From 1fa62b8787984b6c7bb971ebf60875a61904c65e Mon Sep 17 00:00:00 2001
From: yuanhe <yuanhe@minimaxi.com>
Date: Sun, 4 Oct 2026 10:23:53 +0800
Subject: [PATCH 01/60] Add homepage launch video

---
 .../.vitepress/theme/components/Landing.vue   | 45 ++++++----
 .../theme/components/LaunchVideo.vue          | 83 +++++++++++++++++++
 website/.vitepress/theme/landing-content.ts   |  3 +
 website/README.md                             |  4 +
 4 files changed, 119 insertions(+), 16 deletions(-)
 create mode 100644 website/.vitepress/theme/components/LaunchVideo.vue

diff --git a/website/.vitepress/theme/components/Landing.vue b/website/.vitepress/theme/components/Landing.vue
index 53aaa3374..8dde74b3d 100644
--- a/website/.vitepress/theme/components/Landing.vue
+++ b/website/.vitepress/theme/components/Landing.vue
@@ -4,6 +4,7 @@ import { withBase } from 'vitepress'
 import AsciiCanvas from './AsciiCanvas.vue'
 import ComposeLab from './ComposeLab.vue'
 import LogoWall from './LogoWall.vue'
+import LaunchVideo from './LaunchVideo.vue'
 import SessionFlow from './SessionFlow.vue'
 import TitleAccent from './TitleAccent.vue'
 import { copy, installCommand, repoUrl, type Lang } from '../landing-content'
@@ -113,19 +114,26 @@ onBeforeUnmount(() => {
               GitHub
             </a>
           </div>
+          <div class="hero-install">
           <div class="install">
             <code><span class="prompt">$</span> {{ installCommand }}</code>
             <button type="button" class="copy" @click="copyInstall">{{ copied ? t.hero.copied : t.hero.copy }}</button>
           </div>
           <p class="install-note">{{ t.hero.installLabel }}</p>
+          </div>
         </div>
 
-        <div class="hero-art">
-          <div class="corner tl" aria-hidden="true" /><div class="corner tr" aria-hidden="true" /><div class="corner bl" aria-hidden="true" /><div class="corner br" aria-hidden="true" />
-          <AsciiCanvas kind="logo" :cell="12" :fill="0.68" :shift-y="-0.08" label="OpenAgentCore" />
-          <dl class="hud">
-            <div v-for="[k, v] in t.hero.hud" :key="k"><dt>{{ k }}</dt><dd>{{ v }}</dd></div>
-          </dl>
+        <div class="hero-media">
+          <div class="hero-brand">
+            <div class="hero-art">
+              <div class="corner tl" aria-hidden="true" /><div class="corner tr" aria-hidden="true" /><div class="corner bl" aria-hidden="true" /><div class="corner br" aria-hidden="true" />
+              <AsciiCanvas kind="logo" :cell="8" :fill="0.78" label="OpenAgentCore" />
+            </div>
+            <dl class="hud">
+              <div v-for="[k, v] in t.hero.hud" :key="k"><dt>{{ k }}</dt><dd>{{ v }}</dd></div>
+            </dl>
+          </div>
+          <LaunchVideo :lang="lang" />
         </div>
       </div>
 
@@ -371,7 +379,7 @@ onBeforeUnmount(() => {
 }
 .hero-grid {
   display: grid;
-  grid-template-columns: minmax(0, 1.2fr) minmax(0, 0.9fr);
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
   gap: 32px;
   align-items: center;
   min-height: min(72vh, 660px);
@@ -459,12 +467,13 @@ onBeforeUnmount(() => {
   font: 12px var(--l-mono);
   color: var(--l-muted);
 }
+.hero-media { min-width: 0; }
+.hero-brand { display: flex; align-items: center; gap: 20px; margin-bottom: 24px; }
 .hero-art {
   position: relative;
   aspect-ratio: 1 / 1;
-  width: 100%;
-  max-width: 600px;
-  justify-self: end;
+  width: clamp(220px, 22vw, 280px);
+  flex-shrink: 0;
 }
 .corner {
   position: absolute;
@@ -479,11 +488,9 @@ onBeforeUnmount(() => {
 .corner.bl { bottom: 0; left: 0; border-width: 0 0 1px 1px; }
 .corner.br { bottom: 0; right: 0; border-width: 0 1px 1px 0; }
 .hud {
-  position: absolute;
-  left: 14px;
-  bottom: 12px;
+  min-width: 0;
   margin: 0;
-  font: 11px/1.7 var(--l-mono);
+  font: 10px/1.8 var(--l-mono);
   color: var(--l-muted);
   pointer-events: none;
 }
@@ -493,12 +500,14 @@ onBeforeUnmount(() => {
 }
 .hud dt {
   min-width: 6.5em;
+  flex-shrink: 0;
   color: var(--l-accent);
 }
 .hud dt::after {
   content: ':';
 }
 .hud dd {
+  overflow-wrap: anywhere;
   margin: 0;
 }
 
@@ -844,7 +853,11 @@ h3 {
 @media (max-width: 900px) {
   .hero { padding-top: 24px; }
   .hero-grid { grid-template-columns: minmax(0, 1fr); gap: 8px; min-height: 0; }
-  .hero-art { order: -1; width: min(100%, 340px); justify-self: center; }
+  .hero-copy { display: contents; }
+  .hero-media { order: 1; width: 100%; max-width: 600px; justify-self: center; margin-top: 24px; }
+  .hero-install { order: 2; }
+  .hero-brand { justify-content: center; }
+  .hero-art { width: min(60vw, 280px); }
   .hud { display: none; }
   .split, .split.narrow-right { grid-template-columns: minmax(0, 1fr); gap: 32px; }
   .tradeoffs { grid-template-columns: minmax(0, 1fr); }
@@ -872,7 +885,7 @@ h3 {
 .idx { background: var(--l-accent); color: var(--l-bg); padding: 7px 10px; }
 h2, .motto { font-family: var(--l-display); letter-spacing: -0.045em; }
 h3 { font-family: var(--l-display); }
-.hero-art { border: 1px solid var(--l-line-strong); background: var(--l-panel); transform: rotate(1deg); }
+.hero-art { background: transparent; }
 .ticker { background: var(--l-text); color: var(--l-bg); border-top: 3px solid var(--l-accent); }
 .ticker-run span { color: inherit; }
 .btn.primary { box-shadow: 3px 3px 0 var(--l-text); }
diff --git a/website/.vitepress/theme/components/LaunchVideo.vue b/website/.vitepress/theme/components/LaunchVideo.vue
new file mode 100644
index 000000000..2672f86b1
--- /dev/null
+++ b/website/.vitepress/theme/components/LaunchVideo.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { copy, type Lang } from '../landing-content'
+
+const props = defineProps<{ lang: Lang }>()
+const t = computed(() => copy[props.lang].video)
+const source = 'https://file.cdn.minimax.io/public/OpenAgentCore-launch.mp4'
+const preview = ref<HTMLVideoElement>()
+const player = ref<HTMLVideoElement>()
+const dialog = ref<HTMLDialogElement>()
+const paused = ref(true)
+let resumePreview = false
+
+function play(video?: HTMLVideoElement) {
+  void video?.play().catch(() => {})
+}
+function expand() {
+  if (!preview.value || !player.value || !dialog.value) return
+  resumePreview = !preview.value.paused
+  preview.value.pause()
+  dialog.value.showModal()
+  player.value.currentTime = preview.value.currentTime
+  play(player.value)
+}
+function close() {
+  player.value?.pause()
+  if (preview.value && player.value) preview.value.currentTime = player.value.currentTime
+  if (resumePreview) play(preview.value)
+}
+onMounted(() => {
+  if (!window.matchMedia('(prefers-reduced-motion: reduce)').matches) play(preview.value)
+})
+onBeforeUnmount(() => {
+  preview.value?.pause()
+  player.value?.pause()
+  dialog.value?.close()
+})
+</script>
+
+<template>
+  <div class="launch-video">
+    <div class="preview-frame">
+      <button class="preview-open" type="button" :aria-label="t.expand" aria-haspopup="dialog" @click="expand">
+        <video ref="preview" :src="source" muted loop playsinline preload="metadata" aria-hidden="true" @play="paused = false" @pause="paused = true" />
+        <span class="expand-icon" aria-hidden="true">↗</span>
+      </button>
+      <span class="video-corner top-left" aria-hidden="true" /><span class="video-corner top-right" aria-hidden="true" /><span class="video-corner bottom-left" aria-hidden="true" /><span class="video-corner bottom-right" aria-hidden="true" />
+      <button class="preview-pause" type="button" :aria-label="paused ? t.play : t.pause" @click="paused ? play(preview) : preview?.pause()">{{ paused ? '▶' : 'Ⅱ' }}</button>
+    </div>
+    <button class="video-caption" type="button" @click="expand">{{ t.title }} <span aria-hidden="true">↗</span></button>
+    <dialog ref="dialog" class="video-dialog" :aria-label="t.title" @close="close" @click="($event.target === dialog) && dialog?.close()">
+      <div class="player-heading"><span>{{ t.title }}</span><button type="button" :aria-label="t.close" autofocus @click="dialog?.close()">✕</button></div>
+      <video ref="player" :src="source" controls playsinline preload="none" :aria-label="t.title" />
+    </dialog>
+  </div>
+</template>
+
+<style scoped>
+.launch-video { width: 100%; }
+.preview-frame { position: relative; padding: 6px; background: transparent; }
+.video-corner { position: absolute; width: 18px; height: 18px; border-style: solid; border-color: var(--l-accent); opacity: 0.65; pointer-events: none; }
+.top-left { top: 0; left: 0; border-width: 1px 0 0 1px; }
+.top-right { top: 0; right: 0; border-width: 1px 1px 0 0; }
+.bottom-left { bottom: 0; left: 0; border-width: 0 0 1px 1px; }
+.bottom-right { bottom: 0; right: 0; border-width: 0 1px 1px 0; }
+.preview-open { display: block; width: 100%; cursor: pointer; }
+.preview-open video { display: block; width: 100%; aspect-ratio: 16 / 9; object-fit: contain; }
+.expand-icon, .preview-pause { position: absolute; bottom: 10px; display: grid; place-items: center; width: 30px; height: 30px; border: 1px solid #ffffff50; border-radius: 3px; color: #fff; background: #0b100ecc; }
+.expand-icon { right: 10px; }
+.preview-pause { left: 10px; cursor: pointer; }
+.video-caption { display: flex; align-items: center; justify-content: space-between; width: 100%; padding: 12px 6px; border-bottom: 1px solid var(--l-line); color: var(--l-text-2); font: 12px var(--l-mono); cursor: pointer; }
+button:focus-visible { outline: 2px solid var(--l-accent); outline-offset: -3px; }
+.preview-frame:hover .video-corner { opacity: 1; }
+.video-dialog { position: fixed; inset: 0; width: min(1040px, calc(100vw - 32px)); max-width: none; max-height: calc(100dvh - 32px); margin: auto; padding: 0; border: 1px solid var(--l-line-strong); border-radius: 6px; background: var(--l-code-bg); color: var(--l-code-text); box-shadow: 0 24px 100px #0008; }
+.video-dialog::backdrop { background: #050907d9; backdrop-filter: blur(8px); }
+.player-heading { display: flex; align-items: center; justify-content: space-between; gap: 16px; padding: 10px 16px; border-bottom: 1px solid #ffffff20; font: 13px var(--l-mono); }
+.player-heading button { width: 32px; height: 32px; cursor: pointer; }
+.video-dialog video { display: block; width: 100%; max-height: calc(100dvh - 90px); background: #000; }
+</style>
+
+<style>
+html:has(.video-dialog[open]) { overflow: hidden; }
+</style>
diff --git a/website/.vitepress/theme/landing-content.ts b/website/.vitepress/theme/landing-content.ts
index efd797cab..418ae3222 100644
--- a/website/.vitepress/theme/landing-content.ts
+++ b/website/.vitepress/theme/landing-content.ts
@@ -15,6 +15,7 @@ export interface LandingCopy {
     copy: string
     hud: [string, string][]
   }
+  video: { title: string; expand: string; close: string; pause: string; play: string }
   ticker: string[]
   compose: {
     index: string
@@ -92,6 +93,7 @@ const en: LandingCopy = {
       ['machine', 'linux | macos | windows'],
     ],
   },
+  video: { title: 'Meet OpenAgentCore', expand: 'Watch the launch film', close: 'Close video', pause: 'Pause preview', play: 'Play preview' },
   ticker: ['Codex', 'Claude Code', 'MiniMax Code', 'Responses API', 'Anthropic Messages', 'Chat Completions', 'Docker', 'microsandbox', 'E2B', 'Linux', 'macOS', 'Windows', 'PostgreSQL', 'OpenAI SDK'],
   compose: {
     index: '01',
@@ -193,6 +195,7 @@ const zh: LandingCopy = {
       ['machine', 'linux | macos | windows'],
     ],
   },
+  video: { title: '认识 OpenAgentCore', expand: '观看发布视频', close: '关闭视频', pause: '暂停预览', play: '播放预览' },
   ticker: en.ticker,
   compose: {
     index: '01',
diff --git a/website/README.md b/website/README.md
index b9af5b4e0..2c53cfa33 100644
--- a/website/README.md
+++ b/website/README.md
@@ -27,6 +27,10 @@ The landing page lives in `.vitepress/theme/`. `landing-content.ts` holds its En
 
 The landing page has five numbered sections: the interactive combination example, an architecture image, execution lifecycle, console screenshots and installation. Four documentation shortcuts link to the detailed guides. `components/SessionFlow.vue` illustrates native execution, Core orchestration and multiple Session environments through a three-stage hand-drawn animation. It autoplays while visible and offers previous/next buttons, a stage slider and pause/play. Reduced-motion preferences disable autoplay. The diagram uses the locally bundled [Virgil font](https://github.com/excalidraw/virgil); its OFL license is stored beside the font in `.vitepress/theme/assets/fonts/`. Section headings share the hero’s display font with white text and green italic accents.
 
+### Launch video
+
+`components/LaunchVideo.vue` embeds the CDN-hosted launch film in the hero’s right column, below an interactive ASCII brand panel, in both languages. Green corner marks frame the preview. On narrow screens, the video fills the content width between the hero actions and installation command. The compact preview loops silently and has a pause control; reduced-motion preferences leave it paused. Opening the preview pauses it and continues from the same position in a modal player with native playback and audio controls. The close button, Escape and backdrop dismiss the player and return focus to the preview.
+
 ### Ecosystem logo wall
 
 `components/LogoWall.vue` places two full-width white logo rows between the documentation shortcuts and the closing installation section. The wall is transparent and borderless, allowing the landing page's background and grid to continue through it. Harness and model brands occupy the first row; cloud and compute brands occupy the second. They scroll in opposite directions, pause on hover or row keyboard focus, and have an explicit pause control. Reduced-motion preferences disable animation and leave both rows manually scrollable. Labels and controls use the landing page's English and Chinese copy.

From 627117a98d954d197375e0d73c85c5cd8fe6b873 Mon Sep 17 00:00:00 2001
From: yuanhe <yuanhe@minimaxi.com>
Date: Sun, 4 Oct 2026 11:52:06 +0800
Subject: [PATCH 02/60] Add initialization step logs

---
 deploy/README.md                      |  2 +-
 docs/getting-started/operations.md    |  3 +
 docs/zh/getting-started/operations.md |  5 +-
 services/core/cmd/oac/init.go         | 50 ++++++++++++--
 services/core/cmd/oac/init_test.go    | 99 +++++++++++++++++++++++++++
 services/core/cmd/oac/main.go         |  9 ++-
 6 files changed, 158 insertions(+), 10 deletions(-)

diff --git a/deploy/README.md b/deploy/README.md
index 200b68036..5324b60ee 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -11,7 +11,7 @@
 
 `install.sh` downloads its release's `compose.yaml`, checks it against `compose-sha256sums.txt`, writes `.env`, and starts Compose. Core applies database migrations when it starts. The host needs Linux amd64 and Docker Compose 2.26 or newer. [Configuration](../docs/configuration.md) owns the installation layout and settings.
 
-`oac` is a Go command (`services/core/cmd/oac`) in the Core image and the ingress image. The host copy implements `apply`, `core-key` and `rotate-core-key`; `core-key --show` runs `oac-web core-key` in the Web container. Start, stop, logs and removal are `docker compose`. `apply` runs `oac-core check-config` before recreating services. The ingress image runs data initialization as `oac init`, verifies and copies its bundled node metadata without network access, and contains no Python. No service receives a Docker socket.
+`oac` is a Go command (`services/core/cmd/oac`) in the Core image and the ingress image. The host copy implements `apply`, `core-key` and `rotate-core-key`; `core-key --show` runs `oac-web core-key` in the Web container. Start, stop, logs and removal are `docker compose`. `apply` runs `oac-core check-config` before recreating services. The ingress image runs data initialization as `oac init`, verifies and copies its bundled node metadata without network access, and contains no Python. No service receives a Docker socket. Initialization writes structured logs to stderr for directory preparation, lock acquisition, existing-installation verification, bundled metadata verification and publication, credential generation or reuse, and receipt persistence. Each step records its start and completion; failures identify the current step, and completion records elapsed milliseconds. Credential values and digests are never logged. View these logs with `docker compose logs --timestamps init`.
 
 Web serves the console and forwards `/v1` and `/api/v1` to Core, so it is the only published service. HTTPS is terminated by the operator's reverse proxy or hosting platform, which routes to `web:8080`; `OAC_PUBLIC_URL` records that origin.
 
diff --git a/docs/getting-started/operations.md b/docs/getting-started/operations.md
index b692794be..ad027bc0e 100644
--- a/docs/getting-started/operations.md
+++ b/docs/getting-started/operations.md
@@ -41,8 +41,11 @@ Service health does not show that a harness or a model works. Use Session, Turn,
 ```sh
 docker compose -f "$HOME/.oac/core/compose.yaml" ps --all
 docker compose -f "$HOME/.oac/core/compose.yaml" logs --tail 200 core
+docker compose -f "$HOME/.oac/core/compose.yaml" logs --timestamps init
 ```
 
+The `init` service exits after initialization. Its step logs are described in [Deployment](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/README.md#installation).
+
 Don't paste `docker compose config`, `docker inspect` or raw logs into public issue reports.
 
 ## Stop and restart
diff --git a/docs/zh/getting-started/operations.md b/docs/zh/getting-started/operations.md
index facb13092..41ee66157 100644
--- a/docs/zh/getting-started/operations.md
+++ b/docs/zh/getting-started/operations.md
@@ -1,7 +1,7 @@
 ---
 title: "管理你的安装"
 source: docs/getting-started/operations.md
-source_hash: e60a6e96cd61692b6adc7664874ba0ed2ce489982e7da2fe2347631ee2a94c0a
+source_hash: 5ac3e57f943b8bb3fadbf9cda0a72399317ad101416ec28ca4037eea07703a82
 ---
 
 安装运维人员负责 Core 主机、存储和可用性。节点主机运行各自的服务；参阅[节点](nodes.md)。设置见[配置参考](../configuration.md)。
@@ -43,8 +43,11 @@ docker compose -f ~/.oac/core/compose.yaml ps
 ```sh
 docker compose -f "$HOME/.oac/core/compose.yaml" ps --all
 docker compose -f "$HOME/.oac/core/compose.yaml" logs --tail 200 core
+docker compose -f "$HOME/.oac/core/compose.yaml" logs --timestamps init
 ```
 
+`init` 服务在初始化完成后退出。其步骤日志见[部署说明](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/README.md#installation)。
+
 不要将 `docker compose config`、`docker inspect` 或原始日志粘贴到公开问题报告。
 
 ## 停止与重启 {#stop-and-restart}
diff --git a/services/core/cmd/oac/init.go b/services/core/cmd/oac/init.go
index 63a8ca937..7c8f6c8b4 100644
--- a/services/core/cmd/oac/init.go
+++ b/services/core/cmd/oac/init.go
@@ -1,19 +1,21 @@
 package main
 
 import (
+	"context"
 	"crypto/rand"
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 	"syscall"
+	"time"
 
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/google/uuid"
 )
 
@@ -34,10 +36,14 @@ type releaseIdentity struct {
 func initCommand() error {
 	revision := os.Getenv("OAC_REVISION")
 	if revision == "" {
-		return errors.New("OAC_REVISION is required")
+		err := errors.New("OAC_REVISION is required")
+		log.Bg().Error("Initialization failed", "step", "validate_revision", "error", err)
+		return err
 	}
 	if revision != buildRevision {
-		return errors.New("initialization image does not match the Compose release")
+		err := errors.New("initialization image does not match the Compose release")
+		log.Bg().Error("Initialization failed", "step", "validate_revision", "revision", revision, "error", err)
+		return err
 	}
 	syscall.Umask(0o077)
 	release := releaseIdentity{revision}
@@ -89,7 +95,6 @@ func readRelease(root string, release releaseIdentity) (map[string][]byte, error
 	if manifest.SourceCommit != release.revision || manifest.Platform != "linux/amd64" {
 		return nil, errors.New("release identity mismatch")
 	}
-	fmt.Println("Bundled node installation metadata verified")
 	return files, nil
 }
 
@@ -134,7 +139,26 @@ type installReceipt struct {
 	Files        map[string]string `json:"files"`
 }
 
-func initialize(root string, release releaseIdentity, fetch func() (map[string][]byte, error)) error {
+func initialize(root string, release releaseIdentity, fetch func() (map[string][]byte, error)) (err error) {
+	ctx, _ := log.StartBackgroundTrace(context.Background(), "installation.init")
+	logger := log.With("component", "oac-init", "revision", release.revision)
+	started := time.Now()
+	step, stepStarted := "prepare_directories", started
+	logger.InfoContext(ctx, "Initialization started", "data_dir", root)
+	logger.InfoContext(ctx, "Initialization step started", "step", step)
+	nextStep := func(next string) {
+		logger.InfoContext(ctx, "Initialization step completed", "step", step, "duration_ms", time.Since(stepStarted).Milliseconds())
+		step, stepStarted = next, time.Now()
+		logger.InfoContext(ctx, "Initialization step started", "step", step)
+	}
+	defer func() {
+		if err != nil {
+			logger.ErrorContext(ctx, "Initialization failed", "step", step, "duration_ms", time.Since(started).Milliseconds(), "error", err)
+			return
+		}
+		logger.InfoContext(ctx, "Initialization step completed", "step", step, "duration_ms", time.Since(stepStarted).Milliseconds())
+		logger.InfoContext(ctx, "Initialization completed", "duration_ms", time.Since(started).Milliseconds())
+	}()
 	if err := os.Chmod(root, 0o755); err != nil {
 		return err
 	}
@@ -148,6 +172,7 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 			return err
 		}
 	}
+	nextStep("acquire_lock")
 	lock, err := os.OpenFile(filepath.Join(root, "secrets", ".init.lock"), os.O_CREATE|os.O_WRONLY, 0o600)
 	if err != nil {
 		return err
@@ -156,6 +181,7 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 	if err := syscall.Flock(int(lock.Fd()), syscall.LOCK_EX); err != nil {
 		return err
 	}
+	nextStep("verify_existing_installation")
 	marker := filepath.Join(root, "installation.json")
 	if raw, err := os.ReadFile(marker); err == nil {
 		var receipt installReceipt
@@ -174,11 +200,12 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 				return errors.New("installation files changed; restore the matching data directory")
 			}
 		}
-		fmt.Println("Existing installation verified")
+		logger.InfoContext(ctx, "Existing installation verified", "file_count", len(receipt.Files))
 		return nil
 	} else if !errors.Is(err, fs.ErrNotExist) {
 		return err
 	}
+	nextStep("verify_empty_data")
 	for _, name := range []string{"database", "state"} {
 		entries, err := os.ReadDir(filepath.Join(root, name))
 		if err != nil {
@@ -188,16 +215,20 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 			return errors.New("existing data requires its original installation files")
 		}
 	}
+	nextStep("verify_bundled_metadata")
 	files, err := fetch()
 	if err != nil {
 		return err
 	}
+	logger.InfoContext(ctx, "Bundled node installation metadata verified", "file_count", len(files))
+	nextStep("publish_node_metadata")
 	prefix := "node-payload/releases/" + release.revision + "/"
 	names := []string{}
 	for _, name := range releaseMembers {
 		if err := writeOwned(filepath.Join(root, prefix+name), files[name]); err != nil {
 			return err
 		}
+		logger.InfoContext(ctx, "Node metadata file copied", "file", name)
 		names = append(names, prefix+name)
 	}
 	active, _ := json.Marshal(map[string]string{"source_commit": release.revision})
@@ -215,6 +246,7 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 	}); err != nil {
 		return err
 	}
+	nextStep("prepare_credentials")
 	generators := []struct {
 		name     string
 		generate func() string
@@ -236,8 +268,11 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 			if err := writeOwned(path, []byte(secret.generate()+"\n")); err != nil {
 				return err
 			}
+			logger.InfoContext(ctx, "Credential file generated", "file", secret.name)
 		} else if err != nil {
 			return err
+		} else {
+			logger.InfoContext(ctx, "Credential file retained", "file", secret.name)
 		}
 		names = append(names, secret.name)
 	}
@@ -250,6 +285,7 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 		return err
 	}
 	names = append(names, "secrets/core/core-key-digests.json", "node-payload/active.json")
+	nextStep("write_installation_receipt")
 	receipt := installReceipt{SourceCommit: release.revision, Files: map[string]string{}}
 	for _, name := range names {
 		if receipt.Files[name], err = fileDigest(filepath.Join(root, name)); err != nil {
@@ -260,7 +296,7 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 	if err := writeOwned(marker, raw); err != nil {
 		return err
 	}
-	fmt.Println("Installation initialized; print the sign-in key with: docker compose exec web oac-web core-key")
+	logger.InfoContext(ctx, "Installation initialized", "sign_in_key_command", "docker compose exec web oac-web core-key")
 	return nil
 }
 
diff --git a/services/core/cmd/oac/init_test.go b/services/core/cmd/oac/init_test.go
index 3c26735dc..b0164d682 100644
--- a/services/core/cmd/oac/init_test.go
+++ b/services/core/cmd/oac/init_test.go
@@ -6,13 +6,16 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"io/fs"
+	"log/slog"
 	"maps"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/google/uuid"
 )
 
@@ -202,3 +205,99 @@ func TestInitRejectsMismatchedImageBeforeTouchingData(t *testing.T) {
 		t.Fatalf("err = %v", err)
 	}
 }
+
+func captureInitLogs(t *testing.T) *bytes.Buffer {
+	t.Helper()
+	var output bytes.Buffer
+	previous := slog.Default()
+	slog.SetDefault(slog.New(log.NewContextHandler(slog.NewJSONHandler(&output, nil))))
+	t.Cleanup(func() { slog.SetDefault(previous) })
+	return &output
+}
+
+func TestInitializationLogsLifecycleWithoutCredentials(t *testing.T) {
+	root, release, files := initFixture(t)
+	output := captureInitLogs(t)
+	if err := initialize(root, release, fixed(files)); err != nil {
+		t.Fatal(err)
+	}
+	for _, message := range []string{"Initialization started", "Node metadata file copied", "Credential file generated", "Installation initialized", "Initialization completed"} {
+		if !strings.Contains(output.String(), message) {
+			t.Fatalf("missing %s", message)
+		}
+	}
+	var traceID string
+	for _, line := range strings.Split(strings.TrimSpace(output.String()), "\n") {
+		var entry map[string]any
+		if err := json.Unmarshal([]byte(line), &entry); err != nil {
+			t.Fatal(err)
+		}
+		if entry["component"] != "oac-init" || entry["revision"] != release.revision {
+			t.Fatalf("missing initialization identity: %v", entry)
+		}
+		trace, ok := entry["trace_id"].(string)
+		if !ok || trace == "" {
+			t.Fatal("missing trace ID")
+		}
+		if traceID == "" {
+			traceID = trace
+		}
+		if traceID != trace {
+			t.Fatal("initialization logs have different trace IDs")
+		}
+		if duration, ok := entry["duration_ms"].(float64); ok && duration < 0 {
+			t.Fatal("negative duration")
+		}
+	}
+	for _, name := range []string{"secrets/web/core.key", "secrets/database/password", "secrets/core/credential.key", "secrets/core/core-key-digests.json"} {
+		data, err := os.ReadFile(filepath.Join(root, name))
+		if err != nil {
+			t.Fatal(err)
+		}
+		for _, value := range []string{strings.TrimSpace(string(data)), keyDigest(strings.TrimSpace(string(data)))} {
+			if strings.Contains(output.String(), value) {
+				t.Fatalf("credential or digest leaked from %s", name)
+			}
+		}
+	}
+	output.Reset()
+	if err := initialize(root, release, refuseDownload(t)); err != nil {
+		t.Fatal(err)
+	}
+	if !strings.Contains(output.String(), "Existing installation verified") || strings.Contains(output.String(), "Credential file generated") {
+		t.Fatal("restart logs do not describe verification only")
+	}
+	output.Reset()
+	if err := os.Remove(filepath.Join(root, "installation.json")); err != nil {
+		t.Fatal(err)
+	}
+	if err := initialize(root, release, fixed(files)); err != nil {
+		t.Fatal(err)
+	}
+	if !strings.Contains(output.String(), "Credential file retained") || strings.Contains(output.String(), "Credential file generated") {
+		t.Fatal("interrupted initialization logs do not describe credential reuse")
+	}
+}
+
+func TestInitializationLogsFailureStep(t *testing.T) {
+	root, release, _ := initFixture(t)
+	output := captureInitLogs(t)
+	failure := errors.New("invalid bundled metadata")
+	if err := initialize(root, release, func() (map[string][]byte, error) { return nil, failure }); !errors.Is(err, failure) {
+		t.Fatalf("err = %v", err)
+	}
+	lines := strings.Split(strings.TrimSpace(output.String()), "\n")
+	var entry map[string]any
+	if err := json.Unmarshal([]byte(lines[len(lines)-1]), &entry); err != nil {
+		t.Fatal(err)
+	}
+	if entry["level"] != "ERROR" || entry["step"] != "verify_bundled_metadata" || entry["error"] != failure.Error() {
+		t.Fatalf("failure log = %v", entry)
+	}
+	if _, ok := entry["duration_ms"]; !ok {
+		t.Fatal("failure duration missing")
+	}
+	if strings.Contains(output.String(), "Initialization completed") || strings.Contains(output.String(), "Credential file generated") {
+		t.Fatal("failure logged success or generated credentials")
+	}
+}
diff --git a/services/core/cmd/oac/main.go b/services/core/cmd/oac/main.go
index 254993a51..0d1318c78 100644
--- a/services/core/cmd/oac/main.go
+++ b/services/core/cmd/oac/main.go
@@ -13,6 +13,8 @@ import (
 	"path/filepath"
 	"strings"
 	"syscall"
+
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 )
 
 func main() {
@@ -20,10 +22,15 @@ func main() {
 		usage()
 		os.Exit(2)
 	}
+	if os.Args[1] == "init" {
+		log.Init(log.ConfigFromEnv())
+	}
 	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
 	if err := run(ctx, os.Args[1], os.Args[2:]); err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
+		if os.Args[1] != "init" {
+			fmt.Fprintln(os.Stderr, err.Error())
+		}
 		os.Exit(1)
 	}
 }

From 9fa92df0afb170bd57da8314e2a4280aca1fd4ac Mon Sep 17 00:00:00 2001
From: yuanhe <yuanhe@minimaxi.com>
Date: Sun, 4 Oct 2026 12:12:44 +0800
Subject: [PATCH 03/60] Minimize complexity and measure performance

---
 AGENTS.md       | 8 +++++++-
 CONTRIBUTING.md | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/AGENTS.md b/AGENTS.md
index deb3b2925..8ec48e767 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,7 +8,13 @@ OpenAgentCore is protocol-first and modular. Core orchestrates operations that p
 
 OpenAgentCore is infrastructure. Change a boundary only when the existing protocol cannot express the behavior, and make that the smallest change that leaves the design intact. Hold the code to the standard of a careful, widely used open-source service.
 
-Keep it concise. Write elegant code that reuses existing code and standard SDKs as far as possible, and avoid redundant code. Expose nothing that does not need to be exposed: no port, route, command or setting without a caller.
+### Simplicity and performance
+
+Do not multiply entities without necessity. The long-term goal is minimal code, dependencies and runtime overhead while preserving protocol correctness, isolation and clear ownership.
+
+- Before adding an abstraction, package, dependency, service, execution path or setting, show why existing code and maintained standard SDKs cannot meet a current requirement cleanly. Prefer reuse, simplification and deletion; do not build extension points for hypothetical needs. Expose no port, route, command or setting without a caller.
+- Keep cohesive responsibilities together and remove redundant layers and indirection. Split code at a real responsibility or protocol boundary, not to meet a file-size target. Fewer files or packages alone do not establish simplicity.
+- Justify performance optimizations with reproducible measurements against a baseline under representative workloads. Compare the relevant latency, throughput, allocations, memory use, startup time or distribution size, and account for added complexity and resource costs. Keep the simplest implementation that meets the measured requirement.
 
 ### Protocols at every boundary
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5710c3f55..12405dd99 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -78,6 +78,7 @@ Record unrelated findings without starting them. Scope compatibility claims to t
 
 ### Implementation conventions
 
+- Apply the [simplicity and performance principles](AGENTS.md#simplicity-and-performance) when adding structure or optimizing execution.
 - Keep one formatter, parser, validator and error mapper per job, and one error mapper per API surface.
 - Share frontend formatting and labels in `apps/web/src/lib/`.
 - Use `internal/obs/log` for logs. Keep credentials out of source and logs. Harness profiles must not copy Runtime tool environment values; see the [environment contract](contracts/agents-api/environments.md#explicit-local-tool-environment).

From f29e406e78f247659bdcb369cf6b7549e53a5b8d Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 00:10:38 +0800
Subject: [PATCH 04/60] Move Core metrics, Runtime history and Runtime targets
 out of store (#430)

---
 services/core/IMPLEMENTATION.md               |   6 +-
 services/core/cmd/server/core_metrics.go      |  18 +--
 services/core/cmd/server/http_routes_test.go  |   2 +-
 services/core/cmd/server/main.go              |   9 +-
 services/core/cmd/server/runtime_history.go   |   6 +-
 .../core/cmd/server/runtime_history_test.go   |   6 +-
 services/core/internal/api/admin_resources.go |   4 +-
 services/core/internal/api/admin_runtime.go   |  11 +-
 .../core/internal/api/admin_runtime_test.go   |  24 ++--
 services/core/internal/api/dependencies.go    |   3 +-
 .../core/internal/api/dependencies_test.go    |   5 +-
 services/core/internal/api/fakes_test.go      |  12 +-
 services/core/internal/coremetrics/service.go |   3 +-
 services/core/internal/coremetrics/types.go   |  15 +++
 .../archive_cancellation_cleanup_test.go      |   2 +-
 .../postgres/coremetricspg/store.go           | 107 +++++++++++++++++
 .../postgres/coremetricspg/store_test.go}     |  45 +++----
 .../persistence/postgres/sessionpg/admin.go   |  55 +++++++++
 .../postgres/sessionpg/admin_test.go          |  63 ++++++++++
 .../persistence/postgres/sessionpg/devices.go |  23 ++++
 .../runtimehistory/postgresreader/reader.go   |  15 ++-
 .../postgresreader/reader_test.go             |   2 +-
 .../postgresreader/samples.go}                |  39 +++---
 .../postgresreader/samples_test.go}           |  80 ++++++++-----
 .../providers/configuration_flow_test.go      |   2 +-
 services/core/internal/sessions/admin.go      |  23 ++++
 services/core/internal/sessions/devices.go    |   4 +
 services/core/internal/sessions/reader.go     |   6 +-
 services/core/internal/store/admin_summary.go |  50 --------
 .../store/archive_cancellation_test.go        |   6 +-
 services/core/internal/store/core_metrics.go  | 111 ------------------
 services/core/internal/store/devices_test.go  |   2 +-
 services/core/internal/store/dispatch_test.go |   2 +-
 .../internal/store/node_host_history_test.go  |  23 ----
 .../store/public_handler_fixture_test.go      |   2 +-
 .../internal/store/runtime_cancellation.go    |  35 ------
 .../internal/store/runtime_connection_test.go |   2 +-
 .../runtime_enrollment_connection_test.go     |   2 +-
 38 files changed, 473 insertions(+), 352 deletions(-)
 create mode 100644 services/core/internal/persistence/postgres/coremetricspg/store.go
 rename services/core/internal/{store/core_metrics_test.go => persistence/postgres/coremetricspg/store_test.go} (79%)
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/admin.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/admin_test.go
 rename services/core/internal/{store/runtime_history.go => runtimehistory/postgresreader/samples.go} (72%)
 rename services/core/internal/{store/runtime_history_acceptance_test.go => runtimehistory/postgresreader/samples_test.go} (76%)
 create mode 100644 services/core/internal/sessions/admin.go
 delete mode 100644 services/core/internal/store/core_metrics.go
 delete mode 100644 services/core/internal/store/node_host_history_test.go
 delete mode 100644 services/core/internal/store/runtime_cancellation.go

diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 9231be3fa..29e210fc0 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -6,7 +6,7 @@ These are the code-level rules of `services/core` that no contract states. Contr
 
 `api.NewHandler` takes one `api.Dependencies` value, built only in `cmd/server`. Each application area is one field typed as an interface declared in `api` beside its handlers, listing exactly the methods they call. Every field is required and `NewHandler` rejects a missing one, except the optional groups whose comments say what nil means: `Execution` is nil without an execution Worker, `Sandboxes` is nil without a managed sandbox installation and requires `Execution`, and `Execution.NativeInstaller` is nil for a build without a source revision. Handlers never discover a capability by type assertion or fall back to another implementation. API tests use one strict fake per area, `fake<Area>`, which fails the test on any call the test did not set.
 
-`internal/persistence/postgres/pgunit` owns the PostgreSQL mechanics that adapters share: pooled read-write and snapshot transactions; pool-bound queries, used only for a single-statement read that needs no transaction, such as the per-request key lookup; the execution lease (its dedicated connection and gate, the ownership check, the cancellation fence, close, and the execution deadline); identifier parsing (`ParseID`, `PathID`, `LookupCursor`); and detection of text PostgreSQL cannot store (`IsUnstorableText`). Persistence code runs every transaction through it. Outside `persistence` and `store`, only `cmd/server`, which acquires the lease and builds the adapters' pool, and test fixtures import it. `internal/persistence/postgres/pgtest` is test support: it opens the dedicated test database under the `oac_*_tests` guard, applies the migrations, and creates isolated databases for database-wide state such as the execution lease. Only test files import it.
+`internal/persistence/postgres/pgunit` owns the PostgreSQL mechanics that adapters share: pooled read-write and snapshot transactions; pool-bound queries, used only for a single-statement read that needs no transaction, such as the per-request key lookup; the execution lease (its dedicated connection and gate, the ownership check, the cancellation fence, close, and the execution deadline); identifier parsing (`ParseID`, `PathID`, `LookupCursor`); and detection of text PostgreSQL cannot store (`IsUnstorableText`). Persistence code runs every transaction through it. Outside `persistence` and `store`, only `cmd/server`, which acquires the lease and builds the adapters' pool, `runtimehistory/postgresreader`, which stores Runtime history in Core's database, and test fixtures import it. `internal/persistence/postgres/pgtest` is test support: it opens the dedicated test database under the `oac_*_tests` guard, applies the migrations, and creates isolated databases for database-wide state such as the execution lease. Only test files import it.
 
 `internal/persistence/postgres/auditpg` is the one adapter that other adapters call directly. Audit rows are written inside the business transaction, so each adapter calls `RecordWriteAudit`, `RecordAdminMutation` or `RecordDeploymentMutation` with its own transaction's queries; the audit provenance travels in the context. `writeaudit` and `adminaudit` own the sources, their validation, `ErrInvalidSource` and the read models, and `auditpg.Store` serves the audit reads.
 
@@ -34,7 +34,9 @@ Domain owners, each with its PostgreSQL adapter under `internal/persistence/post
 - `modelconfiguration` (`modelconfigurationpg`): each Harness's deployment default model configuration and its last-use observations.
 - `skills` (`skillpg`): Skills and their immutable versions: archive checks, the default and latest pointers, version selection and deletion, and each version's sealed archive. Session creation freezes selected versions inside its `store` transaction with the `skills` rules.
 - `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and to `store`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other reader is `store`: Session creation decides admission and placement with those rules and `placementpg` inside its own transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. The reset's Session archive stays in `store`.
-- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, creation, revocation, heartbeats and Runtime enrollment), executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
+- `coremetrics` (`coremetricspg`): the Core metrics PostgreSQL holds: the root Turn queue counts, the root Turn history, read from one read-only snapshot, and the database size. `cmd/server`'s Core metrics source adds them to the process, pool, Worker and daemon registry measurements.
+- `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples.
+- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the Sessions whose Runtime the administrator observes across Projects, executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
 
 ## Request handling
 
diff --git a/services/core/cmd/server/core_metrics.go b/services/core/cmd/server/core_metrics.go
index 9c0147c39..84d4c59a4 100644
--- a/services/core/cmd/server/core_metrics.go
+++ b/services/core/cmd/server/core_metrics.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/coremetricspg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
@@ -16,7 +16,7 @@ var buildRevision string
 var processStartedAt = time.Now().UTC()
 
 type coreMetricsSource struct {
-	store    *store.Store
+	store    *coremetricspg.Store
 	pool     *pgxpool.Pool
 	worker   *execution.Worker
 	registry *runtimegateway.Registry
@@ -51,7 +51,7 @@ func (s *coreMetricsSource) Sample(ctx context.Context) coremetrics.Sample {
 	if s.registry != nil {
 		devices = s.registry.Devices()
 	}
-	counts, err := s.store.ReadCoreExecutionSnapshot(ctx, time.Now(), devices)
+	counts, err := s.store.ReadExecutionSnapshot(ctx, time.Now(), devices)
 	if err != nil {
 		sample.Healthy = false
 	} else {
@@ -61,7 +61,7 @@ func (s *coreMetricsSource) Sample(ctx context.Context) coremetrics.Sample {
 			sample.WaitingForDaemon = metricPtr(counts.WaitingForDaemon)
 		}
 	}
-	size, err := s.store.ReadCoreDatabaseSize(ctx)
+	size, err := s.store.ReadDatabaseSize(ctx)
 	if err != nil {
 		sample.Healthy = false
 	} else {
@@ -71,15 +71,7 @@ func (s *coreMetricsSource) Sample(ctx context.Context) coremetrics.Sample {
 	return sample
 }
 func (s *coreMetricsSource) History(ctx context.Context, start, end time.Time, step time.Duration) (coremetrics.History, error) {
-	value, err := s.store.ReadCoreExecutionHistory(ctx, start, end, step)
-	if err != nil {
-		return coremetrics.History{}, err
-	}
-	result := coremetrics.History{Interrupted: value.Interrupted, QueueWaitMS: coremetrics.Latency{P50: value.QueueWaitMS.P50, P95: value.QueueWaitMS.P95}, Buckets: map[time.Time]*float64{}}
-	for _, bucket := range value.Buckets {
-		result.Buckets[bucket.Start.UTC()] = bucket.P95MS
-	}
-	return result, nil
+	return s.store.ReadExecutionHistory(ctx, start, end, step)
 }
 
 func reportCleanupResult(metrics *coremetrics.Service, job string, count int64, err error) {
diff --git a/services/core/cmd/server/http_routes_test.go b/services/core/cmd/server/http_routes_test.go
index 2af0668e5..998788235 100644
--- a/services/core/cmd/server/http_routes_test.go
+++ b/services/core/cmd/server/http_routes_test.go
@@ -105,7 +105,7 @@ func daemonComposition(t testing.TB) http.Handler {
 		Artifacts:       struct{ api.Artifacts }{},
 		ArtifactsReader: struct{ api.ArtifactsReader }{},
 		SessionAdmin:    struct{ api.SessionAdmin }{}, Environments: struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, ExecutorConnections: struct{ api.ExecutorConnections }{},
-		Admin: struct{ api.Admin }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{}, Metrics: struct{ api.Metrics }{},
+		Admin: struct{ api.Admin }{}, AdminRuntimeTargets: struct{ api.AdminRuntimeTargets }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{}, Metrics: struct{ api.Metrics }{},
 		RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
 		Execution: &api.Execution{
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index 044305694..ecbb7f82c 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -45,6 +45,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/nativeinstaller"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/agentpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/coremetricspg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/filepg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
@@ -198,7 +199,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
-	metricsSource := &coreMetricsSource{store: executionStore, pool: pool}
+	metricsSource := &coreMetricsSource{store: coremetricspg.New(units), pool: pool}
 	metrics := coremetrics.New(processStartedAt, buildRevision, metricsSource)
 	auditRetention, err := writeAuditRetention()
 	if err != nil {
@@ -233,7 +234,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
-	history, err := runtimeHistory(ctx, executionStore, public != "")
+	history, err := runtimeHistory(ctx, units, public != "")
 	if err != nil {
 		return err
 	}
@@ -290,7 +291,7 @@ func run() error {
 		if err != nil {
 			return err
 		}
-		daemonHandler, registry, err = runtime.NewGateway(sessionStore, sessionService, executionStore, executorURL)
+		daemonHandler, registry, err = runtime.NewGateway(sessionStore, sessionService, sessionStore, executorURL)
 		if err != nil {
 			return err
 		}
@@ -412,7 +413,7 @@ func run() error {
 		ArtifactsReader: sessionStore,
 		SessionAdmin:    executionStore,
 		Environments:    sessionService, EnvironmentsReader: sessionStore, ExecutorConnections: executorConnections{sessions: sessionStore, registry: registry},
-		Admin: executionStore, AdminAudit: auditStore, WriteAudit: auditStore, Metrics: metrics,
+		Admin: executionStore, AdminRuntimeTargets: sessionStore, AdminAudit: auditStore, WriteAudit: auditStore, Metrics: metrics,
 		RuntimeObservations: observationService, RuntimeHistory: historyService,
 	}
 	if worker != nil {
diff --git a/services/core/cmd/server/runtime_history.go b/services/core/cmd/server/runtime_history.go
index 308e84a55..3ce6bf015 100644
--- a/services/core/cmd/server/runtime_history.go
+++ b/services/core/cmd/server/runtime_history.go
@@ -12,11 +12,11 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory/postgresreader"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs/otlpexporter"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"golang.org/x/net/http/httpguts"
 )
 
@@ -52,7 +52,7 @@ type runtimeHistoryExporter interface {
 	Close(context.Context) error
 }
 
-func runtimeHistory(ctx context.Context, coreStore *store.Store, executionEnabled bool) (runtimeHistorySetup, error) {
+func runtimeHistory(ctx context.Context, units *pgunit.Pool, executionEnabled bool) (runtimeHistorySetup, error) {
 	config, err := loadRuntimeHistoryConfig()
 	if err != nil {
 		return runtimeHistorySetup{}, err
@@ -70,7 +70,7 @@ func runtimeHistory(ctx context.Context, coreStore *store.Store, executionEnable
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory, runtimehistory.MetricTokens},
 	}
 	timeout := time.Duration(config.TimeoutSeconds) * time.Second
-	backend, err := postgresreader.New(coreStore, postgresreader.Config{Capabilities: capabilities, QueryTimeout: timeout})
+	backend, err := postgresreader.New(units, postgresreader.Config{Capabilities: capabilities, QueryTimeout: timeout})
 	if err != nil {
 		return runtimeHistorySetup{}, err
 	}
diff --git a/services/core/cmd/server/runtime_history_test.go b/services/core/cmd/server/runtime_history_test.go
index 4cf172842..c640f2c92 100644
--- a/services/core/cmd/server/runtime_history_test.go
+++ b/services/core/cmd/server/runtime_history_test.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"context"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"os"
 	"path/filepath"
 	"strings"
@@ -19,7 +19,7 @@ func (panicHistoryExporter) Close(context.Context) error
 func TestRuntimeHistoryUsesCoreDatabaseByDefault(t *testing.T) {
 	t.Setenv("OAC_HISTORY_SETTINGS_FILE", "")
 	for _, enabled := range []bool{true, false} {
-		setup, err := runtimeHistory(t.Context(), store.New(nil), enabled)
+		setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), enabled)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -45,7 +45,7 @@ func TestRuntimeHistoryOptionalExportAndSamplingConfiguration(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Setenv("OAC_HISTORY_SETTINGS_FILE", file)
-	setup, err := runtimeHistory(t.Context(), store.New(nil), true)
+	setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), true)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/api/admin_resources.go b/services/core/internal/api/admin_resources.go
index fbddfcf92..79ad09fe7 100644
--- a/services/core/internal/api/admin_resources.go
+++ b/services/core/internal/api/admin_resources.go
@@ -13,11 +13,9 @@ import (
 // Only Core-key-authenticated project resource handlers receive it.
 type adminTenantContextKey struct{}
 
-// Admin reads the administrator's cross-Project views: the asset summary and
-// the Sessions whose Runtime is observed.
+// Admin reads the administrator's asset summary of a Project.
 type Admin interface {
 	ReadAdminSummary(context.Context, string, store.AdminSummaryFilter, func(sessions.Session, *string) error) (store.AdminAssetCounts, error)
-	ListAdminRuntimeTargets(context.Context, []string, string, int, bool) (store.AdminRuntimeTargetPage, error)
 }
 
 func (h *Handler) adminResourceScope(next http.Handler) http.Handler {
diff --git a/services/core/internal/api/admin_runtime.go b/services/core/internal/api/admin_runtime.go
index 393e65581..c0ff4716e 100644
--- a/services/core/internal/api/admin_runtime.go
+++ b/services/core/internal/api/admin_runtime.go
@@ -7,8 +7,15 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
+// AdminRuntimeTargets lists the Sessions whose Runtime the administrator
+// observes across managed Projects.
+type AdminRuntimeTargets interface {
+	ListAdminRuntimeTargets(context.Context, []string, string, int, bool) (sessions.AdminRuntimeTargetPage, error)
+}
+
 type AdminRuntimeObservation struct {
 	ProjectID   string                        `json:"project_id"`
 	Observation AdminRuntimeObservationDetail `json:"observation"`
@@ -72,9 +79,9 @@ func (h *Handler) adminRuntimeObservations(w http.ResponseWriter, r *http.Reques
 			break
 		}
 	}
-	page, err := h.Admin.ListAdminRuntimeTargets(ctx, tenants, options.after, options.limit, options.ascending)
+	page, err := h.AdminRuntimeTargets.ListAdminRuntimeTargets(ctx, tenants, options.after, options.limit, options.ascending)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	sessions := make([]runtimeobs.SessionIdentity, len(page.Data))
diff --git a/services/core/internal/api/admin_runtime_test.go b/services/core/internal/api/admin_runtime_test.go
index 4507c074a..9df4f2579 100644
--- a/services/core/internal/api/admin_runtime_test.go
+++ b/services/core/internal/api/admin_runtime_test.go
@@ -11,19 +11,19 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 )
 
 type adminRuntimeTargets struct {
-	page      store.AdminRuntimeTargetPage
+	page      sessions.AdminRuntimeTargetPage
 	tenants   []string
 	after     string
 	limit     int
 	ascending bool
 }
 
-func (s *adminRuntimeTargets) ListAdminRuntimeTargets(_ context.Context, tenants []string, after string, limit int, ascending bool) (store.AdminRuntimeTargetPage, error) {
+func (s *adminRuntimeTargets) ListAdminRuntimeTargets(_ context.Context, tenants []string, after string, limit int, ascending bool) (sessions.AdminRuntimeTargetPage, error) {
 	s.tenants, s.after, s.limit, s.ascending = tenants, after, limit, ascending
 	return s.page, nil
 }
@@ -32,14 +32,14 @@ const adminRuntimeObservationsPath = "/core/v1/sandbox/runtime-observations"
 
 // adminRuntimeFixture serves the administrator observation list over one
 // Project per tenant and the given Session targets.
-func adminRuntimeFixture(t *testing.T, catalog []projects.Project, targets []store.AdminRuntimeTarget, service RuntimeObservations) (http.Handler, *adminRuntimeTargets) {
+func adminRuntimeFixture(t *testing.T, catalog []projects.Project, targets []sessions.AdminRuntimeTarget, service RuntimeObservations) (http.Handler, *adminRuntimeTargets) {
 	t.Helper()
 	deps, fakes := managementFakes(t, callerBinding())
 	fakes.projectsReader.listProjects = func(context.Context, projects.ListQuery) (projects.Page, error) {
 		return projects.Page{Data: catalog}, nil
 	}
-	management := &adminRuntimeTargets{page: store.AdminRuntimeTargetPage{Data: targets, HasMore: true}}
-	fakes.admin.listAdminRuntimeTargets = management.ListAdminRuntimeTargets
+	management := &adminRuntimeTargets{page: sessions.AdminRuntimeTargetPage{Data: targets, HasMore: true}}
+	fakes.adminRuntimeTargets.listAdminRuntimeTargets = management.ListAdminRuntimeTargets
 	observeWith(service)(&deps, fakes)
 	return newTestHandler(t, deps), management
 }
@@ -73,12 +73,12 @@ func unsupportedObservation(session string, at time.Time) runtimeobs.Observation
 func TestAdminRuntimeObservationListKeepsTargetOrderAndProjects(t *testing.T) {
 	now := time.Date(2026, 9, 22, 8, 0, 0, 0, time.UTC)
 	catalog := []projects.Project{{ID: uuid.NewString(), TenantID: uuid.NewString()}, {ID: uuid.NewString(), TenantID: uuid.NewString()}}
-	var targets []store.AdminRuntimeTarget
+	var targets []sessions.AdminRuntimeTarget
 	for index := range 3 {
-		targets = append(targets, store.AdminRuntimeTarget{SessionID: uuid.NewString(), TenantID: catalog[index%2].TenantID})
+		targets = append(targets, sessions.AdminRuntimeTarget{SessionID: uuid.NewString(), TenantID: catalog[index%2].TenantID})
 	}
 	service := runtimeObservationServiceFunc(func(_ context.Context, tenant, session string) (runtimeobs.Observation, error) {
-		if !slices.Contains(targets, store.AdminRuntimeTarget{SessionID: session, TenantID: tenant}) {
+		if !slices.Contains(targets, sessions.AdminRuntimeTarget{SessionID: session, TenantID: tenant}) {
 			return runtimeobs.Observation{}, errors.New("unexpected tenant")
 		}
 		return unsupportedObservation(session, now), nil
@@ -107,9 +107,9 @@ func TestAdminRuntimeObservationListKeepsTargetOrderAndProjects(t *testing.T) {
 func TestAdminRuntimeObservationListBoundsCollection(t *testing.T) {
 	now := time.Date(2026, 9, 22, 8, 0, 0, 0, time.UTC)
 	project := projects.Project{ID: uuid.NewString(), TenantID: uuid.NewString()}
-	var targets []store.AdminRuntimeTarget
+	var targets []sessions.AdminRuntimeTarget
 	for range 20 {
-		targets = append(targets, store.AdminRuntimeTarget{SessionID: uuid.NewString(), TenantID: project.TenantID})
+		targets = append(targets, sessions.AdminRuntimeTarget{SessionID: uuid.NewString(), TenantID: project.TenantID})
 	}
 	var options runtimeobs.PageOptions
 	service := runtimeObservationPageRecorder{options: &options, runtimeObservationServiceFunc: func(_ context.Context, _, session string) (runtimeobs.Observation, error) {
@@ -134,7 +134,7 @@ func TestAdminRuntimeObservationListRejectsWholePageOnIntegrityFailure(t *testin
 		}
 		return unsupportedObservation(session, now), nil
 	})
-	handler, _ := adminRuntimeFixture(t, []projects.Project{project}, []store.AdminRuntimeTarget{{SessionID: valid, TenantID: project.TenantID}, {SessionID: invalid, TenantID: project.TenantID}}, service)
+	handler, _ := adminRuntimeFixture(t, []projects.Project{project}, []sessions.AdminRuntimeTarget{{SessionID: valid, TenantID: project.TenantID}, {SessionID: invalid, TenantID: project.TenantID}}, service)
 
 	response := runtimeObservationRequest(handler, adminRuntimeObservationsPath+"?limit=2")
 	var envelope struct {
diff --git a/services/core/internal/api/dependencies.go b/services/core/internal/api/dependencies.go
index d1e25c875..c810fa9c6 100644
--- a/services/core/internal/api/dependencies.go
+++ b/services/core/internal/api/dependencies.go
@@ -55,6 +55,7 @@ type Dependencies struct {
 	EnvironmentsReader   EnvironmentsReader
 	ExecutorConnections  ExecutorConnections
 	Admin                Admin
+	AdminRuntimeTargets  AdminRuntimeTargets
 	AdminAudit           AdminAudit
 	WriteAudit           WriteAudit
 	Metrics              Metrics
@@ -141,7 +142,7 @@ func (d Dependencies) validate() error {
 		field{"Artifacts", d.Artifacts},
 		field{"ArtifactsReader", d.ArtifactsReader},
 		field{"SessionAdmin", d.SessionAdmin}, field{"Environments", d.Environments}, field{"EnvironmentsReader", d.EnvironmentsReader},
-		field{"ExecutorConnections", d.ExecutorConnections}, field{"Admin", d.Admin}, field{"AdminAudit", d.AdminAudit}, field{"WriteAudit", d.WriteAudit},
+		field{"ExecutorConnections", d.ExecutorConnections}, field{"Admin", d.Admin}, field{"AdminRuntimeTargets", d.AdminRuntimeTargets}, field{"AdminAudit", d.AdminAudit}, field{"WriteAudit", d.WriteAudit},
 		field{"Metrics", d.Metrics}, field{"RuntimeObservations", d.RuntimeObservations}, field{"RuntimeHistory", d.RuntimeHistory},
 	); err != nil {
 		return err
diff --git a/services/core/internal/api/dependencies_test.go b/services/core/internal/api/dependencies_test.go
index 41722853c..698629487 100644
--- a/services/core/internal/api/dependencies_test.go
+++ b/services/core/internal/api/dependencies_test.go
@@ -41,6 +41,7 @@ type testFakes struct {
 	environmentsReader     *fakeEnvironmentsReader
 	executorConnections    *fakeExecutorConnections
 	admin                  *fakeAdmin
+	adminRuntimeTargets    *fakeAdminRuntimeTargets
 	adminAudit             *fakeAdminAudit
 	writeAudit             *fakeWriteAudit
 	metrics                *fakeMetrics
@@ -84,7 +85,7 @@ func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 		artifacts:       &fakeArtifacts{t: t},
 		artifactsReader: &fakeArtifactsReader{t: t},
 		sessionAdmin:    &fakeSessionAdmin{t: t}, environments: &fakeEnvironments{t: t}, environmentsReader: &fakeEnvironmentsReader{t: t}, executorConnections: &fakeExecutorConnections{t: t},
-		admin: &fakeAdmin{t: t}, adminAudit: &fakeAdminAudit{t: t}, writeAudit: &fakeWriteAudit{t: t}, metrics: &fakeMetrics{t: t},
+		admin: &fakeAdmin{t: t}, adminRuntimeTargets: &fakeAdminRuntimeTargets{t: t}, adminAudit: &fakeAdminAudit{t: t}, writeAudit: &fakeWriteAudit{t: t}, metrics: &fakeMetrics{t: t},
 		runtimeObservations: &fakeRuntimeObservations{t: t}, runtimeHistory: &fakeRuntimeHistory{t: t}, installationBindings: &fakeInstallationBindings{t: t},
 		sessionAdmission: &fakeSessionAdmission{t: t},
 		inputAdmission:   &fakeInputAdmission{t: t},
@@ -111,7 +112,7 @@ func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 		Artifacts:       f.artifacts,
 		ArtifactsReader: f.artifactsReader,
 		SessionAdmin:    f.sessionAdmin,
-		Environments:    f.environments, EnvironmentsReader: f.environmentsReader, ExecutorConnections: f.executorConnections, Admin: f.admin, AdminAudit: f.adminAudit, WriteAudit: f.writeAudit,
+		Environments:    f.environments, EnvironmentsReader: f.environmentsReader, ExecutorConnections: f.executorConnections, Admin: f.admin, AdminRuntimeTargets: f.adminRuntimeTargets, AdminAudit: f.adminAudit, WriteAudit: f.writeAudit,
 		Metrics: f.metrics, RuntimeObservations: f.runtimeObservations, RuntimeHistory: f.runtimeHistory,
 	}, f
 }
diff --git a/services/core/internal/api/fakes_test.go b/services/core/internal/api/fakes_test.go
index e51df824c..bd21b0a51 100644
--- a/services/core/internal/api/fakes_test.go
+++ b/services/core/internal/api/fakes_test.go
@@ -42,9 +42,8 @@ func unexpectedCall(t testing.TB, method string) {
 }
 
 type fakeAdmin struct {
-	t                       testing.TB
-	readAdminSummary        func(context.Context, string, store.AdminSummaryFilter, func(sessions.Session, *string) error) (store.AdminAssetCounts, error)
-	listAdminRuntimeTargets func(context.Context, []string, string, int, bool) (store.AdminRuntimeTargetPage, error)
+	t                testing.TB
+	readAdminSummary func(context.Context, string, store.AdminSummaryFilter, func(sessions.Session, *string) error) (store.AdminAssetCounts, error)
 }
 
 func (f *fakeAdmin) ReadAdminSummary(a0 context.Context, a1 string, a2 store.AdminSummaryFilter, a3 func(sessions.Session, *string) error) (store.AdminAssetCounts, error) {
@@ -54,7 +53,12 @@ func (f *fakeAdmin) ReadAdminSummary(a0 context.Context, a1 string, a2 store.Adm
 	return f.readAdminSummary(a0, a1, a2, a3)
 }
 
-func (f *fakeAdmin) ListAdminRuntimeTargets(a0 context.Context, a1 []string, a2 string, a3 int, a4 bool) (store.AdminRuntimeTargetPage, error) {
+type fakeAdminRuntimeTargets struct {
+	t                       testing.TB
+	listAdminRuntimeTargets func(context.Context, []string, string, int, bool) (sessions.AdminRuntimeTargetPage, error)
+}
+
+func (f *fakeAdminRuntimeTargets) ListAdminRuntimeTargets(a0 context.Context, a1 []string, a2 string, a3 int, a4 bool) (sessions.AdminRuntimeTargetPage, error) {
 	if f.listAdminRuntimeTargets == nil {
 		unexpectedCall(f.t, "ListAdminRuntimeTargets")
 	}
diff --git a/services/core/internal/coremetrics/service.go b/services/core/internal/coremetrics/service.go
index 87fb79d1e..b5433c329 100644
--- a/services/core/internal/coremetrics/service.go
+++ b/services/core/internal/coremetrics/service.go
@@ -2,7 +2,6 @@ package coremetrics
 
 import (
 	"context"
-	"errors"
 	"regexp"
 	"runtime"
 	"sync"
@@ -120,7 +119,7 @@ func Window(now time.Time, name string) (Range, error) {
 	case "7d":
 		duration, step = retention, 2*time.Hour
 	default:
-		return Range{}, errors.New("invalid Core metrics range")
+		return Range{}, ErrInvalidRange
 	}
 	end := now.UTC().Truncate(step)
 	return Range{Start: end.Add(-duration), End: end, ResolutionSeconds: int64(step / time.Second)}, nil
diff --git a/services/core/internal/coremetrics/types.go b/services/core/internal/coremetrics/types.go
index 3cc899d16..f4c132e5c 100644
--- a/services/core/internal/coremetrics/types.go
+++ b/services/core/internal/coremetrics/types.go
@@ -3,9 +3,15 @@ package coremetrics
 
 import (
 	"context"
+	"errors"
 	"time"
 )
 
+// ErrInvalidRange reports a Core metrics range that is not one of the supported
+// windows, or a history interval that is unbounded or not aligned to its
+// resolution.
+var ErrInvalidRange = errors.New("invalid Core metrics range")
+
 type Latency struct {
 	P50 *float64 `json:"p50" extensions:"x-nullable"`
 	P95 *float64 `json:"p95" extensions:"x-nullable"`
@@ -103,6 +109,15 @@ type Live struct {
 	Pool                                     Pool
 	Scheduler                                Job
 }
+
+// ExecutionSnapshot counts the deployment's persisted root Turns.
+type ExecutionSnapshot struct {
+	QueuedTurns, WaitingForDaemon, InProgressTurns int64
+	OldestQueuedSeconds                            *float64
+}
+
+// History is the root Turn history of a range. Buckets maps each bucket's UTC
+// start to its queue wait p95 in milliseconds, nil without observations.
 type History struct {
 	Interrupted int64
 	QueueWaitMS Latency
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index 6618cb37f..21a4a3916 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -116,7 +116,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 				server := httptest.NewUnstartedServer(nil)
 				wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
 				credentials, heartbeat := testSessions(t, pool, testCredentialCipher(t))
-				handler, liveRegistry, err := runtime.NewGateway(credentials, heartbeat, s, wsURL)
+				handler, liveRegistry, err := runtime.NewGateway(credentials, heartbeat, credentials, wsURL)
 				if err != nil {
 					t.Fatal(err)
 				}
diff --git a/services/core/internal/persistence/postgres/coremetricspg/store.go b/services/core/internal/persistence/postgres/coremetricspg/store.go
new file mode 100644
index 000000000..50ec3fad8
--- /dev/null
+++ b/services/core/internal/persistence/postgres/coremetricspg/store.go
@@ -0,0 +1,107 @@
+// Package coremetricspg reads the Core metrics that PostgreSQL holds: the
+// deployment's root Turn queue and its history, and the database size.
+package coremetricspg
+
+import (
+	"context"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+// Store reads Core metrics from Core's database.
+type Store struct {
+	units *pgunit.Pool
+}
+
+// New builds the Core metrics reader on units.
+func New(units *pgunit.Pool) *Store { return &Store{units: units} }
+
+// ReadExecutionSnapshot counts persisted root Turns across the deployment.
+// WaitingForDaemon is the queued subset whose Session binding is absent from the
+// supplied live registry IDs; callers must distinguish an unavailable registry
+// from an observed empty one before using this method. Age is in seconds, and is
+// nil when the queue is empty. No Session deletion filter hides operational state.
+func (s *Store) ReadExecutionSnapshot(ctx context.Context, now time.Time, connectedDeviceIDs []string) (coremetrics.ExecutionSnapshot, error) {
+	ids := make([]pgtype.UUID, 0, len(connectedDeviceIDs))
+	for _, value := range connectedDeviceIDs {
+		id, err := pgunit.ParseID(value)
+		if err != nil {
+			return coremetrics.ExecutionSnapshot{}, err
+		}
+		ids = append(ids, id)
+	}
+	row, err := s.units.Queries().CoreExecutionSnapshot(ctx, sqlc.CoreExecutionSnapshotParams{
+		ConnectedDeviceIds: ids, ObservedAt: pgtype.Timestamptz{Time: now, Valid: true},
+	})
+	if err != nil {
+		return coremetrics.ExecutionSnapshot{}, err
+	}
+	result := coremetrics.ExecutionSnapshot{QueuedTurns: row.QueuedTurns, WaitingForDaemon: row.WaitingForDaemon, InProgressTurns: row.InProgressTurns}
+	if row.QueuedTurns > 0 {
+		result.OldestQueuedSeconds = &row.OldestQueuedSeconds
+	}
+	return result, nil
+}
+
+// ReadExecutionHistory reads a bounded, repeatable read-only snapshot of root
+// Turn history. The interval is [start,end), with complete epoch-aligned buckets
+// keyed by their UTC start. Interruptions use failed Turns' completed_at and
+// execution_interrupted error code. Queue waits use started_at-created_at in
+// milliseconds, grouped by started_at, including retained history of deleted
+// Sessions. Counts of an empty interval are zero; percentile values without
+// observations are nil. Read errors invalidate the entire result and must not be
+// presented as measured zeros.
+func (s *Store) ReadExecutionHistory(ctx context.Context, start, end time.Time, resolution time.Duration) (coremetrics.History, error) {
+	span := end.Sub(start)
+	if resolution < time.Second || resolution%time.Second != 0 || span <= 0 || span > 7*24*time.Hour ||
+		span%resolution != 0 || span/resolution > 1008 || start.Nanosecond() != 0 || end.Nanosecond() != 0 ||
+		start.Unix()%int64(resolution/time.Second) != 0 || end.Unix()%int64(resolution/time.Second) != 0 {
+		return coremetrics.History{}, coremetrics.ErrInvalidRange
+	}
+	buckets := make([]time.Time, int(span/resolution))
+	result := coremetrics.History{Buckets: make(map[time.Time]*float64, len(buckets))}
+	for i := range buckets {
+		buckets[i] = start.Add(time.Duration(i) * resolution).UTC()
+		result.Buckets[buckets[i]] = nil
+	}
+	first, last := pgtype.Timestamptz{Time: start, Valid: true}, pgtype.Timestamptz{Time: end, Valid: true}
+	err := s.units.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		var err error
+		result.Interrupted, err = q.CoreInterruptedTurns(ctx, sqlc.CoreInterruptedTurnsParams{RangeStart: first, RangeEnd: last})
+		if err != nil {
+			return err
+		}
+		wait, err := q.CoreQueueWaitSummary(ctx, sqlc.CoreQueueWaitSummaryParams{RangeStart: first, RangeEnd: last})
+		if err != nil {
+			return err
+		}
+		if wait.Samples > 0 {
+			result.QueueWaitMS = coremetrics.Latency{P50: &wait.P50Ms, P95: &wait.P95Ms}
+		}
+		rows, err := q.CoreQueueWaitBuckets(ctx, sqlc.CoreQueueWaitBucketsParams{RangeStart: first, RangeEnd: last, ResolutionSeconds: int32(resolution / time.Second)})
+		if err != nil {
+			return err
+		}
+		for _, row := range rows {
+			if row.Samples > 0 {
+				result.Buckets[buckets[row.BucketNumber]] = &row.P95Ms
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return coremetrics.History{}, err
+	}
+	return result, nil
+}
+
+// ReadDatabaseSize measures the current PostgreSQL database in bytes.
+func (s *Store) ReadDatabaseSize(ctx context.Context) (int64, error) {
+	return s.units.Queries().CoreDatabaseSize(ctx)
+}
diff --git a/services/core/internal/store/core_metrics_test.go b/services/core/internal/persistence/postgres/coremetricspg/store_test.go
similarity index 79%
rename from services/core/internal/store/core_metrics_test.go
rename to services/core/internal/persistence/postgres/coremetricspg/store_test.go
index 9fb2f6c2a..db5d8edba 100644
--- a/services/core/internal/store/core_metrics_test.go
+++ b/services/core/internal/persistence/postgres/coremetricspg/store_test.go
@@ -1,4 +1,4 @@
-package store
+package coremetricspg
 
 import (
 	"context"
@@ -8,10 +8,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
 func coreMetricsSession(t *testing.T, pool *pgxpool.Pool, deleted bool) string {
@@ -42,9 +43,10 @@ func coreMetricsTurn(t *testing.T, pool *pgxpool.Pool, session, status, code str
 }
 
 func TestCoreMetricsSnapshot(t *testing.T) {
-	s, pool := testStore(t)
+	pool := pgtest.Open(t)
+	s := New(pgunit.NewPool(pool))
 	now := time.Now().UTC()
-	baseline, err := s.ReadCoreExecutionSnapshot(t.Context(), now, []string{})
+	baseline, err := s.ReadExecutionSnapshot(t.Context(), now, []string{})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -66,7 +68,7 @@ func TestCoreMetricsSnapshot(t *testing.T) {
 			}
 		}
 	}
-	got, err := s.ReadCoreExecutionSnapshot(t.Context(), now, []string{connected})
+	got, err := s.ReadExecutionSnapshot(t.Context(), now, []string{connected})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -76,17 +78,18 @@ func TestCoreMetricsSnapshot(t *testing.T) {
 	if got.OldestQueuedSeconds == nil || math.Abs(*got.OldestQueuedSeconds-now.Sub(oldest).Seconds()) > 0.001 {
 		t.Fatalf("oldest age: %v", got.OldestQueuedSeconds)
 	}
-	disconnected, err := s.ReadCoreExecutionSnapshot(t.Context(), now, []string{})
+	disconnected, err := s.ReadExecutionSnapshot(t.Context(), now, []string{})
 	if err != nil || disconnected.WaitingForDaemon != got.WaitingForDaemon+1 {
 		t.Fatalf("registry disconnect: %+v, %v", disconnected, err)
 	}
-	if _, err := s.ReadCoreExecutionSnapshot(t.Context(), now, []string{"invalid-device-id"}); err == nil {
+	if _, err := s.ReadExecutionSnapshot(t.Context(), now, []string{"invalid-device-id"}); err == nil {
 		t.Fatal("invalid registry ID accepted")
 	}
 }
 
 func TestCoreMetricsHistory(t *testing.T) {
-	s, pool := testStore(t)
+	pool := pgtest.Open(t)
+	s := New(pgunit.NewPool(pool))
 	start := time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
 	end := start.Add(3 * time.Minute)
 	// Boundary samples exercise inclusive start, exclusive end and exact buckets.
@@ -109,7 +112,7 @@ func TestCoreMetricsHistory(t *testing.T) {
 		}
 		coreMetricsTurn(t, pool, coreMetricsSession(t, pool, false), status, code, start, nil, &completed)
 	}
-	got, err := s.ReadCoreExecutionHistory(t.Context(), start, end, time.Minute)
+	got, err := s.ReadExecutionHistory(t.Context(), start, end, time.Minute)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -124,33 +127,33 @@ func TestCoreMetricsHistory(t *testing.T) {
 	}
 	check("range p50", got.QueueWaitMS.P50, 1000)
 	check("range p95", got.QueueWaitMS.P95, 2800)
-	check("first bucket p95", got.Buckets[0].P95MS, 950)
-	check("second bucket p95", got.Buckets[1].P95MS, 3000)
-	if got.Buckets[2].P95MS != nil || !got.Buckets[2].Start.Equal(start.Add(2*time.Minute)) {
+	check("first bucket p95", got.Buckets[start], 950)
+	check("second bucket p95", got.Buckets[start.Add(time.Minute)], 3000)
+	if p95, ok := got.Buckets[start.Add(2*time.Minute)]; !ok || p95 != nil {
 		t.Fatal("missing bucket must have aligned start and unknown percentile")
 	}
-	empty, err := s.ReadCoreExecutionHistory(t.Context(), end.Add(time.Hour), end.Add(2*time.Hour), time.Minute)
+	empty, err := s.ReadExecutionHistory(t.Context(), end.Add(time.Hour), end.Add(2*time.Hour), time.Minute)
 	if err != nil || empty.Interrupted != 0 || empty.QueueWaitMS.P50 != nil || empty.QueueWaitMS.P95 != nil || len(empty.Buckets) != 60 {
 		t.Fatalf("empty history: %+v, %v", empty, err)
 	}
-	for _, bucket := range empty.Buckets {
-		if bucket.P95MS != nil {
+	for _, p95 := range empty.Buckets {
+		if p95 != nil {
 			t.Fatal("empty bucket invented zero percentile")
 		}
 	}
-	size, err := s.ReadCoreDatabaseSize(t.Context())
+	size, err := s.ReadDatabaseSize(t.Context())
 	if err != nil || size <= 0 {
 		t.Fatalf("database size: %d, %v", size, err)
 	}
 	ctx, cancel := context.WithCancel(t.Context())
 	cancel()
-	if _, err := s.ReadCoreExecutionSnapshot(ctx, start, nil); err == nil {
+	if _, err := s.ReadExecutionSnapshot(ctx, start, nil); err == nil {
 		t.Fatal("snapshot read error hidden")
 	}
-	if result, err := s.ReadCoreExecutionHistory(ctx, start, end, time.Minute); err == nil || result.Buckets != nil {
+	if result, err := s.ReadExecutionHistory(ctx, start, end, time.Minute); err == nil || result.Buckets != nil {
 		t.Fatal("history read error hidden or partial data returned")
 	}
-	if _, err := s.ReadCoreDatabaseSize(ctx); err == nil {
+	if _, err := s.ReadDatabaseSize(ctx); err == nil {
 		t.Fatal("database size read error hidden")
 	}
 }
@@ -171,7 +174,7 @@ func TestCoreMetricsHistoryBounds(t *testing.T) {
 		{start, start.Add(time.Hour + time.Second), time.Minute},
 		{start.Add(time.Nanosecond), start.Add(time.Hour + time.Nanosecond), time.Minute},
 	} {
-		if _, err := s.ReadCoreExecutionHistory(t.Context(), tc.start, tc.end, tc.step); !errors.Is(err, sessions.ErrInvalidInput) {
+		if _, err := s.ReadExecutionHistory(t.Context(), tc.start, tc.end, tc.step); !errors.Is(err, coremetrics.ErrInvalidRange) {
 			t.Fatalf("unbounded or unaligned range accepted: %+v, %v", tc, err)
 		}
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/admin.go b/services/core/internal/persistence/postgres/sessionpg/admin.go
new file mode 100644
index 000000000..3f49c20be
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/admin.go
@@ -0,0 +1,55 @@
+package sessionpg
+
+import (
+	"context"
+	"errors"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+func (s *Store) ListAdminRuntimeTargets(ctx context.Context, tenantIDs []string, after string, limit int, ascending bool) (sessions.AdminRuntimeTargetPage, error) {
+	page := sessions.AdminRuntimeTargetPage{Data: []sessions.AdminRuntimeTarget{}}
+	if limit < 1 || limit > 100 {
+		return page, sessions.ErrInvalidInput
+	}
+	tenants := make([]pgtype.UUID, 0, len(tenantIDs))
+	for _, value := range tenantIDs {
+		id, err := parseID(value)
+		if err != nil {
+			return page, err
+		}
+		tenants = append(tenants, id)
+	}
+	q := s.units.Queries()
+	params := sqlc.AdminRuntimeTargetsParams{TenantIds: tenants, Ascending: ascending, AfterID: pgtype.UUID{Valid: true}, PageLimit: int32(limit + 1)}
+	if after != "" {
+		var err error
+		params.AfterID, err = parseID(after)
+		if err != nil {
+			return page, sessions.ErrNotFound
+		}
+		params.AfterTime, err = q.AdminRuntimeCursor(ctx, sqlc.AdminRuntimeCursorParams{ID: params.AfterID, TenantIds: tenants})
+		if errors.Is(err, pgx.ErrNoRows) {
+			return page, sessions.ErrNotFound
+		}
+		if err != nil {
+			return page, err
+		}
+	}
+	rows, err := q.AdminRuntimeTargets(ctx, params)
+	if err != nil {
+		return page, err
+	}
+	page.HasMore = len(rows) > limit
+	if page.HasMore {
+		rows = rows[:limit]
+	}
+	for _, row := range rows {
+		page.Data = append(page.Data, sessions.AdminRuntimeTarget{SessionID: uuid.UUID(row.ID.Bytes).String(), TenantID: uuid.UUID(row.TenantID.Bytes).String()})
+	}
+	return page, nil
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/admin_test.go b/services/core/internal/persistence/postgres/sessionpg/admin_test.go
new file mode 100644
index 000000000..9d1e34609
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/admin_test.go
@@ -0,0 +1,63 @@
+package sessionpg
+
+import (
+	"errors"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+func TestListAdminRuntimeTargetsPagesLiveSessionsOfTenants(t *testing.T) {
+	pool := pgtest.Open(t)
+	store := New(pgunit.NewPool(pool), nil)
+	first, second, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
+	created := time.Now().UTC().Add(-time.Hour)
+	session := func(tenant string, offset time.Duration, deleted bool) sessions.AdminRuntimeTarget {
+		id := uuid.NewString()
+		exec(t, pool, `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash, created_at, deleted_at)
+			VALUES ($1, $2, 'codex', $5, 'hash', $3, CASE WHEN $4::boolean THEN clock_timestamp() END)`, id, tenant, created.Add(offset), deleted, id)
+		return sessions.AdminRuntimeTarget{SessionID: id, TenantID: tenant}
+	}
+	a := session(first, 0, false)
+	b := session(second, time.Second, false)
+	c := session(first, 2*time.Second, false)
+	deleted := session(first, 3*time.Second, true)
+	other := session(foreign, 4*time.Second, false)
+	tenants := []string{first, second}
+
+	page, err := store.ListAdminRuntimeTargets(t.Context(), tenants, "", 2, true)
+	if err != nil || !page.HasMore || !reflect.DeepEqual(page.Data, []sessions.AdminRuntimeTarget{a, b}) {
+		t.Fatalf("first ascending page = %+v, %v", page, err)
+	}
+	page, err = store.ListAdminRuntimeTargets(t.Context(), tenants, b.SessionID, 2, true)
+	if err != nil || page.HasMore || !reflect.DeepEqual(page.Data, []sessions.AdminRuntimeTarget{c}) {
+		t.Fatalf("second ascending page = %+v, %v", page, err)
+	}
+	page, err = store.ListAdminRuntimeTargets(t.Context(), tenants, "", 100, false)
+	if err != nil || page.HasMore || !reflect.DeepEqual(page.Data, []sessions.AdminRuntimeTarget{c, b, a}) {
+		t.Fatalf("descending page = %+v, %v", page, err)
+	}
+	page, err = store.ListAdminRuntimeTargets(t.Context(), []string{}, "", 20, false)
+	if err != nil || page.HasMore || page.Data == nil || len(page.Data) != 0 {
+		t.Fatalf("page without tenants = %+v, %v", page, err)
+	}
+	for _, after := range []string{deleted.SessionID, other.SessionID, "not-a-session"} {
+		if _, err := store.ListAdminRuntimeTargets(t.Context(), tenants, after, 20, false); !errors.Is(err, sessions.ErrNotFound) {
+			t.Fatalf("cursor %q: %v", after, err)
+		}
+	}
+	for _, limit := range []int{0, 101} {
+		if _, err := store.ListAdminRuntimeTargets(t.Context(), tenants, "", limit, false); !errors.Is(err, sessions.ErrInvalidInput) {
+			t.Fatalf("limit %d: %v", limit, err)
+		}
+	}
+	if _, err := store.ListAdminRuntimeTargets(t.Context(), []string{"not-a-tenant"}, "", 20, false); !errors.Is(err, sessions.ErrInvalidInput) {
+		t.Fatalf("malformed tenant: %v", err)
+	}
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/devices.go b/services/core/internal/persistence/postgres/sessionpg/devices.go
index 30b04e7f1..0db12ccb9 100644
--- a/services/core/internal/persistence/postgres/sessionpg/devices.go
+++ b/services/core/internal/persistence/postgres/sessionpg/devices.go
@@ -76,6 +76,29 @@ func (s *Store) GetDeviceCredential(ctx context.Context, device string) (runtime
 	}, true, nil
 }
 
+// ArchivedCancellationReceipt is a read-only exception for the exact already
+// authenticated delivery. The ordinary credential view remains revoked; this
+// cannot authorize bootstrap, reconnect, dispatch, workspace access or renewal.
+// A marker records that archive caused the first revocation; timestamps alone
+// cannot distinguish an earlier ordinary cancel/revoke followed by archive.
+func (s *Store) ArchivedCancellationReceipt(ctx context.Context, device, credentialHash string, runIDs []string) (runtimedevice.ArchivedCancellationReceipt, error) {
+	if len(runIDs) == 0 || credentialHash == "" {
+		return runtimedevice.ArchivedCancellationReceipt{}, nil
+	}
+	id, err := parseID(device)
+	if err != nil {
+		return runtimedevice.ArchivedCancellationReceipt{}, err
+	}
+	row, err := s.units.Queries().GetArchivedCancellationReceipt(ctx, sqlc.GetArchivedCancellationReceiptParams{DeviceID: id, CredentialHash: pgtype.Text{String: credentialHash, Valid: true}, RunIds: runIDs, LimitSeconds: int32(runtimedevice.ArchivedCancellationReceiptLimit.Seconds())})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return runtimedevice.ArchivedCancellationReceipt{}, nil
+	}
+	if err != nil {
+		return runtimedevice.ArchivedCancellationReceipt{}, err
+	}
+	return runtimedevice.ArchivedCancellationReceipt{RunID: uuid.UUID(row.ID.Bytes).String(), Deadline: row.CancelRequestedAt.Time.Add(runtimedevice.ArchivedCancellationReceiptLimit)}, nil
+}
+
 func (s *Store) ListEnrolledRuntimeBindings(ctx context.Context) ([]sessions.EnrolledRuntimeBinding, error) {
 	rows, err := s.units.Queries().ListEnrolledRuntimeBindings(ctx)
 	if err != nil {
diff --git a/services/core/internal/runtimehistory/postgresreader/reader.go b/services/core/internal/runtimehistory/postgresreader/reader.go
index 6c8672482..1011ec484 100644
--- a/services/core/internal/runtimehistory/postgresreader/reader.go
+++ b/services/core/internal/runtimehistory/postgresreader/reader.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"time"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/google/uuid"
@@ -15,6 +16,8 @@ import (
 const maximumRawSamples = 20_000
 const retention = 7 * 24 * time.Hour
 
+// sampleStore is the sample storage the Reader runs on: samples in Core, a
+// fake in the unit tests.
 type sampleStore interface {
 	InsertRuntimeHistorySample(context.Context, runtimeobs.ExportRecord) error
 	ListRuntimeHistorySamples(context.Context, string, string, string, int64, int64, int32) ([]runtimeobs.ExportRecord, error)
@@ -33,8 +36,16 @@ type Reader struct {
 	now          func() time.Time
 }
 
-func New(store sampleStore, config Config) (*Reader, error) {
-	if store == nil || config.QueryTimeout <= 0 || config.Capabilities.Validate() != nil || config.Capabilities.Retention != retention || config.Capabilities.MaximumRange > 24*time.Hour {
+// New builds the Runtime history backend on Core's database.
+func New(units *pgunit.Pool, config Config) (*Reader, error) {
+	if units == nil {
+		return nil, errors.New("invalid Runtime history PostgreSQL configuration")
+	}
+	return newReader(samples{units: units}, config)
+}
+
+func newReader(store sampleStore, config Config) (*Reader, error) {
+	if config.QueryTimeout <= 0 || config.Capabilities.Validate() != nil || config.Capabilities.Retention != retention || config.Capabilities.MaximumRange > 24*time.Hour {
 		return nil, errors.New("invalid Runtime history PostgreSQL configuration")
 	}
 	capabilities := config.Capabilities
diff --git a/services/core/internal/runtimehistory/postgresreader/reader_test.go b/services/core/internal/runtimehistory/postgresreader/reader_test.go
index e2fc8b28a..7d75176da 100644
--- a/services/core/internal/runtimehistory/postgresreader/reader_test.go
+++ b/services/core/internal/runtimehistory/postgresreader/reader_test.go
@@ -65,7 +65,7 @@ func testReader(t *testing.T, s *fakeStore, now time.Time) *Reader {
 	t.Helper()
 	caps := testCapabilities()
 	caps.Metrics = append(caps.Metrics, runtimehistory.MetricTokens)
-	r, err := New(s, Config{Capabilities: caps, QueryTimeout: time.Second})
+	r, err := newReader(s, Config{Capabilities: caps, QueryTimeout: time.Second})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/runtime_history.go b/services/core/internal/runtimehistory/postgresreader/samples.go
similarity index 72%
rename from services/core/internal/store/runtime_history.go
rename to services/core/internal/runtimehistory/postgresreader/samples.go
index 912db93ef..fb0302972 100644
--- a/services/core/internal/store/runtime_history.go
+++ b/services/core/internal/runtimehistory/postgresreader/samples.go
@@ -1,28 +1,34 @@
-package store
+package postgresreader
 
 import (
 	"context"
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
+// samples stores Runtime history samples in Core's database.
+type samples struct {
+	units *pgunit.Pool
+}
+
 // InsertRuntimeHistorySample copies a sanitized periodic observation. Public
 // Session/Turn Usage remains the accounting authority; these measured counters
 // are only sampled chart values. Deleted or mismatched owners cannot create orphan rows.
-func (s *Store) InsertRuntimeHistorySample(ctx context.Context, record runtimeobs.ExportRecord) error {
-	tenant, err := parseID(record.TenantID)
+func (s samples) InsertRuntimeHistorySample(ctx context.Context, record runtimeobs.ExportRecord) error {
+	tenant, err := pgunit.ParseID(record.TenantID)
 	if err != nil {
 		return err
 	}
-	session, err := parseID(record.SessionID)
+	session, err := pgunit.ParseID(record.SessionID)
 	if err != nil {
 		return err
 	}
-	environment, err := parseID(record.EnvironmentID)
+	environment, err := pgunit.ParseID(record.EnvironmentID)
 	if err != nil {
 		return err
 	}
@@ -31,7 +37,7 @@ func (s *Store) InsertRuntimeHistorySample(ctx context.Context, record runtimeob
 		ResolvedAtNs: record.ResolvedAt.UnixNano(), ProviderType: record.ProviderType, Status: string(record.Status),
 	}
 	if record.AllocationID != "" {
-		params.AllocationID, err = parseID(record.AllocationID)
+		params.AllocationID, err = pgunit.ParseID(record.AllocationID)
 		if err != nil {
 			return err
 		}
@@ -51,23 +57,23 @@ func (s *Store) InsertRuntimeHistorySample(ctx context.Context, record runtimeob
 		params.InputTokens = historyInteger(&usage.InputTokens)
 		params.OutputTokens = historyInteger(&usage.OutputTokens)
 	}
-	return s.queries.InsertRuntimeHistorySample(ctx, params)
+	return s.units.Queries().InsertRuntimeHistorySample(ctx, params)
 }
 
-func (s *Store) ListRuntimeHistorySamples(ctx context.Context, tenantID, sessionID, environmentID string, startNS, endNS int64, limit int32) ([]runtimeobs.ExportRecord, error) {
-	tenant, err := parseID(tenantID)
+func (s samples) ListRuntimeHistorySamples(ctx context.Context, tenantID, sessionID, environmentID string, startNS, endNS int64, limit int32) ([]runtimeobs.ExportRecord, error) {
+	tenant, err := pgunit.ParseID(tenantID)
 	if err != nil {
 		return nil, err
 	}
-	session, err := parseID(sessionID)
+	session, err := pgunit.ParseID(sessionID)
 	if err != nil {
 		return nil, err
 	}
-	environment, err := parseID(environmentID)
+	environment, err := pgunit.ParseID(environmentID)
 	if err != nil {
 		return nil, err
 	}
-	rows, err := s.queries.ListRuntimeHistorySamples(ctx, sqlc.ListRuntimeHistorySamplesParams{
+	rows, err := s.units.Queries().ListRuntimeHistorySamples(ctx, sqlc.ListRuntimeHistorySamplesParams{
 		TenantID: tenant, SessionID: session, EnvironmentID: environment, StartNs: startNS, EndNs: endNS, RowLimit: limit,
 	})
 	if err != nil {
@@ -103,12 +109,15 @@ func (s *Store) ListRuntimeHistorySamples(ctx context.Context, tenantID, session
 	return records, nil
 }
 
-func (s *Store) PruneRuntimeHistorySamples(ctx context.Context, beforeNS int64) (int64, error) {
-	count, err := s.queries.PruneRuntimeHistorySamples(ctx, beforeNS)
+// PruneRuntimeHistorySamples deletes one batch of expired Runtime samples and
+// one batch of expired node-host samples, which share the retention.
+func (s samples) PruneRuntimeHistorySamples(ctx context.Context, beforeNS int64) (int64, error) {
+	queries := s.units.Queries()
+	count, err := queries.PruneRuntimeHistorySamples(ctx, beforeNS)
 	if err != nil {
 		return count, err
 	}
-	nodes, err := s.queries.PruneNodeHostHistory(ctx, pgtype.Timestamptz{Time: time.Unix(0, beforeNS), Valid: true})
+	nodes, err := queries.PruneNodeHostHistory(ctx, pgtype.Timestamptz{Time: time.Unix(0, beforeNS), Valid: true})
 	return count + nodes, err
 }
 
diff --git a/services/core/internal/store/runtime_history_acceptance_test.go b/services/core/internal/runtimehistory/postgresreader/samples_test.go
similarity index 76%
rename from services/core/internal/store/runtime_history_acceptance_test.go
rename to services/core/internal/runtimehistory/postgresreader/samples_test.go
index fb496e743..9ba566f2c 100644
--- a/services/core/internal/store/runtime_history_acceptance_test.go
+++ b/services/core/internal/runtimehistory/postgresreader/samples_test.go
@@ -1,16 +1,14 @@
-package store_test
+package postgresreader
 
 import (
 	"context"
-	"encoding/json"
 	"testing"
 	"time"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory/postgresreader"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -20,26 +18,26 @@ func historyCapabilities() runtimehistory.Capabilities {
 		Retention: 7 * 24 * time.Hour, MinimumStep: 30 * time.Second, MaximumRange: 24 * time.Hour, MaximumPoints: 1000, MaximumSeries: 64, MaximumTotalPoints: 10000,
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory, runtimehistory.MetricTokens}}
 }
-func historyBackend(t *testing.T, s *store.Store) *postgresreader.Reader {
+func historyBackend(t *testing.T, pool *pgxpool.Pool) *Reader {
 	t.Helper()
-	r, err := postgresreader.New(s, postgresreader.Config{Capabilities: historyCapabilities(), QueryTimeout: 5 * time.Second})
+	r, err := New(pgunit.NewPool(pool), Config{Capabilities: historyCapabilities(), QueryTimeout: 5 * time.Second})
 	if err != nil {
 		t.Fatal(err)
 	}
 	return r
 }
-func historyOwner(t *testing.T, s *store.Store, pool *pgxpool.Pool) runtimehistory.Scope {
+
+// historyOwner seeds a Session of a fresh tenant with its Environment.
+func historyOwner(t *testing.T, pool *pgxpool.Pool) runtimehistory.Scope {
 	t.Helper()
-	tenant := uuid.NewString()
-	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"fixture-model"},"environment":{"type":"openai_hosted","workspace_directory":"/workspace","capability_directories":[]}}`)})
-	if err != nil {
+	scope := runtimehistory.Scope{TenantID: uuid.NewString(), SessionID: uuid.NewString(), EnvironmentID: uuid.NewString()}
+	if _, err := pool.Exec(t.Context(), `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash) VALUES ($1, $2, 'codex', 'key', 'hash')`, scope.SessionID, scope.TenantID); err != nil {
 		t.Fatal(err)
 	}
-	environment, err := sessionReads(pool).GetSessionEnvironment(t.Context(), tenant, session.ID)
-	if err != nil {
+	if _, err := pool.Exec(t.Context(), `INSERT INTO environments(id, session_id) VALUES ($1, $2)`, scope.EnvironmentID, scope.SessionID); err != nil {
 		t.Fatal(err)
 	}
-	return runtimehistory.Scope{TenantID: tenant, SessionID: session.ID, EnvironmentID: environment.ID}
+	return scope
 }
 func historyRecord(scope runtimehistory.Scope, allocation string, started, at time.Time, cpu float64, input uint64) runtimeobs.ExportRecord {
 	capacity := 2.0
@@ -56,10 +54,10 @@ func historyQuery(scope runtimehistory.Scope, start, end time.Time, points int)
 }
 
 func TestPostgresRuntimeHistoryAcceptance(t *testing.T) {
-	s, pool := store.NewTestStore(t)
-	scope := historyOwner(t, s, pool)
-	foreign := historyOwner(t, s, pool)
-	reader := historyBackend(t, s)
+	pool := pgtest.Open(t)
+	scope := historyOwner(t, pool)
+	foreign := historyOwner(t, pool)
+	reader := historyBackend(t, pool)
 	end := time.Now().UTC().Truncate(time.Second)
 	start := end.Add(-3 * time.Minute)
 	started := start.Add(-time.Minute + 123*time.Nanosecond)
@@ -101,7 +99,7 @@ func TestPostgresRuntimeHistoryAcceptance(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer freshPool.Close()
-	reader = historyBackend(t, store.New(freshPool))
+	reader = historyBackend(t, freshPool)
 	q := historyQuery(scope, start, end, 6)
 	result, err := reader.Query(t.Context(), q)
 	if err != nil {
@@ -129,17 +127,17 @@ func TestPostgresRuntimeHistoryAcceptance(t *testing.T) {
 			t.Fatal("scope isolation failed", got, err)
 		}
 	}
-	// Chart snapshots do not alter canonical Session Usage.
-	session, err := s.GetSession(t.Context(), scope.TenantID, scope.SessionID)
-	if err != nil || len(session.Usage) != 0 && string(session.Usage) != "null" {
-		t.Fatal("telemetry became accounting authority", string(session.Usage), err)
+	// Chart snapshots do not alter canonical Session Usage, which Turns carry.
+	var usage int
+	if err := pool.QueryRow(t.Context(), `SELECT count(*) FROM turns WHERE session_id = $1 AND token_usage IS NOT NULL`, scope.SessionID).Scan(&usage); err != nil || usage != 0 {
+		t.Fatal("telemetry became accounting authority", usage, err)
 	}
 }
 
 func TestPostgresRuntimeHistoryDenseReadAndBoundedRetention(t *testing.T) {
-	s, pool := store.NewTestStore(t)
-	scope := historyOwner(t, s, pool)
-	reader := historyBackend(t, s)
+	pool := pgtest.Open(t)
+	scope := historyOwner(t, pool)
+	reader := historyBackend(t, pool)
 	end := time.Now().UTC().Truncate(time.Second)
 	start := end.Add(-24 * time.Hour)
 	started := start.Add(-time.Hour + 987*time.Nanosecond)
@@ -171,7 +169,7 @@ func TestPostgresRuntimeHistoryDenseReadAndBoundedRetention(t *testing.T) {
 	}
 	// Expired rows remain invisible before physical pruning runs.
 	old := historyRecord(scope, base.AllocationID, started.Add(-8*24*time.Hour), start.Add(-8*24*time.Hour), 0, 1)
-	if err := s.InsertRuntimeHistorySample(t.Context(), old); err != nil {
+	if err := (samples{units: pgunit.NewPool(pool)}).InsertRuntimeHistorySample(t.Context(), old); err != nil {
 		t.Fatal(err)
 	}
 	_, err = pool.Exec(t.Context(), `INSERT INTO runtime_history_samples
@@ -206,9 +204,9 @@ func TestPostgresRuntimeHistoryDenseReadAndBoundedRetention(t *testing.T) {
 }
 
 func TestPostgresRuntimeHistoryKeepsProviderReportedUtilization(t *testing.T) {
-	s, pool := store.NewTestStore(t)
-	scope := historyOwner(t, s, pool)
-	reader := historyBackend(t, s)
+	pool := pgtest.Open(t)
+	scope := historyOwner(t, pool)
+	reader := historyBackend(t, pool)
 	allocation := uuid.NewString()
 	start := time.Now().UTC().Truncate(time.Minute).Add(-10 * time.Minute)
 	started := start.Add(-time.Minute)
@@ -228,3 +226,25 @@ func TestPostgresRuntimeHistoryKeepsProviderReportedUtilization(t *testing.T) {
 		t.Fatalf("bucket utilization = %v, want the mean of reported ratios", ratio)
 	}
 }
+
+// Retention also expires node-host samples and never deletes nodes.
+func TestNodeHostHistoryRetentionKeepsNode(t *testing.T) {
+	pool := pgtest.Open(t)
+	node := uuid.NewString()
+	if _, err := pool.Exec(t.Context(), `INSERT INTO runtime_nodes(id, installation_id, name, backend_fingerprint, credential_sha256, max_active, max_retained) VALUES ($1, $2, 'history', repeat('a', 64), repeat('b', 64), 1, 1)`, node, uuid.NewString()); err != nil {
+		t.Fatal(err)
+	}
+	now := time.Now().UTC()
+	for _, at := range []time.Time{now.Add(-8 * 24 * time.Hour), now.Add(-2 * time.Minute)} {
+		if _, err := pool.Exec(t.Context(), `INSERT INTO node_host_history_samples(node_id, observed_at) VALUES ($1, $2)`, node, at); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if _, err := historyBackend(t, pool).Prune(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	var expired, kept, nodes int
+	if err := pool.QueryRow(t.Context(), `SELECT count(*) FILTER (WHERE observed_at < $2), count(*) FILTER (WHERE observed_at >= $2), (SELECT count(*) FROM runtime_nodes WHERE id = $1) FROM node_host_history_samples WHERE node_id = $1`, node, now.Add(-7*24*time.Hour)).Scan(&expired, &kept, &nodes); err != nil || expired != 0 || kept != 1 || nodes != 1 {
+		t.Fatal("retention kept expired samples or removed recent ones or the node", expired, kept, nodes, err)
+	}
+}
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index 541b350f1..6b1ac416f 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -142,7 +142,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		Artifacts:       struct{ api.Artifacts }{},
 		ArtifactsReader: struct{ api.ArtifactsReader }{},
 		SessionAdmin:    s,
-		Environments:    struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, Admin: s, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{},
+		Environments:    struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, Admin: s, AdminRuntimeTargets: struct{ api.AdminRuntimeTargets }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{},
 		ExecutorConnections: struct{ api.ExecutorConnections }{},
 		Metrics:             struct{ api.Metrics }{}, RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
 		Execution: &api.Execution{
diff --git a/services/core/internal/sessions/admin.go b/services/core/internal/sessions/admin.go
new file mode 100644
index 000000000..c68310671
--- /dev/null
+++ b/services/core/internal/sessions/admin.go
@@ -0,0 +1,23 @@
+package sessions
+
+import "context"
+
+// AdminRuntimeTarget names a live Session whose Runtime an administrator
+// observes, with its tenant.
+type AdminRuntimeTarget struct{ SessionID, TenantID string }
+
+// AdminRuntimeTargetPage is one page of AdminRuntimeTargets.
+type AdminRuntimeTargetPage struct {
+	Data    []AdminRuntimeTarget
+	HasMore bool
+}
+
+// AdminReader reads the administrator's cross-Project Session views.
+type AdminReader interface {
+	// ListAdminRuntimeTargets pages the live Sessions of the tenants by
+	// creation time, then ID, ascending or descending, after the Session
+	// after. A limit outside 1 to 100 or a malformed tenant is
+	// ErrInvalidInput; an after Session that is malformed, deleted or
+	// outside the tenants is ErrNotFound.
+	ListAdminRuntimeTargets(ctx context.Context, tenants []string, after string, limit int, ascending bool) (AdminRuntimeTargetPage, error)
+}
diff --git a/services/core/internal/sessions/devices.go b/services/core/internal/sessions/devices.go
index b419c3983..417263183 100644
--- a/services/core/internal/sessions/devices.go
+++ b/services/core/internal/sessions/devices.go
@@ -65,6 +65,10 @@ type DeviceReader interface {
 	// authenticates a device with, and reports whether the device still has
 	// authority.
 	GetDeviceCredential(ctx context.Context, device string) (runtimedevice.Credential, bool, error)
+	// ArchivedCancellationReceipt reads the receipt window that archiving a
+	// Session leaves the device's exact authenticated delivery of one of
+	// runIDs; without one it is the zero receipt.
+	ArchivedCancellationReceipt(ctx context.Context, device, credentialHash string, runIDs []string) (runtimedevice.ArchivedCancellationReceipt, error)
 	// ListEnrolledRuntimeBindings lists the enrolled user-managed Runtimes of
 	// live Environments.
 	ListEnrolledRuntimeBindings(ctx context.Context) ([]EnrolledRuntimeBinding, error)
diff --git a/services/core/internal/sessions/reader.go b/services/core/internal/sessions/reader.go
index 5fe5d1e34..fe80400aa 100644
--- a/services/core/internal/sessions/reader.go
+++ b/services/core/internal/sessions/reader.go
@@ -1,8 +1,10 @@
 package sessions
 
-// Reader reads a Session's resources, Environment and devices, one family per
-// line. Callers use it directly; no use case forwards a read.
+// Reader reads a Session's resources, Environment and devices, and the
+// administrator's cross-Project Session views, one family per line. Callers
+// use it directly; no use case forwards a read.
 type Reader interface {
+	AdminReader
 	ArtifactReader
 	DeviceReader
 	EnvironmentReader
diff --git a/services/core/internal/store/admin_summary.go b/services/core/internal/store/admin_summary.go
index 43364b8e6..97fffd512 100644
--- a/services/core/internal/store/admin_summary.go
+++ b/services/core/internal/store/admin_summary.go
@@ -2,13 +2,11 @@ package store
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
 )
@@ -75,54 +73,6 @@ func (s *Store) ReadAdminSummary(ctx context.Context, tenantID string, filter Ad
 	return counts, err
 }
 
-type AdminRuntimeTarget struct{ SessionID, TenantID string }
-type AdminRuntimeTargetPage struct {
-	Data    []AdminRuntimeTarget
-	HasMore bool
-}
-
-func (s *Store) ListAdminRuntimeTargets(ctx context.Context, tenantIDs []string, after string, limit int, ascending bool) (AdminRuntimeTargetPage, error) {
-	page := AdminRuntimeTargetPage{Data: []AdminRuntimeTarget{}}
-	if limit < 1 || limit > 100 {
-		return page, sessions.ErrInvalidInput
-	}
-	tenants := make([]pgtype.UUID, 0, len(tenantIDs))
-	for _, value := range tenantIDs {
-		id, err := parseID(value)
-		if err != nil {
-			return page, err
-		}
-		tenants = append(tenants, id)
-	}
-	params := sqlc.AdminRuntimeTargetsParams{TenantIds: tenants, Ascending: ascending, AfterID: pgtype.UUID{Valid: true}, PageLimit: int32(limit + 1)}
-	if after != "" {
-		var err error
-		params.AfterID, err = parseID(after)
-		if err != nil {
-			return page, sessions.ErrNotFound
-		}
-		params.AfterTime, err = s.queries.AdminRuntimeCursor(ctx, sqlc.AdminRuntimeCursorParams{ID: params.AfterID, TenantIds: tenants})
-		if errors.Is(err, pgx.ErrNoRows) {
-			return page, sessions.ErrNotFound
-		}
-		if err != nil {
-			return page, err
-		}
-	}
-	rows, err := s.queries.AdminRuntimeTargets(ctx, params)
-	if err != nil {
-		return page, err
-	}
-	page.HasMore = len(rows) > limit
-	if page.HasMore {
-		rows = rows[:limit]
-	}
-	for _, row := range rows {
-		page.Data = append(page.Data, AdminRuntimeTarget{SessionID: uuid.UUID(row.ID.Bytes).String(), TenantID: uuid.UUID(row.TenantID.Bytes).String()})
-	}
-	return page, nil
-}
-
 func summaryTimestamp(value *time.Time) pgtype.Timestamptz {
 	if value == nil {
 		return pgtype.Timestamptz{}
diff --git a/services/core/internal/store/archive_cancellation_test.go b/services/core/internal/store/archive_cancellation_test.go
index 6a34f1f5f..3434dd0cb 100644
--- a/services/core/internal/store/archive_cancellation_test.go
+++ b/services/core/internal/store/archive_cancellation_test.go
@@ -87,7 +87,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			}
 			server := httptest.NewUnstartedServer(nil)
 			wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-			handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), s, wsURL)
+			handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), fixtureSessionStore(db), wsURL)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -199,11 +199,11 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			if dialErr == nil || response == nil || response.StatusCode != http.StatusUnauthorized {
 				t.Fatal("revoked Runtime reconnected")
 			}
-			drain, err := s.ArchivedCancellationReceipt(t.Context(), owner.DeviceID, secret, nil)
+			drain, err := fixtureSessionStore(db).ArchivedCancellationReceipt(t.Context(), owner.DeviceID, secret, nil)
 			if err != nil || drain.RunID != "" {
 				t.Fatal("unowned delivery got receipt permission", drain, err)
 			}
-			drain, err = s.ArchivedCancellationReceipt(t.Context(), owner.DeviceID, runtimedevice.HashCredential(secret), []string{input.TurnID})
+			drain, err = fixtureSessionStore(db).ArchivedCancellationReceipt(t.Context(), owner.DeviceID, runtimedevice.HashCredential(secret), []string{input.TurnID})
 			if err != nil || (drain.RunID == input.TurnID) == strings.Contains(scenario, "revoke") {
 				t.Fatal("archive revocation causality lost", drain, err)
 			}
diff --git a/services/core/internal/store/core_metrics.go b/services/core/internal/store/core_metrics.go
deleted file mode 100644
index e6e30dcbb..000000000
--- a/services/core/internal/store/core_metrics.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package store
-
-import (
-	"context"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-type CoreExecutionSnapshot struct {
-	QueuedTurns, WaitingForDaemon, InProgressTurns int64
-	OldestQueuedSeconds                            *float64
-}
-
-type CoreQueueWait struct{ P50, P95 *float64 }
-
-type CoreQueueWaitBucket struct {
-	Start time.Time
-	P95MS *float64
-}
-
-type CoreExecutionHistory struct {
-	Interrupted int64
-	QueueWaitMS CoreQueueWait
-	Buckets     []CoreQueueWaitBucket
-}
-
-// ReadCoreExecutionSnapshot counts persisted root Turns across the deployment.
-// WaitingForDaemon is the queued subset whose Session binding is absent from the
-// supplied live registry IDs; callers must distinguish an unavailable registry
-// from an observed empty one before using this method. Age is in seconds, and is
-// nil when the queue is empty. No Session deletion filter hides operational state.
-func (s *Store) ReadCoreExecutionSnapshot(ctx context.Context, now time.Time, connectedDeviceIDs []string) (CoreExecutionSnapshot, error) {
-	ids := make([]pgtype.UUID, 0, len(connectedDeviceIDs))
-	for _, value := range connectedDeviceIDs {
-		id, err := parseID(value)
-		if err != nil {
-			return CoreExecutionSnapshot{}, err
-		}
-		ids = append(ids, id)
-	}
-	row, err := s.queries.CoreExecutionSnapshot(ctx, sqlc.CoreExecutionSnapshotParams{
-		ConnectedDeviceIds: ids, ObservedAt: pgtype.Timestamptz{Time: now, Valid: true},
-	})
-	if err != nil {
-		return CoreExecutionSnapshot{}, err
-	}
-	result := CoreExecutionSnapshot{QueuedTurns: row.QueuedTurns, WaitingForDaemon: row.WaitingForDaemon, InProgressTurns: row.InProgressTurns}
-	if row.QueuedTurns > 0 {
-		result.OldestQueuedSeconds = &row.OldestQueuedSeconds
-	}
-	return result, nil
-}
-
-// ReadCoreExecutionHistory reads a bounded, repeatable read-only snapshot of root
-// Turn history. The interval is [start,end), with complete epoch-aligned buckets.
-// Interruptions use failed Turns' completed_at and execution_interrupted error
-// code. Queue waits use started_at-created_at in milliseconds, grouped by
-// started_at, including retained history of deleted Sessions. Counts of an empty
-// interval are zero; percentile values without observations are nil. Read errors
-// invalidate the entire result and must not be presented as measured zeros.
-func (s *Store) ReadCoreExecutionHistory(ctx context.Context, start, end time.Time, resolution time.Duration) (CoreExecutionHistory, error) {
-	span := end.Sub(start)
-	if resolution < time.Second || resolution%time.Second != 0 || span <= 0 || span > 7*24*time.Hour ||
-		span%resolution != 0 || span/resolution > 1008 || start.Nanosecond() != 0 || end.Nanosecond() != 0 ||
-		start.Unix()%int64(resolution/time.Second) != 0 || end.Unix()%int64(resolution/time.Second) != 0 {
-		return CoreExecutionHistory{}, sessions.ErrInvalidInput
-	}
-	result := CoreExecutionHistory{Buckets: make([]CoreQueueWaitBucket, int(span/resolution))}
-	for i := range result.Buckets {
-		result.Buckets[i].Start = start.Add(time.Duration(i) * resolution).UTC()
-	}
-	first, last := pgtype.Timestamptz{Time: start, Valid: true}, pgtype.Timestamptz{Time: end, Valid: true}
-	err := s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		var err error
-		result.Interrupted, err = q.CoreInterruptedTurns(ctx, sqlc.CoreInterruptedTurnsParams{RangeStart: first, RangeEnd: last})
-		if err != nil {
-			return err
-		}
-		wait, err := q.CoreQueueWaitSummary(ctx, sqlc.CoreQueueWaitSummaryParams{RangeStart: first, RangeEnd: last})
-		if err != nil {
-			return err
-		}
-		if wait.Samples > 0 {
-			result.QueueWaitMS = CoreQueueWait{P50: &wait.P50Ms, P95: &wait.P95Ms}
-		}
-		rows, err := q.CoreQueueWaitBuckets(ctx, sqlc.CoreQueueWaitBucketsParams{RangeStart: first, RangeEnd: last, ResolutionSeconds: int32(resolution / time.Second)})
-		if err != nil {
-			return err
-		}
-		for _, row := range rows {
-			if row.Samples > 0 {
-				result.Buckets[row.BucketNumber].P95MS = &row.P95Ms
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return CoreExecutionHistory{}, err
-	}
-	return result, nil
-}
-
-// ReadCoreDatabaseSize measures the current PostgreSQL database in bytes.
-func (s *Store) ReadCoreDatabaseSize(ctx context.Context) (int64, error) {
-	return s.queries.CoreDatabaseSize(ctx)
-}
diff --git a/services/core/internal/store/devices_test.go b/services/core/internal/store/devices_test.go
index 1e1d8f3e7..eacff7428 100644
--- a/services/core/internal/store/devices_test.go
+++ b/services/core/internal/store/devices_test.go
@@ -124,7 +124,7 @@ func TestStandaloneGatewayUsesExecutionCredentials(t *testing.T) {
 	_, foreignSecret := registerTestDevice(t, s, uuid.NewString())
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-	handler, registry, err := runtime.NewGateway(sessionAdapter(s), sessionService(t, s), s, wsURL)
+	handler, registry, err := runtime.NewGateway(sessionAdapter(s), sessionService(t, s), sessionAdapter(s), wsURL)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/dispatch_test.go b/services/core/internal/store/dispatch_test.go
index cb8fbe2a5..112b42b3a 100644
--- a/services/core/internal/store/dispatch_test.go
+++ b/services/core/internal/store/dispatch_test.go
@@ -88,7 +88,7 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 	}
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-	server.Config.Handler, h.registry, err = runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), s, wsURL)
+	server.Config.Handler, h.registry, err = runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), fixtureSessionStore(db), wsURL)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/node_host_history_test.go b/services/core/internal/store/node_host_history_test.go
deleted file mode 100644
index 43bdcc818..000000000
--- a/services/core/internal/store/node_host_history_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package store
-
-import (
-	"testing"
-	"time"
-)
-
-// Retention uses the Runtime history cleanup operation and never deletes nodes.
-func TestNodeHostHistoryRetentionKeepsNode(t *testing.T) {
-	s, _, d := managerFixture(t, 2, 8)
-	now := time.Now().UTC()
-	for _, at := range []time.Time{now.Add(-8 * 24 * time.Hour), now.Add(-2 * time.Minute)} {
-		if _, err := s.pool.Exec(t.Context(), "INSERT INTO node_host_history_samples(node_id, observed_at) VALUES($1,$2)", d.LocalNodeID, at); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if n, err := s.PruneRuntimeHistorySamples(t.Context(), now.Add(-7*24*time.Hour).UnixNano()); err != nil || n != 1 {
-		t.Fatal(n, err)
-	}
-	if _, err := deploymentService(t, s).NodeDetail(t.Context(), d.LocalNodeID, "1h"); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/services/core/internal/store/public_handler_fixture_test.go b/services/core/internal/store/public_handler_fixture_test.go
index 82da7f7e6..b04fa9f73 100644
--- a/services/core/internal/store/public_handler_fixture_test.go
+++ b/services/core/internal/store/public_handler_fixture_test.go
@@ -93,7 +93,7 @@ func publicHandler(t testing.TB, s *store.Store, db fixtureDB, keys fixtureKeyRe
 		Subagents:       sessionStore,
 		Artifacts:       sessionService,
 		ArtifactsReader: sessionStore,
-		SessionAdmin:    s, Environments: sessionService, EnvironmentsReader: sessionStore, Admin: s, AdminAudit: audit, WriteAudit: audit,
+		SessionAdmin:    s, Environments: sessionService, EnvironmentsReader: sessionStore, Admin: s, AdminRuntimeTargets: sessionStore, AdminAudit: audit, WriteAudit: audit,
 		ExecutorConnections: strict, Metrics: strict, RuntimeObservations: strict, RuntimeHistory: strict,
 	}
 	for _, c := range configure {
diff --git a/services/core/internal/store/runtime_cancellation.go b/services/core/internal/store/runtime_cancellation.go
deleted file mode 100644
index 6f14db569..000000000
--- a/services/core/internal/store/runtime_cancellation.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// ArchivedCancellationReceipt is a read-only exception for the exact already
-// authenticated delivery. The ordinary credential view remains revoked; this
-// cannot authorize bootstrap, reconnect, dispatch, workspace access or renewal.
-// A marker records that archive caused the first revocation; timestamps alone
-// cannot distinguish an earlier ordinary cancel/revoke followed by archive.
-func (s *Store) ArchivedCancellationReceipt(ctx context.Context, deviceID, credentialHash string, runIDs []string) (runtimedevice.ArchivedCancellationReceipt, error) {
-	if len(runIDs) == 0 || credentialHash == "" {
-		return runtimedevice.ArchivedCancellationReceipt{}, nil
-	}
-	id, err := parseID(deviceID)
-	if err != nil {
-		return runtimedevice.ArchivedCancellationReceipt{}, err
-	}
-	row, err := s.queries.GetArchivedCancellationReceipt(ctx, sqlc.GetArchivedCancellationReceiptParams{DeviceID: id, CredentialHash: pgtype.Text{String: credentialHash, Valid: true}, RunIds: runIDs, LimitSeconds: int32(runtimedevice.ArchivedCancellationReceiptLimit.Seconds())})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return runtimedevice.ArchivedCancellationReceipt{}, nil
-	}
-	if err != nil {
-		return runtimedevice.ArchivedCancellationReceipt{}, err
-	}
-	return runtimedevice.ArchivedCancellationReceipt{RunID: uuid.UUID(row.ID.Bytes).String(), Deadline: row.CancelRequestedAt.Time.Add(runtimedevice.ArchivedCancellationReceiptLimit)}, nil
-}
diff --git a/services/core/internal/store/runtime_connection_test.go b/services/core/internal/store/runtime_connection_test.go
index 088ff0eea..de89b8fe9 100644
--- a/services/core/internal/store/runtime_connection_test.go
+++ b/services/core/internal/store/runtime_connection_test.go
@@ -25,7 +25,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	tenant, session, environment := managedSession(t, s, db)
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-	handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), s, wsURL)
+	handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), fixtureSessionStore(db), wsURL)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/runtime_enrollment_connection_test.go b/services/core/internal/store/runtime_enrollment_connection_test.go
index aea56cc8c..fde167d43 100644
--- a/services/core/internal/store/runtime_enrollment_connection_test.go
+++ b/services/core/internal/store/runtime_enrollment_connection_test.go
@@ -47,7 +47,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	}
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-	handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), s, wsURL)
+	handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), fixtureSessionStore(db), wsURL)
 	if err != nil {
 		t.Fatal(err)
 	}

From d0a19f94b0135188a8f5bce60a24527b3db189a7 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 01:22:00 +0800
Subject: [PATCH 05/60] Move Turn transitions and completion into sessions
 (#434)

* Move Turn transitions and completion into sessions

* Type Session model execution errors and run the Turn journal through WithTurns

SessionModelExecution returns sessions.ErrNotFound for a Session without a
frozen provider, credentialcrypto.ErrUnavailable without the credential key,
and wraps the cipher error. AppendTurnEvents runs through WithTurns, so
WithTurnJournal and the JournalExecution port are gone. Tests drop the partial
Reader fake, the shadowed ApplyTurnStatus fake and an unused store export, and
the lease test moves Turns through the leased operations.
---
 services/core/IMPLEMENTATION.md               |   6 +-
 services/core/cmd/server/main.go              |   2 +-
 .../native_classification_integration_test.go |   8 +-
 .../session_diagnostics_public_compat_test.go |  28 +-
 .../internal/api/session_diagnostics_test.go  |   8 +-
 .../archive_cancellation_cleanup_test.go      |  10 +-
 services/core/internal/execution/artifacts.go |   4 +-
 services/core/internal/execution/delivery.go  |   4 +-
 .../deployment_provider_observations_test.go  |  11 +-
 .../core/internal/execution/dispatcher.go     |   8 +-
 .../execution/executor_preparation.go         |   2 +-
 services/core/internal/execution/functions.go |   7 +-
 .../internal/execution/model_execution.go     |   6 +-
 .../execution/model_execution_test.go         |  11 +-
 .../core/internal/execution/owner_test.go     |   9 +-
 .../internal/execution/prepared_dispatch.go   |   2 +-
 services/core/internal/execution/worker.go    |   8 +-
 .../core/internal/execution/worker_device.go  |   6 +-
 .../internal/execution/worker_schedule.go     |   4 +-
 .../persistence/postgres/sessionpg/binding.go |   6 +-
 .../persistence/postgres/sessionpg/devices.go |  54 +++-
 .../postgres/sessionpg/execution_journal.go   |  24 --
 .../postgres/sessionpg/execution_turns.go     |  80 +++++
 .../sessionpg/execution_turns_test.go         | 206 ++++++++++++
 .../postgres/sessionpg/functions.go           |  15 -
 .../postgres/sessionpg/model_execution.go     |  54 ++++
 .../postgres/sessionpg/turn_reads.go          | 119 +++++++
 .../providers/configuration_flow_test.go      |   2 +-
 services/core/internal/sessions/devices.go    |   8 +
 services/core/internal/sessions/doc.go        |  12 +-
 services/core/internal/sessions/execution.go  |   2 +-
 .../internal/sessions/execution_functions.go  |  13 +-
 .../sessions/execution_functions_test.go      |  24 +-
 .../internal/sessions/execution_journal.go    |  30 --
 .../core/internal/sessions/execution_turns.go | 306 ++++++++++++++++++
 .../internal/sessions/execution_turns_test.go | 294 +++++++++++++++++
 .../core/internal/sessions/functions_test.go  |   6 -
 .../core/internal/sessions/journal_test.go    |   2 +-
 .../core/internal/sessions/model_execution.go |  16 +
 services/core/internal/sessions/reader.go     |   2 +
 .../internal/sessions/transaction_test.go     |  32 +-
 services/core/internal/sessions/turn.go       |  22 ++
 .../store/admin_session_archive_test.go       |   2 +-
 .../admin_session_archive_worker_http_test.go |   2 +-
 .../agent_execution_defaults_http_test.go     |   4 +-
 .../store/archive_cancellation_test.go        |   2 +-
 .../core/internal/store/artifact_lifecycle.go |  48 ---
 .../internal/store/claude_execution_test.go   |  10 +-
 .../core/internal/store/claude_mcp_test.go    |   5 +-
 .../internal/store/command_output_test.go     |   4 +-
 .../deployment_model_providers_http_test.go   |   8 +-
 services/core/internal/store/devices.go       |  44 ---
 services/core/internal/store/dispatch_test.go |  15 +-
 .../store/environment_claim_worker_test.go    |   5 +-
 .../store/environment_directory_test.go       |   3 +-
 .../store/environment_expiry_dispatch_test.go |   2 +-
 .../store/environment_input_activity_test.go  |   2 +-
 .../store/environment_input_claim_test.go     |   2 +-
 .../core/internal/store/environment_inputs.go |   7 +-
 .../internal/store/environment_setup_test.go  |   2 +-
 .../store/environment_steering_order_test.go  |   6 +-
 .../store/environment_worker_helpers_test.go  |   2 +-
 .../internal/store/execution_events_test.go   |   2 +-
 .../core/internal/store/execution_test.go     |  55 +++-
 services/core/internal/store/export_test.go   |   9 +
 .../store/function_execution_native_test.go   |   2 +-
 .../internal/store/function_execution_test.go |   4 +-
 .../store/function_images_native_test.go      |   4 +-
 .../store/function_inputs_public_test.go      |   6 +-
 .../internal/store/function_inputs_test.go    |   4 +-
 .../store/function_public_native_test.go      |   2 +-
 .../store/function_state_public_test.go       |   4 +-
 .../internal/store/function_state_test.go     |   4 +-
 .../store/function_stream_native_test.go      |   2 +-
 .../internal/store/function_worker_test.go    |   2 +-
 .../internal/store/harness_onboarding_test.go |   5 +-
 .../core/internal/store/input_batches_test.go |   6 +-
 .../store/input_conflicts_public_test.go      |   4 +-
 .../store/item_order_migration_test.go        |   2 +-
 .../core/internal/store/item_order_test.go    |   6 +-
 .../core/internal/store/item_reads_test.go    |  16 +-
 .../internal/store/list_cursor_public_test.go |   4 +-
 .../store/local_environment_devices_test.go   |   2 +-
 .../store/local_environment_worker_test.go    |   4 +-
 .../store/mcode_public_native_test.go         |   9 +-
 .../mcp_credential_selection_public_test.go   |   2 +-
 .../store/message_images_native_test.go       |   6 +-
 .../store/model_protocol_native_test.go       |   4 +-
 .../internal/store/native_environment_test.go |   4 +-
 .../internal/store/native_recovery_test.go    |   4 +-
 .../internal/store/no_environment_test.go     |   2 +-
 .../store/prepared_dispatch_failure_test.go   |   2 +-
 .../internal/store/prepared_dispatch_test.go  |   4 +-
 .../internal/store/public_execution_test.go   |   6 +-
 .../store/public_handler_fixture_test.go      |   2 +-
 .../runtime_capabilities_pending_test.go      |   2 +-
 .../internal/store/runtime_enrollment_test.go |   2 +-
 .../internal/store/runtime_idle_clock_test.go |  16 +-
 .../internal/store/runtime_initialization.go  |  25 --
 .../store/runtime_initialization_test.go      |   4 +-
 .../runtime_suspension_concurrency_test.go    |   6 +-
 .../store/runtime_worker_recovery_test.go     |   4 +-
 .../store/sandbox_deployment_switch_test.go   |   4 +-
 services/core/internal/store/scheduling.go    |  55 +---
 .../store/self_hosted_cancel_public_test.go   |   5 +-
 .../store/session_artifacts_public_test.go    |   2 +-
 .../internal/store/session_artifacts_test.go  |   6 +-
 .../store/session_creation_identity_test.go   |   6 +-
 .../store/session_creation_stream_test.go     |   2 +-
 .../store/session_deletion_execution_test.go  |   7 +-
 .../session_deletion_lifecycle_public_test.go |   4 +-
 .../internal/store/session_deletion_test.go   |  12 +-
 .../internal/store/session_diagnostics.go     |   2 +-
 .../store/session_diagnostics_test.go         |   4 +-
 .../internal/store/session_events_test.go     |   4 +-
 .../internal/store/session_metadata_test.go   |   4 +-
 .../internal/store/session_model_execution.go |  32 --
 .../store/session_model_execution_test.go     |  10 +-
 .../store/session_model_options_test.go       |   4 +-
 .../store/structured_output_dispatch_test.go  |   2 +-
 .../store/structured_output_native_test.go    |   6 +-
 .../store/subagent_identities_test.go         |   2 +-
 .../store/subagent_native_outputs_test.go     |   4 +-
 .../internal/store/subagent_resources_test.go |   8 +-
 .../store/subagent_visibility_public_test.go  |   7 +-
 .../store/token_usage_integration_test.go     |  22 +-
 .../internal/store/tool_policy_native_test.go |   7 +-
 .../internal/store/tool_search_native_test.go |   6 +-
 .../core/internal/store/turn_completion.go    | 105 ------
 .../core/internal/store/turn_events_test.go   |  10 +-
 services/core/internal/store/turn_inputs.go   |   6 +-
 .../core/internal/store/turn_inputs_test.go   |  15 +-
 .../internal/store/turn_journal_reads_test.go |   2 +-
 services/core/internal/store/turn_reads.go    |  49 ---
 .../core/internal/store/turn_reads_test.go    |  71 ----
 services/core/internal/store/turns.go         | 116 -------
 services/core/internal/store/turns_test.go    |  68 +---
 .../unified_model_configuration_http_test.go  |   3 +-
 .../internal/store/worker_capacity_test.go    |   7 +-
 .../internal/store/worker_input_race_test.go  |   2 +-
 .../internal/store/worker_lease_loss_test.go  |   6 +-
 services/core/tests/fixtures/items.go         |  23 +-
 services/core/tests/fixtures/main.go          |   4 +-
 143 files changed, 1615 insertions(+), 1000 deletions(-)
 delete mode 100644 services/core/internal/persistence/postgres/sessionpg/execution_journal.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/execution_turns.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/execution_turns_test.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/model_execution.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/turn_reads.go
 delete mode 100644 services/core/internal/sessions/execution_journal.go
 create mode 100644 services/core/internal/sessions/execution_turns.go
 create mode 100644 services/core/internal/sessions/execution_turns_test.go
 create mode 100644 services/core/internal/sessions/model_execution.go
 delete mode 100644 services/core/internal/store/artifact_lifecycle.go
 delete mode 100644 services/core/internal/store/devices.go
 delete mode 100644 services/core/internal/store/runtime_initialization.go
 delete mode 100644 services/core/internal/store/turn_completion.go
 delete mode 100644 services/core/internal/store/turn_reads.go
 delete mode 100644 services/core/internal/store/turn_reads_test.go
 delete mode 100644 services/core/internal/store/turns.go

diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 29e210fc0..2254cb2de 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -16,9 +16,9 @@ Two errors are shared across domains, each with one `api` helper: `textvalue.Err
 
 Shared vocabulary has one owner each, and domains use it rather than copy it. `internal/environmentconfig` owns Environment setup, Skills, Plugins and initial files with their validation and public metadata; `Setup.Validate` checks requested configuration, where a Skill may be an unresolved reference, and `Setup.ValidateInstalled` checks frozen, installable configuration. `internal/skills` owns `ParseVersion`, the canonical positive decimal Skill version. `internal/metadata` owns the metadata rules: `Validate` for the pair, key and value limits and U+0000, `ValidateStorable` for U+0000 alone, and `Encode` with its 64 KiB bound. `internal/jsonobject` owns `Normalize`, the stable encoding of stored JSON objects that snapshots and retry identities compare. These packages import no persistence.
 
-`internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitFunctionResult` saves a submitted function result for its Turn's call, and `LoadRequiredActions` lists the calls a Turn waits on. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call operation loads the Turn and its call in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. Neither imports persistence. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
+`internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitFunctionResult` saves a submitted function result for its Turn's call, `LoadRequiredActions` lists the calls a Turn waits on, and `TransitionTurn` moves a root Turn's status as its current status allows and settles a Turn that ends. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call and Turn operation loads the Turn in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. Neither imports persistence. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
 
-Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice`, in that transaction; `LoadEnvironment`, which reads the tenant's Environment of a live Session; and `CreateSessionEnvironment`, which stores the Environment of a Session being created. The other `sessionpg` exports serve `store` until the Session operations leave it. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` and `BindSession` stay exported after store goes; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
+Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; `LoadEnvironment`, which reads the tenant's Environment of a live Session; and `CreateSessionEnvironment`, which stores the Environment of a Session being created. The other `sessionpg` exports serve `store` until the Session operations leave it. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` and `BindSession` stay exported after store goes; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
 
 `store` is transitional. `store.New` builds a pooled Store, and `store.NewExecution(s, lease)` builds the execution writer on a lease it borrows. An execution-only operation on a pooled Store fails with `store.ErrExecutionAuthority`. New adapters do not copy that check: their execution repositories require a `*pgunit.Lease` at construction, their public repositories expose no execution operation, and the check goes away with `store`.
 
@@ -36,7 +36,7 @@ Domain owners, each with its PostgreSQL adapter under `internal/persistence/post
 - `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and to `store`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other reader is `store`: Session creation decides admission and placement with those rules and `placementpg` inside its own transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. The reset's Session archive stays in `store`.
 - `coremetrics` (`coremetricspg`): the Core metrics PostgreSQL holds: the root Turn queue counts, the root Turn history, read from one read-only snapshot, and the database size. `cmd/server`'s Core metrics source adds them to the process, pool, Worker and daemon registry measurements.
 - `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples.
-- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the Sessions whose Runtime the administrator observes across Projects, executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
+- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover Turns (their reads and the execution work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the Sessions whose Runtime the administrator observes across Projects, executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
 
 ## Request handling
 
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index ecbb7f82c..6cf3a08ad 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -406,7 +406,7 @@ func run() error {
 		Sessions:        executionStore,
 		SessionCreation: executionStore,
 		SessionEvents:   executionStore,
-		Turns:           executionStore,
+		Turns:           sessionStore,
 		Items:           sessionStore,
 		Subagents:       sessionStore,
 		Artifacts:       sessionService,
diff --git a/services/core/internal/api/native_classification_integration_test.go b/services/core/internal/api/native_classification_integration_test.go
index e9dcde9df..5b0a4530a 100644
--- a/services/core/internal/api/native_classification_integration_test.go
+++ b/services/core/internal/api/native_classification_integration_test.go
@@ -26,18 +26,14 @@ func TestNativeClassificationPostgresRoundTripAndPublicPrivacy(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			if _, err = s.TransitionTurn(t.Context(), tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
-				t.Fatal(err)
-			}
+			transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 			status := 503
 			result := execution.Result{ErrorCode: "engine_failed", Error: "Bearer secret-canary https://private.example/key", EngineErrorCode: code, EngineHTTPStatus: &status, Done: proto.DonePayload{Usage: proto.Usage{InputTokens: 7, OutputTokens: 3}, Metadata: map[string]any{proto.DoneMetaAgentSessionID: "native-secret-canary"}}}
 			outcome, err := json.Marshal(result)
 			if err != nil {
 				t.Fatal(err)
 			}
-			if _, err = s.TransitionTurn(t.Context(), tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: outcome}); err != nil {
-				t.Fatal(err)
-			}
+			transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: outcome})
 			snap, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 			if err != nil {
 				t.Fatal(err)
diff --git a/services/core/internal/api/session_diagnostics_public_compat_test.go b/services/core/internal/api/session_diagnostics_public_compat_test.go
index 3f8e5aa7a..6910ec7db 100644
--- a/services/core/internal/api/session_diagnostics_public_compat_test.go
+++ b/services/core/internal/api/session_diagnostics_public_compat_test.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -8,6 +9,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
@@ -66,8 +68,30 @@ func diagnosticRequest(handler http.Handler, path, token string) *httptest.Respo
 // Item reads from the Session adapter on pool.
 func databaseSessionReads(s *store.Store, pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
 	return func(d *Dependencies, _ *testFakes) {
-		d.Sessions, d.Turns, d.SessionAdmin = s, s, s
-		d.Items = sessionpg.New(pgunit.NewPool(pool), nil)
+		d.Sessions, d.SessionAdmin = s, s
+		reads := sessionpg.New(pgunit.NewPool(pool), nil)
+		d.Items, d.Turns = reads, reads
+	}
+}
+
+// transitionTurn moves the Turn as the execution owner does, over a pooled
+// Session transaction.
+func transitionTurn(t *testing.T, pool *pgxpool.Pool, tenant, session, turn string, transition sessions.TurnTransition) {
+	t.Helper()
+	tenantID, err := pgunit.ParseID(tenant)
+	if err != nil {
+		t.Fatal(err)
+	}
+	sessionID, err := pgunit.ParseID(session)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = sessionpg.WithSession(t.Context(), pgunit.NewPool(pool), tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, _ sessions.LockedSession) error {
+		_, err := sessions.TransitionTurn(ctx, sessionpg.BindSession(q, tenantID, sessionID), turn, transition)
+		return err
+	})
+	if err != nil {
+		t.Fatal(err)
 	}
 }
 
diff --git a/services/core/internal/api/session_diagnostics_test.go b/services/core/internal/api/session_diagnostics_test.go
index 572cf8c1a..8fc433ae0 100644
--- a/services/core/internal/api/session_diagnostics_test.go
+++ b/services/core/internal/api/session_diagnostics_test.go
@@ -23,12 +23,8 @@ func TestDiagnosticsCoreHandlerDatabaseBoundary(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = s.TransitionTurn(t.Context(), tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
-		t.Fatal(err)
-	}
-	if _, err = s.TransitionTurn(t.Context(), tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"device_disconnected","error":"Bearer raw-secret-canary https://private.example/key","done":{"native_id":"secret-native-canary"}}`)}); err != nil {
-		t.Fatal(err)
-	}
+	transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"device_disconnected","error":"Bearer raw-secret-canary https://private.example/key","done":{"native_id":"secret-native-canary"}}`)})
 	base := adminSessionsPath + session.ID
 	for _, path := range []string{base + "/diagnostics", base + "/turns/" + receipt.TurnID + "/diagnostics"} {
 		if w := diagnosticRequest(h, path, ""); w.Code != 401 {
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index 21a4a3916..eda95d545 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -99,7 +99,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			// This fixture isolates lifecycle ordering. Protocol-driven waiting is
 			// independently exercised in TestArchiveWaitingCancellationReceipts.
 			for _, transition := range []sessions.TurnTransition{{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}, {ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnWaiting}} {
-				if _, err := writer.TransitionTurn(t.Context(), project.TenantID, session.ID, input.TurnID, transition); err != nil {
+				if _, err := leased.Sessions.TransitionTurn(t.Context(), project.TenantID, session.ID, input.TurnID, transition); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -155,11 +155,12 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
+			sessionReader, _ := testSessions(t, pool, testCredentialCipher(t))
 			kills := 0
 			expectedStatus := sessions.TurnWaiting
 			provider := waitingCleanupProvider{beforeKill: func() {
 				kills++
-				turn, err := s.GetTurn(t.Context(), project.TenantID, session.ID, input.TurnID)
+				turn, err := sessionReader.GetTurn(t.Context(), project.TenantID, session.ID, input.TurnID)
 				if err != nil || turn.Status != expectedStatus || turn.CancelRequestedAt.IsZero() || (turn.CompletedAt.IsZero() != (expectedStatus == sessions.TurnWaiting)) {
 					t.Fatal("cleanup observed unexpected terminal state", turn, err)
 				}
@@ -168,7 +169,6 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 					t.Fatal("Kill bypassed durable cleanup ownership", allocation, err)
 				}
 			}}
-			sessionReader, _ := testSessions(t, pool, testCredentialCipher(t))
 			lifecycle := &runtimeLifecycle{store: writer, sessions: sessionReader, sessionExecution: leased.Sessions, deployment: leased.Deployment, deployments: deployments, reader: reader, lease: leased.Lease, registry: registry, config: RuntimeProvider{InstallationID: installation, Provider: provider}, connections: map[string]*runtimeConnection{}}
 			if checkpoint {
 				lifecycle.config.Provider = waitingCleanupCheckpoint{beforeKill: provider.beforeKill}
@@ -185,7 +185,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 					t.Fatal(pending, err)
 				}
 				// Controlled terminal receipt fixture; no native cancellation claim.
-				if _, err := writer.TransitionTurn(t.Context(), project.TenantID, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnCancelled}); err != nil {
+				if _, err := leased.Sessions.TransitionTurn(t.Context(), project.TenantID, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnCancelled}); err != nil {
 					t.Fatal(err)
 				}
 				expectedStatus = sessions.TurnCancelled
@@ -197,7 +197,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if err != nil || after.State != "released" || kills != 1 {
 				t.Fatal("cleanup did not release", after, kills, err)
 			}
-			turn, err := s.GetTurn(t.Context(), project.TenantID, session.ID, input.TurnID)
+			turn, err := sessionReader.GetTurn(t.Context(), project.TenantID, session.ID, input.TurnID)
 			if err != nil || turn.Status != expectedStatus || (turn.CompletedAt.IsZero() != (expectedStatus == sessions.TurnWaiting)) {
 				t.Fatal("cleanup should not fabricate cancellation", turn, err)
 			}
diff --git a/services/core/internal/execution/artifacts.go b/services/core/internal/execution/artifacts.go
index 203f5ada1..f1aa98504 100644
--- a/services/core/internal/execution/artifacts.go
+++ b/services/core/internal/execution/artifacts.go
@@ -17,7 +17,7 @@ func (d *Dispatcher) captureCompletedArtifacts(ctx context.Context, peer *runtim
 	}
 	owner, cancel := context.WithTimeout(ctx, 180*time.Second)
 	defer cancel()
-	err := d.Store.BeginTurnArtifactCapture(owner, session.TenantID, session.ID, turnID, result.AppliedThrough)
+	err := d.sessionExecution.BeginTurnArtifactCapture(owner, session.TenantID, session.ID, turnID, result.AppliedThrough)
 	if err == nil {
 		err = d.withPreparedWorkspace(owner, peer, session, environment, bound, func(ctx context.Context, handle string) error {
 			return peer.ExportWorkspaceOutputs(ctx, proto.WorkspaceExportPayload{Handle: handle, EnvironmentID: environment.ID}, func(body io.Reader) error {
@@ -36,7 +36,7 @@ func (d *Dispatcher) captureCompletedArtifacts(ctx context.Context, peer *runtim
 	status = sessions.TurnFailed
 	check, stop := context.WithTimeout(context.Background(), 5*time.Second)
 	defer stop()
-	if turn, err := d.Store.GetTurn(check, session.TenantID, session.ID, turnID); err == nil && !turn.CancelRequestedAt.IsZero() {
+	if turn, err := d.SessionsReader.GetTurn(check, session.TenantID, session.ID, turnID); err == nil && !turn.CancelRequestedAt.IsZero() {
 		status = sessions.TurnCancelled
 	}
 	return result, status
diff --git a/services/core/internal/execution/delivery.go b/services/core/internal/execution/delivery.go
index a9c2ea6d6..ab20d7d7c 100644
--- a/services/core/internal/execution/delivery.go
+++ b/services/core/internal/execution/delivery.go
@@ -105,7 +105,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 	var pending *pendingInput
 	var cancelSent time.Time
 	var cancelReply <-chan cancellationResult
-	functions := &functionExchange{kind: request.AgentKind, store: d.Store, sessions: d.sessionExecution, tenant: tenantID, session: sessionID, turn: request.RunID, tools: request.FunctionTools}
+	functions := &functionExchange{kind: request.AgentKind, turns: d.SessionsReader, sessions: d.sessionExecution, tenant: tenantID, session: sessionID, turn: request.RunID, tools: request.FunctionTools}
 	done := false
 	cancelCtx, stopCancellation := context.WithCancel(ctx)
 	defer stopCancellation()
@@ -278,7 +278,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 				}
 				continue
 			}
-			turn, err := d.Store.GetTurn(ctx, tenantID, sessionID, request.RunID)
+			turn, err := d.SessionsReader.GetTurn(ctx, tenantID, sessionID, request.RunID)
 			if err != nil {
 				result.ErrorCode = "execution_state_unavailable"
 				if ctx.Err() != nil {
diff --git a/services/core/internal/execution/deployment_provider_observations_test.go b/services/core/internal/execution/deployment_provider_observations_test.go
index 2816644ea..fa11d22b2 100644
--- a/services/core/internal/execution/deployment_provider_observations_test.go
+++ b/services/core/internal/execution/deployment_provider_observations_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
@@ -24,7 +25,7 @@ import (
 
 type finishObservationFixture struct {
 	s          *store.Store
-	writer     *store.Store
+	execution  *sessions.ExecutionOperations
 	lease      Ownership
 	pool       *pgxpool.Pool
 	defaults   *modelconfigurationpg.Store
@@ -77,7 +78,7 @@ func newFinishObservationFixture(t *testing.T, maxConnections int32) finishObser
 	if err != nil {
 		t.Fatal(err)
 	}
-	return finishObservationFixture{s, owner.Store, owner.Lease, pool, defaults, tenant, session, *dispatcher}
+	return finishObservationFixture{s, owner.Sessions, owner.Lease, pool, defaults, tenant, session, *dispatcher}
 }
 func (f finishObservationFixture) start(t *testing.T) sessions.InputReceipt {
 	t.Helper()
@@ -85,7 +86,7 @@ func (f finishObservationFixture) start(t *testing.T) sessions.InputReceipt {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = f.writer.TransitionTurn(t.Context(), f.tenant, f.session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = f.execution.TransitionTurn(t.Context(), f.tenant, f.session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	return receipt
@@ -194,7 +195,7 @@ func TestFinishRunObservationLockTimeoutAndFailureKeepLease(t *testing.T) {
 					t.Fatal(err)
 				}
 				defer conn.Release()
-				turn, err := f.writer.CompleteExecution(t.Context(), f.tenant, f.session.ID, receipt.TurnID, sessions.TurnCompleted, json.RawMessage(`{}`), "", receipt.Sequence)
+				turn, err := f.execution.CompleteExecution(t.Context(), f.tenant, f.session.ID, receipt.TurnID, sessions.TurnCompleted, json.RawMessage(`{}`), "", receipt.Sequence)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -224,7 +225,7 @@ func TestFinishRunObservationLockTimeoutAndFailureKeepLease(t *testing.T) {
 			if cleanup != nil {
 				cleanup()
 			}
-			persisted, err := f.s.GetTurn(t.Context(), f.tenant, f.session.ID, receipt.TurnID)
+			persisted, err := sessionpg.New(pgunit.NewPool(f.pool), nil).GetTurn(t.Context(), f.tenant, f.session.ID, receipt.TurnID)
 			if err != nil || persisted.Status != sessions.TurnCompleted {
 				t.Fatal("terminal outcome lost", err)
 			}
diff --git a/services/core/internal/execution/dispatcher.go b/services/core/internal/execution/dispatcher.go
index 54ad6433d..12710583e 100644
--- a/services/core/internal/execution/dispatcher.go
+++ b/services/core/internal/execution/dispatcher.go
@@ -79,7 +79,7 @@ func (d *Dispatcher) Run(ctx context.Context, tenantID, sessionID, turnID string
 	if err != nil {
 		return sessions.Turn{}, err
 	}
-	bound, err := d.Store.GetSessionExecutionBinding(ctx, tenantID, sessionID)
+	bound, err := d.SessionsReader.GetSessionExecutionBinding(ctx, tenantID, sessionID)
 	if err != nil {
 		return sessions.Turn{}, err
 	}
@@ -115,7 +115,7 @@ func (d *Dispatcher) Run(ctx context.Context, tenantID, sessionID, turnID string
 		return sessions.Turn{}, err
 	}
 	defer prepared.close()
-	if _, err := d.Store.TransitionTurn(ctx, tenantID, sessionID, turnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := d.sessionExecution.TransitionTurn(ctx, tenantID, sessionID, turnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		return sessions.Turn{}, err
 	}
 	req.ConversationID, req.RunID, req.Input = sessionID, turnID, text
@@ -141,11 +141,11 @@ func (d *Dispatcher) finishRun(tenantID, sessionID, turnID, model string, result
 		encoded, _ = json.Marshal(result)
 		status, nativeID = sessions.TurnFailed, ""
 	}
-	turn, err := d.Store.CompleteExecution(finishCtx, tenantID, sessionID, turnID, status, encoded, nativeID, result.AppliedThrough)
+	turn, err := d.sessionExecution.CompleteExecution(finishCtx, tenantID, sessionID, turnID, status, encoded, nativeID, result.AppliedThrough)
 	if errors.Is(err, sessions.ErrUnappliedInputs) {
 		result.ErrorCode = "input_not_applied"
 		encoded, _ = json.Marshal(result)
-		turn, err = d.Store.CompleteExecution(finishCtx, tenantID, sessionID, turnID, sessions.TurnFailed, encoded, nativeID, result.AppliedThrough)
+		turn, err = d.sessionExecution.CompleteExecution(finishCtx, tenantID, sessionID, turnID, sessions.TurnFailed, encoded, nativeID, result.AppliedThrough)
 	}
 	if err == nil {
 		d.observeDeploymentProvider(tenantID, sessionID, turn)
diff --git a/services/core/internal/execution/executor_preparation.go b/services/core/internal/execution/executor_preparation.go
index fad7e9c36..11fafdf9d 100644
--- a/services/core/internal/execution/executor_preparation.go
+++ b/services/core/internal/execution/executor_preparation.go
@@ -37,7 +37,7 @@ func (d *Dispatcher) awaitTurnExecutor(ctx context.Context, tenant, session, tur
 		case <-ctx.Done():
 			return ctx.Err()
 		case <-tick.C:
-			current, err := d.Store.GetTurn(ctx, tenant, session, turn)
+			current, err := d.SessionsReader.GetTurn(ctx, tenant, session, turn)
 			if err != nil {
 				return err
 			}
diff --git a/services/core/internal/execution/functions.go b/services/core/internal/execution/functions.go
index ec278de1a..f3804de11 100644
--- a/services/core/internal/execution/functions.go
+++ b/services/core/internal/execution/functions.go
@@ -12,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/items"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func functionTools(raw []json.RawMessage) ([]proto.FunctionTool, error) {
@@ -50,7 +49,7 @@ type functionReply struct {
 }
 
 type functionExchange struct {
-	store                 *store.Store
+	turns                 sessions.TurnReader
 	sessions              *sessions.ExecutionOperations
 	tenant, session, turn string
 	kind                  string
@@ -125,7 +124,7 @@ func (f *functionExchange) confirm(ctx context.Context, reply functionReply) err
 
 func (f *functionExchange) unlessCancelling(ctx context.Context, err error) error {
 	if errors.Is(err, sessions.ErrTurnConflict) {
-		turn, lookupErr := f.store.GetTurn(ctx, f.tenant, f.session, f.turn)
+		turn, lookupErr := f.turns.GetTurn(ctx, f.tenant, f.session, f.turn)
 		if lookupErr == nil && !turn.CancelRequestedAt.IsZero() {
 			return nil
 		}
@@ -144,7 +143,7 @@ func (f *functionExchange) complete(ctx context.Context) error {
 	if len(calls) != 0 {
 		return errors.New("function calls remain unapplied")
 	}
-	turn, err := f.store.GetTurn(ctx, f.tenant, f.session, f.turn)
+	turn, err := f.turns.GetTurn(ctx, f.tenant, f.session, f.turn)
 	if err != nil {
 		return err
 	}
diff --git a/services/core/internal/execution/model_execution.go b/services/core/internal/execution/model_execution.go
index ad02143c7..926aac7e5 100644
--- a/services/core/internal/execution/model_execution.go
+++ b/services/core/internal/execution/model_execution.go
@@ -2,17 +2,13 @@ package execution
 
 import (
 	"context"
-	"errors"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
 func (d *Dispatcher) sessionModelOptions(ctx context.Context, session sessions.Session) (map[string]any, error) {
-	if d.Store == nil {
-		return nil, errors.New("session model configuration is unavailable")
-	}
-	provider, err := d.Store.SessionModelExecution(ctx, session.TenantID, session.ID)
+	provider, err := d.SessionsReader.SessionModelExecution(ctx, session.TenantID, session.ID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/core/internal/execution/model_execution_test.go b/services/core/internal/execution/model_execution_test.go
index f6fd32bc6..627a3161f 100644
--- a/services/core/internal/execution/model_execution_test.go
+++ b/services/core/internal/execution/model_execution_test.go
@@ -6,15 +6,20 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/google/uuid"
+
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
 func TestSessionModelExecutionNeverFallsBack(t *testing.T) {
-	var d Dispatcher
-	if _, err := d.executionRequest(t.Context(), sessions.Session{Engine: "codex"}, Snapshot{ModelProviderConfigured: true}, runtimedevice.KindCapabilities{}, sessions.ExecutionBinding{}); err == nil {
-		t.Fatal("missing Session credentials fell back")
+	reader, _ := testSessions(t, pgtest.Open(t), nil)
+	d := Dispatcher{SessionsReader: reader}
+	session := sessions.Session{TenantID: uuid.NewString(), ID: uuid.NewString(), Engine: "codex"}
+	if _, err := d.executionRequest(t.Context(), session, Snapshot{ModelProviderConfigured: true}, runtimedevice.KindCapabilities{}, sessions.ExecutionBinding{}); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatal("missing Session credentials fell back", err)
 	}
 	// Hosted and self-hosted Runtimes have no model configuration of their own.
 	for _, environment := range []string{"openai_hosted", "self_hosted"} {
diff --git a/services/core/internal/execution/owner_test.go b/services/core/internal/execution/owner_test.go
index 2f5d3eae2..d62f6e18f 100644
--- a/services/core/internal/execution/owner_test.go
+++ b/services/core/internal/execution/owner_test.go
@@ -53,8 +53,8 @@ func (l *closeCountingLease) Close(ctx context.Context) error {
 	return l.inner.Close(ctx)
 }
 
-// unusedSessions returns the Session service and reader for Workers that run
-// no Turn. Any call through them panics.
+// unusedSessions returns the Session service and reader for Workers that fail
+// to start. Any call through them panics.
 func unusedSessions(t *testing.T) (*sessions.Service, sessions.Reader) {
 	t.Helper()
 	service, err := sessions.NewService(struct{ sessions.Storage }{})
@@ -195,10 +195,11 @@ func TestStartWorkerChecksDeploymentAfterItsDependencies(t *testing.T) {
 }
 
 func TestWorkerRunClosesLeaseAfterDrain(t *testing.T) {
-	s, owner, deployments, deploymentReader := resetManagerStore(t)
+	s, owner, deployments, deploymentReader, pool := resetManagerStoreDB(t, nil)
 	lease := &closeCountingLease{t: t, inner: owner.Lease}
 	id := uuid.NewString()
-	service, reader := unusedSessions(t)
+	// The Worker's first reconciliation scans the Session work.
+	reader, service := testSessions(t, pool, nil)
 	dispatcher := &Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil })}
 	worker, err := StartWorker(t.Context(), dispatcher, Owner{Lease: lease, Store: owner.Store, Deployment: owner.Deployment, Sessions: owner.Sessions})
 	if err != nil {
diff --git a/services/core/internal/execution/prepared_dispatch.go b/services/core/internal/execution/prepared_dispatch.go
index 204a3d11b..c9dec7ede 100644
--- a/services/core/internal/execution/prepared_dispatch.go
+++ b/services/core/internal/execution/prepared_dispatch.go
@@ -42,7 +42,7 @@ func (d *Dispatcher) RunEnvironmentInput(ctx context.Context, lease Ownership, t
 		// Reserved before providers were required; the caller settles it as failed.
 		return run, ErrModelProviderRequired
 	}
-	bound, err := d.Store.GetSessionExecutionBinding(ctx, tenantID, sessionID)
+	bound, err := d.SessionsReader.GetSessionExecutionBinding(ctx, tenantID, sessionID)
 	if err != nil {
 		return run, err
 	}
diff --git a/services/core/internal/execution/worker.go b/services/core/internal/execution/worker.go
index 2f584c543..887722017 100644
--- a/services/core/internal/execution/worker.go
+++ b/services/core/internal/execution/worker.go
@@ -352,7 +352,7 @@ func (w *Worker) Run(ctx context.Context) (runErr error) {
 func (w *Worker) reconcile(ctx context.Context) error {
 	cursor := ""
 	for {
-		work, err := w.dispatcher.Store.ListExecutionWork(ctx, cursor, []string{sessions.TurnInProgress, sessions.TurnWaiting}, nil)
+		work, err := w.dispatcher.SessionsReader.ListExecutionWork(ctx, cursor, []string{sessions.TurnInProgress, sessions.TurnWaiting}, nil)
 		if err != nil {
 			return err
 		}
@@ -360,7 +360,7 @@ func (w *Worker) reconcile(ctx context.Context) error {
 			return nil
 		}
 		for _, item := range work {
-			_, err := w.dispatcher.Store.TransitionTurn(ctx, item.TenantID, item.SessionID, item.TurnID, sessions.TurnTransition{ExpectedStatus: item.Status, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"execution_interrupted"}`)})
+			_, err := w.dispatcher.sessionExecution.TransitionTurn(ctx, item.TenantID, item.SessionID, item.TurnID, sessions.TurnTransition{ExpectedStatus: item.Status, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"execution_interrupted"}`)})
 			if err != nil && !errors.Is(err, sessions.ErrTurnConflict) {
 				return err
 			}
@@ -382,7 +382,7 @@ func (w *Worker) runClaim(ctx context.Context, item sessions.ExecutionWork) erro
 	}
 	finish, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	turn, err := w.dispatcher.Store.GetTurn(finish, item.TenantID, item.SessionID, item.TurnID)
+	turn, err := w.dispatcher.SessionsReader.GetTurn(finish, item.TenantID, item.SessionID, item.TurnID)
 	if err != nil {
 		return err
 	}
@@ -395,7 +395,7 @@ func (w *Worker) runClaim(ctx context.Context, item sessions.ExecutionWork) erro
 		return nil
 	}
 	log.Ctx(ctx).Error("oac-core dispatch did not complete", "turn_id", item.TurnID)
-	_, err = w.dispatcher.Store.TransitionTurn(finish, item.TenantID, item.SessionID, item.TurnID, sessions.TurnTransition{ExpectedStatus: turn.Status, Status: sessions.TurnFailed, Outcome: outcome})
+	_, err = w.dispatcher.sessionExecution.TransitionTurn(finish, item.TenantID, item.SessionID, item.TurnID, sessions.TurnTransition{ExpectedStatus: turn.Status, Status: sessions.TurnFailed, Outcome: outcome})
 	if errors.Is(err, sessions.ErrTurnConflict) {
 		return nil
 	}
diff --git a/services/core/internal/execution/worker_device.go b/services/core/internal/execution/worker_device.go
index 9e7cc9e16..ea63a6b9f 100644
--- a/services/core/internal/execution/worker_device.go
+++ b/services/core/internal/execution/worker_device.go
@@ -18,7 +18,7 @@ func (w *Worker) bind(ctx context.Context, item sessions.ExecutionWork) (bool, e
 	}
 	// Candidate selection is a snapshot. Cancellation can append a control input
 	// before this read, so recheck eligibility after reading the input history.
-	turn, err := w.dispatcher.Store.GetTurn(ctx, item.TenantID, item.SessionID, item.TurnID)
+	turn, err := w.dispatcher.SessionsReader.GetTurn(ctx, item.TenantID, item.SessionID, item.TurnID)
 	if errors.Is(err, sessions.ErrNotFound) {
 		return false, nil
 	}
@@ -38,7 +38,7 @@ func (w *Worker) bind(ctx context.Context, item sessions.ExecutionWork) (bool, e
 	if !errors.Is(err, sessions.ErrDeviceBindingConflict) {
 		return ready, err
 	}
-	_, err = w.dispatcher.Store.TransitionTurn(ctx, item.TenantID, item.SessionID, item.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"execution_device_unavailable"}`)})
+	_, err = w.dispatcher.sessionExecution.TransitionTurn(ctx, item.TenantID, item.SessionID, item.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"execution_device_unavailable"}`)})
 	if errors.Is(err, sessions.ErrTurnConflict) {
 		err = nil
 	}
@@ -107,7 +107,7 @@ func (w *Worker) bindSessionDevice(ctx context.Context, session sessions.Session
 	if !errors.Is(err, sessions.ErrNotFound) {
 		return false, err
 	}
-	devices, err := w.dispatcher.Store.ListExecutionDevices(ctx, session.TenantID)
+	devices, err := w.dispatcher.SessionsReader.ListExecutionDevices(ctx, session.TenantID)
 	if err != nil {
 		return false, err
 	}
diff --git a/services/core/internal/execution/worker_schedule.go b/services/core/internal/execution/worker_schedule.go
index 2a901f5f2..fbc0098d8 100644
--- a/services/core/internal/execution/worker_schedule.go
+++ b/services/core/internal/execution/worker_schedule.go
@@ -21,13 +21,13 @@ type scheduledWork struct {
 }
 
 func (s *workerSchedule) selectWork(ctx context.Context, w *Worker, devices []string, active map[string]bool) ([]scheduledWork, error) {
-	turns, err := w.dispatcher.Store.ListExecutionWork(ctx, s.turnCursor, []string{sessions.TurnQueued}, devices)
+	turns, err := w.dispatcher.SessionsReader.ListExecutionWork(ctx, s.turnCursor, []string{sessions.TurnQueued}, devices)
 	if err != nil {
 		return nil, err
 	}
 	if len(turns) == 0 && s.turnCursor != "" {
 		s.turnCursor = ""
-		turns, err = w.dispatcher.Store.ListExecutionWork(ctx, "", []string{sessions.TurnQueued}, devices)
+		turns, err = w.dispatcher.SessionsReader.ListExecutionWork(ctx, "", []string{sessions.TurnQueued}, devices)
 		if err != nil {
 			return nil, err
 		}
diff --git a/services/core/internal/persistence/postgres/sessionpg/binding.go b/services/core/internal/persistence/postgres/sessionpg/binding.go
index 04fadf5bd..cf227e3f5 100644
--- a/services/core/internal/persistence/postgres/sessionpg/binding.go
+++ b/services/core/internal/persistence/postgres/sessionpg/binding.go
@@ -34,9 +34,8 @@ var (
 	_ sessions.InputStartTx             = (*SessionTx)(nil)
 	_ sessions.ComputeAdmissionTx       = (*SessionTx)(nil)
 	_ sessions.EnvironmentDeviceTx      = (*SessionTx)(nil)
-	_ sessions.TurnJournalTx            = (*SessionTx)(nil)
-	_ sessions.TurnEventTx              = (*SessionTx)(nil)
 	_ sessions.InputProjectionTx        = (*SessionTx)(nil)
+	_ sessions.TurnTx                   = (*SessionTx)(nil)
 )
 
 // BindSession binds the tenant's Session to the caller's transaction-bound
@@ -70,6 +69,9 @@ func (t *SessionTx) LoadTurn(ctx context.Context, turn string) (sessions.Turn, e
 		return sessions.Turn{}, err
 	}
 	row, err := t.q.SessionEventTurn(ctx, sqlc.SessionEventTurnParams{SessionID: t.session, ID: id})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.Turn{}, sessions.ErrNotFound
+	}
 	if err != nil {
 		return sessions.Turn{}, err
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/devices.go b/services/core/internal/persistence/postgres/sessionpg/devices.go
index 0db12ccb9..9bf5e67e5 100644
--- a/services/core/internal/persistence/postgres/sessionpg/devices.go
+++ b/services/core/internal/persistence/postgres/sessionpg/devices.go
@@ -20,14 +20,60 @@ func (s *Store) GetSessionDevice(ctx context.Context, tenant, session string) (s
 	if err != nil {
 		return sessions.ExecutionDevice{}, err
 	}
-	ready, err := s.units.Queries().GetSessionInitializationReady(ctx, sqlc.GetSessionInitializationReadyParams(lookup))
+	if err := requireInitialized(ctx, s.units.Queries(), lookup); err != nil {
+		return sessions.ExecutionDevice{}, err
+	}
+	return s.GetSessionRuntimeDevice(ctx, tenant, session)
+}
+
+func (s *Store) GetSessionExecutionBinding(ctx context.Context, tenant, session string) (sessions.ExecutionBinding, error) {
+	lookup, err := DeviceLookup(tenant, session)
+	if err != nil {
+		return sessions.ExecutionBinding{}, err
+	}
+	q := s.units.Queries()
+	if err := requireInitialized(ctx, q, lookup); err != nil {
+		return sessions.ExecutionBinding{}, err
+	}
+	row, err := q.GetSessionExecutionBinding(ctx, sqlc.GetSessionExecutionBindingParams(lookup))
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.ExecutionBinding{}, sessions.ErrNotFound
+	}
+	if err != nil {
+		return sessions.ExecutionBinding{}, err
+	}
+	return sessions.ExecutionBinding{
+		Device:          sessions.ExecutionDevice{ID: uuid.UUID(row.ID.Bytes).String(), Name: row.Name, EnvironmentID: optionalID(row.EnvironmentID)},
+		NativeSessionID: row.NativeSessionID,
+		HasStartedTurn:  row.HasStartedTurn,
+	}, nil
+}
+
+// requireInitialized requires that the tenant's Session completed its
+// Environment preparation; before that, and for a missing Session, it is
+// sessions.ErrNotFound.
+func requireInitialized(ctx context.Context, q *sqlc.Queries, lookup sqlc.GetDeviceParams) error {
+	ready, err := q.GetSessionInitializationReady(ctx, sqlc.GetSessionInitializationReadyParams(lookup))
 	if errors.Is(err, pgx.ErrNoRows) || (err == nil && !ready) {
-		return sessions.ExecutionDevice{}, sessions.ErrNotFound
+		return sessions.ErrNotFound
 	}
+	return err
+}
+
+func (s *Store) ListExecutionDevices(ctx context.Context, tenant string) ([]sessions.ExecutionDevice, error) {
+	id, err := parseID(tenant)
 	if err != nil {
-		return sessions.ExecutionDevice{}, err
+		return nil, err
 	}
-	return s.GetSessionRuntimeDevice(ctx, tenant, session)
+	rows, err := s.units.Queries().ListExecutionDevices(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+	devices := make([]sessions.ExecutionDevice, 0, len(rows))
+	for _, row := range rows {
+		devices = append(devices, sessions.ExecutionDevice{ID: uuid.UUID(row.ID.Bytes).String(), Name: row.Name})
+	}
+	return devices, nil
 }
 
 func (s *Store) GetSessionRuntimeDevice(ctx context.Context, tenant, session string) (sessions.ExecutionDevice, error) {
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_journal.go b/services/core/internal/persistence/postgres/sessionpg/execution_journal.go
deleted file mode 100644
index ad0f9b1a1..000000000
--- a/services/core/internal/persistence/postgres/sessionpg/execution_journal.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package sessionpg
-
-import (
-	"context"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// WithTurnJournal runs apply in a Session transaction on the lease, including
-// for a publicly deleted Session.
-func (e *Execution) WithTurnJournal(ctx context.Context, tenantID, sessionID string, apply func(context.Context, sessions.TurnJournalTx) error) error {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return err
-	}
-	session, err := parseID(sessionID)
-	if err != nil {
-		return err
-	}
-	return WithSession(ctx, e.lease, tenant, session, func(ctx context.Context, q *sqlc.Queries, _ sessions.LockedSession) error {
-		return apply(ctx, BindSession(q, tenant, session))
-	})
-}
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_turns.go b/services/core/internal/persistence/postgres/sessionpg/execution_turns.go
new file mode 100644
index 000000000..6afe1e0bc
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/execution_turns.go
@@ -0,0 +1,80 @@
+package sessionpg
+
+import (
+	"context"
+	"errors"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+// WithTurns runs apply in a Session transaction on the lease, including for a
+// publicly deleted Session.
+func (e *Execution) WithTurns(ctx context.Context, tenantID, sessionID string, apply func(context.Context, sessions.TurnTx) error) error {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return err
+	}
+	session, err := parseID(sessionID)
+	if err != nil {
+		return err
+	}
+	return WithSession(ctx, e.lease, tenant, session, func(ctx context.Context, q *sqlc.Queries, _ sessions.LockedSession) error {
+		return apply(ctx, BindSession(q, tenant, session))
+	})
+}
+
+func (t *SessionTx) ApplyTurnStatus(ctx context.Context, turn string, change sessions.TurnStatusChange) (sessions.Turn, error) {
+	id, err := parseID(turn)
+	if err != nil {
+		return sessions.Turn{}, err
+	}
+	row, err := t.q.TransitionTurn(ctx, sqlc.TransitionTurnParams{
+		ID: id, SessionID: t.session, ExpectedStatus: change.Expected, NewStatus: change.Status, Outcome: change.Outcome,
+		SourceCompletedAt: pgtype.Timestamptz{Time: change.SourceCompletedAt, Valid: !change.SourceCompletedAt.IsZero()},
+	})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.Turn{}, sessions.ErrTurnConflict
+	}
+	if err != nil {
+		return sessions.Turn{}, err
+	}
+	return TurnFromRow(row), nil
+}
+
+func (t *SessionTx) HasUnappliedInputs(ctx context.Context, turn string, appliedThrough int64) (bool, error) {
+	id, err := parseID(turn)
+	if err != nil {
+		return false, err
+	}
+	return t.q.HasUnappliedMessages(ctx, sqlc.HasUnappliedMessagesParams{SessionID: t.session, TurnID: id, Sequence: appliedThrough})
+}
+
+func (t *SessionTx) RememberNativeSession(ctx context.Context, native string) error {
+	n, err := t.q.RememberNativeSession(ctx, sqlc.RememberNativeSessionParams{SessionID: t.session, NativeSessionID: native})
+	if err != nil {
+		return err
+	}
+	if n != 1 {
+		return sessions.ErrNotFound
+	}
+	return nil
+}
+
+func (t *SessionTx) BeginArtifactCapture(ctx context.Context, turn string) error {
+	id, err := parseID(turn)
+	if err != nil {
+		return err
+	}
+	n, err := t.q.BeginTurnArtifactCapture(ctx, sqlc.BeginTurnArtifactCaptureParams{SessionID: t.session, ID: id})
+	if err != nil {
+		return err
+	}
+	if n != 1 {
+		return sessions.ErrTurnConflict
+	}
+	return nil
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_turns_test.go b/services/core/internal/persistence/postgres/sessionpg/execution_turns_test.go
new file mode 100644
index 000000000..6e06a2780
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/execution_turns_test.go
@@ -0,0 +1,206 @@
+package sessionpg
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"slices"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+// transition moves the Turn as the seeder does: the TransitionTurn procedure
+// in a pooled Session transaction.
+func transition(ctx context.Context, pool *pgxpool.Pool, tenant, session pgtype.UUID, turn string, transition sessions.TurnTransition) (sessions.Turn, error) {
+	var moved sessions.Turn
+	err := WithSession(ctx, pgunit.NewPool(pool), tenant, session, func(ctx context.Context, q *sqlc.Queries, _ sessions.LockedSession) error {
+		var err error
+		moved, err = sessions.TransitionTurn(ctx, BindSession(q, tenant, session), turn, transition)
+		return err
+	})
+	return moved, err
+}
+
+// Concurrent terminal callbacks commit exactly one outcome, which a late
+// callback and a new pool see unchanged.
+func TestConcurrentTerminalTransitionsKeepOneOutcome(t *testing.T) {
+	pool := pgtest.Open(t)
+	tenant, session, id := newTurn(t, pool, sessions.TurnInProgress)
+	turn := text(id)
+	exec(t, pool, `UPDATE turns SET started_at = clock_timestamp(), cancel_requested_at = clock_timestamp() WHERE id = $1`, id)
+	var wg sync.WaitGroup
+	winners, errs := make(chan sessions.Turn, 3), make(chan error, 3)
+	for _, status := range []string{sessions.TurnCompleted, sessions.TurnFailed, sessions.TurnCancelled} {
+		wg.Go(func() {
+			outcome := json.RawMessage(`{"reported":"` + status + `"}`)
+			moved, err := transition(t.Context(), pool, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: status, Outcome: outcome})
+			if err != nil {
+				errs <- err
+				return
+			}
+			winners <- moved
+		})
+	}
+	wg.Wait()
+	close(winners)
+	close(errs)
+	if len(winners) != 1 || len(errs) != 2 {
+		t.Fatalf("winners=%d errors=%d", len(winners), len(errs))
+	}
+	for err := range errs {
+		if !errors.Is(err, sessions.ErrTurnConflict) {
+			t.Fatal(err)
+		}
+	}
+	winner := <-winners
+	if winner.CompletedAt.IsZero() || winner.CancelRequestedAt.IsZero() || winner.CompletedAt.Before(winner.StartedAt) {
+		t.Fatalf("terminal timestamps: %+v", winner)
+	}
+	if _, err := transition(t.Context(), pool, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"late":true}`)}); !errors.Is(err, sessions.ErrTurnConflict) {
+		t.Fatalf("late terminal callback accepted: %v", err)
+	}
+	got, err := New(pgunit.NewPool(pgtest.Open(t)), nil).GetTurn(t.Context(), text(tenant), text(session), turn)
+	if err != nil || !reflect.DeepEqual(got, winner) {
+		t.Fatalf("terminal outcome changed: %+v, %v", got, err)
+	}
+}
+
+// Artifact capture and completion admit only applied inputs. A completion that
+// fails rolls back whole; one that commits records its event, publishes the
+// staged Artifacts and journals the Turn's end in order. A closed lease
+// writes nothing.
+func TestCompleteExecutionSettlesTheTurnOnTheLease(t *testing.T) {
+	pool := pgtest.OpenIsolated(t, nil)
+	operations, lease := sessionExecution(t, pool)
+	_, service := stagingService(t, pool)
+	tenant, session, environment, turn := stagingTurn(t, pool, "openai_hosted")
+	if err := stage(t, service, tenant, session, turn, environment, bytes.NewReader(artifactExport(t, [2]string{"outputs/a", "data"}))); err != nil {
+		t.Fatal(err)
+	}
+	var applied int64
+	if err := pool.QueryRow(t.Context(), `INSERT INTO turn_inputs(session_id, turn_id, idempotency_key, kind, payload)
+		VALUES ($1, $2, 'message', 'message', '{}') RETURNING sequence`, session, turn).Scan(&applied); err != nil {
+		t.Fatal(err)
+	}
+	if err := operations.BeginTurnArtifactCapture(t.Context(), tenant, session, turn, applied-1); !errors.Is(err, sessions.ErrUnappliedInputs) {
+		t.Fatal("capture before the inputs applied", err)
+	}
+	if err := operations.BeginTurnArtifactCapture(t.Context(), tenant, session, turn, applied); err != nil {
+		t.Fatal(err)
+	}
+	if err := operations.BeginTurnArtifactCapture(t.Context(), tenant, session, turn, applied); !errors.Is(err, sessions.ErrTurnConflict) {
+		t.Fatal("second capture", err)
+	}
+
+	completedAt := time.Now().Add(-time.Hour).Truncate(time.Millisecond)
+	outcome := json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, completedAt.UnixMilli()))
+	_, before := journal(t, pool, pgunit.PathID(session))
+	if _, err := operations.CompleteExecution(t.Context(), tenant, session, turn, sessions.TurnCompleted, outcome, "", applied-1); !errors.Is(err, sessions.ErrUnappliedInputs) {
+		t.Fatal("completion before the inputs applied", err)
+	}
+	// The Session has no bound device to remember the native session on.
+	if _, err := operations.CompleteExecution(t.Context(), tenant, session, turn, sessions.TurnCompleted, outcome, "native", applied); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatal("completion without a bound device", err)
+	}
+	if entries, count, _ := recorded(t, pool, pgunit.PathID(turn)); len(entries) != 0 || count != 0 {
+		t.Fatalf("rolled back completion kept %q", entries)
+	}
+	if _, after := journal(t, pool, pgunit.PathID(session)); len(after) != len(before) {
+		t.Fatalf("rolled back completion journaled %q", kinds(after[len(before):]))
+	}
+
+	ended, err := operations.CompleteExecution(t.Context(), tenant, session, turn, sessions.TurnCompleted, outcome, "", applied)
+	if err != nil || ended.Status != sessions.TurnCompleted || !ended.CompletedAt.Equal(completedAt) {
+		t.Fatalf("completion: %+v, %v", ended, err)
+	}
+	if entries, _, _ := recorded(t, pool, pgunit.PathID(turn)); !reflect.DeepEqual(entries, []string{"execution_completed"}) {
+		t.Fatalf("turn journal %q", entries)
+	}
+	var published int
+	if err := pool.QueryRow(t.Context(), `SELECT count(*) FROM session_artifacts WHERE turn_id = $1 AND created_at IS NOT NULL`, turn).Scan(&published); err != nil || published != 1 {
+		t.Fatalf("published %d Artifacts: %v", published, err)
+	}
+	_, after := journal(t, pool, pgunit.PathID(session))
+	if got, want := kinds(after[len(before):]), []string{"agent.session.turn.completed", "agent.session.idle"}; !reflect.DeepEqual(got, want) {
+		t.Fatalf("session journal %q, want %q", got, want)
+	}
+
+	next := text(addTurn(t, pool, pgunit.PathID(session), sessions.TurnQueued))
+	if err := lease.Close(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := operations.TransitionTurn(t.Context(), tenant, session, next, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); !errors.Is(err, pgunit.ErrLeaseClosed) {
+		t.Fatal("closed lease moved a Turn", err)
+	}
+	if _, err := operations.CompleteExecution(t.Context(), tenant, session, next, sessions.TurnFailed, nil, "", 0); !errors.Is(err, pgunit.ErrLeaseClosed) {
+		t.Fatal("closed lease completed a Turn", err)
+	}
+}
+
+// Turn pages keep creation order with an ID tie-breaker in both directions,
+// and a cursor or Session outside the tenant's Session is missing.
+func TestTurnPagesKeepScopeAndOrder(t *testing.T) {
+	pool := pgtest.Open(t)
+	store := New(pgunit.NewPool(pool), nil)
+	ctx := t.Context()
+	tenantID, sessionID, first := newTurn(t, pool, sessions.TurnCancelled)
+	tenant, session := text(tenantID), text(sessionID)
+	ids := []string{text(first)}
+	for range 3 {
+		ids = append(ids, text(addTurn(t, pool, sessionID, sessions.TurnCancelled)))
+	}
+	// Equal creation times exercise the ID tie-breaker across page boundaries.
+	exec(t, pool, `UPDATE turns SET created_at = $1 WHERE session_id = $2`, time.Unix(1700000000, 0), sessionID)
+	slices.Sort(ids)
+	for _, ascending := range []bool{true, false} {
+		cursor := ""
+		for i := range ids {
+			page, err := store.ListTurns(ctx, tenant, session, cursor, 1, ascending)
+			at := i
+			if !ascending {
+				at = len(ids) - 1 - i
+			}
+			if err != nil || len(page.Turns) != 1 || page.Turns[0].ID != ids[at] {
+				t.Fatalf("page %d: %+v %v", i, page, err)
+			}
+			if (page.NextCursor != "") != (i < len(ids)-1) {
+				t.Fatalf("incorrect has_more: %+v", page)
+			}
+			cursor = page.Turns[0].ID
+		}
+		page, err := store.ListTurns(ctx, tenant, session, cursor, 1, ascending)
+		if err != nil || len(page.Turns) != 0 || page.Turns == nil || page.NextCursor != "" {
+			t.Fatalf("end: %+v %v", page, err)
+		}
+	}
+	otherTenant, otherSession, _ := newTurn(t, pool, sessions.TurnCancelled)
+	empty := uuid.New()
+	exec(t, pool, `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash) VALUES ($1, $2, 'codex', 'empty', 'hash')`, empty, tenantID)
+	for _, scope := range [][2]string{{text(otherTenant), session}, {tenant, text(otherSession)}, {tenant, uuid.NewString()}, {tenant, empty.String()}} {
+		if _, err := store.ListTurns(ctx, scope[0], scope[1], ids[0], 1, true); !errors.Is(err, sessions.ErrNotFound) {
+			t.Fatalf("foreign cursor/session accepted: %v", err)
+		}
+	}
+	page, err := store.ListTurns(ctx, tenant, empty.String(), "", 20, false)
+	if err != nil || page.Turns == nil || len(page.Turns) != 0 {
+		t.Fatalf("empty session: %+v %v", page, err)
+	}
+	for _, limit := range []int{0, 101} {
+		if _, err := store.ListTurns(ctx, tenant, session, "", limit, false); !errors.Is(err, sessions.ErrInvalidInput) {
+			t.Fatalf("limit accepted: %v", err)
+		}
+	}
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/functions.go b/services/core/internal/persistence/postgres/sessionpg/functions.go
index 8da77be69..8f82b4fdb 100644
--- a/services/core/internal/persistence/postgres/sessionpg/functions.go
+++ b/services/core/internal/persistence/postgres/sessionpg/functions.go
@@ -150,18 +150,3 @@ func (t *SessionTx) ApplyFunctionResult(ctx context.Context, turn, call string)
 	}
 	return t.q.ApplyFunctionResult(ctx, sqlc.ApplyFunctionResultParams{SessionID: t.session, TurnID: id, CallID: call})
 }
-
-func (t *SessionTx) ApplyFunctionTurnStatus(ctx context.Context, turn, expected, status string) (sessions.Turn, error) {
-	id, err := parseID(turn)
-	if err != nil {
-		return sessions.Turn{}, err
-	}
-	row, err := t.q.TransitionTurn(ctx, sqlc.TransitionTurnParams{ID: id, SessionID: t.session, ExpectedStatus: expected, NewStatus: status, Outcome: []byte(`{}`)})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.Turn{}, sessions.ErrTurnConflict
-	}
-	if err != nil {
-		return sessions.Turn{}, err
-	}
-	return TurnFromRow(row), nil
-}
diff --git a/services/core/internal/persistence/postgres/sessionpg/model_execution.go b/services/core/internal/persistence/postgres/sessionpg/model_execution.go
new file mode 100644
index 000000000..8f5cfbfbb
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/model_execution.go
@@ -0,0 +1,54 @@
+package sessionpg
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+
+	"github.com/jackc/pgx/v5"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+var _ sessions.ModelExecutionReader = (*Store)(nil)
+
+func (s *Store) SessionModelExecution(ctx context.Context, tenant, session string) (*v1.ModelProviderInput, error) {
+	tenantID, err := parseID(tenant)
+	if err != nil {
+		return nil, err
+	}
+	sessionID, err := parseID(session)
+	if err != nil {
+		return nil, err
+	}
+	ciphertext, err := s.units.Queries().GetSessionModelExecution(ctx, sqlc.GetSessionModelExecutionParams{TenantID: tenantID, SessionID: sessionID})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return nil, sessions.ErrNotFound
+	}
+	if err != nil {
+		return nil, err
+	}
+	if s.cipher == nil {
+		return nil, credentialcrypto.ErrUnavailable
+	}
+	raw, err := s.cipher.OpenModelExecution(ciphertext, tenant, session)
+	if err != nil {
+		return nil, fmt.Errorf("open session model execution: %w", err)
+	}
+	var provider v1.ModelProviderInput
+	decoder := json.NewDecoder(bytes.NewReader(raw))
+	decoder.DisallowUnknownFields()
+	if decoder.Decode(&provider) != nil || decoder.Decode(new(any)) != io.EOF {
+		return nil, errors.New("invalid stored model execution configuration")
+	}
+	if err := provider.Validate(); err != nil {
+		return nil, err
+	}
+	return &provider, nil
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/turn_reads.go b/services/core/internal/persistence/postgres/sessionpg/turn_reads.go
new file mode 100644
index 000000000..8704de091
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/turn_reads.go
@@ -0,0 +1,119 @@
+package sessionpg
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+var _ sessions.TurnReader = (*Store)(nil)
+
+func (s *Store) GetTurn(ctx context.Context, tenant, session, turn string) (sessions.Turn, error) {
+	lookup, err := PublicTurnLookup(tenant, session, turn)
+	if err != nil {
+		return sessions.Turn{}, err
+	}
+	row, err := s.units.Queries().GetTurn(ctx, lookup)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.Turn{}, sessions.ErrNotFound
+	}
+	if err != nil {
+		return sessions.Turn{}, fmt.Errorf("get turn: %w", err)
+	}
+	return TurnFromRow(row), nil
+}
+
+func (s *Store) ListTurns(ctx context.Context, tenant, session, cursor string, limit int, ascending bool) (sessions.TurnPage, error) {
+	if limit < 1 || limit > 100 {
+		return sessions.TurnPage{}, fmt.Errorf("%w: page size must be 1..100", sessions.ErrInvalidInput)
+	}
+	tenantID, err := parseID(tenant)
+	if err != nil {
+		return sessions.TurnPage{}, err
+	}
+	sessionID := pgunit.PathID(session)
+	q := s.units.Queries()
+	if _, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: tenantID, ID: sessionID}); errors.Is(err, pgx.ErrNoRows) {
+		return sessions.TurnPage{}, sessions.ErrNotFound
+	} else if err != nil {
+		return sessions.TurnPage{}, fmt.Errorf("get session: %w", err)
+	}
+	params := sqlc.ListRootTurnsParams{TenantID: tenantID, SessionID: sessionID, PageLimit: int32(limit + 1), AfterID: pgtype.UUID{Valid: true}, Ascending: ascending}
+	if cursor != "" {
+		// A child Turn is not a Session Turn, so its ID is a missing cursor here.
+		after, err := s.GetTurn(ctx, tenant, session, pgunit.LookupCursor(cursor))
+		if err != nil {
+			return sessions.TurnPage{}, err
+		}
+		params.AfterCreated = pgtype.Timestamptz{Time: after.CreatedAt, Valid: true}
+		params.AfterID, _ = parseID(after.ID)
+	}
+	rows, err := q.ListRootTurns(ctx, params)
+	if err != nil {
+		return sessions.TurnPage{}, fmt.Errorf("list turns: %w", err)
+	}
+	page := sessions.TurnPage{Turns: make([]sessions.Turn, 0, min(limit, len(rows)))}
+	if len(rows) > limit {
+		page.NextCursor = uuid.UUID(rows[limit-1].ID.Bytes).String()
+		rows = rows[:limit]
+	}
+	for _, row := range rows {
+		page.Turns = append(page.Turns, TurnFromRow(row))
+	}
+	return page, nil
+}
+
+func (s *Store) ListExecutionWork(ctx context.Context, after string, statuses, connectedDevices []string) ([]sessions.ExecutionWork, error) {
+	id, devices, err := ExecutionWorkCursor(after, connectedDevices)
+	if err != nil {
+		return nil, err
+	}
+	rows, err := s.units.Queries().ListExecutionWork(ctx, sqlc.ListExecutionWorkParams{AfterID: id, Statuses: statuses, ConnectedOnly: connectedDevices != nil, ConnectedDevices: devices})
+	if err != nil {
+		return nil, err
+	}
+	work := make([]sessions.ExecutionWork, 0, len(rows))
+	for _, row := range rows {
+		work = append(work, sessions.ExecutionWork{TenantID: uuid.UUID(row.TenantID.Bytes).String(), SessionID: uuid.UUID(row.SessionID.Bytes).String(), TurnID: uuid.UUID(row.ID.Bytes).String(), Status: row.Status})
+	}
+	return work, nil
+}
+
+// ExecutionWorkCursor parses the cursor and connected devices of an execution
+// work scan; an empty cursor starts at the first ID. A malformed ID is
+// sessions.ErrInvalidInput.
+func ExecutionWorkCursor(after string, connectedDevices []string) (pgtype.UUID, []pgtype.UUID, error) {
+	id := pgtype.UUID{Valid: true}
+	var err error
+	if after != "" {
+		id, err = parseID(after)
+		if err != nil {
+			return id, nil, err
+		}
+	}
+	devices := make([]pgtype.UUID, 0, len(connectedDevices))
+	for _, value := range connectedDevices {
+		device, err := parseID(value)
+		if err != nil {
+			return id, nil, err
+		}
+		devices = append(devices, device)
+	}
+	return id, devices, nil
+}
+
+// PublicTurnLookup resolves the caller's path identifiers of a Turn or a
+// Turn-scoped resource. A malformed tenant is sessions.ErrInvalidInput; a
+// malformed Session or Turn ID resolves as a missing one.
+func PublicTurnLookup(tenant, session, turn string) (sqlc.GetTurnParams, error) {
+	id, err := parseID(tenant)
+	return sqlc.GetTurnParams{TenantID: id, SessionID: pgunit.PathID(session), ID: pgunit.PathID(turn)}, err
+}
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index 6b1ac416f..b82a51051 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -136,7 +136,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		Sessions:        s,
 		SessionCreation: s,
 		SessionEvents:   s,
-		Turns:           s,
+		Turns:           struct{ api.Turns }{},
 		Items:           struct{ api.Items }{},
 		Subagents:       struct{ api.Subagents }{},
 		Artifacts:       struct{ api.Artifacts }{},
diff --git a/services/core/internal/sessions/devices.go b/services/core/internal/sessions/devices.go
index 417263183..d7fd40cf9 100644
--- a/services/core/internal/sessions/devices.go
+++ b/services/core/internal/sessions/devices.go
@@ -72,6 +72,14 @@ type DeviceReader interface {
 	// ListEnrolledRuntimeBindings lists the enrolled user-managed Runtimes of
 	// live Environments.
 	ListEnrolledRuntimeBindings(ctx context.Context) ([]EnrolledRuntimeBinding, error)
+	// GetSessionExecutionBinding reads the Runtime device that executes the
+	// Session's Turns, with the native session that continues its history,
+	// once its Environment preparation completed; before that, and without an
+	// authorized bound device, it is ErrNotFound.
+	GetSessionExecutionBinding(ctx context.Context, tenant, session string) (ExecutionBinding, error)
+	// ListExecutionDevices lists the tenant's unrevoked devices that belong
+	// to no Environment, in ID order.
+	ListExecutionDevices(ctx context.Context, tenant string) ([]ExecutionDevice, error)
 }
 
 // DeviceStorage stores Runtime devices.
diff --git a/services/core/internal/sessions/doc.go b/services/core/internal/sessions/doc.go
index adb5fa21d..e86c58aab 100644
--- a/services/core/internal/sessions/doc.go
+++ b/services/core/internal/sessions/doc.go
@@ -7,12 +7,12 @@
 // The Session writes that several operations share are procedures here, over
 // the transaction interfaces declared beside them: cancelling work, failing
 // and terminating an Environment, tracking input activity, the admission
-// gates, admitting a function result, reading a Turn's required actions,
-// appending to a Turn's execution journal and projecting its observations and
-// admitted inputs into Items, Turn usage and Subagents. Service runs the pooled
+// gates, moving a Turn's status, admitting a function result, reading a Turn's
+// required actions, appending to a Turn's execution journal and projecting its
+// observations and admitted inputs into Items, Turn usage and Subagents. Service runs the pooled
 // Session use cases, such as staging a Turn's Artifacts, over Storage, and
 // Reader declares the Session reads. ExecutionOperations runs the Session
-// writes only the execution owner makes, such as recording function calls and
-// their application receipts and journaling a Turn's observations, over the
-// lease-bound ExecutionStorage.
+// writes only the execution owner makes, such as moving and completing Turns,
+// recording function calls and their application receipts and journaling a
+// Turn's observations, over the lease-bound ExecutionStorage.
 package sessions
diff --git a/services/core/internal/sessions/execution.go b/services/core/internal/sessions/execution.go
index e222dc62c..db5eaaf13 100644
--- a/services/core/internal/sessions/execution.go
+++ b/services/core/internal/sessions/execution.go
@@ -20,5 +20,5 @@ func NewExecutionOperations(storage ExecutionStorage) (*ExecutionOperations, err
 type ExecutionStorage interface {
 	EnvironmentExecution
 	FunctionExecution
-	JournalExecution
+	TurnExecution
 }
diff --git a/services/core/internal/sessions/execution_functions.go b/services/core/internal/sessions/execution_functions.go
index aa6478c14..1285a1a9e 100644
--- a/services/core/internal/sessions/execution_functions.go
+++ b/services/core/internal/sessions/execution_functions.go
@@ -1,6 +1,9 @@
 package sessions
 
-import "context"
+import (
+	"context"
+	"encoding/json"
+)
 
 // FunctionCallMatch is what a Turn's stored call shows about a reported call.
 type FunctionCallMatch struct {
@@ -28,9 +31,9 @@ type FunctionTx interface {
 	// ApplyFunctionResult records the application receipt of the call's
 	// result.
 	ApplyFunctionResult(ctx context.Context, turn, call string) error
-	// ApplyFunctionTurnStatus moves the Turn from expected to status and
-	// returns it as stored. A Turn no longer in expected is ErrTurnConflict.
-	ApplyFunctionTurnStatus(ctx context.Context, turn, expected, status string) (Turn, error)
+	// ApplyTurnStatus moves the Turn as change decides and returns it as
+	// stored. A Turn no longer in the expected status is ErrTurnConflict.
+	ApplyTurnStatus(ctx context.Context, turn string, change TurnStatusChange) (Turn, error)
 }
 
 // FunctionExecution is the lease-bound storage of function calls.
@@ -150,7 +153,7 @@ func settleFunctionState(ctx context.Context, tx FunctionTx, turn Turn) error {
 		status = TurnWaiting
 	}
 	if turn.Status != status {
-		if turn, err = tx.ApplyFunctionTurnStatus(ctx, turn.ID, turn.Status, status); err != nil {
+		if turn, err = tx.ApplyTurnStatus(ctx, turn.ID, TurnStatusChange{Expected: turn.Status, Status: status, Outcome: json.RawMessage(`{}`)}); err != nil {
 			return err
 		}
 		if err := tx.AppendChanges(ctx, TurnChanges(turn, false)...); err != nil {
diff --git a/services/core/internal/sessions/execution_functions_test.go b/services/core/internal/sessions/execution_functions_test.go
index 42531197d..cc8ca606a 100644
--- a/services/core/internal/sessions/execution_functions_test.go
+++ b/services/core/internal/sessions/execution_functions_test.go
@@ -17,7 +17,7 @@ import (
 type fakeExecutionStorage struct {
 	t                *testing.T
 	withFunctionTurn func(ctx context.Context, tenant, session, turn string, apply func(context.Context, FunctionTx, Turn) error) error
-	withTurnJournal  func(ctx context.Context, tenant, session string, apply func(context.Context, TurnJournalTx) error) error
+	withTurns        func(ctx context.Context, tenant, session string, apply func(context.Context, TurnTx) error) error
 
 	tx     *fakeTx
 	locked LockedSession
@@ -40,12 +40,12 @@ func (f *fakeExecutionStorage) WithFunctionTurn(ctx context.Context, tenant, ses
 	return f.withFunctionTurn(ctx, tenant, session, turn, apply)
 }
 
-func (f *fakeExecutionStorage) WithTurnJournal(ctx context.Context, tenant, session string, apply func(context.Context, TurnJournalTx) error) error {
+func (f *fakeExecutionStorage) WithTurns(ctx context.Context, tenant, session string, apply func(context.Context, TurnTx) error) error {
 	f.t.Helper()
-	if f.withTurnJournal == nil {
-		f.t.Fatal("unexpected call to WithTurnJournal")
+	if f.withTurns == nil {
+		f.t.Fatal("unexpected call to WithTurns")
 	}
-	return f.withTurnJournal(ctx, tenant, session, apply)
+	return f.withTurns(ctx, tenant, session, apply)
 }
 
 const testTenant = "4f0d0c35-8b8e-4d7c-9d1c-1f0a5b8a2e61"
@@ -132,14 +132,15 @@ func TestRecordFunctionCall(t *testing.T) {
 	t.Run("first call moves the Turn to waiting", func(t *testing.T) {
 		running, waiting := turnWith(TurnInProgress), turnWith(TurnWaiting)
 		var changes []SessionChange
-		f := &fakeFunctionTx{fakeTx: &fakeTx{t: t, loadUsage: returns(usage), appendChanges: collect(&changes)},
+		moved := func(TurnStatusChange) (Turn, error) { return waiting, nil }
+		f := &fakeFunctionTx{fakeTx: &fakeTx{t: t, loadUsage: returns(usage), appendChanges: collect(&changes), applyTurnStatus: moved},
 			matchFunctionCall: returns(FunctionCallMatch{}), createFunctionCall: done,
-			loadPendingFunctionCalls: returns([]FunctionCall{testCall}), applyFunctionTurnStatus: returns(waiting)}
+			loadPendingFunctionCalls: returns([]FunctionCall{testCall})}
 		if err := functionOperations(t, f, running).RecordFunctionCall(t.Context(), testTenant, testSession, testTurn, testCall); err != nil {
 			t.Fatal(err)
 		}
 		assertCalls(t, f.fakeTx, "MatchFunctionCall "+testTurn+" call", "CreateFunctionCall "+testTurn+" call", "LoadPendingFunctionCalls "+testTurn,
-			"ApplyFunctionTurnStatus "+testTurn+" in_progress waiting", "AppendChanges ", "LoadUsage", "AppendChanges agent.session.requires_action")
+			"ApplyTurnStatus "+testTurn+" in_progress waiting {}", "AppendChanges ", "LoadUsage", "AppendChanges agent.session.requires_action")
 		actions, _ := LoadRequiredActions(t.Context(), &fakeFunctionTx{fakeTx: &fakeTx{t: t}, loadPendingFunctionCalls: returns([]FunctionCall{testCall})}, waiting)
 		if !reflect.DeepEqual(changes, []SessionChange{ActivityChange(waiting, usage, actions)}) {
 			t.Fatalf("changes %+v", changes)
@@ -198,14 +199,15 @@ func TestConfirmFunctionResult(t *testing.T) {
 	t.Run("last receipt resumes the Turn", func(t *testing.T) {
 		waiting, running := turnWith(TurnWaiting), turnWith(TurnInProgress)
 		var changes []SessionChange
-		f := &fakeFunctionTx{fakeTx: &fakeTx{t: t, loadUsage: returns(usage), appendChanges: collect(&changes)},
+		moved := func(TurnStatusChange) (Turn, error) { return running, nil }
+		f := &fakeFunctionTx{fakeTx: &fakeTx{t: t, loadUsage: returns(usage), appendChanges: collect(&changes), applyTurnStatus: moved},
 			loadFunctionCall: func() (FunctionCall, bool, error) { return submitted, true, nil }, applyFunctionResult: done,
-			loadPendingFunctionCalls: returns([]FunctionCall{}), applyFunctionTurnStatus: returns(running)}
+			loadPendingFunctionCalls: returns([]FunctionCall{})}
 		if err := functionOperations(t, f, waiting).ConfirmFunctionResult(t.Context(), testTenant, testSession, testTurn, "call"); err != nil {
 			t.Fatal(err)
 		}
 		assertCalls(t, f.fakeTx, "LoadFunctionCall "+testTurn+" call", "ApplyFunctionResult "+testTurn+" call", "LoadPendingFunctionCalls "+testTurn,
-			"ApplyFunctionTurnStatus "+testTurn+" waiting in_progress", "AppendChanges agent.session.turn.in_progress", "LoadUsage", "AppendChanges agent.session.in_progress")
+			"ApplyTurnStatus "+testTurn+" waiting in_progress {}", "AppendChanges agent.session.turn.in_progress", "LoadUsage", "AppendChanges agent.session.in_progress")
 		want := append(TurnChanges(running, false), ActivityChange(running, usage, []v1.FunctionCallAction{}))
 		if !reflect.DeepEqual(changes, want) {
 			t.Fatalf("changes %+v", changes)
diff --git a/services/core/internal/sessions/execution_journal.go b/services/core/internal/sessions/execution_journal.go
deleted file mode 100644
index 95480f05d..000000000
--- a/services/core/internal/sessions/execution_journal.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package sessions
-
-import "context"
-
-// JournalExecution records execution observations in Turn journals.
-type JournalExecution interface {
-	// WithTurnJournal runs apply in a Session transaction on the lease-bound
-	// connection, with the tenant's Session locked, and passes apply the
-	// transaction's context. A deleted Session still records its Turns'
-	// observations.
-	WithTurnJournal(ctx context.Context, tenant, session string, apply func(context.Context, TurnJournalTx) error) error
-}
-
-// AppendTurnEvents records an ordered batch of a Turn's execution observations
-// in its journal from position first and projects them, as the
-// AppendTurnEvents procedure decides. A malformed tenant, Session or Turn ID is
-// ErrInvalidInput, before the batch is validated and before the Session is
-// looked up. The journal is Core-internal; it is not the public event stream.
-func (o *ExecutionOperations) AppendTurnEvents(ctx context.Context, tenant, session, turn string, first int32, events []ExecutionEvent) error {
-	if !validID(tenant) || !validID(session) {
-		return ErrInvalidInput
-	}
-	batch, err := NewJournalBatch(turn, first, events)
-	if err != nil {
-		return err
-	}
-	return o.storage.WithTurnJournal(ctx, tenant, session, func(ctx context.Context, tx TurnJournalTx) error {
-		return AppendTurnEvents(ctx, tx, batch)
-	})
-}
diff --git a/services/core/internal/sessions/execution_turns.go b/services/core/internal/sessions/execution_turns.go
new file mode 100644
index 000000000..a6fbf912c
--- /dev/null
+++ b/services/core/internal/sessions/execution_turns.go
@@ -0,0 +1,306 @@
+package sessions
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/jsonobject"
+)
+
+// maxOutcomeBytes bounds a Turn's terminal outcome.
+const maxOutcomeBytes = 512 * 1024
+
+// TurnStatusChange is a decided change of a Turn's status.
+type TurnStatusChange struct {
+	Expected string
+	Status   string
+	Outcome  json.RawMessage
+	// SourceCompletedAt is when the native source completed a Turn that ends
+	// completed, zero when it reported none.
+	SourceCompletedAt time.Time
+}
+
+// TurnTransitionTx is the Session transaction TransitionTurn runs in.
+type TurnTransitionTx interface {
+	ProjectionTx
+	ComputeAdmissionTx
+	// LoadTurn reads one of the Session's Turns; a missing one is ErrNotFound.
+	LoadTurn(ctx context.Context, turn string) (Turn, error)
+	// ApplyTurnStatus moves the Turn as change decides and returns it as
+	// stored. The database clock stamps the first start of a Turn that moves
+	// to in progress and the end of a Turn that ends, unless the change carries
+	// the source completion time. A Turn no longer in the expected status is
+	// ErrTurnConflict.
+	ApplyTurnStatus(ctx context.Context, turn string, change TurnStatusChange) (Turn, error)
+	// LoadEnding reads the facts EndTurn settles an ended Turn with.
+	LoadEnding(ctx context.Context, turn string) (Ending, error)
+	// ApplyTurnEnd writes what EndTurn decided for an ended Turn.
+	ApplyTurnEnd(ctx context.Context, turn string, end TurnEnd) error
+}
+
+// TurnTx is the Session transaction of the Turn execution operations.
+type TurnTx interface {
+	TurnTransitionTx
+	TurnEventTx
+	TurnJournalTx
+	// HasUnappliedInputs reports whether the Turn has message inputs after
+	// sequence appliedThrough.
+	HasUnappliedInputs(ctx context.Context, turn string, appliedThrough int64) (bool, error)
+	// RememberNativeSession records the native session that continues the
+	// Session's history on its bound device. A Session without a bound device
+	// is ErrNotFound.
+	RememberNativeSession(ctx context.Context, native string) error
+	// BeginArtifactCapture marks that the Turn captures its Artifacts. A Turn
+	// that already does is ErrTurnConflict.
+	BeginArtifactCapture(ctx context.Context, turn string) error
+}
+
+// TurnExecution is the lease-bound storage of the Turn execution operations.
+type TurnExecution interface {
+	// WithTurns runs apply in one transaction on the execution lease, under
+	// the tenant's Session lock, and commits only when apply succeeds. A
+	// malformed ID is ErrInvalidInput and a missing Session ErrNotFound; a
+	// publicly deleted Session still journals and settles its Turns.
+	WithTurns(ctx context.Context, tenant, session string, apply func(context.Context, TurnTx) error) error
+}
+
+// decideTransition decides the status change of current that transition asks
+// for. A transition ValidTransition does not allow, an outcome that is not one
+// JSON object of at most 512 KiB, and an outcome on a Turn that does not end
+// are ErrInvalidInput. A Turn no longer in the expected status, and a Turn
+// with a cancellation request that would resume, are ErrTurnConflict.
+func decideTransition(current Turn, transition TurnTransition) (TurnStatusChange, error) {
+	if !ValidTransition(transition.ExpectedStatus, transition.Status) || len(transition.Outcome) > maxOutcomeBytes {
+		return TurnStatusChange{}, fmt.Errorf("%w: invalid turn transition or outcome size", ErrInvalidInput)
+	}
+	outcome, err := jsonobject.Normalize(transition.Outcome)
+	if err != nil {
+		return TurnStatusChange{}, fmt.Errorf("%w: %w", ErrInvalidInput, err)
+	}
+	if !TerminalStatus(transition.Status) && string(outcome) != "{}" {
+		return TurnStatusChange{}, fmt.Errorf("%w: outcome requires a terminal status", ErrInvalidInput)
+	}
+	if current.Status != transition.ExpectedStatus || (transition.Status == TurnInProgress && !current.CancelRequestedAt.IsZero()) {
+		return TurnStatusChange{}, ErrTurnConflict
+	}
+	return TurnStatusChange{Expected: transition.ExpectedStatus, Status: transition.Status, Outcome: outcome}, nil
+}
+
+// TransitionTurn moves the Session's root Turn as transition asks, a
+// compare-and-set on its status, and publishes what the move settles. A Turn
+// that keeps running journals its event. A Turn that ends projects its
+// outcome, then settles as EndTurn decides from the Turn read after the
+// projection, which may record its usage. An ended Turn is never reopened and
+// its outcome never overwritten, including by retries.
+func TransitionTurn(ctx context.Context, tx TurnTransitionTx, turn string, transition TurnTransition) (Turn, error) {
+	current, err := tx.LoadTurn(ctx, turn)
+	if err != nil {
+		return Turn{}, err
+	}
+	change, err := decideTransition(current, transition)
+	if err != nil {
+		return Turn{}, err
+	}
+	if change.Expected == TurnQueued && change.Status == TurnInProgress {
+		if err := CheckComputeAdmission(ctx, tx); err != nil {
+			return Turn{}, err
+		}
+	}
+	moved, err := tx.ApplyTurnStatus(ctx, turn, change)
+	if err != nil {
+		return Turn{}, err
+	}
+	if !TerminalStatus(moved.Status) {
+		if err := tx.AppendChanges(ctx, TurnChanges(moved, false)...); err != nil {
+			return Turn{}, err
+		}
+		return moved, nil
+	}
+	if err := ProjectSource(ctx, tx, Source{Turn: moved.ID, Kind: "execution_" + moved.Status, Payload: moved.Outcome, CreatedAt: moved.CompletedAt}); err != nil {
+		return Turn{}, err
+	}
+	return settleEnd(ctx, tx, turn)
+}
+
+// settleEnd settles a Turn that ended as EndTurn decides, from the Turn as the
+// transaction has left it, and returns that Turn.
+func settleEnd(ctx context.Context, tx TurnTransitionTx, turn string) (Turn, error) {
+	ended, err := tx.LoadTurn(ctx, turn)
+	if err != nil {
+		return Turn{}, err
+	}
+	ending, err := tx.LoadEnding(ctx, turn)
+	if err != nil {
+		return Turn{}, err
+	}
+	return ended, tx.ApplyTurnEnd(ctx, turn, EndTurn(ended, ending))
+}
+
+// decideCompletion decides whether an execution may end a Turn in status
+// current with status: an in-progress Turn ends in any terminal status, and a
+// waiting Turn, which still waits on actions, only fails or is cancelled.
+// Anything else is ErrTurnConflict.
+func decideCompletion(current, status string) error {
+	if current == TurnInProgress || (current == TurnWaiting && status != TurnCompleted) {
+		return nil
+	}
+	return ErrTurnConflict
+}
+
+// sourceCompletedAt reads the native completion time a completed outcome
+// reports in done.source_completed_at_ms, zero when it reports none. An
+// outcome that does not decode, or a time that is not positive, is
+// ErrInvalidInput. Native and Core timestamps come from independent host
+// clocks: the Turn keeps the source time, while committed activity uses the
+// database clock.
+func sourceCompletedAt(outcome json.RawMessage) (time.Time, error) {
+	var snapshot struct {
+		Done *struct {
+			SourceCompletedAtMS *int64 `json:"source_completed_at_ms"`
+		} `json:"done"`
+	}
+	if json.Unmarshal(outcome, &snapshot) != nil {
+		return time.Time{}, ErrInvalidInput
+	}
+	if snapshot.Done == nil || snapshot.Done.SourceCompletedAtMS == nil {
+		return time.Time{}, nil
+	}
+	ms := *snapshot.Done.SourceCompletedAtMS
+	if ms <= 0 {
+		return time.Time{}, ErrInvalidInput
+	}
+	return time.UnixMilli(ms), nil
+}
+
+// checkInputsApplied requires that the execution applied every message input
+// of the Turn through sequence appliedThrough; otherwise it is
+// ErrUnappliedInputs.
+func checkInputsApplied(ctx context.Context, tx TurnTx, turn string, appliedThrough int64) error {
+	pending, err := tx.HasUnappliedInputs(ctx, turn, appliedThrough)
+	if err != nil {
+		return err
+	}
+	if pending {
+		return ErrUnappliedInputs
+	}
+	return nil
+}
+
+// TransitionTurn moves the tenant's root Turn as transition asks, as the
+// TransitionTurn procedure decides. A dispatcher claims a queued Turn as in
+// progress before it sends the Turn's work to a Runtime. A malformed ID is
+// ErrInvalidInput.
+func (o *ExecutionOperations) TransitionTurn(ctx context.Context, tenant, session, turn string, transition TurnTransition) (Turn, error) {
+	if !validID(tenant) || !validID(session) || !validID(turn) {
+		return Turn{}, ErrInvalidInput
+	}
+	var result Turn
+	err := o.storage.WithTurns(ctx, tenant, session, func(ctx context.Context, tx TurnTx) error {
+		var err error
+		result, err = TransitionTurn(ctx, tx, turn, transition)
+		return err
+	})
+	return result, err
+}
+
+// CompleteExecution ends the Turn an execution ran with the execution's
+// terminal status and outcome. The status change, the outcome's journal entry,
+// the native session that continues the Session's history and the Turn's
+// settlement, which publishes or discards its staged Artifacts, commit
+// together. A Turn completes only when the execution applied its message
+// inputs through appliedThrough; otherwise it is ErrUnappliedInputs. A
+// malformed ID, a status that does not end the Turn, an outcome that is not
+// one JSON object of at most 512 KiB, a native session ID over 512 bytes and a
+// negative appliedThrough are ErrInvalidInput.
+func (o *ExecutionOperations) CompleteExecution(ctx context.Context, tenant, session, turn, status string, outcome json.RawMessage, nativeID string, appliedThrough int64) (Turn, error) {
+	if !validID(tenant) || !validID(session) || !validID(turn) {
+		return Turn{}, ErrInvalidInput
+	}
+	if !TerminalStatus(status) || len(outcome) > maxOutcomeBytes || len(nativeID) > 512 || appliedThrough < 0 {
+		return Turn{}, ErrInvalidInput
+	}
+	outcome, err := jsonobject.Normalize(outcome)
+	if err != nil {
+		return Turn{}, fmt.Errorf("%w: %w", ErrInvalidInput, err)
+	}
+	var result Turn
+	err = o.storage.WithTurns(ctx, tenant, session, func(ctx context.Context, tx TurnTx) error {
+		current, found, err := tx.LoadJournalTurn(ctx, turn)
+		if err != nil {
+			return err
+		}
+		if !found {
+			return ErrNotFound
+		}
+		if err := decideCompletion(current.Status, status); err != nil {
+			return err
+		}
+		change := TurnStatusChange{Expected: current.Status, Status: status, Outcome: outcome}
+		if status == TurnCompleted {
+			if err := checkInputsApplied(ctx, tx, turn, appliedThrough); err != nil {
+				return err
+			}
+			if change.SourceCompletedAt, err = sourceCompletedAt(outcome); err != nil {
+				return err
+			}
+		}
+		if _, err := tx.ApplyTurnStatus(ctx, turn, change); err != nil {
+			return err
+		}
+		if err := AppendTurnEvent(ctx, tx, turn, current.EventCount, ExecutionEvent{Kind: "execution_" + status, Payload: outcome}); err != nil {
+			return err
+		}
+		if nativeID != "" {
+			if err := tx.RememberNativeSession(ctx, nativeID); err != nil {
+				return err
+			}
+		}
+		result, err = settleEnd(ctx, tx, turn)
+		return err
+	})
+	return result, err
+}
+
+// BeginTurnArtifactCapture admits the capture of an in-progress Turn's
+// Artifacts once the execution applied its message inputs through
+// appliedThrough; otherwise it is ErrUnappliedInputs. A Turn that is not in
+// progress, has a cancellation request or already captures is ErrTurnConflict.
+// A malformed ID or a negative appliedThrough is ErrInvalidInput.
+func (o *ExecutionOperations) BeginTurnArtifactCapture(ctx context.Context, tenant, session, turn string, appliedThrough int64) error {
+	if !validID(tenant) || !validID(session) || !validID(turn) || appliedThrough < 0 {
+		return ErrInvalidInput
+	}
+	return o.storage.WithTurns(ctx, tenant, session, func(ctx context.Context, tx TurnTx) error {
+		current, err := tx.LoadTurn(ctx, turn)
+		if err != nil {
+			return err
+		}
+		if current.Status != TurnInProgress || !current.CancelRequestedAt.IsZero() {
+			return ErrTurnConflict
+		}
+		if err := checkInputsApplied(ctx, tx, turn, appliedThrough); err != nil {
+			return err
+		}
+		return tx.BeginArtifactCapture(ctx, turn)
+	})
+}
+
+// AppendTurnEvents records an ordered batch of a Turn's execution observations
+// in its journal from position first and projects them, as the
+// AppendTurnEvents procedure decides. A malformed tenant, Session or Turn ID is
+// ErrInvalidInput, before the batch is validated and before the Session is
+// looked up. The journal is Core-internal; it is not the public event stream.
+func (o *ExecutionOperations) AppendTurnEvents(ctx context.Context, tenant, session, turn string, first int32, events []ExecutionEvent) error {
+	if !validID(tenant) || !validID(session) {
+		return ErrInvalidInput
+	}
+	batch, err := NewJournalBatch(turn, first, events)
+	if err != nil {
+		return err
+	}
+	return o.storage.WithTurns(ctx, tenant, session, func(ctx context.Context, tx TurnTx) error {
+		return AppendTurnEvents(ctx, tx, batch)
+	})
+}
diff --git a/services/core/internal/sessions/execution_turns_test.go b/services/core/internal/sessions/execution_turns_test.go
new file mode 100644
index 000000000..88fbca53f
--- /dev/null
+++ b/services/core/internal/sessions/execution_turns_test.go
@@ -0,0 +1,294 @@
+package sessions
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+)
+
+func TestDecideTransition(t *testing.T) {
+	cancelling := turnWith(TurnWaiting)
+	cancelling.CancelRequestedAt = time.Unix(1, 0)
+	big := json.RawMessage(`{"x":"` + strings.Repeat("x", maxOutcomeBytes) + `"}`)
+	for name, test := range map[string]struct {
+		current    Turn
+		transition TurnTransition
+		want       TurnStatusChange
+		err        error
+	}{
+		"start is admitted": {
+			current: turnWith(TurnQueued), transition: TurnTransition{ExpectedStatus: TurnQueued, Status: TurnInProgress},
+			want: TurnStatusChange{Expected: TurnQueued, Status: TurnInProgress, Outcome: json.RawMessage(`{}`)},
+		},
+		"wait keeps running": {
+			current: turnWith(TurnInProgress), transition: TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnWaiting, Outcome: json.RawMessage(`{}`)},
+			want: TurnStatusChange{Expected: TurnInProgress, Status: TurnWaiting, Outcome: json.RawMessage(`{}`)},
+		},
+		"failure ends": {
+			current: turnWith(TurnInProgress), transition: TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnFailed, Outcome: json.RawMessage(` {"error":"x"} `)},
+			want: TurnStatusChange{Expected: TurnInProgress, Status: TurnFailed, Outcome: json.RawMessage(`{"error":"x"}`)},
+		},
+		"cancelled waiting Turn ends":   {current: cancelling, transition: TurnTransition{ExpectedStatus: TurnWaiting, Status: TurnCancelled}, want: TurnStatusChange{Expected: TurnWaiting, Status: TurnCancelled, Outcome: json.RawMessage(`{}`)}},
+		"ended Turn never moves":        {current: turnWith(TurnCompleted), transition: TurnTransition{ExpectedStatus: TurnCompleted, Status: TurnFailed}, err: ErrInvalidInput},
+		"skipped status":                {current: turnWith(TurnQueued), transition: TurnTransition{ExpectedStatus: TurnQueued, Status: TurnCompleted}, err: ErrInvalidInput},
+		"oversized outcome":             {current: turnWith(TurnInProgress), transition: TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnFailed, Outcome: big}, err: ErrInvalidInput},
+		"outcome not an object":         {current: turnWith(TurnInProgress), transition: TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnFailed, Outcome: json.RawMessage(`[]`)}, err: ErrInvalidInput},
+		"outcome on a running Turn":     {current: turnWith(TurnInProgress), transition: TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnWaiting, Outcome: json.RawMessage(`{"a":1}`)}, err: ErrInvalidInput},
+		"invalid before conflict":       {current: turnWith(TurnCompleted), transition: TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnWaiting, Outcome: json.RawMessage(`{"a":1}`)}, err: ErrInvalidInput},
+		"status moved":                  {current: turnWith(TurnCompleted), transition: TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnFailed}, err: ErrTurnConflict},
+		"cancellation blocks resuming":  {current: cancelling, transition: TurnTransition{ExpectedStatus: TurnWaiting, Status: TurnInProgress}, err: ErrTurnConflict},
+		"cancellation blocks the start": {current: func() Turn { turn := turnWith(TurnQueued); turn.CancelRequestedAt = time.Unix(1, 0); return turn }(), transition: TurnTransition{ExpectedStatus: TurnQueued, Status: TurnInProgress}, err: ErrTurnConflict},
+	} {
+		got, err := decideTransition(test.current, test.transition)
+		if !errors.Is(err, test.err) {
+			t.Fatalf("%s: %v, want %v", name, err, test.err)
+		}
+		if !reflect.DeepEqual(got, test.want) {
+			t.Fatalf("%s: %+v, want %+v", name, got, test.want)
+		}
+	}
+}
+
+func TestDecideCompletion(t *testing.T) {
+	for _, test := range []struct {
+		current, status string
+		err             error
+	}{
+		{TurnInProgress, TurnCompleted, nil},
+		{TurnInProgress, TurnFailed, nil},
+		{TurnInProgress, TurnCancelled, nil},
+		{TurnWaiting, TurnFailed, nil},
+		{TurnWaiting, TurnCancelled, nil},
+		{TurnWaiting, TurnCompleted, ErrTurnConflict},
+		{TurnQueued, TurnFailed, ErrTurnConflict},
+		{TurnCompleted, TurnFailed, ErrTurnConflict},
+	} {
+		if err := decideCompletion(test.current, test.status); !errors.Is(err, test.err) {
+			t.Fatalf("%s to %s: %v, want %v", test.current, test.status, err, test.err)
+		}
+	}
+}
+
+func TestSourceCompletedAt(t *testing.T) {
+	for outcome, want := range map[string]struct {
+		at  time.Time
+		err error
+	}{
+		`{}`:          {},
+		`{"done":{}}`: {},
+		`{"done":{"source_completed_at_ms":1500}}`: {at: time.UnixMilli(1500)},
+		`{"done":{"source_completed_at_ms":0}}`:    {err: ErrInvalidInput},
+		`{"done":{"source_completed_at_ms":"x"}}`:  {err: ErrInvalidInput},
+	} {
+		at, err := sourceCompletedAt(json.RawMessage(outcome))
+		if !errors.Is(err, want.err) || !at.Equal(want.at) {
+			t.Fatalf("%s: %v %v, want %v %v", outcome, at, err, want.at, want.err)
+		}
+	}
+}
+
+// moves is a fake ApplyTurnStatus that returns the Turn in its new status.
+func moves(change TurnStatusChange) (Turn, error) {
+	turn := turnWith(change.Status)
+	turn.Outcome = change.Outcome
+	return turn, nil
+}
+
+// A queued Turn starts only after compute admission, and a Turn that keeps
+// running journals its event.
+func TestTransitionTurnStarts(t *testing.T) {
+	f := &fakeTx{t: t, loadTurn: returns(turnWith(TurnQueued)), loadComputeSuspension: returns(false), applyTurnStatus: moves, appendChanges: func([]SessionChange) error { return nil }}
+	turn, err := TransitionTurn(t.Context(), f, testTurn, TurnTransition{ExpectedStatus: TurnQueued, Status: TurnInProgress})
+	if err != nil || turn.Status != TurnInProgress {
+		t.Fatal(turn, err)
+	}
+	assertCalls(t, f, "LoadTurn "+testTurn, "LoadComputeSuspension", "ApplyTurnStatus "+testTurn+" queued in_progress {}", "AppendChanges agent.session.turn.in_progress")
+
+	f = &fakeTx{t: t, loadTurn: returns(turnWith(TurnQueued)), loadComputeSuspension: returns(true)}
+	if _, err := TransitionTurn(t.Context(), f, testTurn, TurnTransition{ExpectedStatus: TurnQueued, Status: TurnInProgress}); !errors.Is(err, ErrTurnConflict) {
+		t.Fatal(err)
+	}
+	assertCalls(t, f, "LoadTurn "+testTurn, "LoadComputeSuspension")
+}
+
+// A Turn that ends projects its outcome, then settles from the Turn as the
+// projection left it.
+func TestTransitionTurnEnds(t *testing.T) {
+	outcome := `{"done":{"usage":{"tokens":{"cached_input_tokens":0,"input_tokens":1,"output_tokens":2,"reasoning_output_tokens":0,"total_tokens":3}}}}`
+	settled := turnWith(TurnFailed)
+	settled.Usage = json.RawMessage(`{"total_tokens":3}`)
+	read := []Turn{turnWith(TurnInProgress), settled}
+	var end TurnEnd
+	f := &fakeTx{
+		t: t, loadTurn: func() (Turn, error) { turn := read[0]; read = read[1:]; return turn, nil }, applyTurnStatus: moves,
+		putTurnUsage: func(v1.TokenUsage) error { return nil }, loadEnding: returns(Ending{}), applyTurnEnd: func(e TurnEnd) error { end = e; return nil },
+	}
+	turn, err := TransitionTurn(t.Context(), f, testTurn, TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnFailed, Outcome: json.RawMessage(outcome)})
+	if err != nil {
+		t.Fatal(err)
+	}
+	assertCalls(t, f, "LoadTurn "+testTurn, "ApplyTurnStatus "+testTurn+" in_progress failed "+outcome, "PutTurnUsage "+testTurn, "LoadTurn "+testTurn, "LoadEnding "+testTurn, "ApplyTurnEnd "+testTurn)
+	if string(turn.Usage) != string(settled.Usage) || end.Artifacts != DiscardArtifacts {
+		t.Fatal(turn, end)
+	}
+}
+
+// A rejected transition writes nothing.
+func TestTransitionTurnRejectsWithoutWrites(t *testing.T) {
+	f := &fakeTx{t: t, loadTurn: returns(turnWith(TurnCompleted))}
+	if _, err := TransitionTurn(t.Context(), f, testTurn, TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnFailed}); !errors.Is(err, ErrTurnConflict) {
+		t.Fatal(err)
+	}
+	assertCalls(t, f, "LoadTurn "+testTurn)
+
+	f = &fakeTx{t: t, loadTurn: func() (Turn, error) { return Turn{}, ErrNotFound }}
+	if _, err := TransitionTurn(t.Context(), f, testTurn, TurnTransition{ExpectedStatus: TurnInProgress, Status: TurnFailed}); !errors.Is(err, ErrNotFound) {
+		t.Fatal(err)
+	}
+	assertCalls(t, f, "LoadTurn "+testTurn)
+}
+
+// turnOperations runs every Turn transaction of the tenant's Session on tx.
+func turnOperations(t *testing.T, tx *fakeTx) *ExecutionOperations {
+	t.Helper()
+	operations, err := NewExecutionOperations(&fakeExecutionStorage{t: t, withTurns: func(ctx context.Context, tenant, session string, apply func(context.Context, TurnTx) error) error {
+		if tenant != testTenant || session != testSession {
+			t.Fatalf("Session %s %s", tenant, session)
+		}
+		return apply(ctx, tx)
+	}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return operations
+}
+
+// A completed execution checks its inputs, moves the Turn with the source
+// completion time, journals the outcome after the last entry, remembers the
+// native session and settles the Turn, which publishes its Artifacts.
+func TestCompleteExecutionOrder(t *testing.T) {
+	outcome := `{"done":{"source_completed_at_ms":1500}}`
+	var end TurnEnd
+	f := &fakeTx{
+		t: t, loadJournalTurn: func() (JournalTurn, bool, error) {
+			return JournalTurn{Status: TurnInProgress, EventCount: 4}, true, nil
+		},
+		hasUnappliedInputs: returns(false), applyTurnStatus: moves, insertEvent: done, countEvents: done, loadEventSources: returns([]Source(nil)),
+		rememberNativeSession: done, loadTurn: returns(turnWith(TurnCompleted)), loadEnding: returns(Ending{}),
+		applyTurnEnd: func(e TurnEnd) error { end = e; return nil },
+	}
+	turn, err := turnOperations(t, f).CompleteExecution(t.Context(), testTenant, testSession, testTurn, TurnCompleted, json.RawMessage(outcome), "native-1", 7)
+	if err != nil || turn.Status != TurnCompleted {
+		t.Fatal(turn, err)
+	}
+	assertCalls(t, f,
+		"LoadJournalTurn "+testTurn, "HasUnappliedInputs "+testTurn+" 7",
+		"ApplyTurnStatus "+testTurn+" in_progress completed "+outcome+" 1500",
+		"InsertEvent "+testTurn+" 5 execution_completed", "CountEvents "+testTurn+" 1 "+fmt.Sprint(len(outcome)), "LoadEventSources "+testTurn+" 5",
+		"RememberNativeSession native-1", "LoadTurn "+testTurn, "LoadEnding "+testTurn, "ApplyTurnEnd "+testTurn,
+	)
+	if end.Artifacts != PublishArtifacts {
+		t.Fatal(end)
+	}
+}
+
+// A failed execution of a waiting Turn skips the input check and the native
+// session, and settles the Turn, which discards its Artifacts.
+func TestCompleteExecutionFails(t *testing.T) {
+	var end TurnEnd
+	f := &fakeTx{
+		t: t, loadJournalTurn: func() (JournalTurn, bool, error) { return JournalTurn{Status: TurnWaiting}, true, nil },
+		applyTurnStatus: moves, insertEvent: done, countEvents: done, loadEventSources: returns([]Source(nil)),
+		loadTurn: returns(turnWith(TurnFailed)), loadEnding: returns(Ending{}), applyTurnEnd: func(e TurnEnd) error { end = e; return nil },
+	}
+	if _, err := turnOperations(t, f).CompleteExecution(t.Context(), testTenant, testSession, testTurn, TurnFailed, nil, "", 0); err != nil {
+		t.Fatal(err)
+	}
+	assertCalls(t, f, "LoadJournalTurn "+testTurn, "ApplyTurnStatus "+testTurn+" waiting failed {}", "InsertEvent "+testTurn+" 1 execution_failed", "CountEvents "+testTurn+" 1 2", "LoadEventSources "+testTurn+" 1", "LoadTurn "+testTurn, "LoadEnding "+testTurn, "ApplyTurnEnd "+testTurn)
+	if end.Artifacts != DiscardArtifacts {
+		t.Fatal(end)
+	}
+}
+
+func TestCompleteExecutionRejects(t *testing.T) {
+	for name, test := range map[string]struct {
+		turn    JournalTurn
+		found   bool
+		pending bool
+		outcome string
+		err     error
+		calls   []string
+	}{
+		"missing Turn":           {err: ErrNotFound, calls: []string{"LoadJournalTurn " + testTurn}},
+		"waiting Turn completes": {turn: JournalTurn{Status: TurnWaiting}, found: true, err: ErrTurnConflict, calls: []string{"LoadJournalTurn " + testTurn}},
+		"unapplied inputs":       {turn: JournalTurn{Status: TurnInProgress}, found: true, pending: true, err: ErrUnappliedInputs, calls: []string{"LoadJournalTurn " + testTurn, "HasUnappliedInputs " + testTurn + " 0"}},
+		"bad source time":        {turn: JournalTurn{Status: TurnInProgress}, found: true, outcome: `{"done":{"source_completed_at_ms":-1}}`, err: ErrInvalidInput, calls: []string{"LoadJournalTurn " + testTurn, "HasUnappliedInputs " + testTurn + " 0"}},
+	} {
+		f := &fakeTx{t: t, loadJournalTurn: func() (JournalTurn, bool, error) { return test.turn, test.found, nil }, hasUnappliedInputs: returns(test.pending)}
+		if _, err := turnOperations(t, f).CompleteExecution(t.Context(), testTenant, testSession, testTurn, TurnCompleted, json.RawMessage(test.outcome), "", 0); !errors.Is(err, test.err) {
+			t.Fatalf("%s: %v", name, err)
+		}
+		assertCalls(t, f, test.calls...)
+	}
+	for name, call := range map[string]func(*ExecutionOperations) error{
+		"malformed Turn": func(o *ExecutionOperations) error {
+			_, err := o.CompleteExecution(t.Context(), testTenant, testSession, "x", TurnFailed, nil, "", 0)
+			return err
+		},
+		"running status": func(o *ExecutionOperations) error {
+			_, err := o.CompleteExecution(t.Context(), testTenant, testSession, testTurn, TurnWaiting, nil, "", 0)
+			return err
+		},
+		"long native": func(o *ExecutionOperations) error {
+			_, err := o.CompleteExecution(t.Context(), testTenant, testSession, testTurn, TurnFailed, nil, strings.Repeat("n", 513), 0)
+			return err
+		},
+		"negative applied": func(o *ExecutionOperations) error {
+			_, err := o.CompleteExecution(t.Context(), testTenant, testSession, testTurn, TurnFailed, nil, "", -1)
+			return err
+		},
+		"array outcome": func(o *ExecutionOperations) error {
+			_, err := o.CompleteExecution(t.Context(), testTenant, testSession, testTurn, TurnFailed, json.RawMessage(`[]`), "", 0)
+			return err
+		},
+	} {
+		if err := call(unusedStorage(t)); !errors.Is(err, ErrInvalidInput) {
+			t.Fatalf("%s: %v", name, err)
+		}
+	}
+}
+
+func TestBeginTurnArtifactCapture(t *testing.T) {
+	f := &fakeTx{t: t, loadTurn: returns(turnWith(TurnInProgress)), hasUnappliedInputs: returns(false), beginArtifactCapture: done}
+	if err := turnOperations(t, f).BeginTurnArtifactCapture(t.Context(), testTenant, testSession, testTurn, 3); err != nil {
+		t.Fatal(err)
+	}
+	assertCalls(t, f, "LoadTurn "+testTurn, "HasUnappliedInputs "+testTurn+" 3", "BeginArtifactCapture "+testTurn)
+
+	cancelling := turnWith(TurnInProgress)
+	cancelling.CancelRequestedAt = time.Unix(1, 0)
+	for _, current := range []Turn{turnWith(TurnWaiting), cancelling} {
+		f = &fakeTx{t: t, loadTurn: returns(current)}
+		if err := turnOperations(t, f).BeginTurnArtifactCapture(t.Context(), testTenant, testSession, testTurn, 3); !errors.Is(err, ErrTurnConflict) {
+			t.Fatal(current.Status, err)
+		}
+		assertCalls(t, f, "LoadTurn "+testTurn)
+	}
+
+	f = &fakeTx{t: t, loadTurn: returns(turnWith(TurnInProgress)), hasUnappliedInputs: returns(true)}
+	if err := turnOperations(t, f).BeginTurnArtifactCapture(t.Context(), testTenant, testSession, testTurn, 3); !errors.Is(err, ErrUnappliedInputs) {
+		t.Fatal(err)
+	}
+	assertCalls(t, f, "LoadTurn "+testTurn, "HasUnappliedInputs "+testTurn+" 3")
+
+	if err := unusedStorage(t).BeginTurnArtifactCapture(t.Context(), testTenant, testSession, testTurn, -1); !errors.Is(err, ErrInvalidInput) {
+		t.Fatal(err)
+	}
+}
diff --git a/services/core/internal/sessions/functions_test.go b/services/core/internal/sessions/functions_test.go
index 1b1a33f5b..76d661868 100644
--- a/services/core/internal/sessions/functions_test.go
+++ b/services/core/internal/sessions/functions_test.go
@@ -24,7 +24,6 @@ type fakeFunctionTx struct {
 	createFunctionCall       func() error
 	loadFunctionCall         func() (FunctionCall, bool, error)
 	applyFunctionResult      func() error
-	applyFunctionTurnStatus  func() (Turn, error)
 }
 
 var (
@@ -77,11 +76,6 @@ func (f *fakeFunctionTx) ApplyFunctionResult(_ context.Context, turn, call strin
 	return f.applyFunctionResult()
 }
 
-func (f *fakeFunctionTx) ApplyFunctionTurnStatus(_ context.Context, turn, expected, status string) (Turn, error) {
-	f.record("ApplyFunctionTurnStatus", f.applyFunctionTurnStatus != nil, turn, expected, status)
-	return f.applyFunctionTurnStatus()
-}
-
 func cancelling(status string) Turn {
 	turn := turnWith(status)
 	turn.CancelRequestedAt = time.Unix(1700000001, 0)
diff --git a/services/core/internal/sessions/journal_test.go b/services/core/internal/sessions/journal_test.go
index 40c0e08fe..35152b1da 100644
--- a/services/core/internal/sessions/journal_test.go
+++ b/services/core/internal/sessions/journal_test.go
@@ -139,7 +139,7 @@ func TestAppendTurnEvent(t *testing.T) {
 func TestExecutionOperationsValidationOrder(t *testing.T) {
 	big := json.RawMessage(`{"text":"` + strings.Repeat("x", 400*1024) + `"}`)
 	oversized := []ExecutionEvent{{Kind: "delta", Payload: big}, {Kind: "delta", Payload: big}, {Kind: "delta", Payload: big}}
-	operations, err := NewExecutionOperations(&fakeExecutionStorage{t: t, withTurnJournal: func(context.Context, string, string, func(context.Context, TurnJournalTx) error) error {
+	operations, err := NewExecutionOperations(&fakeExecutionStorage{t: t, withTurns: func(context.Context, string, string, func(context.Context, TurnTx) error) error {
 		return ErrNotFound
 	}})
 	if err != nil {
diff --git a/services/core/internal/sessions/model_execution.go b/services/core/internal/sessions/model_execution.go
new file mode 100644
index 000000000..632ac47bb
--- /dev/null
+++ b/services/core/internal/sessions/model_execution.go
@@ -0,0 +1,16 @@
+package sessions
+
+import (
+	"context"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+)
+
+// ModelExecutionReader reads the model execution a Session froze at creation.
+type ModelExecutionReader interface {
+	// SessionModelExecution opens the model provider the tenant's Session
+	// froze at creation. A Session without one is ErrNotFound, and a service
+	// without the credential key credentialcrypto.ErrUnavailable; a frozen
+	// provider that does not open, decode or validate is an internal error.
+	SessionModelExecution(ctx context.Context, tenant, session string) (*v1.ModelProviderInput, error)
+}
diff --git a/services/core/internal/sessions/reader.go b/services/core/internal/sessions/reader.go
index fe80400aa..32dd253bd 100644
--- a/services/core/internal/sessions/reader.go
+++ b/services/core/internal/sessions/reader.go
@@ -10,5 +10,7 @@ type Reader interface {
 	EnvironmentReader
 	ExecutorCredentialReader
 	ItemReader
+	ModelExecutionReader
 	SubagentReader
+	TurnReader
 }
diff --git a/services/core/internal/sessions/transaction_test.go b/services/core/internal/sessions/transaction_test.go
index 2f54fb6f2..6cc0809bd 100644
--- a/services/core/internal/sessions/transaction_test.go
+++ b/services/core/internal/sessions/transaction_test.go
@@ -89,6 +89,11 @@ type fakeTx struct {
 	recordTerminalActivity func() error
 	loadChildItem          func() (StoredChildItem, bool, error)
 	putChildItem           func(ChildItem) error
+
+	applyTurnStatus       func(TurnStatusChange) (Turn, error)
+	hasUnappliedInputs    func() (bool, error)
+	rememberNativeSession func() error
+	beginArtifactCapture  func() error
 }
 
 var (
@@ -96,8 +101,6 @@ var (
 	_ InputStartTx             = (*fakeTx)(nil)
 	_ ComputeAdmissionTx       = (*fakeTx)(nil)
 	_ EnvironmentDeviceTx      = (*fakeTx)(nil)
-	_ TurnJournalTx            = (*fakeTx)(nil)
-	_ TurnEventTx              = (*fakeTx)(nil)
 	_ InputProjectionTx        = (*fakeTx)(nil)
 	_ InitializationTx         = (*fakeTx)(nil)
 	_ ConnectionTx             = (*fakeTx)(nil)
@@ -105,6 +108,7 @@ var (
 	_ EnrollmentTx             = (*fakeTx)(nil)
 	_ FileWriteReservationTx   = (*fakeTx)(nil)
 	_ FileWriteSettlementTx    = (*fakeTx)(nil)
+	_ TurnTx                   = (*fakeTx)(nil)
 
 	_ EnvironmentExecutorCredentialTx = (*fakeTx)(nil)
 )
@@ -312,6 +316,30 @@ func (f *fakeTx) PutChildItem(_ context.Context, item ChildItem) error {
 	return f.putChildItem(item)
 }
 
+func (f *fakeTx) ApplyTurnStatus(_ context.Context, turn string, change TurnStatusChange) (Turn, error) {
+	detail := []string{turn, change.Expected, change.Status, string(change.Outcome)}
+	if !change.SourceCompletedAt.IsZero() {
+		detail = append(detail, fmt.Sprint(change.SourceCompletedAt.UnixMilli()))
+	}
+	f.record("ApplyTurnStatus", f.applyTurnStatus != nil, detail...)
+	return f.applyTurnStatus(change)
+}
+
+func (f *fakeTx) HasUnappliedInputs(_ context.Context, turn string, appliedThrough int64) (bool, error) {
+	f.record("HasUnappliedInputs", f.hasUnappliedInputs != nil, turn, fmt.Sprint(appliedThrough))
+	return f.hasUnappliedInputs()
+}
+
+func (f *fakeTx) RememberNativeSession(_ context.Context, native string) error {
+	f.record("RememberNativeSession", f.rememberNativeSession != nil, native)
+	return f.rememberNativeSession()
+}
+
+func (f *fakeTx) BeginArtifactCapture(_ context.Context, turn string) error {
+	f.record("BeginArtifactCapture", f.beginArtifactCapture != nil, turn)
+	return f.beginArtifactCapture()
+}
+
 // returns is a fake method that reads value.
 func returns[T any](value T) func() (T, error) {
 	return func() (T, error) { return value, nil }
diff --git a/services/core/internal/sessions/turn.go b/services/core/internal/sessions/turn.go
index c7ad7e11c..f6a4574c5 100644
--- a/services/core/internal/sessions/turn.go
+++ b/services/core/internal/sessions/turn.go
@@ -1,6 +1,7 @@
 package sessions
 
 import (
+	"context"
 	"encoding/json"
 	"time"
 )
@@ -53,6 +54,8 @@ func ValidTransition(from, to string) bool {
 	}
 }
 
+// TurnTransition asks to move a Turn from ExpectedStatus to Status. Only a
+// Turn that ends carries an outcome.
 type TurnTransition struct {
 	ExpectedStatus string
 	Status         string
@@ -91,3 +94,22 @@ type ExecutionBinding struct {
 	NativeSessionID string
 	HasStartedTurn  bool
 }
+
+// TurnReader reads root Turns. Subagent Turns are not Session Turns;
+// SubagentReader reads them.
+type TurnReader interface {
+	// GetTurn reads the tenant's root Turn of the Session. A malformed tenant
+	// is ErrInvalidInput; a malformed Session or Turn ID, a Subagent Turn ID
+	// and a missing Turn are ErrNotFound.
+	GetTurn(ctx context.Context, tenant, session, turn string) (Turn, error)
+	// ListTurns pages the root Turns of the tenant's Session that was not
+	// publicly deleted by creation time and ID, after the Turn cursor names.
+	// A page size outside 1..100 is ErrInvalidInput; a missing Session or
+	// cursor Turn is ErrNotFound.
+	ListTurns(ctx context.Context, tenant, session, cursor string, limit int, ascending bool) (TurnPage, error)
+	// ListExecutionWork lists, in ID order after the Turn after names, up to
+	// 100 root Turns in statuses across tenants; the queued Turns of a publicly
+	// deleted Session are not work. With connectedDevices not nil, it lists
+	// only the Turns of tenants that own one of those devices, unrevoked.
+	ListExecutionWork(ctx context.Context, after string, statuses, connectedDevices []string) ([]ExecutionWork, error)
+}
diff --git a/services/core/internal/store/admin_session_archive_test.go b/services/core/internal/store/admin_session_archive_test.go
index ba8d933d1..511a6f458 100644
--- a/services/core/internal/store/admin_session_archive_test.go
+++ b/services/core/internal/store/admin_session_archive_test.go
@@ -222,7 +222,7 @@ func TestManagedSessionArchiveAuditFailureRollsBack(t *testing.T) {
 	if _, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1); err != nil {
 		t.Fatal(err)
 	}
-	turn, err := s.GetTurn(t.Context(), tenant, session.ID, input.TurnID)
+	turn, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnInProgress || turn.CancelRequestedAt.IsZero() {
 		t.Fatal("archive did not request cancellation or fabricated settlement", turn, err)
 	}
diff --git a/services/core/internal/store/admin_session_archive_worker_http_test.go b/services/core/internal/store/admin_session_archive_worker_http_test.go
index 146de71bd..df4b565e1 100644
--- a/services/core/internal/store/admin_session_archive_worker_http_test.go
+++ b/services/core/internal/store/admin_session_archive_worker_http_test.go
@@ -119,7 +119,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil || allocation.ID != owner.ID || allocation.State != "cleanup_pending" {
 		t.Fatal("archive did not retain cleanup ownership", allocation, err)
 	}
-	turn, err := s.GetTurn(t.Context(), project.TenantID, active.ID, input.TurnID)
+	turn, err := store.SessionAdapter(s).GetTurn(t.Context(), project.TenantID, active.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnCancelled {
 		t.Fatal("archive did not cancel queued work", turn, err)
 	}
diff --git a/services/core/internal/store/agent_execution_defaults_http_test.go b/services/core/internal/store/agent_execution_defaults_http_test.go
index 67eb2f2da..95b9ead57 100644
--- a/services/core/internal/store/agent_execution_defaults_http_test.go
+++ b/services/core/internal/store/agent_execution_defaults_http_test.go
@@ -82,7 +82,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 		if json.Unmarshal(session.Configuration, &cfg) != nil || cfg.Agent.Model != model {
 			t.Fatal("model snapshot changed")
 		}
-		provider, err := st.SessionModelExecution(t.Context(), tenant, sessionID)
+		provider, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, sessionID)
 		if err != nil || provider.BaseURL != endpoint || provider.APIKey != key {
 			t.Fatal("provider snapshot mismatch", err)
 		}
@@ -106,7 +106,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 	created := id(call("POST", "/v1/agents/sessions", nativeHarness, uuid.NewString(), 201))
 	assertSnapshot(created, "model-override", "https://override.example/v1", "override-canary")
 	resolved, err := st.GetSession(t.Context(), tenant, created)
-	frozen, providerErr := st.SessionModelExecution(t.Context(), tenant, created)
+	frozen, providerErr := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, created)
 	if err != nil || providerErr != nil || resolved.Engine != "claude_sdk" || frozen == nil || frozen.Protocol != "anthropic" {
 		t.Fatal("harness override did not freeze the native provider", err, providerErr)
 	}
diff --git a/services/core/internal/store/archive_cancellation_test.go b/services/core/internal/store/archive_cancellation_test.go
index 3434dd0cb..4c173ad2b 100644
--- a/services/core/internal/store/archive_cancellation_test.go
+++ b/services/core/internal/store/archive_cancellation_test.go
@@ -182,7 +182,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			current, err := s.GetTurn(t.Context(), h.tenant, session.ID, input.TurnID)
+			current, err := store.SessionAdapter(s).GetTurn(t.Context(), h.tenant, session.ID, input.TurnID)
 			if err != nil || current.Status != sessions.TurnWaiting || current.CancelRequestedAt.IsZero() {
 				t.Fatal("archive must request rather than invent cancellation", current, err)
 			}
diff --git a/services/core/internal/store/artifact_lifecycle.go b/services/core/internal/store/artifact_lifecycle.go
deleted file mode 100644
index eb244e2fa..000000000
--- a/services/core/internal/store/artifact_lifecycle.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// BeginTurnArtifactCapture separates native completion from bounded output publication.
-// Later messages use the existing reservation path instead of the finished executor.
-func (s *Store) BeginTurnArtifactCapture(ctx context.Context, tenantID, sessionID, turnID string, appliedThrough int64) error {
-	lookup, err := sessionpg.TurnLookup(tenantID, sessionID, turnID)
-	if err != nil {
-		return err
-	}
-	if appliedThrough < 0 {
-		return sessions.ErrInvalidInput
-	}
-	return s.withSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		turn, err := q.GetTurn(ctx, lookup)
-		if errors.Is(err, pgx.ErrNoRows) {
-			return sessions.ErrNotFound
-		}
-		if err != nil {
-			return err
-		}
-		if turn.Status != sessions.TurnInProgress || turn.CancelRequestedAt.Valid {
-			return sessions.ErrTurnConflict
-		}
-		pending, err := q.HasUnappliedMessages(ctx, sqlc.HasUnappliedMessagesParams{SessionID: session, TurnID: lookup.ID, Sequence: appliedThrough})
-		if err != nil {
-			return err
-		}
-		if pending {
-			return sessions.ErrUnappliedInputs
-		}
-		count, err := q.BeginTurnArtifactCapture(ctx, sqlc.BeginTurnArtifactCaptureParams{SessionID: session, ID: lookup.ID})
-		if err == nil && count != 1 {
-			return sessions.ErrTurnConflict
-		}
-		return err
-	})
-}
diff --git a/services/core/internal/store/claude_execution_test.go b/services/core/internal/store/claude_execution_test.go
index 3a94c3829..b76101ae7 100644
--- a/services/core/internal/store/claude_execution_test.go
+++ b/services/core/internal/store/claude_execution_test.go
@@ -68,7 +68,7 @@ func TestClaudeWorkerSelectsStoredEngineAndRestrictiveCapabilities(t *testing.T)
 			}()
 			queued := func() {
 				time.Sleep(650 * time.Millisecond)
-				turn, err := h.s.GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+				turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 				if err != nil || turn.Status != sessions.TurnQueued {
 					t.Fatal(turn, err)
 				}
@@ -91,7 +91,7 @@ func TestClaudeWorkerSelectsStoredEngineAndRestrictiveCapabilities(t *testing.T)
 			}
 			h.write(input.TurnID, proto.TypeDone, proto.DonePayload{Content: "done", Metadata: map[string]any{proto.DoneMetaAgentSessionID: "claude-native"}})
 			waitTurn(t, h, input.TurnID, sessions.TurnCompleted)
-			bound, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+			bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 			if err != nil || bound.NativeSessionID != "claude-native" {
 				t.Fatal(bound, err)
 			}
@@ -112,7 +112,7 @@ func TestClaudeDispatcherRejectsUnsupportedConfigurationBeforeClaim(t *testing.T
 			if result := <-h.run(t.Context(), input.TurnID); result.err == nil {
 				t.Fatal("unsupported configuration claimed")
 			}
-			turn, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
+			turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
 			if err != nil || turn.Status != sessions.TurnQueued {
 				t.Fatal(turn, err)
 			}
@@ -126,7 +126,7 @@ func TestClaudeInvalidImageResultRejectsWholeBatchBeforePersistence(t *testing.T
 	worker := startOwnedWorker(t, t.Context(), h.db, h.d, h.owner())
 	defer func() { ctx, cancel := context.WithCancel(context.Background()); cancel(); _ = worker.Run(ctx) }()
 	input := h.message("start", "Run")
-	if _, err := h.s.TransitionTurn(t.Context(), h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := store.TransitionTurn(t.Context(), h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	call := sessions.FunctionCall{CallID: "public-call", ExecutorCallID: "native-call", Name: "lookup_ticket", Arguments: json.RawMessage(`{"ticket":"42"}`)}
@@ -148,7 +148,7 @@ func TestClaudeInvalidImageResultRejectsWholeBatchBeforePersistence(t *testing.T
 	if err != nil || saved.Result != nil || saved.Applied {
 		t.Fatal(saved, err)
 	}
-	turn, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
+	turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnWaiting || !turn.CancelRequestedAt.IsZero() {
 		t.Fatal(turn, err)
 	}
diff --git a/services/core/internal/store/claude_mcp_test.go b/services/core/internal/store/claude_mcp_test.go
index b72536d98..0a81a5a6c 100644
--- a/services/core/internal/store/claude_mcp_test.go
+++ b/services/core/internal/store/claude_mcp_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestClaudeMCPWaitsForCapableRuntime(t *testing.T) {
@@ -55,7 +56,7 @@ func TestClaudeMCPWaitsForCapableRuntime(t *testing.T) {
 					}
 				}()
 				time.Sleep(650 * time.Millisecond)
-				turn, err := h.s.GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+				turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 				if err != nil || turn.Status != sessions.TurnQueued {
 					t.Fatal("incapable runtime claimed work", turn, err)
 				}
@@ -121,7 +122,7 @@ func TestClaudeMCPUnsupportedSnapshotRejectedBeforeClaim(t *testing.T) {
 			if result := <-h.run(t.Context(), input.TurnID); result.err == nil {
 				t.Fatal("unsupported MCP configuration claimed")
 			}
-			turn, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
+			turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
 			if err != nil || turn.Status != sessions.TurnQueued {
 				t.Fatal(turn, err)
 			}
diff --git a/services/core/internal/store/command_output_test.go b/services/core/internal/store/command_output_test.go
index 8ae0b4ba5..b8e90e586 100644
--- a/services/core/internal/store/command_output_test.go
+++ b/services/core/internal/store/command_output_test.go
@@ -26,7 +26,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	event := func(kind, raw string) sessions.ExecutionEvent {
@@ -70,7 +70,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	if err := journal.AppendTurnEvents(ctx, tenant, session.ID, input.TurnID, 4, final); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{}`), "", input.Sequence); err != nil {
+	if _, err := journal.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{}`), "", input.Sequence); err != nil {
 		t.Fatal(err)
 	}
 	// Reopening the Store recovers committed Items without creating events.
diff --git a/services/core/internal/store/deployment_model_providers_http_test.go b/services/core/internal/store/deployment_model_providers_http_test.go
index e3a09f6c6..63866bca3 100644
--- a/services/core/internal/store/deployment_model_providers_http_test.go
+++ b/services/core/internal/store/deployment_model_providers_http_test.go
@@ -83,7 +83,7 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 	}
 	providerOf := func(sessionID string) string {
 		t.Helper()
-		provider, err := st.SessionModelExecution(t.Context(), tenant, sessionID)
+		provider, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, sessionID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -335,7 +335,7 @@ func TestNoneSessionRetryAfterDeploymentDefaultChanges(t *testing.T) {
 	}
 	key := uuid.NewString()
 	original := create(key)
-	if provider, err := st.SessionModelExecution(t.Context(), tenant, original); err != nil || provider.APIKey != "first-default-key" {
+	if provider, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, original); err != nil || provider.APIKey != "first-default-key" {
 		t.Fatal("none Session did not freeze the deployment default", err)
 	}
 	setDefault("rotated-default-key")
@@ -348,7 +348,7 @@ func TestNoneSessionRetryAfterDeploymentDefaultChanges(t *testing.T) {
 	if create(key) != original {
 		t.Fatal("retry after removal created another Session")
 	}
-	if provider, err := st.SessionModelExecution(t.Context(), tenant, original); err != nil || provider.APIKey != "first-default-key" {
+	if provider, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, original); err != nil || provider.APIKey != "first-default-key" {
 		t.Fatal("retry changed the frozen provider", err)
 	}
 	var revision uuid.UUID
@@ -401,7 +401,7 @@ func TestDeploymentProviderResolutionPairsRevisionDuringReplacement(t *testing.T
 	if err = db.pool.QueryRow(t.Context(), "SELECT deployment_provider_revision FROM session_execution_configuration WHERE session_id=$1", session.ID).Scan(&revision); err != nil || revision != original.Revision {
 		t.Fatal("tuple revision changed", err)
 	}
-	frozen, err := st.SessionModelExecution(t.Context(), tenant, session.ID)
+	frozen, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, session.ID)
 	if err != nil || frozen == nil || *frozen != provider {
 		t.Fatal("tuple bundle changed", err)
 	}
diff --git a/services/core/internal/store/devices.go b/services/core/internal/store/devices.go
deleted file mode 100644
index f61266d6e..000000000
--- a/services/core/internal/store/devices.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-func (s *Store) GetSessionExecutionBinding(ctx context.Context, tenantID, sessionID string) (sessions.ExecutionBinding, error) {
-	params, err := sessionpg.DeviceLookup(tenantID, sessionID)
-	if err != nil {
-		return sessions.ExecutionBinding{}, err
-	}
-	if err := s.requireInitializedEnvironment(ctx, params.TenantID, params.ID); err != nil {
-		return sessions.ExecutionBinding{}, err
-	}
-	row, err := s.queries.GetSessionExecutionBinding(ctx, sqlc.GetSessionExecutionBindingParams(params))
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.ExecutionBinding{}, sessions.ErrNotFound
-	}
-	if err != nil {
-		return sessions.ExecutionBinding{}, err
-	}
-	return sessions.ExecutionBinding{
-		Device:          executionDevice(row.ID, row.Name, row.EnvironmentID),
-		NativeSessionID: row.NativeSessionID,
-		HasStartedTurn:  row.HasStartedTurn,
-	}, nil
-}
-
-func executionDevice(id pgtype.UUID, name string, environmentID pgtype.UUID) sessions.ExecutionDevice {
-	value := sessions.ExecutionDevice{ID: uuid.UUID(id.Bytes).String(), Name: name}
-	if environmentID.Valid {
-		value.EnvironmentID = uuid.UUID(environmentID.Bytes).String()
-	}
-	return value
-}
diff --git a/services/core/internal/store/dispatch_test.go b/services/core/internal/store/dispatch_test.go
index 112b42b3a..e5ca9514c 100644
--- a/services/core/internal/store/dispatch_test.go
+++ b/services/core/internal/store/dispatch_test.go
@@ -268,7 +268,7 @@ func TestExecutionDispatchSteeringAndNativeContinuity(t *testing.T) {
 	newStore, db := newTestStoreDB(t)
 	h.s, h.db, h.owned = newStore, db, nil
 	h.d.Store = newStore
-	bound, err := newStore.GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, err := store.SessionAdapter(newStore).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "native-thread-1" {
 		t.Fatalf("native binding lost: %+v %v", bound, err)
 	}
@@ -300,7 +300,7 @@ func TestExecutionCancellationRequiresReceiptAndSurvivesContextEnd(t *testing.T)
 			if cancel.DeliveryID == "" {
 				t.Fatal("cancellation has no receipt identity")
 			}
-			current, err := h.s.GetTurn(context.Background(), h.tenant, h.session.ID, first.TurnID)
+			current, err := store.SessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, first.TurnID)
 			if err != nil || current.Status != sessions.TurnInProgress {
 				t.Fatal("cancel finished before receipt")
 			}
@@ -379,15 +379,16 @@ func TestExecutionOutcomeAndNativeBindingCommitTogether(t *testing.T) {
 	h := newDispatchHarness(t)
 	first := h.message("first", "Run")
 	ctx := context.Background()
-	_, err := h.s.TransitionTurn(ctx, h.tenant, h.session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
 	late := h.message("second", "Late")
-	if _, err := h.s.CompleteExecution(ctx, h.tenant, h.session.ID, first.TurnID, sessions.TurnCompleted, []byte(`{}`), "native-one", first.Sequence); !errors.Is(err, sessions.ErrUnappliedInputs) {
+	operations := h.owner().Sessions
+	if _, err := operations.CompleteExecution(ctx, h.tenant, h.session.ID, first.TurnID, sessions.TurnCompleted, []byte(`{}`), "native-one", first.Sequence); !errors.Is(err, sessions.ErrUnappliedInputs) {
 		t.Fatalf("unapplied completion: %v", err)
 	}
-	bound, _ := h.s.GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, _ := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if bound.NativeSessionID != "" {
 		t.Fatal("native ID committed without outcome")
 	}
@@ -397,7 +398,7 @@ func TestExecutionOutcomeAndNativeBindingCommitTogether(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			_, err := h.s.CompleteExecution(ctx, h.tenant, h.session.ID, first.TurnID, sessions.TurnCompleted, []byte(`{}`), native, late.Sequence)
+			_, err := operations.CompleteExecution(ctx, h.tenant, h.session.ID, first.TurnID, sessions.TurnCompleted, []byte(`{}`), native, late.Sequence)
 			errs <- err
 		}()
 	}
@@ -448,7 +449,7 @@ func TestExecutionRejectsRuntimeMissingCapabilityBeforeClaim(t *testing.T) {
 			if _, err := h.bound().Run(context.Background(), h.tenant, h.session.ID, first.TurnID); err == nil || err.Error() != tc.message {
 				t.Fatalf("Run error = %v, want %q", err, tc.message)
 			}
-			turn, err := h.s.GetTurn(context.Background(), h.tenant, h.session.ID, first.TurnID)
+			turn, err := store.SessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, first.TurnID)
 			if err != nil || turn.Status != sessions.TurnQueued {
 				t.Fatal("Runtime without a required capability claimed work")
 			}
diff --git a/services/core/internal/store/environment_claim_worker_test.go b/services/core/internal/store/environment_claim_worker_test.go
index c4dd8249c..8efa54b68 100644
--- a/services/core/internal/store/environment_claim_worker_test.go
+++ b/services/core/internal/store/environment_claim_worker_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
@@ -32,7 +33,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 					t.Fatal(err)
 				}
 			}
-			turn, err := s.GetTurn(t.Context(), tenant, pending.SessionID, turnID)
+			turn, err := store.SessionAdapter(s).GetTurn(t.Context(), tenant, pending.SessionID, turnID)
 			if err != nil || turn.Status != sessions.TurnInProgress || (deleted && turn.CancelRequestedAt.IsZero()) {
 				t.Fatal("promotion did not retain the active claim", turn, err)
 			}
@@ -50,7 +51,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 				t.Fatal(err)
 			}
 			awaitRelease()
-			turn, err = s.GetTurn(t.Context(), tenant, pending.SessionID, turnID)
+			turn, err = store.SessionAdapter(s).GetTurn(t.Context(), tenant, pending.SessionID, turnID)
 			var outcome struct {
 				ErrorCode string `json:"error_code"`
 			}
diff --git a/services/core/internal/store/environment_directory_test.go b/services/core/internal/store/environment_directory_test.go
index 087c97f60..d98cf67a4 100644
--- a/services/core/internal/store/environment_directory_test.go
+++ b/services/core/internal/store/environment_directory_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -133,7 +134,7 @@ func TestEnvironmentDirectoryWorkerReadsWithoutExecutionPrerequisites(t *testing
 	if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity != nil {
 		t.Fatal("directory read manufactured execution")
 	}
-	bound, err := h.s.GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 	if err != nil || bound.Device.ID != h.device.ID || bound.NativeSessionID != "" {
 		t.Fatal("directory read changed native history identity")
 	}
diff --git a/services/core/internal/store/environment_expiry_dispatch_test.go b/services/core/internal/store/environment_expiry_dispatch_test.go
index 9482a8dea..28770e2f1 100644
--- a/services/core/internal/store/environment_expiry_dispatch_test.go
+++ b/services/core/internal/store/environment_expiry_dispatch_test.go
@@ -35,7 +35,7 @@ func TestWorkerEnvironmentExpiryAtFullExecutionCapacity(t *testing.T) {
 	makeEnvironmentExpiryDue(t, pool, &due)
 	waitEnvironmentExpiry(t, h.s, tenant, due)
 	for i, request := range requests {
-		turn, err := h.s.GetTurn(t.Context(), h.tenant, active[i].ID, request.ID)
+		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, active[i].ID, request.ID)
 		if err != nil || turn.Status != sessions.TurnInProgress {
 			t.Fatal("expiry was not observed at full capacity", turn, err)
 		}
diff --git a/services/core/internal/store/environment_input_activity_test.go b/services/core/internal/store/environment_input_activity_test.go
index 1ed22d4ec..af7f32f8d 100644
--- a/services/core/internal/store/environment_input_activity_test.go
+++ b/services/core/internal/store/environment_input_activity_test.go
@@ -107,7 +107,7 @@ func TestEnvironmentInputActivitySettlementAndNewerWork(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			if _, err := writer.TransitionTurn(t.Context(), tenant, session.ID, prior[0].TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed, Outcome: []byte(`{}`)}); err != nil {
+			if _, err := transitionTurn(t.Context(), writer, tenant, session.ID, prior[0].TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed, Outcome: []byte(`{}`)}); err != nil {
 				t.Fatal(err)
 			}
 			reservation := reserveEnvironmentInput(t, s, tenant, session.ID, "waiting")
diff --git a/services/core/internal/store/environment_input_claim_test.go b/services/core/internal/store/environment_input_claim_test.go
index af872bf5b..4f588dad2 100644
--- a/services/core/internal/store/environment_input_claim_test.go
+++ b/services/core/internal/store/environment_input_claim_test.go
@@ -53,7 +53,7 @@ func TestEnvironmentInputConcurrentPromotionClaimsOnce(t *testing.T) {
 	if received != count || fresh != 1 {
 		t.Fatal("promotion authorized multiple starts", received, fresh)
 	}
-	turn, err := s.GetTurn(t.Context(), tenant, session.ID, turnID)
+	turn, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session.ID, turnID)
 	if err != nil || turn.Status != sessions.TurnInProgress || turn.StartedAt.IsZero() {
 		t.Fatal("promotion did not persist its execution claim", turn, err)
 	}
diff --git a/services/core/internal/store/environment_inputs.go b/services/core/internal/store/environment_inputs.go
index 5fbfedec1..c2d2d4b7f 100644
--- a/services/core/internal/store/environment_inputs.go
+++ b/services/core/internal/store/environment_inputs.go
@@ -232,13 +232,12 @@ func settleEnvironmentInput(ctx context.Context, q *sqlc.Queries, tenantID strin
 		return sessions.EnvironmentInputReservation{}, err
 	}
 	if state == sessions.EnvironmentInputAdmitted {
-		params, err := sessionpg.TurnLookup(tenantID, result.SessionID, result.Receipts[0].TurnID)
+		tenant, err := parseID(tenantID)
 		if err != nil {
 			return sessions.EnvironmentInputReservation{}, err
 		}
-		if _, err := transitionTurn(ctx, q, params, sessions.TurnTransition{
-			ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress, Outcome: json.RawMessage(`{}`),
-		}); err != nil {
+		start := sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}
+		if _, err := sessions.TransitionTurn(ctx, sessionpg.BindSession(q, tenant, row.SessionID), result.Receipts[0].TurnID, start); err != nil {
 			return sessions.EnvironmentInputReservation{}, err
 		}
 	}
diff --git a/services/core/internal/store/environment_setup_test.go b/services/core/internal/store/environment_setup_test.go
index 04c5e9456..b30dec563 100644
--- a/services/core/internal/store/environment_setup_test.go
+++ b/services/core/internal/store/environment_setup_test.go
@@ -46,7 +46,7 @@ func TestEnvironmentSetupEncryptedSnapshotAndIsolation(t *testing.T) {
 	if _, err := s.CreateSession(t.Context(), tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 		t.Fatal("changed setup retried", err)
 	}
-	if _, err := s.GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("uninitialized execution admitted", err)
 	}
 }
diff --git a/services/core/internal/store/environment_steering_order_test.go b/services/core/internal/store/environment_steering_order_test.go
index cff36bdbe..94cfcf094 100644
--- a/services/core/internal/store/environment_steering_order_test.go
+++ b/services/core/internal/store/environment_steering_order_test.go
@@ -56,7 +56,7 @@ func TestEnvironmentActiveInputSerializesWithCompletion(t *testing.T) {
 				admitted <- admission{value, err}
 			}
 			complete := func() {
-				_, err := writer.CompleteExecution(ctx, tenant, session.ID, original.TurnID, sessions.TurnCompleted, nil, "", original.Sequence)
+				_, err := completeExecution(ctx, t, writer, tenant, session.ID, original.TurnID, sessions.TurnCompleted, nil, "", original.Sequence)
 				completed <- err
 			}
 			first, second := input, complete
@@ -87,7 +87,7 @@ func TestEnvironmentActiveInputSerializesWithCompletion(t *testing.T) {
 				if err != nil || retry.ID != got.value.ID || !retry.Deadline.Equal(got.value.Deadline) || len(retry.Receipts) != 2 || !retry.Receipts[0].Replayed || retry.Receipts[0].TurnID != prepared.Receipts[0].TurnID {
 					t.Fatal("active retry replaced its original reservation", retry, err)
 				}
-				if _, err := writer.CompleteExecution(ctx, tenant, session.ID, prepared.Receipts[0].TurnID, sessions.TurnCompleted, nil, "", prepared.Receipts[1].Sequence); err != nil {
+				if _, err := completeExecution(ctx, t, writer, tenant, session.ID, prepared.Receipts[0].TurnID, sessions.TurnCompleted, nil, "", prepared.Receipts[1].Sequence); err != nil {
 					t.Fatal(err)
 				}
 			} else {
@@ -95,7 +95,7 @@ func TestEnvironmentActiveInputSerializesWithCompletion(t *testing.T) {
 					t.Fatal("admitted input escaped the original Turn or application fence", completionErr, got.value)
 				}
 				environmentInputHistory(t, pool, session.ID, 1, 3)
-				if _, err := writer.CompleteExecution(ctx, tenant, session.ID, original.TurnID, sessions.TurnCompleted, nil, "", got.value.Receipts[1].Sequence); err != nil {
+				if _, err := completeExecution(ctx, t, writer, tenant, session.ID, original.TurnID, sessions.TurnCompleted, nil, "", got.value.Receipts[1].Sequence); err != nil {
 					t.Fatal("completion after controlled application failed", err)
 				}
 			}
diff --git a/services/core/internal/store/environment_worker_helpers_test.go b/services/core/internal/store/environment_worker_helpers_test.go
index e437e2f0e..8e6dcfefd 100644
--- a/services/core/internal/store/environment_worker_helpers_test.go
+++ b/services/core/internal/store/environment_worker_helpers_test.go
@@ -122,7 +122,7 @@ func awaitWorkerEnvironmentRun(t *testing.T, ctx context.Context, s *store.Store
 		if len(run.Reservation.Receipts) == 0 {
 			return false
 		}
-		run.Turn, err = s.GetTurn(ctx, tenant, pending.SessionID, run.Reservation.Receipts[0].TurnID)
+		run.Turn, err = store.SessionAdapter(s).GetTurn(ctx, tenant, pending.SessionID, run.Reservation.Receipts[0].TurnID)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/execution_events_test.go b/services/core/internal/store/execution_events_test.go
index 43b39d69f..2ba74d5c9 100644
--- a/services/core/internal/store/execution_events_test.go
+++ b/services/core/internal/store/execution_events_test.go
@@ -94,7 +94,7 @@ func TestExecutionDoesNotCompleteAfterEventPersistenceFailure(t *testing.T) {
 	if outcome.ErrorCode != "event_persistence_failed" {
 		t.Fatal(outcome.ErrorCode)
 	}
-	bound, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "failed-native" || outcome.Done.Usage.InputTokens != 13 {
 		t.Fatalf("terminal failure lost native continuity or usage: %+v %+v %v", bound, outcome, err)
 	}
diff --git a/services/core/internal/store/execution_test.go b/services/core/internal/store/execution_test.go
index 4b0c2f5ba..f2675a51b 100644
--- a/services/core/internal/store/execution_test.go
+++ b/services/core/internal/store/execution_test.go
@@ -11,8 +11,10 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
@@ -43,6 +45,42 @@ func sessionExecution(t *testing.T, lease *pgunit.Lease) *sessions.ExecutionOper
 	return operations
 }
 
+// transitionTurn moves the Turn as the execution owner does, in a Session
+// transaction on s's writer: the lease of a NewExecution writer, otherwise the
+// pool.
+func transitionTurn(ctx context.Context, s *Store, tenant, session, turn string, transition sessions.TurnTransition) (sessions.Turn, error) {
+	var moved sessions.Turn
+	err := s.withLockedSession(ctx, tenant, session, false, func(ctx context.Context, q *sqlc.Queries, id pgtype.UUID, _ sessions.LockedSession) error {
+		owner, err := parseID(tenant)
+		if err != nil {
+			return err
+		}
+		moved, err = sessions.TransitionTurn(ctx, sessionpg.BindSession(q, owner, id), turn, transition)
+		return err
+	})
+	return moved, err
+}
+
+// completeExecution completes the Turn's execution through the Session
+// execution operations on s's lease or, for a pooled s, on the execution lease
+// it holds for the call.
+func completeExecution(ctx context.Context, t testing.TB, s *Store, tenant, session, turn, status string, outcome json.RawMessage, native string, appliedThrough int64) (sessions.Turn, error) {
+	t.Helper()
+	lease := s.lease
+	if lease == nil {
+		var err error
+		if lease, err = pgunit.AcquireLease(ctx, s.pool); err != nil {
+			t.Fatal(err)
+		}
+		defer func() { _ = lease.Close(context.Background()) }()
+	}
+	operations, err := sessions.NewExecutionOperations(sessionpg.NewExecution(lease))
+	if err != nil {
+		t.Fatal(err)
+	}
+	return operations.CompleteExecution(ctx, tenant, session, turn, status, outcome, native, appliedThrough)
+}
+
 // functionExecution builds the Session execution operations on the execution
 // lease of a pool of its own, so the test may close its Store's pool.
 func functionExecution(t *testing.T) *sessions.ExecutionOperations {
@@ -122,14 +160,14 @@ func TestExecutionLeaseLossFencesAllLifecycleWrites(t *testing.T) {
 		}
 	}
 	mustReject("binding", sessionExecution(t, writer.lease).BindSessionDevice(t.Context(), tenant, queued.ID, host.ID))
-	_, err = writer.TransitionTurn(t.Context(), tenant, queued.ID, pending.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = operations.TransitionTurn(t.Context(), tenant, queued.ID, pending.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	mustReject("claim", err)
 	mustReject("journal", operations.AppendTurnEvents(t.Context(), tenant, active.ID, input.TurnID, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"delta":"stale"}`)}}))
 	mustReject("callback", operations.RecordFunctionCall(t.Context(), tenant, active.ID, input.TurnID, functionCallFixture("late")))
 	mustReject("receipt", operations.ConfirmFunctionResult(t.Context(), tenant, waiting.ID, waitInput.TurnID, call.CallID))
-	_, err = writer.CompleteExecution(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnCompleted, json.RawMessage(`{"done":{"content":"stale"}}`), "stale-native", input.Sequence)
+	_, err = operations.CompleteExecution(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnCompleted, json.RawMessage(`{"done":{"content":"stale"}}`), "stale-native", input.Sequence)
 	mustReject("completion", err)
-	_, err = writer.TransitionTurn(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed})
+	_, err = operations.TransitionTurn(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed})
 	mustReject("reconciliation", err)
 	_, err = writer.ExpireEnvironmentInputs(t.Context())
 	mustReject("input expiry", err)
@@ -153,7 +191,7 @@ func TestExecutionLeaseLossFencesAllLifecycleWrites(t *testing.T) {
 	if _, err = sessionAdapter(s).GetSessionDevice(t.Context(), tenant, queued.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("stale binding persisted", err)
 	}
-	queuedTurn, err := s.GetTurn(t.Context(), tenant, queued.ID, pending.TurnID)
+	queuedTurn, err := sessionAdapter(s).GetTurn(t.Context(), tenant, queued.ID, pending.TurnID)
 	if err != nil || queuedTurn.Status != sessions.TurnQueued {
 		t.Fatal("queued work changed", queuedTurn, err)
 	}
@@ -162,14 +200,15 @@ func TestExecutionLeaseLossFencesAllLifecycleWrites(t *testing.T) {
 	if err = successor.lease.CheckOwnership(t.Context()); err != nil {
 		t.Fatal(err)
 	}
-	if _, err = successor.CompleteExecution(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnCompleted, json.RawMessage(`{"done":{"content":"accepted"}}`), "successor-native", input.Sequence); err != nil {
+	successorOperations := sessionExecution(t, successor.lease)
+	if _, err = successorOperations.CompleteExecution(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnCompleted, json.RawMessage(`{"done":{"content":"accepted"}}`), "successor-native", input.Sequence); err != nil {
 		t.Fatal(err)
 	}
-	bound, err := s.GetSessionExecutionBinding(t.Context(), tenant, active.ID)
+	bound, err := sessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, active.ID)
 	if err != nil || bound.NativeSessionID != "successor-native" {
 		t.Fatal(bound, err)
 	}
-	_, err = successor.TransitionTurn(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed})
+	_, err = successorOperations.TransitionTurn(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed})
 	if !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("terminal CAS changed", err)
 	}
@@ -207,7 +246,7 @@ func TestExecutionWriterSerializesWritesOnItsLease(t *testing.T) {
 	results := make(chan error, len(tasks)*2)
 	for _, task := range tasks {
 		group.Go(func() {
-			_, err := writer.TransitionTurn(t.Context(), task.tenant, task.session, task.turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+			_, err := journal.TransitionTurn(t.Context(), task.tenant, task.session, task.turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 			if err == nil {
 				err = journal.AppendTurnEvents(t.Context(), task.tenant, task.session, task.turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"delta":"accepted"}`)}})
 			}
diff --git a/services/core/internal/store/export_test.go b/services/core/internal/store/export_test.go
index 89ad806ba..9be7be169 100644
--- a/services/core/internal/store/export_test.go
+++ b/services/core/internal/store/export_test.go
@@ -22,6 +22,15 @@ import (
 
 func NewTestStore(t *testing.T) (*Store, *pgxpool.Pool) { return testStore(t) }
 
+// SessionAdapter is the Session adapter on s's pool and credential key.
+func SessionAdapter(s *Store) *sessionpg.Store { return sessionAdapter(s) }
+
+// TransitionTurn moves the Turn as the execution owner does, in a Session
+// transaction on s's writer.
+func TransitionTurn(ctx context.Context, s *Store, tenant, session, turn string, transition sessions.TurnTransition) (sessions.Turn, error) {
+	return transitionTurn(ctx, s, tenant, session, turn, transition)
+}
+
 var fixtureCipher, _ = credentialcrypto.New(bytes.Repeat([]byte{61}, 32))
 
 // FixtureCipher is the credential key of NewModelTestStore, for reopened stores.
diff --git a/services/core/internal/store/function_execution_native_test.go b/services/core/internal/store/function_execution_native_test.go
index 58458ac01..a6ed06c0a 100644
--- a/services/core/internal/store/function_execution_native_test.go
+++ b/services/core/internal/store/function_execution_native_test.go
@@ -66,7 +66,7 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 		if !found {
 			t.Fatal("required action identity differs from recovered function item")
 		}
-		bound, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+		bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 		if err != nil || bound.NativeSessionID == "" || (nativeID != "" && bound.NativeSessionID != nativeID) {
 			t.Fatal(bound, err)
 		}
diff --git a/services/core/internal/store/function_execution_test.go b/services/core/internal/store/function_execution_test.go
index b35aec657..c59f5f3a7 100644
--- a/services/core/internal/store/function_execution_test.go
+++ b/services/core/internal/store/function_execution_test.go
@@ -155,7 +155,7 @@ func TestExecutionFunctionsCancellationAndUnconfirmedResults(t *testing.T) {
 			}
 			h.finished(result, status)
 			if cancel {
-				bound, err := h.s.GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+				bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 				if err != nil || bound.NativeSessionID != "native-cancelled-functions" {
 					t.Fatal(bound, err)
 				}
@@ -203,7 +203,7 @@ func TestExecutionFunctionsRequireAdvertisedCapability(t *testing.T) {
 	if result.err == nil || !strings.Contains(result.err.Error(), "function_tools") {
 		t.Fatal(result)
 	}
-	turn, err := h.s.GetTurn(t.Context(), h.tenant, session.ID, input.TurnID)
+	turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnQueued {
 		t.Fatal(turn, err)
 	}
diff --git a/services/core/internal/store/function_images_native_test.go b/services/core/internal/store/function_images_native_test.go
index 4d660edc6..bedafe512 100644
--- a/services/core/internal/store/function_images_native_test.go
+++ b/services/core/internal/store/function_images_native_test.go
@@ -82,14 +82,14 @@ func TestNativeFunctionImagePublicExecution(t *testing.T) {
 			t.Fatal("function result admission duplicated or mutated", err)
 		}
 	}
-	before, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, kind)
 	run("resume")
-	after, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/function_inputs_public_test.go b/services/core/internal/store/function_inputs_public_test.go
index 72614c5d8..7570cbe0b 100644
--- a/services/core/internal/store/function_inputs_public_test.go
+++ b/services/core/internal/store/function_inputs_public_test.go
@@ -38,7 +38,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	functions := executionOwner(t, db, s).Sessions
@@ -108,7 +108,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if err != nil || len(history) != 6 {
 		t.Fatal(history, err)
 	}
-	if _, err := s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnFailed}); err != nil {
+	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnFailed}); err != nil {
 		t.Fatal(err)
 	}
 	next, err := s.SubmitMessage(ctx, tenant, session.ID, "next", json.RawMessage(`{"text":"next"}`))
@@ -125,7 +125,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if err != nil || len(history) != 1 {
 		t.Fatal(history, err)
 	}
-	current, err := s.GetTurn(ctx, tenant, session.ID, next.TurnID)
+	current, err := store.SessionAdapter(s).GetTurn(ctx, tenant, session.ID, next.TurnID)
 	if err != nil || current.Status != sessions.TurnQueued || !current.CancelRequestedAt.IsZero() {
 		t.Fatal(current, err)
 	}
diff --git a/services/core/internal/store/function_inputs_test.go b/services/core/internal/store/function_inputs_test.go
index 53708dc1c..05384e8ab 100644
--- a/services/core/internal/store/function_inputs_test.go
+++ b/services/core/internal/store/function_inputs_test.go
@@ -81,7 +81,7 @@ func TestFunctionInputBatchesPersistAndReplayWithoutRetargeting(t *testing.T) {
 	if err != nil || len(future) != 1 {
 		t.Fatal(future, err)
 	}
-	current, err := s.GetTurn(t.Context(), tenant, session.ID, next)
+	current, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session.ID, next)
 	if err != nil || !current.CancelRequestedAt.IsZero() || current.Status != sessions.TurnQueued {
 		t.Fatal(current, err)
 	}
@@ -143,7 +143,7 @@ func TestFunctionInputBatchFailureRollsBackEveryWrite(t *testing.T) {
 			if err != nil || call.Result != nil || call.Applied {
 				t.Fatal(call, err)
 			}
-			state, err := s.GetTurn(t.Context(), tenant, session.ID, turn)
+			state, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session.ID, turn)
 			if err != nil || !state.CancelRequestedAt.IsZero() || state.Status != sessions.TurnWaiting {
 				t.Fatal(state, err)
 			}
diff --git a/services/core/internal/store/function_public_native_test.go b/services/core/internal/store/function_public_native_test.go
index c96d5a1f8..1df47e840 100644
--- a/services/core/internal/store/function_public_native_test.go
+++ b/services/core/internal/store/function_public_native_test.go
@@ -49,7 +49,7 @@ func TestNativePublicFunctionExecution(t *testing.T) {
 			t.Fatal(call, err)
 		}
 	}
-	bound, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || bound.NativeSessionID == "" || bound.Device.ID != h.device.ID {
 		t.Fatal(bound, err)
 	}
diff --git a/services/core/internal/store/function_state_public_test.go b/services/core/internal/store/function_state_public_test.go
index 96b8f8031..c578c5310 100644
--- a/services/core/internal/store/function_state_public_test.go
+++ b/services/core/internal/store/function_state_public_test.go
@@ -35,7 +35,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	functions := executionOwner(t, db, s).Sessions
@@ -79,7 +79,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	if _, err := s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCompleted, nil, "", input.Sequence); err != nil {
+	if _, err := functions.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCompleted, nil, "", input.Sequence); err != nil {
 		t.Fatal(err)
 	}
 	if err := command.Wait(); err != nil {
diff --git a/services/core/internal/store/function_state_test.go b/services/core/internal/store/function_state_test.go
index 70dd61af6..24da5e4c5 100644
--- a/services/core/internal/store/function_state_test.go
+++ b/services/core/internal/store/function_state_test.go
@@ -38,7 +38,7 @@ func TestFunctionStateSnapshotsRecoveryAndRetries(t *testing.T) {
 	pool.Close()
 	s, _ = testStore(t)
 	assertFunctionState(t, s, tenant, session.ID, sessions.TurnWaiting, 2)
-	if _, err := s.CompleteExecution(t.Context(), tenant, session.ID, turn, sessions.TurnCompleted, nil, "", 1); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := functions.CompleteExecution(t.Context(), tenant, session.ID, turn, sessions.TurnCompleted, nil, "", 1); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("waiting execution completed", err)
 	}
 	for i, id := range []string{"first", "second"} {
@@ -110,7 +110,7 @@ func TestFunctionStateCancellationAndTerminalCleanup(t *testing.T) {
 			}
 			if status == sessions.TurnCompleted {
 				transition(t, s, tenant, session.ID, input.TurnID, sessions.TurnWaiting, status)
-			} else if _, err := s.CompleteExecution(t.Context(), tenant, session.ID, input.TurnID, status, nil, "", input.Sequence); err != nil {
+			} else if _, err := functions.CompleteExecution(t.Context(), tenant, session.ID, input.TurnID, status, nil, "", input.Sequence); err != nil {
 				t.Fatal(err)
 			}
 			assertFunctionState(t, s, tenant, session.ID, status, 0)
diff --git a/services/core/internal/store/function_stream_native_test.go b/services/core/internal/store/function_stream_native_test.go
index 9ddf2316e..11197f2f8 100644
--- a/services/core/internal/store/function_stream_native_test.go
+++ b/services/core/internal/store/function_stream_native_test.go
@@ -44,7 +44,7 @@ func TestNativePublicFunctionStreamHelper(t *testing.T) {
 			t.Fatal(call, err)
 		}
 	}
-	bound, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || bound.NativeSessionID == "" || bound.Device.ID != h.device.ID {
 		t.Fatal(bound, err)
 	}
diff --git a/services/core/internal/store/function_worker_test.go b/services/core/internal/store/function_worker_test.go
index 00cfb8382..0d5efa0aa 100644
--- a/services/core/internal/store/function_worker_test.go
+++ b/services/core/internal/store/function_worker_test.go
@@ -79,7 +79,7 @@ func TestWorkerWaitsForToolCapabilities(t *testing.T) {
 					}
 				}()
 				time.Sleep(650 * time.Millisecond)
-				current, err := h.s.GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+				current, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 				if err != nil || current.Status != sessions.TurnQueued {
 					t.Fatal(current, err)
 				}
diff --git a/services/core/internal/store/harness_onboarding_test.go b/services/core/internal/store/harness_onboarding_test.go
index 69440c8dd..60879b0ff 100644
--- a/services/core/internal/store/harness_onboarding_test.go
+++ b/services/core/internal/store/harness_onboarding_test.go
@@ -22,6 +22,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -99,7 +100,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	}
 	request("POST", "/v1/agents/sessions/"+created.ID+"/events", `{"events":[{"type":"agent.session.input.message","input":[{"role":"user","content":[{"type":"input_text","text":"finish"}]}]}]}`, 202)
 	waitTurn(t, h, first.RunID, sessions.TurnCompleted)
-	turn, err := h.s.GetTurn(ctx, h.tenant, created.ID, first.RunID)
+	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, created.ID, first.RunID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -111,7 +112,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	if err = json.Unmarshal(turn.Outcome, &result); err != nil || result.AppliedThrough != inputs[1].Sequence || result.Done.Content != "readyfinish" {
 		t.Fatal(string(turn.Outcome), err)
 	}
-	bound, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, created.ID)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, created.ID)
 	if err != nil || bound.NativeSessionID == "" {
 		t.Fatal(bound, err)
 	}
diff --git a/services/core/internal/store/input_batches_test.go b/services/core/internal/store/input_batches_test.go
index 222816197..16574d0fd 100644
--- a/services/core/internal/store/input_batches_test.go
+++ b/services/core/internal/store/input_batches_test.go
@@ -108,7 +108,7 @@ func TestBatchRetriesCompareTheWholeRequestAndRetainTargets(t *testing.T) {
 	if first[0].TurnID != "" || first[1].TurnID == "" || first[1].TurnID != first[2].TurnID || first[1].TurnID == first[3].TurnID {
 		t.Fatalf("cancellation targets: %+v", first)
 	}
-	cancelled, err := s.GetTurn(ctx, tenant, session.ID, first[1].TurnID)
+	cancelled, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, first[1].TurnID)
 	if err != nil || cancelled.Status != sessions.TurnCancelled {
 		t.Fatalf("cancelled turn=%+v err=%v", cancelled, err)
 	}
@@ -130,7 +130,7 @@ func TestBatchRetriesCompareTheWholeRequestAndRetainTargets(t *testing.T) {
 	if err != nil || !reflect.DeepEqual(retry, first) {
 		t.Fatalf("restart changed receipts: %+v, %v", retry, err)
 	}
-	current, err := restarted.GetTurn(ctx, tenant, session.ID, next.TurnID)
+	current, err := sessionAdapter(restarted).GetTurn(ctx, tenant, session.ID, next.TurnID)
 	if err != nil || current.Status != sessions.TurnQueued || !current.CancelRequestedAt.IsZero() {
 		t.Fatalf("retry cancelled later work: %+v, %v", current, err)
 	}
@@ -158,7 +158,7 @@ func TestFailedBatchRollsBackEarlierCancellationAndInputs(t *testing.T) {
 	if got, err := s.SubmitInputs(ctx, tenant, session.ID, key, batch); err == nil || got != nil {
 		t.Fatalf("partial batch succeeded: %+v %v", got, err)
 	}
-	turn, err := s.GetTurn(ctx, tenant, session.ID, initial.TurnID)
+	turn, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, initial.TurnID)
 	if err != nil || turn.Status != sessions.TurnInProgress || !turn.CancelRequestedAt.IsZero() {
 		t.Fatalf("cancellation escaped rollback: %+v %v", turn, err)
 	}
diff --git a/services/core/internal/store/input_conflicts_public_test.go b/services/core/internal/store/input_conflicts_public_test.go
index fd1343bfb..fbe1e422c 100644
--- a/services/core/internal/store/input_conflicts_public_test.go
+++ b/services/core/internal/store/input_conflicts_public_test.go
@@ -74,7 +74,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		if _, err := s.TransitionTurn(ctx, tenant, session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+		if _, err := store.TransitionTurn(ctx, s, tenant, session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 			t.Fatal(err)
 		}
 		if err := functions.RecordFunctionCall(ctx, tenant, session, receipt.TurnID, sessions.FunctionCall{CallID: call, ExecutorCallID: "native-" + call, Name: "lookup", Arguments: json.RawMessage(`{}`)}); err != nil {
@@ -87,7 +87,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 		if err := functions.ConfirmFunctionResult(ctx, tenant, session, receipt.TurnID, call); err != nil {
 			t.Fatal(err)
 		}
-		if _, err := s.CompleteExecution(ctx, tenant, session, receipt.TurnID, sessions.TurnCompleted, nil, "", receipt.Sequence); err != nil {
+		if _, err := functions.CompleteExecution(ctx, tenant, session, receipt.TurnID, sessions.TurnCompleted, nil, "", receipt.Sequence); err != nil {
 			t.Fatal(err)
 		}
 	}
diff --git a/services/core/internal/store/item_order_migration_test.go b/services/core/internal/store/item_order_migration_test.go
index 2d5691eef..dff7eb189 100644
--- a/services/core/internal/store/item_order_migration_test.go
+++ b/services/core/internal/store/item_order_migration_test.go
@@ -150,7 +150,7 @@ func TestItemOrderMigrationPreservesIndexedHistory(t *testing.T) {
 	}
 	t.Cleanup(migratedPool.Close)
 	s := store.New(migratedPool)
-	if _, err = s.TransitionTurn(ctx, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = store.TransitionTurn(ctx, s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	if err = executionOwner(t, fixtureDB{pool: migratedPool}, s).Sessions.AppendTurnEvents(ctx, tenant, session, turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"after-upgrade","delta":"continued"}`)}}); err != nil {
diff --git a/services/core/internal/store/item_order_test.go b/services/core/internal/store/item_order_test.go
index 773d36aae..924da4b50 100644
--- a/services/core/internal/store/item_order_test.go
+++ b/services/core/internal/store/item_order_test.go
@@ -27,7 +27,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -128,7 +128,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 			t.Fatalf("output index = %d, want %d", output.Int32, index)
 		}
 	}
-	if _, err = s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{}`), "", input.Sequence); err != nil {
+	if _, err = journal.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{}`), "", input.Sequence); err != nil {
 		t.Fatal(err)
 	}
 	checkOrder()
@@ -136,7 +136,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = s.TransitionTurn(ctx, tenant, session.ID, next.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = store.TransitionTurn(ctx, s, tenant, session.ID, next.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	if err = journal.AppendTurnEvents(ctx, tenant, session.ID, next.TurnID, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"new","delta":"new turn"}`)}}); err != nil {
diff --git a/services/core/internal/store/item_reads_test.go b/services/core/internal/store/item_reads_test.go
index f0f877c6b..836fd4333 100644
--- a/services/core/internal/store/item_reads_test.go
+++ b/services/core/internal/store/item_reads_test.go
@@ -27,7 +27,7 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -57,7 +57,7 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 	if page.Items[4].Status != "in_progress" || page.Items[5].Status != "in_progress" {
 		t.Fatal(page.Items)
 	}
-	_, err = s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{}`), "", input.Sequence)
+	_, err = journal.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{}`), "", input.Sequence)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -127,7 +127,7 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -143,7 +143,7 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 	if err != nil || len(page.Items) != 1 {
 		t.Fatal(page, err)
 	}
-	_, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted, Outcome: json.RawMessage(`{"done":{"content":"legacy answer","metadata":{"private":"SECRET"}}}`)})
+	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted, Outcome: json.RawMessage(`{"done":{"content":"legacy answer","metadata":{"private":"SECRET"}}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -164,7 +164,7 @@ func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		_, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+		_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -174,7 +174,7 @@ func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 				t.Fatal(err)
 			}
 		}
-		_, err = s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{"done":{"content":"retained cancellation text"}}`), "", input.Sequence)
+		_, err = journal.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{"done":{"content":"retained cancellation text"}}`), "", input.Sequence)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -198,7 +198,7 @@ func TestLegacyFailureRetainsPartialAnswerAcrossRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -212,7 +212,7 @@ func TestLegacyFailureRetainsPartialAnswerAcrossRecovery(t *testing.T) {
 	if err = journal.AppendTurnEvents(ctx, tenant, session.ID, input.TurnID, 1, batch); err != nil {
 		t.Fatal(err)
 	}
-	_, err = s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnFailed, json.RawMessage(`{"done":{"content":"provider failure"},"error_code":"engine_failed"}`), "", input.Sequence)
+	_, err = journal.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnFailed, json.RawMessage(`{"done":{"content":"provider failure"},"error_code":"engine_failed"}`), "", input.Sequence)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/list_cursor_public_test.go b/services/core/internal/store/list_cursor_public_test.go
index 009578904..70d58d2dc 100644
--- a/services/core/internal/store/list_cursor_public_test.go
+++ b/services/core/internal/store/list_cursor_public_test.go
@@ -66,7 +66,7 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 	f.session = client.created(token, "/v1/agents/sessions", newSession)
 	f.turn = first("/v1/agents/sessions/" + f.session + "/turns")
 	f.item = first("/v1/agents/sessions/" + f.session + "/items")
-	if _, err := s.TransitionTurn(ctx, tenant, f.session, f.turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
+	if _, err := store.TransitionTurn(ctx, s, tenant, f.session, f.turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := s.SubmitMessage(ctx, tenant, f.session, label+"-second", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"second"}]}]}`)); err != nil {
@@ -102,7 +102,7 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 		if err = leased.Sessions.BindSessionDevice(ctx, tenant, created.ID, host.ID); err != nil {
 			t.Fatal(err)
 		}
-		if _, err = leased.Store.TransitionTurn(ctx, tenant, created.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+		if _, err = store.TransitionTurn(ctx, leased.Store, tenant, created.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 			t.Fatal(err)
 		}
 		opened := int64(1700000001000)
diff --git a/services/core/internal/store/local_environment_devices_test.go b/services/core/internal/store/local_environment_devices_test.go
index 00c31eff8..a16b46b3d 100644
--- a/services/core/internal/store/local_environment_devices_test.go
+++ b/services/core/internal/store/local_environment_devices_test.go
@@ -47,7 +47,7 @@ func TestEnvironmentDeviceAuthorityAndLifecycle(t *testing.T) {
 			t.Fatal("dedicated credential bound to another Session")
 		}
 	}
-	devices, err := s.ListExecutionDevices(t.Context(), tenant)
+	devices, err := sessionAdapter(s).ListExecutionDevices(t.Context(), tenant)
 	if err != nil || len(devices) != 0 {
 		t.Fatalf("dedicated device entered general selection: %v %v", devices, err)
 	}
diff --git a/services/core/internal/store/local_environment_worker_test.go b/services/core/internal/store/local_environment_worker_test.go
index 1aabca710..001bec8cb 100644
--- a/services/core/internal/store/local_environment_worker_test.go
+++ b/services/core/internal/store/local_environment_worker_test.go
@@ -141,14 +141,14 @@ func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *test
 	h.write(start.RunID, proto.TypeDone, proto.DonePayload{Content: "complete", Metadata: map[string]any{proto.DoneMetaAgentSessionID: "local-native-history"}})
 	completeLocalArtifactExport(t, h, worker, environment)
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "local completion", func() bool {
-		turn, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
+		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
 		return err == nil && turn.Status == sessions.TurnCompleted
 	})
 	settled, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, reservation.ID)
 	if err != nil || settled.State != sessions.EnvironmentInputAdmitted || len(settled.Receipts) != 1 {
 		t.Fatal("local reservation did not settle", err)
 	}
-	bound, err := h.s.GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 	if err != nil || bound.Device.EnvironmentID != environment.ID || bound.NativeSessionID != "local-native-history" {
 		t.Fatal("local native identity was not retained", err)
 	}
diff --git a/services/core/internal/store/mcode_public_native_test.go b/services/core/internal/store/mcode_public_native_test.go
index 036eab079..2ffb143e3 100644
--- a/services/core/internal/store/mcode_public_native_test.go
+++ b/services/core/internal/store/mcode_public_native_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -64,7 +65,7 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 				Session string `json:"session"`
 			}
 			_ = json.Unmarshal(data, &identity)
-			if page, e := h.s.ListTurns(ctx, h.tenant, identity.Session, "", 100, true); e == nil {
+			if page, e := store.SessionAdapter(h.s).ListTurns(ctx, h.tenant, identity.Session, "", 100, true); e == nil {
 				diagnostic, _ := json.Marshal(page)
 				text := strings.ReplaceAll(string(diagnostic), provider.APIKey, "[REDACTED]")
 				_ = os.WriteFile(filepath.Join(home, "failed-turns.json"), []byte(text), 0600)
@@ -84,7 +85,7 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 	if json.Unmarshal(data, &proof) != nil {
 		t.Fatal("invalid evidence")
 	}
-	turn, err := h.s.GetTurn(ctx, h.tenant, proof.Session, proof.FirstTurn)
+	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.FirstTurn)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -96,14 +97,14 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 	if json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.AppliedThrough != inputs[1].Sequence {
 		t.Fatal("native applied receipt missing")
 	}
-	before, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, "mcode")
 	run("resume")
-	after, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/mcp_credential_selection_public_test.go b/services/core/internal/store/mcp_credential_selection_public_test.go
index 88837bdb2..1915c220d 100644
--- a/services/core/internal/store/mcp_credential_selection_public_test.go
+++ b/services/core/internal/store/mcp_credential_selection_public_test.go
@@ -282,7 +282,7 @@ func TestMCPCredentialSelectionPublicPostgres(t *testing.T) {
 	if err := pool.QueryRow(t.Context(), "SELECT id FROM turns WHERE session_id=$1", streamed).Scan(&turn); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.TransitionTurn(t.Context(), tenantA, streamed, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
+	if _, err := store.TransitionTurn(t.Context(), s, tenantA, streamed, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
 		t.Fatal(err)
 	}
 	_, tools = snapshot(stream, "agent.session.idle")
diff --git a/services/core/internal/store/message_images_native_test.go b/services/core/internal/store/message_images_native_test.go
index f59e3b23b..46c2583cb 100644
--- a/services/core/internal/store/message_images_native_test.go
+++ b/services/core/internal/store/message_images_native_test.go
@@ -78,7 +78,7 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
-	turn, err := h.s.GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
+	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -90,14 +90,14 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 	if err != nil || len(inputs) != 3 || inputs[0].Kind != "message" || inputs[1].Kind != "message" || inputs[2].Kind != "tool_result" || outcome.AppliedThrough != inputs[2].Sequence {
 		t.Fatal("active image batch was not applied exactly once in the same Turn", err)
 	}
-	before, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, kind)
 	run("resume")
-	after, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/model_protocol_native_test.go b/services/core/internal/store/model_protocol_native_test.go
index c46ab363d..dceecd9bf 100644
--- a/services/core/internal/store/model_protocol_native_test.go
+++ b/services/core/internal/store/model_protocol_native_test.go
@@ -136,14 +136,14 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 	if expectedCalls > 0 && failed != 1 {
 		t.Fatal("missing failed function-result scenario")
 	}
-	before, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native Session binding missing before restart")
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, options.Engine)
 	run("resume")
-	after, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("cold Session continuation changed native history")
 	}
diff --git a/services/core/internal/store/native_environment_test.go b/services/core/internal/store/native_environment_test.go
index e86f74c55..547ad5f2c 100644
--- a/services/core/internal/store/native_environment_test.go
+++ b/services/core/internal/store/native_environment_test.go
@@ -108,13 +108,13 @@ func TestNativeNoExecutionEnvironment(t *testing.T) {
 	}
 	first := h.message("first", "Return an answer.")
 	h.finished(h.run(ctx, first.TurnID), sessions.TurnCompleted)
-	bound, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID == "" {
 		t.Fatal(bound, err)
 	}
 	second := h.message("second", "Continue the same conversation.")
 	h.finished(h.run(ctx, second.TurnID), sessions.TurnCompleted)
-	again, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	again, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || again.NativeSessionID != bound.NativeSessionID {
 		t.Fatal(again, err)
 	}
diff --git a/services/core/internal/store/native_recovery_test.go b/services/core/internal/store/native_recovery_test.go
index f95a1293e..7cf357098 100644
--- a/services/core/internal/store/native_recovery_test.go
+++ b/services/core/internal/store/native_recovery_test.go
@@ -23,11 +23,11 @@ func TestSessionExecutionBindingRetainsStartedExecutionRequirement(t *testing.T)
 	}
 	assertStarted := func(st *Store, want bool) {
 		t.Helper()
-		bound, err := st.GetSessionExecutionBinding(t.Context(), tenant, session.ID)
+		bound, err := sessionAdapter(st).GetSessionExecutionBinding(t.Context(), tenant, session.ID)
 		if err != nil || bound.HasStartedTurn != want || bound.NativeSessionID != "" {
 			t.Fatalf("binding=%+v err=%v", bound, err)
 		}
-		if _, err := st.GetSessionExecutionBinding(t.Context(), foreign, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+		if _, err := sessionAdapter(st).GetSessionExecutionBinding(t.Context(), foreign, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal("foreign binding", err)
 		}
 	}
diff --git a/services/core/internal/store/no_environment_test.go b/services/core/internal/store/no_environment_test.go
index c43cf3fed..6c32bf2c1 100644
--- a/services/core/internal/store/no_environment_test.go
+++ b/services/core/internal/store/no_environment_test.go
@@ -23,7 +23,7 @@ func TestNoEnvironmentRejectsUnadvertisedDeviceBeforeClaim(t *testing.T) {
 	if _, err = h.bound().Run(ctx, h.tenant, h.session.ID, input.TurnID); err == nil {
 		t.Fatal("unsupported environment admitted")
 	}
-	turn, err := h.s.GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnQueued {
 		t.Fatal(turn, err)
 	}
diff --git a/services/core/internal/store/prepared_dispatch_failure_test.go b/services/core/internal/store/prepared_dispatch_failure_test.go
index 5ed6a8480..23f05ff48 100644
--- a/services/core/internal/store/prepared_dispatch_failure_test.go
+++ b/services/core/internal/store/prepared_dispatch_failure_test.go
@@ -190,7 +190,7 @@ func TestPreparedDispatchCancellationReceiptSurvivesStartFailure(t *testing.T) {
 			if receipts != 1 {
 				t.Fatal("cancellation receipt was not journaled once", receipts)
 			}
-			bound, err := h.s.GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+			bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 			if err != nil || (withOutcome && (bound.NativeSessionID != "cancelled-prepared-native" || outcome.Done.Content != "retained cancellation")) {
 				t.Fatal("cancellation lost native continuation or final output", err)
 			}
diff --git a/services/core/internal/store/prepared_dispatch_test.go b/services/core/internal/store/prepared_dispatch_test.go
index a05dac21e..109b662bf 100644
--- a/services/core/internal/store/prepared_dispatch_test.go
+++ b/services/core/internal/store/prepared_dispatch_test.go
@@ -66,7 +66,7 @@ func readyPreparedDispatch(t *testing.T, h *dispatchHarness, request, handle str
 	if frame.ID != request || frame.DecodePayload(&start) != nil || start.Handle != handle || start.RunID == "" || inputTextForTest(t, start.Input) != "first\n\nsecond" {
 		t.Fatal("Start changed preparation or original batch", frame.ID, start)
 	}
-	turn, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
+	turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
 	if err != nil || turn.Status != sessions.TurnInProgress {
 		t.Fatal("Start preceded atomic claim", turn, err)
 	}
@@ -106,7 +106,7 @@ func TestPreparedDispatchPromotesOriginalBatchAndPersistsCompletion(t *testing.T
 		t.Fatal("prepared completion", got)
 	}
 	assertPreparationReleased(t, h, frame.ID, handle)
-	bound, err := h.s.GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "retained-prepared-native" {
 		t.Fatal("native identity was not committed", bound, err)
 	}
diff --git a/services/core/internal/store/public_execution_test.go b/services/core/internal/store/public_execution_test.go
index 9c8df0da2..8d3301506 100644
--- a/services/core/internal/store/public_execution_test.go
+++ b/services/core/internal/store/public_execution_test.go
@@ -95,7 +95,7 @@ func waitTurn(t *testing.T, h *dispatchHarness, id, status string) {
 	t.Helper()
 	deadline := time.Now().Add(12 * time.Second)
 	for time.Now().Before(deadline) {
-		turn, err := h.s.GetTurn(context.Background(), h.tenant, h.session.ID, id)
+		turn, err := store.SessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, id)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -112,7 +112,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	h.session = publicSession(t, h, "interrupted")
 	first := h.message("first", "Already sent")
 	ctx := context.Background()
-	if _, err := h.s.TransitionTurn(ctx, h.tenant, h.session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	// A native measurement committed before process loss must survive startup
@@ -123,7 +123,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	}
 	checkMeasurement := func(ended bool) {
 		t.Helper()
-		turn, err := h.s.GetTurn(ctx, h.tenant, h.session.ID, first.TurnID)
+		turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, first.TurnID)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/public_handler_fixture_test.go b/services/core/internal/store/public_handler_fixture_test.go
index b04fa9f73..111eeb790 100644
--- a/services/core/internal/store/public_handler_fixture_test.go
+++ b/services/core/internal/store/public_handler_fixture_test.go
@@ -88,7 +88,7 @@ func publicHandler(t testing.TB, s *store.Store, db fixtureDB, keys fixtureKeyRe
 		Sessions:        s,
 		SessionCreation: s,
 		SessionEvents:   s,
-		Turns:           s,
+		Turns:           sessionStore,
 		Items:           sessionStore,
 		Subagents:       sessionStore,
 		Artifacts:       sessionService,
diff --git a/services/core/internal/store/runtime_capabilities_pending_test.go b/services/core/internal/store/runtime_capabilities_pending_test.go
index 1052881c3..06cb25c34 100644
--- a/services/core/internal/store/runtime_capabilities_pending_test.go
+++ b/services/core/internal/store/runtime_capabilities_pending_test.go
@@ -52,7 +52,7 @@ func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
 	if err != nil || initializationState(t, db.pool, owner.TenantID, owner.EnvironmentID) != "pending" || owner.State != "running" || provider.writes.Load() != 0 || provider.kills != 0 {
 		t.Fatal("missing socket consumed initialization or requested cleanup", owner, err, provider.writes.Load(), provider.kills)
 	}
-	if _, err := s.GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := store.SessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("ordinary readiness gate bypassed", err)
 	}
 }
diff --git a/services/core/internal/store/runtime_enrollment_test.go b/services/core/internal/store/runtime_enrollment_test.go
index 2a4a001ba..ab2e10932 100644
--- a/services/core/internal/store/runtime_enrollment_test.go
+++ b/services/core/internal/store/runtime_enrollment_test.go
@@ -53,7 +53,7 @@ func TestRuntimeEnrollmentAuthorityAndRotation(t *testing.T) {
 	if again, err := sessionService(t, s).EnrollRuntime(ctx, environment.ID, executorDigest(key.Token)); err != nil || again != bound {
 		t.Fatalf("retry changed binding: %+v %v", again, err)
 	}
-	if devices, err := s.ListExecutionDevices(ctx, p.TenantID); err != nil || len(devices) != 0 {
+	if devices, err := sessionAdapter(s).ListExecutionDevices(ctx, p.TenantID); err != nil || len(devices) != 0 {
 		t.Fatalf("enrolled Runtime entered general selection: %v", err)
 	}
 	auth := runtimegateway.NewAuthenticator(sessionAdapter(s))
diff --git a/services/core/internal/store/runtime_idle_clock_test.go b/services/core/internal/store/runtime_idle_clock_test.go
index 84e59a4b2..0cf23151e 100644
--- a/services/core/internal/store/runtime_idle_clock_test.go
+++ b/services/core/internal/store/runtime_idle_clock_test.go
@@ -87,7 +87,7 @@ func TestManagedIdleClockIgnoresRootHostSkew(t *testing.T) {
 			source := runtimeDatabaseTime(t, s).Add(skew).UnixMilli()
 			outcome := json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, source))
 			before := runtimeDatabaseTime(t, s)
-			completed, err := w.CompleteExecution(t.Context(), owner.TenantID, owner.SessionID, turn, sessions.TurnCompleted, outcome, "", 0)
+			completed, err := completeExecution(t.Context(), t, w, owner.TenantID, owner.SessionID, turn, sessions.TurnCompleted, outcome, "", 0)
 			after := runtimeDatabaseTime(t, s)
 			if err != nil || completed.CompletedAt.UnixMilli() != source {
 				t.Fatal("native completion changed or rejected", completed, err)
@@ -96,7 +96,7 @@ func TestManagedIdleClockIgnoresRootHostSkew(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			if _, err := w.CompleteExecution(t.Context(), owner.TenantID, owner.SessionID, turn, sessions.TurnCompleted, outcome, "", 0); !errors.Is(err, sessions.ErrTurnConflict) {
+			if _, err := completeExecution(t.Context(), t, w, owner.TenantID, owner.SessionID, turn, sessions.TurnCompleted, outcome, "", 0); !errors.Is(err, sessions.ErrTurnConflict) {
 				t.Fatal("terminal replay accepted", err)
 			}
 			unchanged, err := deploymentStore(w).Activity(t.Context(), owner.ID)
@@ -104,7 +104,7 @@ func TestManagedIdleClockIgnoresRootHostSkew(t *testing.T) {
 				t.Fatal("terminal retry reset idle", unchanged, err)
 			}
 			verifyManagedIdleClock(t, s, w, owner, before, after)
-			read, err := s.GetTurn(t.Context(), owner.TenantID, owner.SessionID, turn)
+			read, err := sessionAdapter(s).GetTurn(t.Context(), owner.TenantID, owner.SessionID, turn)
 			if err != nil || read.CompletedAt.UnixMilli() != source {
 				t.Fatal("public native timestamp rewritten", read, err)
 			}
@@ -178,15 +178,15 @@ func TestUnmanagedRootCompletionPreservesHostSkew(t *testing.T) {
 				current := transition(t, s, tenant, session.ID, input.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
 				source := current.CreatedAt.Add(skew).UnixMilli()
 				outcome := json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, source))
-				completed, err := s.CompleteExecution(t.Context(), tenant, session.ID, input.TurnID, sessions.TurnCompleted, outcome, "", input.Sequence)
+				completed, err := completeExecution(t.Context(), t, s, tenant, session.ID, input.TurnID, sessions.TurnCompleted, outcome, "", input.Sequence)
 				if err != nil || completed.CompletedAt.UnixMilli() != source {
 					t.Fatal("native completion changed or rejected", completed, err)
 				}
-				read, err := s.GetTurn(t.Context(), tenant, session.ID, input.TurnID)
+				read, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session.ID, input.TurnID)
 				if err != nil || read.Status != sessions.TurnCompleted || read.CompletedAt.UnixMilli() != source {
 					t.Fatal("public native timestamp rewritten", read, err)
 				}
-				if _, err := s.CompleteExecution(t.Context(), tenant, session.ID, input.TurnID, sessions.TurnCompleted, outcome, "", input.Sequence); !errors.Is(err, sessions.ErrTurnConflict) {
+				if _, err := completeExecution(t.Context(), t, s, tenant, session.ID, input.TurnID, sessions.TurnCompleted, outcome, "", input.Sequence); !errors.Is(err, sessions.ErrTurnConflict) {
 					t.Fatal("terminal replay accepted", err)
 				}
 			})
@@ -202,7 +202,7 @@ func TestRootCompletionRejectsNonpositiveSourceTime(t *testing.T) {
 			input := submitMessage(t, s, tenant, session.ID, "invalid-clock")
 			transition(t, s, tenant, session.ID, input.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
 			outcome := json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, source))
-			if _, err := s.CompleteExecution(t.Context(), tenant, session.ID, input.TurnID, sessions.TurnCompleted, outcome, "", input.Sequence); !errors.Is(err, sessions.ErrInvalidInput) {
+			if _, err := completeExecution(t.Context(), t, s, tenant, session.ID, input.TurnID, sessions.TurnCompleted, outcome, "", input.Sequence); !errors.Is(err, sessions.ErrInvalidInput) {
 				t.Fatal("invalid native timestamp accepted", err)
 			}
 		})
@@ -221,7 +221,7 @@ func TestManagedIdleClockReconnectPreservesReceipts(t *testing.T) {
 	if err != nil || !reflect.DeepEqual(before, after) {
 		t.Fatal("reconnect changed compute receipt or idle clock", err)
 	}
-	if _, err := s.GetTurn(t.Context(), owner.TenantID, owner.SessionID, turn); err != nil {
+	if _, err := sessionAdapter(s).GetTurn(t.Context(), owner.TenantID, owner.SessionID, turn); err != nil {
 		t.Fatal(err)
 	}
 }
diff --git a/services/core/internal/store/runtime_initialization.go b/services/core/internal/store/runtime_initialization.go
deleted file mode 100644
index d156ef9ad..000000000
--- a/services/core/internal/store/runtime_initialization.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-func (s *Store) requireInitializedEnvironment(ctx context.Context, tenant, session pgtype.UUID) error {
-	ready, err := s.queries.GetSessionInitializationReady(ctx, sqlc.GetSessionInitializationReadyParams{TenantID: tenant, ID: session})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.ErrNotFound
-	}
-	if err != nil {
-		return err
-	}
-	if !ready {
-		return sessions.ErrNotFound
-	}
-	return nil
-}
diff --git a/services/core/internal/store/runtime_initialization_test.go b/services/core/internal/store/runtime_initialization_test.go
index 7d61c1ebf..c50208edf 100644
--- a/services/core/internal/store/runtime_initialization_test.go
+++ b/services/core/internal/store/runtime_initialization_test.go
@@ -79,7 +79,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 				if _, err := fixtureSessionStore(db).GetSessionDevice(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 					t.Error("premature file access", err)
 				}
-				if _, err := s.GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+				if _, err := store.SessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 					t.Error("premature execution", err)
 				}
 				if mode == "uncertain" {
@@ -120,7 +120,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 				if int(p.writes.Load()) != expectedSteps {
 					t.Fatal("missing operations", p.writes.Load())
 				}
-				if _, err := s.GetSessionExecutionBinding(t.Context(), tenant, session.ID); err != nil {
+				if _, err := store.SessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); err != nil {
 					t.Fatal("completed preparation blocked", err)
 				}
 				stop()
diff --git a/services/core/internal/store/runtime_suspension_concurrency_test.go b/services/core/internal/store/runtime_suspension_concurrency_test.go
index 5d2a97fd7..67aaf940f 100644
--- a/services/core/internal/store/runtime_suspension_concurrency_test.go
+++ b/services/core/internal/store/runtime_suspension_concurrency_test.go
@@ -61,7 +61,7 @@ func TestRuntimeSuspensionClaimReadsPhaseAfterSessionLock(t *testing.T) {
 			ctx, tx, blocker := runtimeSuspensionLockedSession(t, pool, owner.SessionID)
 			done := make(chan error, 1)
 			go func() {
-				_, err := w.TransitionTurn(ctx, owner.TenantID, owner.SessionID, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+				_, err := transitionTurn(ctx, w, owner.TenantID, owner.SessionID, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 				done <- err
 			}()
 			runtimeSuspensionWaitBlocked(t, ctx, pool, blocker, done)
@@ -77,7 +77,7 @@ func TestRuntimeSuspensionClaimReadsPhaseAfterSessionLock(t *testing.T) {
 			if blocked && !errors.Is(err, sessions.ErrTurnConflict) || !blocked && err != nil {
 				t.Fatal("incorrect claim outcome", phase, err)
 			}
-			got, err := s.GetTurn(ctx, owner.TenantID, owner.SessionID, turn)
+			got, err := sessionAdapter(s).GetTurn(ctx, owner.TenantID, owner.SessionID, turn)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -205,7 +205,7 @@ func TestRuntimeSuspensionQuiesceCannotOvertakeClaim(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := transitionTurn(ctx, w.queries.WithTx(tx), params, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress, Outcome: json.RawMessage(`{}`)}); err != nil {
+	if _, err := sessions.TransitionTurn(ctx, sessionpg.BindSession(w.queries.WithTx(tx), params.TenantID, params.SessionID), turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	if err := tx.Commit(ctx); err != nil {
diff --git a/services/core/internal/store/runtime_worker_recovery_test.go b/services/core/internal/store/runtime_worker_recovery_test.go
index db988287d..56853bb93 100644
--- a/services/core/internal/store/runtime_worker_recovery_test.go
+++ b/services/core/internal/store/runtime_worker_recovery_test.go
@@ -124,7 +124,7 @@ func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 		t.Fatal("completed preparation was not released")
 	}
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "original input completed once", func() bool {
-		turn, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
+		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
 		return err == nil && turn.Status == sessions.TurnCompleted
 	})
 	var turns int
@@ -154,7 +154,7 @@ func TestWorkerRestartPreservesQueuedTurnWhileComputeWakes(t *testing.T) {
 	if err := worker.Run(ctx); !errors.Is(err, context.Canceled) {
 		t.Fatal(err)
 	}
-	got, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, turn)
+	got, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, turn)
 	if err != nil || got.Status != sessions.TurnQueued || !got.StartedAt.IsZero() {
 		t.Fatal("startup consumed queued work before restore", got, err)
 	}
diff --git a/services/core/internal/store/sandbox_deployment_switch_test.go b/services/core/internal/store/sandbox_deployment_switch_test.go
index 3447ee77d..42848e08b 100644
--- a/services/core/internal/store/sandbox_deployment_switch_test.go
+++ b/services/core/internal/store/sandbox_deployment_switch_test.go
@@ -315,13 +315,13 @@ func TestSandboxSwitchPreservesReleasedAllocationAndItemHistory(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := w.TransitionTurn(t.Context(), tenant, history.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := transitionTurn(t.Context(), w, tenant, history.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	if err := sessionExecution(t, w.lease).AppendTurnEvents(t.Context(), tenant, history.ID, input.TurnID, 1, []sessions.ExecutionEvent{{Kind: "output_message", Payload: json.RawMessage(`{"id":"answer","status":"completed","text":"retained answer"}`)}}); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := w.TransitionTurn(t.Context(), tenant, history.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted}); err != nil {
+	if _, err := transitionTurn(t.Context(), w, tenant, history.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted}); err != nil {
 		t.Fatal(err)
 	}
 	items, err := sessionAdapter(s).ListItems(t.Context(), tenant, history.ID, "", 100, true)
diff --git a/services/core/internal/store/scheduling.go b/services/core/internal/store/scheduling.go
index 0cb7a446b..c02516880 100644
--- a/services/core/internal/store/scheduling.go
+++ b/services/core/internal/store/scheduling.go
@@ -11,31 +11,10 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
-func executionWorkCursor(after string, connectedDevices []string) (pgtype.UUID, []pgtype.UUID, error) {
-	id := pgtype.UUID{Valid: true}
-	var err error
-	if after != "" {
-		id, err = parseID(after)
-		if err != nil {
-			return id, nil, err
-		}
-	}
-	devices := make([]pgtype.UUID, 0, len(connectedDevices))
-	for _, value := range connectedDevices {
-		device, err := parseID(value)
-		if err != nil {
-			return id, nil, err
-		}
-		devices = append(devices, device)
-	}
-	return id, devices, nil
-}
-
 func (s *Store) ListEnvironmentInputWork(ctx context.Context, after string, connectedDevices []string) ([]sessions.EnvironmentInputWork, error) {
-	id, devices, err := executionWorkCursor(after, connectedDevices)
+	id, devices, err := sessionpg.ExecutionWorkCursor(after, connectedDevices)
 	if err != nil {
 		return nil, err
 	}
@@ -50,38 +29,6 @@ func (s *Store) ListEnvironmentInputWork(ctx context.Context, after string, conn
 	return work, nil
 }
 
-func (s *Store) ListExecutionWork(ctx context.Context, after string, statuses []string, connectedDevices []string) ([]sessions.ExecutionWork, error) {
-	id, devices, err := executionWorkCursor(after, connectedDevices)
-	if err != nil {
-		return nil, err
-	}
-	rows, err := s.queries.ListExecutionWork(ctx, sqlc.ListExecutionWorkParams{AfterID: id, Statuses: statuses, ConnectedOnly: connectedDevices != nil, ConnectedDevices: devices})
-	if err != nil {
-		return nil, err
-	}
-	work := make([]sessions.ExecutionWork, 0, len(rows))
-	for _, row := range rows {
-		work = append(work, sessions.ExecutionWork{TenantID: uuid.UUID(row.TenantID.Bytes).String(), SessionID: uuid.UUID(row.SessionID.Bytes).String(), TurnID: uuid.UUID(row.ID.Bytes).String(), Status: row.Status})
-	}
-	return work, nil
-}
-
-func (s *Store) ListExecutionDevices(ctx context.Context, tenantID string) ([]sessions.ExecutionDevice, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return nil, err
-	}
-	rows, err := s.queries.ListExecutionDevices(ctx, tenant)
-	if err != nil {
-		return nil, err
-	}
-	devices := make([]sessions.ExecutionDevice, 0, len(rows))
-	for _, row := range rows {
-		devices = append(devices, sessions.ExecutionDevice{ID: uuid.UUID(row.ID.Bytes).String(), Name: row.Name})
-	}
-	return devices, nil
-}
-
 func (s *Store) sessionActivity(ctx context.Context, session sessions.Session, err error) (sessions.Session, error) {
 	if err != nil {
 		return sessions.Session{}, err
diff --git a/services/core/internal/store/self_hosted_cancel_public_test.go b/services/core/internal/store/self_hosted_cancel_public_test.go
index 8a9469d86..eec981f6b 100644
--- a/services/core/internal/store/self_hosted_cancel_public_test.go
+++ b/services/core/internal/store/self_hosted_cancel_public_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -124,7 +125,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	pending := map[string]string{created.InitialID: snapshot(created.InitialID), created.LaterID: snapshot(created.LaterID)}
 	transition := func(id, from, to string) {
 		t.Helper()
-		if _, err := s.TransitionTurn(t.Context(), tenant, created.ID, id, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
+		if _, err := store.TransitionTurn(t.Context(), s, tenant, created.ID, id, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -158,7 +159,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	}
 	run("active")
 	activeReceipts := receipts(created.ActiveKey, first)
-	turn, err := s.GetTurn(t.Context(), tenant, created.ID, first)
+	turn, err := store.SessionAdapter(s).GetTurn(t.Context(), tenant, created.ID, first)
 	if err != nil || turn.Status != sessions.TurnInProgress || turn.CancelRequestedAt.IsZero() || !turn.CompletedAt.IsZero() {
 		t.Fatal("202 must admit cancellation without fabricating native completion", err)
 	}
diff --git a/services/core/internal/store/session_artifacts_public_test.go b/services/core/internal/store/session_artifacts_public_test.go
index 55c5f54eb..8447e86de 100644
--- a/services/core/internal/store/session_artifacts_public_test.go
+++ b/services/core/internal/store/session_artifacts_public_test.go
@@ -43,7 +43,7 @@ func completeArtifactTurn(t *testing.T, s *store.Store, artifacts *sessions.Serv
 	}
 	transition := func(from, to string) {
 		t.Helper()
-		if _, err := s.TransitionTurn(t.Context(), tenant, session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
+		if _, err := store.TransitionTurn(t.Context(), s, tenant, session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
 			t.Fatal(err)
 		}
 	}
diff --git a/services/core/internal/store/session_artifacts_test.go b/services/core/internal/store/session_artifacts_test.go
index 2504d2916..0c4fd6d8d 100644
--- a/services/core/internal/store/session_artifacts_test.go
+++ b/services/core/internal/store/session_artifacts_test.go
@@ -449,7 +449,7 @@ func TestSessionArtifactsNewestVersionFollowsTurnOrder(t *testing.T) {
 	transition(t, s, tenant, session, first.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
 	stageArtifactOutputs(t, s, tenant, session, env.ID, first.TurnID, map[string]string{"b.txt": "bravo"})
 	future := time.Now().Add(time.Hour).UnixMilli()
-	if _, err := s.CompleteExecution(t.Context(), tenant, session, first.TurnID, sessions.TurnCompleted, json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, future)), "", first.Sequence); err != nil {
+	if _, err := completeExecution(t.Context(), t, s, tenant, session, first.TurnID, sessions.TurnCompleted, json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, future)), "", first.Sequence); err != nil {
 		t.Fatal(err)
 	}
 	one := publishedByTurn(t, s, tenant, session, first.TurnID)["b.txt"]
@@ -510,7 +510,7 @@ func TestSessionArtifactsCompletionWaitsForConcurrentDeletion(t *testing.T) {
 	}
 	done := make(chan error, 1)
 	go func() {
-		_, err := s.TransitionTurn(t.Context(), tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted})
+		_, err := transitionTurn(t.Context(), s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted})
 		done <- err
 	}()
 	// Completion must be blocked on the Session lock before the deletion commits.
@@ -533,7 +533,7 @@ func TestSessionArtifactsCompletionWaitsForConcurrentDeletion(t *testing.T) {
 		}
 		time.Sleep(10 * time.Millisecond)
 	}
-	if status, err := s.GetTurn(t.Context(), tenant, session, turn); err != nil || status.Status != sessions.TurnInProgress {
+	if status, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session, turn); err != nil || status.Status != sessions.TurnInProgress {
 		t.Fatalf("Turn settled while the deletion held the lock: %+v %v", status, err)
 	}
 	if err := tx.Commit(t.Context()); err != nil {
diff --git a/services/core/internal/store/session_creation_identity_test.go b/services/core/internal/store/session_creation_identity_test.go
index b87bc54d1..28df45d2a 100644
--- a/services/core/internal/store/session_creation_identity_test.go
+++ b/services/core/internal/store/session_creation_identity_test.go
@@ -197,7 +197,7 @@ func TestSessionCreationKeepsItsResolvedDeploymentRevision(t *testing.T) {
 		receipt := submitMessage(t, s, tenant, session, uuid.NewString())
 		transition(t, s, tenant, session, receipt.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
 		outcome, _ := json.Marshal(map[string]string{"error_code": coreCode, "engine_error_code": nativeCode})
-		turn, err := s.CompleteExecution(t.Context(), tenant, session, receipt.TurnID, status, outcome, "", receipt.Sequence)
+		turn, err := completeExecution(t.Context(), t, s, tenant, session, receipt.TurnID, status, outcome, "", receipt.Sequence)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -233,7 +233,7 @@ func TestSessionCreationKeepsItsResolvedDeploymentRevision(t *testing.T) {
 	if revision(stale.ID) != original {
 		t.Fatal("tuple revision changed during insertion")
 	}
-	frozen, err := s.SessionModelExecution(t.Context(), tenant, stale.ID)
+	frozen, err := sessionAdapter(s).SessionModelExecution(t.Context(), tenant, stale.ID)
 	if err != nil || frozen == nil || *frozen != *before.Provider {
 		t.Fatal("frozen tuple bundle changed", err)
 	}
@@ -253,7 +253,7 @@ func TestSessionCreationKeepsItsResolvedDeploymentRevision(t *testing.T) {
 	if recreated := resolve(); recreated.Revision == original || recreated.Revision == current.Revision {
 		t.Fatal("revision reused")
 	}
-	frozenProvider, err := s.SessionModelExecution(t.Context(), tenant, session.ID)
+	frozenProvider, err := sessionAdapter(s).SessionModelExecution(t.Context(), tenant, session.ID)
 	if err != nil || frozenProvider == nil || *frozenProvider != *input.ModelProvider {
 		t.Fatal("replacement changed the Session bundle", err)
 	}
diff --git a/services/core/internal/store/session_creation_stream_test.go b/services/core/internal/store/session_creation_stream_test.go
index 6c63da92e..ce7b03c1d 100644
--- a/services/core/internal/store/session_creation_stream_test.go
+++ b/services/core/internal/store/session_creation_stream_test.go
@@ -137,7 +137,7 @@ func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.
 			t.Fatal("later Turn events are out of order", i, future[i].Event.Type)
 		}
 	}
-	turns, err := s.ListTurns(ctx, tenant, id, "", 100, true)
+	turns, err := sessionAdapter(s).ListTurns(ctx, tenant, id, "", 100, true)
 	if err != nil || len(turns.Turns) != 2 {
 		t.Fatal(turns, err)
 	}
diff --git a/services/core/internal/store/session_deletion_execution_test.go b/services/core/internal/store/session_deletion_execution_test.go
index 83044b453..678580d56 100644
--- a/services/core/internal/store/session_deletion_execution_test.go
+++ b/services/core/internal/store/session_deletion_execution_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestDeletedSessionWaitingTurnSettlesWithoutStoppingWorker(t *testing.T) {
@@ -47,7 +48,7 @@ func TestDeletedSessionWaitingTurnSettlesWithoutStoppingWorker(t *testing.T) {
 	}
 	h.write(input.TurnID, proto.TypeInteractionDecisionAck, proto.InteractionDecisionAckPayload{DeliveryID: request.DeliveryID, Applied: true, Outcome: &proto.DonePayload{Metadata: map[string]any{proto.DoneMetaAgentSessionID: "deleted-native"}}})
 	waitTurn(t, h, input.TurnID, sessions.TurnCancelled)
-	bound, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "deleted-native" {
 		t.Fatal(bound, err)
 	}
@@ -68,7 +69,7 @@ func TestDeletedSessionRestartStillReconcilesHiddenClaim(t *testing.T) {
 	h := newDispatchHarness(t)
 	input := h.message("interrupted", "Run")
 	ctx := t.Context()
-	if _, err := h.s.TransitionTurn(ctx, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	if err := h.s.DeleteSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotIdle) {
@@ -83,7 +84,7 @@ func TestDeletedSessionRestartStillReconcilesHiddenClaim(t *testing.T) {
 	if err := worker.Run(stopped); !errors.Is(err, context.Canceled) {
 		t.Fatal(err)
 	}
-	turn, err := h.s.GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnFailed {
 		t.Fatal(turn, err)
 	}
diff --git a/services/core/internal/store/session_deletion_lifecycle_public_test.go b/services/core/internal/store/session_deletion_lifecycle_public_test.go
index 5eaf767e5..04fd25a7f 100644
--- a/services/core/internal/store/session_deletion_lifecycle_public_test.go
+++ b/services/core/internal/store/session_deletion_lifecycle_public_test.go
@@ -73,9 +73,9 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 			case "function":
 				err = leased.Sessions.RecordFunctionCall(ctx, tenant, session.ID, receipt.TurnID, sessions.FunctionCall{CallID: "pending", ExecutorCallID: "native-pending", Name: "lookup", Arguments: json.RawMessage(`{}`)})
 			case sessions.TurnCompleted, sessions.TurnFailed:
-				_, err = s.CompleteExecution(ctx, tenant, session.ID, receipt.TurnID, status, nil, "", receipt.Sequence)
+				_, err = leased.Sessions.CompleteExecution(ctx, tenant, session.ID, receipt.TurnID, status, nil, "", receipt.Sequence)
 			default:
-				_, err = s.TransitionTurn(ctx, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: from, Status: status})
+				_, err = store.TransitionTurn(ctx, s, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: from, Status: status})
 				from = status
 			}
 			if err != nil {
diff --git a/services/core/internal/store/session_deletion_test.go b/services/core/internal/store/session_deletion_test.go
index 84b0d53f5..f1bd0de96 100644
--- a/services/core/internal/store/session_deletion_test.go
+++ b/services/core/internal/store/session_deletion_test.go
@@ -67,13 +67,13 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 				t.Fatal(err)
 			}
 			if status != sessions.TurnQueued {
-				_, err = s.TransitionTurn(ctx, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+				_, err = transitionTurn(ctx, s, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 				if err != nil {
 					t.Fatal(err)
 				}
 			}
 			if status == sessions.TurnCompleted || status == sessions.TurnFailed {
-				if _, err = s.CompleteExecution(ctx, tenant, session.ID, receipt.TurnID, status, nil, "", receipt.Sequence); err != nil {
+				if _, err = completeExecution(ctx, t, s, tenant, session.ID, receipt.TurnID, status, nil, "", receipt.Sequence); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -89,7 +89,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 				if err := s.DeleteSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("active Session deleted", err)
 				}
-				turn, err := s.GetTurn(ctx, tenant, session.ID, receipt.TurnID)
+				turn, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, receipt.TurnID)
 				if err != nil || turn.Status != status || !turn.CancelRequestedAt.IsZero() {
 					t.Fatal("rejected deletion changed the Turn", turn, err)
 				}
@@ -108,7 +108,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 					if err := s.DeleteSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
 						t.Fatal("cancelling Session deleted", err)
 					}
-					if _, err := s.CompleteExecution(ctx, tenant, session.ID, receipt.TurnID, sessions.TurnCancelled, nil, "", receipt.Sequence); err != nil {
+					if _, err := completeExecution(ctx, t, s, tenant, session.ID, receipt.TurnID, sessions.TurnCancelled, nil, "", receipt.Sequence); err != nil {
 						t.Fatal(err)
 					}
 				}
@@ -148,7 +148,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if _, err := sessionAdapter(fresh).ListItems(ctx, tenant, session.ID, "", 20, true); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
-			turn, err := fresh.GetTurn(ctx, tenant, session.ID, receipt.TurnID)
+			turn, err := sessionAdapter(fresh).GetTurn(ctx, tenant, session.ID, receipt.TurnID)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -159,7 +159,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if turn.Status != want {
 				t.Fatal(turn)
 			}
-			if _, err := fresh.TransitionTurn(ctx, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
+			if _, err := transitionTurn(ctx, fresh, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
 				t.Fatal(err)
 			}
 			inputs, err := fresh.ListTurnInputs(ctx, tenant, session.ID, receipt.TurnID, 0, 20)
diff --git a/services/core/internal/store/session_diagnostics.go b/services/core/internal/store/session_diagnostics.go
index 316c65a21..0c9ee313a 100644
--- a/services/core/internal/store/session_diagnostics.go
+++ b/services/core/internal/store/session_diagnostics.go
@@ -42,7 +42,7 @@ func (s *Store) GetSessionDiagnosticsSnapshot(ctx context.Context, tenantID, ses
 // GetTurnDiagnosticsSnapshot reads only root Turns and their root Items. Its
 // bounded query and public projection share the same committed snapshot.
 func (s *Store) GetTurnDiagnosticsSnapshot(ctx context.Context, tenantID, sessionID, turnID string) (sessions.TurnDiagnosticsSnapshot, error) {
-	params, err := publicTurnLookup(tenantID, sessionID, turnID)
+	params, err := sessionpg.PublicTurnLookup(tenantID, sessionID, turnID)
 	if err != nil {
 		return sessions.TurnDiagnosticsSnapshot{}, err
 	}
diff --git a/services/core/internal/store/session_diagnostics_test.go b/services/core/internal/store/session_diagnostics_test.go
index 5de8dba1f..9757c2dfe 100644
--- a/services/core/internal/store/session_diagnostics_test.go
+++ b/services/core/internal/store/session_diagnostics_test.go
@@ -76,7 +76,7 @@ func TestDiagnosticForceSettlementIgnoresNativeClock(t *testing.T) {
 			}
 			source := runtimeDatabaseTime(t, s).Add(skew).UnixMilli()
 			before := runtimeDatabaseTime(t, s)
-			completed, err := w.CompleteExecution(t.Context(), owner.TenantID, owner.SessionID, turn, sessions.TurnCompleted, json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, source)), "", 0)
+			completed, err := completeExecution(t.Context(), t, w, owner.TenantID, owner.SessionID, turn, sessions.TurnCompleted, json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, source)), "", 0)
 			after := runtimeDatabaseTime(t, s)
 			if err != nil || completed.CompletedAt.UnixMilli() != source {
 				t.Fatal("public native completion changed", completed, err)
@@ -112,7 +112,7 @@ func TestDiagnosticSettlementWaitsForSessionLock(t *testing.T) {
 	}
 	done := make(chan error, 1)
 	go func() {
-		_, err := s.TransitionTurn(t.Context(), tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed})
+		_, err := transitionTurn(t.Context(), s, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed})
 		done <- err
 	}()
 	// Wait for the actual competing transaction to block, not a scheduler delay.
diff --git a/services/core/internal/store/session_events_test.go b/services/core/internal/store/session_events_test.go
index e65fbf79b..48fa34581 100644
--- a/services/core/internal/store/session_events_test.go
+++ b/services/core/internal/store/session_events_test.go
@@ -72,7 +72,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if before != after {
 		t.Fatal("input retry published duplicate events")
 	}
-	if _, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	batch := []sessions.ExecutionEvent{
@@ -97,7 +97,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if before != after {
 		t.Fatal("failed transaction published events")
 	}
-	if _, err = s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{"private":"must not escape"}`), "", input.Sequence); err != nil {
+	if _, err = journal.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{"private":"must not escape"}`), "", input.Sequence); err != nil {
 		t.Fatal(err)
 	}
 	var all []sessions.SessionChange
diff --git a/services/core/internal/store/session_metadata_test.go b/services/core/internal/store/session_metadata_test.go
index 771ef210d..4e775bda4 100644
--- a/services/core/internal/store/session_metadata_test.go
+++ b/services/core/internal/store/session_metadata_test.go
@@ -118,10 +118,10 @@ func TestSessionMetadataPreservesTerminalActivity(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		if _, err := s.TransitionTurn(ctx, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+		if _, err := transitionTurn(ctx, s, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 			t.Fatal(err)
 		}
-		if _, err := s.TransitionTurn(ctx, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: status}); err != nil {
+		if _, err := transitionTurn(ctx, s, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: status}); err != nil {
 			t.Fatal(err)
 		}
 		before, err := s.GetSession(ctx, tenant, session.ID)
diff --git a/services/core/internal/store/session_model_execution.go b/services/core/internal/store/session_model_execution.go
index ad6565c49..c3f9d469b 100644
--- a/services/core/internal/store/session_model_execution.go
+++ b/services/core/internal/store/session_model_execution.go
@@ -1,11 +1,8 @@
 package store
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
-	"io"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
@@ -28,32 +25,3 @@ func (s *Store) saveSessionModelExecution(ctx context.Context, q *sqlc.Queries,
 	}
 	return q.SaveSessionModelExecution(ctx, sqlc.SaveSessionModelExecutionParams{SessionID: session, EncryptedConfig: encrypted})
 }
-
-func (s *Store) SessionModelExecution(ctx context.Context, tenant, session string) (*v1.ModelProviderInput, error) {
-	tenantID, err := parseID(tenant)
-	if err != nil {
-		return nil, err
-	}
-	sessionID, err := parseID(session)
-	if err != nil {
-		return nil, err
-	}
-	ciphertext, err := s.queries.GetSessionModelExecution(ctx, sqlc.GetSessionModelExecutionParams{TenantID: tenantID, SessionID: sessionID})
-	if err != nil {
-		return nil, errors.New("session model execution configuration is unavailable")
-	}
-	raw, err := s.credentialCipher.OpenModelExecution(ciphertext, tenant, session)
-	if err != nil {
-		return nil, errors.New("session model execution decryption is unavailable")
-	}
-	var provider v1.ModelProviderInput
-	decoder := json.NewDecoder(bytes.NewReader(raw))
-	decoder.DisallowUnknownFields()
-	if decoder.Decode(&provider) != nil || decoder.Decode(new(any)) != io.EOF {
-		return nil, errors.New("invalid stored model execution configuration")
-	}
-	if err := provider.Validate(); err != nil {
-		return nil, err
-	}
-	return &provider, nil
-}
diff --git a/services/core/internal/store/session_model_execution_test.go b/services/core/internal/store/session_model_execution_test.go
index e5eb6ec92..303817845 100644
--- a/services/core/internal/store/session_model_execution_test.go
+++ b/services/core/internal/store/session_model_execution_test.go
@@ -42,18 +42,18 @@ func TestSessionModelExecutionEncryptedAndBound(t *testing.T) {
 		t.Fatal("changed credentials accepted", err)
 	}
 	restarted := withPlacement(t, NewWithCredentialCipher(pool, cipher))
-	provider, err := restarted.SessionModelExecution(ctx, tenant, session.ID)
+	provider, err := sessionAdapter(restarted).SessionModelExecution(ctx, tenant, session.ID)
 	if err != nil || provider.APIKey != "private-model-canary" {
 		t.Fatal("restart lost model credential", err)
 	}
-	if _, err := restarted.SessionModelExecution(ctx, uuid.NewString(), session.ID); err == nil {
-		t.Fatal("foreign tenant read credential")
+	if _, err := sessionAdapter(restarted).SessionModelExecution(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatal("foreign tenant read credential", err)
 	}
 	if _, err := cipher.OpenModelExecution(ciphertext, tenant, uuid.NewString()); err == nil {
 		t.Fatal("ciphertext not Session-bound")
 	}
-	if _, err := New(pool).SessionModelExecution(ctx, tenant, session.ID); err == nil {
-		t.Fatal("missing cipher succeeded")
+	if _, err := sessionAdapter(New(pool)).SessionModelExecution(ctx, tenant, session.ID); !errors.Is(err, credentialcrypto.ErrUnavailable) {
+		t.Fatal("missing cipher succeeded", err)
 	}
 	input.IdempotencyKey = uuid.NewString()
 	if _, err := withPlacement(t, New(pool)).CreateSession(ctx, tenant, input); !errors.Is(err, credentialcrypto.ErrUnavailable) {
diff --git a/services/core/internal/store/session_model_options_test.go b/services/core/internal/store/session_model_options_test.go
index 19e76c80c..079b3b06e 100644
--- a/services/core/internal/store/session_model_options_test.go
+++ b/services/core/internal/store/session_model_options_test.go
@@ -25,7 +25,7 @@ func TestSessionModelExecutionStoresOnlyProviderBundle(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	flat, err := st.SessionModelExecution(ctx, tenant, session.ID)
+	flat, err := sessionAdapter(st).SessionModelExecution(ctx, tenant, session.ID)
 	if err != nil || flat == nil || *flat != *provider {
 		t.Fatal("new Session did not store a flat provider bundle", err)
 	}
@@ -47,7 +47,7 @@ func TestSessionModelExecutionStoresOnlyProviderBundle(t *testing.T) {
 	if _, err := pool.Exec(ctx, "UPDATE session_model_execution SET encrypted_config=$2 WHERE session_id=$1", session.ID, ciphertext); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := NewWithCredentialCipher(pool, cipher).SessionModelExecution(ctx, tenant, session.ID); err == nil {
+	if _, err := sessionAdapter(NewWithCredentialCipher(pool, cipher)).SessionModelExecution(ctx, tenant, session.ID); err == nil {
 		t.Fatal("retired native options accepted in provider bundle")
 	}
 }
diff --git a/services/core/internal/store/structured_output_dispatch_test.go b/services/core/internal/store/structured_output_dispatch_test.go
index 86bc24e64..94b6e34f9 100644
--- a/services/core/internal/store/structured_output_dispatch_test.go
+++ b/services/core/internal/store/structured_output_dispatch_test.go
@@ -54,7 +54,7 @@ func TestStructuredOutputDispatchRechecksOperationQualification(t *testing.T) {
 	if result := <-h.run(ctx, input.TurnID); result.err == nil {
 		t.Fatal("unqualified structured output dispatched")
 	}
-	turn, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
+	turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnQueued {
 		t.Fatal("unqualified work was claimed", turn.Status, err)
 	}
diff --git a/services/core/internal/store/structured_output_native_test.go b/services/core/internal/store/structured_output_native_test.go
index 58d61fd4f..2d51e2995 100644
--- a/services/core/internal/store/structured_output_native_test.go
+++ b/services/core/internal/store/structured_output_native_test.go
@@ -74,7 +74,7 @@ func TestNativeStructuredOutputPublicExecution(t *testing.T) {
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
-	turn, err := h.s.GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
+	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -82,14 +82,14 @@ func TestNativeStructuredOutputPublicExecution(t *testing.T) {
 	if json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.Done.Usage.Raw["claude_sdk_result"] == nil || outcome.AppliedThrough < 1 {
 		t.Fatal("native usage or input receipt missing")
 	}
-	before, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, "claude_sdk")
 	run("resume")
-	after, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/subagent_identities_test.go b/services/core/internal/store/subagent_identities_test.go
index 03857d54f..f5dc4a1a5 100644
--- a/services/core/internal/store/subagent_identities_test.go
+++ b/services/core/internal/store/subagent_identities_test.go
@@ -103,7 +103,7 @@ func TestSubagentIdentityIsAtomicScopedAndImmutable(t *testing.T) {
 	if err = journal.AppendTurnEvents(ctx, tenant, foreign.ID, foreignInput.TurnID, 1, []sessions.ExecutionEvent{subagentIdentityEvent("other-child", "root", 101)}); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 		t.Fatal("known root binding ignored", err)
 	}
-	if _, err = w.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCompleted, json.RawMessage(`{}`), "root", input.Sequence); err != nil {
+	if _, err = completeExecution(ctx, t, w, tenant, session.ID, input.TurnID, sessions.TurnCompleted, json.RawMessage(`{}`), "root", input.Sequence); err != nil {
 		t.Fatal(err)
 	}
 	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, w.pool)
diff --git a/services/core/internal/store/subagent_native_outputs_test.go b/services/core/internal/store/subagent_native_outputs_test.go
index caaf9946a..f6154fb3b 100644
--- a/services/core/internal/store/subagent_native_outputs_test.go
+++ b/services/core/internal/store/subagent_native_outputs_test.go
@@ -136,13 +136,13 @@ func TestSubagentRootCompletionRetainsNativeSourceTime(t *testing.T) {
 			tenant, session := newTurnSession(t, s)
 			input := submitMessage(t, s, tenant, session.ID, "start")
 			transition(t, s, tenant, session.ID, input.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-			current, err := s.GetTurn(t.Context(), tenant, session.ID, input.TurnID)
+			current, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session.ID, input.TurnID)
 			if err != nil {
 				t.Fatal(err)
 			}
 			source := current.CreatedAt.Unix() * 1000
 			outcome := json.RawMessage(fmt.Sprintf(`{"done":{"source_completed_at_ms":%d}}`, source))
-			completed, err := s.CompleteExecution(t.Context(), tenant, session.ID, input.TurnID, status, outcome, "", input.Sequence)
+			completed, err := completeExecution(t.Context(), t, s, tenant, session.ID, input.TurnID, status, outcome, "", input.Sequence)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/subagent_resources_test.go b/services/core/internal/store/subagent_resources_test.go
index 49eecf66f..87135d8a1 100644
--- a/services/core/internal/store/subagent_resources_test.go
+++ b/services/core/internal/store/subagent_resources_test.go
@@ -90,13 +90,13 @@ func TestSubagentResourcesNativeOwnershipLifecycleAndRecovery(t *testing.T) {
 		t.Fatal(same, err)
 	}
 	// Session Turn reads carry root work only: a child Turn ID is missing there.
-	if _, err = s.GetTurn(ctx, tenant, session.ID, tid); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err = sessionAdapter(s).GetTurn(ctx, tenant, session.ID, tid); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("child Turn in Session Turn retrieval", err)
 	}
-	if _, err = s.ListTurns(ctx, tenant, session.ID, tid, 100, true); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err = sessionAdapter(s).ListTurns(ctx, tenant, session.ID, tid, 100, true); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("child Turn as a Session Turn cursor", err)
 	}
-	allTurns, err := s.ListTurns(ctx, tenant, session.ID, "", 100, true)
+	allTurns, err := sessionAdapter(s).ListTurns(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(allTurns.Turns) != 1 || allTurns.Turns[0].ID != root.TurnID {
 		t.Fatal(allTurns, err)
 	}
@@ -113,7 +113,7 @@ func TestSubagentResourcesNativeOwnershipLifecycleAndRecovery(t *testing.T) {
 	if _, err = sessionAdapter(s).ListSubagentTurns(ctx, uuid.NewString(), session.ID, child.ID, "", 20, true); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign tenant child Turns", err)
 	}
-	if allTurns, err = s.ListTurns(ctx, tenant, session.ID, "", 100, true); err != nil || len(allTurns.Turns) != 1 {
+	if allTurns, err = sessionAdapter(s).ListTurns(ctx, tenant, session.ID, "", 100, true); err != nil || len(allTurns.Turns) != 1 {
 		t.Fatal(allTurns, err)
 	}
 	own, err := sessionAdapter(s).ListSubagentTurnItems(ctx, tenant, session.ID, child.ID, tid, "", 20, true)
diff --git a/services/core/internal/store/subagent_visibility_public_test.go b/services/core/internal/store/subagent_visibility_public_test.go
index 80bc82abd..4888d5895 100644
--- a/services/core/internal/store/subagent_visibility_public_test.go
+++ b/services/core/internal/store/subagent_visibility_public_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -115,7 +116,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 	}
 	observed := collectEvents(t, live)
 
-	page, err := s.ListTurns(ctx, tenant, session, "", 10, true)
+	page, err := store.SessionAdapter(s).ListTurns(ctx, tenant, session, "", 10, true)
 	if err != nil || len(page.Turns) != 1 {
 		t.Fatal(page, err)
 	}
@@ -127,7 +128,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 	if err = leased.Sessions.BindSessionDevice(ctx, tenant, session, host.ID); err != nil {
 		t.Fatal(err)
 	}
-	if _, err = writer.TransitionTurn(ctx, tenant, session, root, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = store.TransitionTurn(ctx, writer, tenant, session, root, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	identity := func(child, parent string, created int64) sessions.ExecutionEvent {
@@ -151,7 +152,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 	if err = leased.Sessions.AppendTurnEvents(ctx, tenant, session, root, 1, facts); err != nil {
 		t.Fatal(err)
 	}
-	if _, err = writer.TransitionTurn(ctx, tenant, session, root, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted}); err != nil {
+	if _, err = store.TransitionTurn(ctx, writer, tenant, session, root, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted}); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/services/core/internal/store/token_usage_integration_test.go b/services/core/internal/store/token_usage_integration_test.go
index 404c8a8a9..2dd7268ff 100644
--- a/services/core/internal/store/token_usage_integration_test.go
+++ b/services/core/internal/store/token_usage_integration_test.go
@@ -38,7 +38,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		_, err = s.TransitionTurn(ctx, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+		_, err = store.TransitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -52,29 +52,29 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		if err = journal.AppendTurnEvents(ctx, tenant, session.ID, admission.TurnID, 2, []sessions.ExecutionEvent{{Kind: "usage", Payload: usage(20)}}); err != nil {
 			t.Fatal(err)
 		}
-		measured, err := s.GetTurn(ctx, tenant, session.ID, admission.TurnID)
+		measured, err := store.SessionAdapter(s).GetTurn(ctx, tenant, session.ID, admission.TurnID)
 		if err != nil {
 			t.Fatal(err)
 		}
 		check(measured.Usage, 20)
-		if _, err = s.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, sessions.TurnCompleted, json.RawMessage(`{"done":{"usage":`+string(usage(99))+`}}`), "missing-binding", admission.Sequence); !errors.Is(err, sessions.ErrNotFound) {
+		if _, err = journal.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, sessions.TurnCompleted, json.RawMessage(`{"done":{"usage":`+string(usage(99))+`}}`), "missing-binding", admission.Sequence); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal(err)
 		}
-		rolledBack, err := s.GetTurn(ctx, tenant, session.ID, admission.TurnID)
+		rolledBack, err := store.SessionAdapter(s).GetTurn(ctx, tenant, session.ID, admission.TurnID)
 		if err != nil || rolledBack.Status != sessions.TurnInProgress {
 			t.Fatalf("rollback: %+v %v", rolledBack, err)
 		}
 		check(rolledBack.Usage, 20)
 		// Completion without usage retains the last persisted measurement.
-		completed, err := s.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, status, json.RawMessage(`{"done":{"content":"partial"}}`), "", admission.Sequence)
+		completed, err := journal.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, status, json.RawMessage(`{"done":{"content":"partial"}}`), "", admission.Sequence)
 		if err != nil {
 			t.Fatal(err)
 		}
 		check(completed.Usage, 20)
-		if _, err = s.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, status, json.RawMessage(`{"done":{"usage":`+string(usage(99))+`}}`), "", admission.Sequence); !errors.Is(err, sessions.ErrTurnConflict) {
+		if _, err = journal.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, status, json.RawMessage(`{"done":{"usage":`+string(usage(99))+`}}`), "", admission.Sequence); !errors.Is(err, sessions.ErrTurnConflict) {
 			t.Fatal(err)
 		}
-		if _, err = s.GetTurn(ctx, uuid.NewString(), session.ID, admission.TurnID); !errors.Is(err, sessions.ErrNotFound) {
+		if _, err = store.SessionAdapter(s).GetTurn(ctx, uuid.NewString(), session.ID, admission.TurnID); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal(err)
 		}
 	}
@@ -118,7 +118,7 @@ func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = s.TransitionTurn(ctx, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -127,7 +127,7 @@ func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 		t.Fatal(err)
 	}
 	// Startup recovery has no in-memory cancellation outcome.
-	recovered, err := s.TransitionTurn(ctx, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"execution_interrupted"}`)})
+	recovered, err := store.TransitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"execution_interrupted"}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -196,13 +196,13 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	}
 	move := func(turn, from, to string) {
 		t.Helper()
-		if _, err := s.TransitionTurn(ctx, tenant, session.ID, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
+		if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
 			t.Fatal(err)
 		}
 	}
 	finish := func(admission sessions.InputReceipt, status string) {
 		t.Helper()
-		if _, err := s.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, status, json.RawMessage(`{"done":{}}`), "", admission.Sequence); err != nil {
+		if _, err := journal.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, status, json.RawMessage(`{"done":{}}`), "", admission.Sequence); err != nil {
 			t.Fatal(err)
 		}
 	}
diff --git a/services/core/internal/store/tool_policy_native_test.go b/services/core/internal/store/tool_policy_native_test.go
index aea5f0195..821c075cf 100644
--- a/services/core/internal/store/tool_policy_native_test.go
+++ b/services/core/internal/store/tool_policy_native_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -90,7 +91,7 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 		if err != nil || session.Engine != kind {
 			t.Fatal("selected engine was not persisted", err)
 		}
-		turn, err := h.s.GetTurn(ctx, h.tenant, item.ID, item.FirstTurn)
+		turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, item.ID, item.FirstTurn)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -99,7 +100,7 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 		if err != nil || len(inputs) != 1 || json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.AppliedThrough != inputs[0].Sequence {
 			t.Fatal("native text input receipt missing", err)
 		}
-		binding, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, item.ID)
+		binding, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, item.ID)
 		if err != nil || binding.NativeSessionID == "" {
 			t.Fatal("native binding missing", err)
 		}
@@ -109,7 +110,7 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 	stop = startNativeEngineDaemon(t, h, home, binary, kind)
 	run("resume")
 	for id, before := range nativeIDs {
-		after, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, id)
+		after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, id)
 		if err != nil || after.NativeSessionID != before {
 			t.Fatal("cold continuation changed native history", err)
 		}
diff --git a/services/core/internal/store/tool_search_native_test.go b/services/core/internal/store/tool_search_native_test.go
index e2123d634..626443f9b 100644
--- a/services/core/internal/store/tool_search_native_test.go
+++ b/services/core/internal/store/tool_search_native_test.go
@@ -74,7 +74,7 @@ func TestNativeToolSearchPublicExecution(t *testing.T) {
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
-	turn, err := h.s.GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
+	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -82,14 +82,14 @@ func TestNativeToolSearchPublicExecution(t *testing.T) {
 	if json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.Done.Usage.Raw["claude_sdk_result"] == nil || outcome.AppliedThrough < 1 {
 		t.Fatal("native usage or input receipt missing")
 	}
-	before, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, "claude_sdk")
 	run("resume")
-	after, err := h.s.GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/turn_completion.go b/services/core/internal/store/turn_completion.go
deleted file mode 100644
index bd7f812ca..000000000
--- a/services/core/internal/store/turn_completion.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/jsonobject"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// CompleteExecution commits the outcome and native continuity under the admission lock.
-func (s *Store) CompleteExecution(ctx context.Context, tenantID, sessionID, turnID, status string, outcome json.RawMessage, nativeID string, appliedThrough int64) (sessions.Turn, error) {
-	p, err := sessionpg.TurnLookup(tenantID, sessionID, turnID)
-	if err != nil {
-		return sessions.Turn{}, err
-	}
-	if !sessions.TerminalStatus(status) || len(outcome) > 512*1024 || len(nativeID) > 512 || appliedThrough < 0 {
-		return sessions.Turn{}, sessions.ErrInvalidInput
-	}
-	outcome, err = jsonobject.Normalize(outcome)
-	if err != nil {
-		return sessions.Turn{}, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
-	}
-	var row sqlc.Turn
-	err = s.withSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		current, err := q.GetTurn(ctx, p)
-		if errors.Is(err, pgx.ErrNoRows) {
-			return sessions.ErrNotFound
-		} else if err != nil {
-			return err
-		}
-		if current.Status != sessions.TurnInProgress && (current.Status != sessions.TurnWaiting || status == sessions.TurnCompleted) {
-			return sessions.ErrTurnConflict
-		}
-		if status == sessions.TurnCompleted {
-			pending, err := q.HasUnappliedMessages(ctx, sqlc.HasUnappliedMessagesParams{SessionID: session, TurnID: p.ID, Sequence: appliedThrough})
-			if err != nil {
-				return err
-			}
-			if pending {
-				return sessions.ErrUnappliedInputs
-			}
-		}
-		sourceCompleted := pgtype.Timestamptz{}
-		if status == sessions.TurnCompleted {
-			var snapshot struct {
-				Done *struct {
-					SourceCompletedAtMS *int64 `json:"source_completed_at_ms"`
-				} `json:"done"`
-			}
-			if json.Unmarshal(outcome, &snapshot) != nil {
-				return sessions.ErrInvalidInput
-			}
-			if snapshot.Done != nil && snapshot.Done.SourceCompletedAtMS != nil {
-				ms := *snapshot.Done.SourceCompletedAtMS
-				if ms <= 0 {
-					return sessions.ErrInvalidInput
-				}
-				// Native and Core timestamps come from independent host clocks.
-				// Preserve source time; committed activity uses the database clock.
-				sourceCompleted = pgtype.Timestamptz{Time: time.UnixMilli(ms), Valid: true}
-			}
-		}
-		row, err = q.TransitionTurn(ctx, sqlc.TransitionTurnParams{ID: p.ID, SessionID: session, ExpectedStatus: current.Status, NewStatus: status, Outcome: outcome, SourceCompletedAt: sourceCompleted})
-		if errors.Is(err, pgx.ErrNoRows) {
-			return sessions.ErrTurnConflict
-		}
-		if err != nil {
-			return err
-		}
-		if err = sessions.AppendTurnEvent(ctx, sessionpg.BindSession(q, p.TenantID, session), uuid.UUID(row.ID.Bytes).String(), row.EventCount, sessions.ExecutionEvent{Kind: "execution_" + status, Payload: outcome}); err != nil {
-			return err
-		}
-		if nativeID != "" {
-			n, err := q.RememberNativeSession(ctx, sqlc.RememberNativeSessionParams{SessionID: session, NativeSessionID: nativeID})
-			if err != nil {
-				return err
-			}
-			if n != 1 {
-				return sessions.ErrNotFound
-			}
-		}
-		row, err = q.GetTurn(ctx, p)
-		if err != nil {
-			return err
-		}
-		ending, err := sessionpg.LoadEnding(ctx, q, session, row.ID)
-		if err != nil {
-			return err
-		}
-		return sessionpg.ApplyTurnEnd(ctx, q, session, row.ID, sessions.EndTurn(sessionpg.TurnFromRow(row), ending))
-	})
-	if err != nil {
-		return sessions.Turn{}, err
-	}
-	return sessionpg.TurnFromRow(row), nil
-}
diff --git a/services/core/internal/store/turn_events_test.go b/services/core/internal/store/turn_events_test.go
index cbdd71512..bd4c1c9ec 100644
--- a/services/core/internal/store/turn_events_test.go
+++ b/services/core/internal/store/turn_events_test.go
@@ -25,7 +25,7 @@ func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = s.TransitionTurn(ctx, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -66,14 +66,14 @@ func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 		t.Fatal(err)
 	}
 	// A failed native binding write must roll back both the terminal event and status.
-	if _, err = s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCompleted, json.RawMessage(`{}`), "missing-binding", input.Sequence); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err = journal.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCompleted, json.RawMessage(`{}`), "missing-binding", input.Sequence); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 	events, _ := s.ListTurnEvents(ctx, tenant, session.ID, input.TurnID, 0, 100)
 	if len(events) != 2 {
 		t.Fatal("terminal event survived rollback")
 	}
-	if _, err = s.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{"done":{"content":""}}`), "", input.Sequence); err != nil {
+	if _, err = journal.CompleteExecution(ctx, tenant, session.ID, input.TurnID, sessions.TurnCancelled, json.RawMessage(`{"done":{"content":""}}`), "", input.Sequence); err != nil {
 		t.Fatal(err)
 	}
 	if err = journal.AppendTurnEvents(ctx, tenant, session.ID, input.TurnID, 1, batch); err != nil {
@@ -98,7 +98,7 @@ func TestEventLimitStillAllowsTerminalFailure(t *testing.T) {
 	h := newDispatchHarness(t)
 	ctx := context.Background()
 	input := h.message("start", "Test output budget")
-	_, err := h.s.TransitionTurn(ctx, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -111,7 +111,7 @@ func TestEventLimitStillAllowsTerminalFailure(t *testing.T) {
 	if err = h.owner().Sessions.AppendTurnEvents(ctx, h.tenant, h.session.ID, input.TurnID, 1, events); !errors.Is(err, sessions.ErrEventLimit) {
 		t.Fatal(err)
 	}
-	if _, err = h.s.CompleteExecution(ctx, h.tenant, h.session.ID, input.TurnID, sessions.TurnFailed, json.RawMessage(`{"error_code":"event_limit"}`), "", input.Sequence); err != nil {
+	if _, err = h.owner().Sessions.CompleteExecution(ctx, h.tenant, h.session.ID, input.TurnID, sessions.TurnFailed, json.RawMessage(`{"error_code":"event_limit"}`), "", input.Sequence); err != nil {
 		t.Fatal(err)
 	}
 	got, err := h.s.ListTurnEvents(ctx, h.tenant, h.session.ID, input.TurnID, 0, 100)
diff --git a/services/core/internal/store/turn_inputs.go b/services/core/internal/store/turn_inputs.go
index c9f8285ce..3e896dafd 100644
--- a/services/core/internal/store/turn_inputs.go
+++ b/services/core/internal/store/turn_inputs.go
@@ -211,8 +211,10 @@ func (s *Store) ListTurnInputs(ctx context.Context, tenantID, sessionID, turnID
 	if after < 0 || limit < 1 || limit > 100 {
 		return nil, fmt.Errorf("%w: nonnegative cursor and page size 1..100 required", sessions.ErrInvalidInput)
 	}
-	if _, err := s.GetTurn(ctx, tenantID, sessionID, turnID); err != nil {
-		return nil, err
+	if _, err := s.queries.GetTurn(ctx, params); errors.Is(err, pgx.ErrNoRows) {
+		return nil, sessions.ErrNotFound
+	} else if err != nil {
+		return nil, fmt.Errorf("get turn: %w", err)
 	}
 	rows, err := s.queries.ListTurnInputs(ctx, sqlc.ListTurnInputsParams{
 		TenantID: params.TenantID, SessionID: params.SessionID, TurnID: params.ID, Sequence: after, Limit: int32(limit),
diff --git a/services/core/internal/store/turn_inputs_test.go b/services/core/internal/store/turn_inputs_test.go
index aee9a919b..c5924e554 100644
--- a/services/core/internal/store/turn_inputs_test.go
+++ b/services/core/internal/store/turn_inputs_test.go
@@ -38,7 +38,7 @@ func submitMessage(t *testing.T, s *Store, tenant, session, key string) sessions
 
 func transition(t *testing.T, s *Store, tenant, session, turn, from, to string) sessions.Turn {
 	t.Helper()
-	got, err := s.TransitionTurn(context.Background(), tenant, session, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to})
+	got, err := transitionTurn(context.Background(), s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -137,7 +137,7 @@ func TestTurnInputRetriesAndRestart(t *testing.T) {
 	if !retry.Replayed || retry.TurnID != first.TurnID || retry.Sequence != first.Sequence {
 		t.Fatalf("restart retry changed target: %+v", retry)
 	}
-	got, err := recovered.GetTurn(ctx, tenant, session.ID, first.TurnID)
+	got, err := sessionAdapter(recovered).GetTurn(ctx, tenant, session.ID, first.TurnID)
 	if err != nil || !reflect.DeepEqual(got, completed) {
 		t.Fatalf("restart turn: %+v, %v", got, err)
 	}
@@ -183,13 +183,16 @@ func TestTurnOperationsAreTenantAndSessionScoped(t *testing.T) {
 				return err
 			},
 			"cancel": func() error { _, err := s.RequestCancel(ctx, scope.tenant, scope.session, "cancel"); return err },
-			"read":   func() error { _, err := s.GetTurn(ctx, scope.tenant, scope.session, first.TurnID); return err },
+			"read": func() error {
+				_, err := sessionAdapter(s).GetTurn(ctx, scope.tenant, scope.session, first.TurnID)
+				return err
+			},
 			"inputs": func() error {
 				_, err := s.ListTurnInputs(ctx, scope.tenant, scope.session, first.TurnID, 0, 10)
 				return err
 			},
 			"transition": func() error {
-				_, err := s.TransitionTurn(ctx, scope.tenant, scope.session, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed})
+				_, err := transitionTurn(ctx, s, scope.tenant, scope.session, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed})
 				return err
 			},
 		} {
@@ -203,10 +206,10 @@ func TestTurnOperationsAreTenantAndSessionScoped(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.GetTurn(ctx, tenant, second.ID, first.TurnID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetTurn(ctx, tenant, second.ID, first.TurnID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatalf("cross-session turn read: %v", err)
 	}
-	if _, err := s.TransitionTurn(ctx, tenant, second.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed}); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := transitionTurn(ctx, s, tenant, second.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed}); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatalf("cross-session turn write: %v", err)
 	}
 	otherInput := submitMessage(t, s, otherTenant, other.ID, "input")
diff --git a/services/core/internal/store/turn_journal_reads_test.go b/services/core/internal/store/turn_journal_reads_test.go
index 5ac948041..2e07f9b3d 100644
--- a/services/core/internal/store/turn_journal_reads_test.go
+++ b/services/core/internal/store/turn_journal_reads_test.go
@@ -23,7 +23,7 @@ func (s *Store) ListTurnEvents(ctx context.Context, tenantID, sessionID, turnID
 	if after < 0 || limit < 1 || limit > 100 {
 		return nil, sessions.ErrInvalidInput
 	}
-	if _, err = s.GetTurn(ctx, tenantID, sessionID, turnID); err != nil {
+	if _, err = sessionAdapter(s).GetTurn(ctx, tenantID, sessionID, turnID); err != nil {
 		return nil, err
 	}
 	rows, err := s.queries.ListTurnEvents(ctx, sqlc.ListTurnEventsParams{TenantID: p.TenantID, SessionID: p.SessionID, TurnID: p.ID, Ordinal: after, Limit: int32(limit)})
diff --git a/services/core/internal/store/turn_reads.go b/services/core/internal/store/turn_reads.go
deleted file mode 100644
index 85b5c1793..000000000
--- a/services/core/internal/store/turn_reads.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package store
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// ListTurns pages a Session's root Turns. Subagent Turns are not Session Turns;
-// sessionpg.Store.ListSubagentTurns reads them.
-func (s *Store) ListTurns(ctx context.Context, tenantID, sessionID, cursor string, limit int, ascending bool) (sessions.TurnPage, error) {
-	if limit < 1 || limit > 100 {
-		return sessions.TurnPage{}, fmt.Errorf("%w: page size must be 1..100", sessions.ErrInvalidInput)
-	}
-	if _, err := s.GetSession(ctx, tenantID, sessionID); err != nil {
-		return sessions.TurnPage{}, err
-	}
-	tenant, _ := parseID(tenantID)
-	session, _ := parseID(sessionID)
-	params := sqlc.ListRootTurnsParams{TenantID: tenant, SessionID: session, PageLimit: int32(limit + 1), AfterID: pgtype.UUID{Valid: true}, Ascending: ascending}
-	if cursor != "" {
-		// A child Turn is not a Session Turn, so its ID is a missing cursor here.
-		after, err := s.GetTurn(ctx, tenantID, sessionID, pgunit.LookupCursor(cursor))
-		if err != nil {
-			return sessions.TurnPage{}, err
-		}
-		params.AfterCreated = pgtype.Timestamptz{Time: after.CreatedAt, Valid: true}
-		params.AfterID, _ = parseID(after.ID)
-	}
-	rows, err := s.queries.ListRootTurns(ctx, params)
-	if err != nil {
-		return sessions.TurnPage{}, fmt.Errorf("list turns: %w", err)
-	}
-	page := sessions.TurnPage{Turns: make([]sessions.Turn, 0, min(limit, len(rows)))}
-	if len(rows) > limit {
-		page.NextCursor = uuid.UUID(rows[limit-1].ID.Bytes).String()
-		rows = rows[:limit]
-	}
-	for _, row := range rows {
-		page.Turns = append(page.Turns, sessionpg.TurnFromRow(row))
-	}
-	return page, nil
-}
diff --git a/services/core/internal/store/turn_reads_test.go b/services/core/internal/store/turn_reads_test.go
deleted file mode 100644
index 7d0ced7aa..000000000
--- a/services/core/internal/store/turn_reads_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-func TestTurnPaginationRetainsScopeAndOrder(t *testing.T) {
-	s, pool := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	ids := make([]string, 0, 4)
-	for i := 0; i < 4; i++ {
-		receipt := submitMessage(t, s, tenant, session.ID, uuid.NewString())
-		transition(t, s, tenant, session.ID, receipt.TurnID, sessions.TurnQueued, sessions.TurnCancelled)
-		ids = append(ids, receipt.TurnID)
-	}
-	// Equal creation times exercise the ID tie-breaker across page boundaries.
-	if _, err := pool.Exec(ctx, "UPDATE turns SET created_at=$1 WHERE session_id=$2", time.Unix(1700000000, 0), session.ID); err != nil {
-		t.Fatal(err)
-	}
-	sort.Strings(ids)
-	s = New(pool)
-	for _, ascending := range []bool{true, false} {
-		cursor := ""
-		for i := 0; i < len(ids); i++ {
-			page, err := s.ListTurns(ctx, tenant, session.ID, cursor, 1, ascending)
-			at := i
-			if !ascending {
-				at = len(ids) - 1 - i
-			}
-			if err != nil || len(page.Turns) != 1 || page.Turns[0].ID != ids[at] {
-				t.Fatalf("page %d: %+v %v", i, page, err)
-			}
-			if (page.NextCursor != "") != (i < len(ids)-1) {
-				t.Fatalf("incorrect has_more: %+v", page)
-			}
-			cursor = page.Turns[0].ID
-		}
-		page, err := s.ListTurns(ctx, tenant, session.ID, cursor, 1, ascending)
-		if err != nil || len(page.Turns) != 0 || page.Turns == nil || page.NextCursor != "" {
-			t.Fatalf("end: %+v %v", page, err)
-		}
-	}
-	otherTenant, otherSession := newTurnSession(t, s)
-	sameTenantSession, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, scope := range [][2]string{{otherTenant, session.ID}, {tenant, otherSession.ID}, {tenant, uuid.NewString()}, {tenant, sameTenantSession.ID}} {
-		_, err := s.ListTurns(ctx, scope[0], scope[1], ids[0], 1, true)
-		if !errors.Is(err, sessions.ErrNotFound) {
-			t.Fatalf("foreign cursor/session accepted: %v", err)
-		}
-	}
-	empty, err := s.ListTurns(ctx, tenant, sameTenantSession.ID, "", 20, false)
-	if err != nil || empty.Turns == nil || len(empty.Turns) != 0 {
-		t.Fatalf("empty session: %+v %v", empty, err)
-	}
-	for _, limit := range []int{0, 101} {
-		if _, err := s.ListTurns(ctx, tenant, session.ID, "", limit, false); !errors.Is(err, sessions.ErrInvalidInput) {
-			t.Fatalf("limit accepted: %v", err)
-		}
-	}
-}
diff --git a/services/core/internal/store/turns.go b/services/core/internal/store/turns.go
deleted file mode 100644
index 1ac432d8d..000000000
--- a/services/core/internal/store/turns.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/jsonobject"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// GetTurn reads a root Turn. A Subagent Turn ID is not found here, exactly like
-// a missing one; GetSubagentTurn reads child Turns.
-func (s *Store) GetTurn(ctx context.Context, tenantID, sessionID, turnID string) (sessions.Turn, error) {
-	params, err := publicTurnLookup(tenantID, sessionID, turnID)
-	if err != nil {
-		return sessions.Turn{}, err
-	}
-	row, err := s.queries.GetTurn(ctx, params)
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.Turn{}, sessions.ErrNotFound
-	}
-	if err != nil {
-		return sessions.Turn{}, fmt.Errorf("get turn: %w", err)
-	}
-	return sessionpg.TurnFromRow(row), nil
-}
-
-// TransitionTurn is a compare-and-set for execution callbacks. Once terminal,
-// a Turn cannot be reopened or have its outcome overwritten, including by retries.
-// A dispatcher must claim queued -> in_progress before sending work to a daemon.
-func (s *Store) TransitionTurn(ctx context.Context, tenantID, sessionID, turnID string, input sessions.TurnTransition) (sessions.Turn, error) {
-	params, err := sessionpg.TurnLookup(tenantID, sessionID, turnID)
-	if err != nil {
-		return sessions.Turn{}, err
-	}
-	if !sessions.ValidTransition(input.ExpectedStatus, input.Status) || len(input.Outcome) > 512*1024 {
-		return sessions.Turn{}, fmt.Errorf("%w: invalid turn transition or outcome size", sessions.ErrInvalidInput)
-	}
-	outcome, err := jsonobject.Normalize(input.Outcome)
-	if err != nil {
-		return sessions.Turn{}, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
-	}
-	if !sessions.TerminalStatus(input.Status) && string(outcome) != "{}" {
-		return sessions.Turn{}, fmt.Errorf("%w: outcome requires a terminal status", sessions.ErrInvalidInput)
-	}
-	input.Outcome = outcome
-	var row sqlc.Turn
-	err = s.withSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, _ pgtype.UUID) error {
-		var err error
-		row, err = transitionTurn(ctx, q, params, input)
-		return err
-	})
-	if err != nil {
-		return sessions.Turn{}, fmt.Errorf("transition turn: %w", err)
-	}
-	return sessionpg.TurnFromRow(row), nil
-}
-
-func transitionTurn(ctx context.Context, q *sqlc.Queries, params sqlc.GetTurnParams, input sessions.TurnTransition) (sqlc.Turn, error) {
-	if _, err := q.GetTurn(ctx, params); errors.Is(err, pgx.ErrNoRows) {
-		return sqlc.Turn{}, sessions.ErrNotFound
-	} else if err != nil {
-		return sqlc.Turn{}, err
-	}
-	if input.ExpectedStatus == sessions.TurnQueued && input.Status == sessions.TurnInProgress {
-		if err := sessions.CheckComputeAdmission(ctx, sessionpg.BindSession(q, params.TenantID, params.SessionID)); err != nil {
-			return sqlc.Turn{}, err
-		}
-	}
-	row, err := q.TransitionTurn(ctx, sqlc.TransitionTurnParams{
-		ID: params.ID, SessionID: params.SessionID, ExpectedStatus: input.ExpectedStatus,
-		NewStatus: input.Status, Outcome: input.Outcome,
-	})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sqlc.Turn{}, sessions.ErrTurnConflict
-	}
-	if err != nil {
-		return sqlc.Turn{}, err
-	}
-	if !sessions.TerminalStatus(row.Status) {
-		if err := sessionpg.AppendChanges(ctx, q, row.SessionID, sessions.TurnChanges(sessionpg.TurnFromRow(row), false)...); err != nil {
-			return sqlc.Turn{}, err
-		}
-		return row, nil
-	}
-	outcome := sessions.Source{Turn: uuid.UUID(row.ID.Bytes).String(), Kind: "execution_" + row.Status, Payload: row.Outcome, CreatedAt: row.CompletedAt.Time}
-	if err = sessions.ProjectSource(ctx, sessionpg.BindSession(q, params.TenantID, row.SessionID), outcome); err != nil {
-		return sqlc.Turn{}, err
-	}
-	if row, err = q.GetTurn(ctx, params); err != nil {
-		return sqlc.Turn{}, err
-	}
-	ending, err := sessionpg.LoadEnding(ctx, q, row.SessionID, row.ID)
-	if err != nil {
-		return sqlc.Turn{}, err
-	}
-	if err := sessionpg.ApplyTurnEnd(ctx, q, row.SessionID, row.ID, sessions.EndTurn(sessionpg.TurnFromRow(row), ending)); err != nil {
-		return sqlc.Turn{}, err
-	}
-	return row, nil
-}
-
-// publicTurnLookup resolves caller-supplied path identifiers for a Turn or a
-// Turn-scoped resource. Unparsable values are indistinguishable from missing ones.
-func publicTurnLookup(tenantID, sessionID, turnID string) (sqlc.GetTurnParams, error) {
-	tenant, err := parseID(tenantID)
-	return sqlc.GetTurnParams{TenantID: tenant, SessionID: pgunit.PathID(sessionID), ID: pgunit.PathID(turnID)}, err
-}
diff --git a/services/core/internal/store/turns_test.go b/services/core/internal/store/turns_test.go
index 297457606..4e85732e1 100644
--- a/services/core/internal/store/turns_test.go
+++ b/services/core/internal/store/turns_test.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"reflect"
-	"sync"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -28,7 +26,7 @@ func TestCancellationStaysBoundToItsOriginalTurn(t *testing.T) {
 	if err != nil || cancel.TurnID != first.TurnID {
 		t.Fatalf("cancellation target: %+v, %v", cancel, err)
 	}
-	pending, err := s.GetTurn(ctx, tenant, session.ID, first.TurnID)
+	pending, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, first.TurnID)
 	if err != nil || pending.Status != sessions.TurnInProgress || pending.CancelRequestedAt.IsZero() || !pending.CompletedAt.IsZero() {
 		t.Fatalf("running cancellation falsely completed: %+v, %v", pending, err)
 	}
@@ -40,18 +38,18 @@ func TestCancellationStaysBoundToItsOriginalTurn(t *testing.T) {
 			t.Fatalf("cancellation retargeted: %+v, %v", retry, err)
 		}
 	}
-	queued, err := s.GetTurn(ctx, tenant, session.ID, next.TurnID)
+	queued, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, next.TurnID)
 	if err != nil || queued.Status != sessions.TurnQueued || !queued.CancelRequestedAt.IsZero() {
 		t.Fatalf("old cancellation affected later Turn: %+v, %v", queued, err)
 	}
 	if _, err := s.RequestCancel(ctx, tenant, session.ID, "cancel-queued"); err != nil {
 		t.Fatal(err)
 	}
-	stopped, err := s.GetTurn(ctx, tenant, session.ID, next.TurnID)
+	stopped, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, next.TurnID)
 	if err != nil || stopped.Status != sessions.TurnCancelled || stopped.CompletedAt.IsZero() || !stopped.StartedAt.IsZero() {
 		t.Fatalf("queued work did not stop: %+v, %v", stopped, err)
 	}
-	if _, err := s.TransitionTurn(ctx, tenant, session.ID, next.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := transitionTurn(ctx, s, tenant, session.ID, next.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatalf("cancelled queued work was started: %v", err)
 	}
 }
@@ -75,64 +73,12 @@ func TestWaitingTurnRetainsInputsAndStartTime(t *testing.T) {
 	if _, err := s.RequestCancel(ctx, tenant, session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.TransitionTurn(ctx, tenant, session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := transitionTurn(ctx, s, tenant, session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatalf("cancelling Turn resumed: %v", err)
 	}
 	transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnWaiting, sessions.TurnCancelled)
 }
 
-func TestTerminalOutcomeIsImmutableDuringConcurrentCallbacks(t *testing.T) {
-	s, pool := testStore(t)
-	other, _ := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	first := submitMessage(t, s, tenant, session.ID, "first")
-	transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-	if _, err := s.RequestCancel(ctx, tenant, session.ID, "cancel"); err != nil {
-		t.Fatal(err)
-	}
-	var wg sync.WaitGroup
-	winners := make(chan sessions.Turn, 3)
-	errs := make(chan error, 3)
-	for _, status := range []string{sessions.TurnCompleted, sessions.TurnFailed, sessions.TurnCancelled} {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			outcome, _ := json.Marshal(map[string]string{"reported": status})
-			turn, err := other.TransitionTurn(ctx, tenant, session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: status, Outcome: outcome})
-			if err == nil {
-				winners <- turn
-			} else {
-				errs <- err
-			}
-		}()
-	}
-	wg.Wait()
-	close(winners)
-	close(errs)
-	if len(winners) != 1 || len(errs) != 2 {
-		t.Fatalf("winners=%d errors=%d", len(winners), len(errs))
-	}
-	for err := range errs {
-		if !errors.Is(err, sessions.ErrTurnConflict) {
-			t.Fatal(err)
-		}
-	}
-	winner := <-winners
-	if winner.CompletedAt.IsZero() || winner.CancelRequestedAt.IsZero() || winner.CompletedAt.Before(winner.StartedAt) {
-		t.Fatalf("terminal timestamps: %+v", winner)
-	}
-	if _, err := s.TransitionTurn(ctx, tenant, session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"late":true}`)}); !errors.Is(err, sessions.ErrTurnConflict) {
-		t.Fatalf("late terminal callback accepted: %v", err)
-	}
-	pool.Close()
-	recovered, _ := testStore(t)
-	got, err := recovered.GetTurn(ctx, tenant, session.ID, first.TurnID)
-	if err != nil || !reflect.DeepEqual(got, winner) {
-		t.Fatalf("terminal outcome changed on restart: %+v, %v", got, err)
-	}
-}
-
 func TestTurnInputValidationHasNoSideEffects(t *testing.T) {
 	s, _ := testStore(t)
 	tenant, session := newTurnSession(t, s)
@@ -157,11 +103,11 @@ func TestTurnInputValidationHasNoSideEffects(t *testing.T) {
 		{ExpectedStatus: sessions.TurnCompleted, Status: sessions.TurnInProgress},
 		{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress, Outcome: json.RawMessage(`{"premature":true}`)},
 	} {
-		if _, err := s.TransitionTurn(ctx, tenant, session.ID, first.TurnID, input); !errors.Is(err, sessions.ErrInvalidInput) {
+		if _, err := transitionTurn(ctx, s, tenant, session.ID, first.TurnID, input); !errors.Is(err, sessions.ErrInvalidInput) {
 			t.Fatalf("invalid transition accepted: %v", err)
 		}
 	}
-	got, err := s.GetTurn(ctx, tenant, session.ID, first.TurnID)
+	got, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, first.TurnID)
 	if err != nil || got.Status != sessions.TurnQueued || !got.StartedAt.IsZero() {
 		t.Fatalf("invalid transition changed Turn: %+v, %v", got, err)
 	}
diff --git a/services/core/internal/store/unified_model_configuration_http_test.go b/services/core/internal/store/unified_model_configuration_http_test.go
index 9c7d4a57b..ad3b4ae6c 100644
--- a/services/core/internal/store/unified_model_configuration_http_test.go
+++ b/services/core/internal/store/unified_model_configuration_http_test.go
@@ -10,6 +10,7 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -113,7 +114,7 @@ func TestUnifiedModelConfigurationHTTP(t *testing.T) {
 			t.Fatalf("wrong frozen selections: %#v", snapshot)
 		}
 		equalJSON(snapshot.HarnessConfig.Value, native)
-		secret, err := st.SessionModelExecution(t.Context(), tenant, id)
+		secret, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, id)
 		if err != nil || secret == nil || secret.APIKey != providerKey {
 			t.Fatal("frozen provider changed", err)
 		}
diff --git a/services/core/internal/store/worker_capacity_test.go b/services/core/internal/store/worker_capacity_test.go
index 596019ee1..327d776ef 100644
--- a/services/core/internal/store/worker_capacity_test.go
+++ b/services/core/internal/store/worker_capacity_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // Consume the actual controls so capacity rejection is exercised before any
@@ -102,7 +103,7 @@ func TestWorkerDefersPreparationCapacityUntilCleanupReleasesSlot(t *testing.T) {
 	}
 	assertQueued := func() {
 		t.Helper()
-		turn, err := h.s.GetTurn(t.Context(), h.tenant, blocked, turns[blocked])
+		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, blocked, turns[blocked])
 		if err != nil || turn.Status != sessions.TurnQueued {
 			t.Fatal("capacity rejection failed queued work", turn, err)
 		}
@@ -135,7 +136,7 @@ func TestWorkerDefersPreparationCapacityUntilCleanupReleasesSlot(t *testing.T) {
 	// still owns a slot and reports the same capacity rejection.
 	h.write(turns[first], proto.TypeDone, proto.DonePayload{Content: "done"})
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "first completed Turn", func() bool {
-		turn, err := h.s.GetTurn(t.Context(), h.tenant, first, turns[first])
+		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, first, turns[first])
 		return err == nil && turn.Status == sessions.TurnCompleted
 	})
 	observeCapacity()
@@ -150,7 +151,7 @@ func TestWorkerDefersPreparationCapacityUntilCleanupReleasesSlot(t *testing.T) {
 	}
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "all five Turns completed", func() bool {
 		for session, id := range turns {
-			turn, err := h.s.GetTurn(t.Context(), h.tenant, session, id)
+			turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, session, id)
 			if err != nil || turn.Status != sessions.TurnCompleted {
 				return false
 			}
diff --git a/services/core/internal/store/worker_input_race_test.go b/services/core/internal/store/worker_input_race_test.go
index c24a1a287..c12653dc4 100644
--- a/services/core/internal/store/worker_input_race_test.go
+++ b/services/core/internal/store/worker_input_race_test.go
@@ -80,7 +80,7 @@ func TestWorkerInputReadSkipsConcurrentlyCancelledCandidate(t *testing.T) {
 			case <-time.After(10 * time.Second):
 				t.Fatal("input-read interleaving was not reached")
 			}
-			turn, err := h.s.GetTurn(ctx, h.tenant, candidateSession, candidate.TurnID)
+			turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, candidateSession, candidate.TurnID)
 			if err != nil || turn.Status != sessions.TurnCancelled {
 				t.Fatal("candidate was not cancelled", err)
 			}
diff --git a/services/core/internal/store/worker_lease_loss_test.go b/services/core/internal/store/worker_lease_loss_test.go
index 83ae5d02f..ef31f12a6 100644
--- a/services/core/internal/store/worker_lease_loss_test.go
+++ b/services/core/internal/store/worker_lease_loss_test.go
@@ -68,7 +68,7 @@ func TestWorkerLeaseLossLeavesUncertainWorkForSuccessor(t *testing.T) {
 	case <-time.After(12 * time.Second):
 		t.Fatal("worker ignored lease loss")
 	}
-	active, err := h.s.GetTurn(t.Context(), h.tenant, h.session.ID, request.ID)
+	active, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, request.ID)
 	if err != nil || active.Status != sessions.TurnInProgress {
 		t.Fatal("lost owner persisted fallback completion", active, err)
 	}
@@ -78,11 +78,11 @@ func TestWorkerLeaseLossLeavesUncertainWorkForSuccessor(t *testing.T) {
 	if err = successor.Run(stopped); err != context.Canceled {
 		t.Fatal(err)
 	}
-	active, err = h.s.GetTurn(t.Context(), h.tenant, h.session.ID, request.ID)
+	active, err = store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, request.ID)
 	if err != nil || active.Status != sessions.TurnFailed {
 		t.Fatal("successor did not reconcile", active, err)
 	}
-	next, err := h.s.GetTurn(t.Context(), h.tenant, queued.ID, pending[0].TurnID)
+	next, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, queued.ID, pending[0].TurnID)
 	if err != nil || next.Status != sessions.TurnQueued {
 		t.Fatal("successor lost queued work", next, err)
 	}
diff --git a/services/core/tests/fixtures/items.go b/services/core/tests/fixtures/items.go
index af1242f96..c0e1b6f9b 100644
--- a/services/core/tests/fixtures/items.go
+++ b/services/core/tests/fixtures/items.go
@@ -13,8 +13,8 @@ import (
 )
 
 // observeItems records the Turn's execution observations as the execution
-// journal does, composing the journal procedure over a pooled Session
-// transaction because the seeder holds no execution lease.
+// journal does. The seeder holds no execution lease, so it composes the
+// execution procedures over pooled Session transactions.
 func observeItems(ctx context.Context, pool *pgxpool.Pool, tenantID, sessionID, turn, status string) error {
 	events := []sessions.ExecutionEvent{
 		{Kind: "delta", Payload: json.RawMessage(`{"item_id":"answer","delta":"partial answer"}`)},
@@ -31,6 +31,23 @@ func observeItems(ctx context.Context, pool *pgxpool.Pool, tenantID, sessionID,
 	if err != nil {
 		return err
 	}
+	return inSession(ctx, pool, tenantID, sessionID, func(ctx context.Context, tx *sessionpg.SessionTx) error {
+		return sessions.AppendTurnEvents(ctx, tx, batch)
+	})
+}
+
+// transitionTurn moves the Turn as the execution owner does, running the
+// transition procedure over a pooled Session transaction.
+func transitionTurn(ctx context.Context, pool *pgxpool.Pool, tenantID, sessionID, turn string, transition sessions.TurnTransition) error {
+	return inSession(ctx, pool, tenantID, sessionID, func(ctx context.Context, tx *sessionpg.SessionTx) error {
+		_, err := sessions.TransitionTurn(ctx, tx, turn, transition)
+		return err
+	})
+}
+
+// inSession runs apply in a pooled transaction that holds the tenant's
+// Session lock.
+func inSession(ctx context.Context, pool *pgxpool.Pool, tenantID, sessionID string, apply func(context.Context, *sessionpg.SessionTx) error) error {
 	tenant, err := pgunit.ParseID(tenantID)
 	if err != nil {
 		return err
@@ -40,6 +57,6 @@ func observeItems(ctx context.Context, pool *pgxpool.Pool, tenantID, sessionID,
 		return err
 	}
 	return sessionpg.WithSession(ctx, pgunit.NewPool(pool), tenant, session, func(ctx context.Context, q *sqlc.Queries, _ sessions.LockedSession) error {
-		return sessions.AppendTurnEvents(ctx, sessionpg.BindSession(q, tenant, session), batch)
+		return apply(ctx, sessionpg.BindSession(q, tenant, session))
 	})
 }
diff --git a/services/core/tests/fixtures/main.go b/services/core/tests/fixtures/main.go
index 8ef4db2b0..936afddfd 100644
--- a/services/core/tests/fixtures/main.go
+++ b/services/core/tests/fixtures/main.go
@@ -58,7 +58,7 @@ func seed() error {
 		if err != nil {
 			return err
 		}
-		if _, err = s.TransitionTurn(ctx, f.Tenant, f.Session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+		if err = transitionTurn(ctx, pool, f.Tenant, f.Session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 			return err
 		}
 		if err = observeItems(ctx, pool, f.Tenant, f.Session, receipt.TurnID, status); err != nil {
@@ -66,7 +66,7 @@ func seed() error {
 		}
 		if status != sessions.TurnInProgress {
 			outcome := json.RawMessage(`{"error":"SECRET engine log","done":{"metadata":{"agent_session_id":"PRIVATE"}}}`)
-			if _, err = s.TransitionTurn(ctx, f.Tenant, f.Session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: status, Outcome: outcome}); err != nil {
+			if err = transitionTurn(ctx, pool, f.Tenant, f.Session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: status, Outcome: outcome}); err != nil {
 				return err
 			}
 		}

From 25474e7a679b1b972f9b4b9291278fa7b5f04f55 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 01:37:09 +0800
Subject: [PATCH 06/60] Stamp a sandbox reset with one clock reading (#435)

---
 .../core/internal/db/queries/sandbox_reset.sql   | 16 +++++++++-------
 .../core/internal/db/sqlc/sandbox_reset.sql.go   | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/services/core/internal/db/queries/sandbox_reset.sql b/services/core/internal/db/queries/sandbox_reset.sql
index 58e819620..3fad61493 100644
--- a/services/core/internal/db/queries/sandbox_reset.sql
+++ b/services/core/internal/db/queries/sandbox_reset.sql
@@ -1,15 +1,17 @@
 -- name: StartSandboxReset :exec
+WITH clock AS MATERIALIZED (SELECT clock_timestamp() AS at)
 UPDATE runtime_deployment SET admission_paused = true, reset_clear = sqlc.arg(clear),
-    reset_requested_at = clock_timestamp(),
+    reset_requested_at = clock.at,
     reset_deadline_at = CASE WHEN sqlc.arg(clear)::text = 'auto'
-        THEN clock_timestamp() + make_interval(secs => sqlc.arg(deadline_seconds)::int) END,
-    reset_forced_at = CASE WHEN sqlc.arg(clear)::text = 'force' THEN clock_timestamp() END,
-    reset_audit = sqlc.arg(audit)::jsonb, updated_at = clock_timestamp()
-WHERE singleton = true;
+        THEN clock.at + make_interval(secs => sqlc.arg(deadline_seconds)::int) END,
+    reset_forced_at = CASE WHEN sqlc.arg(clear)::text = 'force' THEN clock.at END,
+    reset_audit = sqlc.arg(audit)::jsonb, updated_at = clock.at
+FROM clock WHERE singleton = true;
 
 -- name: ForceSandboxReset :exec
-UPDATE runtime_deployment SET reset_clear = 'force', reset_forced_at = clock_timestamp(), updated_at = clock_timestamp()
-WHERE singleton = true AND reset_clear = 'auto';
+WITH clock AS MATERIALIZED (SELECT clock_timestamp() AS at)
+UPDATE runtime_deployment SET reset_clear = 'force', reset_forced_at = clock.at, updated_at = clock.at
+FROM clock WHERE singleton = true AND reset_clear = 'auto';
 
 -- name: CancelSandboxReset :exec
 UPDATE runtime_deployment SET admission_paused = false, reset_clear = NULL,
diff --git a/services/core/internal/db/sqlc/sandbox_reset.sql.go b/services/core/internal/db/sqlc/sandbox_reset.sql.go
index 6ded68955..49512c3f6 100644
--- a/services/core/internal/db/sqlc/sandbox_reset.sql.go
+++ b/services/core/internal/db/sqlc/sandbox_reset.sql.go
@@ -40,8 +40,9 @@ func (q *Queries) CompleteSandboxReset(ctx context.Context) error {
 }
 
 const forceSandboxReset = `-- name: ForceSandboxReset :exec
-UPDATE runtime_deployment SET reset_clear = 'force', reset_forced_at = clock_timestamp(), updated_at = clock_timestamp()
-WHERE singleton = true AND reset_clear = 'auto'
+WITH clock AS MATERIALIZED (SELECT clock_timestamp() AS at)
+UPDATE runtime_deployment SET reset_clear = 'force', reset_forced_at = clock.at, updated_at = clock.at
+FROM clock WHERE singleton = true AND reset_clear = 'auto'
 `
 
 func (q *Queries) ForceSandboxReset(ctx context.Context) error {
@@ -228,13 +229,14 @@ func (q *Queries) SessionBlocksAutoReset(ctx context.Context, sessionID pgtype.U
 }
 
 const startSandboxReset = `-- name: StartSandboxReset :exec
+WITH clock AS MATERIALIZED (SELECT clock_timestamp() AS at)
 UPDATE runtime_deployment SET admission_paused = true, reset_clear = $1,
-    reset_requested_at = clock_timestamp(),
+    reset_requested_at = clock.at,
     reset_deadline_at = CASE WHEN $1::text = 'auto'
-        THEN clock_timestamp() + make_interval(secs => $2::int) END,
-    reset_forced_at = CASE WHEN $1::text = 'force' THEN clock_timestamp() END,
-    reset_audit = $3::jsonb, updated_at = clock_timestamp()
-WHERE singleton = true
+        THEN clock.at + make_interval(secs => $2::int) END,
+    reset_forced_at = CASE WHEN $1::text = 'force' THEN clock.at END,
+    reset_audit = $3::jsonb, updated_at = clock.at
+FROM clock WHERE singleton = true
 `
 
 type StartSandboxResetParams struct {

From eed19fc241026ba2f46f2ce0d8d523cb538e2fdc Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 02:26:15 +0800
Subject: [PATCH 07/60] Move Session reads, deletion and archive into sessions
 (#438)

* Move Session reads, deletion and archive into sessions

Session reads, metadata updates, deletion and the public write audit move
from store into sessions and sessionpg. GetSession, ListSessions and the
stream snapshot each read from one snapshot, and the diagnostics read uses
GetSession. sessionpg.LoadSessionActivity is the one Session activity read;
store's Session creation and administrator summary call it.

Session archive becomes deployment.ExecutionOperations.ArchiveSession and
ArchiveResetSession over deploymentpg's WithSessionArchive: the Session
lock, then the deployment's generation and reset checks in deployment,
then cancellation through the sessions procedures, device revocation,
cleanup request and audit in one leased transaction. The api archive route
calls it directly.

The Runtime observation resolver moves to deployment, and the Runtime
history scope rule into runtimehistory.Service; both storeresolver
packages are deleted.

* Address Session reads review findings
---
 contracts/agents-api/runtime-observability.md |   2 +-
 .../agents-api/zh/runtime-observability.md    |   4 +-
 services/core/IMPLEMENTATION.md               |   8 +-
 services/core/cmd/server/http_routes_test.go  |   1 +
 services/core/cmd/server/main.go              |  22 +-
 .../internal/api/admin_session_archive.go     |   4 +-
 .../api/admin_session_archive_test.go         |   4 +-
 services/core/internal/api/dependencies.go    |   3 +-
 .../core/internal/api/dependencies_test.go    |   3 +
 .../core/internal/api/environment_input.go    |   2 +-
 .../internal/api/environment_installation.go  |   2 +-
 .../core/internal/api/errors_deployment.go    |   4 +-
 services/core/internal/api/errors_test.go     |   1 +
 services/core/internal/api/fakes_test.go      |  74 ++--
 services/core/internal/api/handler.go         |  17 +-
 services/core/internal/api/handler_test.go    |   2 +-
 services/core/internal/api/inputs.go          |   2 +-
 .../native_classification_integration_test.go |   9 +-
 .../core/internal/api/resource_query_test.go  |  10 +-
 .../internal/api/session_admission_test.go    |   2 +-
 .../internal/api/session_creation_identity.go |   2 +-
 .../api/session_creation_stream_test.go       |   4 +-
 .../core/internal/api/session_deletion.go     |   2 +-
 .../core/internal/api/session_diagnostics.go  |   5 +-
 .../api/session_diagnostics_deadline_test.go  |   4 +-
 .../session_diagnostics_public_compat_test.go |  13 +-
 .../internal/api/session_diagnostics_test.go  |   8 +-
 .../api/session_environment_http_test.go      |   8 +-
 .../core/internal/api/session_metadata.go     |   3 +-
 .../internal/api/session_semantics_test.go    |   4 +-
 .../core/internal/api/session_write_audit.go  |   3 +-
 .../internal/api/session_write_audit_test.go  |   8 +-
 services/core/internal/api/stream.go          |   2 +-
 services/core/internal/api/stream_test.go     |   2 +-
 services/core/internal/api/turns.go           |   4 +-
 services/core/internal/api/turns_test.go      |   2 +-
 .../internal/api/validation_errors_test.go    |   6 +-
 services/core/internal/deployment/errors.go   |   3 +
 .../core/internal/deployment/fakes_test.go    |  66 ++++
 .../resolver.go => deployment/observation.go} |  42 +--
 .../observation_test.go}                      |  93 +++--
 .../internal/deployment/session_archive.go    | 144 ++++++++
 .../deployment/session_archive_test.go        | 322 +++++++++++++++++
 services/core/internal/deployment/storage.go  |  46 +++
 .../archive_cancellation_cleanup_test.go      |   2 +-
 .../execution/deployment_fixture_test.go      |   4 +
 .../core/internal/execution/dispatcher.go     |   2 +-
 .../execution/environment_directory.go        |   2 +-
 .../execution/environment_file_write.go       |   2 +-
 .../internal/execution/prepared_dispatch.go   |   2 +-
 .../core/internal/execution/sandbox_reset.go  |   5 +-
 .../internal/execution/session_archive.go     |  13 -
 services/core/internal/execution/worker.go    |   2 +-
 .../core/internal/execution/worker_device.go  |   2 +-
 .../postgres/deploymentpg/allocations.go      |  44 +--
 .../postgres/deploymentpg/session_archive.go  |  85 +++++
 .../persistence/postgres/deploymentpg/tx.go   |  38 +-
 .../persistence/postgres/sessionpg/binding.go |   6 +
 .../postgres/sessionpg/session_reads.go       | 325 ++++++++++++++++++
 .../postgres/sessionpg/session_writes.go      |  86 +++++
 .../postgres/sessionpg/turn_reads.go          |   6 +-
 .../core/internal/runtimehistory/service.go   |  47 ++-
 .../internal/runtimehistory/service_test.go   |  80 ++++-
 .../runtimehistory/storeresolver/resolver.go  |  48 ---
 .../storeresolver/resolver_test.go            |  74 ----
 .../providers/configuration_flow_test.go      |   9 +-
 .../core/internal/sessions/artifacts_test.go  |  15 +
 .../core/internal/sessions/devices_test.go    |  20 ++
 .../sessions/execution_configuration.go       |  44 +++
 services/core/internal/sessions/reader.go     |   3 +-
 services/core/internal/sessions/reads.go      |  49 ++-
 services/core/internal/sessions/service.go    |   1 +
 services/core/internal/sessions/session.go    | 117 +++++++
 .../core/internal/sessions/session_test.go    | 102 ++++++
 .../internal/sessions/transaction_test.go     |  14 +
 .../internal/store/admin_delete_audit_test.go |   8 +-
 .../internal/store/admin_session_archive.go   | 161 ---------
 .../store/admin_session_archive_race_test.go  |   8 +-
 .../store/admin_session_archive_test.go       |  44 ++-
 .../admin_session_archive_worker_http_test.go |  27 +-
 services/core/internal/store/admin_summary.go |   2 +-
 .../agent_execution_defaults_http_test.go     |   7 +-
 .../store/archive_cancellation_test.go        |   5 +-
 .../archived_cancellation_migration_test.go   |   2 +-
 .../internal/store/command_output_test.go     |  12 +-
 .../creation_stream_settlement_public_test.go |   7 +-
 .../deployment_model_providers_http_test.go   |   4 +-
 .../store/environment_admission_test.go       |   4 +-
 .../store/environment_claim_worker_test.go    |   2 +-
 .../environment_connection_events_test.go     |   2 +-
 .../store/environment_connections_test.go     |   4 +-
 .../internal/store/environment_device_test.go |   2 +-
 .../store/environment_directory_test.go       |   2 +-
 .../environment_executor_credentials_test.go  |   4 +-
 .../environment_executor_management_test.go   |   2 +-
 ...onment_file_write_semantics_public_test.go |   4 +-
 .../store/environment_file_writes_test.go     |   4 +-
 .../store/environment_initial_input_test.go   |  16 +-
 .../store/environment_initialization_test.go  |   2 +-
 .../store/environment_input_activity_test.go  |  30 +-
 .../store/environment_input_claim_test.go     |   8 +-
 .../store/environment_input_expiry_test.go    |   2 +-
 .../environment_input_settlement_test.go      |   2 +-
 .../store/environment_installation_test.go    |   2 +-
 .../store/environment_mcp_public_test.go      |   2 +-
 .../environment_skill_references_test.go      |   2 +-
 .../internal/store/environment_work_test.go   |   2 +-
 .../store/environment_worker_helpers_test.go  |   2 +-
 .../store/environment_worker_scan_test.go     |   3 +-
 .../core/internal/store/environments_test.go  |   8 +-
 .../core/internal/store/execution_test.go     |  29 +-
 .../store/executor_principals_test.go         |   4 +-
 services/core/internal/store/export_test.go   |   3 +
 .../internal/store/function_execution_test.go |   2 +-
 .../store/function_images_native_test.go      |   2 +-
 .../internal/store/function_inputs_test.go    |   2 +-
 .../store/function_item_events_test.go        |   4 +-
 .../store/function_public_native_test.go      |   2 +-
 .../internal/store/function_state_test.go     |  18 +-
 .../internal/store/harness_onboarding_test.go |   6 +-
 ...sted_initialization_failure_public_test.go |  20 +-
 .../internal/store/item_serialization_test.go |   6 +-
 .../internal/store/list_query_public_test.go  |   2 +-
 .../store/local_environment_devices_test.go   |   2 +-
 .../local_environment_file_write_test.go      |   2 +-
 .../store/local_environment_worker_test.go    |   4 +-
 .../store/mcode_public_native_test.go         |   2 +-
 .../store/message_image_admission_test.go     |   2 +-
 .../store/message_images_native_test.go       |   2 +-
 .../store/model_protocol_native_test.go       |   2 +-
 .../store/native_public_execution_test.go     |   2 +-
 .../store/prepared_dispatch_failure_test.go   |   2 +-
 .../internal/store/prepared_dispatch_test.go  |   2 +-
 .../internal/store/public_execution_test.go   |  10 +-
 .../store/public_handler_fixture_test.go      |  18 +-
 .../store/runtime_allocations_test.go         |   2 +-
 .../store/runtime_compute_lifecycle_test.go   |   4 +-
 .../runtime_configuration_cleanup_test.go     |   8 +-
 .../internal/store/runtime_connection_test.go |   5 +-
 .../store/runtime_creation_settlement_test.go |   6 +-
 .../internal/store/runtime_deployment_test.go |   4 +-
 .../runtime_enrollment_connection_test.go     |   2 +-
 .../internal/store/runtime_enrollment_test.go |   2 +-
 .../runtime_environment_terminal_test.go      |  10 +-
 .../store/runtime_lifecycle_nodes_test.go     |   2 +-
 .../internal/store/runtime_lifecycle_test.go  |   4 +-
 .../store/runtime_node_lifecycle_test.go      |   6 +-
 services/core/internal/store/runtime_nodes.go |  13 -
 .../core/internal/store/runtime_nodes_test.go |  14 +-
 .../store/runtime_observation_scan_test.go    |   5 +-
 .../internal/store/runtime_pending_test.go    |   6 +-
 .../core/internal/store/runtime_scan_test.go  |   4 +-
 .../internal/store/runtime_suspension_test.go |   4 +-
 .../store/runtime_worker_recovery_test.go     |   2 +-
 .../store/sandbox_deployment_switch_test.go   |   4 +-
 .../sandbox_deployment_switch_worker_test.go  |   3 +-
 .../core/internal/store/sandbox_reset_test.go |  26 +-
 .../store/sandbox_specification_store_test.go |   2 +-
 services/core/internal/store/scheduling.go    | 101 ------
 .../store/self_hosted_cancel_public_test.go   |   6 +-
 .../store/self_hosted_initial_public_test.go  |   2 +-
 .../store/session_agent_filter_test.go        |  10 +-
 .../internal/store/session_artifacts_test.go  |   6 +-
 .../store/session_configuration_test.go       |   6 +-
 .../store/session_creation_stream_test.go     |  16 +-
 .../internal/store/session_creator_test.go    |   8 +-
 .../core/internal/store/session_deletion.go   |  64 ----
 .../store/session_deletion_execution_test.go  |  18 +-
 .../internal/store/session_deletion_test.go   |  45 +--
 .../internal/store/session_diagnostics.go     |  87 -----
 .../session_diagnostics_cancellation_test.go  |   8 +-
 .../store/session_diagnostics_test.go         |  34 +-
 .../session_environment_snapshot_test.go      |   4 +-
 .../core/internal/store/session_events.go     |  67 ----
 .../internal/store/session_events_test.go     |  26 +-
 .../store/session_execution_configuration.go  |  70 +---
 .../session_execution_configuration_test.go   |  22 +-
 .../store/session_initial_input_test.go       |   8 +-
 .../store/session_initial_public_test.go      |   4 +-
 .../core/internal/store/session_metadata.go   |  46 ---
 .../internal/store/session_metadata_test.go   |  16 +-
 .../session_reference_retry_public_test.go    |   2 +-
 .../internal/store/session_transaction.go     |  20 +-
 .../internal/store/session_write_audit.go     |  22 --
 .../store/session_write_audit_test.go         |  20 +-
 services/core/internal/store/sessions.go      |  64 +---
 services/core/internal/store/sessions_test.go |  12 +-
 .../store/structured_output_native_test.go    |   2 +-
 .../store/subagent_identities_test.go         |   6 +-
 .../store/subagent_native_outputs_test.go     |   2 +-
 .../internal/store/subagent_resources_test.go |   2 +-
 .../store/template_composition_public_test.go |   2 +-
 .../template_null_selection_public_test.go    |   2 +-
 services/core/internal/store/token_usage.go   |  30 --
 .../store/token_usage_integration_test.go     |  16 +-
 .../internal/store/tool_policy_native_test.go |   8 +-
 .../internal/store/tool_search_native_test.go |   2 +-
 .../core/internal/store/turn_inputs_test.go   |   2 +-
 .../unified_model_configuration_http_test.go  |   2 +-
 .../store/whitespace_input_public_test.go     |   2 +-
 .../store/worker_preparation_failure_test.go  |   5 +-
 201 files changed, 2245 insertions(+), 1559 deletions(-)
 rename services/core/internal/{runtimeobs/storeresolver/resolver.go => deployment/observation.go} (79%)
 rename services/core/internal/{runtimeobs/storeresolver/resolver_test.go => deployment/observation_test.go} (70%)
 create mode 100644 services/core/internal/deployment/session_archive.go
 create mode 100644 services/core/internal/deployment/session_archive_test.go
 delete mode 100644 services/core/internal/execution/session_archive.go
 create mode 100644 services/core/internal/persistence/postgres/deploymentpg/session_archive.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/session_reads.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/session_writes.go
 delete mode 100644 services/core/internal/runtimehistory/storeresolver/resolver.go
 delete mode 100644 services/core/internal/runtimehistory/storeresolver/resolver_test.go
 create mode 100644 services/core/internal/sessions/execution_configuration.go
 create mode 100644 services/core/internal/sessions/session_test.go
 delete mode 100644 services/core/internal/store/admin_session_archive.go
 delete mode 100644 services/core/internal/store/runtime_nodes.go
 delete mode 100644 services/core/internal/store/session_deletion.go
 delete mode 100644 services/core/internal/store/session_diagnostics.go
 delete mode 100644 services/core/internal/store/session_events.go
 delete mode 100644 services/core/internal/store/session_metadata.go
 delete mode 100644 services/core/internal/store/session_write_audit.go
 delete mode 100644 services/core/internal/store/token_usage.go

diff --git a/contracts/agents-api/runtime-observability.md b/contracts/agents-api/runtime-observability.md
index f1a961d79..226fc2ca8 100644
--- a/contracts/agents-api/runtime-observability.md
+++ b/contracts/agents-api/runtime-observability.md
@@ -16,7 +16,7 @@ self-hosted: tenant_id -> session_id -> environment_id -> device_id + connection
 none:        tenant_id -> session_id (no Session-owned Runtime instance)
 ```
 
-The resolver (`internal/runtimeobs/storeresolver`) reads the Session, its Environment, the current allocation and the Session's measured usage from the store. A Session, daemon connection, process, container and native Harness Session are different identities and never stand in for one another.
+The resolver (`services/core/internal/deployment/observation.go`) reads the Session, its Environment, the current allocation and the Session's measured usage from the database. A Session, daemon connection, process, container and native Harness Session are different identities and never stand in for one another.
 
 Managed Docker, microsandbox and E2B allocations are observed. `none` and `self_hosted` Sessions are `unsupported`; Core never attributes shared host statistics to an `environment:none` Session.
 
diff --git a/contracts/agents-api/zh/runtime-observability.md b/contracts/agents-api/zh/runtime-observability.md
index a6d894a45..8e24b9a56 100644
--- a/contracts/agents-api/zh/runtime-observability.md
+++ b/contracts/agents-api/zh/runtime-observability.md
@@ -1,7 +1,7 @@
 ---
 title: "运行时可观测性"
 source: contracts/agents-api/runtime-observability.md
-source_hash: 5da1279a81a6dcb3a85661dbba942c8937f871ae351ed80550db65b2a59156db
+source_hash: f79a077350118f5f9bb3f4e8874242af3cb716e92f5e090f6652b001ae5780a1
 ---
 
 这是面向贡献者的契约，规定 Core 如何观测 Runtime 并保留其历史。路由和响应字段见 [Runtime telemetry API](runtime-observability-api.md)。代码位于 `services/core/internal/runtimeobs`（解析、源、采样器和导出）、`internal/runtimehistory`（历史查询和 PostgreSQL 存储）以及 `internal/runtimeobs/otlpexporter`。
@@ -18,7 +18,7 @@ self-hosted: tenant_id -> session_id -> environment_id -> device_id + connection
 none:        tenant_id -> session_id (no Session-owned Runtime instance)
 ```
 
-解析器（`internal/runtimeobs/storeresolver`）从存储中读取 Session、其 Environment、当前分配以及 Session 的实测使用量。Session、守护进程连接、进程、容器和原生 Harness Session 是不同身份，彼此绝不能替代。
+解析器（`services/core/internal/deployment/observation.go`）从数据库中读取 Session、其 Environment、当前分配以及 Session 的实测使用量。Session、守护进程连接、进程、容器和原生 Harness Session 是不同身份，彼此绝不能替代。
 
 托管 Docker、microsandbox 和 E2B 分配均会被观测。`none` 和 `self_hosted` Session 为 `unsupported`；Core 绝不会将共享主机统计信息归属于 `environment:none` Session。
 
diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 2254cb2de..338a330bc 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -18,7 +18,7 @@ Shared vocabulary has one owner each, and domains use it rather than copy it. `i
 
 `internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitFunctionResult` saves a submitted function result for its Turn's call, `LoadRequiredActions` lists the calls a Turn waits on, and `TransitionTurn` moves a root Turn's status as its current status allows and settles a Turn that ends. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call and Turn operation loads the Turn in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. Neither imports persistence. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
 
-Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; `LoadEnvironment`, which reads the tenant's Environment of a live Session; and `CreateSessionEnvironment`, which stores the Environment of a Session being created. The other `sessionpg` exports serve `store` until the Session operations leave it. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` and `BindSession` stay exported after store goes; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
+Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; `LoadEnvironment`, which reads the tenant's Environment of a live Session; and `CreateSessionEnvironment`, which stores the Environment of a Session being created. The other `sessionpg` exports serve `store` until the Session operations leave it; among them `LoadSessionActivity`, the one Session activity read, adds the activity projection to the Sessions that `store`'s Session creation and administrator summary return. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` and `BindSession` stay exported after store goes; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
 
 `store` is transitional. `store.New` builds a pooled Store, and `store.NewExecution(s, lease)` builds the execution writer on a lease it borrows. An execution-only operation on a pooled Store fails with `store.ErrExecutionAuthority`. New adapters do not copy that check: their execution repositories require a `*pgunit.Lease` at construction, their public repositories expose no execution operation, and the check goes away with `store`.
 
@@ -33,10 +33,10 @@ Domain owners, each with its PostgreSQL adapter under `internal/persistence/post
 - `environmenttemplates` (`templatepg`): Environment Templates, their validation and default network, their sealed setup, initial files, Skills and Plugins, and the resolved Template that Session creation composes into its Environment.
 - `modelconfiguration` (`modelconfigurationpg`): each Harness's deployment default model configuration and its last-use observations.
 - `skills` (`skillpg`): Skills and their immutable versions: archive checks, the default and latest pointers, version selection and deletion, and each version's sealed archive. Session creation freezes selected versions inside its `store` transaction with the `skills` rules.
-- `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and to `store`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other reader is `store`: Session creation decides admission and placement with those rules and `placementpg` inside its own transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. The reset's Session archive stays in `store`.
+- `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and to `store`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other reader is `store`: Session creation decides admission and placement with those rules and `placementpg` inside its own transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. Session archive crosses the Session and the deployment, so it is a `deployment.ExecutionOperations` operation: `ArchiveSession`, which the administrator's archive route calls through `api.Execution.SessionArchive`, and `ArchiveResetSession`, which a reset calls, lock the Session through `deploymentpg`'s `WithSessionArchive`, check the deployment's generation and the running reset in `deployment`, then expire the Environment and cancel its work through the `sessions` procedures, revoke the allocation's device and request its cleanup, and record the audit entry in one leased transaction. `deployment.ObservationResolver` resolves a Session's Runtime observation target for `runtimeobs` from `sessions.SessionReader` and `deployment.Reader`.
 - `coremetrics` (`coremetricspg`): the Core metrics PostgreSQL holds: the root Turn queue counts, the root Turn history, read from one read-only snapshot, and the database size. `cmd/server`'s Core metrics source adds them to the process, pool, Worker and daemon registry measurements.
-- `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples.
-- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover Turns (their reads and the execution work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the Sessions whose Runtime the administrator observes across Projects, executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
+- `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples. `runtimehistory.Service` scopes a read to the Session's hosted Environment through `sessions.EnvironmentReader`.
+- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover Sessions (their reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the Sessions whose Runtime the administrator observes across Projects, executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
 
 ## Request handling
 
diff --git a/services/core/cmd/server/http_routes_test.go b/services/core/cmd/server/http_routes_test.go
index 998788235..05585fd38 100644
--- a/services/core/cmd/server/http_routes_test.go
+++ b/services/core/cmd/server/http_routes_test.go
@@ -97,6 +97,7 @@ func daemonComposition(t testing.TB) http.Handler {
 		Agents: struct{ api.Agents }{}, AgentsReader: struct{ api.AgentsReader }{},
 		EnvironmentTemplates: struct{ api.EnvironmentTemplates }{}, EnvironmentTemplatesReader: struct{ api.EnvironmentTemplatesReader }{},
 		Sessions:        struct{ api.Sessions }{},
+		SessionsReader:  struct{ api.SessionsReader }{},
 		SessionCreation: struct{ api.SessionCreation }{},
 		SessionEvents:   struct{ api.SessionEvents }{},
 		Turns:           struct{ api.Turns }{},
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index 6cf3a08ad..3cf6979dc 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -61,9 +61,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeenrollment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
-	historystoreresolver "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory/storeresolver"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	observationstoreresolver "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs/storeresolver"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
@@ -230,7 +228,7 @@ func run() error {
 		managed = managedNodes.runtime
 		observationSources[managed.InstallationID] = managedNodes.setup
 	}
-	observationResolver, err := observationstoreresolver.NewResolver(executionStore, deploymentStore)
+	observationResolver, err := deployment.NewObservationResolver(sessionStore, deploymentStore)
 	if err != nil {
 		return err
 	}
@@ -274,11 +272,7 @@ func run() error {
 	if err := api.ValidateCredentialSeparation(ctx, keyAdmin, projectStore); err != nil {
 		return err
 	}
-	historyResolver, err := historystoreresolver.NewResolver(sessionStore)
-	if err != nil {
-		return err
-	}
-	historyService, err := runtimehistory.NewService(historyResolver, history.Reader)
+	historyService, err := runtimehistory.NewService(sessionStore, history.Reader)
 	if err != nil {
 		return err
 	}
@@ -307,6 +301,7 @@ func run() error {
 			nativeInstaller = &api.NativeInstaller{Version: buildRevision, Catalog: catalog}
 		}
 	}
+	var deploymentExecution *deployment.ExecutionOperations
 	if registry != nil {
 		dispatcher := &execution.Dispatcher{Store: executionStore, Registry: registry,
 			Credentials: vaultService, Observer: modelConfigurationStore, Deployment: deploymentService, DeploymentReader: deploymentStore,
@@ -317,7 +312,7 @@ func run() error {
 		if err != nil {
 			return err
 		}
-		deploymentExecution, err := deployment.NewExecutionOperations(deploymentService, deploymentpg.NewExecution(lease, credentialKey))
+		deploymentExecution, err = deployment.NewExecutionOperations(deploymentService, deploymentpg.NewExecution(lease, credentialKey))
 		if err != nil {
 			return errors.Join(err, lease.Close(ctx))
 		}
@@ -403,15 +398,16 @@ func run() error {
 		EnvironmentTemplates: environmentTemplates, EnvironmentTemplatesReader: templateStore,
 		Files: fileService, FilesReader: fileStore,
 		Agents: agentService, AgentsReader: agentStore,
-		Sessions:        executionStore,
+		Sessions:        sessionService,
+		SessionsReader:  sessionStore,
 		SessionCreation: executionStore,
-		SessionEvents:   executionStore,
+		SessionEvents:   sessionStore,
 		Turns:           sessionStore,
 		Items:           sessionStore,
 		Subagents:       sessionStore,
 		Artifacts:       sessionService,
 		ArtifactsReader: sessionStore,
-		SessionAdmin:    executionStore,
+		SessionAdmin:    sessionStore,
 		Environments:    sessionService, EnvironmentsReader: sessionStore, ExecutorConnections: executorConnections{sessions: sessionStore, registry: registry},
 		Admin: executionStore, AdminRuntimeTargets: sessionStore, AdminAudit: auditStore, WriteAudit: auditStore, Metrics: metrics,
 		RuntimeObservations: observationService, RuntimeHistory: historyService,
@@ -421,7 +417,7 @@ func run() error {
 			ExecutorURL:      executorURL,
 			SessionAdmission: worker,
 			InputAdmission:   worker,
-			SessionArchive:   worker,
+			SessionArchive:   deploymentExecution,
 			Workspaces:       worker,
 			NativeInstaller:  nativeInstaller,
 		}
diff --git a/services/core/internal/api/admin_session_archive.go b/services/core/internal/api/admin_session_archive.go
index a17268514..bb50213fc 100644
--- a/services/core/internal/api/admin_session_archive.go
+++ b/services/core/internal/api/admin_session_archive.go
@@ -11,7 +11,7 @@ import (
 // SessionArchive archives a managed Session through the execution owner;
 // SessionAdmin reads its archive state.
 type SessionArchive interface {
-	ArchiveManagedSession(context.Context, string, string, uint64) (sessions.ManagedArchive, error)
+	ArchiveSession(context.Context, string, string, uint64) (sessions.ManagedArchive, error)
 }
 
 type AdminSessionArchiveRequest struct {
@@ -44,7 +44,7 @@ func (h *Handler) adminArchiveSession(w http.ResponseWriter, r *http.Request) {
 		writeStoreError(w, r, sessions.ErrEnvironmentUnavailable)
 		return
 	}
-	result, err := h.Execution.SessionArchive.ArchiveManagedSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id"), input.ExpectedGeneration)
+	result, err := h.Execution.SessionArchive.ArchiveSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id"), input.ExpectedGeneration)
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
diff --git a/services/core/internal/api/admin_session_archive_test.go b/services/core/internal/api/admin_session_archive_test.go
index 6ef7550ff..4d12f04a4 100644
--- a/services/core/internal/api/admin_session_archive_test.go
+++ b/services/core/internal/api/admin_session_archive_test.go
@@ -19,7 +19,7 @@ type archiveManagementFixture struct {
 	err                   error
 }
 
-func (s *archiveManagementFixture) ArchiveManagedSession(ctx context.Context, tenant, session string, generation uint64) (sessions.ManagedArchive, error) {
+func (s *archiveManagementFixture) ArchiveSession(ctx context.Context, tenant, session string, generation uint64) (sessions.ManagedArchive, error) {
 	s.calls++
 	s.tenant, s.session, s.generation = tenant, session, generation
 	source, ok := adminaudit.FromContext(ctx)
@@ -39,7 +39,7 @@ func TestAdminSessionArchiveAuthorityAndValidation(t *testing.T) {
 	deps, fakes := managementFakes(t, key)
 	fixture := &archiveManagementFixture{}
 	deps.Execution = fakes.execution()
-	fakes.sessionArchive.archiveManagedSession = fixture.ArchiveManagedSession
+	fakes.sessionArchive.archiveSession = fixture.ArchiveSession
 	fakes.sessionAdmin.getManagedSessionArchive = fixture.GetManagedSessionArchive
 	h := newTestHandler(t, deps)
 	path := "/core/v1/projects/" + managementProjectID + "/sessions/11111111-1111-4111-8111-111111111111/archive"
diff --git a/services/core/internal/api/dependencies.go b/services/core/internal/api/dependencies.go
index c810fa9c6..9c7a5e090 100644
--- a/services/core/internal/api/dependencies.go
+++ b/services/core/internal/api/dependencies.go
@@ -43,6 +43,7 @@ type Dependencies struct {
 	Agents               Agents
 	AgentsReader         AgentsReader
 	Sessions             Sessions
+	SessionsReader       SessionsReader
 	SessionCreation      SessionCreation
 	SessionEvents        SessionEvents
 	Turns                Turns
@@ -133,7 +134,7 @@ func (d Dependencies) validate() error {
 		field{"EnvironmentTemplates", d.EnvironmentTemplates}, field{"EnvironmentTemplatesReader", d.EnvironmentTemplatesReader},
 		field{"Skills", d.Skills}, field{"SkillsReader", d.SkillsReader},
 		field{"Agents", d.Agents}, field{"AgentsReader", d.AgentsReader},
-		field{"Sessions", d.Sessions},
+		field{"Sessions", d.Sessions}, field{"SessionsReader", d.SessionsReader},
 		field{"SessionCreation", d.SessionCreation},
 		field{"SessionEvents", d.SessionEvents},
 		field{"Turns", d.Turns},
diff --git a/services/core/internal/api/dependencies_test.go b/services/core/internal/api/dependencies_test.go
index 698629487..38ce94de5 100644
--- a/services/core/internal/api/dependencies_test.go
+++ b/services/core/internal/api/dependencies_test.go
@@ -29,6 +29,7 @@ type testFakes struct {
 	agents                 *fakeAgents
 	agentsReader           *fakeAgentsReader
 	sessions               *fakeSessions
+	sessionsReader         *fakeSessionsReader
 	sessionCreation        *fakeSessionCreation
 	sessionEvents          *fakeSessionEvents
 	turns                  *fakeTurns
@@ -77,6 +78,7 @@ func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 		skills: &fakeSkills{t: t}, skillsReader: &fakeSkillsReader{t: t},
 		agents: &fakeAgents{t: t}, agentsReader: &fakeAgentsReader{t: t},
 		sessions:        &fakeSessions{t: t},
+		sessionsReader:  &fakeSessionsReader{t: t},
 		sessionCreation: &fakeSessionCreation{t: t},
 		sessionEvents:   &fakeSessionEvents{t: t},
 		turns:           &fakeTurns{t: t},
@@ -104,6 +106,7 @@ func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 		Skills: f.skills, SkillsReader: f.skillsReader,
 		Agents: f.agents, AgentsReader: f.agentsReader,
 		Sessions:        f.sessions,
+		SessionsReader:  f.sessionsReader,
 		SessionCreation: f.sessionCreation,
 		SessionEvents:   f.sessionEvents,
 		Turns:           f.turns,
diff --git a/services/core/internal/api/environment_input.go b/services/core/internal/api/environment_input.go
index 69c4e1ae9..fed8b537c 100644
--- a/services/core/internal/api/environment_input.go
+++ b/services/core/internal/api/environment_input.go
@@ -9,7 +9,7 @@ import (
 )
 
 func (h *Handler) setEnvironmentInputWriteDeadline(w http.ResponseWriter, r *http.Request, sessionID string) error {
-	session, err := h.Sessions.GetSession(r.Context(), tenantID(r), sessionID)
+	session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), sessionID)
 	if err != nil {
 		return err
 	}
diff --git a/services/core/internal/api/environment_installation.go b/services/core/internal/api/environment_installation.go
index 80412dcd8..c9074702f 100644
--- a/services/core/internal/api/environment_installation.go
+++ b/services/core/internal/api/environment_installation.go
@@ -118,7 +118,7 @@ func (h *Handler) prepareNativeInstallation(w http.ResponseWriter, r *http.Reque
 		writeSessionsError(w, r, err)
 		return
 	}
-	session, err := h.Sessions.GetSession(r.Context(), claim.Principal.TenantID, environment.SessionID)
+	session, err := h.SessionsReader.GetSession(r.Context(), claim.Principal.TenantID, environment.SessionID)
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
diff --git a/services/core/internal/api/errors_deployment.go b/services/core/internal/api/errors_deployment.go
index 352b39a2b..eeb8a212b 100644
--- a/services/core/internal/api/errors_deployment.go
+++ b/services/core/internal/api/errors_deployment.go
@@ -22,8 +22,6 @@ func writeDeploymentError(w http.ResponseWriter, r *http.Request, err error) {
 		writeError(w, http.StatusServiceUnavailable, "execution_unavailable", "Execution is not available on this service.")
 	case errors.Is(err, deployment.ErrNotFound):
 		writeError(w, http.StatusNotFound, "not_found_error", "Resource not found.")
-	case errors.Is(err, deployment.ErrInvalidInput):
-		writeError(w, http.StatusBadRequest, "invalid_request", invalidInputMessage)
 	default:
 		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
 			return
@@ -106,6 +104,8 @@ func writeSandboxError(w http.ResponseWriter, err error) bool {
 		writeError(w, http.StatusServiceUnavailable, "sandbox_nodes_preparing", "Sandbox nodes are preparing the requested Runtime.")
 	case errors.Is(err, placement.ErrNodeUnavailable):
 		writeError(w, http.StatusServiceUnavailable, "runtime_node_unavailable", "The selected sandbox node is unavailable or has no capacity.")
+	case errors.Is(err, deployment.ErrInvalidInput):
+		writeError(w, http.StatusBadRequest, "invalid_request", invalidInputMessage)
 	default:
 		return false
 	}
diff --git a/services/core/internal/api/errors_test.go b/services/core/internal/api/errors_test.go
index 6d88ecab7..d7bd2cb31 100644
--- a/services/core/internal/api/errors_test.go
+++ b/services/core/internal/api/errors_test.go
@@ -189,6 +189,7 @@ func TestSharedPersistenceErrors(t *testing.T) {
 		{writeAuditError, adminaudit.ErrInvalidQuery, 400, invalid},
 		{storeError, fmt.Errorf("write: %w", textvalue.ErrUnstorable), 400, unstorableTextMessage},
 		{writeAuditError, textvalue.ErrUnstorable, 400, unstorableTextMessage},
+		{storeError, deployment.ErrInvalidInput, 400, invalid},
 		{storeError, credentialcrypto.ErrUnavailable, 503, "credential_storage_unavailable"},
 		{writeAuditError, errors.New("canary"), 500, "internal_error"},
 	} {
diff --git a/services/core/internal/api/fakes_test.go b/services/core/internal/api/fakes_test.go
index bd21b0a51..cf1565aee 100644
--- a/services/core/internal/api/fakes_test.go
+++ b/services/core/internal/api/fakes_test.go
@@ -739,19 +739,11 @@ func (f *fakeRuntimeObservations) ObserveSessions(a0 context.Context, a1 []runti
 
 type fakeSessionAdmin struct {
 	t                                testing.TB
-	getSessionDiagnosticsSnapshot    func(context.Context, string, string) (sessions.Session, error)
 	getTurnDiagnosticsSnapshot       func(context.Context, string, string, string) (sessions.TurnDiagnosticsSnapshot, error)
 	getSessionExecutionConfiguration func(context.Context, string, string) (v1.SessionExecutionConfiguration, error)
 	getManagedSessionArchive         func(context.Context, string, string) (sessions.ManagedArchive, error)
 }
 
-func (f *fakeSessionAdmin) GetSessionDiagnosticsSnapshot(a0 context.Context, a1 string, a2 string) (sessions.Session, error) {
-	if f.getSessionDiagnosticsSnapshot == nil {
-		unexpectedCall(f.t, "GetSessionDiagnosticsSnapshot")
-	}
-	return f.getSessionDiagnosticsSnapshot(a0, a1, a2)
-}
-
 func (f *fakeSessionAdmin) GetTurnDiagnosticsSnapshot(a0 context.Context, a1 string, a2 string, a3 string) (sessions.TurnDiagnosticsSnapshot, error) {
 	if f.getTurnDiagnosticsSnapshot == nil {
 		unexpectedCall(f.t, "GetTurnDiagnosticsSnapshot")
@@ -794,15 +786,15 @@ func (f *fakeSessionAdmission) CreateSessionStream(a0 context.Context, a1 string
 }
 
 type fakeSessionArchive struct {
-	t                     testing.TB
-	archiveManagedSession func(context.Context, string, string, uint64) (sessions.ManagedArchive, error)
+	t              testing.TB
+	archiveSession func(context.Context, string, string, uint64) (sessions.ManagedArchive, error)
 }
 
-func (f *fakeSessionArchive) ArchiveManagedSession(a0 context.Context, a1 string, a2 string, a3 uint64) (sessions.ManagedArchive, error) {
-	if f.archiveManagedSession == nil {
-		unexpectedCall(f.t, "ArchiveManagedSession")
+func (f *fakeSessionArchive) ArchiveSession(a0 context.Context, a1 string, a2 string, a3 uint64) (sessions.ManagedArchive, error) {
+	if f.archiveSession == nil {
+		unexpectedCall(f.t, "ArchiveSession")
 	}
-	return f.archiveManagedSession(a0, a1, a2, a3)
+	return f.archiveSession(a0, a1, a2, a3)
 }
 
 type fakeSessionCreation struct {
@@ -863,46 +855,50 @@ func (f *fakeSessionEvents) SessionStreamSnapshot(a0 context.Context, a1 string,
 
 type fakeSessions struct {
 	t                     testing.TB
-	getSession            func(context.Context, string, string) (sessions.Session, error)
-	listSessions          func(context.Context, string, string, int, bool, *string) (sessions.Page, error)
-	updateSessionMetadata func(context.Context, string, string, map[string]string) (sessions.Session, error)
-	deleteSession         func(context.Context, string, string) error
-	auditSessionOperation func(context.Context, string, string, string) error
-}
-
-func (f *fakeSessions) GetSession(a0 context.Context, a1 string, a2 string) (sessions.Session, error) {
-	if f.getSession == nil {
-		unexpectedCall(f.t, "GetSession")
-	}
-	return f.getSession(a0, a1, a2)
-}
-
-func (f *fakeSessions) ListSessions(a0 context.Context, a1 string, a2 string, a3 int, a4 bool, a5 *string) (sessions.Page, error) {
-	if f.listSessions == nil {
-		unexpectedCall(f.t, "ListSessions")
-	}
-	return f.listSessions(a0, a1, a2, a3, a4, a5)
+	updateSessionMetadata func(context.Context, sessions.UpdateSessionMetadataCommand) (sessions.Session, error)
+	deleteSession         func(context.Context, sessions.DeleteSessionCommand) error
+	auditSessionOperation func(context.Context, sessions.AuditSessionOperationCommand) error
 }
 
-func (f *fakeSessions) UpdateSessionMetadata(a0 context.Context, a1 string, a2 string, a3 map[string]string) (sessions.Session, error) {
+func (f *fakeSessions) UpdateSessionMetadata(a0 context.Context, a1 sessions.UpdateSessionMetadataCommand) (sessions.Session, error) {
 	if f.updateSessionMetadata == nil {
 		unexpectedCall(f.t, "UpdateSessionMetadata")
 	}
-	return f.updateSessionMetadata(a0, a1, a2, a3)
+	return f.updateSessionMetadata(a0, a1)
 }
 
-func (f *fakeSessions) DeleteSession(a0 context.Context, a1 string, a2 string) error {
+func (f *fakeSessions) DeleteSession(a0 context.Context, a1 sessions.DeleteSessionCommand) error {
 	if f.deleteSession == nil {
 		unexpectedCall(f.t, "DeleteSession")
 	}
-	return f.deleteSession(a0, a1, a2)
+	return f.deleteSession(a0, a1)
 }
 
-func (f *fakeSessions) AuditSessionOperation(a0 context.Context, a1 string, a2 string, a3 string) error {
+func (f *fakeSessions) AuditSessionOperation(a0 context.Context, a1 sessions.AuditSessionOperationCommand) error {
 	if f.auditSessionOperation == nil {
 		unexpectedCall(f.t, "AuditSessionOperation")
 	}
-	return f.auditSessionOperation(a0, a1, a2, a3)
+	return f.auditSessionOperation(a0, a1)
+}
+
+type fakeSessionsReader struct {
+	t            testing.TB
+	getSession   func(context.Context, string, string) (sessions.Session, error)
+	listSessions func(context.Context, string, string, int, bool, *string) (sessions.Page, error)
+}
+
+func (f *fakeSessionsReader) GetSession(a0 context.Context, a1 string, a2 string) (sessions.Session, error) {
+	if f.getSession == nil {
+		unexpectedCall(f.t, "GetSession")
+	}
+	return f.getSession(a0, a1, a2)
+}
+
+func (f *fakeSessionsReader) ListSessions(a0 context.Context, a1 string, a2 string, a3 int, a4 bool, a5 *string) (sessions.Page, error) {
+	if f.listSessions == nil {
+		unexpectedCall(f.t, "ListSessions")
+	}
+	return f.listSessions(a0, a1, a2, a3, a4, a5)
 }
 
 type fakeSkills struct {
diff --git a/services/core/internal/api/handler.go b/services/core/internal/api/handler.go
index 77746f5b2..154b0a491 100644
--- a/services/core/internal/api/handler.go
+++ b/services/core/internal/api/handler.go
@@ -34,14 +34,17 @@ type SessionAdmission interface {
 	CreateSessionStream(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
 }
 
-// Sessions reads, updates and deletes Sessions, and records their public write
-// audit.
+// Sessions updates and deletes Sessions, and records their public write audit.
 type Sessions interface {
+	UpdateSessionMetadata(context.Context, sessions.UpdateSessionMetadataCommand) (sessions.Session, error)
+	DeleteSession(context.Context, sessions.DeleteSessionCommand) error
+	AuditSessionOperation(context.Context, sessions.AuditSessionOperationCommand) error
+}
+
+// SessionsReader reads Sessions.
+type SessionsReader interface {
 	GetSession(context.Context, string, string) (sessions.Session, error)
 	ListSessions(context.Context, string, string, int, bool, *string) (sessions.Page, error)
-	UpdateSessionMetadata(context.Context, string, string, map[string]string) (sessions.Session, error)
-	DeleteSession(context.Context, string, string) error
-	AuditSessionOperation(context.Context, string, string, string) error
 }
 
 // routes builds the router. HEAD runs the GET route without a body after the
@@ -302,7 +305,7 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 // @Failure 400,401,404,500,503 {object} v1.ErrorResponse
 // @Router /agents/sessions/{session_id} [get]
 func (h *Handler) getSession(w http.ResponseWriter, r *http.Request) {
-	session, err := h.Sessions.GetSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id"))
+	session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id"))
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
@@ -349,7 +352,7 @@ func (h *Handler) listSessions(w http.ResponseWriter, r *http.Request) {
 	if values, present := r.URL.Query()["agent_id"]; present {
 		agentID = &values[0]
 	}
-	page, err := h.Sessions.ListSessions(r.Context(), tenantID(r), options.after, options.limit, options.ascending, agentID)
+	page, err := h.SessionsReader.ListSessions(r.Context(), tenantID(r), options.after, options.limit, options.ascending, agentID)
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
diff --git a/services/core/internal/api/handler_test.go b/services/core/internal/api/handler_test.go
index cdcd8d501..0a0ab0536 100644
--- a/services/core/internal/api/handler_test.go
+++ b/services/core/internal/api/handler_test.go
@@ -52,7 +52,7 @@ func (s *recordingStore) CreateSession(_ context.Context, tenant string, input s
 // record answers Session creation, reads and listing from s.
 func (s *recordingStore) record(f *testFakes) {
 	f.sessionCreation.createSession, f.sessionCreation.findSessionCreation = s.CreateSession, s.FindSessionCreation
-	f.sessions.getSession, f.sessions.listSessions = s.GetSession, s.ListSessions
+	f.sessionsReader.getSession, f.sessionsReader.listSessions = s.GetSession, s.ListSessions
 }
 
 // testHandler serves strict fakes for a fresh tenant whose caller
diff --git a/services/core/internal/api/inputs.go b/services/core/internal/api/inputs.go
index 94f9af3e4..aa6f6ad37 100644
--- a/services/core/internal/api/inputs.go
+++ b/services/core/internal/api/inputs.go
@@ -58,7 +58,7 @@ func (h *Handler) createEvents(w http.ResponseWriter, r *http.Request) {
 	if request.Events != nil && len(request.Events) == 0 {
 		// Empty batches have no execution identity to reserve or replay.
 		// Authorize the resource even when no executor is configured.
-		if _, err := h.Sessions.GetSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id")); err != nil {
+		if _, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id")); err != nil {
 			writeStoreError(w, r, err)
 			return
 		}
diff --git a/services/core/internal/api/native_classification_integration_test.go b/services/core/internal/api/native_classification_integration_test.go
index 5b0a4530a..9ce5ea206 100644
--- a/services/core/internal/api/native_classification_integration_test.go
+++ b/services/core/internal/api/native_classification_integration_test.go
@@ -9,13 +9,16 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 )
 
 func TestNativeClassificationPostgresRoundTripAndPublicPrivacy(t *testing.T) {
 	s, pool := diagnosticDatabase(t)
-	h, _, tenant := adminTestHandler(t, databaseSessionReads(s, pool))
+	h, _, tenant := adminTestHandler(t, databaseSessionReads(pool))
+	reader := sessionpg.New(pgunit.NewPool(pool), nil)
 	for _, code := range []string{"authentication_error", "connection_failed", "secret-canary"} {
 		t.Run(code, func(t *testing.T) {
 			session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "native-classification"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
@@ -34,7 +37,7 @@ func TestNativeClassificationPostgresRoundTripAndPublicPrivacy(t *testing.T) {
 				t.Fatal(err)
 			}
 			transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: outcome})
-			snap, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+			snap, err := reader.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -65,7 +68,7 @@ func TestNativeClassificationPostgresRoundTripAndPublicPrivacy(t *testing.T) {
 				}
 				before[i] = append([]byte(nil), w.Body.Bytes()...)
 			}
-			events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+			events, err := reader.ListSessionEvents(t.Context(), tenant, session.ID, 0)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/api/resource_query_test.go b/services/core/internal/api/resource_query_test.go
index 9e4cf7408..bf5dde96c 100644
--- a/services/core/internal/api/resource_query_test.go
+++ b/services/core/internal/api/resource_query_test.go
@@ -54,12 +54,12 @@ func (s *missingResourceStore) GetSession(_ context.Context, tenant, _ string) (
 	return sessions.Session{}, s.missing(tenant)
 }
 
-func (s *missingResourceStore) DeleteSession(_ context.Context, tenant, _ string) error {
-	return s.missing(tenant)
+func (s *missingResourceStore) DeleteSession(_ context.Context, command sessions.DeleteSessionCommand) error {
+	return s.missing(command.TenantID)
 }
 
-func (s *missingResourceStore) UpdateSessionMetadata(_ context.Context, tenant, _ string, _ map[string]string) (sessions.Session, error) {
-	return sessions.Session{}, s.missing(tenant)
+func (s *missingResourceStore) UpdateSessionMetadata(_ context.Context, command sessions.UpdateSessionMetadataCommand) (sessions.Session, error) {
+	return sessions.Session{}, s.missing(command.TenantID)
 }
 
 // Environment Template operations report a missing Template with their
@@ -84,7 +84,7 @@ func (s *missingResourceStore) DeleteEnvironmentTemplate(_ context.Context, comm
 // wire serves the Agent, Session and Environment template lookups from s.
 func (s *missingResourceStore) wire(_ *Dependencies, f *testFakes) {
 	f.agentsReader.getAgent, f.agents.delete, f.agents.update = s.GetAgent, s.DeleteAgent, s.UpdateAgent
-	f.sessions.getSession, f.sessions.deleteSession, f.sessions.updateSessionMetadata = s.GetSession, s.DeleteSession, s.UpdateSessionMetadata
+	f.sessionsReader.getSession, f.sessions.deleteSession, f.sessions.updateSessionMetadata = s.GetSession, s.DeleteSession, s.UpdateSessionMetadata
 	f.environmentTemplatesReader.get, f.environmentTemplates.update, f.environmentTemplates.delete = s.GetEnvironmentTemplate, s.UpdateEnvironmentTemplate, s.DeleteEnvironmentTemplate
 }
 
diff --git a/services/core/internal/api/session_admission_test.go b/services/core/internal/api/session_admission_test.go
index 49914f9f4..aedd04a7b 100644
--- a/services/core/internal/api/session_admission_test.go
+++ b/services/core/internal/api/session_admission_test.go
@@ -15,7 +15,7 @@ import (
 // testHandler serves, so any access fails the test.
 func forbidSessionAccess(_ *Dependencies, f *testFakes) {
 	f.sessionCreation.createSession, f.sessionCreation.findSessionCreation = nil, nil
-	f.sessions.getSession, f.sessions.listSessions = nil, nil
+	f.sessionsReader.getSession, f.sessionsReader.listSessions = nil, nil
 	f.modelProviders.resolve = nil
 }
 
diff --git a/services/core/internal/api/session_creation_identity.go b/services/core/internal/api/session_creation_identity.go
index 22a0bb248..c466a6d1c 100644
--- a/services/core/internal/api/session_creation_identity.go
+++ b/services/core/internal/api/session_creation_identity.go
@@ -60,7 +60,7 @@ func (h *Handler) recoverSessionCreation(w http.ResponseWriter, r *http.Request,
 		// Recorded-intent lookup finds an existing creation, which sends no events.
 		h.respondSessionCreationStream(w, r, result)
 	} else {
-		session, err := h.Sessions.GetSession(r.Context(), tenantID(r), result.Session.ID)
+		session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), result.Session.ID)
 		if err != nil {
 			writeStoreError(w, r, err)
 		} else if h.auditSessionOperation(w, r, session.ID, "create") {
diff --git a/services/core/internal/api/session_creation_stream_test.go b/services/core/internal/api/session_creation_stream_test.go
index bb6dfc839..a94119d7d 100644
--- a/services/core/internal/api/session_creation_stream_test.go
+++ b/services/core/internal/api/session_creation_stream_test.go
@@ -102,7 +102,7 @@ func (f *creationStreamFixture) FindSessionCreation(context.Context, string, str
 }
 
 // AuditSessionOperation accepts the audit of a replayed creation.
-func (f *creationStreamFixture) AuditSessionOperation(context.Context, string, string, string) error {
+func (f *creationStreamFixture) AuditSessionOperation(context.Context, sessions.AuditSessionOperationCommand) error {
 	return nil
 }
 
@@ -146,7 +146,7 @@ func newCreationStreamHarness(t *testing.T) *creationStreamHarness {
 		OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner",
 		TokenSHA256: runtimedevice.HashCredential("key"), TenantID: tenant,
 	}).ResolveAPIKey
-	fakes.sessions.getSession, fakes.sessions.auditSessionOperation = fixture.GetSession, fixture.AuditSessionOperation
+	fakes.sessionsReader.getSession, fakes.sessions.auditSessionOperation = fixture.GetSession, fixture.AuditSessionOperation
 	fakes.sessionCreation.findSessionCreation = fixture.FindSessionCreation
 	fakes.sessionEvents.sessionEventCursor, fakes.sessionEvents.sessionStreamSnapshot, fakes.sessionEvents.listSessionEvents = fixture.SessionEventCursor, fixture.SessionStreamSnapshot, fixture.ListSessionEvents
 	fakes.modelProviders.resolve = noDeploymentModelProvider
diff --git a/services/core/internal/api/session_deletion.go b/services/core/internal/api/session_deletion.go
index ce3917733..7905c0c81 100644
--- a/services/core/internal/api/session_deletion.go
+++ b/services/core/internal/api/session_deletion.go
@@ -35,7 +35,7 @@ func (h *Handler) deleteSession(w http.ResponseWriter, r *http.Request) {
 		writeStoreError(w, r, sessions.ErrNotFound)
 		return
 	}
-	if err := h.Sessions.DeleteSession(r.Context(), tenantID(r), id); err != nil {
+	if err := h.Sessions.DeleteSession(r.Context(), sessions.DeleteSessionCommand{TenantID: tenantID(r), SessionID: id}); err != nil {
 		writeStoreError(w, r, err)
 		return
 	}
diff --git a/services/core/internal/api/session_diagnostics.go b/services/core/internal/api/session_diagnostics.go
index 138534f00..a98f57312 100644
--- a/services/core/internal/api/session_diagnostics.go
+++ b/services/core/internal/api/session_diagnostics.go
@@ -46,10 +46,9 @@ type TurnDiagnostics struct {
 	ItemsTruncated bool                   `json:"items_truncated"`
 }
 
-// SessionAdmin serves the administrator's per-Session reads: diagnostics
+// SessionAdmin serves the administrator's per-Session reads: Turn diagnostics
 // snapshots, the execution configuration and the managed archive state.
 type SessionAdmin interface {
-	GetSessionDiagnosticsSnapshot(context.Context, string, string) (sessions.Session, error)
 	GetTurnDiagnosticsSnapshot(context.Context, string, string, string) (sessions.TurnDiagnosticsSnapshot, error)
 	GetSessionExecutionConfiguration(context.Context, string, string) (v1.SessionExecutionConfiguration, error)
 	GetManagedSessionArchive(context.Context, string, string) (sessions.ManagedArchive, error)
@@ -68,7 +67,7 @@ type SessionAdmin interface {
 func (h *Handler) getSessionDiagnostics(w http.ResponseWriter, r *http.Request) {
 	ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
 	defer cancel()
-	session, err := h.SessionAdmin.GetSessionDiagnosticsSnapshot(ctx, tenantID(r), chi.URLParam(r, "session_id"))
+	session, err := h.SessionsReader.GetSession(ctx, tenantID(r), chi.URLParam(r, "session_id"))
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
diff --git a/services/core/internal/api/session_diagnostics_deadline_test.go b/services/core/internal/api/session_diagnostics_deadline_test.go
index e8fd9445e..523840f37 100644
--- a/services/core/internal/api/session_diagnostics_deadline_test.go
+++ b/services/core/internal/api/session_diagnostics_deadline_test.go
@@ -17,9 +17,9 @@ type diagnosticDeadlineStore struct {
 	observed context.Context
 }
 
-func (s *diagnosticDeadlineStore) GetSessionDiagnosticsSnapshot(ctx context.Context, tenant, session string) (sessions.Session, error) {
+func (s *diagnosticDeadlineStore) GetSession(ctx context.Context, tenant, session string) (sessions.Session, error) {
 	s.observed = ctx
-	return s.diagnosticSnapshotStore.GetSessionDiagnosticsSnapshot(ctx, tenant, session)
+	return s.diagnosticSnapshotStore.GetSession(ctx, tenant, session)
 }
 func (s *diagnosticDeadlineStore) GetTurnDiagnosticsSnapshot(ctx context.Context, tenant, session, turn string) (sessions.TurnDiagnosticsSnapshot, error) {
 	s.observed = ctx
diff --git a/services/core/internal/api/session_diagnostics_public_compat_test.go b/services/core/internal/api/session_diagnostics_public_compat_test.go
index 6910ec7db..c555210b3 100644
--- a/services/core/internal/api/session_diagnostics_public_compat_test.go
+++ b/services/core/internal/api/session_diagnostics_public_compat_test.go
@@ -27,7 +27,7 @@ func TestDiagnosticPublicCompatibility(t *testing.T) {
 	key := callerBinding()
 	deps, fakes := testDependencies(t)
 	fakes.projectsReader.resolveAPIKey = projectKeys(t, key).ResolveAPIKey
-	databaseSessionReads(s, pool)(&deps, fakes)
+	databaseSessionReads(pool)(&deps, fakes)
 	h := newTestHandler(t, deps)
 	session, err := s.CreateSession(t.Context(), key.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "compat-test"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
 	if err != nil {
@@ -64,13 +64,12 @@ func diagnosticRequest(handler http.Handler, path, token string) *httptest.Respo
 	return w
 }
 
-// databaseSessionReads serves Session, Turn and diagnostic reads from s, and
-// Item reads from the Session adapter on pool.
-func databaseSessionReads(s *store.Store, pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
+// databaseSessionReads serves Session, Turn, diagnostic and Item reads from
+// the Session adapter on pool.
+func databaseSessionReads(pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
 	return func(d *Dependencies, _ *testFakes) {
-		d.Sessions, d.SessionAdmin = s, s
-		reads := sessionpg.New(pgunit.NewPool(pool), nil)
-		d.Items, d.Turns = reads, reads
+		reader := sessionpg.New(pgunit.NewPool(pool), nil)
+		d.SessionsReader, d.SessionAdmin, d.Items, d.Turns = reader, reader, reader, reader
 	}
 }
 
diff --git a/services/core/internal/api/session_diagnostics_test.go b/services/core/internal/api/session_diagnostics_test.go
index 8fc433ae0..448a959df 100644
--- a/services/core/internal/api/session_diagnostics_test.go
+++ b/services/core/internal/api/session_diagnostics_test.go
@@ -14,7 +14,7 @@ import (
 
 func TestDiagnosticsCoreHandlerDatabaseBoundary(t *testing.T) {
 	s, pool := diagnosticDatabase(t)
-	h, _, tenant := adminTestHandler(t, databaseSessionReads(s, pool))
+	h, _, tenant := adminTestHandler(t, databaseSessionReads(pool))
 	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "diagnostic-test"}, Engine: "codex", IdempotencyKey: "diagnostics", Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
 	if err != nil {
 		t.Fatal(err)
@@ -61,7 +61,7 @@ type diagnosticSnapshotStore struct {
 	session sessions.Session
 }
 
-func (s diagnosticSnapshotStore) GetSessionDiagnosticsSnapshot(context.Context, string, string) (sessions.Session, error) {
+func (s diagnosticSnapshotStore) GetSession(context.Context, string, string) (sessions.Session, error) {
 	return s.session, nil
 }
 func (s diagnosticSnapshotStore) GetTurnDiagnosticsSnapshot(context.Context, string, string, string) (sessions.TurnDiagnosticsSnapshot, error) {
@@ -70,14 +70,14 @@ func (s diagnosticSnapshotStore) GetTurnDiagnosticsSnapshot(context.Context, str
 
 // diagnosticSnapshots answers Core diagnostic reads.
 type diagnosticSnapshots interface {
-	GetSessionDiagnosticsSnapshot(context.Context, string, string) (sessions.Session, error)
+	GetSession(context.Context, string, string) (sessions.Session, error)
 	GetTurnDiagnosticsSnapshot(context.Context, string, string, string) (sessions.TurnDiagnosticsSnapshot, error)
 }
 
 // serveDiagnostics answers Session and Turn diagnostic reads from source.
 func serveDiagnostics(source diagnosticSnapshots) func(*Dependencies, *testFakes) {
 	return func(_ *Dependencies, f *testFakes) {
-		f.sessionAdmin.getSessionDiagnosticsSnapshot, f.sessionAdmin.getTurnDiagnosticsSnapshot = source.GetSessionDiagnosticsSnapshot, source.GetTurnDiagnosticsSnapshot
+		f.sessionsReader.getSession, f.sessionAdmin.getTurnDiagnosticsSnapshot = source.GetSession, source.GetTurnDiagnosticsSnapshot
 	}
 }
 
diff --git a/services/core/internal/api/session_environment_http_test.go b/services/core/internal/api/session_environment_http_test.go
index 9d93c79cd..d607345c2 100644
--- a/services/core/internal/api/session_environment_http_test.go
+++ b/services/core/internal/api/session_environment_http_test.go
@@ -25,9 +25,9 @@ func (f *environmentHTTPFixture) ListSessions(_ context.Context, tenant, _ strin
 	return sessions.Page{Sessions: []sessions.Session{f.session}}, nil
 }
 
-func (f *environmentHTTPFixture) UpdateSessionMetadata(ctx context.Context, tenant, session string, metadata map[string]string) (sessions.Session, error) {
-	value, err := f.GetSession(ctx, tenant, session)
-	value.Metadata = metadata
+func (f *environmentHTTPFixture) UpdateSessionMetadata(ctx context.Context, command sessions.UpdateSessionMetadataCommand) (sessions.Session, error) {
+	value, err := f.GetSession(ctx, command.TenantID, command.SessionID)
+	value.Metadata = command.Metadata
 	return value, err
 }
 
@@ -48,7 +48,7 @@ func TestSelfHostedSessionHTTPReadListMetadataAndLiveStream(t *testing.T) {
 		TokenSHA256: runtimedevice.HashCredential("key"), TenantID: session.TenantID,
 	}).ResolveAPIKey
 	fixture.serve(fakes)
-	fakes.sessions.listSessions, fakes.sessions.updateSessionMetadata = fixture.ListSessions, fixture.UpdateSessionMetadata
+	fakes.sessionsReader.listSessions, fakes.sessions.updateSessionMetadata = fixture.ListSessions, fixture.UpdateSessionMetadata
 	// Self-hosted Sessions report the executor URL of the enabled Execution.
 	deps.Execution = fakes.execution()
 	deps.Execution.ExecutorURL = environmentOrigin
diff --git a/services/core/internal/api/session_metadata.go b/services/core/internal/api/session_metadata.go
index e4c334fb5..6cec3c02b 100644
--- a/services/core/internal/api/session_metadata.go
+++ b/services/core/internal/api/session_metadata.go
@@ -10,6 +10,7 @@ import (
 	"slices"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/metadata"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/go-chi/chi/v5"
 )
 
@@ -59,7 +60,7 @@ func (h *Handler) updateSession(w http.ResponseWriter, r *http.Request) {
 		}
 		return
 	}
-	session, err := h.Sessions.UpdateSessionMetadata(r.Context(), tenantID(r), chi.URLParam(r, "session_id"), values)
+	session, err := h.Sessions.UpdateSessionMetadata(r.Context(), sessions.UpdateSessionMetadataCommand{TenantID: tenantID(r), SessionID: chi.URLParam(r, "session_id"), Metadata: values})
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
diff --git a/services/core/internal/api/session_semantics_test.go b/services/core/internal/api/session_semantics_test.go
index fe5809db0..2cb5b1ceb 100644
--- a/services/core/internal/api/session_semantics_test.go
+++ b/services/core/internal/api/session_semantics_test.go
@@ -27,7 +27,7 @@ func (s *emptyEventSessionStore) GetSession(_ context.Context, tenant, id string
 	return sessions.Session{ID: id, TenantID: tenant, Configuration: json.RawMessage(`{"environment":{"type":"none"}}`)}, nil
 }
 
-func (s *emptyEventSessionStore) AuditSessionOperation(context.Context, string, string, string) error {
+func (s *emptyEventSessionStore) AuditSessionOperation(context.Context, sessions.AuditSessionOperationCommand) error {
 	return nil
 }
 
@@ -37,7 +37,7 @@ func TestEmptyEventBatchAuthorizesWithoutExecutionEffects(t *testing.T) {
 			recorder := &inputRecorder{}
 			sessions := &emptyEventSessionStore{}
 			h, _, tenant := testHandler(t, func(d *Dependencies, f *testFakes) {
-				f.sessions.getSession, f.sessions.auditSessionOperation = sessions.GetSession, sessions.AuditSessionOperation
+				f.sessionsReader.getSession, f.sessions.auditSessionOperation = sessions.GetSession, sessions.AuditSessionOperation
 				if executor {
 					recorder.admit(d, f)
 				}
diff --git a/services/core/internal/api/session_write_audit.go b/services/core/internal/api/session_write_audit.go
index 52cb4e3be..afc117383 100644
--- a/services/core/internal/api/session_write_audit.go
+++ b/services/core/internal/api/session_write_audit.go
@@ -3,6 +3,7 @@ package api
 import (
 	"net/http"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 )
 
@@ -10,7 +11,7 @@ func (h *Handler) auditSessionOperation(w http.ResponseWriter, r *http.Request,
 	if _, ok := writeaudit.FromContext(r.Context()); !ok {
 		return true
 	}
-	if err := h.Sessions.AuditSessionOperation(r.Context(), tenantID(r), sessionID, action); err != nil {
+	if err := h.Sessions.AuditSessionOperation(r.Context(), sessions.AuditSessionOperationCommand{TenantID: tenantID(r), SessionID: sessionID, Action: action}); err != nil {
 		writeStoreError(w, r, err)
 		return false
 	}
diff --git a/services/core/internal/api/session_write_audit_test.go b/services/core/internal/api/session_write_audit_test.go
index cd0987761..a341ce362 100644
--- a/services/core/internal/api/session_write_audit_test.go
+++ b/services/core/internal/api/session_write_audit_test.go
@@ -27,12 +27,12 @@ func (f *auditedSessionFixture) FindSessionCreation(context.Context, string, str
 	return sessions.Creation{Session: f.session}, nil
 }
 
-func (f *auditedSessionFixture) AuditSessionOperation(ctx context.Context, tenant, session, action string) error {
-	if tenant != f.session.TenantID || session != f.session.ID {
+func (f *auditedSessionFixture) AuditSessionOperation(ctx context.Context, command sessions.AuditSessionOperationCommand) error {
+	if command.TenantID != f.session.TenantID || command.SessionID != f.session.ID {
 		return sessions.ErrNotFound
 	}
 	f.source, _ = writeaudit.FromContext(ctx)
-	f.actions = append(f.actions, action)
+	f.actions = append(f.actions, command.Action)
 	return f.err
 }
 
@@ -48,7 +48,7 @@ func TestSessionAuditOnlyRoutesFailClosed(t *testing.T) {
 				deps, fakes := testDependencies(t)
 				fakes.sessions.auditSessionOperation = f.AuditSessionOperation
 				if route != "stream-replay" {
-					fakes.sessions.getSession = f.GetSession
+					fakes.sessionsReader.getSession = f.GetSession
 				}
 				if route != "empty-events" {
 					fakes.sessionCreation.findSessionCreation = f.FindSessionCreation
diff --git a/services/core/internal/api/stream.go b/services/core/internal/api/stream.go
index 1168ee433..ba7cff7f0 100644
--- a/services/core/internal/api/stream.go
+++ b/services/core/internal/api/stream.go
@@ -37,7 +37,7 @@ type SessionEvents interface {
 // @Router /agents/sessions/{session_id}/events [get]
 func (h *Handler) streamEvents(w http.ResponseWriter, r *http.Request) {
 	id, tenant := chi.URLParam(r, "session_id"), tenantID(r)
-	session, err := h.Sessions.GetSession(r.Context(), tenant, id)
+	session, err := h.SessionsReader.GetSession(r.Context(), tenant, id)
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
diff --git a/services/core/internal/api/stream_test.go b/services/core/internal/api/stream_test.go
index a82b707f3..1e376e0e6 100644
--- a/services/core/internal/api/stream_test.go
+++ b/services/core/internal/api/stream_test.go
@@ -61,7 +61,7 @@ func (f *streamFixture) ListSessionEvents(_ context.Context, _, _ string, cursor
 
 // serve answers Session reads and the event stream from f.
 func (f *streamFixture) serve(fakes *testFakes) {
-	fakes.sessions.getSession = f.GetSession
+	fakes.sessionsReader.getSession = f.GetSession
 	fakes.sessionEvents.sessionEventCursor, fakes.sessionEvents.sessionStreamSnapshot, fakes.sessionEvents.listSessionEvents = f.SessionEventCursor, f.SessionStreamSnapshot, f.ListSessionEvents
 }
 
diff --git a/services/core/internal/api/turns.go b/services/core/internal/api/turns.go
index 7da89680a..cfd2668e6 100644
--- a/services/core/internal/api/turns.go
+++ b/services/core/internal/api/turns.go
@@ -36,7 +36,7 @@ func (h *Handler) getTurn(w http.ResponseWriter, r *http.Request) {
 		writeStoreError(w, r, err)
 		return
 	}
-	session, err := h.Sessions.GetSession(r.Context(), tenantID(r), sessionID)
+	session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), sessionID)
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
@@ -68,7 +68,7 @@ func (h *Handler) listTurns(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	sessionID := chi.URLParam(r, "session_id")
-	session, err := h.Sessions.GetSession(r.Context(), tenantID(r), sessionID)
+	session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), sessionID)
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
diff --git a/services/core/internal/api/turns_test.go b/services/core/internal/api/turns_test.go
index 47acb988a..cbf738706 100644
--- a/services/core/internal/api/turns_test.go
+++ b/services/core/internal/api/turns_test.go
@@ -37,7 +37,7 @@ func (s *turnReadStore) ListTurns(_ context.Context, tenant, session, cursor str
 func TestTurnRoutesUseAuthenticatedScopeAndSafeProjection(t *testing.T) {
 	s := &turnReadStore{session: sessions.Session{Configuration: json.RawMessage(`{"agent":{"id":"agent_snapshot"}}`)}, turn: sessions.Turn{ID: "turn", SessionID: "session", Status: sessions.TurnFailed, CreatedAt: time.Unix(1700000000, 999), Outcome: json.RawMessage(`{"error":"Bearer SECRET","done":{"metadata":{"password":"SECRET"}}}`)}}
 	h, _, tenant := testHandler(t, func(_ *Dependencies, f *testFakes) {
-		f.sessions.getSession, f.turns.getTurn, f.turns.listTurns = s.GetSession, s.GetTurn, s.ListTurns
+		f.sessionsReader.getSession, f.turns.getTurn, f.turns.listTurns = s.GetSession, s.GetTurn, s.ListTurns
 	})
 	request := func(path string) *httptest.ResponseRecorder {
 		r := httptest.NewRequest(http.MethodGet, path, nil)
diff --git a/services/core/internal/api/validation_errors_test.go b/services/core/internal/api/validation_errors_test.go
index 2820e6e24..9c05b9458 100644
--- a/services/core/internal/api/validation_errors_test.go
+++ b/services/core/internal/api/validation_errors_test.go
@@ -40,9 +40,9 @@ func (s *validationStore) CreateVault(_ context.Context, input vaults.CreateVaul
 	return vaults.Vault{ID: uuid.NewString(), TenantID: input.TenantID, Name: input.Name, Metadata: input.Metadata}, nil
 }
 
-func (s *validationStore) UpdateSessionMetadata(_ context.Context, tenant, id string, metadata map[string]string) (sessions.Session, error) {
+func (s *validationStore) UpdateSessionMetadata(_ context.Context, command sessions.UpdateSessionMetadataCommand) (sessions.Session, error) {
 	s.writes++
-	return sessions.Session{ID: id, TenantID: tenant, Metadata: metadata, Configuration: json.RawMessage(`{"agent":{"id":"agent_validation","model":"validation-model"},"environment":{"type":"none"}}`)}, nil
+	return sessions.Session{ID: command.SessionID, TenantID: command.TenantID, Metadata: command.Metadata, Configuration: json.RawMessage(`{"agent":{"id":"agent_validation","model":"validation-model"},"environment":{"type":"none"}}`)}, nil
 }
 
 func (s *validationStore) CreateSession(_ context.Context, tenant string, input sessions.CreateSession) (sessions.Session, error) {
@@ -67,7 +67,7 @@ func (s *validationStore) serve(d *Dependencies, f *testFakes) {
 	f.sessionAdmission.createSession = s.CreateSession
 	f.agents.create, f.agents.update = s.CreateAgent, s.UpdateAgent
 	f.vaults.createVault = s.CreateVault
-	f.sessions.getSession, f.sessions.updateSessionMetadata = nil, s.UpdateSessionMetadata
+	f.sessionsReader.getSession, f.sessions.updateSessionMetadata = nil, s.UpdateSessionMetadata
 	f.environmentTemplates.create, f.environmentTemplates.update = s.CreateEnvironmentTemplate, s.UpdateEnvironmentTemplate
 }
 
diff --git a/services/core/internal/deployment/errors.go b/services/core/internal/deployment/errors.go
index 27252d080..1875e9716 100644
--- a/services/core/internal/deployment/errors.go
+++ b/services/core/internal/deployment/errors.go
@@ -30,6 +30,9 @@ var (
 	ErrNodeAddressMismatch = errors.New("sandbox node Core address differs from the public URL")
 	// ErrNodeExists rejects an enrollment whose node ID is already in use.
 	ErrNodeExists = errors.New("sandbox node ID is already enrolled")
+	// ErrSandboxResetSessionBusy reports a hosted Session an automatic reset
+	// does not archive yet because it has active work.
+	ErrSandboxResetSessionBusy = errors.New("the hosted Session is busy")
 )
 
 // GenerationStaleError rejects a change whose expected generation is not the
diff --git a/services/core/internal/deployment/fakes_test.go b/services/core/internal/deployment/fakes_test.go
index 8113024ec..526945814 100644
--- a/services/core/internal/deployment/fakes_test.go
+++ b/services/core/internal/deployment/fakes_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
@@ -63,6 +64,7 @@ type fakeExecutionStorage struct {
 	withReservation       func(context.Context, AllocationKey, func(sessions.LockedSession, ReservationTx) error) error
 	withAllocation        func(context.Context, AllocationKey, func(AllocationTx) error) error
 	withAllocationCleanup func(context.Context, AllocationKey, func(AllocationCleanupTx) error) error
+	withSessionArchive    func(context.Context, string, string, func(context.Context, sessions.LockedSession, SessionArchiveTx) error) error
 	clearWake             func(context.Context, string, time.Time) error
 }
 
@@ -537,6 +539,13 @@ func (f *fakeExecutionStorage) WithAllocationCleanup(ctx context.Context, key Al
 	return f.withAllocationCleanup(ctx, key, apply)
 }
 
+func (f *fakeExecutionStorage) WithSessionArchive(ctx context.Context, tenantID, sessionID string, apply func(context.Context, sessions.LockedSession, SessionArchiveTx) error) error {
+	if f.withSessionArchive == nil {
+		unexpected(f.t, "WithSessionArchive")
+	}
+	return f.withSessionArchive(ctx, tenantID, sessionID, apply)
+}
+
 func (f *fakeExecutionStorage) ClearWake(ctx context.Context, allocationID string, observed time.Time) error {
 	if f.clearWake == nil {
 		unexpected(f.t, "ClearWake")
@@ -627,3 +636,60 @@ func (f *fakeReader) CountRetainedAllocations(ctx context.Context, installationI
 	}
 	return f.countRetainedAllocations(ctx, installationID)
 }
+
+// fakeSessionReader serves the Session reads the observation resolver makes;
+// every other read fails the test.
+type fakeSessionReader struct {
+	t                    testing.TB
+	getSession           func(context.Context, string, string) (sessions.Session, error)
+	measuredSessionUsage func(context.Context, string, string) (json.RawMessage, error)
+}
+
+func (f *fakeSessionReader) GetSession(ctx context.Context, tenantID, sessionID string) (sessions.Session, error) {
+	if f.getSession == nil {
+		unexpected(f.t, "GetSession")
+	}
+	return f.getSession(ctx, tenantID, sessionID)
+}
+
+func (f *fakeSessionReader) MeasuredSessionUsage(ctx context.Context, tenantID, sessionID string) (json.RawMessage, error) {
+	if f.measuredSessionUsage == nil {
+		unexpected(f.t, "MeasuredSessionUsage")
+	}
+	return f.measuredSessionUsage(ctx, tenantID, sessionID)
+}
+
+func (f *fakeSessionReader) ListSessions(context.Context, string, string, int, bool, *string) (sessions.Page, error) {
+	unexpected(f.t, "ListSessions")
+	return sessions.Page{}, nil
+}
+
+func (f *fakeSessionReader) SessionStreamSnapshot(context.Context, string, string) (sessions.Session, int64, error) {
+	unexpected(f.t, "SessionStreamSnapshot")
+	return sessions.Session{}, 0, nil
+}
+
+func (f *fakeSessionReader) SessionEventCursor(context.Context, string, string) (int64, error) {
+	unexpected(f.t, "SessionEventCursor")
+	return 0, nil
+}
+
+func (f *fakeSessionReader) ListSessionEvents(context.Context, string, string, int64) ([]sessions.SessionChange, error) {
+	unexpected(f.t, "ListSessionEvents")
+	return nil, nil
+}
+
+func (f *fakeSessionReader) GetTurnDiagnosticsSnapshot(context.Context, string, string, string) (sessions.TurnDiagnosticsSnapshot, error) {
+	unexpected(f.t, "GetTurnDiagnosticsSnapshot")
+	return sessions.TurnDiagnosticsSnapshot{}, nil
+}
+
+func (f *fakeSessionReader) GetSessionExecutionConfiguration(context.Context, string, string) (v1.SessionExecutionConfiguration, error) {
+	unexpected(f.t, "GetSessionExecutionConfiguration")
+	return v1.SessionExecutionConfiguration{}, nil
+}
+
+func (f *fakeSessionReader) GetManagedSessionArchive(context.Context, string, string) (sessions.ManagedArchive, error) {
+	unexpected(f.t, "GetManagedSessionArchive")
+	return sessions.ManagedArchive{}, nil
+}
diff --git a/services/core/internal/runtimeobs/storeresolver/resolver.go b/services/core/internal/deployment/observation.go
similarity index 79%
rename from services/core/internal/runtimeobs/storeresolver/resolver.go
rename to services/core/internal/deployment/observation.go
index 8f7e8e8dd..b4871624e 100644
--- a/services/core/internal/runtimeobs/storeresolver/resolver.go
+++ b/services/core/internal/deployment/observation.go
@@ -1,4 +1,4 @@
-package storeresolver
+package deployment
 
 import (
 	"bytes"
@@ -8,36 +8,26 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-type sessionStore interface {
-	GetSession(context.Context, string, string) (sessions.Session, error)
-	MeasuredSessionUsage(context.Context, string, string) (json.RawMessage, error)
+// ObservationResolver resolves a Session to the Runtime observation target of
+// its Environment and allocation, and lists the hosted Sessions to observe.
+type ObservationResolver struct {
+	sessions sessions.SessionReader
+	reader   Reader
 }
 
-// allocationReader is the part of deployment.Reader the resolver reads.
-type allocationReader interface {
-	EnvironmentAllocation(context.Context, deployment.AllocationKey) (deployment.Allocation, error)
-	ObservationSessions(context.Context, string, int) (deployment.ObservationSessionPage, error)
-}
-
-type Resolver struct {
-	store       sessionStore
-	allocations allocationReader
-}
-
-func NewResolver(s sessionStore, allocations allocationReader) (*Resolver, error) {
-	if s == nil || allocations == nil {
+func NewObservationResolver(sessionReader sessions.SessionReader, reader Reader) (*ObservationResolver, error) {
+	if sessionReader == nil || reader == nil {
 		return nil, errors.New("Runtime observation store is required")
 	}
-	return &Resolver{store: s, allocations: allocations}, nil
+	return &ObservationResolver{sessions: sessionReader, reader: reader}, nil
 }
 
-func (r *Resolver) Resolve(ctx context.Context, tenantID, sessionID string) (runtimeobs.Target, error) {
-	session, err := r.store.GetSession(ctx, tenantID, sessionID)
+func (r *ObservationResolver) Resolve(ctx context.Context, tenantID, sessionID string) (runtimeobs.Target, error) {
+	session, err := r.sessions.GetSession(ctx, tenantID, sessionID)
 	if err != nil {
 		return runtimeobs.Target{}, fmt.Errorf("resolve Runtime Session: %w", err)
 	}
@@ -52,7 +42,7 @@ func (r *Resolver) Resolve(ctx context.Context, tenantID, sessionID string) (run
 	target := runtimeobs.Target{TenantID: session.TenantID, SessionID: session.ID, Mode: runtimeobs.Mode(configuration.Environment.Type)}
 	// Telemetry counts measured usage continuously, including active Turns.
 	// Public Session usage stays null until every root Turn ends measured.
-	measured, err := r.store.MeasuredSessionUsage(ctx, session.TenantID, session.ID)
+	measured, err := r.sessions.MeasuredSessionUsage(ctx, session.TenantID, session.ID)
 	if err != nil {
 		return runtimeobs.Target{}, fmt.Errorf("resolve Runtime Session usage: %w", err)
 	}
@@ -84,8 +74,8 @@ func (r *Resolver) Resolve(ctx context.Context, tenantID, sessionID string) (run
 			return runtimeobs.Target{}, errors.New("managed Environment does not match resolved ownership")
 		}
 		target.EnvironmentID = session.Environment.ID
-		allocation, err := r.allocations.EnvironmentAllocation(ctx, deployment.AllocationKey{TenantID: tenantID, EnvironmentID: target.EnvironmentID})
-		if errors.Is(err, deployment.ErrNotFound) {
+		allocation, err := r.reader.EnvironmentAllocation(ctx, AllocationKey{TenantID: tenantID, EnvironmentID: target.EnvironmentID})
+		if errors.Is(err, ErrNotFound) {
 			return target, runtimeobs.ErrUnavailable
 		}
 		if err != nil {
@@ -153,8 +143,8 @@ func decodeTokenUsage(raw json.RawMessage) (*runtimeobs.TokenUsage, error) {
 	return &runtimeobs.TokenUsage{InputTokens: uint64(*usage.InputTokens), OutputTokens: uint64(*usage.OutputTokens)}, nil
 }
 
-func (r *Resolver) ListRuntimeObservationSessions(ctx context.Context, after string, limit int) (runtimeobs.SessionPage, error) {
-	page, err := r.allocations.ObservationSessions(ctx, after, limit)
+func (r *ObservationResolver) ListRuntimeObservationSessions(ctx context.Context, after string, limit int) (runtimeobs.SessionPage, error) {
+	page, err := r.reader.ObservationSessions(ctx, after, limit)
 	if err != nil {
 		return runtimeobs.SessionPage{}, err
 	}
diff --git a/services/core/internal/runtimeobs/storeresolver/resolver_test.go b/services/core/internal/deployment/observation_test.go
similarity index 70%
rename from services/core/internal/runtimeobs/storeresolver/resolver_test.go
rename to services/core/internal/deployment/observation_test.go
index 593d6283a..b84bc1c57 100644
--- a/services/core/internal/runtimeobs/storeresolver/resolver_test.go
+++ b/services/core/internal/deployment/observation_test.go
@@ -1,4 +1,4 @@
-package storeresolver
+package deployment
 
 import (
 	"context"
@@ -6,44 +6,39 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
+// resolverStore is the Session and the deployment reads one resolution sees.
 type resolverStore struct {
 	session       sessions.Session
 	measured      json.RawMessage
-	allocation    deployment.Allocation
+	allocation    Allocation
 	allocationErr error
-	page          deployment.ObservationSessionPage
+	page          ObservationSessionPage
 }
 
-func (s resolverStore) GetSession(context.Context, string, string) (sessions.Session, error) {
-	return s.session, nil
-}
-
-func (s resolverStore) MeasuredSessionUsage(_ context.Context, tenant, session string) (json.RawMessage, error) {
-	if tenant != s.session.TenantID || session != s.session.ID {
-		return nil, errors.New("measured usage read for another Session")
+func newTestResolver(t *testing.T, s resolverStore) (*ObservationResolver, error) {
+	reader := &fakeReader{t: t,
+		environmentAllocation: func(context.Context, AllocationKey) (Allocation, error) { return s.allocation, s.allocationErr },
+		observationSessions:   func(context.Context, string, int) (ObservationSessionPage, error) { return s.page, nil },
 	}
-	return s.measured, nil
-}
-
-func (s resolverStore) EnvironmentAllocation(context.Context, deployment.AllocationKey) (deployment.Allocation, error) {
-	return s.allocation, s.allocationErr
-}
-
-func (s resolverStore) ObservationSessions(context.Context, string, int) (deployment.ObservationSessionPage, error) {
-	return s.page, nil
+	sessionReader := &fakeSessionReader{t: t,
+		getSession: func(context.Context, string, string) (sessions.Session, error) { return s.session, nil },
+		measuredSessionUsage: func(_ context.Context, tenant, session string) (json.RawMessage, error) {
+			if tenant != s.session.TenantID || session != s.session.ID {
+				t.Fatalf("measured usage read for another Session: %s/%s", tenant, session)
+			}
+			return s.measured, nil
+		},
+	}
+	return NewObservationResolver(sessionReader, reader)
 }
 
-// newTestResolver serves the Session and the deployment reads from one fake.
-func newTestResolver(s resolverStore) (*Resolver, error) { return NewResolver(s, s) }
-
-func TestResolverListsOnlyProviderNeutralSessionIdentity(t *testing.T) {
-	r, err := newTestResolver(resolverStore{page: deployment.ObservationSessionPage{
-		Sessions:   []deployment.ObservationSession{{TenantID: "tenant", SessionID: "session"}},
+func TestObservationResolverListsOnlyProviderNeutralSessionIdentity(t *testing.T) {
+	r, err := newTestResolver(t, resolverStore{page: ObservationSessionPage{
+		Sessions:   []ObservationSession{{TenantID: "tenant", SessionID: "session"}},
 		NextCursor: "session",
 	}})
 	if err != nil {
@@ -55,11 +50,11 @@ func TestResolverListsOnlyProviderNeutralSessionIdentity(t *testing.T) {
 	}
 }
 
-func TestResolverBindsManagedSessionEnvironmentAndAllocation(t *testing.T) {
-	r, err := newTestResolver(resolverStore{
+func TestObservationResolverBindsManagedSessionEnvironmentAndAllocation(t *testing.T) {
+	r, err := newTestResolver(t, resolverStore{
 		session:  sessions.Session{ID: "session", TenantID: "tenant", Configuration: []byte(`{"environment":{"type":"openai_hosted"}}`), Environment: &sessions.Environment{ID: "environment", TenantID: "tenant", SessionID: "session"}},
 		measured: []byte(`{"input_tokens":120,"input_tokens_details":{"cached_tokens":20},"output_tokens":30,"output_tokens_details":{"reasoning_tokens":10},"total_tokens":150}`),
-		allocation: deployment.Allocation{
+		allocation: Allocation{
 			ID: "allocation", TenantID: "tenant", SessionID: "session", EnvironmentID: "environment",
 			ProviderKey: "provider", DeviceID: "device", ComputePhase: "running", ComputeState: []byte(`{"current":{"name":"sandbox"}}`),
 		},
@@ -85,7 +80,7 @@ func TestResolverBindsManagedSessionEnvironmentAndAllocation(t *testing.T) {
 	}
 }
 
-func TestResolverRejectsInvalidCanonicalSessionUsage(t *testing.T) {
+func TestObservationResolverRejectsInvalidCanonicalSessionUsage(t *testing.T) {
 	for _, usage := range []string{
 		`{"input_tokens":2,"input_tokens_details":{"cached_tokens":0},"output_tokens":3,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":4}`,
 		`{}`,
@@ -93,7 +88,7 @@ func TestResolverRejectsInvalidCanonicalSessionUsage(t *testing.T) {
 		`{"input_tokens":0,"input_tokens_details":{"cached_tokens":-1},"output_tokens":0,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":0}`,
 		`{"input_tokens":0,"input_tokens_details":{"cached_tokens":0},"output_tokens":0,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":0,"unknown":0}`,
 	} {
-		resolver, err := newTestResolver(resolverStore{session: sessions.Session{
+		resolver, err := newTestResolver(t, resolverStore{session: sessions.Session{
 			ID: "session", TenantID: "tenant", Configuration: []byte(`{"environment":{"type":"none"}}`),
 		}, measured: []byte(usage)})
 		if err != nil {
@@ -105,8 +100,8 @@ func TestResolverRejectsInvalidCanonicalSessionUsage(t *testing.T) {
 	}
 }
 
-func TestResolverKeepsNullCanonicalSessionUsageAbsent(t *testing.T) {
-	resolver, err := newTestResolver(resolverStore{session: sessions.Session{
+func TestObservationResolverKeepsNullCanonicalSessionUsageAbsent(t *testing.T) {
+	resolver, err := newTestResolver(t, resolverStore{session: sessions.Session{
 		ID: "session", TenantID: "tenant", Configuration: []byte(`{"environment":{"type":"none"}}`),
 	}, measured: []byte(" \n null \t")})
 	if err != nil {
@@ -120,7 +115,7 @@ func TestResolverKeepsNullCanonicalSessionUsageAbsent(t *testing.T) {
 
 // Telemetry reads measured usage, not the public Session value, which stays
 // null while a root Turn runs.
-func TestResolverUsesMeasuredRatherThanPublicSessionUsage(t *testing.T) {
+func TestObservationResolverUsesMeasuredRatherThanPublicSessionUsage(t *testing.T) {
 	measured := `{"input_tokens":7,"input_tokens_details":{"cached_tokens":0},"output_tokens":3,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":10}`
 	for _, test := range []struct {
 		public, measured string
@@ -129,7 +124,7 @@ func TestResolverUsesMeasuredRatherThanPublicSessionUsage(t *testing.T) {
 		{"null", measured, &runtimeobs.TokenUsage{InputTokens: 7, OutputTokens: 3}},
 		{measured, "null", nil},
 	} {
-		resolver, err := newTestResolver(resolverStore{session: sessions.Session{
+		resolver, err := newTestResolver(t, resolverStore{session: sessions.Session{
 			ID: "session", TenantID: "tenant", Configuration: []byte(`{"environment":{"type":"none"}}`), Usage: []byte(test.public),
 		}, measured: []byte(test.measured)})
 		if err != nil {
@@ -142,7 +137,7 @@ func TestResolverUsesMeasuredRatherThanPublicSessionUsage(t *testing.T) {
 	}
 }
 
-func TestResolverKeepsUnsupportedModesDistinct(t *testing.T) {
+func TestObservationResolverKeepsUnsupportedModesDistinct(t *testing.T) {
 	for _, tc := range []struct {
 		mode        string
 		environment *sessions.Environment
@@ -150,7 +145,7 @@ func TestResolverKeepsUnsupportedModesDistinct(t *testing.T) {
 		{mode: "none"},
 		{mode: "self_hosted", environment: &sessions.Environment{ID: "environment", TenantID: "tenant", SessionID: "session"}},
 	} {
-		r, err := newTestResolver(resolverStore{session: sessions.Session{ID: "session", TenantID: "tenant", Configuration: []byte(`{"environment":{"type":"` + tc.mode + `"}}`), Environment: tc.environment}})
+		r, err := newTestResolver(t, resolverStore{session: sessions.Session{ID: "session", TenantID: "tenant", Configuration: []byte(`{"environment":{"type":"` + tc.mode + `"}}`), Environment: tc.environment}})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -161,10 +156,10 @@ func TestResolverKeepsUnsupportedModesDistinct(t *testing.T) {
 	}
 }
 
-func TestResolverReportsManagedAllocationAsUnavailable(t *testing.T) {
-	r, err := newTestResolver(resolverStore{
+func TestObservationResolverReportsManagedAllocationAsUnavailable(t *testing.T) {
+	r, err := newTestResolver(t, resolverStore{
 		session:       sessions.Session{ID: "session", TenantID: "tenant", Configuration: []byte(`{"environment":{"type":"openai_hosted"}}`), Environment: &sessions.Environment{ID: "environment", TenantID: "tenant", SessionID: "session"}},
-		allocationErr: deployment.ErrNotFound,
+		allocationErr: ErrNotFound,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -175,13 +170,13 @@ func TestResolverReportsManagedAllocationAsUnavailable(t *testing.T) {
 	}
 }
 
-func TestResolverRejectsMismatchedEnvironmentOwnership(t *testing.T) {
+func TestObservationResolverRejectsMismatchedEnvironmentOwnership(t *testing.T) {
 	for _, mode := range []string{"self_hosted", "openai_hosted"} {
 		for _, environment := range []sessions.Environment{
 			{ID: "environment", TenantID: "other", SessionID: "session"},
 			{ID: "environment", TenantID: "tenant", SessionID: "other"},
 		} {
-			resolver, err := newTestResolver(resolverStore{session: sessions.Session{
+			resolver, err := newTestResolver(t, resolverStore{session: sessions.Session{
 				ID: "session", TenantID: "tenant",
 				Configuration: []byte(`{"environment":{"type":"` + mode + `"}}`), Environment: &environment,
 			}})
@@ -195,19 +190,19 @@ func TestResolverRejectsMismatchedEnvironmentOwnership(t *testing.T) {
 	}
 }
 
-func TestResolverRejectsMismatchedAllocationOwnership(t *testing.T) {
-	base := deployment.Allocation{
+func TestObservationResolverRejectsMismatchedAllocationOwnership(t *testing.T) {
+	base := Allocation{
 		ID: "allocation", TenantID: "tenant", SessionID: "session", EnvironmentID: "environment",
 		ProviderKey: "provider", DeviceID: "device",
 	}
-	for _, mutate := range []func(*deployment.Allocation){
-		func(value *deployment.Allocation) { value.TenantID = "other" },
-		func(value *deployment.Allocation) { value.SessionID = "other" },
-		func(value *deployment.Allocation) { value.EnvironmentID = "other" },
+	for _, mutate := range []func(*Allocation){
+		func(value *Allocation) { value.TenantID = "other" },
+		func(value *Allocation) { value.SessionID = "other" },
+		func(value *Allocation) { value.EnvironmentID = "other" },
 	} {
 		allocation := base
 		mutate(&allocation)
-		resolver, err := newTestResolver(resolverStore{
+		resolver, err := newTestResolver(t, resolverStore{
 			session: sessions.Session{
 				ID: "session", TenantID: "tenant", Configuration: []byte(`{"environment":{"type":"openai_hosted"}}`),
 				Environment: &sessions.Environment{ID: "environment", TenantID: "tenant", SessionID: "session"},
diff --git a/services/core/internal/deployment/session_archive.go b/services/core/internal/deployment/session_archive.go
new file mode 100644
index 000000000..d2b2578fd
--- /dev/null
+++ b/services/core/internal/deployment/session_archive.go
@@ -0,0 +1,144 @@
+package deployment
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+// ArchiveSession ends the lifetime of a hosted Session's Environment while
+// keeping the public Session, its history and persisted files. It cancels the
+// Session's work, revokes the allocation's device and requests its cleanup;
+// the lifecycle performs the provider work, and only its confirmation releases
+// the allocation. expectedGeneration must be the current generation of the Web
+// managed deployment.
+func (e *ExecutionOperations) ArchiveSession(ctx context.Context, tenantID, sessionID string, expectedGeneration uint64) (sessions.ManagedArchive, error) {
+	return e.archiveSession(ctx, tenantID, sessionID, expectedGeneration, nil)
+}
+
+// ArchiveResetSession archives a hosted Session for the running reset, which
+// its generation and request time identify, so that a cancelled reset's
+// candidates never affect its successor. An automatic reset skips a busy
+// Session with ErrSandboxResetSessionBusy; an Environment that already ended
+// only reports its disposal. The archive is audited with the reset's
+// administrator source.
+func (e *ExecutionOperations) ArchiveResetSession(ctx context.Context, tenantID, sessionID string, generation uint64, requestedAt time.Time) (sessions.ManagedArchive, error) {
+	return e.archiveSession(ctx, tenantID, sessionID, generation, &requestedAt)
+}
+
+func (e *ExecutionOperations) archiveSession(ctx context.Context, tenantID, sessionID string, generation uint64, resetRequestedAt *time.Time) (sessions.ManagedArchive, error) {
+	var result sessions.ManagedArchive
+	err := e.storage.WithSessionArchive(ctx, tenantID, sessionID, func(ctx context.Context, locked sessions.LockedSession, tx SessionArchiveTx) error {
+		if err := locked.Public(); err != nil {
+			return err
+		}
+		d, err := tx.LoadDeployment()
+		if err != nil {
+			return err
+		}
+		if err := checkArchiveDeployment(d, generation); err != nil {
+			return err
+		}
+		environment, err := tx.LoadEnvironment(ctx)
+		if errors.Is(err, sessions.ErrNotFound) {
+			return sessions.ErrInvalidInput
+		}
+		if err != nil {
+			return err
+		}
+		if kind, err := sessions.EnvironmentType(environment.Configuration); err != nil || kind != "openai_hosted" {
+			return sessions.ErrInvalidInput
+		}
+		ended := environment.Status == "failed" || environment.Status == "expired"
+		if resetRequestedAt != nil {
+			if err := checkArchiveReset(d, *resetRequestedAt); err != nil {
+				return err
+			}
+			if d.Reset.Clear == ResetAuto {
+				busy, err := tx.LoadResetBusy()
+				if err != nil {
+					return err
+				}
+				if busy {
+					return ErrSandboxResetSessionBusy
+				}
+			}
+			if ended {
+				result, err = tx.LoadArchive(ctx)
+				return err
+			}
+			source, err := tx.LoadResetSource()
+			if err != nil {
+				return err
+			}
+			if source.ProjectID, err = tx.LoadProject(); err != nil {
+				return err
+			}
+			ctx = adminaudit.WithSource(ctx, source)
+		}
+		current, allocated, err := tx.FindAllocation(environment.ID)
+		if err != nil {
+			return err
+		}
+		live := allocated && current.State != "released"
+		if live && current.ProviderKey != d.InstallationID {
+			return ErrConflict
+		}
+		if err := sessions.TrackInputActivity(ctx, tx, func(ctx context.Context) error {
+			if !ended {
+				if err := tx.ExpireEnvironment(ctx, environment.ID); err != nil {
+					return err
+				}
+			}
+			return sessions.CancelWork(ctx, tx)
+		}); err != nil {
+			return err
+		}
+		if live {
+			if err := tx.RequestArchiveCleanup(current); err != nil {
+				return err
+			}
+		} else if !allocated {
+			if err := tx.ReleasePlacement(); err != nil {
+				return err
+			}
+		}
+		if err := tx.RecordArchiveAudit(ctx); err != nil {
+			return err
+		}
+		result, err = tx.LoadArchive(ctx)
+		return err
+	})
+	if err != nil {
+		return sessions.ManagedArchive{}, err
+	}
+	return result, nil
+}
+
+// checkArchiveDeployment rejects an archive against a deployment whose
+// generation is not the expected one, that Web does not manage or that has no
+// provider.
+func checkArchiveDeployment(d Record, expectedGeneration uint64) error {
+	if d.Generation != expectedGeneration {
+		return &GenerationStaleError{CurrentGeneration: d.Generation}
+	}
+	if !d.WebManaged || d.InstallationID == "" {
+		return ErrConflict
+	}
+	if d.Provider == "" {
+		return ErrNotConfigured
+	}
+	return nil
+}
+
+// checkArchiveReset rejects a reset archive unless the reset requested at
+// requestedAt is still running.
+func checkArchiveReset(d Record, requestedAt time.Time) error {
+	if d.Reset == nil || !d.Reset.RequestedAt.Equal(requestedAt) {
+		return ErrConflict
+	}
+	return nil
+}
diff --git a/services/core/internal/deployment/session_archive_test.go b/services/core/internal/deployment/session_archive_test.go
new file mode 100644
index 000000000..3ebbd7cdb
--- /dev/null
+++ b/services/core/internal/deployment/session_archive_test.go
@@ -0,0 +1,322 @@
+package deployment
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"slices"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+func TestCheckArchiveDeployment(t *testing.T) {
+	managed := Record{InstallationID: "installation", WebManaged: true, Provider: "docker", Generation: 4}
+	for name, test := range map[string]struct {
+		change func(*Record)
+		want   error
+	}{
+		"current":          {func(*Record) {}, nil},
+		"stale generation": {func(d *Record) { d.Generation = 5; d.WebManaged = false }, &GenerationStaleError{CurrentGeneration: 5}},
+		"process managed":  {func(d *Record) { d.WebManaged = false; d.Provider = "" }, ErrConflict},
+		"no installation":  {func(d *Record) { d.InstallationID = "" }, ErrConflict},
+		"no provider":      {func(d *Record) { d.Provider = "" }, ErrNotConfigured},
+	} {
+		d := managed
+		test.change(&d)
+		err := checkArchiveDeployment(d, 4)
+		var stale *GenerationStaleError
+		switch want := test.want.(type) {
+		case nil:
+			if err != nil {
+				t.Errorf("%s: %v", name, err)
+			}
+		case *GenerationStaleError:
+			if !errors.As(err, &stale) || stale.CurrentGeneration != want.CurrentGeneration {
+				t.Errorf("%s: got %v, want stale generation %d", name, err, want.CurrentGeneration)
+			}
+		default:
+			if !errors.Is(err, want) || errors.As(err, &stale) {
+				t.Errorf("%s: got %v, want %v", name, err, want)
+			}
+		}
+	}
+}
+
+func TestCheckArchiveReset(t *testing.T) {
+	requested := time.Unix(100, 0)
+	for name, test := range map[string]struct {
+		reset *ResetState
+		want  error
+	}{
+		"running reset":   {&ResetState{Clear: ResetAuto, RequestedAt: requested}, nil},
+		"no reset":        {nil, ErrConflict},
+		"another request": {&ResetState{Clear: ResetAuto, RequestedAt: requested.Add(time.Second)}, ErrConflict},
+	} {
+		if err := checkArchiveReset(Record{Reset: test.reset}, requested); !errors.Is(err, test.want) {
+			t.Errorf("%s: got %v, want %v", name, err, test.want)
+		}
+	}
+}
+
+// fakeArchiveTx is a Session archive over fixed facts. Each method records
+// its call; a test asserts the exact call log. The Session's Turn and input
+// reads fail the test unless it settles the Session with idle.
+type fakeArchiveTx struct {
+	t                    testing.TB
+	calls                []string
+	deployment           Record
+	environment          *sessions.Environment
+	busy                 bool
+	allocation           *Allocation
+	loadActiveTurn       func() (sessions.Turn, bool, error)
+	cancelPendingInput   func() error
+	loadEnvironmentInput func() (*sessions.EnvironmentInputState, error)
+	// audited is the administrator source the audit was recorded with.
+	audited *adminaudit.Source
+}
+
+// idle settles a Session with no active Turn, pending input or input
+// activity change.
+func (f *fakeArchiveTx) idle() {
+	f.loadActiveTurn = func() (sessions.Turn, bool, error) { return sessions.Turn{}, false, nil }
+	f.cancelPendingInput = func() error { return nil }
+	f.loadEnvironmentInput = func() (*sessions.EnvironmentInputState, error) { return nil, nil }
+}
+
+func (f *fakeArchiveTx) record(call string) { f.calls = append(f.calls, call) }
+
+func (f *fakeArchiveTx) LoadDeployment() (Record, error) {
+	f.record("LoadDeployment")
+	return f.deployment, nil
+}
+
+func (f *fakeArchiveTx) LoadEnvironment(context.Context) (sessions.Environment, error) {
+	f.record("LoadEnvironment")
+	if f.environment == nil {
+		return sessions.Environment{}, sessions.ErrNotFound
+	}
+	return *f.environment, nil
+}
+
+func (f *fakeArchiveTx) ExpireEnvironment(_ context.Context, environment string) error {
+	f.record("ExpireEnvironment " + environment)
+	return nil
+}
+
+func (f *fakeArchiveTx) LoadResetBusy() (bool, error) {
+	f.record("LoadResetBusy")
+	return f.busy, nil
+}
+
+func (f *fakeArchiveTx) LoadResetSource() (adminaudit.Source, error) {
+	f.record("LoadResetSource")
+	return adminaudit.Source{CredentialID: "admin"}, nil
+}
+
+func (f *fakeArchiveTx) LoadProject() (string, error) {
+	f.record("LoadProject")
+	return "project", nil
+}
+
+func (f *fakeArchiveTx) FindAllocation(environment string) (Allocation, bool, error) {
+	f.record("FindAllocation " + environment)
+	if f.allocation == nil {
+		return Allocation{}, false, nil
+	}
+	return *f.allocation, true, nil
+}
+
+func (f *fakeArchiveTx) RequestArchiveCleanup(current Allocation) error {
+	f.record("RequestArchiveCleanup " + current.DeviceID + " " + current.ID)
+	return nil
+}
+
+func (f *fakeArchiveTx) ReleasePlacement() error {
+	f.record("ReleasePlacement")
+	return nil
+}
+
+func (f *fakeArchiveTx) RecordArchiveAudit(ctx context.Context) error {
+	f.record("RecordArchiveAudit")
+	if source, ok := adminaudit.FromContext(ctx); ok {
+		f.audited = &source
+	}
+	return nil
+}
+
+func (f *fakeArchiveTx) LoadArchive(context.Context) (sessions.ManagedArchive, error) {
+	f.record("LoadArchive")
+	return sessions.ManagedArchive{SessionID: "session", EnvironmentID: "environment", State: "cleanup_pending"}, nil
+}
+
+func (f *fakeArchiveTx) LoadActiveTurn(context.Context) (sessions.Turn, bool, error) {
+	f.record("LoadActiveTurn")
+	if f.loadActiveTurn == nil {
+		unexpected(f.t, "LoadActiveTurn")
+	}
+	return f.loadActiveTurn()
+}
+
+func (f *fakeArchiveTx) CancelPendingInput(context.Context) error {
+	f.record("CancelPendingInput")
+	if f.cancelPendingInput == nil {
+		unexpected(f.t, "CancelPendingInput")
+	}
+	return f.cancelPendingInput()
+}
+
+func (f *fakeArchiveTx) LoadEnvironmentInput(context.Context) (*sessions.EnvironmentInputState, error) {
+	f.record("LoadEnvironmentInput")
+	if f.loadEnvironmentInput == nil {
+		unexpected(f.t, "LoadEnvironmentInput")
+	}
+	return f.loadEnvironmentInput()
+}
+
+func (f *fakeArchiveTx) RequestTurnCancel(context.Context, string) error {
+	unexpected(f.t, "RequestTurnCancel")
+	return nil
+}
+
+func (f *fakeArchiveTx) LoadTurn(context.Context, string) (sessions.Turn, error) {
+	unexpected(f.t, "LoadTurn")
+	return sessions.Turn{}, nil
+}
+
+func (f *fakeArchiveTx) LoadEnding(context.Context, string) (sessions.Ending, error) {
+	unexpected(f.t, "LoadEnding")
+	return sessions.Ending{}, nil
+}
+
+func (f *fakeArchiveTx) ApplyTurnEnd(context.Context, string, sessions.TurnEnd) error {
+	unexpected(f.t, "ApplyTurnEnd")
+	return nil
+}
+
+func (f *fakeArchiveTx) LoadUsage(context.Context) (json.RawMessage, error) {
+	unexpected(f.t, "LoadUsage")
+	return nil, nil
+}
+
+func (f *fakeArchiveTx) AppendChanges(context.Context, ...sessions.SessionChange) error {
+	unexpected(f.t, "AppendChanges")
+	return nil
+}
+
+// archiveOperations builds execution operations whose Session archives run on
+// tx with locked.
+func archiveOperations(t *testing.T, tx *fakeArchiveTx, locked sessions.LockedSession) *ExecutionOperations {
+	t.Helper()
+	storage := &fakeExecutionStorage{t: t, withSessionArchive: func(ctx context.Context, tenantID, sessionID string, apply func(context.Context, sessions.LockedSession, SessionArchiveTx) error) error {
+		if tenantID != "tenant" || sessionID != "session" {
+			t.Fatalf("archived %s/%s", tenantID, sessionID)
+		}
+		return apply(ctx, locked, tx)
+	}}
+	operations, err := NewExecutionOperations(newService(t, &fakeStorage{t: t}, &fakeReader{t: t}, testPublicURL), storage)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return operations
+}
+
+func TestArchiveSession(t *testing.T) {
+	managed := Record{InstallationID: "installation", WebManaged: true, Provider: "docker", Generation: 1}
+	hosted := &sessions.Environment{ID: "environment", Status: "connected", Configuration: json.RawMessage(`{"type":"openai_hosted"}`)}
+	expired := &sessions.Environment{ID: "environment", Status: "expired", Configuration: hosted.Configuration}
+	live := &Allocation{ID: "allocation", DeviceID: "device", ProviderKey: "installation", State: "running"}
+	settle := []string{"LoadEnvironmentInput", "LoadActiveTurn", "CancelPendingInput", "LoadEnvironmentInput"}
+	expire := append([]string{"LoadEnvironmentInput", "ExpireEnvironment environment"}, settle[1:]...)
+	head := []string{"LoadDeployment", "LoadEnvironment", "FindAllocation environment"}
+	join := func(parts ...[]string) []string {
+		var calls []string
+		for _, part := range parts {
+			calls = append(calls, part...)
+		}
+		return calls
+	}
+	for _, test := range []struct {
+		name        string
+		locked      sessions.LockedSession
+		environment *sessions.Environment
+		allocation  *Allocation
+		want        error
+		calls       []string
+	}{
+		{"live allocation", sessions.LockedSession{}, hosted, live, nil,
+			join(head, expire, []string{"RequestArchiveCleanup device allocation", "RecordArchiveAudit", "LoadArchive"})},
+		{"no allocation", sessions.LockedSession{}, hosted, nil, nil, join(head, expire, []string{"ReleasePlacement", "RecordArchiveAudit", "LoadArchive"})},
+		{"released allocation", sessions.LockedSession{}, hosted, &Allocation{ID: "allocation", ProviderKey: "previous", State: "released"}, nil,
+			join(head, expire, []string{"RecordArchiveAudit", "LoadArchive"})},
+		{"ended Environment", sessions.LockedSession{}, expired, live, nil,
+			join(head, settle, []string{"RequestArchiveCleanup device allocation", "RecordArchiveAudit", "LoadArchive"})},
+		{"allocation of another installation", sessions.LockedSession{}, hosted, &Allocation{ID: "allocation", ProviderKey: "previous", State: "running"}, ErrConflict, head},
+		{"deleted Session", sessions.LockedSession{Deleted: true}, hosted, nil, sessions.ErrNotFound, nil},
+		{"no Environment", sessions.LockedSession{}, nil, nil, sessions.ErrInvalidInput, head[:2]},
+		{"self-hosted Environment", sessions.LockedSession{}, &sessions.Environment{ID: "environment", Configuration: json.RawMessage(`{"type":"self_hosted"}`)}, nil, sessions.ErrInvalidInput, head[:2]},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			tx := &fakeArchiveTx{t: t, deployment: managed, environment: test.environment, allocation: test.allocation}
+			if slices.Contains(test.calls, "LoadActiveTurn") {
+				tx.idle()
+			}
+			result, err := archiveOperations(t, tx, test.locked).ArchiveSession(t.Context(), "tenant", "session", 1)
+			if test.want == nil && (err != nil || result.State != "cleanup_pending") || test.want != nil && !errors.Is(err, test.want) {
+				t.Fatalf("got %v %v, want %v", result, err, test.want)
+			}
+			if strings.Join(tx.calls, "\n") != strings.Join(test.calls, "\n") {
+				t.Fatalf("calls %q, want %q", tx.calls, test.calls)
+			}
+			if tx.audited != nil {
+				t.Fatal("an administrator archive borrowed a reset source", tx.audited)
+			}
+		})
+	}
+}
+
+func TestArchiveResetSession(t *testing.T) {
+	requested := time.Unix(100, 0)
+	resetting := func(clear string) Record {
+		return Record{InstallationID: "installation", WebManaged: true, Provider: "docker", Generation: 1, Reset: &ResetState{Clear: clear, RequestedAt: requested}}
+	}
+	hosted := &sessions.Environment{ID: "environment", Status: "connected", Configuration: json.RawMessage(`{"type":"openai_hosted"}`)}
+	failed := &sessions.Environment{ID: "environment", Status: "failed", Configuration: hosted.Configuration}
+	for _, test := range []struct {
+		name        string
+		deployment  Record
+		environment *sessions.Environment
+		busy        bool
+		requested   time.Time
+		want        error
+		calls       []string
+	}{
+		{"idle Session", resetting(ResetAuto), hosted, false, requested, nil,
+			[]string{"LoadDeployment", "LoadEnvironment", "LoadResetBusy", "LoadResetSource", "LoadProject", "FindAllocation environment", "LoadEnvironmentInput", "ExpireEnvironment environment", "LoadActiveTurn", "CancelPendingInput", "LoadEnvironmentInput", "ReleasePlacement", "RecordArchiveAudit", "LoadArchive"}},
+		{"busy Session", resetting(ResetAuto), hosted, true, requested, ErrSandboxResetSessionBusy, []string{"LoadDeployment", "LoadEnvironment", "LoadResetBusy"}},
+		{"forced busy Session", resetting(ResetForce), hosted, true, requested, nil,
+			[]string{"LoadDeployment", "LoadEnvironment", "LoadResetSource", "LoadProject", "FindAllocation environment", "LoadEnvironmentInput", "ExpireEnvironment environment", "LoadActiveTurn", "CancelPendingInput", "LoadEnvironmentInput", "ReleasePlacement", "RecordArchiveAudit", "LoadArchive"}},
+		{"ended Environment", resetting(ResetAuto), failed, false, requested, nil, []string{"LoadDeployment", "LoadEnvironment", "LoadResetBusy", "LoadArchive"}},
+		{"another reset", resetting(ResetAuto), hosted, false, requested.Add(time.Second), ErrConflict, []string{"LoadDeployment", "LoadEnvironment"}},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			tx := &fakeArchiveTx{t: t, deployment: test.deployment, environment: test.environment, busy: test.busy}
+			if slices.Contains(test.calls, "LoadActiveTurn") {
+				tx.idle()
+			}
+			_, err := archiveOperations(t, tx, sessions.LockedSession{}).ArchiveResetSession(t.Context(), "tenant", "session", 1, test.requested)
+			if test.want == nil && err != nil || test.want != nil && !errors.Is(err, test.want) {
+				t.Fatalf("got %v, want %v", err, test.want)
+			}
+			if strings.Join(tx.calls, "\n") != strings.Join(test.calls, "\n") {
+				t.Fatalf("calls %q, want %q", tx.calls, test.calls)
+			}
+			if audited := tx.audited; test.want == nil && strings.Contains(strings.Join(test.calls, ","), "RecordArchiveAudit") && (audited == nil || audited.CredentialID != "admin" || audited.ProjectID != "project") {
+				t.Fatal("reset archive was not audited with the reset source", audited)
+			}
+		})
+	}
+}
diff --git a/services/core/internal/deployment/storage.go b/services/core/internal/deployment/storage.go
index 399c98d88..20cff0768 100644
--- a/services/core/internal/deployment/storage.go
+++ b/services/core/internal/deployment/storage.go
@@ -61,6 +61,11 @@ type ExecutionStorage interface {
 	// missing allocation is ErrNotFound.
 	WithAllocation(ctx context.Context, key AllocationKey, apply func(AllocationTx) error) error
 	AllocationCleanupStorage
+	// WithSessionArchive runs apply in one leased transaction that locks the
+	// tenant's Session, deleted or not, and then prunes the Session's journal.
+	// It commits only when both succeed. A malformed tenant is
+	// ErrInvalidInput; a malformed or missing Session is sessions.ErrNotFound.
+	WithSessionArchive(ctx context.Context, tenantID, sessionID string, apply func(context.Context, sessions.LockedSession, SessionArchiveTx) error) error
 	// ClearWake clears the allocation's wake request unless activity newer
 	// than observed arrived. It runs on the lease.
 	ClearWake(ctx context.Context, allocationID string, observed time.Time) error
@@ -133,6 +138,47 @@ type AllocationCleanupTx interface {
 	RequestCleanup(current Allocation) (Allocation, error)
 }
 
+// SessionArchiveTx is one Session-locked archive of the Session's hosted
+// Environment, with the Session's cancellation bound to the same transaction.
+type SessionArchiveTx interface {
+	sessions.CancellationTx
+	sessions.InputActivityTx
+	// LoadDeployment locks the deployment and returns it. The Session lock
+	// precedes it, as in Turn, allocation and input admission.
+	LoadDeployment() (Record, error)
+	// LoadEnvironment reads the Session's Environment.
+	LoadEnvironment(ctx context.Context) (sessions.Environment, error)
+	// ExpireEnvironment sets the status of the Session's Environment to
+	// expired.
+	ExpireEnvironment(ctx context.Context, environment string) error
+	// LoadResetBusy reports whether the Session has an in-progress or waiting
+	// Turn or subagent Turn, or a pending Environment file write, which an
+	// automatic reset does not archive.
+	LoadResetBusy() (bool, error)
+	// LoadResetSource returns the administrator source that started the
+	// running reset.
+	LoadResetSource() (adminaudit.Source, error)
+	// LoadProject returns the ID of the tenant's Project.
+	LoadProject() (string, error)
+	// FindAllocation returns the Environment's allocation and whether it has
+	// one.
+	FindAllocation(environment string) (Allocation, bool, error)
+	// RequestArchiveCleanup revokes the allocation's device and records that
+	// its resources await cleanup. The device's first revocation records the
+	// Session's active Turn whose cancellation was requested, which the
+	// archived cancellation receipt reports.
+	RequestArchiveCleanup(current Allocation) error
+	// ReleasePlacement releases the node placement of the Session's
+	// Environments that have no allocation.
+	ReleasePlacement() error
+	// RecordArchiveAudit records the administrator audit of the archive with
+	// the source on ctx.
+	RecordArchiveAudit(ctx context.Context) error
+	// LoadArchive reads the resource disposal of the Session's hosted
+	// Environment.
+	LoadArchive(ctx context.Context) (sessions.ManagedArchive, error)
+}
+
 // Reader answers deployment and node queries.
 type Reader interface {
 	// Deployment returns the stored deployment.
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index eda95d545..822676a52 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -148,7 +148,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 				}
 				defer release()
 			}
-			if _, err := writer.ArchiveManagedSession(audit, project.TenantID, session.ID, 1); err != nil {
+			if _, err := leased.Deployment.ArchiveSession(audit, project.TenantID, session.ID, 1); err != nil {
 				t.Fatal(err)
 			}
 			owner, err = reader.EnvironmentAllocation(t.Context(), key)
diff --git a/services/core/internal/execution/deployment_fixture_test.go b/services/core/internal/execution/deployment_fixture_test.go
index 2c21c8010..94bacf49e 100644
--- a/services/core/internal/execution/deployment_fixture_test.go
+++ b/services/core/internal/execution/deployment_fixture_test.go
@@ -255,6 +255,10 @@ func (s *strictExecutionStorage) WithAllocationCleanup(ctx context.Context, key
 	return s.withAllocationCleanup(ctx, key, apply)
 }
 
+func (s *strictExecutionStorage) WithSessionArchive(context.Context, string, string, func(context.Context, sessions.LockedSession, deployment.SessionArchiveTx) error) error {
+	return unexpectedDeploymentCall(s.t, "WithSessionArchive")
+}
+
 func (s *strictExecutionStorage) ClearWake(ctx context.Context, allocationID string, observed time.Time) error {
 	if s.clearWake == nil {
 		return unexpectedDeploymentCall(s.t, "ClearWake")
diff --git a/services/core/internal/execution/dispatcher.go b/services/core/internal/execution/dispatcher.go
index 12710583e..d1e06b423 100644
--- a/services/core/internal/execution/dispatcher.go
+++ b/services/core/internal/execution/dispatcher.go
@@ -75,7 +75,7 @@ type Result struct {
 
 // Run claims once before subscribing or sending. Uncertain deliveries are not replayed.
 func (d *Dispatcher) Run(ctx context.Context, tenantID, sessionID, turnID string) (sessions.Turn, error) {
-	session, err := d.Store.GetSession(ctx, tenantID, sessionID)
+	session, err := d.SessionsReader.GetSession(ctx, tenantID, sessionID)
 	if err != nil {
 		return sessions.Turn{}, err
 	}
diff --git a/services/core/internal/execution/environment_directory.go b/services/core/internal/execution/environment_directory.go
index bba21b5dd..5d1286efb 100644
--- a/services/core/internal/execution/environment_directory.go
+++ b/services/core/internal/execution/environment_directory.go
@@ -85,7 +85,7 @@ func (w *Worker) runDirectoryRead(owner context.Context, request directoryReadRe
 	if err != nil {
 		return
 	}
-	session, err := w.dispatcher.Store.GetSession(check, environment.TenantID, environment.SessionID)
+	session, err := w.dispatcher.SessionsReader.GetSession(check, environment.TenantID, environment.SessionID)
 	if err != nil {
 		result.err = err
 		return
diff --git a/services/core/internal/execution/environment_file_write.go b/services/core/internal/execution/environment_file_write.go
index 57d06f99e..d608265fd 100644
--- a/services/core/internal/execution/environment_file_write.go
+++ b/services/core/internal/execution/environment_file_write.go
@@ -85,7 +85,7 @@ func (w *Worker) runFileWrite(owner context.Context, request fileWriteRequest) f
 	if err != nil || (placement.Type != "openai_hosted" && placement.Type != "self_hosted") {
 		return unavailable
 	}
-	session, err := w.dispatcher.Store.GetSession(ctx, environment.TenantID, environment.SessionID)
+	session, err := w.dispatcher.SessionsReader.GetSession(ctx, environment.TenantID, environment.SessionID)
 	if err != nil {
 		return fileWriteResult{err: err}
 	}
diff --git a/services/core/internal/execution/prepared_dispatch.go b/services/core/internal/execution/prepared_dispatch.go
index c9dec7ede..1584b7442 100644
--- a/services/core/internal/execution/prepared_dispatch.go
+++ b/services/core/internal/execution/prepared_dispatch.go
@@ -26,7 +26,7 @@ func (d *Dispatcher) RunEnvironmentInput(ctx context.Context, lease Ownership, t
 	if err != nil || run.Reservation.State != sessions.EnvironmentInputPending {
 		return run, err
 	}
-	session, err := d.Store.GetSession(ctx, tenantID, sessionID)
+	session, err := d.SessionsReader.GetSession(ctx, tenantID, sessionID)
 	if err != nil {
 		return run, err
 	}
diff --git a/services/core/internal/execution/sandbox_reset.go b/services/core/internal/execution/sandbox_reset.go
index 187138fd4..f841d4ee8 100644
--- a/services/core/internal/execution/sandbox_reset.go
+++ b/services/core/internal/execution/sandbox_reset.go
@@ -8,7 +8,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func (w *Worker) StartSandboxReset(ctx context.Context, input deployment.ResetRequest) (deployment.View, error) {
@@ -106,9 +105,9 @@ func (m *runtimeManager) resetPage(parent, ctx context.Context) error {
 		if ctx.Err() != nil {
 			return nil
 		}
-		_, err := m.store.ArchiveSandboxResetSession(ctx, candidate.TenantID, candidate.SessionID, current.Generation, current.Reset.RequestedAt)
+		_, err := m.deployment.ArchiveResetSession(ctx, candidate.TenantID, candidate.SessionID, current.Generation, current.Reset.RequestedAt)
 		m.resetCursor = candidate.SessionID
-		if err != nil && !errors.Is(err, store.ErrSandboxResetSessionBusy) && !errors.Is(err, sessions.ErrNotFound) {
+		if err != nil && !errors.Is(err, deployment.ErrSandboxResetSessionBusy) && !errors.Is(err, sessions.ErrNotFound) {
 			// Do not log a provider body, request, credential or stored provenance.
 			log.Warn(ctx, "Sandbox reset archive remains pending", "session_id", candidate.SessionID)
 		}
diff --git a/services/core/internal/execution/session_archive.go b/services/core/internal/execution/session_archive.go
deleted file mode 100644
index 65ed5ba16..000000000
--- a/services/core/internal/execution/session_archive.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package execution
-
-import (
-	"context"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// ArchiveManagedSession records administrative cleanup intent through the same
-// execution owner that settles resources. Provider work remains in the lifecycle.
-func (w *Worker) ArchiveManagedSession(ctx context.Context, tenant, session string, generation uint64) (sessions.ManagedArchive, error) {
-	return w.dispatcher.Store.ArchiveManagedSession(ctx, tenant, session, generation)
-}
diff --git a/services/core/internal/execution/worker.go b/services/core/internal/execution/worker.go
index 887722017..0b2b48a0b 100644
--- a/services/core/internal/execution/worker.go
+++ b/services/core/internal/execution/worker.go
@@ -122,7 +122,7 @@ func (w *Worker) CheckOwnership(ctx context.Context) error {
 }
 
 func (w *Worker) SubmitInputs(ctx context.Context, tenant, session, key string, inputs []sessions.Input) ([]sessions.InputReceipt, error) {
-	value, err := w.admission.GetSession(ctx, tenant, session)
+	value, err := w.dispatcher.SessionsReader.GetSession(ctx, tenant, session)
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/core/internal/execution/worker_device.go b/services/core/internal/execution/worker_device.go
index ea63a6b9f..015ac962e 100644
--- a/services/core/internal/execution/worker_device.go
+++ b/services/core/internal/execution/worker_device.go
@@ -46,7 +46,7 @@ func (w *Worker) bind(ctx context.Context, item sessions.ExecutionWork) (bool, e
 }
 
 func (w *Worker) bindDevice(ctx context.Context, tenantID, sessionID string, input proto.MessageInput) (bool, error) {
-	session, err := w.dispatcher.Store.GetSession(ctx, tenantID, sessionID)
+	session, err := w.dispatcher.SessionsReader.GetSession(ctx, tenantID, sessionID)
 	if errors.Is(err, sessions.ErrNotFound) {
 		return false, nil
 	}
diff --git a/services/core/internal/persistence/postgres/deploymentpg/allocations.go b/services/core/internal/persistence/postgres/deploymentpg/allocations.go
index c12d7bca5..5ff80fbec 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/allocations.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/allocations.go
@@ -30,6 +30,19 @@ func allocation(row sqlc.RuntimeAllocation, session, tenant pgtype.UUID, deleted
 }
 
 // allocationKey returns the stored form of the key's identifiers.
+// findAllocation reads the tenant's allocation of the Environment; found is
+// false when it has none.
+func findAllocation(ctx context.Context, q *sqlc.Queries, tenant, environment pgtype.UUID) (deployment.Allocation, bool, error) {
+	row, err := q.GetRuntimeAllocation(ctx, sqlc.GetRuntimeAllocationParams{TenantID: tenant, EnvironmentID: environment})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return deployment.Allocation{}, false, nil
+	}
+	if err != nil {
+		return deployment.Allocation{}, false, err
+	}
+	return allocation(row.RuntimeAllocation, row.SessionID, row.TenantID, row.DeletedAt, row.Expired), true, nil
+}
+
 func allocationKey(key deployment.AllocationKey) (pgtype.UUID, pgtype.UUID, error) {
 	tenant, err := parseID(key.TenantID)
 	if err != nil {
@@ -175,14 +188,7 @@ type reservationTx struct {
 }
 
 func (t *reservationTx) FindAllocation() (deployment.Allocation, bool, error) {
-	row, err := t.q.GetRuntimeAllocation(t.ctx, sqlc.GetRuntimeAllocationParams{TenantID: t.tenant, EnvironmentID: t.environment})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return deployment.Allocation{}, false, nil
-	}
-	if err != nil {
-		return deployment.Allocation{}, false, err
-	}
-	return allocation(row.RuntimeAllocation, t.session, t.tenant, row.DeletedAt, row.Expired), true, nil
+	return findAllocation(t.ctx, t.q, t.tenant, t.environment)
 }
 
 func (t *reservationTx) LockDeployment() (placement.Deployment, error) {
@@ -229,14 +235,11 @@ type allocationTx struct {
 }
 
 func (t *allocationTx) LoadAllocation() (deployment.Allocation, error) {
-	row, err := t.q.GetRuntimeAllocation(t.ctx, sqlc.GetRuntimeAllocationParams{TenantID: t.tenant, EnvironmentID: t.environment})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return deployment.Allocation{}, deployment.ErrNotFound
+	current, found, err := findAllocation(t.ctx, t.q, t.tenant, t.environment)
+	if err == nil && !found {
+		err = deployment.ErrNotFound
 	}
-	if err != nil {
-		return deployment.Allocation{}, err
-	}
-	return allocation(row.RuntimeAllocation, row.SessionID, row.TenantID, row.DeletedAt, row.Expired), nil
+	return current, err
 }
 
 func (t *allocationTx) LoadSessionDevice() (deployment.SessionDevice, bool, error) {
@@ -363,14 +366,11 @@ func (s *Store) EnvironmentAllocation(ctx context.Context, key deployment.Alloca
 	if err != nil {
 		return deployment.Allocation{}, err
 	}
-	row, err := s.pool.Queries().GetRuntimeAllocation(ctx, sqlc.GetRuntimeAllocationParams{TenantID: tenant, EnvironmentID: environment})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return deployment.Allocation{}, deployment.ErrNotFound
-	}
-	if err != nil {
-		return deployment.Allocation{}, err
+	current, found, err := findAllocation(ctx, s.pool.Queries(), tenant, environment)
+	if err == nil && !found {
+		err = deployment.ErrNotFound
 	}
-	return allocation(row.RuntimeAllocation, row.SessionID, row.TenantID, row.DeletedAt, row.Expired), nil
+	return current, err
 }
 
 func (s *Store) CredentialAllocations(ctx context.Context, after string) ([]deployment.Allocation, error) {
diff --git a/services/core/internal/persistence/postgres/deploymentpg/session_archive.go b/services/core/internal/persistence/postgres/deploymentpg/session_archive.go
new file mode 100644
index 000000000..a361597ee
--- /dev/null
+++ b/services/core/internal/persistence/postgres/deploymentpg/session_archive.go
@@ -0,0 +1,85 @@
+package deploymentpg
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+func (e *Execution) WithSessionArchive(ctx context.Context, tenantID, sessionID string, apply func(context.Context, sessions.LockedSession, deployment.SessionArchiveTx) error) error {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return err
+	}
+	session := pgunit.PathID(sessionID)
+	return e.lease.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		locked, err := sessionpg.LockSession(ctx, q, tenant, session)
+		if err != nil {
+			return err
+		}
+		t := &archiveTx{SessionTx: sessionpg.BindSession(q, tenant, session), unit: unit{ctx: ctx, q: q, locked: true}, tenantID: tenantID, tenant: tenant, session: session}
+		if err := apply(ctx, locked, t); err != nil {
+			return err
+		}
+		return sessionpg.PruneChanges(ctx, q, session)
+	})
+}
+
+// archiveTx is one Session archive. Its unit locks the deployment when it
+// reads it; tenantID is the caller's tenant as the audit records it.
+type archiveTx struct {
+	*sessionpg.SessionTx
+	unit
+	tenantID        string
+	tenant, session pgtype.UUID
+}
+
+func (t *archiveTx) LoadResetBusy() (bool, error) {
+	return t.q.SessionBlocksAutoReset(t.ctx, t.session)
+}
+
+func (t *archiveTx) LoadProject() (string, error) {
+	project, err := t.q.GetSandboxResetProject(t.ctx, t.tenant)
+	return uuidString(project), err
+}
+
+func (t *archiveTx) FindAllocation(environment string) (deployment.Allocation, bool, error) {
+	id, err := parseID(environment)
+	if err != nil {
+		return deployment.Allocation{}, false, err
+	}
+	return findAllocation(t.ctx, t.q, t.tenant, id)
+}
+
+func (t *archiveTx) RequestArchiveCleanup(current deployment.Allocation) error {
+	device, err := parseID(current.DeviceID)
+	if err != nil {
+		return err
+	}
+	id, err := parseID(current.ID)
+	if err != nil {
+		return err
+	}
+	if _, err := t.q.RevokeArchivedRuntimeDevice(t.ctx, sqlc.RevokeArchivedRuntimeDeviceParams{TenantID: t.tenant, DeviceID: device, SessionID: t.session}); err != nil {
+		return err
+	}
+	_, err = t.q.RequestRuntimeCleanup(t.ctx, id)
+	return err
+}
+
+func (t *archiveTx) ReleasePlacement() error {
+	return t.q.ReleaseUnallocatedRuntimePlacement(t.ctx, t.session)
+}
+
+func (t *archiveTx) RecordArchiveAudit(ctx context.Context) error {
+	return auditpg.RecordAdminMutation(ctx, t.q, t.tenantID, "archive", "session", uuidString(t.session))
+}
diff --git a/services/core/internal/persistence/postgres/deploymentpg/tx.go b/services/core/internal/persistence/postgres/deploymentpg/tx.go
index fbab74148..6145dd13b 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/tx.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/tx.go
@@ -45,6 +45,23 @@ func (u unit) loadDeployment() (sqlc.RuntimeDeployment, error) {
 	return u.q.GetRuntimeDeployment(u.ctx)
 }
 
+var errNoResetSource = errors.New("sandbox reset has no stored administrator source")
+
+// LoadResetSource decodes the administrator source that started the running
+// reset from the stored deployment. Audit entries the reset records later
+// carry that source.
+func (u unit) LoadResetSource() (adminaudit.Source, error) {
+	d, err := u.loadDeployment()
+	if err != nil {
+		return adminaudit.Source{}, err
+	}
+	var source adminaudit.Source
+	if !d.ResetClear.Valid || json.Unmarshal(d.ResetAudit, &source) != nil {
+		return adminaudit.Source{}, errNoResetSource
+	}
+	return source, nil
+}
+
 func (u unit) LoadNode(id string) (deployment.StoredNode, error) {
 	nodeID, err := parseID(id)
 	if err != nil {
@@ -339,27 +356,6 @@ func (t *deploymentTx) ForceReset() error { return t.q.ForceSandboxReset(t.ctx)
 
 func (t *deploymentTx) CancelReset() error { return t.q.CancelSandboxReset(t.ctx) }
 
-func (t *deploymentTx) LoadResetSource() (adminaudit.Source, error) {
-	d, err := t.loadDeployment()
-	if err != nil {
-		return adminaudit.Source{}, err
-	}
-	return ResetSource(d)
-}
-
-var errNoResetSource = errors.New("sandbox reset has no stored administrator source")
-
-// ResetSource decodes the administrator source that started the running reset
-// from the stored deployment row. Audit entries the reset records later carry
-// that source.
-func ResetSource(d sqlc.RuntimeDeployment) (adminaudit.Source, error) {
-	var source adminaudit.Source
-	if !d.ResetClear.Valid || json.Unmarshal(d.ResetAudit, &source) != nil {
-		return adminaudit.Source{}, errNoResetSource
-	}
-	return source, nil
-}
-
 func (t *deploymentTx) CompleteReset() error {
 	if err := t.q.CompleteSandboxReset(t.ctx); err != nil {
 		return err
diff --git a/services/core/internal/persistence/postgres/sessionpg/binding.go b/services/core/internal/persistence/postgres/sessionpg/binding.go
index cf227e3f5..745e40c12 100644
--- a/services/core/internal/persistence/postgres/sessionpg/binding.go
+++ b/services/core/internal/persistence/postgres/sessionpg/binding.go
@@ -196,3 +196,9 @@ func (t *SessionTx) LoadComputeSuspension(ctx context.Context) (bool, error) {
 func (t *SessionTx) LoadPendingFileWrite(ctx context.Context) (bool, error) {
 	return t.q.EnvironmentFileWriteBlocksSession(ctx, t.session)
 }
+
+// LoadArchive reads the resource disposal of the Session's hosted
+// Environment, as GetManagedSessionArchive does.
+func (t *SessionTx) LoadArchive(ctx context.Context) (sessions.ManagedArchive, error) {
+	return loadManagedArchive(ctx, t.q, t.tenant, t.session)
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/session_reads.go b/services/core/internal/persistence/postgres/sessionpg/session_reads.go
new file mode 100644
index 000000000..a32a6f622
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/session_reads.go
@@ -0,0 +1,325 @@
+package sessionpg
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+var _ sessions.SessionReader = (*Store)(nil)
+
+func (s *Store) GetSession(ctx context.Context, tenantID, sessionID string) (sessions.Session, error) {
+	session, _, err := s.SessionStreamSnapshot(ctx, tenantID, sessionID)
+	return session, err
+}
+
+func (s *Store) ListSessions(ctx context.Context, tenantID, cursor string, limit int, ascending bool, agentID *string) (sessions.Page, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return sessions.Page{}, err
+	}
+	if limit < 1 || limit > 100 {
+		return sessions.Page{}, fmt.Errorf("%w: page size must be 1..100", sessions.ErrInvalidInput)
+	}
+	params := sqlc.ListSessionsParams{TenantID: tenant, PageLimit: int32(limit + 1), AfterID: pgtype.UUID{Valid: true}, Ascending: ascending}
+	if agentID != nil {
+		params.AgentID = pgtype.Text{String: *agentID, Valid: true}
+	}
+	var page sessions.Page
+	err = s.units.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		if cursor != "" {
+			after, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: tenant, ID: pgunit.PathID(cursor)})
+			if err != nil {
+				return err
+			}
+			params.AfterCreated, params.AfterID = after.CreatedAt, after.ID
+		}
+		rows, err := q.ListSessions(ctx, params)
+		if err != nil {
+			return fmt.Errorf("list sessions: %w", err)
+		}
+		page.Sessions = make([]sessions.Session, 0, min(limit, len(rows)))
+		if len(rows) > limit {
+			page.NextCursor = uuid.UUID(rows[limit-1].ID.Bytes).String()
+			rows = rows[:limit]
+		}
+		for _, row := range rows {
+			session, err := SessionFromRow(row)
+			if err == nil {
+				session, err = LoadSessionActivity(ctx, q, session)
+			}
+			if err != nil {
+				return err
+			}
+			page.Sessions = append(page.Sessions, session)
+		}
+		return nil
+	})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.Page{}, sessions.ErrNotFound
+	}
+	return page, err
+}
+
+func (s *Store) SessionStreamSnapshot(ctx context.Context, tenantID, sessionID string) (sessions.Session, int64, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return sessions.Session{}, 0, err
+	}
+	var session sessions.Session
+	var cursor int64
+	err = s.units.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		row, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: tenant, ID: pgunit.PathID(sessionID)})
+		if err != nil {
+			return err
+		}
+		if session, err = SessionFromRow(row); err != nil {
+			return err
+		}
+		cursor = row.EventSequence
+		session, err = LoadSessionActivity(ctx, q, session)
+		return err
+	})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.Session{}, 0, sessions.ErrNotFound
+	}
+	if err != nil {
+		return sessions.Session{}, 0, fmt.Errorf("get session: %w", err)
+	}
+	return session, cursor, nil
+}
+
+func (s *Store) SessionEventCursor(ctx context.Context, tenantID, sessionID string) (int64, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return 0, err
+	}
+	cursor, err := s.units.Queries().SessionEventCursor(ctx, sqlc.SessionEventCursorParams{TenantID: tenant, ID: pgunit.PathID(sessionID)})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return 0, sessions.ErrNotFound
+	}
+	return cursor, err
+}
+
+func (s *Store) ListSessionEvents(ctx context.Context, tenantID, sessionID string, after int64) ([]sessions.SessionChange, error) {
+	if after < 0 {
+		return nil, sessions.ErrInvalidInput
+	}
+	latest, err := s.SessionEventCursor(ctx, tenantID, sessionID)
+	if err != nil {
+		return nil, err
+	}
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return nil, err
+	}
+	id, err := parseID(sessionID)
+	if err != nil {
+		return nil, err
+	}
+	rows, err := s.units.Queries().ListSessionEvents(ctx, sqlc.ListSessionEventsParams{TenantID: tenant, SessionID: id, Sequence: after})
+	if err != nil {
+		return nil, err
+	}
+	changes := make([]sessions.SessionChange, 0, len(rows))
+	if len(rows) == 0 && latest > after {
+		return nil, sessions.ErrStreamGap
+	}
+	for _, row := range rows {
+		if row.Sequence != after+1 {
+			return nil, sessions.ErrStreamGap
+		}
+		var change sessions.SessionChange
+		decoder := json.NewDecoder(bytes.NewReader(row.Payload))
+		decoder.UseNumber()
+		if err := decoder.Decode(&change); err != nil {
+			return nil, err
+		}
+		change.Sequence = row.Sequence
+		changes = append(changes, change)
+		after = row.Sequence
+	}
+	return changes, nil
+}
+
+func (s *Store) GetTurnDiagnosticsSnapshot(ctx context.Context, tenantID, sessionID, turnID string) (sessions.TurnDiagnosticsSnapshot, error) {
+	params, err := publicTurnLookup(tenantID, sessionID, turnID)
+	if err != nil {
+		return sessions.TurnDiagnosticsSnapshot{}, err
+	}
+	result := sessions.TurnDiagnosticsSnapshot{Items: []sessions.ItemDiagnosticTiming{}}
+	err = s.units.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		turn, err := q.GetTurn(ctx, params)
+		if err != nil {
+			return err
+		}
+		row, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: params.TenantID, ID: params.SessionID})
+		if err != nil {
+			return err
+		}
+		result.Session, err = SessionFromRow(row)
+		if err != nil {
+			return err
+		}
+		result.Turn = TurnFromRow(turn)
+		rows, err := q.ListTurnItemDiagnostics(ctx, sqlc.ListTurnItemDiagnosticsParams{SessionID: params.SessionID, TurnID: params.ID})
+		if err != nil {
+			return err
+		}
+		result.ItemsTruncated = len(rows) > 1000
+		if result.ItemsTruncated {
+			rows = rows[:1000]
+		}
+		for _, row := range rows {
+			item := sessions.ItemDiagnosticTiming{ItemID: uuid.UUID(row.ID.Bytes).String(), StartedAt: row.CreatedAt.Time}
+			if row.SettledAt.Valid {
+				at := row.SettledAt.Time
+				item.CompletedAt = &at
+			}
+			result.Items = append(result.Items, item)
+		}
+		return nil
+	})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.TurnDiagnosticsSnapshot{}, sessions.ErrNotFound
+	}
+	return result, err
+}
+
+func (s *Store) GetSessionExecutionConfiguration(ctx context.Context, tenantID, sessionID string) (v1.SessionExecutionConfiguration, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return v1.SessionExecutionConfiguration{}, err
+	}
+	row, err := s.units.Queries().GetSessionExecutionConfiguration(ctx, sqlc.GetSessionExecutionConfigurationParams{TenantID: tenant, SessionID: pgunit.PathID(sessionID)})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return v1.SessionExecutionConfiguration{}, sessions.ErrNotFound
+	}
+	if err != nil {
+		return v1.SessionExecutionConfiguration{}, fmt.Errorf("get session execution configuration: %w", err)
+	}
+	var projection v1.SessionExecutionConfiguration
+	if len(row.ExecutionConfiguration) == 0 {
+		model, err := sessions.ExecutionModel(row.SessionConfiguration)
+		if err != nil {
+			return projection, err
+		}
+		var harness *string
+		if row.Engine != "" {
+			harness = &row.Engine
+		}
+		projection.Model = v1.ExecutionSelection{Value: model, Source: "unknown"}
+		projection.Harness = v1.ExecutionSelection{Value: harness, Source: "unknown"}
+		projection.ModelProvider = v1.ExecutionProviderSelection{Source: "unknown", Status: "unavailable"}
+	} else if err := json.Unmarshal(row.ExecutionConfiguration, &projection); err != nil {
+		return v1.SessionExecutionConfiguration{}, errors.New("invalid stored session execution configuration")
+	}
+	sessions.NormalizeExecutionProjection(&projection, uuid.UUID(row.ID.Bytes).String())
+	return projection, nil
+}
+
+func (s *Store) MeasuredSessionUsage(ctx context.Context, tenantID, sessionID string) (json.RawMessage, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return nil, err
+	}
+	id, err := parseID(sessionID)
+	if err != nil {
+		return nil, err
+	}
+	usage, err := s.units.Queries().SessionMeasuredTokenUsage(ctx, sqlc.SessionMeasuredTokenUsageParams{TenantID: tenant, ID: id})
+	if err != nil {
+		return nil, fmt.Errorf("read measured session usage: %w", err)
+	}
+	return usage, nil
+}
+
+func (s *Store) GetManagedSessionArchive(ctx context.Context, tenantID, sessionID string) (sessions.ManagedArchive, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return sessions.ManagedArchive{}, err
+	}
+	return loadManagedArchive(ctx, s.units.Queries(), tenant, pgunit.PathID(sessionID))
+}
+
+// loadManagedArchive reads the resource disposal of the tenant's visible
+// hosted Session.
+func loadManagedArchive(ctx context.Context, q *sqlc.Queries, tenant, session pgtype.UUID) (sessions.ManagedArchive, error) {
+	row, err := q.GetManagedSessionArchive(ctx, sqlc.GetManagedSessionArchiveParams{TenantID: tenant, ID: session})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.ManagedArchive{}, sessions.ErrNotFound
+	}
+	if err != nil {
+		return sessions.ManagedArchive{}, err
+	}
+	if row.EnvironmentType != "openai_hosted" {
+		return sessions.ManagedArchive{}, sessions.ErrInvalidInput
+	}
+	return sessions.ManagedArchive{SessionID: uuid.UUID(row.SessionID.Bytes).String(), EnvironmentID: uuid.UUID(row.EnvironmentID.Bytes).String(), State: row.State}, nil
+}
+
+// LoadSessionActivity adds the Environment, input activity and latest Turn
+// projection of GetSession to session within the caller's snapshot.
+func LoadSessionActivity(ctx context.Context, q *sqlc.Queries, session sessions.Session) (sessions.Session, error) {
+	id, _ := parseID(session.ID)
+	tenant, _ := parseID(session.TenantID)
+	environment, err := q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: tenant, ID: id})
+	if err == nil {
+		value, err := EnvironmentFromRow(environment.Environment, environment.TenantID, environment.Configuration, nil)
+		if err != nil {
+			return session, err
+		}
+		session.Environment = &value
+		session.EnvironmentFailure = environmentFailure(environment.Environment)
+		state, err := LoadEnvironmentInput(ctx, q, id)
+		if err != nil {
+			return session, err
+		}
+		session.EnvironmentInputActivity, session.PendingInput = sessions.InputActivity(state)
+	} else if !errors.Is(err, pgx.ErrNoRows) {
+		return session, err
+	}
+	row, err := q.GetLatestSessionTurn(ctx, id)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return session, nil
+	}
+	if err != nil {
+		return session, err
+	}
+	turn := TurnFromRow(row)
+	session.LastTurn = &turn
+	session.RequiredActions, err = LoadRequiredActions(ctx, q, id, turn)
+	if err != nil {
+		return session, err
+	}
+	session.Usage, err = q.SessionTokenUsage(ctx, id)
+	return session, err
+}
+
+// environmentFailure returns the recorded provisioning failure of a failed
+// Environment, with its detail sanitized.
+func environmentFailure(row sqlc.Environment) *sessions.EnvironmentFailure {
+	if row.Status != "failed" || !row.FailureReason.Valid || !row.FailedAt.Valid {
+		return nil
+	}
+	failure := &sessions.EnvironmentFailure{Reason: row.FailureReason.String, FailedAt: row.FailedAt.Time}
+	var detail sessions.ProvisioningFailureDetail
+	if json.Unmarshal(row.FailureDetail, &detail) == nil {
+		failure.Detail = sessions.SanitizedProvisioningDetail(detail)
+	}
+	return failure
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/session_writes.go b/services/core/internal/persistence/postgres/sessionpg/session_writes.go
new file mode 100644
index 000000000..d18311a07
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/session_writes.go
@@ -0,0 +1,86 @@
+package sessionpg
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+var _ sessions.SessionStorage = (*Store)(nil)
+
+func (s *Store) WithSessionDeletion(ctx context.Context, tenantID, sessionID string, apply func(context.Context, sessions.LockedSession, sessions.SessionDeletionTx) error) error {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return err
+	}
+	session := pgunit.PathID(sessionID)
+	return WithSession(ctx, s.units, tenant, session, func(ctx context.Context, q *sqlc.Queries, locked sessions.LockedSession) error {
+		return apply(ctx, locked, &deletionTx{SessionTx: BindSession(q, tenant, session), tenantID: tenantID})
+	})
+}
+
+// deletionTx is one Session deletion. tenantID is the caller's tenant as the
+// write audit records it.
+type deletionTx struct {
+	*SessionTx
+	tenantID string
+}
+
+func (t *deletionTx) ApplyDeletion(ctx context.Context) error {
+	if err := t.q.DeleteSessionArtifacts(ctx, t.session); err != nil {
+		return err
+	}
+	if err := t.q.ReleaseUnallocatedRuntimePlacement(ctx, t.session); err != nil {
+		return err
+	}
+	return t.q.MarkSessionDeleted(ctx, t.session)
+}
+
+func (t *deletionTx) RecordDeletionAudit(ctx context.Context) error {
+	return auditpg.RecordWriteAudit(ctx, t.q, t.tenantID, "delete", "session", uuid.UUID(t.session.Bytes).String(), "")
+}
+
+func (s *Store) UpdateSessionMetadata(ctx context.Context, tenantID, sessionID string, encoded []byte) (sessions.Session, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return sessions.Session{}, err
+	}
+	var session sessions.Session
+	err = s.units.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		row, err := q.UpdateSessionMetadata(ctx, sqlc.UpdateSessionMetadataParams{TenantID: tenant, ID: pgunit.PathID(sessionID), Metadata: encoded})
+		if err != nil {
+			return err
+		}
+		if err := auditpg.RecordWriteAudit(ctx, q, tenantID, "update", "session", uuid.UUID(row.ID.Bytes).String(), ""); err != nil {
+			return err
+		}
+		if session, err = SessionFromRow(row); err != nil {
+			return err
+		}
+		session, err = LoadSessionActivity(ctx, q, session)
+		return err
+	})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.Session{}, sessions.ErrNotFound
+	}
+	if err != nil {
+		return sessions.Session{}, fmt.Errorf("update session metadata: %w", err)
+	}
+	return session, nil
+}
+
+func (s *Store) AuditSessionOperation(ctx context.Context, tenantID, sessionID, action string) error {
+	return s.withPublicSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, action, "session", uuid.UUID(session.Bytes).String(), "")
+	})
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/turn_reads.go b/services/core/internal/persistence/postgres/sessionpg/turn_reads.go
index 8704de091..9848a68d9 100644
--- a/services/core/internal/persistence/postgres/sessionpg/turn_reads.go
+++ b/services/core/internal/persistence/postgres/sessionpg/turn_reads.go
@@ -17,7 +17,7 @@ import (
 var _ sessions.TurnReader = (*Store)(nil)
 
 func (s *Store) GetTurn(ctx context.Context, tenant, session, turn string) (sessions.Turn, error) {
-	lookup, err := PublicTurnLookup(tenant, session, turn)
+	lookup, err := publicTurnLookup(tenant, session, turn)
 	if err != nil {
 		return sessions.Turn{}, err
 	}
@@ -110,10 +110,10 @@ func ExecutionWorkCursor(after string, connectedDevices []string) (pgtype.UUID,
 	return id, devices, nil
 }
 
-// PublicTurnLookup resolves the caller's path identifiers of a Turn or a
+// publicTurnLookup resolves the caller's path identifiers of a Turn or a
 // Turn-scoped resource. A malformed tenant is sessions.ErrInvalidInput; a
 // malformed Session or Turn ID resolves as a missing one.
-func PublicTurnLookup(tenant, session, turn string) (sqlc.GetTurnParams, error) {
+func publicTurnLookup(tenant, session, turn string) (sqlc.GetTurnParams, error) {
 	id, err := parseID(tenant)
 	return sqlc.GetTurnParams{TenantID: id, SessionID: pgunit.PathID(session), ID: pgunit.PathID(turn)}, err
 }
diff --git a/services/core/internal/runtimehistory/service.go b/services/core/internal/runtimehistory/service.go
index 59043201c..2a8be7b60 100644
--- a/services/core/internal/runtimehistory/service.go
+++ b/services/core/internal/runtimehistory/service.go
@@ -2,8 +2,12 @@ package runtimehistory
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
+	"fmt"
 	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
 var (
@@ -13,31 +17,27 @@ var (
 	ErrUnsupported   = errors.New("Runtime history is unsupported for this Session")
 )
 
-type ScopeResolver interface {
-	ResolveRuntimeHistoryScope(context.Context, string, string) (Scope, error)
-}
-
 type Reader interface {
 	Capabilities() Capabilities
 	Query(context.Context, Query) (Result, error)
 }
 
 type Service struct {
-	resolver     ScopeResolver
+	environments sessions.EnvironmentReader
 	reader       Reader
 	capabilities Capabilities
 	now          func() time.Time
 }
 
-func NewService(resolver ScopeResolver, reader Reader) (*Service, error) {
-	if resolver == nil || reader == nil {
-		return nil, errors.New("Runtime history resolver and reader are required")
+func NewService(environments sessions.EnvironmentReader, reader Reader) (*Service, error) {
+	if environments == nil || reader == nil {
+		return nil, errors.New("Runtime history Environments and reader are required")
 	}
 	capabilities := reader.Capabilities()
 	if err := capabilities.Validate(); err != nil {
 		return nil, err
 	}
-	return &Service{resolver: resolver, reader: reader, capabilities: cloneCapabilities(capabilities), now: time.Now}, nil
+	return &Service{environments: environments, reader: reader, capabilities: cloneCapabilities(capabilities), now: time.Now}, nil
 }
 
 func (s *Service) Capabilities() Capabilities {
@@ -52,13 +52,10 @@ func (s *Service) QuerySession(ctx context.Context, tenantID, sessionID string,
 	if !validPublicBoundary(requested.Start) || !validPublicBoundary(requested.End) || !requested.End.After(requested.Start) || requested.End.After(requestNow.Add(time.Second)) || requested.End.Sub(requested.Start) > s.capabilities.MaximumRange || requested.MaxPoints < 2 || requested.MaxPoints > s.capabilities.MaximumPoints {
 		return Response{}, ErrInvalidRange
 	}
-	scope, err := s.resolver.ResolveRuntimeHistoryScope(ctx, tenantID, sessionID)
+	scope, err := s.resolveScope(ctx, tenantID, sessionID)
 	if err != nil {
 		return Response{}, err
 	}
-	if scope.TenantID != tenantID || scope.SessionID != sessionID {
-		return Response{}, ErrInvalidResult
-	}
 	if err := scope.validate(); err != nil {
 		return Response{}, ErrInvalidResult
 	}
@@ -87,6 +84,30 @@ func (s *Service) QuerySession(ctx context.Context, tenantID, sessionID string,
 	}, nil
 }
 
+// resolveScope authorizes the Session and returns only durable Core identity.
+// It does not resolve a current allocation: retained history may contain
+// earlier allocations, and the Reader keeps each durable allocation as one
+// continuous series.
+func (s *Service) resolveScope(ctx context.Context, tenantID, sessionID string) (Scope, error) {
+	environment, err := s.environments.GetSessionEnvironment(ctx, tenantID, sessionID)
+	if err != nil {
+		return Scope{}, fmt.Errorf("resolve Runtime history Environment: %w", err)
+	}
+	if environment.TenantID != tenantID || environment.SessionID != sessionID {
+		return Scope{}, errors.New("Runtime history Environment does not match resolved ownership")
+	}
+	var configuration struct {
+		Type string `json:"type"`
+	}
+	if json.Unmarshal(environment.Configuration, &configuration) != nil || configuration.Type == "" {
+		return Scope{}, errors.New("invalid stored Runtime history environment configuration")
+	}
+	if configuration.Type != "openai_hosted" {
+		return Scope{}, ErrUnsupported
+	}
+	return Scope{TenantID: tenantID, SessionID: sessionID, EnvironmentID: environment.ID}, nil
+}
+
 func resolution(duration time.Duration, maxPoints int, minimum time.Duration) time.Duration {
 	divisor := time.Duration(maxPoints)
 	step := duration / divisor
diff --git a/services/core/internal/runtimehistory/service_test.go b/services/core/internal/runtimehistory/service_test.go
index 63ba36b8e..d56955aa7 100644
--- a/services/core/internal/runtimehistory/service_test.go
+++ b/services/core/internal/runtimehistory/service_test.go
@@ -5,6 +5,9 @@ import (
 	"errors"
 	"testing"
 	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
 const (
@@ -14,13 +17,48 @@ const (
 	allocationID  = "44444444-4444-4444-8444-444444444444"
 )
 
-type fixedScopeResolver struct {
-	scope Scope
-	err   error
+// fakeEnvironmentReader serves the Session Environment read that scopes a
+// query; every other read fails the test.
+type fakeEnvironmentReader struct {
+	t                     testing.TB
+	getSessionEnvironment func(context.Context, string, string) (sessions.Environment, error)
+}
+
+func (f *fakeEnvironmentReader) GetSessionEnvironment(ctx context.Context, tenant, session string) (sessions.Environment, error) {
+	if f.getSessionEnvironment == nil {
+		f.t.Fatalf("unexpected call to GetSessionEnvironment")
+	}
+	return f.getSessionEnvironment(ctx, tenant, session)
+}
+
+func (f *fakeEnvironmentReader) GetEnvironment(context.Context, string, string) (sessions.Environment, error) {
+	f.t.Fatalf("unexpected call to GetEnvironment")
+	return sessions.Environment{}, nil
+}
+
+func (f *fakeEnvironmentReader) ListEnvironmentInitializations(context.Context, string) ([]sessions.EnvironmentInitialization, error) {
+	f.t.Fatalf("unexpected call to ListEnvironmentInitializations")
+	return nil, nil
+}
+
+func (f *fakeEnvironmentReader) ReadEnvironmentSetup(context.Context, string, string) (environmentconfig.Setup, error) {
+	f.t.Fatalf("unexpected call to ReadEnvironmentSetup")
+	return environmentconfig.Setup{}, nil
 }
 
-func (r fixedScopeResolver) ResolveRuntimeHistoryScope(context.Context, string, string) (Scope, error) {
-	return r.scope, r.err
+func (f *fakeEnvironmentReader) ReadInitialEnvironmentFile(context.Context, string, string, int) (environmentconfig.InitialFileMetadata, []byte, error) {
+	f.t.Fatalf("unexpected call to ReadInitialEnvironmentFile")
+	return environmentconfig.InitialFileMetadata{}, nil, nil
+}
+
+// sessionEnvironment reads environment and err as the Session's Environment.
+func sessionEnvironment(t testing.TB, environment sessions.Environment, err error) *fakeEnvironmentReader {
+	return &fakeEnvironmentReader{t: t, getSessionEnvironment: func(context.Context, string, string) (sessions.Environment, error) { return environment, err }}
+}
+
+// hosted reads the hosted Environment of the Session the tests query.
+func hosted(t testing.TB) *fakeEnvironmentReader {
+	return sessionEnvironment(t, sessions.Environment{ID: environmentID, TenantID: tenantID, SessionID: sessionID, Configuration: []byte(`{"type":"openai_hosted"}`)}, nil)
 }
 
 type fakeReader struct {
@@ -69,7 +107,7 @@ func TestServiceAuthorizesAndBoundsBackendQuery(t *testing.T) {
 			CPUUtilizationRatio: &ratio, CPUCapacityCores: &capacity, MemoryUsageBytes: &memory, MemoryLimitBytes: &limit,
 		}},
 	}}}
-	service, err := NewService(fixedScopeResolver{scope: scope}, reader)
+	service, err := NewService(hosted(t), reader)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -94,7 +132,7 @@ func TestServiceAuthorizesAndBoundsBackendQuery(t *testing.T) {
 func TestServiceNeverQueriesBeforeOwnershipResolution(t *testing.T) {
 	reader := &fakeReader{capabilities: capabilities()}
 	denied := errors.New("not found")
-	service, err := NewService(fixedScopeResolver{err: denied}, reader)
+	service, err := NewService(sessionEnvironment(t, sessions.Environment{}, denied), reader)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -108,9 +146,8 @@ func TestServiceNeverQueriesBeforeOwnershipResolution(t *testing.T) {
 func TestServiceValidatesResultAgainstTimeAfterReaderReturns(t *testing.T) {
 	requestNow := time.Date(2026, 9, 23, 8, 0, 0, 0, time.UTC)
 	resultNow := requestNow.Add(2 * time.Second)
-	scope := Scope{TenantID: tenantID, SessionID: sessionID, EnvironmentID: environmentID}
 	reader := &fakeReader{capabilities: capabilities(), result: Result{GeneratedAt: resultNow}}
-	service, err := NewService(fixedScopeResolver{scope: scope}, reader)
+	service, err := NewService(hosted(t), reader)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -136,8 +173,7 @@ func TestServiceValidatesResultAgainstTimeAfterReaderReturns(t *testing.T) {
 
 func TestServiceRejectsInvalidRangeAndResolverIdentity(t *testing.T) {
 	reader := &fakeReader{capabilities: capabilities()}
-	scope := Scope{TenantID: tenantID, SessionID: sessionID, EnvironmentID: environmentID}
-	service, err := NewService(fixedScopeResolver{scope: scope}, reader)
+	service, err := NewService(hosted(t), reader)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -155,9 +191,21 @@ func TestServiceRejectsInvalidRangeAndResolverIdentity(t *testing.T) {
 	if len(reader.queries) != 0 {
 		t.Fatalf("invalid range reached reader: %+v", reader.queries)
 	}
-	service.resolver = fixedScopeResolver{scope: Scope{TenantID: "55555555-5555-4555-8555-555555555555", SessionID: sessionID, EnvironmentID: environmentID}}
-	if _, err := service.QuerySession(t.Context(), tenantID, sessionID, Range{Start: now.Add(-time.Hour), End: now, MaxPoints: 60}); err == nil || len(reader.queries) != 0 {
-		t.Fatal("mismatched resolver identity reached reader")
+	for _, environment := range []sessions.Environment{
+		{ID: environmentID, TenantID: tenantID, SessionID: sessionID, Configuration: []byte(`{"type":"self_hosted"}`)},
+		{ID: environmentID, TenantID: "55555555-5555-4555-8555-555555555555", SessionID: sessionID, Configuration: []byte(`{"type":"openai_hosted"}`)},
+		{ID: environmentID, TenantID: tenantID, SessionID: "66666666-6666-4666-8666-666666666666", Configuration: []byte(`{"type":"openai_hosted"}`)},
+		{ID: environmentID, TenantID: tenantID, SessionID: sessionID, Configuration: []byte(`{"type":`)},
+		{ID: "environment", TenantID: tenantID, SessionID: sessionID, Configuration: []byte(`{"type":"openai_hosted"}`)},
+	} {
+		service.environments = sessionEnvironment(t, environment, nil)
+		if _, err := service.QuerySession(t.Context(), tenantID, sessionID, Range{Start: now.Add(-time.Hour), End: now, MaxPoints: 60}); err == nil || len(reader.queries) != 0 {
+			t.Fatalf("unsafe Runtime history Environment reached reader: %+v", environment)
+		}
+	}
+	service.environments = sessionEnvironment(t, sessions.Environment{ID: environmentID, TenantID: tenantID, SessionID: sessionID, Configuration: []byte(`{"type":"self_hosted"}`)}, nil)
+	if _, err := service.QuerySession(t.Context(), tenantID, sessionID, Range{Start: now.Add(-time.Hour), End: now, MaxPoints: 60}); !errors.Is(err, ErrUnsupported) {
+		t.Fatalf("self-hosted history was not unsupported: %v", err)
 	}
 }
 
@@ -266,7 +314,7 @@ func TestServiceRejectsMalformedBackendResults(t *testing.T) {
 			result.Series[0].Points = []Point{{Start: start, End: start.Add(time.Minute)}}
 			mutate(&result)
 			reader := &fakeReader{capabilities: capabilities(), result: result}
-			service, err := NewService(fixedScopeResolver{scope: scope}, reader)
+			service, err := NewService(hosted(t), reader)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -288,7 +336,7 @@ func TestServiceRejectsUnsafeCapabilities(t *testing.T) {
 		value := base
 		value.Metrics = append([]Metric(nil), base.Metrics...)
 		mutate(&value)
-		if _, err := NewService(fixedScopeResolver{}, &fakeReader{capabilities: value}); err == nil {
+		if _, err := NewService(hosted(t), &fakeReader{capabilities: value}); err == nil {
 			t.Fatalf("unsafe capabilities accepted: %+v", value)
 		}
 	}
diff --git a/services/core/internal/runtimehistory/storeresolver/resolver.go b/services/core/internal/runtimehistory/storeresolver/resolver.go
deleted file mode 100644
index 040de4bda..000000000
--- a/services/core/internal/runtimehistory/storeresolver/resolver.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package storeresolver
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-type environmentStore interface {
-	GetSessionEnvironment(context.Context, string, string) (sessions.Environment, error)
-}
-
-type Resolver struct{ store environmentStore }
-
-func NewResolver(value environmentStore) (*Resolver, error) {
-	if value == nil {
-		return nil, errors.New("Runtime history store is required")
-	}
-	return &Resolver{store: value}, nil
-}
-
-// ResolveRuntimeHistoryScope authorizes the Session through the Core store and
-// returns only durable Core identity. It intentionally does not resolve a
-// current allocation: retained history may contain earlier allocations. The
-// Reader keeps each durable allocation as one continuous series.
-func (r *Resolver) ResolveRuntimeHistoryScope(ctx context.Context, tenantID, sessionID string) (runtimehistory.Scope, error) {
-	environment, err := r.store.GetSessionEnvironment(ctx, tenantID, sessionID)
-	if err != nil {
-		return runtimehistory.Scope{}, fmt.Errorf("resolve Runtime history Environment: %w", err)
-	}
-	if environment.TenantID != tenantID || environment.SessionID != sessionID {
-		return runtimehistory.Scope{}, errors.New("Runtime history Environment does not match resolved ownership")
-	}
-	var configuration struct {
-		Type string `json:"type"`
-	}
-	if json.Unmarshal(environment.Configuration, &configuration) != nil || configuration.Type == "" {
-		return runtimehistory.Scope{}, errors.New("invalid stored Runtime history environment configuration")
-	}
-	if configuration.Type != "openai_hosted" {
-		return runtimehistory.Scope{}, runtimehistory.ErrUnsupported
-	}
-	return runtimehistory.Scope{TenantID: tenantID, SessionID: sessionID, EnvironmentID: environment.ID}, nil
-}
diff --git a/services/core/internal/runtimehistory/storeresolver/resolver_test.go b/services/core/internal/runtimehistory/storeresolver/resolver_test.go
deleted file mode 100644
index 83cf2939f..000000000
--- a/services/core/internal/runtimehistory/storeresolver/resolver_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package storeresolver
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-type resolverStore struct {
-	environment sessions.Environment
-	err         error
-	calls       int
-}
-
-func (s *resolverStore) GetSessionEnvironment(context.Context, string, string) (sessions.Environment, error) {
-	s.calls++
-	return s.environment, s.err
-}
-
-func TestResolverAuthorizesManagedSessionWithoutSelectingCurrentAllocation(t *testing.T) {
-	backend := &resolverStore{environment: sessions.Environment{
-		ID: environmentID, TenantID: tenantID, SessionID: sessionID,
-		Configuration: []byte(`{"type":"openai_hosted"}`),
-	}}
-	resolver, err := NewResolver(backend)
-	if err != nil {
-		t.Fatal(err)
-	}
-	scope, err := resolver.ResolveRuntimeHistoryScope(t.Context(), tenantID, sessionID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if scope != (runtimehistory.Scope{TenantID: tenantID, SessionID: sessionID, EnvironmentID: environmentID}) || backend.calls != 1 {
-		t.Fatalf("unexpected Runtime history scope: %+v calls=%d", scope, backend.calls)
-	}
-}
-
-func TestResolverPreservesTenantScopedNotFound(t *testing.T) {
-	backend := &resolverStore{err: sessions.ErrNotFound}
-	resolver, err := NewResolver(backend)
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = resolver.ResolveRuntimeHistoryScope(t.Context(), tenantID, sessionID)
-	if !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatalf("tenant-scoped not found was not preserved: %v", err)
-	}
-}
-
-func TestResolverRejectsUnsupportedOrMismatchedEnvironment(t *testing.T) {
-	for _, environment := range []sessions.Environment{
-		{ID: environmentID, TenantID: tenantID, SessionID: sessionID, Configuration: []byte(`{"type":"self_hosted"}`)},
-		{ID: environmentID, TenantID: "55555555-5555-4555-8555-555555555555", SessionID: sessionID, Configuration: []byte(`{"type":"openai_hosted"}`)},
-		{ID: environmentID, TenantID: tenantID, SessionID: "66666666-6666-4666-8666-666666666666", Configuration: []byte(`{"type":"openai_hosted"}`)},
-		{ID: environmentID, TenantID: tenantID, SessionID: sessionID, Configuration: []byte(`{"type":`)},
-	} {
-		resolver, err := NewResolver(&resolverStore{environment: environment})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, err := resolver.ResolveRuntimeHistoryScope(t.Context(), tenantID, sessionID); err == nil {
-			t.Fatalf("unsafe Runtime history Environment accepted: %+v", environment)
-		}
-	}
-}
-
-const (
-	tenantID      = "11111111-1111-4111-8111-111111111111"
-	sessionID     = "22222222-2222-4222-8222-222222222222"
-	environmentID = "33333333-3333-4333-8333-333333333333"
-)
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index b82a51051..2fd9a314c 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -133,15 +133,16 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		EnvironmentTemplates: struct{ api.EnvironmentTemplates }{}, EnvironmentTemplatesReader: struct{ api.EnvironmentTemplatesReader }{},
 		Skills: struct{ api.Skills }{}, SkillsReader: struct{ api.SkillsReader }{},
 		Agents: struct{ api.Agents }{}, AgentsReader: struct{ api.AgentsReader }{},
-		Sessions:        s,
+		Sessions:        struct{ api.Sessions }{},
+		SessionsReader:  struct{ api.SessionsReader }{},
 		SessionCreation: s,
-		SessionEvents:   s,
+		SessionEvents:   struct{ api.SessionEvents }{},
 		Turns:           struct{ api.Turns }{},
 		Items:           struct{ api.Items }{},
 		Subagents:       struct{ api.Subagents }{},
 		Artifacts:       struct{ api.Artifacts }{},
 		ArtifactsReader: struct{ api.ArtifactsReader }{},
-		SessionAdmin:    s,
+		SessionAdmin:    struct{ api.SessionAdmin }{},
 		Environments:    struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, Admin: s, AdminRuntimeTargets: struct{ api.AdminRuntimeTargets }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{},
 		ExecutorConnections: struct{ api.ExecutorConnections }{},
 		Metrics:             struct{ api.Metrics }{}, RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
@@ -149,7 +150,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
 			SessionAdmission: s,
 			InputAdmission:   s,
-			SessionArchive:   s,
+			SessionArchive:   struct{ api.SessionArchive }{},
 			Workspaces:       struct{ api.EnvironmentWorkspaces }{},
 		},
 		Sandboxes: &api.Sandboxes{Deployment: service, NodeAllocations: deploymentpg.New(pgunit.NewPool(pool), nil), DeploymentChanges: leaseSetup{t: t, changes: changes, installation: installation},
diff --git a/services/core/internal/sessions/artifacts_test.go b/services/core/internal/sessions/artifacts_test.go
index 7132974d7..a31e5b326 100644
--- a/services/core/internal/sessions/artifacts_test.go
+++ b/services/core/internal/sessions/artifacts_test.go
@@ -257,6 +257,21 @@ func (s *fakeArtifactStorage) WithEnvironmentExecutorCredentials(context.Context
 	return nil
 }
 
+func (s *fakeArtifactStorage) WithSessionDeletion(context.Context, string, string, func(context.Context, LockedSession, SessionDeletionTx) error) error {
+	s.t.Fatal("unexpected call to WithSessionDeletion")
+	return nil
+}
+
+func (s *fakeArtifactStorage) UpdateSessionMetadata(context.Context, string, string, []byte) (Session, error) {
+	s.t.Fatal("unexpected call to UpdateSessionMetadata")
+	return Session{}, nil
+}
+
+func (s *fakeArtifactStorage) AuditSessionOperation(context.Context, string, string, string) error {
+	s.t.Fatal("unexpected call to AuditSessionOperation")
+	return nil
+}
+
 func discard(content io.Reader, size int64) error {
 	_, err := io.CopyN(io.Discard, content, size)
 	return err
diff --git a/services/core/internal/sessions/devices_test.go b/services/core/internal/sessions/devices_test.go
index 20f8676e5..b8297e341 100644
--- a/services/core/internal/sessions/devices_test.go
+++ b/services/core/internal/sessions/devices_test.go
@@ -40,6 +40,11 @@ type fakeStorage struct {
 	// credentials is the transaction the executor credential With methods
 	// apply in, with locked.
 	credentials *fakeTx
+	// deletion is the transaction WithSessionDeletion applies in, with
+	// locked.
+	deletion       *fakeTx
+	updateMetadata func(encoded string) (Session, error)
+	auditOperation func() error
 }
 
 func (s *fakeStorage) record(name string, set bool, detail ...string) {
@@ -75,6 +80,21 @@ func (s *fakeStorage) WithEnrollment(ctx context.Context, environment, credentia
 	return apply(ctx, s.enrollment, s.environment, s.locked)
 }
 
+func (s *fakeStorage) WithSessionDeletion(ctx context.Context, tenant, session string, apply func(context.Context, LockedSession, SessionDeletionTx) error) error {
+	s.record("WithSessionDeletion", s.deletion != nil, tenant, session)
+	return apply(ctx, s.locked, s.deletion)
+}
+
+func (s *fakeStorage) UpdateSessionMetadata(_ context.Context, tenant, session string, encoded []byte) (Session, error) {
+	s.record("UpdateSessionMetadata", s.updateMetadata != nil, tenant, session, string(encoded))
+	return s.updateMetadata(string(encoded))
+}
+
+func (s *fakeStorage) AuditSessionOperation(_ context.Context, tenant, session, action string) error {
+	s.record("AuditSessionOperation", s.auditOperation != nil, tenant, session, action)
+	return s.auditOperation()
+}
+
 func (s *fakeStorage) WithArtifactStaging(context.Context, ArtifactStagingKey, func(context.Context, ArtifactStagingTx) error) error {
 	s.t.Fatal("unexpected call to WithArtifactStaging")
 	return nil
diff --git a/services/core/internal/sessions/execution_configuration.go b/services/core/internal/sessions/execution_configuration.go
new file mode 100644
index 000000000..6065dbe97
--- /dev/null
+++ b/services/core/internal/sessions/execution_configuration.go
@@ -0,0 +1,44 @@
+package sessions
+
+import (
+	"encoding/json"
+	"errors"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+)
+
+// NormalizeExecutionProjection completes a Session's frozen execution
+// configuration for sessionID as it is stored and read: the object and schema
+// version, an unknown harness configuration source, the resolved harness
+// configuration, and the provider view only while it is available. A
+// deployment provider frozen without its safe view stays redacted.
+func NormalizeExecutionProjection(projection *v1.SessionExecutionConfiguration, sessionID string) {
+	projection.Object = "agent.session.execution_configuration"
+	projection.SchemaVersion = 1
+	if projection.HarnessConfig.Source == "" {
+		projection.HarnessConfig.Source = "unknown"
+	}
+	projection.HarnessConfig.Value = v1.ResolvedHarnessConfig(projection.HarnessConfig.Value)
+	projection.SessionID = sessionID
+	if projection.ModelProvider.Source == "deployment" && (projection.ModelProvider.Status != "available" || projection.ModelProvider.Configuration == nil) {
+		// Sessions created before deployment defaults moved into Core stay redacted.
+		projection.ModelProvider.Status = "redacted"
+		projection.ModelProvider.Configuration = nil
+	} else if projection.ModelProvider.Status != "available" {
+		projection.ModelProvider.Configuration = nil
+	}
+}
+
+// ExecutionModel returns the model a stored Session configuration selects,
+// nil when it selects none.
+func ExecutionModel(configuration []byte) (*string, error) {
+	var config struct {
+		Agent struct {
+			Model *string `json:"model"`
+		} `json:"agent"`
+	}
+	if err := json.Unmarshal(configuration, &config); err != nil {
+		return nil, errors.New("invalid stored Session model configuration")
+	}
+	return config.Agent.Model, nil
+}
diff --git a/services/core/internal/sessions/reader.go b/services/core/internal/sessions/reader.go
index 32dd253bd..6da1497a6 100644
--- a/services/core/internal/sessions/reader.go
+++ b/services/core/internal/sessions/reader.go
@@ -1,6 +1,6 @@
 package sessions
 
-// Reader reads a Session's resources, Environment and devices, and the
+// Reader reads Sessions and their resources, Environment and devices, and the
 // administrator's cross-Project Session views, one family per line. Callers
 // use it directly; no use case forwards a read.
 type Reader interface {
@@ -11,6 +11,7 @@ type Reader interface {
 	ExecutorCredentialReader
 	ItemReader
 	ModelExecutionReader
+	SessionReader
 	SubagentReader
 	TurnReader
 }
diff --git a/services/core/internal/sessions/reads.go b/services/core/internal/sessions/reads.go
index f8fb70a74..883dd24b8 100644
--- a/services/core/internal/sessions/reads.go
+++ b/services/core/internal/sessions/reads.go
@@ -1,6 +1,53 @@
 package sessions
 
-import "time"
+import (
+	"context"
+	"encoding/json"
+	"time"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+)
+
+// SessionReader reads Sessions, their public change journal and their
+// diagnostics.
+type SessionReader interface {
+	// GetSession returns the tenant's visible Session with its Environment,
+	// input activity and latest Turn, read from one snapshot, or ErrNotFound.
+	GetSession(ctx context.Context, tenantID, sessionID string) (Session, error)
+	// ListSessions returns one page of the tenant's visible Sessions in
+	// creation-time and ID order; a non-nil agentID keeps that root Agent's
+	// Sessions. The cursor is the last returned Session ID and must belong to
+	// the tenant; it grants no additional access. A limit outside 1..100 is
+	// ErrInvalidInput.
+	ListSessions(ctx context.Context, tenantID, cursor string, limit int, ascending bool, agentID *string) (Page, error)
+	// SessionStreamSnapshot reads the projection GetSession returns and the
+	// committed Session event cursor from the same snapshot.
+	SessionStreamSnapshot(ctx context.Context, tenantID, sessionID string) (Session, int64, error)
+	// SessionEventCursor returns the sequence of the visible Session's latest
+	// public change, or ErrNotFound.
+	SessionEventCursor(ctx context.Context, tenantID, sessionID string) (int64, error)
+	// ListSessionEvents returns the retained public changes after the
+	// sequence, in order. A negative after is ErrInvalidInput; a pruned change
+	// in between is ErrStreamGap.
+	ListSessionEvents(ctx context.Context, tenantID, sessionID string, after int64) ([]SessionChange, error)
+	// GetTurnDiagnosticsSnapshot reads a root Turn and the timing of up to
+	// 1000 of its root Items with the Session in one read-only snapshot.
+	GetTurnDiagnosticsSnapshot(ctx context.Context, tenantID, sessionID, turnID string) (TurnDiagnosticsSnapshot, error)
+	// GetSessionExecutionConfiguration reads only the safe committed
+	// configuration. It never loads provider ciphertext, current defaults or
+	// runtime health.
+	GetSessionExecutionConfiguration(ctx context.Context, tenantID, sessionID string) (v1.SessionExecutionConfiguration, error)
+	// MeasuredSessionUsage returns Core-internal measured usage for Runtime
+	// telemetry: the sum of every recorded root Turn snapshot, active Turns
+	// included, and null only when nothing is recorded. Public Session usage
+	// keeps the official rule. A missing Session reads as null, so callers
+	// resolve the Session first.
+	MeasuredSessionUsage(ctx context.Context, tenantID, sessionID string) (json.RawMessage, error)
+	// GetManagedSessionArchive reads the resource disposal of the tenant's
+	// hosted Session and never contacts compute. A missing Session is
+	// ErrNotFound; one that is not hosted is ErrInvalidInput.
+	GetManagedSessionArchive(ctx context.Context, tenantID, sessionID string) (ManagedArchive, error)
+}
 
 // ItemDiagnosticTiming records Core database receipt and settlement, never native
 // execution duration. Historical terminal Items can have unknown settlement.
diff --git a/services/core/internal/sessions/service.go b/services/core/internal/sessions/service.go
index 4ac82fdc9..8612a15e7 100644
--- a/services/core/internal/sessions/service.go
+++ b/services/core/internal/sessions/service.go
@@ -19,4 +19,5 @@ type Storage interface {
 	ArtifactStorage
 	DeviceStorage
 	ExecutorCredentialStorage
+	SessionStorage
 }
diff --git a/services/core/internal/sessions/session.go b/services/core/internal/sessions/session.go
index 61ded8a8d..8e922604d 100644
--- a/services/core/internal/sessions/session.go
+++ b/services/core/internal/sessions/session.go
@@ -1,7 +1,9 @@
 package sessions
 
 import (
+	"context"
 	"encoding/json"
+	"fmt"
 	"regexp"
 	"time"
 
@@ -10,6 +12,7 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/metadata"
 )
 
 var enginePattern = regexp.MustCompile(`^[a-z][a-z0-9_-]{0,63}$`)
@@ -73,3 +76,117 @@ type Creation struct {
 }
 
 func ValidEngine(engine string) bool { return enginePattern.MatchString(engine) }
+
+// SessionStorage persists the public Session writes.
+type SessionStorage interface {
+	// WithSessionDeletion runs apply in one Session transaction of the
+	// tenant's Session, publicly deleted or not, with what the Session lock
+	// shows. It prunes the Session's journal after apply and commits only
+	// when both succeed. A malformed tenant is ErrInvalidInput; a malformed or
+	// missing Session is ErrNotFound.
+	WithSessionDeletion(ctx context.Context, tenantID, sessionID string, apply func(context.Context, LockedSession, SessionDeletionTx) error) error
+	// UpdateSessionMetadata replaces the visible Session's metadata with the
+	// encoded object, records the write audit and reads the Session as
+	// GetSession does, in one transaction, or returns ErrNotFound.
+	UpdateSessionMetadata(ctx context.Context, tenantID, sessionID string, encoded []byte) (Session, error)
+	// AuditSessionOperation records the write audit of action on the visible
+	// Session under its lock, or returns ErrNotFound.
+	AuditSessionOperation(ctx context.Context, tenantID, sessionID, action string) error
+}
+
+// SessionDeletionTx is the Session transaction DeleteSession runs in.
+type SessionDeletionTx interface {
+	ActiveTurnTx
+	// LoadEnvironmentInput reads the Session's latest Environment input
+	// reservation that no Turn has admitted or superseded, nil when there is
+	// none.
+	LoadEnvironmentInput(ctx context.Context) (*EnvironmentInputState, error)
+	// ApplyDeletion deletes the Session's Artifacts, releases the node
+	// placement of its Environments that have no allocation and removes the
+	// Session from public access. Its row stays so that execution can settle.
+	ApplyDeletion(ctx context.Context) error
+	// RecordDeletionAudit records the write audit of the deletion.
+	RecordDeletionAudit(ctx context.Context) error
+}
+
+// settled reports whether a Session may be deleted: it has no queued,
+// in-progress or waiting Turn, which includes pending required actions and
+// function results, and no pending input reservation, such as queued later
+// input, self-hosted input awaiting a connection, or hosted initial input while
+// provisioning. Terminal idle and failed Sessions are settled.
+func settled(activeTurn bool, input *EnvironmentInputState) bool {
+	_, pending := InputActivity(input)
+	return !activeTurn && !pending
+}
+
+// DeleteSessionCommand deletes one Session.
+type DeleteSessionCommand struct {
+	TenantID  string
+	SessionID string
+}
+
+// DeleteSession removes public access to a settled Session while keeping the
+// state execution needs to settle. It decides under the Session lock that also
+// orders Turn and input admission, so a concurrent admission either commits
+// first and is rejected here with ErrNotIdle, or observes the deletion. A
+// repeated deletion only records the write audit; foreign and missing Sessions
+// are ErrNotFound.
+func (s *Service) DeleteSession(ctx context.Context, command DeleteSessionCommand) error {
+	return s.storage.WithSessionDeletion(ctx, command.TenantID, command.SessionID, func(ctx context.Context, locked LockedSession, tx SessionDeletionTx) error {
+		if !locked.Deleted {
+			_, active, err := tx.LoadActiveTurn(ctx)
+			if err != nil {
+				return err
+			}
+			var input *EnvironmentInputState
+			if !active {
+				if input, err = tx.LoadEnvironmentInput(ctx); err != nil {
+					return err
+				}
+			}
+			if !settled(active, input) {
+				return ErrNotIdle
+			}
+			if err := tx.ApplyDeletion(ctx); err != nil {
+				return err
+			}
+		}
+		return tx.RecordDeletionAudit(ctx)
+	})
+}
+
+// UpdateSessionMetadataCommand replaces a Session's metadata.
+type UpdateSessionMetadataCommand struct {
+	TenantID  string
+	SessionID string
+	Metadata  map[string]string
+}
+
+// UpdateSessionMetadata replaces the visible Session's metadata and returns
+// the Session. Invalid metadata is ErrInvalidInput.
+func (s *Service) UpdateSessionMetadata(ctx context.Context, command UpdateSessionMetadataCommand) (Session, error) {
+	encoded, err := metadata.Encode(command.Metadata)
+	if err != nil {
+		return Session{}, fmt.Errorf("%w: %w", ErrInvalidInput, err)
+	}
+	return s.storage.UpdateSessionMetadata(ctx, command.TenantID, command.SessionID, encoded)
+}
+
+// AuditSessionOperationCommand records an authorized public operation that
+// changes no Session: a no-op or a creation replay.
+type AuditSessionOperationCommand struct {
+	TenantID  string
+	SessionID string
+	// Action is create or send_events.
+	Action string
+}
+
+// AuditSessionOperation records the write audit of a public no-op or creation
+// replay on the visible Session. It cannot create ownership or admit execution
+// work. Another action is ErrInvalidInput.
+func (s *Service) AuditSessionOperation(ctx context.Context, command AuditSessionOperationCommand) error {
+	if command.Action != "create" && command.Action != "send_events" {
+		return ErrInvalidInput
+	}
+	return s.storage.AuditSessionOperation(ctx, command.TenantID, command.SessionID, command.Action)
+}
diff --git a/services/core/internal/sessions/session_test.go b/services/core/internal/sessions/session_test.go
new file mode 100644
index 000000000..120ae30cd
--- /dev/null
+++ b/services/core/internal/sessions/session_test.go
@@ -0,0 +1,102 @@
+package sessions
+
+import (
+	"errors"
+	"strings"
+	"testing"
+)
+
+func TestSettled(t *testing.T) {
+	for name, test := range map[string]struct {
+		active bool
+		input  *EnvironmentInputState
+		want   bool
+	}{
+		"idle":                      {false, nil, true},
+		"active Turn":               {true, nil, false},
+		"pending input":             {false, &EnvironmentInputState{State: EnvironmentInputPending}, false},
+		"pending hosted initial":    {false, &EnvironmentInputState{State: EnvironmentInputPending, Initial: true, EnvironmentType: "openai_hosted"}, false},
+		"failed input":              {false, &EnvironmentInputState{State: EnvironmentInputFailed}, true},
+		"expired input":             {false, &EnvironmentInputState{State: EnvironmentInputExpired}, true},
+		"active Turn without input": {true, &EnvironmentInputState{State: EnvironmentInputFailed}, false},
+	} {
+		if got := settled(test.active, test.input); got != test.want {
+			t.Errorf("%s: settled = %v, want %v", name, got, test.want)
+		}
+	}
+}
+
+func TestDeleteSession(t *testing.T) {
+	errStorage := errors.New("storage")
+	pending := &EnvironmentInputState{State: EnvironmentInputPending}
+	for _, test := range []struct {
+		name   string
+		locked LockedSession
+		tx     fakeTx
+		want   error
+		calls  []string
+	}{
+		{"settled", LockedSession{}, fakeTx{loadActiveTurn: activeTurn(nil), loadEnvironmentInput: returns[*EnvironmentInputState](nil), applyDeletion: done, recordDeletionAudit: done}, nil,
+			[]string{"LoadActiveTurn", "LoadEnvironmentInput", "ApplyDeletion", "RecordDeletionAudit"}},
+		{"repeated deletion only audits", LockedSession{Deleted: true}, fakeTx{recordDeletionAudit: done}, nil, []string{"RecordDeletionAudit"}},
+		{"active Turn", LockedSession{}, fakeTx{loadActiveTurn: activeTurn(&Turn{ID: "turn"})}, ErrNotIdle, []string{"LoadActiveTurn"}},
+		{"pending input", LockedSession{}, fakeTx{loadActiveTurn: activeTurn(nil), loadEnvironmentInput: returns(pending)}, ErrNotIdle, []string{"LoadActiveTurn", "LoadEnvironmentInput"}},
+		{"failed deletion", LockedSession{}, fakeTx{loadActiveTurn: activeTurn(nil), loadEnvironmentInput: returns[*EnvironmentInputState](nil), applyDeletion: func() error { return errStorage }}, errStorage,
+			[]string{"LoadActiveTurn", "LoadEnvironmentInput", "ApplyDeletion"}},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			tx := test.tx
+			tx.t = t
+			storage := &fakeStorage{t: t, deletion: &tx, locked: test.locked}
+			service, err := NewService(storage)
+			if err != nil {
+				t.Fatal(err)
+			}
+			err = service.DeleteSession(t.Context(), DeleteSessionCommand{TenantID: "tenant", SessionID: "session"})
+			if test.want == nil && err != nil || test.want != nil && !errors.Is(err, test.want) {
+				t.Fatalf("got %v, want %v", err, test.want)
+			}
+			if got := strings.Join(storage.calls, "\n"); got != "WithSessionDeletion tenant session" {
+				t.Fatalf("storage calls %q", got)
+			}
+			if strings.Join(tx.calls, "\n") != strings.Join(test.calls, "\n") {
+				t.Fatalf("calls %q, want %q", tx.calls, test.calls)
+			}
+		})
+	}
+}
+
+func TestUpdateSessionMetadata(t *testing.T) {
+	storage := &fakeStorage{t: t, updateMetadata: func(string) (Session, error) { return Session{ID: "session"}, nil }}
+	service, err := NewService(storage)
+	if err != nil {
+		t.Fatal(err)
+	}
+	session, err := service.UpdateSessionMetadata(t.Context(), UpdateSessionMetadataCommand{TenantID: "tenant", SessionID: "session", Metadata: map[string]string{"k": "v"}})
+	if err != nil || session.ID != "session" || strings.Join(storage.calls, "\n") != `UpdateSessionMetadata tenant session {"k":"v"}` {
+		t.Fatal(session, err, storage.calls)
+	}
+	invalid := map[string]string{"k": strings.Repeat("v", 64*1024)}
+	if _, err := service.UpdateSessionMetadata(t.Context(), UpdateSessionMetadataCommand{TenantID: "tenant", SessionID: "session", Metadata: invalid}); !errors.Is(err, ErrInvalidInput) || len(storage.calls) != 1 {
+		t.Fatal("invalid metadata reached storage", err, storage.calls)
+	}
+}
+
+func TestAuditSessionOperation(t *testing.T) {
+	storage := &fakeStorage{t: t, auditOperation: done}
+	service, err := NewService(storage)
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, action := range []string{"create", "send_events"} {
+		if err := service.AuditSessionOperation(t.Context(), AuditSessionOperationCommand{TenantID: "tenant", SessionID: "session", Action: action}); err != nil {
+			t.Fatal(action, err)
+		}
+	}
+	if err := service.AuditSessionOperation(t.Context(), AuditSessionOperationCommand{TenantID: "tenant", SessionID: "session", Action: "delete"}); !errors.Is(err, ErrInvalidInput) {
+		t.Fatal("unsupported action", err)
+	}
+	if got := strings.Join(storage.calls, "\n"); got != "AuditSessionOperation tenant session create\nAuditSessionOperation tenant session send_events" {
+		t.Fatalf("calls %q", got)
+	}
+}
diff --git a/services/core/internal/sessions/transaction_test.go b/services/core/internal/sessions/transaction_test.go
index 6cc0809bd..318013ab3 100644
--- a/services/core/internal/sessions/transaction_test.go
+++ b/services/core/internal/sessions/transaction_test.go
@@ -94,6 +94,9 @@ type fakeTx struct {
 	hasUnappliedInputs    func() (bool, error)
 	rememberNativeSession func() error
 	beginArtifactCapture  func() error
+
+	applyDeletion       func() error
+	recordDeletionAudit func() error
 }
 
 var (
@@ -111,6 +114,7 @@ var (
 	_ TurnTx                   = (*fakeTx)(nil)
 
 	_ EnvironmentExecutorCredentialTx = (*fakeTx)(nil)
+	_ SessionDeletionTx               = (*fakeTx)(nil)
 )
 
 func (f *fakeTx) record(name string, set bool, detail ...string) {
@@ -121,6 +125,16 @@ func (f *fakeTx) record(name string, set bool, detail ...string) {
 	f.calls = append(f.calls, strings.Join(append([]string{name}, detail...), " "))
 }
 
+func (f *fakeTx) ApplyDeletion(context.Context) error {
+	f.record("ApplyDeletion", f.applyDeletion != nil)
+	return f.applyDeletion()
+}
+
+func (f *fakeTx) RecordDeletionAudit(context.Context) error {
+	f.record("RecordDeletionAudit", f.recordDeletionAudit != nil)
+	return f.recordDeletionAudit()
+}
+
 func (f *fakeTx) LoadUsage(context.Context) (json.RawMessage, error) {
 	f.record("LoadUsage", f.loadUsage != nil)
 	return f.loadUsage()
diff --git a/services/core/internal/store/admin_delete_audit_test.go b/services/core/internal/store/admin_delete_audit_test.go
index 8650556f2..4c4acba0f 100644
--- a/services/core/internal/store/admin_delete_audit_test.go
+++ b/services/core/internal/store/admin_delete_audit_test.go
@@ -161,7 +161,7 @@ func prepareAdminHistoryDelete(t *testing.T, s *Store, name string) (string, res
 		t.Fatal("artifact fixture", err)
 	}
 	verify := func() {
-		if _, err := s.GetSession(t.Context(), tenant, session); err != nil {
+		if _, err := sessionAdapter(s).GetSession(t.Context(), tenant, session); err != nil {
 			t.Fatal("Session was not restored", err)
 		}
 		for _, artifact := range page.Artifacts {
@@ -181,7 +181,9 @@ func prepareAdminHistoryDelete(t *testing.T, s *Store, name string) (string, res
 		}
 	}
 	if name == "session_delete" {
-		return tenant, resourceAuditMutation{action: "delete", kind: "session", run: func(ctx context.Context) (string, error) { return session, s.DeleteSession(ctx, tenant, session) }}, verify, 2
+		return tenant, resourceAuditMutation{action: "delete", kind: "session", run: func(ctx context.Context) (string, error) {
+			return session, sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session})
+		}}, verify, 2
 	}
 	artifact := page.Artifacts[0]
 	return tenant, resourceAuditMutation{action: "delete", kind: "artifact", parent: session, run: func(ctx context.Context) (string, error) {
@@ -194,7 +196,7 @@ func assertAdminDeletedResource(t *testing.T, s *Store, tenant string, mutation
 	var err error
 	switch mutation.kind {
 	case "session":
-		_, err = s.GetSession(t.Context(), tenant, id)
+		_, err = sessionAdapter(s).GetSession(t.Context(), tenant, id)
 	case "artifact":
 		_, err = sessionAdapter(s).GetSessionArtifact(t.Context(), tenant, mutation.parent, id)
 	default:
diff --git a/services/core/internal/store/admin_session_archive.go b/services/core/internal/store/admin_session_archive.go
deleted file mode 100644
index 2ee7157cb..000000000
--- a/services/core/internal/store/admin_session_archive.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// ArchiveManagedSession ends a managed Environment's lifetime while keeping its
-// public Session, history and persisted files. The lifecycle owner performs the
-// external cleanup; only its existing confirmation can release an allocation.
-func (s *Store) ArchiveManagedSession(ctx context.Context, tenantID, sessionID string, expectedGeneration uint64) (sessions.ManagedArchive, error) {
-	return s.archiveManagedSession(ctx, tenantID, sessionID, expectedGeneration, nil)
-}
-
-// A reset instance is identified by its persisted request time as well as its
-// generation, preventing a cancelled clear's candidates from affecting its successor.
-func (s *Store) ArchiveSandboxResetSession(ctx context.Context, tenantID, sessionID string, generation uint64, requestedAt time.Time) (sessions.ManagedArchive, error) {
-	return s.archiveManagedSession(ctx, tenantID, sessionID, generation, &requestedAt)
-}
-
-var ErrSandboxResetSessionBusy = errors.New("the hosted Session is busy")
-
-func (s *Store) archiveManagedSession(ctx context.Context, tenantID, sessionID string, expectedGeneration uint64, resetRequestedAt *time.Time) (sessions.ManagedArchive, error) {
-	if err := s.checkExecutionAuthority(); err != nil {
-		return sessions.ManagedArchive{}, err
-	}
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.ManagedArchive{}, err
-	}
-	var result sessions.ManagedArchive
-	err = s.withPublicSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		// Session precedes deployment, matching Turn, allocation and input admission.
-		current, err := q.LockRuntimeDeployment(ctx)
-		if err != nil {
-			return err
-		}
-		if uint64(current.Generation) != expectedGeneration {
-			return &deployment.GenerationStaleError{CurrentGeneration: uint64(current.Generation)}
-		}
-		if !current.WebManaged || !current.InstallationID.Valid {
-			return deployment.ErrConflict
-		}
-		if current.ProviderKind == "" {
-			return deployment.ErrNotConfigured
-		}
-		environment, err := q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: tenant, ID: session})
-		if errors.Is(err, pgx.ErrNoRows) {
-			return sessions.ErrInvalidInput
-		}
-		if err != nil {
-			return err
-		}
-		kind, err := sessions.EnvironmentType(environment.Configuration)
-		if err != nil || kind != "openai_hosted" {
-			return sessions.ErrInvalidInput
-		}
-		if resetRequestedAt != nil {
-			if !current.ResetClear.Valid || !current.ResetRequestedAt.Time.Equal(*resetRequestedAt) {
-				return deployment.ErrConflict
-			}
-			if current.ResetClear.String == "auto" {
-				busy, err := q.SessionBlocksAutoReset(ctx, session)
-				if err != nil {
-					return err
-				}
-				if busy {
-					return ErrSandboxResetSessionBusy
-				}
-			}
-			if environment.Environment.Status == "failed" || environment.Environment.Status == "expired" {
-				result, err = getManagedSessionArchive(ctx, q, tenant, session)
-				return err
-			}
-			source, err := deploymentpg.ResetSource(current)
-			if err != nil {
-				return err
-			}
-			project, err := q.GetSandboxResetProject(ctx, tenant)
-			if err != nil {
-				return err
-			}
-			source.ProjectID = runtimeUUID(project)
-			ctx = adminaudit.WithSource(ctx, source)
-		}
-		allocation, err := q.GetRuntimeAllocation(ctx, sqlc.GetRuntimeAllocationParams{TenantID: tenant, EnvironmentID: environment.Environment.ID})
-		allocated := err == nil
-		if err != nil && !errors.Is(err, pgx.ErrNoRows) {
-			return err
-		}
-		if allocated && allocation.RuntimeAllocation.State != "released" && allocation.RuntimeAllocation.ProviderKey != current.InstallationID {
-			return deployment.ErrConflict
-		}
-		bound := sessionpg.BindSession(q, tenant, session)
-		if err := sessions.TrackInputActivity(ctx, bound, func(ctx context.Context) error {
-			if environment.Environment.Status != "failed" && environment.Environment.Status != "expired" {
-				if err := q.SetEnvironmentConnectionStatus(ctx, sqlc.SetEnvironmentConnectionStatusParams{ID: environment.Environment.ID, Status: "expired"}); err != nil {
-					return err
-				}
-			}
-			return sessions.CancelWork(ctx, bound)
-		}); err != nil {
-			return err
-		}
-		if allocated && allocation.RuntimeAllocation.State != "released" {
-			if _, err := q.RevokeArchivedRuntimeDevice(ctx, sqlc.RevokeArchivedRuntimeDeviceParams{TenantID: tenant, DeviceID: allocation.RuntimeAllocation.DeviceID, SessionID: session}); err != nil {
-				return err
-			}
-			if _, err := q.RequestRuntimeCleanup(ctx, allocation.RuntimeAllocation.ID); err != nil {
-				return err
-			}
-		} else if !allocated {
-			if err := q.ReleaseUnallocatedRuntimePlacement(ctx, session); err != nil {
-				return err
-			}
-		}
-		if err := auditpg.RecordAdminMutation(ctx, q, tenantID, "archive", "session", runtimeUUID(session)); err != nil {
-			return err
-		}
-		result, err = getManagedSessionArchive(ctx, q, tenant, session)
-		return err
-	})
-	return result, err
-}
-
-// GetManagedSessionArchive reads one database snapshot and never contacts compute.
-func (s *Store) GetManagedSessionArchive(ctx context.Context, tenantID, sessionID string) (sessions.ManagedArchive, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.ManagedArchive{}, err
-	}
-	return getManagedSessionArchive(ctx, s.queries, tenant, pgunit.PathID(sessionID))
-}
-
-func getManagedSessionArchive(ctx context.Context, q *sqlc.Queries, tenant, session pgtype.UUID) (sessions.ManagedArchive, error) {
-	row, err := q.GetManagedSessionArchive(ctx, sqlc.GetManagedSessionArchiveParams{TenantID: tenant, ID: session})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.ManagedArchive{}, sessions.ErrNotFound
-	}
-	if err != nil {
-		return sessions.ManagedArchive{}, err
-	}
-	if row.EnvironmentType != "openai_hosted" {
-		return sessions.ManagedArchive{}, sessions.ErrInvalidInput
-	}
-	return sessions.ManagedArchive{SessionID: runtimeUUID(row.SessionID), EnvironmentID: runtimeUUID(row.EnvironmentID), State: row.State}, nil
-}
diff --git a/services/core/internal/store/admin_session_archive_race_test.go b/services/core/internal/store/admin_session_archive_race_test.go
index 8a19c4d98..6903443af 100644
--- a/services/core/internal/store/admin_session_archive_race_test.go
+++ b/services/core/internal/store/admin_session_archive_race_test.go
@@ -36,7 +36,7 @@ func TestManagedSessionArchiveReleasesPendingNodePlacement(t *testing.T) {
 	}
 	onlineManagerNode(t, s, nodeID)
 	tenant, session := managedArchiveSession(t, s, managerSessionInput(uuid.NewString()))
-	result, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1)
+	result, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1)
 	if err != nil || result.State != "released" {
 		t.Fatal(result, err)
 	}
@@ -67,7 +67,7 @@ func TestManagedSessionArchiveOrdersConcurrentInput(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			<-start
-			_, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1)
+			_, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1)
 			if err != nil {
 				t.Error(err)
 			}
@@ -78,7 +78,7 @@ func TestManagedSessionArchiveOrdersConcurrentInput(t *testing.T) {
 		if err := s.pool.QueryRow(t.Context(), "SELECT count(*) FROM environment_input_reservations WHERE session_id=$1 AND state='pending'", session.ID).Scan(&pending); err != nil || pending != 0 {
 			t.Fatal("input survived concurrent archive", pending, err)
 		}
-		if row, err := s.GetSession(t.Context(), tenant, session.ID); err != nil || row.Environment.Status != "expired" {
+		if row, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID); err != nil || row.Environment.Status != "expired" {
 			t.Fatal("concurrent input revived Environment", row, err)
 		}
 	}
@@ -87,7 +87,7 @@ func TestManagedSessionArchiveOrdersConcurrentInput(t *testing.T) {
 func TestManagedSessionArchiveRejectsFileManagedDeployment(t *testing.T) {
 	s, w, _ := managerFixture(t, 1, 1)
 	tenant, session := managedArchiveSession(t, s, managerSessionInput(uuid.NewString()))
-	if _, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 0); !errors.Is(err, deployment.ErrConflict) {
+	if _, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 0); !errors.Is(err, deployment.ErrConflict) {
 		t.Fatal("archive accepted file-managed deployment", err)
 	}
 }
diff --git a/services/core/internal/store/admin_session_archive_test.go b/services/core/internal/store/admin_session_archive_test.go
index 511a6f458..d35a6477a 100644
--- a/services/core/internal/store/admin_session_archive_test.go
+++ b/services/core/internal/store/admin_session_archive_test.go
@@ -67,37 +67,35 @@ func TestManagedSessionArchiveUnallocatedAndGuards(t *testing.T) {
 	input.InitialInputs = []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"waiting"}`)}}
 	tenant, session := managedArchiveSession(t, s, input)
 	ctx := adminDeleteContext(t.Context(), tenant, uuid.NewString())
-	active, err := s.GetManagedSessionArchive(t.Context(), tenant, session.ID)
+	active, err := sessionAdapter(s).GetManagedSessionArchive(t.Context(), tenant, session.ID)
 	if err != nil || active.State != "active" || active.SessionID != session.ID || active.EnvironmentID != session.Environment.ID {
 		t.Fatal("unallocated Session status", active, err)
 	}
 	for _, generation := range []uint64{0, 2, ^uint64(0)} {
-		if _, err := w.ArchiveManagedSession(ctx, tenant, session.ID, generation); !errors.Is(err, deployment.ErrConflict) {
+		var stale *deployment.GenerationStaleError
+		if _, err := deploymentExecution(t, w).ArchiveSession(ctx, tenant, session.ID, generation); !errors.As(err, &stale) || stale.CurrentGeneration != 1 || !errors.Is(err, deployment.ErrConflict) {
 			t.Fatal("archive accepted wrong generation", generation, err)
 		}
 	}
-	if _, err := s.ArchiveManagedSession(ctx, tenant, session.ID, 1); !errors.Is(err, ErrExecutionAuthority) {
-		t.Fatal("unleased archive accepted", err)
-	}
 	for _, other := range []string{uuid.NewString(), "malformed"} {
-		if _, err := w.ArchiveManagedSession(ctx, tenant, other, 1); !errors.Is(err, sessions.ErrNotFound) {
+		if _, err := deploymentExecution(t, w).ArchiveSession(ctx, tenant, other, 1); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal("unknown archive", err)
 		}
-		if _, err := s.GetManagedSessionArchive(ctx, tenant, other); !errors.Is(err, sessions.ErrNotFound) {
+		if _, err := sessionAdapter(s).GetManagedSessionArchive(ctx, tenant, other); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal("unknown status", err)
 		}
 	}
-	if _, err := w.ArchiveManagedSession(ctx, uuid.NewString(), session.ID, 1); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := deploymentExecution(t, w).ArchiveSession(ctx, uuid.NewString(), session.ID, 1); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign archive", err)
 	}
-	if _, err := s.GetManagedSessionArchive(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetManagedSessionArchive(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign status", err)
 	}
-	result, err := w.ArchiveManagedSession(ctx, tenant, session.ID, 1)
+	result, err := deploymentExecution(t, w).ArchiveSession(ctx, tenant, session.ID, 1)
 	if err != nil || result.State != "released" {
 		t.Fatal("unallocated archive", result, err)
 	}
-	row, err := s.GetSession(t.Context(), tenant, session.ID)
+	row, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || row.Environment.Status != "expired" || row.EnvironmentFailure != nil || row.PendingInput || row.EnvironmentInputActivity != nil || row.LastTurn != nil {
 		t.Fatal("archive fabricated failed execution", row, err)
 	}
@@ -106,11 +104,11 @@ func TestManagedSessionArchiveUnallocatedAndGuards(t *testing.T) {
 		t.Fatal("archive left pending initial input", reservationState, err)
 	}
 	before := adminMutationSnapshot(t, s, "sessions", "environments", "environment_input_reservations", "session_events")
-	retry, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1)
+	retry, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1)
 	if err != nil || retry != result || !reflect.DeepEqual(before, adminMutationSnapshot(t, s, "sessions", "environments", "environment_input_reservations", "session_events")) {
 		t.Fatal("archive retry changed Session history", retry, err)
 	}
-	if status, err := s.GetManagedSessionArchive(ctx, tenant, session.ID); err != nil || status != result {
+	if status, err := sessionAdapter(s).GetManagedSessionArchive(ctx, tenant, session.ID); err != nil || status != result {
 		t.Fatal("status differs from committed archive", status, err)
 	}
 	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, deployment.ErrInvalidInput) {
@@ -146,7 +144,7 @@ func TestManagedSessionArchiveRetainsHistoryAndSettledResources(t *testing.T) {
 	transition(t, w, tenant, session.ID, input.TurnID, sessions.TurnInProgress, sessions.TurnCompleted)
 	history := adminMutationSnapshot(t, s, "sessions", "turns", "session_items", "session_artifacts", "source_files", "pg_largeobject", "pg_largeobject_metadata")
 	request := uuid.NewString()
-	result, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, request), tenant, session.ID, 1)
+	result, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, request), tenant, session.ID, 1)
 	if err != nil || result.State != "cleanup_pending" {
 		t.Fatal(result, err)
 	}
@@ -167,7 +165,7 @@ func TestManagedSessionArchiveRetainsHistoryAndSettledResources(t *testing.T) {
 	if _, err := deploymentExecution(t, w).RequestCleanup(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
-	current, err := s.GetSession(t.Context(), tenant, session.ID)
+	current, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || current.EnvironmentFailure != nil || current.LastTurn == nil || current.LastTurn.Status != sessions.TurnCompleted || current.Environment.Status != "expired" {
 		t.Fatal("cleanup rewrote completed outcome", current, err)
 	}
@@ -177,7 +175,7 @@ func TestManagedSessionArchiveRetainsHistoryAndSettledResources(t *testing.T) {
 	if _, err := deploymentExecution(t, w).ReleaseAllocation(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
-	if result, err := s.GetManagedSessionArchive(t.Context(), tenant, session.ID); err != nil || result.State != "released" {
+	if result, err := sessionAdapter(s).GetManagedSessionArchive(t.Context(), tenant, session.ID); err != nil || result.State != "released" {
 		t.Fatal("release not reflected", result, err)
 	}
 	page, err := sessionAdapter(s).ListSessionArtifacts(t.Context(), tenant, session.ID, "", "", 100, true)
@@ -214,12 +212,12 @@ func TestManagedSessionArchiveAuditFailureRollsBack(t *testing.T) {
 	tables := []string{"sessions", "environments", "turns", "session_events", "devices", "runtime_allocations", "runtime_placements", "environment_input_reservations", "admin_audit_log"}
 	before := adminMutationSnapshot(t, s, tables...)
 	count := adminAuditRejections(t, s)
-	_, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, rejectedAdminRequest), tenant, session.ID, 1)
+	_, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, rejectedAdminRequest), tenant, session.ID, 1)
 	requireAdminAuditFailure(t, s, err, count)
 	if !reflect.DeepEqual(before, adminMutationSnapshot(t, s, tables...)) {
 		t.Fatal("failed audit retained archive, revocation or cancellation")
 	}
-	if _, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1); err != nil {
+	if _, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1); err != nil {
 		t.Fatal(err)
 	}
 	turn, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session.ID, input.TurnID)
@@ -238,23 +236,23 @@ func TestManagedSessionArchivePreservesFailuresAndRejectsSelfHosted(t *testing.T
 	if err := sessionExecution(t, w.lease).FailEnvironmentInitialization(t.Context(), sessions.EnvironmentInitialization{EnvironmentID: owner.EnvironmentID, SessionID: owner.SessionID, TenantID: owner.TenantID, DeviceID: owner.DeviceID}, sessions.ProvisioningFailure{Step: sessions.ProvisioningSetupCommand, Index: 0, ExitCode: 2}); err != nil {
 		t.Fatal(err)
 	}
-	failed, err := s.GetSession(t.Context(), tenant, session.ID)
+	failed, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || failed.EnvironmentFailure == nil {
 		t.Fatal("failure fixture", err)
 	}
 	otherTenant, selfHosted := managedArchiveSession(t, s, environmentInput(uuid.NewString(), "self_hosted", "/workspace"))
-	if _, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1); err != nil {
+	if _, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1); err != nil {
 		t.Fatal(err)
 	}
-	after, err := s.GetSession(t.Context(), tenant, session.ID)
+	after, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || !reflect.DeepEqual(after.EnvironmentFailure, failed.EnvironmentFailure) || after.Environment.Status != "failed" {
 		t.Fatal("archive changed recorded provisioning failure", after, err)
 	}
 	before := adminMutationSnapshot(t, s, "sessions", "environments", "admin_audit_log")
-	if _, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), otherTenant, uuid.NewString()), otherTenant, selfHosted.ID, 1); !errors.Is(err, sessions.ErrInvalidInput) {
+	if _, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), otherTenant, uuid.NewString()), otherTenant, selfHosted.ID, 1); !errors.Is(err, sessions.ErrInvalidInput) {
 		t.Fatal("self-hosted archive accepted", err)
 	}
-	if _, err := s.GetManagedSessionArchive(t.Context(), otherTenant, selfHosted.ID); !errors.Is(err, sessions.ErrInvalidInput) {
+	if _, err := sessionAdapter(s).GetManagedSessionArchive(t.Context(), otherTenant, selfHosted.ID); !errors.Is(err, sessions.ErrInvalidInput) {
 		t.Fatal("self-hosted cleanup projected", err)
 	}
 	if !reflect.DeepEqual(before, adminMutationSnapshot(t, s, "sessions", "environments", "admin_audit_log")) {
diff --git a/services/core/internal/store/admin_session_archive_worker_http_test.go b/services/core/internal/store/admin_session_archive_worker_http_test.go
index df4b565e1..3c86b135c 100644
--- a/services/core/internal/store/admin_session_archive_worker_http_test.go
+++ b/services/core/internal/store/admin_session_archive_worker_http_test.go
@@ -11,6 +11,7 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
 
@@ -27,8 +28,9 @@ import (
 	"github.com/google/uuid"
 )
 
-// Use the original Store for administrator reads, as server startup does, and
-// route archive writes through the real Worker's execution-owned Store clone.
+// Serve administrator reads from the pooled Session adapter and archive through
+// the deployment execution operations on the Worker's lease, as server startup
+// does.
 func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	_, pool := store.NewManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{83}, 32))
@@ -52,7 +54,15 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	}, func(_ context.Context, setup deployment.Setup) (execution.PreparedRuntimeDeployment, error) {
 		return execution.PreparedRuntimeDeployment{Config: providerConfig(setup)}, nil
 	})
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
+	lease, err := pgunit.AcquireLease(t.Context(), pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	owner, err := fixtureOwner(db, s, lease)
+	if err != nil {
+		t.Fatal(errors.Join(err, lease.Close(t.Context())))
+	}
+	worker := startOwnedWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration}, owner)
 	var once sync.Once
 	stop := func() {
 		once.Do(func() {
@@ -82,7 +92,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 		return session
 	}
 	active, untouched := create(), create()
-	owner, err := worker.ProvisionEnvironment(t.Context(), project.TenantID, active.Environment.ID, installation)
+	allocated, err := worker.ProvisionEnvironment(t.Context(), project.TenantID, active.Environment.ID, installation)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -90,14 +100,11 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.ArchiveManagedSession(ctx, project.TenantID, active.ID, 1); !errors.Is(err, store.ErrExecutionAuthority) {
-		t.Fatal("fixture admission Store unexpectedly holds execution ownership", err)
-	}
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential("archive-administrator")})
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, s, db, nil, "codex", storeKeys(s), workerExecution(worker), withCoreKeys(admin))
+	handler, err := publicHandler(t, s, db, nil, "codex", storeKeys(s), workerExecution(t, worker), func(d *api.Dependencies) { d.Execution.SessionArchive = owner.Deployment }, withCoreKeys(admin))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -113,10 +120,10 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	w := request(http.MethodPost, active.ID)
 	var archived sessions.ManagedArchive
 	if w.Code != http.StatusOK || json.Unmarshal(w.Body.Bytes(), &archived) != nil || archived.State != "cleanup_pending" || archived.SessionID != active.ID {
-		t.Fatalf("archive did not use Worker's leased Store: %d %s", w.Code, w.Body)
+		t.Fatalf("archive failed: %d %s", w.Code, w.Body)
 	}
 	allocation, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: project.TenantID, EnvironmentID: active.Environment.ID})
-	if err != nil || allocation.ID != owner.ID || allocation.State != "cleanup_pending" {
+	if err != nil || allocation.ID != allocated.ID || allocation.State != "cleanup_pending" {
 		t.Fatal("archive did not retain cleanup ownership", allocation, err)
 	}
 	turn, err := store.SessionAdapter(s).GetTurn(t.Context(), project.TenantID, active.ID, input.TurnID)
diff --git a/services/core/internal/store/admin_summary.go b/services/core/internal/store/admin_summary.go
index 97fffd512..d7578aaf0 100644
--- a/services/core/internal/store/admin_summary.go
+++ b/services/core/internal/store/admin_summary.go
@@ -51,7 +51,7 @@ func (s *Store) ReadAdminSummary(ctx context.Context, tenantID string, filter Ad
 				if err != nil {
 					return err
 				}
-				session, err = readSessionActivity(ctx, q, session)
+				session, err = sessionpg.LoadSessionActivity(ctx, q, session)
 				if err != nil {
 					return err
 				}
diff --git a/services/core/internal/store/agent_execution_defaults_http_test.go b/services/core/internal/store/agent_execution_defaults_http_test.go
index 95b9ead57..7b191ee3a 100644
--- a/services/core/internal/store/agent_execution_defaults_http_test.go
+++ b/services/core/internal/store/agent_execution_defaults_http_test.go
@@ -74,7 +74,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 	sessionID := id(call("POST", "/v1/agents/sessions", body, key, 201))
 	assertSnapshot := func(sessionID, model, endpoint, key string) {
 		t.Helper()
-		session, err := st.GetSession(t.Context(), tenant, sessionID)
+		session, err := store.SessionAdapter(st).GetSession(t.Context(), tenant, sessionID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -105,8 +105,9 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 	nativeHarness := strings.TrimSuffix(crossHarness, "}") + `,"x_agents_core":{"model_provider":{"protocol":"anthropic","base_url":"https://override.example/v1","api_key":"override-canary"}}}`
 	created := id(call("POST", "/v1/agents/sessions", nativeHarness, uuid.NewString(), 201))
 	assertSnapshot(created, "model-override", "https://override.example/v1", "override-canary")
-	resolved, err := st.GetSession(t.Context(), tenant, created)
-	frozen, providerErr := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, created)
+	reads := store.SessionAdapter(st)
+	resolved, err := reads.GetSession(t.Context(), tenant, created)
+	frozen, providerErr := reads.SessionModelExecution(t.Context(), tenant, created)
 	if err != nil || providerErr != nil || resolved.Engine != "claude_sdk" || frozen == nil || frozen.Protocol != "anthropic" {
 		t.Fatal("harness override did not freeze the native provider", err, providerErr)
 	}
diff --git a/services/core/internal/store/archive_cancellation_test.go b/services/core/internal/store/archive_cancellation_test.go
index 4c173ad2b..9c56f82eb 100644
--- a/services/core/internal/store/archive_cancellation_test.go
+++ b/services/core/internal/store/archive_cancellation_test.go
@@ -39,7 +39,6 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			heartbeat := scenario != "receipt_without_heartbeat"
 			s, db := newManagedTestStoreDB(t)
 			leased := executionOwner(t, db, s)
-			writer := leased.Store
 			t.Cleanup(func() {
 				if err := leased.Lease.Close(context.Background()); err != nil {
 					t.Error(err)
@@ -158,7 +157,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				go func() { revokeDone <- fixtureSessionService(t, db).RevokeDevice(t.Context(), h.tenant, owner.DeviceID) }()
 			}
 
-			archived, err := writer.ArchiveManagedSession(auditCtx, h.tenant, session.ID, 1)
+			archived, err := leased.Deployment.ArchiveSession(auditCtx, h.tenant, session.ID, 1)
 			if err != nil || archived.State != "cleanup_pending" {
 				t.Fatal(archived, err)
 			}
@@ -175,7 +174,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			// A repeat archive and cleanup must not recreate an explicitly
 			// cleared marker, nor erase the marker from a fresh archive.
 			repeatAudit := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "fixture-admin", ProjectID: projectID, RequestID: uuid.NewString(), TraceID: uuid.NewString()})
-			if _, err := writer.ArchiveManagedSession(repeatAudit, h.tenant, session.ID, 1); err != nil {
+			if _, err := leased.Deployment.ArchiveSession(repeatAudit, h.tenant, session.ID, 1); err != nil {
 				t.Fatal(err)
 			}
 			if _, err := leased.Deployment.RequestCleanup(t.Context(), owner); err != nil {
diff --git a/services/core/internal/store/archived_cancellation_migration_test.go b/services/core/internal/store/archived_cancellation_migration_test.go
index bd966700b..c3f53cb0c 100644
--- a/services/core/internal/store/archived_cancellation_migration_test.go
+++ b/services/core/internal/store/archived_cancellation_migration_test.go
@@ -19,7 +19,7 @@ func TestArchivedCancellationMigrationDoesNotAdoptOldRevocations(t *testing.T) {
 	input := submitMessage(t, s, tenant, session.ID, "waiting")
 	transition(t, w, tenant, session.ID, input.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
 	transition(t, w, tenant, session.ID, input.TurnID, sessions.TurnInProgress, sessions.TurnWaiting)
-	if _, err := w.ArchiveManagedSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1); err != nil {
+	if _, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 1); err != nil {
 		t.Fatal(err)
 	}
 	db := sql.OpenDB(stdlib.GetConnector(*s.pool.Config().ConnConfig))
diff --git a/services/core/internal/store/command_output_test.go b/services/core/internal/store/command_output_test.go
index b8e90e586..e2e1cb94f 100644
--- a/services/core/internal/store/command_output_test.go
+++ b/services/core/internal/store/command_output_test.go
@@ -42,7 +42,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	before, _ := s.SessionEventCursor(ctx, tenant, session.ID)
+	before, _ := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	// A bad command reference rolls back preceding valid fragments and their events.
 	if err := journal.AppendTurnEvents(ctx, tenant, session.ID, input.TurnID, 4, []sessions.ExecutionEvent{
 		event("command_output", `{"id":"cmd","delta":"rollback"}`),
@@ -50,7 +50,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	}); err == nil {
 		t.Fatal("unknown command accepted")
 	}
-	after, _ := s.SessionEventCursor(ctx, tenant, session.ID)
+	after, _ := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("rollback published output")
 	}
@@ -75,7 +75,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	}
 	// Reopening the Store recovers committed Items without creating events.
 	reopened := store.New(pool)
-	before, _ = s.SessionEventCursor(ctx, tenant, session.ID)
+	before, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	page, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 3 {
 		t.Fatalf("recovery: %+v %v", page, err)
@@ -83,11 +83,11 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	if page.Items[1].Status != "completed" || page.Items[1].Output != "authoritative" || page.Items[2].Status != "incomplete" || page.Items[2].Output != "已观察\n" {
 		t.Fatal("completion/cancellation lost command output", page.Items)
 	}
-	after, _ = s.SessionEventCursor(ctx, tenant, session.ID)
+	after, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("query replayed events")
 	}
-	if _, err := reopened.ListSessionEvents(ctx, uuid.NewString(), session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := store.SessionAdapter(reopened).ListSessionEvents(ctx, uuid.NewString(), session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign event access", err)
 	}
 	var fragments []string
@@ -95,7 +95,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	indexes := map[string]int32{}
 	cursor := int64(0)
 	for {
-		changes, err := reopened.ListSessionEvents(ctx, tenant, session.ID, cursor)
+		changes, err := store.SessionAdapter(reopened).ListSessionEvents(ctx, tenant, session.ID, cursor)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/creation_stream_settlement_public_test.go b/services/core/internal/store/creation_stream_settlement_public_test.go
index e50fd5360..7de1cccaf 100644
--- a/services/core/internal/store/creation_stream_settlement_public_test.go
+++ b/services/core/internal/store/creation_stream_settlement_public_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -173,7 +174,7 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 	if _, err := s.ReserveEnvironmentInput(t.Context(), tenant, first.Session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); err != nil {
 		t.Fatal(err)
 	}
-	if current, err := s.GetSession(t.Context(), tenant, first.Session.ID); err != nil || !current.PendingInput {
+	if current, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, first.Session.ID); err != nil || !current.PendingInput {
 		t.Fatal("later input is not pending", err)
 	}
 	retry := openStream(t, server, token, http.MethodPost, "/v1/agents/sessions", idle, "no-input")
@@ -206,14 +207,14 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 	if err := db.pool.QueryRow(t.Context(), "SELECT id FROM environment_input_reservations WHERE session_id=$1 AND is_initial", session).Scan(&reservation); err != nil {
 		t.Fatal(err)
 	}
-	cursor, err := s.SessionEventCursor(t.Context(), tenant, session)
+	cursor, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, session)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if settled, err := s.CancelEnvironmentInput(t.Context(), tenant, session, reservation); err != nil || settled.State != sessions.EnvironmentInputCancelled {
 		t.Fatal(settled.State, err)
 	}
-	if after, err := s.SessionEventCursor(t.Context(), tenant, session); err != nil || after != cursor {
+	if after, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, session); err != nil || after != cursor {
 		t.Fatal("cancellation recorded a Session event; this case needs a silent settlement", after, cursor, err)
 	}
 	fresh.ended(t, 5*time.Second)
diff --git a/services/core/internal/store/deployment_model_providers_http_test.go b/services/core/internal/store/deployment_model_providers_http_test.go
index 63866bca3..0b0848aa9 100644
--- a/services/core/internal/store/deployment_model_providers_http_test.go
+++ b/services/core/internal/store/deployment_model_providers_http_test.go
@@ -194,7 +194,7 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 	if providerOf(hostedID) != "deployment-canary" {
 		t.Fatal("hosted Session did not freeze the deployment default")
 	}
-	projection, err := st.GetSessionExecutionConfiguration(t.Context(), tenant, hostedID)
+	projection, err := store.SessionAdapter(st).GetSessionExecutionConfiguration(t.Context(), tenant, hostedID)
 	if err != nil || projection.ModelProvider.Source != "deployment" || projection.ModelProvider.Status != "available" || projection.ModelProvider.Configuration == nil || projection.ModelProvider.Configuration.BaseURL != "https://deployment.example/v1" {
 		t.Fatal("deployment selection not recorded", projection, err)
 	}
@@ -271,7 +271,7 @@ func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
 		got, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, legacy.ID, pending.ID)
 		return err == nil && got.State == sessions.EnvironmentInputFailed
 	})
-	session, err := h.s.GetSession(t.Context(), h.tenant, legacy.ID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, legacy.ID)
 	if err != nil || session.EnvironmentInputActivity == nil || session.EnvironmentInputActivity.Failure != "model_provider_required" {
 		t.Fatal("legacy reservation did not fail with its reason", session.EnvironmentInputActivity, err)
 	}
diff --git a/services/core/internal/store/environment_admission_test.go b/services/core/internal/store/environment_admission_test.go
index 5aae0496f..48f5a5d89 100644
--- a/services/core/internal/store/environment_admission_test.go
+++ b/services/core/internal/store/environment_admission_test.go
@@ -92,7 +92,7 @@ func TestEnvironmentAdmissionWaitsForPreparedClaimAndRetainsRetry(t *testing.T)
 		default:
 		}
 	}
-	session, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity == nil || session.EnvironmentInputActivity.Status != "requires_action" {
 		t.Fatal("waiting activity", session, err)
 	}
@@ -186,7 +186,7 @@ func TestEnvironmentAdmissionSettlementDoesNotCreateTurn(t *testing.T) {
 				}
 			case "deleted":
 				expected = sessions.ErrNotFound
-				if err := h.s.DeleteSession(t.Context(), h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := store.SessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("pending input deleted", err)
 				}
 				if err := h.s.CommitLegacyDeletion(t.Context(), h.tenant, h.session.ID); err != nil {
diff --git a/services/core/internal/store/environment_claim_worker_test.go b/services/core/internal/store/environment_claim_worker_test.go
index 8efa54b68..a3b57b5b2 100644
--- a/services/core/internal/store/environment_claim_worker_test.go
+++ b/services/core/internal/store/environment_claim_worker_test.go
@@ -26,7 +26,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 			}
 			turnID := got.Receipts[0].TurnID
 			if deleted {
-				if err := s.DeleteSession(t.Context(), tenant, pending.SessionID); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: pending.SessionID}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("claimed Session deleted", err)
 				}
 				if err := s.CommitLegacyDeletion(t.Context(), tenant, pending.SessionID); err != nil {
diff --git a/services/core/internal/store/environment_connection_events_test.go b/services/core/internal/store/environment_connection_events_test.go
index 135b9c5a7..f5dfc950f 100644
--- a/services/core/internal/store/environment_connection_events_test.go
+++ b/services/core/internal/store/environment_connection_events_test.go
@@ -39,7 +39,7 @@ func retainedEnvironmentEvents(t *testing.T, ctx context.Context, s *store.Store
 	var after int64
 	events := []v1.SessionEvent{}
 	for {
-		changes, err := s.ListSessionEvents(ctx, tenant, session, after)
+		changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session, after)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/environment_connections_test.go b/services/core/internal/store/environment_connections_test.go
index 5c8fe9407..79242db7c 100644
--- a/services/core/internal/store/environment_connections_test.go
+++ b/services/core/internal/store/environment_connections_test.go
@@ -37,7 +37,7 @@ func connectionSnapshot(t *testing.T, pool *pgxpool.Pool, id string) string {
 
 func connectionChanges(t *testing.T, s *Store, tenant, session string) []sessions.SessionChange {
 	t.Helper()
-	all, err := s.ListSessionEvents(t.Context(), tenant, session, 0)
+	all, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -186,7 +186,7 @@ func TestEnvironmentConnectionDoesNotReviveDeletedOrTerminalResources(t *testing
 				t.Fatal(err)
 			}
 			if status == "deleted" {
-				if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+				if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 					t.Fatal(err)
 				}
 			} else {
diff --git a/services/core/internal/store/environment_device_test.go b/services/core/internal/store/environment_device_test.go
index c9578f93d..46801cb71 100644
--- a/services/core/internal/store/environment_device_test.go
+++ b/services/core/internal/store/environment_device_test.go
@@ -37,7 +37,7 @@ func TestWorkerEnvironmentSelectsCapableDeviceWithoutMovingBinding(t *testing.T)
 			if _, err := fixtureSessionStore(h.db).GetSessionDevice(t.Context(), h.tenant, pending.SessionID); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("unregistered Runtime was assigned general compute", err)
 			}
-			session, err := h.s.GetSession(t.Context(), h.tenant, pending.SessionID)
+			session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, pending.SessionID)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/environment_directory_test.go b/services/core/internal/store/environment_directory_test.go
index d98cf67a4..4c24fa01d 100644
--- a/services/core/internal/store/environment_directory_test.go
+++ b/services/core/internal/store/environment_directory_test.go
@@ -130,7 +130,7 @@ func TestEnvironmentDirectoryWorkerReadsWithoutExecutionPrerequisites(t *testing
 	if got.err != nil || len(got.value.Entries) != 1 {
 		t.Fatal("directory result", got.err)
 	}
-	session, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity != nil {
 		t.Fatal("directory read manufactured execution")
 	}
diff --git a/services/core/internal/store/environment_executor_credentials_test.go b/services/core/internal/store/environment_executor_credentials_test.go
index 033ec501f..ad1de8b60 100644
--- a/services/core/internal/store/environment_executor_credentials_test.go
+++ b/services/core/internal/store/environment_executor_credentials_test.go
@@ -110,7 +110,7 @@ func TestEnvironmentExecutorCredentialLifecycle(t *testing.T) {
 	}
 	check(restarted, next.Token, false)
 	check(restarted, restored.Token, true)
-	if err := s.DeleteSession(ctx, tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	check(restarted, restored.Token, false)
@@ -172,7 +172,7 @@ func TestEnvironmentExecutorConcurrentIssueAndDeletion(t *testing.T) {
 			t.Error(err)
 		}
 	}()
-	if err := s.DeleteSession(ctx, tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	wg.Wait()
diff --git a/services/core/internal/store/environment_executor_management_test.go b/services/core/internal/store/environment_executor_management_test.go
index 3e0b373d8..e9f3bf138 100644
--- a/services/core/internal/store/environment_executor_management_test.go
+++ b/services/core/internal/store/environment_executor_management_test.go
@@ -135,7 +135,7 @@ func TestProjectEnvironmentExecutorManagement(t *testing.T) {
 		t.Fatal("audit actions", actions, rows.Err())
 	}
 
-	if err := s.DeleteSession(ctx, p.TenantID, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: p.TenantID, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := projectCredentials(ctx, s, p, one.ID); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/internal/store/environment_file_write_semantics_public_test.go b/services/core/internal/store/environment_file_write_semantics_public_test.go
index ef032e80e..7076eaa71 100644
--- a/services/core/internal/store/environment_file_write_semantics_public_test.go
+++ b/services/core/internal/store/environment_file_write_semantics_public_test.go
@@ -60,7 +60,7 @@ func TestEnvironmentFileCreateRejectionsLeaveNoReceiptOrConsumption(t *testing.T
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "tenant-b", TokenSHA256: runtimedevice.HashCredential(other), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(w))
+	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(t, w))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -169,7 +169,7 @@ func TestEnvironmentFileCreateRejectionsLeaveNoReceiptOrConsumption(t *testing.T
 	if got := states(); !reflect.DeepEqual(got, map[string]int{"rejected": 3, "committed": 1}) {
 		t.Fatal("successor receipt", got)
 	}
-	session, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("file writes created model execution", err)
 	}
diff --git a/services/core/internal/store/environment_file_writes_test.go b/services/core/internal/store/environment_file_writes_test.go
index d4fb1b3a0..68cc9c7c6 100644
--- a/services/core/internal/store/environment_file_writes_test.go
+++ b/services/core/internal/store/environment_file_writes_test.go
@@ -70,7 +70,7 @@ func TestEnvironmentFileWriteRetainsUnknownAcrossLeaseLoss(t *testing.T) {
 	if _, err := sessionAdapter(reopened).GetEnvironment(ctx, f.tenant, f.env.ID); err != nil {
 		t.Fatal("write gate prevented metadata read", err)
 	}
-	if _, err := reopened.GetSession(ctx, f.tenant, f.session.ID); err != nil {
+	if _, err := sessionAdapter(reopened).GetSession(ctx, f.tenant, f.session.ID); err != nil {
 		t.Fatal("write gate prevented recovery read", err)
 	}
 	if receipt, err := reopened.RequestCancel(ctx, f.tenant, f.session.ID, "idle-cancel"); err != nil || receipt.TurnID != "" {
@@ -113,7 +113,7 @@ func TestEnvironmentFileWriteMatchesReceiptAndRetainsDeletedOwner(t *testing.T)
 			t.Fatal("non-receipt settled write", state, err)
 		}
 	}
-	if err := f.s.DeleteSession(ctx, f.tenant, f.session.ID); err != nil {
+	if err := sessionService(t, f.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: f.tenant, SessionID: f.session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	if got, err := FixtureFileWrite(ctx, f.s.pool, f.tenant, f.env.ID, f.key.ID); err != nil || got.State != "pending" {
diff --git a/services/core/internal/store/environment_initial_input_test.go b/services/core/internal/store/environment_initial_input_test.go
index 1a9b2badf..ae58bba5b 100644
--- a/services/core/internal/store/environment_initial_input_test.go
+++ b/services/core/internal/store/environment_initial_input_test.go
@@ -74,7 +74,7 @@ func TestEnvironmentInitialExpiryRollsBackWithFailureEventAndSerializesPromotion
 			t.Fatal("expiry/promotion race started work", got)
 		}
 	}
-	events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+	events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 	if err != nil || len(events) != 2 || events[1].Event.Type != "agent.session.failed" {
 		t.Fatal("racing settlement duplicated or lost failure", events, err)
 	}
@@ -116,7 +116,7 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 				status, actionEnvironment = "", ""
 			}
 			requireEnvironmentInputActivity(t, s, tenant, session.ID, status, actionEnvironment)
-			events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, creation.Cursor)
+			events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, creation.Cursor)
 			expectedEvents := 1
 			if kind == "openai_hosted" {
 				expectedEvents = 0
@@ -172,7 +172,7 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 				t.Fatal(err)
 			}
 			environmentInputHistory(t, pool, session.ID, 1, 2)
-			after, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+			after, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 			if err != nil || !reflect.DeepEqual(events, after[:len(events)]) {
 				t.Fatal("initial snapshot changed after promotion", err)
 			}
@@ -221,7 +221,7 @@ func TestEnvironmentInitialInputExpiryHasNoTurnAndCannotReplay(t *testing.T) {
 			if failed.Environment.Status != "pending" || failed.LastTurn != nil || failed.PendingInput || !failed.EnvironmentInputActivity.LastActiveAt.Equal(*reservation.SettledAt) {
 				t.Fatal("input expiry changed Environment/Turn", failed)
 			}
-			events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+			events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 			expectedEvents := 2
 			if kind == "openai_hosted" {
 				expectedEvents = 1
@@ -261,21 +261,21 @@ func TestEnvironmentInitialInputExpiryHasNoTurnAndCannotReplay(t *testing.T) {
 				t.Fatal("later submission inferred initial origin")
 			}
 			requireEnvironmentInputActivity(t, reopened, tenant, session.ID, "idle", "")
-			after, err := reopened.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+			after, err := sessionAdapter(reopened).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 			if err != nil || len(after) < len(events) || !reflect.DeepEqual(events, after[:len(events)]) {
 				t.Fatal("later work changed historical failure", err)
 			}
 			// The later input is still pending, so deletion waits for it to settle.
-			if err := reopened.DeleteSession(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+			if err := sessionService(t, reopened).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 				t.Fatal("pending later input deleted", err)
 			}
 			if _, err := reopened.CancelEnvironmentInput(t.Context(), tenant, session.ID, later.ID); err != nil {
 				t.Fatal(err)
 			}
-			if err := reopened.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+			if err := sessionService(t, reopened).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 				t.Fatal(err)
 			}
-			if _, err := reopened.GetSession(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sessionAdapter(reopened).GetSession(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("deleted initial Session remained visible", err)
 			}
 		})
diff --git a/services/core/internal/store/environment_initialization_test.go b/services/core/internal/store/environment_initialization_test.go
index 05b4be525..874ef9507 100644
--- a/services/core/internal/store/environment_initialization_test.go
+++ b/services/core/internal/store/environment_initialization_test.go
@@ -160,7 +160,7 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 				if peer.writes.Load() != expected {
 					t.Fatal("failed, unavailable or revoked effect replayed", peer.writes.Load())
 				}
-				value, err := s.GetSession(t.Context(), principal.TenantID, session.ID)
+				value, err := store.SessionAdapter(s).GetSession(t.Context(), principal.TenantID, session.ID)
 				if err != nil || value.EnvironmentFailure == nil {
 					t.Fatal("failure lost shared Session state", err)
 				}
diff --git a/services/core/internal/store/environment_input_activity_test.go b/services/core/internal/store/environment_input_activity_test.go
index af7f32f8d..2dd6a8cd9 100644
--- a/services/core/internal/store/environment_input_activity_test.go
+++ b/services/core/internal/store/environment_input_activity_test.go
@@ -14,7 +14,7 @@ import (
 
 func requireEnvironmentInputActivity(t *testing.T, s *Store, tenant, session, status, environment string) sessions.Session {
 	t.Helper()
-	value, err := s.GetSession(t.Context(), tenant, session)
+	value, err := sessionAdapter(s).GetSession(t.Context(), tenant, session)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -26,7 +26,7 @@ func requireEnvironmentInputActivity(t *testing.T, s *Store, tenant, session, st
 	} else if activity == nil || activity.Status != status || activity.EnvironmentID != environment || activity.LastActiveAt.IsZero() {
 		t.Fatal("input activity", activity, status, environment)
 	}
-	page, err := s.ListSessions(t.Context(), tenant, "", 100, false, nil)
+	page, err := sessionAdapter(s).ListSessions(t.Context(), tenant, "", 100, false, nil)
 	if err != nil || len(page.Sessions) != 1 || !reflect.DeepEqual(page.Sessions[0].EnvironmentInputActivity, activity) {
 		t.Fatal("list and retrieve activity differ", err)
 	}
@@ -47,7 +47,7 @@ func TestEnvironmentInputActivityWaitsBeforeTurnAndClearsOnConnection(t *testing
 		t.Fatal("waiting input fabricated a Turn")
 	}
 	environmentInputHistory(t, pool, session.ID, 0, 0)
-	first, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+	first, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 	if err != nil || len(first) != 1 || first[0].Event.Type != "agent.session.requires_action" || first[0].Turn != nil || first[0].EnvironmentInputActivity == nil {
 		t.Fatal("missing pre-Turn snapshot", first, err)
 	}
@@ -64,7 +64,7 @@ func TestEnvironmentInputActivityWaitsBeforeTurnAndClearsOnConnection(t *testing
 	if idle.LastTurn != nil {
 		t.Fatal("connection fabricated readiness or Turn")
 	}
-	changes, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+	changes, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 	if err != nil || len(changes) != 3 || changes[1].Event.Type != "agent.session.environment.connected" || changes[2].Event.Type != "agent.session.idle" {
 		t.Fatal("connection/action order", changes, err)
 	}
@@ -92,7 +92,7 @@ func TestEnvironmentInputActivityWaitsBeforeTurnAndClearsOnConnection(t *testing
 	if active.LastTurn == nil || active.LastTurn.Status != sessions.TurnInProgress {
 		t.Fatal("normal Turn did not take ownership")
 	}
-	if _, err := s.GetSession(t.Context(), uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetSession(t.Context(), uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign Session activity visible", err)
 	}
 }
@@ -111,11 +111,11 @@ func TestEnvironmentInputActivitySettlementAndNewerWork(t *testing.T) {
 				t.Fatal(err)
 			}
 			reservation := reserveEnvironmentInput(t, s, tenant, session.ID, "waiting")
-			value, err := s.GetSession(t.Context(), tenant, session.ID)
+			value, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 			if err != nil || value.LastTurn.Status != sessions.TurnFailed || value.EnvironmentInputActivity.Status != "requires_action" || !value.PendingInput {
 				t.Fatal("prior failure hid waiting input", err)
 			}
-			waitingCursor, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+			waitingCursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -143,16 +143,16 @@ func TestEnvironmentInputActivitySettlementAndNewerWork(t *testing.T) {
 			// The settled later reservation no longer counts as pending input, so
 			// creation streams can end instead of waiting for work that cannot start.
 			settled := requireEnvironmentInputActivity(t, s, tenant, session.ID, "idle", "")
-			events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, waitingCursor)
+			events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, waitingCursor)
 			if err != nil || settled.PendingInput || len(events) != 1 || events[0].Event.Type != "agent.session.idle" || events[0].Turn != nil || !events[0].Settled {
 				t.Fatal("settled reservation remained pending", settled.EnvironmentInputActivity, events, err)
 			}
-			cursor, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+			cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
 			reserveEnvironmentInput(t, s, tenant, session.ID, "waiting")
-			if after, err := s.SessionEventCursor(t.Context(), tenant, session.ID); err != nil || after != cursor {
+			if after, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID); err != nil || after != cursor {
 				t.Fatal("settled retry repeated activity", after, cursor, err)
 			}
 			if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "newer", []sessions.Input{messageInput("newer")}); err != nil {
@@ -231,27 +231,27 @@ func TestEnvironmentInputActivityRecoversWaitingActionAndHidesDeletion(t *testin
 	if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(reservation.Deadline) {
 		t.Fatal("recovery changed waiting input or its deadline", got, err)
 	}
-	cursor, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if err := sessionExecution(t, next.lease).ObserveEnvironmentConnection(t.Context(), tenant, environment, generation, 2, true); err != nil {
 		t.Fatal(err)
 	}
-	if after, err := s.SessionEventCursor(t.Context(), tenant, session.ID); err != nil || after != cursor {
+	if after, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID); err != nil || after != cursor {
 		t.Fatal("retired generation changed activity", after, cursor, err)
 	}
 	environmentInputHistory(t, pool, session.ID, 0, 0)
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("waiting input deleted", err)
 	}
 	if err := s.commitLegacyDeletion(t.Context(), tenant, session.ID); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.GetSession(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("deleted activity remained visible", err)
 	}
-	if _, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("deleted activity events remained visible", err)
 	}
 }
diff --git a/services/core/internal/store/environment_input_claim_test.go b/services/core/internal/store/environment_input_claim_test.go
index 4f588dad2..8ce51ee8d 100644
--- a/services/core/internal/store/environment_input_claim_test.go
+++ b/services/core/internal/store/environment_input_claim_test.go
@@ -12,7 +12,7 @@ func TestEnvironmentInputConcurrentPromotionClaimsOnce(t *testing.T) {
 	writer := executionWriter(t, s)
 	tenant, session := environmentInputSession(t, s)
 	pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-	reservationCursor, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+	reservationCursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -58,7 +58,7 @@ func TestEnvironmentInputConcurrentPromotionClaimsOnce(t *testing.T) {
 		t.Fatal("promotion did not persist its execution claim", turn, err)
 	}
 	environmentInputHistory(t, pool, session.ID, 1, 2)
-	changes, err := s.ListSessionEvents(t.Context(), tenant, session.ID, reservationCursor)
+	changes, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, reservationCursor)
 	if err != nil || len(changes) < 2 {
 		t.Fatal("missing promotion events", changes, err)
 	}
@@ -77,7 +77,7 @@ func TestEnvironmentInputConcurrentPromotionClaimsOnce(t *testing.T) {
 	}
 	transition(t, writer, tenant, session.ID, turnID, sessions.TurnInProgress, sessions.TurnCompleted)
 	later := reserveEnvironmentInput(t, s, tenant, session.ID, "later")
-	cursor, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -85,7 +85,7 @@ func TestEnvironmentInputConcurrentPromotionClaimsOnce(t *testing.T) {
 	if err != nil || len(retry.Receipts) != 2 || !retry.Receipts[0].Replayed || retry.Receipts[0].TurnID != turnID {
 		t.Fatal("terminal retry reclaimed execution", retry, err)
 	}
-	after, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+	after, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 	if err != nil || after != cursor {
 		t.Fatal("terminal retry published events", after, cursor, err)
 	}
diff --git a/services/core/internal/store/environment_input_expiry_test.go b/services/core/internal/store/environment_input_expiry_test.go
index bcc6ecd97..f733964f8 100644
--- a/services/core/internal/store/environment_input_expiry_test.go
+++ b/services/core/internal/store/environment_input_expiry_test.go
@@ -112,7 +112,7 @@ func TestEnvironmentExpirySerializesWithTargetedSettlement(t *testing.T) {
 				case "cancel":
 					_, err = s.CancelEnvironmentInput(t.Context(), tenant, session.ID, pending.ID)
 				case "delete":
-					err = s.DeleteSession(t.Context(), tenant, session.ID)
+					err = sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID})
 				}
 				results <- err
 			}()
diff --git a/services/core/internal/store/environment_input_settlement_test.go b/services/core/internal/store/environment_input_settlement_test.go
index 82039e2d7..874d8958a 100644
--- a/services/core/internal/store/environment_input_settlement_test.go
+++ b/services/core/internal/store/environment_input_settlement_test.go
@@ -236,7 +236,7 @@ func TestEnvironmentInputDeletionSettlesPendingAndFencesPromotion(t *testing.T)
 				}()
 			}
 			if !concurrent {
-				if err := s.DeleteSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("pending input deleted", err)
 				}
 			}
diff --git a/services/core/internal/store/environment_installation_test.go b/services/core/internal/store/environment_installation_test.go
index 20c4726e4..2b25b5e38 100644
--- a/services/core/internal/store/environment_installation_test.go
+++ b/services/core/internal/store/environment_installation_test.go
@@ -94,7 +94,7 @@ func TestEnvironmentInstallationClaimLifetimeAndRetries(t *testing.T) {
 	if err := installations.ClaimEnvironmentInstallation(ctx, token, "build", secrets[winner]); !errors.Is(err, sessions.ErrExecutorCredentialExists) {
 		t.Fatal("revoked key resurrected", err)
 	}
-	if err := s.DeleteSession(ctx, p.TenantID, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: p.TenantID, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := installations.ValidateEnvironmentInstallation(ctx, token, "build"); !errors.Is(err, sessions.ErrInstallationAuthorization) {
diff --git a/services/core/internal/store/environment_mcp_public_test.go b/services/core/internal/store/environment_mcp_public_test.go
index 35a0c47d4..20e61f076 100644
--- a/services/core/internal/store/environment_mcp_public_test.go
+++ b/services/core/internal/store/environment_mcp_public_test.go
@@ -17,7 +17,7 @@ func TestPublicEnvironmentMCPUsesAttachedVaultSelection(t *testing.T) {
 		t.Run(kind, func(t *testing.T) {
 			s, db, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
 			auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test", TenantID: tenant, TokenSHA256: runtimedevice.HashCredential("test-token")}})
-			handler, err := publicHandler(t, s, db, auth, kind, workerExecution(&execution.Worker{}), executorURL("https://executor.example"))
+			handler, err := publicHandler(t, s, db, auth, kind, workerExecution(t, &execution.Worker{}), executorURL("https://executor.example"))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/environment_skill_references_test.go b/services/core/internal/store/environment_skill_references_test.go
index a0820cf48..ce84a78b8 100644
--- a/services/core/internal/store/environment_skill_references_test.go
+++ b/services/core/internal/store/environment_skill_references_test.go
@@ -69,7 +69,7 @@ func TestSkillReferencesFreezeWithinSessionCreation(t *testing.T) {
 		if err != nil || len(setup.Skills) != 1 || setup.Skills[0].Metadata.Type != "skill_reference" || setup.Skills[0].Metadata.SkillID != skill.ID || setup.Skills[0].Metadata.Version != version || !bytes.Equal(setup.Skills[0].Archive, archive) {
 			t.Fatal("incorrect frozen installation", err)
 		}
-		session, err := s.GetSession(t.Context(), tenant, id)
+		session, err := sessionAdapter(s).GetSession(t.Context(), tenant, id)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/environment_work_test.go b/services/core/internal/store/environment_work_test.go
index 2ba9a501c..5085d3585 100644
--- a/services/core/internal/store/environment_work_test.go
+++ b/services/core/internal/store/environment_work_test.go
@@ -27,7 +27,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 				t.Fatal(err)
 			}
 		case "deleted":
-			if err := h.s.DeleteSession(t.Context(), h.tenant, pending.SessionID); !errors.Is(err, sessions.ErrNotIdle) {
+			if err := store.SessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: pending.SessionID}); !errors.Is(err, sessions.ErrNotIdle) {
 				t.Fatal("pending input deleted", err)
 			}
 			if err := h.s.CommitLegacyDeletion(t.Context(), h.tenant, pending.SessionID); err != nil {
diff --git a/services/core/internal/store/environment_worker_helpers_test.go b/services/core/internal/store/environment_worker_helpers_test.go
index 8e6dcfefd..d39561867 100644
--- a/services/core/internal/store/environment_worker_helpers_test.go
+++ b/services/core/internal/store/environment_worker_helpers_test.go
@@ -34,7 +34,7 @@ func workerEnvironmentCapabilities() proto.AgentKindCapabilities {
 func workerEnvironmentReservation(t *testing.T, h *dispatchHarness) sessions.EnvironmentInputReservation {
 	t.Helper()
 	pending := unboundWorkerEnvironmentReservation(t, h)
-	session, err := h.s.GetSession(t.Context(), h.tenant, pending.SessionID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, pending.SessionID)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/environment_worker_scan_test.go b/services/core/internal/store/environment_worker_scan_test.go
index 64fe1191f..f160dbb04 100644
--- a/services/core/internal/store/environment_worker_scan_test.go
+++ b/services/core/internal/store/environment_worker_scan_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerEnvironmentRetriesNewlyReadyAtNextScan(t *testing.T) {
@@ -59,7 +60,7 @@ func TestWorkerEnvironmentPaginationReachesReadyTail(t *testing.T) {
 			last = pending
 		}
 	}
-	session, err := h.s.GetSession(t.Context(), h.tenant, last.SessionID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, last.SessionID)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/environments_test.go b/services/core/internal/store/environments_test.go
index d423b4156..362c87b58 100644
--- a/services/core/internal/store/environments_test.go
+++ b/services/core/internal/store/environments_test.go
@@ -62,7 +62,7 @@ func TestEnvironmentOwnershipPersistsAndStaysScoped(t *testing.T) {
 			if _, err := s.CreateSession(ctx, tenant, changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 				t.Fatal("changed configuration accepted", err)
 			}
-			if _, err := s.UpdateSessionMetadata(ctx, tenant, session.ID, map[string]string{"updated": "yes"}); err != nil {
+			if _, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: session.ID, Metadata: map[string]string{"updated": "yes"}}); err != nil {
 				t.Fatal(err)
 			}
 			pool.Close()
@@ -153,7 +153,7 @@ func TestEnvironmentCreationWinnerOwnsSnapshotAndIdentity(t *testing.T) {
 		t.Fatal(reservations, err)
 	}
 	environmentInputHistory(t, pool, first.creation.Session.ID, 0, 0)
-	events, err := s.ListSessionEvents(ctx, tenant, first.creation.Session.ID, 0)
+	events, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, first.creation.Session.ID, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -174,7 +174,7 @@ func TestEnvironmentCreationWinnerOwnsSnapshotAndIdentity(t *testing.T) {
 	if err != nil || !reflect.DeepEqual(environment, first.environment) {
 		t.Fatal(environment, err)
 	}
-	after, err := restarted.ListSessionEvents(ctx, tenant, found.Session.ID, 0)
+	after, err := sessionAdapter(restarted).ListSessionEvents(ctx, tenant, found.Session.ID, 0)
 	if err != nil || !reflect.DeepEqual(events, after) {
 		t.Fatal("retry emitted work", err)
 	}
@@ -242,7 +242,7 @@ func TestEnvironmentDeletionHidesWithoutDestroyingOwnership(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := s.DeleteSession(ctx, tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := sessionAdapter(s).GetEnvironment(ctx, tenant, environment.ID); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/internal/store/execution_test.go b/services/core/internal/store/execution_test.go
index f2675a51b..c50428880 100644
--- a/services/core/internal/store/execution_test.go
+++ b/services/core/internal/store/execution_test.go
@@ -50,7 +50,7 @@ func sessionExecution(t *testing.T, lease *pgunit.Lease) *sessions.ExecutionOper
 // pool.
 func transitionTurn(ctx context.Context, s *Store, tenant, session, turn string, transition sessions.TurnTransition) (sessions.Turn, error) {
 	var moved sessions.Turn
-	err := s.withLockedSession(ctx, tenant, session, false, func(ctx context.Context, q *sqlc.Queries, id pgtype.UUID, _ sessions.LockedSession) error {
+	err := s.withSession(ctx, tenant, session, func(ctx context.Context, q *sqlc.Queries, id pgtype.UUID) error {
 		owner, err := parseID(tenant)
 		if err != nil {
 			return err
@@ -139,11 +139,11 @@ func TestExecutionLeaseLossFencesAllLifecycleWrites(t *testing.T) {
 	if err = SubmitFixtureFunctionResult(t.Context(), s, tenant, waiting.ID, waitInput.TurnID, call.CallID, json.RawMessage(`{"success":true,"output":"saved"}`)); err != nil {
 		t.Fatal(err)
 	}
-	before, err := s.GetSession(t.Context(), tenant, active.ID)
+	before, err := sessionAdapter(s).GetSession(t.Context(), tenant, active.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	cursor, err := s.SessionEventCursor(t.Context(), tenant, active.ID)
+	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, active.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -172,11 +172,11 @@ func TestExecutionLeaseLossFencesAllLifecycleWrites(t *testing.T) {
 	_, err = writer.ExpireEnvironmentInputs(t.Context())
 	mustReject("input expiry", err)
 	mustReject("ownership check", writer.lease.CheckOwnership(t.Context()))
-	after, err := s.GetSession(t.Context(), tenant, active.ID)
+	after, err := sessionAdapter(s).GetSession(t.Context(), tenant, active.ID)
 	if err != nil || !reflect.DeepEqual(before, after) {
 		t.Fatal("stale state persisted", after, err)
 	}
-	afterCursor, err := s.SessionEventCursor(t.Context(), tenant, active.ID)
+	afterCursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, active.ID)
 	if err != nil || afterCursor != cursor {
 		t.Fatal("stale events published", afterCursor, err)
 	}
@@ -290,29 +290,22 @@ func TestPooledStoreHasNoExecutionAuthority(t *testing.T) {
 	s, _ := testStore(t)
 	tenant, session := newTurnSession(t, s)
 	submitMessage(t, s, tenant, session.ID, "start")
-	before, err := s.GetSession(t.Context(), tenant, session.ID)
+	before, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	cursor, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, archiveErr := s.ArchiveManagedSession(t.Context(), tenant, session.ID, 0)
-	_, expiryErr := s.ExpireEnvironmentInputs(t.Context())
-	for name, err := range map[string]error{
-		"archive":      archiveErr,
-		"input expiry": expiryErr,
-	} {
-		if !errors.Is(err, ErrExecutionAuthority) {
-			t.Fatalf("pooled Store ran %s: %v", name, err)
-		}
+	if _, err := s.ExpireEnvironmentInputs(t.Context()); !errors.Is(err, ErrExecutionAuthority) {
+		t.Fatalf("pooled Store ran input expiry: %v", err)
 	}
-	after, err := s.GetSession(t.Context(), tenant, session.ID)
+	after, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || !reflect.DeepEqual(before, after) {
 		t.Fatal("rejected execution operation changed the Session", after, err)
 	}
-	if next, err := s.SessionEventCursor(t.Context(), tenant, session.ID); err != nil || next != cursor {
+	if next, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID); err != nil || next != cursor {
 		t.Fatal("rejected execution operation published events", next, err)
 	}
 }
diff --git a/services/core/internal/store/executor_principals_test.go b/services/core/internal/store/executor_principals_test.go
index 3754e390c..e6921f229 100644
--- a/services/core/internal/store/executor_principals_test.go
+++ b/services/core/internal/store/executor_principals_test.go
@@ -19,7 +19,7 @@ func TestExecutorPrincipalBeforeSessionAndSharedLifecycle(t *testing.T) {
 	if err != nil || issued.KeyID != keyID || issued.EnvironmentID != "" || len(issued.Token) != 43 {
 		t.Fatal("pre-Session principal issuance failed", err)
 	}
-	page, err := s.ListSessions(ctx, p.TenantID, "", 10, false, nil)
+	page, err := sessionAdapter(s).ListSessions(ctx, p.TenantID, "", 10, false, nil)
 	if err != nil || len(page.Sessions) != 0 {
 		t.Fatal("issuance created a Session", err)
 	}
@@ -92,7 +92,7 @@ func TestExecutorPrincipalBeforeSessionAndSharedLifecycle(t *testing.T) {
 	credentials = sessionService(t, restarted)
 	check(restarted, one.ID, issued, true)
 	check(restarted, two.ID, issued, true)
-	if err := restarted.DeleteSession(ctx, p.TenantID, first.ID); err != nil {
+	if err := sessionService(t, restarted).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: p.TenantID, SessionID: first.ID}); err != nil {
 		t.Fatal(err)
 	}
 	check(restarted, one.ID, issued, false)
diff --git a/services/core/internal/store/export_test.go b/services/core/internal/store/export_test.go
index 9be7be169..6e3040cc3 100644
--- a/services/core/internal/store/export_test.go
+++ b/services/core/internal/store/export_test.go
@@ -25,6 +25,9 @@ func NewTestStore(t *testing.T) (*Store, *pgxpool.Pool) { return testStore(t) }
 // SessionAdapter is the Session adapter on s's pool and credential key.
 func SessionAdapter(s *Store) *sessionpg.Store { return sessionAdapter(s) }
 
+// SessionService is the Session service on SessionAdapter(s).
+func SessionService(t testing.TB, s *Store) *sessions.Service { return sessionService(t, s) }
+
 // TransitionTurn moves the Turn as the execution owner does, in a Session
 // transaction on s's writer.
 func TransitionTurn(ctx context.Context, s *Store, tenant, session, turn string, transition sessions.TurnTransition) (sessions.Turn, error) {
diff --git a/services/core/internal/store/function_execution_test.go b/services/core/internal/store/function_execution_test.go
index c59f5f3a7..0aca0f12c 100644
--- a/services/core/internal/store/function_execution_test.go
+++ b/services/core/internal/store/function_execution_test.go
@@ -47,7 +47,7 @@ func functionState(t *testing.T, h *dispatchHarness, count int) sessions.Session
 	t.Helper()
 	deadline := time.Now().Add(20 * time.Second)
 	for {
-		state, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+		state, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/function_images_native_test.go b/services/core/internal/store/function_images_native_test.go
index bedafe512..3a00438fa 100644
--- a/services/core/internal/store/function_images_native_test.go
+++ b/services/core/internal/store/function_images_native_test.go
@@ -48,7 +48,7 @@ func TestNativeFunctionImagePublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/function_inputs_test.go b/services/core/internal/store/function_inputs_test.go
index 05384e8ab..5feae8e64 100644
--- a/services/core/internal/store/function_inputs_test.go
+++ b/services/core/internal/store/function_inputs_test.go
@@ -229,7 +229,7 @@ func TestFunctionInputsRejectInvalidTargetsAndStorageObjects(t *testing.T) {
 	if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "late", []sessions.Input{input}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal(err)
 	}
-	current, err := s.GetSession(t.Context(), tenant, session.ID)
+	current, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || current.LastTurn.ID != turn || current.LastTurn.Status != sessions.TurnFailed {
 		t.Fatal(current, err)
 	}
diff --git a/services/core/internal/store/function_item_events_test.go b/services/core/internal/store/function_item_events_test.go
index d6a0b3e4e..0b049b1a1 100644
--- a/services/core/internal/store/function_item_events_test.go
+++ b/services/core/internal/store/function_item_events_test.go
@@ -21,7 +21,7 @@ func TestFunctionResultEventsAreInputs(t *testing.T) {
 	if err := sessionExecution(t, executionWriter(t, s).lease).AppendTurnEvents(t.Context(), tenant, session.ID, turn, 1, events); err != nil {
 		t.Fatal(err)
 	}
-	changes, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+	changes, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -109,7 +109,7 @@ func TestFunctionResultItemsRetainSubmittedFields(t *testing.T) {
 					results++
 				}
 			}
-			changes, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+			changes, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/function_public_native_test.go b/services/core/internal/store/function_public_native_test.go
index 1df47e840..87c754e53 100644
--- a/services/core/internal/store/function_public_native_test.go
+++ b/services/core/internal/store/function_public_native_test.go
@@ -76,7 +76,7 @@ func nativePublicFunctionServer(t *testing.T, h *dispatchHarness, ctx context.Co
 	})
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant}})
-	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(worker), nativeDeploymentDefaults("gpt-5.5", provider))
+	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(t, worker), nativeDeploymentDefaults("gpt-5.5", provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/function_state_test.go b/services/core/internal/store/function_state_test.go
index 24da5e4c5..320650e7f 100644
--- a/services/core/internal/store/function_state_test.go
+++ b/services/core/internal/store/function_state_test.go
@@ -17,7 +17,7 @@ func TestFunctionStateSnapshotsRecoveryAndRetries(t *testing.T) {
 	tenant, session := newTurnSession(t, s)
 	turn := submitMessage(t, s, tenant, session.ID, "start").TurnID
 	transition(t, s, tenant, session.ID, turn, sessions.TurnQueued, sessions.TurnInProgress)
-	before, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+	before, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -53,7 +53,7 @@ func TestFunctionStateSnapshotsRecoveryAndRetries(t *testing.T) {
 		}
 		assertFunctionState(t, s, tenant, session.ID, status, 1-i)
 	}
-	changes, err := s.ListSessionEvents(t.Context(), tenant, session.ID, before)
+	changes, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, before)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -76,10 +76,10 @@ func TestFunctionStateSnapshotsRecoveryAndRetries(t *testing.T) {
 			}
 		}
 	}
-	if _, err := s.GetSession(t.Context(), uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetSession(t.Context(), uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
-	if _, err := s.ListSessionEvents(t.Context(), uuid.NewString(), session.ID, before); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).ListSessionEvents(t.Context(), uuid.NewString(), session.ID, before); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 }
@@ -96,14 +96,14 @@ func TestFunctionStateCancellationAndTerminalCleanup(t *testing.T) {
 				t.Fatal(err)
 			}
 			if status == sessions.TurnCancelled {
-				before, _ := s.SessionEventCursor(t.Context(), tenant, session.ID)
+				before, _ := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 				for _, key := range []string{"cancel", "cancel", "another-cancel"} {
 					if _, err := s.RequestCancel(t.Context(), tenant, session.ID, key); err != nil {
 						t.Fatal(err)
 					}
 				}
 				assertFunctionState(t, s, tenant, session.ID, sessions.TurnWaiting, 0)
-				changes, err := s.ListSessionEvents(t.Context(), tenant, session.ID, before)
+				changes, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, before)
 				if err != nil || len(changes) != 1 || changes[0].Event.Type != "agent.session.in_progress" || len(changes[0].RequiredActions) != 0 || changes[0].Turn.CancelRequestedAt.IsZero() {
 					t.Fatal(changes, err)
 				}
@@ -154,7 +154,7 @@ func TestFunctionStateReadsRemainConsistentDuringReceipts(t *testing.T) {
 	})
 	defer wg.Wait()
 	for {
-		current, err := s.GetSession(t.Context(), tenant, session.ID)
+		current, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -171,11 +171,11 @@ func TestFunctionStateReadsRemainConsistentDuringReceipts(t *testing.T) {
 
 func assertFunctionState(t *testing.T, s *Store, tenant, sessionID, status string, count int) {
 	t.Helper()
-	current, err := s.GetSession(t.Context(), tenant, sessionID)
+	current, err := sessionAdapter(s).GetSession(t.Context(), tenant, sessionID)
 	if err != nil || current.LastTurn == nil || current.LastTurn.Status != status || len(current.RequiredActions) != count {
 		t.Fatalf("state: %+v; %v", current, err)
 	}
-	page, err := s.ListSessions(t.Context(), tenant, "", 10, true, nil)
+	page, err := sessionAdapter(s).ListSessions(t.Context(), tenant, "", 10, true, nil)
 	if err != nil || len(page.Sessions) != 1 || len(page.Sessions[0].RequiredActions) != count || page.Sessions[0].LastTurn.Status != status {
 		t.Fatal("list differs from retrieve", page, err)
 	}
diff --git a/services/core/internal/store/harness_onboarding_test.go b/services/core/internal/store/harness_onboarding_test.go
index 60879b0ff..3203b07de 100644
--- a/services/core/internal/store/harness_onboarding_test.go
+++ b/services/core/internal/store/harness_onboarding_test.go
@@ -63,7 +63,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	}()
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant}})
-	handler, err := publicHandler(t, h.s, h.db, auth, "fixture_harness", workerExecution(worker), withPolicy(policy))
+	handler, err := publicHandler(t, h.s, h.db, auth, "fixture_harness", workerExecution(t, worker), withPolicy(policy))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -90,7 +90,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	if err = json.Unmarshal(res.Body.Bytes(), &created); err != nil || created.ID == "" {
 		t.Fatal(res.Body, err)
 	}
-	h.session, err = h.s.GetSession(ctx, h.tenant, created.ID)
+	h.session, err = store.SessionAdapter(h.s).GetSession(ctx, h.tenant, created.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -152,7 +152,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 		t.Fatalf("incapable runtime received work: %s", p.RunID)
 	case <-time.After(700 * time.Millisecond):
 	}
-	queued, err := h.s.GetSession(ctx, h.tenant, created.ID)
+	queued, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, created.ID)
 	if err != nil || queued.LastTurn == nil || queued.LastTurn.Status != sessions.TurnQueued {
 		t.Fatal(queued, err)
 	}
diff --git a/services/core/internal/store/hosted_initialization_failure_public_test.go b/services/core/internal/store/hosted_initialization_failure_public_test.go
index ebb1dd329..90ccc4f5a 100644
--- a/services/core/internal/store/hosted_initialization_failure_public_test.go
+++ b/services/core/internal/store/hosted_initialization_failure_public_test.go
@@ -193,15 +193,15 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 				t.Fatal("failed initialization continued or reclaimed compute", p.steps, p.kills)
 			}
 
-			read, err := s.GetSession(t.Context(), tenant, session.ID)
+			read, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 			if err != nil || read.Environment.Status != "failed" || read.EnvironmentFailure == nil || read.EnvironmentFailure.Reason != test.reason || read.EnvironmentInputActivity != nil || read.LastTurn != nil {
 				t.Fatal("Session read", read.EnvironmentFailure, err)
 			}
-			page, err := s.ListSessions(t.Context(), tenant, "", 10, false, nil)
+			page, err := store.SessionAdapter(s).ListSessions(t.Context(), tenant, "", 10, false, nil)
 			if err != nil || len(page.Sessions) != 1 || !reflect.DeepEqual(page.Sessions[0].EnvironmentFailure, read.EnvironmentFailure) {
 				t.Fatal("Session list", page, err)
 			}
-			events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+			events, err := store.SessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 			// Transport may connect while initialization is still running.
 			if len(events) > 0 && events[0].Event.Type == "agent.session.environment.connected" {
 				events = events[1:]
@@ -232,13 +232,13 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 			}
 			// Tenant B cannot observe the failure.
 			other := uuid.NewString()
-			if _, err := s.GetSession(t.Context(), other, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := store.SessionAdapter(s).GetSession(t.Context(), other, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("foreign Session read", err)
 			}
-			if _, err := s.ListSessionEvents(t.Context(), other, session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := store.SessionAdapter(s).ListSessionEvents(t.Context(), other, session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("foreign Session events", err)
 			}
-			if page, err := s.ListSessions(t.Context(), other, "", 10, false, nil); err != nil || len(page.Sessions) != 0 {
+			if page, err := store.SessionAdapter(s).ListSessions(t.Context(), other, "", 10, false, nil); err != nil || len(page.Sessions) != 0 {
 				t.Fatal("foreign Session list", page, err)
 			}
 		})
@@ -257,12 +257,12 @@ func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
 	p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, fail: "setup",
 		result: failedInitialization(3)}
 	failHostedInitialization(t, s, db, tenant, environment, p)
-	read, err := s.GetSession(t.Context(), tenant, session.ID)
+	read, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || read.PendingInput || read.EnvironmentInputActivity == nil || read.EnvironmentInputActivity.Status != "failed" ||
 		read.EnvironmentInputActivity.Failure != "environment_unavailable" || read.EnvironmentFailure == nil {
 		t.Fatal("pending input settlement", read.EnvironmentInputActivity, read.EnvironmentFailure, err)
 	}
-	events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+	events, err := store.SessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -300,7 +300,7 @@ func TestHostedInitializationFailurePublicHTTP(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "tenant-b", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(w))
+	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, w))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -341,7 +341,7 @@ func TestHostedInitializationFailurePublicHTTP(t *testing.T) {
 	awaitInitialization(t, db.pool, tenant, environment.ID, "failed")
 
 	reason := `Failed to provision environment: script "setup_commands[0]" failed with exit code 3`
-	read, err := s.GetSession(t.Context(), tenant, session.ID)
+	read, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || read.EnvironmentFailure == nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/item_serialization_test.go b/services/core/internal/store/item_serialization_test.go
index a74bd030c..828b6b30f 100644
--- a/services/core/internal/store/item_serialization_test.go
+++ b/services/core/internal/store/item_serialization_test.go
@@ -18,7 +18,7 @@ type wireEvent struct {
 // wireEvents renders recorded Session events as clients receive them.
 func wireEvents(t *testing.T, s *Store, tenant, session string, after int64) []wireEvent {
 	t.Helper()
-	changes, err := s.ListSessionEvents(t.Context(), tenant, session, after)
+	changes, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session, after)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -72,7 +72,7 @@ func TestAssistantMessageEventsFollowOfficialSequence(t *testing.T) {
 			tenant, session := newTurnSession(t, s)
 			turn := submitMessage(t, s, tenant, session.ID, "start").TurnID
 			transition(t, s, tenant, session.ID, turn, sessions.TurnQueued, sessions.TurnInProgress)
-			cursor, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+			cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -127,7 +127,7 @@ func TestAssistantMessageEventsFollowOfficialSequence(t *testing.T) {
 func TestInputItemEventsCarryNullOutputIndexAndPhase(t *testing.T) {
 	s, _ := testStore(t)
 	tenant, session := newTurnSession(t, s)
-	cursor, err := s.SessionEventCursor(t.Context(), tenant, session.ID)
+	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/list_query_public_test.go b/services/core/internal/store/list_query_public_test.go
index 72bcf988b..3f53a6b23 100644
--- a/services/core/internal/store/list_query_public_test.go
+++ b/services/core/internal/store/list_query_public_test.go
@@ -42,7 +42,7 @@ func TestListQueryOfficialClientPostgres(t *testing.T) {
 			t.Error(err)
 		}
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(worker))
+	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/local_environment_devices_test.go b/services/core/internal/store/local_environment_devices_test.go
index a16b46b3d..64ad74210 100644
--- a/services/core/internal/store/local_environment_devices_test.go
+++ b/services/core/internal/store/local_environment_devices_test.go
@@ -59,7 +59,7 @@ func TestEnvironmentDeviceAuthorityAndLifecycle(t *testing.T) {
 	if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), bound.ID); err != nil || !ok {
 		t.Fatalf("valid credential unavailable: %v", err)
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), bound.ID); err != nil || ok {
diff --git a/services/core/internal/store/local_environment_file_write_test.go b/services/core/internal/store/local_environment_file_write_test.go
index 1f255c6e7..ed77c1edf 100644
--- a/services/core/internal/store/local_environment_file_write_test.go
+++ b/services/core/internal/store/local_environment_file_write_test.go
@@ -79,7 +79,7 @@ func TestLocalEnvironmentFileWriteOwnsMutationBeforeDispatch(t *testing.T) {
 		got, e := store.FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
 		return e == nil && got.State == "committed"
 	})
-	session, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("upload created model execution", err)
 	}
diff --git a/services/core/internal/store/local_environment_worker_test.go b/services/core/internal/store/local_environment_worker_test.go
index 001bec8cb..cd8e2429a 100644
--- a/services/core/internal/store/local_environment_worker_test.go
+++ b/services/core/internal/store/local_environment_worker_test.go
@@ -81,7 +81,7 @@ func TestLocalEnvironmentWorkerDirectoryUsesExactAuthorityWithoutModel(t *testin
 	if got := awaitDirectoryResult(t, result); got.err != nil || len(got.value.Entries) != 1 {
 		t.Fatal("local directory failed", got.err)
 	}
-	session, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity != nil {
 		t.Fatal("local read admitted execution", err)
 	}
@@ -126,7 +126,7 @@ func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *test
 	if frame.DecodePayload(&prepare) != nil || prepare.Configuration.LocalEnvironment == nil || prepare.Configuration.LocalEnvironment.ID != environment.ID {
 		t.Fatal("local preparation lost identity")
 	}
-	before, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+	before, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || before.LastTurn != nil {
 		t.Fatal("preparation admitted execution before readiness", err)
 	}
diff --git a/services/core/internal/store/mcode_public_native_test.go b/services/core/internal/store/mcode_public_native_test.go
index 2ffb143e3..9cd0dcd28 100644
--- a/services/core/internal/store/mcode_public_native_test.go
+++ b/services/core/internal/store/mcode_public_native_test.go
@@ -48,7 +48,7 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, "mcode", workerExecution(worker), acceptUnavailable(t), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, h.db, auth, "mcode", workerExecution(t, worker), acceptUnavailable(t), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/message_image_admission_test.go b/services/core/internal/store/message_image_admission_test.go
index 9ee2a74a6..24f2b03e9 100644
--- a/services/core/internal/store/message_image_admission_test.go
+++ b/services/core/internal/store/message_image_admission_test.go
@@ -46,7 +46,7 @@ func TestUnqualifiedImageAdmissionIsAtomic(t *testing.T) {
 			if _, err := worker.SubmitInputs(t.Context(), h.tenant, session.ID, "image-batch", imageAdmissionBatch()); !errors.Is(err, sessions.ErrInvalidInput) {
 				t.Fatal("batch accepted an unqualified image", err)
 			}
-			session, err = h.s.GetSession(t.Context(), h.tenant, session.ID)
+			session, err = store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, session.ID)
 			if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity != nil {
 				t.Fatal("rejected batch persisted execution activity", err)
 			}
diff --git a/services/core/internal/store/message_images_native_test.go b/services/core/internal/store/message_images_native_test.go
index 46c2583cb..40019ebc2 100644
--- a/services/core/internal/store/message_images_native_test.go
+++ b/services/core/internal/store/message_images_native_test.go
@@ -49,7 +49,7 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/model_protocol_native_test.go b/services/core/internal/store/model_protocol_native_test.go
index dceecd9bf..d0ee2dbd2 100644
--- a/services/core/internal/store/model_protocol_native_test.go
+++ b/services/core/internal/store/model_protocol_native_test.go
@@ -79,7 +79,7 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant}})
 	providerRevision := uuid.New()
-	handler, err := publicHandler(t, h.s, h.db, auth, options.Engine, workerExecution(worker), withPolicy(h.d.Policy), modelProviderDefaults(func(context.Context, string) (*modelconfiguration.Snapshot, error) {
+	handler, err := publicHandler(t, h.s, h.db, auth, options.Engine, workerExecution(t, worker), withPolicy(h.d.Policy), modelProviderDefaults(func(context.Context, string) (*modelconfiguration.Snapshot, error) {
 		return &modelconfiguration.Snapshot{Model: options.Model, HarnessConfig: options.HarnessConfig, Provider: &options.Provider, Revision: providerRevision}, nil
 	}))
 	if err != nil {
diff --git a/services/core/internal/store/native_public_execution_test.go b/services/core/internal/store/native_public_execution_test.go
index 496914f2e..8128b85b6 100644
--- a/services/core/internal/store/native_public_execution_test.go
+++ b/services/core/internal/store/native_public_execution_test.go
@@ -38,7 +38,7 @@ func verifyNativePublicExecution(t *testing.T, h *dispatchHarness, parent contex
 	}()
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
-	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(worker), nativeDeploymentDefaults("gpt-5.5", provider))
+	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(t, worker), nativeDeploymentDefaults("gpt-5.5", provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/prepared_dispatch_failure_test.go b/services/core/internal/store/prepared_dispatch_failure_test.go
index 23f05ff48..aef19d944 100644
--- a/services/core/internal/store/prepared_dispatch_failure_test.go
+++ b/services/core/internal/store/prepared_dispatch_failure_test.go
@@ -32,7 +32,7 @@ func TestPreparedDispatchSettlesOnlyReadyInput(t *testing.T) {
 					t.Fatal(err)
 				}
 			case "delete":
-				if err := h.s.DeleteSession(t.Context(), h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := store.SessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("pending input deleted", err)
 				}
 				if err := h.s.CommitLegacyDeletion(t.Context(), h.tenant, h.session.ID); err != nil {
diff --git a/services/core/internal/store/prepared_dispatch_test.go b/services/core/internal/store/prepared_dispatch_test.go
index 109b662bf..4c30eadc6 100644
--- a/services/core/internal/store/prepared_dispatch_test.go
+++ b/services/core/internal/store/prepared_dispatch_test.go
@@ -81,7 +81,7 @@ func TestPreparedDispatchPromotesOriginalBatchAndPersistsCompletion(t *testing.T
 	if frame.DecodePayload(&prepare) != nil || len(prepare.Configuration.Input) != 0 || prepare.Configuration.RunID != "" || prepare.Configuration.ConversationID != "" || prepare.Configuration.LocalEnvironment == nil || prepare.Configuration.LocalEnvironment.ID != h.device.EnvironmentID || prepare.Configuration.DisableExecutionEnvironment {
 		t.Fatal("invalid preparation configuration", prepare)
 	}
-	session, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("preparation created work before readiness", session, err)
 	}
diff --git a/services/core/internal/store/public_execution_test.go b/services/core/internal/store/public_execution_test.go
index 8d3301506..6b6d99340 100644
--- a/services/core/internal/store/public_execution_test.go
+++ b/services/core/internal/store/public_execution_test.go
@@ -68,7 +68,7 @@ func TestExecutionWorkerAdmissionBindingAndRecovery(t *testing.T) {
 	if err != nil || bound.ID != h.device.ID {
 		t.Fatal(bound, err)
 	}
-	active, err := h.s.GetSession(ctx, h.tenant, h.session.ID)
+	active, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
 	if err != nil || active.LastTurn == nil || active.LastTurn.Status != sessions.TurnInProgress {
 		t.Fatal(active, err)
 	}
@@ -138,7 +138,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 		if !ended {
 			want = nil
 		}
-		session, err := h.s.GetSession(ctx, h.tenant, h.session.ID)
+		session, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
 		if err != nil || string(session.Usage) != string(want) {
 			t.Fatalf("Session and Turn measurement differ: %+v %v", session, err)
 		}
@@ -154,18 +154,18 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	if err := worker.Run(stopped); err != context.Canceled {
 		t.Fatal(err)
 	}
-	interrupted, err := h.s.GetSession(ctx, h.tenant, h.session.ID)
+	interrupted, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
 	if err != nil || interrupted.LastTurn.Status != sessions.TurnFailed {
 		t.Fatal(interrupted, err)
 	}
-	pending, err := h.s.GetSession(ctx, h.tenant, queued.ID)
+	pending, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, queued.ID)
 	if err != nil || pending.LastTurn.Status != sessions.TurnQueued {
 		t.Fatal(pending, err)
 	}
 	if _, err := h.s.RequestCancel(ctx, h.tenant, queued.ID, "stop-before-dispatch"); err != nil {
 		t.Fatal(err)
 	}
-	pending, err = h.s.GetSession(ctx, h.tenant, queued.ID)
+	pending, err = store.SessionAdapter(h.s).GetSession(ctx, h.tenant, queued.ID)
 	if err != nil || pending.LastTurn.Status != sessions.TurnCancelled {
 		t.Fatal(pending, err)
 	}
diff --git a/services/core/internal/store/public_handler_fixture_test.go b/services/core/internal/store/public_handler_fixture_test.go
index 111eeb790..7db484e46 100644
--- a/services/core/internal/store/public_handler_fixture_test.go
+++ b/services/core/internal/store/public_handler_fixture_test.go
@@ -85,15 +85,16 @@ func publicHandler(t testing.TB, s *store.Store, db fixtureDB, keys fixtureKeyRe
 		EnvironmentTemplates: environmentTemplates, EnvironmentTemplatesReader: templates,
 		Skills: skillService, SkillsReader: skillStore,
 		Agents: agentService, AgentsReader: agentStore,
-		Sessions:        s,
+		Sessions:        sessionService,
+		SessionsReader:  sessionStore,
 		SessionCreation: s,
-		SessionEvents:   s,
+		SessionEvents:   sessionStore,
 		Turns:           sessionStore,
 		Items:           sessionStore,
 		Subagents:       sessionStore,
 		Artifacts:       sessionService,
 		ArtifactsReader: sessionStore,
-		SessionAdmin:    s, Environments: sessionService, EnvironmentsReader: sessionStore, Admin: s, AdminRuntimeTargets: sessionStore, AdminAudit: audit, WriteAudit: audit,
+		SessionAdmin:    sessionStore, Environments: sessionService, EnvironmentsReader: sessionStore, Admin: s, AdminRuntimeTargets: sessionStore, AdminAudit: audit, WriteAudit: audit,
 		ExecutorConnections: strict, Metrics: strict, RuntimeObservations: strict, RuntimeHistory: strict,
 	}
 	for _, c := range configure {
@@ -158,14 +159,15 @@ func storeExecution(t testing.TB, s *store.Store) func(*api.Dependencies) {
 	}
 }
 
-// workerExecution runs Sessions through worker.
-func workerExecution(worker *execution.Worker) func(*api.Dependencies) {
+// workerExecution runs Sessions through worker. It wires no archive; an
+// archive request fails the test.
+func workerExecution(t testing.TB, worker *execution.Worker) func(*api.Dependencies) {
 	return func(d *api.Dependencies) {
 		d.Execution = &api.Execution{
 			ExecutorURL:      testExecutorURL,
 			SessionAdmission: worker,
 			InputAdmission:   worker,
-			SessionArchive:   worker,
+			SessionArchive:   strictStandIn{t},
 			Workspaces:       worker,
 		}
 	}
@@ -261,8 +263,8 @@ func (s strictStandIn) ExecutorConnected(context.Context, string, string) (bool,
 	return false, nil
 }
 
-func (s strictStandIn) ArchiveManagedSession(context.Context, string, string, uint64) (sessions.ManagedArchive, error) {
-	s.unexpected("ArchiveManagedSession")
+func (s strictStandIn) ArchiveSession(context.Context, string, string, uint64) (sessions.ManagedArchive, error) {
+	s.unexpected("ArchiveSession")
 	return sessions.ManagedArchive{}, nil
 }
 
diff --git a/services/core/internal/store/runtime_allocations_test.go b/services/core/internal/store/runtime_allocations_test.go
index 9ee59b425..acf21784f 100644
--- a/services/core/internal/store/runtime_allocations_test.go
+++ b/services/core/internal/store/runtime_allocations_test.go
@@ -52,7 +52,7 @@ func TestRuntimeAllocationAtomicOwnershipAndRecovery(t *testing.T) {
 	if err != nil || !ok || credential.CredentialHash != runtimedevice.HashCredential(secret) {
 		t.Fatal("retry rewrote bootstrap credential")
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	retained, err := deploymentStore(next).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
diff --git a/services/core/internal/store/runtime_compute_lifecycle_test.go b/services/core/internal/store/runtime_compute_lifecycle_test.go
index 4e175095b..f32f88f52 100644
--- a/services/core/internal/store/runtime_compute_lifecycle_test.go
+++ b/services/core/internal/store/runtime_compute_lifecycle_test.go
@@ -393,7 +393,7 @@ func TestRuntimeComputeLifecycleIdleSuspendAndQueuedSameSessionWake(t *testing.T
 	if err := f.db.pool.QueryRow(t.Context(), `SELECT count(*) FILTER(WHERE id=$2 AND status='completed'),count(*) FILTER(WHERE id=$3 AND status='queued') FROM turns WHERE session_id=$1`, session.ID, completed, queued).Scan(&completedCount, &queuedCount); err != nil || completedCount != 1 || queuedCount != 1 {
 		t.Fatal("wake replayed/consumed prior or next Turn", err)
 	}
-	if got, err := f.store.GetSession(t.Context(), tenant, session.ID); err != nil || string(got.Configuration) != string(session.Configuration) {
+	if got, err := store.SessionAdapter(f.store).GetSession(t.Context(), tenant, session.ID); err != nil || string(got.Configuration) != string(session.Configuration) {
 		t.Fatal("configuration changed during restore", err)
 	}
 	if f.provider.promptFrames.Load() != 0 {
@@ -510,7 +510,7 @@ func TestRuntimeComputeLifecycleSuspendedDeletionAndExpiryCleanup(t *testing.T)
 			f.complete(owner)
 			f.phase(tenant, env.ID, "suspended")
 			if kind == "deleted" {
-				if err := f.store.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+				if err := store.SessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 					t.Fatal(err)
 				}
 			} else {
diff --git a/services/core/internal/store/runtime_configuration_cleanup_test.go b/services/core/internal/store/runtime_configuration_cleanup_test.go
index 4911133ca..855fc427c 100644
--- a/services/core/internal/store/runtime_configuration_cleanup_test.go
+++ b/services/core/internal/store/runtime_configuration_cleanup_test.go
@@ -6,6 +6,8 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -97,7 +99,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 				t.Fatal("unexpected creation outcome", owner, err)
 			}
 			if test.rejectCreate {
-				value, err := s.GetSession(t.Context(), tenant, session.ID)
+				value, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 				if err != nil || value.Environment.Status != "failed" {
 					t.Fatal("rejected configuration did not terminate its retained Session", value, err)
 				}
@@ -119,7 +121,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 				}
 				// Exercise the existing authorized deletion lifecycle; no new
 				// deployment cleanup API is introduced by this regression test.
-				if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+				if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -152,7 +154,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 			}
 			if test.rejectCreate {
 				// The rejected Session remains publicly readable after cleanup.
-				if _, err := s.GetSession(t.Context(), tenant, session.ID); err != nil {
+				if _, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID); err != nil {
 					t.Fatal("configuration rejection deleted Session history", err)
 				}
 			}
diff --git a/services/core/internal/store/runtime_connection_test.go b/services/core/internal/store/runtime_connection_test.go
index de89b8fe9..e40311ecd 100644
--- a/services/core/internal/store/runtime_connection_test.go
+++ b/services/core/internal/store/runtime_connection_test.go
@@ -18,6 +18,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtime"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
@@ -87,7 +88,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	}
 	defer conn.Close()
 	assertStatus("connected")
-	got, err := s.GetSession(t.Context(), tenant, session.ID)
+	got, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || got.LastTurn != nil || got.EnvironmentInputActivity != nil {
 		t.Fatal("connection fabricated native execution", err)
 	}
@@ -111,7 +112,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	if err != nil || retained.ID != owner.ID || retained.DeviceID != owner.DeviceID || p.creates != 1 {
 		t.Fatal("restart replaced Runtime identity", err)
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
diff --git a/services/core/internal/store/runtime_creation_settlement_test.go b/services/core/internal/store/runtime_creation_settlement_test.go
index 008f31f04..5b812681a 100644
--- a/services/core/internal/store/runtime_creation_settlement_test.go
+++ b/services/core/internal/store/runtime_creation_settlement_test.go
@@ -7,6 +7,8 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -64,7 +66,7 @@ func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 			if _, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 				t.Fatal("released credential retained authority", err)
 			}
-			value, err := s.GetSession(t.Context(), tenant, session.ID)
+			value, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 			if err != nil || value.Environment.Status != "failed" {
 				t.Fatal("environment not terminated", err)
 			}
@@ -100,7 +102,7 @@ func TestManagedRuntimeObservedSettlementAllowsOwnedCleanup(t *testing.T) {
 	if _, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err == nil {
 		t.Fatal("uncertain Create succeeded")
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
diff --git a/services/core/internal/store/runtime_deployment_test.go b/services/core/internal/store/runtime_deployment_test.go
index 6868bb647..8a2f82cbf 100644
--- a/services/core/internal/store/runtime_deployment_test.go
+++ b/services/core/internal/store/runtime_deployment_test.go
@@ -62,7 +62,7 @@ func TestRuntimeDeploymentPendingSessionsCannotMigrate(t *testing.T) {
 	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), nil); err == nil {
 		t.Fatal("pending Session orphaned by removing provider")
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	deploymentConfigure(t, w, &next)
@@ -81,7 +81,7 @@ func TestRuntimeDeploymentUnknownAllocationsBlockAdoptionAndSwitch(t *testing.T)
 	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), &old); err == nil || !strings.Contains(err.Error(), "no verified backend identity") {
 		t.Fatal("legacy allocation silently adopted", err)
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := deploymentExecution(t, w).RequestCleanup(t.Context(), owner); err != nil {
diff --git a/services/core/internal/store/runtime_enrollment_connection_test.go b/services/core/internal/store/runtime_enrollment_connection_test.go
index fde167d43..f7cebbbda 100644
--- a/services/core/internal/store/runtime_enrollment_connection_test.go
+++ b/services/core/internal/store/runtime_enrollment_connection_test.go
@@ -168,7 +168,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	if err = db.pool.QueryRow(t.Context(), "SELECT count(*) FROM runtime_allocations WHERE environment_id=$1", environment.ID).Scan(&allocations); err != nil || allocations != 0 {
 		t.Fatal("user Runtime acquired managed allocation", allocations, err)
 	}
-	current, err := s.GetSession(t.Context(), principal.TenantID, session.ID)
+	current, err := store.SessionAdapter(s).GetSession(t.Context(), principal.TenantID, session.ID)
 	if err != nil || current.LastTurn != nil {
 		t.Fatal("connection handling created execution", err)
 	}
diff --git a/services/core/internal/store/runtime_enrollment_test.go b/services/core/internal/store/runtime_enrollment_test.go
index ab2e10932..bf2e20d87 100644
--- a/services/core/internal/store/runtime_enrollment_test.go
+++ b/services/core/internal/store/runtime_enrollment_test.go
@@ -137,7 +137,7 @@ func TestRuntimeEnrollmentConcurrentAndDeletion(t *testing.T) {
 	if err := pool.QueryRow(t.Context(), "SELECT count(*) FROM runtime_allocations WHERE environment_id=$1", environment.ID).Scan(&allocations); err != nil || allocations != 0 {
 		t.Fatalf("enrollment allocated compute: %d %v", allocations, err)
 	}
-	if err := s.DeleteSession(t.Context(), p.TenantID, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: p.TenantID, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := sessionService(t, s).EnrollRuntime(t.Context(), environment.ID, executorDigest(key.Token)); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/internal/store/runtime_environment_terminal_test.go b/services/core/internal/store/runtime_environment_terminal_test.go
index c22bfed18..3a1ed2d7f 100644
--- a/services/core/internal/store/runtime_environment_terminal_test.go
+++ b/services/core/internal/store/runtime_environment_terminal_test.go
@@ -38,7 +38,7 @@ func TestManagedEnvironmentTerminationSettlesInputAndPreservesIdentity(t *testin
 			if _, err := deploymentExecution(t, writer).RequestCleanup(t.Context(), owner); err != nil {
 				t.Fatal(err)
 			}
-			ended, err := s.GetSession(t.Context(), tenant, session.ID)
+			ended, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 			status := "failed"
 			if expired {
 				status = "expired"
@@ -63,7 +63,7 @@ func TestManagedEnvironmentTerminationSettlesInputAndPreservesIdentity(t *testin
 			if _, err := s.CreateSession(t.Context(), tenant, input); err != nil {
 				t.Fatal("matching creation retry changed outcome", err)
 			}
-			events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+			events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -93,11 +93,11 @@ func TestManagedEnvironmentTerminationSettlesInputAndPreservesIdentity(t *testin
 			} else if last.EnvironmentFailure != nil {
 				t.Fatal("expiry recorded a provisioning failure", last)
 			}
-			cursor, _ := s.SessionEventCursor(t.Context(), tenant, session.ID)
+			cursor, _ := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 			if _, err := deploymentExecution(t, writer).RequestCleanup(t.Context(), owner); err != nil {
 				t.Fatal(err)
 			}
-			if next, err := s.SessionEventCursor(t.Context(), tenant, session.ID); err != nil || next != cursor {
+			if next, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID); err != nil || next != cursor {
 				t.Fatal("cleanup repeated terminal events", next, err)
 			}
 			if err := sessionExecution(t, writer.lease).ReplaceEnvironmentConnection(t.Context(), tenant, session.Environment.ID, uuid.NewString()); !errors.Is(err, sessions.ErrInvalidInput) {
@@ -135,7 +135,7 @@ func TestManagedEnvironmentFailureRollsBackWithSessionEvent(t *testing.T) {
 	if _, err := deploymentExecution(t, writer).RequestCleanup(t.Context(), owner); err == nil {
 		t.Fatal("cleanup committed without failure event")
 	}
-	current, err := s.GetSession(t.Context(), tenant, session.ID)
+	current, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || current.Environment.Status != "pending" || current.EnvironmentInputActivity != nil {
 		t.Fatal("partial public termination", err)
 	}
diff --git a/services/core/internal/store/runtime_lifecycle_nodes_test.go b/services/core/internal/store/runtime_lifecycle_nodes_test.go
index 248b7645f..f7c8fea32 100644
--- a/services/core/internal/store/runtime_lifecycle_nodes_test.go
+++ b/services/core/internal/store/runtime_lifecycle_nodes_test.go
@@ -158,7 +158,7 @@ func TestRuntimeLifecycleNodeInventoryAndRouting(t *testing.T) {
 	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET node_id=$1 WHERE id=$2", other, owner.ID); err != nil {
 		t.Fatal(err)
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	checkRoute(other, nil) // Deletion does not discard cleanup routing.
diff --git a/services/core/internal/store/runtime_lifecycle_test.go b/services/core/internal/store/runtime_lifecycle_test.go
index 1473b627a..b242d2d32 100644
--- a/services/core/internal/store/runtime_lifecycle_test.go
+++ b/services/core/internal/store/runtime_lifecycle_test.go
@@ -170,7 +170,7 @@ func TestManagedRuntimeLostCreateRestartAndDeletion(t *testing.T) {
 	if err != nil || !retry.Replayed || retry.ID != owner.ID || p.creates != 1 {
 		t.Fatal("restart replayed Create")
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	// A scan may first exhaust its previous cursor before starting a new cycle.
@@ -194,7 +194,7 @@ func TestManagedRuntimeUnknownCreationRetainsCleanup(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected uncertain creation")
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reconcileManagedState(t, w, db, tenant, env.ID, "cleanup_pending")
diff --git a/services/core/internal/store/runtime_node_lifecycle_test.go b/services/core/internal/store/runtime_node_lifecycle_test.go
index 7055fe175..d0b6e26e9 100644
--- a/services/core/internal/store/runtime_node_lifecycle_test.go
+++ b/services/core/internal/store/runtime_node_lifecycle_test.go
@@ -9,6 +9,8 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -100,7 +102,7 @@ func TestManagedNodesIsolateBlockedProviderAndInitialization(t *testing.T) {
 			if err := f.nodes.TouchActivity(t.Context(), wakeTenant, wakeEnv.ID); err != nil {
 				t.Fatal(err)
 			}
-			if err := f.store.DeleteSession(t.Context(), deleteTenant, deleteSession.ID); err != nil {
+			if err := store.SessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: deleteTenant, SessionID: deleteSession.ID}); err != nil {
 				t.Fatal(err)
 			}
 
@@ -135,7 +137,7 @@ func TestManagedNodesIsolateBlockedProviderAndInitialization(t *testing.T) {
 			f.online(nodeC)
 			ct, cs, ce := f.session(nodeC, false)
 			f.provision(ct, ce)
-			if err := f.store.DeleteSession(t.Context(), ct, cs.ID); err != nil {
+			if err := store.SessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: ct, SessionID: cs.ID}); err != nil {
 				t.Fatal(err)
 			}
 			waitNodeIsolation(t, 7*time.Second, func() (bool, string) {
diff --git a/services/core/internal/store/runtime_nodes.go b/services/core/internal/store/runtime_nodes.go
deleted file mode 100644
index ef13d1565..000000000
--- a/services/core/internal/store/runtime_nodes.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package store
-
-import (
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-func runtimeUUID(id pgtype.UUID) string {
-	if !id.Valid {
-		return ""
-	}
-	return uuid.UUID(id.Bytes).String()
-}
diff --git a/services/core/internal/store/runtime_nodes_test.go b/services/core/internal/store/runtime_nodes_test.go
index 7627a1421..93b247828 100644
--- a/services/core/internal/store/runtime_nodes_test.go
+++ b/services/core/internal/store/runtime_nodes_test.go
@@ -97,7 +97,7 @@ type sessionPlacement struct {
 
 // sessionRuntimePlacement reads the node a Session was placed on.
 func sessionRuntimePlacement(ctx context.Context, s *Store, tenant, session string) (sessionPlacement, error) {
-	value, err := s.GetSession(ctx, tenant, session)
+	value, err := sessionAdapter(s).GetSession(ctx, tenant, session)
 	if err != nil {
 		return sessionPlacement{}, err
 	}
@@ -112,7 +112,11 @@ func sessionRuntimePlacement(ctx context.Context, s *Store, tenant, session stri
 	if errors.Is(err, pgx.ErrNoRows) {
 		return sessionPlacement{}, sessions.ErrNotFound
 	}
-	return sessionPlacement{NodeID: runtimeUUID(p.NodeID), Available: p.Available && !p.ReleasedAt.Valid}, err
+	placement := sessionPlacement{Available: p.Available && !p.ReleasedAt.Valid}
+	if p.NodeID.Valid {
+		placement.NodeID = uuid.UUID(p.NodeID.Bytes).String()
+	}
+	return placement, err
 }
 func TestRuntimeNodesAtomicPlacementAndRetry(t *testing.T) {
 	s, _, d := managerFixture(t, 1, 4)
@@ -157,7 +161,7 @@ func TestRuntimeNodesAtomicPlacementAndRetry(t *testing.T) {
 	if err := service.RemoveNode(t.Context(), d.LocalNodeID); !errors.Is(err, deployment.ErrNodeInUse) {
 		t.Fatal("removed pending placement", err)
 	}
-	if err := s.DeleteSession(t.Context(), tenant, retained.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: retained.ID}); err != nil {
 		t.Fatal(err)
 	}
 	input := managerSessionInput("retry")
@@ -253,10 +257,10 @@ func TestRuntimeNodesRetention(t *testing.T) {
 	if err := nodes.RemoveNode(t.Context(), next.LocalNodeID); !errors.Is(err, deployment.ErrNodeInUse) {
 		t.Fatal(err)
 	}
-	if err := s.DeleteSession(t.Context(), tenant, pending.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: pending.ID}); err != nil {
 		t.Fatal(err)
 	}
-	if err := s.DeleteSession(t.Context(), tenant, first.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: first.ID}); err != nil {
 		t.Fatal(err)
 	}
 	retained, err = deploymentExecution(t, w).RequestCleanup(t.Context(), retained)
diff --git a/services/core/internal/store/runtime_observation_scan_test.go b/services/core/internal/store/runtime_observation_scan_test.go
index 9bc3238b3..1e43c760b 100644
--- a/services/core/internal/store/runtime_observation_scan_test.go
+++ b/services/core/internal/store/runtime_observation_scan_test.go
@@ -3,6 +3,9 @@ package store_test
 import (
 	"slices"
 	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestRuntimeObservationScanIsDeploymentWideBoundedAndExcludesDeleted(t *testing.T) {
@@ -13,7 +16,7 @@ func TestRuntimeObservationScanIsDeploymentWideBoundedAndExcludesDeleted(t *test
 		expected = append(expected, session.ID)
 	}
 	slices.Sort(expected)
-	if err := s.DeleteSession(t.Context(), sessionTenant(t, db, expected[2]), expected[2]); err != nil {
+	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: sessionTenant(t, db, expected[2]), SessionID: expected[2]}); err != nil {
 		t.Fatal(err)
 	}
 	expected = append(expected[:2], expected[3:]...)
diff --git a/services/core/internal/store/runtime_pending_test.go b/services/core/internal/store/runtime_pending_test.go
index 9a94fefa6..c7b95dea5 100644
--- a/services/core/internal/store/runtime_pending_test.go
+++ b/services/core/internal/store/runtime_pending_test.go
@@ -22,7 +22,7 @@ func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T)
 		t.Fatal(err)
 	}
 	_, deleted, deletedEnvironment := managedSession(t, s, db)
-	if err := s.DeleteSession(t.Context(), deleted.TenantID, deleted.ID); err != nil {
+	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: deleted.TenantID, SessionID: deleted.ID}); err != nil {
 		t.Fatal(err)
 	}
 	key := uuid.NewString()
@@ -60,11 +60,11 @@ func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T)
 	if _, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: deleted.TenantID, EnvironmentID: deletedEnvironment.ID}); err == nil {
 		t.Fatal("deleted Session provisioned")
 	}
-	waiting, err := s.GetSession(t.Context(), tenant, initial.ID)
+	waiting, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, initial.ID)
 	if err != nil || waiting.LastTurn != nil || waiting.EnvironmentInputActivity != nil {
 		t.Fatal("compute existence claimed input readiness", waiting, err)
 	}
-	quiet, err := s.GetSession(t.Context(), tenant, idle.ID)
+	quiet, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, idle.ID)
 	if err != nil || quiet.LastTurn != nil || quiet.EnvironmentInputActivity != nil {
 		t.Fatal("idle creation fabricated work", err)
 	}
diff --git a/services/core/internal/store/runtime_scan_test.go b/services/core/internal/store/runtime_scan_test.go
index fe2305218..dd1e2cac6 100644
--- a/services/core/internal/store/runtime_scan_test.go
+++ b/services/core/internal/store/runtime_scan_test.go
@@ -12,6 +12,8 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 type scanProvider struct {
@@ -87,7 +89,7 @@ func TestManagedRuntimeScanEmptyAfterCleanupAndCanceledCall(t *testing.T) {
 	if len(p.observed) != 0 {
 		t.Fatal("canceled scan reached provider")
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	// EOF must not delay cleanup to a second call, and cancellation must
diff --git a/services/core/internal/store/runtime_suspension_test.go b/services/core/internal/store/runtime_suspension_test.go
index d768c9597..ca07c8f0d 100644
--- a/services/core/internal/store/runtime_suspension_test.go
+++ b/services/core/internal/store/runtime_suspension_test.go
@@ -181,7 +181,7 @@ func TestRuntimeSuspensionWakeDoesNotLoseNewerWork(t *testing.T) {
 	if _, err := deploymentExecution(t, w).KeepAllocation(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.GetSession(t.Context(), owner.TenantID, owner.SessionID); err != nil {
+	if _, err := sessionAdapter(s).GetSession(t.Context(), owner.TenantID, owner.SessionID); err != nil {
 		t.Fatal(err)
 	}
 	quiet, err := deploymentStore(w).Activity(t.Context(), owner.ID)
@@ -246,7 +246,7 @@ func TestRuntimeSuspensionRetentionAndDeletedSession(t *testing.T) {
 	if _, err := deploymentExecution(t, w).SetCompute(t.Context(), retained, "restoring", json.RawMessage(`{}`), &until, 0); !errors.Is(err, deployment.ErrAllocationConflict) {
 		t.Fatal("expired snapshot restored from stale observation", err)
 	}
-	if err := s.DeleteSession(t.Context(), owner.TenantID, owner.SessionID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: owner.TenantID, SessionID: owner.SessionID}); err != nil {
 		t.Fatal(err)
 	}
 	if err := deploymentService(t, s).TouchActivity(t.Context(), owner.TenantID, owner.EnvironmentID); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/internal/store/runtime_worker_recovery_test.go b/services/core/internal/store/runtime_worker_recovery_test.go
index 56853bb93..50c70e6fe 100644
--- a/services/core/internal/store/runtime_worker_recovery_test.go
+++ b/services/core/internal/store/runtime_worker_recovery_test.go
@@ -49,7 +49,7 @@ func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.
 		t.Fatal("rejected promotion lost its pending owner", got)
 	}
 	assertPreparationReleased(t, h, frame.ID, handle)
-	session, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("blocked promotion started a Turn", session, err)
 	}
diff --git a/services/core/internal/store/sandbox_deployment_switch_test.go b/services/core/internal/store/sandbox_deployment_switch_test.go
index 42848e08b..2c26d8739 100644
--- a/services/core/internal/store/sandbox_deployment_switch_test.go
+++ b/services/core/internal/store/sandbox_deployment_switch_test.go
@@ -156,7 +156,7 @@ func TestSandboxDirectDeploymentOwnershipAndCleanSwitch(t *testing.T) {
 	if err := deploymentExecution(t, w).CancelReset(SandboxResetTestContext(t.Context()), id, 1); !errors.Is(err, deployment.ErrConflict) {
 		t.Fatal("stale resume accepted", err)
 	}
-	if _, err := s.GetSession(t.Context(), tenant, session.ID); err != nil {
+	if _, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID); err != nil {
 		t.Fatal("historical Session lost", err)
 	}
 }
@@ -355,7 +355,7 @@ func TestSandboxSwitchPreservesReleasedAllocationAndItemHistory(t *testing.T) {
 		t.Fatal("switch rewrote released allocation ownership")
 	}
 	for _, id := range []string{session.ID, history.ID} {
-		if _, err := s.GetSession(t.Context(), tenant, id); err != nil {
+		if _, err := sessionAdapter(s).GetSession(t.Context(), tenant, id); err != nil {
 			t.Fatal("switch lost undeleted Session", err)
 		}
 	}
diff --git a/services/core/internal/store/sandbox_deployment_switch_worker_test.go b/services/core/internal/store/sandbox_deployment_switch_worker_test.go
index 64d6118ff..e2a8ad911 100644
--- a/services/core/internal/store/sandbox_deployment_switch_worker_test.go
+++ b/services/core/internal/store/sandbox_deployment_switch_worker_test.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
@@ -155,7 +156,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	if _, err := w.UpdateSandboxDeployment(store.SandboxResetTestContext(t.Context()), next); !errors.Is(err, deployment.ErrConflict) {
 		t.Fatal("dirty switch accepted", err)
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
diff --git a/services/core/internal/store/sandbox_reset_test.go b/services/core/internal/store/sandbox_reset_test.go
index 44a54f2bc..7173b5c3a 100644
--- a/services/core/internal/store/sandbox_reset_test.go
+++ b/services/core/internal/store/sandbox_reset_test.go
@@ -103,20 +103,20 @@ func TestSandboxResetAutoUsesStartedWorkAndLockedRecheck(t *testing.T) {
 			if err != nil || (len(page) == 0) != busy {
 				t.Fatal("auto eligibility", page, err)
 			}
-			_, err = w.ArchiveSandboxResetSession(t.Context(), tenant, session.ID, 1, reset.Reset.RequestedAt)
+			_, err = deploymentExecution(t, w).ArchiveResetSession(t.Context(), tenant, session.ID, 1, reset.Reset.RequestedAt)
 			if busy {
-				if !errors.Is(err, ErrSandboxResetSessionBusy) {
+				if !errors.Is(err, deployment.ErrSandboxResetSessionBusy) {
 					t.Fatal("auto cut active work", err)
 				}
 				if err := deploymentExecution(t, w).StartReset(SandboxResetTestContext(t.Context()), installation, deployment.ResetRequest{ExpectedGeneration: 1, Clear: "force"}); err != nil {
 					t.Fatal(err)
 				}
-				_, err = w.ArchiveSandboxResetSession(t.Context(), tenant, session.ID, 1, reset.Reset.RequestedAt)
+				_, err = deploymentExecution(t, w).ArchiveResetSession(t.Context(), tenant, session.ID, 1, reset.Reset.RequestedAt)
 			}
 			if err != nil {
 				t.Fatal("archive", err)
 			}
-			archived, err := s.GetSession(t.Context(), tenant, session.ID)
+			archived, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 			if err != nil || archived.Environment.Status != "expired" {
 				t.Fatal("archive not durable", archived, err)
 			}
@@ -151,7 +151,7 @@ func TestSandboxResetCancellationABADeadlineAndGeneration(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = w.ArchiveSandboxResetSession(t.Context(), tenant, session.ID, 1, first.Reset.RequestedAt); !errors.Is(err, deployment.ErrConflict) {
+	if _, err = deploymentExecution(t, w).ArchiveResetSession(t.Context(), tenant, session.ID, 1, first.Reset.RequestedAt); !errors.Is(err, deployment.ErrConflict) {
 		t.Fatal("cancelled reset archived successor work", err)
 	}
 	runtimeSuspensionSQL(t, s.pool, `UPDATE runtime_deployment SET reset_deadline_at=clock_timestamp()-interval '1 second'`)
@@ -168,7 +168,7 @@ func TestSandboxResetCancellationABADeadlineAndGeneration(t *testing.T) {
 	if err := deploymentExecution(t, w).StartReset(ctx, installation, deployment.ResetRequest{ExpectedGeneration: 0, Clear: "force"}); !errors.Is(err, deployment.ErrConflict) {
 		t.Fatal("stale reset precedence", err)
 	}
-	if _, err := w.ArchiveSandboxResetSession(t.Context(), tenant, session.ID, 1, second.Reset.RequestedAt); err != nil {
+	if _, err := deploymentExecution(t, w).ArchiveResetSession(t.Context(), tenant, session.ID, 1, second.Reset.RequestedAt); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := deploymentExecution(t, w).CompleteReset(ctx, installation, 1, first.Reset.RequestedAt); !errors.Is(err, deployment.ErrConflict) {
@@ -206,7 +206,7 @@ func TestSandboxResetAutoRechecksTurnStartedAfterListing(t *testing.T) {
 	// Session lock that the later conditional archive must reacquire.
 	turn := submitMessage(t, s, tenant, session.ID, "after-list")
 	transition(t, w, tenant, session.ID, turn.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-	if _, err := w.ArchiveSandboxResetSession(t.Context(), tenant, session.ID, 1, reset.Reset.RequestedAt); !errors.Is(err, ErrSandboxResetSessionBusy) {
+	if _, err := deploymentExecution(t, w).ArchiveResetSession(t.Context(), tenant, session.ID, 1, reset.Reset.RequestedAt); !errors.Is(err, deployment.ErrSandboxResetSessionBusy) {
 		t.Fatal("listed idle candidate cut a new Turn", err)
 	}
 	before := adminMutationSnapshot(t, s, "sessions", "environments", "environment_input_reservations", "turns", "runtime_placements")
@@ -261,7 +261,7 @@ func TestSandboxResetSnapshotCountsOfflineOwnershipOnce(t *testing.T) {
 	runtimeSuspensionSQL(t, s.pool, `UPDATE runtime_allocations SET compute_phase='suspended',compute_retained_until=clock_timestamp()+interval '1 hour' WHERE id=$1`, allocation.ID)
 	tenant, deleted := managedArchiveSession(t, s, managerSessionInput(uuid.NewString()))
 	archiveAllocation(t, w, tenant, deleted, process.InstallationID)
-	if err := s.DeleteSession(t.Context(), tenant, deleted.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: deleted.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reset, err := startReset(t, SandboxResetTestContext(t.Context()), w, process.InstallationID, deployment.ResetRequest{ExpectedGeneration: 1, Clear: "auto"})
@@ -327,7 +327,7 @@ func TestSandboxResetPaginationSkipsBusyPrefixAndPreservesSelfHosted(t *testing.
 		if i <= 34 {
 			runtimeSuspensionSQL(t, s.pool, `INSERT INTO turns(id,session_id,status) VALUES($1,$2,'in_progress')`, uuid.NewString(), id)
 		}
-		if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+		if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -340,7 +340,7 @@ func TestSandboxResetPaginationSkipsBusyPrefixAndPreservesSelfHosted(t *testing.
 	if err != nil || len(page) != 1 || page[0].SessionID != "00000000-0000-4000-8000-000000000035" {
 		t.Fatal("busy prefix starved idle work", page, err)
 	}
-	if _, err := w.ArchiveSandboxResetSession(t.Context(), page[0].TenantID, page[0].SessionID, 1, reset.Reset.RequestedAt); err != nil {
+	if _, err := deploymentExecution(t, w).ArchiveResetSession(t.Context(), page[0].TenantID, page[0].SessionID, 1, reset.Reset.RequestedAt); err != nil {
 		t.Fatal(err)
 	}
 	if err := deploymentExecution(t, w).StartReset(SandboxResetTestContext(t.Context()), installation, deployment.ResetRequest{ExpectedGeneration: 1, Clear: "force"}); err != nil {
@@ -354,10 +354,10 @@ func TestSandboxResetPaginationSkipsBusyPrefixAndPreservesSelfHosted(t *testing.
 	if err != nil || len(second) != 2 {
 		t.Fatal(second, err)
 	}
-	if _, err := w.ArchiveSandboxResetSession(t.Context(), selfTenant, self.ID, 1, reset.Reset.RequestedAt); !errors.Is(err, sessions.ErrInvalidInput) {
+	if _, err := deploymentExecution(t, w).ArchiveResetSession(t.Context(), selfTenant, self.ID, 1, reset.Reset.RequestedAt); !errors.Is(err, sessions.ErrInvalidInput) {
 		t.Fatal("self-hosted reset archive", err)
 	}
-	view, err := s.GetSession(t.Context(), selfTenant, self.ID)
+	view, err := sessionAdapter(s).GetSession(t.Context(), selfTenant, self.ID)
 	if err != nil || view.Environment.Status == "expired" {
 		t.Fatal("reset changed self-hosted Session", view, err)
 	}
@@ -388,7 +388,7 @@ func TestSandboxResetOwnerRestartRetainsDeadlineAndProvenance(t *testing.T) {
 	if err := deploymentExecution(t, successor).AdvanceResetDeadline(t.Context()); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := successor.ArchiveSandboxResetSession(t.Context(), tenant, session.ID, 1, reset.Reset.RequestedAt); err != nil {
+	if _, err := deploymentExecution(t, successor).ArchiveResetSession(t.Context(), tenant, session.ID, 1, reset.Reset.RequestedAt); err != nil {
 		t.Fatal(err)
 	}
 	committed, err := deploymentExecution(t, successor).CompleteReset(t.Context(), installation, 1, reset.Reset.RequestedAt)
diff --git a/services/core/internal/store/sandbox_specification_store_test.go b/services/core/internal/store/sandbox_specification_store_test.go
index 06464c77b..6164daf47 100644
--- a/services/core/internal/store/sandbox_specification_store_test.go
+++ b/services/core/internal/store/sandbox_specification_store_test.go
@@ -223,7 +223,7 @@ func TestSandboxSpecificationChangesPreserveEveryRetainedResource(t *testing.T)
 				if _, err := deploymentExecution(t, w).ReleaseAllocation(t.Context(), owner); err != nil {
 					t.Fatal(err)
 				}
-			} else if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+			} else if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 				t.Fatal(err)
 			}
 			changed := input
diff --git a/services/core/internal/store/scheduling.go b/services/core/internal/store/scheduling.go
index c02516880..b094ed530 100644
--- a/services/core/internal/store/scheduling.go
+++ b/services/core/internal/store/scheduling.go
@@ -2,15 +2,11 @@ package store
 
 import (
 	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
 )
 
 func (s *Store) ListEnvironmentInputWork(ctx context.Context, after string, connectedDevices []string) ([]sessions.EnvironmentInputWork, error) {
@@ -28,100 +24,3 @@ func (s *Store) ListEnvironmentInputWork(ctx context.Context, after string, conn
 	}
 	return work, nil
 }
-
-func (s *Store) sessionActivity(ctx context.Context, session sessions.Session, err error) (sessions.Session, error) {
-	if err != nil {
-		return sessions.Session{}, err
-	}
-	err = s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		var err error
-		session, err = readSessionActivity(ctx, s.queries.WithTx(tx), session)
-		return err
-	})
-	return session, err
-}
-
-// SessionStreamSnapshot reads the projection that GetSession returns and the
-// committed Session event cursor from one database snapshot.
-func (s *Store) SessionStreamSnapshot(ctx context.Context, tenantID, sessionID string) (sessions.Session, int64, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.Session{}, 0, err
-	}
-	id, err := parseID(sessionID)
-	if err != nil {
-		return sessions.Session{}, 0, err
-	}
-	var session sessions.Session
-	var cursor int64
-	err = s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		row, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: tenant, ID: id})
-		if err != nil {
-			return err
-		}
-		if session, err = sessionpg.SessionFromRow(row); err != nil {
-			return err
-		}
-		cursor = row.EventSequence
-		session, err = readSessionActivity(ctx, q, session)
-		return err
-	})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.Session{}, 0, sessions.ErrNotFound
-	}
-	if err != nil {
-		return sessions.Session{}, 0, fmt.Errorf("read session stream snapshot: %w", err)
-	}
-	return session, cursor, nil
-}
-
-// readSessionActivity adds the Environment, reservation activity and latest Turn
-// projection within the caller's snapshot.
-func readSessionActivity(ctx context.Context, q *sqlc.Queries, session sessions.Session) (sessions.Session, error) {
-	id, _ := parseID(session.ID)
-	tenant, _ := parseID(session.TenantID)
-	environment, err := q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: tenant, ID: id})
-	if err == nil {
-		value, err := sessionpg.EnvironmentFromRow(environment.Environment, environment.TenantID, environment.Configuration, nil)
-		if err != nil {
-			return session, err
-		}
-		session.Environment = &value
-		session.EnvironmentFailure = environmentFailure(environment.Environment)
-		state, err := sessionpg.LoadEnvironmentInput(ctx, q, id)
-		if err != nil {
-			return session, err
-		}
-		session.EnvironmentInputActivity, session.PendingInput = sessions.InputActivity(state)
-	} else if !errors.Is(err, pgx.ErrNoRows) {
-		return session, err
-	}
-	row, err := q.GetLatestSessionTurn(ctx, id)
-	if errors.Is(err, pgx.ErrNoRows) {
-		return session, nil
-	}
-	if err != nil {
-		return session, err
-	}
-	turn := sessionpg.TurnFromRow(row)
-	session.LastTurn = &turn
-	session.RequiredActions, err = sessionpg.LoadRequiredActions(ctx, q, id, turn)
-	if err != nil {
-		return session, err
-	}
-	session.Usage, err = q.SessionTokenUsage(ctx, id)
-	return session, err
-}
-
-func environmentFailure(row sqlc.Environment) *sessions.EnvironmentFailure {
-	if row.Status != "failed" || !row.FailureReason.Valid || !row.FailedAt.Valid {
-		return nil
-	}
-	failure := &sessions.EnvironmentFailure{Reason: row.FailureReason.String, FailedAt: row.FailedAt.Time}
-	var detail sessions.ProvisioningFailureDetail
-	if json.Unmarshal(row.FailureDetail, &detail) == nil {
-		failure.Detail = sessions.SanitizedProvisioningDetail(detail)
-	}
-	return failure
-}
diff --git a/services/core/internal/store/self_hosted_cancel_public_test.go b/services/core/internal/store/self_hosted_cancel_public_test.go
index eec981f6b..5da4bc866 100644
--- a/services/core/internal/store/self_hosted_cancel_public_test.go
+++ b/services/core/internal/store/self_hosted_cancel_public_test.go
@@ -36,7 +36,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 		t.Helper()
 		owner = executionOwner(t, db, s)
 		worker, stop := publicOwnedWorker(t, s, db, owner)
-		handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(worker), executorURL("https://offline-executor.example"))
+		handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker), executorURL("https://offline-executor.example"))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -153,7 +153,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	if err != nil || len(itemsBefore.Items) != 2 {
 		t.Fatal("controlled partial output was not recorded", err)
 	}
-	cursor, err := s.SessionEventCursor(t.Context(), tenant, created.ID)
+	cursor, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, created.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -167,7 +167,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	if err != nil || !reflect.DeepEqual(itemsBefore, itemsAfter) {
 		t.Fatal("cancellation admission changed partial history", err)
 	}
-	afterCursor, err := s.SessionEventCursor(t.Context(), tenant, created.ID)
+	afterCursor, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, created.ID)
 	if err != nil || afterCursor != cursor {
 		t.Fatal("cancellation admission fabricated an execution event", err)
 	}
diff --git a/services/core/internal/store/self_hosted_initial_public_test.go b/services/core/internal/store/self_hosted_initial_public_test.go
index 90bcb379b..174f9d687 100644
--- a/services/core/internal/store/self_hosted_initial_public_test.go
+++ b/services/core/internal/store/self_hosted_initial_public_test.go
@@ -44,7 +44,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 		t.Helper()
 		enabled := []func(*api.Dependencies){acceptUnavailable(t)}
 		if worker != nil {
-			enabled = append(enabled, workerExecution(worker), executorURL(origin))
+			enabled = append(enabled, workerExecution(t, worker), executorURL(origin))
 		} else {
 			// Without a Worker, Core keeps its executor URL but admits nothing.
 			enabled = append(enabled, func(d *api.Dependencies) {
diff --git a/services/core/internal/store/session_agent_filter_test.go b/services/core/internal/store/session_agent_filter_test.go
index 959b6e2c1..b41aa7873 100644
--- a/services/core/internal/store/session_agent_filter_test.go
+++ b/services/core/internal/store/session_agent_filter_test.go
@@ -45,7 +45,7 @@ func TestSessionAgentFilterPaginationAndIsolation(t *testing.T) {
 		var got []string
 		cursor := ""
 		for {
-			page, err := s.ListSessions(t.Context(), tenant, cursor, 2, ascending, &root)
+			page, err := sessionAdapter(s).ListSessions(t.Context(), tenant, cursor, 2, ascending, &root)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -75,20 +75,20 @@ func TestSessionAgentFilterPaginationAndIsolation(t *testing.T) {
 	if got := read(s, false); !slices.Equal(got, reverse) {
 		t.Fatal(got, reverse)
 	}
-	unfiltered, err := s.ListSessions(t.Context(), tenant, "", 100, false, nil)
+	unfiltered, err := sessionAdapter(s).ListSessions(t.Context(), tenant, "", 100, false, nil)
 	if err != nil || len(unfiltered.Sessions) != 9 {
 		t.Fatal(unfiltered, err)
 	}
 	for _, id := range []string{"", "unknown", root + " ", "' OR true --"} {
-		page, err := s.ListSessions(t.Context(), tenant, "", 100, false, &id)
+		page, err := sessionAdapter(s).ListSessions(t.Context(), tenant, "", 100, false, &id)
 		if err != nil || page.Sessions == nil || len(page.Sessions) != 0 || page.NextCursor != "" {
 			t.Fatal(page, err)
 		}
 	}
-	if _, err := s.ListSessions(t.Context(), tenant, other.ID, 2, true, &root); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).ListSessions(t.Context(), tenant, other.ID, 2, true, &root); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign cursor", err)
 	}
-	page, err := s.ListSessions(t.Context(), foreign, "", 100, false, &root)
+	page, err := sessionAdapter(s).ListSessions(t.Context(), foreign, "", 100, false, &root)
 	if err != nil || len(page.Sessions) != 1 || page.Sessions[0].ID != other.ID {
 		t.Fatal(page, err)
 	}
diff --git a/services/core/internal/store/session_artifacts_test.go b/services/core/internal/store/session_artifacts_test.go
index 0c4fd6d8d..e35b125f7 100644
--- a/services/core/internal/store/session_artifacts_test.go
+++ b/services/core/internal/store/session_artifacts_test.go
@@ -176,7 +176,7 @@ func testSessionArtifactsPublishVersionScopeAndLifetime(t *testing.T, kind strin
 			t.Fatalf("deleted metadata retained: %v", err)
 		}
 	}
-	if err := s.DeleteSession(t.Context(), tenant, session); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session}); err != nil {
 		t.Fatal(err)
 	}
 	if count := largeObjectCount(t, pool); count != before {
@@ -228,7 +228,7 @@ func TestSessionArtifactTransferDoesNotBlockDeletionOrCancellation(t *testing.T)
 			want := sessions.ErrNotFound
 			if operation == "delete" {
 				// The idle-only decision itself is not blocked by the transfer.
-				if err := s.DeleteSession(ctx, tenant, session); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatalf("transfer blocked or bypassed the deletion rule: %v", err)
 				}
 				if err := s.commitLegacyDeletion(ctx, tenant, session); err != nil {
@@ -420,7 +420,7 @@ func TestSessionArtifactsRepublishOnlyNewChangedOrDeletedPaths(t *testing.T) {
 		t.Fatalf("other Session first Turn published %v", got)
 	}
 	for _, id := range []string{session, other.ID} {
-		if err := s.DeleteSession(t.Context(), tenant, id); err != nil {
+		if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: id}); err != nil {
 			t.Fatal(err)
 		}
 	}
diff --git a/services/core/internal/store/session_configuration_test.go b/services/core/internal/store/session_configuration_test.go
index d57de119b..b3047da67 100644
--- a/services/core/internal/store/session_configuration_test.go
+++ b/services/core/internal/store/session_configuration_test.go
@@ -22,11 +22,11 @@ func TestConfigurationSizeLimitSurvivesJSONBRoundTrip(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	got, err := s.GetSession(ctx, tenant, first.ID)
+	got, err := sessionAdapter(s).GetSession(ctx, tenant, first.ID)
 	if err != nil || string(got.Configuration) != string(first.Configuration) {
 		t.Fatalf("configuration failed round trip: %v", err)
 	}
-	page, err := s.ListSessions(ctx, tenant, "", 10, false, nil)
+	page, err := sessionAdapter(s).ListSessions(ctx, tenant, "", 10, false, nil)
 	if err != nil || len(page.Sessions) != 1 || page.Sessions[0].ID != first.ID {
 		t.Fatalf("configuration broke listing: %v", err)
 	}
@@ -61,7 +61,7 @@ func TestConfigurationIsPartOfSessionIdentity(t *testing.T) {
 			t.Fatalf("changed snapshot was accepted: %v", err)
 		}
 	}
-	stored, err := s.GetSession(ctx, tenant, first.ID)
+	stored, err := sessionAdapter(s).GetSession(ctx, tenant, first.ID)
 	if err != nil || string(stored.Configuration) != string(first.Configuration) {
 		t.Fatalf("retry mutated snapshot: %+v, %v", stored, err)
 	}
diff --git a/services/core/internal/store/session_creation_stream_test.go b/services/core/internal/store/session_creation_stream_test.go
index ce7b03c1d..fd0e70e19 100644
--- a/services/core/internal/store/session_creation_stream_test.go
+++ b/services/core/internal/store/session_creation_stream_test.go
@@ -53,7 +53,7 @@ func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.
 		t.Fatal("invalid post-admission creation snapshot", created, retries)
 	}
 	id := created.Session.ID
-	initial, err := s.ListSessionEvents(ctx, tenant, id, created.Cursor)
+	initial, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, id, created.Cursor)
 	if err != nil || len(initial) != 3 {
 		t.Fatal("lost initial events", initial, err)
 	}
@@ -72,7 +72,7 @@ func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.
 		}
 		return string(raw)
 	}
-	read, err := s.GetSession(ctx, tenant, id)
+	read, err := sessionAdapter(s).GetSession(ctx, tenant, id)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -84,7 +84,7 @@ func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.
 		if retry.Session.LastTurn != nil || retry.Session.EnvironmentInputActivity != nil || retry.Session.Usage != nil {
 			t.Fatal("retry read the Session projection", retry.Session)
 		}
-		if events, err := s.ListSessionEvents(ctx, tenant, id, retry.Cursor); err != nil || len(events) != 0 {
+		if events, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, id, retry.Cursor); err != nil || len(events) != 0 {
 			t.Fatal("retry replayed initial events", events, err)
 		}
 	}
@@ -96,14 +96,14 @@ func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.
 	if encoded(created.Session) != encoded(ordinary) || encoded(ordinary) != encoded(read) {
 		t.Fatal("streamed and JSON creation projections differ", created.Session, ordinary)
 	}
-	snapshot, cursor, err := s.SessionStreamSnapshot(ctx, tenant, id)
+	snapshot, cursor, err := sessionAdapter(s).SessionStreamSnapshot(ctx, tenant, id)
 	if err != nil || encoded(snapshot) != encoded(read) || cursor != initial[len(initial)-1].Sequence || initial[2].Settled {
 		t.Fatal("stream snapshot differs from the Session read and its cursor", cursor, err)
 	}
 	transition(t, s, tenant, id, ordinary.LastTurn.ID, sessions.TurnQueued, sessions.TurnInProgress)
 	transition(t, s, tenant, id, ordinary.LastTurn.ID, sessions.TurnInProgress, sessions.TurnCompleted)
 	// Completing before the HTTP observer drains does not change its start point.
-	all, err := s.ListSessionEvents(ctx, tenant, id, created.Cursor)
+	all, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, id, created.Cursor)
 	if err != nil || len(all) <= len(initial) || all[0].Event.EventID != initial[0].Event.EventID {
 		t.Fatal(all, err)
 	}
@@ -111,10 +111,10 @@ func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.
 	if last := all[len(all)-1]; last.Event.Type != "agent.session.idle" || !last.Settled {
 		t.Fatal("terminal idle is not recorded as settled", last.Event.Type, last.Settled)
 	}
-	if _, cursor, err := s.SessionStreamSnapshot(ctx, tenant, id); err != nil || cursor != all[len(all)-1].Sequence {
+	if _, cursor, err := sessionAdapter(s).SessionStreamSnapshot(ctx, tenant, id); err != nil || cursor != all[len(all)-1].Sequence {
 		t.Fatal("stream snapshot cursor", cursor, err)
 	}
-	if _, _, err := s.SessionStreamSnapshot(ctx, uuid.NewString(), id); !errors.Is(err, sessions.ErrNotFound) {
+	if _, _, err := sessionAdapter(s).SessionStreamSnapshot(ctx, uuid.NewString(), id); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign stream snapshot", err)
 	}
 	late, err := s.CreateSessionStream(ctx, tenant, input)
@@ -128,7 +128,7 @@ func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.
 	if late.Session.ID != id || late.Session.LastTurn != nil {
 		t.Fatal("late retry read the Session projection", late.Session.LastTurn)
 	}
-	future, err := s.ListSessionEvents(ctx, tenant, id, late.Cursor)
+	future, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, id, late.Cursor)
 	if err != nil || len(future) != 3 || future[0].Turn.ID != next[0].TurnID {
 		t.Fatal(future, err)
 	}
diff --git a/services/core/internal/store/session_creator_test.go b/services/core/internal/store/session_creator_test.go
index b380d1947..c8c0d25d6 100644
--- a/services/core/internal/store/session_creator_test.go
+++ b/services/core/internal/store/session_creator_test.go
@@ -23,7 +23,7 @@ func TestSessionCreatorIsRequiredBeforeCreation(t *testing.T) {
 			t.Fatalf("invalid creator accepted: %v", err)
 		}
 	}
-	page, err := s.ListSessions(t.Context(), tenant, "", 10, false, nil)
+	page, err := sessionAdapter(s).ListSessions(t.Context(), tenant, "", 10, false, nil)
 	if err != nil || len(page.Sessions) != 0 {
 		t.Fatal("invalid creation wrote resources", page, err)
 	}
@@ -106,7 +106,7 @@ func TestConcurrentSessionCreatorsCannotShareCreationRetry(t *testing.T) {
 			t.Fatal("early recovery ignored creator kind", err)
 		}
 	}
-	if _, err := restarted.GetSession(t.Context(), uuid.NewString(), winner.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(restarted).GetSession(t.Context(), uuid.NewString(), winner.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("creator bypassed project isolation", err)
 	}
 }
@@ -132,11 +132,11 @@ func TestHistoricalUnknownCreatorCannotBeClaimedByRetry(t *testing.T) {
 			if err := pool.QueryRow(ctx, "SELECT to_jsonb(s)::text FROM sessions s WHERE id=$1", created.ID).Scan(&before); err != nil {
 				t.Fatal(err)
 			}
-			read, err := s.GetSession(ctx, tenant, created.ID)
+			read, err := sessionAdapter(s).GetSession(ctx, tenant, created.ID)
 			if err != nil || read.Creator != nil {
 				t.Fatal("historical ownership was invented", read, err)
 			}
-			page, err := s.ListSessions(ctx, tenant, "", 10, false, nil)
+			page, err := sessionAdapter(s).ListSessions(ctx, tenant, "", 10, false, nil)
 			if err != nil || len(page.Sessions) != 1 || page.Sessions[0].Creator != nil {
 				t.Fatal("historical project reads changed", page, err)
 			}
diff --git a/services/core/internal/store/session_deletion.go b/services/core/internal/store/session_deletion.go
deleted file mode 100644
index 7f6772abd..000000000
--- a/services/core/internal/store/session_deletion.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// DeleteSession removes public access to a durably idle or failed Session while
-// retaining state needed to settle execution. The decision is taken under the
-// Session lock that also orders Turn and input admission, so a concurrent
-// admission either commits first and is rejected here, or observes the deletion.
-// The owner's repeated deletion succeeds without another resource write; foreign and
-// missing Sessions remain not found.
-func (s *Store) DeleteSession(ctx context.Context, tenantID, sessionID string) error {
-	return s.withLockedSession(ctx, tenantID, sessionID, true, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID, locked sessions.LockedSession) error {
-		audit := func() error {
-			return auditpg.RecordWriteAudit(ctx, q, tenantID, "delete", "session", uuid.UUID(session.Bytes).String(), "")
-		}
-		if locked.Deleted {
-			return audit()
-		}
-		if err := requireSessionSettled(ctx, q, session); err != nil {
-			return err
-		}
-		if err := q.DeleteSessionArtifacts(ctx, session); err != nil {
-			return err
-		}
-		if err := q.ReleaseUnallocatedRuntimePlacement(ctx, session); err != nil {
-			return err
-		}
-		if err := q.MarkSessionDeleted(ctx, session); err != nil {
-			return err
-		}
-		return audit()
-	})
-}
-
-// requireSessionSettled rejects a queued, in-progress or waiting Turn, which
-// includes pending required actions and function results, and a pending input
-// reservation: queued later input, self-hosted input awaiting a connection, or
-// hosted initial input while provisioning. Terminal idle and failed Sessions pass.
-func requireSessionSettled(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-	if _, err := q.GetActiveTurn(ctx, session); err == nil {
-		return sessions.ErrNotIdle
-	} else if !errors.Is(err, pgx.ErrNoRows) {
-		return err
-	}
-	state, err := sessionpg.LoadEnvironmentInput(ctx, q, session)
-	if err != nil {
-		return err
-	}
-	if _, pending := sessions.InputActivity(state); pending {
-		return sessions.ErrNotIdle
-	}
-	return nil
-}
diff --git a/services/core/internal/store/session_deletion_execution_test.go b/services/core/internal/store/session_deletion_execution_test.go
index 678580d56..fe40df03a 100644
--- a/services/core/internal/store/session_deletion_execution_test.go
+++ b/services/core/internal/store/session_deletion_execution_test.go
@@ -31,7 +31,7 @@ func TestDeletedSessionWaitingTurnSettlesWithoutStoppingWorker(t *testing.T) {
 	h.read(testExecutionRequest)
 	h.write(input.TurnID, proto.TypeFunctionCall, proto.FunctionCallPayload{CallID: "pending", Name: "lookup_ticket", Arguments: json.RawMessage(`{}`)})
 	state := functionState(t, h, 1)
-	if err := h.s.DeleteSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("waiting Session deleted", err)
 	}
 	// A marker committed by an earlier release still cancels and settles work.
@@ -52,7 +52,7 @@ func TestDeletedSessionWaitingTurnSettlesWithoutStoppingWorker(t *testing.T) {
 	if err != nil || bound.NativeSessionID != "deleted-native" {
 		t.Fatal(bound, err)
 	}
-	if _, err := h.s.GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 	if _, err := h.bound().Run(ctx, h.tenant, h.session.ID, input.TurnID); !errors.Is(err, sessions.ErrNotFound) {
@@ -72,7 +72,7 @@ func TestDeletedSessionRestartStillReconcilesHiddenClaim(t *testing.T) {
 	if _, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	if err := h.s.DeleteSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("running Session deleted", err)
 	}
 	if err := h.s.CommitLegacyDeletion(ctx, h.tenant, h.session.ID); err != nil {
@@ -88,7 +88,7 @@ func TestDeletedSessionRestartStillReconcilesHiddenClaim(t *testing.T) {
 	if err != nil || turn.Status != sessions.TurnFailed {
 		t.Fatal(turn, err)
 	}
-	if _, err := h.s.GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 }
@@ -114,7 +114,7 @@ func TestWaitingSessionCancelsThenDeletesThroughWorker(t *testing.T) {
 	h.read(testExecutionRequest)
 	h.write(input.TurnID, proto.TypeFunctionCall, proto.FunctionCallPayload{CallID: "pending", Name: "lookup_ticket", Arguments: json.RawMessage(`{}`)})
 	state := functionState(t, h, 1)
-	if err := h.s.DeleteSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("waiting Session deleted", err)
 	}
 	if again := functionState(t, h, 1); again.LastTurn == nil || again.LastTurn.Status != sessions.TurnWaiting || !again.LastTurn.CancelRequestedAt.IsZero() {
@@ -128,14 +128,14 @@ func TestWaitingSessionCancelsThenDeletesThroughWorker(t *testing.T) {
 	if err := h.read(proto.TypePromptCancel).DecodePayload(&request); err != nil {
 		t.Fatal(err)
 	}
-	if err := h.s.DeleteSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("Session deleted before cancellation settled", err)
 	}
 	h.write(input.TurnID, proto.TypeInteractionDecisionAck, proto.InteractionDecisionAckPayload{DeliveryID: request.DeliveryID, Applied: true, Outcome: &proto.DonePayload{Metadata: map[string]any{proto.DoneMetaAgentSessionID: "cancelled-native"}}})
 	waitTurn(t, h, input.TurnID, sessions.TurnCancelled)
 	deadline := time.Now().Add(10 * time.Second)
 	for {
-		err := h.s.DeleteSession(ctx, h.tenant, h.session.ID)
+		err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID})
 		if err == nil {
 			break
 		}
@@ -144,14 +144,14 @@ func TestWaitingSessionCancelsThenDeletesThroughWorker(t *testing.T) {
 		}
 		time.Sleep(20 * time.Millisecond)
 	}
-	if err := h.s.DeleteSession(ctx, h.tenant, h.session.ID); err != nil {
+	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); err != nil {
 		t.Fatal("repeated deletion", err)
 	}
 	raw, _ := json.Marshal(sessions.FunctionResultInput{TurnID: input.TurnID, CallID: state.RequiredActions[0].CallID, Result: json.RawMessage(`{"success":true,"output":"late"}`)})
 	if _, err := worker.SubmitInputs(ctx, h.tenant, h.session.ID, "late", []sessions.Input{{Kind: "tool_result", Payload: raw}}); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
-	if _, err := h.s.GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 	h.session = publicSession(t, h, "unrelated")
diff --git a/services/core/internal/store/session_deletion_test.go b/services/core/internal/store/session_deletion_test.go
index f1bd0de96..04b1b5623 100644
--- a/services/core/internal/store/session_deletion_test.go
+++ b/services/core/internal/store/session_deletion_test.go
@@ -77,23 +77,23 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 					t.Fatal(err)
 				}
 			}
-			if err := s.DeleteSession(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+			if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: uuid.NewString(), SessionID: session.ID}); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
 			if status == sessions.TurnQueued || status == sessions.TurnInProgress {
 				// Deletion leaves active work untouched: no cancellation, marker or event.
-				cursor, err := s.SessionEventCursor(ctx, tenant, session.ID)
+				cursor, err := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 				if err != nil {
 					t.Fatal(err)
 				}
-				if err := s.DeleteSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("active Session deleted", err)
 				}
 				turn, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, receipt.TurnID)
 				if err != nil || turn.Status != status || !turn.CancelRequestedAt.IsZero() {
 					t.Fatal("rejected deletion changed the Turn", turn, err)
 				}
-				if after, err := s.SessionEventCursor(ctx, tenant, session.ID); err != nil || after != cursor {
+				if after, err := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID); err != nil || after != cursor {
 					t.Fatal("rejected deletion recorded an event", after, cursor, err)
 				}
 				if sessionDeletedAt(t, pool, session.ID).Valid {
@@ -105,7 +105,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 					t.Fatal(err)
 				}
 				if status == sessions.TurnInProgress {
-					if err := s.DeleteSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+					if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 						t.Fatal("cancelling Session deleted", err)
 					}
 					if _, err := completeExecution(ctx, t, s, tenant, session.ID, receipt.TurnID, sessions.TurnCancelled, nil, "", receipt.Sequence); err != nil {
@@ -113,24 +113,24 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 					}
 				}
 			}
-			if err := s.DeleteSession(ctx, tenant, session.ID); err != nil {
+			if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 				t.Fatal(err)
 			}
 			marker := sessionDeletedAt(t, pool, session.ID)
 			fresh := New(pool)
 			// The owner's repeated deletion confirms again without another write.
 			for _, repeat := range []*Store{s, fresh} {
-				if err := repeat.DeleteSession(ctx, tenant, session.ID); err != nil {
+				if err := sessionService(t, repeat).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 					t.Fatal("repeated deletion", err)
 				}
-				if err := repeat.DeleteSession(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+				if err := sessionService(t, repeat).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: uuid.NewString(), SessionID: session.ID}); !errors.Is(err, sessions.ErrNotFound) {
 					t.Fatal("foreign deleted Session", err)
 				}
 			}
 			if again := sessionDeletedAt(t, pool, session.ID); again != marker {
 				t.Fatal("repeated deletion rewrote the marker", marker, again)
 			}
-			if _, err := fresh.GetSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sessionAdapter(fresh).GetSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
 			if _, err := fresh.CreateSession(ctx, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
@@ -166,10 +166,10 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if err != nil || len(inputs) == 0 || inputs[0].Sequence != receipt.Sequence {
 				t.Fatal(inputs, err)
 			}
-			if _, err := fresh.SessionEventCursor(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sessionAdapter(fresh).SessionEventCursor(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
-			if _, err := fresh.ListSessionEvents(ctx, tenant, session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sessionAdapter(fresh).ListSessionEvents(ctx, tenant, session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
 		})
@@ -290,7 +290,9 @@ func TestSessionDeletionRacesAdmissionUnderSessionLock(t *testing.T) {
 			tenant, session := kind.setup(t, plain)
 			deleted := make(chan error, 1)
 			s := traced(t, func() {
-				go func() { deleted <- plain.DeleteSession(context.Background(), tenant, session) }()
+				go func() {
+					deleted <- sessionService(t, plain).DeleteSession(context.Background(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session})
+				}()
 				awaitSessionLockWaiter(t, pool)
 			})
 			if err := kind.admit(t.Context(), s, tenant, session); err != nil {
@@ -302,7 +304,7 @@ func TestSessionDeletionRacesAdmissionUnderSessionLock(t *testing.T) {
 			if sessionDeletedAt(t, pool, session).Valid {
 				t.Fatal("rejected deletion committed a marker")
 			}
-			current, err := plain.GetSession(t.Context(), tenant, session)
+			current, err := sessionAdapter(plain).GetSession(t.Context(), tenant, session)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -320,7 +322,7 @@ func TestSessionDeletionRacesAdmissionUnderSessionLock(t *testing.T) {
 				go func() { admitted <- kind.admit(context.Background(), plain, tenant, session) }()
 				awaitSessionLockWaiter(t, pool)
 			})
-			if err := s.DeleteSession(t.Context(), tenant, session); err != nil {
+			if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session}); err != nil {
 				t.Fatal(err)
 			}
 			if err := <-admitted; !errors.Is(err, sessions.ErrNotFound) {
@@ -341,7 +343,10 @@ func TestSessionDeletionRacesAdmissionUnderSessionLock(t *testing.T) {
 				other := New(pool)
 				start := make(chan struct{})
 				results := make(chan error, 2)
-				go func() { <-start; results <- plain.DeleteSession(context.Background(), tenant, session) }()
+				go func() {
+					<-start
+					results <- sessionService(t, plain).DeleteSession(context.Background(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session})
+				}()
 				go func() { <-start; results <- kind.admit(context.Background(), other, tenant, session) }()
 				close(start)
 				first, second := <-results, <-results
@@ -406,10 +411,10 @@ func TestSessionDeletionKeepsProvisioningInputPlacementUntilSettled(t *testing.T
 	if before.deleted.Valid || before.released.Valid || before.retained != 1 || before.reserved != 1 {
 		t.Fatal("unexpected reserved placement", before)
 	}
-	if err := s.DeleteSession(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: uuid.NewString(), SessionID: session.ID}); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign deletion", err)
 	}
-	if err := s.DeleteSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("provisioning input deleted", err)
 	}
 	if after := read(); after != before {
@@ -421,20 +426,20 @@ func TestSessionDeletionKeepsProvisioningInputPlacementUntilSettled(t *testing.T
 	if count, err := w.ExpireEnvironmentInputs(ctx); err != nil || count != 1 {
 		t.Fatal("initial input did not expire", count, err)
 	}
-	if err := s.DeleteSession(ctx, tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	deleted := read()
 	if !deleted.deleted.Valid || !deleted.released.Valid || deleted.retained != 0 || deleted.reserved != 0 {
 		t.Fatal("allowed deletion kept the placement", deleted)
 	}
-	if err := s.DeleteSession(ctx, tenant, session.ID); err != nil {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal("repeated deletion", err)
 	}
 	if again := read(); again != deleted {
 		t.Fatal("repeated deletion changed timestamps", deleted, again)
 	}
-	if err := s.DeleteSession(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: uuid.NewString(), SessionID: session.ID}); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign deletion of a deleted Session", err)
 	}
 }
diff --git a/services/core/internal/store/session_diagnostics.go b/services/core/internal/store/session_diagnostics.go
deleted file mode 100644
index 0c9ee313a..000000000
--- a/services/core/internal/store/session_diagnostics.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-)
-
-// GetSessionDiagnosticsSnapshot keeps all existing Session projections in one
-// read-only snapshot, including the failure precedence used by the public API.
-func (s *Store) GetSessionDiagnosticsSnapshot(ctx context.Context, tenantID, sessionID string) (sessions.Session, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.Session{}, err
-	}
-	var session sessions.Session
-	err = s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		row, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: tenant, ID: pgunit.PathID(sessionID)})
-		if err != nil {
-			return err
-		}
-		session, err = sessionpg.SessionFromRow(row)
-		if err != nil {
-			return err
-		}
-		session, err = readSessionActivity(ctx, q, session)
-		return err
-	})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.Session{}, sessions.ErrNotFound
-	}
-	return session, err
-}
-
-// GetTurnDiagnosticsSnapshot reads only root Turns and their root Items. Its
-// bounded query and public projection share the same committed snapshot.
-func (s *Store) GetTurnDiagnosticsSnapshot(ctx context.Context, tenantID, sessionID, turnID string) (sessions.TurnDiagnosticsSnapshot, error) {
-	params, err := sessionpg.PublicTurnLookup(tenantID, sessionID, turnID)
-	if err != nil {
-		return sessions.TurnDiagnosticsSnapshot{}, err
-	}
-	result := sessions.TurnDiagnosticsSnapshot{Items: []sessions.ItemDiagnosticTiming{}}
-	err = s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		turn, err := q.GetTurn(ctx, params)
-		if err != nil {
-			return err
-		}
-		row, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: params.TenantID, ID: params.SessionID})
-		if err != nil {
-			return err
-		}
-		result.Session, err = sessionpg.SessionFromRow(row)
-		if err != nil {
-			return err
-		}
-		result.Turn = sessionpg.TurnFromRow(turn)
-		rows, err := q.ListTurnItemDiagnostics(ctx, sqlc.ListTurnItemDiagnosticsParams{SessionID: params.SessionID, TurnID: params.ID})
-		if err != nil {
-			return err
-		}
-		result.ItemsTruncated = len(rows) > 1000
-		if result.ItemsTruncated {
-			rows = rows[:1000]
-		}
-		for _, row := range rows {
-			item := sessions.ItemDiagnosticTiming{ItemID: uuid.UUID(row.ID.Bytes).String(), StartedAt: row.CreatedAt.Time}
-			if row.SettledAt.Valid {
-				at := row.SettledAt.Time
-				item.CompletedAt = &at
-			}
-			result.Items = append(result.Items, item)
-		}
-		return nil
-	})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.TurnDiagnosticsSnapshot{}, sessions.ErrNotFound
-	}
-	return result, err
-}
diff --git a/services/core/internal/store/session_diagnostics_cancellation_test.go b/services/core/internal/store/session_diagnostics_cancellation_test.go
index f4aae5f19..03518915a 100644
--- a/services/core/internal/store/session_diagnostics_cancellation_test.go
+++ b/services/core/internal/store/session_diagnostics_cancellation_test.go
@@ -33,9 +33,9 @@ func TestDiagnosticSnapshotCancellationReleasesTransaction(t *testing.T) {
 			go func() {
 				var err error
 				if rootTurn {
-					_, err = s.GetTurnDiagnosticsSnapshot(ctx, tenant, session.ID, receipt.TurnID)
+					_, err = sessionAdapter(s).GetTurnDiagnosticsSnapshot(ctx, tenant, session.ID, receipt.TurnID)
 				} else {
-					_, err = s.GetSessionDiagnosticsSnapshot(ctx, tenant, session.ID)
+					_, err = sessionAdapter(s).GetSession(ctx, tenant, session.ID)
 				}
 				done <- err
 			}()
@@ -81,9 +81,9 @@ func TestDiagnosticSnapshotCancellationReleasesTransaction(t *testing.T) {
 				t.Fatal(err)
 			}
 			if rootTurn {
-				_, err = s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+				_, err = sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 			} else {
-				_, err = s.GetSessionDiagnosticsSnapshot(t.Context(), tenant, session.ID)
+				_, err = sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 			}
 			if err != nil {
 				t.Fatal("snapshot read did not recover", err)
diff --git a/services/core/internal/store/session_diagnostics_test.go b/services/core/internal/store/session_diagnostics_test.go
index 9757c2dfe..395f8719c 100644
--- a/services/core/internal/store/session_diagnostics_test.go
+++ b/services/core/internal/store/session_diagnostics_test.go
@@ -34,7 +34,7 @@ func TestDiagnosticItemReceiptSettlementAndReplay(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	snap, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+	snap, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 	if err != nil || len(snap.Items) != 2 {
 		t.Fatal(snap, err)
 	}
@@ -58,7 +58,7 @@ func TestDiagnosticItemReceiptSettlementAndReplay(t *testing.T) {
 		t.Fatal(err)
 	}
 	transition(t, s, tenant, session.ID, receipt.TurnID, sessions.TurnInProgress, sessions.TurnFailed)
-	snap, err = s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+	snap, err = sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 	if err != nil || snap.Items[1].CompletedAt != nil {
 		t.Fatal("historical settlement synthesized", snap, err)
 	}
@@ -81,7 +81,7 @@ func TestDiagnosticForceSettlementIgnoresNativeClock(t *testing.T) {
 			if err != nil || completed.CompletedAt.UnixMilli() != source {
 				t.Fatal("public native completion changed", completed, err)
 			}
-			snap, err := s.GetTurnDiagnosticsSnapshot(t.Context(), owner.TenantID, owner.SessionID, turn)
+			snap, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), owner.TenantID, owner.SessionID, turn)
 			if err != nil || len(snap.Items) != 2 {
 				t.Fatal(snap, err)
 			}
@@ -145,7 +145,7 @@ func TestDiagnosticSettlementWaitsForSessionLock(t *testing.T) {
 	if err = <-done; err != nil {
 		t.Fatal(err)
 	}
-	snap, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+	snap, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -165,7 +165,7 @@ func TestDiagnosticTimingBoundOrderAndIsolation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	snap, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+	snap, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 	if err != nil || len(snap.Items) != 1000 || !snap.ItemsTruncated {
 		t.Fatal("unbounded diagnostics", len(snap.Items), snap.ItemsTruncated, err)
 	}
@@ -179,20 +179,20 @@ func TestDiagnosticTimingBoundOrderAndIsolation(t *testing.T) {
 		}
 	}
 	runtimeSuspensionSQL(t, pool, "DELETE FROM session_items WHERE turn_id=$1 AND created_at>'2020-01-01T00:00:00Z'", receipt.TurnID)
-	exact, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+	exact, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 	if err != nil || len(exact.Items) != 1000 || exact.ItemsTruncated {
 		t.Fatal("exact limit falsely truncated", len(exact.Items), exact.ItemsTruncated, err)
 	}
 	for _, ids := range [][3]string{{uuid.NewString(), session.ID, receipt.TurnID}, {tenant, "malformed", receipt.TurnID}, {tenant, session.ID, uuid.NewString()}} {
-		if _, err := s.GetTurnDiagnosticsSnapshot(t.Context(), ids[0], ids[1], ids[2]); !errors.Is(err, sessions.ErrNotFound) {
+		if _, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), ids[0], ids[1], ids[2]); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal("scope leaked", ids, err)
 		}
 	}
 	runtimeSuspensionSQL(t, pool, "UPDATE sessions SET deleted_at=clock_timestamp() WHERE id=$1", session.ID)
-	if _, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("deleted root visible", err)
 	}
-	if _, err := s.GetSessionDiagnosticsSnapshot(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("deleted Session visible", err)
 	}
 }
@@ -233,11 +233,11 @@ func TestDiagnosticProvisioningDetailAtomicAndPrivate(t *testing.T) {
 	if err = sessionExecution(t, writer.lease).FailEnvironmentInitialization(t.Context(), preparation, failure); err != nil {
 		t.Fatal(err)
 	}
-	snap, err := s.GetSessionDiagnosticsSnapshot(t.Context(), tenant, session.ID)
+	snap, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || snap.EnvironmentFailure == nil || snap.EnvironmentFailure.Detail == nil || *snap.EnvironmentFailure.Detail.Index != 2 || *snap.EnvironmentFailure.Detail.ExitCode != 7 {
 		t.Fatal("detail not persisted", snap.EnvironmentFailure, err)
 	}
-	events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+	events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -247,7 +247,7 @@ func TestDiagnosticProvisioningDetailAtomicAndPrivate(t *testing.T) {
 	}
 	// Historical reasons are never parsed into structured detail; corrupted private fields are sanitized.
 	runtimeSuspensionSQL(t, pool, "UPDATE environments SET failure_detail=$2 WHERE id=$1", owner.EnvironmentID, `{"step":"secret-provider-token","index":3,"exit_code":2}`)
-	snap, err = s.GetSessionDiagnosticsSnapshot(t.Context(), tenant, session.ID)
+	snap, err = sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || snap.EnvironmentFailure.Detail != nil {
 		t.Fatal("unsafe private detail projected", snap.EnvironmentFailure, err)
 	}
@@ -271,7 +271,7 @@ func TestDiagnosticPutItemRollsBack(t *testing.T) {
 	if err = tx.Rollback(t.Context()); err != nil {
 		t.Fatal(err)
 	}
-	snap, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+	snap, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 	if err != nil || len(snap.Items) != 1 {
 		t.Fatal("rolled back receipt visible", snap, err)
 	}
@@ -287,7 +287,7 @@ func TestDiagnosticFirstSettlementSurvivesStoredStatusRegression(t *testing.T) {
 	if err := journal.AppendTurnEvents(t.Context(), tenant, session.ID, receipt.TurnID, 1, events); err != nil {
 		t.Fatal(err)
 	}
-	first, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+	first, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -304,7 +304,7 @@ func TestDiagnosticFirstSettlementSurvivesStoredStatusRegression(t *testing.T) {
 		} else if err := journal.AppendTurnEvents(t.Context(), tenant, session.ID, receipt.TurnID, 3, events[1:]); err != nil {
 			t.Fatal(err)
 		}
-		got, err := s.GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
+		got, err := sessionAdapter(s).GetTurnDiagnosticsSnapshot(t.Context(), tenant, session.ID, receipt.TurnID)
 		if err != nil || got.Items[1].CompletedAt == nil || !got.Items[1].CompletedAt.Equal(*item.CompletedAt) {
 			t.Fatal("first settlement overwritten", force, got, err)
 		}
@@ -318,7 +318,7 @@ func TestDiagnosticRootReadRejectsActualChildTurn(t *testing.T) {
 	runtimeSuspensionSQL(t, s.pool, `INSERT INTO turn_events(session_id,turn_id,ordinal,kind,payload) VALUES($1,$2,1,'subagent','{}')`, owner.SessionID, root)
 	runtimeSuspensionSQL(t, s.pool, `INSERT INTO subagent_identities(id,session_id,device_id,engine,native_id,parent_native_id,native_created_at,first_turn_id,first_event_ordinal) VALUES($1,$2,$3,'codex','child','root',1,$4,1)`, child, owner.SessionID, owner.DeviceID, root)
 	runtimeSuspensionSQL(t, s.pool, `INSERT INTO subagent_turns(id,session_id,subagent_id,native_id,status,created_at) VALUES($1,$2,$3,'child-turn','in_progress',clock_timestamp())`, turn, owner.SessionID, child)
-	if _, err := w.GetTurnDiagnosticsSnapshot(t.Context(), owner.TenantID, owner.SessionID, turn); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(w).GetTurnDiagnosticsSnapshot(t.Context(), owner.TenantID, owner.SessionID, turn); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("child Turn became root diagnostics", err)
 	}
 }
@@ -357,7 +357,7 @@ func TestDiagnosticSessionSnapshotConcurrentCommitConsistency(t *testing.T) {
 		done <- nil
 	}()
 	for i := 0; i < 150; i++ {
-		snapshot, err := s.GetSessionDiagnosticsSnapshot(t.Context(), tenant, session.ID)
+		snapshot, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/session_environment_snapshot_test.go b/services/core/internal/store/session_environment_snapshot_test.go
index 39d54f2d2..56e9ce389 100644
--- a/services/core/internal/store/session_environment_snapshot_test.go
+++ b/services/core/internal/store/session_environment_snapshot_test.go
@@ -29,7 +29,7 @@ func TestSelfHostedCreationSnapshotRetainsEnvironmentAndCursor(t *testing.T) {
 	if err != nil || pending.State != sessions.EnvironmentInputPending {
 		t.Fatal(pending, err)
 	}
-	events, err := s.ListSessionEvents(t.Context(), tenant, created.Session.ID, created.Cursor)
+	events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, created.Session.ID, created.Cursor)
 	if err != nil || len(events) != 1 || events[0].Event.Type != "agent.session.requires_action" {
 		t.Fatal("creation cursor lost subsequent activity", events, err)
 	}
@@ -59,7 +59,7 @@ func TestSelfHostedCreationSnapshotRetainsEnvironmentAndCursor(t *testing.T) {
 	if _, err := s.FindSessionCreation(t.Context(), tenant, input.IdempotencyKey, input.CreationRequest, changedCreator); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 		t.Fatal("retry creator isolation", err)
 	}
-	current, err := s.GetSession(t.Context(), tenant, created.Session.ID)
+	current, err := sessionAdapter(s).GetSession(t.Context(), tenant, created.Session.ID)
 	if err != nil || current.EnvironmentInputActivity == nil || current.EnvironmentInputActivity.Status != "requires_action" {
 		t.Fatal("ordinary read lost current activity", current, err)
 	}
diff --git a/services/core/internal/store/session_events.go b/services/core/internal/store/session_events.go
deleted file mode 100644
index 81c48d111..000000000
--- a/services/core/internal/store/session_events.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package store
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-)
-
-func (s *Store) SessionEventCursor(ctx context.Context, tenantID, sessionID string) (int64, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return 0, err
-	}
-	id := pgunit.PathID(sessionID)
-	cursor, err := s.queries.SessionEventCursor(ctx, sqlc.SessionEventCursorParams{TenantID: tenant, ID: id})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return 0, sessions.ErrNotFound
-	}
-	return cursor, err
-}
-
-func (s *Store) ListSessionEvents(ctx context.Context, tenantID, sessionID string, after int64) ([]sessions.SessionChange, error) {
-	if after < 0 {
-		return nil, sessions.ErrInvalidInput
-	}
-	latest, err := s.SessionEventCursor(ctx, tenantID, sessionID)
-	if err != nil {
-		return nil, err
-	}
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return nil, err
-	}
-	id, err := parseID(sessionID)
-	if err != nil {
-		return nil, err
-	}
-	rows, err := s.queries.ListSessionEvents(ctx, sqlc.ListSessionEventsParams{TenantID: tenant, SessionID: id, Sequence: after})
-	if err != nil {
-		return nil, err
-	}
-	changes := make([]sessions.SessionChange, 0, len(rows))
-	if len(rows) == 0 && latest > after {
-		return nil, sessions.ErrStreamGap
-	}
-	for _, row := range rows {
-		if row.Sequence != after+1 {
-			return nil, sessions.ErrStreamGap
-		}
-		var change sessions.SessionChange
-		decoder := json.NewDecoder(bytes.NewReader(row.Payload))
-		decoder.UseNumber()
-		if err := decoder.Decode(&change); err != nil {
-			return nil, err
-		}
-		change.Sequence = row.Sequence
-		changes = append(changes, change)
-		after = row.Sequence
-	}
-	return changes, nil
-}
diff --git a/services/core/internal/store/session_events_test.go b/services/core/internal/store/session_events_test.go
index 48fa34581..3b7748f58 100644
--- a/services/core/internal/store/session_events_test.go
+++ b/services/core/internal/store/session_events_test.go
@@ -31,7 +31,7 @@ func TestSessionEventsAreVisibleOnlyAfterCommit(t *testing.T) {
 		if err = sqlc.New(tx).AppendSessionEvent(ctx, sqlc.AppendSessionEventParams{ID: pgtype.UUID{Bytes: uuid.MustParse(session.ID), Valid: true}, Payload: []byte(`{"event":{"type":"agent.session.idle"}}`)}); err != nil {
 			t.Fatal(err)
 		}
-		if changes, err := s.ListSessionEvents(ctx, tenant, session.ID, 0); err != nil || len(changes) != 0 {
+		if changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); err != nil || len(changes) != 0 {
 			t.Fatal("uncommitted events were visible", changes, err)
 		}
 		if commit {
@@ -43,7 +43,7 @@ func TestSessionEventsAreVisibleOnlyAfterCommit(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	if changes, err := s.ListSessionEvents(ctx, tenant, session.ID, 0); err != nil || len(changes) != 1 || changes[0].Sequence != 1 {
+	if changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); err != nil || len(changes) != 1 || changes[0].Sequence != 1 {
 		t.Fatal("commit or rollback changed sequence continuity", changes, err)
 	}
 }
@@ -61,14 +61,14 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	before, err := s.SessionEventCursor(ctx, tenant, session.ID)
+	before, err := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if _, err = s.SubmitMessage(ctx, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`)); err != nil {
 		t.Fatal(err)
 	}
-	after, _ := s.SessionEventCursor(ctx, tenant, session.ID)
+	after, _ := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("input retry published duplicate events")
 	}
@@ -86,14 +86,14 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	before, _ = s.SessionEventCursor(ctx, tenant, session.ID)
+	before, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if err = journal.AppendTurnEvents(ctx, tenant, session.ID, input.TurnID, 5, []sessions.ExecutionEvent{
 		{Kind: "delta", Payload: json.RawMessage(`{"item_id":"discarded","delta":"rollback"}`)},
 		{Kind: "output_message", Payload: json.RawMessage(`{"status":"invalid"}`)},
 	}); err == nil {
 		t.Fatal("invalid projection accepted")
 	}
-	after, _ = s.SessionEventCursor(ctx, tenant, session.ID)
+	after, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("failed transaction published events")
 	}
@@ -103,7 +103,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	var all []sessions.SessionChange
 	cursor := int64(0)
 	for {
-		page, err := store.New(pool).ListSessionEvents(ctx, tenant, session.ID, cursor)
+		page, err := store.SessionAdapter(store.New(pool)).ListSessionEvents(ctx, tenant, session.ID, cursor)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -139,14 +139,14 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if counts["agent.session.turn.output_text.delta"] != 3 || counts["agent.session.turn.item.done"] != 2 {
 		t.Fatal(counts)
 	}
-	if _, err = s.ListSessionEvents(ctx, uuid.NewString(), session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err = store.SessionAdapter(s).ListSessionEvents(ctx, uuid.NewString(), session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign event access", err)
 	}
-	before, _ = s.SessionEventCursor(ctx, tenant, session.ID)
+	before, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if _, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true); err != nil {
 		t.Fatal(err)
 	}
-	after, _ = s.SessionEventCursor(ctx, tenant, session.ID)
+	after, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("history read published live events")
 	}
@@ -178,17 +178,17 @@ func TestSessionEventsRetentionAndQueuedCancellation(t *testing.T) {
 	if err = pool.QueryRow(ctx, "SELECT count(*) FROM session_events WHERE session_id=$1", session.ID).Scan(&count); err != nil || count != 256 {
 		t.Fatal(count, err)
 	}
-	if _, err = s.ListSessionEvents(ctx, tenant, session.ID, 0); !errors.Is(err, sessions.ErrStreamGap) {
+	if _, err = store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); !errors.Is(err, sessions.ErrStreamGap) {
 		t.Fatal("lagging reader did not detect missing events", err)
 	}
-	cursor, err := s.SessionEventCursor(ctx, tenant, session.ID)
+	cursor, err := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if _, err = s.RequestCancel(ctx, tenant, session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
-	changes, err := s.ListSessionEvents(ctx, tenant, session.ID, cursor)
+	changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, cursor)
 	if err != nil || len(changes) != 2 || changes[0].Event.Type != "agent.session.turn.cancelled" || changes[1].Event.Type != "agent.session.idle" {
 		t.Fatal(changes, err)
 	}
diff --git a/services/core/internal/store/session_execution_configuration.go b/services/core/internal/store/session_execution_configuration.go
index da0cc42fc..883c44bf6 100644
--- a/services/core/internal/store/session_execution_configuration.go
+++ b/services/core/internal/store/session_execution_configuration.go
@@ -3,15 +3,12 @@ package store
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
@@ -23,7 +20,7 @@ func saveSessionExecutionConfiguration(ctx context.Context, q *sqlc.Queries, ses
 	}
 	var frozenRevision pgtype.UUID
 	frozen := *projection
-	model, err := sessionExecutionModel(session.Configuration)
+	model, err := sessions.ExecutionModel(session.Configuration)
 	if err != nil {
 		return err
 	}
@@ -54,7 +51,7 @@ func saveSessionExecutionConfiguration(ctx context.Context, q *sqlc.Queries, ses
 	default:
 		return fmt.Errorf("%w: invalid execution projection source", sessions.ErrInvalidInput)
 	}
-	normalizeExecutionProjection(&frozen, uuid.UUID(session.ID.Bytes).String())
+	sessions.NormalizeExecutionProjection(&frozen, uuid.UUID(session.ID.Bytes).String())
 	raw, err := json.Marshal(frozen)
 	if err != nil {
 		return err
@@ -62,69 +59,6 @@ func saveSessionExecutionConfiguration(ctx context.Context, q *sqlc.Queries, ses
 	return q.SaveSessionExecutionConfiguration(ctx, sqlc.SaveSessionExecutionConfigurationParams{SessionID: session.ID, Configuration: raw, DeploymentProviderRevision: frozenRevision})
 }
 
-// GetSessionExecutionConfiguration reads only safe committed configuration. It
-// never loads provider ciphertext, current defaults or runtime health.
-func (s *Store) GetSessionExecutionConfiguration(ctx context.Context, tenantID, sessionID string) (v1.SessionExecutionConfiguration, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return v1.SessionExecutionConfiguration{}, err
-	}
-	row, err := s.queries.GetSessionExecutionConfiguration(ctx, sqlc.GetSessionExecutionConfigurationParams{TenantID: tenant, SessionID: pgunit.PathID(sessionID)})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return v1.SessionExecutionConfiguration{}, sessions.ErrNotFound
-	}
-	if err != nil {
-		return v1.SessionExecutionConfiguration{}, fmt.Errorf("get session execution configuration: %w", err)
-	}
-	var projection v1.SessionExecutionConfiguration
-	if len(row.ExecutionConfiguration) == 0 {
-		model, err := sessionExecutionModel(row.SessionConfiguration)
-		if err != nil {
-			return projection, err
-		}
-		var harness *string
-		if row.Engine != "" {
-			harness = &row.Engine
-		}
-		projection.Model = v1.ExecutionSelection{Value: model, Source: "unknown"}
-		projection.Harness = v1.ExecutionSelection{Value: harness, Source: "unknown"}
-		projection.ModelProvider = v1.ExecutionProviderSelection{Source: "unknown", Status: "unavailable"}
-	} else if err := json.Unmarshal(row.ExecutionConfiguration, &projection); err != nil {
-		return v1.SessionExecutionConfiguration{}, errors.New("invalid stored session execution configuration")
-	}
-	normalizeExecutionProjection(&projection, uuid.UUID(row.ID.Bytes).String())
-	return projection, nil
-}
-
-func normalizeExecutionProjection(projection *v1.SessionExecutionConfiguration, sessionID string) {
-	projection.Object = "agent.session.execution_configuration"
-	projection.SchemaVersion = 1
-	if projection.HarnessConfig.Source == "" {
-		projection.HarnessConfig.Source = "unknown"
-	}
-	projection.HarnessConfig.Value = v1.ResolvedHarnessConfig(projection.HarnessConfig.Value)
-	projection.SessionID = sessionID
-	if projection.ModelProvider.Source == "deployment" && (projection.ModelProvider.Status != "available" || projection.ModelProvider.Configuration == nil) {
-		// Sessions created before deployment defaults moved into Core stay redacted.
-		projection.ModelProvider.Status = "redacted"
-		projection.ModelProvider.Configuration = nil
-	} else if projection.ModelProvider.Status != "available" {
-		projection.ModelProvider.Configuration = nil
-	}
-}
-
-func sessionExecutionModel(configuration []byte) (*string, error) {
-	var config struct {
-		Agent struct {
-			Model *string `json:"model"`
-		} `json:"agent"`
-	}
-	if err := json.Unmarshal(configuration, &config); err != nil {
-		return nil, errors.New("invalid stored Session model configuration")
-	}
-	return config.Agent.Model, nil
-}
-
 func sameExecutionValue(a, b *string) bool {
 	return a == nil && b == nil || a != nil && b != nil && *a == *b
 }
diff --git a/services/core/internal/store/session_execution_configuration_test.go b/services/core/internal/store/session_execution_configuration_test.go
index e15ef2f49..0c9338d1e 100644
--- a/services/core/internal/store/session_execution_configuration_test.go
+++ b/services/core/internal/store/session_execution_configuration_test.go
@@ -61,7 +61,7 @@ func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testi
 				}
 				// A reader without the encryption key can use the safe snapshot after restart.
 				reader := New(pool)
-				frozen, err := reader.GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
+				frozen, err := sessionAdapter(reader).GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -90,13 +90,13 @@ func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testi
 				if err != nil || replay.ID != session.ID {
 					t.Fatal("projection metadata changed retry identity", err)
 				}
-				if _, err := s.UpdateSessionMetadata(t.Context(), tenant, session.ID, map[string]string{"edited": "yes"}); err != nil {
+				if _, err := sessionService(t, s).UpdateSessionMetadata(t.Context(), sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: session.ID, Metadata: map[string]string{"edited": "yes"}}); err != nil {
 					t.Fatal(err)
 				}
 				if _, err := pool.Exec(t.Context(), "UPDATE session_model_execution SET encrypted_config='\\x00'::bytea WHERE session_id=$1", session.ID); err != nil {
 					t.Fatal(err)
 				}
-				got, err := reader.GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
+				got, err := sessionAdapter(reader).GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
 				if err != nil || !reflect.DeepEqual(got, frozen) {
 					t.Fatal("snapshot changed or reader decrypted a secret", err)
 				}
@@ -105,19 +105,19 @@ func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testi
 					if _, err := pool.Exec(t.Context(), `UPDATE session_execution_configuration SET configuration = jsonb_set(configuration, '{model_provider}', '{"source":"deployment","status":"redacted","configuration":null}') WHERE session_id=$1`, session.ID); err != nil {
 						t.Fatal(err)
 					}
-					if historical, err := reader.GetSessionExecutionConfiguration(t.Context(), tenant, session.ID); err != nil || historical.ModelProvider.Status != "redacted" || historical.ModelProvider.Configuration != nil {
+					if historical, err := sessionAdapter(reader).GetSessionExecutionConfiguration(t.Context(), tenant, session.ID); err != nil || historical.ModelProvider.Status != "redacted" || historical.ModelProvider.Configuration != nil {
 						t.Fatal("historical deployment selection changed", err)
 					}
 				}
 				for _, lookup := range []struct{ tenant, id string }{{uuid.NewString(), session.ID}, {tenant, uuid.NewString()}, {tenant, "malformed"}} {
-					if _, err := reader.GetSessionExecutionConfiguration(t.Context(), lookup.tenant, lookup.id); !errors.Is(err, sessions.ErrNotFound) {
+					if _, err := sessionAdapter(reader).GetSessionExecutionConfiguration(t.Context(), lookup.tenant, lookup.id); !errors.Is(err, sessions.ErrNotFound) {
 						t.Fatal("foreign/missing projection read differed", err)
 					}
 				}
-				if err := s.DeleteSession(t.Context(), tenant, session.ID); err != nil {
+				if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 					t.Fatal(err)
 				}
-				if _, err := reader.GetSessionExecutionConfiguration(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+				if _, err := sessionAdapter(reader).GetSessionExecutionConfiguration(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 					t.Fatal("deleted Session projection remained public", err)
 				}
 			})
@@ -134,7 +134,7 @@ func TestSessionExecutionConfigurationHistoricalProvenance(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		got, err := s.GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
+		got, err := sessionAdapter(s).GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -222,7 +222,7 @@ func TestSessionExecutionConfigurationConcurrentRetryKeepsWinner(t *testing.T) {
 				t.Error(err)
 				return
 			}
-			got, err := s.GetSessionExecutionConfiguration(t.Context(), tenant, created.Session.ID)
+			got, err := sessionAdapter(s).GetSessionExecutionConfiguration(t.Context(), tenant, created.Session.ID)
 			if err != nil {
 				t.Error(err)
 				return
@@ -253,7 +253,7 @@ func TestSessionExecutionConfigurationSurvivesSuspendResume(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	frozen, err := s.GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
+	frozen, err := sessionAdapter(s).GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -285,7 +285,7 @@ func TestSessionExecutionConfigurationSurvivesSuspendResume(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		got, err := s.GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
+		got, err := sessionAdapter(s).GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
 		if err != nil || !reflect.DeepEqual(got, frozen) {
 			t.Fatal("runtime transition changed execution projection", phase, err)
 		}
diff --git a/services/core/internal/store/session_initial_input_test.go b/services/core/internal/store/session_initial_input_test.go
index e581f228d..040701873 100644
--- a/services/core/internal/store/session_initial_input_test.go
+++ b/services/core/internal/store/session_initial_input_test.go
@@ -74,10 +74,10 @@ func TestInitialInputCreationRetriesAcrossConnectionsAndLaterTurns(t *testing.T)
 	if _, err := s.RequestCancel(ctx, tenant, first.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.UpdateSessionMetadata(ctx, tenant, first.ID, map[string]string{"updated": "yes"}); err != nil {
+	if _, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: first.ID, Metadata: map[string]string{"updated": "yes"}}); err != nil {
 		t.Fatal(err)
 	}
-	events, err := s.ListSessionEvents(ctx, tenant, first.ID, 0)
+	events, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, first.ID, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -87,7 +87,7 @@ func TestInitialInputCreationRetriesAcrossConnectionsAndLaterTurns(t *testing.T)
 	if err != nil || retry.ID != first.ID || retry.LastTurn.ID != next[0].TurnID || retry.LastTurn.Status != sessions.TurnCancelled || retry.Metadata["updated"] != "yes" {
 		t.Fatal(retry, err)
 	}
-	after, err := restarted.ListSessionEvents(ctx, tenant, first.ID, 0)
+	after, err := sessionAdapter(restarted).ListSessionEvents(ctx, tenant, first.ID, 0)
 	if err != nil || !reflect.DeepEqual(events, after) {
 		t.Fatal("retry emitted more events", err)
 	}
@@ -112,7 +112,7 @@ func TestInitialInputFailureRollsBackSessionAndWork(t *testing.T) {
 	if got, err := s.CreateSession(ctx, tenant, input); err == nil || got.ID != "" {
 		t.Fatal("partial creation succeeded", got, err)
 	}
-	page, err := s.ListSessions(ctx, tenant, "", 100, true, nil)
+	page, err := sessionAdapter(s).ListSessions(ctx, tenant, "", 100, true, nil)
 	if err != nil || len(page.Sessions) != 0 {
 		t.Fatal("partial Session survived", page, err)
 	}
diff --git a/services/core/internal/store/session_initial_public_test.go b/services/core/internal/store/session_initial_public_test.go
index da77de17e..fc2bb5622 100644
--- a/services/core/internal/store/session_initial_public_test.go
+++ b/services/core/internal/store/session_initial_public_test.go
@@ -29,13 +29,13 @@ func TestInitialSessionInputOfficialClient(t *testing.T) {
 			t.Error(err)
 		}
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(worker))
+	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(handler)
 	defer server.Close()
-	unsupported, err := publicHandler(t, s, db, auth, "fake_alpha", workerExecution(worker))
+	unsupported, err := publicHandler(t, s, db, auth, "fake_alpha", workerExecution(t, worker))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/session_metadata.go b/services/core/internal/store/session_metadata.go
deleted file mode 100644
index 24ae3c2ff..000000000
--- a/services/core/internal/store/session_metadata.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/metadata"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-)
-
-func (s *Store) UpdateSessionMetadata(ctx context.Context, tenantID, sessionID string, values map[string]string) (sessions.Session, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.Session{}, err
-	}
-	id := pgunit.PathID(sessionID)
-	encoded, err := metadata.Encode(values)
-	if err != nil {
-		return sessions.Session{}, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
-	}
-	var row sqlc.Session
-	err = s.pooled.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		var err error
-		row, err = q.UpdateSessionMetadata(ctx, sqlc.UpdateSessionMetadataParams{TenantID: tenant, ID: id, Metadata: encoded})
-		if err != nil {
-			return err
-		}
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "update", "session", uuid.UUID(row.ID.Bytes).String(), "")
-	})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.Session{}, sessions.ErrNotFound
-	}
-	if err != nil {
-		return sessions.Session{}, fmt.Errorf("update session metadata: %w", err)
-	}
-	session, decodeErr := sessionpg.SessionFromRow(row)
-	return s.sessionActivity(ctx, session, decodeErr)
-}
diff --git a/services/core/internal/store/session_metadata_test.go b/services/core/internal/store/session_metadata_test.go
index 4e775bda4..a506b7b2a 100644
--- a/services/core/internal/store/session_metadata_test.go
+++ b/services/core/internal/store/session_metadata_test.go
@@ -32,7 +32,7 @@ func TestSessionMetadataPreservesCreationAndExecutionData(t *testing.T) {
 	}
 	before := snapshot()
 	for _, metadata := range []map[string]string{{"new": "value"}, nil, {}, {"unicode": "中文🧪"}} {
-		updated, err := s.UpdateSessionMetadata(ctx, tenant, first.ID, metadata)
+		updated, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: first.ID, Metadata: metadata})
 		if metadata == nil {
 			metadata = map[string]string{}
 		}
@@ -52,7 +52,7 @@ func TestSessionMetadataPreservesCreationAndExecutionData(t *testing.T) {
 			t.Fatalf("changed creation request: %v", err)
 		}
 	}
-	current, err := s.GetSession(ctx, tenant, first.ID)
+	current, err := sessionAdapter(s).GetSession(ctx, tenant, first.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -68,11 +68,11 @@ func TestSessionMetadataPreservesCreationAndExecutionData(t *testing.T) {
 		{tenant, "invalid", nil, sessions.ErrNotFound},
 		{tenant, first.ID, map[string]string{"large": strings.Repeat("x", 64*1024)}, sessions.ErrInvalidInput},
 	} {
-		if _, err := s.UpdateSessionMetadata(ctx, test.tenant, test.session, test.metadata); !errors.Is(err, test.want) {
+		if _, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: test.tenant, SessionID: test.session, Metadata: test.metadata}); !errors.Is(err, test.want) {
 			t.Fatalf("rejected update error = %v, want %v", err, test.want)
 		}
 	}
-	got, err := s.GetSession(ctx, tenant, first.ID)
+	got, err := sessionAdapter(s).GetSession(ctx, tenant, first.ID)
 	if err != nil || !reflect.DeepEqual(got, current) {
 		t.Fatalf("rejected update changed Session: %+v, %v", got, err)
 	}
@@ -92,14 +92,14 @@ func TestSessionMetadataConcurrentReplacement(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			key := fmt.Sprint(i)
-			got, err := s.UpdateSessionMetadata(ctx, tenant, first.ID, map[string]string{key: key})
+			got, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: first.ID, Metadata: map[string]string{key: key}})
 			if err != nil || len(got.Metadata) != 1 || got.Metadata[key] != key {
 				t.Errorf("concurrent update = %+v, %v", got, err)
 			}
 		}()
 	}
 	wg.Wait()
-	got, err := s.GetSession(ctx, tenant, first.ID)
+	got, err := sessionAdapter(s).GetSession(ctx, tenant, first.ID)
 	if err != nil || len(got.Metadata) != 1 {
 		t.Fatalf("concurrent replacements merged or lost metadata: %+v, %v", got, err)
 	}
@@ -124,12 +124,12 @@ func TestSessionMetadataPreservesTerminalActivity(t *testing.T) {
 		if _, err := transitionTurn(ctx, s, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: status}); err != nil {
 			t.Fatal(err)
 		}
-		before, err := s.GetSession(ctx, tenant, session.ID)
+		before, err := sessionAdapter(s).GetSession(ctx, tenant, session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
 		before.Metadata = map[string]string{"label": status}
-		updated, err := s.UpdateSessionMetadata(ctx, tenant, session.ID, before.Metadata)
+		updated, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: session.ID, Metadata: before.Metadata})
 		if err != nil || !reflect.DeepEqual(updated, before) {
 			t.Fatalf("metadata changed %s activity: %+v, %v", status, updated, err)
 		}
diff --git a/services/core/internal/store/session_reference_retry_public_test.go b/services/core/internal/store/session_reference_retry_public_test.go
index c2068948f..0b07d6852 100644
--- a/services/core/internal/store/session_reference_retry_public_test.go
+++ b/services/core/internal/store/session_reference_retry_public_test.go
@@ -32,7 +32,7 @@ func TestSavedReferenceRetryOfficialClient(t *testing.T) {
 			t.Error(err)
 		}
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(worker))
+	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/session_transaction.go b/services/core/internal/store/session_transaction.go
index ef0749ffb..dbf6fe7bd 100644
--- a/services/core/internal/store/session_transaction.go
+++ b/services/core/internal/store/session_transaction.go
@@ -22,19 +22,6 @@ func (s *Store) withPublicSession(ctx context.Context, tenantID, sessionID strin
 }
 
 func (s *Store) withSessionState(ctx context.Context, tenantID, sessionID string, public bool, apply func(context.Context, *sqlc.Queries, pgtype.UUID) error) error {
-	return s.withLockedSession(ctx, tenantID, sessionID, public, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID, locked sessions.LockedSession) error {
-		if public {
-			if err := locked.Public(); err != nil {
-				return err
-			}
-		}
-		return apply(ctx, q, session)
-	})
-}
-
-// withLockedSession resolves the identifiers and runs apply in the Session
-// transaction, including for a publicly deleted Session.
-func (s *Store) withLockedSession(ctx context.Context, tenantID, sessionID string, public bool, apply func(context.Context, *sqlc.Queries, pgtype.UUID, sessions.LockedSession) error) error {
 	tenant, err := parseID(tenantID)
 	if err != nil {
 		return err
@@ -47,6 +34,11 @@ func (s *Store) withLockedSession(ctx context.Context, tenantID, sessionID strin
 		}
 	}
 	return sessionpg.WithSession(ctx, s.writer, tenant, id, func(ctx context.Context, q *sqlc.Queries, locked sessions.LockedSession) error {
-		return apply(ctx, q, id, locked)
+		if public {
+			if err := locked.Public(); err != nil {
+				return err
+			}
+		}
+		return apply(ctx, q, id)
 	})
 }
diff --git a/services/core/internal/store/session_write_audit.go b/services/core/internal/store/session_write_audit.go
deleted file mode 100644
index 4ab76b688..000000000
--- a/services/core/internal/store/session_write_audit.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package store
-
-import (
-	"context"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// AuditSessionOperation records an authorized public no-op or creation replay.
-// It cannot create ownership or admit execution work.
-func (s *Store) AuditSessionOperation(ctx context.Context, tenantID, sessionID, action string) error {
-	if action != "create" && action != "send_events" {
-		return sessions.ErrInvalidInput
-	}
-	return s.withPublicSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, action, "session", uuid.UUID(session.Bytes).String(), "")
-	})
-}
diff --git a/services/core/internal/store/session_write_audit_test.go b/services/core/internal/store/session_write_audit_test.go
index c72082ed9..fef29312b 100644
--- a/services/core/internal/store/session_write_audit_test.go
+++ b/services/core/internal/store/session_write_audit_test.go
@@ -60,7 +60,7 @@ func TestSessionWriteAuditCreationReplayNoopAndDeletion(t *testing.T) {
 	if _, err := s.CreateSession(sessionAuditContext(t, tenant, "b"), tenant, input); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.GetSession(sessionAuditContext(t, tenant, "b"), tenant, created.ID); err != nil {
+	if _, err := sessionAdapter(s).GetSession(sessionAuditContext(t, tenant, "b"), tenant, created.ID); err != nil {
 		t.Fatal(err)
 	}
 	sessionAuditCount(t, s, tenant, 2)
@@ -71,15 +71,15 @@ func TestSessionWriteAuditCreationReplayNoopAndDeletion(t *testing.T) {
 		}
 	}
 	for _, action := range []string{"create", "send_events"} {
-		if err := s.AuditSessionOperation(sessionAuditContext(t, tenant, "b"), tenant, created.ID, action); err != nil {
+		if err := sessionService(t, s).AuditSessionOperation(sessionAuditContext(t, tenant, "b"), sessions.AuditSessionOperationCommand{TenantID: tenant, SessionID: created.ID, Action: action}); err != nil {
 			t.Fatal(err)
 		}
 	}
-	if _, err := s.UpdateSessionMetadata(sessionAuditContext(t, tenant, "b"), tenant, created.ID, map[string]string{"private": "not in audit"}); err != nil {
+	if _, err := sessionService(t, s).UpdateSessionMetadata(sessionAuditContext(t, tenant, "b"), sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: created.ID, Metadata: map[string]string{"private": "not in audit"}}); err != nil {
 		t.Fatal(err)
 	}
 	for range 2 {
-		if err := s.DeleteSession(sessionAuditContext(t, tenant, "b"), tenant, created.ID); err != nil {
+		if err := sessionService(t, s).DeleteSession(sessionAuditContext(t, tenant, "b"), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: created.ID}); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -88,7 +88,7 @@ func TestSessionWriteAuditCreationReplayNoopAndDeletion(t *testing.T) {
 	if err := s.pool.QueryRow(t.Context(), "SELECT jsonb_agg(to_jsonb(o))::text FROM write_audit_operations o WHERE tenant_id=$1", tenant).Scan(&history); err != nil || strings.Contains(history, "not in audit") || strings.Contains(history, "/workspace") {
 		t.Fatal("payload entered audit", err)
 	}
-	if err := s.AuditSessionOperation(sessionAuditContext(t, tenant, "b"), tenant, created.ID, "send_events"); !errors.Is(err, sessions.ErrNotFound) {
+	if err := sessionService(t, s).AuditSessionOperation(sessionAuditContext(t, tenant, "b"), sessions.AuditSessionOperationCommand{TenantID: tenant, SessionID: created.ID, Action: "send_events"}); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("deleted no-op accepted", err)
 	}
 	sessionAuditCount(t, s, tenant, 7)
@@ -139,20 +139,20 @@ func TestSessionWriteAuditRollback(t *testing.T) {
 			}
 			switch operation {
 			case "update":
-				_, err = s.UpdateSessionMetadata(ctx, tenant, created.ID, map[string]string{"new": "value"})
+				_, err = sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: created.ID, Metadata: map[string]string{"new": "value"}})
 			case "delete":
-				err = s.DeleteSession(ctx, tenant, created.ID)
+				err = sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: created.ID})
 			case "events":
 				_, err = s.SubmitInputs(ctx, tenant, created.ID, "events", []sessions.Input{messageInput("private")})
 			case "noop":
-				err = s.AuditSessionOperation(ctx, tenant, created.ID, "send_events")
+				err = sessionService(t, s).AuditSessionOperation(ctx, sessions.AuditSessionOperationCommand{TenantID: tenant, SessionID: created.ID, Action: "send_events"})
 			case "reserve":
 				_, err = s.ReserveEnvironmentInput(ctx, tenant, created.ID, "reserve", []sessions.Input{messageInput("private")})
 			}
 			if err == nil {
 				t.Fatal("mutation bypassed audit failure")
 			}
-			got, err := s.GetSession(t.Context(), tenant, created.ID)
+			got, err := sessionAdapter(s).GetSession(t.Context(), tenant, created.ID)
 			if err != nil || len(got.Metadata) != 0 {
 				t.Fatal("resource update/deletion survived rollback", got, err)
 			}
@@ -215,7 +215,7 @@ func TestSessionWriteAuditInitialInputAndHistoricalReplay(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			if err := s.AuditSessionOperation(sessionAuditContext(t, tenant, "b"), tenant, legacy.ID, "create"); err != nil {
+			if err := sessionService(t, s).AuditSessionOperation(sessionAuditContext(t, tenant, "b"), sessions.AuditSessionOperationCommand{TenantID: tenant, SessionID: legacy.ID, Action: "create"}); err != nil {
 				t.Fatal(err)
 			}
 			var owners int
diff --git a/services/core/internal/store/sessions.go b/services/core/internal/store/sessions.go
index 28b66381a..95c89ba13 100644
--- a/services/core/internal/store/sessions.go
+++ b/services/core/internal/store/sessions.go
@@ -167,64 +167,18 @@ func (s *Store) createSession(ctx context.Context, tenantID string, input sessio
 	return sessions.Creation{Session: session, Created: row.ID == params.ID, Cursor: row.EventSequence}, err
 }
 
-// GetSession always scopes lookup to the authenticated caller's tenant.
-func (s *Store) GetSession(ctx context.Context, tenantID, sessionID string) (sessions.Session, error) {
-	tenant, err := parseID(tenantID)
+// sessionActivity adds the activity projection to a Session read outside a
+// snapshot, in a snapshot of its own.
+func (s *Store) sessionActivity(ctx context.Context, session sessions.Session, err error) (sessions.Session, error) {
 	if err != nil {
 		return sessions.Session{}, err
 	}
-	id := pgunit.PathID(sessionID)
-	row, err := s.queries.GetSession(ctx, sqlc.GetSessionParams{TenantID: tenant, ID: id})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.Session{}, sessions.ErrNotFound
-	}
-	if err != nil {
-		return sessions.Session{}, fmt.Errorf("get session: %w", err)
-	}
-	session, decodeErr := sessionpg.SessionFromRow(row)
-	return s.sessionActivity(ctx, session, decodeErr)
-}
-
-// ListSessions orders by creation time and ID. The cursor is the last returned
-// session ID and must belong to the same tenant; it grants no additional access.
-func (s *Store) ListSessions(ctx context.Context, tenantID, cursor string, limit int, ascending bool, agentID *string) (sessions.Page, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.Page{}, err
-	}
-	if limit < 1 || limit > 100 {
-		return sessions.Page{}, fmt.Errorf("%w: page size must be 1..100", sessions.ErrInvalidInput)
-	}
-	params := sqlc.ListSessionsParams{TenantID: tenant, PageLimit: int32(limit + 1), AfterID: pgtype.UUID{Valid: true}, Ascending: ascending}
-	if agentID != nil {
-		params.AgentID = pgtype.Text{String: *agentID, Valid: true}
-	}
-	if cursor != "" {
-		after, err := s.GetSession(ctx, tenantID, pgunit.LookupCursor(cursor))
-		if err != nil {
-			return sessions.Page{}, err
-		}
-		params.AfterCreated = pgtype.Timestamptz{Time: after.CreatedAt, Valid: true}
-		params.AfterID, _ = parseID(after.ID)
-	}
-	rows, err := s.queries.ListSessions(ctx, params)
-	if err != nil {
-		return sessions.Page{}, fmt.Errorf("list sessions: %w", err)
-	}
-	page := sessions.Page{Sessions: make([]sessions.Session, 0, min(limit, len(rows)))}
-	if len(rows) > limit {
-		page.NextCursor = uuid.UUID(rows[limit-1].ID.Bytes).String()
-		rows = rows[:limit]
-	}
-	for _, row := range rows {
-		session, err := sessionpg.SessionFromRow(row)
-		session, err = s.sessionActivity(ctx, session, err)
-		if err != nil {
-			return sessions.Page{}, err
-		}
-		page.Sessions = append(page.Sessions, session)
-	}
-	return page, nil
+	err = s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		var err error
+		session, err = sessionpg.LoadSessionActivity(ctx, s.queries.WithTx(tx), session)
+		return err
+	})
+	return session, err
 }
 
 // parseID translates pgunit's identifier rule into store's invalid-input
diff --git a/services/core/internal/store/sessions_test.go b/services/core/internal/store/sessions_test.go
index 09d4bdd62..076938e3f 100644
--- a/services/core/internal/store/sessions_test.go
+++ b/services/core/internal/store/sessions_test.go
@@ -65,10 +65,10 @@ func TestSessionsPersistAndStayTenantScoped(t *testing.T) {
 	if first.ID == other.ID {
 		t.Fatal("idempotency leaked across tenants")
 	}
-	if _, err := s.GetSession(ctx, tenantB, first.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetSession(ctx, tenantB, first.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatalf("cross-tenant read: %v", err)
 	}
-	if _, err := s.ListSessions(ctx, tenantB, first.ID, 10, false, nil); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).ListSessions(ctx, tenantB, first.ID, 10, false, nil); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatalf("cross-tenant cursor: %v", err)
 	}
 	for _, key := range []string{"second", "third"} {
@@ -80,14 +80,14 @@ func TestSessionsPersistAndStayTenantScoped(t *testing.T) {
 	// Recreate the pool and Store as a new service process would.
 	pool.Close()
 	recovered, _ := testStore(t)
-	got, err := recovered.GetSession(ctx, tenantA, first.ID)
+	got, err := sessionAdapter(recovered).GetSession(ctx, tenantA, first.ID)
 	if err != nil || !reflect.DeepEqual(got, first) {
 		t.Fatalf("restart read = %+v, %v; want %+v", got, err, first)
 	}
 	seen := map[string]bool{}
 	cursor := ""
 	for {
-		page, err := recovered.ListSessions(ctx, tenantA, cursor, 2, false, nil)
+		page, err := sessionAdapter(recovered).ListSessions(ctx, tenantA, cursor, 2, false, nil)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -108,7 +108,7 @@ func TestSessionsPersistAndStayTenantScoped(t *testing.T) {
 	if len(seen) != 3 || !seen[first.ID] || seen[other.ID] {
 		t.Fatalf("pagination lost or leaked sessions: %+v", seen)
 	}
-	empty, err := recovered.ListSessions(ctx, uuid.NewString(), "", 10, false, nil)
+	empty, err := sessionAdapter(recovered).ListSessions(ctx, uuid.NewString(), "", 10, false, nil)
 	if err != nil || empty.Sessions == nil || len(empty.Sessions) != 0 {
 		t.Fatalf("empty tenant = %+v, %v", empty, err)
 	}
@@ -159,7 +159,7 @@ func TestConcurrentSessionCreationIsIdempotent(t *testing.T) {
 			t.Fatalf("changed request = %v", err)
 		}
 	}
-	page, err := s.ListSessions(ctx, tenant, "", 10, false, nil)
+	page, err := sessionAdapter(s).ListSessions(ctx, tenant, "", 10, false, nil)
 	if err != nil || len(page.Sessions) != 1 || !reflect.DeepEqual(page.Sessions[0], replay) {
 		t.Fatalf("retry changed stored session: %+v, %v", page, err)
 	}
diff --git a/services/core/internal/store/structured_output_native_test.go b/services/core/internal/store/structured_output_native_test.go
index 2d51e2995..e92633af3 100644
--- a/services/core/internal/store/structured_output_native_test.go
+++ b/services/core/internal/store/structured_output_native_test.go
@@ -45,7 +45,7 @@ func TestNativeStructuredOutputPublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, "claude_sdk", workerExecution(worker), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, h.db, auth, "claude_sdk", workerExecution(t, worker), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/subagent_identities_test.go b/services/core/internal/store/subagent_identities_test.go
index f5dc4a1a5..07aa5228f 100644
--- a/services/core/internal/store/subagent_identities_test.go
+++ b/services/core/internal/store/subagent_identities_test.go
@@ -58,7 +58,7 @@ func TestSubagentIdentityIsAtomicScopedAndImmutable(t *testing.T) {
 			t.Fatal("foreign write", err)
 		}
 	}
-	before, err := s.SessionEventCursor(ctx, tenant, session.ID)
+	before, err := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -80,7 +80,7 @@ func TestSubagentIdentityIsAtomicScopedAndImmutable(t *testing.T) {
 		if err != nil || len(events) != 3 {
 			t.Fatal("partial journal survived", len(events), err)
 		}
-		cursor, err := s.SessionEventCursor(ctx, tenant, session.ID)
+		cursor, err := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 		if err != nil || cursor != before {
 			t.Fatal("partial public projection survived", cursor, err)
 		}
@@ -132,7 +132,7 @@ func TestSubagentIdentityIsAtomicScopedAndImmutable(t *testing.T) {
 	if err != nil || !reflect.DeepEqual(again, saved) {
 		t.Fatal("continuation changed immutable first observation", again, err)
 	}
-	if err = reopened.DeleteSession(ctx, tenant, session.ID); !errors.Is(err, sessions.ErrNotIdle) {
+	if err = sessionService(t, reopened).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("running Session deleted", err)
 	}
 	if err = reopened.commitLegacyDeletion(ctx, tenant, session.ID); err != nil {
diff --git a/services/core/internal/store/subagent_native_outputs_test.go b/services/core/internal/store/subagent_native_outputs_test.go
index f6154fb3b..94511c8e9 100644
--- a/services/core/internal/store/subagent_native_outputs_test.go
+++ b/services/core/internal/store/subagent_native_outputs_test.go
@@ -51,7 +51,7 @@ func TestSubagentNativeFunctionResultDoesNotConsumeOutputIndex(t *testing.T) {
 		t.Fatal(items, err)
 	}
 	// Child Items publish no Session events; only root work reaches the stream.
-	events, err := s.ListSessionEvents(t.Context(), tenant, session.ID, 0)
+	events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/subagent_resources_test.go b/services/core/internal/store/subagent_resources_test.go
index 87135d8a1..fed5afe72 100644
--- a/services/core/internal/store/subagent_resources_test.go
+++ b/services/core/internal/store/subagent_resources_test.go
@@ -151,7 +151,7 @@ func TestSubagentResourcesNativeOwnershipLifecycleAndRecovery(t *testing.T) {
 	if err != nil || value.Status != "active" || value.ClosedAt != nil || value.OpenedAt != 100 {
 		t.Fatal(value, err)
 	}
-	changes, err := s.ListSessionEvents(ctx, tenant, session.ID, 0)
+	changes, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/template_composition_public_test.go b/services/core/internal/store/template_composition_public_test.go
index 1585ea31b..078d99152 100644
--- a/services/core/internal/store/template_composition_public_test.go
+++ b/services/core/internal/store/template_composition_public_test.go
@@ -77,7 +77,7 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 	}
 	t.Cleanup(func() {
 		for _, id := range receipt.Sessions {
-			if err := s.DeleteSession(context.Background(), tenant, id); err != nil {
+			if err := store.SessionService(t, s).DeleteSession(context.Background(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: id}); err != nil {
 				t.Error(err)
 			}
 		}
diff --git a/services/core/internal/store/template_null_selection_public_test.go b/services/core/internal/store/template_null_selection_public_test.go
index edfe2a46e..849cd302f 100644
--- a/services/core/internal/store/template_null_selection_public_test.go
+++ b/services/core/internal/store/template_null_selection_public_test.go
@@ -82,7 +82,7 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 	}
 	t.Cleanup(func() {
 		for _, id := range receipt.Sessions {
-			if err := s.DeleteSession(context.Background(), tenant, id); err != nil {
+			if err := store.SessionService(t, s).DeleteSession(context.Background(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: id}); err != nil {
 				t.Error(err)
 			}
 		}
diff --git a/services/core/internal/store/token_usage.go b/services/core/internal/store/token_usage.go
deleted file mode 100644
index e5a57312f..000000000
--- a/services/core/internal/store/token_usage.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-)
-
-// MeasuredSessionUsage returns Core-internal measured usage for Runtime
-// telemetry: the sum of every recorded root Turn snapshot, active Turns
-// included, and null only when nothing is recorded. Public Session usage keeps
-// the official rule of SessionTokenUsage. A missing Session reads as null, so
-// callers resolve the Session first.
-func (s *Store) MeasuredSessionUsage(ctx context.Context, tenantID, sessionID string) (json.RawMessage, error) {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return nil, err
-	}
-	id, err := parseID(sessionID)
-	if err != nil {
-		return nil, err
-	}
-	usage, err := s.queries.SessionMeasuredTokenUsage(ctx, sqlc.SessionMeasuredTokenUsageParams{TenantID: tenant, ID: id})
-	if err != nil {
-		return nil, fmt.Errorf("read measured session usage: %w", err)
-	}
-	return usage, nil
-}
diff --git a/services/core/internal/store/token_usage_integration_test.go b/services/core/internal/store/token_usage_integration_test.go
index 2dd7268ff..a042c21c2 100644
--- a/services/core/internal/store/token_usage_integration_test.go
+++ b/services/core/internal/store/token_usage_integration_test.go
@@ -85,7 +85,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 	}
 	defer restored.Close()
 	fresh := store.New(restored)
-	got, err := fresh.GetSession(ctx, tenant, session.ID)
+	got, err := store.SessionAdapter(fresh).GetSession(ctx, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -96,11 +96,11 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 	if total.InputTokens != 40 || total.OutputTokens != 6 || total.TotalTokens != 46 || total.InputTokensDetails.CachedTokens != 8 || total.OutputTokensDetails.ReasoningTokens != 4 {
 		t.Fatalf("double counted totals: %+v", total)
 	}
-	page, err := fresh.ListSessions(ctx, tenant, "", 100, true, nil)
+	page, err := store.SessionAdapter(fresh).ListSessions(ctx, tenant, "", 100, true, nil)
 	if err != nil || len(page.Sessions) != 1 || string(page.Sessions[0].Usage) != string(got.Usage) {
 		t.Fatalf("list totals: %+v %v", page, err)
 	}
-	if _, err = fresh.GetSession(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err = store.SessionAdapter(fresh).GetSession(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 }
@@ -156,22 +156,22 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	// included, and is scoped to the tenant.
 	measured := func(want int64) {
 		t.Helper()
-		got, err := s.MeasuredSessionUsage(ctx, tenant, session.ID)
+		got, err := store.SessionAdapter(s).MeasuredSessionUsage(ctx, tenant, session.ID)
 		var value v1.TokenUsage
 		if err != nil || (want < 0) != (got == nil) || (want >= 0 && (json.Unmarshal(got, &value) != nil || value.TotalTokens != want)) {
 			t.Fatalf("measured usage = %s %v, want total %d", got, err, want)
 		}
-		if foreign, err := s.MeasuredSessionUsage(ctx, uuid.NewString(), session.ID); err != nil || foreign != nil {
+		if foreign, err := store.SessionAdapter(s).MeasuredSessionUsage(ctx, uuid.NewString(), session.ID); err != nil || foreign != nil {
 			t.Fatalf("foreign measured usage: %s %v", foreign, err)
 		}
 	}
 	total := func(want int64) {
 		t.Helper()
-		got, err := s.GetSession(ctx, tenant, session.ID)
+		got, err := store.SessionAdapter(s).GetSession(ctx, tenant, session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
-		page, err := s.ListSessions(ctx, tenant, "", 100, true, nil)
+		page, err := store.SessionAdapter(s).ListSessions(ctx, tenant, "", 100, true, nil)
 		if err != nil || len(page.Sessions) != 1 || string(page.Sessions[0].Usage) != string(got.Usage) {
 			t.Fatalf("list usage: %+v %v", page, err)
 		}
@@ -208,7 +208,7 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	}
 	lastIdleUsage := func() json.RawMessage {
 		t.Helper()
-		changes, err := s.ListSessionEvents(ctx, tenant, session.ID, 0)
+		changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0)
 		if err != nil || len(changes) == 0 || changes[len(changes)-1].Event.Type != "agent.session.idle" {
 			t.Fatal(changes, err)
 		}
diff --git a/services/core/internal/store/tool_policy_native_test.go b/services/core/internal/store/tool_policy_native_test.go
index 821c075cf..bfa83bfc0 100644
--- a/services/core/internal/store/tool_policy_native_test.go
+++ b/services/core/internal/store/tool_policy_native_test.go
@@ -51,7 +51,7 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: foreignTenant, SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -77,17 +77,17 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 	if err != nil || json.Unmarshal(raw, &proof) != nil || len(proof.Sessions) != 4 {
 		t.Fatal("invalid public evidence", err)
 	}
-	page, err := h.s.ListSessions(ctx, h.tenant, "", 100, true, nil)
+	page, err := store.SessionAdapter(h.s).ListSessions(ctx, h.tenant, "", 100, true, nil)
 	if err != nil || len(page.Sessions) != 1+len(proof.Sessions) {
 		t.Fatal("rejected configuration persisted a Session", err)
 	}
-	foreignPage, err := h.s.ListSessions(ctx, foreignTenant, "", 100, true, nil)
+	foreignPage, err := store.SessionAdapter(h.s).ListSessions(ctx, foreignTenant, "", 100, true, nil)
 	if err != nil || len(foreignPage.Sessions) != 0 {
 		t.Fatal("foreign Agent reference persisted a Session", err)
 	}
 	nativeIDs := make(map[string]string, len(proof.Sessions))
 	for _, item := range proof.Sessions {
-		session, err := h.s.GetSession(ctx, h.tenant, item.ID)
+		session, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, item.ID)
 		if err != nil || session.Engine != kind {
 			t.Fatal("selected engine was not persisted", err)
 		}
diff --git a/services/core/internal/store/tool_search_native_test.go b/services/core/internal/store/tool_search_native_test.go
index 626443f9b..b47764be6 100644
--- a/services/core/internal/store/tool_search_native_test.go
+++ b/services/core/internal/store/tool_search_native_test.go
@@ -45,7 +45,7 @@ func TestNativeToolSearchPublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, "claude_sdk", workerExecution(worker), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, h.db, auth, "claude_sdk", workerExecution(t, worker), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/turn_inputs_test.go b/services/core/internal/store/turn_inputs_test.go
index c5924e554..3ffc28e26 100644
--- a/services/core/internal/store/turn_inputs_test.go
+++ b/services/core/internal/store/turn_inputs_test.go
@@ -160,7 +160,7 @@ func TestTurnInputRetriesAndRestart(t *testing.T) {
 	if len(all) != 2 || all[0].Sequence != first.Sequence || all[1].Sequence != steer.Sequence {
 		t.Fatalf("recovered inputs = %+v", all)
 	}
-	snapshot, err := recovered.GetSession(ctx, tenant, session.ID)
+	snapshot, err := sessionAdapter(recovered).GetSession(ctx, tenant, session.ID)
 	if err != nil || snapshot.LastTurn == nil || snapshot.LastTurn.ID != next.TurnID || snapshot.LastTurn.Status != sessions.TurnQueued {
 		t.Fatal("latest Session activity did not survive restart", err)
 	}
diff --git a/services/core/internal/store/unified_model_configuration_http_test.go b/services/core/internal/store/unified_model_configuration_http_test.go
index ad3b4ae6c..ef3f4e6c3 100644
--- a/services/core/internal/store/unified_model_configuration_http_test.go
+++ b/services/core/internal/store/unified_model_configuration_http_test.go
@@ -106,7 +106,7 @@ func TestUnifiedModelConfigurationHTTP(t *testing.T) {
 			}
 		}
 		equalJSON(publicNative, native)
-		snapshot, err := st.GetSessionExecutionConfiguration(t.Context(), tenant, id)
+		snapshot, err := store.SessionAdapter(st).GetSessionExecutionConfiguration(t.Context(), tenant, id)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/whitespace_input_public_test.go b/services/core/internal/store/whitespace_input_public_test.go
index d03252e9f..7ea243498 100644
--- a/services/core/internal/store/whitespace_input_public_test.go
+++ b/services/core/internal/store/whitespace_input_public_test.go
@@ -106,7 +106,7 @@ func TestWhitespaceOnlyTextHarnessAdmissionPostgres(t *testing.T) {
 		}
 	})
 	serve := func(engine string) pathIDClient {
-		handler, err := publicHandler(t, s, db, auth, engine, workerExecution(worker), executorURL("https://offline-executor.example"))
+		handler, err := publicHandler(t, s, db, auth, engine, workerExecution(t, worker), executorURL("https://offline-executor.example"))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/worker_preparation_failure_test.go b/services/core/internal/store/worker_preparation_failure_test.go
index 7c9dfd50b..93b293053 100644
--- a/services/core/internal/store/worker_preparation_failure_test.go
+++ b/services/core/internal/store/worker_preparation_failure_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T) {
@@ -33,11 +34,11 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 				current, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 				return err == nil && current.State == sessions.EnvironmentInputFailed
 			})
-			session, err := h.s.GetSession(t.Context(), h.tenant, h.session.ID)
+			session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 			if err != nil || session.PendingInput || session.LastTurn != nil || session.EnvironmentInputActivity == nil || session.EnvironmentInputActivity.Failure != "runtime_preparation_failed" {
 				t.Fatal("preparation did not release input with a safe failure", err)
 			}
-			changes, err := h.s.ListSessionEvents(t.Context(), h.tenant, h.session.ID, 0)
+			changes, err := store.SessionAdapter(h.s).ListSessionEvents(t.Context(), h.tenant, h.session.ID, 0)
 			if err != nil {
 				t.Fatal(err)
 			}

From e8cc52d5e92e5c153d5e18cd7348c27f6cd59d15 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 02:48:39 +0800
Subject: [PATCH 08/60] Move the administrator summary into sessions (#439)

---
 contracts/agents-api/core.openapi.yaml        | 32 ++++----
 services/core/IMPLEMENTATION.md               |  4 +-
 services/core/cmd/server/http_routes_test.go  |  2 +-
 services/core/cmd/server/main.go              |  2 +-
 services/core/internal/api/admin_resources.go |  6 +-
 .../core/internal/api/admin_resources_test.go |  9 +--
 services/core/internal/api/admin_runtime.go   |  9 +--
 .../core/internal/api/admin_runtime_test.go   |  2 +-
 services/core/internal/api/admin_summary.go   | 33 ++++----
 services/core/internal/api/dependencies.go    |  3 +-
 .../core/internal/api/dependencies_test.go    |  5 +-
 services/core/internal/api/fakes_test.go      | 15 ++--
 .../persistence/postgres/sessionpg/admin.go   | 52 ++++++++++++
 .../postgres/sessionpg/admin_test.go          | 44 ++++++++++
 .../providers/configuration_flow_test.go      |  2 +-
 services/core/internal/sessions/admin.go      | 24 +++++-
 services/core/internal/store/admin_summary.go | 81 -------------------
 .../store/public_handler_fixture_test.go      |  2 +-
 18 files changed, 174 insertions(+), 153 deletions(-)
 delete mode 100644 services/core/internal/store/admin_summary.go

diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index ddf6a108d..9a74d1381 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -196,7 +196,7 @@ definitions:
       agent_id:
         type: string
       assets:
-        $ref: '#/definitions/store.AdminAssetCounts'
+        $ref: '#/definitions/sessions.AdminAssetCounts'
       coverage:
         $ref: '#/definitions/api.AdminUsageCoverage'
       key_id:
@@ -1395,6 +1395,21 @@ definitions:
       source_commit:
         type: string
     type: object
+  sessions.AdminAssetCounts:
+    properties:
+      agents:
+        type: integer
+      credentials:
+        type: integer
+      environment_templates:
+        type: integer
+      files:
+        type: integer
+      skills:
+        type: integer
+      vaults:
+        type: integer
+    type: object
   sessions.ExecutorCredential:
     properties:
       created_at:
@@ -1424,21 +1439,6 @@ definitions:
       state:
         type: string
     type: object
-  store.AdminAssetCounts:
-    properties:
-      agents:
-        type: integer
-      credentials:
-        type: integer
-      environment_templates:
-        type: integer
-      files:
-        type: integer
-      skills:
-        type: integer
-      vaults:
-        type: integer
-    type: object
   v1.Agent:
     properties:
       id:
diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 338a330bc..3c5e0278d 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -18,7 +18,7 @@ Shared vocabulary has one owner each, and domains use it rather than copy it. `i
 
 `internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitFunctionResult` saves a submitted function result for its Turn's call, `LoadRequiredActions` lists the calls a Turn waits on, and `TransitionTurn` moves a root Turn's status as its current status allows and settles a Turn that ends. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call and Turn operation loads the Turn in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. Neither imports persistence. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
 
-Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; `LoadEnvironment`, which reads the tenant's Environment of a live Session; and `CreateSessionEnvironment`, which stores the Environment of a Session being created. The other `sessionpg` exports serve `store` until the Session operations leave it; among them `LoadSessionActivity`, the one Session activity read, adds the activity projection to the Sessions that `store`'s Session creation and administrator summary return. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` and `BindSession` stay exported after store goes; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
+Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; `LoadEnvironment`, which reads the tenant's Environment of a live Session; and `CreateSessionEnvironment`, which stores the Environment of a Session being created. The other `sessionpg` exports serve `store` until the Session operations leave it; among them `LoadSessionActivity`, the one Session activity read, adds the activity projection to the Session that `store`'s Session creation returns. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` and `BindSession` stay exported after store goes; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
 
 `store` is transitional. `store.New` builds a pooled Store, and `store.NewExecution(s, lease)` builds the execution writer on a lease it borrows. An execution-only operation on a pooled Store fails with `store.ErrExecutionAuthority`. New adapters do not copy that check: their execution repositories require a `*pgunit.Lease` at construction, their public repositories expose no execution operation, and the check goes away with `store`.
 
@@ -36,7 +36,7 @@ Domain owners, each with its PostgreSQL adapter under `internal/persistence/post
 - `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and to `store`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other reader is `store`: Session creation decides admission and placement with those rules and `placementpg` inside its own transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. Session archive crosses the Session and the deployment, so it is a `deployment.ExecutionOperations` operation: `ArchiveSession`, which the administrator's archive route calls through `api.Execution.SessionArchive`, and `ArchiveResetSession`, which a reset calls, lock the Session through `deploymentpg`'s `WithSessionArchive`, check the deployment's generation and the running reset in `deployment`, then expire the Environment and cancel its work through the `sessions` procedures, revoke the allocation's device and request its cleanup, and record the audit entry in one leased transaction. `deployment.ObservationResolver` resolves a Session's Runtime observation target for `runtimeobs` from `sessions.SessionReader` and `deployment.Reader`.
 - `coremetrics` (`coremetricspg`): the Core metrics PostgreSQL holds: the root Turn queue counts, the root Turn history, read from one read-only snapshot, and the database size. `cmd/server`'s Core metrics source adds them to the process, pool, Worker and daemon registry measurements.
 - `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples. `runtimehistory.Service` scopes a read to the Session's hosted Environment through `sessions.EnvironmentReader`.
-- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover Sessions (their reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the Sessions whose Runtime the administrator observes across Projects, executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
+- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover Sessions (their reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the administrator's views across Projects (a Project's asset counts and Sessions for the summary, and the Sessions whose Runtime the administrator observes), executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
 
 ## Request handling
 
diff --git a/services/core/cmd/server/http_routes_test.go b/services/core/cmd/server/http_routes_test.go
index 05585fd38..f31600030 100644
--- a/services/core/cmd/server/http_routes_test.go
+++ b/services/core/cmd/server/http_routes_test.go
@@ -106,7 +106,7 @@ func daemonComposition(t testing.TB) http.Handler {
 		Artifacts:       struct{ api.Artifacts }{},
 		ArtifactsReader: struct{ api.ArtifactsReader }{},
 		SessionAdmin:    struct{ api.SessionAdmin }{}, Environments: struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, ExecutorConnections: struct{ api.ExecutorConnections }{},
-		Admin: struct{ api.Admin }{}, AdminRuntimeTargets: struct{ api.AdminRuntimeTargets }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{}, Metrics: struct{ api.Metrics }{},
+		Admin: struct{ api.Admin }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{}, Metrics: struct{ api.Metrics }{},
 		RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
 		Execution: &api.Execution{
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index 3cf6979dc..4eef9799e 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -409,7 +409,7 @@ func run() error {
 		ArtifactsReader: sessionStore,
 		SessionAdmin:    sessionStore,
 		Environments:    sessionService, EnvironmentsReader: sessionStore, ExecutorConnections: executorConnections{sessions: sessionStore, registry: registry},
-		Admin: executionStore, AdminRuntimeTargets: sessionStore, AdminAudit: auditStore, WriteAudit: auditStore, Metrics: metrics,
+		Admin: sessionStore, AdminAudit: auditStore, WriteAudit: auditStore, Metrics: metrics,
 		RuntimeObservations: observationService, RuntimeHistory: historyService,
 	}
 	if worker != nil {
diff --git a/services/core/internal/api/admin_resources.go b/services/core/internal/api/admin_resources.go
index 79ad09fe7..c61ad30c3 100644
--- a/services/core/internal/api/admin_resources.go
+++ b/services/core/internal/api/admin_resources.go
@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/go-chi/chi/v5"
 )
 
@@ -13,9 +12,10 @@ import (
 // Only Core-key-authenticated project resource handlers receive it.
 type adminTenantContextKey struct{}
 
-// Admin reads the administrator's asset summary of a Project.
+// Admin reads the administrator's cross-Project Session views.
 type Admin interface {
-	ReadAdminSummary(context.Context, string, store.AdminSummaryFilter, func(sessions.Session, *string) error) (store.AdminAssetCounts, error)
+	ReadAdminSummary(context.Context, string, sessions.AdminSummaryFilter, func(sessions.Session, *string) error) (sessions.AdminAssetCounts, error)
+	ListAdminRuntimeTargets(context.Context, []string, string, int, bool) (sessions.AdminRuntimeTargetPage, error)
 }
 
 func (h *Handler) adminResourceScope(next http.Handler) http.Handler {
diff --git a/services/core/internal/api/admin_resources_test.go b/services/core/internal/api/admin_resources_test.go
index 2a64b778a..cf323c93c 100644
--- a/services/core/internal/api/admin_resources_test.go
+++ b/services/core/internal/api/admin_resources_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 const managementProjectID = "22222222-2222-4222-8222-222222222222"
@@ -117,10 +116,10 @@ func TestAdminResourcesHaveExplicitTargetWithoutCallerImpersonation(t *testing.T
 
 type summaryFixture struct {
 	tenant string
-	filter store.AdminSummaryFilter
+	filter sessions.AdminSummaryFilter
 }
 
-func (s *summaryFixture) ReadAdminSummary(_ context.Context, tenant string, filter store.AdminSummaryFilter, visit func(sessions.Session, *string) error) (store.AdminAssetCounts, error) {
+func (s *summaryFixture) ReadAdminSummary(_ context.Context, tenant string, filter sessions.AdminSummaryFilter, visit func(sessions.Session, *string) error) (sessions.AdminAssetCounts, error) {
 	s.tenant, s.filter = tenant, filter
 	for i, usage := range []json.RawMessage{nil, json.RawMessage(`{"input_tokens":3,"output_tokens":5,"total_tokens":8,"input_tokens_details":{"cached_tokens":2},"output_tokens_details":{"reasoning_tokens":1}}`)} {
 		session := sessions.Session{ID: "session", TenantID: tenant, Configuration: json.RawMessage(`{"agent":{"id":"agent","model":"model","tools":[]},"environment":{"type":"none"}}`), CreatedAt: time.Unix(100+int64(i), 0), Usage: usage}
@@ -128,10 +127,10 @@ func (s *summaryFixture) ReadAdminSummary(_ context.Context, tenant string, filt
 			session.LastTurn = &sessions.Turn{Status: sessions.TurnInProgress, CreatedAt: time.Unix(110, 0)}
 		}
 		if err := visit(session, nil); err != nil {
-			return store.AdminAssetCounts{}, err
+			return sessions.AdminAssetCounts{}, err
 		}
 	}
-	return store.AdminAssetCounts{Agents: 4, Skills: 2}, nil
+	return sessions.AdminAssetCounts{Agents: 4, Skills: 2}, nil
 }
 func TestAdminSummaryUsesPublicStateAndNullUsageCoverage(t *testing.T) {
 	key := callerBinding()
diff --git a/services/core/internal/api/admin_runtime.go b/services/core/internal/api/admin_runtime.go
index c0ff4716e..31d204105 100644
--- a/services/core/internal/api/admin_runtime.go
+++ b/services/core/internal/api/admin_runtime.go
@@ -7,15 +7,8 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-// AdminRuntimeTargets lists the Sessions whose Runtime the administrator
-// observes across managed Projects.
-type AdminRuntimeTargets interface {
-	ListAdminRuntimeTargets(context.Context, []string, string, int, bool) (sessions.AdminRuntimeTargetPage, error)
-}
-
 type AdminRuntimeObservation struct {
 	ProjectID   string                        `json:"project_id"`
 	Observation AdminRuntimeObservationDetail `json:"observation"`
@@ -79,7 +72,7 @@ func (h *Handler) adminRuntimeObservations(w http.ResponseWriter, r *http.Reques
 			break
 		}
 	}
-	page, err := h.AdminRuntimeTargets.ListAdminRuntimeTargets(ctx, tenants, options.after, options.limit, options.ascending)
+	page, err := h.Admin.ListAdminRuntimeTargets(ctx, tenants, options.after, options.limit, options.ascending)
 	if err != nil {
 		writeSessionsError(w, r, err)
 		return
diff --git a/services/core/internal/api/admin_runtime_test.go b/services/core/internal/api/admin_runtime_test.go
index 9df4f2579..d2962247a 100644
--- a/services/core/internal/api/admin_runtime_test.go
+++ b/services/core/internal/api/admin_runtime_test.go
@@ -39,7 +39,7 @@ func adminRuntimeFixture(t *testing.T, catalog []projects.Project, targets []ses
 		return projects.Page{Data: catalog}, nil
 	}
 	management := &adminRuntimeTargets{page: sessions.AdminRuntimeTargetPage{Data: targets, HasMore: true}}
-	fakes.adminRuntimeTargets.listAdminRuntimeTargets = management.ListAdminRuntimeTargets
+	fakes.admin.listAdminRuntimeTargets = management.ListAdminRuntimeTargets
 	observeWith(service)(&deps, fakes)
 	return newTestHandler(t, deps), management
 }
diff --git a/services/core/internal/api/admin_summary.go b/services/core/internal/api/admin_summary.go
index 9805e7517..d24efa7c0 100644
--- a/services/core/internal/api/admin_summary.go
+++ b/services/core/internal/api/admin_summary.go
@@ -9,7 +9,6 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 type AdminSessionCounts struct {
@@ -25,14 +24,14 @@ type AdminUsageCoverage struct {
 	Ratio            *float64 `json:"ratio"`
 }
 type AdminSummaryRow struct {
-	ProjectID    string                  `json:"project_id"`
-	KeyID        *string                 `json:"key_id"`
-	AgentID      *string                 `json:"agent_id"`
-	Assets       *store.AdminAssetCounts `json:"assets"`
-	Sessions     AdminSessionCounts      `json:"sessions"`
-	Usage        v1.TokenUsage           `json:"usage"`
-	Coverage     AdminUsageCoverage      `json:"coverage"`
-	LastActiveAt *int64                  `json:"last_active_at"`
+	ProjectID    string                     `json:"project_id"`
+	KeyID        *string                    `json:"key_id"`
+	AgentID      *string                    `json:"agent_id"`
+	Assets       *sessions.AdminAssetCounts `json:"assets"`
+	Sessions     AdminSessionCounts         `json:"sessions"`
+	Usage        v1.TokenUsage              `json:"usage"`
+	Coverage     AdminUsageCoverage         `json:"coverage"`
+	LastActiveAt *int64                     `json:"last_active_at"`
 }
 type AdminSummaryResponse struct {
 	Data       []AdminSummaryRow `json:"data"`
@@ -80,33 +79,33 @@ func (h *Handler) adminSummary(w http.ResponseWriter, r *http.Request) {
 		group = "project"
 	}
 	if group != "project" && group != "agent" && group != "key" {
-		writeStoreError(w, r, sessions.ErrInvalidInput)
+		writeSessionsError(w, r, sessions.ErrInvalidInput)
 		return
 	}
 	after, err := adminSummaryTime(r, "created_after")
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	before, err := adminSummaryTime(r, "created_before")
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if after != nil && before != nil && !after.Before(*before) {
-		writeStoreError(w, r, sessions.ErrInvalidInput)
+		writeSessionsError(w, r, sessions.ErrInvalidInput)
 		return
 	}
 	ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second)
 	defer cancel()
 	if group == "agent" && r.URL.Query().Get("project_id") == "" {
-		writeStoreError(w, r, sessions.ErrInvalidInput)
+		writeSessionsError(w, r, sessions.ErrInvalidInput)
 		return
 	}
 	var page projects.Page
 	if projectID := r.URL.Query().Get("project_id"); projectID != "" {
 		if options.after != "" {
-			writeStoreError(w, r, sessions.ErrInvalidInput)
+			writeSessionsError(w, r, sessions.ErrInvalidInput)
 			return
 		}
 		var binding projects.Binding
@@ -125,7 +124,7 @@ func (h *Handler) adminSummary(w http.ResponseWriter, r *http.Request) {
 		if group == "project" {
 			groups[""] = &AdminSummaryRow{ProjectID: project.ID}
 		}
-		counts, err := h.Admin.ReadAdminSummary(ctx, project.TenantID, store.AdminSummaryFilter{CreatedAfter: after, CreatedBefore: before}, func(session sessions.Session, creationKeyID *string) error {
+		counts, err := h.Admin.ReadAdminSummary(ctx, project.TenantID, sessions.AdminSummaryFilter{CreatedAfter: after, CreatedBefore: before}, func(session sessions.Session, creationKeyID *string) error {
 			projected, err := sessionResponse(session, h.executorURL())
 			if err != nil {
 				return err
@@ -174,7 +173,7 @@ func (h *Handler) adminSummary(w http.ResponseWriter, r *http.Request) {
 			return nil
 		})
 		if err != nil {
-			writeStoreError(w, r, err)
+			writeSessionsError(w, r, err)
 			return
 		}
 		if group == "project" {
diff --git a/services/core/internal/api/dependencies.go b/services/core/internal/api/dependencies.go
index 9c7a5e090..f4e2b408d 100644
--- a/services/core/internal/api/dependencies.go
+++ b/services/core/internal/api/dependencies.go
@@ -56,7 +56,6 @@ type Dependencies struct {
 	EnvironmentsReader   EnvironmentsReader
 	ExecutorConnections  ExecutorConnections
 	Admin                Admin
-	AdminRuntimeTargets  AdminRuntimeTargets
 	AdminAudit           AdminAudit
 	WriteAudit           WriteAudit
 	Metrics              Metrics
@@ -143,7 +142,7 @@ func (d Dependencies) validate() error {
 		field{"Artifacts", d.Artifacts},
 		field{"ArtifactsReader", d.ArtifactsReader},
 		field{"SessionAdmin", d.SessionAdmin}, field{"Environments", d.Environments}, field{"EnvironmentsReader", d.EnvironmentsReader},
-		field{"ExecutorConnections", d.ExecutorConnections}, field{"Admin", d.Admin}, field{"AdminRuntimeTargets", d.AdminRuntimeTargets}, field{"AdminAudit", d.AdminAudit}, field{"WriteAudit", d.WriteAudit},
+		field{"ExecutorConnections", d.ExecutorConnections}, field{"Admin", d.Admin}, field{"AdminAudit", d.AdminAudit}, field{"WriteAudit", d.WriteAudit},
 		field{"Metrics", d.Metrics}, field{"RuntimeObservations", d.RuntimeObservations}, field{"RuntimeHistory", d.RuntimeHistory},
 	); err != nil {
 		return err
diff --git a/services/core/internal/api/dependencies_test.go b/services/core/internal/api/dependencies_test.go
index 38ce94de5..c7a5bf73b 100644
--- a/services/core/internal/api/dependencies_test.go
+++ b/services/core/internal/api/dependencies_test.go
@@ -42,7 +42,6 @@ type testFakes struct {
 	environmentsReader     *fakeEnvironmentsReader
 	executorConnections    *fakeExecutorConnections
 	admin                  *fakeAdmin
-	adminRuntimeTargets    *fakeAdminRuntimeTargets
 	adminAudit             *fakeAdminAudit
 	writeAudit             *fakeWriteAudit
 	metrics                *fakeMetrics
@@ -87,7 +86,7 @@ func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 		artifacts:       &fakeArtifacts{t: t},
 		artifactsReader: &fakeArtifactsReader{t: t},
 		sessionAdmin:    &fakeSessionAdmin{t: t}, environments: &fakeEnvironments{t: t}, environmentsReader: &fakeEnvironmentsReader{t: t}, executorConnections: &fakeExecutorConnections{t: t},
-		admin: &fakeAdmin{t: t}, adminRuntimeTargets: &fakeAdminRuntimeTargets{t: t}, adminAudit: &fakeAdminAudit{t: t}, writeAudit: &fakeWriteAudit{t: t}, metrics: &fakeMetrics{t: t},
+		admin: &fakeAdmin{t: t}, adminAudit: &fakeAdminAudit{t: t}, writeAudit: &fakeWriteAudit{t: t}, metrics: &fakeMetrics{t: t},
 		runtimeObservations: &fakeRuntimeObservations{t: t}, runtimeHistory: &fakeRuntimeHistory{t: t}, installationBindings: &fakeInstallationBindings{t: t},
 		sessionAdmission: &fakeSessionAdmission{t: t},
 		inputAdmission:   &fakeInputAdmission{t: t},
@@ -115,7 +114,7 @@ func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 		Artifacts:       f.artifacts,
 		ArtifactsReader: f.artifactsReader,
 		SessionAdmin:    f.sessionAdmin,
-		Environments:    f.environments, EnvironmentsReader: f.environmentsReader, ExecutorConnections: f.executorConnections, Admin: f.admin, AdminRuntimeTargets: f.adminRuntimeTargets, AdminAudit: f.adminAudit, WriteAudit: f.writeAudit,
+		Environments:    f.environments, EnvironmentsReader: f.environmentsReader, ExecutorConnections: f.executorConnections, Admin: f.admin, AdminAudit: f.adminAudit, WriteAudit: f.writeAudit,
 		Metrics: f.metrics, RuntimeObservations: f.runtimeObservations, RuntimeHistory: f.runtimeHistory,
 	}, f
 }
diff --git a/services/core/internal/api/fakes_test.go b/services/core/internal/api/fakes_test.go
index cf1565aee..7737d87bd 100644
--- a/services/core/internal/api/fakes_test.go
+++ b/services/core/internal/api/fakes_test.go
@@ -23,7 +23,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 	"github.com/google/uuid"
@@ -42,23 +41,19 @@ func unexpectedCall(t testing.TB, method string) {
 }
 
 type fakeAdmin struct {
-	t                testing.TB
-	readAdminSummary func(context.Context, string, store.AdminSummaryFilter, func(sessions.Session, *string) error) (store.AdminAssetCounts, error)
+	t                       testing.TB
+	readAdminSummary        func(context.Context, string, sessions.AdminSummaryFilter, func(sessions.Session, *string) error) (sessions.AdminAssetCounts, error)
+	listAdminRuntimeTargets func(context.Context, []string, string, int, bool) (sessions.AdminRuntimeTargetPage, error)
 }
 
-func (f *fakeAdmin) ReadAdminSummary(a0 context.Context, a1 string, a2 store.AdminSummaryFilter, a3 func(sessions.Session, *string) error) (store.AdminAssetCounts, error) {
+func (f *fakeAdmin) ReadAdminSummary(a0 context.Context, a1 string, a2 sessions.AdminSummaryFilter, a3 func(sessions.Session, *string) error) (sessions.AdminAssetCounts, error) {
 	if f.readAdminSummary == nil {
 		unexpectedCall(f.t, "ReadAdminSummary")
 	}
 	return f.readAdminSummary(a0, a1, a2, a3)
 }
 
-type fakeAdminRuntimeTargets struct {
-	t                       testing.TB
-	listAdminRuntimeTargets func(context.Context, []string, string, int, bool) (sessions.AdminRuntimeTargetPage, error)
-}
-
-func (f *fakeAdminRuntimeTargets) ListAdminRuntimeTargets(a0 context.Context, a1 []string, a2 string, a3 int, a4 bool) (sessions.AdminRuntimeTargetPage, error) {
+func (f *fakeAdmin) ListAdminRuntimeTargets(a0 context.Context, a1 []string, a2 string, a3 int, a4 bool) (sessions.AdminRuntimeTargetPage, error) {
 	if f.listAdminRuntimeTargets == nil {
 		unexpectedCall(f.t, "ListAdminRuntimeTargets")
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/admin.go b/services/core/internal/persistence/postgres/sessionpg/admin.go
index 3f49c20be..e23f728f7 100644
--- a/services/core/internal/persistence/postgres/sessionpg/admin.go
+++ b/services/core/internal/persistence/postgres/sessionpg/admin.go
@@ -3,6 +3,7 @@ package sessionpg
 import (
 	"context"
 	"errors"
+	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -53,3 +54,54 @@ func (s *Store) ListAdminRuntimeTargets(ctx context.Context, tenantIDs []string,
 	}
 	return page, nil
 }
+
+func (s *Store) ReadAdminSummary(ctx context.Context, tenantID string, filter sessions.AdminSummaryFilter, visit func(sessions.Session, *string) error) (sessions.AdminAssetCounts, error) {
+	var counts sessions.AdminAssetCounts
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return counts, err
+	}
+	err = s.units.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		raw, err := q.AdminAssetCounts(ctx, tenant)
+		if err != nil {
+			return err
+		}
+		counts = sessions.AdminAssetCounts(raw)
+		params := sqlc.AdminSummarySessionsParams{TenantID: tenant, CreatedAfter: timestamp(filter.CreatedAfter), CreatedBefore: timestamp(filter.CreatedBefore), AfterID: pgtype.UUID{Valid: true}}
+		for {
+			rows, err := q.AdminSummarySessions(ctx, params)
+			if err != nil {
+				return err
+			}
+			for _, row := range rows {
+				session, err := SessionFromRow(row.Session)
+				if err != nil {
+					return err
+				}
+				if session, err = LoadSessionActivity(ctx, q, session); err != nil {
+					return err
+				}
+				var creator *string
+				if row.CreationKeyID.Valid {
+					creator = &row.CreationKeyID.String
+				}
+				if err := visit(session, creator); err != nil {
+					return err
+				}
+				params.AfterID = row.Session.ID
+			}
+			if len(rows) < 100 {
+				return nil
+			}
+		}
+	})
+	return counts, err
+}
+
+func timestamp(value *time.Time) pgtype.Timestamptz {
+	if value == nil {
+		return pgtype.Timestamptz{}
+	}
+	return pgtype.Timestamptz{Time: *value, Valid: true}
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/admin_test.go b/services/core/internal/persistence/postgres/sessionpg/admin_test.go
index 9d1e34609..43d37f264 100644
--- a/services/core/internal/persistence/postgres/sessionpg/admin_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/admin_test.go
@@ -61,3 +61,47 @@ func TestListAdminRuntimeTargetsPagesLiveSessionsOfTenants(t *testing.T) {
 		t.Fatalf("malformed tenant: %v", err)
 	}
 }
+
+func TestReadAdminSummaryVisitsTheSelectedSessions(t *testing.T) {
+	pool := pgtest.Open(t)
+	store := New(pgunit.NewPool(pool), nil)
+	tenant, created := uuid.NewString(), time.Now().UTC().Truncate(time.Second).Add(-time.Hour)
+	session := func(offset time.Duration, deleted bool) string {
+		id := uuid.NewString()
+		exec(t, pool, `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash, created_at, deleted_at)
+			VALUES ($1, $2, 'codex', $5, 'hash', $3, CASE WHEN $4::boolean THEN clock_timestamp() END)`, id, tenant, created.Add(offset), deleted, id)
+		return id
+	}
+	session(0, false)
+	turned, keyed := session(time.Second, false), session(2*time.Second, false)
+	session(2*time.Second, true)
+	session(3*time.Second, false)
+	turn := addTurn(t, pool, pgID(uuid.MustParse(turned)), "completed")
+	operation := uuid.NewString()
+	exec(t, pool, `INSERT INTO write_audit_operations(id, tenant_id, key_id, key_name, key_prefix, key_kind, action, resource_type, resource_id, request_id, trace_id)
+		VALUES ($1, $2, 'key', 'Key', 'sk', 'static', 'create', 'session', $3, $4, 'trace')`, operation, tenant, keyed, operation)
+	exec(t, pool, `INSERT INTO write_audit_owners(tenant_id, resource_type, resource_id, operation_id) VALUES ($1, 'session', $2, $3)`, tenant, keyed, operation)
+
+	after, before := created.Add(time.Second), created.Add(3*time.Second)
+	visited := map[string]*string{}
+	counts, err := store.ReadAdminSummary(t.Context(), tenant, sessions.AdminSummaryFilter{CreatedAfter: &after, CreatedBefore: &before}, func(session sessions.Session, creator *string) error {
+		if session.ID == turned && (session.LastTurn == nil || session.LastTurn.ID != text(turn)) {
+			t.Errorf("activity of %s = %+v", turned, session.LastTurn)
+		}
+		visited[session.ID] = creator
+		return nil
+	})
+	if err != nil || counts != (sessions.AdminAssetCounts{}) || len(visited) != 2 || visited[turned] != nil || visited[keyed] == nil || *visited[keyed] != "key" {
+		t.Fatalf("summary = %+v, %v, %v", counts, visited, err)
+	}
+
+	exec(t, pool, `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash)
+		SELECT gen_random_uuid(), $1, 'codex', gen_random_uuid()::text, 'hash' FROM generate_series(1, 101)`, tenant)
+	total := 0
+	if _, err := store.ReadAdminSummary(t.Context(), tenant, sessions.AdminSummaryFilter{}, func(sessions.Session, *string) error { total++; return nil }); err != nil || total != 105 {
+		t.Fatalf("unfiltered summary visited %d, %v", total, err)
+	}
+	if _, err := store.ReadAdminSummary(t.Context(), "not-a-tenant", sessions.AdminSummaryFilter{}, nil); !errors.Is(err, sessions.ErrInvalidInput) {
+		t.Fatalf("malformed tenant: %v", err)
+	}
+}
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index 2fd9a314c..f400a64af 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -143,7 +143,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		Artifacts:       struct{ api.Artifacts }{},
 		ArtifactsReader: struct{ api.ArtifactsReader }{},
 		SessionAdmin:    struct{ api.SessionAdmin }{},
-		Environments:    struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, Admin: s, AdminRuntimeTargets: struct{ api.AdminRuntimeTargets }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{},
+		Environments:    struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, Admin: struct{ api.Admin }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{},
 		ExecutorConnections: struct{ api.ExecutorConnections }{},
 		Metrics:             struct{ api.Metrics }{}, RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
 		Execution: &api.Execution{
diff --git a/services/core/internal/sessions/admin.go b/services/core/internal/sessions/admin.go
index c68310671..3db0ce646 100644
--- a/services/core/internal/sessions/admin.go
+++ b/services/core/internal/sessions/admin.go
@@ -1,6 +1,9 @@
 package sessions
 
-import "context"
+import (
+	"context"
+	"time"
+)
 
 // AdminRuntimeTarget names a live Session whose Runtime an administrator
 // observes, with its tenant.
@@ -12,6 +15,20 @@ type AdminRuntimeTargetPage struct {
 	HasMore bool
 }
 
+// AdminSummaryFilter selects the Sessions created in [CreatedAfter,
+// CreatedBefore); a nil bound is open.
+type AdminSummaryFilter struct{ CreatedAfter, CreatedBefore *time.Time }
+
+// AdminAssetCounts counts a tenant's assets.
+type AdminAssetCounts struct {
+	Agents               int64 `json:"agents"`
+	Skills               int64 `json:"skills"`
+	EnvironmentTemplates int64 `json:"environment_templates"`
+	Files                int64 `json:"files"`
+	Vaults               int64 `json:"vaults"`
+	Credentials          int64 `json:"credentials"`
+}
+
 // AdminReader reads the administrator's cross-Project Session views.
 type AdminReader interface {
 	// ListAdminRuntimeTargets pages the live Sessions of the tenants by
@@ -20,4 +37,9 @@ type AdminReader interface {
 	// ErrInvalidInput; an after Session that is malformed, deleted or
 	// outside the tenants is ErrNotFound.
 	ListAdminRuntimeTargets(ctx context.Context, tenants []string, after string, limit int, ascending bool) (AdminRuntimeTargetPage, error)
+	// ReadAdminSummary counts the tenant's assets and visits each live Session
+	// the filter selects, with GetSession's activity and the ID of the key that
+	// created it, nil when none is recorded, from one read-only snapshot. A
+	// malformed tenant is ErrInvalidInput; an error from visit ends the read.
+	ReadAdminSummary(ctx context.Context, tenant string, filter AdminSummaryFilter, visit func(Session, *string) error) (AdminAssetCounts, error)
 }
diff --git a/services/core/internal/store/admin_summary.go b/services/core/internal/store/admin_summary.go
deleted file mode 100644
index d7578aaf0..000000000
--- a/services/core/internal/store/admin_summary.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package store
-
-import (
-	"context"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-type AdminSummaryFilter struct{ CreatedAfter, CreatedBefore *time.Time }
-type AdminAssetCounts struct {
-	Agents               int64 `json:"agents"`
-	Skills               int64 `json:"skills"`
-	EnvironmentTemplates int64 `json:"environment_templates"`
-	Files                int64 `json:"files"`
-	Vaults               int64 `json:"vaults"`
-	Credentials          int64 `json:"credentials"`
-}
-
-// ReadAdminSummary visits one space's Sessions from one read-only snapshot. The
-// visitor reuses the API's Session projection instead of creating another status
-// or usage model. Paging keeps the stored configurations out of an unbounded slice.
-func (s *Store) ReadAdminSummary(ctx context.Context, tenantID string, filter AdminSummaryFilter, visit func(sessions.Session, *string) error) (AdminAssetCounts, error) {
-	var counts AdminAssetCounts
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return counts, err
-	}
-	if visit == nil || filter.CreatedAfter != nil && filter.CreatedBefore != nil && !filter.CreatedAfter.Before(*filter.CreatedBefore) {
-		return counts, sessions.ErrInvalidInput
-	}
-	err = s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		raw, err := q.AdminAssetCounts(ctx, tenant)
-		if err != nil {
-			return err
-		}
-		counts = AdminAssetCounts{Agents: raw.Agents, Skills: raw.Skills, EnvironmentTemplates: raw.EnvironmentTemplates, Files: raw.Files, Vaults: raw.Vaults, Credentials: raw.Credentials}
-		params := sqlc.AdminSummarySessionsParams{TenantID: tenant, CreatedAfter: summaryTimestamp(filter.CreatedAfter), CreatedBefore: summaryTimestamp(filter.CreatedBefore), AfterID: pgtype.UUID{Valid: true}}
-		for {
-			rows, err := q.AdminSummarySessions(ctx, params)
-			if err != nil {
-				return err
-			}
-			for _, row := range rows {
-				session, err := sessionpg.SessionFromRow(row.Session)
-				if err != nil {
-					return err
-				}
-				session, err = sessionpg.LoadSessionActivity(ctx, q, session)
-				if err != nil {
-					return err
-				}
-				var creator *string
-				if row.CreationKeyID.Valid {
-					id := row.CreationKeyID.String
-					creator = &id
-				}
-				if err := visit(session, creator); err != nil {
-					return err
-				}
-				params.AfterID = row.Session.ID
-			}
-			if len(rows) < 100 {
-				return nil
-			}
-		}
-	})
-	return counts, err
-}
-
-func summaryTimestamp(value *time.Time) pgtype.Timestamptz {
-	if value == nil {
-		return pgtype.Timestamptz{}
-	}
-	return pgtype.Timestamptz{Time: *value, Valid: true}
-}
diff --git a/services/core/internal/store/public_handler_fixture_test.go b/services/core/internal/store/public_handler_fixture_test.go
index 7db484e46..198938cbd 100644
--- a/services/core/internal/store/public_handler_fixture_test.go
+++ b/services/core/internal/store/public_handler_fixture_test.go
@@ -94,7 +94,7 @@ func publicHandler(t testing.TB, s *store.Store, db fixtureDB, keys fixtureKeyRe
 		Subagents:       sessionStore,
 		Artifacts:       sessionService,
 		ArtifactsReader: sessionStore,
-		SessionAdmin:    sessionStore, Environments: sessionService, EnvironmentsReader: sessionStore, Admin: s, AdminRuntimeTargets: sessionStore, AdminAudit: audit, WriteAudit: audit,
+		SessionAdmin:    sessionStore, Environments: sessionService, EnvironmentsReader: sessionStore, Admin: sessionStore, AdminAudit: audit, WriteAudit: audit,
 		ExecutorConnections: strict, Metrics: strict, RuntimeObservations: strict, RuntimeHistory: strict,
 	}
 	for _, c := range configure {

From df2abab637d1dbbad36770a71214d40fcc83da8f Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 03:11:33 +0800
Subject: [PATCH 09/60] Move input admission and Environment input reservations
 into sessions (#441)

* Move input admission and Environment input reservations into sessions

* Admit input batches through one procedure and tighten reservation reads

AdmitInputs admits a validated batch for every admission path, and
admitInput is no longer exported. GetEnvironmentInputReservation reads in
one snapshot through the bound Session transaction, the receipt and
reservation loaders lose their forwarding helpers, FindInputReservation
loads receipts only for a matching batch, and the pooled expiry calls in
execution are bounded. TestTurnInputRetriesAndRestart again checks that
admission leaves the stored Session unchanged and that its latest Turn
survives a restart.
---
 services/core/IMPLEMENTATION.md               |   6 +-
 .../native_classification_integration_test.go |   5 +-
 .../session_diagnostics_public_compat_test.go |  14 +
 .../internal/api/session_diagnostics_test.go  |   5 +-
 .../archive_cancellation_cleanup_test.go      |   4 +-
 services/core/internal/execution/delivery.go  |   2 +-
 .../deployment_provider_observations_test.go  |   4 +-
 .../execution/environment_admission.go        |   6 +-
 .../core/internal/execution/message_input.go  |   2 +-
 .../core/internal/execution/preparation.go    |   4 +-
 .../internal/execution/prepared_dispatch.go   |  10 +-
 services/core/internal/execution/worker.go    |   2 +-
 .../internal/execution/worker_schedule.go     |   8 +-
 .../core/internal/execution/worker_wakeup.go  |   2 +-
 .../sessionpg/environment_inputs_test.go      | 165 ++++
 .../postgres/sessionpg/execution_inputs.go    |  37 +
 .../sessionpg/execution_inputs_test.go        | 776 ++++++++++++++++++
 .../persistence/postgres/sessionpg/inputs.go  | 247 ++++++
 .../postgres/sessionpg/inputs_test.go         | 521 ++++++++++++
 .../postgres/sessionpg/turn_reads.go          |   6 +-
 .../providers/configuration_flow_test.go      |   2 +-
 .../core/internal/sessions/artifacts_test.go  |   5 +
 .../core/internal/sessions/devices_test.go    |   2 +
 services/core/internal/sessions/doc.go        |  17 +-
 .../core/internal/sessions/environment.go     |   2 +
 .../internal/sessions/environment_inputs.go   | 159 ++++
 .../sessions/environment_inputs_test.go       | 165 ++++
 services/core/internal/sessions/execution.go  |   1 +
 .../sessions/execution_functions_test.go      |   8 +-
 .../internal/sessions/execution_inputs.go     | 103 +++
 .../sessions/execution_inputs_test.go         | 133 +++
 services/core/internal/sessions/inputs.go     | 332 ++++++++
 .../core/internal/sessions/inputs_test.go     | 322 ++++++++
 services/core/internal/sessions/reader.go     |   1 +
 services/core/internal/sessions/service.go    |   1 +
 .../store/admin_session_archive_race_test.go  |   2 +-
 .../store/admin_session_archive_test.go       |   2 +-
 .../admin_session_archive_worker_http_test.go |   2 +-
 .../store/archive_cancellation_test.go        |   4 +-
 .../internal/store/claude_execution_test.go   |   2 +-
 .../internal/store/command_output_test.go     |   4 +-
 .../creation_stream_settlement_public_test.go |   4 +-
 .../deployment_model_providers_http_test.go   |   4 +-
 services/core/internal/store/dispatch_test.go |   4 +-
 .../store/environment_admission_test.go       |   6 +-
 .../store/environment_claim_worker_test.go    |   5 +-
 .../internal/store/environment_device_test.go |   2 +-
 .../environment_directory_active_test.go      |   3 +-
 .../store/environment_expiry_worker_test.go   |   6 +-
 .../store/environment_file_writes_test.go     |  10 +-
 .../store/environment_initial_input_test.go   |  16 +-
 .../store/environment_initial_public_test.go  |   3 +-
 .../store/environment_input_activity.go       |  23 -
 .../store/environment_input_activity_test.go  |  38 +-
 .../store/environment_input_claim_test.go     |  96 ---
 .../store/environment_input_expiry.go         |  43 -
 .../store/environment_input_expiry_test.go    | 103 +--
 .../store/environment_input_migration_test.go |  36 -
 .../environment_input_settlement_test.go      | 222 +----
 .../core/internal/store/environment_inputs.go | 287 -------
 .../internal/store/environment_inputs_test.go | 274 -------
 .../store/environment_steering_order_test.go  | 104 ---
 .../internal/store/environment_work_test.go   |   8 +-
 .../store/environment_worker_helpers_test.go  |   4 +-
 .../store/environment_worker_scan_test.go     |   2 +-
 .../internal/store/environment_worker_test.go |   4 +-
 services/core/internal/store/execution.go     |  18 +-
 .../internal/store/execution_events_test.go   |   2 +-
 .../internal/store/execution_messages_test.go |   2 +-
 .../core/internal/store/execution_test.go     |  28 +-
 .../internal/store/execution_tools_test.go    |   2 +-
 services/core/internal/store/export_test.go   |  23 +-
 .../store/function_execution_native_test.go   |   2 +-
 .../internal/store/function_execution_test.go |   2 +-
 .../store/function_images_native_test.go      |   2 +-
 .../store/function_input_execution_test.go    |   4 +-
 .../store/function_inputs_public_test.go      |   8 +-
 .../internal/store/function_inputs_test.go    |  30 +-
 .../store/function_state_public_test.go       |   2 +-
 .../internal/store/function_state_test.go     |   2 +-
 .../internal/store/harness_onboarding_test.go |   2 +-
 ...sted_initialization_failure_public_test.go |   2 +-
 .../core/internal/store/input_batches_test.go | 189 -----
 .../store/input_conflicts_public_test.go      |   2 +-
 services/core/internal/store/inputs_test.go   | 128 +++
 .../core/internal/store/item_order_test.go    |   6 +-
 .../core/internal/store/item_reads_test.go    |   8 +-
 .../internal/store/list_cursor_public_test.go |   4 +-
 .../store/local_artifact_export_test.go       |   3 +-
 .../local_environment_file_write_test.go      |   4 +-
 .../store/local_environment_worker_test.go    |   4 +-
 .../store/mcode_public_native_test.go         |   2 +-
 .../store/message_images_native_test.go       |   2 +-
 .../store/model_protocol_native_test.go       |   2 +-
 .../store/prepared_dispatch_failure_test.go   |   8 +-
 .../internal/store/prepared_dispatch_test.go  |   4 +-
 .../internal/store/public_execution_test.go   |   4 +-
 .../store/public_handler_fixture_test.go      |   6 +-
 .../runtime_environment_terminal_test.go      |   4 +-
 .../store/runtime_input_admission_test.go     |   2 +-
 .../runtime_suspension_concurrency_test.go    |   6 +-
 .../runtime_wake_hint_integration_test.go     |   5 +-
 .../store/runtime_worker_recovery_test.go     |   6 +-
 .../store/sandbox_deployment_switch_test.go   |   2 +-
 services/core/internal/store/scheduling.go    |  26 -
 .../store/self_hosted_cancel_public_test.go   |   4 +-
 .../store/self_hosted_initial_public_test.go  |   2 +-
 .../store/session_artifacts_public_test.go    |   2 +-
 .../internal/store/session_artifacts_test.go  |   2 +-
 .../store/session_creation_stream_test.go     |   4 +-
 .../store/session_deletion_execution_test.go  |   2 +-
 .../session_deletion_lifecycle_public_test.go |  11 +-
 .../internal/store/session_deletion_test.go   |  20 +-
 .../session_environment_snapshot_test.go      |   2 +-
 .../internal/store/session_events_test.go     |   8 +-
 .../internal/store/session_initial_input.go   |  15 +-
 .../store/session_initial_input_test.go       |   6 +-
 .../internal/store/session_metadata_test.go   |   2 +-
 .../store/session_write_audit_test.go         |   8 +-
 services/core/internal/store/sessions.go      |   2 +-
 .../internal/store/steering_receipts_test.go  |   3 +-
 .../store/stream_authority_http_test.go       |   2 +-
 .../store/token_usage_integration_test.go     |   6 +-
 .../internal/store/tool_policy_native_test.go |   2 +-
 .../core/internal/store/turn_events_test.go   |   2 +-
 services/core/internal/store/turn_inputs.go   | 238 ------
 .../core/internal/store/turn_inputs_test.go   | 219 -----
 services/core/internal/store/turns_test.go    | 114 ---
 .../internal/store/worker_input_race_test.go  |   2 +-
 .../store/worker_preparation_failure_test.go  |  22 +-
 services/core/tests/fixtures/main.go          |  11 +-
 131 files changed, 3408 insertions(+), 2263 deletions(-)
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/environment_inputs_test.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/execution_inputs.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/execution_inputs_test.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/inputs.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/inputs_test.go
 create mode 100644 services/core/internal/sessions/environment_inputs.go
 create mode 100644 services/core/internal/sessions/environment_inputs_test.go
 create mode 100644 services/core/internal/sessions/execution_inputs.go
 create mode 100644 services/core/internal/sessions/execution_inputs_test.go
 create mode 100644 services/core/internal/sessions/inputs_test.go
 delete mode 100644 services/core/internal/store/environment_input_activity.go
 delete mode 100644 services/core/internal/store/environment_input_claim_test.go
 delete mode 100644 services/core/internal/store/environment_input_expiry.go
 delete mode 100644 services/core/internal/store/environment_inputs.go
 delete mode 100644 services/core/internal/store/environment_inputs_test.go
 delete mode 100644 services/core/internal/store/environment_steering_order_test.go
 delete mode 100644 services/core/internal/store/input_batches_test.go
 create mode 100644 services/core/internal/store/inputs_test.go
 delete mode 100644 services/core/internal/store/scheduling.go
 delete mode 100644 services/core/internal/store/turn_inputs.go
 delete mode 100644 services/core/internal/store/turn_inputs_test.go
 delete mode 100644 services/core/internal/store/turns_test.go

diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 3c5e0278d..9418835da 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -16,11 +16,11 @@ Two errors are shared across domains, each with one `api` helper: `textvalue.Err
 
 Shared vocabulary has one owner each, and domains use it rather than copy it. `internal/environmentconfig` owns Environment setup, Skills, Plugins and initial files with their validation and public metadata; `Setup.Validate` checks requested configuration, where a Skill may be an unresolved reference, and `Setup.ValidateInstalled` checks frozen, installable configuration. `internal/skills` owns `ParseVersion`, the canonical positive decimal Skill version. `internal/metadata` owns the metadata rules: `Validate` for the pair, key and value limits and U+0000, `ValidateStorable` for U+0000 alone, and `Encode` with its 64 KiB bound. `internal/jsonobject` owns `Normalize`, the stable encoding of stored JSON objects that snapshots and retry identities compare. These packages import no persistence.
 
-`internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitFunctionResult` saves a submitted function result for its Turn's call, `LoadRequiredActions` lists the calls a Turn waits on, and `TransitionTurn` moves a root Turn's status as its current status allows and settles a Turn that ends. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call and Turn operation loads the Turn in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. Neither imports persistence. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
+`internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitInputs` admits a validated input batch in order, each input steering the active Turn, starting a Turn, requesting a cancellation or joining a function result to its call's Turn, `AdmitFunctionResult` saves a submitted function result for its Turn's call, `LoadRequiredActions` lists the calls a Turn waits on, and `TransitionTurn` moves a root Turn's status as its current status allows and settles a Turn that ends. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call and Turn operation loads the Turn in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. Neither imports persistence. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
 
 Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; `LoadEnvironment`, which reads the tenant's Environment of a live Session; and `CreateSessionEnvironment`, which stores the Environment of a Session being created. The other `sessionpg` exports serve `store` until the Session operations leave it; among them `LoadSessionActivity`, the one Session activity read, adds the activity projection to the Session that `store`'s Session creation returns. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` and `BindSession` stay exported after store goes; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
 
-`store` is transitional. `store.New` builds a pooled Store, and `store.NewExecution(s, lease)` builds the execution writer on a lease it borrows. An execution-only operation on a pooled Store fails with `store.ErrExecutionAuthority`. New adapters do not copy that check: their execution repositories require a `*pgunit.Lease` at construction, their public repositories expose no execution operation, and the check goes away with `store`.
+`store` is transitional. `store.New` builds a pooled Store, and `store.NewExecution(s, lease)` builds the execution writer on a lease it borrows. Adapters' execution repositories require a `*pgunit.Lease` at construction, and their public repositories expose no execution operation.
 
 `cmd/server` owns the execution lease. It acquires one `pgunit.Lease`, builds every lease-bound adapter on it, and passes the lease and those adapters together as one `execution.Owner` to `execution.StartWorker`, which binds the Dispatcher to the Owner's execution operations through `Dispatcher.Bind`. If anything fails before that call, `cmd/server` closes the lease. From that call the Worker owns cleanup: a failed start closes the lease before it returns, and a started Worker closes it after `Run` has cancelled and drained its work. Each close runs under its own bounded deadline, independent of the cancelled request or run. Lease-bound adapters and the store writer borrow the lease and never close it, and the Worker uses the lease only through `Owner.Lease`, never through an adapter. Store integration tests start the Worker the same way through `startWorker`, and bind a Dispatcher that runs Turns without a Worker through `Dispatcher.Bind`.
 
@@ -36,7 +36,7 @@ Domain owners, each with its PostgreSQL adapter under `internal/persistence/post
 - `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and to `store`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other reader is `store`: Session creation decides admission and placement with those rules and `placementpg` inside its own transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. Session archive crosses the Session and the deployment, so it is a `deployment.ExecutionOperations` operation: `ArchiveSession`, which the administrator's archive route calls through `api.Execution.SessionArchive`, and `ArchiveResetSession`, which a reset calls, lock the Session through `deploymentpg`'s `WithSessionArchive`, check the deployment's generation and the running reset in `deployment`, then expire the Environment and cancel its work through the `sessions` procedures, revoke the allocation's device and request its cleanup, and record the audit entry in one leased transaction. `deployment.ObservationResolver` resolves a Session's Runtime observation target for `runtimeobs` from `sessions.SessionReader` and `deployment.Reader`.
 - `coremetrics` (`coremetricspg`): the Core metrics PostgreSQL holds: the root Turn queue counts, the root Turn history, read from one read-only snapshot, and the database size. `cmd/server`'s Core metrics source adds them to the process, pool, Worker and daemon registry measurements.
 - `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples. `runtimehistory.Service` scopes a read to the Session's hosted Environment through `sessions.EnvironmentReader`.
-- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover Sessions (their reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the administrator's views across Projects (a Project's asset counts and Sessions for the summary, and the Sessions whose Runtime the administrator observes), executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, and file-write reservation and settlement run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
+- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover Sessions (their reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), input admission (a public input batch, Environment input reservation and the expiry of one reservation, with the reads of a Turn's admitted inputs, a reservation and the Environment input work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the administrator's views across Projects (a Project's asset counts and Sessions for the summary, and the Sessions whose Runtime the administrator observes), executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, file-write reservation and settlement, and the promotion, failure and bulk expiry of Environment input reservations run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
 
 ## Request handling
 
diff --git a/services/core/internal/api/native_classification_integration_test.go b/services/core/internal/api/native_classification_integration_test.go
index 9ce5ea206..12dc3754f 100644
--- a/services/core/internal/api/native_classification_integration_test.go
+++ b/services/core/internal/api/native_classification_integration_test.go
@@ -25,10 +25,7 @@ func TestNativeClassificationPostgresRoundTripAndPublicPrivacy(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			receipt, err := s.SubmitMessage(t.Context(), tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
-			if err != nil {
-				t.Fatal(err)
-			}
+			receipt := submitMessage(t, pool, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
 			transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 			status := 503
 			result := execution.Result{ErrorCode: "engine_failed", Error: "Bearer secret-canary https://private.example/key", EngineErrorCode: code, EngineHTTPStatus: &status, Done: proto.DonePayload{Usage: proto.Usage{InputTokens: 7, OutputTokens: 3}, Metadata: map[string]any{proto.DoneMetaAgentSessionID: "native-secret-canary"}}}
diff --git a/services/core/internal/api/session_diagnostics_public_compat_test.go b/services/core/internal/api/session_diagnostics_public_compat_test.go
index c555210b3..f6b56f881 100644
--- a/services/core/internal/api/session_diagnostics_public_compat_test.go
+++ b/services/core/internal/api/session_diagnostics_public_compat_test.go
@@ -73,6 +73,20 @@ func databaseSessionReads(pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
 	}
 }
 
+// submitMessage admits one message input through the Session service on pool.
+func submitMessage(t *testing.T, pool *pgxpool.Pool, tenant, session, key string, payload json.RawMessage) sessions.InputReceipt {
+	t.Helper()
+	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil))
+	if err != nil {
+		t.Fatal(err)
+	}
+	receipts, err := service.SubmitInputs(t.Context(), tenant, session, key, []sessions.Input{{Kind: "message", Payload: payload}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return receipts[0]
+}
+
 // transitionTurn moves the Turn as the execution owner does, over a pooled
 // Session transaction.
 func transitionTurn(t *testing.T, pool *pgxpool.Pool, tenant, session, turn string, transition sessions.TurnTransition) {
diff --git a/services/core/internal/api/session_diagnostics_test.go b/services/core/internal/api/session_diagnostics_test.go
index 448a959df..0470488c1 100644
--- a/services/core/internal/api/session_diagnostics_test.go
+++ b/services/core/internal/api/session_diagnostics_test.go
@@ -19,10 +19,7 @@ func TestDiagnosticsCoreHandlerDatabaseBoundary(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	receipt, err := s.SubmitMessage(t.Context(), tenant, session.ID, "input", json.RawMessage(`{"text":"input-secret-canary"}`))
-	if err != nil {
-		t.Fatal(err)
-	}
+	receipt := submitMessage(t, pool, tenant, session.ID, "input", json.RawMessage(`{"text":"input-secret-canary"}`))
 	transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"device_disconnected","error":"Bearer raw-secret-canary https://private.example/key","done":{"native_id":"secret-native-canary"}}`)})
 	base := adminSessionsPath + session.ID
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index 822676a52..34ac69f46 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -92,10 +92,12 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			input, err := s.SubmitMessage(t.Context(), project.TenantID, session.ID, "start", json.RawMessage(`{"text":"run"}`))
+			_, service := testSessions(t, pool, nil)
+			inputs, err := service.SubmitInputs(t.Context(), project.TenantID, session.ID, "start", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"run"}`)}})
 			if err != nil {
 				t.Fatal(err)
 			}
+			input := inputs[0]
 			// This fixture isolates lifecycle ordering. Protocol-driven waiting is
 			// independently exercised in TestArchiveWaitingCancellationReceipts.
 			for _, transition := range []sessions.TurnTransition{{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}, {ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnWaiting}} {
diff --git a/services/core/internal/execution/delivery.go b/services/core/internal/execution/delivery.go
index ab20d7d7c..b18f4f86e 100644
--- a/services/core/internal/execution/delivery.go
+++ b/services/core/internal/execution/delivery.go
@@ -303,7 +303,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 				continue
 			}
 			if pending == nil {
-				inputs, err := d.Store.ListTurnInputs(ctx, tenantID, sessionID, request.RunID, result.AppliedThrough, 1)
+				inputs, err := d.SessionsReader.ListTurnInputs(ctx, tenantID, sessionID, request.RunID, result.AppliedThrough, 1)
 				if err != nil {
 					result.ErrorCode = "execution_state_unavailable"
 					if ctx.Err() != nil {
diff --git a/services/core/internal/execution/deployment_provider_observations_test.go b/services/core/internal/execution/deployment_provider_observations_test.go
index fa11d22b2..d8a45d3e4 100644
--- a/services/core/internal/execution/deployment_provider_observations_test.go
+++ b/services/core/internal/execution/deployment_provider_observations_test.go
@@ -82,10 +82,12 @@ func newFinishObservationFixture(t *testing.T, maxConnections int32) finishObser
 }
 func (f finishObservationFixture) start(t *testing.T) sessions.InputReceipt {
 	t.Helper()
-	receipt, err := f.s.SubmitMessage(t.Context(), f.tenant, f.session.ID, uuid.NewString(), json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"fixture"}]}]}`))
+	_, service := testSessions(t, f.pool, nil)
+	receipts, err := service.SubmitInputs(t.Context(), f.tenant, f.session.ID, uuid.NewString(), []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"fixture"}]}]}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
+	receipt := receipts[0]
 	if _, err = f.execution.TransitionTurn(t.Context(), f.tenant, f.session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/execution/environment_admission.go b/services/core/internal/execution/environment_admission.go
index 835027d90..d078186e7 100644
--- a/services/core/internal/execution/environment_admission.go
+++ b/services/core/internal/execution/environment_admission.go
@@ -97,7 +97,7 @@ func (w *Worker) submitEnvironmentInputs(ctx context.Context, session sessions.S
 	changed, unsubscribe := w.dispatcher.notifications.subscribe(session.TenantID, session.ID)
 	defer unsubscribe()
 	reserve, cancel := context.WithTimeout(ctx, 5*time.Second)
-	reservation, err := w.admission.ReserveEnvironmentInput(reserve, session.TenantID, session.ID, key, inputs)
+	reservation, err := w.dispatcher.Sessions.ReserveEnvironmentInput(reserve, session.TenantID, session.ID, key, inputs)
 	cancel()
 	if err != nil {
 		return nil, err
@@ -140,9 +140,9 @@ func (w *Worker) environmentInputOutcome(ctx context.Context, session sessions.S
 	defer cancel()
 	// The database rechecks its clock under the Session lock before settlement.
 	if !time.Now().Before(reservation.Deadline) {
-		return w.admission.ExpireEnvironmentInput(read, session.TenantID, session.ID, reservation.ID)
+		return w.dispatcher.Sessions.ExpireEnvironmentInput(read, session.TenantID, session.ID, reservation.ID)
 	}
-	return w.admission.GetEnvironmentInputReservation(read, session.TenantID, session.ID, reservation.ID)
+	return w.dispatcher.SessionsReader.GetEnvironmentInputReservation(read, session.TenantID, session.ID, reservation.ID)
 }
 
 func (w *Worker) checkAdmissionOwnership(ctx context.Context) error {
diff --git a/services/core/internal/execution/message_input.go b/services/core/internal/execution/message_input.go
index 5a44766d8..328567f6f 100644
--- a/services/core/internal/execution/message_input.go
+++ b/services/core/internal/execution/message_input.go
@@ -38,7 +38,7 @@ func messageInput(raw json.RawMessage) (proto.MessageInput, error) {
 }
 
 func (d *Dispatcher) initialInput(ctx context.Context, tenant, session, turn string) (proto.MessageInput, int64, error) {
-	inputs, err := d.Store.ListTurnInputs(ctx, tenant, session, turn, 0, 100)
+	inputs, err := d.SessionsReader.ListTurnInputs(ctx, tenant, session, turn, 0, 100)
 	if err != nil {
 		return nil, 0, err
 	}
diff --git a/services/core/internal/execution/preparation.go b/services/core/internal/execution/preparation.go
index 59ea9bfb4..ca815d02e 100644
--- a/services/core/internal/execution/preparation.go
+++ b/services/core/internal/execution/preparation.go
@@ -97,7 +97,9 @@ func (d *Dispatcher) awaitPreparation(ctx context.Context, tenant, session strin
 		case <-ctx.Done():
 			return pending, ctx.Err()
 		case <-tick.C:
-			current, err := d.Store.ExpireEnvironmentInput(ctx, tenant, session, pending.ID)
+			expire, cancel := context.WithTimeout(ctx, 5*time.Second)
+			current, err := d.Sessions.ExpireEnvironmentInput(expire, tenant, session, pending.ID)
+			cancel()
 			if err != nil || current.State != sessions.EnvironmentInputPending {
 				return current, err
 			}
diff --git a/services/core/internal/execution/prepared_dispatch.go b/services/core/internal/execution/prepared_dispatch.go
index 1584b7442..6cb5817f6 100644
--- a/services/core/internal/execution/prepared_dispatch.go
+++ b/services/core/internal/execution/prepared_dispatch.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"strings"
+	"time"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
@@ -17,12 +18,15 @@ type EnvironmentRun struct {
 }
 
 // RunEnvironmentInput reserves a Turn on the Session-owned Runtime Executor. It
-// checks lease, the lease d.Store was built on, before any Runtime preparation.
+// checks lease, the lease the Dispatcher's execution operations hold, before
+// any Runtime preparation.
 func (d *Dispatcher) RunEnvironmentInput(ctx context.Context, lease Ownership, tenantID, sessionID, reservationID string) (run EnvironmentRun, err error) {
 	if err = lease.CheckOwnership(ctx); err != nil {
 		return run, err
 	}
-	run.Reservation, err = d.Store.ExpireEnvironmentInput(ctx, tenantID, sessionID, reservationID)
+	expire, cancel := context.WithTimeout(ctx, 5*time.Second)
+	run.Reservation, err = d.Sessions.ExpireEnvironmentInput(expire, tenantID, sessionID, reservationID)
+	cancel()
 	if err != nil || run.Reservation.State != sessions.EnvironmentInputPending {
 		return run, err
 	}
@@ -92,7 +96,7 @@ func (d *Dispatcher) RunEnvironmentInput(ctx context.Context, lease Ownership, t
 	if err := d.messageInputSupport(peer, session.Engine, snapshot, messages); err != nil {
 		return run, err
 	}
-	promoted, err := d.Store.PromoteEnvironmentInput(owner, tenantID, sessionID, reservationID)
+	promoted, err := d.sessionExecution.PromoteEnvironmentInput(owner, tenantID, sessionID, reservationID)
 	if errors.Is(err, sessions.ErrTurnConflict) {
 		// A rejected claim leaves the reservation pending for a later attempt.
 		return run, err
diff --git a/services/core/internal/execution/worker.go b/services/core/internal/execution/worker.go
index 0b2b48a0b..6ad0bcc06 100644
--- a/services/core/internal/execution/worker.go
+++ b/services/core/internal/execution/worker.go
@@ -303,7 +303,7 @@ func (w *Worker) Run(ctx context.Context) (runErr error) {
 			return err
 		}
 		if maintenance {
-			if _, err := w.dispatcher.Store.ExpireEnvironmentInputs(ctx); err != nil {
+			if _, err := w.dispatcher.sessionExecution.ExpireEnvironmentInputs(ctx); err != nil {
 				w.observeSchedulerPoll(0, err)
 				return err
 			}
diff --git a/services/core/internal/execution/worker_schedule.go b/services/core/internal/execution/worker_schedule.go
index fbc0098d8..de5ac027a 100644
--- a/services/core/internal/execution/worker_schedule.go
+++ b/services/core/internal/execution/worker_schedule.go
@@ -34,7 +34,7 @@ func (s *workerSchedule) selectWork(ctx context.Context, w *Worker, devices []st
 	}
 	var environments []sessions.EnvironmentInputWork
 	if !time.Now().Before(s.nextEnvironmentScan) {
-		environments, err = w.dispatcher.Store.ListEnvironmentInputWork(ctx, s.environmentCursor, devices)
+		environments, err = w.dispatcher.SessionsReader.ListEnvironmentInputWork(ctx, s.environmentCursor, devices)
 		if err != nil {
 			return nil, err
 		}
@@ -43,7 +43,7 @@ func (s *workerSchedule) selectWork(ctx context.Context, w *Worker, devices []st
 			s.environmentCursor = ""
 			// Retry the first page now instead of spending a scan interval on EOF.
 			// A single refill preserves the candidate bound and cannot spin when empty.
-			environments, err = w.dispatcher.Store.ListEnvironmentInputWork(ctx, "", devices)
+			environments, err = w.dispatcher.SessionsReader.ListEnvironmentInputWork(ctx, "", devices)
 			if err != nil {
 				return nil, err
 			}
@@ -94,10 +94,10 @@ func (w *Worker) runEnvironmentInput(ctx context.Context, item scheduledWork) er
 		return nil
 	}
 	if errors.Is(err, ErrModelProviderRequired) {
-		return w.dispatcher.Store.FailEnvironmentInput(ctx, item.TenantID, item.SessionID, item.reservationID, "model_provider_required")
+		return w.dispatcher.sessionExecution.FailEnvironmentInput(ctx, item.TenantID, item.SessionID, item.reservationID, "model_provider_required")
 	}
 	if errors.Is(err, errPreparationFailed) && run.Reservation.State == sessions.EnvironmentInputPending {
-		return w.dispatcher.Store.FailEnvironmentInput(ctx, item.TenantID, item.SessionID, item.reservationID, "runtime_preparation_failed")
+		return w.dispatcher.sessionExecution.FailEnvironmentInput(ctx, item.TenantID, item.SessionID, item.reservationID, "runtime_preparation_failed")
 	}
 	if run.Reservation.State == sessions.EnvironmentInputAdmitted {
 		return err
diff --git a/services/core/internal/execution/worker_wakeup.go b/services/core/internal/execution/worker_wakeup.go
index 403e2bead..153a6b962 100644
--- a/services/core/internal/execution/worker_wakeup.go
+++ b/services/core/internal/execution/worker_wakeup.go
@@ -16,7 +16,7 @@ func (w *Worker) wakeScheduler() {
 }
 
 func (w *Worker) admitInputs(ctx context.Context, tenant, session, key string, inputs []sessions.Input) ([]sessions.InputReceipt, error) {
-	receipts, err := w.admission.SubmitInputs(ctx, tenant, session, key, inputs)
+	receipts, err := w.dispatcher.Sessions.SubmitInputs(ctx, tenant, session, key, inputs)
 	if err == nil {
 		w.wakeScheduler()
 		w.dispatcher.notifications.notify(tenant, session)
diff --git a/services/core/internal/persistence/postgres/sessionpg/environment_inputs_test.go b/services/core/internal/persistence/postgres/sessionpg/environment_inputs_test.go
new file mode 100644
index 000000000..9a000de16
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/environment_inputs_test.go
@@ -0,0 +1,165 @@
+package sessionpg
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"reflect"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+var reservedBatch = []sessions.Input{messageInput("first"), messageInput("second")}
+
+// environmentInputHistory checks the Session's Turns and admitted inputs, one
+// Item per input, and that no input left Turn or Item events.
+func environmentInputHistory(t *testing.T, pool *pgxpool.Pool, session pgtype.UUID, turns, inputs int) {
+	t.Helper()
+	var gotTurns, gotInputs, items, events int
+	err := pool.QueryRow(t.Context(), `
+		SELECT (SELECT count(*) FROM turns WHERE session_id=$1),
+		       (SELECT count(*) FROM turn_inputs WHERE session_id=$1),
+		       (SELECT count(*) FROM session_items WHERE session_id=$1),
+		       (SELECT count(*) FROM session_events WHERE session_id=$1
+		        AND (payload ? 'turn' OR payload->'event' ? 'item'))`, session).Scan(&gotTurns, &gotInputs, &items, &events)
+	if err != nil || gotTurns != turns || gotInputs != inputs || items != inputs || (inputs == 0 && events != 0) {
+		t.Fatal("history", gotTurns, gotInputs, items, events, err)
+	}
+}
+
+// reserve reserves the two-message batch under key.
+func reserve(t *testing.T, service *sessions.Service, tenant, session pgtype.UUID, key string) sessions.EnvironmentInputReservation {
+	t.Helper()
+	got, err := service.ReserveEnvironmentInput(t.Context(), text(tenant), text(session), key, reservedBatch)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return got
+}
+
+// passDeadline moves the reservation's deadline into the past.
+func passDeadline(t *testing.T, pool *pgxpool.Pool, reservation string) {
+	t.Helper()
+	exec(t, pool, `UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE id=$1`, reservation)
+}
+
+// cancelPending cancels the Session's pending input as Session cancellation
+// does, then reads the reservation back.
+func cancelPending(ctx context.Context, pool *pgxpool.Pool, store *Store, tenant, session pgtype.UUID, reservation string) (sessions.EnvironmentInputReservation, error) {
+	err := WithSession(ctx, pgunit.NewPool(pool), tenant, session, func(ctx context.Context, q *sqlc.Queries, locked sessions.LockedSession) error {
+		if err := locked.Public(); err != nil {
+			return err
+		}
+		bound := BindSession(q, tenant, session)
+		return sessions.TrackInputActivity(ctx, bound, bound.CancelPendingInput)
+	})
+	if err != nil {
+		return sessions.EnvironmentInputReservation{}, err
+	}
+	return store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), reservation)
+}
+
+// Concurrent equivalent reservations from two pools share one pending
+// identity and deadline, which a restart keeps.
+func TestEnvironmentInputReservationConcurrentIdentity(t *testing.T) {
+	pool := pgtest.Open(t)
+	_, service := stagingService(t, pool)
+	_, other := stagingService(t, pgtest.Open(t))
+	tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	ctx := t.Context()
+	batch := []sessions.Input{
+		{Kind: "message", Payload: json.RawMessage(`{"text":"first","detail":{"a":1,"b":2}}`)},
+		messageInput("second"),
+	}
+	const count = 8
+	results := make(chan sessions.EnvironmentInputReservation, count)
+	var wg sync.WaitGroup
+	for i := range count {
+		wg.Go(func() {
+			admission := service
+			inputs := append([]sessions.Input(nil), batch...)
+			if i%2 == 0 {
+				admission = other
+				inputs[0].Payload = json.RawMessage(` { "detail": {"b": 2, "a": 1}, "text": "first" } `)
+			}
+			got, err := admission.ReserveEnvironmentInput(ctx, text(tenant), text(session), "request", inputs)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			results <- got
+		})
+	}
+	wg.Wait()
+	close(results)
+	var first sessions.EnvironmentInputReservation
+	received := 0
+	for result := range results {
+		received++
+		if first.ID == "" {
+			first = result
+		}
+		if !reflect.DeepEqual(first, result) {
+			t.Fatal("reservation identity changed", first, result)
+		}
+	}
+	if received != count || first.State != sessions.EnvironmentInputPending || first.ID == "" || first.Deadline.Sub(first.CreatedAt) != 5*time.Minute || first.SettledAt != nil || len(first.Receipts) != 0 {
+		t.Fatal("invalid pending result", received, first)
+	}
+	environmentInputHistory(t, pool, session, 0, 0)
+	for _, changed := range [][]sessions.Input{batch[:1], {batch[1], batch[0]}, {messageInput("changed"), batch[1]}} {
+		if _, err := service.ReserveEnvironmentInput(ctx, text(tenant), text(session), "request", changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+			t.Fatal("changed request accepted", err)
+		}
+	}
+	if _, err := other.ReserveEnvironmentInput(ctx, text(tenant), text(session), "other", batch); !errors.Is(err, sessions.ErrTurnConflict) {
+		t.Fatal("second pending request accepted", err)
+	}
+	pool.Close()
+	_, restarted := stagingService(t, pgtest.Open(t))
+	got, err := restarted.ReserveEnvironmentInput(ctx, text(tenant), text(session), "request", batch)
+	if err != nil || !reflect.DeepEqual(first, got) {
+		t.Fatal("restart changed deadline or identity", got, err)
+	}
+}
+
+// A key that direct admission already used keeps its receipts and gains no
+// reservation, and its retry leaves newer pending input alone.
+func TestEnvironmentInputReservationKeepsEarlierDirectIdentity(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := stagingService(t, pool)
+	tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	ctx := t.Context()
+	input := messageInput("already admitted")
+	receipts, err := service.SubmitInputs(ctx, text(tenant), text(session), "direct", []sessions.Input{input})
+	if err != nil {
+		t.Fatal(err)
+	}
+	move(t, pool, tenant, session, receipts[0].TurnID, sessions.TurnQueued, sessions.TurnInProgress)
+	move(t, pool, tenant, session, receipts[0].TurnID, sessions.TurnInProgress, sessions.TurnCompleted)
+	pending := reserve(t, service, tenant, session, "new")
+	got, err := service.ReserveEnvironmentInput(ctx, text(tenant), text(session), "direct", []sessions.Input{input})
+	if err != nil || got.State != sessions.EnvironmentInputAdmitted || got.ID != "" || !got.Deadline.IsZero() || len(got.Receipts) != 1 || got.Receipts[0].Sequence != receipts[0].Sequence {
+		t.Fatal("direct admission gained a reservation", got, err)
+	}
+	if _, err := service.ReserveEnvironmentInput(ctx, text(tenant), text(session), "direct", []sessions.Input{messageInput("changed")}); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+		t.Fatal(err)
+	}
+	retry, err := service.SubmitInputs(ctx, text(tenant), text(session), "direct", []sessions.Input{input})
+	if err != nil || len(retry) != 1 || !retry[0].Replayed {
+		t.Fatal(retry, err)
+	}
+	retained, err := store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), pending.ID)
+	if err != nil || !reflect.DeepEqual(retained, pending) {
+		t.Fatal("old retry affected new pending input", retained, err)
+	}
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_inputs.go b/services/core/internal/persistence/postgres/sessionpg/execution_inputs.go
new file mode 100644
index 000000000..77c88f0a9
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/execution_inputs.go
@@ -0,0 +1,37 @@
+package sessionpg
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+func (e *Execution) WithInputs(ctx context.Context, tenant, session string, apply func(context.Context, sessions.InputTx) error) error {
+	return withInputs(ctx, e.lease, tenant, session, apply)
+}
+
+// WithDueInputReservations locks each due reservation's Session with the scan
+// itself, skipping Sessions another transaction holds, and prunes each
+// Session's change journal after apply.
+func (e *Execution) WithDueInputReservations(ctx context.Context, apply func(context.Context, sessions.InputTx, string) error) error {
+	return e.lease.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		rows, err := q.ListDueEnvironmentInputs(ctx)
+		if err != nil {
+			return err
+		}
+		for _, row := range rows {
+			if err := apply(ctx, BindSession(q, row.TenantID, row.SessionID), uuid.UUID(row.ID.Bytes).String()); err != nil {
+				return err
+			}
+			if err := PruneChanges(ctx, q, row.SessionID); err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_inputs_test.go b/services/core/internal/persistence/postgres/sessionpg/execution_inputs_test.go
new file mode 100644
index 000000000..22807a559
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/execution_inputs_test.go
@@ -0,0 +1,776 @@
+package sessionpg
+
+import (
+	"context"
+	"errors"
+	"reflect"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+// leasedInputs opens a database of its own and returns its pool, the Session
+// store and service on the pool, and the execution operations on its lease.
+func leasedInputs(t *testing.T) (*pgxpool.Pool, *Store, *sessions.Service, *sessions.ExecutionOperations) {
+	t.Helper()
+	pool := pgtest.OpenIsolated(t, nil)
+	store, service := stagingService(t, pool)
+	operations, _ := sessionExecution(t, pool)
+	return pool, store, service, operations
+}
+
+// terminateLeaseOwner ends the backend that holds the execution lease of
+// pool's database.
+func terminateLeaseOwner(t *testing.T, pool *pgxpool.Pool) {
+	t.Helper()
+	var killed bool
+	err := pool.QueryRow(t.Context(), `SELECT pg_terminate_backend(pid, 1000) FROM pg_locks WHERE locktype='advisory' AND granted AND objsubid=1
+		AND classid::bigint * 4294967296 + objid::bigint = 706172736172
+		AND database=(SELECT oid FROM pg_database WHERE datname=current_database())`).Scan(&killed)
+	if err != nil || !killed {
+		t.Fatal("terminate execution lease owner", killed, err)
+	}
+}
+
+func reservationState(t *testing.T, store *Store, tenant, session pgtype.UUID, reservation string) string {
+	t.Helper()
+	got, err := store.GetEnvironmentInputReservation(t.Context(), text(tenant), text(session), reservation)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return got.State
+}
+
+// lockSession holds the Session's lock in an open transaction and returns the
+// holder's backend PID; the transaction rolls back when the test ends unless
+// release commits it first.
+func lockSession(ctx context.Context, t *testing.T, pool *pgxpool.Pool, session pgtype.UUID) (int32, func(sql string, args ...any)) {
+	t.Helper()
+	tx, err := pool.Begin(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { _ = tx.Rollback(context.Background()) })
+	var pid int32
+	if err := tx.QueryRow(ctx, "SELECT pg_backend_pid() FROM sessions WHERE id=$1 FOR UPDATE", session).Scan(&pid); err != nil {
+		t.Fatal(err)
+	}
+	return pid, func(sql string, args ...any) {
+		t.Helper()
+		if sql != "" {
+			if _, err := tx.Exec(ctx, sql, args...); err != nil {
+				t.Fatal(err)
+			}
+		}
+		if err := tx.Commit(ctx); err != nil {
+			t.Fatal(err)
+		}
+	}
+}
+
+// awaitBlocked waits until a backend waits on holder's lock and returns its
+// PID.
+func awaitBlocked(ctx context.Context, t *testing.T, pool *pgxpool.Pool, holder int32) int32 {
+	t.Helper()
+	for ctx.Err() == nil {
+		var blocked int32
+		if err := pool.QueryRow(ctx, "SELECT pid FROM pg_stat_activity WHERE $1=ANY(pg_blocking_pids(pid)) ORDER BY pid LIMIT 1", holder).Scan(&blocked); err == nil {
+			return blocked
+		}
+		time.Sleep(5 * time.Millisecond)
+	}
+	t.Fatal("transaction did not wait for the Session lock")
+	return 0
+}
+
+// Direct input waits behind a pending reservation; promotion admits it once,
+// and every retry, after a new execution owner and pool too, replays that
+// admission.
+func TestEnvironmentInputReservationPromotionAndDirectRetries(t *testing.T) {
+	pool := pgtest.OpenIsolated(t, nil)
+	store, service := stagingService(t, pool)
+	operations, lease := sessionExecution(t, pool)
+	tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	ctx := t.Context()
+	first := reserve(t, service, tenant, session, "pending")
+	for _, request := range []struct {
+		key    string
+		inputs []sessions.Input
+		want   error
+	}{
+		{"pending", first.Inputs, sessions.ErrTurnConflict},
+		{"pending", []sessions.Input{messageInput("changed")}, sessions.ErrIdempotencyConflict},
+		{"later", []sessions.Input{messageInput("later")}, sessions.ErrTurnConflict},
+		{"cancel", []sessions.Input{cancelInput}, sessions.ErrTurnConflict},
+	} {
+		if _, err := service.SubmitInputs(ctx, text(tenant), text(session), request.key, request.inputs); !errors.Is(err, request.want) {
+			t.Fatal("direct path bypassed reservation", request.key, err)
+		}
+	}
+	environmentInputHistory(t, pool, session, 0, 0)
+	promoted, err := operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), first.ID)
+	if err != nil || promoted.State != sessions.EnvironmentInputAdmitted || promoted.SettledAt == nil || len(promoted.Receipts) != 2 || !promoted.Deadline.Equal(first.Deadline) {
+		t.Fatal(promoted, err)
+	}
+	for i, receipt := range promoted.Receipts {
+		if receipt.Replayed || receipt.TurnID == "" || receipt.TurnID != promoted.Receipts[0].TurnID || (i > 0 && receipt.Sequence <= promoted.Receipts[i-1].Sequence) {
+			t.Fatal("promotion receipts", promoted.Receipts)
+		}
+	}
+	environmentInputHistory(t, pool, session, 1, 2)
+	for _, read := range []func() (sessions.EnvironmentInputReservation, error){
+		func() (sessions.EnvironmentInputReservation, error) {
+			return operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), first.ID)
+		},
+		func() (sessions.EnvironmentInputReservation, error) {
+			return store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), first.ID)
+		},
+		func() (sessions.EnvironmentInputReservation, error) {
+			return service.ReserveEnvironmentInput(ctx, text(tenant), text(session), "pending", first.Inputs)
+		},
+	} {
+		retry, err := read()
+		if err != nil || retry.ID != first.ID || !retry.Deadline.Equal(first.Deadline) || retry.State != sessions.EnvironmentInputAdmitted || len(retry.Receipts) != 2 {
+			t.Fatal(retry, err)
+		}
+		for i, receipt := range retry.Receipts {
+			if !receipt.Replayed || receipt.Sequence != promoted.Receipts[i].Sequence || receipt.TurnID != promoted.Receipts[i].TurnID {
+				t.Fatal("retry changed admission", receipt)
+			}
+		}
+	}
+	retry, err := service.SubmitInputs(ctx, text(tenant), text(session), "pending", first.Inputs)
+	if err != nil || len(retry) != 2 || !retry[0].Replayed || retry[0].Sequence != promoted.Receipts[0].Sequence {
+		t.Fatal("direct retry after promotion", retry, err)
+	}
+	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, pool)
+	if err := lease.Close(ctx); err != nil {
+		t.Fatal(err)
+	}
+	awaitRelease()
+	restarted, err := pgxpool.NewWithConfig(ctx, pool.Config())
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(restarted.Close)
+	pool.Close()
+	successor, _ := sessionExecution(t, restarted)
+	after, err := successor.PromoteEnvironmentInput(ctx, text(tenant), text(session), first.ID)
+	if err != nil || after.State != sessions.EnvironmentInputAdmitted || after.Receipts[0].Sequence != promoted.Receipts[0].Sequence {
+		t.Fatal("restart repeated promotion", after, err)
+	}
+	environmentInputHistory(t, restarted, session, 1, 2)
+}
+
+// Reservations resolve only in their tenant's Session, take only messages,
+// need an Environment and join an active Turn at once.
+func TestEnvironmentInputReservationRejectsUnsupportedOrForeignState(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	ctx := t.Context()
+	pending := reserve(t, service, tenant, session, "pending")
+	stranger := pgID(uuid.New())
+	for _, read := range []func() error{
+		func() error {
+			_, err := store.GetEnvironmentInputReservation(ctx, text(stranger), text(session), pending.ID)
+			return err
+		},
+		func() error {
+			_, err := operations.PromoteEnvironmentInput(ctx, text(stranger), text(session), pending.ID)
+			return err
+		},
+		func() error {
+			_, err := cancelPending(ctx, pool, store, stranger, session, pending.ID)
+			return err
+		},
+		func() error {
+			_, err := service.ReserveEnvironmentInput(ctx, text(stranger), text(session), "new", pending.Inputs)
+			return err
+		},
+	} {
+		if err := read(); !errors.Is(err, sessions.ErrNotFound) {
+			t.Fatal("foreign access", err)
+		}
+	}
+	other := pgID(uuid.New())
+	exec(t, pool, `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash) VALUES ($1, $2, 'codex', 'other', 'hash')`, other, tenant)
+	for _, action := range []func(context.Context, pgtype.UUID, pgtype.UUID, string) (sessions.EnvironmentInputReservation, error){
+		func(ctx context.Context, tenant, session pgtype.UUID, reservation string) (sessions.EnvironmentInputReservation, error) {
+			return store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), reservation)
+		},
+		func(ctx context.Context, tenant, session pgtype.UUID, reservation string) (sessions.EnvironmentInputReservation, error) {
+			return operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), reservation)
+		},
+		func(ctx context.Context, tenant, session pgtype.UUID, reservation string) (sessions.EnvironmentInputReservation, error) {
+			return cancelPending(ctx, pool, store, tenant, session, reservation)
+		},
+		func(ctx context.Context, tenant, session pgtype.UUID, reservation string) (sessions.EnvironmentInputReservation, error) {
+			return service.ExpireEnvironmentInput(ctx, text(tenant), text(session), reservation)
+		},
+	} {
+		if _, err := action(ctx, tenant, other, pending.ID); !errors.Is(err, sessions.ErrNotFound) {
+			t.Fatal("reservation crossed Session ownership", err)
+		}
+		if _, err := action(ctx, stranger, session, pending.ID); !errors.Is(err, sessions.ErrNotFound) {
+			t.Fatal("reservation crossed tenant ownership", err)
+		}
+	}
+	retained, err := store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), pending.ID)
+	if err != nil || !reflect.DeepEqual(retained, pending) {
+		t.Fatal("foreign operations changed reservation", retained, err)
+	}
+	for _, invalid := range [][]sessions.Input{nil, {cancelInput}, {{Kind: "tool_result", Payload: []byte(`{}`)}}} {
+		if _, err := service.ReserveEnvironmentInput(ctx, text(tenant), text(session), "invalid", invalid); !errors.Is(err, sessions.ErrInvalidInput) {
+			t.Fatal("unsupported reservation", err)
+		}
+	}
+	noneTenant, none := newSession(t, pool)
+	if _, err := service.ReserveEnvironmentInput(ctx, text(noneTenant), text(none), "none", pending.Inputs); !errors.Is(err, sessions.ErrInvalidInput) {
+		t.Fatal("none reservation", err)
+	}
+	activeTenant, active, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	activeInput := submitMessage(t, service, activeTenant, active, "active")
+	steer, err := service.ReserveEnvironmentInput(ctx, text(activeTenant), text(active), "new", pending.Inputs)
+	if err != nil || steer.State != sessions.EnvironmentInputAdmitted || steer.ID != "" || !steer.Deadline.IsZero() || len(steer.Receipts) != len(pending.Inputs) || steer.Receipts[0].TurnID != activeInput.TurnID {
+		t.Fatal("active input did not retain the existing Turn", steer, err)
+	}
+}
+
+// A cancelled or expired reservation keeps its outcome and identity: no retry
+// or settlement restarts it, and none touches a newer reservation.
+func TestEnvironmentInputTerminalReservationsCannotRestart(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	for _, terminal := range []string{sessions.EnvironmentInputCancelled, sessions.EnvironmentInputExpired} {
+		t.Run(terminal, func(t *testing.T) {
+			tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+			ctx := t.Context()
+			pending := reserve(t, service, tenant, session, "pending")
+			early, err := service.ExpireEnvironmentInput(ctx, text(tenant), text(session), pending.ID)
+			if err != nil || early.State != sessions.EnvironmentInputPending || early.SettledAt != nil || !early.Deadline.Equal(pending.Deadline) {
+				t.Fatal("early expiry", early, err)
+			}
+			var settled sessions.EnvironmentInputReservation
+			if terminal == sessions.EnvironmentInputExpired {
+				passDeadline(t, pool, pending.ID)
+				settled, err = operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), pending.ID)
+			} else {
+				settled, err = cancelPending(ctx, pool, store, tenant, session, pending.ID)
+			}
+			if err != nil || settled.State != terminal || settled.SettledAt == nil || len(settled.Receipts) != 0 {
+				t.Fatal("terminal settlement", settled, err)
+			}
+			retry, err := service.ReserveEnvironmentInput(ctx, text(tenant), text(session), "pending", pending.Inputs)
+			if err != nil || retry.State != terminal || retry.ID != pending.ID || !retry.Deadline.Equal(settled.Deadline) || !retry.SettledAt.Equal(*settled.SettledAt) {
+				t.Fatal("terminal retry changed outcome", retry, err)
+			}
+			if _, err := service.SubmitInputs(ctx, text(tenant), text(session), "pending", pending.Inputs); !errors.Is(err, sessions.ErrTurnConflict) {
+				t.Fatal("terminal request reopened through direct path", err)
+			}
+			if _, err := service.SubmitInputs(ctx, text(tenant), text(session), "pending", []sessions.Input{messageInput("changed")}); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+				t.Fatal("terminal identity changed", err)
+			}
+			later := reserve(t, service, tenant, session, "later")
+			// Cancellation takes whatever input is pending, so only the
+			// settlements that name the reservation run against it here.
+			for _, finish := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){
+				operations.PromoteEnvironmentInput, service.ExpireEnvironmentInput,
+			} {
+				got, err := finish(ctx, text(tenant), text(session), pending.ID)
+				if err != nil || got.State != terminal {
+					t.Fatal("old settlement changed", got, err)
+				}
+			}
+			got, err := store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), later.ID)
+			if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(later.Deadline) {
+				t.Fatal("old settlement touched successor", got, err)
+			}
+			environmentInputHistory(t, pool, session, 0, 0)
+		})
+	}
+}
+
+// A promotion that fails part way leaves no Turn, input, Item, claim or
+// settlement, and its retry promotes the reservation whole.
+func TestEnvironmentInputPromotionRollsBackHistoryAndSettlement(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	for _, phase := range []string{"input", "settlement", "claim", "claim-event"} {
+		t.Run(phase, func(t *testing.T) {
+			tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+			ctx := t.Context()
+			pending := reserve(t, service, tenant, session, "pending")
+			name := "reservation_failure_" + strings.ReplaceAll(uuid.NewString(), "-", "")
+			table, expression := "turn_inputs", "session_id <> '"+text(session)+"'::uuid OR payload->>'text' <> 'second'"
+			switch phase {
+			case "settlement":
+				table, expression = "environment_input_reservations", "id <> '"+pending.ID+"'::uuid OR state <> 'admitted'"
+			case "claim":
+				table, expression = "turns", "session_id <> '"+text(session)+"'::uuid OR status <> 'in_progress'"
+			case "claim-event":
+				table, expression = "session_events", "session_id <> '"+text(session)+"'::uuid OR payload->'event'->>'type' <> 'agent.session.turn.in_progress'"
+			}
+			exec(t, pool, "ALTER TABLE "+table+" ADD CONSTRAINT "+name+" CHECK ("+expression+") NOT VALID")
+			t.Cleanup(func() {
+				_, _ = pool.Exec(context.Background(), "ALTER TABLE "+table+" DROP CONSTRAINT IF EXISTS "+name)
+			})
+			if _, err := operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), pending.ID); err == nil {
+				t.Fatal("injected failure succeeded")
+			}
+			environmentInputHistory(t, pool, session, 0, 0)
+			got, err := store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), pending.ID)
+			if err != nil || got.State != sessions.EnvironmentInputPending || got.SettledAt != nil || !got.Deadline.Equal(pending.Deadline) {
+				t.Fatal("partial settlement survived", got, err)
+			}
+			exec(t, pool, "ALTER TABLE "+table+" DROP CONSTRAINT "+name)
+			got, err = operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), pending.ID)
+			if err != nil || got.State != sessions.EnvironmentInputAdmitted {
+				t.Fatal(got, err)
+			}
+			environmentInputHistory(t, pool, session, 1, 2)
+		})
+	}
+}
+
+// Promotion and failure read the deadline after they take the Session lock,
+// so waiting for the lock never extends the reservation's lifetime.
+func TestEnvironmentInputDeadlineIsCheckedAfterSessionLock(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	for _, action := range []string{"promote", "fail"} {
+		t.Run(action, func(t *testing.T) {
+			tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+			pending := reserve(t, service, tenant, session, "pending")
+			ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
+			defer cancel()
+			blocker, release := lockSession(ctx, t, pool, session)
+			type outcome struct {
+				value sessions.EnvironmentInputReservation
+				err   error
+			}
+			done := make(chan outcome, 1)
+			go func() {
+				var got sessions.EnvironmentInputReservation
+				var err error
+				if action == "promote" {
+					got, err = operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), pending.ID)
+				} else if err = operations.FailEnvironmentInput(ctx, text(tenant), text(session), pending.ID, "runtime_preparation_failed"); err == nil {
+					got, err = store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), pending.ID)
+				}
+				done <- outcome{got, err}
+			}()
+			awaitBlocked(ctx, t, pool, blocker)
+			// Transaction-start time is now older than the controlled deadline.
+			release("UPDATE environment_input_reservations SET deadline=clock_timestamp() WHERE id=$1", pending.ID)
+			result := <-done
+			if result.err != nil || result.value.State != sessions.EnvironmentInputExpired || result.value.SettledAt == nil {
+				t.Fatal("lock wait extended input lifetime", result)
+			}
+			environmentInputHistory(t, pool, session, 0, 0)
+			if state := reservationState(t, store, tenant, session, pending.ID); state != sessions.EnvironmentInputExpired {
+				t.Fatal("expiry was rolled back", state)
+			}
+		})
+	}
+}
+
+// A racing promotion and cancellation agree on one outcome.
+func TestEnvironmentInputCancelAndPromotionShareOneOutcome(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	ctx := t.Context()
+	pending := reserve(t, service, tenant, session, "pending")
+	start := make(chan struct{})
+	results := make(chan sessions.EnvironmentInputReservation, 2)
+	errs := make(chan error, 2)
+	for _, finish := range []func() (sessions.EnvironmentInputReservation, error){
+		func() (sessions.EnvironmentInputReservation, error) {
+			return operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), pending.ID)
+		},
+		func() (sessions.EnvironmentInputReservation, error) {
+			return cancelPending(ctx, pool, store, tenant, session, pending.ID)
+		},
+	} {
+		go func() {
+			<-start
+			got, err := finish()
+			results <- got
+			errs <- err
+		}()
+	}
+	close(start)
+	first, second := <-results, <-results
+	for range 2 {
+		if err := <-errs; err != nil {
+			t.Fatal(err)
+		}
+	}
+	if first.State != second.State || (first.State != sessions.EnvironmentInputAdmitted && first.State != sessions.EnvironmentInputCancelled) {
+		t.Fatal("competing settlements diverged", first.State, second.State)
+	}
+	turns, inputs := 0, 0
+	if first.State == sessions.EnvironmentInputAdmitted {
+		turns, inputs = 1, 2
+	}
+	environmentInputHistory(t, pool, session, turns, inputs)
+}
+
+// Each expiry pass settles at most 32 due reservations and creates no
+// history.
+func TestEnvironmentExpiryBoundsBatch(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	ctx := t.Context()
+	type due struct {
+		tenant, session pgtype.UUID
+		reservation     string
+	}
+	var reservations []due
+	for range 33 {
+		tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+		pending := reserve(t, service, tenant, session, "pending")
+		passDeadline(t, pool, pending.ID)
+		reservations = append(reservations, due{tenant, session, pending.ID})
+	}
+	for _, want := range []int64{32, 1, 0} {
+		n, err := operations.ExpireEnvironmentInputs(ctx)
+		if err != nil || n != want {
+			t.Fatal("unbounded or incomplete batch", n, want, err)
+		}
+	}
+	for _, r := range reservations {
+		if state := reservationState(t, store, r.tenant, r.session, r.reservation); state != sessions.EnvironmentInputExpired {
+			t.Fatal(state)
+		}
+		environmentInputHistory(t, pool, r.session, 0, 0)
+	}
+}
+
+// An execution owner that lost its lease expires nothing; its successor
+// does.
+func TestEnvironmentExpiryFencesLostExecutionOwner(t *testing.T) {
+	pool, store, service, old := leasedInputs(t)
+	tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	pending := reserve(t, service, tenant, session, "pending")
+	passDeadline(t, pool, pending.ID)
+	terminateLeaseOwner(t, pool)
+	successor, _ := sessionExecution(t, pool)
+	if n, err := old.ExpireEnvironmentInputs(t.Context()); err == nil || n != 0 {
+		t.Fatal("lost owner expired input", n, err)
+	}
+	if state := reservationState(t, store, tenant, session, pending.ID); state != sessions.EnvironmentInputPending {
+		t.Fatal("lost owner expired input", state)
+	}
+	if n, err := successor.ExpireEnvironmentInputs(t.Context()); err != nil || n != 1 {
+		t.Fatal("successor could not expire input", n, err)
+	}
+	if state := reservationState(t, store, tenant, session, pending.ID); state != sessions.EnvironmentInputExpired {
+		t.Fatal(state)
+	}
+	environmentInputHistory(t, pool, session, 0, 0)
+}
+
+// Promotion and expiry of a reservation past its deadline, in either order or
+// racing, end with one expired outcome and no history, and leave a newer
+// reservation pending.
+func TestEnvironmentInputPromotionSerializesWithExpiry(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	promote := func(ctx context.Context, tenant, session pgtype.UUID, reservation string) error {
+		got, err := operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), reservation)
+		if err == nil && got.State != sessions.EnvironmentInputExpired {
+			return errors.New("promotion outran expiry: " + got.State)
+		}
+		return err
+	}
+	sweep := func(ctx context.Context, _, _ pgtype.UUID, _ string) error {
+		_, err := operations.ExpireEnvironmentInputs(ctx)
+		return err
+	}
+	expire := func(ctx context.Context, tenant, session pgtype.UUID, reservation string) error {
+		got, err := service.ExpireEnvironmentInput(ctx, text(tenant), text(session), reservation)
+		if err == nil && got.State != sessions.EnvironmentInputExpired {
+			return errors.New("expiry missed its deadline: " + got.State)
+		}
+		return err
+	}
+	type settle func(context.Context, pgtype.UUID, pgtype.UUID, string) error
+	for name, actions := range map[string][]settle{
+		"sweep-then-promote": {sweep, promote},
+		"promote-then-sweep": {promote, sweep},
+		"racing-sweep":       {sweep, promote},
+		"racing-expire":      {expire, promote},
+	} {
+		t.Run(name, func(t *testing.T) {
+			tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+			ctx := t.Context()
+			pending := reserve(t, service, tenant, session, "pending")
+			passDeadline(t, pool, pending.ID)
+			if strings.HasPrefix(name, "racing") {
+				start := make(chan struct{})
+				errs := make(chan error, len(actions))
+				for _, action := range actions {
+					go func() { <-start; errs <- action(ctx, tenant, session, pending.ID) }()
+				}
+				close(start)
+				for range actions {
+					if err := <-errs; err != nil {
+						t.Fatal(err)
+					}
+				}
+			} else {
+				for _, action := range actions {
+					if err := action(ctx, tenant, session, pending.ID); err != nil {
+						t.Fatal(err)
+					}
+				}
+			}
+			if state := reservationState(t, store, tenant, session, pending.ID); state != sessions.EnvironmentInputExpired {
+				t.Fatal("invalid competing settlement", state)
+			}
+			environmentInputHistory(t, pool, session, 0, 0)
+			later := reserve(t, service, tenant, session, "later")
+			for _, action := range []settle{promote, expire, sweep} {
+				if err := action(ctx, tenant, session, pending.ID); err != nil {
+					t.Fatal("old reservation changed", err)
+				}
+			}
+			got, err := store.GetEnvironmentInputReservation(ctx, text(tenant), text(session), later.ID)
+			if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(later.Deadline) {
+				t.Fatal("old settlement affected successor", got, err)
+			}
+		})
+	}
+}
+
+// Concurrent promotions claim one Turn once: one fresh admission, one claim
+// event after the admission's, and a retry after the Turn ends publishes
+// nothing.
+func TestEnvironmentInputConcurrentPromotionClaimsOnce(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	pending := reserve(t, service, tenant, session, "pending")
+	before, _ := journal(t, pool, session)
+	const count = 8
+	results := make(chan sessions.EnvironmentInputReservation, count)
+	var group sync.WaitGroup
+	for range count {
+		group.Go(func() {
+			got, err := operations.PromoteEnvironmentInput(t.Context(), text(tenant), text(session), pending.ID)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			results <- got
+		})
+	}
+	group.Wait()
+	close(results)
+	var turnID string
+	fresh, received := 0, 0
+	for got := range results {
+		received++
+		if got.State != sessions.EnvironmentInputAdmitted || len(got.Receipts) != 2 {
+			t.Fatal("promotion lost the original batch", got)
+		}
+		if turnID == "" {
+			turnID = got.Receipts[0].TurnID
+		}
+		if !got.Receipts[0].Replayed {
+			fresh++
+		}
+		for _, receipt := range got.Receipts {
+			if receipt.TurnID != turnID || receipt.Replayed != got.Receipts[0].Replayed {
+				t.Fatal("promotion changed execution ownership", got.Receipts)
+			}
+		}
+	}
+	if received != count || fresh != 1 {
+		t.Fatal("promotion authorized multiple starts", received, fresh)
+	}
+	turn, err := store.GetTurn(t.Context(), text(tenant), text(session), turnID)
+	if err != nil || turn.Status != sessions.TurnInProgress || turn.StartedAt.IsZero() {
+		t.Fatal("promotion did not persist its execution claim", turn, err)
+	}
+	environmentInputHistory(t, pool, session, 1, 2)
+	_, changes := journal(t, pool, session)
+	changes = changes[len(before):]
+	if len(changes) < 2 {
+		t.Fatal("missing promotion events", kinds(changes))
+	}
+	created, claimed := changes[0], changes[len(changes)-1]
+	if created.Event.Type != "agent.session.turn.created" || created.Turn == nil || created.Turn.Status != sessions.TurnQueued || claimed.Event.Type != "agent.session.turn.in_progress" || claimed.Turn == nil || claimed.Turn.ID != turnID || claimed.Turn.Status != sessions.TurnInProgress {
+		t.Fatal("claim reordered or replaced admission snapshots", kinds(changes))
+	}
+	claims := 0
+	for _, change := range changes {
+		if change.Event.Type == "agent.session.turn.in_progress" {
+			claims++
+		}
+	}
+	if claims != 1 {
+		t.Fatal("retry published another claim", claims)
+	}
+	move(t, pool, tenant, session, turnID, sessions.TurnInProgress, sessions.TurnCompleted)
+	later := reserve(t, service, tenant, session, "later")
+	cursor, _ := journal(t, pool, session)
+	retry, err := operations.PromoteEnvironmentInput(t.Context(), text(tenant), text(session), pending.ID)
+	if err != nil || len(retry.Receipts) != 2 || !retry.Receipts[0].Replayed || retry.Receipts[0].TurnID != turnID {
+		t.Fatal("terminal retry reclaimed execution", retry, err)
+	}
+	if after, _ := journal(t, pool, session); !reflect.DeepEqual(after, cursor) {
+		t.Fatal("terminal retry published events", after, cursor)
+	}
+	retained, err := store.GetEnvironmentInputReservation(t.Context(), text(tenant), text(session), later.ID)
+	if err != nil || retained.State != sessions.EnvironmentInputPending || !retained.Deadline.Equal(later.Deadline) {
+		t.Fatal("old promotion affected new preparation", retained, err)
+	}
+}
+
+// Promotion and preparation failure from a closed lease or a lost execution
+// owner write nothing; the successor settles both.
+func TestEnvironmentInputSettlementUsesCurrentExecutionOwner(t *testing.T) {
+	pool := pgtest.OpenIsolated(t, nil)
+	store, service := stagingService(t, pool)
+	promoteTenant, promoteSession, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	failTenant, failSession, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	promoted := reserve(t, service, promoteTenant, promoteSession, "pending")
+	failed := reserve(t, service, failTenant, failSession, "pending")
+	settle := func(operations *sessions.ExecutionOperations) (error, error) {
+		_, promoteErr := operations.PromoteEnvironmentInput(t.Context(), text(promoteTenant), text(promoteSession), promoted.ID)
+		return promoteErr, operations.FailEnvironmentInput(t.Context(), text(failTenant), text(failSession), failed.ID, "runtime_preparation_failed")
+	}
+	unsettled := func() {
+		t.Helper()
+		environmentInputHistory(t, pool, promoteSession, 0, 0)
+		environmentInputHistory(t, pool, failSession, 0, 0)
+		if reservationState(t, store, promoteTenant, promoteSession, promoted.ID) != sessions.EnvironmentInputPending || reservationState(t, store, failTenant, failSession, failed.ID) != sessions.EnvironmentInputPending {
+			t.Fatal("fenced owner settled input")
+		}
+	}
+	closed, lease := sessionExecution(t, pool)
+	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, pool)
+	if err := lease.Close(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	awaitRelease()
+	if promoteErr, failErr := settle(closed); !errors.Is(promoteErr, pgunit.ErrLeaseClosed) || !errors.Is(failErr, pgunit.ErrLeaseClosed) {
+		t.Fatal("closed lease settled input", promoteErr, failErr)
+	}
+	unsettled()
+	stale, _ := sessionExecution(t, pool)
+	terminateLeaseOwner(t, pool)
+	successor, _ := sessionExecution(t, pool)
+	if promoteErr, failErr := settle(stale); promoteErr == nil || failErr == nil {
+		t.Fatal("stale owner settled input", promoteErr, failErr)
+	}
+	unsettled()
+	if promoteErr, failErr := settle(successor); promoteErr != nil || failErr != nil {
+		t.Fatal("successor could not settle", promoteErr, failErr)
+	}
+	environmentInputHistory(t, pool, promoteSession, 1, 2)
+	environmentInputHistory(t, pool, failSession, 0, 0)
+	if reservationState(t, store, promoteTenant, promoteSession, promoted.ID) != sessions.EnvironmentInputAdmitted || reservationState(t, store, failTenant, failSession, failed.ID) != sessions.EnvironmentInputFailed {
+		t.Fatal("successor settlement")
+	}
+}
+
+// Input reserved while the active Turn completes serializes with the
+// completion: input first joins the Turn and blocks completion until applied;
+// completion first leaves the input pending for its own Turn.
+func TestEnvironmentActiveInputSerializesWithCompletion(t *testing.T) {
+	pool, _, service, operations := leasedInputs(t)
+	for _, completionFirst := range []bool{false, true} {
+		name := "input-first"
+		if completionFirst {
+			name = "completion-first"
+		}
+		t.Run(name, func(t *testing.T) {
+			tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+			original := submitMessage(t, service, tenant, session, "original")
+			move(t, pool, tenant, session, original.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
+			ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
+			defer cancel()
+			blocker, release := lockSession(ctx, t, pool, session)
+			type admission struct {
+				value sessions.EnvironmentInputReservation
+				err   error
+			}
+			admitted := make(chan admission, 1)
+			completed := make(chan error, 1)
+			input := func() {
+				value, err := service.ReserveEnvironmentInput(ctx, text(tenant), text(session), "racing-input", reservedBatch)
+				admitted <- admission{value, err}
+			}
+			complete := func() {
+				_, err := operations.CompleteExecution(ctx, text(tenant), text(session), original.TurnID, sessions.TurnCompleted, nil, "", original.Sequence)
+				completed <- err
+			}
+			first, second := input, complete
+			if completionFirst {
+				first, second = complete, input
+			}
+			go first()
+			firstPID := awaitBlocked(ctx, t, pool, blocker)
+			go second()
+			awaitBlocked(ctx, t, pool, firstPID)
+			release("")
+			got, completionErr := <-admitted, <-completed
+			if got.err != nil {
+				t.Fatal(got.err)
+			}
+			if completionFirst {
+				if completionErr != nil || got.value.State != sessions.EnvironmentInputPending || got.value.ID == "" || len(got.value.Receipts) != 0 || got.value.Deadline.Sub(got.value.CreatedAt) != 5*time.Minute {
+					t.Fatal("completion winner did not leave new input waiting for preparation", completionErr, got.value)
+				}
+				environmentInputHistory(t, pool, session, 1, 1)
+				prepared, err := operations.PromoteEnvironmentInput(ctx, text(tenant), text(session), got.value.ID)
+				if err != nil || len(prepared.Receipts) != 2 || prepared.Receipts[0].TurnID == original.TurnID {
+					t.Fatal("prepared successor reused terminal work", err)
+				}
+				retry, err := service.ReserveEnvironmentInput(ctx, text(tenant), text(session), "racing-input", reservedBatch)
+				if err != nil || retry.ID != got.value.ID || !retry.Deadline.Equal(got.value.Deadline) || len(retry.Receipts) != 2 || !retry.Receipts[0].Replayed || retry.Receipts[0].TurnID != prepared.Receipts[0].TurnID {
+					t.Fatal("active retry replaced its original reservation", retry, err)
+				}
+				if _, err := operations.CompleteExecution(ctx, text(tenant), text(session), prepared.Receipts[0].TurnID, sessions.TurnCompleted, nil, "", prepared.Receipts[1].Sequence); err != nil {
+					t.Fatal(err)
+				}
+			} else {
+				if !errors.Is(completionErr, sessions.ErrUnappliedInputs) || got.value.State != sessions.EnvironmentInputAdmitted || got.value.ID != "" || !got.value.Deadline.IsZero() || len(got.value.Receipts) != 2 || got.value.Receipts[0].TurnID != original.TurnID || got.value.Receipts[0].Replayed {
+					t.Fatal("admitted input escaped the original Turn or application fence", completionErr, got.value)
+				}
+				environmentInputHistory(t, pool, session, 1, 3)
+				if _, err := operations.CompleteExecution(ctx, text(tenant), text(session), original.TurnID, sessions.TurnCompleted, nil, "", got.value.Receipts[1].Sequence); err != nil {
+					t.Fatal("completion after controlled application failed", err)
+				}
+			}
+		})
+	}
+}
+
+// A late preparation failure leaves a cancelled reservation and a newer one
+// as they are, and takes only classified codes.
+func TestPreparationFailurePreservesCancelledAndNewerInput(t *testing.T) {
+	pool, store, service, operations := leasedInputs(t)
+	tenant, session, _ := newEnvironment(t, pool, "self_hosted", "pending")
+	first := reserve(t, service, tenant, session, "cancelled")
+	if _, err := cancelPending(t.Context(), pool, store, tenant, session, first.ID); err != nil {
+		t.Fatal(err)
+	}
+	next := reserve(t, service, tenant, session, "new")
+	if err := operations.FailEnvironmentInput(t.Context(), text(tenant), text(session), first.ID, "runtime_preparation_failed"); err != nil {
+		t.Fatal(err)
+	}
+	for id, state := range map[string]string{first.ID: sessions.EnvironmentInputCancelled, next.ID: sessions.EnvironmentInputPending} {
+		if current := reservationState(t, store, tenant, session, id); current != state {
+			t.Fatal("late failure changed another outcome", id, current)
+		}
+	}
+	if err := operations.FailEnvironmentInput(t.Context(), text(tenant), text(session), next.ID, "secret-canary"); !errors.Is(err, sessions.ErrInvalidInput) {
+		t.Fatal("unclassified diagnostic accepted", err)
+	}
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/inputs.go b/services/core/internal/persistence/postgres/sessionpg/inputs.go
new file mode 100644
index 000000000..37e764773
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/inputs.go
@@ -0,0 +1,247 @@
+package sessionpg
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+var (
+	_ sessions.InputTx     = (*SessionTx)(nil)
+	_ sessions.InputReader = (*Store)(nil)
+)
+
+func (s *Store) WithInputs(ctx context.Context, tenant, session string, apply func(context.Context, sessions.InputTx) error) error {
+	return withInputs(ctx, s.units, tenant, session, apply)
+}
+
+// withInputs runs apply on runner in the Session transaction of the tenant's
+// visible Session. A malformed tenant is sessions.ErrInvalidInput; a malformed
+// Session ID resolves as a missing Session.
+func withInputs(ctx context.Context, runner pgunit.Transactor, tenantID, sessionID string, apply func(context.Context, sessions.InputTx) error) error {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return err
+	}
+	session := pgunit.PathID(sessionID)
+	return WithSession(ctx, runner, tenant, session, func(ctx context.Context, q *sqlc.Queries, locked sessions.LockedSession) error {
+		if err := locked.Public(); err != nil {
+			return err
+		}
+		return apply(ctx, BindSession(q, tenant, session))
+	})
+}
+
+func (t *SessionTx) CreateTurn(ctx context.Context) (sessions.Turn, error) {
+	row, err := t.q.CreateTurn(ctx, sqlc.CreateTurnParams{ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, SessionID: t.session})
+	if err != nil {
+		return sessions.Turn{}, err
+	}
+	return TurnFromRow(row), nil
+}
+
+func (t *SessionTx) CreateTurnInput(ctx context.Context, turn, key string, position int32, input sessions.Input) (int64, error) {
+	var id pgtype.UUID
+	if turn != "" {
+		var err error
+		if id, err = parseID(turn); err != nil {
+			return 0, err
+		}
+	}
+	sequence, err := t.q.CreateTurnInput(ctx, sqlc.CreateTurnInputParams{
+		SessionID: t.session, TurnID: id, IdempotencyKey: key, Kind: input.Kind, Payload: input.Payload, BatchPosition: position,
+	})
+	return sequence, storable(err)
+}
+
+func (t *SessionTx) LoadInputBatch(ctx context.Context, key string, batch json.RawMessage) ([]sessions.InputReceipt, bool, error) {
+	rows, err := t.q.FindInputBatch(ctx, sqlc.FindInputBatchParams{SessionID: t.session, IdempotencyKey: key, Batch: batch})
+	if err != nil {
+		return nil, false, storable(err)
+	}
+	receipts := make([]sessions.InputReceipt, 0, len(rows))
+	matches := true
+	for _, row := range rows {
+		matches = matches && row.Matches
+		receipts = append(receipts, sessions.InputReceipt{Sequence: row.Sequence, TurnID: uuidString(row.TurnID), Replayed: true})
+	}
+	return receipts, matches, nil
+}
+
+func (t *SessionTx) LoadInputGate(ctx context.Context, key string, batch json.RawMessage) (sessions.InputGate, error) {
+	gate, err := t.q.CheckEnvironmentInputGate(ctx, sqlc.CheckEnvironmentInputGateParams{SessionID: t.session, IdempotencyKey: key, Batch: batch})
+	return sessions.InputGate{Matches: gate.Matches, Blocked: gate.Blocked}, storable(err)
+}
+
+func (t *SessionTx) FindInputReservation(ctx context.Context, key string, batch json.RawMessage) (*sessions.EnvironmentInputReservation, bool, error) {
+	row, err := t.q.FindEnvironmentInputReservation(ctx, sqlc.FindEnvironmentInputReservationParams{SessionID: t.session, IdempotencyKey: key, Batch: batch})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return nil, false, nil
+	}
+	if err != nil {
+		return nil, false, storable(err)
+	}
+	if !row.Matches {
+		return nil, true, nil
+	}
+	reservation, err := t.reservationFromRow(ctx, row.EnvironmentInputReservation)
+	if err != nil {
+		return nil, false, err
+	}
+	return &reservation, true, nil
+}
+
+func (t *SessionTx) LoadInputReservation(ctx context.Context, reservation string) (sessions.EnvironmentInputReservation, error) {
+	id, err := parseID(reservation)
+	if err != nil {
+		return sessions.EnvironmentInputReservation{}, err
+	}
+	row, err := t.q.GetEnvironmentInputReservation(ctx, sqlc.GetEnvironmentInputReservationParams{SessionID: t.session, ID: id})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.EnvironmentInputReservation{}, sessions.ErrNotFound
+	}
+	if err != nil {
+		return sessions.EnvironmentInputReservation{}, err
+	}
+	return t.reservationFromRow(ctx, row)
+}
+
+// reservationFromRow maps a stored Environment input reservation; an
+// admitted one carries the receipts of its batch, which it must have.
+func (t *SessionTx) reservationFromRow(ctx context.Context, row sqlc.EnvironmentInputReservation) (sessions.EnvironmentInputReservation, error) {
+	result := sessions.EnvironmentInputReservation{
+		ID: uuid.UUID(row.ID.Bytes).String(), SessionID: uuid.UUID(row.SessionID.Bytes).String(), Key: row.IdempotencyKey,
+		State: row.State, IsInitial: row.IsInitial, CreatedAt: row.CreatedAt.Time, Deadline: row.Deadline.Time,
+	}
+	if row.SettledAt.Valid {
+		result.SettledAt = &row.SettledAt.Time
+	}
+	if err := json.Unmarshal(row.Batch, &result.Inputs); err != nil {
+		return sessions.EnvironmentInputReservation{}, fmt.Errorf("decode Environment input: %w", err)
+	}
+	if row.State != sessions.EnvironmentInputAdmitted {
+		return result, nil
+	}
+	receipts, matches, err := t.LoadInputBatch(ctx, row.IdempotencyKey, row.Batch)
+	if err != nil {
+		return sessions.EnvironmentInputReservation{}, err
+	}
+	if len(receipts) == 0 || !matches {
+		return sessions.EnvironmentInputReservation{}, errors.New("admitted Environment input has no receipts of its batch")
+	}
+	result.Receipts = receipts
+	return result, nil
+}
+
+func (t *SessionTx) CreateInputReservation(ctx context.Context, key string, batch json.RawMessage) (sessions.EnvironmentInputReservation, error) {
+	row, err := t.q.CreateEnvironmentInputReservation(ctx, sqlc.CreateEnvironmentInputReservationParams{
+		ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, SessionID: t.session, IdempotencyKey: key, Batch: batch,
+	})
+	if err != nil {
+		return sessions.EnvironmentInputReservation{}, storable(err)
+	}
+	return t.reservationFromRow(ctx, row)
+}
+
+func (t *SessionTx) ExpireInputReservation(ctx context.Context, reservation string) error {
+	id, err := parseID(reservation)
+	if err != nil {
+		return err
+	}
+	return t.q.ExpireEnvironmentInputReservation(ctx, sqlc.ExpireEnvironmentInputReservationParams{SessionID: t.session, ID: id})
+}
+
+func (t *SessionTx) AdmitInputReservation(ctx context.Context, reservation string) (time.Time, error) {
+	id, err := parseID(reservation)
+	if err != nil {
+		return time.Time{}, err
+	}
+	row, err := t.q.SettleEnvironmentInputReservation(ctx, sqlc.SettleEnvironmentInputReservationParams{SessionID: t.session, ID: id, State: sessions.EnvironmentInputAdmitted})
+	if err != nil {
+		return time.Time{}, err
+	}
+	return row.SettledAt.Time, nil
+}
+
+func (t *SessionTx) FailInputReservation(ctx context.Context, reservation, code string) error {
+	id, err := parseID(reservation)
+	if err != nil {
+		return err
+	}
+	_, err = t.q.FailEnvironmentInput(ctx, sqlc.FailEnvironmentInputParams{SessionID: t.session, ID: id, FailureCode: pgtype.Text{String: code, Valid: true}})
+	return err
+}
+
+func (t *SessionTx) RecordInputAudit(ctx context.Context) error {
+	return auditpg.RecordWriteAudit(ctx, t.q, optionalID(t.tenant), "send_events", "session", optionalID(t.session), "")
+}
+
+func (s *Store) ListTurnInputs(ctx context.Context, tenant, session, turn string, after int64, limit int) ([]sessions.TurnInput, error) {
+	params, err := TurnLookup(tenant, session, turn)
+	if err != nil {
+		return nil, err
+	}
+	if after < 0 || limit < 1 || limit > 100 {
+		return nil, fmt.Errorf("%w: nonnegative cursor and page size 1..100 required", sessions.ErrInvalidInput)
+	}
+	if _, err := s.GetTurn(ctx, tenant, session, turn); err != nil {
+		return nil, err
+	}
+	rows, err := s.units.Queries().ListTurnInputs(ctx, sqlc.ListTurnInputsParams{
+		TenantID: params.TenantID, SessionID: params.SessionID, TurnID: params.ID, Sequence: after, Limit: int32(limit),
+	})
+	if err != nil {
+		return nil, fmt.Errorf("list turn inputs: %w", err)
+	}
+	inputs := make([]sessions.TurnInput, 0, len(rows))
+	for _, row := range rows {
+		inputs = append(inputs, sessions.TurnInput{Sequence: row.Sequence, Kind: row.Kind, Payload: row.Payload, CreatedAt: row.CreatedAt.Time})
+	}
+	return inputs, nil
+}
+
+func (s *Store) GetEnvironmentInputReservation(ctx context.Context, tenantID, sessionID, reservationID string) (sessions.EnvironmentInputReservation, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return sessions.EnvironmentInputReservation{}, err
+	}
+	session := pgunit.PathID(sessionID)
+	var reservation sessions.EnvironmentInputReservation
+	err = s.units.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		if err := visibleSession(ctx, q, tenant, session); err != nil {
+			return err
+		}
+		var err error
+		reservation, err = BindSession(q, tenant, session).LoadInputReservation(ctx, reservationID)
+		return err
+	})
+	return reservation, err
+}
+
+func (s *Store) ListEnvironmentInputWork(ctx context.Context, after string, connectedDevices []string) ([]sessions.EnvironmentInputWork, error) {
+	id, devices, err := executionWorkCursor(after, connectedDevices)
+	if err != nil {
+		return nil, err
+	}
+	rows, err := s.units.Queries().ListEnvironmentInputWork(ctx, sqlc.ListEnvironmentInputWorkParams{AfterID: id, ConnectedDevices: devices})
+	if err != nil {
+		return nil, err
+	}
+	work := make([]sessions.EnvironmentInputWork, 0, len(rows))
+	for _, row := range rows {
+		work = append(work, sessions.EnvironmentInputWork{TenantID: uuid.UUID(row.TenantID.Bytes).String(), SessionID: uuid.UUID(row.SessionID.Bytes).String(), ReservationID: uuid.UUID(row.ID.Bytes).String()})
+	}
+	return work, nil
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/inputs_test.go b/services/core/internal/persistence/postgres/sessionpg/inputs_test.go
new file mode 100644
index 000000000..e2f9e1b2f
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/inputs_test.go
@@ -0,0 +1,521 @@
+package sessionpg
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+	"sync"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+var messagePayload = json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"hello"}]}]}`)
+
+var cancelInput = sessions.Input{Kind: "cancel", Payload: json.RawMessage(`{}`)}
+
+func messageInput(text string) sessions.Input {
+	payload, _ := json.Marshal(map[string]string{"text": text})
+	return sessions.Input{Kind: "message", Payload: payload}
+}
+
+// newSession stores a fresh tenant's idle Session without an Environment and
+// returns their IDs.
+func newSession(t *testing.T, pool *pgxpool.Pool) (pgtype.UUID, pgtype.UUID) {
+	t.Helper()
+	tenant, session := uuid.New(), uuid.New()
+	exec(t, pool, `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash) VALUES ($1, $2, 'codex', 'key', 'hash')`, session, tenant)
+	return pgID(tenant), pgID(session)
+}
+
+// submit admits one input through the Session service.
+func submit(ctx context.Context, service *sessions.Service, tenant, session pgtype.UUID, key string, input sessions.Input) (sessions.InputReceipt, error) {
+	receipts, err := service.SubmitInputs(ctx, text(tenant), text(session), key, []sessions.Input{input})
+	if err != nil {
+		return sessions.InputReceipt{}, err
+	}
+	return receipts[0], nil
+}
+
+func submitMessage(t *testing.T, service *sessions.Service, tenant, session pgtype.UUID, key string) sessions.InputReceipt {
+	t.Helper()
+	receipt, err := submit(t.Context(), service, tenant, session, key, sessions.Input{Kind: "message", Payload: messagePayload})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return receipt
+}
+
+func move(t *testing.T, pool *pgxpool.Pool, tenant, session pgtype.UUID, turn, from, to string) sessions.Turn {
+	t.Helper()
+	moved, err := transition(t.Context(), pool, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return moved
+}
+
+// Concurrent messages from two pools all join one Turn, and concurrent retries
+// of one key commit one input.
+func TestConcurrentInputsUseOneTurnAndOneRetryReceipt(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := stagingService(t, pool)
+	_, other := stagingService(t, pgtest.Open(t))
+	tenant, session := newSession(t, pool)
+	const count = 8
+	for _, repeatedKey := range []bool{true, false} {
+		t.Run(fmt.Sprintf("repeated-key-%v", repeatedKey), func(t *testing.T) {
+			var wg sync.WaitGroup
+			receipts := make(chan sessions.InputReceipt, count)
+			errs := make(chan error, count)
+			for i := range count {
+				wg.Go(func() {
+					key := "same"
+					if !repeatedKey {
+						key = fmt.Sprintf("distinct-%d", i)
+					}
+					admission := service
+					if i%2 == 0 {
+						admission = other
+					}
+					r, err := submit(t.Context(), admission, tenant, session, key, sessions.Input{Kind: "message", Payload: messagePayload})
+					receipts <- r
+					errs <- err
+				})
+			}
+			wg.Wait()
+			close(receipts)
+			close(errs)
+			for err := range errs {
+				if err != nil {
+					t.Fatal(err)
+				}
+			}
+			turns, sequences := map[string]bool{}, map[int64]bool{}
+			newReceipts := 0
+			for r := range receipts {
+				turns[r.TurnID], sequences[r.Sequence] = true, true
+				if !r.Replayed {
+					newReceipts++
+				}
+			}
+			want := count
+			if repeatedKey {
+				want = 1
+			}
+			if len(turns) != 1 || turns[""] || len(sequences) != want || newReceipts != want {
+				t.Fatalf("turns=%v sequences=%v new=%d", turns, sequences, newReceipts)
+			}
+		})
+	}
+	first := submitMessage(t, service, tenant, session, "same")
+	inputs, err := store.ListTurnInputs(t.Context(), text(tenant), text(session), first.TurnID, 0, 100)
+	if err != nil || len(inputs) != count+1 {
+		t.Fatalf("lost or duplicated inputs: %d, %v", len(inputs), err)
+	}
+}
+
+// An active Turn takes steering input, retries replay their receipts across a
+// restart, an idle Session starts a new Turn, and admission changes no stored
+// Session field besides its event sequence.
+func TestTurnInputRetriesAndRestart(t *testing.T) {
+	pool := pgtest.Open(t)
+	_, service := stagingService(t, pool)
+	tenant, session := newSession(t, pool)
+	ctx := t.Context()
+	stored := func(pool *pgxpool.Pool) (row string) {
+		if err := pool.QueryRow(ctx, `SELECT (to_jsonb(s) - 'event_sequence')::text FROM sessions s WHERE id = $1`, session).Scan(&row); err != nil {
+			t.Fatal(err)
+		}
+		return row
+	}
+	created := stored(pool)
+	first := submitMessage(t, service, tenant, session, "first")
+	move(t, pool, tenant, session, first.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
+	steer := submitMessage(t, service, tenant, session, "steer")
+	if steer.TurnID != first.TurnID || steer.Sequence <= first.Sequence {
+		t.Fatalf("active message did not steer: %+v", steer)
+	}
+	reordered := json.RawMessage(`{ "input": [{"content":[{"text":"hello","type":"input_text"}],"role":"user"}] }`)
+	retry, err := submit(ctx, service, tenant, session, "first", sessions.Input{Kind: "message", Payload: reordered})
+	if err != nil || !retry.Replayed || retry.Sequence != first.Sequence || retry.TurnID != first.TurnID {
+		t.Fatalf("equivalent retry = %+v, %v", retry, err)
+	}
+	if _, err := submit(ctx, service, tenant, session, "first", messageInput("changed")); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+		t.Fatalf("changed payload accepted: %v", err)
+	}
+	if _, err := submit(ctx, service, tenant, session, "first", cancelInput); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+		t.Fatalf("changed input kind accepted: %v", err)
+	}
+	completed := move(t, pool, tenant, session, first.TurnID, sessions.TurnInProgress, sessions.TurnCompleted)
+	next := submitMessage(t, service, tenant, session, "next")
+	if next.TurnID == first.TurnID {
+		t.Fatal("idle message did not start a new Turn")
+	}
+	pool.Close()
+	reopened := pgtest.Open(t)
+	recovered, restarted := stagingService(t, reopened)
+	retry = submitMessage(t, restarted, tenant, session, "first")
+	if !retry.Replayed || retry.TurnID != first.TurnID || retry.Sequence != first.Sequence {
+		t.Fatalf("restart retry changed target: %+v", retry)
+	}
+	got, err := recovered.GetTurn(ctx, text(tenant), text(session), first.TurnID)
+	if err != nil || !reflect.DeepEqual(got, completed) {
+		t.Fatalf("restart turn: %+v, %v", got, err)
+	}
+	var all []sessions.TurnInput
+	var cursor int64
+	for {
+		page, err := recovered.ListTurnInputs(ctx, text(tenant), text(session), first.TurnID, cursor, 1)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if len(page) == 0 {
+			break
+		}
+		if page[0].Sequence <= cursor || page[0].CreatedAt.IsZero() {
+			t.Fatalf("invalid ordered input: %+v", page)
+		}
+		cursor = page[0].Sequence
+		all = append(all, page...)
+	}
+	if len(all) != 2 || all[0].Sequence != first.Sequence || all[1].Sequence != steer.Sequence {
+		t.Fatalf("recovered inputs = %+v", all)
+	}
+	snapshot, err := recovered.GetSession(ctx, text(tenant), text(session))
+	if err != nil || snapshot.LastTurn == nil || snapshot.LastTurn.ID != next.TurnID || snapshot.LastTurn.Status != sessions.TurnQueued {
+		t.Fatal("latest Session activity did not survive restart", err)
+	}
+	if stored(reopened) != created {
+		t.Fatal("input admission mutated the stored Session")
+	}
+}
+
+// Input admission and Turn reads and writes resolve only the tenant's own
+// Session, and a Turn only within its Session.
+func TestTurnOperationsAreTenantAndSessionScoped(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := stagingService(t, pool)
+	tenant, session := newSession(t, pool)
+	otherTenant, other := newSession(t, pool)
+	ctx := t.Context()
+	first := submitMessage(t, service, tenant, session, "input")
+	for _, scope := range []struct{ tenant, session pgtype.UUID }{{otherTenant, session}, {tenant, other}, {tenant, pgID(uuid.New())}} {
+		for name, call := range map[string]func() error{
+			"submit": func() error {
+				_, err := submit(ctx, service, scope.tenant, scope.session, "input", sessions.Input{Kind: "message", Payload: messagePayload})
+				return err
+			},
+			"cancel": func() error {
+				_, err := submit(ctx, service, scope.tenant, scope.session, "cancel", cancelInput)
+				return err
+			},
+			"read": func() error {
+				_, err := store.GetTurn(ctx, text(scope.tenant), text(scope.session), first.TurnID)
+				return err
+			},
+			"inputs": func() error {
+				_, err := store.ListTurnInputs(ctx, text(scope.tenant), text(scope.session), first.TurnID, 0, 10)
+				return err
+			},
+			"transition": func() error {
+				_, err := transition(ctx, pool, scope.tenant, scope.session, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed})
+				return err
+			},
+		} {
+			if err := call(); !errors.Is(err, sessions.ErrNotFound) {
+				t.Fatalf("%s escaped scope: %v", name, err)
+			}
+		}
+	}
+	// Turn IDs cannot be used with another valid Session in the same tenant either.
+	second := pgID(uuid.New())
+	exec(t, pool, `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash) VALUES ($1, $2, 'codex', 'second', 'hash')`, second, tenant)
+	if _, err := store.GetTurn(ctx, text(tenant), text(second), first.TurnID); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatalf("cross-session turn read: %v", err)
+	}
+	if _, err := transition(ctx, pool, tenant, second, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed}); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatalf("cross-session turn write: %v", err)
+	}
+	otherInput := submitMessage(t, service, otherTenant, other, "input")
+	if otherInput.TurnID == first.TurnID {
+		t.Fatal("retry identity leaked across Sessions")
+	}
+}
+
+// Batches from two pools keep their inputs adjacent and in order, and one
+// key's concurrent retries commit one batch.
+func TestInputBatchesAreOrderedAndIdempotentAcrossConnections(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := stagingService(t, pool)
+	_, other := stagingService(t, pgtest.Open(t))
+	tenant, session := newSession(t, pool)
+	ctx := t.Context()
+	const count = 8
+	batch := []sessions.Input{messageInput("first"), messageInput("second")}
+	for _, repeated := range []bool{true, false} {
+		var wg sync.WaitGroup
+		receipts := make(chan []sessions.InputReceipt, count)
+		errs := make(chan error, count)
+		for i := range count {
+			wg.Go(func() {
+				admission := service
+				if i%2 == 0 {
+					admission = other
+				}
+				key := "same-batch"
+				if !repeated {
+					key = fmt.Sprintf("batch-%d", i)
+				}
+				got, err := admission.SubmitInputs(ctx, text(tenant), text(session), key, batch)
+				receipts <- got
+				errs <- err
+			})
+		}
+		wg.Wait()
+		close(receipts)
+		close(errs)
+		for err := range errs {
+			if err != nil {
+				t.Fatal(err)
+			}
+		}
+		newBatches := 0
+		for got := range receipts {
+			if len(got) != 2 || got[0].TurnID == "" || got[0].TurnID != got[1].TurnID || got[0].Sequence >= got[1].Sequence || got[0].Replayed != got[1].Replayed {
+				t.Fatalf("invalid batch receipt: %+v", got)
+			}
+			if !got[0].Replayed {
+				newBatches++
+			}
+		}
+		want := count
+		if repeated {
+			want = 1
+		}
+		if newBatches != want {
+			t.Fatalf("accepted %d batches, want %d", newBatches, want)
+		}
+	}
+	got, err := service.SubmitInputs(ctx, text(tenant), text(session), "same-batch", batch)
+	if err != nil {
+		t.Fatal(err)
+	}
+	inputs, err := store.ListTurnInputs(ctx, text(tenant), text(session), got[0].TurnID, 0, 100)
+	if err != nil || len(inputs) != 2*(count+1) {
+		t.Fatalf("inputs=%d err=%v", len(inputs), err)
+	}
+	for i, input := range inputs {
+		var payload map[string]string
+		if err := json.Unmarshal(input.Payload, &payload); err != nil {
+			t.Fatal(err)
+		}
+		want := "first"
+		if i%2 == 1 {
+			want = "second"
+		}
+		if payload["text"] != want {
+			t.Fatalf("batch interleaved at %d: %v", i, payload)
+		}
+	}
+}
+
+// A batch retry compares the whole normalized request and replays the
+// cancellation targets it committed, after a restart too.
+func TestBatchRetriesCompareTheWholeRequestAndRetainTargets(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := stagingService(t, pool)
+	tenant, session := newSession(t, pool)
+	ctx := t.Context()
+	batch := []sessions.Input{cancelInput, messageInput("one"), cancelInput, messageInput("two")}
+	first, err := service.SubmitInputs(ctx, text(tenant), text(session), "mixed", batch)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if first[0].TurnID != "" || first[1].TurnID == "" || first[1].TurnID != first[2].TurnID || first[1].TurnID == first[3].TurnID {
+		t.Fatalf("cancellation targets: %+v", first)
+	}
+	cancelled, err := store.GetTurn(ctx, text(tenant), text(session), first[1].TurnID)
+	if err != nil || cancelled.Status != sessions.TurnCancelled {
+		t.Fatalf("cancelled turn=%+v err=%v", cancelled, err)
+	}
+	move(t, pool, tenant, session, first[3].TurnID, sessions.TurnQueued, sessions.TurnInProgress)
+	move(t, pool, tenant, session, first[3].TurnID, sessions.TurnInProgress, sessions.TurnCompleted)
+	next := submitMessage(t, service, tenant, session, "next")
+	for _, changed := range [][]sessions.Input{batch[:3], append(append([]sessions.Input{}, batch...), cancelInput), {batch[0], batch[3], batch[2], batch[1]}} {
+		if _, err := service.SubmitInputs(ctx, text(tenant), text(session), "mixed", changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+			t.Fatalf("changed batch accepted: %v", err)
+		}
+	}
+	batch[1].Payload = json.RawMessage(`{ "text" : "one" }`)
+	pool.Close()
+	restartedStore, restarted := stagingService(t, pgtest.Open(t))
+	retry, err := restarted.SubmitInputs(ctx, text(tenant), text(session), "mixed", batch)
+	for i := range first {
+		first[i].Replayed = true
+	}
+	if err != nil || !reflect.DeepEqual(retry, first) {
+		t.Fatalf("restart changed receipts: %+v, %v", retry, err)
+	}
+	current, err := restartedStore.GetTurn(ctx, text(tenant), text(session), next.TurnID)
+	if err != nil || current.Status != sessions.TurnQueued || !current.CancelRequestedAt.IsZero() {
+		t.Fatalf("retry cancelled later work: %+v, %v", current, err)
+	}
+	if _, err := restarted.SubmitInputs(ctx, uuid.NewString(), text(session), "mixed", batch); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatalf("batch retry escaped tenant: %v", err)
+	}
+}
+
+// A batch that fails part way rolls back its earlier cancellation and inputs,
+// and its retry then commits it whole.
+func TestFailedBatchRollsBackEarlierCancellationAndInputs(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := stagingService(t, pool)
+	tenant, session := newSession(t, pool)
+	ctx := t.Context()
+	initial := submitMessage(t, service, tenant, session, "initial")
+	move(t, pool, tenant, session, initial.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
+	key := uuid.NewString()
+	constraint := "batch_failure_" + strings.ReplaceAll(key, "-", "")
+	// Inject a storage error on the second insert, after cancellation has run.
+	exec(t, pool, "ALTER TABLE turn_inputs ADD CONSTRAINT "+constraint+" CHECK (idempotency_key <> '"+key+"' OR batch_position = 0)")
+	t.Cleanup(func() {
+		_, _ = pool.Exec(context.Background(), "ALTER TABLE turn_inputs DROP CONSTRAINT IF EXISTS "+constraint)
+	})
+	batch := []sessions.Input{cancelInput, messageInput("after cancel")}
+	if got, err := service.SubmitInputs(ctx, text(tenant), text(session), key, batch); err == nil || got != nil {
+		t.Fatalf("partial batch succeeded: %+v %v", got, err)
+	}
+	turn, err := store.GetTurn(ctx, text(tenant), text(session), initial.TurnID)
+	if err != nil || turn.Status != sessions.TurnInProgress || !turn.CancelRequestedAt.IsZero() {
+		t.Fatalf("cancellation escaped rollback: %+v %v", turn, err)
+	}
+	inputs, err := store.ListTurnInputs(ctx, text(tenant), text(session), initial.TurnID, 0, 100)
+	if err != nil || len(inputs) != 1 {
+		t.Fatalf("partial inputs survived: %v %v", inputs, err)
+	}
+	exec(t, pool, "ALTER TABLE turn_inputs DROP CONSTRAINT "+constraint)
+	got, err := service.SubmitInputs(ctx, text(tenant), text(session), key, batch)
+	if err != nil || len(got) != 2 || got[0].Replayed || got[1].Replayed {
+		t.Fatalf("retry after rollback: %+v %v", got, err)
+	}
+}
+
+// A cancel request targets the Turn active when it was admitted, and its retry
+// never retargets a later Turn; cancelling queued work stops it at once.
+func TestCancellationStaysBoundToItsOriginalTurn(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := stagingService(t, pool)
+	tenant, session := newSession(t, pool)
+	ctx := t.Context()
+	idle, err := submit(ctx, service, tenant, session, "idle-cancel", cancelInput)
+	if err != nil || idle.TurnID != "" || idle.Sequence == 0 {
+		t.Fatalf("idle cancellation: %+v, %v", idle, err)
+	}
+	first := submitMessage(t, service, tenant, session, "first")
+	started := move(t, pool, tenant, session, first.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
+	if started.StartedAt.IsZero() || !started.CompletedAt.IsZero() {
+		t.Fatalf("started timestamps: %+v", started)
+	}
+	cancel, err := submit(ctx, service, tenant, session, "cancel", cancelInput)
+	if err != nil || cancel.TurnID != first.TurnID {
+		t.Fatalf("cancellation target: %+v, %v", cancel, err)
+	}
+	pending, err := store.GetTurn(ctx, text(tenant), text(session), first.TurnID)
+	if err != nil || pending.Status != sessions.TurnInProgress || pending.CancelRequestedAt.IsZero() || !pending.CompletedAt.IsZero() {
+		t.Fatalf("running cancellation falsely completed: %+v, %v", pending, err)
+	}
+	move(t, pool, tenant, session, first.TurnID, sessions.TurnInProgress, sessions.TurnCancelled)
+	next := submitMessage(t, service, tenant, session, "next")
+	for key, original := range map[string]sessions.InputReceipt{"cancel": cancel, "idle-cancel": idle} {
+		retry, err := submit(ctx, service, tenant, session, key, cancelInput)
+		if err != nil || !retry.Replayed || retry.TurnID != original.TurnID || retry.Sequence != original.Sequence {
+			t.Fatalf("cancellation retargeted: %+v, %v", retry, err)
+		}
+	}
+	queued, err := store.GetTurn(ctx, text(tenant), text(session), next.TurnID)
+	if err != nil || queued.Status != sessions.TurnQueued || !queued.CancelRequestedAt.IsZero() {
+		t.Fatalf("old cancellation affected later Turn: %+v, %v", queued, err)
+	}
+	if _, err := submit(ctx, service, tenant, session, "cancel-queued", cancelInput); err != nil {
+		t.Fatal(err)
+	}
+	stopped, err := store.GetTurn(ctx, text(tenant), text(session), next.TurnID)
+	if err != nil || stopped.Status != sessions.TurnCancelled || stopped.CompletedAt.IsZero() || !stopped.StartedAt.IsZero() {
+		t.Fatalf("queued work did not stop: %+v, %v", stopped, err)
+	}
+	if _, err := transition(ctx, pool, tenant, session, next.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
+		t.Fatalf("cancelled queued work was started: %v", err)
+	}
+}
+
+// A waiting Turn takes steering input and keeps its start time when it
+// resumes; a cancel request keeps it from resuming.
+func TestWaitingTurnRetainsInputsAndStartTime(t *testing.T) {
+	pool := pgtest.Open(t)
+	_, service := stagingService(t, pool)
+	tenant, session := newSession(t, pool)
+	first := submitMessage(t, service, tenant, session, "first")
+	started := move(t, pool, tenant, session, first.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
+	move(t, pool, tenant, session, first.TurnID, sessions.TurnInProgress, sessions.TurnWaiting)
+	steer := submitMessage(t, service, tenant, session, "steer")
+	if steer.TurnID != first.TurnID {
+		t.Fatal("waiting input started another Turn")
+	}
+	resumed := move(t, pool, tenant, session, first.TurnID, sessions.TurnWaiting, sessions.TurnInProgress)
+	if !started.StartedAt.Equal(resumed.StartedAt) {
+		t.Fatal("resume reset the start time")
+	}
+	move(t, pool, tenant, session, first.TurnID, sessions.TurnInProgress, sessions.TurnWaiting)
+	if _, err := submit(t.Context(), service, tenant, session, "cancel", cancelInput); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := transition(t.Context(), pool, tenant, session, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
+		t.Fatalf("cancelling Turn resumed: %v", err)
+	}
+	move(t, pool, tenant, session, first.TurnID, sessions.TurnWaiting, sessions.TurnCancelled)
+}
+
+// Rejected input and rejected transitions persist nothing.
+func TestTurnInputValidationHasNoSideEffects(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := stagingService(t, pool)
+	tenant, session := newSession(t, pool)
+	ctx := t.Context()
+	for _, raw := range []json.RawMessage{nil, json.RawMessage(`[]`), json.RawMessage(`null`), json.RawMessage(`{} {}`), json.RawMessage(`{"text":"` + string(make([]byte, 512*1024)) + `"}`)} {
+		if _, err := submit(ctx, service, tenant, session, "first", sessions.Input{Kind: "message", Payload: raw}); !errors.Is(err, sessions.ErrInvalidInput) {
+			t.Fatalf("invalid input accepted: %v", err)
+		}
+	}
+	cancelled, stop := context.WithCancel(ctx)
+	stop()
+	if _, err := submit(cancelled, service, tenant, session, "first", sessions.Input{Kind: "message", Payload: messagePayload}); !errors.Is(err, context.Canceled) {
+		t.Fatalf("cancelled context: %v", err)
+	}
+	first := submitMessage(t, service, tenant, session, "first")
+	if first.Replayed {
+		t.Fatal("failed submission persisted a receipt")
+	}
+	for _, input := range []sessions.TurnTransition{
+		{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCompleted},
+		{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnQueued},
+		{ExpectedStatus: sessions.TurnCompleted, Status: sessions.TurnInProgress},
+		{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress, Outcome: json.RawMessage(`{"premature":true}`)},
+	} {
+		if _, err := transition(ctx, pool, tenant, session, first.TurnID, input); !errors.Is(err, sessions.ErrInvalidInput) {
+			t.Fatalf("invalid transition accepted: %v", err)
+		}
+	}
+	got, err := store.GetTurn(ctx, text(tenant), text(session), first.TurnID)
+	if err != nil || got.Status != sessions.TurnQueued || !got.StartedAt.IsZero() {
+		t.Fatalf("invalid transition changed Turn: %+v, %v", got, err)
+	}
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/turn_reads.go b/services/core/internal/persistence/postgres/sessionpg/turn_reads.go
index 9848a68d9..28f96b606 100644
--- a/services/core/internal/persistence/postgres/sessionpg/turn_reads.go
+++ b/services/core/internal/persistence/postgres/sessionpg/turn_reads.go
@@ -72,7 +72,7 @@ func (s *Store) ListTurns(ctx context.Context, tenant, session, cursor string, l
 }
 
 func (s *Store) ListExecutionWork(ctx context.Context, after string, statuses, connectedDevices []string) ([]sessions.ExecutionWork, error) {
-	id, devices, err := ExecutionWorkCursor(after, connectedDevices)
+	id, devices, err := executionWorkCursor(after, connectedDevices)
 	if err != nil {
 		return nil, err
 	}
@@ -87,10 +87,10 @@ func (s *Store) ListExecutionWork(ctx context.Context, after string, statuses, c
 	return work, nil
 }
 
-// ExecutionWorkCursor parses the cursor and connected devices of an execution
+// executionWorkCursor parses the cursor and connected devices of an execution
 // work scan; an empty cursor starts at the first ID. A malformed ID is
 // sessions.ErrInvalidInput.
-func ExecutionWorkCursor(after string, connectedDevices []string) (pgtype.UUID, []pgtype.UUID, error) {
+func executionWorkCursor(after string, connectedDevices []string) (pgtype.UUID, []pgtype.UUID, error) {
 	id := pgtype.UUID{Valid: true}
 	var err error
 	if after != "" {
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index f400a64af..f043ab26d 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -149,7 +149,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		Execution: &api.Execution{
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
 			SessionAdmission: s,
-			InputAdmission:   s,
+			InputAdmission:   struct{ api.InputAdmission }{},
 			SessionArchive:   struct{ api.SessionArchive }{},
 			Workspaces:       struct{ api.EnvironmentWorkspaces }{},
 		},
diff --git a/services/core/internal/sessions/artifacts_test.go b/services/core/internal/sessions/artifacts_test.go
index a31e5b326..b7a45c855 100644
--- a/services/core/internal/sessions/artifacts_test.go
+++ b/services/core/internal/sessions/artifacts_test.go
@@ -192,6 +192,11 @@ func (s *fakeArtifactStorage) DeleteSessionArtifact(context.Context, string, str
 	return nil
 }
 
+func (s *fakeArtifactStorage) WithInputs(context.Context, string, string, func(context.Context, InputTx) error) error {
+	s.t.Fatal("unexpected call to WithInputs")
+	return nil
+}
+
 func (s *fakeArtifactStorage) CreateDevice(context.Context, string, DeviceRegistration) (ExecutionDevice, error) {
 	s.t.Fatal("unexpected call to CreateDevice")
 	return ExecutionDevice{}, nil
diff --git a/services/core/internal/sessions/devices_test.go b/services/core/internal/sessions/devices_test.go
index b8297e341..1976c4769 100644
--- a/services/core/internal/sessions/devices_test.go
+++ b/services/core/internal/sessions/devices_test.go
@@ -45,6 +45,8 @@ type fakeStorage struct {
 	deletion       *fakeTx
 	updateMetadata func(encoded string) (Session, error)
 	auditOperation func() error
+	// inputTx is the transaction WithInputs applies in.
+	inputTx *fakeInputTx
 }
 
 func (s *fakeStorage) record(name string, set bool, detail ...string) {
diff --git a/services/core/internal/sessions/doc.go b/services/core/internal/sessions/doc.go
index e86c58aab..069ef6765 100644
--- a/services/core/internal/sessions/doc.go
+++ b/services/core/internal/sessions/doc.go
@@ -7,12 +7,13 @@
 // The Session writes that several operations share are procedures here, over
 // the transaction interfaces declared beside them: cancelling work, failing
 // and terminating an Environment, tracking input activity, the admission
-// gates, moving a Turn's status, admitting a function result, reading a Turn's
-// required actions, appending to a Turn's execution journal and projecting its
-// observations and admitted inputs into Items, Turn usage and Subagents. Service runs the pooled
-// Session use cases, such as staging a Turn's Artifacts, over Storage, and
-// Reader declares the Session reads. ExecutionOperations runs the Session
-// writes only the execution owner makes, such as moving and completing Turns,
-// recording function calls and their application receipts and journaling a
-// Turn's observations, over the lease-bound ExecutionStorage.
+// gates, admitting an input batch, moving a Turn's status, admitting a function
+// result, reading a Turn's required actions, appending to a Turn's execution
+// journal and projecting its observations and admitted inputs into Items, Turn
+// usage and Subagents. Service runs the pooled Session use cases, such as
+// staging a Turn's Artifacts, over Storage, and Reader declares the Session
+// reads. ExecutionOperations runs the Session writes only the execution owner
+// makes, such as moving and completing Turns, recording function calls and
+// their application receipts and journaling a Turn's observations, over the
+// lease-bound ExecutionStorage.
 package sessions
diff --git a/services/core/internal/sessions/environment.go b/services/core/internal/sessions/environment.go
index 745ecc791..107aa894c 100644
--- a/services/core/internal/sessions/environment.go
+++ b/services/core/internal/sessions/environment.go
@@ -98,6 +98,8 @@ const (
 type EnvironmentInputReservation struct {
 	ID        string
 	SessionID string
+	// Key is the idempotency key the reservation's batch is admitted under.
+	Key       string
 	State     string
 	IsInitial bool
 	Inputs    []Input
diff --git a/services/core/internal/sessions/environment_inputs.go b/services/core/internal/sessions/environment_inputs.go
new file mode 100644
index 000000000..c0b02bee8
--- /dev/null
+++ b/services/core/internal/sessions/environment_inputs.go
@@ -0,0 +1,159 @@
+package sessions
+
+import (
+	"context"
+	"errors"
+)
+
+// checkEnvironmentAcceptsInput admits new input only while the Session's
+// Environment is live: a failed hosted Environment is
+// ErrHostedEnvironmentFailed, and any other failed or expired Environment
+// ErrEnvironmentUnavailable.
+func checkEnvironmentAcceptsInput(environment Environment) error {
+	if environment.Status == "failed" {
+		if kind, err := EnvironmentType(environment.Configuration); err == nil && kind == "openai_hosted" {
+			return ErrHostedEnvironmentFailed
+		}
+	}
+	if environment.Status == "failed" || environment.Status == "expired" {
+		return ErrEnvironmentUnavailable
+	}
+	return nil
+}
+
+// joinsActiveTurn reports whether reserved Environment input joins the
+// Session's active Turn at once instead of waiting for its own Turn: it does
+// while the Turn has not started capturing its Artifacts, whose sealed native
+// input takes nothing more.
+func joinsActiveTurn(turn Turn, active bool) bool {
+	return active && !turn.ArtifactCaptureStarted
+}
+
+// ReserveEnvironmentInput admits a message batch for a Session whose
+// Environment runs it. Under the Session lock it joins the active Turn at once,
+// unless that Turn captures its Artifacts, or otherwise reserves the batch
+// until a deadline, for the execution owner to promote into a new Turn. A
+// retry returns the reservation under its key, expired once its deadline has
+// passed, or the receipts the batch was admitted with. The checks of
+// SubmitInputs apply, and a failed or expired Environment rejects new input.
+func (s *Service) ReserveEnvironmentInput(ctx context.Context, tenant, session, key string, inputs []Input) (EnvironmentInputReservation, error) {
+	if err := ValidateInputKey(key); err != nil {
+		return EnvironmentInputReservation{}, err
+	}
+	batch, encoded, err := ValidateMessageInputs(inputs)
+	if err != nil {
+		return EnvironmentInputReservation{}, err
+	}
+	var result EnvironmentInputReservation
+	err = s.storage.WithInputs(ctx, tenant, session, func(ctx context.Context, tx InputTx) error {
+		return TrackInputActivity(ctx, tx, func(ctx context.Context) error {
+			previous, used, err := tx.FindInputReservation(ctx, key, encoded)
+			if err != nil {
+				return err
+			}
+			replay, err := decideReplay(used, previous != nil)
+			if err != nil {
+				return err
+			}
+			if replay {
+				if result, err = expireReservation(ctx, tx, *previous); err != nil {
+					return err
+				}
+				if result.State == EnvironmentInputPending || result.State == EnvironmentInputAdmitted {
+					return tx.RecordInputAudit(ctx)
+				}
+				return nil
+			}
+			receipts, matches, err := tx.LoadInputBatch(ctx, key, encoded)
+			if err != nil {
+				return err
+			}
+			if replay, err = decideReplay(len(receipts) > 0, matches); err != nil {
+				return err
+			}
+			if replay {
+				// Earlier direct admission has receipts, but never had a reservation or deadline.
+				result = EnvironmentInputReservation{SessionID: session, State: EnvironmentInputAdmitted, Receipts: receipts}
+				return tx.RecordInputAudit(ctx)
+			}
+			if err := CheckFileWriteGate(ctx, tx); err != nil {
+				return err
+			}
+			environment, err := tx.LoadEnvironment(ctx)
+			if errors.Is(err, ErrNotFound) {
+				return ErrInvalidInput
+			}
+			if err != nil {
+				return err
+			}
+			if err := checkEnvironmentAcceptsInput(environment); err != nil {
+				return err
+			}
+			gate, err := tx.LoadInputGate(ctx, key, encoded)
+			if err != nil {
+				return err
+			}
+			if err := checkInputGate(gate); err != nil {
+				return err
+			}
+			turn, active, err := tx.LoadActiveTurn(ctx)
+			if err != nil {
+				return err
+			}
+			if joinsActiveTurn(turn, active) {
+				receipts, err := AdmitInputs(ctx, tx, key, batch)
+				if err != nil {
+					return err
+				}
+				result = EnvironmentInputReservation{SessionID: session, State: EnvironmentInputAdmitted, Receipts: receipts}
+				return tx.RecordInputAudit(ctx)
+			}
+			if result, err = tx.CreateInputReservation(ctx, key, encoded); err != nil {
+				return err
+			}
+			return tx.RecordInputAudit(ctx)
+		})
+	})
+	if err != nil {
+		return EnvironmentInputReservation{}, err
+	}
+	return result, nil
+}
+
+// ExpireEnvironmentInput returns the Session's Environment input reservation,
+// expired first when it is pending and its deadline has passed by the
+// database clock. A malformed reservation ID is ErrInvalidInput, and a missing
+// reservation ErrNotFound.
+func (s *Service) ExpireEnvironmentInput(ctx context.Context, tenant, session, reservation string) (EnvironmentInputReservation, error) {
+	if !validID(reservation) {
+		return EnvironmentInputReservation{}, ErrInvalidInput
+	}
+	var result EnvironmentInputReservation
+	err := s.storage.WithInputs(ctx, tenant, session, func(ctx context.Context, tx InputTx) error {
+		return TrackInputActivity(ctx, tx, func(ctx context.Context) error {
+			current, err := tx.LoadInputReservation(ctx, reservation)
+			if err != nil {
+				return err
+			}
+			result, err = expireReservation(ctx, tx, current)
+			return err
+		})
+	})
+	if err != nil {
+		return EnvironmentInputReservation{}, err
+	}
+	return result, nil
+}
+
+// expireReservation expires a pending reservation whose deadline has passed
+// and returns it as the transaction has left it. A settled one is returned as
+// it is: its outcome is a successful result, so settling never rolls back.
+func expireReservation(ctx context.Context, tx InputTx, reservation EnvironmentInputReservation) (EnvironmentInputReservation, error) {
+	if reservation.State != EnvironmentInputPending {
+		return reservation, nil
+	}
+	if err := tx.ExpireInputReservation(ctx, reservation.ID); err != nil {
+		return EnvironmentInputReservation{}, err
+	}
+	return tx.LoadInputReservation(ctx, reservation.ID)
+}
diff --git a/services/core/internal/sessions/environment_inputs_test.go b/services/core/internal/sessions/environment_inputs_test.go
new file mode 100644
index 000000000..f49fd2aaf
--- /dev/null
+++ b/services/core/internal/sessions/environment_inputs_test.go
@@ -0,0 +1,165 @@
+package sessions
+
+import (
+	"encoding/json"
+	"errors"
+	"reflect"
+	"testing"
+)
+
+const testReservation = "6a1c9e2b-3d4f-4a5b-8c6d-7e8f9a0b1c2d"
+
+// reservations is a fake LoadInputReservation that reads states one call at
+// a time, then the last again.
+func reservations(states ...EnvironmentInputReservation) func() (EnvironmentInputReservation, error) {
+	return func() (EnvironmentInputReservation, error) {
+		state := states[0]
+		if len(states) > 1 {
+			states = states[1:]
+		}
+		return state, nil
+	}
+}
+
+func reservationIn(state string) EnvironmentInputReservation {
+	return EnvironmentInputReservation{ID: testReservation, SessionID: testSession, Key: inputKey, State: state, Inputs: []Input{messageInput("hi")}}
+}
+
+func TestCheckEnvironmentAcceptsInput(t *testing.T) {
+	hosted := json.RawMessage(`{"type":"openai_hosted"}`)
+	for _, test := range []struct {
+		environment Environment
+		want        error
+	}{
+		{selfHosted, nil},
+		{Environment{Status: "failed", Configuration: hosted}, ErrHostedEnvironmentFailed},
+		{Environment{Status: "failed", Configuration: selfHosted.Configuration}, ErrEnvironmentUnavailable},
+		{Environment{Status: "expired", Configuration: hosted}, ErrEnvironmentUnavailable},
+	} {
+		if err := checkEnvironmentAcceptsInput(test.environment); err != test.want {
+			t.Errorf("%s %s: %v", test.environment.Status, test.environment.Configuration, err)
+		}
+	}
+}
+
+func TestJoinsActiveTurn(t *testing.T) {
+	capturing := turnWith(TurnInProgress)
+	capturing.ArtifactCaptureStarted = true
+	if joinsActiveTurn(Turn{}, false) || !joinsActiveTurn(turnWith(TurnInProgress), true) || joinsActiveTurn(capturing, true) {
+		t.Fatal("joins")
+	}
+}
+
+func TestReserveEnvironmentInput(t *testing.T) {
+	const batch = `[{"kind":"message","payload":{"text":"hi"}}]`
+	find := "FindInputReservation request " + batch
+	reserve := func(t *testing.T, tx *fakeInputTx) (EnvironmentInputReservation, error) {
+		tx.loadEnvironmentInput = inputs()
+		return deviceService(t, &fakeStorage{t: t, inputTx: tx}).ReserveEnvironmentInput(t.Context(), testTenant, testSession, inputKey, []Input{messageInput("hi")})
+	}
+	// fresh is a transaction where the key holds no batch yet.
+	fresh := func(t *testing.T) *fakeInputTx {
+		tx := newInputTx(t)
+		tx.findInputReservation = func() (*EnvironmentInputReservation, bool, error) { return nil, false, nil }
+		tx.loadInputBatch = func() ([]InputReceipt, bool, error) { return nil, true, nil }
+		tx.loadPendingFileWrite, tx.loadEnvironment = returns(false), returns(selfHosted)
+		return tx
+	}
+	checked := []string{"LoadEnvironmentInput", find, "LoadInputBatch request " + batch, "LoadPendingFileWrite", "LoadEnvironment"}
+	t.Run("a retry returns its reservation", func(t *testing.T) {
+		for _, test := range []struct {
+			name    string
+			current EnvironmentInputReservation
+			audit   []string
+		}{
+			{"pending", reservationIn(EnvironmentInputPending), []string{"RecordInputAudit"}},
+			{"expired at its deadline", reservationIn(EnvironmentInputExpired), nil},
+		} {
+			t.Run(test.name, func(t *testing.T) {
+				previous := reservationIn(EnvironmentInputPending)
+				tx := newInputTx(t)
+				tx.findInputReservation = func() (*EnvironmentInputReservation, bool, error) { return &previous, true, nil }
+				tx.expireInputReservation, tx.loadInputReservation, tx.recordInputAudit = done, returns(test.current), done
+				result, err := reserve(t, tx)
+				if err != nil || !reflect.DeepEqual(result, test.current) {
+					t.Fatalf("reservation %+v, %v", result, err)
+				}
+				calls := append([]string{"LoadEnvironmentInput", find, "ExpireInputReservation " + testReservation, "LoadInputReservation " + testReservation}, test.audit...)
+				assertCalls(t, tx.fakeTx, append(calls, "LoadEnvironmentInput")...)
+			})
+		}
+	})
+	t.Run("a retry of a direct admission returns its receipts", func(t *testing.T) {
+		previous := []InputReceipt{{Sequence: 3, TurnID: testTurn, Replayed: true}}
+		tx := newInputTx(t)
+		tx.findInputReservation = func() (*EnvironmentInputReservation, bool, error) { return nil, false, nil }
+		tx.loadInputBatch = func() ([]InputReceipt, bool, error) { return previous, true, nil }
+		tx.recordInputAudit = done
+		result, err := reserve(t, tx)
+		if err != nil || !reflect.DeepEqual(result, EnvironmentInputReservation{SessionID: testSession, State: EnvironmentInputAdmitted, Receipts: previous}) {
+			t.Fatalf("reservation %+v, %v", result, err)
+		}
+		assertCalls(t, tx.fakeTx, "LoadEnvironmentInput", find, "LoadInputBatch request "+batch, "RecordInputAudit", "LoadEnvironmentInput")
+	})
+	t.Run("an Environment that no longer runs rejects input", func(t *testing.T) {
+		for _, test := range []struct {
+			name string
+			load func() (Environment, error)
+			want error
+		}{
+			{"failed hosted", returns(Environment{Status: "failed", Configuration: json.RawMessage(`{"type":"openai_hosted"}`)}), ErrHostedEnvironmentFailed},
+			{"expired", returns(Environment{Status: "expired", Configuration: selfHosted.Configuration}), ErrEnvironmentUnavailable},
+			{"missing", func() (Environment, error) { return Environment{}, ErrNotFound }, ErrInvalidInput},
+		} {
+			t.Run(test.name, func(t *testing.T) {
+				tx := fresh(t)
+				tx.loadEnvironment = test.load
+				if _, err := reserve(t, tx); err != test.want {
+					t.Fatal(err)
+				}
+				assertCalls(t, tx.fakeTx, checked...)
+			})
+		}
+	})
+	t.Run("input joins the active Turn", func(t *testing.T) {
+		running := turnWith(TurnInProgress)
+		tx := fresh(t)
+		tx.loadInputGate, tx.loadActiveTurn, tx.createTurnInput, tx.loadInputSource, tx.recordInputAudit = returns(InputGate{Matches: true}), activeTurn(&running), sequences(4), unprojected, done
+		result, err := reserve(t, tx)
+		if err != nil || !reflect.DeepEqual(result, EnvironmentInputReservation{SessionID: testSession, State: EnvironmentInputAdmitted, Receipts: []InputReceipt{{Sequence: 4, TurnID: testTurn}}}) {
+			t.Fatalf("reservation %+v, %v", result, err)
+		}
+		assertCalls(t, tx.fakeTx, append(checked, "LoadInputGate request "+batch, "LoadActiveTurn",
+			"LoadActiveTurn", "CreateTurnInput "+testTurn+" request 0 message", "LoadInputSource 4", "RecordInputAudit", "LoadEnvironmentInput")...)
+	})
+	t.Run("input waits in a reservation on an idle Session", func(t *testing.T) {
+		tx := fresh(t)
+		tx.loadInputGate, tx.loadActiveTurn = returns(InputGate{Matches: true}), activeTurn(nil)
+		tx.createInputReservation, tx.recordInputAudit = returns(reservationIn(EnvironmentInputPending)), done
+		result, err := reserve(t, tx)
+		if err != nil || !reflect.DeepEqual(result, reservationIn(EnvironmentInputPending)) {
+			t.Fatalf("reservation %+v, %v", result, err)
+		}
+		assertCalls(t, tx.fakeTx, append(checked, "LoadInputGate request "+batch, "LoadActiveTurn", "CreateInputReservation request "+batch, "RecordInputAudit", "LoadEnvironmentInput")...)
+	})
+	t.Run("a cancellation touches no storage", func(t *testing.T) {
+		if _, err := deviceService(t, &fakeStorage{t: t}).ReserveEnvironmentInput(t.Context(), testTenant, testSession, inputKey, []Input{cancelInput}); !errors.Is(err, ErrInvalidInput) {
+			t.Fatal(err)
+		}
+	})
+}
+
+func TestExpireEnvironmentInput(t *testing.T) {
+	tx := newInputTx(t)
+	tx.loadEnvironmentInput, tx.expireInputReservation = inputs(), done
+	tx.loadInputReservation = reservations(reservationIn(EnvironmentInputPending), reservationIn(EnvironmentInputExpired))
+	service := deviceService(t, &fakeStorage{t: t, inputTx: tx})
+	result, err := service.ExpireEnvironmentInput(t.Context(), testTenant, testSession, testReservation)
+	if err != nil || result.State != EnvironmentInputExpired {
+		t.Fatalf("reservation %+v, %v", result, err)
+	}
+	assertCalls(t, tx.fakeTx, "LoadEnvironmentInput", "LoadInputReservation "+testReservation, "ExpireInputReservation "+testReservation, "LoadInputReservation "+testReservation, "LoadEnvironmentInput")
+	if _, err := service.ExpireEnvironmentInput(t.Context(), testTenant, testSession, "malformed"); !errors.Is(err, ErrInvalidInput) {
+		t.Fatal(err)
+	}
+}
diff --git a/services/core/internal/sessions/execution.go b/services/core/internal/sessions/execution.go
index db5eaaf13..c07c25573 100644
--- a/services/core/internal/sessions/execution.go
+++ b/services/core/internal/sessions/execution.go
@@ -20,5 +20,6 @@ func NewExecutionOperations(storage ExecutionStorage) (*ExecutionOperations, err
 type ExecutionStorage interface {
 	EnvironmentExecution
 	FunctionExecution
+	InputExecution
 	TurnExecution
 }
diff --git a/services/core/internal/sessions/execution_functions_test.go b/services/core/internal/sessions/execution_functions_test.go
index cc8ca606a..03cdbb09e 100644
--- a/services/core/internal/sessions/execution_functions_test.go
+++ b/services/core/internal/sessions/execution_functions_test.go
@@ -15,9 +15,11 @@ import (
 // their call on tx, then run apply with tx and locked; without tx they fail
 // the test.
 type fakeExecutionStorage struct {
-	t                *testing.T
-	withFunctionTurn func(ctx context.Context, tenant, session, turn string, apply func(context.Context, FunctionTx, Turn) error) error
-	withTurns        func(ctx context.Context, tenant, session string, apply func(context.Context, TurnTx) error) error
+	t                        *testing.T
+	withFunctionTurn         func(ctx context.Context, tenant, session, turn string, apply func(context.Context, FunctionTx, Turn) error) error
+	withTurns                func(ctx context.Context, tenant, session string, apply func(context.Context, TurnTx) error) error
+	withInputs               func(ctx context.Context, tenant, session string, apply func(context.Context, InputTx) error) error
+	withDueInputReservations func(ctx context.Context, apply func(context.Context, InputTx, string) error) error
 
 	tx     *fakeTx
 	locked LockedSession
diff --git a/services/core/internal/sessions/execution_inputs.go b/services/core/internal/sessions/execution_inputs.go
new file mode 100644
index 000000000..111195033
--- /dev/null
+++ b/services/core/internal/sessions/execution_inputs.go
@@ -0,0 +1,103 @@
+package sessions
+
+import "context"
+
+// InputExecution is the lease-bound storage of Environment input settlement.
+type InputExecution interface {
+	// WithInputs runs apply in one transaction on the execution lease, under
+	// the lock of the tenant's Session, and commits only when apply succeeds.
+	// A malformed tenant is ErrInvalidInput; a malformed, missing or deleted
+	// Session is ErrNotFound.
+	WithInputs(ctx context.Context, tenant, session string, apply func(context.Context, InputTx) error) error
+	// WithDueInputReservations runs apply in one transaction on the execution
+	// lease for each of at most 32 pending Environment input reservations
+	// whose deadline has passed, earliest deadline first, of live Sessions
+	// whose lock no other transaction holds, with that Session's transaction
+	// and the reservation's ID. It commits only when every apply succeeds.
+	WithDueInputReservations(ctx context.Context, apply func(context.Context, InputTx, string) error) error
+}
+
+// PromoteEnvironmentInput admits a pending reservation's batch into a new Turn
+// and claims that Turn as in progress for the execution owner's retained
+// native preparation. The reservation settles as admitted with the batch's
+// receipts. A reservation that already settled, or expires now because its
+// deadline has passed, is returned as it is. The Session must be idle with no
+// pending file write; otherwise it is ErrTurnConflict and the reservation
+// stays pending. A malformed reservation ID is ErrInvalidInput, and a missing
+// reservation ErrNotFound.
+func (o *ExecutionOperations) PromoteEnvironmentInput(ctx context.Context, tenant, session, reservation string) (EnvironmentInputReservation, error) {
+	if !validID(reservation) {
+		return EnvironmentInputReservation{}, ErrInvalidInput
+	}
+	var result EnvironmentInputReservation
+	err := o.storage.WithInputs(ctx, tenant, session, func(ctx context.Context, tx InputTx) error {
+		return TrackInputActivity(ctx, tx, func(ctx context.Context) error {
+			current, err := tx.LoadInputReservation(ctx, reservation)
+			if err != nil {
+				return err
+			}
+			if result, err = expireReservation(ctx, tx, current); err != nil || result.State != EnvironmentInputPending {
+				return err
+			}
+			if err := CheckInputStart(ctx, tx); err != nil {
+				return err
+			}
+			if result.Receipts, err = AdmitInputs(ctx, tx, result.Key, result.Inputs); err != nil {
+				return err
+			}
+			settled, err := tx.AdmitInputReservation(ctx, reservation)
+			if err != nil {
+				return err
+			}
+			start := TurnTransition{ExpectedStatus: TurnQueued, Status: TurnInProgress}
+			if _, err := TransitionTurn(ctx, tx, result.Receipts[0].TurnID, start); err != nil {
+				return err
+			}
+			result.State, result.SettledAt = EnvironmentInputAdmitted, &settled
+			return nil
+		})
+	})
+	if err != nil {
+		return EnvironmentInputReservation{}, err
+	}
+	return result, nil
+}
+
+// FailEnvironmentInput settles a pending reservation as failed before
+// admission with code, model_provider_required or runtime_preparation_failed,
+// once execution confirmed the failure. A reservation that already settled,
+// including one cancelled meanwhile, keeps its outcome, and one whose deadline
+// has passed expires instead. Any other code and a malformed reservation ID
+// are ErrInvalidInput.
+func (o *ExecutionOperations) FailEnvironmentInput(ctx context.Context, tenant, session, reservation, code string) error {
+	if (code != "model_provider_required" && code != "runtime_preparation_failed") || !validID(reservation) {
+		return ErrInvalidInput
+	}
+	return o.storage.WithInputs(ctx, tenant, session, func(ctx context.Context, tx InputTx) error {
+		return TrackInputActivity(ctx, tx, func(ctx context.Context) error {
+			if err := tx.ExpireInputReservation(ctx, reservation); err != nil {
+				return err
+			}
+			return tx.FailInputReservation(ctx, reservation, code)
+		})
+	})
+}
+
+// ExpireEnvironmentInputs expires one bounded batch of pending reservations
+// whose deadline has passed, reports the input activity each changes, creates
+// no Turn history and returns how many it expired. It is cross-Session
+// maintenance only the execution owner runs.
+func (o *ExecutionOperations) ExpireEnvironmentInputs(ctx context.Context) (int64, error) {
+	var expired int64
+	err := o.storage.WithDueInputReservations(ctx, func(ctx context.Context, tx InputTx, reservation string) error {
+		if err := TrackInputActivity(ctx, tx, func(ctx context.Context) error { return tx.ExpireInputReservation(ctx, reservation) }); err != nil {
+			return err
+		}
+		expired++
+		return nil
+	})
+	if err != nil {
+		return 0, err
+	}
+	return expired, nil
+}
diff --git a/services/core/internal/sessions/execution_inputs_test.go b/services/core/internal/sessions/execution_inputs_test.go
new file mode 100644
index 000000000..64a10a1bd
--- /dev/null
+++ b/services/core/internal/sessions/execution_inputs_test.go
@@ -0,0 +1,133 @@
+package sessions
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"reflect"
+	"testing"
+	"time"
+)
+
+func (f *fakeExecutionStorage) WithInputs(ctx context.Context, tenant, session string, apply func(context.Context, InputTx) error) error {
+	f.t.Helper()
+	if f.withInputs == nil {
+		f.t.Fatal("unexpected call to WithInputs")
+	}
+	return f.withInputs(ctx, tenant, session, apply)
+}
+
+func (f *fakeExecutionStorage) WithDueInputReservations(ctx context.Context, apply func(context.Context, InputTx, string) error) error {
+	f.t.Helper()
+	if f.withDueInputReservations == nil {
+		f.t.Fatal("unexpected call to WithDueInputReservations")
+	}
+	return f.withDueInputReservations(ctx, apply)
+}
+
+// inputOperations serves the tenant's Session through tx.
+func inputOperations(t *testing.T, tx *fakeInputTx) *ExecutionOperations {
+	t.Helper()
+	tx.loadEnvironmentInput = inputs()
+	operations, err := NewExecutionOperations(&fakeExecutionStorage{t: t, withInputs: func(ctx context.Context, tenant, session string, apply func(context.Context, InputTx) error) error {
+		if tenant != testTenant || session != testSession {
+			t.Fatalf("Session %s %s", tenant, session)
+		}
+		return apply(ctx, tx)
+	}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return operations
+}
+
+func TestPromoteEnvironmentInput(t *testing.T) {
+	expire := []string{"LoadEnvironmentInput", "LoadInputReservation " + testReservation, "ExpireInputReservation " + testReservation, "LoadInputReservation " + testReservation}
+	promote := func(t *testing.T, tx *fakeInputTx) (EnvironmentInputReservation, error) {
+		return inputOperations(t, tx).PromoteEnvironmentInput(t.Context(), testTenant, testSession, testReservation)
+	}
+	t.Run("a reservation past its deadline expires", func(t *testing.T) {
+		tx := newInputTx(t)
+		tx.loadInputReservation, tx.expireInputReservation = reservations(reservationIn(EnvironmentInputPending), reservationIn(EnvironmentInputExpired)), done
+		result, err := promote(t, tx)
+		if err != nil || !reflect.DeepEqual(result, reservationIn(EnvironmentInputExpired)) {
+			t.Fatalf("reservation %+v, %v", result, err)
+		}
+		assertCalls(t, tx.fakeTx, append(expire, "LoadEnvironmentInput")...)
+	})
+	t.Run("a pending reservation starts its Turn", func(t *testing.T) {
+		settled := time.Unix(1700000002, 0)
+		tx := newInputTx(t)
+		tx.loadInputReservation, tx.expireInputReservation = returns(reservationIn(EnvironmentInputPending)), done
+		tx.loadPendingFileWrite, tx.loadActiveTurn = returns(false), activeTurn(nil)
+		tx.createTurn, tx.createTurnInput, tx.loadInputSource = returns(turnWith(TurnQueued)), sequences(5), unprojected
+		tx.loadUsage, tx.appendChanges = returns(json.RawMessage(`{}`)), collect(new([]SessionChange))
+		tx.admitInputReservation, tx.loadTurn, tx.loadComputeSuspension = returns(settled), returns(turnWith(TurnQueued)), returns(false)
+		tx.applyTurnStatus = func(TurnStatusChange) (Turn, error) { return turnWith(TurnInProgress), nil }
+		result, err := promote(t, tx)
+		want := reservationIn(EnvironmentInputAdmitted)
+		want.SettledAt, want.Receipts = &settled, []InputReceipt{{Sequence: 5, TurnID: testTurn}}
+		if err != nil || !reflect.DeepEqual(result, want) {
+			t.Fatalf("reservation %+v, %v", result, err)
+		}
+		assertCalls(t, tx.fakeTx, append(expire, "LoadPendingFileWrite", "LoadActiveTurn",
+			"LoadActiveTurn", "CreateTurn", "AppendChanges agent.session.turn.created", "CreateTurnInput "+testTurn+" request 0 message", "LoadInputSource 5", "LoadUsage", "AppendChanges agent.session.in_progress",
+			"AdmitInputReservation "+testReservation,
+			"LoadTurn "+testTurn, "LoadComputeSuspension", "ApplyTurnStatus "+testTurn+" queued in_progress {}", "AppendChanges agent.session.turn.in_progress",
+			"LoadEnvironmentInput")...)
+	})
+	t.Run("a busy Session keeps the reservation pending", func(t *testing.T) {
+		running := turnWith(TurnInProgress)
+		tx := newInputTx(t)
+		tx.loadInputReservation, tx.expireInputReservation = returns(reservationIn(EnvironmentInputPending)), done
+		tx.loadPendingFileWrite, tx.loadActiveTurn = returns(false), activeTurn(&running)
+		if _, err := promote(t, tx); !errors.Is(err, ErrTurnConflict) {
+			t.Fatal(err)
+		}
+		assertCalls(t, tx.fakeTx, append(expire, "LoadPendingFileWrite", "LoadActiveTurn")...)
+	})
+	if _, err := unusedStorage(t).PromoteEnvironmentInput(t.Context(), testTenant, testSession, "malformed"); !errors.Is(err, ErrInvalidInput) {
+		t.Fatal(err)
+	}
+}
+
+func TestFailEnvironmentInput(t *testing.T) {
+	tx := newInputTx(t)
+	tx.expireInputReservation, tx.failInputReservation = done, done
+	if err := inputOperations(t, tx).FailEnvironmentInput(t.Context(), testTenant, testSession, testReservation, "runtime_preparation_failed"); err != nil {
+		t.Fatal(err)
+	}
+	assertCalls(t, tx.fakeTx, "LoadEnvironmentInput", "ExpireInputReservation "+testReservation, "FailInputReservation "+testReservation+" runtime_preparation_failed", "LoadEnvironmentInput")
+	for reservation, code := range map[string]string{testReservation: "other", "malformed": "model_provider_required"} {
+		if err := unusedStorage(t).FailEnvironmentInput(t.Context(), testTenant, testSession, reservation, code); !errors.Is(err, ErrInvalidInput) {
+			t.Fatalf("%s %s: %v", reservation, code, err)
+		}
+	}
+}
+
+func TestExpireEnvironmentInputs(t *testing.T) {
+	due := []string{"6a1c9e2b-0000-4a5b-8c6d-7e8f9a0b1c2d", "6a1c9e2b-1111-4a5b-8c6d-7e8f9a0b1c2d"}
+	expire := func(t *testing.T, tx *fakeInputTx, failure error) (int64, error) {
+		tx.loadEnvironmentInput, tx.expireInputReservation = inputs(), done
+		operations, err := NewExecutionOperations(&fakeExecutionStorage{t: t, withDueInputReservations: func(ctx context.Context, apply func(context.Context, InputTx, string) error) error {
+			for _, reservation := range due {
+				if err := apply(ctx, tx, reservation); err != nil {
+					return err
+				}
+			}
+			return failure
+		}})
+		if err != nil {
+			t.Fatal(err)
+		}
+		return operations.ExpireEnvironmentInputs(t.Context())
+	}
+	tx := newInputTx(t)
+	if expired, err := expire(t, tx, nil); err != nil || expired != 2 {
+		t.Fatalf("expired %d, %v", expired, err)
+	}
+	assertCalls(t, tx.fakeTx, "LoadEnvironmentInput", "ExpireInputReservation "+due[0], "LoadEnvironmentInput", "LoadEnvironmentInput", "ExpireInputReservation "+due[1], "LoadEnvironmentInput")
+	if expired, err := expire(t, newInputTx(t), errStorage); !errors.Is(err, errStorage) || expired != 0 {
+		t.Fatalf("expired %d, %v", expired, err)
+	}
+}
diff --git a/services/core/internal/sessions/inputs.go b/services/core/internal/sessions/inputs.go
index e041795b5..264cbb106 100644
--- a/services/core/internal/sessions/inputs.go
+++ b/services/core/internal/sessions/inputs.go
@@ -1,10 +1,14 @@
 package sessions
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
+	"slices"
 	"strings"
 	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/jsonobject"
 )
 
 // Input is a validated execution command, not an upstream wire type.
@@ -35,6 +39,334 @@ func ValidateInputKey(key string) error {
 	return nil
 }
 
+// ValidateInputs checks and normalizes an input batch: 1..64 messages,
+// cancellations and function results whose nonempty JSON object payloads total
+// at most 512 KiB, an empty cancellation payload and a well-formed function
+// result. It returns the normalized batch and its encoding, the batch's retry
+// identity.
+func ValidateInputs(inputs []Input) ([]Input, json.RawMessage, error) {
+	if len(inputs) == 0 || len(inputs) > 64 {
+		return nil, nil, fmt.Errorf("%w: input batch must contain 1..64 events", ErrInvalidInput)
+	}
+	batch := make([]Input, len(inputs))
+	size := 0
+	for i, input := range inputs {
+		size += len(input.Payload)
+		if size > 512*1024 || len(input.Payload) == 0 || (input.Kind != "message" && input.Kind != "cancel" && input.Kind != "tool_result") {
+			return nil, nil, fmt.Errorf("%w: input payloads must be nonempty and total at most 512 KiB", ErrInvalidInput)
+		}
+		payload, err := jsonobject.Normalize(input.Payload)
+		if err != nil {
+			return nil, nil, fmt.Errorf("%w: %w", ErrInvalidInput, err)
+		}
+		if input.Kind == "cancel" && string(payload) != "{}" {
+			return nil, nil, fmt.Errorf("%w: cancel payload must be empty", ErrInvalidInput)
+		}
+		if input.Kind == "tool_result" {
+			if _, err := ParseFunctionResultInput(payload); err != nil {
+				return nil, nil, err
+			}
+		}
+		batch[i] = Input{Kind: input.Kind, Payload: payload}
+	}
+	encoded, err := json.Marshal(batch)
+	return batch, encoded, err
+}
+
+// ValidateMessageInputs validates a batch as ValidateInputs does and also
+// requires that it holds only messages, as Environment input reservations and
+// Session initial input do.
+func ValidateMessageInputs(inputs []Input) ([]Input, json.RawMessage, error) {
+	for _, input := range inputs {
+		if input.Kind != "message" {
+			return nil, nil, ErrInvalidInput
+		}
+	}
+	return ValidateInputs(inputs)
+}
+
+// decideReplay decides a request whose idempotency key may already hold a
+// batch: an unused key admits the request, a key holding the same batch
+// replays what it admitted, and a key holding a different batch is
+// ErrIdempotencyConflict. The whole batch is the retry identity, so a replay
+// never re-evaluates its inputs, such as a cancellation's target.
+func decideReplay(used, matches bool) (bool, error) {
+	if !used {
+		return false, nil
+	}
+	if !matches {
+		return false, ErrIdempotencyConflict
+	}
+	return true, nil
+}
+
+// InputGate is what the Session's Environment input reservations show about a
+// new input batch.
+type InputGate struct {
+	// Matches reports that the Session has no reservation under the batch's
+	// idempotency key, or one with the same batch.
+	Matches bool
+	// Blocked reports that a reservation is pending or one holds the batch's
+	// idempotency key.
+	Blocked bool
+}
+
+// checkInputGate admits a new input batch only while no Environment input
+// reservation is pending or holds its key: a reservation holding the key with
+// a different batch is ErrIdempotencyConflict, and any other blocking
+// reservation ErrInputPending.
+func checkInputGate(gate InputGate) error {
+	if !gate.Matches {
+		return ErrIdempotencyConflict
+	}
+	if gate.Blocked {
+		return ErrInputPending
+	}
+	return nil
+}
+
+// inputPlacement is where admission puts a message or cancellation.
+type inputPlacement int
+
+const (
+	// steersTurn adds a message to the active Turn.
+	steersTurn inputPlacement = iota
+	// cancelsTurn adds a cancellation to the active Turn and requests it.
+	cancelsTurn
+	// startsTurn starts a new Turn with a message on an idle Session.
+	startsTurn
+	// keepsIdentity records a cancellation on an idle Session without a Turn,
+	// which keeps only its retry identity.
+	keepsIdentity
+)
+
+// placeInput decides where a message or cancellation goes, given whether the
+// Session has an active Turn.
+func placeInput(kind string, active bool) inputPlacement {
+	switch {
+	case active && kind == "cancel":
+		return cancelsTurn
+	case active:
+		return steersTurn
+	case kind == "message":
+		return startsTurn
+	}
+	return keepsIdentity
+}
+
+// InputAdmissionTx is the Session transaction AdmitInputs runs in.
+type InputAdmissionTx interface {
+	FunctionResultTx
+	TurnCancellationTx
+	InputProjectionTx
+	ActiveTurnTx
+	// CreateTurn creates a queued Turn in the Session and returns it as
+	// stored.
+	CreateTurn(ctx context.Context) (Turn, error)
+	// CreateTurnInput records input at position of the batch admitted under
+	// key, joined to turn, or to no Turn when turn is empty, and returns the
+	// Session sequence it allocates.
+	CreateTurnInput(ctx context.Context, turn, key string, position int32, input Input) (int64, error)
+}
+
+// AdmitInputs admits the validated batch under key, input by input in batch
+// order, and returns their receipts. A function result joins the Turn whose
+// call it answers. A message steers the Session's active Turn or, on an idle
+// Session, starts a new Turn, which publishes turn.created, then the message's
+// Items, then the Session activity. A cancellation requests the cancellation
+// of the active Turn; on an idle Session it joins no Turn and keeps only its
+// retry identity.
+func AdmitInputs(ctx context.Context, tx InputAdmissionTx, key string, batch []Input) ([]InputReceipt, error) {
+	receipts := make([]InputReceipt, 0, len(batch))
+	for position, input := range batch {
+		receipt, err := admitInput(ctx, tx, key, int32(position), input)
+		if err != nil {
+			return nil, err
+		}
+		receipts = append(receipts, receipt)
+	}
+	return receipts, nil
+}
+
+// admitInput admits the input at position of the batch under key.
+func admitInput(ctx context.Context, tx InputAdmissionTx, key string, position int32, input Input) (InputReceipt, error) {
+	if input.Kind == "tool_result" {
+		result, err := ParseFunctionResultInput(input.Payload)
+		if err != nil {
+			return InputReceipt{}, err
+		}
+		turn, err := AdmitFunctionResult(ctx, tx, result)
+		if err != nil {
+			return InputReceipt{}, err
+		}
+		sequence, err := tx.CreateTurnInput(ctx, turn.ID, key, position, input)
+		if err != nil {
+			return InputReceipt{}, err
+		}
+		return InputReceipt{Sequence: sequence, TurnID: turn.ID}, nil
+	}
+	turn, active, err := tx.LoadActiveTurn(ctx)
+	if err != nil {
+		return InputReceipt{}, err
+	}
+	placement := placeInput(input.Kind, active)
+	if placement == startsTurn {
+		if turn, err = tx.CreateTurn(ctx); err != nil {
+			return InputReceipt{}, err
+		}
+		if err := tx.AppendChanges(ctx, TurnChanges(turn, true)...); err != nil {
+			return InputReceipt{}, err
+		}
+	}
+	sequence, err := tx.CreateTurnInput(ctx, turn.ID, key, position, input)
+	if err != nil {
+		return InputReceipt{}, err
+	}
+	if placement == cancelsTurn {
+		if err := CancelTurn(ctx, tx, turn); err != nil {
+			return InputReceipt{}, err
+		}
+	}
+	if err := ProjectInput(ctx, tx, sequence); err != nil {
+		return InputReceipt{}, err
+	}
+	if placement == startsTurn {
+		usage, err := tx.LoadUsage(ctx)
+		if err != nil {
+			return InputReceipt{}, err
+		}
+		if err := tx.AppendChanges(ctx, ActivityChange(turn, usage, nil)); err != nil {
+			return InputReceipt{}, err
+		}
+	}
+	return InputReceipt{Sequence: sequence, TurnID: turn.ID}, nil
+}
+
+// InputTx is the Session transaction of the input use cases.
+type InputTx interface {
+	InputAdmissionTx
+	InputActivityTx
+	InputStartTx
+	TurnTransitionTx
+	// LoadInputBatch reads the receipts of the inputs the Session admitted
+	// under key, in batch order and marked replayed, none when it admitted
+	// none, and reports whether they are batch.
+	LoadInputBatch(ctx context.Context, key string, batch json.RawMessage) ([]InputReceipt, bool, error)
+	// LoadInputGate reads what the Session's Environment input reservations
+	// show about batch under key.
+	LoadInputGate(ctx context.Context, key string, batch json.RawMessage) (InputGate, error)
+	// LoadEnvironment reads the Session's Environment; a Session without one
+	// is ErrNotFound.
+	LoadEnvironment(ctx context.Context) (Environment, error)
+	// FindInputReservation reads the Session's Environment input reservation
+	// under key when its batch is batch, nil otherwise, and reports whether
+	// the Session reserved key at all.
+	FindInputReservation(ctx context.Context, key string, batch json.RawMessage) (*EnvironmentInputReservation, bool, error)
+	// LoadInputReservation reads one of the Session's Environment input
+	// reservations; a missing one is ErrNotFound. An admitted reservation
+	// carries the receipts of its batch.
+	LoadInputReservation(ctx context.Context, reservation string) (EnvironmentInputReservation, error)
+	// CreateInputReservation reserves batch under key until the deadline the
+	// database clock sets, and returns the pending reservation as stored.
+	CreateInputReservation(ctx context.Context, key string, batch json.RawMessage) (EnvironmentInputReservation, error)
+	// ExpireInputReservation expires the reservation while it is pending and
+	// its deadline has passed by the database clock; otherwise it changes
+	// nothing.
+	ExpireInputReservation(ctx context.Context, reservation string) error
+	// AdmitInputReservation settles the pending reservation as admitted and
+	// returns when the database clock settled it.
+	AdmitInputReservation(ctx context.Context, reservation string) (time.Time, error)
+	// FailInputReservation settles the reservation as failed with code while
+	// it is pending; otherwise it changes nothing.
+	FailInputReservation(ctx context.Context, reservation, code string) error
+	// RecordInputAudit records the send_events write audit of the Session.
+	RecordInputAudit(ctx context.Context) error
+}
+
+// InputStorage is the pooled storage of the input use cases.
+type InputStorage interface {
+	// WithInputs runs apply in one pooled transaction under the lock of the
+	// tenant's Session and commits only when apply succeeds. A malformed
+	// tenant is ErrInvalidInput; a malformed, missing or deleted Session is
+	// ErrNotFound.
+	WithInputs(ctx context.Context, tenant, session string, apply func(context.Context, InputTx) error) error
+}
+
+// InputReader reads a Session's admitted inputs, its Environment input
+// reservations and the reservations execution may admit.
+type InputReader interface {
+	// ListTurnInputs pages a Turn's admitted inputs in sequence order after
+	// sequence after, at most limit of 1..100. It is an internal recovery
+	// read, not the public event stream. A malformed ID, a negative after and
+	// a limit out of range are ErrInvalidInput; a missing Turn is ErrNotFound.
+	ListTurnInputs(ctx context.Context, tenant, session, turn string, after int64, limit int) ([]TurnInput, error)
+	// GetEnvironmentInputReservation reads one of the tenant's Session's
+	// Environment input reservations; an admitted one carries the receipts of
+	// its batch. A malformed tenant or reservation ID is ErrInvalidInput; a
+	// missing or deleted Session and a missing reservation are ErrNotFound.
+	GetEnvironmentInputReservation(ctx context.Context, tenant, session, reservation string) (EnvironmentInputReservation, error)
+	// ListEnvironmentInputWork lists, in ID order after the reservation ID
+	// after or from the first when it is empty, at most 100 pending
+	// reservations before their deadline of live Sessions whose tenant has an
+	// unrevoked device among connectedDevices, the Session's bound device when
+	// it has one. A malformed ID is ErrInvalidInput.
+	ListEnvironmentInputWork(ctx context.Context, after string, connectedDevices []string) ([]EnvironmentInputWork, error)
+}
+
+// SubmitInputs admits a request's input batch in order under one Session
+// lock and returns a receipt per input. The whole batch under its key is the
+// retry identity: a retry replays the receipts of the batch it admitted,
+// whatever has changed since, and the same key with a different batch is
+// ErrIdempotencyConflict. A batch with a message waits for a pending file
+// write to the Session's Environment (ErrTurnConflict), and no batch is
+// admitted while an Environment input reservation is pending or holds the key
+// (ErrInputPending). Internal receipts are not the response body of the
+// public events endpoint.
+func (s *Service) SubmitInputs(ctx context.Context, tenant, session, key string, inputs []Input) ([]InputReceipt, error) {
+	if err := ValidateInputKey(key); err != nil {
+		return nil, err
+	}
+	batch, encoded, err := ValidateInputs(inputs)
+	if err != nil {
+		return nil, err
+	}
+	var receipts []InputReceipt
+	err = s.storage.WithInputs(ctx, tenant, session, func(ctx context.Context, tx InputTx) error {
+		previous, matches, err := tx.LoadInputBatch(ctx, key, encoded)
+		if err != nil {
+			return err
+		}
+		replay, err := decideReplay(len(previous) > 0, matches)
+		if err != nil {
+			return err
+		}
+		if replay {
+			receipts = previous
+			return tx.RecordInputAudit(ctx)
+		}
+		if slices.ContainsFunc(batch, func(input Input) bool { return input.Kind == "message" }) {
+			if err := CheckFileWriteGate(ctx, tx); err != nil {
+				return err
+			}
+		}
+		gate, err := tx.LoadInputGate(ctx, key, encoded)
+		if err != nil {
+			return err
+		}
+		if err := checkInputGate(gate); err != nil {
+			return err
+		}
+		if receipts, err = AdmitInputs(ctx, tx, key, batch); err != nil {
+			return err
+		}
+		return tx.RecordInputAudit(ctx)
+	})
+	if err != nil {
+		return nil, fmt.Errorf("submit turn inputs: %w", err)
+	}
+	return receipts, nil
+}
+
 // FunctionCall retains public identity and its opaque execution-adapter reference.
 type FunctionCall struct {
 	CallID, ExecutorCallID, Name string
diff --git a/services/core/internal/sessions/inputs_test.go b/services/core/internal/sessions/inputs_test.go
new file mode 100644
index 000000000..6120dfb46
--- /dev/null
+++ b/services/core/internal/sessions/inputs_test.go
@@ -0,0 +1,322 @@
+package sessions
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/items"
+)
+
+// fakeInputTx is fakeFunctionTx with the input methods, equally strict: it
+// shares fakeTx's call log, and a method whose func is unset fails the test.
+type fakeInputTx struct {
+	*fakeFunctionTx
+
+	createTurn             func() (Turn, error)
+	createTurnInput        func() (int64, error)
+	loadInputBatch         func() ([]InputReceipt, bool, error)
+	loadInputGate          func() (InputGate, error)
+	findInputReservation   func() (*EnvironmentInputReservation, bool, error)
+	loadInputReservation   func() (EnvironmentInputReservation, error)
+	createInputReservation func() (EnvironmentInputReservation, error)
+	expireInputReservation func() error
+	admitInputReservation  func() (time.Time, error)
+	failInputReservation   func() error
+	recordInputAudit       func() error
+}
+
+var _ InputTx = (*fakeInputTx)(nil)
+
+func newInputTx(t *testing.T) *fakeInputTx {
+	return &fakeInputTx{fakeFunctionTx: &fakeFunctionTx{fakeTx: &fakeTx{t: t}}}
+}
+
+func (f *fakeInputTx) CreateTurn(context.Context) (Turn, error) {
+	f.record("CreateTurn", f.createTurn != nil)
+	return f.createTurn()
+}
+
+func (f *fakeInputTx) CreateTurnInput(_ context.Context, turn, key string, position int32, input Input) (int64, error) {
+	f.record("CreateTurnInput", f.createTurnInput != nil, turn, key, fmt.Sprint(position), input.Kind)
+	return f.createTurnInput()
+}
+
+func (f *fakeInputTx) LoadInputBatch(_ context.Context, key string, batch json.RawMessage) ([]InputReceipt, bool, error) {
+	f.record("LoadInputBatch", f.loadInputBatch != nil, key, string(batch))
+	return f.loadInputBatch()
+}
+
+func (f *fakeInputTx) LoadInputGate(_ context.Context, key string, batch json.RawMessage) (InputGate, error) {
+	f.record("LoadInputGate", f.loadInputGate != nil, key, string(batch))
+	return f.loadInputGate()
+}
+
+func (f *fakeInputTx) FindInputReservation(_ context.Context, key string, batch json.RawMessage) (*EnvironmentInputReservation, bool, error) {
+	f.record("FindInputReservation", f.findInputReservation != nil, key, string(batch))
+	return f.findInputReservation()
+}
+
+func (f *fakeInputTx) LoadInputReservation(_ context.Context, reservation string) (EnvironmentInputReservation, error) {
+	f.record("LoadInputReservation", f.loadInputReservation != nil, reservation)
+	return f.loadInputReservation()
+}
+
+func (f *fakeInputTx) CreateInputReservation(_ context.Context, key string, batch json.RawMessage) (EnvironmentInputReservation, error) {
+	f.record("CreateInputReservation", f.createInputReservation != nil, key, string(batch))
+	return f.createInputReservation()
+}
+
+func (f *fakeInputTx) ExpireInputReservation(_ context.Context, reservation string) error {
+	f.record("ExpireInputReservation", f.expireInputReservation != nil, reservation)
+	return f.expireInputReservation()
+}
+
+func (f *fakeInputTx) AdmitInputReservation(_ context.Context, reservation string) (time.Time, error) {
+	f.record("AdmitInputReservation", f.admitInputReservation != nil, reservation)
+	return f.admitInputReservation()
+}
+
+func (f *fakeInputTx) FailInputReservation(_ context.Context, reservation, code string) error {
+	f.record("FailInputReservation", f.failInputReservation != nil, reservation, code)
+	return f.failInputReservation()
+}
+
+func (f *fakeInputTx) RecordInputAudit(context.Context) error {
+	f.record("RecordInputAudit", f.recordInputAudit != nil)
+	return f.recordInputAudit()
+}
+
+func (s *fakeStorage) WithInputs(ctx context.Context, tenant, session string, apply func(context.Context, InputTx) error) error {
+	s.record("WithInputs", s.inputTx != nil, tenant, session)
+	return apply(ctx, s.inputTx)
+}
+
+// inputKey is the idempotency key of the input batches under test.
+const inputKey = "request"
+
+func messageInput(text string) Input {
+	payload, _ := json.Marshal(map[string]string{"text": text})
+	return Input{Kind: "message", Payload: payload}
+}
+
+var cancelInput = Input{Kind: "cancel", Payload: json.RawMessage(`{}`)}
+
+// sequences is a fake CreateTurnInput that allocates sequences from first.
+func sequences(first int64) func() (int64, error) {
+	return func() (int64, error) {
+		first++
+		return first - 1, nil
+	}
+}
+
+// unprojected is a fake LoadInputSource: a message without text, which
+// projects no Item.
+var unprojected = returns(Source{Turn: testTurn, Kind: "message", Payload: json.RawMessage(`{}`)})
+
+func TestValidateInputs(t *testing.T) {
+	batch, encoded, err := ValidateInputs([]Input{{Kind: "message", Payload: json.RawMessage(` {"text":"hi","a":1} `)}, {Kind: "cancel", Payload: json.RawMessage(` { } `)}})
+	if err != nil || string(batch[0].Payload) != `{"a":1,"text":"hi"}` || string(encoded) != `[{"kind":"message","payload":{"a":1,"text":"hi"}},{"kind":"cancel","payload":{}}]` {
+		t.Fatalf("batch %s, %v", encoded, err)
+	}
+	for name, inputs := range map[string][]Input{
+		"no inputs":            nil,
+		"65 inputs":            make([]Input, 65),
+		"unsupported kind":     {messageInput("ok"), {Kind: "unsupported", Payload: json.RawMessage(`{}`)}},
+		"missing payload":      {{Kind: "message"}},
+		"array payload":        {{Kind: "message", Payload: json.RawMessage(`[]`)}},
+		"cancel with a target": {{Kind: "cancel", Payload: json.RawMessage(`{"target":"other"}`)}},
+		"over 512 KiB":         {messageInput(strings.Repeat("x", 300*1024)), messageInput(strings.Repeat("y", 300*1024))},
+	} {
+		if _, _, err := ValidateInputs(inputs); !errors.Is(err, ErrInvalidInput) {
+			t.Errorf("%s: %v", name, err)
+		}
+	}
+}
+
+func TestValidateMessageInputs(t *testing.T) {
+	if _, encoded, err := ValidateMessageInputs([]Input{messageInput("hi")}); err != nil || string(encoded) != `[{"kind":"message","payload":{"text":"hi"}}]` {
+		t.Fatalf("batch %s, %v", encoded, err)
+	}
+	for name, inputs := range map[string][]Input{"cancel": {messageInput("hi"), cancelInput}, "no inputs": nil} {
+		if _, _, err := ValidateMessageInputs(inputs); !errors.Is(err, ErrInvalidInput) {
+			t.Errorf("%s: %v", name, err)
+		}
+	}
+}
+
+func TestDecideReplay(t *testing.T) {
+	for _, test := range []struct {
+		used, matches, replay bool
+		err                   error
+	}{
+		{false, false, false, nil},
+		{true, true, true, nil},
+		{true, false, false, ErrIdempotencyConflict},
+	} {
+		if replay, err := decideReplay(test.used, test.matches); replay != test.replay || err != test.err {
+			t.Errorf("used %v matches %v: %v, %v", test.used, test.matches, replay, err)
+		}
+	}
+}
+
+func TestCheckInputGate(t *testing.T) {
+	for gate, want := range map[InputGate]error{
+		{Matches: true}:                 nil,
+		{Matches: true, Blocked: true}:  ErrInputPending,
+		{Matches: false, Blocked: true}: ErrIdempotencyConflict,
+	} {
+		if err := checkInputGate(gate); err != want {
+			t.Errorf("%+v: %v", gate, err)
+		}
+	}
+}
+
+func TestPlaceInput(t *testing.T) {
+	for _, test := range []struct {
+		kind   string
+		active bool
+		want   inputPlacement
+	}{
+		{"message", true, steersTurn},
+		{"cancel", true, cancelsTurn},
+		{"message", false, startsTurn},
+		{"cancel", false, keepsIdentity},
+	} {
+		if got := placeInput(test.kind, test.active); got != test.want {
+			t.Errorf("%s active %v: %v", test.kind, test.active, got)
+		}
+	}
+}
+
+func TestAdmitInput(t *testing.T) {
+	running := turnWith(TurnInProgress)
+	t.Run("an idle message starts a Turn", func(t *testing.T) {
+		var changes []SessionChange
+		tx := newInputTx(t)
+		tx.loadActiveTurn, tx.createTurn, tx.appendChanges = activeTurn(nil), returns(turnWith(TurnQueued)), collect(&changes)
+		tx.createTurnInput, tx.loadUsage = sequences(7), returns(json.RawMessage(`{}`))
+		tx.loadInputSource = returns(Source{Turn: testTurn, Kind: "message", Sequence: 7, Payload: json.RawMessage(`{"text":"hi"}`)})
+		tx.loadItem, tx.putItem = returns(items.Stored{}), func(items.Change) (*int32, error) { return nil, nil }
+		receipt, err := admitInput(t.Context(), tx, inputKey, 0, messageInput("hi"))
+		if err != nil || receipt != (InputReceipt{Sequence: 7, TurnID: testTurn}) {
+			t.Fatalf("receipt %+v, %v", receipt, err)
+		}
+		item := items.Identity(testTurn, "input:7")
+		assertCalls(t, tx.fakeTx, "LoadActiveTurn", "CreateTurn", "AppendChanges agent.session.turn.created", "CreateTurnInput "+testTurn+" request 0 message",
+			"LoadInputSource 7", "LoadItem "+testTurn+" "+item, "PutItem "+testTurn+" "+item, "AppendChanges agent.session.turn.item.added",
+			"LoadUsage", "AppendChanges agent.session.in_progress")
+	})
+	for _, test := range []struct {
+		name   string
+		input  Input
+		active *Turn
+		want   InputReceipt
+		calls  []string
+	}{
+		{"a message steers the active Turn", messageInput("more"), &running, InputReceipt{Sequence: 8, TurnID: testTurn},
+			[]string{"LoadActiveTurn", "CreateTurnInput " + testTurn + " request 1 message", "LoadInputSource 8"}},
+		{"a cancellation requests the active Turn's cancellation", cancelInput, &running, InputReceipt{Sequence: 8, TurnID: testTurn},
+			[]string{"LoadActiveTurn", "CreateTurnInput " + testTurn + " request 1 cancel", "RequestTurnCancel " + testTurn, "LoadInputSource 8"}},
+		{"an idle cancellation keeps only its retry identity", cancelInput, nil, InputReceipt{Sequence: 8},
+			[]string{"LoadActiveTurn", "CreateTurnInput  request 1 cancel", "LoadInputSource 8"}},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			tx := newInputTx(t)
+			tx.loadActiveTurn, tx.createTurnInput, tx.loadInputSource, tx.requestTurnCancel = activeTurn(test.active), sequences(8), unprojected, done
+			receipt, err := admitInput(t.Context(), tx, inputKey, 1, test.input)
+			if err != nil || receipt != test.want {
+				t.Fatalf("receipt %+v, %v", receipt, err)
+			}
+			assertCalls(t, tx.fakeTx, test.calls...)
+		})
+	}
+	t.Run("a function result joins the Turn of its call", func(t *testing.T) {
+		tx := newInputTx(t)
+		tx.findResultTurn = func() (Turn, bool, error) { return turnWith(TurnWaiting), true, nil }
+		tx.matchFunctionResult, tx.submitFunctionResult, tx.createTurnInput = returns(FunctionResultMatch{Recorded: true}), done, sequences(9)
+		payload := json.RawMessage(`{"turn_id":"` + testTurn + `","call_id":"call","result":{"ok":true}}`)
+		receipt, err := admitInput(t.Context(), tx, inputKey, 0, Input{Kind: "tool_result", Payload: payload})
+		if err != nil || receipt != (InputReceipt{Sequence: 9, TurnID: testTurn}) {
+			t.Fatalf("receipt %+v, %v", receipt, err)
+		}
+		assertCalls(t, tx.fakeTx, "FindResultTurn "+testTurn, "MatchFunctionResult "+testTurn+` call {"ok":true}`, "SubmitFunctionResult "+testTurn+` call {"ok":true}`,
+			"CreateTurnInput "+testTurn+" request 0 tool_result")
+	})
+}
+
+func TestSubmitInputs(t *testing.T) {
+	const batch = `[{"kind":"message","payload":{"text":"hi"}},{"kind":"cancel","payload":{}}]`
+	inputs := []Input{messageInput("hi"), cancelInput}
+	running := turnWith(TurnInProgress)
+	submit := func(t *testing.T, tx *fakeInputTx, inputs []Input) ([]InputReceipt, error) {
+		storage := &fakeStorage{t: t, inputTx: tx}
+		receipts, err := deviceService(t, storage).SubmitInputs(t.Context(), testTenant, testSession, inputKey, inputs)
+		assertStorageCalls(t, storage, "WithInputs "+testTenant+" "+testSession)
+		return receipts, err
+	}
+	t.Run("admits the batch in order", func(t *testing.T) {
+		tx := newInputTx(t)
+		tx.loadInputBatch = func() ([]InputReceipt, bool, error) { return nil, true, nil }
+		tx.loadPendingFileWrite, tx.loadInputGate = returns(false), returns(InputGate{Matches: true})
+		tx.loadActiveTurn, tx.createTurnInput, tx.loadInputSource, tx.requestTurnCancel = activeTurn(&running), sequences(1), unprojected, done
+		tx.recordInputAudit = done
+		receipts, err := submit(t, tx, inputs)
+		if err != nil || !reflect.DeepEqual(receipts, []InputReceipt{{Sequence: 1, TurnID: testTurn}, {Sequence: 2, TurnID: testTurn}}) {
+			t.Fatalf("receipts %+v, %v", receipts, err)
+		}
+		assertCalls(t, tx.fakeTx, "LoadInputBatch request "+batch, "LoadPendingFileWrite", "LoadInputGate request "+batch,
+			"LoadActiveTurn", "CreateTurnInput "+testTurn+" request 0 message", "LoadInputSource 1",
+			"LoadActiveTurn", "CreateTurnInput "+testTurn+" request 1 cancel", "RequestTurnCancel "+testTurn, "LoadInputSource 2",
+			"RecordInputAudit")
+	})
+	t.Run("a retry replays its receipts", func(t *testing.T) {
+		previous := []InputReceipt{{Sequence: 1, TurnID: testTurn, Replayed: true}, {Sequence: 2, TurnID: testTurn, Replayed: true}}
+		tx := newInputTx(t)
+		tx.loadInputBatch = func() ([]InputReceipt, bool, error) { return previous, true, nil }
+		tx.recordInputAudit = done
+		receipts, err := submit(t, tx, inputs)
+		if err != nil || !reflect.DeepEqual(receipts, previous) {
+			t.Fatalf("receipts %+v, %v", receipts, err)
+		}
+		assertCalls(t, tx.fakeTx, "LoadInputBatch request "+batch, "RecordInputAudit")
+	})
+	t.Run("a different batch under the key conflicts", func(t *testing.T) {
+		tx := newInputTx(t)
+		tx.loadInputBatch = func() ([]InputReceipt, bool, error) { return []InputReceipt{{Sequence: 1}}, false, nil }
+		if _, err := submit(t, tx, inputs); !errors.Is(err, ErrIdempotencyConflict) {
+			t.Fatal(err)
+		}
+		assertCalls(t, tx.fakeTx, "LoadInputBatch request "+batch)
+	})
+	t.Run("a pending file write holds a message", func(t *testing.T) {
+		tx := newInputTx(t)
+		tx.loadInputBatch, tx.loadPendingFileWrite = func() ([]InputReceipt, bool, error) { return nil, true, nil }, returns(true)
+		if _, err := submit(t, tx, inputs); !errors.Is(err, ErrTurnConflict) {
+			t.Fatal(err)
+		}
+		assertCalls(t, tx.fakeTx, "LoadInputBatch request "+batch, "LoadPendingFileWrite")
+	})
+	t.Run("a pending reservation holds a cancellation", func(t *testing.T) {
+		tx := newInputTx(t)
+		tx.loadInputBatch, tx.loadInputGate = func() ([]InputReceipt, bool, error) { return nil, true, nil }, returns(InputGate{Matches: true, Blocked: true})
+		if _, err := submit(t, tx, []Input{cancelInput}); !errors.Is(err, ErrInputPending) {
+			t.Fatal(err)
+		}
+		assertCalls(t, tx.fakeTx, `LoadInputBatch request [{"kind":"cancel","payload":{}}]`, `LoadInputGate request [{"kind":"cancel","payload":{}}]`)
+	})
+	t.Run("an invalid request touches no storage", func(t *testing.T) {
+		service := deviceService(t, &fakeStorage{t: t})
+		if _, err := service.SubmitInputs(t.Context(), testTenant, testSession, " ", inputs); !errors.Is(err, ErrInvalidInput) {
+			t.Fatal(err)
+		}
+		if _, err := service.SubmitInputs(t.Context(), testTenant, testSession, inputKey, nil); !errors.Is(err, ErrInvalidInput) {
+			t.Fatal(err)
+		}
+	})
+}
diff --git a/services/core/internal/sessions/reader.go b/services/core/internal/sessions/reader.go
index 6da1497a6..59e24ba32 100644
--- a/services/core/internal/sessions/reader.go
+++ b/services/core/internal/sessions/reader.go
@@ -9,6 +9,7 @@ type Reader interface {
 	DeviceReader
 	EnvironmentReader
 	ExecutorCredentialReader
+	InputReader
 	ItemReader
 	ModelExecutionReader
 	SessionReader
diff --git a/services/core/internal/sessions/service.go b/services/core/internal/sessions/service.go
index 8612a15e7..df891e54c 100644
--- a/services/core/internal/sessions/service.go
+++ b/services/core/internal/sessions/service.go
@@ -20,4 +20,5 @@ type Storage interface {
 	DeviceStorage
 	ExecutorCredentialStorage
 	SessionStorage
+	InputStorage
 }
diff --git a/services/core/internal/store/admin_session_archive_race_test.go b/services/core/internal/store/admin_session_archive_race_test.go
index 6903443af..b5670acc4 100644
--- a/services/core/internal/store/admin_session_archive_race_test.go
+++ b/services/core/internal/store/admin_session_archive_race_test.go
@@ -59,7 +59,7 @@ func TestManagedSessionArchiveOrdersConcurrentInput(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			<-start
-			_, err := s.ReserveEnvironmentInput(t.Context(), tenant, session.ID, "racing-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"racing"}`)}})
+			_, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "racing-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"racing"}`)}})
 			if err != nil && !errors.Is(err, sessions.ErrEnvironmentUnavailable) {
 				t.Error(err)
 			}
diff --git a/services/core/internal/store/admin_session_archive_test.go b/services/core/internal/store/admin_session_archive_test.go
index d35a6477a..cda2e569b 100644
--- a/services/core/internal/store/admin_session_archive_test.go
+++ b/services/core/internal/store/admin_session_archive_test.go
@@ -114,7 +114,7 @@ func TestManagedSessionArchiveUnallocatedAndGuards(t *testing.T) {
 	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, deployment.ErrInvalidInput) {
 		t.Fatal("archived Environment allocated after archive", err)
 	}
-	if _, err := s.ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); !errors.Is(err, sessions.ErrEnvironmentUnavailable) {
+	if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); !errors.Is(err, sessions.ErrEnvironmentUnavailable) {
 		t.Fatal("archived Environment accepted new input", err)
 	}
 	view, err := deploymentService(t, s).View(t.Context())
diff --git a/services/core/internal/store/admin_session_archive_worker_http_test.go b/services/core/internal/store/admin_session_archive_worker_http_test.go
index 3c86b135c..7085b64fa 100644
--- a/services/core/internal/store/admin_session_archive_worker_http_test.go
+++ b/services/core/internal/store/admin_session_archive_worker_http_test.go
@@ -96,7 +96,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(t.Context(), project.TenantID, active.ID, "pending-turn", json.RawMessage(`{"text":"pending"}`))
+	input, err := store.SendMessage(t.Context(), s, project.TenantID, active.ID, "pending-turn", json.RawMessage(`{"text":"pending"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/archive_cancellation_test.go b/services/core/internal/store/archive_cancellation_test.go
index 9c56f82eb..6e3da3dce 100644
--- a/services/core/internal/store/archive_cancellation_test.go
+++ b/services/core/internal/store/archive_cancellation_test.go
@@ -123,7 +123,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				}
 				time.Sleep(time.Millisecond)
 			}
-			pending, err := s.ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
+			pending, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -142,7 +142,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			}
 
 			if scenario == "cancel_revoke_archive" {
-				if _, err := s.RequestCancel(t.Context(), h.tenant, session.ID, "ordinary-cancel"); err != nil {
+				if _, err := store.RequestCancel(t.Context(), s, h.tenant, session.ID, "ordinary-cancel"); err != nil {
 					t.Fatal(err)
 				}
 			}
diff --git a/services/core/internal/store/claude_execution_test.go b/services/core/internal/store/claude_execution_test.go
index b76101ae7..cf3b54681 100644
--- a/services/core/internal/store/claude_execution_test.go
+++ b/services/core/internal/store/claude_execution_test.go
@@ -152,7 +152,7 @@ func TestClaudeInvalidImageResultRejectsWholeBatchBeforePersistence(t *testing.T
 	if err != nil || turn.Status != sessions.TurnWaiting || !turn.CancelRequestedAt.IsZero() {
 		t.Fatal(turn, err)
 	}
-	history, err := h.s.ListTurnInputs(t.Context(), h.tenant, h.session.ID, input.TurnID, 0, 100)
+	history, err := store.SessionAdapter(h.s).ListTurnInputs(t.Context(), h.tenant, h.session.ID, input.TurnID, 0, 100)
 	if err != nil || len(history) != 1 {
 		t.Fatal(history, err)
 	}
diff --git a/services/core/internal/store/command_output_test.go b/services/core/internal/store/command_output_test.go
index e2e1cb94f..a87885fa2 100644
--- a/services/core/internal/store/command_output_test.go
+++ b/services/core/internal/store/command_output_test.go
@@ -22,7 +22,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "start", json.RawMessage(`{"text":"run commands"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"run commands"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -135,7 +135,7 @@ func TestExecutionJournalsCommandOutputBeforeCancellation(t *testing.T) {
 	h.read(testExecutionRequest)
 	h.write(input.TurnID, proto.TypeToolCall, proto.ToolCallPayload{ID: "cmd", Stage: "before", Observation: &proto.ToolObservation{Kind: "command", Command: "wait", Status: "in_progress"}})
 	h.write(input.TurnID, proto.TypeCommandOutput, proto.CommandOutputPayload{ID: "cmd", Delta: "partial"})
-	if _, err := h.s.RequestCancel(ctx, h.tenant, h.session.ID, "cancel"); err != nil {
+	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
 	env := h.read(proto.TypePromptCancel)
diff --git a/services/core/internal/store/creation_stream_settlement_public_test.go b/services/core/internal/store/creation_stream_settlement_public_test.go
index 7de1cccaf..2dced38ca 100644
--- a/services/core/internal/store/creation_stream_settlement_public_test.go
+++ b/services/core/internal/store/creation_stream_settlement_public_test.go
@@ -171,7 +171,7 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 	created.ended(t, 5*time.Second)
 
 	connect(first.Session.Environment.ID)
-	if _, err := s.ReserveEnvironmentInput(t.Context(), tenant, first.Session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); err != nil {
+	if _, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, first.Session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); err != nil {
 		t.Fatal(err)
 	}
 	if current, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, first.Session.ID); err != nil || !current.PendingInput {
@@ -211,7 +211,7 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if settled, err := s.CancelEnvironmentInput(t.Context(), tenant, session, reservation); err != nil || settled.State != sessions.EnvironmentInputCancelled {
+	if settled, err := store.CancelEnvironmentInput(t.Context(), s, tenant, session, reservation); err != nil || settled.State != sessions.EnvironmentInputCancelled {
 		t.Fatal(settled.State, err)
 	}
 	if after, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, session); err != nil || after != cursor {
diff --git a/services/core/internal/store/deployment_model_providers_http_test.go b/services/core/internal/store/deployment_model_providers_http_test.go
index 0b0848aa9..774319df1 100644
--- a/services/core/internal/store/deployment_model_providers_http_test.go
+++ b/services/core/internal/store/deployment_model_providers_http_test.go
@@ -244,7 +244,7 @@ func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
 	}
 	executor := connectFixtureRuntime(t, h, legacy)
 	// Reserved directly, as a pre-upgrade Core did.
-	pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, legacy.ID, "before-upgrade", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"old"}`)}})
+	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, legacy.ID, "before-upgrade", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"old"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -268,7 +268,7 @@ func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
 		t.Fatal("rejected work was queued", before, after)
 	}
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "legacy reservation settled", func() bool {
-		got, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, legacy.ID, pending.ID)
+		got, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, legacy.ID, pending.ID)
 		return err == nil && got.State == sessions.EnvironmentInputFailed
 	})
 	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, legacy.ID)
diff --git a/services/core/internal/store/dispatch_test.go b/services/core/internal/store/dispatch_test.go
index e5ca9514c..90d97092a 100644
--- a/services/core/internal/store/dispatch_test.go
+++ b/services/core/internal/store/dispatch_test.go
@@ -127,7 +127,7 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 func (h *dispatchHarness) message(key, text string) sessions.InputReceipt {
 	h.t.Helper()
 	body, _ := json.Marshal(map[string]string{"text": text})
-	r, err := h.s.SubmitMessage(context.Background(), h.tenant, h.session.ID, key, body)
+	r, err := store.SendMessage(context.Background(), h.s, h.tenant, h.session.ID, key, body)
 	if err != nil {
 		h.t.Fatal(err)
 	}
@@ -290,7 +290,7 @@ func TestExecutionCancellationRequiresReceiptAndSurvivesContextEnd(t *testing.T)
 			first := h.message("first", "Run")
 			result := h.run(context.Background(), first.TurnID)
 			h.read(testExecutionRequest)
-			_, err := h.s.RequestCancel(context.Background(), h.tenant, h.session.ID, "cancel")
+			_, err := store.RequestCancel(context.Background(), h.s, h.tenant, h.session.ID, "cancel")
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/environment_admission_test.go b/services/core/internal/store/environment_admission_test.go
index 48f5a5d89..052666fdb 100644
--- a/services/core/internal/store/environment_admission_test.go
+++ b/services/core/internal/store/environment_admission_test.go
@@ -73,7 +73,7 @@ func environmentAdmissionPending(t *testing.T, h *dispatchHarness, key string) s
 	awaitDaemonRemoteCondition(t, t.Context(), 3*time.Second, "input reservation", func() bool {
 		return pool.QueryRow(t.Context(), "SELECT id::text FROM environment_input_reservations WHERE session_id=$1 AND idempotency_key=$2", h.session.ID, key).Scan(&id) == nil
 	})
-	pending, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, id)
+	pending, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, id)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -181,7 +181,7 @@ func TestEnvironmentAdmissionSettlementDoesNotCreateTurn(t *testing.T) {
 				}
 			case "cancelled":
 				expected = execution.ErrEnvironmentInputCancelled
-				if _, err := h.s.CancelEnvironmentInput(t.Context(), h.tenant, h.session.ID, pending.ID); err != nil {
+				if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
 					t.Fatal(err)
 				}
 			case "deleted":
@@ -220,7 +220,7 @@ func TestEnvironmentAdmissionSettlementDoesNotCreateTurn(t *testing.T) {
 			if name == "deleted" {
 				return
 			}
-			retained, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+			retained, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/environment_claim_worker_test.go b/services/core/internal/store/environment_claim_worker_test.go
index a3b57b5b2..62221cd64 100644
--- a/services/core/internal/store/environment_claim_worker_test.go
+++ b/services/core/internal/store/environment_claim_worker_test.go
@@ -19,8 +19,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 			s, db := newTestStoreDB(t)
 			tenant, pending := newEnvironmentExpiryReservation(t, s)
 			owner := executionOwner(t, db, s)
-			writer := owner.Store
-			got, err := writer.PromoteEnvironmentInput(t.Context(), tenant, pending.SessionID, pending.ID)
+			got, err := owner.Sessions.PromoteEnvironmentInput(t.Context(), tenant, pending.SessionID, pending.ID)
 			if err != nil || len(got.Receipts) != 1 || got.Receipts[0].Replayed {
 				t.Fatal(got, err)
 			}
@@ -66,7 +65,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 			if err != nil || turns != 1 || inputs != 1 || queued != 0 {
 				t.Fatal("restart duplicated or requeued prepared work", turns, inputs, queued, err)
 			}
-			successor := executionOwner(t, db, s).Store
+			successor := executionOwner(t, db, s).Sessions
 			retry, err := successor.PromoteEnvironmentInput(t.Context(), tenant, pending.SessionID, pending.ID)
 			if deleted {
 				if !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/internal/store/environment_device_test.go b/services/core/internal/store/environment_device_test.go
index 46801cb71..e56cadc9e 100644
--- a/services/core/internal/store/environment_device_test.go
+++ b/services/core/internal/store/environment_device_test.go
@@ -61,7 +61,7 @@ func TestWorkerEnvironmentSelectsCapableDeviceWithoutMovingBinding(t *testing.T)
 			}
 			stop()
 			for _, value := range []sessions.EnvironmentInputReservation{pending, bound} {
-				stored, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, value.SessionID, value.ID)
+				stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, value.SessionID, value.ID)
 				if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(value.Deadline) {
 					t.Fatal("device readiness changed pending input", err)
 				}
diff --git a/services/core/internal/store/environment_directory_active_test.go b/services/core/internal/store/environment_directory_active_test.go
index 161e59146..2f6db1cf1 100644
--- a/services/core/internal/store/environment_directory_active_test.go
+++ b/services/core/internal/store/environment_directory_active_test.go
@@ -5,12 +5,13 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestEnvironmentDirectoryActiveRunUsesExistingOwner(t *testing.T) {
 	h, w, environment := directoryWorker(t)
 	awaitFixtureCapabilities(t, h, workerEnvironmentCapabilities())
-	pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "execute", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}})
+	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "execute", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/environment_expiry_worker_test.go b/services/core/internal/store/environment_expiry_worker_test.go
index 9ce19dd15..93be26e40 100644
--- a/services/core/internal/store/environment_expiry_worker_test.go
+++ b/services/core/internal/store/environment_expiry_worker_test.go
@@ -26,7 +26,7 @@ func newEnvironmentExpiryReservation(t *testing.T, s *store.Store) (string, sess
 	if err != nil {
 		t.Fatal(err)
 	}
-	pending, err := s.ReserveEnvironmentInput(t.Context(), tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"wait for the environment"}`)}})
+	pending, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"wait for the environment"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -68,7 +68,7 @@ func waitEnvironmentExpiry(t *testing.T, s *store.Store, tenant string, pending
 	t.Helper()
 	deadline := time.Now().Add(5 * time.Second)
 	for {
-		got, err := s.GetEnvironmentInputReservation(t.Context(), tenant, pending.SessionID, pending.ID)
+		got, err := store.SessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, pending.SessionID, pending.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -107,7 +107,7 @@ func TestWorkerEnvironmentExpiryWithoutDevicesAndAfterRestart(t *testing.T) {
 	d := &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry()}
 	_, stop := startEnvironmentExpiryWorker(t, db, d)
 	waitEnvironmentExpiry(t, s, dueTenant, due)
-	got, err := s.GetEnvironmentInputReservation(t.Context(), futureTenant, future.SessionID, future.ID)
+	got, err := store.SessionAdapter(s).GetEnvironmentInputReservation(t.Context(), futureTenant, future.SessionID, future.ID)
 	if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(future.Deadline) {
 		t.Fatal("future input changed", got, err)
 	}
diff --git a/services/core/internal/store/environment_file_writes_test.go b/services/core/internal/store/environment_file_writes_test.go
index 68cc9c7c6..73c342b23 100644
--- a/services/core/internal/store/environment_file_writes_test.go
+++ b/services/core/internal/store/environment_file_writes_test.go
@@ -61,10 +61,10 @@ func TestEnvironmentFileWriteRetainsUnknownAcrossLeaseLoss(t *testing.T) {
 	if _, err := next.ReserveEnvironmentFileWrite(ctx, f.tenant, f.env.ID, another); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("restart admitted successor", err)
 	}
-	if _, err := reopened.ReserveEnvironmentInput(ctx, f.tenant, f.session.ID, "new-input", []sessions.Input{messageInput("new")}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := sessionService(t, reopened).ReserveEnvironmentInput(ctx, f.tenant, f.session.ID, "new-input", []sessions.Input{messageInput("new")}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("unknown write admitted input", err)
 	}
-	if _, err := reopened.SubmitMessage(ctx, f.tenant, f.session.ID, "direct", messageInput("new").Payload); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := sendMessage(ctx, reopened, f.tenant, f.session.ID, "direct", messageInput("new").Payload); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("direct admission bypassed write", err)
 	}
 	if _, err := sessionAdapter(reopened).GetEnvironment(ctx, f.tenant, f.env.ID); err != nil {
@@ -73,7 +73,7 @@ func TestEnvironmentFileWriteRetainsUnknownAcrossLeaseLoss(t *testing.T) {
 	if _, err := sessionAdapter(reopened).GetSession(ctx, f.tenant, f.session.ID); err != nil {
 		t.Fatal("write gate prevented recovery read", err)
 	}
-	if receipt, err := reopened.RequestCancel(ctx, f.tenant, f.session.ID, "idle-cancel"); err != nil || receipt.TurnID != "" {
+	if receipt, err := requestCancel(ctx, reopened, f.tenant, f.session.ID, "idle-cancel"); err != nil || receipt.TurnID != "" {
 		t.Fatal("write gate imposed mutation admission on idle cancellation", receipt, err)
 	}
 	if got, err := FixtureFileWrite(ctx, reopened.pool, f.tenant, f.env.ID, f.key.ID); err != nil || got.State != "pending" {
@@ -178,7 +178,7 @@ func TestEnvironmentFileWriteSerializesWithInputAndRetry(t *testing.T) {
 		group.Go(func() {
 			<-start
 			var err error
-			pending, err = f.s.ReserveEnvironmentInput(ctx, f.tenant, f.session.ID, inputKey, []sessions.Input{messageInput("race")})
+			pending, err = sessionService(t, f.s).ReserveEnvironmentInput(ctx, f.tenant, f.session.ID, inputKey, []sessions.Input{messageInput("race")})
 			inputs <- err
 		})
 		close(start)
@@ -189,7 +189,7 @@ func TestEnvironmentFileWriteSerializesWithInputAndRetry(t *testing.T) {
 				t.Fatal(err)
 			}
 		} else if inputErr == nil && errors.Is(writeErr, sessions.ErrTurnConflict) {
-			if _, err := f.s.CancelEnvironmentInput(ctx, f.tenant, f.session.ID, pending.ID); err != nil {
+			if _, err := cancelEnvironmentInput(ctx, f.s, f.tenant, f.session.ID, pending.ID); err != nil {
 				t.Fatal(err)
 			}
 		} else {
diff --git a/services/core/internal/store/environment_initial_input_test.go b/services/core/internal/store/environment_initial_input_test.go
index ae58bba5b..2cb963652 100644
--- a/services/core/internal/store/environment_initial_input_test.go
+++ b/services/core/internal/store/environment_initial_input_test.go
@@ -21,7 +21,7 @@ func initialEnvironmentReservation(t *testing.T, s *Store, pool *pgxpool.Pool, t
 	if err := pool.QueryRow(t.Context(), "SELECT id FROM environment_input_reservations WHERE session_id=$1 AND is_initial", session).Scan(&id); err != nil {
 		t.Fatal(err)
 	}
-	reservation, err := s.GetEnvironmentInputReservation(t.Context(), tenant, session, id)
+	reservation, err := sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, session, id)
 	if err != nil || !reservation.IsInitial {
 		t.Fatal("missing initial origin", reservation, err)
 	}
@@ -49,7 +49,7 @@ func TestEnvironmentInitialExpiryRollsBackWithFailureEventAndSerializesPromotion
 		_, _ = pool.Exec(context.Background(), "ALTER TABLE session_events DROP CONSTRAINT IF EXISTS "+constraint)
 	})
 	writer := executionWriter(t, s)
-	if _, err := writer.ExpireEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID); err == nil {
+	if _, err := sessionService(t, writer).ExpireEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID); err == nil {
 		t.Fatal("expiry committed without its failure event")
 	}
 	retained := initialEnvironmentReservation(t, s, pool, tenant, session.ID)
@@ -65,7 +65,7 @@ func TestEnvironmentInitialExpiryRollsBackWithFailureEventAndSerializesPromotion
 		err         error
 	}
 	results := make(chan result, 2)
-	for _, settle := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){writer.PromoteEnvironmentInput, s.ExpireEnvironmentInput} {
+	for _, settle := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){sessionExecution(t, writer.lease).PromoteEnvironmentInput, sessionService(t, s).ExpireEnvironmentInput} {
 		go func() { r, err := settle(t.Context(), tenant, session.ID, reservation.ID); results <- result{r, err} }()
 	}
 	for i := 0; i < 2; i++ {
@@ -156,7 +156,7 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 			}
 			requireEnvironmentInputActivity(t, s, tenant, session.ID, connectedStatus, "")
 			environmentInputHistory(t, pool, session.ID, 0, 0)
-			promoted, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
+			promoted, err := sessionExecution(t, writer.lease).PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
 			if err != nil || promoted.State != sessions.EnvironmentInputAdmitted || !promoted.IsInitial || len(promoted.Receipts) != 2 {
 				t.Fatal("initial batch did not promote", promoted, err)
 			}
@@ -164,7 +164,7 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 			if active.LastTurn == nil || active.LastTurn.Status != sessions.TurnInProgress || active.PendingInput {
 				t.Fatal("promotion did not claim its Turn", active.LastTurn)
 			}
-			replay, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
+			replay, err := sessionExecution(t, writer.lease).PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
 			if err != nil || len(replay.Receipts) != 2 || !replay.Receipts[0].Replayed || !replay.Receipts[1].Replayed {
 				t.Fatal("promotion retry granted fresh receipts", replay, err)
 			}
@@ -211,7 +211,7 @@ func TestEnvironmentInitialInputExpiryHasNoTurnAndCannotReplay(t *testing.T) {
 			}
 			writer := executionWriter(t, s)
 			for reservation.State == sessions.EnvironmentInputPending {
-				count, err := writer.ExpireEnvironmentInputs(t.Context())
+				count, err := sessionExecution(t, writer.lease).ExpireEnvironmentInputs(t.Context())
 				if err != nil || count < 1 || count > 32 {
 					t.Fatal("expiry made no bounded progress", count, err)
 				}
@@ -250,7 +250,7 @@ func TestEnvironmentInitialInputExpiryHasNoTurnAndCannotReplay(t *testing.T) {
 			if err := sessionExecution(t, writer.lease).ObserveEnvironmentConnection(t.Context(), tenant, session.Environment.ID, generation, 1, true); err != nil {
 				t.Fatal(err)
 			}
-			late, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
+			late, err := sessionExecution(t, writer.lease).PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
 			if err != nil || late.State != sessions.EnvironmentInputExpired || len(late.Receipts) != 0 {
 				t.Fatal("late connection resurrected initial input", late, err)
 			}
@@ -269,7 +269,7 @@ func TestEnvironmentInitialInputExpiryHasNoTurnAndCannotReplay(t *testing.T) {
 			if err := sessionService(t, reopened).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 				t.Fatal("pending later input deleted", err)
 			}
-			if _, err := reopened.CancelEnvironmentInput(t.Context(), tenant, session.ID, later.ID); err != nil {
+			if _, err := cancelEnvironmentInput(t.Context(), reopened, tenant, session.ID, later.ID); err != nil {
 				t.Fatal(err)
 			}
 			if err := sessionService(t, reopened).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
diff --git a/services/core/internal/store/environment_initial_public_test.go b/services/core/internal/store/environment_initial_public_test.go
index 82deb5708..dd490c24a 100644
--- a/services/core/internal/store/environment_initial_public_test.go
+++ b/services/core/internal/store/environment_initial_public_test.go
@@ -38,7 +38,6 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 		t.Fatal(err)
 	}
 	owner := executionOwner(t, db, s)
-	writer := owner.Store
 	t.Cleanup(func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		defer cancel()
@@ -94,7 +93,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 	if err := db.pool.QueryRow(t.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1 AND is_initial RETURNING id", session.ID).Scan(&reservation); err != nil {
 		t.Fatal(err)
 	}
-	if result, err := writer.ExpireEnvironmentInput(t.Context(), tenant, session.ID, reservation); err != nil || result.State != sessions.EnvironmentInputExpired {
+	if result, err := store.SessionService(t, s).ExpireEnvironmentInput(t.Context(), tenant, session.ID, reservation); err != nil || result.State != sessions.EnvironmentInputExpired {
 		t.Fatal("initial reservation did not expire", result, err)
 	}
 	observed := <-done
diff --git a/services/core/internal/store/environment_input_activity.go b/services/core/internal/store/environment_input_activity.go
deleted file mode 100644
index 5e32b7e0e..000000000
--- a/services/core/internal/store/environment_input_activity.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package store
-
-import (
-	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// withEnvironmentInputSession runs apply in the public Session's transaction
-// and reports the input activity it changes.
-func (s *Store) withEnvironmentInputSession(ctx context.Context, tenantID, sessionID string, apply func(context.Context, *sqlc.Queries, pgtype.UUID) error) error {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return err
-	}
-	return s.withPublicSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, id pgtype.UUID) error {
-		return sessions.TrackInputActivity(ctx, sessionpg.BindSession(q, tenant, id), func(ctx context.Context) error { return apply(ctx, q, id) })
-	})
-}
diff --git a/services/core/internal/store/environment_input_activity_test.go b/services/core/internal/store/environment_input_activity_test.go
index 2dd6a8cd9..b874348f9 100644
--- a/services/core/internal/store/environment_input_activity_test.go
+++ b/services/core/internal/store/environment_input_activity_test.go
@@ -85,7 +85,7 @@ func TestEnvironmentInputActivityWaitsBeforeTurnAndClearsOnConnection(t *testing
 	if err := sessionExecution(t, writer.lease).ObserveEnvironmentConnection(t.Context(), tenant, environment, generation, 3, true); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID); err != nil {
+	if _, err := sessionExecution(t, writer.lease).PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID); err != nil {
 		t.Fatal(err)
 	}
 	active := requireEnvironmentInputActivity(t, s, tenant, session.ID, "", "")
@@ -103,7 +103,7 @@ func TestEnvironmentInputActivitySettlementAndNewerWork(t *testing.T) {
 			s, pool := testStore(t)
 			tenant, session := environmentInputSession(t, s)
 			writer := executionWriter(t, s)
-			prior, err := s.SubmitInputs(t.Context(), tenant, session.ID, "prior", []sessions.Input{messageInput("prior")})
+			prior, err := submitInputs(t.Context(), s, tenant, session.ID, "prior", []sessions.Input{messageInput("prior")})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -120,18 +120,18 @@ func TestEnvironmentInputActivitySettlementAndNewerWork(t *testing.T) {
 				t.Fatal(err)
 			}
 			if state == sessions.EnvironmentInputCancelled {
-				_, err = s.CancelEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
+				_, err = cancelEnvironmentInput(t.Context(), s, tenant, session.ID, reservation.ID)
 			} else {
 				if _, err := pool.Exec(t.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE id=$1", reservation.ID); err != nil {
 					t.Fatal(err)
 				}
 				// Other retained test rows may precede this reservation in bounded batches.
 				for reservation.State == sessions.EnvironmentInputPending {
-					count, sweepErr := writer.ExpireEnvironmentInputs(t.Context())
+					count, sweepErr := sessionExecution(t, writer.lease).ExpireEnvironmentInputs(t.Context())
 					if sweepErr != nil || count < 1 || count > 32 {
 						t.Fatal("expiry made no bounded progress", count, sweepErr)
 					}
-					reservation, err = s.GetEnvironmentInputReservation(t.Context(), tenant, session.ID, reservation.ID)
+					reservation, err = sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, session.ID, reservation.ID)
 					if err != nil {
 						t.Fatal(err)
 					}
@@ -155,7 +155,7 @@ func TestEnvironmentInputActivitySettlementAndNewerWork(t *testing.T) {
 			if after, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID); err != nil || after != cursor {
 				t.Fatal("settled retry repeated activity", after, cursor, err)
 			}
-			if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "newer", []sessions.Input{messageInput("newer")}); err != nil {
+			if _, err := submitInputs(t.Context(), s, tenant, session.ID, "newer", []sessions.Input{messageInput("newer")}); err != nil {
 				t.Fatal(err)
 			}
 			requireEnvironmentInputActivity(t, s, tenant, session.ID, "", "")
@@ -173,7 +173,7 @@ func TestEnvironmentInputActivityRollsBackReservationAndConnection(t *testing.T)
 	t.Cleanup(func() {
 		_, _ = pool.Exec(context.Background(), "ALTER TABLE session_events DROP CONSTRAINT IF EXISTS "+constraint)
 	})
-	if _, err := s.ReserveEnvironmentInput(t.Context(), tenant, session.ID, "rollback", []sessions.Input{messageInput("pending")}); err == nil {
+	if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "rollback", []sessions.Input{messageInput("pending")}); err == nil {
 		t.Fatal("activity failure retained reservation")
 	}
 	var count int
@@ -227,7 +227,7 @@ func TestEnvironmentInputActivityRecoversWaitingActionAndHidesDeletion(t *testin
 		t.Fatal(err)
 	}
 	requireEnvironmentInputActivity(t, s, tenant, session.ID, "requires_action", environment)
-	got, err := s.GetEnvironmentInputReservation(t.Context(), tenant, session.ID, reservation.ID)
+	got, err := sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, session.ID, reservation.ID)
 	if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(reservation.Deadline) {
 		t.Fatal("recovery changed waiting input or its deadline", got, err)
 	}
@@ -255,25 +255,3 @@ func TestEnvironmentInputActivityRecoversWaitingActionAndHidesDeletion(t *testin
 		t.Fatal("deleted activity events remained visible", err)
 	}
 }
-
-func TestPreparationFailurePreservesCancelledAndNewerInput(t *testing.T) {
-	s, _ := testStore(t)
-	tenant, session := environmentInputSession(t, s)
-	first := reserveEnvironmentInput(t, s, tenant, session.ID, "cancelled")
-	if _, err := s.CancelEnvironmentInput(t.Context(), tenant, session.ID, first.ID); err != nil {
-		t.Fatal(err)
-	}
-	next := reserveEnvironmentInput(t, s, tenant, session.ID, "new")
-	if err := s.FailEnvironmentInput(t.Context(), tenant, session.ID, first.ID, "runtime_preparation_failed"); err != nil {
-		t.Fatal(err)
-	}
-	for id, state := range map[string]string{first.ID: sessions.EnvironmentInputCancelled, next.ID: sessions.EnvironmentInputPending} {
-		current, err := s.GetEnvironmentInputReservation(t.Context(), tenant, session.ID, id)
-		if err != nil || current.State != state {
-			t.Fatal("late failure changed another outcome", err)
-		}
-	}
-	if err := s.FailEnvironmentInput(t.Context(), tenant, session.ID, next.ID, "secret-canary"); !errors.Is(err, sessions.ErrInvalidInput) {
-		t.Fatal("unclassified diagnostic accepted", err)
-	}
-}
diff --git a/services/core/internal/store/environment_input_claim_test.go b/services/core/internal/store/environment_input_claim_test.go
deleted file mode 100644
index 8ce51ee8d..000000000
--- a/services/core/internal/store/environment_input_claim_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package store
-
-import (
-	"sync"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-func TestEnvironmentInputConcurrentPromotionClaimsOnce(t *testing.T) {
-	s, pool := testStore(t)
-	writer := executionWriter(t, s)
-	tenant, session := environmentInputSession(t, s)
-	pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-	reservationCursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	const count = 8
-	results := make(chan sessions.EnvironmentInputReservation, count)
-	var group sync.WaitGroup
-	for range count {
-		group.Go(func() {
-			got, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			results <- got
-		})
-	}
-	group.Wait()
-	close(results)
-	var turnID string
-	fresh, received := 0, 0
-	for got := range results {
-		received++
-		if got.State != sessions.EnvironmentInputAdmitted || len(got.Receipts) != 2 {
-			t.Fatal("promotion lost the original batch", got)
-		}
-		if turnID == "" {
-			turnID = got.Receipts[0].TurnID
-		}
-		if !got.Receipts[0].Replayed {
-			fresh++
-		}
-		for _, receipt := range got.Receipts {
-			if receipt.TurnID != turnID || receipt.Replayed != got.Receipts[0].Replayed {
-				t.Fatal("promotion changed execution ownership", got.Receipts)
-			}
-		}
-	}
-	if received != count || fresh != 1 {
-		t.Fatal("promotion authorized multiple starts", received, fresh)
-	}
-	turn, err := sessionAdapter(s).GetTurn(t.Context(), tenant, session.ID, turnID)
-	if err != nil || turn.Status != sessions.TurnInProgress || turn.StartedAt.IsZero() {
-		t.Fatal("promotion did not persist its execution claim", turn, err)
-	}
-	environmentInputHistory(t, pool, session.ID, 1, 2)
-	changes, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, reservationCursor)
-	if err != nil || len(changes) < 2 {
-		t.Fatal("missing promotion events", changes, err)
-	}
-	created, claimed := changes[0], changes[len(changes)-1]
-	if created.Event.Type != "agent.session.turn.created" || created.Turn == nil || created.Turn.Status != sessions.TurnQueued || claimed.Event.Type != "agent.session.turn.in_progress" || claimed.Turn == nil || claimed.Turn.ID != turnID || claimed.Turn.Status != sessions.TurnInProgress {
-		t.Fatal("claim reordered or replaced admission snapshots", created, claimed)
-	}
-	claimEvents := 0
-	for _, change := range changes {
-		if change.Event.Type == "agent.session.turn.in_progress" {
-			claimEvents++
-		}
-	}
-	if claimEvents != 1 {
-		t.Fatal("retry published another claim", claimEvents)
-	}
-	transition(t, writer, tenant, session.ID, turnID, sessions.TurnInProgress, sessions.TurnCompleted)
-	later := reserveEnvironmentInput(t, s, tenant, session.ID, "later")
-	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	retry, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID)
-	if err != nil || len(retry.Receipts) != 2 || !retry.Receipts[0].Replayed || retry.Receipts[0].TurnID != turnID {
-		t.Fatal("terminal retry reclaimed execution", retry, err)
-	}
-	after, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
-	if err != nil || after != cursor {
-		t.Fatal("terminal retry published events", after, cursor, err)
-	}
-	retained, err := s.GetEnvironmentInputReservation(t.Context(), tenant, session.ID, later.ID)
-	if err != nil || retained.State != sessions.EnvironmentInputPending || !retained.Deadline.Equal(later.Deadline) {
-		t.Fatal("old promotion affected new preparation", retained, err)
-	}
-}
diff --git a/services/core/internal/store/environment_input_expiry.go b/services/core/internal/store/environment_input_expiry.go
deleted file mode 100644
index 3724937da..000000000
--- a/services/core/internal/store/environment_input_expiry.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package store
-
-import (
-	"context"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-)
-
-// ExpireEnvironmentInputs settles one bounded batch without creating Turn history.
-// Only the current execution writer may run this cross-Session maintenance.
-func (s *Store) ExpireEnvironmentInputs(ctx context.Context) (int64, error) {
-	if err := s.checkExecutionAuthority(); err != nil {
-		return 0, err
-	}
-	var expired int64
-	err := s.writer.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		rows, err := q.ListDueEnvironmentInputs(ctx)
-		if err != nil {
-			return err
-		}
-		for _, row := range rows {
-			err := sessions.TrackInputActivity(ctx, sessionpg.BindSession(q, row.TenantID, row.SessionID), func(ctx context.Context) error {
-				return q.ExpireEnvironmentInputReservation(ctx, sqlc.ExpireEnvironmentInputReservationParams{SessionID: row.SessionID, ID: row.ID})
-			})
-			if err != nil {
-				return err
-			}
-			if err := sessionpg.PruneChanges(ctx, q, row.SessionID); err != nil {
-				return err
-			}
-			expired++
-		}
-		return nil
-	})
-	if err != nil {
-		return 0, err
-	}
-	return expired, nil
-}
diff --git a/services/core/internal/store/environment_input_expiry_test.go b/services/core/internal/store/environment_input_expiry_test.go
index f733964f8..4c003e0e6 100644
--- a/services/core/internal/store/environment_input_expiry_test.go
+++ b/services/core/internal/store/environment_input_expiry_test.go
@@ -10,86 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-func TestEnvironmentExpiryBoundsBatchAndRequiresExecutionWriter(t *testing.T) {
-	s, pool := testStore(t)
-	ctx := t.Context()
-	var reservations []sessions.EnvironmentInputReservation
-	for range 33 {
-		tenant, session := environmentInputSession(t, s)
-		pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-		reservations = append(reservations, pending)
-		if _, err := pool.Exec(ctx, "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE id=$1", pending.ID); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if n, err := s.ExpireEnvironmentInputs(ctx); err == nil || n != 0 {
-		t.Fatal("unleased maintenance", n, err)
-	}
-	var before, after, due int64
-	if err := pool.QueryRow(ctx, "SELECT count(*) FILTER (WHERE state='expired'), count(*) FILTER (WHERE state='pending' AND deadline <= statement_timestamp()) FROM environment_input_reservations").Scan(&before, &due); err != nil {
-		t.Fatal(err)
-	}
-	writer := executionWriter(t, s)
-	n, err := writer.ExpireEnvironmentInputs(ctx)
-	if err != nil || n != 32 {
-		t.Fatal("unbounded or incomplete batch", n, err)
-	}
-	if err := pool.QueryRow(ctx, "SELECT count(*) FROM environment_input_reservations WHERE state='expired'").Scan(&after); err != nil || after-before != n {
-		t.Fatal("reported expiry did not match persisted settlement", before, after, n, err)
-	}
-	// Existing test rows may precede this fixture; each pass must make bounded progress.
-	for remaining := due - n; remaining > 0; {
-		n, err = writer.ExpireEnvironmentInputs(ctx)
-		if err != nil || n <= 0 || n > 32 {
-			t.Fatal("expiry backlog did not progress", n, err)
-		}
-		remaining -= n
-	}
-	for _, pending := range reservations {
-		var state string
-		if err := pool.QueryRow(ctx, "SELECT state FROM environment_input_reservations WHERE id=$1", pending.ID).Scan(&state); err != nil || state != sessions.EnvironmentInputExpired {
-			t.Fatal(state, err)
-		}
-		environmentInputHistory(t, pool, pending.SessionID, 0, 0)
-	}
-}
-
-func TestEnvironmentExpiryFencesLostExecutionOwner(t *testing.T) {
-	s, pool := testStore(t)
-	tenant, session := environmentInputSession(t, s)
-	pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-	if _, err := pool.Exec(t.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE id=$1", pending.ID); err != nil {
-		t.Fatal(err)
-	}
-	old := executionWriter(t, s)
-	var killed bool
-	if err := pool.QueryRow(t.Context(), "SELECT pg_terminate_backend($1,1000)", executionOwnerPID(t, pool)).Scan(&killed); err != nil || !killed {
-		t.Fatal(killed, err)
-	}
-	successor := executionWriter(t, s)
-	if n, err := old.ExpireEnvironmentInputs(t.Context()); err == nil || n != 0 {
-		t.Fatal("lost owner expired input", n, err)
-	}
-	got, err := s.GetEnvironmentInputReservation(t.Context(), tenant, session.ID, pending.ID)
-	if err != nil || got.State != sessions.EnvironmentInputPending {
-		t.Fatal("lost owner wrote through the pool", got, err)
-	}
-	for got.State == sessions.EnvironmentInputPending {
-		n, err := successor.ExpireEnvironmentInputs(t.Context())
-		if err != nil || n == 0 {
-			t.Fatal("successor could not expire input", n, err)
-		}
-		got, err = s.GetEnvironmentInputReservation(t.Context(), tenant, session.ID, pending.ID)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-	if got.State != sessions.EnvironmentInputExpired {
-		t.Fatal(got)
-	}
-	environmentInputHistory(t, pool, session.ID, 0, 0)
-}
-
 func TestEnvironmentExpirySerializesWithTargetedSettlement(t *testing.T) {
 	for _, action := range []string{"promote", "cancel", "delete"} {
 		t.Run(action, func(t *testing.T) {
@@ -99,18 +19,22 @@ func TestEnvironmentExpirySerializesWithTargetedSettlement(t *testing.T) {
 			if _, err := pool.Exec(t.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE id=$1", pending.ID); err != nil {
 				t.Fatal(err)
 			}
-			writer := executionWriter(t, s)
+			operations := sessionExecution(t, executionWriter(t, s).lease)
 			start := make(chan struct{})
 			results := make(chan error, 2)
-			go func() { <-start; _, err := writer.ExpireEnvironmentInputs(t.Context()); results <- err }()
+			go func() {
+				<-start
+				_, err := operations.ExpireEnvironmentInputs(t.Context())
+				results <- err
+			}()
 			go func() {
 				<-start
 				var err error
 				switch action {
 				case "promote":
-					_, err = writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID)
+					_, err = operations.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID)
 				case "cancel":
-					_, err = s.CancelEnvironmentInput(t.Context(), tenant, session.ID, pending.ID)
+					_, err = cancelEnvironmentInput(t.Context(), s, tenant, session.ID, pending.ID)
 				case "delete":
 					err = sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID})
 				}
@@ -131,22 +55,25 @@ func TestEnvironmentExpirySerializesWithTargetedSettlement(t *testing.T) {
 			}
 			environmentInputHistory(t, pool, session.ID, 0, 0)
 			if action == "delete" {
-				if _, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID); !errors.Is(err, sessions.ErrNotFound) {
+				if _, err := operations.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID); !errors.Is(err, sessions.ErrNotFound) {
 					t.Fatal("deleted input resurrected", err)
 				}
 				return
 			}
 			later := reserveEnvironmentInput(t, s, tenant, session.ID, uuid.NewString())
-			for _, settle := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){writer.PromoteEnvironmentInput, s.CancelEnvironmentInput, s.ExpireEnvironmentInput} {
+			for _, settle := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){
+				operations.PromoteEnvironmentInput,
+				sessionService(t, s).ExpireEnvironmentInput,
+			} {
 				old, err := settle(t.Context(), tenant, session.ID, pending.ID)
 				if err != nil || old.State != state {
 					t.Fatal("old reservation changed", old, err)
 				}
 			}
-			if _, err := writer.ExpireEnvironmentInputs(t.Context()); err != nil {
+			if _, err := operations.ExpireEnvironmentInputs(t.Context()); err != nil {
 				t.Fatal(err)
 			}
-			got, err := s.GetEnvironmentInputReservation(t.Context(), tenant, session.ID, later.ID)
+			got, err := sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, session.ID, later.ID)
 			if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(later.Deadline) {
 				t.Fatal("old settlement affected successor", got, err)
 			}
diff --git a/services/core/internal/store/environment_input_migration_test.go b/services/core/internal/store/environment_input_migration_test.go
index c04de8f7a..a792de72c 100644
--- a/services/core/internal/store/environment_input_migration_test.go
+++ b/services/core/internal/store/environment_input_migration_test.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/stdlib"
@@ -92,37 +90,3 @@ func TestEnvironmentInputMigrationRetainsHistoryAndRetryIdentity(t *testing.T) {
 		t.Fatal("migration manufactured a Turn", count, err)
 	}
 }
-
-func TestEnvironmentInputPromotionUsesCurrentExecutionWriter(t *testing.T) {
-	s, pool := testStore(t)
-	tenant, session := environmentInputSession(t, s)
-	pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-	if _, err := s.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID); err == nil {
-		t.Fatal("pooled Store promoted input without execution ownership")
-	}
-	closed := executionWriter(t, s)
-	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, closed.pool)
-	if err := closed.lease.Close(t.Context()); err != nil {
-		t.Fatal(err)
-	}
-	awaitRelease()
-	if _, err := closed.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID); err == nil {
-		t.Fatal("closed execution writer promoted pending input")
-	}
-	environmentInputHistory(t, pool, session.ID, 0, 0)
-	writer := executionWriter(t, s)
-	var killed bool
-	if err := pool.QueryRow(t.Context(), "SELECT pg_terminate_backend($1, 1000)", executionOwnerPID(t, pool)).Scan(&killed); err != nil || !killed {
-		t.Fatal(killed, err)
-	}
-	successor := executionWriter(t, s)
-	if _, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID); err == nil {
-		t.Fatal("stale execution writer promoted pending input")
-	}
-	environmentInputHistory(t, pool, session.ID, 0, 0)
-	got, err := successor.PromoteEnvironmentInput(t.Context(), tenant, session.ID, pending.ID)
-	if err != nil || got.State != sessions.EnvironmentInputAdmitted {
-		t.Fatal("successor could not promote", got, err)
-	}
-	environmentInputHistory(t, pool, session.ID, 1, 2)
-}
diff --git a/services/core/internal/store/environment_input_settlement_test.go b/services/core/internal/store/environment_input_settlement_test.go
index 874d8958a..ac8ee7b74 100644
--- a/services/core/internal/store/environment_input_settlement_test.go
+++ b/services/core/internal/store/environment_input_settlement_test.go
@@ -3,223 +3,11 @@ package store
 import (
 	"context"
 	"errors"
-	"strings"
 	"testing"
-	"time"
-
-	"github.com/google/uuid"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-func TestEnvironmentInputTerminalReservationsCannotRestart(t *testing.T) {
-	for _, terminal := range []string{sessions.EnvironmentInputCancelled, sessions.EnvironmentInputExpired} {
-		t.Run(terminal, func(t *testing.T) {
-			s, pool := testStore(t)
-			writer := executionWriter(t, s)
-			tenant, session := environmentInputSession(t, s)
-			ctx := context.Background()
-			pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-			early, err := s.ExpireEnvironmentInput(ctx, tenant, session.ID, pending.ID)
-			if err != nil || early.State != sessions.EnvironmentInputPending || early.SettledAt != nil || !early.Deadline.Equal(pending.Deadline) {
-				t.Fatal("early expiry", early, err)
-			}
-			var settled sessions.EnvironmentInputReservation
-			if terminal == sessions.EnvironmentInputExpired {
-				if _, err := pool.Exec(ctx, "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE id=$1", pending.ID); err != nil {
-					t.Fatal(err)
-				}
-				settled, err = writer.PromoteEnvironmentInput(ctx, tenant, session.ID, pending.ID)
-			} else {
-				settled, err = s.CancelEnvironmentInput(ctx, tenant, session.ID, pending.ID)
-			}
-			if err != nil || settled.State != terminal || settled.SettledAt == nil || len(settled.Receipts) != 0 {
-				t.Fatal("terminal settlement", settled, err)
-			}
-			retry, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "pending", pending.Inputs)
-			if err != nil || retry.State != terminal || retry.ID != pending.ID || !retry.Deadline.Equal(settled.Deadline) || !retry.SettledAt.Equal(*settled.SettledAt) {
-				t.Fatal("terminal retry changed outcome", retry, err)
-			}
-			if _, err := s.SubmitInputs(ctx, tenant, session.ID, "pending", pending.Inputs); !errors.Is(err, sessions.ErrTurnConflict) {
-				t.Fatal("terminal request reopened through direct path", err)
-			}
-			if _, err := s.SubmitInputs(ctx, tenant, session.ID, "pending", []sessions.Input{messageInput("changed")}); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-				t.Fatal("terminal identity changed", err)
-			}
-			later := reserveEnvironmentInput(t, s, tenant, session.ID, "later")
-			for _, finish := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){
-				writer.PromoteEnvironmentInput, s.CancelEnvironmentInput, s.ExpireEnvironmentInput,
-			} {
-				got, err := finish(ctx, tenant, session.ID, pending.ID)
-				if err != nil || got.State != terminal {
-					t.Fatal("old settlement changed", got, err)
-				}
-			}
-			got, err := s.GetEnvironmentInputReservation(ctx, tenant, session.ID, later.ID)
-			if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(later.Deadline) {
-				t.Fatal("old settlement touched successor", got, err)
-			}
-			environmentInputHistory(t, pool, session.ID, 0, 0)
-		})
-	}
-}
-
-func TestEnvironmentInputPromotionRollsBackHistoryAndSettlement(t *testing.T) {
-	for _, phase := range []string{"input", "settlement", "claim", "claim-event"} {
-		t.Run(phase, func(t *testing.T) {
-			s, pool := testStore(t)
-			writer := executionWriter(t, s)
-			tenant, session := environmentInputSession(t, s)
-			ctx := context.Background()
-			pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-			name := "reservation_failure_" + strings.ReplaceAll(uuid.NewString(), "-", "")
-			table := "turn_inputs"
-			expression := "session_id <> '" + session.ID + "'::uuid OR payload->>'text' <> 'second'"
-			if phase == "settlement" {
-				table = "environment_input_reservations"
-				expression = "id <> '" + pending.ID + "'::uuid OR state <> 'admitted'"
-			}
-			if phase == "claim" {
-				table = "turns"
-				expression = "session_id <> '" + session.ID + "'::uuid OR status <> 'in_progress'"
-			}
-			if phase == "claim-event" {
-				table = "session_events"
-				expression = "session_id <> '" + session.ID + "'::uuid OR payload->'event'->>'type' <> 'agent.session.turn.in_progress'"
-			}
-			if _, err := pool.Exec(ctx, "ALTER TABLE "+table+" ADD CONSTRAINT "+name+" CHECK ("+expression+") NOT VALID"); err != nil {
-				t.Fatal(err)
-			}
-			t.Cleanup(func() { _, _ = pool.Exec(ctx, "ALTER TABLE "+table+" DROP CONSTRAINT IF EXISTS "+name) })
-			if _, err := writer.PromoteEnvironmentInput(ctx, tenant, session.ID, pending.ID); err == nil {
-				t.Fatal("injected failure succeeded")
-			}
-			environmentInputHistory(t, pool, session.ID, 0, 0)
-			got, err := s.GetEnvironmentInputReservation(ctx, tenant, session.ID, pending.ID)
-			if err != nil || got.State != sessions.EnvironmentInputPending || got.SettledAt != nil || !got.Deadline.Equal(pending.Deadline) {
-				t.Fatal("partial settlement survived", got, err)
-			}
-			if _, err := pool.Exec(ctx, "ALTER TABLE "+table+" DROP CONSTRAINT "+name); err != nil {
-				t.Fatal(err)
-			}
-			got, err = writer.PromoteEnvironmentInput(ctx, tenant, session.ID, pending.ID)
-			if err != nil || got.State != sessions.EnvironmentInputAdmitted {
-				t.Fatal(got, err)
-			}
-			environmentInputHistory(t, pool, session.ID, 1, 2)
-		})
-	}
-}
-
-func TestEnvironmentInputDeadlineIsCheckedAfterSessionLock(t *testing.T) {
-	for _, action := range []string{"promote", "fail"} {
-		t.Run(action, func(t *testing.T) {
-			s, pool := testStore(t)
-			writer := executionWriter(t, s)
-			tenant, session := environmentInputSession(t, s)
-			pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-			tx, err := pool.Begin(ctx)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer func() { _ = tx.Rollback(context.Background()) }()
-			var blocker int32
-			if err := tx.QueryRow(ctx, "SELECT pg_backend_pid() FROM sessions WHERE id=$1 FOR UPDATE", session.ID).Scan(&blocker); err != nil {
-				t.Fatal(err)
-			}
-			type outcome struct {
-				value sessions.EnvironmentInputReservation
-				err   error
-			}
-			done := make(chan outcome, 1)
-			go func() {
-				var got sessions.EnvironmentInputReservation
-				var err error
-				if action == "promote" {
-					got, err = writer.PromoteEnvironmentInput(ctx, tenant, session.ID, pending.ID)
-				} else {
-					err = writer.FailEnvironmentInput(ctx, tenant, session.ID, pending.ID, "runtime_preparation_failed")
-					if err == nil {
-						got, err = s.GetEnvironmentInputReservation(ctx, tenant, session.ID, pending.ID)
-					}
-				}
-				done <- outcome{got, err}
-			}()
-			for {
-				var blocked bool
-				if err := pool.QueryRow(ctx, "SELECT EXISTS (SELECT 1 FROM pg_stat_activity WHERE $1=ANY(pg_blocking_pids(pid)))", blocker).Scan(&blocked); err != nil {
-					t.Fatal(err)
-				}
-				if blocked {
-					break
-				}
-				select {
-				case result := <-done:
-					t.Fatal("settlement bypassed Session lock", result)
-				case <-ctx.Done():
-					t.Fatal("settlement lock wait not observed")
-				case <-time.After(5 * time.Millisecond):
-				}
-			}
-			// Transaction-start time is now older than the controlled deadline.
-			if _, err := tx.Exec(ctx, "UPDATE environment_input_reservations SET deadline=clock_timestamp() WHERE id=$1", pending.ID); err != nil {
-				t.Fatal(err)
-			}
-			if err := tx.Commit(ctx); err != nil {
-				t.Fatal(err)
-			}
-			result := <-done
-			if result.err != nil || result.value.State != sessions.EnvironmentInputExpired || result.value.SettledAt == nil {
-				t.Fatal("lock wait extended input lifetime", result)
-			}
-			environmentInputHistory(t, pool, session.ID, 0, 0)
-			stored, err := s.GetEnvironmentInputReservation(ctx, tenant, session.ID, pending.ID)
-			if err != nil || stored.State != sessions.EnvironmentInputExpired {
-				t.Fatal("expiry was rolled back", stored, err)
-			}
-		})
-	}
-}
-
-func TestEnvironmentInputCancelAndPromotionShareOneOutcome(t *testing.T) {
-	s, pool := testStore(t)
-	writer := executionWriter(t, s)
-	other, _ := testStore(t)
-	tenant, session := environmentInputSession(t, s)
-	ctx := context.Background()
-	pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-	start := make(chan struct{})
-	results := make(chan sessions.EnvironmentInputReservation, 2)
-	errs := make(chan error, 2)
-	for _, finish := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){
-		writer.PromoteEnvironmentInput, other.CancelEnvironmentInput,
-	} {
-		go func() {
-			<-start
-			got, err := finish(ctx, tenant, session.ID, pending.ID)
-			results <- got
-			errs <- err
-		}()
-	}
-	close(start)
-	first, second := <-results, <-results
-	for range 2 {
-		if err := <-errs; err != nil {
-			t.Fatal(err)
-		}
-	}
-	if first.State != second.State || (first.State != sessions.EnvironmentInputAdmitted && first.State != sessions.EnvironmentInputCancelled) {
-		t.Fatal("competing settlements diverged", first.State, second.State)
-	}
-	turns, inputs := 0, 0
-	if first.State == sessions.EnvironmentInputAdmitted {
-		turns, inputs = 1, 2
-	}
-	environmentInputHistory(t, pool, session.ID, turns, inputs)
-}
-
 func TestEnvironmentInputDeletionSettlesPendingAndFencesPromotion(t *testing.T) {
 	for _, concurrent := range []bool{false, true} {
 		t.Run(map[bool]string{false: "pending", true: "racing-promotion"}[concurrent], func(t *testing.T) {
@@ -231,7 +19,7 @@ func TestEnvironmentInputDeletionSettlesPendingAndFencesPromotion(t *testing.T)
 			done := make(chan error, 1)
 			if concurrent {
 				go func() {
-					_, err := writer.PromoteEnvironmentInput(ctx, tenant, session.ID, pending.ID)
+					_, err := sessionExecution(t, writer.lease).PromoteEnvironmentInput(ctx, tenant, session.ID, pending.ID)
 					done <- err
 				}()
 			}
@@ -250,13 +38,17 @@ func TestEnvironmentInputDeletionSettlesPendingAndFencesPromotion(t *testing.T)
 				}
 			}
 			for _, action := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){
-				s.GetEnvironmentInputReservation, writer.PromoteEnvironmentInput, s.CancelEnvironmentInput,
+				sessionAdapter(s).GetEnvironmentInputReservation,
+				sessionExecution(t, writer.lease).PromoteEnvironmentInput,
+				func(ctx context.Context, tenant, session, id string) (sessions.EnvironmentInputReservation, error) {
+					return cancelEnvironmentInput(ctx, s, tenant, session, id)
+				},
 			} {
 				if _, err := action(ctx, tenant, session.ID, pending.ID); !errors.Is(err, sessions.ErrNotFound) {
 					t.Fatal("deleted reservation remained accessible", err)
 				}
 			}
-			if _, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "late", pending.Inputs); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sessionService(t, s).ReserveEnvironmentInput(ctx, tenant, session.ID, "late", pending.Inputs); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("deleted Session accepted reservation", err)
 			}
 			var state string
diff --git a/services/core/internal/store/environment_inputs.go b/services/core/internal/store/environment_inputs.go
deleted file mode 100644
index c2d2d4b7f..000000000
--- a/services/core/internal/store/environment_inputs.go
+++ /dev/null
@@ -1,287 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// ReserveEnvironmentInput appends to active work or reserves an idle message batch.
-// The Session lock decides both paths; only promotion can create a new Turn.
-func (s *Store) ReserveEnvironmentInput(ctx context.Context, tenantID, sessionID, key string, inputs []sessions.Input) (sessions.EnvironmentInputReservation, error) {
-	if err := sessions.ValidateInputKey(key); err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	batch, encoded, err := validateInitialInputs(inputs)
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	var result sessions.EnvironmentInputReservation
-	err = s.withEnvironmentInputSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		audit := func() error {
-			return auditpg.RecordWriteAudit(ctx, q, tenantID, "send_events", "session", uuid.UUID(session.Bytes).String(), "")
-		}
-		previous, err := q.FindEnvironmentInputReservation(ctx, sqlc.FindEnvironmentInputReservationParams{
-			SessionID: session, IdempotencyKey: key, Batch: encoded,
-		})
-		if err == nil {
-			if !previous.Matches {
-				return sessions.ErrIdempotencyConflict
-			}
-			result, err = settleEnvironmentInput(ctx, q, tenantID, previous.EnvironmentInputReservation, sessions.EnvironmentInputExpired)
-			if err == nil && (result.State == sessions.EnvironmentInputPending || result.State == sessions.EnvironmentInputAdmitted) {
-				return audit()
-			}
-			return err
-		}
-		if !errors.Is(err, pgx.ErrNoRows) {
-			return err
-		}
-		receipts, err := inputBatchReceipts(ctx, q, session, key, encoded)
-		if err != nil {
-			return err
-		}
-		if len(receipts) > 0 {
-			// Earlier direct admission has receipts, but never had a reservation or deadline.
-			result = sessions.EnvironmentInputReservation{SessionID: sessionID, State: sessions.EnvironmentInputAdmitted, Receipts: receipts}
-			return audit()
-		}
-		if err := sessions.CheckFileWriteGate(ctx, sessionpg.BindSession(q, tenant, session)); err != nil {
-			return err
-		}
-		environment, err := q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: tenant, ID: session})
-		if errors.Is(err, pgx.ErrNoRows) {
-			return sessions.ErrInvalidInput
-		} else if err != nil {
-			return err
-		}
-		if environment.Environment.Status == "failed" {
-			if kind, err := sessions.EnvironmentType(environment.Configuration); err == nil && kind == "openai_hosted" {
-				return sessions.ErrHostedEnvironmentFailed
-			}
-		}
-		if environment.Environment.Status == "failed" || environment.Environment.Status == "expired" {
-			return sessions.ErrEnvironmentUnavailable
-		}
-		if err := checkEnvironmentInputGate(ctx, q, session, key, encoded); err != nil {
-			return err
-		}
-		if active, err := q.GetActiveTurn(ctx, session); err == nil && !active.ArtifactCaptureStarted {
-			result = sessions.EnvironmentInputReservation{SessionID: sessionID, State: sessions.EnvironmentInputAdmitted}
-			for position, input := range batch {
-				receipt, err := admitInput(ctx, q, tenantID, session, key, int32(position), input)
-				if err != nil {
-					return err
-				}
-				result.Receipts = append(result.Receipts, receipt)
-			}
-			return audit()
-		} else if err != nil && !errors.Is(err, pgx.ErrNoRows) {
-			return err
-		}
-		row, err := q.CreateEnvironmentInputReservation(ctx, sqlc.CreateEnvironmentInputReservationParams{
-			ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, SessionID: session, IdempotencyKey: key, Batch: encoded,
-		})
-		if err != nil {
-			return err
-		}
-		result, err = environmentInputFromRow(row)
-		if err != nil {
-			return err
-		}
-		return audit()
-	})
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	return result, nil
-}
-
-func (s *Store) GetEnvironmentInputReservation(ctx context.Context, tenantID, sessionID, reservationID string) (sessions.EnvironmentInputReservation, error) {
-	id, err := parseID(reservationID)
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	var result sessions.EnvironmentInputReservation
-	err = s.withPublicSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		row, err := q.GetEnvironmentInputReservation(ctx, sqlc.GetEnvironmentInputReservationParams{SessionID: session, ID: id})
-		if errors.Is(err, pgx.ErrNoRows) {
-			return sessions.ErrNotFound
-		}
-		if err != nil {
-			return err
-		}
-		result, err = environmentInputOutcome(ctx, q, row)
-		return err
-	})
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	return result, nil
-}
-
-// PromoteEnvironmentInput admits and claims work for the retained native preparation.
-func (s *Store) PromoteEnvironmentInput(ctx context.Context, tenantID, sessionID, reservationID string) (sessions.EnvironmentInputReservation, error) {
-	if err := s.checkExecutionAuthority(); err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	return s.settleEnvironmentInput(ctx, tenantID, sessionID, reservationID, sessions.EnvironmentInputAdmitted)
-}
-
-func (s *Store) CancelEnvironmentInput(ctx context.Context, tenantID, sessionID, reservationID string) (sessions.EnvironmentInputReservation, error) {
-	return s.settleEnvironmentInput(ctx, tenantID, sessionID, reservationID, sessions.EnvironmentInputCancelled)
-}
-
-// FailEnvironmentInput settles a confirmed pre-admission failure. The Session
-// lock and pending-state predicate preserve cancellation and newer input.
-func (s *Store) FailEnvironmentInput(ctx context.Context, tenantID, sessionID, reservationID, code string) error {
-	if code != "model_provider_required" && code != "runtime_preparation_failed" {
-		return sessions.ErrInvalidInput
-	}
-	id, err := parseID(reservationID)
-	if err != nil {
-		return err
-	}
-	return s.withEnvironmentInputSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		if err := q.ExpireEnvironmentInputReservation(ctx, sqlc.ExpireEnvironmentInputReservationParams{SessionID: session, ID: id}); err != nil {
-			return err
-		}
-		_, err := q.FailEnvironmentInput(ctx, sqlc.FailEnvironmentInputParams{SessionID: session, ID: id, FailureCode: pgtype.Text{String: code, Valid: true}})
-		return err
-	})
-}
-
-func (s *Store) ExpireEnvironmentInput(ctx context.Context, tenantID, sessionID, reservationID string) (sessions.EnvironmentInputReservation, error) {
-	return s.settleEnvironmentInput(ctx, tenantID, sessionID, reservationID, sessions.EnvironmentInputExpired)
-}
-
-func (s *Store) settleEnvironmentInput(ctx context.Context, tenantID, sessionID, reservationID, state string) (sessions.EnvironmentInputReservation, error) {
-	id, err := parseID(reservationID)
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	var result sessions.EnvironmentInputReservation
-	err = s.withEnvironmentInputSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		row, err := q.GetEnvironmentInputReservation(ctx, sqlc.GetEnvironmentInputReservationParams{SessionID: session, ID: id})
-		if errors.Is(err, pgx.ErrNoRows) {
-			return sessions.ErrNotFound
-		}
-		if err != nil {
-			return err
-		}
-		result, err = settleEnvironmentInput(ctx, q, tenantID, row, state)
-		return err
-	})
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	return result, nil
-}
-
-func settleEnvironmentInput(ctx context.Context, q *sqlc.Queries, tenantID string, row sqlc.EnvironmentInputReservation, state string) (sessions.EnvironmentInputReservation, error) {
-	if row.State != sessions.EnvironmentInputPending {
-		return environmentInputOutcome(ctx, q, row)
-	}
-	if err := q.ExpireEnvironmentInputReservation(ctx, sqlc.ExpireEnvironmentInputReservationParams{SessionID: row.SessionID, ID: row.ID}); err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	row, err := q.GetEnvironmentInputReservation(ctx, sqlc.GetEnvironmentInputReservationParams{SessionID: row.SessionID, ID: row.ID})
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	// Terminal outcomes are successful storage results so settlement is not rolled back.
-	if row.State != sessions.EnvironmentInputPending || state == sessions.EnvironmentInputExpired {
-		return environmentInputOutcome(ctx, q, row)
-	}
-	result, err := environmentInputFromRow(row)
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	if state == sessions.EnvironmentInputAdmitted {
-		tenant, err := parseID(tenantID)
-		if err != nil {
-			return sessions.EnvironmentInputReservation{}, err
-		}
-		if err := sessions.CheckInputStart(ctx, sessionpg.BindSession(q, tenant, row.SessionID)); err != nil {
-			return sessions.EnvironmentInputReservation{}, err
-		}
-		for position, input := range result.Inputs {
-			receipt, err := admitInput(ctx, q, tenantID, row.SessionID, row.IdempotencyKey, int32(position), input)
-			if err != nil {
-				return sessions.EnvironmentInputReservation{}, err
-			}
-			result.Receipts = append(result.Receipts, receipt)
-		}
-	}
-	row, err = q.SettleEnvironmentInputReservation(ctx, sqlc.SettleEnvironmentInputReservationParams{SessionID: row.SessionID, ID: row.ID, State: state})
-	if err != nil {
-		return sessions.EnvironmentInputReservation{}, err
-	}
-	if state == sessions.EnvironmentInputAdmitted {
-		tenant, err := parseID(tenantID)
-		if err != nil {
-			return sessions.EnvironmentInputReservation{}, err
-		}
-		start := sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}
-		if _, err := sessions.TransitionTurn(ctx, sessionpg.BindSession(q, tenant, row.SessionID), result.Receipts[0].TurnID, start); err != nil {
-			return sessions.EnvironmentInputReservation{}, err
-		}
-	}
-	result.State = row.State
-	result.SettledAt = &row.SettledAt.Time
-	return result, nil
-}
-
-func environmentInputOutcome(ctx context.Context, q *sqlc.Queries, row sqlc.EnvironmentInputReservation) (sessions.EnvironmentInputReservation, error) {
-	result, err := environmentInputFromRow(row)
-	if err != nil || row.State != sessions.EnvironmentInputAdmitted {
-		return result, err
-	}
-	result.Receipts, err = inputBatchReceipts(ctx, q, row.SessionID, row.IdempotencyKey, row.Batch)
-	if err == nil && len(result.Receipts) == 0 {
-		err = errors.New("admitted Environment input has no receipts")
-	}
-	return result, err
-}
-
-func environmentInputFromRow(row sqlc.EnvironmentInputReservation) (sessions.EnvironmentInputReservation, error) {
-	result := sessions.EnvironmentInputReservation{
-		ID: uuid.UUID(row.ID.Bytes).String(), SessionID: uuid.UUID(row.SessionID.Bytes).String(),
-		State: row.State, IsInitial: row.IsInitial, CreatedAt: row.CreatedAt.Time, Deadline: row.Deadline.Time,
-	}
-	if row.SettledAt.Valid {
-		result.SettledAt = &row.SettledAt.Time
-	}
-	if err := json.Unmarshal(row.Batch, &result.Inputs); err != nil {
-		return sessions.EnvironmentInputReservation{}, fmt.Errorf("decode Environment input: %w", err)
-	}
-	return result, nil
-}
-
-func checkEnvironmentInputGate(ctx context.Context, q *sqlc.Queries, session pgtype.UUID, key string, batch json.RawMessage) error {
-	gate, err := q.CheckEnvironmentInputGate(ctx, sqlc.CheckEnvironmentInputGateParams{SessionID: session, IdempotencyKey: key, Batch: batch})
-	if err != nil {
-		return err
-	}
-	if !gate.Matches {
-		return sessions.ErrIdempotencyConflict
-	}
-	if gate.Blocked {
-		return sessions.ErrInputPending
-	}
-	return nil
-}
diff --git a/services/core/internal/store/environment_inputs_test.go b/services/core/internal/store/environment_inputs_test.go
deleted file mode 100644
index 2b2074e70..000000000
--- a/services/core/internal/store/environment_inputs_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"reflect"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgxpool"
-)
-
-func environmentInputSession(t *testing.T, s *Store) (string, sessions.Session) {
-	t.Helper()
-	tenant := uuid.NewString()
-	session, err := s.CreateSession(context.Background(), tenant, environmentInput("session", "self_hosted", "/workspace"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	return tenant, session
-}
-
-func reserveEnvironmentInput(t *testing.T, s *Store, tenant, session, key string) sessions.EnvironmentInputReservation {
-	t.Helper()
-	got, err := s.ReserveEnvironmentInput(context.Background(), tenant, session, key, []sessions.Input{messageInput("first"), messageInput("second")})
-	if err != nil {
-		t.Fatal(err)
-	}
-	return got
-}
-
-func environmentInputHistory(t *testing.T, pool *pgxpool.Pool, session string, turns, inputs int) {
-	t.Helper()
-	var gotTurns, gotInputs, items, events int
-	err := pool.QueryRow(context.Background(), `
-		SELECT (SELECT count(*) FROM turns WHERE session_id=$1),
-		       (SELECT count(*) FROM turn_inputs WHERE session_id=$1),
-		       (SELECT count(*) FROM session_items WHERE session_id=$1),
-		       (SELECT count(*) FROM session_events WHERE session_id=$1
-		        AND (payload ? 'turn' OR payload->'event' ? 'item'))`, session).Scan(&gotTurns, &gotInputs, &items, &events)
-	if err != nil || gotTurns != turns || gotInputs != inputs || items != inputs || (inputs == 0 && events != 0) {
-		t.Fatal("history", gotTurns, gotInputs, items, events, err)
-	}
-}
-
-func TestEnvironmentInputReservationConcurrentIdentity(t *testing.T) {
-	s, pool := testStore(t)
-	other, _ := testStore(t)
-	tenant, session := environmentInputSession(t, s)
-	ctx := context.Background()
-	batch := []sessions.Input{
-		{Kind: "message", Payload: json.RawMessage(`{"text":"first","detail":{"a":1,"b":2}}`)},
-		messageInput("second"),
-	}
-	const count = 8
-	results := make(chan sessions.EnvironmentInputReservation, count)
-	var wg sync.WaitGroup
-	for i := range count {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			st := s
-			inputs := append([]sessions.Input(nil), batch...)
-			if i%2 == 0 {
-				st = other
-				inputs[0].Payload = json.RawMessage(` { "detail": {"b": 2, "a": 1}, "text": "first" } `)
-			}
-			got, err := st.ReserveEnvironmentInput(ctx, tenant, session.ID, "request", inputs)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			results <- got
-		}()
-	}
-	wg.Wait()
-	close(results)
-	var first sessions.EnvironmentInputReservation
-	received := 0
-	for result := range results {
-		received++
-		if first.ID == "" {
-			first = result
-		}
-		if !reflect.DeepEqual(first, result) {
-			t.Fatal("reservation identity changed", first, result)
-		}
-	}
-	if received != count || first.State != sessions.EnvironmentInputPending || first.ID == "" || first.Deadline.Sub(first.CreatedAt) != 5*time.Minute || first.SettledAt != nil || len(first.Receipts) != 0 {
-		t.Fatal("invalid pending result", received, first)
-	}
-	environmentInputHistory(t, pool, session.ID, 0, 0)
-	for _, changed := range [][]sessions.Input{batch[:1], {batch[1], batch[0]}, {messageInput("changed"), batch[1]}} {
-		if _, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "request", changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-			t.Fatal("changed request accepted", err)
-		}
-	}
-	if _, err := other.ReserveEnvironmentInput(ctx, tenant, session.ID, "other", batch); !errors.Is(err, sessions.ErrTurnConflict) {
-		t.Fatal("second pending request accepted", err)
-	}
-	pool.Close()
-	restarted, _ := testStore(t)
-	got, err := restarted.ReserveEnvironmentInput(ctx, tenant, session.ID, "request", batch)
-	if err != nil || !reflect.DeepEqual(first, got) {
-		t.Fatal("restart changed deadline or identity", got, err)
-	}
-}
-
-func TestEnvironmentInputReservationPromotionAndDirectRetries(t *testing.T) {
-	s, pool := testStore(t)
-	writer := executionWriter(t, s)
-	tenant, session := environmentInputSession(t, s)
-	ctx := context.Background()
-	first := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-	for _, request := range []struct {
-		key    string
-		inputs []sessions.Input
-		want   error
-	}{
-		{"pending", first.Inputs, sessions.ErrTurnConflict},
-		{"pending", []sessions.Input{messageInput("changed")}, sessions.ErrIdempotencyConflict},
-		{"later", []sessions.Input{messageInput("later")}, sessions.ErrTurnConflict},
-		{"cancel", []sessions.Input{{Kind: "cancel", Payload: json.RawMessage(`{}`)}}, sessions.ErrTurnConflict},
-	} {
-		if _, err := s.SubmitInputs(ctx, tenant, session.ID, request.key, request.inputs); !errors.Is(err, request.want) {
-			t.Fatal("direct path bypassed reservation", request.key, err)
-		}
-	}
-	environmentInputHistory(t, pool, session.ID, 0, 0)
-	promoted, err := writer.PromoteEnvironmentInput(ctx, tenant, session.ID, first.ID)
-	if err != nil || promoted.State != sessions.EnvironmentInputAdmitted || promoted.SettledAt == nil || len(promoted.Receipts) != 2 || !promoted.Deadline.Equal(first.Deadline) {
-		t.Fatal(promoted, err)
-	}
-	for i, receipt := range promoted.Receipts {
-		if receipt.Replayed || receipt.TurnID == "" || receipt.TurnID != promoted.Receipts[0].TurnID || (i > 0 && receipt.Sequence <= promoted.Receipts[i-1].Sequence) {
-			t.Fatal("promotion receipts", promoted.Receipts)
-		}
-	}
-	environmentInputHistory(t, pool, session.ID, 1, 2)
-	for _, read := range []func() (sessions.EnvironmentInputReservation, error){
-		func() (sessions.EnvironmentInputReservation, error) {
-			return writer.PromoteEnvironmentInput(ctx, tenant, session.ID, first.ID)
-		},
-		func() (sessions.EnvironmentInputReservation, error) {
-			return s.GetEnvironmentInputReservation(ctx, tenant, session.ID, first.ID)
-		},
-		func() (sessions.EnvironmentInputReservation, error) {
-			return s.ReserveEnvironmentInput(ctx, tenant, session.ID, "pending", first.Inputs)
-		},
-	} {
-		retry, err := read()
-		if err != nil || retry.ID != first.ID || !retry.Deadline.Equal(first.Deadline) || retry.State != sessions.EnvironmentInputAdmitted || len(retry.Receipts) != 2 {
-			t.Fatal(retry, err)
-		}
-		for i, receipt := range retry.Receipts {
-			if !receipt.Replayed || receipt.Sequence != promoted.Receipts[i].Sequence || receipt.TurnID != promoted.Receipts[i].TurnID {
-				t.Fatal("retry changed admission", receipt)
-			}
-		}
-	}
-	retry, err := s.SubmitInputs(ctx, tenant, session.ID, "pending", first.Inputs)
-	if err != nil || len(retry) != 2 || !retry[0].Replayed || retry[0].Sequence != promoted.Receipts[0].Sequence {
-		t.Fatal("direct retry after promotion", retry, err)
-	}
-	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, writer.pool)
-	if err := writer.lease.Close(ctx); err != nil {
-		t.Fatal(err)
-	}
-	awaitRelease()
-	pool.Close()
-	restarted, pool := testStore(t)
-	after, err := executionWriter(t, restarted).PromoteEnvironmentInput(ctx, tenant, session.ID, first.ID)
-	if err != nil || after.State != sessions.EnvironmentInputAdmitted || after.Receipts[0].Sequence != promoted.Receipts[0].Sequence {
-		t.Fatal("restart repeated promotion", after, err)
-	}
-	environmentInputHistory(t, pool, session.ID, 1, 2)
-}
-
-func TestEnvironmentInputReservationKeepsEarlierDirectIdentity(t *testing.T) {
-	s, _ := testStore(t)
-	tenant, session := environmentInputSession(t, s)
-	ctx := context.Background()
-	input := messageInput("already admitted")
-	receipts, err := s.SubmitInputs(ctx, tenant, session.ID, "direct", []sessions.Input{input})
-	if err != nil {
-		t.Fatal(err)
-	}
-	transition(t, s, tenant, session.ID, receipts[0].TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-	transition(t, s, tenant, session.ID, receipts[0].TurnID, sessions.TurnInProgress, sessions.TurnCompleted)
-	pending := reserveEnvironmentInput(t, s, tenant, session.ID, "new")
-	got, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "direct", []sessions.Input{input})
-	if err != nil || got.State != sessions.EnvironmentInputAdmitted || got.ID != "" || !got.Deadline.IsZero() || len(got.Receipts) != 1 || got.Receipts[0].Sequence != receipts[0].Sequence {
-		t.Fatal("direct admission gained a reservation", got, err)
-	}
-	if _, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "direct", []sessions.Input{messageInput("changed")}); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatal(err)
-	}
-	retry, err := s.SubmitInputs(ctx, tenant, session.ID, "direct", []sessions.Input{input})
-	if err != nil || len(retry) != 1 || !retry[0].Replayed {
-		t.Fatal(retry, err)
-	}
-	retained, err := s.GetEnvironmentInputReservation(ctx, tenant, session.ID, pending.ID)
-	if err != nil || !reflect.DeepEqual(retained, pending) {
-		t.Fatal("old retry affected new pending input", retained, err)
-	}
-}
-
-func TestEnvironmentInputReservationRejectsUnsupportedOrForeignState(t *testing.T) {
-	s, _ := testStore(t)
-	writer := executionWriter(t, s)
-	tenant, session := environmentInputSession(t, s)
-	ctx := context.Background()
-	pending := reserveEnvironmentInput(t, s, tenant, session.ID, "pending")
-	for _, read := range []func() error{
-		func() error {
-			_, err := s.GetEnvironmentInputReservation(ctx, uuid.NewString(), session.ID, pending.ID)
-			return err
-		},
-		func() error {
-			_, err := writer.PromoteEnvironmentInput(ctx, uuid.NewString(), session.ID, pending.ID)
-			return err
-		},
-		func() error {
-			_, err := s.CancelEnvironmentInput(ctx, uuid.NewString(), session.ID, pending.ID)
-			return err
-		},
-		func() error {
-			_, err := s.ReserveEnvironmentInput(ctx, uuid.NewString(), session.ID, "new", pending.Inputs)
-			return err
-		},
-	} {
-		if err := read(); !errors.Is(err, sessions.ErrNotFound) {
-			t.Fatal("foreign access", err)
-		}
-	}
-	other, err := s.CreateSession(ctx, tenant, environmentInput("other", "self_hosted", "/workspace"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, action := range []func(context.Context, string, string, string) (sessions.EnvironmentInputReservation, error){
-		s.GetEnvironmentInputReservation, writer.PromoteEnvironmentInput, s.CancelEnvironmentInput, s.ExpireEnvironmentInput,
-	} {
-		if _, err := action(ctx, tenant, other.ID, pending.ID); !errors.Is(err, sessions.ErrNotFound) {
-			t.Fatal("reservation crossed Session ownership", err)
-		}
-		if _, err := action(ctx, uuid.NewString(), session.ID, pending.ID); !errors.Is(err, sessions.ErrNotFound) {
-			t.Fatal("reservation crossed tenant ownership", err)
-		}
-	}
-	retained, err := s.GetEnvironmentInputReservation(ctx, tenant, session.ID, pending.ID)
-	if err != nil || !reflect.DeepEqual(retained, pending) {
-		t.Fatal("foreign operations changed reservation", retained, err)
-	}
-	for _, invalid := range [][]sessions.Input{nil, {{Kind: "cancel", Payload: json.RawMessage(`{}`)}}, {{Kind: "tool_result", Payload: json.RawMessage(`{}`)}}} {
-		if _, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "invalid", invalid); !errors.Is(err, sessions.ErrInvalidInput) {
-			t.Fatal("unsupported reservation", err)
-		}
-	}
-	noneTenant, none := newTurnSession(t, s)
-	if _, err := s.ReserveEnvironmentInput(ctx, noneTenant, none.ID, "none", pending.Inputs); !errors.Is(err, sessions.ErrInvalidInput) {
-		t.Fatal("none reservation", err)
-	}
-	activeTenant, active := environmentInputSession(t, s)
-	activeInput := submitMessage(t, s, activeTenant, active.ID, "active")
-	steer, err := s.ReserveEnvironmentInput(ctx, activeTenant, active.ID, "new", pending.Inputs)
-	if err != nil || steer.State != sessions.EnvironmentInputAdmitted || steer.ID != "" || !steer.Deadline.IsZero() || len(steer.Receipts) != len(pending.Inputs) || steer.Receipts[0].TurnID != activeInput.TurnID {
-		t.Fatal("active input did not retain the existing Turn", steer, err)
-	}
-}
diff --git a/services/core/internal/store/environment_steering_order_test.go b/services/core/internal/store/environment_steering_order_test.go
deleted file mode 100644
index 94cfcf094..000000000
--- a/services/core/internal/store/environment_steering_order_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-func TestEnvironmentActiveInputSerializesWithCompletion(t *testing.T) {
-	for _, completionFirst := range []bool{false, true} {
-		name := "input-first"
-		if completionFirst {
-			name = "completion-first"
-		}
-		t.Run(name, func(t *testing.T) {
-			s, pool := testStore(t)
-			writer := executionWriter(t, s)
-			tenant, session := environmentInputSession(t, s)
-			original := submitMessage(t, s, tenant, session.ID, "original")
-			transition(t, s, tenant, session.ID, original.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-			ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
-			defer cancel()
-			blocker, err := pool.Begin(ctx)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer func() { _ = blocker.Rollback(context.Background()) }()
-			var blockerPID int32
-			if err := blocker.QueryRow(ctx, "SELECT pg_backend_pid() FROM sessions WHERE id=$1 FOR UPDATE", session.ID).Scan(&blockerPID); err != nil {
-				t.Fatal(err)
-			}
-			waiter := func(pid int32) int32 {
-				t.Helper()
-				for ctx.Err() == nil {
-					var blocked int32
-					if err := pool.QueryRow(ctx, "SELECT pid FROM pg_stat_activity WHERE $1=ANY(pg_blocking_pids(pid)) ORDER BY pid LIMIT 1", pid).Scan(&blocked); err == nil {
-						return blocked
-					}
-					time.Sleep(5 * time.Millisecond)
-				}
-				t.Fatal("transaction did not wait for the Session lock")
-				return 0
-			}
-			type admission struct {
-				value sessions.EnvironmentInputReservation
-				err   error
-			}
-			admitted := make(chan admission, 1)
-			completed := make(chan error, 1)
-			batch := []sessions.Input{messageInput("first"), messageInput("second")}
-			input := func() {
-				value, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "racing-input", batch)
-				admitted <- admission{value, err}
-			}
-			complete := func() {
-				_, err := completeExecution(ctx, t, writer, tenant, session.ID, original.TurnID, sessions.TurnCompleted, nil, "", original.Sequence)
-				completed <- err
-			}
-			first, second := input, complete
-			if completionFirst {
-				first, second = complete, input
-			}
-			go first()
-			firstPID := waiter(blockerPID)
-			go second()
-			waiter(firstPID)
-			if err := blocker.Commit(ctx); err != nil {
-				t.Fatal(err)
-			}
-			got, completionErr := <-admitted, <-completed
-			if got.err != nil {
-				t.Fatal(got.err)
-			}
-			if completionFirst {
-				if completionErr != nil || got.value.State != sessions.EnvironmentInputPending || got.value.ID == "" || len(got.value.Receipts) != 0 || got.value.Deadline.Sub(got.value.CreatedAt) != 5*time.Minute {
-					t.Fatal("completion winner did not leave new input waiting for preparation", completionErr, got.value)
-				}
-				environmentInputHistory(t, pool, session.ID, 1, 1)
-				prepared, err := writer.PromoteEnvironmentInput(ctx, tenant, session.ID, got.value.ID)
-				if err != nil || len(prepared.Receipts) != 2 || prepared.Receipts[0].TurnID == original.TurnID {
-					t.Fatal("prepared successor reused terminal work", err)
-				}
-				retry, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "racing-input", batch)
-				if err != nil || retry.ID != got.value.ID || !retry.Deadline.Equal(got.value.Deadline) || len(retry.Receipts) != 2 || !retry.Receipts[0].Replayed || retry.Receipts[0].TurnID != prepared.Receipts[0].TurnID {
-					t.Fatal("active retry replaced its original reservation", retry, err)
-				}
-				if _, err := completeExecution(ctx, t, writer, tenant, session.ID, prepared.Receipts[0].TurnID, sessions.TurnCompleted, nil, "", prepared.Receipts[1].Sequence); err != nil {
-					t.Fatal(err)
-				}
-			} else {
-				if !errors.Is(completionErr, sessions.ErrUnappliedInputs) || got.value.State != sessions.EnvironmentInputAdmitted || got.value.ID != "" || !got.value.Deadline.IsZero() || len(got.value.Receipts) != 2 || got.value.Receipts[0].TurnID != original.TurnID || got.value.Receipts[0].Replayed {
-					t.Fatal("admitted input escaped the original Turn or application fence", completionErr, got.value)
-				}
-				environmentInputHistory(t, pool, session.ID, 1, 3)
-				if _, err := completeExecution(ctx, t, writer, tenant, session.ID, original.TurnID, sessions.TurnCompleted, nil, "", got.value.Receipts[1].Sequence); err != nil {
-					t.Fatal("completion after controlled application failed", err)
-				}
-			}
-		})
-	}
-}
diff --git a/services/core/internal/store/environment_work_test.go b/services/core/internal/store/environment_work_test.go
index 5085d3585..0c07a6321 100644
--- a/services/core/internal/store/environment_work_test.go
+++ b/services/core/internal/store/environment_work_test.go
@@ -23,7 +23,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 		case "expired":
 			makeEnvironmentExpiryDue(t, pool, &pending)
 		case "cancelled":
-			if _, err := h.s.CancelEnvironmentInput(t.Context(), h.tenant, pending.SessionID, pending.ID); err != nil {
+			if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, pending.SessionID, pending.ID); err != nil {
 				t.Fatal(err)
 			}
 		case "deleted":
@@ -44,7 +44,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 				if err := fixtureSessionService(t, h.db).RevokeDevice(t.Context(), h.tenant, runtime.device.ID); err != nil {
 					t.Fatal(err)
 				}
-				work, err := h.s.ListEnvironmentInputWork(t.Context(), "", []string{runtime.device.ID})
+				work, err := store.SessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), "", []string{runtime.device.ID})
 				if err != nil || len(work) != 0 {
 					t.Fatal("revoked Runtime selected", work, err)
 				}
@@ -55,7 +55,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 		}
 	}
 	for _, devices := range [][]string{nil, {}, {uuid.NewString()}} {
-		work, err := h.s.ListEnvironmentInputWork(t.Context(), "", devices)
+		work, err := store.SessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), "", devices)
 		if err != nil || len(work) != 0 {
 			t.Fatal("unconnected work selected", work, err)
 		}
@@ -67,7 +67,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 		for _, runtime := range h.environments {
 			devices = append(devices, runtime.device.ID)
 		}
-		work, err := h.s.ListEnvironmentInputWork(t.Context(), cursor, devices)
+		work, err := store.SessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), cursor, devices)
 		if err != nil || len(work) != count {
 			t.Fatal("environment work page", len(work), count, err)
 		}
diff --git a/services/core/internal/store/environment_worker_helpers_test.go b/services/core/internal/store/environment_worker_helpers_test.go
index d39561867..4ea8d7485 100644
--- a/services/core/internal/store/environment_worker_helpers_test.go
+++ b/services/core/internal/store/environment_worker_helpers_test.go
@@ -48,7 +48,7 @@ func unboundWorkerEnvironmentReservation(t *testing.T, h *dispatchHarness) sessi
 	if err != nil {
 		t.Fatal(err)
 	}
-	pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "work", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "work", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -115,7 +115,7 @@ func awaitWorkerEnvironmentRun(t *testing.T, ctx context.Context, s *store.Store
 	var run execution.EnvironmentRun
 	awaitDaemonRemoteCondition(t, ctx, 5*time.Minute, "worker terminal Environment Turn", func() bool {
 		var err error
-		run.Reservation, err = s.GetEnvironmentInputReservation(ctx, tenant, pending.SessionID, pending.ID)
+		run.Reservation, err = store.SessionAdapter(s).GetEnvironmentInputReservation(ctx, tenant, pending.SessionID, pending.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/environment_worker_scan_test.go b/services/core/internal/store/environment_worker_scan_test.go
index f160dbb04..56860b921 100644
--- a/services/core/internal/store/environment_worker_scan_test.go
+++ b/services/core/internal/store/environment_worker_scan_test.go
@@ -44,7 +44,7 @@ func TestWorkerEnvironmentRetriesNewlyReadyAtNextScan(t *testing.T) {
 	runtime.write(prepare.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{Handle: handle, Revision: 2, State: "failed"})
 	nextWorkerFrame(t, frames, proto.TypeExecutionRelease)
 	stop()
-	stored, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, pending.SessionID, pending.ID)
+	stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, pending.SessionID, pending.ID)
 	if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(pending.Deadline) || len(stored.Receipts) != 0 {
 		t.Fatal("readiness retry changed pending identity or admitted work", stored, err)
 	}
diff --git a/services/core/internal/store/environment_worker_test.go b/services/core/internal/store/environment_worker_test.go
index 275e1220f..58d851208 100644
--- a/services/core/internal/store/environment_worker_test.go
+++ b/services/core/internal/store/environment_worker_test.go
@@ -82,7 +82,7 @@ func TestWorkerEnvironmentSharesCapacityThroughClaimAndCleanup(t *testing.T) {
 	tenant, due := newEnvironmentExpiryReservation(t, h.s)
 	makeEnvironmentExpiryDue(t, pool, &due)
 	waitEnvironmentExpiry(t, h.s, tenant, due)
-	if _, err := h.s.CancelEnvironmentInput(t.Context(), h.tenant, waiting.SessionID, waiting.ID); err != nil {
+	if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, waiting.SessionID, waiting.ID); err != nil {
 		t.Fatal(err)
 	}
 	// Distinct Runtime sockets do not promise cross-socket delivery order.
@@ -159,7 +159,7 @@ func TestWorkerEnvironmentRetriesPendingWithoutExtendingDeadline(t *testing.T) {
 	}
 	stop()
 	nextWorkerFrame(t, frames, proto.TypeExecutionRelease)
-	stored, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, pending.SessionID, pending.ID)
+	stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, pending.SessionID, pending.ID)
 	if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(pending.Deadline) || len(stored.Receipts) != 0 {
 		t.Fatal("retry or shutdown changed the original reservation", stored, err)
 	}
diff --git a/services/core/internal/store/execution.go b/services/core/internal/store/execution.go
index 0978511c5..92d5f5fc9 100644
--- a/services/core/internal/store/execution.go
+++ b/services/core/internal/store/execution.go
@@ -1,13 +1,6 @@
 package store
 
-import (
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-)
-
-// ErrExecutionAuthority rejects an execution-only operation on a pooled Store.
-var ErrExecutionAuthority = errors.New("operation requires the execution writer")
+import "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 
 // NewExecution returns the execution writer built on lease, which the caller
 // acquired and closes. The writer's Session and execution-only transactions run
@@ -18,12 +11,3 @@ func NewExecution(s *Store, lease *pgunit.Lease) *Store {
 	writer.writer, writer.lease = lease, lease
 	return &writer
 }
-
-// checkExecutionAuthority only validates. The connection was fixed when the
-// Store was constructed.
-func (s *Store) checkExecutionAuthority() error {
-	if s.lease == nil {
-		return ErrExecutionAuthority
-	}
-	return nil
-}
diff --git a/services/core/internal/store/execution_events_test.go b/services/core/internal/store/execution_events_test.go
index 2ba74d5c9..5e8b963e9 100644
--- a/services/core/internal/store/execution_events_test.go
+++ b/services/core/internal/store/execution_events_test.go
@@ -39,7 +39,7 @@ func TestExecutionPersistsLiveAndCancelledPartialOutput(t *testing.T) {
 		}
 		time.Sleep(20 * time.Millisecond)
 	}
-	if _, err := h.s.RequestCancel(ctx, h.tenant, h.session.ID, "stop"); err != nil {
+	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "stop"); err != nil {
 		t.Fatal(err)
 	}
 	cancelEnv := h.read(proto.TypePromptCancel)
diff --git a/services/core/internal/store/execution_messages_test.go b/services/core/internal/store/execution_messages_test.go
index ccb8f31eb..3df7562ee 100644
--- a/services/core/internal/store/execution_messages_test.go
+++ b/services/core/internal/store/execution_messages_test.go
@@ -54,7 +54,7 @@ func TestExecutionNegotiatesAndPersistsMessageObservations(t *testing.T) {
 	h.write(input.TurnID, proto.TypeOutputMessage, proto.OutputMessagePayload{ID: "a", Status: "completed", Phase: "commentary", Text: &text})
 	h.write(input.TurnID, proto.TypeOutputMessage, proto.OutputMessagePayload{ID: "b", Status: "in_progress", Phase: "final_answer"})
 	h.write(input.TurnID, proto.TypeDelta, proto.DeltaPayload{ItemID: "b", Delta: "partial", Sequence: 2})
-	if _, err := h.s.RequestCancel(ctx, h.tenant, h.session.ID, "cancel"); err != nil {
+	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
 	env = h.read(proto.TypePromptCancel)
diff --git a/services/core/internal/store/execution_test.go b/services/core/internal/store/execution_test.go
index c50428880..8104027e5 100644
--- a/services/core/internal/store/execution_test.go
+++ b/services/core/internal/store/execution_test.go
@@ -169,7 +169,7 @@ func TestExecutionLeaseLossFencesAllLifecycleWrites(t *testing.T) {
 	mustReject("completion", err)
 	_, err = operations.TransitionTurn(t.Context(), tenant, active.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed})
 	mustReject("reconciliation", err)
-	_, err = writer.ExpireEnvironmentInputs(t.Context())
+	_, err = operations.ExpireEnvironmentInputs(t.Context())
 	mustReject("input expiry", err)
 	mustReject("ownership check", writer.lease.CheckOwnership(t.Context()))
 	after, err := sessionAdapter(s).GetSession(t.Context(), tenant, active.ID)
@@ -276,7 +276,7 @@ func TestExecutionWriterSerializesWritesOnItsLease(t *testing.T) {
 	ctx, cancel := context.WithTimeout(t.Context(), time.Second)
 	defer cancel()
 	task := tasks[0]
-	_, err := s.SubmitMessage(ctx, task.tenant, task.session, "public", json.RawMessage(`{"text":"additional"}`))
+	_, err := sendMessage(ctx, s, task.tenant, task.session, "public", json.RawMessage(`{"text":"additional"}`))
 	close(release)
 	if err != nil {
 		t.Fatal("public admission used owner gate", err)
@@ -285,27 +285,3 @@ func TestExecutionWriterSerializesWritesOnItsLease(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-func TestPooledStoreHasNoExecutionAuthority(t *testing.T) {
-	s, _ := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	submitMessage(t, s, tenant, session.ID, "start")
-	before, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := s.ExpireEnvironmentInputs(t.Context()); !errors.Is(err, ErrExecutionAuthority) {
-		t.Fatalf("pooled Store ran input expiry: %v", err)
-	}
-	after, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
-	if err != nil || !reflect.DeepEqual(before, after) {
-		t.Fatal("rejected execution operation changed the Session", after, err)
-	}
-	if next, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID); err != nil || next != cursor {
-		t.Fatal("rejected execution operation published events", next, err)
-	}
-}
diff --git a/services/core/internal/store/execution_tools_test.go b/services/core/internal/store/execution_tools_test.go
index fe1484b4d..2db63f908 100644
--- a/services/core/internal/store/execution_tools_test.go
+++ b/services/core/internal/store/execution_tools_test.go
@@ -40,7 +40,7 @@ func TestExecutionNegotiatesAndPersistsToolObservations(t *testing.T) {
 		}
 		h.write(input.TurnID, proto.TypeToolCall, proto.ToolCallPayload{ID: id, Stage: stage, Observation: &observation})
 	}
-	if _, err := h.s.RequestCancel(ctx, h.tenant, h.session.ID, "cancel"); err != nil {
+	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
 	env = h.read(proto.TypePromptCancel)
diff --git a/services/core/internal/store/export_test.go b/services/core/internal/store/export_test.go
index 6e3040cc3..50d908034 100644
--- a/services/core/internal/store/export_test.go
+++ b/services/core/internal/store/export_test.go
@@ -28,6 +28,27 @@ func SessionAdapter(s *Store) *sessionpg.Store { return sessionAdapter(s) }
 // SessionService is the Session service on SessionAdapter(s).
 func SessionService(t testing.TB, s *Store) *sessions.Service { return sessionService(t, s) }
 
+// SubmitInputs admits inputs through the Session service on s's database.
+func SubmitInputs(ctx context.Context, s *Store, tenant, session, key string, inputs []sessions.Input) ([]sessions.InputReceipt, error) {
+	return submitInputs(ctx, s, tenant, session, key, inputs)
+}
+
+// SendMessage admits one message input with payload.
+func SendMessage(ctx context.Context, s *Store, tenant, session, key string, payload json.RawMessage) (sessions.InputReceipt, error) {
+	return sendMessage(ctx, s, tenant, session, key, payload)
+}
+
+// RequestCancel admits one cancel input.
+func RequestCancel(ctx context.Context, s *Store, tenant, session, key string) (sessions.InputReceipt, error) {
+	return requestCancel(ctx, s, tenant, session, key)
+}
+
+// CancelEnvironmentInput cancels the Session's pending Environment input as
+// Session cancellation does, then reads the reservation back.
+func CancelEnvironmentInput(ctx context.Context, s *Store, tenant, session, reservation string) (sessions.EnvironmentInputReservation, error) {
+	return cancelEnvironmentInput(ctx, s, tenant, session, reservation)
+}
+
 // TransitionTurn moves the Turn as the execution owner does, in a Session
 // transaction on s's writer.
 func TransitionTurn(ctx context.Context, s *Store, tenant, session, turn string, transition sessions.TurnTransition) (sessions.Turn, error) {
@@ -144,6 +165,6 @@ func SubmitFixtureFunctionResult(ctx context.Context, s *Store, tenantID, sessio
 	if err != nil {
 		return err
 	}
-	_, err = s.SubmitInputs(ctx, tenantID, sessionID, uuid.NewString(), []sessions.Input{{Kind: "tool_result", Payload: payload}})
+	_, err = SubmitInputs(ctx, s, tenantID, sessionID, uuid.NewString(), []sessions.Input{{Kind: "tool_result", Payload: payload}})
 	return err
 }
diff --git a/services/core/internal/store/function_execution_native_test.go b/services/core/internal/store/function_execution_native_test.go
index a6ed06c0a..665b98188 100644
--- a/services/core/internal/store/function_execution_native_test.go
+++ b/services/core/internal/store/function_execution_native_test.go
@@ -32,7 +32,7 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 			t.Fatal(action, state.LastTurn)
 		}
 		if index == 2 {
-			if _, err := h.s.RequestCancel(ctx, h.tenant, h.session.ID, "native-cancel"); err != nil {
+			if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "native-cancel"); err != nil {
 				t.Fatal(err)
 			}
 			h.finished(running, sessions.TurnCancelled)
diff --git a/services/core/internal/store/function_execution_test.go b/services/core/internal/store/function_execution_test.go
index 0aca0f12c..95e6c0835 100644
--- a/services/core/internal/store/function_execution_test.go
+++ b/services/core/internal/store/function_execution_test.go
@@ -137,7 +137,7 @@ func TestExecutionFunctionsCancellationAndUnconfirmedResults(t *testing.T) {
 			}
 			status := sessions.TurnFailed
 			if cancel {
-				if _, err := h.s.RequestCancel(t.Context(), h.tenant, h.session.ID, "cancel"); err != nil {
+				if _, err := store.RequestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 					t.Fatal(err)
 				}
 				var request proto.PromptCancelPayload
diff --git a/services/core/internal/store/function_images_native_test.go b/services/core/internal/store/function_images_native_test.go
index 3a00438fa..54c2284eb 100644
--- a/services/core/internal/store/function_images_native_test.go
+++ b/services/core/internal/store/function_images_native_test.go
@@ -77,7 +77,7 @@ func TestNativeFunctionImagePublicExecution(t *testing.T) {
 		if err != nil || !call.Applied {
 			t.Fatal("function delivery acknowledgement missing", err)
 		}
-		inputs, err := h.s.ListTurnInputs(ctx, h.tenant, proof.Session, item.Turn, 0, 100)
+		inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, item.Turn, 0, 100)
 		if err != nil || len(inputs) != 2 || inputs[0].Kind != "message" || inputs[1].Kind != "tool_result" {
 			t.Fatal("function result admission duplicated or mutated", err)
 		}
diff --git a/services/core/internal/store/function_input_execution_test.go b/services/core/internal/store/function_input_execution_test.go
index fd0964274..5d3141eb0 100644
--- a/services/core/internal/store/function_input_execution_test.go
+++ b/services/core/internal/store/function_input_execution_test.go
@@ -20,11 +20,11 @@ func TestExecutionFunctionInputBatchStillSteersMessages(t *testing.T) {
 	state := functionState(t, h, 1)
 	raw, _ := json.Marshal(sessions.FunctionResultInput{TurnID: input.TurnID, CallID: state.RequiredActions[0].CallID, Result: json.RawMessage(`{"success":true,"output":"answer"}`)})
 	batch := []sessions.Input{{Kind: "tool_result", Payload: raw}, {Kind: "message", Payload: json.RawMessage(`{"text":"Follow up"}`)}}
-	receipts, err := h.s.SubmitInputs(t.Context(), h.tenant, h.session.ID, "mixed", batch)
+	receipts, err := store.SubmitInputs(t.Context(), h.s, h.tenant, h.session.ID, "mixed", batch)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := h.s.SubmitInputs(t.Context(), h.tenant, h.session.ID, "mixed", batch); err != nil {
+	if _, err := store.SubmitInputs(t.Context(), h.s, h.tenant, h.session.ID, "mixed", batch); err != nil {
 		t.Fatal(err)
 	}
 	resultSeen, messageSeen := false, false
diff --git a/services/core/internal/store/function_inputs_public_test.go b/services/core/internal/store/function_inputs_public_test.go
index 7570cbe0b..4ad8bade0 100644
--- a/services/core/internal/store/function_inputs_public_test.go
+++ b/services/core/internal/store/function_inputs_public_test.go
@@ -34,7 +34,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -104,14 +104,14 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 			}
 		}
 	}
-	history, err := s.ListTurnInputs(ctx, tenant, session.ID, input.TurnID, 0, 100)
+	history, err := store.SessionAdapter(s).ListTurnInputs(ctx, tenant, session.ID, input.TurnID, 0, 100)
 	if err != nil || len(history) != 6 {
 		t.Fatal(history, err)
 	}
 	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnFailed}); err != nil {
 		t.Fatal(err)
 	}
-	next, err := s.SubmitMessage(ctx, tenant, session.ID, "next", json.RawMessage(`{"text":"next"}`))
+	next, err := store.SendMessage(ctx, s, tenant, session.ID, "next", json.RawMessage(`{"text":"next"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -121,7 +121,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if err := command.Wait(); err != nil {
 		t.Fatalf("SDK retry: %v %s", err, stderr.String())
 	}
-	history, err = s.ListTurnInputs(ctx, tenant, session.ID, next.TurnID, 0, 100)
+	history, err = store.SessionAdapter(s).ListTurnInputs(ctx, tenant, session.ID, next.TurnID, 0, 100)
 	if err != nil || len(history) != 1 {
 		t.Fatal(history, err)
 	}
diff --git a/services/core/internal/store/function_inputs_test.go b/services/core/internal/store/function_inputs_test.go
index 5feae8e64..3a82d5ac5 100644
--- a/services/core/internal/store/function_inputs_test.go
+++ b/services/core/internal/store/function_inputs_test.go
@@ -40,7 +40,7 @@ func TestFunctionInputBatchesPersistAndReplayWithoutRetargeting(t *testing.T) {
 	tenant, session, turn := functionInputFixture(t, s, functionExecution(t))
 	full := `{"success":false,"output":[{"type":"input_text","text":""},{"type":"input_image","image_url":"data:image/png;base64,AA=="},{"type":"input_text","text":"after"}],"error":"failed"}`
 	batch := []sessions.Input{resultInput(t, turn, "a", full), {Kind: "message", Payload: json.RawMessage(`{"text":"Follow up"}`)}, resultInput(t, turn, "b", `{"success":true,"output":null,"error":null}`), {Kind: "cancel", Payload: json.RawMessage(`{}`)}}
-	receipts, err := s.SubmitInputs(t.Context(), tenant, session.ID, "batch", batch)
+	receipts, err := submitInputs(t.Context(), s, tenant, session.ID, "batch", batch)
 	if err != nil || len(receipts) != 4 {
 		t.Fatal(receipts, err)
 	}
@@ -60,7 +60,7 @@ func TestFunctionInputBatchesPersistAndReplayWithoutRetargeting(t *testing.T) {
 	next := submitMessage(t, s, tenant, session.ID, "next").TurnID
 	pool.Close()
 	s, _ = testStore(t)
-	retry, err := s.SubmitInputs(t.Context(), tenant, session.ID, "batch", batch)
+	retry, err := submitInputs(t.Context(), s, tenant, session.ID, "batch", batch)
 	if err != nil || len(retry) != len(receipts) {
 		t.Fatal(retry, err)
 	}
@@ -73,11 +73,11 @@ func TestFunctionInputBatchesPersistAndReplayWithoutRetargeting(t *testing.T) {
 	if !reflect.DeepEqual(retry, receipts) {
 		t.Fatal(retry, receipts)
 	}
-	history, err := s.ListTurnInputs(t.Context(), tenant, session.ID, turn, 0, 100)
+	history, err := sessionAdapter(s).ListTurnInputs(t.Context(), tenant, session.ID, turn, 0, 100)
 	if err != nil || len(history) != 5 || history[1].Kind != "tool_result" || history[2].Kind != "message" {
 		t.Fatal(history, err)
 	}
-	future, err := s.ListTurnInputs(t.Context(), tenant, session.ID, next, 0, 100)
+	future, err := sessionAdapter(s).ListTurnInputs(t.Context(), tenant, session.ID, next, 0, 100)
 	if err != nil || len(future) != 1 {
 		t.Fatal(future, err)
 	}
@@ -86,11 +86,11 @@ func TestFunctionInputBatchesPersistAndReplayWithoutRetargeting(t *testing.T) {
 		t.Fatal(current, err)
 	}
 	changed := []sessions.Input{batch[1], batch[0], batch[2], batch[3]}
-	if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "batch", changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+	if _, err := submitInputs(t.Context(), s, tenant, session.ID, "batch", changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 		t.Fatal(err)
 	}
 	// A new request identity can repeat an identical saved result, without native application.
-	if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "same-result", batch[:1]); err != nil {
+	if _, err := submitInputs(t.Context(), s, tenant, session.ID, "same-result", batch[:1]); err != nil {
 		t.Fatal(err)
 	}
 	call, err = FixtureFunctionCall(t.Context(), s.pool, tenant, session.ID, turn, "a")
@@ -136,7 +136,7 @@ func TestFunctionInputBatchFailureRollsBackEveryWrite(t *testing.T) {
 				batch = append(batch, resultInput(t, turn, "a", `{"success":false}`))
 				expected = sessions.ErrFunctionResultConflict
 			}
-			if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "failed-batch", batch); !errors.Is(err, expected) {
+			if _, err := submitInputs(t.Context(), s, tenant, session.ID, "failed-batch", batch); !errors.Is(err, expected) {
 				t.Fatal(err)
 			}
 			call, err := FixtureFunctionCall(t.Context(), s.pool, tenant, session.ID, turn, "a")
@@ -147,11 +147,11 @@ func TestFunctionInputBatchFailureRollsBackEveryWrite(t *testing.T) {
 			if err != nil || !state.CancelRequestedAt.IsZero() || state.Status != sessions.TurnWaiting {
 				t.Fatal(state, err)
 			}
-			history, err := s.ListTurnInputs(t.Context(), tenant, session.ID, turn, 0, 100)
+			history, err := sessionAdapter(s).ListTurnInputs(t.Context(), tenant, session.ID, turn, 0, 100)
 			if err != nil || len(history) != 1 {
 				t.Fatal(history, err)
 			}
-			if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "failed-batch", []sessions.Input{first, cancel}); err != nil {
+			if _, err := submitInputs(t.Context(), s, tenant, session.ID, "failed-batch", []sessions.Input{first, cancel}); err != nil {
 				t.Fatal("failed transaction retained retry identity", err)
 			}
 		})
@@ -169,7 +169,7 @@ func TestFunctionInputConcurrentBatchesSelectOneResult(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			_, err := other.SubmitInputs(t.Context(), tenant, session.ID, fmt.Sprint(i), batch)
+			_, err := submitInputs(t.Context(), other, tenant, session.ID, fmt.Sprint(i), batch)
 			results <- err
 		}()
 	}
@@ -188,7 +188,7 @@ func TestFunctionInputConcurrentBatchesSelectOneResult(t *testing.T) {
 	if wins != 1 || conflicts != 1 {
 		t.Fatal(wins, conflicts)
 	}
-	history, err := s.ListTurnInputs(t.Context(), tenant, session.ID, turn, 0, 100)
+	history, err := sessionAdapter(s).ListTurnInputs(t.Context(), tenant, session.ID, turn, 0, 100)
 	if err != nil || len(history) != 3 {
 		t.Fatal(history, err)
 	}
@@ -198,7 +198,7 @@ func TestFunctionInputsRejectInvalidTargetsAndStorageObjects(t *testing.T) {
 	s, _ := testStore(t)
 	tenant, session, turn := functionInputFixture(t, s, functionExecution(t))
 	for _, raw := range []string{`{}`, `{"turn_id":"","call_id":"a","result":{}}`, fmt.Sprintf(`{"turn_id":%q,"call_id":" ","result":{}}`, turn), fmt.Sprintf(`{"turn_id":%q,"call_id":"a"}`, turn), fmt.Sprintf(`{"turn_id":%q,"call_id":"a","result":null}`, turn), fmt.Sprintf(`{"turn_id":%q,"call_id":"a","result":[]}`, turn)} {
-		_, err := s.SubmitInputs(t.Context(), tenant, session.ID, "invalid", []sessions.Input{{Kind: "tool_result", Payload: json.RawMessage(raw)}})
+		_, err := submitInputs(t.Context(), s, tenant, session.ID, "invalid", []sessions.Input{{Kind: "tool_result", Payload: json.RawMessage(raw)}})
 		if !errors.Is(err, sessions.ErrInvalidInput) {
 			t.Fatal(err)
 		}
@@ -207,7 +207,7 @@ func TestFunctionInputsRejectInvalidTargetsAndStorageObjects(t *testing.T) {
 	// Missing, foreign and malformed Sessions are not found, whatever the target.
 	for _, scope := range []struct{ tenant, session string }{{uuid.NewString(), session.ID}, {tenant, uuid.NewString()}, {tenant, "sess_malformed"}} {
 		for _, target := range []sessions.Input{input, resultInput(t, "bad", "missing", `{"success":true}`)} {
-			if _, err := s.SubmitInputs(t.Context(), scope.tenant, scope.session, "foreign", []sessions.Input{target}); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := submitInputs(t.Context(), s, scope.tenant, scope.session, "foreign", []sessions.Input{target}); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
 		}
@@ -221,12 +221,12 @@ func TestFunctionInputsRejectInvalidTargetsAndStorageObjects(t *testing.T) {
 		{uuid.NewString(), "a", sessions.ErrFunctionCallTurnMismatch}, {"bad", "a", sessions.ErrFunctionCallTurnMismatch},
 		{turn, "missing", sessions.ErrUnknownFunctionCall}, {uuid.NewString(), "missing", sessions.ErrUnknownFunctionCall}, {"bad", "missing", sessions.ErrUnknownFunctionCall},
 	} {
-		if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "target", []sessions.Input{resultInput(t, target.turn, target.call, `{"success":true}`)}); !errors.Is(err, target.want) {
+		if _, err := submitInputs(t.Context(), s, tenant, session.ID, "target", []sessions.Input{resultInput(t, target.turn, target.call, `{"success":true}`)}); !errors.Is(err, target.want) {
 			t.Fatal(target, err)
 		}
 	}
 	transition(t, s, tenant, session.ID, turn, sessions.TurnWaiting, sessions.TurnFailed)
-	if _, err := s.SubmitInputs(t.Context(), tenant, session.ID, "late", []sessions.Input{input}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := submitInputs(t.Context(), s, tenant, session.ID, "late", []sessions.Input{input}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal(err)
 	}
 	current, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
diff --git a/services/core/internal/store/function_state_public_test.go b/services/core/internal/store/function_state_public_test.go
index c578c5310..69b329cbf 100644
--- a/services/core/internal/store/function_state_public_test.go
+++ b/services/core/internal/store/function_state_public_test.go
@@ -31,7 +31,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/function_state_test.go b/services/core/internal/store/function_state_test.go
index 320650e7f..8da65ee48 100644
--- a/services/core/internal/store/function_state_test.go
+++ b/services/core/internal/store/function_state_test.go
@@ -98,7 +98,7 @@ func TestFunctionStateCancellationAndTerminalCleanup(t *testing.T) {
 			if status == sessions.TurnCancelled {
 				before, _ := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session.ID)
 				for _, key := range []string{"cancel", "cancel", "another-cancel"} {
-					if _, err := s.RequestCancel(t.Context(), tenant, session.ID, key); err != nil {
+					if _, err := requestCancel(t.Context(), s, tenant, session.ID, key); err != nil {
 						t.Fatal(err)
 					}
 				}
diff --git a/services/core/internal/store/harness_onboarding_test.go b/services/core/internal/store/harness_onboarding_test.go
index 3203b07de..c41003575 100644
--- a/services/core/internal/store/harness_onboarding_test.go
+++ b/services/core/internal/store/harness_onboarding_test.go
@@ -105,7 +105,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 		t.Fatal(err)
 	}
 	var result execution.Result
-	inputs, inputErr := h.s.ListTurnInputs(ctx, h.tenant, created.ID, first.RunID, 0, 100)
+	inputs, inputErr := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, created.ID, first.RunID, 0, 100)
 	if inputErr != nil || len(inputs) != 2 {
 		t.Fatal(inputs, inputErr)
 	}
diff --git a/services/core/internal/store/hosted_initialization_failure_public_test.go b/services/core/internal/store/hosted_initialization_failure_public_test.go
index 90ccc4f5a..805d0ebb3 100644
--- a/services/core/internal/store/hosted_initialization_failure_public_test.go
+++ b/services/core/internal/store/hosted_initialization_failure_public_test.go
@@ -223,7 +223,7 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 				!last.EnvironmentFailure.FailedAt.Equal(read.EnvironmentFailure.FailedAt) || last.EnvironmentInputActivity != nil || !last.Settled {
 				t.Fatal("failed snapshot", last)
 			}
-			if _, err := s.ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); !errors.Is(err, sessions.ErrHostedEnvironmentFailed) {
+			if _, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); !errors.Is(err, sessions.ErrHostedEnvironmentFailed) {
 				t.Fatal("failed hosted Environment admitted input", err)
 			}
 			raw, _ := json.Marshal(events)
diff --git a/services/core/internal/store/input_batches_test.go b/services/core/internal/store/input_batches_test.go
deleted file mode 100644
index 16574d0fd..000000000
--- a/services/core/internal/store/input_batches_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-	"sync"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-func messageInput(text string) sessions.Input {
-	payload, _ := json.Marshal(map[string]string{"text": text})
-	return sessions.Input{Kind: "message", Payload: payload}
-}
-
-func TestInputBatchesAreOrderedAndIdempotentAcrossConnections(t *testing.T) {
-	s, _ := testStore(t)
-	other, _ := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	const count = 8
-	batch := []sessions.Input{messageInput("first"), messageInput("second")}
-	for _, repeated := range []bool{true, false} {
-		var wg sync.WaitGroup
-		receipts := make(chan []sessions.InputReceipt, count)
-		errs := make(chan error, count)
-		for i := range count {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
-				st := s
-				if i%2 == 0 {
-					st = other
-				}
-				key := "same-batch"
-				if !repeated {
-					key = fmt.Sprintf("batch-%d", i)
-				}
-				got, err := st.SubmitInputs(ctx, tenant, session.ID, key, batch)
-				receipts <- got
-				errs <- err
-			}()
-		}
-		wg.Wait()
-		close(receipts)
-		close(errs)
-		for err := range errs {
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-		newBatches := 0
-		for got := range receipts {
-			if len(got) != 2 || got[0].TurnID == "" || got[0].TurnID != got[1].TurnID || got[0].Sequence >= got[1].Sequence || got[0].Replayed != got[1].Replayed {
-				t.Fatalf("invalid batch receipt: %+v", got)
-			}
-			if !got[0].Replayed {
-				newBatches++
-			}
-		}
-		want := count
-		if repeated {
-			want = 1
-		}
-		if newBatches != want {
-			t.Fatalf("accepted %d batches, want %d", newBatches, want)
-		}
-	}
-	got, err := s.SubmitInputs(ctx, tenant, session.ID, "same-batch", batch)
-	if err != nil {
-		t.Fatal(err)
-	}
-	inputs, err := s.ListTurnInputs(ctx, tenant, session.ID, got[0].TurnID, 0, 100)
-	if err != nil || len(inputs) != 2*(count+1) {
-		t.Fatalf("inputs=%d err=%v", len(inputs), err)
-	}
-	for i, input := range inputs {
-		var payload map[string]string
-		if err := json.Unmarshal(input.Payload, &payload); err != nil {
-			t.Fatal(err)
-		}
-		want := "first"
-		if i%2 == 1 {
-			want = "second"
-		}
-		if payload["text"] != want {
-			t.Fatalf("batch interleaved at %d: %v", i, payload)
-		}
-	}
-}
-
-func TestBatchRetriesCompareTheWholeRequestAndRetainTargets(t *testing.T) {
-	s, pool := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	cancel := sessions.Input{Kind: "cancel", Payload: json.RawMessage(`{}`)}
-	batch := []sessions.Input{cancel, messageInput("one"), cancel, messageInput("two")}
-	first, err := s.SubmitInputs(ctx, tenant, session.ID, "mixed", batch)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if first[0].TurnID != "" || first[1].TurnID == "" || first[1].TurnID != first[2].TurnID || first[1].TurnID == first[3].TurnID {
-		t.Fatalf("cancellation targets: %+v", first)
-	}
-	cancelled, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, first[1].TurnID)
-	if err != nil || cancelled.Status != sessions.TurnCancelled {
-		t.Fatalf("cancelled turn=%+v err=%v", cancelled, err)
-	}
-	transition(t, s, tenant, session.ID, first[3].TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-	transition(t, s, tenant, session.ID, first[3].TurnID, sessions.TurnInProgress, sessions.TurnCompleted)
-	next := submitMessage(t, s, tenant, session.ID, "next")
-	for _, changed := range [][]sessions.Input{batch[:3], append(append([]sessions.Input{}, batch...), cancel), {batch[0], batch[3], batch[2], batch[1]}} {
-		if _, err := s.SubmitInputs(ctx, tenant, session.ID, "mixed", changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-			t.Fatalf("changed batch accepted: %v", err)
-		}
-	}
-	batch[1].Payload = json.RawMessage(`{ "text" : "one" }`)
-	pool.Close()
-	restarted, _ := testStore(t)
-	retry, err := restarted.SubmitInputs(ctx, tenant, session.ID, "mixed", batch)
-	for i := range first {
-		first[i].Replayed = true
-	}
-	if err != nil || !reflect.DeepEqual(retry, first) {
-		t.Fatalf("restart changed receipts: %+v, %v", retry, err)
-	}
-	current, err := sessionAdapter(restarted).GetTurn(ctx, tenant, session.ID, next.TurnID)
-	if err != nil || current.Status != sessions.TurnQueued || !current.CancelRequestedAt.IsZero() {
-		t.Fatalf("retry cancelled later work: %+v, %v", current, err)
-	}
-	otherTenant, _ := newTurnSession(t, restarted)
-	if _, err := restarted.SubmitInputs(ctx, otherTenant, session.ID, "mixed", batch); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatalf("batch retry escaped tenant: %v", err)
-	}
-}
-
-func TestFailedBatchRollsBackEarlierCancellationAndInputs(t *testing.T) {
-	s, pool := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	initial := submitMessage(t, s, tenant, session.ID, "initial")
-	transition(t, s, tenant, session.ID, initial.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-	key := uuid.NewString()
-	constraint := "batch_failure_" + strings.ReplaceAll(key, "-", "")
-	// Inject a storage error on the second insert, after cancellation has run.
-	_, err := pool.Exec(ctx, "ALTER TABLE turn_inputs ADD CONSTRAINT "+constraint+" CHECK (idempotency_key <> '"+key+"' OR batch_position = 0)")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { _, _ = pool.Exec(ctx, "ALTER TABLE turn_inputs DROP CONSTRAINT IF EXISTS "+constraint) })
-	batch := []sessions.Input{{Kind: "cancel", Payload: json.RawMessage(`{}`)}, messageInput("after cancel")}
-	if got, err := s.SubmitInputs(ctx, tenant, session.ID, key, batch); err == nil || got != nil {
-		t.Fatalf("partial batch succeeded: %+v %v", got, err)
-	}
-	turn, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, initial.TurnID)
-	if err != nil || turn.Status != sessions.TurnInProgress || !turn.CancelRequestedAt.IsZero() {
-		t.Fatalf("cancellation escaped rollback: %+v %v", turn, err)
-	}
-	inputs, err := s.ListTurnInputs(ctx, tenant, session.ID, initial.TurnID, 0, 100)
-	if err != nil || len(inputs) != 1 {
-		t.Fatalf("partial inputs survived: %v %v", inputs, err)
-	}
-	if _, err := pool.Exec(ctx, "ALTER TABLE turn_inputs DROP CONSTRAINT "+constraint); err != nil {
-		t.Fatal(err)
-	}
-	got, err := s.SubmitInputs(ctx, tenant, session.ID, key, batch)
-	if err != nil || len(got) != 2 || got[0].Replayed || got[1].Replayed {
-		t.Fatalf("retry after rollback: %+v %v", got, err)
-	}
-}
-
-func TestInputBatchValidation(t *testing.T) {
-	for _, input := range [][]sessions.Input{
-		nil, make([]sessions.Input, 65), {messageInput("ok"), {Kind: "unsupported", Payload: json.RawMessage(`{}`)}},
-		{{Kind: "message"}}, {{Kind: "message", Payload: json.RawMessage(`[]`)}},
-		{{Kind: "cancel", Payload: json.RawMessage(`{"target":"other"}`)}},
-		{messageInput(strings.Repeat("x", 300*1024)), messageInput(strings.Repeat("y", 300*1024))},
-	} {
-		if _, _, err := validateInputs(input); !errors.Is(err, sessions.ErrInvalidInput) {
-			t.Fatalf("invalid batch accepted: %v", err)
-		}
-	}
-}
diff --git a/services/core/internal/store/input_conflicts_public_test.go b/services/core/internal/store/input_conflicts_public_test.go
index fbe1e422c..7c739e4b1 100644
--- a/services/core/internal/store/input_conflicts_public_test.go
+++ b/services/core/internal/store/input_conflicts_public_test.go
@@ -70,7 +70,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	// waiting starts a Turn that waits for one function result.
 	waiting := func(session, key, call string) sessions.InputReceipt {
 		t.Helper()
-		receipt, err := s.SubmitMessage(ctx, tenant, session, key, json.RawMessage(`{"text":"work"}`))
+		receipt, err := store.SendMessage(ctx, s, tenant, session, key, json.RawMessage(`{"text":"work"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/inputs_test.go b/services/core/internal/store/inputs_test.go
new file mode 100644
index 000000000..ec00d3d78
--- /dev/null
+++ b/services/core/internal/store/inputs_test.go
@@ -0,0 +1,128 @@
+package store
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+var messagePayload = json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"hello"}]}]}`)
+
+func messageInput(text string) sessions.Input {
+	payload, _ := json.Marshal(map[string]string{"text": text})
+	return sessions.Input{Kind: "message", Payload: payload}
+}
+
+func newTurnSession(t *testing.T, s *Store) (string, sessions.Session) {
+	t.Helper()
+	tenant := uuid.NewString()
+	session, err := s.CreateSession(context.Background(), tenant, sessions.CreateSession{Creator: FixtureCreator(),
+		Engine: "codex", IdempotencyKey: "session", Configuration: json.RawMessage(`{"agent":{"model":"test","instructions":"original"}}`),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return tenant, session
+}
+
+func environmentInputSession(t *testing.T, s *Store) (string, sessions.Session) {
+	t.Helper()
+	tenant := uuid.NewString()
+	session, err := s.CreateSession(context.Background(), tenant, environmentInput("session", "self_hosted", "/workspace"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	return tenant, session
+}
+
+// submitInputs admits inputs through the Session service on s's database, as
+// the public events route does.
+func submitInputs(ctx context.Context, s *Store, tenant, session, key string, inputs []sessions.Input) ([]sessions.InputReceipt, error) {
+	service, err := sessions.NewService(sessionAdapter(s))
+	if err != nil {
+		return nil, err
+	}
+	return service.SubmitInputs(ctx, tenant, session, key, inputs)
+}
+
+func submitInput(ctx context.Context, s *Store, tenant, session, key string, input sessions.Input) (sessions.InputReceipt, error) {
+	receipts, err := submitInputs(ctx, s, tenant, session, key, []sessions.Input{input})
+	if err != nil {
+		return sessions.InputReceipt{}, err
+	}
+	return receipts[0], nil
+}
+
+func sendMessage(ctx context.Context, s *Store, tenant, session, key string, payload json.RawMessage) (sessions.InputReceipt, error) {
+	return submitInput(ctx, s, tenant, session, key, sessions.Input{Kind: "message", Payload: payload})
+}
+
+func requestCancel(ctx context.Context, s *Store, tenant, session, key string) (sessions.InputReceipt, error) {
+	return submitInput(ctx, s, tenant, session, key, sessions.Input{Kind: "cancel", Payload: json.RawMessage(`{}`)})
+}
+
+func submitMessage(t *testing.T, s *Store, tenant, session, key string) sessions.InputReceipt {
+	t.Helper()
+	receipt, err := sendMessage(context.Background(), s, tenant, session, key, messagePayload)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return receipt
+}
+
+func reserveEnvironmentInput(t *testing.T, s *Store, tenant, session, key string) sessions.EnvironmentInputReservation {
+	t.Helper()
+	got, err := sessionService(t, s).ReserveEnvironmentInput(context.Background(), tenant, session, key, []sessions.Input{messageInput("first"), messageInput("second")})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return got
+}
+
+// cancelEnvironmentInput cancels the Session's pending Environment input as
+// Session cancellation does, then reads the reservation back.
+func cancelEnvironmentInput(ctx context.Context, s *Store, tenant, session, reservation string) (sessions.EnvironmentInputReservation, error) {
+	owner, err := parseID(tenant)
+	if err != nil {
+		return sessions.EnvironmentInputReservation{}, err
+	}
+	err = s.withPublicSession(ctx, tenant, session, func(ctx context.Context, q *sqlc.Queries, id pgtype.UUID) error {
+		bound := sessionpg.BindSession(q, owner, id)
+		return sessions.TrackInputActivity(ctx, bound, func(ctx context.Context) error { return bound.CancelPendingInput(ctx) })
+	})
+	if err != nil {
+		return sessions.EnvironmentInputReservation{}, err
+	}
+	return sessionAdapter(s).GetEnvironmentInputReservation(ctx, tenant, session, reservation)
+}
+
+func transition(t *testing.T, s *Store, tenant, session, turn, from, to string) sessions.Turn {
+	t.Helper()
+	got, err := transitionTurn(context.Background(), s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return got
+}
+
+func environmentInputHistory(t *testing.T, pool *pgxpool.Pool, session string, turns, inputs int) {
+	t.Helper()
+	var gotTurns, gotInputs, items, events int
+	err := pool.QueryRow(context.Background(), `
+		SELECT (SELECT count(*) FROM turns WHERE session_id=$1),
+		       (SELECT count(*) FROM turn_inputs WHERE session_id=$1),
+		       (SELECT count(*) FROM session_items WHERE session_id=$1),
+		       (SELECT count(*) FROM session_events WHERE session_id=$1
+		        AND (payload ? 'turn' OR payload->'event' ? 'item'))`, session).Scan(&gotTurns, &gotInputs, &items, &events)
+	if err != nil || gotTurns != turns || gotInputs != inputs || items != inputs || (inputs == 0 && events != 0) {
+		t.Fatal("history", gotTurns, gotInputs, items, events, err)
+	}
+}
diff --git a/services/core/internal/store/item_order_test.go b/services/core/internal/store/item_order_test.go
index 924da4b50..5514b2e31 100644
--- a/services/core/internal/store/item_order_test.go
+++ b/services/core/internal/store/item_order_test.go
@@ -23,7 +23,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -52,7 +52,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 			t.Fatal(err)
 		}
 	}
-	if _, err = s.SubmitMessage(ctx, tenant, session.ID, "steer", json.RawMessage(`{"text":"continue"}`)); err != nil {
+	if _, err = store.SendMessage(ctx, s, tenant, session.ID, "steer", json.RawMessage(`{"text":"continue"}`)); err != nil {
 		t.Fatal(err)
 	}
 	page, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
@@ -132,7 +132,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 		t.Fatal(err)
 	}
 	checkOrder()
-	next, err := s.SubmitMessage(ctx, tenant, session.ID, "next-turn", json.RawMessage(`{"text":"new turn"}`))
+	next, err := store.SendMessage(ctx, s, tenant, session.ID, "next-turn", json.RawMessage(`{"text":"new turn"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/item_reads_test.go b/services/core/internal/store/item_reads_test.go
index 836fd4333..861f0d7f4 100644
--- a/services/core/internal/store/item_reads_test.go
+++ b/services/core/internal/store/item_reads_test.go
@@ -23,7 +23,7 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -123,7 +123,7 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
 	tenant := uuid.NewString()
 	session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "legacy"})
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -160,7 +160,7 @@ func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 	tenant := uuid.NewString()
 	for _, receiptOnly := range []bool{true, false} {
 		session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString()})
-		input, err := s.SubmitMessage(ctx, tenant, session.ID, "first", json.RawMessage(`{"text":"test"}`))
+		input, err := store.SendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"test"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -194,7 +194,7 @@ func TestLegacyFailureRetainsPartialAnswerAcrossRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/list_cursor_public_test.go b/services/core/internal/store/list_cursor_public_test.go
index 70d58d2dc..8d050877c 100644
--- a/services/core/internal/store/list_cursor_public_test.go
+++ b/services/core/internal/store/list_cursor_public_test.go
@@ -69,7 +69,7 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 	if _, err := store.TransitionTurn(ctx, s, tenant, f.session, f.turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.SubmitMessage(ctx, tenant, f.session, label+"-second", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"second"}]}]}`)); err != nil {
+	if _, err := store.SendMessage(ctx, s, tenant, f.session, label+"-second", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"second"}]}]}`)); err != nil {
 		t.Fatal(err)
 	}
 	f.otherSession = client.created(token, "/v1/agents/sessions", newSession)
@@ -91,7 +91,7 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 		if err != nil {
 			t.Fatal(err)
 		}
-		receipt, err := s.SubmitMessage(ctx, tenant, created.ID, key+"-input", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"delegate"}]}]}`))
+		receipt, err := store.SendMessage(ctx, s, tenant, created.ID, key+"-input", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"delegate"}]}]}`))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/local_artifact_export_test.go b/services/core/internal/store/local_artifact_export_test.go
index cc45e09e5..b39f29ded 100644
--- a/services/core/internal/store/local_artifact_export_test.go
+++ b/services/core/internal/store/local_artifact_export_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func completeLocalArtifactExport(t *testing.T, h *dispatchHarness, worker *execution.Worker, environment sessions.Environment) {
@@ -46,7 +47,7 @@ func completeLocalArtifactExport(t *testing.T, h *dispatchHarness, worker *execu
 		t.Fatal("capture published before native completion", err)
 	}
 	completeCaptureDirectoryRead(t, h, worker, environment)
-	pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "during-artifact-capture", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"run after the completed native execution"}`)}})
+	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "during-artifact-capture", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"run after the completed native execution"}`)}})
 	if err != nil || pending.State != sessions.EnvironmentInputPending || len(pending.Receipts) != 0 {
 		t.Fatalf("input during artifact capture was assigned to the finished executor: %+v %v", pending, err)
 	}
diff --git a/services/core/internal/store/local_environment_file_write_test.go b/services/core/internal/store/local_environment_file_write_test.go
index ed77c1edf..dd795c914 100644
--- a/services/core/internal/store/local_environment_file_write_test.go
+++ b/services/core/internal/store/local_environment_file_write_test.go
@@ -57,7 +57,7 @@ func TestLocalEnvironmentFileWriteOwnsMutationBeforeDispatch(t *testing.T) {
 	if err != nil || intent.State != "pending" || intent.Identity.DeviceID != h.device.ID {
 		t.Fatal("dispatch preceded durable ownership", intent, err)
 	}
-	if _, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "concurrent", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "concurrent", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("upload admitted concurrent execution", err)
 	}
 	cancel()
@@ -99,7 +99,7 @@ func TestLocalEnvironmentFileWriteLostReceiptRemainsPending(t *testing.T) {
 	if err != nil || intent.State != "pending" {
 		t.Fatal("disconnect guessed rejection", intent, err)
 	}
-	if _, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "after-loss", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "after-loss", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("unknown upload admitted execution", err)
 	}
 }
diff --git a/services/core/internal/store/local_environment_worker_test.go b/services/core/internal/store/local_environment_worker_test.go
index cd8e2429a..6f935956d 100644
--- a/services/core/internal/store/local_environment_worker_test.go
+++ b/services/core/internal/store/local_environment_worker_test.go
@@ -110,7 +110,7 @@ func TestLocalEnvironmentWorkerRejectsGeneralDeviceDespiteCapability(t *testing.
 
 func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *testing.T) {
 	h, worker, environment := localWorker(t, true, true)
-	reservation, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "local-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	reservation, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "local-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -144,7 +144,7 @@ func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *test
 		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
 		return err == nil && turn.Status == sessions.TurnCompleted
 	})
-	settled, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, reservation.ID)
+	settled, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, reservation.ID)
 	if err != nil || settled.State != sessions.EnvironmentInputAdmitted || len(settled.Receipts) != 1 {
 		t.Fatal("local reservation did not settle", err)
 	}
diff --git a/services/core/internal/store/mcode_public_native_test.go b/services/core/internal/store/mcode_public_native_test.go
index 9cd0dcd28..9e1b3ce01 100644
--- a/services/core/internal/store/mcode_public_native_test.go
+++ b/services/core/internal/store/mcode_public_native_test.go
@@ -89,7 +89,7 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	inputs, err := h.s.ListTurnInputs(ctx, h.tenant, proof.Session, proof.FirstTurn, 0, 100)
+	inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, proof.FirstTurn, 0, 100)
 	if err != nil || len(inputs) != 2 {
 		t.Fatal("steering input not in same turn", err)
 	}
diff --git a/services/core/internal/store/message_images_native_test.go b/services/core/internal/store/message_images_native_test.go
index 40019ebc2..79aa40647 100644
--- a/services/core/internal/store/message_images_native_test.go
+++ b/services/core/internal/store/message_images_native_test.go
@@ -86,7 +86,7 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 	if json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.AppliedThrough < 1 {
 		t.Fatal("native input receipt missing")
 	}
-	inputs, err := h.s.ListTurnInputs(ctx, h.tenant, proof.Session, proof.Turn, 0, 100)
+	inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, proof.Turn, 0, 100)
 	if err != nil || len(inputs) != 3 || inputs[0].Kind != "message" || inputs[1].Kind != "message" || inputs[2].Kind != "tool_result" || outcome.AppliedThrough != inputs[2].Sequence {
 		t.Fatal("active image batch was not applied exactly once in the same Turn", err)
 	}
diff --git a/services/core/internal/store/model_protocol_native_test.go b/services/core/internal/store/model_protocol_native_test.go
index d0ee2dbd2..fac467b0e 100644
--- a/services/core/internal/store/model_protocol_native_test.go
+++ b/services/core/internal/store/model_protocol_native_test.go
@@ -125,7 +125,7 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 		if err != nil || !call.Applied {
 			t.Fatal("public function result lacks native delivery acknowledgement")
 		}
-		inputs, err := h.s.ListTurnInputs(ctx, h.tenant, proof.Session, item.Turn, 0, 100)
+		inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, item.Turn, 0, 100)
 		if err != nil || len(inputs) != 2 || inputs[0].Kind != "message" || inputs[1].Kind != "tool_result" {
 			t.Fatal("public function result input was lost or duplicated")
 		}
diff --git a/services/core/internal/store/prepared_dispatch_failure_test.go b/services/core/internal/store/prepared_dispatch_failure_test.go
index aef19d944..4c62c3518 100644
--- a/services/core/internal/store/prepared_dispatch_failure_test.go
+++ b/services/core/internal/store/prepared_dispatch_failure_test.go
@@ -24,7 +24,7 @@ func TestPreparedDispatchSettlesOnlyReadyInput(t *testing.T) {
 			handle := acknowledgePreparation(h, frame.ID)
 			switch action {
 			case "cancel":
-				if _, err := h.s.CancelEnvironmentInput(t.Context(), h.tenant, h.session.ID, pending.ID); err != nil {
+				if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
 					t.Fatal(err)
 				}
 			case "expire":
@@ -66,7 +66,7 @@ func TestPreparedDispatchSettlesOnlyReadyInput(t *testing.T) {
 			}
 			assertEnvironmentExpiryHasNoHistory(t, pool, h.session.ID)
 			if action == "prepare-failure" || action == "disconnect" {
-				stored, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+				stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 				if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(pending.Deadline) {
 					t.Fatal("preparation failure changed the pending identity", stored, err)
 				}
@@ -87,7 +87,7 @@ func TestPreparedDispatchHandlesStartRejectionAndPendingStartCancellation(t *tes
 				h.write(frame.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{State: "rejected", Operation: proto.TypeExecutionStart, ErrorCode: "preparation_not_ready"})
 			} else {
 				h.write(frame.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{Handle: handle, Revision: 3, State: "starting", RunID: start.RunID})
-				if _, err := h.s.RequestCancel(t.Context(), h.tenant, h.session.ID, "cancel-start"); err != nil {
+				if _, err := store.RequestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel-start"); err != nil {
 					t.Fatal(err)
 				}
 				frame := h.read(proto.TypePromptCancel)
@@ -147,7 +147,7 @@ func TestPreparedDispatchCancellationReceiptSurvivesStartFailure(t *testing.T) {
 			handle := acknowledgePreparation(h, prepare.ID)
 			start := readyPreparedDispatch(t, h, prepare.ID, handle)
 			h.write(prepare.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{Handle: handle, Revision: 3, State: "starting", RunID: start.RunID})
-			if _, err := h.s.RequestCancel(t.Context(), h.tenant, h.session.ID, "cancel-start"); err != nil {
+			if _, err := store.RequestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel-start"); err != nil {
 				t.Fatal(err)
 			}
 			frame := h.read(proto.TypePromptCancel)
diff --git a/services/core/internal/store/prepared_dispatch_test.go b/services/core/internal/store/prepared_dispatch_test.go
index 4c30eadc6..5964853c0 100644
--- a/services/core/internal/store/prepared_dispatch_test.go
+++ b/services/core/internal/store/prepared_dispatch_test.go
@@ -25,7 +25,7 @@ func preparedDispatchHarness(t *testing.T) (*dispatchHarness, sessions.Environme
 	assertNoRuntimeAllocation(t, h)
 	h.d, h.lease = h.bound(), h.owner().Lease
 	enableWorkerEnvironment(t, h)
-	pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
+	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -128,7 +128,7 @@ func TestPreparedDispatchOwnerOutlivesReservationDeadline(t *testing.T) {
 	if _, err := pool.Exec(t.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE id=$1", pending.ID); err != nil {
 		t.Fatal(err)
 	}
-	stored, err := h.d.Store.ExpireEnvironmentInput(t.Context(), h.tenant, h.session.ID, pending.ID)
+	stored, err := h.d.Sessions.ExpireEnvironmentInput(t.Context(), h.tenant, h.session.ID, pending.ID)
 	if err != nil || stored.State != sessions.EnvironmentInputAdmitted {
 		t.Fatal("admitted execution lost its owner to the pending-input deadline", err)
 	}
diff --git a/services/core/internal/store/public_execution_test.go b/services/core/internal/store/public_execution_test.go
index 6b6d99340..681841b58 100644
--- a/services/core/internal/store/public_execution_test.go
+++ b/services/core/internal/store/public_execution_test.go
@@ -145,7 +145,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	}
 	checkMeasurement(false)
 	queued := publicSession(t, h, "queued")
-	if _, err := h.s.SubmitMessage(ctx, h.tenant, queued.ID, "first", json.RawMessage(`{"text":"Not sent"}`)); err != nil {
+	if _, err := store.SendMessage(ctx, h.s, h.tenant, queued.ID, "first", json.RawMessage(`{"text":"Not sent"}`)); err != nil {
 		t.Fatal(err)
 	}
 	worker := startOwnedWorker(t, ctx, h.db, h.d, h.owner())
@@ -162,7 +162,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	if err != nil || pending.LastTurn.Status != sessions.TurnQueued {
 		t.Fatal(pending, err)
 	}
-	if _, err := h.s.RequestCancel(ctx, h.tenant, queued.ID, "stop-before-dispatch"); err != nil {
+	if _, err := store.RequestCancel(ctx, h.s, h.tenant, queued.ID, "stop-before-dispatch"); err != nil {
 		t.Fatal(err)
 	}
 	pending, err = store.SessionAdapter(h.s).GetSession(ctx, h.tenant, queued.ID)
diff --git a/services/core/internal/store/public_handler_fixture_test.go b/services/core/internal/store/public_handler_fixture_test.go
index 198938cbd..594490d71 100644
--- a/services/core/internal/store/public_handler_fixture_test.go
+++ b/services/core/internal/store/public_handler_fixture_test.go
@@ -145,14 +145,14 @@ func withPolicy(policy execution.Policy) func(*api.Dependencies) {
 	return func(d *api.Dependencies) { d.Policy = policy }
 }
 
-// storeExecution admits Sessions and inputs through the Store without a
-// Worker, so nothing runs them.
+// storeExecution admits Sessions through the Store and inputs through the
+// Session service without a Worker, so nothing runs them.
 func storeExecution(t testing.TB, s *store.Store) func(*api.Dependencies) {
 	return func(d *api.Dependencies) {
 		d.Execution = &api.Execution{
 			ExecutorURL:      testExecutorURL,
 			SessionAdmission: s,
-			InputAdmission:   s,
+			InputAdmission:   store.SessionService(t, s),
 			SessionArchive:   strictStandIn{t},
 			Workspaces:       strictStandIn{t},
 		}
diff --git a/services/core/internal/store/runtime_environment_terminal_test.go b/services/core/internal/store/runtime_environment_terminal_test.go
index 3a1ed2d7f..d90215a2d 100644
--- a/services/core/internal/store/runtime_environment_terminal_test.go
+++ b/services/core/internal/store/runtime_environment_terminal_test.go
@@ -53,11 +53,11 @@ func TestManagedEnvironmentTerminationSettlesInputAndPreservesIdentity(t *testin
 			if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 				t.Fatal("terminal credential remained usable", err)
 			}
-			failed, err := writer.PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
+			failed, err := sessionExecution(t, writer.lease).PromoteEnvironmentInput(t.Context(), tenant, session.ID, reservation.ID)
 			if err != nil || failed.State != sessions.EnvironmentInputFailed || len(failed.Receipts) != 0 || failed.SettledAt == nil || !failed.Deadline.Equal(reservation.Deadline) {
 				t.Fatal("late preparation resurrected failed input", failed, err)
 			}
-			if _, err := s.ReserveEnvironmentInput(t.Context(), tenant, session.ID, "new", []sessions.Input{messageInput("later")}); !errors.Is(err, sessions.ErrEnvironmentUnavailable) || expired == errors.Is(err, sessions.ErrHostedEnvironmentFailed) {
+			if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "new", []sessions.Input{messageInput("later")}); !errors.Is(err, sessions.ErrEnvironmentUnavailable) || expired == errors.Is(err, sessions.ErrHostedEnvironmentFailed) {
 				t.Fatal("terminal environment admitted new input", err)
 			}
 			if _, err := s.CreateSession(t.Context(), tenant, input); err != nil {
diff --git a/services/core/internal/store/runtime_input_admission_test.go b/services/core/internal/store/runtime_input_admission_test.go
index b80696f0a..346d3c3c2 100644
--- a/services/core/internal/store/runtime_input_admission_test.go
+++ b/services/core/internal/store/runtime_input_admission_test.go
@@ -17,7 +17,7 @@ func TestManagedRuntimeMaintenancePreservesCancelAndRetry(t *testing.T) {
 	s, db := newManagedTestStoreDB(t)
 	tenant, session, _ := managedSession(t, s, db)
 	inputs := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"accepted work"}`)}}
-	accepted, err := s.SubmitInputs(t.Context(), tenant, session.ID, "work", inputs)
+	accepted, err := store.SubmitInputs(t.Context(), s, tenant, session.ID, "work", inputs)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/runtime_suspension_concurrency_test.go b/services/core/internal/store/runtime_suspension_concurrency_test.go
index 67aaf940f..0bd57d443 100644
--- a/services/core/internal/store/runtime_suspension_concurrency_test.go
+++ b/services/core/internal/store/runtime_suspension_concurrency_test.go
@@ -99,16 +99,16 @@ func TestRuntimeSuspensionPromotionRetainsPendingInput(t *testing.T) {
 	s, w, pool, owner := runtimeSuspensionFixture(t)
 	runtimeSuspensionSQL(t, pool, `UPDATE runtime_allocations SET compute_phase='waking',compute_retained_until=clock_timestamp()+interval '1 hour' WHERE id=$1`, owner.ID)
 	pending := reserveEnvironmentInput(t, s, owner.TenantID, owner.SessionID, "during-wake")
-	if _, err := w.PromoteEnvironmentInput(t.Context(), owner.TenantID, owner.SessionID, pending.ID); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := sessionExecution(t, w.lease).PromoteEnvironmentInput(t.Context(), owner.TenantID, owner.SessionID, pending.ID); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("waking allocation promoted model input", err)
 	}
-	got, err := s.GetEnvironmentInputReservation(t.Context(), owner.TenantID, owner.SessionID, pending.ID)
+	got, err := sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), owner.TenantID, owner.SessionID, pending.ID)
 	if err != nil || got.State != sessions.EnvironmentInputPending || got.SettledAt != nil || len(got.Receipts) != 0 {
 		t.Fatal("blocked promotion partially committed", got, err)
 	}
 	environmentInputHistory(t, pool, owner.SessionID, 0, 0)
 	runtimeSuspensionSQL(t, pool, `UPDATE runtime_allocations SET compute_phase='running',compute_retained_until=NULL WHERE id=$1`, owner.ID)
-	got, err = w.PromoteEnvironmentInput(t.Context(), owner.TenantID, owner.SessionID, pending.ID)
+	got, err = sessionExecution(t, w.lease).PromoteEnvironmentInput(t.Context(), owner.TenantID, owner.SessionID, pending.ID)
 	if err != nil || got.State != sessions.EnvironmentInputAdmitted || len(got.Receipts) != 2 {
 		t.Fatal("pending request could not resume once running", got, err)
 	}
diff --git a/services/core/internal/store/runtime_wake_hint_integration_test.go b/services/core/internal/store/runtime_wake_hint_integration_test.go
index d6744f12d..b7cfc0664 100644
--- a/services/core/internal/store/runtime_wake_hint_integration_test.go
+++ b/services/core/internal/store/runtime_wake_hint_integration_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 type wakeHintScanProvider struct {
@@ -125,7 +126,7 @@ func (f *wakeHintIntegration) pending(t *testing.T, target wakeHintIntegrationTa
 			"SELECT id::text FROM environment_input_reservations WHERE session_id=$1 AND idempotency_key=$2",
 			target.session.ID, key).Scan(&id) == nil
 	})
-	pending, err := f.fixture.store.GetEnvironmentInputReservation(t.Context(), target.tenant, target.session.ID, id)
+	pending, err := store.SessionAdapter(f.fixture.store).GetEnvironmentInputReservation(t.Context(), target.tenant, target.session.ID, id)
 	if err != nil || pending.State != sessions.EnvironmentInputPending {
 		t.Fatal("input was not durably pending", pending.State, err)
 	}
@@ -196,7 +197,7 @@ func TestRuntimeWakeHintRejectedSubmitDoesNotAccelerateScan(t *testing.T) {
 			} else {
 				// Persist directly while the sentinel is blocked. Only the failing
 				// Worker submission could emit a hint; Store persistence cannot.
-				if _, err := f.fixture.store.ReserveEnvironmentInput(t.Context(), f.target.tenant, f.target.session.ID, key, inputs); err != nil {
+				if _, err := store.SessionService(t, f.fixture.store).ReserveEnvironmentInput(t.Context(), f.target.tenant, f.target.session.ID, key, inputs); err != nil {
 					t.Fatal(err)
 				}
 				if name == "idempotency conflict" {
diff --git a/services/core/internal/store/runtime_worker_recovery_test.go b/services/core/internal/store/runtime_worker_recovery_test.go
index 50c70e6fe..99e4a3275 100644
--- a/services/core/internal/store/runtime_worker_recovery_test.go
+++ b/services/core/internal/store/runtime_worker_recovery_test.go
@@ -36,7 +36,7 @@ func runtimeWorkerHarness(t *testing.T) (*dispatchHarness, *pgxpool.Pool) {
 func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.T) {
 	h, _ := runtimeWorkerHarness(t)
 	h.d, h.lease = h.bound(), h.owner().Lease
-	pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -57,7 +57,7 @@ func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.
 
 func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 	h, pool := runtimeWorkerHarness(t)
-	pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -104,7 +104,7 @@ func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 	if release.ID != prepare.ID {
 		t.Fatal("conflicted preparation was not released")
 	}
-	stored, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+	stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 	if err != nil || stored.State != sessions.EnvironmentInputPending || len(stored.Receipts) != 0 {
 		t.Fatal("conflict consumed queued input", stored, err)
 	}
diff --git a/services/core/internal/store/sandbox_deployment_switch_test.go b/services/core/internal/store/sandbox_deployment_switch_test.go
index 2c26d8739..63602a7ed 100644
--- a/services/core/internal/store/sandbox_deployment_switch_test.go
+++ b/services/core/internal/store/sandbox_deployment_switch_test.go
@@ -311,7 +311,7 @@ func TestSandboxSwitchPreservesReleasedAllocationAndItemHistory(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(t.Context(), tenant, history.ID, "history", json.RawMessage(`{"text":"retained request"}`))
+	input, err := sendMessage(t.Context(), s, tenant, history.ID, "history", json.RawMessage(`{"text":"retained request"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/scheduling.go b/services/core/internal/store/scheduling.go
deleted file mode 100644
index b094ed530..000000000
--- a/services/core/internal/store/scheduling.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package store
-
-import (
-	"context"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-func (s *Store) ListEnvironmentInputWork(ctx context.Context, after string, connectedDevices []string) ([]sessions.EnvironmentInputWork, error) {
-	id, devices, err := sessionpg.ExecutionWorkCursor(after, connectedDevices)
-	if err != nil {
-		return nil, err
-	}
-	rows, err := s.queries.ListEnvironmentInputWork(ctx, sqlc.ListEnvironmentInputWorkParams{AfterID: id, ConnectedDevices: devices})
-	if err != nil {
-		return nil, err
-	}
-	work := make([]sessions.EnvironmentInputWork, 0, len(rows))
-	for _, row := range rows {
-		work = append(work, sessions.EnvironmentInputWork{TenantID: uuid.UUID(row.TenantID.Bytes).String(), SessionID: uuid.UUID(row.SessionID.Bytes).String(), ReservationID: uuid.UUID(row.ID.Bytes).String()})
-	}
-	return work, nil
-}
diff --git a/services/core/internal/store/self_hosted_cancel_public_test.go b/services/core/internal/store/self_hosted_cancel_public_test.go
index 5da4bc866..aeff47ca7 100644
--- a/services/core/internal/store/self_hosted_cancel_public_test.go
+++ b/services/core/internal/store/self_hosted_cancel_public_test.go
@@ -118,7 +118,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 		return value
 	}
 	idleReceipts := receipts(created.IdleKey, "")
-	later, err := s.ReserveEnvironmentInput(t.Context(), tenant, created.LaterID, "controlled-later-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"Retain pending input."}`)}})
+	later, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, created.LaterID, "controlled-later-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"Retain pending input."}`)}})
 	if err != nil || later.State != sessions.EnvironmentInputPending || later.IsInitial {
 		t.Fatal("could not establish controlled later reservation", err)
 	}
@@ -132,7 +132,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	start := func() string {
 		t.Helper()
 		// Controlled callbacks isolate HTTP admission; no daemon or model runs in this fixture.
-		input, err := s.SubmitMessage(t.Context(), tenant, created.ID, uuid.NewString(), json.RawMessage(`{"text":"Controlled active work."}`))
+		input, err := store.SendMessage(t.Context(), s, tenant, created.ID, uuid.NewString(), json.RawMessage(`{"text":"Controlled active work."}`))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/self_hosted_initial_public_test.go b/services/core/internal/store/self_hosted_initial_public_test.go
index 174f9d687..ef1b5e050 100644
--- a/services/core/internal/store/self_hosted_initial_public_test.go
+++ b/services/core/internal/store/self_hosted_initial_public_test.go
@@ -107,7 +107,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 			if err := pool.QueryRow(t.Context(), "SELECT id FROM environment_input_reservations WHERE session_id=$1 AND is_initial", item.ID).Scan(&id); err != nil {
 				t.Fatal("public creation did not reserve initial input", err)
 			}
-			reservation, err := s.GetEnvironmentInputReservation(t.Context(), tenant, item.ID, id)
+			reservation, err := store.SessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, item.ID, id)
 			if err != nil || !reservation.IsInitial || len(reservation.Inputs) != 1 || len(reservation.Receipts) != 0 {
 				t.Fatal("invalid public initial reservation", err)
 			}
diff --git a/services/core/internal/store/session_artifacts_public_test.go b/services/core/internal/store/session_artifacts_public_test.go
index 8447e86de..d5e6cc722 100644
--- a/services/core/internal/store/session_artifacts_public_test.go
+++ b/services/core/internal/store/session_artifacts_public_test.go
@@ -37,7 +37,7 @@ func hostedArtifactSession(t *testing.T, s *store.Store, tenant, key string) (se
 // through artifacts and settled as completed, and returns the Turn ID.
 func completeArtifactTurn(t *testing.T, s *store.Store, artifacts *sessions.Service, tenant, session, environment, key string, outputs map[string]string) string {
 	t.Helper()
-	receipt, err := s.SubmitMessage(t.Context(), tenant, session, key, json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"publish outputs"}]}]}`))
+	receipt, err := store.SendMessage(t.Context(), s, tenant, session, key, json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"publish outputs"}]}]}`))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/session_artifacts_test.go b/services/core/internal/store/session_artifacts_test.go
index e35b125f7..ba5957f9f 100644
--- a/services/core/internal/store/session_artifacts_test.go
+++ b/services/core/internal/store/session_artifacts_test.go
@@ -235,7 +235,7 @@ func TestSessionArtifactTransferDoesNotBlockDeletionOrCancellation(t *testing.T)
 					t.Fatalf("transfer blocked deletion: %v", err)
 				}
 			} else {
-				if _, err := s.RequestCancel(ctx, tenant, session, "cancel-capture"); err != nil {
+				if _, err := requestCancel(ctx, s, tenant, session, "cancel-capture"); err != nil {
 					t.Fatalf("transfer blocked cancellation: %v", err)
 				}
 				want = sessions.ErrTurnConflict
diff --git a/services/core/internal/store/session_creation_stream_test.go b/services/core/internal/store/session_creation_stream_test.go
index fd0e70e19..c7aee3ae1 100644
--- a/services/core/internal/store/session_creation_stream_test.go
+++ b/services/core/internal/store/session_creation_stream_test.go
@@ -121,7 +121,7 @@ func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.
 	if err != nil || late.Created || late.Cursor != all[len(all)-1].Sequence {
 		t.Fatal(late, err)
 	}
-	next, err := s.SubmitInputs(ctx, tenant, id, "next", []sessions.Input{messageInput("later")})
+	next, err := submitInputs(ctx, s, tenant, id, "next", []sessions.Input{messageInput("later")})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -156,7 +156,7 @@ func TestCreationStreamIdleAndNonstreamRetry(t *testing.T) {
 	if err != nil || !first.Created || first.Cursor != 0 || first.Session.LastTurn != nil {
 		t.Fatal(first, err)
 	}
-	if _, err := s.SubmitInputs(ctx, tenant, first.Session.ID, "message", []sessions.Input{messageInput("later")}); err != nil {
+	if _, err := submitInputs(ctx, s, tenant, first.Session.ID, "message", []sessions.Input{messageInput("later")}); err != nil {
 		t.Fatal(err)
 	}
 	retry, err := s.CreateSessionStream(ctx, tenant, input)
diff --git a/services/core/internal/store/session_deletion_execution_test.go b/services/core/internal/store/session_deletion_execution_test.go
index fe40df03a..92798a4b2 100644
--- a/services/core/internal/store/session_deletion_execution_test.go
+++ b/services/core/internal/store/session_deletion_execution_test.go
@@ -120,7 +120,7 @@ func TestWaitingSessionCancelsThenDeletesThroughWorker(t *testing.T) {
 	if again := functionState(t, h, 1); again.LastTurn == nil || again.LastTurn.Status != sessions.TurnWaiting || !again.LastTurn.CancelRequestedAt.IsZero() {
 		t.Fatal("rejected deletion changed required actions", again)
 	}
-	if _, err := h.s.RequestCancel(ctx, h.tenant, h.session.ID, "cancel-before-delete"); err != nil {
+	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel-before-delete"); err != nil {
 		t.Fatal(err)
 	}
 	// The explicit cancellation, not the rejected deletion, reaches the daemon.
diff --git a/services/core/internal/store/session_deletion_lifecycle_public_test.go b/services/core/internal/store/session_deletion_lifecycle_public_test.go
index 04fd25a7f..8852cfda3 100644
--- a/services/core/internal/store/session_deletion_lifecycle_public_test.go
+++ b/services/core/internal/store/session_deletion_lifecycle_public_test.go
@@ -40,7 +40,6 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
 	leased := executionOwner(t, db, s)
-	writer := leased.Store
 
 	create := func(environment string, initial bool) sessions.Session {
 		t.Helper()
@@ -61,7 +60,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	turn := func(to ...string) string {
 		t.Helper()
 		session := create(none, false)
-		receipt, err := s.SubmitMessage(ctx, tenant, session.ID, "input", json.RawMessage(`{"text":"work"}`))
+		receipt, err := store.SendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"work"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -69,7 +68,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 		for _, status := range to {
 			switch status {
 			case "cancel":
-				_, err = s.RequestCancel(ctx, tenant, session.ID, "cancel")
+				_, err = store.RequestCancel(ctx, s, tenant, session.ID, "cancel")
 			case "function":
 				err = leased.Sessions.RecordFunctionCall(ctx, tenant, session.ID, receipt.TurnID, sessions.FunctionCall{CallID: "pending", ExecutorCallID: "native-pending", Name: "lookup", Arguments: json.RawMessage(`{}`)})
 			case sessions.TurnCompleted, sessions.TurnFailed:
@@ -86,7 +85,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	}
 	reserve := func(session sessions.Session) sessions.EnvironmentInputReservation {
 		t.Helper()
-		reservation, err := s.ReserveEnvironmentInput(ctx, tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}})
+		reservation, err := store.SessionService(t, s).ReserveEnvironmentInput(ctx, tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}})
 		if err != nil || reservation.State != sessions.EnvironmentInputPending {
 			t.Fatal(reservation, err)
 		}
@@ -139,12 +138,12 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	if _, err := db.pool.Exec(ctx, "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1", expired.ID); err != nil {
 		t.Fatal(err)
 	}
-	if count, err := writer.ExpireEnvironmentInputs(ctx); err != nil || count != 1 {
+	if count, err := leased.Sessions.ExpireEnvironmentInputs(ctx); err != nil || count != 1 {
 		t.Fatal("initial input did not expire", count, err)
 	}
 	settled["self_hosted_input_expired"] = expired.ID
 	withdrawn := create(selfHosted, false)
-	if _, err := s.CancelEnvironmentInput(ctx, tenant, withdrawn.ID, reserve(withdrawn).ID); err != nil {
+	if _, err := store.CancelEnvironmentInput(ctx, s, tenant, withdrawn.ID, reserve(withdrawn).ID); err != nil {
 		t.Fatal(err)
 	}
 	settled["later_input_cancelled"] = withdrawn.ID
diff --git a/services/core/internal/store/session_deletion_test.go b/services/core/internal/store/session_deletion_test.go
index 04b1b5623..425307967 100644
--- a/services/core/internal/store/session_deletion_test.go
+++ b/services/core/internal/store/session_deletion_test.go
@@ -62,7 +62,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			receipt, err := s.SubmitMessage(ctx, tenant, session.ID, "input", json.RawMessage(`{"text":"retained"}`))
+			receipt, err := sendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"retained"}`))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -101,7 +101,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 				}
 				// Callers cancel first. A queued Turn cancels at once; a running
 				// Turn stays active until execution settles its cancellation.
-				if _, err := s.RequestCancel(ctx, tenant, session.ID, "cancel"); err != nil {
+				if _, err := requestCancel(ctx, s, tenant, session.ID, "cancel"); err != nil {
 					t.Fatal(err)
 				}
 				if status == sessions.TurnInProgress {
@@ -139,10 +139,10 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if _, err := fresh.CreateSessionStream(ctx, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 				t.Fatal(err)
 			}
-			if _, err := fresh.SubmitMessage(ctx, tenant, session.ID, "input", json.RawMessage(`{"text":"retained"}`)); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sendMessage(ctx, fresh, tenant, session.ID, "input", json.RawMessage(`{"text":"retained"}`)); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
-			if _, err := fresh.RequestCancel(ctx, tenant, session.ID, "late-cancel"); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := requestCancel(ctx, fresh, tenant, session.ID, "late-cancel"); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
 			if _, err := sessionAdapter(fresh).ListItems(ctx, tenant, session.ID, "", 20, true); !errors.Is(err, sessions.ErrNotFound) {
@@ -162,7 +162,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if _, err := transitionTurn(ctx, fresh, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
 				t.Fatal(err)
 			}
-			inputs, err := fresh.ListTurnInputs(ctx, tenant, session.ID, receipt.TurnID, 0, 20)
+			inputs, err := sessionAdapter(fresh).ListTurnInputs(ctx, tenant, session.ID, receipt.TurnID, 0, 20)
 			if err != nil || len(inputs) == 0 || inputs[0].Sequence != receipt.Sequence {
 				t.Fatal(inputs, err)
 			}
@@ -184,7 +184,7 @@ func TestSessionDeletionSerializesAdmissionBeforeRetryLookup(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.RequestCancel(ctx, tenant, session.ID, "existing"); err != nil {
+	if _, err := requestCancel(ctx, s, tenant, session.ID, "existing"); err != nil {
 		t.Fatal(err)
 	}
 	tx, err := pool.Begin(ctx)
@@ -196,7 +196,7 @@ func TestSessionDeletionSerializesAdmissionBeforeRetryLookup(t *testing.T) {
 		t.Fatal(err)
 	}
 	done := make(chan error, 1)
-	go func() { _, err := s.RequestCancel(ctx, tenant, session.ID, "existing"); done <- err }()
+	go func() { _, err := requestCancel(ctx, s, tenant, session.ID, "existing"); done <- err }()
 	if err := tx.Commit(ctx); err != nil {
 		t.Fatal(err)
 	}
@@ -262,14 +262,14 @@ func TestSessionDeletionRacesAdmissionUnderSessionLock(t *testing.T) {
 			tenant, session := newTurnSession(t, s)
 			return tenant, session.ID
 		}, func(ctx context.Context, s *Store, tenant, session string) error {
-			_, err := s.SubmitMessage(ctx, tenant, session, "racing", messagePayload)
+			_, err := sendMessage(ctx, s, tenant, session, "racing", messagePayload)
 			return err
 		}},
 		{"environment_input", func(t *testing.T, s *Store) (string, string) {
 			tenant, session := environmentInputSession(t, s)
 			return tenant, session.ID
 		}, func(ctx context.Context, s *Store, tenant, session string) error {
-			_, err := s.ReserveEnvironmentInput(ctx, tenant, session, "racing", []sessions.Input{messageInput("racing")})
+			_, err := sessionService(t, s).ReserveEnvironmentInput(ctx, tenant, session, "racing", []sessions.Input{messageInput("racing")})
 			return err
 		}},
 	}
@@ -423,7 +423,7 @@ func TestSessionDeletionKeepsProvisioningInputPlacementUntilSettled(t *testing.T
 	if _, err := s.pool.Exec(ctx, "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1", session.ID); err != nil {
 		t.Fatal(err)
 	}
-	if count, err := w.ExpireEnvironmentInputs(ctx); err != nil || count != 1 {
+	if count, err := sessionExecution(t, w.lease).ExpireEnvironmentInputs(ctx); err != nil || count != 1 {
 		t.Fatal("initial input did not expire", count, err)
 	}
 	if err := sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
diff --git a/services/core/internal/store/session_environment_snapshot_test.go b/services/core/internal/store/session_environment_snapshot_test.go
index 56e9ce389..eda9b4990 100644
--- a/services/core/internal/store/session_environment_snapshot_test.go
+++ b/services/core/internal/store/session_environment_snapshot_test.go
@@ -25,7 +25,7 @@ func TestSelfHostedCreationSnapshotRetainsEnvironmentAndCursor(t *testing.T) {
 	if environment.ID == "" || environment.SessionID != created.Session.ID || environment.TenantID != tenant || environment.Status != "pending" {
 		t.Fatal("incorrect creation association", environment)
 	}
-	pending, err := s.ReserveEnvironmentInput(t.Context(), tenant, created.Session.ID, "later", []sessions.Input{messageInput("later")})
+	pending, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, created.Session.ID, "later", []sessions.Input{messageInput("later")})
 	if err != nil || pending.State != sessions.EnvironmentInputPending {
 		t.Fatal(pending, err)
 	}
diff --git a/services/core/internal/store/session_events_test.go b/services/core/internal/store/session_events_test.go
index 3b7748f58..1c761eb11 100644
--- a/services/core/internal/store/session_events_test.go
+++ b/services/core/internal/store/session_events_test.go
@@ -57,7 +57,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -65,7 +65,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = s.SubmitMessage(ctx, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`)); err != nil {
+	if _, err = store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`)); err != nil {
 		t.Fatal(err)
 	}
 	after, _ := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
@@ -170,7 +170,7 @@ func TestSessionEventsRetentionAndQueuedCancellation(t *testing.T) {
 		inputs[i] = sessions.Input{Kind: "message", Payload: json.RawMessage(`{"text":"input"}`)}
 	}
 	for range 5 {
-		if _, err = s.SubmitInputs(ctx, tenant, session.ID, uuid.NewString(), inputs); err != nil {
+		if _, err = store.SubmitInputs(ctx, s, tenant, session.ID, uuid.NewString(), inputs); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -185,7 +185,7 @@ func TestSessionEventsRetentionAndQueuedCancellation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = s.RequestCancel(ctx, tenant, session.ID, "cancel"); err != nil {
+	if _, err = store.RequestCancel(ctx, s, tenant, session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
 	changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, cursor)
diff --git a/services/core/internal/store/session_initial_input.go b/services/core/internal/store/session_initial_input.go
index 15c9642ed..77e89638b 100644
--- a/services/core/internal/store/session_initial_input.go
+++ b/services/core/internal/store/session_initial_input.go
@@ -21,15 +21,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 )
 
-func validateInitialInputs(inputs []sessions.Input) ([]sessions.Input, json.RawMessage, error) {
-	for _, input := range inputs {
-		if input.Kind != "message" {
-			return nil, nil, sessions.ErrInvalidInput
-		}
-	}
-	return validateInputs(inputs)
-}
-
 // The Session upsert locks retries. Only the new row reserves or admits work, so a
 // retry after completion or later Turns cannot submit the original input again.
 func (s *Store) createSessionResources(ctx context.Context, tenant string, params sqlc.CreateSessionParams, inputs []sessions.Input, encodedInput json.RawMessage, files []environmentconfig.InitialFile, setup environmentconfig.Setup, provider *v1.ModelProviderInput, executionConfiguration *v1.SessionExecutionConfiguration, providerSource string, deploymentRevision uuid.UUID) (sqlc.Session, *sessions.Environment, error) {
@@ -170,10 +161,8 @@ func (s *Store) createSessionResources(ctx context.Context, tenant string, param
 				return err
 			}
 		} else {
-			for position, input := range inputs {
-				if _, err := admitInput(ctx, q, tenant, row.ID, key, int32(position), input); err != nil {
-					return err
-				}
+			if _, err := sessions.AdmitInputs(ctx, sessionpg.BindSession(q, row.TenantID, row.ID), key, inputs); err != nil {
+				return err
 			}
 		}
 		if err := sessionpg.PruneChanges(ctx, q, row.ID); err != nil {
diff --git a/services/core/internal/store/session_initial_input_test.go b/services/core/internal/store/session_initial_input_test.go
index 040701873..d8d568786 100644
--- a/services/core/internal/store/session_initial_input_test.go
+++ b/services/core/internal/store/session_initial_input_test.go
@@ -50,7 +50,7 @@ func TestInitialInputCreationRetriesAcrossConnectionsAndLaterTurns(t *testing.T)
 	if first.LastTurn == nil {
 		t.Fatal("missing initial Turn")
 	}
-	inputs, err := s.ListTurnInputs(ctx, tenant, first.ID, first.LastTurn.ID, 0, 100)
+	inputs, err := sessionAdapter(s).ListTurnInputs(ctx, tenant, first.ID, first.LastTurn.ID, 0, 100)
 	if err != nil || len(inputs) != 2 {
 		t.Fatal(inputs, err)
 	}
@@ -67,11 +67,11 @@ func TestInitialInputCreationRetriesAcrossConnectionsAndLaterTurns(t *testing.T)
 	transition(t, s, tenant, first.ID, first.LastTurn.ID, sessions.TurnQueued, sessions.TurnInProgress)
 	transition(t, s, tenant, first.ID, first.LastTurn.ID, sessions.TurnInProgress, sessions.TurnCompleted)
 	// The same caller key at the events endpoint is an independent request.
-	next, err := s.SubmitInputs(ctx, tenant, first.ID, input.IdempotencyKey, []sessions.Input{messageInput("later")})
+	next, err := submitInputs(ctx, s, tenant, first.ID, input.IdempotencyKey, []sessions.Input{messageInput("later")})
 	if err != nil || len(next) != 1 || next[0].TurnID == first.LastTurn.ID {
 		t.Fatal(next, err)
 	}
-	if _, err := s.RequestCancel(ctx, tenant, first.ID, "cancel"); err != nil {
+	if _, err := requestCancel(ctx, s, tenant, first.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: first.ID, Metadata: map[string]string{"updated": "yes"}}); err != nil {
diff --git a/services/core/internal/store/session_metadata_test.go b/services/core/internal/store/session_metadata_test.go
index a506b7b2a..d1be257f1 100644
--- a/services/core/internal/store/session_metadata_test.go
+++ b/services/core/internal/store/session_metadata_test.go
@@ -114,7 +114,7 @@ func TestSessionMetadataPreservesTerminalActivity(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, status := range []string{sessions.TurnCompleted, sessions.TurnFailed, sessions.TurnCancelled} {
-		receipt, err := s.SubmitMessage(ctx, tenant, session.ID, uuid.NewString(), []byte(`{"text":"metadata fixture"}`))
+		receipt, err := sendMessage(ctx, s, tenant, session.ID, uuid.NewString(), []byte(`{"text":"metadata fixture"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/session_write_audit_test.go b/services/core/internal/store/session_write_audit_test.go
index fef29312b..61249e770 100644
--- a/services/core/internal/store/session_write_audit_test.go
+++ b/services/core/internal/store/session_write_audit_test.go
@@ -143,11 +143,11 @@ func TestSessionWriteAuditRollback(t *testing.T) {
 			case "delete":
 				err = sessionService(t, s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: created.ID})
 			case "events":
-				_, err = s.SubmitInputs(ctx, tenant, created.ID, "events", []sessions.Input{messageInput("private")})
+				_, err = submitInputs(ctx, s, tenant, created.ID, "events", []sessions.Input{messageInput("private")})
 			case "noop":
 				err = sessionService(t, s).AuditSessionOperation(ctx, sessions.AuditSessionOperationCommand{TenantID: tenant, SessionID: created.ID, Action: "send_events"})
 			case "reserve":
-				_, err = s.ReserveEnvironmentInput(ctx, tenant, created.ID, "reserve", []sessions.Input{messageInput("private")})
+				_, err = sessionService(t, s).ReserveEnvironmentInput(ctx, tenant, created.ID, "reserve", []sessions.Input{messageInput("private")})
 			}
 			if err == nil {
 				t.Fatal("mutation bypassed audit failure")
@@ -177,10 +177,10 @@ func TestEventsWriteAuditAdmissionAndReplay(t *testing.T) {
 			}
 			submit := func(ctx context.Context) error {
 				if prepared {
-					_, err := s.ReserveEnvironmentInput(ctx, tenant, created.ID, "batch", []sessions.Input{messageInput("private")})
+					_, err := sessionService(t, s).ReserveEnvironmentInput(ctx, tenant, created.ID, "batch", []sessions.Input{messageInput("private")})
 					return err
 				}
-				_, err := s.SubmitInputs(ctx, tenant, created.ID, "batch", []sessions.Input{messageInput("private")})
+				_, err := submitInputs(ctx, s, tenant, created.ID, "batch", []sessions.Input{messageInput("private")})
 				return err
 			}
 			first := sessionAuditContext(t, tenant, "a")
diff --git a/services/core/internal/store/sessions.go b/services/core/internal/store/sessions.go
index 95c89ba13..78dcf1f94 100644
--- a/services/core/internal/store/sessions.go
+++ b/services/core/internal/store/sessions.go
@@ -89,7 +89,7 @@ func (s *Store) createSession(ctx context.Context, tenantID string, input sessio
 	var batch []sessions.Input
 	var encodedInput json.RawMessage
 	if len(input.InitialInputs) > 0 {
-		batch, encodedInput, err = validateInitialInputs(input.InitialInputs)
+		batch, encodedInput, err = sessions.ValidateMessageInputs(input.InitialInputs)
 		if err != nil {
 			return sessions.Creation{}, err
 		}
diff --git a/services/core/internal/store/steering_receipts_test.go b/services/core/internal/store/steering_receipts_test.go
index beff34513..69a7ab13e 100644
--- a/services/core/internal/store/steering_receipts_test.go
+++ b/services/core/internal/store/steering_receipts_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestExecutionDurableInputReceiptLifetime(t *testing.T) {
@@ -42,7 +43,7 @@ func TestExecutionDurableInputReceiptLifetime(t *testing.T) {
 			case "retry-after-write":
 				h.write(first.TurnID, proto.TypePromptSteerAck, proto.PromptSteerAckPayload{InputID: input.InputID, ErrorCode: "not_ready"})
 			case "cancel-unknown-first":
-				if _, err := h.s.RequestCancel(ctx, h.tenant, h.session.ID, "cancel"); err != nil {
+				if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 					t.Fatal(err)
 				}
 				var request proto.PromptCancelPayload
diff --git a/services/core/internal/store/stream_authority_http_test.go b/services/core/internal/store/stream_authority_http_test.go
index a03a3fc5c..1d68d49eb 100644
--- a/services/core/internal/store/stream_authority_http_test.go
+++ b/services/core/internal/store/stream_authority_http_test.go
@@ -101,7 +101,7 @@ func TestLiveStreamClosesAfterKeyRevocationOrProjectArchive(t *testing.T) {
 					t.Fatal("revocation affected peer", valid.StatusCode)
 				}
 				// New events remain available to valid callers after the reader has closed.
-				if _, err := s.ReserveEnvironmentInput(t.Context(), project.TenantID, session.ID, "after-revocation", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"new event"}`)}}); err != nil {
+				if _, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), project.TenantID, session.ID, "after-revocation", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"new event"}`)}}); err != nil {
 					t.Fatal(err)
 				}
 			}
diff --git a/services/core/internal/store/token_usage_integration_test.go b/services/core/internal/store/token_usage_integration_test.go
index a042c21c2..dfddb68fd 100644
--- a/services/core/internal/store/token_usage_integration_test.go
+++ b/services/core/internal/store/token_usage_integration_test.go
@@ -34,7 +34,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		}
 	}
 	for n, status := range []string{sessions.TurnFailed, sessions.TurnCancelled} {
-		admission, err := s.SubmitMessage(ctx, tenant, session.ID, fmt.Sprint(n), json.RawMessage(`{"text":"measure"}`))
+		admission, err := store.SendMessage(ctx, s, tenant, session.ID, fmt.Sprint(n), json.RawMessage(`{"text":"measure"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -114,7 +114,7 @@ func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	admission, err := s.SubmitMessage(ctx, tenant, session.ID, "start", json.RawMessage(`{"text":"measure"}`))
+	admission, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"measure"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -188,7 +188,7 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	}
 	submit := func(key string) sessions.InputReceipt {
 		t.Helper()
-		admission, err := s.SubmitMessage(ctx, tenant, session.ID, key, json.RawMessage(`{"text":"measure"}`))
+		admission, err := store.SendMessage(ctx, s, tenant, session.ID, key, json.RawMessage(`{"text":"measure"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/tool_policy_native_test.go b/services/core/internal/store/tool_policy_native_test.go
index bfa83bfc0..380a0c4f7 100644
--- a/services/core/internal/store/tool_policy_native_test.go
+++ b/services/core/internal/store/tool_policy_native_test.go
@@ -95,7 +95,7 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		inputs, err := h.s.ListTurnInputs(ctx, h.tenant, item.ID, item.FirstTurn, 0, 100)
+		inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, item.ID, item.FirstTurn, 0, 100)
 		var outcome execution.Result
 		if err != nil || len(inputs) != 1 || json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.AppliedThrough != inputs[0].Sequence {
 			t.Fatal("native text input receipt missing", err)
diff --git a/services/core/internal/store/turn_events_test.go b/services/core/internal/store/turn_events_test.go
index bd4c1c9ec..0e8b8ba0c 100644
--- a/services/core/internal/store/turn_events_test.go
+++ b/services/core/internal/store/turn_events_test.go
@@ -21,7 +21,7 @@ func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := s.SubmitMessage(ctx, tenant, session.ID, "start", json.RawMessage(`{"text":"test"}`))
+	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"test"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/turn_inputs.go b/services/core/internal/store/turn_inputs.go
deleted file mode 100644
index 3e896dafd..000000000
--- a/services/core/internal/store/turn_inputs.go
+++ /dev/null
@@ -1,238 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"slices"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/jsonobject"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// SubmitMessage and RequestCancel use the same request-level admission as batches.
-func (s *Store) SubmitMessage(ctx context.Context, tenantID, sessionID, key string, payload json.RawMessage) (sessions.InputReceipt, error) {
-	return s.submitOne(ctx, tenantID, sessionID, key, sessions.Input{Kind: "message", Payload: payload})
-}
-
-func (s *Store) RequestCancel(ctx context.Context, tenantID, sessionID, key string) (sessions.InputReceipt, error) {
-	return s.submitOne(ctx, tenantID, sessionID, key, sessions.Input{Kind: "cancel", Payload: json.RawMessage(`{}`)})
-}
-
-func (s *Store) submitOne(ctx context.Context, tenantID, sessionID, key string, input sessions.Input) (sessions.InputReceipt, error) {
-	receipts, err := s.SubmitInputs(ctx, tenantID, sessionID, key, []sessions.Input{input})
-	if err != nil {
-		return sessions.InputReceipt{}, err
-	}
-	return receipts[0], nil
-}
-
-// SubmitInputs commits a request in order under one Session lock. The entire
-// batch is the retry identity; replay never re-evaluates a cancellation target.
-// Internal receipts are not the response body of the public events endpoint.
-func (s *Store) SubmitInputs(ctx context.Context, tenantID, sessionID, key string, inputs []sessions.Input) ([]sessions.InputReceipt, error) {
-	if err := sessions.ValidateInputKey(key); err != nil {
-		return nil, err
-	}
-	batch, encoded, err := validateInputs(inputs)
-	if err != nil {
-		return nil, err
-	}
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return nil, err
-	}
-	receipts := make([]sessions.InputReceipt, 0, len(batch))
-	err = s.withPublicSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		previous, err := inputBatchReceipts(ctx, q, session, key, encoded)
-		if err != nil {
-			return err
-		}
-		if len(previous) > 0 {
-			receipts = previous
-			return auditpg.RecordWriteAudit(ctx, q, tenantID, "send_events", "session", uuid.UUID(session.Bytes).String(), "")
-		}
-		if slices.ContainsFunc(batch, func(input sessions.Input) bool { return input.Kind == "message" }) {
-			if err := sessions.CheckFileWriteGate(ctx, sessionpg.BindSession(q, tenant, session)); err != nil {
-				return err
-			}
-		}
-		if err := checkEnvironmentInputGate(ctx, q, session, key, encoded); err != nil {
-			return err
-		}
-		for position, input := range batch {
-			receipt, err := admitInput(ctx, q, tenantID, session, key, int32(position), input)
-			if err != nil {
-				return err
-			}
-			receipts = append(receipts, receipt)
-		}
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "send_events", "session", uuid.UUID(session.Bytes).String(), "")
-	})
-	if err != nil {
-		return nil, fmt.Errorf("submit turn inputs: %w", err)
-	}
-	return receipts, nil
-}
-
-func inputBatchReceipts(ctx context.Context, q *sqlc.Queries, session pgtype.UUID, key string, batch json.RawMessage) ([]sessions.InputReceipt, error) {
-	rows, err := q.FindInputBatch(ctx, sqlc.FindInputBatchParams{SessionID: session, IdempotencyKey: key, Batch: batch})
-	if err != nil {
-		return nil, err
-	}
-	receipts := make([]sessions.InputReceipt, 0, len(rows))
-	for _, row := range rows {
-		if !row.Matches {
-			return nil, sessions.ErrIdempotencyConflict
-		}
-		receipts = append(receipts, inputReceipt(row.Sequence, row.TurnID, true))
-	}
-	return receipts, nil
-}
-
-func validateInputs(inputs []sessions.Input) ([]sessions.Input, json.RawMessage, error) {
-	if len(inputs) == 0 || len(inputs) > 64 {
-		return nil, nil, fmt.Errorf("%w: input batch must contain 1..64 events", sessions.ErrInvalidInput)
-	}
-	batch := make([]sessions.Input, len(inputs))
-	size := 0
-	for i, input := range inputs {
-		size += len(input.Payload)
-		if size > 512*1024 || len(input.Payload) == 0 || (input.Kind != "message" && input.Kind != "cancel" && input.Kind != "tool_result") {
-			return nil, nil, fmt.Errorf("%w: input payloads must be nonempty and total at most 512 KiB", sessions.ErrInvalidInput)
-		}
-		payload, err := jsonobject.Normalize(input.Payload)
-		if err != nil {
-			return nil, nil, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
-		}
-		if input.Kind == "cancel" && string(payload) != "{}" {
-			return nil, nil, fmt.Errorf("%w: cancel payload must be empty", sessions.ErrInvalidInput)
-		}
-		if input.Kind == "tool_result" {
-			if _, err := sessions.ParseFunctionResultInput(payload); err != nil {
-				return nil, nil, err
-			}
-		}
-		batch[i] = sessions.Input{Kind: input.Kind, Payload: payload}
-	}
-	encoded, err := json.Marshal(batch)
-	return batch, encoded, err
-}
-
-func admitInput(ctx context.Context, q *sqlc.Queries, tenantID string, session pgtype.UUID, key string, position int32, input sessions.Input) (sessions.InputReceipt, error) {
-	if input.Kind == "tool_result" {
-		result, err := sessions.ParseFunctionResultInput(input.Payload)
-		if err != nil {
-			return sessions.InputReceipt{}, err
-		}
-		tenant, err := parseID(tenantID)
-		if err != nil {
-			return sessions.InputReceipt{}, err
-		}
-		turn, err := sessions.AdmitFunctionResult(ctx, sessionpg.BindSession(q, tenant, session), result)
-		if err != nil {
-			return sessions.InputReceipt{}, err
-		}
-		id, err := parseID(turn.ID)
-		if err != nil {
-			return sessions.InputReceipt{}, err
-		}
-		sequence, err := q.CreateTurnInput(ctx, sqlc.CreateTurnInputParams{
-			SessionID: session, TurnID: id, IdempotencyKey: key, Kind: input.Kind, Payload: input.Payload, BatchPosition: position,
-		})
-		if err != nil {
-			return sessions.InputReceipt{}, err
-		}
-		return inputReceipt(sequence, id, false), nil
-	}
-	created := false
-	turn, err := q.GetActiveTurn(ctx, session)
-	if errors.Is(err, pgx.ErrNoRows) {
-		if input.Kind == "message" {
-			turn, err = q.CreateTurn(ctx, sqlc.CreateTurnParams{ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, SessionID: session})
-			if err == nil {
-				created = true
-				err = sessionpg.AppendChanges(ctx, q, session, sessions.TurnChanges(sessionpg.TurnFromRow(turn), true)...)
-			}
-		} else {
-			err = nil // Retain even an idle cancellation's retry identity.
-		}
-	}
-	if err != nil {
-		return sessions.InputReceipt{}, err
-	}
-	sequence, err := q.CreateTurnInput(ctx, sqlc.CreateTurnInputParams{
-		SessionID: session, TurnID: turn.ID, IdempotencyKey: key, Kind: input.Kind, Payload: input.Payload, BatchPosition: position,
-	})
-	if err != nil {
-		return sessions.InputReceipt{}, err
-	}
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.InputReceipt{}, err
-	}
-	bound := sessionpg.BindSession(q, tenant, session)
-	if input.Kind == "cancel" && turn.ID.Valid {
-		if err := sessions.CancelTurn(ctx, bound, sessionpg.TurnFromRow(turn)); err != nil {
-			return sessions.InputReceipt{}, err
-		}
-	}
-	if err := sessions.ProjectInput(ctx, bound, sequence); err != nil {
-		return sessions.InputReceipt{}, err
-	}
-	if created {
-		// A new Turn publishes turn.created, then its user input Items, then the
-		// Session activity, within this transaction.
-		usage, err := sessionpg.LoadUsage(ctx, q, session)
-		if err != nil {
-			return sessions.InputReceipt{}, err
-		}
-		if err := sessionpg.AppendChanges(ctx, q, session, sessions.ActivityChange(sessionpg.TurnFromRow(turn), usage, nil)); err != nil {
-			return sessions.InputReceipt{}, err
-		}
-	}
-	return inputReceipt(sequence, turn.ID, false), nil
-}
-
-// ListTurnInputs is an internal ordered recovery query, not the public SSE stream.
-func (s *Store) ListTurnInputs(ctx context.Context, tenantID, sessionID, turnID string, after int64, limit int) ([]sessions.TurnInput, error) {
-	params, err := sessionpg.TurnLookup(tenantID, sessionID, turnID)
-	if err != nil {
-		return nil, err
-	}
-	if after < 0 || limit < 1 || limit > 100 {
-		return nil, fmt.Errorf("%w: nonnegative cursor and page size 1..100 required", sessions.ErrInvalidInput)
-	}
-	if _, err := s.queries.GetTurn(ctx, params); errors.Is(err, pgx.ErrNoRows) {
-		return nil, sessions.ErrNotFound
-	} else if err != nil {
-		return nil, fmt.Errorf("get turn: %w", err)
-	}
-	rows, err := s.queries.ListTurnInputs(ctx, sqlc.ListTurnInputsParams{
-		TenantID: params.TenantID, SessionID: params.SessionID, TurnID: params.ID, Sequence: after, Limit: int32(limit),
-	})
-	if err != nil {
-		return nil, fmt.Errorf("list turn inputs: %w", err)
-	}
-	inputs := make([]sessions.TurnInput, 0, len(rows))
-	for _, row := range rows {
-		inputs = append(inputs, sessions.TurnInput{Sequence: row.Sequence, Kind: row.Kind, Payload: row.Payload, CreatedAt: row.CreatedAt.Time})
-	}
-	return inputs, nil
-}
-
-func inputReceipt(sequence int64, turn pgtype.UUID, replayed bool) sessions.InputReceipt {
-	receipt := sessions.InputReceipt{Sequence: sequence, Replayed: replayed}
-	if turn.Valid {
-		receipt.TurnID = uuid.UUID(turn.Bytes).String()
-	}
-	return receipt
-}
diff --git a/services/core/internal/store/turn_inputs_test.go b/services/core/internal/store/turn_inputs_test.go
deleted file mode 100644
index 3ffc28e26..000000000
--- a/services/core/internal/store/turn_inputs_test.go
+++ /dev/null
@@ -1,219 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"sync"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-var messagePayload = json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"hello"}]}]}`)
-
-func newTurnSession(t *testing.T, s *Store) (string, sessions.Session) {
-	t.Helper()
-	tenant := uuid.NewString()
-	session, err := s.CreateSession(context.Background(), tenant, sessions.CreateSession{Creator: FixtureCreator(),
-		Engine: "codex", IdempotencyKey: "session", Configuration: json.RawMessage(`{"agent":{"model":"test","instructions":"original"}}`),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	return tenant, session
-}
-
-func submitMessage(t *testing.T, s *Store, tenant, session, key string) sessions.InputReceipt {
-	t.Helper()
-	receipt, err := s.SubmitMessage(context.Background(), tenant, session, key, messagePayload)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return receipt
-}
-
-func transition(t *testing.T, s *Store, tenant, session, turn, from, to string) sessions.Turn {
-	t.Helper()
-	got, err := transitionTurn(context.Background(), s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to})
-	if err != nil {
-		t.Fatal(err)
-	}
-	return got
-}
-
-func TestConcurrentInputsUseOneTurnAndOneRetryReceipt(t *testing.T) {
-	s, _ := testStore(t)
-	otherStore, _ := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	const count = 8
-	for _, repeatedKey := range []bool{true, false} {
-		t.Run(fmt.Sprintf("repeated-key-%v", repeatedKey), func(t *testing.T) {
-			var wg sync.WaitGroup
-			receipts := make(chan sessions.InputReceipt, count)
-			errs := make(chan error, count)
-			for i := range count {
-				wg.Add(1)
-				go func() {
-					defer wg.Done()
-					key := "same"
-					if !repeatedKey {
-						key = fmt.Sprintf("distinct-%d", i)
-					}
-					store := s
-					if i%2 == 0 {
-						store = otherStore
-					}
-					r, err := store.SubmitMessage(ctx, tenant, session.ID, key, messagePayload)
-					receipts <- r
-					errs <- err
-				}()
-			}
-			wg.Wait()
-			close(receipts)
-			close(errs)
-			for err := range errs {
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-			turns, sequences := map[string]bool{}, map[int64]bool{}
-			newReceipts := 0
-			for r := range receipts {
-				turns[r.TurnID], sequences[r.Sequence] = true, true
-				if !r.Replayed {
-					newReceipts++
-				}
-			}
-			want := count
-			if repeatedKey {
-				want = 1
-			}
-			if len(turns) != 1 || turns[""] || len(sequences) != want || newReceipts != want {
-				t.Fatalf("turns=%v sequences=%v new=%d", turns, sequences, newReceipts)
-			}
-		})
-	}
-	first := submitMessage(t, s, tenant, session.ID, "same")
-	inputs, err := s.ListTurnInputs(ctx, tenant, session.ID, first.TurnID, 0, 100)
-	if err != nil || len(inputs) != count+1 {
-		t.Fatalf("lost or duplicated inputs: %d, %v", len(inputs), err)
-	}
-}
-
-func TestTurnInputRetriesAndRestart(t *testing.T) {
-	s, pool := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	first := submitMessage(t, s, tenant, session.ID, "first")
-	transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-	steer := submitMessage(t, s, tenant, session.ID, "steer")
-	if steer.TurnID != first.TurnID || steer.Sequence <= first.Sequence {
-		t.Fatalf("active message did not steer: %+v", steer)
-	}
-	reordered := json.RawMessage(`{ "input": [{"content":[{"text":"hello","type":"input_text"}],"role":"user"}] }`)
-	retry, err := s.SubmitMessage(ctx, tenant, session.ID, "first", reordered)
-	if err != nil || !retry.Replayed || retry.Sequence != first.Sequence || retry.TurnID != first.TurnID {
-		t.Fatalf("equivalent retry = %+v, %v", retry, err)
-	}
-	if _, err := s.SubmitMessage(ctx, tenant, session.ID, "first", json.RawMessage(`{"text":"changed"}`)); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatalf("changed payload accepted: %v", err)
-	}
-	if _, err := s.RequestCancel(ctx, tenant, session.ID, "first"); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatalf("changed input kind accepted: %v", err)
-	}
-	completed := transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnInProgress, sessions.TurnCompleted)
-	next := submitMessage(t, s, tenant, session.ID, "next")
-	if next.TurnID == first.TurnID {
-		t.Fatal("idle message did not start a new Turn")
-	}
-	pool.Close()
-	recovered, _ := testStore(t)
-	retry = submitMessage(t, recovered, tenant, session.ID, "first")
-	if !retry.Replayed || retry.TurnID != first.TurnID || retry.Sequence != first.Sequence {
-		t.Fatalf("restart retry changed target: %+v", retry)
-	}
-	got, err := sessionAdapter(recovered).GetTurn(ctx, tenant, session.ID, first.TurnID)
-	if err != nil || !reflect.DeepEqual(got, completed) {
-		t.Fatalf("restart turn: %+v, %v", got, err)
-	}
-	var all []sessions.TurnInput
-	var cursor int64
-	for {
-		page, err := recovered.ListTurnInputs(ctx, tenant, session.ID, first.TurnID, cursor, 1)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(page) == 0 {
-			break
-		}
-		if page[0].Sequence <= cursor || page[0].CreatedAt.IsZero() {
-			t.Fatalf("invalid ordered input: %+v", page)
-		}
-		cursor = page[0].Sequence
-		all = append(all, page...)
-	}
-	if len(all) != 2 || all[0].Sequence != first.Sequence || all[1].Sequence != steer.Sequence {
-		t.Fatalf("recovered inputs = %+v", all)
-	}
-	snapshot, err := sessionAdapter(recovered).GetSession(ctx, tenant, session.ID)
-	if err != nil || snapshot.LastTurn == nil || snapshot.LastTurn.ID != next.TurnID || snapshot.LastTurn.Status != sessions.TurnQueued {
-		t.Fatal("latest Session activity did not survive restart", err)
-	}
-	snapshot.LastTurn = nil
-	if !reflect.DeepEqual(snapshot, session) {
-		t.Fatal("turn submission mutated the Session snapshot", err)
-	}
-}
-
-func TestTurnOperationsAreTenantAndSessionScoped(t *testing.T) {
-	s, _ := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	otherTenant, other := newTurnSession(t, s)
-	ctx := context.Background()
-	first := submitMessage(t, s, tenant, session.ID, "input")
-	for _, scope := range []struct{ tenant, session string }{{otherTenant, session.ID}, {tenant, other.ID}, {tenant, uuid.NewString()}} {
-		for name, call := range map[string]func() error{
-			"submit": func() error {
-				_, err := s.SubmitMessage(ctx, scope.tenant, scope.session, "input", messagePayload)
-				return err
-			},
-			"cancel": func() error { _, err := s.RequestCancel(ctx, scope.tenant, scope.session, "cancel"); return err },
-			"read": func() error {
-				_, err := sessionAdapter(s).GetTurn(ctx, scope.tenant, scope.session, first.TurnID)
-				return err
-			},
-			"inputs": func() error {
-				_, err := s.ListTurnInputs(ctx, scope.tenant, scope.session, first.TurnID, 0, 10)
-				return err
-			},
-			"transition": func() error {
-				_, err := transitionTurn(ctx, s, scope.tenant, scope.session, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed})
-				return err
-			},
-		} {
-			if err := call(); !errors.Is(err, sessions.ErrNotFound) {
-				t.Fatalf("%s escaped scope: %v", name, err)
-			}
-		}
-	}
-	// Turn IDs cannot be used with another valid Session in the same tenant either.
-	second, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "second"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := sessionAdapter(s).GetTurn(ctx, tenant, second.ID, first.TurnID); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatalf("cross-session turn read: %v", err)
-	}
-	if _, err := transitionTurn(ctx, s, tenant, second.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnFailed}); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatalf("cross-session turn write: %v", err)
-	}
-	otherInput := submitMessage(t, s, otherTenant, other.ID, "input")
-	if otherInput.TurnID == first.TurnID {
-		t.Fatal("retry identity leaked across Sessions")
-	}
-}
diff --git a/services/core/internal/store/turns_test.go b/services/core/internal/store/turns_test.go
deleted file mode 100644
index 4e85732e1..000000000
--- a/services/core/internal/store/turns_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-func TestCancellationStaysBoundToItsOriginalTurn(t *testing.T) {
-	s, _ := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	idle, err := s.RequestCancel(ctx, tenant, session.ID, "idle-cancel")
-	if err != nil || idle.TurnID != "" || idle.Sequence == 0 {
-		t.Fatalf("idle cancellation: %+v, %v", idle, err)
-	}
-	first := submitMessage(t, s, tenant, session.ID, "first")
-	started := transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-	if started.StartedAt.IsZero() || !started.CompletedAt.IsZero() {
-		t.Fatalf("started timestamps: %+v", started)
-	}
-	cancel, err := s.RequestCancel(ctx, tenant, session.ID, "cancel")
-	if err != nil || cancel.TurnID != first.TurnID {
-		t.Fatalf("cancellation target: %+v, %v", cancel, err)
-	}
-	pending, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, first.TurnID)
-	if err != nil || pending.Status != sessions.TurnInProgress || pending.CancelRequestedAt.IsZero() || !pending.CompletedAt.IsZero() {
-		t.Fatalf("running cancellation falsely completed: %+v, %v", pending, err)
-	}
-	transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnInProgress, sessions.TurnCancelled)
-	next := submitMessage(t, s, tenant, session.ID, "next")
-	for key, original := range map[string]sessions.InputReceipt{"cancel": cancel, "idle-cancel": idle} {
-		retry, err := s.RequestCancel(ctx, tenant, session.ID, key)
-		if err != nil || !retry.Replayed || retry.TurnID != original.TurnID || retry.Sequence != original.Sequence {
-			t.Fatalf("cancellation retargeted: %+v, %v", retry, err)
-		}
-	}
-	queued, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, next.TurnID)
-	if err != nil || queued.Status != sessions.TurnQueued || !queued.CancelRequestedAt.IsZero() {
-		t.Fatalf("old cancellation affected later Turn: %+v, %v", queued, err)
-	}
-	if _, err := s.RequestCancel(ctx, tenant, session.ID, "cancel-queued"); err != nil {
-		t.Fatal(err)
-	}
-	stopped, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, next.TurnID)
-	if err != nil || stopped.Status != sessions.TurnCancelled || stopped.CompletedAt.IsZero() || !stopped.StartedAt.IsZero() {
-		t.Fatalf("queued work did not stop: %+v, %v", stopped, err)
-	}
-	if _, err := transitionTurn(ctx, s, tenant, session.ID, next.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
-		t.Fatalf("cancelled queued work was started: %v", err)
-	}
-}
-
-func TestWaitingTurnRetainsInputsAndStartTime(t *testing.T) {
-	s, _ := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	first := submitMessage(t, s, tenant, session.ID, "first")
-	started := transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnQueued, sessions.TurnInProgress)
-	transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnInProgress, sessions.TurnWaiting)
-	steer := submitMessage(t, s, tenant, session.ID, "steer")
-	if steer.TurnID != first.TurnID {
-		t.Fatal("waiting input started another Turn")
-	}
-	resumed := transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnWaiting, sessions.TurnInProgress)
-	if !started.StartedAt.Equal(resumed.StartedAt) {
-		t.Fatal("resume reset the start time")
-	}
-	transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnInProgress, sessions.TurnWaiting)
-	if _, err := s.RequestCancel(ctx, tenant, session.ID, "cancel"); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := transitionTurn(ctx, s, tenant, session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnInProgress}); !errors.Is(err, sessions.ErrTurnConflict) {
-		t.Fatalf("cancelling Turn resumed: %v", err)
-	}
-	transition(t, s, tenant, session.ID, first.TurnID, sessions.TurnWaiting, sessions.TurnCancelled)
-}
-
-func TestTurnInputValidationHasNoSideEffects(t *testing.T) {
-	s, _ := testStore(t)
-	tenant, session := newTurnSession(t, s)
-	ctx := context.Background()
-	for _, raw := range []json.RawMessage{nil, json.RawMessage(`[]`), json.RawMessage(`null`), json.RawMessage(`{} {}`), json.RawMessage(`{"text":"` + string(make([]byte, 512*1024)) + `"}`)} {
-		if _, err := s.SubmitMessage(ctx, tenant, session.ID, "first", raw); !errors.Is(err, sessions.ErrInvalidInput) {
-			t.Fatalf("invalid input accepted: %v", err)
-		}
-	}
-	cancelled, stop := context.WithCancel(ctx)
-	stop()
-	if _, err := s.SubmitMessage(cancelled, tenant, session.ID, "first", messagePayload); !errors.Is(err, context.Canceled) {
-		t.Fatalf("cancelled context: %v", err)
-	}
-	first := submitMessage(t, s, tenant, session.ID, "first")
-	if first.Replayed {
-		t.Fatal("failed submission persisted a receipt")
-	}
-	for _, input := range []sessions.TurnTransition{
-		{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCompleted},
-		{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnQueued},
-		{ExpectedStatus: sessions.TurnCompleted, Status: sessions.TurnInProgress},
-		{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress, Outcome: json.RawMessage(`{"premature":true}`)},
-	} {
-		if _, err := transitionTurn(ctx, s, tenant, session.ID, first.TurnID, input); !errors.Is(err, sessions.ErrInvalidInput) {
-			t.Fatalf("invalid transition accepted: %v", err)
-		}
-	}
-	got, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, first.TurnID)
-	if err != nil || got.Status != sessions.TurnQueued || !got.StartedAt.IsZero() {
-		t.Fatalf("invalid transition changed Turn: %+v, %v", got, err)
-	}
-}
diff --git a/services/core/internal/store/worker_input_race_test.go b/services/core/internal/store/worker_input_race_test.go
index c12653dc4..6ca03ded1 100644
--- a/services/core/internal/store/worker_input_race_test.go
+++ b/services/core/internal/store/worker_input_race_test.go
@@ -50,7 +50,7 @@ func TestWorkerInputReadSkipsConcurrentlyCancelledCandidate(t *testing.T) {
 					mutated <- h.s.CommitLegacyDeletion(t.Context(), h.tenant, candidateSession)
 					return
 				}
-				_, err := h.s.SubmitInputs(t.Context(), h.tenant, candidateSession, "cancel", []sessions.Input{{Kind: "cancel", Payload: json.RawMessage(`{}`)}})
+				_, err := store.SubmitInputs(t.Context(), h.s, h.tenant, candidateSession, "cancel", []sessions.Input{{Kind: "cancel", Payload: json.RawMessage(`{}`)}})
 				mutated <- err
 			}}
 			instrumented, err := pgxpool.NewWithConfig(t.Context(), cfg)
diff --git a/services/core/internal/store/worker_preparation_failure_test.go b/services/core/internal/store/worker_preparation_failure_test.go
index 93b293053..b7c82413e 100644
--- a/services/core/internal/store/worker_preparation_failure_test.go
+++ b/services/core/internal/store/worker_preparation_failure_test.go
@@ -16,7 +16,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 			h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 			enableWorkerEnvironment(t, h)
 			frames := workerFrames(t, h)
-			pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+			pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -31,7 +31,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 				h.write(prepare.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{State: "rejected", Operation: proto.TypeExecutionPrepare, ErrorCode: code})
 			}
 			awaitDaemonRemoteCondition(t, t.Context(), 3*time.Second, "failed reservation settlement", func() bool {
-				current, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+				current, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 				return err == nil && current.State == sessions.EnvironmentInputFailed
 			})
 			session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
@@ -59,7 +59,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 				t.Fatal("failed input retried", frame.Type)
 			case <-time.After(1200 * time.Millisecond):
 			}
-			next, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
+			next, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
 			if err != nil {
 				t.Fatal("new input remained blocked", err)
 			}
@@ -71,7 +71,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 			if startFrame.DecodePayload(&start) != nil || start.RunID == "" || inputTextForTest(t, start.Input) != "next" {
 				t.Fatal("new input was not admitted")
 			}
-			current, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, next.ID)
+			current, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, next.ID)
 			if err != nil || current.State != sessions.EnvironmentInputAdmitted {
 				t.Fatal("new input state", err)
 			}
@@ -99,7 +99,7 @@ func TestWorkerRetriesUncertainPreparationFailure(t *testing.T) {
 			h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 			enableWorkerEnvironment(t, h)
 			frames := workerFrames(t, h)
-			pending, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "retry", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"retry"}`)}})
+			pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "retry", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"retry"}`)}})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -116,11 +116,11 @@ func TestWorkerRetriesUncertainPreparationFailure(t *testing.T) {
 				nextWorkerFrame(t, frames, proto.TypeExecutionRelease)
 			}
 			nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
-			current, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+			current, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 			if err != nil || current.State != sessions.EnvironmentInputPending || !current.Deadline.Equal(pending.Deadline) {
 				t.Fatal("transient failure settled or extended input", err)
 			}
-			if _, err := h.s.CancelEnvironmentInput(t.Context(), h.tenant, h.session.ID, pending.ID); err != nil {
+			if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
 				t.Fatal(err)
 			}
 		})
@@ -131,17 +131,17 @@ func TestWorkerPreparationRejectionPreservesCancellationAndNewerInput(t *testing
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 	enableWorkerEnvironment(t, h)
 	frames := workerFrames(t, h)
-	first, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	first, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
 	defer stop()
 	old := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
-	if _, err := h.s.CancelEnvironmentInput(t.Context(), h.tenant, h.session.ID, first.ID); err != nil {
+	if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, first.ID); err != nil {
 		t.Fatal(err)
 	}
-	next, err := h.s.ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
+	next, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -149,7 +149,7 @@ func TestWorkerPreparationRejectionPreservesCancellationAndNewerInput(t *testing
 	h.write(old.ID, proto.TypePreparationStatus, rejection)
 	prepare := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
 	for id, state := range map[string]string{first.ID: sessions.EnvironmentInputCancelled, next.ID: sessions.EnvironmentInputPending} {
-		current, err := h.s.GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, id)
+		current, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, id)
 		if err != nil || current.State != state {
 			t.Fatal("late rejection changed cancellation or newer input", err)
 		}
diff --git a/services/core/tests/fixtures/main.go b/services/core/tests/fixtures/main.go
index 936afddfd..12f1e8159 100644
--- a/services/core/tests/fixtures/main.go
+++ b/services/core/tests/fixtures/main.go
@@ -8,8 +8,9 @@ import (
 	"os"
 	"strings"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -52,12 +53,16 @@ func seed() error {
 		return err
 	}
 	defer pool.Close()
-	s := store.New(pool)
+	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil))
+	if err != nil {
+		return err
+	}
 	for _, status := range []string{sessions.TurnCompleted, sessions.TurnFailed, sessions.TurnCancelled, sessions.TurnInProgress} {
-		receipt, err := s.SubmitMessage(ctx, f.Tenant, f.Session, uuid.NewString(), json.RawMessage(`{"text":"recovery fixture"}`))
+		receipts, err := service.SubmitInputs(ctx, f.Tenant, f.Session, uuid.NewString(), []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"recovery fixture"}`)}})
 		if err != nil {
 			return err
 		}
+		receipt := receipts[0]
 		if err = transitionTurn(ctx, pool, f.Tenant, f.Session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 			return err
 		}

From 0e3c3576e19d45205cd3b74937bcdee193e53dd8 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 05:18:50 +0800
Subject: [PATCH 10/60] Move Session creation into sessions (#444)

* Move Session creation into sessions

sessions.Service.CreateSession now decides creation (idempotent intent,
hosted admission and placement, Skill freeze, execution projection,
initial files, setup, Environment and initial inputs) over one
sessionpg creation transaction that calls the placementpg, skillpg,
filepg and auditpg participants. The Worker creates Sessions through the
service and wakes after commit; the streaming creation path, the store
Session code and the Store fields of the execution owner are removed.

* Restore creation identity assertions and share the store Session service

The PostgreSQL creation tests again check that a changed intent conflicts
at the upsert, that concurrent resolutions of one intent converge on the
winner's configuration, and that of two creators racing for one key exactly
one creates. The request-hash coverage of initial inputs moves to the
sessions unit test. The store fixtures build the Session service in one
helper.
---
 scripts/name-allowlist.json                   |   2 +-
 services/core/IMPLEMENTATION.md               |  16 +-
 services/core/cmd/device/main.go              |   2 +-
 services/core/cmd/environment-key/main.go     |   2 +-
 services/core/cmd/server/main.go              |  12 +-
 .../internal/api/claude_admission_test.go     |   9 +-
 .../internal/api/environment_creation_test.go |  13 +-
 services/core/internal/api/fakes_test.go      |  26 +-
 services/core/internal/api/handler.go         |  18 +-
 services/core/internal/api/handler_test.go    |   4 +-
 .../internal/api/hosted_environment_test.go   |  12 +-
 .../native_classification_integration_test.go |   3 +-
 .../internal/api/sandbox_selector_test.go     |   4 +-
 .../internal/api/session_creation_stream.go   |  23 -
 .../api/session_creation_stream_test.go       |   9 +-
 .../session_diagnostics_public_compat_test.go |  16 +-
 .../internal/api/session_diagnostics_test.go  |   3 +-
 .../internal/api/validation_errors_test.go    |   4 +-
 .../internal/db/queries/environment_setup.sql |   4 +-
 .../db/queries/initial_environment_files.sql  |   7 +-
 .../core/internal/db/queries/source_files.sql |   3 +
 .../internal/db/sqlc/environment_setup.sql.go |  26 +-
 .../db/sqlc/initial_environment_files.sql.go  |  51 +-
 .../core/internal/db/sqlc/source_files.sql.go |  25 +
 .../archive_cancellation_cleanup_test.go      |  10 +-
 .../deployment_provider_observations_test.go  |   9 +-
 .../core/internal/execution/dispatcher.go     |   2 -
 services/core/internal/execution/owner.go     |  10 +-
 .../core/internal/execution/owner_test.go     |  41 +-
 .../internal/execution/runtime_lifecycle.go   |   4 +-
 .../internal/execution/runtime_manager.go     |   4 +-
 .../runtime_retirement_failure_test.go        |   2 +-
 .../sandbox_deployment_drain_test.go          |   5 +-
 .../execution/sandbox_generations_test.go     |   2 +-
 .../internal/execution/sandbox_reset_test.go  |  49 +-
 .../execution/sandbox_snapshot_budget_test.go |   2 +-
 .../execution/session_fixture_test.go         |   4 +-
 services/core/internal/execution/worker.go    |  24 +-
 .../persistence/postgres/filepg/filepg.go     |  33 +
 .../postgres/filepg/filepg_test.go            |  55 ++
 .../modelconfigurationpg/fixture_test.go      |  20 +-
 .../modelconfigurationpg/observation_test.go  |   3 +-
 .../persistence/postgres/sessionpg/admin.go   |   4 +-
 .../postgres/sessionpg/artifacts.go           |   2 +-
 .../postgres/sessionpg/artifacts_test.go      |   2 +-
 .../persistence/postgres/sessionpg/binding.go |   2 +-
 .../postgres/sessionpg/creation.go            | 256 +++++++
 .../postgres/sessionpg/creation_test.go       | 651 ++++++++++++++++++
 .../postgres/sessionpg/environment.go         |  12 +-
 .../persistence/postgres/sessionpg/frozen.go  |  18 +-
 .../persistence/postgres/sessionpg/inputs.go  |   4 +-
 .../persistence/postgres/sessionpg/rows.go    |   8 +-
 .../postgres/sessionpg/session_reads.go       |  39 +-
 .../postgres/sessionpg/session_writes.go      |   4 +-
 .../persistence/postgres/skillpg/skillpg.go   |  55 +-
 .../postgres/skillpg/skillpg_test.go          |  41 ++
 .../providers/configuration_flow_test.go      |  10 +-
 .../core/internal/sessions/artifacts_test.go  |  21 +-
 services/core/internal/sessions/creation.go   | 575 ++++++++++++++++
 .../core/internal/sessions/creation_test.go   | 561 +++++++++++++++
 .../core/internal/sessions/devices_test.go    |   6 +-
 .../core/internal/sessions/environment.go     |   4 +-
 .../internal/sessions/environment_inputs.go   |   4 +-
 .../internal/sessions/environment_test.go     |   4 +-
 .../sessions/executor_credentials_test.go     |   2 +-
 services/core/internal/sessions/inputs.go     |   9 +-
 .../core/internal/sessions/inputs_test.go     |  12 +-
 services/core/internal/sessions/service.go    |  20 +-
 services/core/internal/sessions/session.go    |  12 +-
 .../core/internal/sessions/session_test.go    |   6 +-
 .../store/admin_session_archive_test.go       |  21 +
 .../admin_session_archive_worker_http_test.go |   4 +-
 .../store/archive_cancellation_test.go        |   2 +-
 .../internal/store/command_output_test.go     |   2 +-
 .../creation_stream_settlement_public_test.go |   2 +-
 .../core/internal/store/credential_cipher.go  |  14 -
 .../store/credential_matrix_http_test.go      |   2 +-
 services/core/internal/store/dispatch_test.go |   5 +-
 .../store/environment_admission_test.go       |   4 +-
 .../store/environment_claim_worker_test.go    |   6 +-
 .../environment_connection_worker_test.go     |   4 +-
 .../store/environment_expiry_worker_test.go   |   2 +-
 .../store/environment_initial_input_test.go   |   7 +-
 .../store/environment_initial_public_test.go  |   2 +-
 .../store/environment_initialization_test.go  |   4 +-
 .../core/internal/store/environment_setup.go  |  39 --
 .../store/environment_skill_references.go     |  98 ---
 .../environment_skill_references_test.go      | 147 ----
 .../internal/store/environment_skills_test.go |  50 --
 .../core/internal/store/environments_test.go  |   6 +-
 services/core/internal/store/execution.go     |  13 -
 .../core/internal/store/fixture_db_test.go    |  19 +-
 .../store/function_inputs_public_test.go      |   2 +-
 .../store/function_state_public_test.go       |   2 +-
 .../internal/store/function_worker_test.go    |   1 -
 services/core/internal/store/initial_files.go |  83 ---
 .../core/internal/store/initial_files_test.go |  91 ---
 .../store/input_conflicts_public_test.go      |   2 +-
 services/core/internal/store/inputs_test.go   |   2 +-
 .../store/item_order_migration_test.go        |   2 +-
 .../core/internal/store/item_order_test.go    |   2 +-
 .../core/internal/store/item_reads_test.go    |   8 +-
 .../internal/store/list_cursor_public_test.go |   5 +-
 .../internal/store/list_query_public_test.go  |   2 +-
 .../store/public_handler_fixture_test.go      |  11 +-
 .../store/runtime_compute_lifecycle_test.go   |   2 +-
 .../internal/store/runtime_connection_test.go |   2 +-
 .../store/runtime_deployment_worker_test.go   |   2 +-
 .../runtime_enrollment_connection_test.go     |   2 +-
 .../internal/store/runtime_lifecycle_test.go  |   2 +-
 .../runtime_node_lifecycle_fixture_test.go    |   2 +-
 .../internal/store/runtime_pending_test.go    |   2 +-
 .../runtime_wake_hint_integration_test.go     |   2 +-
 .../sandbox_deployment_switch_worker_test.go  |   2 +-
 .../store/sandbox_deployment_worker_test.go   |   2 +-
 .../store/self_hosted_cancel_public_test.go   |   2 +-
 .../store/self_hosted_initial_public_test.go  |  10 +-
 .../store/session_creation_identity.go        | 162 -----
 .../store/session_creation_identity_test.go   | 138 ----
 .../internal/store/session_creation_stream.go |  23 -
 .../store/session_creation_stream_test.go     | 179 -----
 .../internal/store/session_creator_test.go    | 162 -----
 .../session_deletion_lifecycle_public_test.go |   2 +-
 .../internal/store/session_deletion_test.go   |   2 +-
 .../store/session_environment_snapshot.go     |  23 -
 .../session_environment_snapshot_test.go      |  69 --
 .../internal/store/session_events_test.go     |   2 +-
 .../store/session_execution_configuration.go  |  72 --
 .../session_execution_configuration_test.go   |   4 +-
 .../internal/store/session_initial_input.go   | 174 -----
 .../store/session_initial_input_test.go       | 130 ----
 .../store/session_initial_public_test.go      |   2 +-
 .../internal/store/session_model_execution.go |  27 -
 .../store/session_model_execution_test.go     |  66 --
 .../session_reference_retry_public_test.go    |   2 +-
 .../internal/store/session_transaction.go     |  44 --
 .../store/session_write_audit_test.go         |   2 +-
 services/core/internal/store/sessions.go      | 193 ------
 .../internal/store/sessions_fixture_test.go   |  16 +-
 services/core/internal/store/sessions_test.go |  15 +-
 .../core/internal/store/store_fixture_test.go | 110 +++
 .../store/subagent_visibility_public_test.go  |   5 +-
 .../store/token_usage_integration_test.go     |   6 +-
 .../core/internal/store/turn_events_test.go   |   2 +-
 .../store/whitespace_input_public_test.go     |   2 +-
 .../internal/store/worker_input_race_test.go  |   1 -
 .../core/internal/store/worker_wakeup_test.go |  12 +-
 services/core/tests/fixtures/main.go          |   2 +-
 148 files changed, 2773 insertions(+), 2491 deletions(-)
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/creation.go
 create mode 100644 services/core/internal/persistence/postgres/sessionpg/creation_test.go
 create mode 100644 services/core/internal/sessions/creation.go
 create mode 100644 services/core/internal/sessions/creation_test.go
 delete mode 100644 services/core/internal/store/credential_cipher.go
 delete mode 100644 services/core/internal/store/environment_setup.go
 delete mode 100644 services/core/internal/store/environment_skill_references.go
 delete mode 100644 services/core/internal/store/environment_skill_references_test.go
 delete mode 100644 services/core/internal/store/environment_skills_test.go
 delete mode 100644 services/core/internal/store/execution.go
 delete mode 100644 services/core/internal/store/initial_files.go
 delete mode 100644 services/core/internal/store/initial_files_test.go
 delete mode 100644 services/core/internal/store/session_creation_identity.go
 delete mode 100644 services/core/internal/store/session_creation_stream.go
 delete mode 100644 services/core/internal/store/session_creation_stream_test.go
 delete mode 100644 services/core/internal/store/session_creator_test.go
 delete mode 100644 services/core/internal/store/session_environment_snapshot.go
 delete mode 100644 services/core/internal/store/session_environment_snapshot_test.go
 delete mode 100644 services/core/internal/store/session_execution_configuration.go
 delete mode 100644 services/core/internal/store/session_initial_input.go
 delete mode 100644 services/core/internal/store/session_initial_input_test.go
 delete mode 100644 services/core/internal/store/session_model_execution.go
 delete mode 100644 services/core/internal/store/session_model_execution_test.go
 delete mode 100644 services/core/internal/store/session_transaction.go
 delete mode 100644 services/core/internal/store/sessions.go
 create mode 100644 services/core/internal/store/store_fixture_test.go

diff --git a/scripts/name-allowlist.json b/scripts/name-allowlist.json
index 9723931fe..02cfe794b 100644
--- a/scripts/name-allowlist.json
+++ b/scripts/name-allowlist.json
@@ -65,7 +65,7 @@
     "reason": "These exact authenticated encryption domain/AAD strings must remain stable to decrypt existing stored credentials and assets."
   },
   {
-    "path": "services/core/internal/store/session_creation_identity.go",
+    "path": "services/core/internal/persistence/postgres/sessionpg/creation.go",
     "regex": "parsar\\.agents-api\\.model-provider-api-key\\.v1",
     "reason": "This persisted model-provider key fingerprint purpose remains stable across upgrade and request replay."
   },
diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 9418835da..3dc457af0 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -18,11 +18,11 @@ Shared vocabulary has one owner each, and domains use it rather than copy it. `i
 
 `internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitInputs` admits a validated input batch in order, each input steering the active Turn, starting a Turn, requesting a cancellation or joining a function result to its call's Turn, `AdmitFunctionResult` saves a submitted function result for its Turn's call, `LoadRequiredActions` lists the calls a Turn waits on, and `TransitionTurn` moves a root Turn's status as its current status allows and settles a Turn that ends. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call and Turn operation loads the Turn in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. Neither imports persistence. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
 
-Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; `LoadEnvironment`, which reads the tenant's Environment of a live Session; and `CreateSessionEnvironment`, which stores the Environment of a Session being created. The other `sessionpg` exports serve `store` until the Session operations leave it; among them `LoadSessionActivity`, the one Session activity read, adds the activity projection to the Session that `store`'s Session creation returns. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` and `BindSession` stay exported after store goes; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
+Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; and `LoadEnvironment`, which reads the tenant's Environment of a live Session. In turn, Session creation's transaction in `sessionpg` calls the `placementpg`, `skillpg` and `filepg` participants and `auditpg.RecordWriteAudit` on its own queries. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` stays exported; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
 
-`store` is transitional. `store.New` builds a pooled Store, and `store.NewExecution(s, lease)` builds the execution writer on a lease it borrows. Adapters' execution repositories require a `*pgunit.Lease` at construction, and their public repositories expose no execution operation.
+`store` is transitional: its only production code is `UnstorableText`, which `api` uses to classify database errors, and its integration tests build their fixtures from the domain services. Adapters' execution repositories require a `*pgunit.Lease` at construction, and their public repositories expose no execution operation.
 
-`cmd/server` owns the execution lease. It acquires one `pgunit.Lease`, builds every lease-bound adapter on it, and passes the lease and those adapters together as one `execution.Owner` to `execution.StartWorker`, which binds the Dispatcher to the Owner's execution operations through `Dispatcher.Bind`. If anything fails before that call, `cmd/server` closes the lease. From that call the Worker owns cleanup: a failed start closes the lease before it returns, and a started Worker closes it after `Run` has cancelled and drained its work. Each close runs under its own bounded deadline, independent of the cancelled request or run. Lease-bound adapters and the store writer borrow the lease and never close it, and the Worker uses the lease only through `Owner.Lease`, never through an adapter. Store integration tests start the Worker the same way through `startWorker`, and bind a Dispatcher that runs Turns without a Worker through `Dispatcher.Bind`.
+`cmd/server` owns the execution lease. It acquires one `pgunit.Lease`, builds every lease-bound adapter on it, and passes the lease and those adapters together as one `execution.Owner` to `execution.StartWorker`, which binds the Dispatcher to the Owner's execution operations through `Dispatcher.Bind`. If anything fails before that call, `cmd/server` closes the lease. From that call the Worker owns cleanup: a failed start closes the lease before it returns, and a started Worker closes it after `Run` has cancelled and drained its work. Each close runs under its own bounded deadline, independent of the cancelled request or run. Lease-bound adapters borrow the lease and never close it, and the Worker uses the lease only through `Owner.Lease`, never through an adapter. Store integration tests start the Worker the same way through `startWorker`, and bind a Dispatcher that runs Turns without a Worker through `Dispatcher.Bind`.
 
 Domain owners, each with its PostgreSQL adapter under `internal/persistence/postgres`:
 
@@ -32,11 +32,11 @@ Domain owners, each with its PostgreSQL adapter under `internal/persistence/post
 - `vaults` (`vaultpg`): Vaults and Credentials, the encryption of Credential secrets, OAuth access-token refresh, and the MCP credential selection that Session creation freezes and the Dispatcher's `Credentials` resolves into a bearer token.
 - `environmenttemplates` (`templatepg`): Environment Templates, their validation and default network, their sealed setup, initial files, Skills and Plugins, and the resolved Template that Session creation composes into its Environment.
 - `modelconfiguration` (`modelconfigurationpg`): each Harness's deployment default model configuration and its last-use observations.
-- `skills` (`skillpg`): Skills and their immutable versions: archive checks, the default and latest pointers, version selection and deletion, and each version's sealed archive. Session creation freezes selected versions inside its `store` transaction with the `skills` rules.
-- `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and to `store`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other reader is `store`: Session creation decides admission and placement with those rules and `placementpg` inside its own transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. Session archive crosses the Session and the deployment, so it is a `deployment.ExecutionOperations` operation: `ArchiveSession`, which the administrator's archive route calls through `api.Execution.SessionArchive`, and `ArchiveResetSession`, which a reset calls, lock the Session through `deploymentpg`'s `WithSessionArchive`, check the deployment's generation and the running reset in `deployment`, then expire the Environment and cancel its work through the `sessions` procedures, revoke the allocation's device and request its cleanup, and record the audit entry in one leased transaction. `deployment.ObservationResolver` resolves a Session's Runtime observation target for `runtimeobs` from `sessions.SessionReader` and `deployment.Reader`.
+- `skills` (`skillpg`): Skills and their immutable versions: archive checks, the default and latest pointers, version selection and deletion, and each version's sealed archive. Session creation freezes selected versions inside its own transaction: `skillpg.LockSkills` locks the selected Skills in ID order, `skillpg.ReadVersionForFreeze` opens and verifies a version, and `sessions` selects each version with the `skills` rules.
+- `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and `sessions.Service`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other caller is Session creation: `sessions` decides admission and placement with those rules over the `placementpg` participants inside the creation transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. Session archive crosses the Session and the deployment, so it is a `deployment.ExecutionOperations` operation: `ArchiveSession`, which the administrator's archive route calls through `api.Execution.SessionArchive`, and `ArchiveResetSession`, which a reset calls, lock the Session through `deploymentpg`'s `WithSessionArchive`, check the deployment's generation and the running reset in `deployment`, then expire the Environment and cancel its work through the `sessions` procedures, revoke the allocation's device and request its cleanup, and record the audit entry in one leased transaction. `deployment.ObservationResolver` resolves a Session's Runtime observation target for `runtimeobs` from `sessions.SessionReader` and `deployment.Reader`.
 - `coremetrics` (`coremetricspg`): the Core metrics PostgreSQL holds: the root Turn queue counts, the root Turn history, read from one read-only snapshot, and the database size. `cmd/server`'s Core metrics source adds them to the process, pool, Worker and daemon registry measurements.
 - `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples. `runtimehistory.Service` scopes a read to the Session's hosted Environment through `sessions.EnvironmentReader`.
-- `sessions` (`sessionpg`): Session use cases and reads as they leave `store`. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. So far these cover Sessions (their reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), input admission (a public input batch, Environment input reservation and the expiry of one reservation, with the reads of a Turn's admitted inputs, a reservation and the Environment input work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the administrator's views across Projects (a Project's asset counts and Sessions for the summary, and the Sessions whose Runtime the administrator observes), executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. `cmd/server` builds one `sessionpg.Store` with the credential key and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker stages Artifacts through the Service; `cmd/environment-key` builds one without the key for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, file-write reservation and settlement, and the promotion, failure and bulk expiry of Environment input reservations run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
+- `sessions` (`sessionpg`): Session use cases and reads. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. These cover Sessions (their creation, reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), input admission (a public input batch, Environment input reservation and the expiry of one reservation, with the reads of a Turn's admitted inputs, a reservation and the Environment input work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the administrator's views across Projects (a Project's asset counts and Sessions for the summary, and the Sessions whose Runtime the administrator observes), executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. Session creation runs in one pooled `sessions.CreationTx`: `sessions` validates the request, computes its retry identity, with the provider key fingerprinted by `sessionpg.Store` under the credential key, and orders the upsert, hosted admission, the Skill freeze, the sealed model provider, execution configuration, initial files and setup, the Environment, placement and the initial input; `FindSessionCreation` finds an earlier creation by its recorded intent. `cmd/server` builds one `sessionpg.Store` with the credential key and the Service with its `placement.Rules`, and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker creates Sessions through the Service after its execution checks, waking the scheduler only after the commit, and stages Artifacts through it; `cmd/environment-key` builds one without the key, and the Service without placement rules, for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, file-write reservation and settlement, and the promotion, failure and bulk expiry of Environment input reservations run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
 
 ## Request handling
 
@@ -56,7 +56,7 @@ On the Beta group, the OpenAI-Beta check (exactly one `agents=v1` value) runs be
 
 ## Source Files and Artifacts
 
-Source Files are Project resources with a lifecycle independent of copied workspace files. `files` owns their vocabulary, the upload envelope and 512 MiB content bound, the list rules and the create and delete use cases; `filepg` stores immutable source metadata and PostgreSQL large objects in Core's database with the pinned pgx driver. Upload validation, metadata insertion, the bytes and the write audit commit atomically; deletion removes the metadata, unlinks the object and records the audit in one transaction. Keep OIDs private and authorize every metadata, content and delete lookup by tenant before opening a body. Write content through `pgunit`'s large-object writer, which streams bounded chunks and reports the size and SHA-256 digest; never hold an entire upload in memory or use a filename as a filesystem path. A direct download of the `user_data` purpose is rejected after the tenant-scoped metadata lookup, while workspace copies keep their authorized `filepg` read and Session initialization copies read the object inside Session creation's store transaction. A read-only repeatable-read transaction preserves an admitted source across concurrent deletion; resolve that snapshot before entering the Environment write path, and a later deletion never undoes a completed workspace copy. Bound request and transaction lifetimes, roll back incomplete bodies and never retry an ambiguous commit automatically. Backups must include PostgreSQL large objects, and a schema rollback must not orphan them.
+Source Files are Project resources with a lifecycle independent of copied workspace files. `files` owns their vocabulary, the upload envelope and 512 MiB content bound, the list rules and the create and delete use cases; `filepg` stores immutable source metadata and PostgreSQL large objects in Core's database with the pinned pgx driver. Upload validation, metadata insertion, the bytes and the write audit commit atomically; deletion removes the metadata, unlinks the object and records the audit in one transaction. Keep OIDs private and authorize every metadata, content and delete lookup by tenant before opening a body. Write content through `pgunit`'s large-object writer, which streams bounded chunks and reports the size and SHA-256 digest; never hold an entire upload in memory or use a filename as a filesystem path. A direct download of the `user_data` purpose is rejected after the tenant-scoped metadata lookup, while workspace copies keep their authorized `filepg` read and Session creation copies an initial file's object inside its own transaction through `filepg.ReadSourceForCopy`, which locks the source and bounds the read. A read-only repeatable-read transaction preserves an admitted source across concurrent deletion; resolve that snapshot before entering the Environment write path, and a later deletion never undoes a completed workspace copy. Bound request and transaction lifetimes, roll back incomplete bodies and never retry an ambiguous commit automatically. Backups must include PostgreSQL large objects, and a schema rollback must not orphan them.
 
 Session Artifacts are immutable published copies, separate from live workspace files and source Files. The private output exporter reuses the authorized workspace path boundary and streams bounded bytes; publication requires complete capture and confirmed helper and transport success, not merely valid archive syntax. The daemon owns and drains the exporter's stdout pipe separately from child reaping, so pull-transport backpressure cannot consume the process-exit I/O deadline; after helper exit, each pipe read has one second, reset after consumer delays, which rejects inherited pipes that never close. Cancellation closes the owned reader and the dispatch consumer, then waits for the child. Never extract an output archive into Core's filesystem or hold the execution lease through a large transfer.
 
@@ -102,7 +102,7 @@ Turn writes serialize on the tenant-scoped Session row. Input requests are order
 
 Session deletion takes its decision and commits the `deleted_at` marker under the tenant Session lock that orders Turn and input admission, so either an admission commits first and deletion conflicts, or admission observes the deletion. Admission checks visibility under that lock before its retry lookup. Internal Turn, receipt, finalization and restart reconciliation keep access to deleted Sessions so that work settles under the execution lease; queued work of a deleted Session is never claimed, and Runtime cleanup still cancels pending work. Deletion never revokes a shared device or removes a saved Agent. Deleted Session records are retained, and a migration rollback refuses to drop the column while any exist.
 
-Every new Session needs an explicit typed creator at the store boundary, internal callers included; public creation derives it from the authenticated principal only. Creator kind and ID persist in the creation transaction and never change on retry, update or source mutation. Both the early saved-reference recovery and the authoritative creation upsert require a matching creator before returning a Session or event cursor. Tenant scope always comes from the authenticated identity before any store call; metadata grants nothing. Tests supply explicit synthetic creators.
+Every new Session needs an explicit typed creator at the `sessions` boundary, internal callers included; public creation derives it from the authenticated principal only. Creator kind and ID persist in the creation transaction and never change on retry, update or source mutation. Both the early saved-reference recovery and the authoritative creation upsert require a matching creator before returning a Session or event cursor. Tenant scope always comes from the authenticated identity before any storage call; metadata grants nothing. Tests supply explicit synthetic creators.
 
 New saved-reference Sessions, and inline requests with Vault attachments or credential references, record a separate caller-intent hash: the source ID (empty for inline), supplied overrides with field presence, Environment and Vaults, original metadata and normalized initial input, excluding response streaming and resolved source values. Compare that same-tenant retry identity before looking up the source; a match returns the existing Session without input admission or source revalidation. Recheck after a source resolution failure for a concurrently committed creator, without holding a lock across resolution; the unique creation upsert stays authoritative. Credential-bound retries recover before reading mutable Vault contents. Every new hosted Session also records caller intent, before deployment defaults are resolved; the resolved-configuration hash of other inline Sessions leaves the deployment default out. Provider keys enter retry hashes only as keyed fingerprints.
 
diff --git a/services/core/cmd/device/main.go b/services/core/cmd/device/main.go
index 59c6830ce..692325600 100644
--- a/services/core/cmd/device/main.go
+++ b/services/core/cmd/device/main.go
@@ -58,7 +58,7 @@ func run() error {
 	defer pool.Close()
 	// Device provisioning opens no frozen Session data, so it needs no
 	// credential key.
-	s, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil))
+	s, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil), nil)
 	if err != nil {
 		return err
 	}
diff --git a/services/core/cmd/environment-key/main.go b/services/core/cmd/environment-key/main.go
index 43c75db60..37b6d4752 100644
--- a/services/core/cmd/environment-key/main.go
+++ b/services/core/cmd/environment-key/main.go
@@ -110,7 +110,7 @@ func run() error {
 	}
 	defer pool.Close()
 	// Executor credentials need no credential key.
-	credentials, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil))
+	credentials, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil), nil)
 	if err != nil {
 		return err
 	}
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index 4eef9799e..f734986f2 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -65,7 +65,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/migrations"
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -140,7 +139,6 @@ func run() error {
 	if err != nil {
 		return err
 	}
-	executionStore := store.NewWithCredentialCipher(pool, credentialKey)
 	units := pgunit.NewPool(pool)
 	auditStore := auditpg.New(units)
 	agentStore := agentpg.New(units, credentialKey)
@@ -180,16 +178,13 @@ func run() error {
 	if err != nil {
 		return err
 	}
-	// Session creation in store still decides admission and placement until
-	// it moves to sessions.
-	executionStore.SetPlacement(placementRules)
 	deploymentStore := deploymentpg.New(units, credentialKey)
 	deploymentService, err := deployment.NewService(deploymentStore, deploymentStore, sandboxProviders, placementRules)
 	if err != nil {
 		return err
 	}
 	sessionStore := sessionpg.New(units, credentialKey)
-	sessionService, err := sessions.NewService(sessionStore)
+	sessionService, err := sessions.NewService(sessionStore, placementRules)
 	if err != nil {
 		return err
 	}
@@ -303,7 +298,7 @@ func run() error {
 	}
 	var deploymentExecution *deployment.ExecutionOperations
 	if registry != nil {
-		dispatcher := &execution.Dispatcher{Store: executionStore, Registry: registry,
+		dispatcher := &execution.Dispatcher{Registry: registry,
 			Credentials: vaultService, Observer: modelConfigurationStore, Deployment: deploymentService, DeploymentReader: deploymentStore,
 			Sessions:        sessionService,
 			SessionsReader:  sessionStore,
@@ -323,7 +318,6 @@ func run() error {
 		// From this call on the Worker closes the lease, even when it fails to start.
 		worker, err = execution.StartWorker(ctx, dispatcher, execution.Owner{
 			Lease:      lease,
-			Store:      store.NewExecution(executionStore, lease),
 			Deployment: deploymentExecution,
 			Sessions:   sessionExecution,
 		})
@@ -400,7 +394,7 @@ func run() error {
 		Agents: agentService, AgentsReader: agentStore,
 		Sessions:        sessionService,
 		SessionsReader:  sessionStore,
-		SessionCreation: executionStore,
+		SessionCreation: sessionService,
 		SessionEvents:   sessionStore,
 		Turns:           sessionStore,
 		Items:           sessionStore,
diff --git a/services/core/internal/api/claude_admission_test.go b/services/core/internal/api/claude_admission_test.go
index dc948d39e..683af40e1 100644
--- a/services/core/internal/api/claude_admission_test.go
+++ b/services/core/internal/api/claude_admission_test.go
@@ -46,8 +46,13 @@ func TestClaudeSessionConfigurationAdmission(t *testing.T) {
 					handler, saved, _ := testHandler(t, func(d *Dependencies, f *testFakes) {
 						d.Engine = "claude_sdk"
 						admitSessions(d, f)
-						// The Worker's stream admission reports that it cannot execute.
-						f.sessionAdmission.createSessionStream = func(_ context.Context, _ string, input sessions.CreateSession) (sessions.Creation, error) {
+						// The Worker records a JSON creation and reports that it cannot
+						// execute a streamed one.
+						record := f.sessionAdmission.createSession
+						f.sessionAdmission.createSession = func(ctx context.Context, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
+							if !stream {
+								return record(ctx, tenant, input)
+							}
 							streamed = input.Engine
 							return sessions.Creation{}, execution.ErrExecutionUnavailable
 						}
diff --git a/services/core/internal/api/environment_creation_test.go b/services/core/internal/api/environment_creation_test.go
index b66a2e9c1..7feca96c7 100644
--- a/services/core/internal/api/environment_creation_test.go
+++ b/services/core/internal/api/environment_creation_test.go
@@ -27,7 +27,7 @@ func (f *environmentCreationFixture) FindSessionCreation(context.Context, string
 	return sessions.Creation{}, sessions.ErrNotFound
 }
 
-func (f *environmentCreationFixture) CreateSession(_ context.Context, tenant string, input sessions.CreateSession) (sessions.Session, error) {
+func (f *environmentCreationFixture) CreateSession(_ context.Context, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 	f.input = input
@@ -36,17 +36,12 @@ func (f *environmentCreationFixture) CreateSession(_ context.Context, tenant str
 		Environment json.RawMessage `json:"environment"`
 	}
 	if err := json.Unmarshal(input.Configuration, &snapshot); err != nil {
-		return sessions.Session{}, err
+		return sessions.Creation{}, err
 	}
 	f.session.Environment = &sessions.Environment{
 		ID: uuid.NewString(), SessionID: f.session.ID, TenantID: tenant, Status: "pending", Configuration: snapshot.Environment,
 	}
-	return f.session, nil
-}
-
-func (f *environmentCreationFixture) CreateSessionStream(ctx context.Context, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
-	session, err := f.CreateSession(ctx, tenant, input)
-	return sessions.Creation{Session: session, Created: true}, err
+	return sessions.Creation{Session: f.session, Created: true}, nil
 }
 
 // environmentCreationHandler serves Session creation and reads from a fresh
@@ -63,7 +58,7 @@ func environmentCreationHandler(t *testing.T, engine string, configure ...func(*
 		TokenSHA256: runtimedevice.HashCredential("key"), TenantID: uuid.NewString(),
 	}).ResolveAPIKey
 	fixture.serve(fakes)
-	fakes.sessionCreation.findSessionCreation, fakes.sessionCreation.createSession, fakes.sessionCreation.createSessionStream = fixture.FindSessionCreation, fixture.CreateSession, fixture.CreateSessionStream
+	fakes.sessionCreation.findSessionCreation, fakes.sessionCreation.createSession = fixture.FindSessionCreation, fixture.CreateSession
 	fakes.modelProviders.resolve = fixtureDeploymentProvider
 	for _, c := range configure {
 		c(&deps, fakes)
diff --git a/services/core/internal/api/fakes_test.go b/services/core/internal/api/fakes_test.go
index 7737d87bd..f7bb22fac 100644
--- a/services/core/internal/api/fakes_test.go
+++ b/services/core/internal/api/fakes_test.go
@@ -761,25 +761,17 @@ func (f *fakeSessionAdmin) GetManagedSessionArchive(a0 context.Context, a1 strin
 }
 
 type fakeSessionAdmission struct {
-	t                   testing.TB
-	createSession       func(context.Context, string, sessions.CreateSession) (sessions.Session, error)
-	createSessionStream func(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
+	t             testing.TB
+	createSession func(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
 }
 
-func (f *fakeSessionAdmission) CreateSession(a0 context.Context, a1 string, a2 sessions.CreateSession) (sessions.Session, error) {
+func (f *fakeSessionAdmission) CreateSession(a0 context.Context, a1 string, a2 sessions.CreateSession) (sessions.Creation, error) {
 	if f.createSession == nil {
 		unexpectedCall(f.t, "CreateSession")
 	}
 	return f.createSession(a0, a1, a2)
 }
 
-func (f *fakeSessionAdmission) CreateSessionStream(a0 context.Context, a1 string, a2 sessions.CreateSession) (sessions.Creation, error) {
-	if f.createSessionStream == nil {
-		unexpectedCall(f.t, "CreateSessionStream")
-	}
-	return f.createSessionStream(a0, a1, a2)
-}
-
 type fakeSessionArchive struct {
 	t              testing.TB
 	archiveSession func(context.Context, string, string, uint64) (sessions.ManagedArchive, error)
@@ -794,25 +786,17 @@ func (f *fakeSessionArchive) ArchiveSession(a0 context.Context, a1 string, a2 st
 
 type fakeSessionCreation struct {
 	t                   testing.TB
-	createSession       func(context.Context, string, sessions.CreateSession) (sessions.Session, error)
-	createSessionStream func(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
+	createSession       func(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
 	findSessionCreation func(context.Context, string, string, json.RawMessage, identity.Subject) (sessions.Creation, error)
 }
 
-func (f *fakeSessionCreation) CreateSession(a0 context.Context, a1 string, a2 sessions.CreateSession) (sessions.Session, error) {
+func (f *fakeSessionCreation) CreateSession(a0 context.Context, a1 string, a2 sessions.CreateSession) (sessions.Creation, error) {
 	if f.createSession == nil {
 		unexpectedCall(f.t, "CreateSession")
 	}
 	return f.createSession(a0, a1, a2)
 }
 
-func (f *fakeSessionCreation) CreateSessionStream(a0 context.Context, a1 string, a2 sessions.CreateSession) (sessions.Creation, error) {
-	if f.createSessionStream == nil {
-		unexpectedCall(f.t, "CreateSessionStream")
-	}
-	return f.createSessionStream(a0, a1, a2)
-}
-
 func (f *fakeSessionCreation) FindSessionCreation(a0 context.Context, a1 string, a2 string, a3 json.RawMessage, a4 identity.Subject) (sessions.Creation, error) {
 	if f.findSessionCreation == nil {
 		unexpectedCall(f.t, "FindSessionCreation")
diff --git a/services/core/internal/api/handler.go b/services/core/internal/api/handler.go
index 154b0a491..329e3218f 100644
--- a/services/core/internal/api/handler.go
+++ b/services/core/internal/api/handler.go
@@ -22,16 +22,14 @@ import (
 // earlier creation by its retry identity. Creation that admits work goes
 // through Execution.SessionAdmission.
 type SessionCreation interface {
-	CreateSession(context.Context, string, sessions.CreateSession) (sessions.Session, error)
-	CreateSessionStream(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
+	CreateSession(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
 	FindSessionCreation(context.Context, string, string, json.RawMessage, identity.Subject) (sessions.Creation, error)
 }
 
 // SessionAdmission creates Sessions that admit work through the execution
 // Worker, which validates execution support first.
 type SessionAdmission interface {
-	CreateSession(context.Context, string, sessions.CreateSession) (sessions.Session, error)
-	CreateSessionStream(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
+	CreateSession(context.Context, string, sessions.CreateSession) (sessions.Creation, error)
 }
 
 // Sessions updates and deletes Sessions, and records their public write audit.
@@ -274,10 +272,6 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 		Creator:                    sessionCreator(r), InitialFiles: input.initialFiles, Initialization: input.initialization,
 		Engine: selectedEngine, IdempotencyKey: key, Metadata: input.Metadata, Configuration: configuration, InitialInputs: initialInputs, CreationRequest: creationRequest,
 	}
-	if input.Stream {
-		h.createSessionStream(w, r, createInput)
-		return
-	}
 	create := h.SessionCreation.CreateSession
 	if len(initialInputs) > 0 || input.Environment.Type == "openai_hosted" {
 		if h.Execution == nil {
@@ -286,12 +280,16 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 		}
 		create = h.Execution.SessionAdmission.CreateSession
 	}
-	session, err := create(r.Context(), tenantID(r), createInput)
+	result, err := create(r.Context(), tenantID(r), createInput)
 	if err != nil {
 		writeStoreError(w, r, err)
 		return
 	}
-	h.respondSessionStatus(w, r, session, http.StatusCreated)
+	if input.Stream {
+		h.respondSessionCreationStream(w, r, result)
+		return
+	}
+	h.respondSessionStatus(w, r, result.Session, http.StatusCreated)
 }
 
 // @Summary Retrieve an execution Session
diff --git a/services/core/internal/api/handler_test.go b/services/core/internal/api/handler_test.go
index 0a0ab0536..8257827b7 100644
--- a/services/core/internal/api/handler_test.go
+++ b/services/core/internal/api/handler_test.go
@@ -44,9 +44,9 @@ func (s *recordingStore) FindSessionCreation(context.Context, string, string, js
 	return sessions.Creation{}, sessions.ErrNotFound
 }
 
-func (s *recordingStore) CreateSession(_ context.Context, tenant string, input sessions.CreateSession) (sessions.Session, error) {
+func (s *recordingStore) CreateSession(_ context.Context, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
 	s.tenant, s.input = tenant, input
-	return sessions.Session{ID: uuid.NewString(), TenantID: tenant, Metadata: input.Metadata, Configuration: input.Configuration, CreatedAt: time.Unix(1700000000, 0)}, nil
+	return sessions.Creation{Session: sessions.Session{ID: uuid.NewString(), TenantID: tenant, Metadata: input.Metadata, Configuration: input.Configuration, CreatedAt: time.Unix(1700000000, 0)}, Created: true}, nil
 }
 
 // record answers Session creation, reads and listing from s.
diff --git a/services/core/internal/api/hosted_environment_test.go b/services/core/internal/api/hosted_environment_test.go
index 471a06a4c..bcc69d9fa 100644
--- a/services/core/internal/api/hosted_environment_test.go
+++ b/services/core/internal/api/hosted_environment_test.go
@@ -90,7 +90,7 @@ func TestHostedCreationUsesExecutionAdmission(t *testing.T) {
 		recorder := &hostedCreationRecorder{}
 		handler, fixture := environmentCreationHandler(t, "codex", func(d *Dependencies, f *testFakes) {
 			d.Execution, d.Sandboxes = f.execution(), f.sandboxes()
-			f.sessionAdmission.createSession, f.sessionAdmission.createSessionStream = recorder.CreateSession, recorder.CreateSessionStream
+			f.sessionAdmission.createSession = recorder.CreateSession
 		})
 		input := ""
 		if stream {
@@ -103,8 +103,8 @@ func TestHostedCreationUsesExecutionAdmission(t *testing.T) {
 		request.Header.Set("Content-Type", "application/json")
 		response := httptest.NewRecorder()
 		handler.ServeHTTP(response, request)
-		// The recorder deliberately rejects both creation methods. Its rejection
-		// proves admission was used; the resource fixture must remain untouched.
+		// The recorder deliberately rejects creation. Its rejection proves
+		// admission was used; the resource fixture must remain untouched.
 		if recorder.calls != 1 || fixture.input.Engine != "" || fixture.session.ID != "" || response.Code != http.StatusBadRequest {
 			t.Fatal("hosted creation bypassed execution admission", stream, response.Code, response.Body.String())
 		}
@@ -117,11 +117,7 @@ type hostedCreationRecorder struct {
 	calls int
 }
 
-func (r *hostedCreationRecorder) CreateSession(context.Context, string, sessions.CreateSession) (sessions.Session, error) {
-	r.calls++
-	return sessions.Session{}, sessions.ErrInvalidInput
-}
-func (r *hostedCreationRecorder) CreateSessionStream(context.Context, string, sessions.CreateSession) (sessions.Creation, error) {
+func (r *hostedCreationRecorder) CreateSession(context.Context, string, sessions.CreateSession) (sessions.Creation, error) {
 	r.calls++
 	return sessions.Creation{}, sessions.ErrInvalidInput
 }
diff --git a/services/core/internal/api/native_classification_integration_test.go b/services/core/internal/api/native_classification_integration_test.go
index 12dc3754f..47a621d6a 100644
--- a/services/core/internal/api/native_classification_integration_test.go
+++ b/services/core/internal/api/native_classification_integration_test.go
@@ -21,10 +21,11 @@ func TestNativeClassificationPostgresRoundTripAndPublicPrivacy(t *testing.T) {
 	reader := sessionpg.New(pgunit.NewPool(pool), nil)
 	for _, code := range []string{"authentication_error", "connection_failed", "secret-canary"} {
 		t.Run(code, func(t *testing.T) {
-			session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "native-classification"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
+			created, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "native-classification"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
 			if err != nil {
 				t.Fatal(err)
 			}
+			session := created.Session
 			receipt := submitMessage(t, pool, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
 			transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 			status := 503
diff --git a/services/core/internal/api/sandbox_selector_test.go b/services/core/internal/api/sandbox_selector_test.go
index 8f20e2ee2..f70dc9dd9 100644
--- a/services/core/internal/api/sandbox_selector_test.go
+++ b/services/core/internal/api/sandbox_selector_test.go
@@ -18,9 +18,9 @@ type sandboxCreationRecorder struct {
 	calls int
 }
 
-func (r *sandboxCreationRecorder) CreateSession(context.Context, string, sessions.CreateSession) (sessions.Session, error) {
+func (r *sandboxCreationRecorder) CreateSession(context.Context, string, sessions.CreateSession) (sessions.Creation, error) {
 	r.calls++
-	return sessions.Session{}, sessions.ErrInvalidInput
+	return sessions.Creation{}, sessions.ErrInvalidInput
 }
 
 // Placement is automatic. A node selector is an unknown member wherever it appears.
diff --git a/services/core/internal/api/session_creation_stream.go b/services/core/internal/api/session_creation_stream.go
index b640f5a48..d385d3c8c 100644
--- a/services/core/internal/api/session_creation_stream.go
+++ b/services/core/internal/api/session_creation_stream.go
@@ -2,7 +2,6 @@ package api
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
@@ -10,28 +9,6 @@ import (
 	"github.com/google/uuid"
 )
 
-func (h *Handler) createSessionStream(w http.ResponseWriter, r *http.Request, input sessions.CreateSession) {
-	var config configuration
-	if err := json.Unmarshal(input.Configuration, &config); err != nil {
-		writeStoreError(w, r, sessions.ErrInvalidInput)
-		return
-	}
-	create := h.SessionCreation.CreateSessionStream
-	if len(input.InitialInputs) > 0 || config.Environment.Type == "openai_hosted" {
-		if h.Execution == nil {
-			writeError(w, http.StatusServiceUnavailable, "execution_unavailable", "Execution input is not enabled on this service.")
-			return
-		}
-		create = h.Execution.SessionAdmission.CreateSessionStream
-	}
-	result, err := create(r.Context(), tenantID(r), input)
-	if err != nil {
-		writeStoreError(w, r, err)
-		return
-	}
-	h.respondSessionCreationStream(w, r, result)
-}
-
 // respondSessionCreationStream renders result.Session, the committed Session
 // projection read after result.Cursor, which is also the JSON 201 body. A fresh
 // creation sends it as agent.session.created, then streams changes after the
diff --git a/services/core/internal/api/session_creation_stream_test.go b/services/core/internal/api/session_creation_stream_test.go
index a94119d7d..ada43b580 100644
--- a/services/core/internal/api/session_creation_stream_test.go
+++ b/services/core/internal/api/session_creation_stream_test.go
@@ -21,7 +21,7 @@ import (
 )
 
 // creationStreamFixture serves one Session through both creation paths: the
-// execution upsert (CreateSessionStream) and recorded-intent retry lookup. Like
+// execution upsert (CreateSession) and recorded-intent retry lookup. Like
 // the Store, it commits events with ordered sequences together with the state
 // they describe.
 type creationStreamFixture struct {
@@ -106,9 +106,8 @@ func (f *creationStreamFixture) AuditSessionOperation(context.Context, sessions.
 	return nil
 }
 
-// CreateSessionStream is the Worker's streamed admission: it returns the
-// prepared creation.
-func (f *creationStreamFixture) CreateSessionStream(context.Context, string, sessions.CreateSession) (sessions.Creation, error) {
+// CreateSession is the Worker's admission: it returns the prepared creation.
+func (f *creationStreamFixture) CreateSession(context.Context, string, sessions.CreateSession) (sessions.Creation, error) {
 	return f.creation, nil
 }
 
@@ -151,7 +150,7 @@ func newCreationStreamHarness(t *testing.T) *creationStreamHarness {
 	fakes.sessionEvents.sessionEventCursor, fakes.sessionEvents.sessionStreamSnapshot, fakes.sessionEvents.listSessionEvents = fixture.SessionEventCursor, fixture.SessionStreamSnapshot, fixture.ListSessionEvents
 	fakes.modelProviders.resolve = noDeploymentModelProvider
 	deps.Execution = fakes.execution()
-	fakes.sessionAdmission.createSessionStream = fixture.CreateSessionStream
+	fakes.sessionAdmission.createSession = fixture.CreateSession
 	handler := newTestHandler(t, deps)
 	h := &creationStreamHarness{t: t, fixture: fixture}
 	h.server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/services/core/internal/api/session_diagnostics_public_compat_test.go b/services/core/internal/api/session_diagnostics_public_compat_test.go
index f6b56f881..bb5fa50eb 100644
--- a/services/core/internal/api/session_diagnostics_public_compat_test.go
+++ b/services/core/internal/api/session_diagnostics_public_compat_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/migrations"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -29,10 +28,11 @@ func TestDiagnosticPublicCompatibility(t *testing.T) {
 	fakes.projectsReader.resolveAPIKey = projectKeys(t, key).ResolveAPIKey
 	databaseSessionReads(pool)(&deps, fakes)
 	h := newTestHandler(t, deps)
-	session, err := s.CreateSession(t.Context(), key.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "compat-test"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
+	created, err := s.CreateSession(t.Context(), key.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "compat-test"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
+	session := created.Session
 	turn := uuid.NewString()
 	item := uuid.NewString()
 	if _, err = pool.Exec(t.Context(), "UPDATE sessions SET created_at='2026-09-28T00:00:00Z' WHERE id=$1", session.ID); err != nil {
@@ -76,7 +76,7 @@ func databaseSessionReads(pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
 // submitMessage admits one message input through the Session service on pool.
 func submitMessage(t *testing.T, pool *pgxpool.Pool, tenant, session, key string, payload json.RawMessage) sessions.InputReceipt {
 	t.Helper()
-	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil))
+	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -108,7 +108,9 @@ func transitionTurn(t *testing.T, pool *pgxpool.Pool, tenant, session, turn stri
 	}
 }
 
-func diagnosticDatabase(t *testing.T) (*store.Store, *pgxpool.Pool) {
+// diagnosticDatabase opens the dedicated test database and the Session
+// service on it.
+func diagnosticDatabase(t *testing.T) (*sessions.Service, *pgxpool.Pool) {
 	t.Helper()
 	dsn := os.Getenv("OAC_TEST_DATABASE_URL")
 	if dsn == "" {
@@ -133,5 +135,9 @@ func diagnosticDatabase(t *testing.T) (*store.Store, *pgxpool.Pool) {
 	if err = migrations.Apply(t.Context(), dsn); err != nil {
 		t.Fatal(err)
 	}
-	return store.New(pool), pool
+	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return service, pool
 }
diff --git a/services/core/internal/api/session_diagnostics_test.go b/services/core/internal/api/session_diagnostics_test.go
index 0470488c1..a9365ba25 100644
--- a/services/core/internal/api/session_diagnostics_test.go
+++ b/services/core/internal/api/session_diagnostics_test.go
@@ -15,10 +15,11 @@ import (
 func TestDiagnosticsCoreHandlerDatabaseBoundary(t *testing.T) {
 	s, pool := diagnosticDatabase(t)
 	h, _, tenant := adminTestHandler(t, databaseSessionReads(pool))
-	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "diagnostic-test"}, Engine: "codex", IdempotencyKey: "diagnostics", Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
+	created, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "diagnostic-test"}, Engine: "codex", IdempotencyKey: "diagnostics", Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
+	session := created.Session
 	receipt := submitMessage(t, pool, tenant, session.ID, "input", json.RawMessage(`{"text":"input-secret-canary"}`))
 	transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"device_disconnected","error":"Bearer raw-secret-canary https://private.example/key","done":{"native_id":"secret-native-canary"}}`)})
diff --git a/services/core/internal/api/validation_errors_test.go b/services/core/internal/api/validation_errors_test.go
index 9c05b9458..cecc32b60 100644
--- a/services/core/internal/api/validation_errors_test.go
+++ b/services/core/internal/api/validation_errors_test.go
@@ -45,9 +45,9 @@ func (s *validationStore) UpdateSessionMetadata(_ context.Context, command sessi
 	return sessions.Session{ID: command.SessionID, TenantID: command.TenantID, Metadata: command.Metadata, Configuration: json.RawMessage(`{"agent":{"id":"agent_validation","model":"validation-model"},"environment":{"type":"none"}}`)}, nil
 }
 
-func (s *validationStore) CreateSession(_ context.Context, tenant string, input sessions.CreateSession) (sessions.Session, error) {
+func (s *validationStore) CreateSession(_ context.Context, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
 	s.writes++
-	return sessions.Session{ID: uuid.NewString(), TenantID: tenant, Metadata: input.Metadata, Configuration: input.Configuration}, nil
+	return sessions.Creation{Session: sessions.Session{ID: uuid.NewString(), TenantID: tenant, Metadata: input.Metadata, Configuration: input.Configuration}, Created: true}, nil
 }
 
 func (s *validationStore) CreateEnvironmentTemplate(context.Context, environmenttemplates.CreateCommand) (environmenttemplates.Template, error) {
diff --git a/services/core/internal/db/queries/environment_setup.sql b/services/core/internal/db/queries/environment_setup.sql
index 9c53690e2..cafee522c 100644
--- a/services/core/internal/db/queries/environment_setup.sql
+++ b/services/core/internal/db/queries/environment_setup.sql
@@ -5,7 +5,7 @@ INSERT INTO environment_setups (session_id, contents) VALUES ($1, $2);
 SELECT f.contents FROM sessions s LEFT JOIN environment_setups f ON s.id = f.session_id
 WHERE s.tenant_id = $1 AND s.id = $2 AND s.deleted_at IS NULL;
 
--- name: SetSessionSetupMetadata :one
+-- name: SetSessionSetupMetadata :exec
 UPDATE sessions SET configuration = jsonb_set(configuration, '{environment}',
     (configuration->'environment') || jsonb_build_object(
         'packages', sqlc.arg(packages)::jsonb,
@@ -13,4 +13,4 @@ UPDATE sessions SET configuration = jsonb_set(configuration, '{environment}',
         'plugins', sqlc.arg(plugins)::jsonb,
         'capability_directories', sqlc.arg(capability_directories)::jsonb,
         'initialization', true))
-WHERE id = $1 RETURNING *;
+WHERE id = $1;
diff --git a/services/core/internal/db/queries/initial_environment_files.sql b/services/core/internal/db/queries/initial_environment_files.sql
index df3bae7ca..38b49cefa 100644
--- a/services/core/internal/db/queries/initial_environment_files.sql
+++ b/services/core/internal/db/queries/initial_environment_files.sql
@@ -2,9 +2,9 @@
 INSERT INTO initial_environment_files (id, session_id, position, path, size_bytes, contents)
 VALUES ($1, $2, $3, $4, $5, $6);
 
--- name: SetSessionInitialFileMetadata :one
+-- name: SetSessionInitialFileMetadata :exec
 UPDATE sessions SET configuration = jsonb_set(configuration, '{environment,files}', $2::jsonb)
-WHERE id = $1 RETURNING *;
+WHERE id = $1;
 
 -- name: GetInitialEnvironmentFile :one
 SELECT f.* FROM initial_environment_files f JOIN sessions s ON s.id = f.session_id
@@ -13,6 +13,3 @@ WHERE s.tenant_id = $1 AND f.session_id = $2 AND f.position = $3 AND s.deleted_a
 -- name: GetSessionInitializationReady :one
 SELECT NOT EXISTS (SELECT 1 FROM environments e WHERE e.session_id = s.id AND e.initialization <> 'complete') AS ready
 FROM sessions s WHERE s.tenant_id = $1 AND s.id = $2;
-
--- name: LockInitialSourceFile :one
-SELECT * FROM source_files WHERE tenant_id = $1 AND id = $2 FOR SHARE;
diff --git a/services/core/internal/db/queries/source_files.sql b/services/core/internal/db/queries/source_files.sql
index 4f54fed9a..b27ad5981 100644
--- a/services/core/internal/db/queries/source_files.sql
+++ b/services/core/internal/db/queries/source_files.sql
@@ -6,6 +6,9 @@ RETURNING *;
 -- name: GetSourceFile :one
 SELECT * FROM source_files WHERE tenant_id = $1 AND id = $2;
 
+-- name: LockSourceFile :one
+SELECT * FROM source_files WHERE tenant_id = $1 AND id = $2 FOR SHARE;
+
 -- name: ListSourceFiles :many
 SELECT * FROM source_files
 WHERE tenant_id = sqlc.arg(tenant_id)
diff --git a/services/core/internal/db/sqlc/environment_setup.sql.go b/services/core/internal/db/sqlc/environment_setup.sql.go
index c72589537..3085adcc9 100644
--- a/services/core/internal/db/sqlc/environment_setup.sql.go
+++ b/services/core/internal/db/sqlc/environment_setup.sql.go
@@ -42,7 +42,7 @@ func (q *Queries) GetEnvironmentSetup(ctx context.Context, arg GetEnvironmentSet
 	return contents, err
 }
 
-const setSessionSetupMetadata = `-- name: SetSessionSetupMetadata :one
+const setSessionSetupMetadata = `-- name: SetSessionSetupMetadata :exec
 UPDATE sessions SET configuration = jsonb_set(configuration, '{environment}',
     (configuration->'environment') || jsonb_build_object(
         'packages', $2::jsonb,
@@ -50,7 +50,7 @@ UPDATE sessions SET configuration = jsonb_set(configuration, '{environment}',
         'plugins', $4::jsonb,
         'capability_directories', $5::jsonb,
         'initialization', true))
-WHERE id = $1 RETURNING id, tenant_id, engine, metadata, idempotency_key, request_hash, created_at, configuration, event_sequence, creation_request_hash, deleted_at, creator_kind, creator_id
+WHERE id = $1
 `
 
 type SetSessionSetupMetadataParams struct {
@@ -61,29 +61,13 @@ type SetSessionSetupMetadataParams struct {
 	CapabilityDirectories []byte      `json:"capability_directories"`
 }
 
-func (q *Queries) SetSessionSetupMetadata(ctx context.Context, arg SetSessionSetupMetadataParams) (Session, error) {
-	row := q.db.QueryRow(ctx, setSessionSetupMetadata,
+func (q *Queries) SetSessionSetupMetadata(ctx context.Context, arg SetSessionSetupMetadataParams) error {
+	_, err := q.db.Exec(ctx, setSessionSetupMetadata,
 		arg.ID,
 		arg.Packages,
 		arg.Skills,
 		arg.Plugins,
 		arg.CapabilityDirectories,
 	)
-	var i Session
-	err := row.Scan(
-		&i.ID,
-		&i.TenantID,
-		&i.Engine,
-		&i.Metadata,
-		&i.IdempotencyKey,
-		&i.RequestHash,
-		&i.CreatedAt,
-		&i.Configuration,
-		&i.EventSequence,
-		&i.CreationRequestHash,
-		&i.DeletedAt,
-		&i.CreatorKind,
-		&i.CreatorID,
-	)
-	return i, err
+	return err
 }
diff --git a/services/core/internal/db/sqlc/initial_environment_files.sql.go b/services/core/internal/db/sqlc/initial_environment_files.sql.go
index 051caa0c4..4a9245d68 100644
--- a/services/core/internal/db/sqlc/initial_environment_files.sql.go
+++ b/services/core/internal/db/sqlc/initial_environment_files.sql.go
@@ -79,34 +79,9 @@ func (q *Queries) GetSessionInitializationReady(ctx context.Context, arg GetSess
 	return ready, err
 }
 
-const lockInitialSourceFile = `-- name: LockInitialSourceFile :one
-SELECT id, tenant_id, filename, purpose, body_oid, size_bytes, sha256, created_at FROM source_files WHERE tenant_id = $1 AND id = $2 FOR SHARE
-`
-
-type LockInitialSourceFileParams struct {
-	TenantID pgtype.UUID `json:"tenant_id"`
-	ID       pgtype.UUID `json:"id"`
-}
-
-func (q *Queries) LockInitialSourceFile(ctx context.Context, arg LockInitialSourceFileParams) (SourceFile, error) {
-	row := q.db.QueryRow(ctx, lockInitialSourceFile, arg.TenantID, arg.ID)
-	var i SourceFile
-	err := row.Scan(
-		&i.ID,
-		&i.TenantID,
-		&i.Filename,
-		&i.Purpose,
-		&i.BodyOid,
-		&i.SizeBytes,
-		&i.Sha256,
-		&i.CreatedAt,
-	)
-	return i, err
-}
-
-const setSessionInitialFileMetadata = `-- name: SetSessionInitialFileMetadata :one
+const setSessionInitialFileMetadata = `-- name: SetSessionInitialFileMetadata :exec
 UPDATE sessions SET configuration = jsonb_set(configuration, '{environment,files}', $2::jsonb)
-WHERE id = $1 RETURNING id, tenant_id, engine, metadata, idempotency_key, request_hash, created_at, configuration, event_sequence, creation_request_hash, deleted_at, creator_kind, creator_id
+WHERE id = $1
 `
 
 type SetSessionInitialFileMetadataParams struct {
@@ -114,23 +89,7 @@ type SetSessionInitialFileMetadataParams struct {
 	Column2 []byte      `json:"column_2"`
 }
 
-func (q *Queries) SetSessionInitialFileMetadata(ctx context.Context, arg SetSessionInitialFileMetadataParams) (Session, error) {
-	row := q.db.QueryRow(ctx, setSessionInitialFileMetadata, arg.ID, arg.Column2)
-	var i Session
-	err := row.Scan(
-		&i.ID,
-		&i.TenantID,
-		&i.Engine,
-		&i.Metadata,
-		&i.IdempotencyKey,
-		&i.RequestHash,
-		&i.CreatedAt,
-		&i.Configuration,
-		&i.EventSequence,
-		&i.CreationRequestHash,
-		&i.DeletedAt,
-		&i.CreatorKind,
-		&i.CreatorID,
-	)
-	return i, err
+func (q *Queries) SetSessionInitialFileMetadata(ctx context.Context, arg SetSessionInitialFileMetadataParams) error {
+	_, err := q.db.Exec(ctx, setSessionInitialFileMetadata, arg.ID, arg.Column2)
+	return err
 }
diff --git a/services/core/internal/db/sqlc/source_files.sql.go b/services/core/internal/db/sqlc/source_files.sql.go
index e4f0700be..1876c9d21 100644
--- a/services/core/internal/db/sqlc/source_files.sql.go
+++ b/services/core/internal/db/sqlc/source_files.sql.go
@@ -151,3 +151,28 @@ func (q *Queries) ListSourceFiles(ctx context.Context, arg ListSourceFilesParams
 	}
 	return items, nil
 }
+
+const lockSourceFile = `-- name: LockSourceFile :one
+SELECT id, tenant_id, filename, purpose, body_oid, size_bytes, sha256, created_at FROM source_files WHERE tenant_id = $1 AND id = $2 FOR SHARE
+`
+
+type LockSourceFileParams struct {
+	TenantID pgtype.UUID `json:"tenant_id"`
+	ID       pgtype.UUID `json:"id"`
+}
+
+func (q *Queries) LockSourceFile(ctx context.Context, arg LockSourceFileParams) (SourceFile, error) {
+	row := q.db.QueryRow(ctx, lockSourceFile, arg.TenantID, arg.ID)
+	var i SourceFile
+	err := row.Scan(
+		&i.ID,
+		&i.TenantID,
+		&i.Filename,
+		&i.Purpose,
+		&i.BodyOid,
+		&i.SizeBytes,
+		&i.Sha256,
+		&i.CreatedAt,
+	)
+	return i, err
+}
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index 34ac69f46..a0cde3cd0 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -65,8 +65,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 	}{{"Kill_no_delivery", false, false}, {"KillCompute_no_delivery", true, false}, {"Kill_live_delivery", false, true}, {"KillCompute_live_delivery", true, true}} {
 		t.Run(scenario.name, func(t *testing.T) {
 			checkpoint := scenario.checkpoint
-			s, leased, deployments, reader, pool := resetManagerStoreDB(t, nil)
-			writer := leased.Store
+			leased, deployments, reader, pool := resetManagerDB(t, nil)
 			installation := initializeE2BDeployment(t, leased)
 			projectID := uuid.NewString()
 			audit := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "fixture-admin", ProjectID: projectID, RequestID: uuid.NewString(), TraceID: uuid.NewString()})
@@ -78,10 +77,12 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			session, err := s.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "fixture"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`), ModelProvider: &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://model.fixture.example/v1", APIKey: "fixture-key"}, ModelProviderSource: v1.ModelProviderSourceSession})
+			_, service := testSessions(t, pool, testCredentialCipher(t))
+			created, err := service.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "fixture"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`), ModelProvider: &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://model.fixture.example/v1", APIKey: "fixture-key"}, ModelProviderSource: v1.ModelProviderSourceSession})
 			if err != nil {
 				t.Fatal(err)
 			}
+			session := created.Session
 			secret := uuid.NewString()
 			key := deployment.AllocationKey{TenantID: project.TenantID, EnvironmentID: session.Environment.ID}
 			owner, err := leased.Deployment.ReserveAllocation(t.Context(), key, installation, runtimedevice.HashCredential(secret))
@@ -92,7 +93,6 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			_, service := testSessions(t, pool, nil)
 			inputs, err := service.SubmitInputs(t.Context(), project.TenantID, session.ID, "start", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"run"}`)}})
 			if err != nil {
 				t.Fatal(err)
@@ -171,7 +171,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 					t.Fatal("Kill bypassed durable cleanup ownership", allocation, err)
 				}
 			}}
-			lifecycle := &runtimeLifecycle{store: writer, sessions: sessionReader, sessionExecution: leased.Sessions, deployment: leased.Deployment, deployments: deployments, reader: reader, lease: leased.Lease, registry: registry, config: RuntimeProvider{InstallationID: installation, Provider: provider}, connections: map[string]*runtimeConnection{}}
+			lifecycle := &runtimeLifecycle{sessions: sessionReader, sessionExecution: leased.Sessions, deployment: leased.Deployment, deployments: deployments, reader: reader, lease: leased.Lease, registry: registry, config: RuntimeProvider{InstallationID: installation, Provider: provider}, connections: map[string]*runtimeConnection{}}
 			if checkpoint {
 				lifecycle.config.Provider = waitingCleanupCheckpoint{beforeKill: provider.beforeKill}
 			}
diff --git a/services/core/internal/execution/deployment_provider_observations_test.go b/services/core/internal/execution/deployment_provider_observations_test.go
index d8a45d3e4..d2b3c7539 100644
--- a/services/core/internal/execution/deployment_provider_observations_test.go
+++ b/services/core/internal/execution/deployment_provider_observations_test.go
@@ -18,13 +18,11 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 type finishObservationFixture struct {
-	s          *store.Store
 	execution  *sessions.ExecutionOperations
 	lease      Ownership
 	pool       *pgxpool.Pool
@@ -37,7 +35,7 @@ type finishObservationFixture struct {
 func newFinishObservationFixture(t *testing.T, maxConnections int32) finishObservationFixture {
 	t.Helper()
 	var cfg *pgxpool.Config
-	s, owner, _, _ := resetManagerStoreConfig(t, func(c *pgxpool.Config) {
+	owner, _, _ := resetManagerConfig(t, func(c *pgxpool.Config) {
 		if maxConnections > 0 {
 			c.MaxConns = maxConnections
 		}
@@ -70,7 +68,8 @@ func newFinishObservationFixture(t *testing.T, maxConnections int32) finishObser
 	model, harness := "fixture-model", "codex"
 	input := sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "fixture"}, Engine: harness, IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"fixture-model"},"environment":{"type":"none"}}`), ModelProvider: snapshot.Provider, ModelProviderSource: "deployment", DeploymentProviderRevision: snapshot.Revision,
 		ExecutionConfiguration: &v1.SessionExecutionConfiguration{Model: v1.ExecutionSelection{Value: &model, Source: "session"}, Harness: v1.ExecutionSelection{Value: &harness, Source: "deployment"}, ModelProvider: v1.ExecutionProviderSelection{Source: "deployment"}}}
-	session, err := s.CreateSession(t.Context(), tenant, input)
+	_, sessionService := testSessions(t, pool, cipher)
+	created, err := sessionService.CreateSession(t.Context(), tenant, input)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -78,7 +77,7 @@ func newFinishObservationFixture(t *testing.T, maxConnections int32) finishObser
 	if err != nil {
 		t.Fatal(err)
 	}
-	return finishObservationFixture{s, owner.Sessions, owner.Lease, pool, defaults, tenant, session, *dispatcher}
+	return finishObservationFixture{owner.Sessions, owner.Lease, pool, defaults, tenant, created.Session, *dispatcher}
 }
 func (f finishObservationFixture) start(t *testing.T) sessions.InputReceipt {
 	t.Helper()
diff --git a/services/core/internal/execution/dispatcher.go b/services/core/internal/execution/dispatcher.go
index d1e06b423..7a1545402 100644
--- a/services/core/internal/execution/dispatcher.go
+++ b/services/core/internal/execution/dispatcher.go
@@ -14,7 +14,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
@@ -33,7 +32,6 @@ type Dispatcher struct {
 	// Bind sets it from Owner.Sessions.
 	sessionExecution *sessions.ExecutionOperations
 	Policy
-	Store    *store.Store
 	Registry *runtimegateway.Registry
 	// Credentials opens the bearer tokens of authenticated MCP servers.
 	Credentials Credentials
diff --git a/services/core/internal/execution/owner.go b/services/core/internal/execution/owner.go
index e0cf459ed..fb886228a 100644
--- a/services/core/internal/execution/owner.go
+++ b/services/core/internal/execution/owner.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // Ownership is the execution lease as the Worker uses it. *pgunit.Lease implements it.
@@ -17,11 +16,10 @@ type Ownership interface {
 	Close(context.Context) error
 }
 
-// Owner is everything bound to one execution lease. Later cutovers add one explicit
-// field per domain's execution operations and delete the matching store calls.
+// Owner is everything bound to one execution lease: one field per domain's
+// execution operations.
 type Owner struct {
 	Lease      Ownership
-	Store      *store.Store                    // the remaining store execution operations, built by store.NewExecution(s, lease)
 	Deployment *deployment.ExecutionOperations // sandbox deployment changes on the lease-bound deploymentpg storage
 	Sessions   *sessions.ExecutionOperations   // Session execution operations on the lease-bound sessionpg storage
 }
@@ -29,14 +27,10 @@ type Owner struct {
 // Bind returns a copy of d bound to owner's execution operations. StartWorker
 // binds through it; a Dispatcher that runs Turns outside a Worker binds the same way.
 func (d *Dispatcher) Bind(owner Owner) (*Dispatcher, error) {
-	if owner.Store == nil {
-		return nil, errors.New("execution requires the execution Store")
-	}
 	if owner.Sessions == nil {
 		return nil, errors.New("execution requires the Session execution operations")
 	}
 	owned := *d
-	owned.Store = owner.Store
 	owned.sessionExecution = owner.Sessions
 	return &owned, nil
 }
diff --git a/services/core/internal/execution/owner_test.go b/services/core/internal/execution/owner_test.go
index d62f6e18f..57d676ee9 100644
--- a/services/core/internal/execution/owner_test.go
+++ b/services/core/internal/execution/owner_test.go
@@ -57,7 +57,7 @@ func (l *closeCountingLease) Close(ctx context.Context) error {
 // to start. Any call through them panics.
 func unusedSessions(t *testing.T) (*sessions.Service, sessions.Reader) {
 	t.Helper()
-	service, err := sessions.NewService(struct{ sessions.Storage }{})
+	service, err := sessions.NewService(struct{ sessions.Storage }{}, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -102,46 +102,40 @@ func TestStartWorkerFailureClosesLeaseOnce(t *testing.T) {
 			return err
 		},
 		"missing deployment reader": func(t *testing.T, lease *closeCountingLease) error {
-			_, _, deployments, _ := resetManagerStore(t)
+			_, deployments, _ := resetManager(t)
 			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments}, Owner{Lease: lease})
 			return err
 		},
 		"missing Session service": func(t *testing.T, lease *closeCountingLease) error {
-			_, _, deployments, deploymentReader := resetManagerStore(t)
+			_, deployments, deploymentReader := resetManager(t)
 			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader}, Owner{Lease: lease})
 			return err
 		},
 		"missing Session reader": func(t *testing.T, lease *closeCountingLease) error {
-			_, _, deployments, deploymentReader := resetManagerStore(t)
+			_, deployments, deploymentReader := resetManager(t)
 			service, _ := unusedSessions(t)
 			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service}, Owner{Lease: lease})
 			return err
 		},
-		"missing Store": func(t *testing.T, lease *closeCountingLease) error {
-			_, _, deployments, deploymentReader := resetManagerStore(t)
-			service, reader := unusedSessions(t)
-			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Lease: lease})
-			return err
-		},
 		"missing Session operations": func(t *testing.T, lease *closeCountingLease) error {
-			_, owner, deployments, deploymentReader := resetManagerStore(t)
+			_, deployments, deploymentReader := resetManager(t)
 			service, reader := unusedSessions(t)
-			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Lease: lease, Store: owner.Store})
+			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Lease: lease})
 			return err
 		},
 		"missing deployment": func(t *testing.T, lease *closeCountingLease) error {
-			_, owner, deployments, deploymentReader := resetManagerStore(t)
+			owner, deployments, deploymentReader := resetManager(t)
 			service, reader := unusedSessions(t)
-			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Lease: lease, Store: owner.Store, Sessions: owner.Sessions})
+			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Lease: lease, Sessions: owner.Sessions})
 			return err
 		},
 		"deployment claim": func(t *testing.T, lease *closeCountingLease) error {
-			s, owner, deployments, deploymentReader := resetManagerStore(t)
+			owner, deployments, deploymentReader := resetManager(t)
 			lease.inner = owner.Lease
 			id := uuid.NewString()
 			service, reader := unusedSessions(t)
-			dispatcher := &Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil })}
-			_, err := StartWorker(canceled, dispatcher, Owner{Lease: lease, Store: owner.Store, Deployment: owner.Deployment, Sessions: owner.Sessions})
+			dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil })}
+			_, err := StartWorker(canceled, dispatcher, Owner{Lease: lease, Deployment: owner.Deployment, Sessions: owner.Sessions})
 			if ping := owner.Lease.CheckOwnership(t.Context()); !errors.Is(ping, pgunit.ErrLeaseClosed) {
 				t.Error("failed start kept the database lease", ping)
 			}
@@ -162,10 +156,10 @@ func TestStartWorkerFailureClosesLeaseOnce(t *testing.T) {
 }
 
 func TestStartWorkerChecksDeploymentAfterItsDependencies(t *testing.T) {
-	_, owner, deployments, deploymentReader := resetManagerStore(t)
+	owner, deployments, deploymentReader := resetManager(t)
 	credentials, observer := &recordingCredentials{}, unusedObserver{t}
 	service, reader := unusedSessions(t)
-	bound := Owner{Store: owner.Store, Sessions: owner.Sessions}
+	bound := Owner{Sessions: owner.Sessions}
 	for _, test := range []struct {
 		name       string
 		dispatcher Dispatcher
@@ -178,8 +172,7 @@ func TestStartWorkerChecksDeploymentAfterItsDependencies(t *testing.T) {
 		{"missing deployment reader", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments}, bound, "execution worker requires the deployment reader"},
 		{"missing Session service", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader}, bound, "execution worker requires the Session service"},
 		{"missing Session reader", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service}, bound, "execution worker requires the Session reader"},
-		{"missing Store", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Sessions: owner.Sessions}, "execution requires the execution Store"},
-		{"missing Session operations", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Store: owner.Store}, "execution requires the Session execution operations"},
+		{"missing Session operations", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{}, "execution requires the Session execution operations"},
 		{"missing deployment", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, bound, "execution worker requires the deployment execution operations"},
 	} {
 		t.Run(test.name, func(t *testing.T) {
@@ -195,13 +188,13 @@ func TestStartWorkerChecksDeploymentAfterItsDependencies(t *testing.T) {
 }
 
 func TestWorkerRunClosesLeaseAfterDrain(t *testing.T) {
-	s, owner, deployments, deploymentReader, pool := resetManagerStoreDB(t, nil)
+	owner, deployments, deploymentReader, pool := resetManagerDB(t, nil)
 	lease := &closeCountingLease{t: t, inner: owner.Lease}
 	id := uuid.NewString()
 	// The Worker's first reconciliation scans the Session work.
 	reader, service := testSessions(t, pool, nil)
-	dispatcher := &Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil })}
-	worker, err := StartWorker(t.Context(), dispatcher, Owner{Lease: lease, Store: owner.Store, Deployment: owner.Deployment, Sessions: owner.Sessions})
+	dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil })}
+	worker, err := StartWorker(t.Context(), dispatcher, Owner{Lease: lease, Deployment: owner.Deployment, Sessions: owner.Sessions})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/execution/runtime_lifecycle.go b/services/core/internal/execution/runtime_lifecycle.go
index 54713e6d8..d6ca1b27c 100644
--- a/services/core/internal/execution/runtime_lifecycle.go
+++ b/services/core/internal/execution/runtime_lifecycle.go
@@ -17,7 +17,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // RuntimeProvider binds one deployment to one sandbox installation.
@@ -42,7 +41,6 @@ type RuntimeProvider struct {
 }
 
 type runtimeLifecycle struct {
-	store            *store.Store
 	sessions         sessions.Reader
 	sessionExecution *sessions.ExecutionOperations
 	// deployment runs the allocation mutations on the lease; deployments and
@@ -83,7 +81,7 @@ func newRuntimeManager(owner Owner, deployments *deployment.Service, deploymentR
 		}
 	}
 	ctx, stop := context.WithCancel(context.Background())
-	return &runtimeManager{store: owner.Store, sessions: sessionReader, sessionExecution: owner.Sessions, deployment: owner.Deployment, deploymentService: deployments, deploymentReader: deploymentReader, lease: owner.Lease, registry: registry, config: copied, setupInstallationID: config.InstallationID, loadDeployment: config.loadDeployment, prepareDeployment: config.prepareDeployment, publishUnconfigured: config.PublishUnconfigured, setupGate: make(chan struct{}, 1), mutationGate: make(chan struct{}, 1), ctx: ctx, cancel: stop, nodes: make(map[string]*runtimeNode), failed: make(chan error, 1), inventory: make(chan struct{}, 1)}, nil
+	return &runtimeManager{sessions: sessionReader, sessionExecution: owner.Sessions, deployment: owner.Deployment, deploymentService: deployments, deploymentReader: deploymentReader, lease: owner.Lease, registry: registry, config: copied, setupInstallationID: config.InstallationID, loadDeployment: config.loadDeployment, prepareDeployment: config.prepareDeployment, publishUnconfigured: config.PublishUnconfigured, setupGate: make(chan struct{}, 1), mutationGate: make(chan struct{}, 1), ctx: ctx, cancel: stop, nodes: make(map[string]*runtimeNode), failed: make(chan error, 1), inventory: make(chan struct{}, 1)}, nil
 }
 
 func validatedRuntimeProvider(config *RuntimeProvider, registry *runtimegateway.Registry) (RuntimeProvider, error) {
diff --git a/services/core/internal/execution/runtime_manager.go b/services/core/internal/execution/runtime_manager.go
index e2871bde3..68cae6b9e 100644
--- a/services/core/internal/execution/runtime_manager.go
+++ b/services/core/internal/execution/runtime_manager.go
@@ -10,7 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // runtimeManager owns node membership, not provider operations. Each registered
@@ -18,7 +17,6 @@ import (
 var errRuntimeTransition = fmt.Errorf("%w: sandbox configuration is changing", ErrExecutionUnavailable)
 
 type runtimeManager struct {
-	store               *store.Store
 	sessions            sessions.Reader
 	sessionExecution    *sessions.ExecutionOperations
 	deployment          *deployment.ExecutionOperations
@@ -89,7 +87,7 @@ func (m *runtimeManager) node(id string) (*runtimeNode, error) {
 	if n == nil {
 		ctx, stop := context.WithCancel(m.ctx)
 		n = &runtimeNode{lifecycle: &runtimeLifecycle{
-			store: m.store, sessions: m.sessions, sessionExecution: m.sessionExecution,
+			sessions: m.sessions, sessionExecution: m.sessionExecution,
 			deployment: m.deployment, deployments: m.deploymentService, reader: m.deploymentReader,
 			lease: m.lease, registry: m.registry, config: m.config, nodeID: id,
 			gate: make(chan struct{}, 1), ctx: ctx, stop: stop,
diff --git a/services/core/internal/execution/runtime_retirement_failure_test.go b/services/core/internal/execution/runtime_retirement_failure_test.go
index 6a004fa75..f5e8e69b0 100644
--- a/services/core/internal/execution/runtime_retirement_failure_test.go
+++ b/services/core/internal/execution/runtime_retirement_failure_test.go
@@ -31,7 +31,7 @@ func TestFailedInventoryRetirementClosesAdmissionAndRetainsGate(t *testing.T) {
 			defer unblockRead()
 			owner, _, _, pool := delayedReadWriter(t, &armed, reading, releaseRead)
 			m := testRuntimeManager(t)
-			m.store, m.lease = owner.Store, owner.Lease
+			m.lease = owner.Lease
 			m.loadDeployment = func(context.Context) (*RuntimeProvider, error) { return nil, nil }
 			m.mutationGate = make(chan struct{}, 1)
 			// This fixture models an already loaded node deployment; its provider is
diff --git a/services/core/internal/execution/sandbox_deployment_drain_test.go b/services/core/internal/execution/sandbox_deployment_drain_test.go
index ddab4df33..3104220af 100644
--- a/services/core/internal/execution/sandbox_deployment_drain_test.go
+++ b/services/core/internal/execution/sandbox_deployment_drain_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/docker"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/node"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -72,7 +71,7 @@ func delayedReadWriter(t *testing.T, armed *atomic.Bool, reading chan struct{},
 		}
 	})
 	deployments, reader, operations := testDeployment(t, pool, nil, lease)
-	return Owner{Lease: lease, Store: store.NewExecution(store.New(pool), lease), Deployment: operations, Sessions: sessionExecution(t, lease)}, deployments, reader, pool
+	return Owner{Lease: lease, Deployment: operations, Sessions: sessionExecution(t, lease)}, deployments, reader, pool
 }
 
 func TestSandboxDeploymentDrainPreservesLeaseInFlightRead(t *testing.T) {
@@ -227,7 +226,7 @@ func (c *delayedCancellationContext) unblock() {
 }
 
 func TestSandboxDeploymentDrainFailureCannotReactivate(t *testing.T) {
-	_, owner, deployments, reader := resetManagerStore(t)
+	owner, deployments, reader := resetManager(t)
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
 	id := uuid.NewString()
diff --git a/services/core/internal/execution/sandbox_generations_test.go b/services/core/internal/execution/sandbox_generations_test.go
index 4ae75b9e4..32fc48961 100644
--- a/services/core/internal/execution/sandbox_generations_test.go
+++ b/services/core/internal/execution/sandbox_generations_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 func TestE2BReplacementVerifiesTwiceAndNeverPublishesFailedCommit(t *testing.T) {
-	_, owner, deployments, reader := resetManagerStore(t)
+	owner, deployments, reader := resetManager(t)
 	id := uuid.NewString()
 	if err := owner.Deployment.Claim(t.Context(), id); err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/execution/sandbox_reset_test.go b/services/core/internal/execution/sandbox_reset_test.go
index 0f5212244..9ec0bb050 100644
--- a/services/core/internal/execution/sandbox_reset_test.go
+++ b/services/core/internal/execution/sandbox_reset_test.go
@@ -21,40 +21,36 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/node"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 // The execution lease is database-scoped, so these manager tests own a database.
-// They receive the pooled Store, the Owner of its execution lease, which the
-// test closes when it ends, and the pooled deployment service and reader the
-// Worker receives beside it.
-func resetManagerStore(t *testing.T) (*store.Store, Owner, *deployment.Service, deployment.Reader) {
+// They receive the Owner of its execution lease, which the test closes when it
+// ends, and the pooled deployment service and reader the Worker receives
+// beside it.
+func resetManager(t *testing.T) (Owner, *deployment.Service, deployment.Reader) {
 	t.Helper()
-	return resetManagerStoreConfig(t, nil)
+	return resetManagerConfig(t, nil)
 }
 
-func resetManagerStoreConfig(t *testing.T, configure func(*pgxpool.Config)) (*store.Store, Owner, *deployment.Service, deployment.Reader) {
+func resetManagerConfig(t *testing.T, configure func(*pgxpool.Config)) (Owner, *deployment.Service, deployment.Reader) {
 	t.Helper()
-	s, owner, deployments, reader, _ := resetManagerStoreDB(t, configure)
-	return s, owner, deployments, reader
+	owner, deployments, reader, _ := resetManagerDB(t, configure)
+	return owner, deployments, reader
 }
 
-// resetManagerStoreDB also returns the test database, for tests that build
+// resetManagerDB also returns the test database, for tests that build
 // adapters on it.
-func resetManagerStoreDB(t *testing.T, configure func(*pgxpool.Config)) (*store.Store, Owner, *deployment.Service, deployment.Reader, *pgxpool.Pool) {
+func resetManagerDB(t *testing.T, configure func(*pgxpool.Config)) (Owner, *deployment.Service, deployment.Reader, *pgxpool.Pool) {
 	t.Helper()
 	pool := pgtest.OpenIsolated(t, configure)
-	cipher := testCredentialCipher(t)
-	s := store.NewWithCredentialCipher(pool, cipher)
-	s.SetPlacement(fixtureRules(t))
-	owner, deployments, reader := testOwner(t, pool, cipher, s)
-	return s, owner, deployments, reader, pool
+	owner, deployments, reader := testOwner(t, pool, testCredentialCipher(t))
+	return owner, deployments, reader, pool
 }
 
-// testCredentialCipher is the credential key of the Store resetManagerStoreDB
-// builds, for adapters built beside it.
+// testCredentialCipher is the credential key of the adapters these tests
+// build on one database.
 func testCredentialCipher(t *testing.T) *credentialcrypto.Cipher {
 	t.Helper()
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{8}, 32))
@@ -64,11 +60,10 @@ func testCredentialCipher(t *testing.T) *credentialcrypto.Cipher {
 	return cipher
 }
 
-// testOwner acquires the execution lease on pool and builds s's execution
-// writer and the deployment and Session execution operations on it, and the pooled
-// deployment service and reader, as cmd/server does. The lease closes when the
-// test ends.
-func testOwner(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher, s *store.Store) (Owner, *deployment.Service, deployment.Reader) {
+// testOwner acquires the execution lease on pool and builds the deployment and
+// Session execution operations on it, and the pooled deployment service and
+// reader, as cmd/server does. The lease closes when the test ends.
+func testOwner(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) (Owner, *deployment.Service, deployment.Reader) {
 	t.Helper()
 	lease, err := pgunit.AcquireLease(t.Context(), pool)
 	if err != nil {
@@ -76,7 +71,7 @@ func testOwner(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher
 	}
 	t.Cleanup(func() { _ = lease.Close(context.Background()) })
 	deployments, reader, operations := testDeployment(t, pool, cipher, lease)
-	return Owner{Lease: lease, Store: store.NewExecution(s, lease), Deployment: operations, Sessions: sessionExecution(t, lease)}, deployments, reader
+	return Owner{Lease: lease, Deployment: operations, Sessions: sessionExecution(t, lease)}, deployments, reader
 }
 
 // sessionExecution builds the Session execution operations on lease, as
@@ -91,7 +86,7 @@ func sessionExecution(t *testing.T, lease *pgunit.Lease) *sessions.ExecutionOper
 }
 
 func TestSandboxResetPageTimeoutRecoversCommittedOwner(t *testing.T) {
-	_, owner, deployments, reader := resetManagerStore(t)
+	owner, deployments, reader := resetManager(t)
 	id := initializeE2BDeployment(t, owner)
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
@@ -196,7 +191,7 @@ func initializeE2BDeployment(t *testing.T, owner Owner) string {
 }
 
 func TestSandboxResetPublishesCommittedGenerationWithoutReading(t *testing.T) {
-	_, owner, pooled, _, pool := resetManagerStoreDB(t, nil)
+	owner, pooled, _, pool := resetManagerDB(t, nil)
 	id := initializeE2BDeployment(t, owner)
 	// The manager reads the deployment through a reader that fails every read
 	// of the committed reset, so publication cannot depend on one.
@@ -283,7 +278,7 @@ func TestCommittedResetViewStopsOwnerWithoutLease(t *testing.T) {
 }
 
 func TestSandboxResetChangesReturnViewReadAfterCommit(t *testing.T) {
-	_, owner, deployments, reader := resetManagerStore(t)
+	owner, deployments, reader := resetManager(t)
 	id := initializeE2BDeployment(t, owner)
 	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }))
 	if err != nil {
diff --git a/services/core/internal/execution/sandbox_snapshot_budget_test.go b/services/core/internal/execution/sandbox_snapshot_budget_test.go
index 152df9d6d..467596e9a 100644
--- a/services/core/internal/execution/sandbox_snapshot_budget_test.go
+++ b/services/core/internal/execution/sandbox_snapshot_budget_test.go
@@ -60,7 +60,7 @@ func (d *snapshotBudget) TraceQueryEnd(ctx context.Context, _ *pgx.Conn, data pg
 
 func TestSandboxResetSnapshotFitsPageBudget(t *testing.T) {
 	budget := &snapshotBudget{t: t}
-	_, owner, deployments, reader := resetManagerStoreConfig(t, func(cfg *pgxpool.Config) {
+	owner, deployments, reader := resetManagerConfig(t, func(cfg *pgxpool.Config) {
 		cfg.ConnConfig.RuntimeParams["jit"] = "on"
 		cfg.ConnConfig.Tracer = budget
 	})
diff --git a/services/core/internal/execution/session_fixture_test.go b/services/core/internal/execution/session_fixture_test.go
index 8e6f3e322..ae02a91b6 100644
--- a/services/core/internal/execution/session_fixture_test.go
+++ b/services/core/internal/execution/session_fixture_test.go
@@ -12,11 +12,11 @@ import (
 )
 
 // testSessions builds the pooled Session adapter on pool with cipher and the
-// Session service on it, as cmd/server does.
+// Session service on it under fixtureRules, as cmd/server does.
 func testSessions(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) (*sessionpg.Store, *sessions.Service) {
 	t.Helper()
 	adapter := sessionpg.New(pgunit.NewPool(pool), cipher)
-	service, err := sessions.NewService(adapter)
+	service, err := sessions.NewService(adapter, fixtureRules(t))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/execution/worker.go b/services/core/internal/execution/worker.go
index 6ad0bcc06..2ebb2c20f 100644
--- a/services/core/internal/execution/worker.go
+++ b/services/core/internal/execution/worker.go
@@ -11,7 +11,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 const DefaultExecutionConcurrency = 4
@@ -21,7 +20,6 @@ type Worker struct {
 	concurrency         int
 	metrics             workerMetricsState
 	dispatcher          *Dispatcher
-	admission           *store.Store
 	lease               Ownership
 	directoryReads      chan directoryReadRequest
 	fileWrites          chan fileWriteRequest
@@ -76,7 +74,7 @@ func StartWorker(ctx context.Context, dispatcher *Dispatcher, owner Owner) (_ *W
 		return nil, errors.New("execution worker requires the deployment execution operations")
 	}
 	owned.notifications = &executionNotifications{}
-	worker := &Worker{concurrency: dispatcher.MaxConcurrentExecutions, dispatcher: owned, admission: dispatcher.Store, lease: owner.Lease, directoryReads: make(chan directoryReadRequest), fileWrites: make(chan fileWriteRequest), stopped: make(chan struct{}), scheduleWake: make(chan struct{}, 1), enrolledConnections: make(map[string]*runtimeConnection)}
+	worker := &Worker{concurrency: dispatcher.MaxConcurrentExecutions, dispatcher: owned, lease: owner.Lease, directoryReads: make(chan directoryReadRequest), fileWrites: make(chan fileWriteRequest), stopped: make(chan struct{}), scheduleWake: make(chan struct{}, 1), enrolledConnections: make(map[string]*runtimeConnection)}
 	worker.runtimes, err = newRuntimeManager(owner, owned.Deployment, owned.DeploymentReader, owned.SessionsReader, owned.Registry, owned.ManagedRuntimes)
 	if err != nil {
 		return nil, err
@@ -138,24 +136,14 @@ func (w *Worker) SubmitInputs(ctx context.Context, tenant, session, key string,
 	return w.admitInputs(ctx, tenant, session, key, inputs)
 }
 
-// CreateSession validates execution support before reserving or admitting initial work.
-func (w *Worker) CreateSession(ctx context.Context, tenant string, input sessions.CreateSession) (sessions.Session, error) {
-	if err := w.validateCreation(ctx, input); err != nil {
-		return sessions.Session{}, err
-	}
-	session, err := w.admission.CreateSession(ctx, tenant, input)
-	if err == nil && len(input.InitialInputs) > 0 {
-		w.wakeScheduler()
-	}
-	return session, err
-}
-
-// CreateSessionStream applies the same execution admission before creating a stream.
-func (w *Worker) CreateSessionStream(ctx context.Context, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
+// CreateSession validates execution support before the pooled Session
+// creation reserves or admits initial work, and wakes the scheduler once that
+// creation commits.
+func (w *Worker) CreateSession(ctx context.Context, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
 	if err := w.validateCreation(ctx, input); err != nil {
 		return sessions.Creation{}, err
 	}
-	creation, err := w.admission.CreateSessionStream(ctx, tenant, input)
+	creation, err := w.dispatcher.Sessions.CreateSession(ctx, tenant, input)
 	if err == nil && len(input.InitialInputs) > 0 {
 		w.wakeScheduler()
 	}
diff --git a/services/core/internal/persistence/postgres/filepg/filepg.go b/services/core/internal/persistence/postgres/filepg/filepg.go
index d9da13e9b..6bac2306c 100644
--- a/services/core/internal/persistence/postgres/filepg/filepg.go
+++ b/services/core/internal/persistence/postgres/filepg/filepg.go
@@ -157,6 +157,39 @@ func (s *Store) Read(ctx context.Context, tenantID, fileID string, consume func(
 	})
 }
 
+// ReadSourceForCopy reads, in the caller's transaction, the content of the
+// tenant's File for a copy of at most limit bytes. It holds a share lock on
+// the File until that transaction ends, so a Delete waits for the copy. A
+// malformed or missing File is files.ErrNotFound and a larger one
+// files.ErrTooLarge; content that does not match its recorded size is an
+// internal error.
+func ReadSourceForCopy(ctx context.Context, tx pgx.Tx, tenant pgtype.UUID, id string, limit int64) ([]byte, error) {
+	key, ok := files.ParseID(id)
+	if !ok {
+		return nil, files.ErrNotFound
+	}
+	row, err := sqlc.New(tx).LockSourceFile(ctx, sqlc.LockSourceFileParams{TenantID: tenant, ID: pgtype.UUID{Bytes: key, Valid: true}})
+	if err != nil {
+		return nil, rowError(err)
+	}
+	if row.SizeBytes > limit {
+		return nil, files.ErrTooLarge
+	}
+	objects := tx.LargeObjects()
+	body, err := objects.Open(ctx, row.BodyOid.Uint32, pgx.LargeObjectModeRead)
+	if err != nil {
+		return nil, err
+	}
+	content, err := io.ReadAll(io.LimitReader(body, row.SizeBytes+1))
+	if err != nil {
+		return nil, err
+	}
+	if int64(len(content)) != row.SizeBytes {
+		return nil, errors.New("stored File does not match its recorded size")
+	}
+	return content, body.Close()
+}
+
 // Delete removes the row and its large object and records the write audit in
 // one transaction.
 func (s *Store) Delete(ctx context.Context, tenantID, fileID string) error {
diff --git a/services/core/internal/persistence/postgres/filepg/filepg_test.go b/services/core/internal/persistence/postgres/filepg/filepg_test.go
index 974b6449a..806236399 100644
--- a/services/core/internal/persistence/postgres/filepg/filepg_test.go
+++ b/services/core/internal/persistence/postgres/filepg/filepg_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
@@ -352,6 +353,60 @@ func TestFileReadAdmittedBeforeDeletionCompletes(t *testing.T) {
 	}
 }
 
+// ReadSourceForCopy reads a File up to a limit in the caller's transaction
+// and holds it until that transaction ends, so a deletion waits for the copy.
+func TestReadSourceForCopy(t *testing.T) {
+	pool := pgtest.Open(t)
+	_, service := open(t, pool)
+	ctx := t.Context()
+	tenant := uuid.NewString()
+	data := []byte("copied\x00source")
+	file := create(t, service, ctx, tenant, data)
+	tenantID := pgtype.UUID{Bytes: uuid.MustParse(tenant), Valid: true}
+	tx, err := pool.Begin(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer tx.Rollback(context.Background())
+	for _, missing := range []string{"file-" + uuid.NewString(), "malformed"} {
+		if _, err := filepg.ReadSourceForCopy(ctx, tx, tenantID, missing, 100); !errors.Is(err, files.ErrNotFound) {
+			t.Fatal(missing, err)
+		}
+	}
+	if _, err := filepg.ReadSourceForCopy(ctx, tx, pgtype.UUID{Bytes: uuid.New(), Valid: true}, file.ID, 100); !errors.Is(err, files.ErrNotFound) {
+		t.Fatal("foreign File", err)
+	}
+	if _, err := filepg.ReadSourceForCopy(ctx, tx, tenantID, file.ID, int64(len(data))-1); !errors.Is(err, files.ErrTooLarge) {
+		t.Fatal("over the limit", err)
+	}
+	got, err := filepg.ReadSourceForCopy(ctx, tx, tenantID, file.ID, int64(len(data)))
+	if err != nil || !bytes.Equal(got, data) {
+		t.Fatal("copied content", err)
+	}
+	var holder int32
+	if err := tx.QueryRow(ctx, "SELECT pg_backend_pid()").Scan(&holder); err != nil {
+		t.Fatal(err)
+	}
+	deleted := make(chan error, 1)
+	go func() { deleted <- service.Delete(ctx, files.DeleteCommand{TenantID: tenant, FileID: file.ID}) }()
+	for blocked := 0; blocked == 0; {
+		if err := pool.QueryRow(ctx, "SELECT count(*) FROM pg_stat_activity WHERE $1=ANY(pg_blocking_pids(pid))", holder).Scan(&blocked); err != nil {
+			t.Fatal(err)
+		}
+		select {
+		case err := <-deleted:
+			t.Fatal("deletion did not wait for the copy", err)
+		default:
+		}
+	}
+	if err := tx.Commit(ctx); err != nil {
+		t.Fatal(err)
+	}
+	if err := <-deleted; err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestFileReadReturnsConsumerErrors(t *testing.T) {
 	store, service := open(t, pgtest.Open(t))
 	tenant := uuid.NewString()
diff --git a/services/core/internal/persistence/postgres/modelconfigurationpg/fixture_test.go b/services/core/internal/persistence/postgres/modelconfigurationpg/fixture_test.go
index 5b37c1dce..5e30ce5a2 100644
--- a/services/core/internal/persistence/postgres/modelconfigurationpg/fixture_test.go
+++ b/services/core/internal/persistence/postgres/modelconfigurationpg/fixture_test.go
@@ -19,9 +19,9 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // Deployment defaults are deployment-wide, so every test opens its own
@@ -81,11 +81,11 @@ func (f fixture) list(t *testing.T) []modelconfiguration.Configuration {
 	return configurations
 }
 
-// observed is a codex default and one Session that froze it. Store builds the
-// Session; Turns are committed rows written directly.
+// observed is a codex default and one Session that froze it. The Session
+// service builds the Session; Turns are committed rows written directly.
 type observed struct {
 	fixture
-	sessions *store.Store
+	sessions *sessions.Service
 	tenant   string
 	input    sessions.CreateSession
 	session  sessions.Session
@@ -106,19 +106,21 @@ func newObserved(t *testing.T) observed {
 			ModelProvider: v1.ExecutionProviderSelection{Source: "deployment"},
 		},
 	}
-	sessions := store.NewWithCredentialCipher(f.pool, f.cipher)
-	// cmd/server gives the store its placement rules; hosted creation needs them.
+	// Hosted creation needs placement rules, as cmd/server gives them.
 	rules, err := placement.NewRules(providers.Builtin(), "")
 	if err != nil {
 		t.Fatal(err)
 	}
-	sessions.SetPlacement(rules)
+	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(f.pool), f.cipher), rules)
+	if err != nil {
+		t.Fatal(err)
+	}
 	tenant := uuid.NewString()
-	session, err := sessions.CreateSession(t.Context(), tenant, input)
+	created, err := service.CreateSession(t.Context(), tenant, input)
 	if err != nil {
 		t.Fatal(err)
 	}
-	return observed{f, sessions, tenant, input, session}
+	return observed{f, service, tenant, input, created.Session}
 }
 
 // terminal commits a root Turn with the outcome fields the observation reads.
diff --git a/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go b/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
index 3e9047b7c..d46af31c2 100644
--- a/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
+++ b/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
@@ -90,10 +90,11 @@ func TestObservationExcludesOtherSourcesAndHistoricalSessions(t *testing.T) {
 			}
 		}
 		projection.ModelProvider = v1.ExecutionProviderSelection{Source: source, Status: "available", Configuration: input.ModelProvider.SafeView()}
-		session, err := o.sessions.CreateSession(t.Context(), o.tenant, input)
+		created, err := o.sessions.CreateSession(t.Context(), o.tenant, input)
 		if err != nil {
 			t.Fatal(source, err)
 		}
+		session := created.Session
 		var revision pgtype.UUID
 		if err = o.pool.QueryRow(t.Context(), "SELECT deployment_provider_revision FROM session_execution_configuration WHERE session_id=$1", session.ID).Scan(&revision); err != nil || revision.Valid {
 			t.Fatal("non-deployment or historical revision persisted", source, err)
diff --git a/services/core/internal/persistence/postgres/sessionpg/admin.go b/services/core/internal/persistence/postgres/sessionpg/admin.go
index e23f728f7..3896633c5 100644
--- a/services/core/internal/persistence/postgres/sessionpg/admin.go
+++ b/services/core/internal/persistence/postgres/sessionpg/admin.go
@@ -75,11 +75,11 @@ func (s *Store) ReadAdminSummary(ctx context.Context, tenantID string, filter se
 				return err
 			}
 			for _, row := range rows {
-				session, err := SessionFromRow(row.Session)
+				session, err := sessionFromRow(row.Session)
 				if err != nil {
 					return err
 				}
-				if session, err = LoadSessionActivity(ctx, q, session); err != nil {
+				if session, err = loadSessionActivity(ctx, q, session); err != nil {
 					return err
 				}
 				var creator *string
diff --git a/services/core/internal/persistence/postgres/sessionpg/artifacts.go b/services/core/internal/persistence/postgres/sessionpg/artifacts.go
index a5ec9a935..371e8a0ab 100644
--- a/services/core/internal/persistence/postgres/sessionpg/artifacts.go
+++ b/services/core/internal/persistence/postgres/sessionpg/artifacts.go
@@ -173,7 +173,7 @@ type artifactStaging struct {
 
 func (t *artifactStaging) LoadEnvironment(ctx context.Context) (sessions.Environment, error) {
 	row, err := t.q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: t.turn.TenantID, ID: t.turn.SessionID})
-	return EnvironmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
+	return environmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
 }
 
 func (t *artifactStaging) PutArtifactContent(ctx context.Context, path string, size int64, content io.Reader) error {
diff --git a/services/core/internal/persistence/postgres/sessionpg/artifacts_test.go b/services/core/internal/persistence/postgres/sessionpg/artifacts_test.go
index 0c06e8f94..30a299d63 100644
--- a/services/core/internal/persistence/postgres/sessionpg/artifacts_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/artifacts_test.go
@@ -68,7 +68,7 @@ func stagedRows(t *testing.T, pool *pgxpool.Pool, turn string) int {
 func stagingService(t *testing.T, pool *pgxpool.Pool) (*Store, *sessions.Service) {
 	t.Helper()
 	store := New(pgunit.NewPool(pool), nil)
-	service, err := sessions.NewService(store)
+	service, err := sessions.NewService(store, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/binding.go b/services/core/internal/persistence/postgres/sessionpg/binding.go
index 745e40c12..dad3703c5 100644
--- a/services/core/internal/persistence/postgres/sessionpg/binding.go
+++ b/services/core/internal/persistence/postgres/sessionpg/binding.go
@@ -116,7 +116,7 @@ func (t *SessionTx) LoadEnvironmentInput(ctx context.Context) (*sessions.Environ
 
 func (t *SessionTx) LoadEnvironment(ctx context.Context) (sessions.Environment, error) {
 	row, err := t.q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: t.tenant, ID: t.session})
-	return EnvironmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
+	return environmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
 }
 
 // RecordEnvironmentFailure fails the Environment only while it is the
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation.go b/services/core/internal/persistence/postgres/sessionpg/creation.go
new file mode 100644
index 000000000..5c3a93c57
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/creation.go
@@ -0,0 +1,256 @@
+package sessionpg
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/filepg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/placementpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/skillpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+)
+
+// modelProviderKeyPurpose keys the provider-key fingerprint in creation
+// identities. Changing it changes every stored identity.
+const modelProviderKeyPurpose = "parsar.agents-api.model-provider-api-key.v1"
+
+var _ sessions.CreationTx = (*creationTx)(nil)
+
+func (s *Store) FingerprintProviderKey(secret string) (string, error) {
+	if s.cipher == nil {
+		return "", credentialcrypto.ErrUnavailable
+	}
+	return s.cipher.Fingerprint(modelProviderKeyPurpose, secret)
+}
+
+func (s *Store) WithCreation(ctx context.Context, tenantID string, apply func(context.Context, sessions.CreationTx) error) error {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return err
+	}
+	return s.units.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		return apply(ctx, &creationTx{SessionTx: SessionTx{q: sqlc.New(tx), tenant: tenant}, tenantID: tenantID, tx: tx, cipher: s.cipher})
+	})
+}
+
+func (s *Store) FindCreation(ctx context.Context, tenantID, key string) (sessions.CreationRecord, error) {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return sessions.CreationRecord{}, err
+	}
+	row, err := s.units.Queries().FindSessionCreation(ctx, sqlc.FindSessionCreationParams{TenantID: tenant, IdempotencyKey: key})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.CreationRecord{}, sessions.ErrNotFound
+	}
+	if err != nil {
+		return sessions.CreationRecord{}, err
+	}
+	record := sessions.CreationRecord{SessionID: uuid.UUID(row.ID.Bytes).String(), Deleted: row.DeletedAt.Valid}
+	if row.CreatorKind.Valid && row.CreatorID.Valid {
+		record.Creator = &identity.Subject{Kind: row.CreatorKind.String, ID: row.CreatorID.String}
+	}
+	if row.CreationRequestHash.Valid {
+		record.IntentHash = &row.CreationRequestHash.String
+	}
+	return record, nil
+}
+
+// creationTx is a Session creation transaction. UpsertSession binds the
+// embedded SessionTx to the stored Session. tenantID is the tenant as the
+// caller named it, which binds the sealed model execution and the audit.
+type creationTx struct {
+	SessionTx
+	tenantID string
+	tx       pgx.Tx
+	cipher   *credentialcrypto.Cipher
+}
+
+func (t *creationTx) UpsertSession(ctx context.Context, session sessions.NewSession) (sessions.Creation, error) {
+	params := sqlc.CreateSessionParams{
+		ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, TenantID: t.tenant, Engine: session.Engine,
+		Metadata: session.Metadata, IdempotencyKey: session.Key, RequestHash: session.RequestHash, Configuration: session.Configuration,
+		CreatorKind: pgtype.Text{String: session.Creator.Kind, Valid: true}, CreatorID: pgtype.Text{String: session.Creator.ID, Valid: true},
+	}
+	if session.IntentHash != nil {
+		params.CreationRequestHash = pgtype.Text{String: *session.IntentHash, Valid: true}
+	}
+	row, err := t.q.CreateSession(ctx, params)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.Creation{}, sessions.ErrIdempotencyConflict
+	}
+	if err != nil {
+		return sessions.Creation{}, storable(err)
+	}
+	t.session = row.ID
+	stored, err := sessionFromRow(row)
+	return sessions.Creation{Session: stored, Created: row.ID == params.ID, Cursor: row.EventSequence}, err
+}
+
+func (t *creationTx) LockDeployment(ctx context.Context) (placement.Deployment, error) {
+	return placementpg.LockDeployment(ctx, t.q)
+}
+
+func (t *creationTx) LoadNodes(ctx context.Context) ([]placement.Node, error) {
+	return placementpg.LoadNodes(ctx, t.q)
+}
+
+func (t *creationTx) ReservePlacement(ctx context.Context, chosen placement.Placement) error {
+	return placementpg.ReservePlacement(ctx, t.q, t.session, chosen)
+}
+
+func (t *creationTx) LockSkills(ctx context.Context, ids []string) (map[string]skills.Skill, error) {
+	locked, err := skillpg.LockSkills(ctx, t.q, t.tenant, ids)
+	return locked, skillError(err)
+}
+
+func (t *creationTx) ReadSkillVersion(ctx context.Context, skill string, version int64) (skills.Content, error) {
+	content, err := skillpg.ReadVersionForFreeze(ctx, t.q, t.cipher, t.tenant, skill, version)
+	return content, skillError(err)
+}
+
+// skillError translates a missing Skill or version into the Session error.
+func skillError(err error) error {
+	if errors.Is(err, skills.ErrNotFound) {
+		return sessions.ErrNotFound
+	}
+	return err
+}
+
+func (t *creationTx) SaveModelExecution(ctx context.Context, provider v1.ModelProviderInput) error {
+	if t.cipher == nil {
+		return credentialcrypto.ErrUnavailable
+	}
+	raw, err := json.Marshal(provider)
+	if err != nil {
+		return err
+	}
+	encrypted, err := t.cipher.SealModelExecution(raw, t.tenantID, optionalID(t.session))
+	if err != nil {
+		return fmt.Errorf("seal session model execution: %w", err)
+	}
+	return t.q.SaveSessionModelExecution(ctx, sqlc.SaveSessionModelExecutionParams{SessionID: t.session, EncryptedConfig: encrypted})
+}
+
+func (t *creationTx) SaveExecutionConfiguration(ctx context.Context, projection v1.SessionExecutionConfiguration, revision uuid.UUID) error {
+	configuration, err := json.Marshal(projection)
+	if err != nil {
+		return err
+	}
+	params := sqlc.SaveSessionExecutionConfigurationParams{SessionID: t.session, Configuration: configuration}
+	if revision != uuid.Nil {
+		params.DeploymentProviderRevision = pgtype.UUID{Bytes: revision, Valid: true}
+	}
+	return storable(t.q.SaveSessionExecutionConfiguration(ctx, params))
+}
+
+func (t *creationTx) SaveInitialFiles(ctx context.Context, initial []environmentconfig.InitialFile) error {
+	if t.cipher == nil {
+		return credentialcrypto.ErrUnavailable
+	}
+	metadata := environmentconfig.InitialFilesMetadata(initial)
+	for i, f := range initial {
+		body := f.Data
+		if f.Type == "file_id" {
+			var err error
+			body, err = filepg.ReadSourceForCopy(ctx, t.tx, t.tenant, f.FileID, environmentconfig.MaxInitialFileBytes)
+			switch {
+			case errors.Is(err, files.ErrNotFound):
+				return sessions.ErrNotFound
+			case errors.Is(err, files.ErrTooLarge):
+				return sessions.ErrInvalidInput
+			case err != nil:
+				return err
+			}
+		}
+		id := uuid.New()
+		size := int64(len(body))
+		metadata[i].ID = id.String()
+		metadata[i].SizeBytes = &size
+		encrypted, err := t.cipher.SealEnvironmentFile(body, fileBinding(t.tenant, t.session, id.String()))
+		if err != nil {
+			return fmt.Errorf("seal initial file: %w", err)
+		}
+		if err := t.q.CreateInitialEnvironmentFile(ctx, sqlc.CreateInitialEnvironmentFileParams{
+			ID: pgtype.UUID{Bytes: id, Valid: true}, SessionID: t.session, Position: int32(i), Path: f.Path, SizeBytes: size, Contents: encrypted,
+		}); err != nil {
+			return storable(err)
+		}
+	}
+	encoded, err := json.Marshal(metadata)
+	if err != nil {
+		return err
+	}
+	return storable(t.q.SetSessionInitialFileMetadata(ctx, sqlc.SetSessionInitialFileMetadataParams{ID: t.session, Column2: encoded}))
+}
+
+func (t *creationTx) SaveSetup(ctx context.Context, setup environmentconfig.Setup) error {
+	if t.cipher == nil {
+		return credentialcrypto.ErrUnavailable
+	}
+	plaintext, err := json.Marshal(setup)
+	if err != nil {
+		return err
+	}
+	encrypted, err := t.cipher.SealEnvironmentSetup(plaintext, setupBinding(t.tenant, t.session))
+	if err != nil {
+		return fmt.Errorf("seal environment setup: %w", err)
+	}
+	if err := t.q.CreateEnvironmentSetup(ctx, sqlc.CreateEnvironmentSetupParams{SessionID: t.session, Contents: encrypted}); err != nil {
+		return err
+	}
+	params := sqlc.SetSessionSetupMetadataParams{ID: t.session}
+	for _, field := range []struct {
+		target *[]byte
+		value  any
+	}{
+		{&params.Packages, setup.PackageMetadata()},
+		{&params.Skills, setup.SkillMetadata()},
+		{&params.Plugins, setup.PluginMetadata()},
+		{&params.CapabilityDirectories, append([]string{}, setup.CapabilityDirectories...)},
+	} {
+		if *field.target, err = json.Marshal(field.value); err != nil {
+			return err
+		}
+	}
+	return storable(t.q.SetSessionSetupMetadata(ctx, params))
+}
+
+func (t *creationTx) CreateEnvironment(ctx context.Context) (string, error) {
+	id := uuid.New()
+	if err := t.q.CreateEnvironment(ctx, sqlc.CreateEnvironmentParams{ID: pgtype.UUID{Bytes: id, Valid: true}, SessionID: t.session}); err != nil {
+		return "", err
+	}
+	return id.String(), nil
+}
+
+func (t *creationTx) PruneChanges(ctx context.Context) error {
+	return PruneChanges(ctx, t.q, t.session)
+}
+
+func (t *creationTx) AuditCreation(ctx context.Context, created ...writeaudit.Resource) error {
+	return auditpg.RecordWriteAudit(ctx, t.q, t.tenantID, "create", "session", optionalID(t.session), "", created...)
+}
+
+func (t *creationTx) LoadSession(ctx context.Context) (sessions.Session, error) {
+	session, _, err := loadSession(ctx, t.q, t.tenant, t.session)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return sessions.Session{}, sessions.ErrNotFound
+	}
+	return session, err
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation_test.go b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
new file mode 100644
index 000000000..1b857bb00
--- /dev/null
+++ b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
@@ -0,0 +1,651 @@
+package sessionpg
+
+import (
+	"archive/zip"
+	"bytes"
+	"context"
+	"crypto/sha256"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"reflect"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/filepg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/skillpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+)
+
+var creator = identity.Subject{Kind: "service_account", ID: "test-runner"}
+
+var hostedConfiguration = json.RawMessage(`{"agent":{"model":"m"},"environment":{"type":"openai_hosted"}}`)
+
+// creationService returns the Session store and service over pool with the
+// built-in placement rules.
+func creationService(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) (*Store, *sessions.Service) {
+	t.Helper()
+	rules, err := placement.NewRules(providers.Builtin(), "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	store := New(pgunit.NewPool(pool), cipher)
+	service, err := sessions.NewService(store, rules)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return store, service
+}
+
+func skillService(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) *skills.Service {
+	t.Helper()
+	store := skillpg.New(pgunit.NewPool(pool), cipher)
+	service, err := skills.NewService(store, store)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return service
+}
+
+func skillArchive(t *testing.T, name, marker string) []byte {
+	t.Helper()
+	var buffer bytes.Buffer
+	writer := zip.NewWriter(&buffer)
+	file, err := writer.CreateHeader(&zip.FileHeader{Name: name + "/SKILL.md", Method: zip.Store})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err = fmt.Fprintf(file, "---\nname: %s\ndescription: A proof.\n---\n%s\n", name, marker); err != nil {
+		t.Fatal(err)
+	}
+	if err = writer.Close(); err != nil {
+		t.Fatal(err)
+	}
+	return buffer.Bytes()
+}
+
+func skillKey(t *testing.T, id string) uuid.UUID {
+	t.Helper()
+	key, err := skills.ParseID(id)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return key
+}
+
+func sameJSON(t *testing.T, a, b any) bool {
+	t.Helper()
+	left, err := json.Marshal(a)
+	if err != nil {
+		t.Fatal(err)
+	}
+	right, err := json.Marshal(b)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return bytes.Equal(left, right)
+}
+
+func countRows(t *testing.T, pool *pgxpool.Pool, query string, args ...any) int {
+	t.Helper()
+	var count int
+	if err := pool.QueryRow(t.Context(), query, args...).Scan(&count); err != nil {
+		t.Fatal(err)
+	}
+	return count
+}
+
+// awaitWaiters waits until count backends queue, directly or not, behind
+// holder's lock.
+func awaitWaiters(t *testing.T, pool *pgxpool.Pool, holder int32, count int) {
+	t.Helper()
+	deadline := time.Now().Add(10 * time.Second)
+	for countRows(t, pool, `WITH RECURSIVE queued(pid) AS (
+ SELECT $1::int UNION SELECT a.pid FROM pg_stat_activity a JOIN queued q ON q.pid = ANY(pg_blocking_pids(a.pid))
+) SELECT count(*) - 1 FROM queued`, holder) < count {
+		if time.Now().After(deadline) {
+			t.Fatal("lock waiters", count)
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+}
+
+// Concurrent creations of one intent under one key from two pools, each
+// resolved to its own configuration, create one Session with the winner's
+// configuration and a cursor before its initial input. A retry after the Turn
+// completed and a later Turn ran returns the current Session without
+// submitting the input again.
+func TestCreationRetriesNeverReplayInitialInput(t *testing.T) {
+	pool := pgtest.Open(t)
+	store, service := creationService(t, pool, nil)
+	_, other := creationService(t, pgtest.Open(t), nil)
+	ctx := t.Context()
+	tenant := uuid.NewString()
+	input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "initial", CreationRequest: json.RawMessage(`{"agent_id":"source"}`), InitialInputs: []sessions.Input{messageInput("first"), messageInput("second")}}
+	const count = 8
+	var wg sync.WaitGroup
+	results := make(chan sessions.Creation, count)
+	for i := range count {
+		wg.Go(func() {
+			creating := service
+			if i%2 == 0 {
+				creating = other
+			}
+			resolved := input
+			resolved.Configuration = json.RawMessage(fmt.Sprintf(`{"resolved":%d}`, i))
+			result, err := creating.CreateSession(ctx, tenant, resolved)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			results <- result
+		})
+	}
+	wg.Wait()
+	close(results)
+	var created []sessions.Creation
+	id, configuration := "", json.RawMessage(nil)
+	for result := range results {
+		if id == "" {
+			id, configuration = result.Session.ID, result.Session.Configuration
+		}
+		if result.Session.ID != id || !bytes.Equal(result.Session.Configuration, configuration) || result.Session.LastTurn == nil {
+			t.Fatal("creation retry diverged", result)
+		}
+		if result.Created {
+			created = append(created, result)
+		}
+	}
+	if len(created) != 1 || created[0].Cursor != 0 || created[0].Session.LastTurn.Status != sessions.TurnQueued {
+		t.Fatal("one creation starts before its inputs", created)
+	}
+	events, err := store.ListSessionEvents(ctx, tenant, id, created[0].Cursor)
+	if err != nil || !reflect.DeepEqual(kinds(events), []string{"agent.session.turn.created", "agent.session.turn.item.added", "agent.session.in_progress", "agent.session.turn.item.added"}) {
+		t.Fatal("initial input events", kinds(events), err)
+	}
+	inputs, err := store.ListTurnInputs(ctx, tenant, id, created[0].Session.LastTurn.ID, 0, 100)
+	if err != nil || len(inputs) != 2 || !strings.Contains(string(inputs[0].Payload), "first") || !strings.Contains(string(inputs[1].Payload), "second") {
+		t.Fatal("initial inputs", inputs, err)
+	}
+	// The creation returns the projection a read and a stream snapshot see.
+	read, err := store.GetSession(ctx, tenant, id)
+	if err != nil || !sameJSON(t, created[0].Session, read) {
+		t.Fatal("creation projection differs from the Session read", err)
+	}
+	if snapshot, cursor, err := store.SessionStreamSnapshot(ctx, tenant, id); err != nil || !sameJSON(t, snapshot, read) || cursor != events[len(events)-1].Sequence {
+		t.Fatal("stream snapshot", cursor, err)
+	}
+	if _, _, err := store.SessionStreamSnapshot(ctx, uuid.NewString(), id); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatal("foreign stream snapshot", err)
+	}
+	tenantID, sessionID := pgID(uuid.MustParse(tenant)), pgID(uuid.MustParse(id))
+	first := created[0].Session.LastTurn.ID
+	move(t, pool, tenantID, sessionID, first, sessions.TurnQueued, sessions.TurnInProgress)
+	move(t, pool, tenantID, sessionID, first, sessions.TurnInProgress, sessions.TurnCompleted)
+	// The ended Turn's idle snapshot is recorded as settled.
+	if ended, err := store.ListSessionEvents(ctx, tenant, id, events[len(events)-1].Sequence); err != nil || len(ended) == 0 || ended[len(ended)-1].Event.Type != "agent.session.idle" || !ended[len(ended)-1].Settled {
+		t.Fatal("terminal idle is not settled", kinds(ended), err)
+	}
+	// The creation key at the events endpoint is an independent request.
+	later := submitMessage(t, service, tenantID, sessionID, input.IdempotencyKey)
+	all, err := store.ListSessionEvents(ctx, tenant, id, 0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	retry, err := service.CreateSession(ctx, tenant, input)
+	if err != nil || retry.Created || retry.Session.ID != id || !bytes.Equal(retry.Session.Configuration, configuration) || retry.Session.LastTurn.ID != later.TurnID || retry.Cursor != all[len(all)-1].Sequence {
+		t.Fatal("retry after later Turn", retry, err)
+	}
+	if after, err := store.ListSessionEvents(ctx, tenant, id, retry.Cursor); err != nil || len(after) != 0 {
+		t.Fatal("retry replayed initial input", kinds(after), err)
+	}
+	if turns := countRows(t, pool, "SELECT count(*) FROM turns WHERE session_id=$1", id); turns != 2 {
+		t.Fatal("retry created a Turn", turns)
+	}
+	foreign, err := service.CreateSession(ctx, uuid.NewString(), input)
+	if err != nil || !foreign.Created || foreign.Session.ID == id {
+		t.Fatal("tenant creation keys collided", foreign, err)
+	}
+}
+
+// A stored intent hash identifies the creation whatever the request resolved
+// to, and a changed intent conflicts at both lookup and upsert; a Session
+// without one falls back to its request hash and is never given one. Another
+// creator, a Session without a complete creator and a deleted Session conflict
+// at both lookup and upsert, and of two creators racing for one key exactly
+// one creates.
+func TestCreationIdentity(t *testing.T) {
+	pool := pgtest.Open(t)
+	_, service := creationService(t, pool, nil)
+	ctx := t.Context()
+	tenant := uuid.NewString()
+	request := json.RawMessage(`{"agent_id":"source","agent":{"tools":[{"parameters":{"const":9007199254740993}}]}}`)
+	input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "intent", CreationRequest: request, Configuration: json.RawMessage(`{"resolved":1}`)}
+	first, err := service.CreateSession(ctx, tenant, input)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resolved := input
+	resolved.Configuration = json.RawMessage(`{"resolved":2}`)
+	if retry, err := service.CreateSession(ctx, tenant, resolved); err != nil || retry.Created || retry.Session.ID != first.Session.ID || !bytes.Equal(retry.Session.Configuration, first.Session.Configuration) {
+		t.Fatal("intent retry", retry, err)
+	}
+	reordered := json.RawMessage(`{"agent":{"tools":[{"parameters":{"const":9007199254740993}}]},"agent_id":"source"}`)
+	if found, err := service.FindSessionCreation(ctx, tenant, "intent", reordered, creator); err != nil || found.Created || found.Session.ID != first.Session.ID {
+		t.Fatal("intent lookup", found, err)
+	}
+	if _, err := service.FindSessionCreation(ctx, tenant, "intent", json.RawMessage(`{"agent_id":"source","agent":{"tools":[{"parameters":{"const":9007199254740992}}]}}`), creator); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+		t.Fatal("changed intent found", err)
+	}
+	changed := input
+	changed.CreationRequest = json.RawMessage(`{"agent_id":"changed"}`)
+	if _, err := service.CreateSession(ctx, tenant, changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+		t.Fatal("changed intent upserted", err)
+	}
+	if _, err := service.FindSessionCreation(ctx, uuid.NewString(), "intent", request, creator); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatal("foreign lookup", err)
+	}
+
+	historical := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "historical", Configuration: json.RawMessage(`{"agent":{"instructions":"original"}}`)}
+	stored, err := service.CreateSession(ctx, tenant, historical)
+	if err != nil {
+		t.Fatal(err)
+	}
+	historical.CreationRequest = json.RawMessage(`{"agent_id":"source"}`)
+	if _, err := service.FindSessionCreation(ctx, tenant, "historical", historical.CreationRequest, creator); !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatal("lookup without a stored intent", err)
+	}
+	if retry, err := service.CreateSession(ctx, tenant, historical); err != nil || retry.Session.ID != stored.Session.ID {
+		t.Fatal("request hash retry", retry, err)
+	}
+	if countRows(t, pool, "SELECT count(*) FROM sessions WHERE id=$1 AND creation_request_hash IS NULL", stored.Session.ID) != 1 {
+		t.Fatal("retry stored an intent")
+	}
+	historical.Configuration = json.RawMessage(`{"agent":{"instructions":"changed"}}`)
+	if _, err := service.CreateSession(ctx, tenant, historical); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+		t.Fatal("changed request accepted", err)
+	}
+
+	another := identity.Subject{Kind: "user", ID: creator.ID}
+	conflicts := func(name string, subject identity.Subject) {
+		t.Helper()
+		if _, err := service.FindSessionCreation(ctx, tenant, "intent", request, subject); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+			t.Fatal(name, "lookup", err)
+		}
+		retry := input
+		retry.Creator = subject
+		if _, err := service.CreateSession(ctx, tenant, retry); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+			t.Fatal(name, "upsert", err)
+		}
+	}
+	conflicts("another creator", another)
+	exec(t, pool, "UPDATE sessions SET creator_kind=NULL, creator_id=NULL WHERE id=$1", first.Session.ID)
+	conflicts("unknown creator", creator)
+	exec(t, pool, "UPDATE sessions SET creator_kind=$2, creator_id=$3, deleted_at=clock_timestamp() WHERE id=$1", first.Session.ID, creator.Kind, creator.ID)
+	conflicts("deleted Session", creator)
+
+	outcomes := make(chan error, 2)
+	for _, subject := range []identity.Subject{creator, another} {
+		go func() {
+			raced := input
+			raced.IdempotencyKey, raced.Creator = "raced", subject
+			_, err := service.CreateSession(ctx, tenant, raced)
+			outcomes <- err
+		}()
+	}
+	won, conflicted := 0, 0
+	for range 2 {
+		switch err := <-outcomes; {
+		case err == nil:
+			won++
+		case errors.Is(err, sessions.ErrIdempotencyConflict):
+			conflicted++
+		default:
+			t.Fatal("racing creator", err)
+		}
+	}
+	if won != 1 || conflicted != 1 {
+		t.Fatal("racing creators", won, conflicted)
+	}
+}
+
+// The provider-key fingerprint in retry identities depends on the credential
+// key and needs one.
+func TestProviderKeyFingerprintIsKeyed(t *testing.T) {
+	fingerprint := func(seed byte) string {
+		cipher, err := credentialcrypto.New(bytes.Repeat([]byte{seed}, 32))
+		if err != nil {
+			t.Fatal(err)
+		}
+		value, err := New(nil, cipher).FingerprintProviderKey("provider-key")
+		if err != nil || value == "" || strings.Contains(value, "provider-key") {
+			t.Fatal(value, err)
+		}
+		return value
+	}
+	if fingerprint(71) == fingerprint(72) {
+		t.Fatal("fingerprint ignores the credential key")
+	}
+	if _, err := New(nil, nil).FingerprintProviderKey("provider-key"); !errors.Is(err, credentialcrypto.ErrUnavailable) {
+		t.Fatal(err)
+	}
+}
+
+// A new Session freezes its provider, Skills and initial files sealed under
+// its own binding. A retry returns it after every source is gone, changed
+// bytes conflict, and a foreign source is missing.
+func TestCreationFreezesResourcesOnce(t *testing.T) {
+	pool := pgtest.Open(t)
+	cipher := frozenCipher(t)
+	store, service := creationService(t, pool, cipher)
+	skillsService := skillService(t, pool, cipher)
+	filesService, err := files.NewService(filepg.New(pgunit.NewPool(pool)))
+	if err != nil {
+		t.Fatal(err)
+	}
+	ctx := t.Context()
+	tenant, foreign := uuid.NewString(), uuid.NewString()
+	const canary = "private-creation-canary"
+	skill, err := skillsService.CreateSkill(ctx, skills.CreateSkill{TenantID: tenant, Archive: skillArchive(t, "referenced", canary+"-1")})
+	if err != nil {
+		t.Fatal(err)
+	}
+	latest := skillArchive(t, "referenced", canary+"-2")
+	if _, err := skillsService.CreateVersion(ctx, skills.CreateVersion{TenantID: tenant, SkillID: skillKey(t, skill.ID), Archive: latest}); err != nil {
+		t.Fatal(err)
+	}
+	source, err := filesService.Create(ctx, files.CreateCommand{TenantID: tenant, Upload: func(w io.Writer) (files.Upload, error) {
+		_, err := io.WriteString(w, canary)
+		return files.Upload{Filename: "source.bin", Purpose: files.PurposeUserData}, err
+	}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	inline := environmentconfig.Skill{Metadata: environmentconfig.SkillMetadata{Type: "inline", Name: "inline", Description: "A proof."}, Archive: skillArchive(t, "inline", canary)}
+	reference := environmentconfig.Skill{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: skill.ID, Version: "latest"}}
+	fileID := environmentconfig.InitialFile{Type: "file_id", Path: "/workspace/b", FileID: source.ID}
+	input := sessions.CreateSession{
+		Creator: creator, Engine: "codex", IdempotencyKey: "frozen", Configuration: hostedConfiguration,
+		ModelProvider:       &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://example.com/v1", APIKey: canary},
+		ModelProviderSource: v1.ModelProviderSourceSession,
+		Initialization:      environmentconfig.Setup{Skills: []environmentconfig.Skill{inline, reference}},
+		InitialFiles:        []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a", Data: []byte(canary)}, fileID},
+	}
+	created, err := service.CreateSession(ctx, tenant, input)
+	if err != nil {
+		t.Fatal(err)
+	}
+	id := created.Session.ID
+	if bytes.Contains(created.Session.Configuration, []byte(canary)) || !bytes.Contains(created.Session.Configuration, []byte(`"model_provider_configured":true`)) {
+		t.Fatal("Session configuration", string(created.Session.Configuration))
+	}
+	sealed := `FROM (SELECT encrypted_config AS b FROM session_model_execution WHERE session_id=$1
+ UNION ALL SELECT contents FROM environment_setups WHERE session_id=$1
+ UNION ALL SELECT contents FROM initial_environment_files WHERE session_id=$1) frozen`
+	if countRows(t, pool, "SELECT count(*) "+sealed, id) != 4 || countRows(t, pool, "SELECT count(*) "+sealed+" WHERE position($2::bytea IN b) > 0", id, []byte(canary)) != 0 {
+		t.Fatal("frozen data is missing or not sealed")
+	}
+	assertFrozen := func() {
+		t.Helper()
+		provider, err := store.SessionModelExecution(ctx, tenant, id)
+		if err != nil || provider.APIKey != canary {
+			t.Fatal("frozen provider", err)
+		}
+		setup, err := store.ReadEnvironmentSetup(ctx, tenant, id)
+		if err != nil || len(setup.Skills) != 2 || !reflect.DeepEqual(setup.Skills[0], inline) || setup.Skills[1].Metadata.Version != "2" || !bytes.Equal(setup.Skills[1].Archive, latest) {
+			t.Fatal("frozen Skills", err)
+		}
+		for position := range input.InitialFiles {
+			if _, body, err := store.ReadInitialEnvironmentFile(ctx, tenant, id, position); err != nil || string(body) != canary {
+				t.Fatal("frozen initial file", position, err)
+			}
+		}
+	}
+	assertFrozen()
+	for _, reference := range []sessions.CreateSession{
+		{Creator: creator, Engine: "codex", IdempotencyKey: "foreign-skill", Configuration: hostedConfiguration, Initialization: environmentconfig.Setup{Skills: []environmentconfig.Skill{reference}}},
+		{Creator: creator, Engine: "codex", IdempotencyKey: "foreign-file", Configuration: hostedConfiguration, InitialFiles: []environmentconfig.InitialFile{fileID}},
+	} {
+		if _, err := service.CreateSession(ctx, foreign, reference); !errors.Is(err, sessions.ErrNotFound) {
+			t.Fatal(reference.IdempotencyKey, err)
+		}
+	}
+	if countRows(t, pool, "SELECT count(*) FROM sessions WHERE tenant_id=$1", foreign) != 0 {
+		t.Fatal("a failed creation left a Session")
+	}
+	if err := filesService.Delete(ctx, files.DeleteCommand{TenantID: tenant, FileID: source.ID}); err != nil {
+		t.Fatal(err)
+	}
+	if err := skillsService.DeleteSkill(ctx, skills.DeleteSkill{TenantID: tenant, SkillID: skillKey(t, skill.ID)}); err != nil {
+		t.Fatal(err)
+	}
+	if retry, err := service.CreateSession(ctx, tenant, input); err != nil || retry.Created || retry.Session.ID != id {
+		t.Fatal("retry resolved its sources again", retry, err)
+	}
+	assertFrozen()
+	changed := input
+	changed.InitialFiles = []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a", Data: []byte("changed")}, fileID}
+	if _, err := service.CreateSession(ctx, tenant, changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+		t.Fatal("changed bytes accepted", err)
+	}
+	_, keyless := creationService(t, pool, nil)
+	sealedInput := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "keyless", Configuration: hostedConfiguration, InitialFiles: changed.InitialFiles[:1]}
+	if _, err := keyless.CreateSession(ctx, tenant, sealedInput); !errors.Is(err, credentialcrypto.ErrUnavailable) {
+		t.Fatal("sealed without a credential key", err)
+	}
+	if countRows(t, pool, "SELECT count(*) FROM sessions WHERE tenant_id=$1 AND idempotency_key='keyless'", tenant) != 0 {
+		t.Fatal("a failed creation left a Session")
+	}
+}
+
+// An Environment Session reserves its initial input, tracking its activity,
+// instead of admitting a Turn.
+func TestEnvironmentCreationReservesItsInitialInput(t *testing.T) {
+	pool := pgtest.Open(t)
+	_, service := creationService(t, pool, nil)
+	input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "environment", InitialInputs: []sessions.Input{messageInput("first")},
+		Configuration: json.RawMessage(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)}
+	created, err := service.CreateSession(t.Context(), uuid.NewString(), input)
+	if err != nil || created.Session.Environment == nil || created.Session.LastTurn != nil || created.Session.EnvironmentInputActivity == nil {
+		t.Fatal(created, err)
+	}
+	if turns := countRows(t, pool, "SELECT count(*) FROM turns WHERE session_id=$1", created.Session.ID); turns != 0 {
+		t.Fatal("initial input admitted a Turn", turns)
+	}
+	if reserved := countRows(t, pool, "SELECT count(*) FROM environment_input_reservations WHERE session_id=$1 AND is_initial", created.Session.ID); reserved != 1 {
+		t.Fatal("initial reservations", reserved)
+	}
+}
+
+// Hosted creation checks admission on the locked deployment, so it sees
+// maintenance committed while it waited, and places after creating the
+// Environment, rolling both back when no node is available. A retry admits
+// nothing and still returns its Session.
+func TestHostedCreationAdmitsAndPlacesUnderTheDeploymentLock(t *testing.T) {
+	pool := pgtest.OpenIsolated(t, nil)
+	_, service := creationService(t, pool, nil)
+	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
+	defer cancel()
+	tenant := uuid.NewString()
+	hosted := func(key string) sessions.CreateSession {
+		return sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: key, Configuration: hostedConfiguration}
+	}
+	existing, err := service.CreateSession(ctx, tenant, hosted("existing"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	tx, err := pool.Begin(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer tx.Rollback(context.Background())
+	var holder int32
+	if err := tx.QueryRow(ctx, "SELECT pg_backend_pid() FROM runtime_deployment FOR UPDATE").Scan(&holder); err != nil {
+		t.Fatal(err)
+	}
+	done := make(chan error, 1)
+	go func() {
+		_, err := service.CreateSession(ctx, tenant, hosted("paused"))
+		done <- err
+	}()
+	awaitBlocked(ctx, t, pool, holder)
+	if _, err := tx.Exec(ctx, "UPDATE runtime_deployment SET installation_id=$1, backend_fingerprint=$2, admission_paused=true", uuid.New(), strings.Repeat("a", 64)); err != nil {
+		t.Fatal(err)
+	}
+	if err := tx.Commit(ctx); err != nil {
+		t.Fatal(err)
+	}
+	if err := <-done; !errors.Is(err, placement.ErrAdmissionClosed) {
+		t.Fatal("creation bypassed committed maintenance", err)
+	}
+	if retry, err := service.CreateSession(ctx, tenant, hosted("existing")); err != nil || retry.Created || retry.Session.ID != existing.Session.ID {
+		t.Fatal("retry ran admission", retry, err)
+	}
+	exec(t, pool, "UPDATE runtime_deployment SET admission_paused=false, web_managed=true")
+	if _, err := service.CreateSession(ctx, tenant, hosted("unplaced")); !errors.Is(err, placement.ErrNodeUnavailable) {
+		t.Fatal("placement without a node", err)
+	}
+	if count := countRows(t, pool, "SELECT count(*) FROM sessions s JOIN environments e ON e.session_id=s.id WHERE s.tenant_id=$1", tenant); count != 1 {
+		t.Fatal("failed hosted creation left work", count)
+	}
+}
+
+// Freezing a Skill version and deleting it serialize on the Skill lock:
+// whichever goes first decides, and no Session refers to a missing version.
+func TestSkillFreezeSerializesWithVersionDeletion(t *testing.T) {
+	pool := pgtest.Open(t)
+	cipher := frozenCipher(t)
+	store, service := creationService(t, pool, cipher)
+	skillsService := skillService(t, pool, cipher)
+	ctx := t.Context()
+	tenant := uuid.NewString()
+	for _, freezeFirst := range []bool{true, false} {
+		skill, err := skillsService.CreateSkill(ctx, skills.CreateSkill{TenantID: tenant, Archive: skillArchive(t, "raced", "one")})
+		if err != nil {
+			t.Fatal(err)
+		}
+		key := skillKey(t, skill.ID)
+		second := skillArchive(t, "raced", "two")
+		if _, err := skillsService.CreateVersion(ctx, skills.CreateVersion{TenantID: tenant, SkillID: key, Archive: second}); err != nil {
+			t.Fatal(err)
+		}
+		holder, err := pool.Begin(ctx)
+		if err != nil {
+			t.Fatal(err)
+		}
+		var holderPID int32
+		if err := holder.QueryRow(ctx, "SELECT pg_backend_pid() FROM skills WHERE id=$1 FOR UPDATE", key).Scan(&holderPID); err != nil {
+			t.Fatal(err)
+		}
+		input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: hostedConfiguration,
+			Initialization: environmentconfig.Setup{Skills: []environmentconfig.Skill{{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: skill.ID, Version: "2"}}}}}
+		type outcome struct {
+			creation sessions.Creation
+			err      error
+		}
+		created, deleted := make(chan outcome, 1), make(chan error, 1)
+		freeze := func() {
+			creation, err := service.CreateSession(ctx, tenant, input)
+			created <- outcome{creation, err}
+		}
+		remove := func() {
+			_, err := skillsService.DeleteVersion(ctx, skills.DeleteVersion{TenantID: tenant, SkillID: key, Version: 2})
+			deleted <- err
+		}
+		early, late := freeze, remove
+		if !freezeFirst {
+			early, late = remove, freeze
+		}
+		go early()
+		awaitWaiters(t, pool, holderPID, 1)
+		go late()
+		awaitWaiters(t, pool, holderPID, 2)
+		if err := holder.Rollback(ctx); err != nil {
+			t.Fatal(err)
+		}
+		creation, err := <-created, <-deleted
+		if err != nil {
+			t.Fatal("version deletion", err)
+		}
+		if !freezeFirst {
+			if !errors.Is(creation.err, sessions.ErrNotFound) || countRows(t, pool, "SELECT count(*) FROM sessions WHERE tenant_id=$1 AND idempotency_key=$2", tenant, input.IdempotencyKey) != 0 {
+				t.Fatal("creation froze a deleted version", creation.err)
+			}
+			continue
+		}
+		if creation.err != nil {
+			t.Fatal(creation.err)
+		}
+		setup, err := store.ReadEnvironmentSetup(ctx, tenant, creation.creation.Session.ID)
+		if err != nil || setup.Skills[0].Metadata.Version != "2" || !bytes.Equal(setup.Skills[0].Archive, second) {
+			t.Fatal("frozen version after its deletion", err)
+		}
+	}
+}
+
+// Every creation, retries included, records a create audit; only the new
+// Session lists what it created. An audit that cannot be recorded fails the
+// creation closed and rolls it back.
+func TestCreationAudit(t *testing.T) {
+	pool := pgtest.Open(t)
+	_, service := creationService(t, pool, nil)
+	tenant := uuid.NewString()
+	sum := sha256.Sum256([]byte(uuid.NewString()))
+	digest := hex.EncodeToString(sum[:])
+	source := writeaudit.Source{KeyID: "static:" + digest, Prefix: digest[:8], Name: "test key", Kind: "static", TenantID: uuid.NewString(), RequestID: uuid.NewString(), TraceID: uuid.NewString()}
+	input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "audited", InitialInputs: []sessions.Input{messageInput("first")},
+		Configuration: json.RawMessage(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)}
+	if _, err := service.CreateSession(writeaudit.WithSource(t.Context(), source), tenant, input); !errors.Is(err, writeaudit.ErrInvalidSource) {
+		t.Fatal("foreign provenance recorded", err)
+	}
+	if countRows(t, pool, "SELECT count(*) FROM sessions WHERE tenant_id=$1", tenant) != 0 {
+		t.Fatal("a failed audit left the Session")
+	}
+	source.TenantID = tenant
+	ctx := writeaudit.WithSource(t.Context(), source)
+	created, err := service.CreateSession(ctx, tenant, input)
+	if err != nil {
+		t.Fatal(err)
+	}
+	// A retry is another request.
+	source.RequestID = uuid.NewString()
+	if _, err := service.CreateSession(writeaudit.WithSource(t.Context(), source), tenant, input); err != nil {
+		t.Fatal(err)
+	}
+	if count := countRows(t, pool, "SELECT count(*) FROM write_audit_operations WHERE tenant_id=$1 AND action='create' AND resource_type='session' AND resource_id=$2", tenant, created.Session.ID); count != 2 {
+		t.Fatal("create audits", count)
+	}
+	var owned []string
+	rows, err := pool.Query(t.Context(), "SELECT resource_type FROM write_audit_owners WHERE tenant_id=$1 ORDER BY resource_type", tenant)
+	if err != nil {
+		t.Fatal(err)
+	}
+	for rows.Next() {
+		var resource string
+		if err := rows.Scan(&resource); err != nil {
+			t.Fatal(err)
+		}
+		owned = append(owned, resource)
+	}
+	if rows.Err() != nil || !reflect.DeepEqual(owned, []string{"environment", "session"}) {
+		t.Fatal("created resources", owned, rows.Err())
+	}
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/environment.go b/services/core/internal/persistence/postgres/sessionpg/environment.go
index 1374902eb..830d095ab 100644
--- a/services/core/internal/persistence/postgres/sessionpg/environment.go
+++ b/services/core/internal/persistence/postgres/sessionpg/environment.go
@@ -23,7 +23,7 @@ func LoadEnvironment(ctx context.Context, q *sqlc.Queries, tenant, environment s
 		return sessions.Environment{}, err
 	}
 	row, err := q.GetEnvironment(ctx, sqlc.GetEnvironmentParams{TenantID: tenantID, ID: pgunit.PathID(environment)})
-	return EnvironmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
+	return environmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
 }
 
 // loadSessionEnvironment reads, on q, the Environment of the tenant's Session
@@ -39,15 +39,7 @@ func loadSessionEnvironment(ctx context.Context, q *sqlc.Queries, tenant, sessio
 		return sessions.Environment{}, err
 	}
 	row, err := q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: tenantID, ID: id})
-	return EnvironmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
-}
-
-// CreateSessionEnvironment creates, on q, the Environment of a new Session
-// whose configuration has one, as sessions.CreatesEnvironment decides. Its
-// preparation is pending when the Session froze a setup or initial files, and
-// complete otherwise, so it runs after those are saved.
-func CreateSessionEnvironment(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-	return q.CreateEnvironment(ctx, sqlc.CreateEnvironmentParams{ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, SessionID: session})
+	return environmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
 }
 
 func (s *Store) GetEnvironment(ctx context.Context, tenant, environment string) (sessions.Environment, error) {
diff --git a/services/core/internal/persistence/postgres/sessionpg/frozen.go b/services/core/internal/persistence/postgres/sessionpg/frozen.go
index 4b7e74cda..40e36f0ef 100644
--- a/services/core/internal/persistence/postgres/sessionpg/frozen.go
+++ b/services/core/internal/persistence/postgres/sessionpg/frozen.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
@@ -36,8 +37,7 @@ func (s *Store) ReadEnvironmentSetup(ctx context.Context, tenant, session string
 	if s.cipher == nil {
 		return environmentconfig.Setup{}, credentialcrypto.ErrUnavailable
 	}
-	binding := credentialcrypto.EnvironmentSetupBinding{TenantID: uuid.UUID(lookup.TenantID.Bytes).String(), Resource: "session", OwnerID: uuid.UUID(lookup.ID.Bytes).String(), Field: "initialization"}
-	plaintext, err := s.cipher.OpenEnvironmentSetup(encrypted, binding)
+	plaintext, err := s.cipher.OpenEnvironmentSetup(encrypted, setupBinding(lookup.TenantID, lookup.ID))
 	if err != nil {
 		return environmentconfig.Setup{}, fmt.Errorf("open frozen environment setup: %w", err)
 	}
@@ -66,8 +66,7 @@ func (s *Store) ReadInitialEnvironmentFile(ctx context.Context, tenant, session
 		return environmentconfig.InitialFileMetadata{}, nil, credentialcrypto.ErrUnavailable
 	}
 	id := uuid.UUID(row.ID.Bytes).String()
-	binding := credentialcrypto.EnvironmentFileBinding{TenantID: uuid.UUID(lookup.TenantID.Bytes).String(), Resource: "session", OwnerID: uuid.UUID(lookup.ID.Bytes).String(), FileID: id}
-	body, err := s.cipher.OpenEnvironmentFile(row.Contents, binding)
+	body, err := s.cipher.OpenEnvironmentFile(row.Contents, fileBinding(lookup.TenantID, lookup.ID, id))
 	if err != nil {
 		return environmentconfig.InitialFileMetadata{}, nil, fmt.Errorf("open frozen initial file: %w", err)
 	}
@@ -76,3 +75,14 @@ func (s *Store) ReadInitialEnvironmentFile(ctx context.Context, tenant, session
 	}
 	return environmentconfig.InitialFileMetadata{ID: id, Path: row.Path, SizeBytes: &row.SizeBytes}, body, nil
 }
+
+// setupBinding binds the setup a Session froze to the tenant and Session.
+func setupBinding(tenant, session pgtype.UUID) credentialcrypto.EnvironmentSetupBinding {
+	return credentialcrypto.EnvironmentSetupBinding{TenantID: optionalID(tenant), Resource: "session", OwnerID: optionalID(session), Field: "initialization"}
+}
+
+// fileBinding binds an initial file a Session froze to the tenant, Session
+// and file.
+func fileBinding(tenant, session pgtype.UUID, file string) credentialcrypto.EnvironmentFileBinding {
+	return credentialcrypto.EnvironmentFileBinding{TenantID: optionalID(tenant), Resource: "session", OwnerID: optionalID(session), FileID: file}
+}
diff --git a/services/core/internal/persistence/postgres/sessionpg/inputs.go b/services/core/internal/persistence/postgres/sessionpg/inputs.go
index 37e764773..a55e41aaa 100644
--- a/services/core/internal/persistence/postgres/sessionpg/inputs.go
+++ b/services/core/internal/persistence/postgres/sessionpg/inputs.go
@@ -144,9 +144,9 @@ func (t *SessionTx) reservationFromRow(ctx context.Context, row sqlc.Environment
 	return result, nil
 }
 
-func (t *SessionTx) CreateInputReservation(ctx context.Context, key string, batch json.RawMessage) (sessions.EnvironmentInputReservation, error) {
+func (t *SessionTx) CreateInputReservation(ctx context.Context, key string, batch json.RawMessage, initial bool) (sessions.EnvironmentInputReservation, error) {
 	row, err := t.q.CreateEnvironmentInputReservation(ctx, sqlc.CreateEnvironmentInputReservationParams{
-		ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, SessionID: t.session, IdempotencyKey: key, Batch: batch,
+		ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, SessionID: t.session, IdempotencyKey: key, Batch: batch, IsInitial: initial,
 	})
 	if err != nil {
 		return sessions.EnvironmentInputReservation{}, storable(err)
diff --git a/services/core/internal/persistence/postgres/sessionpg/rows.go b/services/core/internal/persistence/postgres/sessionpg/rows.go
index f4b885714..a07c5a342 100644
--- a/services/core/internal/persistence/postgres/sessionpg/rows.go
+++ b/services/core/internal/persistence/postgres/sessionpg/rows.go
@@ -65,9 +65,9 @@ func TurnFromRow(row sqlc.Turn) sessions.Turn {
 	}
 }
 
-// SessionFromRow maps a stored Session with its creator, normalized
+// sessionFromRow maps a stored Session with its creator, normalized
 // configuration and metadata.
-func SessionFromRow(row sqlc.Session) (sessions.Session, error) {
+func sessionFromRow(row sqlc.Session) (sessions.Session, error) {
 	session := sessions.Session{ID: uuid.UUID(row.ID.Bytes).String(), TenantID: uuid.UUID(row.TenantID.Bytes).String(), Engine: row.Engine, CreatedAt: row.CreatedAt.Time, RequiredActions: []v1.FunctionCallAction{}}
 	creator, err := sessionCreator(row.CreatorKind, row.CreatorID)
 	if err != nil {
@@ -98,10 +98,10 @@ func sessionCreator(kind, id pgtype.Text) (*identity.Subject, error) {
 	return &creator, nil
 }
 
-// EnvironmentFromRow maps a stored Environment of the tenant with its
+// environmentFromRow maps a stored Environment of the tenant with its
 // normalized configuration snapshot, from the result of the query that read
 // it: no rows is sessions.ErrNotFound.
-func EnvironmentFromRow(row sqlc.Environment, tenant pgtype.UUID, configuration []byte, err error) (sessions.Environment, error) {
+func environmentFromRow(row sqlc.Environment, tenant pgtype.UUID, configuration []byte, err error) (sessions.Environment, error) {
 	if errors.Is(err, pgx.ErrNoRows) {
 		return sessions.Environment{}, sessions.ErrNotFound
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/session_reads.go b/services/core/internal/persistence/postgres/sessionpg/session_reads.go
index a32a6f622..7f9af672f 100644
--- a/services/core/internal/persistence/postgres/sessionpg/session_reads.go
+++ b/services/core/internal/persistence/postgres/sessionpg/session_reads.go
@@ -56,9 +56,9 @@ func (s *Store) ListSessions(ctx context.Context, tenantID, cursor string, limit
 			rows = rows[:limit]
 		}
 		for _, row := range rows {
-			session, err := SessionFromRow(row)
+			session, err := sessionFromRow(row)
 			if err == nil {
-				session, err = LoadSessionActivity(ctx, q, session)
+				session, err = loadSessionActivity(ctx, q, session)
 			}
 			if err != nil {
 				return err
@@ -81,16 +81,8 @@ func (s *Store) SessionStreamSnapshot(ctx context.Context, tenantID, sessionID s
 	var session sessions.Session
 	var cursor int64
 	err = s.units.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := sqlc.New(tx)
-		row, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: tenant, ID: pgunit.PathID(sessionID)})
-		if err != nil {
-			return err
-		}
-		if session, err = SessionFromRow(row); err != nil {
-			return err
-		}
-		cursor = row.EventSequence
-		session, err = LoadSessionActivity(ctx, q, session)
+		var err error
+		session, cursor, err = loadSession(ctx, sqlc.New(tx), tenant, pgunit.PathID(sessionID))
 		return err
 	})
 	if errors.Is(err, pgx.ErrNoRows) {
@@ -171,7 +163,7 @@ func (s *Store) GetTurnDiagnosticsSnapshot(ctx context.Context, tenantID, sessio
 		if err != nil {
 			return err
 		}
-		result.Session, err = SessionFromRow(row)
+		result.Session, err = sessionFromRow(row)
 		if err != nil {
 			return err
 		}
@@ -272,14 +264,29 @@ func loadManagedArchive(ctx context.Context, q *sqlc.Queries, tenant, session pg
 	return sessions.ManagedArchive{SessionID: uuid.UUID(row.SessionID.Bytes).String(), EnvironmentID: uuid.UUID(row.EnvironmentID.Bytes).String(), State: row.State}, nil
 }
 
-// LoadSessionActivity adds the Environment, input activity and latest Turn
+// loadSession reads, on q, the tenant's visible Session with the projection
+// of GetSession and its event cursor; a missing one is pgx.ErrNoRows.
+func loadSession(ctx context.Context, q *sqlc.Queries, tenant, id pgtype.UUID) (sessions.Session, int64, error) {
+	row, err := q.GetSession(ctx, sqlc.GetSessionParams{TenantID: tenant, ID: id})
+	if err != nil {
+		return sessions.Session{}, 0, err
+	}
+	session, err := sessionFromRow(row)
+	if err != nil {
+		return sessions.Session{}, 0, err
+	}
+	session, err = loadSessionActivity(ctx, q, session)
+	return session, row.EventSequence, err
+}
+
+// loadSessionActivity adds the Environment, input activity and latest Turn
 // projection of GetSession to session within the caller's snapshot.
-func LoadSessionActivity(ctx context.Context, q *sqlc.Queries, session sessions.Session) (sessions.Session, error) {
+func loadSessionActivity(ctx context.Context, q *sqlc.Queries, session sessions.Session) (sessions.Session, error) {
 	id, _ := parseID(session.ID)
 	tenant, _ := parseID(session.TenantID)
 	environment, err := q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: tenant, ID: id})
 	if err == nil {
-		value, err := EnvironmentFromRow(environment.Environment, environment.TenantID, environment.Configuration, nil)
+		value, err := environmentFromRow(environment.Environment, environment.TenantID, environment.Configuration, nil)
 		if err != nil {
 			return session, err
 		}
diff --git a/services/core/internal/persistence/postgres/sessionpg/session_writes.go b/services/core/internal/persistence/postgres/sessionpg/session_writes.go
index d18311a07..ac1ad07be 100644
--- a/services/core/internal/persistence/postgres/sessionpg/session_writes.go
+++ b/services/core/internal/persistence/postgres/sessionpg/session_writes.go
@@ -64,10 +64,10 @@ func (s *Store) UpdateSessionMetadata(ctx context.Context, tenantID, sessionID s
 		if err := auditpg.RecordWriteAudit(ctx, q, tenantID, "update", "session", uuid.UUID(row.ID.Bytes).String(), ""); err != nil {
 			return err
 		}
-		if session, err = SessionFromRow(row); err != nil {
+		if session, err = sessionFromRow(row); err != nil {
 			return err
 		}
-		session, err = LoadSessionActivity(ctx, q, session)
+		session, err = loadSessionActivity(ctx, q, session)
 		return err
 	})
 	if errors.Is(err, pgx.ErrNoRows) {
diff --git a/services/core/internal/persistence/postgres/skillpg/skillpg.go b/services/core/internal/persistence/postgres/skillpg/skillpg.go
index c05225094..8453bbb55 100644
--- a/services/core/internal/persistence/postgres/skillpg/skillpg.go
+++ b/services/core/internal/persistence/postgres/skillpg/skillpg.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"math"
+	"slices"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
@@ -283,7 +284,7 @@ func (s *Store) VersionContent(ctx context.Context, tenantID string, skillID uui
 	if err != nil {
 		return skills.Content{}, translate(err)
 	}
-	return s.open(row)
+	return open(s.cipher, row)
 }
 
 func (s *Store) DefaultVersionContent(ctx context.Context, tenantID string, skillID uuid.UUID) (skills.Content, error) {
@@ -295,7 +296,7 @@ func (s *Store) DefaultVersionContent(ctx context.Context, tenantID string, skil
 	if err != nil {
 		return skills.Content{}, translate(err)
 	}
-	return s.open(row)
+	return open(s.cipher, row)
 }
 
 // insertVersion seals the archive under a new version ID and stores it.
@@ -315,11 +316,55 @@ func (s *Store) insertVersion(ctx context.Context, q *sqlc.Queries, tenant, skil
 	return versionFromRow(sqlc.GetSkillVersionRow(row)), nil
 }
 
-func (s *Store) open(row sqlc.SkillVersion) (skills.Content, error) {
-	if s.cipher == nil {
+// LockSkills locks, on q, the tenant's Skills in ID order, whatever the order
+// of ids, so callers never lock them in opposite orders. It returns them by
+// ID; a malformed or missing one is skills.ErrNotFound.
+func LockSkills(ctx context.Context, q *sqlc.Queries, tenant pgtype.UUID, ids []string) (map[string]skills.Skill, error) {
+	ids = slices.Compact(slices.Sorted(slices.Values(ids)))
+	locked := make(map[string]skills.Skill, len(ids))
+	for _, id := range ids {
+		key, err := skills.ParseID(id)
+		if err != nil {
+			return nil, err
+		}
+		row, err := q.LockSkill(ctx, sqlc.LockSkillParams{TenantID: tenant, ID: pgID(key)})
+		if err != nil {
+			return nil, translate(err)
+		}
+		locked[id] = skillFromRow(row)
+	}
+	return locked, nil
+}
+
+// ReadVersionForFreeze reads, on q, a version of the tenant's Skill, opens
+// it with cipher and verifies it is still the archive the version records. A
+// missing version is skills.ErrNotFound and a missing cipher
+// credentialcrypto.ErrUnavailable; one that does not open or verify is
+// corrupt stored data, an internal error.
+func ReadVersionForFreeze(ctx context.Context, q *sqlc.Queries, cipher *credentialcrypto.Cipher, tenant pgtype.UUID, skillID string, version int64) (skills.Content, error) {
+	key, err := skills.ParseID(skillID)
+	if err != nil {
+		return skills.Content{}, err
+	}
+	row, err := q.ReadSkillVersion(ctx, sqlc.ReadSkillVersionParams{TenantID: tenant, SkillID: pgID(key), Version: version})
+	if err != nil {
+		return skills.Content{}, translate(err)
+	}
+	content, err := open(cipher, row)
+	if err != nil {
+		return skills.Content{}, err
+	}
+	if skills.VerifyContent(content) != nil {
+		return skills.Content{}, errors.New("stored Skill version does not verify")
+	}
+	return content, nil
+}
+
+func open(cipher *credentialcrypto.Cipher, row sqlc.SkillVersion) (skills.Content, error) {
+	if cipher == nil {
 		return skills.Content{}, credentialcrypto.ErrUnavailable
 	}
-	archive, err := s.cipher.OpenSkill(row.Contents, credentialcrypto.NewSkillBinding(row.TenantID.Bytes, row.SkillID.Bytes, row.ID.Bytes, row.Version))
+	archive, err := cipher.OpenSkill(row.Contents, credentialcrypto.NewSkillBinding(row.TenantID.Bytes, row.SkillID.Bytes, row.ID.Bytes, row.Version))
 	if err != nil {
 		return skills.Content{}, err
 	}
diff --git a/services/core/internal/persistence/postgres/skillpg/skillpg_test.go b/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
index b7ebc9580..f4fee68ef 100644
--- a/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
+++ b/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
@@ -11,12 +11,14 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/skillpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/textvalue"
 	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
@@ -469,6 +471,45 @@ func TestSoleVersionDeletionSerializesWithUpload(t *testing.T) {
 	}
 }
 
+// LockSkills locks each named Skill of the tenant once, and
+// ReadVersionForFreeze opens a version only with the key that sealed it.
+func TestFreezeReads(t *testing.T) {
+	cipher := testCipher(t, 48)
+	f := newFixture(t, pgtest.Open(t), cipher)
+	ctx := t.Context()
+	tenant := uuid.NewString()
+	content := proofArchive(t, "freeze-first")
+	first := f.create(t, tenant, content)
+	second := f.create(t, tenant, archive(t, "other", "Another Skill.", "freeze-second"))
+	tenantID := pgtype.UUID{Bytes: uuid.MustParse(tenant), Valid: true}
+	q := sqlc.New(f.pool)
+	locked, err := skillpg.LockSkills(ctx, q, tenantID, []string{second.ID, first.ID, second.ID})
+	if err != nil || len(locked) != 2 || locked[first.ID].ID != first.ID || locked[second.ID].DefaultVersion != 1 {
+		t.Fatal("locked Skills", locked, err)
+	}
+	for _, ids := range [][]string{{first.ID, "skill_" + uuid.NewString()}, {"malformed"}} {
+		if _, err := skillpg.LockSkills(ctx, q, tenantID, ids); !errors.Is(err, skills.ErrNotFound) {
+			t.Fatal("missing Skill", ids, err)
+		}
+	}
+	if _, err := skillpg.LockSkills(ctx, q, pgtype.UUID{Bytes: uuid.New(), Valid: true}, []string{first.ID}); !errors.Is(err, skills.ErrNotFound) {
+		t.Fatal("foreign Skill", err)
+	}
+	read, err := skillpg.ReadVersionForFreeze(ctx, q, cipher, tenantID, first.ID, 1)
+	if err != nil || read.Version.Version != 1 || !bytes.Equal(read.Archive, content) {
+		t.Fatal("frozen version", err)
+	}
+	if _, err := skillpg.ReadVersionForFreeze(ctx, q, cipher, tenantID, first.ID, 2); !errors.Is(err, skills.ErrNotFound) {
+		t.Fatal("missing version", err)
+	}
+	if _, err := skillpg.ReadVersionForFreeze(ctx, q, nil, tenantID, first.ID, 1); !errors.Is(err, credentialcrypto.ErrUnavailable) {
+		t.Fatal("read without a key", err)
+	}
+	if _, err := skillpg.ReadVersionForFreeze(ctx, q, testCipher(t, 49), tenantID, first.ID, 1); err == nil || errors.Is(err, skills.ErrNotFound) || errors.Is(err, credentialcrypto.ErrUnavailable) {
+		t.Fatal("another key opened the version", err)
+	}
+}
+
 // waitForLockWaiters waits until count sessions queue behind holder.
 func waitForLockWaiters(t *testing.T, pool *pgxpool.Pool, holder int32, count int) {
 	t.Helper()
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index f043ab26d..b61b73c5a 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -18,7 +18,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -89,7 +88,6 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 	}
 	adapter.Configuration = regionalCodec{}
 	registry := providers.FixtureRegistry(t, kind, adapter)
-	s := store.New(pool)
 	// The deployment reaches the registered configuration only through the
 	// registry it is built with.
 	deployments := func() *deployment.Service {
@@ -122,8 +120,8 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	// The flow reaches only the store areas and the deployment setup; every
-	// other dependency panics if called.
+	// The flow reaches only the deployment setup; every other dependency
+	// panics if called.
 	h, err := api.NewHandler(api.Dependencies{
 		Engine: "codex", CoreKeys: auth, InstallationBindings: service,
 		Projects: struct{ api.Projects }{}, ProjectsReader: struct{ api.ProjectsReader }{},
@@ -135,7 +133,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		Agents: struct{ api.Agents }{}, AgentsReader: struct{ api.AgentsReader }{},
 		Sessions:        struct{ api.Sessions }{},
 		SessionsReader:  struct{ api.SessionsReader }{},
-		SessionCreation: s,
+		SessionCreation: struct{ api.SessionCreation }{},
 		SessionEvents:   struct{ api.SessionEvents }{},
 		Turns:           struct{ api.Turns }{},
 		Items:           struct{ api.Items }{},
@@ -148,7 +146,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		Metrics:             struct{ api.Metrics }{}, RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
 		Execution: &api.Execution{
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
-			SessionAdmission: s,
+			SessionAdmission: struct{ api.SessionAdmission }{},
 			InputAdmission:   struct{ api.InputAdmission }{},
 			SessionArchive:   struct{ api.SessionArchive }{},
 			Workspaces:       struct{ api.EnvironmentWorkspaces }{},
diff --git a/services/core/internal/sessions/artifacts_test.go b/services/core/internal/sessions/artifacts_test.go
index b7a45c855..f11756353 100644
--- a/services/core/internal/sessions/artifacts_test.go
+++ b/services/core/internal/sessions/artifacts_test.go
@@ -277,6 +277,21 @@ func (s *fakeArtifactStorage) AuditSessionOperation(context.Context, string, str
 	return nil
 }
 
+func (s *fakeArtifactStorage) FingerprintProviderKey(string) (string, error) {
+	s.t.Fatal("unexpected call to FingerprintProviderKey")
+	return "", nil
+}
+
+func (s *fakeArtifactStorage) WithCreation(context.Context, string, func(context.Context, CreationTx) error) error {
+	s.t.Fatal("unexpected call to WithCreation")
+	return nil
+}
+
+func (s *fakeArtifactStorage) FindCreation(context.Context, string, string) (CreationRecord, error) {
+	s.t.Fatal("unexpected call to FindCreation")
+	return CreationRecord{}, nil
+}
+
 func discard(content io.Reader, size int64) error {
 	_, err := io.CopyN(io.Discard, content, size)
 	return err
@@ -309,7 +324,7 @@ func TestStageTurnArtifacts(t *testing.T) {
 			tx := test.tx
 			tx.t = t
 			storage := &fakeArtifactStorage{t: t, tx: &tx}
-			service, err := NewService(storage)
+			service, err := NewService(storage, nil)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -327,7 +342,7 @@ func TestStageTurnArtifacts(t *testing.T) {
 	}
 
 	// Without an export nothing reaches storage.
-	service, err := NewService(&fakeArtifactStorage{t: t})
+	service, err := NewService(&fakeArtifactStorage{t: t}, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -337,7 +352,7 @@ func TestStageTurnArtifacts(t *testing.T) {
 }
 
 func TestNewServiceRequiresStorage(t *testing.T) {
-	if _, err := NewService(nil); err == nil {
+	if _, err := NewService(nil, nil); err == nil {
 		t.Fatal("service built without storage")
 	}
 }
diff --git a/services/core/internal/sessions/creation.go b/services/core/internal/sessions/creation.go
new file mode 100644
index 000000000..a970db327
--- /dev/null
+++ b/services/core/internal/sessions/creation.go
@@ -0,0 +1,575 @@
+package sessions
+
+import (
+	"bytes"
+	"context"
+	"crypto/sha256"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"slices"
+	"strconv"
+	"strings"
+
+	"github.com/google/uuid"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/jsonobject"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/metadata"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+)
+
+// CreationStorage persists Session creation and finds an earlier one.
+type CreationStorage interface {
+	// FingerprintProviderKey returns the keyed fingerprint of a model
+	// provider key, so retry identities tell keys apart without hashing a key.
+	// Without a credential key it is credentialcrypto.ErrUnavailable.
+	FingerprintProviderKey(secret string) (string, error)
+	// WithCreation runs apply in one pooled transaction and commits only when
+	// apply returns nil. A malformed tenant is ErrInvalidInput.
+	WithCreation(ctx context.Context, tenant string, apply func(context.Context, CreationTx) error) error
+	// FindCreation reads the tenant's Session created under key, deleted or
+	// not, or ErrNotFound. A malformed tenant is ErrInvalidInput.
+	FindCreation(ctx context.Context, tenant, key string) (CreationRecord, error)
+}
+
+// NewSession is a validated Session creation with its retry identity.
+type NewSession struct {
+	Key           string
+	Creator       identity.Subject
+	Engine        string
+	Metadata      json.RawMessage
+	Configuration json.RawMessage
+	// RequestHash identifies the resolved request; IntentHash, when set, the
+	// caller's intent before mutable sources resolved.
+	RequestHash string
+	IntentHash  *string
+}
+
+// CreationRecord is what a retry identity lookup compares.
+type CreationRecord struct {
+	SessionID string
+	Deleted   bool
+	// Creator is nil when the Session records no complete creator.
+	Creator *identity.Subject
+	// IntentHash is nil when the creation recorded no caller intent.
+	IntentHash *string
+}
+
+// CreationTx is the Session creation transaction. UpsertSession binds it to
+// the stored Session, which every later method acts on.
+type CreationTx interface {
+	InputAdmissionTx
+	InputActivityTx
+	// UpsertSession inserts the Session or, under the tenant and key, returns
+	// the stored one with Created false when its creator and identity match:
+	// the intent hash when the stored Session has one, else the request hash.
+	// A deleted or mismatched one is ErrIdempotencyConflict. Cursor is the
+	// Session's event sequence before anything the transaction admits.
+	UpsertSession(ctx context.Context, session NewSession) (Creation, error)
+	// LockDeployment locks and reads the sandbox deployment, serializing
+	// hosted creation with deployment changes, restore and node removal.
+	LockDeployment(ctx context.Context) (placement.Deployment, error)
+	LoadNodes(ctx context.Context) ([]placement.Node, error)
+	ReservePlacement(ctx context.Context, chosen placement.Placement) error
+	// LockSkills locks the tenant's Skills in ID order, whatever the order of
+	// ids, and returns them by ID. A missing one is ErrNotFound.
+	LockSkills(ctx context.Context, ids []string) (map[string]skills.Skill, error)
+	// ReadSkillVersion opens and verifies a version of a locked Skill. A
+	// missing one is ErrNotFound; one that does not open or verify is an
+	// internal error.
+	ReadSkillVersion(ctx context.Context, skill string, version int64) (skills.Content, error)
+	// SaveModelExecution seals the Session's model provider bundle.
+	SaveModelExecution(ctx context.Context, provider v1.ModelProviderInput) error
+	// SaveExecutionConfiguration records the frozen execution projection and,
+	// unless it is uuid.Nil, the deployment provider revision it resolved.
+	SaveExecutionConfiguration(ctx context.Context, projection v1.SessionExecutionConfiguration, revision uuid.UUID) error
+	// SaveInitialFiles copies the validated initial files, a file_id one from
+	// its locked source File, seals them under the Session and records their
+	// metadata in its configuration. A missing source is ErrNotFound and one
+	// beyond environmentconfig.MaxInitialFileBytes ErrInvalidInput.
+	SaveInitialFiles(ctx context.Context, files []environmentconfig.InitialFile) error
+	// SaveSetup seals the installed setup under the Session and records its
+	// metadata in its configuration.
+	SaveSetup(ctx context.Context, setup environmentconfig.Setup) error
+	// CreateEnvironment creates the Session's Environment, pending
+	// preparation when the Session froze a setup or initial files, and
+	// returns its ID.
+	CreateEnvironment(ctx context.Context) (string, error)
+	// CreateInputReservation reserves the batch under key until the deadline
+	// the database clock sets, marked as the Session's initial input.
+	CreateInputReservation(ctx context.Context, key string, batch json.RawMessage, initial bool) (EnvironmentInputReservation, error)
+	// PruneChanges bounds the Session's retained public changes.
+	PruneChanges(ctx context.Context) error
+	// AuditCreation records the create write audit, listing created.
+	AuditCreation(ctx context.Context, created ...writeaudit.Resource) error
+	// LoadSession reads the Session with its Environment and activity as the
+	// transaction has left it.
+	LoadSession(ctx context.Context) (Session, error)
+}
+
+// CreateSession creates a Session under a tenant-scoped key, so retries,
+// including concurrent ones, return the stored Session. The same key with
+// different input or another creator is ErrIdempotencyConflict. Only the new
+// Session freezes resources, takes a placement and admits its initial inputs,
+// so a retry after completion or later Turns never submits them again.
+func (s *Service) CreateSession(ctx context.Context, tenant string, input CreateSession) (Creation, error) {
+	session, batch, encoded, err := prepareCreation(input, s.storage.FingerprintProviderKey)
+	if err != nil {
+		return Creation{}, err
+	}
+	var result Creation
+	err = s.storage.WithCreation(ctx, tenant, func(ctx context.Context, tx CreationTx) error {
+		upserted, err := tx.UpsertSession(ctx, session)
+		if err != nil {
+			return err
+		}
+		var created []writeaudit.Resource
+		if upserted.Created {
+			if created, err = s.createResources(ctx, tx, upserted.Session, input, batch, encoded); err != nil {
+				return err
+			}
+		}
+		if err := tx.AuditCreation(ctx, created...); err != nil {
+			return err
+		}
+		result = upserted
+		result.Session, err = tx.LoadSession(ctx)
+		return err
+	})
+	if err != nil {
+		return Creation{}, fmt.Errorf("create session: %w", err)
+	}
+	return result, nil
+}
+
+// createResources freezes what the new Session keeps, creates its Environment
+// and admits its initial inputs, in lock order: the hosted deployment, the
+// Skills, then the Session's own rows. It returns the resources created.
+func (s *Service) createResources(ctx context.Context, tx CreationTx, session Session, input CreateSession, batch []Input, encoded json.RawMessage) ([]writeaudit.Resource, error) {
+	var configuration struct {
+		Environment struct {
+			Type string `json:"type"`
+		} `json:"environment"`
+	}
+	if err := json.Unmarshal(session.Configuration, &configuration); err != nil {
+		return nil, err
+	}
+	hosted := configuration.Environment.Type == "openai_hosted"
+	var deployment placement.Deployment
+	if hosted {
+		if s.rules == nil {
+			return nil, errors.New("hosted Session creation requires placement rules")
+		}
+		var err error
+		if deployment, err = tx.LockDeployment(ctx); err != nil {
+			return nil, err
+		}
+		if err := s.rules.CheckAdmission(deployment, ""); err != nil {
+			return nil, err
+		}
+	}
+	setup, err := freezeSkills(ctx, tx, input.Initialization)
+	if err != nil {
+		return nil, err
+	}
+	if input.ModelProvider != nil {
+		if err := tx.SaveModelExecution(ctx, *input.ModelProvider); err != nil {
+			return nil, err
+		}
+	}
+	if input.ExecutionConfiguration != nil {
+		projection, revision, err := freezeProjection(session, *input.ExecutionConfiguration, input.ModelProvider, input.ModelProviderSource, input.DeploymentProviderRevision)
+		if err != nil {
+			return nil, err
+		}
+		if err := tx.SaveExecutionConfiguration(ctx, projection, revision); err != nil {
+			return nil, err
+		}
+	}
+	if len(input.InitialFiles) > 0 {
+		if environmentconfig.ValidateInitialFiles(input.InitialFiles) != nil {
+			return nil, ErrInvalidInput
+		}
+		if err := tx.SaveInitialFiles(ctx, input.InitialFiles); err != nil {
+			return nil, err
+		}
+	}
+	if !setup.Empty() {
+		if err := tx.SaveSetup(ctx, setup); err != nil {
+			return nil, err
+		}
+	}
+	created := []writeaudit.Resource{{Type: "session", ID: session.ID}}
+	creates, err := createsEnvironment(session.Configuration)
+	if err != nil {
+		return nil, err
+	}
+	environment := ""
+	if creates {
+		if environment, err = tx.CreateEnvironment(ctx); err != nil {
+			return nil, err
+		}
+		created = append(created, writeaudit.Resource{Type: "environment", ID: environment, ParentID: session.ID})
+	}
+	if hosted {
+		nodes, err := tx.LoadNodes(ctx)
+		if err != nil {
+			return nil, err
+		}
+		chosen, err := s.rules.DecidePlacement(deployment, nodes)
+		if err != nil {
+			return nil, err
+		}
+		if chosen != nil {
+			if err := tx.ReservePlacement(ctx, *chosen); err != nil {
+				return nil, err
+			}
+		}
+	}
+	if len(batch) == 0 {
+		return created, nil
+	}
+	// The input key is internal, independent of the creation key and of keys
+	// callers send to the events endpoint.
+	key := uuid.NewString()
+	if environment != "" {
+		// Environment input waits for preparation and the leased promotion.
+		err = TrackInputActivity(ctx, tx, func(ctx context.Context) error {
+			_, err := tx.CreateInputReservation(ctx, key, encoded, true)
+			return err
+		})
+	} else {
+		_, err = AdmitInputs(ctx, tx, key, batch)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return created, tx.PruneChanges(ctx)
+}
+
+// freezeSkills replaces each Skill reference of setup with the version it
+// selects, read under the Skill locks, so the result no longer depends on any
+// Skill. The locks serialize selection with default changes and version and
+// Skill deletion.
+func freezeSkills(ctx context.Context, tx CreationTx, setup environmentconfig.Setup) (environmentconfig.Setup, error) {
+	if setup.Validate() != nil {
+		return environmentconfig.Setup{}, ErrInvalidInput
+	}
+	var ids []string
+	for _, skill := range setup.Skills {
+		if skill.Metadata.Type == "skill_reference" {
+			ids = append(ids, skill.Metadata.SkillID)
+		}
+	}
+	if len(ids) > 0 {
+		owners, err := tx.LockSkills(ctx, ids)
+		if err != nil {
+			return environmentconfig.Setup{}, err
+		}
+		setup.Skills = slices.Clone(setup.Skills)
+		for i, skill := range setup.Skills {
+			if skill.Metadata.Type != "skill_reference" {
+				continue
+			}
+			owner := owners[skill.Metadata.SkillID]
+			number, err := skills.SelectVersion(skill.Metadata.Version, owner.DefaultVersion, owner.LatestVersion)
+			if err != nil {
+				return environmentconfig.Setup{}, ErrInvalidInput
+			}
+			content, err := tx.ReadSkillVersion(ctx, skill.Metadata.SkillID, number)
+			if err != nil {
+				return environmentconfig.Setup{}, err
+			}
+			version := content.Version
+			setup.Skills[i] = environmentconfig.Skill{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: version.SkillID, Version: strconv.FormatInt(version.Version, 10), Name: version.Name, Description: version.Description}, Archive: content.Archive}
+		}
+	}
+	if setup.ValidateInstalled() != nil {
+		return environmentconfig.Setup{}, ErrInvalidInput
+	}
+	return setup, nil
+}
+
+// freezeProjection checks the execution projection against the new Session
+// and its provider bundle and completes it as stored. It also returns the
+// deployment provider revision to record, uuid.Nil for none. The projection is
+// creation metadata, never retry identity.
+func freezeProjection(session Session, frozen v1.SessionExecutionConfiguration, provider *v1.ModelProviderInput, providerSource string, revision uuid.UUID) (v1.SessionExecutionConfiguration, uuid.UUID, error) {
+	model, err := ExecutionModel(session.Configuration)
+	if err != nil {
+		return v1.SessionExecutionConfiguration{}, uuid.Nil, err
+	}
+	if !sameExecutionValue(frozen.Model.Value, model) || frozen.Harness.Value == nil || *frozen.Harness.Value != session.Engine ||
+		!validExecutionSource(frozen.Model.Source) || !validExecutionSource(frozen.Harness.Source) {
+		return v1.SessionExecutionConfiguration{}, uuid.Nil, fmt.Errorf("%w: execution projection does not match Session configuration", ErrInvalidInput)
+	}
+	recorded := uuid.Nil
+	switch frozen.ModelProvider.Source {
+	case "deployment":
+		if provider == nil {
+			return v1.SessionExecutionConfiguration{}, uuid.Nil, fmt.Errorf("%w: execution projection has no model provider", ErrInvalidInput)
+		}
+		// The deployment default is readable with the same Core key, so the
+		// safe view is recorded from the frozen bundle itself. Native options
+		// are never part of it.
+		frozen.ModelProvider.Status = "available"
+		frozen.ModelProvider.Configuration = provider.SafeView()
+		if providerSource == v1.ModelProviderSourceDeployment {
+			recorded = revision
+		}
+	case "session", "agent":
+		if provider == nil || frozen.ModelProvider.Status != "available" || frozen.ModelProvider.Configuration == nil || *frozen.ModelProvider.Configuration != *provider.SafeView() {
+			return v1.SessionExecutionConfiguration{}, uuid.Nil, fmt.Errorf("%w: execution projection does not match model provider", ErrInvalidInput)
+		}
+	case "unknown":
+		frozen.ModelProvider.Status = "unavailable"
+		frozen.ModelProvider.Configuration = nil
+	default:
+		return v1.SessionExecutionConfiguration{}, uuid.Nil, fmt.Errorf("%w: invalid execution projection source", ErrInvalidInput)
+	}
+	NormalizeExecutionProjection(&frozen, session.ID)
+	return frozen, recorded, nil
+}
+
+func sameExecutionValue(a, b *string) bool {
+	return a == nil && b == nil || a != nil && b != nil && *a == *b
+}
+
+func validExecutionSource(source string) bool {
+	switch source {
+	case "session", "agent", "deployment", "unknown":
+		return true
+	}
+	return false
+}
+
+// prepareCreation validates input and derives the Session to upsert with its
+// retry identity, and the validated initial inputs with their encoding.
+func prepareCreation(input CreateSession, fingerprint func(string) (string, error)) (NewSession, []Input, json.RawMessage, error) {
+	if err := input.Creator.Validate(); err != nil {
+		return NewSession{}, nil, nil, fmt.Errorf("%w: %v", ErrInvalidInput, err)
+	}
+	engine := strings.TrimSpace(input.Engine)
+	if !ValidEngine(engine) || !validCreationKey(input.IdempotencyKey) {
+		return NewSession{}, nil, nil, fmt.Errorf("%w: engine and idempotency key are required", ErrInvalidInput)
+	}
+	labels := input.Metadata
+	if labels == nil {
+		labels = map[string]string{}
+	}
+	encodedMetadata, err := metadata.Encode(labels)
+	if err != nil {
+		return NewSession{}, nil, nil, fmt.Errorf("%w: %w", ErrInvalidInput, err)
+	}
+	if len(input.Configuration) > 512*1024 {
+		return NewSession{}, nil, nil, fmt.Errorf("%w: configuration exceeds 512 KiB", ErrInvalidInput)
+	}
+	configuration, err := jsonobject.Normalize(input.Configuration)
+	if err != nil {
+		return NewSession{}, nil, nil, fmt.Errorf("%w: %w", ErrInvalidInput, err)
+	}
+	var batch []Input
+	var encodedInput json.RawMessage
+	if len(input.InitialInputs) > 0 {
+		if batch, encodedInput, err = validateMessageInputs(input.InitialInputs); err != nil {
+			return NewSession{}, nil, nil, err
+		}
+	}
+	// The retry identity covers the configuration as requested; the marker
+	// added for a provider bundle below is not caller input.
+	requested := configuration
+	if input.ModelProvider != nil {
+		if err := input.ModelProvider.ValidateHarness(engine); err != nil {
+			return NewSession{}, nil, nil, fmt.Errorf("%w: %s", ErrInvalidInput, err)
+		}
+		var fields map[string]any
+		if json.Unmarshal(configuration, &fields) != nil {
+			return NewSession{}, nil, nil, ErrInvalidInput
+		}
+		environment, _ := fields["environment"].(map[string]any)
+		environmentType, _ := environment["type"].(string)
+		if !v1.ModelProviderAllowed(environmentType, input.ModelProviderSource) {
+			return NewSession{}, nil, nil, fmt.Errorf("%w: this model provider source is not supported for the Session environment", ErrInvalidInput)
+		}
+		fields["model_provider_configured"] = true
+		if configuration, err = json.Marshal(fields); err != nil {
+			return NewSession{}, nil, nil, err
+		}
+	}
+	var initialization *environmentconfig.Setup
+	if !input.Initialization.Empty() {
+		initialization = &input.Initialization
+	}
+	// The retry identity carries a caller's provider key only as a keyed
+	// fingerprint. A deployment default is not caller input: leaving it and
+	// its configuration marker out keeps retries equivalent when the default
+	// is set, replaced or removed.
+	var fingerprinted *v1.ModelProviderInput
+	hashed := configuration
+	if input.ModelProviderSource == v1.ModelProviderSourceDeployment {
+		hashed = requested
+	} else if fingerprinted, err = fingerprintedProvider(input.ModelProvider, fingerprint); err != nil {
+		return NewSession{}, nil, nil, err
+	}
+	// encoding/json sorts map keys, so key order does not affect retries.
+	canonical, err := json.Marshal(struct {
+		ModelProvider  *v1.ModelProviderInput `json:",omitempty"`
+		Engine         string
+		Metadata       map[string]string
+		Configuration  json.RawMessage                 `json:",omitempty"`
+		InitialInputs  json.RawMessage                 `json:",omitempty"`
+		InitialFiles   []environmentconfig.InitialFile `json:",omitempty"`
+		Initialization *environmentconfig.Setup        `json:",omitempty"`
+	}{fingerprinted, engine, labels, hashed, encodedInput, input.InitialFiles, initialization})
+	if err != nil {
+		return NewSession{}, nil, nil, fmt.Errorf("%w: input: %v", ErrInvalidInput, err)
+	}
+	intent, err := intentHash(input.CreationRequest, fingerprint)
+	if err != nil {
+		return NewSession{}, nil, nil, err
+	}
+	hash := sha256.Sum256(canonical)
+	return NewSession{
+		Key: input.IdempotencyKey, Creator: input.Creator, Engine: engine, Metadata: encodedMetadata,
+		Configuration: configuration, RequestHash: hex.EncodeToString(hash[:]), IntentHash: intent,
+	}, batch, encodedInput, nil
+}
+
+func validCreationKey(key string) bool {
+	return strings.TrimSpace(key) != "" && len(key) <= 128
+}
+
+// fingerprintedProvider replaces a bundle's key with its keyed fingerprint.
+func fingerprintedProvider(provider *v1.ModelProviderInput, fingerprint func(string) (string, error)) (*v1.ModelProviderInput, error) {
+	if provider == nil {
+		return nil, nil
+	}
+	value, err := fingerprint(provider.APIKey)
+	if err != nil {
+		return nil, err
+	}
+	copy := *provider
+	copy.APIKey = "fingerprint:" + value
+	return &copy, nil
+}
+
+// intentHash hashes the caller's creation intent, nil when there is none.
+func intentHash(raw json.RawMessage, fingerprint func(string) (string, error)) (*string, error) {
+	if len(raw) == 0 {
+		return nil, nil
+	}
+	if len(raw) > 16<<20 {
+		return nil, ErrInvalidInput
+	}
+	raw, err := withoutProviderKey(raw, fingerprint)
+	if err != nil {
+		return nil, err
+	}
+	canonical, err := jsonobject.Normalize(raw)
+	if err != nil {
+		return nil, fmt.Errorf("%w: %w", ErrInvalidInput, err)
+	}
+	hash := sha256.Sum256(canonical)
+	value := hex.EncodeToString(hash[:])
+	return &value, nil
+}
+
+// withoutProviderKey replaces a caller intent's x_agents_core.model_provider
+// with its typed value carrying a keyed fingerprint instead of the key. It
+// fails closed: an intent whose extension or provider cannot be read is
+// rejected rather than hashed as raw bytes that could carry a key.
+func withoutProviderKey(raw json.RawMessage, fingerprint func(string) (string, error)) (json.RawMessage, error) {
+	var request map[string]json.RawMessage
+	if json.Unmarshal(raw, &request) != nil || request == nil {
+		return nil, ErrInvalidInput
+	}
+	extensionRaw, present := request["x_agents_core"]
+	if !present || jsonNull(extensionRaw) {
+		return raw, nil
+	}
+	var extension map[string]json.RawMessage
+	if json.Unmarshal(extensionRaw, &extension) != nil || extension == nil {
+		return nil, ErrInvalidInput
+	}
+	providerRaw, present := extension["model_provider"]
+	if !present || jsonNull(providerRaw) {
+		return raw, nil
+	}
+	var provider v1.ModelProviderInput
+	if json.Unmarshal(providerRaw, &provider) != nil {
+		return nil, ErrInvalidInput
+	}
+	fingerprinted, err := fingerprintedProvider(&provider, fingerprint)
+	if err != nil {
+		return nil, err
+	}
+	if extension["model_provider"], err = json.Marshal(fingerprinted); err != nil {
+		return nil, err
+	}
+	if request["x_agents_core"], err = json.Marshal(extension); err != nil {
+		return nil, err
+	}
+	return json.Marshal(request)
+}
+
+func jsonNull(raw json.RawMessage) bool {
+	return string(bytes.TrimSpace(raw)) == "null"
+}
+
+// FindSessionCreation recovers a creation by its recorded caller intent,
+// without resolving a mutable source. It returns only the Session ID; a
+// recovered creation is never Created.
+func (s *Service) FindSessionCreation(ctx context.Context, tenant, key string, request json.RawMessage, creator identity.Subject) (Creation, error) {
+	if err := creator.Validate(); err != nil {
+		return Creation{}, fmt.Errorf("%w: %v", ErrInvalidInput, err)
+	}
+	if !validCreationKey(key) {
+		return Creation{}, ErrInvalidInput
+	}
+	hash, err := intentHash(request, s.storage.FingerprintProviderKey)
+	if errors.Is(err, credentialcrypto.ErrUnavailable) {
+		// Without the credential key no Session with a provider bundle can
+		// have been committed or can be created; creation reports the missing
+		// key after request validation.
+		return Creation{}, ErrNotFound
+	}
+	if err != nil {
+		return Creation{}, err
+	}
+	if hash == nil {
+		return Creation{}, ErrInvalidInput
+	}
+	record, err := s.storage.FindCreation(ctx, tenant, key)
+	if err != nil {
+		return Creation{}, fmt.Errorf("find session creation: %w", err)
+	}
+	if err := decideRecovery(record, creator, *hash); err != nil {
+		return Creation{}, err
+	}
+	return Creation{Session: Session{ID: record.SessionID}}, nil
+}
+
+// decideRecovery accepts a recorded creation for the creator's intent. A
+// deleted Session, or one another or no complete creator made, conflicts
+// before a missing intent is ErrNotFound: missing intent does not imply
+// missing ownership, and the creation can still fall back to resolved-request
+// equivalence at the upsert.
+func decideRecovery(record CreationRecord, creator identity.Subject, hash string) error {
+	if record.Deleted || record.Creator == nil || *record.Creator != creator {
+		return ErrIdempotencyConflict
+	}
+	if record.IntentHash == nil {
+		return ErrNotFound
+	}
+	if *record.IntentHash != hash {
+		return ErrIdempotencyConflict
+	}
+	return nil
+}
diff --git a/services/core/internal/sessions/creation_test.go b/services/core/internal/sessions/creation_test.go
new file mode 100644
index 000000000..2fa58c0da
--- /dev/null
+++ b/services/core/internal/sessions/creation_test.go
@@ -0,0 +1,561 @@
+package sessions
+
+import (
+	"archive/zip"
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"regexp"
+	"strings"
+	"testing"
+
+	"github.com/google/uuid"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+)
+
+// fakeCreationTx is fakeInputTx with the creation methods, equally strict.
+type fakeCreationTx struct {
+	*fakeInputTx
+
+	upsertSession              func(NewSession) (Creation, error)
+	lockDeployment             func() (placement.Deployment, error)
+	loadNodes                  func() ([]placement.Node, error)
+	reservePlacement           func() error
+	lockSkills                 func() (map[string]skills.Skill, error)
+	readSkillVersion           func() (skills.Content, error)
+	saveModelExecution         func() error
+	saveExecutionConfiguration func() error
+	saveInitialFiles           func() error
+	saveSetup                  func() error
+	createEnvironment          func() (string, error)
+	pruneChanges               func() error
+	auditCreation              func() error
+	loadSession                func() (Session, error)
+}
+
+var _ CreationTx = (*fakeCreationTx)(nil)
+
+func (f *fakeCreationTx) UpsertSession(_ context.Context, session NewSession) (Creation, error) {
+	f.record("UpsertSession", f.upsertSession != nil, session.Key)
+	return f.upsertSession(session)
+}
+
+func (f *fakeCreationTx) LockDeployment(context.Context) (placement.Deployment, error) {
+	f.record("LockDeployment", f.lockDeployment != nil)
+	return f.lockDeployment()
+}
+
+func (f *fakeCreationTx) LoadNodes(context.Context) ([]placement.Node, error) {
+	f.record("LoadNodes", f.loadNodes != nil)
+	return f.loadNodes()
+}
+
+func (f *fakeCreationTx) ReservePlacement(_ context.Context, chosen placement.Placement) error {
+	f.record("ReservePlacement", f.reservePlacement != nil, chosen.NodeID, fmt.Sprint(chosen.Generation))
+	return f.reservePlacement()
+}
+
+func (f *fakeCreationTx) LockSkills(_ context.Context, ids []string) (map[string]skills.Skill, error) {
+	f.record("LockSkills", f.lockSkills != nil, ids...)
+	return f.lockSkills()
+}
+
+func (f *fakeCreationTx) ReadSkillVersion(_ context.Context, skill string, version int64) (skills.Content, error) {
+	f.record("ReadSkillVersion", f.readSkillVersion != nil, skill, fmt.Sprint(version))
+	return f.readSkillVersion()
+}
+
+func (f *fakeCreationTx) SaveModelExecution(_ context.Context, provider v1.ModelProviderInput) error {
+	f.record("SaveModelExecution", f.saveModelExecution != nil, provider.BaseURL)
+	return f.saveModelExecution()
+}
+
+func (f *fakeCreationTx) SaveExecutionConfiguration(_ context.Context, projection v1.SessionExecutionConfiguration, revision uuid.UUID) error {
+	f.record("SaveExecutionConfiguration", f.saveExecutionConfiguration != nil, projection.ModelProvider.Status, revision.String())
+	return f.saveExecutionConfiguration()
+}
+
+func (f *fakeCreationTx) SaveInitialFiles(_ context.Context, files []environmentconfig.InitialFile) error {
+	f.record("SaveInitialFiles", f.saveInitialFiles != nil, fmt.Sprint(len(files)))
+	return f.saveInitialFiles()
+}
+
+func (f *fakeCreationTx) SaveSetup(_ context.Context, setup environmentconfig.Setup) error {
+	var frozen []string
+	for _, skill := range setup.Skills {
+		frozen = append(frozen, skill.Metadata.SkillID+"@"+skill.Metadata.Version)
+	}
+	f.record("SaveSetup", f.saveSetup != nil, frozen...)
+	return f.saveSetup()
+}
+
+func (f *fakeCreationTx) CreateEnvironment(context.Context) (string, error) {
+	f.record("CreateEnvironment", f.createEnvironment != nil)
+	return f.createEnvironment()
+}
+
+func (f *fakeCreationTx) PruneChanges(context.Context) error {
+	f.record("PruneChanges", f.pruneChanges != nil)
+	return f.pruneChanges()
+}
+
+func (f *fakeCreationTx) AuditCreation(_ context.Context, created ...writeaudit.Resource) error {
+	var resources []string
+	for _, resource := range created {
+		resources = append(resources, strings.TrimSuffix(resource.Type+":"+resource.ID+":"+resource.ParentID, ":"))
+	}
+	f.record("AuditCreation", f.auditCreation != nil, resources...)
+	return f.auditCreation()
+}
+
+func (f *fakeCreationTx) LoadSession(context.Context) (Session, error) {
+	f.record("LoadSession", f.loadSession != nil)
+	return f.loadSession()
+}
+
+func (s *fakeStorage) FingerprintProviderKey(secret string) (string, error) {
+	s.record("FingerprintProviderKey", s.fingerprint != nil)
+	return s.fingerprint(secret)
+}
+
+func (s *fakeStorage) WithCreation(ctx context.Context, tenant string, apply func(context.Context, CreationTx) error) error {
+	s.record("WithCreation", s.creation != nil, tenant)
+	return apply(ctx, s.creation)
+}
+
+func (s *fakeStorage) FindCreation(_ context.Context, tenant, key string) (CreationRecord, error) {
+	s.record("FindCreation", s.findCreation != nil, tenant, key)
+	return s.findCreation()
+}
+
+// fingerprints is a fake FingerprintProviderKey that keeps keys apart.
+func fingerprints(secret string) (string, error) { return "fp-" + secret, nil }
+
+func unavailable(string) (string, error) { return "", credentialcrypto.ErrUnavailable }
+
+// declarations accept every provider and specification.
+type declarations struct{}
+
+func (declarations) RequiresPublicOrigin(string) (bool, error) { return false, nil }
+
+func (declarations) ValidateSpecification(string, sandbox.DeploymentSpec) error { return nil }
+
+var (
+	creator  = identity.Subject{Kind: "user", ID: "creator"}
+	provider = &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://model.example/v1", APIKey: "secret"}
+)
+
+func creationInput(environment string) CreateSession {
+	return CreateSession{
+		Creator: creator, Engine: "codex", IdempotencyKey: "create", Metadata: map[string]string{"b": "2", "a": "1"},
+		Configuration: json.RawMessage(`{"environment":{"type":"` + environment + `"},"agent":{"model":"gpt"}}`),
+	}
+}
+
+func TestPrepareCreation(t *testing.T) {
+	base := creationInput("self_hosted")
+	prepare := func(t *testing.T, change func(*CreateSession), fingerprint func(string) (string, error)) NewSession {
+		t.Helper()
+		input := base
+		change(&input)
+		session, _, _, err := prepareCreation(input, fingerprint)
+		if err != nil {
+			t.Fatal(err)
+		}
+		return session
+	}
+	withProvider := func(environment, key, source string) func(*CreateSession) {
+		return func(input *CreateSession) {
+			copy := *provider
+			copy.APIKey = key
+			input.Configuration = creationInput(environment).Configuration
+			input.ModelProvider, input.ModelProviderSource = &copy, source
+		}
+	}
+	session := prepare(t, func(*CreateSession) {}, fingerprints)
+	if session.Key != "create" || session.Engine != "codex" || session.Creator != creator || session.IntentHash != nil || string(session.Metadata) != `{"a":"1","b":"2"}` {
+		t.Fatalf("session %+v", session)
+	}
+	if prepare(t, func(input *CreateSession) {
+		input.Metadata = map[string]string{"a": "1", "b": "2"}
+		input.Engine = " codex "
+	}, fingerprints).RequestHash != session.RequestHash {
+		t.Fatal("metadata order or engine whitespace changed the identity")
+	}
+	inputs := []Input{messageInput("first"), messageInput("second")}
+	initial := prepare(t, func(input *CreateSession) { input.InitialInputs = inputs }, fingerprints).RequestHash
+	for _, changed := range [][]Input{nil, {messageInput("changed")}, {inputs[1], inputs[0]}} {
+		if prepare(t, func(input *CreateSession) { input.InitialInputs = changed }, fingerprints).RequestHash == initial {
+			t.Fatal("changed initial input kept the identity", changed)
+		}
+	}
+	if prepare(t, withProvider("self_hosted", "one", "session"), fingerprints).RequestHash == prepare(t, withProvider("self_hosted", "two", "session"), fingerprints).RequestHash {
+		t.Fatal("caller keys share an identity")
+	}
+	deployed := prepare(t, withProvider("none", "deployment-key", v1.ModelProviderSourceDeployment), unavailable)
+	plain := prepare(t, func(input *CreateSession) { input.Configuration = creationInput("none").Configuration }, unavailable)
+	if !strings.Contains(string(deployed.Configuration), `"model_provider_configured":true`) || deployed.RequestHash != plain.RequestHash {
+		t.Fatalf("the deployment default joined the identity: %s", deployed.Configuration)
+	}
+	if intent := prepare(t, func(input *CreateSession) { input.CreationRequest = json.RawMessage(`{"agent_id":"a"}`) }, fingerprints).IntentHash; intent == nil {
+		t.Fatal("no intent hash")
+	}
+
+	for name, test := range map[string]struct {
+		change      func(*CreateSession)
+		fingerprint func(string) (string, error)
+		want        error
+	}{
+		"invalid creator": {func(input *CreateSession) { input.Creator = identity.Subject{} }, fingerprints, ErrInvalidInput},
+		"invalid engine":  {func(input *CreateSession) { input.Engine = "Codex" }, fingerprints, ErrInvalidInput},
+		"blank key":       {func(input *CreateSession) { input.IdempotencyKey = " " }, fingerprints, ErrInvalidInput},
+		"long key":        {func(input *CreateSession) { input.IdempotencyKey = strings.Repeat("k", 129) }, fingerprints, ErrInvalidInput},
+		"configuration over 512K": {func(input *CreateSession) {
+			input.Configuration = json.RawMessage(`"` + strings.Repeat("x", 512*1024) + `"`)
+		}, fingerprints, ErrInvalidInput},
+		"configuration array":    {func(input *CreateSession) { input.Configuration = json.RawMessage(`[]`) }, fingerprints, ErrInvalidInput},
+		"cancel initial input":   {func(input *CreateSession) { input.InitialInputs = []Input{cancelInput} }, fingerprints, ErrInvalidInput},
+		"deployment self_hosted": {withProvider("self_hosted", "key", v1.ModelProviderSourceDeployment), fingerprints, ErrInvalidInput},
+		"no credential key":      {withProvider("self_hosted", "key", "session"), unavailable, credentialcrypto.ErrUnavailable},
+		"unreadable intent":      {func(input *CreateSession) { input.CreationRequest = json.RawMessage(`[]`) }, fingerprints, ErrInvalidInput},
+	} {
+		t.Run(name, func(t *testing.T) {
+			input := base
+			test.change(&input)
+			if _, _, _, err := prepareCreation(input, test.fingerprint); !errors.Is(err, test.want) {
+				t.Fatalf("got %v, want %v", err, test.want)
+			}
+		})
+	}
+}
+
+func TestIntentHash(t *testing.T) {
+	hash := func(raw string, fingerprint func(string) (string, error)) (*string, error) {
+		return intentHash(json.RawMessage(raw), fingerprint)
+	}
+	if value, err := hash("", fingerprints); value != nil || err != nil {
+		t.Fatal("empty intent", value, err)
+	}
+	one, err := hash(`{"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"u","api_key":"one"}},"b":1}`, fingerprints)
+	if err != nil {
+		t.Fatal(err)
+	}
+	reordered, _ := hash(` {"b":1,"x_agents_core":{"model_provider":{"api_key":"one","base_url":"u","protocol":"responses"}}}`, fingerprints)
+	two, _ := hash(`{"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"u","api_key":"two"}},"b":1}`, fingerprints)
+	if one == nil || *one != *reordered || *one == *two {
+		t.Fatal("intent hash ignores order or confuses keys")
+	}
+	for name, test := range map[string]struct {
+		raw         string
+		fingerprint func(string) (string, error)
+		want        error
+	}{
+		"not an object":        {`[]`, fingerprints, ErrInvalidInput},
+		"over 16 MiB":          {`"` + strings.Repeat("x", 16<<20) + `"`, fingerprints, ErrInvalidInput},
+		"extension not object": {`{"x_agents_core":[]}`, fingerprints, ErrInvalidInput},
+		"provider unreadable":  {`{"x_agents_core":{"model_provider":[]}}`, fingerprints, ErrInvalidInput},
+		"provider no key":      {`{"x_agents_core":{"model_provider":{"api_key":"k"}}}`, unavailable, credentialcrypto.ErrUnavailable},
+		"null extension":       {`{"x_agents_core":null}`, unavailable, nil},
+		"null provider":        {`{"x_agents_core":{"model_provider":null}}`, unavailable, nil},
+		"intent without key":   {`{"agent_id":"a"}`, unavailable, nil},
+	} {
+		if _, err := hash(test.raw, test.fingerprint); test.want == nil && err != nil || test.want != nil && !errors.Is(err, test.want) {
+			t.Errorf("%s: got %v, want %v", name, err, test.want)
+		}
+	}
+}
+
+func TestFreezeProjection(t *testing.T) {
+	model, harness := "gpt", "codex"
+	session := Session{ID: "session", Engine: harness, Configuration: json.RawMessage(`{"agent":{"model":"gpt"}}`)}
+	revision := uuid.New()
+	projection := func(source, status string, view *v1.ModelProviderView) v1.SessionExecutionConfiguration {
+		return v1.SessionExecutionConfiguration{
+			Model: v1.ExecutionSelection{Value: &model, Source: "session"}, Harness: v1.ExecutionSelection{Value: &harness, Source: "agent"},
+			ModelProvider: v1.ExecutionProviderSelection{Source: source, Status: status, Configuration: view},
+		}
+	}
+	other := "other"
+	mismatched := projection("unknown", "", nil)
+	mismatched.Harness.Value = &other
+	for name, test := range map[string]struct {
+		projection   v1.SessionExecutionConfiguration
+		provider     *v1.ModelProviderInput
+		source       string
+		status       string
+		revision     uuid.UUID
+		want         error
+		hasProjected bool
+	}{
+		"deployment records its revision":  {projection("deployment", "", nil), provider, v1.ModelProviderSourceDeployment, "available", revision, nil, true},
+		"deployment from another source":   {projection("deployment", "", nil), provider, "session", "available", uuid.Nil, nil, true},
+		"deployment without a provider":    {projection("deployment", "", nil), nil, "", "", uuid.Nil, ErrInvalidInput, false},
+		"caller provider matches":          {projection("session", "available", provider.SafeView()), provider, "session", "available", uuid.Nil, nil, true},
+		"caller provider mismatches":       {projection("agent", "available", &v1.ModelProviderView{BaseURL: "other"}), provider, "agent", "", uuid.Nil, ErrInvalidInput, false},
+		"unknown provider is unavailable":  {projection("unknown", "available", provider.SafeView()), nil, "", "unavailable", uuid.Nil, nil, true},
+		"invalid provider source":          {projection("vault", "", nil), nil, "", "", uuid.Nil, ErrInvalidInput, false},
+		"harness mismatches configuration": {mismatched, nil, "", "", uuid.Nil, ErrInvalidInput, false},
+	} {
+		t.Run(name, func(t *testing.T) {
+			frozen, recorded, err := freezeProjection(session, test.projection, test.provider, test.source, revision)
+			if test.want == nil && err != nil || test.want != nil && !errors.Is(err, test.want) {
+				t.Fatalf("got %v, want %v", err, test.want)
+			}
+			if !test.hasProjected {
+				return
+			}
+			if frozen.ModelProvider.Status != test.status || recorded != test.revision || frozen.SessionID != "session" || frozen.Object != "agent.session.execution_configuration" {
+				t.Fatalf("frozen %+v, revision %s", frozen, recorded)
+			}
+		})
+	}
+}
+
+func TestDecideRecovery(t *testing.T) {
+	hash, other := "hash", "other"
+	stranger := identity.Subject{Kind: "user", ID: "stranger"}
+	for name, test := range map[string]struct {
+		record CreationRecord
+		want   error
+	}{
+		"matching intent":         {CreationRecord{Creator: &creator, IntentHash: &hash}, nil},
+		"deleted":                 {CreationRecord{Deleted: true, Creator: &creator, IntentHash: &hash}, ErrIdempotencyConflict},
+		"no creator":              {CreationRecord{IntentHash: &hash}, ErrIdempotencyConflict},
+		"another creator":         {CreationRecord{Creator: &stranger, IntentHash: &hash}, ErrIdempotencyConflict},
+		"no intent":               {CreationRecord{Creator: &creator}, ErrNotFound},
+		"deleted without intent":  {CreationRecord{Deleted: true, Creator: &creator}, ErrIdempotencyConflict},
+		"another intent":          {CreationRecord{Creator: &creator, IntentHash: &other}, ErrIdempotencyConflict},
+		"stranger without intent": {CreationRecord{Creator: &stranger}, ErrIdempotencyConflict},
+	} {
+		if err := decideRecovery(test.record, creator, hash); err != test.want {
+			t.Errorf("%s: got %v, want %v", name, err, test.want)
+		}
+	}
+}
+
+// skillZip is a Skill archive of one SKILL.md.
+func skillZip(t *testing.T, name, description string) []byte {
+	t.Helper()
+	var buffer bytes.Buffer
+	writer := zip.NewWriter(&buffer)
+	file, err := writer.Create(name + "/SKILL.md")
+	if err == nil {
+		_, err = fmt.Fprintf(file, "---\nname: %s\ndescription: %s\n---\n", name, description)
+	}
+	if err == nil {
+		err = writer.Close()
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+	return buffer.Bytes()
+}
+
+// newCreationTx is a strict creation transaction whose upsert creates
+// session, or returns it as stored when created is false.
+func newCreationTx(t *testing.T, session Session, created bool) *fakeCreationTx {
+	tx := &fakeCreationTx{fakeInputTx: newInputTx(t)}
+	tx.upsertSession = func(NewSession) (Creation, error) {
+		return Creation{Session: session, Created: created, Cursor: 4}, nil
+	}
+	tx.auditCreation = done
+	tx.loadSession = returns(Session{ID: session.ID, Engine: "loaded"})
+	return tx
+}
+
+// runCreation creates input with the service's rules on tx and returns the
+// result and the transaction's calls, with the internal input key replaced.
+func runCreation(t *testing.T, rules *placement.Rules, tx *fakeCreationTx, input CreateSession) (Creation, error, []string) {
+	t.Helper()
+	storage := &fakeStorage{t: t, creation: tx, fingerprint: fingerprints}
+	service, err := NewService(storage, rules)
+	if err != nil {
+		t.Fatal(err)
+	}
+	result, err := service.CreateSession(t.Context(), "tenant", input)
+	calls := strings.Join(tx.calls, "\n")
+	if key := regexp.MustCompile(`(?:CreateInputReservation|CreateTurnInput \S+) (\S+)`).FindStringSubmatch(calls); key != nil {
+		if _, parseErr := uuid.Parse(key[1]); parseErr != nil {
+			t.Fatalf("input key %q", key[1])
+		}
+		calls = strings.ReplaceAll(calls, key[1], "<key>")
+	}
+	return result, err, strings.Split(calls, "\n")
+}
+
+func TestCreateSession(t *testing.T) {
+	rules, err := placement.NewRules(declarations{}, "https://core.example")
+	if err != nil {
+		t.Fatal(err)
+	}
+	selfHosted := Session{ID: "session", Engine: "codex", Configuration: json.RawMessage(`{"agent":{"model":"gpt"},"environment":{"type":"self_hosted"}}`)}
+	hostedSession := Session{ID: "session", Engine: "codex", Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`)}
+	noEnvironment := Session{ID: "session", Engine: "codex", Configuration: json.RawMessage(`{"environment":{"type":"none"}}`)}
+
+	t.Run("a new self-hosted Session freezes, then reserves its initial input", func(t *testing.T) {
+		tx := newCreationTx(t, selfHosted, true)
+		tx.lockSkills = returns(map[string]skills.Skill{"skill_a": {DefaultVersion: 2, LatestVersion: 3}})
+		tx.readSkillVersion = returns(skills.Content{Version: skills.Version{SkillID: "skill_a", Version: 3, Name: "proof", Description: "Verify a frozen Skill."}, Archive: skillZip(t, "proof", "Verify a frozen Skill.")})
+		tx.saveModelExecution, tx.saveExecutionConfiguration, tx.saveInitialFiles, tx.saveSetup = done, done, done, done
+		tx.createEnvironment = returns("environment")
+		tx.loadEnvironmentInput, tx.createInputReservation, tx.pruneChanges = inputs(), returns(EnvironmentInputReservation{}), done
+		input := creationInput("self_hosted")
+		input.ModelProvider, input.ModelProviderSource = provider, "session"
+		model, harness := "gpt", "codex"
+		input.ExecutionConfiguration = &v1.SessionExecutionConfiguration{Model: v1.ExecutionSelection{Value: &model, Source: "session"}, Harness: v1.ExecutionSelection{Value: &harness, Source: "session"},
+			ModelProvider: v1.ExecutionProviderSelection{Source: "session", Status: "available", Configuration: provider.SafeView()}}
+		input.InitialFiles = []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a.txt", Data: []byte("a")}}
+		input.Initialization = environmentconfig.Setup{Skills: []environmentconfig.Skill{{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: "skill_a", Version: "latest"}}}}
+		input.InitialInputs = []Input{messageInput("hi")}
+		result, err, calls := runCreation(t, rules, tx, input)
+		if err != nil || !result.Created || result.Cursor != 4 || result.Session.Engine != "loaded" {
+			t.Fatalf("result %+v, %v", result, err)
+		}
+		want := []string{"UpsertSession create", "LockSkills skill_a", "ReadSkillVersion skill_a 3", "SaveModelExecution https://model.example/v1",
+			"SaveExecutionConfiguration available " + uuid.Nil.String(), "SaveInitialFiles 1", "SaveSetup skill_a@3", "CreateEnvironment",
+			"LoadEnvironmentInput", `CreateInputReservation <key> [{"kind":"message","payload":{"text":"hi"}}] initial`, "LoadEnvironmentInput",
+			"PruneChanges", "AuditCreation session:session environment:environment:session", "LoadSession"}
+		if strings.Join(calls, "\n") != strings.Join(want, "\n") {
+			t.Fatalf("calls:\n%s\nwant:\n%s", strings.Join(calls, "\n"), strings.Join(want, "\n"))
+		}
+	})
+
+	t.Run("a new Session without an Environment admits its initial input", func(t *testing.T) {
+		tx := newCreationTx(t, noEnvironment, true)
+		tx.loadActiveTurn, tx.createTurn, tx.appendChanges = activeTurn(nil), returns(turnWith(TurnQueued)), collect(new([]SessionChange))
+		tx.createTurnInput, tx.loadInputSource, tx.loadUsage, tx.pruneChanges = sequences(7), unprojected, returns(json.RawMessage(`{}`)), done
+		input := creationInput("none")
+		input.InitialInputs = []Input{messageInput("hi")}
+		_, err, calls := runCreation(t, nil, tx, input)
+		want := []string{"UpsertSession create", "LoadActiveTurn", "CreateTurn", "AppendChanges agent.session.turn.created", "CreateTurnInput " + testTurn + " <key> 0 message",
+			"LoadInputSource 7", "LoadUsage", "AppendChanges agent.session.in_progress", "PruneChanges", "AuditCreation session:session", "LoadSession"}
+		if err != nil || strings.Join(calls, "\n") != strings.Join(want, "\n") {
+			t.Fatalf("calls:\n%s\nwant:\n%s\n%v", strings.Join(calls, "\n"), strings.Join(want, "\n"), err)
+		}
+	})
+
+	t.Run("a hosted Session is admitted under the deployment lock and placed after its Environment", func(t *testing.T) {
+		ready := uint64(5)
+		tx := newCreationTx(t, hostedSession, true)
+		tx.lockDeployment = returns(placement.Deployment{InstallationID: "installation", Provider: "docker", Specification: json.RawMessage(`{}`)})
+		tx.createEnvironment = returns("environment")
+		tx.loadNodes = returns([]placement.Node{{ID: "node", Online: true, ServingReady: true, ReadyGeneration: &ready, MaxActive: 1, MaxRetained: 1}})
+		tx.reservePlacement = done
+		_, err, calls := runCreation(t, rules, tx, creationInput("openai_hosted"))
+		want := []string{"UpsertSession create", "LockDeployment", "CreateEnvironment", "LoadNodes", "ReservePlacement node 5", "AuditCreation session:session environment:environment:session", "LoadSession"}
+		if err != nil || strings.Join(calls, "\n") != strings.Join(want, "\n") {
+			t.Fatalf("calls %q, %v", calls, err)
+		}
+	})
+
+	for _, test := range []struct {
+		name  string
+		rules *placement.Rules
+		tx    func(*fakeCreationTx)
+		want  error
+		calls []string
+	}{
+		{"a reset closes hosted admission", rules, func(tx *fakeCreationTx) {
+			tx.lockDeployment = returns(placement.Deployment{InstallationID: "installation", Resetting: true})
+		}, placement.ErrResetAdmission, []string{"UpsertSession create", "LockDeployment"}},
+		{"no node places the Environment", rules, func(tx *fakeCreationTx) {
+			tx.lockDeployment = returns(placement.Deployment{InstallationID: "installation", Provider: "docker", Specification: json.RawMessage(`{}`)})
+			tx.createEnvironment, tx.loadNodes = returns("environment"), returns([]placement.Node(nil))
+		}, placement.ErrNodeUnavailable, []string{"UpsertSession create", "LockDeployment", "CreateEnvironment", "LoadNodes"}},
+		{"hosted creation needs rules", nil, func(*fakeCreationTx) {}, nil, []string{"UpsertSession create"}},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			tx := newCreationTx(t, hostedSession, true)
+			test.tx(tx)
+			_, err, calls := runCreation(t, test.rules, tx, creationInput("openai_hosted"))
+			if err == nil || test.want != nil && !errors.Is(err, test.want) || strings.Join(calls, "\n") != strings.Join(test.calls, "\n") {
+				t.Fatalf("calls %q, %v", calls, err)
+			}
+		})
+	}
+
+	t.Run("a retry only audits and reads the stored Session", func(t *testing.T) {
+		tx := newCreationTx(t, hostedSession, false)
+		input := creationInput("openai_hosted")
+		input.InitialInputs = []Input{messageInput("hi")}
+		result, err, calls := runCreation(t, nil, tx, input)
+		if err != nil || result.Created || result.Cursor != 4 || strings.Join(calls, "\n") != "UpsertSession create\nAuditCreation\nLoadSession" {
+			t.Fatalf("result %+v, calls %q, %v", result, calls, err)
+		}
+	})
+
+	t.Run("a failed audit fails the creation", func(t *testing.T) {
+		tx := newCreationTx(t, noEnvironment, true)
+		tx.auditCreation = func() error { return errStorage }
+		if _, err, calls := runCreation(t, nil, tx, creationInput("none")); !errors.Is(err, errStorage) || strings.Join(calls, "\n") != "UpsertSession create\nAuditCreation session:session" {
+			t.Fatalf("calls %q, %v", calls, err)
+		}
+	})
+
+	t.Run("invalid input never reaches storage", func(t *testing.T) {
+		storage := &fakeStorage{t: t}
+		service, err := NewService(storage, rules)
+		if err != nil {
+			t.Fatal(err)
+		}
+		input := creationInput("none")
+		input.IdempotencyKey = ""
+		if _, err := service.CreateSession(t.Context(), "tenant", input); !errors.Is(err, ErrInvalidInput) || len(storage.calls) != 0 {
+			t.Fatal(err, storage.calls)
+		}
+	})
+}
+
+func TestFindSessionCreation(t *testing.T) {
+	request := json.RawMessage(`{"agent_id":"agent"}`)
+	hash, err := intentHash(request, fingerprints)
+	if err != nil {
+		t.Fatal(err)
+	}
+	found := func() (CreationRecord, error) {
+		return CreationRecord{SessionID: "session", Creator: &creator, IntentHash: hash}, nil
+	}
+	for _, test := range []struct {
+		name        string
+		key         string
+		request     json.RawMessage
+		creator     identity.Subject
+		fingerprint func(string) (string, error)
+		find        func() (CreationRecord, error)
+		want        error
+		calls       []string
+	}{
+		{"recorded intent", "create", request, creator, fingerprints, found, nil, []string{"FindCreation tenant create"}},
+		{"missing creation", "create", request, creator, fingerprints, func() (CreationRecord, error) { return CreationRecord{}, ErrNotFound }, ErrNotFound, []string{"FindCreation tenant create"}},
+		{"another creator", "create", request, identity.Subject{Kind: "user", ID: "stranger"}, fingerprints, found, ErrIdempotencyConflict, []string{"FindCreation tenant create"}},
+		{"no credential key", "create", json.RawMessage(`{"x_agents_core":{"model_provider":{"api_key":"k"}}}`), creator, unavailable, nil, ErrNotFound, []string{"FingerprintProviderKey"}},
+		{"no intent", "create", nil, creator, nil, nil, ErrInvalidInput, nil},
+		{"invalid key", " ", request, creator, nil, nil, ErrInvalidInput, nil},
+		{"invalid creator", "create", request, identity.Subject{}, nil, nil, ErrInvalidInput, nil},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			storage := &fakeStorage{t: t, fingerprint: test.fingerprint, findCreation: test.find}
+			service, err := NewService(storage, nil)
+			if err != nil {
+				t.Fatal(err)
+			}
+			result, err := service.FindSessionCreation(t.Context(), "tenant", test.key, test.request, test.creator)
+			if test.want == nil && (err != nil || result.Session.ID != "session" || result.Created) || test.want != nil && !errors.Is(err, test.want) {
+				t.Fatalf("result %+v, %v", result, err)
+			}
+			if strings.Join(storage.calls, "\n") != strings.Join(test.calls, "\n") {
+				t.Fatalf("storage calls %q", storage.calls)
+			}
+		})
+	}
+}
diff --git a/services/core/internal/sessions/devices_test.go b/services/core/internal/sessions/devices_test.go
index 1976c4769..0ea72fcd4 100644
--- a/services/core/internal/sessions/devices_test.go
+++ b/services/core/internal/sessions/devices_test.go
@@ -47,6 +47,10 @@ type fakeStorage struct {
 	auditOperation func() error
 	// inputTx is the transaction WithInputs applies in.
 	inputTx *fakeInputTx
+	// creation is the transaction WithCreation applies in.
+	creation     *fakeCreationTx
+	fingerprint  func(secret string) (string, error)
+	findCreation func() (CreationRecord, error)
 }
 
 func (s *fakeStorage) record(name string, set bool, detail ...string) {
@@ -109,7 +113,7 @@ func (s *fakeStorage) DeleteSessionArtifact(context.Context, string, string, str
 
 func deviceService(t *testing.T, storage *fakeStorage) *Service {
 	t.Helper()
-	service, err := NewService(storage)
+	service, err := NewService(storage, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/sessions/environment.go b/services/core/internal/sessions/environment.go
index 107aa894c..3ec6c03fe 100644
--- a/services/core/internal/sessions/environment.go
+++ b/services/core/internal/sessions/environment.go
@@ -38,10 +38,10 @@ type EnvironmentReader interface {
 	ReadInitialEnvironmentFile(ctx context.Context, tenant, session string, position int) (environmentconfig.InitialFileMetadata, []byte, error)
 }
 
-// CreatesEnvironment reports whether a Session created with the configuration
+// createsEnvironment reports whether a Session created with the configuration
 // snapshot has an Environment: a self_hosted or openai_hosted one does, and
 // none or no Environment does not. Any other snapshot is ErrInvalidInput.
-func CreatesEnvironment(configuration json.RawMessage) (bool, error) {
+func createsEnvironment(configuration json.RawMessage) (bool, error) {
 	var snapshot struct {
 		Environment *struct {
 			Type string `json:"type"`
diff --git a/services/core/internal/sessions/environment_inputs.go b/services/core/internal/sessions/environment_inputs.go
index c0b02bee8..5eb7e37eb 100644
--- a/services/core/internal/sessions/environment_inputs.go
+++ b/services/core/internal/sessions/environment_inputs.go
@@ -40,7 +40,7 @@ func (s *Service) ReserveEnvironmentInput(ctx context.Context, tenant, session,
 	if err := ValidateInputKey(key); err != nil {
 		return EnvironmentInputReservation{}, err
 	}
-	batch, encoded, err := ValidateMessageInputs(inputs)
+	batch, encoded, err := validateMessageInputs(inputs)
 	if err != nil {
 		return EnvironmentInputReservation{}, err
 	}
@@ -108,7 +108,7 @@ func (s *Service) ReserveEnvironmentInput(ctx context.Context, tenant, session,
 				result = EnvironmentInputReservation{SessionID: session, State: EnvironmentInputAdmitted, Receipts: receipts}
 				return tx.RecordInputAudit(ctx)
 			}
-			if result, err = tx.CreateInputReservation(ctx, key, encoded); err != nil {
+			if result, err = tx.CreateInputReservation(ctx, key, encoded, false); err != nil {
 				return err
 			}
 			return tx.RecordInputAudit(ctx)
diff --git a/services/core/internal/sessions/environment_test.go b/services/core/internal/sessions/environment_test.go
index a3df7db70..986c5a9ca 100644
--- a/services/core/internal/sessions/environment_test.go
+++ b/services/core/internal/sessions/environment_test.go
@@ -13,12 +13,12 @@ func TestCreatesEnvironment(t *testing.T) {
 		`{"environment":{"type":"self_hosted"}}`:   true,
 		`{"environment":{"type":"openai_hosted"}}`: true,
 	} {
-		if got, err := CreatesEnvironment([]byte(configuration)); err != nil || got != want {
+		if got, err := createsEnvironment([]byte(configuration)); err != nil || got != want {
 			t.Fatalf("%s: %v, %v", configuration, got, err)
 		}
 	}
 	for _, configuration := range []string{`not json`, `{"environment":{"type":"docker"}}`, `{"environment":{}}`} {
-		if _, err := CreatesEnvironment([]byte(configuration)); !errors.Is(err, ErrInvalidInput) {
+		if _, err := createsEnvironment([]byte(configuration)); !errors.Is(err, ErrInvalidInput) {
 			t.Fatalf("%s: %v", configuration, err)
 		}
 	}
diff --git a/services/core/internal/sessions/executor_credentials_test.go b/services/core/internal/sessions/executor_credentials_test.go
index fb8964205..345b4b35f 100644
--- a/services/core/internal/sessions/executor_credentials_test.go
+++ b/services/core/internal/sessions/executor_credentials_test.go
@@ -148,7 +148,7 @@ func runCredentialCases(t *testing.T, cases []credentialCase, digest *string) {
 			tx.t = t
 			storage := test.storage
 			storage.t, storage.credentials = t, &tx
-			service, err := NewService(&storage)
+			service, err := NewService(&storage, nil)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/sessions/inputs.go b/services/core/internal/sessions/inputs.go
index 264cbb106..78706022b 100644
--- a/services/core/internal/sessions/inputs.go
+++ b/services/core/internal/sessions/inputs.go
@@ -73,10 +73,10 @@ func ValidateInputs(inputs []Input) ([]Input, json.RawMessage, error) {
 	return batch, encoded, err
 }
 
-// ValidateMessageInputs validates a batch as ValidateInputs does and also
+// validateMessageInputs validates a batch as ValidateInputs does and also
 // requires that it holds only messages, as Environment input reservations and
 // Session initial input do.
-func ValidateMessageInputs(inputs []Input) ([]Input, json.RawMessage, error) {
+func validateMessageInputs(inputs []Input) ([]Input, json.RawMessage, error) {
 	for _, input := range inputs {
 		if input.Kind != "message" {
 			return nil, nil, ErrInvalidInput
@@ -267,8 +267,9 @@ type InputTx interface {
 	// carries the receipts of its batch.
 	LoadInputReservation(ctx context.Context, reservation string) (EnvironmentInputReservation, error)
 	// CreateInputReservation reserves batch under key until the deadline the
-	// database clock sets, and returns the pending reservation as stored.
-	CreateInputReservation(ctx context.Context, key string, batch json.RawMessage) (EnvironmentInputReservation, error)
+	// database clock sets, marked initial when it is the Session's initial
+	// input, and returns the pending reservation as stored.
+	CreateInputReservation(ctx context.Context, key string, batch json.RawMessage, initial bool) (EnvironmentInputReservation, error)
 	// ExpireInputReservation expires the reservation while it is pending and
 	// its deadline has passed by the database clock; otherwise it changes
 	// nothing.
diff --git a/services/core/internal/sessions/inputs_test.go b/services/core/internal/sessions/inputs_test.go
index 6120dfb46..22930d983 100644
--- a/services/core/internal/sessions/inputs_test.go
+++ b/services/core/internal/sessions/inputs_test.go
@@ -67,8 +67,12 @@ func (f *fakeInputTx) LoadInputReservation(_ context.Context, reservation string
 	return f.loadInputReservation()
 }
 
-func (f *fakeInputTx) CreateInputReservation(_ context.Context, key string, batch json.RawMessage) (EnvironmentInputReservation, error) {
-	f.record("CreateInputReservation", f.createInputReservation != nil, key, string(batch))
+func (f *fakeInputTx) CreateInputReservation(_ context.Context, key string, batch json.RawMessage, initial bool) (EnvironmentInputReservation, error) {
+	detail := []string{key, string(batch)}
+	if initial {
+		detail = append(detail, "initial")
+	}
+	f.record("CreateInputReservation", f.createInputReservation != nil, detail...)
 	return f.createInputReservation()
 }
 
@@ -140,11 +144,11 @@ func TestValidateInputs(t *testing.T) {
 }
 
 func TestValidateMessageInputs(t *testing.T) {
-	if _, encoded, err := ValidateMessageInputs([]Input{messageInput("hi")}); err != nil || string(encoded) != `[{"kind":"message","payload":{"text":"hi"}}]` {
+	if _, encoded, err := validateMessageInputs([]Input{messageInput("hi")}); err != nil || string(encoded) != `[{"kind":"message","payload":{"text":"hi"}}]` {
 		t.Fatalf("batch %s, %v", encoded, err)
 	}
 	for name, inputs := range map[string][]Input{"cancel": {messageInput("hi"), cancelInput}, "no inputs": nil} {
-		if _, _, err := ValidateMessageInputs(inputs); !errors.Is(err, ErrInvalidInput) {
+		if _, _, err := validateMessageInputs(inputs); !errors.Is(err, ErrInvalidInput) {
 			t.Errorf("%s: %v", name, err)
 		}
 	}
diff --git a/services/core/internal/sessions/service.go b/services/core/internal/sessions/service.go
index df891e54c..fe4d90bdf 100644
--- a/services/core/internal/sessions/service.go
+++ b/services/core/internal/sessions/service.go
@@ -1,22 +1,32 @@
 package sessions
 
-import "errors"
+import (
+	"errors"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
+)
 
 // Service runs the pooled Session use cases: those that need no execution
 // fencing, even when only execution calls them. Reads go through Reader.
-type Service struct{ storage Storage }
+type Service struct {
+	storage Storage
+	rules   *placement.Rules
+}
 
-// NewService builds the Session use cases on storage.
-func NewService(storage Storage) (*Service, error) {
+// NewService builds the Session use cases on storage. rules admit and place
+// hosted Session creation; nil rules serve a service that never creates
+// hosted Sessions, whose hosted creation then fails.
+func NewService(storage Storage, rules *placement.Rules) (*Service, error) {
 	if storage == nil {
 		return nil, errors.New("sessions: storage is required")
 	}
-	return &Service{storage: storage}, nil
+	return &Service{storage: storage, rules: rules}, nil
 }
 
 // Storage persists the pooled Session use cases, one family per line.
 type Storage interface {
 	ArtifactStorage
+	CreationStorage
 	DeviceStorage
 	ExecutorCredentialStorage
 	SessionStorage
diff --git a/services/core/internal/sessions/session.go b/services/core/internal/sessions/session.go
index 8e922604d..eb43abedc 100644
--- a/services/core/internal/sessions/session.go
+++ b/services/core/internal/sessions/session.go
@@ -63,12 +63,12 @@ type Page struct {
 	NextCursor string
 }
 
-// Creation starts observation at the Session upsert. For a new creation,
-// CreateSessionStream returns the committed Session projection that
-// CreateSession returns, read after the creation commits; Cursor still precedes
-// the initial inputs, so their events remain observable exactly once. Retries
-// and FindSessionCreation return only the resource row and its cursor. Only a new creation emits a created snapshot and
-// streams from Cursor; a stream retry of an existing creation sends no events.
+// Creation starts observation at the Session upsert. Session is the Session
+// projection the creation transaction read last, after any initial input;
+// Cursor is the event sequence the upsert returned, before that input, so its
+// events remain observable exactly once. Only a new creation emits a created
+// snapshot and streams from Cursor; a stream retry of an existing creation
+// sends no events. FindSessionCreation returns only the Session ID.
 type Creation struct {
 	Session Session
 	Created bool
diff --git a/services/core/internal/sessions/session_test.go b/services/core/internal/sessions/session_test.go
index 120ae30cd..53013d9e6 100644
--- a/services/core/internal/sessions/session_test.go
+++ b/services/core/internal/sessions/session_test.go
@@ -48,7 +48,7 @@ func TestDeleteSession(t *testing.T) {
 			tx := test.tx
 			tx.t = t
 			storage := &fakeStorage{t: t, deletion: &tx, locked: test.locked}
-			service, err := NewService(storage)
+			service, err := NewService(storage, nil)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -68,7 +68,7 @@ func TestDeleteSession(t *testing.T) {
 
 func TestUpdateSessionMetadata(t *testing.T) {
 	storage := &fakeStorage{t: t, updateMetadata: func(string) (Session, error) { return Session{ID: "session"}, nil }}
-	service, err := NewService(storage)
+	service, err := NewService(storage, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -84,7 +84,7 @@ func TestUpdateSessionMetadata(t *testing.T) {
 
 func TestAuditSessionOperation(t *testing.T) {
 	storage := &fakeStorage{t: t, auditOperation: done}
-	service, err := NewService(storage)
+	service, err := NewService(storage, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/admin_session_archive_test.go b/services/core/internal/store/admin_session_archive_test.go
index cda2e569b..0f724c886 100644
--- a/services/core/internal/store/admin_session_archive_test.go
+++ b/services/core/internal/store/admin_session_archive_test.go
@@ -11,11 +11,32 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/filepg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
+// testFiles returns the files domain over pool for tests that need a File.
+func testFiles(t *testing.T, pool *pgxpool.Pool) (*files.Service, *filepg.Store) {
+	t.Helper()
+	storage := filepg.New(pgunit.NewPool(pool))
+	service, err := files.NewService(storage)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return service, storage
+}
+
+func uploadSource(data []byte) func(io.Writer) (files.Upload, error) {
+	return func(w io.Writer) (files.Upload, error) {
+		_, err := w.Write(data)
+		return files.Upload{Filename: "source.bin", Purpose: files.PurposeUserData}, err
+	}
+}
+
 func managedArchiveFixture(t *testing.T) (*Store, *Store, string) {
 	t.Helper()
 	_, pool := newManagedTestStore(t)
diff --git a/services/core/internal/store/admin_session_archive_worker_http_test.go b/services/core/internal/store/admin_session_archive_worker_http_test.go
index 7085b64fa..6057235a5 100644
--- a/services/core/internal/store/admin_session_archive_worker_http_test.go
+++ b/services/core/internal/store/admin_session_archive_worker_http_test.go
@@ -58,11 +58,11 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	owner, err := fixtureOwner(db, s, lease)
+	owner, err := fixtureOwner(db, lease)
 	if err != nil {
 		t.Fatal(errors.Join(err, lease.Close(t.Context())))
 	}
-	worker := startOwnedWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration}, owner)
+	worker := startOwnedWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration}, owner)
 	var once sync.Once
 	stop := func() {
 		once.Do(func() {
diff --git a/services/core/internal/store/archive_cancellation_test.go b/services/core/internal/store/archive_cancellation_test.go
index 6e3da3dce..4ae861bdf 100644
--- a/services/core/internal/store/archive_cancellation_test.go
+++ b/services/core/internal/store/archive_cancellation_test.go
@@ -38,7 +38,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 		t.Run(scenario, func(t *testing.T) {
 			heartbeat := scenario != "receipt_without_heartbeat"
 			s, db := newManagedTestStoreDB(t)
-			leased := executionOwner(t, db, s)
+			leased := executionOwner(t, db)
 			t.Cleanup(func() {
 				if err := leased.Lease.Close(context.Background()); err != nil {
 					t.Error(err)
diff --git a/services/core/internal/store/command_output_test.go b/services/core/internal/store/command_output_test.go
index a87885fa2..081e2ddca 100644
--- a/services/core/internal/store/command_output_test.go
+++ b/services/core/internal/store/command_output_test.go
@@ -16,7 +16,7 @@ import (
 func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "command-output"})
 	if err != nil {
diff --git a/services/core/internal/store/creation_stream_settlement_public_test.go b/services/core/internal/store/creation_stream_settlement_public_test.go
index 2dced38ca..996c025b4 100644
--- a/services/core/internal/store/creation_stream_settlement_public_test.go
+++ b/services/core/internal/store/creation_stream_settlement_public_test.go
@@ -128,7 +128,7 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 		handler.ServeHTTP(w, r)
 	}))
 	defer server.Close()
-	sessionExecution := executionOwner(t, db, s).Sessions
+	sessionExecution := executionOwner(t, db).Sessions
 	connect := func(environment string) {
 		t.Helper()
 		generation := uuid.NewString()
diff --git a/services/core/internal/store/credential_cipher.go b/services/core/internal/store/credential_cipher.go
deleted file mode 100644
index 3051915f3..000000000
--- a/services/core/internal/store/credential_cipher.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package store
-
-import (
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/jackc/pgx/v5/pgxpool"
-)
-
-// NewWithCredentialCipher configures immutable credential encryption before the
-// Store is published. A nil cipher leaves non-secret resource operations available.
-func NewWithCredentialCipher(pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) *Store {
-	s := New(pool)
-	s.credentialCipher = cipher
-	return s
-}
diff --git a/services/core/internal/store/credential_matrix_http_test.go b/services/core/internal/store/credential_matrix_http_test.go
index b2621c35d..e1d7ae2e2 100644
--- a/services/core/internal/store/credential_matrix_http_test.go
+++ b/services/core/internal/store/credential_matrix_http_test.go
@@ -101,7 +101,7 @@ func TestCredentialNamespaceMatrix(t *testing.T) {
 	}, func(_ context.Context, setup deployment.Setup) (execution.PreparedRuntimeDeployment, error) {
 		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: provider}}, nil
 	})
-	worker := startWorker(t, ctx, db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), ManagedRuntimes: runtimes})
+	worker := startWorker(t, ctx, db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: runtimes})
 	var stop sync.Once
 	t.Cleanup(func() {
 		stop.Do(func() {
diff --git a/services/core/internal/store/dispatch_test.go b/services/core/internal/store/dispatch_test.go
index 90d97092a..65619b6b2 100644
--- a/services/core/internal/store/dispatch_test.go
+++ b/services/core/internal/store/dispatch_test.go
@@ -120,7 +120,7 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 	if err != nil {
 		t.Fatal(err)
 	}
-	h.d = &execution.Dispatcher{Store: s, Registry: h.registry, Observer: modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher), Sessions: sessionService, SessionsReader: sessionStore}
+	h.d = &execution.Dispatcher{Registry: h.registry, Observer: modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher), Sessions: sessionService, SessionsReader: sessionStore}
 	return h
 }
 
@@ -183,7 +183,7 @@ type runResult struct {
 func (h *dispatchHarness) owner() execution.Owner {
 	h.t.Helper()
 	if h.owned == nil {
-		owner := executionOwner(h.t, h.db, h.s)
+		owner := executionOwner(h.t, h.db)
 		h.owned = &owner
 	}
 	return *h.owned
@@ -267,7 +267,6 @@ func TestExecutionDispatchSteeringAndNativeContinuity(t *testing.T) {
 	awaitRelease()
 	newStore, db := newTestStoreDB(t)
 	h.s, h.db, h.owned = newStore, db, nil
-	h.d.Store = newStore
 	bound, err := store.SessionAdapter(newStore).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "native-thread-1" {
 		t.Fatalf("native binding lost: %+v %v", bound, err)
diff --git a/services/core/internal/store/environment_admission_test.go b/services/core/internal/store/environment_admission_test.go
index 052666fdb..72a0676d7 100644
--- a/services/core/internal/store/environment_admission_test.go
+++ b/services/core/internal/store/environment_admission_test.go
@@ -30,14 +30,14 @@ func newEnvironmentAdmission(t *testing.T) (*dispatchHarness, *execution.Worker)
 		cancel()
 		_ = worker.Run(ctx)
 	})
-	session, err := worker.CreateSession(t.Context(), h.tenant, store.WithFixtureModelProvider(sessions.CreateSession{
+	created, err := worker.CreateSession(t.Context(), h.tenant, store.WithFixtureModelProvider(sessions.CreateSession{
 		Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 		Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`),
 	}))
 	if err != nil {
 		t.Fatal(err)
 	}
-	h.session = session
+	h.session = created.Session
 	h = connectFixtureRuntime(t, h, h.session)
 	return h, worker
 }
diff --git a/services/core/internal/store/environment_claim_worker_test.go b/services/core/internal/store/environment_claim_worker_test.go
index 62221cd64..5efdc36dc 100644
--- a/services/core/internal/store/environment_claim_worker_test.go
+++ b/services/core/internal/store/environment_claim_worker_test.go
@@ -18,7 +18,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 		t.Run(map[bool]string{false: "unbound", true: "deleted"}[deleted], func(t *testing.T) {
 			s, db := newTestStoreDB(t)
 			tenant, pending := newEnvironmentExpiryReservation(t, s)
-			owner := executionOwner(t, db, s)
+			owner := executionOwner(t, db)
 			got, err := owner.Sessions.PromoteEnvironmentInput(t.Context(), tenant, pending.SessionID, pending.ID)
 			if err != nil || len(got.Receipts) != 1 || got.Receipts[0].Replayed {
 				t.Fatal(got, err)
@@ -42,7 +42,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 				t.Fatal(err)
 			}
 			awaitRelease()
-			restarted := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry()})
+			restarted := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 			stopped, cancel := context.WithCancel(t.Context())
 			cancel()
 			awaitRelease = pgtest.ObserveExecutionLeaseRelease(t, db.pool)
@@ -65,7 +65,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 			if err != nil || turns != 1 || inputs != 1 || queued != 0 {
 				t.Fatal("restart duplicated or requeued prepared work", turns, inputs, queued, err)
 			}
-			successor := executionOwner(t, db, s).Sessions
+			successor := executionOwner(t, db).Sessions
 			retry, err := successor.PromoteEnvironmentInput(t.Context(), tenant, pending.SessionID, pending.ID)
 			if deleted {
 				if !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/internal/store/environment_connection_worker_test.go b/services/core/internal/store/environment_connection_worker_test.go
index 0f9a710f3..71badf7e2 100644
--- a/services/core/internal/store/environment_connection_worker_test.go
+++ b/services/core/internal/store/environment_connection_worker_test.go
@@ -25,7 +25,7 @@ func TestEnvironmentConnectionWorkerReconcilesAndReleasesLease(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	owner := executionOwner(t, db, s)
+	owner := executionOwner(t, db)
 	generation := uuid.NewString()
 	if err := owner.Sessions.ReplaceEnvironmentConnection(t.Context(), tenant, environment.ID, generation); err != nil {
 		t.Fatal(err)
@@ -38,7 +38,7 @@ func TestEnvironmentConnectionWorkerReconcilesAndReleasesLease(t *testing.T) {
 		t.Fatal(err)
 	}
 	awaitRelease()
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry()})
+	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	exited := make(chan struct{})
diff --git a/services/core/internal/store/environment_expiry_worker_test.go b/services/core/internal/store/environment_expiry_worker_test.go
index 93be26e40..18dce54dc 100644
--- a/services/core/internal/store/environment_expiry_worker_test.go
+++ b/services/core/internal/store/environment_expiry_worker_test.go
@@ -104,7 +104,7 @@ func TestWorkerEnvironmentExpiryWithoutDevicesAndAfterRestart(t *testing.T) {
 	dueTenant, due := newEnvironmentExpiryReservation(t, s)
 	futureTenant, future := newEnvironmentExpiryReservation(t, s)
 	makeEnvironmentExpiryDue(t, db.pool, &due)
-	d := &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry()}
+	d := &execution.Dispatcher{Registry: runtimegateway.NewRegistry()}
 	_, stop := startEnvironmentExpiryWorker(t, db, d)
 	waitEnvironmentExpiry(t, s, dueTenant, due)
 	got, err := store.SessionAdapter(s).GetEnvironmentInputReservation(t.Context(), futureTenant, future.SessionID, future.ID)
diff --git a/services/core/internal/store/environment_initial_input_test.go b/services/core/internal/store/environment_initial_input_test.go
index 2cb963652..6db7757a2 100644
--- a/services/core/internal/store/environment_initial_input_test.go
+++ b/services/core/internal/store/environment_initial_input_test.go
@@ -88,7 +88,7 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 			tenant := uuid.NewString()
 			input := environmentInput("initial", kind, "/workspace")
 			input.InitialInputs = []sessions.Input{messageInput("first"), messageInput("second")}
-			creation, err := s.CreateSessionStream(t.Context(), tenant, input)
+			creation, err := createSession(t.Context(), s, tenant, input)
 			if err != nil || !creation.Created || creation.Cursor != 0 || creation.Session.LastTurn != nil {
 				t.Fatal("creation started initial work before native readiness", creation, err)
 			}
@@ -125,8 +125,9 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 				t.Fatal("creation cursor lost initial activity", events, err)
 			}
 			other, _ := testStore(t)
-			retry, err := other.CreateSessionStream(t.Context(), tenant, input)
-			if err != nil || retry.Created || retry.Cursor != int64(expectedEvents) || retry.Session.ID != session.ID || retry.Session.EnvironmentInputActivity != nil || retry.Session.LastTurn != nil {
+			retry, err := createSession(t.Context(), other, tenant, input)
+			// A retry returns the current projection; the reservation is unchanged.
+			if err != nil || retry.Created || retry.Cursor != int64(expectedEvents) || retry.Session.ID != session.ID || activityStatus(retry.Session) != activityStatus(session) || retry.Session.LastTurn != nil {
 				t.Fatal("retry changed creation cursor/snapshot", retry, err)
 			}
 			if got := initialEnvironmentReservation(t, other, pool, tenant, session.ID); !reflect.DeepEqual(got, reservation) {
diff --git a/services/core/internal/store/environment_initial_public_test.go b/services/core/internal/store/environment_initial_public_test.go
index dd490c24a..9fb791611 100644
--- a/services/core/internal/store/environment_initial_public_test.go
+++ b/services/core/internal/store/environment_initial_public_test.go
@@ -37,7 +37,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	owner := executionOwner(t, db, s)
+	owner := executionOwner(t, db)
 	t.Cleanup(func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		defer cancel()
diff --git a/services/core/internal/store/environment_initialization_test.go b/services/core/internal/store/environment_initialization_test.go
index 874ef9507..9e5778351 100644
--- a/services/core/internal/store/environment_initialization_test.go
+++ b/services/core/internal/store/environment_initialization_test.go
@@ -83,7 +83,7 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 			handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(fixtureSessionStore(db)), Registry: registry})
 			server := httptest.NewServer(http.HandlerFunc(handler.WS))
 			defer server.Close()
-			worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: registry})
+			worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry})
 			ctx, cancel := context.WithCancel(t.Context())
 			done := make(chan error, 1)
 			go func() { done <- worker.Run(ctx) }()
@@ -199,7 +199,7 @@ func TestEnvironmentInitializationRevocationBeforeClaim(t *testing.T) {
 		return sessions.EnvironmentInitialization{EnvironmentID: environment.ID, SessionID: session.ID, TenantID: principal.TenantID, DeviceID: enrolled.DeviceID, State: "pending", Engine: "codex"}
 	}
 	revoked, other := create(), create()
-	owned := executionOwner(t, db, s).Sessions
+	owned := executionOwner(t, db).Sessions
 	if err := fixtureSessionService(t, db).RevokeDevice(t.Context(), principal.TenantID, revoked.DeviceID); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/environment_setup.go b/services/core/internal/store/environment_setup.go
deleted file mode 100644
index 04c2e0c73..000000000
--- a/services/core/internal/store/environment_setup.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-func (s *Store) sealEnvironmentSetup(tenant, resource, id, field string, input any) ([]byte, error) {
-	plaintext, err := json.Marshal(input)
-	if err != nil {
-		return nil, err
-	}
-	return s.credentialCipher.SealEnvironmentSetup(plaintext, credentialcrypto.EnvironmentSetupBinding{TenantID: tenant, Resource: resource, OwnerID: id, Field: field})
-}
-
-func (s *Store) saveEnvironmentSetup(ctx context.Context, q *sqlc.Queries, tenant string, session pgtype.UUID, setup environmentconfig.Setup) error {
-	if setup.ValidateInstalled() != nil {
-		return sessions.ErrInvalidInput
-	}
-	if setup.Empty() {
-		return nil
-	}
-	owner, err := parseID(tenant)
-	if err != nil {
-		return err
-	}
-	encrypted, err := s.sealEnvironmentSetup(uuid.UUID(owner.Bytes).String(), "session", uuid.UUID(session.Bytes).String(), "initialization", setup)
-	if err != nil {
-		return err
-	}
-	return q.CreateEnvironmentSetup(ctx, sqlc.CreateEnvironmentSetupParams{SessionID: session, Contents: encrypted})
-}
diff --git a/services/core/internal/store/environment_skill_references.go b/services/core/internal/store/environment_skill_references.go
deleted file mode 100644
index 41a579818..000000000
--- a/services/core/internal/store/environment_skill_references.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"sort"
-	"strconv"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// freezeEnvironmentSkills runs only for a newly inserted Session, in its transaction.
-// Resource locks serialize selection with pointer changes, version deletion and
-// resource deletion. The returned copy no longer depends on any source resource.
-func (s *Store) freezeEnvironmentSkills(ctx context.Context, q *sqlc.Queries, tenantID string, setup environmentconfig.Setup) (environmentconfig.Setup, error) {
-	if setup.Validate() != nil {
-		return environmentconfig.Setup{}, sessions.ErrInvalidInput
-	}
-	owners := make(map[string]sqlc.Skill)
-	for _, skill := range setup.Skills {
-		if skill.Metadata.Type == "skill_reference" {
-			owners[skill.Metadata.SkillID] = sqlc.Skill{}
-		}
-	}
-	// Opposite caller list orders must not produce opposite database lock orders.
-	ids := make([]string, 0, len(owners))
-	for id := range owners {
-		ids = append(ids, id)
-	}
-	sort.Strings(ids)
-	for _, id := range ids {
-		tenant, err := parseID(tenantID)
-		if err != nil {
-			return environmentconfig.Setup{}, err
-		}
-		skill, err := skills.ParseID(id)
-		if err != nil {
-			return environmentconfig.Setup{}, sessions.ErrNotFound
-		}
-		owner, err := q.LockSkill(ctx, sqlc.LockSkillParams{TenantID: tenant, ID: pgtype.UUID{Bytes: skill, Valid: true}})
-		if errors.Is(err, pgx.ErrNoRows) {
-			err = sessions.ErrNotFound
-		}
-		if err != nil {
-			return environmentconfig.Setup{}, err
-		}
-		owners[id] = owner
-	}
-	result := setup
-	result.Skills = append([]environmentconfig.Skill(nil), setup.Skills...)
-	for i, skill := range result.Skills {
-		if skill.Metadata.Type != "skill_reference" {
-			continue
-		}
-		owner := owners[skill.Metadata.SkillID]
-		number, err := skills.SelectVersion(skill.Metadata.Version, owner.DefaultVersion, owner.LatestVersion)
-		if err != nil {
-			return environmentconfig.Setup{}, sessions.ErrInvalidInput
-		}
-		row, err := q.ReadSkillVersion(ctx, sqlc.ReadSkillVersionParams{TenantID: owner.TenantID, SkillID: owner.ID, Version: number})
-		if errors.Is(err, pgx.ErrNoRows) {
-			err = sessions.ErrNotFound
-		}
-		if err != nil {
-			return environmentconfig.Setup{}, err
-		}
-		content, err := s.openFrozenSkill(row)
-		if err != nil {
-			return environmentconfig.Setup{}, err
-		}
-		version := content.Version
-		result.Skills[i] = environmentconfig.Skill{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: version.SkillID, Version: strconv.FormatInt(version.Version, 10), Name: version.Name, Description: version.Description}, Archive: content.Archive}
-	}
-	if result.ValidateInstalled() != nil {
-		return environmentconfig.Setup{}, sessions.ErrInvalidInput
-	}
-	return result, nil
-}
-
-// openFrozenSkill decrypts a version the Session transaction selected and
-// checks it is still the bundle its version records.
-func (s *Store) openFrozenSkill(row sqlc.SkillVersion) (skills.Content, error) {
-	archive, err := s.credentialCipher.OpenSkill(row.Contents, credentialcrypto.NewSkillBinding(row.TenantID.Bytes, row.SkillID.Bytes, row.ID.Bytes, row.Version))
-	if err != nil {
-		return skills.Content{}, err
-	}
-	content := skills.Content{Version: skills.Version{ID: skills.FormatVersionID(row.ID.Bytes), SkillID: skills.FormatID(row.SkillID.Bytes), Version: row.Version, Name: row.Name, Description: row.Description, CreatedAt: row.CreatedAt.Time}, Archive: archive}
-	if skills.VerifyContent(content) != nil {
-		return skills.Content{}, sessions.ErrInvalidInput
-	}
-	return content, nil
-}
diff --git a/services/core/internal/store/environment_skill_references_test.go b/services/core/internal/store/environment_skill_references_test.go
deleted file mode 100644
index ce84a78b8..000000000
--- a/services/core/internal/store/environment_skill_references_test.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package store
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"sync"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
-	"github.com/google/uuid"
-)
-
-func TestSkillReferencesFreezeWithinSessionCreation(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{61}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
-	skillService := SkillService(t, pool, cipher)
-	tenant := uuid.NewString()
-	first, second := skillArchive(t, "frozen-first"), skillArchive(t, "frozen-second")
-	skill, err := skillService.CreateSkill(t.Context(), skills.CreateSkill{TenantID: tenant, Archive: first})
-	if err != nil {
-		t.Fatal(err)
-	}
-	skillID := skills.PathID(skill.ID)
-	if _, err = skillService.CreateVersion(t.Context(), skills.CreateVersion{TenantID: tenant, SkillID: skillID, Archive: second}); err != nil {
-		t.Fatal(err)
-	}
-	intent := environmentconfig.Setup{Skills: []environmentconfig.Skill{{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: skill.ID}}}}
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), Initialization: intent}
-	// Concurrent callers share one Session and one frozen installation.
-	var group sync.WaitGroup
-	ids := make(chan string, 6)
-	failures := make(chan error, 6)
-	for range 6 {
-		group.Add(1)
-		go func() {
-			defer group.Done()
-			session, err := s.CreateSession(t.Context(), tenant, input)
-			if err != nil {
-				failures <- err
-			} else {
-				ids <- session.ID
-			}
-		}()
-	}
-	group.Wait()
-	close(ids)
-	close(failures)
-	for err := range failures {
-		t.Fatal(err)
-	}
-	sessionID := ""
-	for id := range ids {
-		if sessionID != "" && sessionID != id {
-			t.Fatal("concurrent retry created a second Session")
-		}
-		sessionID = id
-	}
-	assertFrozen := func(id, version string, archive []byte) {
-		t.Helper()
-		setup, err := sessionAdapter(s).ReadEnvironmentSetup(t.Context(), tenant, id)
-		if err != nil || len(setup.Skills) != 1 || setup.Skills[0].Metadata.Type != "skill_reference" || setup.Skills[0].Metadata.SkillID != skill.ID || setup.Skills[0].Metadata.Version != version || !bytes.Equal(setup.Skills[0].Archive, archive) {
-			t.Fatal("incorrect frozen installation", err)
-		}
-		session, err := sessionAdapter(s).GetSession(t.Context(), tenant, id)
-		if err != nil {
-			t.Fatal(err)
-		}
-		var cfg struct {
-			Environment struct {
-				Skills []environmentconfig.SkillMetadata `json:"skills"`
-			} `json:"environment"`
-		}
-		if json.Unmarshal(session.Configuration, &cfg) != nil || len(cfg.Environment.Skills) != 1 || cfg.Environment.Skills[0] != setup.Skills[0].Metadata || bytes.Contains(session.Configuration, archive) {
-			t.Fatal("public snapshot differs from frozen contents")
-		}
-	}
-	assertFrozen(sessionID, "1", first)
-	latest := input
-	latest.IdempotencyKey = uuid.NewString()
-	latest.Initialization.Skills = []environmentconfig.Skill{{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: skill.ID, Version: "latest"}}}
-	latestSession, err := s.CreateSession(t.Context(), tenant, latest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertFrozen(latestSession.ID, "2", second)
-	if input.Initialization.Skills[0].Metadata.Version != "" || len(input.Initialization.Skills[0].Archive) != 0 {
-		t.Fatal("creation mutated caller intent")
-	}
-	if _, err = skillService.SetDefaultVersion(t.Context(), skills.SetDefaultVersion{TenantID: tenant, SkillID: skillID, Version: "2"}); err != nil {
-		t.Fatal(err)
-	}
-	for _, selector := range []string{"", "latest", "1"} {
-		next := input
-		next.IdempotencyKey = uuid.NewString()
-		next.Initialization.Skills = []environmentconfig.Skill{{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: skill.ID, Version: selector}}}
-		created, err := s.CreateSession(t.Context(), tenant, next)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if selector == "1" {
-			assertFrozen(created.ID, "1", first)
-		} else {
-			assertFrozen(created.ID, "2", second)
-		}
-	}
-	if err = skillService.DeleteSkill(t.Context(), skills.DeleteSkill{TenantID: tenant, SkillID: skillID}); err != nil {
-		t.Fatal(err)
-	}
-	retry, err := s.CreateSession(t.Context(), tenant, input)
-	if err != nil || retry.ID != sessionID {
-		t.Fatal("committed retry read deleted sources", err)
-	}
-	assertFrozen(sessionID, "1", first)
-	if _, err = sessionAdapter(s).ReadEnvironmentSetup(t.Context(), uuid.NewString(), sessionID); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("foreign tenant read frozen Skill", err)
-	}
-}
-
-func TestSkillReferenceAuthorizationRollsBackSession(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{62}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
-	tenant, foreign := uuid.NewString(), uuid.NewString()
-	skill, err := SkillService(t, pool, cipher).CreateSkill(t.Context(), skills.CreateSkill{TenantID: tenant, Archive: skillArchive(t, "private-owner")})
-	if err != nil {
-		t.Fatal(err)
-	}
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), Initialization: environmentconfig.Setup{Skills: []environmentconfig.Skill{{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: skill.ID}}}}}
-	if _, err := s.CreateSession(t.Context(), foreign, input); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("foreign reference accepted", err)
-	}
-	var count int
-	if err := pool.QueryRow(t.Context(), "SELECT count(*) FROM sessions WHERE tenant_id=$1", foreign).Scan(&count); err != nil || count != 0 {
-		t.Fatal("failed reference left a Session", count, err)
-	}
-}
diff --git a/services/core/internal/store/environment_skills_test.go b/services/core/internal/store/environment_skills_test.go
deleted file mode 100644
index 8e25d5743..000000000
--- a/services/core/internal/store/environment_skills_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package store
-
-import (
-	"archive/zip"
-	"bytes"
-	"encoding/json"
-	"errors"
-	"reflect"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-func TestSkillsFrozenInSession(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{17}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
-	var archive bytes.Buffer
-	writer := zip.NewWriter(&archive)
-	header := &zip.FileHeader{Name: "proof/SKILL.md", Method: zip.Store}
-	file, err := writer.CreateHeader(header)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err = file.Write([]byte("---\nname: proof\ndescription: A proof.\n---\nprivate-skill-canary")); err != nil {
-		t.Fatal(err)
-	}
-	if err = writer.Close(); err != nil {
-		t.Fatal(err)
-	}
-	setup := environmentconfig.Setup{Skills: []environmentconfig.Skill{{Metadata: environmentconfig.SkillMetadata{Type: "inline", Name: "proof", Description: "A proof."}, Archive: archive.Bytes()}}}
-	tenant, foreign := uuid.NewString(), uuid.NewString()
-	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), Initialization: setup})
-	if err != nil {
-		t.Fatal(err)
-	}
-	frozen, err := sessionAdapter(s).ReadEnvironmentSetup(t.Context(), tenant, session.ID)
-	if err != nil || !reflect.DeepEqual(frozen.Skills, setup.Skills) {
-		t.Fatal("frozen content changed", err)
-	}
-	if _, err = sessionAdapter(s).ReadEnvironmentSetup(t.Context(), foreign, session.ID); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("foreign content", err)
-	}
-}
diff --git a/services/core/internal/store/environments_test.go b/services/core/internal/store/environments_test.go
index 362c87b58..45f909038 100644
--- a/services/core/internal/store/environments_test.go
+++ b/services/core/internal/store/environments_test.go
@@ -103,7 +103,7 @@ func TestEnvironmentCreationWinnerOwnsSnapshotAndIdentity(t *testing.T) {
 			input := environmentInput("winner", "openai_hosted", fmt.Sprintf("/workspace/%d", i))
 			input.CreationRequest = intent
 			input.InitialInputs = []sessions.Input{messageInput("initial")}
-			creation, err := st.CreateSessionStream(ctx, tenant, input)
+			creation, err := createSession(ctx, st, tenant, input)
 			if err != nil {
 				t.Error(err)
 				return
@@ -162,11 +162,11 @@ func TestEnvironmentCreationWinnerOwnsSnapshotAndIdentity(t *testing.T) {
 	retryInput := environmentInput("winner", "openai_hosted", "/changed-resolution")
 	retryInput.CreationRequest = intent
 	retryInput.InitialInputs = []sessions.Input{messageInput("initial")}
-	retry, err := restarted.CreateSessionStream(ctx, tenant, retryInput)
+	retry, err := createSession(ctx, restarted, tenant, retryInput)
 	if err != nil || retry.Created || retry.Session.ID != first.creation.Session.ID {
 		t.Fatal(retry, err)
 	}
-	found, err := restarted.FindSessionCreation(ctx, tenant, "winner", intent, FixtureCreator())
+	found, err := sessionService(t, restarted).FindSessionCreation(ctx, tenant, "winner", intent, FixtureCreator())
 	if err != nil || found.Created || found.Session.ID != first.creation.Session.ID {
 		t.Fatal(found, err)
 	}
diff --git a/services/core/internal/store/execution.go b/services/core/internal/store/execution.go
deleted file mode 100644
index 92d5f5fc9..000000000
--- a/services/core/internal/store/execution.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package store
-
-import "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-
-// NewExecution returns the execution writer built on lease, which the caller
-// acquired and closes. The writer's Session and execution-only transactions run
-// on the leased connection; reads keep the pool. Keep public admission on the
-// pooled Store. Losing or closing the lease never falls back to a pooled writer.
-func NewExecution(s *Store, lease *pgunit.Lease) *Store {
-	writer := *s
-	writer.writer, writer.lease = lease, lease
-	return &writer
-}
diff --git a/services/core/internal/store/fixture_db_test.go b/services/core/internal/store/fixture_db_test.go
index 3372f2b31..88259eaac 100644
--- a/services/core/internal/store/fixture_db_test.go
+++ b/services/core/internal/store/fixture_db_test.go
@@ -65,7 +65,7 @@ func startWorkerErr(ctx context.Context, db fixtureDB, dispatcher *execution.Dis
 	if err != nil {
 		return nil, err
 	}
-	owner, err := fixtureOwner(db, dispatcher.Store, lease)
+	owner, err := fixtureOwner(db, lease)
 	if err != nil {
 		return nil, errors.Join(err, lease.Close(ctx))
 	}
@@ -107,26 +107,26 @@ func startOwnedWorkerErr(ctx context.Context, db fixtureDB, dispatcher *executio
 	return execution.StartWorker(ctx, &owned, owner)
 }
 
-// executionOwner acquires the execution lease on db and builds s's execution
-// writer on it, for tests that run execution operations without a Worker. The
-// lease closes when the test ends.
-func executionOwner(t testing.TB, db fixtureDB, s *store.Store) execution.Owner {
+// executionOwner acquires the execution lease on db and builds the execution
+// operations on it, for tests that run them without a Worker. The lease
+// closes when the test ends.
+func executionOwner(t testing.TB, db fixtureDB) execution.Owner {
 	t.Helper()
 	lease, err := pgunit.AcquireLease(t.Context(), db.pool)
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Cleanup(func() { _ = lease.Close(context.Background()) })
-	owner, err := fixtureOwner(db, s, lease)
+	owner, err := fixtureOwner(db, lease)
 	if err != nil {
 		t.Fatal(err)
 	}
 	return owner
 }
 
-// fixtureOwner builds s's execution writer and the deployment and Session
-// execution operations on lease, as cmd/server does.
-func fixtureOwner(db fixtureDB, s *store.Store, lease *pgunit.Lease) (execution.Owner, error) {
+// fixtureOwner builds the deployment and Session execution operations on
+// lease, as cmd/server does.
+func fixtureOwner(db fixtureDB, lease *pgunit.Lease) (execution.Owner, error) {
 	_, changes, err := fixtureDeploymentExecution(db, lease)
 	if err != nil {
 		return execution.Owner{}, err
@@ -137,7 +137,6 @@ func fixtureOwner(db fixtureDB, s *store.Store, lease *pgunit.Lease) (execution.
 	}
 	return execution.Owner{
 		Lease:      lease,
-		Store:      store.NewExecution(s, lease),
 		Deployment: changes,
 		Sessions:   sessionExecution,
 	}, nil
diff --git a/services/core/internal/store/function_inputs_public_test.go b/services/core/internal/store/function_inputs_public_test.go
index 4ad8bade0..d73b02242 100644
--- a/services/core/internal/store/function_inputs_public_test.go
+++ b/services/core/internal/store/function_inputs_public_test.go
@@ -41,7 +41,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	functions := executionOwner(t, db, s).Sessions
+	functions := executionOwner(t, db).Sessions
 	for _, id := range []string{"a", "b", "c", "rollback", "late"} {
 		if err := functions.RecordFunctionCall(ctx, tenant, session.ID, input.TurnID, sessions.FunctionCall{CallID: id, ExecutorCallID: "native-" + id, Name: "lookup", Arguments: json.RawMessage(`{}`)}); err != nil {
 			t.Fatal(err)
diff --git a/services/core/internal/store/function_state_public_test.go b/services/core/internal/store/function_state_public_test.go
index 69b329cbf..05374b657 100644
--- a/services/core/internal/store/function_state_public_test.go
+++ b/services/core/internal/store/function_state_public_test.go
@@ -38,7 +38,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	functions := executionOwner(t, db, s).Sessions
+	functions := executionOwner(t, db).Sessions
 	record := func(id string) {
 		t.Helper()
 		if err := functions.RecordFunctionCall(ctx, tenant, session.ID, input.TurnID, sessions.FunctionCall{CallID: id, ExecutorCallID: "private-" + id, Name: "lookup", Arguments: json.RawMessage(`{"ticket":9007199254740993}`)}); err != nil {
diff --git a/services/core/internal/store/function_worker_test.go b/services/core/internal/store/function_worker_test.go
index 0d5efa0aa..857a7268f 100644
--- a/services/core/internal/store/function_worker_test.go
+++ b/services/core/internal/store/function_worker_test.go
@@ -127,7 +127,6 @@ func mcpBearerWorkerConfiguration(t *testing.T, h *dispatchHarness) (string, str
 		t.Fatal(err)
 	}
 	h.s, h.db = store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	h.d.Store = h.s
 	_, service, err := fixtureVaults(h.db)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/initial_files.go b/services/core/internal/store/initial_files.go
deleted file mode 100644
index 6956d6fb4..000000000
--- a/services/core/internal/store/initial_files.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"io"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-func (s *Store) saveInitialFiles(ctx context.Context, q *sqlc.Queries, tx pgx.Tx, tenant string, session pgtype.UUID, initial []environmentconfig.InitialFile) ([]byte, error) {
-	if environmentconfig.ValidateInitialFiles(initial) != nil {
-		return nil, sessions.ErrInvalidInput
-	}
-	tenantID, err := parseID(tenant)
-	if err != nil {
-		return nil, err
-	}
-	tenant = uuid.UUID(tenantID.Bytes).String()
-	metadata := environmentconfig.InitialFilesMetadata(initial)
-	for i, f := range initial {
-		body := f.Data
-		if f.Type == "file_id" {
-			sourceID, ok := files.ParseID(f.FileID)
-			if !ok {
-				return nil, sessions.ErrNotFound
-			}
-			source, err := q.LockInitialSourceFile(ctx, sqlc.LockInitialSourceFileParams{TenantID: tenantID, ID: pgtype.UUID{Bytes: sourceID, Valid: true}})
-			if errors.Is(err, pgx.ErrNoRows) {
-				return nil, sessions.ErrNotFound
-			}
-			if err != nil {
-				return nil, err
-			}
-			if body, err = readInitialSourceFile(ctx, tx, source); err != nil {
-				return nil, err
-			}
-		}
-		id := uuid.NewString()
-		size := int64(len(body))
-		metadata[i].ID = id
-		metadata[i].SizeBytes = &size
-		encrypted, err := s.credentialCipher.SealEnvironmentFile(body, credentialcrypto.EnvironmentFileBinding{TenantID: tenant, Resource: "session", OwnerID: uuid.UUID(session.Bytes).String(), FileID: id})
-		if err != nil {
-			return nil, err
-		}
-		fileID, _ := parseID(id)
-		if err := q.CreateInitialEnvironmentFile(ctx, sqlc.CreateInitialEnvironmentFileParams{ID: fileID, SessionID: session, Position: int32(i), Path: f.Path, SizeBytes: size, Contents: encrypted}); err != nil {
-			return nil, err
-		}
-	}
-	return json.Marshal(metadata)
-}
-
-// readInitialSourceFile copies a File's content for a new Session. Session
-// creation reads source_files through store's SQL until Sessions move out of
-// store.
-func readInitialSourceFile(ctx context.Context, tx pgx.Tx, source sqlc.SourceFile) ([]byte, error) {
-	if source.SizeBytes > environmentconfig.MaxInitialFileBytes {
-		return nil, sessions.ErrInvalidInput
-	}
-	objects := tx.LargeObjects()
-	reader, err := objects.Open(ctx, source.BodyOid.Uint32, pgx.LargeObjectModeRead)
-	if err != nil {
-		return nil, err
-	}
-	body, err := io.ReadAll(io.LimitReader(reader, environmentconfig.MaxInitialFileBytes+1))
-	if err != nil {
-		return nil, err
-	}
-	if len(body) > environmentconfig.MaxInitialFileBytes || int64(len(body)) != source.SizeBytes {
-		return nil, sessions.ErrInvalidInput
-	}
-	return body, reader.Close()
-}
diff --git a/services/core/internal/store/initial_files_test.go b/services/core/internal/store/initial_files_test.go
deleted file mode 100644
index 0bc20c97d..000000000
--- a/services/core/internal/store/initial_files_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package store
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"io"
-	"strings"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/filepg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgxpool"
-)
-
-// testFiles returns the files domain over pool for tests that need a File.
-func testFiles(t *testing.T, pool *pgxpool.Pool) (*files.Service, *filepg.Store) {
-	t.Helper()
-	storage := filepg.New(pgunit.NewPool(pool))
-	service, err := files.NewService(storage)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return service, storage
-}
-
-func uploadSource(data []byte) func(io.Writer) (files.Upload, error) {
-	return func(w io.Writer) (files.Upload, error) {
-		_, err := w.Write(data)
-		return files.Upload{Filename: "source.bin", Purpose: files.PurposeUserData}, err
-	}
-}
-
-func TestInitialFilesFrozenEncryptedIsolatedAndRetryable(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
-	tenant, foreign := uuid.NewString(), uuid.NewString()
-	canary := []byte("private-initial-file-canary\x00\xff")
-	sourceFiles, _ := testFiles(t, pool)
-	upload, err := sourceFiles.Create(t.Context(), files.CreateCommand{TenantID: tenant, Upload: uploadSource(canary)})
-	if err != nil {
-		t.Fatal(err)
-	}
-	initial := []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a/data", Data: canary}, {Type: "file_id", Path: "/workspace/b", FileID: upload.ID}}
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), InitialFiles: initial}
-	session, err := s.CreateSession(t.Context(), tenant, input)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if bytes.Contains(session.Configuration, canary) || bytes.Contains(session.Configuration, []byte(`"data"`)) {
-		t.Fatal("plaintext in Session configuration")
-	}
-	if err := sourceFiles.Delete(t.Context(), files.DeleteCommand{TenantID: tenant, FileID: upload.ID}); err != nil {
-		t.Fatal(err)
-	}
-	retry, err := s.CreateSession(t.Context(), tenant, input)
-	if err != nil || retry.ID != session.ID {
-		t.Fatal("retry re-resolved deleted resources", err)
-	}
-	for position := range initial {
-		metadata, body, err := sessionAdapter(s).ReadInitialEnvironmentFile(t.Context(), strings.ToUpper(tenant), strings.ToUpper(session.ID), position)
-		if err != nil || !bytes.Equal(body, canary) || metadata.ID == "" {
-			t.Fatal("frozen initial content", err)
-		}
-		if _, _, err := sessionAdapter(s).ReadInitialEnvironmentFile(t.Context(), foreign, session.ID, position); err == nil {
-			t.Fatal("foreign bytes disclosed")
-		}
-		var encrypted []byte
-		if err := pool.QueryRow(t.Context(), "SELECT contents FROM initial_environment_files WHERE id=$1", metadata.ID).Scan(&encrypted); err != nil || bytes.Contains(encrypted, canary) {
-			t.Fatal("unencrypted file storage", err)
-		}
-	}
-	changed := input
-	changed.InitialFiles = append([]environmentconfig.InitialFile(nil), initial...)
-	changed.InitialFiles[0].Data = []byte("changed")
-	if _, err := s.CreateSession(t.Context(), tenant, changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatal("changed bytes retried", err)
-	}
-	if _, err := sessionAdapter(s).GetSessionDevice(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("uninitialized environment exposed", err)
-	}
-}
diff --git a/services/core/internal/store/input_conflicts_public_test.go b/services/core/internal/store/input_conflicts_public_test.go
index 7c739e4b1..453a06a6d 100644
--- a/services/core/internal/store/input_conflicts_public_test.go
+++ b/services/core/internal/store/input_conflicts_public_test.go
@@ -52,7 +52,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	server := httptest.NewServer(h)
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
-	functions := executionOwner(t, db, s).Sessions
+	functions := executionOwner(t, db).Sessions
 
 	create := func(environment string, initial bool) string {
 		t.Helper()
diff --git a/services/core/internal/store/inputs_test.go b/services/core/internal/store/inputs_test.go
index ec00d3d78..1a497326a 100644
--- a/services/core/internal/store/inputs_test.go
+++ b/services/core/internal/store/inputs_test.go
@@ -46,7 +46,7 @@ func environmentInputSession(t *testing.T, s *Store) (string, sessions.Session)
 // submitInputs admits inputs through the Session service on s's database, as
 // the public events route does.
 func submitInputs(ctx context.Context, s *Store, tenant, session, key string, inputs []sessions.Input) ([]sessions.InputReceipt, error) {
-	service, err := sessions.NewService(sessionAdapter(s))
+	service, err := newSessionService(s)
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/core/internal/store/item_order_migration_test.go b/services/core/internal/store/item_order_migration_test.go
index dff7eb189..ed226b76c 100644
--- a/services/core/internal/store/item_order_migration_test.go
+++ b/services/core/internal/store/item_order_migration_test.go
@@ -153,7 +153,7 @@ func TestItemOrderMigrationPreservesIndexedHistory(t *testing.T) {
 	if _, err = store.TransitionTurn(ctx, s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	if err = executionOwner(t, fixtureDB{pool: migratedPool}, s).Sessions.AppendTurnEvents(ctx, tenant, session, turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"after-upgrade","delta":"continued"}`)}}); err != nil {
+	if err = executionOwner(t, fixtureDB{pool: migratedPool}).Sessions.AppendTurnEvents(ctx, tenant, session, turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"after-upgrade","delta":"continued"}`)}}); err != nil {
 		t.Fatal(err)
 	}
 	addedID := items.Identity(turn, "message:after-upgrade")
diff --git a/services/core/internal/store/item_order_test.go b/services/core/internal/store/item_order_test.go
index 5514b2e31..634ed5f82 100644
--- a/services/core/internal/store/item_order_test.go
+++ b/services/core/internal/store/item_order_test.go
@@ -17,7 +17,7 @@ import (
 func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "ordered"})
 	if err != nil {
diff --git a/services/core/internal/store/item_reads_test.go b/services/core/internal/store/item_reads_test.go
index 861f0d7f4..e6540af5c 100644
--- a/services/core/internal/store/item_reads_test.go
+++ b/services/core/internal/store/item_reads_test.go
@@ -17,7 +17,7 @@ import (
 func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "items"})
 	if err != nil {
@@ -120,7 +120,7 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "legacy"})
 	input, err := store.SendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
@@ -156,7 +156,7 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	for _, receiptOnly := range []bool{true, false} {
 		session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString()})
@@ -188,7 +188,7 @@ func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 func TestLegacyFailureRetainsPartialAnswerAcrossRecovery(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "failed-items"})
 	if err != nil {
diff --git a/services/core/internal/store/list_cursor_public_test.go b/services/core/internal/store/list_cursor_public_test.go
index 8d050877c..b028f78ea 100644
--- a/services/core/internal/store/list_cursor_public_test.go
+++ b/services/core/internal/store/list_cursor_public_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
@@ -102,7 +103,7 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 		if err = leased.Sessions.BindSessionDevice(ctx, tenant, created.ID, host.ID); err != nil {
 			t.Fatal(err)
 		}
-		if _, err = store.TransitionTurn(ctx, leased.Store, tenant, created.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+		if _, err = store.TransitionTurn(ctx, store.NewExecution(s, leased.Lease.(*pgunit.Lease)), tenant, created.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 			t.Fatal(err)
 		}
 		opened := int64(1700000001000)
@@ -241,7 +242,7 @@ func TestListCursorErrorsPostgres(t *testing.T) {
 	server := httptest.NewServer(h)
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
-	leased := executionOwner(t, db, s)
+	leased := executionOwner(t, db)
 	skillService := store.SkillService(t, db.pool, db.cipher)
 	_, sessionService, err := fixtureSessions(db)
 	if err != nil {
diff --git a/services/core/internal/store/list_query_public_test.go b/services/core/internal/store/list_query_public_test.go
index 3f53a6b23..d714c6e1a 100644
--- a/services/core/internal/store/list_query_public_test.go
+++ b/services/core/internal/store/list_query_public_test.go
@@ -34,7 +34,7 @@ func TestListQueryOfficialClientPostgres(t *testing.T) {
 	})
 	// Use real admission while leaving dispatch paused. Public cancellation retains
 	// the queued history; this fixture does not perform native or model execution.
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s})
+	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{})
 	t.Cleanup(func() {
 		stopped, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/internal/store/public_handler_fixture_test.go b/services/core/internal/store/public_handler_fixture_test.go
index 594490d71..0ffd53c74 100644
--- a/services/core/internal/store/public_handler_fixture_test.go
+++ b/services/core/internal/store/public_handler_fixture_test.go
@@ -87,7 +87,7 @@ func publicHandler(t testing.TB, s *store.Store, db fixtureDB, keys fixtureKeyRe
 		Agents: agentService, AgentsReader: agentStore,
 		Sessions:        sessionService,
 		SessionsReader:  sessionStore,
-		SessionCreation: s,
+		SessionCreation: store.SessionService(t, s),
 		SessionEvents:   sessionStore,
 		Turns:           sessionStore,
 		Items:           sessionStore,
@@ -145,14 +145,15 @@ func withPolicy(policy execution.Policy) func(*api.Dependencies) {
 	return func(d *api.Dependencies) { d.Policy = policy }
 }
 
-// storeExecution admits Sessions through the Store and inputs through the
-// Session service without a Worker, so nothing runs them.
+// storeExecution admits Sessions and inputs through the Session service on s
+// without a Worker, so nothing runs them.
 func storeExecution(t testing.TB, s *store.Store) func(*api.Dependencies) {
 	return func(d *api.Dependencies) {
+		service := store.SessionService(t, s)
 		d.Execution = &api.Execution{
 			ExecutorURL:      testExecutorURL,
-			SessionAdmission: s,
-			InputAdmission:   store.SessionService(t, s),
+			SessionAdmission: service,
+			InputAdmission:   service,
 			SessionArchive:   strictStandIn{t},
 			Workspaces:       strictStandIn{t},
 		}
diff --git a/services/core/internal/store/runtime_compute_lifecycle_test.go b/services/core/internal/store/runtime_compute_lifecycle_test.go
index f32f88f52..b8370de0e 100644
--- a/services/core/internal/store/runtime_compute_lifecycle_test.go
+++ b/services/core/internal/store/runtime_compute_lifecycle_test.go
@@ -292,7 +292,7 @@ func newComputeLifecycleFixture(t *testing.T, maxActive, maxRetained int) *compu
 func (f *computeLifecycleFixture) start() {
 	t := f.t
 	t.Helper()
-	dispatcher := &execution.Dispatcher{Store: f.store, Registry: f.provider.registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: f.provider, Suspension: &f.policy}}
+	dispatcher := &execution.Dispatcher{Registry: f.provider.registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: f.provider, Suspension: &f.policy}}
 	// Closing the previous Worker's connection can return before PostgreSQL drops its advisory lock.
 	deadline := time.Now().Add(2 * time.Second)
 	var w *execution.Worker
diff --git a/services/core/internal/store/runtime_connection_test.go b/services/core/internal/store/runtime_connection_test.go
index e40311ecd..81450cd21 100644
--- a/services/core/internal/store/runtime_connection_test.go
+++ b/services/core/internal/store/runtime_connection_test.go
@@ -36,7 +36,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	key := uuid.NewString()
 	start := func() *execution.Worker {
-		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: server.URL + "/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
+		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: server.URL + "/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
 		return w
 	}
 	stop := func(w *execution.Worker) {
diff --git a/services/core/internal/store/runtime_deployment_worker_test.go b/services/core/internal/store/runtime_deployment_worker_test.go
index 6260a2737..76f867a32 100644
--- a/services/core/internal/store/runtime_deployment_worker_test.go
+++ b/services/core/internal/store/runtime_deployment_worker_test.go
@@ -25,7 +25,7 @@ func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T)
 	replacement := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	config := &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: uuid.NewString(), BackendFingerprint: strings.Repeat("b", 64), Provider: replacement, AdmissionPaused: true}
 	start := func(config *execution.RuntimeProvider) error {
-		_, err := startWorkerErr(t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), ManagedRuntimes: config})
+		_, err := startWorkerErr(t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: config})
 		return err
 	}
 	if err := start(config); err == nil || !strings.Contains(err.Error(), "maintenance") {
diff --git a/services/core/internal/store/runtime_enrollment_connection_test.go b/services/core/internal/store/runtime_enrollment_connection_test.go
index f7cebbbda..ae07e3d1a 100644
--- a/services/core/internal/store/runtime_enrollment_connection_test.go
+++ b/services/core/internal/store/runtime_enrollment_connection_test.go
@@ -85,7 +85,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	server.Start()
 	t.Cleanup(func() { server.Close(); runtime.CloseConnections(registry) })
 	start := func() func() {
-		worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: registry})
+		worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry})
 		ctx, cancel := context.WithCancel(context.Background())
 		done := make(chan error, 1)
 		go func() { done <- worker.Run(ctx) }()
diff --git a/services/core/internal/store/runtime_lifecycle_test.go b/services/core/internal/store/runtime_lifecycle_test.go
index b242d2d32..1abae6129 100644
--- a/services/core/internal/store/runtime_lifecycle_test.go
+++ b/services/core/internal/store/runtime_lifecycle_test.go
@@ -89,7 +89,7 @@ func managedWorkerMode(t *testing.T, s *store.Store, db fixtureDB, key string, p
 		t.Cleanup(server.Close)
 		peer.setRuntimeGateway(t, "ws"+strings.TrimPrefix(server.URL, "http"), registry)
 	}
-	w := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p, AdmissionPaused: maintenance}})
+	w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p, AdmissionPaused: maintenance}})
 	if len(run) > 0 && run[0] {
 		ctx, cancel := context.WithCancel(t.Context())
 		done := make(chan error, 1)
diff --git a/services/core/internal/store/runtime_node_lifecycle_fixture_test.go b/services/core/internal/store/runtime_node_lifecycle_fixture_test.go
index 1a7f7fb14..5cdebc08c 100644
--- a/services/core/internal/store/runtime_node_lifecycle_fixture_test.go
+++ b/services/core/internal/store/runtime_node_lifecycle_fixture_test.go
@@ -131,7 +131,7 @@ func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 	// Keep restored compute awake throughout the isolation assertions.
 	// The suspension setup explicitly dates its activity two minutes in the past.
 	policy := &execution.RuntimeSuspensionPolicy{IdleTimeout: time.Minute, Retention: time.Hour, MaxActive: 100, MaxRetained: 100}
-	f.worker = startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: strings.Repeat("a", 64), Provider: p, ProviderKind: "microsandbox", LocalNodeID: f.nodeA, LocalCredentialSHA256: runtimedevice.HashCredential("local-credential"), LocalMaxActive: 100, LocalMaxRetained: 100, Suspension: policy}})
+	f.worker = startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: strings.Repeat("a", 64), Provider: p, ProviderKind: "microsandbox", LocalNodeID: f.nodeA, LocalCredentialSHA256: runtimedevice.HashCredential("local-credential"), LocalMaxActive: 100, LocalMaxRetained: 100, Suspension: policy}})
 	spec := store.SandboxDeploymentTestSpec("microsandbox")
 	raw, _ := json.Marshal(spec)
 	if _, err := pool.Exec(t.Context(), "UPDATE runtime_deployment SET specification=$1", raw); err != nil {
diff --git a/services/core/internal/store/runtime_pending_test.go b/services/core/internal/store/runtime_pending_test.go
index c7b95dea5..157ecb176 100644
--- a/services/core/internal/store/runtime_pending_test.go
+++ b/services/core/internal/store/runtime_pending_test.go
@@ -28,7 +28,7 @@ func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T)
 	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	start := func() *execution.Worker {
-		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
+		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
 		return w
 	}
 	stop := func(w *execution.Worker) {
diff --git a/services/core/internal/store/runtime_wake_hint_integration_test.go b/services/core/internal/store/runtime_wake_hint_integration_test.go
index b7cfc0664..c5326609f 100644
--- a/services/core/internal/store/runtime_wake_hint_integration_test.go
+++ b/services/core/internal/store/runtime_wake_hint_integration_test.go
@@ -75,7 +75,7 @@ func newWakeHintIntegration(t *testing.T) *wakeHintIntegration {
 		release: make(chan struct{}), scans: make(chan int, 16),
 	}
 	worker := startWorker(t, t.Context(), f.db, &execution.Dispatcher{
-		Store: f.store, Registry: f.provider.registry,
+		Registry: f.provider.registry,
 		ManagedRuntimes: &execution.RuntimeProvider{
 			CoreURL: "http://core.invalid/api/v1", InstallationID: f.key,
 			BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
diff --git a/services/core/internal/store/sandbox_deployment_switch_worker_test.go b/services/core/internal/store/sandbox_deployment_switch_worker_test.go
index e2a8ad911..5308d5cc9 100644
--- a/services/core/internal/store/sandbox_deployment_switch_worker_test.go
+++ b/services/core/internal/store/sandbox_deployment_switch_worker_test.go
@@ -45,7 +45,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 		}
 		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p}}, nil
 	})
-	w := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
+	w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- w.Run(ctx) }()
diff --git a/services/core/internal/store/sandbox_deployment_worker_test.go b/services/core/internal/store/sandbox_deployment_worker_test.go
index 70bdd2cb4..7b169a815 100644
--- a/services/core/internal/store/sandbox_deployment_worker_test.go
+++ b/services/core/internal/store/sandbox_deployment_worker_test.go
@@ -35,7 +35,7 @@ func TestSandboxDeploymentWorkerActivatesWithoutRestart(t *testing.T) {
 	})
 	start := func() (*execution.Worker, func()) {
 		t.Helper()
-		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
+		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
 		var once sync.Once
 		stop := func() {
 			once.Do(func() { ctx, cancel := context.WithCancel(context.Background()); cancel(); _ = w.Run(ctx) })
diff --git a/services/core/internal/store/self_hosted_cancel_public_test.go b/services/core/internal/store/self_hosted_cancel_public_test.go
index aeff47ca7..dfa04103c 100644
--- a/services/core/internal/store/self_hosted_cancel_public_test.go
+++ b/services/core/internal/store/self_hosted_cancel_public_test.go
@@ -34,7 +34,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	var owner execution.Owner
 	serve := func() (*httptest.Server, func(bool)) {
 		t.Helper()
-		owner = executionOwner(t, db, s)
+		owner = executionOwner(t, db)
 		worker, stop := publicOwnedWorker(t, s, db, owner)
 		handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker), executorURL("https://offline-executor.example"))
 		if err != nil {
diff --git a/services/core/internal/store/self_hosted_initial_public_test.go b/services/core/internal/store/self_hosted_initial_public_test.go
index ef1b5e050..c3f19eff0 100644
--- a/services/core/internal/store/self_hosted_initial_public_test.go
+++ b/services/core/internal/store/self_hosted_initial_public_test.go
@@ -214,14 +214,14 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 
 func publicInitialWorker(t *testing.T, s *store.Store, db fixtureDB) (*execution.Worker, func(bool)) {
 	t.Helper()
-	return publicOwnedWorker(t, s, db, executionOwner(t, db, s))
+	return publicOwnedWorker(t, s, db, executionOwner(t, db))
 }
 
 // publicOwnedWorker is publicInitialWorker on owner, for tests that also write
 // as the Worker's execution owner.
 func publicOwnedWorker(t *testing.T, s *store.Store, db fixtureDB, owner execution.Owner) (*execution.Worker, func(bool)) {
 	t.Helper()
-	worker := startOwnedWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry()}, owner)
+	worker := startOwnedWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()}, owner)
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
@@ -250,11 +250,7 @@ func publicOwnedWorker(t *testing.T, s *store.Store, db fixtureDB, owner executi
 // a running Worker.
 type unavailableAdmission struct{}
 
-func (unavailableAdmission) CreateSession(context.Context, string, sessions.CreateSession) (sessions.Session, error) {
-	return sessions.Session{}, execution.ErrExecutionUnavailable
-}
-
-func (unavailableAdmission) CreateSessionStream(context.Context, string, sessions.CreateSession) (sessions.Creation, error) {
+func (unavailableAdmission) CreateSession(context.Context, string, sessions.CreateSession) (sessions.Creation, error) {
 	return sessions.Creation{}, execution.ErrExecutionUnavailable
 }
 
diff --git a/services/core/internal/store/session_creation_identity.go b/services/core/internal/store/session_creation_identity.go
deleted file mode 100644
index 6f59d0555..000000000
--- a/services/core/internal/store/session_creation_identity.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package store
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/jsonobject"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// modelProviderKeyPurpose separates model provider key fingerprints from any
-// other use of the credential key.
-const modelProviderKeyPurpose = "parsar.agents-api.model-provider-api-key.v1"
-
-// fingerprintedProvider replaces a bundle's key with its keyed fingerprint, so
-// idempotency hashes tell keys apart without ever hashing a key itself.
-func (s *Store) fingerprintedProvider(provider *v1.ModelProviderInput) (*v1.ModelProviderInput, error) {
-	if provider == nil {
-		return nil, nil
-	}
-	fingerprint, err := s.credentialCipher.Fingerprint(modelProviderKeyPurpose, provider.APIKey)
-	if err != nil {
-		return nil, credentialcrypto.ErrUnavailable
-	}
-	copy := *provider
-	copy.APIKey = "fingerprint:" + fingerprint
-	return &copy, nil
-}
-
-// withoutProviderKey replaces a caller intent's x_agents_core.model_provider
-// with its typed value carrying a keyed fingerprint instead of the key. It fails
-// closed: an intent whose extension or provider cannot be read is rejected
-// rather than hashed as raw bytes that could carry a key.
-func (s *Store) withoutProviderKey(raw json.RawMessage) (json.RawMessage, error) {
-	var request map[string]json.RawMessage
-	if json.Unmarshal(raw, &request) != nil || request == nil {
-		return nil, sessions.ErrInvalidInput
-	}
-	extensionRaw, present := request["x_agents_core"]
-	if !present || jsonNull(extensionRaw) {
-		return raw, nil
-	}
-	var extension map[string]json.RawMessage
-	if json.Unmarshal(extensionRaw, &extension) != nil || extension == nil {
-		return nil, sessions.ErrInvalidInput
-	}
-	providerRaw, present := extension["model_provider"]
-	if !present || jsonNull(providerRaw) {
-		return raw, nil
-	}
-	var provider v1.ModelProviderInput
-	if json.Unmarshal(providerRaw, &provider) != nil {
-		return nil, sessions.ErrInvalidInput
-	}
-	fingerprinted, err := s.fingerprintedProvider(&provider)
-	if err != nil {
-		return nil, err
-	}
-	if extension["model_provider"], err = json.Marshal(fingerprinted); err != nil {
-		return nil, err
-	}
-	if request["x_agents_core"], err = json.Marshal(extension); err != nil {
-		return nil, err
-	}
-	return json.Marshal(request)
-}
-
-func jsonNull(raw json.RawMessage) bool {
-	return string(bytes.TrimSpace(raw)) == "null"
-}
-
-func (s *Store) creationRequestHash(raw json.RawMessage) (pgtype.Text, error) {
-	if len(raw) == 0 {
-		return pgtype.Text{}, nil
-	}
-	if len(raw) > 16<<20 {
-		return pgtype.Text{}, sessions.ErrInvalidInput
-	}
-	raw, err := s.withoutProviderKey(raw)
-	if err != nil {
-		return pgtype.Text{}, err
-	}
-	canonical, err := jsonobject.Normalize(raw)
-	if err != nil {
-		return pgtype.Text{}, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
-	}
-	hash := sha256.Sum256(canonical)
-	return pgtype.Text{String: hex.EncodeToString(hash[:]), Valid: true}, nil
-}
-
-// FindSessionCreation recovers recorded caller intent without resolving a mutable source.
-func (s *Store) FindSessionCreation(ctx context.Context, tenantID, key string, request json.RawMessage, creator identity.Subject) (sessions.Creation, error) {
-	if err := creator.Validate(); err != nil {
-		return sessions.Creation{}, fmt.Errorf("%w: %v", sessions.ErrInvalidInput, err)
-	}
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.Creation{}, err
-	}
-	if strings.TrimSpace(key) == "" || len(key) > 128 {
-		return sessions.Creation{}, sessions.ErrInvalidInput
-	}
-	hash, err := s.creationRequestHash(request)
-	if errors.Is(err, credentialcrypto.ErrUnavailable) {
-		// Without the credential key no Session with a provider bundle can have
-		// been committed or can be created; creation reports the missing key
-		// after request validation.
-		return sessions.Creation{}, sessions.ErrNotFound
-	}
-	if err != nil {
-		return sessions.Creation{}, err
-	}
-	if !hash.Valid {
-		return sessions.Creation{}, sessions.ErrInvalidInput
-	}
-	var row sqlc.Session
-	var environment *sessions.Environment
-	err = s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		var err error
-		row, err = q.FindSessionCreation(ctx, sqlc.FindSessionCreationParams{TenantID: tenant, IdempotencyKey: key})
-		if err != nil {
-			return err
-		}
-		environment, err = sessionEnvironmentSnapshot(ctx, q, row)
-		return err
-	})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.Creation{}, sessions.ErrNotFound
-	}
-	if err != nil {
-		return sessions.Creation{}, fmt.Errorf("find session creation: %w", err)
-	}
-	if row.DeletedAt.Valid || !row.CreatorKind.Valid || !row.CreatorID.Valid || row.CreatorKind.String != creator.Kind || row.CreatorID.String != creator.ID {
-		return sessions.Creation{}, sessions.ErrIdempotencyConflict
-	}
-	// Missing request intent does not imply missing ownership. Known creators may
-	// still fall back to the original resolved-request equivalence at the upsert.
-	if !row.CreationRequestHash.Valid {
-		return sessions.Creation{}, sessions.ErrNotFound
-	}
-	if row.CreationRequestHash.String != hash.String {
-		return sessions.Creation{}, sessions.ErrIdempotencyConflict
-	}
-	session, err := sessionpg.SessionFromRow(row)
-	session.Environment = environment
-	// The row and cursor share one committed snapshot; later events remain observable.
-	return sessions.Creation{Session: session, Cursor: row.EventSequence}, err
-}
diff --git a/services/core/internal/store/session_creation_identity_test.go b/services/core/internal/store/session_creation_identity_test.go
index 28df45d2a..44e1b2fa6 100644
--- a/services/core/internal/store/session_creation_identity_test.go
+++ b/services/core/internal/store/session_creation_identity_test.go
@@ -2,12 +2,7 @@ package store
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
-	"errors"
-	"fmt"
-	"reflect"
-	"sync"
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
@@ -20,139 +15,6 @@ import (
 	"github.com/google/uuid"
 )
 
-func TestSessionCreationIdentityConvergesOnFrozenSnapshot(t *testing.T) {
-	s, pool := testStore(t)
-	ctx := context.Background()
-	tenant := uuid.NewString()
-	request := json.RawMessage(`{"agent_id":"source","agent":{"tools":[{"parameters":{"const":9007199254740993}}]}}`)
-	const count = 8
-	results := make(chan sessions.Creation, count)
-	errs := make(chan error, count)
-	var wg sync.WaitGroup
-	for i := range count {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "same", CreationRequest: request, Configuration: json.RawMessage(fmt.Sprintf(`{"resolved":%d}`, i)), InitialInputs: []sessions.Input{messageInput("one")}}
-			result, err := s.CreateSessionStream(ctx, tenant, input)
-			results <- result
-			errs <- err
-		}()
-	}
-	wg.Wait()
-	close(results)
-	close(errs)
-	for err := range errs {
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-	var first sessions.Creation
-	created := 0
-	for result := range results {
-		if first.Session.ID == "" {
-			first = result
-		}
-		if result.Session.ID != first.Session.ID || string(result.Session.Configuration) != string(first.Session.Configuration) {
-			t.Fatal("concurrent resolution changed winner", first, result)
-		}
-		if result.Created {
-			created++
-			if result.Cursor != 0 {
-				t.Fatal("creation cursor passed initial input")
-			}
-		}
-	}
-	var turns, inputs int
-	if err := pool.QueryRow(ctx, `SELECT count(*) FROM turns WHERE session_id=$1`, first.Session.ID).Scan(&turns); err != nil {
-		t.Fatal(err)
-	}
-	if err := pool.QueryRow(ctx, `SELECT count(*) FROM turn_inputs WHERE session_id=$1`, first.Session.ID).Scan(&inputs); err != nil {
-		t.Fatal(err)
-	}
-	if created != 1 || turns != 1 || inputs != 1 {
-		t.Fatal(created, turns, inputs)
-	}
-	restarted := New(pool)
-	retry, err := restarted.FindSessionCreation(ctx, tenant, "same", json.RawMessage(`{"agent":{"tools":[{"parameters":{"const":9007199254740993}}]},"agent_id":"source"}`), FixtureCreator())
-	if err != nil || retry.Created || retry.Session.ID != first.Session.ID || retry.Cursor == 0 {
-		t.Fatal(retry, err)
-	}
-	if _, err := restarted.FindSessionCreation(ctx, tenant, "same", json.RawMessage(`{"agent_id":"source","agent":{"tools":[{"parameters":{"const":9007199254740992}}]}}`), FixtureCreator()); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatal("numeric identity collapsed", err)
-	}
-	if _, err := restarted.FindSessionCreation(ctx, uuid.NewString(), "same", request, FixtureCreator()); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("foreign lookup", err)
-	}
-	if _, err := restarted.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "same", CreationRequest: json.RawMessage(`{"agent_id":"changed"}`), Configuration: first.Session.Configuration}); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatal("changed caller admitted", err)
-	}
-}
-
-func TestSessionCreationIdentityDoesNotInventHistoricalIntent(t *testing.T) {
-	s, pool := testStore(t)
-	ctx := context.Background()
-	tenant := uuid.NewString()
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "historical", Configuration: json.RawMessage(`{"agent":{"id":"source","instructions":"original"}}`)}
-	first, err := s.CreateSession(ctx, tenant, input)
-	if err != nil {
-		t.Fatal(err)
-	}
-	input.CreationRequest = json.RawMessage(`{"agent_id":"source"}`)
-	if _, err := s.FindSessionCreation(ctx, tenant, input.IdempotencyKey, input.CreationRequest, FixtureCreator()); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal(err)
-	}
-	retry, err := s.CreateSession(ctx, tenant, input)
-	if err != nil || !reflect.DeepEqual(first, retry) {
-		t.Fatal(retry, err)
-	}
-	var hash *string
-	if err := pool.QueryRow(ctx, `SELECT creation_request_hash FROM sessions WHERE id=$1`, first.ID).Scan(&hash); err != nil || hash != nil {
-		t.Fatal("historical intent was manufactured", hash, err)
-	}
-	input.Configuration = json.RawMessage(`{"agent":{"id":"source","instructions":"changed"}}`)
-	if _, err := s.CreateSession(ctx, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatal("historical retry rules changed", err)
-	}
-}
-
-// A provider key enters the retry hashes only through a fingerprint keyed by the
-// credential key: the same request under two credential keys hashes differently,
-// and an intent whose provider cannot be read is rejected, not hashed raw.
-func TestProviderKeyEntersRetryHashesOnlyAsKeyedFingerprint(t *testing.T) {
-	_, pool := testStore(t)
-	provider := &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://example.com/v1", APIKey: "hash-key-canary"}
-	intent, err := json.Marshal(map[string]any{"agent": map[string]string{"model": "m"}, "environment": map[string]string{"type": "openai_hosted"}, "x_agents_core": map[string]any{"model_provider": provider}})
-	if err != nil {
-		t.Fatal(err)
-	}
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "same-request", ModelProvider: provider, ModelProviderSource: v1.ModelProviderSourceSession,
-		Configuration: []byte(`{"agent":{"model":"m"},"environment":{"type":"openai_hosted"}}`), CreationRequest: intent}
-	var hashes [2][2]string
-	for index, seed := range []byte{71, 72} {
-		cipher, err := credentialcrypto.New(bytes.Repeat([]byte{seed}, 32))
-		if err != nil {
-			t.Fatal(err)
-		}
-		session, err := withPlacement(t, NewWithCredentialCipher(pool, cipher)).CreateSession(t.Context(), uuid.NewString(), input)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := pool.QueryRow(t.Context(), "SELECT request_hash, creation_request_hash FROM sessions WHERE id=$1", session.ID).Scan(&hashes[index][0], &hashes[index][1]); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if hashes[0][0] == hashes[1][0] || hashes[0][1] == hashes[1][1] {
-		t.Fatal("retry hashes do not depend on the credential key", hashes)
-	}
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{71}, 32))
-	unreadable := input
-	unreadable.IdempotencyKey, unreadable.CreationRequest = "unreadable", json.RawMessage(`{"x_agents_core":{"model_provider":"hash-key-canary"}}`)
-	if _, err := withPlacement(t, NewWithCredentialCipher(pool, cipher)).CreateSession(t.Context(), uuid.NewString(), unreadable); !errors.Is(err, sessions.ErrInvalidInput) {
-		t.Fatal("unreadable provider intent was hashed", err)
-	}
-}
-
 // A Session keeps the deployment default and revision it resolved. Replacing,
 // removing or recreating the default never changes a created Session, a retry
 // that resolved a newer default replays the original, and a Session that froze
diff --git a/services/core/internal/store/session_creation_stream.go b/services/core/internal/store/session_creation_stream.go
deleted file mode 100644
index 1319353a1..000000000
--- a/services/core/internal/store/session_creation_stream.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package store
-
-import (
-	"context"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// CreateSessionStream shares admission and retry identity with ordinary creation.
-// The upsert returns its event cursor while holding the Session write lock, before
-// initial inputs commit. No post-commit cursor lookup may skip those inputs.
-func (s *Store) CreateSessionStream(ctx context.Context, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
-	result, err := s.createSession(ctx, tenant, input)
-	if err != nil || !result.Created {
-		// A stream retry sends no events, so it needs no projection read.
-		return result, err
-	}
-	result.Session, err = s.sessionActivity(ctx, result.Session, nil)
-	if err != nil {
-		return sessions.Creation{}, err
-	}
-	return result, nil
-}
diff --git a/services/core/internal/store/session_creation_stream_test.go b/services/core/internal/store/session_creation_stream_test.go
deleted file mode 100644
index c7aee3ae1..000000000
--- a/services/core/internal/store/session_creation_stream_test.go
+++ /dev/null
@@ -1,179 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"sync"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-func TestCreationStreamStartsBeforeOwnInputsAndRetriesAtUpsertCursor(t *testing.T) {
-	s, _ := testStore(t)
-	other, _ := testStore(t)
-	ctx := context.Background()
-	tenant := uuid.NewString()
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "stream", InitialInputs: []sessions.Input{messageInput("first")}}
-	var wg sync.WaitGroup
-	results := make(chan sessions.Creation, 8)
-	for i := range 8 {
-		wg.Go(func() {
-			st := s
-			if i%2 == 0 {
-				st = other
-			}
-			result, err := st.CreateSessionStream(ctx, tenant, input)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			results <- result
-		})
-	}
-	wg.Wait()
-	close(results)
-	var created sessions.Creation
-	var retries []sessions.Creation
-	for result := range results {
-		if result.Created {
-			if created.Created {
-				t.Fatal("two creation owners")
-			}
-			created = result
-		} else {
-			retries = append(retries, result)
-		}
-	}
-	// The snapshot is the committed post-admission projection; the cursor still
-	// precedes the initial input's events.
-	if !created.Created || created.Cursor != 0 || created.Session.LastTurn == nil || created.Session.LastTurn.Status != sessions.TurnQueued || len(retries) != 7 {
-		t.Fatal("invalid post-admission creation snapshot", created, retries)
-	}
-	id := created.Session.ID
-	initial, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, id, created.Cursor)
-	if err != nil || len(initial) != 3 {
-		t.Fatal("lost initial events", initial, err)
-	}
-	for i, kind := range []string{"agent.session.turn.created", "agent.session.turn.item.added", "agent.session.in_progress"} {
-		if initial[i].Event.Type != kind {
-			t.Fatal("new Turn events are out of order", i, initial[i].Event.Type)
-		}
-	}
-	if initial[1].Event.Item == nil || initial[1].Event.Item.Role != "user" || initial[2].Turn == nil || initial[2].Turn.Status != sessions.TurnQueued {
-		t.Fatal("invalid initial input or activity snapshot", initial)
-	}
-	encoded := func(value sessions.Session) string {
-		raw, err := json.Marshal(value)
-		if err != nil {
-			t.Fatal(err)
-		}
-		return string(raw)
-	}
-	read, err := sessionAdapter(s).GetSession(ctx, tenant, id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, retry := range retries {
-		if retry.Session.ID != id || retry.Cursor != initial[len(initial)-1].Sequence {
-			t.Fatal(retry)
-		}
-		// Upsert retries return only the row, without a projection read or input.
-		if retry.Session.LastTurn != nil || retry.Session.EnvironmentInputActivity != nil || retry.Session.Usage != nil {
-			t.Fatal("retry read the Session projection", retry.Session)
-		}
-		if events, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, id, retry.Cursor); err != nil || len(events) != 0 {
-			t.Fatal("retry replayed initial events", events, err)
-		}
-	}
-	ordinary, err := s.CreateSession(ctx, tenant, input)
-	if err != nil || ordinary.ID != id || ordinary.LastTurn == nil {
-		t.Fatal(ordinary, err)
-	}
-	// The streamed snapshot is the projection that the JSON response returns.
-	if encoded(created.Session) != encoded(ordinary) || encoded(ordinary) != encoded(read) {
-		t.Fatal("streamed and JSON creation projections differ", created.Session, ordinary)
-	}
-	snapshot, cursor, err := sessionAdapter(s).SessionStreamSnapshot(ctx, tenant, id)
-	if err != nil || encoded(snapshot) != encoded(read) || cursor != initial[len(initial)-1].Sequence || initial[2].Settled {
-		t.Fatal("stream snapshot differs from the Session read and its cursor", cursor, err)
-	}
-	transition(t, s, tenant, id, ordinary.LastTurn.ID, sessions.TurnQueued, sessions.TurnInProgress)
-	transition(t, s, tenant, id, ordinary.LastTurn.ID, sessions.TurnInProgress, sessions.TurnCompleted)
-	// Completing before the HTTP observer drains does not change its start point.
-	all, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, id, created.Cursor)
-	if err != nil || len(all) <= len(initial) || all[0].Event.EventID != initial[0].Event.EventID {
-		t.Fatal(all, err)
-	}
-	// The terminal Turn's idle snapshot is recorded as settled for creation streams.
-	if last := all[len(all)-1]; last.Event.Type != "agent.session.idle" || !last.Settled {
-		t.Fatal("terminal idle is not recorded as settled", last.Event.Type, last.Settled)
-	}
-	if _, cursor, err := sessionAdapter(s).SessionStreamSnapshot(ctx, tenant, id); err != nil || cursor != all[len(all)-1].Sequence {
-		t.Fatal("stream snapshot cursor", cursor, err)
-	}
-	if _, _, err := sessionAdapter(s).SessionStreamSnapshot(ctx, uuid.NewString(), id); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("foreign stream snapshot", err)
-	}
-	late, err := s.CreateSessionStream(ctx, tenant, input)
-	if err != nil || late.Created || late.Cursor != all[len(all)-1].Sequence {
-		t.Fatal(late, err)
-	}
-	next, err := submitInputs(ctx, s, tenant, id, "next", []sessions.Input{messageInput("later")})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if late.Session.ID != id || late.Session.LastTurn != nil {
-		t.Fatal("late retry read the Session projection", late.Session.LastTurn)
-	}
-	future, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, id, late.Cursor)
-	if err != nil || len(future) != 3 || future[0].Turn.ID != next[0].TurnID {
-		t.Fatal(future, err)
-	}
-	for i, kind := range []string{"agent.session.turn.created", "agent.session.turn.item.added", "agent.session.in_progress"} {
-		if future[i].Event.Type != kind {
-			t.Fatal("later Turn events are out of order", i, future[i].Event.Type)
-		}
-	}
-	turns, err := sessionAdapter(s).ListTurns(ctx, tenant, id, "", 100, true)
-	if err != nil || len(turns.Turns) != 2 {
-		t.Fatal(turns, err)
-	}
-	foreign, err := s.CreateSessionStream(ctx, uuid.NewString(), input)
-	if err != nil || !foreign.Created || foreign.Session.ID == id || foreign.Cursor != 0 {
-		t.Fatal(foreign, err)
-	}
-}
-
-func TestCreationStreamIdleAndNonstreamRetry(t *testing.T) {
-	s, _ := testStore(t)
-	ctx := context.Background()
-	tenant := uuid.NewString()
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "idle"}
-	first, err := s.CreateSessionStream(ctx, tenant, input)
-	if err != nil || !first.Created || first.Cursor != 0 || first.Session.LastTurn != nil {
-		t.Fatal(first, err)
-	}
-	if _, err := submitInputs(ctx, s, tenant, first.Session.ID, "message", []sessions.Input{messageInput("later")}); err != nil {
-		t.Fatal(err)
-	}
-	retry, err := s.CreateSessionStream(ctx, tenant, input)
-	if err != nil || retry.Created || retry.Cursor == 0 {
-		t.Fatal(retry, err)
-	}
-	ordinary, err := s.CreateSession(ctx, tenant, input)
-	if err != nil || ordinary.ID != first.Session.ID || ordinary.LastTurn == nil {
-		t.Fatal(ordinary, err)
-	}
-	input.IdempotencyKey = "nonstream-first"
-	ordinary, err = s.CreateSession(ctx, tenant, input)
-	if err != nil {
-		t.Fatal(err)
-	}
-	retry, err = s.CreateSessionStream(ctx, tenant, input)
-	if err != nil || retry.Created || retry.Session.ID != ordinary.ID || retry.Cursor != 0 {
-		t.Fatal(retry, err)
-	}
-}
diff --git a/services/core/internal/store/session_creator_test.go b/services/core/internal/store/session_creator_test.go
deleted file mode 100644
index c8c0d25d6..000000000
--- a/services/core/internal/store/session_creator_test.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"sync"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-func TestSessionCreatorIsRequiredBeforeCreation(t *testing.T) {
-	s, _ := testStore(t)
-	tenant := uuid.NewString()
-	input := environmentInput("creator-required", "self_hosted", "/workspace")
-	input.InitialInputs = []sessions.Input{messageInput("initial")}
-	for _, invalid := range []identity.Subject{{}, {Kind: "user"}, {ID: "someone"}, {Kind: "workspace", ID: "someone"}} {
-		input.Creator = invalid
-		if _, err := s.CreateSessionStream(t.Context(), tenant, input); !errors.Is(err, sessions.ErrInvalidInput) {
-			t.Fatalf("invalid creator accepted: %v", err)
-		}
-	}
-	page, err := sessionAdapter(s).ListSessions(t.Context(), tenant, "", 10, false, nil)
-	if err != nil || len(page.Sessions) != 0 {
-		t.Fatal("invalid creation wrote resources", page, err)
-	}
-	input.Creator = FixtureCreator()
-	created, err := s.CreateSession(t.Context(), tenant, input)
-	if err != nil || created.Creator == nil || *created.Creator != input.Creator {
-		t.Fatal("valid creator did not persist", created, err)
-	}
-}
-
-func TestConcurrentSessionCreatorsCannotShareCreationRetry(t *testing.T) {
-	s, pool := testStore(t)
-	tenant := uuid.NewString()
-	request := json.RawMessage(`{"agent_id":"source"}`)
-	creators := []identity.Subject{{Kind: "user", ID: "same-id"}, {Kind: "service_account", ID: "same-id"}}
-	type outcome struct {
-		result sessions.Creation
-		err    error
-	}
-	results := make(chan outcome, 8)
-	start := make(chan struct{})
-	var ready sync.WaitGroup
-	ready.Add(8)
-	for i := range 8 {
-		go func() {
-			input := environmentInput("shared-retry", "self_hosted", "/workspace")
-			input.Creator = creators[i%2]
-			input.CreationRequest, input.InitialInputs = request, []sessions.Input{messageInput("once")}
-			ready.Done()
-			<-start
-			result, err := s.CreateSessionStream(t.Context(), tenant, input)
-			results <- outcome{result, err}
-		}()
-	}
-	ready.Wait()
-	close(start)
-	var winner sessions.Session
-	succeeded, conflicted, created := 0, 0, 0
-	for range 8 {
-		got := <-results
-		if errors.Is(got.err, sessions.ErrIdempotencyConflict) {
-			conflicted++
-			continue
-		}
-		if got.err != nil || got.result.Session.Creator == nil {
-			t.Fatal("creation failed", got)
-		}
-		succeeded++
-		if got.result.Created {
-			created++
-		}
-		if winner.ID == "" {
-			winner = got.result.Session
-		}
-		if winner.ID != got.result.Session.ID || *winner.Creator != *got.result.Session.Creator {
-			t.Fatal("creator or Session changed across retries")
-		}
-	}
-	if succeeded != 4 || conflicted != 4 || created != 1 {
-		t.Fatalf("success/conflict/created = %d/%d/%d", succeeded, conflicted, created)
-	}
-	var environments, turns, inputs, reservations, initialReservations int
-	if err := pool.QueryRow(t.Context(), `SELECT
-        (SELECT count(*) FROM environments WHERE session_id=$1),
-        (SELECT count(*) FROM turns WHERE session_id=$1),
-        (SELECT count(*) FROM turn_inputs WHERE session_id=$1),
-        (SELECT count(*) FROM environment_input_reservations WHERE session_id=$1),
-        (SELECT count(*) FROM environment_input_reservations WHERE session_id=$1 AND is_initial)`, winner.ID).Scan(&environments, &turns, &inputs, &reservations, &initialReservations); err != nil || environments != 1 || turns != 0 || inputs != 0 || reservations != 1 || initialReservations != 1 {
-		t.Fatal("concurrent creators duplicated or prematurely admitted resources", environments, turns, inputs, reservations, initialReservations, err)
-	}
-	pool.Close()
-	restarted, _ := testStore(t)
-	for _, creator := range creators {
-		found, err := restarted.FindSessionCreation(t.Context(), tenant, "shared-retry", request, creator)
-		if creator == *winner.Creator {
-			if err != nil || found.Session.ID != winner.ID || found.Session.Creator == nil || *found.Session.Creator != creator {
-				t.Fatal("creator retry did not survive restart", found, err)
-			}
-		} else if !errors.Is(err, sessions.ErrIdempotencyConflict) {
-			t.Fatal("early recovery ignored creator kind", err)
-		}
-	}
-	if _, err := sessionAdapter(restarted).GetSession(t.Context(), uuid.NewString(), winner.ID); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("creator bypassed project isolation", err)
-	}
-}
-
-func TestHistoricalUnknownCreatorCannotBeClaimedByRetry(t *testing.T) {
-	for _, recordedIntent := range []bool{false, true} {
-		t.Run(map[bool]string{false: "unknown intent", true: "recorded intent"}[recordedIntent], func(t *testing.T) {
-			s, pool := testStore(t)
-			ctx := context.Background()
-			tenant := uuid.NewString()
-			input := environmentInput("historical-owner", "self_hosted", "/workspace")
-			input.CreationRequest = json.RawMessage(`{"agent_id":"historical-source"}`)
-			created, err := s.CreateSession(ctx, tenant, input)
-			if err != nil {
-				t.Fatal(err)
-			}
-			// Explicitly represent pre-migration ownership; production creation has no unknown mode.
-			if _, err := pool.Exec(ctx, `UPDATE sessions SET creator_kind=NULL, creator_id=NULL,
-                creation_request_hash=CASE WHEN $2 THEN creation_request_hash ELSE NULL END WHERE id=$1`, created.ID, recordedIntent); err != nil {
-				t.Fatal(err)
-			}
-			var before, after string
-			if err := pool.QueryRow(ctx, "SELECT to_jsonb(s)::text FROM sessions s WHERE id=$1", created.ID).Scan(&before); err != nil {
-				t.Fatal(err)
-			}
-			read, err := sessionAdapter(s).GetSession(ctx, tenant, created.ID)
-			if err != nil || read.Creator != nil {
-				t.Fatal("historical ownership was invented", read, err)
-			}
-			page, err := sessionAdapter(s).ListSessions(ctx, tenant, "", 10, false, nil)
-			if err != nil || len(page.Sessions) != 1 || page.Sessions[0].Creator != nil {
-				t.Fatal("historical project reads changed", page, err)
-			}
-			if _, err := s.FindSessionCreation(ctx, tenant, input.IdempotencyKey, input.CreationRequest, input.Creator); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-				t.Fatal("early retry claimed historical ownership", err)
-			}
-			if _, err := s.CreateSessionStream(ctx, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-				t.Fatal("upsert claimed historical ownership", err)
-			}
-			for _, statement := range []string{
-				"UPDATE sessions SET creator_kind='user' WHERE id=$1",
-				"UPDATE sessions SET creator_id='someone' WHERE id=$1",
-			} {
-				if _, err := pool.Exec(ctx, statement, created.ID); err == nil {
-					t.Fatal("partial creator passed the database constraint")
-				}
-			}
-			if err := pool.QueryRow(ctx, "SELECT to_jsonb(s)::text FROM sessions s WHERE id=$1", created.ID).Scan(&after); err != nil || after != before {
-				t.Fatal("retry changed historical data", err)
-			}
-		})
-	}
-}
diff --git a/services/core/internal/store/session_deletion_lifecycle_public_test.go b/services/core/internal/store/session_deletion_lifecycle_public_test.go
index 8852cfda3..8f33c7051 100644
--- a/services/core/internal/store/session_deletion_lifecycle_public_test.go
+++ b/services/core/internal/store/session_deletion_lifecycle_public_test.go
@@ -39,7 +39,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	server := httptest.NewServer(h)
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
-	leased := executionOwner(t, db, s)
+	leased := executionOwner(t, db)
 
 	create := func(environment string, initial bool) sessions.Session {
 		t.Helper()
diff --git a/services/core/internal/store/session_deletion_test.go b/services/core/internal/store/session_deletion_test.go
index 425307967..619465053 100644
--- a/services/core/internal/store/session_deletion_test.go
+++ b/services/core/internal/store/session_deletion_test.go
@@ -136,7 +136,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if _, err := fresh.CreateSession(ctx, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 				t.Fatal(err)
 			}
-			if _, err := fresh.CreateSessionStream(ctx, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
+			if _, err := createSession(ctx, fresh, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 				t.Fatal(err)
 			}
 			if _, err := sendMessage(ctx, fresh, tenant, session.ID, "input", json.RawMessage(`{"text":"retained"}`)); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/internal/store/session_environment_snapshot.go b/services/core/internal/store/session_environment_snapshot.go
deleted file mode 100644
index 315fe08a9..000000000
--- a/services/core/internal/store/session_environment_snapshot.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/jackc/pgx/v5"
-)
-
-func sessionEnvironmentSnapshot(ctx context.Context, q *sqlc.Queries, session sqlc.Session) (*sessions.Environment, error) {
-	row, err := q.GetSessionEnvironment(ctx, sqlc.GetSessionEnvironmentParams{TenantID: session.TenantID, ID: session.ID})
-	if errors.Is(err, pgx.ErrNoRows) {
-		return nil, nil
-	}
-	value, err := sessionpg.EnvironmentFromRow(row.Environment, row.TenantID, row.Configuration, err)
-	if err != nil {
-		return nil, err
-	}
-	return &value, nil
-}
diff --git a/services/core/internal/store/session_environment_snapshot_test.go b/services/core/internal/store/session_environment_snapshot_test.go
deleted file mode 100644
index eda9b4990..000000000
--- a/services/core/internal/store/session_environment_snapshot_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package store
-
-import (
-	"encoding/json"
-	"errors"
-	"testing"
-
-	"github.com/google/uuid"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-func TestSelfHostedCreationSnapshotRetainsEnvironmentAndCursor(t *testing.T) {
-	s, _ := testStore(t)
-	tenant := uuid.NewString()
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "environment-snapshot",
-		Configuration:   json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`),
-		CreationRequest: json.RawMessage(`{"agent_id":"saved-agent","environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`),
-	}
-	created, err := s.CreateSessionStream(t.Context(), tenant, input)
-	if err != nil || !created.Created || created.Cursor != 0 || created.Session.Environment == nil {
-		t.Fatal("missing creation Environment", created, err)
-	}
-	environment := created.Session.Environment
-	if environment.ID == "" || environment.SessionID != created.Session.ID || environment.TenantID != tenant || environment.Status != "pending" {
-		t.Fatal("incorrect creation association", environment)
-	}
-	pending, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, created.Session.ID, "later", []sessions.Input{messageInput("later")})
-	if err != nil || pending.State != sessions.EnvironmentInputPending {
-		t.Fatal(pending, err)
-	}
-	events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, created.Session.ID, created.Cursor)
-	if err != nil || len(events) != 1 || events[0].Event.Type != "agent.session.requires_action" {
-		t.Fatal("creation cursor lost subsequent activity", events, err)
-	}
-	retry, err := s.CreateSessionStream(t.Context(), tenant, input)
-	if err != nil {
-		t.Fatal(err)
-	}
-	recovered, err := s.FindSessionCreation(t.Context(), tenant, input.IdempotencyKey, input.CreationRequest, input.Creator)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, value := range []sessions.Creation{retry, recovered} {
-		snapshot := value.Session
-		if value.Created || value.Cursor != events[0].Sequence || snapshot.Environment == nil || snapshot.Environment.ID != environment.ID || string(snapshot.Environment.Configuration) != string(environment.Configuration) {
-			t.Fatal("retry changed Environment or cursor", value)
-		}
-	}
-	// Recorded-intent lookup and upsert retries return only the row; they read
-	// no projection because a stream retry sends no events.
-	for _, snapshot := range []sessions.Session{recovered.Session, retry.Session} {
-		if snapshot.LastTurn != nil || snapshot.EnvironmentInputActivity != nil || snapshot.Usage != nil {
-			t.Fatal("creation retry borrowed later activity", snapshot)
-		}
-	}
-	changedCreator := input.Creator
-	changedCreator.ID = "another-creator"
-	if _, err := s.FindSessionCreation(t.Context(), tenant, input.IdempotencyKey, input.CreationRequest, changedCreator); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatal("retry creator isolation", err)
-	}
-	current, err := sessionAdapter(s).GetSession(t.Context(), tenant, created.Session.ID)
-	if err != nil || current.EnvironmentInputActivity == nil || current.EnvironmentInputActivity.Status != "requires_action" {
-		t.Fatal("ordinary read lost current activity", current, err)
-	}
-	if created.Cursor != 0 || created.Session.EnvironmentInputActivity != nil {
-		t.Fatal("creation snapshot mutated")
-	}
-}
diff --git a/services/core/internal/store/session_events_test.go b/services/core/internal/store/session_events_test.go
index 1c761eb11..f0640c382 100644
--- a/services/core/internal/store/session_events_test.go
+++ b/services/core/internal/store/session_events_test.go
@@ -51,7 +51,7 @@ func TestSessionEventsAreVisibleOnlyAfterCommit(t *testing.T) {
 func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "stream"})
 	if err != nil {
diff --git a/services/core/internal/store/session_execution_configuration.go b/services/core/internal/store/session_execution_configuration.go
deleted file mode 100644
index 883c44bf6..000000000
--- a/services/core/internal/store/session_execution_configuration.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-// The projection is creation metadata, excluded from retry identity. Only the
-// transaction that inserts the Session writes it; retries cannot repair or alter it.
-func saveSessionExecutionConfiguration(ctx context.Context, q *sqlc.Queries, session sqlc.Session, projection *v1.SessionExecutionConfiguration, provider *v1.ModelProviderInput, providerSource string, revision uuid.UUID) error {
-	if projection == nil {
-		return nil
-	}
-	var frozenRevision pgtype.UUID
-	frozen := *projection
-	model, err := sessions.ExecutionModel(session.Configuration)
-	if err != nil {
-		return err
-	}
-	if !sameExecutionValue(frozen.Model.Value, model) || frozen.Harness.Value == nil || *frozen.Harness.Value != session.Engine ||
-		!validExecutionSource(frozen.Model.Source) || !validExecutionSource(frozen.Harness.Source) {
-		return fmt.Errorf("%w: execution projection does not match Session configuration", sessions.ErrInvalidInput)
-	}
-	switch frozen.ModelProvider.Source {
-	case "deployment":
-		if provider == nil {
-			return fmt.Errorf("%w: execution projection has no model provider", sessions.ErrInvalidInput)
-		}
-		// The deployment default is readable with the same Core key, so the
-		// safe view is recorded from the frozen bundle itself. Native options
-		// are never part of it.
-		frozen.ModelProvider.Status = "available"
-		frozen.ModelProvider.Configuration = provider.SafeView()
-		if providerSource == v1.ModelProviderSourceDeployment && revision != uuid.Nil {
-			frozenRevision = pgtype.UUID{Bytes: revision, Valid: true}
-		}
-	case "session", "agent":
-		if provider == nil || frozen.ModelProvider.Status != "available" || frozen.ModelProvider.Configuration == nil || *frozen.ModelProvider.Configuration != *provider.SafeView() {
-			return fmt.Errorf("%w: execution projection does not match model provider", sessions.ErrInvalidInput)
-		}
-	case "unknown":
-		frozen.ModelProvider.Status = "unavailable"
-		frozen.ModelProvider.Configuration = nil
-	default:
-		return fmt.Errorf("%w: invalid execution projection source", sessions.ErrInvalidInput)
-	}
-	sessions.NormalizeExecutionProjection(&frozen, uuid.UUID(session.ID.Bytes).String())
-	raw, err := json.Marshal(frozen)
-	if err != nil {
-		return err
-	}
-	return q.SaveSessionExecutionConfiguration(ctx, sqlc.SaveSessionExecutionConfigurationParams{SessionID: session.ID, Configuration: raw, DeploymentProviderRevision: frozenRevision})
-}
-
-func sameExecutionValue(a, b *string) bool {
-	return a == nil && b == nil || a != nil && b != nil && *a == *b
-}
-
-func validExecutionSource(source string) bool {
-	switch source {
-	case "session", "agent", "deployment", "unknown":
-		return true
-	}
-	return false
-}
diff --git a/services/core/internal/store/session_execution_configuration_test.go b/services/core/internal/store/session_execution_configuration_test.go
index 0c9338d1e..d75aa2293 100644
--- a/services/core/internal/store/session_execution_configuration_test.go
+++ b/services/core/internal/store/session_execution_configuration_test.go
@@ -51,7 +51,7 @@ func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testi
 				var session sessions.Session
 				var err error
 				if stream {
-					created, e := s.CreateSessionStream(t.Context(), tenant, input)
+					created, e := createSession(t.Context(), s, tenant, input)
 					session, err = created.Session, e
 				} else {
 					session, err = s.CreateSession(t.Context(), tenant, input)
@@ -217,7 +217,7 @@ func TestSessionExecutionConfigurationConcurrentRetryKeepsWinner(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			created, err := s.CreateSessionStream(t.Context(), tenant, request)
+			created, err := createSession(t.Context(), s, tenant, request)
 			if err != nil {
 				t.Error(err)
 				return
diff --git a/services/core/internal/store/session_initial_input.go b/services/core/internal/store/session_initial_input.go
deleted file mode 100644
index 77e89638b..000000000
--- a/services/core/internal/store/session_initial_input.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/placementpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
-)
-
-// The Session upsert locks retries. Only the new row reserves or admits work, so a
-// retry after completion or later Turns cannot submit the original input again.
-func (s *Store) createSessionResources(ctx context.Context, tenant string, params sqlc.CreateSessionParams, inputs []sessions.Input, encodedInput json.RawMessage, files []environmentconfig.InitialFile, setup environmentconfig.Setup, provider *v1.ModelProviderInput, executionConfiguration *v1.SessionExecutionConfiguration, providerSource string, deploymentRevision uuid.UUID) (sqlc.Session, *sessions.Environment, error) {
-	var row sqlc.Session
-	var environment *sessions.Environment
-	err := s.pooled.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := s.queries.WithTx(tx)
-		var err error
-		row, err = q.CreateSession(ctx, params)
-		if err != nil {
-			return err
-		}
-		if row.ID == params.ID {
-			var configuration struct {
-				Environment struct {
-					Type string `json:"type"`
-				} `json:"environment"`
-			}
-			if err := json.Unmarshal(row.Configuration, &configuration); err != nil {
-				return err
-			}
-			// Hosted admission and placement share the deployment lock with
-			// deployment changes, restore and node removal.
-			var hosted *placement.Deployment
-			if configuration.Environment.Type == "openai_hosted" {
-				if s.placement == nil {
-					return errors.New("hosted Session creation requires placement rules")
-				}
-				d, err := placementpg.LockDeployment(ctx, q)
-				if err != nil {
-					return err
-				}
-				if err := s.placement.CheckAdmission(d, ""); err != nil {
-					return err
-				}
-				hosted = &d
-			}
-			setup, err = s.freezeEnvironmentSkills(ctx, q, tenant, setup)
-			if err != nil {
-				return err
-			}
-			if err := s.saveSessionModelExecution(ctx, q, tenant, row.ID, provider); err != nil {
-				return err
-			}
-			if err := saveSessionExecutionConfiguration(ctx, q, row, executionConfiguration, provider, providerSource, deploymentRevision); err != nil {
-				return err
-			}
-			if len(files) > 0 {
-				metadata, err := s.saveInitialFiles(ctx, q, tx, tenant, row.ID, files)
-				if err != nil {
-					return err
-				}
-				row, err = q.SetSessionInitialFileMetadata(ctx, sqlc.SetSessionInitialFileMetadataParams{ID: row.ID, Column2: metadata})
-				if err != nil {
-					return err
-				}
-			}
-			if err := s.saveEnvironmentSetup(ctx, q, tenant, row.ID, setup); err != nil {
-				return err
-			}
-			if !setup.Empty() {
-				packages, err := json.Marshal(setup.PackageMetadata())
-				if err != nil {
-					return err
-				}
-				skills, err := json.Marshal(setup.SkillMetadata())
-				if err != nil {
-					return err
-				}
-				plugins, err := json.Marshal(setup.PluginMetadata())
-				if err != nil {
-					return err
-				}
-				directories, err := json.Marshal(append([]string{}, setup.CapabilityDirectories...))
-				if err != nil {
-					return err
-				}
-				row, err = q.SetSessionSetupMetadata(ctx, sqlc.SetSessionSetupMetadataParams{ID: row.ID, Packages: packages, Skills: skills, Plugins: plugins, CapabilityDirectories: directories})
-				if err != nil {
-					return err
-				}
-			}
-			creates, err := sessions.CreatesEnvironment(row.Configuration)
-			if err != nil {
-				return err
-			}
-			if creates {
-				if err := sessionpg.CreateSessionEnvironment(ctx, q, row.ID); err != nil {
-					return err
-				}
-			}
-			if hosted != nil {
-				nodes, err := placementpg.LoadNodes(ctx, q)
-				if err != nil {
-					return err
-				}
-				// A Session creation retry never reaches the placement.
-				chosen, err := s.placement.DecidePlacement(*hosted, nodes)
-				if err != nil {
-					return err
-				}
-				if chosen != nil {
-					if err := placementpg.ReservePlacement(ctx, q, row.ID, *chosen); err != nil {
-						return err
-					}
-				}
-			}
-		}
-		environment, err = sessionEnvironmentSnapshot(ctx, q, row)
-		if err != nil {
-			return err
-		}
-		audit := func() error {
-			var created []writeaudit.Resource
-			if row.ID == params.ID {
-				created = append(created, writeaudit.Resource{Type: "session", ID: uuid.UUID(row.ID.Bytes).String()})
-				if environment != nil {
-					created = append(created, writeaudit.Resource{Type: "environment", ID: environment.ID, ParentID: uuid.UUID(row.ID.Bytes).String()})
-				}
-			}
-			return auditpg.RecordWriteAudit(ctx, q, tenant, "create", "session", uuid.UUID(row.ID.Bytes).String(), "", created...)
-		}
-		if row.ID != params.ID || len(inputs) == 0 {
-			return audit()
-		}
-		// Creation retries use the Session request hash. Keep the internal input key
-		// independent of caller-supplied keys at the events endpoint.
-		key := uuid.NewString()
-		if environment != nil {
-			// Environment input waits for the existing preparation and leased promotion.
-			if err := sessions.TrackInputActivity(ctx, sessionpg.BindSession(q, row.TenantID, row.ID), func(ctx context.Context) error {
-				_, err := q.CreateEnvironmentInputReservation(ctx, sqlc.CreateEnvironmentInputReservationParams{
-					ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, SessionID: row.ID,
-					IdempotencyKey: key, Batch: encodedInput, IsInitial: true,
-				})
-				return err
-			}); err != nil {
-				return err
-			}
-		} else {
-			if _, err := sessions.AdmitInputs(ctx, sessionpg.BindSession(q, row.TenantID, row.ID), key, inputs); err != nil {
-				return err
-			}
-		}
-		if err := sessionpg.PruneChanges(ctx, q, row.ID); err != nil {
-			return err
-		}
-		return audit()
-	})
-	return row, environment, err
-}
diff --git a/services/core/internal/store/session_initial_input_test.go b/services/core/internal/store/session_initial_input_test.go
deleted file mode 100644
index d8d568786..000000000
--- a/services/core/internal/store/session_initial_input_test.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"reflect"
-	"strings"
-	"sync"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-func TestInitialInputCreationRetriesAcrossConnectionsAndLaterTurns(t *testing.T) {
-	s, pool := testStore(t)
-	other, _ := testStore(t)
-	ctx := context.Background()
-	tenant := uuid.NewString()
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "initial", InitialInputs: []sessions.Input{messageInput("first"), messageInput("second")}}
-	var wg sync.WaitGroup
-	results := make(chan sessions.Session, 8)
-	for i := range 8 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			st := s
-			if i%2 == 0 {
-				st = other
-			}
-			session, err := st.CreateSession(ctx, tenant, input)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			results <- session
-		}()
-	}
-	wg.Wait()
-	close(results)
-	var first sessions.Session
-	for session := range results {
-		if first.ID == "" {
-			first = session
-		}
-		if session.ID != first.ID || session.LastTurn == nil || session.LastTurn.ID != first.LastTurn.ID {
-			t.Fatal("creation retry duplicated work", session)
-		}
-	}
-	if first.LastTurn == nil {
-		t.Fatal("missing initial Turn")
-	}
-	inputs, err := sessionAdapter(s).ListTurnInputs(ctx, tenant, first.ID, first.LastTurn.ID, 0, 100)
-	if err != nil || len(inputs) != 2 {
-		t.Fatal(inputs, err)
-	}
-	if !strings.Contains(string(inputs[0].Payload), "first") || !strings.Contains(string(inputs[1].Payload), "second") {
-		t.Fatal(inputs)
-	}
-	for _, changed := range [][]sessions.Input{nil, {messageInput("changed")}, {input.InitialInputs[1], input.InitialInputs[0]}} {
-		request := input
-		request.InitialInputs = changed
-		if _, err := s.CreateSession(ctx, tenant, request); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-			t.Fatal("changed initial input accepted", err)
-		}
-	}
-	transition(t, s, tenant, first.ID, first.LastTurn.ID, sessions.TurnQueued, sessions.TurnInProgress)
-	transition(t, s, tenant, first.ID, first.LastTurn.ID, sessions.TurnInProgress, sessions.TurnCompleted)
-	// The same caller key at the events endpoint is an independent request.
-	next, err := submitInputs(ctx, s, tenant, first.ID, input.IdempotencyKey, []sessions.Input{messageInput("later")})
-	if err != nil || len(next) != 1 || next[0].TurnID == first.LastTurn.ID {
-		t.Fatal(next, err)
-	}
-	if _, err := requestCancel(ctx, s, tenant, first.ID, "cancel"); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: first.ID, Metadata: map[string]string{"updated": "yes"}}); err != nil {
-		t.Fatal(err)
-	}
-	events, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, first.ID, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	pool.Close()
-	restarted, _ := testStore(t)
-	retry, err := restarted.CreateSession(ctx, tenant, input)
-	if err != nil || retry.ID != first.ID || retry.LastTurn.ID != next[0].TurnID || retry.LastTurn.Status != sessions.TurnCancelled || retry.Metadata["updated"] != "yes" {
-		t.Fatal(retry, err)
-	}
-	after, err := sessionAdapter(restarted).ListSessionEvents(ctx, tenant, first.ID, 0)
-	if err != nil || !reflect.DeepEqual(events, after) {
-		t.Fatal("retry emitted more events", err)
-	}
-	foreign, err := restarted.CreateSession(ctx, uuid.NewString(), input)
-	if err != nil || foreign.ID == first.ID || foreign.LastTurn.ID == first.LastTurn.ID {
-		t.Fatal("tenant creation keys collided", foreign, err)
-	}
-}
-
-func TestInitialInputFailureRollsBackSessionAndWork(t *testing.T) {
-	s, pool := testStore(t)
-	ctx := context.Background()
-	tenant, marker := uuid.NewString(), uuid.NewString()
-	constraint := "initial_failure_" + strings.ReplaceAll(marker, "-", "")
-	// Fail the second input insert after the Session, Turn and first Item exist.
-	_, err := pool.Exec(ctx, "ALTER TABLE turn_inputs ADD CONSTRAINT "+constraint+" CHECK (payload->>'text' <> '"+marker+"')")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { _, _ = pool.Exec(ctx, "ALTER TABLE turn_inputs DROP CONSTRAINT IF EXISTS "+constraint) })
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "rollback", InitialInputs: []sessions.Input{messageInput("first"), messageInput(marker)}}
-	if got, err := s.CreateSession(ctx, tenant, input); err == nil || got.ID != "" {
-		t.Fatal("partial creation succeeded", got, err)
-	}
-	page, err := sessionAdapter(s).ListSessions(ctx, tenant, "", 100, true, nil)
-	if err != nil || len(page.Sessions) != 0 {
-		t.Fatal("partial Session survived", page, err)
-	}
-	if _, err := pool.Exec(ctx, "ALTER TABLE turn_inputs DROP CONSTRAINT "+constraint); err != nil {
-		t.Fatal(err)
-	}
-	got, err := s.CreateSession(ctx, tenant, input)
-	if err != nil || got.LastTurn == nil {
-		t.Fatal("retry after rollback failed", got, err)
-	}
-	items, err := sessionAdapter(s).ListItems(ctx, tenant, got.ID, "", 100, true)
-	if err != nil || len(items.Items) != 2 {
-		t.Fatal(items, err)
-	}
-}
diff --git a/services/core/internal/store/session_initial_public_test.go b/services/core/internal/store/session_initial_public_test.go
index fc2bb5622..f2ca88403 100644
--- a/services/core/internal/store/session_initial_public_test.go
+++ b/services/core/internal/store/session_initial_public_test.go
@@ -21,7 +21,7 @@ func TestInitialSessionInputOfficialClient(t *testing.T) {
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
 	// Exercise real worker admission with dispatch paused for deterministic reads.
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s})
+	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{})
 	t.Cleanup(func() {
 		stopped, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/internal/store/session_model_execution.go b/services/core/internal/store/session_model_execution.go
deleted file mode 100644
index c3f9d469b..000000000
--- a/services/core/internal/store/session_model_execution.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package store
-
-import (
-	"context"
-	"encoding/json"
-
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgtype"
-)
-
-func (s *Store) saveSessionModelExecution(ctx context.Context, q *sqlc.Queries, tenant string, session pgtype.UUID, provider *v1.ModelProviderInput) error {
-	if provider == nil {
-		return nil
-	}
-	raw, err := json.Marshal(provider)
-	if err != nil {
-		return err
-	}
-	encrypted, err := s.credentialCipher.SealModelExecution(raw, tenant, uuid.UUID(session.Bytes).String())
-	if err != nil {
-		return credentialcrypto.ErrUnavailable
-	}
-	return q.SaveSessionModelExecution(ctx, sqlc.SaveSessionModelExecutionParams{SessionID: session, EncryptedConfig: encrypted})
-}
diff --git a/services/core/internal/store/session_model_execution_test.go b/services/core/internal/store/session_model_execution_test.go
deleted file mode 100644
index 303817845..000000000
--- a/services/core/internal/store/session_model_execution_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package store
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"testing"
-
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/google/uuid"
-)
-
-func TestSessionModelExecutionEncryptedAndBound(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{17}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	st := withPlacement(t, NewWithCredentialCipher(pool, cipher))
-	ctx := t.Context()
-	tenant := uuid.NewString()
-	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "mcode", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"actual-model"},"environment":{"type":"openai_hosted"}}`), ModelProvider: &v1.ModelProviderInput{Protocol: "anthropic", BaseURL: "https://example.com", APIKey: "private-model-canary", ContextWindow: 100000, MaxOutputTokens: 8000}}
-	session, err := st.CreateSession(ctx, tenant, input)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if bytes.Contains(session.Configuration, []byte("private-model-canary")) || !bytes.Contains(session.Configuration, []byte(`"model_provider_configured":true`)) {
-		t.Fatal("unsafe or missing configuration marker")
-	}
-	var ciphertext []byte
-	if err := pool.QueryRow(ctx, "SELECT encrypted_config FROM session_model_execution WHERE session_id=$1", session.ID).Scan(&ciphertext); err != nil || bytes.Contains(ciphertext, []byte("private-model-canary")) {
-		t.Fatal("plaintext key in storage", err)
-	}
-	replay, err := st.CreateSession(ctx, tenant, input)
-	if err != nil || replay.ID != session.ID {
-		t.Fatal("retry changed snapshot", err)
-	}
-	input.ModelProvider.APIKey = "conflicting-key"
-	if _, err := st.CreateSession(ctx, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
-		t.Fatal("changed credentials accepted", err)
-	}
-	restarted := withPlacement(t, NewWithCredentialCipher(pool, cipher))
-	provider, err := sessionAdapter(restarted).SessionModelExecution(ctx, tenant, session.ID)
-	if err != nil || provider.APIKey != "private-model-canary" {
-		t.Fatal("restart lost model credential", err)
-	}
-	if _, err := sessionAdapter(restarted).SessionModelExecution(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("foreign tenant read credential", err)
-	}
-	if _, err := cipher.OpenModelExecution(ciphertext, tenant, uuid.NewString()); err == nil {
-		t.Fatal("ciphertext not Session-bound")
-	}
-	if _, err := sessionAdapter(New(pool)).SessionModelExecution(ctx, tenant, session.ID); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("missing cipher succeeded", err)
-	}
-	input.IdempotencyKey = uuid.NewString()
-	if _, err := withPlacement(t, New(pool)).CreateSession(ctx, tenant, input); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("unencrypted create", err)
-	}
-	var count int
-	if err := pool.QueryRow(ctx, "SELECT count(*) FROM sessions WHERE tenant_id=$1 AND idempotency_key=$2", tenant, input.IdempotencyKey).Scan(&count); err != nil || count != 0 {
-		t.Fatal("failed creation left partial Session", err)
-	}
-}
diff --git a/services/core/internal/store/session_reference_retry_public_test.go b/services/core/internal/store/session_reference_retry_public_test.go
index 0b07d6852..410d1543e 100644
--- a/services/core/internal/store/session_reference_retry_public_test.go
+++ b/services/core/internal/store/session_reference_retry_public_test.go
@@ -24,7 +24,7 @@ func TestSavedReferenceRetryOfficialClient(t *testing.T) {
 	s, db := newTestStoreDB(t)
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s})
+	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{})
 	t.Cleanup(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/internal/store/session_transaction.go b/services/core/internal/store/session_transaction.go
deleted file mode 100644
index dbf6fe7bd..000000000
--- a/services/core/internal/store/session_transaction.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package store
-
-import (
-	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// All Turn admission and lifecycle writes run in sessionpg's Session
-// transaction on the writer.
-func (s *Store) withSession(ctx context.Context, tenantID, sessionID string, apply func(context.Context, *sqlc.Queries, pgtype.UUID) error) error {
-	return s.withSessionState(ctx, tenantID, sessionID, false, apply)
-}
-
-func (s *Store) withPublicSession(ctx context.Context, tenantID, sessionID string, apply func(context.Context, *sqlc.Queries, pgtype.UUID) error) error {
-	return s.withSessionState(ctx, tenantID, sessionID, true, apply)
-}
-
-func (s *Store) withSessionState(ctx context.Context, tenantID, sessionID string, public bool, apply func(context.Context, *sqlc.Queries, pgtype.UUID) error) error {
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return err
-	}
-	// Public paths resolve malformed IDs as missing; internal callers keep parseID.
-	id := pgunit.PathID(sessionID)
-	if !public {
-		if id, err = parseID(sessionID); err != nil {
-			return err
-		}
-	}
-	return sessionpg.WithSession(ctx, s.writer, tenant, id, func(ctx context.Context, q *sqlc.Queries, locked sessions.LockedSession) error {
-		if public {
-			if err := locked.Public(); err != nil {
-				return err
-			}
-		}
-		return apply(ctx, q, id)
-	})
-}
diff --git a/services/core/internal/store/session_write_audit_test.go b/services/core/internal/store/session_write_audit_test.go
index 61249e770..f4b7862ef 100644
--- a/services/core/internal/store/session_write_audit_test.go
+++ b/services/core/internal/store/session_write_audit_test.go
@@ -205,7 +205,7 @@ func TestSessionWriteAuditInitialInputAndHistoricalReplay(t *testing.T) {
 			tenant := uuid.NewString()
 			input := environmentInput("audit-initial", kind, "/workspace")
 			input.InitialInputs = []sessions.Input{messageInput("private initial message")}
-			created, err := s.CreateSessionStream(sessionAuditContext(t, tenant, "a"), tenant, input)
+			created, err := createSession(sessionAuditContext(t, tenant, "a"), s, tenant, input)
 			if err != nil || !created.Created {
 				t.Fatal(created, err)
 			}
diff --git a/services/core/internal/store/sessions.go b/services/core/internal/store/sessions.go
deleted file mode 100644
index 78dcf1f94..000000000
--- a/services/core/internal/store/sessions.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Package store persists execution state independently of the Parsar product.
-package store
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/jsonobject"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/metadata"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-type Store struct {
-	queries *sqlc.Queries
-	// pool is the database the Store was built on; pooled runs every
-	// transaction that is not on the execution lease.
-	pool   *pgxpool.Pool
-	pooled *pgunit.Pool
-	// writer runs Session and execution-only transactions, and lease grants
-	// execution authority. New sets writer to pooled and leaves lease nil;
-	// NewExecution sets both to the lease it borrows. Neither changes later.
-	writer           pgunit.Transactor
-	lease            *pgunit.Lease
-	credentialCipher *credentialcrypto.Cipher
-	// placement admits and places hosted Session creation. It is nil until
-	// SetPlacement, and hosted creation fails without it.
-	placement *placement.Rules
-}
-
-// SetPlacement records the installation's placement rules, built once in the
-// composition root. Call it once, before serving requests.
-func (s *Store) SetPlacement(rules *placement.Rules) { s.placement = rules }
-
-func New(pool *pgxpool.Pool) *Store {
-	pooled := pgunit.NewPool(pool)
-	return &Store{queries: sqlc.New(pool), pool: pool, pooled: pooled, writer: pooled}
-}
-
-// CreateSession uses a project-scoped key to make retries safe, including
-// concurrent submissions. Different input or creator with the same key conflicts.
-func (s *Store) CreateSession(ctx context.Context, tenantID string, input sessions.CreateSession) (sessions.Session, error) {
-	result, err := s.createSession(ctx, tenantID, input)
-	return s.sessionActivity(ctx, result.Session, err)
-}
-
-func (s *Store) createSession(ctx context.Context, tenantID string, input sessions.CreateSession) (sessions.Creation, error) {
-	if err := input.Creator.Validate(); err != nil {
-		return sessions.Creation{}, fmt.Errorf("%w: %v", sessions.ErrInvalidInput, err)
-	}
-	tenant, err := parseID(tenantID)
-	if err != nil {
-		return sessions.Creation{}, err
-	}
-	input.Engine = strings.TrimSpace(input.Engine)
-	if !sessions.ValidEngine(input.Engine) || strings.TrimSpace(input.IdempotencyKey) == "" || len(input.IdempotencyKey) > 128 {
-		return sessions.Creation{}, fmt.Errorf("%w: engine and idempotency key are required", sessions.ErrInvalidInput)
-	}
-	if input.Metadata == nil {
-		input.Metadata = map[string]string{}
-	}
-	encodedMetadata, err := metadata.Encode(input.Metadata)
-	if err != nil {
-		return sessions.Creation{}, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
-	}
-	if len(input.Configuration) > 512*1024 {
-		return sessions.Creation{}, fmt.Errorf("%w: configuration exceeds 512 KiB", sessions.ErrInvalidInput)
-	}
-	configuration, err := jsonobject.Normalize(input.Configuration)
-	if err != nil {
-		return sessions.Creation{}, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
-	}
-	var batch []sessions.Input
-	var encodedInput json.RawMessage
-	if len(input.InitialInputs) > 0 {
-		batch, encodedInput, err = sessions.ValidateMessageInputs(input.InitialInputs)
-		if err != nil {
-			return sessions.Creation{}, err
-		}
-	}
-	// The retry identity covers the configuration as requested; the marker added
-	// for a deployment default below is not caller input.
-	requested := configuration
-	if input.ModelProvider != nil {
-		if err := input.ModelProvider.ValidateHarness(input.Engine); err != nil {
-			return sessions.Creation{}, fmt.Errorf("%w: %s", sessions.ErrInvalidInput, err)
-		}
-		var fields map[string]any
-		if json.Unmarshal(configuration, &fields) != nil {
-			return sessions.Creation{}, sessions.ErrInvalidInput
-		}
-		environment, _ := fields["environment"].(map[string]any)
-		environmentType, _ := environment["type"].(string)
-		if !v1.ModelProviderAllowed(environmentType, input.ModelProviderSource) {
-			return sessions.Creation{}, fmt.Errorf("%w: this model provider source is not supported for the Session environment", sessions.ErrInvalidInput)
-		}
-		fields["model_provider_configured"] = true
-		configuration, err = json.Marshal(fields)
-		if err != nil {
-			return sessions.Creation{}, err
-		}
-	}
-	var initialization *environmentconfig.Setup
-	if !input.Initialization.Empty() {
-		initialization = &input.Initialization
-	}
-	// The retry identity carries a caller's provider key only as a keyed
-	// fingerprint. A deployment default is not caller input: leaving it and its
-	// configuration marker out keeps retries equivalent when the default is set,
-	// replaced or removed.
-	var fingerprinted *v1.ModelProviderInput
-	hashed := configuration
-	if input.ModelProviderSource == v1.ModelProviderSourceDeployment {
-		hashed = requested
-	} else if fingerprinted, err = s.fingerprintedProvider(input.ModelProvider); err != nil {
-		return sessions.Creation{}, err
-	}
-	// JSON map keys are sorted by encoding/json, so key order does not affect retries.
-	canonical, err := json.Marshal(struct {
-		ModelProvider  *v1.ModelProviderInput `json:",omitempty"`
-		Engine         string
-		Metadata       map[string]string
-		Configuration  json.RawMessage                 `json:",omitempty"`
-		InitialInputs  json.RawMessage                 `json:",omitempty"`
-		InitialFiles   []environmentconfig.InitialFile `json:",omitempty"`
-		Initialization *environmentconfig.Setup        `json:",omitempty"`
-	}{fingerprinted, input.Engine, input.Metadata, hashed, encodedInput, input.InitialFiles, initialization})
-	if err != nil {
-		return sessions.Creation{}, fmt.Errorf("%w: input: %v", sessions.ErrInvalidInput, err)
-	}
-	creationHash, err := s.creationRequestHash(input.CreationRequest)
-	if err != nil {
-		return sessions.Creation{}, err
-	}
-	hash := sha256.Sum256(canonical)
-	params := sqlc.CreateSessionParams{
-		ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, TenantID: tenant, Engine: input.Engine,
-		Metadata: encodedMetadata, IdempotencyKey: input.IdempotencyKey, RequestHash: hex.EncodeToString(hash[:]),
-		Configuration: configuration, CreationRequestHash: creationHash,
-		CreatorKind: pgtype.Text{String: input.Creator.Kind, Valid: true}, CreatorID: pgtype.Text{String: input.Creator.ID, Valid: true},
-	}
-	row, environment, err := s.createSessionResources(ctx, tenantID, params, batch, encodedInput, input.InitialFiles, input.Initialization, input.ModelProvider, input.ExecutionConfiguration, input.ModelProviderSource, input.DeploymentProviderRevision)
-	if errors.Is(err, pgx.ErrNoRows) {
-		return sessions.Creation{}, sessions.ErrIdempotencyConflict
-	}
-	if err != nil {
-		return sessions.Creation{}, fmt.Errorf("create session: %w", err)
-	}
-	session, err := sessionpg.SessionFromRow(row)
-	session.Environment = environment
-	return sessions.Creation{Session: session, Created: row.ID == params.ID, Cursor: row.EventSequence}, err
-}
-
-// sessionActivity adds the activity projection to a Session read outside a
-// snapshot, in a snapshot of its own.
-func (s *Store) sessionActivity(ctx context.Context, session sessions.Session, err error) (sessions.Session, error) {
-	if err != nil {
-		return sessions.Session{}, err
-	}
-	err = s.pooled.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		var err error
-		session, err = sessionpg.LoadSessionActivity(ctx, s.queries.WithTx(tx), session)
-		return err
-	})
-	return session, err
-}
-
-// parseID translates pgunit's identifier rule into store's invalid-input
-// error. Path identifiers use pgunit.PathID and lookup cursors
-// pgunit.LookupCursor.
-func parseID(value string) (pgtype.UUID, error) {
-	id, err := pgunit.ParseID(value)
-	if err != nil {
-		return pgtype.UUID{}, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
-	}
-	return id, nil
-}
diff --git a/services/core/internal/store/sessions_fixture_test.go b/services/core/internal/store/sessions_fixture_test.go
index ff2aaba29..7dbf21484 100644
--- a/services/core/internal/store/sessions_fixture_test.go
+++ b/services/core/internal/store/sessions_fixture_test.go
@@ -5,8 +5,10 @@ import (
 
 	"github.com/jackc/pgx/v5/pgxpool"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
@@ -16,10 +18,15 @@ func sessionReads(pool *pgxpool.Pool) *sessionpg.Store {
 	return sessionpg.New(pgunit.NewPool(pool), nil)
 }
 
-// fixtureSessions builds the Session adapter and service on db, as cmd/server does.
+// fixtureSessions builds the Session adapter and service on db, with the
+// placement rules on db's public URL, as cmd/server does.
 func fixtureSessions(db fixtureDB) (*sessionpg.Store, *sessions.Service, error) {
+	rules, err := placement.NewRules(providers.Builtin(), db.publicURL)
+	if err != nil {
+		return nil, nil, err
+	}
 	sessionStore := fixtureSessionStore(db)
-	sessionService, err := sessions.NewService(sessionStore)
+	sessionService, err := sessions.NewService(sessionStore, rules)
 	return sessionStore, sessionService, err
 }
 
@@ -29,11 +36,10 @@ func fixtureSessionStore(db fixtureDB) *sessionpg.Store {
 	return sessionpg.New(pgunit.NewPool(db.pool), db.cipher)
 }
 
-// fixtureSessionService is the Session service on fixtureSessionStore(db). It
-// runs the device, heartbeat, enrollment and executor credential use cases.
+// fixtureSessionService is the Session service of fixtureSessions(db).
 func fixtureSessionService(t testing.TB, db fixtureDB) *sessions.Service {
 	t.Helper()
-	service, err := sessions.NewService(fixtureSessionStore(db))
+	_, service, err := fixtureSessions(db)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/sessions_test.go b/services/core/internal/store/sessions_test.go
index 076938e3f..f0f6dec40 100644
--- a/services/core/internal/store/sessions_test.go
+++ b/services/core/internal/store/sessions_test.go
@@ -26,12 +26,17 @@ func testStore(t *testing.T) (*Store, *pgxpool.Pool) {
 // key. It serves the Session reads and pooled Session storage.
 func sessionAdapter(s *Store) *sessionpg.Store { return sessionpg.New(s.pooled, s.credentialCipher) }
 
-// sessionService is the Session service on s's Session adapter. It runs the
-// device, heartbeat, enrollment, executor credential and installation use
-// cases.
+// newSessionService is the Session service on s's Session adapter with s's
+// placement rules, as cmd/server builds it.
+func newSessionService(s *Store) (*sessions.Service, error) {
+	return sessions.NewService(sessionAdapter(s), s.placement)
+}
+
+// sessionService is newSessionService(s) for a test. It runs the device,
+// heartbeat, enrollment, executor credential and installation use cases.
 func sessionService(t testing.TB, s *Store) *sessions.Service {
 	t.Helper()
-	service, err := sessions.NewService(sessionAdapter(s))
+	service, err := newSessionService(s)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -41,7 +46,7 @@ func sessionService(t testing.TB, s *Store) *sessions.Service {
 // stageTurnArtifacts stages export as the Turn's Artifacts through the Session
 // service on s's database, as the execution Worker does.
 func stageTurnArtifacts(ctx context.Context, s *Store, tenant, session, turn, environment string, export io.Reader) error {
-	service, err := sessions.NewService(sessionAdapter(s))
+	service, err := newSessionService(s)
 	if err != nil {
 		return err
 	}
diff --git a/services/core/internal/store/store_fixture_test.go b/services/core/internal/store/store_fixture_test.go
new file mode 100644
index 000000000..99ce17b42
--- /dev/null
+++ b/services/core/internal/store/store_fixture_test.go
@@ -0,0 +1,110 @@
+package store
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+// Store is the integration tests' fixture: one database with its credential
+// key and placement rules, from which the tests build the domain services as
+// cmd/server does. Session transactions run on writer: the pool, or the
+// lease of a NewExecution fixture.
+type Store struct {
+	queries          *sqlc.Queries
+	pool             *pgxpool.Pool
+	pooled           *pgunit.Pool
+	writer           pgunit.Transactor
+	lease            *pgunit.Lease
+	credentialCipher *credentialcrypto.Cipher
+	placement        *placement.Rules
+}
+
+func New(pool *pgxpool.Pool) *Store {
+	pooled := pgunit.NewPool(pool)
+	return &Store{queries: sqlc.New(pool), pool: pool, pooled: pooled, writer: pooled}
+}
+
+// NewWithCredentialCipher is New with a credential key, so Sessions can freeze
+// sealed resources.
+func NewWithCredentialCipher(pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) *Store {
+	s := New(pool)
+	s.credentialCipher = cipher
+	return s
+}
+
+// NewExecution is s with its Session transactions on lease.
+func NewExecution(s *Store, lease *pgunit.Lease) *Store {
+	writer := *s
+	writer.writer, writer.lease = lease, lease
+	return &writer
+}
+
+// SetPlacement gives s the placement rules its Sessions are created under.
+func (s *Store) SetPlacement(rules *placement.Rules) { s.placement = rules }
+
+// CreateSession creates a Session through the Session service on s.
+func (s *Store) CreateSession(ctx context.Context, tenant string, input sessions.CreateSession) (sessions.Session, error) {
+	creation, err := createSession(ctx, s, tenant, input)
+	return creation.Session, err
+}
+
+// createSession runs Session creation as cmd/server does, on s's database,
+// credential key and placement rules.
+func createSession(ctx context.Context, s *Store, tenant string, input sessions.CreateSession) (sessions.Creation, error) {
+	service, err := newSessionService(s)
+	if err != nil {
+		return sessions.Creation{}, err
+	}
+	return service.CreateSession(ctx, tenant, input)
+}
+
+// parseID translates pgunit's identifier rule into the Session
+// invalid-input error.
+func parseID(value string) (pgtype.UUID, error) {
+	id, err := pgunit.ParseID(value)
+	if err != nil {
+		return pgtype.UUID{}, fmt.Errorf("%w: %w", sessions.ErrInvalidInput, err)
+	}
+	return id, nil
+}
+
+// withSession runs apply in sessionpg's Session transaction on s's writer.
+func (s *Store) withSession(ctx context.Context, tenantID, sessionID string, apply func(context.Context, *sqlc.Queries, pgtype.UUID) error) error {
+	return s.withSessionState(ctx, tenantID, sessionID, false, apply)
+}
+
+func (s *Store) withPublicSession(ctx context.Context, tenantID, sessionID string, apply func(context.Context, *sqlc.Queries, pgtype.UUID) error) error {
+	return s.withSessionState(ctx, tenantID, sessionID, true, apply)
+}
+
+func (s *Store) withSessionState(ctx context.Context, tenantID, sessionID string, public bool, apply func(context.Context, *sqlc.Queries, pgtype.UUID) error) error {
+	tenant, err := parseID(tenantID)
+	if err != nil {
+		return err
+	}
+	// Public paths resolve malformed IDs as missing.
+	id := pgunit.PathID(sessionID)
+	if !public {
+		if id, err = parseID(sessionID); err != nil {
+			return err
+		}
+	}
+	return sessionpg.WithSession(ctx, s.writer, tenant, id, func(ctx context.Context, q *sqlc.Queries, locked sessions.LockedSession) error {
+		if public {
+			if err := locked.Public(); err != nil {
+				return err
+			}
+		}
+		return apply(ctx, q, id)
+	})
+}
diff --git a/services/core/internal/store/subagent_visibility_public_test.go b/services/core/internal/store/subagent_visibility_public_test.go
index 4888d5895..fd259dac8 100644
--- a/services/core/internal/store/subagent_visibility_public_test.go
+++ b/services/core/internal/store/subagent_visibility_public_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
@@ -83,8 +84,8 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 	server := httptest.NewServer(handler)
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
-	leased := executionOwner(t, db, s)
-	writer := leased.Store
+	leased := executionOwner(t, db)
+	writer := store.NewExecution(s, leased.Lease.(*pgunit.Lease))
 	ctx := t.Context()
 
 	created := openStream(t, server, token, http.MethodPost, "/v1/agents/sessions",
diff --git a/services/core/internal/store/token_usage_integration_test.go b/services/core/internal/store/token_usage_integration_test.go
index dfddb68fd..a650779b9 100644
--- a/services/core/internal/store/token_usage_integration_test.go
+++ b/services/core/internal/store/token_usage_integration_test.go
@@ -17,7 +17,7 @@ import (
 func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "usage"})
 	if err != nil {
@@ -108,7 +108,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "cancel-recovery"})
 	if err != nil {
@@ -143,7 +143,7 @@ func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "unknown-usage"})
 	if err != nil {
diff --git a/services/core/internal/store/turn_events_test.go b/services/core/internal/store/turn_events_test.go
index 0e8b8ba0c..8e12190c8 100644
--- a/services/core/internal/store/turn_events_test.go
+++ b/services/core/internal/store/turn_events_test.go
@@ -15,7 +15,7 @@ import (
 func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 	ctx := context.Background()
 	s, pool := store.NewTestStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}, s).Sessions
+	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "events"})
 	if err != nil {
diff --git a/services/core/internal/store/whitespace_input_public_test.go b/services/core/internal/store/whitespace_input_public_test.go
index 7ea243498..d26dcb2e8 100644
--- a/services/core/internal/store/whitespace_input_public_test.go
+++ b/services/core/internal/store/whitespace_input_public_test.go
@@ -97,7 +97,7 @@ func TestWhitespaceOnlyTextHarnessAdmissionPostgres(t *testing.T) {
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "whitespace-harness", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}})
 	// Real Worker admission with dispatch paused keeps admitted Turns queued.
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Store: s, Registry: runtimegateway.NewRegistry()})
+	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 	t.Cleanup(func() {
 		stopped, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/internal/store/worker_input_race_test.go b/services/core/internal/store/worker_input_race_test.go
index 6ca03ded1..a424f57dd 100644
--- a/services/core/internal/store/worker_input_race_test.go
+++ b/services/core/internal/store/worker_input_race_test.go
@@ -58,7 +58,6 @@ func TestWorkerInputReadSkipsConcurrentlyCancelledCandidate(t *testing.T) {
 				t.Fatal(err)
 			}
 			defer instrumented.Close()
-			h.d.Store = store.New(instrumented)
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
 			worker := startWorker(t, ctx, fixtureDB{pool: instrumented}, h.d)
diff --git a/services/core/internal/store/worker_wakeup_test.go b/services/core/internal/store/worker_wakeup_test.go
index 1b3813e19..893d2a36f 100644
--- a/services/core/internal/store/worker_wakeup_test.go
+++ b/services/core/internal/store/worker_wakeup_test.go
@@ -31,7 +31,7 @@ func (trace *schedulerQueryOrder) TraceQueryStart(ctx context.Context, _ *pgx.Co
 func (*schedulerQueryOrder) TraceQueryEnd(context.Context, *pgx.Conn, pgx.TraceQueryEndData) {}
 
 func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
-	for _, operation := range []string{"submit", "create", "stream", "rejected"} {
+	for _, operation := range []string{"submit", "create", "rejected"} {
 		t.Run(operation, func(t *testing.T) {
 			h := newDispatchHarness(t)
 			enableWorkerEnvironment(t, h)
@@ -45,7 +45,6 @@ func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
 				t.Fatal(err)
 			}
 			defer instrumented.Close()
-			h.d.Store = store.NewWithCredentialCipher(instrumented, store.FixtureCipher())
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
 			worker := startWorker(t, ctx, fixtureDB{pool: instrumented, cipher: store.FixtureCipher()}, h.d)
@@ -66,13 +65,8 @@ func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
 			switch operation {
 			case "submit":
 				_, err = worker.SubmitInputs(ctx, h.tenant, h.session.ID, "wake", input)
-			case "create", "stream":
-				creation := sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "wake", Configuration: h.session.Configuration, InitialInputs: input}
-				if operation == "create" {
-					_, err = worker.CreateSession(ctx, h.tenant, creation)
-				} else {
-					_, err = worker.CreateSessionStream(ctx, h.tenant, creation)
-				}
+			case "create":
+				_, err = worker.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "wake", Configuration: h.session.Configuration, InitialInputs: input})
 			case "rejected":
 				h.message("wake", "different")
 				_, err = worker.SubmitInputs(ctx, h.tenant, h.session.ID, "wake", input)
diff --git a/services/core/tests/fixtures/main.go b/services/core/tests/fixtures/main.go
index 12f1e8159..b55810eca 100644
--- a/services/core/tests/fixtures/main.go
+++ b/services/core/tests/fixtures/main.go
@@ -53,7 +53,7 @@ func seed() error {
 		return err
 	}
 	defer pool.Close()
-	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil))
+	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil), nil)
 	if err != nil {
 		return err
 	}

From ad0dd790055ca2465381188199196473a927b973 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 05:42:52 +0800
Subject: [PATCH 11/60] Map api errors by domain (#445)

---
 services/core/IMPLEMENTATION.md               |  6 +-
 services/core/internal/api/admin_runtime.go   |  4 +-
 .../internal/api/admin_session_archive.go     |  8 +--
 .../api/core_store_validation_test.go         |  8 +--
 .../api/environment_executor_management.go    |  2 +-
 .../core/internal/api/environment_files.go    | 12 ++--
 .../internal/api/environment_files_create.go  | 22 +++----
 .../internal/api/environment_files_query.go   |  2 +-
 .../internal/api/environment_installation.go  |  4 +-
 .../api/environment_templates_test.go         | 42 ++++++++-----
 services/core/internal/api/errors.go          | 20 ++-----
 .../core/internal/api/errors_deployment.go    | 10 +++-
 services/core/internal/api/errors_sessions.go |  2 +-
 services/core/internal/api/errors_test.go     | 19 +++---
 services/core/internal/api/handler.go         | 20 +++----
 services/core/internal/api/inputs.go          |  8 +--
 .../internal/api/placement_errors_test.go     | 45 ++++++--------
 services/core/internal/api/runtime_history.go |  2 +-
 .../core/internal/api/runtime_observations.go |  4 +-
 .../api/sandbox_deployment_changes_test.go    | 60 ++++++++-----------
 .../core/internal/api/sandbox_manager_test.go |  2 +-
 .../internal/api/session_creation_identity.go |  4 +-
 .../internal/api/session_creation_stream.go   |  4 +-
 .../core/internal/api/session_deletion.go     |  4 +-
 .../core/internal/api/session_diagnostics.go  |  8 +--
 .../api/session_execution_configuration.go    |  2 +-
 .../core/internal/api/session_metadata.go     |  2 +-
 .../core/internal/api/session_write_audit.go  |  2 +-
 services/core/internal/api/stream.go          |  6 +-
 services/core/internal/api/turns.go           | 12 ++--
 .../internal/api/validation_errors_test.go    | 23 -------
 services/core/internal/api/write_audit.go     |  4 +-
 .../core/internal/deployment/allocations.go   |  1 -
 .../postgres/deploymentpg/allocations.go      |  3 -
 .../postgres/sessionpg/session_reads.go       |  2 +-
 .../core/internal/store/unstorable_text.go    |  8 ---
 36 files changed, 166 insertions(+), 221 deletions(-)
 delete mode 100644 services/core/internal/store/unstorable_text.go

diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 3dc457af0..3ecbdfcf6 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -12,7 +12,7 @@ These are the code-level rules of `services/core` that no contract states. Contr
 
 The adapter that stores a secret seals and opens it with the credential key `cmd/server` builds it with: domain storage interfaces carry plaintext, domain service constructors never take the key, a missing key is `credentialcrypto.ErrUnavailable`, and a ciphertext that fails to open or authenticate is an internal error, never a missing key, value or row.
 
-Two errors are shared across domains, each with one `api` helper: `textvalue.ErrUnstorable` (400, `writeTextValueError`) for text PostgreSQL cannot store, and `credentialcrypto.ErrUnavailable` (503, `writeCredentialUnavailableError`) for a missing credential key. The audit `ErrInvalidSource` errors pass through adapters unchanged, and `writeAuditSourceError` maps both to 400.
+Two errors are shared across domains, each with one `api` helper: `textvalue.ErrUnstorable` (400, `writeTextValueError`) for text PostgreSQL cannot store, and `credentialcrypto.ErrUnavailable` (503, `writeCredentialUnavailableError`) for a missing credential key. The audit `ErrInvalidSource` errors pass through adapters unchanged, and `writeAuditSourceError` maps both to 400. Each handler maps its operation's errors through that domain's mapper; Session operations that also meet the sandbox deployment, namely creation, input admission, archive and Runtime observation, map through `writeOperationError`, which tries `writeSandboxError` and then `writeSessionsError`.
 
 Shared vocabulary has one owner each, and domains use it rather than copy it. `internal/environmentconfig` owns Environment setup, Skills, Plugins and initial files with their validation and public metadata; `Setup.Validate` checks requested configuration, where a Skill may be an unresolved reference, and `Setup.ValidateInstalled` checks frozen, installable configuration. `internal/skills` owns `ParseVersion`, the canonical positive decimal Skill version. `internal/metadata` owns the metadata rules: `Validate` for the pair, key and value limits and U+0000, `ValidateStorable` for U+0000 alone, and `Encode` with its 64 KiB bound. `internal/jsonobject` owns `Normalize`, the stable encoding of stored JSON objects that snapshots and retry identities compare. These packages import no persistence.
 
@@ -20,7 +20,7 @@ Shared vocabulary has one owner each, and domains use it rather than copy it. `i
 
 Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; and `LoadEnvironment`, which reads the tenant's Environment of a live Session. In turn, Session creation's transaction in `sessionpg` calls the `placementpg`, `skillpg` and `filepg` participants and `auditpg.RecordWriteAudit` on its own queries. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` stays exported; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
 
-`store` is transitional: its only production code is `UnstorableText`, which `api` uses to classify database errors, and its integration tests build their fixtures from the domain services. Adapters' execution repositories require a `*pgunit.Lease` at construction, and their public repositories expose no execution operation.
+`store` is transitional: it holds only integration tests, which build their fixtures from the domain services. Adapters' execution repositories require a `*pgunit.Lease` at construction, and their public repositories expose no execution operation.
 
 `cmd/server` owns the execution lease. It acquires one `pgunit.Lease`, builds every lease-bound adapter on it, and passes the lease and those adapters together as one `execution.Owner` to `execution.StartWorker`, which binds the Dispatcher to the Owner's execution operations through `Dispatcher.Bind`. If anything fails before that call, `cmd/server` closes the lease. From that call the Worker owns cleanup: a failed start closes the lease before it returns, and a started Worker closes it after `Run` has cancelled and drained its work. Each close runs under its own bounded deadline, independent of the cancelled request or run. Lease-bound adapters borrow the lease and never close it, and the Worker uses the lease only through `Owner.Lease`, never through an adapter. Store integration tests start the Worker the same way through `startWorker`, and bind a Dispatcher that runs Turns without a Worker through `Dispatcher.Bind`.
 
@@ -33,7 +33,7 @@ Domain owners, each with its PostgreSQL adapter under `internal/persistence/post
 - `environmenttemplates` (`templatepg`): Environment Templates, their validation and default network, their sealed setup, initial files, Skills and Plugins, and the resolved Template that Session creation composes into its Environment.
 - `modelconfiguration` (`modelconfigurationpg`): each Harness's deployment default model configuration and its last-use observations.
 - `skills` (`skillpg`): Skills and their immutable versions: archive checks, the default and latest pointers, version selection and deletion, and each version's sealed archive. Session creation freezes selected versions inside its own transaction: `skillpg.LockSkills` locks the selected Skills in ID order, `skillpg.ReadVersionForFreeze` opens and verifies a version, and `sessions` selects each version with the `skills` rules.
-- `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and `sessions.Service`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeStoreError` and `writeDeploymentError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other caller is Session creation: `sessions` decides admission and placement with those rules over the `placementpg` participants inside the creation transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. Session archive crosses the Session and the deployment, so it is a `deployment.ExecutionOperations` operation: `ArchiveSession`, which the administrator's archive route calls through `api.Execution.SessionArchive`, and `ArchiveResetSession`, which a reset calls, lock the Session through `deploymentpg`'s `WithSessionArchive`, check the deployment's generation and the running reset in `deployment`, then expire the Environment and cancel its work through the `sessions` procedures, revoke the allocation's device and request its cleanup, and record the audit entry in one leased transaction. `deployment.ObservationResolver` resolves a Session's Runtime observation target for `runtimeobs` from `sessions.SessionReader` and `deployment.Reader`.
+- `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and `sessions.Service`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeSandboxError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other caller is Session creation: `sessions` decides admission and placement with those rules over the `placementpg` participants inside the creation transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. Session archive crosses the Session and the deployment, so it is a `deployment.ExecutionOperations` operation: `ArchiveSession`, which the administrator's archive route calls through `api.Execution.SessionArchive`, and `ArchiveResetSession`, which a reset calls, lock the Session through `deploymentpg`'s `WithSessionArchive`, check the deployment's generation and the running reset in `deployment`, then expire the Environment and cancel its work through the `sessions` procedures, revoke the allocation's device and request its cleanup, and record the audit entry in one leased transaction. `deployment.ObservationResolver` resolves a Session's Runtime observation target for `runtimeobs` from `sessions.SessionReader` and `deployment.Reader`.
 - `coremetrics` (`coremetricspg`): the Core metrics PostgreSQL holds: the root Turn queue counts, the root Turn history, read from one read-only snapshot, and the database size. `cmd/server`'s Core metrics source adds them to the process, pool, Worker and daemon registry measurements.
 - `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples. `runtimehistory.Service` scopes a read to the Session's hosted Environment through `sessions.EnvironmentReader`.
 - `sessions` (`sessionpg`): Session use cases and reads. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. These cover Sessions (their creation, reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), input admission (a public input batch, Environment input reservation and the expiry of one reservation, with the reads of a Turn's admitted inputs, a reservation and the Environment input work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the administrator's views across Projects (a Project's asset counts and Sessions for the summary, and the Sessions whose Runtime the administrator observes), executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. Session creation runs in one pooled `sessions.CreationTx`: `sessions` validates the request, computes its retry identity, with the provider key fingerprinted by `sessionpg.Store` under the credential key, and orders the upsert, hosted admission, the Skill freeze, the sealed model provider, execution configuration, initial files and setup, the Environment, placement and the initial input; `FindSessionCreation` finds an earlier creation by its recorded intent. `cmd/server` builds one `sessionpg.Store` with the credential key and the Service with its `placement.Rules`, and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker creates Sessions through the Service after its execution checks, waking the scheduler only after the commit, and stages Artifacts through it; `cmd/environment-key` builds one without the key, and the Service without placement rules, for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, file-write reservation and settlement, and the promotion, failure and bulk expiry of Environment input reservations run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
diff --git a/services/core/internal/api/admin_runtime.go b/services/core/internal/api/admin_runtime.go
index 31d204105..f6b1df723 100644
--- a/services/core/internal/api/admin_runtime.go
+++ b/services/core/internal/api/admin_runtime.go
@@ -87,14 +87,14 @@ func (h *Handler) adminRuntimeObservations(w http.ResponseWriter, r *http.Reques
 		return
 	}
 	if err := firstRuntimeObservationError(errs); err != nil {
-		writeStoreError(w, r, err)
+		writeOperationError(w, r, err)
 		return
 	}
 	response := AdminRuntimeObservationList{Object: "list", Data: make([]AdminRuntimeObservation, len(page.Data)), HasMore: page.HasMore}
 	for index, observation := range observations {
 		detail, err := adminRuntimeObservationResponse(observation)
 		if err != nil {
-			writeStoreError(w, r, err)
+			writeOperationError(w, r, err)
 			return
 		}
 		response.Data[index] = AdminRuntimeObservation{ProjectID: projectByTenant[page.Data[index].TenantID], Observation: detail}
diff --git a/services/core/internal/api/admin_session_archive.go b/services/core/internal/api/admin_session_archive.go
index bb50213fc..fcf8ae8f8 100644
--- a/services/core/internal/api/admin_session_archive.go
+++ b/services/core/internal/api/admin_session_archive.go
@@ -37,16 +37,16 @@ func (h *Handler) adminArchiveSession(w http.ResponseWriter, r *http.Request) {
 	}
 	var input AdminSessionArchiveRequest
 	if decodeInputObject(raw, &input, "expected_generation") != nil || input.ExpectedGeneration == 0 {
-		writeStoreError(w, r, sessions.ErrInvalidInput)
+		writeOperationError(w, r, sessions.ErrInvalidInput)
 		return
 	}
 	if h.Execution == nil {
-		writeStoreError(w, r, sessions.ErrEnvironmentUnavailable)
+		writeOperationError(w, r, sessions.ErrEnvironmentUnavailable)
 		return
 	}
 	result, err := h.Execution.SessionArchive.ArchiveSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id"), input.ExpectedGeneration)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeOperationError(w, r, err)
 		return
 	}
 	writeJSON(w, http.StatusOK, result)
@@ -65,7 +65,7 @@ func (h *Handler) adminArchiveSession(w http.ResponseWriter, r *http.Request) {
 func (h *Handler) adminGetSessionArchive(w http.ResponseWriter, r *http.Request) {
 	result, err := h.SessionAdmin.GetManagedSessionArchive(r.Context(), tenantID(r), chi.URLParam(r, "session_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	writeJSON(w, http.StatusOK, result)
diff --git a/services/core/internal/api/core_store_validation_test.go b/services/core/internal/api/core_store_validation_test.go
index 2279170a5..326967bb7 100644
--- a/services/core/internal/api/core_store_validation_test.go
+++ b/services/core/internal/api/core_store_validation_test.go
@@ -40,7 +40,7 @@ func TestCoreStoreValidationFieldsAndPublicFallback(t *testing.T) {
 		publicMessage, publicCode string
 		write                     func(http.ResponseWriter, *http.Request, error)
 	}{
-		{&sandbox.ValidationError{Param: "resources", Message: "E2B template build resources are outside the supported sandbox limits; select another build"}, "invalid_sandbox_configuration", "resources", nil, "E2B template build resources are outside the supported sandbox limits; select another build", "invalid_sandbox_configuration", nil},
+		{&sandbox.ValidationError{Param: "resources", Message: "E2B template build resources are outside the supported sandbox limits; select another build"}, "invalid_sandbox_configuration", "resources", nil, "E2B template build resources are outside the supported sandbox limits; select another build", "invalid_sandbox_configuration", writeOperationError},
 		{&projects.NameError{MaxLength: projects.ProjectNameMaxLength}, "invalid_name", "name", map[string]any{"max_length": float64(128)}, "Invalid resource identifier or request limits.", "invalid_request", writeProjectsError},
 		{upperCapacityErr, "invalid_node_capacity", "max_active", map[string]any{"min": float64(1), "max": float64(1000000)}, "Invalid resource identifier or request limits.", "invalid_request", writeDeploymentError},
 		{capacityErr, "invalid_node_capacity", "max_active", map[string]any{"min": float64(1), "max": float64(1000000)}, "Invalid resource identifier or request limits.", "invalid_request", writeDeploymentError},
@@ -50,12 +50,8 @@ func TestCoreStoreValidationFieldsAndPublicFallback(t *testing.T) {
 		if tc.err == nil {
 			t.Fatal("missing validator error")
 		}
-		write := tc.write
-		if write == nil {
-			write = func(w http.ResponseWriter, r *http.Request, err error) { writeStoreError(w, r, err) }
-		}
 		for _, core := range []bool{false, true} {
-			handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { write(w, r, fmt.Errorf("wrapped: %w", tc.err)) }))
+			handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { tc.write(w, r, fmt.Errorf("wrapped: %w", tc.err)) }))
 			if core {
 				handler = coreErrorResponses(handler)
 			}
diff --git a/services/core/internal/api/environment_executor_management.go b/services/core/internal/api/environment_executor_management.go
index 9238a4c2e..5bbb1ee57 100644
--- a/services/core/internal/api/environment_executor_management.go
+++ b/services/core/internal/api/environment_executor_management.go
@@ -78,7 +78,7 @@ func (h *Handler) listExecutorCredentials(w http.ResponseWriter, r *http.Request
 		if observed.EnvironmentStatus == "connected" && observed.CredentialHash != "" {
 			connected, err := h.ExecutorConnections.ExecutorConnected(r.Context(), state.EnvironmentID, observed.CredentialHash)
 			if err != nil && !errors.Is(err, sessions.ErrNotFound) && !errors.Is(err, sessions.ErrDeviceBindingConflict) {
-				writeStoreError(w, r, err)
+				writeSessionsError(w, r, err)
 				return
 			}
 			if err == nil && connected {
diff --git a/services/core/internal/api/environment_files.go b/services/core/internal/api/environment_files.go
index 35440fa9a..afb2b0efd 100644
--- a/services/core/internal/api/environment_files.go
+++ b/services/core/internal/api/environment_files.go
@@ -40,7 +40,7 @@ type EnvironmentWorkspaces interface {
 func (h *Handler) listEnvironmentFiles(w http.ResponseWriter, r *http.Request) {
 	environment, err := h.EnvironmentsReader.GetEnvironment(r.Context(), tenantID(r), chi.URLParam(r, "environment_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	options, ok := readEnvironmentFileQuery(w, r, environment)
@@ -48,21 +48,21 @@ func (h *Handler) listEnvironmentFiles(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if h.Execution == nil || !execution.LocalWorkspaceConfiguration(environment.Configuration) {
-		writeStoreError(w, r, execution.ErrExecutionUnavailable)
+		writeSessionsError(w, r, execution.ErrExecutionUnavailable)
 		return
 	}
 	// Allow the Worker's 45-second observation budget plus response delivery.
 	if err := http.NewResponseController(w).SetWriteDeadline(time.Now().Add(50 * time.Second)); err != nil {
-		writeStoreError(w, r, execution.ErrExecutionUnavailable)
+		writeSessionsError(w, r, execution.ErrExecutionUnavailable)
 		return
 	}
 	result, err := h.Execution.Workspaces.ReadEnvironmentDirectory(r.Context(), environment, options.relativeDirectory)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if result.Truncated || !proto.ValidWorkspaceDirectory(&result, proto.WorkspaceDirectoryMaxEntries) {
-		writeStoreError(w, r, execution.ErrExecutionUnavailable)
+		writeSessionsError(w, r, execution.ErrExecutionUnavailable)
 		return
 	}
 	files := make([]v1.EnvironmentFile, 0, len(result.Entries))
@@ -85,7 +85,7 @@ func (h *Handler) listEnvironmentFiles(w http.ResponseWriter, r *http.Request) {
 	response, err := environmentFilePage(files, options)
 	if err != nil {
 		if !writeFieldError(w, err) {
-			writeStoreError(w, r, err)
+			writeSessionsError(w, r, err)
 		}
 		return
 	}
diff --git a/services/core/internal/api/environment_files_create.go b/services/core/internal/api/environment_files_create.go
index dfb4e901a..956af680f 100644
--- a/services/core/internal/api/environment_files_create.go
+++ b/services/core/internal/api/environment_files_create.go
@@ -42,7 +42,7 @@ func (h *Handler) createEnvironmentFile(w http.ResponseWriter, r *http.Request)
 	}
 	environment, err := h.EnvironmentsReader.GetEnvironment(r.Context(), tenantID(r), chi.URLParam(r, "environment_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	var request v1.EnvironmentFileCreateRequest
@@ -56,28 +56,28 @@ func (h *Handler) createEnvironmentFile(w http.ResponseWriter, r *http.Request)
 		return
 	}
 	if err := decodeInputObject(raw, &request, fields...); err != nil || request.Path == nil {
-		writeStoreError(w, r, sessions.ErrInvalidInput)
+		writeSessionsError(w, r, sessions.ErrInvalidInput)
 		return
 	}
 	switch request.Type {
 	case "inline":
 		fields = []string{"type", "path", "data"}
 		if request.Data == nil {
-			writeStoreError(w, r, sessions.ErrInvalidInput)
+			writeSessionsError(w, r, sessions.ErrInvalidInput)
 			return
 		}
 	case "file_id":
 		fields = []string{"type", "path", "file_id"}
 		if request.FileID == nil || *request.FileID == "" {
-			writeStoreError(w, r, sessions.ErrInvalidInput)
+			writeSessionsError(w, r, sessions.ErrInvalidInput)
 			return
 		}
 	default:
-		writeStoreError(w, r, sessions.ErrInvalidInput)
+		writeSessionsError(w, r, sessions.ErrInvalidInput)
 		return
 	}
 	if decodeInputObject(raw, &request, fields...) != nil {
-		writeStoreError(w, r, sessions.ErrInvalidInput)
+		writeSessionsError(w, r, sessions.ErrInvalidInput)
 		return
 	}
 	if err := environmentFileCreatePathError(*request.Path); err != nil {
@@ -88,7 +88,7 @@ func (h *Handler) createEnvironmentFile(w http.ResponseWriter, r *http.Request)
 	if request.Type == "inline" {
 		data, err = base64.StdEncoding.Strict().DecodeString(*request.Data)
 		if err != nil {
-			writeStoreError(w, r, sessions.ErrInvalidInput)
+			writeSessionsError(w, r, sessions.ErrInvalidInput)
 			return
 		}
 		if len(data) > maxInlineEnvironmentFileBytes {
@@ -118,22 +118,22 @@ func (h *Handler) createEnvironmentFile(w http.ResponseWriter, r *http.Request)
 		}
 	}
 	if h.Execution == nil || !execution.LocalWorkspaceConfiguration(environment.Configuration) {
-		writeStoreError(w, r, execution.ErrExecutionUnavailable)
+		writeSessionsError(w, r, execution.ErrExecutionUnavailable)
 		return
 	}
 	if err := http.NewResponseController(w).SetWriteDeadline(time.Now().Add(215 * time.Second)); err != nil {
-		writeStoreError(w, r, execution.ErrExecutionUnavailable)
+		writeSessionsError(w, r, execution.ErrExecutionUnavailable)
 		return
 	}
 	size, err := h.Execution.Workspaces.WriteEnvironmentFile(r.Context(), environment, strings.TrimPrefix(*request.Path, "/workspace/"), data)
 	if err != nil {
 		if !writeFieldError(w, environmentFileWriteError(err)) {
-			writeStoreError(w, r, err)
+			writeSessionsError(w, r, err)
 		}
 		return
 	}
 	if size != int64(len(data)) {
-		writeStoreError(w, r, execution.ErrExecutionUnavailable)
+		writeSessionsError(w, r, execution.ErrExecutionUnavailable)
 		return
 	}
 	writeJSON(w, http.StatusCreated, v1.EnvironmentFile{EnvironmentID: environment.ID, Object: "agent.environment.file", Path: *request.Path, SizeBytes: size})
diff --git a/services/core/internal/api/environment_files_query.go b/services/core/internal/api/environment_files_query.go
index 503b96dfd..6e5e2ec54 100644
--- a/services/core/internal/api/environment_files_query.go
+++ b/services/core/internal/api/environment_files_query.go
@@ -36,7 +36,7 @@ func readEnvironmentFileQuery(w http.ResponseWriter, r *http.Request, environmen
 	// Malformed query encoding remains a local rejection; no official sample exists.
 	q, err := url.ParseQuery(r.URL.RawQuery)
 	if err != nil {
-		writeStoreError(w, r, sessions.ErrInvalidInput)
+		writeSessionsError(w, r, sessions.ErrInvalidInput)
 		return options, false
 	}
 	for _, key := range environmentFileQueryKeys {
diff --git a/services/core/internal/api/environment_installation.go b/services/core/internal/api/environment_installation.go
index c9074702f..8f60a15c9 100644
--- a/services/core/internal/api/environment_installation.go
+++ b/services/core/internal/api/environment_installation.go
@@ -120,12 +120,12 @@ func (h *Handler) prepareNativeInstallation(w http.ResponseWriter, r *http.Reque
 	}
 	session, err := h.SessionsReader.GetSession(r.Context(), claim.Principal.TenantID, environment.SessionID)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	response, err := sessionResponse(session, h.executorURL())
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	writeJSON(w, http.StatusOK, v1.NativeInstallationContext{Version: h.Execution.NativeInstaller.Version, ProtocolVersion: proto.Version, EnvironmentID: claim.Environment, RemoteURL: h.Execution.ExecutorURL, Workspace: response.Environment.WorkspaceDirectory, Harness: session.Engine})
diff --git a/services/core/internal/api/environment_templates_test.go b/services/core/internal/api/environment_templates_test.go
index b684de304..90f5d08dc 100644
--- a/services/core/internal/api/environment_templates_test.go
+++ b/services/core/internal/api/environment_templates_test.go
@@ -74,24 +74,34 @@ func (l *templateLookup) resolved() environmenttemplates.Resolved {
 	return environmenttemplates.Resolved{Template: environmenttemplates.Template{ID: "saved", NetworkAccess: l.network, AllowedDomains: l.domains}, Setup: environmentconfig.Setup{Skills: l.skills, Plugins: l.plugins, CapabilityDirectories: l.directories}}
 }
 
-// Session creation resolves the Template for the caller's tenant, and a
-// Template it cannot resolve answers with the Template's error.
+// Session creation resolves the Template for the caller's tenant and answers
+// with the error of a Template it cannot resolve or cannot apply.
 func TestSessionCreationResolvesTemplateForTenant(t *testing.T) {
-	var resolved []string
-	h, _, tenant := testHandler(t, func(_ *Dependencies, f *testFakes) {
-		f.environmentTemplatesReader.resolve = func(_ context.Context, tenant, id string) (environmenttemplates.Resolved, error) {
-			resolved = append(resolved, tenant, id)
-			return environmenttemplates.Resolved{}, environmenttemplates.ErrNotFound
+	for _, test := range []struct {
+		body   string
+		err    error
+		status int
+		want   string
+	}{
+		{`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","environment_template_id":"saved"},"input":"Start."}`, environmenttemplates.ErrNotFound, http.StatusNotFound, `"not_found_error"`},
+		{`{"agent":{"model":"test"},"environment":{"type":"self_hosted","workspace_directory":"/work"},"x_agents_core":{"environment":{"environment_template_id":"saved"}}}`, nil, http.StatusBadRequest, `"type":"invalid_request_error","code":"invalid_request_error","param":"x_agents_core.environment.environment_template_id"`},
+	} {
+		var resolved []string
+		h, _, tenant := testHandler(t, func(_ *Dependencies, f *testFakes) {
+			f.environmentTemplatesReader.resolve = func(_ context.Context, tenant, id string) (environmenttemplates.Resolved, error) {
+				resolved = append(resolved, tenant, id)
+				return (&templateLookup{network: "disabled"}).resolved(), test.err
+			}
+		})
+		req := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(test.body))
+		req.Header.Set("Authorization", "Bearer test-api-key")
+		req.Header.Set("OpenAI-Beta", "agents=v1")
+		req.Header.Set("Content-Type", "application/json")
+		response := httptest.NewRecorder()
+		h.ServeHTTP(response, req)
+		if response.Code != test.status || !strings.Contains(response.Body.String(), test.want) || !reflect.DeepEqual(resolved, []string{tenant, "saved"}) {
+			t.Fatal("Template error", response.Code, response.Body.String(), resolved)
 		}
-	})
-	req := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","environment_template_id":"saved"},"input":"Start."}`))
-	req.Header.Set("Authorization", "Bearer test-api-key")
-	req.Header.Set("OpenAI-Beta", "agents=v1")
-	req.Header.Set("Content-Type", "application/json")
-	response := httptest.NewRecorder()
-	h.ServeHTTP(response, req)
-	if response.Code != http.StatusNotFound || !strings.Contains(response.Body.String(), `"not_found_error"`) || !reflect.DeepEqual(resolved, []string{tenant, "saved"}) {
-		t.Fatal("missing Template", response.Code, response.Body.String(), resolved)
 	}
 }
 
diff --git a/services/core/internal/api/errors.go b/services/core/internal/api/errors.go
index 9b34108a5..676d51ee0 100644
--- a/services/core/internal/api/errors.go
+++ b/services/core/internal/api/errors.go
@@ -9,8 +9,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/textvalue"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 )
@@ -86,18 +84,10 @@ func writeFieldError(w http.ResponseWriter, err error) bool {
 	return true
 }
 
-// writeStoreError reports a failure of an operation that can meet a sandbox
-// reset or the sandbox deployment, then the Session errors.
-func writeStoreError(w http.ResponseWriter, r *http.Request, err error) {
-	// Admission paused by a reset is Session admission's.
-	if errors.Is(err, placement.ErrResetAdmission) {
-		writeError(w, http.StatusServiceUnavailable, "sandbox_reset_in_progress", "A sandbox reset is in progress.")
-		return
-	}
-	if errors.Is(err, placement.ErrAdmissionClosed) {
-		writeError(w, http.StatusConflict, "environment_unavailable", "The environment is no longer available for new input.")
-		return
-	}
+// writeOperationError reports a failure of a Session operation that also
+// meets the sandbox deployment: creation, input admission, archive and Runtime
+// observation.
+func writeOperationError(w http.ResponseWriter, r *http.Request, err error) {
 	if writeSandboxError(w, err) {
 		return
 	}
@@ -120,7 +110,7 @@ func writeInternalError(w http.ResponseWriter, r *http.Request) {
 // jsonb cannot store U+0000, and text parameters, including query filters,
 // reject invalid UTF-8.
 func writeTextValueError(w http.ResponseWriter, r *http.Request, err error) bool {
-	if !errors.Is(err, textvalue.ErrUnstorable) && !store.UnstorableText(err) {
+	if !errors.Is(err, textvalue.ErrUnstorable) {
 		return false
 	}
 	writeError(w, http.StatusBadRequest, "invalid_request_error", unstorableTextMessage)
diff --git a/services/core/internal/api/errors_deployment.go b/services/core/internal/api/errors_deployment.go
index eeb8a212b..70435254a 100644
--- a/services/core/internal/api/errors_deployment.go
+++ b/services/core/internal/api/errors_deployment.go
@@ -30,9 +30,9 @@ func writeDeploymentError(w http.ResponseWriter, r *http.Request, err error) {
 	}
 }
 
-// writeSandboxError reports a sandbox deployment, node or Sandbox Provider
-// error and returns false for any other error. Session and Environment
-// admission report the same errors through writeStoreError.
+// writeSandboxError reports a sandbox deployment, node, placement or Sandbox
+// Provider error and returns false for any other error. Session operations that meet
+// the deployment report the same errors through writeOperationError.
 func writeSandboxError(w http.ResponseWriter, err error) bool {
 	// Adapter discovery and persisted configuration share the same public error.
 	var validation *sandbox.ValidationError
@@ -84,6 +84,10 @@ func writeSandboxError(w http.ResponseWriter, err error) bool {
 		writeError(w, http.StatusConflict, "sandbox_not_configured", "The sandbox deployment is not configured.")
 	case errors.As(err, &deploymentConfiguration):
 		writeError(w, http.StatusBadRequest, "invalid_sandbox_configuration", deploymentConfiguration.Message)
+	case errors.Is(err, placement.ErrResetAdmission):
+		writeError(w, http.StatusServiceUnavailable, "sandbox_reset_in_progress", "A sandbox reset is in progress.")
+	case errors.Is(err, placement.ErrAdmissionClosed):
+		writeError(w, http.StatusConflict, "environment_unavailable", "The environment is no longer available for new input.")
 	case errors.Is(err, placement.ErrPublicURLUnreachable):
 		writeError(w, http.StatusConflict, "sandbox_configuration_error", err.Error())
 	case errors.Is(err, deployment.ErrNodeAddressMismatch):
diff --git a/services/core/internal/api/errors_sessions.go b/services/core/internal/api/errors_sessions.go
index 4c45919ad..8806156ee 100644
--- a/services/core/internal/api/errors_sessions.go
+++ b/services/core/internal/api/errors_sessions.go
@@ -20,7 +20,7 @@ func writeInputError(w http.ResponseWriter, r *http.Request, err error) {
 	case errors.Is(err, sessions.ErrTurnConflict):
 		writeError(w, http.StatusConflict, "conflict_error", "The Turn cannot accept this input in its current state.")
 	default:
-		writeStoreError(w, r, err)
+		writeOperationError(w, r, err)
 	}
 }
 
diff --git a/services/core/internal/api/errors_test.go b/services/core/internal/api/errors_test.go
index d7bd2cb31..9f139d003 100644
--- a/services/core/internal/api/errors_test.go
+++ b/services/core/internal/api/errors_test.go
@@ -152,7 +152,7 @@ func TestConflictErrorsUseConflictType(t *testing.T) {
 		t.Run(code, func(t *testing.T) {
 			response := httptest.NewRecorder()
 			request := httptest.NewRequest(http.MethodPost, "/v1/agents/environments/environment/files", nil)
-			writeStoreError(response, request, fmt.Errorf("operation: %w", err))
+			writeOperationError(response, request, fmt.Errorf("operation: %w", err))
 			var body v1.ErrorResponse
 			if response.Code != http.StatusConflict || json.Unmarshal(response.Body.Bytes(), &body) != nil ||
 				body.Error.Type != "conflict_error" || body.Error.Code == nil || *body.Error.Code != code || body.Error.Param != nil {
@@ -167,30 +167,29 @@ func TestConflictErrorsUseConflictType(t *testing.T) {
 	}
 }
 
-// The shared persistence errors keep the responses the store errors had: an
-// audit source or query that cannot be used answers like invalid input.
+// The shared persistence errors answer alike in every domain mapper: an audit
+// source or query that cannot be used answers like invalid input.
 func TestSharedPersistenceErrors(t *testing.T) {
-	storeError := func(w http.ResponseWriter, r *http.Request, err error) { writeStoreError(w, r, err) }
 	respond := func(write func(http.ResponseWriter, *http.Request, error), err error) *httptest.ResponseRecorder {
 		response := httptest.NewRecorder()
 		write(response, httptest.NewRequest(http.MethodPost, "/v1/agents", nil), err)
 		return response
 	}
-	invalid := respond(storeError, sessions.ErrInvalidInput).Body.String()
+	invalid := respond(writeSessionsError, sessions.ErrInvalidInput).Body.String()
 	for _, test := range []struct {
 		write  func(http.ResponseWriter, *http.Request, error)
 		err    error
 		status int
 		body   string
 	}{
-		{storeError, fmt.Errorf("write: %w", writeaudit.ErrInvalidSource), 400, invalid},
-		{storeError, fmt.Errorf("write: %w", adminaudit.ErrInvalidSource), 400, invalid},
+		{writeSessionsError, fmt.Errorf("write: %w", writeaudit.ErrInvalidSource), 400, invalid},
+		{writeSessionsError, fmt.Errorf("write: %w", adminaudit.ErrInvalidSource), 400, invalid},
 		{writeAuditError, writeaudit.ErrInvalidQuery, 400, invalid},
 		{writeAuditError, adminaudit.ErrInvalidQuery, 400, invalid},
-		{storeError, fmt.Errorf("write: %w", textvalue.ErrUnstorable), 400, unstorableTextMessage},
+		{writeSessionsError, fmt.Errorf("write: %w", textvalue.ErrUnstorable), 400, unstorableTextMessage},
 		{writeAuditError, textvalue.ErrUnstorable, 400, unstorableTextMessage},
-		{storeError, deployment.ErrInvalidInput, 400, invalid},
-		{storeError, credentialcrypto.ErrUnavailable, 503, "credential_storage_unavailable"},
+		{writeDeploymentError, deployment.ErrInvalidInput, 400, invalid},
+		{writeSessionsError, credentialcrypto.ErrUnavailable, 503, "credential_storage_unavailable"},
 		{writeAuditError, errors.New("canary"), 500, "internal_error"},
 	} {
 		response := respond(test.write, test.err)
diff --git a/services/core/internal/api/handler.go b/services/core/internal/api/handler.go
index 329e3218f..a06ca1d0a 100644
--- a/services/core/internal/api/handler.go
+++ b/services/core/internal/api/handler.go
@@ -166,7 +166,7 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 	}
 	initialInputs, err := initialSessionInputs(input.Input)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if input.Environment.Type == "none" && len(initialInputs) == 0 {
@@ -179,7 +179,7 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 	}
 	creationRequest, err := sessionCreationRequest(input, initialInputs)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if h.recoverSessionCreation(w, r, key, creationRequest, input.Stream) {
@@ -194,8 +194,8 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		if err := applyTemplateEnvironment(&input, template); err != nil {
-			if !h.recoverSessionCreation(w, r, key, creationRequest, input.Stream) {
-				writeStoreError(w, r, err)
+			if !h.recoverSessionCreation(w, r, key, creationRequest, input.Stream) && !writeFieldError(w, err) {
+				writeSessionsError(w, r, err)
 			}
 			return
 		}
@@ -282,7 +282,7 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 	}
 	result, err := create(r.Context(), tenantID(r), createInput)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeOperationError(w, r, err)
 		return
 	}
 	if input.Stream {
@@ -305,7 +305,7 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 func (h *Handler) getSession(w http.ResponseWriter, r *http.Request) {
 	session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	h.respondSession(w, r, session)
@@ -318,11 +318,11 @@ func (h *Handler) respondSession(w http.ResponseWriter, r *http.Request, session
 func (h *Handler) respondSessionStatus(w http.ResponseWriter, r *http.Request, session sessions.Session, status int) {
 	response, err := sessionResponse(session, h.executorURL())
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if err := h.addSessionInstallation(w, r, &response); err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	writeJSON(w, status, response)
@@ -352,14 +352,14 @@ func (h *Handler) listSessions(w http.ResponseWriter, r *http.Request) {
 	}
 	page, err := h.SessionsReader.ListSessions(r.Context(), tenantID(r), options.after, options.limit, options.ascending, agentID)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	response := v1.SessionList{Data: make([]v1.Session, 0, len(page.Sessions)), HasMore: page.NextCursor != ""}
 	for _, session := range page.Sessions {
 		item, err := sessionResponse(session, h.executorURL())
 		if err != nil {
-			writeStoreError(w, r, err)
+			writeSessionsError(w, r, err)
 			return
 		}
 		response.Data = append(response.Data, item)
diff --git a/services/core/internal/api/inputs.go b/services/core/internal/api/inputs.go
index aa6f6ad37..f63e87dcc 100644
--- a/services/core/internal/api/inputs.go
+++ b/services/core/internal/api/inputs.go
@@ -52,14 +52,14 @@ func (h *Handler) createEvents(w http.ResponseWriter, r *http.Request) {
 		key = uuid.NewString()
 	}
 	if err := sessions.ValidateInputKey(key); err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if request.Events != nil && len(request.Events) == 0 {
 		// Empty batches have no execution identity to reserve or replay.
 		// Authorize the resource even when no executor is configured.
 		if _, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id")); err != nil {
-			writeStoreError(w, r, err)
+			writeSessionsError(w, r, err)
 			return
 		}
 		if !h.auditSessionOperation(w, r, chi.URLParam(r, "session_id"), "send_events") {
@@ -75,12 +75,12 @@ func (h *Handler) createEvents(w http.ResponseWriter, r *http.Request) {
 	}
 	inputs, err := executionInputs(request.Events)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	sessionID := chi.URLParam(r, "session_id")
 	if err := h.setEnvironmentInputWriteDeadline(w, r, sessionID); err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if _, err := h.Execution.InputAdmission.SubmitInputs(r.Context(), tenantID(r), sessionID, key, inputs); err != nil {
diff --git a/services/core/internal/api/placement_errors_test.go b/services/core/internal/api/placement_errors_test.go
index 36866dae5..90a8fb360 100644
--- a/services/core/internal/api/placement_errors_test.go
+++ b/services/core/internal/api/placement_errors_test.go
@@ -11,38 +11,29 @@ import (
 )
 
 // Each placement error keeps its status, code and message, wrapped as the
-// rules and their callers return it. Session creation reports them through
-// writeStoreError; the deployment writer reports those deployment use cases
-// can meet.
+// rules and their callers return it.
 func TestPlacementErrorsKeepTheirResponses(t *testing.T) {
 	for _, tc := range []struct {
-		err             error
-		status          int
-		code, message   string
-		deploymentWrite bool
+		err           error
+		status        int
+		code, message string
 	}{
-		{placement.ErrResetAdmission, http.StatusServiceUnavailable, "sandbox_reset_in_progress", "A sandbox reset is in progress.", false},
-		{fmt.Errorf("%w: sandbox creation is paused for provider maintenance", placement.ErrAdmissionClosed), http.StatusConflict, "environment_unavailable", "The environment is no longer available for new input.", false},
-		{placement.ErrPublicURLUnreachable, http.StatusConflict, "sandbox_configuration_error", placement.ErrPublicURLUnreachable.Error(), true},
-		{placement.ErrNodesPreparing, http.StatusServiceUnavailable, "sandbox_nodes_preparing", "Sandbox nodes are preparing the requested Runtime.", true},
-		{placement.ErrNodeUnavailable, http.StatusServiceUnavailable, "runtime_node_unavailable", "The selected sandbox node is unavailable or has no capacity.", true},
+		{placement.ErrResetAdmission, http.StatusServiceUnavailable, "sandbox_reset_in_progress", "A sandbox reset is in progress."},
+		{fmt.Errorf("%w: sandbox creation is paused for provider maintenance", placement.ErrAdmissionClosed), http.StatusConflict, "environment_unavailable", "The environment is no longer available for new input."},
+		{placement.ErrPublicURLUnreachable, http.StatusConflict, "sandbox_configuration_error", placement.ErrPublicURLUnreachable.Error()},
+		{placement.ErrNodesPreparing, http.StatusServiceUnavailable, "sandbox_nodes_preparing", "Sandbox nodes are preparing the requested Runtime."},
+		{placement.ErrNodeUnavailable, http.StatusServiceUnavailable, "runtime_node_unavailable", "The selected sandbox node is unavailable or has no capacity."},
 	} {
-		writers := map[string]func(http.ResponseWriter, *http.Request, error){"store": writeStoreError}
-		if tc.deploymentWrite {
-			writers["deployment"] = writeDeploymentError
+		response := httptest.NewRecorder()
+		writeOperationError(response, httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", nil), tc.err)
+		var body struct {
+			Error struct{ Code, Message string } `json:"error"`
 		}
-		for name, write := range writers {
-			response := httptest.NewRecorder()
-			write(response, httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", nil), tc.err)
-			var body struct {
-				Error struct{ Code, Message string } `json:"error"`
-			}
-			if err := json.Unmarshal(response.Body.Bytes(), &body); err != nil {
-				t.Fatal(name, err)
-			}
-			if response.Code != tc.status || body.Error.Code != tc.code || body.Error.Message != tc.message {
-				t.Errorf("%s writer for %v = %d %+v", name, tc.err, response.Code, body.Error)
-			}
+		if err := json.Unmarshal(response.Body.Bytes(), &body); err != nil {
+			t.Fatal(err)
+		}
+		if response.Code != tc.status || body.Error.Code != tc.code || body.Error.Message != tc.message {
+			t.Errorf("%v = %d %+v", tc.err, response.Code, body.Error)
 		}
 	}
 }
diff --git a/services/core/internal/api/runtime_history.go b/services/core/internal/api/runtime_history.go
index 752ffe798..5d4d0c3fe 100644
--- a/services/core/internal/api/runtime_history.go
+++ b/services/core/internal/api/runtime_history.go
@@ -52,7 +52,7 @@ func (h *Handler) getRuntimeHistory(w http.ResponseWriter, r *http.Request) {
 			log.Ctx(r.Context()).Warn("Runtime history query unavailable")
 			writeError(w, http.StatusServiceUnavailable, "runtime_history_unavailable", "Durable Runtime history is temporarily unavailable.")
 		default:
-			writeStoreError(w, r, err)
+			writeSessionsError(w, r, err)
 		}
 		return
 	}
diff --git a/services/core/internal/api/runtime_observations.go b/services/core/internal/api/runtime_observations.go
index aab0b20be..2d8e94606 100644
--- a/services/core/internal/api/runtime_observations.go
+++ b/services/core/internal/api/runtime_observations.go
@@ -48,12 +48,12 @@ func (h *Handler) getRuntimeObservation(w http.ResponseWriter, r *http.Request)
 	defer cancel()
 	observation, err := h.RuntimeObservations.ObserveSession(ctx, tenantID(r), chi.URLParam(r, "session_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeOperationError(w, r, err)
 		return
 	}
 	response, err := runtimeObservationResponse(observation)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeOperationError(w, r, err)
 		return
 	}
 	writeJSON(w, http.StatusOK, response)
diff --git a/services/core/internal/api/sandbox_deployment_changes_test.go b/services/core/internal/api/sandbox_deployment_changes_test.go
index e7b7d4ed2..89e20aed3 100644
--- a/services/core/internal/api/sandbox_deployment_changes_test.go
+++ b/services/core/internal/api/sandbox_deployment_changes_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
@@ -73,45 +72,36 @@ func TestSandboxDeploymentChangesAuthenticateAndDecode(t *testing.T) {
 	}
 }
 
-// The deployment writer, which the reset handlers use, and the Session writer,
-// which admission uses, report the deployment errors alike.
+// Deployment errors carry typed details only through the Core router.
 func TestSandboxMutationErrorsExposeOnlyTypedCoreFacts(t *testing.T) {
-	writers := map[string]func(http.ResponseWriter, *http.Request, error){"deployment": writeDeploymentError, "store": writeStoreError}
 	for _, tc := range []struct {
-		err       error
-		code      string
-		status    int
-		details   string
-		admission bool
+		err     error
+		code    string
+		status  int
+		details string
 	}{
-		{&deployment.GenerationStaleError{CurrentGeneration: 8}, "sandbox_generation_stale", 409, `"current_generation":8`, false},
-		{&deployment.ResetRequiredError{CurrentProvider: "docker", RequestedProvider: "e2b"}, "sandbox_reset_required", 409, `"requested_provider":"e2b"`, false},
-		{&deployment.ResetRequiredError{CurrentProvider: "e2b", RequestedProvider: "e2b"}, "sandbox_reset_required", 409, `"current_provider":"e2b"`, false},
-		{&deployment.InUseError{Resources: deployment.Resources{Allocations: 2, Pending: 1}}, "sandbox_in_use", 409, `"allocations":2`, false},
-		{deployment.ErrResetInProgress, "sandbox_reset_in_progress", 409, "", false},
-		{placement.ErrResetAdmission, "sandbox_reset_in_progress", 503, "", true},
+		{&deployment.GenerationStaleError{CurrentGeneration: 8}, "sandbox_generation_stale", 409, `"current_generation":8`},
+		{&deployment.ResetRequiredError{CurrentProvider: "docker", RequestedProvider: "e2b"}, "sandbox_reset_required", 409, `"requested_provider":"e2b"`},
+		{&deployment.ResetRequiredError{CurrentProvider: "e2b", RequestedProvider: "e2b"}, "sandbox_reset_required", 409, `"current_provider":"e2b"`},
+		{&deployment.InUseError{Resources: deployment.Resources{Allocations: 2, Pending: 1}}, "sandbox_in_use", 409, `"allocations":2`},
+		{deployment.ErrResetInProgress, "sandbox_reset_in_progress", 409, ""},
 	} {
-		for name, write := range writers {
-			if tc.admission && name != "store" {
-				continue
+		for _, core := range []bool{false, true} {
+			handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { writeDeploymentError(w, r, tc.err) }))
+			if core {
+				handler = coreErrorResponses(handler)
 			}
-			for _, core := range []bool{false, true} {
-				handler := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { write(w, r, tc.err) }))
-				if core {
-					handler = coreErrorResponses(handler)
-				}
-				response := httptest.NewRecorder()
-				handler.ServeHTTP(response, httptest.NewRequest("POST", "/test", nil))
-				body := response.Body.String()
-				if response.Code != tc.status || !strings.Contains(body, `"code":"`+tc.code+`"`) {
-					t.Fatal(name, body)
-				}
-				if core && tc.details != "" && !strings.Contains(body, tc.details) {
-					t.Fatal("typed detail missing", body)
-				}
-				if !core && strings.Contains(body, `"details"`) {
-					t.Fatal("Core facts escaped their router", body)
-				}
+			response := httptest.NewRecorder()
+			handler.ServeHTTP(response, httptest.NewRequest("POST", "/test", nil))
+			body := response.Body.String()
+			if response.Code != tc.status || !strings.Contains(body, `"code":"`+tc.code+`"`) {
+				t.Fatal(body)
+			}
+			if core && tc.details != "" && !strings.Contains(body, tc.details) {
+				t.Fatal("typed detail missing", body)
+			}
+			if !core && strings.Contains(body, `"details"`) {
+				t.Fatal("Core facts escaped their router", body)
 			}
 		}
 	}
diff --git a/services/core/internal/api/sandbox_manager_test.go b/services/core/internal/api/sandbox_manager_test.go
index 61f816a93..7de004b17 100644
--- a/services/core/internal/api/sandbox_manager_test.go
+++ b/services/core/internal/api/sandbox_manager_test.go
@@ -72,7 +72,7 @@ func TestSandboxEnrollmentDoesNotAcceptProjectAsAdmin(t *testing.T) {
 func TestSandboxLocalNodeRemovalExplainsDeploymentBinding(t *testing.T) {
 	request := httptest.NewRequest(http.MethodDelete, "/core/v1/sandbox/nodes/local", nil)
 	response := httptest.NewRecorder()
-	writeStoreError(response, request, deployment.ErrLocalNodeConfigured)
+	writeDeploymentError(response, request, deployment.ErrLocalNodeConfigured)
 	if response.Code != http.StatusConflict || !strings.Contains(response.Body.String(), "runtime_local_node_configured") || !strings.Contains(response.Body.String(), "previous release") {
 		t.Fatal(response.Code, response.Body.String())
 	}
diff --git a/services/core/internal/api/session_creation_identity.go b/services/core/internal/api/session_creation_identity.go
index c466a6d1c..1f754dbf6 100644
--- a/services/core/internal/api/session_creation_identity.go
+++ b/services/core/internal/api/session_creation_identity.go
@@ -50,7 +50,7 @@ func (h *Handler) recoverSessionCreation(w http.ResponseWriter, r *http.Request,
 		return false
 	}
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return true
 	}
 	if stream {
@@ -62,7 +62,7 @@ func (h *Handler) recoverSessionCreation(w http.ResponseWriter, r *http.Request,
 	} else {
 		session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), result.Session.ID)
 		if err != nil {
-			writeStoreError(w, r, err)
+			writeSessionsError(w, r, err)
 		} else if h.auditSessionOperation(w, r, session.ID, "create") {
 			h.respondSessionStatus(w, r, session, http.StatusCreated)
 		}
diff --git a/services/core/internal/api/session_creation_stream.go b/services/core/internal/api/session_creation_stream.go
index d385d3c8c..7ee530d23 100644
--- a/services/core/internal/api/session_creation_stream.go
+++ b/services/core/internal/api/session_creation_stream.go
@@ -24,12 +24,12 @@ func (h *Handler) respondSessionCreationStream(w http.ResponseWriter, r *http.Re
 	}
 	response, err := sessionResponse(result.Session, h.executorURL())
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	created := v1.SessionEvent{Type: "agent.session.created", EventID: uuid.NewString(), Session: &response}
 	if err := h.addSessionInstallation(w, r, &response); err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if session := result.Session; sessionSettled(session, response) && session.LastTurn == nil && session.EnvironmentInputActivity == nil {
diff --git a/services/core/internal/api/session_deletion.go b/services/core/internal/api/session_deletion.go
index 7905c0c81..7a88b3b04 100644
--- a/services/core/internal/api/session_deletion.go
+++ b/services/core/internal/api/session_deletion.go
@@ -32,11 +32,11 @@ func (h *Handler) deleteSession(w http.ResponseWriter, r *http.Request) {
 	id := chi.URLParam(r, "session_id")
 	parsed, err := uuid.Parse(id)
 	if err != nil || parsed == uuid.Nil {
-		writeStoreError(w, r, sessions.ErrNotFound)
+		writeSessionsError(w, r, sessions.ErrNotFound)
 		return
 	}
 	if err := h.Sessions.DeleteSession(r.Context(), sessions.DeleteSessionCommand{TenantID: tenantID(r), SessionID: id}); err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	writeJSON(w, http.StatusOK, v1.SessionDeleted{ID: parsed.String(), Object: "agent.session.deleted", Deleted: true})
diff --git a/services/core/internal/api/session_diagnostics.go b/services/core/internal/api/session_diagnostics.go
index a98f57312..8eef13aac 100644
--- a/services/core/internal/api/session_diagnostics.go
+++ b/services/core/internal/api/session_diagnostics.go
@@ -69,12 +69,12 @@ func (h *Handler) getSessionDiagnostics(w http.ResponseWriter, r *http.Request)
 	defer cancel()
 	session, err := h.SessionsReader.GetSession(ctx, tenantID(r), chi.URLParam(r, "session_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	public, err := sessionResponse(session, h.executorURL())
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	response := SessionDiagnostics{Object: "core.session_diagnostics", SessionID: public.ID, Status: public.Status}
@@ -125,12 +125,12 @@ func (h *Handler) getTurnDiagnostics(w http.ResponseWriter, r *http.Request) {
 	defer cancel()
 	snapshot, err := h.SessionAdmin.GetTurnDiagnosticsSnapshot(ctx, tenantID(r), chi.URLParam(r, "session_id"), chi.URLParam(r, "turn_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	public, err := turnResponse(snapshot.Session, snapshot.Turn)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	response := TurnDiagnostics{Object: "core.turn_diagnostics", SessionID: public.SessionID, TurnID: public.ID, Status: public.Status, Failure: turnDiagnosticFailure(snapshot.Turn), Items: []ItemDiagnosticTiming{}, ItemsTruncated: snapshot.ItemsTruncated}
diff --git a/services/core/internal/api/session_execution_configuration.go b/services/core/internal/api/session_execution_configuration.go
index 77cfda50e..9acdc758c 100644
--- a/services/core/internal/api/session_execution_configuration.go
+++ b/services/core/internal/api/session_execution_configuration.go
@@ -66,7 +66,7 @@ func sessionExecutionProjection(input sessionRequest, saved *v1.SavedAgent, inhe
 func (h *Handler) getSessionExecutionConfiguration(w http.ResponseWriter, r *http.Request) {
 	configuration, err := h.SessionAdmin.GetSessionExecutionConfiguration(r.Context(), tenantID(r), chi.URLParam(r, "session_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	w.Header().Set("Cache-Control", "no-store")
diff --git a/services/core/internal/api/session_metadata.go b/services/core/internal/api/session_metadata.go
index 6cec3c02b..5ccea02ec 100644
--- a/services/core/internal/api/session_metadata.go
+++ b/services/core/internal/api/session_metadata.go
@@ -62,7 +62,7 @@ func (h *Handler) updateSession(w http.ResponseWriter, r *http.Request) {
 	}
 	session, err := h.Sessions.UpdateSessionMetadata(r.Context(), sessions.UpdateSessionMetadataCommand{TenantID: tenantID(r), SessionID: chi.URLParam(r, "session_id"), Metadata: values})
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	h.respondSession(w, r, session)
diff --git a/services/core/internal/api/session_write_audit.go b/services/core/internal/api/session_write_audit.go
index afc117383..b8e29e05f 100644
--- a/services/core/internal/api/session_write_audit.go
+++ b/services/core/internal/api/session_write_audit.go
@@ -12,7 +12,7 @@ func (h *Handler) auditSessionOperation(w http.ResponseWriter, r *http.Request,
 		return true
 	}
 	if err := h.Sessions.AuditSessionOperation(r.Context(), sessions.AuditSessionOperationCommand{TenantID: tenantID(r), SessionID: sessionID, Action: action}); err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return false
 	}
 	return true
diff --git a/services/core/internal/api/stream.go b/services/core/internal/api/stream.go
index ba7cff7f0..9ac502a10 100644
--- a/services/core/internal/api/stream.go
+++ b/services/core/internal/api/stream.go
@@ -39,16 +39,16 @@ func (h *Handler) streamEvents(w http.ResponseWriter, r *http.Request) {
 	id, tenant := chi.URLParam(r, "session_id"), tenantID(r)
 	session, err := h.SessionsReader.GetSession(r.Context(), tenant, id)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	if _, err = sessionResponse(session, h.executorURL()); err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	cursor, err := h.SessionEvents.SessionEventCursor(r.Context(), tenant, id)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	h.serveSessionEvents(w, r, session, cursor, nil, http.StatusOK, nil)
diff --git a/services/core/internal/api/turns.go b/services/core/internal/api/turns.go
index cfd2668e6..d1afadac7 100644
--- a/services/core/internal/api/turns.go
+++ b/services/core/internal/api/turns.go
@@ -33,17 +33,17 @@ func (h *Handler) getTurn(w http.ResponseWriter, r *http.Request) {
 	sessionID := chi.URLParam(r, "session_id")
 	turn, err := h.Turns.GetTurn(r.Context(), tenantID(r), sessionID, chi.URLParam(r, "turn_id"))
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), sessionID)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	response, err := turnResponse(session, turn)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	writeJSON(w, http.StatusOK, response)
@@ -70,19 +70,19 @@ func (h *Handler) listTurns(w http.ResponseWriter, r *http.Request) {
 	sessionID := chi.URLParam(r, "session_id")
 	session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), sessionID)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	page, err := h.Turns.ListTurns(r.Context(), tenantID(r), sessionID, options.after, options.limit, options.ascending)
 	if err != nil {
-		writeStoreError(w, r, err)
+		writeSessionsError(w, r, err)
 		return
 	}
 	response := v1.TurnList{Data: make([]v1.Turn, 0, len(page.Turns)), HasMore: page.NextCursor != ""}
 	for _, turn := range page.Turns {
 		item, err := turnResponse(session, turn)
 		if err != nil {
-			writeStoreError(w, r, err)
+			writeSessionsError(w, r, err)
 			return
 		}
 		response.Data = append(response.Data, item)
diff --git a/services/core/internal/api/validation_errors_test.go b/services/core/internal/api/validation_errors_test.go
index cecc32b60..fc9b45aac 100644
--- a/services/core/internal/api/validation_errors_test.go
+++ b/services/core/internal/api/validation_errors_test.go
@@ -10,13 +10,11 @@ import (
 	"testing"
 	"time"
 
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/agents"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmenttemplates"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgconn"
 )
 
 // validationStore counts every persistence attempt so rejected requests can
@@ -264,24 +262,3 @@ func TestTemplateNetworkRejectionsUseOfficialCode(t *testing.T) {
 		}
 	}
 }
-
-func TestUnstorableTextMapsToInvalidRequest(t *testing.T) {
-	for _, tc := range []struct {
-		err    error
-		status int
-	}{
-		{fmt.Errorf("create agent: %w", &pgconn.PgError{Code: "22P05"}), http.StatusBadRequest},
-		{fmt.Errorf("create vault: %w", &pgconn.PgError{Code: "22021"}), http.StatusBadRequest},
-		{&pgconn.PgError{Code: "23505"}, http.StatusInternalServerError},
-	} {
-		w := httptest.NewRecorder()
-		writeStoreError(w, httptest.NewRequest(http.MethodPost, "/v1/agents", nil), tc.err)
-		var response v1.ErrorResponse
-		if w.Code != tc.status || json.Unmarshal(w.Body.Bytes(), &response) != nil || response.Error.Param != nil {
-			t.Fatalf("%v: %d %s", tc.err, w.Code, w.Body)
-		}
-		if tc.status == http.StatusBadRequest && (response.Error.Code == nil || *response.Error.Code != "invalid_request_error" || response.Error.Type != "invalid_request_error" || response.Error.Message != unstorableTextMessage) {
-			t.Fatalf("%v: %s", tc.err, w.Body)
-		}
-	}
-}
diff --git a/services/core/internal/api/write_audit.go b/services/core/internal/api/write_audit.go
index 154899a05..8f4b8e258 100644
--- a/services/core/internal/api/write_audit.go
+++ b/services/core/internal/api/write_audit.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 )
 
@@ -43,7 +43,7 @@ func (h *Handler) writeAuditScope(w http.ResponseWriter, r *http.Request, allowe
 	}
 	tenant, ok := r.Context().Value(adminTenantContextKey{}).(string)
 	if !ok || tenant == "" {
-		writeStoreError(w, r, sessions.ErrNotFound)
+		writeProjectsError(w, r, projects.ErrNotFound)
 		return nil, "", false
 	}
 	return values, tenant, true
diff --git a/services/core/internal/deployment/allocations.go b/services/core/internal/deployment/allocations.go
index 294c096fc..2d10c6c1d 100644
--- a/services/core/internal/deployment/allocations.go
+++ b/services/core/internal/deployment/allocations.go
@@ -307,7 +307,6 @@ func checkAllocation(tx AllocationTx, owner Allocation, live bool) (Allocation,
 		return current, nil
 	}
 	if current.SessionDeleted {
-		// sessions.ErrNotFound keeps the public 404 that writeStoreError maps.
 		return Allocation{}, sessions.ErrNotFound
 	}
 	device, bound, err := tx.LoadSessionDevice()
diff --git a/services/core/internal/persistence/postgres/deploymentpg/allocations.go b/services/core/internal/persistence/postgres/deploymentpg/allocations.go
index 5ff80fbec..08e2569cb 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/allocations.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/allocations.go
@@ -79,7 +79,6 @@ func (e *Execution) WithReservation(ctx context.Context, key deployment.Allocati
 		q := sqlc.New(tx)
 		owned, err := q.GetEnvironment(ctx, sqlc.GetEnvironmentParams{TenantID: tenant, ID: environment})
 		if errors.Is(err, pgx.ErrNoRows) {
-			// sessions.ErrNotFound keeps the public 404 that writeStoreError maps.
 			return sessions.ErrNotFound
 		}
 		if err != nil {
@@ -153,7 +152,6 @@ func (s *Store) WithActivity(ctx context.Context, key deployment.AllocationKey,
 		q := sqlc.New(tx)
 		owned, err := q.GetEnvironment(ctx, sqlc.GetEnvironmentParams{TenantID: tenant, ID: environment})
 		if errors.Is(err, pgx.ErrNoRows) {
-			// sessions.ErrNotFound keeps the public 404 that writeStoreError maps.
 			return sessions.ErrNotFound
 		}
 		if err != nil {
@@ -526,7 +524,6 @@ func (s *Store) LifecyclePlacement(ctx context.Context, key deployment.Allocatio
 	defer cancel()
 	row, err := s.pool.Queries().GetRuntimeLifecyclePlacement(ctx, sqlc.GetRuntimeLifecyclePlacementParams{TenantID: tenant, ID: environment})
 	if errors.Is(err, pgx.ErrNoRows) {
-		// sessions.ErrNotFound keeps the public 404 that writeStoreError maps.
 		return deployment.LifecyclePlacement{}, sessions.ErrNotFound
 	}
 	if err != nil {
diff --git a/services/core/internal/persistence/postgres/sessionpg/session_reads.go b/services/core/internal/persistence/postgres/sessionpg/session_reads.go
index 7f9af672f..f22c82e04 100644
--- a/services/core/internal/persistence/postgres/sessionpg/session_reads.go
+++ b/services/core/internal/persistence/postgres/sessionpg/session_reads.go
@@ -48,7 +48,7 @@ func (s *Store) ListSessions(ctx context.Context, tenantID, cursor string, limit
 		}
 		rows, err := q.ListSessions(ctx, params)
 		if err != nil {
-			return fmt.Errorf("list sessions: %w", err)
+			return storable(fmt.Errorf("list sessions: %w", err))
 		}
 		page.Sessions = make([]sessions.Session, 0, min(limit, len(rows)))
 		if len(rows) > limit {
diff --git a/services/core/internal/store/unstorable_text.go b/services/core/internal/store/unstorable_text.go
deleted file mode 100644
index 8c730eb95..000000000
--- a/services/core/internal/store/unstorable_text.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package store
-
-import "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-
-// UnstorableText reports PostgreSQL rejecting text it cannot store; see
-// pgunit.IsUnstorableText. Store returns database errors untranslated, so api
-// checks them with this until store is deleted.
-func UnstorableText(err error) bool { return pgunit.IsUnstorableText(err) }

From bd04f2276dcef5ba3d412c775ed3d8a3a4441bb8 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 06:10:42 +0800
Subject: [PATCH 12/60] Delete the store package (#449)

---
 .github/workflows/api-acceptance.yml          |  2 +-
 .github/workflows/check.yml                   | 14 ++---
 Makefile                                      | 20 +++----
 contracts/agents-api/harness-onboarding.md    |  4 +-
 contracts/agents-api/model-execution.md       |  2 +-
 contracts/agents-api/zh/harness-onboarding.md |  6 +--
 contracts/agents-api/zh/model-execution.md    |  4 +-
 docs/development.md                           |  3 +-
 docs/maintainers.md                           |  4 +-
 docs/zh/development.md                        |  5 +-
 docs/zh/maintainers.md                        |  6 +--
 scripts/ci_plan_test.py                       |  4 +-
 scripts/ci_shard_test.py                      |  2 +-
 scripts/name-allowlist.json                   | 10 ++--
 services/core/IMPLEMENTATION.md               | 14 ++---
 services/core/README.md                       |  2 +-
 services/core/cmd/server/layering_test.go     | 53 +++++++++++++++++++
 services/core/cmd/server/runtime_history.go   |  4 +-
 .../internal/api/core_validation_errors.go    |  2 +-
 .../internal/api/session_creation_identity.go |  5 +-
 .../internal/execution/runtime_manager.go     |  2 +-
 .../execution/sandbox_deployment_setup.go     |  2 +-
 .../postgres/runtimehistorypg}/aggregate.go   |  4 +-
 .../runtimehistorypg}/aggregate_test.go       |  2 +-
 .../postgres/runtimehistorypg}/exporter.go    |  2 +-
 .../postgres/runtimehistorypg}/reader.go      |  2 +-
 .../postgres/runtimehistorypg}/reader_test.go |  2 +-
 .../postgres/runtimehistorypg}/samples.go     |  2 +-
 .../runtimehistorypg}/samples_test.go         |  2 +-
 .../integration}/admin_delete_audit_test.go   |  2 +-
 .../admin_session_archive_race_test.go        |  2 +-
 .../admin_session_archive_test.go             |  2 +-
 .../admin_session_archive_worker_http_test.go | 15 +++---
 .../agent_execution_defaults_http_test.go     | 15 +++---
 .../integration}/agents_delete_public_test.go |  5 +-
 .../integration}/agents_fixture_test.go       |  2 +-
 .../integration}/agents_update_public_test.go |  5 +-
 .../integration}/archive_cancellation_test.go | 17 +++---
 .../archived_cancellation_migration_test.go   |  2 +-
 .../integration}/auth_fixture_test.go         |  2 +-
 .../integration}/claude_execution_test.go     | 19 ++++---
 .../integration}/claude_mcp_test.go           |  7 ++-
 .../integration}/command_output_test.go       | 27 +++++-----
 .../configuration_validation_public_test.go   |  7 ++-
 .../creation_stream_settlement_public_test.go | 13 +++--
 .../credential_matrix_http_test.go            |  5 +-
 .../credential_oauth_migration_test.go        |  2 +-
 .../credential_status_migration_test.go       |  2 +-
 .../integration}/deployment_fixture_test.go   |  2 +-
 .../deployment_model_providers_http_test.go   | 29 +++++-----
 .../deployment_public_fixture_test.go         |  2 +-
 .../device_bootstrap_binding_test.go          |  2 +-
 .../integration}/devices_test.go              |  2 +-
 .../integration}/dispatch_test.go             | 23 ++++----
 .../environment_admission_test.go             | 23 ++++----
 .../environment_claim_worker_test.go          | 11 ++--
 .../environment_connection_events_test.go     | 31 ++---------
 .../environment_connection_migration_test.go  |  2 +-
 .../environment_connection_recovery_test.go   |  2 +-
 .../environment_connection_worker_test.go     |  5 +-
 .../environment_connections_test.go           |  2 +-
 .../integration}/environment_device_test.go   |  9 ++--
 .../environment_directory_active_test.go      |  5 +-
 .../environment_directory_test.go             |  7 ++-
 .../environment_executor_command_test.go      |  9 ++--
 .../environment_executor_credentials_test.go  |  2 +-
 .../environment_executor_management_test.go   |  2 +-
 .../environment_expiry_dispatch_test.go       |  9 ++--
 .../environment_expiry_worker_test.go         | 15 +++---
 .../environment_failure_migration_test.go     |  2 +-
 .../environment_file_write_migration_test.go  |  2 +-
 ...onment_file_write_semantics_public_test.go |  9 ++--
 .../environment_file_writes_test.go           |  2 +-
 .../environment_initial_input_test.go         |  2 +-
 .../environment_initial_migration_test.go     |  2 +-
 .../environment_initial_public_test.go        |  7 ++-
 .../environment_initialization_test.go        | 13 +++--
 .../environment_input_activity_test.go        |  2 +-
 .../environment_input_expiry_test.go          |  2 +-
 .../environment_input_migration_test.go       |  2 +-
 .../environment_input_settlement_test.go      |  2 +-
 .../environment_installation_test.go          |  2 +-
 .../environment_mcp_public_test.go            |  5 +-
 .../integration}/environment_plugins_test.go  |  2 +-
 .../environment_retrieve_public_test.go       |  5 +-
 .../environment_runtime_fixture_test.go       |  9 ++--
 .../integration}/environment_setup_test.go    |  2 +-
 .../integration}/environment_work_test.go     | 17 +++---
 .../environment_worker_helpers_test.go        | 15 +++---
 .../environment_worker_scan_test.go           |  7 ++-
 .../integration}/environment_worker_test.go   |  9 ++--
 .../environment_write_audit_test.go           |  2 +-
 .../environments_migration_test.go            |  2 +-
 .../integration}/environments_test.go         |  2 +-
 .../integration}/execution_events_test.go     | 11 ++--
 .../integration}/execution_messages_test.go   |  7 ++-
 .../integration}/execution_test.go            |  2 +-
 .../integration}/execution_tools_test.go      |  7 ++-
 .../integration}/executor_fixture_test.go     |  2 +-
 .../executor_principals_migration_test.go     |  2 +-
 .../integration}/executor_principals_test.go  |  2 +-
 .../integration}/executor_recovery_test.go    |  2 +-
 .../file_resource_semantics_public_test.go    |  7 ++-
 .../integration}/fixture_db_test.go           | 26 +++++----
 .../integration/fixtures_test.go}             | 53 ++-----------------
 .../function_execution_native_test.go         | 13 +++--
 .../integration}/function_execution_test.go   | 23 ++++----
 .../function_images_native_test.go            | 11 ++--
 .../function_input_execution_test.go          |  9 ++--
 .../function_inputs_public_test.go            | 23 ++++----
 .../integration}/function_inputs_test.go      |  2 +-
 .../integration}/function_item_events_test.go |  2 +-
 .../integration}/function_model_test.go       |  2 +-
 .../function_public_native_test.go            |  7 ++-
 .../function_state_public_test.go             | 11 ++--
 .../integration}/function_state_test.go       |  2 +-
 .../function_stream_native_test.go            |  8 ++-
 .../integration}/function_worker_test.go      | 11 ++--
 .../integration}/harness_onboarding_test.go   | 13 +++--
 ...sted_initialization_failure_public_test.go | 37 +++++++------
 .../integration}/initial_files_http_test.go   |  7 ++-
 .../input_conflicts_public_test.go            | 15 +++---
 .../integration}/inputs_test.go               |  2 +-
 .../integration}/item_order_migration_test.go |  9 ++--
 .../integration}/item_order_test.go           | 17 +++---
 .../integration}/item_reads_test.go           | 39 +++++++-------
 .../integration}/item_serialization_test.go   |  2 +-
 .../integration}/list_cursor_public_test.go   | 29 +++++-----
 .../integration}/list_query_public_test.go    |  7 ++-
 .../local_artifact_export_test.go             |  5 +-
 .../local_environment_devices_test.go         |  2 +-
 .../local_environment_file_write_test.go      | 17 +++---
 .../local_environment_worker_test.go          | 19 ++++---
 .../integration/managed_fixture_test.go}      |  7 +--
 .../integration}/mcode_public_native_test.go  | 13 +++--
 .../mcp_credential_selection_public_test.go   |  9 ++--
 .../message_image_admission_test.go           |  7 ++-
 .../message_images_native_test.go             | 13 +++--
 .../message_input_helpers_test.go             |  2 +-
 .../model_protocol_native_test.go             | 11 ++--
 .../model_provider_fixture_test.go            |  9 ++--
 .../integration}/native_daemon_test.go        |  2 +-
 .../integration}/native_environment_test.go   |  9 ++--
 .../native_public_execution_test.go           |  2 +-
 .../integration}/native_recovery_test.go      |  2 +-
 .../integration}/no_environment_test.go       |  7 ++-
 .../node_diagnostic_contract_test.go          |  4 +-
 .../oac_runtime_names_migration_test.go       |  2 +-
 .../path_id_semantics_public_test.go          | 19 ++++---
 .../prepared_dispatch_failure_test.go         | 19 ++++---
 .../integration}/prepared_dispatch_test.go    | 17 +++---
 .../project_api_keys_http_test.go             |  2 +-
 .../project_scopes_fixture_test.go            |  2 +-
 .../integration}/project_scopes_test.go       |  2 +-
 .../integration}/projects_fixture_test.go     |  2 +-
 .../projects_public_fixture_test.go           |  2 +-
 .../provider_configuration_migration_test.go  |  2 +-
 .../provider_operations_fixture_test.go       |  2 +-
 .../provider_registration_migration_test.go   |  2 +-
 .../integration}/public_execution_test.go     | 25 +++++----
 .../public_handler_fixture_test.go            | 21 ++++----
 .../integration}/public_url_migration_test.go |  2 +-
 .../remote_mcp_credentials_test.go            |  7 ++-
 .../integration}/remote_mcp_test.go           | 13 +++--
 .../integration}/request_body_public_test.go  | 15 +++---
 .../integration/root_fixture_test.go}         |  2 +-
 .../integration}/runtime_adoption_test.go     |  2 +-
 .../integration}/runtime_allocations_test.go  |  2 +-
 .../runtime_capabilities_pending_test.go      | 11 ++--
 .../runtime_compute_lifecycle_test.go         |  9 ++--
 .../runtime_configuration_cleanup_test.go     |  9 ++--
 .../integration}/runtime_connection_test.go   |  7 ++-
 .../runtime_creation_settlement_test.go       |  7 ++-
 .../integration}/runtime_deployment_test.go   |  2 +-
 .../runtime_deployment_worker_test.go         |  2 +-
 .../runtime_enrollment_connection_test.go     |  9 ++--
 .../integration}/runtime_enrollment_test.go   |  2 +-
 .../runtime_environment_terminal_test.go      |  2 +-
 .../runtime_file_admission_test.go            |  2 +-
 .../integration}/runtime_idle_clock_test.go   |  2 +-
 .../runtime_initialization_peer_test.go       |  2 +-
 .../runtime_initialization_test.go            | 13 +++--
 .../runtime_input_admission_test.go           |  7 ++-
 .../runtime_lifecycle_nodes_test.go           |  2 +-
 .../integration}/runtime_lifecycle_test.go    | 15 +++---
 .../runtime_node_capacity_test.go             |  2 +-
 .../runtime_node_generations_test.go          |  2 +-
 .../runtime_node_lifecycle_fixture_test.go    | 17 +++---
 .../runtime_node_lifecycle_test.go            |  7 ++-
 .../integration}/runtime_nodes_test.go        |  2 +-
 .../runtime_observation_scan_test.go          |  5 +-
 .../integration}/runtime_observation_test.go  |  2 +-
 .../integration}/runtime_pending_test.go      | 11 ++--
 .../integration}/runtime_scan_test.go         |  5 +-
 .../runtime_suspension_concurrency_test.go    |  2 +-
 .../integration}/runtime_suspension_test.go   |  2 +-
 .../integration}/runtime_wait_test.go         |  2 +-
 .../runtime_wake_hint_integration_test.go     |  7 ++-
 .../runtime_worker_recovery_test.go           | 17 +++---
 .../sandbox_deployment_resources_test.go      |  2 +-
 .../sandbox_deployment_setup_test.go          |  2 +-
 .../sandbox_deployment_switch_test.go         |  2 +-
 .../sandbox_deployment_switch_worker_test.go  | 35 ++++++------
 .../sandbox_deployment_view_test.go           |  2 +-
 .../sandbox_deployment_worker_test.go         | 11 ++--
 .../integration}/sandbox_generations_test.go  |  2 +-
 .../sandbox_node_auth_order_http_test.go      |  2 +-
 .../sandbox_reset_migration_test.go           |  2 +-
 .../integration}/sandbox_reset_test.go        |  2 +-
 .../sandbox_snapshot_plan_test.go             |  4 +-
 .../sandbox_specification_lifecycle_test.go}  |  2 +-
 .../sandbox_specification_test.go             |  2 +-
 .../saved_web_search_public_test.go           |  2 +-
 .../self_hosted_cancel_public_test.go         | 15 +++---
 .../self_hosted_initial_public_test.go        | 13 +++--
 .../session_agent_filter_public_test.go       |  5 +-
 .../integration}/session_agent_filter_test.go |  2 +-
 .../session_artifacts_public_test.go          | 15 +++---
 .../integration}/session_artifacts_test.go    |  2 +-
 .../session_configuration_test.go             |  2 +-
 .../session_creation_identity_test.go         |  2 +-
 .../session_deletion_execution_test.go        | 33 ++++++------
 .../session_deletion_lifecycle_public_test.go | 15 +++---
 .../session_deletion_public_test.go           |  5 +-
 .../integration}/session_deletion_test.go     |  2 +-
 .../session_devices_fixture_test.go           |  2 +-
 .../session_diagnostics_cancellation_test.go  |  2 +-
 .../integration}/session_diagnostics_test.go  |  2 +-
 .../integration}/session_events_test.go       | 51 +++++++++---------
 .../session_execution_configuration_test.go   |  2 +-
 .../session_initial_public_test.go            |  2 +-
 .../integration}/session_metadata_test.go     |  2 +-
 .../session_model_execution_http_test.go      |  7 ++-
 .../session_model_options_test.go             |  2 +-
 .../session_reads_fixture_test.go             |  2 +-
 .../session_reference_retry_public_test.go    |  5 +-
 .../integration}/session_write_audit_test.go  |  2 +-
 .../integration}/sessions_fixture_test.go     |  2 +-
 .../integration}/sessions_test.go             |  2 +-
 .../skill_default_metadata_migration_test.go  |  2 +-
 .../integration}/skill_fixture_test.go        |  2 +-
 .../skill_selectors_public_test.go            |  9 ++--
 .../skill_version_deletion_public_test.go     | 15 +++---
 .../skill_version_deletion_test.go            |  2 +-
 .../integration}/skills_public_test.go        |  9 ++--
 .../source_files_errors_public_test.go        |  2 +-
 .../integration}/steering_receipts_test.go    |  5 +-
 .../stream_authority_http_test.go             |  7 ++-
 .../structured_output_dispatch_test.go        |  7 ++-
 .../structured_output_native_test.go          | 11 ++--
 .../integration}/subagent_dispatch_test.go    |  5 +-
 .../integration}/subagent_identities_test.go  |  2 +-
 .../subagent_native_outputs_test.go           |  2 +-
 .../integration}/subagent_resources_test.go   |  2 +-
 .../subagent_visibility_public_test.go        | 11 ++--
 .../template_composition_public_test.go       | 11 ++--
 .../template_null_selection_public_test.go    | 11 ++--
 .../token_usage_integration_test.go           | 53 +++++++++----------
 .../integration}/tool_policy_native_test.go   | 17 +++---
 .../integration}/tool_search_native_test.go   | 11 ++--
 .../integration}/turn_events_test.go          | 19 ++++---
 .../integration}/turn_journal_reads_test.go   |  2 +-
 .../unified_model_configuration_http_test.go  |  7 ++-
 .../unstorable_text_public_test.go            |  7 ++-
 .../vault_status_migration_test.go            |  2 +-
 .../integration}/vaults_fixture_test.go       |  2 +-
 .../whitespace_input_public_test.go           |  2 +-
 .../integration}/worker_capacity_test.go      |  9 ++--
 .../integration}/worker_input_race_test.go    | 13 +++--
 .../integration}/worker_lease_loss_test.go    | 11 ++--
 .../worker_preparation_failure_test.go        | 29 +++++-----
 .../integration}/worker_wakeup_test.go        |  9 ++--
 .../tests/official_credential_rotation.py     |  2 +-
 services/core/tests/official_credentials.py   |  2 +-
 .../core/tests/official_environment_events.py | 44 ---------------
 275 files changed, 1001 insertions(+), 1190 deletions(-)
 create mode 100644 services/core/cmd/server/layering_test.go
 rename services/core/internal/{runtimehistory/postgresreader => persistence/postgres/runtimehistorypg}/aggregate.go (99%)
 rename services/core/internal/{runtimehistory/postgresreader => persistence/postgres/runtimehistorypg}/aggregate_test.go (99%)
 rename services/core/internal/{runtimehistory/postgresreader => persistence/postgres/runtimehistorypg}/exporter.go (99%)
 rename services/core/internal/{runtimehistory/postgresreader => persistence/postgres/runtimehistorypg}/reader.go (99%)
 rename services/core/internal/{runtimehistory/postgresreader => persistence/postgres/runtimehistorypg}/reader_test.go (99%)
 rename services/core/internal/{runtimehistory/postgresreader => persistence/postgres/runtimehistorypg}/samples.go (99%)
 rename services/core/internal/{runtimehistory/postgresreader => persistence/postgres/runtimehistorypg}/samples_test.go (99%)
 rename services/core/{internal/store => tests/integration}/admin_delete_audit_test.go (99%)
 rename services/core/{internal/store => tests/integration}/admin_session_archive_race_test.go (99%)
 rename services/core/{internal/store => tests/integration}/admin_session_archive_test.go (99%)
 rename services/core/{internal/store => tests/integration}/admin_session_archive_worker_http_test.go (88%)
 rename services/core/{internal/store => tests/integration}/agent_execution_defaults_http_test.go (95%)
 rename services/core/{internal/store => tests/integration}/agents_delete_public_test.go (90%)
 rename services/core/{internal/store => tests/integration}/agents_fixture_test.go (97%)
 rename services/core/{internal/store => tests/integration}/agents_update_public_test.go (90%)
 rename services/core/{internal/store => tests/integration}/archive_cancellation_test.go (92%)
 rename services/core/{internal/store => tests/integration}/archived_cancellation_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/auth_fixture_test.go (98%)
 rename services/core/{internal/store => tests/integration}/claude_execution_test.go (86%)
 rename services/core/{internal/store => tests/integration}/claude_mcp_test.go (95%)
 rename services/core/{internal/store => tests/integration}/command_output_test.go (82%)
 rename services/core/{internal/store => tests/integration}/configuration_validation_public_test.go (98%)
 rename services/core/{internal/store => tests/integration}/creation_stream_settlement_public_test.go (89%)
 rename services/core/{internal/store => tests/integration}/credential_matrix_http_test.go (98%)
 rename services/core/{internal/store => tests/integration}/credential_oauth_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/credential_status_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/deployment_fixture_test.go (99%)
 rename services/core/{internal/store => tests/integration}/deployment_model_providers_http_test.go (93%)
 rename services/core/{internal/store => tests/integration}/deployment_public_fixture_test.go (99%)
 rename services/core/{internal/store => tests/integration}/device_bootstrap_binding_test.go (99%)
 rename services/core/{internal/store => tests/integration}/devices_test.go (99%)
 rename services/core/{internal/store => tests/integration}/dispatch_test.go (93%)
 rename services/core/{internal/store => tests/integration}/environment_admission_test.go (89%)
 rename services/core/{internal/store => tests/integration}/environment_claim_worker_test.go (85%)
 rename services/core/{internal/store => tests/integration}/environment_connection_events_test.go (62%)
 rename services/core/{internal/store => tests/integration}/environment_connection_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_connection_recovery_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_connection_worker_test.go (88%)
 rename services/core/{internal/store => tests/integration}/environment_connections_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_device_test.go (89%)
 rename services/core/{internal/store => tests/integration}/environment_directory_active_test.go (87%)
 rename services/core/{internal/store => tests/integration}/environment_directory_test.go (97%)
 rename services/core/{internal/store => tests/integration}/environment_executor_command_test.go (88%)
 rename services/core/{internal/store => tests/integration}/environment_executor_credentials_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_executor_management_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_expiry_dispatch_test.go (94%)
 rename services/core/{internal/store => tests/integration}/environment_expiry_worker_test.go (81%)
 rename services/core/{internal/store => tests/integration}/environment_failure_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_file_write_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_file_write_semantics_public_test.go (95%)
 rename services/core/{internal/store => tests/integration}/environment_file_writes_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_initial_input_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_initial_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_initial_public_test.go (91%)
 rename services/core/{internal/store => tests/integration}/environment_initialization_test.go (95%)
 rename services/core/{internal/store => tests/integration}/environment_input_activity_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_input_expiry_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_input_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_input_settlement_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_installation_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_mcp_public_test.go (96%)
 rename services/core/{internal/store => tests/integration}/environment_plugins_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_retrieve_public_test.go (96%)
 rename services/core/{internal/store => tests/integration}/environment_runtime_fixture_test.go (94%)
 rename services/core/{internal/store => tests/integration}/environment_setup_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environment_work_test.go (73%)
 rename services/core/{internal/store => tests/integration}/environment_worker_helpers_test.go (79%)
 rename services/core/{internal/store => tests/integration}/environment_worker_scan_test.go (92%)
 rename services/core/{internal/store => tests/integration}/environment_worker_test.go (95%)
 rename services/core/{internal/store => tests/integration}/environment_write_audit_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environments_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/environments_test.go (99%)
 rename services/core/{internal/store => tests/integration}/execution_events_test.go (92%)
 rename services/core/{internal/store => tests/integration}/execution_messages_test.go (94%)
 rename services/core/{internal/store => tests/integration}/execution_test.go (99%)
 rename services/core/{internal/store => tests/integration}/execution_tools_test.go (93%)
 rename services/core/{internal/store => tests/integration}/executor_fixture_test.go (99%)
 rename services/core/{internal/store => tests/integration}/executor_principals_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/executor_principals_test.go (99%)
 rename services/core/{internal/store => tests/integration}/executor_recovery_test.go (99%)
 rename services/core/{internal/store => tests/integration}/file_resource_semantics_public_test.go (89%)
 rename services/core/{internal/store => tests/integration}/fixture_db_test.go (84%)
 rename services/core/{internal/store/export_test.go => tests/integration/fixtures_test.go} (69%)
 rename services/core/{internal/store => tests/integration}/function_execution_native_test.go (74%)
 rename services/core/{internal/store => tests/integration}/function_execution_test.go (85%)
 rename services/core/{internal/store => tests/integration}/function_images_native_test.go (87%)
 rename services/core/{internal/store => tests/integration}/function_input_execution_test.go (83%)
 rename services/core/{internal/store => tests/integration}/function_inputs_public_test.go (76%)
 rename services/core/{internal/store => tests/integration}/function_inputs_test.go (99%)
 rename services/core/{internal/store => tests/integration}/function_item_events_test.go (99%)
 rename services/core/{internal/store => tests/integration}/function_model_test.go (99%)
 rename services/core/{internal/store => tests/integration}/function_public_native_test.go (90%)
 rename services/core/{internal/store => tests/integration}/function_state_public_test.go (83%)
 rename services/core/{internal/store => tests/integration}/function_state_test.go (99%)
 rename services/core/{internal/store => tests/integration}/function_stream_native_test.go (85%)
 rename services/core/{internal/store => tests/integration}/function_worker_test.go (94%)
 rename services/core/{internal/store => tests/integration}/harness_onboarding_test.go (95%)
 rename services/core/{internal/store => tests/integration}/hosted_initialization_failure_public_test.go (90%)
 rename services/core/{internal/store => tests/integration}/initial_files_http_test.go (92%)
 rename services/core/{internal/store => tests/integration}/input_conflicts_public_test.go (93%)
 rename services/core/{internal/store => tests/integration}/inputs_test.go (99%)
 rename services/core/{internal/store => tests/integration}/item_order_migration_test.go (94%)
 rename services/core/{internal/store => tests/integration}/item_order_test.go (84%)
 rename services/core/{internal/store => tests/integration}/item_reads_test.go (80%)
 rename services/core/{internal/store => tests/integration}/item_serialization_test.go (99%)
 rename services/core/{internal/store => tests/integration}/list_cursor_public_test.go (93%)
 rename services/core/{internal/store => tests/integration}/list_query_public_test.go (90%)
 rename services/core/{internal/store => tests/integration}/local_artifact_export_test.go (92%)
 rename services/core/{internal/store => tests/integration}/local_environment_devices_test.go (99%)
 rename services/core/{internal/store => tests/integration}/local_environment_file_write_test.go (81%)
 rename services/core/{internal/store => tests/integration}/local_environment_worker_test.go (88%)
 rename services/core/{internal/store/managed_test_store_test.go => tests/integration/managed_fixture_test.go} (82%)
 rename services/core/{internal/store => tests/integration}/mcode_public_native_test.go (90%)
 rename services/core/{internal/store => tests/integration}/mcp_credential_selection_public_test.go (98%)
 rename services/core/{internal/store => tests/integration}/message_image_admission_test.go (87%)
 rename services/core/{internal/store => tests/integration}/message_images_native_test.go (86%)
 rename services/core/{internal/store => tests/integration}/message_input_helpers_test.go (92%)
 rename services/core/{internal/store => tests/integration}/model_protocol_native_test.go (91%)
 rename services/core/{internal/store => tests/integration}/model_provider_fixture_test.go (76%)
 rename services/core/{internal/store => tests/integration}/native_daemon_test.go (99%)
 rename services/core/{internal/store => tests/integration}/native_environment_test.go (92%)
 rename services/core/{internal/store => tests/integration}/native_public_execution_test.go (99%)
 rename services/core/{internal/store => tests/integration}/native_recovery_test.go (98%)
 rename services/core/{internal/store => tests/integration}/no_environment_test.go (66%)
 rename services/core/{internal/store => tests/integration}/node_diagnostic_contract_test.go (93%)
 rename services/core/{internal/store => tests/integration}/oac_runtime_names_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/path_id_semantics_public_test.go (96%)
 rename services/core/{internal/store => tests/integration}/prepared_dispatch_failure_test.go (89%)
 rename services/core/{internal/store => tests/integration}/prepared_dispatch_test.go (89%)
 rename services/core/{internal/store => tests/integration}/project_api_keys_http_test.go (99%)
 rename services/core/{internal/store => tests/integration}/project_scopes_fixture_test.go (98%)
 rename services/core/{internal/store => tests/integration}/project_scopes_test.go (99%)
 rename services/core/{internal/store => tests/integration}/projects_fixture_test.go (98%)
 rename services/core/{internal/store => tests/integration}/projects_public_fixture_test.go (98%)
 rename services/core/{internal/store => tests/integration}/provider_configuration_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/provider_operations_fixture_test.go (99%)
 rename services/core/{internal/store => tests/integration}/provider_registration_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/public_execution_test.go (82%)
 rename services/core/{internal/store => tests/integration}/public_handler_fixture_test.go (93%)
 rename services/core/{internal/store => tests/integration}/public_url_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/remote_mcp_credentials_test.go (92%)
 rename services/core/{internal/store => tests/integration}/remote_mcp_test.go (90%)
 rename services/core/{internal/store => tests/integration}/request_body_public_test.go (96%)
 rename services/core/{internal/store/store_fixture_test.go => tests/integration/root_fixture_test.go} (99%)
 rename services/core/{internal/store => tests/integration}/runtime_adoption_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_allocations_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_capabilities_pending_test.go (83%)
 rename services/core/{internal/store => tests/integration}/runtime_compute_lifecycle_test.go (98%)
 rename services/core/{internal/store => tests/integration}/runtime_configuration_cleanup_test.go (93%)
 rename services/core/{internal/store => tests/integration}/runtime_connection_test.go (93%)
 rename services/core/{internal/store => tests/integration}/runtime_creation_settlement_test.go (92%)
 rename services/core/{internal/store => tests/integration}/runtime_deployment_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_deployment_worker_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_enrollment_connection_test.go (95%)
 rename services/core/{internal/store => tests/integration}/runtime_enrollment_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_environment_terminal_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_file_admission_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_idle_clock_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_initialization_peer_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_initialization_test.go (90%)
 rename services/core/{internal/store => tests/integration}/runtime_input_admission_test.go (84%)
 rename services/core/{internal/store => tests/integration}/runtime_lifecycle_nodes_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_lifecycle_test.go (90%)
 rename services/core/{internal/store => tests/integration}/runtime_node_capacity_test.go (98%)
 rename services/core/{internal/store => tests/integration}/runtime_node_generations_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_node_lifecycle_fixture_test.go (92%)
 rename services/core/{internal/store => tests/integration}/runtime_node_lifecycle_test.go (94%)
 rename services/core/{internal/store => tests/integration}/runtime_nodes_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_observation_scan_test.go (87%)
 rename services/core/{internal/store => tests/integration}/runtime_observation_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_pending_test.go (82%)
 rename services/core/{internal/store => tests/integration}/runtime_scan_test.go (94%)
 rename services/core/{internal/store => tests/integration}/runtime_suspension_concurrency_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_suspension_test.go (99%)
 rename services/core/{internal/store => tests/integration}/runtime_wait_test.go (96%)
 rename services/core/{internal/store => tests/integration}/runtime_wake_hint_integration_test.go (95%)
 rename services/core/{internal/store => tests/integration}/runtime_worker_recovery_test.go (87%)
 rename services/core/{internal/store => tests/integration}/sandbox_deployment_resources_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_deployment_setup_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_deployment_switch_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_deployment_switch_worker_test.go (77%)
 rename services/core/{internal/store => tests/integration}/sandbox_deployment_view_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_deployment_worker_test.go (80%)
 rename services/core/{internal/store => tests/integration}/sandbox_generations_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_node_auth_order_http_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_reset_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_reset_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_snapshot_plan_test.go (97%)
 rename services/core/{internal/store/sandbox_specification_store_test.go => tests/integration/sandbox_specification_lifecycle_test.go} (99%)
 rename services/core/{internal/store => tests/integration}/sandbox_specification_test.go (98%)
 rename services/core/{internal/store => tests/integration}/saved_web_search_public_test.go (99%)
 rename services/core/{internal/store => tests/integration}/self_hosted_cancel_public_test.go (89%)
 rename services/core/{internal/store => tests/integration}/self_hosted_initial_public_test.go (93%)
 rename services/core/{internal/store => tests/integration}/session_agent_filter_public_test.go (90%)
 rename services/core/{internal/store => tests/integration}/session_agent_filter_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_artifacts_public_test.go (93%)
 rename services/core/{internal/store => tests/integration}/session_artifacts_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_configuration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_creation_identity_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_deletion_execution_test.go (73%)
 rename services/core/{internal/store => tests/integration}/session_deletion_lifecycle_public_test.go (92%)
 rename services/core/{internal/store => tests/integration}/session_deletion_public_test.go (88%)
 rename services/core/{internal/store => tests/integration}/session_deletion_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_devices_fixture_test.go (98%)
 rename services/core/{internal/store => tests/integration}/session_diagnostics_cancellation_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_diagnostics_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_events_test.go (72%)
 rename services/core/{internal/store => tests/integration}/session_execution_configuration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_initial_public_test.go (98%)
 rename services/core/{internal/store => tests/integration}/session_metadata_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_model_execution_http_test.go (93%)
 rename services/core/{internal/store => tests/integration}/session_model_options_test.go (99%)
 rename services/core/{internal/store => tests/integration}/session_reads_fixture_test.go (98%)
 rename services/core/{internal/store => tests/integration}/session_reference_retry_public_test.go (94%)
 rename services/core/{internal/store => tests/integration}/session_write_audit_test.go (99%)
 rename services/core/{internal/store => tests/integration}/sessions_fixture_test.go (98%)
 rename services/core/{internal/store => tests/integration}/sessions_test.go (99%)
 rename services/core/{internal/store => tests/integration}/skill_default_metadata_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/skill_fixture_test.go (98%)
 rename services/core/{internal/store => tests/integration}/skill_selectors_public_test.go (85%)
 rename services/core/{internal/store => tests/integration}/skill_version_deletion_public_test.go (91%)
 rename services/core/{internal/store => tests/integration}/skill_version_deletion_test.go (99%)
 rename services/core/{internal/store => tests/integration}/skills_public_test.go (85%)
 rename services/core/{internal/store => tests/integration}/source_files_errors_public_test.go (98%)
 rename services/core/{internal/store => tests/integration}/steering_receipts_test.go (94%)
 rename services/core/{internal/store => tests/integration}/stream_authority_http_test.go (85%)
 rename services/core/{internal/store => tests/integration}/structured_output_dispatch_test.go (90%)
 rename services/core/{internal/store => tests/integration}/structured_output_native_test.go (87%)
 rename services/core/{internal/store => tests/integration}/subagent_dispatch_test.go (94%)
 rename services/core/{internal/store => tests/integration}/subagent_identities_test.go (99%)
 rename services/core/{internal/store => tests/integration}/subagent_native_outputs_test.go (99%)
 rename services/core/{internal/store => tests/integration}/subagent_resources_test.go (99%)
 rename services/core/{internal/store => tests/integration}/subagent_visibility_public_test.go (95%)
 rename services/core/{internal/store => tests/integration}/template_composition_public_test.go (94%)
 rename services/core/{internal/store => tests/integration}/template_null_selection_public_test.go (94%)
 rename services/core/{internal/store => tests/integration}/token_usage_integration_test.go (76%)
 rename services/core/{internal/store => tests/integration}/tool_policy_native_test.go (85%)
 rename services/core/{internal/store => tests/integration}/tool_search_native_test.go (87%)
 rename services/core/{internal/store => tests/integration}/turn_events_test.go (84%)
 rename services/core/{internal/store => tests/integration}/turn_journal_reads_test.go (99%)
 rename services/core/{internal/store => tests/integration}/unified_model_configuration_http_test.go (97%)
 rename services/core/{internal/store => tests/integration}/unstorable_text_public_test.go (96%)
 rename services/core/{internal/store => tests/integration}/vault_status_migration_test.go (99%)
 rename services/core/{internal/store => tests/integration}/vaults_fixture_test.go (97%)
 rename services/core/{internal/store => tests/integration}/whitespace_input_public_test.go (99%)
 rename services/core/{internal/store => tests/integration}/worker_capacity_test.go (94%)
 rename services/core/{internal/store => tests/integration}/worker_input_race_test.go (83%)
 rename services/core/{internal/store => tests/integration}/worker_lease_loss_test.go (89%)
 rename services/core/{internal/store => tests/integration}/worker_preparation_failure_test.go (78%)
 rename services/core/{internal/store => tests/integration}/worker_wakeup_test.go (93%)
 delete mode 100644 services/core/tests/official_environment_events.py

diff --git a/.github/workflows/api-acceptance.yml b/.github/workflows/api-acceptance.yml
index a90f1be0a..d4437a4c9 100644
--- a/.github/workflows/api-acceptance.yml
+++ b/.github/workflows/api-acceptance.yml
@@ -63,7 +63,7 @@ jobs:
           OAC_TEST_OFFICIAL_SDK_PYTHON: python
         run: |
           python services/core/tests/official_client.py
-          go test ./services/core/internal/store -run '^(TestFunctionStateOfficialClientReadsAndLiveEvents|TestSavedReferenceRetryOfficialClient|TestAgentUpdateOfficialClient|TestAgentDeletionOfficialClient|TestSessionAgentFilterOfficialClient|TestSessionDeletionOfficialClient|TestEnvironmentInitialFailureOfficialClient|TestSelfHostedInitialCreationOfficialClient|TestSelfHostedCancellationOfficialClient|TestSelfHostedFunctionsOfficialClient|TestSelfHostedSteeringOfficialClient)$' -count=1
+          go test ./services/core/tests/integration -run '^(TestFunctionStateOfficialClientReadsAndLiveEvents|TestSavedReferenceRetryOfficialClient|TestAgentUpdateOfficialClient|TestAgentDeletionOfficialClient|TestSessionAgentFilterOfficialClient|TestSessionDeletionOfficialClient|TestEnvironmentInitialFailureOfficialClient|TestSelfHostedInitialCreationOfficialClient|TestSelfHostedCancellationOfficialClient)$' -count=1
       - uses: ./.github/actions/e2b-provider
         if: inputs.container
       - name: Verify the distribution's Core image
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5aa1f5b01..151a0c410 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Verify names, documentation and CI selection invariants
         run: make check-names check-docs check-ci
 
-  # Parts run in parallel; the serial store integration package is split into deterministic shards.
+  # Parts run in parallel; the serial integration package is split into deterministic shards.
   backend:
     needs: plan
     if: needs.plan.result == 'success' && contains(fromJSON(needs.plan.outputs.jobs || '[]'), 'backend')
@@ -62,11 +62,11 @@ jobs:
         include:
           - part: runtime
           - part: core
-          - part: store
+          - part: integration
             shard: 1/3
-          - part: store
+          - part: integration
             shard: 2/3
-          - part: store
+          - part: integration
             shard: 3/3
     name: backend (${{ matrix.part }}${{ matrix.shard && format(' {0}', matrix.shard) || '' }})
     runs-on: ${{ vars.OAC_USE_GITHUB_RUNNERS == 'true' && 'ubuntu-22.04' || 'blacksmith-2vcpu-ubuntu-2204' }}
@@ -138,9 +138,9 @@ jobs:
       - name: Build standalone Core and test services and clients
         if: matrix.part == 'core'
         run: make build-core check-core-packages
-      - name: Test Core persistence shard ${{ matrix.shard }}
-        if: matrix.part == 'store'
-        run: make check-core-store OAC_CORE_STORE_SHARD=${{ matrix.shard }}
+      - name: Test Core integration shard ${{ matrix.shard }}
+        if: matrix.part == 'integration'
+        run: make check-core-integration OAC_CORE_INTEGRATION_SHARD=${{ matrix.shard }}
 
   distribution:
     needs: plan
diff --git a/Makefile b/Makefile
index c5c4f5907..03060591a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SQLC_VERSION ?= v1.29.0
 SQLC ?= go run github.com/sqlc-dev/sqlc/cmd/sqlc@$(SQLC_VERSION)
 SWAG_VERSION ?= v1.16.4
 
-.PHONY: help check check-database check-go check-sqlc sqlc-generate node-deps check-claude-sdk check-web check-mcode-harness build-daemon build-core check-core check-core-packages check-core-store docker-build-core check-core-container build-agents-runtime build-claude-runtime build-claude-sdk-runtime build-mcode-harness build-mcode-runtime
+.PHONY: help check check-database check-go check-sqlc sqlc-generate node-deps check-claude-sdk check-web check-mcode-harness build-daemon build-core check-core check-core-packages check-core-integration docker-build-core check-core-container build-agents-runtime build-claude-runtime build-claude-sdk-runtime build-mcode-harness build-mcode-runtime
 
 help:
 	@printf '%s\n' 'make build-core        Build standalone Core commands' 'make build-daemon      Build the execution daemon' 'make check             Run Core, persistence and runtime checks' 'See README.md for runtime prerequisites and deployment.'
@@ -64,23 +64,23 @@ build-daemon:
 build-core:
 	./scripts/build-core.sh
 
-CORE_STORE_PACKAGE := github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store
+CORE_INTEGRATION_PACKAGE := github.com/MiniMax-AI/OpenAgentCore/services/core/tests/integration
 
-check-core: override OAC_CORE_STORE_SHARD :=
-check-core: build-core check-core-packages check-core-store
+check-core: override OAC_CORE_INTEGRATION_SHARD :=
+check-core: build-core check-core-packages check-core-integration
 
-# Core, service and client tests except the serial store integration package.
+# Core, service and client tests except the serial integration package.
 check-core-packages:
 	@set -euo pipefail; packages=$$(go list ./services/core/... ./packages/agents-client/...); \
-	packages=$$(printf '%s\n' "$$packages" | grep -vxF '$(CORE_STORE_PACKAGE)'); \
+	packages=$$(printf '%s\n' "$$packages" | grep -vxF '$(CORE_INTEGRATION_PACKAGE)'); \
 	go test $$packages -count=1 -timeout=20m
 	PYTHONDONTWRITEBYTECODE=1 python3 -m unittest discover -s services/core/tests -p 'official_diagnostics_test.py'
 	PYTHONDONTWRITEBYTECODE=1 python3 services/core/deploy/e2b/managed_init_test.py
 
-# Store integration tests run serially and include bounded lifecycle waits that together exceed Go's 10m default.
-# OAC_CORE_STORE_SHARD=INDEX/TOTAL runs one deterministic partition; unset runs them all.
-check-core-store:
-	PYTHONDONTWRITEBYTECODE=1 python3 scripts/go-test-shard.py $(CORE_STORE_PACKAGE) $(or $(OAC_CORE_STORE_SHARD),1/1) -count=1 -timeout=20m
+# Integration tests run serially and include bounded lifecycle waits that together exceed Go's 10m default.
+# OAC_CORE_INTEGRATION_SHARD=INDEX/TOTAL runs one deterministic partition; unset runs them all.
+check-core-integration:
+	PYTHONDONTWRITEBYTECODE=1 python3 scripts/go-test-shard.py $(CORE_INTEGRATION_PACKAGE) $(or $(OAC_CORE_INTEGRATION_SHARD),1/1) -count=1 -timeout=20m
 
 # The distribution's Core image, without the native installer catalog.
 docker-build-core:
diff --git a/contracts/agents-api/harness-onboarding.md b/contracts/agents-api/harness-onboarding.md
index a48a8df59..c382061cf 100644
--- a/contracts/agents-api/harness-onboarding.md
+++ b/contracts/agents-api/harness-onboarding.md
@@ -196,7 +196,7 @@ An omitted or unknown policy, missing required callback, or callback paired with
 
 `engine.NewCatalog` validates every entry before publishing its immutable snapshot and panics with `engine.ErrInvalidDeclaration` for invalid static registrations. Kinds must be nonempty without surrounding whitespace. Placements must explicitly list at least one supported placement; MCP origins must be a non-nil list (an empty list qualifies none). Unknown or duplicate choices, origins without a corresponding placement and bearer support without an MCP origin are rejected. Errors identify authored fields without echoing declaration values. Future profile fields must be classified by the completeness validator and explicitly decided by every profile; there is no production default-filling constructor.
 
-Run the `engine` and `execution` tests for omission, policy, combination and error precedence coverage, and the public onboarding/store tests for admission and Runtime dispatch. Test fixtures use `engine/enginetest`, whose exhaustive literal also requires a decision when a field is added; it is not a production profile.
+Run the `engine` and `execution` tests for omission, policy, combination and error precedence coverage, and the public onboarding tests in `services/core/tests/integration` for admission and Runtime dispatch. Test fixtures use `engine/enginetest`, whose exhaustive literal also requires a decision when a field is added; it is not a production profile.
 
 `execution.Policy` supplies immutable service qualification to HTTP admission, Worker device selection and final dispatch. Custom composition gives the same Policy to `api.Dependencies.Policy` and the Core dispatcher's `Policy`. The zero value uses the built-in profiles; an explicitly empty catalog authorizes none. There is no mutable global registration.
 
@@ -218,7 +218,7 @@ Before starting, record the operation set, expected results, exclusions and stop
 4. **Regression.** Existing Harnesses keep working. Run targeted tests, then `make check`; run `make openapi` after API changes and `make sqlc-generate` after query changes.
 5. **Review.** Follow the [blind review workflow](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#review).
 
-| Operation | Test in `services/core/internal/store` | Options file variable, and Harness variable where the test takes one |
+| Operation | Test in `services/core/tests/integration` | Options file variable, and Harness variable where the test takes one |
 | --- | --- | --- |
 | Model provider protocols | `TestNativeModelProtocolPublicExecution` | [Model execution](./model-execution.md#acceptance) |
 | MiniMax Code text | `TestNativeMCodePublicExecution` | `OAC_TEST_MCODE_REAL_OPTIONS` |
diff --git a/contracts/agents-api/model-execution.md b/contracts/agents-api/model-execution.md
index 5be0513f1..38bc231b0 100644
--- a/contracts/agents-api/model-execution.md
+++ b/contracts/agents-api/model-execution.md
@@ -139,4 +139,4 @@ These are best-effort Core receipt times after the terminal commit, not provider
 
 ## Acceptance
 
-`TestNativeModelProtocolPublicExecution` (`services/core/internal/store/model_protocol_native_test.go`) with `services/core/tests/official_model_protocol_native.py` runs each Harness against real provider APIs through the pinned official client. It runs when `OAC_TEST_OFFICIAL_SDK_PYTHON`, `OAC_TEST_NATIVE_DAEMON_BIN`, `OAC_TEST_NATIVE_PROOF_DIR` and `OAC_TEST_MODEL_PROTOCOL_OPTIONS` are set; the last names a private model settings file. Never commit those settings or print their values.
+`TestNativeModelProtocolPublicExecution` (`services/core/tests/integration/model_protocol_native_test.go`) with `services/core/tests/official_model_protocol_native.py` runs each Harness against real provider APIs through the pinned official client. It runs when `OAC_TEST_OFFICIAL_SDK_PYTHON`, `OAC_TEST_NATIVE_DAEMON_BIN`, `OAC_TEST_NATIVE_PROOF_DIR` and `OAC_TEST_MODEL_PROTOCOL_OPTIONS` are set; the last names a private model settings file. Never commit those settings or print their values.
diff --git a/contracts/agents-api/zh/harness-onboarding.md b/contracts/agents-api/zh/harness-onboarding.md
index aa984be23..169fc2566 100644
--- a/contracts/agents-api/zh/harness-onboarding.md
+++ b/contracts/agents-api/zh/harness-onboarding.md
@@ -1,7 +1,7 @@
 ---
 title: "将原生 Harness 添加到 OpenAgentCore"
 source: contracts/agents-api/harness-onboarding.md
-source_hash: 526356d82bd6b69e0c848b570d4944cd4a5872f8bb85eee0fb99124da0f1b8bd
+source_hash: bcc38731520dd485fa91b3d897774da397a1a2ddfa866d1c01e1cc91e348bd97
 ---
 
 **Harness** 是一种运行模型和工具循环的原生代理引擎（Codex、Claude Code、MiniMax Code）。**Harness 适配器**将 Runtime 的 Executor 和 Turn 契约转换到该引擎的 SDK 或协议。本文档定义 Runtime–Harness 协议：适配器接口及其生命周期义务、注册、Core 资格认定和验收。[Harness capabilities](harness-capabilities.md) 记录了当前每个 Harness 支持的功能。
@@ -198,7 +198,7 @@ profile 是纯逻辑：它使用现有的公共类型和协议类型，声明受
 
 `engine.NewCatalog` 会在发布不可变快照之前验证每个条目，并对无效静态注册触发 `engine.ErrInvalidDeclaration` panic。Kind 必须非空且前后不得包含空白字符。放置方式必须显式列出至少一个受支持的放置方式；MCP 来源必须是非 nil 列表（空列表表示不认定任何来源合格）。未知或重复选项、没有对应放置方式的来源，以及没有 MCP 来源的 bearer 支持均会被拒绝。错误应标识已编写的字段，但不回显声明值。未来 profile 字段必须由完整性验证器分类，并由每个 profile 显式决定；不存在生产用默认填充构造函数。
 
-运行 `engine` 和 `execution` 测试以覆盖遗漏、策略、组合和错误优先级，并运行公共接入测试和存储测试以覆盖准入和 Runtime 调度。测试夹具使用 `engine/enginetest`，其穷尽式字面量在添加字段时也要求作出决定；它不是生产 profile。
+运行 `engine` 和 `execution` 测试以覆盖遗漏、策略、组合和错误优先级，并运行 `services/core/tests/integration` 中的公共接入测试以覆盖准入和 Runtime 调度。测试夹具使用 `engine/enginetest`，其穷尽式字面量在添加字段时也要求作出决定；它不是生产 profile。
 
 `execution.Policy` 向 HTTP 准入、Worker 设备选择和最终调度提供不可变服务资格认定。自定义组合将同一个 Policy 提供给 `api.Dependencies.Policy` 和 Core 调度器的 `Policy`。零值使用内置 profile；显式空目录不授权任何内容。不存在可变全局注册。
 
@@ -220,7 +220,7 @@ profile 是纯逻辑：它使用现有的公共类型和协议类型，声明受
 4. **回归。** 现有 Harness 必须继续正常工作。先运行定向测试，然后运行 `make check`；API 更改后运行 `make openapi`，查询更改后运行 `make sqlc-generate`。
 5. **审查。** 遵循 [blind review workflow](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#review)。
 
-| 操作 | `services/core/internal/store` 中的测试 | 选项文件变量；测试采用 Harness 变量时也列出该变量 |
+| 操作 | `services/core/tests/integration` 中的测试 | 选项文件变量；测试采用 Harness 变量时也列出该变量 |
 | --- | --- | --- |
 | 模型 Provider 协议 | `TestNativeModelProtocolPublicExecution` | [Model execution](model-execution.md#acceptance) |
 | MiniMax Code 文本 | `TestNativeMCodePublicExecution` | `OAC_TEST_MCODE_REAL_OPTIONS` |
diff --git a/contracts/agents-api/zh/model-execution.md b/contracts/agents-api/zh/model-execution.md
index 0b29d25a3..aa762e519 100644
--- a/contracts/agents-api/zh/model-execution.md
+++ b/contracts/agents-api/zh/model-execution.md
@@ -1,7 +1,7 @@
 ---
 title: "模型执行"
 source: contracts/agents-api/model-execution.md
-source_hash: d657e6189ebc5e55ed5201dceaa304b157a6b6ca1f45dcbe9756ef866d63ed05
+source_hash: b995996e38d7a1591d1db0a548a616f6c0ac687f36185a13e95cb52d2e2ff0c3
 ---
 
 每个 Session 都运行一个 Harness，并使用一个模型提供商。Core 通过三个固定版本上游协议未定义的 Core 扩展来选择它们：`x_agents_core.harness` 选择 Harness，`x_agents_core.model_provider` 提供端点和密钥，`x_agents_core.harness_config` 携带原生模型参数。Core 没有提供商目录、模型别名解析或产品权限模型；除 Session 和已保存 Agent 配置包外，唯一存储的配置包是每个 Harness 的一个 [deployment default](#deployment-defaults)。本文档定义 Harness—模型提供商协议：[`internal/modelprovider/config.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/modelprovider/config.go) 负责验证冻结的提供商连接，每个 Harness 则通过 [`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 声明其协议和原生参数。
@@ -141,4 +141,4 @@ Harness 和默认模型读取结果包含可空的 `last_used_at`、`last_error_
 
 ## 验收 {#acceptance}
 
-`TestNativeModelProtocolPublicExecution`（`services/core/internal/store/model_protocol_native_test.go`）结合 `services/core/tests/official_model_protocol_native.py`，通过固定版本的官方客户端针对真实提供商 API 运行每个 Harness。当 `OAC_TEST_OFFICIAL_SDK_PYTHON`、`OAC_TEST_NATIVE_DAEMON_BIN`、`OAC_TEST_NATIVE_PROOF_DIR` 和 `OAC_TEST_MODEL_PROTOCOL_OPTIONS` 均已设置时运行；最后一项指定一个私有模型设置文件。绝不提交这些设置或打印其值。
+`TestNativeModelProtocolPublicExecution`（`services/core/tests/integration/model_protocol_native_test.go`）结合 `services/core/tests/official_model_protocol_native.py`，通过固定版本的官方客户端针对真实提供商 API 运行每个 Harness。当 `OAC_TEST_OFFICIAL_SDK_PYTHON`、`OAC_TEST_NATIVE_DAEMON_BIN`、`OAC_TEST_NATIVE_PROOF_DIR` 和 `OAC_TEST_MODEL_PROTOCOL_OPTIONS` 均已设置时运行；最后一项指定一个私有模型设置文件。绝不提交这些设置或打印其值。
diff --git a/docs/development.md b/docs/development.md
index 5554518e9..68b2cffd7 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -66,7 +66,8 @@ For frontend development, run `pnpm dev:web` using the fixture or Core connectio
 | Location | Responsibility | Read next |
 | --- | --- | --- |
 | `services/core/internal/api` | Public, administrator and machine HTTP boundaries | [API index](./api/index.md) |
-| `services/core/internal/store` and `services/core/internal/db` | Core persistence, transactions, queries and migrations | [Service guide](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#database) |
+| `services/core/internal/persistence`, `services/core/internal/db` and `services/core/migrations` | Core's PostgreSQL adapters, transactions, queries and migrations | [Service guide](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#database) |
+| `services/core/tests/integration` | Tests that drive the HTTP boundaries, the execution Worker and the PostgreSQL adapters together | [Service guide](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#tests) |
 | `services/core/internal/execution` | Durable Turn dispatch and scheduling | [Runtime protocol](./runtime-protocol.md) |
 | `services/core/internal/engine` | Pure qualification of harness operations and placements | [Harness onboarding](../contracts/agents-api/harness-onboarding.md) |
 | `internal/agentdaemon/proto` | Core–Runtime wire types and validators | [Runtime protocol](./runtime-protocol.md) |
diff --git a/docs/maintainers.md b/docs/maintainers.md
index c7818da95..18fbde9b7 100644
--- a/docs/maintainers.md
+++ b/docs/maintainers.md
@@ -167,7 +167,7 @@ The planner compares the PR event's tested merge commit with its verified first
 | `hygiene` | Names, repository links, bundled documentation integrity, and CI planner/gate tests; runs for every change |
 | `distribution` | Harness catalog and installer schema, install/apply/recovery/cleanup tests, Compose parsing and initialization fixtures, release/download and bundle contracts, Go console tests and build; needs Docker Compose for template parsing, no pnpm install or browser |
 | `compose` | Real startup from empty volumes using images built from the checkout, sign-in and API access, file upload and node installer download, then URL reconfiguration and container recreation with preserved credentials and data; needs Docker, Go and network access, no model credentials |
-| `backend` | Parallel parts, each with a dedicated PostgreSQL guard: `runtime` (sqlc freshness, Runtime/shared Go tests, Linux microsandbox helper, daemon build), `core` (standalone Core build, Core service and client tests) and three `store` shards of the serial Core persistence integration package |
+| `backend` | Parallel parts, each with a dedicated PostgreSQL guard: `runtime` (sqlc freshness, Runtime/shared Go tests, Linux microsandbox helper, daemon build), `core` (standalone Core build, Core service and client tests) and three `integration` shards of the serial Core integration test package |
 | `harness` | Claude SDK tests and packaging, MiniMax companion scripts |
 | `example` | Optional application typecheck, tests, build and isolated browser acceptance |
 | `web` | TypeScript, Web/client tests and Web build |
@@ -202,7 +202,7 @@ python3 scripts/ci_plan.py plan --base origin/main --head HEAD
 make check-ci
 ```
 
-`make check` remains the full local entry point with an unsharded Web suite and an unsharded store package. `make check-web-unit` and `make check-web-acceptance OAC_WEB_TEST_SHARD=1/4` expose the Web parts; `make check-core-packages` and `make check-core-store OAC_CORE_STORE_SHARD=1/3` expose the Core parts, with store tests assigned to shards by a stable hash of their names. The selection tests cover mixed changes, shared consumers, renames/deletions, unknown inputs, shallow merge checkouts and failed/cancelled/missing results. For changes to the selection map, replay representative diffs for the affected rules. For workflow changes, run actionlint and validate the changed scheduling or partition behavior. Use real component runs only when needed to validate behavior affected by the change.
+`make check` remains the full local entry point with an unsharded Web suite and an unsharded Core integration test package. `make check-web-unit` and `make check-web-acceptance OAC_WEB_TEST_SHARD=1/4` expose the Web parts; `make check-core-packages` and `make check-core-integration OAC_CORE_INTEGRATION_SHARD=1/3` expose the Core parts, with integration tests assigned to shards by a stable hash of their names. The selection tests cover mixed changes, shared consumers, renames/deletions, unknown inputs, shallow merge checkouts and failed/cancelled/missing results. For changes to the selection map, replay representative diffs for the affected rules. For workflow changes, run actionlint and validate the changed scheduling or partition behavior. Use real component runs only when needed to validate behavior affected by the change.
 
 Measure completed runs with `python3 scripts/ci_metrics.py RUN_ID ...`. It reports the latest attempt's summed runner minutes, elapsed time and initial queue delay from that attempt's start, peak concurrent jobs, platform breakdown and job outcomes/failure fraction. Only jobs assigned a runner in that attempt contribute machine time and execution concurrency; jobs cancelled while queued retain their outcome and wall time. Earlier attempts are not included. Failed-job reruns can carry earlier successful results: their outcomes appear separately and their old execution time is excluded. A missing rerun start timestamp stops measurement because reused jobs cannot be separated reliably. Keep run/head/attempt identities with comparisons, and report cancellations and unfinished runs separately. Raw runner minutes are not billed minutes; use each platform's published conversion and allowance rules before estimating cost. A small successful sample is not a long-term failure-rate estimate. Scheduled full runs are outside this policy.
 
diff --git a/docs/zh/development.md b/docs/zh/development.md
index 4f262eb85..5e6008e97 100644
--- a/docs/zh/development.md
+++ b/docs/zh/development.md
@@ -1,7 +1,7 @@
 ---
 title: "开发 OpenAgentCore"
 source: docs/development.md
-source_hash: b7025e9b2072924c33656e0319363cf3564593bb1e2506a891be5be251087c11
+source_hash: ddc74c5f4b9766690c0ed35743d391cadd8025c1842ba279ab5f990b6b6980ce
 ---
 
 准备工作副本，构建组件并验证修改。如需使用已安装的实例，从[入门指南](getting-started/index.md)开始。修改代码前阅读[贡献者规则](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md)。
@@ -68,7 +68,8 @@ Core 构建产物和输出目录设置见[独立 Core 构建](maintainers.md#sta
 | 位置 | 职责 | 后续阅读 |
 | --- | --- | --- |
 | `services/core/internal/api` | 公开、管理员与机器 HTTP 边界 | [API 索引](api/index.md) |
-| `services/core/internal/store` 和 `services/core/internal/db` | Core 持久化、事务、查询和迁移 | [服务指南](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#database) |
+| `services/core/internal/persistence`、`services/core/internal/db` 和 `services/core/migrations` | Core 的 PostgreSQL adapter、事务、查询和迁移 | [服务指南](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#database) |
+| `services/core/tests/integration` | 共同驱动 HTTP 边界、执行 Worker 和 PostgreSQL adapter 的测试 | [服务指南](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#tests) |
 | `services/core/internal/execution` | 持久化 Turn 分发与调度 | [Runtime 协议](runtime-protocol.md) |
 | `services/core/internal/engine` | 对 harness 操作与执行位置进行纯资格验证 | [Harness 接入](../../contracts/agents-api/zh/harness-onboarding.md) |
 | `internal/agentdaemon/proto` | Core–Runtime wire 类型与验证器 | [Runtime 协议](runtime-protocol.md) |
diff --git a/docs/zh/maintainers.md b/docs/zh/maintainers.md
index e2af80adb..afb79b2fa 100644
--- a/docs/zh/maintainers.md
+++ b/docs/zh/maintainers.md
@@ -1,7 +1,7 @@
 ---
 title: "构建并发布 OpenAgentCore"
 source: docs/maintainers.md
-source_hash: c7a280c8367f0b86b4ccc4eeb3e3ee203519804ef5e0a09f874a71b0e78ac6be
+source_hash: cfab5d1ad336c809b2b27bc870b02934f54184f3778e2c5d770a945c6830e097
 ---
 
 本指南面向负责构建和发布 OpenAgentCore 的维护者。要安装 Core 和 Web，请使用 [安装指南](getting-started/install.md)。安装器代码遵循的规则见 [部署](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/README.md) 和 [节点安装器](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/node/README.md)；必需检查见 [CONTRIBUTING](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#required-checks)。
@@ -169,7 +169,7 @@ gh workflow run core-release --repo MiniMax-AI/OpenAgentCore --ref main \
 | `hygiene` | 名称、仓库链接、随包文档完整性以及 CI 计划器/门禁测试；每次变更都会运行 |
 | `distribution` | Harness 目录和安装器模式、安装/应用/恢复/清理测试、Compose 解析和初始化固定数据、发布/下载和捆绑包契约、Go 控制台测试与构建；模板解析需要 Docker Compose，不需要 pnpm install 或浏览器 |
 | `compose` | 使用从当前检出构建的镜像从空数据卷实际启动、登录和 API 访问、上传文件和下载节点安装器，然后在保留凭据和数据的同时重新配置 URL 并重新创建容器；需要 Docker、Go 和网络访问，不需要模型凭据 |
-| `backend` | 并行部分，每部分都有专用 PostgreSQL 保护检查：`runtime`（sqlc 新鲜度、Runtime/共享 Go 测试、Linux microsandbox 辅助程序、守护进程构建）、`core`（独立 Core 构建、Core 服务和客户端测试），以及串行 Core 持久化集成包的三个 `store` 分片 |
+| `backend` | 并行部分，每部分都有专用 PostgreSQL 保护检查：`runtime`（sqlc 新鲜度、Runtime/共享 Go 测试、Linux microsandbox 辅助程序、守护进程构建）、`core`（独立 Core 构建、Core 服务和客户端测试），以及串行 Core 集成测试包的三个 `integration` 分片 |
 | `harness` | Claude SDK 测试和打包、MiniMax 配套脚本 |
 | `example` | 可选的应用程序类型检查、测试、构建和隔离的浏览器验收 |
 | `web` | TypeScript、Web/客户端测试和 Web 构建 |
@@ -204,7 +204,7 @@ python3 scripts/ci_plan.py plan --base origin/main --head HEAD
 make check-ci
 ```
 
-`make check` 仍是完整的本地入口，使用未分片的 Web 测试套件和未分片的 store 软件包。`make check-web-unit` 和 `make check-web-acceptance OAC_WEB_TEST_SHARD=1/4` 用于分别运行 Web 部分；`make check-core-packages` 和 `make check-core-store OAC_CORE_STORE_SHARD=1/3` 用于分别运行 Core 部分，其中 store 测试按名称的稳定哈希分配到分片。选择测试涵盖混合变更、共享使用方、重命名/删除、未知输入、浅合并检出以及失败/取消/缺失结果。对于选择映射的更改，请针对受影响的规则重放具有代表性的差异。对于工作流更改，请运行 actionlint，并验证更改后的调度或分区行为。仅在需要验证受变更影响的行为时，才运行真实组件测试。
+`make check` 仍是完整的本地入口，使用未分片的 Web 测试套件和未分片的 Core 集成测试包。`make check-web-unit` 和 `make check-web-acceptance OAC_WEB_TEST_SHARD=1/4` 用于分别运行 Web 部分；`make check-core-packages` 和 `make check-core-integration OAC_CORE_INTEGRATION_SHARD=1/3` 用于分别运行 Core 部分，其中集成测试按名称的稳定哈希分配到分片。选择测试涵盖混合变更、共享使用方、重命名/删除、未知输入、浅合并检出以及失败/取消/缺失结果。对于选择映射的更改，请针对受影响的规则重放具有代表性的差异。对于工作流更改，请运行 actionlint，并验证更改后的调度或分区行为。仅在需要验证受变更影响的行为时，才运行真实组件测试。
 
 使用 `python3 scripts/ci_metrics.py RUN_ID ...` 衡量已完成的运行。它会报告最近一次尝试的运行器分钟数总和、耗时、从该次尝试开始计算的初始排队延迟、并发作业峰值、平台明细以及作业结果/失败比例。只有在该次尝试中被分配了运行器的作业才计入机器时间和执行并发；排队期间被取消的作业仍保留其结果和实际耗时。更早的尝试不计入其中。失败作业的重新运行可能沿用更早的成功结果：这些结果会单独显示，且其原有执行时间会被排除。如果缺少重新运行的开始时间戳，测量会停止，因为无法可靠区分复用的作业。比较时应保留 run/head/attempt 标识，并分别报告取消和未完成的运行。原始运行器分钟数并非计费分钟数；估算成本前，应使用各平台公布的转换和配额规则。较小的成功样本不能作为长期失败率估计。定时完整运行不在此策略范围内。
 
diff --git a/scripts/ci_plan_test.py b/scripts/ci_plan_test.py
index 361bf7e5f..23def3412 100644
--- a/scripts/ci_plan_test.py
+++ b/scripts/ci_plan_test.py
@@ -30,7 +30,7 @@ def test_compose_inputs_select_live_and_fixture_checks_without_image_builds(self
 
     def test_web_and_core_have_different_consumers(self):
         self.assertEqual(self.jobs("apps/web/src/app.tsx"), {"hygiene", "web", "web-acceptance"})
-        plan = ci.select(["services/core/internal/store/sessions.go"])
+        plan = ci.select(["services/core/internal/persistence/postgres/sessionpg/creation.go"])
         self.assertEqual(set(plan["jobs"]), {"hygiene", "backend", "api", "compose"})
         self.assertFalse(plan["image"])
 
@@ -151,7 +151,7 @@ def test_ci_tests_and_metrics_do_not_trigger_product_checks(self):
             self.assertEqual(self.jobs(path), {"hygiene"})
 
     def test_workflow_and_code_changes_accumulate(self):
-        self.assertEqual(self.jobs(".github/workflows/ci-review.yml", "services/core/internal/store/sessions.go"),
+        self.assertEqual(self.jobs(".github/workflows/ci-review.yml", "services/core/internal/persistence/postgres/sessionpg/creation.go"),
                          {"hygiene", "lint", "backend", "api", "compose"})
         self.assertEqual(self.jobs(".github/workflows/native.yml", "apps/web/src/app.tsx"),
                          {"hygiene", "lint", "native", "web", "web-acceptance"})
diff --git a/scripts/ci_shard_test.py b/scripts/ci_shard_test.py
index d526c493a..9a0ed328e 100644
--- a/scripts/ci_shard_test.py
+++ b/scripts/ci_shard_test.py
@@ -67,5 +67,5 @@ def test_invalid_partition_fails_before_running_go(self):
 
     def test_full_core_gate_ignores_shard_override(self):
         root = Path(__file__).resolve().parents[1]
-        result = subprocess.check_output(["make", "-n", "check-core", "OAC_CORE_STORE_SHARD=2/3"], cwd=root, text=True)
+        result = subprocess.check_output(["make", "-n", "check-core", "OAC_CORE_INTEGRATION_SHARD=2/3"], cwd=root, text=True)
         self.assertRegex(result, r"go-test-shard.py \S+ 1/1 ")
diff --git a/scripts/name-allowlist.json b/scripts/name-allowlist.json
index 02cfe794b..2468c8388 100644
--- a/scripts/name-allowlist.json
+++ b/scripts/name-allowlist.json
@@ -120,27 +120,27 @@
     "reason": "AgentStateKey is a persisted daemon/native-session resume identity carried on the existing machine wire contract; changing it would select another session."
   },
   {
-    "path": "services/core/internal/store/dispatch_test.go",
+    "path": "services/core/tests/integration/dispatch_test.go",
     "regex": "\"agents-api-(?:session)?\"",
     "reason": "AgentStateKey is a persisted daemon/native-session resume identity carried on the existing machine wire contract; changing it would select another session."
   },
   {
-    "path": "services/core/internal/store/environment_directory_test.go",
+    "path": "services/core/tests/integration/environment_directory_test.go",
     "regex": "\"agents-api-(?:session)?\"",
     "reason": "AgentStateKey is a persisted daemon/native-session resume identity carried on the existing machine wire contract; changing it would select another session."
   },
   {
-    "path": "services/core/internal/store/environment_worker_helpers_test.go",
+    "path": "services/core/tests/integration/environment_worker_helpers_test.go",
     "regex": "\"agents-api-(?:session)?\"",
     "reason": "AgentStateKey is a persisted daemon/native-session resume identity carried on the existing machine wire contract; changing it would select another session."
   },
   {
-    "path": "services/core/internal/store/environment_worker_test.go",
+    "path": "services/core/tests/integration/environment_worker_test.go",
     "regex": "\"agents-api-(?:session)?\"",
     "reason": "AgentStateKey is a persisted daemon/native-session resume identity carried on the existing machine wire contract; changing it would select another session."
   },
   {
-    "path": "services/core/internal/store/oac_runtime_names_migration_test.go",
+    "path": "services/core/tests/integration/oac_runtime_names_migration_test.go",
     "regex": "parsar-core-runtime@sha256:|parsar_worker /home/runtime/\\.parsar",
     "reason": "Migration input and historical Session content assertions prove only the Runtime reference changes, never stored conversation data."
   },
diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 3ecbdfcf6..e80ea729c 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -4,9 +4,11 @@ These are the code-level rules of `services/core` that no contract states. Contr
 
 ## Layering
 
+The domain packages own their vocabulary, pure rules and use cases: the domain owners listed below, `items`, `adminaudit`, `writeaudit`, and the shared vocabulary packages `environmentconfig`, `metadata` and `jsonobject`. No `internal` package except `persistence` and `db` imports an `internal/persistence`, `internal/db` or pgx package: they reach storage only through interfaces that the PostgreSQL adapters under `internal/persistence/postgres` implement and the commands under `cmd/` wire in. `TestLayering` in `cmd/server` checks these imports.
+
 `api.NewHandler` takes one `api.Dependencies` value, built only in `cmd/server`. Each application area is one field typed as an interface declared in `api` beside its handlers, listing exactly the methods they call. Every field is required and `NewHandler` rejects a missing one, except the optional groups whose comments say what nil means: `Execution` is nil without an execution Worker, `Sandboxes` is nil without a managed sandbox installation and requires `Execution`, and `Execution.NativeInstaller` is nil for a build without a source revision. Handlers never discover a capability by type assertion or fall back to another implementation. API tests use one strict fake per area, `fake<Area>`, which fails the test on any call the test did not set.
 
-`internal/persistence/postgres/pgunit` owns the PostgreSQL mechanics that adapters share: pooled read-write and snapshot transactions; pool-bound queries, used only for a single-statement read that needs no transaction, such as the per-request key lookup; the execution lease (its dedicated connection and gate, the ownership check, the cancellation fence, close, and the execution deadline); identifier parsing (`ParseID`, `PathID`, `LookupCursor`); and detection of text PostgreSQL cannot store (`IsUnstorableText`). Persistence code runs every transaction through it. Outside `persistence` and `store`, only `cmd/server`, which acquires the lease and builds the adapters' pool, `runtimehistory/postgresreader`, which stores Runtime history in Core's database, and test fixtures import it. `internal/persistence/postgres/pgtest` is test support: it opens the dedicated test database under the `oac_*_tests` guard, applies the migrations, and creates isolated databases for database-wide state such as the execution lease. Only test files import it.
+`internal/persistence/postgres/pgunit` owns the PostgreSQL mechanics that adapters share: pooled read-write and snapshot transactions; pool-bound queries, used only for a single-statement read that needs no transaction, such as the per-request key lookup; the execution lease (its dedicated connection and gate, the ownership check, the cancellation fence, close, and the execution deadline); identifier parsing (`ParseID`, `PathID`, `LookupCursor`); and detection of text PostgreSQL cannot store (`IsUnstorableText`). Persistence code runs every transaction through it. Outside `persistence`, only the commands under `cmd/`, which build the adapters' pool, and test fixtures import it; `cmd/server` also acquires the lease. `internal/persistence/postgres/pgtest` is test support: it opens the dedicated test database under the `oac_*_tests` guard, applies the migrations, and creates isolated databases for database-wide state such as the execution lease. Only test files import it.
 
 `internal/persistence/postgres/auditpg` is the one adapter that other adapters call directly. Audit rows are written inside the business transaction, so each adapter calls `RecordWriteAudit`, `RecordAdminMutation` or `RecordDeploymentMutation` with its own transaction's queries; the audit provenance travels in the context. `writeaudit` and `adminaudit` own the sources, their validation, `ErrInvalidSource` and the read models, and `auditpg.Store` serves the audit reads.
 
@@ -14,15 +16,15 @@ The adapter that stores a secret seals and opens it with the credential key `cmd
 
 Two errors are shared across domains, each with one `api` helper: `textvalue.ErrUnstorable` (400, `writeTextValueError`) for text PostgreSQL cannot store, and `credentialcrypto.ErrUnavailable` (503, `writeCredentialUnavailableError`) for a missing credential key. The audit `ErrInvalidSource` errors pass through adapters unchanged, and `writeAuditSourceError` maps both to 400. Each handler maps its operation's errors through that domain's mapper; Session operations that also meet the sandbox deployment, namely creation, input admission, archive and Runtime observation, map through `writeOperationError`, which tries `writeSandboxError` and then `writeSessionsError`.
 
-Shared vocabulary has one owner each, and domains use it rather than copy it. `internal/environmentconfig` owns Environment setup, Skills, Plugins and initial files with their validation and public metadata; `Setup.Validate` checks requested configuration, where a Skill may be an unresolved reference, and `Setup.ValidateInstalled` checks frozen, installable configuration. `internal/skills` owns `ParseVersion`, the canonical positive decimal Skill version. `internal/metadata` owns the metadata rules: `Validate` for the pair, key and value limits and U+0000, `ValidateStorable` for U+0000 alone, and `Encode` with its 64 KiB bound. `internal/jsonobject` owns `Normalize`, the stable encoding of stored JSON objects that snapshots and retry identities compare. These packages import no persistence.
+Shared vocabulary has one owner each, and domains use it rather than copy it. `internal/environmentconfig` owns Environment setup, Skills, Plugins and initial files with their validation and public metadata; `Setup.Validate` checks requested configuration, where a Skill may be an unresolved reference, and `Setup.ValidateInstalled` checks frozen, installable configuration. `internal/skills` owns `ParseVersion`, the canonical positive decimal Skill version. `internal/metadata` owns the metadata rules: `Validate` for the pair, key and value limits and U+0000, `ValidateStorable` for U+0000 alone, and `Encode` with its 64 KiB bound. `internal/jsonobject` owns `Normalize`, the stable encoding of stored JSON objects that snapshots and retry identities compare.
 
-`internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitInputs` admits a validated input batch in order, each input steering the active Turn, starting a Turn, requesting a cancellation or joining a function result to its call's Turn, `AdmitFunctionResult` saves a submitted function result for its Turn's call, `LoadRequiredActions` lists the calls a Turn waits on, and `TransitionTurn` moves a root Turn's status as its current status allows and settles a Turn that ends. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call and Turn operation loads the Turn in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. Neither imports persistence. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
+`internal/sessions` owns the Session vocabulary: Sessions, Turns, inputs, Environments and their provisioning failures, function calls, Item and Artifact reads, executor credentials, and the errors Session operations return, which `api` maps in `writeSessionsError`. It also owns the Session change vocabulary and its decisions: the public changes that report Turn and Session transitions, what a Turn that ends settles, measured Turn usage and the Session activity a change reports. Sequences that several Session operations share are `sessions` procedures, each over the transaction interface it declares: `CancelTurn` and `CancelWork` cancel work, `TrackInputActivity` reports the input activity a write changes, `FailEnvironment` and `TerminateEnvironment` settle an Environment that failed or whose managed compute ended, `CreateEnvironmentDevice` creates and binds a hosted Environment's dedicated Runtime device, `CheckComputeAdmission`, `CheckFileWriteGate` and `CheckInputStart` gate new work, `AdmitInputs` admits a validated input batch in order, each input steering the active Turn, starting a Turn, requesting a cancellation or joining a function result to its call's Turn, `AdmitFunctionResult` saves a submitted function result for its Turn's call, `LoadRequiredActions` lists the calls a Turn waits on, and `TransitionTurn` moves a root Turn's status as its current status allows and settles a Turn that ends. `AppendTurnEvents` records a batch of a Turn's execution observations, which `NewJournalBatch` validates, and `AppendTurnEvent` records its terminal outcome; both project the new entries. `ProjectSource` projects one journal entry or admitted input into Items, the root Turn's usage and Subagents, and `ProjectInput` projects an admitted input. `ValidTransition` decides the Turn status transitions, and the Subagent projection decides each Subagent's identity, lifecycle, child Turn and child Item changes. `sessions.ExecutionOperations` runs the Session writes only the execution owner makes; each function-call and Turn operation loads the Turn in one leased Session transaction, decides in `sessions`, then applies in `sessionpg`, and `AppendTurnEvents` records and projects a Turn's journal batch in one leased Session transaction. `internal/items` owns public Items: it projects observations, merges them into stored Items and builds the ordered events that report each Item change. `internal/persistence/postgres/sessionpg` loads the facts those decisions read and applies them inside the caller's Session transaction, under the Session lock: it allocates event sequence positions, event IDs, Item positions, output indexes and Subagent IDs, writes the change journal, each Turn's execution journal and its counters, Items, Turn usage, Subagent bindings, child Turns and child Items, and Artifact settlement, and prunes the change journal. It decides nothing. `WithSession` runs a Session operation's transaction on the pool or the lease: it locks the Session, applies the operation, then prunes the change journal. `BindSession` binds one Session to a transaction's queries as a `SessionTx`, which implements the procedures' interfaces.
 
 Other adapters call only these `sessionpg` participants, on their own transaction's queries: `LockSession`, which orders a write against the Session's Turns; `BindSession`, which runs a Session procedure, such as `CreateEnvironmentDevice` or `TransitionTurn`, in that transaction; and `LoadEnvironment`, which reads the tenant's Environment of a live Session. In turn, Session creation's transaction in `sessionpg` calls the `placementpg`, `skillpg` and `filepg` participants and `auditpg.RecordWriteAudit` on its own queries. `tests/fixtures` is test tooling that composes procedures over a pooled `WithSession`, which is why `WithSession` stays exported; no production code may do this. `deploymentpg` may import `sessionpg`, and `sessionpg` never imports `deploymentpg`; `placementpg`, which loads the placement facts and reserves placements, sits below both, so either may call it and it imports neither. Likewise `deployment` may compose the `sessions` procedures, and `sessions` never imports `deployment`.
 
-`store` is transitional: it holds only integration tests, which build their fixtures from the domain services. Adapters' execution repositories require a `*pgunit.Lease` at construction, and their public repositories expose no execution operation.
+Adapters' execution repositories require a `*pgunit.Lease` at construction, and their public repositories expose no execution operation.
 
-`cmd/server` owns the execution lease. It acquires one `pgunit.Lease`, builds every lease-bound adapter on it, and passes the lease and those adapters together as one `execution.Owner` to `execution.StartWorker`, which binds the Dispatcher to the Owner's execution operations through `Dispatcher.Bind`. If anything fails before that call, `cmd/server` closes the lease. From that call the Worker owns cleanup: a failed start closes the lease before it returns, and a started Worker closes it after `Run` has cancelled and drained its work. Each close runs under its own bounded deadline, independent of the cancelled request or run. Lease-bound adapters borrow the lease and never close it, and the Worker uses the lease only through `Owner.Lease`, never through an adapter. Store integration tests start the Worker the same way through `startWorker`, and bind a Dispatcher that runs Turns without a Worker through `Dispatcher.Bind`.
+`cmd/server` owns the execution lease. It acquires one `pgunit.Lease`, builds every lease-bound adapter on it, and passes the lease and those adapters together as one `execution.Owner` to `execution.StartWorker`, which binds the Dispatcher to the Owner's execution operations through `Dispatcher.Bind`. If anything fails before that call, `cmd/server` closes the lease. From that call the Worker owns cleanup: a failed start closes the lease before it returns, and a started Worker closes it after `Run` has cancelled and drained its work. Each close runs under its own bounded deadline, independent of the cancelled request or run. Lease-bound adapters borrow the lease and never close it, and the Worker uses the lease only through `Owner.Lease`, never through an adapter. Integration tests start the Worker the same way through `startWorker`, and bind a Dispatcher that runs Turns without a Worker through `Dispatcher.Bind`.
 
 Domain owners, each with its PostgreSQL adapter under `internal/persistence/postgres`:
 
@@ -35,7 +37,7 @@ Domain owners, each with its PostgreSQL adapter under `internal/persistence/post
 - `skills` (`skillpg`): Skills and their immutable versions: archive checks, the default and latest pointers, version selection and deletion, and each version's sealed archive. Session creation freezes selected versions inside its own transaction: `skillpg.LockSkills` locks the selected Skills in ID order, `skillpg.ReadVersionForFreeze` opens and verifies a version, and `sessions` selects each version with the `skills` rules.
 - `deployment` and its subpackage `deployment/placement` (`deploymentpg`, `placementpg`): the sandbox deployment and its nodes: provider configuration and the sealed credential, the specification and retained generations, setup, update and switch, node enrollment, identity and authentication, generation configuration, capacity, presence, status, host history, reset, and the counts of nodes and sandboxes bound to the public address; and hosted runtime allocations: reservation with the dedicated device, compute ownership and settlement, observation diagnostics, activity, compute phases, wake receipts and cleanup, with the reads that schedule, discover and authorize them. It interprets Sandbox Provider declarations through the `providers.Registry` it is given, whose lookups return typed errors. `cmd/server` builds that registry and calls it only to build a direct Provider and to discover a Provider's configuration; it takes each setup's mode and declared operations from the `Setup` that `deployment` returns. `deployment/placement` owns hosted admission and placement: `cmd/server` builds one `placement.Rules` from the registry and the public URL, both fixed while Core runs, and gives it to `deployment.Service` and `sessions.Service`; its pure decisions admit a hosted Session, choose its node, and admit an allocation's reserved node and a restore on it, and its errors keep one status, code and message through `writeSandboxError`. `placementpg` loads the facts those decisions read and applies them on the caller's transaction-bound queries; it has no Store or transaction runner. The only other caller is Session creation: `sessions` decides admission and placement with those rules over the `placementpg` participants inside the creation transaction. Deployment changes and allocation writes run through `deployment.ExecutionOperations` on `deploymentpg.NewExecution(lease, …)`, which the Worker receives as `execution.Owner.Deployment`. Each allocation write locks the owning Session, decides in `deployment`, applies in `deploymentpg` and prunes the Session's change journal in the same leased transaction; cleanup settles the Session through the `sessions` procedures on a `sessionpg.SessionTx` bound to that transaction. The Worker reads the deployment, prepares a selection's setup and records live-compute activity through the pooled `deployment.Service` in `execution.Dispatcher.Deployment`, and lists the Sessions a reset still has to archive, schedules node lifecycles and reads allocations through the pooled `deployment.Reader` in `execution.Dispatcher.DeploymentReader`; a pooled read carries no lease, and the leased write that follows it rechecks the allocation's owner. Node management and reads use the pooled `deploymentpg.Store`, which `cmd/server` also reads the owner epoch from and runs the host-history sampler on. Provider calls run outside transactions, and the final transaction rechecks the expected generation. Session archive crosses the Session and the deployment, so it is a `deployment.ExecutionOperations` operation: `ArchiveSession`, which the administrator's archive route calls through `api.Execution.SessionArchive`, and `ArchiveResetSession`, which a reset calls, lock the Session through `deploymentpg`'s `WithSessionArchive`, check the deployment's generation and the running reset in `deployment`, then expire the Environment and cancel its work through the `sessions` procedures, revoke the allocation's device and request its cleanup, and record the audit entry in one leased transaction. `deployment.ObservationResolver` resolves a Session's Runtime observation target for `runtimeobs` from `sessions.SessionReader` and `deployment.Reader`.
 - `coremetrics` (`coremetricspg`): the Core metrics PostgreSQL holds: the root Turn queue counts, the root Turn history, read from one read-only snapshot, and the database size. `cmd/server`'s Core metrics source adds them to the process, pool, Worker and daemon registry measurements.
-- `runtimehistory` (`runtimehistory/postgresreader`, outside this directory): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples. `runtimehistory.Service` scopes a read to the Session's hosted Environment through `sessions.EnvironmentReader`.
+- `runtimehistory` (`runtimehistorypg`): Runtime history samples: the periodic export, scoped reads and retention, which also prunes node-host samples. `runtimehistory.Service` scopes a read to the Session's hosted Environment through `sessions.EnvironmentReader`.
 - `sessions` (`sessionpg`): Session use cases and reads. The pooled `sessions.Service` runs the use cases on `sessionpg.Store`, which implements `sessions.Storage`, and plain reads use `sessions.Reader`, which `sessionpg.Store` also implements, directly. These cover Sessions (their creation, reads, the change journal and stream snapshot, diagnostics, the frozen execution configuration, measured usage and archive state, metadata updates, deletion and the public write audit), Turns (their reads and the execution work scan), input admission (a public input batch, Environment input reservation and the expiry of one reservation, with the reads of a Turn's admitted inputs, a reservation and the Environment input work scan), the model provider a Session froze, which `sessionpg.Store` opens with the credential key, root Items and Subagents (their reads), Session Artifacts (their reads, deletion and the staging of a Turn's export), Environments (their reads, the initialization list and the frozen setup and initial files, which `sessionpg.Store` opens with the credential key), devices (their reads, which include a Session's execution binding and the execution device list, their creation, revocation, heartbeats and Runtime enrollment, and the archived cancellation receipt the daemon gateway reads), the administrator's views across Projects (a Project's asset counts and Sessions for the summary, and the Sessions whose Runtime the administrator observes), executor credentials (authentication and a Project's credential state through `sessions.ExecutorCredentialReader`, and issuance, rotation and revocation; the Core-key Project operations record their audit entry in the same transaction) and native installation authorization and claims, whose tokens `sessionpg.Store` signs with the credential key. Session creation runs in one pooled `sessions.CreationTx`: `sessions` validates the request, computes its retry identity, with the provider key fingerprinted by `sessionpg.Store` under the credential key, and orders the upsert, hosted admission, the Skill freeze, the sealed model provider, execution configuration, initial files and setup, the Environment, placement and the initial input; `FindSessionCreation` finds an earlier creation by its recorded intent. `cmd/server` builds one `sessionpg.Store` with the credential key and the Service with its `placement.Rules`, and wires the Service and the Store into `execution.Dispatcher.Sessions` and `SessionsReader`, into the api fields, into Runtime enrollment and into the daemon gateway; the Worker creates Sessions through the Service after its execution checks, waking the scheduler only after the commit, and stages Artifacts through it; `cmd/environment-key` builds one without the key, and the Service without placement rules, for its credential commands. Turn transitions, execution completion, which alone publishes or discards a Turn's staged Artifacts, the start of Artifact capture, function calls and their application receipts, the Turn execution journal, Environment initialization, connection observations and their reconciliation, Session device binding, file-write reservation and settlement, and the promotion, failure and bulk expiry of Environment input reservations run through `sessions.ExecutionOperations` on `sessionpg.NewExecution(lease)`, which the Worker receives as `execution.Owner.Sessions`.
 
 ## Request handling
diff --git a/services/core/README.md b/services/core/README.md
index 1d00541d2..424600be8 100644
--- a/services/core/README.md
+++ b/services/core/README.md
@@ -44,7 +44,7 @@ Core uses its own PostgreSQL database and account and shares no tables with an a
 
 ## Tests
 
-`make check-core` builds Core and runs the Go tests of `services/core` and `packages/agents-client`. Point `OAC_TEST_DATABASE_URL` at a dedicated database named `oac_*_tests` that holds no other tables; the tests apply only Core's migrations and use fresh tenants without truncating anything. Without it, database tests skip locally; CI provides its own PostgreSQL. Set `OAC_TEST_OFFICIAL_SDK_PYTHON` to the interpreter with the pinned SDK for the store's client fixtures. [Validate a change](../../docs/development.md#validate-a-change) lists the focused checks for other areas.
+`make check-core` builds Core and runs the Go tests of `services/core` and `packages/agents-client`. Point `OAC_TEST_DATABASE_URL` at a dedicated database named `oac_*_tests` that holds no other tables; the tests apply only Core's migrations and use fresh tenants without truncating anything. Without it, database tests skip locally; CI provides its own PostgreSQL. Set `OAC_TEST_OFFICIAL_SDK_PYTHON` to the interpreter with the pinned SDK for the official-client tests in `tests/integration`. [Validate a change](../../docs/development.md#validate-a-change) lists the focused checks for other areas.
 
 ### Official client verification
 
diff --git a/services/core/cmd/server/layering_test.go b/services/core/cmd/server/layering_test.go
new file mode 100644
index 000000000..4818f17e7
--- /dev/null
+++ b/services/core/cmd/server/layering_test.go
@@ -0,0 +1,53 @@
+package main
+
+import (
+	"go/parser"
+	"go/token"
+	"io/fs"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"testing"
+)
+
+// TestLayering checks the import rule of IMPLEMENTATION.md "Layering": outside
+// internal/persistence and internal/db, no non-test file imports a persistence
+// package, generated query or PostgreSQL driver.
+func TestLayering(t *testing.T) {
+	const root = "../../internal"
+	const internal = "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/"
+	forbidden := []string{internal + "persistence", internal + "db", "github.com/jackc/pgx"}
+	err := filepath.WalkDir(root, func(path string, entry fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if entry.IsDir() {
+			if entry.Name() == "testdata" || path == filepath.Join(root, "persistence") || path == filepath.Join(root, "db") {
+				return filepath.SkipDir
+			}
+			return nil
+		}
+		if !strings.HasSuffix(path, ".go") || strings.HasSuffix(path, "_test.go") {
+			return nil
+		}
+		file, err := parser.ParseFile(token.NewFileSet(), path, nil, parser.ImportsOnly)
+		if err != nil {
+			return err
+		}
+		for _, spec := range file.Imports {
+			imported, err := strconv.Unquote(spec.Path.Value)
+			if err != nil {
+				return err
+			}
+			for _, prefix := range forbidden {
+				if imported == prefix || strings.HasPrefix(imported, prefix+"/") {
+					t.Errorf("%s imports %s", path, imported)
+				}
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/services/core/cmd/server/runtime_history.go b/services/core/cmd/server/runtime_history.go
index 3ce6bf015..11213fa2e 100644
--- a/services/core/cmd/server/runtime_history.go
+++ b/services/core/cmd/server/runtime_history.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/runtimehistorypg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory/postgresreader"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs/otlpexporter"
 	"golang.org/x/net/http/httpguts"
@@ -70,7 +70,7 @@ func runtimeHistory(ctx context.Context, units *pgunit.Pool, executionEnabled bo
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory, runtimehistory.MetricTokens},
 	}
 	timeout := time.Duration(config.TimeoutSeconds) * time.Second
-	backend, err := postgresreader.New(units, postgresreader.Config{Capabilities: capabilities, QueryTimeout: timeout})
+	backend, err := runtimehistorypg.New(units, runtimehistorypg.Config{Capabilities: capabilities, QueryTimeout: timeout})
 	if err != nil {
 		return runtimeHistorySetup{}, err
 	}
diff --git a/services/core/internal/api/core_validation_errors.go b/services/core/internal/api/core_validation_errors.go
index ccdf15d60..5310c0d24 100644
--- a/services/core/internal/api/core_validation_errors.go
+++ b/services/core/internal/api/core_validation_errors.go
@@ -12,7 +12,7 @@ import (
 const invalidNameMessage = "The name exceeds its length limit or contains invalid characters."
 
 // writeCoreValidationError is deliberately gated by the router marker. Shared
-// store validators must retain the public and machine routes' existing errors.
+// domain validators must retain the public and machine routes' existing errors.
 func writeCoreValidationError(w http.ResponseWriter, err error) bool {
 	if !isCoreErrorWriter(w) {
 		return false
diff --git a/services/core/internal/api/session_creation_identity.go b/services/core/internal/api/session_creation_identity.go
index 1f754dbf6..8a3c96385 100644
--- a/services/core/internal/api/session_creation_identity.go
+++ b/services/core/internal/api/session_creation_identity.go
@@ -13,8 +13,9 @@ import (
 // sessionCreationRequest records caller intent before mutable sources resolve:
 // saved Agents, templates, credentials and hosted deployment defaults. A retry
 // then returns the committed Session even after those sources change. Other
-// inline requests keep the resolved-request retry rule; the store leaves the
-// deployment default out of that hash, so it cannot change their identity.
+// inline requests keep the resolved-request retry rule; the sessions package
+// leaves the deployment default out of that hash, so it cannot change their
+// identity.
 func sessionCreationRequest(input sessionRequest, initial []sessions.Input) (json.RawMessage, error) {
 	if input.Agent != nil && input.Agent.Model != nil && (input.Environment == nil || input.Environment.Type != "openai_hosted") && input.XAgentsCore == nil && input.AgentID == nil && input.templateID == "" && len(input.initialFiles) == 0 && input.initialization.Empty() && !inlineCredentialIntent(input) && input.agentFields["x_agents_core"] == nil {
 		return nil, nil
diff --git a/services/core/internal/execution/runtime_manager.go b/services/core/internal/execution/runtime_manager.go
index 68cae6b9e..24f0ec8cb 100644
--- a/services/core/internal/execution/runtime_manager.go
+++ b/services/core/internal/execution/runtime_manager.go
@@ -186,7 +186,7 @@ func (m *runtimeManager) applyInventory(previous map[string]*runtimeNode, ids []
 	}
 	m.mu.Unlock()
 	// Inventory includes offline nodes. Only explicit removal retires a lane;
-	// the Store requires all retained resources to be cleaned before removal.
+	// deployment removes only a node that retains no resources.
 	if err := m.cancelLifecycles(retired); err != nil {
 		// No cancellation was authorized. Keep each retiring identity and gate;
 		// acquiring its gate later cannot substitute for successful cancellation.
diff --git a/services/core/internal/execution/sandbox_deployment_setup.go b/services/core/internal/execution/sandbox_deployment_setup.go
index 6bfa6d142..7bff16c58 100644
--- a/services/core/internal/execution/sandbox_deployment_setup.go
+++ b/services/core/internal/execution/sandbox_deployment_setup.go
@@ -158,7 +158,7 @@ func (m *runtimeManager) prepareCandidate(ctx context.Context, input sandbox.Sel
 	return candidate, nil
 }
 
-// The store commit is the point of no return. Publishing a validated candidate
+// The deployment commit is the point of no return. Publishing a validated candidate
 // is infallible, including when shutdown or request cancellation follows commit.
 func (m *runtimeManager) publishDeployment(candidate PreparedRuntimeDeployment, committed deployment.View) {
 	m.mu.Lock()
diff --git a/services/core/internal/runtimehistory/postgresreader/aggregate.go b/services/core/internal/persistence/postgres/runtimehistorypg/aggregate.go
similarity index 99%
rename from services/core/internal/runtimehistory/postgresreader/aggregate.go
rename to services/core/internal/persistence/postgres/runtimehistorypg/aggregate.go
index fae764a78..f869706e8 100644
--- a/services/core/internal/runtimehistory/postgresreader/aggregate.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/aggregate.go
@@ -1,5 +1,5 @@
-// Package postgresreader stores and reads bounded periodic Runtime telemetry.
-package postgresreader
+// Package runtimehistorypg stores and reads bounded periodic Runtime telemetry.
+package runtimehistorypg
 
 import (
 	"errors"
diff --git a/services/core/internal/runtimehistory/postgresreader/aggregate_test.go b/services/core/internal/persistence/postgres/runtimehistorypg/aggregate_test.go
similarity index 99%
rename from services/core/internal/runtimehistory/postgresreader/aggregate_test.go
rename to services/core/internal/persistence/postgres/runtimehistorypg/aggregate_test.go
index 9108c8ea5..de23739a7 100644
--- a/services/core/internal/runtimehistory/postgresreader/aggregate_test.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/aggregate_test.go
@@ -1,4 +1,4 @@
-package postgresreader
+package runtimehistorypg
 
 import (
 	"math"
diff --git a/services/core/internal/runtimehistory/postgresreader/exporter.go b/services/core/internal/persistence/postgres/runtimehistorypg/exporter.go
similarity index 99%
rename from services/core/internal/runtimehistory/postgresreader/exporter.go
rename to services/core/internal/persistence/postgres/runtimehistorypg/exporter.go
index ef4b66c38..13935943c 100644
--- a/services/core/internal/runtimehistory/postgresreader/exporter.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/exporter.go
@@ -1,4 +1,4 @@
-package postgresreader
+package runtimehistorypg
 
 import (
 	"context"
diff --git a/services/core/internal/runtimehistory/postgresreader/reader.go b/services/core/internal/persistence/postgres/runtimehistorypg/reader.go
similarity index 99%
rename from services/core/internal/runtimehistory/postgresreader/reader.go
rename to services/core/internal/persistence/postgres/runtimehistorypg/reader.go
index 1011ec484..39419d1ff 100644
--- a/services/core/internal/runtimehistory/postgresreader/reader.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/reader.go
@@ -1,4 +1,4 @@
-package postgresreader
+package runtimehistorypg
 
 import (
 	"context"
diff --git a/services/core/internal/runtimehistory/postgresreader/reader_test.go b/services/core/internal/persistence/postgres/runtimehistorypg/reader_test.go
similarity index 99%
rename from services/core/internal/runtimehistory/postgresreader/reader_test.go
rename to services/core/internal/persistence/postgres/runtimehistorypg/reader_test.go
index 7d75176da..aca72a965 100644
--- a/services/core/internal/runtimehistory/postgresreader/reader_test.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/reader_test.go
@@ -1,4 +1,4 @@
-package postgresreader
+package runtimehistorypg
 
 import (
 	"context"
diff --git a/services/core/internal/runtimehistory/postgresreader/samples.go b/services/core/internal/persistence/postgres/runtimehistorypg/samples.go
similarity index 99%
rename from services/core/internal/runtimehistory/postgresreader/samples.go
rename to services/core/internal/persistence/postgres/runtimehistorypg/samples.go
index fb0302972..08f637f8f 100644
--- a/services/core/internal/runtimehistory/postgresreader/samples.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/samples.go
@@ -1,4 +1,4 @@
-package postgresreader
+package runtimehistorypg
 
 import (
 	"context"
diff --git a/services/core/internal/runtimehistory/postgresreader/samples_test.go b/services/core/internal/persistence/postgres/runtimehistorypg/samples_test.go
similarity index 99%
rename from services/core/internal/runtimehistory/postgresreader/samples_test.go
rename to services/core/internal/persistence/postgres/runtimehistorypg/samples_test.go
index 9ba566f2c..f6375b460 100644
--- a/services/core/internal/runtimehistory/postgresreader/samples_test.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/samples_test.go
@@ -1,4 +1,4 @@
-package postgresreader
+package runtimehistorypg
 
 import (
 	"context"
diff --git a/services/core/internal/store/admin_delete_audit_test.go b/services/core/tests/integration/admin_delete_audit_test.go
similarity index 99%
rename from services/core/internal/store/admin_delete_audit_test.go
rename to services/core/tests/integration/admin_delete_audit_test.go
index 4c4acba0f..183713c19 100644
--- a/services/core/internal/store/admin_delete_audit_test.go
+++ b/services/core/tests/integration/admin_delete_audit_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/admin_session_archive_race_test.go b/services/core/tests/integration/admin_session_archive_race_test.go
similarity index 99%
rename from services/core/internal/store/admin_session_archive_race_test.go
rename to services/core/tests/integration/admin_session_archive_race_test.go
index b5670acc4..2bd929df6 100644
--- a/services/core/internal/store/admin_session_archive_race_test.go
+++ b/services/core/tests/integration/admin_session_archive_race_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/admin_session_archive_test.go b/services/core/tests/integration/admin_session_archive_test.go
similarity index 99%
rename from services/core/internal/store/admin_session_archive_test.go
rename to services/core/tests/integration/admin_session_archive_test.go
index 0f724c886..85e4024e9 100644
--- a/services/core/internal/store/admin_session_archive_test.go
+++ b/services/core/tests/integration/admin_session_archive_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/admin_session_archive_worker_http_test.go b/services/core/tests/integration/admin_session_archive_worker_http_test.go
similarity index 88%
rename from services/core/internal/store/admin_session_archive_worker_http_test.go
rename to services/core/tests/integration/admin_session_archive_worker_http_test.go
index 6057235a5..6f586d67b 100644
--- a/services/core/internal/store/admin_session_archive_worker_http_test.go
+++ b/services/core/tests/integration/admin_session_archive_worker_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -24,7 +24,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -32,12 +31,12 @@ import (
 // the deployment execution operations on the Worker's lease, as server startup
 // does.
 func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{83}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	s.SetPlacement(fixtureRules(t, db))
 	installation := uuid.NewString()
 	provider := &lifecycleProvider{resources: map[string]sandbox.Info{}}
@@ -72,7 +71,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 		})
 	}
 	t.Cleanup(stop)
-	selection := sandbox.Selection{DeploymentSpec: store.SandboxDeploymentTestSpec("e2b"), Provider: "e2b", Configuration: &e2b.DeploymentConfiguration{APIKey: "fixture-api-key", Template: "runtime:" + uuid.NewString()}}
+	selection := sandbox.Selection{DeploymentSpec: SandboxDeploymentTestSpec("e2b"), Provider: "e2b", Configuration: &e2b.DeploymentConfiguration{APIKey: "fixture-api-key", Template: "runtime:" + uuid.NewString()}}
 	if _, err := worker.InitializeSandboxDeployment(t.Context(), selection); err != nil {
 		t.Fatal(err)
 	}
@@ -85,7 +84,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	}
 	create := func() sessions.Session {
 		t.Helper()
-		session, err := s.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`)})
+		session, err := s.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`)})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -96,7 +95,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(t.Context(), s, project.TenantID, active.ID, "pending-turn", json.RawMessage(`{"text":"pending"}`))
+	input, err := sendMessage(t.Context(), s, project.TenantID, active.ID, "pending-turn", json.RawMessage(`{"text":"pending"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -126,7 +125,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil || allocation.ID != allocated.ID || allocation.State != "cleanup_pending" {
 		t.Fatal("archive did not retain cleanup ownership", allocation, err)
 	}
-	turn, err := store.SessionAdapter(s).GetTurn(t.Context(), project.TenantID, active.ID, input.TurnID)
+	turn, err := sessionAdapter(s).GetTurn(t.Context(), project.TenantID, active.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnCancelled {
 		t.Fatal("archive did not cancel queued work", turn, err)
 	}
diff --git a/services/core/internal/store/agent_execution_defaults_http_test.go b/services/core/tests/integration/agent_execution_defaults_http_test.go
similarity index 95%
rename from services/core/internal/store/agent_execution_defaults_http_test.go
rename to services/core/tests/integration/agent_execution_defaults_http_test.go
index 7b191ee3a..eeff542fc 100644
--- a/services/core/internal/store/agent_execution_defaults_http_test.go
+++ b/services/core/tests/integration/agent_execution_defaults_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -12,14 +12,13 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{19}, 32))
-	st, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	st, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	st.SetPlacement(fixtureRules(t, db))
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "defaults-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
@@ -74,7 +73,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 	sessionID := id(call("POST", "/v1/agents/sessions", body, key, 201))
 	assertSnapshot := func(sessionID, model, endpoint, key string) {
 		t.Helper()
-		session, err := store.SessionAdapter(st).GetSession(t.Context(), tenant, sessionID)
+		session, err := sessionAdapter(st).GetSession(t.Context(), tenant, sessionID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -82,7 +81,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 		if json.Unmarshal(session.Configuration, &cfg) != nil || cfg.Agent.Model != model {
 			t.Fatal("model snapshot changed")
 		}
-		provider, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, sessionID)
+		provider, err := sessionAdapter(st).SessionModelExecution(t.Context(), tenant, sessionID)
 		if err != nil || provider.BaseURL != endpoint || provider.APIKey != key {
 			t.Fatal("provider snapshot mismatch", err)
 		}
@@ -105,7 +104,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 	nativeHarness := strings.TrimSuffix(crossHarness, "}") + `,"x_agents_core":{"model_provider":{"protocol":"anthropic","base_url":"https://override.example/v1","api_key":"override-canary"}}}`
 	created := id(call("POST", "/v1/agents/sessions", nativeHarness, uuid.NewString(), 201))
 	assertSnapshot(created, "model-override", "https://override.example/v1", "override-canary")
-	reads := store.SessionAdapter(st)
+	reads := sessionAdapter(st)
 	resolved, err := reads.GetSession(t.Context(), tenant, created)
 	frozen, providerErr := reads.SessionModelExecution(t.Context(), tenant, created)
 	if err != nil || providerErr != nil || resolved.Engine != "claude_sdk" || frozen == nil || frozen.Protocol != "anthropic" {
@@ -133,7 +132,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 		t.Fatal("retry created another Session")
 	}
 	call("POST", "/v1/agents/sessions", body, uuid.NewString(), 404)
-	st = store.NewWithCredentialCipher(pool, cipher)
+	st = NewWithCredentialCipher(pool, cipher)
 	assertSnapshot(sessionID, "model-original", "https://saved.example/v1", "saved-canary")
 	assertSnapshot(fresh, "model-new", "https://override.example/v1", "override-canary")
 	inline := `{"agent":{"model":"inline-model"},"environment":{"type":"openai_hosted"}}`
diff --git a/services/core/internal/store/agents_delete_public_test.go b/services/core/tests/integration/agents_delete_public_test.go
similarity index 90%
rename from services/core/internal/store/agents_delete_public_test.go
rename to services/core/tests/integration/agents_delete_public_test.go
index 2ccc36e91..87ea12a0e 100644
--- a/services/core/internal/store/agents_delete_public_test.go
+++ b/services/core/tests/integration/agents_delete_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -30,7 +29,7 @@ func TestAgentDeletionOfficialClient(t *testing.T) {
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := store.New(db.pool), fixtureDB{pool: db.pool}
+	recoveredStore, recoveredDB := New(db.pool), fixtureDB{pool: db.pool}
 	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex", storeExecution(t, recoveredStore))
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/agents_fixture_test.go b/services/core/tests/integration/agents_fixture_test.go
similarity index 97%
rename from services/core/internal/store/agents_fixture_test.go
rename to services/core/tests/integration/agents_fixture_test.go
index 037c87f0d..9caa40be7 100644
--- a/services/core/internal/store/agents_fixture_test.go
+++ b/services/core/tests/integration/agents_fixture_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"testing"
diff --git a/services/core/internal/store/agents_update_public_test.go b/services/core/tests/integration/agents_update_public_test.go
similarity index 90%
rename from services/core/internal/store/agents_update_public_test.go
rename to services/core/tests/integration/agents_update_public_test.go
index 2930a267c..c6f49158f 100644
--- a/services/core/internal/store/agents_update_public_test.go
+++ b/services/core/tests/integration/agents_update_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -30,7 +29,7 @@ func TestAgentUpdateOfficialClient(t *testing.T) {
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := store.New(db.pool), fixtureDB{pool: db.pool}
+	recoveredStore, recoveredDB := New(db.pool), fixtureDB{pool: db.pool}
 	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex", storeExecution(t, recoveredStore))
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/archive_cancellation_test.go b/services/core/tests/integration/archive_cancellation_test.go
similarity index 92%
rename from services/core/internal/store/archive_cancellation_test.go
rename to services/core/tests/integration/archive_cancellation_test.go
index 4ae861bdf..d5aa6bf2b 100644
--- a/services/core/internal/store/archive_cancellation_test.go
+++ b/services/core/tests/integration/archive_cancellation_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -25,7 +25,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 )
@@ -48,7 +47,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			if err := leased.Deployment.Claim(t.Context(), installation); err != nil {
 				t.Fatal(err)
 			}
-			if _, err := leased.Deployment.Initialize(t.Context(), installation, sandbox.Selection{DeploymentSpec: store.SandboxDeploymentTestSpec("e2b"), Provider: "e2b", Configuration: &e2b.DeploymentConfiguration{APIKey: "fixture", Template: "runtime:" + uuid.NewString()}}); err != nil {
+			if _, err := leased.Deployment.Initialize(t.Context(), installation, sandbox.Selection{DeploymentSpec: SandboxDeploymentTestSpec("e2b"), Provider: "e2b", Configuration: &e2b.DeploymentConfiguration{APIKey: "fixture", Template: "runtime:" + uuid.NewString()}}); err != nil {
 				t.Fatal(err)
 			}
 			projectID := uuid.NewString()
@@ -59,7 +58,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				t.Fatal(err)
 			}
 			configuration := strings.Replace(functionConfiguration, `"type":"none"`, `"type":"openai_hosted","network":{"access":"disabled"}`, 1)
-			session, err := s.CreateSession(t.Context(), project.TenantID, store.WithFixtureModelProvider(sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(configuration)}))
+			session, err := s.CreateSession(t.Context(), project.TenantID, WithFixtureModelProvider(sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(configuration)}))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -100,11 +99,11 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				t.Fatal(err)
 			}
 			t.Cleanup(func() { conn.Close() })
-			sessionStore, sessionService, err := fixtureSessions(db)
+			sessionStore, service, err := fixtureSessions(db)
 			if err != nil {
 				t.Fatal(err)
 			}
-			h := &dispatchHarness{t: t, s: s, db: db, lease: leased.Lease, owned: &leased, tenant: project.TenantID, session: session, conn: conn, registry: registry, d: &execution.Dispatcher{Registry: registry, Observer: modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher), Sessions: sessionService, SessionsReader: sessionStore}}
+			h := &dispatchHarness{t: t, s: s, db: db, lease: leased.Lease, owned: &leased, tenant: project.TenantID, session: session, conn: conn, registry: registry, d: &execution.Dispatcher{Registry: registry, Observer: modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher), Sessions: service, SessionsReader: sessionStore}}
 			h.d = h.bound()
 			capabilities := workerEnvironmentCapabilities()
 			capabilities.FunctionTools = proto.CapabilitySupported
@@ -123,7 +122,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				}
 				time.Sleep(time.Millisecond)
 			}
-			pending, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
+			pending, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -142,7 +141,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			}
 
 			if scenario == "cancel_revoke_archive" {
-				if _, err := store.RequestCancel(t.Context(), s, h.tenant, session.ID, "ordinary-cancel"); err != nil {
+				if _, err := requestCancel(t.Context(), s, h.tenant, session.ID, "ordinary-cancel"); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -181,7 +180,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			current, err := store.SessionAdapter(s).GetTurn(t.Context(), h.tenant, session.ID, input.TurnID)
+			current, err := sessionAdapter(s).GetTurn(t.Context(), h.tenant, session.ID, input.TurnID)
 			if err != nil || current.Status != sessions.TurnWaiting || current.CancelRequestedAt.IsZero() {
 				t.Fatal("archive must request rather than invent cancellation", current, err)
 			}
diff --git a/services/core/internal/store/archived_cancellation_migration_test.go b/services/core/tests/integration/archived_cancellation_migration_test.go
similarity index 99%
rename from services/core/internal/store/archived_cancellation_migration_test.go
rename to services/core/tests/integration/archived_cancellation_migration_test.go
index c3f53cb0c..705a695d6 100644
--- a/services/core/internal/store/archived_cancellation_migration_test.go
+++ b/services/core/tests/integration/archived_cancellation_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"database/sql"
diff --git a/services/core/internal/store/auth_fixture_test.go b/services/core/tests/integration/auth_fixture_test.go
similarity index 98%
rename from services/core/internal/store/auth_fixture_test.go
rename to services/core/tests/integration/auth_fixture_test.go
index dc89198ec..1bbabac49 100644
--- a/services/core/internal/store/auth_fixture_test.go
+++ b/services/core/tests/integration/auth_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/claude_execution_test.go b/services/core/tests/integration/claude_execution_test.go
similarity index 86%
rename from services/core/internal/store/claude_execution_test.go
rename to services/core/tests/integration/claude_execution_test.go
index cf3b54681..e298a94a4 100644
--- a/services/core/internal/store/claude_execution_test.go
+++ b/services/core/tests/integration/claude_execution_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,13 +12,12 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func claudeSession(t *testing.T, h *dispatchHarness, configuration string, prebound bool) {
 	t.Helper()
 	var err error
-	h.session, err = h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "claude_sdk", IdempotencyKey: "claude", Configuration: json.RawMessage(configuration)})
+	h.session, err = h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "claude_sdk", IdempotencyKey: "claude", Configuration: json.RawMessage(configuration)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -68,7 +67,7 @@ func TestClaudeWorkerSelectsStoredEngineAndRestrictiveCapabilities(t *testing.T)
 			}()
 			queued := func() {
 				time.Sleep(650 * time.Millisecond)
-				turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+				turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 				if err != nil || turn.Status != sessions.TurnQueued {
 					t.Fatal(turn, err)
 				}
@@ -91,7 +90,7 @@ func TestClaudeWorkerSelectsStoredEngineAndRestrictiveCapabilities(t *testing.T)
 			}
 			h.write(input.TurnID, proto.TypeDone, proto.DonePayload{Content: "done", Metadata: map[string]any{proto.DoneMetaAgentSessionID: "claude-native"}})
 			waitTurn(t, h, input.TurnID, sessions.TurnCompleted)
-			bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+			bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 			if err != nil || bound.NativeSessionID != "claude-native" {
 				t.Fatal(bound, err)
 			}
@@ -112,7 +111,7 @@ func TestClaudeDispatcherRejectsUnsupportedConfigurationBeforeClaim(t *testing.T
 			if result := <-h.run(t.Context(), input.TurnID); result.err == nil {
 				t.Fatal("unsupported configuration claimed")
 			}
-			turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
+			turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
 			if err != nil || turn.Status != sessions.TurnQueued {
 				t.Fatal(turn, err)
 			}
@@ -126,7 +125,7 @@ func TestClaudeInvalidImageResultRejectsWholeBatchBeforePersistence(t *testing.T
 	worker := startOwnedWorker(t, t.Context(), h.db, h.d, h.owner())
 	defer func() { ctx, cancel := context.WithCancel(context.Background()); cancel(); _ = worker.Run(ctx) }()
 	input := h.message("start", "Run")
-	if _, err := store.TransitionTurn(t.Context(), h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := transitionTurn(t.Context(), h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	call := sessions.FunctionCall{CallID: "public-call", ExecutorCallID: "native-call", Name: "lookup_ticket", Arguments: json.RawMessage(`{"ticket":"42"}`)}
@@ -144,15 +143,15 @@ func TestClaudeInvalidImageResultRejectsWholeBatchBeforePersistence(t *testing.T
 	if _, err := worker.SubmitInputs(t.Context(), h.tenant, h.session.ID, "batch", batch); !errors.Is(err, sessions.ErrInvalidInput) {
 		t.Fatal(err)
 	}
-	saved, err := store.FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, call.CallID)
+	saved, err := FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, call.CallID)
 	if err != nil || saved.Result != nil || saved.Applied {
 		t.Fatal(saved, err)
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
+	turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnWaiting || !turn.CancelRequestedAt.IsZero() {
 		t.Fatal(turn, err)
 	}
-	history, err := store.SessionAdapter(h.s).ListTurnInputs(t.Context(), h.tenant, h.session.ID, input.TurnID, 0, 100)
+	history, err := sessionAdapter(h.s).ListTurnInputs(t.Context(), h.tenant, h.session.ID, input.TurnID, 0, 100)
 	if err != nil || len(history) != 1 {
 		t.Fatal(history, err)
 	}
diff --git a/services/core/internal/store/claude_mcp_test.go b/services/core/tests/integration/claude_mcp_test.go
similarity index 95%
rename from services/core/internal/store/claude_mcp_test.go
rename to services/core/tests/integration/claude_mcp_test.go
index 0a81a5a6c..f9d9f7a0e 100644
--- a/services/core/internal/store/claude_mcp_test.go
+++ b/services/core/tests/integration/claude_mcp_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestClaudeMCPWaitsForCapableRuntime(t *testing.T) {
@@ -56,7 +55,7 @@ func TestClaudeMCPWaitsForCapableRuntime(t *testing.T) {
 					}
 				}()
 				time.Sleep(650 * time.Millisecond)
-				turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+				turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 				if err != nil || turn.Status != sessions.TurnQueued {
 					t.Fatal("incapable runtime claimed work", turn, err)
 				}
@@ -122,7 +121,7 @@ func TestClaudeMCPUnsupportedSnapshotRejectedBeforeClaim(t *testing.T) {
 			if result := <-h.run(t.Context(), input.TurnID); result.err == nil {
 				t.Fatal("unsupported MCP configuration claimed")
 			}
-			turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
+			turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
 			if err != nil || turn.Status != sessions.TurnQueued {
 				t.Fatal(turn, err)
 			}
diff --git a/services/core/internal/store/command_output_test.go b/services/core/tests/integration/command_output_test.go
similarity index 82%
rename from services/core/internal/store/command_output_test.go
rename to services/core/tests/integration/command_output_test.go
index 081e2ddca..ca65f2527 100644
--- a/services/core/internal/store/command_output_test.go
+++ b/services/core/tests/integration/command_output_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,24 +9,23 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "command-output"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "command-output"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"run commands"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"run commands"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	event := func(kind, raw string) sessions.ExecutionEvent {
@@ -42,7 +41,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	before, _ := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	before, _ := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	// A bad command reference rolls back preceding valid fragments and their events.
 	if err := journal.AppendTurnEvents(ctx, tenant, session.ID, input.TurnID, 4, []sessions.ExecutionEvent{
 		event("command_output", `{"id":"cmd","delta":"rollback"}`),
@@ -50,7 +49,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	}); err == nil {
 		t.Fatal("unknown command accepted")
 	}
-	after, _ := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	after, _ := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("rollback published output")
 	}
@@ -74,8 +73,8 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 		t.Fatal(err)
 	}
 	// Reopening the Store recovers committed Items without creating events.
-	reopened := store.New(pool)
-	before, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	reopened := New(pool)
+	before, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	page, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 3 {
 		t.Fatalf("recovery: %+v %v", page, err)
@@ -83,11 +82,11 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	if page.Items[1].Status != "completed" || page.Items[1].Output != "authoritative" || page.Items[2].Status != "incomplete" || page.Items[2].Output != "已观察\n" {
 		t.Fatal("completion/cancellation lost command output", page.Items)
 	}
-	after, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	after, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("query replayed events")
 	}
-	if _, err := store.SessionAdapter(reopened).ListSessionEvents(ctx, uuid.NewString(), session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(reopened).ListSessionEvents(ctx, uuid.NewString(), session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign event access", err)
 	}
 	var fragments []string
@@ -95,7 +94,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	indexes := map[string]int32{}
 	cursor := int64(0)
 	for {
-		changes, err := store.SessionAdapter(reopened).ListSessionEvents(ctx, tenant, session.ID, cursor)
+		changes, err := sessionAdapter(reopened).ListSessionEvents(ctx, tenant, session.ID, cursor)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -135,7 +134,7 @@ func TestExecutionJournalsCommandOutputBeforeCancellation(t *testing.T) {
 	h.read(testExecutionRequest)
 	h.write(input.TurnID, proto.TypeToolCall, proto.ToolCallPayload{ID: "cmd", Stage: "before", Observation: &proto.ToolObservation{Kind: "command", Command: "wait", Status: "in_progress"}})
 	h.write(input.TurnID, proto.TypeCommandOutput, proto.CommandOutputPayload{ID: "cmd", Delta: "partial"})
-	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
+	if _, err := requestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
 	env := h.read(proto.TypePromptCancel)
diff --git a/services/core/internal/store/configuration_validation_public_test.go b/services/core/tests/integration/configuration_validation_public_test.go
similarity index 98%
rename from services/core/internal/store/configuration_validation_public_test.go
rename to services/core/tests/integration/configuration_validation_public_test.go
index ed523ef5b..c3ef553c8 100644
--- a/services/core/internal/store/configuration_validation_public_test.go
+++ b/services/core/tests/integration/configuration_validation_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -11,7 +11,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/agents"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -20,12 +19,12 @@ import (
 // resource ownership.
 func TestAgentConfigurationValidationRejectsWithoutWritesPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{63}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "config-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
diff --git a/services/core/internal/store/creation_stream_settlement_public_test.go b/services/core/tests/integration/creation_stream_settlement_public_test.go
similarity index 89%
rename from services/core/internal/store/creation_stream_settlement_public_test.go
rename to services/core/tests/integration/creation_stream_settlement_public_test.go
index 996c025b4..98f6043fd 100644
--- a/services/core/internal/store/creation_stream_settlement_public_test.go
+++ b/services/core/tests/integration/creation_stream_settlement_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bufio"
@@ -13,7 +13,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -171,10 +170,10 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 	created.ended(t, 5*time.Second)
 
 	connect(first.Session.Environment.ID)
-	if _, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, first.Session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); err != nil {
+	if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, first.Session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); err != nil {
 		t.Fatal(err)
 	}
-	if current, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, first.Session.ID); err != nil || !current.PendingInput {
+	if current, err := sessionAdapter(s).GetSession(t.Context(), tenant, first.Session.ID); err != nil || !current.PendingInput {
 		t.Fatal("later input is not pending", err)
 	}
 	retry := openStream(t, server, token, http.MethodPost, "/v1/agents/sessions", idle, "no-input")
@@ -207,14 +206,14 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 	if err := db.pool.QueryRow(t.Context(), "SELECT id FROM environment_input_reservations WHERE session_id=$1 AND is_initial", session).Scan(&reservation); err != nil {
 		t.Fatal(err)
 	}
-	cursor, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, session)
+	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if settled, err := store.CancelEnvironmentInput(t.Context(), s, tenant, session, reservation); err != nil || settled.State != sessions.EnvironmentInputCancelled {
+	if settled, err := cancelEnvironmentInput(t.Context(), s, tenant, session, reservation); err != nil || settled.State != sessions.EnvironmentInputCancelled {
 		t.Fatal(settled.State, err)
 	}
-	if after, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, session); err != nil || after != cursor {
+	if after, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session); err != nil || after != cursor {
 		t.Fatal("cancellation recorded a Session event; this case needs a silent settlement", after, cursor, err)
 	}
 	fresh.ended(t, 5*time.Second)
diff --git a/services/core/internal/store/credential_matrix_http_test.go b/services/core/tests/integration/credential_matrix_http_test.go
similarity index 98%
rename from services/core/internal/store/credential_matrix_http_test.go
rename to services/core/tests/integration/credential_matrix_http_test.go
index e1d7ae2e2..395828d20 100644
--- a/services/core/internal/store/credential_matrix_http_test.go
+++ b/services/core/tests/integration/credential_matrix_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -21,7 +21,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -110,7 +109,7 @@ func TestCredentialNamespaceMatrix(t *testing.T) {
 			_ = worker.Run(cancelled)
 		})
 	})
-	specification := store.SandboxDeploymentTestSpec("docker")
+	specification := SandboxDeploymentTestSpec("docker")
 	if _, err := worker.InitializeSandboxDeployment(ctx, sandbox.Selection{DeploymentSpec: specification, Provider: "docker"}); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/credential_oauth_migration_test.go b/services/core/tests/integration/credential_oauth_migration_test.go
similarity index 99%
rename from services/core/internal/store/credential_oauth_migration_test.go
rename to services/core/tests/integration/credential_oauth_migration_test.go
index 87515e9ed..6c607c388 100644
--- a/services/core/internal/store/credential_oauth_migration_test.go
+++ b/services/core/tests/integration/credential_oauth_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/credential_status_migration_test.go b/services/core/tests/integration/credential_status_migration_test.go
similarity index 99%
rename from services/core/internal/store/credential_status_migration_test.go
rename to services/core/tests/integration/credential_status_migration_test.go
index e8b644ffe..1bbea5ef6 100644
--- a/services/core/internal/store/credential_status_migration_test.go
+++ b/services/core/tests/integration/credential_status_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/deployment_fixture_test.go b/services/core/tests/integration/deployment_fixture_test.go
similarity index 99%
rename from services/core/internal/store/deployment_fixture_test.go
rename to services/core/tests/integration/deployment_fixture_test.go
index af32eee77..5b35597c9 100644
--- a/services/core/internal/store/deployment_fixture_test.go
+++ b/services/core/tests/integration/deployment_fixture_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"testing"
diff --git a/services/core/internal/store/deployment_model_providers_http_test.go b/services/core/tests/integration/deployment_model_providers_http_test.go
similarity index 93%
rename from services/core/internal/store/deployment_model_providers_http_test.go
rename to services/core/tests/integration/deployment_model_providers_http_test.go
index 774319df1..a9c561762 100644
--- a/services/core/internal/store/deployment_model_providers_http_test.go
+++ b/services/core/tests/integration/deployment_model_providers_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -22,7 +22,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -30,12 +29,12 @@ import (
 // frozen only into hosted Sessions; self-hosted Sessions bring their own
 // provider, and a Session with no provider is rejected before any write.
 func TestDeploymentModelProvidersHTTP(t *testing.T) {
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	if _, err := pool.Exec(t.Context(), "DELETE FROM deployment_model_providers"); err != nil {
 		t.Fatal(err)
 	}
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{53}, 32))
-	st, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	st, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	st.SetPlacement(fixtureRules(t, db))
 	tenant, projectKey, coreKey := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "defaults-http", TokenSHA256: runtimedevice.HashCredential(projectKey), TenantID: tenant}})
@@ -83,7 +82,7 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 	}
 	providerOf := func(sessionID string) string {
 		t.Helper()
-		provider, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, sessionID)
+		provider, err := sessionAdapter(st).SessionModelExecution(t.Context(), tenant, sessionID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -194,7 +193,7 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 	if providerOf(hostedID) != "deployment-canary" {
 		t.Fatal("hosted Session did not freeze the deployment default")
 	}
-	projection, err := store.SessionAdapter(st).GetSessionExecutionConfiguration(t.Context(), tenant, hostedID)
+	projection, err := sessionAdapter(st).GetSessionExecutionConfiguration(t.Context(), tenant, hostedID)
 	if err != nil || projection.ModelProvider.Source != "deployment" || projection.ModelProvider.Status != "available" || projection.ModelProvider.Configuration == nil || projection.ModelProvider.Configuration.BaseURL != "https://deployment.example/v1" {
 		t.Fatal("deployment selection not recorded", projection, err)
 	}
@@ -237,20 +236,20 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 // reserved before the upgrade fails with that reason instead of waiting.
 func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), true)
-	legacy, err := h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
+	legacy, err := h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 		Configuration: []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
 	executor := connectFixtureRuntime(t, h, legacy)
 	// Reserved directly, as a pre-upgrade Core did.
-	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, legacy.ID, "before-upgrade", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"old"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, legacy.ID, "before-upgrade", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"old"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
 	worker, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
 	defer stop()
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	reservations := func() int {
 		t.Helper()
 		var count int
@@ -268,10 +267,10 @@ func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
 		t.Fatal("rejected work was queued", before, after)
 	}
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "legacy reservation settled", func() bool {
-		got, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, legacy.ID, pending.ID)
+		got, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, legacy.ID, pending.ID)
 		return err == nil && got.State == sessions.EnvironmentInputFailed
 	})
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, legacy.ID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, legacy.ID)
 	if err != nil || session.EnvironmentInputActivity == nil || session.EnvironmentInputActivity.Failure != "model_provider_required" {
 		t.Fatal("legacy reservation did not fail with its reason", session.EnvironmentInputActivity, err)
 	}
@@ -335,7 +334,7 @@ func TestNoneSessionRetryAfterDeploymentDefaultChanges(t *testing.T) {
 	}
 	key := uuid.NewString()
 	original := create(key)
-	if provider, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, original); err != nil || provider.APIKey != "first-default-key" {
+	if provider, err := sessionAdapter(st).SessionModelExecution(t.Context(), tenant, original); err != nil || provider.APIKey != "first-default-key" {
 		t.Fatal("none Session did not freeze the deployment default", err)
 	}
 	setDefault("rotated-default-key")
@@ -348,7 +347,7 @@ func TestNoneSessionRetryAfterDeploymentDefaultChanges(t *testing.T) {
 	if create(key) != original {
 		t.Fatal("retry after removal created another Session")
 	}
-	if provider, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, original); err != nil || provider.APIKey != "first-default-key" {
+	if provider, err := sessionAdapter(st).SessionModelExecution(t.Context(), tenant, original); err != nil || provider.APIKey != "first-default-key" {
 		t.Fatal("retry changed the frozen provider", err)
 	}
 	var revision uuid.UUID
@@ -401,7 +400,7 @@ func TestDeploymentProviderResolutionPairsRevisionDuringReplacement(t *testing.T
 	if err = db.pool.QueryRow(t.Context(), "SELECT deployment_provider_revision FROM session_execution_configuration WHERE session_id=$1", session.ID).Scan(&revision); err != nil || revision != original.Revision {
 		t.Fatal("tuple revision changed", err)
 	}
-	frozen, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, session.ID)
+	frozen, err := sessionAdapter(st).SessionModelExecution(t.Context(), tenant, session.ID)
 	if err != nil || frozen == nil || *frozen != provider {
 		t.Fatal("tuple bundle changed", err)
 	}
@@ -415,7 +414,7 @@ func TestDeploymentProviderResolutionPairsRevisionDuringReplacement(t *testing.T
 // The official-client job starts a fresh server with an independent encryption
 // key after the Go suite. Deployment-wide fixtures must leave its database intact.
 func TestDeploymentProviderResolutionFixtureIsolation(t *testing.T) {
-	_, shared := store.NewTestStore(t)
+	_, shared := testStore(t)
 	revisions := func() string {
 		t.Helper()
 		var value string
diff --git a/services/core/internal/store/deployment_public_fixture_test.go b/services/core/tests/integration/deployment_public_fixture_test.go
similarity index 99%
rename from services/core/internal/store/deployment_public_fixture_test.go
rename to services/core/tests/integration/deployment_public_fixture_test.go
index f7377971d..dff1550b7 100644
--- a/services/core/internal/store/deployment_public_fixture_test.go
+++ b/services/core/tests/integration/deployment_public_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"testing"
diff --git a/services/core/internal/store/device_bootstrap_binding_test.go b/services/core/tests/integration/device_bootstrap_binding_test.go
similarity index 99%
rename from services/core/internal/store/device_bootstrap_binding_test.go
rename to services/core/tests/integration/device_bootstrap_binding_test.go
index d01d32146..597001774 100644
--- a/services/core/internal/store/device_bootstrap_binding_test.go
+++ b/services/core/tests/integration/device_bootstrap_binding_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/devices_test.go b/services/core/tests/integration/devices_test.go
similarity index 99%
rename from services/core/internal/store/devices_test.go
rename to services/core/tests/integration/devices_test.go
index eacff7428..385c4571f 100644
--- a/services/core/internal/store/devices_test.go
+++ b/services/core/tests/integration/devices_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/dispatch_test.go b/services/core/tests/integration/dispatch_test.go
similarity index 93%
rename from services/core/internal/store/dispatch_test.go
rename to services/core/tests/integration/dispatch_test.go
index 65619b6b2..e4b122c3b 100644
--- a/services/core/internal/store/dispatch_test.go
+++ b/services/core/tests/integration/dispatch_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -21,7 +21,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 )
@@ -30,7 +29,7 @@ type dispatchHarness struct {
 	writeMu      sync.Mutex
 	admissions   map[string]fixtureAdmission
 	t            *testing.T
-	s            *store.Store
+	s            *Store
 	db           fixtureDB
 	d            *execution.Dispatcher
 	lease        execution.Ownership // held by tests that run execution operations without a Worker
@@ -56,7 +55,7 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 	h := &dispatchHarness{t: t, s: s, db: db, tenant: uuid.NewString(), environments: map[string]*dispatchHarness{}}
 	ctx := context.Background()
 	var err error
-	h.session, err = s.CreateSession(ctx, h.tenant, store.WithFixtureModelProvider(sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "session", Configuration: configuration}))
+	h.session, err = s.CreateSession(ctx, h.tenant, WithFixtureModelProvider(sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "session", Configuration: configuration}))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -76,7 +75,7 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 		if getErr != nil {
 			t.Fatal(getErr)
 		}
-		h.device, err = store.FixtureEnvironmentDevice(ctx, db.pool, h.tenant, environment.ID, "local runtime", runtimedevice.HashCredential(secret))
+		h.device, err = FixtureEnvironmentDevice(ctx, db.pool, h.tenant, environment.ID, "local runtime", runtimedevice.HashCredential(secret))
 	} else {
 		h.device, err = fixtureSessionService(t, db).CreateDevice(ctx, h.tenant, "isolated executor", runtimedevice.HashCredential(secret))
 	}
@@ -127,7 +126,7 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 func (h *dispatchHarness) message(key, text string) sessions.InputReceipt {
 	h.t.Helper()
 	body, _ := json.Marshal(map[string]string{"text": text})
-	r, err := store.SendMessage(context.Background(), h.s, h.tenant, h.session.ID, key, body)
+	r, err := sendMessage(context.Background(), h.s, h.tenant, h.session.ID, key, body)
 	if err != nil {
 		h.t.Fatal(err)
 	}
@@ -267,7 +266,7 @@ func TestExecutionDispatchSteeringAndNativeContinuity(t *testing.T) {
 	awaitRelease()
 	newStore, db := newTestStoreDB(t)
 	h.s, h.db, h.owned = newStore, db, nil
-	bound, err := store.SessionAdapter(newStore).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, err := sessionAdapter(newStore).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "native-thread-1" {
 		t.Fatalf("native binding lost: %+v %v", bound, err)
 	}
@@ -289,7 +288,7 @@ func TestExecutionCancellationRequiresReceiptAndSurvivesContextEnd(t *testing.T)
 			first := h.message("first", "Run")
 			result := h.run(context.Background(), first.TurnID)
 			h.read(testExecutionRequest)
-			_, err := store.RequestCancel(context.Background(), h.s, h.tenant, h.session.ID, "cancel")
+			_, err := requestCancel(context.Background(), h.s, h.tenant, h.session.ID, "cancel")
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -299,7 +298,7 @@ func TestExecutionCancellationRequiresReceiptAndSurvivesContextEnd(t *testing.T)
 			if cancel.DeliveryID == "" {
 				t.Fatal("cancellation has no receipt identity")
 			}
-			current, err := store.SessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, first.TurnID)
+			current, err := sessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, first.TurnID)
 			if err != nil || current.Status != sessions.TurnInProgress {
 				t.Fatal("cancel finished before receipt")
 			}
@@ -378,7 +377,7 @@ func TestExecutionOutcomeAndNativeBindingCommitTogether(t *testing.T) {
 	h := newDispatchHarness(t)
 	first := h.message("first", "Run")
 	ctx := context.Background()
-	_, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err := transitionTurn(ctx, h.s, h.tenant, h.session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -387,7 +386,7 @@ func TestExecutionOutcomeAndNativeBindingCommitTogether(t *testing.T) {
 	if _, err := operations.CompleteExecution(ctx, h.tenant, h.session.ID, first.TurnID, sessions.TurnCompleted, []byte(`{}`), "native-one", first.Sequence); !errors.Is(err, sessions.ErrUnappliedInputs) {
 		t.Fatalf("unapplied completion: %v", err)
 	}
-	bound, _ := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, _ := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if bound.NativeSessionID != "" {
 		t.Fatal("native ID committed without outcome")
 	}
@@ -448,7 +447,7 @@ func TestExecutionRejectsRuntimeMissingCapabilityBeforeClaim(t *testing.T) {
 			if _, err := h.bound().Run(context.Background(), h.tenant, h.session.ID, first.TurnID); err == nil || err.Error() != tc.message {
 				t.Fatalf("Run error = %v, want %q", err, tc.message)
 			}
-			turn, err := store.SessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, first.TurnID)
+			turn, err := sessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, first.TurnID)
 			if err != nil || turn.Status != sessions.TurnQueued {
 				t.Fatal("Runtime without a required capability claimed work")
 			}
diff --git a/services/core/internal/store/environment_admission_test.go b/services/core/tests/integration/environment_admission_test.go
similarity index 89%
rename from services/core/internal/store/environment_admission_test.go
rename to services/core/tests/integration/environment_admission_test.go
index 72a0676d7..8229152ba 100644
--- a/services/core/internal/store/environment_admission_test.go
+++ b/services/core/tests/integration/environment_admission_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -30,8 +29,8 @@ func newEnvironmentAdmission(t *testing.T) (*dispatchHarness, *execution.Worker)
 		cancel()
 		_ = worker.Run(ctx)
 	})
-	created, err := worker.CreateSession(t.Context(), h.tenant, store.WithFixtureModelProvider(sessions.CreateSession{
-		Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
+	created, err := worker.CreateSession(t.Context(), h.tenant, WithFixtureModelProvider(sessions.CreateSession{
+		Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 		Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`),
 	}))
 	if err != nil {
@@ -68,12 +67,12 @@ func awaitEnvironmentAdmission(t *testing.T, result <-chan environmentAdmissionR
 
 func environmentAdmissionPending(t *testing.T, h *dispatchHarness, key string) sessions.EnvironmentInputReservation {
 	t.Helper()
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	var id string
 	awaitDaemonRemoteCondition(t, t.Context(), 3*time.Second, "input reservation", func() bool {
 		return pool.QueryRow(t.Context(), "SELECT id::text FROM environment_input_reservations WHERE session_id=$1 AND idempotency_key=$2", h.session.ID, key).Scan(&id) == nil
 	})
-	pending, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, id)
+	pending, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, id)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -92,7 +91,7 @@ func TestEnvironmentAdmissionWaitsForPreparedClaimAndRetainsRetry(t *testing.T)
 		default:
 		}
 	}
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity == nil || session.EnvironmentInputActivity.Status != "requires_action" {
 		t.Fatal("waiting activity", session, err)
 	}
@@ -172,7 +171,7 @@ func TestEnvironmentAdmissionSettlementDoesNotCreateTurn(t *testing.T) {
 			defer cancel()
 			response := submitEnvironmentAdmission(ctx, h, worker, "waiting")
 			pending := environmentAdmissionPending(t, h, "waiting")
-			_, pool := store.NewTestStore(t)
+			_, pool := testStore(t)
 			expected := execution.ErrEnvironmentInputExpired
 			switch name {
 			case "expired":
@@ -181,15 +180,15 @@ func TestEnvironmentAdmissionSettlementDoesNotCreateTurn(t *testing.T) {
 				}
 			case "cancelled":
 				expected = execution.ErrEnvironmentInputCancelled
-				if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
+				if _, err := cancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
 					t.Fatal(err)
 				}
 			case "deleted":
 				expected = sessions.ErrNotFound
-				if err := store.SessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := sessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("pending input deleted", err)
 				}
-				if err := h.s.CommitLegacyDeletion(t.Context(), h.tenant, h.session.ID); err != nil {
+				if err := h.s.commitLegacyDeletion(t.Context(), h.tenant, h.session.ID); err != nil {
 					t.Fatal(err)
 				}
 			case "disconnected":
@@ -220,7 +219,7 @@ func TestEnvironmentAdmissionSettlementDoesNotCreateTurn(t *testing.T) {
 			if name == "deleted" {
 				return
 			}
-			retained, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+			retained, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/environment_claim_worker_test.go b/services/core/tests/integration/environment_claim_worker_test.go
similarity index 85%
rename from services/core/internal/store/environment_claim_worker_test.go
rename to services/core/tests/integration/environment_claim_worker_test.go
index 5efdc36dc..e7fd2c54e 100644
--- a/services/core/internal/store/environment_claim_worker_test.go
+++ b/services/core/tests/integration/environment_claim_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
@@ -25,14 +24,14 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 			}
 			turnID := got.Receipts[0].TurnID
 			if deleted {
-				if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: pending.SessionID}); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: pending.SessionID}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("claimed Session deleted", err)
 				}
-				if err := s.CommitLegacyDeletion(t.Context(), tenant, pending.SessionID); err != nil {
+				if err := s.commitLegacyDeletion(t.Context(), tenant, pending.SessionID); err != nil {
 					t.Fatal(err)
 				}
 			}
-			turn, err := store.SessionAdapter(s).GetTurn(t.Context(), tenant, pending.SessionID, turnID)
+			turn, err := sessionAdapter(s).GetTurn(t.Context(), tenant, pending.SessionID, turnID)
 			if err != nil || turn.Status != sessions.TurnInProgress || (deleted && turn.CancelRequestedAt.IsZero()) {
 				t.Fatal("promotion did not retain the active claim", turn, err)
 			}
@@ -50,7 +49,7 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 				t.Fatal(err)
 			}
 			awaitRelease()
-			turn, err = store.SessionAdapter(s).GetTurn(t.Context(), tenant, pending.SessionID, turnID)
+			turn, err = sessionAdapter(s).GetTurn(t.Context(), tenant, pending.SessionID, turnID)
 			var outcome struct {
 				ErrorCode string `json:"error_code"`
 			}
diff --git a/services/core/internal/store/environment_connection_events_test.go b/services/core/tests/integration/environment_connection_events_test.go
similarity index 62%
rename from services/core/internal/store/environment_connection_events_test.go
rename to services/core/tests/integration/environment_connection_events_test.go
index f5dfc950f..7096f339e 100644
--- a/services/core/internal/store/environment_connection_events_test.go
+++ b/services/core/tests/integration/environment_connection_events_test.go
@@ -1,16 +1,11 @@
-package store_test
+package integration
 
 import (
 	"context"
-	"encoding/json"
-	"os"
-	"os/exec"
-	"path/filepath"
 	"testing"
 	"time"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
@@ -34,12 +29,12 @@ func awaitEnvironmentConnectionState(t *testing.T, ctx context.Context, pool *pg
 	t.Fatal("persisted connection state did not converge", status)
 }
 
-func retainedEnvironmentEvents(t *testing.T, ctx context.Context, s *store.Store, tenant, session, environment string) []v1.SessionEvent {
+func retainedEnvironmentEvents(t *testing.T, ctx context.Context, s *Store, tenant, session, environment string) []v1.SessionEvent {
 	t.Helper()
 	var after int64
 	events := []v1.SessionEvent{}
 	for {
-		changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session, after)
+		changes, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, session, after)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -67,23 +62,3 @@ func retainedEnvironmentEvents(t *testing.T, ctx context.Context, s *store.Store
 	}
 	return events
 }
-
-func verifyEnvironmentEventsWithSDK(t *testing.T, root string, events []v1.SessionEvent) {
-	t.Helper()
-	python := os.Getenv("OAC_TEST_OFFICIAL_SDK_PYTHON")
-	if python == "" {
-		t.Fatal("pinned official SDK is required for native Environment event acceptance")
-	}
-	raw, err := json.Marshal(events)
-	if err != nil {
-		t.Fatal(err)
-	}
-	path := filepath.Join(root, "environment-events.json")
-	if err := os.WriteFile(path, raw, 0600); err != nil {
-		t.Fatal(err)
-	}
-	command := exec.Command(python, "../../tests/official_environment_events.py", path)
-	if output, err := command.CombinedOutput(); err != nil {
-		t.Fatalf("official Environment event validation: %v\n%s", err, output)
-	}
-}
diff --git a/services/core/internal/store/environment_connection_migration_test.go b/services/core/tests/integration/environment_connection_migration_test.go
similarity index 99%
rename from services/core/internal/store/environment_connection_migration_test.go
rename to services/core/tests/integration/environment_connection_migration_test.go
index 58fd2e1ef..f48ba3360 100644
--- a/services/core/internal/store/environment_connection_migration_test.go
+++ b/services/core/tests/integration/environment_connection_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_connection_recovery_test.go b/services/core/tests/integration/environment_connection_recovery_test.go
similarity index 99%
rename from services/core/internal/store/environment_connection_recovery_test.go
rename to services/core/tests/integration/environment_connection_recovery_test.go
index bfe0d6d49..49fa10e2d 100644
--- a/services/core/internal/store/environment_connection_recovery_test.go
+++ b/services/core/tests/integration/environment_connection_recovery_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"testing"
diff --git a/services/core/internal/store/environment_connection_worker_test.go b/services/core/tests/integration/environment_connection_worker_test.go
similarity index 88%
rename from services/core/internal/store/environment_connection_worker_test.go
rename to services/core/tests/integration/environment_connection_worker_test.go
index 71badf7e2..a5d855f51 100644
--- a/services/core/internal/store/environment_connection_worker_test.go
+++ b/services/core/tests/integration/environment_connection_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,14 +10,13 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestEnvironmentConnectionWorkerReconcilesAndReleasesLease(t *testing.T) {
 	s, db := newTestStoreDB(t)
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "connection-worker", Configuration: []byte(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
+	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "connection-worker", Configuration: []byte(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/environment_connections_test.go b/services/core/tests/integration/environment_connections_test.go
similarity index 99%
rename from services/core/internal/store/environment_connections_test.go
rename to services/core/tests/integration/environment_connections_test.go
index 79242db7c..28ab46bb8 100644
--- a/services/core/internal/store/environment_connections_test.go
+++ b/services/core/tests/integration/environment_connections_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_device_test.go b/services/core/tests/integration/environment_device_test.go
similarity index 89%
rename from services/core/internal/store/environment_device_test.go
rename to services/core/tests/integration/environment_device_test.go
index e56cadc9e..493be5031 100644
--- a/services/core/internal/store/environment_device_test.go
+++ b/services/core/tests/integration/environment_device_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"errors"
@@ -7,14 +7,13 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerEnvironmentSelectsCapableDeviceWithoutMovingBinding(t *testing.T) {
 	for _, missing := range []string{"preparation", "local_environment", "durable_input_receipts"} {
 		t.Run(missing, func(t *testing.T) {
 			h := newDispatchHarness(t)
-			_, pool := store.NewTestStore(t)
+			_, pool := testStore(t)
 			enableWorkerEnvironment(t, h)
 			pending := unboundWorkerEnvironmentReservation(t, h)
 			bound := workerEnvironmentReservation(t, h)
@@ -37,7 +36,7 @@ func TestWorkerEnvironmentSelectsCapableDeviceWithoutMovingBinding(t *testing.T)
 			if _, err := fixtureSessionStore(h.db).GetSessionDevice(t.Context(), h.tenant, pending.SessionID); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("unregistered Runtime was assigned general compute", err)
 			}
-			session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, pending.SessionID)
+			session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, pending.SessionID)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -61,7 +60,7 @@ func TestWorkerEnvironmentSelectsCapableDeviceWithoutMovingBinding(t *testing.T)
 			}
 			stop()
 			for _, value := range []sessions.EnvironmentInputReservation{pending, bound} {
-				stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, value.SessionID, value.ID)
+				stored, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, value.SessionID, value.ID)
 				if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(value.Deadline) {
 					t.Fatal("device readiness changed pending input", err)
 				}
diff --git a/services/core/internal/store/environment_directory_active_test.go b/services/core/tests/integration/environment_directory_active_test.go
similarity index 87%
rename from services/core/internal/store/environment_directory_active_test.go
rename to services/core/tests/integration/environment_directory_active_test.go
index 2f6db1cf1..96696846f 100644
--- a/services/core/internal/store/environment_directory_active_test.go
+++ b/services/core/tests/integration/environment_directory_active_test.go
@@ -1,17 +1,16 @@
-package store_test
+package integration
 
 import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestEnvironmentDirectoryActiveRunUsesExistingOwner(t *testing.T) {
 	h, w, environment := directoryWorker(t)
 	awaitFixtureCapabilities(t, h, workerEnvironmentCapabilities())
-	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "execute", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "execute", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/environment_directory_test.go b/services/core/tests/integration/environment_directory_test.go
similarity index 97%
rename from services/core/internal/store/environment_directory_test.go
rename to services/core/tests/integration/environment_directory_test.go
index 4c24fa01d..aebfd8f0b 100644
--- a/services/core/internal/store/environment_directory_test.go
+++ b/services/core/tests/integration/environment_directory_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -130,11 +129,11 @@ func TestEnvironmentDirectoryWorkerReadsWithoutExecutionPrerequisites(t *testing
 	if got.err != nil || len(got.value.Entries) != 1 {
 		t.Fatal("directory result", got.err)
 	}
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity != nil {
 		t.Fatal("directory read manufactured execution")
 	}
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 	if err != nil || bound.Device.ID != h.device.ID || bound.NativeSessionID != "" {
 		t.Fatal("directory read changed native history identity")
 	}
diff --git a/services/core/internal/store/environment_executor_command_test.go b/services/core/tests/integration/environment_executor_command_test.go
similarity index 88%
rename from services/core/internal/store/environment_executor_command_test.go
rename to services/core/tests/integration/environment_executor_command_test.go
index 3dc6175ca..c0a906dcb 100644
--- a/services/core/internal/store/environment_executor_command_test.go
+++ b/services/core/tests/integration/environment_executor_command_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -9,7 +9,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -18,9 +17,9 @@ func TestEnvironmentExecutorOperatorCommand(t *testing.T) {
 	if binary == "" {
 		t.Skip("built environment-key operator executable required")
 	}
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	tenant := uuid.NewString()
-	principal := store.FixtureExecutorPrincipal(t, s, tenant)
+	principal := FixtureExecutorPrincipal(t, s, tenant)
 	keyID := uuid.NewString()
 	command := func(owner string, success bool, flags ...string) string {
 		t.Helper()
@@ -49,7 +48,7 @@ func TestEnvironmentExecutorOperatorCommand(t *testing.T) {
 	}
 	command(uuid.NewString(), false)
 	first := command(tenant, true)
-	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "operator-key", Configuration: json.RawMessage(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
+	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "operator-key", Configuration: json.RawMessage(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/environment_executor_credentials_test.go b/services/core/tests/integration/environment_executor_credentials_test.go
similarity index 99%
rename from services/core/internal/store/environment_executor_credentials_test.go
rename to services/core/tests/integration/environment_executor_credentials_test.go
index ad1de8b60..eda27d7fd 100644
--- a/services/core/internal/store/environment_executor_credentials_test.go
+++ b/services/core/tests/integration/environment_executor_credentials_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"crypto/rand"
diff --git a/services/core/internal/store/environment_executor_management_test.go b/services/core/tests/integration/environment_executor_management_test.go
similarity index 99%
rename from services/core/internal/store/environment_executor_management_test.go
rename to services/core/tests/integration/environment_executor_management_test.go
index e9f3bf138..a2f5a0d84 100644
--- a/services/core/internal/store/environment_executor_management_test.go
+++ b/services/core/tests/integration/environment_executor_management_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_expiry_dispatch_test.go b/services/core/tests/integration/environment_expiry_dispatch_test.go
similarity index 94%
rename from services/core/internal/store/environment_expiry_dispatch_test.go
rename to services/core/tests/integration/environment_expiry_dispatch_test.go
index 28770e2f1..7b57eb2be 100644
--- a/services/core/internal/store/environment_expiry_dispatch_test.go
+++ b/services/core/tests/integration/environment_expiry_dispatch_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -7,7 +7,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func enableEnvironmentExpiryDispatch(h *dispatchHarness) {
@@ -18,7 +17,7 @@ func enableEnvironmentExpiryDispatch(h *dispatchHarness) {
 
 func TestWorkerEnvironmentExpiryAtFullExecutionCapacity(t *testing.T) {
 	h := newDispatchHarness(t)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	enableEnvironmentExpiryDispatch(h)
 	worker, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
 	var requests []proto.Envelope
@@ -35,7 +34,7 @@ func TestWorkerEnvironmentExpiryAtFullExecutionCapacity(t *testing.T) {
 	makeEnvironmentExpiryDue(t, pool, &due)
 	waitEnvironmentExpiry(t, h.s, tenant, due)
 	for i, request := range requests {
-		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, active[i].ID, request.ID)
+		turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, active[i].ID, request.ID)
 		if err != nil || turn.Status != sessions.TurnInProgress {
 			t.Fatal("expiry was not observed at full capacity", turn, err)
 		}
@@ -51,7 +50,7 @@ func TestWorkerEnvironmentExpiryAtFullExecutionCapacity(t *testing.T) {
 
 func TestWorkerEnvironmentExpirySkipsBusySessionAndAllowsDispatch(t *testing.T) {
 	h := newDispatchHarness(t)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	enableEnvironmentExpiryDispatch(h)
 	lockedTenant, locked := newEnvironmentExpiryReservation(t, h.s)
 	otherTenant, other := newEnvironmentExpiryReservation(t, h.s)
diff --git a/services/core/internal/store/environment_expiry_worker_test.go b/services/core/tests/integration/environment_expiry_worker_test.go
similarity index 81%
rename from services/core/internal/store/environment_expiry_worker_test.go
rename to services/core/tests/integration/environment_expiry_worker_test.go
index 18dce54dc..44892e17d 100644
--- a/services/core/internal/store/environment_expiry_worker_test.go
+++ b/services/core/tests/integration/environment_expiry_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -11,22 +11,21 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-func newEnvironmentExpiryReservation(t *testing.T, s *store.Store) (string, sessions.EnvironmentInputReservation) {
+func newEnvironmentExpiryReservation(t *testing.T, s *Store) (string, sessions.EnvironmentInputReservation) {
 	t.Helper()
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: store.FixtureCreator(),
+	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(),
 		Engine: "codex", IdempotencyKey: "environment",
 		Configuration: json.RawMessage(`{"agent":{"model":"fixture-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`),
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
-	pending, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"wait for the environment"}`)}})
+	pending, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"wait for the environment"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -64,11 +63,11 @@ func startEnvironmentExpiryWorker(t *testing.T, db fixtureDB, d *execution.Dispa
 	return worker, stop
 }
 
-func waitEnvironmentExpiry(t *testing.T, s *store.Store, tenant string, pending sessions.EnvironmentInputReservation) {
+func waitEnvironmentExpiry(t *testing.T, s *Store, tenant string, pending sessions.EnvironmentInputReservation) {
 	t.Helper()
 	deadline := time.Now().Add(5 * time.Second)
 	for {
-		got, err := store.SessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, pending.SessionID, pending.ID)
+		got, err := sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, pending.SessionID, pending.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -107,7 +106,7 @@ func TestWorkerEnvironmentExpiryWithoutDevicesAndAfterRestart(t *testing.T) {
 	d := &execution.Dispatcher{Registry: runtimegateway.NewRegistry()}
 	_, stop := startEnvironmentExpiryWorker(t, db, d)
 	waitEnvironmentExpiry(t, s, dueTenant, due)
-	got, err := store.SessionAdapter(s).GetEnvironmentInputReservation(t.Context(), futureTenant, future.SessionID, future.ID)
+	got, err := sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), futureTenant, future.SessionID, future.ID)
 	if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(future.Deadline) {
 		t.Fatal("future input changed", got, err)
 	}
diff --git a/services/core/internal/store/environment_failure_migration_test.go b/services/core/tests/integration/environment_failure_migration_test.go
similarity index 99%
rename from services/core/internal/store/environment_failure_migration_test.go
rename to services/core/tests/integration/environment_failure_migration_test.go
index 20294c2d9..d6e094324 100644
--- a/services/core/internal/store/environment_failure_migration_test.go
+++ b/services/core/tests/integration/environment_failure_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_file_write_migration_test.go b/services/core/tests/integration/environment_file_write_migration_test.go
similarity index 99%
rename from services/core/internal/store/environment_file_write_migration_test.go
rename to services/core/tests/integration/environment_file_write_migration_test.go
index e582a0396..a1124e313 100644
--- a/services/core/internal/store/environment_file_write_migration_test.go
+++ b/services/core/tests/integration/environment_file_write_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_file_write_semantics_public_test.go b/services/core/tests/integration/environment_file_write_semantics_public_test.go
similarity index 95%
rename from services/core/internal/store/environment_file_write_semantics_public_test.go
rename to services/core/tests/integration/environment_file_write_semantics_public_test.go
index 7076eaa71..949e7206c 100644
--- a/services/core/internal/store/environment_file_write_semantics_public_test.go
+++ b/services/core/tests/integration/environment_file_write_semantics_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -15,7 +15,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -51,7 +50,7 @@ func serveFileWrite(h *dispatchHarness, final proto.WorkspaceWriteResultPayload)
 
 func TestEnvironmentFileCreateRejectionsLeaveNoReceiptOrConsumption(t *testing.T) {
 	h, w, environment := localWorker(t, true, false)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	if _, err := pool.Exec(t.Context(), `UPDATE environments SET status='connected' WHERE id=$1`, environment.ID); err != nil {
 		t.Fatal(err)
 	}
@@ -141,7 +140,7 @@ func TestEnvironmentFileCreateRejectionsLeaveNoReceiptOrConsumption(t *testing.T
 		done := post(token, environment.ID, tc.body)
 		id := serveFileWrite(h, rejected(tc.reason))
 		assertError(await(done), tc.message)
-		if intent, err := store.FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, id); err != nil || intent.State != "rejected" {
+		if intent, err := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, id); err != nil || intent.State != "rejected" {
 			t.Fatal("rejection did not settle", intent, err)
 		}
 	}
@@ -169,7 +168,7 @@ func TestEnvironmentFileCreateRejectionsLeaveNoReceiptOrConsumption(t *testing.T
 	if got := states(); !reflect.DeepEqual(got, map[string]int{"rejected": 3, "committed": 1}) {
 		t.Fatal("successor receipt", got)
 	}
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("file writes created model execution", err)
 	}
diff --git a/services/core/internal/store/environment_file_writes_test.go b/services/core/tests/integration/environment_file_writes_test.go
similarity index 99%
rename from services/core/internal/store/environment_file_writes_test.go
rename to services/core/tests/integration/environment_file_writes_test.go
index 73c342b23..2c4f598d3 100644
--- a/services/core/internal/store/environment_file_writes_test.go
+++ b/services/core/tests/integration/environment_file_writes_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/environment_initial_input_test.go b/services/core/tests/integration/environment_initial_input_test.go
similarity index 99%
rename from services/core/internal/store/environment_initial_input_test.go
rename to services/core/tests/integration/environment_initial_input_test.go
index 6db7757a2..5bd57dfff 100644
--- a/services/core/internal/store/environment_initial_input_test.go
+++ b/services/core/tests/integration/environment_initial_input_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_initial_migration_test.go b/services/core/tests/integration/environment_initial_migration_test.go
similarity index 99%
rename from services/core/internal/store/environment_initial_migration_test.go
rename to services/core/tests/integration/environment_initial_migration_test.go
index 867b6ade5..21a7524de 100644
--- a/services/core/internal/store/environment_initial_migration_test.go
+++ b/services/core/tests/integration/environment_initial_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_initial_public_test.go b/services/core/tests/integration/environment_initial_public_test.go
similarity index 91%
rename from services/core/internal/store/environment_initial_public_test.go
rename to services/core/tests/integration/environment_initial_public_test.go
index 9fb791611..12c062565 100644
--- a/services/core/internal/store/environment_initial_public_test.go
+++ b/services/core/tests/integration/environment_initial_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -13,7 +13,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -31,7 +30,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 	// Private setup isolates the persistence prerequisite from public creation admission.
 	configuration := json.RawMessage(`{"agent":{"id":"agent_initial_failure","model":"fixture","tools":[],"multi_agent":{"enabled":false,"max_concurrent_subagents":null},"reasoning":{},"service_tier":"auto","text":{"format":{"type":"text"},"verbosity":"medium"}},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)
 	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{
-		Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "initial", Configuration: configuration,
+		Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "initial", Configuration: configuration,
 		InitialInputs: []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"private-input-marker"}`)}},
 	})
 	if err != nil {
@@ -93,7 +92,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 	if err := db.pool.QueryRow(t.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1 AND is_initial RETURNING id", session.ID).Scan(&reservation); err != nil {
 		t.Fatal(err)
 	}
-	if result, err := store.SessionService(t, s).ExpireEnvironmentInput(t.Context(), tenant, session.ID, reservation); err != nil || result.State != sessions.EnvironmentInputExpired {
+	if result, err := sessionService(t, s).ExpireEnvironmentInput(t.Context(), tenant, session.ID, reservation); err != nil || result.State != sessions.EnvironmentInputExpired {
 		t.Fatal("initial reservation did not expire", result, err)
 	}
 	observed := <-done
diff --git a/services/core/internal/store/environment_initialization_test.go b/services/core/tests/integration/environment_initialization_test.go
similarity index 95%
rename from services/core/internal/store/environment_initialization_test.go
rename to services/core/tests/integration/environment_initialization_test.go
index 9e5778351..a18d50f6d 100644
--- a/services/core/internal/store/environment_initialization_test.go
+++ b/services/core/tests/integration/environment_initialization_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -24,7 +24,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func initializationState(t *testing.T, pool *pgxpool.Pool, tenant, environment string) string {
@@ -51,13 +50,13 @@ func awaitInitialization(t *testing.T, pool *pgxpool.Pool, tenant, environment,
 func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *testing.T) {
 	for _, outcome := range []string{"completed", "failed", "unknown", "unavailable", "revoked"} {
 		t.Run(outcome, func(t *testing.T) {
-			_, pool := store.NewManagedTestStore(t)
+			_, pool := newManagedTestStore(t)
 			cipher, err := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
 			if err != nil {
 				t.Fatal(err)
 			}
-			s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-			principal := store.FixtureExecutorPrincipal(t, s, uuid.NewString())
+			s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+			principal := FixtureExecutorPrincipal(t, s, uuid.NewString())
 			session, err := s.CreateSession(t.Context(), principal.TenantID, sessions.CreateSession{
 				Creator: principal.Subject(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 				Configuration:  json.RawMessage(`{"environment":{"type":"self_hosted","workspace_directory":"/home/user/work"}}`),
@@ -160,7 +159,7 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 				if peer.writes.Load() != expected {
 					t.Fatal("failed, unavailable or revoked effect replayed", peer.writes.Load())
 				}
-				value, err := store.SessionAdapter(s).GetSession(t.Context(), principal.TenantID, session.ID)
+				value, err := sessionAdapter(s).GetSession(t.Context(), principal.TenantID, session.ID)
 				if err != nil || value.EnvironmentFailure == nil {
 					t.Fatal("failure lost shared Session state", err)
 				}
@@ -173,7 +172,7 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 // it claims preparation. It must remain a per-Environment admission result.
 func TestEnvironmentInitializationRevocationBeforeClaim(t *testing.T) {
 	s, db := newManagedTestStoreDB(t)
-	principal := store.FixtureExecutorPrincipal(t, s, uuid.NewString())
+	principal := FixtureExecutorPrincipal(t, s, uuid.NewString())
 	create := func() sessions.EnvironmentInitialization {
 		t.Helper()
 		session, err := s.CreateSession(t.Context(), principal.TenantID, sessions.CreateSession{
diff --git a/services/core/internal/store/environment_input_activity_test.go b/services/core/tests/integration/environment_input_activity_test.go
similarity index 99%
rename from services/core/internal/store/environment_input_activity_test.go
rename to services/core/tests/integration/environment_input_activity_test.go
index b874348f9..a6e9b9bf3 100644
--- a/services/core/internal/store/environment_input_activity_test.go
+++ b/services/core/tests/integration/environment_input_activity_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_input_expiry_test.go b/services/core/tests/integration/environment_input_expiry_test.go
similarity index 99%
rename from services/core/internal/store/environment_input_expiry_test.go
rename to services/core/tests/integration/environment_input_expiry_test.go
index 4c003e0e6..340226271 100644
--- a/services/core/internal/store/environment_input_expiry_test.go
+++ b/services/core/tests/integration/environment_input_expiry_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_input_migration_test.go b/services/core/tests/integration/environment_input_migration_test.go
similarity index 99%
rename from services/core/internal/store/environment_input_migration_test.go
rename to services/core/tests/integration/environment_input_migration_test.go
index a792de72c..8e57ded17 100644
--- a/services/core/internal/store/environment_input_migration_test.go
+++ b/services/core/tests/integration/environment_input_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_input_settlement_test.go b/services/core/tests/integration/environment_input_settlement_test.go
similarity index 99%
rename from services/core/internal/store/environment_input_settlement_test.go
rename to services/core/tests/integration/environment_input_settlement_test.go
index ac8ee7b74..d5e8f4472 100644
--- a/services/core/internal/store/environment_input_settlement_test.go
+++ b/services/core/tests/integration/environment_input_settlement_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environment_installation_test.go b/services/core/tests/integration/environment_installation_test.go
similarity index 99%
rename from services/core/internal/store/environment_installation_test.go
rename to services/core/tests/integration/environment_installation_test.go
index 2b25b5e38..e4282f866 100644
--- a/services/core/internal/store/environment_installation_test.go
+++ b/services/core/tests/integration/environment_installation_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/environment_mcp_public_test.go b/services/core/tests/integration/environment_mcp_public_test.go
similarity index 96%
rename from services/core/internal/store/environment_mcp_public_test.go
rename to services/core/tests/integration/environment_mcp_public_test.go
index 20e61f076..e616943e9 100644
--- a/services/core/internal/store/environment_mcp_public_test.go
+++ b/services/core/tests/integration/environment_mcp_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -9,7 +9,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestPublicEnvironmentMCPUsesAttachedVaultSelection(t *testing.T) {
@@ -23,7 +22,7 @@ func TestPublicEnvironmentMCPUsesAttachedVaultSelection(t *testing.T) {
 			}
 			send := func(origin string, vaults []string, cred any, allowed any, required bool) *httptest.ResponseRecorder {
 				tool := map[string]any{"type": "mcp", "server_label": "proof", "connection_origin": origin, "credential_id": cred, "allowed_tools": allowed, "required": required, "transport": map[string]string{"type": "http", "server_url": "https://tools.example/mcp"}}
-				body := map[string]any{"agent": map[string]any{"model": "model", "tools": []any{tool}}, "environment": map[string]string{"type": "self_hosted", "workspace_directory": "/workspace"}, "vault_ids": vaults, "x_agents_core": map[string]any{"model_provider": store.FixtureModelProvider(kind)}}
+				body := map[string]any{"agent": map[string]any{"model": "model", "tools": []any{tool}}, "environment": map[string]string{"type": "self_hosted", "workspace_directory": "/workspace"}, "vault_ids": vaults, "x_agents_core": map[string]any{"model_provider": FixtureModelProvider(kind)}}
 				raw, _ := json.Marshal(body)
 				req := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(string(raw)))
 				req.Header.Set("Authorization", "Bearer test-token")
diff --git a/services/core/internal/store/environment_plugins_test.go b/services/core/tests/integration/environment_plugins_test.go
similarity index 99%
rename from services/core/internal/store/environment_plugins_test.go
rename to services/core/tests/integration/environment_plugins_test.go
index 1a0ffa94f..030ffec5e 100644
--- a/services/core/internal/store/environment_plugins_test.go
+++ b/services/core/tests/integration/environment_plugins_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"archive/zip"
diff --git a/services/core/internal/store/environment_retrieve_public_test.go b/services/core/tests/integration/environment_retrieve_public_test.go
similarity index 96%
rename from services/core/internal/store/environment_retrieve_public_test.go
rename to services/core/tests/integration/environment_retrieve_public_test.go
index 4fb1b5214..6223410f6 100644
--- a/services/core/internal/store/environment_retrieve_public_test.go
+++ b/services/core/tests/integration/environment_retrieve_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -13,7 +13,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -24,7 +23,7 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 	}
 	s, db := newModelTestStoreDB(t)
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
-	principal := store.FixtureExecutorPrincipal(t, s, tenant)
+	principal := FixtureExecutorPrincipal(t, s, tenant)
 	token, peer, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: principal.OrganizationID, ProjectID: tenant, SubjectKind: principal.SubjectKind, SubjectID: principal.SubjectID, TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
diff --git a/services/core/internal/store/environment_runtime_fixture_test.go b/services/core/tests/integration/environment_runtime_fixture_test.go
similarity index 94%
rename from services/core/internal/store/environment_runtime_fixture_test.go
rename to services/core/tests/integration/environment_runtime_fixture_test.go
index 1366e4d2f..1b35f5d11 100644
--- a/services/core/internal/store/environment_runtime_fixture_test.go
+++ b/services/core/tests/integration/environment_runtime_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"net/http"
@@ -9,18 +9,17 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 )
 
-func enrollFixtureSession(t *testing.T, s *store.Store, db fixtureDB, tenant string, session sessions.Session) (sessions.ExecutionDevice, string) {
+func enrollFixtureSession(t *testing.T, s *Store, db fixtureDB, tenant string, session sessions.Session) (sessions.ExecutionDevice, string) {
 	t.Helper()
 	environment, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	principal := store.FixtureExecutorPrincipal(t, s, tenant)
+	principal := FixtureExecutorPrincipal(t, s, tenant)
 	key, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
 	if err != nil {
 		t.Fatal(err)
@@ -103,7 +102,7 @@ func completeEmptyArtifactExport(t *testing.T, h *dispatchHarness, frames ...<-c
 
 func assertNoRuntimeAllocation(t *testing.T, h *dispatchHarness) {
 	t.Helper()
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	var count int
 	if err := pool.QueryRow(t.Context(), "SELECT count(*) FROM runtime_allocations WHERE environment_id IN (SELECT id FROM environments WHERE session_id=$1)", h.session.ID).Scan(&count); err != nil || count != 0 {
 		t.Fatal("self-hosted fixture allocated managed compute", count, err)
diff --git a/services/core/internal/store/environment_setup_test.go b/services/core/tests/integration/environment_setup_test.go
similarity index 99%
rename from services/core/internal/store/environment_setup_test.go
rename to services/core/tests/integration/environment_setup_test.go
index b30dec563..c033371f3 100644
--- a/services/core/internal/store/environment_setup_test.go
+++ b/services/core/tests/integration/environment_setup_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/environment_work_test.go b/services/core/tests/integration/environment_work_test.go
similarity index 73%
rename from services/core/internal/store/environment_work_test.go
rename to services/core/tests/integration/environment_work_test.go
index 0c07a6321..d8efad184 100644
--- a/services/core/internal/store/environment_work_test.go
+++ b/services/core/tests/integration/environment_work_test.go
@@ -1,17 +1,16 @@
-package store_test
+package integration
 
 import (
 	"errors"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 	h := newDispatchHarness(t)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	wanted := map[string]string{}
 	for range 103 {
 		pending := workerEnvironmentReservation(t, h)
@@ -23,14 +22,14 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 		case "expired":
 			makeEnvironmentExpiryDue(t, pool, &pending)
 		case "cancelled":
-			if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, pending.SessionID, pending.ID); err != nil {
+			if _, err := cancelEnvironmentInput(t.Context(), h.s, h.tenant, pending.SessionID, pending.ID); err != nil {
 				t.Fatal(err)
 			}
 		case "deleted":
-			if err := store.SessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: pending.SessionID}); !errors.Is(err, sessions.ErrNotIdle) {
+			if err := sessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: pending.SessionID}); !errors.Is(err, sessions.ErrNotIdle) {
 				t.Fatal("pending input deleted", err)
 			}
-			if err := h.s.CommitLegacyDeletion(t.Context(), h.tenant, pending.SessionID); err != nil {
+			if err := h.s.commitLegacyDeletion(t.Context(), h.tenant, pending.SessionID); err != nil {
 				t.Fatal(err)
 			}
 		case "unbound":
@@ -44,7 +43,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 				if err := fixtureSessionService(t, h.db).RevokeDevice(t.Context(), h.tenant, runtime.device.ID); err != nil {
 					t.Fatal(err)
 				}
-				work, err := store.SessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), "", []string{runtime.device.ID})
+				work, err := sessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), "", []string{runtime.device.ID})
 				if err != nil || len(work) != 0 {
 					t.Fatal("revoked Runtime selected", work, err)
 				}
@@ -55,7 +54,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 		}
 	}
 	for _, devices := range [][]string{nil, {}, {uuid.NewString()}} {
-		work, err := store.SessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), "", devices)
+		work, err := sessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), "", devices)
 		if err != nil || len(work) != 0 {
 			t.Fatal("unconnected work selected", work, err)
 		}
@@ -67,7 +66,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 		for _, runtime := range h.environments {
 			devices = append(devices, runtime.device.ID)
 		}
-		work, err := store.SessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), cursor, devices)
+		work, err := sessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), cursor, devices)
 		if err != nil || len(work) != count {
 			t.Fatal("environment work page", len(work), count, err)
 		}
diff --git a/services/core/internal/store/environment_worker_helpers_test.go b/services/core/tests/integration/environment_worker_helpers_test.go
similarity index 79%
rename from services/core/internal/store/environment_worker_helpers_test.go
rename to services/core/tests/integration/environment_worker_helpers_test.go
index 4ea8d7485..d587a3ca4 100644
--- a/services/core/internal/store/environment_worker_helpers_test.go
+++ b/services/core/tests/integration/environment_worker_helpers_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -34,7 +33,7 @@ func workerEnvironmentCapabilities() proto.AgentKindCapabilities {
 func workerEnvironmentReservation(t *testing.T, h *dispatchHarness) sessions.EnvironmentInputReservation {
 	t.Helper()
 	pending := unboundWorkerEnvironmentReservation(t, h)
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, pending.SessionID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, pending.SessionID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -44,11 +43,11 @@ func workerEnvironmentReservation(t *testing.T, h *dispatchHarness) sessions.Env
 
 func unboundWorkerEnvironmentReservation(t *testing.T, h *dispatchHarness) sessions.EnvironmentInputReservation {
 	t.Helper()
-	session, err := h.s.CreateSession(t.Context(), h.tenant, store.WithFixtureModelProvider(sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)}))
+	session, err := h.s.CreateSession(t.Context(), h.tenant, WithFixtureModelProvider(sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)}))
 	if err != nil {
 		t.Fatal(err)
 	}
-	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "work", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "work", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -110,19 +109,19 @@ func nextWorkerFrame(t *testing.T, frames <-chan proto.Envelope, kind string) pr
 	}
 }
 
-func awaitWorkerEnvironmentRun(t *testing.T, ctx context.Context, s *store.Store, tenant string, pending sessions.EnvironmentInputReservation) execution.EnvironmentRun {
+func awaitWorkerEnvironmentRun(t *testing.T, ctx context.Context, s *Store, tenant string, pending sessions.EnvironmentInputReservation) execution.EnvironmentRun {
 	t.Helper()
 	var run execution.EnvironmentRun
 	awaitDaemonRemoteCondition(t, ctx, 5*time.Minute, "worker terminal Environment Turn", func() bool {
 		var err error
-		run.Reservation, err = store.SessionAdapter(s).GetEnvironmentInputReservation(ctx, tenant, pending.SessionID, pending.ID)
+		run.Reservation, err = sessionAdapter(s).GetEnvironmentInputReservation(ctx, tenant, pending.SessionID, pending.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
 		if len(run.Reservation.Receipts) == 0 {
 			return false
 		}
-		run.Turn, err = store.SessionAdapter(s).GetTurn(ctx, tenant, pending.SessionID, run.Reservation.Receipts[0].TurnID)
+		run.Turn, err = sessionAdapter(s).GetTurn(ctx, tenant, pending.SessionID, run.Reservation.Receipts[0].TurnID)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/store/environment_worker_scan_test.go b/services/core/tests/integration/environment_worker_scan_test.go
similarity index 92%
rename from services/core/internal/store/environment_worker_scan_test.go
rename to services/core/tests/integration/environment_worker_scan_test.go
index 56860b921..2d255ade0 100644
--- a/services/core/internal/store/environment_worker_scan_test.go
+++ b/services/core/tests/integration/environment_worker_scan_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"testing"
@@ -6,7 +6,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerEnvironmentRetriesNewlyReadyAtNextScan(t *testing.T) {
@@ -44,7 +43,7 @@ func TestWorkerEnvironmentRetriesNewlyReadyAtNextScan(t *testing.T) {
 	runtime.write(prepare.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{Handle: handle, Revision: 2, State: "failed"})
 	nextWorkerFrame(t, frames, proto.TypeExecutionRelease)
 	stop()
-	stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, pending.SessionID, pending.ID)
+	stored, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, pending.SessionID, pending.ID)
 	if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(pending.Deadline) || len(stored.Receipts) != 0 {
 		t.Fatal("readiness retry changed pending identity or admitted work", stored, err)
 	}
@@ -60,7 +59,7 @@ func TestWorkerEnvironmentPaginationReachesReadyTail(t *testing.T) {
 			last = pending
 		}
 	}
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, last.SessionID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, last.SessionID)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/environment_worker_test.go b/services/core/tests/integration/environment_worker_test.go
similarity index 95%
rename from services/core/internal/store/environment_worker_test.go
rename to services/core/tests/integration/environment_worker_test.go
index 58d851208..da3aaf6f6 100644
--- a/services/core/internal/store/environment_worker_test.go
+++ b/services/core/tests/integration/environment_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -8,12 +8,11 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerEnvironmentSharesCapacityThroughClaimAndCleanup(t *testing.T) {
 	h := newDispatchHarness(t)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	enableWorkerEnvironment(t, h)
 	pending := map[string]sessions.EnvironmentInputReservation{}
 	for range 2 {
@@ -82,7 +81,7 @@ func TestWorkerEnvironmentSharesCapacityThroughClaimAndCleanup(t *testing.T) {
 	tenant, due := newEnvironmentExpiryReservation(t, h.s)
 	makeEnvironmentExpiryDue(t, pool, &due)
 	waitEnvironmentExpiry(t, h.s, tenant, due)
-	if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, waiting.SessionID, waiting.ID); err != nil {
+	if _, err := cancelEnvironmentInput(t.Context(), h.s, h.tenant, waiting.SessionID, waiting.ID); err != nil {
 		t.Fatal(err)
 	}
 	// Distinct Runtime sockets do not promise cross-socket delivery order.
@@ -159,7 +158,7 @@ func TestWorkerEnvironmentRetriesPendingWithoutExtendingDeadline(t *testing.T) {
 	}
 	stop()
 	nextWorkerFrame(t, frames, proto.TypeExecutionRelease)
-	stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, pending.SessionID, pending.ID)
+	stored, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, pending.SessionID, pending.ID)
 	if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(pending.Deadline) || len(stored.Receipts) != 0 {
 		t.Fatal("retry or shutdown changed the original reservation", stored, err)
 	}
diff --git a/services/core/internal/store/environment_write_audit_test.go b/services/core/tests/integration/environment_write_audit_test.go
similarity index 99%
rename from services/core/internal/store/environment_write_audit_test.go
rename to services/core/tests/integration/environment_write_audit_test.go
index eeb8afbf6..f58f18064 100644
--- a/services/core/internal/store/environment_write_audit_test.go
+++ b/services/core/tests/integration/environment_write_audit_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/environments_migration_test.go b/services/core/tests/integration/environments_migration_test.go
similarity index 99%
rename from services/core/internal/store/environments_migration_test.go
rename to services/core/tests/integration/environments_migration_test.go
index 2566751b2..2645ed971 100644
--- a/services/core/internal/store/environments_migration_test.go
+++ b/services/core/tests/integration/environments_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/environments_test.go b/services/core/tests/integration/environments_test.go
similarity index 99%
rename from services/core/internal/store/environments_test.go
rename to services/core/tests/integration/environments_test.go
index 45f909038..ee0c7a98f 100644
--- a/services/core/internal/store/environments_test.go
+++ b/services/core/tests/integration/environments_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/execution_events_test.go b/services/core/tests/integration/execution_events_test.go
similarity index 92%
rename from services/core/internal/store/execution_events_test.go
rename to services/core/tests/integration/execution_events_test.go
index 5e8b963e9..9588652e5 100644
--- a/services/core/internal/store/execution_events_test.go
+++ b/services/core/tests/integration/execution_events_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestExecutionPersistsLiveAndCancelledPartialOutput(t *testing.T) {
@@ -23,7 +22,7 @@ func TestExecutionPersistsLiveAndCancelledPartialOutput(t *testing.T) {
 	h.write(input.TurnID, proto.TypeToolCall, proto.ToolCallPayload{ID: "tool-1", Name: "Bash", Stage: "before", Observation: &proto.ToolObservation{Kind: "command", Command: "pwd", Status: "in_progress"}})
 	h.write(input.TurnID, proto.TypeToolCall, proto.ToolCallPayload{ID: "tool-1", Name: "Bash", Stage: "after", Observation: &proto.ToolObservation{Kind: "command", Command: "pwd", Status: "completed"}})
 	h.write(input.TurnID, proto.TypeUsage, proto.UsagePayload{Usage: proto.Usage{InputTokens: 11, OutputTokens: 2}})
-	reopened, pool := store.NewTestStore(t)
+	reopened, pool := testStore(t)
 	defer pool.Close()
 	deadline := time.Now().Add(5 * time.Second)
 	for {
@@ -39,7 +38,7 @@ func TestExecutionPersistsLiveAndCancelledPartialOutput(t *testing.T) {
 		}
 		time.Sleep(20 * time.Millisecond)
 	}
-	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "stop"); err != nil {
+	if _, err := requestCancel(ctx, h.s, h.tenant, h.session.ID, "stop"); err != nil {
 		t.Fatal(err)
 	}
 	cancelEnv := h.read(proto.TypePromptCancel)
@@ -81,7 +80,7 @@ func TestExecutionDoesNotCompleteAfterEventPersistenceFailure(t *testing.T) {
 	input := h.message("start", "Output beyond storage budget")
 	result := h.run(ctx, input.TurnID)
 	h.read(testExecutionRequest)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	defer pool.Close()
 	if _, err := pool.Exec(ctx, "UPDATE turns SET event_bytes=33554432 WHERE id=$1", input.TurnID); err != nil {
 		t.Fatal(err)
@@ -94,7 +93,7 @@ func TestExecutionDoesNotCompleteAfterEventPersistenceFailure(t *testing.T) {
 	if outcome.ErrorCode != "event_persistence_failed" {
 		t.Fatal(outcome.ErrorCode)
 	}
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "failed-native" || outcome.Done.Usage.InputTokens != 13 {
 		t.Fatalf("terminal failure lost native continuity or usage: %+v %+v %v", bound, outcome, err)
 	}
diff --git a/services/core/internal/store/execution_messages_test.go b/services/core/tests/integration/execution_messages_test.go
similarity index 94%
rename from services/core/internal/store/execution_messages_test.go
rename to services/core/tests/integration/execution_messages_test.go
index 3df7562ee..860192ca2 100644
--- a/services/core/internal/store/execution_messages_test.go
+++ b/services/core/tests/integration/execution_messages_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestExecutionNegotiatesAndPersistsMessageObservations(t *testing.T) {
@@ -54,7 +53,7 @@ func TestExecutionNegotiatesAndPersistsMessageObservations(t *testing.T) {
 	h.write(input.TurnID, proto.TypeOutputMessage, proto.OutputMessagePayload{ID: "a", Status: "completed", Phase: "commentary", Text: &text})
 	h.write(input.TurnID, proto.TypeOutputMessage, proto.OutputMessagePayload{ID: "b", Status: "in_progress", Phase: "final_answer"})
 	h.write(input.TurnID, proto.TypeDelta, proto.DeltaPayload{ItemID: "b", Delta: "partial", Sequence: 2})
-	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
+	if _, err := requestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
 	env = h.read(proto.TypePromptCancel)
@@ -62,7 +61,7 @@ func TestExecutionNegotiatesAndPersistsMessageObservations(t *testing.T) {
 	_ = env.DecodePayload(&cancel)
 	h.write(input.TurnID, proto.TypeInteractionDecisionAck, proto.InteractionDecisionAckPayload{DeliveryID: cancel.DeliveryID, Applied: true, Outcome: &proto.DonePayload{}})
 	h.finished(result, sessions.TurnCancelled)
-	reopened, pool := store.NewTestStore(t)
+	reopened, pool := testStore(t)
 	defer pool.Close()
 	events, err := reopened.ListTurnEvents(ctx, h.tenant, h.session.ID, input.TurnID, 0, 100)
 	if err != nil {
diff --git a/services/core/internal/store/execution_test.go b/services/core/tests/integration/execution_test.go
similarity index 99%
rename from services/core/internal/store/execution_test.go
rename to services/core/tests/integration/execution_test.go
index 8104027e5..0be73a2e7 100644
--- a/services/core/internal/store/execution_test.go
+++ b/services/core/tests/integration/execution_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/execution_tools_test.go b/services/core/tests/integration/execution_tools_test.go
similarity index 93%
rename from services/core/internal/store/execution_tools_test.go
rename to services/core/tests/integration/execution_tools_test.go
index 2db63f908..d1cd4a85d 100644
--- a/services/core/internal/store/execution_tools_test.go
+++ b/services/core/tests/integration/execution_tools_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -9,7 +9,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestExecutionNegotiatesAndPersistsToolObservations(t *testing.T) {
@@ -40,7 +39,7 @@ func TestExecutionNegotiatesAndPersistsToolObservations(t *testing.T) {
 		}
 		h.write(input.TurnID, proto.TypeToolCall, proto.ToolCallPayload{ID: id, Stage: stage, Observation: &observation})
 	}
-	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
+	if _, err := requestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
 	env = h.read(proto.TypePromptCancel)
@@ -48,7 +47,7 @@ func TestExecutionNegotiatesAndPersistsToolObservations(t *testing.T) {
 	_ = env.DecodePayload(&cancel)
 	h.write(input.TurnID, proto.TypeInteractionDecisionAck, proto.InteractionDecisionAckPayload{DeliveryID: cancel.DeliveryID, Applied: true, Outcome: &proto.DonePayload{}})
 	h.finished(result, sessions.TurnCancelled)
-	reopened, pool := store.NewTestStore(t)
+	reopened, pool := testStore(t)
 	defer pool.Close()
 	events, err := reopened.ListTurnEvents(ctx, h.tenant, h.session.ID, input.TurnID, 0, 100)
 	if err != nil {
diff --git a/services/core/internal/store/executor_fixture_test.go b/services/core/tests/integration/executor_fixture_test.go
similarity index 99%
rename from services/core/internal/store/executor_fixture_test.go
rename to services/core/tests/integration/executor_fixture_test.go
index 6c304fd0e..36008c6e6 100644
--- a/services/core/internal/store/executor_fixture_test.go
+++ b/services/core/tests/integration/executor_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
diff --git a/services/core/internal/store/executor_principals_migration_test.go b/services/core/tests/integration/executor_principals_migration_test.go
similarity index 99%
rename from services/core/internal/store/executor_principals_migration_test.go
rename to services/core/tests/integration/executor_principals_migration_test.go
index 258634aa3..808e69a2a 100644
--- a/services/core/internal/store/executor_principals_migration_test.go
+++ b/services/core/tests/integration/executor_principals_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/executor_principals_test.go b/services/core/tests/integration/executor_principals_test.go
similarity index 99%
rename from services/core/internal/store/executor_principals_test.go
rename to services/core/tests/integration/executor_principals_test.go
index e6921f229..eadc5ad1e 100644
--- a/services/core/internal/store/executor_principals_test.go
+++ b/services/core/tests/integration/executor_principals_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/executor_recovery_test.go b/services/core/tests/integration/executor_recovery_test.go
similarity index 99%
rename from services/core/internal/store/executor_recovery_test.go
rename to services/core/tests/integration/executor_recovery_test.go
index f8c511338..6b29660a0 100644
--- a/services/core/internal/store/executor_recovery_test.go
+++ b/services/core/tests/integration/executor_recovery_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"testing"
diff --git a/services/core/internal/store/file_resource_semantics_public_test.go b/services/core/tests/integration/file_resource_semantics_public_test.go
similarity index 89%
rename from services/core/internal/store/file_resource_semantics_public_test.go
rename to services/core/tests/integration/file_resource_semantics_public_test.go
index 2007062e5..c2290b747 100644
--- a/services/core/internal/store/file_resource_semantics_public_test.go
+++ b/services/core/tests/integration/file_resource_semantics_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -21,7 +20,7 @@ func TestFileResourceSemanticsOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{53}, 32))
 	if err != nil {
 		t.Fatal(err)
@@ -33,7 +32,7 @@ func TestFileResourceSemanticsOfficialClientPostgres(t *testing.T) {
 	})
 	newServer := func() *httptest.Server {
 		t.Helper()
-		s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+		s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 		h, err := publicHandler(t, s, db, auth, "codex")
 		if err != nil {
 			t.Fatal(err)
diff --git a/services/core/internal/store/fixture_db_test.go b/services/core/tests/integration/fixture_db_test.go
similarity index 84%
rename from services/core/internal/store/fixture_db_test.go
rename to services/core/tests/integration/fixture_db_test.go
index 88259eaac..5f7361505 100644
--- a/services/core/internal/store/fixture_db_test.go
+++ b/services/core/tests/integration/fixture_db_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -14,33 +14,31 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // fixtureDB is the database and credential key that built the test's Store.
-// Cutovers build their adapters from it; add fields here, never parameters.
 type fixtureDB struct {
 	pool      *pgxpool.Pool
 	cipher    *credentialcrypto.Cipher // nil for a keyless Store
 	publicURL string                   // the public URL of the Store's placement rules, if any
 }
 
-// newTestStoreDB is store.NewTestStore with the fixtureDB that built it.
-func newTestStoreDB(t *testing.T) (*store.Store, fixtureDB) {
-	s, pool := store.NewTestStore(t)
+// newTestStoreDB is testStore with the fixtureDB that built it.
+func newTestStoreDB(t *testing.T) (*Store, fixtureDB) {
+	s, pool := testStore(t)
 	return s, fixtureDB{pool: pool}
 }
 
-// newModelTestStoreDB is store.NewModelTestStore with the fixtureDB that built it.
-func newModelTestStoreDB(t *testing.T) (*store.Store, fixtureDB) {
-	s, pool := store.NewModelTestStore(t)
-	return s, fixtureDB{pool: pool, cipher: store.FixtureCipher()}
+// newModelTestStoreDB is NewModelTestStore with the fixtureDB that built it.
+func newModelTestStoreDB(t *testing.T) (*Store, fixtureDB) {
+	s, pool := NewModelTestStore(t)
+	return s, fixtureDB{pool: pool, cipher: fixtureCipher}
 }
 
-// newManagedTestStoreDB is store.NewManagedTestStore with the fixtureDB that built it.
-func newManagedTestStoreDB(t *testing.T) (*store.Store, fixtureDB) {
-	s, pool := store.NewManagedTestStore(t)
-	return s, fixtureDB{pool: pool, cipher: store.FixtureCipher()}
+// newManagedTestStoreDB is newManagedTestStore with the fixtureDB that built it.
+func newManagedTestStoreDB(t *testing.T) (*Store, fixtureDB) {
+	s, pool := newManagedTestStore(t)
+	return s, fixtureDB{pool: pool, cipher: fixtureCipher}
 }
 
 // startWorker starts the execution Worker as cmd/server does: it acquires the
diff --git a/services/core/internal/store/export_test.go b/services/core/tests/integration/fixtures_test.go
similarity index 69%
rename from services/core/internal/store/export_test.go
rename to services/core/tests/integration/fixtures_test.go
index 50d908034..c23832821 100644
--- a/services/core/internal/store/export_test.go
+++ b/services/core/tests/integration/fixtures_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
@@ -20,47 +20,9 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-func NewTestStore(t *testing.T) (*Store, *pgxpool.Pool) { return testStore(t) }
-
-// SessionAdapter is the Session adapter on s's pool and credential key.
-func SessionAdapter(s *Store) *sessionpg.Store { return sessionAdapter(s) }
-
-// SessionService is the Session service on SessionAdapter(s).
-func SessionService(t testing.TB, s *Store) *sessions.Service { return sessionService(t, s) }
-
-// SubmitInputs admits inputs through the Session service on s's database.
-func SubmitInputs(ctx context.Context, s *Store, tenant, session, key string, inputs []sessions.Input) ([]sessions.InputReceipt, error) {
-	return submitInputs(ctx, s, tenant, session, key, inputs)
-}
-
-// SendMessage admits one message input with payload.
-func SendMessage(ctx context.Context, s *Store, tenant, session, key string, payload json.RawMessage) (sessions.InputReceipt, error) {
-	return sendMessage(ctx, s, tenant, session, key, payload)
-}
-
-// RequestCancel admits one cancel input.
-func RequestCancel(ctx context.Context, s *Store, tenant, session, key string) (sessions.InputReceipt, error) {
-	return requestCancel(ctx, s, tenant, session, key)
-}
-
-// CancelEnvironmentInput cancels the Session's pending Environment input as
-// Session cancellation does, then reads the reservation back.
-func CancelEnvironmentInput(ctx context.Context, s *Store, tenant, session, reservation string) (sessions.EnvironmentInputReservation, error) {
-	return cancelEnvironmentInput(ctx, s, tenant, session, reservation)
-}
-
-// TransitionTurn moves the Turn as the execution owner does, in a Session
-// transaction on s's writer.
-func TransitionTurn(ctx context.Context, s *Store, tenant, session, turn string, transition sessions.TurnTransition) (sessions.Turn, error) {
-	return transitionTurn(ctx, s, tenant, session, turn, transition)
-}
-
 var fixtureCipher, _ = credentialcrypto.New(bytes.Repeat([]byte{61}, 32))
 
-// FixtureCipher is the credential key of NewModelTestStore, for reopened stores.
-func FixtureCipher() *credentialcrypto.Cipher { return fixtureCipher }
-
-// NewModelTestStore is NewTestStore with a fixture credential key, so Sessions
+// NewModelTestStore is testStore with a fixture credential key, so Sessions
 // can freeze a model provider.
 func NewModelTestStore(t *testing.T) (*Store, *pgxpool.Pool) {
 	_, pool := testStore(t)
@@ -113,15 +75,6 @@ func FixtureExecutorPrincipal(t *testing.T, s *Store, tenant string) identity.Pr
 	return p
 }
 
-// SkillArchive builds a minimal valid Skill archive for public HTTP fixtures.
-func SkillArchive(t *testing.T, marker string) []byte { return skillArchive(t, marker) }
-
-// CommitLegacyDeletion commits a deletion marker the way releases before the
-// idle-only deletion rule did, for Sessions that public deletion now rejects.
-func (s *Store) CommitLegacyDeletion(ctx context.Context, tenantID, sessionID string) error {
-	return s.commitLegacyDeletion(ctx, tenantID, sessionID)
-}
-
 // FixtureFunctionCall reads a stored function call of the Turn from the test's
 // database for assertions. A call outside the tenant's Session and Turn is
 // sessions.ErrNotFound.
@@ -165,6 +118,6 @@ func SubmitFixtureFunctionResult(ctx context.Context, s *Store, tenantID, sessio
 	if err != nil {
 		return err
 	}
-	_, err = SubmitInputs(ctx, s, tenantID, sessionID, uuid.NewString(), []sessions.Input{{Kind: "tool_result", Payload: payload}})
+	_, err = submitInputs(ctx, s, tenantID, sessionID, uuid.NewString(), []sessions.Input{{Kind: "tool_result", Payload: payload}})
 	return err
 }
diff --git a/services/core/internal/store/function_execution_native_test.go b/services/core/tests/integration/function_execution_native_test.go
similarity index 74%
rename from services/core/internal/store/function_execution_native_test.go
rename to services/core/tests/integration/function_execution_native_test.go
index 665b98188..c19732859 100644
--- a/services/core/internal/store/function_execution_native_test.go
+++ b/services/core/tests/integration/function_execution_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -7,7 +7,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T) {
@@ -15,7 +14,7 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 	model, output, requests := nativeFunctionModel(t, home)
 	defer model.Close()
 	var err error
-	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "native-functions", Configuration: json.RawMessage(functionConfiguration), ModelProvider: nativeModelProvider(model), ModelProviderSource: v1.ModelProviderSourceDeployment})
+	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "native-functions", Configuration: json.RawMessage(functionConfiguration), ModelProvider: nativeModelProvider(model), ModelProviderSource: v1.ModelProviderSourceDeployment})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -32,7 +31,7 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 			t.Fatal(action, state.LastTurn)
 		}
 		if index == 2 {
-			if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "native-cancel"); err != nil {
+			if _, err := requestCancel(ctx, h.s, h.tenant, h.session.ID, "native-cancel"); err != nil {
 				t.Fatal(err)
 			}
 			h.finished(running, sessions.TurnCancelled)
@@ -44,12 +43,12 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 		}
 		raw, _ := json.Marshal(value)
 		for range 2 {
-			if err := store.SubmitFixtureFunctionResult(ctx, h.s, h.tenant, h.session.ID, input.TurnID, action.CallID, raw); err != nil {
+			if err := SubmitFixtureFunctionResult(ctx, h.s, h.tenant, h.session.ID, input.TurnID, action.CallID, raw); err != nil {
 				t.Fatal(err)
 			}
 		}
 		h.finished(running, sessions.TurnCompleted)
-		saved, err := store.FixtureFunctionCall(ctx, h.db.pool, h.tenant, h.session.ID, input.TurnID, action.CallID)
+		saved, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, h.session.ID, input.TurnID, action.CallID)
 		if err != nil || !saved.Applied {
 			t.Fatal(saved, err)
 		}
@@ -66,7 +65,7 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 		if !found {
 			t.Fatal("required action identity differs from recovered function item")
 		}
-		bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+		bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 		if err != nil || bound.NativeSessionID == "" || (nativeID != "" && bound.NativeSessionID != nativeID) {
 			t.Fatal(bound, err)
 		}
diff --git a/services/core/internal/store/function_execution_test.go b/services/core/tests/integration/function_execution_test.go
similarity index 85%
rename from services/core/internal/store/function_execution_test.go
rename to services/core/tests/integration/function_execution_test.go
index 95e6c0835..28dd4ea59 100644
--- a/services/core/internal/store/function_execution_test.go
+++ b/services/core/tests/integration/function_execution_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/items"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 const functionConfiguration = `{"agent":{"model":"gpt-5.5","tools":[{"type":"function","name":"lookup_ticket","description":"Read a synthetic ticket","parameters":{"type":"object","properties":{"ticket":{"type":"string"}},"required":["ticket"],"additionalProperties":false},"defer_loading":false}]},"environment":{"type":"none"}}`
@@ -21,7 +20,7 @@ func newFunctionHarness(t *testing.T) *dispatchHarness {
 	t.Helper()
 	h := newDispatchHarness(t)
 	var err error
-	h.session, err = h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "functions", Configuration: json.RawMessage(functionConfiguration)})
+	h.session, err = h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "functions", Configuration: json.RawMessage(functionConfiguration)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -47,7 +46,7 @@ func functionState(t *testing.T, h *dispatchHarness, count int) sessions.Session
 	t.Helper()
 	deadline := time.Now().Add(20 * time.Second)
 	for {
-		state, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+		state, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -81,7 +80,7 @@ func TestExecutionFunctionsWaitForEveryApplicationReceipt(t *testing.T) {
 	}
 	for _, id := range []string{"a", "b"} {
 		public := items.Identity(input.TurnID, "tool:"+id)
-		if err := store.SubmitFixtureFunctionResult(t.Context(), h.s, h.tenant, h.session.ID, input.TurnID, public, json.RawMessage(`{"success":true,"output":"saved"}`)); err != nil {
+		if err := SubmitFixtureFunctionResult(t.Context(), h.s, h.tenant, h.session.ID, input.TurnID, public, json.RawMessage(`{"success":true,"output":"saved"}`)); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -89,7 +88,7 @@ func TestExecutionFunctionsWaitForEveryApplicationReceipt(t *testing.T) {
 		var reply proto.FunctionResultPayload
 		_ = h.read(proto.TypeFunctionResult).DecodePayload(&reply)
 		public := items.Identity(input.TurnID, "tool:"+reply.CallID)
-		saved, err := store.FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, public)
+		saved, err := FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, public)
 		if err != nil || saved.Applied || reply.DeliveryID != "function:"+public || len(reply.Content) != 1 || *reply.Content[0].Text != "saved" {
 			t.Fatal(saved, reply, err)
 		}
@@ -127,7 +126,7 @@ func TestExecutionFunctionsCancellationAndUnconfirmedResults(t *testing.T) {
 			h.write(input.TurnID, proto.TypeFunctionCall, proto.FunctionCallPayload{CallID: "a", Name: "lookup_ticket", Arguments: json.RawMessage(`{}`)})
 			state := functionState(t, h, 1)
 			id := state.RequiredActions[0].CallID
-			if err := store.SubmitFixtureFunctionResult(t.Context(), h.s, h.tenant, h.session.ID, input.TurnID, id, json.RawMessage(`{"success":false,"error":"tool failed"}`)); err != nil {
+			if err := SubmitFixtureFunctionResult(t.Context(), h.s, h.tenant, h.session.ID, input.TurnID, id, json.RawMessage(`{"success":false,"error":"tool failed"}`)); err != nil {
 				t.Fatal(err)
 			}
 			var reply proto.FunctionResultPayload
@@ -137,7 +136,7 @@ func TestExecutionFunctionsCancellationAndUnconfirmedResults(t *testing.T) {
 			}
 			status := sessions.TurnFailed
 			if cancel {
-				if _, err := store.RequestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel"); err != nil {
+				if _, err := requestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 					t.Fatal(err)
 				}
 				var request proto.PromptCancelPayload
@@ -155,12 +154,12 @@ func TestExecutionFunctionsCancellationAndUnconfirmedResults(t *testing.T) {
 			}
 			h.finished(result, status)
 			if cancel {
-				bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+				bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 				if err != nil || bound.NativeSessionID != "native-cancelled-functions" {
 					t.Fatal(bound, err)
 				}
 			}
-			saved, err := store.FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, id)
+			saved, err := FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, id)
 			if err != nil || saved.Applied || len(saved.Result) == 0 {
 				t.Fatal(saved, err)
 			}
@@ -190,7 +189,7 @@ func TestExecutionFunctionsRejectUndeclaredCallsAndPrematureDone(t *testing.T) {
 
 func TestExecutionFunctionsRequireAdvertisedCapability(t *testing.T) {
 	h := newDispatchHarness(t)
-	session, err := h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "functions", Configuration: json.RawMessage(functionConfiguration)})
+	session, err := h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "functions", Configuration: json.RawMessage(functionConfiguration)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -203,7 +202,7 @@ func TestExecutionFunctionsRequireAdvertisedCapability(t *testing.T) {
 	if result.err == nil || !strings.Contains(result.err.Error(), "function_tools") {
 		t.Fatal(result)
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, session.ID, input.TurnID)
+	turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnQueued {
 		t.Fatal(turn, err)
 	}
diff --git a/services/core/internal/store/function_images_native_test.go b/services/core/tests/integration/function_images_native_test.go
similarity index 87%
rename from services/core/internal/store/function_images_native_test.go
rename to services/core/tests/integration/function_images_native_test.go
index 54c2284eb..ae4925610 100644
--- a/services/core/internal/store/function_images_native_test.go
+++ b/services/core/tests/integration/function_images_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -73,23 +72,23 @@ func TestNativeFunctionImagePublicExecution(t *testing.T) {
 		t.Fatal("invalid evidence", err)
 	}
 	for _, item := range proof.Calls {
-		call, err := store.FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, item.Turn, item.Call)
+		call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, item.Turn, item.Call)
 		if err != nil || !call.Applied {
 			t.Fatal("function delivery acknowledgement missing", err)
 		}
-		inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, item.Turn, 0, 100)
+		inputs, err := sessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, item.Turn, 0, 100)
 		if err != nil || len(inputs) != 2 || inputs[0].Kind != "message" || inputs[1].Kind != "tool_result" {
 			t.Fatal("function result admission duplicated or mutated", err)
 		}
 	}
-	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, kind)
 	run("resume")
-	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/function_input_execution_test.go b/services/core/tests/integration/function_input_execution_test.go
similarity index 83%
rename from services/core/internal/store/function_input_execution_test.go
rename to services/core/tests/integration/function_input_execution_test.go
index 5d3141eb0..eec056ea2 100644
--- a/services/core/internal/store/function_input_execution_test.go
+++ b/services/core/tests/integration/function_input_execution_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -8,7 +8,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestExecutionFunctionInputBatchStillSteersMessages(t *testing.T) {
@@ -20,11 +19,11 @@ func TestExecutionFunctionInputBatchStillSteersMessages(t *testing.T) {
 	state := functionState(t, h, 1)
 	raw, _ := json.Marshal(sessions.FunctionResultInput{TurnID: input.TurnID, CallID: state.RequiredActions[0].CallID, Result: json.RawMessage(`{"success":true,"output":"answer"}`)})
 	batch := []sessions.Input{{Kind: "tool_result", Payload: raw}, {Kind: "message", Payload: json.RawMessage(`{"text":"Follow up"}`)}}
-	receipts, err := store.SubmitInputs(t.Context(), h.s, h.tenant, h.session.ID, "mixed", batch)
+	receipts, err := submitInputs(t.Context(), h.s, h.tenant, h.session.ID, "mixed", batch)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := store.SubmitInputs(t.Context(), h.s, h.tenant, h.session.ID, "mixed", batch); err != nil {
+	if _, err := submitInputs(t.Context(), h.s, h.tenant, h.session.ID, "mixed", batch); err != nil {
 		t.Fatal(err)
 	}
 	resultSeen, messageSeen := false, false
@@ -53,7 +52,7 @@ func TestExecutionFunctionInputBatchStillSteersMessages(t *testing.T) {
 	}
 	h.write(input.TurnID, proto.TypeDone, proto.DonePayload{Content: "done"})
 	h.finished(running, sessions.TurnCompleted)
-	saved, err := store.FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, state.RequiredActions[0].CallID)
+	saved, err := FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, state.RequiredActions[0].CallID)
 	if err != nil || !saved.Applied {
 		t.Fatal(saved, err)
 	}
diff --git a/services/core/internal/store/function_inputs_public_test.go b/services/core/tests/integration/function_inputs_public_test.go
similarity index 76%
rename from services/core/internal/store/function_inputs_public_test.go
rename to services/core/tests/integration/function_inputs_public_test.go
index d73b02242..16b44ec29 100644
--- a/services/core/internal/store/function_inputs_public_test.go
+++ b/services/core/tests/integration/function_inputs_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bufio"
@@ -13,7 +13,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -26,19 +25,19 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second)
 	defer cancel()
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "fixture"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "fixture"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	other, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "other"})
+	other, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "other"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	functions := executionOwner(t, db).Sessions
@@ -73,7 +72,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 		t.Fatalf("SDK admission: %s %v %s", line, err, stderr.String())
 	}
 	for _, id := range []string{"a", "b", "c", "rollback", "late"} {
-		call, err := store.FixtureFunctionCall(ctx, db.pool, tenant, session.ID, input.TurnID, id)
+		call, err := FixtureFunctionCall(ctx, db.pool, tenant, session.ID, input.TurnID, id)
 		if err != nil || call.Applied {
 			t.Fatal(call, err)
 		}
@@ -104,14 +103,14 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 			}
 		}
 	}
-	history, err := store.SessionAdapter(s).ListTurnInputs(ctx, tenant, session.ID, input.TurnID, 0, 100)
+	history, err := sessionAdapter(s).ListTurnInputs(ctx, tenant, session.ID, input.TurnID, 0, 100)
 	if err != nil || len(history) != 6 {
 		t.Fatal(history, err)
 	}
-	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnFailed}); err != nil {
+	if _, err := transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnFailed}); err != nil {
 		t.Fatal(err)
 	}
-	next, err := store.SendMessage(ctx, s, tenant, session.ID, "next", json.RawMessage(`{"text":"next"}`))
+	next, err := sendMessage(ctx, s, tenant, session.ID, "next", json.RawMessage(`{"text":"next"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -121,11 +120,11 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if err := command.Wait(); err != nil {
 		t.Fatalf("SDK retry: %v %s", err, stderr.String())
 	}
-	history, err = store.SessionAdapter(s).ListTurnInputs(ctx, tenant, session.ID, next.TurnID, 0, 100)
+	history, err = sessionAdapter(s).ListTurnInputs(ctx, tenant, session.ID, next.TurnID, 0, 100)
 	if err != nil || len(history) != 1 {
 		t.Fatal(history, err)
 	}
-	current, err := store.SessionAdapter(s).GetTurn(ctx, tenant, session.ID, next.TurnID)
+	current, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, next.TurnID)
 	if err != nil || current.Status != sessions.TurnQueued || !current.CancelRequestedAt.IsZero() {
 		t.Fatal(current, err)
 	}
diff --git a/services/core/internal/store/function_inputs_test.go b/services/core/tests/integration/function_inputs_test.go
similarity index 99%
rename from services/core/internal/store/function_inputs_test.go
rename to services/core/tests/integration/function_inputs_test.go
index 3a82d5ac5..435e1579f 100644
--- a/services/core/internal/store/function_inputs_test.go
+++ b/services/core/tests/integration/function_inputs_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/function_item_events_test.go b/services/core/tests/integration/function_item_events_test.go
similarity index 99%
rename from services/core/internal/store/function_item_events_test.go
rename to services/core/tests/integration/function_item_events_test.go
index 0b049b1a1..7fca61f85 100644
--- a/services/core/internal/store/function_item_events_test.go
+++ b/services/core/tests/integration/function_item_events_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/function_model_test.go b/services/core/tests/integration/function_model_test.go
similarity index 99%
rename from services/core/internal/store/function_model_test.go
rename to services/core/tests/integration/function_model_test.go
index 4272b211b..2cb93e03b 100644
--- a/services/core/internal/store/function_model_test.go
+++ b/services/core/tests/integration/function_model_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/function_public_native_test.go b/services/core/tests/integration/function_public_native_test.go
similarity index 90%
rename from services/core/internal/store/function_public_native_test.go
rename to services/core/tests/integration/function_public_native_test.go
index 87c754e53..9049edfa7 100644
--- a/services/core/internal/store/function_public_native_test.go
+++ b/services/core/tests/integration/function_public_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -44,12 +43,12 @@ func TestNativePublicFunctionExecution(t *testing.T) {
 		t.Fatal(proof, err)
 	}
 	for i, callID := range proof.Calls {
-		call, err := store.FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turns[i], callID)
+		call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turns[i], callID)
 		if err != nil || call.Applied != (i < 2) {
 			t.Fatal(call, err)
 		}
 	}
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || bound.NativeSessionID == "" || bound.Device.ID != h.device.ID {
 		t.Fatal(bound, err)
 	}
diff --git a/services/core/internal/store/function_state_public_test.go b/services/core/tests/integration/function_state_public_test.go
similarity index 83%
rename from services/core/internal/store/function_state_public_test.go
rename to services/core/tests/integration/function_state_public_test.go
index 05374b657..0b9cedc0a 100644
--- a/services/core/internal/store/function_state_public_test.go
+++ b/services/core/tests/integration/function_state_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bufio"
@@ -13,7 +13,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -27,15 +26,15 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	defer cancel()
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	cfg := json.RawMessage(`{"agent":{"id":"agent_fixture","model":"fixture","tools":[],"multi_agent":{"enabled":false,"max_concurrent_subagents":null},"reasoning":{},"service_tier":"auto","text":{"format":{"type":"text"},"verbosity":"medium"}},"environment":{"type":"none"}}`)
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "fixture", Configuration: cfg})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "fixture", Configuration: cfg})
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	functions := executionOwner(t, db).Sessions
@@ -72,7 +71,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	}
 	record("second")
 	for _, id := range []string{"first", "second"} {
-		if err := store.SubmitFixtureFunctionResult(ctx, s, tenant, session.ID, input.TurnID, id, json.RawMessage(`{"success":true,"output":"private"}`)); err != nil {
+		if err := SubmitFixtureFunctionResult(ctx, s, tenant, session.ID, input.TurnID, id, json.RawMessage(`{"success":true,"output":"private"}`)); err != nil {
 			t.Fatal(err)
 		}
 		if err := functions.ConfirmFunctionResult(ctx, tenant, session.ID, input.TurnID, id); err != nil {
diff --git a/services/core/internal/store/function_state_test.go b/services/core/tests/integration/function_state_test.go
similarity index 99%
rename from services/core/internal/store/function_state_test.go
rename to services/core/tests/integration/function_state_test.go
index 8da65ee48..7d011da21 100644
--- a/services/core/internal/store/function_state_test.go
+++ b/services/core/tests/integration/function_state_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/function_stream_native_test.go b/services/core/tests/integration/function_stream_native_test.go
similarity index 85%
rename from services/core/internal/store/function_stream_native_test.go
rename to services/core/tests/integration/function_stream_native_test.go
index 11197f2f8..481451e5e 100644
--- a/services/core/internal/store/function_stream_native_test.go
+++ b/services/core/tests/integration/function_stream_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -6,8 +6,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestNativePublicFunctionStreamHelper(t *testing.T) {
@@ -39,12 +37,12 @@ func TestNativePublicFunctionStreamHelper(t *testing.T) {
 		t.Fatal(proof, err)
 	}
 	for i, callID := range proof.Calls {
-		call, err := store.FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turns[i], callID)
+		call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turns[i], callID)
 		if err != nil || !call.Applied {
 			t.Fatal(call, err)
 		}
 	}
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || bound.NativeSessionID == "" || bound.Device.ID != h.device.ID {
 		t.Fatal(bound, err)
 	}
diff --git a/services/core/internal/store/function_worker_test.go b/services/core/tests/integration/function_worker_test.go
similarity index 94%
rename from services/core/internal/store/function_worker_test.go
rename to services/core/tests/integration/function_worker_test.go
index 857a7268f..5e32cfdde 100644
--- a/services/core/internal/store/function_worker_test.go
+++ b/services/core/tests/integration/function_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -13,7 +13,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/google/uuid"
 )
@@ -37,7 +36,7 @@ func TestWorkerWaitsForToolCapabilities(t *testing.T) {
 				}
 				if !prebound || isMCP {
 					var err error
-					h.session, err = h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "unbound", Configuration: []byte(configuration)})
+					h.session, err = h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "unbound", Configuration: []byte(configuration)})
 					if err != nil {
 						t.Fatal(err)
 					}
@@ -79,7 +78,7 @@ func TestWorkerWaitsForToolCapabilities(t *testing.T) {
 					}
 				}()
 				time.Sleep(650 * time.Millisecond)
-				current, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+				current, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 				if err != nil || current.Status != sessions.TurnQueued {
 					t.Fatal(current, err)
 				}
@@ -121,12 +120,12 @@ const mcpWorkerConfiguration = `{"agent":{"model":"gpt-5.5","tools":[{"type":"mc
 
 func mcpBearerWorkerConfiguration(t *testing.T, h *dispatchHarness) (string, string) {
 	t.Helper()
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New([]byte(strings.Repeat("k", 32)))
 	if err != nil {
 		t.Fatal(err)
 	}
-	h.s, h.db = store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	h.s, h.db = NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	_, service, err := fixtureVaults(h.db)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/harness_onboarding_test.go b/services/core/tests/integration/harness_onboarding_test.go
similarity index 95%
rename from services/core/internal/store/harness_onboarding_test.go
rename to services/core/tests/integration/harness_onboarding_test.go
index c41003575..dad2531bd 100644
--- a/services/core/internal/store/harness_onboarding_test.go
+++ b/services/core/tests/integration/harness_onboarding_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -22,7 +22,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -90,7 +89,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	if err = json.Unmarshal(res.Body.Bytes(), &created); err != nil || created.ID == "" {
 		t.Fatal(res.Body, err)
 	}
-	h.session, err = store.SessionAdapter(h.s).GetSession(ctx, h.tenant, created.ID)
+	h.session, err = sessionAdapter(h.s).GetSession(ctx, h.tenant, created.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -100,19 +99,19 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	}
 	request("POST", "/v1/agents/sessions/"+created.ID+"/events", `{"events":[{"type":"agent.session.input.message","input":[{"role":"user","content":[{"type":"input_text","text":"finish"}]}]}]}`, 202)
 	waitTurn(t, h, first.RunID, sessions.TurnCompleted)
-	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, created.ID, first.RunID)
+	turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, created.ID, first.RunID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	var result execution.Result
-	inputs, inputErr := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, created.ID, first.RunID, 0, 100)
+	inputs, inputErr := sessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, created.ID, first.RunID, 0, 100)
 	if inputErr != nil || len(inputs) != 2 {
 		t.Fatal(inputs, inputErr)
 	}
 	if err = json.Unmarshal(turn.Outcome, &result); err != nil || result.AppliedThrough != inputs[1].Sequence || result.Done.Content != "readyfinish" {
 		t.Fatal(string(turn.Outcome), err)
 	}
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, created.ID)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, created.ID)
 	if err != nil || bound.NativeSessionID == "" {
 		t.Fatal(bound, err)
 	}
@@ -152,7 +151,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 		t.Fatalf("incapable runtime received work: %s", p.RunID)
 	case <-time.After(700 * time.Millisecond):
 	}
-	queued, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, created.ID)
+	queued, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, created.ID)
 	if err != nil || queued.LastTurn == nil || queued.LastTurn.Status != sessions.TurnQueued {
 		t.Fatal(queued, err)
 	}
diff --git a/services/core/internal/store/hosted_initialization_failure_public_test.go b/services/core/tests/integration/hosted_initialization_failure_public_test.go
similarity index 90%
rename from services/core/internal/store/hosted_initialization_failure_public_test.go
rename to services/core/tests/integration/hosted_initialization_failure_public_test.go
index 805d0ebb3..15ea8c8ba 100644
--- a/services/core/internal/store/hosted_initialization_failure_public_test.go
+++ b/services/core/tests/integration/hosted_initialization_failure_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"archive/zip"
@@ -24,7 +24,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -99,26 +98,26 @@ func (p *hostedFailureProvider) prepare(request proto.RuntimePreparePayload, _ [
 	return completedInitialization(request, nil)
 }
 
-func hostedFailureStore(t *testing.T) (*store.Store, fixtureDB) {
+func hostedFailureStore(t *testing.T) (*Store, fixtureDB) {
 	t.Helper()
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	s.SetPlacement(fixtureRules(t, db))
 	return s, db
 }
 
-func hostedFailureSession(t *testing.T, s *store.Store, db fixtureDB, tenant string, input sessions.CreateSession) (sessions.Session, sessions.Environment) {
+func hostedFailureSession(t *testing.T, s *Store, db fixtureDB, tenant string, input sessions.CreateSession) (sessions.Session, sessions.Environment) {
 	t.Helper()
-	input.Creator, input.Engine, input.IdempotencyKey = store.FixtureCreator(), "codex", uuid.NewString()
+	input.Creator, input.Engine, input.IdempotencyKey = FixtureCreator(), "codex", uuid.NewString()
 	input.Configuration = json.RawMessage(`{"agent":{"id":"agent_test","model":"test-model","tools":[]},"environment":{"type":"openai_hosted","network":{"access":"enabled"}}}`)
 	if input.Initialization.Env == nil {
 		input.Initialization.Env = map[string]string{"SCAN_VALUE": hostedFailureCanary}
 	}
-	session, err := s.CreateSession(t.Context(), tenant, store.WithFixtureModelProvider(input))
+	session, err := s.CreateSession(t.Context(), tenant, WithFixtureModelProvider(input))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -129,7 +128,7 @@ func hostedFailureSession(t *testing.T, s *store.Store, db fixtureDB, tenant str
 	return session, environment
 }
 
-func failHostedInitialization(t *testing.T, s *store.Store, db fixtureDB, tenant string, environment sessions.Environment, p *hostedFailureProvider) {
+func failHostedInitialization(t *testing.T, s *Store, db fixtureDB, tenant string, environment sessions.Environment, p *hostedFailureProvider) {
 	t.Helper()
 	key := uuid.NewString()
 	w, _ := managedWorkerMode(t, s, db, key, p, false, true)
@@ -193,15 +192,15 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 				t.Fatal("failed initialization continued or reclaimed compute", p.steps, p.kills)
 			}
 
-			read, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
+			read, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 			if err != nil || read.Environment.Status != "failed" || read.EnvironmentFailure == nil || read.EnvironmentFailure.Reason != test.reason || read.EnvironmentInputActivity != nil || read.LastTurn != nil {
 				t.Fatal("Session read", read.EnvironmentFailure, err)
 			}
-			page, err := store.SessionAdapter(s).ListSessions(t.Context(), tenant, "", 10, false, nil)
+			page, err := sessionAdapter(s).ListSessions(t.Context(), tenant, "", 10, false, nil)
 			if err != nil || len(page.Sessions) != 1 || !reflect.DeepEqual(page.Sessions[0].EnvironmentFailure, read.EnvironmentFailure) {
 				t.Fatal("Session list", page, err)
 			}
-			events, err := store.SessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
+			events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 			// Transport may connect while initialization is still running.
 			if len(events) > 0 && events[0].Event.Type == "agent.session.environment.connected" {
 				events = events[1:]
@@ -223,7 +222,7 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 				!last.EnvironmentFailure.FailedAt.Equal(read.EnvironmentFailure.FailedAt) || last.EnvironmentInputActivity != nil || !last.Settled {
 				t.Fatal("failed snapshot", last)
 			}
-			if _, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); !errors.Is(err, sessions.ErrHostedEnvironmentFailed) {
+			if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); !errors.Is(err, sessions.ErrHostedEnvironmentFailed) {
 				t.Fatal("failed hosted Environment admitted input", err)
 			}
 			raw, _ := json.Marshal(events)
@@ -232,13 +231,13 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 			}
 			// Tenant B cannot observe the failure.
 			other := uuid.NewString()
-			if _, err := store.SessionAdapter(s).GetSession(t.Context(), other, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sessionAdapter(s).GetSession(t.Context(), other, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("foreign Session read", err)
 			}
-			if _, err := store.SessionAdapter(s).ListSessionEvents(t.Context(), other, session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sessionAdapter(s).ListSessionEvents(t.Context(), other, session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("foreign Session events", err)
 			}
-			if page, err := store.SessionAdapter(s).ListSessions(t.Context(), other, "", 10, false, nil); err != nil || len(page.Sessions) != 0 {
+			if page, err := sessionAdapter(s).ListSessions(t.Context(), other, "", 10, false, nil); err != nil || len(page.Sessions) != 0 {
 				t.Fatal("foreign Session list", page, err)
 			}
 		})
@@ -257,12 +256,12 @@ func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
 	p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, fail: "setup",
 		result: failedInitialization(3)}
 	failHostedInitialization(t, s, db, tenant, environment, p)
-	read, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
+	read, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || read.PendingInput || read.EnvironmentInputActivity == nil || read.EnvironmentInputActivity.Status != "failed" ||
 		read.EnvironmentInputActivity.Failure != "environment_unavailable" || read.EnvironmentFailure == nil {
 		t.Fatal("pending input settlement", read.EnvironmentInputActivity, read.EnvironmentFailure, err)
 	}
-	events, err := store.SessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
+	events, err := sessionAdapter(s).ListSessionEvents(t.Context(), tenant, session.ID, 0)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -341,7 +340,7 @@ func TestHostedInitializationFailurePublicHTTP(t *testing.T) {
 	awaitInitialization(t, db.pool, tenant, environment.ID, "failed")
 
 	reason := `Failed to provision environment: script "setup_commands[0]" failed with exit code 3`
-	read, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
+	read, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || read.EnvironmentFailure == nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/initial_files_http_test.go b/services/core/tests/integration/initial_files_http_test.go
similarity index 92%
rename from services/core/internal/store/initial_files_http_test.go
rename to services/core/tests/integration/initial_files_http_test.go
index 8dda7ceef..ccf870867 100644
--- a/services/core/internal/store/initial_files_http_test.go
+++ b/services/core/tests/integration/initial_files_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -10,17 +10,16 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestInitialFilesHTTPInlineLimitsAndRetry(t *testing.T) {
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{9}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	s.SetPlacement(fixtureRules(t, db))
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
diff --git a/services/core/internal/store/input_conflicts_public_test.go b/services/core/tests/integration/input_conflicts_public_test.go
similarity index 93%
rename from services/core/internal/store/input_conflicts_public_test.go
rename to services/core/tests/integration/input_conflicts_public_test.go
index 453a06a6d..258ffb39f 100644
--- a/services/core/internal/store/input_conflicts_public_test.go
+++ b/services/core/tests/integration/input_conflicts_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -56,7 +55,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 
 	create := func(environment string, initial bool) string {
 		t.Helper()
-		input := sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
+		input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 			Configuration: json.RawMessage(`{` + conflictAgent + `,"environment":` + environment + `}`)}
 		if initial {
 			input.InitialInputs = []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"reserved"}`)}}
@@ -70,11 +69,11 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	// waiting starts a Turn that waits for one function result.
 	waiting := func(session, key, call string) sessions.InputReceipt {
 		t.Helper()
-		receipt, err := store.SendMessage(ctx, s, tenant, session, key, json.RawMessage(`{"text":"work"}`))
+		receipt, err := sendMessage(ctx, s, tenant, session, key, json.RawMessage(`{"text":"work"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
-		if _, err := store.TransitionTurn(ctx, s, tenant, session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+		if _, err := transitionTurn(ctx, s, tenant, session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 			t.Fatal(err)
 		}
 		if err := functions.RecordFunctionCall(ctx, tenant, session, receipt.TurnID, sessions.FunctionCall{CallID: call, ExecutorCallID: "native-" + call, Name: "lookup", Arguments: json.RawMessage(`{}`)}); err != nil {
@@ -161,7 +160,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	none := `{"type":"none"}`
 	session := create(none, false)
 	first := waiting(session, "first", "first-call")
-	if err := store.SubmitFixtureFunctionResult(ctx, s, tenant, session, first.TurnID, "first-call", json.RawMessage(`{"success":true,"output":"one"}`)); err != nil {
+	if err := SubmitFixtureFunctionResult(ctx, s, tenant, session, first.TurnID, "first-call", json.RawMessage(`{"success":true,"output":"one"}`)); err != nil {
 		t.Fatal(err)
 	}
 	complete(session, first, "first-call")
@@ -233,7 +232,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	if status, body := submit(owner, session, "same-after-completion", valid); status != http.StatusAccepted || body != "" {
 		t.Fatalf("identical result after completion: %d %s", status, body)
 	}
-	if call, err := store.FixtureFunctionCall(ctx, db.pool, tenant, session, current.TurnID, "pending-call"); err != nil || !bytes.Contains(call.Result, []byte(`"value"`)) {
+	if call, err := FixtureFunctionCall(ctx, db.pool, tenant, session, current.TurnID, "pending-call"); err != nil || !bytes.Contains(call.Result, []byte(`"value"`)) {
 		t.Fatal("saved result changed", call, err)
 	}
 
@@ -247,7 +246,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 		{"after-cancel", owner, session, []string{late}, 409, turnConflictBody, ""},
 		{"after-cancel-foreign", foreign, session, []string{late}, 404, missingSessionBody, ""},
 	}, session)
-	if call, err := store.FixtureFunctionCall(ctx, db.pool, tenant, session, cancelled.TurnID, "late-call"); err != nil || call.Result != nil {
+	if call, err := FixtureFunctionCall(ctx, db.pool, tenant, session, cancelled.TurnID, "late-call"); err != nil || call.Result != nil {
 		t.Fatal("late result was saved", call, err)
 	}
 
diff --git a/services/core/internal/store/inputs_test.go b/services/core/tests/integration/inputs_test.go
similarity index 99%
rename from services/core/internal/store/inputs_test.go
rename to services/core/tests/integration/inputs_test.go
index 1a497326a..8dd0279e2 100644
--- a/services/core/internal/store/inputs_test.go
+++ b/services/core/tests/integration/inputs_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/item_order_migration_test.go b/services/core/tests/integration/item_order_migration_test.go
similarity index 94%
rename from services/core/internal/store/item_order_migration_test.go
rename to services/core/tests/integration/item_order_migration_test.go
index ed226b76c..a7ac7c6fc 100644
--- a/services/core/internal/store/item_order_migration_test.go
+++ b/services/core/tests/integration/item_order_migration_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/items"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
@@ -22,7 +21,7 @@ import (
 
 func TestItemOrderMigrationPreservesIndexedHistory(t *testing.T) {
 	ctx := context.Background()
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	schema := "item_order_" + uuid.New().String()[:8]
 	quoted := pgx.Identifier{schema}.Sanitize()
 	if _, err := pool.Exec(ctx, "CREATE SCHEMA "+quoted); err != nil {
@@ -149,8 +148,8 @@ func TestItemOrderMigrationPreservesIndexedHistory(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Cleanup(migratedPool.Close)
-	s := store.New(migratedPool)
-	if _, err = store.TransitionTurn(ctx, s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	s := New(migratedPool)
+	if _, err = transitionTurn(ctx, s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	if err = executionOwner(t, fixtureDB{pool: migratedPool}).Sessions.AppendTurnEvents(ctx, tenant, session, turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"after-upgrade","delta":"continued"}`)}}); err != nil {
diff --git a/services/core/internal/store/item_order_test.go b/services/core/tests/integration/item_order_test.go
similarity index 84%
rename from services/core/internal/store/item_order_test.go
rename to services/core/tests/integration/item_order_test.go
index 634ed5f82..788a2b3bc 100644
--- a/services/core/internal/store/item_order_test.go
+++ b/services/core/tests/integration/item_order_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,25 +9,24 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/items"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
 func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "ordered"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "ordered"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -52,7 +51,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 			t.Fatal(err)
 		}
 	}
-	if _, err = store.SendMessage(ctx, s, tenant, session.ID, "steer", json.RawMessage(`{"text":"continue"}`)); err != nil {
+	if _, err = sendMessage(ctx, s, tenant, session.ID, "steer", json.RawMessage(`{"text":"continue"}`)); err != nil {
 		t.Fatal(err)
 	}
 	page, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
@@ -132,11 +131,11 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 		t.Fatal(err)
 	}
 	checkOrder()
-	next, err := store.SendMessage(ctx, s, tenant, session.ID, "next-turn", json.RawMessage(`{"text":"new turn"}`))
+	next, err := sendMessage(ctx, s, tenant, session.ID, "next-turn", json.RawMessage(`{"text":"new turn"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = store.TransitionTurn(ctx, s, tenant, session.ID, next.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = transitionTurn(ctx, s, tenant, session.ID, next.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	if err = journal.AppendTurnEvents(ctx, tenant, session.ID, next.TurnID, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"new","delta":"new turn"}`)}}); err != nil {
diff --git a/services/core/internal/store/item_reads_test.go b/services/core/tests/integration/item_reads_test.go
similarity index 80%
rename from services/core/internal/store/item_reads_test.go
rename to services/core/tests/integration/item_reads_test.go
index e6540af5c..9e15be0c7 100644
--- a/services/core/internal/store/item_reads_test.go
+++ b/services/core/tests/integration/item_reads_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,24 +10,23 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "items"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "items"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -103,7 +102,7 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 			}
 		}
 	}
-	other, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "other"})
+	other, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "other"})
 	// A foreign parent is not found before the cursor is read.
 	if _, err = sessionReads(pool).ListItems(ctx, uuid.NewString(), session.ID, page.Items[0].ID, 20, true); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
@@ -119,15 +118,15 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 
 func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "legacy"})
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
+	session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "legacy"})
+	input, err := sendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -143,7 +142,7 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 	if err != nil || len(page.Items) != 1 {
 		t.Fatal(page, err)
 	}
-	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted, Outcome: json.RawMessage(`{"done":{"content":"legacy answer","metadata":{"private":"SECRET"}}}`)})
+	_, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted, Outcome: json.RawMessage(`{"done":{"content":"legacy answer","metadata":{"private":"SECRET"}}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -155,16 +154,16 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 
 func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
 	for _, receiptOnly := range []bool{true, false} {
-		session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString()})
-		input, err := store.SendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"test"}`))
+		session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString()})
+		input, err := sendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"test"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
-		_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+		_, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -187,18 +186,18 @@ func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 
 func TestLegacyFailureRetainsPartialAnswerAcrossRecovery(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "failed-items"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "failed-items"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/item_serialization_test.go b/services/core/tests/integration/item_serialization_test.go
similarity index 99%
rename from services/core/internal/store/item_serialization_test.go
rename to services/core/tests/integration/item_serialization_test.go
index 828b6b30f..a9fa34591 100644
--- a/services/core/internal/store/item_serialization_test.go
+++ b/services/core/tests/integration/item_serialization_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/list_cursor_public_test.go b/services/core/tests/integration/list_cursor_public_test.go
similarity index 93%
rename from services/core/internal/store/list_cursor_public_test.go
rename to services/core/tests/integration/list_cursor_public_test.go
index b028f78ea..29d801bd7 100644
--- a/services/core/internal/store/list_cursor_public_test.go
+++ b/services/core/tests/integration/list_cursor_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -19,7 +19,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -36,7 +35,7 @@ type cursorFixture struct {
 	file                                                            string
 }
 
-func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, skillService *skills.Service, sessionService *sessions.Service, client pathIDClient, token, tenant, label string) cursorFixture {
+func seedCursorFixture(t *testing.T, s *Store, leased execution.Owner, skillService *skills.Service, sessionService *sessions.Service, client pathIDClient, token, tenant, label string) cursorFixture {
 	t.Helper()
 	ctx := t.Context()
 	var f cursorFixture
@@ -67,10 +66,10 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 	f.session = client.created(token, "/v1/agents/sessions", newSession)
 	f.turn = first("/v1/agents/sessions/" + f.session + "/turns")
 	f.item = first("/v1/agents/sessions/" + f.session + "/items")
-	if _, err := store.TransitionTurn(ctx, s, tenant, f.session, f.turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
+	if _, err := transitionTurn(ctx, s, tenant, f.session, f.turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := store.SendMessage(ctx, s, tenant, f.session, label+"-second", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"second"}]}]}`)); err != nil {
+	if _, err := sendMessage(ctx, s, tenant, f.session, label+"-second", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"second"}]}]}`)); err != nil {
 		t.Fatal(err)
 	}
 	f.otherSession = client.created(token, "/v1/agents/sessions", newSession)
@@ -87,12 +86,12 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 	// Subagent history is seeded through the execution lease, as a daemon would.
 	seedSubagents := func(key string) (session, rootTurn string) {
 		t.Helper()
-		created, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: key,
+		created, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: key,
 			Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"cursor-model","multi_agent":{"enabled":true,"max_concurrent_subagents":4}}}`)})
 		if err != nil {
 			t.Fatal(err)
 		}
-		receipt, err := store.SendMessage(ctx, s, tenant, created.ID, key+"-input", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"delegate"}]}]}`))
+		receipt, err := sendMessage(ctx, s, tenant, created.ID, key+"-input", json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"delegate"}]}]}`))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -103,7 +102,7 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 		if err = leased.Sessions.BindSessionDevice(ctx, tenant, created.ID, host.ID); err != nil {
 			t.Fatal(err)
 		}
-		if _, err = store.TransitionTurn(ctx, store.NewExecution(s, leased.Lease.(*pgunit.Lease)), tenant, created.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+		if _, err = transitionTurn(ctx, NewExecution(s, leased.Lease.(*pgunit.Lease)), tenant, created.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 			t.Fatal(err)
 		}
 		opened := int64(1700000001000)
@@ -153,7 +152,7 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 	f.otherSubagent = subagent(otherSubSession, "child")
 	f.otherChildTurn = first("/v1/agents/sessions/" + otherSubSession + "/subagents/" + f.otherSubagent + "/turns")
 
-	skill, err := skillService.CreateSkill(ctx, skills.CreateSkill{TenantID: tenant, Archive: store.SkillArchive(t, label+"-cursor-skill")})
+	skill, err := skillService.CreateSkill(ctx, skills.CreateSkill{TenantID: tenant, Archive: skillArchive(t, label+"-cursor-skill")})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -164,12 +163,12 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 		t.Fatal("fixture Skill version", versions, err)
 	}
 	f.version = versions.Versions[0].ID
-	later, err := skillService.CreateVersion(ctx, skills.CreateVersion{TenantID: tenant, SkillID: skillID, Archive: store.SkillArchive(t, label+"-cursor-skill-v2")})
+	later, err := skillService.CreateVersion(ctx, skills.CreateVersion{TenantID: tenant, SkillID: skillID, Archive: skillArchive(t, label+"-cursor-skill-v2")})
 	if err != nil {
 		t.Fatal(err)
 	}
 	f.laterVersion = later.ID
-	deleted, err := skillService.CreateVersion(ctx, skills.CreateVersion{TenantID: tenant, SkillID: skillID, Archive: store.SkillArchive(t, label+"-cursor-skill-v3")})
+	deleted, err := skillService.CreateVersion(ctx, skills.CreateVersion{TenantID: tenant, SkillID: skillID, Archive: skillArchive(t, label+"-cursor-skill-v3")})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -177,7 +176,7 @@ func seedCursorFixture(t *testing.T, s *store.Store, leased execution.Owner, ski
 		t.Fatal(err)
 	}
 	f.deletedVersion = deleted.ID
-	otherSkill, err := skillService.CreateSkill(ctx, skills.CreateSkill{TenantID: tenant, Archive: store.SkillArchive(t, label+"-cursor-other-skill")})
+	otherSkill, err := skillService.CreateSkill(ctx, skills.CreateSkill{TenantID: tenant, Archive: skillArchive(t, label+"-cursor-other-skill")})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -222,12 +221,12 @@ func wireError(kind string, code, param *string, message string) string {
 // lookups keep their behavior (K1–K3). A foreign cursor is always byte-identical
 // to a missing one, and a foreign or missing parent is 404 before any cursor.
 func TestListCursorErrorsPostgres(t *testing.T) {
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{67}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	s.SetPlacement(fixtureRules(t, db))
 	owner, foreign := uuid.NewString(), uuid.NewString()
 	ownerTenant, foreignTenant := uuid.NewString(), uuid.NewString()
@@ -243,7 +242,7 @@ func TestListCursorErrorsPostgres(t *testing.T) {
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
 	leased := executionOwner(t, db)
-	skillService := store.SkillService(t, db.pool, db.cipher)
+	skillService := SkillService(t, db.pool, db.cipher)
 	_, sessionService, err := fixtureSessions(db)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/list_query_public_test.go b/services/core/tests/integration/list_query_public_test.go
similarity index 90%
rename from services/core/internal/store/list_query_public_test.go
rename to services/core/tests/integration/list_query_public_test.go
index d714c6e1a..059d7673e 100644
--- a/services/core/internal/store/list_query_public_test.go
+++ b/services/core/tests/integration/list_query_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -21,12 +20,12 @@ func TestListQueryOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{72}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "query-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
diff --git a/services/core/internal/store/local_artifact_export_test.go b/services/core/tests/integration/local_artifact_export_test.go
similarity index 92%
rename from services/core/internal/store/local_artifact_export_test.go
rename to services/core/tests/integration/local_artifact_export_test.go
index b39f29ded..abd071810 100644
--- a/services/core/internal/store/local_artifact_export_test.go
+++ b/services/core/tests/integration/local_artifact_export_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"archive/tar"
@@ -9,7 +9,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func completeLocalArtifactExport(t *testing.T, h *dispatchHarness, worker *execution.Worker, environment sessions.Environment) {
@@ -47,7 +46,7 @@ func completeLocalArtifactExport(t *testing.T, h *dispatchHarness, worker *execu
 		t.Fatal("capture published before native completion", err)
 	}
 	completeCaptureDirectoryRead(t, h, worker, environment)
-	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "during-artifact-capture", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"run after the completed native execution"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "during-artifact-capture", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"run after the completed native execution"}`)}})
 	if err != nil || pending.State != sessions.EnvironmentInputPending || len(pending.Receipts) != 0 {
 		t.Fatalf("input during artifact capture was assigned to the finished executor: %+v %v", pending, err)
 	}
diff --git a/services/core/internal/store/local_environment_devices_test.go b/services/core/tests/integration/local_environment_devices_test.go
similarity index 99%
rename from services/core/internal/store/local_environment_devices_test.go
rename to services/core/tests/integration/local_environment_devices_test.go
index 64ad74210..88a04c240 100644
--- a/services/core/internal/store/local_environment_devices_test.go
+++ b/services/core/tests/integration/local_environment_devices_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/local_environment_file_write_test.go b/services/core/tests/integration/local_environment_file_write_test.go
similarity index 81%
rename from services/core/internal/store/local_environment_file_write_test.go
rename to services/core/tests/integration/local_environment_file_write_test.go
index dd795c914..b256291d0 100644
--- a/services/core/internal/store/local_environment_file_write_test.go
+++ b/services/core/tests/integration/local_environment_file_write_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -53,11 +52,11 @@ func TestLocalEnvironmentFileWriteOwnsMutationBeforeDispatch(t *testing.T) {
 	if begin.DecodePayload(&request) != nil || request.Step != "begin" || request.EnvironmentID != environment.ID || request.SessionID != h.session.ID || request.Path != "input" || request.SizeBytes != 3 {
 		t.Fatal("upload identity changed")
 	}
-	intent, err := store.FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
+	intent, err := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
 	if err != nil || intent.State != "pending" || intent.Identity.DeviceID != h.device.ID {
 		t.Fatal("dispatch preceded durable ownership", intent, err)
 	}
-	if _, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "concurrent", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "concurrent", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("upload admitted concurrent execution", err)
 	}
 	cancel()
@@ -76,10 +75,10 @@ func TestLocalEnvironmentFileWriteOwnsMutationBeforeDispatch(t *testing.T) {
 	}
 	h.write(begin.ID, proto.TypeWorkspaceWriteResult, proto.WorkspaceWriteResultPayload{Outcome: "completed", SizeBytes: 3})
 	awaitDaemonRemoteCondition(t, t.Context(), 3*time.Second, "detached durable commit", func() bool {
-		got, e := store.FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
+		got, e := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
 		return e == nil && got.State == "committed"
 	})
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("upload created model execution", err)
 	}
@@ -95,11 +94,11 @@ func TestLocalEnvironmentFileWriteLostReceiptRemainsPending(t *testing.T) {
 	if result := awaitLocalWrite(t, done); !errors.Is(result.err, execution.ErrExecutionUnavailable) {
 		t.Fatal(result.err)
 	}
-	intent, err := store.FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
+	intent, err := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
 	if err != nil || intent.State != "pending" {
 		t.Fatal("disconnect guessed rejection", intent, err)
 	}
-	if _, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "after-loss", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "after-loss", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("unknown upload admitted execution", err)
 	}
 }
@@ -113,7 +112,7 @@ func TestLocalEnvironmentFileWriteKnownRejectionReleasesMutation(t *testing.T) {
 		if result := awaitLocalWrite(t, done); !errors.Is(result.err, execution.ErrExecutionUnavailable) {
 			t.Fatal(result.err)
 		}
-		intent, err := store.FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
+		intent, err := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
 		if err != nil || intent.State != "rejected" {
 			t.Fatal("rejection did not settle", intent, err)
 		}
diff --git a/services/core/internal/store/local_environment_worker_test.go b/services/core/tests/integration/local_environment_worker_test.go
similarity index 88%
rename from services/core/internal/store/local_environment_worker_test.go
rename to services/core/tests/integration/local_environment_worker_test.go
index 6f935956d..76740497a 100644
--- a/services/core/internal/store/local_environment_worker_test.go
+++ b/services/core/tests/integration/local_environment_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -11,7 +11,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -19,7 +18,7 @@ func localWorker(t *testing.T, scoped, execute bool) (*dispatchHarness, *executi
 	t.Helper()
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`), scoped)
 	if scoped {
-		_, pool := store.NewTestStore(t)
+		_, pool := testStore(t)
 		insertWorkerRuntimeAllocation(t, pool, h, "disabled")
 	}
 	environment, err := fixtureSessionStore(h.db).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
@@ -81,7 +80,7 @@ func TestLocalEnvironmentWorkerDirectoryUsesExactAuthorityWithoutModel(t *testin
 	if got := awaitDirectoryResult(t, result); got.err != nil || len(got.value.Entries) != 1 {
 		t.Fatal("local directory failed", got.err)
 	}
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity != nil {
 		t.Fatal("local read admitted execution", err)
 	}
@@ -92,7 +91,7 @@ func TestLocalEnvironmentWorkerRejectsGeneralDeviceDespiteCapability(t *testing.
 	if _, err := w.ReadEnvironmentDirectory(t.Context(), environment, "reports"); !errors.Is(err, execution.ErrExecutionUnavailable) {
 		t.Fatal("general device used as local authority", err)
 	}
-	other, err := h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "unassigned", Configuration: h.session.Configuration})
+	other, err := h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "unassigned", Configuration: h.session.Configuration})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -110,7 +109,7 @@ func TestLocalEnvironmentWorkerRejectsGeneralDeviceDespiteCapability(t *testing.
 
 func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *testing.T) {
 	h, worker, environment := localWorker(t, true, true)
-	reservation, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "local-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	reservation, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "local-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -126,7 +125,7 @@ func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *test
 	if frame.DecodePayload(&prepare) != nil || prepare.Configuration.LocalEnvironment == nil || prepare.Configuration.LocalEnvironment.ID != environment.ID {
 		t.Fatal("local preparation lost identity")
 	}
-	before, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+	before, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || before.LastTurn != nil {
 		t.Fatal("preparation admitted execution before readiness", err)
 	}
@@ -141,14 +140,14 @@ func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *test
 	h.write(start.RunID, proto.TypeDone, proto.DonePayload{Content: "complete", Metadata: map[string]any{proto.DoneMetaAgentSessionID: "local-native-history"}})
 	completeLocalArtifactExport(t, h, worker, environment)
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "local completion", func() bool {
-		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
+		turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
 		return err == nil && turn.Status == sessions.TurnCompleted
 	})
-	settled, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, reservation.ID)
+	settled, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, reservation.ID)
 	if err != nil || settled.State != sessions.EnvironmentInputAdmitted || len(settled.Receipts) != 1 {
 		t.Fatal("local reservation did not settle", err)
 	}
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 	if err != nil || bound.Device.EnvironmentID != environment.ID || bound.NativeSessionID != "local-native-history" {
 		t.Fatal("local native identity was not retained", err)
 	}
diff --git a/services/core/internal/store/managed_test_store_test.go b/services/core/tests/integration/managed_fixture_test.go
similarity index 82%
rename from services/core/internal/store/managed_test_store_test.go
rename to services/core/tests/integration/managed_fixture_test.go
index 172392a82..2fb5b7ff6 100644
--- a/services/core/internal/store/managed_test_store_test.go
+++ b/services/core/tests/integration/managed_fixture_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"testing"
@@ -16,8 +16,3 @@ func newManagedTestStore(t *testing.T) (*Store, *pgxpool.Pool) {
 	// Hosted Sessions freeze a model provider, which needs a credential key.
 	return withPlacement(t, NewWithCredentialCipher(pool, fixtureCipher)), pool
 }
-
-func NewManagedTestStore(t *testing.T) (*Store, *pgxpool.Pool) {
-	t.Helper()
-	return newManagedTestStore(t)
-}
diff --git a/services/core/internal/store/mcode_public_native_test.go b/services/core/tests/integration/mcode_public_native_test.go
similarity index 90%
rename from services/core/internal/store/mcode_public_native_test.go
rename to services/core/tests/integration/mcode_public_native_test.go
index 9e1b3ce01..03198bdcc 100644
--- a/services/core/internal/store/mcode_public_native_test.go
+++ b/services/core/tests/integration/mcode_public_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -13,7 +13,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -65,7 +64,7 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 				Session string `json:"session"`
 			}
 			_ = json.Unmarshal(data, &identity)
-			if page, e := store.SessionAdapter(h.s).ListTurns(ctx, h.tenant, identity.Session, "", 100, true); e == nil {
+			if page, e := sessionAdapter(h.s).ListTurns(ctx, h.tenant, identity.Session, "", 100, true); e == nil {
 				diagnostic, _ := json.Marshal(page)
 				text := strings.ReplaceAll(string(diagnostic), provider.APIKey, "[REDACTED]")
 				_ = os.WriteFile(filepath.Join(home, "failed-turns.json"), []byte(text), 0600)
@@ -85,11 +84,11 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 	if json.Unmarshal(data, &proof) != nil {
 		t.Fatal("invalid evidence")
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.FirstTurn)
+	turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.FirstTurn)
 	if err != nil {
 		t.Fatal(err)
 	}
-	inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, proof.FirstTurn, 0, 100)
+	inputs, err := sessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, proof.FirstTurn, 0, 100)
 	if err != nil || len(inputs) != 2 {
 		t.Fatal("steering input not in same turn", err)
 	}
@@ -97,14 +96,14 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 	if json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.AppliedThrough != inputs[1].Sequence {
 		t.Fatal("native applied receipt missing")
 	}
-	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, "mcode")
 	run("resume")
-	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/mcp_credential_selection_public_test.go b/services/core/tests/integration/mcp_credential_selection_public_test.go
similarity index 98%
rename from services/core/internal/store/mcp_credential_selection_public_test.go
rename to services/core/tests/integration/mcp_credential_selection_public_test.go
index 1915c220d..72bab89e5 100644
--- a/services/core/internal/store/mcp_credential_selection_public_test.go
+++ b/services/core/tests/integration/mcp_credential_selection_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -26,12 +25,12 @@ type selectionResponse struct {
 // M1–M8) over real HTTP and PostgreSQL, with tenants A and B.
 func TestMCPCredentialSelectionPublicPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{67}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	tenantA, tokenA, tokenB := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-a", TokenSHA256: runtimedevice.HashCredential(tokenA), TenantID: tenantA},
@@ -282,7 +281,7 @@ func TestMCPCredentialSelectionPublicPostgres(t *testing.T) {
 	if err := pool.QueryRow(t.Context(), "SELECT id FROM turns WHERE session_id=$1", streamed).Scan(&turn); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := store.TransitionTurn(t.Context(), s, tenantA, streamed, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
+	if _, err := transitionTurn(t.Context(), s, tenantA, streamed, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnCancelled}); err != nil {
 		t.Fatal(err)
 	}
 	_, tools = snapshot(stream, "agent.session.idle")
diff --git a/services/core/internal/store/message_image_admission_test.go b/services/core/tests/integration/message_image_admission_test.go
similarity index 87%
rename from services/core/internal/store/message_image_admission_test.go
rename to services/core/tests/integration/message_image_admission_test.go
index 24f2b03e9..d68af03d6 100644
--- a/services/core/internal/store/message_image_admission_test.go
+++ b/services/core/tests/integration/message_image_admission_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/engine"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func imageAdmissionBatch() []sessions.Input {
@@ -32,7 +31,7 @@ func TestUnqualifiedImageAdmissionIsAtomic(t *testing.T) {
 			worker := startWorker(t, t.Context(), h.db, h.d)
 			defer func() { ctx, cancel := context.WithCancel(context.Background()); cancel(); _ = worker.Run(ctx) }()
 			configuration := json.RawMessage(`{"agent":{"model":"fixture"},"environment":{"type":"` + placement + `","workspace_directory":"/workspace"}}`)
-			create := sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "image-create", Configuration: configuration, InitialInputs: imageAdmissionBatch()}
+			create := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "image-create", Configuration: configuration, InitialInputs: imageAdmissionBatch()}
 			if _, err := worker.CreateSession(t.Context(), h.tenant, create); !errors.Is(err, sessions.ErrInvalidInput) {
 				t.Fatal("creation accepted an unqualified image", err)
 			}
@@ -46,7 +45,7 @@ func TestUnqualifiedImageAdmissionIsAtomic(t *testing.T) {
 			if _, err := worker.SubmitInputs(t.Context(), h.tenant, session.ID, "image-batch", imageAdmissionBatch()); !errors.Is(err, sessions.ErrInvalidInput) {
 				t.Fatal("batch accepted an unqualified image", err)
 			}
-			session, err = store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, session.ID)
+			session, err = sessionAdapter(h.s).GetSession(t.Context(), h.tenant, session.ID)
 			if err != nil || session.LastTurn != nil || session.EnvironmentInputActivity != nil {
 				t.Fatal("rejected batch persisted execution activity", err)
 			}
diff --git a/services/core/internal/store/message_images_native_test.go b/services/core/tests/integration/message_images_native_test.go
similarity index 86%
rename from services/core/internal/store/message_images_native_test.go
rename to services/core/tests/integration/message_images_native_test.go
index 79aa40647..5e1a20d4d 100644
--- a/services/core/internal/store/message_images_native_test.go
+++ b/services/core/tests/integration/message_images_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -74,11 +73,11 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 	if err != nil || json.Unmarshal(raw, &proof) != nil {
 		t.Fatal("invalid evidence", err)
 	}
-	call, err := store.FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
+	call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
+	turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -86,18 +85,18 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 	if json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.AppliedThrough < 1 {
 		t.Fatal("native input receipt missing")
 	}
-	inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, proof.Turn, 0, 100)
+	inputs, err := sessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, proof.Turn, 0, 100)
 	if err != nil || len(inputs) != 3 || inputs[0].Kind != "message" || inputs[1].Kind != "message" || inputs[2].Kind != "tool_result" || outcome.AppliedThrough != inputs[2].Sequence {
 		t.Fatal("active image batch was not applied exactly once in the same Turn", err)
 	}
-	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, kind)
 	run("resume")
-	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/message_input_helpers_test.go b/services/core/tests/integration/message_input_helpers_test.go
similarity index 92%
rename from services/core/internal/store/message_input_helpers_test.go
rename to services/core/tests/integration/message_input_helpers_test.go
index 550d7ef5c..0f118ab76 100644
--- a/services/core/internal/store/message_input_helpers_test.go
+++ b/services/core/tests/integration/message_input_helpers_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"testing"
diff --git a/services/core/internal/store/model_protocol_native_test.go b/services/core/tests/integration/model_protocol_native_test.go
similarity index 91%
rename from services/core/internal/store/model_protocol_native_test.go
rename to services/core/tests/integration/model_protocol_native_test.go
index fac467b0e..66b231bdd 100644
--- a/services/core/internal/store/model_protocol_native_test.go
+++ b/services/core/tests/integration/model_protocol_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -14,7 +14,6 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -121,11 +120,11 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 	}
 	failed := 0
 	for _, item := range proof.Calls {
-		call, err := store.FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, item.Turn, item.Call)
+		call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, item.Turn, item.Call)
 		if err != nil || !call.Applied {
 			t.Fatal("public function result lacks native delivery acknowledgement")
 		}
-		inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, item.Turn, 0, 100)
+		inputs, err := sessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, proof.Session, item.Turn, 0, 100)
 		if err != nil || len(inputs) != 2 || inputs[0].Kind != "message" || inputs[1].Kind != "tool_result" {
 			t.Fatal("public function result input was lost or duplicated")
 		}
@@ -136,14 +135,14 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 	if expectedCalls > 0 && failed != 1 {
 		t.Fatal("missing failed function-result scenario")
 	}
-	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native Session binding missing before restart")
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, options.Engine)
 	run("resume")
-	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("cold Session continuation changed native history")
 	}
diff --git a/services/core/internal/store/model_provider_fixture_test.go b/services/core/tests/integration/model_provider_fixture_test.go
similarity index 76%
rename from services/core/internal/store/model_provider_fixture_test.go
rename to services/core/tests/integration/model_provider_fixture_test.go
index 9866aebd1..c70091f34 100644
--- a/services/core/internal/store/model_provider_fixture_test.go
+++ b/services/core/tests/integration/model_provider_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -8,23 +8,22 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // Hosted and self-hosted Sessions must freeze a model provider. HTTP fixtures
 // supply one here instead of relaxing that check; the store needs a credential
-// key (store.NewModelTestStore).
+// key (NewModelTestStore).
 
 // fixtureDeploymentProvider configures a deployment default for every harness.
 func fixtureDeploymentProvider() func(*api.Dependencies) {
 	return modelProviderDefaults(func(_ context.Context, harness string) (*modelconfiguration.Snapshot, error) {
-		return &modelconfiguration.Snapshot{Model: "fixture", Provider: store.FixtureModelProvider(harness), Revision: uuid.New()}, nil
+		return &modelconfiguration.Snapshot{Model: "fixture", Provider: FixtureModelProvider(harness), Revision: uuid.New()}, nil
 	})
 }
 
 // fixtureSessionProvider is the top-level Session request member that supplies
 // the harness's fixture bundle, for self-hosted Sessions.
 func fixtureSessionProvider(harness string) string {
-	raw, _ := json.Marshal(map[string]any{"model_provider": store.FixtureModelProvider(harness)})
+	raw, _ := json.Marshal(map[string]any{"model_provider": FixtureModelProvider(harness)})
 	return `"x_agents_core":` + string(raw)
 }
diff --git a/services/core/internal/store/native_daemon_test.go b/services/core/tests/integration/native_daemon_test.go
similarity index 99%
rename from services/core/internal/store/native_daemon_test.go
rename to services/core/tests/integration/native_daemon_test.go
index 4aab20f29..908f769a9 100644
--- a/services/core/internal/store/native_daemon_test.go
+++ b/services/core/tests/integration/native_daemon_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/native_environment_test.go b/services/core/tests/integration/native_environment_test.go
similarity index 92%
rename from services/core/internal/store/native_environment_test.go
rename to services/core/tests/integration/native_environment_test.go
index 547ad5f2c..8614a7637 100644
--- a/services/core/internal/store/native_environment_test.go
+++ b/services/core/tests/integration/native_environment_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -13,7 +13,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestNativeNoExecutionEnvironment(t *testing.T) {
@@ -99,7 +98,7 @@ func TestNativeNoExecutionEnvironment(t *testing.T) {
 	provider := nativeModelProvider(model)
 	config, _ := json.Marshal(map[string]any{"agent": map[string]string{"model": "gpt-5.5", "instructions": "Keep this instruction."}, "environment": map[string]string{"type": "none"}})
 	var err error
-	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "native-session", Configuration: config, ModelProvider: provider, ModelProviderSource: v1.ModelProviderSourceDeployment})
+	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "native-session", Configuration: config, ModelProvider: provider, ModelProviderSource: v1.ModelProviderSourceDeployment})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -108,13 +107,13 @@ func TestNativeNoExecutionEnvironment(t *testing.T) {
 	}
 	first := h.message("first", "Return an answer.")
 	h.finished(h.run(ctx, first.TurnID), sessions.TurnCompleted)
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID == "" {
 		t.Fatal(bound, err)
 	}
 	second := h.message("second", "Continue the same conversation.")
 	h.finished(h.run(ctx, second.TurnID), sessions.TurnCompleted)
-	again, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	again, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || again.NativeSessionID != bound.NativeSessionID {
 		t.Fatal(again, err)
 	}
diff --git a/services/core/internal/store/native_public_execution_test.go b/services/core/tests/integration/native_public_execution_test.go
similarity index 99%
rename from services/core/internal/store/native_public_execution_test.go
rename to services/core/tests/integration/native_public_execution_test.go
index 8128b85b6..b370d5ad6 100644
--- a/services/core/internal/store/native_public_execution_test.go
+++ b/services/core/tests/integration/native_public_execution_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/native_recovery_test.go b/services/core/tests/integration/native_recovery_test.go
similarity index 98%
rename from services/core/internal/store/native_recovery_test.go
rename to services/core/tests/integration/native_recovery_test.go
index 7cf357098..db4d7d859 100644
--- a/services/core/internal/store/native_recovery_test.go
+++ b/services/core/tests/integration/native_recovery_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/no_environment_test.go b/services/core/tests/integration/no_environment_test.go
similarity index 66%
rename from services/core/internal/store/no_environment_test.go
rename to services/core/tests/integration/no_environment_test.go
index 6c32bf2c1..2c19405b5 100644
--- a/services/core/internal/store/no_environment_test.go
+++ b/services/core/tests/integration/no_environment_test.go
@@ -1,18 +1,17 @@
-package store_test
+package integration
 
 import (
 	"context"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestNoEnvironmentRejectsUnadvertisedDeviceBeforeClaim(t *testing.T) {
 	h := newDispatchHarness(t)
 	ctx := context.Background()
 	var err error
-	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "none", Configuration: []byte(`{"agent":{"model":"test-model"},"environment":{"type":"none"}}`)})
+	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "none", Configuration: []byte(`{"agent":{"model":"test-model"},"environment":{"type":"none"}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -23,7 +22,7 @@ func TestNoEnvironmentRejectsUnadvertisedDeviceBeforeClaim(t *testing.T) {
 	if _, err = h.bound().Run(ctx, h.tenant, h.session.ID, input.TurnID); err == nil {
 		t.Fatal("unsupported environment admitted")
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+	turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnQueued {
 		t.Fatal(turn, err)
 	}
diff --git a/services/core/internal/store/node_diagnostic_contract_test.go b/services/core/tests/integration/node_diagnostic_contract_test.go
similarity index 93%
rename from services/core/internal/store/node_diagnostic_contract_test.go
rename to services/core/tests/integration/node_diagnostic_contract_test.go
index b6c059474..6d742c8ed 100644
--- a/services/core/internal/store/node_diagnostic_contract_test.go
+++ b/services/core/tests/integration/node_diagnostic_contract_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
@@ -14,7 +14,7 @@ import (
 )
 
 func TestNodeDiagnosticSchemaContract(t *testing.T) {
-	raw, err := os.ReadFile("../sandbox/testdata/node-diagnostics.json")
+	raw, err := os.ReadFile("../../internal/sandbox/testdata/node-diagnostics.json")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/oac_runtime_names_migration_test.go b/services/core/tests/integration/oac_runtime_names_migration_test.go
similarity index 99%
rename from services/core/internal/store/oac_runtime_names_migration_test.go
rename to services/core/tests/integration/oac_runtime_names_migration_test.go
index 235c7a822..d4d7122c7 100644
--- a/services/core/internal/store/oac_runtime_names_migration_test.go
+++ b/services/core/tests/integration/oac_runtime_names_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/path_id_semantics_public_test.go b/services/core/tests/integration/path_id_semantics_public_test.go
similarity index 96%
rename from services/core/internal/store/path_id_semantics_public_test.go
rename to services/core/tests/integration/path_id_semantics_public_test.go
index 50d897c1d..afab3adf7 100644
--- a/services/core/internal/store/path_id_semantics_public_test.go
+++ b/services/core/tests/integration/path_id_semantics_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -14,7 +14,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -87,12 +86,12 @@ func databaseDigest(t *testing.T, pool *pgxpool.Pool) map[string]string {
 
 func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{61}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	owner, foreign := uuid.NewString(), uuid.NewString()
 	ownerTenant := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
@@ -118,13 +117,13 @@ func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 		t.Fatalf("fixture Turn: %d %s", status, raw)
 	}
 	turn := turns.Data[0].ID
-	hosted, err := s.CreateSession(t.Context(), ownerTenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "path-environment",
+	hosted, err := s.CreateSession(t.Context(), ownerTenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "path-environment",
 		Configuration: json.RawMessage(`{"agent":{"model":"path-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace","capability_directories":[]}}`)})
 	if err != nil || hosted.Environment == nil {
 		t.Fatal("fixture Environment", err)
 	}
 	environment := hosted.Environment.ID
-	skill, err := store.SkillService(t, pool, cipher).CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: store.SkillArchive(t, "path-skill")})
+	skill, err := SkillService(t, pool, cipher).CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: skillArchive(t, "path-skill")})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -321,10 +320,10 @@ func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 		archive []byte
 		fields  map[string]string
 	}{
-		{store.SkillArchive(t, "path-version"), nil},
-		{store.SkillArchive(t, "path-version-default"), map[string]string{"default": "true"}},
+		{skillArchive(t, "path-version"), nil},
+		{skillArchive(t, "path-version-default"), map[string]string{"default": "true"}},
 		{[]byte("not a ZIP archive"), nil},
-		{store.SkillArchive(t, "path-version-invalid-default"), map[string]string{"default": "maybe"}},
+		{skillArchive(t, "path-version-invalid-default"), map[string]string{"default": "maybe"}},
 	} {
 		var body bytes.Buffer
 		form := multipart.NewWriter(&body)
@@ -361,7 +360,7 @@ func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 	}
 
 	// Storage availability checks also run before the lookup of a missing identifier.
-	h, err = publicHandler(t, store.New(pool), fixtureDB{pool: pool}, auth, "codex")
+	h, err = publicHandler(t, New(pool), fixtureDB{pool: pool}, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/prepared_dispatch_failure_test.go b/services/core/tests/integration/prepared_dispatch_failure_test.go
similarity index 89%
rename from services/core/internal/store/prepared_dispatch_failure_test.go
rename to services/core/tests/integration/prepared_dispatch_failure_test.go
index 4c62c3518..6f486bf47 100644
--- a/services/core/internal/store/prepared_dispatch_failure_test.go
+++ b/services/core/tests/integration/prepared_dispatch_failure_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -11,20 +11,19 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestPreparedDispatchSettlesOnlyReadyInput(t *testing.T) {
 	for _, action := range []string{"cancel", "expire", "delete", "prepare-failure", "disconnect"} {
 		t.Run(action, func(t *testing.T) {
 			h, pending := preparedDispatchHarness(t)
-			_, pool := store.NewTestStore(t)
+			_, pool := testStore(t)
 			result := runPreparedDispatch(h, t.Context(), pending)
 			frame := h.read(proto.TypeExecutionPrepare)
 			handle := acknowledgePreparation(h, frame.ID)
 			switch action {
 			case "cancel":
-				if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
+				if _, err := cancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
 					t.Fatal(err)
 				}
 			case "expire":
@@ -32,10 +31,10 @@ func TestPreparedDispatchSettlesOnlyReadyInput(t *testing.T) {
 					t.Fatal(err)
 				}
 			case "delete":
-				if err := store.SessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
+				if err := sessionService(t, h.s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 					t.Fatal("pending input deleted", err)
 				}
-				if err := h.s.CommitLegacyDeletion(t.Context(), h.tenant, h.session.ID); err != nil {
+				if err := h.s.commitLegacyDeletion(t.Context(), h.tenant, h.session.ID); err != nil {
 					t.Fatal(err)
 				}
 			case "prepare-failure":
@@ -66,7 +65,7 @@ func TestPreparedDispatchSettlesOnlyReadyInput(t *testing.T) {
 			}
 			assertEnvironmentExpiryHasNoHistory(t, pool, h.session.ID)
 			if action == "prepare-failure" || action == "disconnect" {
-				stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+				stored, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 				if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(pending.Deadline) {
 					t.Fatal("preparation failure changed the pending identity", stored, err)
 				}
@@ -87,7 +86,7 @@ func TestPreparedDispatchHandlesStartRejectionAndPendingStartCancellation(t *tes
 				h.write(frame.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{State: "rejected", Operation: proto.TypeExecutionStart, ErrorCode: "preparation_not_ready"})
 			} else {
 				h.write(frame.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{Handle: handle, Revision: 3, State: "starting", RunID: start.RunID})
-				if _, err := store.RequestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel-start"); err != nil {
+				if _, err := requestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel-start"); err != nil {
 					t.Fatal(err)
 				}
 				frame := h.read(proto.TypePromptCancel)
@@ -147,7 +146,7 @@ func TestPreparedDispatchCancellationReceiptSurvivesStartFailure(t *testing.T) {
 			handle := acknowledgePreparation(h, prepare.ID)
 			start := readyPreparedDispatch(t, h, prepare.ID, handle)
 			h.write(prepare.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{Handle: handle, Revision: 3, State: "starting", RunID: start.RunID})
-			if _, err := store.RequestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel-start"); err != nil {
+			if _, err := requestCancel(t.Context(), h.s, h.tenant, h.session.ID, "cancel-start"); err != nil {
 				t.Fatal(err)
 			}
 			frame := h.read(proto.TypePromptCancel)
@@ -190,7 +189,7 @@ func TestPreparedDispatchCancellationReceiptSurvivesStartFailure(t *testing.T) {
 			if receipts != 1 {
 				t.Fatal("cancellation receipt was not journaled once", receipts)
 			}
-			bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+			bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 			if err != nil || (withOutcome && (bound.NativeSessionID != "cancelled-prepared-native" || outcome.Done.Content != "retained cancellation")) {
 				t.Fatal("cancellation lost native continuation or final output", err)
 			}
diff --git a/services/core/internal/store/prepared_dispatch_test.go b/services/core/tests/integration/prepared_dispatch_test.go
similarity index 89%
rename from services/core/internal/store/prepared_dispatch_test.go
rename to services/core/tests/integration/prepared_dispatch_test.go
index 5964853c0..9b2c5ff61 100644
--- a/services/core/internal/store/prepared_dispatch_test.go
+++ b/services/core/tests/integration/prepared_dispatch_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -25,7 +24,7 @@ func preparedDispatchHarness(t *testing.T) (*dispatchHarness, sessions.Environme
 	assertNoRuntimeAllocation(t, h)
 	h.d, h.lease = h.bound(), h.owner().Lease
 	enableWorkerEnvironment(t, h)
-	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -66,7 +65,7 @@ func readyPreparedDispatch(t *testing.T, h *dispatchHarness, request, handle str
 	if frame.ID != request || frame.DecodePayload(&start) != nil || start.Handle != handle || start.RunID == "" || inputTextForTest(t, start.Input) != "first\n\nsecond" {
 		t.Fatal("Start changed preparation or original batch", frame.ID, start)
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
+	turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
 	if err != nil || turn.Status != sessions.TurnInProgress {
 		t.Fatal("Start preceded atomic claim", turn, err)
 	}
@@ -81,7 +80,7 @@ func TestPreparedDispatchPromotesOriginalBatchAndPersistsCompletion(t *testing.T
 	if frame.DecodePayload(&prepare) != nil || len(prepare.Configuration.Input) != 0 || prepare.Configuration.RunID != "" || prepare.Configuration.ConversationID != "" || prepare.Configuration.LocalEnvironment == nil || prepare.Configuration.LocalEnvironment.ID != h.device.EnvironmentID || prepare.Configuration.DisableExecutionEnvironment {
 		t.Fatal("invalid preparation configuration", prepare)
 	}
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("preparation created work before readiness", session, err)
 	}
@@ -106,7 +105,7 @@ func TestPreparedDispatchPromotesOriginalBatchAndPersistsCompletion(t *testing.T
 		t.Fatal("prepared completion", got)
 	}
 	assertPreparationReleased(t, h, frame.ID, handle)
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(t.Context(), h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "retained-prepared-native" {
 		t.Fatal("native identity was not committed", bound, err)
 	}
@@ -118,7 +117,7 @@ func TestPreparedDispatchPromotesOriginalBatchAndPersistsCompletion(t *testing.T
 
 func TestPreparedDispatchOwnerOutlivesReservationDeadline(t *testing.T) {
 	h, pending := preparedDispatchHarness(t)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	parent, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	result := runPreparedDispatch(h, parent, pending)
@@ -146,7 +145,7 @@ func TestPreparedDispatchOwnerOutlivesReservationDeadline(t *testing.T) {
 // to the executor bound to that Session, not to another executor of the tenant.
 func TestSelfHostedProviderReachesOnlyBoundExecutor(t *testing.T) {
 	h, pending := preparedDispatchHarness(t)
-	other, err := h.s.CreateSession(t.Context(), h.tenant, store.WithFixtureModelProvider(sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
+	other, err := h.s.CreateSession(t.Context(), h.tenant, WithFixtureModelProvider(sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 		Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)}))
 	if err != nil {
 		t.Fatal(err)
@@ -160,7 +159,7 @@ func TestSelfHostedProviderReachesOnlyBoundExecutor(t *testing.T) {
 		t.Fatal("invalid preparation")
 	}
 	provider, _ := prepare.Configuration.AgentOptions["model_provider"].(map[string]any)
-	fixture := store.FixtureModelProvider("codex")
+	fixture := FixtureModelProvider("codex")
 	if provider["base_url"] != fixture.BaseURL || provider["api_key"] != fixture.APIKey {
 		t.Fatal("bound executor did not receive the frozen provider", prepare.Configuration.AgentOptions)
 	}
diff --git a/services/core/internal/store/project_api_keys_http_test.go b/services/core/tests/integration/project_api_keys_http_test.go
similarity index 99%
rename from services/core/internal/store/project_api_keys_http_test.go
rename to services/core/tests/integration/project_api_keys_http_test.go
index df0aba6ad..36c3d7014 100644
--- a/services/core/internal/store/project_api_keys_http_test.go
+++ b/services/core/tests/integration/project_api_keys_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/project_scopes_fixture_test.go b/services/core/tests/integration/project_scopes_fixture_test.go
similarity index 98%
rename from services/core/internal/store/project_scopes_fixture_test.go
rename to services/core/tests/integration/project_scopes_fixture_test.go
index 8e75fb1d4..574f876f9 100644
--- a/services/core/internal/store/project_scopes_fixture_test.go
+++ b/services/core/tests/integration/project_scopes_fixture_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/project_scopes_test.go b/services/core/tests/integration/project_scopes_test.go
similarity index 99%
rename from services/core/internal/store/project_scopes_test.go
rename to services/core/tests/integration/project_scopes_test.go
index d47dae6ba..afcebedf7 100644
--- a/services/core/internal/store/project_scopes_test.go
+++ b/services/core/tests/integration/project_scopes_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/projects_fixture_test.go b/services/core/tests/integration/projects_fixture_test.go
similarity index 98%
rename from services/core/internal/store/projects_fixture_test.go
rename to services/core/tests/integration/projects_fixture_test.go
index 838452c1b..19d5bebce 100644
--- a/services/core/internal/store/projects_fixture_test.go
+++ b/services/core/tests/integration/projects_fixture_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/projects_public_fixture_test.go b/services/core/tests/integration/projects_public_fixture_test.go
similarity index 98%
rename from services/core/internal/store/projects_public_fixture_test.go
rename to services/core/tests/integration/projects_public_fixture_test.go
index e861a47f1..9fac07967 100644
--- a/services/core/internal/store/projects_public_fixture_test.go
+++ b/services/core/tests/integration/projects_public_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/provider_configuration_migration_test.go b/services/core/tests/integration/provider_configuration_migration_test.go
similarity index 99%
rename from services/core/internal/store/provider_configuration_migration_test.go
rename to services/core/tests/integration/provider_configuration_migration_test.go
index a6883c994..1e9d06f5c 100644
--- a/services/core/internal/store/provider_configuration_migration_test.go
+++ b/services/core/tests/integration/provider_configuration_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/provider_operations_fixture_test.go b/services/core/tests/integration/provider_operations_fixture_test.go
similarity index 99%
rename from services/core/internal/store/provider_operations_fixture_test.go
rename to services/core/tests/integration/provider_operations_fixture_test.go
index 68d0d0b98..383fde08d 100644
--- a/services/core/internal/store/provider_operations_fixture_test.go
+++ b/services/core/tests/integration/provider_operations_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/provider_registration_migration_test.go b/services/core/tests/integration/provider_registration_migration_test.go
similarity index 99%
rename from services/core/internal/store/provider_registration_migration_test.go
rename to services/core/tests/integration/provider_registration_migration_test.go
index 86a3a7cb3..bbc4cfb1e 100644
--- a/services/core/internal/store/provider_registration_migration_test.go
+++ b/services/core/tests/integration/provider_registration_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"database/sql"
diff --git a/services/core/internal/store/public_execution_test.go b/services/core/tests/integration/public_execution_test.go
similarity index 82%
rename from services/core/internal/store/public_execution_test.go
rename to services/core/tests/integration/public_execution_test.go
index 681841b58..4a45ff9aa 100644
--- a/services/core/internal/store/public_execution_test.go
+++ b/services/core/tests/integration/public_execution_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,13 +9,12 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func publicSession(t *testing.T, h *dispatchHarness, key string) sessions.Session {
 	t.Helper()
-	value, err := h.s.CreateSession(context.Background(), h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: key, Configuration: json.RawMessage(`{"agent":{"id":"agent_test","model":"test-model","instructions":"Keep this."},"environment":{"type":"none"}}`)})
+	value, err := h.s.CreateSession(context.Background(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: key, Configuration: json.RawMessage(`{"agent":{"id":"agent_test","model":"test-model","instructions":"Keep this."},"environment":{"type":"none"}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -68,7 +67,7 @@ func TestExecutionWorkerAdmissionBindingAndRecovery(t *testing.T) {
 	if err != nil || bound.ID != h.device.ID {
 		t.Fatal(bound, err)
 	}
-	active, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
+	active, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
 	if err != nil || active.LastTurn == nil || active.LastTurn.Status != sessions.TurnInProgress {
 		t.Fatal(active, err)
 	}
@@ -95,7 +94,7 @@ func waitTurn(t *testing.T, h *dispatchHarness, id, status string) {
 	t.Helper()
 	deadline := time.Now().Add(12 * time.Second)
 	for time.Now().Before(deadline) {
-		turn, err := store.SessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, id)
+		turn, err := sessionAdapter(h.s).GetTurn(context.Background(), h.tenant, h.session.ID, id)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -112,7 +111,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	h.session = publicSession(t, h, "interrupted")
 	first := h.message("first", "Already sent")
 	ctx := context.Background()
-	if _, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := transitionTurn(ctx, h.s, h.tenant, h.session.ID, first.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	// A native measurement committed before process loss must survive startup
@@ -123,7 +122,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	}
 	checkMeasurement := func(ended bool) {
 		t.Helper()
-		turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, first.TurnID)
+		turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, first.TurnID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -138,14 +137,14 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 		if !ended {
 			want = nil
 		}
-		session, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
+		session, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
 		if err != nil || string(session.Usage) != string(want) {
 			t.Fatalf("Session and Turn measurement differ: %+v %v", session, err)
 		}
 	}
 	checkMeasurement(false)
 	queued := publicSession(t, h, "queued")
-	if _, err := store.SendMessage(ctx, h.s, h.tenant, queued.ID, "first", json.RawMessage(`{"text":"Not sent"}`)); err != nil {
+	if _, err := sendMessage(ctx, h.s, h.tenant, queued.ID, "first", json.RawMessage(`{"text":"Not sent"}`)); err != nil {
 		t.Fatal(err)
 	}
 	worker := startOwnedWorker(t, ctx, h.db, h.d, h.owner())
@@ -154,18 +153,18 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	if err := worker.Run(stopped); err != context.Canceled {
 		t.Fatal(err)
 	}
-	interrupted, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
+	interrupted, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID)
 	if err != nil || interrupted.LastTurn.Status != sessions.TurnFailed {
 		t.Fatal(interrupted, err)
 	}
-	pending, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, queued.ID)
+	pending, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, queued.ID)
 	if err != nil || pending.LastTurn.Status != sessions.TurnQueued {
 		t.Fatal(pending, err)
 	}
-	if _, err := store.RequestCancel(ctx, h.s, h.tenant, queued.ID, "stop-before-dispatch"); err != nil {
+	if _, err := requestCancel(ctx, h.s, h.tenant, queued.ID, "stop-before-dispatch"); err != nil {
 		t.Fatal(err)
 	}
-	pending, err = store.SessionAdapter(h.s).GetSession(ctx, h.tenant, queued.ID)
+	pending, err = sessionAdapter(h.s).GetSession(ctx, h.tenant, queued.ID)
 	if err != nil || pending.LastTurn.Status != sessions.TurnCancelled {
 		t.Fatal(pending, err)
 	}
diff --git a/services/core/internal/store/public_handler_fixture_test.go b/services/core/tests/integration/public_handler_fixture_test.go
similarity index 93%
rename from services/core/internal/store/public_handler_fixture_test.go
rename to services/core/tests/integration/public_handler_fixture_test.go
index 0ffd53c74..5c299fcf8 100644
--- a/services/core/internal/store/public_handler_fixture_test.go
+++ b/services/core/tests/integration/public_handler_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -28,7 +28,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // testExecutorURL is the daemon URL self-hosted Sessions report unless a test
@@ -42,7 +41,7 @@ const testExecutorURL = "wss://core.example/api/v1/agent-daemon/ws"
 // Core key. Metrics, Runtime observation and history, and executor connections
 // are strict stand-ins. Execution and Sandboxes stay disabled unless configure
 // sets them.
-func publicHandler(t testing.TB, s *store.Store, db fixtureDB, keys fixtureKeyResolver, engine string, configure ...func(*api.Dependencies)) (http.Handler, error) {
+func publicHandler(t testing.TB, s *Store, db fixtureDB, keys fixtureKeyResolver, engine string, configure ...func(*api.Dependencies)) (http.Handler, error) {
 	t.Helper()
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential("admin")})
 	if err != nil {
@@ -72,7 +71,7 @@ func publicHandler(t testing.TB, s *store.Store, db fixtureDB, keys fixtureKeyRe
 		return nil, err
 	}
 	projectStore, projectService := fixtureProjects(t, db)
-	sessionStore, sessionService, err := fixtureSessions(db)
+	sessionStore, service, err := fixtureSessions(db)
 	if err != nil {
 		return nil, err
 	}
@@ -85,16 +84,16 @@ func publicHandler(t testing.TB, s *store.Store, db fixtureDB, keys fixtureKeyRe
 		EnvironmentTemplates: environmentTemplates, EnvironmentTemplatesReader: templates,
 		Skills: skillService, SkillsReader: skillStore,
 		Agents: agentService, AgentsReader: agentStore,
-		Sessions:        sessionService,
+		Sessions:        service,
 		SessionsReader:  sessionStore,
-		SessionCreation: store.SessionService(t, s),
+		SessionCreation: sessionService(t, s),
 		SessionEvents:   sessionStore,
 		Turns:           sessionStore,
 		Items:           sessionStore,
 		Subagents:       sessionStore,
-		Artifacts:       sessionService,
+		Artifacts:       service,
 		ArtifactsReader: sessionStore,
-		SessionAdmin:    sessionStore, Environments: sessionService, EnvironmentsReader: sessionStore, Admin: sessionStore, AdminAudit: audit, WriteAudit: audit,
+		SessionAdmin:    sessionStore, Environments: service, EnvironmentsReader: sessionStore, Admin: sessionStore, AdminAudit: audit, WriteAudit: audit,
 		ExecutorConnections: strict, Metrics: strict, RuntimeObservations: strict, RuntimeHistory: strict,
 	}
 	for _, c := range configure {
@@ -126,7 +125,7 @@ func fixtureFiles(t testing.TB, db fixtureDB) (*filepg.Store, *files.Service) {
 }
 
 // storeKeys resolves Project keys from the database, as production does.
-func storeKeys(*store.Store) func(*api.Dependencies) {
+func storeKeys(*Store) func(*api.Dependencies) {
 	return func(d *api.Dependencies) { d.ProjectsReader = d.ProjectsReader.(fixtureProjectsReader).Reader }
 }
 
@@ -147,9 +146,9 @@ func withPolicy(policy execution.Policy) func(*api.Dependencies) {
 
 // storeExecution admits Sessions and inputs through the Session service on s
 // without a Worker, so nothing runs them.
-func storeExecution(t testing.TB, s *store.Store) func(*api.Dependencies) {
+func storeExecution(t testing.TB, s *Store) func(*api.Dependencies) {
 	return func(d *api.Dependencies) {
-		service := store.SessionService(t, s)
+		service := sessionService(t, s)
 		d.Execution = &api.Execution{
 			ExecutorURL:      testExecutorURL,
 			SessionAdmission: service,
diff --git a/services/core/internal/store/public_url_migration_test.go b/services/core/tests/integration/public_url_migration_test.go
similarity index 99%
rename from services/core/internal/store/public_url_migration_test.go
rename to services/core/tests/integration/public_url_migration_test.go
index 857f3cda0..d2e6e522d 100644
--- a/services/core/internal/store/public_url_migration_test.go
+++ b/services/core/tests/integration/public_url_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/remote_mcp_credentials_test.go b/services/core/tests/integration/remote_mcp_credentials_test.go
similarity index 92%
rename from services/core/internal/store/remote_mcp_credentials_test.go
rename to services/core/tests/integration/remote_mcp_credentials_test.go
index fb3f3f1d8..0a5624583 100644
--- a/services/core/internal/store/remote_mcp_credentials_test.go
+++ b/services/core/tests/integration/remote_mcp_credentials_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -7,7 +7,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
@@ -17,7 +16,7 @@ func TestSelfHostedServiceMCPRejectionDoesNotRequireCredentialDecryption(t *test
 			s, db, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
 			switch mode {
 			case "missing key":
-				s, db = store.New(db.pool), fixtureDB{pool: db.pool}
+				s, db = New(db.pool), fixtureDB{pool: db.pool}
 			case "deleted":
 				_, service, err := fixtureVaults(db)
 				if err != nil {
@@ -40,7 +39,7 @@ func TestSelfHostedServiceMCPRejectionDoesNotRequireCredentialDecryption(t *test
 					}}},
 					"environment":   map[string]string{"type": "self_hosted", "workspace_directory": "/workspace"},
 					"vault_ids":     []string{vault.ID},
-					"x_agents_core": map[string]any{"model_provider": store.FixtureModelProvider("codex")},
+					"x_agents_core": map[string]any{"model_provider": FixtureModelProvider("codex")},
 				}
 				if initial {
 					body["input"] = "must not execute"
diff --git a/services/core/internal/store/remote_mcp_test.go b/services/core/tests/integration/remote_mcp_test.go
similarity index 90%
rename from services/core/internal/store/remote_mcp_test.go
rename to services/core/tests/integration/remote_mcp_test.go
index 841b76f82..dec32b273 100644
--- a/services/core/internal/store/remote_mcp_test.go
+++ b/services/core/tests/integration/remote_mcp_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -9,7 +9,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -27,7 +26,7 @@ func TestSelfHostedServiceMCPRejectedWithoutWrites(t *testing.T) {
 			}
 			tool["required"] = strings.HasPrefix(mode, "required")
 			body := map[string]any{"agent": map[string]any{"model": "model", "tools": []any{tool}}, "environment": map[string]string{"type": "self_hosted", "workspace_directory": "/workspace"}, "vault_ids": []string{vault.ID},
-				"x_agents_core": map[string]any{"model_provider": store.FixtureModelProvider("codex")}}
+				"x_agents_core": map[string]any{"model_provider": FixtureModelProvider("codex")}}
 			switch mode {
 			case "anonymous", "required anonymous", "unattached":
 				body["vault_ids"] = []string{}
@@ -73,14 +72,14 @@ func TestSelfHostedServiceMCPRejectedWithoutWrites(t *testing.T) {
 	}
 }
 
-func selfHostedMCPAdmissionFixture(t *testing.T) (*store.Store, fixtureDB, string, vaults.Vault, vaults.Credential) {
+func selfHostedMCPAdmissionFixture(t *testing.T) (*Store, fixtureDB, string, vaults.Vault, vaults.Credential) {
 	t.Helper()
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New([]byte(strings.Repeat("k", 32)))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	_, service, err := fixtureVaults(db)
 	if err != nil {
 		t.Fatal(err)
@@ -97,7 +96,7 @@ func selfHostedMCPAdmissionFixture(t *testing.T) (*store.Store, fixtureDB, strin
 	return s, db, tenant, vault, credential
 }
 
-func selfHostedMCPAdmissionHandler(t *testing.T, s *store.Store, db fixtureDB, tenant string) http.Handler {
+func selfHostedMCPAdmissionHandler(t *testing.T, s *Store, db fixtureDB, tenant string) http.Handler {
 	t.Helper()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test", TenantID: tenant, TokenSHA256: runtimedevice.HashCredential("test-token")}})
 	handler, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
diff --git a/services/core/internal/store/request_body_public_test.go b/services/core/tests/integration/request_body_public_test.go
similarity index 96%
rename from services/core/internal/store/request_body_public_test.go
rename to services/core/tests/integration/request_body_public_test.go
index 50b0ba0ad..37073f5a3 100644
--- a/services/core/internal/store/request_body_public_test.go
+++ b/services/core/tests/integration/request_body_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -15,7 +15,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -25,12 +24,12 @@ import (
 // sent as text/plain, change nothing for the owner or another tenant.
 func TestRequestBodyGateRejectsWithoutWritesPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{64}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "body-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
@@ -51,7 +50,7 @@ func TestRequestBodyGateRejectsWithoutWritesPostgres(t *testing.T) {
 	credential := client.created(owner, "/v1/vaults/"+vault+"/credentials", `{"name":"body","auth":{"type":"static_bearer","mcp_server_url":"https://mcp.example/mcp","token":"body-token"}}`)
 	template := client.created(owner, "/v1/agents/environments/templates", `{"name":"body-template"}`)
 	session := client.created(owner, "/v1/agents/sessions", `{"agent":{"model":"body-model"},"environment":{"type":"none"},"input":"Keep this Session.","metadata":{"k":"v"}}`)
-	prepared, err := s.CreateSession(t.Context(), ownerTenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "body-environment",
+	prepared, err := s.CreateSession(t.Context(), ownerTenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "body-environment",
 		Configuration: json.RawMessage(`{"agent":{"model":"body-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace","capability_directories":[]}}`)})
 	if err != nil || prepared.Environment == nil {
 		t.Fatal("fixture Environment", err)
@@ -166,12 +165,12 @@ func TestRequestBodyGateRejectsWithoutWritesPostgres(t *testing.T) {
 // Core extension routes keep their own body handling, without the Content-Type
 // rule or the official body messages.
 func TestRequestBodyGateExcludedRoutesPostgres(t *testing.T) {
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{65}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	token, tenant := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "excluded-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
@@ -208,7 +207,7 @@ func TestRequestBodyGateExcludedRoutesPostgres(t *testing.T) {
 	if status, response := client.do(token, http.MethodPost, "/v1/files", contentType, body); status != http.StatusOK || gated(response) {
 		t.Fatalf("Files upload: %d %s", status, response)
 	}
-	contentType, body = upload("files", "proof.zip", store.SkillArchive(t, "excluded-skill"))
+	contentType, body = upload("files", "proof.zip", skillArchive(t, "excluded-skill"))
 	status, response := client.do(token, http.MethodPost, "/v1/skills", contentType, body)
 	var skill struct{ ID string }
 	if status != http.StatusOK || json.Unmarshal([]byte(response), &skill) != nil || skill.ID == "" {
diff --git a/services/core/internal/store/store_fixture_test.go b/services/core/tests/integration/root_fixture_test.go
similarity index 99%
rename from services/core/internal/store/store_fixture_test.go
rename to services/core/tests/integration/root_fixture_test.go
index 99ce17b42..1696dcdf1 100644
--- a/services/core/internal/store/store_fixture_test.go
+++ b/services/core/tests/integration/root_fixture_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_adoption_test.go b/services/core/tests/integration/runtime_adoption_test.go
similarity index 99%
rename from services/core/internal/store/runtime_adoption_test.go
rename to services/core/tests/integration/runtime_adoption_test.go
index dea4dcb4c..76ae44516 100644
--- a/services/core/internal/store/runtime_adoption_test.go
+++ b/services/core/tests/integration/runtime_adoption_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"fmt"
diff --git a/services/core/internal/store/runtime_allocations_test.go b/services/core/tests/integration/runtime_allocations_test.go
similarity index 99%
rename from services/core/internal/store/runtime_allocations_test.go
rename to services/core/tests/integration/runtime_allocations_test.go
index acf21784f..14ffb4994 100644
--- a/services/core/internal/store/runtime_allocations_test.go
+++ b/services/core/tests/integration/runtime_allocations_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_capabilities_pending_test.go b/services/core/tests/integration/runtime_capabilities_pending_test.go
similarity index 83%
rename from services/core/internal/store/runtime_capabilities_pending_test.go
rename to services/core/tests/integration/runtime_capabilities_pending_test.go
index 06cb25c34..f0c854b16 100644
--- a/services/core/internal/store/runtime_capabilities_pending_test.go
+++ b/services/core/tests/integration/runtime_capabilities_pending_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -11,21 +11,20 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{9}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	s.SetPlacement(fixtureRules(t, db))
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{
-		Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
+		Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 		Configuration:  json.RawMessage(`{"environment":{"type":"openai_hosted"}}`),
 		Initialization: environmentconfig.Setup{CapabilityDirectories: []string{"/workspace/generated"}},
 	})
@@ -52,7 +51,7 @@ func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
 	if err != nil || initializationState(t, db.pool, owner.TenantID, owner.EnvironmentID) != "pending" || owner.State != "running" || provider.writes.Load() != 0 || provider.kills != 0 {
 		t.Fatal("missing socket consumed initialization or requested cleanup", owner, err, provider.writes.Load(), provider.kills)
 	}
-	if _, err := store.SessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("ordinary readiness gate bypassed", err)
 	}
 }
diff --git a/services/core/internal/store/runtime_compute_lifecycle_test.go b/services/core/tests/integration/runtime_compute_lifecycle_test.go
similarity index 98%
rename from services/core/internal/store/runtime_compute_lifecycle_test.go
rename to services/core/tests/integration/runtime_compute_lifecycle_test.go
index b8370de0e..01700b449 100644
--- a/services/core/internal/store/runtime_compute_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_compute_lifecycle_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -21,7 +21,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 )
@@ -260,7 +259,7 @@ func (p *fakeCheckpointProvider) connect(ctx context.Context, b sandbox.Bootstra
 
 type computeLifecycleFixture struct {
 	t        *testing.T
-	store    *store.Store
+	store    *Store
 	db       fixtureDB
 	provider *fakeCheckpointProvider
 	worker   *execution.Worker
@@ -393,7 +392,7 @@ func TestRuntimeComputeLifecycleIdleSuspendAndQueuedSameSessionWake(t *testing.T
 	if err := f.db.pool.QueryRow(t.Context(), `SELECT count(*) FILTER(WHERE id=$2 AND status='completed'),count(*) FILTER(WHERE id=$3 AND status='queued') FROM turns WHERE session_id=$1`, session.ID, completed, queued).Scan(&completedCount, &queuedCount); err != nil || completedCount != 1 || queuedCount != 1 {
 		t.Fatal("wake replayed/consumed prior or next Turn", err)
 	}
-	if got, err := store.SessionAdapter(f.store).GetSession(t.Context(), tenant, session.ID); err != nil || string(got.Configuration) != string(session.Configuration) {
+	if got, err := sessionAdapter(f.store).GetSession(t.Context(), tenant, session.ID); err != nil || string(got.Configuration) != string(session.Configuration) {
 		t.Fatal("configuration changed during restore", err)
 	}
 	if f.provider.promptFrames.Load() != 0 {
@@ -510,7 +509,7 @@ func TestRuntimeComputeLifecycleSuspendedDeletionAndExpiryCleanup(t *testing.T)
 			f.complete(owner)
 			f.phase(tenant, env.ID, "suspended")
 			if kind == "deleted" {
-				if err := store.SessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+				if err := sessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 					t.Fatal(err)
 				}
 			} else {
diff --git a/services/core/internal/store/runtime_configuration_cleanup_test.go b/services/core/tests/integration/runtime_configuration_cleanup_test.go
similarity index 93%
rename from services/core/internal/store/runtime_configuration_cleanup_test.go
rename to services/core/tests/integration/runtime_configuration_cleanup_test.go
index 855fc427c..3ea9cb028 100644
--- a/services/core/internal/store/runtime_configuration_cleanup_test.go
+++ b/services/core/tests/integration/runtime_configuration_cleanup_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -7,7 +7,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -99,7 +98,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 				t.Fatal("unexpected creation outcome", owner, err)
 			}
 			if test.rejectCreate {
-				value, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
+				value, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 				if err != nil || value.Environment.Status != "failed" {
 					t.Fatal("rejected configuration did not terminate its retained Session", value, err)
 				}
@@ -121,7 +120,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 				}
 				// Exercise the existing authorized deletion lifecycle; no new
 				// deployment cleanup API is introduced by this regression test.
-				if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+				if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -154,7 +153,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 			}
 			if test.rejectCreate {
 				// The rejected Session remains publicly readable after cleanup.
-				if _, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID); err != nil {
+				if _, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID); err != nil {
 					t.Fatal("configuration rejection deleted Session history", err)
 				}
 			}
diff --git a/services/core/internal/store/runtime_connection_test.go b/services/core/tests/integration/runtime_connection_test.go
similarity index 93%
rename from services/core/internal/store/runtime_connection_test.go
rename to services/core/tests/integration/runtime_connection_test.go
index 81450cd21..85d5ccd11 100644
--- a/services/core/internal/store/runtime_connection_test.go
+++ b/services/core/tests/integration/runtime_connection_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -18,7 +18,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtime"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
@@ -88,7 +87,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	}
 	defer conn.Close()
 	assertStatus("connected")
-	got, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
+	got, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || got.LastTurn != nil || got.EnvironmentInputActivity != nil {
 		t.Fatal("connection fabricated native execution", err)
 	}
@@ -112,7 +111,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	if err != nil || retained.ID != owner.ID || retained.DeviceID != owner.DeviceID || p.creates != 1 {
 		t.Fatal("restart replaced Runtime identity", err)
 	}
-	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
diff --git a/services/core/internal/store/runtime_creation_settlement_test.go b/services/core/tests/integration/runtime_creation_settlement_test.go
similarity index 92%
rename from services/core/internal/store/runtime_creation_settlement_test.go
rename to services/core/tests/integration/runtime_creation_settlement_test.go
index 5b812681a..ea035f854 100644
--- a/services/core/internal/store/runtime_creation_settlement_test.go
+++ b/services/core/tests/integration/runtime_creation_settlement_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -8,7 +8,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -66,7 +65,7 @@ func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 			if _, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 				t.Fatal("released credential retained authority", err)
 			}
-			value, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
+			value, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 			if err != nil || value.Environment.Status != "failed" {
 				t.Fatal("environment not terminated", err)
 			}
@@ -102,7 +101,7 @@ func TestManagedRuntimeObservedSettlementAllowsOwnedCleanup(t *testing.T) {
 	if _, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err == nil {
 		t.Fatal("uncertain Create succeeded")
 	}
-	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
diff --git a/services/core/internal/store/runtime_deployment_test.go b/services/core/tests/integration/runtime_deployment_test.go
similarity index 99%
rename from services/core/internal/store/runtime_deployment_test.go
rename to services/core/tests/integration/runtime_deployment_test.go
index 8a2f82cbf..28d6bb24c 100644
--- a/services/core/internal/store/runtime_deployment_test.go
+++ b/services/core/tests/integration/runtime_deployment_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_deployment_worker_test.go b/services/core/tests/integration/runtime_deployment_worker_test.go
similarity index 99%
rename from services/core/internal/store/runtime_deployment_worker_test.go
rename to services/core/tests/integration/runtime_deployment_worker_test.go
index 76f867a32..ab326a2f4 100644
--- a/services/core/internal/store/runtime_deployment_worker_test.go
+++ b/services/core/tests/integration/runtime_deployment_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"strings"
diff --git a/services/core/internal/store/runtime_enrollment_connection_test.go b/services/core/tests/integration/runtime_enrollment_connection_test.go
similarity index 95%
rename from services/core/internal/store/runtime_enrollment_connection_test.go
rename to services/core/tests/integration/runtime_enrollment_connection_test.go
index ae07e3d1a..9a452f384 100644
--- a/services/core/internal/store/runtime_enrollment_connection_test.go
+++ b/services/core/tests/integration/runtime_enrollment_connection_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -17,14 +17,13 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtime"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeenrollment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 )
 
 func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	s, db := newTestStoreDB(t)
-	principal := store.FixtureExecutorPrincipal(t, s, uuid.NewString())
+	principal := FixtureExecutorPrincipal(t, s, uuid.NewString())
 	session, err := s.CreateSession(t.Context(), principal.TenantID, sessions.CreateSession{
 		Creator: principal.Subject(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 		Configuration: json.RawMessage(`{"agent":{"model":"fixture"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`),
@@ -75,7 +74,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 		t.Fatal(err)
 	}
 	assertConnection(environment.ID, otherKey.Token, "", 409)
-	foreign := store.FixtureExecutorPrincipal(t, s, uuid.NewString())
+	foreign := FixtureExecutorPrincipal(t, s, uuid.NewString())
 	foreignKey, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), foreign, uuid.NewString(), "")
 	if err != nil {
 		t.Fatal(err)
@@ -168,7 +167,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	if err = db.pool.QueryRow(t.Context(), "SELECT count(*) FROM runtime_allocations WHERE environment_id=$1", environment.ID).Scan(&allocations); err != nil || allocations != 0 {
 		t.Fatal("user Runtime acquired managed allocation", allocations, err)
 	}
-	current, err := store.SessionAdapter(s).GetSession(t.Context(), principal.TenantID, session.ID)
+	current, err := sessionAdapter(s).GetSession(t.Context(), principal.TenantID, session.ID)
 	if err != nil || current.LastTurn != nil {
 		t.Fatal("connection handling created execution", err)
 	}
diff --git a/services/core/internal/store/runtime_enrollment_test.go b/services/core/tests/integration/runtime_enrollment_test.go
similarity index 99%
rename from services/core/internal/store/runtime_enrollment_test.go
rename to services/core/tests/integration/runtime_enrollment_test.go
index bf2e20d87..7a22c4c04 100644
--- a/services/core/internal/store/runtime_enrollment_test.go
+++ b/services/core/tests/integration/runtime_enrollment_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/runtime_environment_terminal_test.go b/services/core/tests/integration/runtime_environment_terminal_test.go
similarity index 99%
rename from services/core/internal/store/runtime_environment_terminal_test.go
rename to services/core/tests/integration/runtime_environment_terminal_test.go
index d90215a2d..2851301a3 100644
--- a/services/core/internal/store/runtime_environment_terminal_test.go
+++ b/services/core/tests/integration/runtime_environment_terminal_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_file_admission_test.go b/services/core/tests/integration/runtime_file_admission_test.go
similarity index 99%
rename from services/core/internal/store/runtime_file_admission_test.go
rename to services/core/tests/integration/runtime_file_admission_test.go
index 5196757ee..676c9e9d9 100644
--- a/services/core/internal/store/runtime_file_admission_test.go
+++ b/services/core/tests/integration/runtime_file_admission_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/runtime_idle_clock_test.go b/services/core/tests/integration/runtime_idle_clock_test.go
similarity index 99%
rename from services/core/internal/store/runtime_idle_clock_test.go
rename to services/core/tests/integration/runtime_idle_clock_test.go
index 0cf23151e..b792c00e5 100644
--- a/services/core/internal/store/runtime_idle_clock_test.go
+++ b/services/core/tests/integration/runtime_idle_clock_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_initialization_peer_test.go b/services/core/tests/integration/runtime_initialization_peer_test.go
similarity index 99%
rename from services/core/internal/store/runtime_initialization_peer_test.go
rename to services/core/tests/integration/runtime_initialization_peer_test.go
index 32b119f41..e67d099db 100644
--- a/services/core/internal/store/runtime_initialization_peer_test.go
+++ b/services/core/tests/integration/runtime_initialization_peer_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_initialization_test.go b/services/core/tests/integration/runtime_initialization_test.go
similarity index 90%
rename from services/core/internal/store/runtime_initialization_test.go
rename to services/core/tests/integration/runtime_initialization_test.go
index c50208edf..ba45c2311 100644
--- a/services/core/internal/store/runtime_initialization_test.go
+++ b/services/core/tests/integration/runtime_initialization_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"archive/zip"
@@ -21,7 +21,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -47,15 +46,15 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 			setupOnly := strings.HasPrefix(mode, "setup-")
 			mode = strings.TrimPrefix(mode, "setup-")
 			expectedSteps := 2
-			_, pool := store.NewManagedTestStore(t)
+			_, pool := newManagedTestStore(t)
 			cipher, err := credentialcrypto.New(bytes.Repeat([]byte{9}, 32))
 			if err != nil {
 				t.Fatal(err)
 			}
-			s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+			s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 			s.SetPlacement(fixtureRules(t, db))
 			tenant := uuid.NewString()
-			input := sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), InitialFiles: []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a", Data: []byte("first")}, {Type: "inline", Path: "/workspace/b", Data: []byte("second")}}}
+			input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), InitialFiles: []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a", Data: []byte("first")}, {Type: "inline", Path: "/workspace/b", Data: []byte("second")}}}
 			if setupOnly {
 				input.InitialFiles = nil
 				input.Initialization = environmentconfig.Setup{Env: map[string]string{"VALUE": "private"}, Packages: v1.EnvironmentPackages{NPM: []string{"is-number@7.0.0"}}, Commands: []environmentconfig.SetupCommand{{Command: "touch first"}, {Command: "test -f first"}}}
@@ -79,7 +78,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 				if _, err := fixtureSessionStore(db).GetSessionDevice(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 					t.Error("premature file access", err)
 				}
-				if _, err := store.SessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+				if _, err := sessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 					t.Error("premature execution", err)
 				}
 				if mode == "uncertain" {
@@ -120,7 +119,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 				if int(p.writes.Load()) != expectedSteps {
 					t.Fatal("missing operations", p.writes.Load())
 				}
-				if _, err := store.SessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); err != nil {
+				if _, err := sessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); err != nil {
 					t.Fatal("completed preparation blocked", err)
 				}
 				stop()
diff --git a/services/core/internal/store/runtime_input_admission_test.go b/services/core/tests/integration/runtime_input_admission_test.go
similarity index 84%
rename from services/core/internal/store/runtime_input_admission_test.go
rename to services/core/tests/integration/runtime_input_admission_test.go
index 346d3c3c2..6ff20dd1d 100644
--- a/services/core/internal/store/runtime_input_admission_test.go
+++ b/services/core/tests/integration/runtime_input_admission_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -10,21 +10,20 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestManagedRuntimeMaintenancePreservesCancelAndRetry(t *testing.T) {
 	s, db := newManagedTestStoreDB(t)
 	tenant, session, _ := managedSession(t, s, db)
 	inputs := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"accepted work"}`)}}
-	accepted, err := store.SubmitInputs(t.Context(), s, tenant, session.ID, "work", inputs)
+	accepted, err := submitInputs(t.Context(), s, tenant, session.ID, "work", inputs)
 	if err != nil {
 		t.Fatal(err)
 	}
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	w, stop := managedWorkerMode(t, s, db, uuid.NewString(), p, true)
 	defer stop()
-	if _, err := w.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: session.Configuration}); !errors.Is(err, placement.ErrAdmissionClosed) {
+	if _, err := w.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: session.Configuration}); !errors.Is(err, placement.ErrAdmissionClosed) {
 		t.Fatal("maintenance accepted new hosted Session", err)
 	}
 	cancel := []sessions.Input{{Kind: "cancel", Payload: json.RawMessage(`{}`)}}
diff --git a/services/core/internal/store/runtime_lifecycle_nodes_test.go b/services/core/tests/integration/runtime_lifecycle_nodes_test.go
similarity index 99%
rename from services/core/internal/store/runtime_lifecycle_nodes_test.go
rename to services/core/tests/integration/runtime_lifecycle_nodes_test.go
index f7c8fea32..a02c00452 100644
--- a/services/core/internal/store/runtime_lifecycle_nodes_test.go
+++ b/services/core/tests/integration/runtime_lifecycle_nodes_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/runtime_lifecycle_test.go b/services/core/tests/integration/runtime_lifecycle_test.go
similarity index 90%
rename from services/core/internal/store/runtime_lifecycle_test.go
rename to services/core/tests/integration/runtime_lifecycle_test.go
index 1abae6129..67ed0160d 100644
--- a/services/core/internal/store/runtime_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_lifecycle_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -18,7 +18,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // Controlled provider faults exercise durable recovery, not native/model acceptance.
@@ -73,12 +72,12 @@ func (p *lifecycleProvider) RunCommand(context.Context, sandbox.Reference, sandb
 	return sandbox.CommandResult{}, errors.New("not used")
 }
 
-func managedWorker(t *testing.T, s *store.Store, db fixtureDB, key string, p sandbox.SandboxProvider) (*execution.Worker, func()) {
+func managedWorker(t *testing.T, s *Store, db fixtureDB, key string, p sandbox.SandboxProvider) (*execution.Worker, func()) {
 	t.Helper()
 	return managedWorkerMode(t, s, db, key, p, false)
 }
 
-func managedWorkerMode(t *testing.T, s *store.Store, db fixtureDB, key string, p sandbox.SandboxProvider, maintenance bool, run ...bool) (*execution.Worker, func()) {
+func managedWorkerMode(t *testing.T, s *Store, db fixtureDB, key string, p sandbox.SandboxProvider, maintenance bool, run ...bool) (*execution.Worker, func()) {
 	t.Helper()
 	registry := runtimegateway.NewRegistry()
 	if peer, ok := p.(interface {
@@ -114,10 +113,10 @@ func managedWorkerMode(t *testing.T, s *store.Store, db fixtureDB, key string, p
 	return w, stop
 }
 
-func managedSession(t *testing.T, s *store.Store, db fixtureDB) (string, sessions.Session, sessions.Environment) {
+func managedSession(t *testing.T, s *Store, db fixtureDB) (string, sessions.Session, sessions.Environment) {
 	t.Helper()
 	tenant := uuid.NewString()
-	v, e := s.CreateSession(t.Context(), tenant, store.WithFixtureModelProvider(sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","network":{"access":"enabled"}}}`)}))
+	v, e := s.CreateSession(t.Context(), tenant, WithFixtureModelProvider(sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","network":{"access":"enabled"}}}`)}))
 	if e != nil {
 		t.Fatal(e)
 	}
@@ -170,7 +169,7 @@ func TestManagedRuntimeLostCreateRestartAndDeletion(t *testing.T) {
 	if err != nil || !retry.Replayed || retry.ID != owner.ID || p.creates != 1 {
 		t.Fatal("restart replayed Create")
 	}
-	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	// A scan may first exhaust its previous cursor before starting a new cycle.
@@ -194,7 +193,7 @@ func TestManagedRuntimeUnknownCreationRetainsCleanup(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected uncertain creation")
 	}
-	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reconcileManagedState(t, w, db, tenant, env.ID, "cleanup_pending")
diff --git a/services/core/internal/store/runtime_node_capacity_test.go b/services/core/tests/integration/runtime_node_capacity_test.go
similarity index 98%
rename from services/core/internal/store/runtime_node_capacity_test.go
rename to services/core/tests/integration/runtime_node_capacity_test.go
index c76613475..c53bc8c00 100644
--- a/services/core/internal/store/runtime_node_capacity_test.go
+++ b/services/core/tests/integration/runtime_node_capacity_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/runtime_node_generations_test.go b/services/core/tests/integration/runtime_node_generations_test.go
similarity index 99%
rename from services/core/internal/store/runtime_node_generations_test.go
rename to services/core/tests/integration/runtime_node_generations_test.go
index aa7e857c7..f491d98cf 100644
--- a/services/core/internal/store/runtime_node_generations_test.go
+++ b/services/core/tests/integration/runtime_node_generations_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/runtime_node_lifecycle_fixture_test.go b/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
similarity index 92%
rename from services/core/internal/store/runtime_node_lifecycle_fixture_test.go
rename to services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
index 5cdebc08c..0a1ed7040 100644
--- a/services/core/internal/store/runtime_node_lifecycle_fixture_test.go
+++ b/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -22,7 +22,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -77,7 +76,7 @@ func (p *nodeIsolationProvider) RunCommand(ctx context.Context, r sandbox.Refere
 
 type nodeIsolationFixture struct {
 	t                    *testing.T
-	store                *store.Store
+	store                *Store
 	db                   fixtureDB
 	nodes                *deployment.Service
 	pool                 *pgxpool.Pool
@@ -93,12 +92,12 @@ type nodeIsolationFixture struct {
 
 func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 	t.Helper()
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{8}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	s.SetPlacement(fixtureRules(t, db))
 	registry := runtimegateway.NewRegistry()
 	cp := &fakeCheckpointProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, computes: map[string]sandbox.ComputeState{}, snapshots: map[string]sandbox.SnapshotIdentity{}, bootstraps: map[string]sandbox.Bootstrap{}, peers: map[string]*websocket.Conn{}, registry: registry}
@@ -132,7 +131,7 @@ func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 	// The suspension setup explicitly dates its activity two minutes in the past.
 	policy := &execution.RuntimeSuspensionPolicy{IdleTimeout: time.Minute, Retention: time.Hour, MaxActive: 100, MaxRetained: 100}
 	f.worker = startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: strings.Repeat("a", 64), Provider: p, ProviderKind: "microsandbox", LocalNodeID: f.nodeA, LocalCredentialSHA256: runtimedevice.HashCredential("local-credential"), LocalMaxActive: 100, LocalMaxRetained: 100, Suspension: policy}})
-	spec := store.SandboxDeploymentTestSpec("microsandbox")
+	spec := SandboxDeploymentTestSpec("microsandbox")
 	raw, _ := json.Marshal(spec)
 	if _, err := pool.Exec(t.Context(), "UPDATE runtime_deployment SET specification=$1", raw); err != nil {
 		t.Fatal(err)
@@ -149,11 +148,11 @@ func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 }
 func (f *nodeIsolationFixture) enroll(id string) {
 	f.t.Helper()
-	token, err := store.EnrollmentTestToken(f.nodes.CreateEnrollment(f.t.Context(), deployment.Capacity{MaxActive: 100, MaxRetained: 100}))
+	token, err := EnrollmentTestToken(f.nodes.CreateEnrollment(f.t.Context(), deployment.Capacity{MaxActive: 100, MaxRetained: 100}))
 	if err != nil {
 		f.t.Fatal(err)
 	}
-	_, err = f.nodes.Enroll(f.t.Context(), token, deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: store.SandboxDeploymentTestSpec("microsandbox").Digest("microsandbox"), NodeID: id, Credential: strings.Repeat("x", 64), Name: id, Provider: "microsandbox", BackendFingerprint: strings.Repeat("b", 64)})
+	_, err = f.nodes.Enroll(f.t.Context(), token, deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("microsandbox").Digest("microsandbox"), NodeID: id, Credential: strings.Repeat("x", 64), Name: id, Provider: "microsandbox", BackendFingerprint: strings.Repeat("b", 64)})
 	if err != nil {
 		f.t.Fatal(err)
 	}
@@ -171,7 +170,7 @@ func (f *nodeIsolationFixture) online(id string) {
 func (f *nodeIsolationFixture) session(node string, initialize bool) (string, sessions.Session, sessions.Environment) {
 	f.t.Helper()
 	tenant := uuid.NewString()
-	input := sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage("{\"agent\":{\"model\":\"test\"},\"environment\":{\"type\":\"openai_hosted\"}}")}
+	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage("{\"agent\":{\"model\":\"test\"},\"environment\":{\"type\":\"openai_hosted\"}}")}
 	if initialize {
 		input.InitialFiles = []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/seed", Data: []byte("retained")}}
 	}
diff --git a/services/core/internal/store/runtime_node_lifecycle_test.go b/services/core/tests/integration/runtime_node_lifecycle_test.go
similarity index 94%
rename from services/core/internal/store/runtime_node_lifecycle_test.go
rename to services/core/tests/integration/runtime_node_lifecycle_test.go
index d0b6e26e9..39bef5925 100644
--- a/services/core/internal/store/runtime_node_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_node_lifecycle_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -102,7 +101,7 @@ func TestManagedNodesIsolateBlockedProviderAndInitialization(t *testing.T) {
 			if err := f.nodes.TouchActivity(t.Context(), wakeTenant, wakeEnv.ID); err != nil {
 				t.Fatal(err)
 			}
-			if err := store.SessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: deleteTenant, SessionID: deleteSession.ID}); err != nil {
+			if err := sessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: deleteTenant, SessionID: deleteSession.ID}); err != nil {
 				t.Fatal(err)
 			}
 
@@ -137,7 +136,7 @@ func TestManagedNodesIsolateBlockedProviderAndInitialization(t *testing.T) {
 			f.online(nodeC)
 			ct, cs, ce := f.session(nodeC, false)
 			f.provision(ct, ce)
-			if err := store.SessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: ct, SessionID: cs.ID}); err != nil {
+			if err := sessionService(t, f.store).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: ct, SessionID: cs.ID}); err != nil {
 				t.Fatal(err)
 			}
 			waitNodeIsolation(t, 7*time.Second, func() (bool, string) {
diff --git a/services/core/internal/store/runtime_nodes_test.go b/services/core/tests/integration/runtime_nodes_test.go
similarity index 99%
rename from services/core/internal/store/runtime_nodes_test.go
rename to services/core/tests/integration/runtime_nodes_test.go
index 93b247828..cf11c0a42 100644
--- a/services/core/internal/store/runtime_nodes_test.go
+++ b/services/core/tests/integration/runtime_nodes_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_observation_scan_test.go b/services/core/tests/integration/runtime_observation_scan_test.go
similarity index 87%
rename from services/core/internal/store/runtime_observation_scan_test.go
rename to services/core/tests/integration/runtime_observation_scan_test.go
index 1e43c760b..17a5d317a 100644
--- a/services/core/internal/store/runtime_observation_scan_test.go
+++ b/services/core/tests/integration/runtime_observation_scan_test.go
@@ -1,11 +1,10 @@
-package store_test
+package integration
 
 import (
 	"slices"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestRuntimeObservationScanIsDeploymentWideBoundedAndExcludesDeleted(t *testing.T) {
@@ -16,7 +15,7 @@ func TestRuntimeObservationScanIsDeploymentWideBoundedAndExcludesDeleted(t *test
 		expected = append(expected, session.ID)
 	}
 	slices.Sort(expected)
-	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: sessionTenant(t, db, expected[2]), SessionID: expected[2]}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: sessionTenant(t, db, expected[2]), SessionID: expected[2]}); err != nil {
 		t.Fatal(err)
 	}
 	expected = append(expected[:2], expected[3:]...)
diff --git a/services/core/internal/store/runtime_observation_test.go b/services/core/tests/integration/runtime_observation_test.go
similarity index 99%
rename from services/core/internal/store/runtime_observation_test.go
rename to services/core/tests/integration/runtime_observation_test.go
index 84a2fa366..0c178075c 100644
--- a/services/core/internal/store/runtime_observation_test.go
+++ b/services/core/tests/integration/runtime_observation_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"errors"
diff --git a/services/core/internal/store/runtime_pending_test.go b/services/core/tests/integration/runtime_pending_test.go
similarity index 82%
rename from services/core/internal/store/runtime_pending_test.go
rename to services/core/tests/integration/runtime_pending_test.go
index 157ecb176..ad25d023f 100644
--- a/services/core/internal/store/runtime_pending_test.go
+++ b/services/core/tests/integration/runtime_pending_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,19 +10,18 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T) {
 	s, db := newManagedTestStoreDB(t)
 	tenant, idle, idleEnvironment := managedSession(t, s, db)
-	initial, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted"}}`), InitialInputs: []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"hello"}`)}}})
+	initial, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted"}}`), InitialInputs: []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"hello"}`)}}})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, deleted, deletedEnvironment := managedSession(t, s, db)
-	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: deleted.TenantID, SessionID: deleted.ID}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: deleted.TenantID, SessionID: deleted.ID}); err != nil {
 		t.Fatal(err)
 	}
 	key := uuid.NewString()
@@ -60,11 +59,11 @@ func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T)
 	if _, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: deleted.TenantID, EnvironmentID: deletedEnvironment.ID}); err == nil {
 		t.Fatal("deleted Session provisioned")
 	}
-	waiting, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, initial.ID)
+	waiting, err := sessionAdapter(s).GetSession(t.Context(), tenant, initial.ID)
 	if err != nil || waiting.LastTurn != nil || waiting.EnvironmentInputActivity != nil {
 		t.Fatal("compute existence claimed input readiness", waiting, err)
 	}
-	quiet, err := store.SessionAdapter(s).GetSession(t.Context(), tenant, idle.ID)
+	quiet, err := sessionAdapter(s).GetSession(t.Context(), tenant, idle.ID)
 	if err != nil || quiet.LastTurn != nil || quiet.EnvironmentInputActivity != nil {
 		t.Fatal("idle creation fabricated work", err)
 	}
diff --git a/services/core/internal/store/runtime_scan_test.go b/services/core/tests/integration/runtime_scan_test.go
similarity index 94%
rename from services/core/internal/store/runtime_scan_test.go
rename to services/core/tests/integration/runtime_scan_test.go
index dd1e2cac6..c92f1a21b 100644
--- a/services/core/internal/store/runtime_scan_test.go
+++ b/services/core/tests/integration/runtime_scan_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -13,7 +13,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 type scanProvider struct {
@@ -89,7 +88,7 @@ func TestManagedRuntimeScanEmptyAfterCleanupAndCanceledCall(t *testing.T) {
 	if len(p.observed) != 0 {
 		t.Fatal("canceled scan reached provider")
 	}
-	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	// EOF must not delay cleanup to a second call, and cancellation must
diff --git a/services/core/internal/store/runtime_suspension_concurrency_test.go b/services/core/tests/integration/runtime_suspension_concurrency_test.go
similarity index 99%
rename from services/core/internal/store/runtime_suspension_concurrency_test.go
rename to services/core/tests/integration/runtime_suspension_concurrency_test.go
index 0bd57d443..381ed3e7f 100644
--- a/services/core/internal/store/runtime_suspension_concurrency_test.go
+++ b/services/core/tests/integration/runtime_suspension_concurrency_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_suspension_test.go b/services/core/tests/integration/runtime_suspension_test.go
similarity index 99%
rename from services/core/internal/store/runtime_suspension_test.go
rename to services/core/tests/integration/runtime_suspension_test.go
index ca07c8f0d..402338582 100644
--- a/services/core/internal/store/runtime_suspension_test.go
+++ b/services/core/tests/integration/runtime_suspension_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/runtime_wait_test.go b/services/core/tests/integration/runtime_wait_test.go
similarity index 96%
rename from services/core/internal/store/runtime_wait_test.go
rename to services/core/tests/integration/runtime_wait_test.go
index ecfdb581c..6e38c67eb 100644
--- a/services/core/internal/store/runtime_wait_test.go
+++ b/services/core/tests/integration/runtime_wait_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/runtime_wake_hint_integration_test.go b/services/core/tests/integration/runtime_wake_hint_integration_test.go
similarity index 95%
rename from services/core/internal/store/runtime_wake_hint_integration_test.go
rename to services/core/tests/integration/runtime_wake_hint_integration_test.go
index c5326609f..318ff7474 100644
--- a/services/core/internal/store/runtime_wake_hint_integration_test.go
+++ b/services/core/tests/integration/runtime_wake_hint_integration_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -13,7 +13,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 type wakeHintScanProvider struct {
@@ -126,7 +125,7 @@ func (f *wakeHintIntegration) pending(t *testing.T, target wakeHintIntegrationTa
 			"SELECT id::text FROM environment_input_reservations WHERE session_id=$1 AND idempotency_key=$2",
 			target.session.ID, key).Scan(&id) == nil
 	})
-	pending, err := store.SessionAdapter(f.fixture.store).GetEnvironmentInputReservation(t.Context(), target.tenant, target.session.ID, id)
+	pending, err := sessionAdapter(f.fixture.store).GetEnvironmentInputReservation(t.Context(), target.tenant, target.session.ID, id)
 	if err != nil || pending.State != sessions.EnvironmentInputPending {
 		t.Fatal("input was not durably pending", pending.State, err)
 	}
@@ -197,7 +196,7 @@ func TestRuntimeWakeHintRejectedSubmitDoesNotAccelerateScan(t *testing.T) {
 			} else {
 				// Persist directly while the sentinel is blocked. Only the failing
 				// Worker submission could emit a hint; Store persistence cannot.
-				if _, err := store.SessionService(t, f.fixture.store).ReserveEnvironmentInput(t.Context(), f.target.tenant, f.target.session.ID, key, inputs); err != nil {
+				if _, err := sessionService(t, f.fixture.store).ReserveEnvironmentInput(t.Context(), f.target.tenant, f.target.session.ID, key, inputs); err != nil {
 					t.Fatal(err)
 				}
 				if name == "idempotency conflict" {
diff --git a/services/core/internal/store/runtime_worker_recovery_test.go b/services/core/tests/integration/runtime_worker_recovery_test.go
similarity index 87%
rename from services/core/internal/store/runtime_worker_recovery_test.go
rename to services/core/tests/integration/runtime_worker_recovery_test.go
index 99e4a3275..4e41fe586 100644
--- a/services/core/internal/store/runtime_worker_recovery_test.go
+++ b/services/core/tests/integration/runtime_worker_recovery_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -28,7 +27,7 @@ func runtimeWorkerHarness(t *testing.T) (*dispatchHarness, *pgxpool.Pool) {
 	t.Helper()
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"enabled"}}}`), true)
 	enableWorkerEnvironment(t, h)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	insertWorkerRuntimeAllocation(t, pool, h, "waking")
 	return h, pool
 }
@@ -36,7 +35,7 @@ func runtimeWorkerHarness(t *testing.T) (*dispatchHarness, *pgxpool.Pool) {
 func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.T) {
 	h, _ := runtimeWorkerHarness(t)
 	h.d, h.lease = h.bound(), h.owner().Lease
-	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -49,7 +48,7 @@ func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.
 		t.Fatal("rejected promotion lost its pending owner", got)
 	}
 	assertPreparationReleased(t, h, frame.ID, handle)
-	session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("blocked promotion started a Turn", session, err)
 	}
@@ -57,7 +56,7 @@ func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.
 
 func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 	h, pool := runtimeWorkerHarness(t)
-	pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -104,7 +103,7 @@ func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 	if release.ID != prepare.ID {
 		t.Fatal("conflicted preparation was not released")
 	}
-	stored, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+	stored, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 	if err != nil || stored.State != sessions.EnvironmentInputPending || len(stored.Receipts) != 0 {
 		t.Fatal("conflict consumed queued input", stored, err)
 	}
@@ -124,7 +123,7 @@ func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 		t.Fatal("completed preparation was not released")
 	}
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "original input completed once", func() bool {
-		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
+		turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, start.RunID)
 		return err == nil && turn.Status == sessions.TurnCompleted
 	})
 	var turns int
@@ -154,7 +153,7 @@ func TestWorkerRestartPreservesQueuedTurnWhileComputeWakes(t *testing.T) {
 	if err := worker.Run(ctx); !errors.Is(err, context.Canceled) {
 		t.Fatal(err)
 	}
-	got, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, turn)
+	got, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, turn)
 	if err != nil || got.Status != sessions.TurnQueued || !got.StartedAt.IsZero() {
 		t.Fatal("startup consumed queued work before restore", got, err)
 	}
diff --git a/services/core/internal/store/sandbox_deployment_resources_test.go b/services/core/tests/integration/sandbox_deployment_resources_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_deployment_resources_test.go
rename to services/core/tests/integration/sandbox_deployment_resources_test.go
index cd2595cb0..8c256bf6b 100644
--- a/services/core/internal/store/sandbox_deployment_resources_test.go
+++ b/services/core/tests/integration/sandbox_deployment_resources_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/sandbox_deployment_setup_test.go b/services/core/tests/integration/sandbox_deployment_setup_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_deployment_setup_test.go
rename to services/core/tests/integration/sandbox_deployment_setup_test.go
index 6415add8e..3b0a655c2 100644
--- a/services/core/internal/store/sandbox_deployment_setup_test.go
+++ b/services/core/tests/integration/sandbox_deployment_setup_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/sandbox_deployment_switch_test.go b/services/core/tests/integration/sandbox_deployment_switch_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_deployment_switch_test.go
rename to services/core/tests/integration/sandbox_deployment_switch_test.go
index 63602a7ed..9931d2296 100644
--- a/services/core/internal/store/sandbox_deployment_switch_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/sandbox_deployment_switch_worker_test.go b/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
similarity index 77%
rename from services/core/internal/store/sandbox_deployment_switch_worker_test.go
rename to services/core/tests/integration/sandbox_deployment_switch_worker_test.go
index 5308d5cc9..c8c21589d 100644
--- a/services/core/internal/store/sandbox_deployment_switch_worker_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -18,14 +18,13 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	s.SetPlacement(fixtureRules(t, db))
 	deployments := fixtureDeployment(t, db)
 	id := uuid.NewString()
@@ -58,7 +57,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 		}
 	})
 	fail.Store(true)
-	if _, err := w.InitializeSandboxDeployment(t.Context(), sandbox.Selection{DeploymentSpec: store.SandboxDeploymentTestSpec("docker"), Provider: "docker"}); err == nil {
+	if _, err := w.InitializeSandboxDeployment(t.Context(), sandbox.Selection{DeploymentSpec: SandboxDeploymentTestSpec("docker"), Provider: "docker"}); err == nil {
 		t.Fatal("rejected initial provider configuration was committed")
 	}
 	empty, err := deployments.View(t.Context())
@@ -66,18 +65,18 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 		t.Fatal("failed initial candidate changed the deployment", err)
 	}
 	fail.Store(false)
-	if _, err := w.InitializeSandboxDeployment(t.Context(), sandbox.Selection{DeploymentSpec: store.SandboxDeploymentTestSpec("docker"), Provider: "docker"}); err != nil {
+	if _, err := w.InitializeSandboxDeployment(t.Context(), sandbox.Selection{DeploymentSpec: SandboxDeploymentTestSpec("docker"), Provider: "docker"}); err != nil {
 		t.Fatal(err)
 	}
 	prepared := preparations.Load()
-	if _, err := w.InitializeSandboxDeployment(t.Context(), sandbox.Selection{DeploymentSpec: store.SandboxDeploymentTestSpec("docker"), Provider: "docker"}); err == nil || preparations.Load() != prepared {
+	if _, err := w.InitializeSandboxDeployment(t.Context(), sandbox.Selection{DeploymentSpec: SandboxDeploymentTestSpec("docker"), Provider: "docker"}); err == nil || preparations.Load() != prepared {
 		t.Fatal("stale identical POST reached provider preparation", err)
 	}
-	enrollment, err := store.EnrollmentTestToken(deployments.CreateEnrollment(t.Context(), deployment.Capacity{MaxActive: 2, MaxRetained: 4}))
+	enrollment, err := EnrollmentTestToken(deployments.CreateEnrollment(t.Context(), deployment.Capacity{MaxActive: 2, MaxRetained: 4}))
 	if err != nil {
 		t.Fatal(err)
 	}
-	node := deployment.Enrollment{NodeID: uuid.NewString(), Name: "retained candidate fixture", Provider: "docker", Credential: strings.Repeat("n", 64), BackendFingerprint: strings.Repeat("b", 64), DeploymentGeneration: 1, SpecificationDigest: store.SandboxDeploymentTestSpec("docker").Digest("docker")}
+	node := deployment.Enrollment{NodeID: uuid.NewString(), Name: "retained candidate fixture", Provider: "docker", Credential: strings.Repeat("n", 64), BackendFingerprint: strings.Repeat("b", 64), DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("docker").Digest("docker")}
 	if _, err := deployments.Enroll(t.Context(), enrollment, node); err != nil {
 		t.Fatal(err)
 	}
@@ -85,10 +84,10 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input := sandbox.Selection{ExpectedGeneration: 1, DeploymentSpec: store.SandboxDeploymentTestSpec("docker"), Provider: "docker"}
+	input := sandbox.Selection{ExpectedGeneration: 1, DeploymentSpec: SandboxDeploymentTestSpec("docker"), Provider: "docker"}
 	input.Resources.CPUs++
 	fail.Store(true)
-	if _, err := w.UpdateSandboxDeployment(store.SandboxResetTestContext(t.Context()), input); err == nil {
+	if _, err := w.UpdateSandboxDeployment(SandboxResetTestContext(t.Context()), input); err == nil {
 		t.Fatal("failed activation reported success")
 	}
 	view, err := deployments.View(t.Context())
@@ -104,7 +103,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	if _, err := pool.Exec(t.Context(), `CREATE FUNCTION reject_reset_fixture_update() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN IF NEW.generation > OLD.generation THEN RAISE EXCEPTION 'fixture commit rejected'; END IF; RETURN NEW; END $$; CREATE TRIGGER reject_reset_fixture_update BEFORE UPDATE ON runtime_deployment FOR EACH ROW EXECUTE FUNCTION reject_reset_fixture_update()`); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := w.UpdateSandboxDeployment(store.SandboxResetTestContext(t.Context()), input); err == nil {
+	if _, err := w.UpdateSandboxDeployment(SandboxResetTestContext(t.Context()), input); err == nil {
 		t.Fatal("failed final transaction accepted")
 	}
 	if _, err := pool.Exec(t.Context(), `DROP TRIGGER reject_reset_fixture_update ON runtime_deployment; DROP FUNCTION reject_reset_fixture_update()`); err != nil {
@@ -116,12 +115,12 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	if view, err := deployments.View(t.Context()); err != nil || view.Generation != 1 || view.Provider != "docker" {
 		t.Fatal("failed commit replaced provider", view, err)
 	}
-	if _, err := w.UpdateSandboxDeployment(store.SandboxResetTestContext(t.Context()), input); err != nil {
+	if _, err := w.UpdateSandboxDeployment(SandboxResetTestContext(t.Context()), input); err != nil {
 		t.Fatal(err)
 	}
 	reset := func(generation uint64) deployment.View {
 		t.Helper()
-		if _, err := w.StartSandboxReset(store.SandboxResetTestContext(t.Context()), deployment.ResetRequest{ExpectedGeneration: generation, Clear: "force"}); err != nil {
+		if _, err := w.StartSandboxReset(SandboxResetTestContext(t.Context()), deployment.ResetRequest{ExpectedGeneration: generation, Clear: "force"}); err != nil {
 			t.Fatal(err)
 		}
 		deadline := time.Now().Add(12 * time.Second)
@@ -143,7 +142,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 		return deployment.View{}
 	}
 	empty = reset(2)
-	cloud := sandbox.Selection{ExpectedGeneration: empty.Generation, DeploymentSpec: store.SandboxDeploymentTestSpec("e2b"), Provider: "e2b", Configuration: &e2b.DeploymentConfiguration{APIKey: "fixture-api-key", Template: "runtime:" + uuid.NewString()}}
+	cloud := sandbox.Selection{ExpectedGeneration: empty.Generation, DeploymentSpec: SandboxDeploymentTestSpec("e2b"), Provider: "e2b", Configuration: &e2b.DeploymentConfiguration{APIKey: "fixture-api-key", Template: "runtime:" + uuid.NewString()}}
 	if _, err := w.InitializeSandboxDeployment(t.Context(), cloud); err != nil {
 		t.Fatal("setup after unconfigured publication", err)
 	}
@@ -152,11 +151,11 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	if err != nil || allocation.NodeID != "" || allocation.State != "running" {
 		t.Fatal("direct provider not available after resume", allocation, err)
 	}
-	next := sandbox.Selection{ExpectedGeneration: 4, DeploymentSpec: store.SandboxDeploymentTestSpec("docker"), Provider: "docker"}
-	if _, err := w.UpdateSandboxDeployment(store.SandboxResetTestContext(t.Context()), next); !errors.Is(err, deployment.ErrConflict) {
+	next := sandbox.Selection{ExpectedGeneration: 4, DeploymentSpec: SandboxDeploymentTestSpec("docker"), Provider: "docker"}
+	if _, err := w.UpdateSandboxDeployment(SandboxResetTestContext(t.Context()), next); !errors.Is(err, deployment.ErrConflict) {
 		t.Fatal("dirty switch accepted", err)
 	}
-	if err := store.SessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
 	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
diff --git a/services/core/internal/store/sandbox_deployment_view_test.go b/services/core/tests/integration/sandbox_deployment_view_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_deployment_view_test.go
rename to services/core/tests/integration/sandbox_deployment_view_test.go
index 452633018..000a058df 100644
--- a/services/core/internal/store/sandbox_deployment_view_test.go
+++ b/services/core/tests/integration/sandbox_deployment_view_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/sandbox_deployment_worker_test.go b/services/core/tests/integration/sandbox_deployment_worker_test.go
similarity index 80%
rename from services/core/internal/store/sandbox_deployment_worker_test.go
rename to services/core/tests/integration/sandbox_deployment_worker_test.go
index 7b169a815..4b28da8d1 100644
--- a/services/core/internal/store/sandbox_deployment_worker_test.go
+++ b/services/core/tests/integration/sandbox_deployment_worker_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -14,7 +14,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -44,22 +43,22 @@ func TestSandboxDeploymentWorkerActivatesWithoutRestart(t *testing.T) {
 		return w, stop
 	}
 	w, stop := start()
-	input := sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`)}
+	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`)}
 	if _, err := w.CreateSession(t.Context(), uuid.NewString(), input); !errors.Is(err, execution.ErrExecutionUnavailable) {
 		t.Fatal("uninitialized worker admitted hosted Session", err)
 	}
-	if _, err := w.InitializeSandboxDeployment(t.Context(), sandbox.Selection{DeploymentSpec: store.SandboxDeploymentTestSpec("docker"), Provider: "docker"}); err != nil {
+	if _, err := w.InitializeSandboxDeployment(t.Context(), sandbox.Selection{DeploymentSpec: SandboxDeploymentTestSpec("docker"), Provider: "docker"}); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := s.CreateSession(t.Context(), uuid.NewString(), input); !errors.Is(err, placement.ErrNodeUnavailable) {
 		t.Fatal("zero-node deployment admitted Session", err)
 	}
-	token, err := store.EnrollmentTestToken(deployments.CreateEnrollment(t.Context(), deployment.Capacity{MaxActive: 4, MaxRetained: 16}))
+	token, err := EnrollmentTestToken(deployments.CreateEnrollment(t.Context(), deployment.Capacity{MaxActive: 4, MaxRetained: 16}))
 	if err != nil {
 		t.Fatal(err)
 	}
 	nodeID := uuid.NewString()
-	if _, err := deployments.Enroll(t.Context(), token, deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: store.SandboxDeploymentTestSpec("docker").Digest("docker"), NodeID: nodeID, Name: "Remote", Provider: "docker", Credential: strings.Repeat("x", 64), BackendFingerprint: strings.Repeat("b", 64)}); err != nil {
+	if _, err := deployments.Enroll(t.Context(), token, deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("docker").Digest("docker"), NodeID: nodeID, Name: "Remote", Provider: "docker", Credential: strings.Repeat("x", 64), BackendFingerprint: strings.Repeat("b", 64)}); err != nil {
 		t.Fatal(err)
 	}
 	connect := func() {
diff --git a/services/core/internal/store/sandbox_generations_test.go b/services/core/tests/integration/sandbox_generations_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_generations_test.go
rename to services/core/tests/integration/sandbox_generations_test.go
index 42dfb6a7d..af3147a55 100644
--- a/services/core/internal/store/sandbox_generations_test.go
+++ b/services/core/tests/integration/sandbox_generations_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"database/sql"
diff --git a/services/core/internal/store/sandbox_node_auth_order_http_test.go b/services/core/tests/integration/sandbox_node_auth_order_http_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_node_auth_order_http_test.go
rename to services/core/tests/integration/sandbox_node_auth_order_http_test.go
index 0e667702c..5e92a1965 100644
--- a/services/core/internal/store/sandbox_node_auth_order_http_test.go
+++ b/services/core/tests/integration/sandbox_node_auth_order_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/sandbox_reset_migration_test.go b/services/core/tests/integration/sandbox_reset_migration_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_reset_migration_test.go
rename to services/core/tests/integration/sandbox_reset_migration_test.go
index 8a8bf3ce6..4ca85d199 100644
--- a/services/core/internal/store/sandbox_reset_migration_test.go
+++ b/services/core/tests/integration/sandbox_reset_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"strings"
diff --git a/services/core/internal/store/sandbox_reset_test.go b/services/core/tests/integration/sandbox_reset_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_reset_test.go
rename to services/core/tests/integration/sandbox_reset_test.go
index 7173b5c3a..43316c0e0 100644
--- a/services/core/internal/store/sandbox_reset_test.go
+++ b/services/core/tests/integration/sandbox_reset_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/sandbox_snapshot_plan_test.go b/services/core/tests/integration/sandbox_snapshot_plan_test.go
similarity index 97%
rename from services/core/internal/store/sandbox_snapshot_plan_test.go
rename to services/core/tests/integration/sandbox_snapshot_plan_test.go
index feb3e86df..c488917ab 100644
--- a/services/core/internal/store/sandbox_snapshot_plan_test.go
+++ b/services/core/tests/integration/sandbox_snapshot_plan_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
@@ -12,7 +12,7 @@ import (
 
 func sandboxSnapshotSQL(t *testing.T) string {
 	t.Helper()
-	raw, err := os.ReadFile("../db/queries/sandbox_reset.sql")
+	raw, err := os.ReadFile("../../internal/db/queries/sandbox_reset.sql")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/sandbox_specification_store_test.go b/services/core/tests/integration/sandbox_specification_lifecycle_test.go
similarity index 99%
rename from services/core/internal/store/sandbox_specification_store_test.go
rename to services/core/tests/integration/sandbox_specification_lifecycle_test.go
index 6164daf47..baf925f1c 100644
--- a/services/core/internal/store/sandbox_specification_store_test.go
+++ b/services/core/tests/integration/sandbox_specification_lifecycle_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/sandbox_specification_test.go b/services/core/tests/integration/sandbox_specification_test.go
similarity index 98%
rename from services/core/internal/store/sandbox_specification_test.go
rename to services/core/tests/integration/sandbox_specification_test.go
index ffa0e1dc4..e69631350 100644
--- a/services/core/internal/store/sandbox_specification_test.go
+++ b/services/core/tests/integration/sandbox_specification_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"strings"
diff --git a/services/core/internal/store/saved_web_search_public_test.go b/services/core/tests/integration/saved_web_search_public_test.go
similarity index 99%
rename from services/core/internal/store/saved_web_search_public_test.go
rename to services/core/tests/integration/saved_web_search_public_test.go
index 437248c35..96992c293 100644
--- a/services/core/internal/store/saved_web_search_public_test.go
+++ b/services/core/tests/integration/saved_web_search_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/self_hosted_cancel_public_test.go b/services/core/tests/integration/self_hosted_cancel_public_test.go
similarity index 89%
rename from services/core/internal/store/self_hosted_cancel_public_test.go
rename to services/core/tests/integration/self_hosted_cancel_public_test.go
index dfa04103c..ae60019a1 100644
--- a/services/core/internal/store/self_hosted_cancel_public_test.go
+++ b/services/core/tests/integration/self_hosted_cancel_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -15,7 +15,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -118,21 +117,21 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 		return value
 	}
 	idleReceipts := receipts(created.IdleKey, "")
-	later, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, created.LaterID, "controlled-later-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"Retain pending input."}`)}})
+	later, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, created.LaterID, "controlled-later-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"Retain pending input."}`)}})
 	if err != nil || later.State != sessions.EnvironmentInputPending || later.IsInitial {
 		t.Fatal("could not establish controlled later reservation", err)
 	}
 	pending := map[string]string{created.InitialID: snapshot(created.InitialID), created.LaterID: snapshot(created.LaterID)}
 	transition := func(id, from, to string) {
 		t.Helper()
-		if _, err := store.TransitionTurn(t.Context(), s, tenant, created.ID, id, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
+		if _, err := transitionTurn(t.Context(), s, tenant, created.ID, id, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
 			t.Fatal(err)
 		}
 	}
 	start := func() string {
 		t.Helper()
 		// Controlled callbacks isolate HTTP admission; no daemon or model runs in this fixture.
-		input, err := store.SendMessage(t.Context(), s, tenant, created.ID, uuid.NewString(), json.RawMessage(`{"text":"Controlled active work."}`))
+		input, err := sendMessage(t.Context(), s, tenant, created.ID, uuid.NewString(), json.RawMessage(`{"text":"Controlled active work."}`))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -153,13 +152,13 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	if err != nil || len(itemsBefore.Items) != 2 {
 		t.Fatal("controlled partial output was not recorded", err)
 	}
-	cursor, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, created.ID)
+	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, created.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	run("active")
 	activeReceipts := receipts(created.ActiveKey, first)
-	turn, err := store.SessionAdapter(s).GetTurn(t.Context(), tenant, created.ID, first)
+	turn, err := sessionAdapter(s).GetTurn(t.Context(), tenant, created.ID, first)
 	if err != nil || turn.Status != sessions.TurnInProgress || turn.CancelRequestedAt.IsZero() || !turn.CompletedAt.IsZero() {
 		t.Fatal("202 must admit cancellation without fabricating native completion", err)
 	}
@@ -167,7 +166,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	if err != nil || !reflect.DeepEqual(itemsBefore, itemsAfter) {
 		t.Fatal("cancellation admission changed partial history", err)
 	}
-	afterCursor, err := store.SessionAdapter(s).SessionEventCursor(t.Context(), tenant, created.ID)
+	afterCursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, created.ID)
 	if err != nil || afterCursor != cursor {
 		t.Fatal("cancellation admission fabricated an execution event", err)
 	}
diff --git a/services/core/internal/store/self_hosted_initial_public_test.go b/services/core/tests/integration/self_hosted_initial_public_test.go
similarity index 93%
rename from services/core/internal/store/self_hosted_initial_public_test.go
rename to services/core/tests/integration/self_hosted_initial_public_test.go
index c3f19eff0..0693f210a 100644
--- a/services/core/internal/store/self_hosted_initial_public_test.go
+++ b/services/core/tests/integration/self_hosted_initial_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -21,7 +21,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -40,7 +39,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: foreignTenant, SubjectKind: "service_account", SubjectID: "initial-creator", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
 	const origin = "https://offline-executor.example"
-	serve := func(s *store.Store, db fixtureDB, worker *execution.Worker) *httptest.Server {
+	serve := func(s *Store, db fixtureDB, worker *execution.Worker) *httptest.Server {
 		t.Helper()
 		enabled := []func(*api.Dependencies){acceptUnavailable(t)}
 		if worker != nil {
@@ -99,7 +98,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 	if err := json.Unmarshal(accepted, &created); err != nil || len(created.Cases) != 4 {
 		t.Fatal("missing public initial creation cases", err)
 	}
-	reservations := func(s *store.Store, pool *pgxpool.Pool) map[string]sessions.EnvironmentInputReservation {
+	reservations := func(s *Store, pool *pgxpool.Pool) map[string]sessions.EnvironmentInputReservation {
 		t.Helper()
 		result := make(map[string]sessions.EnvironmentInputReservation)
 		for _, item := range created.Cases {
@@ -107,7 +106,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 			if err := pool.QueryRow(t.Context(), "SELECT id FROM environment_input_reservations WHERE session_id=$1 AND is_initial", item.ID).Scan(&id); err != nil {
 				t.Fatal("public creation did not reserve initial input", err)
 			}
-			reservation, err := store.SessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, item.ID, id)
+			reservation, err := sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), tenant, item.ID, id)
 			if err != nil || !reservation.IsInitial || len(reservation.Inputs) != 1 || len(reservation.Receipts) != 0 {
 				t.Fatal("invalid public initial reservation", err)
 			}
@@ -212,14 +211,14 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 	}
 }
 
-func publicInitialWorker(t *testing.T, s *store.Store, db fixtureDB) (*execution.Worker, func(bool)) {
+func publicInitialWorker(t *testing.T, s *Store, db fixtureDB) (*execution.Worker, func(bool)) {
 	t.Helper()
 	return publicOwnedWorker(t, s, db, executionOwner(t, db))
 }
 
 // publicOwnedWorker is publicInitialWorker on owner, for tests that also write
 // as the Worker's execution owner.
-func publicOwnedWorker(t *testing.T, s *store.Store, db fixtureDB, owner execution.Owner) (*execution.Worker, func(bool)) {
+func publicOwnedWorker(t *testing.T, s *Store, db fixtureDB, owner execution.Owner) (*execution.Worker, func(bool)) {
 	t.Helper()
 	worker := startOwnedWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()}, owner)
 	ctx, cancel := context.WithCancel(t.Context())
diff --git a/services/core/internal/store/session_agent_filter_public_test.go b/services/core/tests/integration/session_agent_filter_public_test.go
similarity index 90%
rename from services/core/internal/store/session_agent_filter_public_test.go
rename to services/core/tests/integration/session_agent_filter_public_test.go
index 08fbc257a..d4fb2142c 100644
--- a/services/core/internal/store/session_agent_filter_public_test.go
+++ b/services/core/tests/integration/session_agent_filter_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -30,7 +29,7 @@ func TestSessionAgentFilterOfficialClient(t *testing.T) {
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := store.New(db.pool), fixtureDB{pool: db.pool}
+	recoveredStore, recoveredDB := New(db.pool), fixtureDB{pool: db.pool}
 	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex", storeExecution(t, recoveredStore))
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/session_agent_filter_test.go b/services/core/tests/integration/session_agent_filter_test.go
similarity index 99%
rename from services/core/internal/store/session_agent_filter_test.go
rename to services/core/tests/integration/session_agent_filter_test.go
index b41aa7873..4679836d2 100644
--- a/services/core/internal/store/session_agent_filter_test.go
+++ b/services/core/tests/integration/session_agent_filter_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/session_artifacts_public_test.go b/services/core/tests/integration/session_artifacts_public_test.go
similarity index 93%
rename from services/core/internal/store/session_artifacts_public_test.go
rename to services/core/tests/integration/session_artifacts_public_test.go
index d5e6cc722..e8e3f61f1 100644
--- a/services/core/internal/store/session_artifacts_public_test.go
+++ b/services/core/tests/integration/session_artifacts_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"archive/tar"
@@ -18,14 +18,13 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 // hostedArtifactSession creates an openai_hosted Session without Turns.
-func hostedArtifactSession(t *testing.T, s *store.Store, tenant, key string) (session, environment string) {
+func hostedArtifactSession(t *testing.T, s *Store, tenant, key string) (session, environment string) {
 	t.Helper()
-	created, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: key,
+	created, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: key,
 		Configuration: json.RawMessage(`{"agent":{"model":"artifact-model"},"environment":{"type":"openai_hosted","workspace_directory":"/workspace","capability_directories":[]}}`)})
 	if err != nil || created.Environment == nil {
 		t.Fatal("fixture Session", err)
@@ -35,15 +34,15 @@ func hostedArtifactSession(t *testing.T, s *store.Store, tenant, key string) (se
 
 // completeArtifactTurn runs one Turn whose complete outputs tree is staged
 // through artifacts and settled as completed, and returns the Turn ID.
-func completeArtifactTurn(t *testing.T, s *store.Store, artifacts *sessions.Service, tenant, session, environment, key string, outputs map[string]string) string {
+func completeArtifactTurn(t *testing.T, s *Store, artifacts *sessions.Service, tenant, session, environment, key string, outputs map[string]string) string {
 	t.Helper()
-	receipt, err := store.SendMessage(t.Context(), s, tenant, session, key, json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"publish outputs"}]}]}`))
+	receipt, err := sendMessage(t.Context(), s, tenant, session, key, json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"publish outputs"}]}]}`))
 	if err != nil {
 		t.Fatal(err)
 	}
 	transition := func(from, to string) {
 		t.Helper()
-		if _, err := store.TransitionTurn(t.Context(), s, tenant, session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
+		if _, err := transitionTurn(t.Context(), s, tenant, session, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -69,7 +68,7 @@ func completeArtifactTurn(t *testing.T, s *store.Store, artifacts *sessions.Serv
 }
 
 // artifactHTTPServer serves Artifact routes for an owner and a foreign tenant.
-func artifactHTTPServer(t *testing.T, s *store.Store, db fixtureDB) (server *httptest.Server, owner, ownerTenant, foreign, foreignTenant string) {
+func artifactHTTPServer(t *testing.T, s *Store, db fixtureDB) (server *httptest.Server, owner, ownerTenant, foreign, foreignTenant string) {
 	t.Helper()
 	owner, foreign = uuid.NewString(), uuid.NewString()
 	ownerTenant, foreignTenant = uuid.NewString(), uuid.NewString()
diff --git a/services/core/internal/store/session_artifacts_test.go b/services/core/tests/integration/session_artifacts_test.go
similarity index 99%
rename from services/core/internal/store/session_artifacts_test.go
rename to services/core/tests/integration/session_artifacts_test.go
index ba5957f9f..6db473180 100644
--- a/services/core/internal/store/session_artifacts_test.go
+++ b/services/core/tests/integration/session_artifacts_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"archive/tar"
diff --git a/services/core/internal/store/session_configuration_test.go b/services/core/tests/integration/session_configuration_test.go
similarity index 99%
rename from services/core/internal/store/session_configuration_test.go
rename to services/core/tests/integration/session_configuration_test.go
index b3047da67..04f4ed07e 100644
--- a/services/core/internal/store/session_configuration_test.go
+++ b/services/core/tests/integration/session_configuration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/session_creation_identity_test.go b/services/core/tests/integration/session_creation_identity_test.go
similarity index 99%
rename from services/core/internal/store/session_creation_identity_test.go
rename to services/core/tests/integration/session_creation_identity_test.go
index 44e1b2fa6..e919ccf68 100644
--- a/services/core/internal/store/session_creation_identity_test.go
+++ b/services/core/tests/integration/session_creation_identity_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/session_deletion_execution_test.go b/services/core/tests/integration/session_deletion_execution_test.go
similarity index 73%
rename from services/core/internal/store/session_deletion_execution_test.go
rename to services/core/tests/integration/session_deletion_execution_test.go
index 92798a4b2..8a6124e92 100644
--- a/services/core/internal/store/session_deletion_execution_test.go
+++ b/services/core/tests/integration/session_deletion_execution_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestDeletedSessionWaitingTurnSettlesWithoutStoppingWorker(t *testing.T) {
@@ -31,11 +30,11 @@ func TestDeletedSessionWaitingTurnSettlesWithoutStoppingWorker(t *testing.T) {
 	h.read(testExecutionRequest)
 	h.write(input.TurnID, proto.TypeFunctionCall, proto.FunctionCallPayload{CallID: "pending", Name: "lookup_ticket", Arguments: json.RawMessage(`{}`)})
 	state := functionState(t, h, 1)
-	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := sessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("waiting Session deleted", err)
 	}
 	// A marker committed by an earlier release still cancels and settles work.
-	if err := h.s.CommitLegacyDeletion(ctx, h.tenant, h.session.ID); err != nil {
+	if err := h.s.commitLegacyDeletion(ctx, h.tenant, h.session.ID); err != nil {
 		t.Fatal(err)
 	}
 	var request proto.PromptCancelPayload
@@ -48,11 +47,11 @@ func TestDeletedSessionWaitingTurnSettlesWithoutStoppingWorker(t *testing.T) {
 	}
 	h.write(input.TurnID, proto.TypeInteractionDecisionAck, proto.InteractionDecisionAckPayload{DeliveryID: request.DeliveryID, Applied: true, Outcome: &proto.DonePayload{Metadata: map[string]any{proto.DoneMetaAgentSessionID: "deleted-native"}}})
 	waitTurn(t, h, input.TurnID, sessions.TurnCancelled)
-	bound, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
+	bound, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "deleted-native" {
 		t.Fatal(bound, err)
 	}
-	if _, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 	if _, err := h.bound().Run(ctx, h.tenant, h.session.ID, input.TurnID); !errors.Is(err, sessions.ErrNotFound) {
@@ -69,13 +68,13 @@ func TestDeletedSessionRestartStillReconcilesHiddenClaim(t *testing.T) {
 	h := newDispatchHarness(t)
 	input := h.message("interrupted", "Run")
 	ctx := t.Context()
-	if _, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err := transitionTurn(ctx, h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := sessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("running Session deleted", err)
 	}
-	if err := h.s.CommitLegacyDeletion(ctx, h.tenant, h.session.ID); err != nil {
+	if err := h.s.commitLegacyDeletion(ctx, h.tenant, h.session.ID); err != nil {
 		t.Fatal(err)
 	}
 	worker := startWorker(t, ctx, h.db, h.d)
@@ -84,11 +83,11 @@ func TestDeletedSessionRestartStillReconcilesHiddenClaim(t *testing.T) {
 	if err := worker.Run(stopped); !errors.Is(err, context.Canceled) {
 		t.Fatal(err)
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
+	turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, h.session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnFailed {
 		t.Fatal(turn, err)
 	}
-	if _, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 }
@@ -114,13 +113,13 @@ func TestWaitingSessionCancelsThenDeletesThroughWorker(t *testing.T) {
 	h.read(testExecutionRequest)
 	h.write(input.TurnID, proto.TypeFunctionCall, proto.FunctionCallPayload{CallID: "pending", Name: "lookup_ticket", Arguments: json.RawMessage(`{}`)})
 	state := functionState(t, h, 1)
-	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := sessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("waiting Session deleted", err)
 	}
 	if again := functionState(t, h, 1); again.LastTurn == nil || again.LastTurn.Status != sessions.TurnWaiting || !again.LastTurn.CancelRequestedAt.IsZero() {
 		t.Fatal("rejected deletion changed required actions", again)
 	}
-	if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel-before-delete"); err != nil {
+	if _, err := requestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel-before-delete"); err != nil {
 		t.Fatal(err)
 	}
 	// The explicit cancellation, not the rejected deletion, reaches the daemon.
@@ -128,14 +127,14 @@ func TestWaitingSessionCancelsThenDeletesThroughWorker(t *testing.T) {
 	if err := h.read(proto.TypePromptCancel).DecodePayload(&request); err != nil {
 		t.Fatal(err)
 	}
-	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
+	if err := sessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); !errors.Is(err, sessions.ErrNotIdle) {
 		t.Fatal("Session deleted before cancellation settled", err)
 	}
 	h.write(input.TurnID, proto.TypeInteractionDecisionAck, proto.InteractionDecisionAckPayload{DeliveryID: request.DeliveryID, Applied: true, Outcome: &proto.DonePayload{Metadata: map[string]any{proto.DoneMetaAgentSessionID: "cancelled-native"}}})
 	waitTurn(t, h, input.TurnID, sessions.TurnCancelled)
 	deadline := time.Now().Add(10 * time.Second)
 	for {
-		err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID})
+		err := sessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID})
 		if err == nil {
 			break
 		}
@@ -144,14 +143,14 @@ func TestWaitingSessionCancelsThenDeletesThroughWorker(t *testing.T) {
 		}
 		time.Sleep(20 * time.Millisecond)
 	}
-	if err := store.SessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); err != nil {
+	if err := sessionService(t, h.s).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: h.tenant, SessionID: h.session.ID}); err != nil {
 		t.Fatal("repeated deletion", err)
 	}
 	raw, _ := json.Marshal(sessions.FunctionResultInput{TurnID: input.TurnID, CallID: state.RequiredActions[0].CallID, Result: json.RawMessage(`{"success":true,"output":"late"}`)})
 	if _, err := worker.SubmitInputs(ctx, h.tenant, h.session.ID, "late", []sessions.Input{{Kind: "tool_result", Payload: raw}}); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
-	if _, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 	h.session = publicSession(t, h, "unrelated")
diff --git a/services/core/internal/store/session_deletion_lifecycle_public_test.go b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
similarity index 92%
rename from services/core/internal/store/session_deletion_lifecycle_public_test.go
rename to services/core/tests/integration/session_deletion_lifecycle_public_test.go
index 8f33c7051..930530ec1 100644
--- a/services/core/internal/store/session_deletion_lifecycle_public_test.go
+++ b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -11,7 +11,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 	"github.com/google/uuid"
 )
@@ -43,7 +42,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 
 	create := func(environment string, initial bool) sessions.Session {
 		t.Helper()
-		input := sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
+		input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 			Configuration: json.RawMessage(`{` + deletionAgent + `,"environment":` + environment + `}`)}
 		if initial {
 			input.InitialInputs = []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"reserved"}`)}}
@@ -60,7 +59,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	turn := func(to ...string) string {
 		t.Helper()
 		session := create(none, false)
-		receipt, err := store.SendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"work"}`))
+		receipt, err := sendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"work"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -68,13 +67,13 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 		for _, status := range to {
 			switch status {
 			case "cancel":
-				_, err = store.RequestCancel(ctx, s, tenant, session.ID, "cancel")
+				_, err = requestCancel(ctx, s, tenant, session.ID, "cancel")
 			case "function":
 				err = leased.Sessions.RecordFunctionCall(ctx, tenant, session.ID, receipt.TurnID, sessions.FunctionCall{CallID: "pending", ExecutorCallID: "native-pending", Name: "lookup", Arguments: json.RawMessage(`{}`)})
 			case sessions.TurnCompleted, sessions.TurnFailed:
 				_, err = leased.Sessions.CompleteExecution(ctx, tenant, session.ID, receipt.TurnID, status, nil, "", receipt.Sequence)
 			default:
-				_, err = store.TransitionTurn(ctx, s, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: from, Status: status})
+				_, err = transitionTurn(ctx, s, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: from, Status: status})
 				from = status
 			}
 			if err != nil {
@@ -85,7 +84,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	}
 	reserve := func(session sessions.Session) sessions.EnvironmentInputReservation {
 		t.Helper()
-		reservation, err := store.SessionService(t, s).ReserveEnvironmentInput(ctx, tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}})
+		reservation, err := sessionService(t, s).ReserveEnvironmentInput(ctx, tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}})
 		if err != nil || reservation.State != sessions.EnvironmentInputPending {
 			t.Fatal(reservation, err)
 		}
@@ -143,7 +142,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	}
 	settled["self_hosted_input_expired"] = expired.ID
 	withdrawn := create(selfHosted, false)
-	if _, err := store.CancelEnvironmentInput(ctx, s, tenant, withdrawn.ID, reserve(withdrawn).ID); err != nil {
+	if _, err := cancelEnvironmentInput(ctx, s, tenant, withdrawn.ID, reserve(withdrawn).ID); err != nil {
 		t.Fatal(err)
 	}
 	settled["later_input_cancelled"] = withdrawn.ID
diff --git a/services/core/internal/store/session_deletion_public_test.go b/services/core/tests/integration/session_deletion_public_test.go
similarity index 88%
rename from services/core/internal/store/session_deletion_public_test.go
rename to services/core/tests/integration/session_deletion_public_test.go
index ca34c9123..6b60be3bd 100644
--- a/services/core/internal/store/session_deletion_public_test.go
+++ b/services/core/tests/integration/session_deletion_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -30,7 +29,7 @@ func TestSessionDeletionOfficialClient(t *testing.T) {
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	h, err = publicHandler(t, store.New(db.pool), db, auth, "codex", storeExecution(t, store.New(db.pool)))
+	h, err = publicHandler(t, New(db.pool), db, auth, "codex", storeExecution(t, New(db.pool)))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/session_deletion_test.go b/services/core/tests/integration/session_deletion_test.go
similarity index 99%
rename from services/core/internal/store/session_deletion_test.go
rename to services/core/tests/integration/session_deletion_test.go
index 619465053..1484c5553 100644
--- a/services/core/internal/store/session_deletion_test.go
+++ b/services/core/tests/integration/session_deletion_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/session_devices_fixture_test.go b/services/core/tests/integration/session_devices_fixture_test.go
similarity index 98%
rename from services/core/internal/store/session_devices_fixture_test.go
rename to services/core/tests/integration/session_devices_fixture_test.go
index 582f1197a..f05c43240 100644
--- a/services/core/internal/store/session_devices_fixture_test.go
+++ b/services/core/tests/integration/session_devices_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/session_diagnostics_cancellation_test.go b/services/core/tests/integration/session_diagnostics_cancellation_test.go
similarity index 99%
rename from services/core/internal/store/session_diagnostics_cancellation_test.go
rename to services/core/tests/integration/session_diagnostics_cancellation_test.go
index 03518915a..f99e59811 100644
--- a/services/core/internal/store/session_diagnostics_cancellation_test.go
+++ b/services/core/tests/integration/session_diagnostics_cancellation_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/session_diagnostics_test.go b/services/core/tests/integration/session_diagnostics_test.go
similarity index 99%
rename from services/core/internal/store/session_diagnostics_test.go
rename to services/core/tests/integration/session_diagnostics_test.go
index 395f8719c..4c3996829 100644
--- a/services/core/internal/store/session_diagnostics_test.go
+++ b/services/core/tests/integration/session_diagnostics_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/session_events_test.go b/services/core/tests/integration/session_events_test.go
similarity index 72%
rename from services/core/internal/store/session_events_test.go
rename to services/core/tests/integration/session_events_test.go
index f0640c382..fc96e11b8 100644
--- a/services/core/internal/store/session_events_test.go
+++ b/services/core/tests/integration/session_events_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,16 +9,15 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
 func TestSessionEventsAreVisibleOnlyAfterCommit(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "commit"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "commit"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -31,7 +30,7 @@ func TestSessionEventsAreVisibleOnlyAfterCommit(t *testing.T) {
 		if err = sqlc.New(tx).AppendSessionEvent(ctx, sqlc.AppendSessionEventParams{ID: pgtype.UUID{Bytes: uuid.MustParse(session.ID), Valid: true}, Payload: []byte(`{"event":{"type":"agent.session.idle"}}`)}); err != nil {
 			t.Fatal(err)
 		}
-		if changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); err != nil || len(changes) != 0 {
+		if changes, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); err != nil || len(changes) != 0 {
 			t.Fatal("uncommitted events were visible", changes, err)
 		}
 		if commit {
@@ -43,36 +42,36 @@ func TestSessionEventsAreVisibleOnlyAfterCommit(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	if changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); err != nil || len(changes) != 1 || changes[0].Sequence != 1 {
+	if changes, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); err != nil || len(changes) != 1 || changes[0].Sequence != 1 {
 		t.Fatal("commit or rollback changed sequence continuity", changes, err)
 	}
 }
 
 func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "stream"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "stream"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	before, err := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	before, err := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`)); err != nil {
+	if _, err = sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`)); err != nil {
 		t.Fatal(err)
 	}
-	after, _ := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	after, _ := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("input retry published duplicate events")
 	}
-	if _, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	batch := []sessions.ExecutionEvent{
@@ -86,14 +85,14 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	before, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	before, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if err = journal.AppendTurnEvents(ctx, tenant, session.ID, input.TurnID, 5, []sessions.ExecutionEvent{
 		{Kind: "delta", Payload: json.RawMessage(`{"item_id":"discarded","delta":"rollback"}`)},
 		{Kind: "output_message", Payload: json.RawMessage(`{"status":"invalid"}`)},
 	}); err == nil {
 		t.Fatal("invalid projection accepted")
 	}
-	after, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	after, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("failed transaction published events")
 	}
@@ -103,7 +102,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	var all []sessions.SessionChange
 	cursor := int64(0)
 	for {
-		page, err := store.SessionAdapter(store.New(pool)).ListSessionEvents(ctx, tenant, session.ID, cursor)
+		page, err := sessionAdapter(New(pool)).ListSessionEvents(ctx, tenant, session.ID, cursor)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -139,14 +138,14 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if counts["agent.session.turn.output_text.delta"] != 3 || counts["agent.session.turn.item.done"] != 2 {
 		t.Fatal(counts)
 	}
-	if _, err = store.SessionAdapter(s).ListSessionEvents(ctx, uuid.NewString(), session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err = sessionAdapter(s).ListSessionEvents(ctx, uuid.NewString(), session.ID, 0); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign event access", err)
 	}
-	before, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	before, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if _, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true); err != nil {
 		t.Fatal(err)
 	}
-	after, _ = store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	after, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if before != after {
 		t.Fatal("history read published live events")
 	}
@@ -154,9 +153,9 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 
 func TestSessionEventsRetentionAndQueuedCancellation(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "retention"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "retention"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -170,7 +169,7 @@ func TestSessionEventsRetentionAndQueuedCancellation(t *testing.T) {
 		inputs[i] = sessions.Input{Kind: "message", Payload: json.RawMessage(`{"text":"input"}`)}
 	}
 	for range 5 {
-		if _, err = store.SubmitInputs(ctx, s, tenant, session.ID, uuid.NewString(), inputs); err != nil {
+		if _, err = submitInputs(ctx, s, tenant, session.ID, uuid.NewString(), inputs); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -178,17 +177,17 @@ func TestSessionEventsRetentionAndQueuedCancellation(t *testing.T) {
 	if err = pool.QueryRow(ctx, "SELECT count(*) FROM session_events WHERE session_id=$1", session.ID).Scan(&count); err != nil || count != 256 {
 		t.Fatal(count, err)
 	}
-	if _, err = store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); !errors.Is(err, sessions.ErrStreamGap) {
+	if _, err = sessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0); !errors.Is(err, sessions.ErrStreamGap) {
 		t.Fatal("lagging reader did not detect missing events", err)
 	}
-	cursor, err := store.SessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
+	cursor, err := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = store.RequestCancel(ctx, s, tenant, session.ID, "cancel"); err != nil {
+	if _, err = requestCancel(ctx, s, tenant, session.ID, "cancel"); err != nil {
 		t.Fatal(err)
 	}
-	changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, cursor)
+	changes, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, cursor)
 	if err != nil || len(changes) != 2 || changes[0].Event.Type != "agent.session.turn.cancelled" || changes[1].Event.Type != "agent.session.idle" {
 		t.Fatal(changes, err)
 	}
diff --git a/services/core/internal/store/session_execution_configuration_test.go b/services/core/tests/integration/session_execution_configuration_test.go
similarity index 99%
rename from services/core/internal/store/session_execution_configuration_test.go
rename to services/core/tests/integration/session_execution_configuration_test.go
index d75aa2293..f32f7e7bd 100644
--- a/services/core/internal/store/session_execution_configuration_test.go
+++ b/services/core/tests/integration/session_execution_configuration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/session_initial_public_test.go b/services/core/tests/integration/session_initial_public_test.go
similarity index 98%
rename from services/core/internal/store/session_initial_public_test.go
rename to services/core/tests/integration/session_initial_public_test.go
index f2ca88403..f6e5a3f0d 100644
--- a/services/core/internal/store/session_initial_public_test.go
+++ b/services/core/tests/integration/session_initial_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/session_metadata_test.go b/services/core/tests/integration/session_metadata_test.go
similarity index 99%
rename from services/core/internal/store/session_metadata_test.go
rename to services/core/tests/integration/session_metadata_test.go
index d1be257f1..021a87b0c 100644
--- a/services/core/internal/store/session_metadata_test.go
+++ b/services/core/tests/integration/session_metadata_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/session_model_execution_http_test.go b/services/core/tests/integration/session_model_execution_http_test.go
similarity index 93%
rename from services/core/internal/store/session_model_execution_http_test.go
rename to services/core/tests/integration/session_model_execution_http_test.go
index e0b763697..adb141a66 100644
--- a/services/core/internal/store/session_model_execution_http_test.go
+++ b/services/core/tests/integration/session_model_execution_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -9,14 +9,13 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestModelExecutionHTTPWriteOnlyAndStrictAdmission(t *testing.T) {
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{6}, 32))
-	st, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	st, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	st.SetPlacement(fixtureRules(t, db))
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "catalog-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
diff --git a/services/core/internal/store/session_model_options_test.go b/services/core/tests/integration/session_model_options_test.go
similarity index 99%
rename from services/core/internal/store/session_model_options_test.go
rename to services/core/tests/integration/session_model_options_test.go
index 079b3b06e..9724b971e 100644
--- a/services/core/internal/store/session_model_options_test.go
+++ b/services/core/tests/integration/session_model_options_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/session_reads_fixture_test.go b/services/core/tests/integration/session_reads_fixture_test.go
similarity index 98%
rename from services/core/internal/store/session_reads_fixture_test.go
rename to services/core/tests/integration/session_reads_fixture_test.go
index 5ddb4be8c..8ab6b3564 100644
--- a/services/core/internal/store/session_reads_fixture_test.go
+++ b/services/core/tests/integration/session_reads_fixture_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/session_reference_retry_public_test.go b/services/core/tests/integration/session_reference_retry_public_test.go
similarity index 94%
rename from services/core/internal/store/session_reference_retry_public_test.go
rename to services/core/tests/integration/session_reference_retry_public_test.go
index 410d1543e..6e54d2c79 100644
--- a/services/core/internal/store/session_reference_retry_public_test.go
+++ b/services/core/tests/integration/session_reference_retry_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -38,7 +37,7 @@ func TestSavedReferenceRetryOfficialClient(t *testing.T) {
 	}
 	server := httptest.NewServer(handler)
 	defer server.Close()
-	recovered, err := publicHandler(t, store.New(db.pool), db, auth, "codex")
+	recovered, err := publicHandler(t, New(db.pool), db, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/store/session_write_audit_test.go b/services/core/tests/integration/session_write_audit_test.go
similarity index 99%
rename from services/core/internal/store/session_write_audit_test.go
rename to services/core/tests/integration/session_write_audit_test.go
index f4b7862ef..e4679b03e 100644
--- a/services/core/internal/store/session_write_audit_test.go
+++ b/services/core/tests/integration/session_write_audit_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/sessions_fixture_test.go b/services/core/tests/integration/sessions_fixture_test.go
similarity index 98%
rename from services/core/internal/store/sessions_fixture_test.go
rename to services/core/tests/integration/sessions_fixture_test.go
index 7dbf21484..0f921ab0a 100644
--- a/services/core/internal/store/sessions_fixture_test.go
+++ b/services/core/tests/integration/sessions_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"testing"
diff --git a/services/core/internal/store/sessions_test.go b/services/core/tests/integration/sessions_test.go
similarity index 99%
rename from services/core/internal/store/sessions_test.go
rename to services/core/tests/integration/sessions_test.go
index f0f6dec40..ac8401aac 100644
--- a/services/core/internal/store/sessions_test.go
+++ b/services/core/tests/integration/sessions_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/skill_default_metadata_migration_test.go b/services/core/tests/integration/skill_default_metadata_migration_test.go
similarity index 99%
rename from services/core/internal/store/skill_default_metadata_migration_test.go
rename to services/core/tests/integration/skill_default_metadata_migration_test.go
index daa52b4e5..1fe748407 100644
--- a/services/core/internal/store/skill_default_metadata_migration_test.go
+++ b/services/core/tests/integration/skill_default_metadata_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/skill_fixture_test.go b/services/core/tests/integration/skill_fixture_test.go
similarity index 98%
rename from services/core/internal/store/skill_fixture_test.go
rename to services/core/tests/integration/skill_fixture_test.go
index 8f0c141bc..67486ac6d 100644
--- a/services/core/internal/store/skill_fixture_test.go
+++ b/services/core/tests/integration/skill_fixture_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"archive/zip"
diff --git a/services/core/internal/store/skill_selectors_public_test.go b/services/core/tests/integration/skill_selectors_public_test.go
similarity index 85%
rename from services/core/internal/store/skill_selectors_public_test.go
rename to services/core/tests/integration/skill_selectors_public_test.go
index f6758fbd2..42ccdcd51 100644
--- a/services/core/internal/store/skill_selectors_public_test.go
+++ b/services/core/tests/integration/skill_selectors_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -21,12 +20,12 @@ func TestSkillSelectorsOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{63}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
@@ -38,7 +37,7 @@ func TestSkillSelectorsOfficialClientPostgres(t *testing.T) {
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	recoveredStore, recoveredDB := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/skill_version_deletion_public_test.go b/services/core/tests/integration/skill_version_deletion_public_test.go
similarity index 91%
rename from services/core/internal/store/skill_version_deletion_public_test.go
rename to services/core/tests/integration/skill_version_deletion_public_test.go
index 54eb4ce7f..d82d42a66 100644
--- a/services/core/internal/store/skill_version_deletion_public_test.go
+++ b/services/core/tests/integration/skill_version_deletion_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -21,12 +20,12 @@ import (
 // other versions remain (V2), nondefault latest deletion (V3) and tenant
 // isolation (V4).
 func TestSkillVersionDeletionHTTPPostgres(t *testing.T) {
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{64}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "skill-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
@@ -57,8 +56,8 @@ func TestSkillVersionDeletionHTTPPostgres(t *testing.T) {
 	}
 	missing := expect(owner, http.MethodDelete, "/v1/skills/skill_"+uuid.NewString()+"/versions/1", http.StatusNotFound)
 
-	skillService := store.SkillService(t, pool, cipher)
-	sole, err := skillService.CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: store.SkillArchive(t, "sole-http")})
+	skillService := SkillService(t, pool, cipher)
+	sole, err := skillService.CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: skillArchive(t, "sole-http")})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -89,14 +88,14 @@ func TestSkillVersionDeletionHTTPPostgres(t *testing.T) {
 	expect(owner, http.MethodDelete, path, http.StatusNotFound)
 
 	// V2 and V3 on a Skill with two versions, then V1 on the reduced Skill.
-	pair, err := skillService.CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: store.SkillArchive(t, "pair-one")})
+	pair, err := skillService.CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: skillArchive(t, "pair-one")})
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Cleanup(func() {
 		_ = skillService.DeleteSkill(t.Context(), skills.DeleteSkill{TenantID: ownerTenant, SkillID: skills.PathID(pair.ID)})
 	})
-	if _, err = skillService.CreateVersion(t.Context(), skills.CreateVersion{TenantID: ownerTenant, SkillID: skills.PathID(pair.ID), Archive: store.SkillArchive(t, "pair-two")}); err != nil {
+	if _, err = skillService.CreateVersion(t.Context(), skills.CreateVersion{TenantID: ownerTenant, SkillID: skills.PathID(pair.ID), Archive: skillArchive(t, "pair-two")}); err != nil {
 		t.Fatal(err)
 	}
 	path = "/v1/skills/" + pair.ID
diff --git a/services/core/internal/store/skill_version_deletion_test.go b/services/core/tests/integration/skill_version_deletion_test.go
similarity index 99%
rename from services/core/internal/store/skill_version_deletion_test.go
rename to services/core/tests/integration/skill_version_deletion_test.go
index f98a573c6..77547d92f 100644
--- a/services/core/internal/store/skill_version_deletion_test.go
+++ b/services/core/tests/integration/skill_version_deletion_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"bytes"
diff --git a/services/core/internal/store/skills_public_test.go b/services/core/tests/integration/skills_public_test.go
similarity index 85%
rename from services/core/internal/store/skills_public_test.go
rename to services/core/tests/integration/skills_public_test.go
index 98e6ee955..5f1040746 100644
--- a/services/core/internal/store/skills_public_test.go
+++ b/services/core/tests/integration/skills_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -21,12 +20,12 @@ func TestSkillsOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{51}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
@@ -38,7 +37,7 @@ func TestSkillsOfficialClientPostgres(t *testing.T) {
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	recoveredStore, recoveredDB := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/source_files_errors_public_test.go b/services/core/tests/integration/source_files_errors_public_test.go
similarity index 98%
rename from services/core/internal/store/source_files_errors_public_test.go
rename to services/core/tests/integration/source_files_errors_public_test.go
index 9fd35f39e..147d9ea3a 100644
--- a/services/core/internal/store/source_files_errors_public_test.go
+++ b/services/core/tests/integration/source_files_errors_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/steering_receipts_test.go b/services/core/tests/integration/steering_receipts_test.go
similarity index 94%
rename from services/core/internal/store/steering_receipts_test.go
rename to services/core/tests/integration/steering_receipts_test.go
index 69a7ab13e..71c63dc04 100644
--- a/services/core/internal/store/steering_receipts_test.go
+++ b/services/core/tests/integration/steering_receipts_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,7 +9,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestExecutionDurableInputReceiptLifetime(t *testing.T) {
@@ -43,7 +42,7 @@ func TestExecutionDurableInputReceiptLifetime(t *testing.T) {
 			case "retry-after-write":
 				h.write(first.TurnID, proto.TypePromptSteerAck, proto.PromptSteerAckPayload{InputID: input.InputID, ErrorCode: "not_ready"})
 			case "cancel-unknown-first":
-				if _, err := store.RequestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
+				if _, err := requestCancel(ctx, h.s, h.tenant, h.session.ID, "cancel"); err != nil {
 					t.Fatal(err)
 				}
 				var request proto.PromptCancelPayload
diff --git a/services/core/internal/store/stream_authority_http_test.go b/services/core/tests/integration/stream_authority_http_test.go
similarity index 85%
rename from services/core/internal/store/stream_authority_http_test.go
rename to services/core/tests/integration/stream_authority_http_test.go
index 1d68d49eb..97c287eeb 100644
--- a/services/core/internal/store/stream_authority_http_test.go
+++ b/services/core/tests/integration/stream_authority_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bufio"
@@ -12,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -39,7 +38,7 @@ func TestLiveStreamClosesAfterKeyRevocationOrProjectArchive(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			session, err := s.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_fixture","model":"fixture","tools":[]},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
+			session, err := s.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_fixture","model":"fixture","tools":[]},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -101,7 +100,7 @@ func TestLiveStreamClosesAfterKeyRevocationOrProjectArchive(t *testing.T) {
 					t.Fatal("revocation affected peer", valid.StatusCode)
 				}
 				// New events remain available to valid callers after the reader has closed.
-				if _, err := store.SessionService(t, s).ReserveEnvironmentInput(t.Context(), project.TenantID, session.ID, "after-revocation", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"new event"}`)}}); err != nil {
+				if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), project.TenantID, session.ID, "after-revocation", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"new event"}`)}}); err != nil {
 					t.Fatal(err)
 				}
 			}
diff --git a/services/core/internal/store/structured_output_dispatch_test.go b/services/core/tests/integration/structured_output_dispatch_test.go
similarity index 90%
rename from services/core/internal/store/structured_output_dispatch_test.go
rename to services/core/tests/integration/structured_output_dispatch_test.go
index 94b6e34f9..ed70760cf 100644
--- a/services/core/internal/store/structured_output_dispatch_test.go
+++ b/services/core/tests/integration/structured_output_dispatch_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/engine/enginetest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestStructuredOutputDispatchRechecksOperationQualification(t *testing.T) {
@@ -24,7 +23,7 @@ func TestStructuredOutputDispatchRechecksOperationQualification(t *testing.T) {
 		t.Fatal(err)
 	}
 	var err error
-	h.session, err = h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "fixture_harness", IdempotencyKey: "structured", Configuration: configuration})
+	h.session, err = h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "fixture_harness", IdempotencyKey: "structured", Configuration: configuration})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -54,7 +53,7 @@ func TestStructuredOutputDispatchRechecksOperationQualification(t *testing.T) {
 	if result := <-h.run(ctx, input.TurnID); result.err == nil {
 		t.Fatal("unqualified structured output dispatched")
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
+	turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, input.TurnID)
 	if err != nil || turn.Status != sessions.TurnQueued {
 		t.Fatal("unqualified work was claimed", turn.Status, err)
 	}
diff --git a/services/core/internal/store/structured_output_native_test.go b/services/core/tests/integration/structured_output_native_test.go
similarity index 87%
rename from services/core/internal/store/structured_output_native_test.go
rename to services/core/tests/integration/structured_output_native_test.go
index e92633af3..c1abc64e6 100644
--- a/services/core/internal/store/structured_output_native_test.go
+++ b/services/core/tests/integration/structured_output_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -70,11 +69,11 @@ func TestNativeStructuredOutputPublicExecution(t *testing.T) {
 	if err != nil || json.Unmarshal(raw, &proof) != nil {
 		t.Fatal("invalid evidence", err)
 	}
-	call, err := store.FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
+	call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
+	turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -82,14 +81,14 @@ func TestNativeStructuredOutputPublicExecution(t *testing.T) {
 	if json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.Done.Usage.Raw["claude_sdk_result"] == nil || outcome.AppliedThrough < 1 {
 		t.Fatal("native usage or input receipt missing")
 	}
-	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, "claude_sdk")
 	run("resume")
-	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/subagent_dispatch_test.go b/services/core/tests/integration/subagent_dispatch_test.go
similarity index 94%
rename from services/core/internal/store/subagent_dispatch_test.go
rename to services/core/tests/integration/subagent_dispatch_test.go
index 7b87bc5b8..6a937f75e 100644
--- a/services/core/internal/store/subagent_dispatch_test.go
+++ b/services/core/tests/integration/subagent_dispatch_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -7,7 +7,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestSubagentIdentityUsesLeasedDispatchJournal(t *testing.T) {
@@ -20,7 +19,7 @@ func TestSubagentIdentityUsesLeasedDispatchJournal(t *testing.T) {
 				"environment": map[string]string{"type": "none"},
 			})
 			var err error
-			h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "identity-dispatch", Configuration: configuration})
+			h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "identity-dispatch", Configuration: configuration})
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/subagent_identities_test.go b/services/core/tests/integration/subagent_identities_test.go
similarity index 99%
rename from services/core/internal/store/subagent_identities_test.go
rename to services/core/tests/integration/subagent_identities_test.go
index 07aa5228f..4a7fccf6d 100644
--- a/services/core/internal/store/subagent_identities_test.go
+++ b/services/core/tests/integration/subagent_identities_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/subagent_native_outputs_test.go b/services/core/tests/integration/subagent_native_outputs_test.go
similarity index 99%
rename from services/core/internal/store/subagent_native_outputs_test.go
rename to services/core/tests/integration/subagent_native_outputs_test.go
index 94511c8e9..ad1238c1b 100644
--- a/services/core/internal/store/subagent_native_outputs_test.go
+++ b/services/core/tests/integration/subagent_native_outputs_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"encoding/json"
diff --git a/services/core/internal/store/subagent_resources_test.go b/services/core/tests/integration/subagent_resources_test.go
similarity index 99%
rename from services/core/internal/store/subagent_resources_test.go
rename to services/core/tests/integration/subagent_resources_test.go
index fed5afe72..474f4cb6e 100644
--- a/services/core/internal/store/subagent_resources_test.go
+++ b/services/core/tests/integration/subagent_resources_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/subagent_visibility_public_test.go b/services/core/tests/integration/subagent_visibility_public_test.go
similarity index 95%
rename from services/core/internal/store/subagent_visibility_public_test.go
rename to services/core/tests/integration/subagent_visibility_public_test.go
index fd259dac8..7a71affb0 100644
--- a/services/core/internal/store/subagent_visibility_public_test.go
+++ b/services/core/tests/integration/subagent_visibility_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -12,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -85,7 +84,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
 	leased := executionOwner(t, db)
-	writer := store.NewExecution(s, leased.Lease.(*pgunit.Lease))
+	writer := NewExecution(s, leased.Lease.(*pgunit.Lease))
 	ctx := t.Context()
 
 	created := openStream(t, server, token, http.MethodPost, "/v1/agents/sessions",
@@ -117,7 +116,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 	}
 	observed := collectEvents(t, live)
 
-	page, err := store.SessionAdapter(s).ListTurns(ctx, tenant, session, "", 10, true)
+	page, err := sessionAdapter(s).ListTurns(ctx, tenant, session, "", 10, true)
 	if err != nil || len(page.Turns) != 1 {
 		t.Fatal(page, err)
 	}
@@ -129,7 +128,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 	if err = leased.Sessions.BindSessionDevice(ctx, tenant, session, host.ID); err != nil {
 		t.Fatal(err)
 	}
-	if _, err = store.TransitionTurn(ctx, writer, tenant, session, root, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
+	if _, err = transitionTurn(ctx, writer, tenant, session, root, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
 	identity := func(child, parent string, created int64) sessions.ExecutionEvent {
@@ -153,7 +152,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 	if err = leased.Sessions.AppendTurnEvents(ctx, tenant, session, root, 1, facts); err != nil {
 		t.Fatal(err)
 	}
-	if _, err = store.TransitionTurn(ctx, writer, tenant, session, root, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted}); err != nil {
+	if _, err = transitionTurn(ctx, writer, tenant, session, root, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnCompleted}); err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/services/core/internal/store/template_composition_public_test.go b/services/core/tests/integration/template_composition_public_test.go
similarity index 94%
rename from services/core/internal/store/template_composition_public_test.go
rename to services/core/tests/integration/template_composition_public_test.go
index 078d99152..76eaa9e2f 100644
--- a/services/core/internal/store/template_composition_public_test.go
+++ b/services/core/tests/integration/template_composition_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -17,7 +17,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -26,12 +25,12 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{84}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, reopenedStore := store.NewWithCredentialCipher(pool, cipher), store.NewWithCredentialCipher(pool, cipher)
+	s, reopenedStore := NewWithCredentialCipher(pool, cipher), NewWithCredentialCipher(pool, cipher)
 	db := fixtureDB{pool: pool, cipher: cipher} // built both Stores
 	s.SetPlacement(fixtureRules(t, db))
 	reopenedStore.SetPlacement(fixtureRules(t, db))
@@ -40,7 +39,7 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "composition-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "composition-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
-	serve := func(current *store.Store) *httptest.Server {
+	serve := func(current *Store) *httptest.Server {
 		t.Helper()
 		// Hosted admission and freezing use the real Store; no Runtime or model runs.
 		h, err := publicHandler(t, current, db, auth, "codex", storeExecution(t, current), managedSandboxes(t, db), fixtureDeploymentProvider())
@@ -77,7 +76,7 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 	}
 	t.Cleanup(func() {
 		for _, id := range receipt.Sessions {
-			if err := store.SessionService(t, s).DeleteSession(context.Background(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: id}); err != nil {
+			if err := sessionService(t, s).DeleteSession(context.Background(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: id}); err != nil {
 				t.Error(err)
 			}
 		}
diff --git a/services/core/internal/store/template_null_selection_public_test.go b/services/core/tests/integration/template_null_selection_public_test.go
similarity index 94%
rename from services/core/internal/store/template_null_selection_public_test.go
rename to services/core/tests/integration/template_null_selection_public_test.go
index 849cd302f..294166b91 100644
--- a/services/core/internal/store/template_null_selection_public_test.go
+++ b/services/core/tests/integration/template_null_selection_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"bytes"
@@ -19,7 +19,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -28,12 +27,12 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{87}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, reopenedStore := store.NewWithCredentialCipher(pool, cipher), store.NewWithCredentialCipher(pool, cipher)
+	s, reopenedStore := NewWithCredentialCipher(pool, cipher), NewWithCredentialCipher(pool, cipher)
 	db := fixtureDB{pool: pool, cipher: cipher} // built both Stores
 	s.SetPlacement(fixtureRules(t, db))
 	reopenedStore.SetPlacement(fixtureRules(t, db))
@@ -42,7 +41,7 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
-	serve := func(current *store.Store) *httptest.Server {
+	serve := func(current *Store) *httptest.Server {
 		t.Helper()
 		h, err := publicHandler(t, current, db, auth, "codex", storeExecution(t, current), managedSandboxes(t, db), fixtureDeploymentProvider())
 		if err != nil {
@@ -82,7 +81,7 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 	}
 	t.Cleanup(func() {
 		for _, id := range receipt.Sessions {
-			if err := store.SessionService(t, s).DeleteSession(context.Background(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: id}); err != nil {
+			if err := sessionService(t, s).DeleteSession(context.Background(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: id}); err != nil {
 				t.Error(err)
 			}
 		}
diff --git a/services/core/internal/store/token_usage_integration_test.go b/services/core/tests/integration/token_usage_integration_test.go
similarity index 76%
rename from services/core/internal/store/token_usage_integration_test.go
rename to services/core/tests/integration/token_usage_integration_test.go
index a650779b9..de9dba494 100644
--- a/services/core/internal/store/token_usage_integration_test.go
+++ b/services/core/tests/integration/token_usage_integration_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,17 +9,16 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "usage"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "usage"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -34,11 +33,11 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		}
 	}
 	for n, status := range []string{sessions.TurnFailed, sessions.TurnCancelled} {
-		admission, err := store.SendMessage(ctx, s, tenant, session.ID, fmt.Sprint(n), json.RawMessage(`{"text":"measure"}`))
+		admission, err := sendMessage(ctx, s, tenant, session.ID, fmt.Sprint(n), json.RawMessage(`{"text":"measure"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
-		_, err = store.TransitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+		_, err = transitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -52,7 +51,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		if err = journal.AppendTurnEvents(ctx, tenant, session.ID, admission.TurnID, 2, []sessions.ExecutionEvent{{Kind: "usage", Payload: usage(20)}}); err != nil {
 			t.Fatal(err)
 		}
-		measured, err := store.SessionAdapter(s).GetTurn(ctx, tenant, session.ID, admission.TurnID)
+		measured, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, admission.TurnID)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -60,7 +59,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		if _, err = journal.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, sessions.TurnCompleted, json.RawMessage(`{"done":{"usage":`+string(usage(99))+`}}`), "missing-binding", admission.Sequence); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal(err)
 		}
-		rolledBack, err := store.SessionAdapter(s).GetTurn(ctx, tenant, session.ID, admission.TurnID)
+		rolledBack, err := sessionAdapter(s).GetTurn(ctx, tenant, session.ID, admission.TurnID)
 		if err != nil || rolledBack.Status != sessions.TurnInProgress {
 			t.Fatalf("rollback: %+v %v", rolledBack, err)
 		}
@@ -74,7 +73,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		if _, err = journal.CompleteExecution(ctx, tenant, session.ID, admission.TurnID, status, json.RawMessage(`{"done":{"usage":`+string(usage(99))+`}}`), "", admission.Sequence); !errors.Is(err, sessions.ErrTurnConflict) {
 			t.Fatal(err)
 		}
-		if _, err = store.SessionAdapter(s).GetTurn(ctx, uuid.NewString(), session.ID, admission.TurnID); !errors.Is(err, sessions.ErrNotFound) {
+		if _, err = sessionAdapter(s).GetTurn(ctx, uuid.NewString(), session.ID, admission.TurnID); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal(err)
 		}
 	}
@@ -84,8 +83,8 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer restored.Close()
-	fresh := store.New(restored)
-	got, err := store.SessionAdapter(fresh).GetSession(ctx, tenant, session.ID)
+	fresh := New(restored)
+	got, err := sessionAdapter(fresh).GetSession(ctx, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -96,29 +95,29 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 	if total.InputTokens != 40 || total.OutputTokens != 6 || total.TotalTokens != 46 || total.InputTokensDetails.CachedTokens != 8 || total.OutputTokensDetails.ReasoningTokens != 4 {
 		t.Fatalf("double counted totals: %+v", total)
 	}
-	page, err := store.SessionAdapter(fresh).ListSessions(ctx, tenant, "", 100, true, nil)
+	page, err := sessionAdapter(fresh).ListSessions(ctx, tenant, "", 100, true, nil)
 	if err != nil || len(page.Sessions) != 1 || string(page.Sessions[0].Usage) != string(got.Usage) {
 		t.Fatalf("list totals: %+v %v", page, err)
 	}
-	if _, err = store.SessionAdapter(fresh).GetSession(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err = sessionAdapter(fresh).GetSession(ctx, uuid.NewString(), session.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 }
 
 func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "cancel-recovery"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "cancel-recovery"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	admission, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"measure"}`))
+	admission, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"measure"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = transitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -127,7 +126,7 @@ func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 		t.Fatal(err)
 	}
 	// Startup recovery has no in-memory cancellation outcome.
-	recovered, err := store.TransitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"execution_interrupted"}`)})
+	recovered, err := transitionTurn(ctx, s, tenant, session.ID, admission.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"execution_interrupted"}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -142,10 +141,10 @@ func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 // and after a Turn ends with unknown usage (EVT-13).
 func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "unknown-usage"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "unknown-usage"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -156,22 +155,22 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	// included, and is scoped to the tenant.
 	measured := func(want int64) {
 		t.Helper()
-		got, err := store.SessionAdapter(s).MeasuredSessionUsage(ctx, tenant, session.ID)
+		got, err := sessionAdapter(s).MeasuredSessionUsage(ctx, tenant, session.ID)
 		var value v1.TokenUsage
 		if err != nil || (want < 0) != (got == nil) || (want >= 0 && (json.Unmarshal(got, &value) != nil || value.TotalTokens != want)) {
 			t.Fatalf("measured usage = %s %v, want total %d", got, err, want)
 		}
-		if foreign, err := store.SessionAdapter(s).MeasuredSessionUsage(ctx, uuid.NewString(), session.ID); err != nil || foreign != nil {
+		if foreign, err := sessionAdapter(s).MeasuredSessionUsage(ctx, uuid.NewString(), session.ID); err != nil || foreign != nil {
 			t.Fatalf("foreign measured usage: %s %v", foreign, err)
 		}
 	}
 	total := func(want int64) {
 		t.Helper()
-		got, err := store.SessionAdapter(s).GetSession(ctx, tenant, session.ID)
+		got, err := sessionAdapter(s).GetSession(ctx, tenant, session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
-		page, err := store.SessionAdapter(s).ListSessions(ctx, tenant, "", 100, true, nil)
+		page, err := sessionAdapter(s).ListSessions(ctx, tenant, "", 100, true, nil)
 		if err != nil || len(page.Sessions) != 1 || string(page.Sessions[0].Usage) != string(got.Usage) {
 			t.Fatalf("list usage: %+v %v", page, err)
 		}
@@ -188,7 +187,7 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	}
 	submit := func(key string) sessions.InputReceipt {
 		t.Helper()
-		admission, err := store.SendMessage(ctx, s, tenant, session.ID, key, json.RawMessage(`{"text":"measure"}`))
+		admission, err := sendMessage(ctx, s, tenant, session.ID, key, json.RawMessage(`{"text":"measure"}`))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -196,7 +195,7 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	}
 	move := func(turn, from, to string) {
 		t.Helper()
-		if _, err := store.TransitionTurn(ctx, s, tenant, session.ID, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
+		if _, err := transitionTurn(ctx, s, tenant, session.ID, turn, sessions.TurnTransition{ExpectedStatus: from, Status: to}); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -208,7 +207,7 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	}
 	lastIdleUsage := func() json.RawMessage {
 		t.Helper()
-		changes, err := store.SessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0)
+		changes, err := sessionAdapter(s).ListSessionEvents(ctx, tenant, session.ID, 0)
 		if err != nil || len(changes) == 0 || changes[len(changes)-1].Event.Type != "agent.session.idle" {
 			t.Fatal(changes, err)
 		}
diff --git a/services/core/internal/store/tool_policy_native_test.go b/services/core/tests/integration/tool_policy_native_test.go
similarity index 85%
rename from services/core/internal/store/tool_policy_native_test.go
rename to services/core/tests/integration/tool_policy_native_test.go
index 380a0c4f7..4b443aee4 100644
--- a/services/core/internal/store/tool_policy_native_test.go
+++ b/services/core/tests/integration/tool_policy_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -77,30 +76,30 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 	if err != nil || json.Unmarshal(raw, &proof) != nil || len(proof.Sessions) != 4 {
 		t.Fatal("invalid public evidence", err)
 	}
-	page, err := store.SessionAdapter(h.s).ListSessions(ctx, h.tenant, "", 100, true, nil)
+	page, err := sessionAdapter(h.s).ListSessions(ctx, h.tenant, "", 100, true, nil)
 	if err != nil || len(page.Sessions) != 1+len(proof.Sessions) {
 		t.Fatal("rejected configuration persisted a Session", err)
 	}
-	foreignPage, err := store.SessionAdapter(h.s).ListSessions(ctx, foreignTenant, "", 100, true, nil)
+	foreignPage, err := sessionAdapter(h.s).ListSessions(ctx, foreignTenant, "", 100, true, nil)
 	if err != nil || len(foreignPage.Sessions) != 0 {
 		t.Fatal("foreign Agent reference persisted a Session", err)
 	}
 	nativeIDs := make(map[string]string, len(proof.Sessions))
 	for _, item := range proof.Sessions {
-		session, err := store.SessionAdapter(h.s).GetSession(ctx, h.tenant, item.ID)
+		session, err := sessionAdapter(h.s).GetSession(ctx, h.tenant, item.ID)
 		if err != nil || session.Engine != kind {
 			t.Fatal("selected engine was not persisted", err)
 		}
-		turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, item.ID, item.FirstTurn)
+		turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, item.ID, item.FirstTurn)
 		if err != nil {
 			t.Fatal(err)
 		}
-		inputs, err := store.SessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, item.ID, item.FirstTurn, 0, 100)
+		inputs, err := sessionAdapter(h.s).ListTurnInputs(ctx, h.tenant, item.ID, item.FirstTurn, 0, 100)
 		var outcome execution.Result
 		if err != nil || len(inputs) != 1 || json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.AppliedThrough != inputs[0].Sequence {
 			t.Fatal("native text input receipt missing", err)
 		}
-		binding, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, item.ID)
+		binding, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, item.ID)
 		if err != nil || binding.NativeSessionID == "" {
 			t.Fatal("native binding missing", err)
 		}
@@ -110,7 +109,7 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 	stop = startNativeEngineDaemon(t, h, home, binary, kind)
 	run("resume")
 	for id, before := range nativeIDs {
-		after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, id)
+		after, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, id)
 		if err != nil || after.NativeSessionID != before {
 			t.Fatal("cold continuation changed native history", err)
 		}
diff --git a/services/core/internal/store/tool_search_native_test.go b/services/core/tests/integration/tool_search_native_test.go
similarity index 87%
rename from services/core/internal/store/tool_search_native_test.go
rename to services/core/tests/integration/tool_search_native_test.go
index b47764be6..2312b1c59 100644
--- a/services/core/internal/store/tool_search_native_test.go
+++ b/services/core/tests/integration/tool_search_native_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -70,11 +69,11 @@ func TestNativeToolSearchPublicExecution(t *testing.T) {
 	if err != nil || json.Unmarshal(raw, &proof) != nil {
 		t.Fatal("invalid evidence", err)
 	}
-	call, err := store.FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
+	call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
-	turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
+	turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, proof.Session, proof.Turn)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -82,14 +81,14 @@ func TestNativeToolSearchPublicExecution(t *testing.T) {
 	if json.Unmarshal(turn.Outcome, &outcome) != nil || outcome.Done.Usage.Raw["claude_sdk_result"] == nil || outcome.AppliedThrough < 1 {
 		t.Fatal("native usage or input receipt missing")
 	}
-	before, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	before, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID == "" {
 		t.Fatal("native binding missing", err)
 	}
 	stop()
 	stop = startNativeEngineDaemon(t, h, home, binary, "claude_sdk")
 	run("resume")
-	after, err := store.SessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
+	after, err := sessionAdapter(h.s).GetSessionExecutionBinding(ctx, h.tenant, proof.Session)
 	if err != nil || before.NativeSessionID != after.NativeSessionID {
 		t.Fatal("native history changed", err)
 	}
diff --git a/services/core/internal/store/turn_events_test.go b/services/core/tests/integration/turn_events_test.go
similarity index 84%
rename from services/core/internal/store/turn_events_test.go
rename to services/core/tests/integration/turn_events_test.go
index 8e12190c8..3c5a39839 100644
--- a/services/core/internal/store/turn_events_test.go
+++ b/services/core/tests/integration/turn_events_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -8,24 +8,23 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
 func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 	ctx := context.Background()
-	s, pool := store.NewTestStore(t)
+	s, pool := testStore(t)
 	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
 	tenant := uuid.NewString()
-	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "events"})
+	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "events"})
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := store.SendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"test"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"test"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, err = store.TransitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err = transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -61,7 +60,7 @@ func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	other, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "other"})
+	other, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "other"})
 	if _, err := s.ListTurnEvents(ctx, tenant, other.ID, input.TurnID, 0, 100); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
@@ -82,7 +81,7 @@ func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 	if err = journal.AppendTurnEvents(ctx, tenant, session.ID, input.TurnID, 4, conflict); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal(err)
 	}
-	reopened, pool := store.NewTestStore(t)
+	reopened, pool := testStore(t)
 	defer pool.Close()
 	page, err := reopened.ListTurnEvents(ctx, tenant, session.ID, input.TurnID, 0, 1)
 	if err != nil || len(page) != 1 || page[0].Ordinal != 1 {
@@ -98,11 +97,11 @@ func TestEventLimitStillAllowsTerminalFailure(t *testing.T) {
 	h := newDispatchHarness(t)
 	ctx := context.Background()
 	input := h.message("start", "Test output budget")
-	_, err := store.TransitionTurn(ctx, h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
+	_, err := transitionTurn(ctx, h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	defer pool.Close()
 	if _, err := pool.Exec(ctx, "UPDATE turns SET event_bytes=33554432 WHERE id=$1", input.TurnID); err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/store/turn_journal_reads_test.go b/services/core/tests/integration/turn_journal_reads_test.go
similarity index 99%
rename from services/core/internal/store/turn_journal_reads_test.go
rename to services/core/tests/integration/turn_journal_reads_test.go
index 2e07f9b3d..09ee32b68 100644
--- a/services/core/internal/store/turn_journal_reads_test.go
+++ b/services/core/tests/integration/turn_journal_reads_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/unified_model_configuration_http_test.go b/services/core/tests/integration/unified_model_configuration_http_test.go
similarity index 97%
rename from services/core/internal/store/unified_model_configuration_http_test.go
rename to services/core/tests/integration/unified_model_configuration_http_test.go
index ef3f4e6c3..769a77d21 100644
--- a/services/core/internal/store/unified_model_configuration_http_test.go
+++ b/services/core/tests/integration/unified_model_configuration_http_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -10,7 +10,6 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -106,7 +105,7 @@ func TestUnifiedModelConfigurationHTTP(t *testing.T) {
 			}
 		}
 		equalJSON(publicNative, native)
-		snapshot, err := store.SessionAdapter(st).GetSessionExecutionConfiguration(t.Context(), tenant, id)
+		snapshot, err := sessionAdapter(st).GetSessionExecutionConfiguration(t.Context(), tenant, id)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -114,7 +113,7 @@ func TestUnifiedModelConfigurationHTTP(t *testing.T) {
 			t.Fatalf("wrong frozen selections: %#v", snapshot)
 		}
 		equalJSON(snapshot.HarnessConfig.Value, native)
-		secret, err := store.SessionAdapter(st).SessionModelExecution(t.Context(), tenant, id)
+		secret, err := sessionAdapter(st).SessionModelExecution(t.Context(), tenant, id)
 		if err != nil || secret == nil || secret.APIKey != providerKey {
 			t.Fatal("frozen provider changed", err)
 		}
diff --git a/services/core/internal/store/unstorable_text_public_test.go b/services/core/tests/integration/unstorable_text_public_test.go
similarity index 96%
rename from services/core/internal/store/unstorable_text_public_test.go
rename to services/core/tests/integration/unstorable_text_public_test.go
index fb611768f..fec595786 100644
--- a/services/core/internal/store/unstorable_text_public_test.go
+++ b/services/core/tests/integration/unstorable_text_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"archive/zip"
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/google/uuid"
 )
 
@@ -20,12 +19,12 @@ import (
 // containing it must be rejected as a client error before anything is written.
 func TestUnstorableTextRejectsWithoutWritesPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := store.NewManagedTestStore(t)
+	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{62}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := store.NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "nul-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}})
 	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
diff --git a/services/core/internal/store/vault_status_migration_test.go b/services/core/tests/integration/vault_status_migration_test.go
similarity index 99%
rename from services/core/internal/store/vault_status_migration_test.go
rename to services/core/tests/integration/vault_status_migration_test.go
index e506d118b..671568940 100644
--- a/services/core/internal/store/vault_status_migration_test.go
+++ b/services/core/tests/integration/vault_status_migration_test.go
@@ -1,4 +1,4 @@
-package store
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/vaults_fixture_test.go b/services/core/tests/integration/vaults_fixture_test.go
similarity index 97%
rename from services/core/internal/store/vaults_fixture_test.go
rename to services/core/tests/integration/vaults_fixture_test.go
index 17a110e88..d5d8697fd 100644
--- a/services/core/internal/store/vaults_fixture_test.go
+++ b/services/core/tests/integration/vaults_fixture_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/oauthrefresh"
diff --git a/services/core/internal/store/whitespace_input_public_test.go b/services/core/tests/integration/whitespace_input_public_test.go
similarity index 99%
rename from services/core/internal/store/whitespace_input_public_test.go
rename to services/core/tests/integration/whitespace_input_public_test.go
index d26dcb2e8..5bfeeafec 100644
--- a/services/core/internal/store/whitespace_input_public_test.go
+++ b/services/core/tests/integration/whitespace_input_public_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
diff --git a/services/core/internal/store/worker_capacity_test.go b/services/core/tests/integration/worker_capacity_test.go
similarity index 94%
rename from services/core/internal/store/worker_capacity_test.go
rename to services/core/tests/integration/worker_capacity_test.go
index 327d776ef..f125e435c 100644
--- a/services/core/internal/store/worker_capacity_test.go
+++ b/services/core/tests/integration/worker_capacity_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"fmt"
@@ -7,7 +7,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 // Consume the actual controls so capacity rejection is exercised before any
@@ -103,7 +102,7 @@ func TestWorkerDefersPreparationCapacityUntilCleanupReleasesSlot(t *testing.T) {
 	}
 	assertQueued := func() {
 		t.Helper()
-		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, blocked, turns[blocked])
+		turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, blocked, turns[blocked])
 		if err != nil || turn.Status != sessions.TurnQueued {
 			t.Fatal("capacity rejection failed queued work", turn, err)
 		}
@@ -136,7 +135,7 @@ func TestWorkerDefersPreparationCapacityUntilCleanupReleasesSlot(t *testing.T) {
 	// still owns a slot and reports the same capacity rejection.
 	h.write(turns[first], proto.TypeDone, proto.DonePayload{Content: "done"})
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "first completed Turn", func() bool {
-		turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, first, turns[first])
+		turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, first, turns[first])
 		return err == nil && turn.Status == sessions.TurnCompleted
 	})
 	observeCapacity()
@@ -151,7 +150,7 @@ func TestWorkerDefersPreparationCapacityUntilCleanupReleasesSlot(t *testing.T) {
 	}
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "all five Turns completed", func() bool {
 		for session, id := range turns {
-			turn, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, session, id)
+			turn, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, session, id)
 			if err != nil || turn.Status != sessions.TurnCompleted {
 				return false
 			}
diff --git a/services/core/internal/store/worker_input_race_test.go b/services/core/tests/integration/worker_input_race_test.go
similarity index 83%
rename from services/core/internal/store/worker_input_race_test.go
rename to services/core/tests/integration/worker_input_race_test.go
index a424f57dd..eaa856fbb 100644
--- a/services/core/internal/store/worker_input_race_test.go
+++ b/services/core/tests/integration/worker_input_race_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -40,17 +39,17 @@ func TestWorkerInputReadSkipsConcurrentlyCancelledCandidate(t *testing.T) {
 			h := newDispatchHarness(t)
 			candidate := h.message("candidate", "queued")
 			candidateSession := h.session.ID
-			_, pool := store.NewTestStore(t)
+			_, pool := testStore(t)
 			cfg := pool.Config()
 			mutated := make(chan error, 1)
 			cfg.ConnConfig.Tracer = &beforeInputRead{run: func() {
 				if deleted {
 					// Public deletion now rejects the queued candidate; an
 					// earlier release's marker must still fence its execution.
-					mutated <- h.s.CommitLegacyDeletion(t.Context(), h.tenant, candidateSession)
+					mutated <- h.s.commitLegacyDeletion(t.Context(), h.tenant, candidateSession)
 					return
 				}
-				_, err := store.SubmitInputs(t.Context(), h.s, h.tenant, candidateSession, "cancel", []sessions.Input{{Kind: "cancel", Payload: json.RawMessage(`{}`)}})
+				_, err := submitInputs(t.Context(), h.s, h.tenant, candidateSession, "cancel", []sessions.Input{{Kind: "cancel", Payload: json.RawMessage(`{}`)}})
 				mutated <- err
 			}}
 			instrumented, err := pgxpool.NewWithConfig(t.Context(), cfg)
@@ -79,12 +78,12 @@ func TestWorkerInputReadSkipsConcurrentlyCancelledCandidate(t *testing.T) {
 			case <-time.After(10 * time.Second):
 				t.Fatal("input-read interleaving was not reached")
 			}
-			turn, err := store.SessionAdapter(h.s).GetTurn(ctx, h.tenant, candidateSession, candidate.TurnID)
+			turn, err := sessionAdapter(h.s).GetTurn(ctx, h.tenant, candidateSession, candidate.TurnID)
 			if err != nil || turn.Status != sessions.TurnCancelled {
 				t.Fatal("candidate was not cancelled", err)
 			}
 			// A later Session must still execute through this same Worker.
-			h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "healthy", Configuration: h.session.Configuration})
+			h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "healthy", Configuration: h.session.Configuration})
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/store/worker_lease_loss_test.go b/services/core/tests/integration/worker_lease_loss_test.go
similarity index 89%
rename from services/core/internal/store/worker_lease_loss_test.go
rename to services/core/tests/integration/worker_lease_loss_test.go
index ef31f12a6..bedf0f7c7 100644
--- a/services/core/internal/store/worker_lease_loss_test.go
+++ b/services/core/tests/integration/worker_lease_loss_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -9,12 +9,11 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerLeaseLossLeavesUncertainWorkForSuccessor(t *testing.T) {
 	h := newDispatchHarness(t)
-	_, pool := store.NewTestStore(t)
+	_, pool := testStore(t)
 	h.write("", proto.TypeHeartbeat, proto.HeartbeatPayload{SupportedAgentKinds: []proto.SupportedAgentKind{{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Streaming: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableTurns: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported, WebSearchControl: proto.CapabilitySupported, TextVerbosity: proto.CapabilitySupported, ExecutionControls: proto.CapabilitySupported, SubagentControl: proto.CapabilitySupported, ToolObservations: proto.CapabilitySupported, EnvironmentNone: proto.CapabilitySupported, Preparation: proto.CapabilitySupported})}}})
 	h.session = publicSession(t, h, "active")
 	queued := publicSession(t, h, "queued")
@@ -68,7 +67,7 @@ func TestWorkerLeaseLossLeavesUncertainWorkForSuccessor(t *testing.T) {
 	case <-time.After(12 * time.Second):
 		t.Fatal("worker ignored lease loss")
 	}
-	active, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, request.ID)
+	active, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, request.ID)
 	if err != nil || active.Status != sessions.TurnInProgress {
 		t.Fatal("lost owner persisted fallback completion", active, err)
 	}
@@ -78,11 +77,11 @@ func TestWorkerLeaseLossLeavesUncertainWorkForSuccessor(t *testing.T) {
 	if err = successor.Run(stopped); err != context.Canceled {
 		t.Fatal(err)
 	}
-	active, err = store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, request.ID)
+	active, err = sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, h.session.ID, request.ID)
 	if err != nil || active.Status != sessions.TurnFailed {
 		t.Fatal("successor did not reconcile", active, err)
 	}
-	next, err := store.SessionAdapter(h.s).GetTurn(t.Context(), h.tenant, queued.ID, pending[0].TurnID)
+	next, err := sessionAdapter(h.s).GetTurn(t.Context(), h.tenant, queued.ID, pending[0].TurnID)
 	if err != nil || next.Status != sessions.TurnQueued {
 		t.Fatal("successor lost queued work", next, err)
 	}
diff --git a/services/core/internal/store/worker_preparation_failure_test.go b/services/core/tests/integration/worker_preparation_failure_test.go
similarity index 78%
rename from services/core/internal/store/worker_preparation_failure_test.go
rename to services/core/tests/integration/worker_preparation_failure_test.go
index b7c82413e..4a744e311 100644
--- a/services/core/internal/store/worker_preparation_failure_test.go
+++ b/services/core/tests/integration/worker_preparation_failure_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"encoding/json"
@@ -7,7 +7,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 )
 
 func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T) {
@@ -16,7 +15,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 			h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 			enableWorkerEnvironment(t, h)
 			frames := workerFrames(t, h)
-			pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+			pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -31,14 +30,14 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 				h.write(prepare.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{State: "rejected", Operation: proto.TypeExecutionPrepare, ErrorCode: code})
 			}
 			awaitDaemonRemoteCondition(t, t.Context(), 3*time.Second, "failed reservation settlement", func() bool {
-				current, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+				current, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 				return err == nil && current.State == sessions.EnvironmentInputFailed
 			})
-			session, err := store.SessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
+			session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
 			if err != nil || session.PendingInput || session.LastTurn != nil || session.EnvironmentInputActivity == nil || session.EnvironmentInputActivity.Failure != "runtime_preparation_failed" {
 				t.Fatal("preparation did not release input with a safe failure", err)
 			}
-			changes, err := store.SessionAdapter(h.s).ListSessionEvents(t.Context(), h.tenant, h.session.ID, 0)
+			changes, err := sessionAdapter(h.s).ListSessionEvents(t.Context(), h.tenant, h.session.ID, 0)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -59,7 +58,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 				t.Fatal("failed input retried", frame.Type)
 			case <-time.After(1200 * time.Millisecond):
 			}
-			next, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
+			next, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
 			if err != nil {
 				t.Fatal("new input remained blocked", err)
 			}
@@ -71,7 +70,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 			if startFrame.DecodePayload(&start) != nil || start.RunID == "" || inputTextForTest(t, start.Input) != "next" {
 				t.Fatal("new input was not admitted")
 			}
-			current, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, next.ID)
+			current, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, next.ID)
 			if err != nil || current.State != sessions.EnvironmentInputAdmitted {
 				t.Fatal("new input state", err)
 			}
@@ -99,7 +98,7 @@ func TestWorkerRetriesUncertainPreparationFailure(t *testing.T) {
 			h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 			enableWorkerEnvironment(t, h)
 			frames := workerFrames(t, h)
-			pending, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "retry", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"retry"}`)}})
+			pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "retry", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"retry"}`)}})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -116,11 +115,11 @@ func TestWorkerRetriesUncertainPreparationFailure(t *testing.T) {
 				nextWorkerFrame(t, frames, proto.TypeExecutionRelease)
 			}
 			nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
-			current, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
+			current, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, pending.ID)
 			if err != nil || current.State != sessions.EnvironmentInputPending || !current.Deadline.Equal(pending.Deadline) {
 				t.Fatal("transient failure settled or extended input", err)
 			}
-			if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
+			if _, err := cancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, pending.ID); err != nil {
 				t.Fatal(err)
 			}
 		})
@@ -131,17 +130,17 @@ func TestWorkerPreparationRejectionPreservesCancellationAndNewerInput(t *testing
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 	enableWorkerEnvironment(t, h)
 	frames := workerFrames(t, h)
-	first, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	first, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
 	defer stop()
 	old := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
-	if _, err := store.CancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, first.ID); err != nil {
+	if _, err := cancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, first.ID); err != nil {
 		t.Fatal(err)
 	}
-	next, err := store.SessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
+	next, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -149,7 +148,7 @@ func TestWorkerPreparationRejectionPreservesCancellationAndNewerInput(t *testing
 	h.write(old.ID, proto.TypePreparationStatus, rejection)
 	prepare := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
 	for id, state := range map[string]string{first.ID: sessions.EnvironmentInputCancelled, next.ID: sessions.EnvironmentInputPending} {
-		current, err := store.SessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, id)
+		current, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, h.session.ID, id)
 		if err != nil || current.State != state {
 			t.Fatal("late rejection changed cancellation or newer input", err)
 		}
diff --git a/services/core/internal/store/worker_wakeup_test.go b/services/core/tests/integration/worker_wakeup_test.go
similarity index 93%
rename from services/core/internal/store/worker_wakeup_test.go
rename to services/core/tests/integration/worker_wakeup_test.go
index 893d2a36f..379cd2349 100644
--- a/services/core/internal/store/worker_wakeup_test.go
+++ b/services/core/tests/integration/worker_wakeup_test.go
@@ -1,4 +1,4 @@
-package store_test
+package integration
 
 import (
 	"context"
@@ -10,7 +10,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/store"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -36,7 +35,7 @@ func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
 			h := newDispatchHarness(t)
 			enableWorkerEnvironment(t, h)
 			h.session = publicSession(t, h, "wakeup")
-			_, pool := store.NewTestStore(t)
+			_, pool := testStore(t)
 			trace := &schedulerQueryOrder{first: make(chan string, 1)}
 			config := pool.Config()
 			config.ConnConfig.Tracer = trace
@@ -47,7 +46,7 @@ func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
 			defer instrumented.Close()
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
-			worker := startWorker(t, ctx, fixtureDB{pool: instrumented, cipher: store.FixtureCipher()}, h.d)
+			worker := startWorker(t, ctx, fixtureDB{pool: instrumented, cipher: fixtureCipher}, h.d)
 			done := make(chan error, 1)
 			started := false
 			defer func() {
@@ -66,7 +65,7 @@ func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
 			case "submit":
 				_, err = worker.SubmitInputs(ctx, h.tenant, h.session.ID, "wake", input)
 			case "create":
-				_, err = worker.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: store.FixtureCreator(), Engine: "codex", IdempotencyKey: "wake", Configuration: h.session.Configuration, InitialInputs: input})
+				_, err = worker.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "wake", Configuration: h.session.Configuration, InitialInputs: input})
 			case "rejected":
 				h.message("wake", "different")
 				_, err = worker.SubmitInputs(ctx, h.tenant, h.session.ID, "wake", input)
diff --git a/services/core/tests/official_credential_rotation.py b/services/core/tests/official_credential_rotation.py
index da61f3a2a..e7ae40cb9 100644
--- a/services/core/tests/official_credential_rotation.py
+++ b/services/core/tests/official_credential_rotation.py
@@ -51,7 +51,7 @@ def metadata(response, previous):
         response = credentials.with_raw_response.update(original.id, vault_id=vault.id, **replacement)
         current = metadata(response.http_response, original)
         assert response.parse() == current
-        # The public boundary accepts opaque values; private Store tests verify
+        # The public boundary accepts opaque values; Core's Go tests verify
         # their bytes. The final value also supplies a log-scan canary.
         for token in (" ", " \t" + canary + "\n雪 ", canary + "final"):
             response = raw.post(endpoint, headers=headers, json={"auth": {"type": "static_bearer", "token": token}})
diff --git a/services/core/tests/official_credentials.py b/services/core/tests/official_credentials.py
index ae5c05871..a3f1efc47 100644
--- a/services/core/tests/official_credentials.py
+++ b/services/core/tests/official_credentials.py
@@ -45,7 +45,7 @@ def safe_body(response, status):
         saved.append(value)
 
         # These successful writes exercise opaque strings, not a public token
-        # round-trip. Byte preservation is verified by private Store tests.
+        # round-trip. Byte preservation is verified by Core's Go tests.
         for name, token in (("🧪" * 64, canary + "x" * 1024), ("Whitespace opaque token", " ")):
             response = raw.post(endpoint, headers=headers, json={"name": " " + name + "\n",
                                 "auth": {**auth, "token": token}})
diff --git a/services/core/tests/official_environment_events.py b/services/core/tests/official_environment_events.py
deleted file mode 100644
index 631f0555f..000000000
--- a/services/core/tests/official_environment_events.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""Validate retained connection observations against the pinned SDK and raw shape."""
-
-import importlib.metadata
-import json
-from pathlib import Path
-import sys
-
-from openai._models import validate_type
-from openai.types.beta.agent_session_environment_connected_event import AgentSessionEnvironmentConnectedEvent
-from openai.types.beta.agent_session_environment_disconnected_event import AgentSessionEnvironmentDisconnectedEvent
-
-
-def main():
-    root = Path(__file__).resolve().parents[3]
-    pin = json.loads((root / "contracts/agents-api/upstream.json").read_text())
-    distribution = importlib.metadata.distribution("openai")
-    source = json.loads(distribution.read_text("direct_url.json") or "{}")
-    assert distribution.version == "3.13.0"
-    assert source.get("vcs_info", {}).get("commit_id") == pin["commit"]
-    events = json.loads(Path(sys.argv[1]).read_text())
-    models = {"connected": AgentSessionEnvironmentConnectedEvent,
-              "disconnected": AgentSessionEnvironmentDisconnectedEvent}
-    assert len(events) >= 3
-    ids = set()
-    previous = None
-    for event in events:
-        assert set(event) == {"type", "event_id", "session_id", "environment"}
-        state = event["environment"]
-        assert set(state) == {"id", "type", "status", "error"}
-        assert state["type"] == "self_hosted" and state["error"] is None
-        status = state["status"]
-        assert status in models and status != previous
-        assert event["type"] == "agent.session.environment." + status
-        parsed = validate_type(type_=models[status], value=event)
-        assert parsed.environment.id == state["id"]
-        assert parsed.session_id == event["session_id"] and parsed.turn_id is None
-        assert event["event_id"] not in ids
-        ids.add(event["event_id"])
-        previous = status
-    print(f"Pinned SDK and raw Environment event snapshots passed: {len(events)} transitions.")
-
-
-if __name__ == "__main__":
-    main()

From 07820085ce6235413f195a7151bd9c19df38b48a Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 06:47:46 +0800
Subject: [PATCH 13/60] Fold the integration fixture database into Store (#450)

---
 .../integration/admin_session_archive_test.go |   2 +-
 .../admin_session_archive_worker_http_test.go |  15 +-
 .../agent_execution_defaults_http_test.go     |   5 +-
 .../integration/agents_delete_public_test.go  |   8 +-
 .../integration/agents_update_public_test.go  |   8 +-
 .../integration/archive_cancellation_test.go  |  39 ++---
 .../integration/claude_execution_test.go      |  10 +-
 .../core/tests/integration/claude_mcp_test.go |   4 +-
 .../tests/integration/command_output_test.go  |   8 +-
 .../configuration_validation_public_test.go   |   6 +-
 .../creation_stream_settlement_public_test.go |   8 +-
 .../credential_matrix_http_test.go            |  19 ++-
 .../integration/deployment_fixture_test.go    |  16 +-
 .../deployment_model_providers_http_test.go   |  33 ++--
 .../deployment_public_fixture_test.go         |  49 ++----
 .../core/tests/integration/dispatch_test.go   |  30 ++--
 .../integration/environment_admission_test.go |   2 +-
 .../environment_claim_worker_test.go          |  14 +-
 .../environment_connection_events_test.go     |   5 +-
 .../environment_connection_worker_test.go     |  14 +-
 .../integration/environment_device_test.go    |   8 +-
 .../integration/environment_directory_test.go |   4 +-
 .../environment_executor_command_test.go      |   8 +-
 .../environment_expiry_dispatch_test.go       |   4 +-
 .../environment_expiry_worker_test.go         |  18 +--
 ...onment_file_write_semantics_public_test.go |   6 +-
 .../environment_initial_public_test.go        |   8 +-
 .../environment_initialization_test.go        |  43 +++---
 .../environment_mcp_public_test.go            |   6 +-
 .../integration/environment_plugins_test.go   |   2 +-
 .../environment_retrieve_public_test.go       |  22 +--
 .../environment_runtime_fixture_test.go       |  16 +-
 .../integration/environment_setup_test.go     |   2 +-
 .../integration/environment_work_test.go      |   2 +-
 .../environment_worker_scan_test.go           |   4 +-
 .../integration/environment_worker_test.go    |   6 +-
 .../file_resource_semantics_public_test.go    |   4 +-
 .../core/tests/integration/fixture_db_test.go | 141 ------------------
 .../core/tests/integration/fixtures_test.go   |   2 +-
 .../function_execution_native_test.go         |   6 +-
 .../integration/function_execution_test.go    |   8 +-
 .../function_images_native_test.go            |   6 +-
 .../function_input_execution_test.go          |   2 +-
 .../function_inputs_public_test.go            |   8 +-
 .../function_public_native_test.go            |   6 +-
 .../integration/function_state_public_test.go |   6 +-
 .../function_stream_native_test.go            |   2 +-
 .../tests/integration/function_worker_test.go |  10 +-
 .../integration/harness_onboarding_test.go    |   4 +-
 ...sted_initialization_failure_public_test.go |  38 +++--
 .../integration/initial_files_http_test.go    |   7 +-
 .../input_conflicts_public_test.go            |  18 +--
 .../integration/item_order_migration_test.go  |   2 +-
 .../core/tests/integration/item_order_test.go |   8 +-
 .../core/tests/integration/item_reads_test.go |  32 ++--
 .../integration/list_cursor_public_test.go    |  11 +-
 .../integration/list_query_public_test.go     |   6 +-
 .../integration/local_artifact_export_test.go |   2 +-
 .../local_environment_file_write_test.go      |   8 +-
 .../local_environment_worker_test.go          |  10 +-
 .../tests/integration/managed_fixture_test.go |   2 +-
 .../integration/mcode_public_native_test.go   |   4 +-
 .../mcp_credential_selection_public_test.go   |   4 +-
 .../message_image_admission_test.go           |   2 +-
 .../integration/message_images_native_test.go |   6 +-
 .../integration/model_protocol_native_test.go |   6 +-
 .../integration/native_environment_test.go    |   4 +-
 .../native_public_execution_test.go           |   4 +-
 .../tests/integration/no_environment_test.go  |   2 +-
 .../path_id_semantics_public_test.go          |   6 +-
 .../integration/prepared_dispatch_test.go     |   2 +-
 .../integration/project_api_keys_http_test.go |   4 +-
 .../projects_public_fixture_test.go           |   6 +-
 .../integration/public_execution_test.go      |  12 +-
 .../public_handler_fixture_test.go            |  57 ++++---
 .../remote_mcp_credentials_test.go            |  12 +-
 .../core/tests/integration/remote_mcp_test.go |  18 +--
 .../integration/request_body_public_test.go   |   8 +-
 .../tests/integration/root_fixture_test.go    |   8 +-
 .../runtime_capabilities_pending_test.go      |  13 +-
 .../runtime_compute_lifecycle_test.go         |  31 ++--
 .../runtime_configuration_cleanup_test.go     |  14 +-
 .../integration/runtime_connection_test.go    |  16 +-
 .../runtime_creation_settlement_test.go       |  26 ++--
 .../runtime_deployment_worker_test.go         |  14 +-
 .../runtime_enrollment_connection_test.go     |  28 ++--
 .../runtime_initialization_test.go            |  31 ++--
 .../runtime_input_admission_test.go           |   6 +-
 .../integration/runtime_lifecycle_test.go     |  76 +++++-----
 .../runtime_node_lifecycle_fixture_test.go    |  16 +-
 .../runtime_node_lifecycle_test.go            |  14 +-
 .../runtime_observation_scan_test.go          |  14 +-
 .../tests/integration/runtime_pending_test.go |  16 +-
 .../tests/integration/runtime_scan_test.go    |  16 +-
 .../runtime_wake_hint_integration_test.go     |   8 +-
 .../runtime_worker_recovery_test.go           |   6 +-
 .../sandbox_deployment_resources_test.go      |   2 +-
 .../sandbox_deployment_switch_test.go         |  12 +-
 .../sandbox_deployment_switch_worker_test.go  |  11 +-
 .../sandbox_deployment_view_test.go           |   2 +-
 .../sandbox_deployment_worker_test.go         |  10 +-
 .../sandbox_node_auth_order_http_test.go      |   8 +-
 .../sandbox_specification_lifecycle_test.go   |   2 +-
 .../saved_web_search_public_test.go           |  10 +-
 .../self_hosted_cancel_public_test.go         |  22 +--
 .../self_hosted_initial_public_test.go        |  46 +++---
 .../session_agent_filter_public_test.go       |   8 +-
 .../session_artifacts_public_test.go          |  17 ++-
 .../session_deletion_execution_test.go        |   6 +-
 .../session_deletion_lifecycle_public_test.go |  18 +--
 .../session_deletion_public_test.go           |   6 +-
 .../session_devices_fixture_test.go           |   6 +-
 .../tests/integration/session_events_test.go  |   6 +-
 .../session_execution_configuration_test.go   |   4 +-
 .../session_initial_public_test.go            |   8 +-
 .../session_model_execution_http_test.go      |   5 +-
 .../integration/session_model_options_test.go |   2 +-
 .../integration/session_reads_fixture_test.go |   7 +-
 .../session_reference_retry_public_test.go    |  12 +-
 .../integration/sessions_fixture_test.go      |  47 ------
 .../core/tests/integration/sessions_test.go   |   2 +-
 .../skill_selectors_public_test.go            |   8 +-
 .../skill_version_deletion_public_test.go     |   4 +-
 .../skill_version_deletion_test.go            |   2 +-
 .../tests/integration/skills_public_test.go   |   8 +-
 .../source_files_errors_public_test.go        |   4 +-
 .../integration/stream_authority_http_test.go |   6 +-
 .../structured_output_dispatch_test.go        |   2 +-
 .../structured_output_native_test.go          |   6 +-
 .../integration/subagent_dispatch_test.go     |   2 +-
 .../subagent_visibility_public_test.go        |   8 +-
 .../template_composition_public_test.go       |   7 +-
 .../template_null_selection_public_test.go    |   7 +-
 .../token_usage_integration_test.go           |  10 +-
 .../integration/tool_policy_native_test.go    |   4 +-
 .../integration/tool_search_native_test.go    |   6 +-
 .../tests/integration/turn_events_test.go     |   2 +-
 .../unified_model_configuration_http_test.go  |   4 +-
 .../unstorable_text_public_test.go            |   4 +-
 .../tests/integration/vaults_fixture_test.go  |   8 +-
 .../whitespace_input_public_test.go           |  18 +--
 .../tests/integration/worker_capacity_test.go |   4 +-
 .../tests/integration/worker_fixture_test.go  | 112 ++++++++++++++
 .../integration/worker_input_race_test.go     |   2 +-
 .../integration/worker_lease_loss_test.go     |   4 +-
 .../worker_preparation_failure_test.go        |   6 +-
 .../tests/integration/worker_wakeup_test.go   |   4 +-
 147 files changed, 856 insertions(+), 988 deletions(-)
 delete mode 100644 services/core/tests/integration/fixture_db_test.go
 delete mode 100644 services/core/tests/integration/sessions_fixture_test.go
 create mode 100644 services/core/tests/integration/worker_fixture_test.go

diff --git a/services/core/tests/integration/admin_session_archive_test.go b/services/core/tests/integration/admin_session_archive_test.go
index 85e4024e9..df75725eb 100644
--- a/services/core/tests/integration/admin_session_archive_test.go
+++ b/services/core/tests/integration/admin_session_archive_test.go
@@ -44,7 +44,7 @@ func managedArchiveFixture(t *testing.T) (*Store, *Store, string) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	installation := uuid.NewString()
 	changes := deploymentExecution(t, w)
diff --git a/services/core/tests/integration/admin_session_archive_worker_http_test.go b/services/core/tests/integration/admin_session_archive_worker_http_test.go
index 6f586d67b..134fd92d0 100644
--- a/services/core/tests/integration/admin_session_archive_worker_http_test.go
+++ b/services/core/tests/integration/admin_session_archive_worker_http_test.go
@@ -36,11 +36,10 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	s.SetPlacement(fixtureRules(t, db))
+	s := NewWithCredentialCipher(pool, cipher)
 	installation := uuid.NewString()
 	provider := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	deployments := fixtureDeployment(t, db)
+	deployments := deploymentService(t, s)
 	providerConfig := func(setup deployment.Setup) *execution.RuntimeProvider {
 		return &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: provider}
 	}
@@ -57,11 +56,11 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	owner, err := fixtureOwner(db, lease)
+	owner, err := fixtureOwner(s, lease)
 	if err != nil {
 		t.Fatal(errors.Join(err, lease.Close(t.Context())))
 	}
-	worker := startOwnedWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration}, owner)
+	worker := startOwnedWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration}, owner)
 	var once sync.Once
 	stop := func() {
 		once.Do(func() {
@@ -77,7 +76,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	}
 	projectID := uuid.NewString()
 	ctx := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "fixture-admin", ProjectID: projectID, RequestID: uuid.NewString(), TraceID: uuid.NewString()})
-	_, management := fixtureProjects(t, db)
+	_, management := fixtureProjects(t, s)
 	project, err := management.CreateProject(ctx, projects.CreateProject{ID: projectID, Name: "Archive HTTP fixture"})
 	if err != nil {
 		t.Fatal(err)
@@ -103,7 +102,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, s, db, nil, "codex", storeKeys(s), workerExecution(t, worker), func(d *api.Dependencies) { d.Execution.SessionArchive = owner.Deployment }, withCoreKeys(admin))
+	handler, err := publicHandler(t, s, nil, "codex", storeKeys(s), workerExecution(t, worker), func(d *api.Dependencies) { d.Execution.SessionArchive = owner.Deployment }, withCoreKeys(admin))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -121,7 +120,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if w.Code != http.StatusOK || json.Unmarshal(w.Body.Bytes(), &archived) != nil || archived.State != "cleanup_pending" || archived.SessionID != active.ID {
 		t.Fatalf("archive failed: %d %s", w.Code, w.Body)
 	}
-	allocation, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: project.TenantID, EnvironmentID: active.Environment.ID})
+	allocation, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: project.TenantID, EnvironmentID: active.Environment.ID})
 	if err != nil || allocation.ID != allocated.ID || allocation.State != "cleanup_pending" {
 		t.Fatal("archive did not retain cleanup ownership", allocation, err)
 	}
diff --git a/services/core/tests/integration/agent_execution_defaults_http_test.go b/services/core/tests/integration/agent_execution_defaults_http_test.go
index eeff542fc..28f587c6c 100644
--- a/services/core/tests/integration/agent_execution_defaults_http_test.go
+++ b/services/core/tests/integration/agent_execution_defaults_http_test.go
@@ -18,13 +18,12 @@ import (
 func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 	_, pool := testStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{19}, 32))
-	st, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	st.SetPlacement(fixtureRules(t, db))
+	st := NewWithCredentialCipher(pool, cipher)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "defaults-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	deployment := &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://deployment.example/v1", APIKey: "deployment-canary"}
 	defaultsCalls := 0
-	handler, err := publicHandler(t, st, db, auth, "codex", storeExecution(t, st), managedSandboxes(t, db), withHarnesses([]string{"codex", "claude_sdk", "mcode"}), modelProviderDefaults(func(context.Context, string) (*modelconfiguration.Snapshot, error) {
+	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), managedSandboxes(t, st), withHarnesses([]string{"codex", "claude_sdk", "mcode"}), modelProviderDefaults(func(context.Context, string) (*modelconfiguration.Snapshot, error) {
 		defaultsCalls++
 		copy := *deployment
 		return &modelconfiguration.Snapshot{Model: "fixture", Provider: &copy, Revision: uuid.New()}, nil
diff --git a/services/core/tests/integration/agents_delete_public_test.go b/services/core/tests/integration/agents_delete_public_test.go
index 87ea12a0e..0f37041d4 100644
--- a/services/core/tests/integration/agents_delete_public_test.go
+++ b/services/core/tests/integration/agents_delete_public_test.go
@@ -17,20 +17,20 @@ func TestAgentDeletionOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := New(db.pool), fixtureDB{pool: db.pool}
-	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex", storeExecution(t, recoveredStore))
+	recoveredStore := New(s.pool)
+	h, err = publicHandler(t, recoveredStore, auth, "codex", storeExecution(t, recoveredStore))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/agents_update_public_test.go b/services/core/tests/integration/agents_update_public_test.go
index c6f49158f..651a044b1 100644
--- a/services/core/tests/integration/agents_update_public_test.go
+++ b/services/core/tests/integration/agents_update_public_test.go
@@ -17,20 +17,20 @@ func TestAgentUpdateOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := New(db.pool), fixtureDB{pool: db.pool}
-	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex", storeExecution(t, recoveredStore))
+	recoveredStore := New(s.pool)
+	h, err = publicHandler(t, recoveredStore, auth, "codex", storeExecution(t, recoveredStore))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/archive_cancellation_test.go b/services/core/tests/integration/archive_cancellation_test.go
index d5aa6bf2b..0b64fef50 100644
--- a/services/core/tests/integration/archive_cancellation_test.go
+++ b/services/core/tests/integration/archive_cancellation_test.go
@@ -36,8 +36,8 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 	for _, scenario := range []string{"receipt_without_heartbeat", "heartbeat_before_receipt", "done_heartbeat_ack", "ack_commit_blocked", "rotated", "expired", "transport_lost", "negative_ack", "missing_outcome", "revoke_before_archive", "cancel_revoke_archive", "revoke_after_archive", "revoke_concurrent_archive"} {
 		t.Run(scenario, func(t *testing.T) {
 			heartbeat := scenario != "receipt_without_heartbeat"
-			s, db := newManagedTestStoreDB(t)
-			leased := executionOwner(t, db)
+			s, _ := newManagedTestStore(t)
+			leased := executionOwner(t, s)
 			t.Cleanup(func() {
 				if err := leased.Lease.Close(context.Background()); err != nil {
 					t.Error(err)
@@ -52,7 +52,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			}
 			projectID := uuid.NewString()
 			auditCtx := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "fixture-admin", ProjectID: projectID, RequestID: uuid.NewString(), TraceID: uuid.NewString()})
-			_, management := fixtureProjects(t, db)
+			_, management := fixtureProjects(t, s)
 			project, err := management.CreateProject(auditCtx, projects.CreateProject{ID: projectID, Name: "Archive diagnosis"})
 			if err != nil {
 				t.Fatal(err)
@@ -85,7 +85,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			}
 			server := httptest.NewUnstartedServer(nil)
 			wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-			handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), fixtureSessionStore(db), wsURL)
+			handler, registry, err := runtime.NewGateway(sessionAdapter(s), sessionService(t, s), sessionAdapter(s), wsURL)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -99,11 +99,12 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				t.Fatal(err)
 			}
 			t.Cleanup(func() { conn.Close() })
-			sessionStore, service, err := fixtureSessions(db)
+			sessionStore := sessionAdapter(s)
+			service, err := newSessionService(s)
 			if err != nil {
 				t.Fatal(err)
 			}
-			h := &dispatchHarness{t: t, s: s, db: db, lease: leased.Lease, owned: &leased, tenant: project.TenantID, session: session, conn: conn, registry: registry, d: &execution.Dispatcher{Registry: registry, Observer: modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher), Sessions: service, SessionsReader: sessionStore}}
+			h := &dispatchHarness{t: t, s: s, lease: leased.Lease, owned: &leased, tenant: project.TenantID, session: session, conn: conn, registry: registry, d: &execution.Dispatcher{Registry: registry, Observer: modelconfigurationpg.New(pgunit.NewPool(s.pool), s.credentialCipher), Sessions: service, SessionsReader: sessionStore}}
 			h.d = h.bound()
 			capabilities := workerEnvironmentCapabilities()
 			capabilities.FunctionTools = proto.CapabilitySupported
@@ -146,14 +147,14 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				}
 			}
 			if scenario == "revoke_before_archive" || scenario == "cancel_revoke_archive" {
-				if err := fixtureSessionService(t, db).RevokeDevice(t.Context(), h.tenant, owner.DeviceID); err != nil {
+				if err := sessionService(t, s).RevokeDevice(t.Context(), h.tenant, owner.DeviceID); err != nil {
 					t.Fatal(err)
 				}
 			}
 			var revokeDone chan error
 			if scenario == "revoke_concurrent_archive" {
 				revokeDone = make(chan error, 1)
-				go func() { revokeDone <- fixtureSessionService(t, db).RevokeDevice(t.Context(), h.tenant, owner.DeviceID) }()
+				go func() { revokeDone <- sessionService(t, s).RevokeDevice(t.Context(), h.tenant, owner.DeviceID) }()
 			}
 
 			archived, err := leased.Deployment.ArchiveSession(auditCtx, h.tenant, session.ID, 1)
@@ -166,7 +167,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				}
 			}
 			if scenario == "revoke_after_archive" {
-				if err := fixtureSessionService(t, db).RevokeDevice(t.Context(), h.tenant, owner.DeviceID); err != nil {
+				if err := sessionService(t, s).RevokeDevice(t.Context(), h.tenant, owner.DeviceID); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -184,7 +185,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			if err != nil || current.Status != sessions.TurnWaiting || current.CancelRequestedAt.IsZero() {
 				t.Fatal("archive must request rather than invent cancellation", current, err)
 			}
-			if _, err := runtimegateway.NewAuthenticator(fixtureSessionStore(db)).AuthenticateBearer(t.Context(), owner.DeviceID, secret); !errors.Is(err, runtimegateway.ErrAuthUnknownDevice) {
+			if _, err := runtimegateway.NewAuthenticator(sessionAdapter(s)).AuthenticateBearer(t.Context(), owner.DeviceID, secret); !errors.Is(err, runtimegateway.ErrAuthUnknownDevice) {
 				t.Fatal("archive allowed renewed authority", err)
 			}
 			rejected, response, dialErr := websocket.DefaultDialer.Dial(u.String(), http.Header{"Authorization": {"Bearer " + secret}})
@@ -197,11 +198,11 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			if dialErr == nil || response == nil || response.StatusCode != http.StatusUnauthorized {
 				t.Fatal("revoked Runtime reconnected")
 			}
-			drain, err := fixtureSessionStore(db).ArchivedCancellationReceipt(t.Context(), owner.DeviceID, secret, nil)
+			drain, err := sessionAdapter(s).ArchivedCancellationReceipt(t.Context(), owner.DeviceID, secret, nil)
 			if err != nil || drain.RunID != "" {
 				t.Fatal("unowned delivery got receipt permission", drain, err)
 			}
-			drain, err = fixtureSessionStore(db).ArchivedCancellationReceipt(t.Context(), owner.DeviceID, runtimedevice.HashCredential(secret), []string{input.TurnID})
+			drain, err = sessionAdapter(s).ArchivedCancellationReceipt(t.Context(), owner.DeviceID, runtimedevice.HashCredential(secret), []string{input.TurnID})
 			if err != nil || (drain.RunID == input.TurnID) == strings.Contains(scenario, "revoke") {
 				t.Fatal("archive revocation causality lost", drain, err)
 			}
@@ -218,18 +219,18 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				t.Fatal("missing cancel delivery identity")
 			}
 			if scenario == "rotated" {
-				if _, err := db.pool.Exec(t.Context(), "UPDATE devices SET credential_hash=$2 WHERE id=$1", owner.DeviceID, runtimedevice.HashCredential(uuid.NewString())); err != nil {
+				if _, err := s.pool.Exec(t.Context(), "UPDATE devices SET credential_hash=$2 WHERE id=$1", owner.DeviceID, runtimedevice.HashCredential(uuid.NewString())); err != nil {
 					t.Fatal(err)
 				}
 			}
 			if scenario == "expired" {
-				if _, err := db.pool.Exec(t.Context(), "UPDATE turns SET cancel_requested_at=clock_timestamp()-interval '21 seconds' WHERE id=$1", input.TurnID); err != nil {
+				if _, err := s.pool.Exec(t.Context(), "UPDATE turns SET cancel_requested_at=clock_timestamp()-interval '21 seconds' WHERE id=$1", input.TurnID); err != nil {
 					t.Fatal(err)
 				}
 			}
 			var unlockCommit func()
 			if scenario == "ack_commit_blocked" {
-				tx, err := db.pool.Begin(t.Context())
+				tx, err := s.pool.Begin(t.Context())
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -269,7 +270,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				// Observe actual SQL lock contention, not an assumed timing delay.
 				for deadline := time.Now().Add(3 * time.Second); ; {
 					var blocked bool
-					if err := db.pool.QueryRow(t.Context(), "SELECT EXISTS (SELECT 1 FROM pg_stat_activity WHERE datname=current_database() AND wait_event_type='Lock' AND query ILIKE '%session_devices%')").Scan(&blocked); err != nil {
+					if err := s.pool.QueryRow(t.Context(), "SELECT EXISTS (SELECT 1 FROM pg_stat_activity WHERE datname=current_database() AND wait_event_type='Lock' AND query ILIKE '%session_devices%')").Scan(&blocked); err != nil {
 						t.Fatal(err)
 					}
 					if blocked {
@@ -302,7 +303,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			}
 
 			var receipts int
-			if err := db.pool.QueryRow(t.Context(), "SELECT count(*) FROM turn_events WHERE turn_id=$1 AND kind='cancel_receipt'", input.TurnID).Scan(&receipts); err != nil {
+			if err := s.pool.QueryRow(t.Context(), "SELECT count(*) FROM turn_events WHERE turn_id=$1 AND kind='cancel_receipt'", input.TurnID).Scan(&receipts); err != nil {
 				t.Fatal(err)
 			}
 			wantReceipts := 1
@@ -314,12 +315,12 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 			}
 			// The original cleanup owner survives every delivery outcome; only
 			// provider receipts can release its resources.
-			allocation, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: h.tenant, EnvironmentID: session.Environment.ID})
+			allocation, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: h.tenant, EnvironmentID: session.Environment.ID})
 			if err != nil || allocation.State != "cleanup_pending" {
 				t.Fatal(allocation, err)
 			}
 			var revoked bool
-			if err := db.pool.QueryRow(t.Context(), "SELECT revoked_at IS NOT NULL FROM devices WHERE id=$1", owner.DeviceID).Scan(&revoked); err != nil || !revoked {
+			if err := s.pool.QueryRow(t.Context(), "SELECT revoked_at IS NOT NULL FROM devices WHERE id=$1", owner.DeviceID).Scan(&revoked); err != nil || !revoked {
 				t.Fatal(revoked, err)
 			}
 		})
diff --git a/services/core/tests/integration/claude_execution_test.go b/services/core/tests/integration/claude_execution_test.go
index e298a94a4..648969f7c 100644
--- a/services/core/tests/integration/claude_execution_test.go
+++ b/services/core/tests/integration/claude_execution_test.go
@@ -22,7 +22,7 @@ func claudeSession(t *testing.T, h *dispatchHarness, configuration string, prebo
 		t.Fatal(err)
 	}
 	if prebound {
-		if err := bindSessionDevice(t, h.db, h.tenant, h.session.ID, h.device.ID); err != nil {
+		if err := bindSessionDevice(t, h.s, h.tenant, h.session.ID, h.device.ID); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -54,7 +54,7 @@ func TestClaudeWorkerSelectsStoredEngineAndRestrictiveCapabilities(t *testing.T)
 			input := h.message("start", "Look up ticket")
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
-			worker := startWorker(t, ctx, h.db, h.d)
+			worker := startWorker(t, ctx, h.s, h.d)
 			done := make(chan error, 1)
 			go func() { done <- worker.Run(ctx) }()
 			defer func() {
@@ -72,7 +72,7 @@ func TestClaudeWorkerSelectsStoredEngineAndRestrictiveCapabilities(t *testing.T)
 					t.Fatal(turn, err)
 				}
 				if !prebound {
-					if _, err := fixtureSessionStore(h.db).GetSessionDevice(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+					if _, err := sessionAdapter(h.s).GetSessionDevice(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 						t.Fatal("bound an incapable device", err)
 					}
 				}
@@ -122,7 +122,7 @@ func TestClaudeDispatcherRejectsUnsupportedConfigurationBeforeClaim(t *testing.T
 func TestClaudeInvalidImageResultRejectsWholeBatchBeforePersistence(t *testing.T) {
 	h := newDispatchHarness(t)
 	claudeSession(t, h, functionConfiguration, false)
-	worker := startOwnedWorker(t, t.Context(), h.db, h.d, h.owner())
+	worker := startOwnedWorker(t, t.Context(), h.s, h.d, h.owner())
 	defer func() { ctx, cancel := context.WithCancel(context.Background()); cancel(); _ = worker.Run(ctx) }()
 	input := h.message("start", "Run")
 	if _, err := transitionTurn(t.Context(), h.s, h.tenant, h.session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
@@ -143,7 +143,7 @@ func TestClaudeInvalidImageResultRejectsWholeBatchBeforePersistence(t *testing.T
 	if _, err := worker.SubmitInputs(t.Context(), h.tenant, h.session.ID, "batch", batch); !errors.Is(err, sessions.ErrInvalidInput) {
 		t.Fatal(err)
 	}
-	saved, err := FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, call.CallID)
+	saved, err := FixtureFunctionCall(t.Context(), h.s.pool, h.tenant, h.session.ID, input.TurnID, call.CallID)
 	if err != nil || saved.Result != nil || saved.Applied {
 		t.Fatal(saved, err)
 	}
diff --git a/services/core/tests/integration/claude_mcp_test.go b/services/core/tests/integration/claude_mcp_test.go
index f9d9f7a0e..32a18777a 100644
--- a/services/core/tests/integration/claude_mcp_test.go
+++ b/services/core/tests/integration/claude_mcp_test.go
@@ -43,7 +43,7 @@ func TestClaudeMCPWaitsForCapableRuntime(t *testing.T) {
 				}
 				ctx, cancel := context.WithCancel(t.Context())
 				defer cancel()
-				worker := startOwnedWorker(t, ctx, h.db, h.d, h.owner())
+				worker := startOwnedWorker(t, ctx, h.s, h.d, h.owner())
 				done := make(chan error, 1)
 				go func() { done <- worker.Run(ctx) }()
 				defer func() {
@@ -60,7 +60,7 @@ func TestClaudeMCPWaitsForCapableRuntime(t *testing.T) {
 					t.Fatal("incapable runtime claimed work", turn, err)
 				}
 				if !prebound {
-					if _, err := fixtureSessionStore(h.db).GetSessionDevice(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+					if _, err := sessionAdapter(h.s).GetSessionDevice(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 						t.Fatal("bound an incapable runtime", err)
 					}
 				}
diff --git a/services/core/tests/integration/command_output_test.go b/services/core/tests/integration/command_output_test.go
index ca65f2527..01406737e 100644
--- a/services/core/tests/integration/command_output_test.go
+++ b/services/core/tests/integration/command_output_test.go
@@ -15,7 +15,7 @@ import (
 func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	ctx := context.Background()
 	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "command-output"})
 	if err != nil {
@@ -53,7 +53,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	if before != after {
 		t.Fatal("rollback published output")
 	}
-	page, err := sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+	page, err := sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 2 {
 		t.Fatalf("read draft: %+v %v", page, err)
 	}
@@ -75,7 +75,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	// Reopening the Store recovers committed Items without creating events.
 	reopened := New(pool)
 	before, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
-	page, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+	page, err = sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 3 {
 		t.Fatalf("recovery: %+v %v", page, err)
 	}
@@ -144,7 +144,7 @@ func TestExecutionJournalsCommandOutputBeforeCancellation(t *testing.T) {
 	}
 	h.write(input.TurnID, proto.TypeInteractionDecisionAck, proto.InteractionDecisionAckPayload{DeliveryID: cancel.DeliveryID, Applied: true, Outcome: &proto.DonePayload{}})
 	h.finished(result, sessions.TurnCancelled)
-	page, err := sessionReads(h.db.pool).ListItems(ctx, h.tenant, h.session.ID, "", 100, true)
+	page, err := sessionAdapter(h.s).ListItems(ctx, h.tenant, h.session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 2 || page.Items[1].Status != "incomplete" || page.Items[1].Output != "partial" {
 		t.Fatalf("journal/cancellation lost partial output: %+v %v", page, err)
 	}
diff --git a/services/core/tests/integration/configuration_validation_public_test.go b/services/core/tests/integration/configuration_validation_public_test.go
index c3ef553c8..e1bbe8f26 100644
--- a/services/core/tests/integration/configuration_validation_public_test.go
+++ b/services/core/tests/integration/configuration_validation_public_test.go
@@ -24,13 +24,13 @@ func TestAgentConfigurationValidationRejectsWithoutWritesPostgres(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "config-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "config-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -43,7 +43,7 @@ func TestAgentConfigurationValidationRejectsWithoutWritesPostgres(t *testing.T)
 	saved := func(tools string) string {
 		return `{"model":"config-model","name":null,"instructions":null,"multi_agent":{"enabled":false,"max_concurrent_subagents":null},"reasoning":{},"service_tier":"auto","text":{"format":{"type":"text"},"verbosity":"medium"},"tools":` + tools + `}`
 	}
-	_, agentService := fixtureAgents(t, db)
+	_, agentService := fixtureAgents(t, s)
 	legacy, err := agentService.Create(t.Context(), agents.CreateCommand{TenantID: ownerTenant, Metadata: map[string]string{}, Configuration: json.RawMessage(saved(`[{"type":"function","name":"lookup","description":"","parameters":{"type":"string"},"defer_loading":false}]`))})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/creation_stream_settlement_public_test.go b/services/core/tests/integration/creation_stream_settlement_public_test.go
index 98f6043fd..63e64c863 100644
--- a/services/core/tests/integration/creation_stream_settlement_public_test.go
+++ b/services/core/tests/integration/creation_stream_settlement_public_test.go
@@ -113,10 +113,10 @@ func (s sseLines) open(t *testing.T) {
 // creation stream whose initial reservation is cancelled without a Session event
 // ends through the committed projection, while GET stays open.
 func TestCreationStreamPublicLifetimes(t *testing.T) {
-	s, db := newModelTestStoreDB(t)
+	s, _ := NewModelTestStore(t)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
-	handler, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), executorURL("https://offline-executor.example"))
+	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://offline-executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -127,7 +127,7 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 		handler.ServeHTTP(w, r)
 	}))
 	defer server.Close()
-	sessionExecution := executionOwner(t, db).Sessions
+	sessionExecution := executionOwner(t, s).Sessions
 	connect := func(environment string) {
 		t.Helper()
 		generation := uuid.NewString()
@@ -203,7 +203,7 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 	}
 	fresh.open(t)
 	var reservation string
-	if err := db.pool.QueryRow(t.Context(), "SELECT id FROM environment_input_reservations WHERE session_id=$1 AND is_initial", session).Scan(&reservation); err != nil {
+	if err := s.pool.QueryRow(t.Context(), "SELECT id FROM environment_input_reservations WHERE session_id=$1 AND is_initial", session).Scan(&reservation); err != nil {
 		t.Fatal(err)
 	}
 	cursor, err := sessionAdapter(s).SessionEventCursor(t.Context(), tenant, session)
diff --git a/services/core/tests/integration/credential_matrix_http_test.go b/services/core/tests/integration/credential_matrix_http_test.go
index 395828d20..d424fc7d4 100644
--- a/services/core/tests/integration/credential_matrix_http_test.go
+++ b/services/core/tests/integration/credential_matrix_http_test.go
@@ -28,23 +28,22 @@ import (
 // the Core key in /core/v1, and node and executor credentials only on their
 // own /api/v1 machine connection routes.
 func TestCredentialNamespaceMatrix(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	db.publicURL = "https://core.example"
-	s.SetPlacement(fixtureRules(t, db))
+	s, _ := newManagedTestStore(t)
+	s.SetPlacement(placementRules(t, "https://core.example"))
 	ctx := t.Context()
 	coreKey := uuid.NewString()
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential(coreKey)})
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, s, db, nil, "codex", storeKeys(s), storeExecution(t, s), managedSandboxes(t, db), withCoreKeys(admin))
+	handler, err := publicHandler(t, s, nil, "codex", storeKeys(s), storeExecution(t, s), managedSandboxes(t, s), withCoreKeys(admin))
 	if err != nil {
 		t.Fatal(err)
 	}
 	// The server composition: daemon transport beside the API handler.
 	mux := http.NewServeMux()
-	mux.Handle("/api/v1/agent-daemon/enroll", runtimeenrollment.EnrollmentHandler(fixtureSessionService(t, db)))
-	mux.Handle("/api/v1/agent-daemon/connection", runtimeenrollment.ConnectionHandler(fixtureSessionStore(db), runtimegateway.NewRegistry()))
+	mux.Handle("/api/v1/agent-daemon/enroll", runtimeenrollment.EnrollmentHandler(sessionService(t, s)))
+	mux.Handle("/api/v1/agent-daemon/connection", runtimeenrollment.ConnectionHandler(sessionAdapter(s), runtimegateway.NewRegistry()))
 	mux.Handle("/", handler)
 	server := api.CanonicalPaths(mux)
 	call := func(method, path, token, body string) *httptest.ResponseRecorder {
@@ -71,7 +70,7 @@ func TestCredentialNamespaceMatrix(t *testing.T) {
 	created("POST", "/core/v1/projects/"+project.ID+"/keys", coreKey, `{"name":"application"}`, &projectKey)
 
 	// An executor credential for a self_hosted Session of that Project.
-	binding, err := projectpg.New(pgunit.NewPool(db.pool)).GetProject(ctx, project.ID)
+	binding, err := projectpg.New(pgunit.NewPool(s.pool)).GetProject(ctx, project.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -80,7 +79,7 @@ func TestCredentialNamespaceMatrix(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	environment, err := fixtureSessionStore(db).GetSessionEnvironment(ctx, binding.Principal.TenantID, session.ID)
+	environment, err := sessionAdapter(s).GetSessionEnvironment(ctx, binding.Principal.TenantID, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -88,7 +87,7 @@ func TestCredentialNamespaceMatrix(t *testing.T) {
 	created("POST", "/core/v1/projects/"+project.ID+"/environments/"+environment.ID+"/executor-credentials", coreKey, `{"key_id":"`+uuid.NewString()+`"}`, &executor)
 
 	// A node credential: a Docker deployment, an enrollment token issued with the Core key, and an enrolled node.
-	deployments := fixtureDeployment(t, db)
+	deployments := deploymentService(t, s)
 	installation := uuid.NewString()
 	provider := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	runtimes := execution.NewDeferredRuntimeProvider(installation, func(ctx context.Context) (*execution.RuntimeProvider, error) {
@@ -100,7 +99,7 @@ func TestCredentialNamespaceMatrix(t *testing.T) {
 	}, func(_ context.Context, setup deployment.Setup) (execution.PreparedRuntimeDeployment, error) {
 		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: provider}}, nil
 	})
-	worker := startWorker(t, ctx, db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: runtimes})
+	worker := startWorker(t, ctx, s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: runtimes})
 	var stop sync.Once
 	t.Cleanup(func() {
 		stop.Do(func() {
diff --git a/services/core/tests/integration/deployment_fixture_test.go b/services/core/tests/integration/deployment_fixture_test.go
index 5b35597c9..25018ae00 100644
--- a/services/core/tests/integration/deployment_fixture_test.go
+++ b/services/core/tests/integration/deployment_fixture_test.go
@@ -27,20 +27,10 @@ func placementRules(t testing.TB, publicURL string) *placement.Rules {
 	return rules
 }
 
-// withPlacement gives s the placement rules cmd/server builds on the built-in
-// providers and an unset public URL, and returns s.
-func withPlacement(t testing.TB, s *Store) *Store {
-	t.Helper()
-	s.SetPlacement(placementRules(t, ""))
-	return s
-}
-
-// deploymentService builds the deployment service as cmd/server does, on s's
-// database, credential key and placement rules.
+// deploymentService is fixtureDeploymentService(s) for a test.
 func deploymentService(t testing.TB, s *Store) *deployment.Service {
 	t.Helper()
-	adapter := deploymentStore(s)
-	service, err := deployment.NewService(adapter, adapter, providers.Builtin(), s.placement)
+	service, err := fixtureDeploymentService(s)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -54,7 +44,7 @@ func deploymentExecution(t testing.TB, w *Store) *deployment.ExecutionOperations
 	if w.lease == nil {
 		t.Fatal("deployment execution operations need an execution writer")
 	}
-	operations, err := deployment.NewExecutionOperations(deploymentService(t, w), deploymentpg.NewExecution(w.lease, w.credentialCipher))
+	_, operations, err := fixtureDeploymentExecution(w, w.lease)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/deployment_model_providers_http_test.go b/services/core/tests/integration/deployment_model_providers_http_test.go
index a9c561762..7e25421a1 100644
--- a/services/core/tests/integration/deployment_model_providers_http_test.go
+++ b/services/core/tests/integration/deployment_model_providers_http_test.go
@@ -34,19 +34,18 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 		t.Fatal(err)
 	}
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{53}, 32))
-	st, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	st.SetPlacement(fixtureRules(t, db))
+	st := NewWithCredentialCipher(pool, cipher)
 	tenant, projectKey, coreKey := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "defaults-http", TokenSHA256: runtimedevice.HashCredential(projectKey), TenantID: tenant}})
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential(coreKey)})
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, st, db, auth, "codex", storeExecution(t, st), managedSandboxes(t, db), withCoreKeys(admin), withHarnesses([]string{"codex", "mcode"}))
+	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), managedSandboxes(t, st), withCoreKeys(admin), withHarnesses([]string{"codex", "mcode"}))
 	if err != nil {
 		t.Fatal(err)
 	}
-	defaults := deploymentDefaults(t, db)
+	defaults := deploymentDefaults(t, st)
 	call := func(method, path, key, body string, status int) map[string]json.RawMessage {
 		t.Helper()
 		r := httptest.NewRequest(method, path, strings.NewReader(body))
@@ -247,7 +246,7 @@ func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	worker, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	worker, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	defer stop()
 	_, pool := testStore(t)
 	reservations := func() int {
@@ -290,18 +289,18 @@ func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
 // recorded first: a same-key retry returns the committed Session after the
 // default was replaced or removed.
 func TestNoneSessionRetryAfterDeploymentDefaultChanges(t *testing.T) {
-	st, db := newModelTestStoreDB(t)
-	if _, err := db.pool.Exec(t.Context(), "DELETE FROM deployment_model_providers"); err != nil {
+	st, _ := NewModelTestStore(t)
+	if _, err := st.pool.Exec(t.Context(), "DELETE FROM deployment_model_providers"); err != nil {
 		t.Fatal(err)
 	}
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "none-retry", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
-	handler, err := publicHandler(t, st, db, auth, "codex", storeExecution(t, st))
+	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st))
 	if err != nil {
 		t.Fatal(err)
 	}
 	admin := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "abcd1234", RequestID: "none-retry", TraceID: "none-retry"})
-	defaults := deploymentDefaults(t, db)
+	defaults := deploymentDefaults(t, st)
 	setDefault := func(key string) {
 		t.Helper()
 		if _, err := defaults.Replace(admin, modelconfiguration.Replacement{Harness: "codex", Configuration: v1.ModelConfigurationInput{ModelProvider: v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://deployment.example/v1", APIKey: key}, Model: "fixture"}}); err != nil {
@@ -351,18 +350,18 @@ func TestNoneSessionRetryAfterDeploymentDefaultChanges(t *testing.T) {
 		t.Fatal("retry changed the frozen provider", err)
 	}
 	var revision uuid.UUID
-	if err := db.pool.QueryRow(t.Context(), "SELECT deployment_provider_revision FROM session_execution_configuration WHERE session_id=$1", original).Scan(&revision); err != nil || revision != snapshot.Revision {
+	if err := st.pool.QueryRow(t.Context(), "SELECT deployment_provider_revision FROM session_execution_configuration WHERE session_id=$1", original).Scan(&revision); err != nil || revision != snapshot.Revision {
 		t.Fatal("API retry changed frozen revision", err)
 	}
 }
 
 func TestDeploymentProviderResolutionPairsRevisionDuringReplacement(t *testing.T) {
-	st, db := newManagedTestStoreDB(t)
+	st, _ := newManagedTestStore(t)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "tuple-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	admin := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "fixture-admin", RequestID: uuid.NewString(), TraceID: uuid.NewString()})
 	provider := v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://original.example/v1", APIKey: "original-fixture-key"}
-	defaults := deploymentDefaults(t, db)
+	defaults := deploymentDefaults(t, st)
 	if _, err := defaults.Replace(admin, modelconfiguration.Replacement{Harness: "codex", Configuration: v1.ModelConfigurationInput{ModelProvider: provider, Model: "fixture"}}); err != nil {
 		t.Fatal(err)
 	}
@@ -382,7 +381,7 @@ func TestDeploymentProviderResolutionPairsRevisionDuringReplacement(t *testing.T
 		_, err = defaults.Replace(admin, modelconfiguration.Replacement{Harness: harness, Configuration: v1.ModelConfigurationInput{ModelProvider: replacement, Model: "fixture"}})
 		return snapshot, err
 	}
-	handler, err := publicHandler(t, st, db, auth, "codex", storeExecution(t, st), modelProviderDefaults(resolver))
+	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), modelProviderDefaults(resolver))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -397,7 +396,7 @@ func TestDeploymentProviderResolutionPairsRevisionDuringReplacement(t *testing.T
 		t.Fatalf("creation failed: %d %s", w.Code, w.Body)
 	}
 	var revision uuid.UUID
-	if err = db.pool.QueryRow(t.Context(), "SELECT deployment_provider_revision FROM session_execution_configuration WHERE session_id=$1", session.ID).Scan(&revision); err != nil || revision != original.Revision {
+	if err = st.pool.QueryRow(t.Context(), "SELECT deployment_provider_revision FROM session_execution_configuration WHERE session_id=$1", session.ID).Scan(&revision); err != nil || revision != original.Revision {
 		t.Fatal("tuple revision changed", err)
 	}
 	frozen, err := sessionAdapter(st).SessionModelExecution(t.Context(), tenant, session.ID)
@@ -430,11 +429,11 @@ func TestDeploymentProviderResolutionFixtureIsolation(t *testing.T) {
 	}
 }
 
-// deploymentDefaults serves deployment default model configurations from db,
+// deploymentDefaults serves deployment default model configurations from s,
 // as the Core routes do.
-func deploymentDefaults(t *testing.T, db fixtureDB) *modelconfiguration.Service {
+func deploymentDefaults(t *testing.T, s *Store) *modelconfiguration.Service {
 	t.Helper()
-	service, err := modelconfiguration.NewService(modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher))
+	service, err := modelconfiguration.NewService(modelconfigurationpg.New(pgunit.NewPool(s.pool), s.credentialCipher))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/deployment_public_fixture_test.go b/services/core/tests/integration/deployment_public_fixture_test.go
index dff1550b7..b1ce77186 100644
--- a/services/core/tests/integration/deployment_public_fixture_test.go
+++ b/services/core/tests/integration/deployment_public_fixture_test.go
@@ -4,52 +4,23 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 )
 
-// fixtureDeployment builds the deployment service on db, as cmd/server does.
-func fixtureDeployment(t testing.TB, db fixtureDB) *deployment.Service {
-	t.Helper()
-	service, err := fixtureDeploymentService(db)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return service
-}
-
-func fixtureDeploymentService(db fixtureDB) (*deployment.Service, error) {
-	rules, err := placement.NewRules(providers.Builtin(), db.publicURL)
-	if err != nil {
-		return nil, err
-	}
-	adapter := deploymentpg.New(pgunit.NewPool(db.pool), db.cipher)
-	return deployment.NewService(adapter, adapter, providers.Builtin(), rules)
-}
-
-// fixtureRules builds the placement rules on db's public URL, as cmd/server
-// does for the Store's Session creation.
-func fixtureRules(t testing.TB, db fixtureDB) *placement.Rules {
-	t.Helper()
-	rules, err := placement.NewRules(providers.Builtin(), db.publicURL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return rules
-}
-
-// fixtureReader is the deployment reader on db, as cmd/server builds it.
-func fixtureReader(db fixtureDB) *deploymentpg.Store {
-	return deploymentpg.New(pgunit.NewPool(db.pool), db.cipher)
+// fixtureDeploymentService builds the deployment service as cmd/server does, on
+// s's database, credential key and placement rules.
+func fixtureDeploymentService(s *Store) (*deployment.Service, error) {
+	adapter := deploymentStore(s)
+	return deployment.NewService(adapter, adapter, providers.Builtin(), s.placement)
 }
 
 // fixtureOwnerEpoch reads the execution owner epoch from the deployment store,
 // as cmd/server does to fence node connections.
-func fixtureOwnerEpoch(t testing.TB, db fixtureDB) uint64 {
+func fixtureOwnerEpoch(t testing.TB, s *Store) uint64 {
 	t.Helper()
-	epoch, err := deploymentpg.New(pgunit.NewPool(db.pool), db.cipher).OwnerEpoch(t.Context())
+	epoch, err := deploymentStore(s).OwnerEpoch(t.Context())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -58,11 +29,11 @@ func fixtureOwnerEpoch(t testing.TB, db fixtureDB) uint64 {
 
 // fixtureDeploymentExecution builds the pooled deployment service and the
 // deployment execution operations on lease, as cmd/server does for the Worker.
-func fixtureDeploymentExecution(db fixtureDB, lease *pgunit.Lease) (*deployment.Service, *deployment.ExecutionOperations, error) {
-	service, err := fixtureDeploymentService(db)
+func fixtureDeploymentExecution(s *Store, lease *pgunit.Lease) (*deployment.Service, *deployment.ExecutionOperations, error) {
+	service, err := fixtureDeploymentService(s)
 	if err != nil {
 		return nil, nil, err
 	}
-	changes, err := deployment.NewExecutionOperations(service, deploymentpg.NewExecution(lease, db.cipher))
+	changes, err := deployment.NewExecutionOperations(service, deploymentpg.NewExecution(lease, s.credentialCipher))
 	return service, changes, err
 }
diff --git a/services/core/tests/integration/dispatch_test.go b/services/core/tests/integration/dispatch_test.go
index e4b122c3b..40de3c693 100644
--- a/services/core/tests/integration/dispatch_test.go
+++ b/services/core/tests/integration/dispatch_test.go
@@ -30,7 +30,6 @@ type dispatchHarness struct {
 	admissions   map[string]fixtureAdmission
 	t            *testing.T
 	s            *Store
-	db           fixtureDB
 	d            *execution.Dispatcher
 	lease        execution.Ownership // held by tests that run execution operations without a Worker
 	owned        *execution.Owner    // the Owner that bound binds, acquired on first use
@@ -51,8 +50,8 @@ func newDispatchHarness(t *testing.T) *dispatchHarness {
 
 func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool) *dispatchHarness {
 	t.Helper()
-	s, db := newModelTestStoreDB(t)
-	h := &dispatchHarness{t: t, s: s, db: db, tenant: uuid.NewString(), environments: map[string]*dispatchHarness{}}
+	s, _ := NewModelTestStore(t)
+	h := &dispatchHarness{t: t, s: s, tenant: uuid.NewString(), environments: map[string]*dispatchHarness{}}
 	ctx := context.Background()
 	var err error
 	h.session, err = s.CreateSession(ctx, h.tenant, WithFixtureModelProvider(sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "session", Configuration: configuration}))
@@ -68,26 +67,26 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 	}
 	_ = json.Unmarshal(configuration, &snapshot)
 	if snapshot.Environment.Type == "self_hosted" {
-		h.device, h.credential = enrollFixtureSession(t, s, db, h.tenant, h.session)
+		h.device, h.credential = enrollFixtureSession(t, s, h.tenant, h.session)
 		secret = h.credential
 	} else if local {
-		environment, getErr := fixtureSessionStore(db).GetSessionEnvironment(ctx, h.tenant, h.session.ID)
+		environment, getErr := sessionAdapter(s).GetSessionEnvironment(ctx, h.tenant, h.session.ID)
 		if getErr != nil {
 			t.Fatal(getErr)
 		}
-		h.device, err = FixtureEnvironmentDevice(ctx, db.pool, h.tenant, environment.ID, "local runtime", runtimedevice.HashCredential(secret))
+		h.device, err = FixtureEnvironmentDevice(ctx, s.pool, h.tenant, environment.ID, "local runtime", runtimedevice.HashCredential(secret))
 	} else {
-		h.device, err = fixtureSessionService(t, db).CreateDevice(ctx, h.tenant, "isolated executor", runtimedevice.HashCredential(secret))
+		h.device, err = sessionService(t, s).CreateDevice(ctx, h.tenant, "isolated executor", runtimedevice.HashCredential(secret))
 	}
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err = bindSessionDevice(t, db, h.tenant, h.session.ID, h.device.ID); err != nil {
+	if err = bindSessionDevice(t, s, h.tenant, h.session.ID, h.device.ID); err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-	server.Config.Handler, h.registry, err = runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), fixtureSessionStore(db), wsURL)
+	server.Config.Handler, h.registry, err = runtime.NewGateway(sessionAdapter(s), sessionService(t, s), sessionAdapter(s), wsURL)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -115,11 +114,12 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 		}
 		time.Sleep(10 * time.Millisecond)
 	}
-	sessionStore, sessionService, err := fixtureSessions(db)
+	sessionStore := sessionAdapter(s)
+	sessionService, err := newSessionService(s)
 	if err != nil {
 		t.Fatal(err)
 	}
-	h.d = &execution.Dispatcher{Registry: h.registry, Observer: modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher), Sessions: sessionService, SessionsReader: sessionStore}
+	h.d = &execution.Dispatcher{Registry: h.registry, Observer: modelconfigurationpg.New(pgunit.NewPool(s.pool), s.credentialCipher), Sessions: sessionService, SessionsReader: sessionStore}
 	return h
 }
 
@@ -182,7 +182,7 @@ type runResult struct {
 func (h *dispatchHarness) owner() execution.Owner {
 	h.t.Helper()
 	if h.owned == nil {
-		owner := executionOwner(h.t, h.db)
+		owner := executionOwner(h.t, h.s)
 		h.owned = &owner
 	}
 	return *h.owned
@@ -259,13 +259,13 @@ func TestExecutionDispatchSteeringAndNativeContinuity(t *testing.T) {
 		t.Fatalf("missing result: %+v", outcome)
 	}
 	// Restart Core: a new Store and execution owner continue the native Session.
-	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, h.db.pool)
+	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, h.s.pool)
 	if err := h.owner().Lease.Close(ctx); err != nil {
 		t.Fatal(err)
 	}
 	awaitRelease()
-	newStore, db := newTestStoreDB(t)
-	h.s, h.db, h.owned = newStore, db, nil
+	newStore, _ := testStore(t)
+	h.s, h.owned = newStore, nil
 	bound, err := sessionAdapter(newStore).GetSessionExecutionBinding(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.NativeSessionID != "native-thread-1" {
 		t.Fatalf("native binding lost: %+v %v", bound, err)
diff --git a/services/core/tests/integration/environment_admission_test.go b/services/core/tests/integration/environment_admission_test.go
index 8229152ba..27e191352 100644
--- a/services/core/tests/integration/environment_admission_test.go
+++ b/services/core/tests/integration/environment_admission_test.go
@@ -23,7 +23,7 @@ func newEnvironmentAdmission(t *testing.T) (*dispatchHarness, *execution.Worker)
 	t.Helper()
 	h := newDispatchHarness(t)
 	enableWorkerEnvironment(t, h)
-	worker := startWorker(t, t.Context(), h.db, h.d)
+	worker := startWorker(t, t.Context(), h.s, h.d)
 	t.Cleanup(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/tests/integration/environment_claim_worker_test.go b/services/core/tests/integration/environment_claim_worker_test.go
index e7fd2c54e..522f5230a 100644
--- a/services/core/tests/integration/environment_claim_worker_test.go
+++ b/services/core/tests/integration/environment_claim_worker_test.go
@@ -15,9 +15,9 @@ import (
 func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 	for _, deleted := range []bool{false, true} {
 		t.Run(map[bool]string{false: "unbound", true: "deleted"}[deleted], func(t *testing.T) {
-			s, db := newTestStoreDB(t)
+			s, _ := testStore(t)
 			tenant, pending := newEnvironmentExpiryReservation(t, s)
-			owner := executionOwner(t, db)
+			owner := executionOwner(t, s)
 			got, err := owner.Sessions.PromoteEnvironmentInput(t.Context(), tenant, pending.SessionID, pending.ID)
 			if err != nil || len(got.Receipts) != 1 || got.Receipts[0].Replayed {
 				t.Fatal(got, err)
@@ -36,15 +36,15 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 				t.Fatal("promotion did not retain the active claim", turn, err)
 			}
 			// Simulate owner loss after commit, without sending any daemon Start.
-			awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, db.pool)
+			awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, s.pool)
 			if err := owner.Lease.Close(t.Context()); err != nil {
 				t.Fatal(err)
 			}
 			awaitRelease()
-			restarted := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
+			restarted := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 			stopped, cancel := context.WithCancel(t.Context())
 			cancel()
-			awaitRelease = pgtest.ObserveExecutionLeaseRelease(t, db.pool)
+			awaitRelease = pgtest.ObserveExecutionLeaseRelease(t, s.pool)
 			if err := restarted.Run(stopped); !errors.Is(err, context.Canceled) {
 				t.Fatal(err)
 			}
@@ -57,14 +57,14 @@ func TestWorkerReconcilesEnvironmentPromotionBeforeStart(t *testing.T) {
 				t.Fatal("restart failed to settle the original claim", turn, err)
 			}
 			var turns, inputs, queued int
-			err = db.pool.QueryRow(t.Context(), `SELECT
+			err = s.pool.QueryRow(t.Context(), `SELECT
 				(SELECT count(*) FROM turns WHERE session_id=$1),
 				(SELECT count(*) FROM turn_inputs WHERE session_id=$1),
 				(SELECT count(*) FROM turns WHERE session_id=$1 AND status='queued')`, pending.SessionID).Scan(&turns, &inputs, &queued)
 			if err != nil || turns != 1 || inputs != 1 || queued != 0 {
 				t.Fatal("restart duplicated or requeued prepared work", turns, inputs, queued, err)
 			}
-			successor := executionOwner(t, db).Sessions
+			successor := executionOwner(t, s).Sessions
 			retry, err := successor.PromoteEnvironmentInput(t.Context(), tenant, pending.SessionID, pending.ID)
 			if deleted {
 				if !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/tests/integration/environment_connection_events_test.go b/services/core/tests/integration/environment_connection_events_test.go
index 7096f339e..a3bfa945f 100644
--- a/services/core/tests/integration/environment_connection_events_test.go
+++ b/services/core/tests/integration/environment_connection_events_test.go
@@ -6,14 +6,13 @@ import (
 	"time"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-func awaitEnvironmentConnectionState(t *testing.T, ctx context.Context, pool *pgxpool.Pool, tenant, environment, status string) {
+func awaitEnvironmentConnectionState(t *testing.T, ctx context.Context, s *Store, tenant, environment, status string) {
 	t.Helper()
 	deadline := time.Now().Add(5 * time.Second)
 	for time.Now().Before(deadline) {
-		value, err := sessionReads(pool).GetEnvironment(ctx, tenant, environment)
+		value, err := sessionAdapter(s).GetEnvironment(ctx, tenant, environment)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/environment_connection_worker_test.go b/services/core/tests/integration/environment_connection_worker_test.go
index a5d855f51..ca356f402 100644
--- a/services/core/tests/integration/environment_connection_worker_test.go
+++ b/services/core/tests/integration/environment_connection_worker_test.go
@@ -14,17 +14,17 @@ import (
 )
 
 func TestEnvironmentConnectionWorkerReconcilesAndReleasesLease(t *testing.T) {
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "connection-worker", Configuration: []byte(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
 	if err != nil {
 		t.Fatal(err)
 	}
-	environment, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), tenant, session.ID)
+	environment, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	owner := executionOwner(t, db)
+	owner := executionOwner(t, s)
 	generation := uuid.NewString()
 	if err := owner.Sessions.ReplaceEnvironmentConnection(t.Context(), tenant, environment.ID, generation); err != nil {
 		t.Fatal(err)
@@ -32,12 +32,12 @@ func TestEnvironmentConnectionWorkerReconcilesAndReleasesLease(t *testing.T) {
 	if err := owner.Sessions.ObserveEnvironmentConnection(t.Context(), tenant, environment.ID, generation, 1, true); err != nil {
 		t.Fatal(err)
 	}
-	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, db.pool)
+	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, s.pool)
 	if err := owner.Lease.Close(t.Context()); err != nil {
 		t.Fatal(err)
 	}
 	awaitRelease()
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
+	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	exited := make(chan struct{})
@@ -50,7 +50,7 @@ func TestEnvironmentConnectionWorkerReconcilesAndReleasesLease(t *testing.T) {
 			t.Error("worker cleanup did not exit")
 		}
 	})
-	awaitEnvironmentConnectionState(t, ctx, db.pool, tenant, environment.ID, "disconnected")
+	awaitEnvironmentConnectionState(t, ctx, s, tenant, environment.ID, "disconnected")
 
 	cancel()
 	select {
@@ -61,7 +61,7 @@ func TestEnvironmentConnectionWorkerReconcilesAndReleasesLease(t *testing.T) {
 	case <-time.After(10 * time.Second):
 		t.Fatal("worker did not close")
 	}
-	awaitEnvironmentConnectionState(t, t.Context(), db.pool, tenant, environment.ID, "disconnected")
+	awaitEnvironmentConnectionState(t, t.Context(), s, tenant, environment.ID, "disconnected")
 	if err := worker.CheckOwnership(t.Context()); err == nil {
 		t.Fatal("worker retained lease")
 	}
diff --git a/services/core/tests/integration/environment_device_test.go b/services/core/tests/integration/environment_device_test.go
index 493be5031..b348101ea 100644
--- a/services/core/tests/integration/environment_device_test.go
+++ b/services/core/tests/integration/environment_device_test.go
@@ -25,7 +25,7 @@ func TestWorkerEnvironmentSelectsCapableDeviceWithoutMovingBinding(t *testing.T)
 			awaitFixtureCapabilities(t, originalRuntime, caps)
 			generalFrames := workerFrames(t, h)
 			boundFrames := workerFrames(t, originalRuntime)
-			_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+			_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 			select {
 			case frame := <-generalFrames:
 				t.Fatal("general device received self-hosted work", frame.Type)
@@ -33,7 +33,7 @@ func TestWorkerEnvironmentSelectsCapableDeviceWithoutMovingBinding(t *testing.T)
 				t.Fatal("incapable enrolled device received work", frame.Type)
 			case <-time.After(time.Second):
 			}
-			if _, err := fixtureSessionStore(h.db).GetSessionDevice(t.Context(), h.tenant, pending.SessionID); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sessionAdapter(h.s).GetSessionDevice(t.Context(), h.tenant, pending.SessionID); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal("unregistered Runtime was assigned general compute", err)
 			}
 			session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, pending.SessionID)
@@ -43,11 +43,11 @@ func TestWorkerEnvironmentSelectsCapableDeviceWithoutMovingBinding(t *testing.T)
 			other := connectFixtureRuntime(t, h, session)
 			otherFrames := workerFrames(t, other)
 			request := nextWorkerFrame(t, otherFrames, proto.TypeExecutionPrepare)
-			selected, err := fixtureSessionStore(h.db).GetSessionDevice(t.Context(), h.tenant, pending.SessionID)
+			selected, err := sessionAdapter(h.s).GetSessionDevice(t.Context(), h.tenant, pending.SessionID)
 			if err != nil || selected.ID != other.device.ID {
 				t.Fatal("enrollment did not retain exact Runtime", err)
 			}
-			original, err := fixtureSessionStore(h.db).GetSessionDevice(t.Context(), h.tenant, bound.SessionID)
+			original, err := sessionAdapter(h.s).GetSessionDevice(t.Context(), h.tenant, bound.SessionID)
 			if err != nil || original.ID != originalRuntime.device.ID {
 				t.Fatal("existing binding moved to a capable Runtime", err)
 			}
diff --git a/services/core/tests/integration/environment_directory_test.go b/services/core/tests/integration/environment_directory_test.go
index aebfd8f0b..815203094 100644
--- a/services/core/tests/integration/environment_directory_test.go
+++ b/services/core/tests/integration/environment_directory_test.go
@@ -21,7 +21,7 @@ type directoryResult struct {
 func directoryWorker(t *testing.T) (*dispatchHarness, *execution.Worker, sessions.Environment) {
 	t.Helper()
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"unavailable-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), true)
-	environment, err := fixtureSessionStore(h.db).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
+	environment, err := sessionAdapter(h.s).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -34,7 +34,7 @@ func directoryWorker(t *testing.T) (*dispatchHarness, *execution.Worker, session
 		info, _, _ := peer.AgentKindStatus("codex")
 		return info.Capabilities.WorkspaceReadPreparation
 	})
-	w := startWorker(t, t.Context(), h.db, h.d)
+	w := startWorker(t, t.Context(), h.s, h.d)
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- w.Run(ctx) }()
diff --git a/services/core/tests/integration/environment_executor_command_test.go b/services/core/tests/integration/environment_executor_command_test.go
index c0a906dcb..2803532f5 100644
--- a/services/core/tests/integration/environment_executor_command_test.go
+++ b/services/core/tests/integration/environment_executor_command_test.go
@@ -52,7 +52,7 @@ func TestEnvironmentExecutorOperatorCommand(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	environment, err := sessionReads(pool).GetSessionEnvironment(t.Context(), tenant, session.ID)
+	environment, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -64,14 +64,14 @@ func TestEnvironmentExecutorOperatorCommand(t *testing.T) {
 	if next == first {
 		t.Fatal("rotation returned the same key")
 	}
-	if _, err := sessionReads(pool).AuthenticateEnvironmentExecutor(t.Context(), environment.ID, runtimedevice.HashCredential(first)); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).AuthenticateEnvironmentExecutor(t.Context(), environment.ID, runtimedevice.HashCredential(first)); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("old command credential retained authority", err)
 	}
-	if owner, err := sessionReads(pool).AuthenticateEnvironmentExecutor(t.Context(), environment.ID, runtimedevice.HashCredential(next)); err != nil || owner != tenant {
+	if owner, err := sessionAdapter(s).AuthenticateEnvironmentExecutor(t.Context(), environment.ID, runtimedevice.HashCredential(next)); err != nil || owner != tenant {
 		t.Fatal("rotated command credential failed", err)
 	}
 	command(tenant, true, "--revoke")
-	if _, err := sessionReads(pool).AuthenticateEnvironmentExecutor(t.Context(), environment.ID, runtimedevice.HashCredential(next)); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).AuthenticateEnvironmentExecutor(t.Context(), environment.ID, runtimedevice.HashCredential(next)); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("revoked command credential retained authority", err)
 	}
 	t.Log("built operator command issued before Session creation, rejected duplicate/foreign requests, rotated and revoked durable credentials")
diff --git a/services/core/tests/integration/environment_expiry_dispatch_test.go b/services/core/tests/integration/environment_expiry_dispatch_test.go
index 7b57eb2be..623fe0ea5 100644
--- a/services/core/tests/integration/environment_expiry_dispatch_test.go
+++ b/services/core/tests/integration/environment_expiry_dispatch_test.go
@@ -19,7 +19,7 @@ func TestWorkerEnvironmentExpiryAtFullExecutionCapacity(t *testing.T) {
 	h := newDispatchHarness(t)
 	_, pool := testStore(t)
 	enableEnvironmentExpiryDispatch(h)
-	worker, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	worker, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	var requests []proto.Envelope
 	var active []sessions.Session
 	for _, key := range []string{"one", "two", "three", "four"} {
@@ -64,7 +64,7 @@ func TestWorkerEnvironmentExpirySkipsBusySessionAndAllowsDispatch(t *testing.T)
 	if _, err := tx.Exec(t.Context(), "SELECT id FROM sessions WHERE id=$1 FOR UPDATE", locked.SessionID); err != nil {
 		t.Fatal(err)
 	}
-	worker, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	worker, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	h.session = publicSession(t, h, "unrelated")
 	receipt, err := worker.SubmitInputs(t.Context(), h.tenant, h.session.ID, "work", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"make normal progress"}`)}})
 	if err != nil {
diff --git a/services/core/tests/integration/environment_expiry_worker_test.go b/services/core/tests/integration/environment_expiry_worker_test.go
index 44892e17d..a7d8b4fdd 100644
--- a/services/core/tests/integration/environment_expiry_worker_test.go
+++ b/services/core/tests/integration/environment_expiry_worker_test.go
@@ -39,9 +39,9 @@ func makeEnvironmentExpiryDue(t *testing.T, pool *pgxpool.Pool, pending *session
 	}
 }
 
-func startEnvironmentExpiryWorker(t *testing.T, db fixtureDB, d *execution.Dispatcher) (*execution.Worker, func()) {
+func startEnvironmentExpiryWorker(t *testing.T, s *Store, d *execution.Dispatcher) (*execution.Worker, func()) {
 	t.Helper()
-	worker := startWorker(t, t.Context(), db, d)
+	worker := startWorker(t, t.Context(), s, d)
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
@@ -99,22 +99,22 @@ func assertEnvironmentExpiryHasNoHistory(t *testing.T, pool *pgxpool.Pool, sessi
 }
 
 func TestWorkerEnvironmentExpiryWithoutDevicesAndAfterRestart(t *testing.T) {
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	dueTenant, due := newEnvironmentExpiryReservation(t, s)
 	futureTenant, future := newEnvironmentExpiryReservation(t, s)
-	makeEnvironmentExpiryDue(t, db.pool, &due)
+	makeEnvironmentExpiryDue(t, s.pool, &due)
 	d := &execution.Dispatcher{Registry: runtimegateway.NewRegistry()}
-	_, stop := startEnvironmentExpiryWorker(t, db, d)
+	_, stop := startEnvironmentExpiryWorker(t, s, d)
 	waitEnvironmentExpiry(t, s, dueTenant, due)
 	got, err := sessionAdapter(s).GetEnvironmentInputReservation(t.Context(), futureTenant, future.SessionID, future.ID)
 	if err != nil || got.State != sessions.EnvironmentInputPending || !got.Deadline.Equal(future.Deadline) {
 		t.Fatal("future input changed", got, err)
 	}
 	stop()
-	makeEnvironmentExpiryDue(t, db.pool, &future)
-	_, stop = startEnvironmentExpiryWorker(t, db, d)
+	makeEnvironmentExpiryDue(t, s.pool, &future)
+	_, stop = startEnvironmentExpiryWorker(t, s, d)
 	waitEnvironmentExpiry(t, s, futureTenant, future)
 	stop()
-	assertEnvironmentExpiryHasNoHistory(t, db.pool, due.SessionID)
-	assertEnvironmentExpiryHasNoHistory(t, db.pool, future.SessionID)
+	assertEnvironmentExpiryHasNoHistory(t, s.pool, due.SessionID)
+	assertEnvironmentExpiryHasNoHistory(t, s.pool, future.SessionID)
 }
diff --git a/services/core/tests/integration/environment_file_write_semantics_public_test.go b/services/core/tests/integration/environment_file_write_semantics_public_test.go
index 949e7206c..03398dc75 100644
--- a/services/core/tests/integration/environment_file_write_semantics_public_test.go
+++ b/services/core/tests/integration/environment_file_write_semantics_public_test.go
@@ -59,13 +59,13 @@ func TestEnvironmentFileCreateRejectionsLeaveNoReceiptOrConsumption(t *testing.T
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "tenant-b", TokenSHA256: runtimedevice.HashCredential(other), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(t, w))
+	handler, err := publicHandler(t, h.s, auth, "codex", workerExecution(t, w))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(handler)
 	defer server.Close()
-	fileStore, fileService := fixtureFiles(t, h.db)
+	fileStore, fileService := fixtureFiles(t, h.s)
 	source, err := fileService.Create(t.Context(), files.CreateCommand{TenantID: h.tenant, Upload: func(out io.Writer) (files.Upload, error) {
 		_, err := out.Write([]byte("src"))
 		return files.Upload{Filename: "source.txt", Purpose: files.PurposeUserData}, err
@@ -140,7 +140,7 @@ func TestEnvironmentFileCreateRejectionsLeaveNoReceiptOrConsumption(t *testing.T
 		done := post(token, environment.ID, tc.body)
 		id := serveFileWrite(h, rejected(tc.reason))
 		assertError(await(done), tc.message)
-		if intent, err := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, id); err != nil || intent.State != "rejected" {
+		if intent, err := FixtureFileWrite(t.Context(), h.s.pool, h.tenant, environment.ID, id); err != nil || intent.State != "rejected" {
 			t.Fatal("rejection did not settle", intent, err)
 		}
 	}
diff --git a/services/core/tests/integration/environment_initial_public_test.go b/services/core/tests/integration/environment_initial_public_test.go
index 12c062565..a3b47fa76 100644
--- a/services/core/tests/integration/environment_initial_public_test.go
+++ b/services/core/tests/integration/environment_initial_public_test.go
@@ -21,7 +21,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
@@ -36,7 +36,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	owner := executionOwner(t, db)
+	owner := executionOwner(t, s)
 	t.Cleanup(func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		defer cancel()
@@ -44,7 +44,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 			t.Error(err)
 		}
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
+	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -89,7 +89,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 		}
 	}
 	var reservation string
-	if err := db.pool.QueryRow(t.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1 AND is_initial RETURNING id", session.ID).Scan(&reservation); err != nil {
+	if err := s.pool.QueryRow(t.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1 AND is_initial RETURNING id", session.ID).Scan(&reservation); err != nil {
 		t.Fatal(err)
 	}
 	if result, err := sessionService(t, s).ExpireEnvironmentInput(t.Context(), tenant, session.ID, reservation); err != nil || result.State != sessions.EnvironmentInputExpired {
diff --git a/services/core/tests/integration/environment_initialization_test.go b/services/core/tests/integration/environment_initialization_test.go
index a18d50f6d..d21de7390 100644
--- a/services/core/tests/integration/environment_initialization_test.go
+++ b/services/core/tests/integration/environment_initialization_test.go
@@ -20,26 +20,25 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgxpool"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-func initializationState(t *testing.T, pool *pgxpool.Pool, tenant, environment string) string {
+func initializationState(t *testing.T, s *Store, tenant, environment string) string {
 	t.Helper()
-	value, err := sessionReads(pool).GetEnvironment(t.Context(), tenant, environment)
+	value, err := sessionAdapter(s).GetEnvironment(t.Context(), tenant, environment)
 	if err != nil {
 		t.Fatal(err)
 	}
 	return value.Initialization
 }
 
-func awaitInitialization(t *testing.T, pool *pgxpool.Pool, tenant, environment, state string) {
+func awaitInitialization(t *testing.T, s *Store, tenant, environment, state string) {
 	t.Helper()
 	deadline := time.Now().Add(10 * time.Second)
 	for time.Now().Before(deadline) {
-		if initializationState(t, pool, tenant, environment) == state {
+		if initializationState(t, s, tenant, environment) == state {
 			return
 		}
 		time.Sleep(10 * time.Millisecond)
@@ -55,7 +54,7 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 			if err != nil {
 				t.Fatal(err)
 			}
-			s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+			s := NewWithCredentialCipher(pool, cipher)
 			principal := FixtureExecutorPrincipal(t, s, uuid.NewString())
 			session, err := s.CreateSession(t.Context(), principal.TenantID, sessions.CreateSession{
 				Creator: principal.Subject(), Engine: "codex", IdempotencyKey: uuid.NewString(),
@@ -66,23 +65,23 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 			if err != nil {
 				t.Fatal(err)
 			}
-			environment, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), principal.TenantID, session.ID)
+			environment, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), principal.TenantID, session.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
-			key, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
+			key, err := sessionService(t, s).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
-			enrolled, err := fixtureSessionService(t, db).EnrollRuntime(t.Context(), environment.ID, runtimedevice.HashCredential(key.Token))
+			enrolled, err := sessionService(t, s).EnrollRuntime(t.Context(), environment.ID, runtimedevice.HashCredential(key.Token))
 			if err != nil {
 				t.Fatal(err)
 			}
 			registry := runtimegateway.NewRegistry()
-			handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(fixtureSessionStore(db)), Registry: registry})
+			handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(sessionAdapter(s)), Registry: registry})
 			server := httptest.NewServer(http.HandlerFunc(handler.WS))
 			defer server.Close()
-			worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry})
+			worker := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry})
 			ctx, cancel := context.WithCancel(t.Context())
 			done := make(chan error, 1)
 			go func() { done <- worker.Run(ctx) }()
@@ -111,7 +110,7 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 				actions = append(actions, action)
 				mu.Unlock()
 				if outcome == "revoked" {
-					if err := fixtureSessionService(t, db).RevokeDevice(t.Context(), principal.TenantID, enrolled.DeviceID); err != nil {
+					if err := sessionService(t, s).RevokeDevice(t.Context(), principal.TenantID, enrolled.DeviceID); err != nil {
 						t.Error(err)
 					}
 					return completedInitialization(request, data)
@@ -122,7 +121,7 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 				return completedInitialization(request, data)
 			}
 			time.Sleep(350 * time.Millisecond)
-			if initializationState(t, db.pool, principal.TenantID, environment.ID) != "pending" {
+			if initializationState(t, s, principal.TenantID, environment.ID) != "pending" {
 				t.Fatal("unconnected preparation was consumed")
 			}
 			bootstrap := sandbox.Bootstrap{DeviceID: enrolled.DeviceID, Credential: key.Token}
@@ -133,8 +132,8 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 			if outcome != "completed" {
 				want = "failed"
 			}
-			awaitInitialization(t, db.pool, principal.TenantID, environment.ID, want)
-			if _, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: principal.TenantID, EnvironmentID: environment.ID}); !errors.Is(err, deployment.ErrNotFound) {
+			awaitInitialization(t, s, principal.TenantID, environment.ID, want)
+			if _, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: principal.TenantID, EnvironmentID: environment.ID}); !errors.Is(err, deployment.ErrNotFound) {
 				t.Fatal("self-hosted preparation fabricated allocation", err)
 			}
 			if outcome == "completed" {
@@ -171,7 +170,7 @@ func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *test
 // Revocation can commit after the worker observes a connected peer but before
 // it claims preparation. It must remain a per-Environment admission result.
 func TestEnvironmentInitializationRevocationBeforeClaim(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	principal := FixtureExecutorPrincipal(t, s, uuid.NewString())
 	create := func() sessions.EnvironmentInitialization {
 		t.Helper()
@@ -183,23 +182,23 @@ func TestEnvironmentInitializationRevocationBeforeClaim(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		environment, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), principal.TenantID, session.ID)
+		environment, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), principal.TenantID, session.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
-		key, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
+		key, err := sessionService(t, s).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
-		enrolled, err := fixtureSessionService(t, db).EnrollRuntime(t.Context(), environment.ID, runtimedevice.HashCredential(key.Token))
+		enrolled, err := sessionService(t, s).EnrollRuntime(t.Context(), environment.ID, runtimedevice.HashCredential(key.Token))
 		if err != nil {
 			t.Fatal(err)
 		}
 		return sessions.EnvironmentInitialization{EnvironmentID: environment.ID, SessionID: session.ID, TenantID: principal.TenantID, DeviceID: enrolled.DeviceID, State: "pending", Engine: "codex"}
 	}
 	revoked, other := create(), create()
-	owned := executionOwner(t, db).Sessions
-	if err := fixtureSessionService(t, db).RevokeDevice(t.Context(), principal.TenantID, revoked.DeviceID); err != nil {
+	owned := executionOwner(t, s).Sessions
+	if err := sessionService(t, s).RevokeDevice(t.Context(), principal.TenantID, revoked.DeviceID); err != nil {
 		t.Fatal(err)
 	}
 	if err := owned.ClaimEnvironmentInitialization(t.Context(), revoked); !errors.Is(err, sessions.ErrNotFound) {
@@ -210,7 +209,7 @@ func TestEnvironmentInitializationRevocationBeforeClaim(t *testing.T) {
 	if err := owned.ClaimEnvironmentInitialization(t.Context(), stale); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatalf("stale binding escaped normal admission handling: %v", err)
 	}
-	if initializationState(t, db.pool, other.TenantID, other.EnvironmentID) != "pending" {
+	if initializationState(t, s, other.TenantID, other.EnvironmentID) != "pending" {
 		t.Fatal("stale claim changed preparation state")
 	}
 	if err := owned.ClaimEnvironmentInitialization(t.Context(), other); err != nil {
diff --git a/services/core/tests/integration/environment_mcp_public_test.go b/services/core/tests/integration/environment_mcp_public_test.go
index e616943e9..d57a013fd 100644
--- a/services/core/tests/integration/environment_mcp_public_test.go
+++ b/services/core/tests/integration/environment_mcp_public_test.go
@@ -14,9 +14,9 @@ import (
 func TestPublicEnvironmentMCPUsesAttachedVaultSelection(t *testing.T) {
 	for _, kind := range []string{"codex", "claude_sdk", "mcode"} {
 		t.Run(kind, func(t *testing.T) {
-			s, db, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
+			s, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
 			auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test", TenantID: tenant, TokenSHA256: runtimedevice.HashCredential("test-token")}})
-			handler, err := publicHandler(t, s, db, auth, kind, workerExecution(t, &execution.Worker{}), executorURL("https://executor.example"))
+			handler, err := publicHandler(t, s, auth, kind, workerExecution(t, &execution.Worker{}), executorURL("https://executor.example"))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -47,7 +47,7 @@ func TestPublicEnvironmentMCPUsesAttachedVaultSelection(t *testing.T) {
 					}
 				}
 			}
-			assertSelfHostedMCPRejectionHasNoWrites(t, db.pool, tenant)
+			assertSelfHostedMCPRejectionHasNoWrites(t, s.pool, tenant)
 			for _, r := range []*httptest.ResponseRecorder{send("environment", []string{}, nil, nil, false), send("environment", []string{vault.ID}, credential.ID, nil, false), send("environment", []string{vault.ID}, nil, nil, false)} {
 				if r.Code != 201 {
 					t.Fatal("qualified public MCP rejected", r.Code, r.Body)
diff --git a/services/core/tests/integration/environment_plugins_test.go b/services/core/tests/integration/environment_plugins_test.go
index 030ffec5e..21d207470 100644
--- a/services/core/tests/integration/environment_plugins_test.go
+++ b/services/core/tests/integration/environment_plugins_test.go
@@ -21,7 +21,7 @@ func TestPluginsFrozenInSession(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	var archive bytes.Buffer
 	writer := zip.NewWriter(&archive)
 	for path, body := range map[string]string{
diff --git a/services/core/tests/integration/environment_retrieve_public_test.go b/services/core/tests/integration/environment_retrieve_public_test.go
index 6223410f6..2169efcef 100644
--- a/services/core/tests/integration/environment_retrieve_public_test.go
+++ b/services/core/tests/integration/environment_retrieve_public_test.go
@@ -21,7 +21,7 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newModelTestStoreDB(t)
+	s, _ := NewModelTestStore(t)
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	principal := FixtureExecutorPrincipal(t, s, tenant)
 	token, peer, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
@@ -33,7 +33,7 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 	if err := s.EnsureProjectScopes(t.Context(), []identity.ProjectScope{{TenantID: tenant, OrganizationID: principal.OrganizationID, ProjectID: tenant}, {TenantID: foreignTenant, OrganizationID: principal.OrganizationID, ProjectID: foreignTenant}}); err != nil {
 		t.Fatal(err)
 	}
-	executor, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), "")
+	executor, err := sessionService(t, s).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -42,12 +42,12 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 		if !revoked {
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
-			if err := fixtureSessionService(t, db).RevokeExecutorCredential(ctx, principal, executor.KeyID); err != nil {
+			if err := sessionService(t, s).RevokeExecutorCredential(ctx, principal, executor.KeyID); err != nil {
 				t.Error("owned executor credential cleanup failed", err)
 			}
 		}
 	}()
-	handler, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), executorURL("https://private-registry.example"))
+	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://private-registry.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -75,18 +75,18 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 		return result
 	}
 	result := run()
-	before, err := fixtureSessionStore(db).GetEnvironment(t.Context(), tenant, result["environment_id"])
+	before, err := sessionAdapter(s).GetEnvironment(t.Context(), tenant, result["environment_id"])
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := fixtureSessionService(t, db).RevokeExecutorCredential(t.Context(), principal, executor.KeyID); err != nil {
+	if err := sessionService(t, s).RevokeExecutorCredential(t.Context(), principal, executor.KeyID); err != nil {
 		t.Fatal(err)
 	}
 	revoked = true
 	server.Close()
-	db.pool.Close()
-	reopened, reopenedDB := newModelTestStoreDB(t)
-	handler, err = publicHandler(t, reopened, reopenedDB, auth, "codex")
+	s.pool.Close()
+	reopened, _ := NewModelTestStore(t)
+	handler, err = publicHandler(t, reopened, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -97,12 +97,12 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 		settings[key] = value
 	}
 	run()
-	after, err := fixtureSessionStore(reopenedDB).GetEnvironment(t.Context(), tenant, before.ID)
+	after, err := sessionAdapter(reopened).GetEnvironment(t.Context(), tenant, before.ID)
 	if err != nil || !reflect.DeepEqual(before, after) {
 		t.Fatal("public retrieval changed durable Environment state", err)
 	}
 	var history int
-	if err := reopenedDB.pool.QueryRow(t.Context(), `SELECT
+	if err := reopened.pool.QueryRow(t.Context(), `SELECT
 		(SELECT count(*) FROM turns WHERE session_id=$1) +
 		(SELECT count(*) FROM environment_input_reservations WHERE session_id=$1) +
 		(SELECT count(*) FROM session_events WHERE session_id=$1)`, before.SessionID).Scan(&history); err != nil || history != 0 {
diff --git a/services/core/tests/integration/environment_runtime_fixture_test.go b/services/core/tests/integration/environment_runtime_fixture_test.go
index 1b35f5d11..4a047b13a 100644
--- a/services/core/tests/integration/environment_runtime_fixture_test.go
+++ b/services/core/tests/integration/environment_runtime_fixture_test.go
@@ -13,22 +13,22 @@ import (
 	"github.com/gorilla/websocket"
 )
 
-func enrollFixtureSession(t *testing.T, s *Store, db fixtureDB, tenant string, session sessions.Session) (sessions.ExecutionDevice, string) {
+func enrollFixtureSession(t *testing.T, s *Store, tenant string, session sessions.Session) (sessions.ExecutionDevice, string) {
 	t.Helper()
-	environment, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), tenant, session.ID)
+	environment, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	principal := FixtureExecutorPrincipal(t, s, tenant)
-	key, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
+	key, err := sessionService(t, s).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	enrolled, err := fixtureSessionService(t, db).EnrollRuntime(t.Context(), environment.ID, runtimedevice.HashCredential(key.Token))
+	enrolled, err := sessionService(t, s).EnrollRuntime(t.Context(), environment.ID, runtimedevice.HashCredential(key.Token))
 	if err != nil || enrolled.EnvironmentID != environment.ID || enrolled.SessionID != session.ID || enrolled.WorkspaceDirectory != "/workspace" {
 		t.Fatalf("Runtime enrollment: %+v %v", enrolled, err)
 	}
-	bound, err := fixtureSessionStore(db).GetSessionDevice(t.Context(), tenant, session.ID)
+	bound, err := sessionAdapter(s).GetSessionDevice(t.Context(), tenant, session.ID)
 	if err != nil || bound.ID != enrolled.DeviceID || bound.EnvironmentID != environment.ID {
 		t.Fatalf("Runtime binding: %+v %v", bound, err)
 	}
@@ -38,9 +38,9 @@ func enrollFixtureSession(t *testing.T, s *Store, db fixtureDB, tenant string, s
 func connectFixtureRuntime(t *testing.T, h *dispatchHarness, session sessions.Session) *dispatchHarness {
 	t.Helper()
 	// The Runtime shares the harness's Core, not its connection or write lock.
-	other := &dispatchHarness{t: h.t, s: h.s, db: h.db, lease: h.lease, owned: h.owned, d: h.d, tenant: h.tenant, session: session, registry: h.registry, url: h.url,
+	other := &dispatchHarness{t: h.t, s: h.s, lease: h.lease, owned: h.owned, d: h.d, tenant: h.tenant, session: session, registry: h.registry, url: h.url,
 		admissions: h.admissions, environments: h.environments}
-	other.device, other.credential = enrollFixtureSession(t, h.s, h.db, h.tenant, session)
+	other.device, other.credential = enrollFixtureSession(t, h.s, h.tenant, session)
 	u, err := url.Parse(h.url)
 	if err != nil {
 		t.Fatal(err)
@@ -74,7 +74,7 @@ func completeEmptyArtifactExport(t *testing.T, h *dispatchHarness, frames ...<-c
 	}
 	frame := read(proto.TypeExecutionPrepare)
 	var prepare proto.ExecutionPreparePayload
-	environment, err := fixtureSessionStore(h.db).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
+	environment, err := sessionAdapter(h.s).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
 	if err != nil || frame.DecodePayload(&prepare) != nil || !proto.ValidWorkspaceReadPreparation(prepare.Configuration) || prepare.Configuration.LocalEnvironment == nil || prepare.Configuration.LocalEnvironment.ID != environment.ID {
 		t.Fatal("artifact preparation lost exact local authority", err)
 	}
diff --git a/services/core/tests/integration/environment_setup_test.go b/services/core/tests/integration/environment_setup_test.go
index c033371f3..039131e0e 100644
--- a/services/core/tests/integration/environment_setup_test.go
+++ b/services/core/tests/integration/environment_setup_test.go
@@ -20,7 +20,7 @@ func TestEnvironmentSetupEncryptedSnapshotAndIsolation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	setup := environmentconfig.Setup{Env: map[string]string{"SECRET": "session-env-canary"}, Commands: []environmentconfig.SetupCommand{{Command: "printf session-command-canary > result"}}, Packages: v1.EnvironmentPackages{NPM: []string{"is-number@7.0.0"}}}
 	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), Initialization: setup}
diff --git a/services/core/tests/integration/environment_work_test.go b/services/core/tests/integration/environment_work_test.go
index d8efad184..fae8b6abc 100644
--- a/services/core/tests/integration/environment_work_test.go
+++ b/services/core/tests/integration/environment_work_test.go
@@ -40,7 +40,7 @@ func TestEnvironmentInputWorkFiltersAndPagesDevices(t *testing.T) {
 		default:
 			runtime := h.environments[pending.SessionID]
 			if state == "revoked" {
-				if err := fixtureSessionService(t, h.db).RevokeDevice(t.Context(), h.tenant, runtime.device.ID); err != nil {
+				if err := sessionService(t, h.s).RevokeDevice(t.Context(), h.tenant, runtime.device.ID); err != nil {
 					t.Fatal(err)
 				}
 				work, err := sessionAdapter(h.s).ListEnvironmentInputWork(t.Context(), "", []string{runtime.device.ID})
diff --git a/services/core/tests/integration/environment_worker_scan_test.go b/services/core/tests/integration/environment_worker_scan_test.go
index 2d255ade0..5149190ff 100644
--- a/services/core/tests/integration/environment_worker_scan_test.go
+++ b/services/core/tests/integration/environment_worker_scan_test.go
@@ -21,7 +21,7 @@ func TestWorkerEnvironmentRetriesNewlyReadyAtNextScan(t *testing.T) {
 	h.session = publicSession(t, h, "scan-barrier")
 	receipt := h.message("barrier", "ordinary work")
 	scanned := time.Now()
-	_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	// Dispatch starts only after selectWork has examined the pending input on
 	// the same pass, while its exact Runtime is still incapable of preparation.
 	barrier := nextWorkerFrame(t, frames, testExecutionRequest)
@@ -69,7 +69,7 @@ func TestWorkerEnvironmentPaginationReachesReadyTail(t *testing.T) {
 	h.session = publicSession(t, h, "page-barrier")
 	receipt := h.message("barrier", "ordinary work")
 	scanned := time.Now()
-	_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	barrier := nextWorkerFrame(t, frames, testExecutionRequest)
 	if barrier.ID != receipt.TurnID {
 		t.Fatal("unexpected page barrier")
diff --git a/services/core/tests/integration/environment_worker_test.go b/services/core/tests/integration/environment_worker_test.go
index da3aaf6f6..3ba10d5ce 100644
--- a/services/core/tests/integration/environment_worker_test.go
+++ b/services/core/tests/integration/environment_worker_test.go
@@ -31,7 +31,7 @@ func TestWorkerEnvironmentSharesCapacityThroughClaimAndCleanup(t *testing.T) {
 		receipt := h.message(key, "ordinary")
 		ordinary[receipt.TurnID] = session
 	}
-	_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	var normal []proto.Envelope
 	var preparing []proto.Envelope
 	for range 4 {
@@ -132,7 +132,7 @@ func TestWorkerEnvironmentRetriesPendingWithoutExtendingDeadline(t *testing.T) {
 	pending := workerEnvironmentReservation(t, h)
 	runtime := h.environments[pending.SessionID]
 	frames := workerFrames(t, h, runtime)
-	_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	first := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
 	started := time.Now()
 	handle := acknowledgePreparation(runtime, first.ID)
@@ -162,7 +162,7 @@ func TestWorkerEnvironmentRetriesPendingWithoutExtendingDeadline(t *testing.T) {
 	if err != nil || stored.State != sessions.EnvironmentInputPending || !stored.Deadline.Equal(pending.Deadline) || len(stored.Receipts) != 0 {
 		t.Fatal("retry or shutdown changed the original reservation", stored, err)
 	}
-	_, stop = startEnvironmentExpiryWorker(t, h.db, h.d)
+	_, stop = startEnvironmentExpiryWorker(t, h.s, h.d)
 	third := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
 	handle = acknowledgePreparation(runtime, third.ID)
 	runtime.write(third.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{Handle: handle, Revision: 2, State: "ready"})
diff --git a/services/core/tests/integration/file_resource_semantics_public_test.go b/services/core/tests/integration/file_resource_semantics_public_test.go
index c2290b747..83854d136 100644
--- a/services/core/tests/integration/file_resource_semantics_public_test.go
+++ b/services/core/tests/integration/file_resource_semantics_public_test.go
@@ -32,8 +32,8 @@ func TestFileResourceSemanticsOfficialClientPostgres(t *testing.T) {
 	})
 	newServer := func() *httptest.Server {
 		t.Helper()
-		s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-		h, err := publicHandler(t, s, db, auth, "codex")
+		s := NewWithCredentialCipher(pool, cipher)
+		h, err := publicHandler(t, s, auth, "codex")
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/fixture_db_test.go b/services/core/tests/integration/fixture_db_test.go
deleted file mode 100644
index 5f7361505..000000000
--- a/services/core/tests/integration/fixture_db_test.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package integration
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// fixtureDB is the database and credential key that built the test's Store.
-type fixtureDB struct {
-	pool      *pgxpool.Pool
-	cipher    *credentialcrypto.Cipher // nil for a keyless Store
-	publicURL string                   // the public URL of the Store's placement rules, if any
-}
-
-// newTestStoreDB is testStore with the fixtureDB that built it.
-func newTestStoreDB(t *testing.T) (*Store, fixtureDB) {
-	s, pool := testStore(t)
-	return s, fixtureDB{pool: pool}
-}
-
-// newModelTestStoreDB is NewModelTestStore with the fixtureDB that built it.
-func newModelTestStoreDB(t *testing.T) (*Store, fixtureDB) {
-	s, pool := NewModelTestStore(t)
-	return s, fixtureDB{pool: pool, cipher: fixtureCipher}
-}
-
-// newManagedTestStoreDB is newManagedTestStore with the fixtureDB that built it.
-func newManagedTestStoreDB(t *testing.T) (*Store, fixtureDB) {
-	s, pool := newManagedTestStore(t)
-	return s, fixtureDB{pool: pool, cipher: fixtureCipher}
-}
-
-// startWorker starts the execution Worker as cmd/server does: it acquires the
-// execution lease on db and hands it, with the execution writer built on it, to
-// the Worker, which closes it when Run exits. The Worker opens MCP bearer tokens
-// through the vaults service on db, records model configuration observations
-// through the model configuration adapter on db, runs Session use cases and
-// reads through the Session service and adapter on db, and reads the
-// deployment through the deployment adapter on db.
-func startWorker(t testing.TB, ctx context.Context, db fixtureDB, dispatcher *execution.Dispatcher) *execution.Worker {
-	t.Helper()
-	worker, err := startWorkerErr(ctx, db, dispatcher)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return worker
-}
-
-// startWorkerErr is startWorker for tests that assert a startup failure.
-func startWorkerErr(ctx context.Context, db fixtureDB, dispatcher *execution.Dispatcher) (*execution.Worker, error) {
-	lease, err := pgunit.AcquireLease(ctx, db.pool)
-	if err != nil {
-		return nil, err
-	}
-	owner, err := fixtureOwner(db, lease)
-	if err != nil {
-		return nil, errors.Join(err, lease.Close(ctx))
-	}
-	return startOwnedWorkerErr(ctx, db, dispatcher, owner)
-}
-
-// startOwnedWorker is startWorker on an Owner the test already holds, for tests
-// that also run execution operations on it. The Worker closes its lease when
-// Run exits.
-func startOwnedWorker(t testing.TB, ctx context.Context, db fixtureDB, dispatcher *execution.Dispatcher, owner execution.Owner) *execution.Worker {
-	t.Helper()
-	worker, err := startOwnedWorkerErr(ctx, db, dispatcher, owner)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return worker
-}
-
-func startOwnedWorkerErr(ctx context.Context, db fixtureDB, dispatcher *execution.Dispatcher, owner execution.Owner) (*execution.Worker, error) {
-	_, credentials, err := fixtureVaults(db)
-	if err != nil {
-		return nil, errors.Join(err, owner.Lease.Close(ctx))
-	}
-	sessionStore, sessionService, err := fixtureSessions(db)
-	if err != nil {
-		return nil, errors.Join(err, owner.Lease.Close(ctx))
-	}
-	deployments, err := fixtureDeploymentService(db)
-	if err != nil {
-		return nil, errors.Join(err, owner.Lease.Close(ctx))
-	}
-	owned := *dispatcher
-	owned.Credentials = credentials
-	owned.Observer = modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher)
-	owned.Deployment = deployments
-	owned.DeploymentReader = deploymentpg.New(pgunit.NewPool(db.pool), db.cipher)
-	owned.Sessions = sessionService
-	owned.SessionsReader = sessionStore
-	return execution.StartWorker(ctx, &owned, owner)
-}
-
-// executionOwner acquires the execution lease on db and builds the execution
-// operations on it, for tests that run them without a Worker. The lease
-// closes when the test ends.
-func executionOwner(t testing.TB, db fixtureDB) execution.Owner {
-	t.Helper()
-	lease, err := pgunit.AcquireLease(t.Context(), db.pool)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() { _ = lease.Close(context.Background()) })
-	owner, err := fixtureOwner(db, lease)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return owner
-}
-
-// fixtureOwner builds the deployment and Session execution operations on
-// lease, as cmd/server does.
-func fixtureOwner(db fixtureDB, lease *pgunit.Lease) (execution.Owner, error) {
-	_, changes, err := fixtureDeploymentExecution(db, lease)
-	if err != nil {
-		return execution.Owner{}, err
-	}
-	sessionExecution, err := sessions.NewExecutionOperations(sessionpg.NewExecution(lease))
-	if err != nil {
-		return execution.Owner{}, err
-	}
-	return execution.Owner{
-		Lease:      lease,
-		Deployment: changes,
-		Sessions:   sessionExecution,
-	}, nil
-}
diff --git a/services/core/tests/integration/fixtures_test.go b/services/core/tests/integration/fixtures_test.go
index c23832821..6fecfab2c 100644
--- a/services/core/tests/integration/fixtures_test.go
+++ b/services/core/tests/integration/fixtures_test.go
@@ -26,7 +26,7 @@ var fixtureCipher, _ = credentialcrypto.New(bytes.Repeat([]byte{61}, 32))
 // can freeze a model provider.
 func NewModelTestStore(t *testing.T) (*Store, *pgxpool.Pool) {
 	_, pool := testStore(t)
-	return withPlacement(t, NewWithCredentialCipher(pool, fixtureCipher)), pool
+	return NewWithCredentialCipher(pool, fixtureCipher), pool
 }
 
 // FixtureModelProvider is a valid bundle for the harness. Hosted and self-hosted
diff --git a/services/core/tests/integration/function_execution_native_test.go b/services/core/tests/integration/function_execution_native_test.go
index c19732859..96844b3d4 100644
--- a/services/core/tests/integration/function_execution_native_test.go
+++ b/services/core/tests/integration/function_execution_native_test.go
@@ -18,7 +18,7 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := bindSessionDevice(t, h.db, h.tenant, h.session.ID, h.device.ID); err != nil {
+	if err := bindSessionDevice(t, h.s, h.tenant, h.session.ID, h.device.ID); err != nil {
 		t.Fatal(err)
 	}
 	nativeID := ""
@@ -48,11 +48,11 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 			}
 		}
 		h.finished(running, sessions.TurnCompleted)
-		saved, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, h.session.ID, input.TurnID, action.CallID)
+		saved, err := FixtureFunctionCall(ctx, h.s.pool, h.tenant, h.session.ID, input.TurnID, action.CallID)
 		if err != nil || !saved.Applied {
 			t.Fatal(saved, err)
 		}
-		page, err := sessionReads(h.db.pool).ListItems(ctx, h.tenant, h.session.ID, "", 100, true)
+		page, err := sessionAdapter(h.s).ListItems(ctx, h.tenant, h.session.ID, "", 100, true)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/function_execution_test.go b/services/core/tests/integration/function_execution_test.go
index 28dd4ea59..16b67e438 100644
--- a/services/core/tests/integration/function_execution_test.go
+++ b/services/core/tests/integration/function_execution_test.go
@@ -24,7 +24,7 @@ func newFunctionHarness(t *testing.T) *dispatchHarness {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := bindSessionDevice(t, h.db, h.tenant, h.session.ID, h.device.ID); err != nil {
+	if err := bindSessionDevice(t, h.s, h.tenant, h.session.ID, h.device.ID); err != nil {
 		t.Fatal(err)
 	}
 	h.write("", proto.TypeHeartbeat, proto.HeartbeatPayload{SupportedAgentKinds: []proto.SupportedAgentKind{{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Streaming: proto.CapabilitySupported, Steering: proto.CapabilitySupported, Resume: proto.CapabilitySupported, DurableTurns: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported, WebSearchControl: proto.CapabilitySupported, TextVerbosity: proto.CapabilitySupported, ExecutionControls: proto.CapabilitySupported, SubagentControl: proto.CapabilitySupported, ToolObservations: proto.CapabilitySupported, EnvironmentNone: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported, FunctionResultImages: proto.CapabilitySupported, Preparation: proto.CapabilitySupported})}}})
@@ -88,7 +88,7 @@ func TestExecutionFunctionsWaitForEveryApplicationReceipt(t *testing.T) {
 		var reply proto.FunctionResultPayload
 		_ = h.read(proto.TypeFunctionResult).DecodePayload(&reply)
 		public := items.Identity(input.TurnID, "tool:"+reply.CallID)
-		saved, err := FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, public)
+		saved, err := FixtureFunctionCall(t.Context(), h.s.pool, h.tenant, h.session.ID, input.TurnID, public)
 		if err != nil || saved.Applied || reply.DeliveryID != "function:"+public || len(reply.Content) != 1 || *reply.Content[0].Text != "saved" {
 			t.Fatal(saved, reply, err)
 		}
@@ -159,7 +159,7 @@ func TestExecutionFunctionsCancellationAndUnconfirmedResults(t *testing.T) {
 					t.Fatal(bound, err)
 				}
 			}
-			saved, err := FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, id)
+			saved, err := FixtureFunctionCall(t.Context(), h.s.pool, h.tenant, h.session.ID, input.TurnID, id)
 			if err != nil || saved.Applied || len(saved.Result) == 0 {
 				t.Fatal(saved, err)
 			}
@@ -194,7 +194,7 @@ func TestExecutionFunctionsRequireAdvertisedCapability(t *testing.T) {
 		t.Fatal(err)
 	}
 	h.session = session
-	if err := bindSessionDevice(t, h.db, h.tenant, session.ID, h.device.ID); err != nil {
+	if err := bindSessionDevice(t, h.s, h.tenant, session.ID, h.device.ID); err != nil {
 		t.Fatal(err)
 	}
 	input := h.message("start", "Run")
diff --git a/services/core/tests/integration/function_images_native_test.go b/services/core/tests/integration/function_images_native_test.go
index ae4925610..d0c78d6df 100644
--- a/services/core/tests/integration/function_images_native_test.go
+++ b/services/core/tests/integration/function_images_native_test.go
@@ -31,7 +31,7 @@ func TestNativeFunctionImagePublicExecution(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Minute)
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	defer func() {
@@ -47,7 +47,7 @@ func TestNativeFunctionImagePublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -72,7 +72,7 @@ func TestNativeFunctionImagePublicExecution(t *testing.T) {
 		t.Fatal("invalid evidence", err)
 	}
 	for _, item := range proof.Calls {
-		call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, item.Turn, item.Call)
+		call, err := FixtureFunctionCall(ctx, h.s.pool, h.tenant, proof.Session, item.Turn, item.Call)
 		if err != nil || !call.Applied {
 			t.Fatal("function delivery acknowledgement missing", err)
 		}
diff --git a/services/core/tests/integration/function_input_execution_test.go b/services/core/tests/integration/function_input_execution_test.go
index eec056ea2..63dbe8d17 100644
--- a/services/core/tests/integration/function_input_execution_test.go
+++ b/services/core/tests/integration/function_input_execution_test.go
@@ -52,7 +52,7 @@ func TestExecutionFunctionInputBatchStillSteersMessages(t *testing.T) {
 	}
 	h.write(input.TurnID, proto.TypeDone, proto.DonePayload{Content: "done"})
 	h.finished(running, sessions.TurnCompleted)
-	saved, err := FixtureFunctionCall(t.Context(), h.db.pool, h.tenant, h.session.ID, input.TurnID, state.RequiredActions[0].CallID)
+	saved, err := FixtureFunctionCall(t.Context(), h.s.pool, h.tenant, h.session.ID, input.TurnID, state.RequiredActions[0].CallID)
 	if err != nil || !saved.Applied {
 		t.Fatal(saved, err)
 	}
diff --git a/services/core/tests/integration/function_inputs_public_test.go b/services/core/tests/integration/function_inputs_public_test.go
index 16b44ec29..486a53276 100644
--- a/services/core/tests/integration/function_inputs_public_test.go
+++ b/services/core/tests/integration/function_inputs_public_test.go
@@ -21,7 +21,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if python == "" {
 		t.Skip("OAC_TEST_OFFICIAL_SDK_PYTHON is required for official-client verification")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second)
 	defer cancel()
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
@@ -40,14 +40,14 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if _, err := transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	functions := executionOwner(t, db).Sessions
+	functions := executionOwner(t, s).Sessions
 	for _, id := range []string{"a", "b", "c", "rollback", "late"} {
 		if err := functions.RecordFunctionCall(ctx, tenant, session.ID, input.TurnID, sessions.FunctionCall{CallID: id, ExecutorCallID: "native-" + id, Name: "lookup", Arguments: json.RawMessage(`{}`)}); err != nil {
 			t.Fatal(err)
 		}
 	}
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
-	handler, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -72,7 +72,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 		t.Fatalf("SDK admission: %s %v %s", line, err, stderr.String())
 	}
 	for _, id := range []string{"a", "b", "c", "rollback", "late"} {
-		call, err := FixtureFunctionCall(ctx, db.pool, tenant, session.ID, input.TurnID, id)
+		call, err := FixtureFunctionCall(ctx, s.pool, tenant, session.ID, input.TurnID, id)
 		if err != nil || call.Applied {
 			t.Fatal(call, err)
 		}
diff --git a/services/core/tests/integration/function_public_native_test.go b/services/core/tests/integration/function_public_native_test.go
index 9049edfa7..0da28f9c9 100644
--- a/services/core/tests/integration/function_public_native_test.go
+++ b/services/core/tests/integration/function_public_native_test.go
@@ -43,7 +43,7 @@ func TestNativePublicFunctionExecution(t *testing.T) {
 		t.Fatal(proof, err)
 	}
 	for i, callID := range proof.Calls {
-		call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turns[i], callID)
+		call, err := FixtureFunctionCall(ctx, h.s.pool, h.tenant, proof.Session, proof.Turns[i], callID)
 		if err != nil || call.Applied != (i < 2) {
 			t.Fatal(call, err)
 		}
@@ -60,7 +60,7 @@ func TestNativePublicFunctionExecution(t *testing.T) {
 
 func nativePublicFunctionServer(t *testing.T, h *dispatchHarness, ctx context.Context, provider *v1.ModelProviderInput) (string, string) {
 	t.Helper()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	ctx, cancel := context.WithCancel(ctx)
 	t.Cleanup(cancel)
 	done := make(chan error, 1)
@@ -75,7 +75,7 @@ func nativePublicFunctionServer(t *testing.T, h *dispatchHarness, ctx context.Co
 	})
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant}})
-	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(t, worker), nativeDeploymentDefaults("gpt-5.5", provider))
+	handler, err := publicHandler(t, h.s, auth, "codex", workerExecution(t, worker), nativeDeploymentDefaults("gpt-5.5", provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/function_state_public_test.go b/services/core/tests/integration/function_state_public_test.go
index 0b9cedc0a..7c1b84cd7 100644
--- a/services/core/tests/integration/function_state_public_test.go
+++ b/services/core/tests/integration/function_state_public_test.go
@@ -21,7 +21,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	if python == "" {
 		t.Skip("OAC_TEST_OFFICIAL_SDK_PYTHON is required for official-client verification")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second)
 	defer cancel()
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
@@ -37,7 +37,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	if _, err := transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	functions := executionOwner(t, db).Sessions
+	functions := executionOwner(t, s).Sessions
 	record := func(id string) {
 		t.Helper()
 		if err := functions.RecordFunctionCall(ctx, tenant, session.ID, input.TurnID, sessions.FunctionCall{CallID: id, ExecutorCallID: "private-" + id, Name: "lookup", Arguments: json.RawMessage(`{"ticket":9007199254740993}`)}); err != nil {
@@ -46,7 +46,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	}
 	record("first")
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
-	handler, err := publicHandler(t, s, db, auth, "codex")
+	handler, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/function_stream_native_test.go b/services/core/tests/integration/function_stream_native_test.go
index 481451e5e..29fcf4954 100644
--- a/services/core/tests/integration/function_stream_native_test.go
+++ b/services/core/tests/integration/function_stream_native_test.go
@@ -37,7 +37,7 @@ func TestNativePublicFunctionStreamHelper(t *testing.T) {
 		t.Fatal(proof, err)
 	}
 	for i, callID := range proof.Calls {
-		call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turns[i], callID)
+		call, err := FixtureFunctionCall(ctx, h.s.pool, h.tenant, proof.Session, proof.Turns[i], callID)
 		if err != nil || !call.Applied {
 			t.Fatal(call, err)
 		}
diff --git a/services/core/tests/integration/function_worker_test.go b/services/core/tests/integration/function_worker_test.go
index 5e32cfdde..916f4f113 100644
--- a/services/core/tests/integration/function_worker_test.go
+++ b/services/core/tests/integration/function_worker_test.go
@@ -42,7 +42,7 @@ func TestWorkerWaitsForToolCapabilities(t *testing.T) {
 					}
 				}
 				if prebound && isMCP {
-					if err := bindSessionDevice(t, h.db, h.tenant, h.session.ID, h.device.ID); err != nil {
+					if err := bindSessionDevice(t, h.s, h.tenant, h.session.ID, h.device.ID); err != nil {
 						t.Fatal(err)
 					}
 				}
@@ -66,7 +66,7 @@ func TestWorkerWaitsForToolCapabilities(t *testing.T) {
 				input := h.message("queued", "Look up ticket")
 				ctx, cancel := context.WithCancel(t.Context())
 				defer cancel()
-				worker := startWorker(t, ctx, h.db, h.d)
+				worker := startWorker(t, ctx, h.s, h.d)
 				done := make(chan error, 1)
 				go func() { done <- worker.Run(ctx) }()
 				defer func() {
@@ -83,7 +83,7 @@ func TestWorkerWaitsForToolCapabilities(t *testing.T) {
 					t.Fatal(current, err)
 				}
 				if !prebound {
-					if _, err := fixtureSessionStore(h.db).GetSessionDevice(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
+					if _, err := sessionAdapter(h.s).GetSessionDevice(ctx, h.tenant, h.session.ID); !errors.Is(err, sessions.ErrNotFound) {
 						t.Fatal("bound an incapable device", err)
 					}
 				}
@@ -125,8 +125,8 @@ func mcpBearerWorkerConfiguration(t *testing.T, h *dispatchHarness) (string, str
 	if err != nil {
 		t.Fatal(err)
 	}
-	h.s, h.db = NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	_, service, err := fixtureVaults(h.db)
+	h.s = NewWithCredentialCipher(pool, cipher)
+	_, service, err := fixtureVaults(h.s)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/harness_onboarding_test.go b/services/core/tests/integration/harness_onboarding_test.go
index dad2531bd..b655f11cb 100644
--- a/services/core/tests/integration/harness_onboarding_test.go
+++ b/services/core/tests/integration/harness_onboarding_test.go
@@ -49,7 +49,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	started, write, declaration := startOnboardingPeer(t, h)
 	ctx, cancel := context.WithCancel(t.Context())
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	stopped := make(chan error, 1)
 	go func() { stopped <- worker.Run(ctx) }()
 	defer func() {
@@ -62,7 +62,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	}()
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant}})
-	handler, err := publicHandler(t, h.s, h.db, auth, "fixture_harness", workerExecution(t, worker), withPolicy(policy))
+	handler, err := publicHandler(t, h.s, auth, "fixture_harness", workerExecution(t, worker), withPolicy(policy))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/hosted_initialization_failure_public_test.go b/services/core/tests/integration/hosted_initialization_failure_public_test.go
index 15ea8c8ba..ee461f4e5 100644
--- a/services/core/tests/integration/hosted_initialization_failure_public_test.go
+++ b/services/core/tests/integration/hosted_initialization_failure_public_test.go
@@ -98,19 +98,17 @@ func (p *hostedFailureProvider) prepare(request proto.RuntimePreparePayload, _ [
 	return completedInitialization(request, nil)
 }
 
-func hostedFailureStore(t *testing.T) (*Store, fixtureDB) {
+func hostedFailureStore(t *testing.T) *Store {
 	t.Helper()
 	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	s.SetPlacement(fixtureRules(t, db))
-	return s, db
+	return NewWithCredentialCipher(pool, cipher)
 }
 
-func hostedFailureSession(t *testing.T, s *Store, db fixtureDB, tenant string, input sessions.CreateSession) (sessions.Session, sessions.Environment) {
+func hostedFailureSession(t *testing.T, s *Store, tenant string, input sessions.CreateSession) (sessions.Session, sessions.Environment) {
 	t.Helper()
 	input.Creator, input.Engine, input.IdempotencyKey = FixtureCreator(), "codex", uuid.NewString()
 	input.Configuration = json.RawMessage(`{"agent":{"id":"agent_test","model":"test-model","tools":[]},"environment":{"type":"openai_hosted","network":{"access":"enabled"}}}`)
@@ -121,21 +119,21 @@ func hostedFailureSession(t *testing.T, s *Store, db fixtureDB, tenant string, i
 	if err != nil {
 		t.Fatal(err)
 	}
-	environment, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), tenant, session.ID)
+	environment, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	return session, environment
 }
 
-func failHostedInitialization(t *testing.T, s *Store, db fixtureDB, tenant string, environment sessions.Environment, p *hostedFailureProvider) {
+func failHostedInitialization(t *testing.T, s *Store, tenant string, environment sessions.Environment, p *hostedFailureProvider) {
 	t.Helper()
 	key := uuid.NewString()
-	w, _ := managedWorkerMode(t, s, db, key, p, false, true)
+	w, _ := managedWorkerMode(t, s, key, p, false, true)
 	if _, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err != nil {
 		t.Fatal(err)
 	}
-	awaitInitialization(t, db.pool, tenant, environment.ID, "failed")
+	awaitInitialization(t, s, tenant, environment.ID, "failed")
 }
 
 // H1/H2/H3/H4: one transaction records the Environment failure, an error event
@@ -182,12 +180,12 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 			"Failed to provision environment: Skill installation failed", []string{"configure", "skill"}},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			s, db := hostedFailureStore(t)
+			s := hostedFailureStore(t)
 			tenant := uuid.NewString()
-			session, environment := hostedFailureSession(t, s, db, tenant, test.input)
+			session, environment := hostedFailureSession(t, s, tenant, test.input)
 			p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}},
 				fail: test.p.fail, skip: test.p.skip, result: test.p.result, err: test.p.err}
-			failHostedInitialization(t, s, db, tenant, environment, p)
+			failHostedInitialization(t, s, tenant, environment, p)
 			if !reflect.DeepEqual(p.steps, test.steps) || p.kills != 0 || p.commandCalls.Load() != 0 {
 				t.Fatal("failed initialization continued or reclaimed compute", p.steps, p.kills)
 			}
@@ -247,15 +245,15 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 // A pending initial input settles exactly as before; the one failed snapshot
 // carries both that settlement and the provisioning failure.
 func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
-	s, db := hostedFailureStore(t)
+	s := hostedFailureStore(t)
 	tenant := uuid.NewString()
-	session, environment := hostedFailureSession(t, s, db, tenant, sessions.CreateSession{
+	session, environment := hostedFailureSession(t, s, tenant, sessions.CreateSession{
 		Initialization: environmentconfig.Setup{Commands: []environmentconfig.SetupCommand{{Command: "exit 3"}}},
 		InitialInputs:  []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"initial"}`)}},
 	})
 	p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, fail: "setup",
 		result: failedInitialization(3)}
-	failHostedInitialization(t, s, db, tenant, environment, p)
+	failHostedInitialization(t, s, tenant, environment, p)
 	read, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || read.PendingInput || read.EnvironmentInputActivity == nil || read.EnvironmentInputActivity.Status != "failed" ||
 		read.EnvironmentInputActivity.Failure != "environment_unavailable" || read.EnvironmentFailure == nil {
@@ -281,9 +279,9 @@ func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
 // stream ends after agent.session.failed; later input gets the observed 409;
 // delete succeeds; tenant B sees nothing; the canary never appears.
 func TestHostedInitializationFailurePublicHTTP(t *testing.T) {
-	s, db := hostedFailureStore(t)
+	s := hostedFailureStore(t)
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
-	session, environment := hostedFailureSession(t, s, db, tenant, sessions.CreateSession{
+	session, environment := hostedFailureSession(t, s, tenant, sessions.CreateSession{
 		Initialization: environmentconfig.Setup{Commands: []environmentconfig.SetupCommand{{Command: "echo " + hostedFailureCanary + "; exit 3"}}},
 		Metadata:       map[string]string{"case": "setup-exit3"},
 	})
@@ -294,12 +292,12 @@ func TestHostedInitializationFailurePublicHTTP(t *testing.T) {
 	previous := slog.Default()
 	slog.SetDefault(slog.New(slog.NewTextHandler(logs, &slog.HandlerOptions{Level: slog.LevelDebug})))
 	t.Cleanup(func() { slog.SetDefault(previous) })
-	w, _ := managedWorkerMode(t, s, db, key, p, false, true)
+	w, _ := managedWorkerMode(t, s, key, p, false, true)
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "tenant-b", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, w))
+	handler, err := publicHandler(t, s, auth, "codex", workerExecution(t, w))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -337,7 +335,7 @@ func TestHostedInitializationFailurePublicHTTP(t *testing.T) {
 	if _, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err != nil {
 		t.Fatal(err)
 	}
-	awaitInitialization(t, db.pool, tenant, environment.ID, "failed")
+	awaitInitialization(t, s, tenant, environment.ID, "failed")
 
 	reason := `Failed to provision environment: script "setup_commands[0]" failed with exit code 3`
 	read, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
diff --git a/services/core/tests/integration/initial_files_http_test.go b/services/core/tests/integration/initial_files_http_test.go
index ccf870867..9fee427b4 100644
--- a/services/core/tests/integration/initial_files_http_test.go
+++ b/services/core/tests/integration/initial_files_http_test.go
@@ -19,12 +19,11 @@ func TestInitialFilesHTTPInlineLimitsAndRetry(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	s.SetPlacement(fixtureRules(t, db))
+	s := NewWithCredentialCipher(pool, cipher)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	// Exercise HTTP parsing and durable storage without starting a Runtime.
-	handler, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), managedSandboxes(t, db), fixtureDeploymentProvider())
+	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), managedSandboxes(t, s), fixtureDeploymentProvider())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -59,7 +58,7 @@ func TestInitialFilesHTTPInlineLimitsAndRetry(t *testing.T) {
 			id = response.ID
 		}
 		for position := range files {
-			_, actual, err := fixtureSessionStore(db).ReadInitialEnvironmentFile(t.Context(), tenant, id, position)
+			_, actual, err := sessionAdapter(s).ReadInitialEnvironmentFile(t.Context(), tenant, id, position)
 			if err != nil || !bytes.Equal(actual, data) {
 				t.Fatal("large HTTP snapshot differs", err)
 			}
diff --git a/services/core/tests/integration/input_conflicts_public_test.go b/services/core/tests/integration/input_conflicts_public_test.go
index 258ffb39f..41578612f 100644
--- a/services/core/tests/integration/input_conflicts_public_test.go
+++ b/services/core/tests/integration/input_conflicts_public_test.go
@@ -37,21 +37,21 @@ const (
 // and every rejection leaves the database and the pending action unchanged.
 func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	ctx := t.Context()
 	tenant, owner, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "conflict-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "conflict-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
-	functions := executionOwner(t, db).Sessions
+	functions := executionOwner(t, s).Sessions
 
 	create := func(environment string, initial bool) string {
 		t.Helper()
@@ -133,7 +133,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	// reject checks each response body and that no rejection wrote anything.
 	reject := func(cases []rejection, watched ...string) {
 		t.Helper()
-		digest := databaseDigest(t, db.pool)
+		digest := databaseDigest(t, s.pool)
 		before := make([]string, len(watched))
 		for i, session := range watched {
 			before[i] = read(session)
@@ -147,7 +147,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 				t.Errorf("%s: %d %s", tc.name, status, body)
 			}
 		}
-		if after := databaseDigest(t, db.pool); !reflect.DeepEqual(after, digest) {
+		if after := databaseDigest(t, s.pool); !reflect.DeepEqual(after, digest) {
 			t.Error("rejected input changed the database")
 		}
 		for i, session := range watched {
@@ -232,7 +232,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	if status, body := submit(owner, session, "same-after-completion", valid); status != http.StatusAccepted || body != "" {
 		t.Fatalf("identical result after completion: %d %s", status, body)
 	}
-	if call, err := FixtureFunctionCall(ctx, db.pool, tenant, session, current.TurnID, "pending-call"); err != nil || !bytes.Contains(call.Result, []byte(`"value"`)) {
+	if call, err := FixtureFunctionCall(ctx, s.pool, tenant, session, current.TurnID, "pending-call"); err != nil || !bytes.Contains(call.Result, []byte(`"value"`)) {
 		t.Fatal("saved result changed", call, err)
 	}
 
@@ -246,7 +246,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 		{"after-cancel", owner, session, []string{late}, 409, turnConflictBody, ""},
 		{"after-cancel-foreign", foreign, session, []string{late}, 404, missingSessionBody, ""},
 	}, session)
-	if call, err := FixtureFunctionCall(ctx, db.pool, tenant, session, cancelled.TurnID, "late-call"); err != nil || call.Result != nil {
+	if call, err := FixtureFunctionCall(ctx, s.pool, tenant, session, cancelled.TurnID, "late-call"); err != nil || call.Result != nil {
 		t.Fatal("late result was saved", call, err)
 	}
 
@@ -272,7 +272,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	if status, body := createSession("first"); status != http.StatusCreated {
 		t.Fatal(status, body)
 	}
-	digest := databaseDigest(t, db.pool)
+	digest := databaseDigest(t, s.pool)
 	status, body := createSession("changed")
 	var creation struct {
 		Error struct {
@@ -285,7 +285,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 		creation.Error.Type != "conflict_error" || creation.Error.Code != "idempotency_conflict" || creation.Error.Param != nil {
 		t.Fatalf("creation key reuse: %d %s", status, body)
 	}
-	if after := databaseDigest(t, db.pool); !reflect.DeepEqual(after, digest) {
+	if after := databaseDigest(t, s.pool); !reflect.DeepEqual(after, digest) {
 		t.Error("creation key reuse changed the database")
 	}
 }
diff --git a/services/core/tests/integration/item_order_migration_test.go b/services/core/tests/integration/item_order_migration_test.go
index a7ac7c6fc..31b3abf22 100644
--- a/services/core/tests/integration/item_order_migration_test.go
+++ b/services/core/tests/integration/item_order_migration_test.go
@@ -152,7 +152,7 @@ func TestItemOrderMigrationPreservesIndexedHistory(t *testing.T) {
 	if _, err = transitionTurn(ctx, s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	if err = executionOwner(t, fixtureDB{pool: migratedPool}).Sessions.AppendTurnEvents(ctx, tenant, session, turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"after-upgrade","delta":"continued"}`)}}); err != nil {
+	if err = executionOwner(t, New(migratedPool)).Sessions.AppendTurnEvents(ctx, tenant, session, turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"after-upgrade","delta":"continued"}`)}}); err != nil {
 		t.Fatal(err)
 	}
 	addedID := items.Identity(turn, "message:after-upgrade")
diff --git a/services/core/tests/integration/item_order_test.go b/services/core/tests/integration/item_order_test.go
index 788a2b3bc..d7c152ac7 100644
--- a/services/core/tests/integration/item_order_test.go
+++ b/services/core/tests/integration/item_order_test.go
@@ -16,7 +16,7 @@ import (
 func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T) {
 	ctx := context.Background()
 	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "ordered"})
 	if err != nil {
@@ -30,7 +30,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	page, err := sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+	page, err := sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 1 {
 		t.Fatal(page, err)
 	}
@@ -54,7 +54,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 	if _, err = sendMessage(ctx, s, tenant, session.ID, "steer", json.RawMessage(`{"text":"continue"}`)); err != nil {
 		t.Fatal(err)
 	}
-	page, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+	page, err = sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 5 {
 		t.Fatal(page, err)
 	}
@@ -87,7 +87,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 			var got []string
 			cursor := ""
 			for {
-				page, err := sessionReads(pool).ListItems(ctx, tenant, session.ID, cursor, 2, asc)
+				page, err := sessionAdapter(s).ListItems(ctx, tenant, session.ID, cursor, 2, asc)
 				if err != nil {
 					t.Fatal(err)
 				}
diff --git a/services/core/tests/integration/item_reads_test.go b/services/core/tests/integration/item_reads_test.go
index 9e15be0c7..31b01fa3b 100644
--- a/services/core/tests/integration/item_reads_test.go
+++ b/services/core/tests/integration/item_reads_test.go
@@ -15,8 +15,8 @@ import (
 
 func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T) {
 	ctx := context.Background()
-	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	s, _ := testStore(t)
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "items"})
 	if err != nil {
@@ -46,7 +46,7 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 			t.Fatal(err)
 		}
 	}
-	page, err := sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+	page, err := sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -60,7 +60,7 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	reopened := sessionReads(pool)
+	reopened := sessionAdapter(s)
 	page, err = reopened.ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil {
 		t.Fatal(err)
@@ -104,13 +104,13 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 	}
 	other, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "other"})
 	// A foreign parent is not found before the cursor is read.
-	if _, err = sessionReads(pool).ListItems(ctx, uuid.NewString(), session.ID, page.Items[0].ID, 20, true); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err = sessionAdapter(s).ListItems(ctx, uuid.NewString(), session.ID, page.Items[0].ID, 20, true); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal(err)
 	}
 	// Another Session's Item is an invalid cursor here, like a missing or malformed one.
 	for _, cursor := range []string{page.Items[0].ID, uuid.NewString(), "not-a-uuid"} {
 		var invalid *sessions.CursorError
-		if _, err = sessionReads(pool).ListItems(ctx, tenant, other.ID, cursor, 20, true); !errors.As(err, &invalid) || invalid.Message != "Invalid session item ID in `after`" {
+		if _, err = sessionAdapter(s).ListItems(ctx, tenant, other.ID, cursor, 20, true); !errors.As(err, &invalid) || invalid.Message != "Invalid session item ID in `after`" {
 			t.Fatal(cursor, err)
 		}
 	}
@@ -118,8 +118,8 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 
 func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T) {
 	ctx := context.Background()
-	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	s, _ := testStore(t)
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "legacy"})
 	input, err := sendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
@@ -138,7 +138,7 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 	if err != nil || len(events) != 0 {
 		t.Fatal(events, err)
 	}
-	page, err := sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+	page, err := sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 1 {
 		t.Fatal(page, err)
 	}
@@ -146,7 +146,7 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	current, err := sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+	current, err := sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(current.Items) != 2 || *current.Items[1].Content[0].Text != "legacy answer" {
 		t.Fatal(current, err)
 	}
@@ -154,8 +154,8 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 
 func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 	ctx := context.Background()
-	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	s, _ := testStore(t)
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	for _, receiptOnly := range []bool{true, false} {
 		session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString()})
@@ -177,7 +177,7 @@ func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		page, err := sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+		page, err := sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 		if err != nil || len(page.Items) != 2 || page.Items[1].Status != "incomplete" || *page.Items[1].Content[0].Text != "retained cancellation text" {
 			t.Fatal(page, err)
 		}
@@ -186,8 +186,8 @@ func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 
 func TestLegacyFailureRetainsPartialAnswerAcrossRecovery(t *testing.T) {
 	ctx := context.Background()
-	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	s, _ := testStore(t)
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "failed-items"})
 	if err != nil {
@@ -215,7 +215,7 @@ func TestLegacyFailureRetainsPartialAnswerAcrossRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	page, err := sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true)
+	page, err := sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 4 {
 		t.Fatal(page, err)
 	}
diff --git a/services/core/tests/integration/list_cursor_public_test.go b/services/core/tests/integration/list_cursor_public_test.go
index 29d801bd7..9cf08ae1a 100644
--- a/services/core/tests/integration/list_cursor_public_test.go
+++ b/services/core/tests/integration/list_cursor_public_test.go
@@ -226,24 +226,23 @@ func TestListCursorErrorsPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	s.SetPlacement(fixtureRules(t, db))
+	s := NewWithCredentialCipher(pool, cipher)
 	owner, foreign := uuid.NewString(), uuid.NewString()
 	ownerTenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "cursor-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "cursor-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
-	leased := executionOwner(t, db)
-	skillService := SkillService(t, db.pool, db.cipher)
-	_, sessionService, err := fixtureSessions(db)
+	leased := executionOwner(t, s)
+	skillService := SkillService(t, s.pool, s.credentialCipher)
+	sessionService, err := newSessionService(s)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/list_query_public_test.go b/services/core/tests/integration/list_query_public_test.go
index 059d7673e..8a67221f8 100644
--- a/services/core/tests/integration/list_query_public_test.go
+++ b/services/core/tests/integration/list_query_public_test.go
@@ -25,7 +25,7 @@ func TestListQueryOfficialClientPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "query-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
@@ -33,7 +33,7 @@ func TestListQueryOfficialClientPostgres(t *testing.T) {
 	})
 	// Use real admission while leaving dispatch paused. Public cancellation retains
 	// the queued history; this fixture does not perform native or model execution.
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{})
+	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{})
 	t.Cleanup(func() {
 		stopped, cancel := context.WithCancel(context.Background())
 		cancel()
@@ -41,7 +41,7 @@ func TestListQueryOfficialClientPostgres(t *testing.T) {
 			t.Error(err)
 		}
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker))
+	handler, err := publicHandler(t, s, auth, "codex", workerExecution(t, worker))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/local_artifact_export_test.go b/services/core/tests/integration/local_artifact_export_test.go
index abd071810..06775a674 100644
--- a/services/core/tests/integration/local_artifact_export_test.go
+++ b/services/core/tests/integration/local_artifact_export_test.go
@@ -41,7 +41,7 @@ func completeLocalArtifactExport(t *testing.T, h *dispatchHarness, worker *execu
 	if next.DecodePayload(&export) != nil || export.Step != "next" || export.Offset != int64(data.Len()) {
 		t.Fatal("export did not await native completion")
 	}
-	page, err := sessionReads(h.db.pool).ListSessionArtifacts(t.Context(), h.tenant, h.session.ID, "", "", 20, false)
+	page, err := sessionAdapter(h.s).ListSessionArtifacts(t.Context(), h.tenant, h.session.ID, "", "", 20, false)
 	if err != nil || len(page.Artifacts) != 0 {
 		t.Fatal("capture published before native completion", err)
 	}
diff --git a/services/core/tests/integration/local_environment_file_write_test.go b/services/core/tests/integration/local_environment_file_write_test.go
index b256291d0..0b802a30f 100644
--- a/services/core/tests/integration/local_environment_file_write_test.go
+++ b/services/core/tests/integration/local_environment_file_write_test.go
@@ -52,7 +52,7 @@ func TestLocalEnvironmentFileWriteOwnsMutationBeforeDispatch(t *testing.T) {
 	if begin.DecodePayload(&request) != nil || request.Step != "begin" || request.EnvironmentID != environment.ID || request.SessionID != h.session.ID || request.Path != "input" || request.SizeBytes != 3 {
 		t.Fatal("upload identity changed")
 	}
-	intent, err := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
+	intent, err := FixtureFileWrite(t.Context(), h.s.pool, h.tenant, environment.ID, begin.ID)
 	if err != nil || intent.State != "pending" || intent.Identity.DeviceID != h.device.ID {
 		t.Fatal("dispatch preceded durable ownership", intent, err)
 	}
@@ -75,7 +75,7 @@ func TestLocalEnvironmentFileWriteOwnsMutationBeforeDispatch(t *testing.T) {
 	}
 	h.write(begin.ID, proto.TypeWorkspaceWriteResult, proto.WorkspaceWriteResultPayload{Outcome: "completed", SizeBytes: 3})
 	awaitDaemonRemoteCondition(t, t.Context(), 3*time.Second, "detached durable commit", func() bool {
-		got, e := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
+		got, e := FixtureFileWrite(t.Context(), h.s.pool, h.tenant, environment.ID, begin.ID)
 		return e == nil && got.State == "committed"
 	})
 	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)
@@ -94,7 +94,7 @@ func TestLocalEnvironmentFileWriteLostReceiptRemainsPending(t *testing.T) {
 	if result := awaitLocalWrite(t, done); !errors.Is(result.err, execution.ErrExecutionUnavailable) {
 		t.Fatal(result.err)
 	}
-	intent, err := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
+	intent, err := FixtureFileWrite(t.Context(), h.s.pool, h.tenant, environment.ID, begin.ID)
 	if err != nil || intent.State != "pending" {
 		t.Fatal("disconnect guessed rejection", intent, err)
 	}
@@ -112,7 +112,7 @@ func TestLocalEnvironmentFileWriteKnownRejectionReleasesMutation(t *testing.T) {
 		if result := awaitLocalWrite(t, done); !errors.Is(result.err, execution.ErrExecutionUnavailable) {
 			t.Fatal(result.err)
 		}
-		intent, err := FixtureFileWrite(t.Context(), h.db.pool, h.tenant, environment.ID, begin.ID)
+		intent, err := FixtureFileWrite(t.Context(), h.s.pool, h.tenant, environment.ID, begin.ID)
 		if err != nil || intent.State != "rejected" {
 			t.Fatal("rejection did not settle", intent, err)
 		}
diff --git a/services/core/tests/integration/local_environment_worker_test.go b/services/core/tests/integration/local_environment_worker_test.go
index 76740497a..494efc624 100644
--- a/services/core/tests/integration/local_environment_worker_test.go
+++ b/services/core/tests/integration/local_environment_worker_test.go
@@ -21,7 +21,7 @@ func localWorker(t *testing.T, scoped, execute bool) (*dispatchHarness, *executi
 		_, pool := testStore(t)
 		insertWorkerRuntimeAllocation(t, pool, h, "disabled")
 	}
-	environment, err := fixtureSessionStore(h.db).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
+	environment, err := sessionAdapter(h.s).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -41,7 +41,7 @@ func localWorker(t *testing.T, scoped, execute bool) (*dispatchHarness, *executi
 		info, _, _ := peer.AgentKindStatus("codex")
 		return info.Capabilities.LocalEnvironment
 	})
-	w := startWorker(t, t.Context(), h.db, h.d)
+	w := startWorker(t, t.Context(), h.s, h.d)
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- w.Run(ctx) }()
@@ -95,14 +95,14 @@ func TestLocalEnvironmentWorkerRejectsGeneralDeviceDespiteCapability(t *testing.
 	if err != nil {
 		t.Fatal(err)
 	}
-	unassigned, err := fixtureSessionStore(h.db).GetSessionEnvironment(t.Context(), h.tenant, other.ID)
+	unassigned, err := sessionAdapter(h.s).GetSessionEnvironment(t.Context(), h.tenant, other.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if _, err := w.ReadEnvironmentDirectory(t.Context(), unassigned, "reports"); !errors.Is(err, execution.ErrExecutionUnavailable) {
 		t.Fatal("unassigned environment selected general device", err)
 	}
-	if _, err := fixtureSessionStore(h.db).GetSessionDevice(t.Context(), h.tenant, other.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(h.s).GetSessionDevice(t.Context(), h.tenant, other.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("read persisted an unauthorized placement", err)
 	}
 }
@@ -151,7 +151,7 @@ func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *test
 	if err != nil || bound.Device.EnvironmentID != environment.ID || bound.NativeSessionID != "local-native-history" {
 		t.Fatal("local native identity was not retained", err)
 	}
-	artifacts, err := sessionReads(h.db.pool).ListSessionArtifacts(t.Context(), h.tenant, h.session.ID, environment.ID, "", 20, false)
+	artifacts, err := sessionAdapter(h.s).ListSessionArtifacts(t.Context(), h.tenant, h.session.ID, environment.ID, "", 20, false)
 	if err != nil || len(artifacts.Artifacts) != 1 || artifacts.Artifacts[0].Path != "/workspace/outputs/result.bin" || artifacts.Artifacts[0].TurnID != start.RunID || artifacts.Artifacts[0].SizeBytes != 3 {
 		t.Fatalf("completed turn did not publish output: %+v %v", artifacts, err)
 	}
diff --git a/services/core/tests/integration/managed_fixture_test.go b/services/core/tests/integration/managed_fixture_test.go
index 2fb5b7ff6..27cac8f77 100644
--- a/services/core/tests/integration/managed_fixture_test.go
+++ b/services/core/tests/integration/managed_fixture_test.go
@@ -14,5 +14,5 @@ func newManagedTestStore(t *testing.T) (*Store, *pgxpool.Pool) {
 	t.Helper()
 	pool := pgtest.OpenIsolated(t, nil)
 	// Hosted Sessions freeze a model provider, which needs a credential key.
-	return withPlacement(t, NewWithCredentialCipher(pool, fixtureCipher)), pool
+	return NewWithCredentialCipher(pool, fixtureCipher), pool
 }
diff --git a/services/core/tests/integration/mcode_public_native_test.go b/services/core/tests/integration/mcode_public_native_test.go
index 03198bdcc..85ed9fca6 100644
--- a/services/core/tests/integration/mcode_public_native_test.go
+++ b/services/core/tests/integration/mcode_public_native_test.go
@@ -31,7 +31,7 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 12*time.Minute)
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	stopped := make(chan error, 1)
 	go func() { stopped <- worker.Run(ctx) }()
 	defer func() {
@@ -47,7 +47,7 @@ func TestNativeMCodePublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, "mcode", workerExecution(t, worker), acceptUnavailable(t), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, auth, "mcode", workerExecution(t, worker), acceptUnavailable(t), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/mcp_credential_selection_public_test.go b/services/core/tests/integration/mcp_credential_selection_public_test.go
index 72bab89e5..b047c7608 100644
--- a/services/core/tests/integration/mcp_credential_selection_public_test.go
+++ b/services/core/tests/integration/mcp_credential_selection_public_test.go
@@ -30,13 +30,13 @@ func TestMCPCredentialSelectionPublicPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	tenantA, tokenA, tokenB := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-a", TokenSHA256: runtimedevice.HashCredential(tokenA), TenantID: tenantA},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-b", TokenSHA256: runtimedevice.HashCredential(tokenB), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/message_image_admission_test.go b/services/core/tests/integration/message_image_admission_test.go
index d68af03d6..02024727a 100644
--- a/services/core/tests/integration/message_image_admission_test.go
+++ b/services/core/tests/integration/message_image_admission_test.go
@@ -28,7 +28,7 @@ func TestUnqualifiedImageAdmissionIsAtomic(t *testing.T) {
 			profile, _ := (engine.Catalog{}).Lookup("codex")
 			profile.MessageImages = proto.CapabilityUnsupported
 			h.d.Policy = execution.Policy{Engines: engine.NewCatalog(map[string]engine.Profile{"codex": profile})}
-			worker := startWorker(t, t.Context(), h.db, h.d)
+			worker := startWorker(t, t.Context(), h.s, h.d)
 			defer func() { ctx, cancel := context.WithCancel(context.Background()); cancel(); _ = worker.Run(ctx) }()
 			configuration := json.RawMessage(`{"agent":{"model":"fixture"},"environment":{"type":"` + placement + `","workspace_directory":"/workspace"}}`)
 			create := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "image-create", Configuration: configuration, InitialInputs: imageAdmissionBatch()}
diff --git a/services/core/tests/integration/message_images_native_test.go b/services/core/tests/integration/message_images_native_test.go
index 5e1a20d4d..d6500f390 100644
--- a/services/core/tests/integration/message_images_native_test.go
+++ b/services/core/tests/integration/message_images_native_test.go
@@ -32,7 +32,7 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Minute)
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	defer func() {
@@ -48,7 +48,7 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -73,7 +73,7 @@ func TestNativeMessageImagePublicExecution(t *testing.T) {
 	if err != nil || json.Unmarshal(raw, &proof) != nil {
 		t.Fatal("invalid evidence", err)
 	}
-	call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
+	call, err := FixtureFunctionCall(ctx, h.s.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
diff --git a/services/core/tests/integration/model_protocol_native_test.go b/services/core/tests/integration/model_protocol_native_test.go
index 66b231bdd..587074d0c 100644
--- a/services/core/tests/integration/model_protocol_native_test.go
+++ b/services/core/tests/integration/model_protocol_native_test.go
@@ -61,7 +61,7 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 15*time.Minute)
 	defer cancel()
-	worker, err := startWorkerErr(ctx, h.db, h.d)
+	worker, err := startWorkerErr(ctx, h.s, h.d)
 	if err != nil {
 		t.Fatal("cannot start native execution worker")
 	}
@@ -78,7 +78,7 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant}})
 	providerRevision := uuid.New()
-	handler, err := publicHandler(t, h.s, h.db, auth, options.Engine, workerExecution(t, worker), withPolicy(h.d.Policy), modelProviderDefaults(func(context.Context, string) (*modelconfiguration.Snapshot, error) {
+	handler, err := publicHandler(t, h.s, auth, options.Engine, workerExecution(t, worker), withPolicy(h.d.Policy), modelProviderDefaults(func(context.Context, string) (*modelconfiguration.Snapshot, error) {
 		return &modelconfiguration.Snapshot{Model: options.Model, HarnessConfig: options.HarnessConfig, Provider: &options.Provider, Revision: providerRevision}, nil
 	}))
 	if err != nil {
@@ -120,7 +120,7 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 	}
 	failed := 0
 	for _, item := range proof.Calls {
-		call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, item.Turn, item.Call)
+		call, err := FixtureFunctionCall(ctx, h.s.pool, h.tenant, proof.Session, item.Turn, item.Call)
 		if err != nil || !call.Applied {
 			t.Fatal("public function result lacks native delivery acknowledgement")
 		}
diff --git a/services/core/tests/integration/native_environment_test.go b/services/core/tests/integration/native_environment_test.go
index 8614a7637..dc02c61a2 100644
--- a/services/core/tests/integration/native_environment_test.go
+++ b/services/core/tests/integration/native_environment_test.go
@@ -102,7 +102,7 @@ func TestNativeNoExecutionEnvironment(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err = bindSessionDevice(t, h.db, h.tenant, h.session.ID, h.device.ID); err != nil {
+	if err = bindSessionDevice(t, h.s, h.tenant, h.session.ID, h.device.ID); err != nil {
 		t.Fatal(err)
 	}
 	first := h.message("first", "Return an answer.")
@@ -123,7 +123,7 @@ func TestNativeNoExecutionEnvironment(t *testing.T) {
 	if _, err := os.Stat(marker); !os.IsNotExist(err) {
 		t.Fatalf("forbidden command may have executed: %v", err)
 	}
-	page, err := sessionReads(h.db.pool).ListItems(ctx, h.tenant, h.session.ID, "", 100, true)
+	page, err := sessionAdapter(h.s).ListItems(ctx, h.tenant, h.session.ID, "", 100, true)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/native_public_execution_test.go b/services/core/tests/integration/native_public_execution_test.go
index b370d5ad6..9fbf1e266 100644
--- a/services/core/tests/integration/native_public_execution_test.go
+++ b/services/core/tests/integration/native_public_execution_test.go
@@ -25,7 +25,7 @@ func verifyNativePublicExecution(t *testing.T, h *dispatchHarness, parent contex
 	defer cancel()
 	// The Turns before this proof ran on the harness's execution Owner, so the
 	// Worker takes that lease rather than a second one.
-	worker := startOwnedWorker(t, ctx, h.db, h.d, h.owner())
+	worker := startOwnedWorker(t, ctx, h.s, h.d, h.owner())
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	defer func() {
@@ -38,7 +38,7 @@ func verifyNativePublicExecution(t *testing.T, h *dispatchHarness, parent contex
 	}()
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
-	handler, err := publicHandler(t, h.s, h.db, auth, "codex", workerExecution(t, worker), nativeDeploymentDefaults("gpt-5.5", provider))
+	handler, err := publicHandler(t, h.s, auth, "codex", workerExecution(t, worker), nativeDeploymentDefaults("gpt-5.5", provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/no_environment_test.go b/services/core/tests/integration/no_environment_test.go
index 2c19405b5..fe6512490 100644
--- a/services/core/tests/integration/no_environment_test.go
+++ b/services/core/tests/integration/no_environment_test.go
@@ -15,7 +15,7 @@ func TestNoEnvironmentRejectsUnadvertisedDeviceBeforeClaim(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err = bindSessionDevice(t, h.db, h.tenant, h.session.ID, h.device.ID); err != nil {
+	if err = bindSessionDevice(t, h.s, h.tenant, h.session.ID, h.device.ID); err != nil {
 		t.Fatal(err)
 	}
 	input := h.message("first", "Answer")
diff --git a/services/core/tests/integration/path_id_semantics_public_test.go b/services/core/tests/integration/path_id_semantics_public_test.go
index afab3adf7..ebb0b24df 100644
--- a/services/core/tests/integration/path_id_semantics_public_test.go
+++ b/services/core/tests/integration/path_id_semantics_public_test.go
@@ -91,14 +91,14 @@ func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	owner, foreign := uuid.NewString(), uuid.NewString()
 	ownerTenant := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "path-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "path-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -360,7 +360,7 @@ func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 	}
 
 	// Storage availability checks also run before the lookup of a missing identifier.
-	h, err = publicHandler(t, New(pool), fixtureDB{pool: pool}, auth, "codex")
+	h, err = publicHandler(t, New(pool), auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/prepared_dispatch_test.go b/services/core/tests/integration/prepared_dispatch_test.go
index 9b2c5ff61..8a01bb556 100644
--- a/services/core/tests/integration/prepared_dispatch_test.go
+++ b/services/core/tests/integration/prepared_dispatch_test.go
@@ -84,7 +84,7 @@ func TestPreparedDispatchPromotesOriginalBatchAndPersistsCompletion(t *testing.T
 	if err != nil || session.LastTurn != nil {
 		t.Fatal("preparation created work before readiness", session, err)
 	}
-	items, err := sessionReads(h.db.pool).ListItems(t.Context(), h.tenant, h.session.ID, "", 100, true)
+	items, err := sessionAdapter(h.s).ListItems(t.Context(), h.tenant, h.session.ID, "", 100, true)
 	if err != nil || len(items.Items) != 0 {
 		t.Fatal("preparation published input history", items, err)
 	}
diff --git a/services/core/tests/integration/project_api_keys_http_test.go b/services/core/tests/integration/project_api_keys_http_test.go
index 36c3d7014..0a6871812 100644
--- a/services/core/tests/integration/project_api_keys_http_test.go
+++ b/services/core/tests/integration/project_api_keys_http_test.go
@@ -13,13 +13,13 @@ import (
 )
 
 func TestProjectAndSharedKeysHTTPManagement(t *testing.T) {
-	st, db := newTestStoreDB(t)
+	st, _ := testStore(t)
 	adminToken := uuid.NewString()
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential(adminToken)})
 	if err != nil {
 		t.Fatal(err)
 	}
-	h, err := publicHandler(t, st, db, nil, "codex", storeKeys(st), withCoreKeys(admin))
+	h, err := publicHandler(t, st, nil, "codex", storeKeys(st), withCoreKeys(admin))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/projects_public_fixture_test.go b/services/core/tests/integration/projects_public_fixture_test.go
index 9fac07967..50f1265e0 100644
--- a/services/core/tests/integration/projects_public_fixture_test.go
+++ b/services/core/tests/integration/projects_public_fixture_test.go
@@ -10,10 +10,10 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 )
 
-// fixtureProjects builds the Project adapter and service on db.
-func fixtureProjects(t testing.TB, db fixtureDB) (*projectpg.Store, *projects.Service) {
+// fixtureProjects builds the Project adapter and service on s.
+func fixtureProjects(t testing.TB, s *Store) (*projectpg.Store, *projects.Service) {
 	t.Helper()
-	projectStore := projectpg.New(pgunit.NewPool(db.pool))
+	projectStore := projectpg.New(pgunit.NewPool(s.pool))
 	projectService, err := projects.NewService(projectStore)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/public_execution_test.go b/services/core/tests/integration/public_execution_test.go
index 4a45ff9aa..879c09a1d 100644
--- a/services/core/tests/integration/public_execution_test.go
+++ b/services/core/tests/integration/public_execution_test.go
@@ -27,7 +27,7 @@ func TestExecutionWorkerAdmissionBindingAndRecovery(t *testing.T) {
 	h.session = publicSession(t, h, "public")
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	t.Cleanup(func() {
@@ -38,7 +38,7 @@ func TestExecutionWorkerAdmissionBindingAndRecovery(t *testing.T) {
 			t.Error("worker did not stop")
 		}
 	})
-	if second, err := startWorkerErr(ctx, h.db, h.d); err == nil {
+	if second, err := startWorkerErr(ctx, h.s, h.d); err == nil {
 		cancel()
 		go second.Run(ctx)
 		t.Fatal("second service acquired database")
@@ -63,7 +63,7 @@ func TestExecutionWorkerAdmissionBindingAndRecovery(t *testing.T) {
 	if inputTextForTest(t, prompt.Input) != "First\n\nSecond" || !prompt.DisableExecutionEnvironment || !prompt.DisableSubagents || prompt.ExecutionControls == nil || *prompt.ExecutionControls != (proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}) || prompt.AgentOptions["web_search"] != nil || prompt.AgentOptions["model_verbosity"] != nil {
 		t.Fatal(prompt)
 	}
-	bound, err := fixtureSessionStore(h.db).GetSessionDevice(ctx, h.tenant, h.session.ID)
+	bound, err := sessionAdapter(h.s).GetSessionDevice(ctx, h.tenant, h.session.ID)
 	if err != nil || bound.ID != h.device.ID {
 		t.Fatal(bound, err)
 	}
@@ -73,7 +73,7 @@ func TestExecutionWorkerAdmissionBindingAndRecovery(t *testing.T) {
 	}
 	h.write(request.ID, proto.TypeDone, proto.DonePayload{Content: "Answer", Metadata: map[string]any{proto.DoneMetaAgentSessionID: "worker-native"}})
 	waitTurn(t, h, receipts[0].TurnID, sessions.TurnCompleted)
-	items, err := sessionReads(h.db.pool).ListItems(ctx, h.tenant, h.session.ID, "", 100, true)
+	items, err := sessionAdapter(h.s).ListItems(ctx, h.tenant, h.session.ID, "", 100, true)
 	if err != nil || len(items.Items) != 3 {
 		t.Fatal(items, err)
 	}
@@ -147,7 +147,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	if _, err := sendMessage(ctx, h.s, h.tenant, queued.ID, "first", json.RawMessage(`{"text":"Not sent"}`)); err != nil {
 		t.Fatal(err)
 	}
-	worker := startOwnedWorker(t, ctx, h.db, h.d, h.owner())
+	worker := startOwnedWorker(t, ctx, h.s, h.d, h.owner())
 	stopped, cancel := context.WithCancel(ctx)
 	cancel()
 	if err := worker.Run(stopped); err != context.Canceled {
@@ -168,7 +168,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	if err != nil || pending.LastTurn.Status != sessions.TurnCancelled {
 		t.Fatal(pending, err)
 	}
-	restarted, err := startWorkerErr(ctx, h.db, h.d)
+	restarted, err := startWorkerErr(ctx, h.s, h.d)
 	if err != nil {
 		t.Fatal("lease not released", err)
 	}
diff --git a/services/core/tests/integration/public_handler_fixture_test.go b/services/core/tests/integration/public_handler_fixture_test.go
index 5c299fcf8..382dfec57 100644
--- a/services/core/tests/integration/public_handler_fixture_test.go
+++ b/services/core/tests/integration/public_handler_fixture_test.go
@@ -34,49 +34,48 @@ import (
 // sets another with executorURL.
 const testExecutorURL = "wss://core.example/api/v1/agent-daemon/ws"
 
-// publicHandler serves s through api.NewHandler. s backs every area the Store
-// implements, and db is the database and credential key that built s; the
-// audit reads, Agents, Files, Vaults, Environment reads, Items, Subagents and
-// Artifacts come from db. keys authenticate as Project keys and "admin" as the
-// Core key. Metrics, Runtime observation and history, and executor connections
-// are strict stand-ins. Execution and Sandboxes stay disabled unless configure
-// sets them.
-func publicHandler(t testing.TB, s *Store, db fixtureDB, keys fixtureKeyResolver, engine string, configure ...func(*api.Dependencies)) (http.Handler, error) {
+// publicHandler serves s through api.NewHandler, with every area built on s's
+// database, credential key and placement rules as cmd/server builds it. keys
+// authenticate as Project keys and "admin" as the Core key. Metrics, Runtime
+// observation and history, and executor connections are strict stand-ins.
+// Execution and Sandboxes stay disabled unless configure sets them.
+func publicHandler(t testing.TB, s *Store, keys fixtureKeyResolver, engine string, configure ...func(*api.Dependencies)) (http.Handler, error) {
 	t.Helper()
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential("admin")})
 	if err != nil {
 		return nil, err
 	}
 	strict := strictStandIn{t}
-	audit := auditpg.New(pgunit.NewPool(db.pool))
-	agentStore, agentService := fixtureAgents(t, db)
-	fileStore, fileService := fixtureFiles(t, db)
-	vaultStore, vaultService, err := fixtureVaults(db)
+	audit := auditpg.New(pgunit.NewPool(s.pool))
+	agentStore, agentService := fixtureAgents(t, s)
+	fileStore, fileService := fixtureFiles(t, s)
+	vaultStore, vaultService, err := fixtureVaults(s)
 	if err != nil {
 		return nil, err
 	}
-	templates := templatepg.New(pgunit.NewPool(db.pool), db.cipher)
+	templates := templatepg.New(pgunit.NewPool(s.pool), s.credentialCipher)
 	environmentTemplates, err := environmenttemplates.NewService(templates)
 	if err != nil {
 		return nil, err
 	}
-	modelConfigurationStore := modelconfigurationpg.New(pgunit.NewPool(db.pool), db.cipher)
+	modelConfigurationStore := modelconfigurationpg.New(pgunit.NewPool(s.pool), s.credentialCipher)
 	modelConfigurationService, err := modelconfiguration.NewService(modelConfigurationStore)
 	if err != nil {
 		return nil, err
 	}
-	skillStore := skillpg.New(pgunit.NewPool(db.pool), db.cipher)
+	skillStore := skillpg.New(pgunit.NewPool(s.pool), s.credentialCipher)
 	skillService, err := skills.NewService(skillStore, skillStore)
 	if err != nil {
 		return nil, err
 	}
-	projectStore, projectService := fixtureProjects(t, db)
-	sessionStore, service, err := fixtureSessions(db)
+	projectStore, projectService := fixtureProjects(t, s)
+	sessionStore := sessionAdapter(s)
+	service, err := newSessionService(s)
 	if err != nil {
 		return nil, err
 	}
 	deps := api.Dependencies{
-		Engine: engine, CoreKeys: admin, InstallationBindings: fixtureDeployment(t, db),
+		Engine: engine, CoreKeys: admin, InstallationBindings: deploymentService(t, s),
 		Projects: projectService, ProjectsReader: fixtureProjectsReader{Reader: projectStore, keys: keys},
 		ModelProviders: modelConfigurationService, ModelProvidersReader: modelConfigurationStore,
 		Vaults: vaultService, VaultsReader: vaultStore,
@@ -86,7 +85,7 @@ func publicHandler(t testing.TB, s *Store, db fixtureDB, keys fixtureKeyResolver
 		Agents: agentService, AgentsReader: agentStore,
 		Sessions:        service,
 		SessionsReader:  sessionStore,
-		SessionCreation: sessionService(t, s),
+		SessionCreation: service,
 		SessionEvents:   sessionStore,
 		Turns:           sessionStore,
 		Items:           sessionStore,
@@ -102,10 +101,10 @@ func publicHandler(t testing.TB, s *Store, db fixtureDB, keys fixtureKeyResolver
 	return api.NewHandler(deps)
 }
 
-// fixtureAgents builds the Agent adapter and service on db.
-func fixtureAgents(t testing.TB, db fixtureDB) (*agentpg.Store, *agents.Service) {
+// fixtureAgents builds the Agent adapter and service on s.
+func fixtureAgents(t testing.TB, s *Store) (*agentpg.Store, *agents.Service) {
 	t.Helper()
-	agentStore := agentpg.New(pgunit.NewPool(db.pool), db.cipher)
+	agentStore := agentpg.New(pgunit.NewPool(s.pool), s.credentialCipher)
 	agentService, err := agents.NewService(agentStore)
 	if err != nil {
 		t.Fatal(err)
@@ -113,10 +112,10 @@ func fixtureAgents(t testing.TB, db fixtureDB) (*agentpg.Store, *agents.Service)
 	return agentStore, agentService
 }
 
-// fixtureFiles builds the File adapter and service on db.
-func fixtureFiles(t testing.TB, db fixtureDB) (*filepg.Store, *files.Service) {
+// fixtureFiles builds the File adapter and service on s.
+func fixtureFiles(t testing.TB, s *Store) (*filepg.Store, *files.Service) {
 	t.Helper()
-	fileStore := filepg.New(pgunit.NewPool(db.pool))
+	fileStore := filepg.New(pgunit.NewPool(s.pool))
 	fileService, err := files.NewService(fileStore)
 	if err != nil {
 		t.Fatal(err)
@@ -179,15 +178,15 @@ func executorURL(url string) func(*api.Dependencies) {
 	return func(d *api.Dependencies) { d.Execution.ExecutorURL = url }
 }
 
-// managedSandboxes enables the managed sandbox deployment on db: its
+// managedSandboxes enables the managed sandbox deployment on s: its
 // administration and node routes and openai_hosted Environments. Deployment
 // changes, reset and discovery need the Worker and are strict stand-ins. It
 // follows the option that enables Execution.
-func managedSandboxes(t testing.TB, db fixtureDB) func(*api.Dependencies) {
+func managedSandboxes(t testing.TB, s *Store) func(*api.Dependencies) {
 	return func(d *api.Dependencies) {
 		d.Sandboxes = &api.Sandboxes{
-			Deployment:             fixtureDeployment(t, db),
-			NodeAllocations:        fixtureReader(db),
+			Deployment:             deploymentService(t, s),
+			NodeAllocations:        deploymentStore(s),
 			DeploymentChanges:      strictStandIn{t},
 			DeploymentReset:        strictStandIn{t},
 			ConfigurationDiscovery: strictStandIn{t},
diff --git a/services/core/tests/integration/remote_mcp_credentials_test.go b/services/core/tests/integration/remote_mcp_credentials_test.go
index 0a5624583..393e50c9b 100644
--- a/services/core/tests/integration/remote_mcp_credentials_test.go
+++ b/services/core/tests/integration/remote_mcp_credentials_test.go
@@ -13,12 +13,12 @@ import (
 func TestSelfHostedServiceMCPRejectionDoesNotRequireCredentialDecryption(t *testing.T) {
 	for _, mode := range []string{"missing key", "deleted", "tampered"} {
 		t.Run(mode, func(t *testing.T) {
-			s, db, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
+			s, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
 			switch mode {
 			case "missing key":
-				s, db = New(db.pool), fixtureDB{pool: db.pool}
+				s = New(s.pool)
 			case "deleted":
-				_, service, err := fixtureVaults(db)
+				_, service, err := fixtureVaults(s)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -26,11 +26,11 @@ func TestSelfHostedServiceMCPRejectionDoesNotRequireCredentialDecryption(t *test
 					t.Fatal(err)
 				}
 			case "tampered":
-				if _, err := db.pool.Exec(t.Context(), "UPDATE vault_credentials SET token_ciphertext=set_byte(token_ciphertext,15,get_byte(token_ciphertext,15) # 1) WHERE id=$1", credential.ID); err != nil {
+				if _, err := s.pool.Exec(t.Context(), "UPDATE vault_credentials SET token_ciphertext=set_byte(token_ciphertext,15,get_byte(token_ciphertext,15) # 1) WHERE id=$1", credential.ID); err != nil {
 					t.Fatal(err)
 				}
 			}
-			handler := selfHostedMCPAdmissionHandler(t, s, db, tenant)
+			handler := selfHostedMCPAdmissionHandler(t, s, tenant)
 			for _, initial := range []bool{false, true} {
 				body := map[string]any{
 					"agent": map[string]any{"model": "model", "tools": []any{map[string]any{
@@ -64,7 +64,7 @@ func TestSelfHostedServiceMCPRejectionDoesNotRequireCredentialDecryption(t *test
 				if !strings.Contains(response.Body.String(), message) {
 					t.Fatal("unsupported placement attempted credential decryption", response.Body)
 				}
-				assertSelfHostedMCPRejectionHasNoWrites(t, db.pool, tenant)
+				assertSelfHostedMCPRejectionHasNoWrites(t, s.pool, tenant)
 			}
 		})
 	}
diff --git a/services/core/tests/integration/remote_mcp_test.go b/services/core/tests/integration/remote_mcp_test.go
index dec32b273..0344b0c0a 100644
--- a/services/core/tests/integration/remote_mcp_test.go
+++ b/services/core/tests/integration/remote_mcp_test.go
@@ -15,8 +15,8 @@ import (
 )
 
 func TestSelfHostedServiceMCPRejectedWithoutWrites(t *testing.T) {
-	s, db, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
-	handler := selfHostedMCPAdmissionHandler(t, s, db, tenant)
+	s, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
+	handler := selfHostedMCPAdmissionHandler(t, s, tenant)
 
 	for _, mode := range []string{"unattached", "missing", "wrong URL", "foreign Vault", "anonymous", "implicit", "explicit", "required anonymous", "required bearer"} {
 		for _, initial := range []bool{false, true} {
@@ -67,20 +67,20 @@ func TestSelfHostedServiceMCPRejectedWithoutWrites(t *testing.T) {
 				t.Fatal("rejected request exposed private authentication")
 			}
 
-			assertSelfHostedMCPRejectionHasNoWrites(t, db.pool, tenant)
+			assertSelfHostedMCPRejectionHasNoWrites(t, s.pool, tenant)
 		}
 	}
 }
 
-func selfHostedMCPAdmissionFixture(t *testing.T) (*Store, fixtureDB, string, vaults.Vault, vaults.Credential) {
+func selfHostedMCPAdmissionFixture(t *testing.T) (*Store, string, vaults.Vault, vaults.Credential) {
 	t.Helper()
 	_, pool := testStore(t)
 	cipher, err := credentialcrypto.New([]byte(strings.Repeat("k", 32)))
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	_, service, err := fixtureVaults(db)
+	s := NewWithCredentialCipher(pool, cipher)
+	_, service, err := fixtureVaults(s)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -93,13 +93,13 @@ func selfHostedMCPAdmissionFixture(t *testing.T) (*Store, fixtureDB, string, vau
 	if err != nil {
 		t.Fatal(err)
 	}
-	return s, db, tenant, vault, credential
+	return s, tenant, vault, credential
 }
 
-func selfHostedMCPAdmissionHandler(t *testing.T, s *Store, db fixtureDB, tenant string) http.Handler {
+func selfHostedMCPAdmissionHandler(t *testing.T, s *Store, tenant string) http.Handler {
 	t.Helper()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test", TenantID: tenant, TokenSHA256: runtimedevice.HashCredential("test-token")}})
-	handler, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
+	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/request_body_public_test.go b/services/core/tests/integration/request_body_public_test.go
index 37073f5a3..f075d4ce3 100644
--- a/services/core/tests/integration/request_body_public_test.go
+++ b/services/core/tests/integration/request_body_public_test.go
@@ -29,7 +29,7 @@ func TestRequestBodyGateRejectsWithoutWritesPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "body-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
@@ -37,7 +37,7 @@ func TestRequestBodyGateRejectsWithoutWritesPostgres(t *testing.T) {
 	})
 	// No Runtime is connected, so a file write that passes the gate is unavailable.
 	unavailable := func(d *api.Dependencies) { d.Execution.Workspaces = unavailableWorkspaces{strictStandIn{t}} }
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), unavailable, acceptUnavailable(t))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), unavailable, acceptUnavailable(t))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -170,10 +170,10 @@ func TestRequestBodyGateExcludedRoutesPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	token, tenant := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "excluded-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/root_fixture_test.go b/services/core/tests/integration/root_fixture_test.go
index 1696dcdf1..2fde53550 100644
--- a/services/core/tests/integration/root_fixture_test.go
+++ b/services/core/tests/integration/root_fixture_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
@@ -29,9 +30,14 @@ type Store struct {
 	placement        *placement.Rules
 }
 
+// defaultPlacement is the placement rules cmd/server builds on the built-in
+// providers and an unset public URL.
+var defaultPlacement, _ = placement.NewRules(providers.Builtin(), "")
+
+// New is the fixture on pool without a credential key, under defaultPlacement.
 func New(pool *pgxpool.Pool) *Store {
 	pooled := pgunit.NewPool(pool)
-	return &Store{queries: sqlc.New(pool), pool: pool, pooled: pooled, writer: pooled}
+	return &Store{queries: sqlc.New(pool), pool: pool, pooled: pooled, writer: pooled, placement: defaultPlacement}
 }
 
 // NewWithCredentialCipher is New with a credential key, so Sessions can freeze
diff --git a/services/core/tests/integration/runtime_capabilities_pending_test.go b/services/core/tests/integration/runtime_capabilities_pending_test.go
index f0c854b16..5bbe67cf6 100644
--- a/services/core/tests/integration/runtime_capabilities_pending_test.go
+++ b/services/core/tests/integration/runtime_capabilities_pending_test.go
@@ -20,8 +20,7 @@ func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	s.SetPlacement(fixtureRules(t, db))
+	s := NewWithCredentialCipher(pool, cipher)
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{
 		Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
@@ -31,15 +30,15 @@ func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	env, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), tenant, session.ID)
+	env, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	provider := &initializingProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, initializationPeer: initializationPeer{deferred: true}}
 	key := uuid.NewString()
-	worker, _ := managedWorkerMode(t, s, db, key, provider, false, true)
+	worker, _ := managedWorkerMode(t, s, key, provider, false, true)
 	owner, err := worker.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
-	if err != nil || initializationState(t, db.pool, owner.TenantID, owner.EnvironmentID) != "pending" {
+	if err != nil || initializationState(t, s, owner.TenantID, owner.EnvironmentID) != "pending" {
 		t.Fatal(owner, err)
 	}
 	for range 4 {
@@ -47,8 +46,8 @@ func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	owner, err = fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
-	if err != nil || initializationState(t, db.pool, owner.TenantID, owner.EnvironmentID) != "pending" || owner.State != "running" || provider.writes.Load() != 0 || provider.kills != 0 {
+	owner, err = deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	if err != nil || initializationState(t, s, owner.TenantID, owner.EnvironmentID) != "pending" || owner.State != "running" || provider.writes.Load() != 0 || provider.kills != 0 {
 		t.Fatal("missing socket consumed initialization or requested cleanup", owner, err, provider.writes.Load(), provider.kills)
 	}
 	if _, err := sessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/tests/integration/runtime_compute_lifecycle_test.go b/services/core/tests/integration/runtime_compute_lifecycle_test.go
index 01700b449..7d3286718 100644
--- a/services/core/tests/integration/runtime_compute_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_compute_lifecycle_test.go
@@ -260,7 +260,6 @@ func (p *fakeCheckpointProvider) connect(ctx context.Context, b sandbox.Bootstra
 type computeLifecycleFixture struct {
 	t        *testing.T
 	store    *Store
-	db       fixtureDB
 	provider *fakeCheckpointProvider
 	worker   *execution.Worker
 	stop     func()
@@ -270,10 +269,10 @@ type computeLifecycleFixture struct {
 
 func newComputeLifecycleFixture(t *testing.T, maxActive, maxRetained int) *computeLifecycleFixture {
 	t.Helper()
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	registry := runtimegateway.NewRegistry()
 	p := &fakeCheckpointProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, computes: map[string]sandbox.ComputeState{}, snapshots: map[string]sandbox.SnapshotIdentity{}, bootstraps: map[string]sandbox.Bootstrap{}, peers: map[string]*websocket.Conn{}, registry: registry}
-	handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(fixtureSessionStore(db)), Registry: registry})
+	handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(sessionAdapter(s)), Registry: registry})
 	server := httptest.NewServer(http.HandlerFunc(handler.WS))
 	p.endpoint = "ws" + strings.TrimPrefix(server.URL, "http")
 	t.Cleanup(func() {
@@ -284,7 +283,7 @@ func newComputeLifecycleFixture(t *testing.T, maxActive, maxRetained int) *compu
 		}
 		server.Close()
 	})
-	f := &computeLifecycleFixture{t: t, store: s, db: db, provider: p, key: uuid.NewString(), policy: execution.RuntimeSuspensionPolicy{IdleTimeout: time.Second, Retention: time.Hour, MaxActive: maxActive, MaxRetained: maxRetained}}
+	f := &computeLifecycleFixture{t: t, store: s, provider: p, key: uuid.NewString(), policy: execution.RuntimeSuspensionPolicy{IdleTimeout: time.Second, Retention: time.Hour, MaxActive: maxActive, MaxRetained: maxRetained}}
 	f.start()
 	return f
 }
@@ -297,7 +296,7 @@ func (f *computeLifecycleFixture) start() {
 	var w *execution.Worker
 	var err error
 	for {
-		w, err = startWorkerErr(t.Context(), f.db, dispatcher)
+		w, err = startWorkerErr(t.Context(), f.store, dispatcher)
 		if err == nil || !errors.Is(err, pgunit.ErrLeaseHeld) || !time.Now().Before(deadline) {
 			break
 		}
@@ -315,14 +314,14 @@ func (f *computeLifecycleFixture) start() {
 }
 func (f *computeLifecycleFixture) sql(query string, args ...any) {
 	f.t.Helper()
-	if _, err := f.db.pool.Exec(f.t.Context(), query, args...); err != nil {
+	if _, err := f.store.pool.Exec(f.t.Context(), query, args...); err != nil {
 		f.t.Fatal(err)
 	}
 }
 func (f *computeLifecycleFixture) create() (string, sessions.Session, sessions.Environment, deployment.Allocation) {
 	t := f.t
 	t.Helper()
-	tenant, session, environment := managedSession(t, f.store, f.db)
+	tenant, session, environment := managedSession(t, f.store)
 	owner, err := f.worker.ProvisionEnvironment(t.Context(), tenant, environment.ID, f.key)
 	if err != nil {
 		t.Fatal(err)
@@ -346,7 +345,7 @@ func (f *computeLifecycleFixture) phase(tenant, environment, phase string) deplo
 		if err != nil {
 			f.t.Fatal(err)
 		}
-		owner, err = fixtureReader(f.db).EnvironmentAllocation(f.t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment})
+		owner, err = deploymentStore(f.store).EnvironmentAllocation(f.t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment})
 		if err != nil {
 			f.t.Fatal(err)
 		}
@@ -389,7 +388,7 @@ func TestRuntimeComputeLifecycleIdleSuspendAndQueuedSameSessionWake(t *testing.T
 		t.Fatal("wake replaced Session or replayed allocation")
 	}
 	var completedCount, queuedCount int
-	if err := f.db.pool.QueryRow(t.Context(), `SELECT count(*) FILTER(WHERE id=$2 AND status='completed'),count(*) FILTER(WHERE id=$3 AND status='queued') FROM turns WHERE session_id=$1`, session.ID, completed, queued).Scan(&completedCount, &queuedCount); err != nil || completedCount != 1 || queuedCount != 1 {
+	if err := f.store.pool.QueryRow(t.Context(), `SELECT count(*) FILTER(WHERE id=$2 AND status='completed'),count(*) FILTER(WHERE id=$3 AND status='queued') FROM turns WHERE session_id=$1`, session.ID, completed, queued).Scan(&completedCount, &queuedCount); err != nil || completedCount != 1 || queuedCount != 1 {
 		t.Fatal("wake replayed/consumed prior or next Turn", err)
 	}
 	if got, err := sessionAdapter(f.store).GetSession(t.Context(), tenant, session.ID); err != nil || string(got.Configuration) != string(session.Configuration) {
@@ -454,7 +453,7 @@ func TestRuntimeComputeLifecycleQuiesceRejectionAndUnknownIntentRollback(t *test
 	}
 	// A restart with persisted quiescing but no acknowledgement must resume the
 	// source. Inject only the durable phase, never a fake snapshot or new source.
-	current, err := fixtureReader(f.db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	current, err := deploymentStore(f.store).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -476,7 +475,7 @@ func TestRuntimeComputeLifecycleWakeDuringQuiesceResumesSource(t *testing.T) {
 	tenant, _, env, owner := f.create()
 	f.complete(owner)
 	wakeResult := make(chan error, 1)
-	activity := fixtureDeployment(t, f.db)
+	activity := deploymentService(t, f.store)
 	f.provider.mu.Lock()
 	f.provider.beforeQuiesce = func() {
 		wakeResult <- activity.TouchActivity(t.Context(), tenant, env.ID)
@@ -515,11 +514,11 @@ func TestRuntimeComputeLifecycleSuspendedDeletionAndExpiryCleanup(t *testing.T)
 			} else {
 				f.sql(`UPDATE runtime_allocations SET compute_retained_until=clock_timestamp()-interval '1 second' WHERE id=$1`, owner.ID)
 			}
-			reconcileManagedState(t, f.worker, f.db, tenant, env.ID, "released")
+			reconcileManagedState(t, f.worker, f.store, tenant, env.ID, "released")
 			if len(f.provider.computes) != 0 || len(f.provider.snapshots) != 0 || f.provider.snapshotDeletes != 1 {
 				t.Fatal("retained snapshot survived cleanup")
 			}
-			if _, ok, err := fixtureSessionStore(f.db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
+			if _, ok, err := sessionAdapter(f.store).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 				t.Fatal("cleanup retained daemon authority", err)
 			}
 		})
@@ -529,7 +528,7 @@ func TestRuntimeComputeLifecycleSuspendedDeletionAndExpiryCleanup(t *testing.T)
 func TestRuntimeComputeLifecycleCapacityBoundsActiveAndRetained(t *testing.T) {
 	f := newComputeLifecycleFixture(t, 1, 2)
 	tenant, _, env, owner := f.create()
-	tenant2, _, env2 := managedSession(t, f.store, f.db)
+	tenant2, _, env2 := managedSession(t, f.store)
 	if _, err := f.worker.ProvisionEnvironment(t.Context(), tenant2, env2.ID, f.key); !errors.Is(err, execution.ErrExecutionUnavailable) {
 		t.Fatalf("active capacity ignored: %v", err)
 	}
@@ -546,7 +545,7 @@ func TestRuntimeComputeLifecycleCapacityBoundsActiveAndRetained(t *testing.T) {
 	for range 4 {
 		f.worker.ReconcileManagedRuntimes(t.Context())
 	}
-	first, err := fixtureReader(f.db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	first, err := deploymentStore(f.store).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 	if err != nil || first.ComputePhase != "suspended" || f.provider.restores != 0 {
 		t.Fatal("wake exceeded active capacity", err)
 	}
@@ -561,7 +560,7 @@ func TestRuntimeComputeLifecycleCapacityBoundsActiveAndRetained(t *testing.T) {
 	f.complete(second)
 	f.phase(tenant2, env2.ID, "suspended")
 	// Both retained allocations count even when their source VMs are gone.
-	tenant3, _, env3 := managedSession(t, f.store, f.db)
+	tenant3, _, env3 := managedSession(t, f.store)
 	if _, err := f.worker.ProvisionEnvironment(t.Context(), tenant3, env3.ID, f.key); !errors.Is(err, execution.ErrExecutionUnavailable) {
 		t.Fatalf("retained capacity ignored: %v", err)
 	}
diff --git a/services/core/tests/integration/runtime_configuration_cleanup_test.go b/services/core/tests/integration/runtime_configuration_cleanup_test.go
index 3ea9cb028..2196f7674 100644
--- a/services/core/tests/integration/runtime_configuration_cleanup_test.go
+++ b/services/core/tests/integration/runtime_configuration_cleanup_test.go
@@ -83,7 +83,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 		{name: "kill unavailable stays retained", inspectionError: sandbox.ErrInvalid, killError: sandbox.ErrComputeUnconfirmed, wantSettled: true, wantKill: true},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			s, db := newManagedTestStoreDB(t)
+			s, _ := newManagedTestStore(t)
 			key := uuid.NewString()
 			p := &configurationCleanupProvider{
 				lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: test.loseCreate},
@@ -91,8 +91,8 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 				settleInspection: test.settleInspection, foreign: test.foreign,
 				inspectionError: test.inspectionError, killError: test.killError,
 			}
-			w, _ := managedWorker(t, s, db, key, p)
-			tenant, session, environment := managedSession(t, s, db)
+			w, _ := managedWorker(t, s, key, p)
+			tenant, session, environment := managedSession(t, s)
 			owner, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, key)
 			if (err != nil) != (test.rejectCreate || test.loseCreate) || owner.ID == "" {
 				t.Fatal("unexpected creation outcome", owner, err)
@@ -108,7 +108,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 				if err := w.ReconcileManagedRuntimes(t.Context()); err != nil {
 					t.Fatal(err)
 				}
-				before, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
+				before, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
 				if err != nil || before.State == "cleanup_pending" || before.State == "released" {
 					t.Fatal("drift authorized cleanup", before, err)
 				}
@@ -129,17 +129,17 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 			if test.wantReleased {
 				wantState = "released"
 			}
-			reconcileManagedState(t, w, db, tenant, environment.ID, wantState)
+			reconcileManagedState(t, w, s, tenant, environment.ID, wantState)
 			// A second observation must not turn absence after Kill into proof
 			// that an unknown original Create can no longer mutate resources.
 			if err := w.ReconcileManagedRuntimes(t.Context()); err != nil {
 				t.Fatal(err)
 			}
-			got, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
+			got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
 			if err != nil || got.ID != owner.ID || got.State != wantState || got.CreateSettled != test.wantSettled {
 				t.Fatal("cleanup lost ownership or settlement", got, err)
 			}
-			if _, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
+			if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 				t.Fatal("cleanup retained execution authority", err)
 			}
 			p.mu.Lock()
diff --git a/services/core/tests/integration/runtime_connection_test.go b/services/core/tests/integration/runtime_connection_test.go
index 85d5ccd11..19947a340 100644
--- a/services/core/tests/integration/runtime_connection_test.go
+++ b/services/core/tests/integration/runtime_connection_test.go
@@ -21,11 +21,11 @@ import (
 )
 
 func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	tenant, session, environment := managedSession(t, s, db)
+	s, _ := newManagedTestStore(t)
+	tenant, session, environment := managedSession(t, s)
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-	handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), fixtureSessionStore(db), wsURL)
+	handler, registry, err := runtime.NewGateway(sessionAdapter(s), sessionService(t, s), sessionAdapter(s), wsURL)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -35,7 +35,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	key := uuid.NewString()
 	start := func() *execution.Worker {
-		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: server.URL + "/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
+		w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: server.URL + "/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
 		return w
 	}
 	stop := func(w *execution.Worker) {
@@ -55,7 +55,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 			if err := w.ReconcileManagedRuntimes(t.Context()); err != nil {
 				t.Fatal(err)
 			}
-			got, err := fixtureSessionStore(db).GetEnvironment(t.Context(), tenant, environment.ID)
+			got, err := sessionAdapter(s).GetEnvironment(t.Context(), tenant, environment.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -91,7 +91,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	if err != nil || got.LastTurn != nil || got.EnvironmentInputActivity != nil {
 		t.Fatal("connection fabricated native execution", err)
 	}
-	if _, err := fixtureSessionStore(db).GetEnvironment(t.Context(), uuid.NewString(), environment.ID); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := sessionAdapter(s).GetEnvironment(t.Context(), uuid.NewString(), environment.ID); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("foreign Environment access", err)
 	}
 	p.unavailable = true
@@ -107,14 +107,14 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	stop(w)
 	w = start()
 	assertStatus("connected")
-	retained, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
+	retained, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
 	if err != nil || retained.ID != owner.ID || retained.DeviceID != owner.DeviceID || p.creates != 1 {
 		t.Fatal("restart replaced Runtime identity", err)
 	}
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
-	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
+	reconcileManagedState(t, w, s, tenant, environment.ID, "released")
 	if conn, err := dial(p.credential); err == nil {
 		conn.Close()
 		t.Fatal("released Runtime reconnected")
diff --git a/services/core/tests/integration/runtime_creation_settlement_test.go b/services/core/tests/integration/runtime_creation_settlement_test.go
index ea035f854..b827e9c49 100644
--- a/services/core/tests/integration/runtime_creation_settlement_test.go
+++ b/services/core/tests/integration/runtime_creation_settlement_test.go
@@ -41,11 +41,11 @@ func (p *absentCreationProvider) GetInfo(_ context.Context, r sandbox.Reference)
 func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 	for _, cancelled := range []bool{false, true} {
 		t.Run(map[bool]string{false: "live caller", true: "cancelled caller"}[cancelled], func(t *testing.T) {
-			s, db := newManagedTestStoreDB(t)
+			s, _ := newManagedTestStore(t)
 			key := uuid.NewString()
 			p := &absentCreationProvider{}
-			w, _ := managedWorker(t, s, db, key, p)
-			tenant, session, environment := managedSession(t, s, db)
+			w, _ := managedWorker(t, s, key, p)
+			tenant, session, environment := managedSession(t, s)
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
 			if cancelled {
@@ -58,11 +58,11 @@ func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 			if p.kills != 0 || p.creates != 1 {
 				t.Fatal("absence proof still called external cleanup", p.kills, p.creates)
 			}
-			stored, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
+			stored, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
 			if err != nil || stored.State != "released" || !stored.CreateSettled {
 				t.Fatal("release not durable", err)
 			}
-			if _, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
+			if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 				t.Fatal("released credential retained authority", err)
 			}
 			value, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
@@ -79,32 +79,32 @@ func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 	}
 }
 func TestManagedRuntimeForeignAbsenceCannotReleaseCreation(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	key := uuid.NewString()
 	p := &absentCreationProvider{foreign: true}
-	w, _ := managedWorker(t, s, db, key, p)
-	tenant, _, environment := managedSession(t, s, db)
+	w, _ := managedWorker(t, s, key, p)
+	tenant, _, environment := managedSession(t, s)
 	if _, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err == nil {
 		t.Fatal("foreign absence accepted")
 	}
-	owner, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
+	owner, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
 	if err != nil || owner.CreateSettled || owner.State == "released" {
 		t.Fatal("foreign proof settled original attempt", owner, err)
 	}
 }
 func TestManagedRuntimeObservedSettlementAllowsOwnedCleanup(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	key := uuid.NewString()
 	p := &absentCreationProvider{observeSettled: true}
-	w, _ := managedWorker(t, s, db, key, p)
-	tenant, session, environment := managedSession(t, s, db)
+	w, _ := managedWorker(t, s, key, p)
+	tenant, session, environment := managedSession(t, s)
 	if _, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err == nil {
 		t.Fatal("uncertain Create succeeded")
 	}
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
-	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
+	reconcileManagedState(t, w, s, tenant, environment.ID, "released")
 	if p.kills != 1 || p.creates != 1 {
 		t.Fatal("settled observation replayed Create or skipped cleanup", p.creates, p.kills)
 	}
diff --git a/services/core/tests/integration/runtime_deployment_worker_test.go b/services/core/tests/integration/runtime_deployment_worker_test.go
index ab326a2f4..42ce2fae8 100644
--- a/services/core/tests/integration/runtime_deployment_worker_test.go
+++ b/services/core/tests/integration/runtime_deployment_worker_test.go
@@ -12,11 +12,11 @@ import (
 )
 
 func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	key := uuid.NewString()
 	old := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	worker, stop := managedWorker(t, s, db, key, old)
-	tenant, _, environment := managedSession(t, s, db)
+	worker, stop := managedWorker(t, s, key, old)
+	tenant, _, environment := managedSession(t, s)
 	owner, err := worker.ProvisionEnvironment(t.Context(), tenant, environment.ID, key)
 	if err != nil {
 		t.Fatal(err)
@@ -25,13 +25,13 @@ func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T)
 	replacement := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	config := &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: uuid.NewString(), BackendFingerprint: strings.Repeat("b", 64), Provider: replacement, AdmissionPaused: true}
 	start := func(config *execution.RuntimeProvider) error {
-		_, err := startWorkerErr(t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: config})
+		_, err := startWorkerErr(t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: config})
 		return err
 	}
 	if err := start(config); err == nil || !strings.Contains(err.Error(), "maintenance") {
 		t.Fatal("startup switched active deployment", err)
 	}
-	worker, stop = managedWorkerMode(t, s, db, key, old, true)
+	worker, stop = managedWorkerMode(t, s, key, old, true)
 	replay, err := worker.ProvisionEnvironment(t.Context(), tenant, environment.ID, key)
 	if err != nil || !replay.Replayed || replay.ID != owner.ID {
 		t.Fatal("maintenance interrupted existing allocation", replay, err)
@@ -46,11 +46,11 @@ func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T)
 	if replacement.creates != 0 || replacement.kills != 0 {
 		t.Fatal("rejected startup touched new backend")
 	}
-	got, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
+	got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
 	if err != nil || got.ID != owner.ID || got.ProviderKey != key {
 		t.Fatal("rejected startup rewrote resource owner", got, err)
 	}
 	// Failed startup relinquishes its lease, so the original backend can resume.
-	_, stop = managedWorker(t, s, db, key, old)
+	_, stop = managedWorker(t, s, key, old)
 	stop()
 }
diff --git a/services/core/tests/integration/runtime_enrollment_connection_test.go b/services/core/tests/integration/runtime_enrollment_connection_test.go
index 9a452f384..791fe6dd9 100644
--- a/services/core/tests/integration/runtime_enrollment_connection_test.go
+++ b/services/core/tests/integration/runtime_enrollment_connection_test.go
@@ -22,7 +22,7 @@ import (
 )
 
 func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	principal := FixtureExecutorPrincipal(t, s, uuid.NewString())
 	session, err := s.CreateSession(t.Context(), principal.TenantID, sessions.CreateSession{
 		Creator: principal.Subject(), Engine: "codex", IdempotencyKey: uuid.NewString(),
@@ -31,26 +31,26 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	environment, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), principal.TenantID, session.ID)
+	environment, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), principal.TenantID, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
-	key, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
+	key, err := sessionService(t, s).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	digest := sha256.Sum256([]byte(key.Token))
-	bound, err := fixtureSessionService(t, db).EnrollRuntime(t.Context(), environment.ID, hex.EncodeToString(digest[:]))
+	bound, err := sessionService(t, s).EnrollRuntime(t.Context(), environment.ID, hex.EncodeToString(digest[:]))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-	handler, registry, err := runtime.NewGateway(fixtureSessionStore(db), fixtureSessionService(t, db), fixtureSessionStore(db), wsURL)
+	handler, registry, err := runtime.NewGateway(sessionAdapter(s), sessionService(t, s), sessionAdapter(s), wsURL)
 	if err != nil {
 		t.Fatal(err)
 	}
-	connection := runtimeenrollment.ConnectionHandler(fixtureSessionStore(db), registry)
+	connection := runtimeenrollment.ConnectionHandler(sessionAdapter(s), registry)
 	assertConnection := func(target, token, status string, code int) {
 		t.Helper()
 		request := httptest.NewRequest("GET", "/api/v1/agent-daemon/connection?environment_id="+target, nil)
@@ -69,13 +69,13 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	}
 	assertConnection(environment.ID, key.Token, "disconnected", 200)
 	assertConnection(uuid.NewString(), key.Token, "", 401)
-	otherKey, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
+	otherKey, err := sessionService(t, s).IssueExecutorCredential(t.Context(), principal, uuid.NewString(), environment.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	assertConnection(environment.ID, otherKey.Token, "", 409)
 	foreign := FixtureExecutorPrincipal(t, s, uuid.NewString())
-	foreignKey, err := fixtureSessionService(t, db).IssueExecutorCredential(t.Context(), foreign, uuid.NewString(), "")
+	foreignKey, err := sessionService(t, s).IssueExecutorCredential(t.Context(), foreign, uuid.NewString(), "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -84,7 +84,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	server.Start()
 	t.Cleanup(func() { server.Close(); runtime.CloseConnections(registry) })
 	start := func() func() {
-		worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry})
+		worker := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry})
 		ctx, cancel := context.WithCancel(context.Background())
 		done := make(chan error, 1)
 		go func() { done <- worker.Run(ctx) }()
@@ -120,7 +120,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 		t.Helper()
 		deadline := time.Now().Add(5 * time.Second)
 		for time.Now().Before(deadline) {
-			current, err := fixtureSessionStore(db).GetEnvironment(t.Context(), principal.TenantID, environment.ID)
+			current, err := sessionAdapter(s).GetEnvironment(t.Context(), principal.TenantID, environment.ID)
 			if err == nil && current.Status == status {
 				return
 			}
@@ -131,7 +131,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	first := connect(key.Token)
 	await("connected")
 	assertConnection(environment.ID, key.Token, "connected", 200)
-	rotated, err := fixtureSessionService(t, db).RotateExecutorCredential(t.Context(), principal, key.KeyID)
+	rotated, err := sessionService(t, s).RotateExecutorCredential(t.Context(), principal, key.KeyID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -146,7 +146,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	second := connect(rotated.Token)
 	await("connected")
 	assertConnection(environment.ID, rotated.Token, "connected", 200)
-	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, db.pool)
+	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, s.pool)
 	stop()
 	stop = nil
 	awaitRelease()
@@ -154,7 +154,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 	// live, authorized daemon. No compute allocation or native execution is made.
 	stop = start()
 	await("connected")
-	if err = fixtureSessionService(t, db).RevokeExecutorCredential(t.Context(), principal, key.KeyID); err != nil {
+	if err = sessionService(t, s).RevokeExecutorCredential(t.Context(), principal, key.KeyID); err != nil {
 		t.Fatal(err)
 	}
 	assertConnection(environment.ID, rotated.Token, "", 401)
@@ -164,7 +164,7 @@ func TestEnrolledDaemonConnectionRevocationAndRestart(t *testing.T) {
 		t.Fatal("revoked socket retained authority")
 	}
 	var allocations int
-	if err = db.pool.QueryRow(t.Context(), "SELECT count(*) FROM runtime_allocations WHERE environment_id=$1", environment.ID).Scan(&allocations); err != nil || allocations != 0 {
+	if err = s.pool.QueryRow(t.Context(), "SELECT count(*) FROM runtime_allocations WHERE environment_id=$1", environment.ID).Scan(&allocations); err != nil || allocations != 0 {
 		t.Fatal("user Runtime acquired managed allocation", allocations, err)
 	}
 	current, err := sessionAdapter(s).GetSession(t.Context(), principal.TenantID, session.ID)
diff --git a/services/core/tests/integration/runtime_initialization_test.go b/services/core/tests/integration/runtime_initialization_test.go
index ba45c2311..57a4bf5cc 100644
--- a/services/core/tests/integration/runtime_initialization_test.go
+++ b/services/core/tests/integration/runtime_initialization_test.go
@@ -51,8 +51,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-			s.SetPlacement(fixtureRules(t, db))
+			s := NewWithCredentialCipher(pool, cipher)
 			tenant := uuid.NewString()
 			input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), InitialFiles: []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a", Data: []byte("first")}, {Type: "inline", Path: "/workspace/b", Data: []byte("second")}}}
 			if setupOnly {
@@ -64,7 +63,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			env, err := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), tenant, session.ID)
+			env, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), tenant, session.ID)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -75,7 +74,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 			}
 			p := &initializingProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, initializationPeer: initializationPeer{deferred: true}}
 			p.apply = func(_ proto.RuntimePreparePayload, _ []byte) proto.RuntimePrepareResultPayload {
-				if _, err := fixtureSessionStore(db).GetSessionDevice(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
+				if _, err := sessionAdapter(s).GetSessionDevice(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
 					t.Error("premature file access", err)
 				}
 				if _, err := sessionAdapter(s).GetSessionExecutionBinding(t.Context(), tenant, session.ID); !errors.Is(err, sessions.ErrNotFound) {
@@ -87,9 +86,9 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 				return completedInitialization(proto.RuntimePreparePayload{}, nil)
 			}
 			key := uuid.NewString()
-			w, stop := managedWorkerMode(t, s, db, key, p, false, true)
+			w, stop := managedWorkerMode(t, s, key, p, false, true)
 			if mode == "restart" {
-				awaitInitialization(t, db.pool, tenant, env.ID, "failed")
+				awaitInitialization(t, s, tenant, env.ID, "failed")
 				if p.writes.Load() != 0 {
 					t.Fatal("recovered unknown operation replayed")
 				}
@@ -99,11 +98,11 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			if _, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || !ok {
+			if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || !ok {
 				t.Fatal("preparation blocked authentication", err)
 			}
 			time.Sleep(350 * time.Millisecond)
-			if initializationState(t, db.pool, tenant, env.ID) != "pending" || p.writes.Load() != 0 {
+			if initializationState(t, s, tenant, env.ID) != "pending" || p.writes.Load() != 0 {
 				t.Fatal("missing socket consumed initialization")
 			}
 			p.deferred = false
@@ -114,7 +113,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 			if mode == "uncertain" {
 				want = "failed"
 			}
-			awaitInitialization(t, db.pool, tenant, env.ID, want)
+			awaitInitialization(t, s, tenant, env.ID, want)
 			if mode == "complete" {
 				if int(p.writes.Load()) != expectedSteps {
 					t.Fatal("missing operations", p.writes.Load())
@@ -123,7 +122,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 					t.Fatal("completed preparation blocked", err)
 				}
 				stop()
-				_, _ = managedWorkerMode(t, s, db, key, p, false, true)
+				_, _ = managedWorkerMode(t, s, key, p, false, true)
 				time.Sleep(350 * time.Millisecond)
 				if int(p.writes.Load()) != expectedSteps {
 					t.Fatal("completed preparation replayed")
@@ -142,7 +141,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 }
 
 func TestManagedRuntimePreparationAllOperationsUsePeer(t *testing.T) {
-	s, db := hostedFailureStore(t)
+	s := hostedFailureStore(t)
 	var archive bytes.Buffer
 	writer := zip.NewWriter(&archive)
 	for path, body := range map[string]string{"proof/.codex-plugin/plugin.json": `{"name":"plugin","description":"A plugin.","skills":"./skills"}`, "proof/skills/example/SKILL.md": "---\nname: plugin-proof\ndescription: A plugin Skill.\n---\nProof."} {
@@ -159,7 +158,7 @@ func TestManagedRuntimePreparationAllOperationsUsePeer(t *testing.T) {
 	}
 	tenant := uuid.NewString()
 	fileBody := bytes.Repeat([]byte("bounded bytes"), 12000)
-	session, environment := hostedFailureSession(t, s, db, tenant, sessions.CreateSession{
+	session, environment := hostedFailureSession(t, s, tenant, sessions.CreateSession{
 		InitialFiles:   []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/first", Data: fileBody}},
 		Initialization: environmentconfig.Setup{Skills: []environmentconfig.Skill{hostedFailureSkill(t)}, Plugins: []environmentconfig.Plugin{{Metadata: agentplugin.Metadata{Type: "inline", Name: "plugin", Description: "A plugin."}, Archive: archive.Bytes()}}, Packages: v1.EnvironmentPackages{NPM: []string{"is-number@7.0.0"}, Python: []string{"packaging==24.2"}}, Commands: []environmentconfig.SetupCommand{{Command: "read installed bundles and create directory"}}, CapabilityDirectories: []string{"/workspace/generated"}},
 	})
@@ -183,19 +182,19 @@ func TestManagedRuntimePreparationAllOperationsUsePeer(t *testing.T) {
 		return completedInitialization(request, data)
 	}
 	key := uuid.NewString()
-	worker, _ := managedWorkerMode(t, s, db, key, provider, false, true)
+	worker, _ := managedWorkerMode(t, s, key, provider, false, true)
 	if _, err := worker.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err != nil {
 		t.Fatal(err)
 	}
-	awaitInitialization(t, db.pool, tenant, environment.ID, "complete")
+	awaitInitialization(t, s, tenant, environment.ID, "complete")
 	actionsMu.Lock()
 	defer actionsMu.Unlock()
 	expected := []string{"file", "configure", "skill", "plugin", "npm", "python", "setup", "finalize"}
 	if !reflect.DeepEqual(actions, expected) || provider.commandCalls.Load() != 0 {
 		t.Fatal("typed ordering or provider isolation", actions, provider.commandCalls.Load())
 	}
-	allocation, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
-	if err != nil || initializationState(t, db.pool, allocation.TenantID, allocation.EnvironmentID) != "complete" {
+	allocation, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
+	if err != nil || initializationState(t, s, allocation.TenantID, allocation.EnvironmentID) != "complete" {
 		t.Fatal("initialization incomplete", allocation, err)
 	}
 }
diff --git a/services/core/tests/integration/runtime_input_admission_test.go b/services/core/tests/integration/runtime_input_admission_test.go
index 6ff20dd1d..66617e3db 100644
--- a/services/core/tests/integration/runtime_input_admission_test.go
+++ b/services/core/tests/integration/runtime_input_admission_test.go
@@ -13,15 +13,15 @@ import (
 )
 
 func TestManagedRuntimeMaintenancePreservesCancelAndRetry(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	tenant, session, _ := managedSession(t, s, db)
+	s, _ := newManagedTestStore(t)
+	tenant, session, _ := managedSession(t, s)
 	inputs := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"accepted work"}`)}}
 	accepted, err := submitInputs(t.Context(), s, tenant, session.ID, "work", inputs)
 	if err != nil {
 		t.Fatal(err)
 	}
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	w, stop := managedWorkerMode(t, s, db, uuid.NewString(), p, true)
+	w, stop := managedWorkerMode(t, s, uuid.NewString(), p, true)
 	defer stop()
 	if _, err := w.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: session.Configuration}); !errors.Is(err, placement.ErrAdmissionClosed) {
 		t.Fatal("maintenance accepted new hosted Session", err)
diff --git a/services/core/tests/integration/runtime_lifecycle_test.go b/services/core/tests/integration/runtime_lifecycle_test.go
index 67ed0160d..f03f85e0a 100644
--- a/services/core/tests/integration/runtime_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_lifecycle_test.go
@@ -72,23 +72,23 @@ func (p *lifecycleProvider) RunCommand(context.Context, sandbox.Reference, sandb
 	return sandbox.CommandResult{}, errors.New("not used")
 }
 
-func managedWorker(t *testing.T, s *Store, db fixtureDB, key string, p sandbox.SandboxProvider) (*execution.Worker, func()) {
+func managedWorker(t *testing.T, s *Store, key string, p sandbox.SandboxProvider) (*execution.Worker, func()) {
 	t.Helper()
-	return managedWorkerMode(t, s, db, key, p, false)
+	return managedWorkerMode(t, s, key, p, false)
 }
 
-func managedWorkerMode(t *testing.T, s *Store, db fixtureDB, key string, p sandbox.SandboxProvider, maintenance bool, run ...bool) (*execution.Worker, func()) {
+func managedWorkerMode(t *testing.T, s *Store, key string, p sandbox.SandboxProvider, maintenance bool, run ...bool) (*execution.Worker, func()) {
 	t.Helper()
 	registry := runtimegateway.NewRegistry()
 	if peer, ok := p.(interface {
 		setRuntimeGateway(*testing.T, string, *runtimegateway.Registry)
 	}); ok {
-		handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(fixtureSessionStore(db)), Registry: registry})
+		handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(sessionAdapter(s)), Registry: registry})
 		server := httptest.NewServer(http.HandlerFunc(handler.WS))
 		t.Cleanup(server.Close)
 		peer.setRuntimeGateway(t, "ws"+strings.TrimPrefix(server.URL, "http"), registry)
 	}
-	w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p, AdmissionPaused: maintenance}})
+	w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p, AdmissionPaused: maintenance}})
 	if len(run) > 0 && run[0] {
 		ctx, cancel := context.WithCancel(t.Context())
 		done := make(chan error, 1)
@@ -113,27 +113,27 @@ func managedWorkerMode(t *testing.T, s *Store, db fixtureDB, key string, p sandb
 	return w, stop
 }
 
-func managedSession(t *testing.T, s *Store, db fixtureDB) (string, sessions.Session, sessions.Environment) {
+func managedSession(t *testing.T, s *Store) (string, sessions.Session, sessions.Environment) {
 	t.Helper()
 	tenant := uuid.NewString()
 	v, e := s.CreateSession(t.Context(), tenant, WithFixtureModelProvider(sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted","network":{"access":"enabled"}}}`)}))
 	if e != nil {
 		t.Fatal(e)
 	}
-	env, e := fixtureSessionStore(db).GetSessionEnvironment(t.Context(), tenant, v.ID)
+	env, e := sessionAdapter(s).GetSessionEnvironment(t.Context(), tenant, v.ID)
 	if e != nil {
 		t.Fatal(e)
 	}
 	return tenant, v, env
 }
 
-func reconcileManagedState(t *testing.T, w *execution.Worker, db fixtureDB, tenant, environment, state string) {
+func reconcileManagedState(t *testing.T, w *execution.Worker, s *Store, tenant, environment, state string) {
 	t.Helper()
 	for range 100 {
 		if err := w.ReconcileManagedRuntimes(t.Context()); err != nil {
 			t.Fatal(err)
 		}
-		got, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment})
+		got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -145,23 +145,23 @@ func reconcileManagedState(t *testing.T, w *execution.Worker, db fixtureDB, tena
 }
 
 func TestManagedRuntimeLostCreateRestartAndDeletion(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	tenant, session, env := managedSession(t, s, db)
+	s, _ := newManagedTestStore(t)
+	tenant, session, env := managedSession(t, s)
 	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: true}
-	w, stop := managedWorker(t, s, db, key, p)
+	w, stop := managedWorker(t, s, key, p)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
 	if err == nil || owner.ID == "" {
 		t.Fatal("fault did not retain allocation")
 	}
-	credential, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID)
+	credential, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID)
 	if err != nil || !ok || credential.CredentialHash != p.credentialHash {
 		t.Fatal("provider received unbound credential")
 	}
 	stop()
-	next, _ := managedWorker(t, s, db, key, p)
-	reconcileManagedState(t, next, db, tenant, env.ID, "running")
-	recovered, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	next, _ := managedWorker(t, s, key, p)
+	reconcileManagedState(t, next, s, tenant, env.ID, "running")
+	recovered, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 	if err != nil || recovered.ID != owner.ID || !recovered.CreateSettled || recovered.State != "running" {
 		t.Fatalf("lost response recovery: %+v %v", recovered, err)
 	}
@@ -173,22 +173,22 @@ func TestManagedRuntimeLostCreateRestartAndDeletion(t *testing.T) {
 		t.Fatal(err)
 	}
 	// A scan may first exhaust its previous cursor before starting a new cycle.
-	reconcileManagedState(t, next, db, tenant, env.ID, "released")
-	clean, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	reconcileManagedState(t, next, s, tenant, env.ID, "released")
+	clean, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 	if err != nil || clean.State != "released" || p.kills != 1 {
 		t.Fatalf("deleted cleanup: %+v %v", clean, err)
 	}
-	if _, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
+	if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 		t.Fatal("cleanup did not revoke authority")
 	}
 }
 
 func TestManagedRuntimeUnknownCreationRetainsCleanup(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	tenant, session, env := managedSession(t, s, db)
+	s, _ := newManagedTestStore(t)
+	tenant, session, env := managedSession(t, s)
 	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: true, absent: true}
-	w, _ := managedWorker(t, s, db, key, p)
+	w, _ := managedWorker(t, s, key, p)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
 	if err == nil {
 		t.Fatal("expected uncertain creation")
@@ -196,43 +196,43 @@ func TestManagedRuntimeUnknownCreationRetainsCleanup(t *testing.T) {
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
-	reconcileManagedState(t, w, db, tenant, env.ID, "cleanup_pending")
-	got, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	reconcileManagedState(t, w, s, tenant, env.ID, "cleanup_pending")
+	got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 	if err != nil || got.State != "cleanup_pending" || got.CreateSettled || p.creates != 1 {
 		t.Fatalf("unknown creation forgotten: %+v %v", got, err)
 	}
-	if _, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
+	if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 		t.Fatal("unknown allocation retains execution authority")
 	}
 	// A late completion is still owned and reclaimed on the next scan.
 	p.resources[owner.ID] = sandbox.Info{Reference: sandbox.Reference{TenantID: tenant, EnvironmentID: env.ID, AllocationID: owner.ID}, ProviderID: owner.ID, State: "running", BootstrapComplete: true}
-	reconcileManagedState(t, w, db, tenant, env.ID, "released")
-	got, err = fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	reconcileManagedState(t, w, s, tenant, env.ID, "released")
+	got, err = deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 	if err != nil || got.State != "released" || len(p.resources) != 0 {
 		t.Fatalf("late creation escaped cleanup: %+v %v", got, err)
 	}
 }
 
 func TestManagedRuntimeExpiryRevokesWhenProviderUnavailable(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	tenant, _, env := managedSession(t, s, db)
+	s, _ := newManagedTestStore(t)
+	tenant, _, env := managedSession(t, s)
 	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	w, _ := managedWorker(t, s, db, key, p)
+	w, _ := managedWorker(t, s, key, p)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := db.pool.Exec(t.Context(), "UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '61 minutes' WHERE id=$1", owner.ID); err != nil {
+	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '61 minutes' WHERE id=$1", owner.ID); err != nil {
 		t.Fatal(err)
 	}
 	p.unavailable = true
-	reconcileManagedState(t, w, db, tenant, env.ID, "cleanup_pending")
-	got, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	reconcileManagedState(t, w, s, tenant, env.ID, "cleanup_pending")
+	got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 	if err != nil || got.State != "cleanup_pending" {
 		t.Fatalf("expiry lost on provider failure: %+v %v", got, err)
 	}
-	if _, ok, err := fixtureSessionStore(db).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
+	if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 		t.Fatal("expired credential still authenticates")
 	}
 	if p.kills != 0 {
@@ -241,11 +241,11 @@ func TestManagedRuntimeExpiryRevokesWhenProviderUnavailable(t *testing.T) {
 }
 
 func TestManagedRuntimeStoppedComputeDoesNotRequestCleanup(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	tenant, _, env := managedSession(t, s, db)
+	s, _ := newManagedTestStore(t)
+	tenant, _, env := managedSession(t, s)
 	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	w, _ := managedWorker(t, s, db, key, p)
+	w, _ := managedWorker(t, s, key, p)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
 	if err != nil {
 		t.Fatal(err)
@@ -266,7 +266,7 @@ func TestManagedRuntimeStoppedComputeDoesNotRequestCleanup(t *testing.T) {
 		if p.gets == before {
 			t.Fatal("fixture allocation not inspected")
 		}
-		got, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+		got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 		if err != nil || got.State != "running" || p.kills != 0 || p.creates != 1 {
 			t.Fatalf("compute interruption authorized replacement/cleanup: %+v %v", got, err)
 		}
diff --git a/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go b/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
index 0a1ed7040..d581b19f6 100644
--- a/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
+++ b/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
@@ -77,7 +77,6 @@ func (p *nodeIsolationProvider) RunCommand(ctx context.Context, r sandbox.Refere
 type nodeIsolationFixture struct {
 	t                    *testing.T
 	store                *Store
-	db                   fixtureDB
 	nodes                *deployment.Service
 	pool                 *pgxpool.Pool
 	worker               *execution.Worker
@@ -97,8 +96,7 @@ func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	s.SetPlacement(fixtureRules(t, db))
+	s := NewWithCredentialCipher(pool, cipher)
 	registry := runtimegateway.NewRegistry()
 	cp := &fakeCheckpointProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, computes: map[string]sandbox.ComputeState{}, snapshots: map[string]sandbox.SnapshotIdentity{}, bootstraps: map[string]sandbox.Bootstrap{}, peers: map[string]*websocket.Conn{}, registry: registry}
 	p := &nodeIsolationProvider{fakeCheckpointProvider: cp, blocked: map[string]bool{}, mode: mode, entered: make(chan struct{})}
@@ -115,7 +113,7 @@ func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 		p.writes.Add(1)
 		return completedInitialization(request, data)
 	}}
-	handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(fixtureSessionStore(db)), Registry: registry})
+	handler := runtimegateway.NewHandler(runtimegateway.HandlerConfig{Authenticator: runtimegateway.NewAuthenticator(sessionAdapter(s)), Registry: registry})
 	server := httptest.NewServer(http.HandlerFunc(handler.WS))
 	cp.endpoint = "ws" + strings.TrimPrefix(server.URL, "http")
 	t.Cleanup(func() {
@@ -126,11 +124,11 @@ func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 		cp.mu.Unlock()
 		server.Close()
 	})
-	f := &nodeIsolationFixture{initializationCancel: cancelPreparation, t: t, store: s, db: db, nodes: fixtureDeployment(t, db), pool: pool, provider: p, key: uuid.NewString(), nodeA: uuid.NewString(), nodeB: uuid.NewString()}
+	f := &nodeIsolationFixture{initializationCancel: cancelPreparation, t: t, store: s, nodes: deploymentService(t, s), pool: pool, provider: p, key: uuid.NewString(), nodeA: uuid.NewString(), nodeB: uuid.NewString()}
 	// Keep restored compute awake throughout the isolation assertions.
 	// The suspension setup explicitly dates its activity two minutes in the past.
 	policy := &execution.RuntimeSuspensionPolicy{IdleTimeout: time.Minute, Retention: time.Hour, MaxActive: 100, MaxRetained: 100}
-	f.worker = startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: strings.Repeat("a", 64), Provider: p, ProviderKind: "microsandbox", LocalNodeID: f.nodeA, LocalCredentialSHA256: runtimedevice.HashCredential("local-credential"), LocalMaxActive: 100, LocalMaxRetained: 100, Suspension: policy}})
+	f.worker = startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: strings.Repeat("a", 64), Provider: p, ProviderKind: "microsandbox", LocalNodeID: f.nodeA, LocalCredentialSHA256: runtimedevice.HashCredential("local-credential"), LocalMaxActive: 100, LocalMaxRetained: 100, Suspension: policy}})
 	spec := SandboxDeploymentTestSpec("microsandbox")
 	raw, _ := json.Marshal(spec)
 	if _, err := pool.Exec(t.Context(), "UPDATE runtime_deployment SET specification=$1", raw); err != nil {
@@ -140,7 +138,7 @@ func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 		t.Fatal(err)
 	}
 	t.Cleanup(f.stop)
-	f.epoch = fixtureOwnerEpoch(t, db)
+	f.epoch = fixtureOwnerEpoch(t, s)
 	f.enroll(f.nodeB)
 	f.online(f.nodeA)
 	f.online(f.nodeB)
@@ -211,7 +209,7 @@ func (f *nodeIsolationFixture) session(node string, initialize bool) (string, se
 	if err != nil {
 		f.t.Fatal(err)
 	}
-	env, err := sessionReads(f.pool).GetSessionEnvironment(f.t.Context(), tenant, session.ID)
+	env, err := sessionAdapter(f.store).GetSessionEnvironment(f.t.Context(), tenant, session.ID)
 	if err != nil {
 		f.t.Fatal(err)
 	}
@@ -237,7 +235,7 @@ func (f *nodeIsolationFixture) phase(tenant, environment, phase string) deployme
 		if err := f.worker.ReconcileManagedRuntimes(f.t.Context()); err != nil {
 			f.t.Fatal(err)
 		}
-		owner, err := fixtureReader(f.db).EnvironmentAllocation(f.t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment})
+		owner, err := deploymentStore(f.store).EnvironmentAllocation(f.t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment})
 		if err != nil {
 			f.t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/runtime_node_lifecycle_test.go b/services/core/tests/integration/runtime_node_lifecycle_test.go
index 39bef5925..545e87866 100644
--- a/services/core/tests/integration/runtime_node_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_node_lifecycle_test.go
@@ -48,7 +48,7 @@ func TestManagedNodesIsolateBlockedProviderAndInitialization(t *testing.T) {
 			case <-time.After(8 * time.Second):
 				t.Fatalf("node A did not enter blocked %s operation", mode)
 			}
-			online, err := fixtureReader(f.db).NodeOnline(t.Context(), f.nodeA)
+			online, err := deploymentStore(f.store).NodeOnline(t.Context(), f.nodeA)
 			if err != nil || !online {
 				t.Fatal("test node must stay online while its helper is blocked", err)
 			}
@@ -108,14 +108,14 @@ func TestManagedNodesIsolateBlockedProviderAndInitialization(t *testing.T) {
 			// Only independent normal five-second loops drive these transitions.
 			// No manual reconciliation or wake hint accelerates healthy nodes.
 			waitNodeIsolation(t, 18*time.Second, func() (bool, string) {
-				wake, e1 := fixtureReader(f.db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: wakeTenant, EnvironmentID: wakeEnv.ID})
-				deleted, e2 := fixtureReader(f.db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: deleteTenant, EnvironmentID: deleteEnv.ID})
-				initialized, e3 := fixtureReader(f.db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+				wake, e1 := deploymentStore(f.store).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: wakeTenant, EnvironmentID: wakeEnv.ID})
+				deleted, e2 := deploymentStore(f.store).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: deleteTenant, EnvironmentID: deleteEnv.ID})
+				initialized, e3 := deploymentStore(f.store).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 				f.provider.mu.Lock()
 				restores := f.provider.restores
 				f.provider.mu.Unlock()
-				state := fmt.Sprintf("wake=%s/%s err=%v; deleted=%s/%s err=%v; initialized=%s/%s/%s err=%v; restores=%d writes=%d blocked_returns=%d", wake.State, wake.ComputePhase, e1, deleted.State, deleted.ComputePhase, e2, initialized.State, initializationState(t, f.pool, initialized.TenantID, initialized.EnvironmentID), initialized.ComputePhase, e3, restores, f.provider.writes.Load(), f.provider.returned.Load())
-				return e1 == nil && e2 == nil && e3 == nil && wake.ComputePhase == "running" && deleted.State == "released" && initializationState(t, f.pool, initialized.TenantID, initialized.EnvironmentID) == "complete" && initialized.ComputePhase == "running", state
+				state := fmt.Sprintf("wake=%s/%s err=%v; deleted=%s/%s err=%v; initialized=%s/%s/%s err=%v; restores=%d writes=%d blocked_returns=%d", wake.State, wake.ComputePhase, e1, deleted.State, deleted.ComputePhase, e2, initialized.State, initializationState(t, f.store, initialized.TenantID, initialized.EnvironmentID), initialized.ComputePhase, e3, restores, f.provider.writes.Load(), f.provider.returned.Load())
+				return e1 == nil && e2 == nil && e3 == nil && wake.ComputePhase == "running" && deleted.State == "released" && initializationState(t, f.store, initialized.TenantID, initialized.EnvironmentID) == "complete" && initialized.ComputePhase == "running", state
 			})
 			if f.provider.returned.Load() != 0 || f.provider.writes.Load() != 1 {
 				t.Fatalf("A returned early or initialization replayed: returned=%d writes=%d", f.provider.returned.Load(), f.provider.writes.Load())
@@ -140,7 +140,7 @@ func TestManagedNodesIsolateBlockedProviderAndInitialization(t *testing.T) {
 				t.Fatal(err)
 			}
 			waitNodeIsolation(t, 7*time.Second, func() (bool, string) {
-				owner, err := fixtureReader(f.db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: ct, EnvironmentID: ce.ID})
+				owner, err := deploymentStore(f.store).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: ct, EnvironmentID: ce.ID})
 				return err == nil && owner.State == "released", fmt.Sprintf("new node allocation=%s/%s err=%v", owner.State, owner.ComputePhase, err)
 			})
 			if err := f.nodes.RemoveNode(t.Context(), nodeC); err != nil {
diff --git a/services/core/tests/integration/runtime_observation_scan_test.go b/services/core/tests/integration/runtime_observation_scan_test.go
index 17a5d317a..b535ccf30 100644
--- a/services/core/tests/integration/runtime_observation_scan_test.go
+++ b/services/core/tests/integration/runtime_observation_scan_test.go
@@ -8,14 +8,14 @@ import (
 )
 
 func TestRuntimeObservationScanIsDeploymentWideBoundedAndExcludesDeleted(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	var expected []string
 	for range 5 {
-		_, session, _ := managedSession(t, s, db)
+		_, session, _ := managedSession(t, s)
 		expected = append(expected, session.ID)
 	}
 	slices.Sort(expected)
-	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: sessionTenant(t, db, expected[2]), SessionID: expected[2]}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: sessionTenant(t, s, expected[2]), SessionID: expected[2]}); err != nil {
 		t.Fatal(err)
 	}
 	expected = append(expected[:2], expected[3:]...)
@@ -23,7 +23,7 @@ func TestRuntimeObservationScanIsDeploymentWideBoundedAndExcludesDeleted(t *test
 	var got []string
 	cursor := ""
 	for {
-		page, err := fixtureReader(db).ObservationSessions(t.Context(), cursor, 2)
+		page, err := deploymentStore(s).ObservationSessions(t.Context(), cursor, 2)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -47,16 +47,16 @@ func TestRuntimeObservationScanIsDeploymentWideBoundedAndExcludesDeleted(t *test
 	if !slices.Equal(got, expected) {
 		t.Fatalf("observation scan = %v, want %v", got, expected)
 	}
-	if _, err := fixtureReader(db).ObservationSessions(t.Context(), "", 0); err == nil {
+	if _, err := deploymentStore(s).ObservationSessions(t.Context(), "", 0); err == nil {
 		t.Fatal("zero observation page size was accepted")
 	}
 }
 
-func sessionTenant(t *testing.T, db fixtureDB, sessionID string) string {
+func sessionTenant(t *testing.T, s *Store, sessionID string) string {
 	t.Helper()
 	// The deployment-wide scan intentionally discovers tenant identity without
 	// enumerating configured API keys. Use that same read to locate this fixture.
-	page, err := fixtureReader(db).ObservationSessions(t.Context(), "", 100)
+	page, err := deploymentStore(s).ObservationSessions(t.Context(), "", 100)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/runtime_pending_test.go b/services/core/tests/integration/runtime_pending_test.go
index ad25d023f..65128f89c 100644
--- a/services/core/tests/integration/runtime_pending_test.go
+++ b/services/core/tests/integration/runtime_pending_test.go
@@ -14,20 +14,20 @@ import (
 )
 
 func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	tenant, idle, idleEnvironment := managedSession(t, s, db)
+	s, _ := newManagedTestStore(t)
+	tenant, idle, idleEnvironment := managedSession(t, s)
 	initial, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted"}}`), InitialInputs: []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"hello"}`)}}})
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, deleted, deletedEnvironment := managedSession(t, s, db)
+	_, deleted, deletedEnvironment := managedSession(t, s)
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: deleted.TenantID, SessionID: deleted.ID}); err != nil {
 		t.Fatal(err)
 	}
 	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	start := func() *execution.Worker {
-		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
+		w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
 		return w
 	}
 	stop := func(w *execution.Worker) {
@@ -48,15 +48,15 @@ func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T)
 			t.Fatal(err)
 		}
 	}
-	idleOwner, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: idleEnvironment.ID})
+	idleOwner, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: idleEnvironment.ID})
 	if err != nil || idleOwner.State != "running" {
 		t.Fatal("idle creation was stranded", idleOwner, err)
 	}
-	initialOwner, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: initial.Environment.ID})
+	initialOwner, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: initial.Environment.ID})
 	if err != nil || initialOwner.State != "running" {
 		t.Fatal("initial creation was stranded", initialOwner, err)
 	}
-	if _, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: deleted.TenantID, EnvironmentID: deletedEnvironment.ID}); err == nil {
+	if _, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: deleted.TenantID, EnvironmentID: deletedEnvironment.ID}); err == nil {
 		t.Fatal("deleted Session provisioned")
 	}
 	waiting, err := sessionAdapter(s).GetSession(t.Context(), tenant, initial.ID)
@@ -81,7 +81,7 @@ func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T)
 		t.Fatal("restart repeated bootstrap", creates, p.creates)
 	}
 	for _, owner := range []deployment.Allocation{idleOwner, initialOwner} {
-		got, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: owner.EnvironmentID})
+		got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: owner.EnvironmentID})
 		if err != nil || got.ID != owner.ID || got.DeviceID != owner.DeviceID {
 			t.Fatal("restart replaced allocation identity", got, err)
 		}
diff --git a/services/core/tests/integration/runtime_scan_test.go b/services/core/tests/integration/runtime_scan_test.go
index c92f1a21b..c5221dbc1 100644
--- a/services/core/tests/integration/runtime_scan_test.go
+++ b/services/core/tests/integration/runtime_scan_test.go
@@ -28,13 +28,13 @@ func (p *scanProvider) GetInfo(ctx context.Context, ref sandbox.Reference) (sand
 func TestManagedRuntimeScanWrapServicesNextPage(t *testing.T) {
 	for _, count := range []int{0, 1, 31, 32, 33, 65} {
 		t.Run(fmt.Sprint(count), func(t *testing.T) {
-			s, db := newManagedTestStoreDB(t)
+			s, _ := newManagedTestStore(t)
 			p := &scanProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}}
 			key := uuid.NewString()
-			w, _ := managedWorker(t, s, db, key, p)
+			w, _ := managedWorker(t, s, key, p)
 			var ids []string
 			for range count {
-				tenant, _, env := managedSession(t, s, db)
+				tenant, _, env := managedSession(t, s)
 				owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
 				if err != nil {
 					t.Fatal(err)
@@ -67,11 +67,11 @@ func TestManagedRuntimeScanWrapServicesNextPage(t *testing.T) {
 }
 
 func TestManagedRuntimeScanEmptyAfterCleanupAndCanceledCall(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	p := &scanProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}}
 	key := uuid.NewString()
-	w, _ := managedWorker(t, s, db, key, p)
-	tenant, session, env := managedSession(t, s, db)
+	w, _ := managedWorker(t, s, key, p)
+	tenant, session, env := managedSession(t, s)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
 	if err != nil {
 		t.Fatal(err)
@@ -96,7 +96,7 @@ func TestManagedRuntimeScanEmptyAfterCleanupAndCanceledCall(t *testing.T) {
 	if err := w.ReconcileManagedRuntimes(t.Context()); err != nil {
 		t.Fatal(err)
 	}
-	got, err := fixtureReader(db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
+	got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
 	if err != nil || got.State != "released" || p.kills != 1 {
 		t.Fatal("cleanup delayed at EOF", got, err, p.kills)
 	}
@@ -110,7 +110,7 @@ func TestManagedRuntimeScanEmptyAfterCleanupAndCanceledCall(t *testing.T) {
 		}
 	}
 	// A new allocation remains discoverable after the store becomes empty.
-	tenant, _, env = managedSession(t, s, db)
+	tenant, _, env = managedSession(t, s)
 	next, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/runtime_wake_hint_integration_test.go b/services/core/tests/integration/runtime_wake_hint_integration_test.go
index 318ff7474..f31a2e4a7 100644
--- a/services/core/tests/integration/runtime_wake_hint_integration_test.go
+++ b/services/core/tests/integration/runtime_wake_hint_integration_test.go
@@ -73,7 +73,7 @@ func newWakeHintIntegration(t *testing.T) *wakeHintIntegration {
 		fakeCheckpointProvider: f.provider, sentinel: sentinel.owner.ID,
 		release: make(chan struct{}), scans: make(chan int, 16),
 	}
-	worker := startWorker(t, t.Context(), f.db, &execution.Dispatcher{
+	worker := startWorker(t, t.Context(), f.store, &execution.Dispatcher{
 		Registry: f.provider.registry,
 		ManagedRuntimes: &execution.RuntimeProvider{
 			CoreURL: "http://core.invalid/api/v1", InstallationID: f.key,
@@ -121,7 +121,7 @@ func (f *wakeHintIntegration) pending(t *testing.T, target wakeHintIntegrationTa
 	t.Helper()
 	var id string
 	awaitDaemonRemoteCondition(t, t.Context(), 2*time.Second, "committed wake input", func() bool {
-		return f.fixture.db.pool.QueryRow(t.Context(),
+		return f.fixture.store.pool.QueryRow(t.Context(),
 			"SELECT id::text FROM environment_input_reservations WHERE session_id=$1 AND idempotency_key=$2",
 			target.session.ID, key).Scan(&id) == nil
 	})
@@ -166,7 +166,7 @@ func TestRuntimeWakeHintCommittedSubmitResumesBeforeNormalTick(t *testing.T) {
 	}
 	f.release()
 	awaitDaemonRemoteCondition(t, t.Context(), 2*time.Second, "hint restored retained compute", func() bool {
-		owner, err := fixtureReader(f.fixture.db).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: f.target.tenant, EnvironmentID: f.target.environment.ID})
+		owner, err := deploymentStore(f.fixture.store).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: f.target.tenant, EnvironmentID: f.target.environment.ID})
 		return err == nil && owner.ComputePhase == "running"
 	})
 	if elapsed := time.Since(f.started); elapsed >= 3*time.Second {
@@ -179,7 +179,7 @@ func TestRuntimeWakeHintCommittedSubmitResumesBeforeNormalTick(t *testing.T) {
 		t.Fatal("wake replayed creation/restoration or sent native input", restores, creates, f.provider.promptFrames.Load())
 	}
 	var reservations, turns int
-	if err := f.fixture.db.pool.QueryRow(t.Context(),
+	if err := f.fixture.store.pool.QueryRow(t.Context(),
 		"SELECT (SELECT count(*) FROM environment_input_reservations WHERE session_id=$1), (SELECT count(*) FROM turns WHERE session_id=$1)",
 		f.target.session.ID).Scan(&reservations, &turns); err != nil || reservations != 1 || turns != 1 {
 		t.Fatal("retry duplicated input or started a Turn before preparation", reservations, turns, err)
diff --git a/services/core/tests/integration/runtime_worker_recovery_test.go b/services/core/tests/integration/runtime_worker_recovery_test.go
index 4e41fe586..654f8a444 100644
--- a/services/core/tests/integration/runtime_worker_recovery_test.go
+++ b/services/core/tests/integration/runtime_worker_recovery_test.go
@@ -60,7 +60,7 @@ func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	worker := startWorker(t, t.Context(), h.db, h.d)
+	worker := startWorker(t, t.Context(), h.s, h.d)
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
@@ -73,7 +73,7 @@ func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 		}
 	})
 	frames := workerFrames(t, h)
-	environment, err := fixtureSessionStore(h.db).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
+	environment, err := sessionAdapter(h.s).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -144,7 +144,7 @@ func TestWorkerRestartPreservesQueuedTurnWhileComputeWakes(t *testing.T) {
 	if _, err := pool.Exec(t.Context(), `INSERT INTO turns(id,session_id,status) VALUES($1,$2,'queued')`, turn, h.session.ID); err != nil {
 		t.Fatal(err)
 	}
-	worker, err := startWorkerErr(t.Context(), h.db, h.d)
+	worker, err := startWorkerErr(t.Context(), h.s, h.d)
 	if err != nil {
 		t.Fatal("queued wake blocked Core startup", err)
 	}
diff --git a/services/core/tests/integration/sandbox_deployment_resources_test.go b/services/core/tests/integration/sandbox_deployment_resources_test.go
index 8c256bf6b..f4588ac29 100644
--- a/services/core/tests/integration/sandbox_deployment_resources_test.go
+++ b/services/core/tests/integration/sandbox_deployment_resources_test.go
@@ -16,7 +16,7 @@ func TestSandboxDeploymentMutationViewsIncludeActualResources(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	installation := uuid.NewString()
diff --git a/services/core/tests/integration/sandbox_deployment_switch_test.go b/services/core/tests/integration/sandbox_deployment_switch_test.go
index 9931d2296..49ee8ba6a 100644
--- a/services/core/tests/integration/sandbox_deployment_switch_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_test.go
@@ -37,7 +37,7 @@ func TestSandboxResetClearsCustomE2BEndpoint(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	installation := uuid.NewString()
@@ -78,7 +78,7 @@ func TestSandboxDirectDeploymentOwnershipAndCleanSwitch(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	id := uuid.NewString()
@@ -164,7 +164,7 @@ func TestSandboxDirectDeploymentOwnershipAndCleanSwitch(t *testing.T) {
 func TestSandboxSwitchRetiresNodesAndEnrollment(t *testing.T) {
 	_, pool := newManagedTestStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{5}, 32))
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	nodes := deploymentService(t, s)
@@ -239,7 +239,7 @@ func TestSandboxSwitchRetiresNodesAndEnrollment(t *testing.T) {
 func TestSandboxResetSerializesFreshDirectSessions(t *testing.T) {
 	_, pool := newManagedTestStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{6}, 32))
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	id := uuid.NewString()
@@ -283,7 +283,7 @@ func TestSandboxResetSerializesFreshDirectSessions(t *testing.T) {
 func TestSandboxSwitchPreservesReleasedAllocationAndItemHistory(t *testing.T) {
 	_, pool := newManagedTestStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{8}, 32))
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	installation := uuid.NewString()
@@ -368,7 +368,7 @@ func TestSandboxSwitchPreservesReleasedAllocationAndItemHistory(t *testing.T) {
 func TestUnspecifiedNodeDeploymentRejectedWithoutMutation(t *testing.T) {
 	_, pool := newManagedTestStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	nodes := deploymentService(t, s)
diff --git a/services/core/tests/integration/sandbox_deployment_switch_worker_test.go b/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
index c8c21589d..e43dd7ae3 100644
--- a/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
@@ -24,9 +24,8 @@ import (
 func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	_, pool := newManagedTestStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	s.SetPlacement(fixtureRules(t, db))
-	deployments := fixtureDeployment(t, db)
+	s := NewWithCredentialCipher(pool, cipher)
+	deployments := deploymentService(t, s)
 	id := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	var fail atomic.Bool
@@ -44,7 +43,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 		}
 		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p}}, nil
 	})
-	w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
+	w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- w.Run(ctx) }()
@@ -146,7 +145,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	if _, err := w.InitializeSandboxDeployment(t.Context(), cloud); err != nil {
 		t.Fatal("setup after unconfigured publication", err)
 	}
-	tenant, session, environment := managedSession(t, s, db)
+	tenant, session, environment := managedSession(t, s)
 	allocation, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, id)
 	if err != nil || allocation.NodeID != "" || allocation.State != "running" {
 		t.Fatal("direct provider not available after resume", allocation, err)
@@ -158,7 +157,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
-	reconcileManagedState(t, w, db, tenant, environment.ID, "released")
+	reconcileManagedState(t, w, s, tenant, environment.ID, "released")
 	empty = reset(4)
 	next.ExpectedGeneration = empty.Generation
 	if _, err := w.InitializeSandboxDeployment(t.Context(), next); err != nil {
diff --git a/services/core/tests/integration/sandbox_deployment_view_test.go b/services/core/tests/integration/sandbox_deployment_view_test.go
index 000a058df..0e696c890 100644
--- a/services/core/tests/integration/sandbox_deployment_view_test.go
+++ b/services/core/tests/integration/sandbox_deployment_view_test.go
@@ -20,7 +20,7 @@ func TestSandboxDeploymentViewRecordsTemplateBuildAndSuspension(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	id := uuid.NewString()
diff --git a/services/core/tests/integration/sandbox_deployment_worker_test.go b/services/core/tests/integration/sandbox_deployment_worker_test.go
index 4b28da8d1..95538e64a 100644
--- a/services/core/tests/integration/sandbox_deployment_worker_test.go
+++ b/services/core/tests/integration/sandbox_deployment_worker_test.go
@@ -18,8 +18,8 @@ import (
 )
 
 func TestSandboxDeploymentWorkerActivatesWithoutRestart(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
-	deployments := fixtureDeployment(t, db)
+	s, _ := newManagedTestStore(t)
+	deployments := deploymentService(t, s)
 	id := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	configuration := execution.NewDeferredRuntimeProvider(id, func(ctx context.Context) (*execution.RuntimeProvider, error) {
@@ -34,7 +34,7 @@ func TestSandboxDeploymentWorkerActivatesWithoutRestart(t *testing.T) {
 	})
 	start := func() (*execution.Worker, func()) {
 		t.Helper()
-		w := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
+		w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
 		var once sync.Once
 		stop := func() {
 			once.Do(func() { ctx, cancel := context.WithCancel(context.Background()); cancel(); _ = w.Run(ctx) })
@@ -63,7 +63,7 @@ func TestSandboxDeploymentWorkerActivatesWithoutRestart(t *testing.T) {
 	}
 	connect := func() {
 		t.Helper()
-		epoch := fixtureOwnerEpoch(t, db)
+		epoch := fixtureOwnerEpoch(t, s)
 		connection := uuid.NewString()
 		if err := deployments.ConnectNode(t.Context(), nodeID, connection, epoch); err != nil {
 			t.Fatal(err)
@@ -73,7 +73,7 @@ func TestSandboxDeploymentWorkerActivatesWithoutRestart(t *testing.T) {
 		}
 	}
 	connect()
-	tenant, _, environment := managedSession(t, s, db)
+	tenant, _, environment := managedSession(t, s)
 	allocation, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, id)
 	if err != nil || allocation.NodeID != nodeID || p.creates != 1 {
 		t.Fatal("activation failed", allocation, err)
diff --git a/services/core/tests/integration/sandbox_node_auth_order_http_test.go b/services/core/tests/integration/sandbox_node_auth_order_http_test.go
index 5e92a1965..67f9d9615 100644
--- a/services/core/tests/integration/sandbox_node_auth_order_http_test.go
+++ b/services/core/tests/integration/sandbox_node_auth_order_http_test.go
@@ -17,19 +17,19 @@ import (
 // authenticate first: a missing or invalid credential gets 401, and only a
 // recognized credential learns that the deployment is unavailable.
 func TestSandboxNodeRoutesAuthenticateBeforeDeploymentState(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential(uuid.NewString())})
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, s, db, nil, "codex", storeKeys(s), storeExecution(t, s), managedSandboxes(t, db), withCoreKeys(admin))
+	handler, err := publicHandler(t, s, nil, "codex", storeKeys(s), storeExecution(t, s), managedSandboxes(t, s), withCoreKeys(admin))
 	if err != nil {
 		t.Fatal(err)
 	}
 	// Recognized, unconsumed enrollment tokens; no deployment has been initialized.
 	enrollment := func(token, installation string) {
 		t.Helper()
-		if _, err := db.pool.Exec(t.Context(), "INSERT INTO runtime_node_enrollments(token_sha256,installation_id,expires_at) VALUES(encode(sha256($1::bytea),'hex'),$2,clock_timestamp()+interval '10 minutes')", token, installation); err != nil {
+		if _, err := s.pool.Exec(t.Context(), "INSERT INTO runtime_node_enrollments(token_sha256,installation_id,expires_at) VALUES(encode(sha256($1::bytea),'hex'),$2,clock_timestamp()+interval '10 minutes')", token, installation); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -75,7 +75,7 @@ func TestSandboxNodeRoutesAuthenticateBeforeDeploymentState(t *testing.T) {
 
 	// Once Web claims an installation, still before initialization, another
 	// installation's token gets the same 401 it gets after initialization.
-	if _, err := db.pool.Exec(t.Context(), "UPDATE runtime_deployment SET installation_id=$1, web_managed=true WHERE singleton=true", claimed); err != nil {
+	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_deployment SET installation_id=$1, web_managed=true WHERE singleton=true", claimed); err != nil {
 		t.Fatal(err)
 	}
 	run([]check{
diff --git a/services/core/tests/integration/sandbox_specification_lifecycle_test.go b/services/core/tests/integration/sandbox_specification_lifecycle_test.go
index baf925f1c..19e9e2513 100644
--- a/services/core/tests/integration/sandbox_specification_lifecycle_test.go
+++ b/services/core/tests/integration/sandbox_specification_lifecycle_test.go
@@ -24,7 +24,7 @@ func webSpecificationFixture(t *testing.T, provider string) (*Store, *Store, dep
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	w := executionWriter(t, s)
 	id := uuid.NewString()
 	changes := deploymentExecution(t, w)
diff --git a/services/core/tests/integration/saved_web_search_public_test.go b/services/core/tests/integration/saved_web_search_public_test.go
index 96992c293..dd31102ac 100644
--- a/services/core/tests/integration/saved_web_search_public_test.go
+++ b/services/core/tests/integration/saved_web_search_public_test.go
@@ -19,13 +19,13 @@ import (
 // and keeps tenant isolation (W8).
 func TestSavedWebSearchPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "search-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "search-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -115,7 +115,7 @@ func TestSavedWebSearchPostgres(t *testing.T) {
 
 	// A disabled record saved before this batch reads unchanged and is admitted with
 	// the same frozen Session tool (W7).
-	_, agentService := fixtureAgents(t, db)
+	_, agentService := fixtureAgents(t, s)
 	legacy, err := agentService.Create(t.Context(), agents.CreateCommand{TenantID: ownerTenant, Metadata: map[string]string{}, Configuration: json.RawMessage(
 		`{"model":"search-model","name":null,"instructions":null,"multi_agent":{"enabled":false,"max_concurrent_subagents":null},"reasoning":{},"service_tier":"auto","text":{"format":{"type":"text"},"verbosity":"medium"},"tools":[{"type":"web_search","mode":"disabled","context_size":"medium","allowed_domains":[],"location":null}]}`)})
 	if err != nil {
@@ -172,7 +172,7 @@ func TestSavedWebSearchPostgres(t *testing.T) {
 	enabledTools := map[string]string{"mode-live": agentIDs["mode-live"], "mode-cached": agentIDs["mode-cached"], "type-only": agentIDs["type-only"], "updated-to-live": agentIDs["mode-disabled"]}
 
 	// W4: every creation mode rejects enabled saved search without writes.
-	before := databaseDigest(t, db.pool)
+	before := databaseDigest(t, s.pool)
 	const rejection = `{"error":{"message":"Only disabled web_search is qualified for execution.","type":"invalid_request_error","code":"unsupported_or_invalid_configuration","param":null}}` + "\n"
 	for name, id := range enabledTools {
 		for _, suffix := range []string{
@@ -224,7 +224,7 @@ func TestSavedWebSearchPostgres(t *testing.T) {
 	if status, raw := client.do(foreign, http.MethodGet, "/v1/agents?limit=100", "", nil); status != http.StatusOK || strings.Contains(raw, "search-model") {
 		t.Errorf("foreign list: %d %s", status, raw)
 	}
-	if after := databaseDigest(t, db.pool); !mapsEqual(before, after) {
+	if after := databaseDigest(t, s.pool); !mapsEqual(before, after) {
 		t.Fatal("rejected Session creation changed persisted state")
 	}
 
diff --git a/services/core/tests/integration/self_hosted_cancel_public_test.go b/services/core/tests/integration/self_hosted_cancel_public_test.go
index ae60019a1..31f6f8989 100644
--- a/services/core/tests/integration/self_hosted_cancel_public_test.go
+++ b/services/core/tests/integration/self_hosted_cancel_public_test.go
@@ -23,7 +23,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newModelTestStoreDB(t)
+	s, _ := NewModelTestStore(t)
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
@@ -33,9 +33,9 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	var owner execution.Owner
 	serve := func() (*httptest.Server, func(bool)) {
 		t.Helper()
-		owner = executionOwner(t, db)
-		worker, stop := publicOwnedWorker(t, s, db, owner)
-		handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker), executorURL("https://offline-executor.example"))
+		owner = executionOwner(t, s)
+		worker, stop := publicOwnedWorker(t, s, owner)
+		handler, err := publicHandler(t, s, auth, "codex", workerExecution(t, worker), executorURL("https://offline-executor.example"))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -79,7 +79,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	settings["accepted"] = accepted
 	receipts := func(key, target string) []sessions.InputReceipt {
 		t.Helper()
-		rows, err := db.pool.Query(t.Context(), `SELECT sequence, COALESCE(turn_id::text,'') FROM turn_inputs
+		rows, err := s.pool.Query(t.Context(), `SELECT sequence, COALESCE(turn_id::text,'') FROM turn_inputs
 			WHERE session_id=$1 AND idempotency_key=$2 ORDER BY batch_position`, created.ID, key)
 		if err != nil {
 			t.Fatal(err)
@@ -104,7 +104,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	snapshot := func(sessionID string) string {
 		t.Helper()
 		var value string
-		err := db.pool.QueryRow(t.Context(), `SELECT jsonb_build_object(
+		err := s.pool.QueryRow(t.Context(), `SELECT jsonb_build_object(
 			'session', (SELECT to_jsonb(s) FROM sessions s WHERE id=$1),
 			'reservations', (SELECT jsonb_agg(to_jsonb(r) ORDER BY r.id) FROM environment_input_reservations r WHERE session_id=$1),
 			'turns', (SELECT jsonb_agg(to_jsonb(t) ORDER BY t.id) FROM turns t WHERE session_id=$1),
@@ -148,7 +148,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	if snapshot(created.ID) != before {
 		t.Fatal("idle cancellation replay or rejected input changed active work")
 	}
-	itemsBefore, err := sessionReads(db.pool).ListItems(t.Context(), tenant, created.ID, "", 100, true)
+	itemsBefore, err := sessionAdapter(s).ListItems(t.Context(), tenant, created.ID, "", 100, true)
 	if err != nil || len(itemsBefore.Items) != 2 {
 		t.Fatal("controlled partial output was not recorded", err)
 	}
@@ -162,7 +162,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	if err != nil || turn.Status != sessions.TurnInProgress || turn.CancelRequestedAt.IsZero() || !turn.CompletedAt.IsZero() {
 		t.Fatal("202 must admit cancellation without fabricating native completion", err)
 	}
-	itemsAfter, err := sessionReads(db.pool).ListItems(t.Context(), tenant, created.ID, "", 100, true)
+	itemsAfter, err := sessionAdapter(s).ListItems(t.Context(), tenant, created.ID, "", 100, true)
 	if err != nil || !reflect.DeepEqual(itemsBefore, itemsAfter) {
 		t.Fatal("cancellation admission changed partial history", err)
 	}
@@ -173,12 +173,12 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	transition(first, sessions.TurnInProgress, sessions.TurnCancelled)
 	for _, reopen := range []bool{false, true} {
 		if reopen {
-			awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, db.pool)
+			awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, s.pool)
 			stop(false)
 			awaitRelease()
 			server.Close()
-			db.pool.Close()
-			s, db = newModelTestStoreDB(t)
+			s.pool.Close()
+			s, _ = NewModelTestStore(t)
 			server, stop = serve()
 			settings["base"] = server.URL
 		}
diff --git a/services/core/tests/integration/self_hosted_initial_public_test.go b/services/core/tests/integration/self_hosted_initial_public_test.go
index 0693f210a..be5360247 100644
--- a/services/core/tests/integration/self_hosted_initial_public_test.go
+++ b/services/core/tests/integration/self_hosted_initial_public_test.go
@@ -30,7 +30,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newModelTestStoreDB(t)
+	s, _ := NewModelTestStore(t)
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	token, peer, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
@@ -39,7 +39,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: foreignTenant, SubjectKind: "service_account", SubjectID: "initial-creator", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
 	const origin = "https://offline-executor.example"
-	serve := func(s *Store, db fixtureDB, worker *execution.Worker) *httptest.Server {
+	serve := func(s *Store, worker *execution.Worker) *httptest.Server {
 		t.Helper()
 		enabled := []func(*api.Dependencies){acceptUnavailable(t)}
 		if worker != nil {
@@ -56,7 +56,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 				}
 			})
 		}
-		handler, err := publicHandler(t, s, db, auth, "codex", enabled...)
+		handler, err := publicHandler(t, s, auth, "codex", enabled...)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -64,8 +64,8 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 		t.Cleanup(server.Close)
 		return server
 	}
-	worker, stop := publicInitialWorker(t, s, db)
-	server := serve(s, db, worker)
+	worker, stop := publicInitialWorker(t, s)
+	server := serve(s, worker)
 	settings := map[string]any{"base": server.URL, "token": token, "peer_token": peer, "foreign_token": foreign, "remote_url": origin}
 	run := func(phase string) json.RawMessage {
 		t.Helper()
@@ -129,7 +129,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 			if !reflect.DeepEqual(texts, item.Texts) {
 				t.Fatal("public initial text order changed")
 			}
-			environment, err := sessionReads(pool).GetSessionEnvironment(t.Context(), tenant, item.ID)
+			environment, err := sessionAdapter(s).GetSessionEnvironment(t.Context(), tenant, item.ID)
 			if err != nil || environment.ID != item.EnvironmentID || environment.Status != "pending" {
 				t.Fatal("public initial Environment identity changed", err)
 			}
@@ -144,23 +144,23 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 		}
 		return result
 	}
-	before := reservations(s, db.pool)
+	before := reservations(s, s.pool)
 	for _, reservation := range before {
 		if reservation.State != sessions.EnvironmentInputPending || reservation.Deadline.Sub(reservation.CreatedAt) != 5*time.Minute {
 			t.Fatal("public initial creation did not retain its database deadline")
 		}
 	}
-	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, db.pool)
+	awaitRelease := pgtest.ObserveExecutionLeaseRelease(t, s.pool)
 	stop(false)
 	awaitRelease()
 	server.Close()
-	db.pool.Close()
-	reopened, reopenedDB := newModelTestStoreDB(t)
-	worker, stop = publicInitialWorker(t, reopened, reopenedDB)
-	server = serve(reopened, reopenedDB, worker)
+	s.pool.Close()
+	reopened, _ := NewModelTestStore(t)
+	worker, stop = publicInitialWorker(t, reopened)
+	server = serve(reopened, worker)
 	settings["base"], settings["accepted"] = server.URL, accepted
 	run("reopen")
-	if !reflect.DeepEqual(before, reservations(reopened, reopenedDB.pool)) {
+	if !reflect.DeepEqual(before, reservations(reopened, reopened.pool)) {
 		t.Fatal("reopened public retry changed reservation identity or deadline")
 	}
 	failureID := created.Cases[0].ID
@@ -170,7 +170,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 			return
 		}
 		// Advance one known deadline; the running Worker still owns settlement and events.
-		tag, err := reopenedDB.pool.Exec(r.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1 AND is_initial AND state='pending'", failureID)
+		tag, err := reopened.pool.Exec(r.Context(), "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1 AND is_initial AND state='pending'", failureID)
 		if err != nil || tag.RowsAffected() != 1 {
 			t.Error("controlled initial deadline update failed", err)
 			w.WriteHeader(http.StatusInternalServerError)
@@ -181,7 +181,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 	defer control.Close()
 	settings["expiry_control"] = control.URL
 	run("expire")
-	after := reservations(reopened, reopenedDB.pool)
+	after := reservations(reopened, reopened.pool)
 	for id, reservation := range after {
 		if id == failureID {
 			if reservation.ID != before[id].ID || reservation.State != sessions.EnvironmentInputExpired || reservation.SettledAt == nil {
@@ -192,7 +192,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 		}
 	}
 	var pid uint32
-	err := reopenedDB.pool.QueryRow(t.Context(), `SELECT pid FROM pg_locks WHERE locktype='advisory'
+	err := reopened.pool.QueryRow(t.Context(), `SELECT pid FROM pg_locks WHERE locktype='advisory'
 		AND database=(SELECT oid FROM pg_database WHERE datname=current_database())
 		AND classid=(706172736172::bigint >> 32)::oid
 		AND objid=(706172736172::bigint & 4294967295)::oid AND objsubid=1 AND granted`).Scan(&pid)
@@ -200,27 +200,27 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 		t.Fatal(err)
 	}
 	var killed bool
-	if err := reopenedDB.pool.QueryRow(t.Context(), "SELECT pg_terminate_backend($1, 1000)", pid).Scan(&killed); err != nil || !killed {
+	if err := reopened.pool.QueryRow(t.Context(), "SELECT pg_terminate_backend($1, 1000)", pid).Scan(&killed); err != nil || !killed {
 		t.Fatal("could not end the fixture Worker's execution lease", err)
 	}
 	stop(true)
-	settings["disabled_base"] = serve(reopened, reopenedDB, nil).URL
+	settings["disabled_base"] = serve(reopened, nil).URL
 	run("unavailable")
-	if !reflect.DeepEqual(after, reservations(reopened, reopenedDB.pool)) {
+	if !reflect.DeepEqual(after, reservations(reopened, reopened.pool)) {
 		t.Fatal("unavailable execution or recorded retry changed initial work")
 	}
 }
 
-func publicInitialWorker(t *testing.T, s *Store, db fixtureDB) (*execution.Worker, func(bool)) {
+func publicInitialWorker(t *testing.T, s *Store) (*execution.Worker, func(bool)) {
 	t.Helper()
-	return publicOwnedWorker(t, s, db, executionOwner(t, db))
+	return publicOwnedWorker(t, s, executionOwner(t, s))
 }
 
 // publicOwnedWorker is publicInitialWorker on owner, for tests that also write
 // as the Worker's execution owner.
-func publicOwnedWorker(t *testing.T, s *Store, db fixtureDB, owner execution.Owner) (*execution.Worker, func(bool)) {
+func publicOwnedWorker(t *testing.T, s *Store, owner execution.Owner) (*execution.Worker, func(bool)) {
 	t.Helper()
-	worker := startOwnedWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()}, owner)
+	worker := startOwnedWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()}, owner)
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
diff --git a/services/core/tests/integration/session_agent_filter_public_test.go b/services/core/tests/integration/session_agent_filter_public_test.go
index d4fb2142c..e6239c311 100644
--- a/services/core/tests/integration/session_agent_filter_public_test.go
+++ b/services/core/tests/integration/session_agent_filter_public_test.go
@@ -17,20 +17,20 @@ func TestSessionAgentFilterOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := New(db.pool), fixtureDB{pool: db.pool}
-	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex", storeExecution(t, recoveredStore))
+	recoveredStore := New(s.pool)
+	h, err = publicHandler(t, recoveredStore, auth, "codex", storeExecution(t, recoveredStore))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_artifacts_public_test.go b/services/core/tests/integration/session_artifacts_public_test.go
index e8e3f61f1..4b72e8863 100644
--- a/services/core/tests/integration/session_artifacts_public_test.go
+++ b/services/core/tests/integration/session_artifacts_public_test.go
@@ -68,7 +68,7 @@ func completeArtifactTurn(t *testing.T, s *Store, artifacts *sessions.Service, t
 }
 
 // artifactHTTPServer serves Artifact routes for an owner and a foreign tenant.
-func artifactHTTPServer(t *testing.T, s *Store, db fixtureDB) (server *httptest.Server, owner, ownerTenant, foreign, foreignTenant string) {
+func artifactHTTPServer(t *testing.T, s *Store) (server *httptest.Server, owner, ownerTenant, foreign, foreignTenant string) {
 	t.Helper()
 	owner, foreign = uuid.NewString(), uuid.NewString()
 	ownerTenant, foreignTenant = uuid.NewString(), uuid.NewString()
@@ -76,7 +76,7 @@ func artifactHTTPServer(t *testing.T, s *Store, db fixtureDB) (server *httptest.
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "artifact-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "artifact-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex")
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -89,12 +89,12 @@ func artifactHTTPServer(t *testing.T, s *Store, db fixtureDB) (server *httptest.
 // environment_id filter matches nothing like another Environment's ID (HE-56),
 // without weakening tenant or Session scoping.
 func TestSessionArtifactListEnvelopeAndEnvironmentFilterPostgres(t *testing.T) {
-	s, db := newTestStoreDB(t)
-	_, sessionService, err := fixtureSessions(db)
+	s, _ := testStore(t)
+	sessionService, err := newSessionService(s)
 	if err != nil {
 		t.Fatal(err)
 	}
-	server, owner, ownerTenant, foreign, foreignTenant := artifactHTTPServer(t, s, db)
+	server, owner, ownerTenant, foreign, foreignTenant := artifactHTTPServer(t, s)
 	client := pathIDClient{t: t, server: server}
 
 	session, environment := hostedArtifactSession(t, s, ownerTenant, "artifact-list")
@@ -213,12 +213,13 @@ func TestSessionArtifactsOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
-	sessionStore, sessionService, err := fixtureSessions(db)
+	s, _ := testStore(t)
+	sessionStore := sessionAdapter(s)
+	sessionService, err := newSessionService(s)
 	if err != nil {
 		t.Fatal(err)
 	}
-	server, owner, ownerTenant, foreign, _ := artifactHTTPServer(t, s, db)
+	server, owner, ownerTenant, foreign, _ := artifactHTTPServer(t, s)
 	session, environment := hostedArtifactSession(t, s, ownerTenant, "artifact-sdk")
 	outputs := map[string]string{"a.txt": "alpha", "sub/b.txt": "bravo", "empty.txt": ""}
 	first := completeArtifactTurn(t, s, sessionService, ownerTenant, session, environment, "artifact-sdk-1", outputs)
diff --git a/services/core/tests/integration/session_deletion_execution_test.go b/services/core/tests/integration/session_deletion_execution_test.go
index 8a6124e92..fb1872d74 100644
--- a/services/core/tests/integration/session_deletion_execution_test.go
+++ b/services/core/tests/integration/session_deletion_execution_test.go
@@ -15,7 +15,7 @@ func TestDeletedSessionWaitingTurnSettlesWithoutStoppingWorker(t *testing.T) {
 	h := newFunctionHarness(t)
 	ctx, cancel := context.WithCancel(t.Context())
 	defer cancel()
-	worker := startOwnedWorker(t, ctx, h.db, h.d, h.owner())
+	worker := startOwnedWorker(t, ctx, h.s, h.d, h.owner())
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	defer func() {
@@ -77,7 +77,7 @@ func TestDeletedSessionRestartStillReconcilesHiddenClaim(t *testing.T) {
 	if err := h.s.commitLegacyDeletion(ctx, h.tenant, h.session.ID); err != nil {
 		t.Fatal(err)
 	}
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	stopped, cancel := context.WithCancel(ctx)
 	cancel()
 	if err := worker.Run(stopped); !errors.Is(err, context.Canceled) {
@@ -98,7 +98,7 @@ func TestWaitingSessionCancelsThenDeletesThroughWorker(t *testing.T) {
 	h := newFunctionHarness(t)
 	ctx, cancel := context.WithCancel(t.Context())
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	defer func() {
diff --git a/services/core/tests/integration/session_deletion_lifecycle_public_test.go b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
index 930530ec1..57216d5a3 100644
--- a/services/core/tests/integration/session_deletion_lifecycle_public_test.go
+++ b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
@@ -23,22 +23,22 @@ const deletionAgent = `"agent":{"id":"agent_deletion","model":"fixture","tools":
 // missing and malformed identifiers keep one not-found response.
 func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	s, db := newManagedTestStoreDB(t)
-	audit := auditpg.New(pgunit.NewPool(db.pool))
+	s, _ := newManagedTestStore(t)
+	audit := auditpg.New(pgunit.NewPool(s.pool))
 	ctx := t.Context()
 	tenant, owner, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "deletion-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "deletion-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
-	leased := executionOwner(t, db)
+	leased := executionOwner(t, s)
 
 	create := func(environment string, initial bool) sessions.Session {
 		t.Helper()
@@ -134,7 +134,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 		"later_input_cancelled":     "",
 	}
 	expired := create(selfHosted, true)
-	if _, err := db.pool.Exec(ctx, "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1", expired.ID); err != nil {
+	if _, err := s.pool.Exec(ctx, "UPDATE environment_input_reservations SET deadline=clock_timestamp()-interval '1 second' WHERE session_id=$1", expired.ID); err != nil {
 		t.Fatal(err)
 	}
 	if count, err := leased.Sessions.ExpireEnvironmentInputs(ctx); err != nil || count != 1 {
@@ -181,13 +181,13 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 			if readStatus != http.StatusOK || decode(before)["status"] != projected[name] {
 				t.Fatal(readStatus, before)
 			}
-			digest := databaseDigest(t, db.pool)
+			digest := databaseDigest(t, s.pool)
 			notFound(foreign, http.MethodDelete, sessionPath(id))
 			status, raw := client.do(owner, http.MethodDelete, sessionPath(id), "", nil)
 			if status != http.StatusConflict || !reflect.DeepEqual(decode(raw), conflict) {
 				t.Fatalf("busy Session deletion: %d %s", status, raw)
 			}
-			if after := databaseDigest(t, db.pool); !reflect.DeepEqual(after, digest) {
+			if after := databaseDigest(t, s.pool); !reflect.DeepEqual(after, digest) {
 				t.Fatal("rejected deletion changed the database")
 			}
 			if readStatus, after := client.do(owner, http.MethodGet, sessionPath(id), "", nil); readStatus != http.StatusOK || after != before {
@@ -202,7 +202,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 			if status != http.StatusOK || !reflect.DeepEqual(decode(first), map[string]any{"id": id, "object": "agent.session.deleted", "deleted": true}) {
 				t.Fatalf("settled Session deletion: %d %s", status, first)
 			}
-			digest := databaseDigest(t, db.pool)
+			digest := databaseDigest(t, s.pool)
 			filter := writeaudit.Filter{ResourceType: "session", ResourceID: id, Limit: 100}
 			beforeAudit, err := audit.ListWriteOperations(ctx, tenant, filter)
 			if err != nil {
@@ -224,7 +224,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 			}
 			// Only the new operation records may differ. Ownership, Session state,
 			// execution data and every public response remain unchanged.
-			after := databaseDigest(t, db.pool)
+			after := databaseDigest(t, s.pool)
 			delete(after, "write_audit_operations")
 			delete(digest, "write_audit_operations")
 			if !reflect.DeepEqual(after, digest) {
diff --git a/services/core/tests/integration/session_deletion_public_test.go b/services/core/tests/integration/session_deletion_public_test.go
index 6b60be3bd..65fae5e91 100644
--- a/services/core/tests/integration/session_deletion_public_test.go
+++ b/services/core/tests/integration/session_deletion_public_test.go
@@ -17,19 +17,19 @@ func TestSessionDeletionOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	h, err = publicHandler(t, New(db.pool), db, auth, "codex", storeExecution(t, New(db.pool)))
+	h, err = publicHandler(t, New(s.pool), auth, "codex", storeExecution(t, New(s.pool)))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_devices_fixture_test.go b/services/core/tests/integration/session_devices_fixture_test.go
index f05c43240..9dc9380e5 100644
--- a/services/core/tests/integration/session_devices_fixture_test.go
+++ b/services/core/tests/integration/session_devices_fixture_test.go
@@ -14,13 +14,13 @@ import (
 // bindSessionDevice binds the tenant's device to the Session through the
 // Session execution operations on an execution lease of its own, and returns
 // once the server released that lease, so a Worker can take it next.
-func bindSessionDevice(t *testing.T, db fixtureDB, tenant, session, device string) error {
+func bindSessionDevice(t *testing.T, s *Store, tenant, session, device string) error {
 	t.Helper()
-	lease, err := pgunit.AcquireLease(t.Context(), db.pool)
+	lease, err := pgunit.AcquireLease(t.Context(), s.pool)
 	if err != nil {
 		return err
 	}
-	released := pgtest.ObserveExecutionLeaseRelease(t, db.pool)
+	released := pgtest.ObserveExecutionLeaseRelease(t, s.pool)
 	operations, err := sessions.NewExecutionOperations(sessionpg.NewExecution(lease))
 	if err == nil {
 		err = operations.BindSessionDevice(t.Context(), tenant, session, device)
diff --git a/services/core/tests/integration/session_events_test.go b/services/core/tests/integration/session_events_test.go
index fc96e11b8..b68308acb 100644
--- a/services/core/tests/integration/session_events_test.go
+++ b/services/core/tests/integration/session_events_test.go
@@ -50,7 +50,7 @@ func TestSessionEventsAreVisibleOnlyAfterCommit(t *testing.T) {
 func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	ctx := context.Background()
 	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "stream"})
 	if err != nil {
@@ -142,7 +142,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 		t.Fatal("foreign event access", err)
 	}
 	before, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
-	if _, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 100, true); err != nil {
+	if _, err = sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true); err != nil {
 		t.Fatal(err)
 	}
 	after, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
@@ -195,7 +195,7 @@ func TestSessionEventsRetentionAndQueuedCancellation(t *testing.T) {
 	if _, err = pool.Exec(ctx, "UPDATE session_events SET payload=jsonb_build_object('padding',repeat('x',524288)) WHERE session_id=$1", session.ID); err != nil {
 		t.Fatal(err)
 	}
-	if _, err = sessionReads(pool).ListItems(ctx, tenant, session.ID, "", 1, true); err != nil {
+	if _, err = sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 1, true); err != nil {
 		t.Fatal(err)
 	}
 	var bytes int64
diff --git a/services/core/tests/integration/session_execution_configuration_test.go b/services/core/tests/integration/session_execution_configuration_test.go
index f32f7e7bd..3f6f5f45a 100644
--- a/services/core/tests/integration/session_execution_configuration_test.go
+++ b/services/core/tests/integration/session_execution_configuration_test.go
@@ -37,7 +37,7 @@ func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testi
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	for _, stream := range []bool{false, true} {
 		for _, source := range []string{"session", "agent", "deployment"} {
 			t.Run(source+map[bool]string{false: "/ordinary", true: "/stream"}[stream], func(t *testing.T) {
@@ -165,7 +165,7 @@ func TestSessionExecutionConfigurationRollbackAndValidation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	tenant := uuid.NewString()
 	for _, kind := range []string{"model", "harness", "source", "provider", "provider_mismatch", "post_projection_failure"} {
 		input := executionProjectionInput("session")
diff --git a/services/core/tests/integration/session_initial_public_test.go b/services/core/tests/integration/session_initial_public_test.go
index f6e5a3f0d..3b8162891 100644
--- a/services/core/tests/integration/session_initial_public_test.go
+++ b/services/core/tests/integration/session_initial_public_test.go
@@ -17,11 +17,11 @@ func TestInitialSessionInputOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
 	// Exercise real worker admission with dispatch paused for deterministic reads.
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{})
+	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{})
 	t.Cleanup(func() {
 		stopped, cancel := context.WithCancel(context.Background())
 		cancel()
@@ -29,13 +29,13 @@ func TestInitialSessionInputOfficialClient(t *testing.T) {
 			t.Error(err)
 		}
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker))
+	handler, err := publicHandler(t, s, auth, "codex", workerExecution(t, worker))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(handler)
 	defer server.Close()
-	unsupported, err := publicHandler(t, s, db, auth, "fake_alpha", workerExecution(t, worker))
+	unsupported, err := publicHandler(t, s, auth, "fake_alpha", workerExecution(t, worker))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_model_execution_http_test.go b/services/core/tests/integration/session_model_execution_http_test.go
index adb141a66..9a1e6c2f1 100644
--- a/services/core/tests/integration/session_model_execution_http_test.go
+++ b/services/core/tests/integration/session_model_execution_http_test.go
@@ -15,11 +15,10 @@ import (
 func TestModelExecutionHTTPWriteOnlyAndStrictAdmission(t *testing.T) {
 	_, pool := testStore(t)
 	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{6}, 32))
-	st, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	st.SetPlacement(fixtureRules(t, db))
+	st := NewWithCredentialCipher(pool, cipher)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "catalog-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
-	handler, err := publicHandler(t, st, db, auth, "codex", storeExecution(t, st), managedSandboxes(t, db))
+	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), managedSandboxes(t, st))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_model_options_test.go b/services/core/tests/integration/session_model_options_test.go
index 9724b971e..553df763c 100644
--- a/services/core/tests/integration/session_model_options_test.go
+++ b/services/core/tests/integration/session_model_options_test.go
@@ -17,7 +17,7 @@ func TestSessionModelExecutionStoresOnlyProviderBundle(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	st := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	st := NewWithCredentialCipher(pool, cipher)
 	ctx, tenant := t.Context(), uuid.NewString()
 	provider := &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://example.com/v1", APIKey: "provider-key-canary"}
 	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: []byte(`{"agent":{"model":"actual-model"},"environment":{"type":"openai_hosted"}}`), ModelProvider: provider}
diff --git a/services/core/tests/integration/session_reads_fixture_test.go b/services/core/tests/integration/session_reads_fixture_test.go
index 8ab6b3564..43f097c11 100644
--- a/services/core/tests/integration/session_reads_fixture_test.go
+++ b/services/core/tests/integration/session_reads_fixture_test.go
@@ -7,7 +7,6 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
@@ -16,8 +15,8 @@ import (
 // tenant's hosted Environment on pool through the procedure the managed
 // Runtime allocation runs, without the allocation.
 func FixtureEnvironmentDevice(ctx context.Context, pool *pgxpool.Pool, tenant, environment, name, credentialHash string) (sessions.ExecutionDevice, error) {
-	units := pgunit.NewPool(pool)
-	current, err := sessionpg.New(units, nil).GetEnvironment(ctx, tenant, environment)
+	s := New(pool)
+	current, err := sessionAdapter(s).GetEnvironment(ctx, tenant, environment)
 	if err != nil {
 		return sessions.ExecutionDevice{}, err
 	}
@@ -30,7 +29,7 @@ func FixtureEnvironmentDevice(ctx context.Context, pool *pgxpool.Pool, tenant, e
 		return sessions.ExecutionDevice{}, err
 	}
 	device := sessions.ExecutionDevice{ID: uuid.NewString(), Name: registration.Name, EnvironmentID: current.ID}
-	err = sessionpg.WithSession(ctx, units, lookup.TenantID, lookup.ID, func(ctx context.Context, q *sqlc.Queries, locked sessions.LockedSession) error {
+	err = sessionpg.WithSession(ctx, s.pooled, lookup.TenantID, lookup.ID, func(ctx context.Context, q *sqlc.Queries, locked sessions.LockedSession) error {
 		if err := locked.Public(); err != nil {
 			return err
 		}
diff --git a/services/core/tests/integration/session_reference_retry_public_test.go b/services/core/tests/integration/session_reference_retry_public_test.go
index 6e54d2c79..5ee70df0a 100644
--- a/services/core/tests/integration/session_reference_retry_public_test.go
+++ b/services/core/tests/integration/session_reference_retry_public_test.go
@@ -20,10 +20,10 @@ func TestSavedReferenceRetryOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{})
+	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{})
 	t.Cleanup(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
@@ -31,13 +31,13 @@ func TestSavedReferenceRetryOfficialClient(t *testing.T) {
 			t.Error(err)
 		}
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", workerExecution(t, worker))
+	handler, err := publicHandler(t, s, auth, "codex", workerExecution(t, worker))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(handler)
 	defer server.Close()
-	recovered, err := publicHandler(t, New(db.pool), db, auth, "codex")
+	recovered, err := publicHandler(t, New(s.pool), auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -56,9 +56,9 @@ func TestSavedReferenceRetryOfficialClient(t *testing.T) {
 		}
 		var err error
 		if input.Delete {
-			_, err = db.pool.Exec(r.Context(), `DELETE FROM agents WHERE tenant_id=$1 AND id=$2`, tenant, input.ID)
+			_, err = s.pool.Exec(r.Context(), `DELETE FROM agents WHERE tenant_id=$1 AND id=$2`, tenant, input.ID)
 		} else {
-			_, err = db.pool.Exec(r.Context(), `UPDATE agents SET configuration=configuration || $3::jsonb WHERE tenant_id=$1 AND id=$2`, tenant, input.ID, input.Patch)
+			_, err = s.pool.Exec(r.Context(), `UPDATE agents SET configuration=configuration || $3::jsonb WHERE tenant_id=$1 AND id=$2`, tenant, input.ID, input.Patch)
 		}
 		if err != nil {
 			t.Error(err)
diff --git a/services/core/tests/integration/sessions_fixture_test.go b/services/core/tests/integration/sessions_fixture_test.go
deleted file mode 100644
index 0f921ab0a..000000000
--- a/services/core/tests/integration/sessions_fixture_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package integration
-
-import (
-	"testing"
-
-	"github.com/jackc/pgx/v5/pgxpool"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
-)
-
-// sessionReads is the Session adapter on pool without a credential key. It
-// serves the Session reads that open no frozen data.
-func sessionReads(pool *pgxpool.Pool) *sessionpg.Store {
-	return sessionpg.New(pgunit.NewPool(pool), nil)
-}
-
-// fixtureSessions builds the Session adapter and service on db, with the
-// placement rules on db's public URL, as cmd/server does.
-func fixtureSessions(db fixtureDB) (*sessionpg.Store, *sessions.Service, error) {
-	rules, err := placement.NewRules(providers.Builtin(), db.publicURL)
-	if err != nil {
-		return nil, nil, err
-	}
-	sessionStore := fixtureSessionStore(db)
-	sessionService, err := sessions.NewService(sessionStore, rules)
-	return sessionStore, sessionService, err
-}
-
-// fixtureSessionStore is the Session adapter on db with its credential key, as
-// cmd/server builds it.
-func fixtureSessionStore(db fixtureDB) *sessionpg.Store {
-	return sessionpg.New(pgunit.NewPool(db.pool), db.cipher)
-}
-
-// fixtureSessionService is the Session service of fixtureSessions(db).
-func fixtureSessionService(t testing.TB, db fixtureDB) *sessions.Service {
-	t.Helper()
-	_, service, err := fixtureSessions(db)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return service
-}
diff --git a/services/core/tests/integration/sessions_test.go b/services/core/tests/integration/sessions_test.go
index ac8401aac..9e945672c 100644
--- a/services/core/tests/integration/sessions_test.go
+++ b/services/core/tests/integration/sessions_test.go
@@ -19,7 +19,7 @@ import (
 func testStore(t *testing.T) (*Store, *pgxpool.Pool) {
 	t.Helper()
 	pool := pgtest.Open(t)
-	return withPlacement(t, New(pool)), pool
+	return New(pool), pool
 }
 
 // sessionAdapter is the Session adapter on s's database with s's credential
diff --git a/services/core/tests/integration/skill_selectors_public_test.go b/services/core/tests/integration/skill_selectors_public_test.go
index 42ccdcd51..7052c01b2 100644
--- a/services/core/tests/integration/skill_selectors_public_test.go
+++ b/services/core/tests/integration/skill_selectors_public_test.go
@@ -25,20 +25,20 @@ func TestSkillSelectorsOfficialClientPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex")
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex")
+	recoveredStore := NewWithCredentialCipher(pool, cipher)
+	h, err = publicHandler(t, recoveredStore, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/skill_version_deletion_public_test.go b/services/core/tests/integration/skill_version_deletion_public_test.go
index d82d42a66..82ea71dce 100644
--- a/services/core/tests/integration/skill_version_deletion_public_test.go
+++ b/services/core/tests/integration/skill_version_deletion_public_test.go
@@ -25,13 +25,13 @@ func TestSkillVersionDeletionHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "skill-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "skill-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex")
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/skill_version_deletion_test.go b/services/core/tests/integration/skill_version_deletion_test.go
index 77547d92f..3a9b2e5a2 100644
--- a/services/core/tests/integration/skill_version_deletion_test.go
+++ b/services/core/tests/integration/skill_version_deletion_test.go
@@ -21,7 +21,7 @@ func TestSoleSkillVersionDeletionKeepsFrozenSetup(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s := withPlacement(t, NewWithCredentialCipher(pool, cipher))
+	s := NewWithCredentialCipher(pool, cipher)
 	skillService := SkillService(t, pool, cipher)
 	tenant := uuid.NewString()
 	archive := skillArchive(t, "sole-version-frozen")
diff --git a/services/core/tests/integration/skills_public_test.go b/services/core/tests/integration/skills_public_test.go
index 5f1040746..4aa57368b 100644
--- a/services/core/tests/integration/skills_public_test.go
+++ b/services/core/tests/integration/skills_public_test.go
@@ -25,20 +25,20 @@ func TestSkillsOfficialClientPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex")
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore, recoveredDB := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
-	h, err = publicHandler(t, recoveredStore, recoveredDB, auth, "codex")
+	recoveredStore := NewWithCredentialCipher(pool, cipher)
+	h, err = publicHandler(t, recoveredStore, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/source_files_errors_public_test.go b/services/core/tests/integration/source_files_errors_public_test.go
index 147d9ea3a..73fc3856b 100644
--- a/services/core/tests/integration/source_files_errors_public_test.go
+++ b/services/core/tests/integration/source_files_errors_public_test.go
@@ -17,13 +17,13 @@ func TestSourceFileErrorsOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "files-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "files-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, db, auth, "codex")
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/stream_authority_http_test.go b/services/core/tests/integration/stream_authority_http_test.go
index 97c287eeb..33dd4666a 100644
--- a/services/core/tests/integration/stream_authority_http_test.go
+++ b/services/core/tests/integration/stream_authority_http_test.go
@@ -22,8 +22,8 @@ func TestLiveStreamClosesAfterKeyRevocationOrProjectArchive(t *testing.T) {
 			name = "project-archive"
 		}
 		t.Run(name, func(t *testing.T) {
-			s, db := newTestStoreDB(t)
-			_, management := fixtureProjects(t, db)
+			s, _ := testStore(t)
+			_, management := fixtureProjects(t, s)
 			projectID := uuid.NewString()
 			ctx := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "12345678", ActorLabel: "test", RequestID: uuid.NewString(), TraceID: uuid.NewString(), ProjectID: projectID})
 			project, err := management.CreateProject(ctx, projects.CreateProject{ID: projectID, Name: "Stream authority"})
@@ -42,7 +42,7 @@ func TestLiveStreamClosesAfterKeyRevocationOrProjectArchive(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			h, err := publicHandler(t, s, db, nil, "codex", storeKeys(s), storeExecution(t, s))
+			h, err := publicHandler(t, s, nil, "codex", storeKeys(s), storeExecution(t, s))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/tests/integration/structured_output_dispatch_test.go b/services/core/tests/integration/structured_output_dispatch_test.go
index ed70760cf..2ae4b27be 100644
--- a/services/core/tests/integration/structured_output_dispatch_test.go
+++ b/services/core/tests/integration/structured_output_dispatch_test.go
@@ -27,7 +27,7 @@ func TestStructuredOutputDispatchRechecksOperationQualification(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err = bindSessionDevice(t, h.db, h.tenant, h.session.ID, h.device.ID); err != nil {
+	if err = bindSessionDevice(t, h.s, h.tenant, h.session.ID, h.device.ID); err != nil {
 		t.Fatal(err)
 	}
 	caps := prototest.Capabilities(proto.AgentKindCapabilities{Streaming: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableTurns: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported, ExecutionControls: proto.CapabilitySupported, EnvironmentNone: proto.CapabilitySupported, SubagentControl: proto.CapabilitySupported, ToolObservations: proto.CapabilitySupported, StructuredOutput: proto.CapabilitySupported, MessageItems: proto.CapabilitySupported, Preparation: proto.CapabilitySupported})
diff --git a/services/core/tests/integration/structured_output_native_test.go b/services/core/tests/integration/structured_output_native_test.go
index c1abc64e6..afa3de2b6 100644
--- a/services/core/tests/integration/structured_output_native_test.go
+++ b/services/core/tests/integration/structured_output_native_test.go
@@ -28,7 +28,7 @@ func TestNativeStructuredOutputPublicExecution(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Minute)
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	defer func() {
@@ -44,7 +44,7 @@ func TestNativeStructuredOutputPublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, "claude_sdk", workerExecution(t, worker), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, auth, "claude_sdk", workerExecution(t, worker), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -69,7 +69,7 @@ func TestNativeStructuredOutputPublicExecution(t *testing.T) {
 	if err != nil || json.Unmarshal(raw, &proof) != nil {
 		t.Fatal("invalid evidence", err)
 	}
-	call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
+	call, err := FixtureFunctionCall(ctx, h.s.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
diff --git a/services/core/tests/integration/subagent_dispatch_test.go b/services/core/tests/integration/subagent_dispatch_test.go
index 6a937f75e..e56fa1df2 100644
--- a/services/core/tests/integration/subagent_dispatch_test.go
+++ b/services/core/tests/integration/subagent_dispatch_test.go
@@ -23,7 +23,7 @@ func TestSubagentIdentityUsesLeasedDispatchJournal(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			if err = bindSessionDevice(t, h.db, h.tenant, h.session.ID, h.device.ID); err != nil {
+			if err = bindSessionDevice(t, h.s, h.tenant, h.session.ID, h.device.ID); err != nil {
 				t.Fatal(err)
 			}
 			input := h.message("first", "root message")
diff --git a/services/core/tests/integration/subagent_visibility_public_test.go b/services/core/tests/integration/subagent_visibility_public_test.go
index 7a71affb0..b6b7ec69e 100644
--- a/services/core/tests/integration/subagent_visibility_public_test.go
+++ b/services/core/tests/integration/subagent_visibility_public_test.go
@@ -70,20 +70,20 @@ func subagentFixture(kind string, value any) sessions.ExecutionEvent {
 // routes with the Session's Agent ID, Subagent lists use the common envelope and
 // child Item lists clamp their limit. Tenant B sees none of it.
 func TestSubagentVisibilityPublic(t *testing.T) {
-	s, db := newTestStoreDB(t)
+	s, _ := testStore(t)
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(handler)
 	defer server.Close()
 	client := pathIDClient{t: t, server: server}
-	leased := executionOwner(t, db)
+	leased := executionOwner(t, s)
 	writer := NewExecution(s, leased.Lease.(*pgunit.Lease))
 	ctx := t.Context()
 
@@ -121,7 +121,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 		t.Fatal(page, err)
 	}
 	root := page.Turns[0].ID
-	host, err := fixtureSessionService(t, db).CreateDevice(ctx, tenant, "subagent visibility", runtimedevice.HashCredential(uuid.NewString()))
+	host, err := sessionService(t, s).CreateDevice(ctx, tenant, "subagent visibility", runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/template_composition_public_test.go b/services/core/tests/integration/template_composition_public_test.go
index 76eaa9e2f..a958e47ac 100644
--- a/services/core/tests/integration/template_composition_public_test.go
+++ b/services/core/tests/integration/template_composition_public_test.go
@@ -31,9 +31,6 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 		t.Fatal(err)
 	}
 	s, reopenedStore := NewWithCredentialCipher(pool, cipher), NewWithCredentialCipher(pool, cipher)
-	db := fixtureDB{pool: pool, cipher: cipher} // built both Stores
-	s.SetPlacement(fixtureRules(t, db))
-	reopenedStore.SetPlacement(fixtureRules(t, db))
 	tenant, foreignTenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "composition-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
@@ -42,7 +39,7 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 	serve := func(current *Store) *httptest.Server {
 		t.Helper()
 		// Hosted admission and freezing use the real Store; no Runtime or model runs.
-		h, err := publicHandler(t, current, db, auth, "codex", storeExecution(t, current), managedSandboxes(t, db), fixtureDeploymentProvider())
+		h, err := publicHandler(t, current, auth, "codex", storeExecution(t, current), managedSandboxes(t, current), fixtureDeploymentProvider())
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -105,7 +102,7 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 			t.Fatalf("unknown case %q", label)
 		}
 		// A reader built after the requests reads the frozen setup and files.
-		current := fixtureSessionStore(db)
+		current := sessionAdapter(s)
 		setup, err := current.ReadEnvironmentSetup(t.Context(), tenant, id)
 		if err != nil || !reflect.DeepEqual(setup.Env, env) || !reflect.DeepEqual(setup.PackageMetadata(), packages) || len(setup.Commands) != len(commands) {
 			t.Fatalf("%s durable setup differs: %v", label, err)
diff --git a/services/core/tests/integration/template_null_selection_public_test.go b/services/core/tests/integration/template_null_selection_public_test.go
index 294166b91..368e7f5e5 100644
--- a/services/core/tests/integration/template_null_selection_public_test.go
+++ b/services/core/tests/integration/template_null_selection_public_test.go
@@ -33,9 +33,6 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 		t.Fatal(err)
 	}
 	s, reopenedStore := NewWithCredentialCipher(pool, cipher), NewWithCredentialCipher(pool, cipher)
-	db := fixtureDB{pool: pool, cipher: cipher} // built both Stores
-	s.SetPlacement(fixtureRules(t, db))
-	reopenedStore.SetPlacement(fixtureRules(t, db))
 	tenant, foreignTenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
@@ -43,7 +40,7 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 	})
 	serve := func(current *Store) *httptest.Server {
 		t.Helper()
-		h, err := publicHandler(t, current, db, auth, "codex", storeExecution(t, current), managedSandboxes(t, db), fixtureDeploymentProvider())
+		h, err := publicHandler(t, current, auth, "codex", storeExecution(t, current), managedSandboxes(t, current), fixtureDeploymentProvider())
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -95,7 +92,7 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 			t.Fatalf("missing expectation for %s", label)
 		}
 		// A reader built after the requests reads the frozen setup and files.
-		current := fixtureSessionStore(db)
+		current := sessionAdapter(s)
 		setup, err := current.ReadEnvironmentSetup(t.Context(), tenant, id)
 		if err != nil {
 			t.Fatalf("%s frozen setup: %v", label, err)
diff --git a/services/core/tests/integration/token_usage_integration_test.go b/services/core/tests/integration/token_usage_integration_test.go
index de9dba494..6b533dc6b 100644
--- a/services/core/tests/integration/token_usage_integration_test.go
+++ b/services/core/tests/integration/token_usage_integration_test.go
@@ -16,7 +16,7 @@ import (
 func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 	ctx := context.Background()
 	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "usage"})
 	if err != nil {
@@ -106,8 +106,8 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 
 func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 	ctx := context.Background()
-	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	s, _ := testStore(t)
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "cancel-recovery"})
 	if err != nil {
@@ -141,8 +141,8 @@ func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 // and after a Turn ends with unknown usage (EVT-13).
 func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	ctx := context.Background()
-	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	s, _ := testStore(t)
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "unknown-usage"})
 	if err != nil {
diff --git a/services/core/tests/integration/tool_policy_native_test.go b/services/core/tests/integration/tool_policy_native_test.go
index 4b443aee4..8f5030ca3 100644
--- a/services/core/tests/integration/tool_policy_native_test.go
+++ b/services/core/tests/integration/tool_policy_native_test.go
@@ -34,7 +34,7 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 15*time.Minute)
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	defer func() {
@@ -50,7 +50,7 @@ func TestNativeToolPolicyPublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: foreignTenant, SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, auth, kind, workerExecution(t, worker), withPolicy(h.d.Policy), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/tool_search_native_test.go b/services/core/tests/integration/tool_search_native_test.go
index 2312b1c59..f5e950500 100644
--- a/services/core/tests/integration/tool_search_native_test.go
+++ b/services/core/tests/integration/tool_search_native_test.go
@@ -28,7 +28,7 @@ func TestNativeToolSearchPublicExecution(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Minute)
 	defer cancel()
-	worker := startWorker(t, ctx, h.db, h.d)
+	worker := startWorker(t, ctx, h.s, h.d)
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
 	defer func() {
@@ -44,7 +44,7 @@ func TestNativeToolSearchPublicExecution(t *testing.T) {
 		{OrganizationID: "test", ProjectID: h.tenant, SubjectKind: "service_account", SubjectID: "owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: h.tenant},
 		{OrganizationID: "test", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, h.s, h.db, auth, "claude_sdk", workerExecution(t, worker), nativeDeploymentDefaults(model, provider))
+	handler, err := publicHandler(t, h.s, auth, "claude_sdk", workerExecution(t, worker), nativeDeploymentDefaults(model, provider))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -69,7 +69,7 @@ func TestNativeToolSearchPublicExecution(t *testing.T) {
 	if err != nil || json.Unmarshal(raw, &proof) != nil {
 		t.Fatal("invalid evidence", err)
 	}
-	call, err := FixtureFunctionCall(ctx, h.db.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
+	call, err := FixtureFunctionCall(ctx, h.s.pool, h.tenant, proof.Session, proof.Turn, proof.Call)
 	if err != nil || !call.Applied {
 		t.Fatal("function application receipt missing", err)
 	}
diff --git a/services/core/tests/integration/turn_events_test.go b/services/core/tests/integration/turn_events_test.go
index 3c5a39839..e95bf1a40 100644
--- a/services/core/tests/integration/turn_events_test.go
+++ b/services/core/tests/integration/turn_events_test.go
@@ -14,7 +14,7 @@ import (
 func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 	ctx := context.Background()
 	s, pool := testStore(t)
-	journal := executionOwner(t, fixtureDB{pool: pool}).Sessions
+	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "events"})
 	if err != nil {
diff --git a/services/core/tests/integration/unified_model_configuration_http_test.go b/services/core/tests/integration/unified_model_configuration_http_test.go
index 769a77d21..bfcea9301 100644
--- a/services/core/tests/integration/unified_model_configuration_http_test.go
+++ b/services/core/tests/integration/unified_model_configuration_http_test.go
@@ -14,14 +14,14 @@ import (
 )
 
 func TestUnifiedModelConfigurationHTTP(t *testing.T) {
-	st, db := newManagedTestStoreDB(t)
+	st, _ := newManagedTestStore(t)
 	tenant, token, coreKey := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "model-configuration", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential(coreKey)})
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, st, db, auth, "codex", storeExecution(t, st), managedSandboxes(t, db), withCoreKeys(admin), withHarnesses([]string{"codex", "claude_sdk"}))
+	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), managedSandboxes(t, st), withCoreKeys(admin), withHarnesses([]string{"codex", "claude_sdk"}))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/unstorable_text_public_test.go b/services/core/tests/integration/unstorable_text_public_test.go
index fec595786..01f1f9804 100644
--- a/services/core/tests/integration/unstorable_text_public_test.go
+++ b/services/core/tests/integration/unstorable_text_public_test.go
@@ -24,10 +24,10 @@ func TestUnstorableTextRejectsWithoutWritesPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	s, db := NewWithCredentialCipher(pool, cipher), fixtureDB{pool: pool, cipher: cipher}
+	s := NewWithCredentialCipher(pool, cipher)
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "nul-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/vaults_fixture_test.go b/services/core/tests/integration/vaults_fixture_test.go
index d5d8697fd..5249ca3ea 100644
--- a/services/core/tests/integration/vaults_fixture_test.go
+++ b/services/core/tests/integration/vaults_fixture_test.go
@@ -7,14 +7,14 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
-// fixtureVaults builds the Vault adapter and service on db, as cmd/server does.
-// A keyless db leaves the operations that need no credential key available.
-func fixtureVaults(db fixtureDB) (*vaultpg.Store, *vaults.Service, error) {
+// fixtureVaults builds the Vault adapter and service on s, as cmd/server does.
+// A keyless s leaves the operations that need no credential key available.
+func fixtureVaults(s *Store) (*vaultpg.Store, *vaults.Service, error) {
 	refresher, err := oauthrefresh.NewClient(nil)
 	if err != nil {
 		return nil, nil, err
 	}
-	vaultStore := vaultpg.New(pgunit.NewPool(db.pool), db.cipher)
+	vaultStore := vaultpg.New(pgunit.NewPool(s.pool), s.credentialCipher)
 	vaultService, err := vaults.NewService(vaultStore, refresher)
 	return vaultStore, vaultService, err
 }
diff --git a/services/core/tests/integration/whitespace_input_public_test.go b/services/core/tests/integration/whitespace_input_public_test.go
index 5bfeeafec..3954c0b49 100644
--- a/services/core/tests/integration/whitespace_input_public_test.go
+++ b/services/core/tests/integration/whitespace_input_public_test.go
@@ -19,10 +19,10 @@ import (
 // still reject with today's fields and write nothing.
 func TestWhitespaceInputStoredVerbatimPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "whitespace-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}})
-	h, err := publicHandler(t, s, db, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -72,7 +72,7 @@ func TestWhitespaceInputStoredVerbatimPostgres(t *testing.T) {
 	}
 
 	// W4: unchanged rejection without writes.
-	before := databaseDigest(t, db.pool)
+	before := databaseDigest(t, s.pool)
 	const rejection = `{"error":{"message":"Invalid resource identifier or request limits.","type":"invalid_request_error","code":"invalid_request","param":null}}` + "\n"
 	for _, input := range []string{`""`, `[]`, `[{"role":"user","content":[]}]`, `[{"role":"user","content":[{"type":"input_text","text":""}]}]`} {
 		if status, body := client.do(token, http.MethodPost, "/v1/agents/sessions", "application/json", []byte(`{"agent":{"model":"whitespace-model"},"environment":{"type":"none"},"input":`+input+`}`)); status != http.StatusBadRequest || body != rejection {
@@ -84,7 +84,7 @@ func TestWhitespaceInputStoredVerbatimPostgres(t *testing.T) {
 			t.Errorf("events %s: %d %s", input, status, body)
 		}
 	}
-	if after := databaseDigest(t, db.pool); !mapsEqual(before, after) {
+	if after := databaseDigest(t, s.pool); !mapsEqual(before, after) {
 		t.Error("rejected empty input changed persisted state")
 	}
 }
@@ -93,11 +93,11 @@ func TestWhitespaceInputStoredVerbatimPostgres(t *testing.T) {
 // admits it; Claude SDK and MiniMax Code reject it at Session creation and
 // events.create, before any write, reservation or promotion.
 func TestWhitespaceOnlyTextHarnessAdmissionPostgres(t *testing.T) {
-	s, db := newManagedTestStoreDB(t)
+	s, _ := newManagedTestStore(t)
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "whitespace-harness", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}})
 	// Real Worker admission with dispatch paused keeps admitted Turns queued.
-	worker := startWorker(t, t.Context(), db, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
+	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 	t.Cleanup(func() {
 		stopped, cancel := context.WithCancel(context.Background())
 		cancel()
@@ -106,7 +106,7 @@ func TestWhitespaceOnlyTextHarnessAdmissionPostgres(t *testing.T) {
 		}
 	})
 	serve := func(engine string) pathIDClient {
-		handler, err := publicHandler(t, s, db, auth, engine, workerExecution(t, worker), executorURL("https://offline-executor.example"))
+		handler, err := publicHandler(t, s, auth, engine, workerExecution(t, worker), executorURL("https://offline-executor.example"))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -139,7 +139,7 @@ func TestWhitespaceOnlyTextHarnessAdmissionPostgres(t *testing.T) {
 		if status, body := events(client, session, cancel); status != http.StatusAccepted {
 			t.Fatalf("%s cancel: %d %s", engine, status, body)
 		}
-		before := databaseDigest(t, db.pool)
+		before := databaseDigest(t, s.pool)
 		for _, body := range []string{
 			`{"agent":{"model":"m"},"environment":{"type":"none"},"input":"   "}`,
 			`{"agent":{"model":"m"},"environment":{"type":"none"},"input":[{"role":"user","content":[{"type":"input_text","text":"\n\t"}]}]}`,
@@ -157,7 +157,7 @@ func TestWhitespaceOnlyTextHarnessAdmissionPostgres(t *testing.T) {
 				t.Errorf("%s events %s: %d %s", engine, body, status, response)
 			}
 		}
-		if after := databaseDigest(t, db.pool); !mapsEqual(before, after) {
+		if after := databaseDigest(t, s.pool); !mapsEqual(before, after) {
 			t.Errorf("%s: rejected whitespace-only text changed persisted state", engine)
 		}
 		// Whitespace beside non-whitespace text in one message remains admitted verbatim.
diff --git a/services/core/tests/integration/worker_capacity_test.go b/services/core/tests/integration/worker_capacity_test.go
index f125e435c..0f11cef48 100644
--- a/services/core/tests/integration/worker_capacity_test.go
+++ b/services/core/tests/integration/worker_capacity_test.go
@@ -42,7 +42,7 @@ func TestWorkerDefersPreparationCapacityUntilCleanupReleasesSlot(t *testing.T) {
 		turns[h.session.ID] = receipt.TurnID
 	}
 	frames := capacityWorkerFrames(t, h)
-	_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	defer stop()
 	admissions := make(map[string]string)
 	started := make(map[string]int)
@@ -175,7 +175,7 @@ func TestWorkerDoesNotDeferOtherPreparationOrStartRejections(t *testing.T) {
 			h.session = publicSession(t, h, test.name)
 			receipt := h.message("work", "once")
 			frames := capacityWorkerFrames(t, h)
-			_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+			_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 			defer stop()
 			prepare := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
 			if test.operation == proto.TypeExecutionStart {
diff --git a/services/core/tests/integration/worker_fixture_test.go b/services/core/tests/integration/worker_fixture_test.go
new file mode 100644
index 000000000..872c77345
--- /dev/null
+++ b/services/core/tests/integration/worker_fixture_test.go
@@ -0,0 +1,112 @@
+package integration
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+)
+
+// startWorker starts the execution Worker as cmd/server does: it acquires the
+// execution lease on s's database and hands it, with the execution writer built
+// on it, to the Worker, which closes it when Run exits. The Worker opens MCP
+// bearer tokens through the vaults service on s, records model configuration
+// observations through the model configuration adapter on s, runs Session use
+// cases and reads through the Session service and adapter on s, and reads the
+// deployment through the deployment adapter on s.
+func startWorker(t testing.TB, ctx context.Context, s *Store, dispatcher *execution.Dispatcher) *execution.Worker {
+	t.Helper()
+	worker, err := startWorkerErr(ctx, s, dispatcher)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return worker
+}
+
+// startWorkerErr is startWorker for tests that assert a startup failure.
+func startWorkerErr(ctx context.Context, s *Store, dispatcher *execution.Dispatcher) (*execution.Worker, error) {
+	lease, err := pgunit.AcquireLease(ctx, s.pool)
+	if err != nil {
+		return nil, err
+	}
+	owner, err := fixtureOwner(s, lease)
+	if err != nil {
+		return nil, errors.Join(err, lease.Close(ctx))
+	}
+	return startOwnedWorkerErr(ctx, s, dispatcher, owner)
+}
+
+// startOwnedWorker is startWorker on an Owner the test already holds, for tests
+// that also run execution operations on it. The Worker closes its lease when
+// Run exits.
+func startOwnedWorker(t testing.TB, ctx context.Context, s *Store, dispatcher *execution.Dispatcher, owner execution.Owner) *execution.Worker {
+	t.Helper()
+	worker, err := startOwnedWorkerErr(ctx, s, dispatcher, owner)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return worker
+}
+
+func startOwnedWorkerErr(ctx context.Context, s *Store, dispatcher *execution.Dispatcher, owner execution.Owner) (*execution.Worker, error) {
+	_, credentials, err := fixtureVaults(s)
+	if err != nil {
+		return nil, errors.Join(err, owner.Lease.Close(ctx))
+	}
+	service, err := newSessionService(s)
+	if err != nil {
+		return nil, errors.Join(err, owner.Lease.Close(ctx))
+	}
+	deployments, err := fixtureDeploymentService(s)
+	if err != nil {
+		return nil, errors.Join(err, owner.Lease.Close(ctx))
+	}
+	owned := *dispatcher
+	owned.Credentials = credentials
+	owned.Observer = modelconfigurationpg.New(pgunit.NewPool(s.pool), s.credentialCipher)
+	owned.Deployment = deployments
+	owned.DeploymentReader = deploymentStore(s)
+	owned.Sessions = service
+	owned.SessionsReader = sessionAdapter(s)
+	return execution.StartWorker(ctx, &owned, owner)
+}
+
+// executionOwner acquires the execution lease on s's database and builds the
+// execution operations on it, for tests that run them without a Worker. The
+// lease closes when the test ends.
+func executionOwner(t testing.TB, s *Store) execution.Owner {
+	t.Helper()
+	lease, err := pgunit.AcquireLease(t.Context(), s.pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { _ = lease.Close(context.Background()) })
+	owner, err := fixtureOwner(s, lease)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return owner
+}
+
+// fixtureOwner builds the deployment and Session execution operations on
+// lease, as cmd/server does.
+func fixtureOwner(s *Store, lease *pgunit.Lease) (execution.Owner, error) {
+	_, changes, err := fixtureDeploymentExecution(s, lease)
+	if err != nil {
+		return execution.Owner{}, err
+	}
+	sessionExecution, err := sessions.NewExecutionOperations(sessionpg.NewExecution(lease))
+	if err != nil {
+		return execution.Owner{}, err
+	}
+	return execution.Owner{
+		Lease:      lease,
+		Deployment: changes,
+		Sessions:   sessionExecution,
+	}, nil
+}
diff --git a/services/core/tests/integration/worker_input_race_test.go b/services/core/tests/integration/worker_input_race_test.go
index eaa856fbb..76030a770 100644
--- a/services/core/tests/integration/worker_input_race_test.go
+++ b/services/core/tests/integration/worker_input_race_test.go
@@ -59,7 +59,7 @@ func TestWorkerInputReadSkipsConcurrentlyCancelledCandidate(t *testing.T) {
 			defer instrumented.Close()
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
-			worker := startWorker(t, ctx, fixtureDB{pool: instrumented}, h.d)
+			worker := startWorker(t, ctx, New(instrumented), h.d)
 			done := make(chan error, 1)
 			go func() { done <- worker.Run(ctx) }()
 			defer func() {
diff --git a/services/core/tests/integration/worker_lease_loss_test.go b/services/core/tests/integration/worker_lease_loss_test.go
index bedf0f7c7..d2b75293f 100644
--- a/services/core/tests/integration/worker_lease_loss_test.go
+++ b/services/core/tests/integration/worker_lease_loss_test.go
@@ -17,7 +17,7 @@ func TestWorkerLeaseLossLeavesUncertainWorkForSuccessor(t *testing.T) {
 	h.write("", proto.TypeHeartbeat, proto.HeartbeatPayload{SupportedAgentKinds: []proto.SupportedAgentKind{{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Streaming: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableTurns: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported, WebSearchControl: proto.CapabilitySupported, TextVerbosity: proto.CapabilitySupported, ExecutionControls: proto.CapabilitySupported, SubagentControl: proto.CapabilitySupported, ToolObservations: proto.CapabilitySupported, EnvironmentNone: proto.CapabilitySupported, Preparation: proto.CapabilitySupported})}}})
 	h.session = publicSession(t, h, "active")
 	queued := publicSession(t, h, "queued")
-	worker := startWorker(t, t.Context(), h.db, h.d)
+	worker := startWorker(t, t.Context(), h.s, h.d)
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	go func() { done <- worker.Run(ctx) }()
@@ -71,7 +71,7 @@ func TestWorkerLeaseLossLeavesUncertainWorkForSuccessor(t *testing.T) {
 	if err != nil || active.Status != sessions.TurnInProgress {
 		t.Fatal("lost owner persisted fallback completion", active, err)
 	}
-	successor := startWorker(t, t.Context(), h.db, h.d)
+	successor := startWorker(t, t.Context(), h.s, h.d)
 	stopped, stop := context.WithCancel(t.Context())
 	stop()
 	if err = successor.Run(stopped); err != context.Canceled {
diff --git a/services/core/tests/integration/worker_preparation_failure_test.go b/services/core/tests/integration/worker_preparation_failure_test.go
index 4a744e311..d1d266352 100644
--- a/services/core/tests/integration/worker_preparation_failure_test.go
+++ b/services/core/tests/integration/worker_preparation_failure_test.go
@@ -19,7 +19,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 			if err != nil {
 				t.Fatal(err)
 			}
-			_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+			_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 			defer stop()
 			prepare := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
 			if code == "preparation_failed" {
@@ -102,7 +102,7 @@ func TestWorkerRetriesUncertainPreparationFailure(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+			_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 			defer stop()
 			prepare := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
 			status := proto.PreparationStatusPayload{State: response.state, Operation: response.operation, ErrorCode: response.code, RunID: response.runID}
@@ -134,7 +134,7 @@ func TestWorkerPreparationRejectionPreservesCancellationAndNewerInput(t *testing
 	if err != nil {
 		t.Fatal(err)
 	}
-	_, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	_, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	defer stop()
 	old := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)
 	if _, err := cancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, first.ID); err != nil {
diff --git a/services/core/tests/integration/worker_wakeup_test.go b/services/core/tests/integration/worker_wakeup_test.go
index 379cd2349..3596bbff1 100644
--- a/services/core/tests/integration/worker_wakeup_test.go
+++ b/services/core/tests/integration/worker_wakeup_test.go
@@ -46,7 +46,7 @@ func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
 			defer instrumented.Close()
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
-			worker := startWorker(t, ctx, fixtureDB{pool: instrumented, cipher: fixtureCipher}, h.d)
+			worker := startWorker(t, ctx, NewWithCredentialCipher(instrumented, fixtureCipher), h.d)
 			done := make(chan error, 1)
 			started := false
 			defer func() {
@@ -102,7 +102,7 @@ func TestWorkerSchedulerHintBypassesEnvironmentScanThrottle(t *testing.T) {
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 	enableWorkerEnvironment(t, h)
 	frames := workerFrames(t, h)
-	worker, stop := startEnvironmentExpiryWorker(t, h.db, h.d)
+	worker, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	defer stop()
 	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "initial empty scheduler scan", func() bool {
 		return worker.MetricsSnapshot().Scheduler.LastRunAt != nil

From 00c99ca51fc2f010cb2e9f03cba03fb75f0f2e72 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 13:14:23 +0800
Subject: [PATCH 14/60] Rename the Codex runtime build and Web storage keys
 (#464)

---
 .github/workflows/release.yml                        |  4 ++--
 Makefile                                             |  6 +++---
 apps/web/e2e/access.spec.ts                          |  4 ++--
 apps/web/e2e/console.ts                              |  2 +-
 apps/web/e2e/overview-readiness.spec.ts              |  2 +-
 apps/web/index.html                                  |  2 +-
 .../src/features/overview/getting-started.test.ts    |  6 +++---
 apps/web/src/features/overview/getting-started.ts    |  4 ++--
 apps/web/src/features/sandbox/NodeEnrollment.tsx     |  2 +-
 apps/web/src/i18n/i18n.test.tsx                      |  2 +-
 apps/web/src/i18n/index.ts                           |  7 ++-----
 apps/web/src/lib/locale.test.ts                      |  7 -------
 apps/web/src/lib/locale.ts                           |  5 -----
 apps/web/src/lib/theme.ts                            |  2 +-
 docs/maintainers.md                                  | 10 +++++-----
 docs/zh/maintainers.md                               | 12 ++++++------
 ...uild-agents-runtime.sh => build-codex-runtime.sh} | 10 +++++-----
 scripts/build-core-distribution.sh                   |  6 ++----
 scripts/check-names.py                               |  2 +-
 scripts/ci_plan.py                                   |  2 +-
 20 files changed, 40 insertions(+), 57 deletions(-)
 rename scripts/{build-agents-runtime.sh => build-codex-runtime.sh} (77%)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 72bcd1f5b..d798c1976 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -124,9 +124,9 @@ jobs:
           CORE_DISTRIBUTION_OFFLINE: ${{ (github.event_name == 'push' || inputs.offline) && '1' || '0' }}
         run: |
           inputs="$HOME/.oac/build/release-inputs/inputs.json"
-          AGENTS_RUNTIME_CODEX_PACKAGE="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["codex"])' "$inputs")"
+          CODEX_CLI_DIR="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["codex"])' "$inputs")"
           MCODE_HARNESS_BUILD_DIR="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["mcode"])' "$inputs")"
-          export AGENTS_RUNTIME_CODEX_PACKAGE MCODE_HARNESS_BUILD_DIR
+          export CODEX_CLI_DIR MCODE_HARNESS_BUILD_DIR
           export CORE_DISTRIBUTION_RELEASE_BASE_URL="https://github.com/$RELEASE_REPOSITORY/releases/download/$RELEASE_TAG"
           bash scripts/build-core-distribution.sh
           mkdir -p "$HOME/.oac/build/release-upload"
diff --git a/Makefile b/Makefile
index 03060591a..24b6a13ab 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SQLC_VERSION ?= v1.29.0
 SQLC ?= go run github.com/sqlc-dev/sqlc/cmd/sqlc@$(SQLC_VERSION)
 SWAG_VERSION ?= v1.16.4
 
-.PHONY: help check check-database check-go check-sqlc sqlc-generate node-deps check-claude-sdk check-web check-mcode-harness build-daemon build-core check-core check-core-packages check-core-integration docker-build-core check-core-container build-agents-runtime build-claude-runtime build-claude-sdk-runtime build-mcode-harness build-mcode-runtime
+.PHONY: help check check-database check-go check-sqlc sqlc-generate node-deps check-claude-sdk check-web check-mcode-harness build-daemon build-core check-core check-core-packages check-core-integration docker-build-core check-core-container build-codex-runtime build-claude-runtime build-claude-sdk-runtime build-mcode-harness build-mcode-runtime
 
 help:
 	@printf '%s\n' 'make build-core        Build standalone Core commands' 'make build-daemon      Build the execution daemon' 'make check             Run Core, persistence and runtime checks' 'See README.md for runtime prerequisites and deployment.'
@@ -145,8 +145,8 @@ check-mcode-harness:
 	@for script in packages/mcode-harness/*.mjs; do node --check "$$script"; done
 	bash -n scripts/build-mcode-harness.sh scripts/build-mcode-runtime.sh
 
-build-agents-runtime:
-	./scripts/build-agents-runtime.sh
+build-codex-runtime:
+	./scripts/build-codex-runtime.sh
 
 build-claude-runtime:
 	./scripts/build-claude-runtime.sh
diff --git a/apps/web/e2e/access.spec.ts b/apps/web/e2e/access.spec.ts
index d5a1a90ab..41149ef97 100644
--- a/apps/web/e2e/access.spec.ts
+++ b/apps/web/e2e/access.spec.ts
@@ -14,7 +14,7 @@ const browserStorage = (page: Page) => page.evaluate(() => JSON.stringify({ ...w
 test("signs in with the Core key, keeps it out of the browser, and signs out and back in", async ({ page, request }) => {
   await resetFixture(request, "login");
   await recordV1Requests(page);
-  await page.addInitScript(() => window.localStorage.setItem("agents-core-web.language", "en"));
+  await page.addInitScript(() => window.localStorage.setItem("oac-web.language", "en"));
   await page.goto("/");
 
   await expect(page.getByRole("heading", { name: "Sign in to OpenAgentCore" })).toBeVisible();
@@ -47,7 +47,7 @@ test("signs in with the Core key, keeps it out of the browser, and signs out and
 test("opens a fresh install on the Overview's Getting started: a project and its key shown once, then the step is done", async ({ page, request }) => {
   await resetFixture(request, "login", { fresh: true });
   await recordV1Requests(page);
-  await page.addInitScript(() => window.localStorage.setItem("agents-core-web.language", "en"));
+  await page.addInitScript(() => window.localStorage.setItem("oac-web.language", "en"));
   await page.goto("/");
   await signIn(page, FIXTURE_CORE_KEY);
 
diff --git a/apps/web/e2e/console.ts b/apps/web/e2e/console.ts
index 78000a332..1e50de4db 100644
--- a/apps/web/e2e/console.ts
+++ b/apps/web/e2e/console.ts
@@ -40,7 +40,7 @@ export async function openConsole(page: Page, request: APIRequestContext, hash =
   await resetFixture(request, "authenticated", options);
   await recordV1Requests(page);
   await page.context().addCookies([{ name: "core_console", value: "fixture-session", url: web }]);
-  await page.addInitScript(() => window.localStorage.setItem("agents-core-web.language", "en"));
+  await page.addInitScript(() => window.localStorage.setItem("oac-web.language", "en"));
   await page.goto(`/#${hash}`);
 }
 
diff --git a/apps/web/e2e/overview-readiness.spec.ts b/apps/web/e2e/overview-readiness.spec.ts
index 5f22542d5..540a37405 100644
--- a/apps/web/e2e/overview-readiness.spec.ts
+++ b/apps/web/e2e/overview-readiness.spec.ts
@@ -164,7 +164,7 @@ test("failed summary and Session refreshes preserve their previous evidence unti
 });
 
 test("installation failure cannot complete onboarding and its retry reveals local-only blockage", async ({ page, request }) => {
-  await page.addInitScript(() => window.localStorage.setItem("agents-core-web.getting-started.7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f", "open"));
+  await page.addInitScript(() => window.localStorage.setItem("oac-web.getting-started.7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f", "open"));
   await page.route("**/core/v1/installation", (route) => route.fulfill(reject));
   await openConsole(page, request, "overview", { installation: "local" });
   const step = page.locator(".getting-started-step").first();
diff --git a/apps/web/index.html b/apps/web/index.html
index b65773249..4bd5a5edd 100644
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -13,7 +13,7 @@
     <title>OpenAgentCore</title>
     <script>
       ;(() => {
-        const stored = localStorage.getItem("agents-core-web.theme")
+        const stored = localStorage.getItem("oac-web.theme")
         const preference =
           stored === "light" || stored === "dark" || stored === "system" ? stored : "system"
         const resolved =
diff --git a/apps/web/src/features/overview/getting-started.test.ts b/apps/web/src/features/overview/getting-started.test.ts
index 356c075dc..56a9990a7 100644
--- a/apps/web/src/features/overview/getting-started.test.ts
+++ b/apps/web/src/features/overview/getting-started.test.ts
@@ -126,10 +126,10 @@ describe("Getting started visibility", () => {
     const stored = new Map<string, string>();
     vi.stubGlobal("window", { localStorage: { getItem: (key: string) => stored.get(key) ?? null, setItem: (key: string, value: string) => stored.set(key, value) } });
     const down: FleetState = { status: "failed", error: new Error("down") };
-    expect(checklistStorageKey(fleet(deployment({ installation_id: "inst-1" })))).toBe("agents-core-web.getting-started.inst-1");
-    expect(checklistStorageKey(down)).toBe("agents-core-web.getting-started");
+    expect(checklistStorageKey(fleet(deployment({ installation_id: "inst-1" })))).toBe("oac-web.getting-started.inst-1");
+    expect(checklistStorageKey(down)).toBe("oac-web.getting-started");
     rememberInstallation("inst-1");
-    expect(checklistStorageKey(down)).toBe("agents-core-web.getting-started.inst-1");
+    expect(checklistStorageKey(down)).toBe("oac-web.getting-started.inst-1");
     expect(checklistStorageKey({ status: "loading" })).toBeNull();
   });
 });
diff --git a/apps/web/src/features/overview/getting-started.ts b/apps/web/src/features/overview/getting-started.ts
index f1f803ce9..24d47382f 100644
--- a/apps/web/src/features/overview/getting-started.ts
+++ b/apps/web/src/features/overview/getting-started.ts
@@ -131,9 +131,9 @@ export function checklistView(states: readonly StepState[], memory: ChecklistMem
   return memory === "open" && states.some((state) => state !== null) ? "full" : "hidden";
 }
 
-const MEMORY_KEY = "agents-core-web.getting-started";
+const MEMORY_KEY = "oac-web.getting-started";
 /** The installation this browser last read, so the checklist keeps its entry while the deployment cannot be read. */
-const INSTALLATION_KEY = "agents-core-web.last-installation";
+const INSTALLATION_KEY = "oac-web.last-installation";
 
 /**
  * The storage entry for this installation, so a reinstall at the same origin
diff --git a/apps/web/src/features/sandbox/NodeEnrollment.tsx b/apps/web/src/features/sandbox/NodeEnrollment.tsx
index bd9cab55c..2ffc21f72 100644
--- a/apps/web/src/features/sandbox/NodeEnrollment.tsx
+++ b/apps/web/src/features/sandbox/NodeEnrollment.tsx
@@ -21,7 +21,7 @@ import { enrolledNode, enrollmentProgress, formatCountdown, progressSteps, type
 import { sandboxConsoleConfigQuery } from "./sandbox-queries";
 
 /** The host requirements open by default until this browser has shown them once. */
-const REQUIREMENTS_SEEN = "agents-core-web.node-requirements-seen";
+const REQUIREMENTS_SEEN = "oac-web.node-requirements-seen";
 function requirementsSeen(): boolean {
   try { return window.localStorage.getItem(REQUIREMENTS_SEEN) === "1"; } catch { return false; }
 }
diff --git a/apps/web/src/i18n/i18n.test.tsx b/apps/web/src/i18n/i18n.test.tsx
index f49befe07..59595904b 100644
--- a/apps/web/src/i18n/i18n.test.tsx
+++ b/apps/web/src/i18n/i18n.test.tsx
@@ -44,7 +44,7 @@ describe("Web internationalization", () => {
   });
 
   it("honors a saved choice and otherwise selects the first supported browser preference", () => {
-    expect(resolveLanguage("zh", ["en-US"])).toBe("zh-CN");
+    expect(resolveLanguage("zh-CN", ["en-US"])).toBe("zh-CN");
     expect(resolveLanguage("en", ["zh-CN"])).toBe("en");
     expect(resolveLanguage(null, ["en-US", "zh-CN"])).toBe("en");
     expect(resolveLanguage(null, ["fr-FR", "zh-Hans", "en-US"])).toBe("zh-CN");
diff --git a/apps/web/src/i18n/index.ts b/apps/web/src/i18n/index.ts
index baa7b0cfb..8837b0473 100644
--- a/apps/web/src/i18n/index.ts
+++ b/apps/web/src/i18n/index.ts
@@ -6,12 +6,10 @@ import { defaultNamespace, resources } from "./resources";
 export const supportedLanguages = ["en", "zh-CN"] as const;
 export type SupportedLanguage = (typeof supportedLanguages)[number];
 
-const LANGUAGE_STORAGE_KEY = "agents-core-web.language";
-const LEGACY_LANGUAGE_STORAGE_KEY = "agents-core-web.locale";
+const LANGUAGE_STORAGE_KEY = "oac-web.language";
 
 export function resolveLanguage(stored: string | null, languages: readonly string[]): SupportedLanguage {
   if (stored === "en" || stored === "zh-CN") return stored;
-  if (stored === "zh") return "zh-CN";
   for (const language of languages) {
     const normalized = language.toLowerCase();
     if (normalized.startsWith("zh")) return "zh-CN";
@@ -24,7 +22,7 @@ function browserLanguage(): SupportedLanguage {
   if (typeof window === "undefined") return "en";
   let stored: string | null = null;
   try {
-    stored = window.localStorage.getItem(LANGUAGE_STORAGE_KEY) ?? window.localStorage.getItem(LEGACY_LANGUAGE_STORAGE_KEY);
+    stored = window.localStorage.getItem(LANGUAGE_STORAGE_KEY);
   } catch {
     // Storage can be unavailable in privacy-restricted browser contexts.
   }
@@ -49,7 +47,6 @@ export function setLanguage(language: SupportedLanguage): Promise<unknown> {
   if (typeof window !== "undefined") {
     try {
       window.localStorage.setItem(LANGUAGE_STORAGE_KEY, language);
-      window.localStorage.removeItem(LEGACY_LANGUAGE_STORAGE_KEY);
     } catch {
       // Keep the in-memory choice when persistence is unavailable.
     }
diff --git a/apps/web/src/lib/locale.test.ts b/apps/web/src/lib/locale.test.ts
index 18248783f..fc47a3e83 100644
--- a/apps/web/src/lib/locale.test.ts
+++ b/apps/web/src/lib/locale.test.ts
@@ -1,16 +1,9 @@
 import { describe, expect, it } from "vitest";
-import { resolveLocale } from "./locale";
 import { AgentCoreError } from "@oac/agents-client";
 import { sandboxRequestError, sandboxStateLabel } from "./sandbox-labels";
 import { sandboxDiagnosticMessage } from "./sandbox-diagnostic";
 
 describe("sandbox localization", () => {
-  it("uses saved choices and defaults to the browser's preferred language", () => {
-    expect(resolveLocale(null, ["zh-CN", "en-US"])).toBe("zh");
-    expect(resolveLocale("en", ["zh-TW"])).toBe("en");
-    expect(resolveLocale("zh", ["en-US"])).toBe("zh");
-    expect(resolveLocale("invalid", ["fr"])).toBe("en");
-  });
   it("localizes every persisted allocation and compute state without exposing unknown values", () => {
     for (const state of ["creating", "running", "cleanup_pending", "released", "disabled", "quiescing", "suspending", "suspended", "restoring", "waking"]) {
       expect(sandboxStateLabel(state, "zh")).toMatch(/[\u4e00-\u9fff]/);
diff --git a/apps/web/src/lib/locale.ts b/apps/web/src/lib/locale.ts
index 22d250fda..9f02335c9 100644
--- a/apps/web/src/lib/locale.ts
+++ b/apps/web/src/lib/locale.ts
@@ -1,10 +1,5 @@
 import { chinese, type MessageKey } from "./locale-strings";
 export type Locale = "en" | "zh";
-export const localeStorageKey = "agents-core-web.locale";
-export function resolveLocale(saved: string | null, languages: readonly string[]): Locale {
-  if (saved === "en" || saved === "zh") return saved;
-  return languages[0]?.toLowerCase().startsWith("zh") ? "zh" : "en";
-}
 export function translate(locale: Locale, key: MessageKey): string {
   return locale === "zh" ? chinese[key] : key;
 }
diff --git a/apps/web/src/lib/theme.ts b/apps/web/src/lib/theme.ts
index 0167777ce..b369a4ba8 100644
--- a/apps/web/src/lib/theme.ts
+++ b/apps/web/src/lib/theme.ts
@@ -9,7 +9,7 @@ export interface ThemeContextValue {
   setPreference: (preference: ThemePreference) => void;
 }
 
-export const themeStorageKey = "agents-core-web.theme";
+export const themeStorageKey = "oac-web.theme";
 export const defaultThemePreference: ThemePreference = "system";
 export const ThemeContext = createContext<ThemeContextValue | null>(null);
 
diff --git a/docs/maintainers.md b/docs/maintainers.md
index 18fbde9b7..47d162b70 100644
--- a/docs/maintainers.md
+++ b/docs/maintainers.md
@@ -13,7 +13,7 @@ Build on Linux x86_64 with a glibc compatible with Debian 12, Docker, the Go ver
 ```sh
 bash scripts/prepare-release-runtimes.sh
 inputs="$HOME/.oac/build/release-inputs/inputs.json"
-export AGENTS_RUNTIME_CODEX_PACKAGE="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["codex"])' "$inputs")"
+export CODEX_CLI_DIR="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["codex"])' "$inputs")"
 export MCODE_HARNESS_BUILD_DIR="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["mcode"])' "$inputs")"
 export CORE_DISTRIBUTION_RELEASE_BASE_URL=https://github.com/MiniMax-AI/OpenAgentCore/releases/download/v1.2.3
 make build-core-distribution
@@ -25,7 +25,7 @@ make build-core-distribution
 | --- | --- |
 | `CORE_DISTRIBUTION_RELEASE_BASE_URL` | Versioned HTTPS directory that will serve the generated asset file names (never `latest`). Required unless `CORE_DISTRIBUTION_OFFLINE=1` |
 | `CORE_DISTRIBUTION_OFFLINE` | `1` also builds the offline archive |
-| `AGENTS_RUNTIME_CODEX_PACKAGE`, `MCODE_HARNESS_BUILD_DIR` | Pinned Runtime inputs from `prepare-release-runtimes.sh` |
+| `CODEX_CLI_DIR`, `MCODE_HARNESS_BUILD_DIR` | Pinned Runtime inputs from `prepare-release-runtimes.sh` |
 | `CORE_DISTRIBUTION_CODEX_IMAGE`, `CORE_DISTRIBUTION_CLAUDE_IMAGE`, `CORE_DISTRIBUTION_MCODE_IMAGE` | Use existing Harness images, given as immutable `sha256:` image IDs, instead of building them; set all three or none. Each must contain the daemon built from this commit |
 | `OAC_NATIVE_INSTALLER_BUILD_DIR` | Native installer catalog directory; see [Native installers](#native-installers) |
 | `CORE_DISTRIBUTION_BUILD_DIR` | Output directory under `~/.oac`. Default: `~/.oac/build/core-distribution` |
@@ -59,9 +59,9 @@ The catalog records the commit, the Runtime protocol version, each archive's SHA
 **Codex Runtime image.** Extract the official npm package `@openai/codex@0.153.4-linux-x64` under `~/.oac` (for example with `npm pack --ignore-scripts` and `tar -xzf`), then:
 
 ```sh
-export AGENTS_RUNTIME_CODEX_PACKAGE=/absolute/path/to/package
-make build-agents-runtime
-docker build --platform linux/amd64 -t oac-runtime:codex "${OAC_DEV_HOME:-$HOME/.oac}/build/agents-runtime"
+export CODEX_CLI_DIR=/absolute/path/to/package
+make build-codex-runtime
+docker build --platform linux/amd64 -t oac-runtime:codex "${OAC_DEV_HOME:-$HOME/.oac}/build/codex-runtime"
 ```
 
 The script checks the package version, builds `oac-daemon` for Linux amd64 and prepares a context with only the daemon, the unmodified native executable, its resources and `services/core/deploy/codex/Dockerfile`.
diff --git a/docs/zh/maintainers.md b/docs/zh/maintainers.md
index afb79b2fa..3b553a3da 100644
--- a/docs/zh/maintainers.md
+++ b/docs/zh/maintainers.md
@@ -1,7 +1,7 @@
 ---
 title: "构建并发布 OpenAgentCore"
 source: docs/maintainers.md
-source_hash: cfab5d1ad336c809b2b27bc870b02934f54184f3778e2c5d770a945c6830e097
+source_hash: 679fb7cf8af9fc6aa2adfb9b04e1766497a32937fd184162614ae813707cb90b
 ---
 
 本指南面向负责构建和发布 OpenAgentCore 的维护者。要安装 Core 和 Web，请使用 [安装指南](getting-started/install.md)。安装器代码遵循的规则见 [部署](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/README.md) 和 [节点安装器](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/node/README.md)；必需检查见 [CONTRIBUTING](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#required-checks)。
@@ -15,7 +15,7 @@ source_hash: cfab5d1ad336c809b2b27bc870b02934f54184f3778e2c5d770a945c6830e097
 ```sh
 bash scripts/prepare-release-runtimes.sh
 inputs="$HOME/.oac/build/release-inputs/inputs.json"
-export AGENTS_RUNTIME_CODEX_PACKAGE="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["codex"])' "$inputs")"
+export CODEX_CLI_DIR="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["codex"])' "$inputs")"
 export MCODE_HARNESS_BUILD_DIR="$(python3 -c 'import json,sys; print(json.load(open(sys.argv[1]))["mcode"])' "$inputs")"
 export CORE_DISTRIBUTION_RELEASE_BASE_URL=https://github.com/MiniMax-AI/OpenAgentCore/releases/download/v1.2.3
 make build-core-distribution
@@ -27,7 +27,7 @@ make build-core-distribution
 | --- | --- |
 | `CORE_DISTRIBUTION_RELEASE_BASE_URL` | 用于提供生成的资源文件名的带版本 HTTPS 目录（绝不能使用 `latest`）。除非 `CORE_DISTRIBUTION_OFFLINE=1`，否则为必填项 |
 | `CORE_DISTRIBUTION_OFFLINE` | 设为 `1` 时还会构建离线归档 |
-| `AGENTS_RUNTIME_CODEX_PACKAGE`、`MCODE_HARNESS_BUILD_DIR` | `prepare-release-runtimes.sh` 固定的 Runtime 输入 |
+| `CODEX_CLI_DIR`、`MCODE_HARNESS_BUILD_DIR` | `prepare-release-runtimes.sh` 固定的 Runtime 输入 |
 | `CORE_DISTRIBUTION_CODEX_IMAGE`、`CORE_DISTRIBUTION_CLAUDE_IMAGE`、`CORE_DISTRIBUTION_MCODE_IMAGE` | 使用现有 Harness 镜像，而不是构建这些镜像；值必须是以不可变 `sha256:` 镜像 ID 表示的现有镜像。三个变量必须全部设置或全部不设置；每个镜像都必须包含由该提交构建的守护进程 |
 | `OAC_NATIVE_INSTALLER_BUILD_DIR` | 原生安装器目录；请参阅[原生安装器](#native-installers) |
 | `CORE_DISTRIBUTION_BUILD_DIR` | `~/.oac` 下的输出目录。默认值：`~/.oac/build/core-distribution` |
@@ -61,9 +61,9 @@ export OAC_NATIVE_INSTALLER_BUILD_DIR=OUTPUT_DIR
 **Codex Runtime 镜像。** 在 `~/.oac` 下解压官方 npm 包 `@openai/codex@0.153.4-linux-x64`（例如使用 `npm pack --ignore-scripts` 和 `tar -xzf`），然后执行：
 
 ```sh
-export AGENTS_RUNTIME_CODEX_PACKAGE=/absolute/path/to/package
-make build-agents-runtime
-docker build --platform linux/amd64 -t oac-runtime:codex "${OAC_DEV_HOME:-$HOME/.oac}/build/agents-runtime"
+export CODEX_CLI_DIR=/absolute/path/to/package
+make build-codex-runtime
+docker build --platform linux/amd64 -t oac-runtime:codex "${OAC_DEV_HOME:-$HOME/.oac}/build/codex-runtime"
 ```
 
 该脚本会检查软件包版本，为 Linux amd64 构建 `oac-daemon`，并准备一个仅包含守护进程、未修改的原生可执行文件、相关资源和 `services/core/deploy/codex/Dockerfile` 的上下文。
diff --git a/scripts/build-agents-runtime.sh b/scripts/build-codex-runtime.sh
similarity index 77%
rename from scripts/build-agents-runtime.sh
rename to scripts/build-codex-runtime.sh
index 4b00f5d21..fcae07a81 100755
--- a/scripts/build-agents-runtime.sh
+++ b/scripts/build-codex-runtime.sh
@@ -3,9 +3,9 @@ set -euo pipefail
 
 repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 runtime_root="${OAC_DEV_HOME:-$HOME/.oac}"
-output_dir="${AGENTS_RUNTIME_BUILD_DIR:-$runtime_root/build/agents-runtime}"
+output_dir="${AGENTS_RUNTIME_BUILD_DIR:-$runtime_root/build/codex-runtime}"
 # Extract the official @openai/codex@0.153.4-linux-x64 npm package here.
-package_dir="${AGENTS_RUNTIME_CODEX_PACKAGE:?Set AGENTS_RUNTIME_CODEX_PACKAGE to the extracted pinned platform package}"
+package_dir="${CODEX_CLI_DIR:?Set CODEX_CLI_DIR to the extracted pinned platform package}"
 for directory in "$runtime_root" "$output_dir" "$package_dir"; do
   if [[ "$directory" != /* ]]; then
     printf 'Runtime build directories must be absolute: %s\n' "$directory" >&2
@@ -23,7 +23,7 @@ for executable in "$native_dir/bin/codex"; do
 done
 test -d "$native_dir/codex-resources"
 mkdir -p "$runtime_root/cache/oac-runtime-builds"
-context="$(mktemp -d "$runtime_root/cache/oac-runtime-builds/bundle.XXXXXX")"
+context="$(mktemp -d "$runtime_root/cache/oac-runtime-builds/codex.XXXXXX")"
 trap 'rm -rf "$context"' EXIT
 (
   cd "$repo_root"
@@ -36,5 +36,5 @@ cp "$repo_root/services/core/deploy/codex/Dockerfile" "$context/Dockerfile"
 # Preserve the previous bundle if compilation or validation failed.
 mkdir -p "$output_dir"
 cp -R "$context/." "$output_dir/"
-printf 'Runtime image context: %s\n' "$output_dir"
-printf 'Build with: docker build --platform linux/amd64 -t agents-runtime:local %q\n' "$output_dir"
+printf 'Codex Runtime image context: %s\n' "$output_dir"
+printf 'Build with: docker build --platform linux/amd64 -t oac-runtime:codex %q\n' "$output_dir"
diff --git a/scripts/build-core-distribution.sh b/scripts/build-core-distribution.sh
index bc661b251..e6635f418 100755
--- a/scripts/build-core-distribution.sh
+++ b/scripts/build-core-distribution.sh
@@ -160,14 +160,12 @@ if [[ -n "$codex_image$claude_image$mcode_image" ]]; then
     exit 1
   fi
 else
-  : "${AGENTS_RUNTIME_CODEX_PACKAGE:?Set the extracted pinned Codex Linux x64 package directory}"
+  : "${CODEX_CLI_DIR:?Set the extracted pinned Codex Linux x64 package directory}"
   : "${MCODE_HARNESS_BUILD_DIR:?Set the existing built pinned MiniMax Code companion directory}"
   export CLAUDE_SDK_BUILD_DIR="$stage/claude-sdk"
   scripts/build-claude-sdk-runtime.sh
   for harness in codex claude mcode; do
-    script="scripts/build-$harness-runtime.sh"
-    if [[ "$harness" == codex ]]; then script=scripts/build-agents-runtime.sh; fi
-    AGENTS_RUNTIME_BUILD_DIR="$stage/$harness" bash "$script"
+    AGENTS_RUNTIME_BUILD_DIR="$stage/$harness" bash "scripts/build-$harness-runtime.sh"
     build_image "$harness" "$stage/$harness"
   done
   codex_image="$(cat "$stage/codex.id")"
diff --git a/scripts/check-names.py b/scripts/check-names.py
index f2e3b00f0..d1fba0a4f 100644
--- a/scripts/check-names.py
+++ b/scripts/check-names.py
@@ -16,7 +16,7 @@
     r"(?i:parsar)|\bAGENTS_CORE_WEB_[A-Z][A-Z0-9_]*|\bAGENTS_API_[A-Z][A-Z0-9_]*|\bCORE_CONSOLE_[A-Z][A-Z0-9_]*"
     r"|\bagents-api(?:-(?:migrate|device|environment-key|e2b-provider|microsandbox-provider"
     r"|tool-root|codex-directory|codex-write|workspace-export|runtime-initialize|claude-shell-prefix))?\b"
-    r"|\bcore-console\b|\bagents-runtime-|(?i:\bAgents? Core(?: Web)?\b)|@agents-core-web/"
+    r"|\bcore-console\b|\bagents-runtime\b|(?i:\bAgents? Core(?: Web)?\b)|\bagents-core-web\b"
     r"|(?i:\bminimax-ai-dev\b)",
 )
 
diff --git a/scripts/ci_plan.py b/scripts/ci_plan.py
index 30d0f61b2..7b45e8bbf 100644
--- a/scripts/ci_plan.py
+++ b/scripts/ci_plan.py
@@ -79,7 +79,7 @@
     (("scripts/build-e2b-provider.sh",), (".sh",), ("backend", "api", "distribution")),
     (("scripts/build-claude", "scripts/check-claude", "scripts/build-mcode", "scripts/prepare-release-runtimes.sh"),
      SCRIPTS, ("harness", "native", "backend", "distribution")),
-    (("scripts/build-agents-runtime.sh",), (".sh",), ("backend", "native", "distribution")),
+    (("scripts/build-codex-runtime.sh",), (".sh",), ("backend", "native", "distribution")),
     (("scripts/generate-harness-catalog", "scripts/harness-catalog/", "scripts/openapi-split/", "scripts/patch-agents-openapi.py",
       "scripts/extract-agents-api-upstream.py"), SCRIPTS, JOBS),
     (("scripts/check-sqlc.py", "scripts/go-test-shard.py"), (".py",), ("backend",)),

From dfc38781504d017cf8dbc8cc813a53c557b5daa0 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 13:30:22 +0800
Subject: [PATCH 15/60] Report corrupt stored data as internal errors (#465)

---
 services/core/internal/api/handler_test.go    |  8 ++++++-
 .../internal/api/session_model_defaults.go    |  3 +--
 .../internal/environmenttemplates/errors.go   |  2 +-
 .../persistence/postgres/sessionpg/devices.go | 10 ++++----
 .../sessionpg/execution_environment.go        |  4 ++--
 .../persistence/postgres/sessionpg/frozen.go  |  4 ++--
 .../persistence/postgres/sessionpg/rows.go    |  8 +++----
 .../persistence/postgres/templatepg/seal.go   |  3 ++-
 .../persistence/postgres/templatepg/store.go  | 20 +++++++++++-----
 .../postgres/templatepg/store_test.go         | 24 ++++++++++++-------
 .../integration/session_reads_fixture_test.go |  2 +-
 .../integration/turn_journal_reads_test.go    |  2 +-
 12 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/services/core/internal/api/handler_test.go b/services/core/internal/api/handler_test.go
index 8257827b7..04b28b3f6 100644
--- a/services/core/internal/api/handler_test.go
+++ b/services/core/internal/api/handler_test.go
@@ -149,6 +149,7 @@ func TestHTTPRejectsUntrustedOrUnsupportedRequests(t *testing.T) {
 		{"initial input", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", valid, 503},
 		{"stream unavailable", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"agent":`, `"stream":true,"agent":`, 1), 503},
 		{"unknown saved agent", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"agent":`, `"agent_id":"saved","agent":`, 1), 404},
+		{"saved agent without its model provider bundle", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"agent":`, `"agent_id":"saved","agent":`, 1), 500},
 		{"unknown agent option", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"model":`, `"tools":[{}],"model":`, 1), 400},
 		{"multiple objects", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", valid + `{}`, 400},
 		{"null body as empty object", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", `null`, 400},
@@ -158,10 +159,15 @@ func TestHTTPRejectsUntrustedOrUnsupportedRequests(t *testing.T) {
 			unavailable := 0
 			h, s, _ := testHandler(t, func(_ *Dependencies, f *testFakes) {
 				f.metrics.recordUnavailable = func() { unavailable++ }
-				if test.name == "unknown saved agent" {
+				switch test.name {
+				case "unknown saved agent":
 					f.agentsReader.getAgentWithModelProvider = func(context.Context, string, string) (agents.Agent, *v1.ModelProviderInput, error) {
 						return agents.Agent{}, nil, agents.ErrNotFound
 					}
+				case "saved agent without its model provider bundle":
+					f.agentsReader.getAgentWithModelProvider = func(context.Context, string, string) (agents.Agent, *v1.ModelProviderInput, error) {
+						return agents.Agent{ID: "saved", Configuration: json.RawMessage(`{"model":"example","x_agents_core":{"model_provider":{"protocol":"responses","base_url":"https://model.invalid"}}}`)}, nil, nil
+					}
 				}
 			})
 			r := httptest.NewRequest(http.MethodPost, test.path, strings.NewReader(test.body))
diff --git a/services/core/internal/api/session_model_defaults.go b/services/core/internal/api/session_model_defaults.go
index c897bd7c7..93bdffd7d 100644
--- a/services/core/internal/api/session_model_defaults.go
+++ b/services/core/internal/api/session_model_defaults.go
@@ -7,7 +7,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/agents"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/google/uuid"
 )
 
@@ -34,7 +33,7 @@ func (h *Handler) sessionAgentDefaults(ctx context.Context, tenant string, input
 		return nil, nil, err
 	}
 	if inherit && saved.XAgentsCore != nil && saved.XAgentsCore.ModelProvider != nil && provider == nil {
-		return nil, nil, credentialcrypto.ErrUnavailable
+		return nil, nil, errors.New("saved agent model provider bundle is missing")
 	}
 	return saved, provider, nil
 }
diff --git a/services/core/internal/environmenttemplates/errors.go b/services/core/internal/environmenttemplates/errors.go
index 1591eaeee..7730fa274 100644
--- a/services/core/internal/environmenttemplates/errors.go
+++ b/services/core/internal/environmenttemplates/errors.go
@@ -7,6 +7,6 @@ var (
 	// the tenant. Missing, malformed and foreign IDs are indistinguishable.
 	ErrNotFound = errors.New("environment template not found")
 	// ErrInvalidInput reports input that is not a valid Template, or a saved
-	// Template whose configuration no longer decodes as one.
+	// Template whose configuration no longer passes validation.
 	ErrInvalidInput = errors.New("invalid environment template")
 )
diff --git a/services/core/internal/persistence/postgres/sessionpg/devices.go b/services/core/internal/persistence/postgres/sessionpg/devices.go
index 9bf5e67e5..7512586b3 100644
--- a/services/core/internal/persistence/postgres/sessionpg/devices.go
+++ b/services/core/internal/persistence/postgres/sessionpg/devices.go
@@ -16,7 +16,7 @@ import (
 )
 
 func (s *Store) GetSessionDevice(ctx context.Context, tenant, session string) (sessions.ExecutionDevice, error) {
-	lookup, err := DeviceLookup(tenant, session)
+	lookup, err := ResourceLookup(tenant, session)
 	if err != nil {
 		return sessions.ExecutionDevice{}, err
 	}
@@ -27,7 +27,7 @@ func (s *Store) GetSessionDevice(ctx context.Context, tenant, session string) (s
 }
 
 func (s *Store) GetSessionExecutionBinding(ctx context.Context, tenant, session string) (sessions.ExecutionBinding, error) {
-	lookup, err := DeviceLookup(tenant, session)
+	lookup, err := ResourceLookup(tenant, session)
 	if err != nil {
 		return sessions.ExecutionBinding{}, err
 	}
@@ -77,7 +77,7 @@ func (s *Store) ListExecutionDevices(ctx context.Context, tenant string) ([]sess
 }
 
 func (s *Store) GetSessionRuntimeDevice(ctx context.Context, tenant, session string) (sessions.ExecutionDevice, error) {
-	lookup, err := DeviceLookup(tenant, session)
+	lookup, err := ResourceLookup(tenant, session)
 	if err != nil {
 		return sessions.ExecutionDevice{}, err
 	}
@@ -176,7 +176,7 @@ func (s *Store) CreateDevice(ctx context.Context, tenant string, registration se
 }
 
 func (s *Store) RevokeDevice(ctx context.Context, tenant, device string) error {
-	lookup, err := DeviceLookup(tenant, device)
+	lookup, err := ResourceLookup(tenant, device)
 	if err != nil {
 		return err
 	}
@@ -217,7 +217,7 @@ func (s *Store) WithEnrollment(ctx context.Context, environment, credentialHash
 	if err != nil {
 		return err
 	}
-	lookup, err := DeviceLookup(tenant, current.ID)
+	lookup, err := ResourceLookup(tenant, current.ID)
 	if err != nil {
 		return err
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_environment.go b/services/core/internal/persistence/postgres/sessionpg/execution_environment.go
index 505f859ec..de4bf3cd5 100644
--- a/services/core/internal/persistence/postgres/sessionpg/execution_environment.go
+++ b/services/core/internal/persistence/postgres/sessionpg/execution_environment.go
@@ -32,7 +32,7 @@ func (e *Execution) WithConnection(ctx context.Context, tenant, environment stri
 		if err != nil {
 			return err
 		}
-		lookup, err := DeviceLookup(tenant, current.SessionID)
+		lookup, err := ResourceLookup(tenant, current.SessionID)
 		if err != nil {
 			return err
 		}
@@ -43,7 +43,7 @@ func (e *Execution) WithConnection(ctx context.Context, tenant, environment stri
 }
 
 func (e *Execution) WithDeviceBinding(ctx context.Context, tenant, session string, apply func(context.Context, sessions.DeviceBindingTx, sessions.LockedSession) error) error {
-	lookup, err := DeviceLookup(tenant, session)
+	lookup, err := ResourceLookup(tenant, session)
 	if err != nil {
 		return err
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/frozen.go b/services/core/internal/persistence/postgres/sessionpg/frozen.go
index 40e36f0ef..d7a638f78 100644
--- a/services/core/internal/persistence/postgres/sessionpg/frozen.go
+++ b/services/core/internal/persistence/postgres/sessionpg/frozen.go
@@ -19,7 +19,7 @@ import (
 // data that does not open, decode or validate is corrupt stored data, never
 // the caller's input, so it is an internal error.
 func (s *Store) ReadEnvironmentSetup(ctx context.Context, tenant, session string) (environmentconfig.Setup, error) {
-	lookup, err := DeviceLookup(tenant, session)
+	lookup, err := ResourceLookup(tenant, session)
 	if err != nil {
 		return environmentconfig.Setup{}, sessions.ErrNotFound
 	}
@@ -51,7 +51,7 @@ func (s *Store) ReadEnvironmentSetup(ctx context.Context, tenant, session string
 // position. A file that does not open or match its recorded size is corrupt
 // stored data, so it is an internal error.
 func (s *Store) ReadInitialEnvironmentFile(ctx context.Context, tenant, session string, position int) (environmentconfig.InitialFileMetadata, []byte, error) {
-	lookup, err := DeviceLookup(tenant, session)
+	lookup, err := ResourceLookup(tenant, session)
 	if err != nil {
 		return environmentconfig.InitialFileMetadata{}, nil, err
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/rows.go b/services/core/internal/persistence/postgres/sessionpg/rows.go
index a07c5a342..d635b72bf 100644
--- a/services/core/internal/persistence/postgres/sessionpg/rows.go
+++ b/services/core/internal/persistence/postgres/sessionpg/rows.go
@@ -42,10 +42,10 @@ func TurnLookup(tenantID, sessionID, turnID string) (sqlc.GetTurnParams, error)
 	return p, err
 }
 
-// DeviceLookup parses a tenant and the internal identifier of one of its
+// ResourceLookup parses a tenant and the internal identifier of one of its
 // resources, such as a device, Session or Environment; a malformed one is
 // sessions.ErrInvalidInput.
-func DeviceLookup(tenantID, id string) (sqlc.GetDeviceParams, error) {
+func ResourceLookup(tenantID, id string) (sqlc.GetDeviceParams, error) {
 	var p sqlc.GetDeviceParams
 	var err error
 	if p.TenantID, err = parseID(tenantID); err != nil {
@@ -76,7 +76,7 @@ func sessionFromRow(row sqlc.Session) (sessions.Session, error) {
 	session.Creator = creator
 	configuration, err := jsonobject.Normalize(row.Configuration)
 	if err != nil {
-		return sessions.Session{}, fmt.Errorf("decode session configuration: %w: %w", sessions.ErrInvalidInput, err)
+		return sessions.Session{}, fmt.Errorf("decode session configuration: %w", err)
 	}
 	session.Configuration = configuration
 	if err := json.Unmarshal(row.Metadata, &session.Metadata); err != nil {
@@ -110,7 +110,7 @@ func environmentFromRow(row sqlc.Environment, tenant pgtype.UUID, configuration
 	}
 	configuration, err = jsonobject.Normalize(configuration)
 	if err != nil {
-		return sessions.Environment{}, fmt.Errorf("decode environment configuration: %w: %w", sessions.ErrInvalidInput, err)
+		return sessions.Environment{}, fmt.Errorf("decode environment configuration: %w", err)
 	}
 	return sessions.Environment{
 		ID: uuid.UUID(row.ID.Bytes).String(), SessionID: uuid.UUID(row.SessionID.Bytes).String(),
diff --git a/services/core/internal/persistence/postgres/templatepg/seal.go b/services/core/internal/persistence/postgres/templatepg/seal.go
index fd504ecbc..06b2f0749 100644
--- a/services/core/internal/persistence/postgres/templatepg/seal.go
+++ b/services/core/internal/persistence/postgres/templatepg/seal.go
@@ -2,6 +2,7 @@ package templatepg
 
 import (
 	"encoding/json"
+	"errors"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
@@ -87,7 +88,7 @@ func (s *Store) openSetup(tenant, id pgtype.UUID, field string, ciphertext []byt
 		return err
 	}
 	if environmentconfig.Decode(plaintext, output) != nil {
-		return environmenttemplates.ErrInvalidInput
+		return errors.New("invalid stored environment template " + field)
 	}
 	return nil
 }
diff --git a/services/core/internal/persistence/postgres/templatepg/store.go b/services/core/internal/persistence/postgres/templatepg/store.go
index 61f93bb4b..cb3d1d502 100644
--- a/services/core/internal/persistence/postgres/templatepg/store.go
+++ b/services/core/internal/persistence/postgres/templatepg/store.go
@@ -169,8 +169,10 @@ func (s *Store) List(ctx context.Context, tenantID string, query environmenttemp
 }
 
 // Resolve reads one row, so the metadata and every confidential field come
-// from the same committed version. Stored Skill and Plugin metadata must match
-// the sealed archives they describe. Any malformed ID resolves to ErrNotFound.
+// from the same committed version. Stored data that does not decode or match
+// its sealed contents is corrupt, an internal error; configuration that decodes
+// but fails current validation is ErrInvalidInput. Any malformed ID resolves to
+// ErrNotFound.
 func (s *Store) Resolve(ctx context.Context, tenantID, templateID string) (environmenttemplates.Resolved, error) {
 	tenant, err := pgunit.ParseID(tenantID)
 	if err != nil {
@@ -203,12 +205,15 @@ func (s *Store) Resolve(ctx context.Context, tenantID, templateID string) (envir
 			return environmenttemplates.Resolved{}, err
 		}
 	}
-	if !matches(metadata.Skills, resolved.Setup.SkillMetadata()) || !matches(metadata.Plugins, resolved.Setup.PluginMetadata()) || resolved.Setup.Validate() != nil {
+	if !matches(metadata.Skills, resolved.Setup.SkillMetadata()) || !matches(metadata.Plugins, resolved.Setup.PluginMetadata()) {
+		return environmenttemplates.Resolved{}, errors.New("stored environment template metadata does not match its sealed setup")
+	}
+	if resolved.Setup.Validate() != nil {
 		return environmenttemplates.Resolved{}, environmenttemplates.ErrInvalidInput
 	}
 	if len(row.FileContents) == 0 {
 		if len(metadata.Files) > 0 {
-			return environmenttemplates.Resolved{}, environmenttemplates.ErrInvalidInput
+			return environmenttemplates.Resolved{}, errors.New("stored environment template files have no contents")
 		}
 		return resolved, nil
 	}
@@ -219,7 +224,10 @@ func (s *Store) Resolve(ctx context.Context, tenantID, templateID string) (envir
 	if err != nil {
 		return environmenttemplates.Resolved{}, err
 	}
-	if json.Unmarshal(plaintext, &resolved.Files) != nil || environmentconfig.ValidateInitialFiles(resolved.Files) != nil {
+	if json.Unmarshal(plaintext, &resolved.Files) != nil {
+		return environmenttemplates.Resolved{}, errors.New("invalid stored environment template files")
+	}
+	if environmentconfig.ValidateInitialFiles(resolved.Files) != nil {
 		return environmenttemplates.Resolved{}, environmenttemplates.ErrInvalidInput
 	}
 	return resolved, nil
@@ -246,7 +254,7 @@ func template(row metadataRow) (environmenttemplates.Template, error) {
 		result.Name = &row.Name.String
 	}
 	if json.Unmarshal(row.Files, &result.Files) != nil || environmentconfig.Decode(row.Packages, &result.Packages) != nil || json.Unmarshal(row.Skills, &result.Skills) != nil || json.Unmarshal(row.Plugins, &result.Plugins) != nil {
-		return environmenttemplates.Template{}, environmenttemplates.ErrInvalidInput
+		return environmenttemplates.Template{}, errors.New("invalid stored environment template metadata")
 	}
 	return result, nil
 }
diff --git a/services/core/internal/persistence/postgres/templatepg/store_test.go b/services/core/internal/persistence/postgres/templatepg/store_test.go
index ee5b02b82..7710eb447 100644
--- a/services/core/internal/persistence/postgres/templatepg/store_test.go
+++ b/services/core/internal/persistence/postgres/templatepg/store_test.go
@@ -370,9 +370,10 @@ func TestMissingKeyIsUnavailable(t *testing.T) {
 	}
 }
 
-// Stored package metadata naming the removed system manager is rejected on
-// every read instead of being silently dropped.
-func TestStoredSystemPackagesRejected(t *testing.T) {
+// Stored package metadata naming the removed system manager no longer decodes,
+// so every read fails with an internal error instead of dropping it. Packages
+// that decode but fail current validation are an invalid Template.
+func TestStoredPackagesRejected(t *testing.T) {
 	f := newFixture(t, pgtest.Open(t))
 	ctx := t.Context()
 	tenant := uuid.NewString()
@@ -383,18 +384,23 @@ func TestStoredSystemPackagesRejected(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
+	internal := func(err error) bool { return err != nil && !errors.Is(err, environmenttemplates.ErrInvalidInput) }
 	for _, value := range []string{`null`, `[]`, `["jq"]`} {
 		store(`{"npm":[],"python":[],"system":` + value + `}`)
-		if _, err := f.keyless.Get(ctx, tenant, template.ID); !errors.Is(err, environmenttemplates.ErrInvalidInput) {
-			t.Fatal("get silently ignored removed system packages", value, err)
+		if _, err := f.keyless.Get(ctx, tenant, template.ID); !internal(err) {
+			t.Fatal("get did not fail internally on removed system packages", value, err)
 		}
-		if _, err := f.keyless.List(ctx, tenant, environmenttemplates.ListQuery{Limit: 1}); !errors.Is(err, environmenttemplates.ErrInvalidInput) {
-			t.Fatal("list silently ignored removed system packages", value, err)
+		if _, err := f.keyless.List(ctx, tenant, environmenttemplates.ListQuery{Limit: 1}); !internal(err) {
+			t.Fatal("list did not fail internally on removed system packages", value, err)
 		}
-		if _, err := f.keyed.Resolve(ctx, tenant, template.ID); !errors.Is(err, environmenttemplates.ErrInvalidInput) {
-			t.Fatal("resolve silently ignored removed system packages", value, err)
+		if _, err := f.keyed.Resolve(ctx, tenant, template.ID); !internal(err) {
+			t.Fatal("resolve did not fail internally on removed system packages", value, err)
 		}
 	}
+	store(`{"npm":["-x"],"python":[]}`)
+	if _, err := f.keyed.Resolve(ctx, tenant, template.ID); !errors.Is(err, environmenttemplates.ErrInvalidInput) {
+		t.Fatal("resolve accepted packages that fail validation", err)
+	}
 	store(`{"npm":["semver"],"python":["packaging"]}`)
 	if got, err := f.keyless.Get(ctx, tenant, template.ID); err != nil || !reflect.DeepEqual(got.Packages, v1.EnvironmentPackages{NPM: []string{"semver"}, Python: []string{"packaging"}}) {
 		t.Fatal("supported stored package managers rejected", got.Packages, err)
diff --git a/services/core/tests/integration/session_reads_fixture_test.go b/services/core/tests/integration/session_reads_fixture_test.go
index 43f097c11..6dbc04a1b 100644
--- a/services/core/tests/integration/session_reads_fixture_test.go
+++ b/services/core/tests/integration/session_reads_fixture_test.go
@@ -24,7 +24,7 @@ func FixtureEnvironmentDevice(ctx context.Context, pool *pgxpool.Pool, tenant, e
 	if err != nil {
 		return sessions.ExecutionDevice{}, err
 	}
-	lookup, err := sessionpg.DeviceLookup(tenant, current.SessionID)
+	lookup, err := sessionpg.ResourceLookup(tenant, current.SessionID)
 	if err != nil {
 		return sessions.ExecutionDevice{}, err
 	}
diff --git a/services/core/tests/integration/turn_journal_reads_test.go b/services/core/tests/integration/turn_journal_reads_test.go
index 09ee32b68..1bb705a24 100644
--- a/services/core/tests/integration/turn_journal_reads_test.go
+++ b/services/core/tests/integration/turn_journal_reads_test.go
@@ -50,7 +50,7 @@ type SubagentIdentity struct {
 // GetSubagentIdentity reads a binding in its authorized, visible Session. Only
 // tests read bindings back.
 func (s *Store) GetSubagentIdentity(ctx context.Context, tenantID, sessionID, nativeID string) (SubagentIdentity, error) {
-	p, err := sessionpg.DeviceLookup(tenantID, sessionID)
+	p, err := sessionpg.ResourceLookup(tenantID, sessionID)
 	if err != nil {
 		return SubagentIdentity{}, err
 	}

From 1074e470108d05df6b1d6a1307fe34a1b05fb80d Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 14:26:14 +0800
Subject: [PATCH 16/60] docs: point website links to openagentcore.dev (#467)

---
 README.md       | 36 ++++++++++++++++++------------------
 README.zh-CN.md | 36 ++++++++++++++++++------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 6277909fd..5713ac292 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 An open-source, self-hosted implementation of the OpenAI Agents API with multiple native harnesses.
 
-[Website](https://minimax-ai.github.io/OpenAgentCore/) · [Install](#install) · [Call the API](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/quickstart) · [Documentation](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/) · [Contributing](CONTRIBUTING.md)
+[Website](https://openagentcore.dev/) · [Install](#install) · [Call the API](https://openagentcore.dev/docs/getting-started/quickstart) · [Documentation](https://openagentcore.dev/docs/getting-started/) · [Contributing](CONTRIBUTING.md)
 
 **English** · [简体中文](README.zh-CN.md)
 
@@ -17,9 +17,9 @@ An open-source, self-hosted implementation of the OpenAI Agents API with multipl
 OpenAgentCore runs AI agents on your own infrastructure behind the [OpenAI Agents API](https://developers.openai.com/api/docs/guides/agents-api/overview).
 
 - **Same API as OpenAI.** Point the [OpenAI Agent API](https://developers.openai.com/api/docs/guides/agents/sdk), or plain HTTP, at your installation. No new client to learn.
-- **Your choice of agent.** Each [Session](https://minimax-ai.github.io/OpenAgentCore/docs/api/public-agent-api) runs a [native harness](https://minimax-ai.github.io/OpenAgentCore/contracts/agents-api/harness-onboarding): [Codex](https://github.com/openai/codex), [Claude Code](https://code.claude.com/docs/en/overview) or [MiniMax Code](https://github.com/MiniMax-AI/minimax-code), with the [model provider you configure](https://minimax-ai.github.io/OpenAgentCore/contracts/agents-api/model-execution).
-- **Your choice of machine.** Agents work in a [managed sandbox](https://minimax-ai.github.io/OpenAgentCore/contracts/agents-api/sandbox-deployment) ([Docker](https://www.docker.com/), [microsandbox](https://github.com/zerocore-ai/microsandbox) or [E2B](https://e2b.dev/)), or on your own Linux, macOS or Windows machine.
-- **Every part is replaceable.** [Sandboxes](https://minimax-ai.github.io/OpenAgentCore/docs/sandbox-provider), [harnesses](https://minimax-ai.github.io/OpenAgentCore/contracts/agents-api/harness-onboarding) and [model providers](https://minimax-ai.github.io/OpenAgentCore/contracts/agents-api/model-execution) plug in through [defined protocols](AGENTS.md#protocols-at-every-boundary).
+- **Your choice of agent.** Each [Session](https://openagentcore.dev/docs/api/public-agent-api) runs a [native harness](https://openagentcore.dev/contracts/agents-api/harness-onboarding): [Codex](https://github.com/openai/codex), [Claude Code](https://code.claude.com/docs/en/overview) or [MiniMax Code](https://github.com/MiniMax-AI/minimax-code), with the [model provider you configure](https://openagentcore.dev/contracts/agents-api/model-execution).
+- **Your choice of machine.** Agents work in a [managed sandbox](https://openagentcore.dev/contracts/agents-api/sandbox-deployment) ([Docker](https://www.docker.com/), [microsandbox](https://github.com/zerocore-ai/microsandbox) or [E2B](https://e2b.dev/)), or on your own Linux, macOS or Windows machine.
+- **Every part is replaceable.** [Sandboxes](https://openagentcore.dev/docs/sandbox-provider), [harnesses](https://openagentcore.dev/contracts/agents-api/harness-onboarding) and [model providers](https://openagentcore.dev/contracts/agents-api/model-execution) plug in through [defined protocols](AGENTS.md#protocols-at-every-boundary).
 
 ## How it fits together
 
@@ -29,10 +29,10 @@ Applications and operators use these Core APIs:
 
 | API | Path | Used by |
 | --- | --- | --- |
-| **[Agents API](https://minimax-ai.github.io/OpenAgentCore/docs/api/public-agent-api)** | `/v1` | Your applications. Same protocol as [OpenAI's Agents API](https://developers.openai.com/api/docs/guides/agents-api/overview) |
-| **[Core API](https://minimax-ai.github.io/OpenAgentCore/contracts/agents-api/admin-api)** | `/core/v1` | Operators, through Web |
+| **[Agents API](https://openagentcore.dev/docs/api/public-agent-api)** | `/v1` | Your applications. Same protocol as [OpenAI's Agents API](https://developers.openai.com/api/docs/guides/agents-api/overview) |
+| **[Core API](https://openagentcore.dev/contracts/agents-api/admin-api)** | `/core/v1` | Operators, through Web |
 
-Core keeps durable execution state. The Runtime runs the chosen harness inside the Environment. Each connection is a defined protocol, so any part can be replaced on its own. See the [architecture guide](https://minimax-ai.github.io/OpenAgentCore/docs/architecture).
+Core keeps durable execution state. The Runtime runs the chosen harness inside the Environment. Each connection is a defined protocol, so any part can be replaced on its own. See the [architecture guide](https://openagentcore.dev/docs/architecture).
 
 ## Screenshots
 
@@ -53,20 +53,20 @@ Then:
 1. **Sign in to Web**, the admin console, with the Core key the installer created, and **configure the domain and HTTPS**.
 2. **Set a default model** and **issue a Project API key**.
 3. **Add execution capacity:** a node, E2B, or your own machine.
-4. **[Run your first Session](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/quickstart)** with the OpenAI SDK.
+4. **[Run your first Session](https://openagentcore.dev/docs/getting-started/quickstart)** with the OpenAI SDK.
 
-The [installation guide](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/install) covers each step, HTTPS and a quick local trial. Listen addresses, ports and other options: [installation options](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/install-options).
+The [installation guide](https://openagentcore.dev/docs/getting-started/install) covers each step, HTTPS and a quick local trial. Listen addresses, ports and other options: [installation options](https://openagentcore.dev/docs/getting-started/install-options).
 
 ## Documentation
 
 | I want to | Start with |
 | --- | --- |
-| Install and operate an installation | [Installation](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/install), then [operations](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/operations) |
-| Build an application on the API | [Quickstart](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/quickstart), then the [Agents API guide](https://minimax-ai.github.io/OpenAgentCore/docs/api/public-agent-api) |
-| See a complete application | [Examples](https://minimax-ai.github.io/OpenAgentCore/docs/examples) |
-| Run agents on my own machine | [Self-hosted execution](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/self-hosted) |
-| Check Harness capabilities and limits | [Harness capabilities](https://minimax-ai.github.io/OpenAgentCore/contracts/agents-api/harness-capabilities) |
-| Understand the design | [Architecture](https://minimax-ai.github.io/OpenAgentCore/docs/architecture) |
-| Add a sandbox, harness or other component | [Developer guide](https://minimax-ai.github.io/OpenAgentCore/docs/development) |
-
-All pages: [documentation index](https://minimax-ai.github.io/OpenAgentCore/docs/getting-started/). Before changing code, read the [contributor rules](CONTRIBUTING.md).
+| Install and operate an installation | [Installation](https://openagentcore.dev/docs/getting-started/install), then [operations](https://openagentcore.dev/docs/getting-started/operations) |
+| Build an application on the API | [Quickstart](https://openagentcore.dev/docs/getting-started/quickstart), then the [Agents API guide](https://openagentcore.dev/docs/api/public-agent-api) |
+| See a complete application | [Examples](https://openagentcore.dev/docs/examples) |
+| Run agents on my own machine | [Self-hosted execution](https://openagentcore.dev/docs/getting-started/self-hosted) |
+| Check Harness capabilities and limits | [Harness capabilities](https://openagentcore.dev/contracts/agents-api/harness-capabilities) |
+| Understand the design | [Architecture](https://openagentcore.dev/docs/architecture) |
+| Add a sandbox, harness or other component | [Developer guide](https://openagentcore.dev/docs/development) |
+
+All pages: [documentation index](https://openagentcore.dev/docs/getting-started/). Before changing code, read the [contributor rules](CONTRIBUTING.md).
diff --git a/README.zh-CN.md b/README.zh-CN.md
index b2d5f42a9..5414cea3c 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -6,7 +6,7 @@
 
 OpenAI Agents API 的开源实现，支持多种原生执行引擎，可部署在自己的基础设施上。
 
-[官网](https://minimax-ai.github.io/OpenAgentCore/zh/) · [安装](#安装) · [调用 API](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/quickstart) · [文档](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/) · [参与贡献](CONTRIBUTING.md)
+[官网](https://openagentcore.dev/zh/) · [安装](#安装) · [调用 API](https://openagentcore.dev/zh/docs/getting-started/quickstart) · [文档](https://openagentcore.dev/zh/docs/getting-started/) · [参与贡献](CONTRIBUTING.md)
 
 [English](README.md) · **简体中文**
 
@@ -20,19 +20,19 @@ OpenAI Agents API 的开源实现，支持多种原生执行引擎，可部署
 
 | API | 路径 | 调用方 |
 | --- | --- | --- |
-| **[Agents API](https://minimax-ai.github.io/OpenAgentCore/zh/docs/api/public-agent-api)** | `/v1` | 你的应用，与 [OpenAI 的 Agents API](https://developers.openai.com/api/docs/guides/agents-api/overview) 协议一致 |
-| **[Core API](https://minimax-ai.github.io/OpenAgentCore/zh/contracts/agents-api/admin-api)** | `/core/v1` | 管理员，通过 Web 调用 |
+| **[Agents API](https://openagentcore.dev/zh/docs/api/public-agent-api)** | `/v1` | 你的应用，与 [OpenAI 的 Agents API](https://developers.openai.com/api/docs/guides/agents-api/overview) 协议一致 |
+| **[Core API](https://openagentcore.dev/zh/contracts/agents-api/admin-api)** | `/core/v1` | 管理员，通过 Web 调用 |
 
-持久化执行状态由 Core 保存；Runtime 在 Environment 中运行所选 Harness。各部件之间都通过既定协议连接， 任何一个都可以单独替换。详见[架构说明](https://minimax-ai.github.io/OpenAgentCore/zh/docs/architecture)。
+持久化执行状态由 Core 保存；Runtime 在 Environment 中运行所选 Harness。各部件之间都通过既定协议连接， 任何一个都可以单独替换。详见[架构说明](https://openagentcore.dev/zh/docs/architecture)。
 
 ## 这是什么
 
 OpenAgentCore 在你自己的基础设施上运行 AI Agent，对外提供 [OpenAI Agents API](https://developers.openai.com/api/docs/guides/agents-api/overview)。
 
 - **与 OpenAI 相同的 API。** [官方 OpenAI SDK](https://developers.openai.com/api/docs/guides/agents/sdk) 或直接 HTTP 调用，改一下地址即可，无需学习新客户端。
-- **自选 Agent。** 每个 [Session](https://minimax-ai.github.io/OpenAgentCore/zh/docs/api/public-agent-api) 运行一个[原生 Harness](https://minimax-ai.github.io/OpenAgentCore/zh/contracts/agents-api/harness-onboarding)：[Codex](https://github.com/openai/codex)、[Claude Code](https://code.claude.com/docs/en/overview) 或 [MiniMax Code](https://github.com/MiniMax-AI/minimax-code)， 使用[你配置的模型供应商](https://minimax-ai.github.io/OpenAgentCore/zh/contracts/agents-api/model-execution)。
-- **自选机器。** Agent 可以在[托管沙箱](https://minimax-ai.github.io/OpenAgentCore/zh/contracts/agents-api/sandbox-deployment)（[Docker](https://www.docker.com/)、[microsandbox](https://github.com/zerocore-ai/microsandbox) 或 [E2B](https://e2b.dev/)）里工作， 也可以在你自己的 Linux、macOS 或 Windows 机器上工作。
-- **每个部件都可替换。** [沙箱](https://minimax-ai.github.io/OpenAgentCore/zh/docs/sandbox-provider)、[Harness](https://minimax-ai.github.io/OpenAgentCore/zh/contracts/agents-api/harness-onboarding) 和[模型供应商](https://minimax-ai.github.io/OpenAgentCore/zh/contracts/agents-api/model-execution)都通过[既定协议](AGENTS.md#protocols-at-every-boundary)接入。
+- **自选 Agent。** 每个 [Session](https://openagentcore.dev/zh/docs/api/public-agent-api) 运行一个[原生 Harness](https://openagentcore.dev/zh/contracts/agents-api/harness-onboarding)：[Codex](https://github.com/openai/codex)、[Claude Code](https://code.claude.com/docs/en/overview) 或 [MiniMax Code](https://github.com/MiniMax-AI/minimax-code)， 使用[你配置的模型供应商](https://openagentcore.dev/zh/contracts/agents-api/model-execution)。
+- **自选机器。** Agent 可以在[托管沙箱](https://openagentcore.dev/zh/contracts/agents-api/sandbox-deployment)（[Docker](https://www.docker.com/)、[microsandbox](https://github.com/zerocore-ai/microsandbox) 或 [E2B](https://e2b.dev/)）里工作， 也可以在你自己的 Linux、macOS 或 Windows 机器上工作。
+- **每个部件都可替换。** [沙箱](https://openagentcore.dev/zh/docs/sandbox-provider)、[Harness](https://openagentcore.dev/zh/contracts/agents-api/harness-onboarding) 和[模型供应商](https://openagentcore.dev/zh/contracts/agents-api/model-execution)都通过[既定协议](AGENTS.md#protocols-at-every-boundary)接入。
 
 ## 界面预览
 
@@ -53,20 +53,20 @@ curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/
 1. 用安装器生成的 Core key **登录 Web**（管理控制台），并**配置域名和 HTTPS**。
 2. **设置默认模型**，并**签发 Project API key**。
 3. **添加执行资源**：节点、E2B，或你自己的机器。
-4. 用 OpenAI SDK **[运行第一个 Session](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/quickstart)**。
+4. 用 OpenAI SDK **[运行第一个 Session](https://openagentcore.dev/zh/docs/getting-started/quickstart)**。
 
-[安装指南](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/install)详细介绍每一步，以及 HTTPS 配置和本地快速试用。监听地址、端口等参数见[安装配置选项](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/install-options)。
+[安装指南](https://openagentcore.dev/zh/docs/getting-started/install)详细介绍每一步，以及 HTTPS 配置和本地快速试用。监听地址、端口等参数见[安装配置选项](https://openagentcore.dev/zh/docs/getting-started/install-options)。
 
 ## 文档
 
 | 我想要 | 从这里开始 |
 | --- | --- |
-| 安装并运维 | [安装指南](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/install)，然后看[运维](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/operations) |
-| 基于 API 开发应用 | [快速开始](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/quickstart)，然后看 [Agents API 指南](https://minimax-ai.github.io/OpenAgentCore/zh/docs/api/public-agent-api) |
-| 看一个完整的应用 | [示例](https://minimax-ai.github.io/OpenAgentCore/zh/docs/examples) |
-| 在自己的机器上运行 Agent | [自托管执行](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/self-hosted) |
-| 查看 Harness 能力和限制 | [Harness 能力](https://minimax-ai.github.io/OpenAgentCore/zh/contracts/agents-api/harness-capabilities) |
-| 了解设计 | [架构说明](https://minimax-ai.github.io/OpenAgentCore/zh/docs/architecture) |
-| 接入新的沙箱、Harness 或其他组件 | [开发指南](https://minimax-ai.github.io/OpenAgentCore/zh/docs/development) |
-
-全部文档见[文档目录](https://minimax-ai.github.io/OpenAgentCore/zh/docs/getting-started/)。修改代码前请阅读[贡献规范](CONTRIBUTING.md)。
+| 安装并运维 | [安装指南](https://openagentcore.dev/zh/docs/getting-started/install)，然后看[运维](https://openagentcore.dev/zh/docs/getting-started/operations) |
+| 基于 API 开发应用 | [快速开始](https://openagentcore.dev/zh/docs/getting-started/quickstart)，然后看 [Agents API 指南](https://openagentcore.dev/zh/docs/api/public-agent-api) |
+| 看一个完整的应用 | [示例](https://openagentcore.dev/zh/docs/examples) |
+| 在自己的机器上运行 Agent | [自托管执行](https://openagentcore.dev/zh/docs/getting-started/self-hosted) |
+| 查看 Harness 能力和限制 | [Harness 能力](https://openagentcore.dev/zh/contracts/agents-api/harness-capabilities) |
+| 了解设计 | [架构说明](https://openagentcore.dev/zh/docs/architecture) |
+| 接入新的沙箱、Harness 或其他组件 | [开发指南](https://openagentcore.dev/zh/docs/development) |
+
+全部文档见[文档目录](https://openagentcore.dev/zh/docs/getting-started/)。修改代码前请阅读[贡献规范](CONTRIBUTING.md)。

From da97031bb304a35c94de8252f6793cb14dd51a90 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 14:32:42 +0800
Subject: [PATCH 17/60] Drop unsent Harness options and reject prompts without
 an environment (#468)

Core sends only model, system_prompt, model_provider and harness_config
in agent_options. Delete the adapter keys no Core path produces: codex
override_system_prompt, reasoning_summary, mode, mcp_servers,
enable_features, disable_features, skills and the controls copied into
web_search/model_verbosity; mcode mode, override_system_prompt, skills,
plugins and mcp_servers. Codex reads ExecutionControls directly. The
managed Skill installer, the Runtime capability-download and skill-upload
wrappers, the Runtime capability-context flags and the no-op feature
preference removals go with them.

Dispatch now rejects any other agent_options key, and an execution
preparation with neither or both of local_environment and
disable_execution_environment, with unsupported_configuration before a
factory runs. claude_sdk's own unknown-key branch is unreachable and
removed. agent.ManagedSkillsRoot becomes StateDir, its only remaining
use.
---
 .../internal/agent/claudesdk/options.go       |   2 -
 .../internal/agent/claudesdk/session_test.go  |   4 +-
 .../agent/claudesdk/workspace_test.go         |   4 +-
 .../internal/agent/codex/declaration.go       |   2 +-
 .../internal/agent/codex/declaration_test.go  |   2 +-
 .../agent/codex/execution_controls.go         |  26 -
 .../agent/codex/execution_controls_test.go    |  31 +-
 .../internal/agent/codex/generation_config.go |  17 -
 .../agent/codex/harness_config_test.go        |   6 +-
 .../daemon/internal/agent/codex/mcp_config.go |  24 +-
 .../internal/agent/codex/mcp_config_test.go   |  17 +-
 apps/daemon/internal/agent/codex/mcp_http.go  |   1 -
 .../agent/codex/mcp_http_bearer_test.go       |   2 +-
 .../agent/codex/mcp_http_preflight.go         |   3 +-
 .../internal/agent/codex/mcp_http_test.go     |  15 +-
 .../internal/agent/codex/model_route_test.go  |   4 +-
 .../agent/codex/model_verbosity_test.go       |   4 +-
 apps/daemon/internal/agent/codex/options.go   | 203 +-------
 .../internal/agent/codex/options_test.go      | 162 +-----
 .../agent/codex/permission_profile.go         |   6 +-
 .../internal/agent/codex/preparation.go       |   1 -
 .../agent/codex/preparation_helpers_test.go   |   3 +-
 .../agent/codex/programmatic_tools.go         |   1 -
 .../agent/codex/programmatic_tools_test.go    |   9 +-
 apps/daemon/internal/agent/codex/protocol.go  |   5 +-
 .../agent/codex/protocol_wire_test.go         |   6 +-
 .../agent/codex/provider_config_test.go       |   6 +-
 .../internal/agent/codex/session_plan.go      |  28 +-
 .../agent/codex/session_policy_test.go        |   2 +-
 .../internal/agent/codex/session_run.go       |  32 +-
 .../codex/session_steering_lifecycle_test.go  |   2 +-
 apps/daemon/internal/agent/codex/skills.go    |  23 -
 .../internal/agent/codex/skills_test.go       |  24 -
 .../internal/agent/codex/subagent_profile.go  |   6 +-
 .../agent/codex/subagent_profile_test.go      |   2 +-
 apps/daemon/internal/agent/codex/subagents.go |   3 +-
 .../internal/agent/codex/subagents_test.go    |  12 +-
 .../internal/agent/codex/verbosity_test.go    |  33 --
 .../internal/agent/codex/web_search_test.go   |  33 --
 apps/daemon/internal/agent/harness.go         |  17 +-
 .../internal/agent/managedskills/archive.go   | 289 -----------
 .../agent/managedskills/archive_test.go       | 486 ------------------
 .../agent/managedskills/concurrency_test.go   | 144 ------
 .../internal/agent/managedskills/skills.go    | 237 ---------
 .../agent/managedskills/skills_test.go        | 165 ------
 .../internal/agent/mcode/declaration.go       |   3 +-
 .../internal/agent/mcode/declaration_test.go  |   2 +-
 .../agent/mcode/environment_mcp_test.go       |   8 +-
 apps/daemon/internal/agent/mcode/execution.go |  10 +-
 .../internal/agent/mcode/execution_test.go    |   4 +-
 apps/daemon/internal/agent/mcode/executor.go  |   4 +-
 .../agent/mcode/harness_config_test.go        |   5 +-
 .../agent/mcode/model_provider_test.go        |   8 +-
 .../internal/agent/mcode/native_test.go       |  94 +---
 apps/daemon/internal/agent/mcode/options.go   | 120 +----
 .../internal/agent/mcode/options_test.go      |  29 +-
 apps/daemon/internal/agent/mcode/session.go   |   2 +-
 .../agent/mcode/tool_environment_test.go      |   4 +-
 apps/daemon/internal/agent/mcode/workspace.go |   5 +-
 .../agent/mcode/workspace_network_test.go     |   2 +-
 .../agent/mcode/workspace_skills_test.go      |   2 +-
 apps/daemon/internal/agent/runtime_paths.go   |  14 +-
 .../internal/agent/runtime_paths_test.go      |  16 +-
 .../daemon/internal/cli/agent_registration.go |  11 +-
 .../internal/cli/capability_downloads.go      |  85 ---
 .../internal/cli/capability_downloads_test.go | 115 -----
 .../cli/claude_sdk_live_linux_test.go         |   2 +-
 apps/daemon/internal/cli/companion_path.go    |  18 +
 apps/daemon/internal/cli/connect.go           |   2 +-
 .../internal/cli/native_discovery_test.go     |   2 +-
 apps/daemon/internal/cli/preparation_test.go  |   2 +-
 apps/daemon/internal/cli/skill_upload.go      |  44 --
 apps/daemon/internal/cli/skill_upload_test.go |  41 --
 apps/daemon/internal/dispatch/environment.go  |   3 +
 apps/daemon/internal/dispatch/executor.go     |   2 +-
 .../daemon/internal/dispatch/executor_test.go |  19 +
 contracts/agents-api/harness-onboarding.md    |   2 +-
 contracts/agents-api/zh/harness-onboarding.md |   4 +-
 docs/runtime-protocol.md                      |   3 +
 docs/zh/runtime-protocol.md                   |   5 +-
 internal/agentdaemon/proto/outbound.go        |  24 +-
 packages/claude-sdk-adapter/README.md         |   2 +-
 scripts/name-allowlist.json                   |  25 +-
 services/core/deploy/codex/README.md          |   6 +-
 84 files changed, 258 insertions(+), 2595 deletions(-)
 delete mode 100644 apps/daemon/internal/agent/codex/execution_controls.go
 delete mode 100644 apps/daemon/internal/agent/codex/generation_config.go
 delete mode 100644 apps/daemon/internal/agent/codex/verbosity_test.go
 delete mode 100644 apps/daemon/internal/agent/codex/web_search_test.go
 delete mode 100644 apps/daemon/internal/agent/managedskills/archive.go
 delete mode 100644 apps/daemon/internal/agent/managedskills/archive_test.go
 delete mode 100644 apps/daemon/internal/agent/managedskills/concurrency_test.go
 delete mode 100644 apps/daemon/internal/agent/managedskills/skills.go
 delete mode 100644 apps/daemon/internal/agent/managedskills/skills_test.go
 delete mode 100644 apps/daemon/internal/cli/capability_downloads.go
 delete mode 100644 apps/daemon/internal/cli/capability_downloads_test.go
 create mode 100644 apps/daemon/internal/cli/companion_path.go
 delete mode 100644 apps/daemon/internal/cli/skill_upload.go
 delete mode 100644 apps/daemon/internal/cli/skill_upload_test.go

diff --git a/apps/daemon/internal/agent/claudesdk/options.go b/apps/daemon/internal/agent/claudesdk/options.go
index 5f9bae245..47c1ac3e1 100644
--- a/apps/daemon/internal/agent/claudesdk/options.go
+++ b/apps/daemon/internal/agent/claudesdk/options.go
@@ -135,8 +135,6 @@ func prepareConfiguration(config Config, req proto.PromptRequestPayload) (startR
 			start.Model = value
 		case "system_prompt":
 			start.SystemPrompt = value
-		default:
-			return fail("unsupported option: " + name)
 		}
 	}
 	if strings.TrimSpace(start.Model) == "" {
diff --git a/apps/daemon/internal/agent/claudesdk/session_test.go b/apps/daemon/internal/agent/claudesdk/session_test.go
index c1808a754..3ea42c618 100644
--- a/apps/daemon/internal/agent/claudesdk/session_test.go
+++ b/apps/daemon/internal/agent/claudesdk/session_test.go
@@ -74,7 +74,7 @@ func TestTextFactoryCompletionAndFailures(t *testing.T) {
 }
 
 func TestTextFactoryRejectsUnsupportedInput(t *testing.T) {
-	for _, kind := range []string{"execution-controls", "tool", "option", "outside"} {
+	for _, kind := range []string{"execution-controls", "tool", "outside"} {
 		t.Run(kind, func(t *testing.T) {
 			root := t.TempDir()
 			t.Setenv("OAC_RUNTIME_HOME", root)
@@ -85,8 +85,6 @@ func TestTextFactoryRejectsUnsupportedInput(t *testing.T) {
 				request.ExecutionControls = &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "low"}
 			case "tool":
 				request.FunctionTools = []proto.FunctionTool{{}}
-			case "option":
-				request.AgentOptions["allowed_tools"] = "anything"
 			case "outside":
 				config.StateDir = filepath.Dir(root)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_test.go b/apps/daemon/internal/agent/claudesdk/workspace_test.go
index b84b767a7..2dab86f61 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_test.go
@@ -76,7 +76,7 @@ func TestWorkspaceTrustedBindingAndEnvironment(t *testing.T) {
 }
 
 func TestWorkspaceRejectsConflictsBeforeSideEffects(t *testing.T) {
-	for _, name := range []string{"none", "workspace-root", "mcp", "caller-policy", "relative", "missing", "ambient-setting", "duplicate-env", "bad-env"} {
+	for _, name := range []string{"none", "workspace-root", "mcp", "relative", "missing", "ambient-setting", "duplicate-env", "bad-env"} {
 		t.Run(name, func(t *testing.T) {
 			config := workspaceFixture(t)
 			req := workspaceRequest()
@@ -88,8 +88,6 @@ func TestWorkspaceRejectsConflictsBeforeSideEffects(t *testing.T) {
 				req.LocalEnvironment = &proto.LocalEnvironment{ID: "environment", NetworkAccess: "enabled", WorkspaceRoot: config.Workspace.ScratchDir}
 			case "mcp":
 				req.MCPHTTPServers = &[]proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "remote", ServerURL: "https://example.test/mcp"}}
-			case "caller-policy":
-				req.AgentOptions["workspace"] = "override"
 			case "relative":
 				config.Workspace.Directory = "relative"
 			case "missing":
diff --git a/apps/daemon/internal/agent/codex/declaration.go b/apps/daemon/internal/agent/codex/declaration.go
index 2c962fe2c..ea6bfab51 100644
--- a/apps/daemon/internal/agent/codex/declaration.go
+++ b/apps/daemon/internal/agent/codex/declaration.go
@@ -51,7 +51,7 @@ func discover(ctx context.Context, options agent.DiscoveryOptions, info proto.Su
 	return discoverWithCheck(ctx, options, info, CheckCLIAvailable)
 }
 func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, info proto.SupportedAgentKind, check func(context.Context, string) (string, error)) *agent.Runtime {
-	runtime := &agent.Runtime{Info: info, Session: Factory, SessionCapabilityContext: true, ExecutorCapabilityContext: true}
+	runtime := &agent.Runtime{Info: info, Session: Factory}
 	ctx, cancel := context.WithTimeout(parent, 15*time.Second)
 	defer cancel()
 	version, err := check(ctx, "")
diff --git a/apps/daemon/internal/agent/codex/declaration_test.go b/apps/daemon/internal/agent/codex/declaration_test.go
index 652c5cc1e..d3a364b97 100644
--- a/apps/daemon/internal/agent/codex/declaration_test.go
+++ b/apps/daemon/internal/agent/codex/declaration_test.go
@@ -15,7 +15,7 @@ func TestMCPRequiredDiscoveryRequiresPinnedNative(t *testing.T) {
 	for _, version := range []string{"codex-cli 0.153.4", "codex-cli 0.153.3", "codex-cli 0.154.0"} {
 		runtime := discoverWithCheck(t.Context(), agent.DiscoveryOptions{Stdout: io.Discard, Stderr: io.Discard}, Declaration.Info, func(context.Context, string) (string, error) { return version, nil })
 
-		if !runtime.Info.Available || runtime.Executor == nil || (runtime.Preparation != nil) != SupportsLocalEnvironment(version) || !runtime.SessionCapabilityContext || !runtime.ExecutorCapabilityContext {
+		if !runtime.Info.Available || runtime.Executor == nil || (runtime.Preparation != nil) != SupportsLocalEnvironment(version) {
 			t.Fatalf("factories: %+v", runtime)
 		}
 		if runtime.Info.Capabilities.MCPHTTPRequired.IsSupported() != (version == "codex-cli 0.153.4") {
diff --git a/apps/daemon/internal/agent/codex/execution_controls.go b/apps/daemon/internal/agent/codex/execution_controls.go
deleted file mode 100644
index 1ffde7adf..000000000
--- a/apps/daemon/internal/agent/codex/execution_controls.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package codex
-
-import (
-	"maps"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func executionOptions(req proto.PromptRequestPayload) map[string]any {
-	if req.ExecutionControls == nil && req.MCPHTTPServers == nil {
-		return req.AgentOptions
-	}
-	options := maps.Clone(req.AgentOptions)
-	if options == nil {
-		options = make(map[string]any)
-	}
-	if req.ExecutionControls != nil {
-		// Reuse native validation/catalog handling, overriding lower-priority operator options.
-		options["web_search"] = req.ExecutionControls.WebSearch
-		options["model_verbosity"] = req.ExecutionControls.TextVerbosity
-	}
-	if req.MCPHTTPServers != nil {
-		delete(options, "mcp_servers")
-	}
-	return options
-}
diff --git a/apps/daemon/internal/agent/codex/execution_controls_test.go b/apps/daemon/internal/agent/codex/execution_controls_test.go
index b1cd9eac9..65f8a058f 100644
--- a/apps/daemon/internal/agent/codex/execution_controls_test.go
+++ b/apps/daemon/internal/agent/codex/execution_controls_test.go
@@ -7,36 +7,18 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func TestExecutionControlsOverrideWithoutMutatingNativeOptions(t *testing.T) {
+func TestExecutionControlsSelectNativeSettings(t *testing.T) {
 	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-	original := map[string]any{"model": "test-model", "web_search": "live", "model_verbosity": "high"}
-	request := proto.PromptRequestPayload{AgentOptions: original}
-	if got := executionOptions(request); !reflect.DeepEqual(got, original) {
-		t.Fatal("ordinary options changed")
-	}
 	for _, search := range []string{"disabled", "cached", "live"} {
 		for _, verbosity := range []string{"low", "medium", "high"} {
-			request.ExecutionControls = &proto.ExecutionControls{WebSearch: search, TextVerbosity: verbosity}
-			options := executionOptions(request)
-			if options["model"] != "test-model" || original["web_search"] != "live" || original["model_verbosity"] != "high" {
-				t.Fatal("operator options mutated")
-			}
-			plan, err := BuildSessionPlan("run", "state", options)
+			plan, err := BuildSessionPlan("state", map[string]any{"model": "test-model"}, &proto.ExecutionControls{WebSearch: search, TextVerbosity: verbosity})
 			if err != nil {
 				t.Fatal(err)
 			}
-			want := map[string]string{"web_search": `"` + search + `"`, "model_verbosity": `"` + verbosity + `"`}
-			for _, kv := range plan.ExtraConfig {
-				if v, ok := want[kv[0]]; ok {
-					if kv[1] != v {
-						t.Fatal("native control differs", kv)
-					}
-					delete(want, kv[0])
-				}
-			}
 			plan.Cleanup()
-			if len(want) != 0 {
-				t.Fatal("native settings omitted", want)
+			want := [][2]string{{"web_search", `"` + search + `"`}, {"model_verbosity", `"` + verbosity + `"`}}
+			if !reflect.DeepEqual(plan.ExtraConfig, want) {
+				t.Fatalf("config = %v, want %v", plan.ExtraConfig, want)
 			}
 		}
 	}
@@ -48,8 +30,7 @@ func TestExecutionControlsRejectIncompleteOrInvalidValues(t *testing.T) {
 		{}, {WebSearch: "disabled"}, {TextVerbosity: "medium"},
 		{WebSearch: "invalid", TextVerbosity: "medium"}, {WebSearch: "disabled", TextVerbosity: "invalid"},
 	} {
-		options := executionOptions(proto.PromptRequestPayload{ExecutionControls: &controls})
-		if plan, err := BuildSessionPlan("run", "state", options); err == nil {
+		if plan, err := BuildSessionPlan("state", nil, &controls); err == nil {
 			plan.Cleanup()
 			t.Fatal("invalid controls accepted", controls)
 		}
diff --git a/apps/daemon/internal/agent/codex/generation_config.go b/apps/daemon/internal/agent/codex/generation_config.go
deleted file mode 100644
index 8cce97fbf..000000000
--- a/apps/daemon/internal/agent/codex/generation_config.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package codex
-
-func extraConfigFromOpts(opts map[string]any) [][2]string {
-	var out [][2]string
-	if rs := stringOpt(opts, "reasoning_summary"); rs != "" {
-		// codex app-server has no per-call flag; route via -c override.
-		// TOML literal — quoted string keeps shell-safe special chars.
-		out = append(out, [2]string{"model_reasoning_summary", strconv(rs)})
-	}
-	if mode := stringOpt(opts, "web_search"); mode != "" {
-		out = append(out, [2]string{"web_search", strconv(mode)})
-	}
-	if verbosity := stringOpt(opts, "model_verbosity"); verbosity != "" {
-		out = append(out, [2]string{"model_verbosity", strconv(verbosity)})
-	}
-	return out
-}
diff --git a/apps/daemon/internal/agent/codex/harness_config_test.go b/apps/daemon/internal/agent/codex/harness_config_test.go
index 1efa79cc5..cd3577d3c 100644
--- a/apps/daemon/internal/agent/codex/harness_config_test.go
+++ b/apps/daemon/internal/agent/codex/harness_config_test.go
@@ -13,10 +13,10 @@ import (
 
 func TestHarnessConfigAppliedWithoutChangingProvider(t *testing.T) {
 	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-	plan, err := BuildSessionPlan("run", "native-config", map[string]any{
+	plan, err := BuildSessionPlan("native-config", map[string]any{
 		"model": "fixture", "harness_config": map[string]any{"model_reasoning_effort": "high"},
 		"model_provider": map[string]any{"base_url": "https://provider.invalid/v1", "protocol": "responses", "api_key": "test-key"},
-	})
+	}, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -27,7 +27,7 @@ func TestHarnessConfigAppliedWithoutChangingProvider(t *testing.T) {
 }
 
 func TestHarnessConfigConflictFailsBeforePreparation(t *testing.T) {
-	_, err := BuildSessionPlan("run", "", map[string]any{"harness_config": map[string]any{"model_provider": "bypass"}})
+	_, err := BuildSessionPlan("", map[string]any{"harness_config": map[string]any{"model_provider": "bypass"}}, nil)
 	if err != harnessconfig.ErrHarnessConfig {
 		t.Fatalf("configuration must fail before filesystem preparation: %v", err)
 	}
diff --git a/apps/daemon/internal/agent/codex/mcp_config.go b/apps/daemon/internal/agent/codex/mcp_config.go
index aac6309cb..653726a43 100644
--- a/apps/daemon/internal/agent/codex/mcp_config.go
+++ b/apps/daemon/internal/agent/codex/mcp_config.go
@@ -8,17 +8,14 @@ import (
 	"strings"
 )
 
-// mcpServerConfig is the daemon-internal MCP server config flattened
-// from agent_options["mcp_servers"] (rendered by render.TargetCodex /
-// the mcpServers JSON shape). Written into <CODEX_HOME>/config.toml
+// mcpServerConfig is the daemon-internal MCP server config resolved from
+// the request's MCP bindings. Written into <CODEX_HOME>/config.toml
 // before spawning the app-server child.
 type mcpServerConfig struct {
 	Name              string
 	URL               string
-	Headers           map[string]string
 	Command           string
 	Args              []string
-	Env               map[string]string
 	EnabledTools      *[]string
 	Required          bool
 	BearerTokenEnvVar string
@@ -76,7 +73,6 @@ func writeCodexMCPConfig(codexHome string, servers map[string]mcpServerConfig) e
 				}
 				b.WriteString("]\n")
 			}
-			writeMCPHeaderMap(&b, "http_headers", srv.Headers)
 			writeMCPHeaderMap(&b, "env_http_headers", srv.EnvHTTPHeaders)
 			b.WriteByte('\n')
 			continue
@@ -94,22 +90,6 @@ func writeCodexMCPConfig(codexHome string, servers map[string]mcpServerConfig) e
 			}
 			b.WriteString("]\n")
 		}
-		if len(srv.Env) > 0 {
-			envKeys := make([]string, 0, len(srv.Env))
-			for k := range srv.Env {
-				envKeys = append(envKeys, k)
-			}
-			sort.Strings(envKeys)
-			b.WriteString("\n[mcp_servers.")
-			b.WriteString(tomlQuoteString(name))
-			b.WriteString(".env]\n")
-			for _, k := range envKeys {
-				b.WriteString(tomlQuoteString(k))
-				b.WriteString(" = ")
-				b.WriteString(tomlQuoteString(srv.Env[k]))
-				b.WriteByte('\n')
-			}
-		}
 		b.WriteByte('\n')
 	}
 
diff --git a/apps/daemon/internal/agent/codex/mcp_config_test.go b/apps/daemon/internal/agent/codex/mcp_config_test.go
index 499733029..c55ca481a 100644
--- a/apps/daemon/internal/agent/codex/mcp_config_test.go
+++ b/apps/daemon/internal/agent/codex/mcp_config_test.go
@@ -33,14 +33,13 @@ func TestWriteCodexMCPConfig_DeterministicOrdering(t *testing.T) {
 	}
 }
 
-func TestWriteCodexMCPConfig_EmitsCommandArgsEnv(t *testing.T) {
+func TestWriteCodexMCPConfig_EmitsCommandArgs(t *testing.T) {
 	dir := t.TempDir()
 	servers := map[string]mcpServerConfig{
 		"docs": {
 			Name:    "docs",
 			Command: "docs-server",
 			Args:    []string{"--port", "8080"},
-			Env:     map[string]string{"DOCS_TOKEN": "secret"},
 		},
 	}
 	if err := writeCodexMCPConfig(dir, servers); err != nil {
@@ -53,21 +52,14 @@ func TestWriteCodexMCPConfig_EmitsCommandArgsEnv(t *testing.T) {
 	if !strings.Contains(string(body), `args = ["--port", "8080"]`) {
 		t.Fatalf("missing args: %s", body)
 	}
-	if !strings.Contains(string(body), `[mcp_servers."docs".env]`) {
-		t.Fatalf("missing env table: %s", body)
-	}
-	if !strings.Contains(string(body), `"DOCS_TOKEN" = "secret"`) {
-		t.Fatalf("missing env entry: %s", body)
-	}
 }
 
 func TestWriteCodexMCPConfig_EmitsStreamableHTTPURL(t *testing.T) {
 	dir := t.TempDir()
 	servers := map[string]mcpServerConfig{
 		"docs": {
-			Name:    "docs",
-			URL:     "https://docs.example.com/mcp",
-			Headers: map[string]string{"Authorization": "Bearer token"},
+			Name: "docs",
+			URL:  "https://docs.example.com/mcp",
 		},
 	}
 	if err := writeCodexMCPConfig(dir, servers); err != nil {
@@ -77,9 +69,6 @@ func TestWriteCodexMCPConfig_EmitsStreamableHTTPURL(t *testing.T) {
 	if !strings.Contains(string(body), `url = "https://docs.example.com/mcp"`) || strings.Contains(string(body), "command =") {
 		t.Fatalf("remote config: %s", body)
 	}
-	if !strings.Contains(string(body), `http_headers = {"Authorization" = "Bearer token"}`) {
-		t.Fatalf("remote headers: %s", body)
-	}
 }
 
 // TestWriteCodexMCPConfig_FreshHomeDropsStaleEntries documents the
diff --git a/apps/daemon/internal/agent/codex/mcp_http.go b/apps/daemon/internal/agent/codex/mcp_http.go
index bdeb2af17..d5a935f7d 100644
--- a/apps/daemon/internal/agent/codex/mcp_http.go
+++ b/apps/daemon/internal/agent/codex/mcp_http.go
@@ -63,7 +63,6 @@ func configureMCP(plan *SessionPlan, servers map[string]mcpServerConfig) error {
 		return errors.New("codex: cannot write public MCP configuration")
 	}
 	for _, feature := range []string{"plugins", "apps"} {
-		plan.EnableFeatures = slices.DeleteFunc(plan.EnableFeatures, func(value string) bool { return value == feature })
 		if !slices.Contains(plan.DisableFeatures, feature) {
 			plan.DisableFeatures = append(plan.DisableFeatures, feature)
 		}
diff --git a/apps/daemon/internal/agent/codex/mcp_http_bearer_test.go b/apps/daemon/internal/agent/codex/mcp_http_bearer_test.go
index 4c1ed5d8c..0223e6716 100644
--- a/apps/daemon/internal/agent/codex/mcp_http_bearer_test.go
+++ b/apps/daemon/internal/agent/codex/mcp_http_bearer_test.go
@@ -81,7 +81,7 @@ func TestMCPHTTPBearerDoesNotReachModelCatalogProbe(t *testing.T) {
 	token := "synthetic-catalog-secret"
 	servers := []proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "tools", ServerURL: "https://tools.example/mcp", BearerToken: &token}}
 	req := proto.PromptRequestPayload{AgentStateKey: "catalog", DisableExecutionEnvironment: true, MCPHTTPServers: &servers,
-		AgentOptions: map[string]any{"model": "fixture-model", "model_verbosity": "medium"}}
+		AgentOptions: map[string]any{"model": "fixture-model"}, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
 	cfg := defaultSessionConfig()
 	cfg.codexBinary = binary
 	plan, _, err := prepareSessionPlan(t.Context(), req, cfg)
diff --git a/apps/daemon/internal/agent/codex/mcp_http_preflight.go b/apps/daemon/internal/agent/codex/mcp_http_preflight.go
index 7aeae62aa..b499038fb 100644
--- a/apps/daemon/internal/agent/codex/mcp_http_preflight.go
+++ b/apps/daemon/internal/agent/codex/mcp_http_preflight.go
@@ -46,8 +46,7 @@ func matchesMCPConfig(raw json.RawMessage, declared map[string]mcpServerConfig)
 			return false
 		}
 		if expected.URL != "" {
-			if server["url"] != expected.URL || !matchesMCPHeaderMap(server, "http_headers", expected.Headers) ||
-				!matchesMCPHeaderMap(server, "env_http_headers", expected.EnvHTTPHeaders) {
+			if server["url"] != expected.URL || !matchesMCPHeaderMap(server, "env_http_headers", expected.EnvHTTPHeaders) {
 				return false
 			}
 			delete(server, "url")
diff --git a/apps/daemon/internal/agent/codex/mcp_http_test.go b/apps/daemon/internal/agent/codex/mcp_http_test.go
index 7720bee3f..20ac1767f 100644
--- a/apps/daemon/internal/agent/codex/mcp_http_test.go
+++ b/apps/daemon/internal/agent/codex/mcp_http_test.go
@@ -20,21 +20,13 @@ func TestPublicMCPHTTPPlanOwnsConfigurationAndPreservesHistory(t *testing.T) {
 		{ConnectionOrigin: "service", ServerLabel: "docs.server", ServerURL: "https://docs.example/mcp", AllowedTools: &tools, Required: true},
 		{ConnectionOrigin: "service", ServerLabel: "blocked", ServerURL: "http://127.0.0.1:12345/mcp", AllowedTools: &denyAll},
 	}
-	original := map[string]any{
-		"mcp_servers":     map[string]any{"operator": map[string]any{"command": "operator-mcp"}},
-		"enable_features": []any{"apps", "plugins", "unrelated"},
-	}
-	req := proto.PromptRequestPayload{AgentStateKey: "public-mcp", DisableExecutionEnvironment: true, MCPHTTPServers: &servers, AgentOptions: original}
-	req.AgentOptions = executionOptions(req)
+	req := proto.PromptRequestPayload{AgentStateKey: "public-mcp", DisableExecutionEnvironment: true, MCPHTTPServers: &servers}
 	plan, _, err := prepareSessionPlan(t.Context(), req, defaultSessionConfig())
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer plan.Cleanup()
-	if original["mcp_servers"] == nil || req.AgentOptions["mcp_servers"] != nil {
-		t.Fatal("declaration failed to replace operator MCP without mutation")
-	}
-	if !slices.Equal(plan.EnableFeatures, []string{"unrelated"}) || !slices.Contains(plan.DisableFeatures, "apps") || !slices.Contains(plan.DisableFeatures, "plugins") || !slices.Contains(plan.ExtraConfig, [2]string{"mcp_oauth_credentials_store", `"file"`}) {
+	if !slices.Contains(plan.DisableFeatures, "apps") || !slices.Contains(plan.DisableFeatures, "plugins") || !slices.Contains(plan.ExtraConfig, [2]string{"mcp_oauth_credentials_store", `"file"`}) {
 		t.Fatal("native profile was not pinned")
 	}
 	home, err := allocCodexHome(req.AgentStateKey)
@@ -53,9 +45,6 @@ func TestPublicMCPHTTPPlanOwnsConfigurationAndPreservesHistory(t *testing.T) {
 			t.Fatalf("missing native config %q", expected)
 		}
 	}
-	if strings.Contains(string(config), "operator") {
-		t.Fatal("operator MCP was rendered")
-	}
 	tools[0] = "mutated"
 	if (*plan.mcpServers["docs.server"].EnabledTools)[0] != "lookup.docs" {
 		t.Fatal("prepared allowlist retained caller-owned memory")
diff --git a/apps/daemon/internal/agent/codex/model_route_test.go b/apps/daemon/internal/agent/codex/model_route_test.go
index 2e4a716cc..32aeb4680 100644
--- a/apps/daemon/internal/agent/codex/model_route_test.go
+++ b/apps/daemon/internal/agent/codex/model_route_test.go
@@ -11,7 +11,7 @@ func TestPlanRejectsNonNativeFrozenProvider(t *testing.T) {
 	for _, protocol := range []string{"anthropic", "chat_completions"} {
 		t.Run(protocol, func(t *testing.T) {
 			provider := map[string]any{"protocol": protocol, "base_url": "https://model.invalid/v1", "api_key": "private-sentinel"}
-			plan, err := BuildSessionPlan("recovered", "frozen-state", map[string]any{"model": "frozen-model", "model_provider": provider})
+			plan, err := BuildSessionPlan("frozen-state", map[string]any{"model": "frozen-model", "model_provider": provider}, nil)
 			if plan.Cleanup != nil {
 				plan.Cleanup()
 			}
@@ -30,7 +30,7 @@ func TestPlanRejectsIncompleteExplicitProvider(t *testing.T) {
 		{"model": "chosen", "model_provider": nil},
 		{"model_provider": map[string]any{"protocol": "responses", "base_url": "https://model.example/v1", "api_key": "fixture"}},
 	} {
-		if _, err := BuildSessionPlan("frozen", "state", options); err == nil {
+		if _, err := BuildSessionPlan("state", options, nil); err == nil {
 			t.Fatal("explicit provider fell back to native defaults")
 		}
 	}
diff --git a/apps/daemon/internal/agent/codex/model_verbosity_test.go b/apps/daemon/internal/agent/codex/model_verbosity_test.go
index 957a70132..e1b9ecd45 100644
--- a/apps/daemon/internal/agent/codex/model_verbosity_test.go
+++ b/apps/daemon/internal/agent/codex/model_verbosity_test.go
@@ -37,7 +37,7 @@ func TestPrepareModelVerbosity(t *testing.T) {
 	if err := os.WriteFile(binary, []byte("#!/bin/sh\nprintf '%s' '"+catalog+"'\n"), 0700); err != nil {
 		t.Fatal(err)
 	}
-	plan, err := BuildSessionPlan("run", "state", map[string]any{"model": "known-model", "model_verbosity": "high"})
+	plan, err := BuildSessionPlan("state", map[string]any{"model": "known-model"}, &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "high"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -80,7 +80,7 @@ func TestPrepareDefaultModelVerbosity(t *testing.T) {
 	for _, model := range []string{"supported", "unsupported", "unknown-provider-model"} {
 		for _, level := range []string{"low", "medium", "high"} {
 			t.Run(model+"/"+level, func(t *testing.T) {
-				plan, err := BuildSessionPlan("run", "state", executionOptions(proto.PromptRequestPayload{AgentOptions: map[string]any{"model": model}, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: level}}))
+				plan, err := BuildSessionPlan("state", map[string]any{"model": model}, &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: level})
 				if err != nil {
 					t.Fatal(err)
 				}
diff --git a/apps/daemon/internal/agent/codex/options.go b/apps/daemon/internal/agent/codex/options.go
index 54defb0c9..2e0457cb2 100644
--- a/apps/daemon/internal/agent/codex/options.go
+++ b/apps/daemon/internal/agent/codex/options.go
@@ -6,10 +6,12 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"sort"
 	"strings"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/paths"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	harnessconfiguration "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig/codex"
 )
 
@@ -22,17 +24,16 @@ type SessionPlan struct {
 	Cwd string
 
 	// Env is the full environment slice (KEY=value) to layer onto
-	// os.Environ() before spawning. Includes CODEX_HOME, plus any
-	// caller-provided OPENAI_API_KEY / CODEX_API_KEY / proxy vars.
+	// os.Environ() before spawning. Includes CODEX_HOME and the entries
+	// of the env option.
 	Env []string
 
 	// ExtraConfig is a list of `-c key=value` overrides applied at the
-	// app-server CLI. Used to layer model_reasoning_summary etc. without
-	// editing config.toml.
+	// app-server CLI.
 	ExtraConfig [][2]string
 
 	// EnableFeatures / DisableFeatures forward to `--enable / --disable`
-	// flags. Today empty by default; reserved for future ARC opt-in.
+	// flags for the profiles the adapter configures.
 	EnableFeatures  []string
 	DisableFeatures []string
 
@@ -54,9 +55,6 @@ type SessionPlan struct {
 	// SystemPrompt is forwarded as developerInstructions on thread/start.
 	SystemPrompt string
 
-	// CollaborationMode selects Codex's default or plan tool surface.
-	CollaborationMode CollaborationModeKind
-
 	// ModelReasoningEffort is frozen for launch and every native Turn.
 	ModelReasoningEffort string
 
@@ -69,38 +67,25 @@ type SessionPlan struct {
 	Cleanup func()
 }
 
-// BuildSessionPlan derives a SessionPlan from PromptRequestPayload's
-// fields. Options use a string-keyed map.
-//
-// The agent_options keys this function reads:
+// BuildSessionPlan derives a SessionPlan from the request's agent_options and
+// execution controls. It reads these agent_options keys:
 //
-//	model                 string          codex model slug, e.g. "gpt-5.5"
-//	system_prompt         string          forwarded as developerInstructions
-//	override_system_prompt string         replaces system_prompt entirely when
-//	                                      non-empty
-//	env                   map[string]any  extra env vars (KEY=string-value)
-//	mcp_servers           map[string]any  rendered MCP server config — written
-//	                                      to <CODEX_HOME>/config.toml [mcp_servers]
-//	model_provider       object          frozen upstream protocol, endpoint, credential and token limits
-//	reasoning_summary     string          one of auto/concise/detailed/none —
-//	                                      routed via -c model_reasoning_summary
-//	mode                  string          Codex collaboration mode: default/plan
-//	enable_features       []any           string list, forwarded as --enable
-//	disable_features      []any           string list, forwarded as --disable
+//	model           string  codex model slug, e.g. "gpt-5.5"
+//	system_prompt   string  forwarded as developerInstructions
+//	model_provider  object  frozen upstream protocol, endpoint, credential and token limits
+//	harness_config  object  native parameters accepted by harnessconfig/codex
+//	env             object  extra env vars (KEY=string-value); the Runtime's
+//	                        authoring bridge supplies it
 //
-// The codex binary itself is resolved via PATH only — there's no
-// per-prompt override knob. If a deployment needs a custom binary
-// location, set it via the daemon's process environment (PATH /
-// codexBinary in sessionConfig) rather than per-call.
+// Execution controls select the native web_search and model_verbosity settings.
+// The codex binary itself is resolved via PATH only.
 //
 // Daemon-managed Codex sessions bypass approvals and the engine sandbox.
-func BuildSessionPlan(runID, agentStateKey string, opts map[string]any) (SessionPlan, error) {
-	cleanup := func() {}
+func BuildSessionPlan(agentStateKey string, opts map[string]any, controls *proto.ExecutionControls) (SessionPlan, error) {
 	plan := SessionPlan{
-		CollaborationMode: CollaborationModeDefault,
-		ApprovalPolicy:    AskForApproval{String: "never"},
-		Sandbox:           SandboxDangerFullAcces,
-		Cleanup:           cleanup,
+		ApprovalPolicy: AskForApproval{String: "never"},
+		Sandbox:        SandboxDangerFullAcces,
+		Cleanup:        func() {},
 	}
 
 	nativeConfig, err := harnessconfiguration.Configuration().PrepareHarnessConfig(opts)
@@ -112,35 +97,17 @@ func BuildSessionPlan(runID, agentStateKey string, opts map[string]any) (Session
 		return plan, errors.New("codex: model and complete model_provider are required")
 	}
 
-	if value, present := opts["web_search"]; present {
-		switch value {
-		case "disabled", "cached", "live":
-		default:
-			return plan, fmt.Errorf("codex: web_search must be disabled, cached or live")
+	if controls != nil {
+		if !slices.Contains([]string{"disabled", "cached", "live"}, controls.WebSearch) {
+			return plan, errors.New("codex: web_search must be disabled, cached or live")
 		}
-	}
-
-	if value, present := opts["model_verbosity"]; present {
-		switch value {
-		case "low", "medium", "high":
-		default:
-			return plan, fmt.Errorf("codex: model_verbosity must be low, medium or high")
+		if !slices.Contains([]string{"low", "medium", "high"}, controls.TextVerbosity) {
+			return plan, errors.New("codex: text_verbosity must be low, medium or high")
 		}
 	}
 
 	plan.Model = stringOpt(opts, "model")
 	plan.SystemPrompt = stringOpt(opts, "system_prompt")
-	if override := stringOpt(opts, "override_system_prompt"); override != "" {
-		plan.SystemPrompt = override
-	}
-	if mode := CollaborationModeKind(stringOpt(opts, "mode")); mode != "" {
-		switch mode {
-		case CollaborationModeDefault, CollaborationModePlan:
-			plan.CollaborationMode = mode
-		default:
-			return plan, fmt.Errorf("codex: unsupported collaboration mode %q", mode)
-		}
-	}
 
 	env, err := buildSessionEnv(opts)
 	if err != nil {
@@ -156,36 +123,21 @@ func BuildSessionPlan(runID, agentStateKey string, opts map[string]any) (Session
 	}
 	env = append(env, "CODEX_HOME="+codexHome)
 
-	// MCP servers come pre-rendered from server/internal/connector/agentdaemon
-	// (capabilityAdditions.MCPServers, rendered via render.TargetCodex)
-	// as a map of name → {command,args,env}. Write them into
-	// <CODEX_HOME>/config.toml so codex picks them up on startup.
-	mcpServers, err := normaliseMCPServers(opts["mcp_servers"])
-	if err != nil {
-		return plan, err
-	}
-	if len(mcpServers) > 0 {
-		if err := writeCodexMCPConfig(codexHome, mcpServers); err != nil {
-			return plan, err
-		}
-	}
-
 	provider, hasProvider, err := normaliseProviderConfig(opts["model_provider"])
 	if err != nil {
-		cleanup()
 		return plan, err
 	}
 	if hasProvider {
 		if err := writeCodexProviderConfig(codexHome, provider); err != nil {
-			cleanup()
 			return plan, err
 		}
 		plan.ModelProvider = oacProviderSlug
 	}
 
 	plan.Env = env
-	plan.Cleanup = cleanup
-	plan.ExtraConfig = extraConfigFromOpts(opts)
+	if controls != nil {
+		plan.ExtraConfig = [][2]string{{"web_search", strconv(controls.WebSearch)}, {"model_verbosity", strconv(controls.TextVerbosity)}}
+	}
 	if effort, ok := nativeConfig["model_reasoning_effort"].(string); ok {
 		plan.ModelReasoningEffort = effort
 		plan.ExtraConfig = append(plan.ExtraConfig, [2]string{"model_reasoning_effort", strconv(effort)})
@@ -198,8 +150,6 @@ func BuildSessionPlan(runID, agentStateKey string, opts map[string]any) (Session
 		plan.ExtraConfig = append(plan.ExtraConfig,
 			[2]string{"model_provider", strconv(plan.ModelProvider)})
 	}
-	plan.EnableFeatures = stringListOpt(opts, "enable_features")
-	plan.DisableFeatures = stringListOpt(opts, "disable_features")
 	return plan, nil
 }
 
@@ -280,84 +230,6 @@ func buildSessionEnv(opts map[string]any) ([]string, error) {
 	return env, nil
 }
 
-func stringListOpt(opts map[string]any, key string) []string {
-	if opts == nil {
-		return nil
-	}
-	raw, ok := opts[key]
-	if !ok || raw == nil {
-		return nil
-	}
-	arr, ok := raw.([]any)
-	if !ok {
-		return nil
-	}
-	out := make([]string, 0, len(arr))
-	for _, v := range arr {
-		if s, ok := v.(string); ok && strings.TrimSpace(s) != "" {
-			out = append(out, s)
-		}
-	}
-	return out
-}
-
-func normaliseMCPServers(raw any) (map[string]mcpServerConfig, error) {
-	if raw == nil {
-		return nil, nil
-	}
-	m, ok := raw.(map[string]any)
-	if !ok {
-		return nil, fmt.Errorf("codex: mcp_servers must be object, got %T", raw)
-	}
-	out := make(map[string]mcpServerConfig, len(m))
-	for name, v := range m {
-		entry, ok := v.(map[string]any)
-		if !ok {
-			return nil, fmt.Errorf("codex: mcp_servers[%q] must be object, got %T", name, v)
-		}
-		srv := mcpServerConfig{Name: name}
-		if url, ok := entry["url"].(string); ok {
-			srv.URL = strings.TrimSpace(url)
-		}
-		if cmd, ok := entry["command"].(string); ok {
-			srv.Command = cmd
-		}
-		if args, ok := entry["args"].([]any); ok {
-			for _, a := range args {
-				if s, ok := a.(string); ok {
-					srv.Args = append(srv.Args, s)
-				}
-			}
-		}
-		if env, ok := entry["env"].(map[string]any); ok {
-			srv.Env = make(map[string]string, len(env))
-			for k, val := range env {
-				if s, ok := val.(string); ok {
-					srv.Env[k] = s
-				}
-			}
-		}
-		if headers, ok := entry["headers"].(map[string]any); ok {
-			srv.Headers = make(map[string]string, len(headers))
-			for key, value := range headers {
-				if text, ok := value.(string); ok {
-					srv.Headers[key] = text
-				}
-			}
-		} else if headers, ok := entry["headers"].(map[string]string); ok {
-			srv.Headers = headers
-		}
-		if srv.Command == "" && srv.URL == "" {
-			return nil, fmt.Errorf("codex: mcp_servers[%q] missing command or url", name)
-		}
-		if srv.Command != "" && srv.URL != "" {
-			return nil, fmt.Errorf("codex: mcp_servers[%q] cannot set both command and url", name)
-		}
-		out[name] = srv
-	}
-	return out, nil
-}
-
 // normaliseProviderConfig validates and renders the frozen native provider.
 func normaliseProviderConfig(raw any) (providerConfig, bool, error) {
 	if raw == nil {
@@ -370,25 +242,6 @@ func normaliseProviderConfig(raw any) (providerConfig, bool, error) {
 	return providerConfig{BaseURL: provider.BaseURL, BearerToken: provider.APIKey, WireAPI: "responses"}, true, nil
 }
 
-// intOpt extracts an integer-shaped value from a map. JSON-decoded
-// numbers arrive as float64; tests sometimes pass int directly. Both
-// are accepted; non-numeric / missing yields 0.
-func intOpt(m map[string]any, key string) int {
-	v, ok := m[key]
-	if !ok || v == nil {
-		return 0
-	}
-	switch x := v.(type) {
-	case int:
-		return x
-	case int64:
-		return int(x)
-	case float64:
-		return int(x)
-	}
-	return 0
-}
-
 func stringOpt(opts map[string]any, key string) string {
 	if opts == nil {
 		return ""
diff --git a/apps/daemon/internal/agent/codex/options_test.go b/apps/daemon/internal/agent/codex/options_test.go
index b8b8587ac..f5fec2fdb 100644
--- a/apps/daemon/internal/agent/codex/options_test.go
+++ b/apps/daemon/internal/agent/codex/options_test.go
@@ -2,13 +2,12 @@ package codex
 
 import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"os"
 	"strings"
 	"testing"
 )
 
 func TestBuildSessionPlan_DefaultsToBypass(t *testing.T) {
-	plan, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", nil)
+	plan, err := BuildSessionPlan("conv-1/agent-1/codex", nil, nil)
 	if err != nil {
 		t.Fatalf("BuildSessionPlan: %v", err)
 	}
@@ -25,11 +24,11 @@ func TestBuildSessionPlan_DefaultsToBypass(t *testing.T) {
 }
 
 func TestBuildSessionPlan_AllocsCodexHomeAndEnv(t *testing.T) {
-	plan, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", map[string]any{
+	plan, err := BuildSessionPlan("conv-1/agent-1/codex", map[string]any{
 		"env": map[string]any{
 			"OPENAI_API_KEY": "sk-test",
 		},
-	})
+	}, nil)
 	if err != nil {
 		t.Fatalf("BuildSessionPlan: %v", err)
 	}
@@ -60,11 +59,11 @@ func TestBuildSessionPlan_AllocsCodexHomeAndEnv(t *testing.T) {
 
 func TestBuildSessionPlan_StableCodexHomeByStateKey(t *testing.T) {
 	stateKey := "conv-stable/agent-stable/codex"
-	planA, err := BuildSessionPlan("run-a", stateKey, nil)
+	planA, err := BuildSessionPlan(stateKey, nil, nil)
 	if err != nil {
 		t.Fatalf("BuildSessionPlan A: %v", err)
 	}
-	planB, err := BuildSessionPlan("run-b", stateKey, nil)
+	planB, err := BuildSessionPlan(stateKey, nil, nil)
 	if err != nil {
 		t.Fatalf("BuildSessionPlan B: %v", err)
 	}
@@ -73,26 +72,6 @@ func TestBuildSessionPlan_StableCodexHomeByStateKey(t *testing.T) {
 	}
 }
 
-func TestBuildSessionPlan_RoutesReasoningSummary(t *testing.T) {
-	plan, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", map[string]any{
-		"reasoning_summary": "detailed",
-	})
-	if err != nil {
-		t.Fatalf("BuildSessionPlan: %v", err)
-	}
-	defer plan.Cleanup()
-	if len(plan.ExtraConfig) != 1 {
-		t.Fatalf("ExtraConfig = %+v", plan.ExtraConfig)
-	}
-	kv := plan.ExtraConfig[0]
-	if kv[0] != "model_reasoning_summary" {
-		t.Fatalf("override key = %q", kv[0])
-	}
-	if kv[1] != `"detailed"` {
-		t.Fatalf("override value = %q (must be TOML-quoted)", kv[1])
-	}
-}
-
 func codexHomeFromEnv(env []string) string {
 	for _, kv := range env {
 		if strings.HasPrefix(kv, "CODEX_HOME=") {
@@ -102,128 +81,6 @@ func codexHomeFromEnv(env []string) string {
 	return ""
 }
 
-func TestBuildSessionPlan_OverrideSystemPromptReplacesAppend(t *testing.T) {
-	plan, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", map[string]any{
-		"system_prompt":          "user base",
-		"override_system_prompt": "you are pirate",
-	})
-	if err != nil {
-		t.Fatalf("BuildSessionPlan: %v", err)
-	}
-	defer plan.Cleanup()
-	if plan.SystemPrompt != "you are pirate" {
-		t.Fatalf("SystemPrompt = %q, want %q", plan.SystemPrompt, "you are pirate")
-	}
-}
-
-func TestBuildSessionPlan_EmptyOverrideKeepsSystemPrompt(t *testing.T) {
-	plan, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", map[string]any{
-		"system_prompt":          "user base",
-		"override_system_prompt": "",
-	})
-	if err != nil {
-		t.Fatalf("BuildSessionPlan: %v", err)
-	}
-	defer plan.Cleanup()
-	if plan.SystemPrompt != "user base" {
-		t.Fatalf("SystemPrompt = %q, want %q (empty override should not clobber)", plan.SystemPrompt, "user base")
-	}
-}
-
-func TestBuildSessionPlan_ParsesCollaborationMode(t *testing.T) {
-	plan, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", map[string]any{
-		"mode": "plan",
-	})
-	if err != nil {
-		t.Fatalf("BuildSessionPlan: %v", err)
-	}
-	defer plan.Cleanup()
-	if plan.CollaborationMode != CollaborationModePlan {
-		t.Fatalf("CollaborationMode = %q, want plan", plan.CollaborationMode)
-	}
-}
-
-func TestBuildSessionPlan_OmittedModeRetainsCurrentInstructions(t *testing.T) {
-	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-	for _, mode := range []string{"", "default"} {
-		opts := map[string]any{"system_prompt": "current reference", "model": "MiniMax-M3"}
-		if mode != "" {
-			opts["mode"] = mode
-		}
-		plan, err := BuildSessionPlan("run", "conv/agent/codex", opts)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer plan.Cleanup()
-		if plan.CollaborationMode != CollaborationModeDefault || plan.SystemPrompt != "current reference" || plan.Model != "MiniMax-M3" {
-			t.Fatalf("mode %q did not retain the default turn instructions: %+v", mode, plan)
-		}
-	}
-}
-
-func TestBuildSessionPlan_RejectsUnknownCollaborationMode(t *testing.T) {
-	_, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", map[string]any{
-		"mode": "autopilot",
-	})
-	if err == nil || !strings.Contains(err.Error(), "unsupported collaboration mode") {
-		t.Fatalf("expected unsupported collaboration mode error, got %v", err)
-	}
-}
-
-func TestBuildSessionPlan_WritesMCPConfig(t *testing.T) {
-	plan, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", map[string]any{
-		"mcp_servers": map[string]any{
-			"docs": map[string]any{
-				"command": "docs-server",
-				"args":    []any{"--port", "8080"},
-				"env":     map[string]any{"TOKEN": "abc"},
-			},
-		},
-	})
-	if err != nil {
-		t.Fatalf("BuildSessionPlan: %v", err)
-	}
-	defer plan.Cleanup()
-	// Find CODEX_HOME so we can verify the config.toml was written there.
-	codexHome := ""
-	for _, kv := range plan.Env {
-		if strings.HasPrefix(kv, "CODEX_HOME=") {
-			codexHome = strings.TrimPrefix(kv, "CODEX_HOME=")
-			break
-		}
-	}
-	if codexHome == "" {
-		t.Fatal("CODEX_HOME not in plan.Env")
-	}
-	// mcp_config.go writes <codexHome>/config.toml — verify it exists
-	// and contains the rendered server.
-	bodyBytes, err := os.ReadFile(codexHome + "/config.toml")
-	if err != nil {
-		t.Fatalf("read config.toml: %v", err)
-	}
-	body := string(bodyBytes)
-	if !strings.Contains(body, `[mcp_servers."docs"]`) {
-		t.Fatalf("config.toml missing docs server: %s", body)
-	}
-	if !strings.Contains(body, `command = "docs-server"`) {
-		t.Fatalf("config.toml missing command: %s", body)
-	}
-}
-
-func TestBuildSessionPlan_MissingMCPCommandErrors(t *testing.T) {
-	_, err := BuildSessionPlan("run-1", "conv-1/agent-1/codex", map[string]any{
-		"mcp_servers": map[string]any{
-			"broken": map[string]any{
-				"args": []any{"--x"},
-				// no command
-			},
-		},
-	})
-	if err == nil {
-		t.Fatal("missing mcp command must surface as error")
-	}
-}
-
 func TestNativeInputPreservesText(t *testing.T) {
 	inputs, err := nativeInput(proto.TextInput("  hello world  "))
 	if err != nil {
@@ -250,12 +107,3 @@ func TestFirstUserInput_WhitespaceIsUnchanged(t *testing.T) {
 		t.Fatalf("input = %+v, %v", inputs, err)
 	}
 }
-
-func TestStringListOpt_FiltersEmpties(t *testing.T) {
-	got := stringListOpt(map[string]any{
-		"enable_features": []any{"a", "", "  ", "b"},
-	}, "enable_features")
-	if len(got) != 2 || got[0] != "a" || got[1] != "b" {
-		t.Fatalf("filter = %+v", got)
-	}
-}
diff --git a/apps/daemon/internal/agent/codex/permission_profile.go b/apps/daemon/internal/agent/codex/permission_profile.go
index 46911ca67..f5e7cb807 100644
--- a/apps/daemon/internal/agent/codex/permission_profile.go
+++ b/apps/daemon/internal/agent/codex/permission_profile.go
@@ -6,9 +6,9 @@ import (
 )
 
 // Runtime execution uses the current user; isolation belongs to its outer host.
-func runtimePermissionProfile(req proto.PromptRequestPayload) (string, error) {
+func validatePermissionProfile(req proto.PromptRequestPayload) error {
 	if req.LocalEnvironment != nil && (req.DisableExecutionEnvironment || req.WorkspaceReadOnly || req.LocalEnvironment.NetworkAccess != "enabled" || len(req.LocalEnvironment.AllowedDomains) != 0) {
-		return "", fmt.Errorf("codex: Runtime execution requires unrestricted host access")
+		return fmt.Errorf("codex: Runtime execution requires unrestricted host access")
 	}
-	return "", nil
+	return nil
 }
diff --git a/apps/daemon/internal/agent/codex/preparation.go b/apps/daemon/internal/agent/codex/preparation.go
index 44d750c04..663f060d2 100644
--- a/apps/daemon/internal/agent/codex/preparation.go
+++ b/apps/daemon/internal/agent/codex/preparation.go
@@ -63,7 +63,6 @@ func newPreparation(parent context.Context, req proto.PromptRequestPayload, cfg
 	}
 	req.AgentStateKey = effectiveAgentStateKey(req)
 
-	req.AgentOptions = executionOptions(req)
 	plan, skillRoots, err := prepareSessionPlan(parent, req, cfg)
 	if err != nil {
 		return nil, err
diff --git a/apps/daemon/internal/agent/codex/preparation_helpers_test.go b/apps/daemon/internal/agent/codex/preparation_helpers_test.go
index d56acef77..65625bcec 100644
--- a/apps/daemon/internal/agent/codex/preparation_helpers_test.go
+++ b/apps/daemon/internal/agent/codex/preparation_helpers_test.go
@@ -43,7 +43,8 @@ func preparationFixture(t *testing.T) (proto.PromptRequestPayload, sessionConfig
 	req := proto.PromptRequestPayload{
 		AgentKind: "codex", AgentStateKey: "prepared-session",
 		ReleaseOnCompletion: true, StrictResume: true,
-		AgentOptions:                map[string]any{"model": "fixture-model", "model_verbosity": "medium"},
+		AgentOptions:                map[string]any{"model": "fixture-model"},
+		ExecutionControls:           &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"},
 		DisableExecutionEnvironment: true,
 		FunctionTools:               []proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{"type":"object","properties":{"value":{"type":"integer"}}}`)}},
 	}
diff --git a/apps/daemon/internal/agent/codex/programmatic_tools.go b/apps/daemon/internal/agent/codex/programmatic_tools.go
index e0d377fa0..c2da9f9a1 100644
--- a/apps/daemon/internal/agent/codex/programmatic_tools.go
+++ b/apps/daemon/internal/agent/codex/programmatic_tools.go
@@ -16,7 +16,6 @@ func disableProgrammaticTools(plan *SessionPlan, controls *proto.ExecutionContro
 		return
 	}
 	for _, feature := range programmaticFeatures {
-		plan.EnableFeatures = slices.DeleteFunc(plan.EnableFeatures, func(value string) bool { return value == feature })
 		if !slices.Contains(plan.DisableFeatures, feature) {
 			plan.DisableFeatures = append(plan.DisableFeatures, feature)
 		}
diff --git a/apps/daemon/internal/agent/codex/programmatic_tools_test.go b/apps/daemon/internal/agent/codex/programmatic_tools_test.go
index df9064dc4..fd0aeee8a 100644
--- a/apps/daemon/internal/agent/codex/programmatic_tools_test.go
+++ b/apps/daemon/internal/agent/codex/programmatic_tools_test.go
@@ -3,7 +3,6 @@ package codex
 import (
 	"context"
 	"encoding/json"
-	"reflect"
 	"slices"
 	"testing"
 	"time"
@@ -12,16 +11,12 @@ import (
 )
 
 func TestProgrammaticToolsExplicitDisableOverridesNativeOptions(t *testing.T) {
-	plan := SessionPlan{EnableFeatures: []string{"code_mode", "unrelated", "code_mode_only", "code_mode_prewarm"}, ExtraConfig: [][2]string{{"features.code_mode", "true"}}}
-	before := slices.Clone(plan.EnableFeatures)
+	plan := SessionPlan{ExtraConfig: [][2]string{{"features.code_mode", "true"}}}
 	disableProgrammaticTools(&plan, nil)
-	if !reflect.DeepEqual(plan.EnableFeatures, before) {
+	if len(plan.DisableFeatures) != 0 || len(plan.ExtraConfig) != 1 {
 		t.Fatal("omission changed native configuration")
 	}
 	disableProgrammaticTools(&plan, &proto.ExecutionControls{DisableProgrammaticToolCalling: true})
-	if !slices.Equal(plan.EnableFeatures, []string{"unrelated"}) {
-		t.Fatal(plan.EnableFeatures)
-	}
 	for _, feature := range programmaticFeatures {
 		if !slices.Contains(plan.DisableFeatures, feature) {
 			t.Fatal("missing disable", feature)
diff --git a/apps/daemon/internal/agent/codex/protocol.go b/apps/daemon/internal/agent/codex/protocol.go
index 2aa988740..462c10f3e 100644
--- a/apps/daemon/internal/agent/codex/protocol.go
+++ b/apps/daemon/internal/agent/codex/protocol.go
@@ -238,10 +238,7 @@ type TurnStartParams struct {
 
 type CollaborationModeKind string
 
-const (
-	CollaborationModePlan    CollaborationModeKind = "plan"
-	CollaborationModeDefault CollaborationModeKind = "default"
-)
+const CollaborationModeDefault CollaborationModeKind = "default"
 
 type CollaborationMode struct {
 	Mode     CollaborationModeKind     `json:"mode"`
diff --git a/apps/daemon/internal/agent/codex/protocol_wire_test.go b/apps/daemon/internal/agent/codex/protocol_wire_test.go
index 5a513043b..d32590d7c 100644
--- a/apps/daemon/internal/agent/codex/protocol_wire_test.go
+++ b/apps/daemon/internal/agent/codex/protocol_wire_test.go
@@ -106,13 +106,13 @@ func TestThreadStartParams_ModelProviderIsCamelCaseField(t *testing.T) {
 	}
 }
 
-func TestTurnStartParams_CollaborationModeUsesPlanWireShape(t *testing.T) {
+func TestTurnStartParams_CollaborationModeWireShape(t *testing.T) {
 	developerInstructions := "stay within the configured workspace"
 	params := TurnStartParams{
 		ThreadID: "thread-1",
 		Input:    []UserInput{{Type: UserInputText, Text: "ask me a question"}},
 		CollaborationMode: &CollaborationMode{
-			Mode: CollaborationModePlan,
+			Mode: CollaborationModeDefault,
 			Settings: CollaborationModeSettings{
 				Model:                 "MiniMax-M3",
 				DeveloperInstructions: &developerInstructions,
@@ -124,7 +124,7 @@ func TestTurnStartParams_CollaborationModeUsesPlanWireShape(t *testing.T) {
 		t.Fatalf("marshal: %v", err)
 	}
 	body := string(raw)
-	if !strings.Contains(body, `"collaborationMode":{"mode":"plan","settings":{"model":"MiniMax-M3","developer_instructions":"stay within the configured workspace"}}`) {
+	if !strings.Contains(body, `"collaborationMode":{"mode":"default","settings":{"model":"MiniMax-M3","developer_instructions":"stay within the configured workspace"}}`) {
 		t.Fatalf("collaboration mode missing or malformed: %s", body)
 	}
 	if strings.Contains(body, `"collaboration_mode"`) {
diff --git a/apps/daemon/internal/agent/codex/provider_config_test.go b/apps/daemon/internal/agent/codex/provider_config_test.go
index 345a86378..80eb8d48b 100644
--- a/apps/daemon/internal/agent/codex/provider_config_test.go
+++ b/apps/daemon/internal/agent/codex/provider_config_test.go
@@ -156,13 +156,13 @@ func TestNormaliseProviderConfig_Nil(t *testing.T) {
 }
 
 func TestBuildSessionPlan_PinsModelProviderWhenProviderSet(t *testing.T) {
-	plan, err := BuildSessionPlan("run-x", "conv-1/agent-1/codex", map[string]any{
+	plan, err := BuildSessionPlan("conv-1/agent-1/codex", map[string]any{
 		"model": "fixture-model",
 		"model_provider": map[string]any{"protocol": "responses",
 			"base_url": "https://x/v1",
 			"api_key":  "sk-x",
 		},
-	})
+	}, nil)
 	if err != nil {
 		t.Fatalf("BuildSessionPlan: %v", err)
 	}
@@ -194,7 +194,7 @@ func TestBuildSessionPlan_PinsModelProviderWhenProviderSet(t *testing.T) {
 }
 
 func TestBuildSessionPlan_NoProviderLeavesBuiltinDefault(t *testing.T) {
-	plan, err := BuildSessionPlan("run-y", "conv-1/agent-1/codex", nil)
+	plan, err := BuildSessionPlan("conv-1/agent-1/codex", nil, nil)
 	if err != nil {
 		t.Fatalf("BuildSessionPlan: %v", err)
 	}
diff --git a/apps/daemon/internal/agent/codex/session_plan.go b/apps/daemon/internal/agent/codex/session_plan.go
index 0fde0a6e0..216b6717a 100644
--- a/apps/daemon/internal/agent/codex/session_plan.go
+++ b/apps/daemon/internal/agent/codex/session_plan.go
@@ -13,15 +13,14 @@ func prepareSessionPlan(ctx context.Context, req proto.PromptRequestPayload, cfg
 	if err := validateNativeTransportEnvironment(req); err != nil {
 		return SessionPlan{}, nil, err
 	}
-	_, err := runtimePermissionProfile(req)
-	if err != nil {
+	if err := validatePermissionProfile(req); err != nil {
 		return SessionPlan{}, nil, err
 	}
 	mcpServers, mcpEnv, err := runtimeMCPServers(req)
 	if err != nil {
 		return SessionPlan{}, nil, err
 	}
-	plan, err := BuildSessionPlan(req.RunID, req.AgentStateKey, req.AgentOptions)
+	plan, err := BuildSessionPlan(req.AgentStateKey, req.AgentOptions, req.ExecutionControls)
 	if err != nil {
 		return SessionPlan{}, nil, fmt.Errorf("codex: build session plan: %w", err)
 	}
@@ -35,7 +34,7 @@ func prepareSessionPlan(ctx context.Context, req proto.PromptRequestPayload, cfg
 		plan.Sandbox = "danger-full-access"
 		plan.Permissions = ""
 		plan.ApprovalPolicy = AskForApproval{String: "never"}
-	} else if req.DisableExecutionEnvironment {
+	} else {
 		// environment:none has no workspace; the Session's private home is its cwd.
 		plan.Cwd = nativeHomeFromPlan(plan)
 	}
@@ -64,7 +63,7 @@ func prepareSessionPlan(ctx context.Context, req proto.PromptRequestPayload, cfg
 		}
 	}
 
-	if stringOpt(req.AgentOptions, "model_verbosity") != "" {
+	if req.ExecutionControls != nil {
 		if err := prepareModelVerbosity(ctx, cfg.codexBinary, &plan); err != nil {
 			plan.Cleanup()
 			return SessionPlan{}, nil, err
@@ -76,23 +75,14 @@ func prepareSessionPlan(ctx context.Context, req proto.PromptRequestPayload, cfg
 	}
 	var skillRoots []string
 	if req.LocalEnvironment != nil && len(req.LocalEnvironment.Skills) > 0 {
-		err = verifyHostedSkills(req.LocalEnvironment.Skills)
-		if err == nil {
-			for _, skill := range req.LocalEnvironment.Skills {
-				skillRoots = append(skillRoots, localworkspace.SkillPath(skill))
-			}
+		if err := verifyHostedSkills(req.LocalEnvironment.Skills); err != nil {
+			plan.Cleanup()
+			return SessionPlan{}, nil, err
 		}
-	} else if !req.DisableExecutionEnvironment {
-		var root string
-		root, err = prepareManagedSkills(ctx, cfg.logger, req)
-		if root != "" {
-			skillRoots = []string{root}
+		for _, skill := range req.LocalEnvironment.Skills {
+			skillRoots = append(skillRoots, localworkspace.SkillPath(skill))
 		}
 	}
-	if err != nil {
-		plan.Cleanup()
-		return SessionPlan{}, nil, err
-	}
 
 	plan.Env = append(plan.Env, mcpEnv...)
 
diff --git a/apps/daemon/internal/agent/codex/session_policy_test.go b/apps/daemon/internal/agent/codex/session_policy_test.go
index e21e793c9..86c5b3c74 100644
--- a/apps/daemon/internal/agent/codex/session_policy_test.go
+++ b/apps/daemon/internal/agent/codex/session_policy_test.go
@@ -16,7 +16,7 @@ func TestThreadRequestsApplyDeploymentPolicy(t *testing.T) {
 			for _, method := range []string{"thread/start", "thread/resume"} {
 				t.Run(method, func(t *testing.T) {
 					t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-					plan, _, err := prepareSessionPlan(context.Background(), proto.PromptRequestPayload{AgentStateKey: "conv/agent/codex", DisableSubagents: true, AgentOptions: map[string]any{"permissions": ":danger-full-access"}}, sessionConfig{})
+					plan, _, err := prepareSessionPlan(context.Background(), proto.PromptRequestPayload{AgentStateKey: "conv/agent/codex", DisableSubagents: true, DisableExecutionEnvironment: true}, sessionConfig{})
 					if err != nil {
 						t.Fatal(err)
 					}
diff --git a/apps/daemon/internal/agent/codex/session_run.go b/apps/daemon/internal/agent/codex/session_run.go
index 9051ea3c4..7517bfb98 100644
--- a/apps/daemon/internal/agent/codex/session_run.go
+++ b/apps/daemon/internal/agent/codex/session_run.go
@@ -47,23 +47,21 @@ func (s *Session) startNative(ctx context.Context, plan SessionPlan, req proto.P
 		ThreadID: s.currentThreadID(),
 		Input:    input,
 	}
-	if plan.CollaborationMode != "" {
-		model := strings.TrimSpace(s.resolvedModel)
-		if model == "" {
-			return fmt.Errorf("codex: collaboration mode requires a resolved model")
-		}
-		var developerInstructions *string
-		if plan.SystemPrompt != "" {
-			developerInstructions = &plan.SystemPrompt
-		}
-		turnParams.CollaborationMode = &CollaborationMode{
-			Mode: plan.CollaborationMode,
-			Settings: CollaborationModeSettings{
-				ReasoningEffort:       plan.ModelReasoningEffort,
-				Model:                 model,
-				DeveloperInstructions: developerInstructions,
-			},
-		}
+	model := strings.TrimSpace(s.resolvedModel)
+	if model == "" {
+		return fmt.Errorf("codex: collaboration mode requires a resolved model")
+	}
+	var developerInstructions *string
+	if plan.SystemPrompt != "" {
+		developerInstructions = &plan.SystemPrompt
+	}
+	turnParams.CollaborationMode = &CollaborationMode{
+		Mode: CollaborationModeDefault,
+		Settings: CollaborationModeSettings{
+			ReasoningEffort:       plan.ModelReasoningEffort,
+			Model:                 model,
+			DeveloperInstructions: developerInstructions,
+		},
 	}
 	turnCtx, turnCancel := context.WithTimeout(ctx, 10*time.Second)
 	_, ackErr := s.rpc.requestWithResult(turnCtx, "turn/start", turnParams, s.bindTurnResult)
diff --git a/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go b/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
index c886439de..9b2bf38f0 100644
--- a/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
+++ b/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
@@ -84,7 +84,7 @@ func TestBlockedSteeringWriteEndsRunWithTerminalFrames(t *testing.T) {
 	defer cancel()
 	out := make(chan proto.Envelope, 8)
 	s := &Session{
-		runID: "run", rpc: client.JSONRPCClient, cancelCtx: ctx, out: out,
+		runID: "run", rpc: client.JSONRPCClient, cancelCtx: ctx, out: out, resolvedModel: "synthetic",
 		cfg: sessionConfig{logger: obslog.Bg()}, waitDone: make(chan struct{}), cleanup: func() {},
 		bufs: NewItemBuffers(), interactions: newPendingCodexInteractions(),
 	}
diff --git a/apps/daemon/internal/agent/codex/skills.go b/apps/daemon/internal/agent/codex/skills.go
index aacb6d0ca..69994f5ee 100644
--- a/apps/daemon/internal/agent/codex/skills.go
+++ b/apps/daemon/internal/agent/codex/skills.go
@@ -2,12 +2,8 @@ package codex
 
 import (
 	"context"
-	"fmt"
-	"log/slog"
 	"strings"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent/managedskills"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
@@ -24,25 +20,6 @@ func effectiveAgentStateKey(req proto.PromptRequestPayload) string {
 	return ""
 }
 
-func prepareManagedSkills(ctx context.Context, logger *slog.Logger, req proto.PromptRequestPayload) (string, error) {
-	rawSkills := req.AgentOptions["skills"]
-	root, err := agent.ManagedSkillsRoot("codex", req.AgentStateKey, req.ConversationID, req.RunID)
-	if err != nil {
-		return "", fmt.Errorf("codex: resolve managed skills root: %w", err)
-	}
-	result, err := managedskills.InstallManagedSkills(ctx, logger, root, rawSkills)
-	if err != nil {
-		return "", fmt.Errorf("codex: install skills: %w", err)
-	}
-	for _, warning := range result.Warnings {
-		logger.Warn("codex: skill install warning", "run_id", req.RunID, "msg", warning)
-	}
-	if len(result.SkillDirs) == 0 {
-		return "", nil
-	}
-	return root, nil
-}
-
 func setSkillExtraRoots(ctx context.Context, rpc *JSONRPCClient, roots []string) error {
 	if len(roots) == 0 {
 		return nil
diff --git a/apps/daemon/internal/agent/codex/skills_test.go b/apps/daemon/internal/agent/codex/skills_test.go
index 35d031ba5..1f90c574b 100644
--- a/apps/daemon/internal/agent/codex/skills_test.go
+++ b/apps/daemon/internal/agent/codex/skills_test.go
@@ -3,8 +3,6 @@ package codex
 import (
 	"context"
 	"encoding/json"
-	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
@@ -43,28 +41,6 @@ func TestSetSkillExtraRootsUsesCodexRPC(t *testing.T) {
 	}
 }
 
-func TestPrepareManagedSkillsPrunesWhenPayloadOmitsSkills(t *testing.T) {
-	home := t.TempDir()
-	t.Setenv("OAC_RUNTIME_HOME", home)
-	stale := filepath.Join(home, "runtime", "codex", "state", "conv-1", "agent-1", "codex", "skills", "stale")
-	if err := os.MkdirAll(stale, 0o755); err != nil {
-		t.Fatal(err)
-	}
-
-	root, err := prepareManagedSkills(context.Background(), nil, proto.PromptRequestPayload{
-		AgentStateKey: "conv-1/agent-1/codex",
-	})
-	if err != nil {
-		t.Fatalf("prepareManagedSkills: %v", err)
-	}
-	if root != "" {
-		t.Fatalf("root = %q, want empty", root)
-	}
-	if _, err := os.Stat(stale); !os.IsNotExist(err) {
-		t.Fatalf("stale skill still exists: %v", err)
-	}
-}
-
 func TestEffectiveAgentStateKeyFallsBackToConversation(t *testing.T) {
 	got := effectiveAgentStateKey(proto.PromptRequestPayload{
 		ConversationID: "conv-legacy",
diff --git a/apps/daemon/internal/agent/codex/subagent_profile.go b/apps/daemon/internal/agent/codex/subagent_profile.go
index 6bf395c68..68afc9626 100644
--- a/apps/daemon/internal/agent/codex/subagent_profile.go
+++ b/apps/daemon/internal/agent/codex/subagent_profile.go
@@ -15,16 +15,12 @@ func configureSubagentObservations(plan *SessionPlan, req proto.PromptRequestPay
 		return nil
 	}
 	for _, feature := range []string{"hooks", "plugins", "code_mode", "code_mode_only", "code_mode_prewarm", "multi_agent_v2"} {
-		plan.EnableFeatures = slices.DeleteFunc(plan.EnableFeatures, func(value string) bool { return value == feature })
 		if !slices.Contains(plan.DisableFeatures, feature) {
 			plan.DisableFeatures = append(plan.DisableFeatures, feature)
 		}
 		plan.ExtraConfig = append(plan.ExtraConfig, [2]string{"features." + feature, "false"})
 	}
-	plan.DisableFeatures = slices.DeleteFunc(plan.DisableFeatures, func(value string) bool { return value == "multi_agent" })
-	if !slices.Contains(plan.EnableFeatures, "multi_agent") {
-		plan.EnableFeatures = append(plan.EnableFeatures, "multi_agent")
-	}
+	plan.EnableFeatures = append(plan.EnableFeatures, "multi_agent")
 	plan.ExtraConfig = append(plan.ExtraConfig, [2]string{"features.multi_agent", "true"}, [2]string{"agents.max_depth", "64"})
 	if req.MaxConcurrentSubagents != nil {
 		if *req.MaxConcurrentSubagents < 1 {
diff --git a/apps/daemon/internal/agent/codex/subagent_profile_test.go b/apps/daemon/internal/agent/codex/subagent_profile_test.go
index 5e9df85a0..14ee5aa5a 100644
--- a/apps/daemon/internal/agent/codex/subagent_profile_test.go
+++ b/apps/daemon/internal/agent/codex/subagent_profile_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestSubagentProfileOverridesUnsafeNativeFeatures(t *testing.T) {
 	limit := 6
-	plan := SessionPlan{EnableFeatures: []string{"hooks", "code_mode", "plugins", "multi_agent_v2"}, DisableFeatures: []string{"multi_agent"}}
+	plan := SessionPlan{}
 	if err := configureSubagentObservations(&plan, proto.PromptRequestPayload{ObserveSubagentIdentities: true, MaxConcurrentSubagents: &limit}); err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/agent/codex/subagents.go b/apps/daemon/internal/agent/codex/subagents.go
index 710e12215..1c273779d 100644
--- a/apps/daemon/internal/agent/codex/subagents.go
+++ b/apps/daemon/internal/agent/codex/subagents.go
@@ -3,9 +3,8 @@ package codex
 import "slices"
 
 func disableSubagents(plan *SessionPlan) {
-	// Native v1 and v2 controls must override operator feature preferences.
+	// Disable both native Subagent feature versions.
 	for _, feature := range []string{"multi_agent", "multi_agent_v2"} {
-		plan.EnableFeatures = slices.DeleteFunc(plan.EnableFeatures, func(value string) bool { return value == feature })
 		if !slices.Contains(plan.DisableFeatures, feature) {
 			plan.DisableFeatures = append(plan.DisableFeatures, feature)
 		}
diff --git a/apps/daemon/internal/agent/codex/subagents_test.go b/apps/daemon/internal/agent/codex/subagents_test.go
index 9e725e0cf..b70d17d7c 100644
--- a/apps/daemon/internal/agent/codex/subagents_test.go
+++ b/apps/daemon/internal/agent/codex/subagents_test.go
@@ -5,14 +5,10 @@ import (
 	"testing"
 )
 
-func TestDisableSubagentsOverridesNativeFeaturePreferences(t *testing.T) {
-	plan := SessionPlan{
-		EnableFeatures:  []string{"multi_agent", "unrelated", "multi_agent_v2"},
-		DisableFeatures: []string{"another", "multi_agent"},
-	}
+func TestDisableSubagentsDisablesBothNativeFeatures(t *testing.T) {
+	plan := SessionPlan{DisableFeatures: []string{"another", "multi_agent"}}
 	disableSubagents(&plan)
-	if !reflect.DeepEqual(plan.EnableFeatures, []string{"unrelated"}) ||
-		!reflect.DeepEqual(plan.DisableFeatures, []string{"another", "multi_agent", "multi_agent_v2"}) {
-		t.Fatal(plan.EnableFeatures, plan.DisableFeatures)
+	if !reflect.DeepEqual(plan.DisableFeatures, []string{"another", "multi_agent", "multi_agent_v2"}) {
+		t.Fatal(plan.DisableFeatures)
 	}
 }
diff --git a/apps/daemon/internal/agent/codex/verbosity_test.go b/apps/daemon/internal/agent/codex/verbosity_test.go
deleted file mode 100644
index 924cc52e3..000000000
--- a/apps/daemon/internal/agent/codex/verbosity_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package codex
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestVerbosityConfiguration(t *testing.T) {
-	for _, mode := range []string{"", "low", "medium", "high"} {
-		t.Run(mode, func(t *testing.T) {
-			t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-			opts := map[string]any{}
-			var want [][2]string
-			if mode != "" {
-				opts["model_verbosity"] = mode
-				want = [][2]string{{"model_verbosity", `"` + mode + `"`}}
-			}
-			plan, err := BuildSessionPlan("run", "state", opts)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer plan.Cleanup()
-			if !reflect.DeepEqual(plan.ExtraConfig, want) {
-				t.Fatalf("config = %v, want %v", plan.ExtraConfig, want)
-			}
-		})
-	}
-	for _, value := range []any{nil, "", "enabled", true, 1, map[string]any{}, []any{}} {
-		if _, err := BuildSessionPlan("run", "state", map[string]any{"model_verbosity": value}); err == nil {
-			t.Fatalf("accepted invalid model_verbosity %T", value)
-		}
-	}
-}
diff --git a/apps/daemon/internal/agent/codex/web_search_test.go b/apps/daemon/internal/agent/codex/web_search_test.go
deleted file mode 100644
index 43fc00de9..000000000
--- a/apps/daemon/internal/agent/codex/web_search_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package codex
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestWebSearchConfiguration(t *testing.T) {
-	for _, mode := range []string{"", "disabled", "cached", "live"} {
-		t.Run(mode, func(t *testing.T) {
-			t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-			opts := map[string]any{}
-			var want [][2]string
-			if mode != "" {
-				opts["web_search"] = mode
-				want = [][2]string{{"web_search", `"` + mode + `"`}}
-			}
-			plan, err := BuildSessionPlan("run", "state", opts)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer plan.Cleanup()
-			if !reflect.DeepEqual(plan.ExtraConfig, want) {
-				t.Fatalf("config = %v, want %v", plan.ExtraConfig, want)
-			}
-		})
-	}
-	for _, value := range []any{nil, "", "enabled", true, 1, map[string]any{}, []any{}} {
-		if _, err := BuildSessionPlan("run", "state", map[string]any{"web_search": value}); err == nil {
-			t.Fatalf("accepted invalid web_search %T", value)
-		}
-	}
-}
diff --git a/apps/daemon/internal/agent/harness.go b/apps/daemon/internal/agent/harness.go
index 7d0f715dd..5ca1f91e6 100644
--- a/apps/daemon/internal/agent/harness.go
+++ b/apps/daemon/internal/agent/harness.go
@@ -50,17 +50,12 @@ type DiscoveryOptions struct {
 }
 
 // Runtime binds one discovered descriptor to its native factories.
-// SessionCapabilityContext and ExecutorCapabilityContext request the Runtime's
-// capability-download URL and scoped product-upload context for those factories.
-// Preparation never receives those execution-only effects.
 type Runtime struct {
-	Info                      proto.SupportedAgentKind
-	Session                   Factory
-	Preparation               PreparationFactory
-	Executor                  ExecutorFactory
-	WorkspaceReadPreparation  bool
-	SessionCapabilityContext  bool
-	ExecutorCapabilityContext bool
+	Info                     proto.SupportedAgentKind
+	Session                  Factory
+	Preparation              PreparationFactory
+	Executor                 ExecutorFactory
+	WorkspaceReadPreparation bool
 }
 
 // Register installs a discovered Runtime with its declaration's configuration.
@@ -297,7 +292,7 @@ func (r *Registry) RegisterExecutor(kind string, factory ExecutorFactory) {
 }
 
 // RegisterPreparation installs a separate execution-only path. Product factory
-// wrappers must not add authoring or capability-download side effects to it.
+// wrappers must not add authoring side effects to it.
 func (r *Registry) RegisterPreparation(kind string, workspaceRead bool, prepare PreparationFactory) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
diff --git a/apps/daemon/internal/agent/managedskills/archive.go b/apps/daemon/internal/agent/managedskills/archive.go
deleted file mode 100644
index 363f8b0da..000000000
--- a/apps/daemon/internal/agent/managedskills/archive.go
+++ /dev/null
@@ -1,289 +0,0 @@
-package managedskills
-
-import (
-	"archive/zip"
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-// pluginInstallTimeout caps a single plugin's download + extract step.
-const pluginInstallTimeout = 60 * time.Second
-
-// maxPluginZipBytes mirrors the server-side cap in
-// server/internal/capability/parser/plugin_validator.go. Defense in
-// depth.
-const maxPluginZipBytes int64 = 32 * 1024 * 1024
-
-// pluginsHTTPClient timeout is larger than pluginInstallTimeout so the
-// per-call context cancel dominates.
-var pluginsHTTPClient = &http.Client{
-	Timeout: pluginInstallTimeout + 10*time.Second,
-}
-
-// fetchPluginZip GETs url into dst, capping the body at
-// maxPluginZipBytes. Returns an OPEN file descriptor positioned at
-// offset 0; the caller closes it. Holding the FD across verify +
-// extract closes the TOCTOU between hashing the on-disk bytes and
-// reading them for extract — even if someone swaps the file, the open
-// FD points at the original inode.
-//
-// Only http/https are accepted to defend against a future
-// canonical_spec letting attacker-supplied download_url reach this
-// code with file:// or http://internal-ip/... values.
-func fetchPluginZip(ctx context.Context, downloadURL, dst string) (*os.File, error) {
-	parsed, err := url.Parse(downloadURL)
-	if err != nil || (parsed.Scheme != "http" && parsed.Scheme != "https") {
-		// Don't include downloadURL — it carries the signature query
-		// string.
-		return nil, errors.New("download_url must be http(s)")
-	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, downloadURL, nil)
-	if err != nil {
-		return nil, errors.New("build request failed")
-	}
-	resp, err := pluginsHTTPClient.Do(req)
-	if err != nil {
-		// Strip embedded URL via sanitizeHTTPClientError —
-		// OSSAccessKeyId + Signature would otherwise leak into the
-		// daemon log.
-		return nil, fmt.Errorf("get failed: %s", sanitizeHTTPClientError(err))
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode/100 != 2 {
-		_, _ = io.Copy(io.Discard, io.LimitReader(resp.Body, 4*1024))
-		return nil, fmt.Errorf("get: status %d", resp.StatusCode)
-	}
-
-	// O_EXCL — the per-call uuid in the path makes a collision a
-	// programmer error, not an attacker condition. Failing fast is
-	// safer than silent truncation.
-	f, err := os.OpenFile(dst, os.O_CREATE|os.O_EXCL|os.O_RDWR, 0o600)
-	if err != nil {
-		return nil, fmt.Errorf("open dst: %w", err)
-	}
-
-	limited := io.LimitReader(resp.Body, maxPluginZipBytes+1)
-	written, err := io.Copy(f, limited)
-	if err != nil {
-		_ = f.Close()
-		return nil, fmt.Errorf("copy body: %w", err)
-	}
-	if written > maxPluginZipBytes {
-		_ = f.Close()
-		return nil, fmt.Errorf("zip exceeds %d byte cap", maxPluginZipBytes)
-	}
-	if _, err := f.Seek(0, io.SeekStart); err != nil {
-		_ = f.Close()
-		return nil, fmt.Errorf("seek after write: %w", err)
-	}
-	return f, nil
-}
-
-// sanitizeHTTPClientError strips the URL embedded by *url.Error.
-// net/http returns errors that include the full request URL — for
-// presigned OSS URLs that's OSSAccessKeyId + Signature + Expires.
-// Without redaction those credentials land in the daemon log via
-// PluginInstallResult.Warnings → session.go logger.Warn.
-//
-// Format is `<method> "<url>": <inner>` — keep the method + inner
-// message, drop the URL.
-func sanitizeHTTPClientError(err error) string {
-	if err == nil {
-		return ""
-	}
-	msg := err.Error()
-	open := strings.Index(msg, `"`)
-	if open < 0 {
-		return msg
-	}
-	close := strings.Index(msg[open+1:], `"`)
-	if close < 0 {
-		return msg
-	}
-	closeAbs := open + 1 + close
-	if closeAbs+2 > len(msg) {
-		return msg
-	}
-	return msg[:open] + "<redacted-url>" + msg[closeAbs+1:]
-}
-
-// verifyPluginSHA256FromFD hashes the bytes the open FD points at and
-// compares against want (lowercase hex). Rewinds the FD afterwards.
-func verifyPluginSHA256FromFD(fd *os.File, want string) error {
-	want = strings.ToLower(strings.TrimSpace(want))
-	if want == "" {
-		return errors.New("verify: empty expected sha256")
-	}
-	if _, err := fd.Seek(0, io.SeekStart); err != nil {
-		return fmt.Errorf("verify: seek: %w", err)
-	}
-	h := sha256.New()
-	if _, err := io.Copy(h, fd); err != nil {
-		return fmt.Errorf("verify: hash: %w", err)
-	}
-	got := hex.EncodeToString(h.Sum(nil))
-	if got != want {
-		return fmt.Errorf("verify: sha256 mismatch (want=%s got=%s)", want, got)
-	}
-	return nil
-}
-
-// extractPluginZipFromFD reads via io.NewSectionReader rather than
-// re-opening the path so the byte stream stays identical to the
-// verified one (TOCTOU defense).
-func extractPluginZipFromFD(fd *os.File, size int64, dst string) error {
-	zr, err := zip.NewReader(io.NewSectionReader(fd, 0, size), size)
-	if err != nil {
-		return fmt.Errorf("extract: open zip: %w", err)
-	}
-
-	root := detectSingleZipRoot(zr.File)
-	absDst, err := filepath.Abs(dst)
-	if err != nil {
-		return fmt.Errorf("extract: abs dst: %w", err)
-	}
-
-	for _, f := range zr.File {
-		name := normaliseZipPath(f.Name)
-		if name == "" || strings.HasPrefix(name, "__MACOSX/") || name == "__MACOSX" {
-			continue
-		}
-		// Skip non-regular zip entries (symlinks, devices, named
-		// pipes). Symlink entries flagged with Unix lrwxrwxrwx mode
-		// bits would otherwise be written as plain files containing
-		// the link target string — an exfil vector.
-		mode := f.Mode()
-		if !f.FileInfo().IsDir() && !mode.IsRegular() {
-			continue
-		}
-		if root != "" {
-			if !strings.HasPrefix(name, root) {
-				continue
-			}
-			name = strings.TrimPrefix(name, root)
-			if name == "" {
-				continue
-			}
-		}
-
-		target := filepath.Join(absDst, name)
-		rel, err := filepath.Rel(absDst, target)
-		if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
-			return fmt.Errorf("extract: entry %q escapes target", f.Name)
-		}
-
-		if f.FileInfo().IsDir() {
-			if err := os.MkdirAll(target, 0o755); err != nil {
-				return fmt.Errorf("extract: mkdir %s: %w", target, err)
-			}
-			continue
-		}
-		if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
-			return fmt.Errorf("extract: mkdir parent of %s: %w", target, err)
-		}
-		if err := writeZipEntry(f, target); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// writeZipEntry streams one zip entry into target preserving the
-// entry's mode bits (executables stay executable — hook scripts need
-// this). 0644 default when no mode is set.
-func writeZipEntry(f *zip.File, target string) error {
-	rc, err := f.Open()
-	if err != nil {
-		return fmt.Errorf("extract: open entry %s: %w", f.Name, err)
-	}
-	defer rc.Close()
-
-	mode := f.Mode().Perm()
-	if mode == 0 {
-		mode = 0o644
-	}
-	out, err := os.OpenFile(target, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, mode)
-	if err != nil {
-		return fmt.Errorf("extract: open target %s: %w", target, err)
-	}
-	defer out.Close()
-	if _, err := io.Copy(out, rc); err != nil {
-		return fmt.Errorf("extract: copy %s: %w", target, err)
-	}
-	return nil
-}
-
-// detectSingleZipRoot returns the common root directory (with trailing
-// slash) shared by every non-MACOSX entry, or "" when there is none.
-// Hidden directories (".*") are NOT treated as wrappers because
-// `.claude-plugin/` is a legitimate plugin component.
-//
-// `normaliseZipPath` strips trailing slashes, so a bare directory
-// entry like `my-plugin/` arrives as `my-plugin` —
-// indistinguishable from a top-level file. Skipping entries without an
-// internal "/" lets us pick a real file path and infer the wrapper.
-// Without this, `zip -r foo foo/` would short-circuit on the leading
-// `foo/` directory entry and leave the manifest nested.
-// (Mirrors server-side plugin_validator.detectSingleRoot — the two
-// must agree.)
-func detectSingleZipRoot(files []*zip.File) string {
-	var first string
-	for _, f := range files {
-		name := normaliseZipPath(f.Name)
-		if name == "" || strings.HasPrefix(name, "__MACOSX/") || name == "__MACOSX" {
-			continue
-		}
-		if !strings.Contains(name, "/") {
-			continue
-		}
-		first = name
-		break
-	}
-	if first == "" {
-		return ""
-	}
-	idx := strings.Index(first, "/")
-	if idx <= 0 {
-		return ""
-	}
-	root := first[:idx+1]
-	if strings.HasPrefix(root, ".") {
-		return ""
-	}
-	for _, f := range files {
-		name := normaliseZipPath(f.Name)
-		if name == "" || strings.HasPrefix(name, "__MACOSX/") || name == "__MACOSX" {
-			continue
-		}
-		// Bare directory entries (e.g. `my-plugin`) arrive without a
-		// trailing slash. If the entry equals the root with the slash
-		// trimmed, it's the wrapping dir itself.
-		if name+"/" == root {
-			continue
-		}
-		if !strings.HasPrefix(name, root) {
-			return ""
-		}
-	}
-	return root
-}
-
-// normaliseZipPath converts back-slashes to forward slashes (some
-// Windows zip writers emit `\`) and strips trailing slashes that
-// directory entries may carry.
-func normaliseZipPath(name string) string {
-	p := strings.ReplaceAll(name, "\\", "/")
-	return strings.TrimSuffix(p, "/")
-}
-
-func stringField(m map[string]any, key string) string { s, _ := m[key].(string); return s }
diff --git a/apps/daemon/internal/agent/managedskills/archive_test.go b/apps/daemon/internal/agent/managedskills/archive_test.go
deleted file mode 100644
index af5c30a55..000000000
--- a/apps/daemon/internal/agent/managedskills/archive_test.go
+++ /dev/null
@@ -1,486 +0,0 @@
-package managedskills
-
-import (
-	"archive/zip"
-	"bytes"
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"log/slog"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-// pluginZipFile mirrors the server-side validator test helper.
-type pluginZipFile struct {
-	Name string
-	Body string
-	Mode os.FileMode // 0 → default
-}
-
-func buildPluginZipBytes(t *testing.T, files []pluginZipFile) []byte {
-	t.Helper()
-	var buf bytes.Buffer
-	zw := zip.NewWriter(&buf)
-	for _, f := range files {
-		hdr := &zip.FileHeader{Name: f.Name, Method: zip.Deflate}
-		if f.Mode != 0 {
-			hdr.SetMode(f.Mode)
-		}
-		w, err := zw.CreateHeader(hdr)
-		if err != nil {
-			t.Fatalf("zip header %q: %v", f.Name, err)
-		}
-		if _, err := w.Write([]byte(f.Body)); err != nil {
-			t.Fatalf("zip write %q: %v", f.Name, err)
-		}
-	}
-	if err := zw.Close(); err != nil {
-		t.Fatalf("zip close: %v", err)
-	}
-	return buf.Bytes()
-}
-
-// validPluginZipBytes is the baseline fixture every install test uses
-// unless it explicitly mutates the entry set.
-func validPluginZipBytes(t *testing.T) []byte {
-	return buildPluginZipBytes(t, []pluginZipFile{
-		{Name: ".claude-plugin/plugin.json", Body: `{"name":"my-plugin","version":"1.0.0"}`},
-		{Name: "commands/hello.md", Body: "---\nname: hello\n---\nbody"},
-	})
-}
-
-func sha256Hex(body []byte) string {
-	h := sha256.Sum256(body)
-	return hex.EncodeToString(h[:])
-}
-
-// pluginServer is a deterministic stand-in for the OSS presigned GET
-// endpoint. It counts hits so cache-hit tests can verify the second
-// install call did NOT round-trip.
-type pluginServer struct {
-	*httptest.Server
-	hits *int
-	body []byte
-	stat int
-}
-
-func startPluginServer(t *testing.T, body []byte) *pluginServer {
-	t.Helper()
-	var hits int
-	ps := &pluginServer{hits: &hits, body: body, stat: http.StatusOK}
-	ps.Server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hits++
-		w.WriteHeader(ps.stat)
-		_, _ = w.Write(ps.body)
-	}))
-	t.Cleanup(ps.Close)
-	return ps
-}
-
-func (s *pluginServer) Hits() int { return *s.hits }
-
-func discardLogger() *slog.Logger {
-	return slog.New(slog.NewTextHandler(io.Discard, nil))
-}
-
-func TestInstallPlugins_HappyPath_ExtractsAndStampsCacheKey(t *testing.T) {
-	t.Parallel()
-	body := validPluginZipBytes(t)
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "my-plugin", Version: "1.0.0", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	})
-	if err != nil {
-		t.Fatalf("installPlugins: %v", err)
-	}
-	if len(res.SkillDirs) != 1 {
-		t.Fatalf("SkillDirs = %v, want 1 entry", res.SkillDirs)
-	}
-	if len(res.Warnings) != 0 {
-		t.Fatalf("unexpected warnings: %v", res.Warnings)
-	}
-
-	dir := res.SkillDirs[0]
-	if filepath.Base(dir) != "my-plugin" {
-		t.Fatalf("dir basename = %q, want my-plugin", filepath.Base(dir))
-	}
-	if _, err := os.Stat(filepath.Join(dir, ".claude-plugin", "plugin.json")); err != nil {
-		t.Fatalf("manifest missing: %v", err)
-	}
-	if _, err := os.Stat(filepath.Join(dir, "commands", "hello.md")); err != nil {
-		t.Fatalf("commands entry missing: %v", err)
-	}
-	stamped, err := os.ReadFile(filepath.Join(dir, ".cache-key"))
-	if err != nil {
-		t.Fatalf("read cache-key: %v", err)
-	}
-	want := "my-plugin@" + sha256Hex(body)
-	if string(stamped) != want {
-		t.Fatalf("cache-key = %q, want %q", stamped, want)
-	}
-}
-
-func TestInstallPlugins_CacheHitSkipsDownload(t *testing.T) {
-	t.Parallel()
-	body := validPluginZipBytes(t)
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	desc := []skillDescriptor{
-		{Name: "my-plugin", Version: "1.0.0", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	}
-	if _, err := installSkillsForTest(context.Background(), discardLogger(), workDir, desc); err != nil {
-		t.Fatalf("first install: %v", err)
-	}
-	hitsAfterFirst := srv.Hits()
-	if hitsAfterFirst != 1 {
-		t.Fatalf("first install hits = %d, want 1", hitsAfterFirst)
-	}
-
-	// Second install with the same descriptor — cache-key match
-	// short-circuits BEFORE any HTTP call.
-	if _, err := installSkillsForTest(context.Background(), discardLogger(), workDir, desc); err != nil {
-		t.Fatalf("second install: %v", err)
-	}
-	if got := srv.Hits(); got != hitsAfterFirst {
-		t.Fatalf("second install made %d additional hits; cache should have prevented network", got-hitsAfterFirst)
-	}
-}
-
-func TestInstallPlugins_CacheInvalidatedBySHA256Change(t *testing.T) {
-	t.Parallel()
-	body := validPluginZipBytes(t)
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-	logger := discardLogger()
-
-	first := []skillDescriptor{
-		{Name: "my-plugin", Version: "1.0.0", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	}
-	if _, err := installSkillsForTest(context.Background(), logger, workDir, first); err != nil {
-		t.Fatalf("first install: %v", err)
-	}
-
-	// Swap the server payload + sha. Cache key contains the sha so it
-	// must be invalidated.
-	newBody := buildPluginZipBytes(t, []pluginZipFile{
-		{Name: ".claude-plugin/plugin.json", Body: `{"name":"my-plugin","version":"1.0.0"}`},
-		{Name: "commands/different.md", Body: "---\nname: different\n---\nbody"},
-	})
-	srv.body = newBody
-
-	second := []skillDescriptor{
-		{Name: "my-plugin", Version: "1.0.0", DownloadURL: srv.URL, SHA256: sha256Hex(newBody)},
-	}
-	if _, err := installSkillsForTest(context.Background(), logger, workDir, second); err != nil {
-		t.Fatalf("second install: %v", err)
-	}
-	dir := filepath.Join(workDir, "my-plugin")
-	if _, err := os.Stat(filepath.Join(dir, "commands", "different.md")); err != nil {
-		t.Fatalf("new content not extracted: %v", err)
-	}
-	if _, err := os.Stat(filepath.Join(dir, "commands", "hello.md")); err == nil {
-		t.Fatal("old content survived the re-install")
-	}
-}
-
-func TestInstallPlugins_SHA256MismatchDemotesToWarning(t *testing.T) {
-	t.Parallel()
-	body := validPluginZipBytes(t)
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	// Wrong sha → no install, no hard error; rest of the prompt
-	// continues without this plugin.
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "my-plugin", Version: "1.0.0", DownloadURL: srv.URL, SHA256: strings.Repeat("0", 64)},
-	})
-	if err != nil {
-		t.Fatalf("installPlugins: %v", err)
-	}
-	if len(res.SkillDirs) != 0 {
-		t.Fatalf("SkillDirs = %v, want empty after sha mismatch", res.SkillDirs)
-	}
-	if len(res.Warnings) == 0 {
-		t.Fatal("expected warning on sha mismatch")
-	}
-	if !strings.Contains(res.Warnings[0], "sha256 mismatch") {
-		t.Fatalf("warning text = %q, want sha256-mismatch hint", res.Warnings[0])
-	}
-	// No .cache-key file must be stamped — would short-circuit future
-	// retries with the same bad sha.
-	if _, err := os.Stat(filepath.Join(workDir, "my-plugin", ".cache-key")); err == nil {
-		t.Fatal("cache-key stamped despite sha mismatch")
-	}
-}
-
-func TestInstallPlugins_HTTPErrorDemotesToWarning(t *testing.T) {
-	t.Parallel()
-	workDir := t.TempDir()
-	srv := startPluginServer(t, nil)
-	srv.stat = http.StatusForbidden
-
-	res, _ := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "p", Version: "1", DownloadURL: srv.URL, SHA256: strings.Repeat("a", 64)},
-	})
-	if len(res.SkillDirs) != 0 {
-		t.Fatal("expected no installed dirs on 403")
-	}
-	if len(res.Warnings) == 0 {
-		t.Fatal("expected warning on 403")
-	}
-}
-
-func TestInstallPlugins_StripWrappingRoot(t *testing.T) {
-	t.Parallel()
-	body := buildPluginZipBytes(t, []pluginZipFile{
-		{Name: "wrapper-dir/.claude-plugin/plugin.json", Body: `{"name":"x","version":"1"}`},
-		{Name: "wrapper-dir/commands/hi.md", Body: "---\nname: hi\n---"},
-	})
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "x", Version: "1", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	})
-	if err != nil {
-		t.Fatalf("install: %v", err)
-	}
-	if len(res.SkillDirs) != 1 {
-		t.Fatalf("SkillDirs = %v", res.SkillDirs)
-	}
-	dir := res.SkillDirs[0]
-	if _, err := os.Stat(filepath.Join(dir, ".claude-plugin", "plugin.json")); err != nil {
-		t.Fatalf("manifest at expected path missing (wrapper not stripped?): %v", err)
-	}
-	if _, err := os.Stat(filepath.Join(dir, "wrapper-dir")); err == nil {
-		t.Fatal("wrapper-dir survived the strip")
-	}
-}
-
-// TestInstallPlugins_StripWrappingRootWithBareDirEntry locks in the
-// production fix: real `zip -r my-plugin.zip my-plugin/` archives emit
-// a bare directory entry first; naive root-inference sees no internal
-// "/" and concludes "no wrapper to strip". The fix skips directory-
-// only entries when picking the first candidate.
-func TestInstallPlugins_StripWrappingRootWithBareDirEntry(t *testing.T) {
-	t.Parallel()
-	body := buildPluginZipBytes(t, []pluginZipFile{
-		// Bare directory entry — the gotcha.
-		{Name: "wrapper-dir/", Body: ""},
-		{Name: "wrapper-dir/.claude-plugin/plugin.json", Body: `{"name":"x","version":"1"}`},
-		{Name: "wrapper-dir/commands/hi.md", Body: "---\nname: hi\n---"},
-	})
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "x", Version: "1", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	})
-	if err != nil {
-		t.Fatalf("install: %v", err)
-	}
-	if len(res.SkillDirs) != 1 {
-		t.Fatalf("SkillDirs = %v", res.SkillDirs)
-	}
-	dir := res.SkillDirs[0]
-	if _, err := os.Stat(filepath.Join(dir, ".claude-plugin", "plugin.json")); err != nil {
-		t.Fatalf("manifest at expected path missing (bare dir entry confused wrapper detection?): %v", err)
-	}
-	if _, err := os.Stat(filepath.Join(dir, "wrapper-dir")); err == nil {
-		t.Fatal("wrapper-dir survived the strip")
-	}
-}
-
-func TestInstallPlugins_MacOSXMetadataIgnored(t *testing.T) {
-	t.Parallel()
-	body := buildPluginZipBytes(t, []pluginZipFile{
-		{Name: "__MACOSX/._plugin.json", Body: "binary metadata"},
-		{Name: ".claude-plugin/plugin.json", Body: `{"name":"x","version":"1"}`},
-	})
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "x", Version: "1", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	})
-	if err != nil {
-		t.Fatalf("install: %v", err)
-	}
-	dir := res.SkillDirs[0]
-	if _, err := os.Stat(filepath.Join(dir, "__MACOSX")); err == nil {
-		t.Fatal("__MACOSX dir was extracted despite filter")
-	}
-	if _, err := os.Stat(filepath.Join(dir, ".claude-plugin", "plugin.json")); err != nil {
-		t.Fatalf("manifest missing: %v", err)
-	}
-}
-
-func TestInstallPlugins_PathTraversalRejected(t *testing.T) {
-	t.Parallel()
-	// "../../etc/passwd" entry must not write outside the target dir.
-	body := buildPluginZipBytes(t, []pluginZipFile{
-		{Name: ".claude-plugin/plugin.json", Body: `{"name":"x","version":"1"}`},
-		{Name: "../../escape", Body: "should never land outside dir"},
-	})
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	res, _ := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "x", Version: "1", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	})
-	if len(res.SkillDirs) != 0 {
-		t.Fatalf("SkillDirs = %v, want empty on path-traversal", res.SkillDirs)
-	}
-	if len(res.Warnings) == 0 {
-		t.Fatal("expected warning on path-traversal")
-	}
-	if !strings.Contains(res.Warnings[0], "escapes") {
-		t.Fatalf("warning text = %q, want escape hint", res.Warnings[0])
-	}
-}
-
-func TestInstallPlugins_SymlinkEntrySkipped(t *testing.T) {
-	t.Parallel()
-	// archive/zip's SetMode() drops file-type bits, so to test a real
-	// symlink entry we set ExternalAttrs by hand — upper 16 bits are
-	// the Unix mode (S_IFLNK | perm), which is how attacker-crafted
-	// zips actually mark symlinks.
-	var buf bytes.Buffer
-	zw := zip.NewWriter(&buf)
-	{
-		hdr := &zip.FileHeader{Name: ".claude-plugin/plugin.json", Method: zip.Deflate}
-		w, err := zw.CreateHeader(hdr)
-		if err != nil {
-			t.Fatalf("create manifest: %v", err)
-		}
-		if _, err := w.Write([]byte(`{"name":"x","version":"1"}`)); err != nil {
-			t.Fatalf("write manifest: %v", err)
-		}
-	}
-	{
-		hdr := &zip.FileHeader{Name: "commands/evil.md", Method: zip.Deflate}
-		// 0xA1ED = S_IFLNK (0xA000) | 0755. External attrs are
-		// (unix_mode << 16) per the zip spec.
-		hdr.ExternalAttrs = 0xA1ED << 16
-		hdr.CreatorVersion = 3 << 8 // UNIX host system
-		w, err := zw.CreateHeader(hdr)
-		if err != nil {
-			t.Fatalf("create symlink: %v", err)
-		}
-		if _, err := w.Write([]byte("/etc/passwd")); err != nil {
-			t.Fatalf("write symlink target: %v", err)
-		}
-	}
-	if err := zw.Close(); err != nil {
-		t.Fatalf("zip close: %v", err)
-	}
-	body := buf.Bytes()
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "x", Version: "1", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	})
-	if err != nil {
-		t.Fatalf("install: %v", err)
-	}
-	if len(res.SkillDirs) != 1 {
-		t.Fatalf("SkillDirs = %v, want 1", res.SkillDirs)
-	}
-	dir := res.SkillDirs[0]
-	if _, err := os.Stat(filepath.Join(dir, ".claude-plugin", "plugin.json")); err != nil {
-		t.Fatalf("manifest missing: %v", err)
-	}
-	if _, err := os.Stat(filepath.Join(dir, "commands", "evil.md")); err == nil {
-		t.Fatal("symlink entry was extracted as a regular file; symlinks must be skipped")
-	}
-}
-
-func TestInstallPlugins_ConcurrentSamePluginNoTruncation(t *testing.T) {
-	t.Parallel()
-	// Per-call uuid in the temp filename makes each install's temp
-	// file independent; concurrent installs of the same (name,
-	// version) must both succeed.
-	body := validPluginZipBytes(t)
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	done := make(chan error, 2)
-	for i := 0; i < 2; i++ {
-		go func() {
-			res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-				{Name: "my-plugin", Version: "1.0.0", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-			})
-			if err != nil {
-				done <- err
-				return
-			}
-			if len(res.SkillDirs) != 1 {
-				done <- fmt.Errorf("SkillDirs = %v", res.SkillDirs)
-				return
-			}
-			done <- nil
-		}()
-	}
-	for i := 0; i < 2; i++ {
-		if err := <-done; err != nil {
-			t.Fatalf("concurrent install failed: %v", err)
-		}
-	}
-}
-
-func TestInstallPlugins_PartialInstall(t *testing.T) {
-	t.Parallel()
-	// Good descriptor installs; bad-sha descriptor demotes to warning.
-	bodyOK := buildPluginZipBytes(t, []pluginZipFile{
-		{Name: ".claude-plugin/plugin.json", Body: `{"name":"good","version":"1"}`},
-	})
-	srvOK := startPluginServer(t, bodyOK)
-	srvBAD := startPluginServer(t, bodyOK)
-	workDir := t.TempDir()
-
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "good", Version: "1", DownloadURL: srvOK.URL, SHA256: sha256Hex(bodyOK)},
-		{Name: "bad", Version: "1", DownloadURL: srvBAD.URL, SHA256: strings.Repeat("0", 64)},
-	})
-	if err != nil {
-		t.Fatalf("install: %v", err)
-	}
-	if len(res.SkillDirs) != 1 {
-		t.Fatalf("SkillDirs = %v, want 1 (only the good one)", res.SkillDirs)
-	}
-	if !strings.HasSuffix(res.SkillDirs[0], "/good") {
-		t.Fatalf("SkillDirs[0] = %q, want trailing /good", res.SkillDirs[0])
-	}
-	if len(res.Warnings) == 0 {
-		t.Fatal("expected warning for the bad plugin")
-	}
-}
-
-func TestInstallPlugins_EmptyListIsNoop(t *testing.T) {
-	t.Parallel()
-	res, err := installSkillsForTest(context.Background(), discardLogger(), t.TempDir(), nil)
-	if err != nil {
-		t.Fatalf("install: %v", err)
-	}
-	if len(res.SkillDirs) != 0 || len(res.Warnings) != 0 {
-		t.Fatalf("expected empty result; got %+v", res)
-	}
-}
-
-func installSkillsForTest(ctx context.Context, logger *slog.Logger, root string, descriptors []skillDescriptor) (SkillInstallResult, error) {
-	raw := make([]any, 0, len(descriptors))
-	for _, d := range descriptors {
-		raw = append(raw, map[string]any{"name": d.Name, "version": d.Version, "download_url": d.DownloadURL, "sha256": d.SHA256})
-	}
-	return InstallManagedSkills(ctx, logger, root, raw)
-}
diff --git a/apps/daemon/internal/agent/managedskills/concurrency_test.go b/apps/daemon/internal/agent/managedskills/concurrency_test.go
deleted file mode 100644
index dd2f40255..000000000
--- a/apps/daemon/internal/agent/managedskills/concurrency_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package managedskills
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-func installConcurrentFixture(ctx context.Context, kind, root, url string, body []byte) error {
-	result, err := InstallManagedSkills(ctx, discardLogger(), root, []any{map[string]any{"name": "fixture", "version": "1.0.0", "download_url": url, "sha256": sha256Hex(body)}})
-	dirs, warnings := result.SkillDirs, result.Warnings
-
-	if err != nil {
-		return err
-	}
-	if len(dirs) != 1 || len(warnings) != 0 {
-		return fmt.Errorf("dirs=%v warnings=%v", dirs, warnings)
-	}
-	content, err := os.ReadFile(filepath.Join(dirs[0], "SKILL.md"))
-	if err != nil {
-		return err
-	}
-	if string(content) != "Complete fixture contents.\n" {
-		return fmt.Errorf("incomplete file: %q", content)
-	}
-	return nil
-}
-
-func TestInstallsConcurrentSameRoot(t *testing.T) {
-	for _, kind := range []string{"managed"} {
-		t.Run(kind, func(t *testing.T) {
-			body := buildPluginZipBytes(t, []pluginZipFile{{Name: "SKILL.md", Body: "Complete fixture contents.\n"}})
-			var calls atomic.Int32
-			srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				calls.Add(1)
-				_, _ = w.Write(body)
-			}))
-			defer srv.Close()
-			parent := t.TempDir()
-			alias := filepath.Join(t.TempDir(), "alias")
-			if err := os.Symlink(parent, alias); err != nil {
-				t.Fatal(err)
-			}
-			results := make(chan error, 8)
-			for i := range 8 {
-				root := filepath.Join(parent, "new", "root")
-				if i%2 == 1 {
-					root = filepath.Join(alias, "new", "root")
-				}
-				go func() { results <- installConcurrentFixture(context.Background(), kind, root, srv.URL, body) }()
-			}
-			for range 8 {
-				if err := <-results; err != nil {
-					t.Error(err)
-				}
-			}
-			if calls.Load() != 1 {
-				t.Errorf("downloads=%d, want one installation shared through the cache", calls.Load())
-			}
-		})
-	}
-}
-
-func TestInstallWaitCancellation(t *testing.T) {
-	for _, kind := range []string{"managed"} {
-		t.Run(kind, func(t *testing.T) {
-			body := buildPluginZipBytes(t, []pluginZipFile{{Name: "SKILL.md", Body: "Complete fixture contents.\n"}})
-			started, release := make(chan struct{}, 2), make(chan struct{})
-			srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				started <- struct{}{}
-				select {
-				case <-release:
-					_, _ = w.Write(body)
-				case <-r.Context().Done():
-				}
-			}))
-			defer srv.Close()
-			ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-			defer cancel()
-			root := t.TempDir()
-			first := make(chan error, 1)
-			go func() { first <- installConcurrentFixture(ctx, kind, root, srv.URL, body) }()
-			select {
-			case <-started:
-			case <-ctx.Done():
-				t.Fatal("first download did not start")
-			}
-			waiting, cancelWait := context.WithCancel(ctx)
-			cancelWait()
-			if err := installConcurrentFixture(waiting, kind, root, srv.URL, body); err != context.Canceled {
-				t.Errorf("waiting install error=%v, want cancellation", err)
-			}
-			close(release)
-			if err := <-first; err != nil {
-				t.Fatal(err)
-			}
-			if err := installConcurrentFixture(ctx, kind, root, srv.URL, body); err != nil {
-				t.Fatalf("cancelled waiter damaged installation: %v", err)
-			}
-			if len(started) != 0 {
-				t.Fatal("cancelled waiter started another download")
-			}
-		})
-	}
-}
-
-func TestInstallsIndependentRootsRemainConcurrent(t *testing.T) {
-	body := buildPluginZipBytes(t, []pluginZipFile{{Name: "SKILL.md", Body: "Complete fixture contents.\n"}})
-	started, release := make(chan struct{}, 2), make(chan struct{})
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		started <- struct{}{}
-		select {
-		case <-release:
-			_, _ = w.Write(body)
-		case <-r.Context().Done():
-		}
-	}))
-	defer srv.Close()
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-	results := make(chan error, 2)
-	for _, root := range []string{t.TempDir(), t.TempDir()} {
-		go func() { results <- installConcurrentFixture(ctx, "managed", root, srv.URL, body) }()
-	}
-	for range 2 {
-		select {
-		case <-started:
-		case <-ctx.Done():
-			t.Fatal("independent roots were serialized")
-		}
-	}
-	close(release)
-	for range 2 {
-		if err := <-results; err != nil {
-			t.Error(err)
-		}
-	}
-}
diff --git a/apps/daemon/internal/agent/managedskills/skills.go b/apps/daemon/internal/agent/managedskills/skills.go
deleted file mode 100644
index 3f052ca1c..000000000
--- a/apps/daemon/internal/agent/managedskills/skills.go
+++ /dev/null
@@ -1,237 +0,0 @@
-package managedskills
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"log/slog"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent/installroot"
-	obslog "github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
-	"github.com/google/uuid"
-)
-
-// skillDescriptor is the daemon-side view of one server-sent skill entry
-// under agent_options["skills"].
-type skillDescriptor struct {
-	Name        string
-	Version     string
-	DownloadURL string
-	SHA256      string
-}
-
-// SkillInstallResult carries installed directories and warnings.
-type SkillInstallResult struct {
-	SkillDirs []string
-	Warnings  []string
-}
-
-// InstallManagedSkills decodes the portable agent_options["skills"] payload,
-// materializes it below root, and removes entries that are no longer active.
-func InstallManagedSkills(ctx context.Context, logger *slog.Logger, root string, raw any) (SkillInstallResult, error) {
-	if strings.TrimSpace(root) == "" {
-		return SkillInstallResult{}, errors.New("managed skills: root is required")
-	}
-	unlock, err := installroot.Lock(ctx, root)
-	if err != nil {
-		return SkillInstallResult{}, err
-	}
-	defer unlock()
-	skills, decodeWarnings := decodeSkillDescriptors(raw)
-	result, err := installSkillsAtRootLocked(ctx, logger, root, skills, "managed skills")
-	result.Warnings = append(decodeWarnings, result.Warnings...)
-	if err != nil {
-		return result, err
-	}
-	if err := pruneManagedSkills(root, result.SkillDirs); err != nil {
-		return result, err
-	}
-	return result, nil
-}
-
-func installSkillsAtRootLocked(
-	ctx context.Context,
-	logger *slog.Logger,
-	root string,
-	skills []skillDescriptor,
-	logLabel string,
-) (SkillInstallResult, error) {
-	if logger == nil {
-		logger = obslog.Bg()
-	}
-	if len(skills) == 0 {
-		return SkillInstallResult{}, nil
-	}
-
-	result := SkillInstallResult{}
-	for _, s := range skills {
-		if err := s.validate(); err != nil {
-			result.Warnings = append(result.Warnings, fmt.Sprintf("skip skill (invalid descriptor): %v", err))
-			logger.Warn(logLabel+": invalid descriptor", "err", err.Error())
-			continue
-		}
-
-		dir := filepath.Join(root, s.Name)
-		cacheKey := filepath.Join(dir, ".cache-key")
-		expectedKey := s.cacheKey()
-
-		if existing, err := os.ReadFile(cacheKey); err == nil && string(existing) == expectedKey {
-			logger.Info(logLabel+": cache hit",
-				"name", s.Name, "version", s.Version, "dir", dir)
-			result.SkillDirs = append(result.SkillDirs, dir)
-			continue
-		}
-
-		// Bound each archive download and extraction.
-		perCtx, cancel := context.WithTimeout(ctx, pluginInstallTimeout)
-		err := installOneSkill(perCtx, logger, root, dir, cacheKey, expectedKey, s, logLabel)
-		cancel()
-		if err != nil {
-			result.Warnings = append(result.Warnings,
-				fmt.Sprintf("skill %s@%s: %v", s.Name, s.Version, err))
-			logger.Warn(logLabel+": install failed",
-				"name", s.Name, "version", s.Version, "err", err.Error())
-			continue
-		}
-		result.SkillDirs = append(result.SkillDirs, dir)
-		logger.Info(logLabel+": installed",
-			"name", s.Name, "version", s.Version, "dir", dir)
-	}
-	return result, nil
-}
-
-func pruneManagedSkills(root string, activeDirs []string) error {
-	entries, err := os.ReadDir(root)
-	if os.IsNotExist(err) {
-		return nil
-	}
-	if err != nil {
-		return fmt.Errorf("managed skills: read root %s: %w", root, err)
-	}
-	active := make(map[string]struct{}, len(activeDirs))
-	for _, dir := range activeDirs {
-		active[filepath.Base(dir)] = struct{}{}
-	}
-	for _, entry := range entries {
-		if entry.Name() == ".tmp" {
-			continue
-		}
-		if _, ok := active[entry.Name()]; ok {
-			continue
-		}
-		path := filepath.Join(root, entry.Name())
-		if err := os.RemoveAll(path); err != nil {
-			return fmt.Errorf("managed skills: remove stale entry %s: %w", path, err)
-		}
-	}
-	return nil
-}
-
-// installOneSkill downloads, verifies and extracts one skill archive.
-func installOneSkill(
-	ctx context.Context,
-	logger *slog.Logger,
-	root, dir, cacheKey, expectedKey string,
-	s skillDescriptor,
-	logLabel string,
-) error {
-	tmpDir := filepath.Join(root, ".tmp")
-	if err := os.MkdirAll(tmpDir, 0o755); err != nil {
-		return fmt.Errorf("mkdir tmp: %w", err)
-	}
-
-	zipPath := filepath.Join(tmpDir, fmt.Sprintf("%s-%s-%s.zip", s.Name, s.Version, uuid.NewString()))
-	defer func() {
-		_ = os.Remove(zipPath)
-	}()
-
-	fd, err := fetchPluginZip(ctx, s.DownloadURL, zipPath)
-	if err != nil {
-		return err
-	}
-	defer fd.Close()
-
-	if err := verifyPluginSHA256FromFD(fd, s.SHA256); err != nil {
-		return err
-	}
-	if _, err := fd.Seek(0, io.SeekStart); err != nil {
-		return fmt.Errorf("seek: %w", err)
-	}
-	fi, err := fd.Stat()
-	if err != nil {
-		return fmt.Errorf("stat: %w", err)
-	}
-
-	if err := os.RemoveAll(dir); err != nil {
-		return fmt.Errorf("rm old dir: %w", err)
-	}
-	if err := os.MkdirAll(dir, 0o755); err != nil {
-		return fmt.Errorf("mkdir target: %w", err)
-	}
-	if err := extractPluginZipFromFD(fd, fi.Size(), dir); err != nil {
-		_ = os.RemoveAll(dir)
-		return err
-	}
-
-	if err := os.WriteFile(cacheKey, []byte(expectedKey), 0o644); err != nil {
-		logger.Warn(logLabel+": write cache key failed",
-			"path", cacheKey, "err", err.Error())
-	}
-	return nil
-}
-
-// decodeSkillDescriptors converts agent_options["skills"] into typed descriptors.
-func decodeSkillDescriptors(raw any) ([]skillDescriptor, []string) {
-	if raw == nil {
-		return nil, nil
-	}
-	items, ok := raw.([]any)
-	if !ok {
-		return nil, []string{fmt.Sprintf("agent_options[skills] must be array, got %T", raw)}
-	}
-	out := make([]skillDescriptor, 0, len(items))
-	warnings := make([]string, 0)
-	for i, item := range items {
-		obj, ok := item.(map[string]any)
-		if !ok {
-			warnings = append(warnings, fmt.Sprintf("skills[%d]: not an object", i))
-			continue
-		}
-		s := skillDescriptor{
-			Name:        stringField(obj, "name"),
-			Version:     stringField(obj, "version"),
-			DownloadURL: stringField(obj, "download_url"),
-			SHA256:      stringField(obj, "sha256"),
-		}
-		if err := s.validate(); err != nil {
-			warnings = append(warnings, fmt.Sprintf("skills[%d] (%s): %v", i, s.Name, err))
-			continue
-		}
-		out = append(out, s)
-	}
-	return out, warnings
-}
-
-func (s skillDescriptor) validate() error {
-	if strings.TrimSpace(s.Name) == "" {
-		return errors.New("name is required")
-	}
-	if strings.ContainsAny(s.Name, "/\\") || s.Name == "." || s.Name == ".." {
-		return fmt.Errorf("name %q contains path separator or dot-ref", s.Name)
-	}
-	if strings.TrimSpace(s.DownloadURL) == "" {
-		return errors.New("download_url is required")
-	}
-	if len(s.SHA256) != 64 {
-		return fmt.Errorf("sha256 must be 64 hex chars (got %d)", len(s.SHA256))
-	}
-	return nil
-}
-
-func (s skillDescriptor) cacheKey() string {
-	return fmt.Sprintf("%s@%s", strings.TrimSpace(s.Name), strings.ToLower(s.SHA256))
-}
diff --git a/apps/daemon/internal/agent/managedskills/skills_test.go b/apps/daemon/internal/agent/managedskills/skills_test.go
deleted file mode 100644
index f2977f371..000000000
--- a/apps/daemon/internal/agent/managedskills/skills_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package managedskills
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-// validSkillZipBytes is a minimal SKILL.md-rooted zip.
-func validSkillZipBytes(t *testing.T) []byte {
-	return buildPluginZipBytes(t, []pluginZipFile{
-		{Name: "SKILL.md", Body: "---\nname: code-review\ndescription: Review code\n---\nBody"},
-	})
-}
-
-func TestInstallSkills_HappyPath_ExtractsAndStampsCacheKey(t *testing.T) {
-	t.Parallel()
-	body := validSkillZipBytes(t)
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		{Name: "code-review", Version: "1.0.0", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	})
-	if err != nil {
-		t.Fatalf("installSkills: %v", err)
-	}
-	if len(res.Warnings) != 0 {
-		t.Fatalf("unexpected warnings: %v", res.Warnings)
-	}
-
-	dir := filepath.Join(workDir, "code-review")
-	if len(res.SkillDirs) != 1 || res.SkillDirs[0] != dir {
-		t.Fatalf("skill dirs = %v, want [%s]", res.SkillDirs, dir)
-	}
-	if _, err := os.Stat(filepath.Join(dir, "SKILL.md")); err != nil {
-		t.Fatalf("SKILL.md missing: %v", err)
-	}
-	stamped, err := os.ReadFile(filepath.Join(dir, ".cache-key"))
-	if err != nil {
-		t.Fatalf("read cache-key: %v", err)
-	}
-	want := "code-review@" + sha256Hex(body)
-	if string(stamped) != want {
-		t.Fatalf("cache-key = %q, want %q", stamped, want)
-	}
-}
-
-func TestInstallSkills_CacheHitSkipsDownload(t *testing.T) {
-	t.Parallel()
-	body := validSkillZipBytes(t)
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	desc := []skillDescriptor{
-		{Name: "code-review", Version: "1.0.0", DownloadURL: srv.URL, SHA256: sha256Hex(body)},
-	}
-	if _, err := installSkillsForTest(context.Background(), discardLogger(), workDir, desc); err != nil {
-		t.Fatalf("first install: %v", err)
-	}
-	hitsAfterFirst := srv.Hits()
-	if hitsAfterFirst != 1 {
-		t.Fatalf("first install hits = %d, want 1", hitsAfterFirst)
-	}
-	second, err := installSkillsForTest(context.Background(), discardLogger(), workDir, desc)
-	if err != nil {
-		t.Fatalf("second install: %v", err)
-	}
-	if len(second.SkillDirs) != 1 {
-		t.Fatalf("cache hit skill dirs = %v", second.SkillDirs)
-	}
-	if got := srv.Hits(); got != hitsAfterFirst {
-		t.Fatalf("cache should prevent second download; got %d extra hits", got-hitsAfterFirst)
-	}
-}
-
-func TestInstallManagedSkillsPrunesInactiveEntries(t *testing.T) {
-	body := validSkillZipBytes(t)
-	srv := startPluginServer(t, body)
-	root := t.TempDir()
-	stale := filepath.Join(root, "old-skill")
-	if err := os.MkdirAll(stale, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(stale, "SKILL.md"), []byte("old"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	res, err := InstallManagedSkills(context.Background(), discardLogger(), root, []any{
-		map[string]any{
-			"name": "code-review", "version": "1.0.0",
-			"download_url": srv.URL, "sha256": sha256Hex(body),
-		},
-	})
-	if err != nil {
-		t.Fatalf("InstallManagedSkills: %v", err)
-	}
-	if len(res.SkillDirs) != 1 || res.SkillDirs[0] != filepath.Join(root, "code-review") {
-		t.Fatalf("skill dirs = %v", res.SkillDirs)
-	}
-	if _, err := os.Stat(stale); !os.IsNotExist(err) {
-		t.Fatalf("stale skill still exists: %v", err)
-	}
-	if _, err := os.Stat(filepath.Join(root, "code-review", "SKILL.md")); err != nil {
-		t.Fatalf("active skill missing: %v", err)
-	}
-}
-
-func TestInstallSkills_SHA256MismatchDemotesToWarning(t *testing.T) {
-	t.Parallel()
-	body := validSkillZipBytes(t)
-	srv := startPluginServer(t, body)
-	workDir := t.TempDir()
-
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, []skillDescriptor{
-		// Wrong sha256 (all-zero pattern is 64 hex chars, never matches body)
-		{Name: "code-review", Version: "1.0.0", DownloadURL: srv.URL, SHA256: "0000000000000000000000000000000000000000000000000000000000000000"},
-	})
-	if err != nil {
-		t.Fatalf("installSkills should not hard-error on sha mismatch: %v", err)
-	}
-	if len(res.Warnings) != 1 {
-		t.Fatalf("want 1 warning, got %d: %v", len(res.Warnings), res.Warnings)
-	}
-	if _, err := os.Stat(filepath.Join(workDir, "code-review", "SKILL.md")); err == nil {
-		t.Fatal("SKILL.md should not exist after sha mismatch")
-	}
-}
-
-func TestInstallSkills_EmptyListIsNoop(t *testing.T) {
-	t.Parallel()
-	workDir := t.TempDir()
-	res, err := installSkillsForTest(context.Background(), discardLogger(), workDir, nil)
-	if err != nil {
-		t.Fatalf("empty install: %v", err)
-	}
-	if len(res.Warnings) != 0 {
-		t.Fatalf("unexpected warnings: %v", res.Warnings)
-	}
-}
-
-func TestDecodeSkillDescriptors_ArrayShape(t *testing.T) {
-	raw := []any{
-		map[string]any{
-			"name":         "code-review",
-			"version":      "1.0.0",
-			"download_url": "https://x",
-			"sha256":       "0000000000000000000000000000000000000000000000000000000000000000",
-		},
-	}
-	got, warns := decodeSkillDescriptors(raw)
-	if len(got) != 1 || len(warns) != 0 {
-		t.Fatalf("got=%+v warns=%v", got, warns)
-	}
-}
-
-func TestDecodeSkillDescriptors_NilAndWrongType(t *testing.T) {
-	if got, warns := decodeSkillDescriptors(nil); got != nil || warns != nil {
-		t.Fatalf("nil raw should be (nil, nil), got (%v, %v)", got, warns)
-	}
-	if got, warns := decodeSkillDescriptors("not-array"); got != nil || len(warns) != 1 {
-		t.Fatalf("string raw should warn, got got=%v warns=%v", got, warns)
-	}
-}
diff --git a/apps/daemon/internal/agent/mcode/declaration.go b/apps/daemon/internal/agent/mcode/declaration.go
index bfab385d3..5a6682dbb 100644
--- a/apps/daemon/internal/agent/mcode/declaration.go
+++ b/apps/daemon/internal/agent/mcode/declaration.go
@@ -48,7 +48,7 @@ func discover(ctx context.Context, options agent.DiscoveryOptions, info proto.Su
 	return discoverWithCheck(ctx, options, info, CheckCLIAvailable)
 }
 func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, result proto.SupportedAgentKind, check func(context.Context, string) (string, error)) *agent.Runtime {
-	runtime := &agent.Runtime{Info: result, Session: Factory, SessionCapabilityContext: true, ExecutorCapabilityContext: true}
+	runtime := &agent.Runtime{Info: result, Session: Factory}
 
 	ctx, cancel := context.WithTimeout(parent, 15*time.Second)
 	defer cancel()
@@ -78,7 +78,6 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, r
 		runtime.Executor = NewExecutorFactory(workspace)
 	}
 	if workspace != nil {
-		runtime.SessionCapabilityContext = false
 		runtime.Info.Capabilities.WorkspaceAuthoring = proto.CapabilityUnsupported
 		runtime.Preparation = NewPreparationFactory(*workspace)
 		runtime.WorkspaceReadPreparation = true
diff --git a/apps/daemon/internal/agent/mcode/declaration_test.go b/apps/daemon/internal/agent/mcode/declaration_test.go
index ab845b1c2..16ec2df71 100644
--- a/apps/daemon/internal/agent/mcode/declaration_test.go
+++ b/apps/daemon/internal/agent/mcode/declaration_test.go
@@ -19,7 +19,7 @@ func TestMCodeExecutionOptInIsVersionBound(t *testing.T) {
 			t.Setenv("OAC_RUNTIME_MCODE_AGENTS_API", tc.enabled)
 			rc := agent.DiscoveryOptions{Stdout: io.Discard, Stderr: io.Discard}
 			runtime := discoverWithCheck(t.Context(), rc, Declaration.Info, func(context.Context, string) (string, error) { return tc.version, nil })
-			if runtime.Executor == nil || runtime.Preparation != nil || !runtime.SessionCapabilityContext || !runtime.ExecutorCapabilityContext {
+			if runtime.Executor == nil || runtime.Preparation != nil {
 				t.Fatalf("factories: %+v", runtime)
 			}
 			info := runtime.Info
diff --git a/apps/daemon/internal/agent/mcode/environment_mcp_test.go b/apps/daemon/internal/agent/mcode/environment_mcp_test.go
index 1e2c745cb..d4ccae14a 100644
--- a/apps/daemon/internal/agent/mcode/environment_mcp_test.go
+++ b/apps/daemon/internal/agent/mcode/environment_mcp_test.go
@@ -98,7 +98,7 @@ func TestEnvironmentMCPRejectsUnqualifiedAuthorityBeforePreparation(t *testing.T
 			case "reserved":
 				req.LocalEnvironment.MCP[0].Server.Name = "oac_workspace"
 			}
-			if _, err := prepareWorkspaceOptions(t.Context(), c, req); err == nil || strings.Contains(err.Error(), "confidential-http-token") {
+			if _, err := prepareWorkspaceOptions(c, req); err == nil || strings.Contains(err.Error(), "confidential-http-token") {
 				t.Fatal("unqualified declaration accepted or credential exposed")
 			}
 		})
@@ -238,7 +238,7 @@ func TestPublicEnvironmentHTTPMCPKeepsCredentialTransient(t *testing.T) {
 	c.Network, req.LocalEnvironment.NetworkAccess = "enabled", "enabled"
 	token := "selected-public-vault-canary"
 	req.MCPHTTPServers = &[]proto.MCPHTTPServer{{ConnectionOrigin: "environment", ServerLabel: "remote", ServerURL: "https://example.test/mcp", BearerToken: &token}}
-	opts, err := prepareWorkspaceOptions(t.Context(), c, req)
+	opts, err := prepareWorkspaceOptions(c, req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -267,12 +267,12 @@ func TestPublicEnvironmentHTTPMCPKeepsCredentialTransient(t *testing.T) {
 	}
 	empty := []string{}
 	(*req.MCPHTTPServers)[0].AllowedTools = &empty
-	if _, err := prepareWorkspaceOptions(t.Context(), c, req); err == nil {
+	if _, err := prepareWorkspaceOptions(c, req); err == nil {
 		t.Fatal("empty allowlist silently treated as all")
 	}
 	(*req.MCPHTTPServers)[0].AllowedTools = nil
 	(*req.MCPHTTPServers)[0].Required = true
-	if _, err := prepareWorkspaceOptions(t.Context(), c, req); err == nil {
+	if _, err := prepareWorkspaceOptions(c, req); err == nil {
 		t.Fatal("required initialization silently ignored")
 	}
 }
diff --git a/apps/daemon/internal/agent/mcode/execution.go b/apps/daemon/internal/agent/mcode/execution.go
index a54bfc742..82dd3c9f8 100644
--- a/apps/daemon/internal/agent/mcode/execution.go
+++ b/apps/daemon/internal/agent/mcode/execution.go
@@ -27,14 +27,8 @@ func validateExecutionRequest(req proto.PromptRequestPayload) error {
 			return err
 		}
 	}
-	if mode := optionString(req.AgentOptions, "mode"); mode != "" {
-		return fmt.Errorf("mcode: text execution uses default native permissions")
-	}
-	if req.AgentOptions["plugins"] != nil {
-		return fmt.Errorf("mcode: execution cannot import plugins")
-	}
-	if req.AgentOptions["skills"] != nil || req.AgentOptions["mcp_servers"] != nil || req.AgentOptions["env"] != nil {
-		return fmt.Errorf("mcode: execution cannot import product capabilities or environment")
+	if req.AgentOptions["env"] != nil {
+		return fmt.Errorf("mcode: execution cannot import an environment")
 	}
 	return nil
 }
diff --git a/apps/daemon/internal/agent/mcode/execution_test.go b/apps/daemon/internal/agent/mcode/execution_test.go
index ac7bcd53b..839c594ad 100644
--- a/apps/daemon/internal/agent/mcode/execution_test.go
+++ b/apps/daemon/internal/agent/mcode/execution_test.go
@@ -21,7 +21,7 @@ func TestExecutionOptionsInheritUserEnvironment(t *testing.T) {
 	r := executionRequest(t)
 	t.Setenv("OAC_TEST_SECRET_CANARY", "secret")
 	t.Setenv("NODE_OPTIONS", "--import=untrusted")
-	opts, err := prepareOptions(t.Context(), r)
+	opts, err := prepareOptions(r)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -56,7 +56,7 @@ func TestExecutionRejectsUnqualifiedAuthority(t *testing.T) {
 	} {
 		r := executionRequest(t)
 		change(&r)
-		if _, err := prepareOptions(t.Context(), r); err == nil {
+		if _, err := prepareOptions(r); err == nil {
 			t.Fatal("unsupported execution accepted")
 		}
 	}
diff --git a/apps/daemon/internal/agent/mcode/executor.go b/apps/daemon/internal/agent/mcode/executor.go
index 69cf28357..c63473397 100644
--- a/apps/daemon/internal/agent/mcode/executor.go
+++ b/apps/daemon/internal/agent/mcode/executor.go
@@ -46,10 +46,10 @@ func NewExecutorFactory(config *WorkspaceConfig) agent.ExecutorFactory {
 		var opts launchOptions
 		binary := defaultBinary()
 		if frozen == nil {
-			opts, err = prepareOptions(ctx, req)
+			opts, err = prepareOptions(req)
 		} else {
 			binary = frozen.Binary
-			opts, err = prepareWorkspaceOptions(ctx, *frozen, req)
+			opts, err = prepareWorkspaceOptions(*frozen, req)
 		}
 		if err != nil {
 			return nil, err
diff --git a/apps/daemon/internal/agent/mcode/harness_config_test.go b/apps/daemon/internal/agent/mcode/harness_config_test.go
index eaf4f2c1a..a704912f9 100644
--- a/apps/daemon/internal/agent/mcode/harness_config_test.go
+++ b/apps/daemon/internal/agent/mcode/harness_config_test.go
@@ -1,7 +1,6 @@
 package mcode
 
 import (
-	"context"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
 	"testing"
 )
@@ -9,11 +8,11 @@ import (
 func TestNativeConfigDoesNotPretendToSupportParameters(t *testing.T) {
 	req := testRequest(t)
 	req.AgentOptions["harness_config"] = map[string]any{}
-	if _, err := prepareOptions(context.Background(), req); err != nil {
+	if _, err := prepareOptions(req); err != nil {
 		t.Fatal(err)
 	}
 	req.AgentOptions["harness_config"] = map[string]any{"temperature": 0.5}
-	if _, err := prepareOptions(context.Background(), req); err != harnessconfig.ErrHarnessConfig {
+	if _, err := prepareOptions(req); err != harnessconfig.ErrHarnessConfig {
 		t.Fatalf("unsupported parameter accepted: %v", err)
 	}
 }
diff --git a/apps/daemon/internal/agent/mcode/model_provider_test.go b/apps/daemon/internal/agent/mcode/model_provider_test.go
index 715bf181c..f97b50508 100644
--- a/apps/daemon/internal/agent/mcode/model_provider_test.go
+++ b/apps/daemon/internal/agent/mcode/model_provider_test.go
@@ -16,7 +16,7 @@ func TestOptionsModelProviderProtocols(t *testing.T) {
 			req := testRequest(t)
 			req.AgentOptions["model_provider"].(map[string]any)["protocol"] = tc.protocol
 			req.AgentOptions["model"] = "chosen-model"
-			opts, err := prepareOptions(t.Context(), req)
+			opts, err := prepareOptions(req)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -60,7 +60,7 @@ func TestOptionsRejectInvalidProvider(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			req := testRequest(t)
 			req.AgentOptions["model_provider"].(map[string]any)[tc.field] = tc.value
-			if _, err := prepareOptions(t.Context(), req); err == nil {
+			if _, err := prepareOptions(req); err == nil {
 				t.Fatal("invalid model provider accepted")
 			}
 		})
@@ -69,7 +69,7 @@ func TestOptionsRejectInvalidProvider(t *testing.T) {
 		req := testRequest(t)
 		req.AgentOptions["mcode_provider"] = req.AgentOptions["model_provider"]
 		delete(req.AgentOptions, "model_provider")
-		if _, err := prepareOptions(t.Context(), req); err == nil {
+		if _, err := prepareOptions(req); err == nil {
 			t.Fatal("retired native provider option accepted")
 		}
 	})
@@ -78,7 +78,7 @@ func TestOptionsRejectInvalidProvider(t *testing.T) {
 func TestOptionsAllowLoopbackProviderFixture(t *testing.T) {
 	req := testRequest(t)
 	req.AgentOptions["model_provider"].(map[string]any)["base_url"] = "http://127.0.0.1:4321/v1"
-	if _, err := prepareOptions(t.Context(), req); err != nil {
+	if _, err := prepareOptions(req); err != nil {
 		t.Fatal(err)
 	}
 }
diff --git a/apps/daemon/internal/agent/mcode/native_test.go b/apps/daemon/internal/agent/mcode/native_test.go
index bb61fdeb3..042f577de 100644
--- a/apps/daemon/internal/agent/mcode/native_test.go
+++ b/apps/daemon/internal/agent/mcode/native_test.go
@@ -1,11 +1,7 @@
 package mcode
 
 import (
-	"archive/zip"
-	"bytes"
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -28,42 +24,6 @@ func TestNativeMCodeACP(t *testing.T) {
 	req := testRequest(t)
 	var mu sync.Mutex
 	var requests []string
-	mcpCalls := 0
-	mcp := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "POST" {
-			w.WriteHeader(http.StatusMethodNotAllowed)
-			return
-		}
-		var msg struct {
-			ID     json.RawMessage `json:"id"`
-			Method string          `json:"method"`
-		}
-		if json.NewDecoder(r.Body).Decode(&msg) != nil {
-			w.WriteHeader(400)
-			return
-		}
-		if len(msg.ID) == 0 {
-			w.WriteHeader(http.StatusAccepted)
-			return
-		}
-		var result any
-		switch msg.Method {
-		case "initialize":
-			result = map[string]any{"protocolVersion": "2024-11-05", "capabilities": map[string]any{"tools": map[string]any{}}, "serverInfo": map[string]string{"name": "fixture", "version": "1"}}
-		case "tools/list":
-			result = map[string]any{"tools": []map[string]any{{"name": "get_fixture", "description": "Returns the fixture marker", "inputSchema": map[string]any{"type": "object", "properties": map[string]any{}}}}}
-		case "tools/call":
-			mu.Lock()
-			mcpCalls++
-			mu.Unlock()
-			result = map[string]any{"content": []map[string]string{{"type": "text", "text": "MCP-READY"}}}
-		default:
-			result = map[string]any{}
-		}
-		w.Header().Set("Content-Type", "application/json")
-		_ = json.NewEncoder(w).Encode(map[string]any{"jsonrpc": "2.0", "id": msg.ID, "result": result})
-	}))
-	defer mcp.Close()
 	model := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var body map[string]any
 		if json.NewDecoder(r.Body).Decode(&body) != nil {
@@ -74,34 +34,12 @@ func TestNativeMCodeACP(t *testing.T) {
 		mu.Lock()
 		requests = append(requests, string(raw))
 		mu.Unlock()
-		tool := ""
-		if !strings.Contains(string(raw), "MCP-READY") && strings.Contains(string(raw), "QA-CALL-MCP") {
-			tools, _ := body["tools"].([]any)
-			for _, entry := range tools {
-				value, _ := entry.(map[string]any)
-				name, _ := value["name"].(string)
-				if strings.Contains(name, "get_fixture") {
-					tool = name
-					break
-				}
-			}
-		}
-		writeNativeResponse(w, tool)
+		writeNativeResponse(w)
 	}))
 	defer model.Close()
-	var archive bytes.Buffer
-	zw := zip.NewWriter(&archive)
-	f, _ := zw.Create("SKILL.md")
-	_, _ = f.Write([]byte("---\nname: qa-mcode-skill\ndescription: Test skill marker SKILL-MCODE-451\n---\nReturn SKILL-MCODE-451.\n"))
-	_ = zw.Close()
-	digest := sha256.Sum256(archive.Bytes())
-	skill := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, _ = w.Write(archive.Bytes()) }))
-	defer skill.Close()
 	req.AgentOptions["model_provider"] = map[string]any{"protocol": "anthropic", "base_url": model.URL, "api_key": "fixture-only", "context_window": 64000, "max_output_tokens": 4096}
-	req.AgentOptions["skills"] = []any{map[string]any{"name": "qa-mcode-skill", "version": "1", "download_url": skill.URL, "sha256": hex.EncodeToString(digest[:])}}
-	req.AgentOptions["mcp_servers"] = map[string]any{"qa": map[string]any{"type": "http", "url": mcp.URL}}
-	req.AgentOptions["system_prompt"] = "SP-MCODE-672: use the available tools when requested."
-	req.Input = proto.TextInput("QA-CALL-MCP: call get_fixture, then reply OAC-MCODE-OK.")
+	req.AgentOptions["system_prompt"] = "SP-MCODE-672: reply as instructed."
+	req.Input = proto.TextInput("Reply OAC-MCODE-OK.")
 	run := func() proto.DonePayload {
 		ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 		t.Cleanup(cancel)
@@ -138,19 +76,14 @@ func TestNativeMCodeACP(t *testing.T) {
 	done := run()
 	mu.Lock()
 	firstRequests := strings.Join(requests, "\n")
-	calls := mcpCalls
 	requests = nil
 	mu.Unlock()
-	if !strings.Contains(firstRequests, "SP-MCODE-672") || !strings.Contains(firstRequests, "qa-mcode-skill") {
-		t.Fatalf("native context missing: prompt=%t skill=%t", strings.Contains(firstRequests, "SP-MCODE-672"), strings.Contains(firstRequests, "qa-mcode-skill"))
-	}
-	if calls == 0 {
-		t.Fatal("native MCP was not called")
+	if !strings.Contains(firstRequests, "SP-MCODE-672") {
+		t.Fatal("native instructions missing")
 	}
 	req.RunID = "run-2"
 	req.AgentSessionID = done.Metadata[proto.DoneMetaAgentSessionID].(string)
 	req.AgentOptions["system_prompt"] = "SP-MCODE-NEW: reply concisely."
-	req.AgentOptions["skills"] = []any{}
 	req.AgentOptions["model"] = "fixture-new"
 	req.Input = proto.TextInput("Now reply OAC-MCODE-OK.")
 	run()
@@ -163,26 +96,19 @@ func TestNativeMCodeACP(t *testing.T) {
 	if !strings.Contains(resumed, `"model":"fixture-new"`) {
 		t.Fatal("resume did not use the updated model")
 	}
-	t.Logf("native new/resume, model, instructions, Skill discovery and MCP verified (%d tool calls)", calls)
+	t.Log("native new/resume, model and instructions verified")
 }
 
-func writeNativeResponse(w http.ResponseWriter, tool string) {
+func writeNativeResponse(w http.ResponseWriter) {
 	w.Header().Set("Content-Type", "text/event-stream")
 	send := func(kind string, payload any) {
 		data, _ := json.Marshal(payload)
 		_, _ = fmt.Fprintf(w, "event: %s\ndata: %s\n\n", kind, data)
 	}
 	send("message_start", map[string]any{"type": "message_start", "message": map[string]any{"id": "msg_qa", "type": "message", "role": "assistant", "model": "fixture", "content": []any{}, "stop_reason": nil, "stop_sequence": nil, "usage": map[string]int{"input_tokens": 20, "output_tokens": 0}}})
-	stop := "end_turn"
-	if tool != "" {
-		send("content_block_start", map[string]any{"type": "content_block_start", "index": 0, "content_block": map[string]any{"type": "tool_use", "id": "call_fixture", "name": tool, "input": map[string]any{}}})
-		send("content_block_delta", map[string]any{"type": "content_block_delta", "index": 0, "delta": map[string]string{"type": "input_json_delta", "partial_json": "{}"}})
-		stop = "tool_use"
-	} else {
-		send("content_block_start", map[string]any{"type": "content_block_start", "index": 0, "content_block": map[string]string{"type": "text", "text": ""}})
-		send("content_block_delta", map[string]any{"type": "content_block_delta", "index": 0, "delta": map[string]string{"type": "text_delta", "text": "OAC-MCODE-OK"}})
-	}
+	send("content_block_start", map[string]any{"type": "content_block_start", "index": 0, "content_block": map[string]string{"type": "text", "text": ""}})
+	send("content_block_delta", map[string]any{"type": "content_block_delta", "index": 0, "delta": map[string]string{"type": "text_delta", "text": "OAC-MCODE-OK"}})
 	send("content_block_stop", map[string]any{"type": "content_block_stop", "index": 0})
-	send("message_delta", map[string]any{"type": "message_delta", "delta": map[string]any{"stop_reason": stop, "stop_sequence": nil}, "usage": map[string]int{"output_tokens": 8}})
+	send("message_delta", map[string]any{"type": "message_delta", "delta": map[string]any{"stop_reason": "end_turn", "stop_sequence": nil}, "usage": map[string]int{"output_tokens": 8}})
 	send("message_stop", map[string]string{"type": "message_stop"})
 }
diff --git a/apps/daemon/internal/agent/mcode/options.go b/apps/daemon/internal/agent/mcode/options.go
index 86305f17d..5714e401f 100644
--- a/apps/daemon/internal/agent/mcode/options.go
+++ b/apps/daemon/internal/agent/mcode/options.go
@@ -1,20 +1,16 @@
 package mcode
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
-	"sort"
 	"strconv"
 	"strings"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent/managedskills"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	harnessconfiguration "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig/mcode"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 )
 
 type launchOptions struct {
@@ -23,11 +19,7 @@ type launchOptions struct {
 	MCP                 []map[string]any
 }
 
-func prepareOptions(ctx context.Context, req proto.PromptRequestPayload) (launchOptions, error) {
-	return prepareOptionsWithSkills(ctx, req, true)
-}
-
-func prepareOptionsWithSkills(ctx context.Context, req proto.PromptRequestPayload, managedSkills bool) (launchOptions, error) {
+func prepareOptions(req proto.PromptRequestPayload) (launchOptions, error) {
 	var result launchOptions
 	if _, err := harnessconfiguration.Configuration().PrepareHarnessConfig(req.AgentOptions); err != nil {
 		return result, err
@@ -40,11 +32,11 @@ func prepareOptionsWithSkills(ctx context.Context, req proto.PromptRequestPayloa
 	if req.Input.HasImages() {
 		return result, fmt.Errorf("mcode: ACP does not support attachments")
 	}
-	root, err := agent.ManagedSkillsRoot("mcode", req.AgentStateKey, req.ConversationID, req.RunID)
+	dataDir, err := agent.StateDir("mcode", req.AgentStateKey, req.ConversationID, req.RunID)
 	if err != nil {
 		return result, err
 	}
-	result.DataDir = filepath.Dir(root)
+	result.DataDir = dataDir
 	result.Dir = filepath.Join(result.DataDir, "workspace")
 	if err := os.MkdirAll(result.DataDir, 0o700); err != nil {
 		return result, err
@@ -52,20 +44,8 @@ func prepareOptionsWithSkills(ctx context.Context, req proto.PromptRequestPayloa
 	if err := os.MkdirAll(result.Dir, 0o700); err != nil {
 		return result, err
 	}
-	if managedSkills {
-		installed, err := managedskills.InstallManagedSkills(ctx, log.With("component", "mcode"), root, req.AgentOptions["skills"])
-		if err != nil {
-			return result, err
-		}
-		if len(installed.Warnings) > 0 {
-			return result, fmt.Errorf("mcode: one or more configured Skills could not be installed")
-		}
-	}
 	opts := req.AgentOptions
 	prompt := optionString(opts, "system_prompt")
-	if override := optionString(opts, "override_system_prompt"); override != "" {
-		prompt = override
-	}
 	if len(prompt) > 32*1024 {
 		return result, fmt.Errorf("mcode: combined instructions exceed the CLI's 32 KiB limit")
 	}
@@ -92,14 +72,7 @@ func prepareOptionsWithSkills(ctx context.Context, req proto.PromptRequestPayloa
 			}}
 		}
 	}
-	mode := optionString(opts, "mode")
-	if mode == "" {
-		mode = "auto"
-	}
-	if mode != "auto" && mode != "default" && mode != "bypassPermissions" {
-		return result, fmt.Errorf("mcode: unsupported permission mode")
-	}
-	config["permissionMode"] = mode
+	config["permissionMode"] = "auto"
 	data, err := json.Marshal(config)
 	if err != nil {
 		return result, err
@@ -137,92 +110,11 @@ func prepareOptionsWithSkills(ctx context.Context, req proto.PromptRequestPayloa
 	if req.StrictResume {
 		result.Env = append(result.Env, "HOME="+result.DataDir, "USERPROFILE="+result.DataDir)
 	}
-	result.MCP, err = mcpServers(opts["mcp_servers"])
-	return result, err
+	result.MCP = []map[string]any{}
+	return result, nil
 }
 
 func optionString(options map[string]any, key string) string {
 	value, _ := options[key].(string)
 	return value
 }
-
-func mcpServers(raw any) ([]map[string]any, error) {
-	result := []map[string]any{}
-	if raw == nil {
-		return result, nil
-	}
-	servers, ok := raw.(map[string]any)
-	if !ok {
-		return nil, fmt.Errorf("mcode: mcp_servers must be an object")
-	}
-	names := make([]string, 0, len(servers))
-	for name := range servers {
-		names = append(names, name)
-	}
-	sort.Strings(names)
-	for _, name := range names {
-		entry, ok := servers[name].(map[string]any)
-		if !ok {
-			return nil, fmt.Errorf("mcode: invalid MCP server %q", name)
-		}
-		server := map[string]any{"name": name}
-		if url := optionString(entry, "url"); url != "" {
-			kind := optionString(entry, "type")
-			if kind == "" {
-				kind = "http"
-			}
-			if kind != "http" && kind != "sse" {
-				return nil, fmt.Errorf("mcode: unsupported MCP transport %q", kind)
-			}
-			server["type"] = kind
-			server["url"] = url
-			headers, err := namedValues(entry["headers"])
-			if err != nil {
-				return nil, err
-			}
-			server["headers"] = headers
-		} else {
-			command := optionString(entry, "command")
-			if command == "" {
-				return nil, fmt.Errorf("mcode: MCP server %q needs command or URL", name)
-			}
-			server["command"] = command
-			args := entry["args"]
-			if args == nil {
-				args = []string{}
-			}
-			server["args"] = args
-			env, err := namedValues(entry["env"])
-			if err != nil {
-				return nil, err
-			}
-			server["env"] = env
-		}
-		result = append(result, server)
-	}
-	return result, nil
-}
-
-func namedValues(raw any) ([]map[string]string, error) {
-	result := []map[string]string{}
-	if raw == nil {
-		return result, nil
-	}
-	values, ok := raw.(map[string]any)
-	if !ok {
-		return nil, fmt.Errorf("mcode: MCP headers/env must be an object")
-	}
-	keys := make([]string, 0, len(values))
-	for key := range values {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	for _, key := range keys {
-		value, ok := values[key].(string)
-		if !ok {
-			return nil, fmt.Errorf("mcode: MCP headers/env values must be strings")
-		}
-		result = append(result, map[string]string{"name": key, "value": value})
-	}
-	return result, nil
-}
diff --git a/apps/daemon/internal/agent/mcode/options_test.go b/apps/daemon/internal/agent/mcode/options_test.go
index dde7201c9..fa7fa94d2 100644
--- a/apps/daemon/internal/agent/mcode/options_test.go
+++ b/apps/daemon/internal/agent/mcode/options_test.go
@@ -1,7 +1,6 @@
 package mcode
 
 import (
-	"context"
 	"encoding/json"
 	"os"
 	"path/filepath"
@@ -14,7 +13,7 @@ import (
 func TestOptionsRefreshManagedState(t *testing.T) {
 	req := testRequest(t)
 	req.AgentOptions["env"] = map[string]any{"MINIMAX_DATA_DIR": "/wrong", "FIXTURE": "yes"}
-	opts, err := prepareOptions(context.Background(), req)
+	opts, err := prepareOptions(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -25,9 +24,8 @@ func TestOptionsRefreshManagedState(t *testing.T) {
 		t.Fatal("state override did not win")
 	}
 	req.AgentOptions["system_prompt"] = ""
-	req.AgentOptions["mode"] = "default"
 	req.AgentSessionID = "native-1"
-	refreshed, err := prepareOptions(context.Background(), req)
+	refreshed, err := prepareOptions(req)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -46,8 +44,8 @@ func TestOptionsRefreshManagedState(t *testing.T) {
 	if json.Unmarshal(data, &cfg) != nil {
 		t.Fatal("invalid config")
 	}
-	if cfg["permissionMode"] != "default" {
-		t.Fatal("requested native permission mode was not refreshed")
+	if cfg["permissionMode"] != "auto" {
+		t.Fatal("native permission mode changed")
 	}
 	if cfg["skills"].(map[string]any)["external"].(map[string]any)["enabled"] != false {
 		t.Fatal("external discovery enabled")
@@ -69,35 +67,18 @@ func TestOptionsRejectDroppedContext(t *testing.T) {
 		}},
 		{"missing model", func(r *proto.PromptRequestPayload) { delete(r.AgentOptions, "model") }},
 		{"missing provider", func(r *proto.PromptRequestPayload) { delete(r.AgentOptions, "model_provider") }},
-		{"invalid permission mode", func(r *proto.PromptRequestPayload) { r.AgentOptions["mode"] = "plan" }},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			req := testRequest(t)
 			tt.edit(&req)
-			if _, err := prepareOptions(context.Background(), req); err == nil {
+			if _, err := prepareOptions(req); err == nil {
 				t.Fatal("expected validation failure")
 			}
 		})
 	}
 }
 
-func TestMCPTransportConversion(t *testing.T) {
-	servers, err := mcpServers(map[string]any{
-		"local":  map[string]any{"command": "fixture", "args": []any{"--stdio"}, "env": map[string]any{"TOKEN": "test"}},
-		"remote": map[string]any{"type": "http", "url": "https://mcp.example.test", "headers": map[string]any{"Authorization": "Bearer fixture"}},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(servers) != 2 || servers[0]["command"] != "fixture" || servers[1]["type"] != "http" {
-		t.Fatalf("servers=%v", servers)
-	}
-	if servers[0]["env"].([]map[string]string)[0]["name"] != "TOKEN" || servers[1]["headers"].([]map[string]string)[0]["value"] != "Bearer fixture" {
-		t.Fatal("MCP credentials lost")
-	}
-}
-
 func TestQuestionContentPreservesTypesAndValidates(t *testing.T) {
 	pending := pendingQuestion{Properties: map[string]formProperty{"text": {Type: "string"}, "choice": {Type: "string", Options: []formOption{{Value: "eu", Title: "Europe"}}}}, Required: []string{"choice"}}
 	if _, err := questionContent(pending, proto.PromptForUserChoiceDecisionPayload{}); err == nil {
diff --git a/apps/daemon/internal/agent/mcode/session.go b/apps/daemon/internal/agent/mcode/session.go
index d93877cfa..cd32a2edf 100644
--- a/apps/daemon/internal/agent/mcode/session.go
+++ b/apps/daemon/internal/agent/mcode/session.go
@@ -67,7 +67,7 @@ func newSession(ctx context.Context, req proto.PromptRequestPayload, out chan<-
 	if out == nil {
 		return nil, fmt.Errorf("mcode: output channel is required")
 	}
-	opts, err := prepareOptions(ctx, req)
+	opts, err := prepareOptions(req)
 	if err != nil {
 		return nil, err
 	}
diff --git a/apps/daemon/internal/agent/mcode/tool_environment_test.go b/apps/daemon/internal/agent/mcode/tool_environment_test.go
index 557ff5dfa..ab6accd5a 100644
--- a/apps/daemon/internal/agent/mcode/tool_environment_test.go
+++ b/apps/daemon/internal/agent/mcode/tool_environment_test.go
@@ -60,7 +60,7 @@ func TestWorkspaceCredentialsRemainInRuntimeSnapshotAcrossReconnect(t *testing.T
 		if err != nil {
 			t.Fatal(err)
 		}
-		opts, err := prepareWorkspaceOptions(t.Context(), config, prepared)
+		opts, err := prepareWorkspaceOptions(config, prepared)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -125,7 +125,7 @@ func TestWorkspaceRejectsInvalidToolEnvironment(t *testing.T) {
 	}
 	t.Setenv("OAC_RUNTIME_TOOL_ENV_FILE", file)
 	t.Setenv("OAC_RUNTIME_INITIALIZATION_DIRECTORY", t.TempDir())
-	if _, err := prepareWorkspaceOptions(t.Context(), config, req); err == nil {
+	if _, err := prepareWorkspaceOptions(config, req); err == nil {
 		t.Fatal("invalid explicit tool configuration was ignored")
 	}
 }
diff --git a/apps/daemon/internal/agent/mcode/workspace.go b/apps/daemon/internal/agent/mcode/workspace.go
index 5c8f5aa6d..7fdf2d3fd 100644
--- a/apps/daemon/internal/agent/mcode/workspace.go
+++ b/apps/daemon/internal/agent/mcode/workspace.go
@@ -1,7 +1,6 @@
 package mcode
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -50,7 +49,7 @@ func ConfigureLocal(binary, node, bridge, root, workspace string, network agentn
 	return c, nil
 }
 
-func prepareWorkspaceOptions(ctx context.Context, c WorkspaceConfig, req proto.PromptRequestPayload) (launchOptions, error) {
+func prepareWorkspaceOptions(c WorkspaceConfig, req proto.PromptRequestPayload) (launchOptions, error) {
 	if c.Network != "enabled" || len(c.AllowedDomains) != 0 {
 		return launchOptions{}, fmt.Errorf("mcode: Runtime does not implement network isolation")
 	}
@@ -67,7 +66,7 @@ func prepareWorkspaceOptions(ctx context.Context, c WorkspaceConfig, req proto.P
 	private.LocalEnvironment, private.DisableExecutionEnvironment = nil, true
 	// Public declarations have already been resolved into the transient ACP map.
 	private.MCPHTTPServers = nil
-	opts, err := prepareOptionsWithSkills(ctx, private, false)
+	opts, err := prepareOptions(private)
 	if err != nil {
 		return opts, err
 	}
diff --git a/apps/daemon/internal/agent/mcode/workspace_network_test.go b/apps/daemon/internal/agent/mcode/workspace_network_test.go
index a42d387cd..83b3156ee 100644
--- a/apps/daemon/internal/agent/mcode/workspace_network_test.go
+++ b/apps/daemon/internal/agent/mcode/workspace_network_test.go
@@ -7,7 +7,7 @@ func TestWorkspaceRejectsInnerNetworkIsolation(t *testing.T) {
 		c, req, _ := workspaceFixture(t)
 		c.Network = access
 		req.LocalEnvironment.NetworkAccess = access
-		if _, err := prepareWorkspaceOptions(t.Context(), c, req); err == nil {
+		if _, err := prepareWorkspaceOptions(c, req); err == nil {
 			t.Fatal("unsupported network isolation accepted")
 		}
 	}
diff --git a/apps/daemon/internal/agent/mcode/workspace_skills_test.go b/apps/daemon/internal/agent/mcode/workspace_skills_test.go
index ed89e029f..0d7c9470d 100644
--- a/apps/daemon/internal/agent/mcode/workspace_skills_test.go
+++ b/apps/daemon/internal/agent/mcode/workspace_skills_test.go
@@ -28,7 +28,7 @@ func TestWorkspaceSkillsUseSelectedSnapshotAndNativeLoader(t *testing.T) {
 		Metadata: agentskill.Metadata{Name: "proof", Description: "Read a marker"},
 	}}
 	for range 2 {
-		opts, err := prepareWorkspaceOptions(t.Context(), c, req)
+		opts, err := prepareWorkspaceOptions(c, req)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/apps/daemon/internal/agent/runtime_paths.go b/apps/daemon/internal/agent/runtime_paths.go
index 5f78a1405..0ad41e2f0 100644
--- a/apps/daemon/internal/agent/runtime_paths.go
+++ b/apps/daemon/internal/agent/runtime_paths.go
@@ -8,12 +8,12 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/paths"
 )
 
-// ManagedSkillsRoot returns an adapter-owned skill directory scoped to one
-// agent state. It never derives runtime state from the subprocess cwd.
-func ManagedSkillsRoot(agentKind, agentStateKey, conversationID, runID string) (string, error) {
+// StateDir returns an adapter-owned state directory scoped to one agent
+// state. It never derives runtime state from the subprocess cwd.
+func StateDir(agentKind, agentStateKey, conversationID, runID string) (string, error) {
 	root, err := paths.Root()
 	if err != nil {
-		return "", fmt.Errorf("agent: resolve managed skills root: %w", err)
+		return "", fmt.Errorf("agent: resolve state directory: %w", err)
 	}
 	kind := safeRuntimePathPart(agentKind)
 	if kind == "" {
@@ -25,13 +25,13 @@ func ManagedSkillsRoot(agentKind, agentStateKey, conversationID, runID string) (
 		if len(parts) == 0 {
 			return "", fmt.Errorf("agent: invalid agent state key %q", agentStateKey)
 		}
-		return filepath.Join(append([]string{base, "state"}, append(parts, "skills")...)...), nil
+		return filepath.Join(append([]string{base, "state"}, parts...)...), nil
 	}
 	if id := safeRuntimePathPart(conversationID); id != "" {
-		return filepath.Join(base, "conv-"+id, "skills"), nil
+		return filepath.Join(base, "conv-"+id), nil
 	}
 	if id := safeRuntimePathPart(runID); id != "" {
-		return filepath.Join(base, "run-"+id, "skills"), nil
+		return filepath.Join(base, "run-"+id), nil
 	}
 	return "", fmt.Errorf("agent: agent state key, conversation id, or run id is required")
 }
diff --git a/apps/daemon/internal/agent/runtime_paths_test.go b/apps/daemon/internal/agent/runtime_paths_test.go
index 8cf35e5dc..2cc51981a 100644
--- a/apps/daemon/internal/agent/runtime_paths_test.go
+++ b/apps/daemon/internal/agent/runtime_paths_test.go
@@ -5,27 +5,27 @@ import (
 	"testing"
 )
 
-func TestManagedSkillsRootUsesStableAgentState(t *testing.T) {
+func TestStateDirUsesStableAgentState(t *testing.T) {
 	home := t.TempDir()
 	t.Setenv("OAC_RUNTIME_HOME", home)
-	got, err := ManagedSkillsRoot("codex", "conv-1/agent-1/codex", "ignored", "ignored")
+	got, err := StateDir("codex", "conv-1/agent-1/codex", "ignored", "ignored")
 	if err != nil {
-		t.Fatalf("ManagedSkillsRoot: %v", err)
+		t.Fatalf("StateDir: %v", err)
 	}
-	want := filepath.Join(home, "runtime", "codex", "state", "conv-1", "agent-1", "codex", "skills")
+	want := filepath.Join(home, "runtime", "codex", "state", "conv-1", "agent-1", "codex")
 	if got != want {
 		t.Fatalf("root = %q, want %q", got, want)
 	}
 }
 
-func TestManagedSkillsRootSanitizesFallback(t *testing.T) {
+func TestStateDirSanitizesFallback(t *testing.T) {
 	home := t.TempDir()
 	t.Setenv("OAC_RUNTIME_HOME", home)
-	got, err := ManagedSkillsRoot("fake_beta", "", "../conv name", "ignored")
+	got, err := StateDir("fake_beta", "", "../conv name", "ignored")
 	if err != nil {
-		t.Fatalf("ManagedSkillsRoot: %v", err)
+		t.Fatalf("StateDir: %v", err)
 	}
-	want := filepath.Join(home, "runtime", "fake_beta", "conv-.._conv_name", "skills")
+	want := filepath.Join(home, "runtime", "fake_beta", "conv-.._conv_name")
 	if got != want {
 		t.Fatalf("root = %q, want %q", got, want)
 	}
diff --git a/apps/daemon/internal/cli/agent_registration.go b/apps/daemon/internal/cli/agent_registration.go
index f2911f217..09472bf6e 100644
--- a/apps/daemon/internal/cli/agent_registration.go
+++ b/apps/daemon/internal/cli/agent_registration.go
@@ -2,15 +2,8 @@ package cli
 
 import "github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 
-func registerAgentKinds(registry *agent.Registry, discovery agentCLIDiscovery, serverURL string) {
+func registerAgentKinds(registry *agent.Registry, discovery agentCLIDiscovery) {
 	for _, discovered := range discovery {
-		runtime := discovered.runtime
-		if runtime.SessionCapabilityContext {
-			runtime.Session = withSkillUploadServer(withCapabilityDownloads(runtime.Session, serverURL), serverURL)
-		}
-		if runtime.Executor != nil && runtime.ExecutorCapabilityContext {
-			runtime.Executor = withExecutorCapabilities(runtime.Executor, serverURL)
-		}
-		registry.Register(discovered.declaration, runtime)
+		registry.Register(discovered.declaration, discovered.runtime)
 	}
 }
diff --git a/apps/daemon/internal/cli/capability_downloads.go b/apps/daemon/internal/cli/capability_downloads.go
deleted file mode 100644
index c6def5f15..000000000
--- a/apps/daemon/internal/cli/capability_downloads.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package cli
-
-import (
-	"context"
-	"maps"
-	"net"
-	"net/url"
-	"slices"
-	"strings"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-// Use the paired server address for loopback PG downloads: inside Compose,
-// the public loopback address points to the runtime container itself.
-func withCapabilityDownloads(factory agent.Factory, serverURL string) agent.Factory {
-	base, err := url.Parse(serverURL)
-	if err != nil || base.Host == "" || (base.Scheme != "http" && base.Scheme != "https") {
-		return factory
-	}
-	return func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		req = capabilityDownloadRequest(req, base)
-		return factory(ctx, req, out)
-	}
-}
-
-func capabilityDownloadURL(raw string, base *url.URL) string {
-	u, err := url.Parse(raw)
-	if err != nil || (u.Scheme != "http" && u.Scheme != "https") {
-		return raw
-	}
-	host := u.Hostname()
-	if !strings.EqualFold(host, "localhost") && !net.ParseIP(host).IsLoopback() {
-		return raw
-	}
-	const blobPath = "/internal/blobs/pg:"
-	start := strings.Index(u.Path, blobPath)
-	if start < 0 {
-		return raw
-	}
-	u.Scheme, u.Host, u.User = base.Scheme, base.Host, nil
-	u.Path = strings.TrimRight(base.Path, "/") + u.Path[start:]
-	u.RawPath = ""
-	return u.String()
-}
-
-func capabilityDownloadRequest(req proto.PromptRequestPayload, base *url.URL) proto.PromptRequestPayload {
-	opts := maps.Clone(req.AgentOptions)
-	for _, key := range []string{"skills", "plugins"} {
-		items, ok := opts[key].([]any)
-		if !ok {
-			continue
-		}
-		items = slices.Clone(items)
-		for i, item := range items {
-			descriptor, ok := item.(map[string]any)
-			if !ok {
-				continue
-			}
-			raw, _ := descriptor["download_url"].(string)
-			if resolved := capabilityDownloadURL(raw, base); resolved != raw {
-				updated := maps.Clone(descriptor)
-				updated["download_url"] = resolved
-				items[i] = updated
-			}
-		}
-		opts[key] = items
-	}
-	req.AgentOptions = opts
-	return req
-}
-
-// Executor setup applies the same immutable capability snapshot as ordinary execution.
-func withExecutorCapabilities(factory agent.ExecutorFactory, serverURL string) agent.ExecutorFactory {
-	base, err := url.Parse(serverURL)
-	valid := err == nil && base.Host != "" && (base.Scheme == "http" || base.Scheme == "https")
-	return func(ctx context.Context, req proto.PromptRequestPayload) (agent.Executor, error) {
-		if valid {
-			req = capabilityDownloadRequest(req, base)
-		}
-		req = skillUploadRequest(req, serverURL)
-		return factory(ctx, req)
-	}
-}
diff --git a/apps/daemon/internal/cli/capability_downloads_test.go b/apps/daemon/internal/cli/capability_downloads_test.go
deleted file mode 100644
index ecdcbc22f..000000000
--- a/apps/daemon/internal/cli/capability_downloads_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package cli
-
-import (
-	"archive/zip"
-	"bytes"
-	"context"
-	"crypto/sha256"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent/managedskills"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func TestCapabilityDownloadUsesPairedServerOnlyForLoopbackPG(t *testing.T) {
-	base, _ := url.Parse("https://parsar.example.test/team")
-	for _, tc := range []struct{ raw, want string }{
-		{"http://127.0.0.1:28080/internal/blobs/pg:id?token=a%2Bb", "https://parsar.example.test/team/internal/blobs/pg:id?token=a%2Bb"},
-		{"http://localhost:28080/old/internal/blobs/pg:id?token=a", "https://parsar.example.test/team/internal/blobs/pg:id?token=a"},
-		{"http://[::1]:28080/internal/blobs/pg:id?token=a", "https://parsar.example.test/team/internal/blobs/pg:id?token=a"},
-		{"https://bucket.example.test/skill.zip?Signature=a", "https://bucket.example.test/skill.zip?Signature=a"},
-		{"http://localhost:28080/other.zip", "http://localhost:28080/other.zip"},
-		{"https://public.example.test/internal/blobs/pg:id?token=a", "https://public.example.test/internal/blobs/pg:id?token=a"},
-		{"file:///internal/blobs/pg:id", "file:///internal/blobs/pg:id"},
-	} {
-		if got := capabilityDownloadURL(tc.raw, base); got != tc.want {
-			t.Errorf("%s: got %s, want %s", tc.raw, got, tc.want)
-		}
-	}
-}
-
-func TestCapabilityDownloadsInstallZIPThroughPairedServer(t *testing.T) {
-	var archive bytes.Buffer
-	w := zip.NewWriter(&archive)
-	for name, content := range map[string]string{
-		"SKILL.md":             "---\nname: qa-download\ndescription: Test downloaded context\n---\nRead references/policy.md.\n",
-		"references/policy.md": "Collect the laptop on the third working day.\n",
-	} {
-		file, err := w.Create(name)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, err := file.Write([]byte(content)); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != "/team/internal/blobs/pg:test" || r.URL.RawQuery != "token=synthetic%2Bsignature" {
-			t.Errorf("download request changed signed resource: %s", r.URL)
-			http.Error(w, "unexpected request", http.StatusForbidden)
-			return
-		}
-		_, _ = w.Write(archive.Bytes())
-	}))
-	defer server.Close()
-	root := t.TempDir()
-	rawURL := "http://127.0.0.1:1/internal/blobs/pg:test?token=synthetic%2Bsignature"
-	descriptor := map[string]any{"name": "qa-download", "version": "1.0.0", "download_url": rawURL, "sha256": fmt.Sprintf("%x", sha256.Sum256(archive.Bytes()))}
-	opts := map[string]any{"skills": []any{descriptor}, "plugins": []any{descriptor}, "model": "preserved"}
-	factory := withCapabilityDownloads(func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		if req.RunID != "run-test" || req.AgentOptions["model"] != "preserved" {
-			t.Fatal("unrelated request fields changed")
-		}
-		plugin := req.AgentOptions["plugins"].([]any)[0].(map[string]any)
-		skill := req.AgentOptions["skills"].([]any)[0].(map[string]any)
-		if plugin["download_url"] != skill["download_url"] {
-			t.Fatal("plugin and skill routing differs")
-		}
-		result, err := managedskills.InstallManagedSkills(ctx, nil, root, req.AgentOptions["skills"])
-		if err == nil && len(result.Warnings) > 0 {
-			err = fmt.Errorf("installation warnings: %v", result.Warnings)
-		}
-		return nil, err
-	}, server.URL+"/team")
-	if _, err := factory(context.Background(), proto.PromptRequestPayload{RunID: "run-test", AgentOptions: opts}, nil); err != nil {
-		t.Fatal(err)
-	}
-	content, err := os.ReadFile(filepath.Join(root, "qa-download", "references", "policy.md"))
-	if err != nil || string(content) != "Collect the laptop on the third working day.\n" {
-		t.Fatalf("installed reference: %q, %v", content, err)
-	}
-	if descriptor["download_url"] != rawURL {
-		t.Fatal("rewrote the original request options")
-	}
-}
-
-func TestExecutorPreparationUsesCapabilitySnapshotTransform(t *testing.T) {
-	originalURL := "http://localhost:8080/internal/blobs/pg:skill"
-	descriptor := map[string]any{"download_url": originalURL}
-	source := proto.PromptRequestPayload{AgentOptions: map[string]any{"skills": []any{descriptor}}}
-	calls := 0
-	factory := withExecutorCapabilities(func(_ context.Context, req proto.PromptRequestPayload) (agent.Executor, error) {
-		calls++
-		actual := req.AgentOptions["skills"].([]any)[0].(map[string]any)["download_url"]
-		if actual != "http://paired-core:8080/internal/blobs/pg:skill" {
-			t.Fatalf("executor capability URL = %v", actual)
-		}
-		return nil, nil
-	}, "http://paired-core:8080")
-	if _, err := factory(t.Context(), source); err != nil {
-		t.Fatal(err)
-	}
-	if calls != 1 || descriptor["download_url"] != originalURL {
-		t.Fatal("preparation changed the source snapshot or repeated setup")
-	}
-}
diff --git a/apps/daemon/internal/cli/claude_sdk_live_linux_test.go b/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
index 7c4899315..3b8a14647 100644
--- a/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
+++ b/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
@@ -72,7 +72,7 @@ func TestLiveRegisteredClaudeSDK(t *testing.T) {
 	run := func(index int, prompt, resume string, callFunction, cancelOnText bool) execution {
 		t.Helper()
 		reg := agent.NewRegistry()
-		registerAgentKinds(reg, discovery, "https://product.invalid")
+		registerAgentKinds(reg, discovery)
 		reg = authoringRegistry(reg, authoring.New(nil))
 		sender := make(registeredSDKSender, 256)
 		router, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender})
diff --git a/apps/daemon/internal/cli/companion_path.go b/apps/daemon/internal/cli/companion_path.go
new file mode 100644
index 000000000..d83814828
--- /dev/null
+++ b/apps/daemon/internal/cli/companion_path.go
@@ -0,0 +1,18 @@
+package cli
+
+import (
+	"os"
+	"path/filepath"
+)
+
+func addCompanionCLIPath(env map[string]any, dir string) {
+	info, err := os.Stat(filepath.Join(dir, "parsar"))
+	if err != nil || !info.Mode().IsRegular() || info.Mode().Perm()&0o111 == 0 {
+		return
+	}
+	path, ok := env["PATH"].(string)
+	if !ok {
+		path = os.Getenv("PATH")
+	}
+	env["PATH"] = dir + string(os.PathListSeparator) + path
+}
diff --git a/apps/daemon/internal/cli/connect.go b/apps/daemon/internal/cli/connect.go
index 7fb6e82f8..ae295f0aa 100644
--- a/apps/daemon/internal/cli/connect.go
+++ b/apps/daemon/internal/cli/connect.go
@@ -327,7 +327,7 @@ func mainLoopRemote(parent context.Context, rc *runContext, profile string, prof
 	obslog.Bg().Info("bootstrap ok", "device_id", boot.DeviceID, "ws_url", wsURL, "heartbeat_interval", boot.HeartbeatInterval())
 
 	registry := agent.NewRegistry()
-	registerAgentKinds(registry, agentCLIs, prof.ServerURL)
+	registerAgentKinds(registry, agentCLIs)
 
 	control, err := newSuspendControl()
 	if err != nil {
diff --git a/apps/daemon/internal/cli/native_discovery_test.go b/apps/daemon/internal/cli/native_discovery_test.go
index 8063e0dbd..e6d9e0dee 100644
--- a/apps/daemon/internal/cli/native_discovery_test.go
+++ b/apps/daemon/internal/cli/native_discovery_test.go
@@ -40,7 +40,7 @@ func TestDiscoveryAndRegistration(t *testing.T) {
 				t.Fatalf("probes %v, want %v", called, expected)
 			}
 			registry := agent.NewRegistry()
-			registerAgentKinds(registry, discovery, "")
+			registerAgentKinds(registry, discovery)
 			if len(registry.Kinds()) != len(expected) {
 				t.Fatal(registry.Kinds())
 			}
diff --git a/apps/daemon/internal/cli/preparation_test.go b/apps/daemon/internal/cli/preparation_test.go
index 2fdb8a189..df9082731 100644
--- a/apps/daemon/internal/cli/preparation_test.go
+++ b/apps/daemon/internal/cli/preparation_test.go
@@ -24,7 +24,7 @@ func TestPreparationRegistrationBypassesProductWrappers(t *testing.T) {
 			runtime.Preparation = func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return nil, nil }
 			runtime.WorkspaceReadPreparation = true
 		}
-		registerAgentKinds(reg, agentCLIDiscovery{{declaration: agent.Declaration{Info: info}, runtime: runtime}}, "http://unreachable.invalid")
+		registerAgentKinds(reg, agentCLIDiscovery{{declaration: agent.Declaration{Info: info}, runtime: runtime}})
 
 		_, err := reg.ResolvePreparation("codex")
 		if (err == nil) != supported {
diff --git a/apps/daemon/internal/cli/skill_upload.go b/apps/daemon/internal/cli/skill_upload.go
deleted file mode 100644
index cdb7ef279..000000000
--- a/apps/daemon/internal/cli/skill_upload.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package cli
-
-import (
-	"context"
-	"maps"
-	"os"
-	"path/filepath"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func withSkillUploadServer(factory agent.Factory, serverURL string) agent.Factory {
-	return func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		req = skillUploadRequest(req, serverURL)
-		return factory(ctx, req, out)
-	}
-}
-
-func addCompanionCLIPath(env map[string]any, dir string) {
-	info, err := os.Stat(filepath.Join(dir, "parsar"))
-	if err != nil || !info.Mode().IsRegular() || info.Mode().Perm()&0o111 == 0 {
-		return
-	}
-	path, ok := env["PATH"].(string)
-	if !ok {
-		path = os.Getenv("PATH")
-	}
-	env["PATH"] = dir + string(os.PathListSeparator) + path
-}
-
-func skillUploadRequest(req proto.PromptRequestPayload, serverURL string) proto.PromptRequestPayload {
-	env, _ := req.AgentOptions["env"].(map[string]any)
-	if token, _ := env["PARSAR_CAPABILITY_UPLOAD_TOKEN"].(string); token != "" {
-		env = maps.Clone(env)
-		env["PARSAR_SERVER_URL"] = serverURL
-		if executable, err := os.Executable(); err == nil {
-			addCompanionCLIPath(env, filepath.Dir(executable))
-		}
-		req.AgentOptions = maps.Clone(req.AgentOptions)
-		req.AgentOptions["env"] = env
-	}
-	return req
-}
diff --git a/apps/daemon/internal/cli/skill_upload_test.go b/apps/daemon/internal/cli/skill_upload_test.go
deleted file mode 100644
index ef8fc3921..000000000
--- a/apps/daemon/internal/cli/skill_upload_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cli
-
-import (
-	"context"
-	"os"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func TestSkillUploadUsesPairedAddressPerRequest(t *testing.T) {
-	t.Setenv("PARSAR_SERVER_URL", "unchanged-process-env")
-	env := map[string]any{"PARSAR_CAPABILITY_UPLOAD_TOKEN": "run-a", "PARSAR_SERVER_URL": "http://localhost:1234", "MODEL_KEY": "preserve"}
-	opts := map[string]any{"env": env, "model": "preserve"}
-	calls := 0
-	factory := withSkillUploadServer(func(_ context.Context, req proto.PromptRequestPayload, _ chan<- proto.Envelope) (agent.Session, error) {
-		calls++
-		if calls == 1 {
-			got := req.AgentOptions["env"].(map[string]any)
-			if got["PARSAR_SERVER_URL"] != "http://parsar-server:8080" || got["PARSAR_CAPABILITY_UPLOAD_TOKEN"] != "run-a" || got["MODEL_KEY"] != "preserve" || req.AgentOptions["model"] != "preserve" {
-				t.Fatal("per-run context incorrect")
-			}
-			if _, exists := got["PARSAR_RUNNER_TOKEN"]; exists {
-				t.Fatal("exported device credential")
-			}
-		} else if len(req.AgentOptions) != 0 {
-			t.Fatal("previous run's context leaked")
-		}
-		return nil, nil
-	}, "http://parsar-server:8080")
-	if _, err := factory(t.Context(), proto.PromptRequestPayload{AgentOptions: opts}, nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := factory(t.Context(), proto.PromptRequestPayload{}, nil); err != nil {
-		t.Fatal(err)
-	}
-	if env["PARSAR_SERVER_URL"] != "http://localhost:1234" || os.Getenv("PARSAR_SERVER_URL") != "unchanged-process-env" {
-		t.Fatal("mutated caller or process environment")
-	}
-}
diff --git a/apps/daemon/internal/dispatch/environment.go b/apps/daemon/internal/dispatch/environment.go
index 3b0cb4b91..932ad7649 100644
--- a/apps/daemon/internal/dispatch/environment.go
+++ b/apps/daemon/internal/dispatch/environment.go
@@ -7,6 +7,9 @@ import (
 )
 
 func validateExecutionEnvironment(req proto.PromptRequestPayload, caps proto.AgentKindCapabilities) error {
+	if err := req.ValidateAgentOptions(); err != nil {
+		return err
+	}
 	if err := req.ValidateProgrammaticToolCallingDisable(caps.ProgrammaticToolCallingDisable.IsSupported()); err != nil {
 		return err
 	}
diff --git a/apps/daemon/internal/dispatch/executor.go b/apps/daemon/internal/dispatch/executor.go
index 90544c9a7..4e7389cc4 100644
--- a/apps/daemon/internal/dispatch/executor.go
+++ b/apps/daemon/internal/dispatch/executor.go
@@ -60,7 +60,7 @@ func (r *Router) handleExecutorPrepare(ctx context.Context, env proto.Envelope,
 	if err != nil {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
-	if validateExecutionEnvironment(req, caps) != nil || len(req.FunctionTools) > 0 && !caps.FunctionTools.IsSupported() {
+	if (req.LocalEnvironment != nil) == req.DisableExecutionEnvironment || validateExecutionEnvironment(req, caps) != nil || len(req.FunctionTools) > 0 && !caps.FunctionTools.IsSupported() {
 		return r.rejectPreparation(env, "unsupported_configuration")
 	}
 	fingerprint, err := executorFingerprint(req)
diff --git a/apps/daemon/internal/dispatch/executor_test.go b/apps/daemon/internal/dispatch/executor_test.go
index 66ec59fba..c8db7c741 100644
--- a/apps/daemon/internal/dispatch/executor_test.go
+++ b/apps/daemon/internal/dispatch/executor_test.go
@@ -294,6 +294,25 @@ func TestExecutorRejectsSessionStateScopeMismatch(t *testing.T) {
 	}
 }
 
+func TestExecutorRejectsUnsupportedConfigurationBeforeFactory(t *testing.T) {
+	for name, change := range map[string]func(*proto.PromptRequestPayload){
+		"no environment":       func(r *proto.PromptRequestPayload) { r.DisableExecutionEnvironment = false },
+		"unknown agent option": func(r *proto.PromptRequestPayload) { r.AgentOptions = map[string]any{"mode": "plan"} },
+	} {
+		t.Run(name, func(t *testing.T) {
+			r, s, calls := executorRouter(t, &reusableExecutor{}, time.Minute)
+			req := executorRequest()
+			change(&req.Configuration)
+			if err := r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "request", req)); err == nil {
+				t.Fatal("unsupported configuration accepted")
+			}
+			if status := waitPreparationStatus(t, s, "request", "rejected", ""); status.ErrorCode != "unsupported_configuration" || calls.Load() != 0 {
+				t.Fatalf("status=%+v factory calls=%d", status, calls.Load())
+			}
+		})
+	}
+}
+
 func TestExecutorRejectsOutputFromAnotherTurn(t *testing.T) {
 	e := &reusableExecutor{starts: make(chan *reusableTurn, 1)}
 	r, s, _ := executorRouter(t, e, time.Minute)
diff --git a/contracts/agents-api/harness-onboarding.md b/contracts/agents-api/harness-onboarding.md
index c382061cf..0d6fba074 100644
--- a/contracts/agents-api/harness-onboarding.md
+++ b/contracts/agents-api/harness-onboarding.md
@@ -151,7 +151,7 @@ A Harness that supports the Subagent reads implements the [neutral observation c
 
 Registration is static and requires a build. Export one `agent.Declaration` from `apps/daemon/internal/agent/<kind>/declaration.go`, then add it to `harnessDeclarations` in [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go). The declaration contains the kind and complete capability descriptor, the shared model `Configuration` and a `Discover` function. Discovery receives the profile and diagnostic writers, owns native configuration and availability checks, and returns the installed `agent.Runtime` with its descriptor and session, preparation and Executor factories. Return nil when the adapter is not configured; return an unavailable descriptor with a session factory when configured prerequisites fail. Keep version gates and factory-selection conditions inside the adapter.
 
-`Runtime.SessionCapabilityContext` and `Runtime.ExecutorCapabilityContext` explicitly request capability-download URL resolution and scoped product-upload context for the corresponding execution factory. Preparation never receives those effects. An adapter that supports product workspace authoring declares `WorkspaceAuthoring` itself; common registration does not grant it.
+An adapter that supports product workspace authoring declares `WorkspaceAuthoring` itself; common registration does not grant it.
 
 [`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) iterates the discovered runtimes and calls `Registry.Register` from `agent/harness.go`. It verifies that discovery retained the declared kind and installs factories in this order:
 
diff --git a/contracts/agents-api/zh/harness-onboarding.md b/contracts/agents-api/zh/harness-onboarding.md
index 169fc2566..b22b086bf 100644
--- a/contracts/agents-api/zh/harness-onboarding.md
+++ b/contracts/agents-api/zh/harness-onboarding.md
@@ -1,7 +1,7 @@
 ---
 title: "将原生 Harness 添加到 OpenAgentCore"
 source: contracts/agents-api/harness-onboarding.md
-source_hash: bcc38731520dd485fa91b3d897774da397a1a2ddfa866d1c01e1cc91e348bd97
+source_hash: 32adff66e2fb33956e96f9a453518d70a3f87056eb777e82a60e087fe4e5aa31
 ---
 
 **Harness** 是一种运行模型和工具循环的原生代理引擎（Codex、Claude Code、MiniMax Code）。**Harness 适配器**将 Runtime 的 Executor 和 Turn 契约转换到该引擎的 SDK 或协议。本文档定义 Runtime–Harness 协议：适配器接口及其生命周期义务、注册、Core 资格认定和验收。[Harness capabilities](harness-capabilities.md) 记录了当前每个 Harness 支持的功能。
@@ -153,7 +153,7 @@ MCP、公共函数、延迟函数发现、结构化输出、图像输入、详
 
 注册是静态的，并且需要构建。从 `apps/daemon/internal/agent/<kind>/declaration.go` 导出一个 `agent.Declaration`，然后将其添加到 [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go) 的 `harnessDeclarations` 中。声明包含 kind、完整能力描述符、共享模型 `Configuration` 和 `Discover` 函数。发现过程接收 profile 和诊断写入器，负责原生配置和可用性检查，并返回已安装的 `agent.Runtime` 及其描述符、session 工厂、准备工厂和 Executor 工厂。未配置适配器时返回 nil；已配置的前置条件失败时，返回不可用描述符和 session 工厂。将版本门控和工厂选择条件保留在适配器内部。
 
-`Runtime.SessionCapabilityContext` 和 `Runtime.ExecutorCapabilityContext` 会为相应的执行工厂显式请求能力下载 URL 解析和限定范围的产品上传上下文。准备过程绝不会收到这些影响。支持产品工作区创作功能的适配器自行声明 `WorkspaceAuthoring`；通用注册不会授予该能力。
+支持产品工作区创作功能的适配器自行声明 `WorkspaceAuthoring`；通用注册不会授予该能力。
 
 [`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) 遍历已发现的 Runtime，并调用 `agent/harness.go` 中的 `Registry.Register`。它验证发现过程是否保留了声明的 kind，并按以下顺序安装工厂：
 
diff --git a/docs/runtime-protocol.md b/docs/runtime-protocol.md
index aa2cb8441..a0398c22a 100644
--- a/docs/runtime-protocol.md
+++ b/docs/runtime-protocol.md
@@ -57,6 +57,7 @@ The prompt request (`prompt_request`, or the configuration of `execution_prepare
 
 | Field | Set by Core |
 | --- | --- |
+| `agent_options` | Always `model` and `system_prompt` from the Agent; `model_provider` when the Session froze one; `harness_config` when the Agent sets `x_agents_core.harness_config`. Core sends no other key; the Runtime rejects any other key with `unsupported_configuration` before preparation |
 | `execution_controls` | Always: web search `disabled`, the resolved text verbosity (default `medium`), an explicit programmatic-tool-calling disable and any `json_schema` output format. Native option names belong to the adapter |
 | `observe_tool_observations` | Always. Tool-call frames then carry the engine-neutral `observation` |
 | `observe_messages` | When the Runtime declares `message_items`. Text deltas then carry the native item ID, and `output_message` frames report message start, completion, phase and the completion text |
@@ -66,6 +67,8 @@ The prompt request (`prompt_request`, or the configuration of `execution_prepare
 | `strict_resume`, `require_existing_native_session` | Always strict; the second when a native Session must be recovered |
 | `durable_receipt` on `prompt_steer` | For every active input Core delivers |
 
+An execution configuration requires exactly one of `local_environment` and `disable_execution_environment`; `execution_prepare` rejects neither or both with `unsupported_configuration`.
+
 Requests without an opt-in keep the frames and fields they had without it.
 
 ## Envelope and identity
diff --git a/docs/zh/runtime-protocol.md b/docs/zh/runtime-protocol.md
index 8a3077ceb..050b36d91 100644
--- a/docs/zh/runtime-protocol.md
+++ b/docs/zh/runtime-protocol.md
@@ -1,7 +1,7 @@
 ---
 title: "Core–Runtime 协议"
 source: docs/runtime-protocol.md
-source_hash: cbc3c6419e2d4991df82d5bbfe3b556d35cccb57d1e4e7437facca7487caabcc
+source_hash: 13766041c9ed0c012ceb5051fe43dcc8a1738a198fe325aad15f1902fe373ee3
 ---
 
 此协议在 Runtime daemon 获取机器凭据后连接 Core 与 daemon，定义 daemon 连接上消息的含义和顺序。wire 类型、限制和验证器仅在 [`internal/agentdaemon/proto`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/internal/agentdaemon/proto) 中定义一次；Core 的 [gateway](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/services/core/internal/runtimegateway) 与参考 Runtime 的 [dispatcher](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/apps/daemon/internal/dispatch) 都使用它们，因此无需同步第二套 payload schema。签发凭据和打开连接的 HTTP 路由见[机器连接 API](../../contracts/agents-api/zh/machine-api.md)。
@@ -59,6 +59,7 @@ prompt 请求（`prompt_request` 或 `execution_prepare` 的配置）携带 Core
 
 | 字段 | Core 设置方式 |
 | --- | --- |
+| `agent_options` | 始终设置 Agent 的 `model` 和 `system_prompt`；Session 冻结了 model provider 时设置 `model_provider`；Agent 设置 `x_agents_core.harness_config` 时设置 `harness_config`。Core 不发送其他键；Runtime 在准备之前以 `unsupported_configuration` 拒绝任何其他键 |
 | `execution_controls` | 始终设置：web search 为 `disabled`、解析后的 text verbosity（默认 `medium`）、明确禁用 programmatic tool calling，以及任何 `json_schema` 输出格式。原生选项名称由 adapter 负责 |
 | `observe_tool_observations` | 始终设置。tool-call frame 随后携带与 engine 无关的 `observation` |
 | `observe_messages` | Runtime 声明 `message_items` 时设置。文本 delta 随后携带原生 item ID，`output_message` frame 报告消息开始、完成、phase 和完成文本 |
@@ -68,6 +69,8 @@ prompt 请求（`prompt_request` 或 `execution_prepare` 的配置）携带 Core
 | `strict_resume`, `require_existing_native_session` | 始终严格；需要恢复原生 Session 时设置第二项 |
 | `prompt_steer` 上的 `durable_receipt` | Core 交付的每个活动输入都设置 |
 
+执行配置必须且只能包含 `local_environment` 和 `disable_execution_environment` 之一；两者都缺失或同时存在时，`execution_prepare` 以 `unsupported_configuration` 拒绝。
+
 未携带显式启用项的请求保留未启用时的 frame 和字段。
 
 ## Envelope 与身份 {#envelope-and-identity}
diff --git a/internal/agentdaemon/proto/outbound.go b/internal/agentdaemon/proto/outbound.go
index 041492308..8f5db4e41 100644
--- a/internal/agentdaemon/proto/outbound.go
+++ b/internal/agentdaemon/proto/outbound.go
@@ -1,6 +1,9 @@
 package proto
 
-import "encoding/json"
+import (
+	"encoding/json"
+	"errors"
+)
 
 // Type constants for server → daemon frames.
 const (
@@ -53,10 +56,8 @@ type PromptRequestPayload struct {
 	// Input preserves ordered user messages and content.
 	Input MessageInput `json:"input,omitempty"`
 
-	// AgentOptions carries agent-specific overrides (model, mode,
-	// allowed_tools, system_prompt, mcp_servers, plugin_dirs, env,
-	// ...). The daemon's agent interprets these; the gateway never
-	// inspects them.
+	// AgentOptions carries only the keys ValidateAgentOptions accepts. The
+	// daemon's agent interprets them; the gateway never inspects them.
 	AgentOptions map[string]any `json:"agent_options,omitempty"`
 
 	// ExecutionControls are authoritative engine-neutral settings, translated by the adapter.
@@ -141,3 +142,16 @@ type OutputFormat struct {
 	Type   string          `json:"type"`
 	Schema json.RawMessage `json:"schema"`
 }
+
+// ValidateAgentOptions rejects any agent_options key other than model,
+// system_prompt, model_provider and harness_config.
+func (r PromptRequestPayload) ValidateAgentOptions() error {
+	for key := range r.AgentOptions {
+		switch key {
+		case "model", "system_prompt", "model_provider", "harness_config":
+		default:
+			return errors.New("unsupported agent option")
+		}
+	}
+	return nil
+}
diff --git a/packages/claude-sdk-adapter/README.md b/packages/claude-sdk-adapter/README.md
index 880cc927d..feca4d537 100644
--- a/packages/claude-sdk-adapter/README.md
+++ b/packages/claude-sdk-adapter/README.md
@@ -66,7 +66,7 @@ Workspace deferred-function discovery uses native ToolSearch alongside the norma
 
 For unmanaged bootstrap, daemon `connect` optionally registers this factory as `claude_sdk` when the operator sets `OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT` to the absolute packaged `dist/main.js`. `OAC_RUNTIME_CLAUDE_SDK_NODE` selects Node (default: `node` on PATH). Discovery resolves Node once and checks that exact configuration before pairing; the SDK's bounded runtime check is independent of CLI version probes. A ready SDK alone is sufficient to start the daemon. No configuration means no SDK probe or descriptor; failed readiness reports an unavailable descriptor with a rejecting factory. Runtime checks establish local readiness, not provider authentication. Installed daemons use `start` and their verified installation manifest for adapter selection and activation; ambient activation variables cannot extend that selection. See [the native installation contract](../../deploy/README.md#native-daemon-installer).
 
-SDK state lives under `paths.ProfileDir(profile)/runtime/claude-sdk`, independently of the replaceable runtime bundle. Both the entrypoint and managed state root must be absolute. Background re-execution inherits operator configuration; it does not persist provider credentials in pairing profiles. The daemon registers `claude_sdk` directly, without the capability-download, skill-upload and `WorkspaceAuthoring` wrappers of its product agent kinds. It accepts no caller-supplied environment variables or business write authority.
+SDK state lives under `paths.ProfileDir(profile)/runtime/claude-sdk`, independently of the replaceable runtime bundle. Both the entrypoint and managed state root must be absolute. Background re-execution inherits operator configuration; it does not persist provider credentials in pairing profiles. The daemon registers `claude_sdk` directly, without the `WorkspaceAuthoring` wrapper of its product agent kinds. It accepts no caller-supplied environment variables or business write authority.
 
 ### Descriptor and execution profile
 
diff --git a/scripts/name-allowlist.json b/scripts/name-allowlist.json
index 2468c8388..23ac631c9 100644
--- a/scripts/name-allowlist.json
+++ b/scripts/name-allowlist.json
@@ -39,11 +39,6 @@
     "regex": "(?i)parsar|\\bAGENTS_CORE_WEB_[A-Z][A-Z0-9_]*|\\bAGENTS_API_[A-Z][A-Z0-9_]*|\\bCORE_CONSOLE_[A-Z][A-Z0-9_]*|\\bagents-api(?:-(?:migrate|device|environment-key|e2b-provider|microsandbox-provider|tool-root|codex-directory|codex-write|workspace-export|runtime-initialize|claude-shell-prefix))?\\b|\\bcore-console\\b|\\bagents-runtime-|\\bAgents? Core(?: Web)?\\b|@agents-core-web/|\\bminimax-ai-dev\\b",
     "reason": "Guard regression fixtures intentionally contain retired identifiers, including rejected examples."
   },
-  {
-    "path": "apps/daemon/internal/cli/skill_upload*.go",
-    "regex": "\\bPARSAR_(?:CAPABILITY_UPLOAD_TOKEN|SERVER_URL)\\b",
-    "reason": "These settings belong to the separate product capability upload integration; Core does not rename their protocol."
-  },
   {
     "path": "services/core/migrations/000078_oac_runtime_names.sql",
     "regex": "parsar-core-runtime@",
@@ -150,24 +145,14 @@
     "reason": "Historical migration commentary records the environment name used when this migration was written."
   },
   {
-    "path": "apps/daemon/internal/cli/skill_upload.go",
-    "regex": "parsar(?:-server|\\.example\\.test)?|PARSAR_RUNNER_TOKEN",
-    "reason": "The dormant product capability upload/download integration locates the separate product CLI and checks its product credentials; it is explicitly retained."
-  },
-  {
-    "path": "apps/daemon/internal/cli/skill_upload_test.go",
-    "regex": "parsar(?:-server|\\.example\\.test)?|PARSAR_RUNNER_TOKEN",
-    "reason": "The dormant product capability upload/download integration locates the separate product CLI and checks its product credentials; it is explicitly retained."
+    "path": "apps/daemon/internal/cli/companion_path.go",
+    "regex": "\\bparsar\\b",
+    "reason": "The authoring bridge puts the separate product CLI on PATH; that CLI keeps its own name."
   },
   {
     "path": "apps/daemon/internal/cli/companion_path_test.go",
-    "regex": "parsar(?:-server|\\.example\\.test)?|PARSAR_RUNNER_TOKEN",
-    "reason": "The dormant product capability upload/download integration locates the separate product CLI and checks its product credentials; it is explicitly retained."
-  },
-  {
-    "path": "apps/daemon/internal/cli/capability_downloads_test.go",
-    "regex": "parsar(?:-server|\\.example\\.test)?|PARSAR_RUNNER_TOKEN",
-    "reason": "The dormant product capability upload/download integration locates the separate product CLI and checks its product credentials; it is explicitly retained."
+    "regex": "\\bparsar\\b",
+    "reason": "The authoring bridge puts the separate product CLI on PATH; that CLI keeps its own name."
   },
   {
     "path": "CONTRIBUTING.md",
diff --git a/services/core/deploy/codex/README.md b/services/core/deploy/codex/README.md
index 42ef10922..ac0c9c78b 100644
--- a/services/core/deploy/codex/README.md
+++ b/services/core/deploy/codex/README.md
@@ -16,9 +16,9 @@ Each Session has its own `CODEX_HOME` at `$OAC_RUNTIME_HOME/daemon/agent-session
 
 ## Execution controls
 
-The adapter applies Core's typed controls and opt-ins, described in the [Runtime protocol](../../../../docs/runtime-protocol.md#capability-declarations), through native Codex settings on both new and resumed Turns. Explicit controls take precedence over adapter options without changing them.
+The adapter applies Core's typed controls and opt-ins, described in the [Runtime protocol](../../../../docs/runtime-protocol.md#capability-declarations), through native Codex settings on both new and resumed Turns.
 
-- **`environment: none`.** The daemon forces `CODEX_EXEC_SERVER_URL=none` after the caller's environment options and confirms that Codex reports its `local` and `remote` environments as unknown before it starts or resumes a thread; a binary that cannot do this fails closed. The engine process runs on the bound device, which is not a user execution environment.
+- **`environment: none`.** The daemon forces `CODEX_EXEC_SERVER_URL=none` and confirms that Codex reports its `local` and `remote` environments as unknown before it starts or resumes a thread; a binary that cannot do this fails closed. The engine process runs on the bound device, which is not a user execution environment.
 - **Web search.** The control becomes Codex's `web_search` option (`disabled`, `cached` or `live`); Core sends `disabled`.
 - **Programmatic tool calling.** An explicit disable turns off the native `code_mode`, `code_mode_only` and `code_mode_prewarm` features and checks managed requirements before a thread starts or resumes, rejecting a conflicting requirement.
 - **Text verbosity.** The adapter reads the model catalog with `codex debug models`, checks the model's support and pins that catalog snapshot for the execution. The probe needs Unix process-group cancellation, so other hosts do not declare `text_verbosity`. For a model without declared verbosity support, including Codex's unknown-model fallback, `medium` omits the override and keeps native default text; a supported model receives an explicit `medium`. Unsupported `low` or `high` and an unreadable catalog fail before model execution.
@@ -26,7 +26,7 @@ The adapter applies Core's typed controls and opt-ins, described in the [Runtime
 
 ## MCP servers
 
-A typed MCP declaration replaces operator MCP options. The adapter renders it with the native renderer and the original tool names for `enabled_tools`, including `[]`. Before creating or resuming a thread it reads native `config/read` with the exact cwd and rejects additional servers or any difference in the effective configuration. It disables native plugins and apps, selects file-only MCP credentials, and rejects existing credentials in the private native home without deleting them or native history. Reserved native labels are an adapter restriction, not a rule of the saved resource. The check is a snapshot, not a barrier against concurrent operator configuration changes, and discovery of a deny-all server can still contact it.
+The adapter renders a typed MCP declaration with the native renderer and the original tool names for `enabled_tools`, including `[]`. Before creating or resuming a thread it reads native `config/read` with the exact cwd and rejects additional servers or any difference in the effective configuration. It disables native plugins and apps, selects file-only MCP credentials, and rejects existing credentials in the private native home without deleting them or native history. Reserved native labels are an adapter restriction, not a rule of the saved resource. The check is a snapshot, not a barrier against concurrent operator configuration changes, and discovery of a deny-all server can still contact it.
 
 With `required: true`, which needs `mcp_http_required`, root thread creation and cold resume wait for required servers to initialize and send no native Turn until they do; a failed strict resume is never replaced with a new thread. Public work may already be accepted while initialization waits.
 

From 59dc3831d141db65a2f5e0e795b3f5e9acd03803 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 15:19:14 +0800
Subject: [PATCH 18/60] Delete prompt request fields Core never sends (#469)

Core never sets workspace_authoring and always sends strict_resume and
observe_tool_observations as true, so the Runtime carried code paths that
no Core request reaches. Delete them and keep only the behavior Core uses:

- Workspace authoring: the proto messages and socket variable, the
  WorkspaceAuthoring request field and capability, the daemon authoring
  bridge, its CLI wiring and companion PATH helper, the env agent option
  that only the bridge injected, and Core's capability copy and
  authoring_request rejection case.
- strict_resume: resume and recovery are always strict; mcode always runs
  its protected execution profile.
- observe_tool_observations: adapters always attach the neutral
  observation to tool_call frames.
- Codex and the shared StateDir no longer derive legacy state keys from
  the conversation or run; an empty agent state key is rejected.
- clirunner always owns the child's process group (a Job object on
  Windows), because every caller now requests it.

The Core-Runtime protocol doc, Harness onboarding, CONTRIBUTING and the
Claude SDK adapter README drop the deleted fields and features.
---
 CONTRIBUTING.md                               |   1 -
 .../claudesdk/cancellation_live_linux_test.go |   2 +-
 .../internal/agent/claudesdk/commands.go      |  10 +-
 .../agent/claudesdk/commands_session_test.go  | 102 ++++++-------
 .../internal/agent/claudesdk/commands_test.go |  88 ++++++------
 .../internal/agent/claudesdk/declaration.go   |   1 -
 .../agent/claudesdk/declaration_test.go       |   2 +-
 .../internal/agent/claudesdk/executor.go      |   3 -
 .../claudesdk/executor_confirmation_test.go   |   3 +
 .../claudesdk/executor_live_linux_test.go     |   2 +-
 .../internal/agent/claudesdk/executor_turn.go |   4 +-
 .../internal/agent/claudesdk/functions.go     |  10 +-
 .../agent/claudesdk/functions_test.go         |   2 +-
 .../agent/claudesdk/live_linux_test.go        |   3 +-
 apps/daemon/internal/agent/claudesdk/mcp.go   |  10 +-
 .../agent/claudesdk/mcp_environment_test.go   |   4 +-
 .../internal/agent/claudesdk/mcp_test.go      |   4 +-
 .../internal/agent/claudesdk/options.go       |   6 +-
 .../agent/claudesdk/preparation_test.go       |   4 +-
 .../internal/agent/claudesdk/readiness.go     |  18 ++-
 .../internal/agent/claudesdk/session.go       |   2 +-
 .../agent/claudesdk/workspace_launch_test.go  |   4 +-
 .../claudesdk/workspace_live_linux_test.go    |   2 +-
 .../internal/agent/clirunner/process.go       |  94 ++----------
 .../agent/clirunner/process_group_other.go    |   2 +-
 .../clirunner/process_group_unix_test.go      |   6 +-
 .../clirunner/process_group_windows_test.go   |   4 +-
 .../internal/agent/codex/declaration.go       |   1 -
 .../internal/agent/codex/declaration_test.go  |   2 +-
 .../internal/agent/codex/environment.go       |  26 ++--
 .../agent/codex/environment_retired_test.go   |  47 +++---
 apps/daemon/internal/agent/codex/executor.go  |   5 +-
 .../agent/codex/executor_native_test.go       |   2 +-
 .../internal/agent/codex/executor_test.go     |   2 +-
 .../internal/agent/codex/mcp_required_test.go |   1 -
 apps/daemon/internal/agent/codex/options.go   |  37 +----
 .../internal/agent/codex/options_test.go      |  12 +-
 .../internal/agent/codex/preparation.go       |  16 +--
 .../agent/codex/preparation_helpers_test.go   |   2 +-
 apps/daemon/internal/agent/codex/prepared.go  |   3 +-
 .../internal/agent/codex/recovery_test.go     |   8 +-
 apps/daemon/internal/agent/codex/resume.go    |  10 +-
 .../internal/agent/codex/resume_test.go       |  79 +++++------
 apps/daemon/internal/agent/codex/rpc.go       |   2 +-
 .../internal/agent/codex/rpc_close_test.go    |   2 +-
 apps/daemon/internal/agent/codex/session.go   |   9 +-
 .../agent/codex/session_command_output.go     |   3 -
 .../codex/session_command_output_test.go      |  62 ++++----
 .../agent/codex/session_notifications_test.go |   3 +-
 .../internal/agent/codex/session_plan.go      |   2 +-
 .../internal/agent/codex/session_tools.go     |   8 +-
 .../agent/codex/session_tools_test.go         |  70 ++++-----
 apps/daemon/internal/agent/codex/skills.go    |  20 +--
 .../internal/agent/codex/skills_test.go       |  12 --
 .../internal/agent/configuration_test.go      |   8 --
 apps/daemon/internal/agent/harness.go         |   3 +-
 .../internal/agent/installroot/probe.go       |   2 +-
 .../internal/agent/mcode/declaration.go       |   2 -
 .../internal/agent/mcode/declaration_test.go  |   2 +-
 .../agent/mcode/environment_mcp_test.go       |   1 -
 apps/daemon/internal/agent/mcode/events.go    |  25 ++--
 apps/daemon/internal/agent/mcode/execution.go |  19 +--
 .../internal/agent/mcode/execution_test.go    |  17 +--
 .../agent/mcode/executor_native_test.go       |   2 +-
 .../internal/agent/mcode/executor_test.go     |   2 +-
 .../internal/agent/mcode/executor_turn.go     |   6 +-
 .../agent/mcode/mcp_observations_test.go      |   2 +-
 .../agent/mcode/native_history_test.go        |   2 +-
 apps/daemon/internal/agent/mcode/options.go   |  60 +++-----
 .../internal/agent/mcode/options_test.go      |  10 +-
 .../internal/agent/mcode/preparation_test.go  |   2 +-
 apps/daemon/internal/agent/mcode/session.go   |  15 +-
 .../internal/agent/mcode/session_test.go      |  13 +-
 .../internal/agent/mcode/steering_test.go     |   2 +-
 .../internal/agent/mcode/tool_observations.go |  22 ++-
 .../agent/mcode/tool_observations_test.go     |   2 +-
 apps/daemon/internal/agent/mcode/workspace.go |   2 +-
 .../agent/mcode/workspace_readiness.go        |   2 +-
 apps/daemon/internal/agent/registry.go        |  12 --
 apps/daemon/internal/agent/runtime_paths.go   |  20 +--
 .../internal/agent/runtime_paths_test.go      |  17 +--
 apps/daemon/internal/authoring/bridge.go      | 134 ------------------
 apps/daemon/internal/authoring/bridge_test.go | 106 --------------
 apps/daemon/internal/cli/authoring.go         |  77 ----------
 apps/daemon/internal/cli/authoring_test.go    | 101 -------------
 .../cli/claude_sdk_live_linux_test.go         |   6 +-
 apps/daemon/internal/cli/companion_path.go    |  18 ---
 .../internal/cli/companion_path_test.go       |  37 -----
 apps/daemon/internal/cli/connect.go           |   7 -
 .../internal/cli/connect_cleanup_test.go      |   2 +-
 apps/daemon/internal/cli/connect_suspend.go   |  12 +-
 apps/daemon/internal/cli/preparation_test.go  |  32 +----
 apps/daemon/internal/dispatch/executor.go     |   2 +-
 .../dispatch/executor_handoff_test.go         |   2 +-
 .../daemon/internal/dispatch/executor_test.go |   2 +-
 .../dispatch/functions_native_test.go         |   2 +-
 .../internal/dispatch/local_directory_test.go |   4 +-
 apps/daemon/internal/dispatch/preparation.go  |   2 +-
 .../internal/dispatch/preparation_test.go     |   4 +-
 .../daemon/internal/localworkspace/binding.go |   3 +-
 .../internal/localworkspace/binding_test.go   |   8 +-
 .../runtime_initialization_process.go         |   2 +-
 apps/daemon/testdata/onboarding/main.go       |   2 +-
 contracts/agents-api/harness-onboarding.md    |   6 +-
 contracts/agents-api/zh/harness-onboarding.md |   8 +-
 docs/runtime-protocol.md                      |   7 +-
 docs/zh/runtime-protocol.md                   |   9 +-
 internal/agentdaemon/proto/authoring.go       |  31 ----
 internal/agentdaemon/proto/inbound.go         |   1 -
 internal/agentdaemon/proto/outbound.go        |  28 ++--
 internal/agentdaemon/proto/preparation.go     |   6 +-
 .../proto/prototest/capabilities.go           |   1 -
 internal/agentdaemon/proto/prototest/wire.go  |   2 +-
 .../proto/workspace_read_preparation.go       |   6 +-
 packages/claude-sdk-adapter/README.md         |   8 +-
 scripts/name-allowlist.json                   |  10 --
 services/core/internal/execution/delivery.go  |   2 +-
 .../execution/directory_preparation.go        |   2 +-
 .../core/internal/execution/recovery_test.go  |   2 +-
 services/core/internal/execution/request.go   |   5 +-
 services/core/internal/runtimedevice/state.go |   1 -
 .../mcp_bearer_live_linux_test.go             |   2 +-
 .../core/internal/runtimegateway/session.go   |   1 -
 .../tests/integration/execution_tools_test.go |   4 +-
 .../integration/harness_onboarding_test.go    |   2 +-
 125 files changed, 453 insertions(+), 1367 deletions(-)
 delete mode 100644 apps/daemon/internal/authoring/bridge.go
 delete mode 100644 apps/daemon/internal/authoring/bridge_test.go
 delete mode 100644 apps/daemon/internal/cli/authoring.go
 delete mode 100644 apps/daemon/internal/cli/authoring_test.go
 delete mode 100644 apps/daemon/internal/cli/companion_path.go
 delete mode 100644 apps/daemon/internal/cli/companion_path_test.go
 delete mode 100644 internal/agentdaemon/proto/authoring.go

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 12405dd99..04cbec682 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,7 +52,6 @@ Core must build, deploy and run independently of product services, frontends and
 - Parsar owns users, workspaces, business authorization, Agent/Team definitions, capabilities, product conversations, IM/sharing, approval decisions and billing. It uses Core for execution.
 - A product conversation may reference several execution Sessions. Core owns native engine session identities; an execution Session has its own lifetime, separate from a daemon connection, process or sandbox.
 - Build application orchestration on the [public Session and event contract](docs/api/public-agent-api.md). Product cursor replay must be an explicit product extension. Business Team orchestration belongs to the application; Core's pinned `multi_agent` and Subagent resources remain part of the public contract.
-- Daemon Skill/SP authoring is a product operation: forward it through a scoped product callback that checks the original requester and workspace. A Runtime credential alone must not authorize business writes.
 
 ### Optional application example
 
diff --git a/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go b/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
index a16a9d7ce..bc5cec8bd 100644
--- a/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
@@ -65,7 +65,7 @@ func TestLiveClaudeSDKCancelResume(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
 		defer cancel()
 		out := make(chan proto.Envelope, 64)
-		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, StrictResume: true, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Follow the user's requested format. Preserve the exact verification value in conversation history. Use no tools."}}
+		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Follow the user's requested format. Preserve the exact verification value in conversation history. Use no tools."}}
 		running, err := NewFactory(config)(ctx, request, out)
 		if err != nil {
 			t.Fatal(err)
diff --git a/apps/daemon/internal/agent/claudesdk/commands.go b/apps/daemon/internal/agent/claudesdk/commands.go
index 46dfa31b1..9bc4c266a 100644
--- a/apps/daemon/internal/agent/claudesdk/commands.go
+++ b/apps/daemon/internal/agent/claudesdk/commands.go
@@ -33,9 +33,7 @@ func (c *commandState) receive(event bridgeEvent, start startRequest, sessionID
 		return fmt.Errorf("claudesdk: inconsistent command observation")
 	}
 	c.calls[event.ID] = *n
-	if start.observeFunctions {
-		emit(proto.TypeToolCall, proto.ToolCallPayload{ID: event.ID, Name: "Bash", Stage: event.Stage, Observation: n})
-	}
+	emit(proto.TypeToolCall, proto.ToolCallPayload{ID: event.ID, Name: "Bash", Stage: event.Stage, Observation: n})
 	return nil
 }
 
@@ -48,15 +46,13 @@ func (c *commandState) complete() bool {
 	return true
 }
 
-func (c *commandState) close(start startRequest, emit func(string, any)) {
+func (c *commandState) close(emit func(string, any)) {
 	for id, call := range c.calls {
 		if call.Status != "in_progress" {
 			continue
 		}
 		call.Status = "incomplete"
 		c.calls[id] = call
-		if start.observeFunctions {
-			emit(proto.TypeToolCall, proto.ToolCallPayload{ID: id, Name: "Bash", Stage: "after", Observation: &call})
-		}
+		emit(proto.TypeToolCall, proto.ToolCallPayload{ID: id, Name: "Bash", Stage: "after", Observation: &call})
 	}
 }
diff --git a/apps/daemon/internal/agent/claudesdk/commands_session_test.go b/apps/daemon/internal/agent/claudesdk/commands_session_test.go
index de9454556..bc62c8540 100644
--- a/apps/daemon/internal/agent/claudesdk/commands_session_test.go
+++ b/apps/daemon/internal/agent/claudesdk/commands_session_test.go
@@ -16,74 +16,56 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func TestWorkspaceCommandsRequirePackagedFeatureOnlyWhenRequested(t *testing.T) {
-	for _, observed := range []bool{false, true} {
-		config := preparationFixture(t, "old-command-runtime")
-		req := preparationRequest()
-		req.ObserveToolObservations = observed
-		resource, err := NewPreparationFactory(config)(t.Context(), req)
-		if observed {
-			if err == nil || !strings.Contains(err.Error(), "workspace command observations") {
-				t.Fatal("old bridge accepted requested command observations", err)
-			}
-			if _, err := os.Stat(filepath.Join(config.StateDir, "launched")); !os.IsNotExist(err) {
-				t.Fatal("old bridge started execution before rejection")
-			}
-		} else {
-			if err != nil {
-				t.Fatal("old bridge changed opt-out behavior", err)
-			}
-			if err := resource.Close(); err != nil {
-				t.Fatal(err)
-			}
-		}
+func TestWorkspaceCommandsRequirePackagedFeature(t *testing.T) {
+	config := preparationFixture(t, "old-command-runtime")
+	if _, err := NewPreparationFactory(config)(t.Context(), preparationRequest()); err == nil || !strings.Contains(err.Error(), "workspace preparation is unavailable") {
+		t.Fatal("old bridge accepted command observations", err)
+	}
+	if _, err := os.Stat(filepath.Join(config.StateDir, "launched")); !os.IsNotExist(err) {
+		t.Fatal("old bridge started execution before rejection")
 	}
 }
 
 func TestWorkspaceCommandFramesKeepStartIdentityAndObservedOutput(t *testing.T) {
-	for _, observed := range []bool{false, true} {
-		config := preparationFixture(t, "commands-success")
-		req := preparationRequest()
-		req.ObserveToolObservations = observed
-		resource, err := NewPreparationFactory(config)(t.Context(), req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer resource.Close()
-		if _, err := os.Stat(filepath.Join(config.StateDir, "start.json")); !os.IsNotExist(err) {
-			t.Fatal("preparation submitted a command")
-		}
-		out := make(chan proto.Envelope, 16)
-		s, err := resource.Start(t.Context(), "actual-command-run", proto.TextInput("hello"), out)
-		if err != nil {
-			t.Fatal(err)
+	config := preparationFixture(t, "commands-success")
+	resource, err := NewPreparationFactory(config)(t.Context(), preparationRequest())
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer resource.Close()
+	if _, err := os.Stat(filepath.Join(config.StateDir, "start.json")); !os.IsNotExist(err) {
+		t.Fatal("preparation submitted a command")
+	}
+	out := make(chan proto.Envelope, 16)
+	s, err := resource.Start(t.Context(), "actual-command-run", proto.TextInput("hello"), out)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer s.Cancel(context.Background())
+	var frames []proto.ToolCallPayload
+	done := 0
+	for event := range out {
+		if event.ID != "actual-command-run" || event.Type == proto.TypeError || event.Type == proto.TypeCommandOutput {
+			t.Fatal("execution identity or final-only command behavior changed", event.Type)
 		}
-		defer s.Cancel(context.Background())
-		var frames []proto.ToolCallPayload
-		done := 0
-		for event := range out {
-			if event.ID != "actual-command-run" || event.Type == proto.TypeError || event.Type == proto.TypeCommandOutput {
-				t.Fatal("execution identity or final-only command behavior changed", event.Type)
-			}
-			if event.Type == proto.TypeToolCall {
-				var payload proto.ToolCallPayload
-				if err := event.DecodePayload(&payload); err != nil {
-					t.Fatal(err)
-				}
-				frames = append(frames, payload)
-			}
-			if event.Type == proto.TypeDone {
-				done++
+		if event.Type == proto.TypeToolCall {
+			var payload proto.ToolCallPayload
+			if err := event.DecodePayload(&payload); err != nil {
+				t.Fatal(err)
 			}
+			frames = append(frames, payload)
 		}
-		if done != 1 || observed && len(frames) != 2 || !observed && len(frames) != 0 {
-			t.Fatal("completion or observation opt-in changed", done, frames)
-		}
-		if observed && (frames[0].ID != "observed" || frames[1].ID != "observed" || frames[1].Observation.Status != "failed" ||
-			string(frames[1].Observation.Output) != `"Exit code 7\nretained"`) {
-			t.Fatal("native failure output was not retained", frames)
+		if event.Type == proto.TypeDone {
+			done++
 		}
 	}
+	if done != 1 || len(frames) != 2 {
+		t.Fatal("completion or observation changed", done, frames)
+	}
+	if frames[0].ID != "observed" || frames[1].ID != "observed" || frames[1].Observation.Status != "failed" ||
+		string(frames[1].Observation.Output) != `"Exit code 7\nretained"` {
+		t.Fatal("native failure output was not retained", frames)
+	}
 }
 
 func TestWorkspaceCommandCancellationAndBridgeFailuresCloseOnlyPendingCalls(t *testing.T) {
@@ -93,7 +75,7 @@ func TestWorkspaceCommandCancellationAndBridgeFailuresCloseOnlyPendingCalls(t *t
 			defer cancel()
 			config := preparationFixture(t, mode)
 			req := workspaceRequest()
-			req.AgentSessionID, req.ObserveToolObservations = "native-session", true
+			req.AgentSessionID = "native-session"
 			out := make(chan proto.Envelope, 32)
 			s, err := NewFactory(config)(ctx, req, out)
 			if err != nil {
diff --git a/apps/daemon/internal/agent/claudesdk/commands_test.go b/apps/daemon/internal/agent/claudesdk/commands_test.go
index 33b923c7f..f98129c51 100644
--- a/apps/daemon/internal/agent/claudesdk/commands_test.go
+++ b/apps/daemon/internal/agent/claudesdk/commands_test.go
@@ -13,53 +13,45 @@ func commandEvent(id, stage, status, command string) bridgeEvent {
 		Observation: &proto.ToolObservation{Kind: "command", Status: status, Command: command}}
 }
 
-func TestCommandObservationLifecycleAndOptIn(t *testing.T) {
-	for _, observed := range []bool{false, true} {
-		state := commandState{calls: map[string]proto.ToolObservation{}}
-		start := startRequest{Workspace: &workspaceProfile{}, observeFunctions: observed}
-		var events []proto.ToolCallPayload
-		emit := func(kind string, payload any) {
-			if kind != proto.TypeToolCall {
-				t.Fatal(kind)
-			}
-			events = append(events, payload.(proto.ToolCallPayload))
-		}
-		const command = "  printf 'failure\\n'; exit 7  "
-		before := commandEvent("native-call", "before", "in_progress", command)
-		if err := state.receive(before, start, "native-session", emit); err != nil || state.complete() {
-			t.Fatal("call was not pending", err)
-		}
-		if err := state.receive(before, start, "native-session", emit); err == nil {
-			t.Fatal("duplicate bridge call accepted")
-		}
-		after := commandEvent("native-call", "after", "failed", command)
-		after.Observation.Output = json.RawMessage(`"Exit code 7\nfailure"`)
-		if err := state.receive(after, start, "native-session", emit); err != nil || !state.complete() {
-			t.Fatal("native result did not complete the call", err)
-		}
-		if err := state.receive(after, start, "native-session", emit); err == nil {
-			t.Fatal("duplicate bridge result accepted")
-		}
-		if err := state.receive(commandEvent("pending", "before", "in_progress", "sleep 30"), start, "native-session", emit); err != nil {
-			t.Fatal(err)
-		}
-		state.close(start, emit)
-		state.close(start, emit)
-		if !state.complete() || state.calls["pending"].Status != "incomplete" || state.calls["native-call"].Status != "failed" {
-			t.Fatal("closure changed an observed result or lost an unfinished call")
-		}
-		if !observed {
-			if len(events) != 0 {
-				t.Fatal("opt-out emitted observations")
-			}
-			continue
-		}
-		if len(events) != 4 || events[0].ID != "native-call" || events[0].Name != "Bash" || events[0].Observation.Command != command ||
-			string(events[1].Observation.Output) != `"Exit code 7\nfailure"` || events[1].Observation.ExitCode != nil ||
-			events[1].Observation.Cwd != nil || events[1].Observation.DurationMS != nil || events[3].ID != "pending" ||
-			events[3].Observation.Status != "incomplete" || len(events[3].Observation.Output) != 0 {
-			t.Fatal("observation identity, output or unknown metadata changed", events)
+func TestCommandObservationLifecycle(t *testing.T) {
+	state := commandState{calls: map[string]proto.ToolObservation{}}
+	start := startRequest{Workspace: &workspaceProfile{}}
+	var events []proto.ToolCallPayload
+	emit := func(kind string, payload any) {
+		if kind != proto.TypeToolCall {
+			t.Fatal(kind)
 		}
+		events = append(events, payload.(proto.ToolCallPayload))
+	}
+	const command = "  printf 'failure\\n'; exit 7  "
+	before := commandEvent("native-call", "before", "in_progress", command)
+	if err := state.receive(before, start, "native-session", emit); err != nil || state.complete() {
+		t.Fatal("call was not pending", err)
+	}
+	if err := state.receive(before, start, "native-session", emit); err == nil {
+		t.Fatal("duplicate bridge call accepted")
+	}
+	after := commandEvent("native-call", "after", "failed", command)
+	after.Observation.Output = json.RawMessage(`"Exit code 7\nfailure"`)
+	if err := state.receive(after, start, "native-session", emit); err != nil || !state.complete() {
+		t.Fatal("native result did not complete the call", err)
+	}
+	if err := state.receive(after, start, "native-session", emit); err == nil {
+		t.Fatal("duplicate bridge result accepted")
+	}
+	if err := state.receive(commandEvent("pending", "before", "in_progress", "sleep 30"), start, "native-session", emit); err != nil {
+		t.Fatal(err)
+	}
+	state.close(emit)
+	state.close(emit)
+	if !state.complete() || state.calls["pending"].Status != "incomplete" || state.calls["native-call"].Status != "failed" {
+		t.Fatal("closure changed an observed result or lost an unfinished call")
+	}
+	if len(events) != 4 || events[0].ID != "native-call" || events[0].Name != "Bash" || events[0].Observation.Command != command ||
+		string(events[1].Observation.Output) != `"Exit code 7\nfailure"` || events[1].Observation.ExitCode != nil ||
+		events[1].Observation.Cwd != nil || events[1].Observation.DurationMS != nil || events[3].ID != "pending" ||
+		events[3].Observation.Status != "incomplete" || len(events[3].Observation.Output) != 0 {
+		t.Fatal("observation identity, output or unknown metadata changed", events)
 	}
 }
 
@@ -67,7 +59,7 @@ func TestCommandObservationsRejectUnqualifiedOrInconsistentEvents(t *testing.T)
 	for _, mode := range []string{"profile", "uninitialized", "session", "id", "nil", "kind", "empty-command", "name", "cwd", "exit", "duration", "arguments", "error", "output-object", "before-output", "before-status", "after-before", "changed-command", "after-status", "stage"} {
 		t.Run(mode, func(t *testing.T) {
 			state := commandState{calls: map[string]proto.ToolObservation{}}
-			start := startRequest{Workspace: &workspaceProfile{}, observeFunctions: true}
+			start := startRequest{Workspace: &workspaceProfile{}}
 			sessionID := "native-session"
 			event := commandEvent("call", "before", "in_progress", "pwd")
 			if strings.HasPrefix(mode, "after-") || mode == "changed-command" {
@@ -130,7 +122,7 @@ func TestCommandObservationUnknownAndEmptyOutputRemainDistinct(t *testing.T) {
 	for _, output := range []json.RawMessage{nil, json.RawMessage(`null`), json.RawMessage(`""`)} {
 		state := commandState{calls: map[string]proto.ToolObservation{}}
 		start := startRequest{Workspace: &workspaceProfile{}}
-		emit := func(string, any) { t.Fatal("opt-out emitted an observation") }
+		emit := func(string, any) {}
 		if err := state.receive(commandEvent("call", "before", "in_progress", "pwd"), start, "native-session", emit); err != nil {
 			t.Fatal(err)
 		}
diff --git a/apps/daemon/internal/agent/claudesdk/declaration.go b/apps/daemon/internal/agent/claudesdk/declaration.go
index e99650049..21a643f88 100644
--- a/apps/daemon/internal/agent/claudesdk/declaration.go
+++ b/apps/daemon/internal/agent/claudesdk/declaration.go
@@ -26,7 +26,6 @@ var Declaration = agent.Declaration{Info: proto.SupportedAgentKind{Kind: "claude
 	Usage:                          proto.CapabilitySupported,
 	Resume:                         proto.CapabilitySupported,
 	NativeSessionRecovery:          proto.CapabilityUnsupported,
-	WorkspaceAuthoring:             proto.CapabilityUnsupported,
 	Steering:                       proto.CapabilitySupported,
 	MessageItems:                   proto.CapabilitySupported,
 	ToolObservations:               proto.CapabilitySupported,
diff --git a/apps/daemon/internal/agent/claudesdk/declaration_test.go b/apps/daemon/internal/agent/claudesdk/declaration_test.go
index d62d77781..149ef8f65 100644
--- a/apps/daemon/internal/agent/claudesdk/declaration_test.go
+++ b/apps/daemon/internal/agent/claudesdk/declaration_test.go
@@ -122,7 +122,7 @@ func TestRuntimeDiscoveryConfigurationAndRegistration(t *testing.T) {
 			registry := agent.NewRegistry()
 			registry.Register(Declaration, *runtime)
 			info := registry.SupportedAgentKinds()[0]
-			if info.Capabilities.WorkspaceAuthoring.IsSupported() || info.Capabilities.Preparation.IsSupported() != ready {
+			if info.Capabilities.Preparation.IsSupported() != ready {
 				t.Fatal(info)
 			}
 			if !ready {
diff --git a/apps/daemon/internal/agent/claudesdk/executor.go b/apps/daemon/internal/agent/claudesdk/executor.go
index 34240d0c5..55eed30a5 100644
--- a/apps/daemon/internal/agent/claudesdk/executor.go
+++ b/apps/daemon/internal/agent/claudesdk/executor.go
@@ -91,9 +91,6 @@ func validateExecutorFeatures(info RuntimeInfo, start startRequest) error {
 	if start.Subagents != nil && !info.SupportsSubagents() {
 		return errors.New("claudesdk: subagent resources are unavailable")
 	}
-	if start.Workspace != nil && start.observeFunctions && !info.supportsWorkspaceCommands() {
-		return errors.New("claudesdk: packaged runtime does not support workspace command observations")
-	}
 	if start.Workspace != nil && len(start.Functions) > 0 && !info.SupportsWorkspaceFunctions() {
 		return errors.New("claudesdk: workspace functions are unavailable")
 	}
diff --git a/apps/daemon/internal/agent/claudesdk/executor_confirmation_test.go b/apps/daemon/internal/agent/claudesdk/executor_confirmation_test.go
index f4cb246bd..bba0b7099 100644
--- a/apps/daemon/internal/agent/claudesdk/executor_confirmation_test.go
+++ b/apps/daemon/internal/agent/claudesdk/executor_confirmation_test.go
@@ -27,6 +27,9 @@ func TestExecutorNativeConfirmationSurvivesCleanup(t *testing.T) {
 				t.Fatal("initial output missing")
 			}
 			if mode == "pending_function" || mode == "pending_function_unconfirmed" {
+				if event := <-out; event.Type != proto.TypeToolCall {
+					t.Fatal("function observation missing")
+				}
 				if event := <-out; event.Type != proto.TypeFunctionCall {
 					t.Fatal("function obligation missing")
 				}
diff --git a/apps/daemon/internal/agent/claudesdk/executor_live_linux_test.go b/apps/daemon/internal/agent/claudesdk/executor_live_linux_test.go
index 25fb8fcda..669f2dce1 100644
--- a/apps/daemon/internal/agent/claudesdk/executor_live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/executor_live_linux_test.go
@@ -80,7 +80,7 @@ func TestLiveClaudeExecutorReuseAndCancel(t *testing.T) {
 		_ = os.WriteFile(filepath.Join(proof, "executor-evidence.json"), raw, 0600)
 	}
 	defer persist()
-	request := proto.PromptRequestPayload{StrictResume: true, DisableExecutionEnvironment: true, DisableSubagents: true, ObserveMessages: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": model, "system_prompt": "Follow requested formats briefly. Remember the exact verification marker across the conversation. Use no tools."}}
+	request := proto.PromptRequestPayload{DisableExecutionEnvironment: true, DisableSubagents: true, ObserveMessages: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": model, "system_prompt": "Follow requested formats briefly. Remember the exact verification marker across the conversation. Use no tools."}}
 	factory := NewExecutorFactory(config)
 	prepared := time.Now()
 	owner, err := factory(ctx, request)
diff --git a/apps/daemon/internal/agent/claudesdk/executor_turn.go b/apps/daemon/internal/agent/claudesdk/executor_turn.go
index d1b9ce48c..97c6638cf 100644
--- a/apps/daemon/internal/agent/claudesdk/executor_turn.go
+++ b/apps/daemon/internal/agent/claudesdk/executor_turn.go
@@ -197,8 +197,8 @@ func (s *session) runTurn(start startRequest, out chan<- proto.Envelope) {
 	if !s.functionsComplete(cancelled && settlementConfirmed) || !s.steeringComplete() || !mcp.complete() || !commands.complete() {
 		settlementConfirmed, reusable, reason = false, false, "unsettled_native_operations"
 	}
-	mcp.close(start, emit)
-	commands.close(start, emit)
+	mcp.close(emit)
+	commands.close(emit)
 	s.stopSteering()
 	metadata := map[string]any{proto.DoneMetaAgentSessionType: "claude_session"}
 	if id := s.inputSessionID(); id != "" {
diff --git a/apps/daemon/internal/agent/claudesdk/functions.go b/apps/daemon/internal/agent/claudesdk/functions.go
index 80048c70b..752d1347f 100644
--- a/apps/daemon/internal/agent/claudesdk/functions.go
+++ b/apps/daemon/internal/agent/claudesdk/functions.go
@@ -84,13 +84,11 @@ func (s *session) receiveFunction(event bridgeEvent, start startRequest, emit fu
 	if err != nil {
 		return err
 	}
-	if start.observeFunctions {
-		id, stage := event.CallID, "after"
-		if call != nil {
-			id, stage = call.CallID, "before"
-		}
-		emit(proto.TypeToolCall, proto.ToolCallPayload{ID: id, Name: observation.Name, Stage: stage, Observation: observation})
+	id, stage := event.CallID, "after"
+	if call != nil {
+		id, stage = call.CallID, "before"
 	}
+	emit(proto.TypeToolCall, proto.ToolCallPayload{ID: id, Name: observation.Name, Stage: stage, Observation: observation})
 	if call != nil {
 		emit(proto.TypeFunctionCall, call)
 	} else {
diff --git a/apps/daemon/internal/agent/claudesdk/functions_test.go b/apps/daemon/internal/agent/claudesdk/functions_test.go
index 09f8b430a..a448790e3 100644
--- a/apps/daemon/internal/agent/claudesdk/functions_test.go
+++ b/apps/daemon/internal/agent/claudesdk/functions_test.go
@@ -22,7 +22,7 @@ func TestFunctionFactoryNativeReceipts(t *testing.T) {
 			root := t.TempDir()
 			t.Setenv("OAC_RUNTIME_HOME", root)
 			config := Config{Node: os.Args[0], Entrypoint: filepath.Join(root, "worker"), StateDir: filepath.Join(root, "state"), Env: []string{"GO_CLAUDE_SDK_HELPER=1", "SDK_HELPER_MODE=" + mode, "GORACE=atexit_sleep_ms=0"}}
-			request := proto.PromptRequestPayload{RunID: "run", Input: proto.TextInput("hello"), AgentSessionID: "native-session", ObserveToolObservations: true, AgentOptions: map[string]any{"model": "fake-model", "system_prompt": "instructions"}, FunctionTools: []proto.FunctionTool{{Name: "lookup", Description: "Lookup.", Parameters: json.RawMessage(`{"type":"object","properties":{"ids":{"type":"array","items":{"type":"string"}}}}`)}}}
+			request := proto.PromptRequestPayload{RunID: "run", Input: proto.TextInput("hello"), AgentSessionID: "native-session", AgentOptions: map[string]any{"model": "fake-model", "system_prompt": "instructions"}, FunctionTools: []proto.FunctionTool{{Name: "lookup", Description: "Lookup.", Parameters: json.RawMessage(`{"type":"object","properties":{"ids":{"type":"array","items":{"type":"string"}}}}`)}}}
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 16)
diff --git a/apps/daemon/internal/agent/claudesdk/live_linux_test.go b/apps/daemon/internal/agent/claudesdk/live_linux_test.go
index 335ff6ecd..ba2f7ca9d 100644
--- a/apps/daemon/internal/agent/claudesdk/live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/live_linux_test.go
@@ -137,9 +137,8 @@ func TestLiveClaudeSDKTextResume(t *testing.T) {
 		requestStart := len(requests)
 		mu.Unlock()
 		out := make(chan proto.Envelope, 64)
-		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, StrictResume: true, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Answer briefly and preserve the exact verification value in the conversation. Use no tools."}}
+		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Answer briefly and preserve the exact verification value in the conversation. Use no tools."}}
 		if success != nil {
-			request.ObserveToolObservations = true
 			request.AgentOptions["system_prompt"] = "Call lookup exactly once as requested, then report both result parts and any prior verification value. Never retry a failed tool."
 			request.FunctionTools = []proto.FunctionTool{{Name: "lookup", Description: "Return a synthetic verification value.", Parameters: json.RawMessage(`{"type":"object","properties":{"id":{"type":"string"}},"required":["id"],"additionalProperties":false}`)}}
 		}
diff --git a/apps/daemon/internal/agent/claudesdk/mcp.go b/apps/daemon/internal/agent/claudesdk/mcp.go
index a74da05d7..b193136d7 100644
--- a/apps/daemon/internal/agent/claudesdk/mcp.go
+++ b/apps/daemon/internal/agent/claudesdk/mcp.go
@@ -109,9 +109,7 @@ func (m *mcpState) receive(event bridgeEvent, start startRequest, emit func(stri
 		return fmt.Errorf("claudesdk: inconsistent MCP observation")
 	}
 	m.calls[event.ID] = *n
-	if start.observeFunctions {
-		emit(proto.TypeToolCall, proto.ToolCallPayload{ID: event.ID, Name: n.Name, Stage: event.Stage, Observation: n})
-	}
+	emit(proto.TypeToolCall, proto.ToolCallPayload{ID: event.ID, Name: n.Name, Stage: event.Stage, Observation: n})
 	return nil
 }
 
@@ -124,15 +122,13 @@ func (m *mcpState) complete() bool {
 	return true
 }
 
-func (m *mcpState) close(start startRequest, emit func(string, any)) {
+func (m *mcpState) close(emit func(string, any)) {
 	for id, call := range m.calls {
 		if call.Status != "in_progress" {
 			continue
 		}
 		call.Status = "incomplete"
 		m.calls[id] = call
-		if start.observeFunctions {
-			emit(proto.TypeToolCall, proto.ToolCallPayload{ID: id, Name: call.Name, Stage: "after", Observation: &call})
-		}
+		emit(proto.TypeToolCall, proto.ToolCallPayload{ID: id, Name: call.Name, Stage: "after", Observation: &call})
 	}
 }
diff --git a/apps/daemon/internal/agent/claudesdk/mcp_environment_test.go b/apps/daemon/internal/agent/claudesdk/mcp_environment_test.go
index 328674950..ab84b3b9e 100644
--- a/apps/daemon/internal/agent/claudesdk/mcp_environment_test.go
+++ b/apps/daemon/internal/agent/claudesdk/mcp_environment_test.go
@@ -73,7 +73,7 @@ func TestEnvironmentMCPRejectsUnqualifiedCombinations(t *testing.T) {
 }
 
 func TestEnvironmentMCPObservationsUseInstalledDeclarations(t *testing.T) {
-	start := startRequest{Workspace: &workspaceProfile{MCP: []environmentMCPServer{{mcpHTTPServer: mcpHTTPServer{ServerLabel: "installed"}}}}, observeFunctions: true}
+	start := startRequest{Workspace: &workspaceProfile{MCP: []environmentMCPServer{{mcpHTTPServer: mcpHTTPServer{ServerLabel: "installed"}}}}}
 	state := mcpState{calls: map[string]proto.ToolObservation{}}
 	observation := proto.ToolObservation{Kind: "mcp", Name: "echo", Server: "installed", Status: "in_progress", Arguments: json.RawMessage(`{}`), Output: json.RawMessage(`null`), Error: json.RawMessage(`null`)}
 	var emitted []proto.ToolCallPayload
@@ -81,7 +81,7 @@ func TestEnvironmentMCPObservationsUseInstalledDeclarations(t *testing.T) {
 	if err := state.receive(bridgeEvent{ID: "native-call", Stage: "before", Observation: &observation}, start, emit); err != nil {
 		t.Fatal(err)
 	}
-	state.close(start, emit)
+	state.close(emit)
 	if len(emitted) != 2 || emitted[1].ID != "native-call" || emitted[1].Observation.Status != "incomplete" {
 		t.Fatal("interrupted environment call lost identity")
 	}
diff --git a/apps/daemon/internal/agent/claudesdk/mcp_test.go b/apps/daemon/internal/agent/claudesdk/mcp_test.go
index 7d1220a01..a8ad18877 100644
--- a/apps/daemon/internal/agent/claudesdk/mcp_test.go
+++ b/apps/daemon/internal/agent/claudesdk/mcp_test.go
@@ -72,7 +72,7 @@ func TestHTTPMCPDeclaration(t *testing.T) {
 }
 
 func TestMCPObservationLifecycle(t *testing.T) {
-	start := startRequest{MCPHTTPServers: &[]mcpHTTPServer{{ServerLabel: "fixture"}}, observeFunctions: true}
+	start := startRequest{MCPHTTPServers: &[]mcpHTTPServer{{ServerLabel: "fixture"}}}
 	state := mcpState{calls: map[string]proto.ToolObservation{}}
 	var observations []proto.ToolCallPayload
 	emit := func(kind string, payload any) {
@@ -107,7 +107,7 @@ func TestMCPObservationLifecycle(t *testing.T) {
 	if err := state.receive(before, start, emit); err != nil {
 		t.Fatal(err)
 	}
-	state.close(start, emit)
+	state.close(emit)
 	if !state.complete() || observations[len(observations)-1].Observation.Status != "incomplete" {
 		t.Fatal("cancellation lost pending call")
 	}
diff --git a/apps/daemon/internal/agent/claudesdk/options.go b/apps/daemon/internal/agent/claudesdk/options.go
index 47c1ac3e1..46ffde096 100644
--- a/apps/daemon/internal/agent/claudesdk/options.go
+++ b/apps/daemon/internal/agent/claudesdk/options.go
@@ -39,7 +39,6 @@ type startRequest struct {
 	MCPHTTPServers     *[]mcpHTTPServer     `json:"mcp_http_servers,omitempty"`
 	Workspace          *workspaceProfile    `json:"workspace,omitempty"`
 	RequireHistory     bool                 `json:"require_history,omitempty"`
-	observeFunctions   bool
 }
 
 func prepare(config Config, req proto.PromptRequestPayload) (startRequest, []string, error) {
@@ -55,7 +54,7 @@ func prepare(config Config, req proto.PromptRequestPayload) (startRequest, []str
 }
 
 func prepareConfiguration(config Config, req proto.PromptRequestPayload) (startRequest, []string, error) {
-	start := startRequest{Type: "start", Resume: req.AgentSessionID, RequireHistory: req.RequireExistingNativeSession, ObserveMessages: req.ObserveMessages, Functions: req.FunctionTools, observeFunctions: req.ObserveToolObservations}
+	start := startRequest{Type: "start", Resume: req.AgentSessionID, RequireHistory: req.RequireExistingNativeSession, ObserveMessages: req.ObserveMessages, Functions: req.FunctionTools}
 	fail := func(reason string) (startRequest, []string, error) {
 		return startRequest{}, nil, fmt.Errorf("claudesdk: %s", reason)
 	}
@@ -64,9 +63,6 @@ func prepareConfiguration(config Config, req proto.PromptRequestPayload) (startR
 		return startRequest{}, nil, err
 	}
 	start.NativeModelOptions = compileNativeModelOptions(modelConfiguration.HarnessConfig)
-	if req.WorkspaceAuthoring {
-		return fail("requested capability is not available in the private SDK adapter")
-	}
 	if err := req.ValidateToolSearch(true); err != nil {
 		return startRequest{}, nil, err
 	}
diff --git a/apps/daemon/internal/agent/claudesdk/preparation_test.go b/apps/daemon/internal/agent/claudesdk/preparation_test.go
index 716797389..f722d4481 100644
--- a/apps/daemon/internal/agent/claudesdk/preparation_test.go
+++ b/apps/daemon/internal/agent/claudesdk/preparation_test.go
@@ -107,7 +107,7 @@ func TestPreparationWaitsForReceiptAndRetainsConfiguration(t *testing.T) {
 }
 
 func TestPreparationRejectsInputAndUnavailableProfilesBeforeLaunch(t *testing.T) {
-	for _, name := range []string{"run", "prompt", "conversation", "attachments", "authoring", "subagents", "workspace-missing", "none", "functions", "mcp", "controls", "old-runtime"} {
+	for _, name := range []string{"run", "prompt", "conversation", "attachments", "subagents", "workspace-missing", "none", "functions", "mcp", "controls", "old-runtime"} {
 		t.Run(name, func(t *testing.T) {
 			config := preparationFixture(t, name)
 			req := preparationRequest()
@@ -120,8 +120,6 @@ func TestPreparationRejectsInputAndUnavailableProfilesBeforeLaunch(t *testing.T)
 				req.ConversationID = "product"
 			case "attachments":
 				req.Input = proto.MessageInput{{Content: []proto.InputContent{{Type: "input_image"}}}}
-			case "authoring":
-				req.WorkspaceAuthoring = true
 			case "subagents":
 				req.ObserveSubagentIdentities = true
 			case "workspace-missing":
diff --git a/apps/daemon/internal/agent/claudesdk/readiness.go b/apps/daemon/internal/agent/claudesdk/readiness.go
index 5c9668990..a9f7f8fbf 100644
--- a/apps/daemon/internal/agent/claudesdk/readiness.go
+++ b/apps/daemon/internal/agent/claudesdk/readiness.go
@@ -73,16 +73,14 @@ func (info RuntimeInfo) supportsWorkspace() bool {
 	return slices.Contains(info.Features, "workspace_tools")
 }
 
+// Workspace execution always emits neutral command observations, so a bridge
+// without them cannot run a prepared workspace.
 func (info RuntimeInfo) supportsWorkspacePreparation() bool {
-	return info.supportsWorkspace() && slices.Contains(info.Features, "workspace_prepare")
-}
-
-func (info RuntimeInfo) supportsWorkspaceCommands() bool {
-	return info.supportsWorkspacePreparation() && slices.Contains(info.Features, "workspace_command_observations")
+	return info.supportsWorkspace() && slices.Contains(info.Features, "workspace_prepare") && slices.Contains(info.Features, "workspace_command_observations")
 }
 
 func (info RuntimeInfo) SupportsLocalRuntime() bool {
-	return info.supportsWorkspaceCommands() && slices.Contains(info.Features, "local_runtime_v2")
+	return info.supportsWorkspacePreparation() && slices.Contains(info.Features, "local_runtime_v2")
 }
 
 func (info RuntimeInfo) SupportsWorkspaceFunctions() bool {
@@ -114,10 +112,10 @@ func CheckRuntime(ctx context.Context, config Config) (RuntimeInfo, error) {
 	}
 	process, err := clirunner.Start(clirunner.StartOptions{
 		Parent: ctx, Binary: binary,
-		Args:            []string{filepath.Join(filepath.Dir(config.Entrypoint), "runtime_check.js"), config.Entrypoint},
-		Dir:             filepath.Dir(config.Entrypoint),
-		Env:             env,
-		OwnProcessGroup: true, KillTimeout: 250 * time.Millisecond,
+		Args:        []string{filepath.Join(filepath.Dir(config.Entrypoint), "runtime_check.js"), config.Entrypoint},
+		Dir:         filepath.Dir(config.Entrypoint),
+		Env:         env,
+		KillTimeout: 250 * time.Millisecond,
 	})
 	if err != nil {
 		return RuntimeInfo{}, fmt.Errorf("claudesdk: cannot start runtime check: %w", err)
diff --git a/apps/daemon/internal/agent/claudesdk/session.go b/apps/daemon/internal/agent/claudesdk/session.go
index 311952092..7edaabb07 100644
--- a/apps/daemon/internal/agent/claudesdk/session.go
+++ b/apps/daemon/internal/agent/claudesdk/session.go
@@ -86,7 +86,7 @@ func launch(ctx context.Context, config Config, start startRequest, env []string
 	if binary == "" {
 		binary = "node"
 	}
-	process, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: binary, Args: []string{config.Entrypoint}, Dir: start.Cwd, Env: env, NeedStdin: true, OwnProcessGroup: true})
+	process, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: binary, Args: []string{config.Entrypoint}, Dir: start.Cwd, Env: env, NeedStdin: true})
 	if err != nil {
 		return nil, err
 	}
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_launch_test.go b/apps/daemon/internal/agent/claudesdk/workspace_launch_test.go
index dfaac5162..1f310776d 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_launch_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_launch_test.go
@@ -24,7 +24,7 @@ test "$ANTHROPIC_AUTH_TOKEN" = selected-provider-fixture || exit 23
 test "$TMPDIR" != "$CLAUDE_CONFIG_DIR/tmp" || exit 24
 case "$1" in
   */runtime_check.js)
-    printf '%s\n' '{"type":"runtime_ready","protocol":3,"node":"fixture","sdk":"fixture","mcp":"fixture","native":"fixture","features":["workspace_tools","workspace_prepare"]}' ;;
+    printf '%s\n' '{"type":"runtime_ready","protocol":3,"node":"fixture","sdk":"fixture","mcp":"fixture","native":"fixture","features":["workspace_tools","workspace_prepare","workspace_command_observations"]}' ;;
   *)
     IFS= read -r request
     printf '%s\n' '{"type":"executor_ready","protocol":3}'
@@ -59,7 +59,7 @@ esac
 		t.Fatal("expected one settled completion")
 	}
 	// Feature checking must reject an older bridge without starting execution.
-	script = strings.ReplaceAll(script, `"features":["workspace_tools","workspace_prepare"]`, `"features":[]`)
+	script = strings.ReplaceAll(script, `"features":["workspace_tools","workspace_prepare","workspace_command_observations"]`, `"features":[]`)
 	script = strings.ReplaceAll(script, "IFS= read -r request", "touch '"+filepath.Join(config.StateDir, "unexpected-start")+"'")
 	if err := os.WriteFile(config.Node, []byte(script), 0o700); err != nil {
 		t.Fatal(err)
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go b/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
index 6a19b6e53..ceca7f844 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
@@ -104,7 +104,7 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 		out := make(chan proto.Envelope, 64)
 		req := workspaceRequest()
 		req.RunID, req.Input, req.AgentSessionID = uuid.NewString(), proto.TextInput(prompt), resume
-		req.StrictResume, req.ReleaseOnCompletion, req.ObserveMessages, req.ObserveToolObservations = true, true, true, true
+		req.ReleaseOnCompletion, req.ObserveMessages = true, true
 		req.AgentOptions = map[string]any{"model": "MiniMax-M3", "system_prompt": "Follow the exact verification instructions using the requested native tools. Preserve conversation facts. No other files, network operations or background work."}
 		proof := evidence{RunID: req.RunID}
 		var running agent.Session
diff --git a/apps/daemon/internal/agent/clirunner/process.go b/apps/daemon/internal/agent/clirunner/process.go
index e693df7f5..a9a4465bd 100644
--- a/apps/daemon/internal/agent/clirunner/process.go
+++ b/apps/daemon/internal/agent/clirunner/process.go
@@ -5,9 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os/exec"
-	"runtime"
 	"sync"
-	"syscall"
 	"time"
 )
 
@@ -19,8 +17,6 @@ type StartOptions struct {
 	Env         []string
 	NeedStdin   bool
 	KillTimeout time.Duration
-	// OwnProcessGroup bounds the lifetime of subprocess descendants on Unix.
-	OwnProcessGroup bool
 }
 
 type Process struct {
@@ -29,13 +25,11 @@ type Process struct {
 	Stdout io.ReadCloser
 	Stderr io.ReadCloser
 
-	ctx       context.Context
-	cancel    context.CancelFunc
-	done      chan struct{}
-	killAfter time.Duration
+	ctx    context.Context
+	cancel context.CancelFunc
+	done   chan struct{}
 
 	cancelOnce    sync.Once
-	waitOnce      sync.Once
 	cancelProcess func() error
 	waitProcess   func() error
 }
@@ -51,54 +45,9 @@ func Start(opts StartOptions) (*Process, error) {
 		opts.KillTimeout = 3 * time.Second
 	}
 
-	if opts.OwnProcessGroup || runtime.GOOS == "windows" {
-		return startProcessGroup(opts)
-	}
-
-	ctx, cancel := context.WithCancel(opts.Parent)
-	cmd := exec.CommandContext(ctx, opts.Binary, opts.Args...)
-	cmd.Dir = opts.Dir
-	if len(opts.Env) > 0 {
-		cmd.Env = append([]string{}, opts.Env...)
-	}
-
-	var stdin io.WriteCloser
-	var err error
-	if opts.NeedStdin {
-		stdin, err = cmd.StdinPipe()
-		if err != nil {
-			cancel()
-			return nil, fmt.Errorf("clirunner: stdin pipe: %w", err)
-		}
-	}
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		closePipe(stdin)
-		cancel()
-		return nil, fmt.Errorf("clirunner: stdout pipe: %w", err)
-	}
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		closePipe(stdin)
-		cancel()
-		return nil, fmt.Errorf("clirunner: stderr pipe: %w", err)
-	}
-	if err := cmd.Start(); err != nil {
-		closePipe(stdin)
-		cancel()
-		return nil, fmt.Errorf("clirunner: start %q: %w", opts.Binary, err)
-	}
-
-	return &Process{
-		Cmd:       cmd,
-		Stdin:     stdin,
-		Stdout:    stdout,
-		Stderr:    stderr,
-		ctx:       ctx,
-		cancel:    cancel,
-		done:      make(chan struct{}),
-		killAfter: opts.KillTimeout,
-	}, nil
+	// Every child owns its process group (a Job object on Windows), bounding the
+	// lifetime of its descendants.
+	return startProcessGroup(opts)
 }
 
 func (p *Process) Context() context.Context {
@@ -118,41 +67,20 @@ func (p *Process) Done() <-chan struct{} {
 }
 
 func (p *Process) Cancel() {
-	if p == nil {
+	if p == nil || p.cancelProcess == nil {
 		return
 	}
 	p.cancelOnce.Do(func() {
-		if p.cancelProcess != nil {
-			_ = p.cancelProcess()
-			p.cancel()
-			return
-		}
-		if p.Cmd != nil && p.Cmd.Process != nil {
-			_ = p.Cmd.Process.Signal(syscall.SIGTERM)
-			go func() {
-				select {
-				case <-p.done:
-				case <-time.After(p.killAfter):
-					_ = p.Cmd.Process.Signal(syscall.SIGKILL)
-				}
-			}()
-		}
-		if p.cancel != nil {
-			p.cancel()
-		}
+		_ = p.cancelProcess()
+		p.cancel()
 	})
 }
 
 func (p *Process) Wait() error {
-	if p == nil || p.Cmd == nil {
+	if p == nil || p.waitProcess == nil {
 		return nil
 	}
-	if p.waitProcess != nil {
-		return p.waitProcess()
-	}
-	err := p.Cmd.Wait()
-	p.waitOnce.Do(func() { close(p.done) })
-	return err
+	return p.waitProcess()
 }
 
 func closePipe(p io.Closer) {
diff --git a/apps/daemon/internal/agent/clirunner/process_group_other.go b/apps/daemon/internal/agent/clirunner/process_group_other.go
index d5763742b..796f8aa19 100644
--- a/apps/daemon/internal/agent/clirunner/process_group_other.go
+++ b/apps/daemon/internal/agent/clirunner/process_group_other.go
@@ -5,5 +5,5 @@ package clirunner
 import "errors"
 
 func startProcessGroup(StartOptions) (*Process, error) {
-	return nil, errors.New("clirunner: process-group ownership requires Unix")
+	return nil, errors.New("clirunner: process ownership requires Unix or Windows")
 }
diff --git a/apps/daemon/internal/agent/clirunner/process_group_unix_test.go b/apps/daemon/internal/agent/clirunner/process_group_unix_test.go
index 8a3cbf162..da3162be5 100644
--- a/apps/daemon/internal/agent/clirunner/process_group_unix_test.go
+++ b/apps/daemon/internal/agent/clirunner/process_group_unix_test.go
@@ -107,9 +107,9 @@ func startOwnedHelper(t *testing.T, ctx context.Context, mode, dir string) *Proc
 	t.Helper()
 	p, err := Start(StartOptions{
 		Parent: ctx, Binary: os.Args[0],
-		Args:            []string{"-test.run=^TestOwnedGroupHelper$", "--", "leader", mode, dir},
-		Env:             append(os.Environ(), "GO_WANT_OWNED_GROUP=1", "GORACE=atexit_sleep_ms=0"),
-		OwnProcessGroup: true, KillTimeout: 300 * time.Millisecond,
+		Args:        []string{"-test.run=^TestOwnedGroupHelper$", "--", "leader", mode, dir},
+		Env:         append(os.Environ(), "GO_WANT_OWNED_GROUP=1", "GORACE=atexit_sleep_ms=0"),
+		KillTimeout: 300 * time.Millisecond,
 	})
 	if err != nil {
 		t.Fatal(err)
diff --git a/apps/daemon/internal/agent/clirunner/process_group_windows_test.go b/apps/daemon/internal/agent/clirunner/process_group_windows_test.go
index b2d442b54..fee66f0f2 100644
--- a/apps/daemon/internal/agent/clirunner/process_group_windows_test.go
+++ b/apps/daemon/internal/agent/clirunner/process_group_windows_test.go
@@ -21,7 +21,7 @@ func TestWindowsOwnedTree(t *testing.T) {
 			dir := t.TempDir()
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
-			p, err := Start(StartOptions{Parent: ctx, Binary: os.Args[0], Args: []string{"-test.run=^TestWindowsTreeHelper$", "--", "leader", mode, dir}, Env: append(os.Environ(), "OAC_TREE_HELPER=1"), OwnProcessGroup: true})
+			p, err := Start(StartOptions{Parent: ctx, Binary: os.Args[0], Args: []string{"-test.run=^TestWindowsTreeHelper$", "--", "leader", mode, dir}, Env: append(os.Environ(), "OAC_TREE_HELPER=1")})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -129,7 +129,7 @@ func TestWindowsTreeHelper(t *testing.T) {
 			time.Sleep(10 * time.Millisecond)
 		}
 	case "owner":
-		p, err := Start(StartOptions{Parent: context.Background(), Binary: os.Args[0], Args: []string{"-test.run=^TestWindowsTreeHelper$", "--", "leader", mode, dir}, Env: os.Environ(), OwnProcessGroup: true})
+		p, err := Start(StartOptions{Parent: context.Background(), Binary: os.Args[0], Args: []string{"-test.run=^TestWindowsTreeHelper$", "--", "leader", mode, dir}, Env: os.Environ()})
 		if err != nil {
 			os.Exit(3)
 		}
diff --git a/apps/daemon/internal/agent/codex/declaration.go b/apps/daemon/internal/agent/codex/declaration.go
index ea6bfab51..26bb61c4e 100644
--- a/apps/daemon/internal/agent/codex/declaration.go
+++ b/apps/daemon/internal/agent/codex/declaration.go
@@ -20,7 +20,6 @@ var Declaration = agent.Declaration{Info: proto.SupportedAgentKind{
 		Usage:                          proto.CapabilitySupported,
 		Resume:                         proto.CapabilitySupported,
 		NativeSessionRecovery:          proto.CapabilityUnsupported,
-		WorkspaceAuthoring:             proto.CapabilitySupported,
 		Steering:                       proto.CapabilitySupported,
 		MessageItems:                   proto.CapabilitySupported,
 		ToolObservations:               proto.CapabilitySupported,
diff --git a/apps/daemon/internal/agent/codex/declaration_test.go b/apps/daemon/internal/agent/codex/declaration_test.go
index d3a364b97..b26acf131 100644
--- a/apps/daemon/internal/agent/codex/declaration_test.go
+++ b/apps/daemon/internal/agent/codex/declaration_test.go
@@ -29,7 +29,7 @@ func TestMCPRequiredDiscoveryRequiresPinnedNative(t *testing.T) {
 
 // The declaration must retain the complete baseline capability descriptor.
 func TestDeclaredCapabilityBaseline(t *testing.T) {
-	expected := map[string]bool{"SubagentObservations": true, "Streaming": true, "Permissions": true, "Usage": true, "Resume": true, "Steering": true, "MessageItems": true, "ToolObservations": true, "EnvironmentNone": true, "ProgrammaticToolCallingDisable": true, "WebSearchControl": true, "MessageImages": true, "FunctionResultImages": true, "SubagentControl": true, "DurableInputReceipts": true, "DurableTurns": true, "FunctionTools": true, "MCPHTTPTools": true, "MCPHTTPBearerAuth": true, "WorkspaceAuthoring": true}
+	expected := map[string]bool{"SubagentObservations": true, "Streaming": true, "Permissions": true, "Usage": true, "Resume": true, "Steering": true, "MessageItems": true, "ToolObservations": true, "EnvironmentNone": true, "ProgrammaticToolCallingDisable": true, "WebSearchControl": true, "MessageImages": true, "FunctionResultImages": true, "SubagentControl": true, "DurableInputReceipts": true, "DurableTurns": true, "FunctionTools": true, "MCPHTTPTools": true, "MCPHTTPBearerAuth": true}
 	expected["ExecutionControls"], expected["TextVerbosity"] = SupportsTextVerbosity, SupportsTextVerbosity
 	value := reflect.ValueOf(Declaration.Info.Capabilities)
 	for i := 0; i < value.NumField(); i++ {
diff --git a/apps/daemon/internal/agent/codex/environment.go b/apps/daemon/internal/agent/codex/environment.go
index 51ba1f0f6..725e5ef58 100644
--- a/apps/daemon/internal/agent/codex/environment.go
+++ b/apps/daemon/internal/agent/codex/environment.go
@@ -7,8 +7,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
 // Check the native provider instead of assuming an older binary honors the flag.
@@ -40,22 +38,16 @@ func nativeEnvironmentStatus(ctx context.Context, rpc *JSONRPCClient, id string)
 }
 
 // Native still recognizes the retired transport variables. Reject them before
-// setup so inherited or operator options cannot select a separate executor.
+// setup so the inherited environment cannot select a separate executor.
 // The explicit none selector remains part of native execution isolation.
-func validateNativeTransportEnvironment(req proto.PromptRequestPayload) error {
-	options, err := buildSessionEnv(req.AgentOptions)
-	if err != nil {
-		return err
-	}
-	for _, environment := range [][]string{os.Environ(), options} {
-		for _, entry := range environment {
-			key, value, _ := strings.Cut(entry, "=")
-			if value == "" {
-				continue
-			}
-			if (key == "CODEX_EXEC_SERVER_URL" && value != "none") || strings.HasPrefix(key, "CODEX_EXEC_SERVER_NOISE_") {
-				return errors.New("codex: retired executor transport configuration is not supported")
-			}
+func validateNativeTransportEnvironment() error {
+	for _, entry := range os.Environ() {
+		key, value, _ := strings.Cut(entry, "=")
+		if value == "" {
+			continue
+		}
+		if (key == "CODEX_EXEC_SERVER_URL" && value != "none") || strings.HasPrefix(key, "CODEX_EXEC_SERVER_NOISE_") {
+			return errors.New("codex: retired executor transport configuration is not supported")
 		}
 	}
 	return nil
diff --git a/apps/daemon/internal/agent/codex/environment_retired_test.go b/apps/daemon/internal/agent/codex/environment_retired_test.go
index 08dab1f6b..f3e070843 100644
--- a/apps/daemon/internal/agent/codex/environment_retired_test.go
+++ b/apps/daemon/internal/agent/codex/environment_retired_test.go
@@ -24,33 +24,27 @@ func TestReadOnlyPreparationRejectedBeforeNativeSetup(t *testing.T) {
 	}
 }
 
-func TestRetiredNativeTransportOptionsRejectedBeforeState(t *testing.T) {
+func TestRetiredNativeTransportEnvironmentRejectedBeforeState(t *testing.T) {
 	for _, key := range []string{"CODEX_EXEC_SERVER_URL", "CODEX_EXEC_SERVER_NOISE_REGISTRY_URL", "CODEX_EXEC_SERVER_NOISE_ENVIRONMENT_ID", "CODEX_EXEC_SERVER_NOISE_AUTH_TOKEN"} {
-		for _, source := range []string{"process", "options"} {
-			for _, none := range []bool{false, true} {
-				t.Run(key+"/"+source+"/"+map[bool]string{false: "local", true: "none"}[none], func(t *testing.T) {
-					req, cfg, root := preparationFixture(t)
-					req.DisableExecutionEnvironment = none
-					if !none {
-						req.LocalEnvironment = &proto.LocalEnvironment{ID: "local"}
-					}
-					if source == "process" {
-						t.Setenv(key, "retired-private-value")
-					} else {
-						req.AgentOptions["env"] = map[string]any{key: "retired-private-value"}
-					}
-					p, err := newPreparation(t.Context(), req, cfg)
-					if p != nil || err == nil || !strings.Contains(err.Error(), "retired executor transport") || strings.Contains(err.Error(), "retired-private-value") {
-						t.Fatal("transport override admitted or disclosed", err)
-					}
-					if len(preparationFrames(t, root)) != 0 {
-						t.Fatal("retired transport started native process")
-					}
-					if _, err := os.Stat(filepath.Join(root, "daemon", "agent-sessions")); !os.IsNotExist(err) {
-						t.Fatal("retired transport created state", err)
-					}
-				})
-			}
+		for _, none := range []bool{false, true} {
+			t.Run(key+"/"+map[bool]string{false: "local", true: "none"}[none], func(t *testing.T) {
+				req, cfg, root := preparationFixture(t)
+				req.DisableExecutionEnvironment = none
+				if !none {
+					req.LocalEnvironment = &proto.LocalEnvironment{ID: "local"}
+				}
+				t.Setenv(key, "retired-private-value")
+				p, err := newPreparation(t.Context(), req, cfg)
+				if p != nil || err == nil || !strings.Contains(err.Error(), "retired executor transport") || strings.Contains(err.Error(), "retired-private-value") {
+					t.Fatal("transport override admitted or disclosed", err)
+				}
+				if len(preparationFrames(t, root)) != 0 {
+					t.Fatal("retired transport started native process")
+				}
+				if _, err := os.Stat(filepath.Join(root, "daemon", "agent-sessions")); !os.IsNotExist(err) {
+					t.Fatal("retired transport created state", err)
+				}
+			})
 		}
 	}
 }
@@ -58,7 +52,6 @@ func TestRetiredNativeTransportOptionsRejectedBeforeState(t *testing.T) {
 func TestNativeNoneSelectorRemainsSupported(t *testing.T) {
 	req, cfg, root := preparationFixture(t)
 	t.Setenv("CODEX_EXEC_SERVER_URL", "none")
-	req.AgentOptions["env"] = map[string]any{"CODEX_EXEC_SERVER_URL": "none"}
 	p, err := newPreparation(t.Context(), req, cfg)
 	if err != nil {
 		t.Fatal(err)
diff --git a/apps/daemon/internal/agent/codex/executor.go b/apps/daemon/internal/agent/codex/executor.go
index 2f1e2eb09..75403c57d 100644
--- a/apps/daemon/internal/agent/codex/executor.go
+++ b/apps/daemon/internal/agent/codex/executor.go
@@ -69,8 +69,7 @@ func (e *Executor) StartTurn(ctx context.Context, runID string, input proto.Mess
 	functions := &functionCalls{definitions: base.functions.definitions, names: base.functions.names, pending: map[string]*pendingFunction{}}
 	turnCtx, cancel := context.WithCancel(base.cancelCtx)
 	s := &Session{executor: e, nativeHome: base.nativeHome,
-		functions: functions, observeMessages: base.observeMessages,
-		observeToolObservations: base.observeToolObservations, observeSubagentIdentities: base.observeSubagentIdentities,
+		functions: functions, observeMessages: base.observeMessages, observeSubagentIdentities: base.observeSubagentIdentities,
 		cfg: base.cfg, rpc: base.rpc, cancelCtx: turnCtx, cancelFn: cancel,
 		waitDone: make(chan struct{}), outputDone: make(chan struct{}), cleanup: func() {},
 		bufs: NewItemBuffers(), resolvedModel: base.resolvedModel, interactions: newPendingCodexInteractions(), runID: runID, out: out}
@@ -94,7 +93,7 @@ func (e *Executor) StartTurn(ctx context.Context, runID string, input proto.Mess
 	}
 	s.registerHandlers()
 	e.mu.Unlock()
-	req := proto.PromptRequestPayload{RunID: runID, Input: input, AgentSessionID: e.prepared.resumeID, StrictResume: e.prepared.strictResume, RequireExistingNativeSession: e.prepared.requireExistingNativeSession}
+	req := proto.PromptRequestPayload{RunID: runID, Input: input, AgentSessionID: e.prepared.resumeID, RequireExistingNativeSession: e.prepared.requireExistingNativeSession}
 	// Ownership precedes any native submission. Even an uncertain start returns the
 	// exact Turn so its caller can await settlement without replaying the input.
 	err := s.startNative(ctx, e.prepared.plan, req)
diff --git a/apps/daemon/internal/agent/codex/executor_native_test.go b/apps/daemon/internal/agent/codex/executor_native_test.go
index 227ad311c..247e6b083 100644
--- a/apps/daemon/internal/agent/codex/executor_native_test.go
+++ b/apps/daemon/internal/agent/codex/executor_native_test.go
@@ -50,7 +50,7 @@ func TestExecutorNativeReuse(t *testing.T) {
 	cfg.logger = obslog.Discard()
 	req := proto.PromptRequestPayload{
 		AgentKind: "codex", AgentStateKey: "executor-native",
-		StrictResume: true, DisableExecutionEnvironment: true, DisableSubagents: true, ObserveMessages: true,
+		DisableExecutionEnvironment: true, DisableSubagents: true, ObserveMessages: true,
 		AgentOptions:  map[string]any{"model": model, "model_provider": map[string]any{"base_url": endpoint, "protocol": "responses", "api_key": strings.TrimSpace(string(key))}},
 		FunctionTools: []proto.FunctionTool{{Name: "hold", Description: "Wait until the host supplies a result.", Parameters: json.RawMessage("{\"type\":\"object\",\"properties\":{},\"additionalProperties\":false}")}},
 	}
diff --git a/apps/daemon/internal/agent/codex/executor_test.go b/apps/daemon/internal/agent/codex/executor_test.go
index 01245f944..f864d5899 100644
--- a/apps/daemon/internal/agent/codex/executor_test.go
+++ b/apps/daemon/internal/agent/codex/executor_test.go
@@ -165,7 +165,7 @@ func TestExecutorStartErrorsRetainExactOwnership(t *testing.T) {
 }
 
 func TestExecutorCloseRetainsPlanUntilReaped(t *testing.T) {
-	process, err := clirunner.Start(clirunner.StartOptions{Parent: t.Context(), Binary: os.Args[0], Args: []string{"-test.run=^TestJSONRPCClientFakeCodexProcess$", "--"}, Env: append(os.Environ(), "CODEX_RPC_FAKE_PROCESS=1", "GORACE=atexit_sleep_ms=0"), NeedStdin: true, OwnProcessGroup: true})
+	process, err := clirunner.Start(clirunner.StartOptions{Parent: t.Context(), Binary: os.Args[0], Args: []string{"-test.run=^TestJSONRPCClientFakeCodexProcess$", "--"}, Env: append(os.Environ(), "CODEX_RPC_FAKE_PROCESS=1", "GORACE=atexit_sleep_ms=0"), NeedStdin: true})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/agent/codex/mcp_required_test.go b/apps/daemon/internal/agent/codex/mcp_required_test.go
index bd4bbec2b..44b106a43 100644
--- a/apps/daemon/internal/agent/codex/mcp_required_test.go
+++ b/apps/daemon/internal/agent/codex/mcp_required_test.go
@@ -17,7 +17,6 @@ func TestRequiredMCPWaitsForNativeThreadAndNeverRestartsFailedResume(t *testing.
 	for _, mode := range []string{"new ready", "new failed", "resume ready", "resume failed"} {
 		t.Run(mode, func(t *testing.T) {
 			req, cfg, root := preparationFixture(t)
-			req.StrictResume = true
 			req.AgentOptions = map[string]any{"model": "fixture-model"}
 			servers := []proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "docs", ServerURL: "https://docs.example/mcp", Required: true}}
 			req.MCPHTTPServers = &servers
diff --git a/apps/daemon/internal/agent/codex/options.go b/apps/daemon/internal/agent/codex/options.go
index 2e0457cb2..4b7b2d2d2 100644
--- a/apps/daemon/internal/agent/codex/options.go
+++ b/apps/daemon/internal/agent/codex/options.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
-	"sort"
 	"strings"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/paths"
@@ -74,8 +73,6 @@ type SessionPlan struct {
 //	system_prompt   string  forwarded as developerInstructions
 //	model_provider  object  frozen upstream protocol, endpoint, credential and token limits
 //	harness_config  object  native parameters accepted by harnessconfig/codex
-//	env             object  extra env vars (KEY=string-value); the Runtime's
-//	                        authoring bridge supplies it
 //
 // Execution controls select the native web_search and model_verbosity settings.
 // The codex binary itself is resolved via PATH only.
@@ -109,11 +106,6 @@ func BuildSessionPlan(agentStateKey string, opts map[string]any, controls *proto
 	plan.Model = stringOpt(opts, "model")
 	plan.SystemPrompt = stringOpt(opts, "system_prompt")
 
-	env, err := buildSessionEnv(opts)
-	if err != nil {
-		return plan, err
-	}
-
 	codexHome, err := allocCodexHome(agentStateKey)
 	if err != nil {
 		return plan, err
@@ -121,7 +113,7 @@ func BuildSessionPlan(agentStateKey string, opts map[string]any, controls *proto
 	if err := resetGeneratedConfig(codexHome); err != nil {
 		return plan, err
 	}
-	env = append(env, "CODEX_HOME="+codexHome)
+	env := []string{"DISABLE_TELEMETRY=1", "CODEX_HOME=" + codexHome}
 
 	provider, hasProvider, err := normaliseProviderConfig(opts["model_provider"])
 	if err != nil {
@@ -203,33 +195,6 @@ func resetGeneratedConfig(codexHome string) error {
 	return nil
 }
 
-func buildSessionEnv(opts map[string]any) ([]string, error) {
-	env := []string{
-		"DISABLE_TELEMETRY=1",
-	}
-	raw, ok := opts["env"]
-	if !ok || raw == nil {
-		return env, nil
-	}
-	envMap, ok := raw.(map[string]any)
-	if !ok {
-		return nil, fmt.Errorf("codex.BuildSessionPlan: env must be object, got %T", raw)
-	}
-	keys := make([]string, 0, len(envMap))
-	for k := range envMap {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	for _, k := range keys {
-		s, ok := envMap[k].(string)
-		if !ok {
-			return nil, fmt.Errorf("codex.BuildSessionPlan: env[%q] must be string, got %T", k, envMap[k])
-		}
-		env = append(env, k+"="+s)
-	}
-	return env, nil
-}
-
 // normaliseProviderConfig validates and renders the frozen native provider.
 func normaliseProviderConfig(raw any) (providerConfig, bool, error) {
 	if raw == nil {
diff --git a/apps/daemon/internal/agent/codex/options_test.go b/apps/daemon/internal/agent/codex/options_test.go
index f5fec2fdb..b20123e2b 100644
--- a/apps/daemon/internal/agent/codex/options_test.go
+++ b/apps/daemon/internal/agent/codex/options_test.go
@@ -24,24 +24,17 @@ func TestBuildSessionPlan_DefaultsToBypass(t *testing.T) {
 }
 
 func TestBuildSessionPlan_AllocsCodexHomeAndEnv(t *testing.T) {
-	plan, err := BuildSessionPlan("conv-1/agent-1/codex", map[string]any{
-		"env": map[string]any{
-			"OPENAI_API_KEY": "sk-test",
-		},
-	}, nil)
+	plan, err := BuildSessionPlan("conv-1/agent-1/codex", nil, nil)
 	if err != nil {
 		t.Fatalf("BuildSessionPlan: %v", err)
 	}
 	defer plan.Cleanup()
 	hasCodexHome := false
-	hasOpenAI := false
 	hasTelemetry := false
 	for _, kv := range plan.Env {
 		switch {
 		case strings.HasPrefix(kv, "CODEX_HOME="):
 			hasCodexHome = true
-		case kv == "OPENAI_API_KEY=sk-test":
-			hasOpenAI = true
 		case kv == "DISABLE_TELEMETRY=1":
 			hasTelemetry = true
 		}
@@ -49,9 +42,6 @@ func TestBuildSessionPlan_AllocsCodexHomeAndEnv(t *testing.T) {
 	if !hasCodexHome {
 		t.Fatalf("env missing CODEX_HOME: %+v", plan.Env)
 	}
-	if !hasOpenAI {
-		t.Fatalf("env missing OPENAI_API_KEY: %+v", plan.Env)
-	}
 	if !hasTelemetry {
 		t.Fatalf("env missing DISABLE_TELEMETRY: %+v", plan.Env)
 	}
diff --git a/apps/daemon/internal/agent/codex/preparation.go b/apps/daemon/internal/agent/codex/preparation.go
index 663f060d2..0d3a4bdf9 100644
--- a/apps/daemon/internal/agent/codex/preparation.go
+++ b/apps/daemon/internal/agent/codex/preparation.go
@@ -25,7 +25,6 @@ func newSession(parent context.Context, req proto.PromptRequestPayload, out chan
 		return nil, errors.New("codex: nil out channel")
 	}
 	runID, prompt := req.RunID, req.Input
-	req.AgentStateKey = effectiveAgentStateKey(req)
 	req.RunID, req.Input = "", nil
 	prepared, err := newPreparation(parent, req, cfg)
 	if err != nil {
@@ -42,9 +41,6 @@ func newPreparation(parent context.Context, req proto.PromptRequestPayload, cfg
 	if req.WorkspaceReadOnly {
 		return nil, errors.New("codex: workspace reads use the local Runtime interface")
 	}
-	if req.RequireExistingNativeSession && (!req.StrictResume || req.AgentStateKey == "" || req.WorkspaceReadOnly) {
-		return nil, errors.New("codex: native-session recovery requires strict private state")
-	}
 	if req.RunID != "" || len(req.Input) != 0 {
 		return nil, errors.New("codex: preparation does not accept a run identity or prompt")
 	}
@@ -61,8 +57,6 @@ func newPreparation(parent context.Context, req proto.PromptRequestPayload, cfg
 	if err != nil {
 		return nil, err
 	}
-	req.AgentStateKey = effectiveAgentStateKey(req)
-
 	plan, skillRoots, err := prepareSessionPlan(parent, req, cfg)
 	if err != nil {
 		return nil, err
@@ -86,11 +80,9 @@ func newPreparation(parent context.Context, req proto.PromptRequestPayload, cfg
 	rpc := NewJSONRPCClient(rpcCfg)
 
 	s := &Session{
-		nativeHome:      nativeHomeFromPlan(plan),
-		functions:       functions,
-		observeMessages: req.ObserveMessages,
-
-		observeToolObservations:   req.ObserveToolObservations,
+		nativeHome:                nativeHomeFromPlan(plan),
+		functions:                 functions,
+		observeMessages:           req.ObserveMessages,
 		observeSubagentIdentities: req.ObserveSubagentIdentities && !req.DisableSubagents,
 		cfg:                       cfg,
 		rpc:                       rpc,
@@ -105,7 +97,7 @@ func newPreparation(parent context.Context, req proto.PromptRequestPayload, cfg
 	plan.Cleanup = s.cleanup
 	p := &Prepared{
 		session: s, plan: plan,
-		resumeID: req.AgentSessionID, strictResume: req.StrictResume, requireExistingNativeSession: req.RequireExistingNativeSession,
+		resumeID: req.AgentSessionID, requireExistingNativeSession: req.RequireExistingNativeSession,
 		transferred: make(chan struct{}),
 	}
 
diff --git a/apps/daemon/internal/agent/codex/preparation_helpers_test.go b/apps/daemon/internal/agent/codex/preparation_helpers_test.go
index 65625bcec..a04fe665c 100644
--- a/apps/daemon/internal/agent/codex/preparation_helpers_test.go
+++ b/apps/daemon/internal/agent/codex/preparation_helpers_test.go
@@ -42,7 +42,7 @@ func preparationFixture(t *testing.T) (proto.PromptRequestPayload, sessionConfig
 	cfg.codexBinary = binary
 	req := proto.PromptRequestPayload{
 		AgentKind: "codex", AgentStateKey: "prepared-session",
-		ReleaseOnCompletion: true, StrictResume: true,
+		ReleaseOnCompletion:         true,
 		AgentOptions:                map[string]any{"model": "fixture-model"},
 		ExecutionControls:           &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"},
 		DisableExecutionEnvironment: true,
diff --git a/apps/daemon/internal/agent/codex/prepared.go b/apps/daemon/internal/agent/codex/prepared.go
index 454b71976..1f4e049f0 100644
--- a/apps/daemon/internal/agent/codex/prepared.go
+++ b/apps/daemon/internal/agent/codex/prepared.go
@@ -17,7 +17,6 @@ type Prepared struct {
 	session                      *Session
 	plan                         SessionPlan
 	resumeID                     string
-	strictResume                 bool
 	requireExistingNativeSession bool
 	claimed                      bool
 	closed                       bool
@@ -70,7 +69,7 @@ func (p *Prepared) start(ctx context.Context, runID string, prompt proto.Message
 	p.started = true
 	close(p.transferred)
 	transferred = true
-	req := proto.PromptRequestPayload{RunID: runID, Input: prompt, AgentSessionID: p.resumeID, StrictResume: p.strictResume, RequireExistingNativeSession: p.requireExistingNativeSession}
+	req := proto.PromptRequestPayload{RunID: runID, Input: prompt, AgentSessionID: p.resumeID, RequireExistingNativeSession: p.requireExistingNativeSession}
 	go s.run(p.plan, req)
 	return s, nil
 }
diff --git a/apps/daemon/internal/agent/codex/recovery_test.go b/apps/daemon/internal/agent/codex/recovery_test.go
index da32ad87e..78aad7c16 100644
--- a/apps/daemon/internal/agent/codex/recovery_test.go
+++ b/apps/daemon/internal/agent/codex/recovery_test.go
@@ -46,7 +46,7 @@ func TestRequiredHistoryResolution(t *testing.T) {
 			case "wrong-home":
 				row["path"] = "/another/sessions/rollout.jsonl"
 			}
-			req := proto.PromptRequestPayload{StrictResume: true, RequireExistingNativeSession: true}
+			req := proto.PromptRequestPayload{RequireExistingNativeSession: true}
 			if scenario == "fresh" {
 				req.RequireExistingNativeSession = false
 			}
@@ -196,14 +196,12 @@ func TestPreparedRecoveryCannotStartWithoutExistingHistory(t *testing.T) {
 	}
 }
 
-func TestRecoveryRequiresStrictPrivateExecution(t *testing.T) {
-	for _, mode := range []string{"non-strict", "no-state", "read-only"} {
+func TestRecoveryRequiresWritableAgentState(t *testing.T) {
+	for _, mode := range []string{"no-state", "read-only"} {
 		t.Run(mode, func(t *testing.T) {
 			req, cfg, root := preparationFixture(t)
 			req.RequireExistingNativeSession = true
 			switch mode {
-			case "non-strict":
-				req.StrictResume = false
 			case "no-state":
 				req.AgentStateKey = ""
 			case "read-only":
diff --git a/apps/daemon/internal/agent/codex/resume.go b/apps/daemon/internal/agent/codex/resume.go
index 6ee852b1c..2bc3172e1 100644
--- a/apps/daemon/internal/agent/codex/resume.go
+++ b/apps/daemon/internal/agent/codex/resume.go
@@ -9,18 +9,12 @@ import (
 
 func (s *Session) resolveThread(req proto.PromptRequestPayload, plan SessionPlan) error {
 	if strings.TrimSpace(req.AgentSessionID) != "" {
-		if err := s.resumeThread(req.AgentSessionID, plan); err == nil {
-			return nil
-		} else if req.StrictResume {
+		if err := s.resumeThread(req.AgentSessionID, plan); err != nil {
 			return fmt.Errorf("codex: thread/resume: %w", err)
-		} else {
-			s.cfg.logger.Warn("codex: thread/resume failed; starting fresh", "run_id", s.runID, "thread_id", req.AgentSessionID, "err", err)
 		}
+		return nil
 	}
 	if req.RequireExistingNativeSession {
-		if !req.StrictResume {
-			return fmt.Errorf("codex: recovery requires strict resume")
-		}
 		id, err := s.recoverRoot(plan)
 		if err != nil {
 			return err
diff --git a/apps/daemon/internal/agent/codex/resume_test.go b/apps/daemon/internal/agent/codex/resume_test.go
index 1da859d76..698eb2cc7 100644
--- a/apps/daemon/internal/agent/codex/resume_test.go
+++ b/apps/daemon/internal/agent/codex/resume_test.go
@@ -10,53 +10,38 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 )
 
-func TestStrictResumeDoesNotStartFresh(t *testing.T) {
-	for _, strict := range []bool{false, true} {
-		t.Run(map[bool]string{false: "legacy", true: "strict"}[strict], func(t *testing.T) {
-			client, server, cleanup := NewTestClient()
-			defer cleanup()
-			ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-			defer cancel()
-			s := &Session{rpc: client.JSONRPCClient, cancelCtx: ctx, cfg: sessionConfig{logger: log.With("component", "resume-test")}}
-			result := make(chan error, 1)
-			go func() {
-				result <- s.resolveThread(proto.PromptRequestPayload{AgentSessionID: "existing", StrictResume: strict}, SessionPlan{})
-			}()
-			var req struct {
-				ID     string `json:"id"`
-				Method string `json:"method"`
-			}
-			decoder := json.NewDecoder(server.FromClient)
-			encoder := json.NewEncoder(server.ToClient)
-			if err := decoder.Decode(&req); err != nil {
-				t.Fatal(err)
-			}
-			if req.Method != "thread/resume" {
-				t.Fatal(req.Method)
-			}
-			if err := encoder.Encode(map[string]any{"id": req.ID, "error": map[string]any{"code": -32600, "message": "native history unavailable"}}); err != nil {
-				t.Fatal(err)
-			}
-			if !strict {
-				if err := decoder.Decode(&req); err != nil {
-					t.Fatal(err)
-				}
-				if req.Method != "thread/start" {
-					t.Fatal(req.Method)
-				}
-				if err := encoder.Encode(map[string]any{"id": req.ID, "result": map[string]any{"thread": map[string]string{"id": "fresh"}}}); err != nil {
-					t.Fatal(err)
-				}
-			}
-			select {
-			case err := <-result:
-				if (err != nil) != strict {
-					t.Fatalf("strict=%v err=%v", strict, err)
-				}
-			case <-ctx.Done():
-				t.Fatal("thread resolution did not finish")
-			}
-		})
+func TestFailedResumeDoesNotStartFresh(t *testing.T) {
+	client, server, cleanup := NewTestClient()
+	defer cleanup()
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+	s := &Session{rpc: client.JSONRPCClient, cancelCtx: ctx, cfg: sessionConfig{logger: log.With("component", "resume-test")}}
+	result := make(chan error, 1)
+	go func() {
+		result <- s.resolveThread(proto.PromptRequestPayload{AgentSessionID: "existing"}, SessionPlan{})
+	}()
+	var req struct {
+		ID     string `json:"id"`
+		Method string `json:"method"`
+	}
+	decoder := json.NewDecoder(server.FromClient)
+	encoder := json.NewEncoder(server.ToClient)
+	if err := decoder.Decode(&req); err != nil {
+		t.Fatal(err)
+	}
+	if req.Method != "thread/resume" {
+		t.Fatal(req.Method)
+	}
+	if err := encoder.Encode(map[string]any{"id": req.ID, "error": map[string]any{"code": -32600, "message": "native history unavailable"}}); err != nil {
+		t.Fatal(err)
+	}
+	select {
+	case err := <-result:
+		if err == nil {
+			t.Fatal("failed resume started a fresh thread")
+		}
+	case <-ctx.Done():
+		t.Fatal("thread resolution did not finish")
 	}
 }
 
diff --git a/apps/daemon/internal/agent/codex/rpc.go b/apps/daemon/internal/agent/codex/rpc.go
index 2102eda9e..78607a12c 100644
--- a/apps/daemon/internal/agent/codex/rpc.go
+++ b/apps/daemon/internal/agent/codex/rpc.go
@@ -182,7 +182,7 @@ func (c *JSONRPCClient) Start(ctx context.Context, init InitializeParams) (Initi
 
 	process, err := clirunner.Start(clirunner.StartOptions{
 		Parent: ctx, Binary: c.cfg.Binary, Args: args, Dir: c.cfg.Cwd, Env: c.cfg.Env,
-		NeedStdin: true, OwnProcessGroup: true, KillTimeout: 250 * time.Millisecond,
+		NeedStdin: true, KillTimeout: 250 * time.Millisecond,
 	})
 	if err != nil {
 		return InitializeResult{}, fmt.Errorf("codex rpc: spawn %q: %w", c.cfg.Binary, err)
diff --git a/apps/daemon/internal/agent/codex/rpc_close_test.go b/apps/daemon/internal/agent/codex/rpc_close_test.go
index 80e404a85..c7b345d33 100644
--- a/apps/daemon/internal/agent/codex/rpc_close_test.go
+++ b/apps/daemon/internal/agent/codex/rpc_close_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 func TestJSONRPCClientCloseCanRetryUnreapedChild(t *testing.T) {
-	process, err := clirunner.Start(clirunner.StartOptions{Parent: t.Context(), Binary: os.Args[0], Args: []string{"-test.run=^TestJSONRPCClientFakeCodexProcess$", "--"}, Env: append(os.Environ(), "CODEX_RPC_FAKE_PROCESS=1", "GORACE=atexit_sleep_ms=0"), NeedStdin: true, OwnProcessGroup: true})
+	process, err := clirunner.Start(clirunner.StartOptions{Parent: t.Context(), Binary: os.Args[0], Args: []string{"-test.run=^TestJSONRPCClientFakeCodexProcess$", "--"}, Env: append(os.Environ(), "CODEX_RPC_FAKE_PROCESS=1", "GORACE=atexit_sleep_ms=0"), NeedStdin: true})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/agent/codex/session.go b/apps/daemon/internal/agent/codex/session.go
index 9b8ce23b0..f2bc6333f 100644
--- a/apps/daemon/internal/agent/codex/session.go
+++ b/apps/daemon/internal/agent/codex/session.go
@@ -70,11 +70,10 @@ type Session struct {
 	functions                 *functionCalls
 	observeMessages           bool
 
-	observeToolObservations bool
-	runID                   string
-	cfg                     sessionConfig
-	out                     chan<- proto.Envelope
-	rpc                     *JSONRPCClient
+	runID string
+	cfg   sessionConfig
+	out   chan<- proto.Envelope
+	rpc   *JSONRPCClient
 
 	cancelCtx context.Context
 	cancelFn  context.CancelFunc
diff --git a/apps/daemon/internal/agent/codex/session_command_output.go b/apps/daemon/internal/agent/codex/session_command_output.go
index 600e4fdad..1d5cd9f92 100644
--- a/apps/daemon/internal/agent/codex/session_command_output.go
+++ b/apps/daemon/internal/agent/codex/session_command_output.go
@@ -7,9 +7,6 @@ import (
 )
 
 func (s *Session) onCommandOutput(raw json.RawMessage) {
-	if !s.observeToolObservations {
-		return
-	}
 	var p AgentMessageDeltaNotification
 	if json.Unmarshal(raw, &p) != nil || !s.isRootTurn(p.ThreadID, p.TurnID) || p.ItemID == "" || p.Delta == "" {
 		return
diff --git a/apps/daemon/internal/agent/codex/session_command_output_test.go b/apps/daemon/internal/agent/codex/session_command_output_test.go
index 4f86ccbd0..a51fb6694 100644
--- a/apps/daemon/internal/agent/codex/session_command_output_test.go
+++ b/apps/daemon/internal/agent/codex/session_command_output_test.go
@@ -8,42 +8,34 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func TestCommandOutputRequiresOptInAndRootTurn(t *testing.T) {
-	for _, enabled := range []bool{false, true} {
-		out := make(chan proto.Envelope, 10)
-		s := &Session{runID: "run", out: out, cancelCtx: context.Background(), cfg: defaultSessionConfig(), rpc: NewJSONRPCClient(JSONRPCConfig{}), observeToolObservations: enabled}
-		s.registerHandlers()
-		s.setThreadID("root")
-		s.beginRootTurn("root", "turn")
-		for _, raw := range []string{
-			`{"threadId":"child","turnId":"turn","itemId":"cmd","delta":"foreign"}`,
-			`{"threadId":"root","turnId":"old","itemId":"cmd","delta":"foreign"}`,
-			`{"threadId":"root","turnId":"turn","delta":"missing identity"}`,
-			`{"threadId":"root","turnId":"turn","itemId":"cmd","delta":null}`,
-			`{"threadId":42}`, `{}`,
-		} {
-			scopeNotification(t, s, "item/commandExecution/outputDelta", raw)
-		}
-		if len(out) != 0 {
-			t.Fatal("invalid output reached root")
+func TestCommandOutputRequiresRootTurn(t *testing.T) {
+	out := make(chan proto.Envelope, 10)
+	s := &Session{runID: "run", out: out, cancelCtx: context.Background(), cfg: defaultSessionConfig(), rpc: NewJSONRPCClient(JSONRPCConfig{})}
+	s.registerHandlers()
+	s.setThreadID("root")
+	s.beginRootTurn("root", "turn")
+	for _, raw := range []string{
+		`{"threadId":"child","turnId":"turn","itemId":"cmd","delta":"foreign"}`,
+		`{"threadId":"root","turnId":"old","itemId":"cmd","delta":"foreign"}`,
+		`{"threadId":"root","turnId":"turn","delta":"missing identity"}`,
+		`{"threadId":"root","turnId":"turn","itemId":"cmd","delta":null}`,
+		`{"threadId":42}`, `{}`,
+	} {
+		scopeNotification(t, s, "item/commandExecution/outputDelta", raw)
+	}
+	if len(out) != 0 {
+		t.Fatal("invalid output reached root")
+	}
+	for _, fragment := range []string{"same\n", "same\n", "结束\n"} {
+		raw, _ := json.Marshal(map[string]string{"threadId": "root", "turnId": "turn", "itemId": "cmd", "delta": fragment})
+		scopeNotification(t, s, "item/commandExecution/outputDelta", string(raw))
+		if len(out) != 1 {
+			t.Fatal("missing registered command notification")
 		}
-		for _, fragment := range []string{"same\n", "same\n", "结束\n"} {
-			raw, _ := json.Marshal(map[string]string{"threadId": "root", "turnId": "turn", "itemId": "cmd", "delta": fragment})
-			scopeNotification(t, s, "item/commandExecution/outputDelta", string(raw))
-			if !enabled {
-				if len(out) != 0 {
-					t.Fatal("product frame sequence changed")
-				}
-				continue
-			}
-			if len(out) != 1 {
-				t.Fatal("missing registered command notification")
-			}
-			env := <-out
-			var p proto.CommandOutputPayload
-			if env.DecodePayload(&p) != nil || env.Type != proto.TypeCommandOutput || env.ID != "run" || p.ID != "cmd" || p.Delta != fragment {
-				t.Fatal("command fragment changed", env)
-			}
+		env := <-out
+		var p proto.CommandOutputPayload
+		if env.DecodePayload(&p) != nil || env.Type != proto.TypeCommandOutput || env.ID != "run" || p.ID != "cmd" || p.Delta != fragment {
+			t.Fatal("command fragment changed", env)
 		}
 	}
 }
diff --git a/apps/daemon/internal/agent/codex/session_notifications_test.go b/apps/daemon/internal/agent/codex/session_notifications_test.go
index 0df73e0e1..0ee2a9b94 100644
--- a/apps/daemon/internal/agent/codex/session_notifications_test.go
+++ b/apps/daemon/internal/agent/codex/session_notifications_test.go
@@ -13,8 +13,7 @@ func TestRootNotificationIsolation(t *testing.T) {
 		t.Run(map[bool]string{false: "child without thread started", true: "child thread started"}[childStarted], func(t *testing.T) {
 			out := make(chan proto.Envelope, 64)
 			s := &Session{runID: "run", out: out, cancelCtx: context.Background(), cfg: defaultSessionConfig(),
-				rpc: NewJSONRPCClient(JSONRPCConfig{}), bufs: NewItemBuffers(), observeMessages: true,
-				observeToolObservations: true}
+				rpc: NewJSONRPCClient(JSONRPCConfig{}), bufs: NewItemBuffers(), observeMessages: true}
 			s.registerHandlers()
 			s.setThreadID("root")
 			notify := func(method, params string) { t.Helper(); scopeNotification(t, s, method, params) }
diff --git a/apps/daemon/internal/agent/codex/session_plan.go b/apps/daemon/internal/agent/codex/session_plan.go
index 216b6717a..6d8ae5d67 100644
--- a/apps/daemon/internal/agent/codex/session_plan.go
+++ b/apps/daemon/internal/agent/codex/session_plan.go
@@ -10,7 +10,7 @@ import (
 )
 
 func prepareSessionPlan(ctx context.Context, req proto.PromptRequestPayload, cfg sessionConfig) (SessionPlan, []string, error) {
-	if err := validateNativeTransportEnvironment(req); err != nil {
+	if err := validateNativeTransportEnvironment(); err != nil {
 		return SessionPlan{}, nil, err
 	}
 	if err := validatePermissionProfile(req); err != nil {
diff --git a/apps/daemon/internal/agent/codex/session_tools.go b/apps/daemon/internal/agent/codex/session_tools.go
index 5a40b45c3..d1d4b4c94 100644
--- a/apps/daemon/internal/agent/codex/session_tools.go
+++ b/apps/daemon/internal/agent/codex/session_tools.go
@@ -10,13 +10,11 @@ func (s *Session) sendItemEvents(events []proto.Envelope, notification json.RawM
 	var native struct {
 		Item json.RawMessage `json:"item"`
 	}
-	if s.observeToolObservations {
-		if err := json.Unmarshal(notification, &native); err != nil {
-			return
-		}
+	if err := json.Unmarshal(notification, &native); err != nil {
+		return
 	}
 	for _, event := range events {
-		if (s.observeToolObservations) && event.Type == proto.TypeToolCall {
+		if event.Type == proto.TypeToolCall {
 			var tool proto.ToolCallPayload
 			if err := event.DecodePayload(&tool); err != nil {
 				return
diff --git a/apps/daemon/internal/agent/codex/session_tools_test.go b/apps/daemon/internal/agent/codex/session_tools_test.go
index 2eff526bb..8d4e06c8d 100644
--- a/apps/daemon/internal/agent/codex/session_tools_test.go
+++ b/apps/daemon/internal/agent/codex/session_tools_test.go
@@ -21,47 +21,39 @@ func toolSnapshotFixtures() []string {
 	}
 }
 
-func TestToolObservationsOnlyWhenRequested(t *testing.T) {
-	for _, enabled := range []bool{false, true} {
-		for _, item := range toolSnapshotFixtures() {
-			var source struct{ ID string }
-			if err := json.Unmarshal([]byte(item), &source); err != nil {
-				t.Fatal(err)
+func TestToolObservations(t *testing.T) {
+	for _, item := range toolSnapshotFixtures() {
+		var source struct{ ID string }
+		if err := json.Unmarshal([]byte(item), &source); err != nil {
+			t.Fatal(err)
+		}
+		t.Run(source.ID, func(t *testing.T) {
+			out := make(chan proto.Envelope, 4)
+			s := &Session{runID: "run", out: out, cancelCtx: context.Background(), bufs: NewItemBuffers(), cfg: defaultSessionConfig()}
+			s.setThreadID("private-thread")
+			s.onTurnStarted(json.RawMessage(`{"threadId":"private-thread","turn":{"id":"private-turn"}}`))
+			raw := json.RawMessage(`{"threadId":"private-thread","turnId":"private-turn","item":` + item + `}`)
+			s.onItemStarted(raw)
+			s.onItemCompleted(raw)
+			if len(out) != 2 {
+				t.Fatalf("tool event count changed: %d", len(out))
 			}
-			t.Run(source.ID, func(t *testing.T) {
-				out := make(chan proto.Envelope, 4)
-				s := &Session{runID: "run", observeToolObservations: enabled, out: out, cancelCtx: context.Background(), bufs: NewItemBuffers(), cfg: defaultSessionConfig()}
-				s.setThreadID("private-thread")
-				s.onTurnStarted(json.RawMessage(`{"threadId":"private-thread","turn":{"id":"private-turn"}}`))
-				raw := json.RawMessage(`{"threadId":"private-thread","turnId":"private-turn","item":` + item + `}`)
-				s.onItemStarted(raw)
-				s.onItemCompleted(raw)
-				if len(out) != 2 {
-					t.Fatalf("tool event count changed: %d", len(out))
+			for _, stage := range []string{"before", "after"} {
+				event := <-out
+				var tool proto.ToolCallPayload
+				if event.DecodePayload(&tool) != nil || event.Type != proto.TypeToolCall || tool.ID != source.ID || tool.Stage != stage {
+					t.Fatal(event)
 				}
-				for _, stage := range []string{"before", "after"} {
-					event := <-out
-					var tool proto.ToolCallPayload
-					if event.DecodePayload(&tool) != nil || event.Type != proto.TypeToolCall || tool.ID != source.ID || tool.Stage != stage {
-						t.Fatal(event)
-					}
-					if bytes.Contains(event.Payload, []byte("native_item")) {
-						t.Fatal("engine-specific snapshot escaped adapter")
-					}
-					if !enabled {
-						if tool.Observation != nil {
-							t.Fatal("unrequested observation")
-						}
-						continue
-					}
-					if tool.Observation == nil || stage == "before" && tool.Observation.Status != "in_progress" {
-						t.Fatal(tool.Observation)
-					}
-					if source.ID == "mcp" && !bytes.Contains(tool.Observation.Output, []byte("9007199254740993")) {
-						t.Fatal("structured output precision lost")
-					}
+				if bytes.Contains(event.Payload, []byte("native_item")) {
+					t.Fatal("engine-specific snapshot escaped adapter")
 				}
-			})
-		}
+				if tool.Observation == nil || stage == "before" && tool.Observation.Status != "in_progress" {
+					t.Fatal(tool.Observation)
+				}
+				if source.ID == "mcp" && !bytes.Contains(tool.Observation.Output, []byte("9007199254740993")) {
+					t.Fatal("structured output precision lost")
+				}
+			}
+		})
 	}
 }
diff --git a/apps/daemon/internal/agent/codex/skills.go b/apps/daemon/internal/agent/codex/skills.go
index 69994f5ee..f7bdfe04a 100644
--- a/apps/daemon/internal/agent/codex/skills.go
+++ b/apps/daemon/internal/agent/codex/skills.go
@@ -1,24 +1,6 @@
 package codex
 
-import (
-	"context"
-	"strings"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func effectiveAgentStateKey(req proto.PromptRequestPayload) string {
-	if strings.TrimSpace(req.AgentStateKey) != "" {
-		return req.AgentStateKey
-	}
-	if id := strings.TrimSpace(req.ConversationID); id != "" {
-		return "_legacy_conversation/" + id + "/codex"
-	}
-	if id := strings.TrimSpace(req.RunID); id != "" {
-		return "_legacy_run/" + id + "/codex"
-	}
-	return ""
-}
+import "context"
 
 func setSkillExtraRoots(ctx context.Context, rpc *JSONRPCClient, roots []string) error {
 	if len(roots) == 0 {
diff --git a/apps/daemon/internal/agent/codex/skills_test.go b/apps/daemon/internal/agent/codex/skills_test.go
index 1f90c574b..bc316eed9 100644
--- a/apps/daemon/internal/agent/codex/skills_test.go
+++ b/apps/daemon/internal/agent/codex/skills_test.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
 func TestSetSkillExtraRootsUsesCodexRPC(t *testing.T) {
@@ -40,13 +38,3 @@ func TestSetSkillExtraRootsUsesCodexRPC(t *testing.T) {
 		t.Fatalf("setSkillExtraRoots: %v", err)
 	}
 }
-
-func TestEffectiveAgentStateKeyFallsBackToConversation(t *testing.T) {
-	got := effectiveAgentStateKey(proto.PromptRequestPayload{
-		ConversationID: "conv-legacy",
-		RunID:          "run-ignored",
-	})
-	if got != "_legacy_conversation/conv-legacy/codex" {
-		t.Fatalf("state key = %q", got)
-	}
-}
diff --git a/apps/daemon/internal/agent/configuration_test.go b/apps/daemon/internal/agent/configuration_test.go
index 974f06824..a186755ce 100644
--- a/apps/daemon/internal/agent/configuration_test.go
+++ b/apps/daemon/internal/agent/configuration_test.go
@@ -30,11 +30,6 @@ func TestEveryRegistryEntryPreparesTheBoundModelConfiguration(t *testing.T) {
 		return nil, expected
 	})
 	configuration.Providers[0].Protocol = "anthropic"
-	copy, err := registry.Configuration("fixture")
-	if err != nil {
-		t.Fatal(err)
-	}
-	copy.Providers[0].Protocol = "anthropic"
 	factory, _ := registry.Resolve("fixture")
 	executor, _ := registry.ResolveExecutor("fixture")
 	preparation, _ := registry.ResolvePreparation("fixture")
@@ -63,9 +58,6 @@ func TestEveryRegistryEntryPreparesTheBoundModelConfiguration(t *testing.T) {
 	if calls != 3 {
 		t.Fatal("unexpected native calls", calls)
 	}
-	if _, err := registry.Configuration("missing"); err == nil {
-		t.Fatal("undeclared configuration inferred")
-	}
 }
 
 func TestRegistryRejectsInvalidConfigurationDeclaration(t *testing.T) {
diff --git a/apps/daemon/internal/agent/harness.go b/apps/daemon/internal/agent/harness.go
index 5ca1f91e6..427a83a58 100644
--- a/apps/daemon/internal/agent/harness.go
+++ b/apps/daemon/internal/agent/harness.go
@@ -291,8 +291,7 @@ func (r *Registry) RegisterExecutor(kind string, factory ExecutorFactory) {
 	r.kinds[kind] = info
 }
 
-// RegisterPreparation installs a separate execution-only path. Product factory
-// wrappers must not add authoring side effects to it.
+// RegisterPreparation installs a separate execution-only path.
 func (r *Registry) RegisterPreparation(kind string, workspaceRead bool, prepare PreparationFactory) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
diff --git a/apps/daemon/internal/agent/installroot/probe.go b/apps/daemon/internal/agent/installroot/probe.go
index b185c31bc..21f50ed47 100644
--- a/apps/daemon/internal/agent/installroot/probe.go
+++ b/apps/daemon/internal/agent/installroot/probe.go
@@ -14,7 +14,7 @@ import (
 func Probe(parent context.Context, binary string, args, env []string, dir string) (string, error) {
 	ctx, cancel := context.WithTimeout(parent, 25*time.Second)
 	defer cancel()
-	p, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: binary, Args: args, Env: env, Dir: dir, OwnProcessGroup: true, KillTimeout: 250 * time.Millisecond})
+	p, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: binary, Args: args, Env: env, Dir: dir, KillTimeout: 250 * time.Millisecond})
 	if err != nil {
 		return "", errors.New("native component failed to start")
 	}
diff --git a/apps/daemon/internal/agent/mcode/declaration.go b/apps/daemon/internal/agent/mcode/declaration.go
index 5a6682dbb..c97e57bea 100644
--- a/apps/daemon/internal/agent/mcode/declaration.go
+++ b/apps/daemon/internal/agent/mcode/declaration.go
@@ -18,7 +18,6 @@ var Declaration = agent.Declaration{Info: proto.SupportedAgentKind{Kind: "mcode"
 	Usage:                          proto.CapabilityUnsupported,
 	Resume:                         proto.CapabilitySupported,
 	NativeSessionRecovery:          proto.CapabilityUnsupported,
-	WorkspaceAuthoring:             proto.CapabilitySupported,
 	Steering:                       proto.CapabilityUnsupported,
 	MessageItems:                   proto.CapabilityUnsupported,
 	ToolObservations:               proto.CapabilityUnsupported,
@@ -78,7 +77,6 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, r
 		runtime.Executor = NewExecutorFactory(workspace)
 	}
 	if workspace != nil {
-		runtime.Info.Capabilities.WorkspaceAuthoring = proto.CapabilityUnsupported
 		runtime.Preparation = NewPreparationFactory(*workspace)
 		runtime.WorkspaceReadPreparation = true
 	}
diff --git a/apps/daemon/internal/agent/mcode/declaration_test.go b/apps/daemon/internal/agent/mcode/declaration_test.go
index 16ec2df71..ff2f74f16 100644
--- a/apps/daemon/internal/agent/mcode/declaration_test.go
+++ b/apps/daemon/internal/agent/mcode/declaration_test.go
@@ -35,7 +35,7 @@ func TestMCodeExecutionOptInIsVersionBound(t *testing.T) {
 
 // The declaration must retain the complete baseline capability descriptor.
 func TestDeclaredCapabilityBaseline(t *testing.T) {
-	expected := map[string]bool{"Streaming": true, "Permissions": true, "Resume": true, "WorkspaceAuthoring": true}
+	expected := map[string]bool{"Streaming": true, "Permissions": true, "Resume": true}
 	value := reflect.ValueOf(Declaration.Info.Capabilities)
 	for i := 0; i < value.NumField(); i++ {
 		name := value.Type().Field(i).Name
diff --git a/apps/daemon/internal/agent/mcode/environment_mcp_test.go b/apps/daemon/internal/agent/mcode/environment_mcp_test.go
index d4ccae14a..aa143e5aa 100644
--- a/apps/daemon/internal/agent/mcode/environment_mcp_test.go
+++ b/apps/daemon/internal/agent/mcode/environment_mcp_test.go
@@ -109,7 +109,6 @@ func TestEnvironmentMCPCancelSettlesPendingObservationBeforeDone(t *testing.T) {
 	c, req, _ := workspaceFixture(t)
 	c.Network, req.LocalEnvironment.NetworkAccess = "enabled", "enabled"
 	req.LocalEnvironment.MCP = []proto.EnvironmentMCP{environmentMCPFixture()}
-	req.ObserveToolObservations = true
 	script, err := os.ReadFile(c.Binary)
 	if err != nil {
 		t.Fatal(err)
diff --git a/apps/daemon/internal/agent/mcode/events.go b/apps/daemon/internal/agent/mcode/events.go
index 0b04ce6dd..97bd1f8cd 100644
--- a/apps/daemon/internal/agent/mcode/events.go
+++ b/apps/daemon/internal/agent/mcode/events.go
@@ -59,7 +59,7 @@ func (s *Session) emitTool(update toolUpdate) error {
 	if update.ID == "" || s.completedTools[update.ID] {
 		return nil
 	}
-	previous, started := s.tools[update.ID]
+	previous := s.tools[update.ID]
 	if update.Name == "" {
 		update.Name = previous.Name
 	}
@@ -69,21 +69,18 @@ func (s *Session) emitTool(update toolUpdate) error {
 	if update.RawInput == nil {
 		update.RawInput = previous.RawInput
 	}
-	if s.req.ObserveToolObservations {
-		update.mcp = previous.mcp
-		if update.mcp != nil && update.Name != previous.Name {
-			return fmt.Errorf("mcode: native MCP call identity changed")
-		}
-		if update.mcp == nil {
-			var err error
-			update.mcp, err = s.environmentMCPIdentity(update.Name)
-			if err != nil {
-				return err
-			}
+	update.mcp = previous.mcp
+	if update.mcp != nil && update.Name != previous.Name {
+		return fmt.Errorf("mcode: native MCP call identity changed")
+	}
+	if update.mcp == nil {
+		var err error
+		update.mcp, err = s.environmentMCPIdentity(update.Name)
+		if err != nil {
+			return err
 		}
-		started = previous.mcp != nil || workspaceToolObservation(previous, "before") != nil
 	}
-	if !started {
+	if previous.mcp == nil && workspaceToolObservation(previous, "before") == nil {
 		if err := s.emitToolStage(update, "before"); err != nil {
 			return err
 		}
diff --git a/apps/daemon/internal/agent/mcode/execution.go b/apps/daemon/internal/agent/mcode/execution.go
index 82dd3c9f8..bcb9e3902 100644
--- a/apps/daemon/internal/agent/mcode/execution.go
+++ b/apps/daemon/internal/agent/mcode/execution.go
@@ -7,7 +7,9 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-// SupportsExecution is an operator opt-in, separate from ordinary product availability.
+// SupportsExecution reports whether the daemon advertises MiniMax Code execution:
+// the operator sets OAC_RUNTIME_MCODE_AGENTS_API=1 and the native version is the
+// qualified one. Otherwise discovery reports only availability.
 func SupportsExecution(version string) bool {
 	return os.Getenv("OAC_RUNTIME_MCODE_AGENTS_API") == "1" && version == SupportedVersion
 }
@@ -27,9 +29,6 @@ func validateExecutionRequest(req proto.PromptRequestPayload) error {
 			return err
 		}
 	}
-	if req.AgentOptions["env"] != nil {
-		return fmt.Errorf("mcode: execution cannot import an environment")
-	}
 	return nil
 }
 
@@ -45,12 +44,8 @@ func configureTextExecution(config map[string]any) {
 // Harness children use the daemon user's ordinary environment.
 func executionEnvironment() []string { return os.Environ() }
 
-// ACP commands are only recognized for a single text block. Public input must
-// remain user text; ordinary product Sessions retain their native command behavior.
-func promptContent(text string, public bool) []map[string]string {
-	blocks := []map[string]string{{"type": "text", "text": text}}
-	if public {
-		blocks = append(blocks, map[string]string{"type": "text", "text": ""})
-	}
-	return blocks
+// ACP commands are only recognized for a single text block. A second, empty
+// block keeps public input as user text.
+func promptContent(text string) []map[string]string {
+	return []map[string]string{{"type": "text", "text": text}, {"type": "text", "text": ""}}
 }
diff --git a/apps/daemon/internal/agent/mcode/execution_test.go b/apps/daemon/internal/agent/mcode/execution_test.go
index 839c594ad..9f188f97f 100644
--- a/apps/daemon/internal/agent/mcode/execution_test.go
+++ b/apps/daemon/internal/agent/mcode/execution_test.go
@@ -10,15 +10,8 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func executionRequest(t *testing.T) proto.PromptRequestPayload {
-	r := testRequest(t)
-	r.StrictResume, r.ReleaseOnCompletion, r.DisableExecutionEnvironment, r.DisableSubagents = true, true, true, true
-	r.ExecutionControls = &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}
-	return r
-}
-
 func TestExecutionOptionsInheritUserEnvironment(t *testing.T) {
-	r := executionRequest(t)
+	r := testRequest(t)
 	t.Setenv("OAC_TEST_SECRET_CANARY", "secret")
 	t.Setenv("NODE_OPTIONS", "--import=untrusted")
 	opts, err := prepareOptions(r)
@@ -52,9 +45,8 @@ func TestExecutionRejectsUnqualifiedAuthority(t *testing.T) {
 		func(r *proto.PromptRequestPayload) { r.RequireExistingNativeSession = true },
 		func(r *proto.PromptRequestPayload) { r.FunctionTools = []proto.FunctionTool{{Name: "f"}} },
 		func(r *proto.PromptRequestPayload) { r.ExecutionControls.WebSearch = "enabled" },
-		func(r *proto.PromptRequestPayload) { r.AgentOptions["env"] = map[string]any{"X": "Y"} },
 	} {
-		r := executionRequest(t)
+		r := testRequest(t)
 		change(&r)
 		if _, err := prepareOptions(r); err == nil {
 			t.Fatal("unsupported execution accepted")
@@ -64,12 +56,9 @@ func TestExecutionRejectsUnqualifiedAuthority(t *testing.T) {
 
 func TestPublicTextDoesNotInvokeACPCommands(t *testing.T) {
 	for _, text := range []string{"/model", "/compact", "hello"} {
-		blocks := promptContent(text, true)
+		blocks := promptContent(text)
 		if len(blocks) != 2 || blocks[0]["text"] != text || blocks[1]["text"] != "" {
 			t.Fatal(blocks)
 		}
-		if blocks = promptContent(text, false); len(blocks) != 1 || blocks[0]["text"] != text {
-			t.Fatal("product prompt changed")
-		}
 	}
 }
diff --git a/apps/daemon/internal/agent/mcode/executor_native_test.go b/apps/daemon/internal/agent/mcode/executor_native_test.go
index e9dd4d9a3..96cae1889 100644
--- a/apps/daemon/internal/agent/mcode/executor_native_test.go
+++ b/apps/daemon/internal/agent/mcode/executor_native_test.go
@@ -28,7 +28,7 @@ func TestNativeMCodeExecutorReuse(t *testing.T) {
 	if err != nil {
 		t.Fatal("private provider options unavailable")
 	}
-	req := executionRequest(t)
+	req := testRequest(t)
 	req.ReleaseOnCompletion = false
 	req.RunID, req.Input, req.ConversationID = "", nil, ""
 	if json.Unmarshal(raw, &req.AgentOptions) != nil {
diff --git a/apps/daemon/internal/agent/mcode/executor_test.go b/apps/daemon/internal/agent/mcode/executor_test.go
index eeac6a0ce..fc78836d0 100644
--- a/apps/daemon/internal/agent/mcode/executor_test.go
+++ b/apps/daemon/internal/agent/mcode/executor_test.go
@@ -28,7 +28,7 @@ func executorFixture(t *testing.T, scenario string, workspace bool) (*executor,
 	if workspace {
 		factory = NewExecutorFactory(&config)
 	} else {
-		req = executionRequest(t)
+		req = testRequest(t)
 		req.ReleaseOnCompletion = false
 		req.RunID, req.Input, req.ConversationID = "", nil, ""
 		t.Setenv("OAC_RUNTIME_MCODE_BIN", config.Binary)
diff --git a/apps/daemon/internal/agent/mcode/executor_turn.go b/apps/daemon/internal/agent/mcode/executor_turn.go
index 3bf537374..1633f5f18 100644
--- a/apps/daemon/internal/agent/mcode/executor_turn.go
+++ b/apps/daemon/internal/agent/mcode/executor_turn.go
@@ -25,7 +25,7 @@ func (s *Session) runExecutorTurn() {
 	// Written steering requests retain their original receipt owner even after
 	// prompt completion. No successor starts until all callers have settled.
 	s.operations.Wait()
-	if s.req.StrictResume && !s.req.DisableSubagents && s.subagentHistoryReady {
+	if !s.req.DisableSubagents && s.subagentHistoryReady {
 		childErr := s.settleSubagents()
 		s.mu.Lock()
 		s.subagentSettlementError = childErr
@@ -82,7 +82,7 @@ func (s *Session) runExecutorTurn() {
 }
 
 func (s *Session) captureSubagentBaseline() error {
-	if !s.req.StrictResume || s.req.DisableSubagents {
+	if s.req.DisableSubagents {
 		return nil
 	}
 	snapshot, err := s.readSubagents(s.ctx)
@@ -135,7 +135,7 @@ func (s *Session) cancelTurn(ctx context.Context) error {
 		err = s.writeContext(ctx, rpcFrame{JSONRPC: "2.0", Method: "session/cancel", Params: raw})
 	}
 	if first {
-		if err == nil && s.req.StrictResume && !s.req.DisableSubagents {
+		if err == nil && !s.req.DisableSubagents {
 			err = s.stopSubagents(ctx)
 		}
 		if err != nil {
diff --git a/apps/daemon/internal/agent/mcode/mcp_observations_test.go b/apps/daemon/internal/agent/mcode/mcp_observations_test.go
index 1c790f731..61e090a6b 100644
--- a/apps/daemon/internal/agent/mcode/mcp_observations_test.go
+++ b/apps/daemon/internal/agent/mcode/mcp_observations_test.go
@@ -15,7 +15,7 @@ func mcpObservationSession(t *testing.T) (*Session, chan proto.Envelope) {
 	t.Helper()
 	out := make(chan proto.Envelope, 16)
 	s := &Session{ctx: context.Background(), opts: launchOptions{DataDir: t.TempDir()},
-		req: proto.PromptRequestPayload{RunID: "run", ObserveToolObservations: true,
+		req: proto.PromptRequestPayload{RunID: "run",
 			LocalEnvironment: &proto.LocalEnvironment{NetworkAccess: "enabled", MCP: []proto.EnvironmentMCP{environmentMCPFixture()}}},
 		out: out, tools: map[string]toolUpdate{}, completedTools: map[string]bool{}, active: true, sessionID: "native-session"}
 	if err := writeMCPRegistry(s.opts.DataDir, mcpRegistryEntry("proof.server", "proof_server_2", "read.status", "read_status_2")); err != nil {
diff --git a/apps/daemon/internal/agent/mcode/native_history_test.go b/apps/daemon/internal/agent/mcode/native_history_test.go
index 0106570cc..d49061554 100644
--- a/apps/daemon/internal/agent/mcode/native_history_test.go
+++ b/apps/daemon/internal/agent/mcode/native_history_test.go
@@ -24,7 +24,7 @@ func TestNativeMCodeHistoryIsolation(t *testing.T) {
 	}
 	for name, id := range map[string]string{"foreign": foreign, "missing": "00000000-0000-4000-8000-000000000000"} {
 		t.Run(name, func(t *testing.T) {
-			req := executionRequest(t)
+			req := testRequest(t)
 			if json.Unmarshal(raw, &req.AgentOptions) != nil {
 				t.Fatal("invalid private options")
 			}
diff --git a/apps/daemon/internal/agent/mcode/options.go b/apps/daemon/internal/agent/mcode/options.go
index 5714e401f..50926a7c8 100644
--- a/apps/daemon/internal/agent/mcode/options.go
+++ b/apps/daemon/internal/agent/mcode/options.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"strings"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
@@ -24,15 +23,13 @@ func prepareOptions(req proto.PromptRequestPayload) (launchOptions, error) {
 	if _, err := harnessconfiguration.Configuration().PrepareHarnessConfig(req.AgentOptions); err != nil {
 		return result, err
 	}
-	if req.StrictResume {
-		if err := validateExecutionRequest(req); err != nil {
-			return result, err
-		}
+	if err := validateExecutionRequest(req); err != nil {
+		return result, err
 	}
 	if req.Input.HasImages() {
 		return result, fmt.Errorf("mcode: ACP does not support attachments")
 	}
-	dataDir, err := agent.StateDir("mcode", req.AgentStateKey, req.ConversationID, req.RunID)
+	dataDir, err := agent.StateDir("mcode", req.AgentStateKey)
 	if err != nil {
 		return result, err
 	}
@@ -62,15 +59,13 @@ func prepareOptions(req proto.PromptRequestPayload) (launchOptions, error) {
 		return result, err
 	}
 	config["custom_provider"] = map[string]any{"oac": provider}
-	if req.StrictResume {
-		configureTextExecution(config)
-		if !req.DisableSubagents {
-			config["agents"] = map[string]any{"default": map[string]any{
-				"tools":        []string{"task", "task_append", "task_query", "task_output", "task_stop"},
-				"builtinTools": []string{"task", "task_append", "task_query", "task_output", "task_stop"}, "skills": []string{},
-				"features": map[string]bool{"mavis": false, "delegation": true, "webSearch": false},
-			}}
-		}
+	configureTextExecution(config)
+	if !req.DisableSubagents {
+		config["agents"] = map[string]any{"default": map[string]any{
+			"tools":        []string{"task", "task_append", "task_query", "task_output", "task_stop"},
+			"builtinTools": []string{"task", "task_append", "task_query", "task_output", "task_stop"}, "skills": []string{},
+			"features": map[string]bool{"mavis": false, "delegation": true, "webSearch": false},
+		}}
 	}
 	config["permissionMode"] = "auto"
 	data, err := json.Marshal(config)
@@ -80,36 +75,17 @@ func prepareOptions(req proto.PromptRequestPayload) (launchOptions, error) {
 	if err := os.WriteFile(filepath.Join(result.DataDir, "config.yaml"), data, 0o600); err != nil {
 		return result, err
 	}
-	result.Env = append([]string{}, os.Environ()...)
-	if req.StrictResume {
-		result.Env = append(executionEnvironment(), "OAC_RUNTIME_MCODE_TOOL_POLICY=protected-mcp-v1")
-		if err := os.WriteFile(filepath.Join(result.DataDir, "mcp.json"), []byte(`{"mcpServers":{}}`), 0o600); err != nil {
-			return result, err
-		}
-		if !req.DisableSubagents {
-			result.Env = append(result.Env, "OAC_RUNTIME_MCODE_MAX_SUBAGENTS="+strconv.Itoa(*req.MaxConcurrentSubagents))
-		} else {
-			result.Env = append(result.Env, "OAC_RUNTIME_MCODE_MAX_SUBAGENTS=0")
-		}
+	result.Env = append(executionEnvironment(), "OAC_RUNTIME_MCODE_TOOL_POLICY=protected-mcp-v1")
+	if err := os.WriteFile(filepath.Join(result.DataDir, "mcp.json"), []byte(`{"mcpServers":{}}`), 0o600); err != nil {
+		return result, err
 	}
-	if raw := opts["env"]; raw != nil && !req.StrictResume {
-		env, ok := raw.(map[string]any)
-		if !ok {
-			return result, fmt.Errorf("mcode: env must be an object")
-		}
-		for key, rawValue := range env {
-			value, ok := rawValue.(string)
-			if !ok || key == "" || strings.ContainsAny(key, "=\x00") || strings.ContainsRune(value, 0) {
-				return result, fmt.Errorf("mcode: invalid environment entry")
-			}
-			result.Env = append(result.Env, key+"="+value)
-		}
+	if !req.DisableSubagents {
+		result.Env = append(result.Env, "OAC_RUNTIME_MCODE_MAX_SUBAGENTS="+strconv.Itoa(*req.MaxConcurrentSubagents))
+	} else {
+		result.Env = append(result.Env, "OAC_RUNTIME_MCODE_MAX_SUBAGENTS=0")
 	}
 	// The adapter owns the native state location, including after cold resume.
-	result.Env = append(result.Env, "MINIMAX_DATA_DIR="+result.DataDir)
-	if req.StrictResume {
-		result.Env = append(result.Env, "HOME="+result.DataDir, "USERPROFILE="+result.DataDir)
-	}
+	result.Env = append(result.Env, "MINIMAX_DATA_DIR="+result.DataDir, "HOME="+result.DataDir, "USERPROFILE="+result.DataDir)
 	result.MCP = []map[string]any{}
 	return result, nil
 }
diff --git a/apps/daemon/internal/agent/mcode/options_test.go b/apps/daemon/internal/agent/mcode/options_test.go
index fa7fa94d2..e5d399ed1 100644
--- a/apps/daemon/internal/agent/mcode/options_test.go
+++ b/apps/daemon/internal/agent/mcode/options_test.go
@@ -11,8 +11,8 @@ import (
 )
 
 func TestOptionsRefreshManagedState(t *testing.T) {
+	t.Setenv("MINIMAX_DATA_DIR", "/wrong")
 	req := testRequest(t)
-	req.AgentOptions["env"] = map[string]any{"MINIMAX_DATA_DIR": "/wrong", "FIXTURE": "yes"}
 	opts, err := prepareOptions(req)
 	if err != nil {
 		t.Fatal(err)
@@ -20,7 +20,13 @@ func TestOptionsRefreshManagedState(t *testing.T) {
 	if !strings.HasPrefix(opts.Dir, os.Getenv("OAC_RUNTIME_HOME")+string(os.PathSeparator)) {
 		t.Fatalf("workdir escaped managed state: %s", opts.Dir)
 	}
-	if opts.Env[len(opts.Env)-1] != "MINIMAX_DATA_DIR="+opts.DataDir {
+	dataDir := ""
+	for _, entry := range opts.Env {
+		if value, ok := strings.CutPrefix(entry, "MINIMAX_DATA_DIR="); ok {
+			dataDir = value
+		}
+	}
+	if dataDir != opts.DataDir {
 		t.Fatal("state override did not win")
 	}
 	req.AgentOptions["system_prompt"] = ""
diff --git a/apps/daemon/internal/agent/mcode/preparation_test.go b/apps/daemon/internal/agent/mcode/preparation_test.go
index 93b095ee4..249129603 100644
--- a/apps/daemon/internal/agent/mcode/preparation_test.go
+++ b/apps/daemon/internal/agent/mcode/preparation_test.go
@@ -15,7 +15,7 @@ import (
 
 func workspaceFixture(t *testing.T) (WorkspaceConfig, proto.PromptRequestPayload, string) {
 	t.Helper()
-	r := executionRequest(t)
+	r := testRequest(t)
 	r.RunID, r.Input, r.ConversationID = "", nil, ""
 	r.DisableExecutionEnvironment = false
 	r.LocalEnvironment = &proto.LocalEnvironment{ID: "environment", NetworkAccess: "enabled", WorkspaceRoot: t.TempDir()}
diff --git a/apps/daemon/internal/agent/mcode/session.go b/apps/daemon/internal/agent/mcode/session.go
index cd32a2edf..741f9a3d9 100644
--- a/apps/daemon/internal/agent/mcode/session.go
+++ b/apps/daemon/internal/agent/mcode/session.go
@@ -80,7 +80,7 @@ func newSession(ctx context.Context, req proto.PromptRequestPayload, out chan<-
 }
 
 func launch(ctx context.Context, req proto.PromptRequestPayload, opts launchOptions, binary string, out chan<- proto.Envelope) (*Session, error) {
-	process, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: binary, Args: []string{"acp"}, Dir: opts.Dir, Env: opts.Env, NeedStdin: true, OwnProcessGroup: req.StrictResume})
+	process, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: binary, Args: []string{"acp"}, Dir: opts.Dir, Env: opts.Env, NeedStdin: true})
 	if err != nil {
 		return nil, err
 	}
@@ -104,7 +104,7 @@ func (s *Session) run() {
 	defer close(s.finished)
 	err := s.prepareNative()
 	if err == nil {
-		if s.req.StrictResume && !s.req.DisableSubagents {
+		if !s.req.DisableSubagents {
 			var snapshot nativeSubagentSnapshot
 			snapshot, err = s.readSubagents(s.ctx)
 			s.subagentHistoryReady = err == nil
@@ -121,7 +121,7 @@ func (s *Session) run() {
 	if err == nil {
 		err = s.executePrompt()
 	}
-	if s.req.StrictResume && !s.req.DisableSubagents && s.subagentHistoryReady && s.out != nil {
+	if !s.req.DisableSubagents && s.subagentHistoryReady && s.out != nil {
 		observationErr := s.settleSubagents()
 		s.mu.Lock()
 		s.subagentSettlementError = observationErr
@@ -174,7 +174,7 @@ func (s *Session) prepareNative() error {
 	if initialized.ProtocolVersion != 1 {
 		return fmt.Errorf("mcode: unsupported ACP protocol version %d", initialized.ProtocolVersion)
 	}
-	if s.req.StrictResume && !s.req.DisableSubagents && (initialized.Meta.Subagents.Version != 1 || initialized.Meta.Subagents.WorkspaceTools != "protected-mcp-v1" || s.req.MaxConcurrentSubagents == nil || initialized.Meta.Subagents.MaxConcurrent != *s.req.MaxConcurrentSubagents) {
+	if !s.req.DisableSubagents && (initialized.Meta.Subagents.Version != 1 || initialized.Meta.Subagents.WorkspaceTools != "protected-mcp-v1" || s.req.MaxConcurrentSubagents == nil || initialized.Meta.Subagents.MaxConcurrent != *s.req.MaxConcurrentSubagents) {
 		return fmt.Errorf("mcode: native Subagent admission is unavailable")
 	}
 	params := map[string]any{"cwd": s.opts.Dir, "mcpServers": s.opts.MCP}
@@ -221,7 +221,7 @@ func (s *Session) executePrompt() error {
 	var result struct {
 		StopReason string `json:"stopReason"`
 	}
-	err = s.call("session/prompt", map[string]any{"sessionId": s.sessionID, "prompt": promptContent(prompt, s.req.StrictResume)}, &result, true)
+	err = s.call("session/prompt", map[string]any{"sessionId": s.sessionID, "prompt": promptContent(prompt)}, &result, true)
 	s.active = false
 	s.mu.Lock()
 	s.steeringReady = false
@@ -360,16 +360,13 @@ func (s *Session) Cancel(ctx context.Context) error {
 	if s.executor != nil {
 		return s.cancelTurn(ctx)
 	}
-	if s.req.StrictResume && !s.req.DisableSubagents {
+	if !s.req.DisableSubagents {
 		if err := s.cancelSubagents(ctx); err != nil {
 			s.process.Cancel()
 			return err
 		}
 	}
 	s.process.Cancel()
-	if !s.req.StrictResume {
-		return nil
-	}
 	select {
 	case <-s.exited:
 	case <-ctx.Done():
diff --git a/apps/daemon/internal/agent/mcode/session_test.go b/apps/daemon/internal/agent/mcode/session_test.go
index f2af87a50..ad506fedb 100644
--- a/apps/daemon/internal/agent/mcode/session_test.go
+++ b/apps/daemon/internal/agent/mcode/session_test.go
@@ -20,15 +20,12 @@ func testRequest(t *testing.T) proto.PromptRequestPayload {
 	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
 	return proto.PromptRequestPayload{RunID: "run-1", ConversationID: "conversation-1", AgentStateKey: "conversation-1/agent-1/mcode", Input: proto.TextInput("Hello"), AgentOptions: map[string]any{
 		"model": "fixture", "model_provider": map[string]any{"protocol": "anthropic", "base_url": "https://provider.example/v1", "api_key": "fixture-key", "context_window": 64000, "max_output_tokens": 4096}, "system_prompt": "Current instructions",
-	}}
+	}, ReleaseOnCompletion: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
 }
 
 func helperSession(t *testing.T, scenario string, resume bool) (*Session, <-chan proto.Envelope) {
 	t.Helper()
 	req := testRequest(t)
-	if scenario == "strict-cancel" {
-		req = executionRequest(t)
-	}
 	if resume {
 		req.AgentSessionID = "native-1"
 	}
@@ -272,7 +269,7 @@ func TestMCodeProcess(t *testing.T) {
 				Prompt []map[string]string `json:"prompt"`
 			}
 			_ = json.Unmarshal(frame.Params, &input)
-			if strict := scenario == "strict-cancel" || (strings.HasPrefix(scenario, "prepared") || strings.HasPrefix(scenario, "executor")); (strict && len(input.Prompt) != 2) || (!strict && len(input.Prompt) != 1) {
+			if len(input.Prompt) != 2 {
 				os.Exit(9)
 			}
 			if strings.HasPrefix(scenario, "executor") {
@@ -286,7 +283,7 @@ func TestMCodeProcess(t *testing.T) {
 					continue
 				}
 				update("agent_message_chunk", map[string]any{"content": map[string]string{"type": "text", "text": input.Prompt[0]["text"]}})
-				update("tool_call", map[string]any{"toolCallId": "repeated-call", "name": "Read", "status": "in_progress", "rawInput": map[string]any{}})
+				update("tool_call", map[string]any{"toolCallId": "repeated-call", "name": "mcp__oac_workspace__workspace_bash", "status": "in_progress", "rawInput": map[string]any{"command": "true"}})
 				update("tool_call_update", map[string]any{"toolCallId": "repeated-call", "status": "completed"})
 				raw, _ := json.Marshal(map[string]string{"stopReason": "end_turn"})
 				send(rpcFrame{JSONRPC: "2.0", ID: frame.ID, Result: raw})
@@ -302,7 +299,7 @@ func TestMCodeProcess(t *testing.T) {
 				update("tool_call", map[string]any{"toolCallId": "native-call", "name": "mcp__proof_server__read_status", "status": "in_progress", "rawInput": map[string]any{}})
 				continue
 			}
-			if scenario == "steering" || scenario == "steer-rejected" || scenario == "steer-lost" || scenario == "strict-cancel" {
+			if scenario == "steering" || scenario == "steer-rejected" || scenario == "steer-lost" || scenario == "cancel-wait" {
 				promptID = frame.ID
 				update("agent_message_chunk", map[string]any{"content": map[string]string{"type": "text", "text": "ready"}})
 				continue
@@ -325,7 +322,7 @@ func TestMCodeProcess(t *testing.T) {
 			}
 			update("agent_message_chunk", map[string]any{"content": map[string]string{"type": "text", "text": "Hello "}})
 			update("agent_message_chunk", map[string]any{"content": map[string]string{"type": "text", "text": "world"}})
-			update("tool_call", map[string]any{"toolCallId": "tool-1", "name": "Read", "status": "in_progress", "rawInput": map[string]any{"path": "fixture.txt"}})
+			update("tool_call", map[string]any{"toolCallId": "tool-1", "name": "mcp__oac_workspace__workspace_bash", "status": "in_progress", "rawInput": map[string]any{"command": "cat fixture.txt"}})
 			for range 2 {
 				update("tool_call_update", map[string]any{"toolCallId": "tool-1", "status": "completed", "rawOutput": "fixture"})
 			}
diff --git a/apps/daemon/internal/agent/mcode/steering_test.go b/apps/daemon/internal/agent/mcode/steering_test.go
index 2c4cc517a..1ecdb5af1 100644
--- a/apps/daemon/internal/agent/mcode/steering_test.go
+++ b/apps/daemon/internal/agent/mcode/steering_test.go
@@ -85,7 +85,7 @@ func TestTerminalFollowsAllNativeFrames(t *testing.T) {
 }
 
 func TestExecutionCancellationWaitsForOutputAndProcess(t *testing.T) {
-	s, out := helperSession(t, "strict-cancel", false)
+	s, out := helperSession(t, "cancel-wait", false)
 	ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
 	defer cancel()
 	select {
diff --git a/apps/daemon/internal/agent/mcode/tool_observations.go b/apps/daemon/internal/agent/mcode/tool_observations.go
index 7f6ba9f9c..1dbd6d643 100644
--- a/apps/daemon/internal/agent/mcode/tool_observations.go
+++ b/apps/daemon/internal/agent/mcode/tool_observations.go
@@ -11,20 +11,18 @@ func (s *Session) emitToolStage(update toolUpdate, stage string) error {
 	if stage == "after" {
 		payload.Result = map[string]any{"output": update.RawOutput, "status": update.Status}
 	}
-	if s.req.ObserveToolObservations {
-		payload.Observation = workspaceToolObservation(update, stage)
-		if payload.Observation == nil {
-			var err error
-			payload.Observation, err = environmentMCPObservation(update, stage)
-			if err != nil {
-				return err
-			}
-		}
-		// Native task/skill bookkeeping has no qualified public item mapping.
-		if payload.Observation == nil {
-			return nil
+	payload.Observation = workspaceToolObservation(update, stage)
+	if payload.Observation == nil {
+		var err error
+		payload.Observation, err = environmentMCPObservation(update, stage)
+		if err != nil {
+			return err
 		}
 	}
+	// Native task/skill bookkeeping has no qualified public item mapping.
+	if payload.Observation == nil {
+		return nil
+	}
 	s.emit(proto.TypeToolCall, payload)
 	return nil
 }
diff --git a/apps/daemon/internal/agent/mcode/tool_observations_test.go b/apps/daemon/internal/agent/mcode/tool_observations_test.go
index e9011d503..c7d1fa6da 100644
--- a/apps/daemon/internal/agent/mcode/tool_observations_test.go
+++ b/apps/daemon/internal/agent/mcode/tool_observations_test.go
@@ -12,7 +12,7 @@ func TestWorkspaceCommandObservationsWaitForArgumentsAndRetainOutcome(t *testing
 	for _, status := range []string{"completed", "failed"} {
 		t.Run(status, func(t *testing.T) {
 			out := make(chan proto.Envelope, 8)
-			s := &Session{ctx: context.Background(), req: proto.PromptRequestPayload{RunID: "run", ObserveToolObservations: true}, out: out, tools: map[string]toolUpdate{}, completedTools: map[string]bool{}}
+			s := &Session{ctx: context.Background(), req: proto.PromptRequestPayload{RunID: "run"}, out: out, tools: map[string]toolUpdate{}, completedTools: map[string]bool{}}
 			s.emitTool(toolUpdate{ID: "call", Name: "mcp__oac_workspace__workspace_bash"})
 			if len(out) != 0 {
 				t.Fatal("command item emitted before native arguments")
diff --git a/apps/daemon/internal/agent/mcode/workspace.go b/apps/daemon/internal/agent/mcode/workspace.go
index 7fdf2d3fd..5b913e4ac 100644
--- a/apps/daemon/internal/agent/mcode/workspace.go
+++ b/apps/daemon/internal/agent/mcode/workspace.go
@@ -53,7 +53,7 @@ func prepareWorkspaceOptions(c WorkspaceConfig, req proto.PromptRequestPayload)
 	if c.Network != "enabled" || len(c.AllowedDomains) != 0 {
 		return launchOptions{}, fmt.Errorf("mcode: Runtime does not implement network isolation")
 	}
-	if !req.StrictResume || req.LocalEnvironment == nil || req.LocalEnvironment.WorkspaceRoot != c.Directory || req.DisableExecutionEnvironment || !(agentnetwork.Policy{Access: c.Network, AllowedDomains: c.AllowedDomains}).Equal(agentnetwork.Policy{Access: req.LocalEnvironment.NetworkAccess, AllowedDomains: req.LocalEnvironment.AllowedDomains}) || req.WorkspaceReadOnly {
+	if req.LocalEnvironment == nil || req.LocalEnvironment.WorkspaceRoot != c.Directory || req.DisableExecutionEnvironment || !(agentnetwork.Policy{Access: c.Network, AllowedDomains: c.AllowedDomains}).Equal(agentnetwork.Policy{Access: req.LocalEnvironment.NetworkAccess, AllowedDomains: req.LocalEnvironment.AllowedDomains}) || req.WorkspaceReadOnly {
 		return launchOptions{}, fmt.Errorf("mcode: execution does not match the dedicated workspace")
 	}
 	servers, err := runtimeMCP(req)
diff --git a/apps/daemon/internal/agent/mcode/workspace_readiness.go b/apps/daemon/internal/agent/mcode/workspace_readiness.go
index b730745b4..7f44d672a 100644
--- a/apps/daemon/internal/agent/mcode/workspace_readiness.go
+++ b/apps/daemon/internal/agent/mcode/workspace_readiness.go
@@ -16,7 +16,7 @@ import (
 func CheckWorkspace(ctx context.Context, c WorkspaceConfig) error {
 	ctx, cancel := context.WithTimeout(ctx, 15*time.Second)
 	defer cancel()
-	p, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: c.Node, Args: []string{filepath.Join(filepath.Dir(c.Bridge), "check.mjs")}, Env: executionEnvironment(), OwnProcessGroup: true})
+	p, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: c.Node, Args: []string{filepath.Join(filepath.Dir(c.Bridge), "check.mjs")}, Env: executionEnvironment()})
 	if err != nil {
 		return err
 	}
diff --git a/apps/daemon/internal/agent/registry.go b/apps/daemon/internal/agent/registry.go
index 4c6b5e815..6584fb751 100644
--- a/apps/daemon/internal/agent/registry.go
+++ b/apps/daemon/internal/agent/registry.go
@@ -107,15 +107,3 @@ func (r *Registry) ResolvePreparation(kind string) (PreparationFactory, error) {
 	}
 	return f, nil
 }
-
-// Configuration returns an owned declaration for registry wrappers. Wrappers
-// transfer it with the factory; they must not infer configuration from kind names.
-func (r *Registry) Configuration(kind string) (harnessconfig.Configuration, error) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	configuration, ok := r.configurations[kind]
-	if !ok {
-		return harnessconfig.Configuration{}, ErrUnsupportedKind
-	}
-	return configuration.Clone(), nil
-}
diff --git a/apps/daemon/internal/agent/runtime_paths.go b/apps/daemon/internal/agent/runtime_paths.go
index 0ad41e2f0..456231282 100644
--- a/apps/daemon/internal/agent/runtime_paths.go
+++ b/apps/daemon/internal/agent/runtime_paths.go
@@ -10,7 +10,7 @@ import (
 
 // StateDir returns an adapter-owned state directory scoped to one agent
 // state. It never derives runtime state from the subprocess cwd.
-func StateDir(agentKind, agentStateKey, conversationID, runID string) (string, error) {
+func StateDir(agentKind, agentStateKey string) (string, error) {
 	root, err := paths.Root()
 	if err != nil {
 		return "", fmt.Errorf("agent: resolve state directory: %w", err)
@@ -19,21 +19,11 @@ func StateDir(agentKind, agentStateKey, conversationID, runID string) (string, e
 	if kind == "" {
 		return "", fmt.Errorf("agent: invalid agent kind %q", agentKind)
 	}
-	base := filepath.Join(root, "runtime", kind)
-	if key := strings.TrimSpace(agentStateKey); key != "" {
-		parts := safeRuntimePathParts(key)
-		if len(parts) == 0 {
-			return "", fmt.Errorf("agent: invalid agent state key %q", agentStateKey)
-		}
-		return filepath.Join(append([]string{base, "state"}, parts...)...), nil
-	}
-	if id := safeRuntimePathPart(conversationID); id != "" {
-		return filepath.Join(base, "conv-"+id), nil
-	}
-	if id := safeRuntimePathPart(runID); id != "" {
-		return filepath.Join(base, "run-"+id), nil
+	parts := safeRuntimePathParts(agentStateKey)
+	if len(parts) == 0 {
+		return "", fmt.Errorf("agent: invalid agent state key %q", agentStateKey)
 	}
-	return "", fmt.Errorf("agent: agent state key, conversation id, or run id is required")
+	return filepath.Join(append([]string{root, "runtime", kind, "state"}, parts...)...), nil
 }
 
 func safeRuntimePathParts(value string) []string {
diff --git a/apps/daemon/internal/agent/runtime_paths_test.go b/apps/daemon/internal/agent/runtime_paths_test.go
index 2cc51981a..3e98c1792 100644
--- a/apps/daemon/internal/agent/runtime_paths_test.go
+++ b/apps/daemon/internal/agent/runtime_paths_test.go
@@ -8,7 +8,7 @@ import (
 func TestStateDirUsesStableAgentState(t *testing.T) {
 	home := t.TempDir()
 	t.Setenv("OAC_RUNTIME_HOME", home)
-	got, err := StateDir("codex", "conv-1/agent-1/codex", "ignored", "ignored")
+	got, err := StateDir("codex", "conv-1/agent-1/codex")
 	if err != nil {
 		t.Fatalf("StateDir: %v", err)
 	}
@@ -18,15 +18,16 @@ func TestStateDirUsesStableAgentState(t *testing.T) {
 	}
 }
 
-func TestStateDirSanitizesFallback(t *testing.T) {
+func TestStateDirRequiresAgentState(t *testing.T) {
 	home := t.TempDir()
 	t.Setenv("OAC_RUNTIME_HOME", home)
-	got, err := StateDir("fake_beta", "", "../conv name", "ignored")
-	if err != nil {
-		t.Fatalf("StateDir: %v", err)
+	for _, key := range []string{"", " ", "../.."} {
+		if _, err := StateDir("codex", key); err == nil {
+			t.Fatalf("state key %q accepted", key)
+		}
 	}
-	want := filepath.Join(home, "runtime", "fake_beta", "conv-.._conv_name")
-	if got != want {
-		t.Fatalf("root = %q, want %q", got, want)
+	got, err := StateDir("codex", "../session-1/a b")
+	if want := filepath.Join(home, "runtime", "codex", "state", "session-1", "a_b"); err != nil || got != want {
+		t.Fatalf("sanitized state = %q, %v; want %q", got, err, want)
 	}
 }
diff --git a/apps/daemon/internal/authoring/bridge.go b/apps/daemon/internal/authoring/bridge.go
deleted file mode 100644
index 519165fda..000000000
--- a/apps/daemon/internal/authoring/bridge.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package authoring
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/google/uuid"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-type Sender interface {
-	Send(context.Context, proto.Envelope) error
-}
-
-type Bridge struct {
-	sender  Sender
-	mu      sync.Mutex
-	waiters map[string]waiter
-}
-
-type waiter struct {
-	runID    string
-	response chan proto.AuthoringResponsePayload
-}
-
-func New(sender Sender) *Bridge {
-	return &Bridge{sender: sender, waiters: make(map[string]waiter)}
-}
-
-// Deliver only resolves the matching request from the same active run.
-func (b *Bridge) Deliver(env proto.Envelope) {
-	var response proto.AuthoringResponsePayload
-	if env.DecodePayload(&response) != nil {
-		return
-	}
-	b.mu.Lock()
-	w, ok := b.waiters[response.RequestID]
-	b.mu.Unlock()
-	if ok && w.runID == env.ID {
-		select {
-		case w.response <- response:
-		default:
-		}
-	}
-}
-
-func (b *Bridge) request(ctx context.Context, runID string, request proto.AuthoringRequestPayload) (proto.AuthoringResponsePayload, error) {
-	request.RequestID = uuid.NewString()
-	w := waiter{runID: runID, response: make(chan proto.AuthoringResponsePayload, 1)}
-	b.mu.Lock()
-	b.waiters[request.RequestID] = w
-	b.mu.Unlock()
-	defer func() { b.mu.Lock(); delete(b.waiters, request.RequestID); b.mu.Unlock() }()
-	env, err := proto.NewEnvelope(proto.TypeAuthoringRequest, runID, request)
-	if err != nil {
-		return proto.AuthoringResponsePayload{}, err
-	}
-	if err := b.sender.Send(ctx, env); err != nil {
-		return proto.AuthoringResponsePayload{}, err
-	}
-	select {
-	case response := <-w.response:
-		return response, nil
-	case <-ctx.Done():
-		return proto.AuthoringResponsePayload{}, ctx.Err()
-	}
-}
-
-func (b *Bridge) Listen(parent context.Context, runID string) (string, func(), error) {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return "", nil, err
-	}
-	dir := filepath.Join(home, ".oac", "authoring")
-	if err := os.MkdirAll(dir, 0o700); err != nil {
-		return "", nil, err
-	}
-	path := filepath.Join(dir, uuid.NewString()[:8]+".sock")
-	listener, err := net.Listen("unix", path)
-	if err != nil {
-		return "", nil, fmt.Errorf("open daemon authoring socket: %w", err)
-	}
-	if err := os.Chmod(path, 0o600); err != nil {
-		_ = listener.Close()
-		return "", nil, err
-	}
-	ctx, cancel := context.WithCancel(parent)
-	stop := context.AfterFunc(ctx, func() { _ = listener.Close() })
-	closeListener := func() { cancel(); stop(); _ = listener.Close() }
-	go func() {
-		defer closeListener()
-		for {
-			conn, err := listener.Accept()
-			if err != nil {
-				return
-			}
-			go b.serve(ctx, runID, conn)
-		}
-	}()
-	return path, closeListener, nil
-}
-
-func (b *Bridge) serve(parent context.Context, runID string, conn net.Conn) {
-	defer func() { _ = conn.Close() }()
-	ctx, cancel := context.WithTimeout(parent, 30*time.Second)
-	defer cancel()
-	stop := context.AfterFunc(ctx, func() { _ = conn.Close() })
-	defer stop()
-	_ = conn.SetDeadline(time.Now().Add(30 * time.Second))
-	var request proto.AuthoringRequestPayload
-	decoder := json.NewDecoder(io.LimitReader(conn, proto.AuthoringMaxBytes+1))
-	decoder.DisallowUnknownFields()
-	err := decoder.Decode(&request)
-	if err == nil && decoder.InputOffset() > proto.AuthoringMaxBytes {
-		err = errors.New("authoring request is too large")
-	}
-	var response proto.AuthoringResponsePayload
-	if err == nil {
-		response, err = b.request(ctx, runID, request)
-	}
-	if err != nil {
-		response.Error = err.Error()
-	}
-	_ = json.NewEncoder(conn).Encode(response)
-}
diff --git a/apps/daemon/internal/authoring/bridge_test.go b/apps/daemon/internal/authoring/bridge_test.go
deleted file mode 100644
index 17056693d..000000000
--- a/apps/daemon/internal/authoring/bridge_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-package authoring
-
-import (
-	"context"
-	"encoding/json"
-	"net"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-type testSender struct{ frames chan proto.Envelope }
-
-func (s testSender) Send(ctx context.Context, env proto.Envelope) error {
-	select {
-	case s.frames <- env:
-		return nil
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-}
-
-func TestBridgeUsesRunAttributionAndClosesAccess(t *testing.T) {
-	home, err := os.MkdirTemp("/tmp", "pa-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(home)
-	t.Setenv("HOME", home)
-	sender := testSender{frames: make(chan proto.Envelope, 1)}
-	b := New(sender)
-	path, release, err := b.Listen(t.Context(), "run-a")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer release()
-	if filepath.Dir(path) != filepath.Join(home, ".oac", "authoring") {
-		t.Fatal("socket outside OpenAgentCore state")
-	}
-	if info, err := os.Stat(path); err != nil || info.Mode().Perm() != 0o600 {
-		t.Fatalf("socket permissions: %v %v", info, err)
-	}
-	conn, err := net.Dial("unix", path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer conn.Close()
-	_ = conn.SetDeadline(time.Now().Add(3 * time.Second))
-	if err := json.NewEncoder(conn).Encode(proto.AuthoringRequestPayload{RequestID: "client-supplied", Operation: proto.AuthoringContext}); err != nil {
-		t.Fatal(err)
-	}
-	var frame proto.Envelope
-	select {
-	case frame = <-sender.frames:
-	case <-time.After(time.Second):
-		t.Fatal("request not forwarded")
-	}
-	var request proto.AuthoringRequestPayload
-	if frame.DecodePayload(&request) != nil || frame.ID != "run-a" || request.RequestID == "client-supplied" || frame.Type != proto.TypeAuthoringRequest {
-		t.Fatalf("wrong attribution: %+v", frame)
-	}
-	wrong, _ := proto.NewEnvelope(proto.TypeAuthoringResponse, "run-b", proto.AuthoringResponsePayload{RequestID: request.RequestID, Data: json.RawMessage(`"wrong"`)})
-	b.Deliver(wrong)
-	good, _ := proto.NewEnvelope(proto.TypeAuthoringResponse, "run-a", proto.AuthoringResponsePayload{RequestID: request.RequestID, Data: json.RawMessage(`"right"`)})
-	b.Deliver(good)
-	var response proto.AuthoringResponsePayload
-	if err := json.NewDecoder(conn).Decode(&response); err != nil {
-		t.Fatal(err)
-	}
-	if string(response.Data) != `"right"` {
-		t.Fatalf("wrong response: %+v", response)
-	}
-	release()
-	if _, err := net.DialTimeout("unix", path, time.Second); err == nil {
-		t.Fatal("completed run still accepts commands")
-	}
-}
-
-func TestBridgeCancellationClearsWaiters(t *testing.T) {
-	sender := testSender{frames: make(chan proto.Envelope, 1)}
-	b := New(sender)
-	ctx, cancel := context.WithCancel(t.Context())
-	done := make(chan error, 1)
-	go func() {
-		_, err := b.request(ctx, "run", proto.AuthoringRequestPayload{Operation: proto.AuthoringSkillList})
-		done <- err
-	}()
-	<-sender.frames
-	cancel()
-	select {
-	case err := <-done:
-		if err == nil {
-			t.Fatal("cancelled request succeeded")
-		}
-	case <-time.After(time.Second):
-		t.Fatal("cancelled request remained blocked")
-	}
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	if len(b.waiters) != 0 {
-		t.Fatal("waiter retained after cancellation")
-	}
-}
diff --git a/apps/daemon/internal/cli/authoring.go b/apps/daemon/internal/cli/authoring.go
deleted file mode 100644
index 6b3b26956..000000000
--- a/apps/daemon/internal/cli/authoring.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package cli
-
-import (
-	"context"
-	"maps"
-	"os"
-	"path/filepath"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/authoring"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func withAuthoringBridge(factory agent.Factory, bridge *authoring.Bridge) agent.Factory {
-	return func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		if !req.WorkspaceAuthoring {
-			return factory(ctx, req, out)
-		}
-		path, release, err := bridge.Listen(ctx, req.RunID)
-		if err != nil {
-			return nil, err
-		}
-		req.AgentOptions = maps.Clone(req.AgentOptions)
-		if req.AgentOptions == nil {
-			req.AgentOptions = make(map[string]any)
-		}
-		env, _ := req.AgentOptions["env"].(map[string]any)
-		env = maps.Clone(env)
-		if env == nil {
-			env = make(map[string]any)
-		}
-		env[proto.AuthoringSocketEnv] = path
-		if executable, err := os.Executable(); err == nil {
-			addCompanionCLIPath(env, filepath.Dir(executable))
-		}
-		req.AgentOptions["env"] = env
-		upstream := make(chan proto.Envelope, 64)
-		session, err := factory(ctx, req, upstream)
-		if err != nil {
-			release()
-			return nil, err
-		}
-		go func() {
-			defer close(out)
-			defer release()
-			for event := range upstream {
-				if event.Type == proto.TypeDone {
-					release()
-				}
-				out <- event
-			}
-		}()
-		return session, nil
-	}
-}
-
-func authoringRegistry(registry *agent.Registry, bridge *authoring.Bridge) *agent.Registry {
-	wrapped := agent.NewRegistry()
-	for _, info := range registry.SupportedAgentKinds() {
-		factory, _ := registry.Resolve(info.Kind)
-		if info.Capabilities.WorkspaceAuthoring.IsSupported() {
-			factory = withAuthoringBridge(factory, bridge)
-		}
-		configuration, err := registry.Configuration(info.Kind)
-		if err != nil {
-			panic(err)
-		}
-		wrapped.RegisterKind(info, configuration, factory)
-		if executor, err := registry.ResolveExecutor(info.Kind); err == nil {
-			wrapped.RegisterExecutor(info.Kind, executor)
-		}
-		if prepare, err := registry.ResolvePreparation(info.Kind); err == nil {
-			wrapped.RegisterPreparation(info.Kind, info.Capabilities.WorkspaceReadPreparation.IsSupported(), prepare)
-		}
-	}
-	return wrapped
-}
diff --git a/apps/daemon/internal/cli/authoring_test.go b/apps/daemon/internal/cli/authoring_test.go
deleted file mode 100644
index 709109256..000000000
--- a/apps/daemon/internal/cli/authoring_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package cli
-
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
-import (
-	"context"
-	"errors"
-	"net"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/authoring"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
-)
-
-func TestAuthoringSocketEndsWithTurnWhileSessionIsRetained(t *testing.T) {
-	home, err := os.MkdirTemp("/tmp", "pa-wrap-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(home)
-	t.Setenv("HOME", home)
-	env := map[string]any{"MODEL_KEY": "preserved"}
-	var path string
-	var events chan<- proto.Envelope
-	factory := withAuthoringBridge(func(_ context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		injected := req.AgentOptions["env"].(map[string]any)
-		path, _ = injected[proto.AuthoringSocketEnv].(string)
-		if path == "" || injected["MODEL_KEY"] != "preserved" {
-			t.Fatal("missing per-run context")
-		}
-		events = out
-		return nil, nil
-	}, authoring.New(nil))
-	out := make(chan proto.Envelope, 1)
-	_, err = factory(t.Context(), proto.PromptRequestPayload{RunID: "run", WorkspaceAuthoring: true, AgentOptions: map[string]any{"env": env}}, out)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, exists := env[proto.AuthoringSocketEnv]; exists {
-		t.Fatal("mutated caller environment")
-	}
-	if _, err := os.Stat(path); err != nil {
-		t.Fatal(err)
-	}
-	done, _ := proto.NewEnvelope(proto.TypeDone, "run", proto.DonePayload{})
-	events <- done
-	select {
-	case <-out:
-	case <-time.After(time.Second):
-		t.Fatal("terminal event blocked")
-	}
-	if conn, err := net.DialTimeout("unix", path, time.Second); err == nil {
-		_ = conn.Close()
-		t.Fatal("authoring remained available after done")
-	}
-	close(events)
-}
-
-func TestAuthoringRegistryRequiresExplicitCapability(t *testing.T) {
-	root, err := os.MkdirTemp("/tmp", "pa-opt-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(root)
-	t.Setenv("OAC_RUNTIME_HOME", root)
-	for _, optIn := range []bool{false, true} {
-		reg := agent.NewRegistry()
-		called := false
-		stop := errors.New("controlled factory stop")
-		out := make(chan proto.Envelope, 1)
-		reg.RegisterKind(proto.SupportedAgentKind{Kind: "engine", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{WorkspaceAuthoring: proto.CapabilityFromBool(optIn)})}, harnessconfig.Configuration{}, func(_ context.Context, req proto.PromptRequestPayload, events chan<- proto.Envelope) (agent.Session, error) {
-			called = true
-			env, _ := req.AgentOptions["env"].(map[string]any)
-			socket, _ := env[proto.AuthoringSocketEnv].(string)
-			if (socket != "") != optIn {
-				t.Fatal("authoring capability was not respected")
-			}
-			if optIn {
-				if _, err := os.Stat(socket); err != nil {
-					t.Fatal(err)
-				}
-			} else if events != out {
-				t.Fatal("non-product event channel was wrapped")
-			}
-			return nil, stop
-		})
-		wrapped := authoringRegistry(reg, authoring.New(nil))
-		factory, err := wrapped.Resolve("engine")
-		if err != nil {
-			t.Fatal(err)
-		}
-		_, err = factory(t.Context(), proto.PromptRequestPayload{RunID: "run", WorkspaceAuthoring: true}, out)
-		if !called || !errors.Is(err, stop) {
-			t.Fatal("registered factory was not preserved", err)
-		}
-	}
-}
diff --git a/apps/daemon/internal/cli/claude_sdk_live_linux_test.go b/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
index 3b8a14647..43a162377 100644
--- a/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
+++ b/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/authoring"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/dispatch"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/google/uuid"
@@ -73,7 +72,6 @@ func TestLiveRegisteredClaudeSDK(t *testing.T) {
 		t.Helper()
 		reg := agent.NewRegistry()
 		registerAgentKinds(reg, discovery)
-		reg = authoringRegistry(reg, authoring.New(nil))
 		sender := make(registeredSDKSender, 256)
 		router, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender})
 		if err != nil {
@@ -89,7 +87,7 @@ func TestLiveRegisteredClaudeSDK(t *testing.T) {
 		ctx, cancel := context.WithTimeout(t.Context(), 120*time.Second)
 		defer cancel()
 		id := uuid.NewString()
-		request := proto.PromptRequestPayload{RunID: id, AgentKind: "claude_sdk", Input: proto.TextInput(prompt), AgentStateKey: "registered-acceptance", AgentSessionID: resume, StrictResume: true, ReleaseOnCompletion: true, ObserveMessages: true, ObserveToolObservations: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": nil}}
+		request := proto.PromptRequestPayload{RunID: id, AgentKind: "claude_sdk", Input: proto.TextInput(prompt), AgentStateKey: "registered-acceptance", AgentSessionID: resume, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": nil}}
 		if callFunction {
 			request.FunctionTools = []proto.FunctionTool{{Name: "lookup", Description: "Return a verification value.", Parameters: json.RawMessage(`{"type":"object","properties":{"id":{"type":"string"}},"required":["id"],"additionalProperties":false}`)}}
 		}
@@ -182,7 +180,7 @@ func TestLiveRegisteredClaudeSDK(t *testing.T) {
 	if third.Outcome.Metadata[proto.DoneMetaAgentSessionID] != id || !strings.Contains(third.Outcome.Content, nonce) {
 		t.Fatal("registered cold continuation lost identity or history")
 	}
-	data, _ := json.MarshalIndent(map[string]any{"scope": "SDK-only readiness and production registration/authoring registry -> daemon router -> pinned SDK/native -> real MiniMax; function receipt, cancellation and cold continuation; public API admission remains separate", "descriptor": discovery[0].runtime.Info, "entrypoint": entrypoint, "verification_value": nonce, "executions": []execution{first, second, third}}, "", "  ")
+	data, _ := json.MarshalIndent(map[string]any{"scope": "SDK-only readiness and production registration -> daemon router -> pinned SDK/native -> real MiniMax; function receipt, cancellation and cold continuation; public API admission remains separate", "descriptor": discovery[0].runtime.Info, "entrypoint": entrypoint, "verification_value": nonce, "executions": []execution{first, second, third}}, "", "  ")
 	if err := os.WriteFile(filepath.Join(root, "proof.json"), data, 0o600); err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/cli/companion_path.go b/apps/daemon/internal/cli/companion_path.go
deleted file mode 100644
index d83814828..000000000
--- a/apps/daemon/internal/cli/companion_path.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package cli
-
-import (
-	"os"
-	"path/filepath"
-)
-
-func addCompanionCLIPath(env map[string]any, dir string) {
-	info, err := os.Stat(filepath.Join(dir, "parsar"))
-	if err != nil || !info.Mode().IsRegular() || info.Mode().Perm()&0o111 == 0 {
-		return
-	}
-	path, ok := env["PATH"].(string)
-	if !ok {
-		path = os.Getenv("PATH")
-	}
-	env["PATH"] = dir + string(os.PathListSeparator) + path
-}
diff --git a/apps/daemon/internal/cli/companion_path_test.go b/apps/daemon/internal/cli/companion_path_test.go
deleted file mode 100644
index 4d8b560fa..000000000
--- a/apps/daemon/internal/cli/companion_path_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package cli
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestCompanionCLIPath(t *testing.T) {
-	for _, tc := range []struct {
-		name string
-		mode os.FileMode
-		want bool
-	}{
-		{"executable", 0o700, true},
-		{"download awaiting review", 0o600, false},
-		{"missing", 0, false},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			dir := t.TempDir()
-			if tc.mode != 0 {
-				if err := os.WriteFile(filepath.Join(dir, "parsar"), []byte("binary"), tc.mode); err != nil {
-					t.Fatal(err)
-				}
-			}
-			env := map[string]any{"PATH": "/existing/tools", "OTHER": "retained"}
-			addCompanionCLIPath(env, dir)
-			want := "/existing/tools"
-			if tc.want {
-				want = dir + string(os.PathListSeparator) + want
-			}
-			if env["PATH"] != want || env["OTHER"] != "retained" {
-				t.Fatalf("unexpected child environment: %v", env)
-			}
-		})
-	}
-}
diff --git a/apps/daemon/internal/cli/connect.go b/apps/daemon/internal/cli/connect.go
index ae295f0aa..32b8e885c 100644
--- a/apps/daemon/internal/cli/connect.go
+++ b/apps/daemon/internal/cli/connect.go
@@ -12,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/auth"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/authoring"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/daemonize"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/dispatch"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/localworkspace"
@@ -427,8 +426,6 @@ func pumpConn(parentCtx context.Context, conn *transport.Conn, registry *agent.R
 	if err != nil {
 		return err
 	}
-	bridge := authoring.New(conn)
-	registry = authoringRegistry(registry, bridge)
 	router, err := dispatch.New(dispatch.Config{
 		Registry:       registry,
 		Sender:         conn,
@@ -471,10 +468,6 @@ func pumpConn(parentCtx context.Context, conn *transport.Conn, registry *agent.R
 				obslog.Bg().Warn("pumpConn: recvCh closed", "err", conn.Err())
 				return conn.Err()
 			}
-			if env.Type == proto.TypeAuthoringResponse {
-				bridge.Deliver(env)
-				continue
-			}
 			obslog.Bg().Info("pumpConn: received envelope, calling router.Handle", "type", env.Type, "id", env.ID)
 			if err := router.Handle(parentCtx, env); err != nil {
 				obslog.Bg().Error("router.Handle failed", "type", env.Type, "id", env.ID, "err", err)
diff --git a/apps/daemon/internal/cli/connect_cleanup_test.go b/apps/daemon/internal/cli/connect_cleanup_test.go
index e8ef2d21e..c8f92a00e 100644
--- a/apps/daemon/internal/cli/connect_cleanup_test.go
+++ b/apps/daemon/internal/cli/connect_cleanup_test.go
@@ -148,7 +148,7 @@ func testDisconnectedPumpCleanup(t *testing.T, suspend bool) {
 	}
 	defer peer.Close()
 	env, err := proto.NewEnvelope(proto.TypeExecutionPrepare, "prepare", proto.ExecutionPreparePayload{SessionID: "cleanup",
-		Configuration: proto.PromptRequestPayload{AgentKind: "cleanup", AgentStateKey: "agents-api-cleanup", StrictResume: true, DisableExecutionEnvironment: true}})
+		Configuration: proto.PromptRequestPayload{AgentKind: "cleanup", AgentStateKey: "agents-api-cleanup", DisableExecutionEnvironment: true}})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/cli/connect_suspend.go b/apps/daemon/internal/cli/connect_suspend.go
index 5050d6e06..b1146b94d 100644
--- a/apps/daemon/internal/cli/connect_suspend.go
+++ b/apps/daemon/internal/cli/connect_suspend.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/authoring"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/dispatch"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/localworkspace"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/transport"
@@ -34,7 +33,6 @@ func (s *reconnectSender) replace(conn *transport.Conn) { s.mu.Lock(); s.conn =
 
 type suspendedRouter struct {
 	router   *dispatch.Router
-	bridge   *authoring.Bridge
 	sender   *reconnectSender
 	registry *agent.Registry
 	local    *localworkspace.Binding
@@ -46,13 +44,11 @@ func newSuspendedRouter(conn *transport.Conn, registry *agent.Registry) (*suspen
 		return nil, err
 	}
 	sender := &reconnectSender{conn: conn}
-	bridge := authoring.New(sender)
-	wrapped := authoringRegistry(registry, bridge)
-	router, err := dispatch.New(dispatch.Config{Registry: wrapped, Sender: sender, Log: obslog.Bg(), LocalWorkspace: local})
+	router, err := dispatch.New(dispatch.Config{Registry: registry, Sender: sender, Log: obslog.Bg(), LocalWorkspace: local})
 	if err != nil {
 		return nil, err
 	}
-	return &suspendedRouter{router: router, bridge: bridge, sender: sender, registry: wrapped, local: local}, nil
+	return &suspendedRouter{router: router, sender: sender, registry: registry, local: local}, nil
 }
 
 func (s *suspendedRouter) shutdown() {
@@ -177,10 +173,6 @@ func (s *suspendedRouter) pump(ctx context.Context, conn *transport.Conn, boot *
 			if !ok {
 				return nil, conn.Err()
 			}
-			if env.Type == proto.TypeAuthoringResponse {
-				s.bridge.Deliver(env)
-				continue
-			}
 			if env.Type == proto.TypeEnvironmentResume {
 				request := rejectedResumeRequest(env)
 				code := "not_suspended"
diff --git a/apps/daemon/internal/cli/preparation_test.go b/apps/daemon/internal/cli/preparation_test.go
index df9082731..7df3223e6 100644
--- a/apps/daemon/internal/cli/preparation_test.go
+++ b/apps/daemon/internal/cli/preparation_test.go
@@ -1,19 +1,16 @@
 package cli
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
-	"errors"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/authoring"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
 )
 
-func TestPreparationRegistrationBypassesProductWrappers(t *testing.T) {
+func TestPreparationRegistrationFollowsNativeSupport(t *testing.T) {
 	for _, supported := range []bool{false, true} {
 		reg := agent.NewRegistry()
 		info := proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilityFromBool(supported)})}
@@ -33,30 +30,15 @@ func TestPreparationRegistrationBypassesProductWrappers(t *testing.T) {
 		if !supported {
 			continue
 		}
-		stop := errors.New("controlled preparation stop")
-		reg.RegisterPreparation("codex", true, func(_ context.Context, req proto.PromptRequestPayload) (agent.Prepared, error) {
-			if req.RunID != "" || req.WorkspaceAuthoring || len(req.AgentOptions) != 0 {
-				t.Error("product wrapper injected preparation context")
-			}
-			return nil, stop
-		})
-		wrapped := authoringRegistry(reg, authoring.New(nil))
-		prepare, err := wrapped.ResolvePreparation("codex")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, err := prepare(t.Context(), proto.PromptRequestPayload{AgentKind: "codex"}); !errors.Is(err, stop) {
-			t.Fatal("raw preparation was lost or wrapped", err)
-		}
-		for _, info := range wrapped.SupportedAgentKinds() {
+		for _, info := range reg.SupportedAgentKinds() {
 			if info.Kind == "codex" && (!info.Capabilities.Preparation.IsSupported() || !info.Capabilities.WorkspaceReadPreparation.IsSupported()) {
-				t.Fatal("real heartbeat registry lost preparation")
+				t.Fatal("heartbeat registry lost preparation")
 			}
 		}
-		wrapped.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-			return nil, stop
+		reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
+			return nil, nil
 		})
-		if _, err := wrapped.ResolvePreparation("codex"); err == nil {
+		if _, err := reg.ResolvePreparation("codex"); err == nil {
 			t.Fatal("factory replacement retained stale preparation")
 		}
 	}
diff --git a/apps/daemon/internal/dispatch/executor.go b/apps/daemon/internal/dispatch/executor.go
index 4e7389cc4..7ac4223b6 100644
--- a/apps/daemon/internal/dispatch/executor.go
+++ b/apps/daemon/internal/dispatch/executor.go
@@ -45,7 +45,7 @@ func executorFingerprint(req proto.PromptRequestPayload) ([32]byte, error) {
 
 func (r *Router) handleExecutorPrepare(ctx context.Context, env proto.Envelope, input proto.ExecutionPreparePayload) error {
 	req := input.Configuration
-	if strings.TrimSpace(input.SessionID) == "" || req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" || req.WorkspaceAuthoring || req.AgentStateKey != "agents-api-"+input.SessionID || !req.StrictResume {
+	if strings.TrimSpace(input.SessionID) == "" || req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" || req.AgentStateKey != "agents-api-"+input.SessionID {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
 	caps, available := r.availableCapabilities(req.AgentKind)
diff --git a/apps/daemon/internal/dispatch/executor_handoff_test.go b/apps/daemon/internal/dispatch/executor_handoff_test.go
index b0fc793fa..60f194351 100644
--- a/apps/daemon/internal/dispatch/executor_handoff_test.go
+++ b/apps/daemon/internal/dispatch/executor_handoff_test.go
@@ -150,7 +150,7 @@ func TestPreparedDonePublishesAfterExecutorHandoff(t *testing.T) {
 					}
 				}
 			}
-			request := proto.ExecutionPreparePayload{SessionID: "session", Configuration: proto.PromptRequestPayload{AgentKind: "handoff", AgentStateKey: "agents-api-session", StrictResume: true, DisableExecutionEnvironment: true}}
+			request := proto.ExecutionPreparePayload{SessionID: "session", Configuration: proto.PromptRequestPayload{AgentKind: "handoff", AgentStateKey: "agents-api-session", DisableExecutionEnvironment: true}}
 			admit := func(id string) proto.PreparationStatusPayload {
 				t.Helper()
 				handle(proto.TypeExecutionPrepare, id, request)
diff --git a/apps/daemon/internal/dispatch/executor_test.go b/apps/daemon/internal/dispatch/executor_test.go
index c8db7c741..55686fd2a 100644
--- a/apps/daemon/internal/dispatch/executor_test.go
+++ b/apps/daemon/internal/dispatch/executor_test.go
@@ -70,7 +70,7 @@ func (t *reusableTurn) AwaitSettlement(ctx context.Context) (agent.TurnSettlemen
 }
 
 func executorRequest() proto.ExecutionPreparePayload {
-	return proto.ExecutionPreparePayload{SessionID: "session", Configuration: proto.PromptRequestPayload{AgentKind: "reusable", AgentStateKey: "agents-api-session", StrictResume: true, DisableExecutionEnvironment: true}}
+	return proto.ExecutionPreparePayload{SessionID: "session", Configuration: proto.PromptRequestPayload{AgentKind: "reusable", AgentStateKey: "agents-api-session", DisableExecutionEnvironment: true}}
 }
 func executorRouter(t *testing.T, owner *reusableExecutor, idle time.Duration) (*dispatch.Router, *recSender, *atomic.Int32) {
 	t.Helper()
diff --git a/apps/daemon/internal/dispatch/functions_native_test.go b/apps/daemon/internal/dispatch/functions_native_test.go
index 036ea1c8d..f541a43a8 100644
--- a/apps/daemon/internal/dispatch/functions_native_test.go
+++ b/apps/daemon/internal/dispatch/functions_native_test.go
@@ -138,7 +138,7 @@ func TestNativeFunctionBridge(t *testing.T) {
 	nativeID := ""
 	for index := 0; index < 3; index++ {
 		run := fmt.Sprintf("run-%d", index)
-		request := proto.PromptRequestPayload{AgentKind: "codex", Input: proto.TextInput("Look up ticket 42."), RunID: run, AgentStateKey: "native-functions", AgentSessionID: nativeID, StrictResume: true, ReleaseOnCompletion: true, DisableExecutionEnvironment: true, ObserveToolObservations: true,
+		request := proto.PromptRequestPayload{AgentKind: "codex", Input: proto.TextInput("Look up ticket 42."), RunID: run, AgentStateKey: "native-functions", AgentSessionID: nativeID, ReleaseOnCompletion: true, DisableExecutionEnvironment: true,
 			FunctionTools: []proto.FunctionTool{{Name: "lookup_ticket", Description: "Read a synthetic ticket", Parameters: json.RawMessage(`{"type":"object","properties":{"ticket":{"type":"string"}},"required":["ticket"],"additionalProperties":false}`)}},
 			AgentOptions:  map[string]any{"model": "gpt-5.5", "model_provider": map[string]any{"protocol": "responses", "base_url": model.URL + "/v1", "api_key": "synthetic-local-token"}}}
 		env, _ := proto.NewEnvelope(proto.TypePromptRequest, run, request)
diff --git a/apps/daemon/internal/dispatch/local_directory_test.go b/apps/daemon/internal/dispatch/local_directory_test.go
index b0363bf24..d06af72aa 100644
--- a/apps/daemon/internal/dispatch/local_directory_test.go
+++ b/apps/daemon/internal/dispatch/local_directory_test.go
@@ -43,7 +43,7 @@ func TestLocalDirectoryPreparationNeedsNoHarnessAndRejectsOtherOwners(t *testing
 		t.Fatal(err)
 	}
 	t.Cleanup(func() { _ = r.Shutdown(context.Background()) })
-	request := proto.PromptRequestPayload{AgentKind: "native", LocalEnvironment: &proto.LocalEnvironment{ID: environment}, AgentStateKey: "agents-api-" + session, StrictResume: true, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
+	request := proto.PromptRequestPayload{AgentKind: "native", LocalEnvironment: &proto.LocalEnvironment{ID: environment}, AgentStateKey: "agents-api-" + session, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
 	if err := r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "idle", proto.ExecutionPreparePayload{Configuration: request})); err != nil {
 		t.Fatal(err)
 	}
@@ -123,7 +123,7 @@ func TestLocalDirectoryKeepsNotDirectorySeparateFromFailures(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Cleanup(func() { _ = r.Shutdown(context.Background()) })
-	request := proto.PromptRequestPayload{AgentKind: "native", LocalEnvironment: &proto.LocalEnvironment{ID: environment}, AgentStateKey: "agents-api-" + session, StrictResume: true, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
+	request := proto.PromptRequestPayload{AgentKind: "native", LocalEnvironment: &proto.LocalEnvironment{ID: environment}, AgentStateKey: "agents-api-" + session, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
 	if err := r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "idle", proto.ExecutionPreparePayload{Configuration: request})); err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/dispatch/preparation.go b/apps/daemon/internal/dispatch/preparation.go
index e77761f09..36695ab7a 100644
--- a/apps/daemon/internal/dispatch/preparation.go
+++ b/apps/daemon/internal/dispatch/preparation.go
@@ -63,7 +63,7 @@ func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope)
 	if req, err = r.localWorkspace.Configure(req); err != nil {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
-	if req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" || req.WorkspaceAuthoring || req.EnvironmentID() == "" || strings.TrimSpace(req.AgentStateKey) == "" || !req.StrictResume || !req.ReleaseOnCompletion {
+	if req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" || req.EnvironmentID() == "" || strings.TrimSpace(req.AgentStateKey) == "" || !req.ReleaseOnCompletion {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
 	if validateExecutionEnvironment(req, caps) != nil || (len(req.FunctionTools) > 0 && !caps.FunctionTools.IsSupported()) {
diff --git a/apps/daemon/internal/dispatch/preparation_test.go b/apps/daemon/internal/dispatch/preparation_test.go
index 7d4a9de4e..64f85b1bf 100644
--- a/apps/daemon/internal/dispatch/preparation_test.go
+++ b/apps/daemon/internal/dispatch/preparation_test.go
@@ -113,7 +113,7 @@ func localPreparationHarness(t *testing.T) *harness {
 }
 
 func preparationRequest() proto.ExecutionPreparePayload {
-	return proto.ExecutionPreparePayload{SessionID: preparationSessionID, Configuration: proto.PromptRequestPayload{AgentKind: "prepared", AgentStateKey: "agents-api-" + preparationSessionID, StrictResume: true, ReleaseOnCompletion: true, LocalEnvironment: &proto.LocalEnvironment{ID: preparationEnvironmentID, NetworkAccess: "enabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}}}
+	return proto.ExecutionPreparePayload{SessionID: preparationSessionID, Configuration: proto.PromptRequestPayload{AgentKind: "prepared", AgentStateKey: "agents-api-" + preparationSessionID, ReleaseOnCompletion: true, LocalEnvironment: &proto.LocalEnvironment{ID: preparationEnvironmentID, NetworkAccess: "enabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}}}
 }
 
 func preparationRouter(t *testing.T, sender dispatch.Sender, timeout time.Duration, factory agent.PreparationFactory) *dispatch.Router {
@@ -372,12 +372,10 @@ func TestPreparationRejectsInputAndProductConfiguration(t *testing.T) {
 		"run":          func(p *proto.PromptRequestPayload) { p.RunID = "run" },
 		"input":        func(p *proto.PromptRequestPayload) { p.Input = proto.TextInput("input") },
 		"conversation": func(p *proto.PromptRequestPayload) { p.ConversationID = "product" },
-		"authoring":    func(p *proto.PromptRequestPayload) { p.WorkspaceAuthoring = true },
 		"attachment": func(p *proto.PromptRequestPayload) {
 			p.Input = proto.MessageInput{{Content: []proto.InputContent{{Type: "input_image"}}}}
 		},
 		"missing environment": func(p *proto.PromptRequestPayload) { p.LocalEnvironment = nil },
-		"resume":              func(p *proto.PromptRequestPayload) { p.StrictResume = false },
 	} {
 		t.Run(name, func(t *testing.T) {
 			r := preparationRouter(t, &recSender{}, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
diff --git a/apps/daemon/internal/localworkspace/binding.go b/apps/daemon/internal/localworkspace/binding.go
index c56610270..fe8bca207 100644
--- a/apps/daemon/internal/localworkspace/binding.go
+++ b/apps/daemon/internal/localworkspace/binding.go
@@ -69,8 +69,7 @@ func (b *Binding) Configure(r proto.PromptRequestPayload) (proto.PromptRequestPa
 		return r, nil
 	}
 	if b == nil || r.LocalEnvironment == nil || r.LocalEnvironment.ID != b.environment || r.AgentStateKey != b.stateKey ||
-		r.DisableExecutionEnvironment ||
-		r.ConversationID != "" || r.WorkspaceAuthoring || !r.StrictResume {
+		r.DisableExecutionEnvironment || r.ConversationID != "" {
 		return r, errors.New("request does not match the dedicated local Environment")
 	}
 	if !r.WorkspaceReadOnly || r.LocalEnvironment.NetworkAccess != "" || len(r.LocalEnvironment.AllowedDomains) > 0 {
diff --git a/apps/daemon/internal/localworkspace/binding_test.go b/apps/daemon/internal/localworkspace/binding_test.go
index 372cc8ec7..9aad690f0 100644
--- a/apps/daemon/internal/localworkspace/binding_test.go
+++ b/apps/daemon/internal/localworkspace/binding_test.go
@@ -26,7 +26,7 @@ func testBinding(t *testing.T) (*Binding, proto.PromptRequestPayload) {
 	}
 	b.networkAccess = "disabled"
 	b.capabilityRoot = t.TempDir()
-	return b, proto.PromptRequestPayload{LocalEnvironment: &proto.LocalEnvironment{ID: environment, NetworkAccess: "disabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}, AgentStateKey: "agents-api-" + session, StrictResume: true, ReleaseOnCompletion: true}
+	return b, proto.PromptRequestPayload{LocalEnvironment: &proto.LocalEnvironment{ID: environment, NetworkAccess: "disabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}, AgentStateKey: "agents-api-" + session, ReleaseOnCompletion: true}
 }
 
 func TestBindingRejectsScopeOverrides(t *testing.T) {
@@ -40,10 +40,8 @@ func TestBindingRejectsScopeOverrides(t *testing.T) {
 		"other Environment": func(r *proto.PromptRequestPayload) {
 			r.LocalEnvironment = &proto.LocalEnvironment{ID: uuid.NewString()}
 		},
-		"other Session":     func(r *proto.PromptRequestPayload) { r.AgentStateKey = "agents-api-" + uuid.NewString() },
-		"none":              func(r *proto.PromptRequestPayload) { r.DisableExecutionEnvironment = true },
-		"product authoring": func(r *proto.PromptRequestPayload) { r.WorkspaceAuthoring = true },
-		"non-strict resume": func(r *proto.PromptRequestPayload) { r.StrictResume = false },
+		"other Session": func(r *proto.PromptRequestPayload) { r.AgentStateKey = "agents-api-" + uuid.NewString() },
+		"none":          func(r *proto.PromptRequestPayload) { r.DisableExecutionEnvironment = true },
 	} {
 		t.Run(name, func(t *testing.T) {
 			r := valid
diff --git a/apps/daemon/internal/localworkspace/runtime_initialization_process.go b/apps/daemon/internal/localworkspace/runtime_initialization_process.go
index e98dc070b..68174485d 100644
--- a/apps/daemon/internal/localworkspace/runtime_initialization_process.go
+++ b/apps/daemon/internal/localworkspace/runtime_initialization_process.go
@@ -110,7 +110,7 @@ func runInitializationProcess(ctx context.Context, binary string, args []string,
 		return &InitializationFailure{}
 	}
 	process, err := clirunner.Start(clirunner.StartOptions{Parent: operation, Binary: binary, Args: args,
-		Dir: directory, Env: env, OwnProcessGroup: true, KillTimeout: 250 * time.Millisecond})
+		Dir: directory, Env: env, KillTimeout: 250 * time.Millisecond})
 	if err != nil {
 		return ErrInitializationUnconfirmed
 	}
diff --git a/apps/daemon/testdata/onboarding/main.go b/apps/daemon/testdata/onboarding/main.go
index 8ecc4dbaf..4ead4f620 100644
--- a/apps/daemon/testdata/onboarding/main.go
+++ b/apps/daemon/testdata/onboarding/main.go
@@ -40,7 +40,7 @@ func (h *harness) prepare(_ context.Context, req proto.PromptRequestPayload) (ag
 	if req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" {
 		return nil, errors.New("preparation submitted fixture input")
 	}
-	if !req.StrictResume || !req.DisableExecutionEnvironment || !req.DisableSubagents || len(req.FunctionTools) > 0 || req.MCPHTTPServers != nil {
+	if !req.DisableExecutionEnvironment || !req.DisableSubagents || len(req.FunctionTools) > 0 || req.MCPHTTPServers != nil {
 		return nil, errors.New("unsupported fixture operation")
 	}
 	h.mu.Lock()
diff --git a/contracts/agents-api/harness-onboarding.md b/contracts/agents-api/harness-onboarding.md
index 0d6fba074..8d5c7459d 100644
--- a/contracts/agents-api/harness-onboarding.md
+++ b/contracts/agents-api/harness-onboarding.md
@@ -151,8 +151,6 @@ A Harness that supports the Subagent reads implements the [neutral observation c
 
 Registration is static and requires a build. Export one `agent.Declaration` from `apps/daemon/internal/agent/<kind>/declaration.go`, then add it to `harnessDeclarations` in [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go). The declaration contains the kind and complete capability descriptor, the shared model `Configuration` and a `Discover` function. Discovery receives the profile and diagnostic writers, owns native configuration and availability checks, and returns the installed `agent.Runtime` with its descriptor and session, preparation and Executor factories. Return nil when the adapter is not configured; return an unavailable descriptor with a session factory when configured prerequisites fail. Keep version gates and factory-selection conditions inside the adapter.
 
-An adapter that supports product workspace authoring declares `WorkspaceAuthoring` itself; common registration does not grant it.
-
 [`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) iterates the discovered runtimes and calls `Registry.Register` from `agent/harness.go`. It verifies that discovery retained the declared kind and installs factories in this order:
 
 | Order | Method | Registers |
@@ -202,7 +200,7 @@ Run the `engine` and `execution` tests for omission, policy, combination and err
 
 ## Native model configuration
 
-[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) owns the shared configuration declaration and pure preparation contract. Each adapter supplies one `Configuration`, in `internal/harnessconfig/<kind>`, to Core's composition and to the Runtime's `RegisterKind`. The direct factory, preparation and Executor paths all validate through that declaration before native side effects, and Registry wrappers keep the declaration with the factory. The wire object is `proto.HarnessConfig`. [Model execution](./model-execution.md#native-model-parameters) lists each Harness's accepted fields.
+[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) owns the shared configuration declaration and pure preparation contract. Each adapter supplies one `Configuration`, in `internal/harnessconfig/<kind>`, to Core's composition and to the Runtime's `RegisterKind`. The direct factory, preparation and Executor paths all validate through that declaration before native side effects. The wire object is `proto.HarnessConfig`. [Model execution](./model-execution.md#native-model-parameters) lists each Harness's accepted fields.
 
 A supplied `model` must be a nonempty string, and an explicit `model_provider` requires it. The native-owned connection path may omit both; explicit null is invalid. An explicitly empty declaration accepts no provider or nonempty native parameters and advertises no provider support. Unknown protocol formats and duplicate protocol declarations fail at registration.
 
@@ -247,7 +245,7 @@ An adapter may supply `agent.Installation` from `installation.go` in its own pac
 
 ## Native process ownership
 
-The daemon's `clirunner` offers opt-in Unix process-group ownership for adapters whose SDK launches a native child; unsupported hosts reject this mode before launch. Explicit and parent-context cancellation share a TERM grace period (three seconds by default) and a bounded KILL escalation. An internal reaper also cleans remaining group members when the direct process exits, even if a descendant still holds stdout open; during cancellation, surviving descendants keep the remaining grace after the leader exits. The daemon's `stop` command waits up to ten seconds for confirmed shutdown, which covers that grace period and the pipe and owner cleanup after it.
+The daemon's `clirunner` starts every native child in its own Unix process group (a Job object on Windows); other hosts reject the launch. Explicit and parent-context cancellation share a TERM grace period (three seconds by default) and a bounded KILL escalation. An internal reaper also cleans remaining group members when the direct process exits, even if a descendant still holds stdout open; during cancellation, surviving descendants keep the remaining grace after the leader exits. The daemon's `stop` command waits up to ten seconds for confirmed shutdown, which covers that grace period and the pipe and owner cleanup after it.
 
 Owned output pipes stay readable after the leader exits. Consumers drain stdout and stderr before calling `Wait`, which joins the cached process result and closes the readers. `Done` reports leader reaping and group cleanup signals; it is not a native execution receipt or proof of persisted history. SDK adapters settle each Turn and drain its observations before publishing completion, and Executor close also closes the query and awaits the native child. Process groups are lifecycle supervision, not isolation or containment of descendants that leave the group.
 
diff --git a/contracts/agents-api/zh/harness-onboarding.md b/contracts/agents-api/zh/harness-onboarding.md
index b22b086bf..e5252a97d 100644
--- a/contracts/agents-api/zh/harness-onboarding.md
+++ b/contracts/agents-api/zh/harness-onboarding.md
@@ -1,7 +1,7 @@
 ---
 title: "将原生 Harness 添加到 OpenAgentCore"
 source: contracts/agents-api/harness-onboarding.md
-source_hash: 32adff66e2fb33956e96f9a453518d70a3f87056eb777e82a60e087fe4e5aa31
+source_hash: cad1a3666f3c0d4c460bb6213da4bcca89c156fc387b1355d683593b55d025a0
 ---
 
 **Harness** 是一种运行模型和工具循环的原生代理引擎（Codex、Claude Code、MiniMax Code）。**Harness 适配器**将 Runtime 的 Executor 和 Turn 契约转换到该引擎的 SDK 或协议。本文档定义 Runtime–Harness 协议：适配器接口及其生命周期义务、注册、Core 资格认定和验收。[Harness capabilities](harness-capabilities.md) 记录了当前每个 Harness 支持的功能。
@@ -153,8 +153,6 @@ MCP、公共函数、延迟函数发现、结构化输出、图像输入、详
 
 注册是静态的，并且需要构建。从 `apps/daemon/internal/agent/<kind>/declaration.go` 导出一个 `agent.Declaration`，然后将其添加到 [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go) 的 `harnessDeclarations` 中。声明包含 kind、完整能力描述符、共享模型 `Configuration` 和 `Discover` 函数。发现过程接收 profile 和诊断写入器，负责原生配置和可用性检查，并返回已安装的 `agent.Runtime` 及其描述符、session 工厂、准备工厂和 Executor 工厂。未配置适配器时返回 nil；已配置的前置条件失败时，返回不可用描述符和 session 工厂。将版本门控和工厂选择条件保留在适配器内部。
 
-支持产品工作区创作功能的适配器自行声明 `WorkspaceAuthoring`；通用注册不会授予该能力。
-
 [`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) 遍历已发现的 Runtime，并调用 `agent/harness.go` 中的 `Registry.Register`。它验证发现过程是否保留了声明的 kind，并按以下顺序安装工厂：
 
 | 顺序 | 方法 | 注册内容 |
@@ -204,7 +202,7 @@ profile 是纯逻辑：它使用现有的公共类型和协议类型，声明受
 
 ## 原生模型配置 {#native-model-configuration}
 
-[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 负责共享配置声明和纯准备契约。每个适配器在 `internal/harnessconfig/<kind>` 中提供一个 `Configuration`，供 Core 组合和 Runtime 的 `RegisterKind` 使用。直接调用工厂、准备路径和 Executor 路径都会在产生原生副作用之前通过该声明进行验证，而 Registry 包装器会将声明与工厂保留在一起。线协议对象是 `proto.HarnessConfig`。[Model execution](model-execution.md#native-model-parameters) 列出了每个 Harness 接受的字段。
+[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 负责共享配置声明和纯准备契约。每个适配器在 `internal/harnessconfig/<kind>` 中提供一个 `Configuration`，供 Core 组合和 Runtime 的 `RegisterKind` 使用。直接调用工厂、准备路径和 Executor 路径都会在产生原生副作用之前通过该声明进行验证。线协议对象是 `proto.HarnessConfig`。[Model execution](model-execution.md#native-model-parameters) 列出了每个 Harness 接受的字段。
 
 提供的 `model` 必须是非空字符串，并且显式指定 `model_provider` 时必须提供它。原生所有权连接路径可以省略二者；显式 null 无效。显式为空的声明不接受任何 Provider 或非空原生参数，也不宣称支持 Provider。未知协议格式和重复协议声明会导致注册失败。
 
@@ -249,7 +247,7 @@ Environment 验收使用 `services/core/tests/official_environment_{templates,se
 
 ## 原生进程所有权 {#native-process-ownership}
 
-daemon 的 `clirunner` 为 SDK 会启动原生子进程的适配器提供可选的 Unix 进程组所有权；不支持的主机会在启动前拒绝此模式。显式取消和父上下文取消共享 TERM 宽限期（默认为三秒）以及有界的 KILL 升级过程。当直接进程退出时，内部回收器也会清理进程组的剩余成员，即使某个后代进程仍保持 stdout 打开；在取消过程中，主进程退出后，存活的后代进程仍会保留剩余宽限时间。daemon 的 `stop` 命令最多等待十秒以确认关闭，这涵盖该宽限期以及之后的管道和所有者清理。
+daemon 的 `clirunner` 让每个原生子进程在自己的 Unix 进程组中启动（Windows 上为 Job 对象）；其他主机会拒绝启动。显式取消和父上下文取消共享 TERM 宽限期（默认为三秒）以及有界的 KILL 升级过程。当直接进程退出时，内部回收器也会清理进程组的剩余成员，即使某个后代进程仍保持 stdout 打开；在取消过程中，主进程退出后，存活的后代进程仍会保留剩余宽限时间。daemon 的 `stop` 命令最多等待十秒以确认关闭，这涵盖该宽限期以及之后的管道和所有者清理。
 
 所属输出管道在主进程退出后仍可读取。消费者在调用 `Wait` 之前耗尽 stdout 和 stderr；`Wait` 会汇合缓存的进程结果并关闭读取器。`Done` 报告主进程回收和进程组清理信号；它不是原生执行回执，也不是历史已持久化的证据。SDK 适配器会结算每个 Turn，并在发布完成状态前耗尽其观察结果；Executor 关闭还会关闭 Query 并等待原生子进程。进程组用于生命周期监管，而不是隔离或遏制离开进程组的后代进程。
 
diff --git a/docs/runtime-protocol.md b/docs/runtime-protocol.md
index a0398c22a..fdd0e943b 100644
--- a/docs/runtime-protocol.md
+++ b/docs/runtime-protocol.md
@@ -51,7 +51,7 @@ A declaration describes what the Runtime can do. Core admits a public feature on
 | `message_images`, `function_result_images` | A message, or a function result, carries an image |
 | `mcp_http_tools`, `mcp_http_required`, `mcp_http_bearer_auth` | The Agent declares HTTP MCP servers; one is `required`; a Vault credential is selected for one |
 
-`permissions` gates permission decisions inside the Runtime, and `workspace_authoring` gates the daemon's authoring command. Core has no admission rule for `usage` and `resume`.
+`permissions` gates permission decisions inside the Runtime. Core has no admission rule for `usage` and `resume`.
 
 The prompt request (`prompt_request`, or the configuration of `execution_prepare`) carries the opt-ins Core sets for each Run:
 
@@ -59,17 +59,16 @@ The prompt request (`prompt_request`, or the configuration of `execution_prepare
 | --- | --- |
 | `agent_options` | Always `model` and `system_prompt` from the Agent; `model_provider` when the Session froze one; `harness_config` when the Agent sets `x_agents_core.harness_config`. Core sends no other key; the Runtime rejects any other key with `unsupported_configuration` before preparation |
 | `execution_controls` | Always: web search `disabled`, the resolved text verbosity (default `medium`), an explicit programmatic-tool-calling disable and any `json_schema` output format. Native option names belong to the adapter |
-| `observe_tool_observations` | Always. Tool-call frames then carry the engine-neutral `observation` |
 | `observe_messages` | When the Runtime declares `message_items`. Text deltas then carry the native item ID, and `output_message` frames report message start, completion, phase and the completion text |
 | `observe_subagent_identities`, `disable_subagents` | From the Agent's `multi_agent.enabled` |
 | `disable_execution_environment` | For an Environment of type `none` |
 | `local_environment` | For `openai_hosted` and `self_hosted`, with the exact Environment binding. The request carries no working directory; the Runtime checks `workspace_directory` against its binding |
-| `strict_resume`, `require_existing_native_session` | Always strict; the second when a native Session must be recovered |
+| `require_existing_native_session` | When a native Session must be recovered |
 | `durable_receipt` on `prompt_steer` | For every active input Core delivers |
 
 An execution configuration requires exactly one of `local_environment` and `disable_execution_environment`; `execution_prepare` rejects neither or both with `unsupported_configuration`.
 
-Requests without an opt-in keep the frames and fields they had without it.
+Requests without an opt-in keep the frames and fields they had without it. A `tool_call` frame carries the engine-neutral `observation` whenever the adapter maps the native tool.
 
 ## Envelope and identity
 
diff --git a/docs/zh/runtime-protocol.md b/docs/zh/runtime-protocol.md
index 050b36d91..0a13af57b 100644
--- a/docs/zh/runtime-protocol.md
+++ b/docs/zh/runtime-protocol.md
@@ -1,7 +1,7 @@
 ---
 title: "Core–Runtime 协议"
 source: docs/runtime-protocol.md
-source_hash: 13766041c9ed0c012ceb5051fe43dcc8a1738a198fe325aad15f1902fe373ee3
+source_hash: fd5bcb71c9234310a449fad97a30a899027133ca8df862e8a3306f6bd3dacae8
 ---
 
 此协议在 Runtime daemon 获取机器凭据后连接 Core 与 daemon，定义 daemon 连接上消息的含义和顺序。wire 类型、限制和验证器仅在 [`internal/agentdaemon/proto`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/internal/agentdaemon/proto) 中定义一次；Core 的 [gateway](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/services/core/internal/runtimegateway) 与参考 Runtime 的 [dispatcher](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/apps/daemon/internal/dispatch) 都使用它们，因此无需同步第二套 payload schema。签发凭据和打开连接的 HTTP 路由见[机器连接 API](../../contracts/agents-api/zh/machine-api.md)。
@@ -53,7 +53,7 @@ wire 上每个字段都是 JSON boolean，所有字段都必须出现，包括 `
 | `message_images`, `function_result_images` | 消息或 function result 携带图像 |
 | `mcp_http_tools`, `mcp_http_required`, `mcp_http_bearer_auth` | Agent 声明 HTTP MCP server；其中一个为 `required`；其中一个选用了 Vault 凭据 |
 
-`permissions` 控制 Runtime 内部权限决定，`workspace_authoring` 控制 daemon 的 authoring 命令。Core 对 `usage` 和 `resume` 没有准入规则。
+`permissions` 控制 Runtime 内部权限决定。Core 对 `usage` 和 `resume` 没有准入规则。
 
 prompt 请求（`prompt_request` 或 `execution_prepare` 的配置）携带 Core 为各 Run 设置的显式启用项：
 
@@ -61,17 +61,16 @@ prompt 请求（`prompt_request` 或 `execution_prepare` 的配置）携带 Core
 | --- | --- |
 | `agent_options` | 始终设置 Agent 的 `model` 和 `system_prompt`；Session 冻结了 model provider 时设置 `model_provider`；Agent 设置 `x_agents_core.harness_config` 时设置 `harness_config`。Core 不发送其他键；Runtime 在准备之前以 `unsupported_configuration` 拒绝任何其他键 |
 | `execution_controls` | 始终设置：web search 为 `disabled`、解析后的 text verbosity（默认 `medium`）、明确禁用 programmatic tool calling，以及任何 `json_schema` 输出格式。原生选项名称由 adapter 负责 |
-| `observe_tool_observations` | 始终设置。tool-call frame 随后携带与 engine 无关的 `observation` |
 | `observe_messages` | Runtime 声明 `message_items` 时设置。文本 delta 随后携带原生 item ID，`output_message` frame 报告消息开始、完成、phase 和完成文本 |
 | `observe_subagent_identities`, `disable_subagents` | 根据 Agent 的 `multi_agent.enabled` 设置 |
 | `disable_execution_environment` | Environment 类型为 `none` 时设置 |
 | `local_environment` | 为 `openai_hosted` 和 `self_hosted` 设置，包含精确的 Environment 绑定。请求不携带 working directory；Runtime 按自身绑定检查 `workspace_directory` |
-| `strict_resume`, `require_existing_native_session` | 始终严格；需要恢复原生 Session 时设置第二项 |
+| `require_existing_native_session` | 需要恢复原生 Session 时设置 |
 | `prompt_steer` 上的 `durable_receipt` | Core 交付的每个活动输入都设置 |
 
 执行配置必须且只能包含 `local_environment` 和 `disable_execution_environment` 之一；两者都缺失或同时存在时，`execution_prepare` 以 `unsupported_configuration` 拒绝。
 
-未携带显式启用项的请求保留未启用时的 frame 和字段。
+未携带显式启用项的请求保留未启用时的 frame 和字段。只要 adapter 映射了原生工具，`tool_call` frame 就携带与 engine 无关的 `observation`。
 
 ## Envelope 与身份 {#envelope-and-identity}
 
diff --git a/internal/agentdaemon/proto/authoring.go b/internal/agentdaemon/proto/authoring.go
deleted file mode 100644
index 338d77b5d..000000000
--- a/internal/agentdaemon/proto/authoring.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package proto
-
-import "encoding/json"
-
-const (
-	TypeAuthoringRequest  = "authoring_request"
-	TypeAuthoringResponse = "authoring_response"
-	AuthoringContext      = "context"
-	AuthoringSkillList    = "skill.list"
-	AuthoringSkillRead    = "skill.read"
-	AuthoringSkillCreate  = "skill.create"
-	AuthoringSkillUpdate  = "skill.update"
-	AuthoringPromptRead   = "instructions.read"
-	AuthoringPromptWrite  = "instructions.write"
-	AuthoringMaxBytes     = 1 << 20
-	AuthoringSocketEnv    = "OAC_RUNTIME_DAEMON_SOCKET"
-)
-
-// AuthoringRequestPayload uses Envelope.ID for the active run, never a client-supplied workspace or user.
-type AuthoringRequestPayload struct {
-	RequestID    string `json:"request_id,omitempty"`
-	Operation    string `json:"operation"`
-	CapabilityID string `json:"capability_id,omitempty"`
-	Content      string `json:"content,omitempty"`
-}
-
-type AuthoringResponsePayload struct {
-	RequestID string          `json:"request_id,omitempty"`
-	Data      json.RawMessage `json:"data,omitempty"`
-	Error     string          `json:"error,omitempty"`
-}
diff --git a/internal/agentdaemon/proto/inbound.go b/internal/agentdaemon/proto/inbound.go
index bb41594c7..73a49f6a8 100644
--- a/internal/agentdaemon/proto/inbound.go
+++ b/internal/agentdaemon/proto/inbound.go
@@ -226,7 +226,6 @@ type AgentKindCapabilities struct {
 	Usage                 CapabilitySupport `json:"usage"`
 	Resume                CapabilitySupport `json:"resume"`
 	NativeSessionRecovery CapabilitySupport `json:"native_session_recovery"`
-	WorkspaceAuthoring    CapabilitySupport `json:"workspace_authoring"`
 	Steering              CapabilitySupport `json:"steering"`
 	MessageItems          CapabilitySupport `json:"message_items"`
 
diff --git a/internal/agentdaemon/proto/outbound.go b/internal/agentdaemon/proto/outbound.go
index 8f5db4e41..799d09835 100644
--- a/internal/agentdaemon/proto/outbound.go
+++ b/internal/agentdaemon/proto/outbound.go
@@ -45,8 +45,8 @@ type PromptRequestPayload struct {
 	// dispatches to.
 	AgentKind string `json:"agent_kind"`
 
-	// ConversationID lets the daemon scope per-conversation state
-	// (Claude --resume session id, scratch dir).
+	// ConversationID is the Core Session ID of a prompt_request Run. Preparation
+	// and Executor configurations leave it empty, and no adapter reads it.
 	ConversationID string `json:"conversation_id"`
 
 	// RunID is the ID of the Core Turn this prompt executes; mirrored
@@ -73,21 +73,17 @@ type PromptRequestPayload struct {
 
 	// AgentStateKey is the stable daemon-side state directory key.
 	// WorkspaceReadOnly prepares temporary native state that cannot start a Run.
-	WorkspaceReadOnly  bool   `json:"workspace_read_only,omitempty"`
-	AgentStateKey      string `json:"agent_state_key,omitempty"`
-	WorkspaceAuthoring bool   `json:"workspace_authoring,omitempty"`
+	WorkspaceReadOnly bool   `json:"workspace_read_only,omitempty"`
+	AgentStateKey     string `json:"agent_state_key,omitempty"`
 	// ReleaseOnCompletion closes the native writer before acknowledging Done.
-	ReleaseOnCompletion          bool `json:"release_on_completion,omitempty"`
-	StrictResume                 bool `json:"strict_resume,omitempty"`
-	RequireExistingNativeSession bool `json:"require_existing_native_session,omitempty"`
-	ObserveMessages              bool `json:"observe_messages,omitempty"`
-
-	ObserveToolObservations     bool           `json:"observe_tool_observations,omitempty"`
-	ObserveSubagentIdentities   bool           `json:"observe_subagent_identities,omitempty"`
-	FunctionTools               []FunctionTool `json:"function_tools,omitempty"`
-	ToolSearch                  bool           `json:"tool_search,omitempty"`
-	DisableExecutionEnvironment bool           `json:"disable_execution_environment,omitempty"`
-	DisableSubagents            bool           `json:"disable_subagents,omitempty"`
+	ReleaseOnCompletion          bool           `json:"release_on_completion,omitempty"`
+	RequireExistingNativeSession bool           `json:"require_existing_native_session,omitempty"`
+	ObserveMessages              bool           `json:"observe_messages,omitempty"`
+	ObserveSubagentIdentities    bool           `json:"observe_subagent_identities,omitempty"`
+	FunctionTools                []FunctionTool `json:"function_tools,omitempty"`
+	ToolSearch                   bool           `json:"tool_search,omitempty"`
+	DisableExecutionEnvironment  bool           `json:"disable_execution_environment,omitempty"`
+	DisableSubagents             bool           `json:"disable_subagents,omitempty"`
 }
 
 // PromptCancelPayload optionally requests an application receipt; identity is on Envelope.ID.
diff --git a/internal/agentdaemon/proto/preparation.go b/internal/agentdaemon/proto/preparation.go
index b03ba0905..99c1dba13 100644
--- a/internal/agentdaemon/proto/preparation.go
+++ b/internal/agentdaemon/proto/preparation.go
@@ -9,9 +9,9 @@ const (
 	TypePreparationStatus = "preparation_status"
 )
 
-// ExecutionPreparePayload reuses execution configuration without accepting input
-// or product authoring. SessionID identifies the immutable configuration owner;
-// each request reserves a separate Turn admission on its Runtime Executor.
+// ExecutionPreparePayload reuses execution configuration without accepting
+// input. SessionID identifies the immutable configuration owner; each request
+// reserves a separate Turn admission on its Runtime Executor.
 type ExecutionPreparePayload struct {
 	SessionID     string               `json:"session_id"`
 	Configuration PromptRequestPayload `json:"configuration"`
diff --git a/internal/agentdaemon/proto/prototest/capabilities.go b/internal/agentdaemon/proto/prototest/capabilities.go
index f40726262..f3337682f 100644
--- a/internal/agentdaemon/proto/prototest/capabilities.go
+++ b/internal/agentdaemon/proto/prototest/capabilities.go
@@ -18,7 +18,6 @@ func Capabilities(overrides proto.AgentKindCapabilities) proto.AgentKindCapabili
 		Usage:                          proto.CapabilityUnsupported,
 		Resume:                         proto.CapabilityUnsupported,
 		NativeSessionRecovery:          proto.CapabilityUnsupported,
-		WorkspaceAuthoring:             proto.CapabilityUnsupported,
 		Steering:                       proto.CapabilityUnsupported,
 		MessageItems:                   proto.CapabilityUnsupported,
 		ToolObservations:               proto.CapabilityUnsupported,
diff --git a/internal/agentdaemon/proto/prototest/wire.go b/internal/agentdaemon/proto/prototest/wire.go
index d27120aad..7833863c9 100644
--- a/internal/agentdaemon/proto/prototest/wire.go
+++ b/internal/agentdaemon/proto/prototest/wire.go
@@ -110,7 +110,7 @@ func WireScenarios() []WireScenario {
 	}
 	prepare := send(Core, proto.TypeExecutionPrepare, PreparationID, proto.ExecutionPreparePayload{
 		SessionID:     SessionID,
-		Configuration: proto.PromptRequestPayload{AgentKind: HarnessKind, AgentStateKey: StateKey, StrictResume: true, DisableExecutionEnvironment: true},
+		Configuration: proto.PromptRequestPayload{AgentKind: HarnessKind, AgentStateKey: StateKey, DisableExecutionEnvironment: true},
 	})
 	started := []Step{
 		prepare,
diff --git a/internal/agentdaemon/proto/workspace_read_preparation.go b/internal/agentdaemon/proto/workspace_read_preparation.go
index f732a329b..5869ca3b2 100644
--- a/internal/agentdaemon/proto/workspace_read_preparation.go
+++ b/internal/agentdaemon/proto/workspace_read_preparation.go
@@ -4,10 +4,10 @@ package proto
 // The native adapter supplies temporary state; this request cannot resume or start.
 func ValidWorkspaceReadPreparation(r PromptRequestPayload) bool {
 	return r.WorkspaceReadOnly && r.LocalEnvironment != nil && r.AgentStateKey != "" &&
-		r.StrictResume && r.ReleaseOnCompletion && r.RunID == "" && len(r.Input) == 0 &&
+		r.ReleaseOnCompletion && r.RunID == "" && len(r.Input) == 0 &&
 		r.ConversationID == "" && r.AgentSessionID == "" &&
-		!r.RequireExistingNativeSession && !r.WorkspaceAuthoring && !r.DisableExecutionEnvironment &&
+		!r.RequireExistingNativeSession && !r.DisableExecutionEnvironment &&
 		len(r.AgentOptions) == 0 && r.ExecutionControls == nil && r.MCPHTTPServers == nil &&
 		len(r.FunctionTools) == 0 && !r.ToolSearch && !r.ObserveMessages &&
-		!r.ObserveToolObservations && !r.ObserveSubagentIdentities
+		!r.ObserveSubagentIdentities
 }
diff --git a/packages/claude-sdk-adapter/README.md b/packages/claude-sdk-adapter/README.md
index feca4d537..4cba3ec4c 100644
--- a/packages/claude-sdk-adapter/README.md
+++ b/packages/claude-sdk-adapter/README.md
@@ -48,7 +48,7 @@ Directory requests are bounded to 8 KiB and 1,000 immediate entries, with explic
 
 ### Command observations
 
-With `ObserveToolObservations`, private workspace execution requires the packaged `workspace_command_observations` feature and emits the neutral command snapshots. Match root, current-query native Bash call/result identities after input; ignore historical replay, synthetic and child work. Preserve exact command text and the native per-call textual result, including native rendering or truncation. This is final native output, not incremental stdout/stderr or reconstructed interleaving. Native error results are failed; unambiguous structured interruption is incomplete. Missing results close as incomplete after the observation drain; query cancellation does not overwrite an already observed native failure. Do not infer an exit code from rendered text or supply cwd/duration without qualified native fields. Preparation alone emits no command. Cold continuation must not reissue historical observations. This private translation does not enable public workspace admission, Read/Edit Items or Files ownership.
+Private workspace execution requires the packaged `workspace_command_observations` feature and emits the neutral command snapshots. Match root, current-query native Bash call/result identities after input; ignore historical replay, synthetic and child work. Preserve exact command text and the native per-call textual result, including native rendering or truncation. This is final native output, not incremental stdout/stderr or reconstructed interleaving. Native error results are failed; unambiguous structured interruption is incomplete. Missing results close as incomplete after the observation drain; query cancellation does not overwrite an already observed native failure. Do not infer an exit code from rendered text or supply cwd/duration without qualified native fields. Preparation alone emits no command. Cold continuation must not reissue historical observations. This private translation does not enable public workspace admission, Read/Edit Items or Files ownership.
 
 ### HTTP MCP
 
@@ -66,11 +66,11 @@ Workspace deferred-function discovery uses native ToolSearch alongside the norma
 
 For unmanaged bootstrap, daemon `connect` optionally registers this factory as `claude_sdk` when the operator sets `OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT` to the absolute packaged `dist/main.js`. `OAC_RUNTIME_CLAUDE_SDK_NODE` selects Node (default: `node` on PATH). Discovery resolves Node once and checks that exact configuration before pairing; the SDK's bounded runtime check is independent of CLI version probes. A ready SDK alone is sufficient to start the daemon. No configuration means no SDK probe or descriptor; failed readiness reports an unavailable descriptor with a rejecting factory. Runtime checks establish local readiness, not provider authentication. Installed daemons use `start` and their verified installation manifest for adapter selection and activation; ambient activation variables cannot extend that selection. See [the native installation contract](../../deploy/README.md#native-daemon-installer).
 
-SDK state lives under `paths.ProfileDir(profile)/runtime/claude-sdk`, independently of the replaceable runtime bundle. Both the entrypoint and managed state root must be absolute. Background re-execution inherits operator configuration; it does not persist provider credentials in pairing profiles. The daemon registers `claude_sdk` directly, without the `WorkspaceAuthoring` wrapper of its product agent kinds. It accepts no caller-supplied environment variables or business write authority.
+SDK state lives under `paths.ProfileDir(profile)/runtime/claude-sdk`, independently of the replaceable runtime bundle. Both the entrypoint and managed state root must be absolute. Background re-execution inherits operator configuration; it does not persist provider credentials in pairing profiles. It accepts no caller-supplied environment variables or business write authority.
 
 ### Descriptor and execution profile
 
-The SDK descriptor advertises the validated daemon subset, including durable Turns/input receipts, text observations, function tools, raw usage and restrictive execution controls. It does not advertise permissions, product authoring, raw tool Items, general web-search control or text-verbosity levels. Router admission for `environment:none` uses the available engine capability, not an engine name.
+The SDK descriptor advertises the validated daemon subset, including durable Turns/input receipts, text observations, function tools, raw usage and restrictive execution controls. It does not advertise permissions, raw tool Items, general web-search control or text-verbosity levels. Router admission for `environment:none` uses the available engine capability, not an engine name.
 
 Core owns public admission for Claude: [harness selection](../../contracts/agents-api/model-execution.md#harness-selection) chooses the engine for each Session; one [engine policy](../../contracts/agents-api/harness-onboarding.md#add-the-engine-to-core) serves API admission, device selection and the final claim; the [qualified operations](../../contracts/agents-api/harness-capabilities.md) table records Claude's medium-only verbosity and object-root function schemas; [function result images](../../contracts/agents-api/message-content.md#function-results) defines which placements accept image results; and [deployment defaults](../../contracts/agents-api/model-execution.md#deployment-defaults) define the model provider Core freezes for a Session. The adapter receives that provider as the adapter-owned `model_provider`, never in public Session configuration. Without one, a `none` host uses the daemon's own provider environment. The adapter alone selects the provider environment and removes credentials from native tool environments.
 
@@ -78,7 +78,7 @@ The `none` profile accepts only text, explicit model/system instructions, manage
 
 ### Function server and results
 
-The internal SDK function-server helper uses the maintained MCP server's public request handlers and standard Tool/CallToolResult types. It snapshots definitions and forwards JSON Schema without a JSON Schema-to-Zod conversion; supplied tools are always loaded. Native call identity comes from the pinned harness's `claudecode/toolUseId` MCP metadata, independently of request IDs, names or arrival order. Missing identities and undeclared tools fail before invoking the host. Return content/error fields unchanged over MCP and forward its per-request abort signal. The private Go factory connects declared functions through this helper and reuses the daemon function-call/result interface and opt-in neutral observations. The native function-server registry must contain exactly those functions. SDK allowlisting admits only these host callbacks; the host still owns result decisions and any business permission checks. It grants no runtime-token business authority.
+The internal SDK function-server helper uses the maintained MCP server's public request handlers and standard Tool/CallToolResult types. It snapshots definitions and forwards JSON Schema without a JSON Schema-to-Zod conversion; supplied tools are always loaded. Native call identity comes from the pinned harness's `claudecode/toolUseId` MCP metadata, independently of request IDs, names or arrival order. Missing identities and undeclared tools fail before invoking the host. Return content/error fields unchanged over MCP and forward its per-request abort signal. The private Go factory connects declared functions through this helper and reuses the daemon function-call/result interface and neutral observations. The native function-server registry must contain exactly those functions. SDK allowlisting admits only these host callbacks; the host still owns result decisions and any business permission checks. It grants no runtime-token business authority.
 
 Function results remain pending after stdin/MCP delivery. A matching live, root native user tool_result confirms application only when its Session/call identity, error flag and ordered content match the submission. Text matches exactly; each submitted image position must remain a valid native base64 image. Native resizing or re-encoding may change image bytes. This acknowledges incorporation into native history, not byte/pixel fidelity or completed provider consumption. Public Items retain the original caller content; real image-dependent model responses separately qualify usability. Ignore replayed, synthetic and subagent messages. Native error text joins the submitted text parts with newlines; neutral observations retain their original order and separate failure status. Missing/mismatched receipts fail the execution; do not replay unknown delivery. Result submission waits at most ten seconds for a receipt and cancels uncertain execution on timeout. Invalid or unsupported image results fail before consuming a pending call. Function state belongs to one live Run and ends with it; the router owns receipt retry/conflict handling. This does not establish crash recovery or exactly-once effects.
 
diff --git a/scripts/name-allowlist.json b/scripts/name-allowlist.json
index 23ac631c9..0cb022c51 100644
--- a/scripts/name-allowlist.json
+++ b/scripts/name-allowlist.json
@@ -144,16 +144,6 @@
     "regex": "AGENTS_API_PUBLIC_URL",
     "reason": "Historical migration commentary records the environment name used when this migration was written."
   },
-  {
-    "path": "apps/daemon/internal/cli/companion_path.go",
-    "regex": "\\bparsar\\b",
-    "reason": "The authoring bridge puts the separate product CLI on PATH; that CLI keeps its own name."
-  },
-  {
-    "path": "apps/daemon/internal/cli/companion_path_test.go",
-    "regex": "\\bparsar\\b",
-    "reason": "The authoring bridge puts the separate product CLI on PATH; that CLI keeps its own name."
-  },
   {
     "path": "CONTRIBUTING.md",
     "regex": "apps/parsar/|Parsar owns",
diff --git a/services/core/internal/execution/delivery.go b/services/core/internal/execution/delivery.go
index b18f4f86e..3cd1e1833 100644
--- a/services/core/internal/execution/delivery.go
+++ b/services/core/internal/execution/delivery.go
@@ -256,7 +256,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 						return
 					}
 				}
-			case proto.TypePermissionRequest, proto.TypePromptForUserChoice, proto.TypeAuthoringRequest:
+			case proto.TypePermissionRequest, proto.TypePromptForUserChoice:
 				result.ErrorCode = "interaction_not_supported"
 				return
 			}
diff --git a/services/core/internal/execution/directory_preparation.go b/services/core/internal/execution/directory_preparation.go
index 427e400cb..177f98571 100644
--- a/services/core/internal/execution/directory_preparation.go
+++ b/services/core/internal/execution/directory_preparation.go
@@ -25,7 +25,7 @@ func (d *Dispatcher) readPreparedDirectory(ctx context.Context, peer *runtimegat
 }
 
 func (d *Dispatcher) withPreparedWorkspace(owner context.Context, peer *runtimegateway.Session, session sessions.Session, environment sessions.Environment, bound sessions.ExecutionDevice, consume func(context.Context, string) error) error {
-	req := proto.PromptRequestPayload{AgentKind: session.Engine, AgentStateKey: "agents-api-" + session.ID, StrictResume: true, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
+	req := proto.PromptRequestPayload{AgentKind: session.Engine, AgentStateKey: "agents-api-" + session.ID, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
 	if err := d.configurePreparedEnvironment(session, environment, bound, &req); err != nil {
 		return ErrExecutionUnavailable
 	}
diff --git a/services/core/internal/execution/recovery_test.go b/services/core/internal/execution/recovery_test.go
index e71df9b27..75e798208 100644
--- a/services/core/internal/execution/recovery_test.go
+++ b/services/core/internal/execution/recovery_test.go
@@ -20,7 +20,7 @@ func TestExistingSessionRecoveryRequiresVerifiedCapability(t *testing.T) {
 						}
 						continue
 					}
-					if err != nil || req.RequireExistingNativeSession != wantRecovery || req.AgentSessionID != nativeID || !req.StrictResume || req.AgentStateKey != "agents-api-session" {
+					if err != nil || req.RequireExistingNativeSession != wantRecovery || req.AgentSessionID != nativeID || req.AgentStateKey != "agents-api-session" {
 						t.Fatalf("engine=%s started=%v id=%s capability=%v request=%+v err=%v", engine, started, nativeID, capable, req, err)
 					}
 				}
diff --git a/services/core/internal/execution/request.go b/services/core/internal/execution/request.go
index 82ba8ade8..99b06d1f1 100644
--- a/services/core/internal/execution/request.go
+++ b/services/core/internal/execution/request.go
@@ -54,9 +54,8 @@ func (d *Dispatcher) executionRequest(ctx context.Context, session sessions.Sess
 	}
 	request := proto.PromptRequestPayload{AgentKind: session.Engine, FunctionTools: tools.Functions, ToolSearch: tools.Search,
 		AgentOptions: options, ExecutionControls: controls, AgentStateKey: "agents-api-" + session.ID,
-		AgentSessionID: bound.NativeSessionID, StrictResume: true,
-		RequireExistingNativeSession: recoverNativeSession,
-		ObserveMessages:              caps.MessageItems, ObserveToolObservations: true,
+		AgentSessionID: bound.NativeSessionID, RequireExistingNativeSession: recoverNativeSession,
+		ObserveMessages:           caps.MessageItems,
 		ObserveSubagentIdentities: snapshot.Agent.MultiAgent.Enabled,
 		MaxConcurrentSubagents:    snapshot.Agent.MultiAgent.MaxConcurrentSubagents,
 		DisableSubagents:          !snapshot.Agent.MultiAgent.Enabled}
diff --git a/services/core/internal/runtimedevice/state.go b/services/core/internal/runtimedevice/state.go
index 6bb39ecfa..0d0cf69a0 100644
--- a/services/core/internal/runtimedevice/state.go
+++ b/services/core/internal/runtimedevice/state.go
@@ -91,7 +91,6 @@ type KindCapabilities struct {
 	MCPHTTPBearerAuth    bool `json:"mcp_http_bearer_auth,omitempty"`
 	DurableInputReceipts bool `json:"durable_input_receipts,omitempty"`
 	DurableTurns         bool `json:"durable_turns,omitempty"`
-	WorkspaceAuthoring   bool `json:"workspace_authoring,omitempty"`
 }
 
 // SupportedAgentKind is the sanitized runtime.config view
diff --git a/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go b/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
index 7a6982fca..8183f6cab 100644
--- a/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
+++ b/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
@@ -87,7 +87,7 @@ func TestLiveMCPBearerGatewayColdContinuation(t *testing.T) {
 		turn := &mcpBearerTurn{}
 		turns = append(turns, turn)
 		runID := uuid.NewString()
-		request := proto.PromptRequestPayload{AgentKind: "codex", ConversationID: "mcp-bearer-acceptance", RunID: runID, Input: proto.TextInput(prompt), AgentStateKey: "mcp-bearer-acceptance", AgentSessionID: resume, StrictResume: true, ReleaseOnCompletion: true, ObserveMessages: true, ObserveToolObservations: true, DisableExecutionEnvironment: true, DisableSubagents: true, MCPHTTPServers: &servers, AgentOptions: map[string]any{"model": "MiniMax-M3"}, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
+		request := proto.PromptRequestPayload{AgentKind: "codex", ConversationID: "mcp-bearer-acceptance", RunID: runID, Input: proto.TextInput(prompt), AgentStateKey: "mcp-bearer-acceptance", AgentSessionID: resume, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, MCPHTTPServers: &servers, AgentOptions: map[string]any{"model": "MiniMax-M3"}, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
 		sub, err := peer.SubscribeDurable(runID)
 		if err != nil {
 			t.Fatal("cannot subscribe before real daemon dispatch")
diff --git a/services/core/internal/runtimegateway/session.go b/services/core/internal/runtimegateway/session.go
index cb115fedb..7d166ce87 100644
--- a/services/core/internal/runtimegateway/session.go
+++ b/services/core/internal/runtimegateway/session.go
@@ -533,7 +533,6 @@ func deviceKindsFromHeartbeat(p proto.HeartbeatPayload) []runtimedevice.Supporte
 				MCPHTTPTools:                   info.Capabilities.MCPHTTPTools.IsSupported(),
 				MCPHTTPRequired:                info.Capabilities.MCPHTTPRequired.IsSupported(),
 				MCPHTTPBearerAuth:              info.Capabilities.MCPHTTPBearerAuth.IsSupported(),
-				WorkspaceAuthoring:             info.Capabilities.WorkspaceAuthoring.IsSupported(),
 			},
 		})
 	}
diff --git a/services/core/tests/integration/execution_tools_test.go b/services/core/tests/integration/execution_tools_test.go
index d1cd4a85d..77cf4c88f 100644
--- a/services/core/tests/integration/execution_tools_test.go
+++ b/services/core/tests/integration/execution_tools_test.go
@@ -19,8 +19,8 @@ func TestExecutionNegotiatesAndPersistsToolObservations(t *testing.T) {
 	env := h.read(testExecutionRequest)
 	var request proto.PromptRequestPayload
 	_ = env.DecodePayload(&request)
-	if !request.ObserveToolObservations || request.ObserveMessages {
-		t.Fatal("advertised capability was not requested")
+	if request.ObserveMessages {
+		t.Fatal("unadvertised message items were requested")
 	}
 	start := json.RawMessage(`{"kind":"mcp","server":"reference","name":"lookup","arguments":{"key":"value"},"status":"in_progress","output":null,"error":null}`)
 	complete := json.RawMessage(`{"kind":"mcp","server":"reference","name":"lookup","arguments":{"key":"value"},"status":"completed","output":{"content":[{"type":"text","text":"answer"}],"structuredContent":{"version":9007199254740993}},"error":null}`)
diff --git a/services/core/tests/integration/harness_onboarding_test.go b/services/core/tests/integration/harness_onboarding_test.go
index b655f11cb..f60c5342a 100644
--- a/services/core/tests/integration/harness_onboarding_test.go
+++ b/services/core/tests/integration/harness_onboarding_test.go
@@ -117,7 +117,7 @@ func TestThirdHarnessPublicOnboarding(t *testing.T) {
 	}
 	request("POST", "/v1/agents/sessions/"+created.ID+"/events", `{"events":[{"type":"agent.session.input.message","input":[{"role":"user","content":[{"type":"input_text","text":"hold"}]}]}]}`, 202)
 	next := awaitOnboardingPrompt(t, started)
-	if next.RunID == first.RunID || next.AgentSessionID != bound.NativeSessionID || !next.StrictResume {
+	if next.RunID == first.RunID || next.AgentSessionID != bound.NativeSessionID {
 		t.Fatal(next)
 	}
 	request("POST", "/v1/agents/sessions/"+created.ID+"/events", `{"events":[{"type":"agent.session.input.cancel"}]}`, 202)

From 1618d4e6c29f0f348616d44a9f7daf0bdeb804f7 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 16:18:06 +0800
Subject: [PATCH 19/60] fix: make installation retries safe and predictable
 (#470)

* fix: make installation retries safe and predictable

* fix: share installation log cleanup on every retry

* fix: make retry preparation atomic and preserve running images

* fix: complete installer preparation before publishing state

* fix: publish node configuration atomically
---
 apps/web/e2e/nodes.spec.ts                    |   8 +-
 .../src/features/sandbox/NodeEnrollment.tsx   |   2 +-
 .../sandbox/enrollment-command.test.ts        |  56 ++---
 .../features/sandbox/enrollment-command.ts    |  35 ++-
 .../src/features/sandbox/node-enrollment.ts   |   4 +-
 apps/web/src/lib/locale-strings.ts            |   4 +-
 deploy/README.md                              |   2 +
 deploy/install.sh                             | 188 ++++++++++-----
 deploy/node/README.md                         |   8 +-
 deploy/node/distribution.py                   | 159 +++++--------
 deploy/node/node_generations.py               |  32 +--
 deploy/node/node_install.py                   |  78 +++---
 deploy/node/test_distribution.py              |  74 ++++--
 deploy/node/test_node_install.py              |  79 +++++++
 deploy/test_install.py                        | 222 +++++++++++++++++-
 docs/getting-started/install.md               |   8 +-
 docs/getting-started/nodes.md                 |  19 +-
 docs/getting-started/operations.md            |  13 +-
 docs/getting-started/self-hosted.md           |   2 +-
 docs/zh/getting-started/install.md            |  10 +-
 docs/zh/getting-started/nodes.md              |  19 +-
 docs/zh/getting-started/operations.md         |  15 +-
 docs/zh/getting-started/self-hosted.md        |   4 +-
 .../nativeinstaller/assets/bootstrap.ps1      |   4 +-
 .../nativeinstaller/assets/bootstrap.sh       |  11 +-
 .../bootstrap_recovery_test.go                |  61 +++++
 26 files changed, 756 insertions(+), 361 deletions(-)

diff --git a/apps/web/e2e/nodes.spec.ts b/apps/web/e2e/nodes.spec.ts
index 721bcf6a0..f404a5de6 100644
--- a/apps/web/e2e/nodes.spec.ts
+++ b/apps/web/e2e/nodes.spec.ts
@@ -35,12 +35,12 @@ test("adds a node: host requirements, a root/sudo command, a countdown, the same
   const field = add.getByLabel("One-time enrollment command", { exact: true });
   await expect(field).toHaveValue(/enroll_fixture_/);
   // The token goes on stdin to the checked installer, run with sudo unless the shell is root.
-  await expect(field).toHaveValue(/^ \(umask 077;.*\|\| s=sudo\n/);
-  await expect(field).toHaveValue(/\| \$s \$\{s:\+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY\} python3 "\$d\/node-install\.pyz" \$\{NO_COLOR\+--no-color\} --enrollment-token-stdin /);
+  await expect(field).toHaveValue(/^ \(umask 077\n/);
+  await expect(field).toHaveValue(/\| \$s \$\{s:\+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY\} python3 "\$installer" \$\{NO_COLOR\+--no-color\} --enrollment-token-stdin /);
   // It downloads from, and names as its source, the public URL, not the loopback address this browser uses.
   await expect(field).toHaveValue(/curl [^\n]* 'https:\/\/core\.example\.com\/node-install\/node-install\.pyz' /);
   await expect(field).toHaveValue(/ --source-url 'https:\/\/core\.example\.com' --core-url 'https:\/\/core\.example\.com' /);
-  await expect(add.getByText("If the command is interrupted or the download stalls, run the same command again: the download resumes.")).toBeVisible();
+  await expect(add.getByText("If the command is interrupted or the download stalls, run it again: unfinished downloads restart, and verified files are reused.")).toBeVisible();
   await expect(add.getByRole("timer")).toHaveText(/^Expires in (10:00|9:\d\d)$/);
   const progress = add.getByRole("status", { name: "Registration progress" });
   await expect(progress).toHaveText(/Waiting for registration.*Connect.*Docker check/);
@@ -155,7 +155,7 @@ test("removes a node after confirmation", async ({ page, request }) => {
   await expect(page.getByRole("table", { name: "Sandbox nodes" })).not.toContainText("edge-03");
   // Removing the Core record leaves the system service for root/sudo to uninstall on its host.
   const cleanup = page.getByRole("dialog", { name: "Clean up the host" });
-  await expect(cleanup.getByLabel("Uninstall command", { exact: true })).toHaveValue(/\| s=sudo\nexport http_proxy=[^\n]+\nexport HTTP_PROXY=[^\n]+\nprintf '\\n==> Downloading node installer\.\.\.\\n' &&\ncurl [^\n]* 'https:\/\/core\.example\.com\/node-install\/node-install\.pyz' [^]*\n\$s \$\{s:\+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY\} python3 "\$d\/node-install\.pyz" \$\{NO_COLOR\+--no-color\} --uninstall --installation-id '7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f'\)$/);
+  await expect(cleanup.getByLabel("Uninstall command", { exact: true })).toHaveValue(/\| s=sudo\nexport http_proxy=[^\n]+\nexport HTTP_PROXY=[^\n]+\nprintf '\\n==> Downloading node installer\.\.\.\\n' &&\ncurl [^\n]* 'https:\/\/core\.example\.com\/node-install\/node-install\.pyz' [^]*\n\$s \$\{s:\+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY\} python3 "\$installer" \$\{NO_COLOR\+--no-color\} --uninstall --installation-id '7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f'\)$/);
   await expect(cleanup.getByText("Installed without sudo?")).toHaveCount(0);
   await expect(cleanup.getByLabel("Uninstall command without sudo", { exact: true })).toHaveCount(0);
   // Nothing to force for a node on the current address; closing leaves focus on the page, as the row is gone.
diff --git a/apps/web/src/features/sandbox/NodeEnrollment.tsx b/apps/web/src/features/sandbox/NodeEnrollment.tsx
index 2ffc21f72..8bcc30e87 100644
--- a/apps/web/src/features/sandbox/NodeEnrollment.tsx
+++ b/apps/web/src/features/sandbox/NodeEnrollment.tsx
@@ -293,7 +293,7 @@ export function NodeEnrollment({ client, consoleConfig, deployment, nodes, open,
         {command ? <CommandBlock key={command} value={command} label={t("One-time enrollment command")} autoFocus
           extra={!registered ? <span className="sandbox-command-expiry" role="timer" title={new Date(enrollment.expires_at).toLocaleString(locale)}>{t("Expires in {{time}}", { time: formatCountdown(Date.parse(enrollment.expires_at) - now) })}</span> : null} /> : null}
         {/* The installer keeps partial downloads and exits 130 on Ctrl-C; the token lasts until the countdown ends. */}
-        {command ? <p className="sandbox-command-note">{t("If the command is interrupted or the download stalls, run the same command again: the download resumes.")}</p> : null}
+        {command ? <p className="sandbox-command-note">{t("If the command is interrupted or the download stalls, run it again: unfinished downloads restart, and verified files are reused.")}</p> : null}
         {/* One live region for the whole flow; only its contents change, so each change is announced. */}
         <div role="status" aria-label={t("Registration progress")}>
           {ready && node ? <div className="sandbox-enrollment-status connected"><span className="sandbox-status-dot" />{t("{{name}} · Connected", { name: node.name })}</div>
diff --git a/apps/web/src/features/sandbox/enrollment-command.test.ts b/apps/web/src/features/sandbox/enrollment-command.test.ts
index 180c4e1b9..d0d1a2405 100644
--- a/apps/web/src/features/sandbox/enrollment-command.test.ts
+++ b/apps/web/src/features/sandbox/enrollment-command.test.ts
@@ -7,37 +7,12 @@ import { join } from "node:path";
 import { nodeInstallCommand, nodeLogCommand, nodeUninstallCommand } from "./enrollment-command";
 
 describe("sandbox connection and enrollment", () => {
-  const digest = "a".repeat(64);
-  const install = () => nodeInstallCommand({ token: "secret'onetime", coreUrl: "https://core.example", sourceUrl: "https://console.example", provider: "docker", installationId: "7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f", scriptDigest: digest });
-  it("creates the exact sudo command: a leading space, the checked installer run as root, the token only on stdin", () => {
-    expect(install()).toBe(` (umask 077; d=$(mktemp -d) || exit; trap 'rm -rf "$d"' EXIT; s=; [ "$(id -u)" -eq 0 ] || s=sudo
-export http_proxy="\${http_proxy-\${HTTP_PROXY-}}" https_proxy="\${https_proxy-\${HTTPS_PROXY-}}" no_proxy="\${no_proxy-\${NO_PROXY-}}"
-export HTTP_PROXY="$http_proxy" HTTPS_PROXY="$https_proxy" NO_PROXY="$no_proxy"
-printf '\\n==> Downloading node installer...\\n' &&
-curl -fs --max-time 30 --max-filesize 1048576 'https://console.example/node-install/node-install.pyz' -o "$d/node-install.pyz" || { c=$?; printf 'Cannot download node installer; check the console URL, TLS and proxy settings.\\n' >&2; exit "$c"; }
-printf '==> Verifying node installer...\\n' &&
-printf '%s  %s\\n' '${digest}' "$d/node-install.pyz" | sha256sum -c --status &&
-printf '%s\\n' 'secret'\\''onetime' | $s \${s:+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY} python3 "$d/node-install.pyz" \${NO_COLOR+--no-color} --enrollment-token-stdin --source-url 'https://console.example' --core-url 'https://core.example' --provider 'docker' --installation-id '7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f')`);
-  });
-  it("creates the exact uninstall commands, with no token", () => {
-    const uninstall = () => nodeUninstallCommand({ sourceUrl: "https://console.example", installationId: "7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f", scriptDigest: digest });
-    expect(uninstall()).toBe(` (umask 077; d=$(mktemp -d) || exit; trap 'rm -rf "$d"' EXIT; s=; [ "$(id -u)" -eq 0 ] || s=sudo
-export http_proxy="\${http_proxy-\${HTTP_PROXY-}}" https_proxy="\${https_proxy-\${HTTPS_PROXY-}}" no_proxy="\${no_proxy-\${NO_PROXY-}}"
-export HTTP_PROXY="$http_proxy" HTTPS_PROXY="$https_proxy" NO_PROXY="$no_proxy"
-printf '\\n==> Downloading node installer...\\n' &&
-curl -fs --max-time 30 --max-filesize 1048576 'https://console.example/node-install/node-install.pyz' -o "$d/node-install.pyz" || { c=$?; printf 'Cannot download node installer; check the console URL, TLS and proxy settings.\\n' >&2; exit "$c"; }
-printf '==> Verifying node installer...\\n' &&
-printf '%s  %s\\n' '${digest}' "$d/node-install.pyz" | sha256sum -c --status &&
-$s \${s:+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY} python3 "$d/node-install.pyz" \${NO_COLOR+--no-color} --uninstall --installation-id '7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f')`);
-    expect(nodeUninstallCommand({ sourceUrl: "https://console.example", installationId: "7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f", scriptDigest: digest, force: true }).split("\n").at(-1))
-      .toBe(`$s \${s:+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY} python3 "$d/node-install.pyz" \${NO_COLOR+--no-color} --uninstall --installation-id '7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f' --force)`);
-  });
   it("points at the system node journal", () => {
     expect(nodeLogCommand("7f3c2a90-fixture")).toBe("sudo journalctl -u oac-node-7f3c2a90-fixture.service");
     expect(nodeLogCommand("a b")).toBe("sudo journalctl -u 'oac-node-a b.service'");
   });
   // "as root": a root shell runs the sudo command without sudo.
-  it.each(["success", "download failure", "checksum mismatch", "installer failure", "as root", "no color", "uppercase proxy", "lowercase proxy", "empty proxy", "root proxy"])("executes safely, passes the token only on stdin and cleans private downloads after %s", (scenario) => {
+  it.each(["success", "download failure", "checksum mismatch", "installer failure", "as root", "no color", "uppercase proxy", "lowercase proxy", "empty proxy", "root proxy", "unsupported platform", "old python", "uninstall", "killed download"])("executes safely, passes the token only on stdin and cleans private downloads after %s", (scenario) => {
     const parent = join(homedir(), ".oac", "tests");
     mkdirSync(parent, { recursive: true });
     const root = mkdtempSync(join(parent, "node-command-"));
@@ -55,12 +30,15 @@ $s \${s:+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,N
 if(process.env.SCENARIO==='download failure') process.exit(22);
 const args=process.argv.slice(2);
 if(args.includes('-L')||args.includes('--location')||args.includes('--insecure')) process.exit(90);
-fs.writeFileSync(args[args.indexOf('-o')+1],fs.readFileSync(process.env.FIXTURE));`);
+fs.writeFileSync(args[args.indexOf('-o')+1],fs.readFileSync(process.env.FIXTURE));
+if(process.env.SCENARIO==='killed download') process.kill(process.ppid,'SIGKILL');`);
     executable("sha256sum", `const fs=require('node:fs'), crypto=require('node:crypto');
 const line=fs.readFileSync(0,'utf8').trimEnd(), split=line.indexOf('  ');
 if(split!==64) process.exit(2);
 const actual=crypto.createHash('sha256').update(fs.readFileSync(line.slice(split+2))).digest('hex');
 process.exit(actual===line.slice(0,split)?0:1);`);
+    executable("flock", `process.exit(0);`);
+    executable("uname", `console.log(process.argv[2]==='-s'?(process.env.SCENARIO==='unsupported platform'?'Darwin':'Linux'):'x86_64');`);
     executable("id", `console.log((process.env.SCENARIO==='as root'||process.env.SCENARIO==='root proxy')?'0':'1000');`);
     // The shell's builtin printf feeds the token; an external one would put it in an argv.
     executable("printf", `require('node:fs').appendFileSync(process.env.PRINTF_REPORT,'called\\n');`);
@@ -71,19 +49,34 @@ const env={...process.env}; delete env.NO_COLOR;
 for(const key of Object.keys(env)) if(/_proxy$/i.test(key)&&!keep.includes(key)) delete env[key];
 process.exit(spawnSync(args[0],args.slice(1),{stdio:'inherit',env}).status ?? 1);`);
     executable("python3", `const fs=require('node:fs');
+if(process.argv[2]==='-c') process.exit(process.env.SCENARIO==='old python'?1:0);
 const stdin=fs.readFileSync(0,'utf8');
 fs.writeFileSync(process.env.REPORT,JSON.stringify({args:process.argv.slice(2),env:process.env,stdin,mode:fs.statSync(process.argv[2]).mode&511}));
 process.exit(process.env.SCENARIO==='installer failure'?7:0);`);
     const digest = scenario === "checksum mismatch" ? "0".repeat(64) : createHash("sha256").update(payload).digest("hex");
     const token = "fixture'one-time";
     try {
-      const command = nodeInstallCommand({ token, coreUrl: "http://127.0.0.1:8091", sourceUrl: "http://localhost:8080", provider: "docker", installationId: "fixture-installation", scriptDigest: digest });
+      const command = scenario === "uninstall" ? nodeUninstallCommand({ sourceUrl: "http://localhost:8080", installationId: "fixture-installation", scriptDigest: digest }) : nodeInstallCommand({ token, coreUrl: "http://127.0.0.1:8091", sourceUrl: "http://localhost:8080", provider: "docker", installationId: "fixture-installation", scriptDigest: digest });
       const proxy = "http://fixture:private%20password@proxy.example:3128";
       const proxyEnv: Record<string, string | undefined> = { http_proxy: undefined, https_proxy: undefined, no_proxy: undefined, HTTP_PROXY: undefined, HTTPS_PROXY: undefined, NO_PROXY: undefined, ALL_PROXY: undefined };
       if (["uppercase proxy", "root proxy", "empty proxy"].includes(scenario)) Object.assign(proxyEnv, { HTTP_PROXY: proxy, HTTPS_PROXY: proxy, NO_PROXY: "core.example,localhost" });
       if (scenario === "lowercase proxy") Object.assign(proxyEnv, { http_proxy: proxy, https_proxy: proxy, no_proxy: "core.example,localhost", HTTP_PROXY: "http://wrong.invalid" });
       if (scenario === "empty proxy") proxyEnv.http_proxy = "";
-      const result = spawnSync("sh", ["-c", command], { env: { ...process.env, ...proxyEnv, NO_COLOR: scenario === "no color" ? "" : undefined, PATH: `${bin}:${process.env.PATH}`, TMPDIR: temporary, SCENARIO: scenario, FIXTURE: fixture, REPORT: report, SUDO_REPORT: sudoReport, PRINTF_REPORT: printfReport }, encoding: "utf8" });
+      const options = { env: { ...process.env, ...proxyEnv, HOME: root, NO_COLOR: scenario === "no color" ? "" : undefined, PATH: `${bin}:${process.env.PATH}`, TMPDIR: temporary, SCENARIO: scenario, FIXTURE: fixture, REPORT: report, SUDO_REPORT: sudoReport, PRINTF_REPORT: printfReport }, encoding: "utf8" as const };
+      let result = spawnSync("sh", ["-c", command], options);
+      if (scenario === "killed download") {
+        expect(result.signal === "SIGKILL" || result.status === 137).toBe(true);
+        expect(readdirSync(join(root, ".oac/node-bootstrap"))).toContain("download.partial");
+        result = spawnSync("sh", ["-c", command], { ...options, env: { ...options.env, SCENARIO: "success" } });
+      }
+      if (["unsupported platform", "old python"].includes(scenario)) {
+        expect(result.status).toBe(1);
+        expect(result.stdout).not.toContain("Downloading");
+        expect(result.stderr).toContain(scenario === "old python" ? "Python 3.9" : "Linux amd64");
+        expect(readdirSync(root)).not.toContain("report.json");
+        expect(readdirSync(temporary)).toEqual([]);
+        return;
+      }
       expect(result.status).toBe(scenario === "installer failure" ? 7 : scenario === "download failure" ? 22 : scenario === "checksum mismatch" ? 1 : 0);
       expect(result.stdout).toContain("==> Downloading node installer...");
       expect(result.stdout.includes("==> Verifying node installer...")).toBe(scenario !== "download failure");
@@ -91,6 +84,7 @@ process.exit(process.env.SCENARIO==='installer failure'?7:0);`);
       expect(result.stdout + result.stderr).not.toContain("private%20password");
       expect(result.stdout + result.stderr).not.toContain("\u001b[");
       expect(readdirSync(temporary)).toEqual([]);
+      expect(readdirSync(join(root, ".oac/node-bootstrap"))).not.toContain("download.partial");
       expect(readdirSync(root)).not.toContain("printf.log");
       if (scenario === "download failure" || scenario === "checksum mismatch") {
         expect(readdirSync(root)).not.toContain("report.json");
@@ -106,10 +100,10 @@ process.exit(process.env.SCENARIO==='installer failure'?7:0);`);
         expect(invocation.env[key]).toBe(expected);
         expect(invocation.env[key.toUpperCase()]).toBe(expected);
       }
-      expect(invocation.stdin).toBe(`${token}\n`);
+      expect(invocation.stdin).toBe(scenario === "uninstall" ? "" : `${token}\n`);
       expect(invocation.args.some((arg) => arg.includes("one-time"))).toBe(false);
       expect(Object.values(invocation.env).some((value) => value.includes("one-time"))).toBe(false);
-      expect(invocation.args.slice(1)).toEqual([...(scenario === "no color" ? ["--no-color"] : []), "--enrollment-token-stdin", "--source-url", "http://localhost:8080", "--core-url", "http://127.0.0.1:8091", "--provider", "docker", "--installation-id", "fixture-installation"]);
+      expect(invocation.args.slice(1)).toEqual(scenario === "uninstall" ? ["--uninstall", "--installation-id", "fixture-installation"] : [...(scenario === "no color" ? ["--no-color"] : []), "--enrollment-token-stdin", "--source-url", "http://localhost:8080", "--core-url", "http://127.0.0.1:8091", "--provider", "docker", "--installation-id", "fixture-installation"]);
       expect(invocation.mode & 0o077).toBe(0);
       if (scenario === "as root" || scenario === "root proxy") {
         expect(readdirSync(root)).not.toContain("sudo.json");
diff --git a/apps/web/src/features/sandbox/enrollment-command.ts b/apps/web/src/features/sandbox/enrollment-command.ts
index f67f7d301..2663c1792 100644
--- a/apps/web/src/features/sandbox/enrollment-command.ts
+++ b/apps/web/src/features/sandbox/enrollment-command.ts
@@ -1,26 +1,41 @@
 const quote = (value: string) => `'${value.replaceAll("'", "'\\''")}'`;
 
 /**
- * The start the node commands share: a private directory removed on exit, then
- * the console's installer, checked against its digest before anything runs. The
- * leading space keeps the command out of shell history under
- * HISTCONTROL=ignorespace. In sudo mode `s` is set before the `&&` chain, so a
- * failed download or check stops the command. It ends where the installer's own
- * line begins.
+ * Download and verify into an immutable cache entry before invoking sudo.
+ * The download lock protects disposable files; verified entries remain usable
+ * by other running installers. A leading space supports HISTCONTROL=ignorespace.
  */
 function nodeInstaller(sourceUrl: string, scriptDigest: string): string {
-  return ` (umask 077; d=$(mktemp -d) || exit; trap 'rm -rf "$d"' EXIT; s=; [ "$(id -u)" -eq 0 ] || s=sudo
+  if (!/^[0-9a-f]{64}$/.test(scriptDigest)) throw new Error("Invalid node installer checksum");
+  return ` (umask 077
+[ "$(uname -s)/$(uname -m)" = Linux/x86_64 ] || { printf 'Node installation requires Linux amd64. Use a Linux host for Nodes, or a self-hosted Session for this machine.\\n' >&2; exit 1; }
+for tool in curl sha256sum python3 flock; do command -v "$tool" >/dev/null || { printf 'Required command missing: %s. Install it and rerun.\\n' "$tool" >&2; exit 1; }; done
+python3 -c 'import sys; sys.exit(sys.version_info < (3, 9))' || { printf 'Python 3.9 or newer is required.\\n' >&2; exit 1; }
+[ "$(id -u)" -eq 0 ] || command -v sudo >/dev/null || { printf 'sudo is required; ask the host administrator to run this command.\\n' >&2; exit 1; }
+d="$HOME/.oac/node-bootstrap"
+[ ! -L "$d" ] && mkdir -p "$d" && [ -d "$d" ] && [ -O "$d" ] && chmod 700 "$d" || { printf 'Cannot use the private node bootstrap directory.\\n' >&2; exit 1; }
+installer="$d"/${quote(scriptDigest + ".pyz")}
+for f in "$d/download.lock" "$d/download.partial" "$installer"; do [ ! -L "$f" ] && { [ ! -e "$f" ] || { [ -f "$f" ] && [ -O "$f" ]; }; } || { printf 'Invalid node bootstrap file.\\n' >&2; exit 1; }; done
+exec 9>>"$d/download.lock"
+flock -n 9 || { printf 'Another node download is running; wait and retry.\\n' >&2; exit 1; }
+rm -f "$d/download.partial" || exit
+trap 'rm -f "$d/download.partial"' EXIT
+s=; [ "$(id -u)" -eq 0 ] || s=sudo
 export http_proxy="\${http_proxy-\${HTTP_PROXY-}}" https_proxy="\${https_proxy-\${HTTPS_PROXY-}}" no_proxy="\${no_proxy-\${NO_PROXY-}}"
 export HTTP_PROXY="$http_proxy" HTTPS_PROXY="$https_proxy" NO_PROXY="$no_proxy"
 printf '\\n==> Downloading node installer...\\n' &&
-curl -fs --max-time 30 --max-filesize 1048576 ${quote(sourceUrl + "/node-install/node-install.pyz")} -o "$d/node-install.pyz" || { c=$?; printf 'Cannot download node installer; check the console URL, TLS and proxy settings.\\n' >&2; exit "$c"; }
+curl -fs --connect-timeout 15 --max-time 60 --retry 2 --retry-connrefused --retry-delay 1 --max-filesize 1048576 ${quote(sourceUrl + "/node-install/node-install.pyz")} -o "$d/download.partial" || { c=$?; printf 'Cannot download node installer; check the console URL, TLS and proxy settings.\\n' >&2; exit "$c"; }
 printf '==> Verifying node installer...\\n' &&
-printf '%s  %s\\n' ${quote(scriptDigest)} "$d/node-install.pyz" | sha256sum -c --status &&
+printf '%s  %s\\n' ${quote(scriptDigest)} "$d/download.partial" | sha256sum -c --status || { printf 'Node installer checksum mismatch; generate a fresh command in Web and retry.\\n' >&2; exit 1; }
+mv "$d/download.partial" "$installer" || exit
+trap - EXIT
+flock -u 9
+exec 9>&-
 `;
 }
 
 /** Runs the downloaded installer, as root in sudo mode. */
-const runInstaller = `$s \${s:+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY} python3 "$d/node-install.pyz" \${NO_COLOR+--no-color}`;
+const runInstaller = `$s \${s:+--preserve-env=http_proxy,https_proxy,no_proxy,HTTP_PROXY,HTTPS_PROXY,NO_PROXY} python3 "$installer" \${NO_COLOR+--no-color}`;
 
 /**
  * Adds this host as a node. The one-time token reaches the installer only on
diff --git a/apps/web/src/features/sandbox/node-enrollment.ts b/apps/web/src/features/sandbox/node-enrollment.ts
index 49f7666e4..7e2f6678a 100644
--- a/apps/web/src/features/sandbox/node-enrollment.ts
+++ b/apps/web/src/features/sandbox/node-enrollment.ts
@@ -18,7 +18,7 @@ export interface HostPrerequisite {
  * What a host needs for the default command, which runs the installer as root
  * and the node as the `oac-node` system service (sudo mode), as the command
  * and deploy/node/node_install.py check it:
- * - the command runs curl, sha256sum and python3 (enrollment-command.ts), and
+ * - the command runs curl, sha256sum, flock and python3 (enrollment-command.ts), and
  *   `sudo` unless the shell is root; `host_checks` needs Python 3.9+, Linux amd64,
  *   systemd as the init system, and SELinux not enforcing; `other_node` refuses a
  *   host that already runs a sudo-mode node for another installation, since
@@ -42,7 +42,7 @@ export interface HostPrerequisite {
  */
 export function hostRequirements(provider: "docker" | "microsandbox", sized: boolean): HostPrerequisite[] {
   return [
-    { label: "Linux amd64 with systemd; Python 3.9+, curl and sha256sum; root or sudo" },
+    { label: "Linux amd64 with systemd; Python 3.9+, curl, sha256sum and flock; root or sudo" },
     { label: "SELinux is not enforcing" },
     { label: "In sudo mode, one Core per host: a host already running a sudo-mode node for another Core is refused." },
     provider === "docker"
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index 8e98ba65c..a9e7a6171 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -143,10 +143,10 @@ export const chinese = {
   "Change limits": "修改上限",
   "Add another node": "添加另一个节点",
   "Host requirements": "主机要求",
-  "Linux amd64 with systemd; Python 3.9+, curl and sha256sum; root or sudo": "Linux amd64，使用 systemd；装有 Python 3.9+、curl 和 sha256sum；有 root 或 sudo 权限",
+  "Linux amd64 with systemd; Python 3.9+, curl, sha256sum and flock; root or sudo": "Linux amd64，使用 systemd；装有 Python 3.9+、curl、sha256sum 和 flock；有 root 或 sudo 权限",
   "SELinux is not enforcing": "SELinux 不是 enforcing 模式",
   "In sudo mode, one Core per host: a host already running a sudo-mode node for another Core is refused.": "sudo 模式下，每台主机只能接入一个 Core：已为其他 Core 运行 sudo 模式节点的主机会被拒绝。",
-  "If the command is interrupted or the download stalls, run the same command again: the download resumes.": "如果命令被中断或下载卡住，重新运行同一条命令即可，下载会接着进行。",
+  "If the command is interrupted or the download stalls, run it again: unfinished downloads restart, and verified files are reused.": "如果命令被中断或下载卡住，重新运行即可：未完成的下载会从头开始，已校验的完整文件会复用。",
   "Rootful Docker Engine running, its socket owned by the docker group with mode 0660, enforcing CPU and memory limits (cgroup v2)": "Docker Engine 以 rootful 模式运行，套接字属于 docker 组、权限 0660，且能限制 CPU 和内存（cgroup v2）",
   "/dev/kvm in the kvm group (hardware or nested virtualization) and the libraries microsandbox links (glibc)": "属于 kvm 组的 /dev/kvm（硬件或嵌套虚拟化），以及 microsandbox 链接的库（glibc）",
   "Copy command with --force": "复制命令（--force）",
diff --git a/deploy/README.md b/deploy/README.md
index 5324b60ee..716971334 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -11,6 +11,8 @@
 
 `install.sh` downloads its release's `compose.yaml`, checks it against `compose-sha256sums.txt`, writes `.env`, and starts Compose. Core applies database migrations when it starts. The host needs Linux amd64 and Docker Compose 2.26 or newer. [Configuration](../docs/configuration.md) owns the installation layout and settings.
 
+The Core installer validates downloads and Compose in the private sibling `<install-dir>.staging` directory, and pulls all images before publishing the installation directory. A retry clears leftover staging only when its atomically created ownership link names this installation, including after the previous process was killed. An unrecognized nonempty staging directory is preserved. The staging log moves with the configuration and is removed on normal exit. Once published, failures retain configuration, containers and data. A retry verifies and starts that saved installation without replacing its Compose file, cached images or existing containers. Missing images are downloaded explicitly; Compose never pulls images implicitly. It refuses unrelated nonempty directories. `<install-dir>.install.lock` serializes directory preparation; `.oac.lock` serializes service changes with mutating `oac` commands. Both lock files remain after exit. Download failures have bounded retries and timeouts; service startup failures print Compose status and recent logs.
+
 `oac` is a Go command (`services/core/cmd/oac`) in the Core image and the ingress image. The host copy implements `apply`, `core-key` and `rotate-core-key`; `core-key --show` runs `oac-web core-key` in the Web container. Start, stop, logs and removal are `docker compose`. `apply` runs `oac-core check-config` before recreating services. The ingress image runs data initialization as `oac init`, verifies and copies its bundled node metadata without network access, and contains no Python. No service receives a Docker socket. Initialization writes structured logs to stderr for directory preparation, lock acquisition, existing-installation verification, bundled metadata verification and publication, credential generation or reuse, and receipt persistence. Each step records its start and completion; failures identify the current step, and completion records elapsed milliseconds. Credential values and digests are never logged. View these logs with `docker compose logs --timestamps init`.
 
 Web serves the console and forwards `/v1` and `/api/v1` to Core, so it is the only published service. HTTPS is terminated by the operator's reverse proxy or hosting platform, which routes to `web:8080`; `OAC_PUBLIC_URL` records that origin.
diff --git a/deploy/install.sh b/deploy/install.sh
index f862fb282..3746122fd 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -8,7 +8,8 @@ install_dir="${OAC_INSTALL_DIR_DEFAULT:-$HOME/.oac/core}"
 public_url=""
 host_address="0.0.0.0"
 web_port="8080"
-kept=0
+stage=""
+published=0
 
 usage() {
   cat <<'EOF'
@@ -38,23 +39,76 @@ if [[ "$(uname -s)" != Linux || "$(uname -m)" != x86_64 ]]; then
   echo "Core installs on Linux amd64." >&2
   exit 1
 fi
-command -v docker >/dev/null || { echo "Docker Engine with Compose 2.26 or newer is required." >&2; exit 1; }
-command -v curl >/dev/null || { echo "curl is required." >&2; exit 1; }
+fail() { printf '%s\n' "$*" >&2; exit 1; }
+for tool in docker curl sha256sum flock readlink od sed awk grep; do
+  command -v "$tool" >/dev/null || fail "Required command missing: $tool. Install it and rerun this command. Docker needs Compose 2.26 or newer."
+done
 compose_version="$(docker compose version --short 2>/dev/null | sed 's/^v//' || true)"
 major="${compose_version%%.*}"
 minor="${compose_version#*.}"
 minor="${minor%%.*}"
 if [[ ! "$major" =~ ^[0-9]+$ || ! "$minor" =~ ^[0-9]+$ ]] || (( major < 2 || (major == 2 && minor < 26) )); then
-  echo "Docker Compose 2.26 or newer is required (found ${compose_version:-none})." >&2
-  exit 1
+  fail "Docker Compose 2.26 or newer is required (found ${compose_version:-none})."
 fi
-if [[ "$install_dir" != /* ]]; then
-  echo "--install-dir must be absolute." >&2
-  exit 1
+docker info >/dev/null 2>&1 || fail "Cannot reach Docker. Start Docker and check this account's access, then rerun."
+[[ "$install_dir" == /* && "$install_dir" != / ]] || fail "--install-dir must be an absolute directory other than /."
+# These values are written as literal dotenv strings, never shell commands.
+for value in "$install_dir" "$public_url" "$host_address" "$version"; do
+  [[ "$value" != *$'\n'* && "$value" != *$'\r'* && "$value" != *"'"* && "$value" != *\\* ]] || fail "Installation options cannot contain newlines, quotes or backslashes."
+done
+[[ "$web_port" =~ ^[0-9]{1,5}$ ]] && (( 10#$web_port >= 1 && 10#$web_port <= 65535 )) || fail "--web-port must be between 1 and 65535."
+[[ ! -L "$install_dir" ]] || fail "Installation directory must not be a symbolic link."
+[[ ! -e "$install_dir" || -d "$install_dir" ]] || fail "Installation path must be a directory."
+case "$(basename "$install_dir")" in .|..) fail "--install-dir must name the installation directory, not . or ...";; esac
+umask 077
+parent="$(dirname "$install_dir")"
+mkdir -p "$parent"
+parent="$(cd "$parent" && pwd -P)"
+install_dir="$parent/$(basename "$install_dir")"
+lock="$install_dir.install.lock"
+[[ ! -L "$lock" && ( ! -e "$lock" || ( -f "$lock" && -O "$lock" ) ) ]] || fail "Invalid installation lock: $lock"
+exec 9>>"$lock"
+flock -n 9 || fail "Another installation is using this directory. Wait for it to finish and rerun."
+stage="$install_dir.staging"
+[[ ! -L "$stage" && ( ! -e "$stage" || ( -d "$stage" && -O "$stage" ) ) ]] || fail "Invalid installation staging directory: $stage"
+if [[ -d "$stage" && -n "$(ls -A "$stage")" ]]; then
+  [[ -L "$stage/.oac-installer" && "$(readlink "$stage/.oac-installer")" == "$install_dir" ]] || fail "Unrecognized staging directory; preserve it and choose another --install-dir: $stage"
 fi
-if [[ -e "$install_dir" ]] && [[ -n "$(ls -A "$install_dir" 2>/dev/null || true)" ]]; then
-  echo "Installation directory is not empty: $install_dir" >&2
-  exit 1
+rm -rf "$stage"
+mkdir "$stage"
+ln -s "$install_dir" "$stage/.oac-installer"
+log="$stage/install.log"
+: >"$log"
+cleanup() {
+  local status=$?
+  trap - EXIT
+  if [[ "$status" != 0 && "$published" == 1 ]]; then
+    printf '\nInstallation and data retained at %s.\n' "$install_dir" >&2
+    (cd "$install_dir" && docker compose ps --all && docker compose logs --no-color --tail 50) >&2 || true
+    printf 'Fix the reported problem, then rerun install.sh --install-dir %q.\n' "$install_dir" >&2
+  fi
+  [[ -z "$stage" ]] || rm -rf "$stage"
+  rm -f "$log"
+  exit "$status"
+}
+trap cleanup EXIT
+trap 'exit 130' INT
+trap 'exit 143' TERM HUP
+
+# step DESCRIPTION COMMAND... prints the command's output only when it fails.
+step() {
+  printf '%s... ' "$1"
+  shift
+  if "$@" >"$log" 2>&1; then echo done; else echo failed; cat "$log" >&2; return 1; fi
+}
+
+resume=0
+if [[ -e "$install_dir" && -n "$(ls -A "$install_dir")" ]]; then
+  for file in compose.yaml compose-sha256sums.txt .env; do
+    [[ -f "$install_dir/$file" && ! -L "$install_dir/$file" ]] || fail "Directory is not a complete Core installation: $install_dir. Preserve it and choose another directory."
+  done
+  resume=1
+  published=1
 fi
 
 port_busy() {
@@ -67,37 +121,15 @@ port_busy() {
   fi
   (echo >/dev/tcp/127.0.0.1/"$port") >/dev/null 2>&1
 }
-if port_busy "$web_port"; then echo "Port $web_port is already in use." >&2; exit 1; fi
+if [[ "$resume" == 0 ]] && port_busy "$web_port"; then fail "Port $web_port is already in use. Choose another with --web-port."; fi
 asset_base="https://github.com/${repository}/releases/latest/download"
 if [[ "$version" != latest ]]; then
   asset_base="https://github.com/${repository}/releases/download/${version}"
 fi
 
-log="$(mktemp)"
-cleanup() {
-  if [[ "$kept" != 1 && -d "$install_dir" ]]; then
-    (
-      cd "$install_dir"
-      docker compose logs --no-color --tail 50 >&2 || true
-      docker compose down --remove-orphans
-      # Containers own data/; remove it from a container as well.
-      if [[ -d data ]]; then docker compose run --rm --no-deps --volume "$install_dir/data:/data" --entrypoint find database /data -mindepth 1 -delete; fi
-    ) >/dev/null 2>&1 || true
-    rm -rf "$install_dir"
-  fi
-  rm -f "$log"
-}
-trap cleanup EXIT
-
-# step DESCRIPTION COMMAND... prints the command's output only when it fails.
-step() {
-  printf '%s... ' "$1"
-  shift
-  if "$@" >"$log" 2>&1; then echo done; else echo failed; cat "$log" >&2; return 1; fi
-}
-
 # The source address of this host's default route, when it is a private one.
 private_address() {
+  command -v ip >/dev/null || return 0
   ip -4 route get 1.1.1.1 2>/dev/null | sed -n 's/.* src \([0-9.]*\).*/\1/p' |
     grep -E '^(10\.|192\.168\.|172\.(1[6-9]|2[0-9]|3[01])\.)' || true
 }
@@ -108,30 +140,70 @@ if [[ -z "$public_url" && "$host_address" == 0.0.0.0 ]]; then
 fi
 if [[ -z "$public_url" ]]; then public_url="http://localhost:$web_port"; local_only=1; fi
 
-mkdir -p "$install_dir"
-chmod 700 "$install_dir"
-curl --fail --silent --show-error --location "$asset_base/compose-sha256sums.txt" --output "$install_dir/compose-sha256sums.txt"
-curl --fail --silent --show-error --location "$asset_base/compose.yaml" --output "$install_dir/compose.yaml"
-(cd "$install_dir" && sha256sum --check --quiet compose-sha256sums.txt)
+if [[ "$resume" == 0 ]]; then
+  # Prepare configuration privately until downloads and image pulls succeed.
+  # Before publication only this invocation's private staging directory is removed.
+  download() {
+    curl --fail --silent --show-error --location --proto '=https' --proto-redir '=https' \
+      --connect-timeout 15 --max-time 120 --retry 2 --retry-connrefused --retry-delay 1 \
+      --max-filesize 1048576 "$asset_base/$1" --output "$stage/$1"
+  }
+  step "Downloading release checksums" download compose-sha256sums.txt
+  step "Downloading Compose configuration" download compose.yaml
+  {
+    echo "COMPOSE_PROJECT_NAME=oac-$(od -An -N5 -tx1 /dev/urandom | tr -d ' \n')"
+    printf "OAC_INSTALL_DIR='%s'\nOAC_HOST='%s'\nOAC_WEB_PORT='%s'\nOAC_PUBLIC_URL='%s'\n" "$install_dir" "$host_address" "$web_port" "$public_url"
+  } >"$stage/.env"
+fi
 
-umask 077
-{
-  echo "COMPOSE_PROJECT_NAME=oac-$(od -An -N5 -tx1 /dev/urandom | tr -d ' \n')"
-  echo "OAC_INSTALL_DIR=$install_dir"
-  echo "OAC_HOST=$host_address"
-  echo "OAC_WEB_PORT=$web_port"
-  echo "OAC_PUBLIC_URL=$public_url"
-} >"$install_dir/.env"
-
-cd "$install_dir"
-copy_cli() { docker compose create core && docker compose cp core:/usr/local/bin/oac ./oac; }
-step "Pulling images" docker compose pull
-step "Installing the oac command" copy_cli
-step "Starting services" docker compose up -d --wait
-key="$(./oac core-key --show)"
-kept=1
-trap - EXIT
-rm -f "$log"
+if [[ "$resume" == 0 ]]; then cd "$stage"; else cd "$install_dir"; fi
+[[ ! -L .oac.lock && ( ! -e .oac.lock || ( -f .oac.lock && -O .oac.lock ) ) ]] || fail "Invalid installation lock: $install_dir/.oac.lock"
+exec 8>>.oac.lock
+flock -n 8 || fail "Another oac command is using this installation. Wait for it to finish and rerun."
+[[ ! -L install.log && ( ! -e install.log || ( -f install.log && -O install.log ) ) ]] || fail "Invalid installation log: $install_dir/install.log"
+log="$PWD/install.log"
+: >"$log"
+step "Verifying saved configuration" sha256sum --check --quiet compose-sha256sums.txt
+step "Checking Compose configuration" docker compose config --quiet
+if [[ "$resume" == 1 ]]; then
+  printf 'Using saved settings from .env; installation flags only apply to new directories. Existing data is preserved.\n'
+fi
+public_url="$(docker compose config --environment | sed -n 's/^OAC_PUBLIC_URL=//p')"
+local_only=0
+[[ "$public_url" != http://localhost:* && "$public_url" != http://127.0.0.1:* ]] || local_only=1
+pull_images() {
+  local images image
+  images="$(docker compose config --images)" || return
+  while IFS= read -r image; do
+    [[ -n "$image" ]] || continue
+    if [[ "$resume" == 0 ]] || ! docker image inspect "$image" >/dev/null 2>&1; then
+      docker pull --platform linux/amd64 "$image" || return
+    fi
+  done <<<"$images"
+}
+step "Checking and downloading images" pull_images
+if [[ "$resume" == 0 ]]; then
+  # An existing empty directory may be replaced, never a directory with user data.
+  if [[ -e "$install_dir" ]]; then rmdir "$install_dir"; fi
+  mv "$stage" "$install_dir"
+  stage=""
+  cd "$install_dir"
+  log="$install_dir/install.log"
+  published=1
+fi
+rm -f .oac-installer
+copy_cli() (
+  [[ ! -L ./oac.download ]] || fail "Temporary oac command must not be a symbolic link."
+  trap 'rm -f ./oac.download' EXIT
+  docker compose create --pull never --no-recreate core &&
+    docker compose cp core:/usr/local/bin/oac ./oac.download &&
+    mv ./oac.download ./oac
+)
+if [[ ! -x ./oac ]]; then step "Installing the oac command" copy_cli; fi
+step "Starting services" docker compose up -d --wait --wait-timeout 180 --pull never --no-recreate
+if ! key="$(./oac core-key --show)"; then
+  fail "Services started, but the Core key could not be read. Inspect Web's logs and retry; data is preserved."
+fi
 
 sudo=""
 if [[ "$EUID" == 0 && -n "${SUDO_USER:-}" ]]; then sudo="sudo "; fi
diff --git a/deploy/node/README.md b/deploy/node/README.md
index 0cd68fb95..74814031c 100644
--- a/deploy/node/README.md
+++ b/deploy/node/README.md
@@ -5,7 +5,7 @@ These modules are packaged as `node-install.pyz`, which Web serves at `/node-ins
 | Module | Role |
 | --- | --- |
 | `node_install.py`, `node_spec.py`, `node_generations.py` | Node installer and generation helper. `node_spec.py` is generated by `go run ./services/core/cmd/specification-contract -write` |
-| `distribution.py` | Checksums, release metadata and Docker image identity |
+| `distribution.py` | Verified artifacts, private temporary files, release metadata and Docker image identity |
 | `install_display.py`, `node_output.py` | Terminal output |
 | `provider_assets.py` | Node provider artifact names, generated by `go run ./services/core/cmd/provider-artifacts` |
 | `node_payload.py` | Publish a release's node files without replacing bytes already installed |
@@ -27,12 +27,16 @@ The node installer runs as root and prepares the host for one node per installat
 
 ## Download contract
 
+The generated command uses `~/.oac/node-bootstrap` in the invoking account's home. Under `download.lock`, it discards an unfinished `download.partial`, downloads and verifies the bootstrap, then publishes `<sha256>.pyz`. The lock is released before invoking sudo; verified files stay available to running installers. Node file writes share `distribution.temporary_file`: under the caller's installation lock, remove the previous temporary file, write privately, and publish atomically. The same lifecycle covers payloads, extraction, helpers, settings and enrollment tokens. Registration tokens are removed even when a rerun finds the node already registered.
+
+Configuration files are published only after their complete contents are written; a retry preserves an existing matching file and refuses conflicting contents. Generation leases are durable locks, not disposable temporary files: interruption between creating a lease and recording its inode identity requires operator inspection. A retry refuses that unrecorded lease instead of replacing an inode that a Runtime helper could still hold.
+
 The distribution manifest is the one download contract for nodes: flat versioned file names, and the compressed and unpacked size and SHA-256 of the Runtime.
 
 - A Compose installation keeps only the node metadata from its release archive; Core's image never acquires execution-only payloads.
 - A node obtains bootstrap metadata from the console that generated its command. Web serves artifacts it has locally and redirects missing declared execution artifacts to the versioned HTTPS release base in the verified manifest. Web never downloads or caches those bytes.
 - Only artifact requests may follow HTTPS redirects, and only without credentials or cookies. Metadata and enrollment requests stay on the configured console. The console publishes only fixed non-secret files and declared artifact names.
-- Download into private temporary files, verify size and SHA-256 before an atomic rename, resume interrupted transfers, and reuse only verified cache entries or exact image identities. Never select a release other than the pinned one.
+- Download into private temporary files, verify size and SHA-256 before an atomic rename, clear leftover temporary downloads and extracted files before retrying, and reuse only verified cache entries or exact image identities. Never select a release other than the pinned one.
 - Release downloads are anonymous. Never add repository credentials to installed node or Runtime configuration.
 - Manual builds use the `build-<full SHA>` release tag and tag builds the `v*` tag. The manifest's download base must match the release tag; artifact file names and source provenance keep the full source SHA.
 
diff --git a/deploy/node/distribution.py b/deploy/node/distribution.py
index 553177b2c..1aec341c4 100644
--- a/deploy/node/distribution.py
+++ b/deploy/node/distribution.py
@@ -9,7 +9,7 @@
 import socket
 import stat
 import subprocess
-import tempfile
+from contextlib import contextmanager
 import time
 import urllib.error
 import urllib.request
@@ -114,11 +114,8 @@ def redirect_request(self, request, fp, code, msg, headers, newurl):
         safe_url(newurl)
         if urlsplit(newurl).scheme != 'https' or request.get_method() not in ('GET', 'HEAD'):
             raise ArtifactError('Artifact redirects require HTTPS')
-        # Carry resume headers, never credentials or cookies, to a release/CDN host.
-        forwarded = {name: value for name, value in request.header_items()
-                     if name.lower() in ('range', 'if-range')}
-        return urllib.request.Request(newurl, headers=forwarded,
-                                      method=request.get_method(), unverifiable=True)
+        # Artifact redirects carry no credentials, cookies or custom headers.
+        return urllib.request.Request(newurl, method=request.get_method(), unverifiable=True)
 
 
 class NoRedirect(urllib.request.HTTPRedirectHandler):
@@ -162,47 +159,42 @@ def obtain_artifact(manifest, logical_path, destination, offline_root=None):
     if not isinstance(base, str) or not base or urlsplit(base).query:
         raise ArtifactError('No downloadable artifact source; use the matching offline bundle')
     url = safe_url(base.rstrip('/') + '/' + entry['filename'])
-    # A private partial file survives interruptions and reruns; the next attempt asks
-    # for the missing bytes only. The complete file is still verified as a whole.
-    partial = target.with_name('.' + target.name + '.partial')
-    for attempt in range(3):
-        try:
-            download_partial(url, partial, entry, logical_path)
-            break
-        except urllib.error.HTTPError as error:
-            if error.code == 416:
-                discard_partial(partial)
-            elif error.code not in (408, 429, 500, 502, 503, 504) or attempt == 2:
-                raise ArtifactError(f'Artifact download failed (HTTP {error.code}): {logical_path}. Check the console and retry.') from None
-        except (urllib.error.URLError, socket.timeout, ConnectionError, http.client.HTTPException):
-            if attempt == 2:
-                raise ArtifactError('Artifact transfer interrupted: ' + logical_path + '. Check network access and rerun; '
-                                        'the download resumes where it stopped.') from None
-        time.sleep(attempt + 1)
-    else:
-        raise ArtifactError('Artifact download did not complete')
-    if digest(partial) != entry['sha256']:
-        discard_partial(partial)
-        raise ArtifactError('Artifact checksum mismatch: ' + logical_path)
-    os.chmod(partial, 0o700 if logical_path.startswith('native/') else 0o600)
-    os.replace(partial, target)
-    validator_path(partial).unlink(missing_ok=True)
-    return target
-
-
-def validator_path(partial):
-    return partial.with_name(partial.name + '.validator')
+    with temporary_file(target) as partial:
+        for attempt in range(3):
+            try:
+                download_artifact(url, partial, entry, logical_path)
+                break
+            except urllib.error.HTTPError as error:
+                if error.code not in (408, 429, 500, 502, 503, 504) or attempt == 2:
+                    raise ArtifactError(f'Artifact download failed (HTTP {error.code}): {logical_path}. Check the console and retry.') from None
+            except (urllib.error.URLError, socket.timeout, ConnectionError, http.client.HTTPException):
+                if attempt == 2:
+                    raise ArtifactError('Artifact transfer interrupted: ' + logical_path + '. Check network access and rerun.') from None
+            time.sleep(attempt + 1)
+        if digest(partial) != entry['sha256']:
+            raise ArtifactError('Artifact checksum mismatch: ' + logical_path)
+        os.chmod(partial, 0o700 if logical_path.startswith('native/') else 0o600)
+        os.replace(partial, target)
+        return target
 
 
-def discard_partial(partial):
+@contextmanager
+def temporary_file(target):
+    """Clear unfinished work under the caller's installation lock."""
+    partial = target.with_name('.' + target.name + '.partial')
+    if partial.is_symlink() or (partial.exists() and
+            (not partial.is_file() or partial.stat().st_uid != os.getuid())):
+        raise DistributionError('Temporary file must be an owned regular file: ' + str(target))
     partial.unlink(missing_ok=True)
-    validator_path(partial).unlink(missing_ok=True)
+    try:
+        yield partial
+    finally:
+        partial.unlink(missing_ok=True)
 
 
 def copy_artifact(source, target, entry, logical_path):
-    fd, temporary = tempfile.mkstemp(prefix='.artifact-', dir=target.parent)
-    try:
-        with os.fdopen(fd, 'wb') as output, source.open('rb') as stream:
+    with temporary_file(target) as temporary:
+        with os.fdopen(os.open(temporary, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600), 'wb') as output, source.open('rb') as stream:
             count = 0
             for block in iter(lambda: stream.read(1024 * 1024), b''):
                 count += len(block)
@@ -214,52 +206,20 @@ def copy_artifact(source, target, entry, logical_path):
         os.chmod(temporary, 0o700 if logical_path.startswith('native/') else 0o600)
         os.replace(temporary, target)
         return target
-    finally:
-        if os.path.exists(temporary):
-            os.unlink(temporary)
 
 
-# A download that brings fewer bytes than this in a window stops; a rerun resumes it.
+# Stop downloads that bring fewer bytes than this in a window.
 SLOW_SECONDS, SLOW_BYTES = 60, 64 * 1024
 
 
-def download_partial(url, partial, entry, logical_path):
-    """Complete the partial file, asking only for the bytes it is missing."""
+def download_artifact(url, partial, entry, logical_path):
+    """Download a complete artifact into a disposable file."""
     size = entry['size']
-    offset = 0
-    if partial.is_symlink() or (partial.exists() and not partial.is_file()):
-        raise DistributionError('Partial download must be a regular file: ' + logical_path)
-    if partial.exists():
-        info = partial.stat()
-        if info.st_uid != os.getuid():
-            raise DistributionError('Partial download must be owned by this user: ' + logical_path)
-        offset = info.st_size if info.st_size <= size else 0
-    if offset == size:
-        return
-    headers = {}
-    if offset:
-        headers['Range'] = f'bytes={offset}-'
-        # If-Range makes a server whose file changed since the partial began send it whole.
-        try:
-            validator = validator_path(partial).read_text().strip()
-        except OSError:
-            validator = ''
-        if validator:
-            headers['If-Range'] = validator
-    request = urllib.request.Request(url, headers=headers)
-    with urllib.request.build_opener(ArtifactRedirect()).open(request, timeout=30) as stream:
-        if offset and (stream.status != 206 or not stream.headers.get('Content-Range', '').startswith(f'bytes {offset}-')):
-            offset = 0  # The server sent the whole file; start over.
-        if not offset:
-            validator = stream.headers.get('ETag') or stream.headers.get('Last-Modified') or ''
-            if validator and all(32 <= ord(c) < 127 for c in validator) and len(validator) < 200:
-                with os.fdopen(os.open(validator_path(partial), os.O_WRONLY | os.O_CREAT | os.O_TRUNC | os.O_NOFOLLOW, 0o600), 'w') as note:
-                    note.write(validator)
-            else:
-                validator_path(partial).unlink(missing_ok=True)
-        flags = os.O_WRONLY | os.O_CREAT | os.O_NOFOLLOW | (os.O_APPEND if offset else os.O_TRUNC)
-        with os.fdopen(os.open(partial, flags, 0o600), 'ab' if offset else 'wb') as output:
-            count, reported = offset, offset * 10 // size
+    opener = urllib.request.build_opener(ArtifactRedirect())
+    with opener.open(url, timeout=60) as stream:
+        flags = os.O_WRONLY | os.O_CREAT | os.O_NOFOLLOW | os.O_TRUNC
+        with os.fdopen(os.open(partial, flags, 0o600), 'wb') as output:
+            count, reported = 0, 0
             window, window_count = time.monotonic(), 0
             while True:
                 block = stream.read1(1024 * 1024)
@@ -267,16 +227,13 @@ def download_partial(url, partial, entry, logical_path):
                     break
                 count += len(block)
                 if count > size:
-                    output.close()
-                    discard_partial(partial)
                     raise ArtifactError('Artifact exceeds published size: ' + logical_path)
                 output.write(block)
                 window_count += len(block)
                 if time.monotonic() - window >= SLOW_SECONDS:
                     if window_count < SLOW_BYTES:
                         raise ArtifactError(f'Artifact download stalled (under {SLOW_BYTES // 1024} KiB in {SLOW_SECONDS} s): '
-                                                f'{logical_path}. The downloaded part is kept; check the network, then rerun '
-                                                'the command to resume.')
+                                                f'{logical_path}. Check the network, then rerun the command.')
                     window, window_count = time.monotonic(), 0
                 if size >= 50 * 1024 * 1024 and count * 10 // size > reported:
                     reported = count * 10 // size
@@ -303,23 +260,21 @@ def runtime_archive(manifest, cache_root, offline_root=None):
             raise ArtifactError('Cached Runtime archive differs; preserve state and inspect it')
         return target
     archive = obtain_artifact(manifest, 'images/runtime.tar.gz', root / 'images/runtime.tar.gz', offline_root)
-    fd, temporary = tempfile.mkstemp(prefix='.runtime-', dir=target.parent)
-    try:
-        with os.fdopen(fd, 'wb') as output, gzip.open(archive, 'rb') as stream:
-            count = 0
-            for block in iter(lambda: stream.read(1024 * 1024), b''):
-                count += len(block)
-                if count > expanded['size']:
-                    raise ArtifactError('Runtime archive exceeds published unpacked size')
-                output.write(block)
-        if not matches(Path(temporary), expanded):
-            raise ArtifactError('Unpacked Runtime checksum mismatch')
-        os.replace(temporary, target)
-    except (gzip.BadGzipFile, EOFError):
-        raise ArtifactError('Invalid compressed Runtime archive') from None
-    finally:
-        if os.path.exists(temporary):
-            os.unlink(temporary)
+    with temporary_file(target) as temporary:
+        try:
+            with os.fdopen(os.open(temporary, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600), 'wb') as output, gzip.open(archive, 'rb') as stream:
+                count = 0
+                for block in iter(lambda: stream.read(1024 * 1024), b''):
+                    count += len(block)
+                    if count > expanded['size']:
+                        raise ArtifactError('Runtime archive exceeds published unpacked size')
+                    output.write(block)
+            if not matches(temporary, expanded):
+                raise ArtifactError('Unpacked Runtime checksum mismatch')
+            os.replace(temporary, target)
+        except (gzip.BadGzipFile, EOFError):
+            raise ArtifactError('Invalid compressed Runtime archive') from None
+
     return target
 
 
diff --git a/deploy/node/node_generations.py b/deploy/node/node_generations.py
index 738c9b765..158eaf827 100644
--- a/deploy/node/node_generations.py
+++ b/deploy/node/node_generations.py
@@ -12,14 +12,14 @@
 import shutil
 import subprocess
 import sys
-import tempfile
-import zipapp
+import zipfile
+
+from distribution import temporary_file
 
 
 def atomic_json(path, value):
-    descriptor, temporary = tempfile.mkstemp(prefix=".generation-", dir=path.parent)
-    try:
-        with os.fdopen(descriptor, "w") as stream:
+    with temporary_file(path) as temporary:
+        with os.fdopen(os.open(temporary, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600), "w") as stream:
             json.dump(value, stream, sort_keys=True)
             stream.write("\n")
             stream.flush()
@@ -30,9 +30,6 @@ def atomic_json(path, value):
             os.fsync(descriptor)
         finally:
             os.close(descriptor)
-    finally:
-        if os.path.exists(temporary):
-            os.unlink(temporary)
 
 
 def helper_archive(args, installer):
@@ -42,14 +39,12 @@ def helper_archive(args, installer):
         source = args.bundle / "node-install.pyz"
     if source.suffix == ".pyz" and source.is_file() and not source.is_symlink():
         return source.read_bytes()
-    with tempfile.TemporaryDirectory() as directory:
-        package = Path(directory)
-        source_dir = Path(installer.__file__).parent
+    archive = io.BytesIO()
+    source_dir = Path(installer.__file__).parent
+    with zipfile.ZipFile(archive, "w", compression=zipfile.ZIP_DEFLATED) as package:
         for name in ("node_install.py", "node_spec.py", "distribution.py", "node_generations.py", "install_display.py", "node_output.py", "provider_assets.py"):
-            shutil.copyfile(source_dir / name, package / ("__main__.py" if name == "node_install.py" else name))
-        archive = io.BytesIO()
-        zipapp.create_archive(package, archive, compressed=True)
-        return archive.getvalue()
+            package.write(source_dir / name, "__main__.py" if name == "node_install.py" else name)
+    return archive.getvalue()
 
 
 def install_helper(root, args, installer, archive=None):
@@ -62,10 +57,9 @@ def install_helper(root, args, installer, archive=None):
     installer.existing_file(target)
     if archive is None:
         archive = helper_archive(args, installer)
-    with tempfile.TemporaryDirectory(dir=root) as directory:
-        staged = Path(directory) / "helper.pyz"
-        staged.write_bytes(archive)
-        os.chmod(staged, 0o600)
+    with temporary_file(target) as staged:
+        with os.fdopen(os.open(staged, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600), "wb") as output:
+            output.write(archive)
         os.replace(staged, target)
     atomic_json(settings, value)
 
diff --git a/deploy/node/node_install.py b/deploy/node/node_install.py
index cc3f6a211..7944db376 100644
--- a/deploy/node/node_install.py
+++ b/deploy/node/node_install.py
@@ -24,7 +24,6 @@
 import stat
 import subprocess
 import sys
-import tempfile
 import time
 import urllib.error
 import urllib.request
@@ -229,13 +228,18 @@ def existing_file(path):
 
 
 def write_once(path, value):
-    if existing_file(path):
-        if path.read_text() != value:
-            raise InstallError("Existing node configuration differs; preserve its state and use the upgrade guide")
-        return
-    descriptor = os.open(path, os.O_WRONLY | os.O_CREAT | os.O_EXCL | os.O_NOFOLLOW, 0o600)
-    with os.fdopen(descriptor, "w") as stream:
-        stream.write(value)
+    # Callers hold the installation lock through comparison and publication.
+    with distribution.temporary_file(path) as temporary:
+        if existing_file(path):
+            if path.read_text() != value:
+                raise InstallError("Existing node configuration differs; preserve its state and use the upgrade guide")
+            return
+        descriptor = os.open(temporary, os.O_WRONLY | os.O_CREAT | os.O_EXCL | os.O_NOFOLLOW, 0o600)
+        with os.fdopen(descriptor, "w") as stream:
+            stream.write(value)
+            stream.flush()
+            os.fsync(stream.fileno())
+        os.replace(temporary, path)
 
 
 def json_text(value):
@@ -257,17 +261,13 @@ def download(source, name, root, expected, prefix=""):
         if file_digest(target) != expected:
             raise RuntimeDownloadError("Installed node payload differs; refusing to overwrite it")
         return
-    descriptor, temporary = tempfile.mkstemp(prefix=".download-", dir=target.parent)
-    try:
-        with os.fdopen(descriptor, "wb") as output, fetch(source, prefix + name) as response:
+    with distribution.temporary_file(target) as temporary:
+        with os.fdopen(os.open(temporary, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600), "wb") as output, fetch(source, prefix + name) as response:
             for block in iter(lambda: response.read(1024 * 1024), b""):
                 output.write(block)
         if file_digest(Path(temporary)) != expected:
             raise RuntimeDownloadError("Node payload checksum mismatch: " + name)
         os.replace(temporary, target)
-    finally:
-        if os.path.exists(temporary):
-            os.unlink(temporary)
     if name.startswith("native/"):
         os.chmod(target, 0o700)
 
@@ -343,10 +343,8 @@ def unit_name(installation_id):
     return "oac-node-" + installation_id + ".service"
 
 
-def open_node(args, token):
-    """Read the Core specification and check the host; returns the node's state directory."""
-    root = Path.home() / ".oac/nodes" / args.installation_id
-    safe_directory(root)
+def configure_node(root, args, token):
+    """Read the Core specification and check the host under the installation lock."""
     identity_file = root / "state/node/identity.json"
     retained = json.loads(identity_file.read_text()) if existing_file(identity_file) else None
     args.configuration = node_spec.fetch(args, token, retained, open_request, allow_enrollment=not (root / "registered.json").exists())
@@ -359,7 +357,6 @@ def open_node(args, token):
         if not owner.exists() and any(runtime_home.iterdir()):
             raise InstallError("Microsandbox home contains unowned state; refusing to adopt it")
         write_once(owner, json_text({"installation_id": args.installation_id}))
-    return root
 
 
 @contextlib.contextmanager
@@ -373,7 +370,7 @@ def install_lock(root):
         yield
 
 
-def register_node(root, args, token, helper_archive=None):
+def register_node(root, args, token, helper_archive=None, *, secret_path):
     """Download and verify the payload, prepare the Runtime and register; not the service."""
     install_display.step("Downloading and verifying node files")
     program_manifest, program_sums = metadata(args.source_url, getattr(args, "bundle", None))
@@ -426,31 +423,28 @@ def register_node(root, args, token, helper_archive=None):
     marker = root / "registered.json"
     if not existing_file(marker):
         # The one-time credential is never passed through process arguments or service environments.
-        descriptor, secret_path = tempfile.mkstemp(prefix=".enrollment-", dir=root)
+        with os.fdopen(os.open(secret_path, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600), "w") as secret:
+            secret.write(token)
+        install_display.step("Registering this node with Core")
         try:
-            with os.fdopen(descriptor, "w") as secret:
-                secret.write(token)
-            install_display.step("Registering this node with Core")
-            try:
-                checked([str(root / provider_assets.artifacts(args.provider, ("node",))[0]), "register", "--config", str(root / "provider.json"), "--state-dir", str(root / "state/node"),
-                         "--core-url", args.core_url, "--name", socket.gethostname(),
-                         "--enrollment-token-file", secret_path], REGISTRATION_UNCONFIRMED, explain=registration_failure)
-            except AddressChanged:
-                discard_unregistered(root)
-                raise
-            write_once(marker, json_text(state))
-        finally:
-            if os.path.exists(secret_path):
-                os.unlink(secret_path)
+            checked([str(root / provider_assets.artifacts(args.provider, ("node",))[0]), "register", "--config", str(root / "provider.json"), "--state-dir", str(root / "state/node"),
+                     "--core-url", args.core_url, "--name", socket.gethostname(),
+                     "--enrollment-token-file", str(secret_path)], REGISTRATION_UNCONFIRMED, explain=registration_failure)
+        except AddressChanged:
+            discard_unregistered(root)
+            raise
+        write_once(marker, json_text(state))
     elif marker.read_text() != json_text(state):
         raise InstallError("Registered node identity differs; refusing to replace it")
 
 
 def prepare_service_node(args, token, helper_archive):
     """Sudo mode, as the service user: everything but the root-owned system unit."""
-    root = open_node(args, token)
-    with install_lock(root):
-        register_node(root, args, token, helper_archive)
+    root = Path.home() / ".oac/nodes" / args.installation_id
+    safe_directory(root)
+    with install_lock(root), distribution.temporary_file(root / "enrollment-token") as secret_path:
+        configure_node(root, args, token)
+        register_node(root, args, token, helper_archive, secret_path=secret_path)
 
 
 # Sudo mode -----------------------------------------------------------------
@@ -727,15 +721,11 @@ def root_file(path, content, replace=False):
         # Set the root-owned unit and record mode independently of the caller's umask.
         path.parent.mkdir(parents=True, mode=0o755)
         os.chmod(path.parent, 0o755)
-    descriptor, temporary = tempfile.mkstemp(prefix=".oac-node-", dir=path.parent)
-    try:
-        with os.fdopen(descriptor, "w") as stream:
+    with distribution.temporary_file(path) as temporary:
+        with os.fdopen(os.open(temporary, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600), "w") as stream:
             stream.write(content)
         os.chmod(temporary, 0o644)
         os.replace(temporary, path)
-    finally:
-        if os.path.exists(temporary):
-            os.unlink(temporary)
 
 
 def read_root_json(path):
diff --git a/deploy/node/test_distribution.py b/deploy/node/test_distribution.py
index d10ea6d70..bee168ab9 100644
--- a/deploy/node/test_distribution.py
+++ b/deploy/node/test_distribution.py
@@ -8,6 +8,7 @@
 import tempfile
 import ssl
 import subprocess
+import sys
 import threading
 from types import SimpleNamespace
 import unittest
@@ -29,15 +30,15 @@ def setUp(self):
         self.if_ranges = []
         self.status = 200
         self.redirect_target = 'https://elsewhere.example'
-        self.resumable = False
+        self.interrupted_once = False
         test = self
         class Handler(http.server.BaseHTTPRequestHandler):
             def do_GET(self):
                 test.requests.append(self.path)
                 test.ranges.append(self.headers.get('Range'))
                 test.if_ranges.append(self.headers.get('If-Range'))
-                if test.resumable:
-                    # The first response breaks off halfway; a Range request gets the rest.
+                if test.interrupted_once and len(test.requests) == 1:
+                    # The first response breaks off halfway; the retry starts over.
                     start = int(self.headers['Range'][6:-1]) if self.headers.get('Range') else 0
                     self.send_response(206 if start else 200)
                     self.send_header('Last-Modified', 'Sat, 26 Sep 2026 00:00:00 GMT')
@@ -109,28 +110,26 @@ def test_truncated_transfer_can_be_rerun(self):
         self.data = self.data[:20]
         with patch.object(distribution.time, 'sleep'), self.assertRaisesRegex(distribution.DistributionError, 'interrupted'):
             distribution.obtain_artifact(self.manifest, 'native/bin/node', self.root / 'node')
-        # Only the private partial file stays, for the rerun to continue.
-        self.assertEqual([path.name for path in self.root.iterdir()], ['.node.partial'])
+        self.assertEqual(list(self.root.iterdir()), [])
         self.data = b'prebuilt artifact' * 1000
         distribution.obtain_artifact(self.manifest, 'native/bin/node', self.root / 'node')
         self.assertEqual([path.name for path in self.root.iterdir()], ['node'])
 
-    def test_interrupted_download_resumes_with_the_missing_bytes(self):
-        self.resumable = True
+    def test_interrupted_download_restarts_with_a_clean_file(self):
+        self.interrupted_once = True
         with patch.object(distribution.time, 'sleep'):
             distribution.obtain_artifact(self.manifest, 'native/bin/node', self.root / 'node')
         self.assertEqual((self.root / 'node').read_bytes(), self.data)
-        self.assertEqual(self.ranges, [None, f'bytes={len(self.data) // 2}-'])
-        # If-Range: a file that changed since the partial began comes back whole instead of mixed.
-        self.assertEqual(self.if_ranges, [None, 'Sat, 26 Sep 2026 00:00:00 GMT'])
+        self.assertEqual(self.ranges, [None, None])
+        self.assertEqual(self.if_ranges, [None, None])
         self.assertEqual([path.name for path in self.root.iterdir()], ['node'])
 
-    def test_a_stalled_download_stops_and_keeps_its_part(self):
+    def test_a_stalled_download_stops_and_removes_its_part(self):
         with patch.object(distribution, 'SLOW_SECONDS', 0), \
-                self.assertRaisesRegex(distribution.DistributionError, 'stalled.*rerun the command to resume'):
+                self.assertRaisesRegex(distribution.DistributionError, 'stalled.*rerun the command'):
             distribution.obtain_artifact(self.manifest, 'native/bin/node', self.root / 'node')
         self.assertEqual(len(self.requests), 1)  # Not retried as a network error.
-        self.assertEqual([path.name for path in self.root.iterdir()], ['.node.partial'])
+        self.assertEqual(list(self.root.iterdir()), [])
 
     def test_offline_and_runtime_expansion_are_verified(self):
         raw = b'synthetic tar contents' * 1000
@@ -148,6 +147,43 @@ def test_offline_and_runtime_expansion_are_verified(self):
         with self.assertRaisesRegex(distribution.DistributionError, 'differs'):
             distribution.runtime_archive(self.manifest, self.root / 'cache')
 
+    def test_retry_after_sigkill_discards_unfinished_artifact(self):
+        target = self.root / 'node'
+        script = """import os, signal, sys
+from pathlib import Path
+import distribution
+with distribution.temporary_file(Path(sys.argv[1])) as partial:
+    partial.write_bytes(b'unfinished bytes')
+    os.kill(os.getpid(), signal.SIGKILL)
+"""
+        killed = subprocess.run([sys.executable, '-c', script, str(target)],
+                                cwd=Path(distribution.__file__).parent)
+        self.assertEqual(killed.returncode, -9)
+        partial = target.with_name('.node.partial')
+        self.assertTrue(partial.exists())
+        distribution.obtain_artifact(self.manifest, 'native/bin/node', target)
+        self.assertEqual(target.read_bytes(), self.data)
+        self.assertFalse(partial.exists())
+        self.assertEqual(self.ranges, [None])
+
+    def test_expansion_discards_stale_temporary_and_preserves_verified_archive(self):
+        raw = b'complete runtime image' * 1000
+        self.data = gzip.compress(raw)
+        entry = self.entry('images/runtime.tar.gz', self.data)
+        entry.update(unpacked_size=len(raw), unpacked_sha256='0' * 64)
+        cache = self.root / 'images'
+        cache.mkdir()
+        partial = cache / '.runtime.tar.partial'
+        partial.write_bytes(b'interrupted expansion')
+        with self.assertRaisesRegex(distribution.ArtifactError, 'Unpacked Runtime checksum'):
+            distribution.runtime_archive(self.manifest, self.root)
+        self.assertFalse(partial.exists())
+        self.assertFalse((cache / 'runtime.tar').exists())
+        self.assertEqual((cache / 'runtime.tar.gz').read_bytes(), self.data)
+        entry['unpacked_sha256'] = hashlib.sha256(raw).hexdigest()
+        self.assertEqual(distribution.runtime_archive(self.manifest, self.root).read_bytes(), raw)
+        self.assertEqual(len(self.requests), 1)
+
     def test_url_and_path_boundaries(self):
         self.assertEqual(distribution.safe_url('http://core.example:8080/a'), 'http://core.example:8080/a')
         for value in ('ftp://example.com/a', 'https://user:secret@example.com/a', 'file:///tmp/a'):
@@ -173,7 +209,7 @@ def test_artifact_downgrades_and_metadata_redirects_are_refused(self):
         self.assertEqual(list(self.root.iterdir()), [])
 
 
-    def test_https_redirect_resumes_and_verifies_on_the_node(self):
+    def test_https_redirect_discards_stale_partial_and_verifies_on_the_node(self):
         certificate, key = self.root / 'cert.pem', self.root / 'key.pem'
         subprocess.run(['openssl', 'req', '-x509', '-newkey', 'rsa:2048', '-nodes',
                         '-keyout', str(key), '-out', str(certificate), '-days', '1',
@@ -203,7 +239,6 @@ def log_message(self, *args):
             self.redirect_target = f'https://localhost:{release.server_port}'
             target = self.root / 'node'
             target.with_name('.node.partial').write_bytes(self.data[:7])
-            target.with_name('.node.partial.validator').write_text('resume-etag')
             opener = distribution.urllib.request.build_opener
             trusted = distribution.urllib.request.HTTPSHandler(context=ssl.create_default_context(cafile=str(certificate)))
             with patch.object(distribution.urllib.request, 'build_opener', side_effect=lambda *handlers: opener(*handlers, trusted)):
@@ -211,14 +246,15 @@ def log_message(self, *args):
                 distribution.obtain_artifact(self.manifest, 'native/bin/node', target)
             self.assertEqual(target.read_bytes(), self.data)
             self.assertEqual(len(received), 1)
-            self.assertEqual(received[0]['Range'], 'bytes=7-')
-            self.assertEqual(received[0]['If-Range'], 'resume-etag')
+            self.assertNotIn('Range', received[0])
+            self.assertNotIn('If-Range', received[0])
+            self.assertFalse(target.with_name('.node.partial').exists())
         finally:
             release.shutdown()
             release.server_close()
             thread.join()
 
-    def test_artifact_redirect_preserves_resume_without_credentials(self):
+    def test_artifact_redirect_strips_credentials_and_custom_headers(self):
         request = distribution.urllib.request.Request('https://console.example/artifact', headers={
             'Range': 'bytes=123-', 'If-Range': 'etag', 'Authorization': 'Bearer secret',
             'Cookie': 'session=secret', 'X-Core-Key': 'secret'})
@@ -227,7 +263,7 @@ def test_artifact_redirect_preserves_resume_without_credentials(self):
         forwarded = redirect.redirect_request(request, None, 307, '', {}, target)
         self.assertEqual(forwarded.full_url, target)
         self.assertEqual(dict((k.lower(), v) for k, v in forwarded.header_items()),
-                         {'range': 'bytes=123-', 'if-range': 'etag'})
+                         {})
         for invalid in ('http://release.example/file', 'file:///tmp/file', 'https://user:secret@release.example/file'):
             with self.subTest(invalid=invalid), self.assertRaises(distribution.ArtifactError):
                 redirect.redirect_request(request, None, 302, '', {}, invalid)
diff --git a/deploy/node/test_node_install.py b/deploy/node/test_node_install.py
index 306588b6c..b17d6fd80 100644
--- a/deploy/node/test_node_install.py
+++ b/deploy/node/test_node_install.py
@@ -509,6 +509,85 @@ def test_repeat_preserves_registration_and_recovers_service_start_failure(self):
         self.assertFalse(any("register" in call for call, _ in self.calls))
         self.assertFalse(any("load" in call for call, _ in self.calls))
 
+    def test_policy_download_after_sigkill_starts_clean(self):
+        root = self.home / "policy"
+        payload = self.payloads["runtime/seccomp.json"]
+        expected = hashlib.sha256(payload).hexdigest()
+        class Interrupted(io.BytesIO):
+            def read(self, size=-1):
+                if self.tell():
+                    os.kill(os.getpid(), signal.SIGKILL)
+                return super().read(1)
+        child = os.fork()
+        if child == 0:
+            with mock.patch.object(installer, "fetch", return_value=Interrupted(payload)):
+                installer.download(self.args.source_url, "runtime/seccomp.json", root, expected)
+            os._exit(1)
+        _, status = os.waitpid(child, 0)
+        self.assertEqual(os.waitstatus_to_exitcode(status), -signal.SIGKILL)
+        partial = root / "runtime/.seccomp.json.partial"
+        self.assertTrue(partial.exists())
+        installer.download(self.args.source_url, "runtime/seccomp.json", root, expected)
+        self.assertFalse(partial.exists())
+        self.assertEqual((root / "runtime/seccomp.json").read_bytes(), payload)
+
+    def test_retry_after_configuration_write_sigkill_publishes_complete_files(self):
+        for name in ("installation.json", "provider.json", "registered.json"):
+            with self.subTest(name=name):
+                self.args.installation_id = name.replace(".json", "")
+                self.root = self.home / ".oac/nodes" / self.args.installation_id
+                partial = self.root / ("." + name + ".partial")
+                original_open = os.open
+                def interrupted_open(path, *args, **kwargs):
+                    descriptor = original_open(path, *args, **kwargs)
+                    if path == partial:
+                        os.write(descriptor, b'{')
+                        os.kill(os.getpid(), signal.SIGKILL)
+                    return descriptor
+                child = os.fork()
+                if child == 0:
+                    with mock.patch.object(installer.os, "open", side_effect=interrupted_open):
+                        self.install()
+                    os._exit(1)
+                _, status = os.waitpid(child, 0)
+                self.assertEqual(os.waitstatus_to_exitcode(status), -signal.SIGKILL)
+                self.assertTrue(partial.exists())
+                self.assertFalse((self.root / name).exists())
+                self.install()
+                self.assertFalse(partial.exists())
+                for target in ("installation.json", "provider.json", "registered.json"):
+                    self.assertEqual(json.loads((self.root / target).read_text())["installation_id"], self.args.installation_id)
+
+    def test_retry_after_registration_sigkill_removes_secret_and_helper_staging(self):
+        write_once = installer.write_once
+        def killed_after_registration(path, value):
+            write_once(path, value)
+            if path.name == "registered.json":
+                os.kill(os.getpid(), signal.SIGKILL)
+        child = os.fork()
+        if child == 0:
+            with mock.patch.object(installer, "write_once", side_effect=killed_after_registration):
+                self.install()
+            os._exit(1)
+        _, status = os.waitpid(child, 0)
+        self.assertEqual(os.waitstatus_to_exitcode(status), -signal.SIGKILL)
+        partial = self.root / ".enrollment-token.partial"
+        self.assertTrue(partial.exists())
+        identity = (self.root / "state/node/identity.json").read_bytes()
+        with mock.patch.object(installer.node_spec, "fetch", side_effect=installer.InstallError("Core unavailable")):
+            with self.assertRaisesRegex(installer.InstallError, "Core unavailable"):
+                self.install()
+        self.assertFalse(partial.exists())
+        self.assertEqual((self.root / "state/node/identity.json").read_bytes(), identity)
+        helper = self.root / ".generation-preparer.pyz.partial"
+        helper.write_bytes(b'unfinished helper')
+        helper.chmod(0o600)
+        self.install()
+        self.assertFalse(partial.exists())
+        self.assertFalse(helper.exists())
+        self.assertEqual((self.root / "state/node/identity.json").read_bytes(), identity)
+        self.assertFalse(any("register" in call for call, _ in self.calls))
+
     def test_unconfirmed_registration_retains_state_removes_token_and_does_not_start(self):
         self.fail_registration = True
         with self.assertRaisesRegex(installer.InstallError, "not confirmed"):
diff --git a/deploy/test_install.py b/deploy/test_install.py
index 6393b28fa..f4bb80cdd 100644
--- a/deploy/test_install.py
+++ b/deploy/test_install.py
@@ -1,5 +1,7 @@
 """install.sh writes .env and starts Compose without host Python."""
 import os
+import fcntl
+import sys
 from pathlib import Path
 import stat
 import subprocess
@@ -13,43 +15,60 @@
 
 
 class InstallScriptTests(unittest.TestCase):
-    def install(self, root, *args, compose_up=0, route="1.1.1.1 via 10.0.0.1 dev eth0 src 10.0.0.5 uid 0"):
+    def install(self, root, *args, compose_up=0, docker_info=0, key_status=0, download_status=0, kill_download=False, kill_start=False, pull_status=0, kill_pull=False, file_limit=False, missing_image="", route="1.1.1.1 via 10.0.0.1 dev eth0 src 10.0.0.5 uid 0"):
         bin_dir = root / "bin"
         bin_dir.mkdir(exist_ok=True)
         log = root / "docker.log"
         self.write_executable(bin_dir / "docker", textwrap.dedent(f"""\
             #!/bin/sh
-            printf '%s\\n' "$*" >> {log}
+            [ {1 if file_limit else 0} -eq 1 ] || printf '%s\\n' "$*" >> {log}
+            if [ "$1" = info ]; then exit {docker_info}; fi
+            if [ "$1" = pull ]; then {'kill -KILL "$PPID"' if kill_pull else ':'}; exit {pull_status}; fi
+            if [ "$1" = image ] && [ "$2" = inspect ] && [ "$3" = "{missing_image}" ]; then exit 1; fi
+            if [ "$1" = compose ] && [ "$2" = config ] && [ "$3" = --images ]; then printf 'fixture-core:latest\\nfixture-web:latest\\n'; fi
+            if [ "$1" = compose ] && [ "$2" = logs ]; then echo service-diagnostic >&2; fi
+            if [ "$1" = compose ] && [ "$2" = config ] && [ "$3" = --environment ]; then sed "s/'//g" .env; fi
             if [ "$1" = compose ] && [ "$2" = version ]; then printf 'v2.29.1\\n'; exit 0; fi
-            if [ "$1" = compose ] && [ "$2" = cp ]; then printf '#!/bin/sh\\necho oac_core_fixture\\n' > ./oac; chmod +x ./oac; exit 0; fi
-            if [ "$1" = compose ] && [ "$2" = up ]; then exit {compose_up}; fi
+            if [ "$1" = compose ] && [ "$2" = cp ]; then printf '#!/bin/sh\\necho oac_core_fixture\\nexit {key_status}\\n' > ./oac.download; chmod +x ./oac.download; exit 0; fi
+            if [ "$1" = compose ] && [ "$2" = up ]; then {'kill -KILL "$PPID"' if kill_start else ':'}; exit {compose_up}; fi
             exit 0
             """))
-        self.write_executable(bin_dir / "curl", textwrap.dedent("""\
+        self.write_executable(bin_dir / "curl", textwrap.dedent(f"""\
             #!/bin/sh
+            exit_status={download_status}
+            [ "$exit_status" = 0 ] || exit "$exit_status"
             output=""
             while [ $# -gt 0 ]; do
               if [ "$1" = --output ]; then output="$2"; shift 2; continue; fi
               shift
             done
             printf 'fixture\\n' > "$output"
+            {'kill -KILL "$PPID"' if kill_download else ':'}
             """))
         self.write_executable(bin_dir / "sha256sum", "#!/bin/sh\nexit 0\n")
+        self.write_executable(bin_dir / "uname", '#!/bin/sh\ncase "$1" in -s) echo Linux;; -m) echo x86_64;; esac\n')
+        self.write_executable(bin_dir / "flock", f'#!{sys.executable}\nimport fcntl, sys\ntry: fcntl.flock(int(sys.argv[-1]), fcntl.LOCK_EX | fcntl.LOCK_NB)\nexcept BlockingIOError: sys.exit(1)\n')
         self.write_executable(bin_dir / "ss", "#!/bin/sh\nexit 0\n")
         self.write_executable(bin_dir / "ip", f"#!/bin/sh\nprintf '%s\\n' '{route}'\n")
         env = dict(os.environ, PATH=str(bin_dir) + os.pathsep + os.environ["PATH"], HOME=str(root))
-        completed = subprocess.run(["bash", str(INSTALL), "--install-dir", str(root / "oac"), *args],
+        command = ["bash", str(INSTALL), "--install-dir", str(root / "oac"), *args]
+        if file_limit:
+            command = ["bash", "-c", 'ulimit -f 0; exec "$@"', "--", *command]
+        completed = subprocess.run(command,
                                    env=env, capture_output=True, text=True)
         return completed, log.read_text() if log.exists() else ""
 
-    def test_a_failed_first_start_stops_and_removes_the_directory(self):
+    def test_a_failed_start_preserves_configuration_and_reports_service_logs(self):
         with tempfile.TemporaryDirectory() as temporary:
             root = Path(temporary)
             completed, recorded = self.install(root, "--host", "127.0.0.1", "--web-port", "59991",
                                                "--public-url", "https://core.example", compose_up=1)
             self.assertNotEqual(completed.returncode, 0, completed.stderr)
-            self.assertFalse((root / "oac").exists(), "a failed first start must remove the directory")
-            self.assertIn("compose pull", recorded)
+            self.assertTrue((root / "oac/.env").exists())
+            self.assertNotIn("compose down", recorded)
+            self.assertIn("service-diagnostic", completed.stderr)
+            self.assertIn("data retained", completed.stderr)
+            self.assertIn("pull --platform linux/amd64 fixture-core:latest", recorded)
             self.assertIn("compose up -d --wait", recorded)
             self.assertIn("compose logs", recorded, "a failed start must show the services' logs")
 
@@ -58,7 +77,7 @@ def test_the_private_address_is_the_default_public_url(self):
             root = Path(temporary)
             completed, _ = self.install(root)
             self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertIn("OAC_PUBLIC_URL=http://10.0.0.5:8080\n", (root / "oac/.env").read_text())
+            self.assertIn("OAC_PUBLIC_URL='http://10.0.0.5:8080'\n", (root / "oac/.env").read_text())
             self.assertIn("Console   http://10.0.0.5:8080", completed.stdout)
             self.assertIn("Core key  oac_core_fixture", completed.stdout)
             self.assertNotIn("Only this host", completed.stdout)
@@ -70,7 +89,7 @@ def test_without_a_private_address_only_this_host_reaches_web(self):
                 root = Path(temporary)
                 completed, _ = self.install(root, *args, route=route)
                 self.assertEqual(completed.returncode, 0, completed.stderr)
-                self.assertIn("OAC_PUBLIC_URL=http://localhost:59992\n", (root / "oac/.env").read_text())
+                self.assertIn("OAC_PUBLIC_URL='http://localhost:59992'\n", (root / "oac/.env").read_text())
                 self.assertIn("Only this host can open the console", completed.stdout)
 
     def test_env_holds_only_the_installation_choices(self):
@@ -78,10 +97,189 @@ def test_env_holds_only_the_installation_choices(self):
             root = Path(temporary)
             completed, _ = self.install(root, "--public-url", "https://core.example")
             self.assertEqual(completed.returncode, 0, completed.stderr)
-            env = dict(line.split("=", 1) for line in (root / "oac/.env").read_text().splitlines())
+            env = dict((lambda pair: (pair[0], pair[1].strip("'")))(line.split("=", 1)) for line in (root / "oac/.env").read_text().splitlines())
             self.assertEqual(env["OAC_PUBLIC_URL"], "https://core.example")
             self.assertEqual(sorted(env), ["COMPOSE_PROJECT_NAME", "OAC_HOST", "OAC_INSTALL_DIR", "OAC_PUBLIC_URL", "OAC_WEB_PORT"])
 
+    def test_key_failure_never_removes_a_started_installation(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            completed, recorded = self.install(root, key_status=1)
+            self.assertNotEqual(completed.returncode, 0)
+            self.assertTrue((root / "oac/.env").exists())
+            self.assertNotIn("compose down", recorded)
+            self.assertIn("Core key could not be read", completed.stderr)
+
+    def test_retry_reuses_saved_settings_and_keeps_data(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            failed, _ = self.install(root, "--public-url", "https://core.example", compose_up=1)
+            self.assertNotEqual(failed.returncode, 0)
+            configuration = (root / "oac/.env").read_bytes()
+            data = root / "oac/data"
+            data.mkdir()
+            (data / "keep").write_text("user data")
+            (root / "docker.log").unlink()
+            completed, recorded = self.install(root, download_status=22)
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            self.assertEqual((root / "oac/.env").read_bytes(), configuration)
+            self.assertEqual((data / "keep").read_text(), "user data")
+            self.assertIn("Console   https://core.example", completed.stdout)
+            self.assertNotIn("pull --platform", recorded)
+            self.assertNotIn("Only this host", completed.stdout)
+
+    def test_retry_downloads_only_missing_images_and_prevents_implicit_updates(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            failed, _ = self.install(root, compose_up=1)
+            self.assertNotEqual(failed.returncode, 0)
+            (root / "docker.log").unlink()
+            (root / "oac/oac").unlink()
+            completed, recorded = self.install(root, missing_image="fixture-web:latest")
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            self.assertNotIn("pull --platform linux/amd64 fixture-core:latest", recorded)
+            self.assertIn("pull --platform linux/amd64 fixture-web:latest", recorded)
+            for line in recorded.splitlines():
+                if line.startswith(("compose create", "compose up")):
+                    self.assertIn("--pull never", line)
+                    self.assertIn("--no-recreate", line)
+
+    def test_retry_after_file_size_limit_recovers_staging(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            failed, _ = self.install(root, file_limit=True)
+            self.assertNotEqual(failed.returncode, 0)
+            self.assertIn("Downloading release checksums", failed.stdout)
+            completed, _ = self.install(root)
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            self.assertFalse((root / "oac.staging").exists())
+
+    def test_failed_initial_pull_never_adopts_old_cached_images_on_retry(self):
+        for kill in (False, True):
+            with self.subTest(kill=kill), tempfile.TemporaryDirectory() as temporary:
+                root = Path(temporary)
+                failed, _ = self.install(root, pull_status=1, kill_pull=kill)
+                self.assertNotEqual(failed.returncode, 0)
+                self.assertFalse((root / "oac").exists())
+                (root / "docker.log").unlink()
+                # Every image inspect succeeds: another installation cached old tags.
+                completed, recorded = self.install(root)
+                self.assertEqual(completed.returncode, 0, completed.stderr)
+                for image in ("fixture-core:latest", "fixture-web:latest"):
+                    self.assertIn("pull --platform linux/amd64 " + image, recorded)
+                self.assertFalse((root / "oac.staging").exists())
+
+    def test_invalid_port_and_unavailable_docker_fail_before_installation(self):
+        for args, status in [(["--web-port", "0"], 0), (["--web-port", "70000"], 0), ([], 1)]:
+            with self.subTest(args=args, status=status), tempfile.TemporaryDirectory() as temporary:
+                root = Path(temporary)
+                completed, recorded = self.install(root, *args, docker_info=status)
+                self.assertNotEqual(completed.returncode, 0)
+                self.assertFalse((root / "oac").exists())
+                self.assertNotIn("pull --platform", recorded)
+
+    def test_failed_download_leaves_no_installation_or_staging(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            completed, recorded = self.install(root, download_status=22)
+            self.assertNotEqual(completed.returncode, 0)
+            self.assertFalse((root / "oac").exists())
+            self.assertFalse((root / "oac.staging").exists())
+            self.assertNotIn("compose down", recorded)
+
+    def test_retry_after_sigkill_cleans_unfinished_download(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            killed, _ = self.install(root, kill_download=True)
+            self.assertEqual(killed.returncode, -9, killed.stderr)
+            self.assertTrue((root / "oac.staging").exists())
+            self.assertFalse((root / "oac").exists())
+            completed, _ = self.install(root)
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            self.assertFalse((root / "oac.staging").exists())
+            self.assertTrue((root / "oac/oac").exists())
+
+    def test_retry_after_start_sigkill_cleans_published_log(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            killed, _ = self.install(root, kill_start=True)
+            self.assertEqual(killed.returncode, -9, killed.stderr)
+            self.assertTrue((root / "oac/install.log").exists())
+            completed, _ = self.install(root)
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            self.assertFalse((root / "oac/install.log").exists())
+            self.assertFalse((root / "oac.staging").exists())
+
+    def test_retry_clears_staging_from_an_interrupted_process(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            staging = root / "oac.staging"
+            staging.mkdir()
+            (staging / ".oac-installer").symlink_to((root / "oac").resolve())
+            (staging / "partial").write_text("unfinished download")
+            completed, _ = self.install(root)
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            self.assertFalse(staging.exists())
+            self.assertFalse((root / "oac/partial").exists())
+
+    def test_unrecognized_staging_directory_is_never_deleted(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            staging = root / "oac.staging"
+            staging.mkdir()
+            (staging / "keep").write_text("user data")
+            completed, recorded = self.install(root)
+            self.assertNotEqual(completed.returncode, 0)
+            self.assertIn("Unrecognized staging", completed.stderr)
+            self.assertEqual((staging / "keep").read_text(), "user data")
+            self.assertNotIn("compose up", recorded)
+
+    def test_existing_unrelated_directory_is_never_deleted(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            (root / "oac").mkdir()
+            (root / "oac/keep").write_text("user data")
+            completed, recorded = self.install(root)
+            self.assertNotEqual(completed.returncode, 0)
+            self.assertEqual((root / "oac/keep").read_text(), "user data")
+            self.assertNotIn("compose down", recorded)
+
+    def test_another_installation_holds_the_lock(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            with (root / "oac.install.lock").open("w") as lock:
+                fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
+                completed, recorded = self.install(root)
+            self.assertNotEqual(completed.returncode, 0)
+            self.assertIn("Another installation", completed.stderr)
+            self.assertFalse((root / "oac").exists())
+            self.assertNotIn("pull --platform", recorded)
+
+    def test_retry_does_not_overlap_an_oac_mutation(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            completed, _ = self.install(root)
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            (root / "docker.log").unlink()
+            with (root / "oac/.oac.lock").open("r+") as lock:
+                fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
+                completed, recorded = self.install(root)
+            self.assertNotEqual(completed.returncode, 0)
+            self.assertIn("Another oac command", completed.stderr)
+            self.assertNotIn("compose up", recorded)
+
+    def test_rerun_does_not_silently_replace_settings(self):
+        with tempfile.TemporaryDirectory() as temporary:
+            root = Path(temporary)
+            completed, _ = self.install(root)
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            before = (root / "oac/.env").read_bytes()
+            completed, _ = self.install(root, "--web-port", "9000")
+            self.assertEqual(completed.returncode, 0, completed.stderr)
+            self.assertIn("Using saved settings", completed.stdout)
+            self.assertIn("only apply to new directories", completed.stdout)
+            self.assertEqual((root / "oac/.env").read_bytes(), before)
+
     def test_help_does_not_need_docker(self):
         help_text = subprocess.run(["bash", str(INSTALL), "--help"], capture_output=True, text=True, check=True)
         self.assertIn("--web-port", help_text.stdout)
diff --git a/docs/getting-started/install.md b/docs/getting-started/install.md
index a4849fd8d..acf59bd48 100644
--- a/docs/getting-started/install.md
+++ b/docs/getting-started/install.md
@@ -44,7 +44,13 @@ The script downloads that release's Compose files, checks their SHA-256, and:
 
 It saves no sandbox backend, adds no node, creates no Project or key and makes no model request. It ends by printing the console address and the Core key.
 
-If installation fails before the services become healthy, the installer removes the directory it created. Fix the reported cause and rerun the same command. Once the services have started, a later failure keeps the installation and its data. A new release is a new directory; see [version policy](./operations.md#installation-version-policy).
+Downloads and configuration checks happen before the installation directory is published. After that, failures preserve the configuration and data and show the service logs. Fix the reported cause and rerun the same command, or specify the installation directory:
+
+```bash
+curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash -s -- --install-dir "$HOME/.oac/core"
+```
+
+Use your chosen directory if it differs. A rerun uses the saved Compose file and settings; installation flags only apply to new directories. Existing images and containers are reused; missing images are downloaded. To change settings, edit `.env` and run `oac apply`. A new release needs a new directory; see [version policy](./operations.md#installation-version-policy).
 
 For insufficient space or quota, free space on the filesystem named by the error. Image-loading failures can also require space in Docker's storage, which may be on a different filesystem.
 
diff --git a/docs/getting-started/nodes.md b/docs/getting-started/nodes.md
index 7847678a1..fd99451cd 100644
--- a/docs/getting-started/nodes.md
+++ b/docs/getting-started/nodes.md
@@ -27,18 +27,9 @@ Node installation and removal require root. Web's command uses `sudo` unless the
 
 ### The command
 
-This is the command Web generates, with this installation's values:
-
-```sh
- (umask 077; d=$(mktemp -d) || exit; trap 'rm -rf "$d"' EXIT; s=; [ "$(id -u)" -eq 0 ] || s=sudo
-printf '\n==> Downloading node installer...\n' &&
-curl -fsS --max-time 30 --max-filesize 1048576 'https://core.example/node-install/node-install.pyz' -o "$d/node-install.pyz" &&
-printf '==> Verifying node installer...\n' &&
-printf '%s  %s\n' '<installer-sha256>' "$d/node-install.pyz" | sha256sum -c --status &&
-printf '%s\n' '<enrollment-token>' | $s python3 "$d/node-install.pyz" ${NO_COLOR+--no-color} --enrollment-token-stdin --source-url 'https://core.example' --core-url 'https://core.example' --provider 'docker' --installation-id '<installation-id>')
-```
-
-- It downloads the installer into a private temporary directory, checks its SHA-256, and runs it with `sudo`, or directly in a root shell.
+Copy the current command from **Nodes → Add node**. It includes this installation's address, checksum and enrollment token. Before downloading, it checks Linux amd64, Python 3.9+ and the required tools. Temporary download failures retry up to three attempts. If checksum verification fails, copy a fresh command from Web and retry.
+
+- It downloads into the invoking account's private `~/.oac/node-bootstrap` directory, checks SHA-256, and runs with `sudo`, or directly in a root shell. Each retry clears the unfinished download while holding a lock; verified `<sha256>.pyz` files remain available to installers.
 - The token reaches the installer on standard input, so it never appears in a process argument, an environment variable or sudo's log.
 - The leading space keeps the command out of the shell history where `HISTCONTROL` ignores such lines (the Debian and Ubuntu default).
 
@@ -46,7 +37,7 @@ The installer shows each phase as it runs and, once Core confirms the node, a su
 
 ### Host requirements
 
-- Linux amd64 with systemd; Python 3.9+, `curl` and `sha256sum`; root or sudo.
+- Linux amd64 with systemd; Python 3.9+, `curl`, `sha256sum` and `flock`; root or sudo.
 - SELinux not enforcing. The installer does not support hosts with enforcing SELinux.
 - Docker: rootful Docker Engine running, its socket `/var/run/docker.sock` owned by the `docker` group with mode `0660`, enforcing CPU and memory limits (cgroup v2).
 - microsandbox: `/dev/kvm` in the `kvm` group (hardware or nested virtualization), and the libraries microsandbox links (glibc).
@@ -88,7 +79,7 @@ Root only prepares the account, the group and the unit; everything else, the Doc
 - Rerunning the same command is safe. Once the node is registered, a rerun uses the node's own credential, changes nothing that already matches and needs no token. It refuses, without changing anything, when the node's retained identity belongs to another Core address or installation.
 - A command that already expired, or was used on another host, fails at once with `Core rejected the node configuration read (HTTP 401)`: generate a new command and run it within 10 minutes.
 - If the command expires during a slow download, registration fails with `The enrollment command expired or was already used`. The downloaded files are kept: generate a new command in Web and run it.
-- Downloads resume where they stopped. A download that brings less than 64 KiB in a minute stops, keeping what it has; run the command again.
+- Failed or interrupted downloads discard their temporary files. A rerun downloads missing files from the beginning and reuses verified complete files. A transfer that brings less than 64 KiB in a minute stops; check the network and retry.
 - The Docker Runtime image is about 500 MB. On a slow link, load it first: copy the release's `oac-<commit>-linux-amd64-runtime.tar.gz` asset to the host and run `sudo docker load -i` on it. The installer then finds the exact image and skips the download.
 - Interrupting the installer, or closing its terminal, stops it; run the command again to continue.
 
diff --git a/docs/getting-started/operations.md b/docs/getting-started/operations.md
index ad027bc0e..83e63c196 100644
--- a/docs/getting-started/operations.md
+++ b/docs/getting-started/operations.md
@@ -161,24 +161,19 @@ An installation runs one release for its whole life. In-place version upgrades a
 
 To move to a new release, install it into a new, empty directory, with its own database, Core key and nodes, and add nodes from its Web. Keep the old installation, its data and its nodes until their work is finished. Nodes run the program of the console that added them and are never upgraded in place; Core accepts only nodes that speak its own node protocol.
 
-`install.sh` refuses a directory that is not empty. If the first start fails, it deletes the directory it created, and the same command can be run again. An installation that has already started is left in place.
+An interrupted installation can [resume with its saved configuration](./install.md#install). An unrelated nonempty directory is refused.
 
-Mutating `oac` commands hold `.oac.lock`. If another command holds it, retry after that command finishes. Never delete `.oac.lock` to get past a busy installation.
+The installer and mutating `oac` commands hold `.oac.lock`. The installer also holds a sibling `<install-dir>.install.lock` while preparing the directory. If another command holds either lock, retry after it finishes. Never delete a lock file to get past a busy installation.
 
 ## Troubleshooting
 
 | Symptom | Cause and fix |
 | --- | --- |
-| `Core installation requires Linux amd64 with Docker access` | Use Linux amd64 and an account with Docker access; root and ordinary users are supported |
-| `Installation failed: inspect prerequisites and private deployment files` | A prerequisite failed without its own message, most often Docker: check that `docker info` and `docker compose version` work for this user |
-| `Docker Compose 2.26.0 or newer is required …` | Update the Docker Compose plugin |
 | `Port N is already in use.` | Another program holds that port. Stop it, or choose another `--web-port`. The installer does not move to a different port |
-| `Installation directory is not empty` | Use an empty `--install-dir`, or [uninstall](#uninstall) the existing installation first |
+| `Directory is not a complete Core installation` | Preserve the directory and choose another `--install-dir` |
 | `configuration check failed; no service was changed` | `.env` has a value Core rejects. The message names the variable and not the value. Fix `.env` and run `oac apply` again |
 | `Docker Compose 2.26 or newer is required` | Update the Docker Compose plugin |
-| `The services did not start: …` | A new installation's first start failed, and the installer [removed what it created](./install.md#install). Compose's or Core's error is printed above it; fix the cause and run the same command again |
-| `Removal did not finish. Left: …` | A failed first start could not remove everything. Run the printed commands to remove what is left, or fix the cause and run the same command again |
-| `This installation did not finish installing …` | The installer stopped before reporting that the services were running. Rerun the installer command, which [removes what is left](./install.md#install) and installs again, or [uninstall](#uninstall) it |
+| `Installation and data retained at …` | Read the service logs above it, fix the cause, then [resume installation](./install.md#install); keep the data |
 | Web answers 403 `Forbidden` | The browser host is not `OAC_PUBLIC_URL`. Open that origin; a reverse proxy must pass the original Host |
 | Web shows that Core is unavailable (502) | Core is stopped or failing: `docker compose ps`, then Core's log |
 | Session creation returns 400 `model_provider_required` | No model provider: set a [default model](../configuration.md#default-models) for the harness, or pass one; self-hosted Sessions always pass their own |
diff --git a/docs/getting-started/self-hosted.md b/docs/getting-started/self-hosted.md
index 426ab539e..828d884e2 100644
--- a/docs/getting-started/self-hosted.md
+++ b/docs/getting-started/self-hosted.md
@@ -25,7 +25,7 @@ The machine needs:
 - Python and pip when the Session's packages need them;
 - any system packages your setup needs. The daemon never runs apt, sudo or another elevation command, so install them through the host's normal administration.
 
-No administrator privileges or Docker are needed. The Unix download command also uses `curl`, `tar`, `gzip`, a SHA-256 tool and the system file-lock command (`flock` on Linux, `lockf` on macOS).
+No administrator privileges or Docker are needed. The Unix download command also uses `curl`, `tar`, `gzip`, a SHA-256 tool and the system file-lock command (`flock` on Linux, `lockf` on macOS). Windows needs its system `tar.exe`; the command checks for it before downloading. The Runtime home must allow executable files to run. On a Unix `noexec` mount, choose another absolute directory with `OAC_RUNTIME_HOME` before running the command.
 
 ## Connect a machine
 
diff --git a/docs/zh/getting-started/install.md b/docs/zh/getting-started/install.md
index 55e711e89..da6dbe184 100644
--- a/docs/zh/getting-started/install.md
+++ b/docs/zh/getting-started/install.md
@@ -1,7 +1,7 @@
 ---
 title: "安装 Core 和 Web"
 source: docs/getting-started/install.md
-source_hash: b588dc9d68ba909fe9fadc440ee3f6fda9b79ebe0f14f6011d8bab603e17c710
+source_hash: d034ab565564ae9447c6e8b31b3d13d8868cae738f623a7471ba56ba517d67c8
 ---
 
 一条命令即可在 Linux 主机上安装 Core、Web 控制台和 PostgreSQL。用 Core 密钥登录 Web，设置默认模型并签发 Project API 密钥。应用使用这些密钥调用 Core。Session 在你添加的节点上的沙箱中运行，也可以在 E2B 上运行。
@@ -46,7 +46,13 @@ curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/
 
 安装程序不保存沙箱后端，不添加节点，不创建 Project 或密钥，也不发起模型请求。完成后输出控制台地址和 Core 密钥。
 
-如果服务进入健康状态之前安装失败，安装程序会删除它创建的目录。修复报告的问题后，重新运行同一命令。服务已经启动之后，后续失败会保留安装和数据。新发布版使用新目录；见[版本策略](operations.md#installation-version-policy)。
+安装目录就位前，先完成下载和配置检查。之后的失败会保留配置与数据，并显示服务日志。修复报错后，重新执行同一命令，或指定安装目录即可继续：
+
+```bash
+curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash -s -- --install-dir "$HOME/.oac/core"
+```
+
+如果使用了其他目录，请替换路径。重新执行时沿用已保存的 Compose 文件和设置；安装参数只对新目录生效。已有镜像和容器直接复用，缺失镜像会重新下载。修改设置请编辑 `.env` 并运行 `oac apply`。新发布版使用新目录；见[版本策略](operations.md#installation-version-policy)。
 
 空间或配额不足时，请释放错误信息所指文件系统的空间。加载镜像失败还可能需要释放 Docker 存储空间，该存储可能位于另一个文件系统。
 
diff --git a/docs/zh/getting-started/nodes.md b/docs/zh/getting-started/nodes.md
index c0097dc89..ec1e69d0b 100644
--- a/docs/zh/getting-started/nodes.md
+++ b/docs/zh/getting-started/nodes.md
@@ -1,7 +1,7 @@
 ---
 title: "添加和管理节点"
 source: docs/getting-started/nodes.md
-source_hash: 863ce05f8cfbc5da7c9f05c35c361ebd15a99fc3cebc952e2c8076810ff3fe3b
+source_hash: f5bec50bf81ebf1d08faaa54432da6a9c6e3ddbf88d93e33244276546c74aaab
 ---
 
 节点是一台 Linux 主机，在沙箱后端为 Docker 或 microsandbox 时，为 Core 托管 Session 运行沙箱。Core 将新 Session 分配给有空余容量的节点；节点创建沙箱，沙箱回连 Core。E2B 不需要节点。应用为自己的 Session 连接的机器是[自托管执行器](self-hosted.md)，而不是节点。
@@ -29,18 +29,9 @@ Core 主机与其他主机一样加入：要在它上面运行沙箱，将它添
 
 ### 命令 {#the-command}
 
-Web 生成如下命令，填入本安装的值：
+从 **Nodes → Add node** 复制当前命令，其中已填入本安装的地址、校验和与注册令牌。命令先检查 Linux amd64、Python 3.9+ 和必要工具，再下载文件；临时网络故障最多尝试三次。校验失败时，从 Web 复制新命令重试。
 
-```sh
- (umask 077; d=$(mktemp -d) || exit; trap 'rm -rf "$d"' EXIT; s=; [ "$(id -u)" -eq 0 ] || s=sudo
-printf '\n==> Downloading node installer...\n' &&
-curl -fsS --max-time 30 --max-filesize 1048576 'https://core.example/node-install/node-install.pyz' -o "$d/node-install.pyz" &&
-printf '==> Verifying node installer...\n' &&
-printf '%s  %s\n' '<installer-sha256>' "$d/node-install.pyz" | sha256sum -c --status &&
-printf '%s\n' '<enrollment-token>' | $s python3 "$d/node-install.pyz" ${NO_COLOR+--no-color} --enrollment-token-stdin --source-url 'https://core.example' --core-url 'https://core.example' --provider 'docker' --installation-id '<installation-id>')
-```
-
-- 下载到私有临时目录、检查 SHA-256，再通过 `sudo` 执行；root shell 中则直接执行。
+- 下载到当前账号的私有 `~/.oac/node-bootstrap` 目录，检查 SHA-256，再通过 `sudo` 执行；root shell 中则直接执行。每次持锁清理下载残片后重试，已验证的 `<sha256>.pyz` 保留供安装程序使用。
 - 令牌通过标准输入传给安装程序，不出现在进程参数、环境变量或 sudo 日志中。
 - 当 `HISTCONTROL` 忽略以空格开头的行时（Debian 和 Ubuntu 默认如此），前导空格能避免命令进入 shell 历史。
 
@@ -48,7 +39,7 @@ printf '%s\n' '<enrollment-token>' | $s python3 "$d/node-install.pyz" ${NO_COLOR
 
 ### 主机要求 {#host-requirements}
 
-- Linux amd64 和 systemd；Python 3.9+、`curl` 和 `sha256sum`；root 或 sudo。
+- Linux amd64 和 systemd；Python 3.9+、`curl`、`sha256sum` 和 `flock`；root 或 sudo。
 - SELinux 不处于 enforcing 模式。安装程序不支持 enforcing SELinux 主机。
 - Docker：正在运行的 rootful Docker Engine，其 `/var/run/docker.sock` 套接字属于 `docker` 组，权限为 `0660`，并强制执行 CPU 和内存限制（cgroup v2）。
 - microsandbox：`/dev/kvm` 属于 `kvm` 组（硬件或嵌套虚拟化），并具有 microsandbox 链接的库（glibc）。
@@ -90,7 +81,7 @@ root 只准备账号、组和服务单元；其他操作（包括 Docker 网络
 - 重新执行同一命令是安全的。节点注册后，重新运行使用节点自身凭据，不改变已匹配的内容，也无需令牌。保留的节点身份属于其他 Core 地址或安装时，程序拒绝且不修改任何内容。
 - 已过期或已在其他主机使用的命令立即失败，显示 `Core rejected the node configuration read (HTTP 401)`：生成新命令并在 10 分钟内执行。
 - 慢速下载期间命令过期时，注册失败并显示 `The enrollment command expired or was already used`。下载文件保留：在 Web 生成新命令后执行。
-- 下载从断点继续。每分钟下载不足 64 KiB 时会停止并保留已有内容；重新执行命令即可。
+- 失败或中断时删除下载残片；重新执行时从头下载缺失文件，复用已校验的完整文件。每分钟下载不足 64 KiB 时会停止，请检查网络后重试。
 - Docker Runtime 镜像约 500 MB。网络较慢时可提前加载：将发行资产 `oac-<commit>-linux-amd64-runtime.tar.gz` 复制到主机并运行 `sudo docker load -i`。安装程序发现精确匹配的镜像后跳过下载。
 - 中断安装程序或关闭终端会停止程序；重新执行命令继续。
 
diff --git a/docs/zh/getting-started/operations.md b/docs/zh/getting-started/operations.md
index 41ee66157..9a2a87cc0 100644
--- a/docs/zh/getting-started/operations.md
+++ b/docs/zh/getting-started/operations.md
@@ -1,7 +1,7 @@
 ---
 title: "管理你的安装"
 source: docs/getting-started/operations.md
-source_hash: 5ac3e57f943b8bb3fadbf9cda0a72399317ad101416ec28ca4037eea07703a82
+source_hash: 8b5ec8893b3e844a2c4173a4122cee17bf08350cd1ea2d5128e9a6c72f590907
 ---
 
 安装运维人员负责 Core 主机、存储和可用性。节点主机运行各自的服务；参阅[节点](nodes.md)。设置见[配置参考](../configuration.md)。
@@ -164,24 +164,19 @@ cd && rm -rf ~/.oac/core
 
 迁移到新版本时，安装到全新的空目录，使用独立数据库、Core 密钥和节点，并从新 Web 添加节点。保留旧安装、数据和节点，直到工作完成。节点运行添加它的控制台所提供的程序，不原地升级；Core 仅接受使用自身节点协议的节点。
 
-`install.sh` 拒绝非空目录。首次启动失败时，它删除自己创建的目录，同一命令可以再运行。已经启动的安装会保留。
+中断的安装可以[沿用已保存配置继续](install.md#install)。与本安装无关的非空目录会被拒绝。
 
-会修改状态的 `oac` 命令持有 `.oac.lock`。其他命令持有锁时，等待其结束后重试。不要删除 `.oac.lock` 来绕过忙碌安装。
+安装程序和修改状态的 `oac` 命令持有 `.oac.lock`。安装程序准备目录时还持有同级的 `<install-dir>.install.lock`。其他命令持有锁时，等待其结束后重试。不要删除锁文件来绕过忙碌安装。
 
 ## 问题排查 {#troubleshooting}
 
 | 症状 | 原因与解决方法 |
 | --- | --- |
-| `Core installation requires Linux amd64 with Docker access` | 使用 Linux amd64 和有 Docker 访问权限的账号；支持 root 和普通用户 |
-| `Installation failed: inspect prerequisites and private deployment files` | 前置条件失败但未单独报告，通常是 Docker：检查此用户能运行 `docker info` 和 `docker compose version` |
-| `Docker Compose 2.26.0 or newer is required …` | 更新 Docker Compose 插件 |
 | `Port N is already in use.` | 其他程序占用该端口。停止它，或另选 `--web-port`。安装程序不会改用其他端口 |
-| `Installation directory is not empty` | 使用空的 `--install-dir`，或先[卸载](#uninstall)现有安装 |
+| `Directory is not a complete Core installation` | 保留目录内容，选择另一个 `--install-dir` |
 | `configuration check failed; no service was changed` | `.env` 中有 Core 拒绝的值。消息只包含变量名。修正 `.env` 后再次运行 `oac apply` |
 | `Docker Compose 2.26 or newer is required` | 更新 Docker Compose 插件 |
-| `The services did not start: …` | 新安装首次启动失败，安装程序[删除了所创建内容](install.md#install)。上方输出 Compose 或 Core 错误；修复后执行同一命令 |
-| `Removal did not finish. Left: …` | 首次启动失败后没能删干净。执行输出的命令移除残留，或修复原因后重新执行原命令 |
-| `This installation did not finish installing …` | 安装程序在报告服务运行前停止。重新执行安装命令，[清理残留](install.md#install)后重新安装，或[卸载](#uninstall) |
+| `Installation and data retained at …` | 查看上方服务日志，修复原因，再[继续安装](install.md#install)；不要删除数据 |
 | Web 返回 403 `Forbidden` | 浏览器主机名不是 `OAC_PUBLIC_URL`。打开该源地址；反向代理必须传递原始 Host |
 | Web 显示 Core 不可用（502） | Core 停止或失败：先 `docker compose ps`，再查看 Core 日志 |
 | 创建 Session 返回 400 `model_provider_required` | 缺少模型提供商：为 Harness 设置[默认模型](../configuration.md#default-models)，或显式提供；自托管 Session 始终自带提供商 |
diff --git a/docs/zh/getting-started/self-hosted.md b/docs/zh/getting-started/self-hosted.md
index 7765a1739..9a075178b 100644
--- a/docs/zh/getting-started/self-hosted.md
+++ b/docs/zh/getting-started/self-hosted.md
@@ -1,7 +1,7 @@
 ---
 title: "自托管执行器"
 source: docs/getting-started/self-hosted.md
-source_hash: 800b3eb891c20d34215344c0ea147dbb79b5921d25d6f2405bcfe5edccd88038
+source_hash: c42a64b5e59406594143866c503817525c55ea844d858f25119c8fa54993134c
 ---
 
 `self_hosted` Session 在应用拥有的机器上运行：工作站、虚拟机或你管理的沙箱。应用通过 `/v1` 创建 Session，并获得安装 `oac-daemon`、启动它并连接 Core 的命令。Web 在 Session 页面展示同一命令；Web 是可选的。Core 不创建、停止或回收这台机器。
@@ -27,7 +27,7 @@ Session 自带模型提供商；安装默认模型不适用（[原因](../../../
 - Session 的软件包需要时，安装 Python 和 pip；
 - 环境设置所需的系统软件包。守护进程不运行 apt、sudo 或其他提权命令，请通过主机的常规管理方式安装。
 
-不需要管理员权限或 Docker。Unix 下载命令还使用 `curl`、`tar`、`gzip`、SHA-256 工具和系统文件锁命令（Linux 为 `flock`，macOS 为 `lockf`）。
+不需要管理员权限或 Docker。Unix 下载命令还使用 `curl`、`tar`、`gzip`、SHA-256 工具和系统文件锁命令（Linux 为 `flock`，macOS 为 `lockf`）。Windows 需要系统自带的 `tar.exe`，命令会在下载前检查。Runtime 主目录必须允许执行文件。如果 Unix 挂载点设为 `noexec`，请先用 `OAC_RUNTIME_HOME` 指定另一个允许执行的绝对目录，再运行命令。
 
 ## 连接机器 {#connect-a-machine}
 
diff --git a/services/core/internal/nativeinstaller/assets/bootstrap.ps1 b/services/core/internal/nativeinstaller/assets/bootstrap.ps1
index 92c0b8094..3a8cae90c 100644
--- a/services/core/internal/nativeinstaller/assets/bootstrap.ps1
+++ b/services/core/internal/nativeinstaller/assets/bootstrap.ps1
@@ -4,6 +4,8 @@ param(
   [Parameter(ValueFromRemainingArguments=$true)][string[]]$InstallArguments
 )
 $ErrorActionPreference = 'Stop'
+$tar = Join-Path $env:SystemRoot 'System32\tar.exe'
+if (!(Test-Path -LiteralPath $tar -PathType Leaf)) { throw 'Windows tar.exe is required. Install the Windows archive tools, then rerun this command.' }
 Add-Type -AssemblyName System.Net.Http
 if (!("OacNativeDownloadSpace" -as [type])) {
   Add-Type -TypeDefinition @'
@@ -158,7 +160,7 @@ try {
   $bundle = Join-Path $work 'bundle'
   [IO.Directory]::CreateDirectory($bundle) | Out-Null
   Write-Host 'Extracting the installer...'
-  & (Join-Path $env:SystemRoot 'System32\tar.exe') -xzf $archive -C $bundle
+  & $tar -xzf $archive -C $bundle
   if ($LASTEXITCODE -ne 0) { throw 'Installer extraction failed. Check disk space, quota and filesystem permissions.' }
   $endpoint = $Base -replace '/install/[^/]+$', '/installation'
   Write-Host 'Starting installation...'
diff --git a/services/core/internal/nativeinstaller/assets/bootstrap.sh b/services/core/internal/nativeinstaller/assets/bootstrap.sh
index e14d88759..c4bf10c9f 100644
--- a/services/core/internal/nativeinstaller/assets/bootstrap.sh
+++ b/services/core/internal/nativeinstaller/assets/bootstrap.sh
@@ -90,4 +90,13 @@ space "$unpacked"
 printf 'Extracting the installer...\n'
 mkdir "$work/bundle"
 run tar -xzf "$work/bundle.tar.gz" -C "$work/bundle" || fail 'Installer extraction failed. Check disk space, quota and filesystem permissions.'
-run "$work/bundle/oac-daemon" install --onboard-url "${base%/install/*}/installation" --authorization "$authorization" "$@"
+[ -x "$work/bundle/oac-daemon" ] || fail 'Cannot start the native installer. Check executable permissions and use a Runtime home that permits execution.'
+if run "$work/bundle/oac-daemon" install --onboard-url "${base%/install/*}/installation" --authorization "$authorization" "$@"; then
+  exit 0
+else
+  code=$?
+  case "$code" in
+    126|127) fail 'Cannot start the native installer. Check that the Runtime home permits execution (not a noexec mount) and that this host has the required native libraries.';;
+    *) exit "$code";;
+  esac
+fi
diff --git a/services/core/internal/nativeinstaller/bootstrap_recovery_test.go b/services/core/internal/nativeinstaller/bootstrap_recovery_test.go
index a0d112925..441e0d3c6 100644
--- a/services/core/internal/nativeinstaller/bootstrap_recovery_test.go
+++ b/services/core/internal/nativeinstaller/bootstrap_recovery_test.go
@@ -163,3 +163,64 @@ func TestBootstrapRejectsLowSpaceBeforeNetwork(t *testing.T) {
 		t.Fatal("low-space failure left staging")
 	}
 }
+
+func TestBootstrapExplainsUnexecutableInstaller(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("POSIX executable permissions")
+	}
+	var buffer bytes.Buffer
+	z := gzip.NewWriter(&buffer)
+	tw := tar.NewWriter(z)
+	data := []byte("#!/bin/sh\nexit 0\n")
+	if err := tw.WriteHeader(&tar.Header{Name: "oac-daemon", Mode: 0600, Size: int64(len(data))}); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := tw.Write(data); err != nil {
+		t.Fatal(err)
+	}
+	if err := tw.Close(); err != nil {
+		t.Fatal(err)
+	}
+	if err := z.Close(); err != nil {
+		t.Fatal(err)
+	}
+	archive := buffer.Bytes()
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if strings.HasSuffix(r.URL.Path, ".sha256") {
+			fmt.Fprintf(w, "%x\n", sha256.Sum256(archive))
+			return
+		}
+		w.Write(archive)
+	}))
+	defer server.Close()
+	home := t.TempDir()
+	output, err := bootstrapCommand(t, server.URL, home).CombinedOutput()
+	if err == nil || !bytes.Contains(output, []byte("Cannot start the native installer")) {
+		t.Fatalf("%v: %s", err, output)
+	}
+	if _, err := os.Stat(filepath.Join(home, "native-download", "staging")); !os.IsNotExist(err) {
+		t.Fatal("staging remains")
+	}
+}
+
+func TestWindowsBootstrapChecksArchiveToolBeforeDownload(t *testing.T) {
+	if runtime.GOOS != "windows" {
+		t.Skip("Windows archive prerequisite")
+	}
+	var requests atomic.Int32
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { requests.Add(1); w.WriteHeader(500) }))
+	defer server.Close()
+	home := filepath.Join(t.TempDir(), "runtime")
+	command := bootstrapCommand(t, server.URL, home)
+	quote := func(value string) string { return "'" + strings.ReplaceAll(value, "'", "''") + "'" }
+	// Keep the real SystemRoot while PowerShell itself loads.
+	command.Args = []string{command.Path, "-NoProfile", "-NonInteractive", "-Command",
+		"$env:SystemRoot = " + quote(t.TempDir()) + "; & './assets/bootstrap.ps1' -Base " + quote(server.URL) + " -Authorization 'fixture-grant'"}
+	output, err := command.CombinedOutput()
+	if err == nil || !bytes.Contains(output, []byte("tar.exe is required")) || requests.Load() != 0 {
+		t.Fatalf("%v: %s", err, output)
+	}
+	if _, err := os.Stat(home); !os.IsNotExist(err) {
+		t.Fatal("home created before prerequisite check")
+	}
+}

From c178f4438007fb11de7b485d7ad96581d014ecee Mon Sep 17 00:00:00 2001
From: RyanLee <33855278+RyanLee-Dev@users.noreply.github.com>
Date: Wed, 7 Oct 2026 16:26:04 +0800
Subject: [PATCH 20/60] Remove the unserved daemon pairing path and unused
 helpers (#363)

* Remove the unserved daemon pairing path and runtimecrypto

`oac-daemon connect --url --token` posted to /api/v1/runtimes/pair, which
Core does not serve and no contract documents, so the path always failed.
Its envelope encryption was never wired: Core never stored or used
runner_public_key, and SealForRuntime had no caller outside its fixture
generator.

Daemon credentials come from a Provider bootstrap file, self-hosted
Environment enrollment or the oac-core-device profile, all unchanged.

- Delete pair.go, the inline pairing flags, their environment handoff and
  their tests.
- Delete internal/runtimecrypto; golang.org/x/crypto is no longer required.
- auth: drop the pairing-only Profile fields and Save, which no longer has
  a production caller; the not-found error points to oac-core-device.
- daemonize: drop ReExecOptions.ExtraEnv, which only carried the pairing
  token to the background child.
- paths: drop EnsureProfileDir, whose only caller was auth.Save.
- Reword comments and docs that described pairing.

* Remove obsolete Parsar integration naming guidance

* docs: sync bootstrap translation after pairing removal

---------

Co-authored-by: saladday <1203511142@qq.com>
---
 CONTRIBUTING.md                               |   2 +-
 apps/daemon/cmd/oac-daemon/main.go            |   4 +-
 apps/daemon/internal/auth/store.go            |  66 +-------
 apps/daemon/internal/auth/store_test.go       | 133 +++++-----------
 apps/daemon/internal/cli/connect.go           | 146 +++---------------
 apps/daemon/internal/cli/connect_bootstrap.go |   2 +-
 .../internal/cli/connect_bootstrap_test.go    |  18 ++-
 .../internal/cli/connect_environment.go       |   2 +-
 .../internal/cli/connect_environment_test.go  |  11 --
 apps/daemon/internal/cli/connect_test.go      |  60 -------
 .../internal/cli/native_install_test.go       |   3 +-
 apps/daemon/internal/cli/pair.go              | 145 -----------------
 apps/daemon/internal/cli/pair_test.go         |  95 ------------
 apps/daemon/internal/cli/root.go              |   4 +-
 apps/daemon/internal/cli/status.go            |   8 +-
 apps/daemon/internal/daemonize/fork.go        |   5 -
 apps/daemon/internal/daemonize/fork_test.go   |   6 +-
 .../daemon/internal/daemonize/pidfile_test.go |   3 +-
 apps/daemon/internal/paths/paths.go           |  19 +--
 apps/daemon/internal/paths/paths_test.go      |  31 ----
 apps/daemon/internal/transport/ws.go          |   2 +-
 docs/runtime-bootstrap.md                     |   2 +-
 docs/zh/runtime-bootstrap.md                  |   4 +-
 go.mod                                        |   1 -
 go.sum                                        |   2 -
 .../runtimecrypto/cmd/emit-fixture/main.go    |  76 ---------
 internal/runtimecrypto/runtime_seal.go        | 110 -------------
 internal/runtimecrypto/runtime_seal_test.go   | 135 ----------------
 .../runtimecrypto/runtime_seal_wire_test.go   |  56 -------
 internal/runtimecrypto/testdata/wire_v1.json  |   8 -
 packages/claude-sdk-adapter/README.md         |   4 +-
 services/core/internal/runtimegateway/auth.go |   2 +-
 .../core/internal/runtimegateway/handler.go   |  10 +-
 .../core/internal/runtimegateway/routes.go    |   4 +-
 34 files changed, 114 insertions(+), 1065 deletions(-)
 delete mode 100644 apps/daemon/internal/cli/connect_test.go
 delete mode 100644 apps/daemon/internal/cli/pair.go
 delete mode 100644 apps/daemon/internal/cli/pair_test.go
 delete mode 100644 internal/runtimecrypto/cmd/emit-fixture/main.go
 delete mode 100644 internal/runtimecrypto/runtime_seal.go
 delete mode 100644 internal/runtimecrypto/runtime_seal_test.go
 delete mode 100644 internal/runtimecrypto/runtime_seal_wire_test.go
 delete mode 100644 internal/runtimecrypto/testdata/wire_v1.json

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 04cbec682..95a989fe2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -142,7 +142,7 @@ Native adapter changes require their build/check targets and live provider accep
 | Provider ownership labels | `io.oac.*` |
 | E2B metadata | `oac_*` |
 
-Provider bootstrap, Runtime images and Harness adapters must agree on these names. The separate Parsar product integration settings keep their own names.
+Provider bootstrap, Runtime images and Harness adapters must agree on these names.
 
 The [installation version policy](docs/getting-started/operations.md#installation-version-policy) owns release changes and preservation of installed data and resources.
 
diff --git a/apps/daemon/cmd/oac-daemon/main.go b/apps/daemon/cmd/oac-daemon/main.go
index 368943517..464f72f9d 100644
--- a/apps/daemon/cmd/oac-daemon/main.go
+++ b/apps/daemon/cmd/oac-daemon/main.go
@@ -1,5 +1,5 @@
-// Command oac-daemon is the reverse-WebSocket worker that pairs a user
-// machine with a OpenAgentCore server and exposes a local agent CLI
+// Command oac-daemon is the reverse-WebSocket worker that connects a
+// machine to an OpenAgentCore server and exposes a local agent CLI
 // subprocess as a connector_type=agent_daemon target. See
 // apps/daemon/README.md for the subcommand spec.
 package main
diff --git a/apps/daemon/internal/auth/store.go b/apps/daemon/internal/auth/store.go
index 3a69123e8..ec636f67e 100644
--- a/apps/daemon/internal/auth/store.go
+++ b/apps/daemon/internal/auth/store.go
@@ -1,9 +1,7 @@
-// Package auth persists the credential bundle from
-// /api/v1/runtimes/pair: server URL, runtime row id (= device_id), and
-// the long-lived runner_credential. Stored as JSON per-profile at
-// ~/.oac/daemon/<profile>/auth.json (0o600), written via
-// atomic rename so a half-flushed pair never leaves the daemon paired
-// with garbage state.
+// Package auth reads the daemon credential profile written by
+// oac-core-device: server URL, runtime row id (= device_id), and the
+// long-lived runner_credential. Stored as JSON per-profile at
+// ~/.oac/daemon/<profile>/auth.json (0o600).
 package auth
 
 import (
@@ -11,21 +9,19 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/paths"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimefs"
 )
 
-// Profile is the on-disk representation of one paired credential.
+// Profile is the on-disk representation of one daemon credential.
 type Profile struct {
 	// ServerURL is the absolute base URL the daemon dials (no
 	// trailing slash). The daemon joins this with paths like
 	// /agent-daemon/bootstrap.
 	ServerURL string `json:"server_url"`
 
-	// RuntimeID is the runtimes row id minted at pair time. The
-	// gateway uses it verbatim as device_id on WS upgrade.
+	// RuntimeID is the runtimes row id. The gateway uses it verbatim
+	// as device_id on WS upgrade.
 	RuntimeID string `json:"runtime_id"`
 
 	// RunnerCredential is the bearer presented on every
@@ -35,57 +31,11 @@ type Profile struct {
 	RunnerCredential string `json:"runner_credential"`
 
 	DeviceName string `json:"device_name,omitempty"`
-
-	Hostname string `json:"hostname,omitempty"`
-
-	// PairedAt is when the credential was minted. `omitzero` because
-	// `omitempty` doesn't elide zero structs like time.Time.
-	PairedAt time.Time `json:"paired_at,omitzero"`
-
-	// RunnerPublicKey is the base64 X25519 public half generated at
-	// pair time. Server stores the matching value in
-	// runtimes.config.runner_public_key for SealAnonymous addressed
-	// to this daemon.
-	RunnerPublicKey string `json:"runner_public_key,omitempty"`
-
-	// RunnerPrivateKey is the base64 X25519 private half — used by
-	// runtimecrypto.OpenSeal to decrypt incoming sealed payloads.
-	// MUST NEVER appear in logs or leave the box.
-	RunnerPrivateKey string `json:"runner_private_key,omitempty"`
 }
 
 // ErrNotPaired is returned by Load when no auth.json exists for the
 // requested profile.
-var ErrNotPaired = errors.New("auth: not paired — use `oac-daemon connect --url ... --token ...`")
-
-// Save writes p atomically to the profile's auth.json (0o600 even if
-// the previous file was world-readable).
-func Save(profile string, p Profile) error {
-	if profile == "" {
-		return fmt.Errorf("auth: profile name required")
-	}
-	dir, err := paths.EnsureProfileDir(profile)
-	if err != nil {
-		return err
-	}
-	raw, err := json.MarshalIndent(p, "", "  ")
-	if err != nil {
-		return errors.New("auth: could not encode profile")
-	}
-	if err = runtimefs.EnsurePrivateDir(dir); err != nil {
-		return errors.New("auth: private profile unavailable")
-	}
-	held, err := os.OpenRoot(dir)
-	if err != nil {
-		return errors.New("auth: private profile unavailable")
-	}
-	defer held.Close()
-	if err = runtimefs.WritePrivateAtomic(held, "auth.json", raw); err != nil {
-		return errors.New("auth: private profile write failed")
-	}
-
-	return nil
-}
+var ErrNotPaired = errors.New("auth: no daemon credential profile — create one with oac-core-device")
 
 // Load reads the profile's auth.json. Returns ErrNotPaired wrapping
 // fs.ErrNotExist when the file is missing.
diff --git a/apps/daemon/internal/auth/store_test.go b/apps/daemon/internal/auth/store_test.go
index 1d76ad1b7..1d3bfffcc 100644
--- a/apps/daemon/internal/auth/store_test.go
+++ b/apps/daemon/internal/auth/store_test.go
@@ -1,16 +1,16 @@
 package auth_test
 
 import (
+	"encoding/json"
 	"errors"
 	"io/fs"
 	"os"
 	"path/filepath"
-	"runtime"
 	"testing"
-	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/auth"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/paths"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimefs"
 )
 
 func withTempHome(t *testing.T) string {
@@ -20,105 +20,62 @@ func withTempHome(t *testing.T) string {
 	return dir
 }
 
-func TestSaveLoadRoundTrip(t *testing.T) {
-	_ = withTempHome(t)
-	now := time.Date(2026, 6, 4, 12, 0, 0, 0, time.UTC)
-	want := auth.Profile{
-		ServerURL:        "https://core.example.com",
-		RuntimeID:        "rt_abc123",
-		RunnerCredential: "secret-credential",
-		DeviceName:       "alice-mac",
-		Hostname:         "alice-mac.local",
-		PairedAt:         now,
-	}
-	if err := auth.Save("test", want); err != nil {
-		t.Fatalf("Save: %v", err)
-	}
-	got, err := auth.Load("test")
+func profileDir(t *testing.T, profile string) string {
+	t.Helper()
+	dir, err := paths.ProfileDir(profile)
 	if err != nil {
-		t.Fatalf("Load: %v", err)
+		t.Fatalf("ProfileDir: %v", err)
 	}
-	if got.ServerURL != want.ServerURL ||
-		got.RuntimeID != want.RuntimeID ||
-		got.RunnerCredential != want.RunnerCredential ||
-		got.DeviceName != want.DeviceName ||
-		got.Hostname != want.Hostname ||
-		!got.PairedAt.Equal(want.PairedAt) {
-		t.Fatalf("Load round-trip mismatch:\n got=%+v\nwant=%+v", got, want)
+	if err := runtimefs.EnsurePrivateDir(dir); err != nil {
+		t.Fatalf("EnsurePrivateDir: %v", err)
 	}
+	return dir
 }
 
-func TestSaveSetsRestrictivePerms(t *testing.T) {
-	_ = withTempHome(t)
-	if err := auth.Save("default", auth.Profile{ServerURL: "https://x", RuntimeID: "rt", RunnerCredential: "c"}); err != nil {
-		t.Fatalf("Save: %v", err)
-	}
-	authPath, err := paths.AuthFile("default")
-	if err != nil {
-		t.Fatalf("AuthFile: %v", err)
-	}
-	info, err := os.Stat(authPath)
+func writeProfile(t *testing.T, profile string, p auth.Profile) {
+	t.Helper()
+	dir := profileDir(t, profile)
+	raw, err := json.Marshal(p)
 	if err != nil {
-		t.Fatalf("stat auth.json: %v", err)
+		t.Fatalf("marshal profile: %v", err)
 	}
-	// Unix stores credentials with 0600; Windows uses normal account ACLs,
-	// which are not represented by Go permission bits.
-	if mode := info.Mode().Perm(); runtime.GOOS != "windows" && mode != 0o600 {
-		t.Errorf("auth.json perm = %o, want 0600", mode)
+	if err := os.WriteFile(filepath.Join(dir, "auth.json"), raw, 0o600); err != nil {
+		t.Fatalf("write auth.json: %v", err)
 	}
 }
 
-func TestSaveIsAtomicNoStrayTempFile(t *testing.T) {
+func TestLoadReadsProfile(t *testing.T) {
 	_ = withTempHome(t)
-	if err := auth.Save("default", auth.Profile{ServerURL: "https://x", RuntimeID: "rt", RunnerCredential: "c"}); err != nil {
-		t.Fatalf("Save: %v", err)
-	}
-	authPath, err := paths.AuthFile("default")
-	if err != nil {
-		t.Fatalf("AuthFile: %v", err)
+	want := auth.Profile{
+		ServerURL:        "https://core.example.com",
+		RuntimeID:        "rt_abc123",
+		RunnerCredential: "secret-credential",
+		DeviceName:       "alice-mac",
 	}
-	// Writes to auth.json.tmp then renames — no stray .tmp on success.
-	entries, err := os.ReadDir(filepath.Dir(authPath))
+	writeProfile(t, "test", want)
+	got, err := auth.Load("test")
 	if err != nil {
-		t.Fatalf("ReadDir: %v", err)
+		t.Fatalf("Load: %v", err)
 	}
-	for _, e := range entries {
-		if filepath.Ext(e.Name()) == ".tmp" {
-			t.Fatalf("found stray temp file after Save: %s", e.Name())
-		}
+	if got != want {
+		t.Fatalf("Load mismatch:\n got=%+v\nwant=%+v", got, want)
 	}
 }
 
-func TestSaveOverwritesAndHealsPerms(t *testing.T) {
+func TestLoadIgnoresLegacyProfileFields(t *testing.T) {
 	_ = withTempHome(t)
-	if err := auth.Save("default", auth.Profile{ServerURL: "https://x", RuntimeID: "rt1", RunnerCredential: "c1"}); err != nil {
-		t.Fatalf("Save first: %v", err)
-	}
-	authPath, err := paths.AuthFile("default")
-	if err != nil {
-		t.Fatalf("AuthFile: %v", err)
-	}
-	// Simulate a previously-world-readable file (user chmod'd it);
-	// atomic-rename Save must re-establish 0600 on the new inode.
-	if err := os.Chmod(authPath, 0o644); err != nil {
-		t.Fatalf("chmod loose perms: %v", err)
-	}
-	if err := auth.Save("default", auth.Profile{ServerURL: "https://x", RuntimeID: "rt2", RunnerCredential: "c2"}); err != nil {
-		t.Fatalf("Save second: %v", err)
-	}
-	info, err := os.Stat(authPath)
-	if err != nil {
-		t.Fatalf("stat: %v", err)
-	}
-	if mode := info.Mode().Perm(); runtime.GOOS != "windows" && mode != 0o600 {
-		t.Errorf("perm after re-save = %o, want 0600 (healing failed)", mode)
+	raw := `{"server_url":"https://core.example.com/api/v1","runtime_id":"rt","runner_credential":"c","device_name":"d",` +
+		`"hostname":"h","paired_at":"2026-06-04T12:00:00Z","runner_public_key":"pub","runner_private_key":"priv"}`
+	if err := os.WriteFile(filepath.Join(profileDir(t, "legacy"), "auth.json"), []byte(raw), 0o600); err != nil {
+		t.Fatalf("write auth.json: %v", err)
 	}
-	got, err := auth.Load("default")
+	got, err := auth.Load("legacy")
 	if err != nil {
 		t.Fatalf("Load: %v", err)
 	}
-	if got.RuntimeID != "rt2" || got.RunnerCredential != "c2" {
-		t.Errorf("overwrite did not take effect: %+v", got)
+	want := auth.Profile{ServerURL: "https://core.example.com/api/v1", RuntimeID: "rt", RunnerCredential: "c", DeviceName: "d"}
+	if got != want {
+		t.Fatalf("Load = %+v, want %+v", got, want)
 	}
 }
 
@@ -137,14 +94,11 @@ func TestLoadMissingReturnsErrNotPaired(t *testing.T) {
 
 func TestLoadCorruptJSONReturnsError(t *testing.T) {
 	_ = withTempHome(t)
-	dir, err := paths.EnsureProfileDir("default")
-	if err != nil {
-		t.Fatalf("EnsureProfileDir: %v", err)
-	}
+	dir := profileDir(t, "default")
 	if err := os.WriteFile(filepath.Join(dir, "auth.json"), []byte("{not valid json"), 0o600); err != nil {
 		t.Fatalf("seed corrupt file: %v", err)
 	}
-	_, err = auth.Load("default")
+	_, err := auth.Load("default")
 	if err == nil {
 		t.Fatal("Load returned nil error on corrupt JSON")
 	}
@@ -158,9 +112,7 @@ func TestDeleteIsIdempotent(t *testing.T) {
 	if err := auth.Delete("default"); err != nil {
 		t.Fatalf("Delete on missing profile returned %v, want nil (idempotent)", err)
 	}
-	if err := auth.Save("default", auth.Profile{ServerURL: "https://x", RuntimeID: "rt", RunnerCredential: "c"}); err != nil {
-		t.Fatalf("Save: %v", err)
-	}
+	writeProfile(t, "default", auth.Profile{ServerURL: "https://x", RuntimeID: "rt", RunnerCredential: "c"})
 	if err := auth.Delete("default"); err != nil {
 		t.Fatalf("Delete: %v", err)
 	}
@@ -172,10 +124,3 @@ func TestDeleteIsIdempotent(t *testing.T) {
 		t.Fatalf("Delete second call = %v, want nil", err)
 	}
 }
-
-func TestSaveRejectsEmptyProfile(t *testing.T) {
-	_ = withTempHome(t)
-	if err := auth.Save("", auth.Profile{ServerURL: "https://x", RuntimeID: "rt", RunnerCredential: "c"}); err == nil {
-		t.Fatal("Save with empty profile should error")
-	}
-}
diff --git a/apps/daemon/internal/cli/connect.go b/apps/daemon/internal/cli/connect.go
index 32b8e885c..a0d6abed1 100644
--- a/apps/daemon/internal/cli/connect.go
+++ b/apps/daemon/internal/cli/connect.go
@@ -7,7 +7,6 @@ import (
 	"log/slog"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
@@ -27,36 +26,25 @@ const (
 
 	// Allow the native process grace period and subsequent owner/pipe cleanup.
 	stopTimeout = 10 * time.Second
-
-	connectInlineURLEnv        = "OAC_RUNTIME_DAEMON_CONNECT_URL"
-	connectInlineTokenEnv      = "OAC_RUNTIME_DAEMON_CONNECT_TOKEN"
-	connectInlineDeviceNameEnv = "OAC_RUNTIME_DAEMON_CONNECT_DEVICE_NAME"
 )
 
 // runConnect dials /agent-daemon/bootstrap, opens /agent-daemon/ws,
 // wires the dispatch router, and routes Envelope traffic both ways
 // until either SIGINT/SIGTERM or a permanent credential rejection.
 //
-// `connect --url --token` folds one-shot pairing into the connect step:
-// the daemon consumes the pairing token, persists the returned runner
-// credential to auth.json, and connects. Subsequent `connect -b`
-// invocations reload the persisted profile.
+// The daemon credential comes from a Provider bootstrap file
+// (--bootstrap-file), self-hosted Environment enrollment
+// (--remote/--environment-id/--credential-file) or the saved profile
+// written by oac-core-device.
 //
 // -b re-execs the binary in the background with stdio redirected to
 // connect.log and the child PID written to connect.pid. The child
-// re-enters runConnect via BackgroundSentinelEnv. When --token is
-// supplied, the parent forks before pairing so the one-shot token is
-// consumed by the long-lived child. Inline pairing flags are scrubbed
-// from child argv and passed via environment to keep the token out of
-// process listings.
+// re-enters runConnect via BackgroundSentinelEnv.
 func runConnect(ctx *runContext, args []string) error {
 	fs := newFlagSet("connect")
 	var (
-		profile        = fs.String("profile", paths.DefaultProfile, "profile name for paired credentials and pid/log files")
+		profile        = fs.String("profile", paths.DefaultProfile, "profile name for daemon credentials and pid/log files")
 		background     = fs.Bool("b", false, "fork into the background; writes connect.pid + connect.log")
-		serverURL      = fs.String("url", "", "Core server base URL; with --token, pair inline before connecting")
-		token          = fs.String("token", "", "pairing token; with --url, connect consumes it without writing auth.json")
-		deviceName     = fs.String("device-name", "", "human label for inline pairing (defaults to hostname)")
 		remote         = fs.String("remote", "", "self-hosted Environment remote_url, unchanged")
 		environment    = fs.String("environment-id", "", "self-hosted Environment ID")
 		bootstrapFile  = fs.String("bootstrap-file", "", "absolute path to Provider-to-Runtime connection JSON")
@@ -74,21 +62,13 @@ func runConnect(ctx *runContext, args []string) error {
 	} else if !errors.Is(err, os.ErrNotExist) {
 		return errors.New("connect: cannot inspect native installation; use oac-daemon start")
 	}
-	// Hydrate inline pairing inputs from env in BOTH parent and the
-	// re-execed background child. Server-spawned sandboxes pass the
-	// token via OAC_RUNTIME_DAEMON_CONNECT_TOKEN/URL env rather than --url
-	// /--token flags; without this hydration before the pre-fork
-	// auth.json check below, the parent would take the "rely on
-	// auth.json" branch and bail with "not paired". Idempotent —
-	// fills only empty flags and unsets the env after consuming.
-	loadInlineConnectEnv(serverURL, token, deviceName)
 	if err := paths.ValidateProfile(*profile); err != nil {
 		return fmt.Errorf("connect: %w", err)
 	}
 	var bootstrapped *auth.Profile
 	if *bootstrapFile != "" {
-		if *serverURL != "" || *token != "" || *deviceName != "" || *remote != "" || *environment != "" || *credentialFile != "" || fs.NArg() != 0 {
-			return errors.New("connect: bootstrap input cannot be combined with enrollment or pairing options")
+		if *remote != "" || *environment != "" || *credentialFile != "" || fs.NArg() != 0 {
+			return errors.New("connect: bootstrap input cannot be combined with enrollment options")
 		}
 		bootstrapped, err = bootstrapProfile(*bootstrapFile)
 		if err != nil {
@@ -96,47 +76,30 @@ func runConnect(ctx *runContext, args []string) error {
 		}
 	}
 	if *remote != "" || *environment != "" || *credentialFile != "" {
-		if *serverURL != "" || *token != "" || *deviceName != "" || fs.NArg() != 0 {
-			return errors.New("connect: Environment enrollment cannot use pairing options or positional arguments")
+		if fs.NArg() != 0 {
+			return errors.New("connect: Environment enrollment cannot use positional arguments")
 		}
 		connectCtx, stop := daemonize.NotifyContext(context.Background())
 		defer stop()
 		return runEnvironmentConnect(connectCtx, ctx, *profile, *background, *remote, *environment, *credentialFile)
 	}
 
-	inlinePair := strings.TrimSpace(*serverURL) != "" || strings.TrimSpace(*token) != ""
-	if inlinePair {
-		if strings.TrimSpace(*serverURL) == "" {
-			return fmt.Errorf("connect: --url is required when --token is supplied")
-		}
-		if strings.TrimSpace(*token) == "" {
-			return fmt.Errorf("connect: --token is required when --url is supplied")
-		}
-	}
-
 	// -b mode: parent forks, child re-enters with sentinel env set
-	// and skips this branch. Fork before inline pairing so the
-	// one-shot token is consumed by the child that owns the WS loop.
+	// and skips this branch.
 	if *background && !daemonize.IsBackgroundChild() {
 		// Validate auth.json exists before forking so the error
 		// surfaces in the user's terminal instead of the background
 		// child's log.
-		if !inlinePair && bootstrapped == nil {
+		if bootstrapped == nil {
 			if _, err := auth.Load(*profile); err != nil {
 				return fmt.Errorf("connect: %w", err)
 			}
 		}
-		argv := os.Args
-		extraEnv := []string(nil)
-		if inlinePair {
-			argv = scrubInlineConnectArgs(os.Args)
-			extraEnv = inlineConnectEnv(*serverURL, *token, *deviceName)
-		}
-		return spawnBackground(context.Background(), ctx, *profile, argv, extraEnv)
+		return spawnBackground(context.Background(), ctx, *profile, os.Args)
 	}
 
-	// Self-check before pairing/loading credentials so a machine with
-	// no supported agent CLI fails before consuming a one-shot token.
+	// Self-check before loading credentials so a machine with no
+	// supported agent CLI fails fast.
 	agentCLIs, err := preflightAgentCLIs(context.Background(), ctx, *profile)
 	if err != nil {
 		return err
@@ -146,84 +109,20 @@ func runConnect(ctx *runContext, args []string) error {
 	if bootstrapped != nil {
 		prof = *bootstrapped
 	} else {
-		prof, err = resolveConnectProfile(*profile, *serverURL, *token, *deviceName)
+		prof, err = auth.Load(*profile)
 		if err != nil {
-			return err
+			return fmt.Errorf("connect: %w", err)
 		}
 	}
 
 	return mainLoop(ctx, *profile, prof, agentCLIs)
 }
 
-func loadInlineConnectEnv(serverURL, token, deviceName *string) {
-	if strings.TrimSpace(*serverURL) == "" {
-		*serverURL = os.Getenv(connectInlineURLEnv)
-	}
-	if strings.TrimSpace(*token) == "" {
-		*token = os.Getenv(connectInlineTokenEnv)
-	}
-	if strings.TrimSpace(*deviceName) == "" {
-		*deviceName = os.Getenv(connectInlineDeviceNameEnv)
-	}
-	_ = os.Unsetenv(connectInlineURLEnv)
-	_ = os.Unsetenv(connectInlineTokenEnv)
-	_ = os.Unsetenv(connectInlineDeviceNameEnv)
-}
-
-func inlineConnectEnv(serverURL, token, deviceName string) []string {
-	out := []string{
-		connectInlineURLEnv + "=" + serverURL,
-		connectInlineTokenEnv + "=" + token,
-	}
-	if strings.TrimSpace(deviceName) != "" {
-		out = append(out, connectInlineDeviceNameEnv+"="+deviceName)
-	}
-	return out
-}
-
-func scrubInlineConnectArgs(argv []string) []string {
-	out := make([]string, 0, len(argv))
-	for i := 0; i < len(argv); i++ {
-		arg := argv[i]
-		switch {
-		case arg == "--url" || arg == "--token" || arg == "--device-name":
-			i++
-			continue
-		case strings.HasPrefix(arg, "--url=") || strings.HasPrefix(arg, "--token=") || strings.HasPrefix(arg, "--device-name="):
-			continue
-		default:
-			out = append(out, arg)
-		}
-	}
-	return out
-}
-
-func resolveConnectProfile(profile, serverURL, token, deviceName string) (auth.Profile, error) {
-	if strings.TrimSpace(serverURL) == "" && strings.TrimSpace(token) == "" {
-		prof, err := auth.Load(profile)
-		if err != nil {
-			return auth.Profile{}, fmt.Errorf("connect: %w", err)
-		}
-		return prof, nil
-	}
-
-	pairCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-	prof, _, err := pairProfile(pairCtx, serverURL, token, deviceName)
-	if err != nil {
-		return auth.Profile{}, fmt.Errorf("connect: pair with server: %w", err)
-	}
-	if err := auth.Save(profile, prof); err != nil {
-		return auth.Profile{}, fmt.Errorf("connect: save auth profile: %w", err)
-	}
-	return prof, nil
-}
-
 // spawnBackground forks the daemon into the background. Parent
 // returns after printing the child PID; child re-enters runConnect
 // with BackgroundSentinelEnv set so the same mainLoop runs in either
 // mode.
-func spawnBackground(ctx context.Context, rc *runContext, profile string, argv []string, extraEnv []string) error {
+func spawnBackground(ctx context.Context, rc *runContext, profile string, argv []string) error {
 	logPath, err := paths.LogFile(profile)
 	if err != nil {
 		return fmt.Errorf("connect: %w", err)
@@ -263,9 +162,8 @@ func spawnBackground(ctx context.Context, rc *runContext, profile string, argv [
 		return err
 	}
 	pid, err := daemonize.Spawn(argv, daemonize.ReExecOptions{
-		LogPath:  logPath,
-		PIDPath:  pidPath,
-		ExtraEnv: extraEnv,
+		LogPath: logPath,
+		PIDPath: pidPath,
 	})
 	if err != nil {
 		return fmt.Errorf("connect: spawn background: %w", err)
@@ -384,7 +282,7 @@ func mainLoopRemote(parent context.Context, rc *runContext, profile string, prof
 				return nil
 			}
 			if errors.Is(err, transport.ErrPermanent) {
-				return fmt.Errorf("connect: permanent error (re-pair the daemon): %w", err)
+				return fmt.Errorf("connect: permanent error (reissue the daemon credential): %w", err)
 			}
 			return fmt.Errorf("connect: dial: %w", err)
 		}
@@ -409,7 +307,7 @@ func mainLoopRemote(parent context.Context, rc *runContext, profile string, prof
 		// Permanent error (e.g. runtime deleted) → exit instead of
 		// reconnecting.
 		if pumpErr != nil && errors.Is(pumpErr, transport.ErrPermanent) {
-			return fmt.Errorf("connect: runtime deleted (re-pair the daemon): %w", pumpErr)
+			return fmt.Errorf("connect: runtime deleted (reissue the daemon credential): %w", pumpErr)
 		}
 		// Small breather before redialing so a flapping server doesn't
 		// get a tight loop of upgrade requests.
diff --git a/apps/daemon/internal/cli/connect_bootstrap.go b/apps/daemon/internal/cli/connect_bootstrap.go
index 4092479dc..1e7848808 100644
--- a/apps/daemon/internal/cli/connect_bootstrap.go
+++ b/apps/daemon/internal/cli/connect_bootstrap.go
@@ -8,7 +8,7 @@ import (
 )
 
 // The launch file is the sole credential source for this connection. Reopening
-// it on process restart neither pairs again nor overwrites an auth profile.
+// it on process restart never reads or overwrites an auth profile.
 func bootstrapProfile(path string) (*auth.Profile, error) {
 	raw, err := runtimefs.ReadPrivatePath(path, runtimebootstrap.MaxBytes)
 	if err != nil {
diff --git a/apps/daemon/internal/cli/connect_bootstrap_test.go b/apps/daemon/internal/cli/connect_bootstrap_test.go
index c3fc68a4d..7f510d699 100644
--- a/apps/daemon/internal/cli/connect_bootstrap_test.go
+++ b/apps/daemon/internal/cli/connect_bootstrap_test.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"encoding/json"
 	"io"
 	"os"
 	"path/filepath"
@@ -10,12 +11,24 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/auth"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/paths"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimebootstrap"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimefs"
 )
 
 func TestBootstrapConnectionDoesNotReadOrOverwritePrivateProfile(t *testing.T) {
 	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
 	prior := auth.Profile{ServerURL: "https://other.example/api/v1", RuntimeID: "retained", RunnerCredential: "retained-secret"}
-	if err := auth.Save("default", prior); err != nil {
+	profileDir, err := paths.ProfileDir("default")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = runtimefs.EnsurePrivateDir(profileDir); err != nil {
+		t.Fatal(err)
+	}
+	priorRaw, err := json.Marshal(prior)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err = os.WriteFile(filepath.Join(profileDir, "auth.json"), priorRaw, 0600); err != nil {
 		t.Fatal(err)
 	}
 	input := runtimebootstrap.Connection{Version: runtimebootstrap.Version, CoreURL: "https://core.example/api/v1", DeviceID: "da912024-1543-4242-a2c1-5f4f7ebbc6c7", Credential: "bootstrap-secret"}
@@ -55,13 +68,12 @@ func TestConnectBootstrapRejectsOtherCredentialSourcesBeforeSideEffects(t *testi
 	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
 	ctx := &runContext{stdin: strings.NewReader(""), stdout: io.Discard, stderr: io.Discard}
 	for _, args := range [][]string{
-		{"--url", "https://core.example", "--token", "private-token"},
 		{"--remote", "wss://core.example/api/v1/agent-daemon/ws"},
 		{"--credential-file", "/credential.json"},
 		{"--environment-id", "foreign"}, {"unexpected"},
 	} {
 		err := runConnect(ctx, append([]string{"--bootstrap-file", "/not-present"}, args...))
-		if err == nil || !strings.Contains(err.Error(), "cannot be combined") || strings.Contains(err.Error(), "private-token") {
+		if err == nil || !strings.Contains(err.Error(), "cannot be combined") {
 			t.Fatal("mixed startup source accepted", err)
 		}
 	}
diff --git a/apps/daemon/internal/cli/connect_environment.go b/apps/daemon/internal/cli/connect_environment.go
index ec8ab6592..0b1c3b4b1 100644
--- a/apps/daemon/internal/cli/connect_environment.go
+++ b/apps/daemon/internal/cli/connect_environment.go
@@ -161,7 +161,7 @@ func runEnvironmentConnect(parent context.Context, rc *runContext, profile strin
 		return err
 	}
 	if background && !daemonize.IsBackgroundChild() {
-		return spawnBackground(parent, rc, profile, os.Args, nil)
+		return spawnBackground(parent, rc, profile, os.Args)
 	}
 	// Discovery consumes the immutable Runtime binding; it must follow enrollment.
 	discovery, err := preflightAgentCLIs(parent, rc, profile)
diff --git a/apps/daemon/internal/cli/connect_environment_test.go b/apps/daemon/internal/cli/connect_environment_test.go
index dc9bd3811..8d398b59b 100644
--- a/apps/daemon/internal/cli/connect_environment_test.go
+++ b/apps/daemon/internal/cli/connect_environment_test.go
@@ -243,17 +243,6 @@ func TestEnvironmentEnrollmentRejectsWrongIdentityAndWorkspace(t *testing.T) {
 	}
 }
 
-func TestEnvironmentConnectRejectsPairing(t *testing.T) {
-	t.Setenv(connectInlineURLEnv, "")
-	t.Setenv(connectInlineTokenEnv, "")
-	t.Setenv(connectInlineDeviceNameEnv, "")
-	rc := &runContext{stdout: &strings.Builder{}, stderr: &strings.Builder{}}
-	err := runConnect(rc, []string{"--remote", "wss://core/api/v1/agent-daemon/ws", "--environment-id", uuid.NewString(), "--credential-file", "/unused", "--token", "private-pairing-canary"})
-	if err == nil || strings.Contains(err.Error(), "private-pairing-canary") {
-		t.Fatal("pairing accepted or leaked")
-	}
-}
-
 func TestEnvironmentEnrollmentAcceptsPhysicalWorkspaceSelection(t *testing.T) {
 	environment := uuid.NewString()
 	want := environmentEnrollment{uuid.NewString(), uuid.NewString(), environment, "/srv/runtime/workspace"}
diff --git a/apps/daemon/internal/cli/connect_test.go b/apps/daemon/internal/cli/connect_test.go
deleted file mode 100644
index 8a5daeb03..000000000
--- a/apps/daemon/internal/cli/connect_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package cli
-
-import (
-	"os"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func TestScrubInlineConnectArgsRemovesTokenURLAndDeviceName(t *testing.T) {
-	got := scrubInlineConnectArgs([]string{
-		"oac-daemon", "connect",
-		"--url", "https://core.example.com",
-		"--token=rtk_secret",
-		"--device-name", "dev-1",
-		"-b",
-		"--profile", "sandbox",
-	})
-	want := []string{"oac-daemon", "connect", "-b", "--profile", "sandbox"}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("scrubInlineConnectArgs() = %#v, want %#v", got, want)
-	}
-}
-
-func TestLoadInlineConnectEnvFillsMissingValuesAndUnsets(t *testing.T) {
-	t.Setenv(connectInlineURLEnv, "https://core.example.com")
-	t.Setenv(connectInlineTokenEnv, "rtk_secret")
-	t.Setenv(connectInlineDeviceNameEnv, "dev-1")
-
-	serverURL, token, deviceName := "", "", ""
-	loadInlineConnectEnv(&serverURL, &token, &deviceName)
-
-	if serverURL != "https://core.example.com" || token != "rtk_secret" || deviceName != "dev-1" {
-		t.Fatalf("loaded values = (%q, %q, %q)", serverURL, token, deviceName)
-	}
-	if got := inlineConnectEnvValue(connectInlineTokenEnv); got != "" {
-		t.Fatalf("%s still set to %q", connectInlineTokenEnv, got)
-	}
-}
-
-func inlineConnectEnvValue(key string) string { return os.Getenv(key) }
-
-// Regression: pre-fork auth.json check used to run BEFORE env-to-flag
-// hydration, so sandboxes passing the token via env bailed with
-// "not paired". loadInlineConnectEnv now runs first.
-func TestLoadInlineConnectEnvHydratesParentProcessFlags(t *testing.T) {
-	t.Setenv(connectInlineURLEnv, "https://core.example.com")
-	t.Setenv(connectInlineTokenEnv, "rtk_secret")
-
-	serverURL, token, deviceName := "", "", ""
-
-	loadInlineConnectEnv(&serverURL, &token, &deviceName)
-
-	// Same predicate runConnect uses to decide whether to skip the
-	// pre-fork auth.json check.
-	inlinePair := strings.TrimSpace(serverURL) != "" || strings.TrimSpace(token) != ""
-	if !inlinePair {
-		t.Fatalf("inlinePair=false after env hydration; serverURL=%q token=%q", serverURL, token)
-	}
-}
diff --git a/apps/daemon/internal/cli/native_install_test.go b/apps/daemon/internal/cli/native_install_test.go
index 0deb2f5b2..2a8453d1f 100644
--- a/apps/daemon/internal/cli/native_install_test.go
+++ b/apps/daemon/internal/cli/native_install_test.go
@@ -257,10 +257,9 @@ func TestNativeInstallationConnectCannotBypassValidation(t *testing.T) {
 			for _, connection := range [][]string{
 				nil,
 				{"--remote", "ws://127.0.0.1:1/api/v1/agent-daemon/ws"},
-				{"--url", "http://127.0.0.1:1", "--token", "private-test-token"},
 			} {
 				err := runConnect(rc, connection)
-				if err == nil || !strings.Contains(err.Error(), "use oac-daemon start") || strings.Contains(err.Error(), "private-test-token") {
+				if err == nil || !strings.Contains(err.Error(), "use oac-daemon start") {
 					t.Fatal("connect bypassed native installation validation", err)
 				}
 			}
diff --git a/apps/daemon/internal/cli/pair.go b/apps/daemon/internal/cli/pair.go
deleted file mode 100644
index c5b65cee4..000000000
--- a/apps/daemon/internal/cli/pair.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package cli
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/auth"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimecrypto"
-)
-
-func pairProfile(ctx context.Context, serverURL, token, deviceName string) (auth.Profile, *pairResponse, error) {
-	base, err := normalizeServerURL(serverURL)
-	if err != nil {
-		return auth.Profile{}, nil, err
-	}
-
-	host, err := os.Hostname()
-	if err != nil {
-		// Stripped-down sandboxes can fail os.Hostname; "unknown"
-		// keeps the request well-formed (it's only a label).
-		host = "unknown"
-	}
-	if strings.TrimSpace(deviceName) == "" {
-		deviceName = host
-	}
-
-	// Generate a fresh X25519 keypair before pairing. Public half is
-	// persisted server-side under runtimes.config.runner_public_key so
-	// SealForRuntime can encrypt payloads to this daemon; private half
-	// stays in auth.Profile (0o600) and is required to OpenSeal on
-	// receive. Every successful pair binds a brand-new pair.
-	pubB64, privB64, err := runtimecrypto.GenerateRuntimeKeypair()
-	if err != nil {
-		return auth.Profile{}, nil, fmt.Errorf("generate runner keypair: %w", err)
-	}
-
-	pair, err := pairWithServer(ctx, base, pairRequest{
-		PairingToken:    token,
-		Hostname:        host,
-		Version:         Version,
-		RunnerPublicKey: pubB64,
-	})
-	if err != nil {
-		return auth.Profile{}, nil, err
-	}
-
-	prof := auth.Profile{
-		ServerURL:        base,
-		RuntimeID:        pair.Runtime.ID,
-		RunnerCredential: pair.RunnerCredential,
-		DeviceName:       deviceName,
-		Hostname:         host,
-		PairedAt:         time.Now().UTC(),
-		RunnerPublicKey:  pubB64,
-		RunnerPrivateKey: privB64,
-	}
-	return prof, pair, nil
-}
-
-// pairRequest mirrors the wire shape of server/internal/api/runtime.
-// Re-declared here so the daemon doesn't import a server-internal
-// package — keeps the wire schema as the only coupling.
-type pairRequest struct {
-	PairingToken    string `json:"pairing_token"`
-	Hostname        string `json:"hostname"`
-	Version         string `json:"version"`
-	RunnerPublicKey string `json:"runner_public_key,omitempty"`
-}
-
-type pairRuntime struct {
-	ID       string `json:"id"`
-	Type     string `json:"type"`
-	Name     string `json:"name"`
-	Liveness string `json:"liveness"`
-}
-
-type pairResponse struct {
-	Runtime          pairRuntime `json:"runtime"`
-	RunnerCredential string      `json:"runner_credential"`
-}
-
-// pairWithServer issues POST /api/v1/runtimes/pair. Returns the parsed
-// response on success; on non-2xx, returns an error containing the
-// server's error code + message when present.
-func pairWithServer(ctx context.Context, base string, req pairRequest) (*pairResponse, error) {
-	body, err := json.Marshal(req)
-	if err != nil {
-		return nil, fmt.Errorf("marshal pair request: %w", err)
-	}
-	httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, base+"/api/v1/runtimes/pair", bytes.NewReader(body))
-	if err != nil {
-		return nil, fmt.Errorf("build request: %w", err)
-	}
-	httpReq.Header.Set("Content-Type", "application/json")
-	httpReq.Header.Set("User-Agent", "oac-daemon/"+Version)
-	resp, err := http.DefaultClient.Do(httpReq)
-	if err != nil {
-		return nil, fmt.Errorf("post: %w", err)
-	}
-	defer resp.Body.Close()
-	respBody, _ := io.ReadAll(io.LimitReader(resp.Body, 1<<20))
-	if resp.StatusCode/100 != 2 {
-		return nil, fmt.Errorf("server returned %s: %s", resp.Status, strings.TrimSpace(string(respBody)))
-	}
-	var out pairResponse
-	if err := json.Unmarshal(respBody, &out); err != nil {
-		return nil, fmt.Errorf("decode pair response: %w", err)
-	}
-	if out.Runtime.ID == "" || out.RunnerCredential == "" {
-		return nil, fmt.Errorf("pair response missing runtime.id or runner_credential")
-	}
-	if out.Runtime.Type != "" && out.Runtime.Type != "agent_daemon" {
-		// Refuse rather than take over the wrong runtime row if the
-		// user pasted a non-agent_daemon pairing token by accident.
-		return nil, fmt.Errorf("pair response runtime.type=%q, expected agent_daemon (was the token issued under the Agent Daemon tab?)", out.Runtime.Type)
-	}
-	return &out, nil
-}
-
-// normalizeServerURL rejects junk inputs and strips a trailing slash so
-// concatenating "/api/v1/..." paths never produces "//".
-func normalizeServerURL(raw string) (string, error) {
-	u, err := url.Parse(strings.TrimSpace(raw))
-	if err != nil {
-		return "", fmt.Errorf("parse --url: %w", err)
-	}
-	if u.Scheme != "http" && u.Scheme != "https" {
-		return "", fmt.Errorf("--url must use http or https (got %q)", u.Scheme)
-	}
-	if u.Host == "" {
-		return "", fmt.Errorf("--url is missing a host")
-	}
-	u.Path = strings.TrimRight(u.Path, "/")
-	u.RawQuery = ""
-	u.Fragment = ""
-	return u.String(), nil
-}
diff --git a/apps/daemon/internal/cli/pair_test.go b/apps/daemon/internal/cli/pair_test.go
deleted file mode 100644
index 620b5ed67..000000000
--- a/apps/daemon/internal/cli/pair_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package cli
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimecrypto"
-)
-
-// Regression for the "runner_public_key required" pair failure: the
-// daemon used to never populate that field on the wire, so server-side
-// pairing rejected with HTTP 400. Asserts the request carries a
-// base64(stdEncoding) X25519 pubkey AND the resulting Profile retains
-// the matching privkey for later OpenSeal.
-func TestPairProfileGeneratesAndSendsRunnerPublicKey(t *testing.T) {
-	var sentPubKey string
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != "/api/v1/runtimes/pair" {
-			http.Error(w, "unexpected path", http.StatusNotFound)
-			return
-		}
-		var body pairRequest
-		if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
-			http.Error(w, "bad json", http.StatusBadRequest)
-			return
-		}
-		sentPubKey = body.RunnerPublicKey
-		_ = json.NewEncoder(w).Encode(pairResponse{
-			Runtime: pairRuntime{
-				ID:   "rt_test_123",
-				Type: "agent_daemon",
-				Name: "test-device",
-			},
-			RunnerCredential: "rc_test_secret",
-		})
-	}))
-	defer srv.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-	defer cancel()
-	prof, _, err := pairProfile(ctx, srv.URL, "pairing-token", "test-device")
-	if err != nil {
-		t.Fatalf("pairProfile: %v", err)
-	}
-
-	// Server must have received a non-empty key.
-	if sentPubKey == "" {
-		t.Fatal("server did not receive runner_public_key on the wire")
-	}
-	// And it must be a valid X25519 pubkey.
-	if _, err := runtimecrypto.DecodeKey(sentPubKey); err != nil {
-		t.Fatalf("server received invalid pubkey %q: %v", sentPubKey, err)
-	}
-
-	// Profile must carry both halves.
-	if prof.RunnerPublicKey != sentPubKey {
-		t.Errorf("Profile.RunnerPublicKey = %q, want sent %q", prof.RunnerPublicKey, sentPubKey)
-	}
-	if prof.RunnerPrivateKey == "" {
-		t.Fatal("Profile.RunnerPrivateKey is empty")
-	}
-	if _, err := runtimecrypto.DecodeKey(prof.RunnerPrivateKey); err != nil {
-		t.Errorf("Profile.RunnerPrivateKey is not a valid X25519 key: %v", err)
-	}
-
-	// Sanity-check the rest of the Profile so a future refactor that
-	// drops one of these fields fails loudly.
-	if prof.RuntimeID != "rt_test_123" {
-		t.Errorf("RuntimeID = %q, want rt_test_123", prof.RuntimeID)
-	}
-	if prof.RunnerCredential != "rc_test_secret" {
-		t.Errorf("RunnerCredential = %q, want rc_test_secret", prof.RunnerCredential)
-	}
-}
-
-// Pair-error pass-through must still surface a 400 when the server
-// fails the pair for any reason (reused token, device limit, etc.).
-func TestPairProfileSurfacesServerPairFailure(t *testing.T) {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusBadRequest)
-		_, _ = w.Write([]byte(`{"error":"pair_failed","message":"token reused"}`))
-	}))
-	defer srv.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-	defer cancel()
-	_, _, err := pairProfile(ctx, srv.URL, "pairing-token", "test-device")
-	if err == nil {
-		t.Fatal("pairProfile succeeded against a 400 server response, want error")
-	}
-}
diff --git a/apps/daemon/internal/cli/root.go b/apps/daemon/internal/cli/root.go
index 18a94b421..cd77a7d2b 100644
--- a/apps/daemon/internal/cli/root.go
+++ b/apps/daemon/internal/cli/root.go
@@ -40,8 +40,8 @@ var commands = []command{
 	{name: "resume", summary: "Wake one planned hosted suspension", run: runResume},
 	{name: "runtime-mcp-exec", summary: "Execute an installed MCP server", run: runRuntimeMCP},
 	{name: "placement", summary: "Enroll or retire an explicitly managed local execution placement", run: runPlacement},
-	{name: "connect", summary: "Pair, open the reverse WebSocket, and start serving prompts", run: runConnect},
-	{name: "status", summary: "Print the paired profile and daemon state", run: runStatus},
+	{name: "connect", summary: "Open the reverse WebSocket and start serving prompts", run: runConnect},
+	{name: "status", summary: "Print the credential profile and daemon state", run: runStatus},
 	{name: "stop", summary: "Stop a background `connect -b` daemon", run: runStop},
 	{name: "logs", summary: "Tail the background daemon's log file", run: runLogs},
 	{name: "logout", summary: "Forget the credential for a profile", run: runLogout},
diff --git a/apps/daemon/internal/cli/status.go b/apps/daemon/internal/cli/status.go
index d02019d45..beb9e444d 100644
--- a/apps/daemon/internal/cli/status.go
+++ b/apps/daemon/internal/cli/status.go
@@ -32,7 +32,7 @@ func runStatus(ctx *runContext, args []string) error {
 	prof, err := auth.Load(*profile)
 	switch {
 	case errors.Is(err, auth.ErrNotPaired):
-		fmt.Fprintln(ctx.stdout, "paired       : no saved pairing profile; check Host connection in Core for a self-hosted Runtime")
+		fmt.Fprintln(ctx.stdout, "paired       : no saved credential profile; check Host connection in Core for a self-hosted Runtime")
 	case err != nil:
 		fmt.Fprintf(ctx.stdout, "paired       : ERROR — %v\n", err)
 	default:
@@ -42,12 +42,6 @@ func runStatus(ctx *runContext, args []string) error {
 		if prof.DeviceName != "" {
 			fmt.Fprintf(ctx.stdout, "device_name  : %s\n", prof.DeviceName)
 		}
-		if prof.Hostname != "" {
-			fmt.Fprintf(ctx.stdout, "hostname     : %s\n", prof.Hostname)
-		}
-		if !prof.PairedAt.IsZero() {
-			fmt.Fprintf(ctx.stdout, "paired_at    : %s\n", prof.PairedAt.Format("2006-01-02 15:04:05 MST"))
-		}
 	}
 
 	// connect.pid existence is the cheap signal; the full liveness
diff --git a/apps/daemon/internal/daemonize/fork.go b/apps/daemon/internal/daemonize/fork.go
index 8803c7ee1..120e7dd75 100644
--- a/apps/daemon/internal/daemonize/fork.go
+++ b/apps/daemon/internal/daemonize/fork.go
@@ -42,10 +42,6 @@ type ReExecOptions struct {
 	// child identity here before returning; existing files are replaced
 	// atomically.
 	PIDPath string
-
-	// ExtraEnv is appended to the child's environment in addition to
-	// parent environ + BackgroundSentinelEnv.
-	ExtraEnv []string
 }
 
 // Spawn re-execs the current binary in the background. argv is the
@@ -89,7 +85,6 @@ func Spawn(argv []string, opts ReExecOptions) (int, error) {
 
 	env := append([]string(nil), os.Environ()...)
 	env = append(env, BackgroundSentinelEnv+"=1")
-	env = append(env, opts.ExtraEnv...)
 
 	cmd := exec.Command(exe, argv[1:]...)
 	cmd.Env = env
diff --git a/apps/daemon/internal/daemonize/fork_test.go b/apps/daemon/internal/daemonize/fork_test.go
index 7ad546605..a8f4fc5a6 100644
--- a/apps/daemon/internal/daemonize/fork_test.go
+++ b/apps/daemon/internal/daemonize/fork_test.go
@@ -12,6 +12,7 @@ func TestSpawnReExecsWithSentinelAndPIDFile(t *testing.T) {
 	dir := privateTempDir(t)
 	logPath := filepath.Join(dir, "child.log")
 	pidPath := filepath.Join(dir, "child.pid")
+	t.Setenv(spawnTestChildEnv, "1")
 
 	// argv[0] is ignored (Spawn uses os.Executable()); argv[1:]
 	// becomes child args. Placeholder subcommand so flag parsing
@@ -19,9 +20,8 @@ func TestSpawnReExecsWithSentinelAndPIDFile(t *testing.T) {
 	pid, err := Spawn(
 		[]string{"oac-daemon", "child-mode"},
 		ReExecOptions{
-			LogPath:  logPath,
-			PIDPath:  pidPath,
-			ExtraEnv: []string{spawnTestChildEnv + "=1"},
+			LogPath: logPath,
+			PIDPath: pidPath,
 		},
 	)
 	if err != nil {
diff --git a/apps/daemon/internal/daemonize/pidfile_test.go b/apps/daemon/internal/daemonize/pidfile_test.go
index f390a7837..4aec5a769 100644
--- a/apps/daemon/internal/daemonize/pidfile_test.go
+++ b/apps/daemon/internal/daemonize/pidfile_test.go
@@ -66,7 +66,8 @@ func TestProcessRecordRejectsOldAndMalformed(t *testing.T) {
 func TestStopTimeoutRetainsProcessRecord(t *testing.T) {
 	dir := privateTempDir(t)
 	path := filepath.Join(dir, "connect.pid")
-	pid, err := Spawn([]string{"daemon", "child"}, ReExecOptions{LogPath: filepath.Join(dir, "log"), PIDPath: path, ExtraEnv: []string{spawnTestChildEnv + "=ignore"}})
+	t.Setenv(spawnTestChildEnv, "ignore")
+	pid, err := Spawn([]string{"daemon", "child"}, ReExecOptions{LogPath: filepath.Join(dir, "log"), PIDPath: path})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/paths/paths.go b/apps/daemon/internal/paths/paths.go
index fb4bcec94..6c835ae3d 100644
--- a/apps/daemon/internal/paths/paths.go
+++ b/apps/daemon/internal/paths/paths.go
@@ -1,6 +1,6 @@
 // Package paths resolves on-disk locations for oac-daemon state under
 // ~/.oac/daemon/<profile>/ — one subdir per profile so "test"
-// and "prod" servers can be paired in parallel without colliding.
+// and "prod" servers can be connected in parallel without colliding.
 //
 // Files are 0o600, parent dir 0o700. These functions only resolve
 // paths — callers do the I/O.
@@ -8,7 +8,6 @@ package paths
 
 import (
 	"fmt"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimefs"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -51,8 +50,7 @@ func Root() (string, error) {
 	return filepath.Join(home, ".oac"), nil
 }
 
-// ProfileDir returns ~/.oac/daemon/<profile>. NOT created;
-// use EnsureProfileDir.
+// ProfileDir returns ~/.oac/daemon/<profile>. It is not created here.
 func ProfileDir(profile string) (string, error) {
 	if err := ValidateProfile(profile); err != nil {
 		return "", err
@@ -64,19 +62,6 @@ func ProfileDir(profile string) (string, error) {
 	return filepath.Join(root, "daemon", profile), nil
 }
 
-// EnsureProfileDir mkdirs the profile dir at mode 0o700 and returns
-// its path. Idempotent.
-func EnsureProfileDir(profile string) (string, error) {
-	dir, err := ProfileDir(profile)
-	if err != nil {
-		return "", err
-	}
-	if err := runtimefs.EnsurePrivateDir(dir); err != nil {
-		return "", fmt.Errorf("create profile dir %s: %w", dir, err)
-	}
-	return dir, nil
-}
-
 // AuthFile returns the absolute path to auth.json for a profile.
 func AuthFile(profile string) (string, error) {
 	dir, err := ProfileDir(profile)
diff --git a/apps/daemon/internal/paths/paths_test.go b/apps/daemon/internal/paths/paths_test.go
index fc151033e..7f4d8fa9e 100644
--- a/apps/daemon/internal/paths/paths_test.go
+++ b/apps/daemon/internal/paths/paths_test.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -93,33 +92,6 @@ func TestProfileDirAndFiles(t *testing.T) {
 	}
 }
 
-func TestEnsureProfileDirCreates0700(t *testing.T) {
-	_ = withTempHome(t)
-	dir, err := paths.EnsureProfileDir("default")
-	if err != nil {
-		t.Fatalf("EnsureProfileDir: %v", err)
-	}
-	info, err := os.Stat(dir)
-	if err != nil {
-		t.Fatalf("stat after EnsureProfileDir: %v", err)
-	}
-	if !info.IsDir() {
-		t.Fatalf("EnsureProfileDir returned %q which is not a directory", dir)
-	}
-	if mode := info.Mode().Perm(); runtime.GOOS != "windows" && mode != 0o700 {
-		t.Errorf("EnsureProfileDir mode = %o, want 0700", mode)
-	}
-
-	// Idempotent (mkdir -p semantics).
-	dir2, err := paths.EnsureProfileDir("default")
-	if err != nil {
-		t.Fatalf("EnsureProfileDir (second call): %v", err)
-	}
-	if dir2 != dir {
-		t.Fatalf("EnsureProfileDir second call returned %q, want %q", dir2, dir)
-	}
-}
-
 func TestInvalidProfileShortCircuits(t *testing.T) {
 	_ = withTempHome(t)
 	if _, err := paths.ProfileDir("bad/profile"); err == nil {
@@ -128,9 +100,6 @@ func TestInvalidProfileShortCircuits(t *testing.T) {
 	if _, err := paths.AuthFile("bad/profile"); err == nil {
 		t.Fatal("AuthFile accepted invalid profile name")
 	}
-	if _, err := paths.EnsureProfileDir("bad/profile"); err == nil {
-		t.Fatal("EnsureProfileDir accepted invalid profile name")
-	}
 }
 
 func TestRootRejectsRelativeOverride(t *testing.T) {
diff --git a/apps/daemon/internal/transport/ws.go b/apps/daemon/internal/transport/ws.go
index feeb2a7a5..e39411074 100644
--- a/apps/daemon/internal/transport/ws.go
+++ b/apps/daemon/internal/transport/ws.go
@@ -24,7 +24,7 @@ type DialOptions struct {
 	// WSURL is the absolute ws://... or wss://... URL.
 	WSURL string
 
-	// DeviceID is the runtime row id stamped at pair time. Sent as
+	// DeviceID is the runtime row id from the daemon credential. Sent as
 	// device_id query param; the gateway uses it as the session key.
 	DeviceID string
 
diff --git a/docs/runtime-bootstrap.md b/docs/runtime-bootstrap.md
index f9a3ced84..7397e07fa 100644
--- a/docs/runtime-bootstrap.md
+++ b/docs/runtime-bootstrap.md
@@ -21,7 +21,7 @@ oac-daemon connect --bootstrap-file /home/runtime/runtime-bootstrap.json
 
 The decoder rejects unknown, duplicate, missing and case-aliased fields, other versions and documents larger than `runtimebootstrap.MaxBytes` (16 KiB). Errors never include submitted values. A missing or malformed file fails before the daemon connects.
 
-The file is the only authentication input for this launch: the daemon refuses to combine it with pairing or self-hosted enrollment options, and reads the credential into memory without saving it to a stored profile. Credentials never go in command arguments, environment variables or receipts. The provider keeps the file for process restarts and removes it only during explicit cleanup of the resources it owns.
+The file is the only authentication input for this launch: the daemon refuses to combine it with self-hosted enrollment options, and reads the credential into memory without saving it to a stored profile. Credentials never go in command arguments, environment variables or receipts. The provider keeps the file for process restarts and removes it only during explicit cleanup of the resources it owns.
 
 ## Responsibilities and readiness
 
diff --git a/docs/zh/runtime-bootstrap.md b/docs/zh/runtime-bootstrap.md
index 1edb83450..d3338fa61 100644
--- a/docs/zh/runtime-bootstrap.md
+++ b/docs/zh/runtime-bootstrap.md
@@ -1,7 +1,7 @@
 ---
 title: "Runtime 引导"
 source: docs/runtime-bootstrap.md
-source_hash: ba7de54c4533b7aa4dc66e3e04aa3687d964faef7c2158740b930e4758567fc1
+source_hash: f7e9275feee79ac1fb1299227e148b85c26efc8b8af5ca0e8f498126c563d182
 ---
 
 Sandbox Provider 通过交付一个引导文件来启动托管 Runtime。本文负责 Provider 到 Runtime 的启动输入。类型与验证器位于 [`internal/runtimebootstrap`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/runtimebootstrap/bootstrap.go)；Go provider 使用 [`runtime_bootstrap.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/sandbox/runtime_bootstrap.go) 中的 `sandbox.Bootstrap.RuntimeConnection()` 构造输入，SDK helper 原样转发序列化对象。provider 不读取或写入 Runtime 的私有认证存储。
@@ -23,7 +23,7 @@ oac-daemon connect --bootstrap-file /home/runtime/runtime-bootstrap.json
 
 解码器拒绝未知、重复、缺失和大小写别名字段，拒绝其他版本及超过 `runtimebootstrap.MaxBytes`（16 KiB）的文档。错误不包含提交的值。文件缺失或格式错误时，daemon 在连接前失败。
 
-该文件是此次启动唯一的认证输入：daemon 拒绝将其与配对或自托管注册选项组合使用，并将凭据读入内存而不保存到存储的 profile。凭据不进入命令参数、环境变量或回执。provider 为进程重启保留该文件，仅在明确清理自己拥有的资源时删除。
+该文件是此次启动唯一的认证输入：daemon 拒绝将其与自托管注册选项组合使用，并将凭据读入内存而不保存到存储的 profile。凭据不进入命令参数、环境变量或回执。provider 为进程重启保留该文件，仅在明确清理自己拥有的资源时删除。
 
 ## 职责与就绪状态 {#responsibilities-and-readiness}
 
diff --git a/go.mod b/go.mod
index 9146030d1..e851cd189 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,6 @@ require (
 	go.opentelemetry.io/otel/sdk v1.44.0
 	go.opentelemetry.io/otel/sdk/metric v1.44.0
 	go.opentelemetry.io/proto/otlp v1.10.0
-	golang.org/x/crypto v0.55.0
 	golang.org/x/net v0.58.0
 	golang.org/x/sync v0.22.0
 	golang.org/x/sys v0.47.0
diff --git a/go.sum b/go.sum
index 07c9f1f70..3ed07c81a 100644
--- a/go.sum
+++ b/go.sum
@@ -127,8 +127,6 @@ go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpu
 go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
-golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis=
 golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To=
 golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU=
 golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
diff --git a/internal/runtimecrypto/cmd/emit-fixture/main.go b/internal/runtimecrypto/cmd/emit-fixture/main.go
deleted file mode 100644
index 9f9572fd3..000000000
--- a/internal/runtimecrypto/cmd/emit-fixture/main.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// One-shot generator for the cross-language wire-format fixture. Run
-// by hand:
-//
-//	go run ./internal/runtimecrypto/cmd/emit-fixture > internal/runtimecrypto/testdata/wire_v1.json
-//
-// The output is COMMITTED and read-only at test time. `//go:build
-// ignore` keeps this invisible to `go build ./...` / `go test ./...`,
-// and the stderr WARNING forces the operator to notice they are about
-// to mutate a wire-locked artefact. A *_test.go that wrote the file
-// would silently green-light protocol drift on every CI run.
-
-//go:build ignore
-
-package main
-
-import (
-	"crypto/rand"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"os"
-
-	runtimecrypto "github.com/MiniMax-AI/OpenAgentCore/internal/runtimecrypto"
-	"golang.org/x/crypto/nacl/box"
-)
-
-type fixture struct {
-	Description      string `json:"description"`
-	WireFormat       string `json:"wire_format"`
-	RecipientPubB64  string `json:"recipient_public_key_b64"`
-	RecipientPrivB64 string `json:"recipient_private_key_b64"`
-	CipherB64        string `json:"cipher_b64"`
-	PlaintextUTF8    string `json:"plaintext_utf8"`
-}
-
-func main() {
-	fmt.Fprintln(os.Stderr,
-		"WARNING: this regenerates internal/runtimecrypto/testdata/wire_v1.json.")
-	fmt.Fprintln(os.Stderr,
-		"  Only commit the new bytes if you intentionally bumped the wire protocol version.")
-	fmt.Fprintln(os.Stderr,
-		"  Re-generating without a version bump silently breaks the protocol-version lock.")
-
-	pub, priv, err := box.GenerateKey(rand.Reader)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "keygen: %v\n", err)
-		os.Exit(1)
-	}
-	pubB64 := base64.StdEncoding.EncodeToString(pub[:])
-	privB64 := base64.StdEncoding.EncodeToString(priv[:])
-
-	plaintext := `{"api_key":"sk-wire-fixture","provider":"anthropic"}`
-	cipherB64, err := runtimecrypto.SealForRuntime([]byte(plaintext), pubB64)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "seal: %v\n", err)
-		os.Exit(1)
-	}
-
-	out := fixture{
-		Description: "Wire fixture for the Runtime credential envelope. " +
-			"Recipient keypair is committed for test reproducibility. DO NOT use these " +
-			"keys in any other context. Wire format: NaCl SealAnonymous (X25519 + " +
-			"XSalsa20-Poly1305), nonce = BLAKE2b-24(ephPub || recipientPub).",
-		WireFormat:       "nacl_sealed_box_v1",
-		RecipientPubB64:  pubB64,
-		RecipientPrivB64: privB64,
-		CipherB64:        cipherB64,
-		PlaintextUTF8:    plaintext,
-	}
-	enc := json.NewEncoder(os.Stdout)
-	enc.SetIndent("", "  ")
-	if err := enc.Encode(out); err != nil {
-		fmt.Fprintf(os.Stderr, "encode: %v\n", err)
-		os.Exit(1)
-	}
-}
diff --git a/internal/runtimecrypto/runtime_seal.go b/internal/runtimecrypto/runtime_seal.go
deleted file mode 100644
index f8d6c3894..000000000
--- a/internal/runtimecrypto/runtime_seal.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Package runtimecrypto implements envelope-encryption for shipping
-// sensitive payloads (model API keys, per-run secrets) from the
-// OpenAgentCore server to a paired Agent Daemon without putting plaintext
-// on the wire.
-//
-// Algorithm: NaCl sealed box (X25519 + XSalsa20-Poly1305) via
-// box.SealAnonymous. Nonce = BLAKE2b-24(ephPub || recipientPub).
-// Wire format: base64(stdEncoding) so it travels safely inside JSON.
-// The committed static fixture (testdata/wire_v1.json) keeps the wire
-// format locked across refactors.
-//
-// Threat model:
-//   - Server logs / debug dumps / DB middlewares see ciphertext only.
-//   - Daemon-machine compromise is OUT of scope (private key lives
-//     there and the host is trusted by definition).
-//   - Server compromise is OUT of scope (a malicious server could
-//     skip encryption entirely).
-package runtimecrypto
-
-import (
-	"crypto/rand"
-	"encoding/base64"
-	"errors"
-	"fmt"
-
-	"golang.org/x/crypto/nacl/box"
-)
-
-// PublicKeySize / PrivateKeySize match nacl/box (32 bytes Curve25519).
-const (
-	PublicKeySize  = 32
-	PrivateKeySize = 32
-)
-
-// ErrInvalidPublicKey wraps any reason the recipient public key is
-// unusable (wrong length, bad base64). API layer returns 400.
-var ErrInvalidPublicKey = errors.New("runtime crypto: invalid public key")
-
-// ErrDecryptFailed is returned when ciphertext fails authentication
-// (tampered, wrong recipient key, malformed envelope). Generic by
-// design — exposing the specific reason helps attackers.
-var ErrDecryptFailed = errors.New("runtime crypto: decrypt failed")
-
-// SealForRuntime encrypts plaintext for the runtime identified by its
-// base64-encoded X25519 public key (as stored in
-// runtimes.config.runner_public_key).
-//
-// Output is base64(stdEncoding) of an anonymous sealed box: each call
-// generates a fresh ephemeral keypair and embeds the public half in
-// the envelope. Receiver derives the shared key from that and its own
-// private key.
-func SealForRuntime(plaintext []byte, runnerPublicKeyB64 string) (string, error) {
-	pub, err := decodePublicKey(runnerPublicKeyB64)
-	if err != nil {
-		return "", err
-	}
-	sealed, err := box.SealAnonymous(nil, plaintext, &pub, rand.Reader)
-	if err != nil {
-		return "", fmt.Errorf("runtime crypto: seal: %w", err)
-	}
-	return base64.StdEncoding.EncodeToString(sealed), nil
-}
-
-// OpenSeal decrypts a SealForRuntime output using the recipient's
-// keypair. Kept here for round-trip tests and to lock the wire format
-// down in one place.
-func OpenSeal(cipherB64 string, publicKey, privateKey [32]byte) ([]byte, error) {
-	sealed, err := base64.StdEncoding.DecodeString(cipherB64)
-	if err != nil {
-		return nil, ErrDecryptFailed
-	}
-	out, ok := box.OpenAnonymous(nil, sealed, &publicKey, &privateKey)
-	if !ok {
-		return nil, ErrDecryptFailed
-	}
-	return out, nil
-}
-
-// GenerateRuntimeKeypair returns a fresh (publicKey, privateKey) pair
-// as base64. Caller MUST persist the private key with mode 0600 and
-// never log it.
-func GenerateRuntimeKeypair() (publicKeyB64, privateKeyB64 string, err error) {
-	pub, priv, err := box.GenerateKey(rand.Reader)
-	if err != nil {
-		return "", "", fmt.Errorf("runtime crypto: keygen: %w", err)
-	}
-	return base64.StdEncoding.EncodeToString(pub[:]),
-		base64.StdEncoding.EncodeToString(priv[:]),
-		nil
-}
-
-// DecodeKey turns a base64-encoded 32-byte key into a [32]byte so
-// daemon code and the API layer share one parser instead of inlining
-// base64 + length checks at every caller.
-func DecodeKey(b64 string) ([32]byte, error) {
-	var out [32]byte
-	raw, err := base64.StdEncoding.DecodeString(b64)
-	if err != nil {
-		return out, ErrInvalidPublicKey
-	}
-	if len(raw) != PublicKeySize {
-		return out, ErrInvalidPublicKey
-	}
-	copy(out[:], raw)
-	return out, nil
-}
-
-func decodePublicKey(b64 string) ([32]byte, error) {
-	return DecodeKey(b64)
-}
diff --git a/internal/runtimecrypto/runtime_seal_test.go b/internal/runtimecrypto/runtime_seal_test.go
deleted file mode 100644
index 5852a5a4d..000000000
--- a/internal/runtimecrypto/runtime_seal_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package runtimecrypto
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/base64"
-	"testing"
-)
-
-func TestSealOpenRoundTrip(t *testing.T) {
-	pub, priv, err := GenerateRuntimeKeypair()
-	if err != nil {
-		t.Fatalf("keygen: %v", err)
-	}
-	pubArr, err := DecodeKey(pub)
-	if err != nil {
-		t.Fatalf("decode pub: %v", err)
-	}
-	privArr, err := DecodeKey(priv)
-	if err != nil {
-		t.Fatalf("decode priv: %v", err)
-	}
-
-	plain := []byte(`{"api_key":"sk-secret","provider":"anthropic"}`)
-	cipher, err := SealForRuntime(plain, pub)
-	if err != nil {
-		t.Fatalf("seal: %v", err)
-	}
-	if cipher == "" {
-		t.Fatal("empty cipher")
-	}
-	if bytes.Contains([]byte(cipher), []byte("sk-secret")) {
-		t.Fatal("ciphertext leaks plaintext")
-	}
-	got, err := OpenSeal(cipher, pubArr, privArr)
-	if err != nil {
-		t.Fatalf("open: %v", err)
-	}
-	if !bytes.Equal(got, plain) {
-		t.Errorf("decrypt mismatch:\n  got  %q\n  want %q", got, plain)
-	}
-}
-
-// Each call uses a fresh ephemeral keypair so the same plaintext
-// yields different ciphertexts.
-func TestSealNonDeterministic(t *testing.T) {
-	pub, _, err := GenerateRuntimeKeypair()
-	if err != nil {
-		t.Fatalf("keygen: %v", err)
-	}
-	c1, _ := SealForRuntime([]byte("hello"), pub)
-	c2, _ := SealForRuntime([]byte("hello"), pub)
-	if c1 == c2 {
-		t.Errorf("two seals of same plaintext should differ; got identical")
-	}
-}
-
-// Tampered ciphertext must fail open (Poly1305 authenticator).
-func TestOpenTamperedFails(t *testing.T) {
-	pub, priv, _ := GenerateRuntimeKeypair()
-	pubArr, _ := DecodeKey(pub)
-	privArr, _ := DecodeKey(priv)
-	cipher, _ := SealForRuntime([]byte("payload"), pub)
-
-	raw, _ := base64.StdEncoding.DecodeString(cipher)
-	raw[len(raw)/2] ^= 0xFF
-	tampered := base64.StdEncoding.EncodeToString(raw)
-	if _, err := OpenSeal(tampered, pubArr, privArr); err != ErrDecryptFailed {
-		t.Errorf("tampered ciphertext: got err=%v, want ErrDecryptFailed", err)
-	}
-}
-
-// Wrong recipient private key must fail open.
-func TestOpenWrongKeyFails(t *testing.T) {
-	pub, _, _ := GenerateRuntimeKeypair()
-	cipher, _ := SealForRuntime([]byte("payload"), pub)
-
-	otherPub, otherPriv, _ := GenerateRuntimeKeypair()
-	otherPubArr, _ := DecodeKey(otherPub)
-	otherPrivArr, _ := DecodeKey(otherPriv)
-	if _, err := OpenSeal(cipher, otherPubArr, otherPrivArr); err != ErrDecryptFailed {
-		t.Errorf("wrong key: got err=%v, want ErrDecryptFailed", err)
-	}
-}
-
-// Bad public key (wrong length / non-base64) must error, not panic.
-func TestSealRejectsBadPublicKey(t *testing.T) {
-	cases := []string{
-		"",
-		"not-base64-!!!",
-		base64.StdEncoding.EncodeToString([]byte("short")),
-	}
-	for _, k := range cases {
-		if _, err := SealForRuntime([]byte("x"), k); err != ErrInvalidPublicKey {
-			t.Errorf("SealForRuntime(%q): got err=%v, want ErrInvalidPublicKey", k, err)
-		}
-	}
-}
-
-func TestKeypairUnique(t *testing.T) {
-	seen := map[string]bool{}
-	for i := 0; i < 16; i++ {
-		pub, priv, _ := GenerateRuntimeKeypair()
-		if seen[pub] {
-			t.Fatalf("duplicate pub at i=%d", i)
-		}
-		if seen[priv] {
-			t.Fatalf("duplicate priv at i=%d", i)
-		}
-		seen[pub] = true
-		seen[priv] = true
-	}
-}
-
-// Guard against a zero/empty-ciphertext regression if crypto/rand is
-// not wired into the build.
-func TestSealNotEmptyEvenForEmptyPlaintext(t *testing.T) {
-	pub, _, _ := GenerateRuntimeKeypair()
-	cipher, err := SealForRuntime([]byte{}, pub)
-	if err != nil {
-		t.Fatalf("seal empty: %v", err)
-	}
-	// nacl sealed-box overhead = 32 (ephemeral pub) + 16 (poly1305) = 48
-	raw, _ := base64.StdEncoding.DecodeString(cipher)
-	if len(raw) < 48 {
-		t.Errorf("ciphertext too short: %d bytes, want >= 48", len(raw))
-	}
-}
-
-func TestRandomReaderAvailable(t *testing.T) {
-	var b [16]byte
-	if _, err := rand.Read(b[:]); err != nil {
-		t.Fatalf("crypto/rand unavailable: %v", err)
-	}
-}
diff --git a/internal/runtimecrypto/runtime_seal_wire_test.go b/internal/runtimecrypto/runtime_seal_wire_test.go
deleted file mode 100644
index 1f439cb11..000000000
--- a/internal/runtimecrypto/runtime_seal_wire_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package runtimecrypto
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-// wireFixture matches the JSON shape emitted by cmd/emit-fixture and
-// committed to testdata/wire_v1.json. Explicit fields so a future
-// schema bump (wire_format != nacl_sealed_box_v1) breaks decoding
-// instead of silently passing.
-type wireFixture struct {
-	Description      string `json:"description"`
-	WireFormat       string `json:"wire_format"`
-	RecipientPubB64  string `json:"recipient_public_key_b64"`
-	RecipientPrivB64 string `json:"recipient_private_key_b64"`
-	CipherB64        string `json:"cipher_b64"`
-	PlaintextUTF8    string `json:"plaintext_utf8"`
-}
-
-// TestOpenStaticWireFixture decrypts the committed wire vector via
-// the production OpenSeal path. Canonical regression guard for
-// cross-language protocol drift — if either side's algorithm
-// (Go nacl/box, Node tweetnacl + @noble/hashes) changes, this fails
-// on the first commit after the drift.
-func TestOpenStaticWireFixture(t *testing.T) {
-	path := filepath.Join("testdata", "wire_v1.json")
-	raw, err := os.ReadFile(path)
-	if err != nil {
-		t.Fatalf("read fixture: %v", err)
-	}
-	var f wireFixture
-	if err := json.Unmarshal(raw, &f); err != nil {
-		t.Fatalf("parse fixture: %v", err)
-	}
-	if f.WireFormat != "nacl_sealed_box_v1" {
-		t.Fatalf("wire_format=%q, want nacl_sealed_box_v1 (test is locked to v1)", f.WireFormat)
-	}
-	pub, err := DecodeKey(f.RecipientPubB64)
-	if err != nil {
-		t.Fatalf("decode pub: %v", err)
-	}
-	priv, err := DecodeKey(f.RecipientPrivB64)
-	if err != nil {
-		t.Fatalf("decode priv: %v", err)
-	}
-	got, err := OpenSeal(f.CipherB64, pub, priv)
-	if err != nil {
-		t.Fatalf("open static fixture: %v", err)
-	}
-	if string(got) != f.PlaintextUTF8 {
-		t.Errorf("plaintext mismatch:\n  got  %q\n  want %q", got, f.PlaintextUTF8)
-	}
-}
diff --git a/internal/runtimecrypto/testdata/wire_v1.json b/internal/runtimecrypto/testdata/wire_v1.json
deleted file mode 100644
index ff34f4bc0..000000000
--- a/internal/runtimecrypto/testdata/wire_v1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "description": "Wire fixture for the Runtime credential envelope. Recipient keypair is committed for test reproducibility. DO NOT use these keys in any other context. Wire format: NaCl SealAnonymous (X25519 + XSalsa20-Poly1305), nonce = BLAKE2b-24(ephPub || recipientPub).",
-  "wire_format": "nacl_sealed_box_v1",
-  "recipient_public_key_b64": "kxmWMYeGYw4zwKGkoXBQUh3Ac6CCD0jUechNvXEwRSk=",
-  "recipient_private_key_b64": "6b/6ZGaX77mlq1Q/ZUZd/T67wNc9orIpSslluBMYXz8=",
-  "cipher_b64": "+xJ0WbN+YwxXhccjZDMJfkRNdICegZpBkkDg2lS1gEpqVXh3ABfYWtz0vxR9zOf9JpeD0z6yprJyDdWkhn8lHbf3Mp+0Z1sMAp9BHoHO61FCGB3DdnZiHp7dTI4NAKM62Zs+LQ==",
-  "plaintext_utf8": "{\"api_key\":\"sk-wire-fixture\",\"provider\":\"anthropic\"}"
-}
diff --git a/packages/claude-sdk-adapter/README.md b/packages/claude-sdk-adapter/README.md
index 4cba3ec4c..e124b3dad 100644
--- a/packages/claude-sdk-adapter/README.md
+++ b/packages/claude-sdk-adapter/README.md
@@ -64,9 +64,9 @@ Workspace deferred-function discovery uses native ToolSearch alongside the norma
 
 ### Registration and state
 
-For unmanaged bootstrap, daemon `connect` optionally registers this factory as `claude_sdk` when the operator sets `OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT` to the absolute packaged `dist/main.js`. `OAC_RUNTIME_CLAUDE_SDK_NODE` selects Node (default: `node` on PATH). Discovery resolves Node once and checks that exact configuration before pairing; the SDK's bounded runtime check is independent of CLI version probes. A ready SDK alone is sufficient to start the daemon. No configuration means no SDK probe or descriptor; failed readiness reports an unavailable descriptor with a rejecting factory. Runtime checks establish local readiness, not provider authentication. Installed daemons use `start` and their verified installation manifest for adapter selection and activation; ambient activation variables cannot extend that selection. See [the native installation contract](../../deploy/README.md#native-daemon-installer).
+For unmanaged bootstrap, daemon `connect` optionally registers this factory as `claude_sdk` when the operator sets `OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT` to the absolute packaged `dist/main.js`. `OAC_RUNTIME_CLAUDE_SDK_NODE` selects Node (default: `node` on PATH). Discovery resolves Node once and checks that exact configuration before connecting; the SDK's bounded runtime check is independent of CLI version probes. A ready SDK alone is sufficient to start the daemon. No configuration means no SDK probe or descriptor; failed readiness reports an unavailable descriptor with a rejecting factory. Runtime checks establish local readiness, not provider authentication. Installed daemons use `start` and their verified installation manifest for adapter selection and activation; ambient activation variables cannot extend that selection. See [the native installation contract](../../deploy/README.md#native-daemon-installer).
 
-SDK state lives under `paths.ProfileDir(profile)/runtime/claude-sdk`, independently of the replaceable runtime bundle. Both the entrypoint and managed state root must be absolute. Background re-execution inherits operator configuration; it does not persist provider credentials in pairing profiles. It accepts no caller-supplied environment variables or business write authority.
+SDK state lives under `paths.ProfileDir(profile)/runtime/claude-sdk`, independently of the replaceable runtime bundle. Both the entrypoint and managed state root must be absolute. Background re-execution inherits operator configuration; it does not persist provider credentials in credential profiles. It accepts no caller-supplied environment variables or business write authority.
 
 ### Descriptor and execution profile
 
diff --git a/services/core/internal/runtimegateway/auth.go b/services/core/internal/runtimegateway/auth.go
index 4d7fadea2..40fa443f5 100644
--- a/services/core/internal/runtimegateway/auth.go
+++ b/services/core/internal/runtimegateway/auth.go
@@ -71,7 +71,7 @@ func (a *Authenticator) AuthenticateBearer(ctx context.Context, deviceID, bearer
 	}
 	storedHash := rt.CredentialHash
 	if storedHash == "" {
-		// Pairing never completed, or someone wiped the credential
+		// No credential was issued, or someone wiped it
 		// out-of-band. Fail closed.
 		return AuthenticatedRuntime{}, ErrAuthBadCredential
 	}
diff --git a/services/core/internal/runtimegateway/handler.go b/services/core/internal/runtimegateway/handler.go
index 85a62d55e..a22d6df2d 100644
--- a/services/core/internal/runtimegateway/handler.go
+++ b/services/core/internal/runtimegateway/handler.go
@@ -15,8 +15,8 @@ import (
 )
 
 // HeartbeatTouch is the persistence interface the gateway uses to
-// bump last_heartbeat_at / promote pending_pairing -> online when a
-// daemon connects.
+// bump last_heartbeat_at and mark the runtime online when a daemon
+// connects.
 type HeartbeatTouch interface {
 	TouchRuntimeHeartbeat(ctx context.Context, runtimeID string) (runtimedevice.HeartbeatStatus, error)
 	TouchAgentDaemonHeartbeat(ctx context.Context, input runtimedevice.Heartbeat) (runtimedevice.HeartbeatStatus, error)
@@ -32,7 +32,7 @@ type HandlerConfig struct {
 
 	Registry *Registry
 
-	// Heartbeat flips pending_pairing -> online and keeps
+	// Heartbeat marks the runtime online and keeps
 	// last_heartbeat_at fresh. nil tracks liveness in-process only.
 	Heartbeat HeartbeatTouch
 
@@ -133,7 +133,7 @@ func (h *Handler) WS(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if h.cfg.Heartbeat != nil {
-		// First inbound action — promote pending_pairing -> online.
+		// First inbound action — mark the runtime online.
 		// Best-effort; a transient DB blip shouldn't refuse the
 		// upgrade since we already accepted the credential.
 		if _, hbErr := h.cfg.Heartbeat.TouchRuntimeHeartbeat(r.Context(), auth.DeviceID); hbErr != nil {
@@ -179,7 +179,7 @@ func (h *Handler) WS(w http.ResponseWriter, r *http.Request) {
 	sess.Start()
 }
 
-// Bootstrap is the daemon's first HTTP call after pairing. Validating
+// Bootstrap is the daemon's first HTTP call with its credential. Validating
 // the bearer in a separate HTTP step (rather than folded into the WS
 // upgrade) lets the daemon fail fast on credential problems with a
 // real HTTP status rather than the opaque WS close code.
diff --git a/services/core/internal/runtimegateway/routes.go b/services/core/internal/runtimegateway/routes.go
index c7bf72429..d0c098c1e 100644
--- a/services/core/internal/runtimegateway/routes.go
+++ b/services/core/internal/runtimegateway/routes.go
@@ -11,8 +11,8 @@ import (
 //	POST /agent-daemon/bootstrap     — daemon first-call to fetch wsUrl + heartbeat cadence
 //	GET  /agent-daemon/device-status — daemon self-check
 //
-// All three accept the runtime credential issued via the
-// runtimes/pairings flow with type='agent_daemon'.
+// All three accept the daemon credential described in
+// contracts/agents-api/machine-api.md.
 func RegisterRoutes(r chi.Router, h *Handler) {
 	if h == nil {
 		panic("agentdaemon gateway: RegisterRoutes called with nil handler")

From e60d8ffe89b32ba3fa0f7f4df4ab3244729b0011 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 16:35:26 +0800
Subject: [PATCH 21/60] Delete the unprepared prompt request (#473)

Core starts every Run through execution_prepare and execution_start, so
the prompt_request frame, its daemon path and Core's unprepared delivery
branch had no caller.

- Delete proto.TypePromptRequest and its protocol rows; the daemon drops
  the frame as an unknown type. PromptRequestPayload stays as the
  execution_prepare configuration.
- Delete the daemon prompt path (prompt.go, output.go, the retained idle
  session pool, the completion barrier and the unprepared cancel and
  shutdown branches). A Run's session is now an agent.Turn, so durable
  steering support is enforced by type.
- Core deliver takes the prepared handle, Run ID and input explicitly.
- Delete ConversationID and ReleaseOnCompletion; WorkspaceReadOnly alone
  marks a read-only preparation.
- validateExecutionEnvironment owns the exactly-one local_environment /
  disable_execution_environment rule.
- Port the dispatch tests that cover behavior execution_start keeps to
  shared execution_prepare/execution_start helpers.
---
 .../claudesdk/cancellation_live_linux_test.go |   2 +-
 .../internal/agent/claudesdk/executor.go      |   2 +-
 .../agent/claudesdk/live_linux_test.go        |   2 +-
 .../agent/claudesdk/preparation_test.go       |   4 +-
 .../internal/agent/claudesdk/session.go       |   2 +-
 .../claudesdk/workspace_live_linux_test.go    |   2 +-
 .../agent/codex/preparation_helpers_test.go   |   1 -
 apps/daemon/internal/agent/codex/session.go   |   5 +-
 apps/daemon/internal/agent/harness.go         |  15 +-
 apps/daemon/internal/agent/mcode/executor.go  |   2 +-
 .../agent/mcode/executor_native_test.go       |   3 +-
 .../internal/agent/mcode/executor_test.go     |   5 +-
 .../internal/agent/mcode/preparation_test.go  |   2 +-
 .../internal/agent/mcode/session_test.go      |   4 +-
 .../cli/claude_sdk_live_linux_test.go         |  31 ++-
 apps/daemon/internal/dispatch/cancellation.go |  49 +---
 .../internal/dispatch/cancellation_test.go    | 102 ++++----
 .../dispatch/capability_admission_test.go     |  27 +-
 apps/daemon/internal/dispatch/environment.go  |   5 +-
 .../internal/dispatch/environment_test.go     |  77 +++---
 apps/daemon/internal/dispatch/executor.go     |  34 +--
 .../daemon/internal/dispatch/executor_test.go |  20 +-
 apps/daemon/internal/dispatch/export_test.go  |   8 +
 .../dispatch/functions_native_test.go         |  58 +++--
 .../internal/dispatch/functions_test.go       |  56 +++--
 .../dispatch/interaction_decisions.go         |   2 +-
 .../internal/dispatch/local_directory_test.go |   4 +-
 .../daemon/internal/dispatch/mcp_http_test.go |  53 ++--
 .../dispatch/optional_interactions_test.go    |  12 +-
 apps/daemon/internal/dispatch/output.go       | 103 --------
 apps/daemon/internal/dispatch/preparation.go  |   5 +-
 .../internal/dispatch/preparation_start.go    |   2 +-
 .../internal/dispatch/preparation_test.go     |   7 +-
 .../internal/dispatch/prepared_handoff.go     |  14 +-
 apps/daemon/internal/dispatch/prompt.go       | 149 ------------
 .../internal/dispatch/receipt_order_test.go   |  34 ++-
 .../dispatch/receipt_shutdown_test.go         |  12 +-
 apps/daemon/internal/dispatch/router.go       | 134 ++--------
 apps/daemon/internal/dispatch/router_test.go  | 230 +++++-------------
 .../internal/dispatch/runtime_preparation.go  |   2 +-
 .../dispatch/runtime_preparation_test.go      |   5 +-
 apps/daemon/internal/dispatch/shutdown.go     |  94 ++-----
 apps/daemon/internal/dispatch/steering.go     |  32 +--
 .../internal/dispatch/steering_lifetime.go    |   4 +-
 .../dispatch/steering_lifetime_test.go        |  60 +----
 .../daemon/internal/dispatch/steering_test.go |  47 ++--
 apps/daemon/internal/dispatch/suspend.go      |  21 --
 apps/daemon/internal/dispatch/suspend_test.go |  38 +--
 .../internal/dispatch/workspace_write.go      |   2 +-
 .../daemon/internal/localworkspace/binding.go |   2 +-
 .../internal/localworkspace/binding_test.go   |  10 +-
 apps/daemon/internal/transport/ws_test.go     |   8 +-
 .../internal/wireconformance/wire_test.go     |   2 +-
 apps/daemon/testdata/onboarding/main.go       |   2 +-
 docs/runtime-protocol.md                      |  10 +-
 docs/zh/runtime-protocol.md                   |  12 +-
 internal/agentdaemon/proto/envelope.go        |   2 +-
 internal/agentdaemon/proto/outbound.go        |  26 +-
 .../proto/workspace_read_preparation.go       |   3 +-
 scripts/name-allowlist.json                   |  10 +
 services/core/internal/execution/delivery.go  |  38 ++-
 .../execution/directory_preparation.go        |   2 +-
 .../core/internal/execution/dispatcher.go     |   5 +-
 .../execution/executor_preparation.go         |   1 -
 .../core/internal/execution/preparation.go    |   4 +-
 .../internal/execution/prepared_dispatch.go   |  13 +-
 .../runtimegateway/cancellation_test.go       |   2 +-
 .../mcp_bearer_live_linux_test.go             |  35 ++-
 .../mcp_bearer_process_linux_test.go          |   2 +-
 .../core/internal/runtimegateway/session.go   |   2 +-
 .../internal/runtimegateway/session_test.go   |   9 +-
 .../deployment_model_providers_http_test.go   |   2 +-
 .../core/tests/integration/dispatch_test.go   |   2 +-
 .../integration/executor_fixture_test.go      |   2 +-
 .../integration/harness_onboarding_test.go    |   2 +-
 .../integration/prepared_dispatch_test.go     |   2 +-
 76 files changed, 607 insertions(+), 1187 deletions(-)
 delete mode 100644 apps/daemon/internal/dispatch/output.go
 delete mode 100644 apps/daemon/internal/dispatch/prompt.go

diff --git a/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go b/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
index bc5cec8bd..7a958ed72 100644
--- a/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
@@ -65,7 +65,7 @@ func TestLiveClaudeSDKCancelResume(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
 		defer cancel()
 		out := make(chan proto.Envelope, 64)
-		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Follow the user's requested format. Preserve the exact verification value in conversation history. Use no tools."}}
+		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Follow the user's requested format. Preserve the exact verification value in conversation history. Use no tools."}}
 		running, err := NewFactory(config)(ctx, request, out)
 		if err != nil {
 			t.Fatal(err)
diff --git a/apps/daemon/internal/agent/claudesdk/executor.go b/apps/daemon/internal/agent/claudesdk/executor.go
index 55eed30a5..5b99aed4f 100644
--- a/apps/daemon/internal/agent/claudesdk/executor.go
+++ b/apps/daemon/internal/agent/claudesdk/executor.go
@@ -36,7 +36,7 @@ func NewExecutorFactory(config Config) agent.ExecutorFactory {
 		if ctx == nil {
 			ctx = context.Background()
 		}
-		if req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" {
+		if req.RunID != "" || len(req.Input) != 0 {
 			return nil, errors.New("claudesdk: Executor preparation cannot submit input")
 		}
 		start, env, err := prepareConfiguration(config, req)
diff --git a/apps/daemon/internal/agent/claudesdk/live_linux_test.go b/apps/daemon/internal/agent/claudesdk/live_linux_test.go
index ba2f7ca9d..72aff690d 100644
--- a/apps/daemon/internal/agent/claudesdk/live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/live_linux_test.go
@@ -137,7 +137,7 @@ func TestLiveClaudeSDKTextResume(t *testing.T) {
 		requestStart := len(requests)
 		mu.Unlock()
 		out := make(chan proto.Envelope, 64)
-		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Answer briefly and preserve the exact verification value in the conversation. Use no tools."}}
+		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Answer briefly and preserve the exact verification value in the conversation. Use no tools."}}
 		if success != nil {
 			request.AgentOptions["system_prompt"] = "Call lookup exactly once as requested, then report both result parts and any prior verification value. Never retry a failed tool."
 			request.FunctionTools = []proto.FunctionTool{{Name: "lookup", Description: "Return a synthetic verification value.", Parameters: json.RawMessage(`{"type":"object","properties":{"id":{"type":"string"}},"required":["id"],"additionalProperties":false}`)}}
diff --git a/apps/daemon/internal/agent/claudesdk/preparation_test.go b/apps/daemon/internal/agent/claudesdk/preparation_test.go
index f722d4481..f6c868640 100644
--- a/apps/daemon/internal/agent/claudesdk/preparation_test.go
+++ b/apps/daemon/internal/agent/claudesdk/preparation_test.go
@@ -107,7 +107,7 @@ func TestPreparationWaitsForReceiptAndRetainsConfiguration(t *testing.T) {
 }
 
 func TestPreparationRejectsInputAndUnavailableProfilesBeforeLaunch(t *testing.T) {
-	for _, name := range []string{"run", "prompt", "conversation", "attachments", "subagents", "workspace-missing", "none", "functions", "mcp", "controls", "old-runtime"} {
+	for _, name := range []string{"run", "prompt", "attachments", "subagents", "workspace-missing", "none", "functions", "mcp", "controls", "old-runtime"} {
 		t.Run(name, func(t *testing.T) {
 			config := preparationFixture(t, name)
 			req := preparationRequest()
@@ -116,8 +116,6 @@ func TestPreparationRejectsInputAndUnavailableProfilesBeforeLaunch(t *testing.T)
 				req.RunID = "unexpected"
 			case "prompt":
 				req.Input = proto.TextInput("unexpected")
-			case "conversation":
-				req.ConversationID = "product"
 			case "attachments":
 				req.Input = proto.MessageInput{{Content: []proto.InputContent{{Type: "input_image"}}}}
 			case "subagents":
diff --git a/apps/daemon/internal/agent/claudesdk/session.go b/apps/daemon/internal/agent/claudesdk/session.go
index 7edaabb07..e6dba3fde 100644
--- a/apps/daemon/internal/agent/claudesdk/session.go
+++ b/apps/daemon/internal/agent/claudesdk/session.go
@@ -37,7 +37,7 @@ func NewFactory(config Config) agent.Factory {
 	prepareExecutor := NewExecutorFactory(config)
 	return func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
 		run, input := req.RunID, req.Input
-		req.RunID, req.ConversationID, req.Input = "", "", nil
+		req.RunID, req.Input = "", nil
 		resource, err := prepareExecutor(ctx, req)
 		if err != nil {
 			return nil, err
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go b/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
index ceca7f844..3acd44b81 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
@@ -104,7 +104,7 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 		out := make(chan proto.Envelope, 64)
 		req := workspaceRequest()
 		req.RunID, req.Input, req.AgentSessionID = uuid.NewString(), proto.TextInput(prompt), resume
-		req.ReleaseOnCompletion, req.ObserveMessages = true, true
+		req.ObserveMessages = true
 		req.AgentOptions = map[string]any{"model": "MiniMax-M3", "system_prompt": "Follow the exact verification instructions using the requested native tools. Preserve conversation facts. No other files, network operations or background work."}
 		proof := evidence{RunID: req.RunID}
 		var running agent.Session
diff --git a/apps/daemon/internal/agent/codex/preparation_helpers_test.go b/apps/daemon/internal/agent/codex/preparation_helpers_test.go
index a04fe665c..52c5f07ea 100644
--- a/apps/daemon/internal/agent/codex/preparation_helpers_test.go
+++ b/apps/daemon/internal/agent/codex/preparation_helpers_test.go
@@ -42,7 +42,6 @@ func preparationFixture(t *testing.T) (proto.PromptRequestPayload, sessionConfig
 	cfg.codexBinary = binary
 	req := proto.PromptRequestPayload{
 		AgentKind: "codex", AgentStateKey: "prepared-session",
-		ReleaseOnCompletion:         true,
 		AgentOptions:                map[string]any{"model": "fixture-model"},
 		ExecutionControls:           &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"},
 		DisableExecutionEnvironment: true,
diff --git a/apps/daemon/internal/agent/codex/session.go b/apps/daemon/internal/agent/codex/session.go
index f2bc6333f..6c72ec886 100644
--- a/apps/daemon/internal/agent/codex/session.go
+++ b/apps/daemon/internal/agent/codex/session.go
@@ -37,9 +37,8 @@ func defaultSessionConfig() sessionConfig {
 }
 
 // Factory implements agent.Factory for agent_kind="codex". Spawns one
-// codex app-server child per prompt. The run stream closes when the turn
-// completes; the router retains the child until the conversation's idle
-// window expires or cancellation shuts it down sooner.
+// codex app-server child for one Turn. The run stream closes when the turn
+// completes; the child remains until the caller cancels the Session.
 func Factory(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
 	return newSession(ctx, req, out, defaultSessionConfig())
 }
diff --git a/apps/daemon/internal/agent/harness.go b/apps/daemon/internal/agent/harness.go
index 427a83a58..d199aa71f 100644
--- a/apps/daemon/internal/agent/harness.go
+++ b/apps/daemon/internal/agent/harness.go
@@ -119,8 +119,8 @@ type TurnSettlement struct {
 	Reason   string
 }
 
-// Session is the cancellation and outcome surface shared by direct prompt runs
-// and Turns. Every owner exposes observed state, including direct-call sessions.
+// Session is the cancellation and outcome surface shared by direct-call
+// sessions and Turns. Every owner exposes observed state.
 // For Executor-owned Turns, AwaitSettlement and Executor.Close define settlement
 // and resource retirement; Cancel alone does not transfer resource ownership.
 type Session interface {
@@ -199,7 +199,7 @@ type WorkspaceWriter interface {
 	WriteWorkspaceFile(context.Context, string, []byte) (WorkspaceWriteResult, error)
 }
 
-// Separate preparation for qualified workspace access and direct-call paths.
+// Separate preparation for qualified workspace access.
 
 // Prepared owns native resources until Start returns a non-nil Session. The
 // preparation owner context spans the eventual Session; Start's context is local
@@ -227,11 +227,12 @@ type PreparedCancellation interface {
 // cleanup remains unconfirmed. The caller must retain and close that resource.
 type PreparationFactory func(context.Context, proto.PromptRequestPayload) (Prepared, error)
 
-// Direct-call factory and registration. These use the existing Registry behavior.
+// Kind registration and the direct-call factory.
 
-// Factory builds a Session for one prompt_request. out is the upstream
-// channel the agent writes into and closes exactly once after terminal output.
-// ctx is cancelled by the router to wind the session down.
+// Factory builds a Session that runs req.Input as req.RunID without an
+// Executor; the router starts every Run through RegisterExecutor instead. out
+// is the channel the agent writes into and closes exactly once after terminal
+// output. ctx is cancelled to wind the session down.
 type Factory func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (Session, error)
 
 // RegisterKind installs f and the heartbeat descriptor for an
diff --git a/apps/daemon/internal/agent/mcode/executor.go b/apps/daemon/internal/agent/mcode/executor.go
index c63473397..1f9ecf907 100644
--- a/apps/daemon/internal/agent/mcode/executor.go
+++ b/apps/daemon/internal/agent/mcode/executor.go
@@ -39,7 +39,7 @@ func NewExecutorFactory(config *WorkspaceConfig) agent.ExecutorFactory {
 		if ctx == nil {
 			ctx = context.Background()
 		}
-		if req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" {
+		if req.RunID != "" || len(req.Input) != 0 {
 			return nil, fmt.Errorf("mcode: Executor configuration cannot contain Turn input")
 		}
 		var err error
diff --git a/apps/daemon/internal/agent/mcode/executor_native_test.go b/apps/daemon/internal/agent/mcode/executor_native_test.go
index 96cae1889..d2c40d507 100644
--- a/apps/daemon/internal/agent/mcode/executor_native_test.go
+++ b/apps/daemon/internal/agent/mcode/executor_native_test.go
@@ -29,8 +29,7 @@ func TestNativeMCodeExecutorReuse(t *testing.T) {
 		t.Fatal("private provider options unavailable")
 	}
 	req := testRequest(t)
-	req.ReleaseOnCompletion = false
-	req.RunID, req.Input, req.ConversationID = "", nil, ""
+	req.RunID, req.Input = "", nil
 	if json.Unmarshal(raw, &req.AgentOptions) != nil {
 		t.Fatal("invalid private provider options")
 	}
diff --git a/apps/daemon/internal/agent/mcode/executor_test.go b/apps/daemon/internal/agent/mcode/executor_test.go
index fc78836d0..52d7bdbd5 100644
--- a/apps/daemon/internal/agent/mcode/executor_test.go
+++ b/apps/daemon/internal/agent/mcode/executor_test.go
@@ -16,7 +16,6 @@ import (
 func executorFixture(t *testing.T, scenario string, workspace bool) (*executor, string) {
 	t.Helper()
 	config, req, record := workspaceFixture(t)
-	req.ReleaseOnCompletion = false
 	script, err := os.ReadFile(config.Binary)
 	if err != nil {
 		t.Fatal(err)
@@ -29,8 +28,7 @@ func executorFixture(t *testing.T, scenario string, workspace bool) (*executor,
 		factory = NewExecutorFactory(&config)
 	} else {
 		req = testRequest(t)
-		req.ReleaseOnCompletion = false
-		req.RunID, req.Input, req.ConversationID = "", nil, ""
+		req.RunID, req.Input = "", nil
 		t.Setenv("OAC_RUNTIME_MCODE_BIN", config.Binary)
 		factory = NewExecutorFactory(nil)
 	}
@@ -263,7 +261,6 @@ func TestExecutorCloseRetainsOwnerAfterDeadline(t *testing.T) {
 
 func TestExecutorFactoryPreparationFailureHasNoTypedNilOwner(t *testing.T) {
 	config, req, _ := workspaceFixture(t)
-	req.ReleaseOnCompletion = false
 	if err := os.WriteFile(config.Binary, []byte("#!/bin/sh\nexit 1\n"), 0700); err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/agent/mcode/preparation_test.go b/apps/daemon/internal/agent/mcode/preparation_test.go
index 249129603..3f0a42502 100644
--- a/apps/daemon/internal/agent/mcode/preparation_test.go
+++ b/apps/daemon/internal/agent/mcode/preparation_test.go
@@ -16,7 +16,7 @@ import (
 func workspaceFixture(t *testing.T) (WorkspaceConfig, proto.PromptRequestPayload, string) {
 	t.Helper()
 	r := testRequest(t)
-	r.RunID, r.Input, r.ConversationID = "", nil, ""
+	r.RunID, r.Input = "", nil
 	r.DisableExecutionEnvironment = false
 	r.LocalEnvironment = &proto.LocalEnvironment{ID: "environment", NetworkAccess: "enabled", WorkspaceRoot: t.TempDir()}
 	record := filepath.Join(t.TempDir(), "calls")
diff --git a/apps/daemon/internal/agent/mcode/session_test.go b/apps/daemon/internal/agent/mcode/session_test.go
index ad506fedb..5012b1268 100644
--- a/apps/daemon/internal/agent/mcode/session_test.go
+++ b/apps/daemon/internal/agent/mcode/session_test.go
@@ -18,9 +18,9 @@ import (
 func testRequest(t *testing.T) proto.PromptRequestPayload {
 	t.Helper()
 	t.Setenv("OAC_RUNTIME_HOME", t.TempDir())
-	return proto.PromptRequestPayload{RunID: "run-1", ConversationID: "conversation-1", AgentStateKey: "conversation-1/agent-1/mcode", Input: proto.TextInput("Hello"), AgentOptions: map[string]any{
+	return proto.PromptRequestPayload{RunID: "run-1", AgentStateKey: "conversation-1/agent-1/mcode", Input: proto.TextInput("Hello"), AgentOptions: map[string]any{
 		"model": "fixture", "model_provider": map[string]any{"protocol": "anthropic", "base_url": "https://provider.example/v1", "api_key": "fixture-key", "context_window": 64000, "max_output_tokens": 4096}, "system_prompt": "Current instructions",
-	}, ReleaseOnCompletion: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
+	}, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
 }
 
 func helperSession(t *testing.T, scenario string, resume bool) (*Session, <-chan proto.Envelope) {
diff --git a/apps/daemon/internal/cli/claude_sdk_live_linux_test.go b/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
index 43a162377..283a34291 100644
--- a/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
+++ b/apps/daemon/internal/cli/claude_sdk_live_linux_test.go
@@ -86,14 +86,14 @@ func TestLiveRegisteredClaudeSDK(t *testing.T) {
 		}()
 		ctx, cancel := context.WithTimeout(t.Context(), 120*time.Second)
 		defer cancel()
-		id := uuid.NewString()
-		request := proto.PromptRequestPayload{RunID: id, AgentKind: "claude_sdk", Input: proto.TextInput(prompt), AgentStateKey: "registered-acceptance", AgentSessionID: resume, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": nil}}
+		id, prepare := uuid.NewString(), uuid.NewString()
+		request := proto.PromptRequestPayload{AgentKind: "claude_sdk", AgentStateKey: "agents-api-registered-acceptance", AgentSessionID: resume, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": nil}}
 		if callFunction {
 			request.FunctionTools = []proto.FunctionTool{{Name: "lookup", Description: "Return a verification value.", Parameters: json.RawMessage(`{"type":"object","properties":{"id":{"type":"string"}},"required":["id"],"additionalProperties":false}`)}}
 		}
-		handle := func(kind string, payload any) {
+		send := func(kind, envelopeID string, payload any) {
 			t.Helper()
-			env, err := proto.NewEnvelope(kind, id, payload)
+			env, err := proto.NewEnvelope(kind, envelopeID, payload)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -101,7 +101,21 @@ func TestLiveRegisteredClaudeSDK(t *testing.T) {
 				t.Fatal("registered router request failed", err)
 			}
 		}
-		handle(proto.TypePromptRequest, request)
+		handle := func(kind string, payload any) { send(kind, id, payload) }
+		send(proto.TypeExecutionPrepare, prepare, proto.ExecutionPreparePayload{SessionID: "registered-acceptance", Configuration: request})
+		var ready proto.PreparationStatusPayload
+		for ready.State != "ready" {
+			var event proto.Envelope
+			select {
+			case event = <-sender:
+			case <-ctx.Done():
+				t.Fatal("registered preparation timed out", ctx.Err())
+			}
+			if event.Type != proto.TypePreparationStatus || event.ID != prepare || event.DecodePayload(&ready) != nil || ready.State != "preparing" && ready.State != "ready" {
+				t.Fatalf("registered preparation failed: %s", event.Payload)
+			}
+		}
+		send(proto.TypeExecutionStart, prepare, proto.ExecutionStartPayload{Handle: ready.Handle, ExecutorID: ready.ExecutorID, RunID: id, Input: proto.TextInput(prompt)})
 		proof := execution{}
 		defer func() {
 			data, _ := json.MarshalIndent(proof, "", "  ")
@@ -117,6 +131,13 @@ func TestLiveRegisteredClaudeSDK(t *testing.T) {
 			case <-ctx.Done():
 				t.Fatal("registered execution timed out", ctx.Err())
 			}
+			if event.Type == proto.TypePreparationStatus && event.ID == prepare {
+				var status proto.PreparationStatusPayload
+				if event.DecodePayload(&status) != nil || status.RunID != id || status.State != "starting" && status.State != "started" {
+					t.Fatalf("registered start failed: %s", event.Payload)
+				}
+				continue
+			}
 			if event.ID != id {
 				t.Fatal("event identity changed")
 			}
diff --git a/apps/daemon/internal/dispatch/cancellation.go b/apps/daemon/internal/dispatch/cancellation.go
index 5dffa4532..d255c6f1e 100644
--- a/apps/daemon/internal/dispatch/cancellation.go
+++ b/apps/daemon/internal/dispatch/cancellation.go
@@ -2,22 +2,10 @@ package dispatch
 
 import (
 	"context"
-	"errors"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func (r *Router) releaseCompletedSession(state *sessionState) error {
-	r.mu.Lock()
-	state.retain = false
-	r.mu.Unlock()
-	receiptErr := r.finishSteering(state)
-	err := state.session.Cancel(context.Background())
-	state.ctxCancel()
-	return errors.Join(receiptErr, err)
-}
-
 func (r *Router) handlePromptCancel(ctx context.Context, env proto.Envelope) error {
 	var request proto.PromptCancelPayload
 	if err := env.DecodePayload(&request); err != nil {
@@ -29,39 +17,18 @@ func (r *Router) handlePromptCancel(ctx context.Context, env proto.Envelope) err
 		return ErrRouterClosed
 	}
 	state := r.sessions[env.ID]
-	if state != nil {
-		state.retain = false
-	}
-	var owner agent.Session
-	if state != nil && state.preparedHandoff != nil {
-		handoff := state.preparedHandoff
-		release, attempt := r.claimPreparedReleaseLocked(state, true, "", true)
-		if request.DeliveryID != "" {
-			r.shutdownWG.Add(1)
-			go r.sendPreparedCancellation(state, handoff, release, attempt, env, request.DeliveryID)
-		}
+	if state == nil {
 		r.mu.Unlock()
-		return nil
+		return r.sendCancellationAck(ctx, env, proto.InteractionDecisionAckPayload{DeliveryID: request.DeliveryID, ErrorCode: "run_inactive"})
 	}
-	if state != nil && state.session != nil {
-		owner = state.session
+	handoff := state.preparedHandoff
+	release, attempt := r.claimPreparedReleaseLocked(state, true, "", true)
+	if request.DeliveryID != "" {
+		r.shutdownWG.Add(1)
+		go r.sendPreparedCancellation(state, handoff, release, attempt, env, request.DeliveryID)
 	}
 	r.mu.Unlock()
-	ack := proto.InteractionDecisionAckPayload{DeliveryID: request.DeliveryID, ErrorCode: "run_inactive"}
-	if state != nil && owner == nil {
-		ack.ErrorCode = "not_ready"
-	} else if owner != nil {
-		if err := owner.Cancel(ctx); err != nil {
-			r.log.WarnContext(ctx, "session.Cancel failed", "run_id", env.ID, "err", err)
-			ack.ErrorCode = "cancel_failed"
-		} else {
-			ack.Applied, ack.ErrorCode = true, ""
-			outcome := owner.CancellationOutcome()
-			ack.Outcome = &outcome
-		}
-		state.ctxCancel()
-	}
-	return r.sendCancellationAck(ctx, env, ack)
+	return nil
 }
 
 func (r *Router) sendCancellationAck(ctx context.Context, env proto.Envelope, ack proto.InteractionDecisionAckPayload) error {
diff --git a/apps/daemon/internal/dispatch/cancellation_test.go b/apps/daemon/internal/dispatch/cancellation_test.go
index f4273d5ef..d43722800 100644
--- a/apps/daemon/internal/dispatch/cancellation_test.go
+++ b/apps/daemon/internal/dispatch/cancellation_test.go
@@ -1,7 +1,5 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"errors"
@@ -25,40 +23,41 @@ func (s *cancelReceiptSession) CancellationOutcome() proto.DonePayload {
 	return s.outcome
 }
 
+func (s *cancelReceiptSession) Cancel(ctx context.Context) error {
+	if s.entered != nil {
+		close(s.entered)
+		<-s.release
+		s.entered = nil
+	}
+	_ = s.fakeSession.Cancel(ctx)
+	return s.err
+}
+
+func registerCancelReceiptKind(h *harness, sess *cancelReceiptSession) {
+	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
+		sess.fakeSession = &fakeSession{out: out, closeOutOnCancel: true}
+		return sess, nil
+	}))
+}
+
 func TestCompletionWaitsForNativeWriterRelease(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 	sess := &cancelReceiptSession{entered: make(chan struct{}), release: make(chan struct{})}
-	h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		sess.fakeSession = &fakeSession{out: out, closeOutOnCancel: true}
-		return sess, nil
-	})
-	if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, "release", proto.PromptRequestPayload{AgentKind: "codex", AgentStateKey: "stable", ReleaseOnCompletion: true})); err != nil {
-		t.Fatal(err)
-	}
+	registerCancelReceiptKind(h, sess)
+	startRun(t, h.router, h.sender, "release", proto.PromptRequestPayload{AgentKind: "codex"})
 	sess.out <- mustEnv(t, proto.TypeDone, "release", proto.DonePayload{Content: "Finished"})
 	<-sess.entered
-	if len(h.sender.snapshot()) != 0 {
+	if len(h.sender.typesFor("release")) != 0 {
 		t.Fatal("completion acknowledged before native writer was released")
 	}
 	close(sess.release)
-	waitFor(t, func() bool { return h.router.ActiveRuns() == 0 }, "release completion")
-	frames := h.sender.snapshot()
-	if len(frames) != 1 || frames[0].Type != proto.TypeDone || sess.cancels() != 1 {
+	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypeDone, "release") }, "release completion")
+	if frames := h.sender.typesFor("release"); len(frames) != 1 || frames[0] != proto.TypeDone || sess.cancels() != 1 {
 		t.Fatal("completion or native release missing")
 	}
 }
 
-func (s *cancelReceiptSession) Cancel(ctx context.Context) error {
-	if s.entered != nil {
-		close(s.entered)
-		<-s.release
-		s.entered = nil
-	}
-	_ = s.fakeSession.Cancel(ctx)
-	return s.err
-}
-
 func TestCancellationReceiptFollowsAdapterOutcome(t *testing.T) {
 	observed := proto.DonePayload{Content: "partial output", Metadata: map[string]any{proto.DoneMetaAgentSessionID: "native-cancelled"}}
 	for _, test := range []struct {
@@ -76,47 +75,31 @@ func TestCancellationReceiptFollowsAdapterOutcome(t *testing.T) {
 			h := newHarness(t)
 			defer h.router.Shutdown(context.Background())
 			sess := &cancelReceiptSession{entered: make(chan struct{}), release: make(chan struct{}), outcome: test.outcome, err: test.err}
-			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-				sess.fakeSession = &fakeSession{out: out, closeOutOnCancel: true}
-				return sess, nil
-			})
-			if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, "run", proto.PromptRequestPayload{AgentKind: "codex"})); err != nil {
+			registerCancelReceiptKind(h, sess)
+			startRun(t, h.router, h.sender, "run", proto.PromptRequestPayload{AgentKind: "codex"})
+			if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptCancel, "run", proto.PromptCancelPayload{DeliveryID: "cancel-1"})); err != nil {
 				t.Fatal(err)
 			}
-			done := make(chan error, 1)
-			go func() {
-				done <- h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptCancel, "run", proto.PromptCancelPayload{DeliveryID: "cancel-1"}))
-			}()
 			<-sess.entered
-			for _, env := range h.sender.snapshot() {
-				if env.Type == proto.TypeInteractionDecisionAck {
-					t.Fatal("cancellation acknowledged before adapter returned")
-				}
+			if len(cancellationAcks(h.sender)) != 0 {
+				t.Fatal("cancellation acknowledged before adapter returned")
 			}
 			close(sess.release)
-			if err := <-done; err != nil {
-				t.Fatal(err)
+			waitFor(t, func() bool { return len(cancellationAcks(h.sender)) != 0 }, "cancellation receipt")
+			acks := cancellationAcks(h.sender)
+			if len(acks) != 1 {
+				t.Fatalf("cancellation receipts: %+v", acks)
 			}
-			found := false
-			for _, env := range h.sender.snapshot() {
-				if env.Type == proto.TypeInteractionDecisionAck {
-					found = true
-					var ack proto.InteractionDecisionAckPayload
-					_ = env.DecodePayload(&ack)
-					if ack.Applied != (test.err == nil) || ack.DeliveryID != "cancel-1" {
-						t.Fatalf("wrong receipt: %+v", ack)
-					}
-					if test.err == nil {
-						if ack.ErrorCode != "" || ack.Outcome == nil || !reflect.DeepEqual(*ack.Outcome, test.outcome) {
-							t.Fatalf("cancellation receipt changed observed evidence: %+v", ack)
-						}
-					} else if ack.ErrorCode != "cancel_failed" || ack.Outcome != nil {
-						t.Fatalf("failed cancellation supplied a success outcome: %+v", ack)
-					}
-				}
+			ack := acks[0]
+			if ack.Applied != (test.err == nil) || ack.DeliveryID != "cancel-1" {
+				t.Fatalf("wrong receipt: %+v", ack)
 			}
-			if !found {
-				t.Fatal("missing cancellation receipt")
+			if test.err == nil {
+				if ack.ErrorCode != "" || ack.Outcome == nil || !reflect.DeepEqual(*ack.Outcome, test.outcome) {
+					t.Fatalf("cancellation receipt changed observed evidence: %+v", ack)
+				}
+			} else if ack.ErrorCode != "cancel_failed" || ack.Outcome != nil {
+				t.Fatalf("failed cancellation supplied a success outcome: %+v", ack)
 			}
 		})
 	}
@@ -125,14 +108,13 @@ func TestCancellationReceiptFollowsAdapterOutcome(t *testing.T) {
 func TestLegacyCancellationDoesNotEmitNewFrames(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
-	if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, "legacy", proto.PromptRequestPayload{AgentKind: "fake_alpha"})); err != nil {
-		t.Fatal(err)
-	}
+	startRun(t, h.router, h.sender, "legacy", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
 	sess.closeOutOnCancel = true
 	if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptCancel, "legacy", proto.PromptCancelPayload{})); err != nil {
 		t.Fatal(err)
 	}
+	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypeDone, "legacy") }, "cancellation settlement")
 	for _, env := range h.sender.snapshot() {
 		if env.Type == proto.TypeInteractionDecisionAck {
 			t.Fatal("legacy cancellation emitted new receipt")
diff --git a/apps/daemon/internal/dispatch/capability_admission_test.go b/apps/daemon/internal/dispatch/capability_admission_test.go
index 0a9fde120..744d60ff6 100644
--- a/apps/daemon/internal/dispatch/capability_admission_test.go
+++ b/apps/daemon/internal/dispatch/capability_admission_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
 )
 
 func TestSteeringUsesAdmittedDeclarationAndDoesNotReplayUnsupportedImplementation(t *testing.T) {
@@ -18,20 +17,18 @@ func TestSteeringUsesAdmittedDeclarationAndDoesNotReplayUnsupportedImplementatio
 			h := newHarness(t)
 			defer h.router.Shutdown(context.Background())
 			var calls atomic.Int32
-			factory := func(_ context.Context, _ proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+			factory := sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 				return &steeringSession{fakeSession: &fakeSession{out: out, closeOutOnCancel: true}, steer: func(context.Context, proto.PromptSteerPayload) error {
 					calls.Add(1)
 					return fmt.Errorf("%w: fixture has no active input", agent.ErrUnsupportedOperation)
 				}}, nil
-			}
-			info := proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilityFromBool(supported)})}
-			h.reg.RegisterKind(info, harnessconfig.Configuration{}, factory)
-			if err := h.router.Handle(t.Context(), mustEnv(t, proto.TypePromptRequest, "run", proto.PromptRequestPayload{AgentKind: "fixture"})); err != nil {
-				t.Fatal(err)
-			}
+			})
+			info := proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilityFromBool(supported)})}
+			registerExecutorKind(h.reg, info, factory)
+			startRun(t, h.router, h.sender, "run", proto.PromptRequestPayload{AgentKind: "fixture"})
 			// A new registration cannot rewrite the already admitted owner's contract.
 			info.Capabilities.Steering = proto.CapabilityFromBool(!supported)
-			h.reg.RegisterKind(info, harnessconfig.Configuration{}, factory)
+			registerExecutorKind(h.reg, info, factory)
 			for range 2 {
 				if err := handleSteeringAndWait(t, h, mustEnv(t, proto.TypePromptSteer, "run", proto.PromptSteerPayload{InputID: "input", Input: proto.TextInput("hello")})); err != nil {
 					t.Fatal(err)
@@ -63,14 +60,12 @@ func TestInteractionDeclarationPrecedesResponderMethods(t *testing.T) {
 				h := newHarness(t)
 				defer h.router.Shutdown(context.Background())
 				var session *fakeSession
-				info := proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Permissions: proto.CapabilityFromBool(supported)})}
-				h.reg.RegisterKind(info, harnessconfig.Configuration{}, func(_ context.Context, _ proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+				info := proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Permissions: proto.CapabilityFromBool(supported)})}
+				registerExecutorKind(h.reg, info, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 					session = &fakeSession{out: out, closeOutOnCancel: true, submitErr: agent.ErrUnsupportedOperation, askErr: agent.ErrUnsupportedOperation}
 					return session, nil
-				})
-				if err := h.router.Handle(t.Context(), mustEnv(t, proto.TypePromptRequest, "run", proto.PromptRequestPayload{AgentKind: "fixture"})); err != nil {
-					t.Fatal(err)
-				}
+				}))
+				startRun(t, h.router, h.sender, "run", proto.PromptRequestPayload{AgentKind: "fixture"})
 				event := mustEnv(t, proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{RequestID: "interaction", Tool: "fixture"})
 				decision := mustEnv(t, proto.TypePermissionDecision, "interaction", proto.PermissionDecisionPayload{DeliveryID: "decision", Approved: true})
 				if ask {
@@ -78,7 +73,7 @@ func TestInteractionDeclarationPrecedesResponderMethods(t *testing.T) {
 					decision = mustEnv(t, proto.TypePromptForUserChoiceDecision, "interaction", proto.PromptForUserChoiceDecisionPayload{DeliveryID: "decision"})
 				}
 				session.out <- event
-				waitFor(t, func() bool { return len(h.sender.snapshot()) > 0 }, "interaction indexed")
+				waitFor(t, func() bool { return hasFrame(h.sender, event.Type, "run") }, "interaction indexed")
 				if err := h.router.Handle(t.Context(), decision); err != nil {
 					t.Fatal(err)
 				}
diff --git a/apps/daemon/internal/dispatch/environment.go b/apps/daemon/internal/dispatch/environment.go
index 932ad7649..74de20411 100644
--- a/apps/daemon/internal/dispatch/environment.go
+++ b/apps/daemon/internal/dispatch/environment.go
@@ -7,6 +7,9 @@ import (
 )
 
 func validateExecutionEnvironment(req proto.PromptRequestPayload, caps proto.AgentKindCapabilities) error {
+	if (req.LocalEnvironment != nil) == req.DisableExecutionEnvironment {
+		return errors.New("execution requires exactly one of local_environment and disable_execution_environment")
+	}
 	if err := req.ValidateAgentOptions(); err != nil {
 		return err
 	}
@@ -16,7 +19,7 @@ func validateExecutionEnvironment(req proto.PromptRequestPayload, caps proto.Age
 	if err := req.ValidateToolSearch(caps.ToolSearch.IsSupported()); err != nil {
 		return err
 	}
-	if req.LocalEnvironment != nil && (req.DisableExecutionEnvironment || !caps.LocalEnvironment.IsSupported()) {
+	if req.LocalEnvironment != nil && !caps.LocalEnvironment.IsSupported() {
 		return errors.New("engine does not support this local Environment configuration")
 	}
 	if req.DisableExecutionEnvironment && !caps.EnvironmentNone.IsSupported() {
diff --git a/apps/daemon/internal/dispatch/environment_test.go b/apps/daemon/internal/dispatch/environment_test.go
index 0e72f9020..c021ec3cb 100644
--- a/apps/daemon/internal/dispatch/environment_test.go
+++ b/apps/daemon/internal/dispatch/environment_test.go
@@ -1,10 +1,9 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"errors"
+	"sync/atomic"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
@@ -12,21 +11,36 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 )
 
+// assertPreparationOutcome waits for the terminal admission status of id. An
+// admitted request fails in the controlled factory; a rejected one sends only
+// its rejection.
+func assertPreparationOutcome(t *testing.T, sender *recSender, id string, admitted bool) proto.PreparationStatusPayload {
+	t.Helper()
+	state, frames := "rejected", 1
+	if admitted {
+		state, frames = "failed", 2
+	}
+	status := waitPreparationStatus(t, sender, id, state, "")
+	if got := sender.typesFor(id); len(got) != frames {
+		t.Fatalf("preparation %s frames = %v, want %d status frames", id, got, frames)
+	}
+	return status
+}
+
 func TestNoEnvironmentRejectsOtherEngineBeforeFactory(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
-	called := false
-	h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		called = true
-		return nil, nil
+	var called atomic.Bool
+	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
+		called.Store(true)
+		return nil, errors.New("controlled factory stop")
 	})
-	err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, "none", proto.PromptRequestPayload{AgentKind: "fake_alpha", DisableExecutionEnvironment: true}))
-	if err == nil || called {
-		t.Fatal("unsupported engine was started", err)
+	err := h.router.Handle(context.Background(), mustEnv(t, proto.TypeExecutionPrepare, "none", noEnvironmentPreparation("none", proto.PromptRequestPayload{AgentKind: "fake_alpha"})))
+	if err == nil {
+		t.Fatal("unsupported engine was admitted")
 	}
-	frames := h.sender.snapshot()
-	if len(frames) != 2 || frames[0].Type != proto.TypeError || frames[1].Type != proto.TypeDone {
-		t.Fatal(frames)
+	if status := assertPreparationOutcome(t, h.sender, "none", false); status.ErrorCode != "unsupported_configuration" || called.Load() {
+		t.Fatalf("unsupported engine was started: status=%+v called=%t", status, called.Load())
 	}
 }
 
@@ -34,14 +48,15 @@ func TestNoEnvironmentUsesAvailableCapability(t *testing.T) {
 	for _, available := range []bool{false, true} {
 		h := newHarness(t)
 		defer h.router.Shutdown(context.Background())
-		called := false
-		h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "claude_sdk", Available: available, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-			called = true
+		var called atomic.Bool
+		registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "claude_sdk", Available: available, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
+			called.Store(true)
 			return nil, errors.New("controlled factory stop")
 		})
-		_ = h.router.Handle(t.Context(), mustEnv(t, proto.TypePromptRequest, "sdk", proto.PromptRequestPayload{AgentKind: "claude_sdk", DisableExecutionEnvironment: true}))
-		if called != available {
-			t.Fatalf("factory called=%t, available=%t", called, available)
+		_ = h.router.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "sdk", noEnvironmentPreparation("sdk", proto.PromptRequestPayload{AgentKind: "claude_sdk"})))
+		assertPreparationOutcome(t, h.sender, "sdk", available)
+		if called.Load() != available {
+			t.Fatalf("factory called=%t, available=%t", called.Load(), available)
 		}
 	}
 }
@@ -51,26 +66,26 @@ func TestLocalEnvironmentRequiresAvailableCapability(t *testing.T) {
 		t.Run(mode, func(t *testing.T) {
 			h := localPreparationHarness(t)
 			defer h.router.Shutdown(context.Background())
-			called := false
-			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: mode != "unavailable",
+			var called atomic.Bool
+			registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "codex", Available: mode != "unavailable",
 				Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilityFromBool(mode != "unsupported")})},
-				harnessconfig.Configuration{}, func(_ context.Context, req proto.PromptRequestPayload, _ chan<- proto.Envelope) (agent.Session, error) {
-					called = true
+				func(_ context.Context, req proto.PromptRequestPayload) (agent.Executor, error) {
+					called.Store(true)
 					if req.LocalEnvironment == nil || req.LocalEnvironment.ID != preparationEnvironmentID {
 						t.Error("local descriptor lost before factory")
 					}
 					return nil, errors.New("controlled factory stop")
 				})
-			req := preparationRequest().Configuration
-			req.AgentKind = "codex"
-			req.DisableExecutionEnvironment = mode == "none conflict"
-			_ = h.router.Handle(t.Context(), mustEnv(t, proto.TypePromptRequest, "local", req))
-			if called != (mode == "supported") {
-				t.Fatalf("unexpected factory call for %s", mode)
+			req := preparationRequest()
+			req.Configuration.AgentKind = "codex"
+			req.Configuration.DisableExecutionEnvironment = mode == "none conflict"
+			err := h.router.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "local", req))
+			if (err == nil) != (mode == "supported") {
+				t.Fatalf("wrong admission for %s: %v", mode, err)
 			}
-			frames := h.sender.snapshot()
-			if len(frames) != 2 || frames[0].Type != proto.TypeError || frames[1].Type != proto.TypeDone {
-				t.Fatal("missing terminal error frames")
+			assertPreparationOutcome(t, h.sender, "local", mode == "supported")
+			if called.Load() != (mode == "supported") {
+				t.Fatalf("unexpected factory call for %s", mode)
 			}
 		})
 	}
diff --git a/apps/daemon/internal/dispatch/executor.go b/apps/daemon/internal/dispatch/executor.go
index 7ac4223b6..38de76298 100644
--- a/apps/daemon/internal/dispatch/executor.go
+++ b/apps/daemon/internal/dispatch/executor.go
@@ -38,14 +38,13 @@ func executorFingerprint(req proto.PromptRequestPayload) ([32]byte, error) {
 	req.RunID, req.Input = "", nil
 	req.AgentSessionID = ""
 	req.RequireExistingNativeSession = false
-	req.ReleaseOnCompletion = false
 	data, err := json.Marshal(req)
 	return sha256.Sum256(data), err
 }
 
 func (r *Router) handleExecutorPrepare(ctx context.Context, env proto.Envelope, input proto.ExecutionPreparePayload) error {
 	req := input.Configuration
-	if strings.TrimSpace(input.SessionID) == "" || req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" || req.AgentStateKey != "agents-api-"+input.SessionID {
+	if strings.TrimSpace(input.SessionID) == "" || req.RunID != "" || len(req.Input) != 0 || req.AgentStateKey != "agents-api-"+input.SessionID {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
 	caps, available := r.availableCapabilities(req.AgentKind)
@@ -60,7 +59,7 @@ func (r *Router) handleExecutorPrepare(ctx context.Context, env proto.Envelope,
 	if err != nil {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
-	if (req.LocalEnvironment != nil) == req.DisableExecutionEnvironment || validateExecutionEnvironment(req, caps) != nil || len(req.FunctionTools) > 0 && !caps.FunctionTools.IsSupported() {
+	if validateExecutionEnvironment(req, caps) != nil || len(req.FunctionTools) > 0 && !caps.FunctionTools.IsSupported() {
 		return r.rejectPreparation(env, "unsupported_configuration")
 	}
 	fingerprint, err := executorFingerprint(req)
@@ -146,7 +145,7 @@ func (r *Router) handleExecutorPrepare(ctx context.Context, env proto.Envelope,
 		r.log.Info("executor owner_created", "executor_id", owner.id, "session_id", owner.sessionID)
 	}
 	operation, cancel := context.WithCancel(context.WithoutCancel(ctx))
-	p := &preparationState{capabilities: owner.capabilities, requestID: env.ID, trace: env.Trace, fingerprint: requestFingerprint, ctx: operation, cancel: cancel, stateKey: req.AgentStateKey, environmentID: req.EnvironmentID(), executor: owner, owns: true, busy: !reused, deadline: time.Now().Add(r.preparationTimeout)}
+	p := &preparationState{capabilities: owner.capabilities, requestID: env.ID, trace: env.Trace, fingerprint: requestFingerprint, ctx: operation, cancel: cancel, environmentID: req.EnvironmentID(), executor: owner, owns: true, busy: !reused, deadline: time.Now().Add(r.preparationTimeout)}
 	state := "preparing"
 	if reused {
 		state = "ready"
@@ -276,19 +275,22 @@ func (r *Router) scheduleExecutorIdleLocked(owner *executorState) {
 	owner.idleLease++
 	lease := owner.idleLease
 	r.log.Info("executor owner_idle", "executor_id", owner.id, "session_id", owner.sessionID)
-	owner.timer = time.AfterFunc(r.idleTimeout, func() {
-		r.mu.Lock()
-		if r.executors[owner.sessionID] != owner || owner.idleLease != lease || owner.run != nil || owner.admission != nil || owner.invalid {
-			r.mu.Unlock()
-			return
-		}
-		owner.invalid = true
-		owner.closeReason = "idle_expired"
-		r.shutdownWG.Add(1)
+	owner.timer = time.AfterFunc(r.idleTimeout, func() { r.expireIdleExecutor(owner, lease) })
+}
+
+// expireIdleExecutor closes owner only while lease is its current idle lease.
+func (r *Router) expireIdleExecutor(owner *executorState, lease uint64) {
+	r.mu.Lock()
+	if r.executors[owner.sessionID] != owner || owner.idleLease != lease || owner.run != nil || owner.admission != nil || owner.invalid {
 		r.mu.Unlock()
-		defer r.shutdownWG.Done()
-		_ = r.closeExecutor(owner)
-	})
+		return
+	}
+	owner.invalid = true
+	owner.closeReason = "idle_expired"
+	r.shutdownWG.Add(1)
+	r.mu.Unlock()
+	defer r.shutdownWG.Done()
+	_ = r.closeExecutor(owner)
 }
 
 // Close failures keep the exact owner; a later call retries only settled failures.
diff --git a/apps/daemon/internal/dispatch/executor_test.go b/apps/daemon/internal/dispatch/executor_test.go
index 55686fd2a..211c2201d 100644
--- a/apps/daemon/internal/dispatch/executor_test.go
+++ b/apps/daemon/internal/dispatch/executor_test.go
@@ -69,17 +69,27 @@ func (t *reusableTurn) AwaitSettlement(ctx context.Context) (agent.TurnSettlemen
 	}
 }
 
+// noEnvironmentPreparation prepares config for session without an execution environment.
+func noEnvironmentPreparation(session string, config proto.PromptRequestPayload) proto.ExecutionPreparePayload {
+	config.AgentStateKey, config.DisableExecutionEnvironment = "agents-api-"+session, true
+	return proto.ExecutionPreparePayload{SessionID: session, Configuration: config}
+}
 func executorRequest() proto.ExecutionPreparePayload {
-	return proto.ExecutionPreparePayload{SessionID: "session", Configuration: proto.PromptRequestPayload{AgentKind: "reusable", AgentStateKey: "agents-api-session", DisableExecutionEnvironment: true}}
+	return noEnvironmentPreparation("session", proto.PromptRequestPayload{AgentKind: "reusable"})
+}
+
+// registerExecutorKind registers info for prepared execution only.
+func registerExecutorKind(reg *agent.Registry, info proto.SupportedAgentKind, factory agent.ExecutorFactory) {
+	reg.RegisterKind(info, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
+		return nil, errors.New("prepared execution must not use the direct Session factory")
+	})
+	reg.RegisterExecutor(info.Kind, factory)
 }
 func executorRouter(t *testing.T, owner *reusableExecutor, idle time.Duration) (*dispatch.Router, *recSender, *atomic.Int32) {
 	t.Helper()
 	calls := &atomic.Int32{}
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "reusable", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		return nil, errors.New("ordinary factory is forbidden")
-	})
-	reg.RegisterExecutor("reusable", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
+	registerExecutorKind(reg, proto.SupportedAgentKind{Kind: "reusable", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 		calls.Add(1)
 		return owner, nil
 	})
diff --git a/apps/daemon/internal/dispatch/export_test.go b/apps/daemon/internal/dispatch/export_test.go
index 4c5e2a361..05d7011d7 100644
--- a/apps/daemon/internal/dispatch/export_test.go
+++ b/apps/daemon/internal/dispatch/export_test.go
@@ -36,3 +36,11 @@ func (r *Router) SteeringClosedForTest(runID string) bool {
 	state := r.sessions[runID]
 	return state != nil && state.steeringClosed
 }
+
+// RunStartedForTest reports whether runID's Turn accepts operations.
+func (r *Router) RunStartedForTest(runID string) bool {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	state := r.sessions[runID]
+	return state != nil && state.session != nil
+}
diff --git a/apps/daemon/internal/dispatch/functions_native_test.go b/apps/daemon/internal/dispatch/functions_native_test.go
index f541a43a8..f8fe3879b 100644
--- a/apps/daemon/internal/dispatch/functions_native_test.go
+++ b/apps/daemon/internal/dispatch/functions_native_test.go
@@ -1,7 +1,5 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"encoding/json"
@@ -110,13 +108,8 @@ func TestNativeFunctionBridge(t *testing.T) {
 	}))
 	defer model.Close()
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{FunctionTools: proto.CapabilitySupported, EnvironmentNone: proto.CapabilitySupported})}, harnessconfig.Configuration{}, codex.Factory)
+	registerExecutorKind(reg, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{FunctionTools: proto.CapabilitySupported, EnvironmentNone: proto.CapabilitySupported})}, codex.NewExecutorFactory())
 	sender := make(nativeFunctionSender, 256)
-	router, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer router.Shutdown(context.Background())
 	ctx, cancel := context.WithTimeout(t.Context(), 60*time.Second)
 	defer cancel()
 	await := func(kind string) proto.Envelope {
@@ -135,14 +128,48 @@ func TestNativeFunctionBridge(t *testing.T) {
 			}
 		}
 	}
+	awaitReady := func(id string) proto.PreparationStatusPayload {
+		t.Helper()
+		for {
+			env := await(proto.TypePreparationStatus)
+			var status proto.PreparationStatusPayload
+			if env.ID != id {
+				continue
+			}
+			if err := env.DecodePayload(&status); err != nil {
+				t.Fatal(env, err)
+			}
+			if status.State == "ready" {
+				return status
+			}
+			if status.State != "preparing" {
+				t.Fatalf("preparation %s: %+v", id, status)
+			}
+		}
+	}
 	nativeID := ""
-	for index := 0; index < 3; index++ {
+	// Each Run owns a fresh Router, so every resume starts a new native process.
+	run := func(index int) {
+		router, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender})
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer func() {
+			if err := router.Shutdown(ctx); err != nil {
+				t.Error(err)
+			}
+		}()
 		run := fmt.Sprintf("run-%d", index)
-		request := proto.PromptRequestPayload{AgentKind: "codex", Input: proto.TextInput("Look up ticket 42."), RunID: run, AgentStateKey: "native-functions", AgentSessionID: nativeID, ReleaseOnCompletion: true, DisableExecutionEnvironment: true,
+		request := noEnvironmentPreparation("native-functions", proto.PromptRequestPayload{AgentKind: "codex", AgentSessionID: nativeID,
 			FunctionTools: []proto.FunctionTool{{Name: "lookup_ticket", Description: "Read a synthetic ticket", Parameters: json.RawMessage(`{"type":"object","properties":{"ticket":{"type":"string"}},"required":["ticket"],"additionalProperties":false}`)}},
-			AgentOptions:  map[string]any{"model": "gpt-5.5", "model_provider": map[string]any{"protocol": "responses", "base_url": model.URL + "/v1", "api_key": "synthetic-local-token"}}}
-		env, _ := proto.NewEnvelope(proto.TypePromptRequest, run, request)
-		if err := router.Handle(ctx, env); err != nil {
+			AgentOptions:  map[string]any{"model": "gpt-5.5", "model_provider": map[string]any{"protocol": "responses", "base_url": model.URL + "/v1", "api_key": "synthetic-local-token"}}})
+		prepare, _ := proto.NewEnvelope(proto.TypeExecutionPrepare, run, request)
+		if err := router.Handle(ctx, prepare); err != nil {
+			t.Fatal(err)
+		}
+		ready := awaitReady(run)
+		start, _ := proto.NewEnvelope(proto.TypeExecutionStart, run, proto.ExecutionStartPayload{Handle: ready.Handle, ExecutorID: ready.ExecutorID, RunID: run, Input: proto.TextInput("Look up ticket 42.")})
+		if err := router.Handle(ctx, start); err != nil {
 			t.Fatal(err)
 		}
 		call := await(proto.TypeFunctionCall)
@@ -169,7 +196,7 @@ func TestNativeFunctionBridge(t *testing.T) {
 			if receipt.Applied || receipt.ErrorCode != "not_pending" {
 				t.Fatal(receipt)
 			}
-			break
+			return
 		}
 		result, _ := proto.NewEnvelope(proto.TypeFunctionResult, run, proto.FunctionResultPayload{CallID: payload.CallID, Success: index == 0, Content: functionResultContent("TICKET-RESULT"), DeliveryID: "result"})
 		if err := router.Handle(ctx, result); err != nil {
@@ -190,5 +217,8 @@ func TestNativeFunctionBridge(t *testing.T) {
 		}
 		nativeID = id
 	}
+	for index := range 3 {
+		run(index)
+	}
 	t.Logf("Native function success/failure, fresh-process resume, cancellation and late-result rejection passed; evidence %s", home)
 }
diff --git a/apps/daemon/internal/dispatch/functions_test.go b/apps/daemon/internal/dispatch/functions_test.go
index 59be84409..db0bc5d56 100644
--- a/apps/daemon/internal/dispatch/functions_test.go
+++ b/apps/daemon/internal/dispatch/functions_test.go
@@ -1,16 +1,17 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"bytes"
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"image"
 	"image/color"
 	"image/png"
 	"sync"
+	"sync/atomic"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
@@ -38,21 +39,18 @@ func TestFunctionReceiptsScopeRetriesAndConflicts(t *testing.T) {
 	reg := agent.NewRegistry()
 	sender := &recSender{}
 	sessions := map[string]*functionSession{}
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "function-test", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{FunctionTools: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, p proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		s := &functionSession{fakeSession: &fakeSession{out: out, ctx: ctx, closeOutOnCancel: true}}
-		sessions[p.RunID] = s
+	registerExecutorKind(reg, proto.SupportedAgentKind{Kind: "function-test", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, runID string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
+		s := &functionSession{fakeSession: &fakeSession{out: out, closeOutOnCancel: true}}
+		sessions[runID] = s
 		return s, nil
-	})
+	}))
 	router, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender})
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer router.Shutdown(context.Background())
 	for _, id := range []string{"one", "two"} {
-		env, _ := proto.NewEnvelope(proto.TypePromptRequest, id, proto.PromptRequestPayload{AgentKind: "function-test", Input: proto.TextInput("lookup"), FunctionTools: []proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{}`)}}})
-		if err := router.Handle(t.Context(), env); err != nil {
-			t.Fatal(err)
-		}
+		startRun(t, router, sender, id, proto.PromptRequestPayload{AgentKind: "function-test", FunctionTools: []proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{}`)}}})
 	}
 	submit := func(run, call, text, delivery string) proto.InteractionDecisionAckPayload {
 		t.Helper()
@@ -137,17 +135,20 @@ func TestFunctionReceiptsScopeRetriesAndConflicts(t *testing.T) {
 
 func TestFunctionToolsRequireAdvertisedSupport(t *testing.T) {
 	reg := agent.NewRegistry()
-	called := false
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "unsupported", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		called = true
-		return nil, nil
+	var called atomic.Bool
+	registerExecutorKind(reg, proto.SupportedAgentKind{Kind: "unsupported", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
+		called.Store(true)
+		return nil, errors.New("unexpected executor preparation")
 	})
 	sender := &recSender{}
 	router, _ := dispatch.New(dispatch.Config{Registry: reg, Sender: sender})
 	defer router.Shutdown(context.Background())
-	env, _ := proto.NewEnvelope(proto.TypePromptRequest, "run", proto.PromptRequestPayload{AgentKind: "unsupported", FunctionTools: []proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{}`)}}})
-	if err := router.Handle(t.Context(), env); err == nil || called {
-		t.Fatal("unsupported engine silently ignored tools", err)
+	env, _ := proto.NewEnvelope(proto.TypeExecutionPrepare, "run", noEnvironmentPreparation("session", proto.PromptRequestPayload{AgentKind: "unsupported", FunctionTools: []proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{}`)}}}))
+	if err := router.Handle(t.Context(), env); err == nil {
+		t.Fatal("unsupported engine silently ignored tools")
+	}
+	if status := waitPreparationStatus(t, sender, "run", "rejected", ""); status.ErrorCode != "unsupported_configuration" || called.Load() {
+		t.Fatalf("status=%+v executor called=%t", status, called.Load())
 	}
 }
 
@@ -165,17 +166,22 @@ func functionResultContent(text string) []proto.InputContent {
 
 func TestDiscoveryCannotReachAnEagerOnlyAdapter(t *testing.T) {
 	reg := agent.NewRegistry()
-	called := false
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "eager-only", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{FunctionTools: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		called = true
-		return nil, nil
+	var called atomic.Bool
+	registerExecutorKind(reg, proto.SupportedAgentKind{Kind: "eager-only", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported})}, func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
+		called.Store(true)
+		return nil, errors.New("unexpected executor preparation")
 	})
-	router, _ := dispatch.New(dispatch.Config{Registry: reg, Sender: &recSender{}})
+	sender := &recSender{}
+	router, _ := dispatch.New(dispatch.Config{Registry: reg, Sender: sender})
 	defer router.Shutdown(context.Background())
 	for _, search := range []bool{false, true} {
-		env, _ := proto.NewEnvelope(proto.TypePromptRequest, "discovery", proto.PromptRequestPayload{AgentKind: "eager-only", ToolSearch: search, FunctionTools: []proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{"type":"object"}`), DeferLoading: true}}})
-		if err := router.Handle(t.Context(), env); err == nil || called {
-			t.Fatal("deferred definitions reached an eager-only adapter", err)
+		id := fmt.Sprint("discovery-", search)
+		env, _ := proto.NewEnvelope(proto.TypeExecutionPrepare, id, noEnvironmentPreparation("session", proto.PromptRequestPayload{AgentKind: "eager-only", ToolSearch: search, FunctionTools: []proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{"type":"object"}`), DeferLoading: true}}}))
+		if err := router.Handle(t.Context(), env); err == nil {
+			t.Fatal("deferred definitions reached an eager-only adapter")
+		}
+		if status := waitPreparationStatus(t, sender, id, "rejected", ""); status.ErrorCode != "unsupported_configuration" || called.Load() {
+			t.Fatalf("status=%+v executor called=%t", status, called.Load())
 		}
 	}
 }
diff --git a/apps/daemon/internal/dispatch/interaction_decisions.go b/apps/daemon/internal/dispatch/interaction_decisions.go
index 77ed0fd8c..1c4c4abb7 100644
--- a/apps/daemon/internal/dispatch/interaction_decisions.go
+++ b/apps/daemon/internal/dispatch/interaction_decisions.go
@@ -101,7 +101,7 @@ func (r *Router) dropPermission(s *sessionState, permissionID string) {
 // those entries linger until cleanupSession — acceptable because they
 // can't double-fire (the session's own pendingAskTable.Take already
 // guards that); cleanupSession removes the routing entry when the run
-// stream closes, even if the underlying CLI remains in the idle pool.
+// stream closes.
 func (r *Router) handlePromptForUserChoiceDecision(ctx context.Context, env proto.Envelope) error {
 	if env.ID == "" {
 		return errors.New("dispatch: prompt_for_user_choice_decision missing ask id (Envelope.ID empty)")
diff --git a/apps/daemon/internal/dispatch/local_directory_test.go b/apps/daemon/internal/dispatch/local_directory_test.go
index d06af72aa..3f1692b07 100644
--- a/apps/daemon/internal/dispatch/local_directory_test.go
+++ b/apps/daemon/internal/dispatch/local_directory_test.go
@@ -43,7 +43,7 @@ func TestLocalDirectoryPreparationNeedsNoHarnessAndRejectsOtherOwners(t *testing
 		t.Fatal(err)
 	}
 	t.Cleanup(func() { _ = r.Shutdown(context.Background()) })
-	request := proto.PromptRequestPayload{AgentKind: "native", LocalEnvironment: &proto.LocalEnvironment{ID: environment}, AgentStateKey: "agents-api-" + session, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
+	request := proto.PromptRequestPayload{AgentKind: "native", LocalEnvironment: &proto.LocalEnvironment{ID: environment}, AgentStateKey: "agents-api-" + session, WorkspaceReadOnly: true}
 	if err := r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "idle", proto.ExecutionPreparePayload{Configuration: request})); err != nil {
 		t.Fatal(err)
 	}
@@ -123,7 +123,7 @@ func TestLocalDirectoryKeepsNotDirectorySeparateFromFailures(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Cleanup(func() { _ = r.Shutdown(context.Background()) })
-	request := proto.PromptRequestPayload{AgentKind: "native", LocalEnvironment: &proto.LocalEnvironment{ID: environment}, AgentStateKey: "agents-api-" + session, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
+	request := proto.PromptRequestPayload{AgentKind: "native", LocalEnvironment: &proto.LocalEnvironment{ID: environment}, AgentStateKey: "agents-api-" + session, WorkspaceReadOnly: true}
 	if err := r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "idle", proto.ExecutionPreparePayload{Configuration: request})); err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/dispatch/mcp_http_test.go b/apps/daemon/internal/dispatch/mcp_http_test.go
index 45ae2fe80..794b596ec 100644
--- a/apps/daemon/internal/dispatch/mcp_http_test.go
+++ b/apps/daemon/internal/dispatch/mcp_http_test.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"strings"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -16,33 +17,38 @@ import (
 )
 
 func TestMCPHTTPBearerRejectsUnsupportedRequestsBeforeFactory(t *testing.T) {
-	for _, mode := range []string{"supported", "claude", "claude old peer", "claude local", "no bearer capability", "no MCP capability", "unavailable", "no none capability", "local", "other engine", "HTTP", "credential-free", "product", "required", "required old peer", "optional old peer"} {
+	for _, mode := range []string{"supported", "claude", "claude old peer", "claude local", "no bearer capability", "no MCP capability", "unavailable", "no none capability", "local", "other engine", "HTTP", "credential-free", "no declaration", "required", "required old peer", "optional old peer"} {
 		t.Run(mode, func(t *testing.T) {
-			h := newHarness(t)
+			// Service-origin servers need a service execution host, never a local Environment.
+			var h *harness
+			prepare := noEnvironmentPreparation("mcp-bearer", proto.PromptRequestPayload{AgentKind: "codex"})
+			if strings.HasSuffix(mode, "local") {
+				h = localPreparationHarness(t)
+				prepare = preparationRequest()
+				prepare.Configuration.AgentKind = "codex"
+			} else {
+				h = newHarness(t)
+			}
 			defer h.router.Shutdown(context.Background())
 			token := "synthetic-private-token"
 			servers := []proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "tools", ServerURL: "https://tools.example/mcp", BearerToken: &token}}
-			req := proto.PromptRequestPayload{AgentKind: "codex", DisableExecutionEnvironment: true, MCPHTTPServers: &servers}
-			caps := prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, MCPHTTPTools: proto.CapabilitySupported, MCPHTTPBearerAuth: proto.CapabilitySupported})
+			req := &prepare.Configuration
+			req.MCPHTTPServers = &servers
+			caps := prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, LocalEnvironment: proto.CapabilitySupported, MCPHTTPTools: proto.CapabilitySupported, MCPHTTPBearerAuth: proto.CapabilitySupported})
 			switch mode {
 			case "claude", "claude old peer", "claude local":
 				req.AgentKind = "claude_sdk"
 				caps.MCPHTTPBearerAuth = proto.CapabilityFromBool(mode != "claude old peer")
-				if mode == "claude local" {
-					req.DisableExecutionEnvironment = false
-				}
 			case "required", "required old peer", "optional old peer":
 				servers[0].Required = mode != "optional old peer"
 				servers[0].BearerToken = nil
 				caps.MCPHTTPRequired = proto.CapabilityFromBool(mode == "required")
-			case "no bearer capability", "credential-free", "product":
+			case "no bearer capability", "credential-free", "no declaration":
 				caps.MCPHTTPBearerAuth = proto.CapabilityUnsupported
 			case "no MCP capability":
 				caps.MCPHTTPTools = proto.CapabilityUnsupported
 			case "no none capability":
 				caps.EnvironmentNone = proto.CapabilityUnsupported
-			case "local":
-				req.DisableExecutionEnvironment = false
 			case "other engine":
 				req.AgentKind = "other"
 			case "HTTP":
@@ -51,13 +57,13 @@ func TestMCPHTTPBearerRejectsUnsupportedRequestsBeforeFactory(t *testing.T) {
 			if mode == "credential-free" {
 				servers[0].BearerToken = nil
 			}
-			if mode == "product" {
-				req.MCPHTTPServers, req.DisableExecutionEnvironment = nil, false
+			if mode == "no declaration" {
+				req.MCPHTTPServers = nil
 			}
-			called := false
-			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: req.AgentKind, Available: mode != "unavailable", Capabilities: caps},
-				harnessconfig.Configuration{}, func(_ context.Context, got proto.PromptRequestPayload, _ chan<- proto.Envelope) (agent.Session, error) {
-					called = true
+			var called atomic.Bool
+			registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: req.AgentKind, Available: mode != "unavailable", Capabilities: caps},
+				func(_ context.Context, got proto.PromptRequestPayload) (agent.Executor, error) {
+					called.Store(true)
 					if mode == "required" && !(*got.MCPHTTPServers)[0].Required {
 						t.Error("required initialization lost before adapter")
 					}
@@ -66,14 +72,15 @@ func TestMCPHTTPBearerRejectsUnsupportedRequestsBeforeFactory(t *testing.T) {
 					}
 					return nil, errors.New("controlled factory stop")
 				})
-			err := h.router.Handle(t.Context(), mustEnv(t, proto.TypePromptRequest, "mcp-bearer", req))
-			if called != (mode == "supported" || mode == "claude" || mode == "other engine" || mode == "credential-free" || mode == "product" || mode == "required" || mode == "optional old peer") {
-				t.Fatal("wrong factory admission")
+			err := h.router.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "mcp-bearer", prepare))
+			admitted := mode == "supported" || mode == "claude" || mode == "other engine" || mode == "credential-free" || mode == "no declaration" || mode == "required" || mode == "optional old peer"
+			assertPreparationOutcome(t, h.sender, "mcp-bearer", admitted)
+			if called.Load() != admitted || (err == nil) != admitted {
+				t.Fatal("wrong factory admission", err)
 			}
-			frames := h.sender.snapshot()
-			raw, _ := json.Marshal(frames)
-			if err == nil || strings.Contains(err.Error(), token) || strings.Contains(string(raw), token) || len(frames) != 2 || frames[0].Type != proto.TypeError || frames[1].Type != proto.TypeDone {
-				t.Fatal("terminal rejection missing or exposed credential")
+			raw, _ := json.Marshal(h.sender.snapshot())
+			if err != nil && strings.Contains(err.Error(), token) || strings.Contains(string(raw), token) {
+				t.Fatal("terminal status exposed credential")
 			}
 		})
 	}
diff --git a/apps/daemon/internal/dispatch/optional_interactions_test.go b/apps/daemon/internal/dispatch/optional_interactions_test.go
index dc63be1eb..37d22eaae 100644
--- a/apps/daemon/internal/dispatch/optional_interactions_test.go
+++ b/apps/daemon/internal/dispatch/optional_interactions_test.go
@@ -1,7 +1,5 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"testing"
@@ -20,14 +18,12 @@ func TestOptionalInteractionResponders(t *testing.T) {
 			h := newHarness(t)
 			defer h.router.Shutdown(context.Background())
 			var output chan<- proto.Envelope
-			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "minimal", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, func(_ context.Context, _ proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+			registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "minimal", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 				output = out
 				s := &fakeSession{out: out, closeOutOnCancel: true}
 				return lifecycleOnly{Session: s}, nil
-			})
-			if err := h.router.Handle(t.Context(), mustEnv(t, proto.TypePromptRequest, "run", proto.PromptRequestPayload{AgentKind: "minimal"})); err != nil {
-				t.Fatal(err)
-			}
+			}))
+			startRun(t, h.router, h.sender, "run", proto.PromptRequestPayload{AgentKind: "minimal"})
 			event := mustEnv(t, proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{RequestID: "interaction", Tool: "fixture"})
 			decision := mustEnv(t, proto.TypePermissionDecision, "interaction", proto.PermissionDecisionPayload{DeliveryID: "decision", Approved: true})
 			if ask {
@@ -37,7 +33,7 @@ func TestOptionalInteractionResponders(t *testing.T) {
 			// An inconsistent adapter emitted an interaction it cannot answer: reject it,
 			// never acknowledge application or call a fabricated responder.
 			output <- event
-			waitFor(t, func() bool { return len(h.sender.snapshot()) > 0 }, "interaction indexed")
+			waitFor(t, func() bool { return hasFrame(h.sender, event.Type, "run") }, "interaction indexed")
 			if err := h.router.Handle(t.Context(), decision); err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/dispatch/output.go b/apps/daemon/internal/dispatch/output.go
deleted file mode 100644
index e0e96dca9..000000000
--- a/apps/daemon/internal/dispatch/output.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package dispatch
-
-import (
-	"context"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	obslog "github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
-)
-
-// pump forwards every Envelope the session writes onto out to the
-// upstream sender, then cleans up when the session closes out.
-func (r *Router) pump(s *sessionState) {
-	defer r.shutdownWG.Done()
-	defer r.cleanupSession(s)
-	_ = r.forwardSessionOutput(s, true)
-}
-
-// wait is false only after a failed Start and its cancellation have returned:
-// no Session owns the output sink, so only already queued frames can be read.
-func (r *Router) forwardSessionOutput(s *sessionState, wait bool) error {
-	// Logging-only ctx carrying the run's trace; sends use their own
-	// ctx tied to shutdownCh.
-	pumpCtx := context.Background()
-	if s.traceparent != "" {
-		if carrier, err := obslog.ParseTraceparent(s.traceparent); err == nil {
-			pumpCtx = obslog.WithTrace(pumpCtx, carrier)
-		}
-	}
-	r.log.InfoContext(pumpCtx, "pump: started", "run_id", s.runID)
-
-	// Long-lived send ctx — must keep forwarding even after the
-	// session's ctx is cancelled (session might emit a final "done"
-	// in response to cancel). Stops on out close or router shutdown.
-	for {
-		if !wait && len(s.out) == 0 {
-			return nil
-		}
-		select {
-		case env, ok := <-s.out:
-			if !ok {
-				r.log.InfoContext(pumpCtx, "pump: out channel closed", "run_id", s.runID)
-				return nil
-			}
-			if s.session != nil {
-				r.indexPermissionFrame(s, env)
-			}
-			if env.Type == proto.TypeDone && s.releaseOnCompletion {
-				if err := r.releaseCompletedSession(s); err != nil {
-					sendCtx, stop := r.shutdownContext(pumpCtx)
-					r.emitTerminalError(sendCtx, s.runID, "failed to release completed executor")
-					stop()
-					continue
-				}
-			}
-			r.log.InfoContext(pumpCtx, "pump: forwarding envelope", "run_id", s.runID, "type", env.Type, "env_id", env.ID)
-			// Stamp the run's trace onto outbound frames so the
-			// gateway attributes daemon-emitted lines to the same
-			// trace_id as the original prompt_request.
-			if env.Trace == "" && s.traceparent != "" {
-				env.Trace = s.traceparent
-			}
-			// Short-ish send ctx that respects router shutdown — if
-			// the transport is wedged we don't want to block forever.
-			sendCtx, cancel := context.WithCancel(context.Background())
-			stopOnShutdown := make(chan struct{})
-			go func() {
-				select {
-				case <-r.shutdownCh:
-					cancel()
-				case <-stopOnShutdown:
-				}
-			}()
-			err := r.sender.Send(sendCtx, env)
-			close(stopOnShutdown)
-			cancel()
-			if err != nil {
-				// Sender failed — log, ask the session to wind down,
-				// but KEEP draining out so the agent's goroutines
-				// don't block on a full channel.
-				r.log.ErrorContext(pumpCtx, "send envelope failed", "type", env.Type, "run_id", env.ID, "err", err)
-				r.mu.Lock()
-				s.retain = false
-				r.mu.Unlock()
-				s.ctxCancel()
-				if wait {
-					r.drain(s.out)
-				}
-				return err
-			}
-		case <-r.shutdownCh:
-			// Router shutdown — cancel + drain so the session's
-			// goroutines unblock and close out cleanly.
-			r.mu.Lock()
-			s.retain = false
-			r.mu.Unlock()
-			s.ctxCancel()
-			if wait {
-				r.drain(s.out)
-			}
-			return ErrRouterClosed
-		}
-	}
-}
diff --git a/apps/daemon/internal/dispatch/preparation.go b/apps/daemon/internal/dispatch/preparation.go
index 36695ab7a..e705953ee 100644
--- a/apps/daemon/internal/dispatch/preparation.go
+++ b/apps/daemon/internal/dispatch/preparation.go
@@ -31,7 +31,6 @@ type preparationState struct {
 	ctx               context.Context
 	cancel            context.CancelFunc
 	prepared          agent.Prepared
-	stateKey          string
 	environmentID     string
 	busy              bool
 	owns              bool
@@ -63,7 +62,7 @@ func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope)
 	if req, err = r.localWorkspace.Configure(req); err != nil {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
-	if req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" || req.EnvironmentID() == "" || strings.TrimSpace(req.AgentStateKey) == "" || !req.ReleaseOnCompletion {
+	if req.RunID != "" || len(req.Input) != 0 || req.EnvironmentID() == "" || strings.TrimSpace(req.AgentStateKey) == "" {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
 	if validateExecutionEnvironment(req, caps) != nil || (len(req.FunctionTools) > 0 && !caps.FunctionTools.IsSupported()) {
@@ -108,7 +107,7 @@ func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope)
 		return r.rejectPreparation(env, "preparation_capacity")
 	}
 	owner, cancel := context.WithCancel(context.WithoutCancel(ctx))
-	p := &preparationState{capabilities: caps, requestID: env.ID, trace: env.Trace, fingerprint: fingerprint, ctx: owner, cancel: cancel, stateKey: req.AgentStateKey, environmentID: req.EnvironmentID(), workspaceReadOnly: req.WorkspaceReadOnly, busy: true, owns: true, deadline: time.Now().Add(r.preparationTimeout)}
+	p := &preparationState{capabilities: caps, requestID: env.ID, trace: env.Trace, fingerprint: fingerprint, ctx: owner, cancel: cancel, environmentID: req.EnvironmentID(), workspaceReadOnly: req.WorkspaceReadOnly, busy: true, owns: true, deadline: time.Now().Add(r.preparationTimeout)}
 	p.status = proto.PreparationStatusPayload{Handle: uuid.NewString(), Revision: 1, State: "preparing", ExpiresAt: p.deadline.UnixMilli()}
 	r.preparations[p.status.Handle], r.preparationRequests[p.requestID] = p, p
 	p.timer = time.AfterFunc(r.preparationTimeout, func() { r.releasePreparation(p, "expired", "", true, true) })
diff --git a/apps/daemon/internal/dispatch/preparation_start.go b/apps/daemon/internal/dispatch/preparation_start.go
index fac37084c..af330553a 100644
--- a/apps/daemon/internal/dispatch/preparation_start.go
+++ b/apps/daemon/internal/dispatch/preparation_start.go
@@ -70,7 +70,7 @@ func (r *Router) handleExecutionStart(_ context.Context, env proto.Envelope) err
 	}
 	p.status.State, p.status.RunID, p.status.Revision = "starting", input.RunID, p.status.Revision+1
 	p.startFingerprint, p.busy = fingerprint, true
-	state := &sessionState{capabilities: p.capabilities, runID: input.RunID, stateKey: p.stateKey, environmentID: p.environmentID, out: make(chan proto.Envelope, 64), ctx: p.ctx, ctxCancel: p.cancel, pendingIDs: make(map[string]struct{}), pendingAsks: make(map[string]struct{}), traceparent: env.Trace}
+	state := &sessionState{capabilities: p.capabilities, runID: input.RunID, environmentID: p.environmentID, out: make(chan proto.Envelope, 64), ctx: p.ctx, pendingIDs: make(map[string]struct{}), pendingAsks: make(map[string]struct{}), traceparent: env.Trace}
 	state.preparedHandoff = newPreparedHandoff(p, owner.native)
 	p.handoff, owner.run = state.preparedHandoff, state
 	r.sessions[input.RunID] = state
diff --git a/apps/daemon/internal/dispatch/preparation_test.go b/apps/daemon/internal/dispatch/preparation_test.go
index 64f85b1bf..57312e3b2 100644
--- a/apps/daemon/internal/dispatch/preparation_test.go
+++ b/apps/daemon/internal/dispatch/preparation_test.go
@@ -113,7 +113,7 @@ func localPreparationHarness(t *testing.T) *harness {
 }
 
 func preparationRequest() proto.ExecutionPreparePayload {
-	return proto.ExecutionPreparePayload{SessionID: preparationSessionID, Configuration: proto.PromptRequestPayload{AgentKind: "prepared", AgentStateKey: "agents-api-" + preparationSessionID, ReleaseOnCompletion: true, LocalEnvironment: &proto.LocalEnvironment{ID: preparationEnvironmentID, NetworkAccess: "enabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}}}
+	return proto.ExecutionPreparePayload{SessionID: preparationSessionID, Configuration: proto.PromptRequestPayload{AgentKind: "prepared", AgentStateKey: "agents-api-" + preparationSessionID, LocalEnvironment: &proto.LocalEnvironment{ID: preparationEnvironmentID, NetworkAccess: "enabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}}}
 }
 
 func preparationRouter(t *testing.T, sender dispatch.Sender, timeout time.Duration, factory agent.PreparationFactory) *dispatch.Router {
@@ -369,9 +369,8 @@ func TestPreparationFailedReadyDeliveryAbandonsAdmission(t *testing.T) {
 
 func TestPreparationRejectsInputAndProductConfiguration(t *testing.T) {
 	for name, change := range map[string]func(*proto.PromptRequestPayload){
-		"run":          func(p *proto.PromptRequestPayload) { p.RunID = "run" },
-		"input":        func(p *proto.PromptRequestPayload) { p.Input = proto.TextInput("input") },
-		"conversation": func(p *proto.PromptRequestPayload) { p.ConversationID = "product" },
+		"run":   func(p *proto.PromptRequestPayload) { p.RunID = "run" },
+		"input": func(p *proto.PromptRequestPayload) { p.Input = proto.TextInput("input") },
 		"attachment": func(p *proto.PromptRequestPayload) {
 			p.Input = proto.MessageInput{{Content: []proto.InputContent{{Type: "input_image"}}}}
 		},
diff --git a/apps/daemon/internal/dispatch/prepared_handoff.go b/apps/daemon/internal/dispatch/prepared_handoff.go
index 8bdd11834..23377efe7 100644
--- a/apps/daemon/internal/dispatch/prepared_handoff.go
+++ b/apps/daemon/internal/dispatch/prepared_handoff.go
@@ -77,14 +77,11 @@ func newPreparedHandoff(p *preparationState, target agent.Executor) *preparedHan
 // preparedOperationLocked admits one mutation at the same linearization point
 // used by release. The returned function must run after the native call, replay
 // bookkeeping and receipt send have all finished. Router.mu must be held.
-func (r *Router) preparedOperationLocked(state *sessionState) (agent.Session, func(), bool) {
+func (r *Router) preparedOperationLocked(state *sessionState) (agent.Turn, func(), bool) {
 	if state == nil || state.session == nil || state.steeringClosed {
 		return nil, nil, false
 	}
 	handoff := state.preparedHandoff
-	if handoff == nil {
-		return state.session, func() {}, true
-	}
 	if handoff.release != nil {
 		return nil, nil, false
 	}
@@ -93,13 +90,7 @@ func (r *Router) preparedOperationLocked(state *sessionState) (agent.Session, fu
 }
 
 func (r *Router) interactionRouteOpenLocked(state *sessionState) bool {
-	if state == nil || r.closed || state.ctx.Err() != nil || state.steeringClosed {
-		return false
-	}
-	if handoff := state.preparedHandoff; handoff != nil {
-		return handoff.release == nil
-	}
-	return state.session != nil
+	return state != nil && !r.closed && state.ctx.Err() == nil && !state.steeringClosed && state.preparedHandoff.release == nil
 }
 
 // claimPreparedReleaseLocked closes admission permanently and returns the
@@ -111,7 +102,6 @@ func (r *Router) claimPreparedReleaseLocked(state *sessionState, abort bool, fai
 	if release == nil {
 		release = &preparedRelease{abort: make(chan struct{}), failure: failure, settled: make(chan struct{})}
 		handoff.release = release
-		state.retain = false
 		state.steeringClosed = true
 		state.session = nil
 		r.clearInteractionRoutesLocked(state)
diff --git a/apps/daemon/internal/dispatch/prompt.go b/apps/daemon/internal/dispatch/prompt.go
deleted file mode 100644
index 2a8d45908..000000000
--- a/apps/daemon/internal/dispatch/prompt.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package dispatch
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	obslog "github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
-)
-
-func (r *Router) handlePromptRequest(callerCtx context.Context, env proto.Envelope) error {
-	r.log.InfoContext(callerCtx, "handlePromptRequest: decoding payload", "env_id", env.ID, "env_type", env.Type)
-	var req proto.PromptRequestPayload
-	if err := env.DecodePayload(&req); err != nil {
-		r.log.ErrorContext(callerCtx, "handlePromptRequest: decode failed", "env_id", env.ID, "err", err)
-		return fmt.Errorf("dispatch: decode prompt_request: %w", err)
-	}
-	// Envelope.ID is the run id; payload mirrors it but envelope wins.
-	runID := env.ID
-	if runID == "" {
-		runID = req.RunID
-	}
-	if runID == "" {
-		r.log.ErrorContext(callerCtx, "handlePromptRequest: missing run id")
-		return errors.New("dispatch: prompt_request missing run id (Envelope.ID and Payload.RunID both empty)")
-	}
-	req.RunID = runID
-	var err error
-	if req, err = r.localWorkspace.Configure(req); err != nil {
-		r.emitTerminalError(callerCtx, runID, err.Error())
-		return err
-	}
-	if req.AgentKind == "" {
-		r.log.ErrorContext(callerCtx, "handlePromptRequest: missing agent_kind", "run_id", runID)
-		return errors.New("dispatch: prompt_request missing agent_kind")
-	}
-	if req.WorkspaceReadOnly {
-		err := errors.New("read-only preparation cannot accept a prompt")
-		r.emitTerminalError(callerCtx, runID, err.Error())
-		return err
-	}
-	caps, available := r.availableCapabilities(req.AgentKind)
-	if !available {
-		_, err := r.registry.Resolve(req.AgentKind)
-		if err == nil {
-			err = errors.New("engine is unavailable on this runtime")
-		}
-		r.emitTerminalError(callerCtx, runID, err.Error())
-		return err
-	}
-	if len(req.FunctionTools) > 0 && !caps.FunctionTools.IsSupported() {
-		err := errors.New("engine does not support function tools")
-		r.emitTerminalError(callerCtx, runID, err.Error())
-		return err
-	}
-	if err := validateExecutionEnvironment(req, caps); err != nil {
-		r.emitTerminalError(callerCtx, runID, err.Error())
-		return err
-	}
-	r.log.InfoContext(callerCtx, "handlePromptRequest: decoded",
-		"run_id", runID, "agent_kind", req.AgentKind,
-		"message_count", len(req.Input),
-		"has_agent_options", req.AgentOptions != nil,
-		"agent_session_id", req.AgentSessionID,
-		"agent_state_key", req.AgentStateKey)
-
-	factory, err := r.registry.Resolve(req.AgentKind)
-	if err != nil {
-		r.log.ErrorContext(callerCtx, "handlePromptRequest: registry.Resolve failed", "run_id", runID, "agent_kind", req.AgentKind, "err", err)
-		// Synthesize error+done so the server-side stream closes
-		// cleanly instead of waiting for a done that never comes.
-		r.emitTerminalError(callerCtx, runID, fmt.Sprintf("unsupported agent_kind %q on this daemon", req.AgentKind))
-		return err
-	}
-	r.log.InfoContext(callerCtx, "handlePromptRequest: factory resolved", "run_id", runID, "agent_kind", req.AgentKind)
-
-	// Lock-protect duplicate-run check + insert so two prompt_requests
-	// with the same RunID can't both start sessions.
-	r.mu.Lock()
-	if r.closed {
-		r.mu.Unlock()
-		r.log.ErrorContext(callerCtx, "handlePromptRequest: router closed", "run_id", runID)
-		return ErrRouterClosed
-	}
-	if r.runtimePreparation != nil || r.workspaceWrite != nil || r.workspaceExport != nil {
-		r.mu.Unlock()
-		err := errors.New("local workspace has an unsettled write")
-		r.emitTerminalError(callerCtx, runID, err.Error())
-		return err
-	}
-	if _, dup := r.sessions[runID]; dup {
-		r.mu.Unlock()
-		r.log.WarnContext(callerCtx, "ignoring duplicate prompt_request", "run_id", runID)
-		return nil
-	}
-	stateKey := sessionStateKey(req)
-	r.touchIdleLocked(stateKey)
-	sessionCtx, sessionCancel := context.WithCancel(context.Background())
-	// Re-attach the inbound trace so every log under this run shows
-	// the same trace_id as the prompt_request that started it.
-	if carrier, ok := obslog.TraceFromContext(callerCtx); ok {
-		sessionCtx = obslog.WithTrace(sessionCtx, carrier)
-	}
-	out := make(chan proto.Envelope, 64)
-	state := &sessionState{
-		runID:               runID,
-		capabilities:        caps,
-		environmentID:       req.EnvironmentID(),
-		stateKey:            stateKey,
-		out:                 out,
-		ctx:                 sessionCtx,
-		ctxCancel:           sessionCancel,
-		pendingIDs:          make(map[string]struct{}),
-		pendingAsks:         make(map[string]struct{}),
-		traceparent:         env.Trace,
-		retain:              stateKey != "",
-		releaseOnCompletion: req.ReleaseOnCompletion,
-	}
-	r.sessions[runID] = state
-	r.mu.Unlock()
-
-	r.log.InfoContext(callerCtx, "handlePromptRequest: calling factory", "run_id", runID)
-	req, err = r.localWorkspace.Prepare(sessionCtx, req)
-	var sess agent.Session
-	if err == nil {
-		sess, err = factory(sessionCtx, req, out)
-	}
-	if err != nil {
-		r.log.ErrorContext(callerCtx, "handlePromptRequest: factory call failed", "run_id", runID, "agent_kind", req.AgentKind, "err", err)
-		// Roll back the registration, cancel ctx, surface error+done
-		// so the server doesn't hang on a phantom run.
-		r.mu.Lock()
-		delete(r.sessions, runID)
-		r.mu.Unlock()
-		sessionCancel()
-		r.emitTerminalError(callerCtx, runID, fmt.Sprintf("agent factory failed: %v", err))
-		return fmt.Errorf("dispatch: factory %q: %w", req.AgentKind, err)
-	}
-	r.log.InfoContext(callerCtx, "handlePromptRequest: session created, starting pump", "run_id", runID)
-	r.mu.Lock()
-	state.session = sess
-	r.mu.Unlock()
-
-	r.shutdownWG.Add(1)
-	go r.pump(state)
-	return nil
-}
diff --git a/apps/daemon/internal/dispatch/receipt_order_test.go b/apps/daemon/internal/dispatch/receipt_order_test.go
index 8fb22b4c4..898889a4b 100644
--- a/apps/daemon/internal/dispatch/receipt_order_test.go
+++ b/apps/daemon/internal/dispatch/receipt_order_test.go
@@ -1,7 +1,5 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"errors"
@@ -52,7 +50,7 @@ func TestDurableCompletionWaitsForSteeringReceiptSend(t *testing.T) {
 			registry := agent.NewRegistry()
 			var session *fakeSession
 			var calls atomic.Int32
-			registry.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+			registerExecutorKind(registry, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 				session = &fakeSession{out: out, closeOutOnCancel: true}
 				return &steeringSession{fakeSession: session, steer: func(context.Context, proto.PromptSteerPayload) error {
 					calls.Add(1)
@@ -61,7 +59,7 @@ func TestDurableCompletionWaitsForSteeringReceiptSend(t *testing.T) {
 					}
 					return nil
 				}}, nil
-			})
+			}))
 			router, err := dispatch.New(dispatch.Config{Registry: registry, Sender: sender})
 			if err != nil {
 				t.Fatal(err)
@@ -75,18 +73,20 @@ func TestDurableCompletionWaitsForSteeringReceiptSend(t *testing.T) {
 					t.Fatal(err)
 				}
 			}
-			handle(proto.TypePromptRequest, proto.PromptRequestPayload{AgentKind: "codex", AgentStateKey: "stable", ReleaseOnCompletion: true})
+			startRun(t, router, &sender.recSender, "ordered", proto.PromptRequestPayload{AgentKind: "codex"})
+			base := len(sender.snapshot())
 			input := proto.PromptSteerPayload{InputID: "input-1", Input: proto.TextInput("original")}
 			handle(proto.TypePromptSteer, input)
 			<-sender.entered
 			session.out <- mustEnv(t, proto.TypeDone, "ordered", proto.DonePayload{Content: "finished"})
 			waitFor(t, func() bool { return router.SteeringClosedForTest("ordered") }, "closed steering admission")
-			if session.cancels() != 0 || len(sender.snapshot()) != 0 {
-				t.Fatal("native release or Done overtook receipt")
+			// Native settlement precedes the receipt join; TestPreparedHandoffReleaseWaitsForMutationReceipt asserts that order.
+			if len(sender.snapshot()) != base {
+				t.Fatal("Done overtook receipt")
 			}
 			if mode != "send_failure" {
 				handle(proto.TypePromptSteer, input)
-				frames := sender.snapshot()
+				frames := sender.snapshot()[base:]
 				var ack proto.PromptSteerAckPayload
 				if len(frames) != 1 || frames[0].DecodePayload(&ack) != nil || ack.Accepted != (mode == "consumed") {
 					t.Fatalf("cached receipt lost: %+v", ack)
@@ -98,7 +98,7 @@ func TestDurableCompletionWaitsForSteeringReceiptSend(t *testing.T) {
 				handle(proto.TypePromptSteer, input)
 				input.InputID = "new"
 				handle(proto.TypePromptSteer, input)
-				frames = sender.snapshot()
+				frames = sender.snapshot()[base:]
 				for i, want := range []string{"input_conflict", "run_inactive"} {
 					if frames[i+1].DecodePayload(&ack) != nil || ack.ErrorCode != want {
 						t.Fatalf("receipt %d: %+v", i, ack)
@@ -106,8 +106,8 @@ func TestDurableCompletionWaitsForSteeringReceiptSend(t *testing.T) {
 				}
 			}
 			release.Do(func() { close(sender.release) })
-			waitFor(t, func() bool { return router.ActiveRuns() == 0 }, "durable completion")
-			frames := sender.snapshot()
+			waitFor(t, func() bool { return hasFrame(&sender.recSender, proto.TypeDone, "ordered") }, "durable completion")
+			frames := sender.snapshot()[base:]
 			if len(frames) == 0 || frames[len(frames)-1].Type != proto.TypeDone || calls.Load() != 1 || session.cancels() != 1 {
 				t.Fatalf("invalid terminal order/calls: %+v, calls=%d cancels=%d", frames, calls.Load(), session.cancels())
 			}
@@ -118,14 +118,14 @@ func TestDurableCompletionWaitsForSteeringReceiptSend(t *testing.T) {
 	}
 }
 
-func TestShutdownReleasesSteeringWorkerAndCompletionBarrier(t *testing.T) {
+func TestShutdownReleasesSteeringWorkerAndReceiptJoin(t *testing.T) {
 	for _, phase := range []string{"native", "receipt_send"} {
 		t.Run(phase, func(t *testing.T) {
 			sender := &blockedReceiptSender{entered: make(chan struct{}), release: make(chan struct{}), exited: make(chan struct{})}
 			registry := agent.NewRegistry()
 			entered, exited := make(chan struct{}), make(chan struct{})
 			var session *fakeSession
-			registry.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+			registerExecutorKind(registry, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 				session = &fakeSession{out: out, closeOutOnCancel: true}
 				return &steeringSession{fakeSession: session, steer: func(ctx context.Context, _ proto.PromptSteerPayload) error {
 					close(entered)
@@ -136,15 +136,13 @@ func TestShutdownReleasesSteeringWorkerAndCompletionBarrier(t *testing.T) {
 					}
 					return nil
 				}}, nil
-			})
+			}))
 			router, err := dispatch.New(dispatch.Config{Registry: registry, Sender: sender})
 			if err != nil {
 				t.Fatal(err)
 			}
 			defer router.Shutdown(context.Background())
-			if err = router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, "shutdown", proto.PromptRequestPayload{AgentKind: "codex", ReleaseOnCompletion: true})); err != nil {
-				t.Fatal(err)
-			}
+			startRun(t, router, &sender.recSender, "shutdown", proto.PromptRequestPayload{AgentKind: "codex"})
 			if err = router.Handle(context.Background(), mustEnv(t, proto.TypePromptSteer, "shutdown", proto.PromptSteerPayload{InputID: "one", Input: proto.TextInput("text")})); err != nil {
 				t.Fatal(err)
 			}
@@ -152,7 +150,7 @@ func TestShutdownReleasesSteeringWorkerAndCompletionBarrier(t *testing.T) {
 			if phase == "receipt_send" {
 				<-sender.entered
 				session.out <- mustEnv(t, proto.TypeDone, "shutdown", proto.DonePayload{})
-				waitFor(t, func() bool { return router.SteeringClosedForTest("shutdown") }, "completion barrier")
+				waitFor(t, func() bool { return router.SteeringClosedForTest("shutdown") }, "receipt join")
 			}
 			ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 			defer cancel()
diff --git a/apps/daemon/internal/dispatch/receipt_shutdown_test.go b/apps/daemon/internal/dispatch/receipt_shutdown_test.go
index 4455f59ac..e736bf867 100644
--- a/apps/daemon/internal/dispatch/receipt_shutdown_test.go
+++ b/apps/daemon/internal/dispatch/receipt_shutdown_test.go
@@ -1,7 +1,5 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"errors"
@@ -47,23 +45,21 @@ func TestShutdownCancelsCompletionErrorSend(t *testing.T) {
 	sender := &shutdownAllSendsBlockSender{entered: make(chan struct{}), terminal: make(chan context.Context, 1), rescue: make(chan struct{})}
 	registry := agent.NewRegistry()
 	var session *fakeSession
-	registry.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+	registerExecutorKind(registry, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 		session = &fakeSession{out: out, closeOutOnCancel: true}
 		return &steeringSession{fakeSession: session, steer: func(context.Context, proto.PromptSteerPayload) error { return nil }}, nil
-	})
+	}))
 	router, err := dispatch.New(dispatch.Config{Registry: registry, Sender: sender})
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err = router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, "shutdown-terminal", proto.PromptRequestPayload{AgentKind: "codex", ReleaseOnCompletion: true})); err != nil {
-		t.Fatal(err)
-	}
+	startRun(t, router, &sender.recSender, "shutdown-terminal", proto.PromptRequestPayload{AgentKind: "codex"})
 	if err = router.Handle(context.Background(), mustEnv(t, proto.TypePromptSteer, "shutdown-terminal", proto.PromptSteerPayload{InputID: "one", Input: proto.TextInput("text")})); err != nil {
 		t.Fatal(err)
 	}
 	<-sender.entered
 	session.out <- mustEnv(t, proto.TypeDone, "shutdown-terminal", proto.DonePayload{})
-	waitFor(t, func() bool { return router.SteeringClosedForTest("shutdown-terminal") }, "completion barrier")
+	waitFor(t, func() bool { return router.SteeringClosedForTest("shutdown-terminal") }, "receipt join")
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	shutdownErr := router.Shutdown(ctx)
diff --git a/apps/daemon/internal/dispatch/router.go b/apps/daemon/internal/dispatch/router.go
index 90610b186..ae283d321 100644
--- a/apps/daemon/internal/dispatch/router.go
+++ b/apps/daemon/internal/dispatch/router.go
@@ -1,6 +1,6 @@
 // Package dispatch wires inbound WebSocket frames to the agent layer.
-// It owns one Session per active RunID, a per-session pump goroutine
-// that forwards the agent's events to the transport, and a
+// It owns one Turn per active RunID, a per-Turn output goroutine that
+// forwards the agent's events to the transport, and a
 // permission_id → run_id index so permission_decision frames route
 // back to the right session.
 //
@@ -38,9 +38,8 @@ type Router struct {
 	suspension          *proto.EnvironmentSuspendPayload
 	mu                  sync.Mutex
 	sessions            map[string]*sessionState // RunID → state
-	idle                map[string]map[*sessionState]struct{}
-	permIndex           map[string]string // permID  → RunID
-	askIndex            map[string]string // askID   → RunID
+	permIndex           map[string]string        // permID  → RunID
+	askIndex            map[string]string        // askID   → RunID
 	applied             map[string]appliedInteractionDecision
 	shutdownAttempt     *shutdownAttempt
 	shutdownCh          chan struct{} // closed by Shutdown
@@ -66,31 +65,24 @@ type appliedInteractionDecision struct {
 }
 
 // sessionState is the dispatcher's per-run bookkeeping. The agent
-// owns the close of out; the dispatcher cancels ctxCancel to wind
-// down. traceparent captures the prompt_request's W3C trace so every
-// outbound frame stamps env.Trace with the same value, completing
+// owns the close of out; preparedHandoff owns release. traceparent
+// captures the execution_start's W3C trace so every outbound frame
+// stamps env.Trace with the same value, completing
 // frontend → server → daemon → agent → server attribution.
 type sessionState struct {
-	capabilities        proto.AgentKindCapabilities
-	runID               string
-	environmentID       string
-	stateKey            string
-	session             agent.Session
-	out                 chan proto.Envelope
-	ctx                 context.Context
-	ctxCancel           context.CancelFunc
-	pendingIDs          map[string]struct{}
-	pendingAsks         map[string]struct{}
-	traceparent         string
-	idleTimer           *time.Timer
-	idleLease           uint64
-	retain              bool
-	releaseOnCompletion bool
-	steering            map[string]steeringReceipt
-	steerBusy           bool
-	steeringClosed      bool
-	steeringDone        chan struct{}
-	preparedHandoff     *preparedHandoff
+	capabilities    proto.AgentKindCapabilities
+	runID           string
+	environmentID   string
+	session         agent.Turn
+	out             chan proto.Envelope
+	ctx             context.Context
+	pendingIDs      map[string]struct{}
+	pendingAsks     map[string]struct{}
+	traceparent     string
+	steering        map[string]steeringReceipt
+	steerBusy       bool
+	steeringClosed  bool
+	preparedHandoff *preparedHandoff
 }
 
 // Config is the constructor input. Registry and Sender are required;
@@ -132,7 +124,6 @@ func New(cfg Config) (*Router, error) {
 		sender:              cfg.Sender,
 		log:                 log,
 		sessions:            make(map[string]*sessionState),
-		idle:                make(map[string]map[*sessionState]struct{}),
 		permIndex:           make(map[string]string),
 		askIndex:            make(map[string]string),
 		applied:             make(map[string]appliedInteractionDecision),
@@ -183,8 +174,6 @@ func (r *Router) Handle(ctx context.Context, env proto.Envelope) error {
 		return r.handleExecutionStart(ctx, env)
 	case proto.TypeExecutionRelease:
 		return r.handleExecutionRelease(ctx, env)
-	case proto.TypePromptRequest:
-		return r.handlePromptRequest(ctx, env)
 	case proto.TypePromptCancel:
 		return r.handlePromptCancel(ctx, env)
 	case proto.TypeFunctionResult:
@@ -237,8 +226,8 @@ func (r *Router) drain(ch <-chan proto.Envelope) {
 	}
 }
 
-// cleanupSession removes the session from registry maps. Called from
-// pump's defer so it runs exactly once.
+// cleanupSession removes the session from registry maps. Called once
+// when its prepared release settles.
 func (r *Router) cleanupSession(s *sessionState) {
 	r.mu.Lock()
 	delete(r.sessions, s.runID)
@@ -248,84 +237,5 @@ func (r *Router) cleanupSession(s *sessionState) {
 	for askID := range s.pendingAsks {
 		delete(r.askIndex, askID)
 	}
-	if !s.retain || s.session == nil || s.stateKey == "" || r.closed {
-		r.mu.Unlock()
-		return
-	}
-	states := r.idle[s.stateKey]
-	if states == nil {
-		states = make(map[*sessionState]struct{})
-		r.idle[s.stateKey] = states
-	}
-	states[s] = struct{}{}
-	r.scheduleIdleLocked(s)
-	r.mu.Unlock()
-}
-
-func sessionStateKey(req proto.PromptRequestPayload) string {
-	return req.AgentStateKey
-}
-
-func (r *Router) touchIdleLocked(stateKey string) {
-	if stateKey == "" {
-		return
-	}
-	for state := range r.idle[stateKey] {
-		r.scheduleIdleLocked(state)
-	}
-}
-
-func (r *Router) scheduleIdleLocked(state *sessionState) {
-	if state.idleTimer != nil {
-		state.idleTimer.Stop()
-	}
-	state.idleLease++
-	lease := state.idleLease
-	state.idleTimer = time.AfterFunc(r.idleTimeout, func() {
-		r.expireIdle(state, lease)
-	})
-}
-
-func (r *Router) expireIdle(state *sessionState, lease uint64) {
-	r.mu.Lock()
-	states := r.idle[state.stateKey]
-	if _, ok := states[state]; !ok || state.idleLease != lease || r.suspension != nil {
-		r.mu.Unlock()
-		return
-	}
-	r.shutdownWG.Add(1)
-	defer r.shutdownWG.Done()
-	delete(states, state)
-	if len(states) == 0 {
-		delete(r.idle, state.stateKey)
-	}
-	state.retain = false
 	r.mu.Unlock()
-
-	state.ctxCancel()
-	if err := state.session.Cancel(context.Background()); err != nil {
-		r.log.Warn("idle session cancel failed", "run_id", state.runID, "state_key", state.stateKey, "err", err)
-	}
-}
-
-// emitTerminalError synthesises error + done for a run that couldn't
-// even be started. Stamps env.Trace from ctx so the gateway can
-// attribute these frames to the same trace_id.
-func (r *Router) emitTerminalError(ctx context.Context, runID, msg string) {
-	traceparent := ""
-	if carrier, ok := obslog.TraceFromContext(ctx); ok {
-		traceparent = carrier.String()
-	}
-	errEnv, err := proto.NewEnvelopeWithTrace(proto.TypeError, runID, proto.ErrorPayload{Error: msg}, traceparent)
-	if err == nil {
-		if sendErr := r.sender.Send(ctx, errEnv); sendErr != nil {
-			r.log.ErrorContext(ctx, "emit terminal error frame failed", "run_id", runID, "err", sendErr)
-		}
-	}
-	doneEnv, err := proto.NewEnvelopeWithTrace(proto.TypeDone, runID, proto.DonePayload{}, traceparent)
-	if err == nil {
-		if sendErr := r.sender.Send(ctx, doneEnv); sendErr != nil {
-			r.log.ErrorContext(ctx, "emit terminal done frame failed", "run_id", runID, "err", sendErr)
-		}
-	}
 }
diff --git a/apps/daemon/internal/dispatch/router_test.go b/apps/daemon/internal/dispatch/router_test.go
index 1e9b0ff15..918f6a06c 100644
--- a/apps/daemon/internal/dispatch/router_test.go
+++ b/apps/daemon/internal/dispatch/router_test.go
@@ -1,7 +1,5 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"errors"
@@ -60,6 +58,8 @@ func (s *recSender) typesFor(runID string) []string {
 // fakeSession is a controllable session. The test owns its out
 // channel and manipulates outbound traffic / cancel observability.
 type fakeSession struct {
+	runID               string
+	input               proto.MessageInput
 	cancelCalls         int
 	submitCalls         []permCall
 	askCalls            []askCall
@@ -133,36 +133,28 @@ func (s *fakeSession) submissions() []permCall {
 // helpers
 // ---------------------------------------------------------------------
 
-// newHarness builds a Router whose registry exposes a single
-// fake_alpha factory that records inputs and exposes the in-flight
-// session.
+// harness is a Router whose fake_alpha kind starts a recorded fakeSession
+// for each Turn.
 type harness struct {
 	router  *dispatch.Router
 	sender  *recSender
 	reg     *agent.Registry
-	gotReq  chan proto.PromptRequestPayload
 	gotSess chan *fakeSession
 }
 
 func newHarness(t *testing.T) *harness {
-	return newHarnessWithIdleTimeout(t, time.Hour)
-}
-
-func newHarnessWithIdleTimeout(t *testing.T, idleTimeout time.Duration) *harness {
 	t.Helper()
 	h := &harness{
 		sender:  &recSender{},
 		reg:     agent.NewRegistry(),
-		gotReq:  make(chan proto.PromptRequestPayload, 16),
 		gotSess: make(chan *fakeSession, 16),
 	}
-	h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Permissions: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		sess := &fakeSession{out: out, ctx: ctx}
-		h.gotReq <- req
+	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Permissions: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, runID string, input proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
+		sess := &fakeSession{runID: runID, input: input, out: out}
 		h.gotSess <- sess
 		return sess, nil
-	})
-	r, err := dispatch.New(dispatch.Config{Registry: h.reg, Sender: h.sender, IdleTimeout: idleTimeout})
+	}))
+	r, err := dispatch.New(dispatch.Config{Registry: h.reg, Sender: h.sender})
 	if err != nil {
 		t.Fatalf("dispatch.New: %v", err)
 	}
@@ -170,58 +162,20 @@ func newHarnessWithIdleTimeout(t *testing.T, idleTimeout time.Duration) *harness
 	return h
 }
 
-func TestCompletedSessionCancelsAfterIdleTimeout(t *testing.T) {
-	h := newHarnessWithIdleTimeout(t, 40*time.Millisecond)
-	defer h.router.Shutdown(context.Background())
-
-	env := mustEnv(t, proto.TypePromptRequest, "run_idle", proto.PromptRequestPayload{
-		AgentKind: "fake_alpha", ConversationID: "conv-idle", AgentStateKey: "conv-idle/agent/fake_alpha",
+// sessionExecutor runs each Turn through start on a disposable Executor.
+func sessionExecutor(start func(context.Context, string, proto.MessageInput, chan<- proto.Envelope) (agent.Session, error)) agent.ExecutorFactory {
+	return preparationExecutorFixture(func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+		return &controlledPreparation{start: start}, nil
 	})
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("Handle prompt_request: %v", err)
-	}
-	sess := <-h.gotSess
-	close(sess.out)
-	waitFor(t, func() bool { return h.router.ActiveRuns() == 0 }, "active run cleanup")
-
-	select {
-	case <-sess.ctx.Done():
-		t.Fatal("completed session cancelled before idle timeout")
-	case <-time.After(15 * time.Millisecond):
-	}
-	waitFor(t, func() bool { return sess.cancels() == 1 }, "idle session cancellation")
 }
 
-func TestNewPromptResetsCompletedSessionIdleTimeout(t *testing.T) {
-	h := newHarnessWithIdleTimeout(t, 80*time.Millisecond)
-	defer h.router.Shutdown(context.Background())
-
-	stateKey := "conv-renew/agent/fake_alpha"
-	first := mustEnv(t, proto.TypePromptRequest, "run_first", proto.PromptRequestPayload{
-		AgentKind: "fake_alpha", ConversationID: "conv-renew", AgentStateKey: stateKey,
-	})
-	if err := h.router.Handle(context.Background(), first); err != nil {
-		t.Fatalf("Handle first prompt: %v", err)
-	}
-	firstSession := <-h.gotSess
-	close(firstSession.out)
-	waitFor(t, func() bool { return h.router.ActiveRuns() == 0 }, "first run cleanup")
-	time.Sleep(50 * time.Millisecond)
-
-	second := mustEnv(t, proto.TypePromptRequest, "run_second", proto.PromptRequestPayload{
-		AgentKind: "fake_alpha", ConversationID: "conv-renew", AgentStateKey: stateKey,
-	})
-	if err := h.router.Handle(context.Background(), second); err != nil {
-		t.Fatalf("Handle second prompt: %v", err)
-	}
-	secondSession := <-h.gotSess
-
-	time.Sleep(45 * time.Millisecond)
-	if firstSession.cancels() != 0 {
-		t.Fatal("new prompt did not renew the completed session idle timeout")
-	}
-	close(secondSession.out)
-	waitFor(t, func() bool { return firstSession.cancels() == 1 }, "renewed idle session cancellation")
+// startRun prepares a dedicated Executor for run, starts the Run with input
+// "input" and waits until it accepts operations.
+func startRun(t *testing.T, r *dispatch.Router, s *recSender, run string, config proto.PromptRequestPayload) {
+	t.Helper()
+	ready := executorAdmission(t, r, s, "prepare-"+run, noEnvironmentPreparation("session-"+run, config))
+	startExecutorTurn(t, r, s, "prepare-"+run, run, ready)
+	waitFor(t, func() bool { return r.RunStartedForTest(run) }, "run "+run+" to accept operations")
 }
 
 func mustEnv(t *testing.T, typ, id string, payload any) proto.Envelope {
@@ -237,22 +191,15 @@ func mustEnv(t *testing.T, typ, id string, payload any) proto.Envelope {
 // tests
 // ---------------------------------------------------------------------
 
-func TestHandlePromptRequestInvokesFactoryAndForwardsOutput(t *testing.T) {
+func TestExecutionStartRunsInputAndForwardsOutput(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "run_1", proto.PromptRequestPayload{
-		AgentKind: "fake_alpha", Input: proto.TextInput("hi"), ConversationID: "c1",
-	})
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("Handle prompt_request: %v", err)
-	}
-
-	req := <-h.gotReq
-	if req.RunID != "run_1" || req.AgentKind != "fake_alpha" || *req.Input[0].Content[0].Text != "hi" {
-		t.Errorf("factory got %+v, want run_1/fake_alpha/hi", req)
-	}
+	startRun(t, h.router, h.sender, "run_1", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
+	if sess.runID != "run_1" || len(sess.input) != 1 || *sess.input[0].Content[0].Text != "input" {
+		t.Errorf("Turn got run %q input %+v, want run_1/input", sess.runID, sess.input)
+	}
 
 	// Session emits a delta + done; both should reach the sender.
 	sess.out <- mustEnv(t, proto.TypeDelta, "run_1", proto.DeltaPayload{Delta: "hello", Sequence: 1})
@@ -261,69 +208,70 @@ func TestHandlePromptRequestInvokesFactoryAndForwardsOutput(t *testing.T) {
 
 	waitForTypes(t, h.sender, "run_1", []string{proto.TypeDelta, proto.TypeDone})
 
-	// Pump should have removed the session.
+	// Settlement should have removed the Run.
 	waitFor(t, func() bool { return h.router.ActiveRuns() == 0 }, "active runs to drop to 0")
 }
 
-func TestHandlePromptRequestRejectsDuplicateRunID(t *testing.T) {
+func TestExecutionStartRejectsDuplicateRunID(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "run_dup", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("first Handle: %v", err)
-	}
-	<-h.gotReq // drain first
+	startRun(t, h.router, h.sender, "run_dup", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
 
-	// Second prompt_request with same RunID should NOT spin up a second factory call.
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("duplicate Handle: %v", err)
+	// Another Executor must not start a second Turn for the same RunID.
+	second := executorAdmission(t, h.router, h.sender, "prepare-dup", noEnvironmentPreparation("session-dup", proto.PromptRequestPayload{AgentKind: "fake_alpha"}))
+	start := mustEnv(t, proto.TypeExecutionStart, "prepare-dup", proto.ExecutionStartPayload{Handle: second.Handle, ExecutorID: second.ExecutorID, RunID: "run_dup", Input: proto.TextInput("input")})
+	if err := h.router.Handle(context.Background(), start); err == nil {
+		t.Fatal("duplicate Run started")
+	}
+	if status := waitPreparationStatus(t, h.sender, "prepare-dup", "rejected", ""); status.ErrorCode != "run_conflict" {
+		t.Fatalf("duplicate start status = %+v, want run_conflict", status)
 	}
 
 	select {
-	case extra := <-h.gotReq:
-		t.Fatalf("factory invoked twice for duplicate run, second req=%+v", extra)
+	case extra := <-h.gotSess:
+		t.Fatalf("Turn started twice for duplicate run, second run=%s", extra.runID)
 	case <-time.After(50 * time.Millisecond):
 	}
 	close(sess.out)
 }
 
-func TestHandlePromptRequestUnsupportedKindEmitsErrorDone(t *testing.T) {
+func TestExecutionPrepareRejectsUnknownKind(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "run_x", proto.PromptRequestPayload{AgentKind: "fake_beta"})
-	err := h.router.Handle(context.Background(), env)
-	if !errors.Is(err, agent.ErrUnsupportedKind) {
-		t.Errorf("Handle unsupported = %v, want ErrUnsupportedKind", err)
+	env := mustEnv(t, proto.TypeExecutionPrepare, "prepare_x", noEnvironmentPreparation("x", proto.PromptRequestPayload{AgentKind: "fake_beta"}))
+	if err := h.router.Handle(context.Background(), env); err == nil {
+		t.Error("unknown kind admitted")
 	}
-	got := h.sender.typesFor("run_x")
-	want := []string{proto.TypeError, proto.TypeDone}
-	if !slices.Equal(got, want) {
-		t.Errorf("sender frames for run_x = %v, want %v", got, want)
+	if status := waitPreparationStatus(t, h.sender, "prepare_x", "rejected", ""); status.ErrorCode != "resource_unavailable" {
+		t.Errorf("unknown kind status = %+v, want resource_unavailable", status)
+	}
+	if got, want := h.sender.typesFor("prepare_x"), []string{proto.TypePreparationStatus}; !slices.Equal(got, want) {
+		t.Errorf("sender frames for prepare_x = %v, want %v", got, want)
 	}
 }
 
-func TestHandlePromptRequestMissingRunIDIsError(t *testing.T) {
+func TestExecutionStartRequiresRunID(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	if err := h.router.Handle(context.Background(), env); err == nil {
+	ready := executorAdmission(t, h.router, h.sender, "prepare", noEnvironmentPreparation("session", proto.PromptRequestPayload{AgentKind: "fake_alpha"}))
+	start := mustEnv(t, proto.TypeExecutionStart, "prepare", proto.ExecutionStartPayload{Handle: ready.Handle, ExecutorID: ready.ExecutorID, Input: proto.TextInput("input")})
+	if err := h.router.Handle(context.Background(), start); err == nil {
 		t.Fatal("expected error on missing run id")
 	}
+	if status := waitPreparationStatus(t, h.sender, "prepare", "rejected", ""); status.ErrorCode != "invalid_start" {
+		t.Fatalf("missing run id status = %+v, want invalid_start", status)
+	}
 }
 
 func TestHandlePromptCancelInvokesSessionCancel(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "run_2", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("prompt_request: %v", err)
-	}
-	<-h.gotReq
+	startRun(t, h.router, h.sender, "run_2", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
 	sess.closeOutOnCancel = true
 
@@ -348,11 +296,7 @@ func TestPermissionRequestIsIndexedAndDecisionRoutes(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "run_p", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("prompt_request: %v", err)
-	}
-	<-h.gotReq
+	startRun(t, h.router, h.sender, "run_p", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
 
 	// Session emits a permission_request; pump should index it.
@@ -361,7 +305,7 @@ func TestPermissionRequestIsIndexedAndDecisionRoutes(t *testing.T) {
 	})
 	sess.out <- permEnv
 	// Wait until sender records — indexing happens before send.
-	waitFor(t, func() bool { return len(h.sender.snapshot()) >= 1 }, "permission_request to be forwarded")
+	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypePermissionRequest, "run_p") }, "permission_request to be forwarded")
 
 	dec := mustEnv(t, proto.TypePermissionDecision, "perm_abcd1234", proto.PermissionDecisionPayload{DeliveryID: "delivery-perm-1", Approved: true})
 	if err := h.router.Handle(context.Background(), dec); err != nil {
@@ -389,32 +333,6 @@ func TestPermissionRequestIsIndexedAndDecisionRoutes(t *testing.T) {
 	close(sess.out)
 }
 
-func TestPermissionCancelDeindexes(t *testing.T) {
-	h := newHarness(t)
-	defer h.router.Shutdown(context.Background())
-
-	env := mustEnv(t, proto.TypePromptRequest, "run_p2", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	_ = h.router.Handle(context.Background(), env)
-	<-h.gotReq
-	sess := <-h.gotSess
-
-	sess.out <- mustEnv(t, proto.TypePermissionRequest, "run_p2", proto.PermissionRequestPayload{RequestID: "perm_xx", Tool: "Bash"})
-	waitFor(t, func() bool { return len(h.sender.snapshot()) >= 1 }, "perm forwarded")
-	sess.out <- mustEnv(t, proto.TypePermissionCancel, "perm_xx", nil)
-	waitFor(t, func() bool { return len(h.sender.snapshot()) >= 2 }, "perm_cancel forwarded")
-
-	// A decision for the cancelled perm should be a no-op (session never sees it).
-	if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePermissionDecision, "perm_xx", proto.PermissionDecisionPayload{DeliveryID: "delivery-cancelled"})); err != nil {
-		t.Fatalf("decision: %v", err)
-	}
-	if calls := sess.submissions(); len(calls) != 0 {
-		t.Errorf("expected zero submissions after cancel, got %+v", calls)
-	}
-	assertDecisionAck(t, h.sender, "delivery-cancelled", false, "not_pending")
-
-	close(sess.out)
-}
-
 func TestPermissionDecisionUnknownPermIsNoop(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
@@ -429,11 +347,7 @@ func TestPromptForUserChoiceDecisionRoutesToSession(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "run_ask", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("prompt_request: %v", err)
-	}
-	<-h.gotReq
+	startRun(t, h.router, h.sender, "run_ask", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
 
 	// Envelope.ID is the run id (server-side dispatch fans on it); the
@@ -445,7 +359,7 @@ func TestPromptForUserChoiceDecisionRoutesToSession(t *testing.T) {
 		ToolUseID: "toolu_42",
 	})
 	sess.out <- askEnv
-	waitFor(t, func() bool { return len(h.sender.snapshot()) >= 1 }, "prompt_for_user_choice forwarded")
+	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypePromptForUserChoice, "run_ask") }, "prompt_for_user_choice forwarded")
 
 	dec := mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask_abcd1234", proto.PromptForUserChoiceDecisionPayload{
 		DeliveryID: "delivery-ask-1", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}},
@@ -486,11 +400,7 @@ func TestPromptForUserChoiceDecisionClearsIndexOnAgentUnknown(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "run_ask_u", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("prompt_request: %v", err)
-	}
-	<-h.gotReq
+	startRun(t, h.router, h.sender, "run_ask_u", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
 	sess.askErr = agent.ErrUnknownAsk
 
@@ -500,7 +410,7 @@ func TestPromptForUserChoiceDecisionClearsIndexOnAgentUnknown(t *testing.T) {
 		ToolUseID: "toolu_y",
 	})
 	sess.out <- askEnv
-	waitFor(t, func() bool { return len(h.sender.snapshot()) >= 1 }, "prompt_for_user_choice forwarded")
+	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypePromptForUserChoice, "run_ask_u") }, "prompt_for_user_choice forwarded")
 
 	dec := mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask_xxxxxxxx", proto.PromptForUserChoiceDecisionPayload{
 		DeliveryID: "delivery-ask-gone", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}},
@@ -524,18 +434,14 @@ func TestPromptForUserChoiceDecisionKeepsIndexOnTransientAgentError(t *testing.T
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 
-	env := mustEnv(t, proto.TypePromptRequest, "run_ask_retry", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	if err := h.router.Handle(context.Background(), env); err != nil {
-		t.Fatalf("prompt_request: %v", err)
-	}
-	<-h.gotReq
+	startRun(t, h.router, h.sender, "run_ask_retry", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
 	sess.askErr = errors.New("temporary stdin failure")
 
 	sess.out <- mustEnv(t, proto.TypePromptForUserChoice, "run_ask_retry", proto.PromptForUserChoicePayload{
 		AskID: "ask_retry", Questions: []proto.PromptForUserChoiceQuestion{{ID: "q0", Question: "Retry?"}},
 	})
-	waitFor(t, func() bool { return len(h.sender.snapshot()) >= 1 }, "prompt_for_user_choice forwarded")
+	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypePromptForUserChoice, "run_ask_retry") }, "prompt_for_user_choice forwarded")
 
 	decision := mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask_retry", proto.PromptForUserChoiceDecisionPayload{
 		DeliveryID: "delivery-ask-retry", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}},
@@ -598,10 +504,7 @@ func TestHandleDeviceShutdownCancelsAllSessions(t *testing.T) {
 	defer h.router.Shutdown(context.Background())
 
 	for _, rid := range []string{"r1", "r2", "r3"} {
-		if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, rid, proto.PromptRequestPayload{AgentKind: "fake_alpha"})); err != nil {
-			t.Fatalf("start %s: %v", rid, err)
-		}
-		<-h.gotReq
+		startRun(t, h.router, h.sender, rid, proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	}
 	sessions := make([]*fakeSession, 3)
 	for i := range sessions {
@@ -631,7 +534,7 @@ func TestHandleAfterShutdownReturnsErrRouterClosed(t *testing.T) {
 	if err := h.router.Shutdown(context.Background()); err != nil {
 		t.Fatalf("Shutdown: %v", err)
 	}
-	err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, "r", proto.PromptRequestPayload{AgentKind: "fake_alpha"}))
+	err := h.router.Handle(context.Background(), mustEnv(t, proto.TypeExecutionPrepare, "r", noEnvironmentPreparation("session", proto.PromptRequestPayload{AgentKind: "fake_alpha"})))
 	if !errors.Is(err, dispatch.ErrRouterClosed) {
 		t.Errorf("post-shutdown Handle = %v, want ErrRouterClosed", err)
 	}
@@ -640,10 +543,7 @@ func TestHandleAfterShutdownReturnsErrRouterClosed(t *testing.T) {
 func TestShutdownWaitsForPumpDrain(t *testing.T) {
 	h := newHarness(t)
 
-	if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptRequest, "rs", proto.PromptRequestPayload{AgentKind: "fake_alpha"})); err != nil {
-		t.Fatalf("prompt_request: %v", err)
-	}
-	<-h.gotReq
+	startRun(t, h.router, h.sender, "rs", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	sess := <-h.gotSess
 
 	// Background: emit one frame then close out shortly after
diff --git a/apps/daemon/internal/dispatch/runtime_preparation.go b/apps/daemon/internal/dispatch/runtime_preparation.go
index 1ed576542..1c777f0fe 100644
--- a/apps/daemon/internal/dispatch/runtime_preparation.go
+++ b/apps/daemon/internal/dispatch/runtime_preparation.go
@@ -114,7 +114,7 @@ func (r *Router) handleRuntimePrepare(ctx context.Context, env proto.Envelope) e
 }
 
 func (r *Router) runtimePreparationResourcesBusyLocked() bool {
-	if r.workspaceWrite != nil || r.workspaceExport != nil || len(r.workspaceReads) != 0 || len(r.sessions) != 0 || len(r.idle) != 0 || len(r.executors) != 0 {
+	if r.workspaceWrite != nil || r.workspaceExport != nil || len(r.workspaceReads) != 0 || len(r.sessions) != 0 || len(r.executors) != 0 {
 		return true
 	}
 	for _, p := range r.preparations {
diff --git a/apps/daemon/internal/dispatch/runtime_preparation_test.go b/apps/daemon/internal/dispatch/runtime_preparation_test.go
index feb7fbf6e..d8a3399f9 100644
--- a/apps/daemon/internal/dispatch/runtime_preparation_test.go
+++ b/apps/daemon/internal/dispatch/runtime_preparation_test.go
@@ -169,7 +169,7 @@ func TestRuntimePreparationBeginRequiresExactBindingAndBounds(t *testing.T) {
 }
 
 func TestRuntimePreparationPreparationExcludesOwnedResources(t *testing.T) {
-	for _, mode := range []string{"write", "export", "read", "run", "idle", "executor", "preparation"} {
+	for _, mode := range []string{"write", "export", "read", "run", "executor", "preparation"} {
 		t.Run(mode, func(t *testing.T) {
 			r, sender, environment, session := capabilitiesTestRouter(t)
 			switch mode {
@@ -181,8 +181,6 @@ func TestRuntimePreparationPreparationExcludesOwnedResources(t *testing.T) {
 				r.workspaceReads = map[string]struct{}{"read": {}}
 			case "run":
 				r.sessions["run"] = &sessionState{}
-			case "idle":
-				r.idle["state"] = map[*sessionState]struct{}{}
 			case "executor":
 				r.executors[session] = &executorState{}
 			case "preparation":
@@ -202,7 +200,6 @@ func TestRuntimePreparationPreparationExcludesOwnedResources(t *testing.T) {
 			r.workspaceExport = nil
 			r.workspaceReads = nil
 			clear(r.sessions)
-			clear(r.idle)
 			clear(r.executors)
 			clear(r.preparations)
 			shutdownCapabilitiesRouter(t, r)
diff --git a/apps/daemon/internal/dispatch/shutdown.go b/apps/daemon/internal/dispatch/shutdown.go
index c40d4875e..cc7229aff 100644
--- a/apps/daemon/internal/dispatch/shutdown.go
+++ b/apps/daemon/internal/dispatch/shutdown.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
@@ -31,31 +30,12 @@ func (r *Router) Shutdown(ctx context.Context) error {
 		}
 	}
 
-	first := !r.closed
-	var victims []sessionCancellation
-	for _, state := range r.sessions {
-		state.retain = false
-		if state.preparedHandoff != nil {
-			victims = append(victims, r.sessionCancellationLocked(state, true))
-		} else if first {
-			victims = append(victims, sessionCancellation{runID: state.runID, ctxCancel: state.ctxCancel, session: state.session})
-		}
-	}
-	if first {
+	victims := r.sessionCancellationsLocked()
+	if !r.closed {
 		r.closed = true
 		if r.runtimePreparation != nil {
 			r.runtimePreparation.cancel()
 		}
-		for _, states := range r.idle {
-			for state := range states {
-				state.retain = false
-				if state.idleTimer != nil {
-					state.idleTimer.Stop()
-				}
-				victims = append(victims, sessionCancellation{runID: state.runID, ctxCancel: state.ctxCancel, session: state.session})
-			}
-		}
-		r.idle = make(map[string]map[*sessionState]struct{})
 		// Prepared release claims exist before this signal can interrupt output.
 		close(r.shutdownCh)
 	}
@@ -78,19 +58,10 @@ func (r *Router) Shutdown(ctx context.Context) error {
 func (r *Router) runShutdownAttempt(attempt *shutdownAttempt, victims []sessionCancellation) {
 	var releaseErr error
 	for _, victim := range victims {
-		if victim.handoff != nil {
-			// The cleanup operation has its own fixed native deadline. The
-			// Shutdown caller's deadline only bounds its wait for this attempt.
-			if err := r.awaitPreparedNativeRelease(context.Background(), victim.release, victim.attempt); err != nil {
-				releaseErr = errors.Join(releaseErr, fmt.Errorf("dispatch: prepared run %s: %w", victim.runID, err))
-			}
-			continue
-		}
-		victim.ctxCancel()
-		if victim.session != nil {
-			if err := victim.session.Cancel(context.Background()); err != nil {
-				r.log.Warn("session.Cancel failed", "run_id", victim.runID, "err", err)
-			}
+		// The cleanup operation has its own fixed native deadline. The
+		// Shutdown caller's deadline only bounds its wait for this attempt.
+		if err := r.awaitPreparedNativeRelease(context.Background(), victim.release, victim.attempt); err != nil {
+			releaseErr = errors.Join(releaseErr, fmt.Errorf("dispatch: prepared run %s: %w", victim.runID, err))
 		}
 	}
 	r.shutdownWG.Done()
@@ -153,21 +124,7 @@ func (r *Router) handleDeviceShutdown(ctx context.Context, env proto.Envelope) e
 	if r.runtimePreparation != nil {
 		r.runtimePreparation.cancel()
 	}
-	victims := make([]sessionCancellation, 0, len(r.sessions))
-	for _, state := range r.sessions {
-		state.retain = false
-		victims = append(victims, r.sessionCancellationLocked(state, true))
-	}
-	for _, states := range r.idle {
-		for state := range states {
-			state.retain = false
-			if state.idleTimer != nil {
-				state.idleTimer.Stop()
-			}
-			victims = append(victims, sessionCancellation{runID: state.runID, ctxCancel: state.ctxCancel, session: state.session})
-		}
-	}
-	r.idle = make(map[string]map[*sessionState]struct{})
+	victims := r.sessionCancellationsLocked()
 	preparations := r.closePendingPreparationsLocked()
 	executors := r.closeIdleExecutorsLocked()
 	r.mu.Unlock()
@@ -180,36 +137,27 @@ func (r *Router) handleDeviceShutdown(ctx context.Context, env proto.Envelope) e
 }
 
 type sessionCancellation struct {
-	runID     string
-	ctxCancel context.CancelFunc
-	session   agent.Session
-	handoff   *preparedHandoff
-	release   *preparedRelease
-	attempt   *preparedReleaseAttempt
+	runID   string
+	handoff *preparedHandoff
+	release *preparedRelease
+	attempt *preparedReleaseAttempt
 }
 
-func (r *Router) sessionCancellationLocked(state *sessionState, retry bool) sessionCancellation {
-	if state.preparedHandoff != nil {
-		release, attempt := r.claimPreparedReleaseLocked(state, true, "", retry)
-		return sessionCancellation{runID: state.runID, handoff: state.preparedHandoff, release: release, attempt: attempt}
+// sessionCancellationsLocked claims release of every active Run, retrying a
+// failed native attempt. Router.mu must be held.
+func (r *Router) sessionCancellationsLocked() []sessionCancellation {
+	victims := make([]sessionCancellation, 0, len(r.sessions))
+	for _, state := range r.sessions {
+		release, attempt := r.claimPreparedReleaseLocked(state, true, "", true)
+		victims = append(victims, sessionCancellation{runID: state.runID, handoff: state.preparedHandoff, release: release, attempt: attempt})
 	}
-	return sessionCancellation{runID: state.runID, ctxCancel: state.ctxCancel, session: state.session}
+	return victims
 }
 
 func (r *Router) cancelSessions(ctx context.Context, sessions []sessionCancellation) {
 	for _, session := range sessions {
-		if session.handoff != nil {
-			if err := r.awaitPreparedRelease(ctx, session.handoff, session.release, session.attempt); err != nil {
-				r.log.Warn("prepared session release failed", "run_id", session.runID, "err", err)
-			}
-			continue
-		}
-		session.ctxCancel()
-		if session.session == nil {
-			continue
-		}
-		if err := session.session.Cancel(ctx); err != nil {
-			r.log.Warn("session.Cancel failed", "run_id", session.runID, "err", err)
+		if err := r.awaitPreparedRelease(ctx, session.handoff, session.release, session.attempt); err != nil {
+			r.log.Warn("prepared session release failed", "run_id", session.runID, "err", err)
 		}
 	}
 }
diff --git a/apps/daemon/internal/dispatch/steering.go b/apps/daemon/internal/dispatch/steering.go
index cd6acfcf2..97a08a399 100644
--- a/apps/daemon/internal/dispatch/steering.go
+++ b/apps/daemon/internal/dispatch/steering.go
@@ -98,12 +98,7 @@ func (r *Router) queueSteering(ctx context.Context, env proto.Envelope, input pr
 	}
 	session := state.session
 	steerer, supportsSteering := session.(agent.Steerer)
-	if input.DurableReceipt {
-		if _, ok := session.(agent.DurableSteerer); !ok || (!state.releaseOnCompletion && state.preparedHandoff == nil) {
-			ack.ErrorCode, ack.Error = "unsupported", "Durable input receipts require a supported Turn settlement contract."
-			return &ack
-		}
-	} else if !supportsSteering {
+	if !input.DurableReceipt && !supportsSteering {
 		ack.ErrorCode, ack.Error = "unsupported", "This engine does not support active-turn input."
 		return &ack
 	}
@@ -120,8 +115,6 @@ func (r *Router) queueSteering(ctx context.Context, env proto.Envelope, input pr
 	ack.ErrorCode, ack.Error = "in_flight", "This input is awaiting an engine receipt."
 	state.steering[input.InputID] = steeringReceipt{fingerprint: fingerprint, ack: ack, durable: input.DurableReceipt}
 	state.steerBusy = true
-	finished := make(chan struct{})
-	state.steeringDone = finished
 	r.shutdownWG.Add(1)
 	go func() {
 		defer r.shutdownWG.Done()
@@ -129,7 +122,6 @@ func (r *Router) queueSteering(ctx context.Context, env proto.Envelope, input pr
 		defer func() {
 			r.mu.Lock()
 			state.steerBusy = false
-			close(finished)
 			r.mu.Unlock()
 		}()
 		ctx, stop := r.shutdownContext(ctx)
@@ -180,25 +172,3 @@ func (r *Router) shutdownContext(parent context.Context) (context.Context, conte
 	}()
 	return ctx, cancel
 }
-
-// Close admission before taking the last worker: its lifetime includes the
-// receipt send, so a durable Done cannot close the gateway subscription first.
-func (r *Router) finishSteering(state *sessionState) error {
-	r.mu.Lock()
-	state.steeringClosed = true
-	finished := state.steeringDone
-	r.mu.Unlock()
-	if finished == nil {
-		return nil
-	}
-	timer := time.NewTimer(steeringCallTimeout + steeringSendTimeout)
-	defer timer.Stop()
-	select {
-	case <-finished:
-		return nil
-	case <-r.shutdownCh:
-		return context.Canceled
-	case <-timer.C:
-		return context.DeadlineExceeded
-	}
-}
diff --git a/apps/daemon/internal/dispatch/steering_lifetime.go b/apps/daemon/internal/dispatch/steering_lifetime.go
index b696de6a4..adbfbe054 100644
--- a/apps/daemon/internal/dispatch/steering_lifetime.go
+++ b/apps/daemon/internal/dispatch/steering_lifetime.go
@@ -9,7 +9,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func (r *Router) steerDurably(sendCtx context.Context, state *sessionState, session agent.Session, env proto.Envelope, input proto.PromptSteerPayload, fingerprint [32]byte) error {
+func (r *Router) steerDurably(sendCtx context.Context, state *sessionState, session agent.DurableSteerer, env proto.Envelope, input proto.PromptSteerPayload, fingerprint [32]byte) error {
 	ctx, cancel := context.WithCancel(state.ctx)
 	defer cancel()
 	stopShutdown := context.AfterFunc(sendCtx, cancel)
@@ -17,7 +17,7 @@ func (r *Router) steerDurably(sendCtx context.Context, state *sessionState, sess
 	timer := time.AfterFunc(steeringCallTimeout, cancel)
 	defer timer.Stop()
 	var once sync.Once
-	return session.(agent.DurableSteerer).SteerWithReceipt(ctx, input, func() {
+	return session.SteerWithReceipt(ctx, input, func() {
 		once.Do(func() {
 			if !timer.Stop() || ctx.Err() != nil {
 				return
diff --git a/apps/daemon/internal/dispatch/steering_lifetime_test.go b/apps/daemon/internal/dispatch/steering_lifetime_test.go
index c51b87b87..9a2419768 100644
--- a/apps/daemon/internal/dispatch/steering_lifetime_test.go
+++ b/apps/daemon/internal/dispatch/steering_lifetime_test.go
@@ -1,7 +1,5 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"sync/atomic"
@@ -28,7 +26,7 @@ func TestDurableSteeringWaitsBeyondTransportDeadline(t *testing.T) {
 	var session *fakeSession
 	var calls atomic.Int32
 	release := make(chan struct{})
-	h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 		session = &fakeSession{out: out, closeOutOnCancel: true}
 		return &durableSteeringSession{steeringSession: &steeringSession{fakeSession: session}, phased: func(ctx context.Context, input proto.PromptSteerPayload, written func()) error {
 			calls.Add(1)
@@ -40,11 +38,9 @@ func TestDurableSteeringWaitsBeyondTransportDeadline(t *testing.T) {
 				return ctx.Err()
 			}
 		}}, nil
-	})
-	ctx := context.Background()
-	if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptRequest, "durable", proto.PromptRequestPayload{AgentKind: "codex", ReleaseOnCompletion: true})); err != nil {
-		t.Fatal(err)
-	}
+	}))
+	startRun(t, h.router, h.sender, "durable", proto.PromptRequestPayload{AgentKind: "codex"})
+	base := len(h.sender.snapshot())
 	input := proto.PromptSteerPayload{InputID: "extra", Input: proto.TextInput("additional"), DurableReceipt: true}
 	env := mustEnv(t, proto.TypePromptSteer, "durable", input)
 	if err := handleSteeringAndWait(t, h, env); err != nil {
@@ -54,7 +50,7 @@ func TestDurableSteeringWaitsBeyondTransportDeadline(t *testing.T) {
 		t.Fatalf("write phase: %+v", ack)
 	}
 	time.Sleep(11 * time.Second)
-	if len(h.sender.snapshot()) != 1 {
+	if len(h.sender.snapshot()) != base+1 {
 		t.Fatal("native wait ended at transport deadline")
 	}
 	if err := handleSteeringAndWait(t, h, env); err != nil {
@@ -64,12 +60,12 @@ func TestDurableSteeringWaitsBeyondTransportDeadline(t *testing.T) {
 		t.Fatalf("cached phase: %+v", ack)
 	}
 	close(release)
-	waitFor(t, func() bool { return len(h.sender.snapshot()) == 3 }, "native acceptance")
+	waitFor(t, func() bool { return len(h.sender.snapshot()) == base+3 }, "native acceptance")
 	if ack := lastSteeringAck(t, h.sender, "durable", "extra"); !ack.Accepted || ack.Written {
 		t.Fatalf("final phase: %+v", ack)
 	}
 	session.out <- mustEnv(t, proto.TypeDone, "durable", proto.DonePayload{})
-	waitFor(t, func() bool { return h.router.ActiveRuns() == 0 }, "completion")
+	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypeDone, "durable") }, "completion")
 	frames := h.sender.snapshot()
 	if calls.Load() != 1 || frames[len(frames)-1].Type != proto.TypeDone {
 		t.Fatal("replayed input or incorrect completion order")
@@ -82,7 +78,7 @@ func TestDurableSteeringTransportTimeoutAndShutdown(t *testing.T) {
 			h := newHarness(t)
 			defer h.router.Shutdown(context.Background())
 			exited := make(chan struct{})
-			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(_ context.Context, _ proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+			registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 				return &durableSteeringSession{steeringSession: &steeringSession{fakeSession: &fakeSession{out: out, closeOutOnCancel: true}}, phased: func(ctx context.Context, _ proto.PromptSteerPayload, written func()) error {
 					defer close(exited)
 					if phase == "written" {
@@ -91,11 +87,10 @@ func TestDurableSteeringTransportTimeoutAndShutdown(t *testing.T) {
 					<-ctx.Done()
 					return ctx.Err()
 				}}, nil
-			})
+			}))
 			ctx := context.Background()
-			if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptRequest, "run", proto.PromptRequestPayload{AgentKind: "codex", ReleaseOnCompletion: true})); err != nil {
-				t.Fatal(err)
-			}
+			startRun(t, h.router, h.sender, "run", proto.PromptRequestPayload{AgentKind: "codex"})
+			base := len(h.sender.snapshot())
 			if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptSteer, "run", proto.PromptSteerPayload{InputID: "one", Input: proto.TextInput("text"), DurableReceipt: true})); err != nil {
 				t.Fatal(err)
 			}
@@ -105,12 +100,12 @@ func TestDurableSteeringTransportTimeoutAndShutdown(t *testing.T) {
 				case <-time.After(12 * time.Second):
 					t.Fatal("blocked write was not bounded")
 				}
-				waitFor(t, func() bool { return len(h.sender.snapshot()) == 1 }, "unknown receipt")
+				waitFor(t, func() bool { return len(h.sender.snapshot()) == base+1 }, "unknown receipt")
 				if ack := lastSteeringAck(t, h.sender, "run", "one"); ack.Written || ack.Accepted || ack.ErrorCode != "outcome_unknown" {
 					t.Fatalf("transport uncertainty: %+v", ack)
 				}
 			} else {
-				waitFor(t, func() bool { return len(h.sender.snapshot()) == 1 }, "written phase")
+				waitFor(t, func() bool { return len(h.sender.snapshot()) == base+1 }, "written phase")
 				stopCtx, cancel := context.WithTimeout(ctx, time.Second)
 				defer cancel()
 				if err := h.router.Shutdown(stopCtx); err != nil {
@@ -125,32 +120,3 @@ func TestDurableSteeringTransportTimeoutAndShutdown(t *testing.T) {
 		})
 	}
 }
-
-func TestDurableSteeringRequiresOptInAndAdapter(t *testing.T) {
-	for _, supported := range []bool{false, true} {
-		t.Run(map[bool]string{false: "old-adapter", true: "retained-run"}[supported], func(t *testing.T) {
-			h := newHarness(t)
-			defer h.router.Shutdown(context.Background())
-			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(_ context.Context, _ proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-				s := &steeringSession{fakeSession: &fakeSession{out: out, closeOutOnCancel: true}, steer: func(context.Context, proto.PromptSteerPayload) error { t.Error("unexpected legacy call"); return nil }}
-				if !supported {
-					return s, nil
-				}
-				return &durableSteeringSession{steeringSession: s, phased: func(context.Context, proto.PromptSteerPayload, func()) error {
-					t.Error("unexpected phased call")
-					return nil
-				}}, nil
-			})
-			ctx := context.Background()
-			if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptRequest, "run", proto.PromptRequestPayload{AgentKind: "codex", ReleaseOnCompletion: !supported})); err != nil {
-				t.Fatal(err)
-			}
-			if err := handleSteeringAndWait(t, h, mustEnv(t, proto.TypePromptSteer, "run", proto.PromptSteerPayload{InputID: "one", Input: proto.TextInput("text"), DurableReceipt: true})); err != nil {
-				t.Fatal(err)
-			}
-			if ack := lastSteeringAck(t, h.sender, "run", "one"); ack.ErrorCode != "unsupported" {
-				t.Fatalf("capability gate: %+v", ack)
-			}
-		})
-	}
-}
diff --git a/apps/daemon/internal/dispatch/steering_test.go b/apps/daemon/internal/dispatch/steering_test.go
index c989afd7c..bf5b214e9 100644
--- a/apps/daemon/internal/dispatch/steering_test.go
+++ b/apps/daemon/internal/dispatch/steering_test.go
@@ -1,7 +1,5 @@
 package dispatch_test
 
-import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-
 import (
 	"context"
 	"errors"
@@ -33,7 +31,7 @@ func TestSteeringReceiptsAndRetries(t *testing.T) {
 			h := newHarness(t)
 			defer h.router.Shutdown(context.Background())
 			calls, starts := 0, 0
-			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+			registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 				starts++
 				return &steeringSession{
 					fakeSession: &fakeSession{out: out, closeOutOnCancel: true},
@@ -45,17 +43,15 @@ func TestSteeringReceiptsAndRetries(t *testing.T) {
 						if input.InputID != "input-1" || *input.Input[0].Content[0].Text != "additional text" {
 							t.Errorf("input lost: %+v", input)
 						}
-						if len(h.sender.snapshot()) != 0 {
+						if hasFrame(h.sender, proto.TypePromptSteerAck, "run-1") {
 							t.Error("ack sent before engine accepted input")
 						}
 						return engineError
 					},
 				}, nil
-			})
+			}))
 			ctx := context.Background()
-			if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptRequest, "run-1", proto.PromptRequestPayload{AgentKind: "codex"})); err != nil {
-				t.Fatal(err)
-			}
+			startRun(t, h.router, h.sender, "run-1", proto.PromptRequestPayload{AgentKind: "codex"})
 			input := proto.PromptSteerPayload{InputID: "input-1", Input: proto.TextInput("additional text")}
 			env := mustEnv(t, proto.TypePromptSteer, "run-1", input)
 			// An ack transport failure must not cause another native invocation.
@@ -94,7 +90,7 @@ func TestSteeringReadinessAndUnsupportedRuns(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 	calls := 0
-	h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 		return &steeringSession{
 			fakeSession: &fakeSession{out: out, closeOutOnCancel: true},
 			steer: func(context.Context, proto.PromptSteerPayload) error {
@@ -105,11 +101,9 @@ func TestSteeringReadinessAndUnsupportedRuns(t *testing.T) {
 				return nil
 			},
 		}, nil
-	})
+	}))
 	ctx := context.Background()
-	if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptRequest, "run-1", proto.PromptRequestPayload{AgentKind: "codex"})); err != nil {
-		t.Fatal(err)
-	}
+	startRun(t, h.router, h.sender, "run-1", proto.PromptRequestPayload{AgentKind: "codex"})
 	input := proto.PromptSteerPayload{InputID: "input-1", Input: proto.TextInput("extra")}
 	env := mustEnv(t, proto.TypePromptSteer, "run-1", input)
 	for _, expected := range []string{"not_ready", ""} {
@@ -132,16 +126,14 @@ func TestSteeringReadinessAndUnsupportedRuns(t *testing.T) {
 	if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptCancel, "run-1", nil)); err != nil {
 		t.Fatal(err)
 	}
-	waitFor(t, func() bool { return h.router.ActiveRuns() == 0 }, "cancel cleanup")
+	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypeDone, "run-1") }, "cancel cleanup")
 	if err := handleSteeringAndWait(t, h, env); err != nil {
 		t.Fatal(err)
 	}
 	if ack := lastSteeringAck(t, h.sender, "run-1", "input-1"); ack.ErrorCode != "run_inactive" {
 		t.Fatalf("inactive: %+v", ack)
 	}
-	if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptRequest, "run-2", proto.PromptRequestPayload{AgentKind: "fake_alpha"})); err != nil {
-		t.Fatal(err)
-	}
+	startRun(t, h.router, h.sender, "run-2", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
 	session := <-h.gotSess
 	defer close(session.out)
 	if err := handleSteeringAndWait(t, h, mustEnv(t, proto.TypePromptSteer, "run-2", input)); err != nil {
@@ -172,7 +164,7 @@ func TestSteeringDoesNotBlockOtherRunCancellation(t *testing.T) {
 	defer h.router.Shutdown(context.Background())
 	entered, release := make(chan struct{}), make(chan struct{})
 	defer close(release)
-	h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 		return &steeringSession{
 			fakeSession: &fakeSession{out: out, closeOutOnCancel: true},
 			steer: func(context.Context, proto.PromptSteerPayload) error {
@@ -181,12 +173,10 @@ func TestSteeringDoesNotBlockOtherRunCancellation(t *testing.T) {
 				return agent.ErrSteeringRejected
 			},
 		}, nil
-	})
+	}))
 	ctx := context.Background()
 	for _, run := range []struct{ id, engine string }{{"run-1", "codex"}, {"run-2", "fake_alpha"}} {
-		if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptRequest, run.id, proto.PromptRequestPayload{AgentKind: run.engine})); err != nil {
-			t.Fatal(err)
-		}
+		startRun(t, h.router, h.sender, run.id, proto.PromptRequestPayload{AgentKind: run.engine})
 	}
 	other := <-h.gotSess
 	other.closeOutOnCancel = true
@@ -206,9 +196,7 @@ func TestSteeringDoesNotBlockOtherRunCancellation(t *testing.T) {
 	if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptCancel, "run-2", nil)); err != nil {
 		t.Fatal(err)
 	}
-	if other.cancels() != 1 {
-		t.Fatal("other run cancellation blocked")
-	}
+	waitFor(t, func() bool { return other.cancels() == 1 }, "other run cancellation")
 }
 
 func lastSteeringAck(t *testing.T, sender *recSender, runID, inputID string) proto.PromptSteerAckPayload {
@@ -235,7 +223,7 @@ func TestSteeringCapacityPreservesExistingReceipts(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
 	calls := 0
-	h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
+	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 		return &steeringSession{
 			fakeSession: &fakeSession{out: out, closeOutOnCancel: true},
 			steer: func(context.Context, proto.PromptSteerPayload) error {
@@ -243,11 +231,8 @@ func TestSteeringCapacityPreservesExistingReceipts(t *testing.T) {
 				return nil
 			},
 		}, nil
-	})
-	ctx := context.Background()
-	if err := h.router.Handle(ctx, mustEnv(t, proto.TypePromptRequest, "run-1", proto.PromptRequestPayload{AgentKind: "codex"})); err != nil {
-		t.Fatal(err)
-	}
+	}))
+	startRun(t, h.router, h.sender, "run-1", proto.PromptRequestPayload{AgentKind: "codex"})
 	for i := range 257 {
 		input := proto.PromptSteerPayload{InputID: fmt.Sprintf("input-%d", i), Input: proto.TextInput("extra")}
 		if err := handleSteeringAndWait(t, h, mustEnv(t, proto.TypePromptSteer, "run-1", input)); err != nil {
diff --git a/apps/daemon/internal/dispatch/suspend.go b/apps/daemon/internal/dispatch/suspend.go
index 003c9ce2f..a5e024746 100644
--- a/apps/daemon/internal/dispatch/suspend.go
+++ b/apps/daemon/internal/dispatch/suspend.go
@@ -41,14 +41,6 @@ func (r *Router) Quiesce(ctx context.Context, request proto.EnvironmentSuspendPa
 			return ErrRouterBusy
 		}
 	}
-	for _, states := range r.idle {
-		for state := range states {
-			if state.environmentID != request.EnvironmentID || state.steerBusy || len(state.pendingIDs) != 0 || len(state.pendingAsks) != 0 {
-				r.mu.Unlock()
-				return ErrRouterBusy
-			}
-		}
-	}
 	for _, owner := range r.executors {
 		if owner.invalid || owner.preparing || owner.run != nil || owner.admission != nil || owner.environmentID != request.EnvironmentID {
 			r.mu.Unlock()
@@ -61,14 +53,6 @@ func (r *Router) Quiesce(ctx context.Context, request proto.EnvironmentSuspendPa
 			p.timer.Stop()
 		}
 	}
-	for _, states := range r.idle {
-		for state := range states {
-			state.idleLease++
-			if state.idleTimer != nil {
-				state.idleTimer.Stop()
-			}
-		}
-	}
 	for _, owner := range r.executors {
 		owner.idleLease++
 		if owner.timer != nil {
@@ -104,10 +88,5 @@ func (r *Router) Resume(request proto.EnvironmentSuspendPayload, sender Sender)
 	for _, owner := range r.executors {
 		r.scheduleExecutorIdleLocked(owner)
 	}
-	for _, states := range r.idle {
-		for state := range states {
-			r.scheduleIdleLocked(state)
-		}
-	}
 	return nil
 }
diff --git a/apps/daemon/internal/dispatch/suspend_test.go b/apps/daemon/internal/dispatch/suspend_test.go
index 64049b954..b713218ae 100644
--- a/apps/daemon/internal/dispatch/suspend_test.go
+++ b/apps/daemon/internal/dispatch/suspend_test.go
@@ -15,11 +15,13 @@ type suspendSender func(context.Context, proto.Envelope) error
 
 func (s suspendSender) Send(ctx context.Context, env proto.Envelope) error { return s(ctx, env) }
 
-type suspendedSession struct{ cancelled atomic.Int32 }
+type suspendedExecutor struct{ closed atomic.Int32 }
 
-func (s *suspendedSession) CancellationOutcome() proto.DonePayload { return proto.DonePayload{} }
+func (e *suspendedExecutor) StartTurn(context.Context, string, proto.MessageInput, chan<- proto.Envelope) (agent.Turn, error) {
+	return nil, errors.New("suspended executor must not start a Turn")
+}
 
-func (s *suspendedSession) Cancel(context.Context) error { s.cancelled.Add(1); return nil }
+func (e *suspendedExecutor) Close(context.Context) error { e.closed.Add(1); return nil }
 
 func suspensionRouter(t *testing.T, sender Sender) *Router {
 	t.Helper()
@@ -37,7 +39,7 @@ func suspensionRouter(t *testing.T, sender Sender) *Router {
 
 func TestQuiesceRejectsEveryUnsettledResource(t *testing.T) {
 	cases := map[string]func(*Router){
-		"active":     func(r *Router) { r.sessions["run"] = &sessionState{ctxCancel: func() {}} },
+		"active":     func(r *Router) { r.sessions["run"] = &sessionState{} },
 		"preparing":  func(r *Router) { r.preparations["p"] = &preparationState{owns: true} },
 		"receipt":    func(r *Router) { r.preparations["p"] = &preparationState{busy: true} },
 		"read":       func(r *Router) { r.workspaceReads = map[string]struct{}{"read": {}} },
@@ -90,7 +92,7 @@ func TestQuiesceDrainsPendingReceiptAndFencesConcurrentAdmission(t *testing.T) {
 	}
 	admitted := make(chan error, 1)
 	go func() {
-		admitted <- r.Handle(context.Background(), proto.Envelope{Type: proto.TypePromptRequest, ID: "late"})
+		admitted <- r.Handle(context.Background(), proto.Envelope{Type: proto.TypeExecutionPrepare, ID: "late"})
 	}()
 	select {
 	case err := <-quiet:
@@ -106,23 +108,23 @@ func TestQuiesceDrainsPendingReceiptAndFencesConcurrentAdmission(t *testing.T) {
 	}
 }
 
-func TestQuiescePreservesIdleOwnerAgainstExpiredTimerAndRequiresExactResume(t *testing.T) {
+func TestQuiescePreservesIdleExecutorAgainstExpiredTimerAndRequiresExactResume(t *testing.T) {
 	sender := suspendSender(func(context.Context, proto.Envelope) error { return nil })
 	r := suspensionRouter(t, sender)
-	session := &suspendedSession{}
-	state := &sessionState{runID: "run", environmentID: "env", stateKey: "state", session: session, ctxCancel: func() {}, retain: true}
+	native := &suspendedExecutor{}
+	owner := &executorState{id: "executor", sessionID: "session", environmentID: "env", native: native, cancel: func() {}}
 	r.mu.Lock()
-	r.idle["state"] = map[*sessionState]struct{}{state: {}}
-	r.scheduleIdleLocked(state)
-	oldLease := state.idleLease
+	r.executors[owner.sessionID] = owner
+	r.scheduleExecutorIdleLocked(owner)
+	oldLease := owner.idleLease
 	r.mu.Unlock()
 	request := proto.EnvironmentSuspendPayload{EnvironmentID: "env", SuspendID: "attempt"}
 	if err := r.Quiesce(context.Background(), request); err != nil {
 		t.Fatal(err)
 	}
-	r.expireIdle(state, oldLease)
-	if session.cancelled.Load() != 0 {
-		t.Fatal("pre-snapshot timer killed retained owner")
+	r.expireIdleExecutor(owner, oldLease)
+	if native.closed.Load() != 0 {
+		t.Fatal("pre-snapshot timer closed retained owner")
 	}
 	wrong := request
 	wrong.SuspendID = "obsolete"
@@ -133,10 +135,10 @@ func TestQuiescePreservesIdleOwnerAgainstExpiredTimerAndRequiresExactResume(t *t
 		t.Fatal(err)
 	}
 	r.mu.Lock()
-	newLease := state.idleLease
+	newLease := owner.idleLease
 	r.mu.Unlock()
-	r.expireIdle(state, newLease)
-	if session.cancelled.Load() != 1 {
+	r.expireIdleExecutor(owner, newLease)
+	if native.closed.Load() != 1 {
 		t.Fatal("normal idle expiration was not restored")
 	}
 }
@@ -164,7 +166,7 @@ func TestQuiesceDrainDeadlineCannotReopenAdmission(t *testing.T) {
 	if err := r.Quiesce(ctx, proto.EnvironmentSuspendPayload{EnvironmentID: "env", SuspendID: "attempt"}); !errors.Is(err, context.Canceled) {
 		t.Fatalf("quiesce=%v", err)
 	}
-	if err := r.Handle(context.Background(), proto.Envelope{Type: proto.TypePromptRequest, ID: "late"}); !errors.Is(err, ErrRouterQuiesced) {
+	if err := r.Handle(context.Background(), proto.Envelope{Type: proto.TypeExecutionPrepare, ID: "late"}); !errors.Is(err, ErrRouterQuiesced) {
 		t.Fatalf("deadline reopened admission: %v", err)
 	}
 	r.shutdownWG.Done()
diff --git a/apps/daemon/internal/dispatch/workspace_write.go b/apps/daemon/internal/dispatch/workspace_write.go
index cd4722a6a..7aa41f555 100644
--- a/apps/daemon/internal/dispatch/workspace_write.go
+++ b/apps/daemon/internal/dispatch/workspace_write.go
@@ -58,7 +58,7 @@ func (r *Router) handleWorkspaceWrite(ctx context.Context, env proto.Envelope) e
 			}
 			return r.sendWorkspaceWrite(ctx, env.ID, rejectedWorkspaceWrite("write_capacity"))
 		}
-		if !r.localWorkspace.AcceptsFileWrite(request.EnvironmentID, request.SessionID) || len(r.sessions) != 0 || len(r.idle) != 0 || len(r.workspaceReads) != 0 {
+		if !r.localWorkspace.AcceptsFileWrite(request.EnvironmentID, request.SessionID) || len(r.sessions) != 0 || len(r.workspaceReads) != 0 {
 			r.mu.Unlock()
 			return r.sendWorkspaceWrite(ctx, env.ID, rejectedWorkspaceWrite("resource_unavailable"))
 		}
diff --git a/apps/daemon/internal/localworkspace/binding.go b/apps/daemon/internal/localworkspace/binding.go
index fe8bca207..5ee7fbf31 100644
--- a/apps/daemon/internal/localworkspace/binding.go
+++ b/apps/daemon/internal/localworkspace/binding.go
@@ -69,7 +69,7 @@ func (b *Binding) Configure(r proto.PromptRequestPayload) (proto.PromptRequestPa
 		return r, nil
 	}
 	if b == nil || r.LocalEnvironment == nil || r.LocalEnvironment.ID != b.environment || r.AgentStateKey != b.stateKey ||
-		r.DisableExecutionEnvironment || r.ConversationID != "" {
+		r.DisableExecutionEnvironment {
 		return r, errors.New("request does not match the dedicated local Environment")
 	}
 	if !r.WorkspaceReadOnly || r.LocalEnvironment.NetworkAccess != "" || len(r.LocalEnvironment.AllowedDomains) > 0 {
diff --git a/apps/daemon/internal/localworkspace/binding_test.go b/apps/daemon/internal/localworkspace/binding_test.go
index 9aad690f0..6d5bc80a5 100644
--- a/apps/daemon/internal/localworkspace/binding_test.go
+++ b/apps/daemon/internal/localworkspace/binding_test.go
@@ -26,7 +26,7 @@ func testBinding(t *testing.T) (*Binding, proto.PromptRequestPayload) {
 	}
 	b.networkAccess = "disabled"
 	b.capabilityRoot = t.TempDir()
-	return b, proto.PromptRequestPayload{LocalEnvironment: &proto.LocalEnvironment{ID: environment, NetworkAccess: "disabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}, AgentStateKey: "agents-api-" + session, ReleaseOnCompletion: true}
+	return b, proto.PromptRequestPayload{LocalEnvironment: &proto.LocalEnvironment{ID: environment, NetworkAccess: "disabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}, AgentStateKey: "agents-api-" + session}
 }
 
 func TestBindingRejectsScopeOverrides(t *testing.T) {
@@ -95,14 +95,6 @@ func TestBindingPrepareRejectsOtherWorkspaceRoot(t *testing.T) {
 	}
 }
 
-func TestBindingAllowsRetainedExecutor(t *testing.T) {
-	b, req := testBinding(t)
-	req.ReleaseOnCompletion = false
-	if _, err := b.Configure(req); err != nil {
-		t.Fatal(err)
-	}
-}
-
 func TestCapabilityLayoutUsesOperatorDirectories(t *testing.T) {
 	b, _ := testBinding(t)
 	for _, directory := range []string{filepath.Join(b.workspace, "capabilities"), filepath.Join(os.Getenv("OAC_RUNTIME_HOME"), "capabilities")} {
diff --git a/apps/daemon/internal/transport/ws_test.go b/apps/daemon/internal/transport/ws_test.go
index 13d5e2390..163de36cb 100644
--- a/apps/daemon/internal/transport/ws_test.go
+++ b/apps/daemon/internal/transport/ws_test.go
@@ -186,9 +186,9 @@ func TestRecvDeliversServerSentFrames(t *testing.T) {
 	}
 	defer conn.Close()
 
-	// Server pushes a prompt_request down to the daemon.
+	// Server pushes a prompt_cancel down to the daemon.
 	serverConn := <-gw.connCh
-	pushed, _ := proto.NewEnvelope("prompt_request", "run_abc", map[string]string{"prompt": "hi"})
+	pushed, _ := proto.NewEnvelope(proto.TypePromptCancel, "run_abc", proto.PromptCancelPayload{DeliveryID: "cancel"})
 	raw, _ := json.Marshal(pushed)
 	if err := serverConn.WriteMessage(websocket.TextMessage, raw); err != nil {
 		t.Fatalf("server write: %v", err)
@@ -196,8 +196,8 @@ func TestRecvDeliversServerSentFrames(t *testing.T) {
 
 	select {
 	case env := <-conn.Recv():
-		if env.Type != "prompt_request" || env.ID != "run_abc" {
-			t.Errorf("received %+v, want prompt_request/run_abc", env)
+		if env.Type != proto.TypePromptCancel || env.ID != "run_abc" {
+			t.Errorf("received %+v, want prompt_cancel/run_abc", env)
 		}
 	case <-time.After(2 * time.Second):
 		t.Fatal("never received the server-pushed frame")
diff --git a/apps/daemon/internal/wireconformance/wire_test.go b/apps/daemon/internal/wireconformance/wire_test.go
index 328737c23..9af45ecba 100644
--- a/apps/daemon/internal/wireconformance/wire_test.go
+++ b/apps/daemon/internal/wireconformance/wire_test.go
@@ -159,7 +159,7 @@ func connectRuntime(t *testing.T, peer *corePeer, setupErr error) *runtimeSide {
 	kinds := agent.NewRegistry()
 	kinds.RegisterKind(proto.SupportedAgentKind{Kind: prototest.HarnessKind, Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})},
 		harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-			return nil, errors.New("prepared execution must not use prompt_request")
+			return nil, errors.New("prepared execution must not use the direct Session factory")
 		})
 	kinds.RegisterExecutor(prototest.HarnessKind, func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 		return rt.executor, setupErr
diff --git a/apps/daemon/testdata/onboarding/main.go b/apps/daemon/testdata/onboarding/main.go
index 4ead4f620..3252f0bdb 100644
--- a/apps/daemon/testdata/onboarding/main.go
+++ b/apps/daemon/testdata/onboarding/main.go
@@ -37,7 +37,7 @@ type harness struct {
 }
 
 func (h *harness) prepare(_ context.Context, req proto.PromptRequestPayload) (agent.Executor, error) {
-	if req.RunID != "" || len(req.Input) != 0 || req.ConversationID != "" {
+	if req.RunID != "" || len(req.Input) != 0 {
 		return nil, errors.New("preparation submitted fixture input")
 	}
 	if !req.DisableExecutionEnvironment || !req.DisableSubagents || len(req.FunctionTools) > 0 || req.MCPHTTPServers != nil {
diff --git a/docs/runtime-protocol.md b/docs/runtime-protocol.md
index fdd0e943b..6b74785a0 100644
--- a/docs/runtime-protocol.md
+++ b/docs/runtime-protocol.md
@@ -53,7 +53,7 @@ A declaration describes what the Runtime can do. Core admits a public feature on
 
 `permissions` gates permission decisions inside the Runtime. Core has no admission rule for `usage` and `resume`.
 
-The prompt request (`prompt_request`, or the configuration of `execution_prepare`) carries the opt-ins Core sets for each Run:
+The `execution_prepare` configuration carries the opt-ins Core sets for each Run:
 
 | Field | Set by Core |
 | --- | --- |
@@ -98,7 +98,7 @@ The linked source files define the required fields, validators, limits and finit
 | --- | --- | --- |
 | `runtime_prepare` | `runtime_prepare_result` | [Initialization and capability transfer](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/runtime_prepare.go) |
 | `execution_prepare`, `execution_start`, `execution_release` | `preparation_status` | [Execution admission](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/preparation.go) |
-| `prompt_request`, `prompt_cancel`, `device_shutdown` | `delta`, `thinking`, `output_message`, `tool_call`, `usage`, `error`, `done`, `heartbeat` | [Requests](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go), [events and capabilities](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
+| `prompt_cancel`, `device_shutdown` | `delta`, `thinking`, `output_message`, `tool_call`, `usage`, `error`, `done`, `heartbeat` | [Requests](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go), [events and capabilities](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
 | `permission_decision`, `prompt_for_user_choice_decision` | `permission_request`, `permission_cancel`, `prompt_for_user_choice`, `interaction_decision_ack` | [Requests](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go), [interactions](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
 | `prompt_steer` | `prompt_steer_ack` | [Active input receipts](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/steering.go) |
 | `function_result` | `function_call`, `interaction_decision_ack` | [Function calls](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/functions.go) |
@@ -127,8 +127,6 @@ Preparation and start run outside the receive loop and router lock. An admission
 
 Idle expiry of an Executor is a Runtime resource policy, separate from Core's active-Turn concurrency. On shutdown the Runtime closes active and idle Executors, keeps any target whose close failed and allows a later serialized retry. An ordinary disconnection closes the failed transport and keeps the exact router until shutdown succeeds; a wait timeout or failed cleanup never authorizes reconnection, and process shutdown keeps waiting rather than discarding owned native resources. Workspace operations keep their binding and settlement rules across Turn boundaries and Executor closure.
 
-`prompt_request` starts a Run directly, without an admission handle. It is not a fallback after a failed prepared start.
-
 ## Active input receipts
 
 Core delivers active input as `prompt_steer` with `durable_receipt: true`, one input at a time per Run, and waits for its receipt before sending the next:
@@ -139,7 +137,7 @@ Core delivers active input as `prompt_steer` with `durable_receipt: true`, one i
 | `written` acknowledgement | Core waits at most 30 seconds from delivery for `written`; otherwise the input outcome is unknown |
 | Receipt send | Each receipt send has its own 5-second, shutdown-aware budget |
 | Native acceptance | `accepted` arrives under the Turn lifetime, with no automatic redelivery |
-| Done | Before `done`, the Runtime waits at most 15 seconds (the write and send budgets) for an in-flight input |
+| Done | The Runtime sends `done` after native Turn settlement and after the receipt send of any in-flight input; the native write and receipt send budgets bound that input |
 
 Neither `written` nor a send failure advances Core's input cursor. Once cancellation is sent, its receipt owns the terminal outcome even if an input becomes unknown first; Core records `cancel_unconfirmed` when no cancellation confirmation arrives within 15 seconds. A cancellation receipt carries the stopped Turn's confirmed continuity snapshot when no `done` is emitted.
 
@@ -199,7 +197,7 @@ Core runs an idle directory read on the Worker's Session scheduling reservation
 
 ## MCP connection authority
 
-Every public `MCPHTTPServer` in a prompt request carries an explicit `connection_origin`; a missing or unknown value rejects rather than selecting a default, and Core freezes the public default before dispatch. The Runtime validates the origin with the common validator before selecting a factory and resolves public and installed MCP into transient effective bindings. The [Environment contract](../contracts/agents-api/environments.md#public-mcp-connection-origin) owns the supported combinations, native limits and failure ownership.
+Every public `MCPHTTPServer` in an `execution_prepare` configuration carries an explicit `connection_origin`; a missing or unknown value rejects rather than selecting a default, and Core freezes the public default before dispatch. The Runtime validates the origin with the common validator before selecting a factory and resolves public and installed MCP into transient effective bindings. The [Environment contract](../contracts/agents-api/environments.md#public-mcp-connection-origin) owns the supported combinations, native limits and failure ownership.
 
 ## Contract verification
 
diff --git a/docs/zh/runtime-protocol.md b/docs/zh/runtime-protocol.md
index 0a13af57b..e721f6133 100644
--- a/docs/zh/runtime-protocol.md
+++ b/docs/zh/runtime-protocol.md
@@ -1,7 +1,7 @@
 ---
 title: "Core–Runtime 协议"
 source: docs/runtime-protocol.md
-source_hash: fd5bcb71c9234310a449fad97a30a899027133ca8df862e8a3306f6bd3dacae8
+source_hash: 1d425cdf68ffd76fbf4ebb856fcf7af8a96eea93e28b1686292eeb0184376664
 ---
 
 此协议在 Runtime daemon 获取机器凭据后连接 Core 与 daemon，定义 daemon 连接上消息的含义和顺序。wire 类型、限制和验证器仅在 [`internal/agentdaemon/proto`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/internal/agentdaemon/proto) 中定义一次；Core 的 [gateway](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/services/core/internal/runtimegateway) 与参考 Runtime 的 [dispatcher](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/apps/daemon/internal/dispatch) 都使用它们，因此无需同步第二套 payload schema。签发凭据和打开连接的 HTTP 路由见[机器连接 API](../../contracts/agents-api/zh/machine-api.md)。
@@ -55,7 +55,7 @@ wire 上每个字段都是 JSON boolean，所有字段都必须出现，包括 `
 
 `permissions` 控制 Runtime 内部权限决定。Core 对 `usage` 和 `resume` 没有准入规则。
 
-prompt 请求（`prompt_request` 或 `execution_prepare` 的配置）携带 Core 为各 Run 设置的显式启用项：
+`execution_prepare` 的配置携带 Core 为各 Run 设置的显式启用项：
 
 | 字段 | Core 设置方式 |
 | --- | --- |
@@ -100,7 +100,7 @@ User-choice decision 携带 `question_answers`：每个已提供回答都有明
 | --- | --- | --- |
 | `runtime_prepare` | `runtime_prepare_result` | [初始化与能力传输](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/runtime_prepare.go) |
 | `execution_prepare`, `execution_start`, `execution_release` | `preparation_status` | [执行准入](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/preparation.go) |
-| `prompt_request`, `prompt_cancel`, `device_shutdown` | `delta`, `thinking`, `output_message`, `tool_call`, `usage`, `error`, `done`, `heartbeat` | [请求](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go)、[事件与能力](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
+| `prompt_cancel`, `device_shutdown` | `delta`, `thinking`, `output_message`, `tool_call`, `usage`, `error`, `done`, `heartbeat` | [请求](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go)、[事件与能力](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
 | `permission_decision`, `prompt_for_user_choice_decision` | `permission_request`, `permission_cancel`, `prompt_for_user_choice`, `interaction_decision_ack` | [请求](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go)、[交互](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
 | `prompt_steer` | `prompt_steer_ack` | [活动输入回执](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/steering.go) |
 | `function_result` | `function_call`, `interaction_decision_ack` | [Function 调用](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/functions.go) |
@@ -129,8 +129,6 @@ preparation 和 start 在 receive loop 与 router lock 之外运行。admission
 
 Executor 空闲到期属于 Runtime 资源策略，与 Core 的活动 Turn 并发限制独立。关闭时 Runtime 关闭活动和空闲 Executor，保留关闭失败的目标，并允许稍后串行重试。普通断连会关闭失败的 transport 并保留原 router，直到 shutdown 成功；等待超时或清理失败不授权重连，进程 shutdown 继续等待，不丢弃自己拥有的原生资源。工作区操作在跨 Turn 和 Executor 关闭后仍保留绑定与结算规则。
 
-`prompt_request` 不经过 admission handle，直接启动 Run。它不是 prepared start 失败后的回退。
-
 ## 活动输入回执 {#active-input-receipts}
 
 Core 通过 `prompt_steer` 交付活动输入，设置 `durable_receipt: true`，每个 Run 一次交付一个输入，并等待回执后再发送下一个：
@@ -141,7 +139,7 @@ Core 通过 `prompt_steer` 交付活动输入，设置 `durable_receipt: true`
 | `written` 确认 | Core 从交付开始最多等待 30 秒取得 `written`；否则输入结果未知 |
 | 回执发送 | 每次发送回执都有独立的 5 秒预算，并感知 shutdown |
 | 原生接受 | `accepted` 在 Turn 生命周期内到达，不自动重新交付 |
-| Done | `done` 前，Runtime 最多等待 15 秒（写入与发送预算），等待正在处理的输入 |
+| Done | Runtime 在原生 Turn 结算完成、且正在处理的输入的回执发送结束后才发送 `done`；该输入受原生写入与回执发送预算限制 |
 
 `written` 和发送失败都不会推进 Core 的 input cursor。取消发出后，即使输入先变为未知，终结结果也由取消回执负责；15 秒内没有取消确认时，Core 记录 `cancel_unconfirmed`。未发出 `done` 时，取消回执携带已停止 Turn 的已确认 continuity snapshot。
 
@@ -201,7 +199,7 @@ Core 在 Worker 的 Session 调度预约上运行空闲目录读取，活动执
 
 ## MCP 连接权限 {#mcp-connection-authority}
 
-prompt request 中每个公开 `MCPHTTPServer` 都携带明确的 `connection_origin`；值缺失或未知时拒绝，不选择默认值，Core 在 dispatch 前冻结公开默认值。Runtime 在选择 factory 前用公共 validator 验证 origin，并将公开和已安装 MCP 解析为临时 effective binding。[Environment 契约](../../contracts/agents-api/zh/environments.md#public-mcp-connection-origin)负责支持的组合、原生限制和故障所有权。
+`execution_prepare` 配置中每个公开 `MCPHTTPServer` 都携带明确的 `connection_origin`；值缺失或未知时拒绝，不选择默认值，Core 在 dispatch 前冻结公开默认值。Runtime 在选择 factory 前用公共 validator 验证 origin，并将公开和已安装 MCP 解析为临时 effective binding。[Environment 契约](../../contracts/agents-api/zh/environments.md#public-mcp-connection-origin)负责支持的组合、原生限制和故障所有权。
 
 ## 契约验证 {#contract-verification}
 
diff --git a/internal/agentdaemon/proto/envelope.go b/internal/agentdaemon/proto/envelope.go
index da98ad3df..11772622a 100644
--- a/internal/agentdaemon/proto/envelope.go
+++ b/internal/agentdaemon/proto/envelope.go
@@ -12,7 +12,7 @@
 // a lookup table.
 //
 // Envelope.ID correlation:
-//   - prompt_request / prompt_cancel: ID = RunID.
+//   - prompt_cancel: ID = RunID.
 //   - delta / tool_call / usage / error / done: ID = originating RunID.
 //   - permission_request: ID = RunID; payload.request_id is the interaction ID.
 //   - permission_decision / permission_cancel: ID = interaction ID.
diff --git a/internal/agentdaemon/proto/outbound.go b/internal/agentdaemon/proto/outbound.go
index 799d09835..03e4acfbf 100644
--- a/internal/agentdaemon/proto/outbound.go
+++ b/internal/agentdaemon/proto/outbound.go
@@ -7,12 +7,6 @@ import (
 
 // Type constants for server → daemon frames.
 const (
-	// TypePromptRequest triggers one prompt cycle. Envelope.ID = RunID;
-	// the daemon stamps every resulting upstream frame with the same
-	// ID so the gateway can fan them back to the matching StreamPrompt
-	// subscriber.
-	TypePromptRequest = "prompt_request"
-
 	// TypePromptCancel aborts an in-flight prompt. Envelope.ID =
 	// RunID. Idempotent — cancelling an unknown / already-finished
 	// run is a no-op on the daemon side.
@@ -35,22 +29,16 @@ const (
 	TypeDeviceShutdown = "device_shutdown"
 )
 
-// PromptRequestPayload is the daemon-side view of a connector.PromptInput,
-// trimmed to fields a daemon agent actually needs. Kept separate from
-// PromptInput so future agent implementations can evolve the wire shape
-// without touching the connector surface.
+// PromptRequestPayload is the execution configuration that execution_prepare
+// carries. execution_start supplies the Run identity and input.
 type PromptRequestPayload struct {
 	MaxConcurrentSubagents *int `json:"max_concurrent_subagents,omitempty"`
 	// AgentKind selects which agent implementation the daemon
 	// dispatches to.
 	AgentKind string `json:"agent_kind"`
 
-	// ConversationID is the Core Session ID of a prompt_request Run. Preparation
-	// and Executor configurations leave it empty, and no adapter reads it.
-	ConversationID string `json:"conversation_id"`
-
-	// RunID is the ID of the Core Turn this prompt executes; mirrored
-	// back on every upstream frame via Envelope.ID.
+	// RunID and Input are empty in an execution_prepare configuration.
+	// Adapters set them from execution_start when they start a Turn.
 	RunID string `json:"run_id"`
 
 	// Input preserves ordered user messages and content.
@@ -73,10 +61,8 @@ type PromptRequestPayload struct {
 
 	// AgentStateKey is the stable daemon-side state directory key.
 	// WorkspaceReadOnly prepares temporary native state that cannot start a Run.
-	WorkspaceReadOnly bool   `json:"workspace_read_only,omitempty"`
-	AgentStateKey     string `json:"agent_state_key,omitempty"`
-	// ReleaseOnCompletion closes the native writer before acknowledging Done.
-	ReleaseOnCompletion          bool           `json:"release_on_completion,omitempty"`
+	WorkspaceReadOnly            bool           `json:"workspace_read_only,omitempty"`
+	AgentStateKey                string         `json:"agent_state_key,omitempty"`
 	RequireExistingNativeSession bool           `json:"require_existing_native_session,omitempty"`
 	ObserveMessages              bool           `json:"observe_messages,omitempty"`
 	ObserveSubagentIdentities    bool           `json:"observe_subagent_identities,omitempty"`
diff --git a/internal/agentdaemon/proto/workspace_read_preparation.go b/internal/agentdaemon/proto/workspace_read_preparation.go
index 5869ca3b2..754d85011 100644
--- a/internal/agentdaemon/proto/workspace_read_preparation.go
+++ b/internal/agentdaemon/proto/workspace_read_preparation.go
@@ -4,8 +4,7 @@ package proto
 // The native adapter supplies temporary state; this request cannot resume or start.
 func ValidWorkspaceReadPreparation(r PromptRequestPayload) bool {
 	return r.WorkspaceReadOnly && r.LocalEnvironment != nil && r.AgentStateKey != "" &&
-		r.ReleaseOnCompletion && r.RunID == "" && len(r.Input) == 0 &&
-		r.ConversationID == "" && r.AgentSessionID == "" &&
+		r.RunID == "" && len(r.Input) == 0 && r.AgentSessionID == "" &&
 		!r.RequireExistingNativeSession && !r.DisableExecutionEnvironment &&
 		len(r.AgentOptions) == 0 && r.ExecutionControls == nil && r.MCPHTTPServers == nil &&
 		len(r.FunctionTools) == 0 && !r.ToolSearch && !r.ObserveMessages &&
diff --git a/scripts/name-allowlist.json b/scripts/name-allowlist.json
index 0cb022c51..b2bd58c18 100644
--- a/scripts/name-allowlist.json
+++ b/scripts/name-allowlist.json
@@ -214,6 +214,16 @@
     "regex": "\"agents-api-(?:session)?\"",
     "reason": "Executor ownership validates the current Core and local-workspace AgentStateKey namespace; this change does not introduce an alternate identity or compatibility path."
   },
+  {
+    "path": "apps/daemon/internal/cli/claude_sdk_live_linux_test.go",
+    "regex": "\"agents-api-registered-acceptance\"",
+    "reason": "Executor ownership validates the current Core and local-workspace AgentStateKey namespace; this change does not introduce an alternate identity or compatibility path."
+  },
+  {
+    "path": "services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go",
+    "regex": "\"agents-api-mcp-bearer-acceptance\"",
+    "reason": "Executor ownership validates the current Core and local-workspace AgentStateKey namespace; this change does not introduce an alternate identity or compatibility path."
+  },
   {
     "path": "apps/daemon/internal/localworkspace/capabilities.go",
     "regex": "\"agents-api-\"",
diff --git a/services/core/internal/execution/delivery.go b/services/core/internal/execution/delivery.go
index 3cd1e1833..70b9c331f 100644
--- a/services/core/internal/execution/delivery.go
+++ b/services/core/internal/execution/delivery.go
@@ -50,24 +50,24 @@ func abort(peer *runtimegateway.Session, runID string) {
 	_ = send(context.Background(), peer, proto.TypePromptCancel, runID, proto.PromptCancelPayload{})
 }
 
-func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, peer *runtimegateway.Session, request proto.PromptRequestPayload, first int64, prepared *preparedStart) (result Result, status string) {
+func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, peer *runtimegateway.Session, request proto.PromptRequestPayload, runID string, input proto.MessageInput, first int64, prepared *preparedStart) (result Result, status string) {
 	changed, unsubscribeChanges := d.notifications.subscribe(tenantID, sessionID)
 	defer unsubscribeChanges()
 	status = sessions.TurnFailed
 	result.AppliedThrough = first
-	subscription, err := peer.SubscribeDurable(request.RunID)
+	subscription, err := peer.SubscribeDurable(runID)
 	if err != nil {
 		result.ErrorCode = "device_disconnected"
 		return
 	}
 	upstream := subscription.Events
-	defer peer.Unsubscribe(request.RunID)
+	defer peer.Unsubscribe(runID)
 	defer func() {
 		if status == sessions.TurnFailed {
-			abort(peer, request.RunID)
+			abort(peer, runID)
 		}
 	}()
-	journal := &journal{writer: d.sessionExecution, tenant: tenantID, session: sessionID, turn: request.RunID, next: 1,
+	journal := &journal{writer: d.sessionExecution, tenant: tenantID, session: sessionID, turn: runID, next: 1,
 		observeSubagents: request.ObserveSubagentIdentities}
 	defer func() {
 		finishCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
@@ -82,17 +82,11 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 			result.ErrorCode, status = "event_stream_incomplete", sessions.TurnFailed
 		}
 	}()
-	var preparationEvents <-chan proto.Envelope
+	preparationEvents := prepared.sub.Events
 	var executorRetried, nativeObserved bool
 	inputStarted := time.Now()
 	firstTextObserved := false
-	if prepared != nil {
-		preparationEvents = prepared.sub.Events
-		err = prepared.start(ctx, request)
-	} else {
-		err = send(ctx, peer, proto.TypePromptRequest, request.RunID, request)
-	}
-	if err != nil {
+	if err = prepared.start(ctx, runID, input); err != nil {
 		result.ErrorCode = "delivery_unknown"
 		return
 	}
@@ -105,7 +99,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 	var pending *pendingInput
 	var cancelSent time.Time
 	var cancelReply <-chan cancellationResult
-	functions := &functionExchange{kind: request.AgentKind, turns: d.SessionsReader, sessions: d.sessionExecution, tenant: tenantID, session: sessionID, turn: request.RunID, tools: request.FunctionTools}
+	functions := &functionExchange{kind: request.AgentKind, turns: d.SessionsReader, sessions: d.sessionExecution, tenant: tenantID, session: sessionID, turn: runID, tools: request.FunctionTools}
 	done := false
 	cancelCtx, stopCancellation := context.WithCancel(ctx)
 	defer stopCancellation()
@@ -124,7 +118,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 				result.ErrorCode = "preparation_interrupted"
 				return
 			}
-			started, err := prepared.started(env, request.RunID)
+			started, err := prepared.started(env, runID)
 			if err != nil {
 				var rejection *preparationRejection
 				if errors.As(err, &rejection) && rejection.operation == proto.TypeExecutionStart && rejection.code == "executor_unavailable" && !executorRetried && !nativeObserved && cancelReply == nil {
@@ -137,7 +131,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 						result.ErrorCode = "device_disconnected"
 						return
 					}
-					replacement, prepareErr := d.prepareTurnExecutor(ctx, peer, tenantID, sessionID, request.RunID, request, sessions.TurnInProgress)
+					replacement, prepareErr := d.prepareTurnExecutor(ctx, peer, tenantID, sessionID, runID, request, sessions.TurnInProgress)
 					if prepareErr != nil {
 						result.ErrorCode = "executor_recovery_failed"
 						return
@@ -145,7 +139,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 					prepared = replacement
 					defer prepared.close()
 					preparationEvents = prepared.sub.Events
-					if prepared.start(ctx, request) != nil {
+					if prepared.start(ctx, runID, input) != nil {
 						result.ErrorCode = "delivery_unknown"
 						return
 					}
@@ -201,7 +195,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 			nativeObserved = true
 			if !firstTextObserved && hasText(env) {
 				firstTextObserved = true
-				recordFirstText(ctx, sessionID, request.RunID, inputStarted)
+				recordFirstText(ctx, sessionID, runID, inputStarted)
 			}
 			writeErr := journal.observe(ctx, env)
 			if result.mergeObservation(env) != nil {
@@ -278,7 +272,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 				}
 				continue
 			}
-			turn, err := d.SessionsReader.GetTurn(ctx, tenantID, sessionID, request.RunID)
+			turn, err := d.SessionsReader.GetTurn(ctx, tenantID, sessionID, runID)
 			if err != nil {
 				result.ErrorCode = "execution_state_unavailable"
 				if ctx.Err() != nil {
@@ -291,7 +285,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 				return
 			}
 			if !turn.CancelRequestedAt.IsZero() {
-				cancelReply = requestCancellation(cancelCtx, peer, request.RunID)
+				cancelReply = requestCancellation(cancelCtx, peer, runID)
 				cancelSent = time.Now()
 				continue
 			}
@@ -303,7 +297,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 				continue
 			}
 			if pending == nil {
-				inputs, err := d.SessionsReader.ListTurnInputs(ctx, tenantID, sessionID, request.RunID, result.AppliedThrough, 1)
+				inputs, err := d.SessionsReader.ListTurnInputs(ctx, tenantID, sessionID, runID, result.AppliedThrough, 1)
 				if err != nil {
 					result.ErrorCode = "execution_state_unavailable"
 					if ctx.Err() != nil {
@@ -338,7 +332,7 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 					result.ErrorCode = "message_input_unsupported"
 					return
 				}
-				if send(ctx, peer, proto.TypePromptSteer, request.RunID, proto.PromptSteerPayload{InputID: strconv.FormatInt(pending.sequence, 10), Input: pending.input, DurableReceipt: true}) != nil {
+				if send(ctx, peer, proto.TypePromptSteer, runID, proto.PromptSteerPayload{InputID: strconv.FormatInt(pending.sequence, 10), Input: pending.input, DurableReceipt: true}) != nil {
 					result.ErrorCode = "input_outcome_unknown"
 					return
 				}
diff --git a/services/core/internal/execution/directory_preparation.go b/services/core/internal/execution/directory_preparation.go
index 177f98571..e159eace3 100644
--- a/services/core/internal/execution/directory_preparation.go
+++ b/services/core/internal/execution/directory_preparation.go
@@ -25,7 +25,7 @@ func (d *Dispatcher) readPreparedDirectory(ctx context.Context, peer *runtimegat
 }
 
 func (d *Dispatcher) withPreparedWorkspace(owner context.Context, peer *runtimegateway.Session, session sessions.Session, environment sessions.Environment, bound sessions.ExecutionDevice, consume func(context.Context, string) error) error {
-	req := proto.PromptRequestPayload{AgentKind: session.Engine, AgentStateKey: "agents-api-" + session.ID, ReleaseOnCompletion: true, WorkspaceReadOnly: true}
+	req := proto.PromptRequestPayload{AgentKind: session.Engine, AgentStateKey: "agents-api-" + session.ID, WorkspaceReadOnly: true}
 	if err := d.configurePreparedEnvironment(session, environment, bound, &req); err != nil {
 		return ErrExecutionUnavailable
 	}
diff --git a/services/core/internal/execution/dispatcher.go b/services/core/internal/execution/dispatcher.go
index 7a1545402..909fb9702 100644
--- a/services/core/internal/execution/dispatcher.go
+++ b/services/core/internal/execution/dispatcher.go
@@ -116,13 +116,12 @@ func (d *Dispatcher) Run(ctx context.Context, tenantID, sessionID, turnID string
 	if _, err := d.sessionExecution.TransitionTurn(ctx, tenantID, sessionID, turnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		return sessions.Turn{}, err
 	}
-	req.ConversationID, req.RunID, req.Input = sessionID, turnID, text
-	release, err := peer.TrackExecutionDelivery(req.RunID)
+	release, err := peer.TrackExecutionDelivery(turnID)
 	if err != nil {
 		return d.finishRun(tenantID, sessionID, turnID, snapshot.Agent.Model, Result{ErrorCode: "delivery_unknown", AppliedThrough: through}, sessions.TurnFailed)
 	}
 	defer release()
-	result, status := d.deliver(ctx, tenantID, sessionID, peer, req, through, prepared)
+	result, status := d.deliver(ctx, tenantID, sessionID, peer, req, turnID, text, through, prepared)
 	return d.finishRun(tenantID, sessionID, turnID, snapshot.Agent.Model, result, status)
 }
 
diff --git a/services/core/internal/execution/executor_preparation.go b/services/core/internal/execution/executor_preparation.go
index 11fafdf9d..1e3854e32 100644
--- a/services/core/internal/execution/executor_preparation.go
+++ b/services/core/internal/execution/executor_preparation.go
@@ -18,7 +18,6 @@ func (d *Dispatcher) prepareTurnExecutor(ctx context.Context, peer *runtimegatew
 	if err != nil {
 		return nil, err
 	}
-	request.RunID, request.ConversationID, request.Input = "", "", nil
 	if err = send(ctx, peer, proto.TypeExecutionPrepare, prepared.requestID, proto.ExecutionPreparePayload{SessionID: session, Configuration: request}); err == nil {
 		err = d.awaitTurnExecutor(ctx, tenant, session, turn, expectedStatus, prepared)
 	}
diff --git a/services/core/internal/execution/preparation.go b/services/core/internal/execution/preparation.go
index ca815d02e..089a04eff 100644
--- a/services/core/internal/execution/preparation.go
+++ b/services/core/internal/execution/preparation.go
@@ -128,9 +128,9 @@ func (d *Dispatcher) awaitPreparation(ctx context.Context, tenant, session strin
 	}
 }
 
-func (p *preparedStart) start(ctx context.Context, request proto.PromptRequestPayload) error {
+func (p *preparedStart) start(ctx context.Context, runID string, input proto.MessageInput) error {
 	p.startSentAt = time.Now()
-	return send(ctx, p.peer, proto.TypeExecutionStart, p.requestID, proto.ExecutionStartPayload{Handle: p.handle, ExecutorID: p.executorID, RunID: request.RunID, Input: request.Input})
+	return send(ctx, p.peer, proto.TypeExecutionStart, p.requestID, proto.ExecutionStartPayload{Handle: p.handle, ExecutorID: p.executorID, RunID: runID, Input: input})
 }
 
 func (p *preparedStart) started(env proto.Envelope, runID string) (bool, error) {
diff --git a/services/core/internal/execution/prepared_dispatch.go b/services/core/internal/execution/prepared_dispatch.go
index 6cb5817f6..751578383 100644
--- a/services/core/internal/execution/prepared_dispatch.go
+++ b/services/core/internal/execution/prepared_dispatch.go
@@ -111,17 +111,16 @@ func (d *Dispatcher) RunEnvironmentInput(ctx context.Context, lease Ownership, t
 	if run.Reservation.Receipts[0].Replayed {
 		return run, nil
 	}
-	req.RunID = run.Reservation.Receipts[0].TurnID
-	req.Input = messages
+	turnID := run.Reservation.Receipts[0].TurnID
 	through := run.Reservation.Receipts[len(run.Reservation.Receipts)-1].Sequence
-	releaseDelivery, err := peer.TrackExecutionDelivery(req.RunID)
+	releaseDelivery, err := peer.TrackExecutionDelivery(turnID)
 	if err != nil {
-		run.Turn, err = d.finishRun(tenantID, sessionID, req.RunID, snapshot.Agent.Model, Result{ErrorCode: "delivery_unknown", AppliedThrough: through}, sessions.TurnFailed)
+		run.Turn, err = d.finishRun(tenantID, sessionID, turnID, snapshot.Agent.Model, Result{ErrorCode: "delivery_unknown", AppliedThrough: through}, sessions.TurnFailed)
 		return run, err
 	}
 	defer releaseDelivery()
-	result, status := d.deliver(owner, tenantID, sessionID, peer, req, through, prepared)
-	result, status = d.captureCompletedArtifacts(owner, peer, session, environment, bound.Device, req.RunID, result, status)
-	run.Turn, err = d.finishRun(tenantID, sessionID, req.RunID, snapshot.Agent.Model, result, status)
+	result, status := d.deliver(owner, tenantID, sessionID, peer, req, turnID, messages, through, prepared)
+	result, status = d.captureCompletedArtifacts(owner, peer, session, environment, bound.Device, turnID, result, status)
+	run.Turn, err = d.finishRun(tenantID, sessionID, turnID, snapshot.Agent.Model, result, status)
 	return run, err
 }
diff --git a/services/core/internal/runtimegateway/cancellation_test.go b/services/core/internal/runtimegateway/cancellation_test.go
index aeae810b7..cead32b38 100644
--- a/services/core/internal/runtimegateway/cancellation_test.go
+++ b/services/core/internal/runtimegateway/cancellation_test.go
@@ -58,7 +58,7 @@ func TestArchivedReceiptTracksDeliveryBeyondDoneAndRejectsNewWork(t *testing.T)
 	if _, err := peer.TrackExecutionDelivery("new-run"); err == nil {
 		t.Fatal("new delivery admitted while draining")
 	}
-	for _, kind := range []string{proto.TypePromptRequest, proto.TypePromptSteer, proto.TypeExecutionPrepare, proto.TypeRuntimePrepare, proto.TypeWorkspaceWrite, proto.TypeWorkspaceRead} {
+	for _, kind := range []string{proto.TypeExecutionStart, proto.TypePromptSteer, proto.TypeExecutionPrepare, proto.TypeRuntimePrepare, proto.TypeWorkspaceWrite, proto.TypeWorkspaceRead} {
 		env, _ := proto.NewEnvelope(kind, "run", nil)
 		if err := peer.Send(t.Context(), env); err == nil {
 			t.Fatal("drain permitted new operation", kind)
diff --git a/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go b/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
index 8183f6cab..a4b7d2ea1 100644
--- a/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
+++ b/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
@@ -86,18 +86,41 @@ func TestLiveMCPBearerGatewayColdContinuation(t *testing.T) {
 		t.Helper()
 		turn := &mcpBearerTurn{}
 		turns = append(turns, turn)
-		runID := uuid.NewString()
-		request := proto.PromptRequestPayload{AgentKind: "codex", ConversationID: "mcp-bearer-acceptance", RunID: runID, Input: proto.TextInput(prompt), AgentStateKey: "mcp-bearer-acceptance", AgentSessionID: resume, ReleaseOnCompletion: true, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, MCPHTTPServers: &servers, AgentOptions: map[string]any{"model": "MiniMax-M3"}, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
+		runID, prepareID := uuid.NewString(), uuid.NewString()
+		request := proto.PromptRequestPayload{AgentKind: "codex", AgentStateKey: "agents-api-mcp-bearer-acceptance", AgentSessionID: resume, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, MCPHTTPServers: &servers, AgentOptions: map[string]any{"model": "MiniMax-M3"}, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
+		send := func(kind, id string, payload any) {
+			t.Helper()
+			envelope, err := proto.NewEnvelope(kind, id, payload)
+			if err != nil || peer.Send(ctx, envelope) != nil {
+				t.Fatal("cannot dispatch the private MCP request")
+			}
+		}
+		statuses, err := peer.SubscribePreparation(prepareID)
+		if err != nil {
+			t.Fatal("cannot subscribe to preparation before real daemon dispatch")
+		}
+		defer peer.UnsubscribePreparation(prepareID)
+		send(proto.TypeExecutionPrepare, prepareID, proto.ExecutionPreparePayload{SessionID: "mcp-bearer-acceptance", Configuration: request})
+		var ready proto.PreparationStatusPayload
+		for ready.State != "ready" {
+			select {
+			case event, ok := <-statuses.Events:
+				if !ok || event.DecodePayload(&ready) != nil || ready.State != "preparing" && ready.State != "ready" {
+					t.Fatal("real daemon did not prepare the private MCP Executor")
+				}
+			case <-ctx.Done():
+				t.Fatal("real daemon preparation timed out")
+			}
+		}
 		sub, err := peer.SubscribeDurable(runID)
 		if err != nil {
 			t.Fatal("cannot subscribe before real daemon dispatch")
 		}
 		defer peer.Unsubscribe(runID)
-		envelope, err := proto.NewEnvelope(proto.TypePromptRequest, runID, request)
-		if err != nil || peer.Send(ctx, envelope) != nil {
-			t.Fatal("cannot dispatch the private MCP request")
-		}
+		send(proto.TypeExecutionStart, prepareID, proto.ExecutionStartPayload{Handle: ready.Handle, ExecutorID: ready.ExecutorID, RunID: runID, Input: proto.TextInput(prompt)})
 		mcpBearerCollectTurn(t, ctx, sub, runID, turn, expected, token, provider)
+		// The Executor stays warm after Done; closing it makes the next Turn a cold continuation.
+		send(proto.TypeDeviceShutdown, "", proto.DeviceShutdownPayload{Reason: "cold continuation"})
 		turn.NativeLaunches = mcpBearerReleased(t, root)
 		turn.BearerEnvironmentReference = mcpBearerConfigReference(t, root, token)
 		return turn
diff --git a/services/core/internal/runtimegateway/mcp_bearer_process_linux_test.go b/services/core/internal/runtimegateway/mcp_bearer_process_linux_test.go
index d8d85d26e..e2d70ae89 100644
--- a/services/core/internal/runtimegateway/mcp_bearer_process_linux_test.go
+++ b/services/core/internal/runtimegateway/mcp_bearer_process_linux_test.go
@@ -197,7 +197,7 @@ func mcpBearerReleased(t *testing.T, root string) int {
 			return launches
 		}
 		if time.Now().After(deadline) {
-			t.Fatal("Done did not release the owned native process")
+			t.Fatal("the owned native process was not released")
 		}
 		time.Sleep(25 * time.Millisecond)
 	}
diff --git a/services/core/internal/runtimegateway/session.go b/services/core/internal/runtimegateway/session.go
index 7d166ce87..7ae93c4d0 100644
--- a/services/core/internal/runtimegateway/session.go
+++ b/services/core/internal/runtimegateway/session.go
@@ -99,7 +99,7 @@ type Session struct {
 
 	// supportedKinds is the latest daemon-advertised agent_kind snapshot,
 	// updated from heartbeat frames and read by the connector before
-	// dispatching prompt_request so unsupported engines fail on the server.
+	// sending execution_prepare so unsupported engines fail on the server.
 	kindsMu        sync.RWMutex
 	kindsSeen      bool
 	supportedKinds []runtimedevice.SupportedAgentKind
diff --git a/services/core/internal/runtimegateway/session_test.go b/services/core/internal/runtimegateway/session_test.go
index a30e8a66d..9990ef097 100644
--- a/services/core/internal/runtimegateway/session_test.go
+++ b/services/core/internal/runtimegateway/session_test.go
@@ -342,10 +342,11 @@ func TestSession_SendWritesToWire(t *testing.T) {
 	sess.Start()
 	defer sess.Close("test done")
 
-	env, _ := proto.NewEnvelope(proto.TypePromptRequest, "run-1", proto.PromptRequestPayload{
-		AgentKind: "fake_alpha",
-		RunID:     "run-1",
-		Input:     proto.TextInput("hello"),
+	env, _ := proto.NewEnvelope(proto.TypeExecutionStart, "prepare-1", proto.ExecutionStartPayload{
+		Handle:     "handle-1",
+		ExecutorID: "executor-1",
+		RunID:      "run-1",
+		Input:      proto.TextInput("hello"),
 	})
 	if err := sess.Send(context.Background(), env); err != nil {
 		t.Fatalf("Send: %v", err)
diff --git a/services/core/tests/integration/deployment_model_providers_http_test.go b/services/core/tests/integration/deployment_model_providers_http_test.go
index 7e25421a1..b796d6ebf 100644
--- a/services/core/tests/integration/deployment_model_providers_http_test.go
+++ b/services/core/tests/integration/deployment_model_providers_http_test.go
@@ -279,7 +279,7 @@ func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
 		if executor.conn.ReadJSON(&frame) != nil {
 			break
 		}
-		if frame.Type == proto.TypeExecutionPrepare || frame.Type == proto.TypePromptRequest {
+		if frame.Type == proto.TypeExecutionPrepare {
 			t.Fatal("provider-free work reached the executor", frame.Type)
 		}
 	}
diff --git a/services/core/tests/integration/dispatch_test.go b/services/core/tests/integration/dispatch_test.go
index 40de3c693..36141beec 100644
--- a/services/core/tests/integration/dispatch_test.go
+++ b/services/core/tests/integration/dispatch_test.go
@@ -229,7 +229,7 @@ func TestExecutionDispatchSteeringAndNativeContinuity(t *testing.T) {
 	request := h.read(testExecutionRequest)
 	var prompt proto.PromptRequestPayload
 	_ = request.DecodePayload(&prompt)
-	if inputTextForTest(t, prompt.Input) != "Initial input" || prompt.ConversationID != h.session.ID || prompt.AgentOptions["model"] != "test-model" || prompt.AgentOptions["system_prompt"] != "Keep this instruction." {
+	if inputTextForTest(t, prompt.Input) != "Initial input" || prompt.AgentStateKey != "agents-api-"+h.session.ID || prompt.AgentOptions["model"] != "test-model" || prompt.AgentOptions["system_prompt"] != "Keep this instruction." {
 		t.Fatalf("wrong resolved request: %+v", prompt)
 	}
 	if _, err := h.bound().Run(ctx, uuid.NewString(), h.session.ID, first.TurnID); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/tests/integration/executor_fixture_test.go b/services/core/tests/integration/executor_fixture_test.go
index 36008c6e6..7cf9a56a2 100644
--- a/services/core/tests/integration/executor_fixture_test.go
+++ b/services/core/tests/integration/executor_fixture_test.go
@@ -47,7 +47,7 @@ func (h *dispatchHarness) executionFrame(env proto.Envelope) (proto.Envelope, bo
 		}
 		h.write(env.ID, proto.TypePreparationStatus, proto.PreparationStatusPayload{Handle: admission.handle, ExecutorID: admission.executor, Revision: 2, State: "started", RunID: start.RunID})
 		request := admission.prepare.Configuration
-		request.RunID, request.ConversationID, request.Input = start.RunID, admission.prepare.SessionID, start.Input
+		request.RunID, request.Input = start.RunID, start.Input
 		projected, err := proto.NewEnvelope(testExecutionRequest, start.RunID, request)
 		if err != nil {
 			h.t.Fatal(err)
diff --git a/services/core/tests/integration/harness_onboarding_test.go b/services/core/tests/integration/harness_onboarding_test.go
index f60c5342a..e98e2934a 100644
--- a/services/core/tests/integration/harness_onboarding_test.go
+++ b/services/core/tests/integration/harness_onboarding_test.go
@@ -262,7 +262,7 @@ func startOnboardingPeer(t *testing.T, h *dispatchHarness) (<-chan proto.PromptR
 					return
 				}
 				request := p.Configuration
-				request.RunID, request.ConversationID, request.Input = start.RunID, p.SessionID, start.Input
+				request.RunID, request.Input = start.RunID, start.Input
 				started <- request
 			}
 			if e.Type == proto.TypeExecutionRelease {
diff --git a/services/core/tests/integration/prepared_dispatch_test.go b/services/core/tests/integration/prepared_dispatch_test.go
index 8a01bb556..bbb1f066f 100644
--- a/services/core/tests/integration/prepared_dispatch_test.go
+++ b/services/core/tests/integration/prepared_dispatch_test.go
@@ -77,7 +77,7 @@ func TestPreparedDispatchPromotesOriginalBatchAndPersistsCompletion(t *testing.T
 	result := runPreparedDispatch(h, t.Context(), pending)
 	frame := h.read(proto.TypeExecutionPrepare)
 	var prepare proto.ExecutionPreparePayload
-	if frame.DecodePayload(&prepare) != nil || len(prepare.Configuration.Input) != 0 || prepare.Configuration.RunID != "" || prepare.Configuration.ConversationID != "" || prepare.Configuration.LocalEnvironment == nil || prepare.Configuration.LocalEnvironment.ID != h.device.EnvironmentID || prepare.Configuration.DisableExecutionEnvironment {
+	if frame.DecodePayload(&prepare) != nil || len(prepare.Configuration.Input) != 0 || prepare.Configuration.RunID != "" || prepare.Configuration.LocalEnvironment == nil || prepare.Configuration.LocalEnvironment.ID != h.device.EnvironmentID || prepare.Configuration.DisableExecutionEnvironment {
 		t.Fatal("invalid preparation configuration", prepare)
 	}
 	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, h.session.ID)

From 6fc76ad2094de3029eeea0eca9a5373b73613cb6 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 19:51:51 +0800
Subject: [PATCH 22/60] Close executors that Shutdown invalidates while their
 Run retires (#482)

Shutdown marks every executor invalid but closes only owners without a
Run, leaving a running owner's close to its prepared release. The release
reads r.closed and owner.invalid once, before joining operations and
retiring the Run. When Shutdown took the lock after that reuse decision
and before the Run let go of the owner, nobody closed the executor: it
stayed in r.executors with no close in flight, and Shutdown reported
"cleanup unconfirmed" for a healthy native executor. Device shutdown
has the same window and left the owner permanently invalid.

When the release retires an owner that was invalidated without a close,
start the close under shutdownWG so Shutdown waits for it. Report an
executor that remains without a close error as "cleanup has not
settled" instead of wrapping a nil error.
---
 apps/daemon/internal/dispatch/prepared_handoff.go | 5 +++++
 apps/daemon/internal/dispatch/shutdown.go         | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/daemon/internal/dispatch/prepared_handoff.go b/apps/daemon/internal/dispatch/prepared_handoff.go
index 23377efe7..31e55a248 100644
--- a/apps/daemon/internal/dispatch/prepared_handoff.go
+++ b/apps/daemon/internal/dispatch/prepared_handoff.go
@@ -262,6 +262,11 @@ func (r *Router) runPreparedRelease(state *sessionState, handoff *preparedHandof
 	}
 	if !owner.invalid {
 		r.scheduleExecutorIdleLocked(owner)
+	} else if owner.closeDone == nil {
+		// Shutdown invalidated this owner after the reuse decision above and
+		// left its close to this Run, which held it.
+		r.shutdownWG.Add(1)
+		go func() { defer r.shutdownWG.Done(); _ = r.closeExecutor(owner) }()
 	}
 	r.mu.Unlock()
 
diff --git a/apps/daemon/internal/dispatch/shutdown.go b/apps/daemon/internal/dispatch/shutdown.go
index cc7229aff..5c350dccb 100644
--- a/apps/daemon/internal/dispatch/shutdown.go
+++ b/apps/daemon/internal/dispatch/shutdown.go
@@ -90,7 +90,11 @@ func (r *Router) runShutdownAttempt(attempt *shutdownAttempt, victims []sessionC
 		}
 	}
 	for _, owner := range r.executors {
-		attempt.err = errors.Join(attempt.err, fmt.Errorf("dispatch: executor %s cleanup unconfirmed: %w", owner.id, owner.closeErr))
+		cause := owner.closeErr
+		if cause == nil {
+			cause = errors.New("cleanup has not settled")
+		}
+		attempt.err = errors.Join(attempt.err, fmt.Errorf("dispatch: executor %s: %w", owner.id, cause))
 	}
 	close(attempt.done)
 	r.mu.Unlock()

From 80638591430df8c0157e438511fa9257e184211a Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 20:07:07 +0800
Subject: [PATCH 23/60] feat: install Core on Linux, macOS and Windows through
 one workflow (#476)

* feat: share Core installation across Linux macOS and Windows

* fix: recover interrupted staging and qualify native platforms

* fix: use native Web base images and one Compose startup

* test: exercise the PowerShell launcher with native oac

* test: share launcher fixtures across PowerShell script scopes

* docs: align installation guidance with shared platform support

* docs: correct secret mounts and installation locking

* docs: clarify native management command invocation
---
 .github/workflows/check.yml                   |  19 +-
 .github/workflows/native.yml                  |  22 ++
 .github/workflows/release.yml                 |   7 +-
 Makefile                                      |   2 +-
 README.md                                     |   8 +-
 README.zh-CN.md                               |   8 +-
 apps/web/DESIGN.md                            |   2 +-
 apps/web/PRODUCT.md                           |   2 +-
 apps/web/e2e/access.spec.ts                   |   4 +-
 .../src/features/first-run/ConsoleAccess.tsx  |  11 +-
 apps/web/src/i18n/locales/en/core-errors.ts   |   2 +-
 .../web/src/i18n/locales/zh-CN/core-errors.ts |   2 +-
 apps/web/src/lib/console-auth-strings.ts      |   4 +-
 deploy/README.md                              |   8 +-
 deploy/compose/compose.yaml                   |  54 +--
 deploy/compose/test_compose.py                |  10 +-
 deploy/install.dev.sh                         |   4 +-
 deploy/install.ps1                            |  31 ++
 deploy/install.sh                             | 245 +-----------
 deploy/test_install.ps1                       |  34 ++
 deploy/test_install.py                        | 335 +++-------------
 docs/configuration.md                         |  45 +--
 docs/getting-started/install-options.md       |  14 +-
 docs/getting-started/install.md               |  28 +-
 docs/getting-started/operations.md            |  30 +-
 docs/maintainers.md                           |  17 +-
 docs/zh/configuration.md                      |  47 +--
 docs/zh/getting-started/install-options.md    |  18 +-
 docs/zh/getting-started/install.md            |  30 +-
 docs/zh/getting-started/operations.md         |  32 +-
 docs/zh/maintainers.md                        |  21 +-
 scripts/build-core-distribution.sh            |  31 +-
 scripts/build-core-image-context.sh           |   4 +-
 scripts/build-e2b-provider.sh                 |  12 +-
 scripts/ci_plan.py                            |   2 +
 scripts/ci_plan_test.py                       |   6 +-
 scripts/compose-smoke.py                      |  22 +-
 scripts/core-distribution-manifest.py         |  35 +-
 scripts/core-distribution-manifest.test.py    |   9 +-
 scripts/publish-core-release.py               | 146 ++++---
 scripts/publish-core-release.test.py          | 214 +++++------
 services/core/cmd/oac/init.go                 | 204 +++++-----
 services/core/cmd/oac/init_test.go            |  31 +-
 services/core/cmd/oac/install.go              | 358 ++++++++++++++++++
 services/core/cmd/oac/install_test.go         | 245 ++++++++++++
 services/core/cmd/oac/install_unix_test.go    |  46 +++
 services/core/cmd/oac/main.go                 |  97 ++---
 services/core/cmd/oac/oac_test.go             |  28 +-
 .../core/tools/e2b-provider/Build.Dockerfile  |   2 +-
 services/core/tools/e2b-provider/build.py     |  11 +-
 services/web/Dockerfile                       |   2 +-
 51 files changed, 1506 insertions(+), 1095 deletions(-)
 create mode 100644 deploy/install.ps1
 create mode 100644 deploy/test_install.ps1
 create mode 100644 services/core/cmd/oac/install.go
 create mode 100644 services/core/cmd/oac/install_test.go
 create mode 100644 services/core/cmd/oac/install_unix_test.go

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 151a0c410..0a307c7ad 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -184,8 +184,18 @@ jobs:
   compose:
     needs: plan
     if: needs.plan.result == 'success' && contains(fromJSON(needs.plan.outputs.jobs || '[]'), 'compose')
-    runs-on: ${{ vars.OAC_USE_GITHUB_RUNNERS == 'true' && 'ubuntu-22.04' || 'blacksmith-2vcpu-ubuntu-2204' }}
-    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: ubuntu-24.04
+            architecture: amd64
+          - runner: ubuntu-24.04-arm
+            architecture: arm64
+    runs-on: ${{ matrix.runner }}
+    env:
+      GOARCH: ${{ matrix.architecture }}
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v7
         with:
@@ -193,6 +203,11 @@ jobs:
       - uses: actions/setup-go@v7
         with:
           go-version-file: go.mod
+      - name: Test the native Core installation lifecycle
+        run: go test ./services/core/cmd/oac -count=1 -timeout=3m
+      - uses: ./.github/actions/e2b-provider
+      - name: Build and verify the architecture-matched E2B helper
+        run: bash scripts/build-e2b-provider.sh
       - name: Allocate an isolated Compose project
         run: python3 -c 'import uuid; print("COMPOSE_SMOKE_PROJECT=oac-smoke-" + uuid.uuid4().hex)' >> "$GITHUB_ENV"
       - name: Build the images, start the installation and verify it
diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
index 7be750d35..c901adc6f 100644
--- a/.github/workflows/native.yml
+++ b/.github/workflows/native.yml
@@ -63,6 +63,14 @@ jobs:
         run: |
           go build -ldflags "-X github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/cli.Version=$(git rev-parse HEAD)" -o "$RUNNER_TEMP/oac-daemon${{ runner.os == 'Windows' && '.exe' || '' }}" ./apps/daemon/cmd/oac-daemon
           node --test scripts/build-native-installer.test.mjs
+      - name: Build and test the shared Core installer
+        run: |
+          go build -o "$RUNNER_TEMP/oac${{ runner.os == 'Windows' && '.exe' || '' }}" ./services/core/cmd/oac
+          go test ./services/core/cmd/oac -count=1 -timeout=3m
+      - name: Exercise the Windows Core launcher
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: ./deploy/test_install.ps1 -Binary "$env:RUNNER_TEMP/oac.exe"
       - name: Verify native download bootstrap and recovery
         run: go test ./services/core/internal/nativeinstaller -count=1 -timeout=3m
       - name: Native filesystem, authentication and process lifecycle
@@ -163,3 +171,17 @@ jobs:
           path: ${{ runner.temp }}/native-ci-diagnostics/
           retention-days: 7
           if-no-files-found: ignore
+
+  core-intel-mac:
+    name: Core installer (macOS Intel)
+    runs-on: macos-15-intel
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{ inputs.ref || github.sha }}
+      - uses: actions/setup-go@v7
+        with:
+          go-version-file: go.mod
+      - run: go test ./services/core/cmd/oac -count=1 -timeout=3m
+      - run: go build -o "$RUNNER_TEMP/oac" ./services/core/cmd/oac
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d798c1976..c8ff4ab28 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -114,6 +114,9 @@ jobs:
           path: ${{ runner.temp }}/native-artifacts
       - name: Assemble the native installation catalog
         run: node scripts/build-native-catalog.mjs "$RUNNER_TEMP/native-artifacts" "$RUNNER_TEMP/native-installers"
+      - uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
       - uses: ./.github/actions/e2b-provider
       - name: Build matched artifacts
         env:
@@ -133,8 +136,8 @@ jobs:
           for asset in "$HOME/.oac/build/core-distribution/"*; do
             if [[ -f "$asset" ]]; then ln "$asset" "$HOME/.oac/build/release-upload/"; fi
           done
-          cp deploy/install.sh "$HOME/.oac/build/release-upload/install.sh"
-          (cd "$HOME/.oac/build/release-upload" && sha256sum install.sh > install.sh.sha256)
+          cp deploy/install.sh deploy/install.ps1 "$HOME/.oac/build/release-upload/"
+          (cd "$HOME/.oac/build/release-upload" && sha256sum install.sh > install.sh.sha256 && sha256sum install.ps1 > install.ps1.sha256)
       - name: Sign in to GHCR
         if: github.event_name == 'push' || inputs.draft_release
         env:
diff --git a/Makefile b/Makefile
index 24b6a13ab..1958607db 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ check-microsandbox-provider:
 .PHONY: check-distribution build-core-distribution
 check-distribution:
 	node --test scripts/build-native-catalog.test.mjs
-	go test ./services/web -count=1
+	go test ./services/web ./services/core/cmd/oac -count=1
 	PYTHONDONTWRITEBYTECODE=1 python3 -m unittest discover -s deploy/node -p 'test_*.py'
 	PYTHONDONTWRITEBYTECODE=1 python3 -m unittest discover -s deploy/compose -p 'test_*.py'
 	PYTHONDONTWRITEBYTECODE=1 python3 -m unittest discover -s scripts/acceptance -p 'test_*.py'
diff --git a/README.md b/README.md
index 5713ac292..d8056f965 100644
--- a/README.md
+++ b/README.md
@@ -42,12 +42,18 @@ Core keeps durable execution state. The Runtime runs the chosen harness inside t
 
 ## Install
 
-On a Linux amd64 host with Docker and Python 3.9+:
+On Linux or macOS with [Docker configured](https://openagentcore.dev/docs/getting-started/install#prerequisites):
 
 ```sh
 curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash
 ```
 
+Windows PowerShell:
+
+```powershell
+irm https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.ps1 | iex
+```
+
 Then:
 
 1. **Sign in to Web**, the admin console, with the Core key the installer created, and **configure the domain and HTTPS**.
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 5414cea3c..fb55a62a5 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -42,12 +42,18 @@ OpenAgentCore 在你自己的基础设施上运行 AI Agent，对外提供 [Open
 
 ## 安装
 
-在已准备 Docker 和 Python 3.9+ 的 Linux amd64 主机上：
+在已按[前置条件](https://openagentcore.dev/zh/docs/getting-started/install#prerequisites)准备 Docker 的 Linux 或 macOS 上：
 
 ```sh
 curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash
 ```
 
+Windows PowerShell:
+
+```powershell
+irm https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.ps1 | iex
+```
+
 然后：
 
 1. 用安装器生成的 Core key **登录 Web**（管理控制台），并**配置域名和 HTTPS**。
diff --git a/apps/web/DESIGN.md b/apps/web/DESIGN.md
index 64bb19dd3..86c08ae95 100644
--- a/apps/web/DESIGN.md
+++ b/apps/web/DESIGN.md
@@ -402,7 +402,7 @@ A failed action whose outcome needs a decision (a sandbox change with no answer,
 A local-only installation has the same amber notice on Overview, Nodes and System: other machines cannot connect, followed by Core's configuration path and apply command as copyable values. If Core has no configuration snapshot, state that those instructions are unavailable; never fill in a path or command. Add node is disabled with its reason beside the action, and Getting started leaves its first step to do with the address fix visible. A pending or failed installation read cannot complete that step; a failed read shows Unknown and Retry.
 
 ### Onboarding
-Signing in and the console tour share one frame: a dark stage on the left (always dark, whatever the theme) and the task panel on the right, which follows the theme. The stage is the product's one authored moment: a flickering indigo dot grid under slow light rays (Magic UI's flickering grid and light rays), Core as the OpenAgentCore mark on a tile with a travelling border beam, and two orbits of Agents, Sessions, Skills, Vaults, files, templates and machines around it; the OpenAgentCore mark is itself nodes on a ring. Brand copy sits bottom-left in solid ink; it is a paragraph, not a heading, because the panel's title names the task. Signing in asks for one thing, the deployment's Core key, in a single password field; the default key location and a copyable read command stay visible beneath it, with a reminder to substitute a custom installation directory. The key’s authority stays in a help tip. A refused key, too many attempts or an unavailable console is an error beside the field. Signing in opens the console on the Overview. The optional tour has three chapters — Monitor, Resources, Platform — whose stage shows a real dark screenshot of those pages, tilted towards the panel; it takes the place of the console until its last button, Skip or Escape, and then returns the focus to the control that opened it. Entering the console or the tour, and leaving the tour, happen inside a View Transition: the old page dissolves forward and the new one is revealed in a circle growing from the pressed button. With reduced motion the orbits hold their places, the grid is a still frame and no transition runs.
+Signing in and the console tour share one frame: a dark stage on the left (always dark, whatever the theme) and the task panel on the right, which follows the theme. The stage is the product's one authored moment: a flickering indigo dot grid under slow light rays (Magic UI's flickering grid and light rays), Core as the OpenAgentCore mark on a tile with a travelling border beam, and two orbits of Agents, Sessions, Skills, Vaults, files, templates and machines around it; the OpenAgentCore mark is itself nodes on a ring. Brand copy sits bottom-left in solid ink; it is a paragraph, not a heading, because the panel's title names the task. Signing in asks for one thing, the deployment's Core key, in a single password field; a copyable Docker Compose command to read the key stays visible beneath it, with a reminder to substitute a custom installation directory. The key’s authority stays in a help tip. A refused key, too many attempts or an unavailable console is an error beside the field. Signing in opens the console on the Overview. The optional tour has three chapters — Monitor, Resources, Platform — whose stage shows a real dark screenshot of those pages, tilted towards the panel; it takes the place of the console until its last button, Skip or Escape, and then returns the focus to the control that opened it. Entering the console or the tour, and leaving the tour, happen inside a View Transition: the old page dissolves forward and the new one is revealed in a circle growing from the pressed button. With reduced motion the orbits hold their places, the grid is a still frame and no transition runs.
 
 ### Getting started
 The first card on the Overview while any step is to do: a card header ("Getting started", "n of 4 done", a help tip, then a ghost Take the tour button and an icon button that hides it) over four rows split by Faint Rules. Each row has a 22px numbered ring (a check on the tile wash when done), a 13px/600 title over one 12.5px Graphite line, a status dot (Done in green, To do in Pencil, Checking pending, Unknown for a failed read) and one outline action while the step is to do: Set up sandboxes, Add node, Open Nodes or Open sandbox backend; Open System; Create project (which continues to the new project's first key) or Issue key; See how to call (the newest active project, preferring one with an active key), or Projects and keys without an active project. Add node, Create project and Issue key open their page with the dialog already open; Open System brings the Default model provider section to the top of the page body and focuses the default harness's Set or Replace; See how to call opens the project and, once its keys, usage and address are read, brings its How to call heading to the top of the page body, focused. Only the page body scrolls; the page header stays. Every step done turns it into one line, "You're set", with Take the tour and Dismiss; it stays, through the tour, until dismissed, and the checklist does not come back on its own. The choice is kept per installation in the browser, also while the deployment cannot be read; Show Getting started, a quiet row above the sidebar's account controls, opens it again at any time.
diff --git a/apps/web/PRODUCT.md b/apps/web/PRODUCT.md
index 2aa72c28c..090ca06fd 100644
--- a/apps/web/PRODUCT.md
+++ b/apps/web/PRODUCT.md
@@ -22,7 +22,7 @@ The console runs beside the administrator's own Core, with execution, files and
 
 ## Operating Context
 
-- Paired console (`services/web`): the administrator signs in with the deployment's Core key, the administration credential the installer writes to `secrets/core.key` under the installation directory (by default `~/.oac/core/secrets/core.key`; keeping and rotating it is described in [Core key](../../docs/getting-started/operations.md#core-key)). There are no console accounts or usernames. Sign-in shows the default file location and a copyable `cat ~/.oac/core/secrets/core.key` command for the Core host, with a reminder to substitute a custom installation directory. The browser sends the key only to sign in and keeps only the session cookie; the console server holds the Core key and forwards the Web API (`/core/v1/**`, including sandbox administration under `/core/v1/sandbox/**`). The console never calls `/v1`.
+- Paired console (`services/web`): the administrator signs in with the deployment's [Core key](../../docs/getting-started/operations.md#core-key). Sign-in shows a copyable Docker Compose command to read the key on the Core host, with a reminder to substitute a custom installation directory. The browser sends the key only to sign in and keeps only the session cookie; the console server holds the Core key and forwards the Web API (`/core/v1/**`, including sandbox administration under `/core/v1/sandbox/**`). The console never calls `/v1`.
 - The Core key is not an Agents API identity and cannot call `/v1`. An administrator who wants to call the Agents API issues a project API key like any other caller.
 - `/console/config` reports the node installer (`node_installer`, `node_installer_sha256`), offered only with a 64-hex digest. Native self-hosted installation does not depend on this endpoint. It also lists the providers it has node files for (`node_artifacts`); without the deployment's provider, Add node says so and issues no command. Signing in grants administration, sandbox administration included.
 - Chinese and English UI; light and dark themes; reduced motion honored.
diff --git a/apps/web/e2e/access.spec.ts b/apps/web/e2e/access.spec.ts
index 41149ef97..f8d48a28d 100644
--- a/apps/web/e2e/access.spec.ts
+++ b/apps/web/e2e/access.spec.ts
@@ -18,11 +18,11 @@ test("signs in with the Core key, keeps it out of the browser, and signs out and
   await page.goto("/");
 
   await expect(page.getByRole("heading", { name: "Sign in to OpenAgentCore" })).toBeVisible();
-  await expect(page.getByText("cat ~/.oac/core/secrets/core.key", { exact: true })).toBeVisible();
+  await expect(page.getByText('docker compose -f "$HOME/.oac/core/compose.yaml" exec -T web oac-web core-key', { exact: true })).toBeVisible();
   await expect(page.getByText("For a custom installation directory, replace the path in this command.")).toBeVisible();
   await page.context().grantPermissions(["clipboard-read", "clipboard-write"]);
   await page.getByRole("button", { name: "Copy key read command" }).click();
-  expect(await page.evaluate(() => navigator.clipboard.readText())).toBe("cat ~/.oac/core/secrets/core.key");
+  expect(await page.evaluate(() => navigator.clipboard.readText())).toBe('docker compose -f "$HOME/.oac/core/compose.yaml" exec -T web oac-web core-key');
   await signIn(page, "not-the-core-key");
   await expect(page.getByRole("alert")).toHaveText("This Core key is not correct. Check it and try again.");
   await signIn(page, FIXTURE_CORE_KEY);
diff --git a/apps/web/src/features/first-run/ConsoleAccess.tsx b/apps/web/src/features/first-run/ConsoleAccess.tsx
index d9ef1f408..5e561f330 100644
--- a/apps/web/src/features/first-run/ConsoleAccess.tsx
+++ b/apps/web/src/features/first-run/ConsoleAccess.tsx
@@ -12,13 +12,6 @@ import { withTransition } from "../onboarding/view-transition";
 import { changeConsoleAuth, ConsoleAuthError, readConsoleAuth, type ConsoleAuth } from "./auth";
 import "./console-access.css";
 
-/**
- * Where the installer writes the Core key: its file inside the installation
- * directory, and that file under the default installation directory. The
- * visible sign-in instructions name both; the actual custom path is not public.
- */
-const CORE_KEY_LOCATION = { file: "secrets/core.key", defaultPath: "~/.oac/core/secrets/core.key" } as const;
-
 const ConsoleAccountContext = createContext<{ logout: () => Promise<void> } | null>(null);
 export const useConsoleAccount = () => useContext(ConsoleAccountContext);
 
@@ -146,8 +139,8 @@ function CoreKeyForm({ onAuthenticated }: {
         readOnly={busy} aria-invalid={error ? true : undefined} aria-describedby={`${id}-location${error ? ` ${id}-error` : ""}`} />
     </div>
     <div className="console-key-location" id={`${id}-location`}>
-      <p>{t("The installer saved the key in {{file}} inside the installation directory. On the Core host, read the default location with:", CORE_KEY_LOCATION)}</p>
-      <CopyableId id={`cat ${CORE_KEY_LOCATION.defaultPath}`} label={t("Copy key read command")} />
+      <p>{t("On the Core host, run this command to read the Core key:")}</p>
+      <CopyableId id={'docker compose -f "$HOME/.oac/core/compose.yaml" exec -T web oac-web core-key'} label={t("Copy key read command")} />
       <p>{t("For a custom installation directory, replace the path in this command.")}</p>
     </div>
     {error ? <p className="console-auth-error" id={`${id}-error`} role="alert">{error}</p> : null}
diff --git a/apps/web/src/i18n/locales/en/core-errors.ts b/apps/web/src/i18n/locales/en/core-errors.ts
index ba11e4086..8b86a85a3 100644
--- a/apps/web/src/i18n/locales/en/core-errors.ts
+++ b/apps/web/src/i18n/locales/en/core-errors.ts
@@ -1,5 +1,5 @@
 export const coreErrors = {
-  "invalid_admin_key": "The console's Core key was rejected. Update secrets/core.key on the Core host and run oac apply.",
+  "invalid_admin_key": "The console's Core key was rejected. Rotate it on the Core host, then sign in again.",
   "console_sign_in_required": "Sign in to the console again.",
   "console_origin_rejected": "Open the console at its configured address.",
   "console_request_invalid": "The console request was rejected. Reload the page.",
diff --git a/apps/web/src/i18n/locales/zh-CN/core-errors.ts b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
index 4334ca3c1..310ade305 100644
--- a/apps/web/src/i18n/locales/zh-CN/core-errors.ts
+++ b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
@@ -1,5 +1,5 @@
 export const coreErrors = {
-  "invalid_admin_key": "控制台的 Core Key 被拒绝。请更新 Core 主机上的 secrets/core.key，再运行 oac apply。",
+  "invalid_admin_key": "控制台的 Core Key 被拒绝。请在 Core 主机上轮换密钥，然后重新登录。",
   "console_sign_in_required": "请重新登录控制台。",
   "console_origin_rejected": "请通过配置的地址打开控制台。",
   "console_request_invalid": "控制台请求被拒绝，请重新加载页面。",
diff --git a/apps/web/src/lib/console-auth-strings.ts b/apps/web/src/lib/console-auth-strings.ts
index c2c8afdf1..c6490daef 100644
--- a/apps/web/src/lib/console-auth-strings.ts
+++ b/apps/web/src/lib/console-auth-strings.ts
@@ -4,8 +4,8 @@ export const consoleAuthChinese = {
   "Core key": "Core Key",
   "The Core key is an administration credential: it cannot call the /v1 Agents API, and the console never keeps it in your browser.":
     "Core Key 是管理凭据：不能调用 /v1 Agents API，控制台也不会把它保存在你的浏览器里。",
-  "The installer saved the key in {{file}} inside the installation directory. On the Core host, read the default location with:":
-    "安装器将 key 保存在安装目录下的 {{file}} 中。在 Core 主机上运行以下命令可读取默认位置：",
+  "On the Core host, run this command to read the Core key:":
+    "在 Core 主机上运行以下命令，读取 Core Key：",
   "Copy key read command": "复制 key 读取命令",
   "For a custom installation directory, replace the path in this command.": "如果使用了自定义安装目录，请替换命令中的路径。",
   "Sign in": "登录",
diff --git a/deploy/README.md b/deploy/README.md
index 716971334..20a61d2e4 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -2,18 +2,18 @@
 
 | Path | Contents |
 | --- | --- |
-| `install.sh` | Host installer published with each release |
+| `install.sh`, `install.ps1` | Native command launchers published with each release |
 | `compose/` | Compose template and its tests |
 | `distribution/` | Image Dockerfiles |
 | `node/` | [Node installer](node/README.md), packaged as `node-install.pyz` |
 
 ## Installation
 
-`install.sh` downloads its release's `compose.yaml`, checks it against `compose-sha256sums.txt`, writes `.env`, and starts Compose. Core applies database migrations when it starts. The host needs Linux amd64 and Docker Compose 2.26 or newer. [Configuration](../docs/configuration.md) owns the installation layout and settings.
+`install.sh` and `install.ps1` select a native `oac` release binary, verify its checksum and invoke `oac install`. That Go command owns the same installation lifecycle on Linux, macOS and Windows: validate Docker, verify release configuration, prepare `.env` and the host command, pull images, publish the installation directory, initialize the data volume and start Compose. [Installation](../docs/getting-started/install.md#prerequisites) owns platform prerequisites; [Configuration](../docs/configuration.md) owns settings and storage.
 
-The Core installer validates downloads and Compose in the private sibling `<install-dir>.staging` directory, and pulls all images before publishing the installation directory. A retry clears leftover staging only when its atomically created ownership link names this installation, including after the previous process was killed. An unrecognized nonempty staging directory is preserved. The staging log moves with the configuration and is removed on normal exit. Once published, failures retain configuration, containers and data. A retry verifies and starts that saved installation without replacing its Compose file, cached images or existing containers. Missing images are downloaded explicitly; Compose never pulls images implicitly. It refuses unrelated nonempty directories. `<install-dir>.install.lock` serializes directory preparation; `.oac.lock` serializes service changes with mutating `oac` commands. Both lock files remain after exit. Download failures have bounded retries and timeouts; service startup failures print Compose status and recent logs.
+Preparation happens in `<install-dir>.staging`. On entry, the installer removes an empty stage or one with the empty ownership directory `.oac-installer-<hash of the installation path>`; it preserves unrecognized directories. Ordinary failures remove owned staging immediately. The ownership marker is created atomically before downloading files. A killed process leaves staging for the next attempt. Publication happens only after downloads, checks and pulls succeed. Later failures preserve saved configuration, containers and the Docker data volume. Retries reuse those settings and cached images, pull missing images and start services with `--pull never --no-recreate`. `<install-dir>.lock` is a persistent lock directory shared by installation and mutating operator commands; the existing `runtimefs` platform adapter owns locking.
 
-`oac` is a Go command (`services/core/cmd/oac`) in the Core image and the ingress image. The host copy implements `apply`, `core-key` and `rotate-core-key`; `core-key --show` runs `oac-web core-key` in the Web container. Start, stop, logs and removal are `docker compose`. `apply` runs `oac-core check-config` before recreating services. The ingress image runs data initialization as `oac init`, verifies and copies its bundled node metadata without network access, and contains no Python. No service receives a Docker socket. Initialization writes structured logs to stderr for directory preparation, lock acquisition, existing-installation verification, bundled metadata verification and publication, credential generation or reuse, and receipt persistence. Each step records its start and completion; failures identify the current step, and completion records elapsed milliseconds. Credential values and digests are never logged. View these logs with `docker compose logs --timestamps init`.
+The host `oac` command also implements `apply`, `core-key` and `rotate-core-key`. `apply` checks Core configuration before recreating services. Reading the key executes `oac-web core-key` in Web. Rotation runs in the initialization container, where Linux file ownership is identical on every host, then restarts Core and Web. Start, stop, logs and removal use `docker compose`. The initialization image verifies and copies bundled node metadata without network access. Its receipt authenticates immutable metadata and credentials; the operator-rotatable Core key and its digest remain mutable. No service receives a Docker socket. Initialization emits structured step logs without credential values; view them with `docker compose logs --timestamps init`.
 
 Web serves the console and forwards `/v1` and `/api/v1` to Core, so it is the only published service. HTTPS is terminated by the operator's reverse proxy or hosting platform, which routes to `web:8080`; `OAC_PUBLIC_URL` records that origin.
 
diff --git a/deploy/compose/compose.yaml b/deploy/compose/compose.yaml
index 21ecceea9..6fe45a4db 100644
--- a/deploy/compose/compose.yaml
+++ b/deploy/compose/compose.yaml
@@ -1,24 +1,23 @@
 # Release template. The publisher pins the initialization image to this release.
 # Core and Web default to latest; OAC_IMAGE_* selects another reference.
-# Data is bind-mounted from ${OAC_DATA_DIR:-./data}.
+# Docker owns data permissions on every host platform.
 x-ingress-image: &ingress-image ${OAC_IMAGE_INGRESS:-__OAC_INIT_IMAGE__}
 services:
   init:
     image: *ingress-image
-    platform: linux/amd64
     restart: "no"
     security_opt: [no-new-privileges:true]
     command: [/usr/local/bin/oac, init]
     environment:
       OAC_REVISION: __OAC_REVISION__
     volumes:
-      - type: bind
-        source: ${OAC_DATA_DIR:-./data}
+      - type: volume
+        source: data
         target: /data
+        volume: {nocopy: true}
 
   database:
     image: postgres:16-alpine
-    platform: linux/amd64
     restart: unless-stopped
     depends_on:
       init: {condition: service_completed_successfully}
@@ -27,12 +26,14 @@ services:
       POSTGRES_DB: agents_api
       POSTGRES_PASSWORD_FILE: /run/database/password
     volumes:
-      - type: bind
-        source: ${OAC_DATA_DIR:-./data}/database
+      - type: volume
+        source: data
         target: /var/lib/postgresql/data
-      - type: bind
-        source: ${OAC_DATA_DIR:-./data}/secrets/database
+        volume: {nocopy: true, subpath: database}
+      - type: volume
+        source: data
         target: /run/database
+        volume: {nocopy: true, subpath: secrets/database}
         read_only: true
     healthcheck:
       test: [CMD-SHELL, "pg_isready -h 127.0.0.1 -U agents_api -d agents_api"]
@@ -42,7 +43,6 @@ services:
 
   core:
     image: ${OAC_IMAGE_CORE:-ghcr.io/minimax-ai/openagentcore/core:latest}
-    platform: linux/amd64
     user: "65532:65532"
     restart: unless-stopped
     read_only: true
@@ -70,23 +70,28 @@ services:
       OAC_LOG_ADD_SOURCE: ${OAC_LOG_ADD_SOURCE:-}
       OAC_HISTORY_SETTINGS_FILE: ${OAC_HISTORY_SETTINGS_FILE:-}
     volumes:
-      - type: bind
-        source: ${OAC_DATA_DIR:-./data}/secrets/core
+      - type: volume
+        source: data
         target: /run/oac
+        volume: {nocopy: true, subpath: secrets/core}
         read_only: true
-      - type: bind
-        source: ${OAC_DATA_DIR:-./data}/secrets/database
+      - type: volume
+        source: data
         target: /run/database
+        volume: {nocopy: true, subpath: secrets/database}
         read_only: true
-      - type: bind
-        source: ${OAC_DATA_DIR:-./data}/state
+      - type: volume
+        source: data
         target: /state
+        volume: {nocopy: true, subpath: state}
 
   web:
     ports:
-      - "${OAC_HOST:-127.0.0.1}:${OAC_WEB_PORT:-8080}:8080"
+      - target: 8080
+        published: "${OAC_WEB_PORT:-8080}"
+        host_ip: "${OAC_HOST:-127.0.0.1}"
+        protocol: tcp
     image: ${OAC_IMAGE_WEB:-ghcr.io/minimax-ai/openagentcore/web:latest}
-    platform: linux/amd64
     user: "65532:65532"
     restart: unless-stopped
     read_only: true
@@ -102,16 +107,21 @@ services:
       OAC_LOG_FORMAT: ${OAC_LOG_FORMAT:-}
       OAC_LOG_ADD_SOURCE: ${OAC_LOG_ADD_SOURCE:-}
     volumes:
-      - type: bind
-        source: ${OAC_DATA_DIR:-./data}/secrets/web
+      - type: volume
+        source: data
         target: /run/oac
+        volume: {nocopy: true, subpath: secrets/web}
         read_only: true
-      - type: bind
-        source: ${OAC_DATA_DIR:-./data}/node-payload
+      - type: volume
+        source: data
         target: /node-payload
+        volume: {nocopy: true, subpath: node-payload}
         read_only: true
     healthcheck:
       test: [CMD, /usr/local/bin/oac-web, healthcheck]
       interval: 5s
       timeout: 10s
       retries: 30
+
+volumes:
+  data:
diff --git a/deploy/compose/test_compose.py b/deploy/compose/test_compose.py
index 11f666e15..ce428f89a 100644
--- a/deploy/compose/test_compose.py
+++ b/deploy/compose/test_compose.py
@@ -61,7 +61,9 @@ def test_compose_uses_private_services_and_ordered_initialization(self):
             self.assertTrue(service['image'].endswith(':latest') or service['image'] == 'postgres:16-alpine' or service['image'].endswith('@sha256:' + 'e' * 64))
             for volume in service.get('volumes', []):
                 self.assertNotIn('docker.sock', json.dumps(volume))
-                self.assertEqual(volume['type'], 'bind')
+                self.assertEqual(volume['type'], 'volume')
+                self.assertEqual(volume['source'], 'data')
+            self.assertNotIn('platform', service)
         self.assertEqual({v['target'] for v in services['web']['volumes']}, {'/run/oac', '/node-payload'})
         self.assertIsNone(services['core']['command'])
         self.assertNotIn('OAC_WEB_INSTALLATION_SOCKET', services['web']['environment'])
@@ -95,6 +97,12 @@ def ports(config):
             ['docker', 'compose', '--env-file', os.devnull, '-f', str(self.compose_file),
              'config', '--format', 'json'], env=env))
         self.assertEqual(ports(configured), {'web': [('0.0.0.0', '9080')]})
+        env['OAC_HOST'] = '::1'
+        configured = json.loads(subprocess.check_output(
+            ['docker', 'compose', '--env-file', os.devnull, '-f', str(self.compose_file),
+             'config', '--format', 'json'], env=env))
+        self.assertEqual(ports(configured), {'web': [('::1', '9080')]})
+
 
     def test_platform_network_injection_keeps_the_file_valid(self):
         # Dokploy isolated deployments attach a project network to every service.
diff --git a/deploy/install.dev.sh b/deploy/install.dev.sh
index eada59aa3..7a3fb5135 100755
--- a/deploy/install.dev.sh
+++ b/deploy/install.dev.sh
@@ -47,8 +47,7 @@ if [[ "$install_dir" != /* ]]; then
   exit 1
 fi
 
-mkdir -p "$install_dir/data"
-chmod 700 "$install_dir/data"
+mkdir -p "$install_dir"
 build="$install_dir/image-build"
 rm -rf "$build"
 mkdir -p "$build"
@@ -115,7 +114,6 @@ PY
 umask 077
 cat >"$install_dir/.env" <<EOF
 COMPOSE_PROJECT_NAME=oac-local
-OAC_DATA_DIR=$install_dir/data
 OAC_HOST=$host_address
 OAC_WEB_PORT=$web_port
 OAC_IMAGE_CORE=$tag/core:dev
diff --git a/deploy/install.ps1 b/deploy/install.ps1
new file mode 100644
index 000000000..02d14975b
--- /dev/null
+++ b/deploy/install.ps1
@@ -0,0 +1,31 @@
+# The same native oac command owns installation on Windows.
+$ErrorActionPreference = 'Stop'
+$installArgs = $args
+$version = 'latest'
+for ($i = 0; $i -lt $installArgs.Count; $i++) {
+    if ($installArgs[$i] -eq '--version') {
+        if ($i + 1 -ge $installArgs.Count) { throw 'Missing release tag' }
+        $version = $installArgs[$i + 1]
+    }
+}
+$architecture = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant()
+if ($architecture -ne 'x64') { throw 'Windows x64 is required.' }
+$repository = $env:OAC_REPOSITORY
+if (-not $repository) { $repository = 'MiniMax-AI/OpenAgentCore' }
+$base = "https://github.com/$repository/releases/latest/download"
+if ($version -ne 'latest') { $base = "https://github.com/$repository/releases/download/$version" }
+$directory = Join-Path ([IO.Path]::GetTempPath()) ([Guid]::NewGuid().ToString())
+New-Item -ItemType Directory -Path $directory | Out-Null
+try {
+    $asset = 'oac-windows-amd64.exe'
+    foreach ($name in @($asset, "$asset.sha256")) {
+        Invoke-WebRequest -UseBasicParsing -Uri "$base/$name" -OutFile (Join-Path $directory $name)
+    }
+    $binary = Join-Path $directory $asset
+    $actual = (Get-FileHash -Algorithm SHA256 $binary).Hash.ToLowerInvariant() + "  $asset"
+    if ($actual -cne (Get-Content -Raw (Join-Path $directory "$asset.sha256")).Trim()) { throw 'Installer checksum mismatch.' }
+    & $binary install @installArgs
+    if ($LASTEXITCODE -ne 0) { throw "Installation failed (exit $LASTEXITCODE). Fix the reported error and rerun." }
+} finally {
+    Remove-Item -Recurse -Force $directory
+}
diff --git a/deploy/install.sh b/deploy/install.sh
index 3746122fd..58ef0226c 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -1,230 +1,25 @@
 #!/usr/bin/env bash
-# Install Core and Web from one release's Compose file. The host needs Docker.
+# The native oac command owns installation on every platform.
 set -euo pipefail
-
-repository="${OAC_REPOSITORY:-MiniMax-AI/OpenAgentCore}"
-version="latest"
-install_dir="${OAC_INSTALL_DIR_DEFAULT:-$HOME/.oac/core}"
-public_url=""
-host_address="0.0.0.0"
-web_port="8080"
-stage=""
-published=0
-
-usage() {
-  cat <<'EOF'
-Usage: install.sh [--version TAG] [--install-dir DIR] [--public-url URL]
-                  [--host ADDRESS] [--web-port PORT]
-
-Installs Core, Web and PostgreSQL, and publishes Web on --web-port. Without
---public-url, a host published on all addresses with a private-network address
-is reached at http://<that address>:<web port>; otherwise only from this host.
-HTTPS is terminated by your reverse proxy or hosting platform.
-EOF
-}
-
+case "$(uname -s)" in Linux) os=linux;; Darwin) os=darwin;; *) echo 'Use install.ps1 on Windows.' >&2; exit 1;; esac
+case "$(uname -m)" in x86_64) arch=amd64;; arm64|aarch64) arch=arm64;; *) echo 'Unsupported CPU architecture.' >&2; exit 1;; esac
+version=latest
+args=("$@")
 while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --version) version="${2:?}"; shift 2 ;;
-    --install-dir) install_dir="${2:?}"; shift 2 ;;
-    --public-url) public_url="${2:?}"; shift 2 ;;
-    --host) host_address="${2:?}"; shift 2 ;;
-    --web-port) web_port="${2:?}"; shift 2 ;;
-    -h|--help) usage; exit 0 ;;
-    *) echo "Unknown argument: $1" >&2; usage >&2; exit 1 ;;
-  esac
+  case "$1" in --version) version="${2:?Missing release tag}"; shift 2;; *) shift;; esac
 done
-
-if [[ "$(uname -s)" != Linux || "$(uname -m)" != x86_64 ]]; then
-  echo "Core installs on Linux amd64." >&2
-  exit 1
-fi
-fail() { printf '%s\n' "$*" >&2; exit 1; }
-for tool in docker curl sha256sum flock readlink od sed awk grep; do
-  command -v "$tool" >/dev/null || fail "Required command missing: $tool. Install it and rerun this command. Docker needs Compose 2.26 or newer."
-done
-compose_version="$(docker compose version --short 2>/dev/null | sed 's/^v//' || true)"
-major="${compose_version%%.*}"
-minor="${compose_version#*.}"
-minor="${minor%%.*}"
-if [[ ! "$major" =~ ^[0-9]+$ || ! "$minor" =~ ^[0-9]+$ ]] || (( major < 2 || (major == 2 && minor < 26) )); then
-  fail "Docker Compose 2.26 or newer is required (found ${compose_version:-none})."
-fi
-docker info >/dev/null 2>&1 || fail "Cannot reach Docker. Start Docker and check this account's access, then rerun."
-[[ "$install_dir" == /* && "$install_dir" != / ]] || fail "--install-dir must be an absolute directory other than /."
-# These values are written as literal dotenv strings, never shell commands.
-for value in "$install_dir" "$public_url" "$host_address" "$version"; do
-  [[ "$value" != *$'\n'* && "$value" != *$'\r'* && "$value" != *"'"* && "$value" != *\\* ]] || fail "Installation options cannot contain newlines, quotes or backslashes."
-done
-[[ "$web_port" =~ ^[0-9]{1,5}$ ]] && (( 10#$web_port >= 1 && 10#$web_port <= 65535 )) || fail "--web-port must be between 1 and 65535."
-[[ ! -L "$install_dir" ]] || fail "Installation directory must not be a symbolic link."
-[[ ! -e "$install_dir" || -d "$install_dir" ]] || fail "Installation path must be a directory."
-case "$(basename "$install_dir")" in .|..) fail "--install-dir must name the installation directory, not . or ...";; esac
+base="https://github.com/${OAC_REPOSITORY:-MiniMax-AI/OpenAgentCore}/releases/latest/download"
+if [[ "$version" != latest ]]; then base="https://github.com/${OAC_REPOSITORY:-MiniMax-AI/OpenAgentCore}/releases/download/$version"; fi
 umask 077
-parent="$(dirname "$install_dir")"
-mkdir -p "$parent"
-parent="$(cd "$parent" && pwd -P)"
-install_dir="$parent/$(basename "$install_dir")"
-lock="$install_dir.install.lock"
-[[ ! -L "$lock" && ( ! -e "$lock" || ( -f "$lock" && -O "$lock" ) ) ]] || fail "Invalid installation lock: $lock"
-exec 9>>"$lock"
-flock -n 9 || fail "Another installation is using this directory. Wait for it to finish and rerun."
-stage="$install_dir.staging"
-[[ ! -L "$stage" && ( ! -e "$stage" || ( -d "$stage" && -O "$stage" ) ) ]] || fail "Invalid installation staging directory: $stage"
-if [[ -d "$stage" && -n "$(ls -A "$stage")" ]]; then
-  [[ -L "$stage/.oac-installer" && "$(readlink "$stage/.oac-installer")" == "$install_dir" ]] || fail "Unrecognized staging directory; preserve it and choose another --install-dir: $stage"
-fi
-rm -rf "$stage"
-mkdir "$stage"
-ln -s "$install_dir" "$stage/.oac-installer"
-log="$stage/install.log"
-: >"$log"
-cleanup() {
-  local status=$?
-  trap - EXIT
-  if [[ "$status" != 0 && "$published" == 1 ]]; then
-    printf '\nInstallation and data retained at %s.\n' "$install_dir" >&2
-    (cd "$install_dir" && docker compose ps --all && docker compose logs --no-color --tail 50) >&2 || true
-    printf 'Fix the reported problem, then rerun install.sh --install-dir %q.\n' "$install_dir" >&2
-  fi
-  [[ -z "$stage" ]] || rm -rf "$stage"
-  rm -f "$log"
-  exit "$status"
-}
-trap cleanup EXIT
-trap 'exit 130' INT
-trap 'exit 143' TERM HUP
-
-# step DESCRIPTION COMMAND... prints the command's output only when it fails.
-step() {
-  printf '%s... ' "$1"
-  shift
-  if "$@" >"$log" 2>&1; then echo done; else echo failed; cat "$log" >&2; return 1; fi
-}
-
-resume=0
-if [[ -e "$install_dir" && -n "$(ls -A "$install_dir")" ]]; then
-  for file in compose.yaml compose-sha256sums.txt .env; do
-    [[ -f "$install_dir/$file" && ! -L "$install_dir/$file" ]] || fail "Directory is not a complete Core installation: $install_dir. Preserve it and choose another directory."
-  done
-  resume=1
-  published=1
-fi
-
-port_busy() {
-  local port="$1"
-  if command -v ss >/dev/null; then
-    if ss -ltn | awk '{print $4}' | grep -Eq "(^|:|\\])${port}$"; then
-      return 0
-    fi
-    return 1
-  fi
-  (echo >/dev/tcp/127.0.0.1/"$port") >/dev/null 2>&1
-}
-if [[ "$resume" == 0 ]] && port_busy "$web_port"; then fail "Port $web_port is already in use. Choose another with --web-port."; fi
-asset_base="https://github.com/${repository}/releases/latest/download"
-if [[ "$version" != latest ]]; then
-  asset_base="https://github.com/${repository}/releases/download/${version}"
-fi
-
-# The source address of this host's default route, when it is a private one.
-private_address() {
-  command -v ip >/dev/null || return 0
-  ip -4 route get 1.1.1.1 2>/dev/null | sed -n 's/.* src \([0-9.]*\).*/\1/p' |
-    grep -E '^(10\.|192\.168\.|172\.(1[6-9]|2[0-9]|3[01])\.)' || true
-}
-local_only=0
-if [[ -z "$public_url" && "$host_address" == 0.0.0.0 ]]; then
-  address="$(private_address)"
-  if [[ -n "$address" ]]; then public_url="http://$address:$web_port"; fi
-fi
-if [[ -z "$public_url" ]]; then public_url="http://localhost:$web_port"; local_only=1; fi
-
-if [[ "$resume" == 0 ]]; then
-  # Prepare configuration privately until downloads and image pulls succeed.
-  # Before publication only this invocation's private staging directory is removed.
-  download() {
-    curl --fail --silent --show-error --location --proto '=https' --proto-redir '=https' \
-      --connect-timeout 15 --max-time 120 --retry 2 --retry-connrefused --retry-delay 1 \
-      --max-filesize 1048576 "$asset_base/$1" --output "$stage/$1"
-  }
-  step "Downloading release checksums" download compose-sha256sums.txt
-  step "Downloading Compose configuration" download compose.yaml
-  {
-    echo "COMPOSE_PROJECT_NAME=oac-$(od -An -N5 -tx1 /dev/urandom | tr -d ' \n')"
-    printf "OAC_INSTALL_DIR='%s'\nOAC_HOST='%s'\nOAC_WEB_PORT='%s'\nOAC_PUBLIC_URL='%s'\n" "$install_dir" "$host_address" "$web_port" "$public_url"
-  } >"$stage/.env"
-fi
-
-if [[ "$resume" == 0 ]]; then cd "$stage"; else cd "$install_dir"; fi
-[[ ! -L .oac.lock && ( ! -e .oac.lock || ( -f .oac.lock && -O .oac.lock ) ) ]] || fail "Invalid installation lock: $install_dir/.oac.lock"
-exec 8>>.oac.lock
-flock -n 8 || fail "Another oac command is using this installation. Wait for it to finish and rerun."
-[[ ! -L install.log && ( ! -e install.log || ( -f install.log && -O install.log ) ) ]] || fail "Invalid installation log: $install_dir/install.log"
-log="$PWD/install.log"
-: >"$log"
-step "Verifying saved configuration" sha256sum --check --quiet compose-sha256sums.txt
-step "Checking Compose configuration" docker compose config --quiet
-if [[ "$resume" == 1 ]]; then
-  printf 'Using saved settings from .env; installation flags only apply to new directories. Existing data is preserved.\n'
-fi
-public_url="$(docker compose config --environment | sed -n 's/^OAC_PUBLIC_URL=//p')"
-local_only=0
-[[ "$public_url" != http://localhost:* && "$public_url" != http://127.0.0.1:* ]] || local_only=1
-pull_images() {
-  local images image
-  images="$(docker compose config --images)" || return
-  while IFS= read -r image; do
-    [[ -n "$image" ]] || continue
-    if [[ "$resume" == 0 ]] || ! docker image inspect "$image" >/dev/null 2>&1; then
-      docker pull --platform linux/amd64 "$image" || return
-    fi
-  done <<<"$images"
-}
-step "Checking and downloading images" pull_images
-if [[ "$resume" == 0 ]]; then
-  # An existing empty directory may be replaced, never a directory with user data.
-  if [[ -e "$install_dir" ]]; then rmdir "$install_dir"; fi
-  mv "$stage" "$install_dir"
-  stage=""
-  cd "$install_dir"
-  log="$install_dir/install.log"
-  published=1
-fi
-rm -f .oac-installer
-copy_cli() (
-  [[ ! -L ./oac.download ]] || fail "Temporary oac command must not be a symbolic link."
-  trap 'rm -f ./oac.download' EXIT
-  docker compose create --pull never --no-recreate core &&
-    docker compose cp core:/usr/local/bin/oac ./oac.download &&
-    mv ./oac.download ./oac
-)
-if [[ ! -x ./oac ]]; then step "Installing the oac command" copy_cli; fi
-step "Starting services" docker compose up -d --wait --wait-timeout 180 --pull never --no-recreate
-if ! key="$(./oac core-key --show)"; then
-  fail "Services started, but the Core key could not be read. Inspect Web's logs and retry; data is preserved."
-fi
-
-sudo=""
-if [[ "$EUID" == 0 && -n "${SUDO_USER:-}" ]]; then sudo="sudo "; fi
-cat <<EOF
-
-OpenAgentCore is running.
-
-  Console   $public_url
-  Core key  $key
-
-Sign in to the console with the Core key, the administrator credential.
-${sudo}$install_dir/oac core-key --show prints it again.
-EOF
-if [[ "$local_only" == 1 ]]; then
-  cat <<EOF
-Only this host can open the console. To serve other machines, set
-OAC_PUBLIC_URL in $install_dir/.env, then run ${sudo}$install_dir/oac apply.
-EOF
-fi
-cat <<EOF
-
-Next, on System, set a default model and choose a sandbox backend, then add a
-node on Nodes.
-EOF
+temporary="$(mktemp -d)"
+trap 'rm -rf "$temporary"' EXIT
+asset="oac-$os-$arch"
+for name in "$asset" "$asset.sha256"; do
+  curl --fail --silent --show-error --location --proto '=https' --proto-redir '=https' \
+    --connect-timeout 15 --max-time 180 --retry 2 "$base/$name" --output "$temporary/$name"
+done
+cd "$temporary"
+if command -v sha256sum >/dev/null; then actual="$(sha256sum "$asset")"; else actual="$(shasum -a 256 "$asset")"; fi
+[[ "$actual" == "$(cat "$asset.sha256")" ]] || { echo 'Installer checksum mismatch.' >&2; exit 1; }
+chmod 700 "$asset"
+"./$asset" install "${args[@]}"
diff --git a/deploy/test_install.ps1 b/deploy/test_install.ps1
new file mode 100644
index 000000000..bed472823
--- /dev/null
+++ b/deploy/test_install.ps1
@@ -0,0 +1,34 @@
+# Exercise the actual launcher with a native oac binary and local release assets.
+param([Parameter(Mandatory=$true)][string]$Binary)
+$ErrorActionPreference = 'Stop'
+$testAssets = @{ Binary = $Binary; Corrupt = $false }
+function Invoke-WebRequest {
+    param([switch]$UseBasicParsing, [string]$Uri, [string]$OutFile)
+    if ($Uri.EndsWith('.sha256')) {
+        $digest = (Get-FileHash -Algorithm SHA256 $testAssets.Binary).Hash.ToLowerInvariant()
+        if ($testAssets.Corrupt) { $digest = '0' * 64 }
+        [IO.File]::WriteAllText($OutFile, "$digest  oac-windows-amd64.exe`n")
+    } else {
+        Copy-Item $testAssets.Binary $OutFile
+    }
+}
+& "$PSScriptRoot/install.ps1" --help
+
+$testAssets.Corrupt = $true
+$caught = $false
+try { & "$PSScriptRoot/install.ps1" --help }
+catch {
+    if ($_.Exception.Message -notlike '*checksum mismatch*') { throw }
+    $caught = $true
+}
+if (-not $caught) { throw 'A corrupt binary was executed.' }
+
+$testAssets.Corrupt = $false
+$caught = $false
+try { & "$PSScriptRoot/install.ps1" --unknown-option }
+catch {
+    if ($_.Exception.Message -notlike '*Installation failed*') { throw }
+    $caught = $true
+}
+if (-not $caught) { throw 'A failed native command was reported as successful.' }
+exit 0
diff --git a/deploy/test_install.py b/deploy/test_install.py
index f4bb80cdd..5b3a3ec05 100644
--- a/deploy/test_install.py
+++ b/deploy/test_install.py
@@ -1,294 +1,55 @@
-"""install.sh writes .env and starts Compose without host Python."""
+"""The POSIX launcher selects and verifies a binary; lifecycle tests live in oac."""
+import hashlib
 import os
-import fcntl
-import sys
 from pathlib import Path
-import stat
 import subprocess
 import tempfile
-import textwrap
 import unittest
 
-
-ROOT = Path(__file__).resolve().parents[1]
-INSTALL = ROOT / "deploy/install.sh"
-
-
-class InstallScriptTests(unittest.TestCase):
-    def install(self, root, *args, compose_up=0, docker_info=0, key_status=0, download_status=0, kill_download=False, kill_start=False, pull_status=0, kill_pull=False, file_limit=False, missing_image="", route="1.1.1.1 via 10.0.0.1 dev eth0 src 10.0.0.5 uid 0"):
-        bin_dir = root / "bin"
-        bin_dir.mkdir(exist_ok=True)
-        log = root / "docker.log"
-        self.write_executable(bin_dir / "docker", textwrap.dedent(f"""\
-            #!/bin/sh
-            [ {1 if file_limit else 0} -eq 1 ] || printf '%s\\n' "$*" >> {log}
-            if [ "$1" = info ]; then exit {docker_info}; fi
-            if [ "$1" = pull ]; then {'kill -KILL "$PPID"' if kill_pull else ':'}; exit {pull_status}; fi
-            if [ "$1" = image ] && [ "$2" = inspect ] && [ "$3" = "{missing_image}" ]; then exit 1; fi
-            if [ "$1" = compose ] && [ "$2" = config ] && [ "$3" = --images ]; then printf 'fixture-core:latest\\nfixture-web:latest\\n'; fi
-            if [ "$1" = compose ] && [ "$2" = logs ]; then echo service-diagnostic >&2; fi
-            if [ "$1" = compose ] && [ "$2" = config ] && [ "$3" = --environment ]; then sed "s/'//g" .env; fi
-            if [ "$1" = compose ] && [ "$2" = version ]; then printf 'v2.29.1\\n'; exit 0; fi
-            if [ "$1" = compose ] && [ "$2" = cp ]; then printf '#!/bin/sh\\necho oac_core_fixture\\nexit {key_status}\\n' > ./oac.download; chmod +x ./oac.download; exit 0; fi
-            if [ "$1" = compose ] && [ "$2" = up ]; then {'kill -KILL "$PPID"' if kill_start else ':'}; exit {compose_up}; fi
-            exit 0
-            """))
-        self.write_executable(bin_dir / "curl", textwrap.dedent(f"""\
-            #!/bin/sh
-            exit_status={download_status}
-            [ "$exit_status" = 0 ] || exit "$exit_status"
-            output=""
-            while [ $# -gt 0 ]; do
-              if [ "$1" = --output ]; then output="$2"; shift 2; continue; fi
-              shift
-            done
-            printf 'fixture\\n' > "$output"
-            {'kill -KILL "$PPID"' if kill_download else ':'}
-            """))
-        self.write_executable(bin_dir / "sha256sum", "#!/bin/sh\nexit 0\n")
-        self.write_executable(bin_dir / "uname", '#!/bin/sh\ncase "$1" in -s) echo Linux;; -m) echo x86_64;; esac\n')
-        self.write_executable(bin_dir / "flock", f'#!{sys.executable}\nimport fcntl, sys\ntry: fcntl.flock(int(sys.argv[-1]), fcntl.LOCK_EX | fcntl.LOCK_NB)\nexcept BlockingIOError: sys.exit(1)\n')
-        self.write_executable(bin_dir / "ss", "#!/bin/sh\nexit 0\n")
-        self.write_executable(bin_dir / "ip", f"#!/bin/sh\nprintf '%s\\n' '{route}'\n")
-        env = dict(os.environ, PATH=str(bin_dir) + os.pathsep + os.environ["PATH"], HOME=str(root))
-        command = ["bash", str(INSTALL), "--install-dir", str(root / "oac"), *args]
-        if file_limit:
-            command = ["bash", "-c", 'ulimit -f 0; exec "$@"', "--", *command]
-        completed = subprocess.run(command,
-                                   env=env, capture_output=True, text=True)
-        return completed, log.read_text() if log.exists() else ""
-
-    def test_a_failed_start_preserves_configuration_and_reports_service_logs(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            completed, recorded = self.install(root, "--host", "127.0.0.1", "--web-port", "59991",
-                                               "--public-url", "https://core.example", compose_up=1)
-            self.assertNotEqual(completed.returncode, 0, completed.stderr)
-            self.assertTrue((root / "oac/.env").exists())
-            self.assertNotIn("compose down", recorded)
-            self.assertIn("service-diagnostic", completed.stderr)
-            self.assertIn("data retained", completed.stderr)
-            self.assertIn("pull --platform linux/amd64 fixture-core:latest", recorded)
-            self.assertIn("compose up -d --wait", recorded)
-            self.assertIn("compose logs", recorded, "a failed start must show the services' logs")
-
-    def test_the_private_address_is_the_default_public_url(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            completed, _ = self.install(root)
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertIn("OAC_PUBLIC_URL='http://10.0.0.5:8080'\n", (root / "oac/.env").read_text())
-            self.assertIn("Console   http://10.0.0.5:8080", completed.stdout)
-            self.assertIn("Core key  oac_core_fixture", completed.stdout)
-            self.assertNotIn("Only this host", completed.stdout)
-
-    def test_without_a_private_address_only_this_host_reaches_web(self):
-        for args, route in ((["--web-port", "59992"], "1.1.1.1 dev eth0 src 203.0.113.5 uid 0"),
-                            (["--host", "127.0.0.1", "--web-port", "59992"], "1.1.1.1 dev eth0 src 10.0.0.5 uid 0")):
-            with self.subTest(args=args), tempfile.TemporaryDirectory() as temporary:
-                root = Path(temporary)
-                completed, _ = self.install(root, *args, route=route)
-                self.assertEqual(completed.returncode, 0, completed.stderr)
-                self.assertIn("OAC_PUBLIC_URL='http://localhost:59992'\n", (root / "oac/.env").read_text())
-                self.assertIn("Only this host can open the console", completed.stdout)
-
-    def test_env_holds_only_the_installation_choices(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            completed, _ = self.install(root, "--public-url", "https://core.example")
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            env = dict((lambda pair: (pair[0], pair[1].strip("'")))(line.split("=", 1)) for line in (root / "oac/.env").read_text().splitlines())
-            self.assertEqual(env["OAC_PUBLIC_URL"], "https://core.example")
-            self.assertEqual(sorted(env), ["COMPOSE_PROJECT_NAME", "OAC_HOST", "OAC_INSTALL_DIR", "OAC_PUBLIC_URL", "OAC_WEB_PORT"])
-
-    def test_key_failure_never_removes_a_started_installation(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            completed, recorded = self.install(root, key_status=1)
-            self.assertNotEqual(completed.returncode, 0)
-            self.assertTrue((root / "oac/.env").exists())
-            self.assertNotIn("compose down", recorded)
-            self.assertIn("Core key could not be read", completed.stderr)
-
-    def test_retry_reuses_saved_settings_and_keeps_data(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            failed, _ = self.install(root, "--public-url", "https://core.example", compose_up=1)
-            self.assertNotEqual(failed.returncode, 0)
-            configuration = (root / "oac/.env").read_bytes()
-            data = root / "oac/data"
-            data.mkdir()
-            (data / "keep").write_text("user data")
-            (root / "docker.log").unlink()
-            completed, recorded = self.install(root, download_status=22)
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertEqual((root / "oac/.env").read_bytes(), configuration)
-            self.assertEqual((data / "keep").read_text(), "user data")
-            self.assertIn("Console   https://core.example", completed.stdout)
-            self.assertNotIn("pull --platform", recorded)
-            self.assertNotIn("Only this host", completed.stdout)
-
-    def test_retry_downloads_only_missing_images_and_prevents_implicit_updates(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            failed, _ = self.install(root, compose_up=1)
-            self.assertNotEqual(failed.returncode, 0)
-            (root / "docker.log").unlink()
-            (root / "oac/oac").unlink()
-            completed, recorded = self.install(root, missing_image="fixture-web:latest")
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertNotIn("pull --platform linux/amd64 fixture-core:latest", recorded)
-            self.assertIn("pull --platform linux/amd64 fixture-web:latest", recorded)
-            for line in recorded.splitlines():
-                if line.startswith(("compose create", "compose up")):
-                    self.assertIn("--pull never", line)
-                    self.assertIn("--no-recreate", line)
-
-    def test_retry_after_file_size_limit_recovers_staging(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            failed, _ = self.install(root, file_limit=True)
-            self.assertNotEqual(failed.returncode, 0)
-            self.assertIn("Downloading release checksums", failed.stdout)
-            completed, _ = self.install(root)
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertFalse((root / "oac.staging").exists())
-
-    def test_failed_initial_pull_never_adopts_old_cached_images_on_retry(self):
-        for kill in (False, True):
-            with self.subTest(kill=kill), tempfile.TemporaryDirectory() as temporary:
-                root = Path(temporary)
-                failed, _ = self.install(root, pull_status=1, kill_pull=kill)
-                self.assertNotEqual(failed.returncode, 0)
-                self.assertFalse((root / "oac").exists())
-                (root / "docker.log").unlink()
-                # Every image inspect succeeds: another installation cached old tags.
-                completed, recorded = self.install(root)
-                self.assertEqual(completed.returncode, 0, completed.stderr)
-                for image in ("fixture-core:latest", "fixture-web:latest"):
-                    self.assertIn("pull --platform linux/amd64 " + image, recorded)
-                self.assertFalse((root / "oac.staging").exists())
-
-    def test_invalid_port_and_unavailable_docker_fail_before_installation(self):
-        for args, status in [(["--web-port", "0"], 0), (["--web-port", "70000"], 0), ([], 1)]:
-            with self.subTest(args=args, status=status), tempfile.TemporaryDirectory() as temporary:
-                root = Path(temporary)
-                completed, recorded = self.install(root, *args, docker_info=status)
-                self.assertNotEqual(completed.returncode, 0)
-                self.assertFalse((root / "oac").exists())
-                self.assertNotIn("pull --platform", recorded)
-
-    def test_failed_download_leaves_no_installation_or_staging(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            completed, recorded = self.install(root, download_status=22)
-            self.assertNotEqual(completed.returncode, 0)
-            self.assertFalse((root / "oac").exists())
-            self.assertFalse((root / "oac.staging").exists())
-            self.assertNotIn("compose down", recorded)
-
-    def test_retry_after_sigkill_cleans_unfinished_download(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            killed, _ = self.install(root, kill_download=True)
-            self.assertEqual(killed.returncode, -9, killed.stderr)
-            self.assertTrue((root / "oac.staging").exists())
-            self.assertFalse((root / "oac").exists())
-            completed, _ = self.install(root)
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertFalse((root / "oac.staging").exists())
-            self.assertTrue((root / "oac/oac").exists())
-
-    def test_retry_after_start_sigkill_cleans_published_log(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            killed, _ = self.install(root, kill_start=True)
-            self.assertEqual(killed.returncode, -9, killed.stderr)
-            self.assertTrue((root / "oac/install.log").exists())
-            completed, _ = self.install(root)
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertFalse((root / "oac/install.log").exists())
-            self.assertFalse((root / "oac.staging").exists())
-
-    def test_retry_clears_staging_from_an_interrupted_process(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            staging = root / "oac.staging"
-            staging.mkdir()
-            (staging / ".oac-installer").symlink_to((root / "oac").resolve())
-            (staging / "partial").write_text("unfinished download")
-            completed, _ = self.install(root)
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertFalse(staging.exists())
-            self.assertFalse((root / "oac/partial").exists())
-
-    def test_unrecognized_staging_directory_is_never_deleted(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            staging = root / "oac.staging"
-            staging.mkdir()
-            (staging / "keep").write_text("user data")
-            completed, recorded = self.install(root)
-            self.assertNotEqual(completed.returncode, 0)
-            self.assertIn("Unrecognized staging", completed.stderr)
-            self.assertEqual((staging / "keep").read_text(), "user data")
-            self.assertNotIn("compose up", recorded)
-
-    def test_existing_unrelated_directory_is_never_deleted(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            (root / "oac").mkdir()
-            (root / "oac/keep").write_text("user data")
-            completed, recorded = self.install(root)
-            self.assertNotEqual(completed.returncode, 0)
-            self.assertEqual((root / "oac/keep").read_text(), "user data")
-            self.assertNotIn("compose down", recorded)
-
-    def test_another_installation_holds_the_lock(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            with (root / "oac.install.lock").open("w") as lock:
-                fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
-                completed, recorded = self.install(root)
-            self.assertNotEqual(completed.returncode, 0)
-            self.assertIn("Another installation", completed.stderr)
-            self.assertFalse((root / "oac").exists())
-            self.assertNotIn("pull --platform", recorded)
-
-    def test_retry_does_not_overlap_an_oac_mutation(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            completed, _ = self.install(root)
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            (root / "docker.log").unlink()
-            with (root / "oac/.oac.lock").open("r+") as lock:
-                fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
-                completed, recorded = self.install(root)
-            self.assertNotEqual(completed.returncode, 0)
-            self.assertIn("Another oac command", completed.stderr)
-            self.assertNotIn("compose up", recorded)
-
-    def test_rerun_does_not_silently_replace_settings(self):
-        with tempfile.TemporaryDirectory() as temporary:
-            root = Path(temporary)
-            completed, _ = self.install(root)
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            before = (root / "oac/.env").read_bytes()
-            completed, _ = self.install(root, "--web-port", "9000")
-            self.assertEqual(completed.returncode, 0, completed.stderr)
-            self.assertIn("Using saved settings", completed.stdout)
-            self.assertIn("only apply to new directories", completed.stdout)
-            self.assertEqual((root / "oac/.env").read_bytes(), before)
-
-    def test_help_does_not_need_docker(self):
-        help_text = subprocess.run(["bash", str(INSTALL), "--help"], capture_output=True, text=True, check=True)
-        self.assertIn("--web-port", help_text.stdout)
-        self.assertNotIn("--external-proxy", help_text.stdout)
-
-    def write_executable(self, path, text):
-        path.write_text(text)
-        path.chmod(path.stat().st_mode | stat.S_IEXEC)
-
-
-if __name__ == "__main__":
+SCRIPT = Path(__file__).with_name('install.sh').resolve()
+
+
+class LauncherTests(unittest.TestCase):
+    def run_launcher(self, system='Darwin', machine='arm64', corrupt=False):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            binary = b'#!/bin/sh\nprintf "%s\\n" "$@"\n'
+            digest = hashlib.sha256(binary).hexdigest()
+            scripts = {
+                'uname': '#!/bin/sh\nif [ "$1" = -s ]; then echo ' + system + '; else echo ' + machine + '; fi\n',
+                'curl': '''#!/usr/bin/env python3
+import pathlib,sys
+args=sys.argv
+url=args[-3]; target=pathlib.Path(args[-1])
+asset=url.rsplit('/',1)[1]
+if asset.endswith('.sha256'):
+    target.write_text(DIGEST + '  ' + asset.removesuffix('.sha256') + '\\n')
+else:
+    target.write_bytes(BINARY)
+'''.replace('DIGEST', repr('0' * 64 if corrupt else digest)).replace('BINARY', repr(binary)),
+            }
+            for name, contents in scripts.items():
+                (root / name).write_text(contents); (root / name).chmod(0o700)
+            return subprocess.run(['bash', str(SCRIPT), '--install-dir', '/path with spaces/core', '--version', 'v1.2.3'],
+                                  env={**os.environ, 'PATH': str(root) + os.pathsep + os.environ['PATH']}, capture_output=True, text=True)
+
+    def test_linux_and_mac_share_argument_forwarding(self):
+        for system, machine in [('Linux', 'x86_64'), ('Linux', 'aarch64'), ('Darwin', 'arm64'), ('Darwin', 'x86_64')]:
+            with self.subTest(system=system, machine=machine):
+                result = self.run_launcher(system, machine)
+                self.assertEqual(result.returncode, 0, result.stderr)
+                self.assertEqual(result.stdout.splitlines(), ['install', '--install-dir', '/path with spaces/core', '--version', 'v1.2.3'])
+
+    def test_corrupt_binary_is_never_executed(self):
+        result = self.run_launcher(corrupt=True)
+        self.assertNotEqual(result.returncode, 0)
+        self.assertIn('checksum mismatch', result.stderr)
+        self.assertEqual(result.stdout, '')
+
+    def test_unsupported_host_fails_before_downloading(self):
+        result = self.run_launcher(system='FreeBSD')
+        self.assertNotEqual(result.returncode, 0)
+
+
+if __name__ == '__main__':
     unittest.main()
diff --git a/docs/configuration.md b/docs/configuration.md
index f91a35562..fcdc5b4a4 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -9,7 +9,7 @@ Every setting of a Core installation has exactly one home. There are two kinds:
 | [Process settings](#process-settings-configjson) | Public URL, ports, logging, harnesses, execution concurrency, audit retention, OAuth origins, Runtime history export | `.env` in the installation directory (default `~/.oac/core`) | Edit `.env`, then run `oac apply` | `oac apply` recreates the services that read the changed settings |
 | [Runtime settings](#runtime-settings-web) | Sandbox backend and size, nodes, Projects and keys, default models, executor credentials | Core's PostgreSQL database | Web, or the Core API (`/core/v1`) with the Core key | Saved without a Core restart; nodes prepare Runtime changes asynchronously |
 
-Web's **System** page shows the installation's addresses, the default models, the sandbox configuration and, under **Startup settings**, the process settings Core loaded. Secrets live in [`data/secrets/`](#installation-directory), one copy each. No configuration file defines Projects or API keys.
+Web's **System** page shows the installation's addresses, the default models, the sandbox configuration and, under **Startup settings**, the process settings Core loaded. Secrets live in [`secrets/`](#compose-installations), one copy each. No configuration file defines Projects or API keys.
 
 ## Process settings {#process-settings-configjson}
 
@@ -23,9 +23,8 @@ Installer flags in [installation options](./getting-started/install-options.md)
 
 1. It runs `oac-core check-config` with the `.env` you edited and changes nothing if a value is invalid.
 2. It runs `docker compose up -d --wait`. Compose recreates only the services whose configuration changed.
-3. If the check fails, no container is recreated. See [stop and restart](./getting-started/operations.md#stop-and-restart) for what a restart interrupts.
 
-`docker compose ps` shows the services. Domain state is `data/domain/status.json`.
+Use `docker compose ps` to check the services. See [stop and restart](./getting-started/operations.md#stop-and-restart) for what a restart interrupts.
 
 ### Changing the public URL {#changing-the-public-url}
 
@@ -44,7 +43,7 @@ To change it, point the reverse proxy at the new address first, then edit `OAC_P
 | Variable | Default | Meaning |
 | --- | --- | --- |
 | `OAC_PUBLIC_URL` | `http://localhost:8080` | Origin applications, nodes, sandboxes and self-hosted executors use. See [changing the public URL](#changing-the-public-url) |
-| `OAC_HOST` | `127.0.0.1` | Web bind address published by `compose.yaml`. `install.sh` sets `0.0.0.0` |
+| `OAC_HOST` | `127.0.0.1` | Web bind address published by `compose.yaml`. The installer sets `0.0.0.0` |
 | `OAC_WEB_PORT` | `8080` | Host port of Web |
 | `OAC_LOG_LEVEL` | `info` | `debug`, `info`, `warn` or `error` |
 | `OAC_LOG_FORMAT` | `auto` | `auto`, `text` or `json` |
@@ -81,7 +80,7 @@ Core approves a node's capacity when you generate its Add node command: **Sandbo
 
 ### Default models
 
-Set a default in **System** → **Default model configuration**, or use `PUT /core/v1/harnesses/{harness}/model-configuration`. Core encrypts provider keys with `secrets/credential.key` and never returns them. [Model execution](../contracts/agents-api/model-execution.md#deployment-defaults) owns the request fields and replacement rules, and [precedence](../contracts/agents-api/model-execution.md#saved-defaults-and-precedence) says which Sessions use a default.
+Set a default in **System** → **Default model configuration**, or use `PUT /core/v1/harnesses/{harness}/model-configuration`. Core encrypts provider keys with `secrets/core/credential.key` and never returns them. [Model execution](../contracts/agents-api/model-execution.md#deployment-defaults) owns the request fields and replacement rules, and [precedence](../contracts/agents-api/model-execution.md#saved-defaults-and-precedence) says which Sessions use a default.
 
 ## Compose installations
 
@@ -100,7 +99,7 @@ The initialization service generates secrets and the installation ID once, then
 
 Initialization prepares this directory; application services receive their secret directories read-only. `docker compose exec web oac-web core-key` prints the Core key to the operator terminal without writing it to container logs. Database passwords and credential encryption keys are never printed.
 
-`OAC_DATA_DIR` selects the directory and defaults to `./data` beside the Compose file. Preserve it together with that project's definition and public URL. Removing only the secret directories does not reset an installation; initialization refuses to start over an existing database. Core also binds the installation ID to its database. Runtime settings continue to live in [Core's database](#runtime-settings-web).
+The named Docker volume `<project>_data` contains these paths. Docker manages Linux ownership on every host; each service mounts only its required subdirectories. Preserve this volume together with the project definition and public URL. Removing only the secret directories does not reset an installation; initialization refuses to start over an existing database. Core also binds the installation ID to its database. Runtime settings continue to live in [Core's database](#runtime-settings-web).
 
 ## Docker node configuration
 
@@ -118,37 +117,31 @@ The [Docker adapter](./sandbox-provider.md#docker-adapter) owns container isolat
 
 ## Installation directory
 
-The installer creates the installation directory, `~/.oac/core` by default, with mode `0700`. Secret files are `0600`.
+The installer creates `~/.oac/core` by default (`$HOME/.oac/core` on Windows). Its files contain process settings and the native operator command; persistent service data lives in the [Compose data volume](#compose-installations).
 
 | Path | Content | Changed by |
 | --- | --- | --- |
-| `.env` | [Process settings](#process-settings-configjson). The file you edit | You, then `oac apply` |
-| `compose.yaml` | The release's service definition. Do not edit them | The release |
-| `oac` | The [management command](./getting-started/operations.md#the-oac-command), copied from the Core image | The installer |
-| `data/secrets/web/core.key` | The [Core key](./getting-started/operations.md#core-key) | `oac rotate-core-key` |
-| `data/secrets/core/credential.key` | Encryption key for what Core stores sealed in the database | Nothing. Keep it with the database |
-| `data/secrets/core/core-key-digests.json` | SHA-256 of the Core key | `oac rotate-core-key` |
-| `data/secrets/database/password` | PostgreSQL password | Nothing. PostgreSQL reads it only when the database is created |
-| `data/database/` | PostgreSQL data | PostgreSQL |
-| `data/node-payload/` | Node files Web serves at `/node-install/` | Initialization |
-| `data/state/` | Private Provider state, including E2B receipts | Core |
-| `.oac.lock` | The installation lock | Mutating `oac` commands |
-
-The Compose project is named `oac-<10 hex digits>`. Its services are `init`, `database`, `core` and `web`. Core applies database migrations when it starts. `web` serves the console and forwards `/v1` and `/api/v1` to Core, and it is the only service with a published port, `OAC_WEB_PORT`. No service receives a Docker socket. Apart from Docker's storage, nothing is written outside the installation directory.
+| `.env` | Process settings and the stable Compose project name | You, then `oac apply` |
+| `compose.yaml`, `compose-sha256sums.txt` | Verified release service definition | The release |
+| `oac` (`oac.exe` on Windows) | Native management command | The installer |
+
+The sibling `<install-dir>.lock` directory remains for synchronization; `<install-dir>.staging` holds unpublished installation files. Neither contains service data. On Unix the installer creates private directories with mode `0700` and configuration files with mode `0600`.
+
+The Compose project is named `oac-<10 hex digits>`. Its services are `init`, `database`, `core` and `web`. Core applies database migrations when it starts. Web serves the console and forwards `/v1` and `/api/v1` to Core; it is the only service with a published port, `OAC_WEB_PORT`. No service receives a Docker socket.
 
 ## Appendix: Core environment without the installer
 
-Core reads only its environment. Compose interpolates `.env` into the service environment. Compose must be 2.26.0 or newer. If you run Core yourself, set these variables; see the [service guide](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md).
+Core reads its process environment. Compose interpolates `.env` into it and mounts secrets at the container paths below. When running Core directly, set the file variables to absolute paths readable by the Core process; see the [service guide](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md).
 
 | Variable | Set from |
 | --- | --- |
 | `OAC_PUBLIC_URL` | The public origin. Core derives the daemon WebSocket URL, the self-hosted `remote_url`, the hosted sandbox address and the deployment's read-only `core_url` from it, never from request headers. Without it, Core runs no Runtime gateway and executes no Sessions |
 | `OAC_ADDR` | The image sets `:8091`. Independently started Core defaults to `127.0.0.1:8091` when unset or empty |
 | `OAC_DATABASE_URL` | PostgreSQL without a password |
-| `OAC_DATABASE_PASSWORD_FILE` | `data/secrets/database/password`. The URL must then carry no password |
-| `OAC_CREDENTIAL_KEY_FILE` | `data/secrets/core/credential.key` |
-| `OAC_CORE_KEY_DIGESTS_FILE` | `data/secrets/core/core-key-digests.json`: a JSON array with the SHA-256 of the Core key |
-| `OAC_INSTALLATION_ID_FILE` | `data/secrets/core/installation.id`: the installation ID, a canonical UUID. It enables the sandbox deployment and node routes and requires `OAC_PUBLIC_URL` and `OAC_CORE_KEY_DIGESTS_FILE`. Core refuses an ID other than the one its database recorded |
+| `OAC_DATABASE_PASSWORD_FILE` | `/run/database/password`. The URL must then carry no password |
+| `OAC_CREDENTIAL_KEY_FILE` | `/run/oac/credential.key` |
+| `OAC_CORE_KEY_DIGESTS_FILE` | `/run/oac/core-key-digests.json`: a JSON array with the SHA-256 of the Core key |
+| `OAC_INSTALLATION_ID_FILE` | `/run/oac/installation.id`: the installation ID, a canonical UUID. It enables the sandbox deployment and node routes and requires `OAC_PUBLIC_URL` and `OAC_CORE_KEY_DIGESTS_FILE`. Core refuses an ID other than the one its database recorded |
 | `OAC_EXECUTION_CONCURRENCY`, `OAC_DEFAULT_HARNESS`, `OAC_HARNESSES`, `OAC_WRITE_AUDIT_RETENTION`, `OAC_OAUTH_TRUSTED_ORIGINS` | The matching [process settings](#settings). `oac-core check-config` validates them without starting Core |
 | `OAC_HISTORY_SETTINGS_FILE` | Optional Runtime history file. Sensitive; the installation report says only whether it is set |
 | `OAC_LOG_LEVEL`, `OAC_LOG_FORMAT`, `OAC_LOG_ADD_SOURCE` | Logging; Web reads the same three |
@@ -162,7 +155,7 @@ Invalid explicit OAuth trusted origins stop Core at startup. Entries must be HTT
 
 ## Appendix: Web environment without the installer
 
-Compose sets these for Web. Set them yourself only when you run the console without Compose. Of the installation's secrets, Web receives only `data/secrets/web/core.key`.
+Compose sets these for Web. Set them yourself only when you run the console without Compose. Compose mounts the data volume's `secrets/web/` at `/run/oac` and sets `OAC_WEB_CORE_KEY_FILE=/run/oac/core.key`.
 
 | Variable | Default | Meaning |
 | --- | --- | --- |
diff --git a/docs/getting-started/install-options.md b/docs/getting-started/install-options.md
index 41c4e50e7..08cdd34e5 100644
--- a/docs/getting-started/install-options.md
+++ b/docs/getting-started/install-options.md
@@ -2,7 +2,7 @@
 title: "Installation options and advanced deployments"
 ---
 
-The [default installation](./install.md) needs no options. Use this page to run behind an existing reverse proxy or install without internet access.
+The [default installation](./install.md) needs no options. Use this page to set installation options, deploy with Compose or configure a reverse proxy.
 
 Pass options to the downloaded script:
 
@@ -10,11 +10,11 @@ Pass options to the downloaded script:
 ./install.sh --public-url https://core.example
 ```
 
-With the one-line command, append them after `bash -s --`. `--version TAG` selects a published release; otherwise the script selects the latest stable release and verifies each Compose file's SHA-256. A failed step stops installation without a success message.
+On Windows, download `install.ps1` and pass the same flags with `& ./install.ps1 --public-url https://core.example`. With the Unix one-line command, append them after `bash -s --`. `--version TAG` selects a published release; otherwise the script selects the latest stable release and verifies the native command and Compose files against their SHA-256 checksums.
 
 ## Docker Compose and hosting platforms
 
-Use the `compose.yaml` from a release with Docker Compose 2.26 or newer on Linux amd64. The release pins its initialization image and source revision in the [Compose template](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/compose/compose.yaml). Core and Web use the `latest` images, and PostgreSQL uses `postgres:16-alpine`. It starts PostgreSQL, Core and Web. Web forwards `/v1` and `/api/v1` to Core. Data is bind-mounted from a directory. The one-time initialization service generates random secrets there and prepares the node installer; Core applies database migrations when it starts. [Compose configuration](../configuration.md#compose-installations) owns the settings and the data directory.
+Use the `compose.yaml` from a release on any [supported Core host](./install.md#prerequisites). The release pins its initialization image and source revision in the [Compose template](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/compose/compose.yaml). Core and Web use the `latest` images, and PostgreSQL uses `postgres:16-alpine`. It starts PostgreSQL, Core and Web. Web forwards `/v1` and `/api/v1` to Core. Data lives in a named Docker volume. The one-time initialization service generates random secrets there and prepares the node installer; Core applies database migrations when it starts. [Compose configuration](../configuration.md#compose-installations) owns the settings and the data directory.
 
 For a local trial, download `compose.yaml` from a release into an empty directory, then run:
 
@@ -23,7 +23,7 @@ docker compose up -d --wait --wait-timeout 900
 docker compose exec web oac-web core-key
 ```
 
-`oac-web core-key` prints the generated Core key to your terminal without writing it to container logs. Open `http://localhost:8080` and use that key to sign in. All installation secrets are generated automatically; keep the same Compose project and its data directory when restarting.
+`oac-web core-key` prints the generated Core key to your terminal without writing it to container logs. Open `http://localhost:8080` and use that key to sign in. All installation secrets are generated automatically; keep the same Compose project and its data volume when restarting.
 
 The initialization image contains only the small node installation metadata alongside the initialization command. First startup verifies and copies that metadata without downloading the control archive or requiring access to GitHub Releases. Later starts verify the saved files. Container images still need to be pulled. An interrupted first initialization can be rerun; an existing database with missing installation secrets is refused.
 
@@ -41,7 +41,7 @@ On either platform, open its server terminal and run `docker compose ls` to find
 
 After signing in, choose the sandbox backend and add nodes using [Nodes](./nodes.md). The Compose stack deploys the control plane; execution machines remain separate.
 
-Stop with `docker compose stop` using the same files and environment. Back up the data directory together while the services are stopped. Follow the [installation version policy](./operations.md#installation-version-policy): a different release needs a new Compose project and a fresh data directory.
+Stop with `docker compose stop` using the same files and environment. Back up the data volume and configuration together while the services are stopped. Follow the [installation version policy](./operations.md#installation-version-policy): a different release needs a new Compose project and a fresh data volume.
 
 ## Process settings
 
@@ -60,7 +60,7 @@ These flags are written to `.env` once. After installation, edit that file and r
 
 | Option | Purpose |
 | --- | --- |
-| `--install-dir DIR` | Absolute installation directory; defaults to `~/.oac/core`. A new installation requires an empty or missing directory, or one holding an [installation that never started](./install.md#install) |
+| `--install-dir DIR` | Absolute installation directory; defaults to `~/.oac/core`. Use an empty or missing directory for a new installation, or an existing installation directory to [retry](./install.md#install) |
 
 Several installations can share a machine when they use distinct installation directories and ports. Use distinct IP addresses or a shared reverse proxy for more. Each installation has its own database, Core key and nodes.
 
@@ -131,4 +131,4 @@ The address changes whenever `cloudflared` restarts; nodes bound to the old addr
 
 ## Offline hosts
 
-This installer does not install from an offline bundle. It downloads Compose files and container images from the release.
+Core installation requires access to GitHub Releases and the container registries to download release files and images.
diff --git a/docs/getting-started/install.md b/docs/getting-started/install.md
index acf59bd48..9e1b17e73 100644
--- a/docs/getting-started/install.md
+++ b/docs/getting-started/install.md
@@ -2,7 +2,7 @@
 title: "Install Core and Web"
 ---
 
-One command installs Core, the Web console and PostgreSQL on a Linux host. Sign in to Web with the Core key, set a default model and issue Project API keys. Applications call Core with those keys. Sessions run in sandboxes on nodes you add, or on E2B.
+One command installs Core, the Web console and PostgreSQL on Linux, macOS or Windows. Sign in to Web with the Core key, set a default model and issue Project API keys. Applications call Core with those keys. Sessions run in sandboxes on nodes you add, or on E2B.
 
 1. [Check the prerequisites](#prerequisites).
 2. [Run the installer](#install).
@@ -16,21 +16,29 @@ This page follows the default path. Every flag, existing reverse proxies and off
 
 ## Prerequisites
 
-- Linux amd64 and curl.
-- Docker Engine with Docker Compose 2.26.0 or newer (`docker compose version`).
+- Linux amd64/arm64 or macOS Intel/Apple Silicon with curl; Windows x64 with PowerShell.
+- Docker Engine 26 or newer and Docker Compose 2.26.0 or newer. On macOS and Windows, install and start Docker Desktop using Linux containers.
 - An account that can run `docker` and write to its home directory. Ordinary users and root both work; the installer never calls sudo.
 - Free port 8080 for Web. See [ports](./install-options.md#ports). Docker must be able to publish it; the installer does not change host policy.
 - For anything off this machine, the origin in `OAC_PUBLIC_URL` must be the address browsers, nodes and executors use. You can sign in on this machine first.
 
-The Core host needs no KVM; nodes that run microsandbox do.
+Sandbox nodes run on Linux amd64. When Core runs on macOS or Windows, connect a Linux node or use E2B.
 
 ## Install
 
+Linux and macOS:
+
 ```sh
 curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash
 ```
 
-On a host whose default route has a private-network address, the installer sets the public URL to `http://<that address>:8080`, so machines on the same network can open Web and add nodes; otherwise only this machine can. If a reverse proxy already serves this host, pass its HTTPS address:
+Windows PowerShell:
+
+```powershell
+irm https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.ps1 | iex
+```
+
+When binding to all IPv4 addresses, the installer uses the private address of the default route if available; otherwise the console address is `http://localhost:8080`. To choose another reachable origin, pass `--public-url`; if a reverse proxy already serves this host, use its HTTPS address:
 
 ```sh
 curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash -s -- --public-url https://core.example
@@ -38,13 +46,13 @@ curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/
 
 The script downloads that release's Compose files, checks their SHA-256, and:
 
-1. checks Linux amd64, Docker Compose 2.26 or newer, and that the ports it will publish are free;
-2. creates the [installation directory](../configuration.md#installation-directory), `~/.oac/core`, writes `.env`, and copies the `oac` command out of the Core image;
+1. checks Docker is running Linux containers, meets the required versions, and can publish the chosen port;
+2. prepares the [installation directory](../configuration.md#installation-directory), `~/.oac/core`, with `.env` and the native `oac` command (`oac.exe` on Windows);
 3. starts the services with Docker Compose. Web serves the console on port 8080 and forwards `/v1`, `/api/v1` and `/docs` to Core. Core and PostgreSQL are not published.
 
-It saves no sandbox backend, adds no node, creates no Project or key and makes no model request. It ends by printing the console address and the Core key.
+The installer prints the console address and Core key. After signing in, configure execution resources and create Projects in Web.
 
-Downloads and configuration checks happen before the installation directory is published. After that, failures preserve the configuration and data and show the service logs. Fix the reported cause and rerun the same command, or specify the installation directory:
+Downloads and configuration checks happen before the installation directory is published. After that, failures preserve the configuration and data and report the failed step; inspect it with `docker compose logs --tail 100` in the installation directory. Fix the reported cause and rerun the same command, or specify the installation directory:
 
 ```bash
 curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash -s -- --install-dir "$HOME/.oac/core"
@@ -63,6 +71,8 @@ For insufficient space or quota, free space on the filesystem named by the error
    ~/.oac/core/oac core-key --show
    ```
 
+   On Windows, use `& "$HOME/.oac/core/oac.exe" core-key --show`. The same command arguments work on every platform.
+
 ## Configure the public address {#configure-the-domain-and-https}
 
 Applications, nodes and sandboxes reach Core at one address, the public URL. HTTP is enough on the local network. When you expose Core beyond it, put a reverse proxy in front and set the public URL to the HTTPS origin it serves. E2B guests reach Core from the internet, so they need a public URL that is not loopback.
diff --git a/docs/getting-started/operations.md b/docs/getting-started/operations.md
index 83e63c196..a15d9174d 100644
--- a/docs/getting-started/operations.md
+++ b/docs/getting-started/operations.md
@@ -6,7 +6,7 @@ The installation operator owns the Core host, its storage and its availability.
 
 ## The oac command
 
-Each installation has its own management command in its directory. It needs neither the bundle nor root:
+Each installation has its own native management command in its directory: `oac` on Unix, `oac.exe` on Windows. It needs Docker access and no root privileges:
 
 ```sh
 docker compose -f ~/.oac/core/compose.yaml ps
@@ -18,11 +18,11 @@ docker compose -f ~/.oac/core/compose.yaml ps
 | `docker compose start` | Starts the services |
 | `docker compose stop` | Stops the services. Data, nodes and sandboxes are kept |
 | `oac apply` | Runs `oac-core check-config`, then `docker compose up -d --wait`. A failed check changes no service |
-| `oac core-key [--show]` | Prints the Core key path, or the key itself with `--show` |
+| `oac core-key [--show]` | Identifies the key location in the data volume, or prints the key with `--show` |
 | `oac rotate-core-key` | Replaces the Core key and restarts Core and Web |
 | `docker compose down` | Removes the containers. Data is kept; to delete it, [uninstall](#uninstall) |
 
-For a second installation, use its directory, such as `~/.oac/second`.
+The examples use the default installation directory. On Windows, invoke the management command with `& "$HOME/.oac/core/oac.exe"` followed by the same arguments. For a custom installation directory, replace the path in each command.
 
 ## Service health
 
@@ -63,13 +63,13 @@ A Web restart, including one caused by `oac apply`, signs everyone out of the co
 
 ## Core key
 
-Each installation has one administrator credential, the Core key. The installer generates a key with the `oac_admin_` prefix followed by 64 random lowercase hexadecimal characters in `data/secrets/web/core.key`. Read it with `oac core-key --show`; the file is owned by the container user. The Core key:
+Each installation has one administrator credential, the Core key. The installer generates a key with the `oac_admin_` prefix followed by 64 random lowercase hexadecimal characters in `secrets/web/core.key`. Read it with `oac core-key --show`; the file is owned by the container user. The Core key:
 
 - signs in to Web. The browser gets an HttpOnly session cookie, never the key;
 - authorizes Core API (`/core/v1`) requests sent as `Authorization: Bearer <Core key>`;
 - never authorizes the Agents API (`/v1`). Applications use Project API keys, which in turn can't call `/core/v1`.
 
-Keep it private. Web reads `data/secrets/web/core.key`. Core reads only its SHA-256 from `data/secrets/core/core-key-digests.json`. A Core key has at least 32 characters and no whitespace. Web limits failed sign-ins.
+Keep it private. Web reads `secrets/web/core.key`. Core reads only its SHA-256 from `secrets/core/core-key-digests.json`. A Core key has at least 32 characters and no whitespace. Web limits failed sign-ins.
 
 ### Script the Core API
 
@@ -103,7 +103,7 @@ The [Core administration API](../../contracts/agents-api/admin-api.md) lists eve
 ~/.oac/core/oac rotate-core-key
 ```
 
-It writes a new key to `data/secrets/web/core.key`, regenerates `data/secrets/core/core-key-digests.json`, and restarts Core and Web. The old key stops working as soon as Core restarts, and every console session ends: sign in again and update your scripts.
+It runs in the initialization container, updates `secrets/web/core.key` and `secrets/core/core-key-digests.json` in the data volume, and restarts Core and Web. The old key stops working as soon as Core restarts, and every console session ends: sign in again and update your scripts.
 
 ## Projects and API keys
 
@@ -123,37 +123,33 @@ Core records which key made each public resource write; the retention of that hi
 
 Back up these together; a restore needs all of them:
 
-- the PostgreSQL volume `<project>_database`. It holds Projects, key digests, nodes, default models, encrypted credentials and all execution history, including large objects. A logical dump:
+- the Docker volume `<project>_data`, including its `database/`, `secrets/` and `state/` directories. It holds Projects, key digests, nodes, default models, encrypted credentials and all execution history, including large objects. A logical dump:
 
   ```sh
   docker compose -f "$HOME/.oac/core/compose.yaml" exec -T database \
     pg_dump -U agents_api agents_api > oac-backup.sql
   ```
 
-- the installation directory, especially `data/`. `data/secrets/core/credential.key` must stay with the database, or stored credentials can't be decrypted.
+- the installation directory containing `.env`, `compose.yaml` and the command. The data volume's `secrets/core/credential.key` must stay with the database, or stored credentials cannot be decrypted.
 - each node's state directory on its host, `/var/lib/oac-node/.oac/nodes/<installation-id>/`, with its provider storage: Docker volumes or microsandbox's store. See [when a node host fails](./nodes.md#when-a-node-host-fails) for restoring them.
 
-Stop with `docker compose stop`, archive the installation directory, then `docker compose start`.
-
-Never prune Docker volumes or delete native harness history to make a retry pass. A deleted Session does not prove that all provider resources were reclaimed.
+Stop with `docker compose stop`, export the complete data volume and archive the installation directory, then `docker compose start`. Docker Desktop supports volume export from its **Volumes** view. A SQL dump alone does not include the encryption key or Provider state.
 
 ## Uninstall
 
 ```sh
 cd ~/.oac/core
-docker compose down --remove-orphans
-docker compose run --rm --no-deps --entrypoint find init /data -mindepth 1 -delete
-docker compose down --rmi all
+docker compose down --volumes --remove-orphans --rmi all
 cd && rm -rf ~/.oac/core
 ```
 
-The containers own `data/`, so the `init` image deletes its contents; then `down --rmi all` removes the images and `rm` removes the installation directory. Run these only when you mean to delete the data.
+`down --volumes` deletes the installation data volume. Remove the installation directory afterward; on Windows use `Remove-Item -Recurse "$HOME/.oac/core"`.
 
 All data goes with it: Projects and API keys, Session history, stored credentials and the Core key. To keep the data, stop the installation with `docker compose stop` instead, or [back it up](#back-up) first.
 
 Uninstall stops no sandbox: node sandboxes keep running on their nodes, and E2B sandboxes keep running, and billing, at E2B. While Core is still up, archive their Sessions or [reset the deployment](./nodes.md#change-the-sandbox-configuration) and let it complete; the command shows how many sandboxes Core has in use.
 
-Nodes on other hosts keep running. To uninstall them the usual way, remove them in Web first, as in [Remove a node](./nodes.md#remove-a-node). After the installation directory is gone, their Core is gone: on each node host, run the node uninstall command with `--force`, using `node-install.pyz` from the release that installed them. The installation ID is `data/secrets/core/installation.id`.
+Nodes on other hosts keep running. To uninstall them the usual way, remove them in Web first, as in [Remove a node](./nodes.md#remove-a-node). After the installation directory is gone, their Core is gone: on each node host, run the node uninstall command with `--force`, using `node-install.pyz` from the release that installed them. The installation ID is `secrets/core/installation.id` in the data volume.
 
 ## Installation version policy
 
@@ -163,7 +159,7 @@ To move to a new release, install it into a new, empty directory, with its own d
 
 An interrupted installation can [resume with its saved configuration](./install.md#install). An unrelated nonempty directory is refused.
 
-The installer and mutating `oac` commands hold `.oac.lock`. The installer also holds a sibling `<install-dir>.install.lock` while preparing the directory. If another command holds either lock, retry after it finishes. Never delete a lock file to get past a busy installation.
+Installation and mutating `oac` commands share the [installation lock](../configuration.md#installation-directory). If another command is running, wait for it to finish before retrying.
 
 ## Troubleshooting
 
diff --git a/docs/maintainers.md b/docs/maintainers.md
index 47d162b70..166c39feb 100644
--- a/docs/maintainers.md
+++ b/docs/maintainers.md
@@ -6,7 +6,10 @@ This guide is for maintainers who build and publish OpenAgentCore. To install Co
 
 ## Build a distribution
 
-A distribution is the matched set of Linux amd64 release assets built from one commit: the control archive (the installer, the `oac` command, and the Core, Web, ingress and PostgreSQL images), the Runtime image and node artifacts as separate files, and the native installers.
+A distribution is a matched set of release assets built from one commit: the control archive (the installer, the `oac` command, and the Core, Web, ingress and PostgreSQL images), the Runtime image and node artifacts as separate files, and the native installers.
+
+Core, Web and ingress images are published as verified Linux amd64/arm64 indexes. The arm64 control archive contains those three images; Node, hosted Runtime and offline payloads use Linux amd64. Release builders use QEMU for ARM image steps, including the E2B helper. Host `oac` binaries are built from the same command for Linux amd64/arm64, macOS amd64/arm64 and Windows amd64; launchers only select, verify and invoke them. Each version index is checked against its platform archives before floating tags move.
+
 
 Build on Linux x86_64 with a glibc compatible with Debian 12, Docker, the Go version in `go.mod`, a C compiler (the microsandbox helper is a CGO build), Node, pnpm, Python 3.9 or newer, curl, tar, pigz and sha256sum. The source must be clean and committed. First prepare the pinned Codex package and MiniMax Code companion, then build:
 
@@ -96,7 +99,7 @@ The distribution combines the three Harness images into one Runtime image (`depl
 make build-e2b-provider
 ```
 
-Docker builds the Linux amd64 helper with the pinned CPython and Debian 12 image. The Python dependency closure, including PyInstaller, is hash-locked in `services/core/tools/e2b-provider/requirements.lock`; no E2B account key is needed. Set `E2B_PROVIDER_BUILD_DIR` for another output directory. The build is a pure function of the helper sources, `LICENSE` and the build script, so it is cached under `~/.oac/cache/e2b-provider/` by their hash and rebuilt only when they change. The output is `oac-e2b-provider-linux-amd64.tar.gz` with its `.sha256`; it extracts to `oac-e2b-provider/` with the executable, `_internal/`, `licenses/`, `requirements.lock` and `manifest.json`. The Core image uses that tree; the host needs a compatible glibc and CA certificates, not Python.
+Docker builds the Linux helper for `GOARCH=amd64` (default) or `GOARCH=arm64` with the pinned CPython and Debian 12 image. The Python dependency closure, including PyInstaller, is hash-locked in `services/core/tools/e2b-provider/requirements.lock`; no E2B account key is needed. Set `E2B_PROVIDER_BUILD_DIR` for another output directory. The build is a pure function of the helper sources, `LICENSE` and the build script, so it is cached under `~/.oac/cache/e2b-provider/` by their hash and rebuilt only when they change. The output is `oac-e2b-provider-linux-<architecture>.tar.gz` with its `.sha256`; it extracts to `oac-e2b-provider/` with the executable, `_internal/`, `licenses/`, `requirements.lock` and `manifest.json`. The Core image uses that tree; the host needs a compatible glibc and CA certificates, not Python.
 
 **microsandbox helper.** Linux only, with a C compiler:
 
@@ -111,9 +114,9 @@ The helper is written to `~/.oac/build/microsandbox-provider/oac-microsandbox-pr
 
 ### Standalone Core builds
 
-`make build-core` builds `oac-core`, `oac-core-device`, `oac-core-environment-key` and `oac-node` into `${OAC_DEV_HOME:-$HOME/.oac}/build/oac-core` (`OAC_DEV_CORE_BUILD_DIR` selects another absolute directory). The build copies only the source set listed in `scripts/build-core.sh` (the Core service, its contracts, the shared packages it needs and the root Go module files) into a temporary context and builds with CGO disabled, read-only modules and trimmed paths. It needs no Node, Docker or other application. When Core gains a shared dependency, add that package to the list; never copy the whole repository to make it compile.
+`make build-core` builds `oac-core`, `oac-core-device`, `oac-core-environment-key` `oac-node` and `oac` into `${OAC_DEV_HOME:-$HOME/.oac}/build/oac-core` (`OAC_DEV_CORE_BUILD_DIR` selects another absolute directory). The build copies only the source set listed in `scripts/build-core.sh` (the Core service, its contracts, the shared packages it needs and the root Go module files) into a temporary context and builds with CGO disabled, read-only modules and trimmed paths. It needs no Node, Docker or other application. When Core gains a shared dependency, add that package to the list; never copy the whole repository to make it compile.
 
-`make docker-build-core` builds the image `oac-core:dev` (`OAC_DEV_CORE_IMAGE` selects another name) from those five commands and the E2B helper. The base is the digest-pinned `debian:bookworm-slim` with CA certificates and the glibc runtime the helper needs; the default user is UID/GID 65532 and Core listens on `:8091`. The image is Linux amd64 only and is not pushed to a registry. Changes to the image or its build need `make check-core-container` in addition to the relevant source checks: it runs the official-client suite against the image with a read-only root filesystem and needs Linux Docker, a non-root user, and the [test database and pinned SDK](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#official-client-verification) of the service checks (`OAC_TEST_DATABASE_URL` naming an `oac_*_tests` database with the migrations applied, and `OAC_TEST_OFFICIAL_SDK_PYTHON`).
+`make docker-build-core` builds the image `oac-core:dev` (`OAC_DEV_CORE_IMAGE` selects another name) from those five commands and the E2B helper. The base is the digest-pinned `debian:bookworm-slim` with CA certificates and the glibc runtime the helper needs; the default user is UID/GID 65532 and Core listens on `:8091`. This local target builds Linux amd64; the [distribution build](#build-a-distribution) builds both architectures. Changes to the image or its build need `make check-core-container` in addition to the relevant source checks: it runs the official-client suite against the image with a read-only root filesystem and needs Linux Docker, a non-root user, and the [test database and pinned SDK](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#official-client-verification) of the service checks (`OAC_TEST_DATABASE_URL` naming an `oac_*_tests` database with the migrations applied, and `OAC_TEST_OFFICIAL_SDK_PYTHON`).
 
 ## Publish a version
 
@@ -132,13 +135,13 @@ Distribution and Runtime archives use `pigz` level 6 with at most four compressi
 
 ### Container registry
 
-Version releases and manual `build-<full SHA>` drafts publish Linux amd64 images as `ghcr.io/minimax-ai/openagentcore/<component>:<version>`, where `<component>` is `core`, `web`, `runtime` or `ingress`. For example, `ghcr.io/minimax-ai/openagentcore/core:v1.2.3`. A draft uses the tag `build-<full SHA>`. PostgreSQL uses its upstream image and is not republished. The registry images are loaded from the release archives without rebuilding. Existing version tags are reused only when their image config digest matches the release; a different image stops publication. A stable release also moves each component's `latest` tag to that image. Prereleases and drafts leave `latest` unchanged. SemVer build metadata uses `_` in place of `+` in container tags; version strings longer than 128 characters cannot be published to GHCR. After the images are verified, the publisher uploads the single `compose.yaml` and its checksum list, rendered for that release. Compose pins the ingress image by its registry digest; initialization rejects an image whose build revision differs from the Compose revision. A draft Release stays unpublished.
+Version releases and manual `build-<full SHA>` drafts publish `ghcr.io/minimax-ai/openagentcore/<component>:<version>`, where `<component>` is `core`, `web`, `runtime` or `ingress`. Core, Web and ingress indexes contain Linux amd64 and arm64 images; Runtime contains Linux amd64. Platform images use `<version>-<architecture>` tags and are loaded from the release archives. Existing version tags must match the release images and platform set. The publisher verifies every version index before updating `latest` for a stable release; prereleases and drafts leave `latest` unchanged. PostgreSQL uses its upstream image. SemVer build metadata uses `_` in place of `+` in container tags; version strings are limited to 128 characters. After verifying the images, the publisher uploads the release's `compose.yaml` and checksum list. Compose pins ingress by its index digest, and initialization checks its build revision against the Compose revision.
 
 The combined build/publication job uses `GITHUB_TOKEN` with `packages: write`. On the first publication, GitHub creates each container package as private: a package administrator must change all four packages to **Public** in their package settings before users can pull anonymously. See [GitHub container visibility](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry). Verify an unauthenticated pull after changing visibility. Repository visibility alone does not make a new container package public.
 
 GHCR and GitHub Releases do not share a transaction. A failed release may leave some matching version tags in GHCR; preserve those images and follow the draft recovery procedure below using the original artifacts. Registry failures other than a missing manifest stop publication. The job summary records digest-pinned references. These images and the rendered Compose files still require the configuration, secrets and routing described in [Configuration](./configuration.md).
 
-`install.sh` downloads the Compose files for the latest stable release, or the release named by `--version`, verifies their SHA-256 and starts that release. The [installation guide](./getting-started/install.md#install) covers its use.
+The [installation guide](./getting-started/install.md#install) covers release selection and the platform launchers.
 
 Go check and build jobs share Go module and compiler-cache directories under `~/.oac/cache/`, keyed by runner OS and architecture, all Go module files, the check/build partition and the commit. Partitioned keys prevent concurrent jobs from saving different compiler subsets under one key. Release builds can seed their cache from backend checks as well as earlier release builds. An older cache only seeds downloads and compilation; every check still runs. Release jobs also cache npm package downloads and the pinned microsandbox archive, whose checksum is verified on every build. Actions cache visibility follows GitHub ref scoping; a tag-specific cache is not shared with other release tags. New keys are saved only after a successful job.
 
@@ -179,7 +182,7 @@ The planner compares the PR event's tested merge commit with its verified first
 
 `.github/actionlint.yaml` selects hygiene and lint. Known workflow changes select their consumers: the CI review and actionlint workflows run hygiene and lint; native workflow changes add native checks; API acceptance workflow changes add API checks with container acceptance enabled; website workflow changes add website checks. The shared Node action selects every job that uses it plus lint. A new or unclassified workflow/action selects the full gate until its consumers are declared in the planner. Planner tests and CI measurement scripts run hygiene; changing the planner itself runs the full gate.
 
-Compose template and Compose test changes select both `distribution` fixtures and the `compose` smoke job; Core, Web, shared Go packages and the image Dockerfiles also select the smoke job. Run `python3 scripts/compose-smoke.py` locally with Docker available to repeat it. The script uses a unique project, an automatically assigned loopback port and artifacts under `~/.oac/tests/`; it removes its containers and volumes on exit. CI also performs cleanup after a failed or interrupted smoke step. Diagnostics show container status without printing HTTP response bodies or sign-in keys. Core, Web and the ingress image are built from the checkout; Web serves a placeholder page instead of the console build. Build-time node metadata comes from the release pinned in `deploy/compose/smoke-pins.json`; the initialization container runs with networking disabled. This checks generic Compose behavior; it does not run a Dokploy/Coolify instance or execute a model.
+Compose template and Compose test changes select both `distribution` fixtures and the `compose` smoke job; Core, Web, shared Go packages and the image Dockerfiles also select the smoke job. Run `python3 scripts/compose-smoke.py` locally with Docker available to repeat it. The script uses a unique project, an automatically assigned loopback port and artifacts under `~/.oac/tests/`; it removes its containers and volumes on exit. CI also performs cleanup after a failed or interrupted smoke step. Diagnostics show container status without printing HTTP response bodies or sign-in keys. Core, Web and the ingress image are built from the checkout; Web serves a placeholder page instead of the console build. Build-time node metadata comes from the release pinned in `deploy/compose/smoke-pins.json`; the initialization container runs with networking disabled. The smoke matrix runs on native Linux amd64 and arm64 runners; the native matrix builds and tests the shared Core installer on Linux, macOS and Windows.
 
 Go module and workspace inputs select backend, API (including the container), native and distribution checks. Each Node module owns its manifest and lockfile. Website dependencies select website checks; Web dependencies select Web and browser checks; example dependencies select example checks; shared TypeScript client dependencies select Web, browser and example checks; Claude adapter dependencies select Harness, native and distribution checks. Shared package-manager configuration selects all Node consumers. The root TypeScript configuration selects Web and example checks; the adapter TypeScript configuration selects Harness and native checks. Each selected set includes hygiene. Mixed changes accumulate their consumers, and every job reads the same plan instead of maintaining its own path list. For example, a notification-only PR skips database, browser and native jobs, while a notification plus Core change adds backend and API checks.
 
diff --git a/docs/zh/configuration.md b/docs/zh/configuration.md
index 2ef6abe1b..79465aa1f 100644
--- a/docs/zh/configuration.md
+++ b/docs/zh/configuration.md
@@ -1,7 +1,7 @@
 ---
 title: "配置参考"
 source: docs/configuration.md
-source_hash: e697e320a2df0c130cb004f5e8bbda50deff6515ef7727bea066fc0d4f688b7d
+source_hash: 8eeef9a9742c5fd8a0bf27a5a31870a77dec59a436518dbe9d34770527c021a2
 ---
 
 Core 安装的每项设置都恰好只有一个归属位置。共有两类：
@@ -11,7 +11,7 @@ Core 安装的每项设置都恰好只有一个归属位置。共有两类：
 | [进程设置](#process-settings-configjson) | 公共 URL、端口、日志、Harness、执行并发度、审计保留期、OAuth 来源、Runtime 历史记录导出 | 安装目录中的 `.env`（默认 `~/.oac/core`） | 编辑 `.env`，然后运行 `oac apply` | `oac apply` 会重新创建读取了这些已更改设置的服务 |
 | [运行时设置](#runtime-settings-web) | 沙箱后端和大小、节点、项目和密钥、默认模型、执行器凭据 | Core 的 PostgreSQL 数据库 | 在 Web 中修改，或使用 Core 密钥调用 Core API（`/core/v1`） | 保存时无需重启 Core；节点会异步准备 Runtime 变更 |
 
-Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置，并在 **Startup settings** 下以只读方式显示 Core 加载的进程设置。机密信息存放在 [`data/secrets/`](#installation-directory) 中，每项仅保存一份。没有任何配置文件定义项目或 API 密钥。
+Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置，并在 **Startup settings** 下以只读方式显示 Core 加载的进程设置。机密信息存放在 [`secrets/`](#compose-installations) 中，每项仅保存一份。没有任何配置文件定义项目或 API 密钥。
 
 ## 进程设置 {#process-settings-configjson}
 
@@ -25,9 +25,8 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 1. 它用你改过的 `.env` 运行 `oac-core check-config`。值无效时什么都不改。
 2. 它运行 `docker compose up -d --wait`。Compose 只重新创建配置有变化的服务。
-3. 校验失败时，不会重新创建任何容器。重启会中断哪些操作，见[停止和重启](getting-started/operations.md#stop-and-restart)。
 
-`docker compose ps` 展示服务。域名状态在 `data/domain/status.json`。
+用 `docker compose ps` 检查服务。重启会中断哪些操作，见[停止和重启](getting-started/operations.md#stop-and-restart)。
 
 ### 更改公共 URL {#changing-the-public-url}
 
@@ -48,7 +47,7 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 | Variable | Default | Meaning |
 | --- | --- | --- |
 | `OAC_PUBLIC_URL` | `http://localhost:8080` | 应用、节点、沙箱和自托管执行器使用的源地址。参阅[修改公开 URL](#changing-the-public-url) |
-| `OAC_HOST` | `127.0.0.1` | `compose.yaml` 发布的 Web 绑定地址。`install.sh` 设置为 `0.0.0.0` |
+| `OAC_HOST` | `127.0.0.1` | `compose.yaml` 发布的 Web 绑定地址。安装器设置为 `0.0.0.0` |
 | `OAC_WEB_PORT` | `8080` | Host port of Web |
 | `OAC_LOG_LEVEL` | `info` | `debug`, `info`, `warn` or `error` |
 | `OAC_LOG_FORMAT` | `auto` | `auto`, `text` or `json` |
@@ -85,7 +84,7 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 ### 默认模型 {#default-models}
 
-在 **System** → **Default model configuration** 中设置默认值，或使用 `PUT /core/v1/harnesses/{harness}/model-configuration`。Core 使用 `secrets/credential.key` 加密提供商密钥，并且绝不返回这些密钥。[模型执行](../../contracts/agents-api/zh/model-execution.md#deployment-defaults) 定义了请求字段和替换规则，[优先级](../../contracts/agents-api/zh/model-execution.md#saved-defaults-and-precedence)说明了哪些 Session 使用默认值。
+在 **System** → **Default model configuration** 中设置默认值，或使用 `PUT /core/v1/harnesses/{harness}/model-configuration`。Core 使用 `secrets/core/credential.key` 加密提供商密钥，并且绝不返回这些密钥。[模型执行](../../contracts/agents-api/zh/model-execution.md#deployment-defaults) 定义了请求字段和替换规则，[优先级](../../contracts/agents-api/zh/model-execution.md#saved-defaults-and-precedence)说明了哪些 Session 使用默认值。
 
 ## Compose 安装 {#compose-installations}
 
@@ -104,7 +103,7 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 初始化会准备该目录；应用服务以只读方式接收各自的机密目录。`docker compose exec web oac-web core-key` 把 Core 密钥打印到运维人员终端，不写入容器日志。数据库密码和凭据加密密钥绝不打印。
 
-`OAC_DATA_DIR` 选择该目录，默认是 Compose 文件旁的 `./data`。必须将该项目的定义和公共 URL 与该目录一同保留。仅删除机密目录不会重置安装；如果数据库已经存在，初始化会拒绝重新开始。Core 还会将安装 ID 与其数据库绑定。运行时设置仍存储在 [Core 的数据库](#runtime-settings-web)中。
+上述路径位于 Docker 命名卷 `<project>_data` 中。所有宿主机平台都由 Docker 管理 Linux 文件权限；每个服务只挂载需要的子目录。数据卷必须和项目定义、公共 URL 一同保留。仅删除机密目录不会重置安装；数据库已存在时初始化会拒绝重建。Core 也会校验安装 ID 与数据库的绑定。运行时设置仍保存在 [Core 数据库](#runtime-settings-web)中。
 
 ## Docker 节点配置 {#docker-node-configuration}
 
@@ -122,37 +121,31 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 ## 安装目录 {#installation-directory}
 
-安装程序会创建安装目录，默认路径为 `~/.oac/core`，权限模式为 `0700`。机密文件为 `0600`。
+安装目录默认为 `~/.oac/core`（Windows 为 `$HOME/.oac/core`）。其中保存进程设置和原生管理命令；服务持久数据位于 [Compose 数据卷](#compose-installations)。
 
 | 路径 | 内容 | 修改者 |
 | --- | --- | --- |
-| `.env` | [进程设置](#process-settings-configjson)。由你编辑的文件 | 你，然后运行 `oac apply`；托管域名设置写入 `OAC_PUBLIC_URL` |
-| `compose.yaml` | 发行版的服务定义。不要编辑 | 发行版 |
-| `oac` | [管理命令](getting-started/operations.md#the-oac-command)，从 Core 镜像复制 | 安装程序 |
-| `data/secrets/web/core.key` | [Core 密钥](getting-started/operations.md#core-key) | `oac rotate-core-key` |
-| `data/secrets/core/credential.key` | 加密 Core 在数据库中封存内容的密钥 | 无。必须与数据库一同保留 |
-| `data/secrets/core/core-key-digests.json` | Core 密钥的 SHA-256 | `oac rotate-core-key` |
-| `data/secrets/database/password` | PostgreSQL 密码 | 无。PostgreSQL 仅在创建数据库时读取 |
-| `data/database/` | PostgreSQL 数据 | PostgreSQL |
-| `data/node-payload/` | Web 在 `/node-install/` 提供的节点文件 | 初始化 |
-| `data/state/` | 私有 Provider 状态，包括 E2B 回执 | Core |
-| `.oac.lock` | 安装锁 | 会修改安装状态的 `oac` 命令 |
-
-Compose 项目名为 `oac-<10 hex digits>`。服务包括 `init`、`database`、`core` 和 `web`。Core 启动时执行数据库迁移。`web` 提供控制台并把 `/v1` 和 `/api/v1` 转发到 Core，是唯一发布端口（`OAC_WEB_PORT`）的服务。没有服务持有 Docker 套接字。除 Docker 存储外，不会向安装目录之外写入任何内容。
+| `.env` | 进程设置和固定的 Compose 项目名 | 用户修改后运行 `oac apply` |
+| `compose.yaml`、`compose-sha256sums.txt` | 已校验的发行版服务定义 | 发行流程 |
+| `oac`（Windows 为 `oac.exe`） | 原生管理命令 | 安装程序 |
+
+同级 `<install-dir>.lock` 目录用于同步操作并一直保留；`<install-dir>.staging` 保存尚未就位的安装文件。两者都不保存服务数据。Unix 上安装程序以 `0700` 创建私有目录，以 `0600` 创建配置文件。
+
+Compose 项目名为 `oac-<10 hex digits>`，服务包括 `init`、`database`、`core` 和 `web`。Core 启动时执行数据库迁移。Web 提供控制台并把 `/v1`、`/api/v1` 转发到 Core，是唯一发布端口（`OAC_WEB_PORT`）的服务。没有服务持有 Docker 套接字。
 
 ## 附录：没有安装程序时的 Core 环境 {#appendix-core-environment-without-the-installer}
 
-Core 只读取其环境。Compose 把 `.env` 插值进服务环境。Compose 必须为 2.26.0 或更高版本。如果你自行运行 Core，请设置这些变量；见[服务指南](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md)。
+Core 读取进程环境。Compose 将 `.env` 插值到环境中，并把机密文件挂载到下表中的容器路径。直接运行 Core 时，将文件变量设为 Core 进程可读取的绝对路径；见[服务指南](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md)。
 
 | 变量 | 设置来源 |
 | --- | --- |
 | `OAC_PUBLIC_URL` | `public_url`，或 Core 的回环源地址。Core 从中派生守护进程 WebSocket URL、自托管 `remote_url`、托管沙箱地址和部署的只读 `core_url`，绝不从请求标头派生。未设置时，Core 不运行 Runtime 网关，也不执行任何 Session |
 | `OAC_ADDR` | 安装程序在容器中设置为 `:8091`。独立启动的 Core 在未设置或为空时，默认使用 `127.0.0.1:8091` |
 | `OAC_DATABASE_URL` | 该安装不含密码的 PostgreSQL URL，并将 `core.database_pool` 作为 `pool_*` 查询参数附加到其中 |
-| `OAC_DATABASE_PASSWORD_FILE` | `data/secrets/database/password`。此时 URL 不得包含密码 |
-| `OAC_CREDENTIAL_KEY_FILE` | `data/secrets/core/credential.key` |
-| `OAC_CORE_KEY_DIGESTS_FILE` | `data/secrets/core/core-key-digests.json`：一个包含 Core 密钥 SHA-256 的 JSON 数组 |
-| `OAC_INSTALLATION_ID_FILE` | `data/secrets/core/installation.id`：安装 ID，采用规范 UUID 格式。它会启用沙箱部署和节点路由，并要求设置 `OAC_PUBLIC_URL` 和 `OAC_CORE_KEY_DIGESTS_FILE`。如果 ID 与数据库记录的 ID 不一致，Core 会拒绝它，因此必须将两者一同保留 |
+| `OAC_DATABASE_PASSWORD_FILE` | `/run/database/password`。此时 URL 不得包含密码 |
+| `OAC_CREDENTIAL_KEY_FILE` | `/run/oac/credential.key` |
+| `OAC_CORE_KEY_DIGESTS_FILE` | `/run/oac/core-key-digests.json`：一个包含 Core 密钥 SHA-256 的 JSON 数组 |
+| `OAC_INSTALLATION_ID_FILE` | `/run/oac/installation.id`：安装 ID，采用规范 UUID 格式。它会启用沙箱部署和节点路由，并要求设置 `OAC_PUBLIC_URL` 和 `OAC_CORE_KEY_DIGESTS_FILE`。如果 ID 与数据库记录的 ID 不一致，Core 会拒绝它，因此必须将两者一同保留 |
 | `OAC_EXECUTION_CONCURRENCY`、`OAC_DEFAULT_HARNESS`、`OAC_HARNESSES`、`OAC_WRITE_AUDIT_RETENTION`、`OAC_OAUTH_TRUSTED_ORIGINS` | 对应的[进程设置](#settings)。`oac-core check-config` 会在不启动 Core 的情况下校验它们 |
 | `OAC_HISTORY_SETTINGS_FILE` | 可选的 Runtime 历史文件。敏感；安装报告只说明它是否已设置 |
 | `OAC_LOG_LEVEL`、`OAC_LOG_FORMAT`、`OAC_LOG_ADD_SOURCE` | `log.*`；Web 也读取这三个设置 |
@@ -166,7 +159,7 @@ Core 会记录所加载文件的路径，但绝不记录环境变量的值或文
 
 ## 附录：没有安装程序时的 Web 环境 {#appendix-web-environment-without-the-installer}
 
-Compose 为 Web 设置这些变量。仅在不使用 Compose 运行控制台时才自行设置。该安装的机密信息中，Web 只收到 `data/secrets/web/core.key`。
+Compose 为 Web 设置这些变量。仅在不使用 Compose 运行控制台时才自行设置。Compose 把数据卷的 `secrets/web/` 挂载到 `/run/oac`，并设置 `OAC_WEB_CORE_KEY_FILE=/run/oac/core.key`。
 
 | 变量 | 默认值 | 含义 |
 | --- | --- | --- |
diff --git a/docs/zh/getting-started/install-options.md b/docs/zh/getting-started/install-options.md
index b0faa317d..fe55a0610 100644
--- a/docs/zh/getting-started/install-options.md
+++ b/docs/zh/getting-started/install-options.md
@@ -1,10 +1,10 @@
 ---
 title: "安装选项与高级部署"
 source: docs/getting-started/install-options.md
-source_hash: e063d7dcd615ef5d6ba8b43f1cbe5a11c75325925605f376161f50b9383297c0
+source_hash: 2e7717f76a46694af3c1ef33a56b195c0a321f54fd7318b488179b4b4c61f336
 ---
 
-[默认安装](install.md)无需任何选项。使用本页可以在现有反向代理后运行，或者在无法访问互联网时进行安装。
+[默认安装](install.md)无需任何选项。本页介绍安装选项、Compose 部署和反向代理配置。
 
 向下载的脚本传递选项：
 
@@ -12,13 +12,11 @@ source_hash: e063d7dcd615ef5d6ba8b43f1cbe5a11c75325925605f376161f50b9383297c0
 ./install.sh --public-url https://core.example
 ```
 
-使用单行命令时，请将选项追加在 `bash -s --` 之后。发布包下载器还接受 `--version TAG` 来选择已发布的版本；否则会选择最新的稳定版本。它会在解压前验证捆绑包的 SHA-256，并保留已验证的捆绑包以供[修复](operations.md#installation-version-policy)。
-
-安装程序会打印每个阶段，然后打印地址、登录信息和后续步骤的摘要。设置 `NO_COLOR=1` 可禁用彩色输出。任一步骤失败都会停止安装，并且不会显示成功消息。
+Windows 可下载 `install.ps1`，然后使用相同参数，例如 `& ./install.ps1 --public-url https://core.example`。Unix 单行命令的参数追加在 `bash -s --` 后。`--version TAG` 选择已发布的版本；默认选择最新稳定版，并校验原生命令和 Compose 文件的 SHA-256。
 
 ## Docker Compose 与托管平台 {#docker-compose-and-hosting-platforms}
 
-在 Linux amd64 上使用发行版中的 `compose.yaml` 和 Docker Compose 2.26 或更高版本。发行流程会在 [Compose 模板](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/compose/compose.yaml)中固定初始化镜像及源码版本。Core 和 Web 使用 `latest` 镜像，PostgreSQL 使用 `postgres:16-alpine`。它会启动 PostgreSQL、Core 和 Web。Web 把 `/v1` 和 `/api/v1` 转发到 Core。数据通过目录 bind mount 挂载。一次性初始化服务会在该目录中生成随机机密信息并准备节点安装程序；Core 启动时执行数据库迁移。[Compose 配置](../configuration.md#compose-installations)负责管理各项设置和数据目录。
+在任一[支持的 Core 主机](install.md#prerequisites)上使用发行版中的 `compose.yaml`。发行流程会在 [Compose 模板](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/compose/compose.yaml)中固定初始化镜像及源码版本。Core 和 Web 使用 `latest` 镜像，PostgreSQL 使用 `postgres:16-alpine`。它会启动 PostgreSQL、Core 和 Web。Web 把 `/v1` 和 `/api/v1` 转发到 Core。数据保存在 Docker 命名卷中。一次性初始化服务会在该目录中生成随机机密信息并准备节点安装程序；Core 启动时执行数据库迁移。[Compose 配置](../configuration.md#compose-installations)负责管理各项设置和数据目录。
 
 进行本地试用时，请将发行版的 `compose.yaml` 下载到一个空目录，然后运行：
 
@@ -27,7 +25,7 @@ docker compose up -d --wait --wait-timeout 900
 docker compose exec web oac-web core-key
 ```
 
-`oac-web core-key` 会将生成的 Core 密钥打印到终端，而不会将其写入容器日志。打开 `http://localhost:8080` 并使用该密钥登录。所有安装机密信息都会自动生成；重启时请保留同一个 Compose 项目及其数据目录。
+`oac-web core-key` 会将生成的 Core 密钥打印到终端，而不会将其写入容器日志。打开 `http://localhost:8080` 并使用该密钥登录。所有安装机密信息都会自动生成；重启时请保留同一个 Compose 项目及其数据卷。
 
 初始化镜像除初始化命令外，仅包含较小的节点安装元数据。首次启动会验证并复制这些元数据，无需下载控制归档或访问 GitHub Releases。后续启动会验证已保存的文件。容器镜像仍需拉取。首次初始化中断后可以重新运行；如果现有数据库缺少安装机密信息，初始化会被拒绝。
 
@@ -45,7 +43,7 @@ docker compose exec web oac-web core-key
 
 登录后，使用 [Nodes](nodes.md)选择沙箱后端并添加节点。Compose 堆栈部署控制平面；执行机器仍需单独部署。
 
-使用相同的文件和环境运行 `docker compose stop` 以停止服务。停止服务后，备份数据目录。请遵循[安装版本策略](operations.md#installation-version-policy)：使用不同发布版本时，需要创建新的 Compose 项目并使用全新的数据目录。
+使用相同的文件和环境运行 `docker compose stop` 以停止服务。停止服务后，备份数据卷。请遵循[安装版本策略](operations.md#installation-version-policy)：使用不同发布版本时，需要创建新的 Compose 项目并使用全新的数据卷。
 
 ## 进程设置 {#process-settings}
 
@@ -64,7 +62,7 @@ docker compose exec web oac-web core-key
 
 | 选项 | 用途 |
 | --- | --- |
-| `--install-dir DIR` | 绝对安装目录；默认为 `~/.oac/core`。新安装要求目录为空或不存在，或者包含一个[从未启动过的安装](install.md#install) |
+| `--install-dir DIR` | 绝对安装目录；默认为 `~/.oac/core`。新安装使用空目录或不存在的目录；[重试](install.md#install)使用已有安装目录 |
 
 只要使用不同的安装目录和端口，多个安装就可以共用一台机器。需要更多安装时，请使用不同的 IP 地址或共享反向代理。每个安装都有自己的数据库、Core 密钥和节点。
 
@@ -137,4 +135,4 @@ http://:8443 {
 
 ## 离线主机 {#offline-hosts}
 
-本安装程序不支持从离线捆绑包安装。它从发布版本下载 Compose 文件和容器镜像。
+Core 安装需要访问 GitHub Releases 和容器注册表，以下载发行文件和镜像。
diff --git a/docs/zh/getting-started/install.md b/docs/zh/getting-started/install.md
index da6dbe184..656ada863 100644
--- a/docs/zh/getting-started/install.md
+++ b/docs/zh/getting-started/install.md
@@ -1,10 +1,10 @@
 ---
 title: "安装 Core 和 Web"
 source: docs/getting-started/install.md
-source_hash: d034ab565564ae9447c6e8b31b3d13d8868cae738f623a7471ba56ba517d67c8
+source_hash: 1366a76858085e015480c48c18891987397cdc1da0d859182da3685ed77355be
 ---
 
-一条命令即可在 Linux 主机上安装 Core、Web 控制台和 PostgreSQL。用 Core 密钥登录 Web，设置默认模型并签发 Project API 密钥。应用使用这些密钥调用 Core。Session 在你添加的节点上的沙箱中运行，也可以在 E2B 上运行。
+一条命令即可在 Linux、macOS 或 Windows 上安装 Core、Web 控制台和 PostgreSQL。用 Core 密钥登录 Web，设置默认模型并签发 Project API 密钥。应用使用这些密钥调用 Core。Session 在你添加的节点上的沙箱中运行，也可以在 E2B 上运行。
 
 1. [检查前置条件](#prerequisites)。
 2. [运行安装程序](#install)。
@@ -18,21 +18,29 @@ source_hash: d034ab565564ae9447c6e8b31b3d13d8868cae738f623a7471ba56ba517d67c8
 
 ## 前置条件 {#prerequisites}
 
-- Linux amd64 和 curl。
-- Docker Engine 和 Docker Compose 2.26.0 或更高版本（`docker compose version`）。
+- Linux amd64/arm64 或 macOS Intel/Apple Silicon，需安装 curl；Windows x64 需 PowerShell。
+- Docker Engine 26 或更高版本，以及 Docker Compose 2.26.0 或更高版本。macOS 和 Windows 使用已启动的 Docker Desktop，并选择 Linux 容器。
 - 能运行 `docker` 并向自己的主目录写入文件的账号。普通用户和 root 均可；安装程序不会调用 sudo。
 - Web 的 8080 端口空闲。参阅[端口](install-options.md#ports)。Docker 必须能发布该端口；安装程序不会修改主机策略。
 - 本机以外的访问要求 `OAC_PUBLIC_URL` 就是浏览器、节点和执行器使用的地址。可以先在本机登录。
 
-Core 主机不需要 KVM；运行 microsandbox 的节点需要。
+沙箱节点运行在 Linux amd64 上。在 macOS 或 Windows 上部署 Core 时，可连接 Linux 节点，或使用 E2B。
 
 ## 安装 {#install}
 
+Linux 和 macOS：
+
 ```sh
 curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash
 ```
 
-如果主机默认路由的源地址是私有网络地址，安装程序把公开 URL 设为 `http://<that address>:8080`，同一网络的机器即可打开 Web 并添加节点；否则只有本机可以访问。反向代理已经提供这台主机时，传入它的 HTTPS 地址：
+Windows PowerShell：
+
+```powershell
+irm https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.ps1 | iex
+```
+
+绑定所有 IPv4 地址时，安装器会使用默认路由的私网地址；如果没有可用私网地址，则使用 `http://localhost:8080`。也可以通过 `--public-url` 指定可访问的源地址；如果已有反向代理，就使用它的 HTTPS 地址：
 
 ```sh
 curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash -s -- --public-url https://core.example
@@ -40,13 +48,13 @@ curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/
 
 脚本下载该发布版的 Compose 文件，校验 SHA-256，然后：
 
-1. 检查 Linux amd64、Docker Compose 2.26 或更高版本，以及将要发布的端口是否空闲；
-2. 创建[安装目录](../configuration.md#installation-directory) `~/.oac/core`，写入 `.env`，并从 Core 镜像复制 `oac` 命令；
+1. 检查 Docker 使用 Linux 容器、符合版本要求，并确认所选端口空闲；
+2. 准备[安装目录](../configuration.md#installation-directory) `~/.oac/core`，写入 `.env` 和原生 `oac` 命令（Windows 为 `oac.exe`）；
 3. 用 Docker Compose 启动服务。Web 在 8080 端口提供控制台，并把 `/v1`、`/api/v1` 和 `/docs` 转发到 Core。Core 和 PostgreSQL 不发布端口。
 
-安装程序不保存沙箱后端，不添加节点，不创建 Project 或密钥，也不发起模型请求。完成后输出控制台地址和 Core 密钥。
+安装器会打印控制台地址和 Core 密钥。登录后，在 Web 中配置执行资源并创建 Project。
 
-安装目录就位前，先完成下载和配置检查。之后的失败会保留配置与数据，并显示服务日志。修复报错后，重新执行同一命令，或指定安装目录即可继续：
+安装目录就位前，先完成下载和配置检查。之后的失败会保留配置与数据，并报告失败步骤；在安装目录运行 `docker compose logs --tail 100` 查看日志。修复报错后，重新执行同一命令，或指定安装目录即可继续：
 
 ```bash
 curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/install.sh | bash -s -- --install-dir "$HOME/.oac/core"
@@ -65,6 +73,8 @@ curl -fsSL https://github.com/MiniMax-AI/OpenAgentCore/releases/latest/download/
    ~/.oac/core/oac core-key --show
    ```
 
+   Windows 使用 `& "$HOME/.oac/core/oac.exe" core-key --show`。各平台的命令参数相同。
+
 ## 配置公开地址 {#configure-the-domain-and-https}
 
 应用、节点和沙箱通过同一个地址访问 Core，即公开 URL。局域网上用 HTTP 即可。对外暴露时，在前面放反向代理，并把公开 URL 设为它提供的 HTTPS 源地址。E2B 客户机从互联网访问 Core，因此需要非回环的公开 URL。
diff --git a/docs/zh/getting-started/operations.md b/docs/zh/getting-started/operations.md
index 9a2a87cc0..545f99a7b 100644
--- a/docs/zh/getting-started/operations.md
+++ b/docs/zh/getting-started/operations.md
@@ -1,14 +1,14 @@
 ---
 title: "管理你的安装"
 source: docs/getting-started/operations.md
-source_hash: 8b5ec8893b3e844a2c4173a4122cee17bf08350cd1ea2d5128e9a6c72f590907
+source_hash: f63789e0f3982b9f6633381d3c93441e5185b04398541b95c3e1d0505de588eb
 ---
 
 安装运维人员负责 Core 主机、存储和可用性。节点主机运行各自的服务；参阅[节点](nodes.md)。设置见[配置参考](../configuration.md)。
 
 ## oac 命令 {#the-oac-command}
 
-每个安装目录中都有自己的管理命令，无需发行包或 root：
+每个安装目录都有自己的原生管理命令：Unix 使用 `oac`，Windows 使用 `oac.exe`。命令需要 Docker 访问权限，不需要 root：
 
 ```sh
 docker compose -f ~/.oac/core/compose.yaml ps
@@ -20,11 +20,11 @@ docker compose -f ~/.oac/core/compose.yaml ps
 | `docker compose start` | 启动服务 |
 | `docker compose stop` | 停止服务。保留数据、节点和沙箱 |
 | `oac apply` | 先运行 `oac-core check-config`，再执行 `docker compose up -d --wait`。校验失败时不改动任何服务 |
-| `oac core-key [--show]` | 打印 Core 密钥路径；加上 `--show` 时打印密钥本身 |
+| `oac core-key [--show]` | 指出 Core 密钥在数据卷中的位置；加上 `--show` 时打印密钥本身 |
 | `oac rotate-core-key` | 替换 Core 密钥并重启 Core 和 Web |
 | `docker compose down` | 移除容器。数据保留；要删除数据，请[卸载](#uninstall) |
 
-第二个安装使用自己的目录，例如 `~/.oac/second`。
+示例使用默认安装目录。Windows 上使用 `& "$HOME/.oac/core/oac.exe"` 调用管理命令，后接相同参数。使用自定义安装目录时，替换各命令中的路径。
 
 ## 服务健康状态 {#service-health}
 
@@ -65,13 +65,13 @@ Web 重启（包括 `oac apply` 引起的重启）会让所有控制台用户退
 
 ## Core 密钥 {#core-key}
 
-每个安装有一个管理员凭据，即 Core 密钥。安装程序在 `data/secrets/web/core.key` 生成以 `oac_admin_` 为前缀、后接 64 个随机小写十六进制字符的密钥。用 `oac core-key --show` 读取；该文件属于容器用户。Core 密钥：
+每个安装有一个管理员凭据，即 Core 密钥。安装程序在 `secrets/web/core.key` 生成以 `oac_admin_` 为前缀、后接 64 个随机小写十六进制字符的密钥。用 `oac core-key --show` 读取；该文件属于容器用户。Core 密钥：
 
 - 用于登录 Web。浏览器获得 HttpOnly 会话 cookie，不持有密钥；
 - 通过 `Authorization: Bearer <Core key>` 授权 Core API（`/core/v1`）请求；
 - 不授权 Agents API（`/v1`）。应用使用 Project API 密钥，后者也不能调用 `/core/v1`。
 
-请保密。Web 读取 `data/secrets/web/core.key`。Core 只读取 `data/secrets/core/core-key-digests.json` 中的 SHA-256。Core 密钥至少 32 字符且不含空白。Web 限制失败登录。
+请保密。Web 读取 `secrets/web/core.key`。Core 只读取 `secrets/core/core-key-digests.json` 中的 SHA-256。Core 密钥至少 32 字符且不含空白。Web 限制失败登录。
 
 ### 用脚本调用 Core API {#script-the-core-api}
 
@@ -105,7 +105,7 @@ core() (  # core METHOD PATH [JSON body]
 ~/.oac/core/oac rotate-core-key
 ```
 
-它把新密钥写入 `data/secrets/web/core.key`，重新生成 `data/secrets/core/core-key-digests.json`，并重启 Core 和 Web。Core 重启后旧密钥立即失效，所有控制台会话结束：重新登录并更新脚本。
+它在初始化容器中更新数据卷内的 `secrets/web/core.key` 和 `secrets/core/core-key-digests.json`，然后重启 Core 与 Web。Core 重启后旧密钥立即失效，控制台会话也会结束；请重新登录并更新脚本。
 
 ## Project 和 API 密钥 {#projects-and-api-keys}
 
@@ -125,38 +125,34 @@ Core 记录每次公开资源写入所使用的密钥；历史保留策略为 [`
 
 一起备份这些内容；恢复时全部需要：
 
-- PostgreSQL 卷 `<project>_database`。其中包含 Project、密钥摘要、节点、默认模型、加密凭据和全部执行历史（含大对象）。逻辑备份：
+- Docker 卷 `<project>_data`，包括其中的 `database/`、`secrets/` 和 `state/` 目录。其中包含 Project、密钥摘要、节点、默认模型、加密凭据和全部执行历史（含大对象）。逻辑备份：
 
   ```sh
   docker compose -f "$HOME/.oac/core/compose.yaml" exec -T database \
     pg_dump -U agents_api agents_api > oac-backup.sql
   ```
 
-- 安装目录，尤其是 `data/`。`data/secrets/core/credential.key` 必须与数据库一起保留，否则无法解密存储的凭据。
+- 安装目录中的 `.env`、`compose.yaml` 和管理命令。数据卷内的 `secrets/core/credential.key` 必须与数据库一起保留，否则存储的凭据无法解密。
 
-先 `docker compose stop`，打包安装目录，再 `docker compose start`。
 - 各节点主机上的状态目录 `/var/lib/oac-node/.oac/nodes/<installation-id>/` 及提供商存储：Docker 卷或 microsandbox 存储。恢复方法见[节点主机故障时](nodes.md#when-a-node-host-fails)。
-- 安装所使用的发行包，用于修复同一版本。
 
-不要通过清理 Docker 卷或删除原生 Harness 历史来让重试成功。Session 已删除不证明所有提供商资源已回收。
+运行 `docker compose stop`，导出完整数据卷并归档安装目录，再运行 `docker compose start`。Docker Desktop 的 **Volumes** 页面支持导出数据卷。SQL 转储不包含加密密钥和 Provider 状态。
 
 ## 卸载 {#uninstall}
 
 ```sh
 cd ~/.oac/core
-docker compose down --remove-orphans
-docker compose run --rm --no-deps --entrypoint find init /data -mindepth 1 -delete
-docker compose down --rmi all
+docker compose down --volumes --remove-orphans --rmi all
 cd && rm -rf ~/.oac/core
 ```
 
-`data/` 归容器所有，因此由 `init` 镜像删除其内容；随后 `down --rmi all` 移除镜像，`rm` 删除安装目录。只有确定要删数据时才执行这些命令。
+`down --volumes` 会删除安装数据卷。之后删除安装目录；Windows 使用 `Remove-Item -Recurse "$HOME/.oac/core"`。
 
 全部数据随之删除：Project 和 API 密钥、Session 历史、存储的凭据和 Core 密钥。要保留数据，请用 `docker compose stop` 停止安装，或先[备份](#back-up)。
 
 卸载不停止沙箱：节点沙箱在节点继续运行，E2B 沙箱在 E2B 继续运行并计费。Core 仍运行时，归档它们的 Session，或[重置部署](nodes.md#change-the-sandbox-configuration)并等待完成；命令展示 Core 正在使用的沙箱数量。
 
-其他主机上的节点继续运行。按常规方式卸载时，先在 Web 移除，见[移除节点](nodes.md#remove-a-node)。安装目录删除后，它们的 Core 已不存在：在各节点主机使用当时发布版的 `node-install.pyz`，执行带 `--force` 的节点卸载命令。安装 ID 在 `data/secrets/core/installation.id`。
+其他主机上的节点继续运行。按常规方式卸载时，先在 Web 移除，见[移除节点](nodes.md#remove-a-node)。安装目录删除后，它们的 Core 已不存在：在各节点主机使用当时发布版的 `node-install.pyz`，执行带 `--force` 的节点卸载命令。安装 ID 在数据卷的 `secrets/core/installation.id` 中。
 
 ## 安装版本策略 {#installation-version-policy}
 
@@ -166,7 +162,7 @@ cd && rm -rf ~/.oac/core
 
 中断的安装可以[沿用已保存配置继续](install.md#install)。与本安装无关的非空目录会被拒绝。
 
-安装程序和修改状态的 `oac` 命令持有 `.oac.lock`。安装程序准备目录时还持有同级的 `<install-dir>.install.lock`。其他命令持有锁时，等待其结束后重试。不要删除锁文件来绕过忙碌安装。
+安装程序和修改状态的 `oac` 命令共用[安装锁](../configuration.md#installation-directory)。其他命令正在运行时，等待其结束后重试。
 
 ## 问题排查 {#troubleshooting}
 
diff --git a/docs/zh/maintainers.md b/docs/zh/maintainers.md
index 3b553a3da..aebb1a172 100644
--- a/docs/zh/maintainers.md
+++ b/docs/zh/maintainers.md
@@ -1,14 +1,17 @@
 ---
 title: "构建并发布 OpenAgentCore"
 source: docs/maintainers.md
-source_hash: 679fb7cf8af9fc6aa2adfb9b04e1766497a32937fd184162614ae813707cb90b
+source_hash: 4f9fd38af5afd47e21589160930347f6693dd4786f56fb2dff2abd4853b3f72f
 ---
 
 本指南面向负责构建和发布 OpenAgentCore 的维护者。要安装 Core 和 Web，请使用 [安装指南](getting-started/install.md)。安装器代码遵循的规则见 [部署](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/README.md) 和 [节点安装器](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/node/README.md)；必需检查见 [CONTRIBUTING](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#required-checks)。
 
 ## 构建分发包 {#build-a-distribution}
 
-分发包是从同一个提交构建的一组相互匹配的 Linux amd64 发布资源：控制归档（安装器、`oac` 命令，以及 Core、Web、ingress 和 PostgreSQL 镜像）、作为独立文件的 Runtime 镜像和节点构件，以及原生安装器。
+分发包是从同一个提交构建的一组相互匹配的发布资源：控制归档（安装器、`oac` 命令，以及 Core、Web、ingress 和 PostgreSQL 镜像）、作为独立文件的 Runtime 镜像和节点构件，以及原生安装器。
+
+Core、Web 和 ingress 镜像发布为经过校验的 Linux amd64/arm64 多架构索引。arm64 控制归档包含这三个镜像；Node、托管 Runtime 和离线包使用 Linux amd64。发行构建使用 QEMU 执行 ARM 镜像步骤，包括 E2B helper。宿主机 `oac` 从同一份实现构建为 Linux amd64/arm64、macOS amd64/arm64 和 Windows amd64 二进制；启动脚本只选择、校验并运行它们。所有版本索引校验通过后才更新浮动标签。
+
 
 请在 Linux x86_64 上构建，所需环境包括与 Debian 12 兼容的 glibc、Docker、`go.mod` 中指定的 Go 版本、C 编译器（microsandbox 辅助程序使用 CGO 构建）、Node、pnpm、Python 3.9 或更高版本、curl、tar、pigz 和 sha256sum。源代码必须保持干净并已提交。请先准备固定版本的 Codex 包和 MiniMax Code 配套程序，然后执行构建：
 
@@ -98,7 +101,7 @@ docker build --platform linux/amd64 -t oac-runtime:mcode "${OAC_DEV_HOME:-$HOME/
 make build-e2b-provider
 ```
 
-Docker 使用固定版本的 CPython 和 Debian 12 镜像构建 Linux amd64 辅助程序。Python 依赖闭包（including PyInstaller）在 `services/core/tools/e2b-provider/requirements.lock` 中按哈希锁定；不需要 E2B 账户密钥。要使用其他输出目录，请设置 `E2B_PROVIDER_BUILD_DIR`。构建结果完全由辅助程序源代码、`LICENSE` 和构建脚本决定，因此会按它们的哈希缓存在 `~/.oac/cache/e2b-provider/` 下，仅在它们变化时重新构建。输出为 `oac-e2b-provider-linux-amd64.tar.gz` 及其 `.sha256`；解压后会得到 `oac-e2b-provider/`，其中包含可执行文件、`_internal/`、`licenses/`、`requirements.lock` 和 `manifest.json`。Core 镜像使用该目录树；主机需要兼容的 glibc 和 CA 证书，而不需要 Python。
+Docker 使用固定版本的 CPython 和 Debian 12 镜像按 `GOARCH=amd64`（默认）或 `GOARCH=arm64` 构建 Linux 辅助程序。Python 依赖闭包（including PyInstaller）在 `services/core/tools/e2b-provider/requirements.lock` 中按哈希锁定；不需要 E2B 账户密钥。要使用其他输出目录，请设置 `E2B_PROVIDER_BUILD_DIR`。构建结果完全由辅助程序源代码、`LICENSE` 和构建脚本决定，因此会按它们的哈希缓存在 `~/.oac/cache/e2b-provider/` 下，仅在它们变化时重新构建。输出为 `oac-e2b-provider-linux-<architecture>.tar.gz` 及其 `.sha256`；解压后会得到 `oac-e2b-provider/`，其中包含可执行文件、`_internal/`、`licenses/`、`requirements.lock` 和 `manifest.json`。Core 镜像使用该目录树；主机需要兼容的 glibc 和 CA 证书，而不需要 Python。
 
 **microsandbox 辅助程序。** 仅支持 Linux，并且需要 C 编译器：
 
@@ -113,9 +116,9 @@ make check-microsandbox-provider
 
 ### 独立 Core 构建 {#standalone-core-builds}
 
-`make build-core` 会将 `oac-core`、`oac-core-device`、`oac-core-environment-key` 和 `oac-node` 构建到 `${OAC_DEV_HOME:-$HOME/.oac}/build/oac-core`（`OAC_DEV_CORE_BUILD_DIR` 可选择其他绝对目录）。构建过程仅将 `scripts/build-core.sh` 中列出的源文件集（Core 服务、其契约、所需的共享软件包以及根 Go 模块文件）复制到临时上下文，并使用禁用 CGO、只读模块和裁剪路径的方式构建。它不需要 Node、Docker 或其他应用程序。Core 新增共享依赖时，请将该软件包加入列表；绝不能复制整个仓库来使其完成编译。
+`make build-core` 会将 `oac-core`、`oac-core-device`、`oac-core-environment-key`、`oac-node` 和 `oac` 构建到 `${OAC_DEV_HOME:-$HOME/.oac}/build/oac-core`（`OAC_DEV_CORE_BUILD_DIR` 可选择其他绝对目录）。构建过程仅将 `scripts/build-core.sh` 中列出的源文件集（Core 服务、其契约、所需的共享软件包以及根 Go 模块文件）复制到临时上下文，并使用禁用 CGO、只读模块和裁剪路径的方式构建。它不需要 Node、Docker 或其他应用程序。Core 新增共享依赖时，请将该软件包加入列表；绝不能复制整个仓库来使其完成编译。
 
-`make docker-build-core` 会根据这五个命令和 E2B 辅助程序构建 `oac-core:dev` 镜像（`OAC_DEV_CORE_IMAGE` 可选择其他名称）。基础镜像是通过摘要固定的 `debian:bookworm-slim`，包含 CA 证书以及辅助程序所需的 glibc 运行时；默认用户的 UID/GID 为 65532，Core 监听 `:8091`。该镜像仅支持 Linux amd64，并且不会推送到注册表。对镜像或其构建进行更改时，除了相关的源代码检查外，还必须运行 `make check-core-container`：它会在只读根文件系统上针对该镜像运行官方客户端测试套件，并且需要 Linux Docker、非 root 用户，以及服务检查中的[测试数据库和固定版本 SDK](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#official-client-verification)（`OAC_TEST_DATABASE_URL` 指向一个已应用迁移的 `oac_*_tests` 数据库，并设置 `OAC_TEST_OFFICIAL_SDK_PYTHON`）。
+`make docker-build-core` 会根据这五个命令和 E2B 辅助程序构建 `oac-core:dev` 镜像（`OAC_DEV_CORE_IMAGE` 可选择其他名称）。基础镜像是通过摘要固定的 `debian:bookworm-slim`，包含 CA 证书以及辅助程序所需的 glibc 运行时；默认用户的 UID/GID 为 65532，Core 监听 `:8091`。此本地构建目标生成 Linux amd64 镜像；[分发构建](#build-a-distribution)生成两种架构的镜像。对镜像或其构建进行更改时，除了相关的源代码检查外，还必须运行 `make check-core-container`：它会在只读根文件系统上针对该镜像运行官方客户端测试套件，并且需要 Linux Docker、非 root 用户，以及服务检查中的[测试数据库和固定版本 SDK](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md#official-client-verification)（`OAC_TEST_DATABASE_URL` 指向一个已应用迁移的 `oac_*_tests` 数据库，并设置 `OAC_TEST_OFFICIAL_SDK_PYTHON`）。
 
 ## 发布版本 {#publish-a-version}
 
@@ -134,13 +137,13 @@ git push origin v1.2.3
 
 ### 容器注册表 {#container-registry}
 
-版本发布和手动的 `build-<full SHA>` 草稿都会将 Linux amd64 镜像发布为 `ghcr.io/minimax-ai/openagentcore/<component>:<version>`，其中 `<component>` 为 `core`、`web`、`runtime` 或 `ingress`。例如，`ghcr.io/minimax-ai/openagentcore/core:v1.2.3`。草稿使用标签 `build-<full SHA>`。PostgreSQL 使用其上游镜像，不会重新发布。注册表镜像从发布归档中加载，不会重新构建。仅当现有版本标签的镜像配置摘要与本次发布相同时才复用该标签；如果镜像不同，则停止发布。稳定版还会把每个组件的 `latest` 标签移到该镜像。预发布和草稿不会改动 `latest`。SemVer 构建元数据在容器标签中使用 `_` 代替 `+`；长度超过 128 个字符的版本字符串无法发布到 GHCR。镜像验证之后，发布器会上传为该发行版渲染的单个 `compose.yaml` 及其校验和清单。Compose 使用注册表摘要固定 ingress 镜像；如果镜像构建版本与 Compose 版本不同，初始化会拒绝运行。草稿 Release 保持未发布。
+版本发布和手动 `build-<full SHA>` 草稿使用 `ghcr.io/minimax-ai/openagentcore/<component>:<version>`，其中 `<component>` 为 `core`、`web`、`runtime` 或 `ingress`。Core、Web 和 ingress 索引包含 Linux amd64 和 arm64 镜像，Runtime 包含 Linux amd64。各平台镜像使用 `<version>-<architecture>` 标签，从发行归档加载。已有版本标签必须与发行镜像及平台集合一致。发布器校验全部版本索引后，才为稳定版更新 `latest`；预发布版和草稿保持 `latest` 不变。PostgreSQL 使用上游镜像。容器标签中的 SemVer 构建元数据用 `_` 替换 `+`，版本字符串上限为 128 个字符。镜像校验后，发布器上传该版本的 `compose.yaml` 和校验和清单。Compose 用索引摘要固定 ingress，初始化时检查其构建版本与 Compose 版本一致。
 
 合并的构建/发布作业使用具有 `packages: write` 权限的 `GITHUB_TOKEN`。首次发布时，GitHub 会将每个容器软件包创建为私有：软件包管理员必须先在各自的软件包设置中将全部四个软件包改为 **Public**，用户才能匿名拉取。请参阅 [GitHub container visibility](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry)。更改可见性后，请验证未认证拉取。仅更改仓库可见性并不会使新的容器软件包变为公开。
 
 GHCR 和 GitHub Releases 不共享事务。发布失败后，GHCR 中可能仍会保留一些匹配的版本标签；请保留这些镜像，并使用原始构件按照下文的草稿恢复流程操作。除清单缺失以外，注册表故障都会停止发布。作业摘要会记录按摘要固定的引用。这些镜像和渲染后的 Compose 文件仍需要[配置](configuration.md)中描述的配置、机密和路由。
 
-`install.sh` 会下载最新稳定版的 Compose 文件，或 `--version` 指定的发布版，校验 SHA-256 后启动该发布版。用法见[安装指南](getting-started/install.md#install)。
+[安装指南](getting-started/install.md#install)介绍版本选择和各平台的启动命令。
 
 Go 检查和构建作业共享 `~/.oac/cache/` 下的 Go 模块和编译器缓存目录，缓存键由运行器 OS 和架构、全部 Go 模块文件、检查/构建分区以及提交确定。分区键可防止并发作业在同一个键下保存不同的编译器子集。发布构建既可以使用后端检查的缓存，也可以使用更早发布构建的缓存。较旧的缓存只会为下载和编译提供初始内容；每项检查仍会运行。发布作业还会缓存 npm 软件包下载内容和固定版本的 microsandbox 归档，并在每次构建时验证后者的校验和。Actions 缓存可见性遵循 GitHub ref 的作用域；特定标签的缓存不会与其他发布标签共享。只有作业成功后才会保存新键。
 
@@ -181,7 +184,9 @@ gh workflow run core-release --repo MiniMax-AI/OpenAgentCore --ref main \
 
 `.github/actionlint.yaml` 会选择 hygiene 和 lint。已知工作流变更会选择其使用方：CI review 和 actionlint 工作流运行 hygiene 和 lint；原生工作流变更会添加原生检查；API 验收工作流变更会添加启用容器验收的 API 检查；网站工作流变更会添加网站检查。共享 Node 操作会选择使用它的每个作业以及 lint。新工作流或未分类的工作流/操作会选择完整门禁，直至在计划器中声明其使用方。计划器测试和 CI 测量脚本运行 hygiene；更改计划器本身会运行完整门禁。
 
-Compose 模板和 Compose 测试发生变更时，会同时选择 `distribution` 固定数据和 `compose` 冒烟作业；Core、Web、共享 Go 软件包和镜像 Dockerfile 的变更也会选择冒烟作业。安装 Docker 后，可在本地运行 `python3 scripts/compose-smoke.py` 重复该测试。该脚本使用唯一的项目、自动分配的回环端口，并将在 `~/.oac/tests/` 下生成构件；退出时移除其容器和数据卷。CI 还会在冒烟步骤失败或中断后执行清理。诊断信息会显示容器状态，但不会打印 HTTP 响应正文或登录密钥。Core、Web 和 ingress 镜像都从当前检出构建；Web 提供占位页面而不是控制台构建。构建时的节点元数据来自 `deploy/compose/smoke-pins.json` 固定的发布版本；初始化容器禁用网络运行。该测试检查通用 Compose 行为；它不会运行 Dokploy/Coolify 实例，也不会执行模型。
+Core 安装器在 Linux、macOS 和 Windows 原生 CI 中构建并测试。Compose 冒烟测试分别使用 Linux amd64 和 arm64 原生 runner。
+
+Compose 模板和 Compose 测试发生变更时，会同时选择 `distribution` 固定数据和 `compose` 冒烟作业；Core、Web、共享 Go 软件包和镜像 Dockerfile 的变更也会选择冒烟作业。安装 Docker 后，可在本地运行 `python3 scripts/compose-smoke.py` 重复该测试。该脚本使用唯一的项目、自动分配的回环端口，并将在 `~/.oac/tests/` 下生成构件；退出时移除其容器和数据卷。CI 还会在冒烟步骤失败或中断后执行清理。诊断信息会显示容器状态，但不会打印 HTTP 响应正文或登录密钥。Core、Web 和 ingress 镜像都从当前检出构建；Web 提供占位页面而不是控制台构建。构建时的节点元数据来自 `deploy/compose/smoke-pins.json` 固定的发布版本；初始化容器禁用网络运行。
 
 Go 模块和工作区输入会选择后端、API（包括容器）、原生和分发检查。每个 Node 模块都拥有自己的清单和锁文件。网站依赖项会选择网站检查；Web 依赖项会选择 Web 和浏览器检查；示例依赖项会选择示例检查；共享 TypeScript 客户端依赖项会选择 Web、浏览器和示例检查；Claude 适配器依赖项会选择 Harness、原生和分发检查。共享包管理器配置会选择所有 Node 使用方。根 TypeScript 配置会选择 Web 和示例检查；适配器 TypeScript 配置会选择 Harness 和原生检查。每个所选集合都包含 hygiene。混合变更会累加其使用方，并且每个作业都读取同一计划，而不是维护各自的路径列表。例如，仅修改通知的 PR 会跳过数据库、浏览器和原生作业，而同时修改通知和 Core 的 PR 会添加后端和 API 检查。
 
diff --git a/scripts/build-core-distribution.sh b/scripts/build-core-distribution.sh
index e6635f418..e2db4d6dd 100755
--- a/scripts/build-core-distribution.sh
+++ b/scripts/build-core-distribution.sh
@@ -44,7 +44,7 @@ case "$build_network" in
   default|host|none) ;;
   *) printf 'CORE_DISTRIBUTION_BUILD_NETWORK must be default, host, or none\n' >&2; exit 1 ;;
 esac
-# Build one Linux amd64 image and write the ID the local image store gives it to
+# Build one selected Linux architecture image and write the ID the local image store gives it to
 # $stage/NAME.id. BuildKit's --iidfile reports the config digest, which is the
 # image ID only in Docker's classic store; the containerd store (Docker 29's
 # default) uses the manifest digest and cannot resolve the config digest. The
@@ -58,14 +58,14 @@ build_image() {
   # declaration persists the operator's network configuration in the images.
   # The metadata file omits build provenance, so it does not record them either.
   BUILDX_METADATA_PROVENANCE=disabled docker build --network "$build_network" \
-    --platform linux/amd64 --provenance=false --metadata-file "$stage/$name.build.json" \
+    --platform "linux/$GOARCH" --provenance=false --metadata-file "$stage/$name.build.json" \
     --label "org.opencontainers.image.revision=$revision" \
     --build-arg HTTP_PROXY --build-arg HTTPS_PROXY --build-arg ALL_PROXY --build-arg NO_PROXY \
     --build-arg "http_proxy=${http_proxy:-${HTTP_PROXY:-}}" \
     --build-arg "https_proxy=${https_proxy:-${HTTPS_PROXY:-}}" \
     --build-arg "all_proxy=${all_proxy:-${ALL_PROXY:-}}" \
     --build-arg "no_proxy=${no_proxy:-${NO_PROXY:-}}" "$@"
-  python3 scripts/core-distribution-manifest.py built-image "$stage/$name.build.json" > "$stage/$name.id"
+  python3 scripts/core-distribution-manifest.py built-image "$stage/$name.build.json" "$GOARCH" > "$stage/$name.id"
 }
 
 require_clean_source() {
@@ -255,3 +255,28 @@ fi
 mv "$stage/artifacts/"* "$output_dir/"
 if [[ -d "$stage/native-artifacts" ]]; then mv "$stage/native-artifacts/"* "$output_dir/"; fi
 mv "$bundle" "$output_dir/"
+
+# Core, Web and initialization also run natively in ARM64 Linux containers.
+# Node and hosted Runtime payloads above remain linux/amd64.
+export GOARCH=arm64
+arm_bundle="$stage/oac-$revision-linux-arm64"
+mkdir -p "$arm_bundle/images"
+OAC_DEV_BUILD_REVISION="$revision" scripts/build-core-image-context.sh "$stage/core"
+OAC_DEV_WEB_BUILD_DIR="$stage/web" scripts/build-web.sh
+cp "$stage/core/bin/oac" "$stage/ingress/oac"
+for name in core web ingress; do
+  build_image "$name" "$stage/$name"
+  docker image save --output "$arm_bundle/images/$name.tar" "$(cat "$stage/$name.id")"
+done
+python3 scripts/core-distribution-manifest.py control-archive "$arm_bundle" "$stage" "$revision" arm64
+mv "$arm_bundle.tar.gz" "$arm_bundle.tar.gz.sha256" "$output_dir/"
+
+# The launchers and operator commands use this same portable implementation.
+for platform in linux-amd64 linux-arm64 darwin-amd64 darwin-arm64 windows-amd64; do
+  extension=""
+  if [[ "$platform" == windows-* ]]; then extension=.exe; fi
+  asset="oac-$platform$extension"
+  GOOS="${platform%-*}" GOARCH="${platform#*-}" CGO_ENABLED=0 go build -mod=readonly -trimpath \
+    -ldflags "-X main.buildRevision=$revision" -o "$output_dir/$asset" ./services/core/cmd/oac
+  (cd "$output_dir" && sha256sum "$asset" > "$asset.sha256")
+done
diff --git a/scripts/build-core-image-context.sh b/scripts/build-core-image-context.sh
index 76d73eb32..fa8d3f0ee 100755
--- a/scripts/build-core-image-context.sh
+++ b/scripts/build-core-image-context.sh
@@ -13,8 +13,8 @@ if [[ "$context" != /* ]]; then
 fi
 
 mkdir -p "$context/bin" "$context/e2b" "$context/native-installers"
-GOOS=linux GOARCH=amd64 OAC_DEV_CORE_BUILD_DIR="$context/bin" "$repo_root/scripts/build-core.sh"
+GOOS=linux GOARCH="${GOARCH:-amd64}" OAC_DEV_CORE_BUILD_DIR="$context/bin" "$repo_root/scripts/build-core.sh"
 E2B_PROVIDER_BUILD_DIR="$context/e2b-build" "$repo_root/scripts/build-e2b-provider.sh"
-tar -xzf "$context/e2b-build/oac-e2b-provider-linux-amd64.tar.gz" --strip-components=1 -C "$context/e2b"
+tar -xzf "$context/e2b-build/oac-e2b-provider-linux-${GOARCH:-amd64}.tar.gz" --strip-components=1 -C "$context/e2b"
 rm -rf "$context/e2b-build"
 cp "$repo_root/deploy/distribution/Dockerfile" "$context/Dockerfile"
diff --git a/scripts/build-e2b-provider.sh b/scripts/build-e2b-provider.sh
index cd91fb5ec..b17f5e071 100755
--- a/scripts/build-e2b-provider.sh
+++ b/scripts/build-e2b-provider.sh
@@ -8,23 +8,25 @@ case "$output_dir" in
   *) printf 'E2B_PROVIDER_BUILD_DIR must be absolute\n' >&2; exit 1 ;;
 esac
 mkdir -p "$output_dir"
-archive=oac-e2b-provider-linux-amd64.tar.gz
+architecture="${GOARCH:-amd64}"
+case "$architecture" in amd64|arm64) ;; *) echo "Unsupported E2B architecture" >&2; exit 1;; esac
+archive="oac-e2b-provider-linux-$architecture.tar.gz"
 # The helper is a pure function of these files, so a build is reused by their hash.
 inputs="$(cd "$repo_root" && {
   find services/core/tools/e2b-provider -type f ! -path '*/__pycache__/*' -print0 | sort -z | xargs -0 sha256sum
   sha256sum LICENSE scripts/build-e2b-provider.sh
 } | sha256sum | cut -c1-64)"
-cache="${OAC_DEV_HOME:-$HOME/.oac}/cache/e2b-provider/$inputs"
+cache="${OAC_DEV_HOME:-$HOME/.oac}/cache/e2b-provider/$architecture-$inputs"
 if [[ ! -f "$cache/$archive.sha256" ]]; then
   mkdir -p "${cache%/*}"
   build="$(mktemp -d "${cache%/*}/.build.XXXXXX")"
-  image="oac-e2b-provider-build:${inputs:0:12}"
+  image="oac-e2b-provider-build:$architecture-${inputs:0:12}"
   # Proxy values are build-only operator settings; no account key is needed.
-  docker build --platform linux/amd64 --build-arg HTTP_PROXY --build-arg HTTPS_PROXY \
+  docker build --platform "linux/$architecture" --build-arg HTTP_PROXY --build-arg HTTPS_PROXY \
     --build-arg ALL_PROXY --build-arg NO_PROXY \
     --file "$repo_root/services/core/tools/e2b-provider/Build.Dockerfile" \
     --tag "$image" "$repo_root/services/core/tools/e2b-provider"
-  docker run --rm --platform linux/amd64 \
+  docker run --rm --platform "linux/$architecture" \
     --env HTTP_PROXY --env HTTPS_PROXY --env ALL_PROXY --env NO_PROXY \
     --mount "type=bind,src=$repo_root,dst=/source,readonly" \
     --mount "type=bind,src=$build,dst=/output" "$image"
diff --git a/scripts/ci_plan.py b/scripts/ci_plan.py
index 7b45e8bbf..b8356b4fc 100644
--- a/scripts/ci_plan.py
+++ b/scripts/ci_plan.py
@@ -58,6 +58,8 @@
     (("docs/", "contracts/"), ("",), ("website",)),
     (("website/",), (*WEB, ".vue", ".md"), ("website",)),
     (("services/core/",), CORE, ("backend", "api", "compose")),
+    (("services/core/cmd/oac/",), GO, ("native", "distribution")),
+    (("deploy/install.sh", "deploy/install.ps1", "deploy/test_install.ps1"), (".sh", ".ps1"), ("native", "distribution")),
     (("services/core/internal/nativeinstaller/",), GO, ("native", "distribution")),
     (("services/core/deploy/", "services/core/tools/"), CORE, ("distribution",)),
     (("apps/daemon/",), GO, ("backend", "native")),
diff --git a/scripts/ci_plan_test.py b/scripts/ci_plan_test.py
index 23def3412..d5ee84204 100644
--- a/scripts/ci_plan_test.py
+++ b/scripts/ci_plan_test.py
@@ -20,7 +20,7 @@ def test_published_documents_also_build_the_website(self):
         self.assertEqual(self.jobs("README.md"), {"hygiene"})
 
     def test_installer_does_not_download_a_browser_or_run_database_tests(self):
-        self.assertEqual(self.jobs("deploy/install.sh", "deploy/node/node_payload.py"), {"hygiene", "distribution"})
+        self.assertEqual(self.jobs("deploy/install.sh", "deploy/node/node_payload.py"), {"hygiene", "distribution", "native"})
 
     def test_compose_inputs_select_live_and_fixture_checks_without_image_builds(self):
         for path in ("deploy/compose/compose.yaml", "deploy/compose/https.yaml", "deploy/compose/dokploy.toml",
@@ -165,13 +165,13 @@ def test_every_job_has_a_plan_condition(self):
 
     def test_mixed_changes_accumulate(self):
         self.assertEqual(self.jobs("docs/maintainers.md", "deploy/install.sh", "apps/web/src/app.tsx"),
-                         {"hygiene", "distribution", "web", "web-acceptance", "website"})
+                         {"hygiene", "distribution", "native", "web", "web-acceptance", "website"})
 
     def test_installer_pr_300_replay(self):
         self.assertEqual(self.jobs(
             "deploy/install.sh", "deploy/README.md", "deploy/node/node_install.py",
             "deploy/node/install_display.py", "deploy/node/node_payload.py",
-            "docs/getting-started/install.md"), {"hygiene", "distribution", "website"})
+            "docs/getting-started/install.md"), {"hygiene", "distribution", "native", "website"})
 
     def test_workflow_graph_cannot_silently_omit_or_add_a_gate_dependency(self):
         workflow = (Path(__file__).resolve().parents[1] / ".github/workflows/check.yml").read_text().split("jobs:\n", 1)[1]
diff --git a/scripts/compose-smoke.py b/scripts/compose-smoke.py
index 2a6b27fa8..f2c4c9946 100644
--- a/scripts/compose-smoke.py
+++ b/scripts/compose-smoke.py
@@ -55,7 +55,7 @@ def prepare_pinned_payload(destination):
 def build_images(directory, tag):
     revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=ROOT, text=True).strip()
     protocol = re.search(r'const Version = "([^"]+)"', (ROOT / 'internal/agentdaemon/proto/version.go').read_text()).group(1)
-    go_env = {**os.environ, 'CGO_ENABLED': '0', 'GOOS': 'linux', 'GOARCH': 'amd64'}
+    go_env = {**os.environ, 'CGO_ENABLED': '0', 'GOOS': 'linux', 'GOARCH': os.environ.get('GOARCH', 'amd64')}
 
     def go_build(package, output, build_revision=revision):
         output.parent.mkdir(parents=True, exist_ok=True)
@@ -88,7 +88,7 @@ def go_build(package, output, build_revision=revision):
     images = {}
     for name, context in contexts.items():
         images[name] = f'oac-smoke/{name}:{tag}'
-        subprocess.run(['docker', 'build', '-q', '--platform', 'linux/amd64', '-t', images[name], str(context)],
+        subprocess.run(['docker', 'build', '-q', '--platform', 'linux/' + go_env['GOARCH'], '-t', images[name], str(context)],
                        check=True, stdout=subprocess.DEVNULL)
     return images
 
@@ -113,7 +113,7 @@ def main():
     images = build_images(directory, project.removeprefix('oac-smoke-'))
 
     override.write_text(json.dumps({'services': {'init': {'network_mode': 'none'}}}))
-    env = {**os.environ, 'COMPOSE_PROGRESS': 'plain', 'OAC_DATA_DIR': str(data),
+    env = {**os.environ, 'COMPOSE_PROGRESS': 'plain',
            'OAC_HOST': '127.0.0.1', 'OAC_WEB_PORT': '0',
            **{'OAC_IMAGE_' + name.upper(): image for name, image in images.items()}}
     env.pop('OAC_PUBLIC_URL', None)
@@ -212,7 +212,18 @@ def terminate(_signum, _frame):
         assert any(p['id'] == project_data['id'] for p in get('/core/v1/projects')['data']), 'Project was lost'
         assert get('/v1/files/' + uploaded['id'], headers=api)['bytes'] == len(content), 'Uploaded file metadata was lost'
         assert 'Bundled node installation metadata verified' not in private_logs(key, project_key), 'Completed initialization recopied metadata'
-        print('PASS: startup, origin validation, sign-in, API, upload, node installer and persistent installation', flush=True)
+        compose('run', '--rm', '--no-deps', 'init', '/usr/local/bin/oac', 'rotate-volume-key')
+        compose('restart', 'core', 'web')
+        compose('up', '-d', '--wait', '--wait-timeout', '120', timeout=180)
+        rotated = compose('exec', '-T', 'web', '/usr/local/bin/oac-web', 'core-key').decode().strip()
+        assert rotated != key, 'Core key was not rotated'
+        browser = client()
+        request('/console/auth/login', {'core_key': rotated})
+        compose('down')
+        compose('up', '-d', '--wait', '--wait-timeout', '120', timeout=180)
+        assert compose('exec', '-T', 'web', '/usr/local/bin/oac-web', 'core-key').decode().strip() == rotated, 'Rotated key was not retained'
+        private_logs(key, rotated, project_key)
+        print('PASS: startup, origin validation, sign-in, API, upload, node installer, key rotation and persistent installation', flush=True)
     except BaseException:
         # Service status identifies failed containers without dumping secret-bearing logs.
         status = subprocess.run(command + ['ps', '--all'], env=env, capture_output=True, timeout=30)
@@ -220,9 +231,6 @@ def terminate(_signum, _frame):
         raise
     finally:
         compose('down', '--volumes', '--remove-orphans', timeout=60)
-        # Match the host installer's cleanup without requiring tools in scratch init.
-        compose('run', '--rm', '--no-deps', '--volume', str(data) + ':/data',
-                '--entrypoint', 'find', 'database', '/data', '-mindepth', '1', '-delete')
         subprocess.run(['docker', 'image', 'rm', '-f', *images.values()], capture_output=True, timeout=60)
 
 
diff --git a/scripts/core-distribution-manifest.py b/scripts/core-distribution-manifest.py
index c00f363b1..3529fb8fe 100644
--- a/scripts/core-distribution-manifest.py
+++ b/scripts/core-distribution-manifest.py
@@ -70,26 +70,26 @@ def sha256(path):
     return digest.hexdigest()
 
 
-def verify_image(image):
+def verify_image(image, architecture="amd64"):
     if not DIGEST.fullmatch(image):
         raise ValueError("Distribution image inputs must be immutable sha256 image IDs")
     details = json.loads(subprocess.check_output(["docker", "image", "inspect", image], text=True))[0]
-    if details["Id"] != image or details["Os"] != "linux" or details["Architecture"] != "amd64":
-        raise ValueError("Distribution images must be the selected Linux amd64 image")
+    if details["Id"] != image or details["Os"] != "linux" or details["Architecture"] != architecture:
+        raise ValueError("Distribution images must match the selected Linux architecture")
     return details
 
 
-def built_image(metadata_file):
+def built_image(metadata_file, architecture="amd64"):
     """Print the local store ID of the image one BuildKit build just produced."""
     metadata = json.loads(pathlib.Path(metadata_file).read_text())
     # The classic store names an image by its config digest, the containerd store
     # by its manifest digest; the other value never resolves to itself there.
     config = metadata.get("containerimage.config.digest")
     manifest = metadata.get("containerimage.digest", config)
-    print(resolve_image(config, manifest))
+    print(resolve_image(config, manifest, architecture))
 
 
-def resolve_image(config, manifest):
+def resolve_image(config, manifest, architecture="amd64"):
     """Resolve the archive identities in either supported Docker image store."""
     if not all(isinstance(value, str) and DIGEST.fullmatch(value) for value in (config, manifest)):
         raise ValueError("Build metadata lacks valid image digests")
@@ -101,11 +101,11 @@ def resolve_image(config, manifest):
             resolved.append(candidate)
     if len(resolved) != 1:
         raise ValueError("The local image store does not identify the built image by exactly one of its digests")
-    verify_image(resolved[0])
+    verify_image(resolved[0], architecture)
     return resolved[0]
 
 
-def image_identities(archive, build_id):
+def image_identities(archive, build_id, architecture="amd64"):
     """Bind both Docker store identities to one exported Linux amd64 image."""
     if not DIGEST.fullmatch(build_id):
         raise ValueError("Missing immutable distribution image identity")
@@ -161,7 +161,7 @@ def blob(descriptor, parse=False):
         config_descriptor = image.get("config", {})
         config = blob(config_descriptor, parse=True)
         config_digest = config_descriptor["digest"]
-        if config.get("os") != "linux" or config.get("architecture") != "amd64":
+        if config.get("os") != "linux" or config.get("architecture") != architecture:
             raise ValueError("Image archive contains an unexpected platform")
         for layer in image.get("layers", []):
             blob(layer)
@@ -170,6 +170,21 @@ def blob(descriptor, parse=False):
         return config_digest, manifest_digest
 
 
+def control_archive(bundle, stage, revision, architecture):
+    bundle, stage = pathlib.Path(bundle), pathlib.Path(stage)
+    manifest = {"source_commit": revision, "platform": "linux/" + architecture,
+                "images": {}, "image_manifest_digests": {}}
+    for name in ("core", "web", "ingress"):
+        config, digest = image_identities(bundle / "images" / (name + ".tar"),
+                                         (stage / (name + ".id")).read_text().strip(), architecture)
+        manifest["images"][name], manifest["image_manifest_digests"][name] = config, digest
+    (bundle / "manifest.json").write_text(json.dumps(manifest, indent=2) + "\n")
+    target = bundle.with_name(bundle.name + ".tar.gz")
+    with tarfile.open(target, "w:gz") as output:
+        output.add(bundle, arcname=bundle.name)
+    target.with_name(target.name + ".sha256").write_text(sha256(target) + "  " + target.name + "\n")
+
+
 def verify_runtime(image, daemon, source):
     details = verify_image(image)
     source = pathlib.Path(source)
@@ -583,7 +598,7 @@ def check(image, link):
 
 
 if __name__ == "__main__":
-    commands = {"extract-runtime": extract_runtime, "verify-runtime": verify_runtime, "verify-image": verify_image,
+    commands = {"control-archive": control_archive, "extract-runtime": extract_runtime, "verify-runtime": verify_runtime, "verify-image": verify_image,
                 "built-image": built_image, "node-payload": node_payload, "manifest": manifest, "archive": archive, "bootstraps": bootstraps,
                 "release-base": release_base, "docs": docs, "native-catalog": native_catalog, "native-offline": native_offline}
     try:
diff --git a/scripts/core-distribution-manifest.test.py b/scripts/core-distribution-manifest.test.py
index 4719f05a1..cb4b78ce8 100644
--- a/scripts/core-distribution-manifest.test.py
+++ b/scripts/core-distribution-manifest.test.py
@@ -143,6 +143,13 @@ def test_oci_manifest_identity_is_distinct_from_docker_config_identity(self):
             digest, name = line.split("  ", 1)
             self.assertEqual(digest, distribution.sha256(self.bundle / name))
 
+    def test_arm_archive_uses_explicit_platform_validation(self):
+        path = self.stage / "arm.tar"
+        config, digest = image_archive(path, "core", architecture="arm64")
+        self.assertEqual(distribution.image_identities(path, config, "arm64"), (config, digest))
+        with self.assertRaisesRegex(ValueError, "unexpected platform"):
+            distribution.image_identities(path, config, "amd64")
+
     def test_built_image_records_the_id_each_docker_store_resolves(self):
         config, manifest, other = ("sha256:" + digit * 64 for digit in "123")
         metadata = self.stage / "build.json"
@@ -163,7 +170,7 @@ def test_built_image_records_the_id_each_docker_store_resolves(self):
                         mock.patch("builtins.print") as output:
                     if expected.startswith("sha256:"):
                         distribution.built_image(metadata)
-                        verify.assert_called_once_with(expected)
+                        verify.assert_called_once_with(expected, "amd64")
                         output.assert_called_once_with(expected)
                     else:
                         with self.assertRaisesRegex(ValueError, expected):
diff --git a/scripts/publish-core-release.py b/scripts/publish-core-release.py
index 7f27e0306..8ae61caa6 100644
--- a/scripts/publish-core-release.py
+++ b/scripts/publish-core-release.py
@@ -97,7 +97,7 @@ def registry_image(reference):
     if manifest is not None and "manifests" in manifest:
         descriptors = manifest["manifests"]
         if len(descriptors) != 1:
-            raise ValueError("Expected one Linux amd64 registry image: " + reference)
+            raise ValueError("Expected one platform registry image: " + reference)
         digest = descriptors[0]["digest"]
         if not distribution.DIGEST.fullmatch(digest):
             raise ValueError("Invalid registry image descriptor")
@@ -109,87 +109,112 @@ def registry_image(reference):
 
 
 def publish_images(assets, repository, revision, tag, floating_latest=False):
-    """Load the checked release archives; never rebuild or replace another image."""
+    """Verify both architectures before publishing immutable platform tags and indexes."""
     image_tag = tag.replace("+", "_")
-    if not re.fullmatch(r"[A-Za-z0-9_][A-Za-z0-9_.-]{0,127}", image_tag):
+    if not re.fullmatch(r"[A-Za-z0-9_][A-Za-z0-9_.-]{0,120}", image_tag):
         raise ValueError("Release version exceeds the container tag format")
-    stem = "oac-" + revision + "-linux-amd64"
-    # Extract named regular members only, never archive-controlled paths.
     with tempfile.TemporaryDirectory(prefix="oac-ghcr-") as directory:
         directory = pathlib.Path(directory)
-        with tarfile.open(assets / (stem + ".tar.gz"), "r:gz") as archive:
-            manifest = json.load(archive.extractfile(stem + "/manifest.json"))
-            if manifest["source_commit"] != revision or manifest["platform"] != "linux/amd64":
-                raise ValueError("Registry images do not match the release")
-            for name in IMAGE_NAMES:
-                if name == "runtime":
-                    continue
-                member = archive.getmember(stem + "/images/" + name + ".tar")
-                if not member.isfile():
-                    raise ValueError("Expected a regular image archive")
-                with archive.extractfile(member) as source, (directory / (name + ".tar")).open("wb") as target:
-                    shutil.copyfileobj(source, target)
-        runtime = manifest["artifacts"]["images/runtime.tar.gz"]
-        filename = runtime["filename"]
-        if pathlib.Path(filename).name != filename:
-            raise ValueError("Invalid Runtime asset filename")
-        runtime_path = assets / filename
-        if runtime_path.is_symlink() or distribution.sha256(runtime_path) != runtime["sha256"]:
-            raise ValueError("Runtime image checksum mismatch")
-        with gzip.open(runtime_path, "rb") as source, (directory / "runtime.tar").open("wb") as target:
-            shutil.copyfileobj(source, target)
-        for name in IMAGE_NAMES:
-            expected = (manifest["images"][name], manifest["image_manifest_digests"][name])
-            if distribution.image_identities(directory / (name + ".tar"), expected[0]) != expected:
-                raise ValueError("Release image identity mismatch: " + name)
+        entries = {}
+        for architecture in ("amd64", "arm64"):
+            stem = "oac-" + revision + "-linux-" + architecture
+            with tarfile.open(assets / (stem + ".tar.gz"), "r:gz") as archive:
+                manifest = json.load(archive.extractfile(stem + "/manifest.json"))
+                if manifest["source_commit"] != revision or manifest["platform"] != "linux/" + architecture:
+                    raise ValueError("Registry images do not match the release")
+                names = IMAGE_NAMES if architecture == "amd64" else ("core", "web", "ingress")
+                for name in names:
+                    path = directory / (name + "-" + architecture + ".tar")
+                    if name == "runtime":
+                        artifact = manifest["artifacts"]["images/runtime.tar.gz"]
+                        filename = artifact["filename"]
+                        if pathlib.Path(filename).name != filename:
+                            raise ValueError("Invalid Runtime asset filename")
+                        compressed = assets / filename
+                        if compressed.is_symlink() or distribution.sha256(compressed) != artifact["sha256"]:
+                            raise ValueError("Runtime image checksum mismatch")
+                        with gzip.open(compressed, "rb") as source, path.open("wb") as target:
+                            shutil.copyfileobj(source, target)
+                    else:
+                        member = archive.getmember(stem + "/images/" + name + ".tar")
+                        if not member.isfile():
+                            raise ValueError("Expected a regular image archive")
+                        with archive.extractfile(member) as source, path.open("wb") as target:
+                            shutil.copyfileobj(source, target)
+                    expected = (manifest["images"][name], manifest["image_manifest_digests"][name])
+                    if distribution.image_identities(path, expected[0], architecture) != expected:
+                        raise ValueError("Release image identity mismatch: " + name)
+                    entries[name, architecture] = (path, *expected)
         references = {}
-        # Validate every local image and every existing tag before the first push.
-        for name in IMAGE_NAMES:
-            path = directory / (name + ".tar")
+        for (name, architecture), (path, config, digest) in entries.items():
             subprocess.run(["docker", "load", "--input", str(path)], check=True)
-            config = manifest["images"][name]
-            local = distribution.resolve_image(config, manifest["image_manifest_digests"][name])
-            reference = "ghcr.io/" + repository.lower() + "/" + name + ":" + image_tag
-            remote, selected = registry_image(reference)
+            local = distribution.resolve_image(config, digest, architecture)
+            reference = "ghcr.io/" + repository.lower() + "/" + name + ":" + image_tag + "-" + architecture
+            remote, _ = registry_image(reference)
             if remote is not None and remote.get("config", {}).get("digest") != config:
                 raise ValueError("Registry tag already names a different image: " + reference)
-            references[name] = (reference, config, local, remote)
+            references[name, architecture] = (reference, config, local, remote)
+        # Version indexes are immutable too. Check every existing one before pushing.
+        bases = {name: "ghcr.io/" + repository.lower() + "/" + name + ":" + image_tag for name in IMAGE_NAMES}
+        for name, reference in bases.items():
+            current = registry_manifest(reference)
+            if current is not None:
+                verify_index(reference, current, {arch: entry[1] for (n, arch), entry in entries.items() if n == name})
+
         def push_image(item):
-            name, (reference, config, local, remote) = item
-            print("Publishing registry image " + name, flush=True)
+            key, (reference, config, local, remote) = item
             if remote is None:
                 subprocess.run(["docker", "tag", local, reference], check=True)
                 subprocess.run(["docker", "push", reference], check=True)
             remote, selected = registry_image(reference)
             if remote is None or remote.get("config", {}).get("digest") != config:
                 raise ValueError("Registry image verification failed: " + reference)
-            # Inspect the registry's descriptor, not the local Docker image ID.
             details = json.loads(subprocess.check_output(
                 ["docker", "manifest", "inspect", "--verbose", selected], text=True))
             digest = details["Descriptor"]["digest"]
             if not distribution.DIGEST.fullmatch(digest):
                 raise ValueError("Invalid registry manifest digest")
-            print("Verified registry image " + name, flush=True)
-            return name, {"tag": reference, "digest": reference.rsplit(":", 1)[0] + "@" + digest}
-        result = dict(sorted(parallel_each(push_image, references.items())))
+            return key, reference.rsplit(":", 1)[0] + "@" + digest
+        platforms = dict(parallel_each(push_image, references.items()))
+        result = {}
+        for name, reference in bases.items():
+            sources = [value for (n, _), value in platforms.items() if n == name]
+            expected = {arch: entry[1] for (n, arch), entry in entries.items() if n == name}
+            if registry_manifest(reference) is None:
+                subprocess.run(["docker", "buildx", "imagetools", "create", "--tag", reference, *sources], check=True)
+            verify_index(reference, registry_manifest(reference), expected)
+            digest = subprocess.check_output(["docker", "buildx", "imagetools", "inspect", reference,
+                                               "--format", "{{.Manifest.Digest}}"], text=True).strip()
+            if not distribution.DIGEST.fullmatch(digest):
+                raise ValueError("Invalid registry index digest")
+            pinned = reference.rsplit(":", 1)[0] + "@" + digest
+            result[name] = {"tag": reference, "digest": pinned}
+        # Advance floating tags only after all version indexes are verified.
         if floating_latest:
-            def push_latest(item):
-                name, (reference, config, local, remote) = item
-                latest = reference.rsplit(":", 1)[0] + ":latest"
-                current, _selected = registry_image(latest)
-                if current is not None and current.get("config", {}).get("digest") == config:
-                    return name, latest
-                print("Publishing registry image " + name + ":latest", flush=True)
-                subprocess.run(["docker", "tag", local, latest], check=True)
-                subprocess.run(["docker", "push", latest], check=True)
-                current, selected = registry_image(latest)
-                if current is None or current.get("config", {}).get("digest") != config:
-                    raise ValueError("Registry image verification failed: " + latest)
-                return name, latest
-            parallel_each(push_latest, references.items())
+            for name, entry in result.items():
+                latest = bases[name].rsplit(":", 1)[0] + ":latest"
+                expected = {arch: value[1] for (n, arch), value in entries.items() if n == name}
+                subprocess.run(["docker", "buildx", "imagetools", "create", "--tag", latest, entry["digest"]], check=True)
+                verify_index(latest, registry_manifest(latest), expected)
         return result
 
 
+def verify_index(reference, index, expected):
+    if not index or len(index.get("manifests", [])) != len(expected):
+        raise ValueError("Registry index has unexpected platforms: " + reference)
+    actual = {}
+    for descriptor in index["manifests"]:
+        platform = descriptor.get("platform", {})
+        architecture = platform.get("architecture")
+        digest = descriptor.get("digest", "")
+        if platform.get("os") != "linux" or architecture in actual or not distribution.DIGEST.fullmatch(digest):
+            raise ValueError("Invalid registry platform descriptor")
+        child = registry_manifest(reference.rsplit(":", 1)[0] + "@" + digest)
+        actual[architecture] = (child or {}).get("config", {}).get("digest")
+    if actual != expected:
+        raise ValueError("Registry index names a different image: " + reference)
+
+
 def publish(assets, repository, revision, tag, mode):
     if not REPOSITORY.fullmatch(repository):
         raise ValueError("Expected an owner/repository")
@@ -209,7 +234,8 @@ def publish(assets, repository, revision, tag, mode):
     # The builder validates the manifest and Runtime assets. Verify archives again
     # after the Actions artifact transfer between jobs.
     stem = "oac-" + revision + "-linux-amd64"
-    archives = [assets / (stem + ".tar.gz"), assets / "install.sh"]
+    archives = [assets / (stem + ".tar.gz"), assets / ("oac-" + revision + "-linux-arm64.tar.gz"), assets / "install.sh", assets / "install.ps1"]
+    archives.extend(assets / name for name in ("oac-linux-amd64", "oac-linux-arm64", "oac-darwin-amd64", "oac-darwin-arm64", "oac-windows-amd64.exe"))
     if mode == "publish" or (assets / (stem + "-offline.tar.gz")).exists():
         archives.append(assets / (stem + "-offline.tar.gz"))
     for archive in archives:
@@ -244,7 +270,7 @@ def publish(assets, repository, revision, tag, mode):
     release = api(repository, "releases", "--method", "POST",
                   "-f", "tag_name=" + tag, "-f", "target_commitish=" + revision,
                   "-f", "name=OpenAgentCore " + tag,
-                  "-f", "body=Linux amd64 distribution from commit " + revision + ".",
+                  "-f", "body=Core for Linux, macOS and Windows; Linux amd64 Node distribution from commit " + revision + ".",
                   "-F", "draft=true", "-F", "prerelease=" + str(prerelease).lower())
     verify_draft(release, tag, revision)
     release_id = release["id"]
diff --git a/scripts/publish-core-release.test.py b/scripts/publish-core-release.test.py
index 29ff5258b..175bc9cd6 100644
--- a/scripts/publish-core-release.test.py
+++ b/scripts/publish-core-release.test.py
@@ -29,7 +29,7 @@ def setUp(self):
         self.assets = pathlib.Path(self.temp.name)
         self.revision = "a" * 40
         self.stem = "oac-" + self.revision + "-linux-amd64"
-        for name in (self.stem + ".tar.gz", self.stem + "-offline.tar.gz", "install.sh"):
+        for name in (self.stem + ".tar.gz", self.stem + "-offline.tar.gz", "install.sh", "install.ps1", "oac-" + self.revision + "-linux-arm64.tar.gz", "oac-linux-amd64", "oac-linux-arm64", "oac-darwin-amd64", "oac-darwin-arm64", "oac-windows-amd64.exe"):
             (self.assets / name).write_bytes(b"archive fixture")
             (self.assets / (name + ".sha256")).write_text(
                 hashlib.sha256(b"archive fixture").hexdigest() + "  " + name + "\n")
@@ -68,7 +68,7 @@ def test_draft_publishes_images_and_stays_unpublished(self):
         self.publish(tag="build-" + self.revision, mode="draft")
         self.images.assert_called_once()
         self.assertTrue(self.release["draft"])
-        self.assertEqual(len(self.release["assets"]), 14)
+        self.assertEqual(len(self.release["assets"]), 28)
 
     def test_missing_native_asset_refuses_release_creation(self):
         (self.assets / f"oac-native-{self.revision}-windows-amd64.tar.gz").unlink()
@@ -142,7 +142,7 @@ def response(repo, endpoint, *args):
                 return result
             if endpoint == "releases/7":
                 self.assertEqual(active, 0)
-                self.assertIn(len(self.release["assets"]), (12, 14))
+                self.assertIn(len(self.release["assets"]), (26, 28))
             return self.response(repo, endpoint, *args)
         self.api.side_effect = response
         self.publish()
@@ -153,7 +153,7 @@ def test_version_tag_publishes_complete_fixed_id(self):
         self.publish()
         self.assertFalse(self.release["draft"])
         self.assertFalse(self.release["prerelease"])
-        self.assertEqual(len(self.release["assets"]), 14)
+        self.assertEqual(len(self.release["assets"]), 28)
         self.assertEqual({a["name"] for a in self.release["assets"] if a["name"].endswith(".yaml")}, {"compose.yaml"})
         self.assertEqual(self.api.call_args.args[1:],
                          ("releases/7", "--method", "PATCH", "-F", "draft=false"))
@@ -343,142 +343,112 @@ def setUp(self):
         self.temp = tempfile.TemporaryDirectory()
         self.addCleanup(self.temp.cleanup)
         self.assets = pathlib.Path(self.temp.name)
-        self.revision = "a" * 40
-        self.config = "sha256:" + "b" * 64
-        self.digest = "sha256:" + "c" * 64
-        runtime = self.assets / "runtime.tar.gz"
-        runtime.write_bytes(gzip.compress(b"runtime"))
-        self.manifest = {
-            "source_commit": self.revision, "platform": "linux/amd64",
-            "images": dict.fromkeys(publisher.IMAGE_NAMES, self.config),
-            "image_manifest_digests": dict.fromkeys(publisher.IMAGE_NAMES, self.digest),
-            "artifacts": {"images/runtime.tar.gz": {
-                "filename": runtime.name, "sha256": publisher.distribution.sha256(runtime)}}}
-        with tarfile.open(self.assets / ("oac-" + self.revision + "-linux-amd64.tar.gz"), "w:gz") as archive:
-            for name, data in [("manifest.json", json.dumps(self.manifest).encode())] + [
-                    ("images/" + name + ".tar", b"image") for name in ("core", "web", "ingress")]:
-                member = tarfile.TarInfo("oac-" + self.revision + "-linux-amd64/" + name)
-                member.size = len(data)
-                archive.addfile(member, io.BytesIO(data))
-        stack = contextlib.ExitStack()
-        self.addCleanup(stack.close)
-        self.identities = stack.enter_context(mock.patch.object(publisher.distribution, "image_identities", return_value=(self.config, self.digest)))
-        stack.enter_context(mock.patch.object(publisher.distribution, "resolve_image", return_value=self.digest))
-        self.run = stack.enter_context(mock.patch.object(publisher.subprocess, "run"))
-        stack.enter_context(mock.patch.object(publisher.subprocess, "check_output", return_value=json.dumps({"Descriptor": {"digest": self.digest}})))
-        self.remote = stack.enter_context(mock.patch.object(publisher, "registry_manifest", return_value={"config": {"digest": self.config}}))
-
-    def publish(self, tag="v1.2.3"):
-        return publisher.publish_images(self.assets, "MiniMax-AI/OpenAgentCore", self.revision, tag)
+        self.revision = 'a' * 40
+        self.configs = {'amd64': 'sha256:' + '1' * 64, 'arm64': 'sha256:' + '2' * 64}
+        self.digests = {'amd64': 'sha256:' + '3' * 64, 'arm64': 'sha256:' + '4' * 64}
+        self.index_digest = 'sha256:' + '5' * 64
+        self.remote_images = {}
+        for arch in ('amd64', 'arm64'):
+            names = publisher.IMAGE_NAMES if arch == 'amd64' else ('core', 'web', 'ingress')
+            manifest = {'source_commit': self.revision, 'platform': 'linux/' + arch,
+                        'images': dict.fromkeys(names, self.configs[arch]),
+                        'image_manifest_digests': dict.fromkeys(names, self.digests[arch])}
+            if arch == 'amd64':
+                runtime = self.assets / 'runtime.tar.gz'
+                runtime.write_bytes(gzip.compress(b'runtime'))
+                manifest['artifacts'] = {'images/runtime.tar.gz': {'filename': runtime.name, 'sha256': publisher.distribution.sha256(runtime)}}
+            stem = 'oac-' + self.revision + '-linux-' + arch
+            with tarfile.open(self.assets / (stem + '.tar.gz'), 'w:gz') as archive:
+                for name, raw in [('manifest.json', json.dumps(manifest).encode())] + [('images/' + n + '.tar', b'image') for n in names if n != 'runtime']:
+                    member = tarfile.TarInfo(stem + '/' + name); member.size = len(raw)
+                    archive.addfile(member, io.BytesIO(raw))
+        stack = contextlib.ExitStack(); self.addCleanup(stack.close)
+        self.identities = stack.enter_context(mock.patch.object(publisher.distribution, 'image_identities', side_effect=lambda path, config, arch: (self.configs[arch], self.digests[arch])))
+        stack.enter_context(mock.patch.object(publisher.distribution, 'resolve_image', side_effect=lambda config, digest, arch: digest))
+        self.run = stack.enter_context(mock.patch.object(publisher.subprocess, 'run', side_effect=self.execute))
+        stack.enter_context(mock.patch.object(publisher.subprocess, 'check_output', side_effect=self.output))
+        self.remote = stack.enter_context(mock.patch.object(publisher, 'registry_manifest', side_effect=self.lookup))
+
+    def lookup(self, reference):
+        if '@' in reference:
+            for arch, digest in self.digests.items():
+                if reference.endswith(digest): return {'config': {'digest': self.configs[arch]}}
+        return self.remote_images.get(reference)
+
+    def execute(self, command, **kwargs):
+        if command[1] == 'push':
+            ref = command[-1]; arch = ref.rsplit('-', 1)[1]
+            self.remote_images[ref] = {'config': {'digest': self.configs[arch]}}
+        if command[1:4] == ['buildx', 'imagetools', 'create']:
+            ref = command[5]; name = ref.rsplit('/', 1)[1].split(':')[0]
+            arches = ('amd64',) if name == 'runtime' else ('amd64', 'arm64')
+            self.remote_images[ref] = {'manifests': [{'platform': {'os': 'linux', 'architecture': arch}, 'digest': self.digests[arch]} for arch in arches]}
+
+    def output(self, command, **kwargs):
+        if command[1] == 'buildx': return self.index_digest
+        ref = command[-1]
+        arch = 'arm64' if ref.endswith('arm64') else 'amd64'
+        return json.dumps({'Descriptor': {'digest': self.digests[arch]}})
+
+    def publish(self, **kwargs):
+        return publisher.publish_images(self.assets, 'MiniMax-AI/OpenAgentCore', self.revision, 'v1.2.3', **kwargs)
 
     def pushes(self):
-        return [c.args[0] for c in self.run.call_args_list if c.args[0][1] == "push"]
-
-    def test_matching_tags_are_reused_and_receipts_use_registry_digest(self):
-        result = self.publish()
-        self.assertEqual(self.pushes(), [])
-        self.assertEqual(result["core"]["digest"], "ghcr.io/minimax-ai/openagentcore/core@" + self.digest)
-
-    def test_stable_release_moves_latest_after_the_version_tags(self):
-        seen = {}
-        def remote(reference):
-            seen[reference] = seen.get(reference, 0) + 1
-            if seen[reference] == 1:
-                return None
-            return {"config": {"digest": self.config}}
-        self.remote.side_effect = remote
-        publisher.publish_images(self.assets, "MiniMax-AI/OpenAgentCore", self.revision, "v1.2.3", floating_latest=True)
-        pushed = [command[-1].rsplit("/", 1)[-1] for command in self.pushes()]
-        self.assertEqual(sorted(name for name in pushed if name.endswith(":v1.2.3")),
-                         sorted(name + ":v1.2.3" for name in publisher.IMAGE_NAMES))
-        self.assertEqual(sorted(name for name in pushed if name.endswith(":latest")),
-                         sorted(name + ":latest" for name in publisher.IMAGE_NAMES))
-
-    def test_matching_latest_tag_is_reused(self):
-        publisher.publish_images(self.assets, "MiniMax-AI/OpenAgentCore", self.revision, "v1.2.3", floating_latest=True)
-        self.assertEqual(self.pushes(), [])
+        return [call.args[0] for call in self.run.call_args_list if call.args[0][1] == 'push']
 
-    def test_new_images_use_resolved_store_identity_and_version_only(self):
-        self.remote.side_effect = [None] * 4 + [{"config": {"digest": self.config}}] * 4
-        result = self.publish("v1.2.3-rc.1+build.2")
-        self.assertEqual(len(self.pushes()), 4)
-        self.assertTrue(all(c[-1].endswith(":v1.2.3-rc.1_build.2") for c in self.pushes()))
-        tags = [c.args[0] for c in self.run.call_args_list if c.args[0][1] == "tag"]
-        self.assertTrue(all(c[2] == self.digest for c in tags))
-        self.assertEqual(len(result), 4)
-
-    def test_single_platform_indexes_are_verified_by_child_config(self):
-        index = {"manifests": [{"digest": self.digest}]}
-        image = {"config": {"digest": self.config}}
-        self.remote.side_effect = lambda reference: image if "@" in reference else index
+    def test_publishes_and_reuses_verified_multiarch_indexes(self):
         result = self.publish()
+        self.assertEqual(len(self.pushes()), 7)
+        self.assertEqual(result['ingress']['digest'], 'ghcr.io/minimax-ai/openagentcore/ingress@' + self.index_digest)
+        self.assertEqual(len(self.remote_images['ghcr.io/minimax-ai/openagentcore/core:v1.2.3']['manifests']), 2)
+        self.run.reset_mock(); self.publish(); self.assertEqual(self.pushes(), [])
+
+    def test_latest_updates_after_all_version_indexes(self):
+        self.publish(floating_latest=True)
+        creates = [c.args[0][5] for c in self.run.call_args_list if c.args[0][1:4] == ['buildx', 'imagetools', 'create']]
+        self.assertTrue(all(ref.endswith(':v1.2.3') for ref in creates[:4]))
+        self.assertTrue(all(ref.endswith(':latest') for ref in creates[4:]))
+
+    def test_conflicting_platform_prevents_every_push(self):
+        self.remote_images['ghcr.io/minimax-ai/openagentcore/web:v1.2.3-arm64'] = {'config': {'digest': 'different'}}
+        with self.assertRaisesRegex(ValueError, 'different image'): self.publish()
         self.assertEqual(self.pushes(), [])
-        self.assertEqual(result["core"]["digest"], "ghcr.io/minimax-ai/openagentcore/core@" + self.digest)
-        self.assertTrue(any("@" in call.args[0] for call in self.remote.call_args_list))
 
-    def test_multi_image_index_is_rejected(self):
-        self.remote.return_value = {"manifests": [{"digest": self.digest}] * 2}
-        with self.assertRaisesRegex(ValueError, "Expected one"):
-            self.publish()
+    def test_conflicting_index_prevents_every_push(self):
+        self.remote_images['ghcr.io/minimax-ai/openagentcore/core:v1.2.3'] = {'manifests': []}
+        with self.assertRaisesRegex(ValueError, 'unexpected platforms'): self.publish()
         self.assertEqual(self.pushes(), [])
 
-    def test_conflicting_tag_prevents_all_pushes(self):
-        self.remote.side_effect = [None, {"config": {"digest": "different"}}]
-        with self.assertRaisesRegex(ValueError, "different image"):
-            self.publish()
-        self.assertEqual(self.pushes(), [])
+    def test_missing_arm_archive_prevents_loading(self):
+        (self.assets / ('oac-' + self.revision + '-linux-arm64.tar.gz')).unlink()
+        with self.assertRaises(FileNotFoundError): self.publish()
+        self.run.assert_not_called()
 
     def test_corrupt_runtime_prevents_loading(self):
-        (self.assets / "runtime.tar.gz").write_bytes(b"corrupt")
-        with self.assertRaisesRegex(ValueError, "checksum"):
-            self.publish()
+        (self.assets / 'runtime.tar.gz').write_bytes(b'corrupt')
+        with self.assertRaisesRegex(ValueError, 'checksum'): self.publish()
         self.run.assert_not_called()
 
-    def test_archive_identity_mismatch_prevents_loading(self):
-        self.identities.return_value = (self.config, "different")
-        with self.assertRaisesRegex(ValueError, "identity mismatch"):
-            self.publish()
+    def test_wrong_archive_identity_prevents_loading(self):
+        self.identities.side_effect = None; self.identities.return_value = ('wrong', 'wrong')
+        with self.assertRaisesRegex(ValueError, 'identity mismatch'): self.publish()
         self.run.assert_not_called()
 
-    def test_failed_push_stops_publication(self):
-        self.remote.return_value = None
-        def run(command, **kwargs):
-            if command[1] == "push":
-                raise subprocess.CalledProcessError(1, command)
-        self.run.side_effect = run
-        with self.assertRaises(subprocess.CalledProcessError):
-            self.publish()
-        self.assertGreaterEqual(len(self.pushes()), 1)
-        self.assertEqual(len({command[-1] for command in self.pushes()}), len(self.pushes()))
-
-    def test_registry_pushes_overlap_after_all_preflight_checks(self):
-        barrier = threading.Barrier(4, timeout=5)
-        pushed = set()
-        lock = threading.Lock()
-        def remote(reference):
-            with lock:
-                return {"config": {"digest": self.config}} if reference in pushed else None
-        def run(command, **kwargs):
-            if command[1] == "push":
-                self.assertEqual(sum(c.args[0][1] == "load" for c in self.run.call_args_list), 4)
-                barrier.wait()
-                with lock:
-                    pushed.add(command[-1])
-        self.remote.side_effect = remote
-        self.run.side_effect = run
-        self.assertEqual(len(self.publish()), 4)
-        self.assertEqual(len(pushed), 4)
+    def test_push_failure_stops_index_publication(self):
+        def fail(command, **kwargs):
+            if command[1] == 'push': raise subprocess.CalledProcessError(1, command)
+        self.run.side_effect = fail
+        with self.assertRaises(subprocess.CalledProcessError): self.publish()
+        self.assertFalse(any(c.args[0][1] == 'buildx' for c in self.run.call_args_list))
 
     def test_registry_auth_failure_is_not_missing_image(self):
-        # Test the actual inspection function separately from the publication fixture.
-        with mock.patch.object(publisher.subprocess, "run", return_value=subprocess.CompletedProcess([], 1, "", "unauthorized")):
-            with self.assertRaisesRegex(RuntimeError, "Cannot inspect"):
-                REAL_REGISTRY_MANIFEST("ghcr.io/example/core:v1")
+        with mock.patch.object(publisher.subprocess, 'run', return_value=subprocess.CompletedProcess([], 1, '', 'unauthorized')):
+            with self.assertRaisesRegex(RuntimeError, 'Cannot inspect'): REAL_REGISTRY_MANIFEST('ghcr.io/example/core:v1')
 
     def test_registry_missing_manifest(self):
-        with mock.patch.object(publisher.subprocess, "run", return_value=subprocess.CompletedProcess([], 1, "", "manifest unknown")):
-            self.assertIsNone(REAL_REGISTRY_MANIFEST("ghcr.io/example/core:v1"))
+        with mock.patch.object(publisher.subprocess, 'run', return_value=subprocess.CompletedProcess([], 1, '', 'manifest unknown')):
+            self.assertIsNone(REAL_REGISTRY_MANIFEST('ghcr.io/example/core:v1'))
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     unittest.main()
diff --git a/services/core/cmd/oac/init.go b/services/core/cmd/oac/init.go
index 7c8f6c8b4..432d9da60 100644
--- a/services/core/cmd/oac/init.go
+++ b/services/core/cmd/oac/init.go
@@ -12,7 +12,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
@@ -45,7 +44,6 @@ func initCommand() error {
 		log.Bg().Error("Initialization failed", "step", "validate_revision", "revision", revision, "error", err)
 		return err
 	}
-	syscall.Umask(0o077)
 	release := releaseIdentity{revision}
 	return initialize("/data", release, func() (map[string][]byte, error) {
 		return readRelease("/opt/oac/node-payload", release)
@@ -173,131 +171,129 @@ func initialize(root string, release releaseIdentity, fetch func() (map[string][
 		}
 	}
 	nextStep("acquire_lock")
-	lock, err := os.OpenFile(filepath.Join(root, "secrets", ".init.lock"), os.O_CREATE|os.O_WRONLY, 0o600)
-	if err != nil {
-		return err
-	}
-	defer lock.Close()
-	if err := syscall.Flock(int(lock.Fd()), syscall.LOCK_EX); err != nil {
-		return err
-	}
-	nextStep("verify_existing_installation")
-	marker := filepath.Join(root, "installation.json")
-	if raw, err := os.ReadFile(marker); err == nil {
-		var receipt installReceipt
-		if err := json.Unmarshal(raw, &receipt); err != nil {
+	return withLock(filepath.Join(root, "secrets", "init"), func() error {
+
+		nextStep("verify_existing_installation")
+		marker := filepath.Join(root, "installation.json")
+		if raw, err := os.ReadFile(marker); err == nil {
+			var receipt installReceipt
+			if err := json.Unmarshal(raw, &receipt); err != nil {
+				return err
+			}
+			if receipt.SourceCommit != release.revision {
+				return errors.New("this data directory belongs to another release; create a new installation")
+			}
+			for name, checksum := range receipt.Files {
+				actual, err := fileDigest(filepath.Join(root, name))
+				if err != nil {
+					return err
+				}
+				if actual != checksum {
+					return errors.New("installation files changed; restore the matching data directory")
+				}
+			}
+			if err := syncCoreKeyDigest(root); err != nil {
+				return err
+			}
+			logger.InfoContext(ctx, "Existing installation verified", "file_count", len(receipt.Files))
+			return nil
+		} else if !errors.Is(err, fs.ErrNotExist) {
 			return err
 		}
-		if receipt.SourceCommit != release.revision {
-			return errors.New("this data directory belongs to another release; create a new installation")
-		}
-		for name, checksum := range receipt.Files {
-			actual, err := fileDigest(filepath.Join(root, name))
+		nextStep("verify_empty_data")
+		for _, name := range []string{"database", "state"} {
+			entries, err := os.ReadDir(filepath.Join(root, name))
 			if err != nil {
 				return err
 			}
-			if actual != checksum {
-				return errors.New("installation files changed; restore the matching data directory")
+			if len(entries) > 0 {
+				return errors.New("existing data requires its original installation files")
 			}
 		}
-		logger.InfoContext(ctx, "Existing installation verified", "file_count", len(receipt.Files))
-		return nil
-	} else if !errors.Is(err, fs.ErrNotExist) {
-		return err
-	}
-	nextStep("verify_empty_data")
-	for _, name := range []string{"database", "state"} {
-		entries, err := os.ReadDir(filepath.Join(root, name))
+		nextStep("verify_bundled_metadata")
+		files, err := fetch()
 		if err != nil {
 			return err
 		}
-		if len(entries) > 0 {
-			return errors.New("existing data requires its original installation files")
+		logger.InfoContext(ctx, "Bundled node installation metadata verified", "file_count", len(files))
+		nextStep("publish_node_metadata")
+		prefix := "node-payload/releases/" + release.revision + "/"
+		names := []string{}
+		for _, name := range releaseMembers {
+			if err := writeOwned(filepath.Join(root, prefix+name), files[name]); err != nil {
+				return err
+			}
+			logger.InfoContext(ctx, "Node metadata file copied", "file", name)
+			names = append(names, prefix+name)
 		}
-	}
-	nextStep("verify_bundled_metadata")
-	files, err := fetch()
-	if err != nil {
-		return err
-	}
-	logger.InfoContext(ctx, "Bundled node installation metadata verified", "file_count", len(files))
-	nextStep("publish_node_metadata")
-	prefix := "node-payload/releases/" + release.revision + "/"
-	names := []string{}
-	for _, name := range releaseMembers {
-		if err := writeOwned(filepath.Join(root, prefix+name), files[name]); err != nil {
+		active, _ := json.Marshal(map[string]string{"source_commit": release.revision})
+		if err := writeOwned(filepath.Join(root, "node-payload", "active.json"), active); err != nil {
 			return err
 		}
-		logger.InfoContext(ctx, "Node metadata file copied", "file", name)
-		names = append(names, prefix+name)
-	}
-	active, _ := json.Marshal(map[string]string{"source_commit": release.revision})
-	if err := writeOwned(filepath.Join(root, "node-payload", "active.json"), active); err != nil {
-		return err
-	}
-	if err := filepath.WalkDir(filepath.Join(root, "node-payload"), func(path string, entry fs.DirEntry, err error) error {
-		if err != nil || !entry.IsDir() {
+		if err := filepath.WalkDir(filepath.Join(root, "node-payload"), func(path string, entry fs.DirEntry, err error) error {
+			if err != nil || !entry.IsDir() {
+				return err
+			}
+			if err := os.Chmod(path, 0o755); err != nil {
+				return err
+			}
+			return chown(path, 65532, 65532)
+		}); err != nil {
 			return err
 		}
-		if err := os.Chmod(path, 0o755); err != nil {
+		nextStep("prepare_credentials")
+		generators := []struct {
+			name     string
+			generate func() string
+		}{
+			{"secrets/web/core.key", func() string {
+				key, err := generateCoreKey()
+				if err != nil {
+					panic(err)
+				}
+				return key
+			}},
+			{"secrets/database/password", func() string { return randomHex(32) }},
+			{"secrets/core/credential.key", func() string { return base64.StdEncoding.EncodeToString(randomBytes(32)) }},
+			{"secrets/core/installation.id", func() string { return uuid.NewString() }},
+		}
+		for _, secret := range generators {
+			path := filepath.Join(root, secret.name)
+			if _, err := os.Stat(path); errors.Is(err, fs.ErrNotExist) {
+				if err := writeOwned(path, []byte(secret.generate()+"\n")); err != nil {
+					return err
+				}
+				logger.InfoContext(ctx, "Credential file generated", "file", secret.name)
+			} else if err != nil {
+				return err
+			} else {
+				logger.InfoContext(ctx, "Credential file retained", "file", secret.name)
+			}
+			if secret.name != "secrets/web/core.key" {
+				names = append(names, secret.name)
+			}
+		}
+		if err := syncCoreKeyDigest(root); err != nil {
 			return err
 		}
-		return chown(path, 65532, 65532)
-	}); err != nil {
-		return err
-	}
-	nextStep("prepare_credentials")
-	generators := []struct {
-		name     string
-		generate func() string
-	}{
-		{"secrets/web/core.key", func() string {
-			key, err := generateCoreKey()
+
+		names = append(names, "node-payload/active.json")
+		nextStep("write_installation_receipt")
+		receipt := installReceipt{SourceCommit: release.revision, Files: map[string]string{}}
+		for _, name := range names {
+			checksum, err := fileDigest(filepath.Join(root, name))
 			if err != nil {
-				panic(err)
-			}
-			return key
-		}},
-		{"secrets/database/password", func() string { return randomHex(32) }},
-		{"secrets/core/credential.key", func() string { return base64.StdEncoding.EncodeToString(randomBytes(32)) }},
-		{"secrets/core/installation.id", func() string { return uuid.NewString() }},
-	}
-	for _, secret := range generators {
-		path := filepath.Join(root, secret.name)
-		if _, err := os.Stat(path); errors.Is(err, fs.ErrNotExist) {
-			if err := writeOwned(path, []byte(secret.generate()+"\n")); err != nil {
 				return err
 			}
-			logger.InfoContext(ctx, "Credential file generated", "file", secret.name)
-		} else if err != nil {
-			return err
-		} else {
-			logger.InfoContext(ctx, "Credential file retained", "file", secret.name)
+			receipt.Files[name] = checksum
 		}
-		names = append(names, secret.name)
-	}
-	key, err := coreKey(root)
-	if err != nil {
-		return err
-	}
-	digests, _ := json.Marshal([]string{keyDigest(key)})
-	if err := writeOwned(filepath.Join(root, "secrets", "core", "core-key-digests.json"), digests); err != nil {
-		return err
-	}
-	names = append(names, "secrets/core/core-key-digests.json", "node-payload/active.json")
-	nextStep("write_installation_receipt")
-	receipt := installReceipt{SourceCommit: release.revision, Files: map[string]string{}}
-	for _, name := range names {
-		if receipt.Files[name], err = fileDigest(filepath.Join(root, name)); err != nil {
+		raw, _ := json.Marshal(receipt)
+		if err := writeOwned(marker, raw); err != nil {
 			return err
 		}
-	}
-	raw, _ := json.Marshal(receipt)
-	if err := writeOwned(marker, raw); err != nil {
-		return err
-	}
-	logger.InfoContext(ctx, "Installation initialized", "sign_in_key_command", "docker compose exec web oac-web core-key")
-	return nil
+		logger.InfoContext(ctx, "Installation initialized", "sign_in_key_command", "docker compose exec web oac-web core-key")
+		return nil
+	})
 }
 
 func randomBytes(n int) []byte {
diff --git a/services/core/cmd/oac/init_test.go b/services/core/cmd/oac/init_test.go
index b0164d682..c005a2fc3 100644
--- a/services/core/cmd/oac/init_test.go
+++ b/services/core/cmd/oac/init_test.go
@@ -12,6 +12,7 @@ import (
 	"maps"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -42,7 +43,7 @@ func snapshot(t *testing.T, root string) map[string]string {
 		}
 		data, err := os.ReadFile(path)
 		relative, _ := filepath.Rel(root, path)
-		saved[relative] = string(data)
+		saved[filepath.ToSlash(relative)] = string(data)
 		return err
 	}); err != nil {
 		t.Fatal(err)
@@ -81,7 +82,7 @@ func TestInitializeKeepsIdentityAndKeysAcrossRestarts(t *testing.T) {
 	}
 	for _, name := range []string{"secrets/web/core.key", "secrets/database/password", "secrets/core/credential.key"} {
 		info, err := os.Stat(filepath.Join(root, name))
-		if err != nil || info.Mode().Perm() != 0o600 {
+		if err != nil || (runtime.GOOS != "windows" && info.Mode().Perm() != 0o600) {
 			t.Fatalf("%s: %v %v", name, info.Mode(), err)
 		}
 	}
@@ -301,3 +302,29 @@ func TestInitializationLogsFailureStep(t *testing.T) {
 		t.Fatal("failure logged success or generated credentials")
 	}
 }
+
+func TestInitializationRetainsRotatedKeyAndRepairsItsDerivedDigest(t *testing.T) {
+	root, release, files := initFixture(t)
+	if err := initialize(root, release, fixed(files)); err != nil {
+		t.Fatal(err)
+	}
+	key, err := generateCoreKey()
+	if err != nil {
+		t.Fatal(err)
+	}
+	// Simulate interruption after publishing the new key but before its digest.
+	if err := writeOwned(filepath.Join(root, "secrets", "web", "core.key"), []byte(key+"\n")); err != nil {
+		t.Fatal(err)
+	}
+	if err := initialize(root, release, refuseDownload(t)); err != nil {
+		t.Fatal(err)
+	}
+	after, _ := coreKey(root)
+	if after != key {
+		t.Fatal("rotated key replaced")
+	}
+	digest, _ := os.ReadFile(filepath.Join(root, "secrets", "core", "core-key-digests.json"))
+	if !strings.Contains(string(digest), keyDigest(key)) {
+		t.Fatal("derived digest not repaired")
+	}
+}
diff --git a/services/core/cmd/oac/install.go b/services/core/cmd/oac/install.go
new file mode 100644
index 000000000..efe7d5955
--- /dev/null
+++ b/services/core/cmd/oac/install.go
@@ -0,0 +1,358 @@
+package main
+
+import (
+	"context"
+	"crypto/sha256"
+	"encoding/hex"
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Installation is host-independent. Only the launchers select a native binary;
+// Docker owns the Linux filesystem, service identities and persistent data.
+type installOptions struct {
+	dir, version, publicURL, host string
+	port                          int
+}
+type installer struct {
+	docker     func(context.Context, string, ...string) ([]byte, error)
+	download   func(context.Context, string, string) error
+	executable string
+}
+
+func installCommand(ctx context.Context, args []string) error {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return err
+	}
+	flags := flag.NewFlagSet("oac install", flag.ContinueOnError)
+	var o installOptions
+	flags.StringVar(&o.dir, "install-dir", filepath.Join(home, ".oac", "core"), "absolute installation directory")
+	flags.StringVar(&o.version, "version", "latest", "release tag")
+	flags.StringVar(&o.publicURL, "public-url", "", "URL reachable by browsers and nodes")
+	flags.StringVar(&o.host, "host", "0.0.0.0", "Web bind address")
+	flags.IntVar(&o.port, "web-port", 8080, "Web port")
+	if err := flags.Parse(args); err != nil {
+		return err
+	}
+	if flags.NArg() != 0 {
+		return errors.New("unexpected installation arguments")
+	}
+	exe, err := os.Executable()
+	if err != nil {
+		return err
+	}
+	i := installer{docker: dockerOutput, download: downloadAsset, executable: exe}
+	return i.install(ctx, o)
+}
+
+func dockerOutput(ctx context.Context, dir string, args ...string) ([]byte, error) {
+	cmd := exec.CommandContext(ctx, "docker", args...)
+	cmd.Dir = dir
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, fmt.Errorf("docker %s: %w\n%s", args[0], err, output)
+	}
+	return output, nil
+}
+
+func downloadAsset(ctx context.Context, address, path string) error {
+	client := &http.Client{Timeout: 2 * time.Minute, CheckRedirect: func(req *http.Request, via []*http.Request) error {
+		if req.URL.Scheme != "https" || len(via) >= 10 {
+			return errors.New("invalid release redirect")
+		}
+		return nil
+	}}
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, address, nil)
+	if err != nil {
+		return err
+	}
+	res, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusOK {
+		return fmt.Errorf("download %s: HTTP %d", address, res.StatusCode)
+	}
+	raw, err := io.ReadAll(io.LimitReader(res.Body, (1<<20)+1))
+	if err != nil {
+		return err
+	}
+	if len(raw) > 1<<20 {
+		return errors.New("release configuration exceeds size limit")
+	}
+	return os.WriteFile(path, raw, 0o600)
+}
+
+func (i installer) install(ctx context.Context, o installOptions) error {
+	if !filepath.IsAbs(o.dir) || filepath.Clean(o.dir) == filepath.VolumeName(o.dir)+string(filepath.Separator) {
+		return errors.New("--install-dir must name an absolute directory other than the filesystem root")
+	}
+	if o.port < 1 || o.port > 65535 {
+		return errors.New("--web-port must be between 1 and 65535")
+	}
+	if net.ParseIP(o.host) == nil {
+		return errors.New("--host must be an IP address")
+	}
+	if o.publicURL == "" {
+		o.publicURL = "http://localhost:" + strconv.Itoa(o.port)
+		if o.host == "0.0.0.0" {
+			// UDP connect selects a route without transmitting a packet.
+			if route, err := net.DialTimeout("udp4", "1.1.1.1:53", time.Second); err == nil {
+				address := route.LocalAddr().(*net.UDPAddr).IP
+				route.Close()
+				if address.IsPrivate() {
+					o.publicURL = "http://" + net.JoinHostPort(address.String(), strconv.Itoa(o.port))
+				}
+			}
+		}
+	}
+	u, err := url.Parse(o.publicURL)
+	if err != nil || (u.Scheme != "http" && u.Scheme != "https") || u.Hostname() == "" || u.User != nil || u.RawQuery != "" || u.Fragment != "" || (u.Path != "" && u.Path != "/") {
+		return errors.New("--public-url must be an HTTP(S) origin")
+	}
+	for _, value := range []string{o.publicURL, o.version} {
+		if strings.ContainsAny(value, "\r\n'\\") {
+			return errors.New("installation options contain invalid characters")
+		}
+	}
+	o.dir = filepath.Clean(o.dir)
+	if err := os.MkdirAll(filepath.Dir(o.dir), 0o700); err != nil {
+		return err
+	}
+	parent, err := filepath.EvalSymlinks(filepath.Dir(o.dir))
+	if err != nil {
+		return err
+	}
+	o.dir = filepath.Join(parent, filepath.Base(o.dir))
+	if info, err := os.Lstat(o.dir); err == nil && !info.IsDir() {
+		return errors.New("installation path must be a directory, not a symbolic link or file")
+	} else if err != nil && !errors.Is(err, os.ErrNotExist) {
+		return err
+	}
+	return withLock(o.dir, func() error { return i.installLocked(ctx, o) })
+}
+
+func (i installer) installLocked(ctx context.Context, o installOptions) error {
+	info, err := i.docker(ctx, "", "info", "--format", "{{.OSType}}/{{.Architecture}}")
+	if err != nil {
+		return fmt.Errorf("start Docker and check this account's access: %w", err)
+	}
+	switch strings.TrimSpace(string(info)) {
+	case "linux/x86_64", "linux/amd64", "linux/aarch64", "linux/arm64":
+	default:
+		return errors.New("Docker must run Linux amd64 or arm64 containers; on Windows select Linux containers in Docker Desktop")
+	}
+	version, err := i.docker(ctx, "", "compose", "version", "--short")
+	if err != nil {
+		return err
+	}
+	var major, minor int
+	if _, err := fmt.Sscanf(strings.TrimPrefix(strings.TrimSpace(string(version)), "v"), "%d.%d", &major, &minor); err != nil || major < 2 || (major == 2 && minor < 26) {
+		return errors.New("Docker Compose 2.26 or newer is required")
+	}
+	engine, err := i.docker(ctx, "", "version", "--format", "{{.Server.APIVersion}}")
+	if err != nil {
+		return err
+	}
+	if _, err := fmt.Sscanf(strings.TrimSpace(string(engine)), "%d.%d", &major, &minor); err != nil || major < 1 || (major == 1 && minor < 45) {
+		return errors.New("Docker Engine 26 or newer is required for data volume subdirectories")
+	}
+	stage := o.dir + ".staging"
+	if err := cleanStage(stage, o.dir); err != nil {
+		return err
+	}
+	entries, err := os.ReadDir(o.dir)
+	if err != nil && !errors.Is(err, os.ErrNotExist) {
+		return err
+	}
+	resume := len(entries) > 0
+	working := o.dir
+	if !resume {
+		listener, err := net.Listen("tcp", net.JoinHostPort(o.host, strconv.Itoa(o.port)))
+		if err != nil {
+			return fmt.Errorf("Web port unavailable; choose --web-port: %w", err)
+		}
+		listener.Close()
+		if err := os.Mkdir(stage, 0o700); err != nil {
+			return err
+		}
+		defer os.RemoveAll(stage)
+		// Directory creation publishes ownership atomically, including on Windows.
+		if err := os.Mkdir(filepath.Join(stage, stageMarker(o.dir)), 0o700); err != nil {
+			return err
+		}
+		working = stage
+		repository := os.Getenv("OAC_REPOSITORY")
+		if repository == "" {
+			repository = "MiniMax-AI/OpenAgentCore"
+		}
+		base := "https://github.com/" + repository + "/releases/latest/download/"
+		if o.version != "latest" {
+			base = "https://github.com/" + repository + "/releases/download/" + url.PathEscape(o.version) + "/"
+		}
+		fmt.Println("Downloading release configuration...")
+		for _, name := range []string{"compose-sha256sums.txt", "compose.yaml"} {
+			if err := i.download(ctx, base+name, filepath.Join(stage, name)); err != nil {
+				return err
+			}
+		}
+		contents := fmt.Sprintf("COMPOSE_PROJECT_NAME=oac-%s\nOAC_HOST='%s'\nOAC_WEB_PORT='%d'\nOAC_PUBLIC_URL='%s'\n", randomHex(5), o.host, o.port, o.publicURL)
+		if err := os.WriteFile(filepath.Join(stage, ".env"), []byte(contents), 0o600); err != nil {
+			return err
+		}
+		source, err := os.Open(i.executable)
+		if err != nil {
+			return err
+		}
+		defer source.Close()
+		target, err := os.OpenFile(filepath.Join(stage, cliName()), os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0o700)
+		if err != nil {
+			return err
+		}
+		_, copyErr := io.Copy(target, source)
+		closeErr := target.Close()
+		if copyErr != nil {
+			return copyErr
+		}
+		if closeErr != nil {
+			return closeErr
+		}
+	} else {
+		fmt.Println("Using saved settings and retaining existing data.")
+	}
+	for _, name := range []string{"compose.yaml", "compose-sha256sums.txt", ".env", cliName()} {
+		info, err := os.Lstat(filepath.Join(working, name))
+		if err != nil || !info.Mode().IsRegular() {
+			return fmt.Errorf("incomplete installation: preserve %s and choose another directory", o.dir)
+		}
+	}
+	if err := verifyCompose(working); err != nil {
+		return err
+	}
+	compose := func(args ...string) ([]byte, error) {
+		return i.docker(ctx, working, append([]string{"compose"}, args...)...)
+	}
+	if _, err := compose("config", "--quiet"); err != nil {
+		return err
+	}
+	images, err := compose("config", "--images")
+	if err != nil {
+		return err
+	}
+	fmt.Println("Checking and downloading images...")
+	for _, image := range strings.Fields(string(images)) {
+		if resume {
+			if _, err := i.docker(ctx, working, "image", "inspect", image); err == nil {
+				continue
+			}
+		}
+		if _, err := i.docker(ctx, working, "pull", image); err != nil {
+			return err
+		}
+	}
+	if !resume {
+		if _, err := os.Stat(o.dir); err == nil {
+			if err := os.Remove(o.dir); err != nil {
+				return err
+			}
+		}
+		if err := os.Rename(stage, o.dir); err != nil {
+			return err
+		}
+		working = o.dir
+		_ = os.Remove(filepath.Join(o.dir, stageMarker(o.dir)))
+	}
+	fmt.Println("Starting services...")
+	if _, err := compose("up", "-d", "--wait", "--wait-timeout", "180", "--pull", "never", "--no-recreate"); err != nil {
+		return fmt.Errorf("startup failed; data retained, rerun the installer: %w", err)
+	}
+	key, err := compose("exec", "-T", "web", "/usr/local/bin/oac-web", "core-key")
+	if err != nil {
+		return err
+	}
+	environment, err := compose("config", "--environment")
+	if err != nil {
+		return err
+	}
+	for _, line := range strings.Split(string(environment), "\n") {
+		if strings.HasPrefix(line, "OAC_PUBLIC_URL=") {
+			o.publicURL = strings.TrimPrefix(line, "OAC_PUBLIC_URL=")
+		}
+	}
+	fmt.Printf("\nOpenAgentCore is running.\n\nConsole: %s\nCore key: %s\nCommand: %s\n", o.publicURL, strings.TrimSpace(string(key)), filepath.Join(o.dir, cliName()))
+	if u, _ := url.Parse(o.publicURL); u != nil && (u.Hostname() == "localhost" || u.Hostname() == "127.0.0.1") {
+		fmt.Println("For remote access, set OAC_PUBLIC_URL in .env to a reachable origin and run oac apply.")
+	}
+	return nil
+}
+
+func cliName() string {
+	if runtime.GOOS == "windows" {
+		return "oac.exe"
+	}
+	return "oac"
+}
+
+func cleanStage(stage, owner string) error {
+	info, err := os.Lstat(stage)
+	if errors.Is(err, os.ErrNotExist) {
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+	if !info.IsDir() {
+		return errors.New("staging path must be a directory, not a link or file")
+	}
+	entries, err := os.ReadDir(stage)
+	if err != nil {
+		return err
+	}
+	if len(entries) > 0 {
+		marker := filepath.Join(stage, stageMarker(owner))
+		info, err := os.Lstat(marker)
+		if err != nil || !info.IsDir() {
+			return errors.New("unrecognized staging directory; preserve it and choose another installation directory")
+		}
+		contents, err := os.ReadDir(marker)
+		if err != nil || len(contents) != 0 {
+			return errors.New("invalid staging ownership marker")
+		}
+
+	}
+	return os.RemoveAll(stage)
+}
+
+func verifyCompose(dir string) error {
+	raw, err := os.ReadFile(filepath.Join(dir, "compose.yaml"))
+	if err != nil {
+		return err
+	}
+	sums, err := os.ReadFile(filepath.Join(dir, "compose-sha256sums.txt"))
+	if err != nil {
+		return err
+	}
+	digest := sha256.Sum256(raw)
+	if strings.TrimSpace(string(sums)) != hex.EncodeToString(digest[:])+"  compose.yaml" {
+		return errors.New("Compose checksum mismatch; restore the matching release configuration")
+	}
+	return nil
+}
+
+func stageMarker(owner string) string {
+	return fmt.Sprintf(".oac-installer-%x", sha256.Sum256([]byte(owner)))
+}
diff --git a/services/core/cmd/oac/install_test.go b/services/core/cmd/oac/install_test.go
new file mode 100644
index 000000000..be48b1bfc
--- /dev/null
+++ b/services/core/cmd/oac/install_test.go
@@ -0,0 +1,245 @@
+package main
+
+import (
+	"context"
+	"crypto/sha256"
+	"fmt"
+	"net"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+)
+
+type installFixture struct {
+	installer
+	options installOptions
+	calls   []string
+	failure string
+	cached  bool
+}
+
+func newInstallFixture(t *testing.T) *installFixture {
+	t.Helper()
+	root, err := filepath.EvalSymlinks(t.TempDir())
+	if err != nil {
+		t.Fatal(err)
+	}
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatal(err)
+	}
+	port := listener.Addr().(*net.TCPAddr).Port
+	listener.Close()
+	exe := filepath.Join(root, "source")
+	if err := os.WriteFile(exe, []byte("binary"), 0o700); err != nil {
+		t.Fatal(err)
+	}
+	f := &installFixture{options: installOptions{dir: filepath.Join(root, "installation with spaces"), version: "latest", host: "127.0.0.1", port: port}}
+	f.executable = exe
+	compose := []byte("services: {}\n")
+	f.download = func(_ context.Context, address, path string) error {
+		if f.failure == "download" {
+			return os.ErrPermission
+		}
+		raw := compose
+		if strings.HasSuffix(address, "sums.txt") {
+			raw = []byte(fmt.Sprintf("%x  compose.yaml\n", sha256.Sum256(compose)))
+		}
+		return os.WriteFile(path, raw, 0o600)
+	}
+	f.docker = func(_ context.Context, dir string, args ...string) ([]byte, error) {
+		command := strings.Join(args, " ")
+		f.calls = append(f.calls, command)
+		if f.failure != "" && strings.HasPrefix(command, f.failure) {
+			return nil, os.ErrPermission
+		}
+		switch command {
+		case "info --format {{.OSType}}/{{.Architecture}}":
+			return []byte("linux/aarch64"), nil
+		case "compose version --short":
+			return []byte("v2.26.0"), nil
+		case "version --format {{.Server.APIVersion}}":
+			return []byte("1.45"), nil
+		case "compose config --images":
+			return []byte("example/core:latest\nexample/web:latest"), nil
+		case "compose config --environment":
+			return []byte("OAC_PUBLIC_URL=http://localhost:8080"), nil
+		}
+		if strings.HasPrefix(command, "image inspect") && !f.cached {
+			return nil, os.ErrNotExist
+		}
+		if strings.HasPrefix(command, "compose up") {
+			if _, err := os.Stat(filepath.Join(f.options.dir, ".env")); err != nil {
+				t.Fatal("services started before configuration publication")
+			}
+		}
+		return nil, nil
+	}
+	return f
+}
+func (f *installFixture) run() error { return f.install(context.Background(), f.options) }
+
+func TestInstallFailureBeforePublicationAndRetry(t *testing.T) {
+	for _, failure := range []string{"download", "compose config --quiet", "pull"} {
+		t.Run(failure, func(t *testing.T) {
+			f := newInstallFixture(t)
+			f.failure = failure
+			if err := f.run(); err == nil {
+				t.Fatal("expected failure")
+			}
+			for _, path := range []string{f.options.dir, f.options.dir + ".staging"} {
+				if _, err := os.Stat(path); !os.IsNotExist(err) {
+					t.Fatalf("unpublished state remains: %s", path)
+				}
+			}
+			f.failure = ""
+			if err := f.run(); err != nil {
+				t.Fatal(err)
+			}
+		})
+	}
+}
+func TestInstallResumePreservesConfigAndUsesCachedImages(t *testing.T) {
+	f := newInstallFixture(t)
+	f.failure = "compose up"
+	if err := f.run(); err == nil {
+		t.Fatal("expected startup failure")
+	}
+	saved, err := os.ReadFile(filepath.Join(f.options.dir, ".env"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	f.failure = ""
+	f.cached = true
+	f.calls = nil
+	f.download = func(context.Context, string, string) error {
+		t.Fatal("resume downloaded replacement release")
+		return nil
+	}
+	f.options.publicURL = "https://replacement.invalid"
+	if err := f.run(); err != nil {
+		t.Fatal(err)
+	}
+	after, _ := os.ReadFile(filepath.Join(f.options.dir, ".env"))
+	if string(saved) != string(after) {
+		t.Fatal("saved configuration replaced")
+	}
+	for _, call := range f.calls {
+		if strings.HasPrefix(call, "pull") || strings.Contains(call, "down") {
+			t.Fatal(call)
+		}
+	}
+	if !strings.Contains(strings.Join(f.calls, "\n"), "--pull never --no-recreate") {
+		t.Fatal(f.calls)
+	}
+}
+func TestInstallRecoversRecognizedStageAndPreservesUnknownData(t *testing.T) {
+	for _, owned := range []bool{true, false} {
+		t.Run(fmt.Sprint(owned), func(t *testing.T) {
+			f := newInstallFixture(t)
+			stage := f.options.dir + ".staging"
+			os.Mkdir(stage, 0o700)
+			os.WriteFile(filepath.Join(stage, "partial"), []byte("untouched"), 0o600)
+			if owned {
+				os.Mkdir(filepath.Join(stage, stageMarker(f.options.dir)), 0o700)
+			}
+			err := f.run()
+			if owned && err != nil {
+				t.Fatal(err)
+			}
+			if !owned {
+				if err == nil {
+					t.Fatal("unrecognized staging accepted")
+				}
+				if raw, _ := os.ReadFile(filepath.Join(stage, "partial")); string(raw) != "untouched" {
+					t.Fatal("unknown contents removed")
+				}
+			}
+		})
+	}
+	f := newInstallFixture(t)
+	os.Mkdir(f.options.dir, 0o700)
+	os.WriteFile(filepath.Join(f.options.dir, "user-file"), []byte("keep"), 0o600)
+	if err := f.run(); err == nil {
+		t.Fatal("unrelated directory accepted")
+	}
+	if raw, _ := os.ReadFile(filepath.Join(f.options.dir, "user-file")); string(raw) != "keep" {
+		t.Fatal("user data lost")
+	}
+}
+func TestInstallRejectsBusyPortAndLock(t *testing.T) {
+	f := newInstallFixture(t)
+	listener, err := net.Listen("tcp", net.JoinHostPort(f.options.host, fmt.Sprint(f.options.port)))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := f.run(); err == nil {
+		t.Fatal("busy port accepted")
+	}
+	listener.Close()
+	if err := withLock(f.options.dir, func() error {
+		if err := f.run(); err == nil {
+			t.Fatal("concurrent installation accepted")
+		}
+		return nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+func TestInstallRefusesModifiedCompose(t *testing.T) {
+	f := newInstallFixture(t)
+	if err := f.run(); err != nil {
+		t.Fatal(err)
+	}
+	os.WriteFile(filepath.Join(f.options.dir, "compose.yaml"), []byte("changed"), 0o600)
+	f.calls = nil
+	if err := f.run(); err == nil {
+		t.Fatal("changed compose accepted")
+	}
+	for _, call := range f.calls {
+		if strings.HasPrefix(call, "compose up") {
+			t.Fatal("started modified compose")
+		}
+	}
+}
+func TestInstallerInterruptedProcess(t *testing.T) {
+	if root := os.Getenv("OAC_TEST_INSTALL_KILL"); root != "" {
+		err := withLock(root, func() error {
+			stage := root + ".staging"
+			os.Mkdir(stage, 0o700)
+			os.Mkdir(filepath.Join(stage, stageMarker(root)), 0o700)
+			os.WriteFile(filepath.Join(stage, "ready"), nil, 0o600)
+			time.Sleep(time.Minute)
+			return nil
+		})
+		if err != nil {
+			os.Exit(2)
+		}
+		return
+	}
+	f := newInstallFixture(t)
+	cmd := exec.Command(os.Args[0], "-test.run=^TestInstallerInterruptedProcess$")
+	cmd.Env = append(os.Environ(), "OAC_TEST_INSTALL_KILL="+f.options.dir)
+	if err := cmd.Start(); err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { _ = cmd.Process.Kill() })
+	deadline := time.Now().Add(15 * time.Second)
+	for {
+		if _, err := os.Stat(filepath.Join(f.options.dir+".staging", "ready")); err == nil {
+			break
+		}
+		if time.Now().After(deadline) {
+			t.Fatal("child never acquired lock")
+		}
+		time.Sleep(20 * time.Millisecond)
+	}
+	cmd.Process.Kill()
+	cmd.Wait()
+	if err := f.run(); err != nil {
+		t.Fatalf("killed installer left unrecoverable state: %v", err)
+	}
+}
diff --git a/services/core/cmd/oac/install_unix_test.go b/services/core/cmd/oac/install_unix_test.go
new file mode 100644
index 000000000..73e875d08
--- /dev/null
+++ b/services/core/cmd/oac/install_unix_test.go
@@ -0,0 +1,46 @@
+//go:build unix
+
+package main
+
+import (
+	"os"
+	"os/exec"
+	"os/signal"
+	"syscall"
+	"testing"
+)
+
+func TestInstallWriteFailureLeavesRetryableState(t *testing.T) {
+	if os.Getenv("OAC_TEST_FILE_LIMIT") != "1" {
+		cmd := exec.Command(os.Args[0], "-test.run=^TestInstallWriteFailureLeavesRetryableState$")
+		cmd.Env = append(os.Environ(), "OAC_TEST_FILE_LIMIT=1")
+		if output, err := cmd.CombinedOutput(); err != nil {
+			t.Fatalf("write failure probe: %v\n%s", err, output)
+		}
+		return
+	}
+	f := newInstallFixture(t)
+	var original syscall.Rlimit
+	if err := syscall.Getrlimit(syscall.RLIMIT_FSIZE, &original); err != nil {
+		t.Fatal(err)
+	}
+	limited := original
+	limited.Cur = 0
+	signal.Ignore(syscall.SIGXFSZ)
+	if err := syscall.Setrlimit(syscall.RLIMIT_FSIZE, &limited); err != nil {
+		t.Fatal(err)
+	}
+	err := f.run()
+	if restore := syscall.Setrlimit(syscall.RLIMIT_FSIZE, &original); restore != nil {
+		t.Fatal(restore)
+	}
+	if err == nil {
+		t.Fatal("installation succeeded without writable files")
+	}
+	if _, err := os.Stat(f.options.dir + ".staging"); !os.IsNotExist(err) {
+		t.Fatal("failed installation retained staging")
+	}
+	if err := f.run(); err != nil {
+		t.Fatalf("installation did not recover after restoring writes: %v", err)
+	}
+}
diff --git a/services/core/cmd/oac/main.go b/services/core/cmd/oac/main.go
index 0d1318c78..f2b3393d3 100644
--- a/services/core/cmd/oac/main.go
+++ b/services/core/cmd/oac/main.go
@@ -7,6 +7,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
+	"flag"
 	"fmt"
 	"os"
 	"os/signal"
@@ -15,6 +16,7 @@ import (
 	"syscall"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimefs"
 )
 
 func main() {
@@ -28,6 +30,9 @@ func main() {
 	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
 	if err := run(ctx, os.Args[1], os.Args[2:]); err != nil {
+		if errors.Is(err, flag.ErrHelp) {
+			return
+		}
 		if os.Args[1] != "init" {
 			fmt.Fprintln(os.Stderr, err.Error())
 		}
@@ -39,27 +44,35 @@ func main() {
 var buildRevision = "development"
 
 func usage() {
-	fmt.Fprintf(os.Stderr, "oac (%s)\nUsage: oac apply|core-key|rotate-core-key|init\n", buildRevision)
+	fmt.Fprintf(os.Stderr, "oac (%s)\nUsage: oac install|apply|core-key|rotate-core-key\n", buildRevision)
 }
 
 func run(ctx context.Context, command string, args []string) error {
 	switch command {
+	case "install":
+		return installCommand(ctx, args)
 	case "init":
 		return initCommand()
+	case "rotate-volume-key":
+		return withLock("/data/secrets/init", func() error { return rotateVolumeKey("/data") })
 	}
 	root, err := installDir()
 	if err != nil {
 		return err
 	}
-	in := installation{root: root, data: dataDir(root)}
 	runner := execRunner{dir: root}
 	switch command {
 	case "apply":
 		return withLock(root, func() error { return apply(ctx, runner) })
 	case "core-key":
-		return coreKeyCommand(ctx, in, runner, args)
+		return coreKeyCommand(ctx, runner, args)
 	case "rotate-core-key":
-		return withLock(root, func() error { return rotateCoreKey(ctx, in, runner) })
+		return withLock(root, func() error {
+			if err := runner.Run(ctx, "run", "--rm", "--no-deps", "init", "/usr/local/bin/oac", "rotate-volume-key"); err != nil {
+				return err
+			}
+			return runner.Run(ctx, "restart", "core", "web")
+		})
 	default:
 		usage()
 		return errors.New("unknown command")
@@ -81,25 +94,24 @@ func installDir() (string, error) {
 	return "", errors.New("run oac from an installation directory that contains compose.yaml")
 }
 
-type installation struct{ root, data string }
-
-func dataDir(root string) string {
-	if dir := os.Getenv("OAC_DATA_MOUNT"); dir != "" {
-		return dir
-	}
-	return filepath.Join(root, "data")
-}
-
 func withLock(root string, fn func() error) error {
-	file, err := os.OpenFile(filepath.Join(root, ".oac.lock"), os.O_CREATE|os.O_RDWR, 0o600)
-	if err != nil {
+	dir := root + ".lock"
+	if info, err := os.Lstat(dir); err == nil && !info.IsDir() {
+		return errors.New("invalid installation lock directory")
+	}
+	if err := os.MkdirAll(dir, 0o700); err != nil {
 		return err
 	}
-	defer file.Close()
-	if err := syscall.Flock(int(file.Fd()), syscall.LOCK_EX); err != nil {
+	handle, err := os.OpenRoot(dir)
+	if err != nil {
 		return err
 	}
-	defer syscall.Flock(int(file.Fd()), syscall.LOCK_UN)
+	defer handle.Close()
+	unlock, err := runtimefs.LockDirectory(handle)
+	if err != nil {
+		return fmt.Errorf("another operation is using this installation: %w", err)
+	}
+	defer unlock()
 	return fn()
 }
 
@@ -110,8 +122,8 @@ func apply(ctx context.Context, runner Runner) error {
 	return runner.Run(ctx, "up", "-d", "--wait")
 }
 
-func coreKeyCommand(ctx context.Context, in installation, runner Runner, args []string) error {
-	path := filepath.Join(in.data, "secrets", "web", "core.key")
+func coreKeyCommand(ctx context.Context, runner Runner, args []string) error {
+	path := "Docker volume: secrets/web/core.key (use oac core-key --show)"
 	if len(args) == 0 {
 		fmt.Println(path)
 		return nil
@@ -130,24 +142,33 @@ func generateCoreKey() (string, error) {
 	return "oac_admin_" + hex.EncodeToString(buf), nil
 }
 
-func rotateCoreKey(ctx context.Context, in installation, runner Runner) error {
+func rotateVolumeKey(data string) error {
 	key, err := generateCoreKey()
 	if err != nil {
 		return err
 	}
-	keyPath := filepath.Join(in.data, "secrets", "web", "core.key")
-	digestPath := filepath.Join(in.data, "secrets", "core", "core-key-digests.json")
-	if err := writeSecret(keyPath, key+"\n"); err != nil {
+	keyPath := filepath.Join(data, "secrets", "web", "core.key")
+	if err := writeOwned(keyPath, []byte(key+"\n")); err != nil {
 		return err
 	}
-	raw, err := json.Marshal([]string{keyDigest(key)})
+	return syncCoreKeyDigest(data)
+}
+
+func syncCoreKeyDigest(data string) error {
+	key, err := coreKey(data)
 	if err != nil {
 		return err
 	}
-	if err := writeSecret(digestPath, string(raw)+"\n"); err != nil {
-		return err
+	value, err := hex.DecodeString(strings.TrimPrefix(key, "oac_admin_"))
+	if err != nil || !strings.HasPrefix(key, "oac_admin_") || len(value) != 32 {
+		return errors.New("invalid saved Core key")
 	}
-	return runner.Run(ctx, "restart", "core", "web")
+	raw, _ := json.Marshal([]string{keyDigest(key)})
+	path := filepath.Join(data, "secrets", "core", "core-key-digests.json")
+	if saved, err := os.ReadFile(path); err == nil && strings.TrimSpace(string(saved)) == string(raw) {
+		return nil
+	}
+	return writeOwned(path, raw)
 }
 
 func coreKey(data string) (string, error) {
@@ -162,23 +183,3 @@ func keyDigest(key string) string {
 	sum := sha256.Sum256([]byte(key))
 	return hex.EncodeToString(sum[:])
 }
-
-func writeSecret(path, contents string) error {
-	info, err := os.Stat(path)
-	if err != nil {
-		return err
-	}
-	stat, ok := info.Sys().(*syscall.Stat_t)
-	if !ok {
-		return os.ErrInvalid
-	}
-	temporary := path + ".tmp"
-	if err := os.WriteFile(temporary, []byte(contents), 0o600); err != nil {
-		return err
-	}
-	if err := os.Chown(temporary, int(stat.Uid), int(stat.Gid)); err != nil {
-		_ = os.Remove(temporary)
-		return err
-	}
-	return os.Rename(temporary, path)
-}
diff --git a/services/core/cmd/oac/oac_test.go b/services/core/cmd/oac/oac_test.go
index ee865c213..d3ccd058d 100644
--- a/services/core/cmd/oac/oac_test.go
+++ b/services/core/cmd/oac/oac_test.go
@@ -28,40 +28,36 @@ func TestApplyDoesNotStartWhenTheConfigurationCheckFails(t *testing.T) {
 
 func TestRotateCoreKeyDigestDoesNotEchoTheKey(t *testing.T) {
 	root := t.TempDir()
-	in := installation{root: root, data: filepath.Join(root, "data")}
-	if err := os.MkdirAll(filepath.Join(in.data, "secrets", "web"), 0o755); err != nil {
+	data := filepath.Join(root, "data")
+	if err := os.MkdirAll(filepath.Join(data, "secrets", "web"), 0o755); err != nil {
 		t.Fatal(err)
 	}
-	if err := os.MkdirAll(filepath.Join(in.data, "secrets", "core"), 0o755); err != nil {
+	if err := os.MkdirAll(filepath.Join(data, "secrets", "core"), 0o755); err != nil {
 		t.Fatal(err)
 	}
-	if err := os.WriteFile(filepath.Join(in.data, "secrets", "web", "core.key"), []byte("old\n"), 0o600); err != nil {
+	if err := os.WriteFile(filepath.Join(data, "secrets", "web", "core.key"), []byte("old\n"), 0o600); err != nil {
 		t.Fatal(err)
 	}
-	if err := os.WriteFile(filepath.Join(in.data, "secrets", "core", "core-key-digests.json"), []byte("[]\n"), 0o600); err != nil {
+	if err := os.WriteFile(filepath.Join(data, "secrets", "core", "core-key-digests.json"), []byte("[]\n"), 0o600); err != nil {
 		t.Fatal(err)
 	}
-	var restarted bool
-	runner := scriptedRunner{run: func(args ...string) error {
-		restarted = args[0] == "restart"
-		return nil
-	}}
-	if err := rotateCoreKey(context.Background(), in, runner); err != nil {
+	previous := chown
+	chown = func(string, int, int) error { return nil }
+	t.Cleanup(func() { chown = previous })
+	if err := rotateVolumeKey(data); err != nil {
 		t.Fatal(err)
 	}
-	raw, err := os.ReadFile(filepath.Join(in.data, "secrets", "web", "core.key"))
+
+	raw, err := os.ReadFile(filepath.Join(data, "secrets", "web", "core.key"))
 	if err != nil {
 		t.Fatal(err)
 	}
 	key := strings.TrimSpace(string(raw))
 	assertCoreKeyFormat(t, key)
-	digest, err := os.ReadFile(filepath.Join(in.data, "secrets", "core", "core-key-digests.json"))
+	digest, err := os.ReadFile(filepath.Join(data, "secrets", "core", "core-key-digests.json"))
 	if err != nil || !strings.Contains(string(digest), keyDigest(key)) || strings.Contains(string(digest), key) {
 		t.Fatalf("digest %s key leaked %v", digest, err)
 	}
-	if !restarted {
-		t.Fatal("core was not restarted")
-	}
 }
 
 type scriptedRunner struct {
diff --git a/services/core/tools/e2b-provider/Build.Dockerfile b/services/core/tools/e2b-provider/Build.Dockerfile
index 446fa4cd2..84083cefd 100644
--- a/services/core/tools/e2b-provider/Build.Dockerfile
+++ b/services/core/tools/e2b-provider/Build.Dockerfile
@@ -1,5 +1,5 @@
 # Fixed CPython and glibc baseline shared by native Core and the Debian Core image.
-FROM python:3.12.12-slim-bookworm@sha256:2986c55feb36e6cae00fa1fefb454283e4b33f35e75ff8bdd123b134130be301
+FROM python:3.12.12-slim-bookworm@sha256:593bd06efe90efa80dc4eee3948be7c0fde4134606dd40d8dd8dbcade98e669c
 RUN apt-get update && apt-get install -y --no-install-recommends binutils \
     && rm -rf /var/lib/apt/lists/*
 ENTRYPOINT ["python3", "/source/services/core/tools/e2b-provider/build.py"]
diff --git a/services/core/tools/e2b-provider/build.py b/services/core/tools/e2b-provider/build.py
index 8d6f9badf..8b69302d5 100644
--- a/services/core/tools/e2b-provider/build.py
+++ b/services/core/tools/e2b-provider/build.py
@@ -16,7 +16,7 @@
 SOURCE = Path('/source/services/core/tools/e2b-provider')
 OUTPUT = Path('/output')
 NAME = 'oac-e2b-provider'
-BASE = 'python:3.12.12-slim-bookworm@sha256:2986c55feb36e6cae00fa1fefb454283e4b33f35e75ff8bdd123b134130be301'
+BASE = next(line.split()[1] for line in (SOURCE / 'Build.Dockerfile').read_text().splitlines() if line.startswith('FROM '))
 
 
 def checked(args, **options):
@@ -24,8 +24,9 @@ def checked(args, **options):
 
 
 def main():
-    if sys.version_info[:3] != (3, 12, 12) or platform.system() != 'Linux' or platform.machine() != 'x86_64':
-        raise RuntimeError('Use the pinned Linux amd64 build image')
+    if sys.version_info[:3] != (3, 12, 12) or platform.system() != 'Linux' or platform.machine() not in ('x86_64', 'aarch64'):
+        raise RuntimeError('Use the pinned Linux amd64 or arm64 build image')
+    architecture = {'x86_64': 'amd64', 'aarch64': 'arm64'}[platform.machine()]
     os.umask(0o022)
     with tempfile.TemporaryDirectory(prefix='e2b-build-') as temporary:
         root = Path(temporary)
@@ -56,7 +57,7 @@ def main():
         if report != {'Version': PROTOCOL_VERSION, 'SDKVersion': SDK_VERSION}:
             raise RuntimeError('Unexpected helper readiness report')
         manifest = {'format_version': 1, 'sdk_version': report['SDKVersion'], 'python_version': platform.python_version(),
-                    'platform': 'linux-amd64', 'libc': platform.libc_ver(), 'build_image': BASE,
+                    'platform': 'linux-' + architecture, 'libc': platform.libc_ver(), 'build_image': BASE,
                     'entrypoint': NAME,
                     'source_sha256': {file.name: hashlib.sha256(file.read_bytes()).hexdigest()
                                       for file in sorted(source.glob('*.py'))},
@@ -66,7 +67,7 @@ def main():
             if entry.is_symlink() or not (entry.is_file() or entry.is_dir()):
                 raise RuntimeError('Unsupported artifact entry')
             entry.chmod(0o755 if entry.is_dir() or entry.stat().st_mode & 0o111 else 0o644)
-        destination = OUTPUT / (NAME + '-linux-amd64.tar.gz')
+        destination = OUTPUT / (NAME + '-linux-' + architecture + '.tar.gz')
         with tarfile.open(destination, 'w:gz', dereference=True) as archive:
             archive.add(exported, arcname=NAME)
         checksum = hashlib.sha256(destination.read_bytes()).hexdigest()
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
index 642383d04..cea7c0df0 100644
--- a/services/web/Dockerfile
+++ b/services/web/Dockerfile
@@ -1,5 +1,5 @@
 # The build context contains only oac-web and the existing Web dist.
-FROM gcr.io/distroless/static-debian13:nonroot@sha256:e754765ad9e167b0677b41c617fd44afb7b9818a477f48f17bda08e12cfb98cb
+FROM gcr.io/distroless/static-debian13:nonroot@sha256:e2e927ec666bae08560abb3c55d0659eceabb657f56b6782ab500a9fc7f555e3
 
 COPY --chmod=0555 oac-web /usr/local/bin/oac-web
 COPY dist /www

From 9ede93563eaeff54273f9d13ec4b614ba4aac849 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 20:11:55 +0800
Subject: [PATCH 24/60] Delete the direct-call Harness factory (#484)

Runs start only through the Executor, so agent.Factory, Runtime.Session, Registry.Resolve, the factories map and each adapter's direct-call factory had no production caller. RegisterKind now registers only the descriptor and model configuration, and Register rejects factories on an unavailable runtime. Code that only the factories reached is deleted, and the adapter tests run through the Executor path.
---
 .../claudesdk/cancellation_live_linux_test.go |   2 +-
 .../agent/claudesdk/cancellation_test.go      |   6 +-
 .../agent/claudesdk/commands_session_test.go  |   2 +-
 .../internal/agent/claudesdk/declaration.go   |   5 +-
 .../agent/claudesdk/declaration_test.go       |   6 -
 .../claudesdk/error_classification_test.go    |   2 +-
 .../claudesdk/execution_controls_test.go      |   4 +-
 .../agent/claudesdk/executor_fixture_test.go  |  22 ++
 .../agent/claudesdk/functions_test.go         |   2 +-
 .../agent/claudesdk/live_linux_test.go        |   6 +-
 .../internal/agent/claudesdk/messages_test.go |   2 +-
 .../agent/claudesdk/readiness_test.go         |   6 +-
 .../agent/claudesdk/restrictions_test.go      |   2 +-
 .../internal/agent/claudesdk/session.go       |  21 --
 .../internal/agent/claudesdk/session_test.go  |   4 +-
 .../internal/agent/claudesdk/steering_test.go |   2 +-
 .../internal/agent/claudesdk/usage_test.go    |   2 +-
 .../agent/claudesdk/workspace_launch_test.go  |   4 +-
 .../claudesdk/workspace_live_linux_test.go    |   2 +-
 .../internal/agent/codex/declaration.go       |   2 +-
 .../internal/agent/codex/declaration_test.go  |   2 +-
 .../agent/codex/mcp_http_preflight_test.go    |   3 +-
 .../internal/agent/codex/mcp_required_test.go |   3 +-
 .../internal/agent/codex/preparation.go       |  14 --
 .../agent/codex/preparation_router_test.go    |   5 +-
 apps/daemon/internal/agent/codex/prepared.go  |   8 -
 .../internal/agent/codex/prepared_test.go     |   4 +-
 apps/daemon/internal/agent/codex/session.go   |  11 +-
 .../internal/agent/configuration_test.go      |  11 +-
 apps/daemon/internal/agent/harness.go         |  41 ++--
 .../internal/agent/mcode/declaration.go       |   2 +-
 .../agent/mcode/environment_mcp_test.go       |   2 +-
 apps/daemon/internal/agent/mcode/executor.go  |   6 +-
 .../internal/agent/mcode/executor_test.go     |  19 +-
 .../internal/agent/mcode/executor_turn.go     |  15 +-
 .../agent/mcode/mcp_observations_test.go      |   2 +-
 .../agent/mcode/native_history_test.go        |  37 +---
 .../internal/agent/mcode/native_test.go       |  12 +-
 apps/daemon/internal/agent/mcode/options.go   |   3 -
 .../internal/agent/mcode/options_test.go      |   3 -
 .../internal/agent/mcode/preparation.go       |   3 +-
 .../internal/agent/mcode/preparation_test.go  |  12 +-
 .../internal/agent/mcode/questions_test.go    |   2 +-
 apps/daemon/internal/agent/mcode/session.go   | 191 ++++--------------
 .../internal/agent/mcode/session_test.go      |  99 ++++++---
 apps/daemon/internal/agent/mcode/steering.go  |  23 +--
 .../internal/agent/mcode/subagent_cancel.go   |  15 --
 .../internal/agent/mcode/subagents_test.go    |   4 +-
 .../agent/mcode/tool_observations_test.go     |   2 +-
 apps/daemon/internal/agent/registry.go        |  36 +---
 apps/daemon/internal/agent/registry_test.go   | 130 ++++--------
 .../internal/cli/connect_cleanup_test.go      |   5 +-
 .../internal/cli/native_discovery_test.go     |  11 +-
 apps/daemon/internal/cli/preparation_test.go  |  10 +-
 .../dispatch/executor_cancel_receipt_test.go  |   4 +-
 .../dispatch/executor_handoff_test.go         |   5 +-
 .../daemon/internal/dispatch/executor_test.go |   8 +-
 .../internal/dispatch/local_directory_test.go |   9 +-
 .../daemon/internal/dispatch/mcp_http_test.go |   5 +-
 .../internal/dispatch/preparation_test.go     |   4 +-
 .../internal/wireconformance/wire_test.go     |   5 +-
 apps/daemon/testdata/onboarding/main.go       |   4 +-
 contracts/agents-api/harness-onboarding.md    |  14 +-
 contracts/agents-api/zh/harness-onboarding.md |  16 +-
 packages/claude-sdk-adapter/README.md         |   4 +-
 65 files changed, 307 insertions(+), 621 deletions(-)

diff --git a/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go b/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
index 7a958ed72..4cbab1ca5 100644
--- a/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/cancellation_live_linux_test.go
@@ -66,7 +66,7 @@ func TestLiveClaudeSDKCancelResume(t *testing.T) {
 		defer cancel()
 		out := make(chan proto.Envelope, 64)
 		request := proto.PromptRequestPayload{RunID: uuid.NewString(), Input: proto.TextInput(prompt), AgentSessionID: resume, ObserveMessages: true, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}, AgentOptions: map[string]any{"model": "MiniMax-M3", "system_prompt": "Follow the user's requested format. Preserve the exact verification value in conversation history. Use no tools."}}
-		running, err := NewFactory(config)(ctx, request, out)
+		running, err := startSingleTurn(ctx, config, request, out)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/apps/daemon/internal/agent/claudesdk/cancellation_test.go b/apps/daemon/internal/agent/claudesdk/cancellation_test.go
index e9d4d2eb2..2ef7efc62 100644
--- a/apps/daemon/internal/agent/claudesdk/cancellation_test.go
+++ b/apps/daemon/internal/agent/claudesdk/cancellation_test.go
@@ -27,7 +27,7 @@ func TestCancellationWaitsForDrainAndPublishesOutcome(t *testing.T) {
 	defer cancel()
 	// A stopped consumer must not prevent native output draining or cancellation.
 	out := make(chan proto.Envelope)
-	running, err := NewFactory(config)(ctx, cancellationRequest(), out)
+	running, err := startSingleTurn(ctx, config, cancellationRequest(), out)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -89,7 +89,7 @@ func TestFailureKeepsOnlyVerifiedNativeIdentity(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 8)
-			running, err := NewFactory(cancellationConfig(root, mode))(ctx, cancellationRequest(), out)
+			running, err := startSingleTurn(ctx, cancellationConfig(root, mode), cancellationRequest(), out)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -125,7 +125,7 @@ func TestCancellationDrainsIntoReadyConsumer(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	out := make(chan proto.Envelope, 16)
-	running, err := NewFactory(config)(ctx, cancellationRequest(), out)
+	running, err := startSingleTurn(ctx, config, cancellationRequest(), out)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/agent/claudesdk/commands_session_test.go b/apps/daemon/internal/agent/claudesdk/commands_session_test.go
index bc62c8540..9789776c0 100644
--- a/apps/daemon/internal/agent/claudesdk/commands_session_test.go
+++ b/apps/daemon/internal/agent/claudesdk/commands_session_test.go
@@ -77,7 +77,7 @@ func TestWorkspaceCommandCancellationAndBridgeFailuresCloseOnlyPendingCalls(t *t
 			req := workspaceRequest()
 			req.AgentSessionID = "native-session"
 			out := make(chan proto.Envelope, 32)
-			s, err := NewFactory(config)(ctx, req, out)
+			s, err := startSingleTurn(ctx, config, req, out)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/declaration.go b/apps/daemon/internal/agent/claudesdk/declaration.go
index 21a643f88..bbe3bdd3a 100644
--- a/apps/daemon/internal/agent/claudesdk/declaration.go
+++ b/apps/daemon/internal/agent/claudesdk/declaration.go
@@ -59,9 +59,7 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, d
 	if entrypoint == "" {
 		return nil
 	}
-	out := &agent.Runtime{Info: descriptor, Session: func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		return nil, fmt.Errorf("claude_sdk: configured runtime is unavailable")
-	}}
+	out := &agent.Runtime{Info: descriptor}
 	var config Config
 
 	fail := func(err error) *agent.Runtime {
@@ -141,7 +139,6 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, d
 		out.Info.Capabilities.MCPHTTPTools, out.Info.Capabilities.MCPHTTPBearerAuth = proto.CapabilityUnsupported, proto.CapabilityUnsupported
 		out.Info.Capabilities.MCPHTTPRequired = proto.CapabilityUnsupported
 	}
-	out.Session = NewFactory(config)
 	out.Executor = NewExecutorFactory(config)
 	if out.Info.Capabilities.LocalEnvironment.IsSupported() {
 		out.Preparation = NewPreparationFactory(config)
diff --git a/apps/daemon/internal/agent/claudesdk/declaration_test.go b/apps/daemon/internal/agent/claudesdk/declaration_test.go
index 149ef8f65..6ff1a6350 100644
--- a/apps/daemon/internal/agent/claudesdk/declaration_test.go
+++ b/apps/daemon/internal/agent/claudesdk/declaration_test.go
@@ -125,12 +125,6 @@ func TestRuntimeDiscoveryConfigurationAndRegistration(t *testing.T) {
 			if info.Capabilities.Preparation.IsSupported() != ready {
 				t.Fatal(info)
 			}
-			if !ready {
-				factory, _ := registry.Resolve("claude_sdk")
-				if _, err := factory(t.Context(), proto.PromptRequestPayload{}, nil); err == nil || !strings.Contains(err.Error(), "runtime is unavailable") {
-					t.Fatal(err)
-				}
-			}
 		}
 	}
 }
diff --git a/apps/daemon/internal/agent/claudesdk/error_classification_test.go b/apps/daemon/internal/agent/claudesdk/error_classification_test.go
index 737d3d173..6ebc1eab2 100644
--- a/apps/daemon/internal/agent/claudesdk/error_classification_test.go
+++ b/apps/daemon/internal/agent/claudesdk/error_classification_test.go
@@ -25,7 +25,7 @@ func TestClassifiedBridgeFailurePreservesTerminalEvidence(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 16)
-			s, err := NewFactory(config)(ctx, req, out)
+			s, err := startSingleTurn(ctx, config, req, out)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/execution_controls_test.go b/apps/daemon/internal/agent/claudesdk/execution_controls_test.go
index 4f79035ce..0381cf750 100644
--- a/apps/daemon/internal/agent/claudesdk/execution_controls_test.go
+++ b/apps/daemon/internal/agent/claudesdk/execution_controls_test.go
@@ -50,7 +50,7 @@ func TestExecutionControlsRejectUnsupportedProfilesBeforeLaunch(t *testing.T) {
 			t.Setenv("OAC_RUNTIME_HOME", root)
 			config := Config{Node: "must-not-run", Entrypoint: filepath.Join(root, "worker"), StateDir: filepath.Join(root, "state")}
 			request := proto.PromptRequestPayload{RunID: "run", Input: proto.TextInput("Original input."), ExecutionControls: &controls, AgentOptions: map[string]any{"model": "native-model"}}
-			_, err := NewFactory(config)(t.Context(), request, make(chan proto.Envelope, 1))
+			_, err := startSingleTurn(t.Context(), config, request, make(chan proto.Envelope, 1))
 			if err == nil || !strings.Contains(err.Error(), "execution controls require") {
 				t.Fatal("unsupported controls did not fail at admission", err)
 			}
@@ -67,7 +67,7 @@ func TestMCPWithoutEnvironmentNoneRejectedBeforeSetup(t *testing.T) {
 	config := Config{Node: "must-not-run", Entrypoint: filepath.Join(root, "worker"), StateDir: filepath.Join(root, "state")}
 	servers := []proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "remote", ServerURL: "https://example.test/mcp"}}
 	request := proto.PromptRequestPayload{RunID: "run", Input: proto.TextInput("Input"), MCPHTTPServers: &servers}
-	_, err := NewFactory(config)(t.Context(), request, make(chan proto.Envelope, 1))
+	_, err := startSingleTurn(t.Context(), config, request, make(chan proto.Envelope, 1))
 	if err == nil || !strings.Contains(err.Error(), "service-origin MCP requires a service execution host") {
 		t.Fatal("MCP reached an unsupported environment", err)
 	}
diff --git a/apps/daemon/internal/agent/claudesdk/executor_fixture_test.go b/apps/daemon/internal/agent/claudesdk/executor_fixture_test.go
index 55768099f..15d683ccf 100644
--- a/apps/daemon/internal/agent/claudesdk/executor_fixture_test.go
+++ b/apps/daemon/internal/agent/claudesdk/executor_fixture_test.go
@@ -4,10 +4,32 @@ package claudesdk
 
 import (
 	"bufio"
+	"context"
 	"encoding/json"
 	"os"
+
+	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
+// startSingleTurn prepares an Executor for one Turn and closes it once that
+// Turn settles, so each test observes the complete native lifecycle.
+func startSingleTurn(ctx context.Context, config Config, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Turn, error) {
+	run, input := req.RunID, req.Input
+	req.RunID, req.Input = "", nil
+	resource, err := NewExecutorFactory(config)(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+	turn, err := resource.StartTurn(ctx, run, input, out)
+	if turn == nil {
+		_ = resource.Close(context.Background())
+		return nil, err
+	}
+	go func() { _, _ = turn.AwaitSettlement(context.Background()); _ = resource.Close(context.Background()) }()
+	return turn, err
+}
+
 func helperTurn(scanner *bufio.Scanner, request *startRequest) (func(bridgeEvent), func()) {
 	_ = json.NewEncoder(os.Stdout).Encode(bridgeEvent{Type: "executor_ready", Protocol: 3})
 	if !scanner.Scan() {
diff --git a/apps/daemon/internal/agent/claudesdk/functions_test.go b/apps/daemon/internal/agent/claudesdk/functions_test.go
index a448790e3..d9c358b83 100644
--- a/apps/daemon/internal/agent/claudesdk/functions_test.go
+++ b/apps/daemon/internal/agent/claudesdk/functions_test.go
@@ -26,7 +26,7 @@ func TestFunctionFactoryNativeReceipts(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 16)
-			running, err := NewFactory(config)(ctx, request, out)
+			running, err := startSingleTurn(ctx, config, request, out)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/live_linux_test.go b/apps/daemon/internal/agent/claudesdk/live_linux_test.go
index 72aff690d..1f534d1a4 100644
--- a/apps/daemon/internal/agent/claudesdk/live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/live_linux_test.go
@@ -142,7 +142,7 @@ func TestLiveClaudeSDKTextResume(t *testing.T) {
 			request.AgentOptions["system_prompt"] = "Call lookup exactly once as requested, then report both result parts and any prior verification value. Never retry a failed tool."
 			request.FunctionTools = []proto.FunctionTool{{Name: "lookup", Description: "Return a synthetic verification value.", Parameters: json.RawMessage(`{"type":"object","properties":{"id":{"type":"string"}},"required":["id"],"additionalProperties":false}`)}}
 		}
-		running, err := NewFactory(config)(ctx, request, out)
+		running, err := startSingleTurn(ctx, config, request, out)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -268,7 +268,7 @@ func TestLiveClaudeSDKTextResume(t *testing.T) {
 				proof.SessionID, _ = payload.Metadata[proto.DoneMetaAgentSessionID].(string)
 			}
 		}
-		// Done reports the Turn outcome; the direct factory closes its Executor
+		// Done reports the Turn outcome; startSingleTurn closes its Executor
 		// after output settlement. Verify release at that boundary.
 		if _, err := s.AwaitSettlement(ctx); err != nil {
 			t.Fatal(err)
@@ -276,7 +276,7 @@ func TestLiveClaudeSDKTextResume(t *testing.T) {
 		select {
 		case <-s.process.Done():
 		case <-time.After(5 * time.Second):
-			t.Fatal("direct factory retained its process after settlement")
+			t.Fatal("single-Turn Executor retained its process after settlement")
 		}
 		if !steeringAt.IsZero() {
 			receipt := <-steeringReply
diff --git a/apps/daemon/internal/agent/claudesdk/messages_test.go b/apps/daemon/internal/agent/claudesdk/messages_test.go
index c0591c668..feaf594e7 100644
--- a/apps/daemon/internal/agent/claudesdk/messages_test.go
+++ b/apps/daemon/internal/agent/claudesdk/messages_test.go
@@ -24,7 +24,7 @@ func TestMessageObservations(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 16)
-			running, err := NewFactory(config)(ctx, request, out)
+			running, err := startSingleTurn(ctx, config, request, out)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/readiness_test.go b/apps/daemon/internal/agent/claudesdk/readiness_test.go
index 49b0d5260..466d6e38e 100644
--- a/apps/daemon/internal/agent/claudesdk/readiness_test.go
+++ b/apps/daemon/internal/agent/claudesdk/readiness_test.go
@@ -25,7 +25,7 @@ func TestRequiredMCPNeedsQualifiedRuntime(t *testing.T) {
 	}}
 	req := proto.PromptRequestPayload{RunID: "run", Input: proto.TextInput("hello"), DisableExecutionEnvironment: true,
 		AgentOptions: map[string]any{"model": "fixture"}, MCPHTTPServers: &[]proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "fixture", ServerURL: "https://example.invalid/mcp", Required: true}}}
-	if _, err := NewFactory(config)(t.Context(), req, make(chan proto.Envelope, 1)); err == nil || err.Error() != "claudesdk: packaged runtime does not support required HTTP MCP" {
+	if _, err := startSingleTurn(t.Context(), config, req, make(chan proto.Envelope, 1)); err == nil || err.Error() != "claudesdk: packaged runtime does not support required HTTP MCP" {
 		t.Fatalf("unqualified runtime executed required MCP: %v", err)
 	}
 }
@@ -46,7 +46,7 @@ func TestHTTPMCPRejectsOldPackagedRuntime(t *testing.T) {
 	}
 	req := proto.PromptRequestPayload{RunID: "run", Input: proto.TextInput("hello"), DisableExecutionEnvironment: true,
 		AgentOptions: map[string]any{"model": "fixture"}, MCPHTTPServers: &[]proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "fixture", ServerURL: "https://example.invalid/mcp"}}}
-	if _, err := NewFactory(config)(t.Context(), req, make(chan proto.Envelope, 1)); err == nil || !strings.Contains(err.Error(), "packaged runtime does not support HTTP MCP") {
+	if _, err := startSingleTurn(t.Context(), config, req, make(chan proto.Envelope, 1)); err == nil || !strings.Contains(err.Error(), "packaged runtime does not support HTTP MCP") {
 		t.Fatalf("old runtime was not rejected before execution: %v", err)
 	}
 }
@@ -83,7 +83,7 @@ func TestMCPBearerRejectsAnonymousOnlyRuntimeWithoutProbeSecrets(t *testing.T) {
 	token := "private-fixture-token"
 	req := proto.PromptRequestPayload{RunID: "run", Input: proto.TextInput("hello"), DisableExecutionEnvironment: true,
 		AgentOptions: map[string]any{"model": "fixture"}, MCPHTTPServers: &[]proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "fixture", ServerURL: "https://example.invalid/mcp", BearerToken: &token}}}
-	if _, err := NewFactory(config)(t.Context(), req, make(chan proto.Envelope, 1)); err == nil || err.Error() != "claudesdk: packaged runtime does not support authenticated HTTP MCP" {
+	if _, err := startSingleTurn(t.Context(), config, req, make(chan proto.Envelope, 1)); err == nil || err.Error() != "claudesdk: packaged runtime does not support authenticated HTTP MCP" {
 		t.Fatalf("old runtime executed authenticated request or readiness received its secret: %v", err)
 	}
 }
diff --git a/apps/daemon/internal/agent/claudesdk/restrictions_test.go b/apps/daemon/internal/agent/claudesdk/restrictions_test.go
index e0b7392de..a574a5009 100644
--- a/apps/daemon/internal/agent/claudesdk/restrictions_test.go
+++ b/apps/daemon/internal/agent/claudesdk/restrictions_test.go
@@ -29,7 +29,7 @@ func TestTextFactoryAcceptsRestrictiveCapabilities(t *testing.T) {
 			ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 16)
-			running, err := NewFactory(config)(ctx, request, out)
+			running, err := startSingleTurn(ctx, config, request, out)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/session.go b/apps/daemon/internal/agent/claudesdk/session.go
index e6dba3fde..cf241ef07 100644
--- a/apps/daemon/internal/agent/claudesdk/session.go
+++ b/apps/daemon/internal/agent/claudesdk/session.go
@@ -33,27 +33,6 @@ type session struct {
 	outcome     proto.DonePayload
 }
 
-func NewFactory(config Config) agent.Factory {
-	prepareExecutor := NewExecutorFactory(config)
-	return func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-		run, input := req.RunID, req.Input
-		req.RunID, req.Input = "", nil
-		resource, err := prepareExecutor(ctx, req)
-		if err != nil {
-			return nil, err
-		}
-		turn, err := resource.StartTurn(ctx, run, input, out)
-		if turn == nil {
-			_ = resource.Close(context.Background())
-			return nil, err
-		}
-		// Factory callers own one execution. Both entrypoints use the same
-		// Executor implementation; Runtime pooling uses NewExecutorFactory.
-		go func() { _, _ = turn.AwaitSettlement(context.Background()); _ = resource.Close(context.Background()) }()
-		return turn, err
-	}
-}
-
 type bridgeEvent struct {
 	EngineErrorCode json.RawMessage `json:"engine_error_code"`
 	TurnID          string          `json:"turn_id"`
diff --git a/apps/daemon/internal/agent/claudesdk/session_test.go b/apps/daemon/internal/agent/claudesdk/session_test.go
index 3ea42c618..30899cfc7 100644
--- a/apps/daemon/internal/agent/claudesdk/session_test.go
+++ b/apps/daemon/internal/agent/claudesdk/session_test.go
@@ -26,7 +26,7 @@ func TestTextFactoryCompletionAndFailures(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 16)
-			s, err := NewFactory(config)(ctx, request, out)
+			s, err := startSingleTurn(ctx, config, request, out)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -88,7 +88,7 @@ func TestTextFactoryRejectsUnsupportedInput(t *testing.T) {
 			case "outside":
 				config.StateDir = filepath.Dir(root)
 			}
-			_, err := NewFactory(config)(context.Background(), request, make(chan proto.Envelope, 1))
+			_, err := startSingleTurn(context.Background(), config, request, make(chan proto.Envelope, 1))
 			if err == nil || !strings.HasPrefix(err.Error(), "claudesdk:") {
 				t.Fatalf("expected pre-launch rejection, got %v", err)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/steering_test.go b/apps/daemon/internal/agent/claudesdk/steering_test.go
index 5f83e13d4..b59f5107f 100644
--- a/apps/daemon/internal/agent/claudesdk/steering_test.go
+++ b/apps/daemon/internal/agent/claudesdk/steering_test.go
@@ -31,7 +31,7 @@ func TestSteeringReceiptsAndLifecycle(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 16)
-			running, err := NewFactory(config)(ctx, request, out)
+			running, err := startSingleTurn(ctx, config, request, out)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/usage_test.go b/apps/daemon/internal/agent/claudesdk/usage_test.go
index 6780ef95d..0c3af818f 100644
--- a/apps/daemon/internal/agent/claudesdk/usage_test.go
+++ b/apps/daemon/internal/agent/claudesdk/usage_test.go
@@ -27,7 +27,7 @@ func TestUsageTransportPreservesSnapshotOnFailureAndDone(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			out := make(chan proto.Envelope, 16)
-			s, err := NewFactory(config)(ctx, request, out)
+			s, err := startSingleTurn(ctx, config, request, out)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_launch_test.go b/apps/daemon/internal/agent/claudesdk/workspace_launch_test.go
index 1f310776d..861312450 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_launch_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_launch_test.go
@@ -41,7 +41,7 @@ esac
 		t.Fatal("readiness did not receive replacement environment", err)
 	}
 	out := make(chan proto.Envelope, 8)
-	s, err := NewFactory(config)(t.Context(), workspaceRequest(), out)
+	s, err := startSingleTurn(t.Context(), config, workspaceRequest(), out)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -64,7 +64,7 @@ esac
 	if err := os.WriteFile(config.Node, []byte(script), 0o700); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := NewFactory(config)(t.Context(), workspaceRequest(), out); err == nil {
+	if _, err := startSingleTurn(t.Context(), config, workspaceRequest(), out); err == nil {
 		t.Fatal("old packaged bridge accepted workspace execution")
 	}
 	if _, err := os.Stat(filepath.Join(config.StateDir, "unexpected-start")); !os.IsNotExist(err) {
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go b/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
index 3acd44b81..d1c1f9417 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
@@ -138,7 +138,7 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 				}
 			}
 		} else {
-			running, err = NewFactory(config)(ctx, req, out)
+			running, err = startSingleTurn(ctx, config, req, out)
 		}
 		if err != nil {
 			if name == "missing-history" && running == nil && strings.Contains(err.Error(), "history_unavailable") {
diff --git a/apps/daemon/internal/agent/codex/declaration.go b/apps/daemon/internal/agent/codex/declaration.go
index 26bb61c4e..2869f9da0 100644
--- a/apps/daemon/internal/agent/codex/declaration.go
+++ b/apps/daemon/internal/agent/codex/declaration.go
@@ -50,7 +50,7 @@ func discover(ctx context.Context, options agent.DiscoveryOptions, info proto.Su
 	return discoverWithCheck(ctx, options, info, CheckCLIAvailable)
 }
 func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, info proto.SupportedAgentKind, check func(context.Context, string) (string, error)) *agent.Runtime {
-	runtime := &agent.Runtime{Info: info, Session: Factory}
+	runtime := &agent.Runtime{Info: info}
 	ctx, cancel := context.WithTimeout(parent, 15*time.Second)
 	defer cancel()
 	version, err := check(ctx, "")
diff --git a/apps/daemon/internal/agent/codex/declaration_test.go b/apps/daemon/internal/agent/codex/declaration_test.go
index b26acf131..b57d13e9a 100644
--- a/apps/daemon/internal/agent/codex/declaration_test.go
+++ b/apps/daemon/internal/agent/codex/declaration_test.go
@@ -49,7 +49,7 @@ func TestDeclaredCapabilityBaseline(t *testing.T) {
 
 func TestUnavailableRuntimeHasNoExecutionFactories(t *testing.T) {
 	runtime := discoverWithCheck(t.Context(), agent.DiscoveryOptions{Stdout: io.Discard, Stderr: io.Discard}, Declaration.Info, func(context.Context, string) (string, error) { return "", errors.New("missing") })
-	if runtime.Info.Available || runtime.Executor != nil || runtime.Preparation != nil || runtime.Session == nil {
+	if runtime.Info.Available || runtime.Executor != nil || runtime.Preparation != nil {
 		t.Fatalf("unavailable runtime: %+v", runtime)
 	}
 }
diff --git a/apps/daemon/internal/agent/codex/mcp_http_preflight_test.go b/apps/daemon/internal/agent/codex/mcp_http_preflight_test.go
index 40c09abdd..20b42094b 100644
--- a/apps/daemon/internal/agent/codex/mcp_http_preflight_test.go
+++ b/apps/daemon/internal/agent/codex/mcp_http_preflight_test.go
@@ -173,10 +173,11 @@ func TestPublicMCPHTTPPreparationChecksBeforeNewAndResumedThread(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			s, err := p.start(t.Context(), "actual-run", proto.TextInput("actual prompt"), make(chan proto.Envelope, 8))
+			started, err := p.Start(t.Context(), "actual-run", proto.TextInput("actual prompt"), make(chan proto.Envelope, 8))
 			if err != nil {
 				t.Fatal(err)
 			}
+			s := started.(*Session)
 			defer s.Cancel(context.Background())
 			frames := waitPreparationMethod(t, root, "turn/start")
 			checked, statuses := false, 0
diff --git a/apps/daemon/internal/agent/codex/mcp_required_test.go b/apps/daemon/internal/agent/codex/mcp_required_test.go
index 44b106a43..18084cc08 100644
--- a/apps/daemon/internal/agent/codex/mcp_required_test.go
+++ b/apps/daemon/internal/agent/codex/mcp_required_test.go
@@ -40,10 +40,11 @@ func TestRequiredMCPWaitsForNativeThreadAndNeverRestartsFailedResume(t *testing.
 			}
 			defer p.Close()
 			out := make(chan proto.Envelope, 16)
-			s, err := p.start(t.Context(), "required-run", proto.TextInput("actual prompt"), out)
+			started, err := p.Start(t.Context(), "required-run", proto.TextInput("actual prompt"), out)
 			if err != nil {
 				t.Fatal(err)
 			}
+			s := started.(*Session)
 			defer s.Cancel(context.Background())
 			waitPreparationMethod(t, root, method)
 			time.Sleep(100 * time.Millisecond)
diff --git a/apps/daemon/internal/agent/codex/preparation.go b/apps/daemon/internal/agent/codex/preparation.go
index 0d3a4bdf9..729934ae9 100644
--- a/apps/daemon/internal/agent/codex/preparation.go
+++ b/apps/daemon/internal/agent/codex/preparation.go
@@ -20,20 +20,6 @@ func Prepare(owner context.Context, req proto.PromptRequestPayload) (*Prepared,
 	return newPreparation(owner, req, defaultSessionConfig())
 }
 
-func newSession(parent context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope, cfg sessionConfig) (*Session, error) {
-	if out == nil {
-		return nil, errors.New("codex: nil out channel")
-	}
-	runID, prompt := req.RunID, req.Input
-	req.RunID, req.Input = "", nil
-	prepared, err := newPreparation(parent, req, cfg)
-	if err != nil {
-		return nil, err
-	}
-	defer prepared.Close()
-	return prepared.start(parent, runID, prompt, out)
-}
-
 func newPreparation(parent context.Context, req proto.PromptRequestPayload, cfg sessionConfig) (*Prepared, error) {
 	if req.ExecutionControls != nil && req.ExecutionControls.OutputFormat != nil {
 		return nil, errors.New("codex: structured output is not qualified")
diff --git a/apps/daemon/internal/agent/codex/preparation_router_test.go b/apps/daemon/internal/agent/codex/preparation_router_test.go
index 660c94504..35f2b64f0 100644
--- a/apps/daemon/internal/agent/codex/preparation_router_test.go
+++ b/apps/daemon/internal/agent/codex/preparation_router_test.go
@@ -4,7 +4,6 @@ import "github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
 
 import (
 	"context"
-	"errors"
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/localworkspace"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentcapabilities"
 	"github.com/google/uuid"
@@ -59,9 +58,7 @@ func TestPreparationRouterRetainsActualNativeChild(t *testing.T) {
 			req.DisableExecutionEnvironment = false
 			req.LocalEnvironment = &proto.LocalEnvironment{ID: environment, WorkspaceDirectory: "/workspace", NetworkAccess: "enabled", CapabilitySources: &agentcapabilities.Input{}}
 			registry := agent.NewRegistry()
-			registry.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-				return nil, errors.New("ordinary Factory must not run")
-			})
+			registry.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 			prepared := make(chan *Prepared, 1)
 			registry.RegisterExecutor("codex", func(ctx context.Context, req proto.PromptRequestPayload) (agent.Executor, error) {
 				e, err := newExecutor(ctx, req, cfg)
diff --git a/apps/daemon/internal/agent/codex/prepared.go b/apps/daemon/internal/agent/codex/prepared.go
index 1f4e049f0..0049ea8e1 100644
--- a/apps/daemon/internal/agent/codex/prepared.go
+++ b/apps/daemon/internal/agent/codex/prepared.go
@@ -30,14 +30,6 @@ var _ agent.PreparedCancellation = (*Prepared)(nil)
 // cancellation after return does not cancel the transferred Session. The original
 // owner context remains its lifetime context. On success the Session owns out.
 func (p *Prepared) Start(ctx context.Context, runID string, prompt proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
-	session, err := p.start(ctx, runID, prompt, out)
-	if err != nil {
-		return nil, err
-	}
-	return session, nil
-}
-
-func (p *Prepared) start(ctx context.Context, runID string, prompt proto.MessageInput, out chan<- proto.Envelope) (*Session, error) {
 	if out == nil || strings.TrimSpace(runID) == "" || prompt.Validate() != nil {
 		return nil, errors.New("codex: start requires a run identity, prompt and output channel")
 	}
diff --git a/apps/daemon/internal/agent/codex/prepared_test.go b/apps/daemon/internal/agent/codex/prepared_test.go
index e729c9613..89d9ab0bf 100644
--- a/apps/daemon/internal/agent/codex/prepared_test.go
+++ b/apps/daemon/internal/agent/codex/prepared_test.go
@@ -169,9 +169,9 @@ func TestPreparedSessionConcurrentStartAndClose(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			<-begin
-			s, err := p.start(t.Context(), "run", proto.TextInput("prompt"), make(chan proto.Envelope, 8))
+			s, err := p.Start(t.Context(), "run", proto.TextInput("prompt"), make(chan proto.Envelope, 8))
 			if err == nil {
-				started <- s
+				started <- s.(*Session)
 			}
 		}()
 	}
diff --git a/apps/daemon/internal/agent/codex/session.go b/apps/daemon/internal/agent/codex/session.go
index 6c72ec886..a69f3944b 100644
--- a/apps/daemon/internal/agent/codex/session.go
+++ b/apps/daemon/internal/agent/codex/session.go
@@ -20,8 +20,8 @@ import (
 // adapter safety net.
 const terminalSendTimeout = 2 * time.Second
 
-// sessionConfig is the cross-cutting knob bag — production callers go
-// through Factory which uses defaults.
+// sessionConfig is the cross-cutting knob bag; production callers use
+// defaultSessionConfig.
 type sessionConfig struct {
 	codexBinary string
 	logger      *slog.Logger
@@ -36,13 +36,6 @@ func defaultSessionConfig() sessionConfig {
 	}
 }
 
-// Factory implements agent.Factory for agent_kind="codex". Spawns one
-// codex app-server child for one Turn. The run stream closes when the turn
-// completes; the child remains until the caller cancels the Session.
-func Factory(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-	return newSession(ctx, req, out, defaultSessionConfig())
-}
-
 // Session implements agent.Session. State lifecycle:
 //
 //  1. Preparation initializes RPC and verifies the selected environment.
diff --git a/apps/daemon/internal/agent/configuration_test.go b/apps/daemon/internal/agent/configuration_test.go
index a186755ce..19d5b8e22 100644
--- a/apps/daemon/internal/agent/configuration_test.go
+++ b/apps/daemon/internal/agent/configuration_test.go
@@ -17,10 +17,7 @@ func TestEveryRegistryEntryPreparesTheBoundModelConfiguration(t *testing.T) {
 	configuration := harnessconfig.Configuration{Providers: []harnessconfig.Provider{{Protocol: "responses"}}}
 	calls := 0
 	expected := errors.New("native entry reached")
-	registry.RegisterKind(proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, configuration, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		calls++
-		return nil, expected
-	})
+	registry.RegisterKind(proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, configuration)
 	registry.RegisterExecutor("fixture", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 		calls++
 		return nil, expected
@@ -30,11 +27,9 @@ func TestEveryRegistryEntryPreparesTheBoundModelConfiguration(t *testing.T) {
 		return nil, expected
 	})
 	configuration.Providers[0].Protocol = "anthropic"
-	factory, _ := registry.Resolve("fixture")
 	executor, _ := registry.ResolveExecutor("fixture")
 	preparation, _ := registry.ResolvePreparation("fixture")
 	entries := []func(proto.PromptRequestPayload) error{
-		func(req proto.PromptRequestPayload) error { _, err := factory(t.Context(), req, nil); return err },
 		func(req proto.PromptRequestPayload) error { _, err := executor(t.Context(), req); return err },
 		func(req proto.PromptRequestPayload) error { _, err := preparation(t.Context(), req); return err },
 	}
@@ -55,7 +50,7 @@ func TestEveryRegistryEntryPreparesTheBoundModelConfiguration(t *testing.T) {
 			t.Fatal("bound declaration was lost or mutated", err)
 		}
 	}
-	if calls != 3 {
+	if calls != 2 {
 		t.Fatal("unexpected native calls", calls)
 	}
 }
@@ -66,5 +61,5 @@ func TestRegistryRejectsInvalidConfigurationDeclaration(t *testing.T) {
 			t.Fatal("invalid configuration registered")
 		}
 	}()
-	agent.NewRegistry().RegisterKind(proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{Providers: []harnessconfig.Provider{{Protocol: "unknown"}}}, stubFactory("fixture"))
+	agent.NewRegistry().RegisterKind(proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{Providers: []harnessconfig.Provider{{Protocol: "unknown"}}})
 }
diff --git a/apps/daemon/internal/agent/harness.go b/apps/daemon/internal/agent/harness.go
index d199aa71f..ee08be11e 100644
--- a/apps/daemon/internal/agent/harness.go
+++ b/apps/daemon/internal/agent/harness.go
@@ -14,8 +14,8 @@
 // Registration: each adapter exports one Declaration. The Runtime discovers the
 // static declaration list and installs each resulting Runtime through Register.
 // Availability and factory selection belong to the adapter. RegisterKind resets
-// the other factories, so Register installs it first. Preparation capabilities
-// are derived from the declared factories.
+// the factories, so Register installs it first. Preparation capabilities are
+// derived from the declared factories.
 //
 // Runtime registration and Core service qualification remain separate. A public
 // Harness also needs a profile in services/core/internal/engine; advertising
@@ -35,7 +35,7 @@ import (
 
 // Declaration is the complete startup contract for a Harness implementation.
 // Discover returns nil when the adapter is not configured. An unavailable
-// configured adapter returns a Runtime with Available=false and a session factory.
+// configured adapter returns a Runtime with Available=false and no factories.
 // Discovery owns runtime-specific configuration, readiness and feature gates.
 type Declaration struct {
 	Info          proto.SupportedAgentKind
@@ -52,7 +52,6 @@ type DiscoveryOptions struct {
 // Runtime binds one discovered descriptor to its native factories.
 type Runtime struct {
 	Info                     proto.SupportedAgentKind
-	Session                  Factory
 	Preparation              PreparationFactory
 	Executor                 ExecutorFactory
 	WorkspaceReadPreparation bool
@@ -63,7 +62,10 @@ func (r *Registry) Register(declaration Declaration, runtime Runtime) {
 	if runtime.Info.Kind != declaration.Info.Kind {
 		panic("agent.Registry.Register: discovery kind differs from declaration")
 	}
-	r.RegisterKind(runtime.Info, declaration.Configuration, runtime.Session)
+	if !runtime.Info.Available && (runtime.Executor != nil || runtime.Preparation != nil) {
+		panic("agent.Registry.Register: unavailable runtime has factories")
+	}
+	r.RegisterKind(runtime.Info, declaration.Configuration)
 	if runtime.Executor != nil {
 		r.RegisterExecutor(runtime.Info.Kind, runtime.Executor)
 	}
@@ -119,8 +121,8 @@ type TurnSettlement struct {
 	Reason   string
 }
 
-// Session is the cancellation and outcome surface shared by direct-call
-// sessions and Turns. Every owner exposes observed state.
+// Session is the cancellation and outcome surface shared by Turn and
+// PreparedCancellation. Every owner exposes observed state.
 // For Executor-owned Turns, AwaitSettlement and Executor.Close define settlement
 // and resource retirement; Cancel alone does not transfer resource ownership.
 type Session interface {
@@ -227,25 +229,16 @@ type PreparedCancellation interface {
 // cleanup remains unconfirmed. The caller must retain and close that resource.
 type PreparationFactory func(context.Context, proto.PromptRequestPayload) (Prepared, error)
 
-// Kind registration and the direct-call factory.
-
-// Factory builds a Session that runs req.Input as req.RunID without an
-// Executor; the router starts every Run through RegisterExecutor instead. out
-// is the channel the agent writes into and closes exactly once after terminal
-// output. ctx is cancelled to wind the session down.
-type Factory func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (Session, error)
+// Kind registration.
 
-// RegisterKind installs f and the heartbeat descriptor for an
-// agent_kind. Callers may set Available=false when an adapter exists
-// but its underlying CLI is not usable.
-func (r *Registry) RegisterKind(info proto.SupportedAgentKind, configuration harnessconfig.Configuration, f Factory) {
+// RegisterKind installs the heartbeat descriptor and model configuration for an
+// agent_kind. Callers may set Available=false when an adapter exists but its
+// underlying CLI is not usable.
+func (r *Registry) RegisterKind(info proto.SupportedAgentKind, configuration harnessconfig.Configuration) {
 	kind := info.Kind
 	if kind == "" {
 		panic("agent.Registry.Register: empty kind")
 	}
-	if f == nil {
-		panic("agent.Registry.Register: nil factory")
-	}
 	if err := configuration.ValidateDeclaration(); err != nil {
 		panic(err)
 	}
@@ -256,12 +249,6 @@ func (r *Registry) RegisterKind(info proto.SupportedAgentKind, configuration har
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	r.configurations[kind] = configuration
-	r.factories[kind] = func(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (Session, error) {
-		if _, err := configuration.Prepare(req.AgentOptions); err != nil {
-			return nil, err
-		}
-		return f(ctx, req, out)
-	}
 	delete(r.preparers, kind)
 	delete(r.executors, kind)
 	info.Capabilities.Preparation = proto.CapabilityUnsupported
diff --git a/apps/daemon/internal/agent/mcode/declaration.go b/apps/daemon/internal/agent/mcode/declaration.go
index c97e57bea..b3f257ad7 100644
--- a/apps/daemon/internal/agent/mcode/declaration.go
+++ b/apps/daemon/internal/agent/mcode/declaration.go
@@ -47,7 +47,7 @@ func discover(ctx context.Context, options agent.DiscoveryOptions, info proto.Su
 	return discoverWithCheck(ctx, options, info, CheckCLIAvailable)
 }
 func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, result proto.SupportedAgentKind, check func(context.Context, string) (string, error)) *agent.Runtime {
-	runtime := &agent.Runtime{Info: result, Session: Factory}
+	runtime := &agent.Runtime{Info: result}
 
 	ctx, cancel := context.WithTimeout(parent, 15*time.Second)
 	defer cancel()
diff --git a/apps/daemon/internal/agent/mcode/environment_mcp_test.go b/apps/daemon/internal/agent/mcode/environment_mcp_test.go
index aa143e5aa..564227bdb 100644
--- a/apps/daemon/internal/agent/mcode/environment_mcp_test.go
+++ b/apps/daemon/internal/agent/mcode/environment_mcp_test.go
@@ -219,7 +219,7 @@ func TestEnvironmentHTTPMCPUsesEphemeralACPConfiguration(t *testing.T) {
 		} else if len(server.Headers) != 0 {
 			t.Fatal("anonymous MCP inherited credentials")
 		}
-		dataDir := resource.(*prepared).session.opts.DataDir
+		dataDir := resource.(*prepared).executor.opts.DataDir
 		for _, name := range []string{"config.yaml", "mcp.json", "workspace-profile.json"} {
 			body, err := os.ReadFile(filepath.Join(dataDir, name))
 			if err != nil && !os.IsNotExist(err) {
diff --git a/apps/daemon/internal/agent/mcode/executor.go b/apps/daemon/internal/agent/mcode/executor.go
index 1f9ecf907..33ea18ed9 100644
--- a/apps/daemon/internal/agent/mcode/executor.go
+++ b/apps/daemon/internal/agent/mcode/executor.go
@@ -63,7 +63,7 @@ func NewExecutorFactory(config *WorkspaceConfig) agent.ExecutorFactory {
 }
 
 func newExecutor(ctx context.Context, req proto.PromptRequestPayload, opts launchOptions, binary string) (*executor, error) {
-	bootstrap, err := launch(ctx, req, opts, binary, nil)
+	bootstrap, err := launch(ctx, req, opts, binary)
 	if err != nil {
 		return nil, err
 	}
@@ -126,14 +126,14 @@ func (e *executor) StartTurn(ctx context.Context, runID string, input proto.Mess
 	default:
 	}
 	req := e.req
-	req.RunID, req.Input = runID, proto.TextInput(text)
+	req.RunID = runID
 	s := newTurnSession(e.connection.process.Context(), req, e.opts, e.connection, out)
 	s.executor, s.sessionID, s.nativeModel = e, e.nativeSession, e.model
 	s.settled, s.inputDone = make(chan struct{}), make(chan struct{})
 	s.outputContext, s.outputCancel = context.WithCancel(context.Background())
 	e.active = s
 	e.connection.setCurrent(s)
-	go s.runExecutorTurn()
+	go s.runExecutorTurn(text)
 	go func() {
 		select {
 		case <-ctx.Done():
diff --git a/apps/daemon/internal/agent/mcode/executor_test.go b/apps/daemon/internal/agent/mcode/executor_test.go
index 52d7bdbd5..979958263 100644
--- a/apps/daemon/internal/agent/mcode/executor_test.go
+++ b/apps/daemon/internal/agent/mcode/executor_test.go
@@ -189,12 +189,21 @@ func TestExecutorCancellationRetiresOwnerAndLateCancelCannotRetarget(t *testing.
 func TestExecutorStartFailureOwnership(t *testing.T) {
 	t.Run("validation", func(t *testing.T) {
 		e, record := executorFixture(t, "executor-reuse", true)
-		out := make(chan proto.Envelope, 1)
-		turn, err := e.StartTurn(t.Context(), "", proto.TextInput("invalid"), out)
-		if err == nil || turn != nil {
-			t.Fatal("invalid Start acquired output")
+		image := "data:image/png;base64,iVBORw0KGgo="
+		for _, invalid := range []struct {
+			id, reason string
+			input      proto.MessageInput
+		}{
+			{"", "requires live context, identity", proto.TextInput("invalid")},
+			{"attachment", "does not support image input", proto.MessageInput{{Content: []proto.InputContent{{Type: "input_image", ImageURL: &image}}}}},
+		} {
+			out := make(chan proto.Envelope, 1)
+			turn, err := e.StartTurn(t.Context(), invalid.id, invalid.input, out)
+			if err == nil || turn != nil || !strings.Contains(err.Error(), invalid.reason) {
+				t.Fatal("invalid Start acquired output", err)
+			}
+			close(out)
 		}
-		close(out)
 		raw, _ := os.ReadFile(record)
 		if strings.Contains(string(raw), "session/prompt") {
 			t.Fatal("invalid input was sent")
diff --git a/apps/daemon/internal/agent/mcode/executor_turn.go b/apps/daemon/internal/agent/mcode/executor_turn.go
index 1633f5f18..e9e2dcc17 100644
--- a/apps/daemon/internal/agent/mcode/executor_turn.go
+++ b/apps/daemon/internal/agent/mcode/executor_turn.go
@@ -10,10 +10,10 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func (s *Session) runExecutorTurn() {
+func (s *Session) runExecutorTurn(prompt string) {
 	err := s.captureSubagentBaseline()
 	if err == nil {
-		err = s.executePrompt()
+		err = s.executePrompt(prompt)
 	}
 	if errors.Is(err, errTurnCancelled) {
 		err = nil
@@ -26,11 +26,7 @@ func (s *Session) runExecutorTurn() {
 	// prompt completion. No successor starts until all callers have settled.
 	s.operations.Wait()
 	if !s.req.DisableSubagents && s.subagentHistoryReady {
-		childErr := s.settleSubagents()
-		s.mu.Lock()
-		s.subagentSettlementError = childErr
-		s.mu.Unlock()
-		if childErr != nil {
+		if childErr := s.settleSubagents(); childErr != nil {
 			err = childErr
 		}
 	}
@@ -99,9 +95,6 @@ func (s *Session) captureSubagentBaseline() error {
 }
 
 func (s *Session) AwaitSettlement(ctx context.Context) (agent.TurnSettlement, error) {
-	if s.settled == nil {
-		return agent.TurnSettlement{}, fmt.Errorf("mcode: Turn has no Executor owner")
-	}
 	select {
 	case <-s.settled:
 		return s.settlement, s.settlementErr
@@ -110,7 +103,7 @@ func (s *Session) AwaitSettlement(ctx context.Context) (agent.TurnSettlement, er
 	}
 }
 
-func (s *Session) cancelTurn(ctx context.Context) error {
+func (s *Session) Cancel(ctx context.Context) error {
 	e := s.executor
 	e.mu.Lock()
 	if e.active != s {
diff --git a/apps/daemon/internal/agent/mcode/mcp_observations_test.go b/apps/daemon/internal/agent/mcode/mcp_observations_test.go
index 61e090a6b..9f613f1a9 100644
--- a/apps/daemon/internal/agent/mcode/mcp_observations_test.go
+++ b/apps/daemon/internal/agent/mcode/mcp_observations_test.go
@@ -14,7 +14,7 @@ import (
 func mcpObservationSession(t *testing.T) (*Session, chan proto.Envelope) {
 	t.Helper()
 	out := make(chan proto.Envelope, 16)
-	s := &Session{ctx: context.Background(), opts: launchOptions{DataDir: t.TempDir()},
+	s := &Session{ctx: context.Background(), outputContext: context.Background(), opts: launchOptions{DataDir: t.TempDir()},
 		req: proto.PromptRequestPayload{RunID: "run",
 			LocalEnvironment: &proto.LocalEnvironment{NetworkAccess: "enabled", MCP: []proto.EnvironmentMCP{environmentMCPFixture()}}},
 		out: out, tools: map[string]toolUpdate{}, completedTools: map[string]bool{}, active: true, sessionID: "native-session"}
diff --git a/apps/daemon/internal/agent/mcode/native_history_test.go b/apps/daemon/internal/agent/mcode/native_history_test.go
index d49061554..dc34007b5 100644
--- a/apps/daemon/internal/agent/mcode/native_history_test.go
+++ b/apps/daemon/internal/agent/mcode/native_history_test.go
@@ -7,12 +7,11 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
 // A successful public real-model run supplies an actual foreign native ID.
-// Neither that history nor a missing ID may silently become a new session.
+// Neither that history nor a missing ID may prepare an Executor, so no Turn can
+// run against it or silently replace it with a new session.
 func TestNativeMCodeHistoryIsolation(t *testing.T) {
 	binary, options, foreign := os.Getenv("OAC_RUNTIME_MCODE_BIN"), os.Getenv("OAC_TEST_MCODE_REAL_OPTIONS"), os.Getenv("OAC_TEST_MCODE_FOREIGN_NATIVE_ID")
 	if binary == "" || options == "" || foreign == "" {
@@ -28,37 +27,11 @@ func TestNativeMCodeHistoryIsolation(t *testing.T) {
 			if json.Unmarshal(raw, &req.AgentOptions) != nil {
 				t.Fatal("invalid private options")
 			}
-			req.AgentSessionID, req.Input = id, proto.TextInput("This input must never execute.")
+			req.AgentSessionID = id
 			ctx, cancel := context.WithTimeout(t.Context(), 90*time.Second)
 			defer cancel()
-			out := make(chan proto.Envelope, 64)
-			session, err := newSession(ctx, req, out, binary)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer func() {
-				cleanup, stop := context.WithTimeout(context.Background(), 10*time.Second)
-				defer stop()
-				if err := session.Cancel(cleanup); err != nil {
-					t.Error(err)
-				}
-			}()
-			rejected := false
-			for event := range out {
-				if event.Type == proto.TypeError {
-					var failure proto.ErrorPayload
-					_ = json.Unmarshal(event.Payload, &failure)
-					rejected = strings.Contains(failure.Error, "session/load:") && !strings.Contains(failure.Error, "deadline exceeded")
-				}
-				if event.Type == proto.TypeDone {
-					var done proto.DonePayload
-					_ = json.Unmarshal(event.Payload, &done)
-					if done.Content != "" || done.Metadata[proto.DoneMetaAgentSessionID] != nil {
-						t.Fatal("unowned history executed or silently replaced")
-					}
-				}
-			}
-			if !rejected {
+			e, err := prepareExecutor(t, ctx, req)
+			if e != nil || err == nil || !strings.Contains(err.Error(), "session/load:") || strings.Contains(err.Error(), "deadline exceeded") {
 				t.Fatal("native history was not explicitly rejected")
 			}
 		})
diff --git a/apps/daemon/internal/agent/mcode/native_test.go b/apps/daemon/internal/agent/mcode/native_test.go
index 042f577de..d1fcc2cd2 100644
--- a/apps/daemon/internal/agent/mcode/native_test.go
+++ b/apps/daemon/internal/agent/mcode/native_test.go
@@ -22,6 +22,7 @@ func TestNativeMCodeACP(t *testing.T) {
 		t.Skip("set OAC_TEST_MCODE_INTEGRATION_BIN to run native ACP smoke test")
 	}
 	req := testRequest(t)
+	t.Setenv("OAC_RUNTIME_MCODE_BIN", binary)
 	var mu sync.Mutex
 	var requests []string
 	model := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -44,18 +45,9 @@ func TestNativeMCodeACP(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 		t.Cleanup(cancel)
 		out := make(chan proto.Envelope, 64)
-		session, err := newSession(ctx, req, out, binary)
-		if err != nil {
+		if _, err := startTurn(t, ctx, req, out); err != nil {
 			t.Fatal(err)
 		}
-		t.Cleanup(func() {
-			_ = session.Cancel(context.Background())
-			select {
-			case <-session.exited:
-			case <-time.After(5 * time.Second):
-				t.Error("native CLI did not stop")
-			}
-		})
 		var done proto.DonePayload
 		for event := range out {
 			if event.Type == proto.TypeError {
diff --git a/apps/daemon/internal/agent/mcode/options.go b/apps/daemon/internal/agent/mcode/options.go
index 50926a7c8..6fc7e3492 100644
--- a/apps/daemon/internal/agent/mcode/options.go
+++ b/apps/daemon/internal/agent/mcode/options.go
@@ -26,9 +26,6 @@ func prepareOptions(req proto.PromptRequestPayload) (launchOptions, error) {
 	if err := validateExecutionRequest(req); err != nil {
 		return result, err
 	}
-	if req.Input.HasImages() {
-		return result, fmt.Errorf("mcode: ACP does not support attachments")
-	}
 	dataDir, err := agent.StateDir("mcode", req.AgentStateKey)
 	if err != nil {
 		return result, err
diff --git a/apps/daemon/internal/agent/mcode/options_test.go b/apps/daemon/internal/agent/mcode/options_test.go
index e5d399ed1..1ae1d7780 100644
--- a/apps/daemon/internal/agent/mcode/options_test.go
+++ b/apps/daemon/internal/agent/mcode/options_test.go
@@ -68,9 +68,6 @@ func TestOptionsRejectDroppedContext(t *testing.T) {
 		edit func(*proto.PromptRequestPayload)
 	}{
 		{"oversized instructions", func(r *proto.PromptRequestPayload) { r.AgentOptions["system_prompt"] = strings.Repeat("x", 32*1024+1) }},
-		{"attachment", func(r *proto.PromptRequestPayload) {
-			r.Input = proto.MessageInput{{Content: []proto.InputContent{{Type: "input_image"}}}}
-		}},
 		{"missing model", func(r *proto.PromptRequestPayload) { delete(r.AgentOptions, "model") }},
 		{"missing provider", func(r *proto.PromptRequestPayload) { delete(r.AgentOptions, "model_provider") }},
 	}
diff --git a/apps/daemon/internal/agent/mcode/preparation.go b/apps/daemon/internal/agent/mcode/preparation.go
index 1366cb5ba..f4b00ed1d 100644
--- a/apps/daemon/internal/agent/mcode/preparation.go
+++ b/apps/daemon/internal/agent/mcode/preparation.go
@@ -28,8 +28,7 @@ func NewPreparationFactory(config WorkspaceConfig) agent.PreparationFactory {
 			}
 			return nil, err
 		}
-		e := value.(*executor)
-		return &prepared{executor: e, session: newTurnSession(ctx, req, e.opts, e.connection, nil)}, nil
+		return &prepared{executor: value.(*executor)}, nil
 	}
 }
 
diff --git a/apps/daemon/internal/agent/mcode/preparation_test.go b/apps/daemon/internal/agent/mcode/preparation_test.go
index 3f0a42502..92b9a2aa0 100644
--- a/apps/daemon/internal/agent/mcode/preparation_test.go
+++ b/apps/daemon/internal/agent/mcode/preparation_test.go
@@ -47,7 +47,7 @@ func TestPreparedWorkspaceHasOneInputAndOutputOwner(t *testing.T) {
 	if err != nil || strings.Contains(string(raw), "session/prompt") {
 		t.Fatalf("preparation consumed input: %q %v", raw, err)
 	}
-	if p.session.opts.Dir != r.LocalEnvironment.WorkspaceRoot || p.session.opts.DataDir == r.LocalEnvironment.WorkspaceRoot {
+	if p.executor.opts.Dir != r.LocalEnvironment.WorkspaceRoot || p.executor.opts.DataDir == r.LocalEnvironment.WorkspaceRoot {
 		t.Fatal("native cwd must use the workspace without moving Session state")
 	}
 	out := make(chan proto.Envelope)
@@ -86,7 +86,7 @@ func TestPreparedWorkspaceHasOneInputAndOutputOwner(t *testing.T) {
 		if e.Type == proto.TypeDone {
 			done++
 			select {
-			case <-p.session.exited:
+			case <-p.executor.connection.exited:
 				t.Fatal("successful Turn disposed the reusable native owner")
 			default:
 			}
@@ -136,9 +136,9 @@ func TestPreparedSubagentsReleaseUnusedOwner(t *testing.T) {
 				t.Fatal(err)
 			}
 			p := resource.(*prepared)
-			// The fixture only implements preparation. Enable execution cancellation's
-			// child branch after initialization to verify unused owners never enter it.
-			p.session.req.DisableSubagents = false
+			// The fixture only implements preparation. Enable the owner's child
+			// branch after initialization to verify unused owners never enter it.
+			p.executor.req.DisableSubagents = false
 			ended := make(chan error, 1)
 			go func() {
 				if method == "close" {
@@ -153,7 +153,7 @@ func TestPreparedSubagentsReleaseUnusedOwner(t *testing.T) {
 					t.Fatal(err)
 				}
 			case <-ctx.Done():
-				p.session.process.Cancel()
+				p.executor.connection.process.Cancel()
 				t.Fatal("unused owner did not close")
 			}
 			raw, err := os.ReadFile(record)
diff --git a/apps/daemon/internal/agent/mcode/questions_test.go b/apps/daemon/internal/agent/mcode/questions_test.go
index c46562977..858658e6c 100644
--- a/apps/daemon/internal/agent/mcode/questions_test.go
+++ b/apps/daemon/internal/agent/mcode/questions_test.go
@@ -19,7 +19,7 @@ func TestQuestionnaireOtherUsesOneQuestion(t *testing.T) {
 		properties := map[string]formProperty{"region": property, "region__other": {Type: "string", Title: "Region? — Other"}}
 		params, _ := json.Marshal(map[string]any{"sessionId": "native-1", "mode": "form", "requestedSchema": map[string]any{"type": "object", "properties": properties}})
 		out := make(chan proto.Envelope, 1)
-		session := &Session{ctx: t.Context(), sessionID: "native-1", out: out, questions: map[string]pendingQuestion{}}
+		session := &Session{ctx: t.Context(), outputContext: t.Context(), sessionID: "native-1", out: out, questions: map[string]pendingQuestion{}}
 		if err := session.askQuestion(rpcFrame{ID: json.RawMessage(`1`), Params: params}); err != nil {
 			t.Fatal(err)
 		}
diff --git a/apps/daemon/internal/agent/mcode/session.go b/apps/daemon/internal/agent/mcode/session.go
index 741f9a3d9..95a0c3d09 100644
--- a/apps/daemon/internal/agent/mcode/session.go
+++ b/apps/daemon/internal/agent/mcode/session.go
@@ -21,71 +21,47 @@ type Session struct {
 	req  proto.PromptRequestPayload
 	opts launchOptions
 	*connection
-	executor                *executor
-	settlement              agent.TurnSettlement
-	settlementErr           error
-	settled                 chan struct{}
-	inputDone               chan struct{}
-	outputCancel            context.CancelFunc
-	operations              sync.WaitGroup
-	closing                 bool
-	cancelled               bool
-	inputUncertain          bool
-	out                     chan<- proto.Envelope
-	frames                  chan rpcFrame
-	finished                chan struct{}
-	mu                      sync.Mutex
-	sessionID               string
-	nativeModel             string
-	outputContext           context.Context
-	outcome                 proto.DonePayload
-	permissions             map[string]pendingPermission
-	questions               map[string]pendingQuestion
-	steeringReady           bool
-	steeringTurn            string
-	sequence                uint64
-	active                  bool
-	content                 strings.Builder
-	tools                   map[string]toolUpdate
-	completedTools          map[string]bool
-	previousNativeTurns     map[string]bool
-	subagentSettlementError error
-	rootCompletedAtMS       *int64
-	subagentHistoryReady    bool
+	executor             *executor
+	settlement           agent.TurnSettlement
+	settlementErr        error
+	settled              chan struct{}
+	inputDone            chan struct{}
+	outputCancel         context.CancelFunc
+	operations           sync.WaitGroup
+	closing              bool
+	cancelled            bool
+	inputUncertain       bool
+	out                  chan<- proto.Envelope
+	frames               chan rpcFrame
+	finished             chan struct{}
+	mu                   sync.Mutex
+	sessionID            string
+	nativeModel          string
+	outputContext        context.Context
+	outcome              proto.DonePayload
+	permissions          map[string]pendingPermission
+	questions            map[string]pendingQuestion
+	steeringReady        bool
+	steeringTurn         string
+	sequence             uint64
+	active               bool
+	content              strings.Builder
+	tools                map[string]toolUpdate
+	completedTools       map[string]bool
+	previousNativeTurns  map[string]bool
+	rootCompletedAtMS    *int64
+	subagentHistoryReady bool
 }
 
 var _ agent.Session = (*Session)(nil)
 
-func Factory(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (agent.Session, error) {
-	return newSession(ctx, req, out, defaultBinary())
-}
-
-func newSession(ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope, binary string) (*Session, error) {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	if out == nil {
-		return nil, fmt.Errorf("mcode: output channel is required")
-	}
-	opts, err := prepareOptions(req)
-	if err != nil {
-		return nil, err
-	}
-	s, err := launch(ctx, req, opts, binary, out)
-	if err != nil {
-		return nil, err
-	}
-	go s.run()
-	return s, nil
-}
-
-func launch(ctx context.Context, req proto.PromptRequestPayload, opts launchOptions, binary string, out chan<- proto.Envelope) (*Session, error) {
+func launch(ctx context.Context, req proto.PromptRequestPayload, opts launchOptions, binary string) (*Session, error) {
 	process, err := clirunner.Start(clirunner.StartOptions{Parent: ctx, Binary: binary, Args: []string{"acp"}, Dir: opts.Dir, Env: opts.Env, NeedStdin: true})
 	if err != nil {
 		return nil, err
 	}
 	c := &connection{process: process, exited: make(chan struct{}), responses: map[string]chan rpcFrame{}}
-	s := newTurnSession(ctx, req, opts, c, out)
+	s := newTurnSession(ctx, req, opts, c, nil)
 	c.current = s
 	go c.read()
 	return s, nil
@@ -95,69 +71,6 @@ func newTurnSession(ctx context.Context, req proto.PromptRequestPayload, opts la
 	return &Session{ctx: ctx, req: req, opts: opts, connection: c, out: out, frames: make(chan rpcFrame, 32), finished: make(chan struct{}), permissions: map[string]pendingPermission{}, questions: map[string]pendingQuestion{}, tools: map[string]toolUpdate{}, completedTools: map[string]bool{}}
 }
 
-func (s *Session) run() {
-	defer func() {
-		if s.out != nil {
-			close(s.out)
-		}
-	}()
-	defer close(s.finished)
-	err := s.prepareNative()
-	if err == nil {
-		if !s.req.DisableSubagents {
-			var snapshot nativeSubagentSnapshot
-			snapshot, err = s.readSubagents(s.ctx)
-			s.subagentHistoryReady = err == nil
-			s.previousNativeTurns = map[string]bool{}
-			for _, session := range snapshot.Sessions {
-				if session.ID == s.sessionID {
-					for _, turn := range session.Turns {
-						s.previousNativeTurns[turn.ID] = true
-					}
-				}
-			}
-		}
-	}
-	if err == nil {
-		err = s.executePrompt()
-	}
-	if !s.req.DisableSubagents && s.subagentHistoryReady && s.out != nil {
-		observationErr := s.settleSubagents()
-		s.mu.Lock()
-		s.subagentSettlementError = observationErr
-		s.mu.Unlock()
-		if observationErr != nil {
-			err = observationErr
-		}
-	}
-	if err != nil {
-		s.process.Cancel()
-		<-s.exited
-	}
-	s.finishEnvironmentMCP()
-	if s.out == nil {
-		return
-	}
-	s.mu.Lock()
-	s.steeringReady = false
-	s.mu.Unlock()
-	if err != nil {
-		s.process.Cancel()
-		s.emit(proto.TypeError, proto.ErrorPayload{Error: err.Error()})
-	}
-	s.mu.Lock()
-	sessionID := s.sessionID
-	s.permissions = map[string]pendingPermission{}
-	s.questions = map[string]pendingQuestion{}
-	s.mu.Unlock()
-	metadata := map[string]any{proto.DoneMetaAgentSessionType: "mcode"}
-	if sessionID != "" {
-		metadata[proto.DoneMetaAgentSessionID] = sessionID
-	}
-	// ACP context usage is not per-turn token usage; do not record it as spend.
-	s.emit(proto.TypeDone, proto.DonePayload{Content: s.content.String(), Metadata: metadata, SourceCompletedAtMS: s.rootCompletedAtMS})
-}
-
 func (s *Session) prepareNative() error {
 	var initialized struct {
 		ProtocolVersion int `json:"protocolVersion"`
@@ -212,16 +125,12 @@ func (s *Session) prepareNative() error {
 	return nil
 }
 
-func (s *Session) executePrompt() error {
-	prompt, err := s.req.Input.TextOnly()
-	if err != nil {
-		return err
-	}
+func (s *Session) executePrompt(prompt string) error {
 	s.active = true
 	var result struct {
 		StopReason string `json:"stopReason"`
 	}
-	err = s.call("session/prompt", map[string]any{"sessionId": s.sessionID, "prompt": promptContent(prompt)}, &result, true)
+	err := s.call("session/prompt", map[string]any{"sessionId": s.sessionID, "prompt": promptContent(prompt)}, &result, true)
 	s.active = false
 	s.mu.Lock()
 	s.steeringReady = false
@@ -275,7 +184,7 @@ func (s *Session) call(method string, params any, result any, prompt bool) error
 	if err != nil {
 		return err
 	}
-	if prompt && s.executor != nil {
+	if prompt {
 		// Serialize the admission check with the wire, but release the owner
 		// mutex before a pipe write so cancellation and Close can stop it.
 		s.connection.writeMu.Lock()
@@ -337,10 +246,6 @@ func (s *Session) call(method string, params any, result any, prompt bool) error
 }
 
 func (s *Session) emit(kind string, payload any) {
-	ctx := s.ctx
-	if s.outputContext != nil {
-		ctx = s.outputContext
-	}
 	env, err := proto.NewEnvelope(kind, s.req.RunID, payload)
 	if err != nil {
 		return
@@ -352,31 +257,7 @@ func (s *Session) emit(kind string, payload any) {
 	}
 	select {
 	case s.out <- env:
-	case <-ctx.Done():
-	}
-}
-
-func (s *Session) Cancel(ctx context.Context) error {
-	if s.executor != nil {
-		return s.cancelTurn(ctx)
-	}
-	if !s.req.DisableSubagents {
-		if err := s.cancelSubagents(ctx); err != nil {
-			s.process.Cancel()
-			return err
-		}
-	}
-	s.process.Cancel()
-	select {
-	case <-s.exited:
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-	select {
-	case <-s.finished:
-		return nil
-	case <-ctx.Done():
-		return ctx.Err()
+	case <-s.outputContext.Done():
 	}
 }
 
diff --git a/apps/daemon/internal/agent/mcode/session_test.go b/apps/daemon/internal/agent/mcode/session_test.go
index 5012b1268..ae435c344 100644
--- a/apps/daemon/internal/agent/mcode/session_test.go
+++ b/apps/daemon/internal/agent/mcode/session_test.go
@@ -23,7 +23,8 @@ func testRequest(t *testing.T) proto.PromptRequestPayload {
 	}, DisableExecutionEnvironment: true, DisableSubagents: true, ExecutionControls: &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium"}}
 }
 
-func helperSession(t *testing.T, scenario string, resume bool) (*Session, <-chan proto.Envelope) {
+// helperRequest selects a protocol fixture scenario as the native CLI.
+func helperRequest(t *testing.T, scenario string, resume bool) proto.PromptRequestPayload {
 	t.Helper()
 	req := testRequest(t)
 	if resume {
@@ -39,21 +40,54 @@ func helperSession(t *testing.T, scenario string, resume bool) (*Session, <-chan
 	if err := os.WriteFile(binary, []byte(script), 0700); err != nil {
 		t.Fatal(err)
 	}
+	t.Setenv("OAC_RUNTIME_MCODE_BIN", binary)
+	return req
+}
+
+// prepareExecutor prepares req without its Turn input; cleanup closes the
+// Executor and reaps its CLI.
+func prepareExecutor(t *testing.T, ctx context.Context, req proto.PromptRequestPayload) (*executor, error) {
+	t.Helper()
+	req.RunID, req.Input = "", nil
+	value, err := NewExecutorFactory(nil)(ctx, req)
+	if value == nil {
+		return nil, err
+	}
+	e := value.(*executor)
+	t.Cleanup(func() {
+		cleanup, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+		defer cancel()
+		if err := e.Close(cleanup); err != nil {
+			t.Error("CLI was not reaped:", err)
+		}
+	})
+	return e, err
+}
+
+// startTurn prepares an Executor for req and starts req.Input as its Turn.
+func startTurn(t *testing.T, ctx context.Context, req proto.PromptRequestPayload, out chan<- proto.Envelope) (*Session, error) {
+	t.Helper()
+	e, err := prepareExecutor(t, ctx, req)
+	if err != nil {
+		return nil, err
+	}
+	turn, err := e.StartTurn(ctx, req.RunID, req.Input, out)
+	if err != nil {
+		return nil, err
+	}
+	return turn.(*Session), nil
+}
+
+func helperSession(t *testing.T, scenario string, resume bool) (*Session, <-chan proto.Envelope) {
+	t.Helper()
+	req := helperRequest(t, scenario, resume)
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	t.Cleanup(cancel)
 	out := make(chan proto.Envelope, 32)
-	session, err := newSession(ctx, req, out, binary)
+	session, err := startTurn(t, ctx, req, out)
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Cleanup(func() {
-		_ = session.Cancel(context.Background())
-		select {
-		case <-session.exited:
-		case <-time.After(3 * time.Second):
-			t.Error("CLI was not reaped")
-		}
-	})
 	return session, out
 }
 
@@ -148,34 +182,41 @@ func TestResumeSelectsModelWhenNativeSelectorIsMissing(t *testing.T) {
 }
 
 func TestSessionFailuresAreReported(t *testing.T) {
-	for _, scenario := range []string{"malformed", "exit", "rpc-error", "unknown-model"} {
+	for _, scenario := range []string{"malformed", "exit", "unknown-model"} {
 		t.Run(scenario, func(t *testing.T) {
-			_, out := helperSession(t, scenario, false)
-			reported := false
-			for event := range out {
-				if event.Type == proto.TypeError {
-					reported = true
-				}
-			}
-			if !reported {
-				t.Fatal("failure was not emitted")
+			ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
+			defer cancel()
+			if e, err := prepareExecutor(t, ctx, helperRequest(t, scenario, false)); err == nil || e != nil {
+				t.Fatal("preparation failure was not reported", err)
 			}
 		})
 	}
+	t.Run("rpc-error", func(t *testing.T) {
+		_, out := helperSession(t, "rpc-error", false)
+		reported := false
+		for event := range out {
+			if event.Type == proto.TypeError {
+				reported = true
+			}
+		}
+		if !reported {
+			t.Fatal("failure was not emitted")
+		}
+	})
 }
 
-func TestCancelStopsWaitingCLI(t *testing.T) {
-	session, out := helperSession(t, "hang", false)
-	if err := session.Cancel(context.Background()); err != nil {
-		t.Fatal(err)
+func TestPreparationCancellationStopsWaitingCLI(t *testing.T) {
+	req := helperRequest(t, "hang", false)
+	ctx, cancel := context.WithCancel(t.Context())
+	defer cancel()
+	time.AfterFunc(100*time.Millisecond, cancel)
+	started := time.Now()
+	if e, err := prepareExecutor(t, ctx, req); err == nil || e != nil {
+		t.Fatal("cancelled preparation retained the CLI", err)
 	}
-	select {
-	case <-session.exited:
-	case <-time.After(3 * time.Second):
+	if time.Since(started) > 3*time.Second {
 		t.Fatal("cancel hung")
 	}
-	for range out {
-	}
 }
 
 func TestMCodeProcess(t *testing.T) {
diff --git a/apps/daemon/internal/agent/mcode/steering.go b/apps/daemon/internal/agent/mcode/steering.go
index bff6f079f..005f5c859 100644
--- a/apps/daemon/internal/agent/mcode/steering.go
+++ b/apps/daemon/internal/agent/mcode/steering.go
@@ -18,16 +18,14 @@ func (s *Session) Steer(ctx context.Context, input proto.PromptSteerPayload) err
 
 // Native acceptance belongs to the active ACP Turn; it does not promise model consumption.
 func (s *Session) SteerWithReceipt(ctx context.Context, input proto.PromptSteerPayload, written func()) error {
-	if s.executor != nil {
-		s.mu.Lock()
-		if s.closing || s.cancelled {
-			s.mu.Unlock()
-			return agent.ErrSteeringInactive
-		}
-		s.operations.Add(1)
+	s.mu.Lock()
+	if s.closing || s.cancelled {
 		s.mu.Unlock()
-		defer s.operations.Done()
+		return agent.ErrSteeringInactive
 	}
+	s.operations.Add(1)
+	s.mu.Unlock()
+	defer s.operations.Done()
 	text, err := input.Input.TextOnly()
 	if strings.TrimSpace(input.InputID) == "" || err != nil {
 		return agent.ErrSteeringRejected
@@ -62,7 +60,7 @@ func (s *Session) SteerWithReceipt(ctx context.Context, input proto.PromptSteerP
 	var stopped error
 	select {
 	case frame = <-response:
-	case <-s.inputSettlementDone():
+	case <-s.inputDone:
 		stopped = fmt.Errorf("mcode: run ended with unknown input outcome")
 	case <-s.exited:
 		stopped = fmt.Errorf("mcode: input transport closed")
@@ -103,13 +101,6 @@ func (s *Session) SteerWithReceipt(ctx context.Context, input proto.PromptSteerP
 	return nil
 }
 
-func (s *Session) inputSettlementDone() <-chan struct{} {
-	if s.inputDone != nil {
-		return s.inputDone
-	}
-	return s.finished
-}
-
 func (s *Session) CancellationOutcome() proto.DonePayload {
 	s.mu.Lock()
 	defer s.mu.Unlock()
diff --git a/apps/daemon/internal/agent/mcode/subagent_cancel.go b/apps/daemon/internal/agent/mcode/subagent_cancel.go
index bd1b88e68..5efa5a031 100644
--- a/apps/daemon/internal/agent/mcode/subagent_cancel.go
+++ b/apps/daemon/internal/agent/mcode/subagent_cancel.go
@@ -6,21 +6,6 @@ import (
 	"fmt"
 )
 
-func (s *Session) cancelSubagents(ctx context.Context) error {
-	if err := s.stopSubagents(ctx); err != nil {
-		return err
-	}
-	select {
-	case <-s.finished:
-		s.mu.Lock()
-		err := s.subagentSettlementError
-		s.mu.Unlock()
-		return err
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-}
-
 func (s *Session) stopSubagents(ctx context.Context) error {
 	select {
 	case <-s.finished:
diff --git a/apps/daemon/internal/agent/mcode/subagents_test.go b/apps/daemon/internal/agent/mcode/subagents_test.go
index bccb15597..25a1773af 100644
--- a/apps/daemon/internal/agent/mcode/subagents_test.go
+++ b/apps/daemon/internal/agent/mcode/subagents_test.go
@@ -27,7 +27,7 @@ func childSnapshot(t *testing.T) nativeSubagentSnapshot {
 func TestSubagentSnapshotsKeepOwnHistoryAndStableNativeIdentity(t *testing.T) {
 	project := func(snapshot nativeSubagentSnapshot) []proto.Envelope {
 		out := make(chan proto.Envelope, 32)
-		s := &Session{ctx: context.Background(), out: out, previousNativeTurns: map[string]bool{}}
+		s := &Session{ctx: context.Background(), outputContext: context.Background(), out: out, previousNativeTurns: map[string]bool{}}
 		if err := s.projectSubagents(snapshot); err != nil {
 			t.Fatal(err)
 		}
@@ -63,7 +63,7 @@ func TestSubagentSnapshotsKeepOwnHistoryAndStableNativeIdentity(t *testing.T) {
 func TestSubagentSnapshotRejectsMissingParentProvenance(t *testing.T) {
 	snapshot := childSnapshot(t)
 	snapshot.Sessions[0].Tasks = nil
-	s := &Session{ctx: context.Background(), out: make(chan proto.Envelope, 32)}
+	s := &Session{ctx: context.Background(), outputContext: context.Background(), out: make(chan proto.Envelope, 32)}
 	if err := s.projectSubagents(snapshot); err == nil {
 		t.Fatal("accepted child without original spawning provenance")
 	}
diff --git a/apps/daemon/internal/agent/mcode/tool_observations_test.go b/apps/daemon/internal/agent/mcode/tool_observations_test.go
index c7d1fa6da..703e3cb90 100644
--- a/apps/daemon/internal/agent/mcode/tool_observations_test.go
+++ b/apps/daemon/internal/agent/mcode/tool_observations_test.go
@@ -12,7 +12,7 @@ func TestWorkspaceCommandObservationsWaitForArgumentsAndRetainOutcome(t *testing
 	for _, status := range []string{"completed", "failed"} {
 		t.Run(status, func(t *testing.T) {
 			out := make(chan proto.Envelope, 8)
-			s := &Session{ctx: context.Background(), req: proto.PromptRequestPayload{RunID: "run"}, out: out, tools: map[string]toolUpdate{}, completedTools: map[string]bool{}}
+			s := &Session{ctx: context.Background(), outputContext: context.Background(), req: proto.PromptRequestPayload{RunID: "run"}, out: out, tools: map[string]toolUpdate{}, completedTools: map[string]bool{}}
 			s.emitTool(toolUpdate{ID: "call", Name: "mcp__oac_workspace__workspace_bash"})
 			if len(out) != 0 {
 				t.Fatal("command item emitted before native arguments")
diff --git a/apps/daemon/internal/agent/registry.go b/apps/daemon/internal/agent/registry.go
index 6584fb751..4a808b7ff 100644
--- a/apps/daemon/internal/agent/registry.go
+++ b/apps/daemon/internal/agent/registry.go
@@ -20,13 +20,10 @@ var ErrUnknownPermission = errors.New("agent: unknown permission id")
 // ErrUnknownPermission.
 var ErrUnknownAsk = errors.New("agent: unknown ask id")
 
-var ErrUnsupportedKind = errors.New("agent: unsupported agent_kind")
-
-// Registry maps agent_kind → Factory and keeps the daemon-advertised
-// capability descriptor for each kind. Safe for concurrent use.
+// Registry keeps the daemon-advertised capability descriptor and execution
+// factories for each agent_kind. Safe for concurrent use.
 type Registry struct {
 	mu             sync.RWMutex
-	factories      map[string]Factory
 	preparers      map[string]PreparationFactory
 	executors      map[string]ExecutorFactory
 	kinds          map[string]proto.SupportedAgentKind
@@ -35,7 +32,6 @@ type Registry struct {
 
 func NewRegistry() *Registry {
 	return &Registry{
-		factories:      make(map[string]Factory),
 		preparers:      make(map[string]PreparationFactory),
 		executors:      make(map[string]ExecutorFactory),
 		kinds:          make(map[string]proto.SupportedAgentKind),
@@ -43,37 +39,13 @@ func NewRegistry() *Registry {
 	}
 }
 
-// Resolve returns the factory for kind, or wraps ErrUnsupportedKind.
-func (r *Registry) Resolve(kind string) (Factory, error) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	f, ok := r.factories[kind]
-	if !ok {
-		return nil, fmt.Errorf("%w: %q", ErrUnsupportedKind, kind)
-	}
-	return f, nil
-}
-
-// Kinds returns the list of registered kinds sorted lexicographically.
-func (r *Registry) Kinds() []string {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	out := make([]string, 0, len(r.factories))
-	for k := range r.factories {
-		out = append(out, k)
-	}
-	slices.Sort(out)
-	return out
-}
-
 // SupportedAgentKinds returns the daemon-advertised capability
 // descriptors sorted by kind so heartbeat payloads are stable.
 func (r *Registry) SupportedAgentKinds() []proto.SupportedAgentKind {
 	r.mu.RLock()
 	defer r.mu.RUnlock()
-	out := make([]proto.SupportedAgentKind, 0, len(r.factories))
-	for kind := range r.factories {
-		info := r.kinds[kind]
+	out := make([]proto.SupportedAgentKind, 0, len(r.kinds))
+	for _, info := range r.kinds {
 		out = append(out, info)
 	}
 	slices.SortFunc(out, func(a, b proto.SupportedAgentKind) int {
diff --git a/apps/daemon/internal/agent/registry_test.go b/apps/daemon/internal/agent/registry_test.go
index c41b6269a..657326a10 100644
--- a/apps/daemon/internal/agent/registry_test.go
+++ b/apps/daemon/internal/agent/registry_test.go
@@ -6,7 +6,6 @@ import (
 	"context"
 	"errors"
 	"reflect"
-	"slices"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
@@ -14,77 +13,14 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 )
 
-func stubFactory(marker string) agent.Factory {
-	return func(_ context.Context, _ proto.PromptRequestPayload, _ chan<- proto.Envelope) (agent.Session, error) {
-		return stubSession{marker: marker}, nil
-	}
-}
-
-type stubSession struct{ marker string }
-
-func (stubSession) CancellationOutcome() proto.DonePayload { return proto.DonePayload{} }
-
-func (stubSession) Cancel(context.Context) error { return nil }
-func (stubSession) SubmitPermission(context.Context, string, proto.PermissionDecisionPayload) error {
-	return nil
-}
-func (stubSession) SubmitPromptForUserChoice(context.Context, string, proto.PromptForUserChoiceDecisionPayload) error {
-	return nil
-}
-
-func TestRegistryResolveReturnsRegisteredFactory(t *testing.T) {
-	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("cc"))
-
-	f, err := reg.Resolve("fake_alpha")
-	if err != nil {
-		t.Fatalf("Resolve: %v", err)
-	}
-	sess, err := f(context.Background(), proto.PromptRequestPayload{AgentKind: "fake_alpha"}, nil)
-	if err != nil {
-		t.Fatalf("factory: %v", err)
-	}
-	stub, ok := sess.(stubSession)
-	if !ok || stub.marker != "cc" {
-		t.Errorf("resolved factory returned %#v, want stubSession{marker:\"cc\"}", sess)
-	}
-}
-
-func TestRegistryResolveUnknownKindReturnsTypedError(t *testing.T) {
+func TestRegistryRegisterOverwritesDescriptor(t *testing.T) {
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("cc"))
-
-	_, err := reg.Resolve("fake_beta")
-	if !errors.Is(err, agent.ErrUnsupportedKind) {
-		t.Errorf("Resolve unknown = %v, want ErrUnsupportedKind chain", err)
-	}
-}
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "k", Available: true, Version: "v1", Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{})
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "k", Available: true, Version: "v2", Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{})
 
-func TestRegistryRegisterOverwrites(t *testing.T) {
-	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "k", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("v1"))
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "k", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("v2"))
-
-	f, err := reg.Resolve("k")
-	if err != nil {
-		t.Fatalf("Resolve: %v", err)
-	}
-	sess, _ := f(context.Background(), proto.PromptRequestPayload{}, nil)
-	if got := sess.(stubSession).marker; got != "v2" {
-		t.Errorf("overwrite: marker = %q, want v2", got)
-	}
-}
-
-func TestRegistryKindsReportsRegistered(t *testing.T) {
-	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("cc"))
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "fake_beta", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("oc"))
-
-	got := reg.Kinds()
-	slices.Sort(got)
-	want := []string{"fake_alpha", "fake_beta"}
-	if !slices.Equal(got, want) {
-		t.Errorf("Kinds = %v, want %v", got, want)
+	got := reg.SupportedAgentKinds()
+	if len(got) != 1 || got[0].Version != "v2" {
+		t.Errorf("overwrite: descriptors = %#v, want one v2 descriptor", got)
 	}
 }
 
@@ -94,16 +30,30 @@ func TestRegistryRegisterPanicsOnEmptyKind(t *testing.T) {
 			t.Fatal("Register(\"\", ...) did not panic")
 		}
 	}()
-	agent.NewRegistry().RegisterKind(proto.SupportedAgentKind{Kind: "", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("x"))
+	agent.NewRegistry().RegisterKind(proto.SupportedAgentKind{Kind: "", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{})
 }
 
-func TestRegistryRegisterPanicsOnNilFactory(t *testing.T) {
-	defer func() {
-		if r := recover(); r == nil {
-			t.Fatal("Register(kind, nil) did not panic")
-		}
-	}()
-	agent.NewRegistry().RegisterKind(proto.SupportedAgentKind{Kind: "k", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, nil)
+func TestRegistryRegisterRejectsFactoriesForUnavailableRuntime(t *testing.T) {
+	info := proto.SupportedAgentKind{Kind: "k", Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported})}
+	executor := func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) { return nil, nil }
+	preparation := func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return nil, nil }
+	for name, runtime := range map[string]agent.Runtime{
+		"executor":    {Info: info, Executor: executor},
+		"preparation": {Info: info, Preparation: preparation},
+	} {
+		t.Run(name, func(t *testing.T) {
+			registry := agent.NewRegistry()
+			defer func() {
+				if recover() == nil {
+					t.Fatal("unavailable runtime registered factories")
+				}
+				if len(registry.SupportedAgentKinds()) != 0 {
+					t.Fatal("rejected runtime changed registry")
+				}
+			}()
+			registry.Register(agent.Declaration{Info: info}, runtime)
+		})
+	}
 }
 
 func TestRegistrySupportedAgentKindsReportsDescriptors(t *testing.T) {
@@ -115,7 +65,7 @@ func TestRegistrySupportedAgentKindsReportsDescriptors(t *testing.T) {
 		Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{
 			Streaming: proto.CapabilitySupported,
 		}),
-	}, harnessconfig.Configuration{}, stubFactory("oc"))
+	}, harnessconfig.Configuration{})
 	reg.RegisterKind(proto.SupportedAgentKind{
 		Kind:      "fake_alpha",
 		Available: true,
@@ -126,7 +76,7 @@ func TestRegistrySupportedAgentKindsReportsDescriptors(t *testing.T) {
 			Usage:       proto.CapabilitySupported,
 			Resume:      proto.CapabilitySupported,
 		}),
-	}, harnessconfig.Configuration{}, stubFactory("cc"))
+	}, harnessconfig.Configuration{})
 
 	got := reg.SupportedAgentKinds()
 	if len(got) != 2 {
@@ -145,9 +95,9 @@ func TestRegistrySupportedAgentKindsReportsDescriptors(t *testing.T) {
 
 func TestRegistryExecutorRequiresExplicitRegistration(t *testing.T) {
 	registry := agent.NewRegistry()
-	registry.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("native"))
+	registry.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{})
 	if _, err := registry.ResolveExecutor("native"); err == nil {
-		t.Fatal("legacy factory implied reusable execution")
+		t.Fatal("kind registration implied reusable execution")
 	}
 	expected := errors.New("executor factory")
 	registry.RegisterExecutor("native", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) { return nil, expected })
@@ -158,7 +108,7 @@ func TestRegistryExecutorRequiresExplicitRegistration(t *testing.T) {
 	if _, err := factory(t.Context(), proto.PromptRequestPayload{}); !errors.Is(err, expected) {
 		t.Fatal(err)
 	}
-	registry.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, stubFactory("replacement"))
+	registry.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{})
 	if _, err := registry.ResolveExecutor("native"); err == nil {
 		t.Fatal("replacing a kind retained its old executor capability")
 	}
@@ -169,7 +119,10 @@ func TestRegistryRejectsEveryOmittedCapabilityBeforeReplacement(t *testing.T) {
 	for i := 0; i < reflect.TypeOf(valid).NumField(); i++ {
 		t.Run(reflect.TypeOf(valid).Field(i).Name, func(t *testing.T) {
 			registry := agent.NewRegistry()
-			registry.RegisterKind(proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: valid}, harnessconfig.Configuration{}, stubFactory("original"))
+			original := proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: valid}
+			registry.RegisterKind(original, harnessconfig.Configuration{})
+			registry.RegisterExecutor("fixture", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) { return nil, nil })
+			original.Capabilities.Preparation = proto.CapabilitySupported
 			missing := valid
 			reflect.ValueOf(&missing).Elem().Field(i).Set(reflect.ValueOf(proto.CapabilityUnspecified))
 			func() {
@@ -178,14 +131,9 @@ func TestRegistryRejectsEveryOmittedCapabilityBeforeReplacement(t *testing.T) {
 						t.Error("incomplete declaration registered")
 					}
 				}()
-				registry.RegisterKind(proto.SupportedAgentKind{Kind: "fixture", Available: false, Capabilities: missing}, harnessconfig.Configuration{}, stubFactory("replacement"))
+				registry.RegisterKind(proto.SupportedAgentKind{Kind: "fixture", Available: false, Capabilities: missing}, harnessconfig.Configuration{})
 			}()
-			factory, err := registry.Resolve("fixture")
-			if err != nil {
-				t.Fatal(err)
-			}
-			session, err := factory(t.Context(), proto.PromptRequestPayload{}, nil)
-			if err != nil || session.(stubSession).marker != "original" {
+			if _, err := registry.ResolveExecutor("fixture"); err != nil || !reflect.DeepEqual(registry.SupportedAgentKinds(), []proto.SupportedAgentKind{original}) {
 				t.Fatal("failed declaration changed registry")
 			}
 		})
diff --git a/apps/daemon/internal/cli/connect_cleanup_test.go b/apps/daemon/internal/cli/connect_cleanup_test.go
index c8f92a00e..ba6192874 100644
--- a/apps/daemon/internal/cli/connect_cleanup_test.go
+++ b/apps/daemon/internal/cli/connect_cleanup_test.go
@@ -115,10 +115,7 @@ func testDisconnectedPumpCleanup(t *testing.T, suspend bool) {
 	}
 	owner := &cleanupExecutor{retry: make(chan struct{}), confirm: make(chan struct{})}
 	registry := agent.NewRegistry()
-	registry.RegisterKind(proto.SupportedAgentKind{Kind: "cleanup", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})},
-		harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-			return nil, errors.New("unexpected legacy factory")
-		})
+	registry.RegisterKind(proto.SupportedAgentKind{Kind: "cleanup", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 	var factories atomic.Int32
 	registry.RegisterExecutor("cleanup", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 		factories.Add(1)
diff --git a/apps/daemon/internal/cli/native_discovery_test.go b/apps/daemon/internal/cli/native_discovery_test.go
index e6d9e0dee..5f3592c9d 100644
--- a/apps/daemon/internal/cli/native_discovery_test.go
+++ b/apps/daemon/internal/cli/native_discovery_test.go
@@ -21,9 +21,7 @@ func TestDiscoveryAndRegistration(t *testing.T) {
 					called = append(called, info.Kind)
 					info.Available = true
 					info.Version = "test"
-					return &agent.Runtime{Info: info, Session: func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-						return nil, errors.New("test")
-					}}
+					return &agent.Runtime{Info: info}
 				}
 			}
 			rc := &runContext{stdout: io.Discard, stderr: io.Discard}
@@ -41,10 +39,11 @@ func TestDiscoveryAndRegistration(t *testing.T) {
 			}
 			registry := agent.NewRegistry()
 			registerAgentKinds(registry, discovery)
-			if len(registry.Kinds()) != len(expected) {
-				t.Fatal(registry.Kinds())
+			kinds := registry.SupportedAgentKinds()
+			if len(kinds) != len(expected) {
+				t.Fatal(kinds)
 			}
-			for _, info := range registry.SupportedAgentKinds() {
+			for _, info := range kinds {
 				if !info.Available || info.Version != "test" {
 					t.Fatal(info)
 				}
diff --git a/apps/daemon/internal/cli/preparation_test.go b/apps/daemon/internal/cli/preparation_test.go
index 7df3223e6..9518ae1b1 100644
--- a/apps/daemon/internal/cli/preparation_test.go
+++ b/apps/daemon/internal/cli/preparation_test.go
@@ -14,9 +14,7 @@ func TestPreparationRegistrationFollowsNativeSupport(t *testing.T) {
 	for _, supported := range []bool{false, true} {
 		reg := agent.NewRegistry()
 		info := proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilityFromBool(supported)})}
-		runtime := agent.Runtime{Info: info, Session: func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-			return nil, nil
-		}}
+		runtime := agent.Runtime{Info: info}
 		if supported {
 			runtime.Preparation = func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return nil, nil }
 			runtime.WorkspaceReadPreparation = true
@@ -35,11 +33,9 @@ func TestPreparationRegistrationFollowsNativeSupport(t *testing.T) {
 				t.Fatal("heartbeat registry lost preparation")
 			}
 		}
-		reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-			return nil, nil
-		})
+		reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{})
 		if _, err := reg.ResolvePreparation("codex"); err == nil {
-			t.Fatal("factory replacement retained stale preparation")
+			t.Fatal("kind replacement retained stale preparation")
 		}
 	}
 }
diff --git a/apps/daemon/internal/dispatch/executor_cancel_receipt_test.go b/apps/daemon/internal/dispatch/executor_cancel_receipt_test.go
index b99a1ef84..d9cf60fac 100644
--- a/apps/daemon/internal/dispatch/executor_cancel_receipt_test.go
+++ b/apps/daemon/internal/dispatch/executor_cancel_receipt_test.go
@@ -127,9 +127,7 @@ func TestExecutorCancellationReachesNativeBeforeDurableReceiptJoin(t *testing.T)
 			sender := &receiptCancelSender{recSender: &recSender{}, entered: make(chan struct{}), release: make(chan struct{})}
 			owner := &receiptCancelExecutor{turn: make(chan *receiptCancelTurn, 2), cancelFails: mode == "cancel_failure" || mode == "close_failure_retry", closeFailsFirst: mode == "close_failure_retry", closeEntered: make(chan struct{}), closeRelease: make(chan struct{})}
 			reg := agent.NewRegistry()
-			reg.RegisterKind(proto.SupportedAgentKind{Kind: "reusable", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-				return nil, errors.New("legacy factory forbidden")
-			})
+			reg.RegisterKind(proto.SupportedAgentKind{Kind: "reusable", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 			reg.RegisterExecutor("reusable", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) { return owner, nil })
 			r, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender, IdleTimeout: time.Hour})
 			if err != nil {
diff --git a/apps/daemon/internal/dispatch/executor_handoff_test.go b/apps/daemon/internal/dispatch/executor_handoff_test.go
index 60f194351..0b679aa7f 100644
--- a/apps/daemon/internal/dispatch/executor_handoff_test.go
+++ b/apps/daemon/internal/dispatch/executor_handoff_test.go
@@ -93,10 +93,7 @@ func TestPreparedDonePublishesAfterExecutorHandoff(t *testing.T) {
 			}
 			owner := &terminalHandoffExecutor{turns: make(chan *terminalHandoffTurn, 3)}
 			registry := agent.NewRegistry()
-			registry.RegisterKind(proto.SupportedAgentKind{Kind: "handoff", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})},
-				harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-					return nil, errors.New("legacy path forbidden")
-				})
+			registry.RegisterKind(proto.SupportedAgentKind{Kind: "handoff", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 			var creates atomic.Int32
 			registry.RegisterExecutor("handoff", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 				creates.Add(1)
diff --git a/apps/daemon/internal/dispatch/executor_test.go b/apps/daemon/internal/dispatch/executor_test.go
index 211c2201d..a2324a78c 100644
--- a/apps/daemon/internal/dispatch/executor_test.go
+++ b/apps/daemon/internal/dispatch/executor_test.go
@@ -80,9 +80,7 @@ func executorRequest() proto.ExecutionPreparePayload {
 
 // registerExecutorKind registers info for prepared execution only.
 func registerExecutorKind(reg *agent.Registry, info proto.SupportedAgentKind, factory agent.ExecutorFactory) {
-	reg.RegisterKind(info, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		return nil, errors.New("prepared execution must not use the direct Session factory")
-	})
+	reg.RegisterKind(info, harnessconfig.Configuration{})
 	reg.RegisterExecutor(info.Kind, factory)
 }
 func executorRouter(t *testing.T, owner *reusableExecutor, idle time.Duration) (*dispatch.Router, *recSender, *atomic.Int32) {
@@ -230,9 +228,7 @@ func TestExecutorPreInputFailureConfirmsCloseBeforeRetrySignal(t *testing.T) {
 func poolRouter(t *testing.T, factory agent.ExecutorFactory) (*dispatch.Router, *recSender) {
 	t.Helper()
 	registry := agent.NewRegistry()
-	registry.RegisterKind(proto.SupportedAgentKind{Kind: "reusable", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		return nil, errors.New("unexpected legacy factory")
-	})
+	registry.RegisterKind(proto.SupportedAgentKind{Kind: "reusable", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 	registry.RegisterExecutor("reusable", factory)
 	sender := &recSender{}
 	router, err := dispatch.New(dispatch.Config{Registry: registry, Sender: sender, IdleTimeout: time.Minute})
diff --git a/apps/daemon/internal/dispatch/local_directory_test.go b/apps/daemon/internal/dispatch/local_directory_test.go
index 3f1692b07..6c79a12cd 100644
--- a/apps/daemon/internal/dispatch/local_directory_test.go
+++ b/apps/daemon/internal/dispatch/local_directory_test.go
@@ -29,10 +29,7 @@ func TestLocalDirectoryPreparationNeedsNoHarnessAndRejectsOtherOwners(t *testing
 	}
 	var harnessCalls atomic.Int32
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		harnessCalls.Add(1)
-		return nil, errors.New("must not start a model")
-	})
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 	reg.RegisterPreparation("native", true, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
 		harnessCalls.Add(1)
 		return nil, errors.New("must not prepare a harness")
@@ -111,9 +108,7 @@ func TestLocalDirectoryKeepsNotDirectorySeparateFromFailures(t *testing.T) {
 		t.Fatal(err)
 	}
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		return nil, errors.New("must not start a model")
-	})
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 	reg.RegisterPreparation("native", true, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
 		return nil, errors.New("must not prepare a harness")
 	})
diff --git a/apps/daemon/internal/dispatch/mcp_http_test.go b/apps/daemon/internal/dispatch/mcp_http_test.go
index 794b596ec..3ba64f237 100644
--- a/apps/daemon/internal/dispatch/mcp_http_test.go
+++ b/apps/daemon/internal/dispatch/mcp_http_test.go
@@ -112,10 +112,7 @@ func TestLocalMCPOriginAndCapabilityAdmission(t *testing.T) {
 				req.Configuration.MCPHTTPServers = nil
 			}
 			entered := make(chan struct{}, 1)
-			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "prepared", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, MCPHTTPTools: proto.CapabilityFromBool(mode != "environment missing capability"), MCPHTTPBearerAuth: proto.CapabilitySupported, MCPHTTPRequired: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-				t.Error("ordinary factory called")
-				return nil, errors.New("unexpected")
-			})
+			h.reg.RegisterKind(proto.SupportedAgentKind{Kind: "prepared", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, MCPHTTPTools: proto.CapabilityFromBool(mode != "environment missing capability"), MCPHTTPBearerAuth: proto.CapabilitySupported, MCPHTTPRequired: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 			h.reg.RegisterExecutor("prepared", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 				entered <- struct{}{}
 				return nil, errors.New("controlled stop")
diff --git a/apps/daemon/internal/dispatch/preparation_test.go b/apps/daemon/internal/dispatch/preparation_test.go
index 57312e3b2..b01dbcca6 100644
--- a/apps/daemon/internal/dispatch/preparation_test.go
+++ b/apps/daemon/internal/dispatch/preparation_test.go
@@ -119,9 +119,7 @@ func preparationRequest() proto.ExecutionPreparePayload {
 func preparationRouter(t *testing.T, sender dispatch.Sender, timeout time.Duration, factory agent.PreparationFactory) *dispatch.Router {
 	t.Helper()
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "prepared", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, Permissions: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		return nil, errors.New("ordinary Factory must not be used for preparation")
-	})
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "prepared", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, Permissions: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 	reg.RegisterPreparation("prepared", true, factory)
 	reg.RegisterExecutor("prepared", preparationExecutorFixture(factory))
 	r, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender, PreparationTimeout: timeout, LocalWorkspace: preparationWorkspace(t)})
diff --git a/apps/daemon/internal/wireconformance/wire_test.go b/apps/daemon/internal/wireconformance/wire_test.go
index 9af45ecba..80b93e394 100644
--- a/apps/daemon/internal/wireconformance/wire_test.go
+++ b/apps/daemon/internal/wireconformance/wire_test.go
@@ -157,10 +157,7 @@ func connectRuntime(t *testing.T, peer *corePeer, setupErr error) *runtimeSide {
 	peer.accept(t)
 	rt := &runtimeSide{conn: conn, executor: &controlledExecutor{turn: make(chan *controlledTurn, 1)}, stopped: make(chan struct{})}
 	kinds := agent.NewRegistry()
-	kinds.RegisterKind(proto.SupportedAgentKind{Kind: prototest.HarnessKind, Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})},
-		harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-			return nil, errors.New("prepared execution must not use the direct Session factory")
-		})
+	kinds.RegisterKind(proto.SupportedAgentKind{Kind: prototest.HarnessKind, Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 	kinds.RegisterExecutor(prototest.HarnessKind, func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 		return rt.executor, setupErr
 	})
diff --git a/apps/daemon/testdata/onboarding/main.go b/apps/daemon/testdata/onboarding/main.go
index 3252f0bdb..0a08375ae 100644
--- a/apps/daemon/testdata/onboarding/main.go
+++ b/apps/daemon/testdata/onboarding/main.go
@@ -163,9 +163,7 @@ func run() error {
 	h := &harness{history: map[string]string{}}
 	registry.RegisterKind(proto.SupportedAgentKind{Kind: "fixture_harness", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{
 		Streaming: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableTurns: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported, ExecutionControls: proto.CapabilitySupported, ToolObservations: proto.CapabilitySupported, SubagentControl: proto.CapabilitySupported, EnvironmentNone: proto.CapabilitySupported,
-	})}, harnessconfig.Configuration{}, func(context.Context, proto.PromptRequestPayload, chan<- proto.Envelope) (agent.Session, error) {
-		return nil, errors.New("fixture execution requires an Executor")
-	})
+	})}, harnessconfig.Configuration{})
 	registry.RegisterExecutor("fixture_harness", h.prepare)
 	sink := &sender{encoder: json.NewEncoder(os.Stdout)}
 	router, err := dispatch.New(dispatch.Config{Registry: registry, Sender: sink, Log: slog.New(slog.NewTextHandler(io.Discard, nil))})
diff --git a/contracts/agents-api/harness-onboarding.md b/contracts/agents-api/harness-onboarding.md
index 8d5c7459d..8ba69107e 100644
--- a/contracts/agents-api/harness-onboarding.md
+++ b/contracts/agents-api/harness-onboarding.md
@@ -116,8 +116,8 @@ A Session owns one reusable Executor in its connected Runtime; a Turn owns one i
 - An error means settlement is unconfirmed and frees neither ownership nor capacity. Caller deadlines stop the wait, not the tracked cleanup. Retry the same cleanup target serially; a failed cleanup blocks replacement and keeps its resource slot.
 - `Executor.Close` confirms resource retirement independently of the Turn outcome: an immutable Turn error must not prevent closing the native transport once its work and output have stopped.
 - Include owned background work in settlement and keep the exact native cleanup target after a failure. Native termination belongs to the adapter; a bulk cleanup acknowledgement alone does not establish quiescence.
-- Every `Session`, including a direct-call factory result, declares `CancellationOutcome`. `Turn` and `PreparedCancellation` inherit it. The snapshot keeps observed native identity, Usage and output and remains readable after cancellation. Missing evidence stays unset; an empty `DonePayload` means nothing has been observed, not that cancellation succeeded or is unsupported. Reading the snapshot does not wait for settlement.
-- Direct-call `Session.Cancel` requests cancellation; output closure signals teardown. Executable `PreparedCancellation.Cancel` waits for local cleanup and output writes to stop. Turn settlement still requires `AwaitSettlement` and any required `Executor.Close`; neither a successful cancellation request nor its snapshot replaces those waits.
+- Every `Session` declares `CancellationOutcome`. `Turn` and `PreparedCancellation` inherit it. The snapshot keeps observed native identity, Usage and output and remains readable after cancellation. Missing evidence stays unset; an empty `DonePayload` means nothing has been observed, not that cancellation succeeded or is unsupported. Reading the snapshot does not wait for settlement.
+- `Session.Cancel` requests cancellation; output closure signals teardown. Executable `PreparedCancellation.Cancel` waits for local cleanup and output writes to stop. Turn settlement still requires `AwaitSettlement` and any required `Executor.Close`; neither a successful cancellation request nor its snapshot replaces those waits.
 
 **What the Runtime does around a Turn.** One output consumer starts before native Start, drains the bounded 64-frame channel and keeps the terminal observation until Start publication, Turn settlement and admitted operation receipts finish. Natural completion never calls Cancel. Input, function and interaction admission close before settlement; operations already admitted hold their barrier through native receipts and outbound acknowledgement. The Runtime sends cancellation to the Turn before waiting on that barrier, because a written input may need a native interrupt to produce its receipt. It joins native settlement, any required confirmed Executor close, output drain and all admitted operations before an applied acknowledgement or reuse, and only then forwards Done or an applied cancellation receipt. A failed Close can report failure while keeping the same Run and outstanding operations for retry; a closed caller wait cannot manufacture an applied input receipt. The Runtime commits native continuity and releases the old Run's admission before publishing Done, since the receiver may start another Turn at once; a late terminal-send failure belongs to the old Run and cannot invalidate a successor that already owns the Executor. Connection shutdown owns transport-loss cleanup. The settlement wait is ten seconds and the receipt send budget five seconds; a timeout is not proof of quiescence.
 
@@ -149,18 +149,16 @@ A Harness that supports the Subagent reads implements the [neutral observation c
 
 ## Register the adapter
 
-Registration is static and requires a build. Export one `agent.Declaration` from `apps/daemon/internal/agent/<kind>/declaration.go`, then add it to `harnessDeclarations` in [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go). The declaration contains the kind and complete capability descriptor, the shared model `Configuration` and a `Discover` function. Discovery receives the profile and diagnostic writers, owns native configuration and availability checks, and returns the installed `agent.Runtime` with its descriptor and session, preparation and Executor factories. Return nil when the adapter is not configured; return an unavailable descriptor with a session factory when configured prerequisites fail. Keep version gates and factory-selection conditions inside the adapter.
+Registration is static and requires a build. Export one `agent.Declaration` from `apps/daemon/internal/agent/<kind>/declaration.go`, then add it to `harnessDeclarations` in [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go). The declaration contains the kind and complete capability descriptor, the shared model `Configuration` and a `Discover` function. Discovery receives the profile and diagnostic writers, owns native configuration and availability checks, and returns the installed `agent.Runtime` with its descriptor and its preparation and Executor factories. Return nil when the adapter is not configured; return an unavailable descriptor without factories when configured prerequisites fail. Keep version gates and factory-selection conditions inside the adapter.
 
-[`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) iterates the discovered runtimes and calls `Registry.Register` from `agent/harness.go`. It verifies that discovery retained the declared kind and installs factories in this order:
+[`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) iterates the discovered runtimes and calls `Registry.Register` from `agent/harness.go`. It verifies that discovery retained the declared kind and registers the Runtime in this order:
 
 | Order | Method | Registers |
 | --- | --- | --- |
-| 1 | `RegisterKind(proto.SupportedAgentKind, harnessconfig.Configuration, agent.Factory)` | Kind, availability, version, `AgentKindCapabilities`, the model configuration declaration and the direct-call factory. It resets the other registrations, so call it first. |
+| 1 | `RegisterKind(proto.SupportedAgentKind, harnessconfig.Configuration)` | Kind, availability, version, `AgentKindCapabilities` and the model configuration declaration. It resets the other registrations, so call it first. |
 | 2 | `RegisterExecutor(kind, agent.ExecutorFactory)` | The Executor and Turn lifecycle used for execution; derives the `Preparation` capability |
 | 3 | `RegisterPreparation(kind, workspaceRead, agent.PreparationFactory)` | Optional: separate read-only workspace preparation for qualified workspace operations |
 
-The direct-call `agent.Factory` delegates to the same Executor implementation.
-
 Every `proto.AgentKindCapabilities` field must be explicitly `proto.CapabilitySupported` or `proto.CapabilityUnsupported`, even for an unavailable Harness. `proto.CapabilityUnspecified` is invalid: zero values and omitted fields never mean Unsupported. An installation probe may set an individual field with `proto.CapabilityFromBool`; it must not populate unmentioned or future fields. Availability stays separate in `SupportedAgentKind.Available`. Registration validates the complete declaration before changing the registry, and the wire carries an explicit boolean for every field, so omitted and null fields are invalid. A new field requires a decision in every production declaration. Runtime consumers use `IsSupported()` and reject unsupported requests before native operations; an interface assertion verifies implementation, never support. Every declaration must match the behavior verified for that installation; the [Core–Runtime protocol](../../docs/runtime-protocol.md#capability-declarations) owns how declarations travel and are frozen.
 
 The admission mapping is explicit. `Steering` controls non-durable `Steerer` input. `DurableInputReceipts` controls `DurableSteerer` input and also requires the Turn settlement contract; neither implies the other, and Core's public text profile requires both. `Permissions` qualifies permission and user-choice responses together and requires both native response paths. Workspace declarations describe the authorized resource owner, including the common Runtime workspace implementation. Runtime registration does not grant Core qualification; the service profile does.
@@ -200,7 +198,7 @@ Run the `engine` and `execution` tests for omission, policy, combination and err
 
 ## Native model configuration
 
-[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) owns the shared configuration declaration and pure preparation contract. Each adapter supplies one `Configuration`, in `internal/harnessconfig/<kind>`, to Core's composition and to the Runtime's `RegisterKind`. The direct factory, preparation and Executor paths all validate through that declaration before native side effects. The wire object is `proto.HarnessConfig`. [Model execution](./model-execution.md#native-model-parameters) lists each Harness's accepted fields.
+[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) owns the shared configuration declaration and pure preparation contract. Each adapter supplies one `Configuration`, in `internal/harnessconfig/<kind>`, to Core's composition and to the Runtime's `RegisterKind`. The preparation and Executor paths both validate through that declaration before native side effects. The wire object is `proto.HarnessConfig`. [Model execution](./model-execution.md#native-model-parameters) lists each Harness's accepted fields.
 
 A supplied `model` must be a nonempty string, and an explicit `model_provider` requires it. The native-owned connection path may omit both; explicit null is invalid. An explicitly empty declaration accepts no provider or nonempty native parameters and advertises no provider support. Unknown protocol formats and duplicate protocol declarations fail at registration.
 
diff --git a/contracts/agents-api/zh/harness-onboarding.md b/contracts/agents-api/zh/harness-onboarding.md
index e5252a97d..8f21103a4 100644
--- a/contracts/agents-api/zh/harness-onboarding.md
+++ b/contracts/agents-api/zh/harness-onboarding.md
@@ -1,7 +1,7 @@
 ---
 title: "将原生 Harness 添加到 OpenAgentCore"
 source: contracts/agents-api/harness-onboarding.md
-source_hash: cad1a3666f3c0d4c460bb6213da4bcca89c156fc387b1355d683593b55d025a0
+source_hash: f9d04f91520968c71565aada8592f116bf794b0e094f8897cb21ef0d10e17793
 ---
 
 **Harness** 是一种运行模型和工具循环的原生代理引擎（Codex、Claude Code、MiniMax Code）。**Harness 适配器**将 Runtime 的 Executor 和 Turn 契约转换到该引擎的 SDK 或协议。本文档定义 Runtime–Harness 协议：适配器接口及其生命周期义务、注册、Core 资格认定和验收。[Harness capabilities](harness-capabilities.md) 记录了当前每个 Harness 支持的功能。
@@ -118,8 +118,8 @@ Session 在其已连接的 Runtime 中拥有一个可复用的 Executor；Turn 
 - 错误表示结算尚未确认，既不释放所有权，也不释放容量。调用方截止时间只会停止等待，不会停止受跟踪的清理。必须串行重试同一个清理目标；清理失败会阻止替换并保留其资源槽位。
 - `Executor.Close` 独立于 Turn 结果确认资源退役：不可变的 Turn 错误不得阻止在其工作和输出已经停止后关闭原生传输层。
 - 结算必须包含所属的后台工作，并在失败后保留精确的原生清理目标。原生终止由适配器负责；仅有批量清理确认并不能证明已达到静默状态。
-- 每个 `Session`（包括直接调用工厂的结果）都要声明 `CancellationOutcome`。`Turn` 和 `PreparedCancellation` 继承该声明。快照保留已观察到的原生身份、Usage 和输出，并在取消后仍可读取。缺失的证据保持未设置；空的 `DonePayload` 表示未观察到任何内容，而不是表示取消成功或不受支持。读取快照不会等待结算。
-- 直接调用的 `Session.Cancel` 请求取消；输出关闭表示拆卸开始。可执行准备中的 `PreparedCancellation.Cancel` 会等待本地清理和输出写入停止。Turn 结算仍需要 `AwaitSettlement` 和所需的任何 `Executor.Close`；取消请求成功或其快照都不能替代这些等待。
+- 每个 `Session` 都要声明 `CancellationOutcome`。`Turn` 和 `PreparedCancellation` 继承该声明。快照保留已观察到的原生身份、Usage 和输出，并在取消后仍可读取。缺失的证据保持未设置；空的 `DonePayload` 表示未观察到任何内容，而不是表示取消成功或不受支持。读取快照不会等待结算。
+- `Session.Cancel` 请求取消；输出关闭表示拆卸开始。可执行准备中的 `PreparedCancellation.Cancel` 会等待本地清理和输出写入停止。Turn 结算仍需要 `AwaitSettlement` 和所需的任何 `Executor.Close`；取消请求成功或其快照都不能替代这些等待。
 
 **Runtime 在 Turn 前后执行的工作。** 一个输出消费者会在原生 Start 之前启动，耗尽有界的 64 帧通道，并将终态观察保留到 Start 发布、Turn 结算和已准入操作回执完成为止。正常完成绝不调用 Cancel。输入、函数和交互准入会在结算前关闭；已准入的操作会持有其屏障，直至原生回执和出站确认完成。Runtime 会在等待该屏障之前向 Turn 发送取消，因为已写入的输入可能需要原生中断才能生成回执。Runtime 会汇合原生结算、所需的已确认 Executor 关闭、输出耗尽和所有已准入操作，然后应用确认或执行复用，之后才会转发 Done 或已应用的取消回执。Close 失败可以报告失败，同时保留同一 Run 和未完成操作以供重试；已关闭的调用方等待无法凭空生成已应用输入回执。Runtime 会在发布 Done 前提交原生连续性状态并释放旧 Run 的准入，因为接收方可能立即启动另一个 Turn；迟到的终态发送失败属于旧 Run，不能使已拥有 Executor 的后继对象失效。连接关闭负责传输丢失清理。结算等待时间为十秒，回执发送预算为五秒；超时不能证明已达到静默状态。
 
@@ -151,18 +151,16 @@ MCP、公共函数、延迟函数发现、结构化输出、图像输入、详
 
 ## 注册适配器 {#register-the-adapter}
 
-注册是静态的，并且需要构建。从 `apps/daemon/internal/agent/<kind>/declaration.go` 导出一个 `agent.Declaration`，然后将其添加到 [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go) 的 `harnessDeclarations` 中。声明包含 kind、完整能力描述符、共享模型 `Configuration` 和 `Discover` 函数。发现过程接收 profile 和诊断写入器，负责原生配置和可用性检查，并返回已安装的 `agent.Runtime` 及其描述符、session 工厂、准备工厂和 Executor 工厂。未配置适配器时返回 nil；已配置的前置条件失败时，返回不可用描述符和 session 工厂。将版本门控和工厂选择条件保留在适配器内部。
+注册是静态的，并且需要构建。从 `apps/daemon/internal/agent/<kind>/declaration.go` 导出一个 `agent.Declaration`，然后将其添加到 [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go) 的 `harnessDeclarations` 中。声明包含 kind、完整能力描述符、共享模型 `Configuration` 和 `Discover` 函数。发现过程接收 profile 和诊断写入器，负责原生配置和可用性检查，并返回已安装的 `agent.Runtime` 及其描述符、准备工厂和 Executor 工厂。未配置适配器时返回 nil；已配置的前置条件失败时，返回不带任何工厂的不可用描述符。将版本门控和工厂选择条件保留在适配器内部。
 
-[`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) 遍历已发现的 Runtime，并调用 `agent/harness.go` 中的 `Registry.Register`。它验证发现过程是否保留了声明的 kind，并按以下顺序安装工厂：
+[`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) 遍历已发现的 Runtime，并调用 `agent/harness.go` 中的 `Registry.Register`。它验证发现过程是否保留了声明的 kind，并按以下顺序注册该 Runtime：
 
 | 顺序 | 方法 | 注册内容 |
 | --- | --- | --- |
-| 1 | `RegisterKind(proto.SupportedAgentKind, harnessconfig.Configuration, agent.Factory)` | Kind、可用性、版本、`AgentKindCapabilities`、模型配置声明和直接调用工厂。它会重置其他注册项，因此必须首先调用。 |
+| 1 | `RegisterKind(proto.SupportedAgentKind, harnessconfig.Configuration)` | Kind、可用性、版本、`AgentKindCapabilities` 和模型配置声明。它会重置其他注册项，因此必须首先调用。 |
 | 2 | `RegisterExecutor(kind, agent.ExecutorFactory)` | 执行所用的 Executor 和 Turn 生命周期；据此派生 `Preparation` 能力 |
 | 3 | `RegisterPreparation(kind, workspaceRead, agent.PreparationFactory)` | 可选：针对已认定合格的工作区操作的独立只读工作区准备 |
 
-直接调用的 `agent.Factory` 委托给同一个 Executor 实现。
-
 每个 `proto.AgentKindCapabilities` 字段都必须显式设为 `proto.CapabilitySupported` 或 `proto.CapabilityUnsupported`，即使 Harness 不可用也是如此。`proto.CapabilityUnspecified` 无效：零值和省略字段绝不表示 Unsupported。安装探测可以使用 `proto.CapabilityFromBool` 设置单个字段；但不得填充未提及字段或未来字段。可用性通过 `SupportedAgentKind.Available` 单独表示。注册会在更改 registry 之前验证完整声明；线协议会为每个字段携带显式布尔值，因此省略字段和 null 字段均无效。添加新字段时，每个生产声明都必须作出决定。Runtime 使用者应调用 `IsSupported()`，并在原生操作前拒绝不受支持的请求；接口断言用于验证实现，绝不表示支持。每个声明都必须与针对该安装验证的行为一致；[Core–Runtime protocol](../../../docs/zh/runtime-protocol.md#capability-declarations) 负责声明的传输方式和冻结方式。
 
 准入映射是显式的。`Steering` 控制非持久化 `Steerer` 输入。`DurableInputReceipts` 控制 `DurableSteerer` 输入，并且还要求 Turn 结算契约；二者互不隐含，而且 Core 的公共文本 profile 要求同时具备二者。`Permissions` 一起认定权限响应和用户选择响应的资格，并要求两条原生响应路径均存在。工作区声明描述授权资源所有者，包括通用 Runtime 工作区实现。Runtime 注册不会授予 Core 资格；服务 profile 才会授予。
@@ -202,7 +200,7 @@ profile 是纯逻辑：它使用现有的公共类型和协议类型，声明受
 
 ## 原生模型配置 {#native-model-configuration}
 
-[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 负责共享配置声明和纯准备契约。每个适配器在 `internal/harnessconfig/<kind>` 中提供一个 `Configuration`，供 Core 组合和 Runtime 的 `RegisterKind` 使用。直接调用工厂、准备路径和 Executor 路径都会在产生原生副作用之前通过该声明进行验证。线协议对象是 `proto.HarnessConfig`。[Model execution](model-execution.md#native-model-parameters) 列出了每个 Harness 接受的字段。
+[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 负责共享配置声明和纯准备契约。每个适配器在 `internal/harnessconfig/<kind>` 中提供一个 `Configuration`，供 Core 组合和 Runtime 的 `RegisterKind` 使用。准备路径和 Executor 路径都会在产生原生副作用之前通过该声明进行验证。线协议对象是 `proto.HarnessConfig`。[Model execution](model-execution.md#native-model-parameters) 列出了每个 Harness 接受的字段。
 
 提供的 `model` 必须是非空字符串，并且显式指定 `model_provider` 时必须提供它。原生所有权连接路径可以省略二者；显式 null 无效。显式为空的声明不接受任何 Provider 或非空原生参数，也不宣称支持 Provider。未知协议格式和重复协议声明会导致注册失败。
 
diff --git a/packages/claude-sdk-adapter/README.md b/packages/claude-sdk-adapter/README.md
index e124b3dad..ad803ff49 100644
--- a/packages/claude-sdk-adapter/README.md
+++ b/packages/claude-sdk-adapter/README.md
@@ -36,7 +36,7 @@ The private bridge accepts `executor_prepare` without model input. It freezes va
 
 Each Turn ends with a result/error and `turn_settled`, independently of process exit. The outer input iterator remains open for later Turns. `turn_cancel` invokes the native interrupt control for that exact Turn. Unconfirmed input, native child work or queue state invalidates the Executor and requires close before replacement. EOF, owner signals and invalid control input close owned resources. Preparation may write native metadata and perform startup traffic; readiness does not prove provider authentication, complete sandbox health or placement authorization.
 
-`claudesdk.NewExecutorFactory` binds this bridge to `agent.Executor`. Direct-call and read-only preparation wrappers delegate to the same implementation. Runtime execution uses the Executor registry for both none and workspace configurations. Its owner context spans all Turns; a Turn's caller cannot replace fixed resources. A failed preparation returns its Executor when cleanup remains unconfirmed. Installed runtime checks are cached by package/file identity, while capability and request validation still run for each Executor configuration.
+`claudesdk.NewExecutorFactory` binds this bridge to `agent.Executor`. The read-only preparation wrapper delegates to the same implementation. Runtime execution uses the Executor registry for both none and workspace configurations. Its owner context spans all Turns; a Turn's caller cannot replace fixed resources. A failed preparation returns its Executor when cleanup remains unconfirmed. Installed runtime checks are cached by package/file identity, while capability and request validation still run for each Executor configuration.
 
 ### Workspace reads and directory listing
 
@@ -64,7 +64,7 @@ Workspace deferred-function discovery uses native ToolSearch alongside the norma
 
 ### Registration and state
 
-For unmanaged bootstrap, daemon `connect` optionally registers this factory as `claude_sdk` when the operator sets `OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT` to the absolute packaged `dist/main.js`. `OAC_RUNTIME_CLAUDE_SDK_NODE` selects Node (default: `node` on PATH). Discovery resolves Node once and checks that exact configuration before connecting; the SDK's bounded runtime check is independent of CLI version probes. A ready SDK alone is sufficient to start the daemon. No configuration means no SDK probe or descriptor; failed readiness reports an unavailable descriptor with a rejecting factory. Runtime checks establish local readiness, not provider authentication. Installed daemons use `start` and their verified installation manifest for adapter selection and activation; ambient activation variables cannot extend that selection. See [the native installation contract](../../deploy/README.md#native-daemon-installer).
+For unmanaged bootstrap, daemon `connect` optionally registers this adapter as `claude_sdk` when the operator sets `OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT` to the absolute packaged `dist/main.js`. `OAC_RUNTIME_CLAUDE_SDK_NODE` selects Node (default: `node` on PATH). Discovery resolves Node once and checks that exact configuration before connecting; the SDK's bounded runtime check is independent of CLI version probes. A ready SDK alone is sufficient to start the daemon. No configuration means no SDK probe or descriptor; failed readiness reports an unavailable descriptor without factories. Runtime checks establish local readiness, not provider authentication. Installed daemons use `start` and their verified installation manifest for adapter selection and activation; ambient activation variables cannot extend that selection. See [the native installation contract](../../deploy/README.md#native-daemon-installer).
 
 SDK state lives under `paths.ProfileDir(profile)/runtime/claude-sdk`, independently of the replaceable runtime bundle. Both the entrypoint and managed state root must be absolute. Background re-execution inherits operator configuration; it does not persist provider credentials in credential profiles. It accepts no caller-supplied environment variables or business write authority.
 

From 80dfaea49c968ac6593e6f2aec4807254d614564 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 20:35:16 +0800
Subject: [PATCH 25/60] ci: split code and docs reviews with one Feishu report
 (#485)

* ci: review documentation consistency and ownership

* ci: split reviews and send one combined Feishu report
---
 .github/workflows/ci-review.yml | 101 ++++++++++++++++-------
 docs/maintainers.md             |   4 +-
 docs/zh/maintainers.md          |   6 +-
 scripts/ci_review.py            | 139 ++++++++++++++++++++++++++++++++
 scripts/ci_review_test.py       |  96 ++++++++++++++++++++++
 5 files changed, 315 insertions(+), 31 deletions(-)
 create mode 100644 scripts/ci_review.py
 create mode 100644 scripts/ci_review_test.py

diff --git a/.github/workflows/ci-review.yml b/.github/workflows/ci-review.yml
index 0cd33e664..c5a2da524 100644
--- a/.github/workflows/ci-review.yml
+++ b/.github/workflows/ci-review.yml
@@ -16,12 +16,28 @@ permissions:
 
 jobs:
   review:
+    name: ${{ matrix.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - kind: code
+            name: Code review
+            instructions: |
+              检查本次代码改动的正确性、仓库设计规则及已有 CI 结果。先读取 AGENTS.md 和 CONTRIBUTING.md，再查看相关实现和测试。
+              用 gh pr checks 查询这个 PR 已有的检查结果，必要时读取 Actions 日志。检查失败、缺失或尚未完成时如实报告，不把合并当作检查通过的证据。
+              报告包括实际行为变化（1–3 条）、代码审查结论和 CI 状态。全部正常时保持简短；有问题时给出文件与行号、证据和最小修改建议。
+          - kind: docs
+            name: Docs review
+            instructions: |
+              每次都检查文档与本次代码变化是否一致，即使 PR 没改文档。读取相关实现、测试和完整文档，核对平台、命令、配置、路径、默认值、接口和操作流程，找出遗漏更新或已经过时的说明。
+              文档有修改（包括新增、删除和重命名）时，再检查文档内部及同主题文档间的矛盾、重复维护的事实、主题归属和中英文含义。按 AGENTS.md 和 CONTRIBUTING.md 的 Documentation ownership 表判断位置。必要的概述加链接、中英文对照和同一来源生成的文档不算重复。
+              分别报告“文档与代码一致性”和“文档矛盾、重复与归属”。未改文档时，第二项写“本次未修改文档”。只报告本次修改引入或使之过时的、有依据的问题，给出文件与行号、对应代码或文档依据，以及最小修改建议。测试或链接检查通过不代表语义一致。
     if: github.event.pull_request.merged == true
     runs-on: ${{ vars.OAC_USE_GITHUB_RUNNERS == 'true' && 'ubuntu-24.04' || 'blacksmith-2vcpu-ubuntu-2404' }}
     timeout-minutes: 30
     env:
-      # allowed_non_write_users turns on a subprocess secret scrub; opt out so Claude's
-      # commands can read GH_TOKEN and the Feishu webhook.
+      # Keep GH_TOKEN available to read the PR and Actions logs.
       CLAUDE_CODE_SUBPROCESS_ENV_SCRUB: '0'
     steps:
       # The triggering revision is already on main, so its rules and code are trusted.
@@ -30,14 +46,15 @@ jobs:
           ref: ${{ github.event.pull_request.merge_commit_sha }}
           fetch-depth: 2
           persist-credentials: false
-      - name: Review and send Feishu card with Claude Code
-        # Notification is best effort: a failed review or delivery never fails the job.
+      - name: Prepare the report schema
+        id: schema
+        run: python3 scripts/ci_review.py schema >> "$GITHUB_OUTPUT"
+      - name: Review with Claude Code
+        id: llm
         continue-on-error: true
         timeout-minutes: 25
         uses: anthropics/claude-code-action@12dd8d74c712f5f3669365b2369b558c495b1104 # v1
         env:
-          FEISHU_WEBHOOK_URL: ${{ secrets.FEISHU_WEBHOOK_URL }}
-          FEISHU_WEBHOOK_SECRET: ${{ secrets.FEISHU_WEBHOOK_SECRET }}
           ANTHROPIC_BASE_URL: https://api.minimax.cn/anthropic
           ANTHROPIC_AUTH_TOKEN: ${{ secrets.MINIMAX_API_KEY }}
           CLAUDE_CODE_AUTO_COMPACT_WINDOW: '524288'
@@ -54,29 +71,57 @@ jobs:
           allowed_bots: '*'
           allowed_non_write_users: '*'
           prompt: |
-            你是 CI 的负责人，负责审核 CI 结果并给出结论。
-            仓库 ${{ github.repository }} 的 PR #${{ github.event.pull_request.number }} 已合入 main：
-            - PR：https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}
-            - 合并 commit：${{ github.event.pull_request.merge_commit_sha }}（已 checkout 到当前目录）
-
-            用 gh pr checks ${{ github.event.pull_request.number }} --repo ${{ github.repository }} 查询这个 PR 已有的检查结果，必要时读取对应 Actions 日志。不要触发新的 CI，也不要把合并本身当作检查通过的证据；管理员可能绕过门禁。检查失败、缺失或尚未完成时如实报告。
+            你负责本次 PR 的 ${{ matrix.name }}，在独立上下文中完成审查。
+            仓库：${{ github.repository }}；PR：#${{ github.event.pull_request.number }}。
+            合并提交：${{ github.event.pull_request.merge_commit_sha }}，已检出到当前目录。
+            先用 gh pr diff ${{ github.event.pull_request.number }} --repo ${{ github.repository }} 读取变更清单与完整差异，再检查相关文件。
 
-            任务：给飞书群发一张中文卡片（Card 2.0）总结这次 CI，尽量在 10 轮以内给出结论，工具调用尽可能的并行。
-            环境里有 gh（已登录，GH_TOKEN）、git、node 和完整的仓库代码。
+            ${{ matrix.instructions }}
 
-            卡片要让手机上的读者快速看懂，如果一切正常，表达的尽可能简单，如果没有问题，尽量简洁：
-            1. 哪个 PR（github id + PR 标题 + 链接）
-              - 如：`github id: jing332, PR 标题: 添加一个新功能, 链接: https://github.com/org/repo/pull/123`
-            2. 改了什么（实际行为变化，1–3 条）
-              - 如：`添加了一个新功能、修改了 web 和 backend 的 CI`
-            3. 是否符合仓库规则（AGENTS.md、CONTRIBUTING.md 及相关文档）：未发现明确违规 / 发现需修复问题 / 信息不足，无法确认
-              - 如：`符合仓库规则`
-            4. CI 哪里失败、可能的原因（可以看日志），全部通过就直接说通过，不要给出细节。如果 CI 失败，则详细说明。
-              - 如：`CI 失败，具体是哪几个失败；全部通过 ✅`
-
-            发送：webhook 地址在环境变量 FEISHU_WEBHOOK_URL。
-            响应 code=0 才算成功，失败就排查并重试，直到发出去。最后用一句中文说明结果，如：`CI 结果已发送至飞书群`。
-            不要在输出里打印 webhook 地址和密钥。
+            按 JSON schema 返回中文报告。status 为 ok（未发现问题）、issues（发现有证据的问题）或 incomplete（审查失败、范围未检查完整或检查结果尚未完成）。有问题且仍有未检查项时，用 issues 并在 summary 中说明缺项。summary 无问题时简短，有问题时保留依据和建议，遵守 schema 的长度限制。
+            只读审查，不修改仓库，不触发新的 CI，不发送消息。两份报告会由后续 job 合并发送。
           claude_args: >-
-            --allowedTools Bash Read Write Edit Glob Grep WebFetch WebSearch
+            --allowedTools Bash Read Glob Grep
             --max-turns 30
+            --json-schema '${{ steps.schema.outputs.schema }}'
+      - name: Save the review result
+        if: always()
+        env:
+          REVIEW_OUTCOME: ${{ steps.llm.outcome }}
+          REVIEW_RESULT: ${{ steps.llm.outputs.structured_output }}
+        run: python3 scripts/ci_review.py collect "$RUNNER_TEMP/review-${{ matrix.kind }}.json"
+      - uses: actions/upload-artifact@v6
+        if: always()
+        with:
+          name: ci-review-${{ matrix.kind }}
+          path: ${{ runner.temp }}/review-${{ matrix.kind }}.json
+          if-no-files-found: error
+          overwrite: true
+          retention-days: 7
+
+  notify:
+    name: Combined Feishu notification
+    needs: review
+    if: always() && github.event.pull_request.merged == true
+    runs-on: ${{ vars.OAC_USE_GITHUB_RUNNERS == 'true' && 'ubuntu-24.04' || 'blacksmith-2vcpu-ubuntu-2404' }}
+    timeout-minutes: 5
+    permissions:
+      contents: read
+      actions: read
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
+          persist-credentials: false
+      - uses: actions/download-artifact@v6
+        continue-on-error: true
+        with:
+          pattern: ci-review-*
+          merge-multiple: true
+          path: ${{ runner.temp }}/reviews
+      - name: Send one card with both results
+        continue-on-error: true
+        env:
+          FEISHU_WEBHOOK_URL: ${{ secrets.FEISHU_WEBHOOK_URL }}
+          FEISHU_WEBHOOK_SECRET: ${{ secrets.FEISHU_WEBHOOK_SECRET }}
+        run: python3 scripts/ci_review.py notify "$RUNNER_TEMP/reviews"
diff --git a/docs/maintainers.md b/docs/maintainers.md
index 166c39feb..8863ed7b3 100644
--- a/docs/maintainers.md
+++ b/docs/maintainers.md
@@ -192,7 +192,9 @@ The final `check` runs even when planning or a dependency fails. It requires a s
 
 Use **Actions → core-check → Run workflow** for a manual full check. For a transient failure, use GitHub's **Re-run failed jobs** so successful jobs remain completed. PR updates cancel the superseded run through Actions concurrency. Build and dependency caches speed execution; they do not stand in for successful tests. Native release installers are passed between jobs using Actions artifacts, within the same release workflow.
 
-The `CI review and Feishu notification` workflow runs once after a PR merges into main. It checks out the merged commit, reads that PR's existing checks and logs, and reports their actual status. It does not trigger another test run. Closing an unmerged PR does not invoke the review. The workflow uses `pull_request_target` only for the merged event and never checks out an unmerged PR head with notification credentials.
+The `CI review and Feishu notification` workflow runs after a PR merges into main. A matrix runs **Code review** and **Docs review** in independent LLM contexts with `fail-fast: false`. Both read the merged commit and PR diff. Code review checks implementation, repository rules and existing CI results; it does not start another test run. Docs review checks changed behavior against documentation even when no docs changed. When docs change, it also checks contradictions, duplicated facts, topic ownership under CONTRIBUTING, and English/Chinese agreement. Findings include file and line references, supporting evidence and a minimal correction. Reviews read the repository without editing it.
+
+Each review returns a structured result (`ok`, `issues` or `incomplete`) and a Chinese summary, retained as an Actions artifact for seven days. **Combined Feishu notification** waits for both jobs and sends one Card 2.0 message containing both results through the existing `FEISHU_WEBHOOK_URL`; `FEISHU_WEBHOOK_SECRET` optionally signs it. Only this notification job receives the webhook secrets. Failed, missing or invalid reports appear as incomplete, alongside any available result from the other review. The notification job runs even when a review fails. Delivery requires Feishu's `code=0` response; a failed or ambiguous request is not automatically retried, avoiding duplicate messages. Review and delivery failures do not block merges, and closing an unmerged PR does not trigger this workflow. The workflow checks out only the merged commit with notification credentials.
 
 Browser jobs own separate fixtures and servers; increasing workers against the shared mutable fixture is unsafe. Failed browser jobs retain reports/traces for seven days. Native failure phase summaries are retained for seven days and detailed output stays in the Actions logs; credentials and temporary installation trees are not uploaded. Successful native archives are uploaded only for explicit manual packaging or releases, without recompressing the compressed archive. Release distribution artifacts retain their existing recovery policy; failed publication can reuse the original build as described above.
 
diff --git a/docs/zh/maintainers.md b/docs/zh/maintainers.md
index aebb1a172..152722ce3 100644
--- a/docs/zh/maintainers.md
+++ b/docs/zh/maintainers.md
@@ -1,7 +1,7 @@
 ---
 title: "构建并发布 OpenAgentCore"
 source: docs/maintainers.md
-source_hash: 4f9fd38af5afd47e21589160930347f6693dd4786f56fb2dff2abd4853b3f72f
+source_hash: bfe6a890a27ff93640636197e72241c71f94c14ca62385be54c69f203ee563e1
 ---
 
 本指南面向负责构建和发布 OpenAgentCore 的维护者。要安装 Core 和 Web，请使用 [安装指南](getting-started/install.md)。安装器代码遵循的规则见 [部署](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/README.md) 和 [节点安装器](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/node/README.md)；必需检查见 [CONTRIBUTING](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#required-checks)。
@@ -196,7 +196,9 @@ Go 模块和工作区输入会选择后端、API（包括容器）、原生和
 
 要手动执行完整检查，请使用 **Actions → core-check → Run workflow**。遇到暂时性故障时，请使用 GitHub 的 **Re-run failed jobs**，这样已成功的作业可保持完成状态。PR 更新后，Actions 并发机制会取消已被取代的运行。构建和依赖项缓存可加快执行，但不能替代成功的测试。原生发布安装器通过 Actions 构建产物在同一发布工作流的不同作业之间传递。
 
-`CI review and Feishu notification` 工作流仅在 PR 合并到 main 后运行一次。它检出合并后的提交，读取该 PR 已有的检查和日志，并报告实际状态，不会触发另一轮测试。关闭未合并 PR 不触发审查。该工作流只针对合并事件使用 `pull_request_target`，绝不在持有通知凭据时检出未合并 PR 的 head。
+`CI review and Feishu notification` 工作流在 PR 合入 main 后运行。矩阵中的 **Code review** 和 **Docs review** 使用独立的 LLM 上下文，并设置 `fail-fast: false`。两者读取合并后的提交和 PR 差异。代码审查检查实现、仓库规则和已有 CI 结果，不触发新一轮测试。文档审查会核对行为变化与文档是否一致，即使没有修改文档；修改文档时，还会检查矛盾、重复维护的事实、CONTRIBUTING 规定的主题归属及中英文含义。每项问题包含文件和行号、依据及最小修改建议。审查只读取仓库，不修改文件。
+
+每项审查返回结构化结果（`ok`、`issues` 或 `incomplete`）及中文摘要，作为 Actions 构建产物保留七天。**Combined Feishu notification** 等待两项审查结束，通过已有的 `FEISHU_WEBHOOK_URL` 发送一张包含两份结果的 Card 2.0 卡片；可选的 `FEISHU_WEBHOOK_SECRET` 用于签名。只有通知 job 能读取 webhook 密钥。审查失败、报告缺失或格式无效时标为未完成，另一项已有的结果照常展示。某项审查失败时，通知 job 仍会运行。只有飞书返回 `code=0` 才确认送达；请求失败或送达状态不明时不自动重试，以免重复发消息。审查和发送失败不会阻止合并；关闭未合并的 PR 不触发此流程。持有通知凭据时，工作流只检出合并后的提交。
 
 浏览器作业各自拥有独立的固定数据和服务；对共享可变固定数据增加 worker 数不安全。失败的浏览器作业保留报告与 trace 七天。原生失败阶段摘要保留七天，详细输出留在 Actions 日志中；凭据和临时安装目录不上传。成功的原生归档仅用于显式手动打包或发布时上传，不重新压缩已压缩的归档。发布分发产物保留现有恢复策略；失败发布可以按前述方式复用原构建。
 
diff --git a/scripts/ci_review.py b/scripts/ci_review.py
new file mode 100644
index 000000000..a6b97b887
--- /dev/null
+++ b/scripts/ci_review.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python3
+"""Collect independent review reports and deliver one Feishu card."""
+
+import argparse
+import base64
+import hashlib
+import hmac
+import json
+import os
+from pathlib import Path
+import re
+import time
+import urllib.error
+import urllib.request
+
+
+STATUSES = {"ok": "未发现问题", "issues": "发现问题", "incomplete": "未完成"}
+MAX_SUMMARY = 2000
+SCHEMA = {
+    "type": "object",
+    "properties": {
+        "status": {"type": "string", "enum": list(STATUSES)},
+        "summary": {"type": "string", "minLength": 1, "maxLength": MAX_SUMMARY},
+    },
+    "required": ["status", "summary"],
+    "additionalProperties": False,
+}
+
+
+def incomplete(reason):
+    return {"status": "incomplete", "summary": reason}
+
+
+def parse_report(raw):
+    try:
+        report = json.loads(raw)
+    except (ValueError, TypeError):
+        return incomplete("未收到有效报告，请查看审查日志。")
+    if (not isinstance(report, dict) or set(report) != set(SCHEMA["required"])
+            or not isinstance(report["status"], str) or report["status"] not in STATUSES
+            or not isinstance(report["summary"], str) or not report["summary"].strip()
+            or len(report["summary"]) > MAX_SUMMARY):
+        return incomplete("报告格式不完整，请查看审查日志。")
+    return report
+
+
+def collect(outcome, raw):
+    if outcome != "success":
+        return incomplete("审查未成功结束，请查看审查日志。")
+    return parse_report(raw)
+
+
+def read_report(directory, kind):
+    try:
+        return parse_report((directory / f"review-{kind}.json").read_text())
+    except (OSError, UnicodeError):
+        return incomplete("审查报告缺失，请查看审查日志。")
+
+
+def markdown_text(value):
+    return re.sub(r"([\\`*_{}\[\]()<>!])", r"\\\1", value)
+
+
+def build_card(event, reports, run_url):
+    pr = event["pull_request"]
+    statuses = {report["status"] for report in reports.values()}
+    color = "red" if "issues" in statuses else "yellow" if "incomplete" in statuses else "green"
+    elements = [{"tag": "markdown", "content": (
+        f"**{markdown_text(pr['title'][:200])}**\n"
+        f"{markdown_text(pr['user']['login'])} · [PR #{pr['number']}]({pr['html_url']})"
+    )}]
+    for kind, title in (("code", "代码审查与 CI"), ("docs", "文档审查")):
+        report = reports[kind]
+        # Feishu mentions use HTML-like tags; reports are ordinary Markdown.
+        summary = report["summary"].replace("<", "&lt;").replace(">", "&gt;")
+        elements.append({"tag": "markdown", "content": f"**{title}：{STATUSES[report['status']]}**\n{summary}"})
+    elements.append({"tag": "markdown", "content": f"[查看审查日志]({run_url})"})
+    return {
+        "msg_type": "interactive",
+        "card": {
+            "schema": "2.0",
+            "header": {"template": color, "title": {"tag": "plain_text", "content": f"CI 审查 · PR #{pr['number']}"}},
+            "body": {"elements": elements},
+        },
+    }
+
+
+def send_card(webhook, secret, card):
+    if not webhook:
+        raise ValueError("FEISHU_WEBHOOK_URL is not configured")
+    payload = dict(card)
+    if secret:
+        timestamp = str(int(time.time()))
+        key = f"{timestamp}\n{secret}".encode()
+        payload.update(timestamp=timestamp, sign=base64.b64encode(hmac.new(key, b"", hashlib.sha256).digest()).decode())
+    data = json.dumps(payload, ensure_ascii=False).encode()
+    if len(data) > 20000:
+        raise ValueError("Review card exceeds the webhook message size limit")
+    request = urllib.request.Request(webhook, data=data, headers={"Content-Type": "application/json"}, method="POST")
+    # A timeout may follow successful delivery; retrying could send a duplicate.
+    try:
+        with urllib.request.urlopen(request, timeout=30) as response:
+            result = json.load(response)
+    except (OSError, ValueError, urllib.error.URLError):
+        raise ValueError("Feishu delivery failed; delivery status is unknown") from None
+    if not isinstance(result, dict) or type(result.get("code")) is not int or result["code"] != 0:
+        raise ValueError("Feishu did not confirm delivery")
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    commands = parser.add_subparsers(dest="command", required=True)
+    commands.add_parser("schema")
+    commands.add_parser("collect").add_argument("output", type=Path)
+    commands.add_parser("notify").add_argument("directory", type=Path)
+    args = parser.parse_args()
+    if args.command == "schema":
+        print("schema=" + json.dumps(SCHEMA, separators=(",", ":")))
+    elif args.command == "collect":
+        report = collect(os.environ.get("REVIEW_OUTCOME"), os.environ.get("REVIEW_RESULT", ""))
+        args.output.write_text(json.dumps(report, ensure_ascii=False))
+    else:
+        event = json.loads(Path(os.environ["GITHUB_EVENT_PATH"]).read_text())
+        reports = {kind: read_report(args.directory, kind) for kind in ("code", "docs")}
+        run_url = f"{os.environ['GITHUB_SERVER_URL']}/{os.environ['GITHUB_REPOSITORY']}/actions/runs/{os.environ['GITHUB_RUN_ID']}"
+        card = build_card(event, reports, run_url)
+        summary = os.environ.get("GITHUB_STEP_SUMMARY")
+        if summary:
+            with open(summary, "a") as output:
+                output.write("\n\n".join(element["content"] for element in card["card"]["body"]["elements"]) + "\n")
+        send_card(os.environ.get("FEISHU_WEBHOOK_URL"), os.environ.get("FEISHU_WEBHOOK_SECRET"), card)
+        print("代码与文档审查结果已合并发送至飞书群。")
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except ValueError as error:
+        raise SystemExit(str(error)) from None
diff --git a/scripts/ci_review_test.py b/scripts/ci_review_test.py
new file mode 100644
index 000000000..05161c0a8
--- /dev/null
+++ b/scripts/ci_review_test.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+"""Exercise combined notification and incomplete-review behavior without sending messages."""
+
+import io
+import json
+from pathlib import Path
+import tempfile
+import unittest
+from unittest.mock import patch
+
+import ci_review as review
+
+
+class ReviewTests(unittest.TestCase):
+    event = {"pull_request": {"number": 485, "title": "Review docs", "html_url": "https://github.com/org/repo/pull/485", "user": {"login": "author"}}}
+    run_url = "https://github.com/org/repo/actions/runs/123"
+
+    def setUp(self):
+        self.ok = {"status": "ok", "summary": "未发现问题"}
+
+    def card(self, code=None, docs=None):
+        return review.build_card(self.event, {"code": code or self.ok, "docs": docs or self.ok}, self.run_url)
+
+    @patch("ci_review.urllib.request.urlopen")
+    def test_two_reports_make_one_delivery(self, post):
+        post.return_value = io.BytesIO(b'{"code":0}')
+        card = self.card(docs={"status": "issues", "summary": "docs/install.md:12 与代码不符"})
+        review.send_card("https://example.invalid/webhook", "", card)
+        post.assert_called_once()
+        payload = json.loads(post.call_args.args[0].data)
+        self.assertEqual(payload["card"]["schema"], "2.0")
+        self.assertEqual(payload["card"]["header"]["template"], "red")
+        text = "\n".join(item["content"] for item in payload["card"]["body"]["elements"])
+        self.assertIn("代码审查与 CI：未发现问题", text)
+        self.assertIn("文档审查：发现问题", text)
+        self.assertIn("docs/install.md:12", text)
+        self.assertIn(self.run_url, text)
+        self.assertNotIn("sign", payload)
+
+    def test_failed_action_cannot_publish_a_success_report(self):
+        for outcome in ("failure", "cancelled", "skipped", None):
+            with self.subTest(outcome=outcome):
+                result = review.collect(outcome, json.dumps(self.ok))
+                self.assertEqual(result["status"], "incomplete")
+                self.assertEqual(self.card(code=result)["card"]["header"]["template"], "yellow")
+
+    def test_invalid_or_missing_reports_are_incomplete(self):
+        for raw in ("", "not json", "null", "[]", '{"status":"ok"}', '{"status":[],"summary":"x"}', '{"status":"ok","summary":" "}', json.dumps({"status": "ok", "summary": "x" * 2001})):
+            with self.subTest(raw=raw[:50]):
+                self.assertEqual(review.collect("success", raw)["status"], "incomplete")
+        root = Path.home() / ".oac/tests"
+        root.mkdir(parents=True, exist_ok=True)
+        with tempfile.TemporaryDirectory(dir=root) as directory:
+            path = Path(directory)
+            (path / "review-code.json").write_text(json.dumps(self.ok))
+            self.assertEqual(review.read_report(path, "code"), self.ok)
+            self.assertEqual(review.read_report(path, "docs")["status"], "incomplete")
+
+    @patch("ci_review.urllib.request.urlopen")
+    def test_http_success_requires_feishu_confirmation(self, post):
+        for body in (b'{"code":19021}', b'{}', b'{"code":false}', b'not json'):
+            with self.subTest(body=body):
+                post.reset_mock()
+                post.return_value = io.BytesIO(body)
+                with self.assertRaises(ValueError):
+                    review.send_card("https://example.invalid/webhook", "", self.card())
+                post.assert_called_once()
+
+    @patch("ci_review.urllib.request.urlopen", side_effect=TimeoutError("private-webhook"))
+    def test_ambiguous_delivery_is_not_retried_or_logged_with_secrets(self, post):
+        with self.assertRaisesRegex(ValueError, "delivery status is unknown") as error:
+            review.send_card("https://example.invalid/private-webhook", "private-signing-key", self.card())
+        self.assertNotIn("private", str(error.exception))
+        post.assert_called_once()
+
+    @patch("ci_review.time.time", return_value=1700000000)
+    @patch("ci_review.urllib.request.urlopen")
+    def test_optional_signing(self, post, _clock):
+        post.return_value = io.BytesIO(b'{"code":0}')
+        review.send_card("https://example.invalid/webhook", "test-secret", self.card())
+        payload = json.loads(post.call_args.args[0].data)
+        self.assertEqual(payload["timestamp"], "1700000000")
+        self.assertEqual(payload["sign"], "mbm4Y4oluIPQ00qlBIhX8vAZ0EKv3nw0LuTb91jPL84=")
+
+    @patch("ci_review.urllib.request.urlopen")
+    def test_bounded_unicode_reports_and_mentions(self, post):
+        post.return_value = io.BytesIO(b'{"code":0}')
+        report = {"status": "issues", "summary": "<at id=all>所有人</at>" + "问" * 1950}
+        review.send_card("https://example.invalid/webhook", "", self.card(report, report))
+        data = post.call_args.args[0].data
+        self.assertLess(len(data), 20000)
+        self.assertNotIn(b"<at", data)
+
+
+if __name__ == "__main__":
+    unittest.main()

From addf285f2ece69c00dd5a69c474d3f71980763ba Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 21:08:13 +0800
Subject: [PATCH 26/60] fix(ci): retain completed reviews within the execution
 timeout (#487)

---
 .github/workflows/ci-review.yml | 4 ++--
 docs/maintainers.md             | 2 +-
 docs/zh/maintainers.md          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-review.yml b/.github/workflows/ci-review.yml
index c5a2da524..2f328e429 100644
--- a/.github/workflows/ci-review.yml
+++ b/.github/workflows/ci-review.yml
@@ -32,7 +32,7 @@ jobs:
             instructions: |
               每次都检查文档与本次代码变化是否一致，即使 PR 没改文档。读取相关实现、测试和完整文档，核对平台、命令、配置、路径、默认值、接口和操作流程，找出遗漏更新或已经过时的说明。
               文档有修改（包括新增、删除和重命名）时，再检查文档内部及同主题文档间的矛盾、重复维护的事实、主题归属和中英文含义。按 AGENTS.md 和 CONTRIBUTING.md 的 Documentation ownership 表判断位置。必要的概述加链接、中英文对照和同一来源生成的文档不算重复。
-              分别报告“文档与代码一致性”和“文档矛盾、重复与归属”。未改文档时，第二项写“本次未修改文档”。只报告本次修改引入或使之过时的、有依据的问题，给出文件与行号、对应代码或文档依据，以及最小修改建议。测试或链接检查通过不代表语义一致。
+              分别报告“文档与代码一致性”和“文档矛盾、重复与归属”。未改文档时，第二项写“本次未修改文档”。只报告本次修改引入或使之过时的、有依据的问题，给出文件与行号、对应代码或文档依据，以及最小修改建议。测试或链接检查通过不代表语义一致。只报告影响读者理解或操作的具体问题，不把未穷举实现细节当作文档缺陷。
     if: github.event.pull_request.merged == true
     runs-on: ${{ vars.OAC_USE_GITHUB_RUNNERS == 'true' && 'ubuntu-24.04' || 'blacksmith-2vcpu-ubuntu-2404' }}
     timeout-minutes: 30
@@ -79,10 +79,10 @@ jobs:
             ${{ matrix.instructions }}
 
             按 JSON schema 返回中文报告。status 为 ok（未发现问题）、issues（发现有证据的问题）或 incomplete（审查失败、范围未检查完整或检查结果尚未完成）。有问题且仍有未检查项时，用 issues 并在 summary 中说明缺项。summary 无问题时简短，有问题时保留依据和建议，遵守 schema 的长度限制。
+            围绕本次 diff 和受影响的文档展开，证据充分后输出结果，避免重复核对同一结论。
             只读审查，不修改仓库，不触发新的 CI，不发送消息。两份报告会由后续 job 合并发送。
           claude_args: >-
             --allowedTools Bash Read Glob Grep
-            --max-turns 30
             --json-schema '${{ steps.schema.outputs.schema }}'
       - name: Save the review result
         if: always()
diff --git a/docs/maintainers.md b/docs/maintainers.md
index 8863ed7b3..7f3ac6626 100644
--- a/docs/maintainers.md
+++ b/docs/maintainers.md
@@ -194,7 +194,7 @@ Use **Actions → core-check → Run workflow** for a manual full check. For a t
 
 The `CI review and Feishu notification` workflow runs after a PR merges into main. A matrix runs **Code review** and **Docs review** in independent LLM contexts with `fail-fast: false`. Both read the merged commit and PR diff. Code review checks implementation, repository rules and existing CI results; it does not start another test run. Docs review checks changed behavior against documentation even when no docs changed. When docs change, it also checks contradictions, duplicated facts, topic ownership under CONTRIBUTING, and English/Chinese agreement. Findings include file and line references, supporting evidence and a minimal correction. Reviews read the repository without editing it.
 
-Each review returns a structured result (`ok`, `issues` or `incomplete`) and a Chinese summary, retained as an Actions artifact for seven days. **Combined Feishu notification** waits for both jobs and sends one Card 2.0 message containing both results through the existing `FEISHU_WEBHOOK_URL`; `FEISHU_WEBHOOK_SECRET` optionally signs it. Only this notification job receives the webhook secrets. Failed, missing or invalid reports appear as incomplete, alongside any available result from the other review. The notification job runs even when a review fails. Delivery requires Feishu's `code=0` response; a failed or ambiguous request is not automatically retried, avoiding duplicate messages. Review and delivery failures do not block merges, and closing an unmerged PR does not trigger this workflow. The workflow checks out only the merged commit with notification credentials.
+Each review returns a structured result (`ok`, `issues` or `incomplete`) and a Chinese summary, retained as an Actions artifact for seven days. **Combined Feishu notification** waits for both jobs and sends one Card 2.0 message containing both results through the existing `FEISHU_WEBHOOK_URL`; `FEISHU_WEBHOOK_SECRET` optionally signs it. Only this notification job receives the webhook secrets. Failed, missing or invalid reports appear as incomplete, alongside any available result from the other review. The notification job runs even when a review fails. Delivery requires Feishu's `code=0` response; a failed or ambiguous request is not automatically retried, avoiding duplicate messages. Each review has a 25-minute execution timeout. Review and delivery failures do not block merges, and closing an unmerged PR does not trigger this workflow. The workflow checks out only the merged commit with notification credentials.
 
 Browser jobs own separate fixtures and servers; increasing workers against the shared mutable fixture is unsafe. Failed browser jobs retain reports/traces for seven days. Native failure phase summaries are retained for seven days and detailed output stays in the Actions logs; credentials and temporary installation trees are not uploaded. Successful native archives are uploaded only for explicit manual packaging or releases, without recompressing the compressed archive. Release distribution artifacts retain their existing recovery policy; failed publication can reuse the original build as described above.
 
diff --git a/docs/zh/maintainers.md b/docs/zh/maintainers.md
index 152722ce3..6fb303605 100644
--- a/docs/zh/maintainers.md
+++ b/docs/zh/maintainers.md
@@ -1,7 +1,7 @@
 ---
 title: "构建并发布 OpenAgentCore"
 source: docs/maintainers.md
-source_hash: bfe6a890a27ff93640636197e72241c71f94c14ca62385be54c69f203ee563e1
+source_hash: e3435d01696a172a0a0bcd5acecf4167410389f2c249730c9333f5d24027248d
 ---
 
 本指南面向负责构建和发布 OpenAgentCore 的维护者。要安装 Core 和 Web，请使用 [安装指南](getting-started/install.md)。安装器代码遵循的规则见 [部署](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/README.md) 和 [节点安装器](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/node/README.md)；必需检查见 [CONTRIBUTING](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#required-checks)。
@@ -198,7 +198,7 @@ Go 模块和工作区输入会选择后端、API（包括容器）、原生和
 
 `CI review and Feishu notification` 工作流在 PR 合入 main 后运行。矩阵中的 **Code review** 和 **Docs review** 使用独立的 LLM 上下文，并设置 `fail-fast: false`。两者读取合并后的提交和 PR 差异。代码审查检查实现、仓库规则和已有 CI 结果，不触发新一轮测试。文档审查会核对行为变化与文档是否一致，即使没有修改文档；修改文档时，还会检查矛盾、重复维护的事实、CONTRIBUTING 规定的主题归属及中英文含义。每项问题包含文件和行号、依据及最小修改建议。审查只读取仓库，不修改文件。
 
-每项审查返回结构化结果（`ok`、`issues` 或 `incomplete`）及中文摘要，作为 Actions 构建产物保留七天。**Combined Feishu notification** 等待两项审查结束，通过已有的 `FEISHU_WEBHOOK_URL` 发送一张包含两份结果的 Card 2.0 卡片；可选的 `FEISHU_WEBHOOK_SECRET` 用于签名。只有通知 job 能读取 webhook 密钥。审查失败、报告缺失或格式无效时标为未完成，另一项已有的结果照常展示。某项审查失败时，通知 job 仍会运行。只有飞书返回 `code=0` 才确认送达；请求失败或送达状态不明时不自动重试，以免重复发消息。审查和发送失败不会阻止合并；关闭未合并的 PR 不触发此流程。持有通知凭据时，工作流只检出合并后的提交。
+每项审查返回结构化结果（`ok`、`issues` 或 `incomplete`）及中文摘要，作为 Actions 构建产物保留七天。**Combined Feishu notification** 等待两项审查结束，通过已有的 `FEISHU_WEBHOOK_URL` 发送一张包含两份结果的 Card 2.0 卡片；可选的 `FEISHU_WEBHOOK_SECRET` 用于签名。只有通知 job 能读取 webhook 密钥。审查失败、报告缺失或格式无效时标为未完成，另一项已有的结果照常展示。某项审查失败时，通知 job 仍会运行。只有飞书返回 `code=0` 才确认送达；请求失败或送达状态不明时不自动重试，以免重复发消息。每项审查的执行超时为 25 分钟。审查和发送失败不会阻止合并；关闭未合并的 PR 不触发此流程。持有通知凭据时，工作流只检出合并后的提交。
 
 浏览器作业各自拥有独立的固定数据和服务；对共享可变固定数据增加 worker 数不安全。失败的浏览器作业保留报告与 trace 七天。原生失败阶段摘要保留七天，详细输出留在 Actions 日志中；凭据和临时安装目录不上传。成功的原生归档仅用于显式手动打包或发布时上传，不重新压缩已压缩的归档。发布分发产物保留现有恢复策略；失败发布可以按前述方式复用原构建。
 

From 516fd3041132d47bb7ad45be537f68c6f37fa777 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 21:16:38 +0800
Subject: [PATCH 27/60] Run Harnesses unattended and delete the interaction
 protocol (#489)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Every Harness now runs unattended; a human in the loop goes only through
function tools and requires_action, as in the pinned Agents API.

- mcode advertises no elicitation and answers session/request_permission
  with the ACP cancelled outcome, which mcode treats as a denial; other
  client methods get -32601.
- codex disables its blocking tools.experimental_request_user_input tool;
  under approval policy never it settles MCP elicitation itself, and any
  other server request gets the client's method-not-found reply. The
  approval policy and sandbox unions collapse to constants.
- Delete permission_request, permission_cancel, permission_decision,
  prompt_for_user_choice, prompt_for_user_choice_decision, device_shutdown,
  the Permissions capability, the responder interfaces, the daemon
  interaction routing, the gateway interaction indexes and the
  interaction_not_supported diagnostic.
- interaction_decision_ack stays for function results and cancellation;
  the daemon's applied-result replay now serves function results only.

Bumps the Core–Runtime protocol to 0.12.0, which also covers the earlier
agent_options, request-field and prompt_request removals.
---
 .../internal/agent/claudesdk/contracts.go     |   2 -
 .../internal/agent/claudesdk/declaration.go   |   1 -
 .../internal/agent/claudesdk/unsupported.go   |  11 +-
 .../agent/claudesdk/unsupported_test.go       |   4 -
 .../internal/agent/codex/approval_policy.go   |  85 ----
 .../agent/codex/approval_policy_test.go       | 142 -------
 apps/daemon/internal/agent/codex/contracts.go |   2 -
 .../internal/agent/codex/declaration.go       |   1 -
 .../internal/agent/codex/declaration_test.go  |   2 +-
 .../agent/codex/execution_controls_test.go    |   2 +-
 apps/daemon/internal/agent/codex/executor.go  |   2 +-
 .../internal/agent/codex/executor_turn.go     |   9 +-
 .../agent/codex/function_receipt_test.go      |   8 +-
 .../codex/function_write_receipt_test.go      |   4 +-
 .../internal/agent/codex/functions_test.go    |  12 +-
 apps/daemon/internal/agent/codex/options.go   |  15 +-
 .../internal/agent/codex/options_test.go      |   8 +-
 .../agent/codex/permission_profile_test.go    |   3 -
 .../internal/agent/codex/preparation.go       |   1 -
 apps/daemon/internal/agent/codex/protocol.go  | 182 +--------
 .../agent/codex/protocol_wire_test.go         |  64 +---
 .../internal/agent/codex/rpc_close_test.go    |   2 +-
 .../internal/agent/codex/server_requests.go   | 362 ------------------
 .../agent/codex/server_requests_mcp.go        |  38 --
 .../agent/codex/server_requests_mcp_test.go   | 100 -----
 .../agent/codex/server_requests_test.go       | 357 -----------------
 apps/daemon/internal/agent/codex/session.go   |  25 +-
 .../internal/agent/codex/session_cancel.go    |   1 -
 .../agent/codex/session_cancel_test.go        |   2 +-
 .../agent/codex/session_cancel_write_test.go  |   2 +-
 .../internal/agent/codex/session_plan.go      |   3 -
 .../internal/agent/codex/session_run.go       |   1 -
 .../codex/session_steering_lifecycle_test.go  |   2 +-
 .../internal/agent/codex/session_thread.go    |  18 +-
 .../agent/codex/subagent_observations_test.go |   2 +-
 .../agent/contract_declarations_test.go       |   2 -
 .../internal/agent/contracttest/text.go       |   2 +-
 apps/daemon/internal/agent/harness.go         |  18 +-
 apps/daemon/internal/agent/mcode/contracts.go |   2 -
 .../internal/agent/mcode/declaration.go       |   1 -
 .../internal/agent/mcode/declaration_test.go  |   2 +-
 apps/daemon/internal/agent/mcode/events.go    |  44 +--
 .../internal/agent/mcode/executor_turn.go     |   3 +-
 .../internal/agent/mcode/options_test.go      |  19 -
 apps/daemon/internal/agent/mcode/protocol.go  |  15 -
 apps/daemon/internal/agent/mcode/questions.go | 217 -----------
 .../internal/agent/mcode/questions_test.go    |  55 ---
 apps/daemon/internal/agent/mcode/session.go   |  32 +-
 .../internal/agent/mcode/session_test.go      |  70 ++--
 apps/daemon/internal/agent/registry.go        |  11 -
 apps/daemon/internal/agent/registry_test.go   |   9 +-
 .../dispatch/capability_admission_test.go     |  47 ---
 apps/daemon/internal/dispatch/export_test.go  |  23 --
 apps/daemon/internal/dispatch/functions.go    |  53 ++-
 .../dispatch/interaction_decisions.go         | 328 ----------------
 .../dispatch/optional_interactions_test.go    |  43 ---
 .../dispatch/preparation_cancel_test.go       |  14 +-
 .../preparation_executor_fixture_test.go      |  12 -
 .../internal/dispatch/preparation_start.go    |   2 +-
 .../internal/dispatch/preparation_test.go     |   2 +-
 .../internal/dispatch/prepared_handoff.go     |  15 -
 .../prepared_handoff_mutation_test.go         |  53 +--
 .../dispatch/prepared_handoff_test.go         |  23 +-
 apps/daemon/internal/dispatch/router.go       |  36 +-
 apps/daemon/internal/dispatch/router_test.go  | 248 +-----------
 apps/daemon/internal/dispatch/shutdown.go     |  37 +-
 apps/daemon/internal/dispatch/suspend.go      |   2 +-
 apps/daemon/internal/dispatch/suspend_test.go |  14 +-
 contracts/agents-api/core-errors.md           |   2 +-
 contracts/agents-api/harness-onboarding.md    |  17 +-
 contracts/agents-api/zh/core-errors.md        |   4 +-
 contracts/agents-api/zh/harness-onboarding.md |  19 +-
 docs/runtime-protocol.md                      |  14 +-
 docs/zh/runtime-protocol.md                   |  16 +-
 internal/agentdaemon/proto/envelope.go        |   5 +-
 internal/agentdaemon/proto/inbound.go         |  72 +---
 internal/agentdaemon/proto/outbound.go        |  49 ---
 .../proto/prototest/capabilities.go           |   1 -
 internal/agentdaemon/proto/tool_call_test.go  |  13 +
 internal/agentdaemon/proto/user_choice.go     |  67 ----
 .../agentdaemon/proto/user_choice_test.go     |  46 ---
 internal/agentdaemon/proto/version.go         |   2 +-
 .../internal/api/turn_diagnostic_failure.go   |   2 +-
 .../api/turn_diagnostic_failure_test.go       |   2 +-
 services/core/internal/execution/delivery.go  |   3 -
 services/core/internal/runtimedevice/state.go |   1 -
 .../mcp_bearer_live_linux_test.go             |  53 ++-
 .../core/internal/runtimegateway/registry.go  | 111 +-----
 .../core/internal/runtimegateway/session.go   |  36 +-
 .../internal/runtimegateway/session_test.go   |  83 +---
 .../runtime_compute_lifecycle_test.go         |   3 -
 91 files changed, 281 insertions(+), 3269 deletions(-)
 delete mode 100644 apps/daemon/internal/agent/codex/approval_policy.go
 delete mode 100644 apps/daemon/internal/agent/codex/approval_policy_test.go
 delete mode 100644 apps/daemon/internal/agent/codex/server_requests.go
 delete mode 100644 apps/daemon/internal/agent/codex/server_requests_mcp.go
 delete mode 100644 apps/daemon/internal/agent/codex/server_requests_mcp_test.go
 delete mode 100644 apps/daemon/internal/agent/codex/server_requests_test.go
 delete mode 100644 apps/daemon/internal/agent/mcode/questions.go
 delete mode 100644 apps/daemon/internal/agent/mcode/questions_test.go
 delete mode 100644 apps/daemon/internal/dispatch/interaction_decisions.go
 delete mode 100644 apps/daemon/internal/dispatch/optional_interactions_test.go
 create mode 100644 internal/agentdaemon/proto/tool_call_test.go
 delete mode 100644 internal/agentdaemon/proto/user_choice.go
 delete mode 100644 internal/agentdaemon/proto/user_choice_test.go

diff --git a/apps/daemon/internal/agent/claudesdk/contracts.go b/apps/daemon/internal/agent/claudesdk/contracts.go
index 4683fd3aa..72b94bdad 100644
--- a/apps/daemon/internal/agent/claudesdk/contracts.go
+++ b/apps/daemon/internal/agent/claudesdk/contracts.go
@@ -11,8 +11,6 @@ var (
 	_ agent.DurableSteerer           = (*session)(nil)
 	_ agent.Steerer                  = (*session)(nil)
 	_ agent.FunctionResultSubmitter  = (*session)(nil)
-	_ agent.PermissionResponder      = (*session)(nil)
-	_ agent.UserChoiceResponder      = (*session)(nil)
 	_ agent.WorkspaceReader          = (*session)(nil)
 	_ agent.WorkspaceDirectoryLister = (*session)(nil)
 	_ agent.WorkspaceWriter          = (*session)(nil)
diff --git a/apps/daemon/internal/agent/claudesdk/declaration.go b/apps/daemon/internal/agent/claudesdk/declaration.go
index bbe3bdd3a..6459a635f 100644
--- a/apps/daemon/internal/agent/claudesdk/declaration.go
+++ b/apps/daemon/internal/agent/claudesdk/declaration.go
@@ -22,7 +22,6 @@ const claudeSDKNodeEnv = "OAC_RUNTIME_CLAUDE_SDK_NODE"
 var Declaration = agent.Declaration{Info: proto.SupportedAgentKind{Kind: "claude_sdk", Capabilities: proto.AgentKindCapabilities{
 	SubagentObservations:           proto.CapabilityUnsupported,
 	Streaming:                      proto.CapabilitySupported,
-	Permissions:                    proto.CapabilityUnsupported,
 	Usage:                          proto.CapabilitySupported,
 	Resume:                         proto.CapabilitySupported,
 	NativeSessionRecovery:          proto.CapabilityUnsupported,
diff --git a/apps/daemon/internal/agent/claudesdk/unsupported.go b/apps/daemon/internal/agent/claudesdk/unsupported.go
index 091e6d167..d66e3cd5f 100644
--- a/apps/daemon/internal/agent/claudesdk/unsupported.go
+++ b/apps/daemon/internal/agent/claudesdk/unsupported.go
@@ -2,19 +2,10 @@ package claudesdk
 
 import (
 	"context"
-	"fmt"
+
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func (s *session) SubmitPermission(context.Context, string, proto.PermissionDecisionPayload) error {
-	return fmt.Errorf("%w: native permission responses are not exposed", agent.ErrUnsupportedOperation)
-}
-
-func (s *session) SubmitPromptForUserChoice(context.Context, string, proto.PromptForUserChoiceDecisionPayload) error {
-	return fmt.Errorf("%w: native user-choice responses are not exposed", agent.ErrUnsupportedOperation)
-}
-
 func (s *executor) WriteWorkspaceFile(context.Context, string, []byte) (agent.WorkspaceWriteResult, error) {
 	return agent.WorkspaceWriteResult{}, agent.ErrWorkspaceWriteUnsupported
 }
diff --git a/apps/daemon/internal/agent/claudesdk/unsupported_test.go b/apps/daemon/internal/agent/claudesdk/unsupported_test.go
index 82ee6cae2..9934a1038 100644
--- a/apps/daemon/internal/agent/claudesdk/unsupported_test.go
+++ b/apps/daemon/internal/agent/claudesdk/unsupported_test.go
@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
 // Nil concrete receivers prove Unsupported needs no native owner, transport,
@@ -25,9 +24,6 @@ func TestUnsupportedExtensionsHaveNoNativeEffects(t *testing.T) {
 			t.Fatal("unsupported error disclosed input")
 		}
 	}
-	var turn *session
-	check(turn.SubmitPermission(ctx, secret, proto.PermissionDecisionPayload{}))
-	check(turn.SubmitPromptForUserChoice(ctx, secret, proto.PromptForUserChoiceDecisionPayload{}))
 	for _, owner := range []agent.WorkspaceWriter{(*executor)(nil), (*session)(nil), (*prepared)(nil)} {
 		result, err := owner.WriteWorkspaceFile(ctx, secret, []byte(secret))
 		check(err)
diff --git a/apps/daemon/internal/agent/codex/approval_policy.go b/apps/daemon/internal/agent/codex/approval_policy.go
deleted file mode 100644
index 9b084e4da..000000000
--- a/apps/daemon/internal/agent/codex/approval_policy.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package codex
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-// SilentGranularPolicy disables every granular Codex approval gate.
-func SilentGranularPolicy() AskForApproval {
-	g := GranularAskForApproval{} // zero value = every gate false
-	return AskForApproval{Granular: &g}
-}
-
-// HumanApprovalPolicy lets Codex request sandbox escalation from Core.
-func HumanApprovalPolicy() AskForApproval {
-	return AskForApproval{String: "on-request"}
-}
-
-// IsSilent reports whether p suppresses every approval surface. The
-// daemon logs this distinction when it starts a thread. Server-request
-// handlers are always registered so explicit policy overrides cannot leave
-// Codex waiting on an unhandled request.
-//
-// A nil pointer is treated as silent — the safe default when callers
-// forget to wire a policy.
-func IsSilent(p *AskForApproval) bool {
-	if p == nil {
-		return true
-	}
-	if p.Granular != nil {
-		g := p.Granular
-		return !g.SandboxApproval && !g.Rules && !g.SkillApproval &&
-			!g.RequestPermissions && !g.MCPElicitations
-	}
-	// Bare string variants ("never" is silent; everything else surfaces).
-	return p.String == "never"
-}
-
-// MarshalJSON emits codex-rs's discriminated union — either a bare
-// string or the granular object. Producing both would deserialise to
-// the granular branch on the codex side (it wins precedence in
-// codex-rs/protocol.rs AskForApproval), but the wire would be wrong; we
-// validate exclusivity here.
-func (a AskForApproval) MarshalJSON() ([]byte, error) {
-	hasString := a.String != ""
-	hasGranular := a.Granular != nil
-	if hasString && hasGranular {
-		return nil, fmt.Errorf("codex: AskForApproval must set exactly one of String or Granular, got both")
-	}
-	if hasString {
-		return json.Marshal(a.String)
-	}
-	if hasGranular {
-		return json.Marshal(struct {
-			Granular *GranularAskForApproval `json:"granular"`
-		}{Granular: a.Granular})
-	}
-	// Neither set — preserve the historical zero-value encoding. Production
-	// plans always set a policy explicitly; an empty marshal would
-	// produce `null`, which codex-rs rejects.
-	return json.Marshal(struct {
-		Granular GranularAskForApproval `json:"granular"`
-	}{})
-}
-
-// UnmarshalJSON is the inverse: codex's ThreadStartResult.approvalPolicy
-// echoes back as either a string or {"granular":...}. Provided so tests
-// can round-trip without surprises; production code only marshals.
-func (a *AskForApproval) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err == nil {
-		a.String = s
-		a.Granular = nil
-		return nil
-	}
-	var obj struct {
-		Granular *GranularAskForApproval `json:"granular"`
-	}
-	if err := json.Unmarshal(data, &obj); err != nil {
-		return fmt.Errorf("codex: AskForApproval: %w", err)
-	}
-	a.Granular = obj.Granular
-	a.String = ""
-	return nil
-}
diff --git a/apps/daemon/internal/agent/codex/approval_policy_test.go b/apps/daemon/internal/agent/codex/approval_policy_test.go
deleted file mode 100644
index 7a98f06cd..000000000
--- a/apps/daemon/internal/agent/codex/approval_policy_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package codex
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-func TestSilentGranularPolicy_AllFalse(t *testing.T) {
-	p := SilentGranularPolicy()
-	if p.Granular == nil {
-		t.Fatal("SilentGranularPolicy must populate Granular")
-	}
-	g := *p.Granular
-	if g.SandboxApproval || g.Rules || g.SkillApproval || g.RequestPermissions || g.MCPElicitations {
-		t.Fatalf("silent policy must have every gate false, got %+v", g)
-	}
-	if !IsSilent(&p) {
-		t.Fatal("IsSilent must return true for the silent default")
-	}
-}
-
-func TestHumanApprovalPolicy_UsesOnRequest(t *testing.T) {
-	p := HumanApprovalPolicy()
-	if p.String != "on-request" || p.Granular != nil {
-		t.Fatalf("HumanApprovalPolicy = %+v, want on-request string policy", p)
-	}
-	if IsSilent(&p) {
-		t.Fatal("HumanApprovalPolicy must surface app-server requests")
-	}
-}
-
-func TestIsSilent_NilIsSilent(t *testing.T) {
-	if !IsSilent(nil) {
-		t.Fatal("nil policy must be treated as silent (safe default)")
-	}
-}
-
-func TestIsSilent_StringPolicies(t *testing.T) {
-	cases := []struct {
-		name   string
-		policy AskForApproval
-		want   bool
-	}{
-		{"never silences", AskForApproval{String: "never"}, true},
-		{"on-request loud", AskForApproval{String: "on-request"}, false},
-		{"untrusted loud", AskForApproval{String: "untrusted"}, false},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			if got := IsSilent(&tc.policy); got != tc.want {
-				t.Fatalf("IsSilent(%+v) = %v, want %v", tc.policy, got, tc.want)
-			}
-		})
-	}
-}
-
-func TestIsSilent_PartialGranularIsLoud(t *testing.T) {
-	// Flipping any single gate true must make IsSilent report false so
-	// the daemon registers the loud server-request handler.
-	for _, flip := range []func(*GranularAskForApproval){
-		func(g *GranularAskForApproval) { g.SandboxApproval = true },
-		func(g *GranularAskForApproval) { g.Rules = true },
-		func(g *GranularAskForApproval) { g.SkillApproval = true },
-		func(g *GranularAskForApproval) { g.RequestPermissions = true },
-		func(g *GranularAskForApproval) { g.MCPElicitations = true },
-	} {
-		g := GranularAskForApproval{}
-		flip(&g)
-		p := AskForApproval{Granular: &g}
-		if IsSilent(&p) {
-			t.Fatalf("IsSilent must be false when any gate is true: %+v", g)
-		}
-	}
-}
-
-func TestAskForApproval_MarshalString(t *testing.T) {
-	p := AskForApproval{String: "never"}
-	raw, err := json.Marshal(p)
-	if err != nil {
-		t.Fatalf("marshal: %v", err)
-	}
-	if string(raw) != `"never"` {
-		t.Fatalf("marshal string variant = %s", raw)
-	}
-}
-
-func TestAskForApproval_MarshalGranular(t *testing.T) {
-	g := GranularAskForApproval{RequestPermissions: true}
-	p := AskForApproval{Granular: &g}
-	raw, err := json.Marshal(p)
-	if err != nil {
-		t.Fatalf("marshal: %v", err)
-	}
-	want := `{"granular":{"sandbox_approval":false,"rules":false,"skill_approval":false,"request_permissions":true,"mcp_elicitations":false}}`
-	if string(raw) != want {
-		t.Fatalf("marshal granular = %s\nwant = %s", raw, want)
-	}
-}
-
-func TestAskForApproval_MarshalEmpty_DefaultsSilent(t *testing.T) {
-	// Neither field set — must not produce `null` (codex rejects it).
-	var p AskForApproval
-	raw, err := json.Marshal(p)
-	if err != nil {
-		t.Fatalf("marshal: %v", err)
-	}
-	if string(raw) == "null" {
-		t.Fatalf("empty AskForApproval must not marshal to null: %s", raw)
-	}
-	if string(raw) != `{"granular":{"sandbox_approval":false,"rules":false,"skill_approval":false,"request_permissions":false,"mcp_elicitations":false}}` {
-		t.Fatalf("empty AskForApproval marshal = %s", raw)
-	}
-}
-
-func TestAskForApproval_MarshalBothErrors(t *testing.T) {
-	g := GranularAskForApproval{}
-	p := AskForApproval{String: "never", Granular: &g}
-	if _, err := json.Marshal(p); err == nil {
-		t.Fatal("setting both String and Granular must error on marshal")
-	}
-}
-
-func TestAskForApproval_RoundTripString(t *testing.T) {
-	var got AskForApproval
-	if err := json.Unmarshal([]byte(`"on-request"`), &got); err != nil {
-		t.Fatalf("unmarshal: %v", err)
-	}
-	if got.String != "on-request" || got.Granular != nil {
-		t.Fatalf("round-trip = %+v", got)
-	}
-}
-
-func TestAskForApproval_RoundTripGranular(t *testing.T) {
-	src := `{"granular":{"sandbox_approval":true,"rules":false,"skill_approval":false,"request_permissions":false,"mcp_elicitations":false}}`
-	var got AskForApproval
-	if err := json.Unmarshal([]byte(src), &got); err != nil {
-		t.Fatalf("unmarshal: %v", err)
-	}
-	if got.Granular == nil || !got.Granular.SandboxApproval || got.String != "" {
-		t.Fatalf("round-trip = %+v", got)
-	}
-}
diff --git a/apps/daemon/internal/agent/codex/contracts.go b/apps/daemon/internal/agent/codex/contracts.go
index 0ba51146f..a6f045a89 100644
--- a/apps/daemon/internal/agent/codex/contracts.go
+++ b/apps/daemon/internal/agent/codex/contracts.go
@@ -11,8 +11,6 @@ var (
 	_ agent.DurableSteerer           = (*Session)(nil)
 	_ agent.Steerer                  = (*Session)(nil)
 	_ agent.FunctionResultSubmitter  = (*Session)(nil)
-	_ agent.PermissionResponder      = (*Session)(nil)
-	_ agent.UserChoiceResponder      = (*Session)(nil)
 	_ agent.WorkspaceReader          = (*Session)(nil)
 	_ agent.WorkspaceDirectoryLister = (*Session)(nil)
 	_ agent.WorkspaceWriter          = (*Session)(nil)
diff --git a/apps/daemon/internal/agent/codex/declaration.go b/apps/daemon/internal/agent/codex/declaration.go
index 2869f9da0..8e5aa004b 100644
--- a/apps/daemon/internal/agent/codex/declaration.go
+++ b/apps/daemon/internal/agent/codex/declaration.go
@@ -16,7 +16,6 @@ var Declaration = agent.Declaration{Info: proto.SupportedAgentKind{
 	Capabilities: proto.AgentKindCapabilities{
 		SubagentObservations:           proto.CapabilitySupported,
 		Streaming:                      proto.CapabilitySupported,
-		Permissions:                    proto.CapabilitySupported,
 		Usage:                          proto.CapabilitySupported,
 		Resume:                         proto.CapabilitySupported,
 		NativeSessionRecovery:          proto.CapabilityUnsupported,
diff --git a/apps/daemon/internal/agent/codex/declaration_test.go b/apps/daemon/internal/agent/codex/declaration_test.go
index b57d13e9a..8f5c7e757 100644
--- a/apps/daemon/internal/agent/codex/declaration_test.go
+++ b/apps/daemon/internal/agent/codex/declaration_test.go
@@ -29,7 +29,7 @@ func TestMCPRequiredDiscoveryRequiresPinnedNative(t *testing.T) {
 
 // The declaration must retain the complete baseline capability descriptor.
 func TestDeclaredCapabilityBaseline(t *testing.T) {
-	expected := map[string]bool{"SubagentObservations": true, "Streaming": true, "Permissions": true, "Usage": true, "Resume": true, "Steering": true, "MessageItems": true, "ToolObservations": true, "EnvironmentNone": true, "ProgrammaticToolCallingDisable": true, "WebSearchControl": true, "MessageImages": true, "FunctionResultImages": true, "SubagentControl": true, "DurableInputReceipts": true, "DurableTurns": true, "FunctionTools": true, "MCPHTTPTools": true, "MCPHTTPBearerAuth": true}
+	expected := map[string]bool{"SubagentObservations": true, "Streaming": true, "Usage": true, "Resume": true, "Steering": true, "MessageItems": true, "ToolObservations": true, "EnvironmentNone": true, "ProgrammaticToolCallingDisable": true, "WebSearchControl": true, "MessageImages": true, "FunctionResultImages": true, "SubagentControl": true, "DurableInputReceipts": true, "DurableTurns": true, "FunctionTools": true, "MCPHTTPTools": true, "MCPHTTPBearerAuth": true}
 	expected["ExecutionControls"], expected["TextVerbosity"] = SupportsTextVerbosity, SupportsTextVerbosity
 	value := reflect.ValueOf(Declaration.Info.Capabilities)
 	for i := 0; i < value.NumField(); i++ {
diff --git a/apps/daemon/internal/agent/codex/execution_controls_test.go b/apps/daemon/internal/agent/codex/execution_controls_test.go
index 65f8a058f..e9d6f5451 100644
--- a/apps/daemon/internal/agent/codex/execution_controls_test.go
+++ b/apps/daemon/internal/agent/codex/execution_controls_test.go
@@ -16,7 +16,7 @@ func TestExecutionControlsSelectNativeSettings(t *testing.T) {
 				t.Fatal(err)
 			}
 			plan.Cleanup()
-			want := [][2]string{{"web_search", `"` + search + `"`}, {"model_verbosity", `"` + verbosity + `"`}}
+			want := [][2]string{{"tools.experimental_request_user_input.enabled", "false"}, {"web_search", `"` + search + `"`}, {"model_verbosity", `"` + verbosity + `"`}}
 			if !reflect.DeepEqual(plan.ExtraConfig, want) {
 				t.Fatalf("config = %v, want %v", plan.ExtraConfig, want)
 			}
diff --git a/apps/daemon/internal/agent/codex/executor.go b/apps/daemon/internal/agent/codex/executor.go
index 75403c57d..d8997e525 100644
--- a/apps/daemon/internal/agent/codex/executor.go
+++ b/apps/daemon/internal/agent/codex/executor.go
@@ -72,7 +72,7 @@ func (e *Executor) StartTurn(ctx context.Context, runID string, input proto.Mess
 		functions: functions, observeMessages: base.observeMessages, observeSubagentIdentities: base.observeSubagentIdentities,
 		cfg: base.cfg, rpc: base.rpc, cancelCtx: turnCtx, cancelFn: cancel,
 		waitDone: make(chan struct{}), outputDone: make(chan struct{}), cleanup: func() {},
-		bufs: NewItemBuffers(), resolvedModel: base.resolvedModel, interactions: newPendingCodexInteractions(), runID: runID, out: out}
+		bufs: NewItemBuffers(), resolvedModel: base.resolvedModel, runID: runID, out: out}
 	if previous != nil {
 		s.threadID = previous.currentThreadID()
 		s.retiredTurns = make(map[string]bool, len(previous.retiredTurns)+1)
diff --git a/apps/daemon/internal/agent/codex/executor_turn.go b/apps/daemon/internal/agent/codex/executor_turn.go
index d02eb988c..60746293f 100644
--- a/apps/daemon/internal/agent/codex/executor_turn.go
+++ b/apps/daemon/internal/agent/codex/executor_turn.go
@@ -44,7 +44,6 @@ func (s *Session) settleExecutorTurn(startErr error) {
 	s.operationMu.Unlock()
 	s.stopSteering()
 	s.stopFunctionCalls()
-	s.stopCodexInteractionTimers()
 	if !s.nativeSettled.Load() || startErr != nil || !s.rpc.Alive() {
 		s.cancelFn()
 		s.settlementErr = errors.Join(s.settlementErr, s.rpc.Close())
@@ -120,7 +119,6 @@ func (s *Session) cancelExecutorTurn(ctx context.Context) error {
 			defer close(s.cancelReady)
 			s.stopFunctionCalls()
 			turnID, active := s.stopSteering()
-			s.stopCodexInteractionTimers()
 			if !s.terminal.Load() && active {
 				if turnID == "" {
 					s.cancelErr = errors.New("codex: cancellation has no native turn identity")
@@ -150,9 +148,7 @@ func (s *Session) cancelExecutorTurn(ctx context.Context) error {
 
 var _ agent.Turn = (*Session)(nil)
 
-// Server callbacks retain their originating Turn. MCP elicitation may be a
-// standalone thread-scoped request in the native protocol; a supplied Turn ID
-// must still match exactly.
+// Server callbacks retain their originating Turn, whose ID must match exactly.
 func (s *Session) onServerRequest(method string, handler ServerRequestHandler) {
 	s.rpc.OnServerRequest(method, func(raw json.RawMessage, id any) (any, error) {
 		if s.executor != nil {
@@ -161,8 +157,7 @@ func (s *Session) onServerRequest(method string, handler ServerRequestHandler) {
 				TurnID   string `json:"turnId"`
 			}
 			if json.Unmarshal(raw, &scope) != nil || !s.isRootThread(scope.ThreadID) || s.terminal.Load() ||
-				(scope.TurnID != "" && !s.isRootTurn(scope.ThreadID, scope.TurnID)) ||
-				(scope.TurnID == "" && method != "mcpServer/elicitation/request") {
+				scope.TurnID == "" || !s.isRootTurn(scope.ThreadID, scope.TurnID) {
 				return nil, errors.New("codex: request does not belong to the active turn")
 			}
 		}
diff --git a/apps/daemon/internal/agent/codex/function_receipt_test.go b/apps/daemon/internal/agent/codex/function_receipt_test.go
index decbf235e..fd138a009 100644
--- a/apps/daemon/internal/agent/codex/function_receipt_test.go
+++ b/apps/daemon/internal/agent/codex/function_receipt_test.go
@@ -16,7 +16,7 @@ import (
 func TestFunctionResultWaitsForNativeCompletion(t *testing.T) {
 	client, server, cleanup := NewTestClient()
 	defer cleanup()
-	session, output := newInteractionTestSession(client.JSONRPCClient)
+	session, output := newFunctionTestSession(client.JSONRPCClient)
 	session.setThreadID("thread")
 	session.startSteering("thread", "turn")
 	var err error
@@ -61,7 +61,7 @@ func pendingReceiptContext(t *testing.T, ctx context.Context) (*Session, ServerS
 	t.Helper()
 	client, server, cleanup := NewTestClient()
 	t.Cleanup(cleanup)
-	s, out := newInteractionTestSession(client.JSONRPCClient)
+	s, out := newFunctionTestSession(client.JSONRPCClient)
 	s.cfg.logger = slog.New(slog.NewTextHandler(io.Discard, nil))
 	s.setThreadID("thread")
 	s.startSteering("thread", "turn")
@@ -169,7 +169,7 @@ func TestFunctionReceiptShutdownDoesNotConfirmApplication(t *testing.T) {
 func TestFunctionReceiptDeadlineEndsUncertainExecution(t *testing.T) {
 	client, server, cleanup := NewTestClient()
 	defer cleanup()
-	s, out := newInteractionTestSession(client.JSONRPCClient)
+	s, out := newFunctionTestSession(client.JSONRPCClient)
 	s.setThreadID("thread")
 	s.startSteering("thread", "turn")
 	s.functions, _ = prepareFunctionTools([]proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{}`)}})
@@ -207,7 +207,7 @@ func TestFunctionReceiptDeadlineEndsUncertainExecution(t *testing.T) {
 func TestFunctionReceiptWinsSimultaneousDeadline(t *testing.T) {
 	for range 100 {
 		client, _, cleanup := NewTestClient()
-		s, _ := newInteractionTestSession(client.JSONRPCClient)
+		s, _ := newFunctionTestSession(client.JSONRPCClient)
 		s.setThreadID("thread")
 		s.startSteering("thread", "turn")
 		s.functions, _ = prepareFunctionTools(nil)
diff --git a/apps/daemon/internal/agent/codex/function_write_receipt_test.go b/apps/daemon/internal/agent/codex/function_write_receipt_test.go
index 49cdc6826..7e6730647 100644
--- a/apps/daemon/internal/agent/codex/function_write_receipt_test.go
+++ b/apps/daemon/internal/agent/codex/function_write_receipt_test.go
@@ -31,7 +31,7 @@ func (w *confirmedResultWriter) Close() error { w.once.Do(func() { close(w.close
 func TestFunctionConfirmedReceiptDuringWriteDeadline(t *testing.T) {
 	client, _, cleanup := NewTestClient()
 	defer cleanup()
-	s, out := newInteractionTestSession(client.JSONRPCClient)
+	s, out := newFunctionTestSession(client.JSONRPCClient)
 	s.setThreadID("thread")
 	s.startSteering("thread", "turn")
 	s.functions, _ = prepareFunctionTools([]proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{}`)}})
@@ -64,7 +64,7 @@ func TestFunctionConfirmedReceiptDuringWriteDeadline(t *testing.T) {
 func TestFunctionUnconfirmedWriteDeadlineClosesNative(t *testing.T) {
 	client, _, cleanup := NewTestClient()
 	defer cleanup()
-	s, out := newInteractionTestSession(client.JSONRPCClient)
+	s, out := newFunctionTestSession(client.JSONRPCClient)
 	s.setThreadID("thread")
 	s.startSteering("thread", "turn")
 	s.functions, _ = prepareFunctionTools([]proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{}`)}})
diff --git a/apps/daemon/internal/agent/codex/functions_test.go b/apps/daemon/internal/agent/codex/functions_test.go
index 1fc34979f..a2fd9c752 100644
--- a/apps/daemon/internal/agent/codex/functions_test.go
+++ b/apps/daemon/internal/agent/codex/functions_test.go
@@ -12,12 +12,20 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
+func newFunctionTestSession(rpc *JSONRPCClient) (*Session, <-chan proto.Envelope) {
+	out := make(chan proto.Envelope, 1)
+	ctx, cancel := context.WithCancel(context.Background())
+	s := &Session{runID: "run-test", out: out, rpc: rpc, cancelCtx: ctx, cancelFn: cancel}
+	s.registerHandlers()
+	return s, out
+}
+
 func TestFunctionCallWaitsAndRepliesOnce(t *testing.T) {
 	for _, success := range []bool{true, false} {
 		t.Run(map[bool]string{true: "success", false: "failure"}[success], func(t *testing.T) {
 			tc, srv, cleanup := NewTestClient()
 			defer cleanup()
-			s, out := newInteractionTestSession(tc.JSONRPCClient)
+			s, out := newFunctionTestSession(tc.JSONRPCClient)
 			var err error
 			s.functions, err = prepareFunctionTools([]proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{"type":"object"}`)}})
 			if err != nil {
@@ -88,7 +96,7 @@ func TestFunctionCallWaitsAndRepliesOnce(t *testing.T) {
 func TestFunctionCallRejectsUnregisteredAndClosedRuns(t *testing.T) {
 	tc, _, cleanup := NewTestClient()
 	defer cleanup()
-	s, _ := newInteractionTestSession(tc.JSONRPCClient)
+	s, _ := newFunctionTestSession(tc.JSONRPCClient)
 	s.setThreadID("thread")
 	s.startSteering("thread", "turn")
 	s.functions, _ = prepareFunctionTools([]proto.FunctionTool{{Name: "lookup", Parameters: json.RawMessage(`{}`)}})
diff --git a/apps/daemon/internal/agent/codex/options.go b/apps/daemon/internal/agent/codex/options.go
index 4b7b2d2d2..1f53a8d24 100644
--- a/apps/daemon/internal/agent/codex/options.go
+++ b/apps/daemon/internal/agent/codex/options.go
@@ -57,11 +57,6 @@ type SessionPlan struct {
 	// ModelReasoningEffort is frozen for launch and every native Turn.
 	ModelReasoningEffort string
 
-	// ApprovalPolicy + Sandbox apply to both new and resumed threads.
-	ApprovalPolicy AskForApproval
-	Sandbox        SandboxMode
-	Permissions    string
-
 	// Cleanup is the deferred housekeeping the session must run after the child exits.
 	Cleanup func()
 }
@@ -76,13 +71,11 @@ type SessionPlan struct {
 //
 // Execution controls select the native web_search and model_verbosity settings.
 // The codex binary itself is resolved via PATH only.
-//
-// Daemon-managed Codex sessions bypass approvals and the engine sandbox.
 func BuildSessionPlan(agentStateKey string, opts map[string]any, controls *proto.ExecutionControls) (SessionPlan, error) {
 	plan := SessionPlan{
-		ApprovalPolicy: AskForApproval{String: "never"},
-		Sandbox:        SandboxDangerFullAcces,
-		Cleanup:        func() {},
+		// Harnesses run unattended: Codex never offers its ask-the-user tool.
+		ExtraConfig: [][2]string{{"tools.experimental_request_user_input.enabled", "false"}},
+		Cleanup:     func() {},
 	}
 
 	nativeConfig, err := harnessconfiguration.Configuration().PrepareHarnessConfig(opts)
@@ -128,7 +121,7 @@ func BuildSessionPlan(agentStateKey string, opts map[string]any, controls *proto
 
 	plan.Env = env
 	if controls != nil {
-		plan.ExtraConfig = [][2]string{{"web_search", strconv(controls.WebSearch)}, {"model_verbosity", strconv(controls.TextVerbosity)}}
+		plan.ExtraConfig = append(plan.ExtraConfig, [2]string{"web_search", strconv(controls.WebSearch)}, [2]string{"model_verbosity", strconv(controls.TextVerbosity)})
 	}
 	if effort, ok := nativeConfig["model_reasoning_effort"].(string); ok {
 		plan.ModelReasoningEffort = effort
diff --git a/apps/daemon/internal/agent/codex/options_test.go b/apps/daemon/internal/agent/codex/options_test.go
index b20123e2b..cb8910aaa 100644
--- a/apps/daemon/internal/agent/codex/options_test.go
+++ b/apps/daemon/internal/agent/codex/options_test.go
@@ -2,6 +2,7 @@ package codex
 
 import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
+	"slices"
 	"strings"
 	"testing"
 )
@@ -11,11 +12,8 @@ func TestBuildSessionPlan_DefaultsToBypass(t *testing.T) {
 	if err != nil {
 		t.Fatalf("BuildSessionPlan: %v", err)
 	}
-	if plan.ApprovalPolicy.String != "never" {
-		t.Fatalf("default policy must bypass approvals, got %+v", plan.ApprovalPolicy)
-	}
-	if plan.Sandbox != SandboxDangerFullAcces {
-		t.Fatalf("default sandbox = %s, want danger-full-access", plan.Sandbox)
+	if !slices.Contains(plan.ExtraConfig, [2]string{"tools.experimental_request_user_input.enabled", "false"}) {
+		t.Fatalf("default plan must disable the native ask-the-user tool, got %+v", plan.ExtraConfig)
 	}
 	if plan.Cleanup == nil {
 		t.Fatal("Cleanup must be non-nil")
diff --git a/apps/daemon/internal/agent/codex/permission_profile_test.go b/apps/daemon/internal/agent/codex/permission_profile_test.go
index dc250c7be..e69720d6e 100644
--- a/apps/daemon/internal/agent/codex/permission_profile_test.go
+++ b/apps/daemon/internal/agent/codex/permission_profile_test.go
@@ -16,9 +16,6 @@ func TestRuntimeUsesHostPermissions(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		if plan.Sandbox != "danger-full-access" || plan.Permissions != "" || plan.ApprovalPolicy.String != "never" {
-			t.Fatal("Runtime must bypass inner sandbox", plan)
-		}
 		if plan.Cwd != req.LocalEnvironment.WorkspaceRoot {
 			t.Fatal("native cwd is not the bound workspace root", plan.Cwd)
 		}
diff --git a/apps/daemon/internal/agent/codex/preparation.go b/apps/daemon/internal/agent/codex/preparation.go
index 729934ae9..263178522 100644
--- a/apps/daemon/internal/agent/codex/preparation.go
+++ b/apps/daemon/internal/agent/codex/preparation.go
@@ -78,7 +78,6 @@ func newPreparation(parent context.Context, req proto.PromptRequestPayload, cfg
 		cleanup:                   sync.OnceFunc(plan.Cleanup),
 		bufs:                      NewItemBuffers(),
 		resolvedModel:             plan.Model,
-		interactions:              newPendingCodexInteractions(),
 	}
 	plan.Cleanup = s.cleanup
 	p := &Prepared{
diff --git a/apps/daemon/internal/agent/codex/protocol.go b/apps/daemon/internal/agent/codex/protocol.go
index 462c10f3e..2daa4acb7 100644
--- a/apps/daemon/internal/agent/codex/protocol.go
+++ b/apps/daemon/internal/agent/codex/protocol.go
@@ -64,8 +64,8 @@ func (e *JsonRpcError) Error() string { return fmt.Sprintf("%d %s", e.Code, e.Me
 // ---------------------------------------------------------------------------
 
 // InitializeCapabilities mirrors codex-rs/app-server/src/protocol.rs.
-// experimentalApi=true opts into the granular AskForApproval enum and
-// the thread/* notification stream.
+// experimentalApi=true opts into the experimental thread/* fields and
+// notification stream.
 type InitializeCapabilities struct {
 	ExperimentalAPI    bool      `json:"experimentalApi"`
 	RequestAttestation bool      `json:"requestAttestation"`
@@ -93,83 +93,19 @@ type SkillsExtraRootsSetParams struct {
 	ExtraRoots []string `json:"extraRoots"`
 }
 
-// ---------------------------------------------------------------------------
-// Approval / sandbox policies
-// ---------------------------------------------------------------------------
-
-// GranularAskForApproval names each approval gate the codex agent can
-// surface. All-false produces a fully silent run; turning any single
-// field true makes the corresponding ServerRequest reach the daemon for
-// human approval.
-//
-// JSON tags MUST stay snake_case — codex-rs deserialises this struct
-// from a config TOML / RPC param with field names like sandbox_approval,
-// and renaming silently breaks the wire.
-type GranularAskForApproval struct {
-	SandboxApproval    bool `json:"sandbox_approval"`
-	Rules              bool `json:"rules"`
-	SkillApproval      bool `json:"skill_approval"`
-	RequestPermissions bool `json:"request_permissions"`
-	MCPElicitations    bool `json:"mcp_elicitations"`
-}
-
-// AskForApproval is the discriminated union codex accepts on
-// ThreadStartParams.approvalPolicy. The serialiser must emit EITHER
-// {"granular": {...}} OR a bare string ("never" / "on-request" /
-// "on-failure" / "untrusted"). See MarshalJSON in approval_policy.go.
-type AskForApproval struct {
-	String   string                  // "" when granular is set
-	Granular *GranularAskForApproval // nil when string is set
-}
-
-// SandboxMode is the wire-level sandbox setting codex's v2 thread/start
-// API accepts. Serializes to a kebab-case string per
-// codex-rs/app-server-protocol/src/protocol/v2/shared.rs::SandboxMode.
-//
-// Earlier (~0.137-era) the field on ThreadStartParams was named
-// `sandboxPolicy` and took a tagged object `{type: "dangerFullAccess"}`.
-// 0.141.0 renamed it to `sandbox` and flattened it to one of these three
-// strings. Sending the old shape no longer errors loudly — codex just
-// silently falls back to read-only, which makes prompts terminate
-// immediately with no agent output. Keep the constants pinned exactly
-// to the kebab values upstream serializes.
-type SandboxMode string
-
-const (
-	SandboxReadOnly        SandboxMode = "read-only"
-	SandboxWorkspaceWrite  SandboxMode = "workspace-write"
-	SandboxDangerFullAcces SandboxMode = "danger-full-access"
-)
-
-// SandboxPolicy is the legacy compound type kept for internal
-// representation only — codex still echoes it back on some response
-// shapes (turn_context inside rollout files, for example). It is NOT
-// what ThreadStartParams.Sandbox takes on the wire.
-type SandboxPolicy struct {
-	Type                SandboxMode `json:"type"`
-	WritableRoots       []string    `json:"writableRoots,omitempty"`
-	NetworkAccess       bool        `json:"networkAccess,omitempty"`
-	ExcludeTmpdirEnvVar bool        `json:"excludeTmpdirEnvVar,omitempty"`
-	ExcludeSlashTmp     bool        `json:"excludeSlashTmp,omitempty"`
-}
-
 // ---------------------------------------------------------------------------
 // thread/start, thread/resume, thread/list
 // ---------------------------------------------------------------------------
 
 type ThreadStartParams struct {
-	HistoryMode    string         `json:"historyMode,omitempty"`
-	Cwd            string         `json:"cwd"`
-	Model          string         `json:"model,omitempty"`
-	ModelProvider  string         `json:"modelProvider,omitempty"`
-	ApprovalPolicy AskForApproval `json:"approvalPolicy"`
-	// Sandbox is the v0.141+ field name; previously called sandboxPolicy
-	// and took a tagged-enum object. Wire format now is a kebab-case
-	// string: "read-only" / "workspace-write" / "danger-full-access".
-	// Sending the old object shape causes codex to silently default to
-	// read-only, which terminates the turn before the model can reply.
-	Sandbox               SandboxMode           `json:"sandbox,omitempty"`
-	Permissions           string                `json:"permissions,omitempty"`
+	HistoryMode    string `json:"historyMode,omitempty"`
+	Cwd            string `json:"cwd"`
+	Model          string `json:"model,omitempty"`
+	ModelProvider  string `json:"modelProvider,omitempty"`
+	ApprovalPolicy string `json:"approvalPolicy"`
+	// Sandbox is the kebab-case mode string. Codex silently falls back to
+	// read-only for the legacy sandboxPolicy object.
+	Sandbox               string                `json:"sandbox"`
 	DeveloperInstructions string                `json:"developerInstructions,omitempty"`
 	RuntimeWorkspaceRoots []string              `json:"runtimeWorkspaceRoots,omitempty"`
 	DynamicTools          []dynamicFunctionTool `json:"dynamicTools,omitempty"`
@@ -187,19 +123,16 @@ type Thread struct {
 }
 
 type ThreadStartResult struct {
-	Thread         Thread          `json:"thread"`
-	Model          string          `json:"model,omitempty"`
-	ApprovalPolicy *AskForApproval `json:"approvalPolicy,omitempty"`
-	Sandbox        *SandboxPolicy  `json:"sandbox,omitempty"`
+	Thread Thread `json:"thread"`
+	Model  string `json:"model,omitempty"`
 }
 
 type ThreadResumeParams struct {
-	Cwd                   string         `json:"cwd,omitempty"`
-	DeveloperInstructions string         `json:"developerInstructions"`
-	ThreadID              string         `json:"threadId"`
-	ApprovalPolicy        AskForApproval `json:"approvalPolicy"`
-	Sandbox               SandboxMode    `json:"sandbox,omitempty"`
-	Permissions           string         `json:"permissions,omitempty"`
+	Cwd                   string `json:"cwd,omitempty"`
+	DeveloperInstructions string `json:"developerInstructions"`
+	ThreadID              string `json:"threadId"`
+	ApprovalPolicy        string `json:"approvalPolicy"`
+	Sandbox               string `json:"sandbox"`
 }
 
 // ---------------------------------------------------------------------------
@@ -381,84 +314,3 @@ type ErrorNotification struct {
 	Error    *TurnError `json:"error,omitempty"`
 	Message  string     `json:"message,omitempty"`
 }
-
-// ---------------------------------------------------------------------------
-// Approval and user-input ServerRequest params. Explicit requests defer their
-// responses until Web or IM submits the decision, even with bypass defaults.
-// ---------------------------------------------------------------------------
-
-type CommandExecutionRequestApprovalParams struct {
-	ThreadID string  `json:"threadId"`
-	TurnID   string  `json:"turnId"`
-	ItemID   string  `json:"itemId"`
-	Command  *string `json:"command,omitempty"`
-	Cwd      *string `json:"cwd,omitempty"`
-	Reason   *string `json:"reason,omitempty"`
-}
-
-type FileChangeRequestApprovalParams struct {
-	ThreadID  string  `json:"threadId"`
-	TurnID    string  `json:"turnId"`
-	ItemID    string  `json:"itemId"`
-	Reason    *string `json:"reason,omitempty"`
-	GrantRoot *string `json:"grantRoot,omitempty"`
-}
-
-type PermissionsRequestApprovalParams struct {
-	ThreadID    string         `json:"threadId"`
-	TurnID      string         `json:"turnId"`
-	ItemID      string         `json:"itemId"`
-	Cwd         string         `json:"cwd"`
-	Reason      *string        `json:"reason,omitempty"`
-	Permissions map[string]any `json:"permissions,omitempty"`
-}
-
-// CommandExecutionApprovalDecision is the verdict the daemon writes
-// back to a Codex approval ServerRequest. "accept" / "decline" / "cancel"
-// / "acceptForSession".
-type CommandExecutionApprovalDecision = string
-
-// ApprovalDecisionResult is the result body for command-execution and
-// file-change approvals. item/permissions/requestApproval uses the distinct
-// PermissionsRequestApprovalResponse contract below.
-type ApprovalDecisionResult struct {
-	Decision CommandExecutionApprovalDecision `json:"decision"`
-}
-
-// PermissionsRequestApprovalResponse mirrors Codex app-server's dedicated
-// response contract. Approving echoes the requested permission profile;
-// denying returns an empty profile, which grants no additional capability.
-type PermissionsRequestApprovalResponse struct {
-	Permissions map[string]any `json:"permissions"`
-	Scope       string         `json:"scope,omitempty"`
-}
-
-type ToolRequestUserInputOption struct {
-	Label       string `json:"label"`
-	Description string `json:"description"`
-}
-
-type ToolRequestUserInputQuestion struct {
-	ID       string                       `json:"id"`
-	Header   string                       `json:"header"`
-	Question string                       `json:"question"`
-	Options  []ToolRequestUserInputOption `json:"options,omitempty"`
-	IsOther  bool                         `json:"isOther,omitempty"`
-	IsSecret bool                         `json:"isSecret,omitempty"`
-}
-
-type ToolRequestUserInputParams struct {
-	ThreadID         string                         `json:"threadId"`
-	TurnID           string                         `json:"turnId"`
-	ItemID           string                         `json:"itemId"`
-	Questions        []ToolRequestUserInputQuestion `json:"questions"`
-	AutoResolutionMs *uint64                        `json:"autoResolutionMs,omitempty"`
-}
-
-type ToolRequestUserInputAnswer struct {
-	Answers []string `json:"answers"`
-}
-
-type ToolRequestUserInputResponse struct {
-	Answers map[string]ToolRequestUserInputAnswer `json:"answers"`
-}
diff --git a/apps/daemon/internal/agent/codex/protocol_wire_test.go b/apps/daemon/internal/agent/codex/protocol_wire_test.go
index d32590d7c..895888bab 100644
--- a/apps/daemon/internal/agent/codex/protocol_wire_test.go
+++ b/apps/daemon/internal/agent/codex/protocol_wire_test.go
@@ -6,66 +6,12 @@ import (
 	"testing"
 )
 
-// TestThreadStartParams_SandboxIsKebabString pins the v0.141+ wire
-// format reviewer caught the hard way: codex's ThreadStartParams.sandbox
-// is a kebab-case string ("read-only" / "workspace-write" /
-// "danger-full-access"), NOT the legacy {"type":"dangerFullAccess"}
-// tagged object on a sandboxPolicy field.
-//
-// Sending the legacy shape used to terminate every turn in <1s with an
-// empty agent message body, because codex silently fell back to
-// read-only when it didn't recognise the field name.
-func TestThreadStartParams_SandboxIsKebabString(t *testing.T) {
-	cases := []struct {
-		name string
-		mode SandboxMode
-		want string
-	}{
-		{"read-only", SandboxReadOnly, "read-only"},
-		{"workspace-write", SandboxWorkspaceWrite, "workspace-write"},
-		{"danger-full-access", SandboxDangerFullAcces, "danger-full-access"},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			params := ThreadStartParams{
-				Cwd:            "/workspace",
-				Model:          "gpt-5.5",
-				ApprovalPolicy: SilentGranularPolicy(),
-				Sandbox:        tc.mode,
-			}
-			raw, err := json.Marshal(params)
-			if err != nil {
-				t.Fatalf("marshal: %v", err)
-			}
-			body := string(raw)
-			if !strings.Contains(body, `"sandbox":"`+tc.want+`"`) {
-				t.Fatalf("wire body missing sandbox=%q: %s", tc.want, body)
-			}
-			// The legacy field name MUST be gone. Even shipping it as
-			// "sandboxPolicy" alongside the new field would confuse
-			// future-version codex servers that strict-deserialise.
-			if strings.Contains(body, `"sandboxPolicy"`) {
-				t.Fatalf("legacy sandboxPolicy field leaked into wire: %s", body)
-			}
-			// And the kebab-case value must NOT collide with the old
-			// camelCase enum names.
-			for _, oldName := range []string{`"readOnly"`, `"workspaceWrite"`, `"dangerFullAccess"`} {
-				if strings.Contains(body, oldName) {
-					t.Fatalf("legacy camelCase enum value %s leaked: %s", oldName, body)
-				}
-			}
-		})
-	}
-}
-
 // TestThreadStartParams_OmitsEmptyOptionalFields pins that model_provider
 // and other optional fields don't leak null/empty values into the wire.
 // codex would reject malformed enum values otherwise.
 func TestThreadStartParams_OmitsEmptyOptionalFields(t *testing.T) {
 	params := ThreadStartParams{
-		Cwd:            "/workspace",
-		ApprovalPolicy: SilentGranularPolicy(),
-		Sandbox:        SandboxDangerFullAcces,
+		Cwd: "/workspace",
 		// Model, ModelProvider, DeveloperInstructions deliberately empty
 	}
 	raw, _ := json.Marshal(params)
@@ -88,11 +34,9 @@ func TestThreadStartParams_OmitsEmptyOptionalFields(t *testing.T) {
 // override. Sending it on both paths is belt + suspenders.
 func TestThreadStartParams_ModelProviderIsCamelCaseField(t *testing.T) {
 	params := ThreadStartParams{
-		Cwd:            "/workspace",
-		Model:          "gpt-5.5",
-		ModelProvider:  "oac",
-		ApprovalPolicy: SilentGranularPolicy(),
-		Sandbox:        SandboxDangerFullAcces,
+		Cwd:           "/workspace",
+		Model:         "gpt-5.5",
+		ModelProvider: "oac",
 	}
 	raw, _ := json.Marshal(params)
 	body := string(raw)
diff --git a/apps/daemon/internal/agent/codex/rpc_close_test.go b/apps/daemon/internal/agent/codex/rpc_close_test.go
index c7b345d33..7b387e23a 100644
--- a/apps/daemon/internal/agent/codex/rpc_close_test.go
+++ b/apps/daemon/internal/agent/codex/rpc_close_test.go
@@ -80,7 +80,7 @@ func TestJSONRPCClientCloseCanRetryUnreapedChild(t *testing.T) {
 	closeConcurrently(true)
 	ownerCtx, cancelOwner := context.WithCancel(t.Context())
 	s := &Session{rpc: client, cancelCtx: ownerCtx, cancelFn: cancelOwner,
-		cfg: defaultSessionConfig(), interactions: newPendingCodexInteractions(), bufs: NewItemBuffers()}
+		cfg: defaultSessionConfig(), bufs: NewItemBuffers()}
 	ctx, cancelWait := context.WithTimeout(t.Context(), 20*time.Millisecond)
 	defer cancelWait()
 	if err := s.Cancel(ctx); !errors.Is(err, context.DeadlineExceeded) {
diff --git a/apps/daemon/internal/agent/codex/server_requests.go b/apps/daemon/internal/agent/codex/server_requests.go
deleted file mode 100644
index 5e77e3c9d..000000000
--- a/apps/daemon/internal/agent/codex/server_requests.go
+++ /dev/null
@@ -1,362 +0,0 @@
-package codex
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-type pendingCodexPermission struct {
-	rpcID       any
-	kind        codexPermissionKind
-	permissions map[string]any
-	timeout     time.Duration
-	timer       *time.Timer
-}
-
-type pendingCodexAsk struct {
-	rpcID       any
-	questionIDs []string
-	timeout     time.Duration
-	timer       *time.Timer
-}
-
-const codexInteractionTimeout = 10 * time.Minute
-
-type codexPermissionKind uint8
-
-const (
-	codexDecisionApproval codexPermissionKind = iota
-	codexPermissionsApproval
-	codexMCPApproval
-)
-
-type pendingCodexInteractions struct {
-	mu          sync.Mutex
-	permissions map[string]pendingCodexPermission
-	asks        map[string]pendingCodexAsk
-}
-
-func newPendingCodexInteractions() *pendingCodexInteractions {
-	return &pendingCodexInteractions{
-		permissions: make(map[string]pendingCodexPermission),
-		asks:        make(map[string]pendingCodexAsk),
-	}
-}
-
-func codexInteractionID(prefix string) string {
-	var bytes [8]byte
-	if _, err := rand.Read(bytes[:]); err == nil {
-		return prefix + "_" + hex.EncodeToString(bytes[:])
-	}
-	return fmt.Sprintf("%s_fallback", prefix)
-}
-
-func (s *Session) handleCodexCommandApproval(raw json.RawMessage, rpcID any) (any, error) {
-	var params CommandExecutionRequestApprovalParams
-	if err := json.Unmarshal(raw, &params); err != nil {
-		return nil, fmt.Errorf("decode command approval: %w", err)
-	}
-	title := stringPointer(params.Command)
-	if title == "" {
-		title = "Run command"
-	}
-	return s.deferCodexPermission(rpcID, codexDecisionApproval, "command_execution", title, stringPointer(params.Reason), raw, nil)
-}
-
-func (s *Session) handleCodexFileApproval(raw json.RawMessage, rpcID any) (any, error) {
-	var params FileChangeRequestApprovalParams
-	if err := json.Unmarshal(raw, &params); err != nil {
-		return nil, fmt.Errorf("decode file approval: %w", err)
-	}
-	title := stringPointer(params.GrantRoot)
-	if title == "" {
-		title = "Apply file changes"
-	}
-	return s.deferCodexPermission(rpcID, codexDecisionApproval, "file_change", title, stringPointer(params.Reason), raw, nil)
-}
-
-func (s *Session) handleCodexPermissionsApproval(raw json.RawMessage, rpcID any) (any, error) {
-	var params PermissionsRequestApprovalParams
-	if err := json.Unmarshal(raw, &params); err != nil {
-		return nil, fmt.Errorf("decode permissions approval: %w", err)
-	}
-	title := strings.TrimSpace(params.Cwd)
-	if title == "" {
-		title = "Grant additional permissions"
-	}
-	return s.deferCodexPermission(rpcID, codexPermissionsApproval, "permission_request", title, stringPointer(params.Reason), raw, params.Permissions)
-}
-
-func (s *Session) deferCodexPermission(rpcID any, kind codexPermissionKind, tool, title, detail string, raw json.RawMessage, permissions map[string]any) (any, error) {
-	requestID := codexInteractionID("perm")
-	payload := map[string]any{}
-	_ = json.Unmarshal(raw, &payload)
-	pending := pendingCodexPermission{
-		rpcID: rpcID, kind: kind, permissions: permissions,
-		timeout: codexInteractionTimeout,
-	}
-	s.interactions.mu.Lock()
-	// Start the timer while holding the table lock. Even a future very short
-	// timeout then blocks in expireCodexPermission until the entry is visible,
-	// rather than firing before insertion and leaving an immortal request.
-	pending.timer = time.AfterFunc(pending.timeout, func() { s.expireCodexPermission(requestID) })
-	s.interactions.permissions[requestID] = pending
-	s.interactions.mu.Unlock()
-	env, err := proto.NewEnvelope(proto.TypePermissionRequest, s.runID, proto.PermissionRequestPayload{
-		RequestID: requestID, Tool: tool, Title: title, Detail: detail, Payload: payload,
-	})
-	if err != nil {
-		s.interactions.mu.Lock()
-		pending, ok := s.interactions.permissions[requestID]
-		if ok {
-			delete(s.interactions.permissions, requestID)
-		}
-		s.interactions.mu.Unlock()
-		if ok && pending.timer != nil {
-			pending.timer.Stop()
-		}
-		return nil, err
-	}
-	s.trySend(env)
-	return DeferReply, nil
-}
-
-func (s *Session) handleCodexUserInput(raw json.RawMessage, rpcID any) (any, error) {
-	var params ToolRequestUserInputParams
-	if err := json.Unmarshal(raw, &params); err != nil {
-		return nil, fmt.Errorf("decode requestUserInput: %w", err)
-	}
-	if len(params.Questions) == 0 {
-		return nil, errors.New("requestUserInput contains no questions")
-	}
-	askID := codexInteractionID("ask")
-	questions := make([]proto.PromptForUserChoiceQuestion, 0, len(params.Questions))
-	questionIDs := make([]string, 0, len(params.Questions))
-	for index, question := range params.Questions {
-		options := make([]proto.PromptForUserChoiceOption, 0, len(question.Options))
-		for _, option := range question.Options {
-			options = append(options, proto.PromptForUserChoiceOption{Label: option.Label, Description: option.Description})
-		}
-		header := strings.TrimSpace(question.Header)
-		if header == "" {
-			header = fmt.Sprintf("q%d", index)
-		}
-		questionID := strings.TrimSpace(question.ID)
-		if questionID == "" {
-			questionID = header
-		}
-		questionIDs = append(questionIDs, questionID)
-		questions = append(questions, proto.PromptForUserChoiceQuestion{
-			ID: questionID, Header: header, Question: question.Question, Options: options,
-			IsOther: question.IsOther, IsSecret: question.IsSecret,
-		})
-	}
-	timeout := codexInteractionTimeout
-	if params.AutoResolutionMs != nil && *params.AutoResolutionMs > 0 {
-		const maxMillis = uint64(^uint64(0)>>1) / uint64(time.Millisecond)
-		if *params.AutoResolutionMs <= maxMillis {
-			timeout = time.Duration(*params.AutoResolutionMs) * time.Millisecond
-		}
-	}
-	pending := pendingCodexAsk{rpcID: rpcID, questionIDs: questionIDs, timeout: timeout}
-	s.interactions.mu.Lock()
-	pending.timer = time.AfterFunc(pending.timeout, func() { s.expireCodexAsk(askID) })
-	s.interactions.asks[askID] = pending
-	s.interactions.mu.Unlock()
-	env, err := proto.NewEnvelope(proto.TypePromptForUserChoice, s.runID, proto.PromptForUserChoicePayload{
-		AskID: askID, Questions: questions, AutoResolutionMs: params.AutoResolutionMs,
-	})
-	if err != nil {
-		s.interactions.mu.Lock()
-		pending, ok := s.interactions.asks[askID]
-		if ok {
-			delete(s.interactions.asks, askID)
-		}
-		s.interactions.mu.Unlock()
-		if ok && pending.timer != nil {
-			pending.timer.Stop()
-		}
-		return nil, err
-	}
-	s.trySend(env)
-	return DeferReply, nil
-}
-
-func (s *Session) submitCodexPermission(requestID string, decision proto.PermissionDecisionPayload) error {
-	if !s.beginOperation() {
-		return agent.ErrSteeringInactive
-	}
-	defer s.endOperation()
-	s.interactions.mu.Lock()
-	pending, ok := s.interactions.permissions[requestID]
-	if ok {
-		delete(s.interactions.permissions, requestID)
-	}
-	s.interactions.mu.Unlock()
-	if !ok {
-		return agent.ErrUnknownPermission
-	}
-	if pending.timer != nil {
-		pending.timer.Stop()
-	}
-	if err := s.sendCodexPermissionReply(pending, decision.Approved); err != nil {
-		s.interactions.mu.Lock()
-		pending.timer = time.AfterFunc(pending.timeout, func() { s.expireCodexPermission(requestID) })
-		s.interactions.permissions[requestID] = pending
-		s.interactions.mu.Unlock()
-		return err
-	}
-	return nil
-}
-
-func (s *Session) sendCodexPermissionReply(pending pendingCodexPermission, approved bool) error {
-	if pending.kind == codexPermissionsApproval {
-		permissions := map[string]any{}
-		if approved && pending.permissions != nil {
-			permissions = pending.permissions
-		}
-		return s.rpc.SendServerReply(pending.rpcID, PermissionsRequestApprovalResponse{
-			Permissions: permissions,
-			Scope:       "turn",
-		})
-	}
-	value := "decline"
-	if approved {
-		value = "accept"
-	}
-	if pending.kind == codexMCPApproval {
-		var content map[string]any
-		if approved {
-			content = map[string]any{}
-		}
-		return s.rpc.SendServerReply(pending.rpcID, mcpElicitationResponse{Action: value, Content: content})
-	}
-	return s.rpc.SendServerReply(pending.rpcID, ApprovalDecisionResult{Decision: value})
-}
-
-func (s *Session) submitCodexUserInput(askID string, decision proto.PromptForUserChoiceDecisionPayload) error {
-	if !s.beginOperation() {
-		return agent.ErrSteeringInactive
-	}
-	defer s.endOperation()
-	s.interactions.mu.Lock()
-	pending, ok := s.interactions.asks[askID]
-	var answers map[string][]string
-	if ok {
-		var err error
-		answers, err = decision.AnswersFor(pending.questionIDs)
-		if err != nil {
-			s.interactions.mu.Unlock()
-			return err
-		}
-		delete(s.interactions.asks, askID)
-	}
-	s.interactions.mu.Unlock()
-	if !ok {
-		return agent.ErrUnknownAsk
-	}
-	if pending.timer != nil {
-		pending.timer.Stop()
-	}
-	if decision.Cancelled {
-		reason := strings.TrimSpace(decision.Reason)
-		if reason == "" {
-			reason = "user cancelled input request"
-		}
-		if err := s.rpc.SendServerError(pending.rpcID, -32001, reason, nil); err != nil {
-			s.interactions.mu.Lock()
-			pending.timer = time.AfterFunc(pending.timeout, func() { s.expireCodexAsk(askID) })
-			s.interactions.asks[askID] = pending
-			s.interactions.mu.Unlock()
-			return err
-		}
-		return nil
-	}
-	result := ToolRequestUserInputResponse{Answers: make(map[string]ToolRequestUserInputAnswer, len(pending.questionIDs))}
-	for _, questionID := range pending.questionIDs {
-		values := answers[questionID]
-		if values == nil {
-			values = []string{}
-		}
-		result.Answers[questionID] = ToolRequestUserInputAnswer{Answers: values}
-	}
-	if err := s.rpc.SendServerReply(pending.rpcID, result); err != nil {
-		s.interactions.mu.Lock()
-		pending.timer = time.AfterFunc(pending.timeout, func() { s.expireCodexAsk(askID) })
-		s.interactions.asks[askID] = pending
-		s.interactions.mu.Unlock()
-		return err
-	}
-	return nil
-}
-
-func (s *Session) expireCodexPermission(requestID string) {
-	if !s.beginOperation() {
-		return
-	}
-	defer s.endOperation()
-	s.interactions.mu.Lock()
-	pending, ok := s.interactions.permissions[requestID]
-	if ok {
-		delete(s.interactions.permissions, requestID)
-	}
-	s.interactions.mu.Unlock()
-	if ok {
-		if pending.timer != nil {
-			pending.timer.Stop()
-		}
-		_ = s.sendCodexPermissionReply(pending, false)
-	}
-}
-
-func (s *Session) expireCodexAsk(askID string) {
-	if !s.beginOperation() {
-		return
-	}
-	defer s.endOperation()
-	s.interactions.mu.Lock()
-	pending, ok := s.interactions.asks[askID]
-	if ok {
-		delete(s.interactions.asks, askID)
-	}
-	s.interactions.mu.Unlock()
-	if ok {
-		if pending.timer != nil {
-			pending.timer.Stop()
-		}
-		_ = s.rpc.SendServerError(pending.rpcID, -32001, "input request timed out", nil)
-	}
-}
-
-func (s *Session) stopCodexInteractionTimers() {
-	s.interactions.mu.Lock()
-	defer s.interactions.mu.Unlock()
-	for id, pending := range s.interactions.permissions {
-		if pending.timer != nil {
-			pending.timer.Stop()
-		}
-		delete(s.interactions.permissions, id)
-	}
-	for id, pending := range s.interactions.asks {
-		if pending.timer != nil {
-			pending.timer.Stop()
-		}
-		delete(s.interactions.asks, id)
-	}
-}
-
-func stringPointer(value *string) string {
-	if value == nil {
-		return ""
-	}
-	return strings.TrimSpace(*value)
-}
diff --git a/apps/daemon/internal/agent/codex/server_requests_mcp.go b/apps/daemon/internal/agent/codex/server_requests_mcp.go
deleted file mode 100644
index 4cb4de00e..000000000
--- a/apps/daemon/internal/agent/codex/server_requests_mcp.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package codex
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-)
-
-type mcpElicitationParams struct {
-	ServerName string `json:"serverName"`
-	Mode       string `json:"mode"`
-	Message    string `json:"message"`
-	Schema     struct {
-		Type       string                     `json:"type"`
-		Properties map[string]json.RawMessage `json:"properties"`
-		Required   []string                   `json:"required"`
-	} `json:"requestedSchema"`
-}
-
-type mcpElicitationResponse struct {
-	Action  string         `json:"action"`
-	Content map[string]any `json:"content"`
-}
-
-func (s *Session) handleCodexMCPElicitation(raw json.RawMessage, rpcID any) (any, error) {
-	var params mcpElicitationParams
-	if err := json.Unmarshal(raw, &params); err != nil {
-		return nil, fmt.Errorf("decode MCP elicitation: %w", err)
-	}
-	if params.Mode != "form" || params.Schema.Type != "object" || params.Schema.Properties == nil || len(params.Schema.Properties) != 0 || len(params.Schema.Required) != 0 {
-		return nil, errors.New("MCP elicitation requires unsupported input; only empty confirmation forms are supported")
-	}
-	if strings.TrimSpace(params.ServerName) == "" || strings.TrimSpace(params.Message) == "" {
-		return nil, errors.New("MCP confirmation requires a server name and message")
-	}
-	return s.deferCodexPermission(rpcID, codexMCPApproval, "mcp:"+params.ServerName, params.Message, "", raw, nil)
-}
diff --git a/apps/daemon/internal/agent/codex/server_requests_mcp_test.go b/apps/daemon/internal/agent/codex/server_requests_mcp_test.go
deleted file mode 100644
index a72ec3d9e..000000000
--- a/apps/daemon/internal/agent/codex/server_requests_mcp_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package codex
-
-import (
-	"encoding/json"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func TestCodexMCPConfirmationUsesPermissionLifecycle(t *testing.T) {
-	for _, action := range []string{"approve", "deny", "expire"} {
-		t.Run(action, func(t *testing.T) {
-			tc, srv, cleanup := NewTestClient()
-			defer cleanup()
-			s, out := newInteractionTestSession(tc.JSONRPCClient)
-			defer s.stopCodexInteractionTimers()
-			params := json.RawMessage(`{"threadId":"thread-1","turnId":"turn-1","serverName":"qa-service-desk","mode":"form","message":"Allow get_test_ticket?","requestedSchema":{"type":"object","properties":{}},"_meta":{"codex_approval_kind":"mcp_tool_call","persist":["session","always"]}}`)
-			if err := SendServerRequest(srv, "rpc-mcp", "mcpServer/elicitation/request", params); err != nil {
-				t.Fatal(err)
-			}
-			var env proto.Envelope
-			select {
-			case env = <-out:
-			case <-time.After(2 * time.Second):
-				t.Fatal("MCP confirmation was not surfaced")
-			}
-			var request proto.PermissionRequestPayload
-			if err := env.DecodePayload(&request); err != nil {
-				t.Fatal(err)
-			}
-			if env.Type != proto.TypePermissionRequest || env.ID != "run-test" || request.RequestID == "" || request.Tool != "mcp:qa-service-desk" || request.Title != "Allow get_test_ticket?" {
-				t.Fatalf("incorrect confirmation: %+v / %+v", env, request)
-			}
-			done := make(chan error, 1)
-			go func() {
-				if action == "expire" {
-					s.expireCodexPermission(request.RequestID)
-					done <- nil
-					return
-				}
-				done <- s.SubmitPermission(t.Context(), request.RequestID, proto.PermissionDecisionPayload{Approved: action == "approve"})
-			}()
-			var reply struct {
-				ID     string                     `json:"id"`
-				Result map[string]json.RawMessage `json:"result"`
-			}
-			decodeCodexReply(t, srv, &reply)
-			if err := <-done; err != nil {
-				t.Fatal(err)
-			}
-			wantAction, wantContent := `"decline"`, `null`
-			if action == "approve" {
-				wantAction, wantContent = `"accept"`, `{}`
-			}
-			if reply.ID != "rpc-mcp" || len(reply.Result) != 2 || string(reply.Result["action"]) != wantAction || string(reply.Result["content"]) != wantContent {
-				t.Fatalf("incorrect MCP response: %+v", reply)
-			}
-			if err := s.SubmitPermission(t.Context(), request.RequestID, proto.PermissionDecisionPayload{Approved: true}); !errors.Is(err, agent.ErrUnknownPermission) {
-				t.Fatalf("resolved confirmation accepted again: %v", err)
-			}
-		})
-	}
-}
-
-func TestCodexMCPElicitationRejectsUnsupportedInputWithoutApproval(t *testing.T) {
-	for _, params := range []string{
-		`{"serverName":"qa","mode":"form","message":"Enter name","requestedSchema":{"type":"object","properties":{"name":{"type":"string"}}}}`,
-		`{"serverName":"qa","mode":"url","message":"Sign in","url":"https://example.test/login","elicitationId":"login"}`,
-		`{"serverName":"qa","mode":"form","message":"Confirm","requestedSchema":{"type":"object","properties":{},"required":["name"]}}`,
-		`{"serverName":"qa","mode":"form","message":"Confirm","requestedSchema":{"type":"object"}}`,
-		`{"mode":"form","requestedSchema":{"type":"object","properties":{}}}`,
-	} {
-		t.Run(params, func(t *testing.T) {
-			tc, srv, cleanup := NewTestClient()
-			defer cleanup()
-			s, out := newInteractionTestSession(tc.JSONRPCClient)
-			defer s.stopCodexInteractionTimers()
-			if err := SendServerRequest(srv, "rpc-unsupported", "mcpServer/elicitation/request", json.RawMessage(params)); err != nil {
-				t.Fatal(err)
-			}
-			var reply struct {
-				Error *struct {
-					Code int `json:"code"`
-				} `json:"error"`
-			}
-			decodeCodexReply(t, srv, &reply)
-			if reply.Error == nil || reply.Error.Code != -32603 {
-				t.Fatalf("unsupported input was not rejected: %+v", reply)
-			}
-			select {
-			case env := <-out:
-				t.Fatalf("unsupported input became an approval: %+v", env)
-			default:
-			}
-		})
-	}
-}
diff --git a/apps/daemon/internal/agent/codex/server_requests_test.go b/apps/daemon/internal/agent/codex/server_requests_test.go
deleted file mode 100644
index 4bae35ed0..000000000
--- a/apps/daemon/internal/agent/codex/server_requests_test.go
+++ /dev/null
@@ -1,357 +0,0 @@
-package codex
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func newInteractionTestSession(rpc *JSONRPCClient) (*Session, <-chan proto.Envelope) {
-	out := make(chan proto.Envelope, 1)
-	ctx, cancel := context.WithCancel(context.Background())
-	s := &Session{
-		runID:        "run-test",
-		out:          out,
-		rpc:          rpc,
-		cancelCtx:    ctx,
-		cancelFn:     cancel,
-		interactions: newPendingCodexInteractions(),
-	}
-	s.registerHandlers()
-	return s, out
-}
-
-func TestCodexPermissionRequestWaitsForHumanDecision(t *testing.T) {
-	tc, srv, cleanup := NewTestClient()
-	defer cleanup()
-	s, out := newInteractionTestSession(tc.JSONRPCClient)
-
-	command := "go test ./..."
-	reason := "requires process execution"
-	if err := SendServerRequest(srv, "rpc-perm-1", "item/commandExecution/requestApproval", CommandExecutionRequestApprovalParams{
-		ThreadID: "thread-1", TurnID: "turn-1", ItemID: "item-1", Command: &command, Reason: &reason,
-	}); err != nil {
-		t.Fatalf("send server request: %v", err)
-	}
-
-	var env proto.Envelope
-	select {
-	case env = <-out:
-	case <-time.After(2 * time.Second):
-		t.Fatal("permission request was not surfaced to OpenAgentCore")
-	}
-	if env.Type != proto.TypePermissionRequest {
-		t.Fatalf("envelope type = %q, want %q", env.Type, proto.TypePermissionRequest)
-	}
-	var request proto.PermissionRequestPayload
-	if err := env.DecodePayload(&request); err != nil {
-		t.Fatalf("decode permission payload: %v", err)
-	}
-	if env.ID != "run-test" || request.RequestID == "" {
-		t.Fatalf("permission correlation = env.ID %q request.ID %q", env.ID, request.RequestID)
-	}
-	if request.Tool != "command_execution" || request.Title != command || request.Detail != reason {
-		t.Fatalf("permission payload = %+v", request)
-	}
-
-	submitDone := make(chan error, 1)
-	go func() {
-		submitDone <- s.SubmitPermission(context.Background(), request.RequestID, proto.PermissionDecisionPayload{Approved: true})
-	}()
-	reply := readCodexServerReply(t, srv)
-	if err := <-submitDone; err != nil {
-		t.Fatalf("submit permission: %v", err)
-	}
-	if reply.ID != "rpc-perm-1" || reply.Result.Decision != "accept" {
-		t.Fatalf("reply = %+v", reply)
-	}
-}
-
-func TestCodexPermissionsApprovalUsesDedicatedResponseSchema(t *testing.T) {
-	for _, tt := range []struct {
-		name       string
-		approved   bool
-		wantGrants bool
-	}{
-		{name: "approve echoes requested grants", approved: true, wantGrants: true},
-		{name: "deny grants nothing", approved: false, wantGrants: false},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			tc, srv, cleanup := NewTestClient()
-			defer cleanup()
-			s, out := newInteractionTestSession(tc.JSONRPCClient)
-			requested := map[string]any{
-				"network":    map[string]any{"enabled": true},
-				"fileSystem": map[string]any{"write": []any{"/workspace"}},
-			}
-			if err := SendServerRequest(srv, "rpc-permissions", "item/permissions/requestApproval", PermissionsRequestApprovalParams{
-				Cwd: "/workspace", Permissions: requested,
-			}); err != nil {
-				t.Fatalf("send permissions request: %v", err)
-			}
-			env := <-out
-			var request proto.PermissionRequestPayload
-			if err := env.DecodePayload(&request); err != nil {
-				t.Fatalf("decode permission payload: %v", err)
-			}
-			done := make(chan error, 1)
-			go func() {
-				done <- s.SubmitPermission(context.Background(), request.RequestID, proto.PermissionDecisionPayload{Approved: tt.approved})
-			}()
-			var reply struct {
-				ID     string `json:"id"`
-				Result struct {
-					Permissions map[string]any `json:"permissions"`
-					Scope       string         `json:"scope"`
-					Decision    string         `json:"decision"`
-				} `json:"result"`
-			}
-			decodeCodexReply(t, srv, &reply)
-			if err := <-done; err != nil {
-				t.Fatalf("submit permissions: %v", err)
-			}
-			if reply.Result.Scope != "turn" || reply.Result.Decision != "" {
-				t.Fatalf("permissions reply = %+v", reply.Result)
-			}
-			_, granted := reply.Result.Permissions["network"]
-			if granted != tt.wantGrants {
-				t.Fatalf("permissions = %+v, want grants=%v", reply.Result.Permissions, tt.wantGrants)
-			}
-		})
-	}
-}
-
-func TestCodexUserInputMapsAnswersByQuestionID(t *testing.T) {
-	tc, srv, cleanup := NewTestClient()
-	defer cleanup()
-	s, out := newInteractionTestSession(tc.JSONRPCClient)
-
-	autoResolutionMs := uint64(120_000)
-	if err := SendServerRequest(srv, "rpc-ask-1", "item/tool/requestUserInput", ToolRequestUserInputParams{
-		ThreadID: "thread-1", TurnID: "turn-1", ItemID: "item-ask",
-		AutoResolutionMs: &autoResolutionMs,
-		Questions: []ToolRequestUserInputQuestion{
-			{ID: "deployment", Header: "Deploy", Question: "Where?", IsOther: true, Options: []ToolRequestUserInputOption{{Label: "Staging"}, {Label: "Production"}}},
-			{ID: "checks", Header: "Checks", Question: "Which checks?", IsSecret: true, Options: []ToolRequestUserInputOption{{Label: "Unit"}, {Label: "E2E"}}},
-		},
-	}); err != nil {
-		t.Fatalf("send server request: %v", err)
-	}
-
-	var env proto.Envelope
-	select {
-	case env = <-out:
-	case <-time.After(2 * time.Second):
-		t.Fatal("requestUserInput was not surfaced to OpenAgentCore")
-	}
-	if env.Type != proto.TypePromptForUserChoice {
-		t.Fatalf("envelope type = %q, want %q", env.Type, proto.TypePromptForUserChoice)
-	}
-	var request proto.PromptForUserChoicePayload
-	if err := env.DecodePayload(&request); err != nil {
-		t.Fatalf("decode user input payload: %v", err)
-	}
-	if len(request.Questions) != 2 || request.Questions[0].ID != "deployment" || request.Questions[1].ID != "checks" || request.Questions[0].Header != "Deploy" {
-		t.Fatalf("user input payload = %+v", request)
-	}
-	if !request.Questions[0].IsOther || !request.Questions[1].IsSecret || request.AutoResolutionMs == nil || *request.AutoResolutionMs != autoResolutionMs {
-		t.Fatalf("user input metadata = %+v", request)
-	}
-	s.interactions.mu.Lock()
-	pending := s.interactions.asks[request.AskID]
-	s.interactions.mu.Unlock()
-	if pending.timeout != 2*time.Minute {
-		t.Fatalf("ask timeout = %v, want 2m", pending.timeout)
-	}
-
-	if err := s.SubmitPromptForUserChoice(context.Background(), request.AskID, proto.PromptForUserChoiceDecisionPayload{
-		QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "foreign", Answers: []string{"yes"}}},
-	}); err == nil {
-		t.Fatal("accepted a foreign question ID")
-	}
-	// Invalid identity must leave the original native request pending.
-	submitDone := make(chan error, 1)
-	go func() {
-		submitDone <- s.SubmitPromptForUserChoice(context.Background(), request.AskID, proto.PromptForUserChoiceDecisionPayload{
-			QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{
-				{QuestionID: "checks", Answers: []string{"Unit", "E2E"}},
-				{QuestionID: "deployment", Answers: []string{"Staging"}},
-			},
-		})
-	}()
-
-	var reply struct {
-		ID     string                       `json:"id"`
-		Result ToolRequestUserInputResponse `json:"result"`
-	}
-	decodeCodexReply(t, srv, &reply)
-	if err := <-submitDone; err != nil {
-		t.Fatalf("submit user input: %v", err)
-	}
-	if reply.ID != "rpc-ask-1" {
-		t.Fatalf("reply id = %q", reply.ID)
-	}
-	if got := reply.Result.Answers["deployment"].Answers; len(got) != 1 || got[0] != "Staging" {
-		t.Fatalf("deployment answers = %v", got)
-	}
-	if got := reply.Result.Answers["checks"].Answers; len(got) != 2 || got[0] != "Unit" || got[1] != "E2E" {
-		t.Fatalf("checks answers = %v", got)
-	}
-}
-
-func TestCodexUserInputCancellationReturnsErrorInsteadOfEmptyAnswers(t *testing.T) {
-	tc, srv, cleanup := NewTestClient()
-	defer cleanup()
-	s, out := newInteractionTestSession(tc.JSONRPCClient)
-
-	if err := SendServerRequest(srv, "rpc-ask-cancel", "item/tool/requestUserInput", ToolRequestUserInputParams{
-		Questions: []ToolRequestUserInputQuestion{{ID: "confirm", Header: "Confirm", Question: "Continue?"}},
-	}); err != nil {
-		t.Fatalf("send server request: %v", err)
-	}
-	var env proto.Envelope
-	select {
-	case env = <-out:
-	case <-time.After(2 * time.Second):
-		t.Fatal("requestUserInput was not surfaced to OpenAgentCore")
-	}
-	var request proto.PromptForUserChoicePayload
-	if err := env.DecodePayload(&request); err != nil {
-		t.Fatalf("decode user input payload: %v", err)
-	}
-	submitDone := make(chan error, 1)
-	go func() {
-		submitDone <- s.SubmitPromptForUserChoice(context.Background(), request.AskID, proto.PromptForUserChoiceDecisionPayload{
-			Cancelled: true, Reason: "cancelled by user",
-		})
-	}()
-
-	var reply struct {
-		ID    string `json:"id"`
-		Error *struct {
-			Code    int    `json:"code"`
-			Message string `json:"message"`
-		} `json:"error"`
-	}
-	decodeCodexReply(t, srv, &reply)
-	if err := <-submitDone; err != nil {
-		t.Fatalf("cancel user input: %v", err)
-	}
-	if reply.ID != "rpc-ask-cancel" || reply.Error == nil || reply.Error.Code != -32001 {
-		t.Fatalf("cancel reply = %+v", reply)
-	}
-}
-
-func TestCodexInteractionExpiryUnblocksRuntime(t *testing.T) {
-	t.Run("permission declines", func(t *testing.T) {
-		tc, srv, cleanup := NewTestClient()
-		defer cleanup()
-		s, out := newInteractionTestSession(tc.JSONRPCClient)
-		command := "deploy"
-		if err := SendServerRequest(srv, "rpc-perm-timeout", "item/commandExecution/requestApproval", CommandExecutionRequestApprovalParams{Command: &command}); err != nil {
-			t.Fatalf("send permission request: %v", err)
-		}
-		env := <-out
-		var request proto.PermissionRequestPayload
-		if err := env.DecodePayload(&request); err != nil {
-			t.Fatalf("decode permission payload: %v", err)
-		}
-		expireDone := make(chan struct{})
-		go func() { s.expireCodexPermission(request.RequestID); close(expireDone) }()
-		reply := readCodexServerReply(t, srv)
-		<-expireDone
-		if reply.Result.Decision != "decline" {
-			t.Fatalf("expiry decision = %q", reply.Result.Decision)
-		}
-		if err := s.SubmitPermission(context.Background(), request.RequestID, proto.PermissionDecisionPayload{Approved: true}); !errors.Is(err, agent.ErrUnknownPermission) {
-			t.Fatalf("late permission error = %v, want ErrUnknownPermission", err)
-		}
-	})
-
-	t.Run("permission profile grants nothing", func(t *testing.T) {
-		tc, srv, cleanup := NewTestClient()
-		defer cleanup()
-		s, out := newInteractionTestSession(tc.JSONRPCClient)
-		if err := SendServerRequest(srv, "rpc-profile-timeout", "item/permissions/requestApproval", PermissionsRequestApprovalParams{
-			Permissions: map[string]any{"network": map[string]any{"enabled": true}},
-		}); err != nil {
-			t.Fatalf("send permission profile request: %v", err)
-		}
-		env := <-out
-		var request proto.PermissionRequestPayload
-		if err := env.DecodePayload(&request); err != nil {
-			t.Fatalf("decode permission payload: %v", err)
-		}
-		done := make(chan struct{})
-		go func() { s.expireCodexPermission(request.RequestID); close(done) }()
-		var reply struct {
-			Result PermissionsRequestApprovalResponse `json:"result"`
-		}
-		decodeCodexReply(t, srv, &reply)
-		<-done
-		if len(reply.Result.Permissions) != 0 || reply.Result.Scope != "turn" {
-			t.Fatalf("expiry permissions response = %+v", reply.Result)
-		}
-	})
-
-	t.Run("user input returns timeout error", func(t *testing.T) {
-		tc, srv, cleanup := NewTestClient()
-		defer cleanup()
-		s, out := newInteractionTestSession(tc.JSONRPCClient)
-		if err := SendServerRequest(srv, "rpc-ask-timeout", "item/tool/requestUserInput", ToolRequestUserInputParams{
-			Questions: []ToolRequestUserInputQuestion{{ID: "q1", Header: "Confirm", Question: "Continue?"}},
-		}); err != nil {
-			t.Fatalf("send input request: %v", err)
-		}
-		var request proto.PromptForUserChoicePayload
-		if err := (<-out).DecodePayload(&request); err != nil {
-			t.Fatalf("decode input request: %v", err)
-		}
-		expireDone := make(chan struct{})
-		go func() { s.expireCodexAsk(request.AskID); close(expireDone) }()
-		var reply struct {
-			Error *struct {
-				Code int `json:"code"`
-			} `json:"error"`
-		}
-		decodeCodexReply(t, srv, &reply)
-		<-expireDone
-		if reply.Error == nil || reply.Error.Code != -32001 {
-			t.Fatalf("expiry reply = %+v", reply)
-		}
-		if err := s.SubmitPromptForUserChoice(context.Background(), request.AskID, proto.PromptForUserChoiceDecisionPayload{QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}}}); !errors.Is(err, agent.ErrUnknownAsk) {
-			t.Fatalf("late input error = %v, want ErrUnknownAsk", err)
-		}
-	})
-}
-
-type approvalReply struct {
-	ID     string                 `json:"id"`
-	Result ApprovalDecisionResult `json:"result"`
-}
-
-func readCodexServerReply(t *testing.T, srv ServerSide) approvalReply {
-	t.Helper()
-	var reply approvalReply
-	decodeCodexReply(t, srv, &reply)
-	return reply
-}
-
-func decodeCodexReply(t *testing.T, srv ServerSide, target any) {
-	t.Helper()
-	done := make(chan error, 1)
-	go func() { done <- json.NewDecoder(srv.FromClient).Decode(target) }()
-	select {
-	case err := <-done:
-		if err != nil {
-			t.Fatalf("decode Codex reply: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("Codex reply timed out")
-	}
-}
diff --git a/apps/daemon/internal/agent/codex/session.go b/apps/daemon/internal/agent/codex/session.go
index a69f3944b..9d3386609 100644
--- a/apps/daemon/internal/agent/codex/session.go
+++ b/apps/daemon/internal/agent/codex/session.go
@@ -103,24 +103,11 @@ type Session struct {
 	finalText   string
 	lastErrText string
 
-	interactions *pendingCodexInteractions
-	outcome      cancellationOutcomeState
+	outcome cancellationOutcomeState
 }
 
 var _ agent.Session = (*Session)(nil)
 
-// SubmitPermission completes the deferred Codex app-server request that
-// produced the Core permission envelope.
-func (s *Session) SubmitPermission(_ context.Context, permID string, decision proto.PermissionDecisionPayload) error {
-	return s.submitCodexPermission(permID, decision)
-}
-
-// SubmitPromptForUserChoice maps Core's header/answer pairs back to
-// Codex's question-id keyed requestUserInput response.
-func (s *Session) SubmitPromptForUserChoice(_ context.Context, askID string, decision proto.PromptForUserChoiceDecisionPayload) error {
-	return s.submitCodexUserInput(askID, decision)
-}
-
 // ---------------------------------------------------------------------------
 // notification handlers
 // ---------------------------------------------------------------------------
@@ -142,14 +129,10 @@ func (s *Session) registerHandlers() {
 	rpc.OnNotification("thread/tokenUsage/updated", s.onUsageUpdated)
 	rpc.OnNotification("error", s.onErrorNotif)
 
-	s.onServerRequest("item/commandExecution/requestApproval", s.handleCodexCommandApproval)
-	s.onServerRequest("item/fileChange/requestApproval", s.handleCodexFileApproval)
-	s.onServerRequest("item/permissions/requestApproval", s.handleCodexPermissionsApproval)
-	// Older app-server releases used this unseparated method name.
-	s.onServerRequest("item/permissionsRequestApproval", s.handleCodexPermissionsApproval)
-	s.onServerRequest("item/tool/requestUserInput", s.handleCodexUserInput)
+	// Harnesses run unattended. Approval policy never and the session plan keep
+	// native asks from being raised; any other server request gets the
+	// client's method-not-found reply.
 	s.onServerRequest("item/tool/call", s.handleFunctionCall)
-	s.onServerRequest("mcpServer/elicitation/request", s.handleCodexMCPElicitation)
 }
 
 func (s *Session) onTurnStarted(raw json.RawMessage) {
diff --git a/apps/daemon/internal/agent/codex/session_cancel.go b/apps/daemon/internal/agent/codex/session_cancel.go
index 25024d5b5..091eae119 100644
--- a/apps/daemon/internal/agent/codex/session_cancel.go
+++ b/apps/daemon/internal/agent/codex/session_cancel.go
@@ -42,7 +42,6 @@ func (s *Session) cancelNativeWork() {
 	defer close(s.cancelReady)
 	s.stopFunctionCalls()
 	turnID, active := s.stopSteering()
-	s.stopCodexInteractionTimers()
 	// Best effort: a known Turn must use its native identity. An explicit
 	// empty ID invokes native startup cancellation before turn/started.
 	if threadID := s.currentThreadID(); threadID != "" && active {
diff --git a/apps/daemon/internal/agent/codex/session_cancel_test.go b/apps/daemon/internal/agent/codex/session_cancel_test.go
index b5879197b..32e794b6a 100644
--- a/apps/daemon/internal/agent/codex/session_cancel_test.go
+++ b/apps/daemon/internal/agent/codex/session_cancel_test.go
@@ -116,7 +116,7 @@ func cancellationTestSession(t *testing.T) (*Session, *TestClient, ServerSide) {
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 	s := &Session{rpc: client.JSONRPCClient, cancelCtx: ctx, cancelFn: cancel,
-		cfg: defaultSessionConfig(), interactions: newPendingCodexInteractions(), out: make(chan proto.Envelope, 8), bufs: NewItemBuffers()}
+		cfg: defaultSessionConfig(), out: make(chan proto.Envelope, 8), bufs: NewItemBuffers()}
 	return s, client, server
 }
 
diff --git a/apps/daemon/internal/agent/codex/session_cancel_write_test.go b/apps/daemon/internal/agent/codex/session_cancel_write_test.go
index 7c0eed406..087b8e78f 100644
--- a/apps/daemon/internal/agent/codex/session_cancel_write_test.go
+++ b/apps/daemon/internal/agent/codex/session_cancel_write_test.go
@@ -146,7 +146,7 @@ func TestCancelReleasesBlockedNativeProcess(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	s := &Session{rpc: client, cancelCtx: ctx, cancelFn: cancel,
-		cfg: defaultSessionConfig(), interactions: newPendingCodexInteractions(), bufs: NewItemBuffers()}
+		cfg: defaultSessionConfig(), bufs: NewItemBuffers()}
 	s.setThreadID("native-thread")
 	s.onTurnStarted(json.RawMessage(`{"threadId":"native-thread","turn":{"id":"native-turn"}}`))
 	cancelDone := make(chan struct{})
diff --git a/apps/daemon/internal/agent/codex/session_plan.go b/apps/daemon/internal/agent/codex/session_plan.go
index 6d8ae5d67..d8e7aede8 100644
--- a/apps/daemon/internal/agent/codex/session_plan.go
+++ b/apps/daemon/internal/agent/codex/session_plan.go
@@ -31,9 +31,6 @@ func prepareSessionPlan(ctx context.Context, req proto.PromptRequestPayload, cfg
 	disableProgrammaticTools(&plan, req.ExecutionControls)
 	if req.LocalEnvironment != nil {
 		plan.Cwd = req.LocalEnvironment.WorkspaceRoot
-		plan.Sandbox = "danger-full-access"
-		plan.Permissions = ""
-		plan.ApprovalPolicy = AskForApproval{String: "never"}
 	} else {
 		// environment:none has no workspace; the Session's private home is its cwd.
 		plan.Cwd = nativeHomeFromPlan(plan)
diff --git a/apps/daemon/internal/agent/codex/session_run.go b/apps/daemon/internal/agent/codex/session_run.go
index 7517bfb98..b9f26c933 100644
--- a/apps/daemon/internal/agent/codex/session_run.go
+++ b/apps/daemon/internal/agent/codex/session_run.go
@@ -11,7 +11,6 @@ import (
 
 func (s *Session) run(plan SessionPlan, req proto.PromptRequestPayload) {
 	defer close(s.waitDone)
-	defer s.stopCodexInteractionTimers()
 	defer s.stopFunctionCalls()
 	defer s.cleanup()
 	defer s.closeRunOutput()
diff --git a/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go b/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
index 9b2bf38f0..7345d5dae 100644
--- a/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
+++ b/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
@@ -86,7 +86,7 @@ func TestBlockedSteeringWriteEndsRunWithTerminalFrames(t *testing.T) {
 	s := &Session{
 		runID: "run", rpc: client.JSONRPCClient, cancelCtx: ctx, out: out, resolvedModel: "synthetic",
 		cfg: sessionConfig{logger: obslog.Bg()}, waitDone: make(chan struct{}), cleanup: func() {},
-		bufs: NewItemBuffers(), interactions: newPendingCodexInteractions(),
+		bufs: NewItemBuffers(),
 	}
 	s.registerHandlers()
 	ready := make(chan error, 1)
diff --git a/apps/daemon/internal/agent/codex/session_thread.go b/apps/daemon/internal/agent/codex/session_thread.go
index 28681b400..35699b8a8 100644
--- a/apps/daemon/internal/agent/codex/session_thread.go
+++ b/apps/daemon/internal/agent/codex/session_thread.go
@@ -5,14 +5,20 @@ import (
 	"fmt"
 )
 
+// Harnesses run unattended with the launching user's permissions: Codex never
+// raises a native approval request and applies no inner sandbox.
+const (
+	approvalPolicyNever     = "never"
+	sandboxDangerFullAccess = "danger-full-access"
+)
+
 func (s *Session) startThread(plan SessionPlan) error {
 	params := ThreadStartParams{
 		Cwd:                   plan.Cwd,
 		Model:                 plan.Model,
 		ModelProvider:         plan.ModelProvider,
-		ApprovalPolicy:        plan.ApprovalPolicy,
-		Sandbox:               plan.Sandbox,
-		Permissions:           plan.Permissions,
+		ApprovalPolicy:        approvalPolicyNever,
+		Sandbox:               sandboxDangerFullAccess,
 		DeveloperInstructions: plan.SystemPrompt,
 	}
 	if s.observeSubagentIdentities {
@@ -26,8 +32,7 @@ func (s *Session) startThread(plan SessionPlan) error {
 		"cwd", params.Cwd,
 		"model", params.Model,
 		"model_provider", params.ModelProvider,
-		"sandbox", string(params.Sandbox),
-		"approval_silent", IsSilent(&params.ApprovalPolicy),
+		"sandbox", params.Sandbox,
 		"developer_instructions_len", len(params.DeveloperInstructions))
 	_, err := s.rpc.requestWithResult(s.cancelCtx, "thread/start", params, func(raw json.RawMessage) error {
 		return s.bindThreadResult(raw, "")
@@ -37,8 +42,7 @@ func (s *Session) startThread(plan SessionPlan) error {
 
 func (s *Session) resumeThread(threadID string, plan SessionPlan) error {
 	params := ThreadResumeParams{
-		ThreadID: threadID, ApprovalPolicy: plan.ApprovalPolicy, Sandbox: plan.Sandbox,
-		Permissions:           plan.Permissions,
+		ThreadID: threadID, ApprovalPolicy: approvalPolicyNever, Sandbox: sandboxDangerFullAccess,
 		DeveloperInstructions: plan.SystemPrompt,
 	}
 	if plan.mcpServers != nil {
diff --git a/apps/daemon/internal/agent/codex/subagent_observations_test.go b/apps/daemon/internal/agent/codex/subagent_observations_test.go
index 6d10dd0a8..3e8f7241a 100644
--- a/apps/daemon/internal/agent/codex/subagent_observations_test.go
+++ b/apps/daemon/internal/agent/codex/subagent_observations_test.go
@@ -74,7 +74,7 @@ func observationSession(t *testing.T, status string) (*Session, *subagentFixture
 		t.Fatal(err)
 	}
 	f.persist(t)
-	s := &Session{runID: "run", nativeHome: f.home, rpc: client.JSONRPCClient, out: out, cancelCtx: ctx, cancelFn: cancel, cfg: defaultSessionConfig(), bufs: NewItemBuffers(), interactions: newPendingCodexInteractions()}
+	s := &Session{runID: "run", nativeHome: f.home, rpc: client.JSONRPCClient, out: out, cancelCtx: ctx, cancelFn: cancel, cfg: defaultSessionConfig(), bufs: NewItemBuffers()}
 	s.setThreadID("root")
 	s.beginRootTurn("root", "root-turn")
 	s.startSubagentObservations()
diff --git a/apps/daemon/internal/agent/contract_declarations_test.go b/apps/daemon/internal/agent/contract_declarations_test.go
index fc642d3f4..386cecee6 100644
--- a/apps/daemon/internal/agent/contract_declarations_test.go
+++ b/apps/daemon/internal/agent/contract_declarations_test.go
@@ -22,8 +22,6 @@ func TestPublicHarnessContractDeclarations(t *testing.T) {
 		"DurableSteerer":           {"session"},
 		"Steerer":                  {"session"},
 		"FunctionResultSubmitter":  {"session"},
-		"PermissionResponder":      {"session"},
-		"UserChoiceResponder":      {"session"},
 		"WorkspaceReader":          {"executor", "prepared", "session"},
 		"WorkspaceDirectoryLister": {"executor", "prepared", "session"},
 		"WorkspaceWriter":          {"executor", "prepared", "session"},
diff --git a/apps/daemon/internal/agent/contracttest/text.go b/apps/daemon/internal/agent/contracttest/text.go
index 5c0d76e4a..c389163a7 100644
--- a/apps/daemon/internal/agent/contracttest/text.go
+++ b/apps/daemon/internal/agent/contracttest/text.go
@@ -32,7 +32,7 @@ type TextFixture struct {
 
 // TextLifecycle verifies ordinary reuse, exact Turn ownership, durable active
 // input, confirmed cancellation and continuation of a healthy Executor. It asks
-// for no optional tools, images, interactions, workspace or detailed Usage.
+// for no optional tools, images, workspace or detailed Usage.
 // Native fault injection and history recovery have separate adapter tests.
 func TextLifecycle(t *testing.T, fixture TextFixture) {
 	t.Helper()
diff --git a/apps/daemon/internal/agent/harness.go b/apps/daemon/internal/agent/harness.go
index ee08be11e..3a798043b 100644
--- a/apps/daemon/internal/agent/harness.go
+++ b/apps/daemon/internal/agent/harness.go
@@ -109,8 +109,8 @@ type Executor interface {
 type Turn interface {
 	Session
 	DurableSteerer
-	// Success confirms closed output and settled native input, function,
-	// interaction and child-work obligations. Errors cannot prove cancellation.
+	// Success confirms closed output and settled native input, function and
+	// child-work obligations. Errors cannot prove cancellation.
 	AwaitSettlement(context.Context) (TurnSettlement, error)
 }
 
@@ -158,20 +158,6 @@ type FunctionResultSubmitter interface {
 	SubmitFunctionResult(context.Context, proto.FunctionResultPayload) error
 }
 
-// PermissionResponder accepts decisions for qualified permission requests.
-// An adapter that never supports these interactions returns ErrUnsupportedOperation.
-// Unknown or expired requests return ErrUnknownPermission.
-type PermissionResponder interface {
-	SubmitPermission(context.Context, string, proto.PermissionDecisionPayload) error
-}
-
-// UserChoiceResponder accepts answers for qualified user-choice requests.
-// An adapter that never supports these interactions returns ErrUnsupportedOperation.
-// Unknown or expired requests return ErrUnknownAsk.
-type UserChoiceResponder interface {
-	SubmitPromptForUserChoice(context.Context, string, proto.PromptForUserChoiceDecisionPayload) error
-}
-
 // Workspace extensions, implemented by each owner explicitly. The common
 // Runtime may supply an authorized workspace owner independently of the adapter.
 // A resource without native access returns the corresponding Unsupported error;
diff --git a/apps/daemon/internal/agent/mcode/contracts.go b/apps/daemon/internal/agent/mcode/contracts.go
index d2ed2e6d4..025ef1890 100644
--- a/apps/daemon/internal/agent/mcode/contracts.go
+++ b/apps/daemon/internal/agent/mcode/contracts.go
@@ -11,8 +11,6 @@ var (
 	_ agent.DurableSteerer           = (*Session)(nil)
 	_ agent.Steerer                  = (*Session)(nil)
 	_ agent.FunctionResultSubmitter  = (*Session)(nil)
-	_ agent.PermissionResponder      = (*Session)(nil)
-	_ agent.UserChoiceResponder      = (*Session)(nil)
 	_ agent.WorkspaceReader          = (*Session)(nil)
 	_ agent.WorkspaceDirectoryLister = (*Session)(nil)
 	_ agent.WorkspaceWriter          = (*Session)(nil)
diff --git a/apps/daemon/internal/agent/mcode/declaration.go b/apps/daemon/internal/agent/mcode/declaration.go
index b3f257ad7..5216634f5 100644
--- a/apps/daemon/internal/agent/mcode/declaration.go
+++ b/apps/daemon/internal/agent/mcode/declaration.go
@@ -14,7 +14,6 @@ import (
 var Declaration = agent.Declaration{Info: proto.SupportedAgentKind{Kind: "mcode", Capabilities: proto.AgentKindCapabilities{
 	SubagentObservations:           proto.CapabilityUnsupported,
 	Streaming:                      proto.CapabilitySupported,
-	Permissions:                    proto.CapabilitySupported,
 	Usage:                          proto.CapabilityUnsupported,
 	Resume:                         proto.CapabilitySupported,
 	NativeSessionRecovery:          proto.CapabilityUnsupported,
diff --git a/apps/daemon/internal/agent/mcode/declaration_test.go b/apps/daemon/internal/agent/mcode/declaration_test.go
index ff2f74f16..d39aada63 100644
--- a/apps/daemon/internal/agent/mcode/declaration_test.go
+++ b/apps/daemon/internal/agent/mcode/declaration_test.go
@@ -35,7 +35,7 @@ func TestMCodeExecutionOptInIsVersionBound(t *testing.T) {
 
 // The declaration must retain the complete baseline capability descriptor.
 func TestDeclaredCapabilityBaseline(t *testing.T) {
-	expected := map[string]bool{"Streaming": true, "Permissions": true, "Resume": true}
+	expected := map[string]bool{"Streaming": true, "Resume": true}
 	value := reflect.ValueOf(Declaration.Info.Capabilities)
 	for i := 0; i < value.NumField(); i++ {
 		name := value.Type().Field(i).Name
diff --git a/apps/daemon/internal/agent/mcode/events.go b/apps/daemon/internal/agent/mcode/events.go
index 97bd1f8cd..a41789fd1 100644
--- a/apps/daemon/internal/agent/mcode/events.go
+++ b/apps/daemon/internal/agent/mcode/events.go
@@ -7,18 +7,18 @@ import (
 	"net/url"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/google/uuid"
 )
 
 func decodeComponent(value string) (string, error) { return url.PathUnescape(value) }
 
 func (s *Session) handle(frame rpcFrame) error {
 	if len(frame.ID) > 0 {
-		if frame.Method == "session/request_permission" && s.active {
-			return s.askPermission(frame)
-		}
-		if frame.Method == "elicitation/create" && s.active {
-			return s.askQuestion(frame)
+		// Harnesses run unattended, so no client method other than the
+		// permission answer is offered. Pinned mcode 0.4.12 maps the ACP
+		// cancelled outcome to deny: the tool call is blocked and the Turn
+		// continues.
+		if frame.Method == "session/request_permission" {
+			return s.write(rpcFrame{JSONRPC: "2.0", ID: frame.ID, Result: json.RawMessage(`{"outcome":{"outcome":"cancelled"}}`)})
 		}
 		return s.write(rpcFrame{JSONRPC: "2.0", ID: frame.ID, Error: &rpcError{Code: -32601, Message: "ACP method not supported by OpenAgentCore"}})
 	}
@@ -95,35 +95,3 @@ func (s *Session) emitTool(update toolUpdate) error {
 	}
 	return nil
 }
-
-func (s *Session) askPermission(frame rpcFrame) error {
-	var request permissionRequest
-	if err := json.Unmarshal(frame.Params, &request); err != nil {
-		return fmt.Errorf("mcode: invalid permission request")
-	}
-	if request.SessionID != s.sessionID {
-		return fmt.Errorf("mcode: permission request belongs to another session")
-	}
-	pending := pendingPermission{RPCID: frame.ID}
-	for _, option := range request.Options {
-		switch option.Kind {
-		case "allow_once":
-			pending.Allow = option.ID
-		case "reject_once":
-			pending.Deny = option.ID
-		}
-	}
-	if pending.Allow == "" || pending.Deny == "" {
-		return fmt.Errorf("mcode: permission request has no one-time allow/deny options")
-	}
-	id := "perm_" + uuid.NewString()
-	s.mu.Lock()
-	s.permissions[id] = pending
-	s.mu.Unlock()
-	tool := request.ToolCall.Name
-	if tool == "" {
-		tool = request.ToolCall.Title
-	}
-	s.emit(proto.TypePermissionRequest, proto.PermissionRequestPayload{RequestID: id, Tool: tool, Title: request.ToolCall.Title, Payload: request.ToolCall.RawInput})
-	return nil
-}
diff --git a/apps/daemon/internal/agent/mcode/executor_turn.go b/apps/daemon/internal/agent/mcode/executor_turn.go
index e9e2dcc17..dc24cd17a 100644
--- a/apps/daemon/internal/agent/mcode/executor_turn.go
+++ b/apps/daemon/internal/agent/mcode/executor_turn.go
@@ -38,7 +38,7 @@ func (s *Session) runExecutorTurn(prompt string) {
 	s.mu.Lock()
 	// ACP and native history cancellation do not prove detached tool cleanup.
 	// Retire the owner and settle its workers before acknowledging cancellation.
-	if s.cancelled || s.inputUncertain || len(s.permissions) != 0 || len(s.questions) != 0 {
+	if s.cancelled || s.inputUncertain {
 		reusable = false
 	}
 	if s.inputUncertain && err == nil {
@@ -47,7 +47,6 @@ func (s *Session) runExecutorTurn(prompt string) {
 	metadata := map[string]any{proto.DoneMetaAgentSessionType: "mcode", proto.DoneMetaAgentSessionID: s.sessionID}
 	s.outcome = proto.DonePayload{Content: s.content.String(), Metadata: metadata, SourceCompletedAtMS: s.rootCompletedAtMS}
 	outcome := s.outcome
-	s.permissions, s.questions = map[string]pendingPermission{}, map[string]pendingQuestion{}
 	s.mu.Unlock()
 	if !reusable {
 		// Unknown quiescence invalidates this owner. A successful settlement
diff --git a/apps/daemon/internal/agent/mcode/options_test.go b/apps/daemon/internal/agent/mcode/options_test.go
index 1ae1d7780..70d736c86 100644
--- a/apps/daemon/internal/agent/mcode/options_test.go
+++ b/apps/daemon/internal/agent/mcode/options_test.go
@@ -81,22 +81,3 @@ func TestOptionsRejectDroppedContext(t *testing.T) {
 		})
 	}
 }
-
-func TestQuestionContentPreservesTypesAndValidates(t *testing.T) {
-	pending := pendingQuestion{Properties: map[string]formProperty{"text": {Type: "string"}, "choice": {Type: "string", Options: []formOption{{Value: "eu", Title: "Europe"}}}}, Required: []string{"choice"}}
-	if _, err := questionContent(pending, proto.PromptForUserChoiceDecisionPayload{}); err == nil {
-		t.Fatal("required answer accepted empty")
-	}
-	decision := proto.PromptForUserChoiceDecisionPayload{QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "text", Answers: []string{"custom"}}, {QuestionID: "choice", Answers: []string{"Europe"}}}}
-	content, err := questionContent(pending, decision)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if content["choice"] != "eu" || content["text"] != "custom" {
-		t.Fatalf("answers=%v", content)
-	}
-	decision.QuestionAnswers[1].Answers = []string{"unoffered"}
-	if _, err := questionContent(pending, decision); err == nil {
-		t.Fatal("unoffered choice accepted")
-	}
-}
diff --git a/apps/daemon/internal/agent/mcode/protocol.go b/apps/daemon/internal/agent/mcode/protocol.go
index 95c9f629a..116d8c024 100644
--- a/apps/daemon/internal/agent/mcode/protocol.go
+++ b/apps/daemon/internal/agent/mcode/protocol.go
@@ -50,18 +50,3 @@ type sessionUpdate struct {
 		toolUpdate
 	} `json:"update"`
 }
-
-type permissionRequest struct {
-	SessionID string     `json:"sessionId"`
-	ToolCall  toolUpdate `json:"toolCall"`
-	Options   []struct {
-		ID   string `json:"optionId"`
-		Kind string `json:"kind"`
-	} `json:"options"`
-}
-
-type pendingPermission struct {
-	RPCID json.RawMessage
-	Allow string
-	Deny  string
-}
diff --git a/apps/daemon/internal/agent/mcode/questions.go b/apps/daemon/internal/agent/mcode/questions.go
deleted file mode 100644
index b61721d97..000000000
--- a/apps/daemon/internal/agent/mcode/questions.go
+++ /dev/null
@@ -1,217 +0,0 @@
-package mcode
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/google/uuid"
-)
-
-type formOption struct {
-	Value       string `json:"const"`
-	Title       string `json:"title"`
-	Description string `json:"description"`
-}
-
-type formProperty struct {
-	Type        string       `json:"type"`
-	Title       string       `json:"title"`
-	Description string       `json:"description"`
-	Options     []formOption `json:"oneOf"`
-	Items       struct {
-		Options []formOption `json:"anyOf"`
-	} `json:"items"`
-}
-
-type pendingQuestion struct {
-	RPCID       json.RawMessage
-	Properties  map[string]formProperty
-	Required    []string
-	OtherFields map[string]string
-}
-
-func (s *Session) askQuestion(frame rpcFrame) error {
-	var request struct {
-		SessionID string `json:"sessionId"`
-		Mode      string `json:"mode"`
-		Schema    struct {
-			Type       string                  `json:"type"`
-			Properties map[string]formProperty `json:"properties"`
-			Required   []string                `json:"required"`
-		} `json:"requestedSchema"`
-	}
-	if err := json.Unmarshal(frame.Params, &request); err != nil {
-		return fmt.Errorf("mcode: invalid input request")
-	}
-	if request.SessionID != s.sessionID {
-		return fmt.Errorf("mcode: input request belongs to another session")
-	}
-	if request.Mode != "form" || request.Schema.Type != "object" || len(request.Schema.Properties) == 0 {
-		return s.write(rpcFrame{JSONRPC: "2.0", ID: frame.ID, Error: &rpcError{Code: -32602, Message: "OpenAgentCore requires a nonempty input form"}})
-	}
-	otherFields := questionnaireOtherFields(request.Schema.Properties)
-	for _, key := range otherFields {
-		delete(request.Schema.Properties, key)
-	}
-	keys := make([]string, 0, len(request.Schema.Properties))
-	for key := range request.Schema.Properties {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	questions := make([]proto.PromptForUserChoiceQuestion, 0, len(keys))
-	for _, key := range keys {
-		property := request.Schema.Properties[key]
-		if property.Type != "string" && property.Type != "array" {
-			return s.write(rpcFrame{JSONRPC: "2.0", ID: frame.ID, Error: &rpcError{Code: -32602, Message: "OpenAgentCore supports text and choice input fields"}})
-		}
-		question := proto.PromptForUserChoiceQuestion{ID: key, Question: property.Title, MultiSelect: property.Type == "array", Options: []proto.PromptForUserChoiceOption{}}
-		if question.Question == "" {
-			question.Question = key
-		}
-		if property.Description != "" {
-			question.Question += "\n" + property.Description
-		}
-		options := property.Options
-		if question.MultiSelect {
-			options = property.Items.Options
-		}
-		labels := map[string]bool{}
-		for _, option := range options {
-			label := option.Title
-			if label == "" {
-				label = option.Value
-			}
-			if labels[label] {
-				return fmt.Errorf("mcode: input choices have ambiguous labels")
-			}
-			labels[label] = true
-			question.Options = append(question.Options, proto.PromptForUserChoiceOption{Label: label, Description: option.Description})
-		}
-		question.IsOther = len(options) == 0 || otherFields[key] != ""
-		questions = append(questions, question)
-	}
-	id := "ask_" + uuid.NewString()
-	s.mu.Lock()
-	s.questions[id] = pendingQuestion{RPCID: frame.ID, Properties: request.Schema.Properties, Required: request.Schema.Required, OtherFields: otherFields}
-	s.mu.Unlock()
-	s.emit(proto.TypePromptForUserChoice, proto.PromptForUserChoicePayload{AskID: id, Questions: questions})
-	return nil
-}
-
-// Native questionnaires encode Other as a companion field, not a second question.
-func questionnaireOtherFields(properties map[string]formProperty) map[string]string {
-	fields := map[string]string{}
-	for key, property := range properties {
-		if len(property.Options) == 0 && len(property.Items.Options) == 0 {
-			continue
-		}
-		for candidate, other := range properties {
-			if strings.HasPrefix(candidate, key+"__other") && strings.Trim(strings.TrimPrefix(candidate, key+"__other"), "_") == "" && other.Type == "string" && len(other.Options) == 0 && other.Title == property.Title+" — Other" {
-				fields[key] = candidate
-				break
-			}
-		}
-	}
-	return fields
-}
-
-func (s *Session) SubmitPromptForUserChoice(_ context.Context, id string, decision proto.PromptForUserChoiceDecisionPayload) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	pending, ok := s.questions[id]
-	if !ok {
-		return agent.ErrUnknownAsk
-	}
-	if err := decision.Validate(); err != nil {
-		return err
-	}
-	response := map[string]any{"action": "cancel"}
-	if !decision.Cancelled {
-		content, err := questionContent(pending, decision)
-		if err != nil {
-			return err
-		}
-		response = map[string]any{"action": "accept", "content": content}
-	}
-	raw, _ := json.Marshal(response)
-	if err := s.write(rpcFrame{JSONRPC: "2.0", ID: pending.RPCID, Result: raw}); err != nil {
-		return err
-	}
-	delete(s.questions, id)
-	return nil
-}
-
-func questionContent(pending pendingQuestion, decision proto.PromptForUserChoiceDecisionPayload) (map[string]any, error) {
-	ids := make([]string, 0, len(pending.Properties))
-	for id := range pending.Properties {
-		ids = append(ids, id)
-	}
-	if _, err := decision.AnswersFor(ids); err != nil {
-		return nil, err
-	}
-	content := map[string]any{}
-	for _, answer := range decision.QuestionAnswers {
-		property, ok := pending.Properties[answer.QuestionID]
-		if !ok {
-			return nil, fmt.Errorf("mcode: unknown input field")
-		}
-		values := append([]string{}, answer.Answers...)
-		if len(values) == 0 {
-			continue
-		}
-		options := property.Options
-		if property.Type == "array" {
-			options = property.Items.Options
-		} else if len(values) != 1 {
-			return nil, fmt.Errorf("mcode: input field requires a single answer")
-		}
-		selected := make([]string, 0, len(values))
-		for _, value := range values {
-			if len(options) == 0 {
-				selected = append(selected, value)
-				continue
-			}
-			found := false
-			for _, option := range options {
-				label := option.Title
-				if label == "" {
-					label = option.Value
-				}
-				if value == label {
-					selected = append(selected, option.Value)
-					found = true
-					break
-				}
-			}
-			if !found {
-				other := pending.OtherFields[answer.QuestionID]
-				if other == "" {
-					return nil, fmt.Errorf("mcode: answer is not an offered choice")
-				}
-				if _, exists := content[other]; exists {
-					return nil, fmt.Errorf("mcode: input field requires a single custom answer")
-				}
-				content[other] = value
-			}
-		}
-		if len(selected) == 0 {
-			continue
-		}
-		if property.Type == "array" {
-			content[answer.QuestionID] = selected
-		} else {
-			content[answer.QuestionID] = selected[0]
-		}
-	}
-	for _, key := range pending.Required {
-		if _, ok := content[key]; !ok {
-			return nil, fmt.Errorf("mcode: required input is missing")
-		}
-	}
-	return content, nil
-}
diff --git a/apps/daemon/internal/agent/mcode/questions_test.go b/apps/daemon/internal/agent/mcode/questions_test.go
deleted file mode 100644
index 858658e6c..000000000
--- a/apps/daemon/internal/agent/mcode/questions_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package mcode
-
-import (
-	"encoding/json"
-	"reflect"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func TestQuestionnaireOtherUsesOneQuestion(t *testing.T) {
-	for _, multiple := range []bool{false, true} {
-		property := formProperty{Type: "string", Title: "Region?", Options: []formOption{{Value: "eu", Title: "Europe"}}}
-		if multiple {
-			property.Type = "array"
-			property.Items.Options = property.Options
-			property.Options = nil
-		}
-		properties := map[string]formProperty{"region": property, "region__other": {Type: "string", Title: "Region? — Other"}}
-		params, _ := json.Marshal(map[string]any{"sessionId": "native-1", "mode": "form", "requestedSchema": map[string]any{"type": "object", "properties": properties}})
-		out := make(chan proto.Envelope, 1)
-		session := &Session{ctx: t.Context(), outputContext: t.Context(), sessionID: "native-1", out: out, questions: map[string]pendingQuestion{}}
-		if err := session.askQuestion(rpcFrame{ID: json.RawMessage(`1`), Params: params}); err != nil {
-			t.Fatal(err)
-		}
-		var request proto.PromptForUserChoicePayload
-		_ = json.Unmarshal((<-out).Payload, &request)
-		if len(request.Questions) != 1 || !request.Questions[0].IsOther || request.Questions[0].MultiSelect != multiple {
-			t.Fatalf("unexpected questions: %#v", request.Questions)
-		}
-		pending := session.questions[request.AskID]
-		for _, custom := range []bool{false, true} {
-			answer := "Europe"
-			want := map[string]any{"region": "eu"}
-			if multiple {
-				want["region"] = []string{"eu"}
-			}
-			if custom {
-				answer = "Asia"
-				want = map[string]any{"region__other": "Asia"}
-			}
-			got, err := questionContent(pending, proto.PromptForUserChoiceDecisionPayload{QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "region", Answers: []string{answer}}}})
-			if err != nil || !reflect.DeepEqual(got, want) {
-				t.Fatalf("multiple=%t custom=%t: got=%v err=%v", multiple, custom, got, err)
-			}
-		}
-		if multiple {
-			got, err := questionContent(pending, proto.PromptForUserChoiceDecisionPayload{QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "region", Answers: []string{"Europe", "Asia"}}}})
-			want := map[string]any{"region": []string{"eu"}, "region__other": "Asia"}
-			if err != nil || !reflect.DeepEqual(got, want) {
-				t.Fatalf("combined choice and custom: got=%v err=%v", got, err)
-			}
-		}
-	}
-}
diff --git a/apps/daemon/internal/agent/mcode/session.go b/apps/daemon/internal/agent/mcode/session.go
index 95a0c3d09..528d0338b 100644
--- a/apps/daemon/internal/agent/mcode/session.go
+++ b/apps/daemon/internal/agent/mcode/session.go
@@ -3,7 +3,6 @@ package mcode
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/url"
 	"slices"
@@ -39,8 +38,6 @@ type Session struct {
 	nativeModel          string
 	outputContext        context.Context
 	outcome              proto.DonePayload
-	permissions          map[string]pendingPermission
-	questions            map[string]pendingQuestion
 	steeringReady        bool
 	steeringTurn         string
 	sequence             uint64
@@ -68,7 +65,7 @@ func launch(ctx context.Context, req proto.PromptRequestPayload, opts launchOpti
 }
 
 func newTurnSession(ctx context.Context, req proto.PromptRequestPayload, opts launchOptions, c *connection, out chan<- proto.Envelope) *Session {
-	return &Session{ctx: ctx, req: req, opts: opts, connection: c, out: out, frames: make(chan rpcFrame, 32), finished: make(chan struct{}), permissions: map[string]pendingPermission{}, questions: map[string]pendingQuestion{}, tools: map[string]toolUpdate{}, completedTools: map[string]bool{}}
+	return &Session{ctx: ctx, req: req, opts: opts, connection: c, out: out, frames: make(chan rpcFrame, 32), finished: make(chan struct{}), tools: map[string]toolUpdate{}, completedTools: map[string]bool{}}
 }
 
 func (s *Session) prepareNative() error {
@@ -81,7 +78,7 @@ func (s *Session) prepareNative() error {
 			} `json:"oac/subagents"`
 		} `json:"_meta"`
 	}
-	if err := s.call("initialize", map[string]any{"protocolVersion": 1, "clientInfo": map[string]string{"name": "oac", "version": "1"}, "clientCapabilities": map[string]any{"elicitation": map[string]any{"form": map[string]any{}}}}, &initialized, false); err != nil {
+	if err := s.call("initialize", map[string]any{"protocolVersion": 1, "clientInfo": map[string]string{"name": "oac", "version": "1"}}, &initialized, false); err != nil {
 		return err
 	}
 	if initialized.ProtocolVersion != 1 {
@@ -260,28 +257,3 @@ func (s *Session) emit(kind string, payload any) {
 	case <-s.outputContext.Done():
 	}
 }
-
-func (s *Session) SubmitPermission(_ context.Context, id string, decision proto.PermissionDecisionPayload) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	pending, ok := s.permissions[id]
-	if !ok {
-		return agent.ErrUnknownPermission
-	}
-	choice := pending.Deny
-	if decision.Approved {
-		choice = pending.Allow
-	}
-	if choice == "" {
-		return errors.New("mcode: ACP permission option is unavailable")
-	}
-	if len(decision.UpdatedInput) > 0 {
-		return errors.New("mcode: edited permission input is not supported")
-	}
-	raw, _ := json.Marshal(map[string]any{"outcome": map[string]string{"outcome": "selected", "optionId": choice}})
-	if err := s.write(rpcFrame{JSONRPC: "2.0", ID: pending.RPCID, Result: raw}); err != nil {
-		return err
-	}
-	delete(s.permissions, id)
-	return nil
-}
diff --git a/apps/daemon/internal/agent/mcode/session_test.go b/apps/daemon/internal/agent/mcode/session_test.go
index ae435c344..0dfc9e070 100644
--- a/apps/daemon/internal/agent/mcode/session_test.go
+++ b/apps/daemon/internal/agent/mcode/session_test.go
@@ -4,14 +4,12 @@ import (
 	"bufio"
 	"context"
 	"encoding/json"
-	"errors"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
@@ -129,39 +127,20 @@ func TestSessionStreamsCurrentTurnAndResumes(t *testing.T) {
 	}
 }
 
-func TestSessionInteractionRoundTrip(t *testing.T) {
-	for _, approved := range []bool{true, false} {
-		t.Run(map[bool]string{true: "allow", false: "deny"}[approved], func(t *testing.T) {
-			session, out := helperSession(t, "interaction", false)
-			permissions, questions := 0, 0
-			for event := range out {
-				switch event.Type {
-				case proto.TypeError:
-					t.Fatalf("error: %s", event.Payload)
-				case proto.TypePermissionRequest:
-					permissions++
-					var p proto.PermissionRequestPayload
-					_ = json.Unmarshal(event.Payload, &p)
-					if err := session.SubmitPermission(context.Background(), p.RequestID, proto.PermissionDecisionPayload{Approved: approved}); err != nil {
-						t.Fatal(err)
-					}
-					if err := session.SubmitPermission(context.Background(), p.RequestID, proto.PermissionDecisionPayload{Approved: true}); !errors.Is(err, agent.ErrUnknownPermission) {
-						t.Fatalf("duplicate approval: %v", err)
-					}
-				case proto.TypePromptForUserChoice:
-					questions++
-					var p proto.PromptForUserChoicePayload
-					_ = json.Unmarshal(event.Payload, &p)
-					decision := proto.PromptForUserChoiceDecisionPayload{QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "region", Answers: []string{"Europe"}}}}
-					if err := session.SubmitPromptForUserChoice(context.Background(), p.AskID, decision); err != nil {
-						t.Fatal(err)
-					}
-				}
-			}
-			if permissions != 1 || questions != 1 {
-				t.Fatalf("permissions=%d questions=%d", permissions, questions)
-			}
-		})
+// Harnesses run unattended: native asks are declined in the adapter and the turn completes.
+func TestSessionDeclinesNativeAsks(t *testing.T) {
+	_, out := helperSession(t, "unattended", false)
+	done := 0
+	for event := range out {
+		switch event.Type {
+		case proto.TypeError:
+			t.Fatalf("error: %s", event.Payload)
+		case proto.TypeDone:
+			done++
+		}
+	}
+	if done != 1 {
+		t.Fatalf("done=%d", done)
 	}
 }
 
@@ -272,6 +251,9 @@ func TestMCodeProcess(t *testing.T) {
 		result := any(map[string]any{})
 		switch frame.Method {
 		case "initialize":
+			if scenario == "unattended" && strings.Contains(string(frame.Params), "elicitation") {
+				os.Exit(7)
+			}
 			result = map[string]int{"protocolVersion": 1}
 		case "session/new", "session/load":
 			if scenario == "prepared-mcp-cancel" {
@@ -356,9 +338,9 @@ func TestMCodeProcess(t *testing.T) {
 				send(rpcFrame{JSONRPC: "2.0", ID: frame.ID, Error: &rpcError{Code: -32603, Message: "Fixture provider unavailable"}})
 				continue
 			}
-			if scenario == "interaction" {
+			if scenario == "unattended" {
 				promptID = frame.ID
-				send(map[string]any{"jsonrpc": "2.0", "id": "permission-1", "method": "session/request_permission", "params": map[string]any{"sessionId": "native-1", "toolCall": map[string]any{"toolCallId": "tool-1", "name": "Bash", "title": "Run fixture", "rawInput": map[string]any{"command": "echo fixture"}}, "options": []map[string]string{{"optionId": "once", "kind": "allow_once"}, {"optionId": "always", "kind": "allow_always"}, {"optionId": "deny", "kind": "reject_once"}}}})
+				send(map[string]any{"jsonrpc": "2.0", "id": "permission-1", "method": "session/request_permission", "params": map[string]any{"sessionId": "native-1", "toolCall": map[string]any{"toolCallId": "tool-1", "name": "Bash", "title": "Run fixture", "rawInput": map[string]any{"command": "echo fixture"}}, "options": []map[string]string{{"optionId": "once", "kind": "allow_once"}, {"optionId": "deny", "kind": "reject_once"}}}})
 				continue
 			}
 			update("agent_message_chunk", map[string]any{"content": map[string]string{"type": "text", "text": "Hello "}})
@@ -397,21 +379,15 @@ func TestMCodeProcess(t *testing.T) {
 			if string(frame.ID) == `"permission-1"` {
 				var reply struct {
 					Outcome struct {
-						Option string `json:"optionId"`
+						Outcome string `json:"outcome"`
 					} `json:"outcome"`
 				}
-				_ = json.Unmarshal(frame.Result, &reply)
-				if reply.Outcome.Option != "once" && reply.Outcome.Option != "deny" {
+				if json.Unmarshal(frame.Result, &reply) != nil || reply.Outcome.Outcome != "cancelled" {
 					os.Exit(5)
 				}
-				send(map[string]any{"jsonrpc": "2.0", "id": "question-1", "method": "elicitation/create", "params": map[string]any{"sessionId": "native-1", "mode": "form", "requestedSchema": map[string]any{"type": "object", "required": []string{"region"}, "properties": map[string]any{"region": map[string]any{"type": "string", "title": "Region?", "oneOf": []map[string]string{{"const": "eu", "title": "Europe"}, {"const": "us", "title": "America"}}}}}}})
+				send(map[string]any{"jsonrpc": "2.0", "id": "question-1", "method": "elicitation/create", "params": map[string]any{"sessionId": "native-1", "mode": "form", "requestedSchema": map[string]any{"type": "object", "properties": map[string]any{"region": map[string]any{"type": "string"}}}}})
 			} else {
-				var reply struct {
-					Action  string            `json:"action"`
-					Content map[string]string `json:"content"`
-				}
-				_ = json.Unmarshal(frame.Result, &reply)
-				if reply.Action != "accept" || reply.Content["region"] != "eu" {
+				if frame.Error == nil || frame.Error.Code != -32601 {
 					os.Exit(6)
 				}
 				raw, _ := json.Marshal(map[string]string{"stopReason": "end_turn"})
diff --git a/apps/daemon/internal/agent/registry.go b/apps/daemon/internal/agent/registry.go
index 4a808b7ff..f6b02c0c9 100644
--- a/apps/daemon/internal/agent/registry.go
+++ b/apps/daemon/internal/agent/registry.go
@@ -1,7 +1,6 @@
 package agent
 
 import (
-	"errors"
 	"fmt"
 	"slices"
 	"sync"
@@ -10,16 +9,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
 )
 
-// ErrUnknownPermission is returned by PermissionResponder.SubmitPermission when
-// the permID doesn't match any outstanding request. The router uses
-// this to distinguish a benign race from a real forwarding failure.
-var ErrUnknownPermission = errors.New("agent: unknown permission id")
-
-// ErrUnknownAsk is returned by UserChoiceResponder.SubmitPromptForUserChoice when
-// the askID doesn't match any outstanding ask. Same race semantics as
-// ErrUnknownPermission.
-var ErrUnknownAsk = errors.New("agent: unknown ask id")
-
 // Registry keeps the daemon-advertised capability descriptor and execution
 // factories for each agent_kind. Safe for concurrent use.
 type Registry struct {
diff --git a/apps/daemon/internal/agent/registry_test.go b/apps/daemon/internal/agent/registry_test.go
index 657326a10..9720ab654 100644
--- a/apps/daemon/internal/agent/registry_test.go
+++ b/apps/daemon/internal/agent/registry_test.go
@@ -71,10 +71,9 @@ func TestRegistrySupportedAgentKindsReportsDescriptors(t *testing.T) {
 		Available: true,
 		Version:   "1.2.3",
 		Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{
-			Streaming:   proto.CapabilitySupported,
-			Permissions: proto.CapabilitySupported,
-			Usage:       proto.CapabilitySupported,
-			Resume:      proto.CapabilitySupported,
+			Streaming: proto.CapabilitySupported,
+			Usage:     proto.CapabilitySupported,
+			Resume:    proto.CapabilitySupported,
 		}),
 	}, harnessconfig.Configuration{})
 
@@ -85,7 +84,7 @@ func TestRegistrySupportedAgentKindsReportsDescriptors(t *testing.T) {
 	if got[0].Kind != "fake_alpha" || got[1].Kind != "fake_beta" {
 		t.Fatalf("SupportedAgentKinds sort = %#v, want fake_alpha then fake_beta", got)
 	}
-	if !got[0].Available || got[0].Version != "1.2.3" || !got[0].Capabilities.Permissions.IsSupported() || !got[0].Capabilities.Resume.IsSupported() {
+	if !got[0].Available || got[0].Version != "1.2.3" || !got[0].Capabilities.Usage.IsSupported() || !got[0].Capabilities.Resume.IsSupported() {
 		t.Fatalf("fake_alpha descriptor not preserved: %#v", got[0])
 	}
 	if got[1].Available || got[1].Version != "missing" || !got[1].Capabilities.Streaming.IsSupported() {
diff --git a/apps/daemon/internal/dispatch/capability_admission_test.go b/apps/daemon/internal/dispatch/capability_admission_test.go
index 744d60ff6..7aaf78466 100644
--- a/apps/daemon/internal/dispatch/capability_admission_test.go
+++ b/apps/daemon/internal/dispatch/capability_admission_test.go
@@ -52,50 +52,3 @@ func TestSteeringUsesAdmittedDeclarationAndDoesNotReplayUnsupportedImplementatio
 		})
 	}
 }
-
-func TestInteractionDeclarationPrecedesResponderMethods(t *testing.T) {
-	for _, supported := range []bool{false, true} {
-		for _, ask := range []bool{false, true} {
-			t.Run(fmt.Sprintf("supported=%v/ask=%v", supported, ask), func(t *testing.T) {
-				h := newHarness(t)
-				defer h.router.Shutdown(context.Background())
-				var session *fakeSession
-				info := proto.SupportedAgentKind{Kind: "fixture", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Permissions: proto.CapabilityFromBool(supported)})}
-				registerExecutorKind(h.reg, info, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
-					session = &fakeSession{out: out, closeOutOnCancel: true, submitErr: agent.ErrUnsupportedOperation, askErr: agent.ErrUnsupportedOperation}
-					return session, nil
-				}))
-				startRun(t, h.router, h.sender, "run", proto.PromptRequestPayload{AgentKind: "fixture"})
-				event := mustEnv(t, proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{RequestID: "interaction", Tool: "fixture"})
-				decision := mustEnv(t, proto.TypePermissionDecision, "interaction", proto.PermissionDecisionPayload{DeliveryID: "decision", Approved: true})
-				if ask {
-					event = mustEnv(t, proto.TypePromptForUserChoice, "run", proto.PromptForUserChoicePayload{AskID: "interaction"})
-					decision = mustEnv(t, proto.TypePromptForUserChoiceDecision, "interaction", proto.PromptForUserChoiceDecisionPayload{DeliveryID: "decision"})
-				}
-				session.out <- event
-				waitFor(t, func() bool { return hasFrame(h.sender, event.Type, "run") }, "interaction indexed")
-				if err := h.router.Handle(t.Context(), decision); err != nil {
-					t.Fatal(err)
-				}
-				code := "unsupported"
-				if supported {
-					code = "contract_violation"
-				}
-				assertDecisionAck(t, h.sender, "decision", false, code)
-				count := len(session.submissions())
-				if ask {
-					session.askMu.Lock()
-					count = len(session.askCalls)
-					session.askMu.Unlock()
-				}
-				want := 0
-				if supported {
-					want = 1
-				}
-				if count != want {
-					t.Fatalf("native calls %d, want %d", count, want)
-				}
-			})
-		}
-	}
-}
diff --git a/apps/daemon/internal/dispatch/export_test.go b/apps/daemon/internal/dispatch/export_test.go
index 05d7011d7..6ee90d36e 100644
--- a/apps/daemon/internal/dispatch/export_test.go
+++ b/apps/daemon/internal/dispatch/export_test.go
@@ -7,29 +7,6 @@ func (r *Router) PreparationOwnershipForTest(handle string) (bool, bool) {
 	return p != nil && p.owns, p != nil && p.busy
 }
 
-// Test-only re-exports so router_test.go (package dispatch_test) can
-// peek into internal state without widening the public surface.
-
-// AskIndexLenForTest returns the number of asks still indexed at the
-// router level. Used to assert cleanup paths.
-func (r *Router) AskIndexLenForTest() int {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	return len(r.askIndex)
-}
-
-// PendingAsksLenForTest reports how many asks the named run still has
-// outstanding. Returns -1 if the run is unknown.
-func (r *Router) PendingAsksLenForTest(runID string) int {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	s, ok := r.sessions[runID]
-	if !ok {
-		return -1
-	}
-	return len(s.pendingAsks)
-}
-
 func (r *Router) SteeringClosedForTest(runID string) bool {
 	r.mu.Lock()
 	defer r.mu.Unlock()
diff --git a/apps/daemon/internal/dispatch/functions.go b/apps/daemon/internal/dispatch/functions.go
index 89ee63a41..14252711b 100644
--- a/apps/daemon/internal/dispatch/functions.go
+++ b/apps/daemon/internal/dispatch/functions.go
@@ -5,6 +5,8 @@ import (
 	"crypto/sha256"
 	"encoding/json"
 	"errors"
+	"fmt"
+	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
@@ -29,9 +31,15 @@ func (r *Router) handleFunctionResult(ctx context.Context, env proto.Envelope) e
 	}
 	fingerprint := sha256.Sum256(encoded)
 	// Scope receipt replay to both identities, even when native call IDs repeat across Runs.
-	kind := proto.TypeFunctionResult + "\x00" + result.CallID
-	if handled, err := r.replayAppliedInteractionDecision(ctx, env.ID, result.DeliveryID, kind, fingerprint); handled {
-		return err
+	key := env.ID + "\x00" + result.CallID
+	r.mu.Lock()
+	applied, replay := r.applied[key]
+	r.mu.Unlock()
+	if replay {
+		if applied.fingerprint != fingerprint {
+			return r.sendInteractionDecisionAck(ctx, env.ID, result.DeliveryID, false, "decision_conflict", "request was already applied with a different decision")
+		}
+		return r.sendInteractionDecisionAck(ctx, env.ID, result.DeliveryID, true, "", "")
 	}
 	r.mu.Lock()
 	state := r.sessions[env.ID]
@@ -69,6 +77,43 @@ func (r *Router) handleFunctionResult(ctx context.Context, env proto.Envelope) e
 		}
 		return r.sendInteractionDecisionAck(ctx, env.ID, result.DeliveryID, false, code, "function result was not applied")
 	}
-	r.rememberAppliedInteractionDecision(env.ID, kind, fingerprint)
+	r.rememberAppliedFunctionResult(key, fingerprint)
 	return r.sendInteractionDecisionAck(ctx, env.ID, result.DeliveryID, true, "", "")
 }
+
+func (r *Router) rememberAppliedFunctionResult(key string, fingerprint [32]byte) {
+	now := time.Now().UTC()
+	r.mu.Lock()
+	if len(r.applied) >= 1024 {
+		cutoff := now.Add(-time.Hour)
+		for id, entry := range r.applied {
+			if entry.recordedAt.Before(cutoff) {
+				delete(r.applied, id)
+			}
+		}
+	}
+	if len(r.applied) >= 1024 {
+		for id := range r.applied {
+			delete(r.applied, id)
+			break
+		}
+	}
+	r.applied[key] = appliedFunctionResult{fingerprint: fingerprint, recordedAt: now}
+	r.mu.Unlock()
+}
+
+func (r *Router) sendInteractionDecisionAck(ctx context.Context, requestID, deliveryID string, applied bool, errorCode, message string) error {
+	env, err := proto.NewEnvelope(proto.TypeInteractionDecisionAck, requestID, proto.InteractionDecisionAckPayload{
+		DeliveryID: deliveryID,
+		Applied:    applied,
+		ErrorCode:  errorCode,
+		Error:      message,
+	})
+	if err != nil {
+		return fmt.Errorf("dispatch: build interaction decision ack: %w", err)
+	}
+	if err := r.sender.Send(ctx, env); err != nil {
+		return fmt.Errorf("dispatch: send interaction decision ack: %w", err)
+	}
+	return nil
+}
diff --git a/apps/daemon/internal/dispatch/interaction_decisions.go b/apps/daemon/internal/dispatch/interaction_decisions.go
deleted file mode 100644
index 1c4c4abb7..000000000
--- a/apps/daemon/internal/dispatch/interaction_decisions.go
+++ /dev/null
@@ -1,328 +0,0 @@
-package dispatch
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func (r *Router) handlePermissionDecision(ctx context.Context, env proto.Envelope) error {
-	if env.ID == "" {
-		return errors.New("dispatch: permission_decision missing perm id (Envelope.ID empty)")
-	}
-	var payload proto.PermissionDecisionPayload
-	if err := env.DecodePayload(&payload); err != nil {
-		return fmt.Errorf("dispatch: decode permission_decision: %w", err)
-	}
-	if payload.DeliveryID == "" {
-		return errors.New("dispatch: permission_decision missing delivery_id")
-	}
-	fingerprint, err := interactionDecisionFingerprint(payload)
-	if err != nil {
-		return fmt.Errorf("dispatch: fingerprint permission_decision: %w", err)
-	}
-	if handled, err := r.replayAppliedInteractionDecision(ctx, env.ID, payload.DeliveryID, proto.TypePermissionDecision, fingerprint); handled {
-		return err
-	}
-
-	r.mu.Lock()
-	runID, known := r.permIndex[env.ID]
-	var state *sessionState
-	var session agent.Session
-	var finishOperation func()
-	if known {
-		state = r.sessions[runID]
-		if state != nil {
-			session, finishOperation, _ = r.preparedOperationLocked(state)
-		}
-	}
-	r.mu.Unlock()
-
-	if !known || state == nil {
-		// Server's perm timeout / cancel race; common enough that info
-		// is right.
-		r.log.InfoContext(ctx, "permission_decision for unknown perm (run gone)", "perm_id", env.ID)
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "not_pending", "permission request is no longer pending")
-	}
-	if session == nil {
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "not_ready", "permission request is waiting for the native session")
-	}
-	defer finishOperation()
-	ctx, stop := r.shutdownContext(ctx)
-	defer stop()
-
-	if !state.capabilities.Permissions.IsSupported() {
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "unsupported", "The runtime declaration does not support interaction decisions.")
-	}
-	responder, supported := session.(agent.PermissionResponder)
-	if !supported {
-		r.dropPermission(state, env.ID)
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "contract_violation", "Declared runtime capability does not implement permission responses")
-	}
-	if err := responder.SubmitPermission(ctx, env.ID, payload); err != nil {
-		if errors.Is(err, agent.ErrUnsupportedOperation) {
-			return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "contract_violation", "Declared permission capability has no implementation.")
-		}
-		if errors.Is(err, agent.ErrUnknownPermission) {
-			r.log.InfoContext(ctx, "agent reports unknown perm (race with cancel)", "perm_id", env.ID, "run_id", runID)
-			r.dropPermission(state, env.ID)
-			return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "not_pending", err.Error())
-		}
-		r.log.WarnContext(ctx, "agent rejected permission decision", "perm_id", env.ID, "run_id", runID, "err", err)
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "runtime_error", err.Error())
-	}
-	r.dropPermission(state, env.ID)
-	r.rememberAppliedInteractionDecision(env.ID, proto.TypePermissionDecision, fingerprint)
-	return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, true, "", "")
-}
-
-func (r *Router) dropPermission(s *sessionState, permissionID string) {
-	r.mu.Lock()
-	delete(r.permIndex, permissionID)
-	delete(s.pendingIDs, permissionID)
-	r.mu.Unlock()
-}
-
-// handlePromptForUserChoiceDecision is the ask-side twin of
-// handlePermissionDecision. The server forwards the human's answer
-// here; we look up the owning session via askIndex and ask the agent
-// to write a matching tool_result back into its CLI.
-//
-// On both success and ErrUnknownAsk we drop the ask from askIndex /
-// pendingAsks so a stale retry can't waste cycles. Timer-fired cancels
-// inside the session don't currently call back into the router, so
-// those entries linger until cleanupSession — acceptable because they
-// can't double-fire (the session's own pendingAskTable.Take already
-// guards that); cleanupSession removes the routing entry when the run
-// stream closes.
-func (r *Router) handlePromptForUserChoiceDecision(ctx context.Context, env proto.Envelope) error {
-	if env.ID == "" {
-		return errors.New("dispatch: prompt_for_user_choice_decision missing ask id (Envelope.ID empty)")
-	}
-	var payload proto.PromptForUserChoiceDecisionPayload
-	if err := env.DecodePayload(&payload); err != nil {
-		return fmt.Errorf("dispatch: decode prompt_for_user_choice_decision: %w", err)
-	}
-	if payload.DeliveryID == "" {
-		return errors.New("dispatch: prompt_for_user_choice_decision missing delivery_id")
-	}
-	fingerprint, err := interactionDecisionFingerprint(payload)
-	if err != nil {
-		return fmt.Errorf("dispatch: fingerprint prompt_for_user_choice_decision: %w", err)
-	}
-	if handled, err := r.replayAppliedInteractionDecision(ctx, env.ID, payload.DeliveryID, proto.TypePromptForUserChoiceDecision, fingerprint); handled {
-		return err
-	}
-
-	r.mu.Lock()
-	runID, known := r.askIndex[env.ID]
-	var state *sessionState
-	var session agent.Session
-	var finishOperation func()
-	if known {
-		state = r.sessions[runID]
-		if state != nil {
-			session, finishOperation, _ = r.preparedOperationLocked(state)
-		}
-	}
-	r.mu.Unlock()
-
-	if !known || state == nil {
-		r.log.InfoContext(ctx, "prompt_for_user_choice_decision for unknown ask (run gone)", "ask_id", env.ID)
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "not_pending", "user-input request is no longer pending")
-	}
-	if session == nil {
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "not_ready", "user-input request is waiting for the native session")
-	}
-	defer finishOperation()
-	ctx, stop := r.shutdownContext(ctx)
-	defer stop()
-
-	if !state.capabilities.Permissions.IsSupported() {
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "unsupported", "The runtime declaration does not support interaction decisions.")
-	}
-	responder, supported := session.(agent.UserChoiceResponder)
-	if !supported {
-		r.dropAsk(state, env.ID)
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "contract_violation", "Declared runtime capability does not implement user-choice responses")
-	}
-	err = responder.SubmitPromptForUserChoice(ctx, env.ID, payload)
-	if err != nil {
-		if errors.Is(err, agent.ErrUnsupportedOperation) {
-			return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "contract_violation", "Declared user-choice capability has no implementation.")
-		}
-		if errors.Is(err, agent.ErrUnknownAsk) {
-			r.log.InfoContext(ctx, "agent reports unknown ask (race with cancel)", "ask_id", env.ID, "run_id", runID)
-			r.dropAsk(state, env.ID)
-			return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "not_pending", err.Error())
-		}
-		// Keep the routing entry for transient runtime failures. Codex, for
-		// example, restores its pending request when a JSON-RPC reply write
-		// fails, so dropping the ask here would turn a retryable error into a
-		// permanent not_pending response on the next attempt.
-		r.log.WarnContext(ctx, "agent rejected user-input decision", "ask_id", env.ID, "run_id", runID, "err", err)
-		return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, false, "runtime_error", err.Error())
-	}
-	r.dropAsk(state, env.ID)
-	r.rememberAppliedInteractionDecision(env.ID, proto.TypePromptForUserChoiceDecision, fingerprint)
-	return r.sendInteractionDecisionAck(ctx, env.ID, payload.DeliveryID, true, "", "")
-}
-
-func (r *Router) replayAppliedInteractionDecision(ctx context.Context, requestID, deliveryID, kind string, fingerprint [32]byte) (bool, error) {
-	key := appliedInteractionDecisionKey(requestID, kind)
-	r.mu.Lock()
-	applied, ok := r.applied[key]
-	r.mu.Unlock()
-	if !ok {
-		return false, nil
-	}
-	if applied.requestID != requestID || applied.kind != kind || applied.fingerprint != fingerprint {
-		return true, r.sendInteractionDecisionAck(ctx, requestID, deliveryID, false, "decision_conflict", "request was already applied with a different decision")
-	}
-	return true, r.sendInteractionDecisionAck(ctx, requestID, deliveryID, true, "", "")
-}
-
-func (r *Router) rememberAppliedInteractionDecision(requestID, kind string, fingerprint [32]byte) {
-	now := time.Now().UTC()
-	key := appliedInteractionDecisionKey(requestID, kind)
-	r.mu.Lock()
-	if len(r.applied) >= 1024 {
-		cutoff := now.Add(-time.Hour)
-		for id, entry := range r.applied {
-			if entry.recordedAt.Before(cutoff) {
-				delete(r.applied, id)
-			}
-		}
-	}
-	if len(r.applied) >= 1024 {
-		for id := range r.applied {
-			delete(r.applied, id)
-			break
-		}
-	}
-	r.applied[key] = appliedInteractionDecision{
-		requestID: requestID, kind: kind, fingerprint: fingerprint, recordedAt: now,
-	}
-	r.mu.Unlock()
-}
-
-func appliedInteractionDecisionKey(requestID, kind string) string {
-	return kind + "\x00" + requestID
-}
-
-// interactionDecisionFingerprint excludes the transport delivery id. Each
-// retry gets a fresh delivery id so a late ack cannot satisfy a newer waiter,
-// while the request plus decision content remains stable for daemon replay.
-func interactionDecisionFingerprint(payload any) ([32]byte, error) {
-	switch decision := payload.(type) {
-	case proto.PermissionDecisionPayload:
-		decision.DeliveryID = ""
-		encoded, err := json.Marshal(decision)
-		if err != nil {
-			return [32]byte{}, err
-		}
-		return sha256.Sum256(encoded), nil
-	case proto.PromptForUserChoiceDecisionPayload:
-		decision.DeliveryID = ""
-		encoded, err := json.Marshal(decision)
-		if err != nil {
-			return [32]byte{}, err
-		}
-		return sha256.Sum256(encoded), nil
-	default:
-		return [32]byte{}, fmt.Errorf("unsupported interaction decision %T", payload)
-	}
-}
-
-func (r *Router) sendInteractionDecisionAck(ctx context.Context, requestID, deliveryID string, applied bool, errorCode, message string) error {
-	env, err := proto.NewEnvelope(proto.TypeInteractionDecisionAck, requestID, proto.InteractionDecisionAckPayload{
-		DeliveryID: deliveryID,
-		Applied:    applied,
-		ErrorCode:  errorCode,
-		Error:      message,
-	})
-	if err != nil {
-		return fmt.Errorf("dispatch: build interaction decision ack: %w", err)
-	}
-	if err := r.sender.Send(ctx, env); err != nil {
-		return fmt.Errorf("dispatch: send interaction decision ack: %w", err)
-	}
-	return nil
-}
-
-// dropAsk clears askID from both the router-level askIndex and the
-// session's pendingAsks set. Safe to call with an askID that's already
-// gone — both deletes are no-ops then.
-func (r *Router) dropAsk(s *sessionState, askID string) {
-	r.mu.Lock()
-	delete(r.askIndex, askID)
-	delete(s.pendingAsks, askID)
-	r.mu.Unlock()
-}
-
-// indexPermissionFrame records interaction identities before forwarding them.
-// Prepared output may arrive before successful Session publication; decisions
-// remain retryable until state.session becomes available.
-func (r *Router) indexPermissionFrame(s *sessionState, env proto.Envelope) {
-	switch env.Type {
-	case proto.TypePermissionRequest:
-		var p proto.PermissionRequestPayload
-		if err := env.DecodePayload(&p); err != nil {
-			return
-		}
-		requestID := strings.TrimSpace(p.RequestID)
-		if requestID == "" {
-			return
-		}
-		r.mu.Lock()
-		if r.interactionRouteOpenLocked(s) {
-			r.permIndex[requestID] = s.runID
-			s.pendingIDs[requestID] = struct{}{}
-		}
-		r.mu.Unlock()
-	case proto.TypePermissionCancel:
-		if env.ID == "" {
-			return
-		}
-		r.mu.Lock()
-		delete(r.permIndex, env.ID)
-		delete(s.pendingIDs, env.ID)
-		r.mu.Unlock()
-	case proto.TypePromptForUserChoice:
-		// env.ID is the run id (so the server-side dispatch can fan
-		// this frame to the run's subscriber); the ask id rides on
-		// the payload. Decode just enough to seed the index.
-		var p proto.PromptForUserChoicePayload
-		if err := env.DecodePayload(&p); err != nil || p.AskID == "" {
-			return
-		}
-		r.mu.Lock()
-		if r.interactionRouteOpenLocked(s) {
-			r.askIndex[p.AskID] = s.runID
-			s.pendingAsks[p.AskID] = struct{}{}
-		}
-		r.mu.Unlock()
-	}
-}
-
-func (r *Router) clearInteractionRoutesLocked(s *sessionState) {
-	for permissionID := range s.pendingIDs {
-		delete(r.permIndex, permissionID)
-		delete(s.pendingIDs, permissionID)
-	}
-	for askID := range s.pendingAsks {
-		delete(r.askIndex, askID)
-		delete(s.pendingAsks, askID)
-	}
-}
-
-// drain consumes everything left on ch until the agent closes it.
-// Events are dropped — by the time we're draining, either transport
-// is dead or the router is shutting down.
diff --git a/apps/daemon/internal/dispatch/optional_interactions_test.go b/apps/daemon/internal/dispatch/optional_interactions_test.go
deleted file mode 100644
index 37d22eaae..000000000
--- a/apps/daemon/internal/dispatch/optional_interactions_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package dispatch_test
-
-import (
-	"context"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
-)
-
-// Wrapping Session proves that no responder stubs are required for a Session.
-type lifecycleOnly struct{ agent.Session }
-
-func TestOptionalInteractionResponders(t *testing.T) {
-	for _, ask := range []bool{false, true} {
-		t.Run(map[bool]string{false: "permission", true: "user choice"}[ask], func(t *testing.T) {
-			h := newHarness(t)
-			defer h.router.Shutdown(context.Background())
-			var output chan<- proto.Envelope
-			registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "minimal", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
-				output = out
-				s := &fakeSession{out: out, closeOutOnCancel: true}
-				return lifecycleOnly{Session: s}, nil
-			}))
-			startRun(t, h.router, h.sender, "run", proto.PromptRequestPayload{AgentKind: "minimal"})
-			event := mustEnv(t, proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{RequestID: "interaction", Tool: "fixture"})
-			decision := mustEnv(t, proto.TypePermissionDecision, "interaction", proto.PermissionDecisionPayload{DeliveryID: "decision", Approved: true})
-			if ask {
-				event = mustEnv(t, proto.TypePromptForUserChoice, "run", proto.PromptForUserChoicePayload{AskID: "interaction"})
-				decision = mustEnv(t, proto.TypePromptForUserChoiceDecision, "interaction", proto.PromptForUserChoiceDecisionPayload{DeliveryID: "decision"})
-			}
-			// An inconsistent adapter emitted an interaction it cannot answer: reject it,
-			// never acknowledge application or call a fabricated responder.
-			output <- event
-			waitFor(t, func() bool { return hasFrame(h.sender, event.Type, "run") }, "interaction indexed")
-			if err := h.router.Handle(t.Context(), decision); err != nil {
-				t.Fatal(err)
-			}
-			assertDecisionAck(t, h.sender, "decision", false, "unsupported")
-		})
-	}
-}
diff --git a/apps/daemon/internal/dispatch/preparation_cancel_test.go b/apps/daemon/internal/dispatch/preparation_cancel_test.go
index b21a5c21c..0a5f96c96 100644
--- a/apps/daemon/internal/dispatch/preparation_cancel_test.go
+++ b/apps/daemon/internal/dispatch/preparation_cancel_test.go
@@ -100,8 +100,6 @@ func TestPreparedCancellationWaitsForOutputAndCleanup(t *testing.T) {
 		session = &fakeSession{out: out, closeOutOnCancel: true,
 			postCancelEnvelopes: []proto.Envelope{mustEnv(t, proto.TypeDone, id, p.outcome)}}
 		out <- mustEnv(t, proto.TypeDelta, id, proto.DeltaPayload{Delta: "observed"})
-		out <- mustEnv(t, proto.TypePermissionRequest, id, proto.PermissionRequestPayload{RequestID: "permission"})
-		out <- mustEnv(t, proto.TypePromptForUserChoice, id, proto.PromptForUserChoicePayload{AskID: "ask"})
 		out <- mustEnv(t, proto.TypeUsage, id, proto.UsagePayload{Usage: p.outcome.Usage})
 		close(startEntered)
 		<-startReturn
@@ -138,16 +136,6 @@ func TestPreparedCancellationWaitsForOutputAndCleanup(t *testing.T) {
 	if len(cancellationAcks(sender.recSender)) != 0 || r.ActiveRuns() != 1 {
 		t.Fatal("cleanup released ownership early")
 	}
-	for _, decision := range []proto.Envelope{
-		mustEnv(t, proto.TypePermissionDecision, "permission", proto.PermissionDecisionPayload{DeliveryID: "permission-reply", Approved: true}),
-		mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask", proto.PromptForUserChoiceDecisionPayload{DeliveryID: "ask-reply", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}}}),
-	} {
-		if err := r.Handle(t.Context(), decision); err != nil {
-			t.Fatal(err)
-		}
-	}
-	assertDecisionAck(t, sender.recSender, "permission-reply", false, "not_pending")
-	assertDecisionAck(t, sender.recSender, "ask-reply", false, "not_pending")
 	close(cleanupReturn)
 	waitFor(t, func() bool { return len(cancellationAcks(sender.recSender)) == 2 && r.ActiveRuns() == 0 }, "prepared cancellation receipts")
 	if p.calls.Load() != 1 || session.cancels() != 1 {
@@ -159,7 +147,7 @@ func TestPreparedCancellationWaitsForOutputAndCleanup(t *testing.T) {
 		}
 	}
 	got := sender.typesFor("run")
-	want := []string{proto.TypeDelta, proto.TypePermissionRequest, proto.TypePromptForUserChoice, proto.TypeUsage, proto.TypeDone, proto.TypeInteractionDecisionAck, proto.TypeInteractionDecisionAck}
+	want := []string{proto.TypeDelta, proto.TypeUsage, proto.TypeDone, proto.TypeInteractionDecisionAck, proto.TypeInteractionDecisionAck}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("output/receipt order = %v", got)
 	}
diff --git a/apps/daemon/internal/dispatch/preparation_executor_fixture_test.go b/apps/daemon/internal/dispatch/preparation_executor_fixture_test.go
index a21823c6a..9da6a2d2e 100644
--- a/apps/daemon/internal/dispatch/preparation_executor_fixture_test.go
+++ b/apps/daemon/internal/dispatch/preparation_executor_fixture_test.go
@@ -113,18 +113,6 @@ func (t *preparationTurn) SteerWithReceipt(ctx context.Context, p proto.PromptSt
 	}
 	return agent.ErrSteeringInactive
 }
-func (t *preparationTurn) SubmitPermission(ctx context.Context, id string, p proto.PermissionDecisionPayload) error {
-	if target, ok := t.Session.(agent.PermissionResponder); ok {
-		return target.SubmitPermission(ctx, id, p)
-	}
-	return agent.ErrUnknownPermission
-}
-func (t *preparationTurn) SubmitPromptForUserChoice(ctx context.Context, id string, p proto.PromptForUserChoiceDecisionPayload) error {
-	if target, ok := t.Session.(agent.UserChoiceResponder); ok {
-		return target.SubmitPromptForUserChoice(ctx, id, p)
-	}
-	return agent.ErrUnknownAsk
-}
 func (t *preparationTurn) ReadWorkspaceFile(ctx context.Context, path string, limit int) (agent.WorkspaceReadResult, error) {
 	if target, ok := t.Session.(agent.WorkspaceReader); ok {
 		return target.ReadWorkspaceFile(ctx, path, limit)
diff --git a/apps/daemon/internal/dispatch/preparation_start.go b/apps/daemon/internal/dispatch/preparation_start.go
index af330553a..5b96f6369 100644
--- a/apps/daemon/internal/dispatch/preparation_start.go
+++ b/apps/daemon/internal/dispatch/preparation_start.go
@@ -70,7 +70,7 @@ func (r *Router) handleExecutionStart(_ context.Context, env proto.Envelope) err
 	}
 	p.status.State, p.status.RunID, p.status.Revision = "starting", input.RunID, p.status.Revision+1
 	p.startFingerprint, p.busy = fingerprint, true
-	state := &sessionState{capabilities: p.capabilities, runID: input.RunID, environmentID: p.environmentID, out: make(chan proto.Envelope, 64), ctx: p.ctx, pendingIDs: make(map[string]struct{}), pendingAsks: make(map[string]struct{}), traceparent: env.Trace}
+	state := &sessionState{capabilities: p.capabilities, runID: input.RunID, environmentID: p.environmentID, out: make(chan proto.Envelope, 64), ctx: p.ctx, traceparent: env.Trace}
 	state.preparedHandoff = newPreparedHandoff(p, owner.native)
 	p.handoff, owner.run = state.preparedHandoff, state
 	r.sessions[input.RunID] = state
diff --git a/apps/daemon/internal/dispatch/preparation_test.go b/apps/daemon/internal/dispatch/preparation_test.go
index b01dbcca6..427470709 100644
--- a/apps/daemon/internal/dispatch/preparation_test.go
+++ b/apps/daemon/internal/dispatch/preparation_test.go
@@ -119,7 +119,7 @@ func preparationRequest() proto.ExecutionPreparePayload {
 func preparationRouter(t *testing.T, sender dispatch.Sender, timeout time.Duration, factory agent.PreparationFactory) *dispatch.Router {
 	t.Helper()
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "prepared", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, Permissions: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{})
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "prepared", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 	reg.RegisterPreparation("prepared", true, factory)
 	reg.RegisterExecutor("prepared", preparationExecutorFixture(factory))
 	r, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender, PreparationTimeout: timeout, LocalWorkspace: preparationWorkspace(t)})
diff --git a/apps/daemon/internal/dispatch/prepared_handoff.go b/apps/daemon/internal/dispatch/prepared_handoff.go
index 31e55a248..382db5ab5 100644
--- a/apps/daemon/internal/dispatch/prepared_handoff.go
+++ b/apps/daemon/internal/dispatch/prepared_handoff.go
@@ -104,7 +104,6 @@ func (r *Router) claimPreparedReleaseLocked(state *sessionState, abort bool, fai
 		handoff.release = release
 		state.steeringClosed = true
 		state.session = nil
-		r.clearInteractionRoutesLocked(state)
 	}
 	if abort && !release.aborted() {
 		close(release.abort)
@@ -328,10 +327,6 @@ func (r *Router) forwardPreparedOutput(state *sessionState) {
 			if drainOnly {
 				continue
 			}
-			switch env.Type {
-			case proto.TypePermissionRequest, proto.TypePermissionCancel, proto.TypePromptForUserChoice:
-				r.indexPermissionFrame(state, env)
-			}
 			if err := r.sendSessionOutput(pumpCtx, state, env); err != nil {
 				r.mu.Lock()
 				if r.closed {
@@ -407,16 +402,6 @@ func (r *Router) forwardPreparedTerminal(state *sessionState, failure string, te
 	return r.sendSessionOutput(pumpCtx, state, done)
 }
 
-func (r *Router) awaitPreparedRelease(ctx context.Context, handoff *preparedHandoff, release *preparedRelease, attempt *preparedReleaseAttempt) error {
-	if err := r.awaitPreparedNativeRelease(ctx, release, attempt); err != nil {
-		return err
-	}
-	r.mu.Lock()
-	err := handoff.outputErr
-	r.mu.Unlock()
-	return err
-}
-
 func (r *Router) awaitPreparedNativeRelease(ctx context.Context, release *preparedRelease, attempt *preparedReleaseAttempt) error {
 	select {
 	case <-attempt.done:
diff --git a/apps/daemon/internal/dispatch/prepared_handoff_mutation_test.go b/apps/daemon/internal/dispatch/prepared_handoff_mutation_test.go
index 095ec5642..b00b647e9 100644
--- a/apps/daemon/internal/dispatch/prepared_handoff_mutation_test.go
+++ b/apps/daemon/internal/dispatch/prepared_handoff_mutation_test.go
@@ -77,7 +77,7 @@ func (s *blockingPreparedReceiptSender) matches(env proto.Envelope) bool {
 }
 
 func TestPreparedHandoffReleaseWaitsForMutationReceipt(t *testing.T) {
-	for _, operation := range []string{"function", "permission", "choice", "steering"} {
+	for _, operation := range []string{"function", "steering"} {
 		t.Run(operation, func(t *testing.T) {
 			sender := &blockingPreparedReceiptSender{
 				recSender: &recSender{}, deliveryID: operation + "-delivery", inputID: operation + "-input",
@@ -97,14 +97,6 @@ func TestPreparedHandoffReleaseWaitsForMutationReceipt(t *testing.T) {
 			switch operation {
 			case "function":
 				mutation = mustEnv(t, proto.TypeFunctionResult, "run", proto.FunctionResultPayload{CallID: "call", Success: true, Content: functionResultContent("answer"), DeliveryID: sender.deliveryID})
-			case "permission":
-				session.out <- mustEnv(t, proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{RequestID: "permission"})
-				waitFor(t, func() bool { return hasFrame(sender.recSender, proto.TypePermissionRequest, "run") }, "permission request")
-				mutation = mustEnv(t, proto.TypePermissionDecision, "permission", proto.PermissionDecisionPayload{DeliveryID: sender.deliveryID, Approved: true})
-			case "choice":
-				session.out <- mustEnv(t, proto.TypePromptForUserChoice, "run", proto.PromptForUserChoicePayload{AskID: "ask"})
-				waitFor(t, func() bool { return hasFrame(sender.recSender, proto.TypePromptForUserChoice, "run") }, "choice request")
-				mutation = mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask", proto.PromptForUserChoiceDecisionPayload{DeliveryID: sender.deliveryID, QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}}})
 			case "steering":
 				mutation = mustEnv(t, proto.TypePromptSteer, "run", proto.PromptSteerPayload{InputID: sender.inputID, Input: proto.TextInput("continue")})
 			}
@@ -125,28 +117,6 @@ func TestPreparedHandoffReleaseWaitsForMutationReceipt(t *testing.T) {
 					t.Fatal(err)
 				}
 				assertDecisionAck(t, sender.recSender, "late-function", false, "not_ready")
-			case "permission":
-				late := mustEnv(t, proto.TypePermissionDecision, "permission", proto.PermissionDecisionPayload{DeliveryID: "late-permission", Approved: true})
-				if err := r.Handle(t.Context(), late); err != nil {
-					t.Fatal(err)
-				}
-				assertDecisionAck(t, sender.recSender, "late-permission", true, "")
-				newRequest := mustEnv(t, proto.TypePermissionDecision, "new-permission", proto.PermissionDecisionPayload{DeliveryID: "new-permission", Approved: true})
-				if err := r.Handle(t.Context(), newRequest); err != nil {
-					t.Fatal(err)
-				}
-				assertDecisionAck(t, sender.recSender, "new-permission", false, "not_pending")
-			case "choice":
-				late := mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask", proto.PromptForUserChoiceDecisionPayload{DeliveryID: "late-choice", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}}})
-				if err := r.Handle(t.Context(), late); err != nil {
-					t.Fatal(err)
-				}
-				assertDecisionAck(t, sender.recSender, "late-choice", true, "")
-				newRequest := mustEnv(t, proto.TypePromptForUserChoiceDecision, "new-choice", proto.PromptForUserChoiceDecisionPayload{DeliveryID: "new-choice", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}}})
-				if err := r.Handle(t.Context(), newRequest); err != nil {
-					t.Fatal(err)
-				}
-				assertDecisionAck(t, sender.recSender, "new-choice", false, "not_pending")
 			case "steering":
 				late := mustEnv(t, proto.TypePromptSteer, "run", proto.PromptSteerPayload{InputID: "late-steering", Input: proto.TextInput("late")})
 				if err := r.Handle(t.Context(), late); err != nil {
@@ -187,17 +157,6 @@ func TestPreparedHandoffReleaseWaitsForMutationReceipt(t *testing.T) {
 				if session.functions.Load() != 1 {
 					t.Fatalf("function native calls = %d, want 1", session.functions.Load())
 				}
-			case "permission":
-				if len(session.submissions()) != 1 {
-					t.Fatalf("permission native calls = %d, want 1", len(session.submissions()))
-				}
-			case "choice":
-				session.askMu.Lock()
-				calls := len(session.askCalls)
-				session.askMu.Unlock()
-				if calls != 1 {
-					t.Fatalf("choice native calls = %d, want 1", calls)
-				}
 			case "steering":
 				if session.steers.Load() != 1 {
 					t.Fatalf("steering native calls = %d, want 1", session.steers.Load())
@@ -234,7 +193,7 @@ func assertReceiptBeforeDone(t *testing.T, sender *recSender, operation string)
 }
 
 func TestPreparedHandoffRouterShutdownWaitsForReceiptAttempt(t *testing.T) {
-	for _, operation := range []string{"function", "permission", "choice", "steering"} {
+	for _, operation := range []string{"function", "steering"} {
 		t.Run(operation, func(t *testing.T) {
 			sender := &blockingPreparedReceiptSender{recSender: &recSender{}, deliveryID: operation + "-delivery", inputID: operation + "-input", entered: make(chan struct{}), release: make(chan struct{}), exited: make(chan struct{})}
 			defer close(sender.release)
@@ -252,14 +211,6 @@ func TestPreparedHandoffRouterShutdownWaitsForReceiptAttempt(t *testing.T) {
 			switch operation {
 			case "function":
 				mutation = mustEnv(t, proto.TypeFunctionResult, "run", proto.FunctionResultPayload{CallID: "call", Success: true, Content: functionResultContent("answer"), DeliveryID: sender.deliveryID})
-			case "permission":
-				session.out <- mustEnv(t, proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{RequestID: "permission"})
-				waitFor(t, func() bool { return hasFrame(sender.recSender, proto.TypePermissionRequest, "run") }, "permission request")
-				mutation = mustEnv(t, proto.TypePermissionDecision, "permission", proto.PermissionDecisionPayload{DeliveryID: sender.deliveryID, Approved: true})
-			case "choice":
-				session.out <- mustEnv(t, proto.TypePromptForUserChoice, "run", proto.PromptForUserChoicePayload{AskID: "ask"})
-				waitFor(t, func() bool { return hasFrame(sender.recSender, proto.TypePromptForUserChoice, "run") }, "choice request")
-				mutation = mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask", proto.PromptForUserChoiceDecisionPayload{DeliveryID: sender.deliveryID, QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}}})
 			case "steering":
 				mutation = mustEnv(t, proto.TypePromptSteer, "run", proto.PromptSteerPayload{InputID: sender.inputID, Input: proto.TextInput("continue")})
 			}
diff --git a/apps/daemon/internal/dispatch/prepared_handoff_test.go b/apps/daemon/internal/dispatch/prepared_handoff_test.go
index f70e4db7b..37c77c149 100644
--- a/apps/daemon/internal/dispatch/prepared_handoff_test.go
+++ b/apps/daemon/internal/dispatch/prepared_handoff_test.go
@@ -161,8 +161,6 @@ func TestPreparedHandoffDuplicateStartDoesNotReexecuteDuringPublication(t *testi
 	p := &controlledPreparation{closed: make(chan struct{})}
 	p.start = func(_ context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 		session.out = out
-		out <- mustEnv(t, proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{RequestID: "publication-permission"})
-		out <- mustEnv(t, proto.TypePromptForUserChoice, "run", proto.PromptForUserChoicePayload{AskID: "publication-choice"})
 		return session, nil
 	}
 	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
@@ -172,21 +170,11 @@ func TestPreparedHandoffDuplicateStartDoesNotReexecuteDuringPublication(t *testi
 	case <-time.After(2 * time.Second):
 		t.Fatal("started status did not reach publication boundary")
 	}
-	waitFor(t, func() bool {
-		return hasFrame(sender.recSender, proto.TypePermissionRequest, "run") && hasFrame(sender.recSender, proto.TypePromptForUserChoice, "run")
-	}, "pre-publication interaction routes")
-	for _, mutation := range []proto.Envelope{
-		mustEnv(t, proto.TypeFunctionResult, "run", proto.FunctionResultPayload{CallID: "call", Success: true, Content: functionResultContent("answer"), DeliveryID: "publication-function"}),
-		mustEnv(t, proto.TypePermissionDecision, "publication-permission", proto.PermissionDecisionPayload{DeliveryID: "publication-permission", Approved: true}),
-		mustEnv(t, proto.TypePromptForUserChoiceDecision, "publication-choice", proto.PromptForUserChoiceDecisionPayload{DeliveryID: "publication-choice", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}}}),
-	} {
-		if err := r.Handle(t.Context(), mutation); err != nil {
-			t.Fatal(err)
-		}
+	result := mustEnv(t, proto.TypeFunctionResult, "run", proto.FunctionResultPayload{CallID: "call", Success: true, Content: functionResultContent("answer"), DeliveryID: "publication-function"})
+	if err := r.Handle(t.Context(), result); err != nil {
+		t.Fatal(err)
 	}
 	assertDecisionAck(t, sender.recSender, "publication-function", false, "not_ready")
-	assertDecisionAck(t, sender.recSender, "publication-permission", false, "not_ready")
-	assertDecisionAck(t, sender.recSender, "publication-choice", false, "not_ready")
 	if err := r.Handle(t.Context(), mustEnv(t, proto.TypePromptSteer, "run", proto.PromptSteerPayload{InputID: "publication-steering", Input: proto.TextInput("continue")})); err != nil {
 		t.Fatal(err)
 	}
@@ -202,10 +190,7 @@ func TestPreparedHandoffDuplicateStartDoesNotReexecuteDuringPublication(t *testi
 	if len(frames) == 0 || frames[len(frames)-1].Type != proto.TypeWorkspaceReadResult || frames[len(frames)-1].DecodePayload(&readResult) != nil || readResult.ErrorCode != "resource_unavailable" {
 		t.Fatalf("pre-publication workspace read = %+v", frames)
 	}
-	session.askMu.Lock()
-	askCalls := len(session.askCalls)
-	session.askMu.Unlock()
-	if session.functions.Load() != 0 || session.steers.Load() != 0 || session.reads.Load() != 0 || len(session.submissions()) != 0 || askCalls != 0 {
+	if session.functions.Load() != 0 || session.steers.Load() != 0 || session.reads.Load() != 0 {
 		t.Fatal("private Session accepted work before started publication")
 	}
 	duplicate := mustEnv(t, proto.TypeExecutionStart, "request", proto.ExecutionStartPayload{Handle: ready.Handle, ExecutorID: ready.ExecutorID, RunID: "run", Input: proto.TextInput("input")})
diff --git a/apps/daemon/internal/dispatch/router.go b/apps/daemon/internal/dispatch/router.go
index ae283d321..5df1f4b32 100644
--- a/apps/daemon/internal/dispatch/router.go
+++ b/apps/daemon/internal/dispatch/router.go
@@ -1,8 +1,6 @@
 // Package dispatch wires inbound WebSocket frames to the agent layer.
-// It owns one Turn per active RunID, a per-Turn output goroutine that
-// forwards the agent's events to the transport, and a
-// permission_id → run_id index so permission_decision frames route
-// back to the right session.
+// It owns one Turn per active RunID and a per-Turn output goroutine that
+// forwards the agent's events to the transport.
 //
 // Concurrency: Handle is safe for one goroutine (typically the read
 // loop). Each session runs its own goroutine. Internal state is
@@ -37,10 +35,8 @@ type Router struct {
 	admission           sync.RWMutex
 	suspension          *proto.EnvironmentSuspendPayload
 	mu                  sync.Mutex
-	sessions            map[string]*sessionState // RunID → state
-	permIndex           map[string]string        // permID  → RunID
-	askIndex            map[string]string        // askID   → RunID
-	applied             map[string]appliedInteractionDecision
+	sessions            map[string]*sessionState         // RunID → state
+	applied             map[string]appliedFunctionResult // RunID and call ID → applied result
 	shutdownAttempt     *shutdownAttempt
 	shutdownCh          chan struct{} // closed by Shutdown
 	shutdownWG          dispatchWork  // waits for all pump goroutines
@@ -57,9 +53,7 @@ type Router struct {
 	localWorkspace      *localworkspace.Binding
 }
 
-type appliedInteractionDecision struct {
-	requestID   string
-	kind        string
+type appliedFunctionResult struct {
 	fingerprint [32]byte
 	recordedAt  time.Time
 }
@@ -76,8 +70,6 @@ type sessionState struct {
 	session         agent.Turn
 	out             chan proto.Envelope
 	ctx             context.Context
-	pendingIDs      map[string]struct{}
-	pendingAsks     map[string]struct{}
 	traceparent     string
 	steering        map[string]steeringReceipt
 	steerBusy       bool
@@ -124,9 +116,7 @@ func New(cfg Config) (*Router, error) {
 		sender:              cfg.Sender,
 		log:                 log,
 		sessions:            make(map[string]*sessionState),
-		permIndex:           make(map[string]string),
-		askIndex:            make(map[string]string),
-		applied:             make(map[string]appliedInteractionDecision),
+		applied:             make(map[string]appliedFunctionResult),
 		shutdownCh:          make(chan struct{}),
 		idleTimeout:         idleTimeout,
 		executors:           make(map[string]*executorState),
@@ -151,7 +141,7 @@ func (r *Router) Handle(ctx context.Context, env proto.Envelope) error {
 		r.mu.Unlock()
 		return ErrRouterClosed
 	}
-	if r.suspension != nil && env.Type != proto.TypeDeviceShutdown {
+	if r.suspension != nil {
 		r.mu.Unlock()
 		return ErrRouterQuiesced
 	}
@@ -180,12 +170,6 @@ func (r *Router) Handle(ctx context.Context, env proto.Envelope) error {
 		return r.handleFunctionResult(ctx, env)
 	case proto.TypePromptSteer:
 		return r.handlePromptSteer(ctx, env)
-	case proto.TypePermissionDecision:
-		return r.handlePermissionDecision(ctx, env)
-	case proto.TypePromptForUserChoiceDecision:
-		return r.handlePromptForUserChoiceDecision(ctx, env)
-	case proto.TypeDeviceShutdown:
-		return r.handleDeviceShutdown(ctx, env)
 	default:
 		// Unknown types are logged and dropped — keeps the daemon
 		// forward-compatible with server-side additions.
@@ -231,11 +215,5 @@ func (r *Router) drain(ch <-chan proto.Envelope) {
 func (r *Router) cleanupSession(s *sessionState) {
 	r.mu.Lock()
 	delete(r.sessions, s.runID)
-	for permID := range s.pendingIDs {
-		delete(r.permIndex, permID)
-	}
-	for askID := range s.pendingAsks {
-		delete(r.askIndex, askID)
-	}
 	r.mu.Unlock()
 }
diff --git a/apps/daemon/internal/dispatch/router_test.go b/apps/daemon/internal/dispatch/router_test.go
index 918f6a06c..ed2d90368 100644
--- a/apps/daemon/internal/dispatch/router_test.go
+++ b/apps/daemon/internal/dispatch/router_test.go
@@ -61,12 +61,7 @@ type fakeSession struct {
 	runID               string
 	input               proto.MessageInput
 	cancelCalls         int
-	submitCalls         []permCall
-	askCalls            []askCall
-	submitErr           error
-	askErr              error
-	cancelMu, submitMu  sync.Mutex
-	askMu               sync.Mutex
+	cancelMu            sync.Mutex
 	closeOutOnCancel    bool
 	out                 chan<- proto.Envelope
 	closeOutOnCancelMu  sync.Once
@@ -74,16 +69,6 @@ type fakeSession struct {
 	ctx                 context.Context
 }
 
-type permCall struct {
-	id       string
-	decision proto.PermissionDecisionPayload
-}
-
-type askCall struct {
-	id       string
-	decision proto.PromptForUserChoiceDecisionPayload
-}
-
 func (s *fakeSession) CancellationOutcome() proto.DonePayload { return proto.DonePayload{} }
 
 func (s *fakeSession) Cancel(context.Context) error {
@@ -101,34 +86,12 @@ func (s *fakeSession) Cancel(context.Context) error {
 	return nil
 }
 
-func (s *fakeSession) SubmitPermission(_ context.Context, permID string, dec proto.PermissionDecisionPayload) error {
-	s.submitMu.Lock()
-	s.submitCalls = append(s.submitCalls, permCall{id: permID, decision: dec})
-	s.submitMu.Unlock()
-	return s.submitErr
-}
-
-func (s *fakeSession) SubmitPromptForUserChoice(_ context.Context, askID string, dec proto.PromptForUserChoiceDecisionPayload) error {
-	s.askMu.Lock()
-	s.askCalls = append(s.askCalls, askCall{id: askID, decision: dec})
-	s.askMu.Unlock()
-	return s.askErr
-}
-
 func (s *fakeSession) cancels() int {
 	s.cancelMu.Lock()
 	defer s.cancelMu.Unlock()
 	return s.cancelCalls
 }
 
-func (s *fakeSession) submissions() []permCall {
-	s.submitMu.Lock()
-	defer s.submitMu.Unlock()
-	out := make([]permCall, len(s.submitCalls))
-	copy(out, s.submitCalls)
-	return out
-}
-
 // ---------------------------------------------------------------------
 // helpers
 // ---------------------------------------------------------------------
@@ -149,7 +112,7 @@ func newHarness(t *testing.T) *harness {
 		reg:     agent.NewRegistry(),
 		gotSess: make(chan *fakeSession, 16),
 	}
-	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported, Permissions: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, runID string, input proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
+	registerExecutorKind(h.reg, proto.SupportedAgentKind{Kind: "fake_alpha", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{EnvironmentNone: proto.CapabilitySupported})}, sessionExecutor(func(_ context.Context, runID string, input proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 		sess := &fakeSession{runID: runID, input: input, out: out}
 		h.gotSess <- sess
 		return sess, nil
@@ -292,192 +255,6 @@ func TestHandlePromptCancelUnknownRunIsNoop(t *testing.T) {
 	}
 }
 
-func TestPermissionRequestIsIndexedAndDecisionRoutes(t *testing.T) {
-	h := newHarness(t)
-	defer h.router.Shutdown(context.Background())
-
-	startRun(t, h.router, h.sender, "run_p", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	sess := <-h.gotSess
-
-	// Session emits a permission_request; pump should index it.
-	permEnv := mustEnv(t, proto.TypePermissionRequest, "run_p", proto.PermissionRequestPayload{
-		RequestID: "perm_abcd1234", Tool: "Bash", Title: "rm -rf /",
-	})
-	sess.out <- permEnv
-	// Wait until sender records — indexing happens before send.
-	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypePermissionRequest, "run_p") }, "permission_request to be forwarded")
-
-	dec := mustEnv(t, proto.TypePermissionDecision, "perm_abcd1234", proto.PermissionDecisionPayload{DeliveryID: "delivery-perm-1", Approved: true})
-	if err := h.router.Handle(context.Background(), dec); err != nil {
-		t.Fatalf("permission_decision: %v", err)
-	}
-	calls := sess.submissions()
-	if len(calls) != 1 || calls[0].id != "perm_abcd1234" || !calls[0].decision.Approved {
-		t.Errorf("submissions = %+v, want one approved perm_abcd1234", calls)
-	}
-	assertDecisionAck(t, h.sender, "delivery-perm-1", true, "")
-	retry := mustEnv(t, proto.TypePermissionDecision, "perm_abcd1234", proto.PermissionDecisionPayload{DeliveryID: "delivery-perm-2", Approved: true})
-	if err := h.router.Handle(context.Background(), retry); err != nil {
-		t.Fatalf("idempotent permission replay: %v", err)
-	}
-	if calls := sess.submissions(); len(calls) != 1 {
-		t.Fatalf("idempotent replay reached agent twice: %+v", calls)
-	}
-	assertDecisionAck(t, h.sender, "delivery-perm-2", true, "")
-	conflict := mustEnv(t, proto.TypePermissionDecision, "perm_abcd1234", proto.PermissionDecisionPayload{DeliveryID: "delivery-perm-3", Approved: false})
-	if err := h.router.Handle(context.Background(), conflict); err != nil {
-		t.Fatalf("conflicting permission replay: %v", err)
-	}
-	assertDecisionAck(t, h.sender, "delivery-perm-3", false, "decision_conflict")
-
-	close(sess.out)
-}
-
-func TestPermissionDecisionUnknownPermIsNoop(t *testing.T) {
-	h := newHarness(t)
-	defer h.router.Shutdown(context.Background())
-
-	if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePermissionDecision, "perm_unknown", proto.PermissionDecisionPayload{DeliveryID: "delivery-unknown-perm"})); err != nil {
-		t.Errorf("decision for unknown perm = %v, want nil", err)
-	}
-	assertDecisionAck(t, h.sender, "delivery-unknown-perm", false, "not_pending")
-}
-
-func TestPromptForUserChoiceDecisionRoutesToSession(t *testing.T) {
-	h := newHarness(t)
-	defer h.router.Shutdown(context.Background())
-
-	startRun(t, h.router, h.sender, "run_ask", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	sess := <-h.gotSess
-
-	// Envelope.ID is the run id (server-side dispatch fans on it); the
-	// ask id rides on the payload. Daemon's indexPermissionFrame reads
-	// payload.AskID to seed askIndex.
-	askEnv := mustEnv(t, proto.TypePromptForUserChoice, "run_ask", proto.PromptForUserChoicePayload{
-		AskID:     "ask_abcd1234",
-		Questions: []proto.PromptForUserChoiceQuestion{{Question: "?", Options: []proto.PromptForUserChoiceOption{{Label: "yes"}, {Label: "no"}}}},
-		ToolUseID: "toolu_42",
-	})
-	sess.out <- askEnv
-	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypePromptForUserChoice, "run_ask") }, "prompt_for_user_choice forwarded")
-
-	dec := mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask_abcd1234", proto.PromptForUserChoiceDecisionPayload{
-		DeliveryID: "delivery-ask-1", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}},
-	})
-	if err := h.router.Handle(context.Background(), dec); err != nil {
-		t.Fatalf("prompt_for_user_choice_decision: %v", err)
-	}
-
-	sess.askMu.Lock()
-	calls := append([]askCall(nil), sess.askCalls...)
-	sess.askMu.Unlock()
-	if len(calls) != 1 || calls[0].id != "ask_abcd1234" {
-		t.Fatalf("askCalls = %+v, want one ask_abcd1234", calls)
-	}
-	if len(calls[0].decision.QuestionAnswers[0].Answers) != 1 || calls[0].decision.QuestionAnswers[0].Answers[0] != "yes" {
-		t.Errorf("answer payload mismatch: %+v", calls[0].decision)
-	}
-	assertDecisionAck(t, h.sender, "delivery-ask-1", true, "")
-
-	// Cleanup contract: a successful decision drops the ask from both
-	// the router-level index and the session's pendingAsks set, so a
-	// stale retry short-circuits as "run gone".
-	if got := h.router.AskIndexLenForTest(); got != 0 {
-		t.Errorf("askIndex len = %d, want 0 after decision", got)
-	}
-	if got := h.router.PendingAsksLenForTest("run_ask"); got != 0 {
-		t.Errorf("pendingAsks len = %d, want 0 after decision", got)
-	}
-
-	close(sess.out)
-}
-
-// TestPromptForUserChoiceDecisionClearsIndexOnAgentUnknown locks in the
-// other cleanup branch: when the session returns ErrUnknownAsk (timer
-// already consumed the entry), the router still drops the index so a
-// retry doesn't loop into Submit again.
-func TestPromptForUserChoiceDecisionClearsIndexOnAgentUnknown(t *testing.T) {
-	h := newHarness(t)
-	defer h.router.Shutdown(context.Background())
-
-	startRun(t, h.router, h.sender, "run_ask_u", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	sess := <-h.gotSess
-	sess.askErr = agent.ErrUnknownAsk
-
-	askEnv := mustEnv(t, proto.TypePromptForUserChoice, "run_ask_u", proto.PromptForUserChoicePayload{
-		AskID:     "ask_xxxxxxxx",
-		Questions: []proto.PromptForUserChoiceQuestion{{Question: "?", Options: []proto.PromptForUserChoiceOption{{Label: "yes"}}}},
-		ToolUseID: "toolu_y",
-	})
-	sess.out <- askEnv
-	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypePromptForUserChoice, "run_ask_u") }, "prompt_for_user_choice forwarded")
-
-	dec := mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask_xxxxxxxx", proto.PromptForUserChoiceDecisionPayload{
-		DeliveryID: "delivery-ask-gone", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}},
-	})
-	if err := h.router.Handle(context.Background(), dec); err != nil {
-		t.Fatalf("prompt_for_user_choice_decision: %v", err)
-	}
-
-	if got := h.router.AskIndexLenForTest(); got != 0 {
-		t.Errorf("askIndex len = %d, want 0 after ErrUnknownAsk", got)
-	}
-	if got := h.router.PendingAsksLenForTest("run_ask_u"); got != 0 {
-		t.Errorf("pendingAsks len = %d, want 0 after ErrUnknownAsk", got)
-	}
-	assertDecisionAck(t, h.sender, "delivery-ask-gone", false, "not_pending")
-
-	close(sess.out)
-}
-
-func TestPromptForUserChoiceDecisionKeepsIndexOnTransientAgentError(t *testing.T) {
-	h := newHarness(t)
-	defer h.router.Shutdown(context.Background())
-
-	startRun(t, h.router, h.sender, "run_ask_retry", proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	sess := <-h.gotSess
-	sess.askErr = errors.New("temporary stdin failure")
-
-	sess.out <- mustEnv(t, proto.TypePromptForUserChoice, "run_ask_retry", proto.PromptForUserChoicePayload{
-		AskID: "ask_retry", Questions: []proto.PromptForUserChoiceQuestion{{ID: "q0", Question: "Retry?"}},
-	})
-	waitFor(t, func() bool { return hasFrame(h.sender, proto.TypePromptForUserChoice, "run_ask_retry") }, "prompt_for_user_choice forwarded")
-
-	decision := mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask_retry", proto.PromptForUserChoiceDecisionPayload{
-		DeliveryID: "delivery-ask-retry", QuestionAnswers: []proto.PromptForUserChoiceQuestionAnswer{{QuestionID: "q0", Answers: []string{"yes"}}},
-	})
-	if err := h.router.Handle(context.Background(), decision); err != nil {
-		t.Fatalf("first decision: %v", err)
-	}
-	assertDecisionAck(t, h.sender, "delivery-ask-retry", false, "runtime_error")
-	if got := h.router.AskIndexLenForTest(); got != 1 {
-		t.Fatalf("askIndex len = %d, want 1 after transient error", got)
-	}
-	if got := h.router.PendingAsksLenForTest("run_ask_retry"); got != 1 {
-		t.Fatalf("pendingAsks len = %d, want 1 after transient error", got)
-	}
-
-	sess.askErr = nil
-	if err := h.router.Handle(context.Background(), decision); err != nil {
-		t.Fatalf("retry decision: %v", err)
-	}
-	assertDecisionAck(t, h.sender, "delivery-ask-retry", true, "")
-	if got := h.router.AskIndexLenForTest(); got != 0 {
-		t.Fatalf("askIndex len = %d, want 0 after successful retry", got)
-	}
-	close(sess.out)
-}
-
-func TestPromptForUserChoiceDecisionUnknownAskIsNoop(t *testing.T) {
-	h := newHarness(t)
-	defer h.router.Shutdown(context.Background())
-
-	if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypePromptForUserChoiceDecision, "ask_unknown", proto.PromptForUserChoiceDecisionPayload{DeliveryID: "delivery-unknown-ask"})); err != nil {
-		t.Errorf("decision for unknown ask = %v, want nil", err)
-	}
-	assertDecisionAck(t, h.sender, "delivery-unknown-ask", false, "not_pending")
-}
-
 func assertDecisionAck(t *testing.T, sender *recSender, deliveryID string, applied bool, errorCode string) {
 	t.Helper()
 	frames := sender.snapshot()
@@ -499,27 +276,6 @@ func assertDecisionAck(t *testing.T, sender *recSender, deliveryID string, appli
 	t.Fatalf("no decision ack for delivery %q in %+v", deliveryID, frames)
 }
 
-func TestHandleDeviceShutdownCancelsAllSessions(t *testing.T) {
-	h := newHarness(t)
-	defer h.router.Shutdown(context.Background())
-
-	for _, rid := range []string{"r1", "r2", "r3"} {
-		startRun(t, h.router, h.sender, rid, proto.PromptRequestPayload{AgentKind: "fake_alpha"})
-	}
-	sessions := make([]*fakeSession, 3)
-	for i := range sessions {
-		sessions[i] = <-h.gotSess
-		sessions[i].closeOutOnCancel = true
-	}
-
-	if err := h.router.Handle(context.Background(), mustEnv(t, proto.TypeDeviceShutdown, "", proto.DeviceShutdownPayload{Reason: "reap"})); err != nil {
-		t.Fatalf("device_shutdown: %v", err)
-	}
-	for _, s := range sessions {
-		waitFor(t, func() bool { return s.cancels() == 1 }, "each session.Cancel to fire")
-	}
-}
-
 func TestHandleUnknownTypeIsNoop(t *testing.T) {
 	h := newHarness(t)
 	defer h.router.Shutdown(context.Background())
diff --git a/apps/daemon/internal/dispatch/shutdown.go b/apps/daemon/internal/dispatch/shutdown.go
index 5c350dccb..10ec3eb69 100644
--- a/apps/daemon/internal/dispatch/shutdown.go
+++ b/apps/daemon/internal/dispatch/shutdown.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
 type shutdownAttempt struct {
@@ -116,33 +114,8 @@ func waitShutdown(ctx context.Context, attempt *shutdownAttempt) error {
 	}
 }
 
-func (r *Router) handleDeviceShutdown(ctx context.Context, env proto.Envelope) error {
-	var payload proto.DeviceShutdownPayload
-	_ = env.DecodePayload(&payload) // body optional
-	r.log.InfoContext(ctx, "device_shutdown received, cancelling runs", "reason", payload.Reason, "active_runs", r.ActiveRuns())
-	r.mu.Lock()
-	if r.closed {
-		r.mu.Unlock()
-		return ErrRouterClosed
-	}
-	if r.runtimePreparation != nil {
-		r.runtimePreparation.cancel()
-	}
-	victims := r.sessionCancellationsLocked()
-	preparations := r.closePendingPreparationsLocked()
-	executors := r.closeIdleExecutorsLocked()
-	r.mu.Unlock()
-	r.closeIdleExecutors(executors)
-	for _, p := range preparations {
-		go func() { defer r.shutdownWG.Done(); r.closePreparationResource(p) }()
-	}
-	r.cancelSessions(ctx, victims)
-	return nil
-}
-
 type sessionCancellation struct {
 	runID   string
-	handoff *preparedHandoff
 	release *preparedRelease
 	attempt *preparedReleaseAttempt
 }
@@ -153,15 +126,7 @@ func (r *Router) sessionCancellationsLocked() []sessionCancellation {
 	victims := make([]sessionCancellation, 0, len(r.sessions))
 	for _, state := range r.sessions {
 		release, attempt := r.claimPreparedReleaseLocked(state, true, "", true)
-		victims = append(victims, sessionCancellation{runID: state.runID, handoff: state.preparedHandoff, release: release, attempt: attempt})
+		victims = append(victims, sessionCancellation{runID: state.runID, release: release, attempt: attempt})
 	}
 	return victims
 }
-
-func (r *Router) cancelSessions(ctx context.Context, sessions []sessionCancellation) {
-	for _, session := range sessions {
-		if err := r.awaitPreparedRelease(ctx, session.handoff, session.release, session.attempt); err != nil {
-			r.log.Warn("prepared session release failed", "run_id", session.runID, "err", err)
-		}
-	}
-}
diff --git a/apps/daemon/internal/dispatch/suspend.go b/apps/daemon/internal/dispatch/suspend.go
index a5e024746..97a8cc6fc 100644
--- a/apps/daemon/internal/dispatch/suspend.go
+++ b/apps/daemon/internal/dispatch/suspend.go
@@ -31,7 +31,7 @@ func (r *Router) Quiesce(ctx context.Context, request proto.EnvironmentSuspendPa
 		r.mu.Unlock()
 		return ErrRouterQuiesced
 	}
-	if r.runtimePreparation != nil || len(r.sessions) != 0 || len(r.workspaceReads) != 0 || r.workspaceWrite != nil || r.workspaceExport != nil || len(r.permIndex) != 0 || len(r.askIndex) != 0 {
+	if r.runtimePreparation != nil || len(r.sessions) != 0 || len(r.workspaceReads) != 0 || r.workspaceWrite != nil || r.workspaceExport != nil {
 		r.mu.Unlock()
 		return ErrRouterBusy
 	}
diff --git a/apps/daemon/internal/dispatch/suspend_test.go b/apps/daemon/internal/dispatch/suspend_test.go
index b713218ae..054a031ed 100644
--- a/apps/daemon/internal/dispatch/suspend_test.go
+++ b/apps/daemon/internal/dispatch/suspend_test.go
@@ -39,14 +39,12 @@ func suspensionRouter(t *testing.T, sender Sender) *Router {
 
 func TestQuiesceRejectsEveryUnsettledResource(t *testing.T) {
 	cases := map[string]func(*Router){
-		"active":     func(r *Router) { r.sessions["run"] = &sessionState{} },
-		"preparing":  func(r *Router) { r.preparations["p"] = &preparationState{owns: true} },
-		"receipt":    func(r *Router) { r.preparations["p"] = &preparationState{busy: true} },
-		"read":       func(r *Router) { r.workspaceReads = map[string]struct{}{"read": {}} },
-		"write":      func(r *Router) { r.workspaceWrite = &workspaceUpload{} },
-		"export":     func(r *Router) { r.workspaceExport = &workspaceExport{} },
-		"permission": func(r *Router) { r.permIndex["permission"] = "run" },
-		"choice":     func(r *Router) { r.askIndex["choice"] = "run" },
+		"active":    func(r *Router) { r.sessions["run"] = &sessionState{} },
+		"preparing": func(r *Router) { r.preparations["p"] = &preparationState{owns: true} },
+		"receipt":   func(r *Router) { r.preparations["p"] = &preparationState{busy: true} },
+		"read":      func(r *Router) { r.workspaceReads = map[string]struct{}{"read": {}} },
+		"write":     func(r *Router) { r.workspaceWrite = &workspaceUpload{} },
+		"export":    func(r *Router) { r.workspaceExport = &workspaceExport{} },
 	}
 	for name, setup := range cases {
 		t.Run(name, func(t *testing.T) {
diff --git a/contracts/agents-api/core-errors.md b/contracts/agents-api/core-errors.md
index b8eddd89d..00be4d1c5 100644
--- a/contracts/agents-api/core-errors.md
+++ b/contracts/agents-api/core-errors.md
@@ -96,7 +96,7 @@ The [Session and Turn diagnostics reads](./session-diagnostics.md) return these
 | `execution_interrupted` | Core execution interrupted |
 | `delivery_unconfirmed` | `delivery_unknown`, `input_outcome_unknown`, `cancel_unconfirmed`, `cancel_outcome_unavailable`, `function_result_unconfirmed` |
 | `input_rejected` | `invalid_input`, `input_not_applied`, `message_input_unsupported`, and the exact steering outcomes `input_invalid_input`, `input_run_inactive`, `input_input_conflict`, `input_input_limit`, `input_unsupported`, `input_rejected`, `input_not_ready`, `input_busy` |
-| `executor_protocol_error` | `invalid_executor_result`, `interaction_not_supported`, `execution_state_unavailable`, `execution_state_changed`, `function_call_invalid`, `function_result_invalid` |
+| `executor_protocol_error` | `invalid_executor_result`, `execution_state_unavailable`, `execution_state_changed`, `function_call_invalid`, `function_result_invalid` |
 | `core_storage_failed` | `event_persistence_failed`, `artifact_capture_failed` |
 | `internal_error` | Unknown or malformed outcome; no raw value is returned |
 | `environment_connection_timeout` | Initial input connection deadline expired |
diff --git a/contracts/agents-api/harness-onboarding.md b/contracts/agents-api/harness-onboarding.md
index 8ba69107e..52a68f354 100644
--- a/contracts/agents-api/harness-onboarding.md
+++ b/contracts/agents-api/harness-onboarding.md
@@ -69,7 +69,6 @@ For example, the Codex adapter keeps its app-server and thread, the Claude adapt
 | `DurableSteerer` | Real implementation on every Turn | Distinguish a complete write from the native application receipt; keep retry identity |
 | `Steerer` | Explicit implementation or Unsupported | Additional non-durable active-Turn input |
 | `FunctionResultSubmitter` | Explicit implementation or Unsupported | Match native call and result identity and acknowledge application |
-| `PermissionResponder`, `UserChoiceResponder` | Explicit implementation or Unsupported | Respond to exact emitted identities; unknown or expired interactions stay distinct from Unsupported |
 | `WorkspaceReader`, `WorkspaceDirectoryLister`, `WorkspaceWriter` | Explicit on Turn, Executor and Prepared owners | Use the authorized workspace, confirm access, commit or close, or return the operation's Unsupported error |
 | `Prepared`, `PreparedCancellation` | Real implementation for an executable preparation | Keep resource and output ownership across Start, cancellation and unused cleanup |
 | Neutral messages, images, MCP, structured output and Subagent observations | Explicit capability decisions | Keep each operation's protocol semantics; reject unsupported input before submission |
@@ -84,7 +83,7 @@ func (s *Session) SubmitFunctionResult(context.Context, proto.FunctionResultPayl
 }
 ```
 
-The reason is a fixed safe string, never submitted content, a credential or raw native diagnostics. Unsupported guarantees no native side effect and is not a successful empty operation. Installation unavailability, unknown interaction IDs, native failures and uncertain outcomes keep their own errors and ownership. A nil `Turn` still means that no input was submitted and the output stays with the caller; never use it as an Unsupported marker.
+The reason is a fixed safe string, never submitted content, a credential or raw native diagnostics. Unsupported guarantees no native side effect and is not a successful empty operation. Installation unavailability, unknown call IDs, native failures and uncertain outcomes keep their own errors and ownership. A nil `Turn` still means that no input was submitted and the output stays with the caller; never use it as an Unsupported marker.
 
 The wire request carries no working directory. The Runtime checks `local_environment.workspace_directory` against its binding and gives the Harness its bound workspace directory in `LocalEnvironment.WorkspaceRoot`; run the native Harness there.
 
@@ -106,11 +105,11 @@ A Session owns one reusable Executor in its connected Runtime; a Turn owns one i
 
 **Binding.** The Runtime binds its Executor record to the Session, Environment, connection and immutable execution configuration. Resume identity and prior-Turn recovery flags are continuity assertions, not configuration changes. A supplied native identity must match the retained owner, and when existing history is required, recovery never starts a new root. A configuration conflict is an error, not a hot switch. A lost connection retires its owners and handles; old timers, output and cancellation cannot affect their replacements.
 
-**Per-Turn state.** Each Turn gets a fresh wrapper, output channel and receipt state. Steering, function, permission and user-choice interfaces belong to that Turn. Native callbacks capture the originating Turn before asynchronous work, so a late event is never attributed to whichever Turn is active. Native processes, query or transport connections, fixed capability configuration and native session identity belong to the Executor. Do not reset completed `sync.Once` values or reuse an old Turn object.
+**Per-Turn state.** Each Turn gets a fresh wrapper, output channel and receipt state. Steering and function interfaces belong to that Turn. Native callbacks capture the originating Turn before asynchronous work, so a late event is never attributed to whichever Turn is active. Native processes, query or transport connections, fixed capability configuration and native session identity belong to the Executor. Do not reset completed `sync.Once` values or reuse an old Turn object.
 
 **Start.** A nil Turn from `StartTurn` guarantees that no native input was submitted and the output channel was not retained; the Runtime then closes the channel. Once input may have been submitted, return a non-nil Turn even with an error: that Turn owns exactly-once output closure and stays tracked until settlement. Unknown input is never replayed. A definite `executor_unavailable` Start rejection allows one common recovery attempt, only after the previous Executor has been closed and no input was submitted; the Runtime rechecks the same physical peer and the current authorization.
 
-**Cancellation and settlement.** `Turn.Cancel` targets only that Turn and does not close a healthy Executor. `AwaitSettlement` applies after both natural completion and cancellation. Success means output can no longer be written and the Turn's native events, input, functions, interactions and child work have settled. Native completion or cancellation confirmation is independent of resource retirement: closing a transport cannot supply a missing native terminal or operation receipt.
+**Cancellation and settlement.** `Turn.Cancel` targets only that Turn and does not close a healthy Executor. `AwaitSettlement` applies after both natural completion and cancellation. Success means output can no longer be written and the Turn's native events, input, functions and child work have settled. Native completion or cancellation confirmation is independent of resource retirement: closing a transport cannot supply a missing native terminal or operation receipt.
 
 - `Reusable=true` also confirms that the native owner can accept the next Turn. `Reusable=false` requires a reason and a later confirmed Executor close.
 - An error means settlement is unconfirmed and frees neither ownership nor capacity. Caller deadlines stop the wait, not the tracked cleanup. Retry the same cleanup target serially; a failed cleanup blocks replacement and keeps its resource slot.
@@ -119,13 +118,13 @@ A Session owns one reusable Executor in its connected Runtime; a Turn owns one i
 - Every `Session` declares `CancellationOutcome`. `Turn` and `PreparedCancellation` inherit it. The snapshot keeps observed native identity, Usage and output and remains readable after cancellation. Missing evidence stays unset; an empty `DonePayload` means nothing has been observed, not that cancellation succeeded or is unsupported. Reading the snapshot does not wait for settlement.
 - `Session.Cancel` requests cancellation; output closure signals teardown. Executable `PreparedCancellation.Cancel` waits for local cleanup and output writes to stop. Turn settlement still requires `AwaitSettlement` and any required `Executor.Close`; neither a successful cancellation request nor its snapshot replaces those waits.
 
-**What the Runtime does around a Turn.** One output consumer starts before native Start, drains the bounded 64-frame channel and keeps the terminal observation until Start publication, Turn settlement and admitted operation receipts finish. Natural completion never calls Cancel. Input, function and interaction admission close before settlement; operations already admitted hold their barrier through native receipts and outbound acknowledgement. The Runtime sends cancellation to the Turn before waiting on that barrier, because a written input may need a native interrupt to produce its receipt. It joins native settlement, any required confirmed Executor close, output drain and all admitted operations before an applied acknowledgement or reuse, and only then forwards Done or an applied cancellation receipt. A failed Close can report failure while keeping the same Run and outstanding operations for retry; a closed caller wait cannot manufacture an applied input receipt. The Runtime commits native continuity and releases the old Run's admission before publishing Done, since the receiver may start another Turn at once; a late terminal-send failure belongs to the old Run and cannot invalidate a successor that already owns the Executor. Connection shutdown owns transport-loss cleanup. The settlement wait is ten seconds and the receipt send budget five seconds; a timeout is not proof of quiescence.
+**What the Runtime does around a Turn.** One output consumer starts before native Start, drains the bounded 64-frame channel and keeps the terminal observation until Start publication, Turn settlement and admitted operation receipts finish. Natural completion never calls Cancel. Input and function admission close before settlement; operations already admitted hold their barrier through native receipts and outbound acknowledgement. The Runtime sends cancellation to the Turn before waiting on that barrier, because a written input may need a native interrupt to produce its receipt. It joins native settlement, any required confirmed Executor close, output drain and all admitted operations before an applied acknowledgement or reuse, and only then forwards Done or an applied cancellation receipt. A failed Close can report failure while keeping the same Run and outstanding operations for retry; a closed caller wait cannot manufacture an applied input receipt. The Runtime commits native continuity and releases the old Run's admission before publishing Done, since the receiver may start another Turn at once; a late terminal-send failure belongs to the old Run and cannot invalidate a successor that already owns the Executor. Connection shutdown owns transport-loss cleanup. The settlement wait is ten seconds and the receipt send budget five seconds; a timeout is not proof of quiescence.
 
 ## Events, inputs and optional capabilities
 
 Use [`internal/agentdaemon/proto`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/internal/agentdaemon/proto) for neutral requests, events and receipts. Each Turn emits only its own events with its Run ID, in order, and one terminal outcome. Native IDs and usage are observed, never invented; a missing measurement is unknown, not zero.
 
-Initial input and steering use ordered `proto.MessageInput`. Keep user-message and content order. Text-only adapters reject images through `TextOnly()` instead of dropping them; image adapters translate each part natively and acknowledge an active batch only after all its messages are applied. A successful transport write is distinct from confirmed native application. User-choice answers use the emitted question ID and an array of values; the shared `PromptForUserChoiceDecisionPayload.AnswersFor` validates identity before consuming a pending interaction, so never map answers by header or position. Resume only the exact history bound to the Session; missing, ambiguous or foreign history fails before new model input. Device identity is not native session ownership.
+Initial input and steering use ordered `proto.MessageInput`. Keep user-message and content order. Text-only adapters reject images through `TextOnly()` instead of dropping them; image adapters translate each part natively and acknowledge an active batch only after all its messages are applied. A successful transport write is distinct from confirmed native application. Resume only the exact history bound to the Session; missing, ambiguous or foreign history fails before new model input. Device identity is not native session ownership.
 
 ### Required and extension operations
 
@@ -161,7 +160,7 @@ Registration is static and requires a build. Export one `agent.Declaration` from
 
 Every `proto.AgentKindCapabilities` field must be explicitly `proto.CapabilitySupported` or `proto.CapabilityUnsupported`, even for an unavailable Harness. `proto.CapabilityUnspecified` is invalid: zero values and omitted fields never mean Unsupported. An installation probe may set an individual field with `proto.CapabilityFromBool`; it must not populate unmentioned or future fields. Availability stays separate in `SupportedAgentKind.Available`. Registration validates the complete declaration before changing the registry, and the wire carries an explicit boolean for every field, so omitted and null fields are invalid. A new field requires a decision in every production declaration. Runtime consumers use `IsSupported()` and reject unsupported requests before native operations; an interface assertion verifies implementation, never support. Every declaration must match the behavior verified for that installation; the [Core–Runtime protocol](../../docs/runtime-protocol.md#capability-declarations) owns how declarations travel and are frozen.
 
-The admission mapping is explicit. `Steering` controls non-durable `Steerer` input. `DurableInputReceipts` controls `DurableSteerer` input and also requires the Turn settlement contract; neither implies the other, and Core's public text profile requires both. `Permissions` qualifies permission and user-choice responses together and requires both native response paths. Workspace declarations describe the authorized resource owner, including the common Runtime workspace implementation. Runtime registration does not grant Core qualification; the service profile does.
+The admission mapping is explicit. `Steering` controls non-durable `Steerer` input. `DurableInputReceipts` controls `DurableSteerer` input and also requires the Turn settlement contract; neither implies the other, and Core's public text profile requires both. Workspace declarations describe the authorized resource owner, including the common Runtime workspace implementation. Runtime registration does not grant Core qualification; the service profile does.
 
 The runnable test-only example [`testdata/onboarding/main.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/testdata/onboarding/main.go) registers a text-only synthetic Harness. It shows a Session-owned Executor, fresh Turns, durable steering, cancellation and history binding, and is never shipped.
 
@@ -209,7 +208,7 @@ The declaration's ordered `protocols` list is the only source of accepted protoc
 Before starting, record the operation set, expected results, exclusions and stopping conditions. A qualification ends when its declared operations pass; it does not expand to match another Harness's feature list.
 
 1. **Contract tests.** Call `agent/contracttest.TextLifecycle` from a test named `TestSharedTextLifecycle` with the adapter's prepared Executor and a deterministic native fixture; `claudesdk/executor_test.go` is the reference. It checks independent Turn streams, native owner and history continuity, durable write and application receipts, stale cancellation and healthy continuation after cancellation. `make check-runtime-contract` runs it together with the shared wire, gateway, transport and dispatcher tests, the declaration completeness check and each adapter's `TestUnsupportedExtensionsHaveNoNativeEffects`. Adapter tests also cover two ordinary Turns sharing one native process or connection and history, cancellation followed by another Turn, stale cancellation and late events, native exit, cleanup failure, input write and application receipts, unknown outcomes and fresh per-Turn usage, function, input and child-observation state. State whether a fixture is controlled or a real provider.
-2. **Shared integration.** `TestThirdHarnessPublicOnboarding` runs the synthetic Harness through public Session and input admission, Worker device selection, the real WebSocket gateway, the daemon Registry and Router, neutral events and durable terminal projection. It uses a custom immutable `engine.Catalog` in the same `execution.Policy` given to the API handler and the dispatcher, and checks applied input receipts, saved native identity, continuation, cancellation, unsupported optional requests and missing mandatory Runtime support. The fixture has no workspace, MCP, public functions, permissions or user-choice handlers, and its registration stays local to the test. It proves the integration path, not native execution.
+2. **Shared integration.** `TestThirdHarnessPublicOnboarding` runs the synthetic Harness through public Session and input admission, Worker device selection, the real WebSocket gateway, the daemon Registry and Router, neutral events and durable terminal projection. It uses a custom immutable `engine.Catalog` in the same `execution.Policy` given to the API handler and the dispatcher, and checks applied input receipts, saved native identity, continuation, cancellation, unsupported optional requests and missing mandatory Runtime support. The fixture has no workspace, MCP or public functions, and its registration stays local to the test. It proves the integration path, not native execution.
 3. **Real acceptance.** Use the pinned official Python SDK and raw HTTP against Core, a real provider API, the native Harness and a dedicated database. Verify initial execution, a warm follow-up, cancellation and restart with continuation; record native owner identity and same-condition cold and warm timing. For workspace placements also verify Files and Artifacts, workspace identity, that no credentials appear in public responses and that foreign history is rejected. `services/core/tests/official_hosted_functions_native.py` holds the shared function assertions: success and error, native file output and public Artifact bytes, same-history continuation after restart, foreign result rejection and pending-call cancellation. Synthetic or failed runs never count. The opt-in tests below run the pinned-SDK fixtures in `services/core/tests` against a real daemon and model; each runs when `OAC_TEST_OFFICIAL_SDK_PYTHON`, `OAC_TEST_NATIVE_DAEMON_BIN`, `OAC_TEST_NATIVE_PROOF_DIR` and its private options file are set. The options file is a JSON object with exactly `model` and `model_provider` (the fields of `x_agents_core.model_provider`); the test sets it as the deployment default model provider, which the fixtures' `environment: none` Sessions freeze at creation.
 4. **Regression.** Existing Harnesses keep working. Run targeted tests, then `make check`; run `make openapi` after API changes and `make sqlc-generate` after query changes.
 5. **Review.** Follow the [blind review workflow](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#review).
@@ -247,7 +246,7 @@ The daemon's `clirunner` starts every native child in its own Unix process group
 
 Owned output pipes stay readable after the leader exits. Consumers drain stdout and stderr before calling `Wait`, which joins the cached process result and closes the readers. `Done` reports leader reaping and group cleanup signals; it is not a native execution receipt or proof of persisted history. SDK adapters settle each Turn and drain its observations before publishing completion, and Executor close also closes the query and awaits the native child. Process groups are lifecycle supervision, not isolation or containment of descendants that leave the group.
 
-Adapters run native tools unattended with the launching user's permissions: Codex with approval policy `never` and full access, Claude through the adapter's tool callback in native `default` permission mode with the SDK sandbox disabled, and MiniMax with bypassed permissions and its sandbox disabled. Do not add permission profiles, bubblewrap wrappers or native sandbox settings; there is one execution path for every Environment origin. Resource paths are operator configuration, not a permission boundary.
+Adapters run native tools unattended with the launching user's permissions, and a Harness never asks a human. Codex runs with approval policy `never`, under which it settles MCP elicitation itself without reaching the client, and with full access; the adapter also disables its blocking `request_user_input` tool. Claude runs through the adapter's tool callback, which allows or denies without asking, in native `default` permission mode with the SDK sandbox disabled. MiniMax runs with bypassed permissions and its sandbox disabled; the adapter disables `askUser`, advertises no elicitation and answers `session/request_permission` with the ACP `cancelled` outcome, which MiniMax treats as a denial. No native permission or question request reaches Core: a human in the loop goes through a function tool, the Session reads [`requires_action`](./sessions-events.md#session-status) and the application submits the function result. Do not add permission profiles, bubblewrap wrappers or native sandbox settings; there is one execution path for every Environment origin. Resource paths are operator configuration, not a permission boundary.
 
 Network admission follows [Restricted network](./environments.md#restricted-network).
 
diff --git a/contracts/agents-api/zh/core-errors.md b/contracts/agents-api/zh/core-errors.md
index d90ac52b0..c7bc4301b 100644
--- a/contracts/agents-api/zh/core-errors.md
+++ b/contracts/agents-api/zh/core-errors.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理错误"
 source: contracts/agents-api/core-errors.md
-source_hash: d5c4450c0c74927115c79dca70d29372a7316d5d2591c7e18af688d08257a98c
+source_hash: 3d8e6a03d6a54c7dc86a27164749ffae963b5ef52cbede0e0da843c7da0216ba
 ---
 
 `/core/v1` 上的错误使用此封装结构。`message` 是安全的英文文本；`code` 和 `param` 可以为 null。客户端依据稳定的 `code` 和可选的 `param` 进行处理，对未知代码显示 `message`，绝不解析消息，也绝不自动重试被拒绝的写操作。
@@ -98,7 +98,7 @@ Web 的控制台服务器在 `/core` 路径上发生自身故障时使用此封
 | `execution_interrupted` | Core 执行被中断 |
 | `delivery_unconfirmed` | `delivery_unknown`、`input_outcome_unknown`、`cancel_unconfirmed`、`cancel_outcome_unavailable`、`function_result_unconfirmed` |
 | `input_rejected` | `invalid_input`、`input_not_applied`、`message_input_unsupported`，以及确切的 steering 结果 `input_invalid_input`、`input_run_inactive`、`input_input_conflict`、`input_input_limit`、`input_unsupported`、`input_rejected`、`input_not_ready`、`input_busy` |
-| `executor_protocol_error` | `invalid_executor_result`、`interaction_not_supported`、`execution_state_unavailable`、`execution_state_changed`、`function_call_invalid`、`function_result_invalid` |
+| `executor_protocol_error` | `invalid_executor_result`、`execution_state_unavailable`、`execution_state_changed`、`function_call_invalid`、`function_result_invalid` |
 | `core_storage_failed` | `event_persistence_failed`、`artifact_capture_failed` |
 | `internal_error` | 结果未知或格式错误；不返回原始值 |
 | `environment_connection_timeout` | 初始输入连接截止时间已过 |
diff --git a/contracts/agents-api/zh/harness-onboarding.md b/contracts/agents-api/zh/harness-onboarding.md
index 8f21103a4..0a952cf17 100644
--- a/contracts/agents-api/zh/harness-onboarding.md
+++ b/contracts/agents-api/zh/harness-onboarding.md
@@ -1,7 +1,7 @@
 ---
 title: "将原生 Harness 添加到 OpenAgentCore"
 source: contracts/agents-api/harness-onboarding.md
-source_hash: f9d04f91520968c71565aada8592f116bf794b0e094f8897cb21ef0d10e17793
+source_hash: 29b19e3f79eda12fcf888bf0551ea36a37df4f9eda8245fb98163978a3695aee
 ---
 
 **Harness** 是一种运行模型和工具循环的原生代理引擎（Codex、Claude Code、MiniMax Code）。**Harness 适配器**将 Runtime 的 Executor 和 Turn 契约转换到该引擎的 SDK 或协议。本文档定义 Runtime–Harness 协议：适配器接口及其生命周期义务、注册、Core 资格认定和验收。[Harness capabilities](harness-capabilities.md) 记录了当前每个 Harness 支持的功能。
@@ -71,7 +71,6 @@ Environment 提供执行资源。受管 E2B、Docker 和 microsandbox 机器以
 | `DurableSteerer` | 每个 Turn 上真实实现 | 区分完整写入与原生应用回执；保留重试身份 |
 | `Steerer` | 明确实现或 Unsupported | 额外的非持久化活动 Turn 输入 |
 | `FunctionResultSubmitter` | 明确实现或 Unsupported | 匹配原生调用和结果身份，并确认应用 |
-| `PermissionResponder`、`UserChoiceResponder` | 明确实现或 Unsupported | 响应精确发出的身份；未知或已过期的交互与 Unsupported 保持区分 |
 | `WorkspaceReader`、`WorkspaceDirectoryLister`、`WorkspaceWriter` | 在 Turn、Executor 和 Prepared 所有者上明确实现 | 使用授权工作区，确认访问，提交或关闭，或者返回该操作的 Unsupported 错误 |
 | `Prepared`、`PreparedCancellation` | 对可执行准备进行真实实现 | 在 Start、取消和未使用清理之间保持资源和输出的所有权 |
 | 中立消息、图像、MCP、结构化输出和 Subagent 观察 | 明确作出能力决策 | 保持每项操作的协议语义；在提交前拒绝不受支持的输入 |
@@ -86,7 +85,7 @@ func (s *Session) SubmitFunctionResult(context.Context, proto.FunctionResultPayl
 }
 ```
 
-原因必须是固定的安全字符串，绝不能是已提交内容、凭据或原始原生诊断信息。Unsupported 保证不会产生原生副作用，也不表示操作成功且为空。安装不可用、未知交互 ID、原生失败和不确定结果应保留各自的错误和所有权。nil `Turn` 仍表示没有提交任何输入，并且输出归调用方所有；绝不能将其用作 Unsupported 标记。
+原因必须是固定的安全字符串，绝不能是已提交内容、凭据或原始原生诊断信息。Unsupported 保证不会产生原生副作用，也不表示操作成功且为空。安装不可用、未知调用 ID、原生失败和不确定结果应保留各自的错误和所有权。nil `Turn` 仍表示没有提交任何输入，并且输出归调用方所有；绝不能将其用作 Unsupported 标记。
 
 线协议请求不携带工作目录。Runtime 将 `local_environment.workspace_directory` 与其绑定进行核对，并通过 `LocalEnvironment.WorkspaceRoot` 向 Harness 提供其绑定的工作区目录；必须在该目录中运行原生 Harness。
 
@@ -108,11 +107,11 @@ Session 在其已连接的 Runtime 中拥有一个可复用的 Executor；Turn 
 
 **绑定。** Runtime 将其 Executor 记录绑定到 Session、Environment、连接和不可变执行配置。恢复身份和先前 Turn 恢复标志是连续性断言，而不是配置更改。提供的原生身份必须与保留的所有者匹配；当需要现有历史时，恢复绝不能启动新的根。配置冲突属于错误，而不是热切换。连接丢失会让其所有者和句柄退役；旧计时器、输出和取消操作不能影响替代对象。
 
-**每 Turn 状态。** 每个 Turn 都会获得全新的包装器、输出通道和回执状态。引导、函数、权限和用户选择接口均属于该 Turn。原生回调必须在异步工作开始前捕获来源 Turn，因此迟到事件绝不会被归到当前活动的 Turn 上。原生进程、query 或传输连接、固定能力配置和原生 session 身份均属于 Executor。不要重置已完成的 `sync.Once` 值，也不要复用旧 Turn 对象。
+**每 Turn 状态。** 每个 Turn 都会获得全新的包装器、输出通道和回执状态。引导和函数接口均属于该 Turn。原生回调必须在异步工作开始前捕获来源 Turn，因此迟到事件绝不会被归到当前活动的 Turn 上。原生进程、query 或传输连接、固定能力配置和原生 session 身份均属于 Executor。不要重置已完成的 `sync.Once` 值，也不要复用旧 Turn 对象。
 
 **开始。** `StartTurn` 返回 nil Turn，保证没有提交任何原生输入，也没有保留输出通道；随后由 Runtime 关闭该通道。一旦输入可能已经提交，即使同时返回错误，也必须返回非 nil Turn：该 Turn 拥有恰好一次的输出关闭权，并在结算前持续接受跟踪。未知输入绝不能重放。明确的 `executor_unavailable` Start 拒绝允许进行一次通用恢复尝试，但只能在此前 Executor 已关闭且未提交输入之后进行；Runtime 会重新检查同一物理对端和当前授权。
 
-**取消和结算。** `Turn.Cancel` 仅以目标 Turn 为对象，不会关闭健康的 Executor。`AwaitSettlement` 同时适用于自然完成和取消。成功意味着输出已无法再写入，并且该 Turn 的原生事件、输入、函数、交互和子任务均已结算。原生完成或取消确认独立于资源退役：关闭传输层无法提供缺失的原生终态或操作回执。
+**取消和结算。** `Turn.Cancel` 仅以目标 Turn 为对象，不会关闭健康的 Executor。`AwaitSettlement` 同时适用于自然完成和取消。成功意味着输出已无法再写入，并且该 Turn 的原生事件、输入、函数和子任务均已结算。原生完成或取消确认独立于资源退役：关闭传输层无法提供缺失的原生终态或操作回执。
 
 - `Reusable=true` 还要确认原生所有者能够接受下一个 Turn。`Reusable=false` 要求提供原因，并在之后确认 Executor 已关闭。
 - 错误表示结算尚未确认，既不释放所有权，也不释放容量。调用方截止时间只会停止等待，不会停止受跟踪的清理。必须串行重试同一个清理目标；清理失败会阻止替换并保留其资源槽位。
@@ -121,13 +120,13 @@ Session 在其已连接的 Runtime 中拥有一个可复用的 Executor；Turn 
 - 每个 `Session` 都要声明 `CancellationOutcome`。`Turn` 和 `PreparedCancellation` 继承该声明。快照保留已观察到的原生身份、Usage 和输出，并在取消后仍可读取。缺失的证据保持未设置；空的 `DonePayload` 表示未观察到任何内容，而不是表示取消成功或不受支持。读取快照不会等待结算。
 - `Session.Cancel` 请求取消；输出关闭表示拆卸开始。可执行准备中的 `PreparedCancellation.Cancel` 会等待本地清理和输出写入停止。Turn 结算仍需要 `AwaitSettlement` 和所需的任何 `Executor.Close`；取消请求成功或其快照都不能替代这些等待。
 
-**Runtime 在 Turn 前后执行的工作。** 一个输出消费者会在原生 Start 之前启动，耗尽有界的 64 帧通道，并将终态观察保留到 Start 发布、Turn 结算和已准入操作回执完成为止。正常完成绝不调用 Cancel。输入、函数和交互准入会在结算前关闭；已准入的操作会持有其屏障，直至原生回执和出站确认完成。Runtime 会在等待该屏障之前向 Turn 发送取消，因为已写入的输入可能需要原生中断才能生成回执。Runtime 会汇合原生结算、所需的已确认 Executor 关闭、输出耗尽和所有已准入操作，然后应用确认或执行复用，之后才会转发 Done 或已应用的取消回执。Close 失败可以报告失败，同时保留同一 Run 和未完成操作以供重试；已关闭的调用方等待无法凭空生成已应用输入回执。Runtime 会在发布 Done 前提交原生连续性状态并释放旧 Run 的准入，因为接收方可能立即启动另一个 Turn；迟到的终态发送失败属于旧 Run，不能使已拥有 Executor 的后继对象失效。连接关闭负责传输丢失清理。结算等待时间为十秒，回执发送预算为五秒；超时不能证明已达到静默状态。
+**Runtime 在 Turn 前后执行的工作。** 一个输出消费者会在原生 Start 之前启动，耗尽有界的 64 帧通道，并将终态观察保留到 Start 发布、Turn 结算和已准入操作回执完成为止。正常完成绝不调用 Cancel。输入和函数准入会在结算前关闭；已准入的操作会持有其屏障，直至原生回执和出站确认完成。Runtime 会在等待该屏障之前向 Turn 发送取消，因为已写入的输入可能需要原生中断才能生成回执。Runtime 会汇合原生结算、所需的已确认 Executor 关闭、输出耗尽和所有已准入操作，然后应用确认或执行复用，之后才会转发 Done 或已应用的取消回执。Close 失败可以报告失败，同时保留同一 Run 和未完成操作以供重试；已关闭的调用方等待无法凭空生成已应用输入回执。Runtime 会在发布 Done 前提交原生连续性状态并释放旧 Run 的准入，因为接收方可能立即启动另一个 Turn；迟到的终态发送失败属于旧 Run，不能使已拥有 Executor 的后继对象失效。连接关闭负责传输丢失清理。结算等待时间为十秒，回执发送预算为五秒；超时不能证明已达到静默状态。
 
 ## 事件、输入和可选能力 {#events-inputs-and-optional-capabilities}
 
 使用 [`internal/agentdaemon/proto`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/internal/agentdaemon/proto) 处理中立请求、事件和回执。每个 Turn 只按顺序发出带有其 Run ID 的自身事件，并产生一个终态结果。原生 ID 和 usage 必须来自观察，绝不能虚构；缺失的度量值表示未知，而不是零。
 
-初始输入和引导使用有序的 `proto.MessageInput`。必须保持用户消息顺序和内容顺序。仅支持文本的适配器通过 `TextOnly()` 拒绝图像，而不是丢弃图像；图像适配器在原生环境中转换每个部分，并且只有在其所有消息均已应用后才确认活动批次。成功传输写入与确认原生应用是不同的事件。用户选择答案使用发出的问题 ID 和值数组；共享的 `PromptForUserChoiceDecisionPayload.AnswersFor` 会在消费待处理交互之前验证身份，因此绝不能按标头或位置映射答案。只能恢复绑定到 Session 的精确历史；缺失、含糊或外部历史会在新的模型输入之前导致失败。设备身份不代表原生 session 所有权。
+初始输入和引导使用有序的 `proto.MessageInput`。必须保持用户消息顺序和内容顺序。仅支持文本的适配器通过 `TextOnly()` 拒绝图像，而不是丢弃图像；图像适配器在原生环境中转换每个部分，并且只有在其所有消息均已应用后才确认活动批次。成功传输写入与确认原生应用是不同的事件。只能恢复绑定到 Session 的精确历史；缺失、含糊或外部历史会在新的模型输入之前导致失败。设备身份不代表原生 session 所有权。
 
 ### 必需操作和扩展操作 {#required-and-extension-operations}
 
@@ -163,7 +162,7 @@ MCP、公共函数、延迟函数发现、结构化输出、图像输入、详
 
 每个 `proto.AgentKindCapabilities` 字段都必须显式设为 `proto.CapabilitySupported` 或 `proto.CapabilityUnsupported`，即使 Harness 不可用也是如此。`proto.CapabilityUnspecified` 无效：零值和省略字段绝不表示 Unsupported。安装探测可以使用 `proto.CapabilityFromBool` 设置单个字段；但不得填充未提及字段或未来字段。可用性通过 `SupportedAgentKind.Available` 单独表示。注册会在更改 registry 之前验证完整声明；线协议会为每个字段携带显式布尔值，因此省略字段和 null 字段均无效。添加新字段时，每个生产声明都必须作出决定。Runtime 使用者应调用 `IsSupported()`，并在原生操作前拒绝不受支持的请求；接口断言用于验证实现，绝不表示支持。每个声明都必须与针对该安装验证的行为一致；[Core–Runtime protocol](../../../docs/zh/runtime-protocol.md#capability-declarations) 负责声明的传输方式和冻结方式。
 
-准入映射是显式的。`Steering` 控制非持久化 `Steerer` 输入。`DurableInputReceipts` 控制 `DurableSteerer` 输入，并且还要求 Turn 结算契约；二者互不隐含，而且 Core 的公共文本 profile 要求同时具备二者。`Permissions` 一起认定权限响应和用户选择响应的资格，并要求两条原生响应路径均存在。工作区声明描述授权资源所有者，包括通用 Runtime 工作区实现。Runtime 注册不会授予 Core 资格；服务 profile 才会授予。
+准入映射是显式的。`Steering` 控制非持久化 `Steerer` 输入。`DurableInputReceipts` 控制 `DurableSteerer` 输入，并且还要求 Turn 结算契约；二者互不隐含，而且 Core 的公共文本 profile 要求同时具备二者。工作区声明描述授权资源所有者，包括通用 Runtime 工作区实现。Runtime 注册不会授予 Core 资格；服务 profile 才会授予。
 
 可运行的仅测试示例 [`testdata/onboarding/main.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/testdata/onboarding/main.go) 会注册一个仅支持文本的合成 Harness。它展示 Session 所有的 Executor、全新的 Turn、持久化引导、取消和历史绑定，并且绝不会发布。
 
@@ -211,7 +210,7 @@ profile 是纯逻辑：它使用现有的公共类型和协议类型，声明受
 开始前，记录操作集、预期结果、排除项和停止条件。当其声明的操作通过时，资格认定即结束；它不会扩展为匹配另一个 Harness 的功能列表。
 
 1. **契约测试。** 在名为 `TestSharedTextLifecycle` 的测试中，使用适配器准备好的 Executor 和确定性的原生夹具调用 `agent/contracttest.TextLifecycle`；`claudesdk/executor_test.go` 是参考实现。它检查独立的 Turn 流、原生所有者和历史连续性、持久化写入与应用回执、过期取消，以及取消后的健康继续执行。`make check-runtime-contract` 会将它与共享线协议、gateway、传输层和调度器测试、声明完整性检查以及每个适配器的 `TestUnsupportedExtensionsHaveNoNativeEffects` 一起运行。适配器测试还覆盖两个普通 Turn 共享一个原生进程或连接和历史、取消后执行另一个 Turn、过期取消和迟到事件、原生退出、清理失败、输入写入与应用回执、未知结果，以及每 Turn 新鲜的 usage、函数、输入和子项观察状态。必须说明夹具是受控夹具还是真实 Provider。
-2. **共享集成。** `TestThirdHarnessPublicOnboarding` 让合成 Harness 通过公共 Session 和输入准入、Worker 设备选择、真实 WebSocket gateway、daemon Registry 和 Router、中立事件以及持久化终态投影运行。它在与 API 处理程序和调度器相同的 `execution.Policy` 中使用自定义不可变 `engine.Catalog`，并检查已应用输入回执、已保存原生身份、继续执行、取消、不受支持的可选请求以及缺少强制 Runtime 支持。该夹具没有工作区、MCP、公共函数、权限或用户选择处理器，其注册仅保留在测试本地。它证明的是集成路径，而不是原生执行。
+2. **共享集成。** `TestThirdHarnessPublicOnboarding` 让合成 Harness 通过公共 Session 和输入准入、Worker 设备选择、真实 WebSocket gateway、daemon Registry 和 Router、中立事件以及持久化终态投影运行。它在与 API 处理程序和调度器相同的 `execution.Policy` 中使用自定义不可变 `engine.Catalog`，并检查已应用输入回执、已保存原生身份、继续执行、取消、不受支持的可选请求以及缺少强制 Runtime 支持。该夹具没有工作区、MCP 或公共函数，其注册仅保留在测试本地。它证明的是集成路径，而不是原生执行。
 3. **真实验收。** 使用锁定的官方 Python SDK 和针对 Core 的原始 HTTP、真实 Provider API、原生 Harness 以及专用数据库。验证初始执行、热后续执行、取消以及带继续执行的重启；记录原生所有者身份以及相同条件下的冷启动和热运行时间。对于工作区放置方式，还要验证 Files 和 Artifacts、工作区身份、公开响应中未出现凭据，以及外部历史会被拒绝。`services/core/tests/official_hosted_functions_native.py` 保存共享函数断言：成功和错误、原生文件输出和公共 Artifact 字节、重启后的同历史继续执行、外部结果拒绝以及待处理调用取消。合成运行或失败运行绝不计入。下面的选择性测试会在 `services/core/tests` 中针对真实 daemon 和模型运行锁定 SDK 夹具；设置 `OAC_TEST_OFFICIAL_SDK_PYTHON`、`OAC_TEST_NATIVE_DAEMON_BIN`、`OAC_TEST_NATIVE_PROOF_DIR` 及其私有选项文件后，每项测试才会运行。选项文件是一个 JSON 对象，恰好包含 `model` 和 `model_provider`（即 `x_agents_core.model_provider` 的字段）；测试会将其设置为部署默认模型 Provider，而夹具的 `environment: none` Session 会在创建时将其冻结。
 4. **回归。** 现有 Harness 必须继续正常工作。先运行定向测试，然后运行 `make check`；API 更改后运行 `make openapi`，查询更改后运行 `make sqlc-generate`。
 5. **审查。** 遵循 [blind review workflow](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#review)。
@@ -249,7 +248,7 @@ daemon 的 `clirunner` 让每个原生子进程在自己的 Unix 进程组中启
 
 所属输出管道在主进程退出后仍可读取。消费者在调用 `Wait` 之前耗尽 stdout 和 stderr；`Wait` 会汇合缓存的进程结果并关闭读取器。`Done` 报告主进程回收和进程组清理信号；它不是原生执行回执，也不是历史已持久化的证据。SDK 适配器会结算每个 Turn，并在发布完成状态前耗尽其观察结果；Executor 关闭还会关闭 Query 并等待原生子进程。进程组用于生命周期监管，而不是隔离或遏制离开进程组的后代进程。
 
-适配器以启动用户的权限无人值守运行原生工具：Codex 使用批准策略 `never` 和完全访问权限；Claude 通过适配器的工具回调，以原生 `default` 权限模式运行，并禁用 SDK sandbox；MiniMax 绕过权限并禁用 sandbox。不要添加权限 profile、bubblewrap 包装器或原生 sandbox 设置；每种 Environment 来源都只有一条执行路径。资源路径属于操作员配置，而不是权限边界。
+适配器以启动用户的权限无人值守运行原生工具，Harness 从不询问人类。Codex 使用批准策略 `never` 和完全访问权限，在该策略下 Codex 自行处理 MCP elicitation，不会发给客户端；适配器还禁用其阻塞式 `request_user_input` 工具。Claude 通过适配器的工具回调运行，回调直接允许或拒绝、不会询问，使用原生 `default` 权限模式并禁用 SDK sandbox。MiniMax 绕过权限并禁用 sandbox；适配器禁用 `askUser`、不声明 elicitation，并以 ACP `cancelled` 结果答复 `session/request_permission`，MiniMax 将其视为拒绝。原生权限或问题请求都不会到达 Core：需要人工介入时通过 function 工具完成，Session 读取 [`requires_action`](./sessions-events.md#session-status)，由应用提交 function 结果。不要添加权限 profile、bubblewrap 包装器或原生 sandbox 设置；每种 Environment 来源都只有一条执行路径。资源路径属于操作员配置，而不是权限边界。
 
 网络准入遵循 [Restricted network](environments.md#restricted-network)。
 
diff --git a/docs/runtime-protocol.md b/docs/runtime-protocol.md
index 6b74785a0..bc1d4859a 100644
--- a/docs/runtime-protocol.md
+++ b/docs/runtime-protocol.md
@@ -20,7 +20,7 @@ A Runtime connects in this order:
 
 The wire version is [`proto.Version`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/version.go), independent of the Runtime build version that heartbeats report. Core accepts only an exact match, including the patch component. A mismatch returns HTTP 426 `incompatible_version` before any dispatch; the daemon treats it as permanent and stops reconnecting. Deploy matching peers together.
 
-Each physical connection has fresh routing, admission handles and transfer state. A newer connection for the same device replaces the previous one: Core fences the owner lease and evicts the old Run and interaction routes, and the new connection inherits none of them. A valid credential and connection are never authority to choose another Session or Environment binding.
+Each physical connection has fresh routing, admission handles and transfer state. A newer connection for the same device replaces the previous one: Core fences the owner lease and evicts the old Run routes, and the new connection inherits none of them. A valid credential and connection are never authority to choose another Session or Environment binding.
 
 ## Capability declarations
 
@@ -51,7 +51,7 @@ A declaration describes what the Runtime can do. Core admits a public feature on
 | `message_images`, `function_result_images` | A message, or a function result, carries an image |
 | `mcp_http_tools`, `mcp_http_required`, `mcp_http_bearer_auth` | The Agent declares HTTP MCP servers; one is `required`; a Vault credential is selected for one |
 
-`permissions` gates permission decisions inside the Runtime. Core has no admission rule for `usage` and `resume`.
+Core has no admission rule for `usage` and `resume`.
 
 The `execution_prepare` configuration carries the opt-ins Core sets for each Run:
 
@@ -82,13 +82,10 @@ Every data frame is one JSON [`Envelope`](https://github.com/MiniMax-AI/OpenAgen
 | Preparation request ID | `Envelope.id` for prepare, start, release and status; distinct from a Run |
 | Admission handle | Runtime-generated reservation, valid only on the connection that accepted it |
 | Run ID | One execution attempt; `Envelope.id` for output, cancellation, active input and functions |
-| Interaction ID | `permission_request.payload.request_id` or `prompt_for_user_choice.payload.ask_id`; these request envelopes still carry the Run ID |
 | Delivery ID / input ID / call ID | Resolve attempt, active-input receipt and native function identity; never interchangeable |
 | Transfer ID / suspension ID | Connection-local transfer correlation / persisted suspension-attempt fencing |
 
-Decision and permission-cancel envelopes use the interaction ID. Cancellation and function-result acknowledgements use the Run ID. Every application decision receipt also matches the delivery ID. A reply without the required correlation cannot establish acceptance.
-
-User-choice decisions carry `question_answers`: an explicit `question_id` and an `answers` array for each provided answer. The IDs must belong to the emitted questions and cannot repeat. Question order and display headers do not identify answers; an omitted question stays unanswered, and an empty array is an explicit non-answer. Cancellation carries `cancelled: true` without answers. Shared validation rejects other shapes before native submission.
+Cancellation and function-result acknowledgements use the Run ID and match the delivery ID. A reply without the required correlation cannot establish acceptance.
 
 ## Message families
 
@@ -98,8 +95,7 @@ The linked source files define the required fields, validators, limits and finit
 | --- | --- | --- |
 | `runtime_prepare` | `runtime_prepare_result` | [Initialization and capability transfer](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/runtime_prepare.go) |
 | `execution_prepare`, `execution_start`, `execution_release` | `preparation_status` | [Execution admission](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/preparation.go) |
-| `prompt_cancel`, `device_shutdown` | `delta`, `thinking`, `output_message`, `tool_call`, `usage`, `error`, `done`, `heartbeat` | [Requests](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go), [events and capabilities](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
-| `permission_decision`, `prompt_for_user_choice_decision` | `permission_request`, `permission_cancel`, `prompt_for_user_choice`, `interaction_decision_ack` | [Requests](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go), [interactions](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
+| `prompt_cancel` | `delta`, `thinking`, `output_message`, `tool_call`, `usage`, `error`, `done`, `heartbeat`, `interaction_decision_ack` | [Requests](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go), [events and capabilities](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
 | `prompt_steer` | `prompt_steer_ack` | [Active input receipts](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/steering.go) |
 | `function_result` | `function_call`, `interaction_decision_ack` | [Function calls](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/functions.go) |
 | `workspace_read`, `workspace_write`, `workspace_export` | Matching `*_result` | [Read](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/workspace_read.go), [write](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/workspace_write.go), [export](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/workspace_export.go) |
@@ -158,7 +154,7 @@ No generic receipt exists for every envelope. A successful send does not prove t
 
 ## Failures, retries and cleanup
 
-Transport and execution outcomes are separate. Core's only Run subscription entry point is `SubscribeDurable`; inspect `Subscription.Err()` when its event channel closes. Disconnection and subscriber overflow close it with an explicit observation error and fabricate no `error` or `done`. Core keeps the durable truth and reconciles from confirmed facts. The Runtime keeps cleanup ownership until native work, input receipts, interactions and child work have settled.
+Transport and execution outcomes are separate. Core's only Run subscription entry point is `SubscribeDurable`; inspect `Subscription.Err()` when its event channel closes. Disconnection and subscriber overflow close it with an explicit observation error and fabricate no `error` or `done`. Core keeps the durable truth and reconciles from confirmed facts. The Runtime keeps cleanup ownership until native work, input receipts, function results and child work have settled.
 
 The public Turn status is a separate projection. [`execution/delivery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/execution/delivery.go) records an unsuccessful orchestration attempt as `failed`, including `delivery_unknown` after an unconfirmed send and `event_stream_incomplete` after a subscription failure; a closed subscription can replace the send reason with `event_stream_incomplete`. Both mean the native effect is unknown: a public `failed` status does not prove that the Harness failed, that no side effect occurred or that cleanup completed. Keep the observation reason and any native evidence distinct.
 
diff --git a/docs/zh/runtime-protocol.md b/docs/zh/runtime-protocol.md
index e721f6133..11a7807a5 100644
--- a/docs/zh/runtime-protocol.md
+++ b/docs/zh/runtime-protocol.md
@@ -1,7 +1,7 @@
 ---
 title: "Core–Runtime 协议"
 source: docs/runtime-protocol.md
-source_hash: 1d425cdf68ffd76fbf4ebb856fcf7af8a96eea93e28b1686292eeb0184376664
+source_hash: aec653711cfaff6123091c418ef1d7eb9dc8b9648cc4a70f9fe231895fd7ae9d
 ---
 
 此协议在 Runtime daemon 获取机器凭据后连接 Core 与 daemon，定义 daemon 连接上消息的含义和顺序。wire 类型、限制和验证器仅在 [`internal/agentdaemon/proto`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/internal/agentdaemon/proto) 中定义一次；Core 的 [gateway](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/services/core/internal/runtimegateway) 与参考 Runtime 的 [dispatcher](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/apps/daemon/internal/dispatch) 都使用它们，因此无需同步第二套 payload schema。签发凭据和打开连接的 HTTP 路由见[机器连接 API](../../contracts/agents-api/zh/machine-api.md)。
@@ -22,7 +22,7 @@ Runtime 按以下顺序连接：
 
 wire 版本为 [`proto.Version`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/version.go)，独立于 heartbeat 报告的 Runtime 构建版本。Core 仅接受精确匹配，包括 patch 部分。不匹配时，在任何 dispatch 前返回 HTTP 426 `incompatible_version`；daemon 将其视为永久错误并停止重连。应一起部署版本匹配的两端。
 
-每条物理连接拥有新的路由、admission handle 和传输状态。同一设备的新连接替代旧连接：Core 隔离 owner lease，移除旧 Run 和 interaction 路由，新连接不继承这些状态。有效凭据和连接不授权选择其他 Session 或 Environment 绑定。
+每条物理连接拥有新的路由、admission handle 和传输状态。同一设备的新连接替代旧连接：Core 隔离 owner lease，移除旧 Run 路由，新连接不继承这些状态。有效凭据和连接不授权选择其他 Session 或 Environment 绑定。
 
 ## 能力声明 {#capability-declarations}
 
@@ -53,7 +53,7 @@ wire 上每个字段都是 JSON boolean，所有字段都必须出现，包括 `
 | `message_images`, `function_result_images` | 消息或 function result 携带图像 |
 | `mcp_http_tools`, `mcp_http_required`, `mcp_http_bearer_auth` | Agent 声明 HTTP MCP server；其中一个为 `required`；其中一个选用了 Vault 凭据 |
 
-`permissions` 控制 Runtime 内部权限决定。Core 对 `usage` 和 `resume` 没有准入规则。
+Core 对 `usage` 和 `resume` 没有准入规则。
 
 `execution_prepare` 的配置携带 Core 为各 Run 设置的显式启用项：
 
@@ -84,13 +84,10 @@ wire 上每个字段都是 JSON boolean，所有字段都必须出现，包括 `
 | Preparation request ID | prepare、start、release 和 status 的 `Envelope.id`；与 Run 不同 |
 | Admission handle | Runtime 生成的预约，仅在接受它的连接上有效 |
 | Run ID | 一次执行尝试；输出、取消、活动输入和 function 的 `Envelope.id` |
-| Interaction ID | `permission_request.payload.request_id` 或 `prompt_for_user_choice.payload.ask_id`；这些请求 envelope 仍携带 Run ID |
 | Delivery ID / input ID / call ID | 分别标识 resolve 尝试、活动输入回执与原生 function；不能互换 |
 | Transfer ID / suspension ID | 连接本地传输关联 / 持久化 suspension 尝试的 fencing |
 
-Decision 和 permission-cancel envelope 使用 interaction ID。取消和 function-result 确认使用 Run ID。每个应用 decision 回执还要匹配 delivery ID。缺少必需关联的回复不能证明已接受。
-
-User-choice decision 携带 `question_answers`：每个已提供回答都有明确的 `question_id` 和 `answers` 数组。ID 必须属于已发出的问题且不能重复。问题顺序和显示 header 不标识回答；省略的问题仍未回答，空数组表示明确未作答。取消携带 `cancelled: true`，不包含回答。共享验证在原生提交前拒绝其他形式。
+取消和 function-result 确认使用 Run ID，并匹配 delivery ID。缺少必需关联的回复不能证明已接受。
 
 ## 消息族 {#message-families}
 
@@ -100,8 +97,7 @@ User-choice decision 携带 `question_answers`：每个已提供回答都有明
 | --- | --- | --- |
 | `runtime_prepare` | `runtime_prepare_result` | [初始化与能力传输](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/runtime_prepare.go) |
 | `execution_prepare`, `execution_start`, `execution_release` | `preparation_status` | [执行准入](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/preparation.go) |
-| `prompt_cancel`, `device_shutdown` | `delta`, `thinking`, `output_message`, `tool_call`, `usage`, `error`, `done`, `heartbeat` | [请求](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go)、[事件与能力](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
-| `permission_decision`, `prompt_for_user_choice_decision` | `permission_request`, `permission_cancel`, `prompt_for_user_choice`, `interaction_decision_ack` | [请求](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go)、[交互](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
+| `prompt_cancel` | `delta`, `thinking`, `output_message`, `tool_call`, `usage`, `error`, `done`, `heartbeat`, `interaction_decision_ack` | [请求](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/outbound.go)、[事件与能力](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/inbound.go) |
 | `prompt_steer` | `prompt_steer_ack` | [活动输入回执](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/steering.go) |
 | `function_result` | `function_call`, `interaction_decision_ack` | [Function 调用](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/functions.go) |
 | `workspace_read`, `workspace_write`, `workspace_export` | 对应的 `*_result` | [读取](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/workspace_read.go)、[写入](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/workspace_write.go)、[导出](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/agentdaemon/proto/workspace_export.go) |
@@ -160,7 +156,7 @@ Core 通过 `prompt_steer` 交付活动输入，设置 `durable_receipt: true`
 
 ## 故障、重试与清理 {#failures-retries-and-cleanup}
 
-transport 与 execution 结果分开。Core 唯一 Run 订阅入口是 `SubscribeDurable`；事件 channel 关闭时检查 `Subscription.Err()`。断连与 subscriber overflow 以明确 observation error 关闭订阅，不虚构 `error` 或 `done`。Core 保留持久事实，并依据已确认事实协调。Runtime 保留清理所有权，直到原生工作、输入回执、交互和子任务工作都结算完成。
+transport 与 execution 结果分开。Core 唯一 Run 订阅入口是 `SubscribeDurable`；事件 channel 关闭时检查 `Subscription.Err()`。断连与 subscriber overflow 以明确 observation error 关闭订阅，不虚构 `error` 或 `done`。Core 保留持久事实，并依据已确认事实协调。Runtime 保留清理所有权，直到原生工作、输入回执、function 结果和子任务工作都结算完成。
 
 公开 Turn 状态是独立投影。[`execution/delivery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/execution/delivery.go) 将不成功的编排尝试记录为 `failed`，包括未确认发送后的 `delivery_unknown` 和订阅失败后的 `event_stream_incomplete`；关闭的订阅可以用 `event_stream_incomplete` 替换发送原因。两者都表示原生效果未知：公开 `failed` 状态不证明 Harness 失败、没有产生副作用或清理已完成。应区分观测原因与原生证据。
 
diff --git a/internal/agentdaemon/proto/envelope.go b/internal/agentdaemon/proto/envelope.go
index 11772622a..bc4df3128 100644
--- a/internal/agentdaemon/proto/envelope.go
+++ b/internal/agentdaemon/proto/envelope.go
@@ -14,8 +14,6 @@
 // Envelope.ID correlation:
 //   - prompt_cancel: ID = RunID.
 //   - delta / tool_call / usage / error / done: ID = originating RunID.
-//   - permission_request: ID = RunID; payload.request_id is the interaction ID.
-//   - permission_decision / permission_cancel: ID = interaction ID.
 //   - execution_prepare / execution_start / execution_release and
 //     preparation_status: ID = preparation request ID, never RunID.
 //   - runtime_prepare / runtime_prepare_result: ID = connection-local transfer ID.
@@ -81,8 +79,7 @@ func NewEnvelopeWithTrace(typ string, id string, payload any, traceparent string
 }
 
 // DecodePayload unpacks Envelope.Payload into out. An empty Payload is
-// a non-error so bodyless types (prompt_cancel, permission_cancel)
-// decode cleanly.
+// a non-error so a bodyless prompt_cancel decodes cleanly.
 func (e Envelope) DecodePayload(out any) error {
 	if len(e.Payload) == 0 {
 		return nil
diff --git a/internal/agentdaemon/proto/inbound.go b/internal/agentdaemon/proto/inbound.go
index 73a49f6a8..ed236518f 100644
--- a/internal/agentdaemon/proto/inbound.go
+++ b/internal/agentdaemon/proto/inbound.go
@@ -28,26 +28,9 @@ const (
 	// before the call, "after" runs after.
 	TypeToolCall = "tool_call"
 
-	// TypePermissionRequest carries an agent's request for human
-	// approval. Envelope.ID is the RunID; payload.request_id identifies the decision.
-	TypePermissionRequest = "permission_request"
-
-	// TypePermissionCancel signals the agent withdrew an earlier
-	// permission request (e.g. its internal timeout fired). Used by
-	// the gateway to unblock pending SubmitPermission calls.
-	TypePermissionCancel = "permission_cancel"
-
-	// TypePromptForUserChoice asks the human to pick one (or more)
-	// answers from a closed list before the agent can continue. Used
-	// to intercept Claude Code's built-in AskUserQuestion tool so the
-	// daemon doesn't deadlock waiting for a tool_result no one will
-	// send. Envelope.ID is the RunID; payload.ask_id identifies the decision.
-	TypePromptForUserChoice = "prompt_for_user_choice"
-
 	// TypeInteractionDecisionAck confirms that the daemon-side agent
-	// accepted (or definitively rejected) a permission/user-input decision or cancellation.
-	// The server must not mark the durable interaction terminal before this
-	// frame arrives.
+	// accepted (or definitively rejected) a function result or cancellation.
+	// The server must not mark the delivery terminal before this frame arrives.
 	TypeInteractionDecisionAck = "interaction_decision_ack"
 
 	// TypeUsage reports a cumulative usage snapshot for the current execution.
@@ -100,18 +83,6 @@ type ToolCallPayload struct {
 	Result      map[string]any   `json:"result,omitempty"`
 }
 
-// PermissionRequestPayload carries an agent's request for human
-// approval. RequestID is the daemon-minted handle used to route a later
-// decision. It lives in the payload because Envelope.ID is the run ID used
-// by the server gateway to deliver the request to the active run subscriber.
-type PermissionRequestPayload struct {
-	RequestID string         `json:"request_id"`
-	Tool      string         `json:"tool"`
-	Title     string         `json:"title"`
-	Detail    string         `json:"detail,omitempty"`
-	Payload   map[string]any `json:"payload,omitempty"`
-}
-
 // InteractionDecisionAckPayload is the daemon's application-level receipt
 // for a server decision. DeliveryID correlates one resolve attempt without
 // relying on the request id, which may outlive a reconnect or timeout race.
@@ -124,44 +95,6 @@ type InteractionDecisionAckPayload struct {
 	Outcome *DonePayload `json:"outcome,omitempty"`
 }
 
-// PromptForUserChoiceOption is one button / checkbox the user can
-// pick when answering a PromptForUserChoice. Label is the human-
-// readable choice; Description is optional inline help.
-type PromptForUserChoiceOption struct {
-	Label       string `json:"label"`
-	Description string `json:"description,omitempty"`
-}
-
-// PromptForUserChoiceQuestion is one question in a (possibly multi-
-// question) AskUserQuestion call. Mirrors the Claude Code built-in
-// schema verbatim so the daemon doesn't translate the shape twice.
-type PromptForUserChoiceQuestion struct {
-	ID          string                      `json:"id"`
-	Header      string                      `json:"header,omitempty"`
-	Question    string                      `json:"question"`
-	MultiSelect bool                        `json:"multi_select,omitempty"`
-	IsOther     bool                        `json:"is_other,omitempty"`
-	IsSecret    bool                        `json:"is_secret,omitempty"`
-	Options     []PromptForUserChoiceOption `json:"options"`
-}
-
-// PromptForUserChoicePayload carries the AskUserQuestion interception.
-//
-// AskID is the daemon-minted "ask_<8hex>" handle the server uses to
-// route SubmitPromptForUserChoice back to the right session. It rides
-// on the payload (not Envelope.ID) because Envelope.ID is reserved for
-// the run id — that's the field server-side session.dispatch fans on
-// to deliver the frame to the run's subscriber channel. ToolUseID is
-// the originating Claude Code tool_use id; empty when the call came
-// through the control_request channel (CCRequestID then identifies the
-// daemon-side waiter instead but it doesn't ride on the wire).
-type PromptForUserChoicePayload struct {
-	AskID            string                        `json:"ask_id"`
-	Questions        []PromptForUserChoiceQuestion `json:"questions"`
-	ToolUseID        string                        `json:"tool_use_id,omitempty"`
-	AutoResolutionMs *uint64                       `json:"auto_resolution_ms,omitempty"`
-}
-
 // TokenUsage is a complete cumulative measurement for the current execution.
 // Adapters publish observed snapshots promptly; historical resume totals belong
 // to the adapter baseline, not this execution. Unknown fields must not become zero.
@@ -222,7 +155,6 @@ const (
 type AgentKindCapabilities struct {
 	SubagentObservations  CapabilitySupport `json:"subagent_observations"`
 	Streaming             CapabilitySupport `json:"streaming"`
-	Permissions           CapabilitySupport `json:"permissions"`
 	Usage                 CapabilitySupport `json:"usage"`
 	Resume                CapabilitySupport `json:"resume"`
 	NativeSessionRecovery CapabilitySupport `json:"native_session_recovery"`
diff --git a/internal/agentdaemon/proto/outbound.go b/internal/agentdaemon/proto/outbound.go
index 03e4acfbf..f5f2062a9 100644
--- a/internal/agentdaemon/proto/outbound.go
+++ b/internal/agentdaemon/proto/outbound.go
@@ -11,22 +11,6 @@ const (
 	// RunID. Idempotent — cancelling an unknown / already-finished
 	// run is a no-op on the daemon side.
 	TypePromptCancel = "prompt_cancel"
-
-	// TypePermissionDecision delivers a human verdict back to the
-	// daemon. Envelope.ID = the perm_<8hex> id the daemon minted in
-	// the matching permission_request.
-	TypePermissionDecision = "permission_decision"
-
-	// TypePromptForUserChoiceDecision delivers the human's answer back
-	// to the daemon. Envelope.ID = the ask_<8hex> id the daemon minted
-	// in the matching prompt_for_user_choice frame.
-	TypePromptForUserChoiceDecision = "prompt_for_user_choice_decision"
-
-	// TypeDeviceShutdown asks the daemon to exit gracefully (SIGTERM
-	// child processes, flush state, close the socket). Ignored by
-	// long-lived local devices unless the operator explicitly
-	// requested it.
-	TypeDeviceShutdown = "device_shutdown"
 )
 
 // PromptRequestPayload is the execution configuration that execution_prepare
@@ -77,39 +61,6 @@ type PromptCancelPayload struct {
 	DeliveryID string `json:"delivery_id,omitempty"`
 }
 
-// PermissionDecisionPayload carries the human verdict. UpdatedInput
-// lets the approver edit the tool input before letting the call
-// proceed (Claude Code's allow-with-changes path).
-type PermissionDecisionPayload struct {
-	DeliveryID   string         `json:"delivery_id"`
-	Approved     bool           `json:"approved"`
-	Message      string         `json:"message,omitempty"`
-	UpdatedInput map[string]any `json:"updated_input,omitempty"`
-}
-
-// PromptForUserChoiceQuestionAnswer binds answer values to one emitted question ID.
-// Headers and array positions never identify a question.
-type PromptForUserChoiceQuestionAnswer struct {
-	QuestionID string   `json:"question_id"`
-	Answers    []string `json:"answers"`
-}
-
-// PromptForUserChoiceDecisionPayload carries either explicitly identified answers
-// or cancellation. Omitted questions remain unanswered; adapters never reassign
-// answers by position or display text. Native choice validation stays in the adapter.
-type PromptForUserChoiceDecisionPayload struct {
-	DeliveryID      string                              `json:"delivery_id"`
-	QuestionAnswers []PromptForUserChoiceQuestionAnswer `json:"question_answers,omitempty"`
-	Cancelled       bool                                `json:"cancelled,omitempty"`
-	Reason          string                              `json:"reason,omitempty"`
-}
-
-// DeviceShutdownPayload tells the daemon why we're closing it (for log
-// lines / metrics on the daemon side). Optional.
-type DeviceShutdownPayload struct {
-	Reason string `json:"reason,omitempty"`
-}
-
 // ExecutionControls requires both values when supplied; omitting the block preserves agent options.
 // Send only to a peer advertising execution_controls, independently of older option capabilities.
 type ExecutionControls struct {
diff --git a/internal/agentdaemon/proto/prototest/capabilities.go b/internal/agentdaemon/proto/prototest/capabilities.go
index f3337682f..82afd39b5 100644
--- a/internal/agentdaemon/proto/prototest/capabilities.go
+++ b/internal/agentdaemon/proto/prototest/capabilities.go
@@ -14,7 +14,6 @@ func Capabilities(overrides proto.AgentKindCapabilities) proto.AgentKindCapabili
 	c := proto.AgentKindCapabilities{
 		SubagentObservations:           proto.CapabilityUnsupported,
 		Streaming:                      proto.CapabilityUnsupported,
-		Permissions:                    proto.CapabilityUnsupported,
 		Usage:                          proto.CapabilityUnsupported,
 		Resume:                         proto.CapabilityUnsupported,
 		NativeSessionRecovery:          proto.CapabilityUnsupported,
diff --git a/internal/agentdaemon/proto/tool_call_test.go b/internal/agentdaemon/proto/tool_call_test.go
new file mode 100644
index 000000000..d65d9d169
--- /dev/null
+++ b/internal/agentdaemon/proto/tool_call_test.go
@@ -0,0 +1,13 @@
+package proto
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestToolCallRejectsEngineSnapshot(t *testing.T) {
+	var call ToolCallPayload
+	if json.Unmarshal([]byte(`{"id":"tool","stage":"after","native_item":{"type":"commandExecution"}}`), &call) == nil {
+		t.Fatal("accepted engine-specific snapshot in common wire")
+	}
+}
diff --git a/internal/agentdaemon/proto/user_choice.go b/internal/agentdaemon/proto/user_choice.go
deleted file mode 100644
index 3c59f701f..000000000
--- a/internal/agentdaemon/proto/user_choice.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package proto
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"strings"
-)
-
-// UnmarshalJSON rejects fields outside the current decision contract, including
-// unrecognized fields nested inside question_answers. Do not silently discard an
-// answer from a peer using a different wire shape.
-func (p *PromptForUserChoiceDecisionPayload) UnmarshalJSON(raw []byte) error {
-	if raw = bytes.TrimSpace(raw); len(raw) == 0 || raw[0] != '{' {
-		return errors.New("user-choice decision must be an object")
-	}
-	type decision PromptForUserChoiceDecisionPayload
-	var value decision
-	decoder := json.NewDecoder(bytes.NewReader(raw))
-	decoder.DisallowUnknownFields()
-	if err := decoder.Decode(&value); err != nil {
-		return errors.New("invalid user-choice decision")
-	}
-	decoded := PromptForUserChoiceDecisionPayload(value)
-	if err := decoded.Validate(); err != nil {
-		return err
-	}
-	*p = decoded
-	return nil
-}
-
-// Validate checks answer identity independently of delivery correlation and
-// native question constraints. An empty answer array is an explicit non-answer.
-func (p PromptForUserChoiceDecisionPayload) Validate() error {
-	if p.Cancelled && len(p.QuestionAnswers) != 0 {
-		return errors.New("cancelled user-choice decision cannot contain answers")
-	}
-	seen := make(map[string]bool, len(p.QuestionAnswers))
-	for _, answer := range p.QuestionAnswers {
-		if strings.TrimSpace(answer.QuestionID) == "" || seen[answer.QuestionID] || answer.Answers == nil {
-			return errors.New("user-choice answers require unique question IDs and answer arrays")
-		}
-		seen[answer.QuestionID] = true
-	}
-	return nil
-}
-
-// AnswersFor binds a decision to the exact emitted question identities. It never
-// derives identity from a header, answer text or array position. Call it before
-// consuming the pending interaction or submitting a native response.
-func (p PromptForUserChoiceDecisionPayload) AnswersFor(questionIDs []string) (map[string][]string, error) {
-	if err := p.Validate(); err != nil {
-		return nil, err
-	}
-	known := make(map[string]bool, len(questionIDs))
-	for _, id := range questionIDs {
-		known[id] = true
-	}
-	answers := make(map[string][]string, len(p.QuestionAnswers))
-	for _, answer := range p.QuestionAnswers {
-		if !known[answer.QuestionID] {
-			return nil, errors.New("user-choice answer refers to an unknown question")
-		}
-		answers[answer.QuestionID] = answer.Answers
-	}
-	return answers, nil
-}
diff --git a/internal/agentdaemon/proto/user_choice_test.go b/internal/agentdaemon/proto/user_choice_test.go
deleted file mode 100644
index 74bfc55cf..000000000
--- a/internal/agentdaemon/proto/user_choice_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package proto
-
-import (
-	"encoding/json"
-	"reflect"
-	"testing"
-)
-
-func TestUserChoiceOnlyAcceptsCurrentAnswerShape(t *testing.T) {
-	for _, raw := range []string{
-		`null`,
-		`{"answers":["yes"]}`,
-		`{"question_answers":[{"header":"Question","answer":"yes"}]}`,
-		`{"question_answers":[{"question_id":"q","answers":["yes"],"answer":"no"}]}`,
-		`{"question_answers":[{"answers":["yes"]}]}`,
-		`{"question_answers":[{"question_id":"q","answers":null}]}`,
-		`{"question_answers":[{"question_id":"q","answers":["yes"]},{"question_id":"q","answers":["no"]}]}`,
-		`{"cancelled":true,"question_answers":[{"question_id":"q","answers":["yes"]}]}`,
-	} {
-		var decision PromptForUserChoiceDecisionPayload
-		if json.Unmarshal([]byte(raw), &decision) == nil {
-			t.Fatalf("accepted invalid decision: %s", raw)
-		}
-	}
-	var decision PromptForUserChoiceDecisionPayload
-	if err := json.Unmarshal([]byte(`{"delivery_id":"d","question_answers":[{"question_id":"b","answers":["two,three","four"]},{"question_id":"a","answers":[]}]}`), &decision); err != nil {
-		t.Fatal(err)
-	}
-	answers, err := decision.AnswersFor([]string{"a", "b"})
-	if err != nil || !reflect.DeepEqual(answers["b"], []string{"two,three", "four"}) || answers["a"] == nil {
-		t.Fatalf("answers=%v err=%v", answers, err)
-	}
-	if _, err := decision.AnswersFor([]string{"a"}); err == nil {
-		t.Fatal("accepted a foreign question ID")
-	}
-	if _, err := (PromptForUserChoiceDecisionPayload{Cancelled: true}).AnswersFor([]string{"a"}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestToolCallRejectsEngineSnapshot(t *testing.T) {
-	var call ToolCallPayload
-	if json.Unmarshal([]byte(`{"id":"tool","stage":"after","native_item":{"type":"commandExecution"}}`), &call) == nil {
-		t.Fatal("accepted engine-specific snapshot in common wire")
-	}
-}
diff --git a/internal/agentdaemon/proto/version.go b/internal/agentdaemon/proto/version.go
index 9ff1c71ec..101fd8dd3 100644
--- a/internal/agentdaemon/proto/version.go
+++ b/internal/agentdaemon/proto/version.go
@@ -2,7 +2,7 @@ package proto
 
 // Version identifies the complete Core–Runtime wire contract. Change it when
 // removing or changing a payload or its semantics; deploy both endpoints together.
-const Version = "0.11.0"
+const Version = "0.12.0"
 
 // VersionCompatible accepts only this contract. Patch drift, prerelease suffixes
 // and malformed versions do not select an implicit compatibility path.
diff --git a/services/core/internal/api/turn_diagnostic_failure.go b/services/core/internal/api/turn_diagnostic_failure.go
index 4449831de..1f2081511 100644
--- a/services/core/internal/api/turn_diagnostic_failure.go
+++ b/services/core/internal/api/turn_diagnostic_failure.go
@@ -49,7 +49,7 @@ func turnDiagnosticFailure(turn sessions.Turn) *DiagnosticFailure {
 		code = "delivery_unconfirmed"
 	case "invalid_input", "input_not_applied", "message_input_unsupported", "input_invalid_input", "input_run_inactive", "input_input_conflict", "input_input_limit", "input_unsupported", "input_rejected", "input_not_ready", "input_busy":
 		code = "input_rejected"
-	case "invalid_executor_result", "interaction_not_supported", "execution_state_unavailable", "execution_state_changed", "function_call_invalid", "function_result_invalid":
+	case "invalid_executor_result", "execution_state_unavailable", "execution_state_changed", "function_call_invalid", "function_result_invalid":
 		code = "executor_protocol_error"
 	case "event_persistence_failed", "artifact_capture_failed":
 		code = "core_storage_failed"
diff --git a/services/core/internal/api/turn_diagnostic_failure_test.go b/services/core/internal/api/turn_diagnostic_failure_test.go
index 0cffe47e1..8fe650ca2 100644
--- a/services/core/internal/api/turn_diagnostic_failure_test.go
+++ b/services/core/internal/api/turn_diagnostic_failure_test.go
@@ -14,7 +14,7 @@ func TestDiagnosticFailureWhitelist(t *testing.T) {
 		"harness_error": {"engine_failed"}, "model_provider_required": {"model_provider_required"}, "runtime_unavailable": {"execution_device_unavailable", "execution_unavailable"}, "runtime_disconnected": {"device_disconnected", "event_stream_incomplete"}, "runtime_preparation_failed": {"preparation_start_failed", "preparation_interrupted"}, "execution_interrupted": {"execution_interrupted"},
 		"delivery_unconfirmed":    {"delivery_unknown", "input_outcome_unknown", "cancel_unconfirmed", "cancel_outcome_unavailable", "function_result_unconfirmed"},
 		"input_rejected":          {"invalid_input", "input_not_applied", "message_input_unsupported", "input_invalid_input", "input_run_inactive", "input_input_conflict", "input_input_limit", "input_unsupported", "input_rejected", "input_not_ready", "input_busy"},
-		"executor_protocol_error": {"invalid_executor_result", "interaction_not_supported", "execution_state_unavailable", "execution_state_changed", "function_call_invalid", "function_result_invalid"}, "core_storage_failed": {"event_persistence_failed", "artifact_capture_failed"}, "internal_error": {"secret-canary", "input_secret-canary", "execution_state_secret-canary", ""},
+		"executor_protocol_error": {"invalid_executor_result", "execution_state_unavailable", "execution_state_changed", "function_call_invalid", "function_result_invalid"}, "core_storage_failed": {"event_persistence_failed", "artifact_capture_failed"}, "internal_error": {"secret-canary", "input_secret-canary", "execution_state_secret-canary", ""},
 	}
 	catalog, err := os.ReadFile("../../../../contracts/agents-api/core-errors.md")
 	if err != nil {
diff --git a/services/core/internal/execution/delivery.go b/services/core/internal/execution/delivery.go
index 70b9c331f..35b4c828b 100644
--- a/services/core/internal/execution/delivery.go
+++ b/services/core/internal/execution/delivery.go
@@ -250,9 +250,6 @@ func (d *Dispatcher) deliver(ctx context.Context, tenantID, sessionID string, pe
 						return
 					}
 				}
-			case proto.TypePermissionRequest, proto.TypePromptForUserChoice:
-				result.ErrorCode = "interaction_not_supported"
-				return
 			}
 		case <-ticker.C:
 			select {
diff --git a/services/core/internal/runtimedevice/state.go b/services/core/internal/runtimedevice/state.go
index 0d0cf69a0..73f917dc1 100644
--- a/services/core/internal/runtimedevice/state.go
+++ b/services/core/internal/runtimedevice/state.go
@@ -62,7 +62,6 @@ type HeartbeatStatus struct {
 type KindCapabilities struct {
 	SubagentObservations  bool `json:"subagent_observations,omitempty"`
 	Streaming             bool `json:"streaming,omitempty"`
-	Permissions           bool `json:"permissions,omitempty"`
 	Usage                 bool `json:"usage,omitempty"`
 	Resume                bool `json:"resume,omitempty"`
 	NativeSessionRecovery bool `json:"native_session_recovery,omitempty"`
diff --git a/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go b/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
index a4b7d2ea1..c0cfe329f 100644
--- a/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
+++ b/services/core/internal/runtimegateway/mcp_bearer_live_linux_test.go
@@ -60,26 +60,35 @@ func TestLiveMCPBearerGatewayColdContinuation(t *testing.T) {
 	mcpBearerStartDaemon(t, root, daemon, native, provider, fixture.caFile, server.URL, id, runner, capture)
 	ctx, cancel := context.WithTimeout(t.Context(), 6*time.Minute)
 	defer cancel()
-	peer, err := registry.WaitForDevice(ctx, id, 30*time.Second)
-	if err != nil {
-		t.Fatal("built daemon did not connect through the real gateway")
-	}
-	t.Cleanup(func() { peer.Close("owned MCP acceptance finished") })
-	ready := time.Now().Add(30 * time.Second)
-	for {
-		info, found, known := peer.AgentKindStatus("codex")
-		if known && found && info.Available {
-			if !info.Capabilities.MCPHTTPTools || !info.Capabilities.MCPHTTPBearerAuth || !info.Capabilities.ToolObservations || !info.Capabilities.DurableTurns || !info.Capabilities.EnvironmentNone {
-				t.Fatal("built daemon did not advertise the required private execution capabilities")
-			}
-			proof["codex_descriptor"] = info
-			break
+	var peer *Session
+	t.Cleanup(func() {
+		if peer != nil {
+			peer.Close("owned MCP acceptance finished")
+		}
+	})
+	connect := func() {
+		t.Helper()
+		var err error
+		if peer, err = registry.WaitForDevice(ctx, id, 30*time.Second); err != nil {
+			t.Fatal("built daemon did not connect through the real gateway")
 		}
-		if time.Now().After(ready) {
-			t.Fatal("pinned Codex capability discovery did not complete")
+		ready := time.Now().Add(30 * time.Second)
+		for {
+			info, found, known := peer.AgentKindStatus("codex")
+			if known && found && info.Available {
+				if !info.Capabilities.MCPHTTPTools || !info.Capabilities.MCPHTTPBearerAuth || !info.Capabilities.ToolObservations || !info.Capabilities.DurableTurns || !info.Capabilities.EnvironmentNone {
+					t.Fatal("built daemon did not advertise the required private execution capabilities")
+				}
+				proof["codex_descriptor"] = info
+				return
+			}
+			if time.Now().After(ready) {
+				t.Fatal("pinned Codex capability discovery did not complete")
+			}
+			time.Sleep(50 * time.Millisecond)
 		}
-		time.Sleep(50 * time.Millisecond)
 	}
+	connect()
 	allowed, anonymousTools := []string{"remember", "fail"}, []string{"ping"}
 	servers := []proto.MCPHTTPServer{{ConnectionOrigin: "service", ServerLabel: "private_mcp", ServerURL: fixture.private.URL, AllowedTools: &allowed, BearerToken: &token}, {ConnectionOrigin: "service", ServerLabel: "anonymous_mcp", ServerURL: fixture.anonymous.URL, AllowedTools: &anonymousTools}}
 	run := func(prompt, resume string, expected map[string]string) *mcpBearerTurn {
@@ -119,8 +128,10 @@ func TestLiveMCPBearerGatewayColdContinuation(t *testing.T) {
 		defer peer.Unsubscribe(runID)
 		send(proto.TypeExecutionStart, prepareID, proto.ExecutionStartPayload{Handle: ready.Handle, ExecutorID: ready.ExecutorID, RunID: runID, Input: proto.TextInput(prompt)})
 		mcpBearerCollectTurn(t, ctx, sub, runID, turn, expected, token, provider)
-		// The Executor stays warm after Done; closing it makes the next Turn a cold continuation.
-		send(proto.TypeDeviceShutdown, "", proto.DeviceShutdownPayload{Reason: "cold continuation"})
+		// The Executor stays warm after Done. Reconnecting gives the daemon a fresh
+		// Router and closes the Executor, so the next Turn is a cold continuation.
+		peer.Close("cold continuation")
+		connect()
 		turn.NativeLaunches = mcpBearerReleased(t, root)
 		turn.BearerEnvironmentReference = mcpBearerConfigReference(t, root, token)
 		return turn
@@ -170,8 +181,8 @@ func mcpBearerCollectTurn(t *testing.T, ctx context.Context, sub *Subscription,
 		}
 		turn.Events = append(turn.Events, event)
 		switch event.Type {
-		case proto.TypeError, proto.TypePermissionRequest, proto.TypePromptForUserChoice:
-			t.Fatal("unexpected execution failure or interaction during private MCP acceptance")
+		case proto.TypeError:
+			t.Fatal("unexpected execution failure during private MCP acceptance")
 		case proto.TypeToolCall:
 			var call proto.ToolCallPayload
 			if event.DecodePayload(&call) != nil || call.Observation == nil {
diff --git a/services/core/internal/runtimegateway/registry.go b/services/core/internal/runtimegateway/registry.go
index 74de0139d..b5984821e 100644
--- a/services/core/internal/runtimegateway/registry.go
+++ b/services/core/internal/runtimegateway/registry.go
@@ -1,7 +1,7 @@
 // Package gateway is the server-side hub of the agent_daemon connector.
 // It owns the HTTP / WebSocket entry points the daemon dials in to,
 // per-device long-lived WebSocket sessions, and a process-local
-// registry of deviceID/runID/permID → Session for routing.
+// registry of deviceID/runID → Session for routing.
 //
 // The package deliberately does NOT depend on the connector
 // implementation — the connector imports it, not the other way around.
@@ -18,31 +18,18 @@ import (
 // asks for a device the gateway has no live session for.
 var ErrDeviceNotRegistered = errors.New("agentdaemon gateway: device not registered (offline / never connected)")
 
-// ErrPermissionNotRegistered is returned when SubmitPermission arrives
-// for a perm id we don't have a pending mapping for.
-var ErrPermissionNotRegistered = errors.New("agentdaemon gateway: permission id not registered (expired / unknown)")
-
-// ErrPromptForUserChoiceNotRegistered is returned when
-// SubmitPromptForUserChoice arrives for an ask id we don't have a
-// pending mapping for. Same race semantics as the permission variant
-// (cancelled / expired / never seen).
-var ErrPromptForUserChoiceNotRegistered = errors.New("agentdaemon gateway: prompt_for_user_choice id not registered (expired / unknown)")
-
 // ErrWaitForDeviceTimeout is returned by WaitForDevice when the
 // deadline expires before a daemon dials in.
 var ErrWaitForDeviceTimeout = errors.New("agentdaemon gateway: timed out waiting for device to register")
 
 // Registry is the process-wide map of live daemon sessions. It is
 // concurrency-safe; readers and writers live in different goroutines.
-// Four O(1) indexes are maintained: byDevice (primary), byRun (per
-// Subscribe), byPerm (per permission_request), byAsk (per
-// prompt_for_user_choice).
+// Two O(1) indexes are maintained: byDevice (primary) and byRun (per
+// Subscribe).
 type Registry struct {
 	mu       sync.RWMutex
 	byDevice map[string]*Session
 	byRun    map[string]*Session
-	byPerm   map[string]*Session
-	byAsk    map[string]*Session
 
 	// waiters holds buffered(1) channels that WaitForDevice callers
 	// are blocked on. Register drains the slice the moment a session
@@ -58,15 +45,13 @@ func NewRegistry() *Registry {
 	return &Registry{
 		byDevice: map[string]*Session{},
 		byRun:    map[string]*Session{},
-		byPerm:   map[string]*Session{},
-		byAsk:    map[string]*Session{},
 		waiters:  map[string][]chan *Session{},
 	}
 }
 
 // Register adds a freshly-upgraded session under its deviceID. The
 // latest dial-in wins: if a session was already registered for that
-// device, the old one's run/perm indexes are evicted (the caller
+// device, the old one's run index entries are evicted (the caller
 // closes the displaced *Session).
 func (r *Registry) Register(sess *Session) (previous *Session) {
 	r.mu.Lock()
@@ -80,16 +65,6 @@ func (r *Registry) Register(sess *Session) (previous *Session) {
 				delete(r.byRun, runID)
 			}
 		}
-		for permID, s := range r.byPerm {
-			if s == previous {
-				delete(r.byPerm, permID)
-			}
-		}
-		for askID, s := range r.byAsk {
-			if s == previous {
-				delete(r.byAsk, askID)
-			}
-		}
 	}
 	r.byDevice[sess.DeviceID] = sess
 
@@ -123,16 +98,6 @@ func (r *Registry) Deregister(sess *Session) {
 			delete(r.byRun, runID)
 		}
 	}
-	for permID, s := range r.byPerm {
-		if s == sess {
-			delete(r.byPerm, permID)
-		}
-	}
-	for askID, s := range r.byAsk {
-		if s == sess {
-			delete(r.byAsk, askID)
-		}
-	}
 }
 
 // LookupDevice returns the registered session for a device, or
@@ -175,74 +140,6 @@ func (r *Registry) DetachRun(runID string) {
 	delete(r.byRun, runID)
 }
 
-// AttachPermission records a permID -> session mapping so a later
-// SubmitPermission can route the decision frame to the right device.
-func (r *Registry) AttachPermission(permID string, sess *Session) {
-	if permID == "" || sess == nil {
-		return
-	}
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	r.byPerm[permID] = sess
-}
-
-// DetachPermission clears the permID -> session mapping. Idempotent.
-func (r *Registry) DetachPermission(permID string) {
-	if permID == "" {
-		return
-	}
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	delete(r.byPerm, permID)
-}
-
-// LookupPermission returns the session that owns a pending permID,
-// or ErrPermissionNotRegistered when the permission has expired /
-// been cancelled.
-func (r *Registry) LookupPermission(permID string) (*Session, error) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	if sess, ok := r.byPerm[permID]; ok {
-		return sess, nil
-	}
-	return nil, ErrPermissionNotRegistered
-}
-
-// AttachPromptForUserChoice records askID → session so a later
-// SubmitPromptForUserChoice can route the decision back to the right
-// daemon. Mirrors AttachPermission.
-func (r *Registry) AttachPromptForUserChoice(askID string, sess *Session) {
-	if askID == "" || sess == nil {
-		return
-	}
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	r.byAsk[askID] = sess
-}
-
-// DetachPromptForUserChoice clears the askID → session mapping.
-// Idempotent.
-func (r *Registry) DetachPromptForUserChoice(askID string) {
-	if askID == "" {
-		return
-	}
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	delete(r.byAsk, askID)
-}
-
-// LookupPromptForUserChoice returns the session that owns a pending
-// askID, or ErrPromptForUserChoiceNotRegistered when the ask has
-// expired or been cancelled.
-func (r *Registry) LookupPromptForUserChoice(askID string) (*Session, error) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	if sess, ok := r.byAsk[askID]; ok {
-		return sess, nil
-	}
-	return nil, ErrPromptForUserChoiceNotRegistered
-}
-
 // Devices returns a snapshot of registered device ids in arbitrary order.
 func (r *Registry) Devices() []string {
 	r.mu.RLock()
diff --git a/services/core/internal/runtimegateway/session.go b/services/core/internal/runtimegateway/session.go
index 7ae93c4d0..6e7f0f707 100644
--- a/services/core/internal/runtimegateway/session.go
+++ b/services/core/internal/runtimegateway/session.go
@@ -34,7 +34,7 @@ var (
 	WriteTimeout = 10 * time.Second
 
 	// InteractionAckTimeout bounds the application-level round trip for a
-	// permission or user-input decision after it is written to the daemon.
+	// function result or cancellation after it is written to the daemon.
 	InteractionAckTimeout = 15 * time.Second
 
 	// ReadLimit caps a single inbound frame at 4 MiB. tool_call
@@ -302,8 +302,8 @@ func (s *Session) Send(ctx context.Context, env proto.Envelope) error {
 
 // SendAndWaitInteractionAck sends a decision and waits until the daemon
 // confirms that its agent session applied it. Queueing or writing the
-// WebSocket frame alone is not success: without this receipt the canonical
-// database interaction must remain retryable.
+// WebSocket frame alone is not success: without this receipt the durable
+// delivery must remain retryable.
 func (s *Session) SendAndWaitInteractionAck(ctx context.Context, env proto.Envelope, deliveryID string) (proto.InteractionDecisionAckPayload, error) {
 	deliveryID = strings.TrimSpace(deliveryID)
 	if deliveryID == "" {
@@ -336,7 +336,7 @@ func (s *Session) SendAndWaitInteractionAck(ctx context.Context, env proto.Envel
 	case <-waitCtx.Done():
 		// If the ack raced the deadline, prefer the application receipt;
 		// treating an already-applied decision as retryable can trigger a
-		// contradictory second human response.
+		// contradictory second response.
 		select {
 		case ack := <-waiter:
 			return ack, nil
@@ -504,7 +504,6 @@ func deviceKindsFromHeartbeat(p proto.HeartbeatPayload) []runtimedevice.Supporte
 			Version:   info.Version,
 			Capabilities: runtimedevice.KindCapabilities{
 				Streaming:             info.Capabilities.Streaming.IsSupported(),
-				Permissions:           info.Capabilities.Permissions.IsSupported(),
 				Usage:                 info.Capabilities.Usage.IsSupported(),
 				Resume:                info.Capabilities.Resume.IsSupported(),
 				Steering:              info.Capabilities.Steering.IsSupported(),
@@ -563,29 +562,6 @@ func (s *Session) dispatch(env proto.Envelope) {
 	case proto.TypeHeartbeat:
 		s.handleHeartbeat(env)
 		return
-	case proto.TypePermissionRequest:
-		var p proto.PermissionRequestPayload
-		requestID := ""
-		if err := env.DecodePayload(&p); err == nil {
-			requestID = strings.TrimSpace(p.RequestID)
-		}
-		if requestID == "" {
-			return
-		}
-		s.reg.AttachPermission(requestID, s)
-	case proto.TypePermissionCancel:
-		if env.ID != "" {
-			s.reg.DetachPermission(env.ID)
-		}
-	case proto.TypePromptForUserChoice:
-		// env.ID is the run id (so the fan path below delivers this
-		// frame to the run's subscriber). The ask id rides on the
-		// payload — pull it out so SubmitPromptForUserChoice can find
-		// the session by ask id via the byAsk index.
-		var p proto.PromptForUserChoicePayload
-		if err := env.DecodePayload(&p); err == nil && p.AskID != "" {
-			s.reg.AttachPromptForUserChoice(p.AskID, s)
-		}
 	case proto.TypeInteractionDecisionAck:
 		var ack proto.InteractionDecisionAckPayload
 		if err := env.DecodePayload(&ack); err != nil {
@@ -606,9 +582,7 @@ func (s *Session) dispatch(env proto.Envelope) {
 		return
 	}
 
-	// All run-correlated frames fan to the matching subscriber. Current
-	// permission and prompt-for-user-choice frames keep their interaction ID
-	// in the payload so Envelope.ID remains the run ID.
+	// All run-correlated frames fan to the matching subscriber.
 	if env.ID == "" {
 		return
 	}
diff --git a/services/core/internal/runtimegateway/session_test.go b/services/core/internal/runtimegateway/session_test.go
index 9990ef097..71eaca263 100644
--- a/services/core/internal/runtimegateway/session_test.go
+++ b/services/core/internal/runtimegateway/session_test.go
@@ -162,21 +162,17 @@ func TestRegistry_RegisterReplacesAndEvictsRuns(t *testing.T) {
 	old := NewSession(newFakeConn(), "dev-1", "wks-1", "0.1.0", reg, nil)
 	reg.Register(old)
 	reg.AttachRun("run-1", old)
-	reg.AttachPermission("perm-1", old)
 
 	new := NewSession(newFakeConn(), "dev-1", "wks-1", "0.1.0", reg, nil)
 	prev := reg.Register(new)
 	if prev != old {
 		t.Fatalf("expected old session as displaced previous, got %p", prev)
 	}
-	// Old session's run/perm indexes must be cleared so a stale
+	// Old session's run index must be cleared so a stale
 	// Cancel can't be routed to the wrong session.
 	if got := reg.LookupRun("run-1"); got != nil {
 		t.Fatalf("expected run-1 mapping cleared, got %p", got)
 	}
-	if _, err := reg.LookupPermission("perm-1"); !errors.Is(err, ErrPermissionNotRegistered) {
-		t.Fatalf("expected perm-1 cleared, got %v", err)
-	}
 }
 
 func TestRegistry_DeregisterPreservesNewer(t *testing.T) {
@@ -257,48 +253,6 @@ func TestSession_DoneFrameAutoUnsubscribes(t *testing.T) {
 	}
 }
 
-func TestSession_PermissionRequestIndexedInRegistry(t *testing.T) {
-	reg := NewRegistry()
-	conn := newFakeConn()
-	sess := NewSession(conn, "dev-1", "wks-1", "0.1.0", reg, nil)
-	sess.Start()
-	defer sess.Close("test done")
-
-	sub, err := sess.SubscribeDurable("run-1")
-	ch := sub.Events
-	if err != nil {
-		t.Fatalf("subscribe: %v", err)
-	}
-	env, _ := proto.NewEnvelope(proto.TypePermissionRequest, "run-1", proto.PermissionRequestPayload{
-		RequestID: "perm-abc",
-		Tool:      "Bash",
-		Title:     "rm -rf /tmp/scratch",
-	})
-	raw, _ := jsonMarshal(env)
-	conn.Feed(raw)
-
-	// Poll because the read loop is async.
-	deadline := time.Now().Add(2 * time.Second)
-	for {
-		if got, err := reg.LookupPermission("perm-abc"); err == nil && got == sess {
-			break
-		}
-		if time.Now().After(deadline) {
-			t.Fatal("perm-abc never indexed in registry")
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-
-	select {
-	case got := <-ch:
-		if got.ID != "run-1" || got.Type != proto.TypePermissionRequest {
-			t.Fatalf("subscriber received %+v", got)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("run subscriber never received permission request")
-	}
-}
-
 func TestSession_CloseReportsUnknownWithoutExecutionEvents(t *testing.T) {
 	sess := NewSession(newFakeConn(), "device", "tenant", proto.Version, NewRegistry(), nil)
 	sub, err := sess.SubscribeDurable("run")
@@ -390,10 +344,9 @@ func TestSession_HeartbeatPersistsSupportedAgentKinds(t *testing.T) {
 				Available: true,
 				Version:   "1.2.3",
 				Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{
-					Streaming:   proto.CapabilitySupported,
-					Permissions: proto.CapabilitySupported,
-					Usage:       proto.CapabilitySupported,
-					Resume:      proto.CapabilitySupported,
+					Streaming: proto.CapabilitySupported,
+					Usage:     proto.CapabilitySupported,
+					Resume:    proto.CapabilitySupported,
 				}),
 			},
 			{
@@ -418,7 +371,7 @@ func TestSession_HeartbeatPersistsSupportedAgentKinds(t *testing.T) {
 		byKind[info.Kind] = info
 	}
 	claude := byKind["fake_alpha"]
-	if !claude.Available || claude.Version != "1.2.3" || !claude.Capabilities.Permissions || !claude.Capabilities.Usage || !claude.Capabilities.Resume {
+	if !claude.Available || claude.Version != "1.2.3" || !claude.Capabilities.Streaming || !claude.Capabilities.Usage || !claude.Capabilities.Resume {
 		t.Fatalf("fake_alpha descriptor not converted: %#v", claude)
 	}
 	fake_beta := byKind["fake_beta"]
@@ -453,32 +406,6 @@ func TestSession_HeartbeatDoesNotInferCapabilities(t *testing.T) {
 	}
 }
 
-func TestSession_PermissionRequiresPayloadIdentity(t *testing.T) {
-	reg := NewRegistry()
-	sess := NewSession(newFakeConn(), "device", "tenant", proto.Version, reg, nil)
-	defer sess.Close("test done")
-	sub, err := sess.SubscribeDurable("run")
-	if err != nil {
-		t.Fatal(err)
-	}
-	env, _ := proto.NewEnvelope(proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{Tool: "test"})
-	sess.dispatch(env)
-	if _, err := reg.LookupPermission("run"); !errors.Is(err, ErrPermissionNotRegistered) {
-		t.Fatal("run ID was treated as an interaction ID")
-	}
-	if len(sub.Events) != 0 {
-		t.Fatal("invalid permission request was forwarded")
-	}
-	env, _ = proto.NewEnvelope(proto.TypePermissionRequest, "run", proto.PermissionRequestPayload{RequestID: "permission", Tool: "test"})
-	sess.dispatch(env)
-	if got, err := reg.LookupPermission("permission"); err != nil || got != sess {
-		t.Fatalf("declared interaction identity was not registered: %v", err)
-	}
-	if got := <-sub.Events; got.ID != "run" {
-		t.Fatal("run correlation lost")
-	}
-}
-
 // jsonMarshal aliases encoding/json.Marshal so call sites read cleanly.
 func jsonMarshal(v any) ([]byte, error) {
 	return json.Marshal(v)
diff --git a/services/core/tests/integration/runtime_compute_lifecycle_test.go b/services/core/tests/integration/runtime_compute_lifecycle_test.go
index 7d3286718..c6949a6de 100644
--- a/services/core/tests/integration/runtime_compute_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_compute_lifecycle_test.go
@@ -216,9 +216,6 @@ func (p *fakeCheckpointProvider) connect(ctx context.Context, b sandbox.Bootstra
 				}
 				continue
 			}
-			if env.Type == proto.TypeDeviceShutdown {
-				return
-			}
 			if env.Type != proto.TypeEnvironmentQuiesce && env.Type != proto.TypeEnvironmentResume {
 				p.mu.Lock()
 				p.promptFrames.Add(1)

From a02ff8e7fa6219c9eca90e2d4f947c4d9ad57f64 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 21:34:07 +0800
Subject: [PATCH 28/60] fix(ci): restore structured Feishu review cards (#492)

---
 .github/workflows/ci-review.yml |  6 +--
 docs/maintainers.md             |  2 +-
 docs/zh/maintainers.md          |  4 +-
 scripts/ci_review.py            | 96 ++++++++++++++++++++-------------
 scripts/ci_review_test.py       | 56 +++++++++++++++----
 5 files changed, 112 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/ci-review.yml b/.github/workflows/ci-review.yml
index 2f328e429..2bc1069bd 100644
--- a/.github/workflows/ci-review.yml
+++ b/.github/workflows/ci-review.yml
@@ -48,7 +48,7 @@ jobs:
           persist-credentials: false
       - name: Prepare the report schema
         id: schema
-        run: python3 scripts/ci_review.py schema >> "$GITHUB_OUTPUT"
+        run: python3 scripts/ci_review.py schema "${{ matrix.kind }}" >> "$GITHUB_OUTPUT"
       - name: Review with Claude Code
         id: llm
         continue-on-error: true
@@ -78,7 +78,7 @@ jobs:
 
             ${{ matrix.instructions }}
 
-            按 JSON schema 返回中文报告。status 为 ok（未发现问题）、issues（发现有证据的问题）或 incomplete（审查失败、范围未检查完整或检查结果尚未完成）。有问题且仍有未检查项时，用 issues 并在 summary 中说明缺项。summary 无问题时简短，有问题时保留依据和建议，遵守 schema 的长度限制。
+            按 JSON schema 返回中文报告。status 为 ok（未发现问题）、issues（发现有证据的问题）或 incomplete（审查失败、范围未检查完整或检查结果尚未完成）。有问题且仍有未检查项时，用 issues 并在对应字段中说明缺项。按 schema 把各项结论分别填入字段，不要重复标题；changes 用 1–3 条 Markdown 列表，其他字段无问题时一句话，有问题时保留依据和建议，遵守各字段长度限制。
             围绕本次 diff 和受影响的文档展开，证据充分后输出结果，避免重复核对同一结论。
             只读审查，不修改仓库，不触发新的 CI，不发送消息。两份报告会由后续 job 合并发送。
           claude_args: >-
@@ -89,7 +89,7 @@ jobs:
         env:
           REVIEW_OUTCOME: ${{ steps.llm.outcome }}
           REVIEW_RESULT: ${{ steps.llm.outputs.structured_output }}
-        run: python3 scripts/ci_review.py collect "$RUNNER_TEMP/review-${{ matrix.kind }}.json"
+        run: python3 scripts/ci_review.py collect "${{ matrix.kind }}" "$RUNNER_TEMP/review-${{ matrix.kind }}.json"
       - uses: actions/upload-artifact@v6
         if: always()
         with:
diff --git a/docs/maintainers.md b/docs/maintainers.md
index 7f3ac6626..a410ad2d1 100644
--- a/docs/maintainers.md
+++ b/docs/maintainers.md
@@ -194,7 +194,7 @@ Use **Actions → core-check → Run workflow** for a manual full check. For a t
 
 The `CI review and Feishu notification` workflow runs after a PR merges into main. A matrix runs **Code review** and **Docs review** in independent LLM contexts with `fail-fast: false`. Both read the merged commit and PR diff. Code review checks implementation, repository rules and existing CI results; it does not start another test run. Docs review checks changed behavior against documentation even when no docs changed. When docs change, it also checks contradictions, duplicated facts, topic ownership under CONTRIBUTING, and English/Chinese agreement. Findings include file and line references, supporting evidence and a minimal correction. Reviews read the repository without editing it.
 
-Each review returns a structured result (`ok`, `issues` or `incomplete`) and a Chinese summary, retained as an Actions artifact for seven days. **Combined Feishu notification** waits for both jobs and sends one Card 2.0 message containing both results through the existing `FEISHU_WEBHOOK_URL`; `FEISHU_WEBHOOK_SECRET` optionally signs it. Only this notification job receives the webhook secrets. Failed, missing or invalid reports appear as incomplete, alongside any available result from the other review. The notification job runs even when a review fails. Delivery requires Feishu's `code=0` response; a failed or ambiguous request is not automatically retried, avoiding duplicate messages. Each review has a 25-minute execution timeout. Review and delivery failures do not block merges, and closing an unmerged PR does not trigger this workflow. The workflow checks out only the merged commit with notification credentials.
+Each review returns a structured result (`ok`, `issues` or `incomplete`) and Chinese sections, retained as an Actions artifact for seven days. **Combined Feishu notification** waits for both jobs and sends one Card 2.0 message containing both results through the existing `FEISHU_WEBHOOK_URL`; `FEISHU_WEBHOOK_SECRET` optionally signs it. The card uses fixed sections for PR details, behavior changes, code and repository rules, CI results, and documentation review, separated by dividers. Its header shows green for no findings, red for findings, and yellow for an incomplete review without findings. Only this notification job receives the webhook secrets. Failed, missing or invalid reports appear as incomplete, alongside any available result from the other review. The notification job runs even when a review fails. Delivery requires Feishu's `code=0` response; a failed or ambiguous request is not automatically retried, avoiding duplicate messages. Each review has a 25-minute execution timeout. Review and delivery failures do not block merges, and closing an unmerged PR does not trigger this workflow. The workflow checks out only the merged commit with notification credentials.
 
 Browser jobs own separate fixtures and servers; increasing workers against the shared mutable fixture is unsafe. Failed browser jobs retain reports/traces for seven days. Native failure phase summaries are retained for seven days and detailed output stays in the Actions logs; credentials and temporary installation trees are not uploaded. Successful native archives are uploaded only for explicit manual packaging or releases, without recompressing the compressed archive. Release distribution artifacts retain their existing recovery policy; failed publication can reuse the original build as described above.
 
diff --git a/docs/zh/maintainers.md b/docs/zh/maintainers.md
index 6fb303605..f6b2b17e3 100644
--- a/docs/zh/maintainers.md
+++ b/docs/zh/maintainers.md
@@ -1,7 +1,7 @@
 ---
 title: "构建并发布 OpenAgentCore"
 source: docs/maintainers.md
-source_hash: e3435d01696a172a0a0bcd5acecf4167410389f2c249730c9333f5d24027248d
+source_hash: aaadeb3a5e99b8d926e9f78b7fc41c7aba808e0d2af58969119e67954f9d7a58
 ---
 
 本指南面向负责构建和发布 OpenAgentCore 的维护者。要安装 Core 和 Web，请使用 [安装指南](getting-started/install.md)。安装器代码遵循的规则见 [部署](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/README.md) 和 [节点安装器](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/deploy/node/README.md)；必需检查见 [CONTRIBUTING](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#required-checks)。
@@ -198,7 +198,7 @@ Go 模块和工作区输入会选择后端、API（包括容器）、原生和
 
 `CI review and Feishu notification` 工作流在 PR 合入 main 后运行。矩阵中的 **Code review** 和 **Docs review** 使用独立的 LLM 上下文，并设置 `fail-fast: false`。两者读取合并后的提交和 PR 差异。代码审查检查实现、仓库规则和已有 CI 结果，不触发新一轮测试。文档审查会核对行为变化与文档是否一致，即使没有修改文档；修改文档时，还会检查矛盾、重复维护的事实、CONTRIBUTING 规定的主题归属及中英文含义。每项问题包含文件和行号、依据及最小修改建议。审查只读取仓库，不修改文件。
 
-每项审查返回结构化结果（`ok`、`issues` 或 `incomplete`）及中文摘要，作为 Actions 构建产物保留七天。**Combined Feishu notification** 等待两项审查结束，通过已有的 `FEISHU_WEBHOOK_URL` 发送一张包含两份结果的 Card 2.0 卡片；可选的 `FEISHU_WEBHOOK_SECRET` 用于签名。只有通知 job 能读取 webhook 密钥。审查失败、报告缺失或格式无效时标为未完成，另一项已有的结果照常展示。某项审查失败时，通知 job 仍会运行。只有飞书返回 `code=0` 才确认送达；请求失败或送达状态不明时不自动重试，以免重复发消息。每项审查的执行超时为 25 分钟。审查和发送失败不会阻止合并；关闭未合并的 PR 不触发此流程。持有通知凭据时，工作流只检出合并后的提交。
+每项审查返回结构化结果（`ok`、`issues` 或 `incomplete`）及分项中文结论，作为 Actions 构建产物保留七天。**Combined Feishu notification** 等待两项审查结束，通过已有的 `FEISHU_WEBHOOK_URL` 发送一张包含两份结果的 Card 2.0 卡片；可选的 `FEISHU_WEBHOOK_SECRET` 用于签名。卡片固定分为 PR 信息、行为变化、代码与仓库规则、CI 结果和文档审查，各区之间使用分隔线。未发现问题时标题为绿色，发现问题时为红色，审查未完成且尚未发现问题时为黄色。只有通知 job 能读取 webhook 密钥。审查失败、报告缺失或格式无效时标为未完成，另一项已有的结果照常展示。某项审查失败时，通知 job 仍会运行。只有飞书返回 `code=0` 才确认送达；请求失败或送达状态不明时不自动重试，以免重复发消息。每项审查的执行超时为 25 分钟。审查和发送失败不会阻止合并；关闭未合并的 PR 不触发此流程。持有通知凭据时，工作流只检出合并后的提交。
 
 浏览器作业各自拥有独立的固定数据和服务；对共享可变固定数据增加 worker 数不安全。失败的浏览器作业保留报告与 trace 七天。原生失败阶段摘要保留七天，详细输出留在 Actions 日志中；凭据和临时安装目录不上传。成功的原生归档仅用于显式手动打包或发布时上传，不重新压缩已压缩的归档。发布分发产物保留现有恢复策略；失败发布可以按前述方式复用原构建。
 
diff --git a/scripts/ci_review.py b/scripts/ci_review.py
index a6b97b887..e7fb16645 100644
--- a/scripts/ci_review.py
+++ b/scripts/ci_review.py
@@ -15,46 +15,50 @@
 
 
 STATUSES = {"ok": "未发现问题", "issues": "发现问题", "incomplete": "未完成"}
-MAX_SUMMARY = 2000
-SCHEMA = {
-    "type": "object",
-    "properties": {
-        "status": {"type": "string", "enum": list(STATUSES)},
-        "summary": {"type": "string", "minLength": 1, "maxLength": MAX_SUMMARY},
-    },
-    "required": ["status", "summary"],
-    "additionalProperties": False,
+MAX_SECTION = 900
+REPORT_FIELDS = {
+    "code": {"changes": "实际行为变化，1–3 条 Markdown 列表", "review": "代码正确性与仓库规则审查结论", "ci": "已有 CI 结果；失败或未完成时给出具体检查项"},
+    "docs": {"consistency": "文档与代码一致性", "organization": "文档矛盾、重复与归属；未改文档时写本次未修改文档"},
 }
 
 
-def incomplete(reason):
-    return {"status": "incomplete", "summary": reason}
+def report_schema(kind):
+    properties = {"status": {"type": "string", "enum": list(STATUSES)}}
+    properties.update({name: {"type": "string", "minLength": 1, "maxLength": MAX_SECTION, "description": description}
+                       for name, description in REPORT_FIELDS[kind].items()})
+    return {"type": "object", "properties": properties, "required": list(properties), "additionalProperties": False}
 
 
-def parse_report(raw):
+def incomplete(reason, kind):
+    fields = dict.fromkeys(REPORT_FIELDS[kind], "未完成。")
+    fields[next(iter(fields))] = reason
+    return {"status": "incomplete", **fields}
+
+
+def parse_report(raw, kind):
     try:
         report = json.loads(raw)
     except (ValueError, TypeError):
-        return incomplete("未收到有效报告，请查看审查日志。")
-    if (not isinstance(report, dict) or set(report) != set(SCHEMA["required"])
+        return incomplete("未收到有效报告，请查看审查日志。", kind)
+    if (not isinstance(report, dict) or set(report) != {"status", *REPORT_FIELDS[kind]}
             or not isinstance(report["status"], str) or report["status"] not in STATUSES
-            or not isinstance(report["summary"], str) or not report["summary"].strip()
-            or len(report["summary"]) > MAX_SUMMARY):
-        return incomplete("报告格式不完整，请查看审查日志。")
+            or any(not isinstance(report[name], str) or not report[name].strip()
+                   or len(report[name]) > MAX_SECTION for name in REPORT_FIELDS[kind])):
+        return incomplete("报告格式不完整，请查看审查日志。", kind)
     return report
 
 
-def collect(outcome, raw):
+def collect(outcome, raw, kind):
     if outcome != "success":
-        return incomplete("审查未成功结束，请查看审查日志。")
-    return parse_report(raw)
+        return incomplete("审查未成功结束，请查看审查日志。", kind)
+    return parse_report(raw, kind)
 
 
 def read_report(directory, kind):
     try:
-        return parse_report((directory / f"review-{kind}.json").read_text())
+        return parse_report((directory / f"review-{kind}.json").read_text(), kind)
     except (OSError, UnicodeError):
-        return incomplete("审查报告缺失，请查看审查日志。")
+        return incomplete("审查报告缺失，请查看审查日志。", kind)
 
 
 def markdown_text(value):
@@ -65,26 +69,44 @@ def build_card(event, reports, run_url):
     pr = event["pull_request"]
     statuses = {report["status"] for report in reports.values()}
     color = "red" if "issues" in statuses else "yellow" if "incomplete" in statuses else "green"
-    elements = [{"tag": "markdown", "content": (
-        f"**{markdown_text(pr['title'][:200])}**\n"
-        f"{markdown_text(pr['user']['login'])} · [PR #{pr['number']}]({pr['html_url']})"
-    )}]
-    for kind, title in (("code", "代码审查与 CI"), ("docs", "文档审查")):
-        report = reports[kind]
+    heading = "❌ 审查发现问题" if "issues" in statuses else "⚠️ 审查未完成" if "incomplete" in statuses else "✅ 审查通过"
+    code, docs = reports["code"], reports["docs"]
+
+    def text(value):
         # Feishu mentions use HTML-like tags; reports are ordinary Markdown.
-        summary = report["summary"].replace("<", "&lt;").replace(">", "&gt;")
-        elements.append({"tag": "markdown", "content": f"**{title}：{STATUSES[report['status']]}**\n{summary}"})
+        return value.replace("<", "&lt;").replace(">", "&gt;")
+
+    sections = [
+        ("1. 哪个 PR", f"**github id:** {markdown_text(pr['user']['login'])}\n"
+         f"**标题:** {markdown_text(pr['title'][:200])}\n**链接:** [PR #{pr['number']}]({pr['html_url']})"),
+        ("2. 改了什么", text(code["changes"])),
+        ("3. 代码与仓库规则", text(code["review"])),
+        ("4. CI 结果", text(code["ci"])),
+        (f"5. 文档审查 · {STATUSES[docs['status']]}",
+         f"**文档与代码一致性**\n{text(docs['consistency'])}\n\n"
+         f"**文档矛盾、重复与归属**\n{text(docs['organization'])}"),
+    ]
+    elements = []
+    for title, content in sections:
+        if elements:
+            elements.append({"tag": "hr"})
+        elements.append({"tag": "markdown", "content": f"**{title}**\n\n{content}"})
     elements.append({"tag": "markdown", "content": f"[查看审查日志]({run_url})"})
     return {
         "msg_type": "interactive",
         "card": {
             "schema": "2.0",
-            "header": {"template": color, "title": {"tag": "plain_text", "content": f"CI 审查 · PR #{pr['number']}"}},
+            "header": {"template": color, "title": {"tag": "plain_text", "content": f"{heading} · PR #{pr['number']}"}},
             "body": {"elements": elements},
         },
     }
 
 
+def card_markdown(card):
+    return "\n\n".join("---" if element["tag"] == "hr" else element["content"]
+                        for element in card["card"]["body"]["elements"]) + "\n"
+
+
 def send_card(webhook, secret, card):
     if not webhook:
         raise ValueError("FEISHU_WEBHOOK_URL is not configured")
@@ -110,14 +132,16 @@ def send_card(webhook, secret, card):
 def main():
     parser = argparse.ArgumentParser(description=__doc__)
     commands = parser.add_subparsers(dest="command", required=True)
-    commands.add_parser("schema")
-    commands.add_parser("collect").add_argument("output", type=Path)
+    commands.add_parser("schema").add_argument("kind", choices=REPORT_FIELDS)
+    collector = commands.add_parser("collect")
+    collector.add_argument("kind", choices=REPORT_FIELDS)
+    collector.add_argument("output", type=Path)
     commands.add_parser("notify").add_argument("directory", type=Path)
     args = parser.parse_args()
     if args.command == "schema":
-        print("schema=" + json.dumps(SCHEMA, separators=(",", ":")))
+        print("schema=" + json.dumps(report_schema(args.kind), separators=(",", ":")))
     elif args.command == "collect":
-        report = collect(os.environ.get("REVIEW_OUTCOME"), os.environ.get("REVIEW_RESULT", ""))
+        report = collect(os.environ.get("REVIEW_OUTCOME"), os.environ.get("REVIEW_RESULT", ""), args.kind)
         args.output.write_text(json.dumps(report, ensure_ascii=False))
     else:
         event = json.loads(Path(os.environ["GITHUB_EVENT_PATH"]).read_text())
@@ -127,7 +151,7 @@ def main():
         summary = os.environ.get("GITHUB_STEP_SUMMARY")
         if summary:
             with open(summary, "a") as output:
-                output.write("\n\n".join(element["content"] for element in card["card"]["body"]["elements"]) + "\n")
+                output.write(card_markdown(card))
         send_card(os.environ.get("FEISHU_WEBHOOK_URL"), os.environ.get("FEISHU_WEBHOOK_SECRET"), card)
         print("代码与文档审查结果已合并发送至飞书群。")
 
diff --git a/scripts/ci_review_test.py b/scripts/ci_review_test.py
index 05161c0a8..c80fdfd99 100644
--- a/scripts/ci_review_test.py
+++ b/scripts/ci_review_test.py
@@ -16,38 +16,73 @@ class ReviewTests(unittest.TestCase):
     run_url = "https://github.com/org/repo/actions/runs/123"
 
     def setUp(self):
-        self.ok = {"status": "ok", "summary": "未发现问题"}
+        self.ok = {"status": "ok", "changes": "- 更新安装流程", "review": "未发现问题", "ci": "全部通过 ✅"}
+        self.docs = {"status": "ok", "consistency": "与代码一致", "organization": "无矛盾或重复"}
 
     def card(self, code=None, docs=None):
-        return review.build_card(self.event, {"code": code or self.ok, "docs": docs or self.ok}, self.run_url)
+        return review.build_card(self.event, {"code": code or self.ok, "docs": docs or self.docs}, self.run_url)
 
     @patch("ci_review.urllib.request.urlopen")
     def test_two_reports_make_one_delivery(self, post):
         post.return_value = io.BytesIO(b'{"code":0}')
-        card = self.card(docs={"status": "issues", "summary": "docs/install.md:12 与代码不符"})
+        card = self.card(docs={**self.docs, "status": "issues", "consistency": "docs/install.md:12 与代码不符"})
         review.send_card("https://example.invalid/webhook", "", card)
         post.assert_called_once()
         payload = json.loads(post.call_args.args[0].data)
         self.assertEqual(payload["card"]["schema"], "2.0")
         self.assertEqual(payload["card"]["header"]["template"], "red")
-        text = "\n".join(item["content"] for item in payload["card"]["body"]["elements"])
-        self.assertIn("代码审查与 CI：未发现问题", text)
-        self.assertIn("文档审查：发现问题", text)
+        text = review.card_markdown(payload)
+        self.assertIn("3. 代码与仓库规则", text)
+        self.assertIn("文档审查 · 发现问题", text)
         self.assertIn("docs/install.md:12", text)
         self.assertIn(self.run_url, text)
         self.assertNotIn("sign", payload)
 
+    def test_fixed_sections_preserve_markdown_and_separators(self):
+        card = self.card()
+        elements = card["card"]["body"]["elements"]
+        self.assertEqual(sum(element["tag"] == "hr" for element in elements), 4)
+        text = review.card_markdown(card)
+        for heading in ("1. 哪个 PR", "2. 改了什么", "3. 代码与仓库规则", "4. CI 结果", "5. 文档审查"):
+            self.assertIn(heading, text)
+        self.assertIn("- 更新安装流程", text)
+        self.assertIn("全部通过 ✅", text)
+        self.assertIn("文档与代码一致性", text)
+        self.assertIn("文档矛盾、重复与归属", text)
+        self.assertIn("---", text)
+        self.assertEqual(card["card"]["header"]["template"], "green")
+        self.assertIn("✅ 审查通过", card["card"]["header"]["title"]["content"])
+
+    def test_pending_ci_does_not_label_the_code_review_incomplete(self):
+        card = self.card(code={**self.ok, "status": "incomplete", "ci": "backend 仍在运行"})
+        text = review.card_markdown(card)
+        self.assertIn("**3. 代码与仓库规则**", text)
+        self.assertIn("未发现问题", text)
+        self.assertIn("backend 仍在运行", text)
+        self.assertEqual(card["card"]["header"]["template"], "yellow")
+
+    def test_each_kind_requires_its_own_sections(self):
+        for kind, report in (("code", self.ok), ("docs", self.docs)):
+            self.assertEqual(review.parse_report(json.dumps(report), kind), report)
+            self.assertEqual(set(review.report_schema(kind)["required"]), set(report))
+            for field in review.REPORT_FIELDS[kind]:
+                for value in (None, " ", "x" * (review.MAX_SECTION + 1)):
+                    invalid = {**report, field: value}
+                    self.assertEqual(review.parse_report(json.dumps(invalid), kind)["status"], "incomplete")
+                missing = {key: value for key, value in report.items() if key != field}
+                self.assertEqual(review.parse_report(json.dumps(missing), kind)["status"], "incomplete")
+
     def test_failed_action_cannot_publish_a_success_report(self):
         for outcome in ("failure", "cancelled", "skipped", None):
             with self.subTest(outcome=outcome):
-                result = review.collect(outcome, json.dumps(self.ok))
+                result = review.collect(outcome, json.dumps(self.ok), "code")
                 self.assertEqual(result["status"], "incomplete")
                 self.assertEqual(self.card(code=result)["card"]["header"]["template"], "yellow")
 
     def test_invalid_or_missing_reports_are_incomplete(self):
         for raw in ("", "not json", "null", "[]", '{"status":"ok"}', '{"status":[],"summary":"x"}', '{"status":"ok","summary":" "}', json.dumps({"status": "ok", "summary": "x" * 2001})):
             with self.subTest(raw=raw[:50]):
-                self.assertEqual(review.collect("success", raw)["status"], "incomplete")
+                self.assertEqual(review.collect("success", raw, "code")["status"], "incomplete")
         root = Path.home() / ".oac/tests"
         root.mkdir(parents=True, exist_ok=True)
         with tempfile.TemporaryDirectory(dir=root) as directory:
@@ -85,8 +120,9 @@ def test_optional_signing(self, post, _clock):
     @patch("ci_review.urllib.request.urlopen")
     def test_bounded_unicode_reports_and_mentions(self, post):
         post.return_value = io.BytesIO(b'{"code":0}')
-        report = {"status": "issues", "summary": "<at id=all>所有人</at>" + "问" * 1950}
-        review.send_card("https://example.invalid/webhook", "", self.card(report, report))
+        reports = {kind: {"status": "issues", **dict.fromkeys(fields, "<at id=all>所有人</at>" + "问" * (review.MAX_SECTION - 20))}
+                   for kind, fields in review.REPORT_FIELDS.items()}
+        review.send_card("https://example.invalid/webhook", "", self.card(reports["code"], reports["docs"]))
         data = post.call_args.args[0].data
         self.assertLess(len(data), 20000)
         self.assertNotIn(b"<at", data)

From 3c7147336d83f99060923aa87f9272ecdf0d6a19 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 21:48:13 +0800
Subject: [PATCH 29/60] Mirror the native matrix sentence in zh maintainers
 (#495)

---
 docs/zh/maintainers.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/zh/maintainers.md b/docs/zh/maintainers.md
index f6b2b17e3..924c3b19f 100644
--- a/docs/zh/maintainers.md
+++ b/docs/zh/maintainers.md
@@ -184,9 +184,7 @@ gh workflow run core-release --repo MiniMax-AI/OpenAgentCore --ref main \
 
 `.github/actionlint.yaml` 会选择 hygiene 和 lint。已知工作流变更会选择其使用方：CI review 和 actionlint 工作流运行 hygiene 和 lint；原生工作流变更会添加原生检查；API 验收工作流变更会添加启用容器验收的 API 检查；网站工作流变更会添加网站检查。共享 Node 操作会选择使用它的每个作业以及 lint。新工作流或未分类的工作流/操作会选择完整门禁，直至在计划器中声明其使用方。计划器测试和 CI 测量脚本运行 hygiene；更改计划器本身会运行完整门禁。
 
-Core 安装器在 Linux、macOS 和 Windows 原生 CI 中构建并测试。Compose 冒烟测试分别使用 Linux amd64 和 arm64 原生 runner。
-
-Compose 模板和 Compose 测试发生变更时，会同时选择 `distribution` 固定数据和 `compose` 冒烟作业；Core、Web、共享 Go 软件包和镜像 Dockerfile 的变更也会选择冒烟作业。安装 Docker 后，可在本地运行 `python3 scripts/compose-smoke.py` 重复该测试。该脚本使用唯一的项目、自动分配的回环端口，并将在 `~/.oac/tests/` 下生成构件；退出时移除其容器和数据卷。CI 还会在冒烟步骤失败或中断后执行清理。诊断信息会显示容器状态，但不会打印 HTTP 响应正文或登录密钥。Core、Web 和 ingress 镜像都从当前检出构建；Web 提供占位页面而不是控制台构建。构建时的节点元数据来自 `deploy/compose/smoke-pins.json` 固定的发布版本；初始化容器禁用网络运行。
+Compose 模板和 Compose 测试发生变更时，会同时选择 `distribution` 固定数据和 `compose` 冒烟作业；Core、Web、共享 Go 软件包和镜像 Dockerfile 的变更也会选择冒烟作业。安装 Docker 后，可在本地运行 `python3 scripts/compose-smoke.py` 重复该测试。该脚本使用唯一的项目、自动分配的回环端口，并将在 `~/.oac/tests/` 下生成构件；退出时移除其容器和数据卷。CI 还会在冒烟步骤失败或中断后执行清理。诊断信息会显示容器状态，但不会打印 HTTP 响应正文或登录密钥。Core、Web 和 ingress 镜像都从当前检出构建；Web 提供占位页面而不是控制台构建。构建时的节点元数据来自 `deploy/compose/smoke-pins.json` 固定的发布版本；初始化容器禁用网络运行。冒烟矩阵使用 Linux amd64 和 arm64 原生 runner；原生矩阵在 Linux、macOS 和 Windows 上构建并测试共享的 Core 安装器。
 
 Go 模块和工作区输入会选择后端、API（包括容器）、原生和分发检查。每个 Node 模块都拥有自己的清单和锁文件。网站依赖项会选择网站检查；Web 依赖项会选择 Web 和浏览器检查；示例依赖项会选择示例检查；共享 TypeScript 客户端依赖项会选择 Web、浏览器和示例检查；Claude 适配器依赖项会选择 Harness、原生和分发检查。共享包管理器配置会选择所有 Node 使用方。根 TypeScript 配置会选择 Web 和示例检查；适配器 TypeScript 配置会选择 Harness 和原生检查。每个所选集合都包含 hygiene。混合变更会累加其使用方，并且每个作业都读取同一计划，而不是维护各自的路径列表。例如，仅修改通知的 PR 会跳过数据库、浏览器和原生作业，而同时修改通知和 Core 的 PR 会添加后端和 API 检查。
 

From 1fcc0661ec1b9aeb7d192edf4881397625e0e5a9 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 21:50:12 +0800
Subject: [PATCH 30/60] refactor(api): generate public contracts from official
 OpenAPI (#490)

* refactor(api): generate public contracts from pinned official OpenAPI

* test(api): validate OpenAPI 3.1 responses and preserve package rejection

* chore(api): remove unused Swagger parser dependency

* fix(api): derive web search union serialization from the official schema

* fix(api): preserve stored search items during public schema migration
---
 .github/workflows/api-acceptance.yml          |      1 +
 AGENTS.md                                     |      2 +-
 Makefile                                      |     16 +-
 contracts/agents-api/core.openapi.yaml        |    117 +-
 contracts/agents-api/go-bindings.json         |    642 +
 contracts/agents-api/index.md                 |     14 +-
 contracts/agents-api/openapi.yaml             |  24873 +++-
 contracts/agents-api/runtime.openapi.yaml     |      4 +
 contracts/agents-api/upstream-fields.json     |   2301 -
 contracts/agents-api/upstream-routes.json     |     10 +-
 contracts/agents-api/upstream.json            |      8 +-
 contracts/agents-api/upstream/LICENSE         |     21 +
 contracts/agents-api/upstream/openapi.json    | 107618 +++++++++++++++
 contracts/agents-api/v1/agents.go             |     82 -
 contracts/agents-api/v1/credentials.go        |     99 -
 contracts/agents-api/v1/environment_events.go |     10 -
 contracts/agents-api/v1/environment_files.go  |     25 -
 .../agents-api/v1/environment_templates.go    |     52 -
 contracts/agents-api/v1/environments.go       |     39 -
 contracts/agents-api/v1/events.go             |     42 -
 contracts/agents-api/v1/function_actions.go   |     10 -
 contracts/agents-api/v1/function_tools.go     |     12 -
 contracts/agents-api/v1/inputs.go             |     30 -
 contracts/agents-api/v1/items.go              |     52 -
 contracts/agents-api/v1/items_test.go         |     35 +
 contracts/agents-api/v1/mcp_tools.go          |     34 -
 contracts/agents-api/v1/official.gen.go       |    996 +
 contracts/agents-api/v1/required_actions.go   |     15 -
 contracts/agents-api/v1/session_artifacts.go  |     26 -
 contracts/agents-api/v1/session_deletion.go   |      7 -
 .../agents-api/v1/session_environment.go      |     17 -
 contracts/agents-api/v1/sessions.go           |    130 -
 contracts/agents-api/v1/skills.go             |     55 -
 contracts/agents-api/v1/source_files.go       |     27 -
 contracts/agents-api/v1/subagent_items.go     |     78 +-
 contracts/agents-api/v1/subagents.go          |     28 -
 contracts/agents-api/v1/turns.go              |     28 -
 .../agents-api/v1/upstream_contract_test.go   |    319 +-
 contracts/agents-api/v1/usage.go              |     15 -
 contracts/agents-api/v1/vaults.go             |     30 -
 contracts/agents-api/zh/index.md              |     17 +-
 docs/development.md                           |      2 +-
 docs/zh/development.md                        |      4 +-
 scripts/ci_plan.py                            |      2 +-
 scripts/extract-agents-api-upstream.py        |    193 -
 scripts/generate-harness-catalog.test.py      |      4 +
 scripts/generate-public-api.py                |    276 +
 scripts/generate-public-api.test.py           |     80 +
 scripts/name-allowlist.json                   |      5 -
 scripts/openapi-split/main.go                 |    146 +-
 scripts/openapi-split/main_test.go            |     24 +-
 services/core/README.md                       |      2 +-
 services/core/internal/api/agents.go          |     21 -
 services/core/internal/api/agents_delete.go   |     10 -
 services/core/internal/api/agents_list.go     |     12 -
 services/core/internal/api/agents_update.go   |     12 -
 .../core/internal/api/contract_routes_test.go |      8 +-
 services/core/internal/api/credentials.go     |     23 -
 .../core/internal/api/credentials_delete.go   |     11 -
 .../core/internal/api/credentials_list.go     |     15 -
 .../core/internal/api/credentials_update.go   |     13 -
 .../core/internal/api/environment_files.go    |     14 -
 .../internal/api/environment_files_create.go  |     12 -
 .../internal/api/environment_templates.go     |     55 -
 services/core/internal/api/environments.go    |     10 -
 services/core/internal/api/handler.go         |     35 -
 services/core/internal/api/inputs.go          |     12 -
 services/core/internal/api/items.go           |     13 -
 .../core/internal/api/session_artifacts.go    |     46 -
 .../core/internal/api/session_deletion.go     |     10 -
 .../core/internal/api/session_metadata.go     |     12 -
 services/core/internal/api/skills.go          |     43 -
 services/core/internal/api/skills_list.go     |     21 -
 services/core/internal/api/skills_transfer.go |     35 -
 services/core/internal/api/source_files.go    |     18 -
 .../core/internal/api/source_files_content.go |      8 -
 .../core/internal/api/source_files_list.go    |     12 -
 .../core/internal/api/source_files_upload.go  |     11 -
 services/core/internal/api/stream.go          |     11 -
 services/core/internal/api/subagent_turns.go  |     41 -
 services/core/internal/api/subagents.go       |     38 -
 services/core/internal/api/turns.go           |     24 -
 services/core/internal/api/vaults.go          |     21 -
 services/core/internal/api/vaults_delete.go   |     10 -
 services/core/internal/api/vaults_list.go     |     14 -
 services/core/tests/official_client.py        |     39 +-
 services/core/tests/official_schema.py        |     41 +
 services/core/tests/official_schema_test.py   |     80 +
 services/core/tests/requirements.txt          |      1 -
 89 files changed, 129546 insertions(+), 9941 deletions(-)
 create mode 100644 contracts/agents-api/go-bindings.json
 delete mode 100644 contracts/agents-api/upstream-fields.json
 create mode 100644 contracts/agents-api/upstream/LICENSE
 create mode 100644 contracts/agents-api/upstream/openapi.json
 delete mode 100644 contracts/agents-api/v1/environment_events.go
 delete mode 100644 contracts/agents-api/v1/environment_files.go
 delete mode 100644 contracts/agents-api/v1/environment_templates.go
 delete mode 100644 contracts/agents-api/v1/environments.go
 delete mode 100644 contracts/agents-api/v1/function_actions.go
 delete mode 100644 contracts/agents-api/v1/function_tools.go
 delete mode 100644 contracts/agents-api/v1/inputs.go
 delete mode 100644 contracts/agents-api/v1/mcp_tools.go
 create mode 100644 contracts/agents-api/v1/official.gen.go
 delete mode 100644 contracts/agents-api/v1/session_artifacts.go
 delete mode 100644 contracts/agents-api/v1/session_deletion.go
 delete mode 100644 contracts/agents-api/v1/session_environment.go
 delete mode 100644 contracts/agents-api/v1/skills.go
 delete mode 100644 contracts/agents-api/v1/source_files.go
 delete mode 100644 contracts/agents-api/v1/subagents.go
 delete mode 100644 contracts/agents-api/v1/turns.go
 delete mode 100644 contracts/agents-api/v1/usage.go
 delete mode 100644 contracts/agents-api/v1/vaults.go
 delete mode 100644 scripts/extract-agents-api-upstream.py
 create mode 100644 scripts/generate-public-api.py
 create mode 100644 scripts/generate-public-api.test.py
 create mode 100644 services/core/tests/official_schema.py
 create mode 100644 services/core/tests/official_schema_test.py

diff --git a/.github/workflows/api-acceptance.yml b/.github/workflows/api-acceptance.yml
index d4437a4c9..ee010ed18 100644
--- a/.github/workflows/api-acceptance.yml
+++ b/.github/workflows/api-acceptance.yml
@@ -62,6 +62,7 @@ jobs:
           OAC_TEST_SERVER_BIN: ${{ runner.temp }}/oac-core-build/oac-core
           OAC_TEST_OFFICIAL_SDK_PYTHON: python
         run: |
+          python services/core/tests/official_schema_test.py
           python services/core/tests/official_client.py
           go test ./services/core/tests/integration -run '^(TestFunctionStateOfficialClientReadsAndLiveEvents|TestSavedReferenceRetryOfficialClient|TestAgentUpdateOfficialClient|TestAgentDeletionOfficialClient|TestSessionAgentFilterOfficialClient|TestSessionDeletionOfficialClient|TestEnvironmentInitialFailureOfficialClient|TestSelfHostedInitialCreationOfficialClient|TestSelfHostedCancellationOfficialClient)$' -count=1
       - uses: ./.github/actions/e2b-provider
diff --git a/AGENTS.md b/AGENTS.md
index 8ec48e767..d6e200722 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -25,7 +25,7 @@ Do not multiply entities without necessity. The long-term goal is minimal code,
 
 | Boundary | Protocol code | Protocol doc |
 | --- | --- | --- |
-| Application–Core (`/v1`) | Types in `contracts/agents-api/v1/` and route annotations in `services/core/internal/api/`; `make openapi` generates `contracts/agents-api/openapi.yaml` | [Agents API guide](docs/api/public-agent-api.md) |
+| Application–Core (`/v1`) | Official schema pinned by `contracts/agents-api/upstream.json` plus Go-owned `x_agents_core` extensions; `make openapi` generates public Go types and `contracts/agents-api/openapi.yaml` | [Agents API guide](docs/api/public-agent-api.md) |
 | Web and operators–Core (`/core/v1`) | Route annotations in `services/core/internal/api/`; `make openapi` generates `contracts/agents-api/core.openapi.yaml` | [Core administration API](contracts/agents-api/admin-api.md) |
 | Nodes and daemons–Core (`/api/v1` HTTP routes; the node and daemon wire protocols are separate rows) | Route annotations in `services/core/internal/api/`; `make openapi` generates `contracts/agents-api/runtime.openapi.yaml` | [Machine connection API](contracts/agents-api/machine-api.md) |
 | Core–Sandbox Provider | `services/core/internal/sandbox/sandbox_provider.go` | [Sandbox Provider guide](docs/sandbox-provider.md) |
diff --git a/Makefile b/Makefile
index 1958607db..4d91c1ca8 100644
--- a/Makefile
+++ b/Makefile
@@ -32,21 +32,29 @@ sqlc-generate:
 
 SWAG ?= go run github.com/swaggo/swag/cmd/swag@$(SWAG_VERSION)
 
-.PHONY: openapi
+.PHONY: openapi check-openapi
+OPENAPI_FLAGS ?=
+check-openapi:
+	$(MAKE) openapi OPENAPI_FLAGS=--check
+	python3 scripts/generate-public-api.test.py
+
 openapi:
+	python3 scripts/generate-public-api.py $(OPENAPI_FLAGS)
 	@set -e; root="$${OAC_DEV_HOME:-$$HOME/.oac}/build"; mkdir -p "$$root"; \
 	output=$$(mktemp -d "$$root/core-openapi.XXXXXX"); trap 'rm -rf "$$output"' EXIT; \
+	python3 scripts/generate-public-api.py $(OPENAPI_FLAGS) --swag-roots "$$output/roots.go"; \
 	$(SWAG) init \
-	    -g cmd/server/main.go --dir ./services/core,./contracts/agents-api/v1 \
+	    -g cmd/server/main.go --dir "./services/core,./contracts/agents-api/v1,$$output" \
 	    --output "$$output" \
 	    --outputTypes yaml --parseInternal; \
 	python3 scripts/patch-agents-openapi.py "$$output/swagger.yaml"; \
-	go run ./scripts/openapi-split "$$output/swagger.yaml" contracts/agents-api/openapi.yaml contracts/agents-api/core.openapi.yaml contracts/agents-api/runtime.openapi.yaml
+	go run ./scripts/openapi-split $(OPENAPI_FLAGS) "$$output/swagger.yaml" "$$output/extensions.json" contracts/agents-api/core.openapi.yaml contracts/agents-api/runtime.openapi.yaml; \
+	python3 scripts/generate-public-api.py $(OPENAPI_FLAGS) --extensions "$$output/extensions.json"
 
 check-sqlc:
 	python3 scripts/check-sqlc.py
 
-check-go:
+check-go: check-openapi
 	go test ./apps/daemon/... ./internal/... ./contracts/agents-api/... ./scripts/openapi-split -count=1
 
 .PHONY: check-runtime-contract
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index 9a74d1381..fb65920bd 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -1458,6 +1458,10 @@ definitions:
       service_tier:
         enum:
           - auto
+          - default
+          - flex
+          - priority
+          - fast
         type: string
       text:
         $ref: '#/definitions/v1.TextConfig'
@@ -1466,13 +1470,13 @@ definitions:
           type: object
         type: array
       x_agents_core:
-        allOf:
-          - $ref: '#/definitions/v1.AgentsCore'
-        x-nullable: true
+        $ref: '#/definitions/v1.AgentsCore'
     required:
       - id
+      - instructions
       - model
       - multi_agent
+      - name
       - reasoning
       - service_tier
       - text
@@ -1481,8 +1485,6 @@ definitions:
   v1.AgentDeleted:
     properties:
       deleted:
-        enum:
-          - true
         type: boolean
       id:
         type: string
@@ -1546,8 +1548,8 @@ definitions:
         x-nullable: true
       type:
         enum:
-          - static_bearer
           - mcp_oauth
+          - static_bearer
         type: string
     required:
       - mcp_server_url
@@ -1588,7 +1590,9 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.EnvironmentInstallation:
@@ -1684,6 +1688,7 @@ definitions:
       - created_at
       - files
       - id
+      - name
       - network
       - object
       - packages
@@ -1726,7 +1731,9 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.ExecutionHarnessConfigSelection:
@@ -1794,7 +1801,9 @@ definitions:
   v1.Item:
     properties:
       action:
-        $ref: '#/definitions/v1.WebSearchAction'
+        allOf:
+          - $ref: '#/definitions/v1.WebSearchAction'
+        x-nullable: true
       agent_id:
         type: string
       arguments: {}
@@ -1808,18 +1817,25 @@ definitions:
         type: array
       cwd:
         type: string
+        x-nullable: true
       duration_ms:
         type: integer
-      error: {}
+        x-nullable: true
+      error:
+        x-nullable: true
       exit_code:
         type: integer
+        x-nullable: true
       id:
         type: string
+        x-nullable: true
       model:
         type: string
+        x-nullable: true
       name:
         type: string
-      output: {}
+      output:
+        x-nullable: true
       phase:
         enum:
           - commentary
@@ -1828,6 +1844,7 @@ definitions:
         x-nullable: true
       reasoning_effort:
         type: string
+        x-nullable: true
       recipient_agent_id:
         type: string
       recipient_agent_ids:
@@ -1847,9 +1864,10 @@ definitions:
         enum:
           - in_progress
           - completed
-          - failed
           - incomplete
+          - failed
         type: string
+        x-nullable: true
       summary:
         items:
           $ref: '#/definitions/v1.SummaryText'
@@ -1859,13 +1877,13 @@ definitions:
       type:
         enum:
           - message
-          - command_execution
-          - mcp_call
+          - reasoning
           - function_call
           - function_call_output
-          - web_search_call
-          - reasoning
           - agent_message
+          - mcp_call
+          - web_search_call
+          - command_execution
           - create_subagent_call
           - send_subagent_input_call
           - resume_subagent_call
@@ -1889,8 +1907,8 @@ definitions:
       type:
         enum:
           - input_text
-          - output_text
           - input_image
+          - output_text
           - encrypted_content
         type: string
     required:
@@ -1916,7 +1934,9 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.ModelConfigurationInput:
@@ -1997,6 +2017,7 @@ definitions:
         x-nullable: true
     required:
       - enabled
+      - max_concurrent_subagents
     type: object
   v1.OAuthCredentialRefresh:
     properties:
@@ -2014,6 +2035,8 @@ definitions:
         $ref: '#/definitions/v1.OAuthEndpointAuth'
     required:
       - client_id
+      - resource
+      - scope
       - token_endpoint
       - token_endpoint_auth
     type: object
@@ -2038,9 +2061,21 @@ definitions:
   v1.Reasoning:
     properties:
       effort:
+        enum:
+          - none
+          - minimal
+          - low
+          - medium
+          - high
+          - xhigh
+          - max
         type: string
         x-nullable: true
       summary:
+        enum:
+          - concise
+          - detailed
+          - auto
         type: string
         x-nullable: true
     type: object
@@ -2560,15 +2595,15 @@ definitions:
       updated_at:
         type: integer
       x_agents_core:
-        allOf:
-          - $ref: '#/definitions/v1.SavedAgentCore'
-        x-nullable: true
+        $ref: '#/definitions/v1.SavedAgentCore'
     required:
       - created_at
       - id
+      - instructions
       - metadata
       - model
       - multi_agent
+      - name
       - object
       - reasoning
       - service_tier
@@ -2609,7 +2644,9 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.SavedAgentText:
@@ -2686,12 +2723,14 @@ definitions:
       - agent
       - created_at
       - environment
+      - error
       - id
       - last_active_at
       - metadata
       - object
       - required_actions
       - status
+      - usage
       - vault_ids
     type: object
   v1.SessionArtifact:
@@ -2759,7 +2798,9 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.SessionCore:
@@ -2811,8 +2852,8 @@ definitions:
       type:
         enum:
           - none
-          - self_hosted
           - openai_hosted
+          - self_hosted
         type: string
       workspace_directory:
         type: string
@@ -2868,7 +2909,9 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.Skill:
@@ -2933,7 +2976,9 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.SkillVersion:
@@ -3001,19 +3046,19 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.SourceFile:
     properties:
       bytes:
-        minimum: 0
         type: integer
       created_at:
         type: integer
       expires_at:
         type: integer
-        x-nullable: true
       filename:
         type: string
       id:
@@ -3024,15 +3069,23 @@ definitions:
         type: string
       purpose:
         enum:
+          - assistants
+          - assistants_output
+          - batch
+          - batch_output
+          - fine-tune
+          - fine-tune-results
+          - vision
           - user_data
         type: string
       status:
         enum:
+          - uploaded
           - processed
+          - error
         type: string
       status_details:
         type: string
-        x-nullable: true
     required:
       - bytes
       - created_at
@@ -3065,19 +3118,17 @@ definitions:
         type: array
       first_id:
         type: string
-        x-nullable: true
       has_more:
         type: boolean
       last_id:
         type: string
-        x-nullable: true
       object:
-        enum:
-          - list
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.SummaryText:
@@ -3179,11 +3230,16 @@ definitions:
         x-nullable: true
     required:
       - agent_id
+      - completed_at
       - created_at
+      - error
       - id
       - object
       - session_id
+      - started_at
       - status
+      - subagent_id
+      - usage
     type: object
   v1.TurnError:
     properties:
@@ -3232,7 +3288,9 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.Vault:
@@ -3256,6 +3314,7 @@ definitions:
       - created_at
       - id
       - metadata
+      - name
       - object
     type: object
   v1.VaultDeleted:
@@ -3293,19 +3352,24 @@ definitions:
         type: string
     required:
       - data
+      - first_id
       - has_more
+      - last_id
       - object
     type: object
   v1.WebSearchAction:
     properties:
       pattern:
         type: string
+        x-nullable: true
       queries:
         items:
           type: string
         type: array
+        x-nullable: true
       query:
         type: string
+        x-nullable: true
       type:
         enum:
           - search
@@ -3315,6 +3379,7 @@ definitions:
         type: string
       url:
         type: string
+        x-nullable: true
     required:
       - type
     type: object
diff --git a/contracts/agents-api/go-bindings.json b/contracts/agents-api/go-bindings.json
new file mode 100644
index 000000000..176a7d1c7
--- /dev/null
+++ b/contracts/agents-api/go-bindings.json
@@ -0,0 +1,642 @@
+{
+  "APIError": {
+    "sources": ["#/components/schemas/Error"],
+    "fields": {
+      "code": {"type": "*string"}
+    },
+    "order": ["message", "type", "code", "param"]
+  },
+  "Agent": {
+    "sources": ["#/components/schemas/SessionAgentResource"],
+    "fields": {
+      "x_agents_core": {"type": "*AgentsCore"},
+      "reasoning": {"type": "Reasoning"},
+      "text": {"type": "TextConfig"}
+    },
+    "order": ["x_agents_core", "id", "instructions", "model", "multi_agent", "name", "reasoning", "service_tier", "text", "tools"]
+  },
+  "AgentContent": {
+    "sources": ["#/components/schemas/AgentContentResource"],
+    "order": ["type", "text", "encrypted_content"]
+  },
+  "AgentDeleted": {
+    "sources": ["#/components/schemas/DeletedAgentResource"],
+    "order": ["id", "object", "deleted"]
+  },
+  "AgentMessageItem": {
+    "sources": ["#/components/schemas/AgentMessageItemResource"],
+    "order": ["id", "turn_id", "type", "sender_agent_id", "recipient_agent_id", "content"]
+  },
+  "CreateAgentRequest": {
+    "sources": ["#/components/schemas/CreateAgentParams"],
+    "fields": {
+      "x_agents_core": {"type": "*SavedAgentCoreInput"},
+      "model": {"type": "*string"},
+      "metadata": {"type": "map[string]*string"},
+      "reasoning": {"type": "*Reasoning"},
+      "text": {"type": "*SavedAgentTextInput"}
+    },
+    "order": ["x_agents_core", "model", "name", "instructions", "metadata", "multi_agent", "reasoning", "service_tier", "text", "tools"]
+  },
+  "CreateCredentialRequest": {
+    "sources": ["#/components/schemas/CreateVaultCredentialParams"],
+    "fields": {
+      "name": {"type": "*string"},
+      "auth": {"type": "*CredentialAuthInput"}
+    },
+    "order": ["name", "auth"]
+  },
+  "CreateEventsRequest": {
+    "sources": ["#/components/schemas/CreateSessionEventsParams"],
+    "order": ["events"]
+  },
+  "CreateSessionRequest": {
+    "sources": ["#/components/schemas/CreateAgentSessionParams"],
+    "fields": {
+      "x_agents_core": {"type": "*SessionExecutionInput"},
+      "environment": {"type": "*Environment"},
+      "input": {"type": "any"},
+      "stream": {"type": "bool"}
+    },
+    "order": ["x_agents_core", "agent", "agent_id", "environment", "input", "metadata", "stream", "vault_ids"]
+  },
+  "CreateSubagentCallItem": {
+    "sources": ["#/components/schemas/CreateSubagentCallItemResource"],
+    "order": ["id", "turn_id", "type", "status", "agent_id", "content", "model", "reasoning_effort"]
+  },
+  "CreateVaultRequest": {
+    "sources": ["#/components/schemas/CreateVaultParams"],
+    "fields": {
+      "metadata": {"type": "map[string]*string"}
+    },
+    "order": ["name", "metadata"]
+  },
+  "Credential": {
+    "sources": ["#/components/schemas/VaultCredentialResource"],
+    "order": ["id", "vault_id", "name", "object", "auth", "created_at", "updated_at"]
+  },
+  "CredentialAuth": {
+    "sources": ["#/components/schemas/VaultCredentialAuthResource"],
+    "fields": {
+      "expires_at": {"omit": false},
+      "refresh": {"type": "*OAuthCredentialRefresh", "omit": false}
+    },
+    "order": ["type", "mcp_server_url", "expires_at", "refresh"]
+  },
+  "CredentialAuthInput": {
+    "sources": ["#/components/schemas/CreateVaultCredentialAuthParam"],
+    "fields": {
+      "mcp_server_url": {"type": "*string"},
+      "refresh": {"type": "*OAuthCredentialRefreshInput"}
+    },
+    "order": ["type", "mcp_server_url", "token", "access_token", "expires_at", "refresh"]
+  },
+  "CredentialAuthReplacement": {
+    "sources": ["#/components/schemas/RotateVaultCredentialAuthParam"],
+    "fields": {
+      "expires_at": {"type": "json.RawMessage"},
+      "refresh": {"type": "*OAuthCredentialRefreshReplacement"}
+    },
+    "order": ["type", "token", "access_token", "expires_at", "refresh"]
+  },
+  "CredentialDeleted": {
+    "sources": ["#/components/schemas/DeletedVaultCredentialResource"],
+    "order": ["id", "deleted", "object"]
+  },
+  "CredentialList": {
+    "sources": ["#/components/schemas/VaultCredentialListResource"],
+    "order": ["object", "data", "has_more", "first_id", "last_id"]
+  },
+  "Environment": {
+    "sources": ["#/components/schemas/EnvironmentParam"],
+    "fields": {
+      "packages": {"type": "*EnvironmentPackages"},
+      "files": {"type": "[]json.RawMessage"},
+      "environment_template_id": {"type": "string"},
+      "workspace_directory": {"type": "string"},
+      "network": {"type": "*EnvironmentNetworkInput"}
+    },
+    "order": ["plugins", "skills", "env", "setup_commands", "packages", "files", "environment_template_id", "type", "workspace_directory", "capability_directories", "network"]
+  },
+  "EnvironmentConnectionAction": {
+    "sources": ["#/components/schemas/SessionRequiredActionResourceEnvironmentConnection"],
+    "order": ["environment_id", "type"]
+  },
+  "EnvironmentFile": {
+    "sources": ["#/components/schemas/EnvironmentFileResource"],
+    "order": ["environment_id", "object", "path", "size_bytes"]
+  },
+  "EnvironmentFileCreateRequest": {
+    "sources": ["#/components/schemas/HostedEnvironmentFileParam"],
+    "fields": {
+      "path": {"type": "*string"}
+    },
+    "order": ["type", "data", "file_id", "path"]
+  },
+  "EnvironmentFileList": {
+    "sources": ["#/components/schemas/EnvironmentFileListResource"],
+    "order": ["object", "data", "next", "has_more"]
+  },
+  "EnvironmentInfo": {
+    "sources": ["#/components/schemas/PublicEnvironmentResource"],
+    "order": ["id", "object", "type", "status", "files", "plugins", "skills"]
+  },
+  "EnvironmentNetwork": {
+    "sources": ["#/components/schemas/NetworkPolicyResource"],
+    "order": ["access", "allowed_domains"]
+  },
+  "EnvironmentNetworkInput": {
+    "sources": ["#/components/schemas/NetworkPolicyParam"],
+    "order": ["access", "allowed_domains"]
+  },
+  "EnvironmentPackages": {
+    "exclude": ["system"],
+    "sources": ["#/components/schemas/EnvironmentPackagesParam"],
+    "fields": {
+      "npm": {"omit": false},
+      "python": {"omit": false}
+    },
+    "order": ["npm", "python"]
+  },
+  "EnvironmentPackagesInput": {
+    "exclude": ["system"],
+    "sources": ["#/components/schemas/EnvironmentPackagesParam"],
+    "order": ["npm", "python"]
+  },
+  "EnvironmentPackagesResponse": {
+    "sources": ["#/components/schemas/EnvironmentPackagesResource"],
+    "order": ["npm", "python", "system"]
+  },
+  "EnvironmentTemplate": {
+    "sources": ["#/components/schemas/EnvironmentTemplateResource"],
+    "order": ["id", "object", "name", "created_at", "updated_at", "capability_directories", "network", "packages", "files", "plugins", "skills"]
+  },
+  "EnvironmentTemplateDeleted": {
+    "sources": ["#/components/schemas/DeletedEnvironmentTemplateResource"],
+    "order": ["id", "object", "deleted"]
+  },
+  "EnvironmentTemplateList": {
+    "sources": ["#/components/schemas/EnvironmentTemplateListResource"],
+    "order": ["object", "data", "has_more", "first_id", "last_id"]
+  },
+  "EnvironmentTemplateRequest": {
+    "sources": ["#/components/schemas/CreateEnvironmentTemplateParams"],
+    "fields": {
+      "network": {"type": "*EnvironmentNetworkInput"},
+      "files": {"type": "[]json.RawMessage"},
+      "packages": {"type": "*EnvironmentPackagesInput"}
+    },
+    "order": ["name", "network", "capability_directories", "env", "files", "packages", "plugins", "skills", "setup_commands"]
+  },
+  "ErrorResponse": {
+    "sources": ["#/components/schemas/ErrorResponse-2"],
+    "fields": {"error": {"type": "APIError"}},
+    "order": ["error"]
+  },
+  "FunctionCallAction": {
+    "sources": ["#/components/schemas/SessionRequiredActionResourceFunctionCall"],
+    "fields": {
+      "arguments": {"type": "any"}
+    },
+    "order": ["arguments", "call_id", "name", "turn_id", "type"]
+  },
+  "FunctionToolInput": {
+    "sources": ["#/components/schemas/AgentToolConfigParamFunction"],
+    "fields": {
+      "name": {"type": "*string"},
+      "description": {"type": "*string"},
+      "parameters": {"type": "json.RawMessage"},
+      "defer_loading": {"type": "json.RawMessage"}
+    },
+    "order": ["type", "name", "description", "parameters", "defer_loading"]
+  },
+  "InlineAgent": {
+    "sources": ["#/components/schemas/SessionAgentConfigParam"],
+    "fields": {
+      "x_agents_core": {"type": "*AgentsCore"},
+      "reasoning": {"type": "*Reasoning"},
+      "text": {"type": "*SavedAgentTextInput"}
+    },
+    "order": ["x_agents_core", "model", "instructions", "multi_agent", "reasoning", "service_tier", "text", "tools"]
+  },
+  "InputContent": {
+    "sources": ["#/components/schemas/InputContentParam"],
+    "order": ["type", "text", "image_url"]
+  },
+  "InputMessage": {
+    "sources": ["#/components/schemas/InputMessageParam"],
+    "fields": {
+      "type": {"type": "string"}
+    },
+    "order": ["type", "role", "content"]
+  },
+  "InputTokenDetails": {
+    "sources": ["#/components/schemas/InputTokensDetailsResource"],
+    "order": ["cached_tokens"]
+  },
+  "Item": {
+    "sources": ["#/components/schemas/SessionTurnItemResource"],
+    "fields": {
+      "id": {"type": "string"},
+      "status": {"type": "string", "omit": false},
+      "role": {"type": "string"},
+      "phase": {"type": "string"},
+      "content": {"type": "[]ItemContent"},
+      "command": {"type": "string"},
+      "name": {"type": "string"},
+      "call_id": {"type": "string"},
+      "server_label": {"type": "string"},
+      "arguments": {"type": "any"},
+      "output": {"type": "any"},
+      "error": {"type": "any"},
+      "action": {"type": "*WebSearchAction"},
+      "agent_id": {"type": "string"},
+      "sender_agent_id": {"type": "string"},
+      "recipient_agent_id": {"type": "string"}
+    },
+    "order": ["id", "turn_id", "type", "status", "role", "phase", "content", "command", "cwd", "duration_ms", "exit_code", "name", "call_id", "server_label", "arguments", "output", "error", "action", "agent_id", "sender_agent_id", "recipient_agent_id", "recipient_agent_ids", "model", "reasoning_effort", "summary"]
+  },
+  "ItemContent": {
+    "sources": ["#/components/schemas/MessageContentResource", "#/components/schemas/EncryptedContentResource"],
+    "fields": {
+      "image_url": {"type": "string"}
+    },
+    "order": ["type", "text", "image_url", "encrypted_content"]
+  },
+  "ItemList": {
+    "sources": ["#/components/schemas/SessionItemListResource"],
+    "order": ["object", "first_id", "last_id", "data", "has_more"]
+  },
+  "MCPHTTPTransport": {
+    "sources": ["#/components/schemas/PersistedMcpTransportConfigParamHttp"],
+    "fields": {
+      "headers": {"type": "*map[string]string"}
+    },
+    "order": ["type", "server_url", "headers"]
+  },
+  "MCPTool": {
+    "sources": ["#/components/schemas/AgentToolResourceMcp"],
+    "fields": {
+      "transport": {"type": "MCPHTTPTransport"},
+      "allowed_tools": {"type": "*[]string"}
+    },
+    "order": ["type", "server_label", "transport", "allowed_tools", "connection_origin", "credential_id", "request_metadata", "required"]
+  },
+  "MCPToolInput": {
+    "sources": ["#/components/schemas/AgentToolConfigParamMcp"],
+    "fields": {
+      "server_label": {"type": "*string"},
+      "allowed_tools": {"type": "json.RawMessage", "omit": false},
+      "connection_origin": {"omit": false},
+      "credential_id": {"omit": false},
+      "request_metadata": {"type": "json.RawMessage", "omit": false},
+      "required": {"type": "json.RawMessage", "omit": false}
+    },
+    "order": ["type", "server_label", "transport", "allowed_tools", "connection_origin", "credential_id", "request_metadata", "required"]
+  },
+  "MultiAgentConfig": {
+    "sources": ["#/components/schemas/MultiAgentConfigResource"],
+    "fields": {
+      "max_concurrent_subagents": {"type": "*int"}
+    },
+    "order": ["enabled", "max_concurrent_subagents"]
+  },
+  "OAuthCredentialRefresh": {
+    "sources": ["#/components/schemas/McpOauthRefreshResource"],
+    "order": ["client_id", "token_endpoint", "token_endpoint_auth", "resource", "scope"]
+  },
+  "OAuthCredentialRefreshInput": {
+    "sources": ["#/components/schemas/CreateMcpOauthRefreshParam"],
+    "fields": {
+      "client_id": {"type": "*string"},
+      "refresh_token": {"type": "*string"},
+      "token_endpoint": {"type": "*string"},
+      "token_endpoint_auth": {"type": "*OAuthEndpointAuthInput"}
+    },
+    "order": ["client_id", "refresh_token", "token_endpoint", "token_endpoint_auth", "resource", "scope"]
+  },
+  "OAuthCredentialRefreshReplacement": {
+    "sources": ["#/components/schemas/RotateMcpOauthRefreshParam"],
+    "fields": {
+      "scope": {"type": "json.RawMessage"},
+      "token_endpoint_auth": {"type": "*OAuthEndpointAuthReplacement"}
+    },
+    "order": ["refresh_token", "scope", "token_endpoint_auth"]
+  },
+  "OAuthEndpointAuth": {
+    "sources": ["#/components/schemas/McpOauthTokenEndpointAuthResource"],
+    "order": ["type"]
+  },
+  "OAuthEndpointAuthInput": {
+    "sources": ["#/components/schemas/CreateMcpOauthTokenEndpointAuthParam"],
+    "order": ["type", "client_secret"]
+  },
+  "OAuthEndpointAuthReplacement": {
+    "sources": ["#/components/schemas/RotateMcpOauthTokenEndpointAuthParam"],
+    "order": ["type", "client_secret"]
+  },
+  "OutputTokenDetails": {
+    "sources": ["#/components/schemas/OutputTokensDetailsResource"],
+    "order": ["reasoning_tokens"]
+  },
+  "Reasoning": {
+    "sources": ["#/components/schemas/ReasoningParam"],
+    "order": ["effort", "summary"]
+  },
+  "ReasoningItem": {
+    "sources": ["#/components/schemas/ReasoningItemResource"],
+    "order": ["id", "turn_id", "type", "status", "summary"]
+  },
+  "RequiredAction": {
+    "sources": ["#/components/schemas/SessionRequiredActionResource"],
+    "fields": {
+      "arguments": {"type": "any"},
+      "call_id": {"type": "string"},
+      "name": {"type": "string"},
+      "turn_id": {"type": "string"},
+      "environment_id": {"type": "string"}
+    },
+    "order": ["type", "arguments", "call_id", "name", "turn_id", "environment_id"]
+  },
+  "SavedAgent": {
+    "sources": ["#/components/schemas/AgentResource"],
+    "embed": {"SavedAgentConfiguration": ["x_agents_core", "model", "name", "instructions", "multi_agent", "reasoning", "service_tier", "text", "tools"]},
+    "order": ["id", "object", "metadata", "created_at", "updated_at"]
+  },
+  "SavedAgentConfiguration": {
+    "sources": ["#/components/schemas/AgentResource"],
+    "fields": {
+      "x_agents_core": {"type": "*SavedAgentCore"},
+      "reasoning": {"type": "Reasoning"}
+    },
+    "exclude": ["id", "object", "created_at", "updated_at", "metadata"],
+    "order": ["x_agents_core", "model", "name", "instructions", "multi_agent", "reasoning", "service_tier", "text", "tools"]
+  },
+  "SavedAgentList": {
+    "sources": ["#/components/schemas/AgentListResource"],
+    "order": ["object", "data", "has_more", "first_id", "last_id"]
+  },
+  "SavedAgentText": {
+    "sources": ["#/components/schemas/TextResource"],
+    "order": ["format", "verbosity"]
+  },
+  "SavedAgentTextFormat": {
+    "sources": ["#/components/schemas/TextFormatResource"],
+    "fields": {
+      "schema": {"type": "json.RawMessage"}
+    },
+    "order": ["type", "schema"]
+  },
+  "SavedAgentTextInput": {
+    "sources": ["#/components/schemas/TextParam"],
+    "order": ["format", "verbosity"]
+  },
+  "SendSubagentInputCallItem": {
+    "sources": ["#/components/schemas/SendSubagentInputCallItemResource"],
+    "order": ["id", "turn_id", "type", "status", "sender_agent_id", "recipient_agent_id", "content"]
+  },
+  "Session": {
+    "sources": ["#/components/schemas/SessionResource"],
+    "fields": {
+      "x_agents_core": {"type": "*SessionCore"},
+      "usage": {"type": "*TokenUsage"}
+    },
+    "order": ["x_agents_core", "id", "agent", "created_at", "environment", "error", "last_active_at", "metadata", "object", "required_actions", "status", "usage", "vault_ids"]
+  },
+  "SessionArtifact": {
+    "sources": ["#/components/schemas/SessionArtifactResource"],
+    "order": ["id", "created_at", "environment_id", "object", "path", "session_id", "size_bytes", "turn_id"]
+  },
+  "SessionArtifactDeleted": {
+    "sources": ["#/components/schemas/DeletedSessionArtifactResource"],
+    "order": ["id", "object", "deleted"]
+  },
+  "SessionArtifactList": {
+    "sources": ["#/components/schemas/SessionArtifactListResource"],
+    "order": ["object", "first_id", "last_id", "data", "has_more"]
+  },
+  "SessionDeleted": {
+    "sources": ["#/components/schemas/DeletedSessionResource"],
+    "order": ["id", "deleted", "object"]
+  },
+  "SessionEnvironment": {
+    "sources": ["#/components/schemas/EnvironmentResource"],
+    "fields": {
+      "id": {"type": "string"},
+      "capability_directories": {"type": "*[]string"},
+      "remote_url": {"type": "string"},
+      "workspace_directory": {"type": "string"},
+      "files": {"type": "*[]json.RawMessage"},
+      "plugins": {"type": "*[]json.RawMessage"},
+      "skills": {"type": "*[]json.RawMessage"}
+    },
+    "order": ["type", "id", "capability_directories", "remote_url", "workspace_directory", "network", "packages", "files", "plugins", "skills"]
+  },
+  "SessionEnvironmentState": {
+    "sources": ["#/components/schemas/SessionEnvironmentStateResource"],
+    "fields": {
+      "error": {"type": "*StreamError"}
+    },
+    "order": ["id", "type", "status", "error"]
+  },
+  "SessionEvent": {
+    "sources": ["#/components/schemas/SessionEvent"],
+    "fields": {
+      "subagent": {"type": "*Subagent"},
+      "session_id": {"type": "string"},
+      "turn_id": {"type": "string"},
+      "session": {"type": "*Session"},
+      "turn": {"type": "*Turn"},
+      "item": {"type": "*Item"},
+      "item_id": {"type": "string"},
+      "output_index": {"type": "*int32"},
+      "content_index": {"type": "*int"},
+      "part": {"type": "*ItemContent"},
+      "usage": {"type": "*TokenUsage"}
+    },
+    "order": ["subagent", "type", "event_id", "session_id", "turn_id", "session", "turn", "item", "item_id", "output_index", "content_index", "part", "delta", "text", "error", "environment", "usage"]
+  },
+  "SessionInput": {
+    "sources": ["#/components/schemas/SessionInputParam"],
+    "fields": {
+      "call_id": {"type": "string"},
+      "turn_id": {"type": "string"},
+      "error": {"type": "json.RawMessage"},
+      "output": {"type": "any"}
+    },
+    "order": ["type", "input", "call_id", "turn_id", "success", "error", "output"]
+  },
+  "SessionList": {
+    "sources": ["#/components/schemas/SessionListResource"],
+    "order": ["object", "first_id", "last_id", "data", "has_more"]
+  },
+  "Skill": {
+    "sources": ["#/components/schemas/SkillResource"],
+    "order": ["id", "object", "created_at", "name", "description", "default_version", "latest_version"]
+  },
+  "SkillDeleted": {
+    "sources": ["#/components/schemas/DeletedSkillResource"],
+    "order": ["id", "object", "deleted"]
+  },
+  "SkillList": {
+    "sources": ["#/components/schemas/SkillListResource"],
+    "order": ["object", "data", "first_id", "last_id", "has_more"]
+  },
+  "SkillUpdateRequest": {
+    "sources": ["#/components/schemas/SetDefaultSkillVersionBody"],
+    "order": ["default_version"]
+  },
+  "SkillVersion": {
+    "sources": ["#/components/schemas/SkillVersionResource"],
+    "order": ["id", "object", "created_at", "skill_id", "version", "name", "description"]
+  },
+  "SkillVersionDeleted": {
+    "sources": ["#/components/schemas/DeletedSkillVersionResource"],
+    "order": ["id", "object", "version", "deleted"]
+  },
+  "SkillVersionList": {
+    "sources": ["#/components/schemas/SkillVersionListResource"],
+    "order": ["object", "data", "first_id", "last_id", "has_more"]
+  },
+  "SourceFile": {
+    "sources": ["#/components/schemas/OpenAIFile"],
+    "fields": {
+      "expires_at": {"omit": false},
+      "status_details": {"omit": false}
+    },
+    "order": ["id", "object", "bytes", "created_at", "filename", "purpose", "status", "expires_at", "status_details"]
+  },
+  "SourceFileDeleted": {
+    "sources": ["#/components/schemas/DeleteFileResponse"],
+    "order": ["id", "object", "deleted"]
+  },
+  "SourceFileList": {
+    "sources": ["#/components/schemas/ListFilesResponse"],
+    "fields": {
+      "first_id": {"type": "*string"},
+      "last_id": {"type": "*string"}
+    },
+    "order": ["object", "data", "has_more", "first_id", "last_id"]
+  },
+  "StreamError": {
+    "sources": ["#/components/schemas/SessionErrorResource"],
+    "fields": {
+      "code": {"type": "string"},
+      "param": {"omit": true}
+    },
+    "order": ["code", "type", "message", "param"]
+  },
+  "Subagent": {
+    "sources": ["#/components/schemas/SubagentResource"],
+    "order": ["id", "object", "session_id", "parent_agent_id", "opened_at", "closed_at", "name", "instructions", "status"]
+  },
+  "SubagentControlCallItem": {
+    "sources": ["#/components/schemas/ResumeSubagentCallItemResource", "#/components/schemas/InterruptSubagentCallItemResource", "#/components/schemas/CloseSubagentCallItemResource"],
+    "order": ["id", "turn_id", "type", "status", "sender_agent_id", "recipient_agent_id"]
+  },
+  "SubagentList": {
+    "sources": ["#/paths/~1agents~1sessions~1{session_id}~1subagents/get/responses/200/content/application~1json/schema"],
+    "order": ["object", "first_id", "last_id", "data", "has_more"]
+  },
+  "SummaryText": {
+    "sources": ["#/components/schemas/SummaryTextResource"],
+    "order": ["type", "text"]
+  },
+  "TextConfig": {
+    "sources": ["#/components/schemas/TextResource"],
+    "order": ["format", "verbosity"],
+    "fields": {
+      "format": {"type": "TextFormat"}
+    }
+  },
+  "TextConfigInput": {
+    "sources": ["#/components/schemas/TextParam"],
+    "fields": {
+      "format": {"type": "*TextFormat"}
+    },
+    "order": ["format", "verbosity"]
+  },
+  "TextFormat": {
+    "sources": ["#/components/schemas/TextFormatResource"],
+    "fields": {
+      "schema": {"type": "json.RawMessage"}
+    },
+    "order": ["type", "schema"]
+  },
+  "TokenUsage": {
+    "sources": ["#/components/schemas/TokenUsageResource"],
+    "order": ["input_tokens", "input_tokens_details", "output_tokens", "output_tokens_details", "total_tokens"]
+  },
+  "Turn": {
+    "sources": ["#/components/schemas/TurnResource"],
+    "fields": {
+      "error": {"type": "*TurnError"},
+      "usage": {"type": "*TokenUsage"}
+    },
+    "order": ["id", "agent_id", "subagent_id", "session_id", "object", "status", "created_at", "started_at", "completed_at", "error", "usage"]
+  },
+  "TurnError": {
+    "sources": ["#/components/schemas/SessionTurnErrorResource"],
+    "order": ["code", "message"]
+  },
+  "TurnList": {
+    "sources": ["#/components/schemas/SessionTurnListResource"],
+    "order": ["object", "first_id", "last_id", "data", "has_more"]
+  },
+  "UpdateAgentRequest": {
+    "sources": ["#/components/schemas/UpdateAgentParams"],
+    "fields": {
+      "x_agents_core": {"type": "*SavedAgentCoreInput"},
+      "metadata": {"type": "map[string]*string"},
+      "reasoning": {"type": "*Reasoning"},
+      "text": {"type": "*SavedAgentTextInput"}
+    },
+    "order": ["x_agents_core", "model", "name", "instructions", "metadata", "multi_agent", "reasoning", "service_tier", "text", "tools"]
+  },
+  "UpdateCredentialRequest": {
+    "sources": ["#/components/schemas/RotateVaultCredentialParams"],
+    "fields": {
+      "auth": {"type": "*CredentialAuthReplacement"}
+    },
+    "order": ["auth"]
+  },
+  "UpdateSessionRequest": {
+    "sources": ["#/components/schemas/UpdateAgentSessionParams"],
+    "fields": {
+      "metadata": {"omit": false}
+    },
+    "order": ["metadata"]
+  },
+  "Vault": {
+    "sources": ["#/components/schemas/VaultResource"],
+    "order": ["id", "object", "created_at", "name", "metadata"]
+  },
+  "VaultDeleted": {
+    "sources": ["#/components/schemas/DeletedVaultResource"],
+    "order": ["id", "deleted", "object"]
+  },
+  "VaultList": {
+    "sources": ["#/components/schemas/VaultListResource"],
+    "order": ["object", "data", "has_more", "first_id", "last_id"]
+  },
+  "WaitForSubagentsCallItem": {
+    "sources": ["#/components/schemas/WaitForSubagentsCallItemResource"],
+    "order": ["id", "turn_id", "type", "status", "sender_agent_id", "recipient_agent_ids"]
+  },
+  "WebSearchAction": {
+    "marshal_union": true,
+    "sources": ["#/components/schemas/WebSearchActionResource"],
+    "order": ["type", "query", "queries", "url", "pattern"]
+  },
+  "reasoningResponse": {
+    "sources": ["#/components/schemas/ReasoningResource"],
+    "order": ["effort", "summary"]
+  },
+  "sessionError": {
+    "sources": ["#/components/schemas/SessionErrorResource"],
+    "fields": {
+      "code": {"type": "string"}
+    },
+    "order": ["code", "type", "message", "param"]
+  }
+}
diff --git a/contracts/agents-api/index.md b/contracts/agents-api/index.md
index be6bed469..87dd67793 100644
--- a/contracts/agents-api/index.md
+++ b/contracts/agents-api/index.md
@@ -9,10 +9,18 @@ Core targets the complete OpenAI Agents API as pinned below ([public API rule](h
 | File | Contents |
 | --- | --- |
 | [upstream.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream.json) | The pin: [openai-python](https://github.com/openai/openai-python/tree/d7c41efee1b0802b79f3f88a678ef2052b06e9ce/src/openai/resources/beta/agents) 3.13.0 at commit `d7c41ef`, resources under `beta/agents`, Beta header `agents=v1` |
-| [upstream-routes.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream-routes.json), [upstream-fields.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream-fields.json) | The 58 method and path pairs and their official fields: 42 operations under `beta/agents`, 5 Files and 11 Skills operations. `scripts/extract-agents-api-upstream.py` extracts them from the pinned SDK; run it with that SDK installed |
-| [openapi.yaml](./openapi.yaml) | Core's public schema, generated by `make openapi` from the route annotations in `services/core/internal/api/` and the wire types in [`v1/`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/contracts/agents-api/v1) |
+| [upstream/openapi.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream/openapi.json) | Unmodified official OpenAPI 3.1 at commit `046a2a0f325bf11f97966f2729219f27281ba71e`, published on 2026-09-10. Its 58 Agents, Vaults, Files and Skills operations match the pinned SDK route set. `upstream.json` records the SHA-256 checksum |
+| [upstream-routes.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream-routes.json) | The normalized method/path inventory generated from the official schema |
+| [openapi.yaml](./openapi.yaml) | The official public contract with Core's `x_agents_core` extension on Agent and Session request/response objects |
+| [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go names, field representations, encoding order and stored projections; it does not define official field membership, enums or constraints |
 
-Contract tests hold Core to the pin: the router and `openapi.yaml` serve exactly the pinned routes (`services/core/internal/api/routing_test.go`, `v1/upstream_contract_test.go`), every query parameter and field is official, and Core-only fields sit only inside `x_agents_core` on Agents and Sessions. Swagger 2.0 cannot express string-or-array unions, so `openapi.yaml` leaves Session `input` and function-result `output` unconstrained; the pinned types and Core's validation define them. Operations and fields newer than the pin wait for a protocol upgrade.
+Run `make openapi` to regenerate the public Go types, route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The internal `/core/v1` and `/api/v1` documents come from handler annotations. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
+
+The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` controls their Go representation where existing storage or custom JSON encoding requires it. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, request admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
+
+The official source and existing service have these recorded differences: Agents authentication errors can return a null `code`; empty Files pages return null `first_id` and `last_id`; File resources can return null `expires_at` and `status_details`. The source declares those fields non-null. The official-client response validator allows null only for these named fields and otherwise validates OpenAPI 3.1 response schemas. Files and Skills operations omit error responses in the source, so those error bodies use the upstream shared `ErrorResponse` schema. [Wire semantics](./wire-semantics.md) and raw HTTP tests qualify service behavior; the published schema retains the official definitions.
+
+Go input projections exclude `packages.system` to preserve its explicit rejection, recorded below. Generation does not enable an unsupported operation or change stored setup validation.
 
 Evidence for a status comes from the pinned official SDK and raw HTTP against the running service, as [CONTRIBUTING](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#compatibility-evidence) requires.
 
diff --git a/contracts/agents-api/openapi.yaml b/contracts/agents-api/openapi.yaml
index 64c942b2e..1885da9ed 100644
--- a/contracts/agents-api/openapi.yaml
+++ b/contracts/agents-api/openapi.yaml
@@ -1,5429 +1,19444 @@
-basePath: /v1
-definitions:
-  v1.APIError:
-    properties:
-      code:
-        type: string
-        x-nullable: true
-      message:
-        type: string
-      param:
-        type: string
-        x-nullable: true
-      type:
-        type: string
-    required:
-    - message
-    - type
-    type: object
-  v1.Agent:
-    properties:
-      id:
-        type: string
-      instructions:
-        type: string
-        x-nullable: true
-      model:
-        type: string
-      multi_agent:
-        $ref: '#/definitions/v1.MultiAgentConfig'
-      name:
-        type: string
-        x-nullable: true
-      reasoning:
-        $ref: '#/definitions/v1.Reasoning'
-      service_tier:
-        enum:
-        - auto
-        type: string
-      text:
-        $ref: '#/definitions/v1.TextConfig'
-      tools:
-        items:
-          type: object
-        type: array
-      x_agents_core:
-        allOf:
-        - $ref: '#/definitions/v1.AgentsCore'
-        x-nullable: true
-    required:
-    - id
-    - model
-    - multi_agent
-    - reasoning
-    - service_tier
-    - text
-    - tools
-    type: object
-  v1.AgentContent:
-    properties:
-      encrypted_content:
-        type: string
-      text:
-        type: string
-      type:
-        enum:
-        - output_text
-        - encrypted_content
-        type: string
-    required:
-    - type
-    type: object
-  v1.AgentDeleted:
-    properties:
-      deleted:
-        enum:
-        - true
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - agent.deleted
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    type: object
-  v1.AgentsCore:
-    properties:
-      harness:
-        enum:
-        - claude_sdk
-        - codex
-        - mcode
-        type: string
-      harness_config:
-        type: object
-    type: object
-  v1.CreateAgentRequest:
-    properties:
-      instructions:
-        type: string
-        x-nullable: true
-      metadata:
-        additionalProperties:
-          type: string
-        type: object
-        x-nullable: true
-      model:
-        type: string
-      multi_agent:
-        type: object
-        x-nullable: true
-      name:
-        maxLength: 128
-        type: string
-        x-nullable: true
-      reasoning:
-        allOf:
-        - $ref: '#/definitions/v1.Reasoning'
-        x-nullable: true
-      service_tier:
-        enum:
-        - auto
-        - default
-        - flex
-        - priority
-        - fast
-        type: string
-        x-nullable: true
-      text:
-        allOf:
-        - $ref: '#/definitions/v1.SavedAgentTextInput'
-        x-nullable: true
-      tools:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      x_agents_core:
-        allOf:
-        - $ref: '#/definitions/v1.SavedAgentCoreInput'
-        x-nullable: true
-    required:
-    - model
-    type: object
-  v1.CreateCredentialRequest:
-    properties:
-      auth:
-        $ref: '#/definitions/v1.CredentialAuthInput'
-      name:
-        type: string
-    required:
-    - auth
-    - name
-    type: object
-  v1.CreateEventsRequest:
-    properties:
-      events:
-        items:
-          $ref: '#/definitions/v1.SessionInput'
-        type: array
-    required:
-    - events
-    type: object
-  v1.CreateSessionRequest:
-    properties:
-      agent:
-        $ref: '#/definitions/v1.InlineAgent'
-      agent_id:
-        type: string
-      environment:
-        $ref: '#/definitions/v1.Environment'
-      input:
-        description: |-
-          Input accepts a string or an ordered array of user InputMessage objects.
-          Required for none and streamed creation outside self_hosted; otherwise optional.
-        x-nullable: true
-      metadata:
-        additionalProperties:
-          type: string
-        type: object
-        x-nullable: true
-      stream:
-        default: false
-        type: boolean
-      vault_ids:
-        items:
-          type: string
-        type: array
-      x_agents_core:
-        $ref: '#/definitions/v1.SessionExecutionInput'
-    required:
-    - environment
-    type: object
-  v1.CreateVaultRequest:
-    properties:
-      metadata:
-        additionalProperties:
-          type: string
-        type: object
-        x-nullable: true
-      name:
-        type: string
-    type: object
-  v1.Credential:
-    properties:
-      auth:
-        $ref: '#/definitions/v1.CredentialAuth'
-      created_at:
-        type: integer
-      id:
-        type: string
-      name:
-        type: string
-      object:
-        enum:
-        - vault.credential
-        type: string
-      updated_at:
-        type: integer
-      vault_id:
-        type: string
-    required:
-    - auth
-    - created_at
-    - id
-    - name
-    - object
-    - updated_at
-    - vault_id
-    type: object
-  v1.CredentialAuth:
-    properties:
-      expires_at:
-        type: string
-        x-nullable: true
-      mcp_server_url:
-        type: string
-      refresh:
-        allOf:
-        - $ref: '#/definitions/v1.OAuthCredentialRefresh'
-        x-nullable: true
-      type:
-        enum:
-        - static_bearer
-        - mcp_oauth
-        type: string
-    required:
-    - mcp_server_url
-    - type
-    type: object
-  v1.CredentialAuthInput:
-    properties:
-      access_token:
-        minLength: 1
-        type: string
-      expires_at:
-        type: string
-        x-nullable: true
-      mcp_server_url:
-        type: string
-      refresh:
-        allOf:
-        - $ref: '#/definitions/v1.OAuthCredentialRefreshInput'
-        x-nullable: true
-      token:
-        minLength: 1
-        type: string
-      type:
-        enum:
-        - static_bearer
-        - mcp_oauth
-        type: string
-    required:
-    - mcp_server_url
-    - type
-    type: object
-  v1.CredentialAuthReplacement:
-    properties:
-      access_token:
-        minLength: 1
-        type: string
-        x-nullable: true
-      expires_at:
-        type: string
-        x-nullable: true
-      refresh:
-        allOf:
-        - $ref: '#/definitions/v1.OAuthCredentialRefreshReplacement'
-        x-nullable: true
-      token:
-        minLength: 1
-        type: string
-      type:
-        enum:
-        - static_bearer
-        - mcp_oauth
-        type: string
-    required:
-    - type
-    type: object
-  v1.CredentialDeleted:
-    properties:
-      deleted:
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - vault.credential.deleted
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    type: object
-  v1.CredentialList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.Credential'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.Environment:
-    properties:
-      capability_directories:
-        items:
-          type: string
-        type: array
-        x-nullable: true
-      env:
-        additionalProperties:
-          type: string
-        type: object
-        x-nullable: true
-      environment_template_id:
-        type: string
-      files:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      network:
-        allOf:
-        - $ref: '#/definitions/v1.EnvironmentNetworkInput'
-        x-nullable: true
-      packages:
-        allOf:
-        - $ref: '#/definitions/v1.EnvironmentPackages'
-        x-nullable: true
-      plugins:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      setup_commands:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      skills:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      type:
-        enum:
-        - none
-        - self_hosted
-        - openai_hosted
-        type: string
-      workspace_directory:
-        type: string
-    required:
-    - type
-    type: object
-  v1.EnvironmentFile:
-    properties:
-      environment_id:
-        type: string
-      object:
-        enum:
-        - agent.environment.file
-        type: string
-      path:
-        type: string
-      size_bytes:
-        minimum: 0
-        type: integer
-    required:
-    - environment_id
-    - object
-    - path
-    - size_bytes
-    type: object
-  v1.EnvironmentFileCreateRequest:
-    properties:
-      data:
-        type: string
-      file_id:
-        type: string
-      path:
-        type: string
-      type:
-        enum:
-        - inline
-        - file_id
-        type: string
-    required:
-    - path
-    - type
-    type: object
-  v1.EnvironmentFileList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.EnvironmentFile'
-        type: array
-      has_more:
-        type: boolean
-      next:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - page
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.EnvironmentInfo:
-    properties:
-      files:
-        items:
-          type: object
-        type: array
-      id:
-        type: string
-      object:
-        enum:
-        - agent.environment
-        type: string
-      plugins:
-        items:
-          type: object
-        type: array
-      skills:
-        items:
-          type: object
-        type: array
-      status:
-        enum:
-        - pending
-        - connected
-        - disconnected
-        - expired
-        - failed
-        type: string
-      type:
-        enum:
-        - openai_hosted
-        - self_hosted
-        type: string
-    required:
-    - files
-    - id
-    - object
-    - plugins
-    - skills
-    - status
-    - type
-    type: object
-  v1.EnvironmentInstallation:
-    properties:
-      commands:
-        additionalProperties:
-          type: string
-        type: object
-      expires_at:
-        type: integer
-      message:
-        type: string
-      status:
-        enum:
-        - available
-        - unavailable
-        type: string
-      version:
-        type: string
-    type: object
-  v1.EnvironmentNetwork:
-    properties:
-      access:
-        enum:
-        - enabled
-        - disabled
-        - restricted
-        type: string
-      allowed_domains:
-        items:
-          type: string
-        type: array
-    required:
-    - access
-    - allowed_domains
-    type: object
-  v1.EnvironmentNetworkInput:
-    properties:
-      access:
-        enum:
-        - enabled
-        - disabled
-        - restricted
-        type: string
-      allowed_domains:
-        items:
-          type: string
-        type: array
-        x-nullable: true
-    required:
-    - access
-    type: object
-  v1.EnvironmentPackages:
-    properties:
-      npm:
-        items:
-          type: string
-        type: array
-      python:
-        items:
-          type: string
-        type: array
-    required:
-    - npm
-    - python
-    type: object
-  v1.EnvironmentPackagesInput:
-    properties:
-      npm:
-        items:
-          type: string
-        type: array
-        x-nullable: true
-      python:
-        items:
-          type: string
-        type: array
-        x-nullable: true
-    type: object
-  v1.EnvironmentPackagesResponse:
-    properties:
-      npm:
-        items:
-          type: string
-        type: array
-      python:
-        items:
-          type: string
-        type: array
-      system:
-        items:
-          type: string
-        type: array
-    required:
-    - npm
-    - python
-    - system
-    type: object
-  v1.EnvironmentTemplate:
-    properties:
-      capability_directories:
-        items:
-          type: string
-        type: array
-      created_at:
-        type: integer
-      files:
-        items:
-          type: object
-        type: array
-      id:
-        type: string
-      name:
-        type: string
-        x-nullable: true
-      network:
-        $ref: '#/definitions/v1.EnvironmentNetwork'
-      object:
-        enum:
-        - agent.environment.template
-        type: string
-      packages:
-        $ref: '#/definitions/v1.EnvironmentPackagesResponse'
-      plugins:
-        items:
-          type: object
-        type: array
-      skills:
-        items:
-          type: object
-        type: array
-      updated_at:
-        type: integer
-    required:
-    - capability_directories
-    - created_at
-    - files
-    - id
-    - network
-    - object
-    - packages
-    - plugins
-    - skills
-    - updated_at
-    type: object
-  v1.EnvironmentTemplateDeleted:
-    properties:
-      deleted:
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - agent.environment.template.deleted
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    type: object
-  v1.EnvironmentTemplateList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.EnvironmentTemplate'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.EnvironmentTemplateRequest:
-    properties:
-      capability_directories:
-        items:
-          type: string
-        type: array
-        x-nullable: true
-      env:
-        additionalProperties:
-          type: string
-        type: object
-        x-nullable: true
-      files:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      name:
-        type: string
-        x-nullable: true
-      network:
-        allOf:
-        - $ref: '#/definitions/v1.EnvironmentNetworkInput'
-        x-nullable: true
-      packages:
-        allOf:
-        - $ref: '#/definitions/v1.EnvironmentPackagesInput'
-        x-nullable: true
-      plugins:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      setup_commands:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      skills:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-    type: object
-  v1.ErrorResponse:
-    properties:
-      error:
-        $ref: '#/definitions/v1.APIError'
-    required:
-    - error
-    type: object
-  v1.InlineAgent:
-    properties:
-      instructions:
-        type: string
-        x-nullable: true
-      model:
-        type: string
-      multi_agent:
-        type: object
-        x-nullable: true
-      reasoning:
-        allOf:
-        - $ref: '#/definitions/v1.Reasoning'
-        x-nullable: true
-      service_tier:
-        enum:
-        - auto
-        - default
-        - flex
-        - priority
-        - fast
-        type: string
-        x-nullable: true
-      text:
-        allOf:
-        - $ref: '#/definitions/v1.SavedAgentTextInput'
-        x-nullable: true
-      tools:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      x_agents_core:
-        allOf:
-        - $ref: '#/definitions/v1.AgentsCore'
-        x-nullable: true
-    type: object
-  v1.InputContent:
-    properties:
-      image_url:
-        type: string
-      text:
-        type: string
-      type:
-        enum:
-        - input_text
-        - input_image
-        type: string
-    required:
-    - type
-    type: object
-  v1.InputMessage:
-    properties:
-      content:
-        items:
-          $ref: '#/definitions/v1.InputContent'
-        type: array
-      role:
-        enum:
-        - user
-        type: string
-      type:
-        enum:
-        - message
-        type: string
-    required:
-    - content
-    - role
-    type: object
-  v1.InputTokenDetails:
-    properties:
-      cached_tokens:
-        type: integer
-    required:
-    - cached_tokens
-    type: object
-  v1.Item:
-    properties:
-      action:
-        $ref: '#/definitions/v1.WebSearchAction'
-      agent_id:
-        type: string
-      arguments: {}
-      call_id:
-        type: string
-      command:
-        type: string
-      content:
-        items:
-          $ref: '#/definitions/v1.ItemContent'
-        type: array
-      cwd:
-        type: string
-      duration_ms:
-        type: integer
-      error: {}
-      exit_code:
-        type: integer
-      id:
-        type: string
-      model:
-        type: string
-      name:
-        type: string
-      output: {}
-      phase:
-        enum:
-        - commentary
-        - final_answer
-        type: string
-        x-nullable: true
-      reasoning_effort:
-        type: string
-      recipient_agent_id:
-        type: string
-      recipient_agent_ids:
-        items:
-          type: string
-        type: array
-      role:
-        enum:
-        - user
-        - assistant
-        type: string
-      sender_agent_id:
-        type: string
-      server_label:
-        type: string
-      status:
-        enum:
-        - in_progress
-        - completed
-        - failed
-        - incomplete
-        type: string
-      summary:
-        items:
-          $ref: '#/definitions/v1.SummaryText'
-        type: array
-      turn_id:
-        type: string
-      type:
-        enum:
-        - message
-        - command_execution
-        - mcp_call
-        - function_call
-        - function_call_output
-        - web_search_call
-        - reasoning
-        - agent_message
-        - create_subagent_call
-        - send_subagent_input_call
-        - resume_subagent_call
-        - wait_for_subagents_call
-        - interrupt_subagent_call
-        - close_subagent_call
-        type: string
-    required:
-    - id
-    - turn_id
-    - type
-    type: object
-  v1.ItemContent:
-    properties:
-      encrypted_content:
-        type: string
-      image_url:
-        type: string
-      text:
-        type: string
-      type:
-        enum:
-        - input_text
-        - output_text
-        - input_image
-        - encrypted_content
-        type: string
-    required:
-    - type
-    type: object
-  v1.ItemList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.Item'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.ModelProviderInput:
-    properties:
-      api_key:
-        type: string
-      base_url:
-        type: string
-      context_window:
-        type: integer
-      max_output_tokens:
-        type: integer
-      protocol:
-        enum:
-        - anthropic
-        - responses
-        - chat_completions
-        type: string
-    required:
-    - api_key
-    - base_url
-    - protocol
-    type: object
-  v1.ModelProviderView:
-    properties:
-      api_key_configured:
-        type: boolean
-      base_url:
-        type: string
-      context_window:
-        type: integer
-      max_output_tokens:
-        type: integer
-      protocol:
-        enum:
-        - anthropic
-        - responses
-        - chat_completions
-        type: string
-    required:
-    - api_key_configured
-    - base_url
-    - protocol
-    type: object
-  v1.MultiAgentConfig:
-    properties:
-      enabled:
-        type: boolean
-      max_concurrent_subagents:
-        type: integer
-        x-nullable: true
-    required:
-    - enabled
-    type: object
-  v1.OAuthCredentialRefresh:
-    properties:
-      client_id:
-        type: string
-      resource:
-        type: string
-        x-nullable: true
-      scope:
-        type: string
-        x-nullable: true
-      token_endpoint:
-        type: string
-      token_endpoint_auth:
-        $ref: '#/definitions/v1.OAuthEndpointAuth'
-    required:
-    - client_id
-    - token_endpoint
-    - token_endpoint_auth
-    type: object
-  v1.OAuthCredentialRefreshInput:
-    properties:
-      client_id:
-        type: string
-      refresh_token:
-        type: string
-      resource:
-        type: string
-        x-nullable: true
-      scope:
-        type: string
-        x-nullable: true
-      token_endpoint:
-        type: string
-      token_endpoint_auth:
-        $ref: '#/definitions/v1.OAuthEndpointAuthInput'
-    required:
-    - client_id
-    - refresh_token
-    - token_endpoint
-    - token_endpoint_auth
-    type: object
-  v1.OAuthCredentialRefreshReplacement:
-    properties:
-      refresh_token:
-        type: string
-        x-nullable: true
-      scope:
-        type: string
-        x-nullable: true
-      token_endpoint_auth:
-        allOf:
-        - $ref: '#/definitions/v1.OAuthEndpointAuthReplacement'
-        x-nullable: true
-    type: object
-  v1.OAuthEndpointAuth:
-    properties:
-      type:
-        enum:
-        - none
-        - client_secret_basic
-        - client_secret_post
-        type: string
-    required:
-    - type
-    type: object
-  v1.OAuthEndpointAuthInput:
-    properties:
-      client_secret:
-        type: string
-      type:
-        enum:
-        - none
-        - client_secret_basic
-        - client_secret_post
-        type: string
-    required:
-    - type
-    type: object
-  v1.OAuthEndpointAuthReplacement:
-    properties:
-      client_secret:
-        type: string
-        x-nullable: true
-      type:
-        enum:
-        - client_secret_basic
-        - client_secret_post
-        type: string
-    required:
-    - type
-    type: object
-  v1.OutputTokenDetails:
-    properties:
-      reasoning_tokens:
-        type: integer
-    required:
-    - reasoning_tokens
-    type: object
-  v1.Reasoning:
-    properties:
-      effort:
-        type: string
-        x-nullable: true
-      summary:
-        type: string
-        x-nullable: true
-    type: object
-  v1.RequiredAction:
-    properties:
-      arguments: {}
-      call_id:
-        type: string
-      environment_id:
-        type: string
-      name:
-        type: string
-      turn_id:
-        type: string
-      type:
-        enum:
-        - function_call
-        - environment_connection
-        type: string
-    required:
-    - type
-    type: object
-  v1.SavedAgent:
-    properties:
-      created_at:
-        type: integer
-      id:
-        type: string
-      instructions:
-        type: string
-        x-nullable: true
-      metadata:
-        additionalProperties:
-          type: string
-        type: object
-      model:
-        type: string
-      multi_agent:
-        $ref: '#/definitions/v1.MultiAgentConfig'
-      name:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - agent
-        type: string
-      reasoning:
-        $ref: '#/definitions/v1.Reasoning'
-      service_tier:
-        enum:
-        - auto
-        - default
-        - flex
-        - priority
-        - fast
-        type: string
-      text:
-        $ref: '#/definitions/v1.SavedAgentText'
-      tools:
-        items:
-          type: object
-        type: array
-      updated_at:
-        type: integer
-      x_agents_core:
-        allOf:
-        - $ref: '#/definitions/v1.SavedAgentCore'
-        x-nullable: true
-    required:
-    - created_at
-    - id
-    - metadata
-    - model
-    - multi_agent
-    - object
-    - reasoning
-    - service_tier
-    - text
-    - tools
-    - updated_at
-    type: object
-  v1.SavedAgentCore:
-    properties:
-      harness:
-        enum:
-        - claude_sdk
-        - codex
-        - mcode
-        type: string
-      harness_config:
-        type: object
-      model_provider:
-        $ref: '#/definitions/v1.ModelProviderView'
-    type: object
-  v1.SavedAgentCoreInput:
-    properties:
-      harness:
-        enum:
-        - claude_sdk
-        - codex
-        - mcode
-        type: string
-      harness_config:
-        type: object
-      model_provider:
-        allOf:
-        - $ref: '#/definitions/v1.ModelProviderInput'
-        x-nullable: true
-    type: object
-  v1.SavedAgentList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.SavedAgent'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.SavedAgentText:
-    properties:
-      format:
-        $ref: '#/definitions/v1.SavedAgentTextFormat'
-      verbosity:
-        enum:
-        - low
-        - medium
-        - high
-        type: string
-    required:
-    - format
-    - verbosity
-    type: object
-  v1.SavedAgentTextFormat:
-    properties:
-      schema:
-        type: object
-      type:
-        enum:
-        - text
-        - json_schema
-        type: string
-    required:
-    - type
-    type: object
-  v1.SavedAgentTextInput:
-    properties:
-      format:
-        type: object
-        x-nullable: true
-      verbosity:
-        enum:
-        - low
-        - medium
-        - high
-        type: string
-        x-nullable: true
-    type: object
-  v1.Session:
-    properties:
-      agent:
-        $ref: '#/definitions/v1.Agent'
-      created_at:
-        type: integer
-      environment:
-        $ref: '#/definitions/v1.SessionEnvironment'
-      error:
-        type: string
-        x-nullable: true
-      id:
-        type: string
-      last_active_at:
-        type: integer
-      metadata:
-        additionalProperties:
-          type: string
-        type: object
-      object:
-        enum:
-        - agent.session
-        type: string
-      required_actions:
-        items:
-          $ref: '#/definitions/v1.RequiredAction'
-        type: array
-      status:
-        enum:
-        - idle
-        - in_progress
-        - requires_action
-        - failed
-        type: string
-      usage:
-        allOf:
-        - $ref: '#/definitions/v1.TokenUsage'
-        x-nullable: true
-      vault_ids:
-        items:
-          type: string
-        type: array
-      x_agents_core:
-        $ref: '#/definitions/v1.SessionCore'
-    required:
-    - agent
-    - created_at
-    - environment
-    - id
-    - last_active_at
-    - metadata
-    - object
-    - required_actions
-    - status
-    - vault_ids
-    type: object
-  v1.SessionArtifact:
-    properties:
-      created_at:
-        type: integer
-      environment_id:
-        type: string
-      id:
-        type: string
-      object:
-        enum:
-        - agent.session.artifact
-        type: string
-      path:
-        type: string
-      session_id:
-        type: string
-      size_bytes:
-        type: integer
-      turn_id:
-        type: string
-    required:
-    - created_at
-    - environment_id
-    - id
-    - object
-    - path
-    - session_id
-    - size_bytes
-    - turn_id
-    type: object
-  v1.SessionArtifactDeleted:
-    properties:
-      deleted:
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - agent.session.artifact.deleted
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    type: object
-  v1.SessionArtifactList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.SessionArtifact'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.SessionCore:
-    properties:
-      installation:
-        $ref: '#/definitions/v1.EnvironmentInstallation'
-    type: object
-  v1.SessionDeleted:
-    properties:
-      deleted:
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - agent.session.deleted
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    type: object
-  v1.SessionEnvironment:
-    properties:
-      capability_directories:
-        items:
-          type: string
-        type: array
-      files:
-        items:
-          type: object
-        type: array
-      id:
-        type: string
-      network:
-        $ref: '#/definitions/v1.EnvironmentNetwork'
-      packages:
-        $ref: '#/definitions/v1.EnvironmentPackagesResponse'
-      plugins:
-        items:
-          type: object
-        type: array
-      remote_url:
-        type: string
-      skills:
-        items:
-          type: object
-        type: array
-      type:
-        enum:
-        - none
-        - self_hosted
-        - openai_hosted
-        type: string
-      workspace_directory:
-        type: string
-    required:
-    - type
-    type: object
-  v1.SessionEnvironmentState:
-    properties:
-      error:
-        allOf:
-        - $ref: '#/definitions/v1.StreamError'
-        x-nullable: true
-      id:
-        type: string
-      status:
-        enum:
-        - pending
-        - ready
-        - connected
-        - disconnected
-        - failed
-        type: string
-      type:
-        type: string
-    required:
-    - id
-    - status
-    - type
-    type: object
-  v1.SessionEvent:
-    properties:
-      content_index:
-        type: integer
-      delta:
-        type: string
-      environment:
-        $ref: '#/definitions/v1.SessionEnvironmentState'
-      error:
-        $ref: '#/definitions/v1.StreamError'
-      event_id:
-        type: string
-      item:
-        $ref: '#/definitions/v1.Item'
-      item_id:
-        type: string
-      output_index:
-        type: integer
-        x-nullable: true
-      part:
-        $ref: '#/definitions/v1.ItemContent'
-      session:
-        $ref: '#/definitions/v1.Session'
-      session_id:
-        type: string
-      subagent:
-        $ref: '#/definitions/v1.Subagent'
-      text:
-        type: string
-      turn:
-        $ref: '#/definitions/v1.Turn'
-      turn_id:
-        type: string
-      type:
-        type: string
-      usage:
-        allOf:
-        - $ref: '#/definitions/v1.TokenUsage'
-        description: |-
-          Usage is present only on terminal Turn events, where it mirrors the Turn
-          snapshot and is null when unknown. Other events omit it.
-        x-nullable: true
-    required:
-    - event_id
-    - type
-    type: object
-  v1.SessionExecutionInput:
-    properties:
-      environment:
-        description: Environment supplies placement-independent preparation through
-          the Core extension.
-        type: object
-      harness_config:
-        type: object
-      model_provider:
-        $ref: '#/definitions/v1.ModelProviderInput'
-    type: object
-  v1.SessionInput:
-    properties:
-      call_id:
-        type: string
-      error:
-        type: string
-        x-nullable: true
-      input:
-        items:
-          $ref: '#/definitions/v1.InputMessage'
-        type: array
-      output:
-        x-nullable: true
-      success:
-        type: boolean
-      turn_id:
-        type: string
-      type:
-        enum:
-        - agent.session.input.message
-        - agent.session.input.cancel
-        - agent.session.input.tool_result
-        type: string
-    required:
-    - type
-    type: object
-  v1.SessionList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.Session'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.Skill:
-    properties:
-      created_at:
-        type: integer
-      default_version:
-        type: string
-      description:
-        type: string
-      id:
-        type: string
-      latest_version:
-        type: string
-      name:
-        type: string
-      object:
-        enum:
-        - skill
-        type: string
-    required:
-    - created_at
-    - default_version
-    - description
-    - id
-    - latest_version
-    - name
-    - object
-    type: object
-  v1.SkillDeleted:
-    properties:
-      deleted:
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - skill.deleted
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    type: object
-  v1.SkillList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.Skill'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.SkillUpdateRequest:
-    properties:
-      default_version:
-        type: string
-    required:
-    - default_version
-    type: object
-  v1.SkillVersion:
-    properties:
-      created_at:
-        type: integer
-      description:
-        type: string
-      id:
-        type: string
-      name:
-        type: string
-      object:
-        enum:
-        - skill.version
-        type: string
-      skill_id:
-        type: string
-      version:
-        type: string
-    required:
-    - created_at
-    - description
-    - id
-    - name
-    - object
-    - skill_id
-    - version
-    type: object
-  v1.SkillVersionDeleted:
-    properties:
-      deleted:
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - skill.version.deleted
-        type: string
-      version:
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    - version
-    type: object
-  v1.SkillVersionList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.SkillVersion'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.SourceFile:
-    properties:
-      bytes:
-        minimum: 0
-        type: integer
-      created_at:
-        type: integer
-      expires_at:
-        type: integer
-        x-nullable: true
-      filename:
-        type: string
-      id:
-        type: string
-      object:
-        enum:
-        - file
-        type: string
-      purpose:
-        enum:
-        - user_data
-        type: string
-      status:
-        enum:
-        - processed
-        type: string
-      status_details:
-        type: string
-        x-nullable: true
-    required:
-    - bytes
-    - created_at
-    - filename
-    - id
-    - object
-    - purpose
-    - status
-    type: object
-  v1.SourceFileDeleted:
-    properties:
-      deleted:
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - file
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    type: object
-  v1.SourceFileList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.SourceFile'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.StreamError:
-    properties:
-      code:
-        type: string
-      message:
-        type: string
-      param:
-        description: |-
-          Param is the pinned SessionError field. An error SessionEvent always
-          carries it, null when unset; Environment state errors and Core's own
-          stream_interrupted frame omit it.
-        type: string
-        x-nullable: true
-      type:
-        type: string
-    type: object
-  v1.Subagent:
-    properties:
-      closed_at:
-        type: integer
-        x-nullable: true
-      id:
-        type: string
-      instructions:
-        items:
-          $ref: '#/definitions/v1.AgentContent'
-        type: array
-        x-nullable: true
-      name:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - agent.session.subagent
-        type: string
-      opened_at:
-        type: integer
-      parent_agent_id:
-        type: string
-      session_id:
-        type: string
-      status:
-        enum:
-        - active
-        - closed
-        type: string
-    required:
-    - id
-    - object
-    - opened_at
-    - parent_agent_id
-    - session_id
-    - status
-    type: object
-  v1.SubagentList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.Subagent'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.SummaryText:
-    properties:
-      text:
-        type: string
-      type:
-        enum:
-        - summary_text
-        type: string
-    required:
-    - text
-    - type
-    type: object
-  v1.TextConfig:
-    properties:
-      format:
-        $ref: '#/definitions/v1.TextFormat'
-      verbosity:
-        enum:
-        - low
-        - medium
-        - high
-        type: string
-    required:
-    - format
-    - verbosity
-    type: object
-  v1.TextFormat:
-    properties:
-      schema:
-        type: object
-      type:
-        enum:
-        - text
-        - json_schema
-        type: string
-    required:
-    - type
-    type: object
-  v1.TokenUsage:
-    properties:
-      input_tokens:
-        type: integer
-      input_tokens_details:
-        $ref: '#/definitions/v1.InputTokenDetails'
-      output_tokens:
-        type: integer
-      output_tokens_details:
-        $ref: '#/definitions/v1.OutputTokenDetails'
-      total_tokens:
-        type: integer
-    required:
-    - input_tokens
-    - input_tokens_details
-    - output_tokens
-    - output_tokens_details
-    - total_tokens
-    type: object
-  v1.Turn:
-    properties:
-      agent_id:
-        type: string
-      completed_at:
-        type: integer
-        x-nullable: true
-      created_at:
-        type: integer
-      error:
-        allOf:
-        - $ref: '#/definitions/v1.TurnError'
-        x-nullable: true
-      id:
-        type: string
-      object:
-        enum:
-        - agent.session.turn
-        type: string
-      session_id:
-        type: string
-      started_at:
-        type: integer
-        x-nullable: true
-      status:
-        enum:
-        - queued
-        - in_progress
-        - waiting
-        - completed
-        - failed
-        - cancelled
-        type: string
-      subagent_id:
-        type: string
-        x-nullable: true
-      usage:
-        allOf:
-        - $ref: '#/definitions/v1.TokenUsage'
-        x-nullable: true
-    required:
-    - agent_id
-    - created_at
-    - id
-    - object
-    - session_id
-    - status
-    type: object
-  v1.TurnError:
-    properties:
-      code:
-        enum:
-        - context_length_exceeded
-        - session_budget_exceeded
-        - usage_limit_exceeded
-        - rate_limit_exceeded
-        - server_overloaded
-        - cyber_policy
-        - connection_failed
-        - server_error
-        - authentication_error
-        - invalid_request
-        - resource_not_found
-        - sandbox_error
-        - executor_version_incompatible
-        - active_turn_not_steerable
-        - request_timeout
-        - internal_error
-        type: string
-      message:
-        type: string
-    required:
-    - code
-    - message
-    type: object
-  v1.TurnList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.Turn'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.UpdateAgentRequest:
-    properties:
-      instructions:
-        type: string
-        x-nullable: true
-      metadata:
-        additionalProperties:
-          type: string
-        type: object
-        x-nullable: true
-      model:
-        type: string
-      multi_agent:
-        type: object
-        x-nullable: true
-      name:
-        maxLength: 128
-        type: string
-        x-nullable: true
-      reasoning:
-        allOf:
-        - $ref: '#/definitions/v1.Reasoning'
-        x-nullable: true
-      service_tier:
-        enum:
-        - auto
-        - default
-        - flex
-        - priority
-        - fast
-        type: string
-        x-nullable: true
-      text:
-        allOf:
-        - $ref: '#/definitions/v1.SavedAgentTextInput'
-        x-nullable: true
-      tools:
-        items:
-          type: object
-        type: array
-        x-nullable: true
-      x_agents_core:
-        allOf:
-        - $ref: '#/definitions/v1.SavedAgentCoreInput'
-        x-nullable: true
-    type: object
-  v1.UpdateCredentialRequest:
-    properties:
-      auth:
-        $ref: '#/definitions/v1.CredentialAuthReplacement'
-    required:
-    - auth
-    type: object
-  v1.UpdateSessionRequest:
-    properties:
-      metadata:
-        additionalProperties:
-          type: string
-        type: object
-        x-nullable: true
-    required:
-    - metadata
-    type: object
-  v1.Vault:
-    properties:
-      created_at:
-        type: integer
-      id:
-        type: string
-      metadata:
-        additionalProperties:
-          type: string
-        type: object
-      name:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - vault
-        type: string
-    required:
-    - created_at
-    - id
-    - metadata
-    - object
-    type: object
-  v1.VaultDeleted:
-    properties:
-      deleted:
-        type: boolean
-      id:
-        type: string
-      object:
-        enum:
-        - vault.deleted
-        type: string
-    required:
-    - deleted
-    - id
-    - object
-    type: object
-  v1.VaultList:
-    properties:
-      data:
-        items:
-          $ref: '#/definitions/v1.Vault'
-        type: array
-      first_id:
-        type: string
-        x-nullable: true
-      has_more:
-        type: boolean
-      last_id:
-        type: string
-        x-nullable: true
-      object:
-        enum:
-        - list
-        type: string
-    required:
-    - data
-    - has_more
-    - object
-    type: object
-  v1.WebSearchAction:
-    properties:
-      pattern:
-        type: string
-      queries:
-        items:
-          type: string
-        type: array
-      query:
-        type: string
-      type:
-        enum:
-        - search
-        - open_page
-        - find_in_page
-        - other
-        type: string
-      url:
-        type: string
-    required:
-    - type
-    type: object
-info:
-  contact: {}
-  description: Supported single-Agent execution resources from the pinned openai-python
-    beta/agents contract. Bearer keys bind an execution principal to one project;
-    optional OpenAI-Organization and OpenAI-Project headers must match that binding.
-  license:
-    name: Apache 2.0
-    url: https://www.apache.org/licenses/LICENSE-2.0.html
-  title: OpenAgentCore Agents API
-  version: "1"
-paths:
-  /agents:
-    get:
-      description: Lists only the authenticated tenant's saved Agents, independently
-        of Sessions. Limit 0 is treated as 1 and larger limits as 100, as observed
-        on the hosted service. The local default is 20; exact upstream default/cap
-        and empty cursor fields remain unverified. An unknown, malformed or foreign
-        after cursor returns not found.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Last Agent ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size; 0 is treated as 1 and values above 100 as 100
-        in: query
-        minimum: 0
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SavedAgentList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List reusable Agents
-      tags:
-      - Agents
-    post:
-      consumes:
-      - application/json
-      description: 'Persists configuration independently of execution. Names over
-        128 characters and metadata outside 16 string pairs with 64-character keys
-        and 512-character values return invalid_request_error with the official param;
-        U+0000 in stored strings is rejected as a local storage limit. As on every
-        Agents API JSON route, a non-JSON Content-Type, invalid UTF-8, malformed JSON,
-        a repeated key at any depth or a non-object root returns invalid_request_error
-        with a null param and the official message before other checks; an empty or
-        null body is {}. Missing, unknown, wrongly typed or unsupported enum members
-        of the pinned configuration shapes (tools, text, reasoning, service_tier,
-        multi_agent) return invalid_request_error with the JSON path as param; duplicate
-        function names, repeated web_search or tool_search and non-object schema root
-        types return it with a null param. Supports model/name/instructions/metadata,
-        explicit reasoning and service tiers, multi_agent, text/json_schema, function/tool_search/programmatic_tool_calling/web_search
-        and HTTP MCP with nullable credential_id, service origin (omitted or null
-        on HTTP transport is saved as service) and boolean required defaulting to
-        false. Saving credential_id grants no access: Session admission checks attached
-        Vault ownership and destination. MCP allowed_tools preserves null versus empty;
-        saved HTTP transport includes empty headers. Model-derived reasoning defaults,
-        other MCP variants and public retry conformance remain incomplete. web_search
-        saves every pinned mode: omitted or null mode is saved as live and omitted
-        or null context_size as medium; allowed_domains preserves null versus empty
-        and a present location, including {}, includes all four keys with null for
-        omitted ones, as observed officially (req_db41d2f6261b4abfb69465eafe719ab5,
-        req_165d53b88445490b9146d8272c54134d). Session execution accepts only explicit
-        disabled web_search and disabled programmatic_tool_calling through qualified
-        Runtime controls; saved enabled forms reject at Session admission. Session
-        execution admits only its supported configuration subset.'
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Reusable Agent configuration
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.CreateAgentRequest'
-      produces:
-      - application/json
-      responses:
-        "201":
-          description: Created
-          schema:
-            $ref: '#/definitions/v1.SavedAgent'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Create a reusable Agent
-      tags:
-      - Agents
-  /agents/{agent_id}:
-    delete:
-      description: Deletes only the authenticated tenant's saved configuration. Existing
-        Session snapshots, history and recorded creation retry identities remain independent.
-        Missing and repeated deletion locally return404; exact hosted error and in-flight
-        creation/deletion semantics remain unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Agent ID
-        in: path
-        name: agent_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.AgentDeleted'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Delete a reusable Agent
-      tags:
-      - Agents
-    get:
-      description: Reads the saved resource owned by the authenticated tenant, independently
-        of execution Sessions.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Agent ID
-        in: path
-        name: agent_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SavedAgent'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve a reusable Agent
-      tags:
-      - Agents
-    post:
-      consumes:
-      - application/json
-      description: Preserves omitted fields and replaces supplied fields using shared
-        saved-configuration validation. Null name/instructions clear; null or empty
-        metadata clears all pairs. Name, metadata and configuration validation errors
-        return invalid_request_error with the official param, using the Agent create
-        rules before the Agent lookup. Existing Session snapshots are unchanged. Empty
-        updates advance updated_at without changing saved fields. Nested replacement/null
-        defaults, model-derived reasoning and exact hosted error behavior remain incompletely
-        verified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Agent ID
-        in: path
-        name: agent_id
-        required: true
-        type: string
-      - description: Supplied reusable Agent fields
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.UpdateAgentRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SavedAgent'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Update a reusable Agent
-      tags:
-      - Agents
-  /agents/environments/{environment_id}:
-    get:
-      description: Returns durable connection status and safe installed metadata for
-        supported self_hosted and basic openai_hosted profiles. Initial files expose
-        frozen safe metadata without content; Plugin/Skill entries expose only safe
-        configured installation metadata. Capability-directory discoveries are not
-        added to those arrays. Unsupported installation configurations remain implementation
-        gaps. This read does not prepare execution, start compute or require an enabled
-        execution worker. Session deletion removes the associated Environment from
-        public reads; project-shared read authorization is unchanged. Connection status
-        does not prove native readiness or process quiescence.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Environment ID
-        in: path
-        name: environment_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.EnvironmentInfo'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve an execution Environment
-      tags:
-      - Environments
-  /agents/environments/{environment_id}/files:
-    get:
-      description: Lists direct regular files in one authorized self_hosted or qualified
-        local workspace directory. Local paths use the public /workspace root and
-        must be in cleaned form. This partial implementation defaults to the workspace
-        root and limit 20; recursive scope and these defaults are not verified upstream
-        semantics. A missing path, a regular file or a symbolic link returns an empty
-        page; links are never followed. Daemons without a local workspace binding
-        use the Claude SDK adapter reader, which keeps 404 for a missing path and
-        503 for a regular file or symbolic link. Well-formed unknown query keys are
-        ignored; malformed query encoding and a repeated supported key are rejected.
-        Sorts by case-sensitive path components, descending by default. Keep the same
-        path, order and limit when using page. Each page rereads the complete bounded
-        directory; changed file paths/sizes invalidate continuation locally with 400.
-        There is no snapshot guarantee. An openai_hosted Environment that has not
-        connected yet returns 400. Truncated or uncertain native results fail with
-        503 without returning a partial page. This read never starts a Turn or admits
-        model input. Actual transport disconnect/reconnect events remain observable.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Environment ID
-        in: path
-        name: environment_id
-        required: true
-        type: string
-      - description: Absolute directory in cleaned form inside /workspace
-        in: query
-        name: path
-        type: string
-      - description: Maximum file count; local default 20
-        in: query
-        maximum: 100
-        minimum: 1
-        name: limit
-        type: integer
-      - default: desc
-        description: Case-sensitive path-component order; omit for descending, explicit
-          empty values are invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      - description: Opaque continuation token; keep path, order and limit unchanged
-        in: query
-        name: page
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.EnvironmentFileList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List live Environment files
-      tags:
-      - Environments
-    post:
-      consumes:
-      - application/json
-      description: Uploads standard Base64 bytes to a file beneath /workspace in a
-        qualified local Environment and returns 201. Accepts inline bytes or a project-owned
-        source file_id through the same write path. Unknown body fields are rejected
-        with their name as param. Basic public hosted creation requires explicit managed
-        Runtime configuration; an openai_hosted Environment that has not connected
-        yet returns 400. Inline data is limited to 5 MiB decoded and a file_id copy
-        to 50 MiB. Missing parent directories are created with mode 0700 and the file
-        with mode 0600. An existing destination is never replaced; a directory, an
-        existing file or a path through a symlink or non-directory returns 400. Idle
-        writes exclude execution. Missing receipts return unavailable and retain a
-        durable mutation gate without automatic replay. Error/timing parity with upstream
-        remains unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Environment ID
-        in: path
-        name: environment_id
-        required: true
-        type: string
-      - description: Inline bytes or source file ID and absolute workspace path
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/v1.EnvironmentFileCreateRequest'
-      produces:
-      - application/json
-      responses:
-        "201":
-          description: Created
-          schema:
-            $ref: '#/definitions/v1.EnvironmentFile'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "409":
-          description: Conflict
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Create an Environment file from inline bytes or a source file
-      tags:
-      - Environments
-  /agents/environments/templates:
-    get:
-      description: Lists tenant-owned safe template metadata in creation order with
-        ID tie-breaking. Defaults to limit 20 and descending order; limit 0 is treated
-        as 1 and larger limits as 100. Foreign, missing and malformed cursors return
-        the same not found error. Concurrent-page and exact hosted error behavior
-        remain unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Previous Template ID
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size; 0 is treated as 1 and values above 100 as 100
-        in: query
-        minimum: 0
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.EnvironmentTemplateList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List Environment Templates
-      tags:
-      - Environment Templates
-    post:
-      consumes:
-      - application/json
-      description: Saves tenant-owned hosted configuration. Supports nullable name,
-        enabled/disabled or exact-domain restricted network, initial inline/file_id
-        files, confidential env, ordered setup_commands, npm/Python packages inline/referenced
-        Skill ZIPs, Plugin ZIPs and workspace-contained capability directories. Omitted/null
-        network defaults to enabled. Restricted network requires 1–100 exact ASCII
-        hostnames; other host forms and populated unsupported installations are rejected
-        before persistence without echoing input. Network policy rejections return
-        invalid_request_error with a null param. System dependencies must be preinstalled
-        in the sandbox image or template, or on the host machine; packages.system
-        is rejected. No compute is allocated. Exact hosted error/retry semantics remain
-        unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Reusable configuration
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.EnvironmentTemplateRequest'
-      produces:
-      - application/json
-      responses:
-        "201":
-          description: Created
-          schema:
-            $ref: '#/definitions/v1.EnvironmentTemplate'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Create an Environment Template
-      tags:
-      - Environment Templates
-  /agents/environments/templates/{environment_template_id}:
-    delete:
-      description: Deletes the tenant-owned reusable configuration without changing
-        or deleting existing Sessions and their frozen configuration.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Template ID
-        in: path
-        name: environment_template_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.EnvironmentTemplateDeleted'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Delete an Environment Template
-      tags:
-      - Environment Templates
-    get:
-      description: Returns safe tenant-owned configuration metadata without allocating
-        compute. Missing and foreign resources return the same not-found response.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Template ID
-        in: path
-        name: environment_template_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.EnvironmentTemplate'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve an Environment Template
-      tags:
-      - Environment Templates
-    post:
-      consumes:
-      - application/json
-      description: Supplied fields replace atomically; omitted fields remain unchanged.
-        Null name clears and null network resets to the pinned enabled default. Existing
-        Session snapshots and creation retries remain unchanged. Initial files replace
-        as a list; null/empty clears. File data is encrypted separately and excluded
-        from response metadata. Skills replace as a list; null/empty clears. Skill
-        archives are encrypted separately and omitted from responses. Plugins and
-        capability directories replace as lists; null/empty clears. Plugin archives
-        are encrypted and omitted from responses. Capability directories are snapshotted
-        after setup. Environment MCP execution requires a qualified native transport
-        and runtime network policy. Empty updates advance updated_at without changing
-        saved fields or confidential contents. Network policy rejections return invalid_request_error
-        with a null param.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Template ID
-        in: path
-        name: environment_template_id
-        required: true
-        type: string
-      - description: Configuration replacements
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.EnvironmentTemplateRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.EnvironmentTemplate'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Update an Environment Template
-      tags:
-      - Environment Templates
-  /agents/sessions:
-    get:
-      description: Cursor and results are scoped to the authenticated execution tenant;
-        an unknown, malformed or foreign after cursor returns not found. Optional
-        agent_id matches the immutable root Agent ID, including inline Agents and
-        historical Sessions whose saved source was updated or deleted. Omission lists
-        all Agents. Returns the same Environment and pending-input activity projection
-        as Session retrieval, including self_hosted Sessions.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Root Agent ID whose Sessions to return
-        in: query
-        name: agent_id
-        type: string
-      - description: Last Session ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size; 0 is treated as 1 and values above 100 as 100
-        in: query
-        minimum: 0
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SessionList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List execution Sessions
-      tags:
-      - Sessions
-    post:
-      consumes:
-      - application/json
-      description: 'The optional Core model_provider bundle resolves from the Session
-        override, saved Agent defaults, then, for openai_hosted and none, the deployment
-        default of the resolved harness; self_hosted never uses the deployment default
-        and none accepts only it. openai_hosted and self_hosted Sessions that resolve
-        no bundle return 400 model_provider_required with param x_agents_core.model_provider
-        before any write. Core encrypts and freezes the resolved bundle; later Agent
-        or deployment default edits and same-key retries cannot change it. Keys are
-        never returned. Supports inline configuration or a tenant-owned saved agent_id
-        with per-Session field replacements. Execution supports model/instructions,
-        text verbosity, non-deferred function tools, adapter-qualified multi_agent
-        with persisted Subagent reads, implicit reasoning, service tier auto and environment
-        type none, subject to the configured engine. Codex additionally supports HTTP
-        MCP with service origin (omitted or null on HTTP transport is saved as service),
-        native allowed_tools and boolean required defaulting to false. Session vault_ids
-        attach only project-owned Vaults; credential_id selects an attached static
-        bearer or OAuth credential for the exact HTTPS URL, while null/omission selects
-        a unique match or remains anonymous. Session reads, lists and event snapshots
-        show that implicitly selected credential ID in a null or omitted credential_id,
-        also after the credential is deleted; anonymous selections stay null and the
-        stored caller intent is unchanged. After the input requirement and before
-        any write, a credential_id without vault_ids, one outside the attached Vaults
-        (one message for missing, foreign and unattached IDs) or one for another server_url
-        returns 400 invalid_request_error, and several implicit matches return 409
-        conflict_error. Missing decryption configuration fails dispatch without anonymous
-        fallback. Required initialization uses native startup before the first native
-        Turn, including cold resume, and requires a separately advertised capability;
-        exact hosted creation timing and error parity remain unverified. Explicit
-        environment-origin HTTP MCP is supported on managed and self-hosted workspaces
-        through the same Runtime bindings; native OAuth login remains unsupported.
-        The self_hosted profile uses a qualified native harness, a clean absolute
-        workspace_directory and optional absolute local capability_directories prepared
-        by Runtime, with optional non-deferred function tools and HTTP MCP using explicit
-        environment origin, optionally authenticated by the attached Vault rules.
-        Service-origin HTTP remains restricted to service-side environment:none. Remote
-        MCP and remote Bearer authentication each require separately advertised combination
-        support; old peers cannot receive unsupported work. Omitted/null capability_directories
-        use the empty-list default; self_hosted requires configured execution plus
-        executor registry. Claude SDK currently requires medium verbosity and object-root
-        function schemas. It supports anonymous or attached static-bearer service-origin
-        HTTP MCP on none with boolean required and separately advertised MCP/bearer/required
-        runtime support. Required servers must be connected before the first native
-        input is released; pending or failed startup rejects execution. The shared
-        Vault selection and immutable binding rules apply; unsupported native labels/tool
-        names reject before persistence. An attached Vault with no matching credential
-        may remain anonymous; missing keys or failed credential lookup/decryption
-        never fall back to anonymous execution. Omitted stream defaults to false;
-        stream and agent_id cannot be null. Metadata may be null; non-string values
-        and limit violations return invalid_request_error with a metadata or metadata.<key>
-        param. The inline agent uses the Agent create configuration validation with
-        agent.-prefixed params, reported before the input requirement and saved-Agent
-        lookup; saved configurations with conflicting tools or schema roots reject
-        admission with the same errors, and execution limits keep unsupported_or_invalid_configuration.
-        Hosted network policy rejections return invalid_request_error with a null
-        param. Initial input accepts a string or ordered user-message array. Codex
-        and Claude SDK on none and qualified managed or self_hosted workspace profiles
-        also accept inline PNG/JPEG image content; other image combinations and remote
-        URLs are unsupported. None initial input atomically starts a Turn; self_hosted
-        initial input is reserved while returning its Environment connection target,
-        with execution deferred to native readiness and Session failure on initial
-        timeout. Initial input is required for none and for streamed creation outside
-        self_hosted. Omitted/null input remains valid for non-streaming hosted and
-        self_hosted creation. With stream=true, returns live Session events starting
-        with the committed creation snapshot and closes right after the first agent.session.idle
-        recorded when a Turn ends or an input reservation stops being pending, or
-        any agent.session.failed, without sending later events. A creation that admitted
-        nothing closes after the snapshot; a settlement that records no event closes
-        after events up to the cursor read with a settled Session projection. Required
-        actions keep it open; disconnect does not cancel execution. The GET events
-        stream remains live-only. New Sessions retain their authenticated creator;
-        all creation retries require the same typed subject, including across key
-        rotation. Saved-Agent retries and inline requests using Vault attachments
-        or credential references retain caller intent independently of later resource
-        changes; new hosted inline requests also freeze caller intent before deployment
-        defaults resolve; unrelated non-hosted inline retries preserve resolved/default
-        equivalences, and their resolved hash leaves out any deployment default. Provider
-        keys enter retry hashes only as fingerprints keyed by the credential key.
-        Unknown historical creators reject retries; known creators without recorded
-        intent retain resolved-snapshot retry rules. These conflict policies are local
-        and not verified hosted parity. A same-key stream=true retry of an existing
-        creation returns 201 with no events and closes at once; retry with stream=false
-        or use the GET events stream to recover. Claude SDK on none, Core-managed
-        Docker openai_hosted and self_hosted supports qualified object-root json_schema
-        output with medium verbosity, single-Agent execution and ordinary functions.
-        Hosted execution reuses native workspace tools and Files/Artifacts; Skills,
-        Plugins, capability directories, HTTP MCP, Subagent and tool_search combinations
-        remain unqualified, including inherited template contents. Other non-text
-        initial input remains unsupported. Basic Codex and Claude SDK openai_hosted
-        creation requires an explicitly configured managed provider. The Claude workspace
-        profile supports non-deferred function tools with text or successful inline
-        PNG/JPEG results alongside native workspace tools; explicit environment-origin
-        HTTP MCP uses the common Runtime path. MiniMax accepts public environment-origin
-        HTTP MCP only with null or omitted allowed_tools and required=false; even
-        an empty non-null allowlist rejects. Idle Sessions provision automatically;
-        initial provisioning has no caller connection action. Network defaults to
-        enabled; disabled and restricted policies reject before compute allocation
-        because the current Runtime cannot enforce them. The x_agents_core.environment
-        extension accepts common preparation fields for either hosted or self-hosted
-        placement: environment_template_id, files, env, packages, setup_commands,
-        skills, plugins and capability_directories. Duplicate fields in environment
-        and the extension reject. Confidential env, npm/Python packages and ordered
-        setup commands use the same Environment-owned initialization lifecycle; compute
-        allocation does not own preparation. Unknown side effects are not replayed
-        after disconnect or restart. System dependencies must be preinstalled in the
-        sandbox image or template, or on the host machine; packages.system is rejected.
-        Initial inline and tenant-owned file_id files freeze encrypted bytes before
-        provisioning, then install through the common Core lifecycle before native
-        execution or live Files access. With a template reference, omitted/null files,
-        env, packages and setup_commands inherit. Non-null files and command lists
-        replace; env overlays by key; each package manager inherits on omission/null
-        and otherwise replaces its list. Empty lists clear their selected field. Tenant-owned
-        environment_template_id references inherit omitted/null network and allow
-        only narrowing overrides. Inline hosted network:null retains the enabled default;
-        updating a Template with network:null resets its saved policy to enabled.
-        Core freezes effective configuration; template updates/deletion do not alter
-        Session snapshots or same-intent creation retries. Inline or tenant-owned
-        skill_reference Skills share initialization. Templates preserve default/latest/explicit
-        selectors; Session creation freezes concrete metadata and encrypted content
-        atomically. Skill, Plugin and capability-directory list omission/null inherit;
-        a non-null list replaces, including empty-list clearing. Omitted/null Skill
-        version selectors resolve the default version. Source deletion/default updates
-        cannot change committed Session Skill contents. Deferred function discovery
-        uses type-only tool_search and per-function defer_loading in the qualified
-        single-agent Claude function profile on none or a managed/user-owned workspace,
-        including qualified inline image messages and text results. Explicit web_search
-        mode disabled and programmatic_tool_calling enabled false use frozen common
-        Runtime controls. Enabled forms, including those saved on an Agent, remain
-        unqualified and reject before any write unless the Session replaces tools.
-        Omitted programmatic configuration preserves native behavior, a documented
-        difference from the official default-on behavior. Other combinations remain
-        unqualified; see the operation coverage.'
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Creation retry key, up to 128 bytes
-        in: header
-        name: Idempotency-Key
-        type: string
-      - description: Session configuration
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.CreateSessionRequest'
-      produces:
-      - application/json
-      - text/event-stream
-      responses:
-        "201":
-          description: Created
-          schema:
-            $ref: '#/definitions/v1.Session'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "409":
-          description: Conflict
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Create an execution Session
-      tags:
-      - Sessions
-  /agents/sessions/{session_id}:
-    delete:
-      description: Removes a durably idle or failed Session and its history from the
-        public API. A Session whose root Turn is queued, in progress or waiting (including
-        required actions) or whose input reservation is pending returns 409 conflict_error
-        and is left unchanged; cancel it and wait until it is idle before deleting.
-        Subagent child Turns and pending Environment file writes are not checked and
-        do not block deletion. Repeating the deletion of the caller's own deleted
-        Session returns the same confirmation; missing and foreign Sessions return
-        404. Internal records and native history are retained pending separate physical
-        cleanup; overlapping stream timing remains unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SessionDeleted'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "409":
-          description: Conflict
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Delete an execution Session
-      tags:
-      - Sessions
-    get:
-      description: Returns supported none, self_hosted and basic openai_hosted Session
-        environments. Self-hosted pending input can require a caller connection before
-        a Turn exists. Hosted initial provisioning remains idle until a Turn starts;
-        connection observations are not native execution readiness.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Session'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve an execution Session
-      tags:
-      - Sessions
-    post:
-      consumes:
-      - application/json
-      description: The metadata field is required in an update body. Send null or
-        {} to clear it, or supply an object to replace all pairs. Up to 16 string
-        pairs, with keys at most 64 characters and values at most 512 characters;
-        violations and non-string values return invalid_request_error with a metadata
-        or metadata.<key> param. U+0000 is rejected as a local storage limit. Malformed,
-        missing and foreign Session IDs share the not-found response. Execution configuration
-        and activity are unchanged. Returns the same safe Environment and pending-input
-        activity projection as Session retrieval.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Session metadata
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.UpdateSessionRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Session'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Update execution Session metadata
-      tags:
-      - Sessions
-  /agents/sessions/{session_id}/artifacts:
-    get:
-      description: Lists published outputs independently of Environment availability.
-        Sorting uses publication time and ID. A later Turn publishes a path again
-        only when it is new, its bytes changed, or no Artifact remains for it. A malformed
-        environment_id matches nothing. An after value that is not an Artifact of
-        this Session, including a malformed one, returns 400 invalid_request_error
-        with the message "after is not a valid artifact ID". The local default page
-        size is 20; exact upstream defaults remain unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Producing Environment ID; an unknown or malformed ID returns
-          an empty page
-        in: query
-        name: environment_id
-        type: string
-      - description: Last immutable artifact ID
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size
-        in: query
-        maximum: 100
-        minimum: 1
-        name: limit
-        type: integer
-      - default: desc
-        description: Publication order; omit for descending, explicit empty values
-          are invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SessionArtifactList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List immutable Session artifacts
-      tags:
-      - Artifacts
-  /agents/sessions/{session_id}/artifacts/{artifact_id}:
-    delete:
-      description: Deletes the published copy without modifying its original workspace
-        file. Already admitted content reads may finish; later reads reject.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Artifact ID
-        in: path
-        name: artifact_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SessionArtifactDeleted'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Delete a published artifact
-      tags:
-      - Artifacts
-    get:
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Artifact ID
-        in: path
-        name: artifact_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SessionArtifact'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve immutable artifact metadata
-      tags:
-      - Artifacts
-  /agents/sessions/{session_id}/artifacts/{artifact_id}/content:
-    get:
-      description: Streams stored bytes after tenant and Session authorization, including
-        after Environment expiration. Exact upstream headers and Range behavior remain
-        unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Artifact ID
-        in: path
-        name: artifact_id
-        required: true
-        type: string
-      produces:
-      - application/octet-stream
-      responses:
-        "200":
-          description: OK
-          schema:
-            type: file
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Download immutable artifact bytes
-      tags:
-      - Artifacts
-  /agents/sessions/{session_id}/events:
-    get:
-      description: |-
-        Live-only events, including command output fragments from capable Codex peers as agent.output.command_execution_output.delta with stable Item/output indexes. Native text conversion and output quotas apply; completion snapshots remain authoritative. Reconnect through Session, Turn and Items reads; missed events are not replayed. A lagging stream closes with an error when its bounded buffer is exceeded. When a hosted Environment fails to provision, the stream sends agent.session.environment.failed, an error event (environment_error/sandbox_error with the safe step and exit-status reason, never command output) and agent.session.failed, then ends. Session activity includes immutable pending-input connection actions before Turn creation; self_hosted environments use the same safe output as Session retrieval.
-        Active streams revalidate the original Project key every second before output; revocation, Project archival or authentication unavailability closes the stream. Authentication checks use a five-second timeout.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      produces:
-      - text/event-stream
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SessionEvent'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Stream live Session events
-      tags:
-      - Events
-    post:
-      consumes:
-      - application/json
-      description: An empty events array is a resource-authorized no-op; it creates
-        no execution retry identity, Turn, Item or input receipt. For environment
-        none, atomically accepts text messages, cancellation and function results.
-        Messages steer active work or start a queued Turn. Qualified Codex and Claude
-        SDK workspace profiles accept text and inline PNG/JPEG messages, independently
-        of managed or self_hosted ownership. Under the Session lock, matching retries
-        retain their original target; new active messages append to the current Turn,
-        while idle messages reserve work and wait up to the original five-minute connection/admission
-        deadline. Return 202 only after durable admission, without claiming native
-        application; active messages create no Turn or reservation. Cancellation-only
-        prepared-environment batches use existing durable cancellation admission and
-        return 202 without waiting for native exit; a new cancellation conflicts while
-        a pre-Turn reservation is pending. Homogeneous tool_result-only prepared-environment
-        batches reuse existing scoped result admission and application receipts without
-        creating a Turn or bypassing a pending reservation. Mixed prepared-environment
-        batches remain unsupported. HTTP expiry/cancellation use local 409 environment_input_expired/environment_input_cancelled
-        errors. New input on a Session whose hosted Environment failed to provision
-        returns the observed 409 conflict_error "the hosted environment failed to
-        provision"; input already waiting when it fails and expired Environments keep
-        the local 409 environment_unavailable. Input the Session cannot accept in
-        its current state, such as a result after cancellation or a batch while earlier
-        input is pending, and a result that differs from the call's saved result return
-        409 with type and code conflict_error; reusing an Idempotency-Key with a different
-        batch returns the local 409 idempotency_conflict. Inside an owned Session,
-        a result for an unknown call or for a call of another Turn returns 400 invalid_request_error
-        and changes nothing; missing and foreign Sessions return 404. Losing execution
-        ownership returns 503. The response write deadline accommodates the admission
-        window for either prepared Environment, independently of new-hosted-admission
-        and executor URL settings. Disconnecting the waiting HTTP request does not
-        cancel retained work or restart its deadline. Retry keys identify the whole
-        ordered batch. Function output accepts text or ordered text/image parts subject
-        to engine support; Claude SDK accepts text results and, on none and qualified
-        workspace profiles, successful inline PNG/JPEG results, preserving ordered
-        content; error images and remote references reject before admission. Native
-        image resizing may change bytes. Runtime image-result support is checked only
-        for image-bearing delivery. Codex and Claude SDK on none and qualified managed
-        or self_hosted workspace profiles accept ordered inline PNG/JPEG image messages.
-        Other engines remain text-only; remote image URLs are unsupported. Image references
-        are retained unchanged without service-side downloads.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Retry key, up to 128 bytes
-        in: header
-        name: Idempotency-Key
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Ordered input events
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.CreateEventsRequest'
-      responses:
-        "202":
-          description: Accepted
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "409":
-          description: Conflict
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Submit Session input events
-      tags:
-      - Sessions
-  /agents/sessions/{session_id}/items:
-    get:
-      description: Returns supported message and tool Items in first-observation order.
-        Native engine fields are projected explicitly; unfinished Items on terminal
-        Turns are incomplete. Cursors are Items of the same tenant and Session. Any
-        other after value, including a malformed one, returns 400 invalid_request_error
-        with the message "Invalid session item ID in `after`".
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Last Item ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size; 0 is treated as 1 and values above 100 as 100
-        in: query
-        minimum: 0
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.ItemList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List persisted execution Items
-      tags:
-      - Items
-  /agents/sessions/{session_id}/subagents:
-    get:
-      description: Includes nested and closed Subagents. Cursors are Subagents of
-        the same tenant and Session. Any other after value, including a malformed
-        one, returns 400 invalid_request_error with the message "Invalid resource
-        ID in `after`". A limit outside 1–100 is rejected.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Last Subagent ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size
-        in: query
-        maximum: 100
-        minimum: 1
-        name: limit
-        type: integer
-      - default: desc
-        description: Resource order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SubagentList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List Session Subagents
-      tags:
-      - Subagents
-  /agents/sessions/{session_id}/subagents/{subagent_id}:
-    get:
-      description: Returns this Session's persisted Subagent. Active includes idle
-        between Turns. Resuming preserves opened_at and clears closed_at. Unknown
-        or inaccessible parent scopes return not found.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Subagent ID
-        in: path
-        name: subagent_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Subagent'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve a Session Subagent
-      tags:
-      - Subagents
-  /agents/sessions/{session_id}/subagents/{subagent_id}/items:
-    get:
-      description: Returns only this Subagent's own Items across all its Turns, not
-        its descendants' Items. Cursors are Items of the same tenant, Session and
-        Subagent. Any other after value, including a malformed one, returns 400 invalid_request_error
-        with the message "Invalid session item ID in `after`".
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Subagent ID
-        in: path
-        name: subagent_id
-        required: true
-        type: string
-      - description: Last Item ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size; 0 is treated as 1 and values above 100 as 100
-        in: query
-        minimum: 0
-        name: limit
-        type: integer
-      - default: desc
-        description: Resource order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.ItemList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List a Subagent's Items
-      tags:
-      - Subagents
-  /agents/sessions/{session_id}/subagents/{subagent_id}/turns:
-    get:
-      description: Includes this Subagent's Turns after resume, with the Session's
-        Agent ID as agent_id. Cursors are Turns of the same tenant, Session and Subagent.
-        Any other after value, including a malformed one, returns 400 invalid_request_error
-        with the message "Invalid resource ID in `after`". Missing recorded usage
-        remains null. A limit outside 1–100 is rejected.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Subagent ID
-        in: path
-        name: subagent_id
-        required: true
-        type: string
-      - description: Last Turn ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size
-        in: query
-        maximum: 100
-        minimum: 1
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.TurnList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List a Subagent's Turns
-      tags:
-      - Subagents
-  /agents/sessions/{session_id}/subagents/{subagent_id}/turns/{turn_id}:
-    get:
-      description: Returns a Turn owned by this Subagent. Its agent_id is the Session's
-        Agent ID and its subagent_id identifies the Subagent. Session Turn routes
-        do not return child Turns. Unknown or inaccessible parent scopes return not
-        found.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Subagent ID
-        in: path
-        name: subagent_id
-        required: true
-        type: string
-      - description: Turn ID
-        in: path
-        name: turn_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Turn'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve a Subagent Turn
-      tags:
-      - Subagents
-  /agents/sessions/{session_id}/subagents/{subagent_id}/turns/{turn_id}/items:
-    get:
-      description: Returns Items owned by this exact Subagent Turn. Cursors are Items
-        of the same tenant, Session, Subagent and Turn. Any other after value, including
-        a malformed one, returns 400 invalid_request_error with the message "Invalid
-        session item ID in `after`".
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Subagent ID
-        in: path
-        name: subagent_id
-        required: true
-        type: string
-      - description: Turn ID
-        in: path
-        name: turn_id
-        required: true
-        type: string
-      - description: Last Item ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size; 0 is treated as 1 and values above 100 as 100
-        in: query
-        minimum: 0
-        name: limit
-        type: integer
-      - default: desc
-        description: Resource order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.ItemList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List a Subagent Turn's Items
-      tags:
-      - Subagents
-  /agents/sessions/{session_id}/turns:
-    get:
-      description: Returns the Session's root Turns in creation order; Subagent Turns
-        are listed through the Subagent Turn routes. The cursor belongs to the same
-        Session and tenant; any other after value, including a malformed one or a
-        Subagent Turn ID, returns not found. Usage contains the latest recorded complete
-        token breakdown; missing measurements remain null.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Last Turn ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size
-        in: query
-        maximum: 100
-        minimum: 1
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.TurnList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List execution Turns
-      tags:
-      - Turns
-  /agents/sessions/{session_id}/turns/{turn_id}:
-    get:
-      description: Returns a root Turn of this Session. A Subagent Turn ID returns
-        the same not found error as a missing Turn; read it through the Subagent Turn
-        routes.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Session ID
-        in: path
-        name: session_id
-        required: true
-        type: string
-      - description: Turn ID
-        in: path
-        name: turn_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Turn'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve an execution Turn
-      tags:
-      - Turns
-  /files:
-    get:
-      description: Lists project-owned Files without reading their bodies. The limit
-        defaults to 10000 and must be 1–10000. Equal creation times use ID ordering.
-        Purpose validation precedes cursor lookup; current storage contains only user_data.
-        An explicit empty purpose is treated as omitted. Repeated purpose values remain
-        rejected. Hosted positive filtering, default order and concurrent-page behavior
-        remain unverified. No Beta header is required.
-      parameters:
-      - description: Last File ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 10000
-        description: Maximum page size, 1–10000
-        in: query
-        maximum: 10000
-        minimum: 1
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      - description: Only return Files with this purpose
-        in: query
-        name: purpose
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SourceFileList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List source files
-      tags:
-      - Files
-    post:
-      consumes:
-      - multipart/form-data
-      description: Accepts one multipart file and purpose=user_data in either order,
-        with a private 512 MiB content limit and 64 KiB envelope allowance. Commits
-        only after the entire request validates. The source is project-owned, independent
-        of Sessions and workspace copies. No Beta header is required. Other purposes,
-        expires_after, listing, resumable Uploads, quotas/rate-limit and complete
-        hosted error/status parity remain unsupported or unverified.
-      parameters:
-      - description: Source bytes
-        in: formData
-        name: file
-        required: true
-        type: file
-      - description: user_data
-        enum:
-        - user_data
-        in: formData
-        name: purpose
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SourceFile'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Upload a source file
-      tags:
-      - Files
-  /files/{file_id}:
-    delete:
-      description: Atomically deletes project-owned metadata and stored bytes. Already-admitted
-        reads or copies may finish. Workspace copies remain independent. Historical
-        WAL/backups are not erased. No Beta header is required; exact hosted concurrent
-        deletion/error semantics remain unverified.
-      parameters:
-      - description: Source file ID
-        in: path
-        name: file_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SourceFileDeleted'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Delete a source file
-      tags:
-      - Files
-    get:
-      description: Returns immutable project-owned user_data file metadata. No Beta
-        header is required. Other purposes, expiration and full hosted status/error
-        semantics remain unimplemented or unverified.
-      parameters:
-      - description: Source file ID
-        in: path
-        name: file_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SourceFile'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve source file metadata
-      tags:
-      - Files
-  /files/{file_id}/content:
-    get:
-      description: Resolves project-owned File metadata before enforcing download
-        policy. Public download of user_data Files returns 400; missing and foreign
-        Files return the same 404. Internal initial-file and workspace copies remain
-        available. No Beta header is required.
-      parameters:
-      - description: Source file ID
-        in: path
-        name: file_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Download source file bytes
-      tags:
-      - Files
-  /skills:
-    get:
-      description: Lists tenant-owned metadata in timestamp order. Default page size
-        20, maximum 100. Limit 0 returns an empty page whose has_more reports whether
-        any Skill follows the cursor; exact hosted defaults remain unverified.
-      parameters:
-      - description: Skill resource cursor
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size; 0 returns an empty page
-        in: query
-        maximum: 100
-        minimum: 0
-        name: limit
-        type: integer
-      - description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SkillList'
-      security:
-      - BearerAuth: []
-      summary: List Skills
-      tags:
-      - Skills
-    post:
-      consumes:
-      - multipart/form-data
-      description: Accepts one ZIP in files or a directory in files[]. Applies the
-        qualified portable Skill bundle profile. No Beta header is required; full
-        hosted upload limits and activation extensions are not qualified.
-      parameters:
-      - description: Skill ZIP or directory files
-        in: formData
-        name: files
-        required: true
-        type: file
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Skill'
-      security:
-      - BearerAuth: []
-      summary: Upload a Skill
-      tags:
-      - Skills
-  /skills/{skill_id}:
-    delete:
-      description: Deletes tenant-owned source bundles. Existing Session installation
-        snapshots remain independent.
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SkillDeleted'
-      security:
-      - BearerAuth: []
-      summary: Delete a Skill and its versions
-      tags:
-      - Skills
-    get:
-      description: Returns tenant-owned metadata without decrypting contents or starting
-        Runtime. No Beta header is required.
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Skill'
-      security:
-      - BearerAuth: []
-      summary: Retrieve Skill metadata
-      tags:
-      - Skills
-    post:
-      consumes:
-      - application/json
-      description: Changes only the tenant-owned default pointer; immutable versions
-        and existing Session snapshots remain unchanged.
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      - description: Default version
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.SkillUpdateRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Skill'
-      security:
-      - BearerAuth: []
-      summary: Update the default Skill version
-      tags:
-      - Skills
-  /skills/{skill_id}/content:
-    get:
-      description: Downloads an authorized ZIP using the default pointer when no concrete
-        version is supplied. Exact upstream unversioned selection, content headers
-        and range semantics remain unverified.
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      produces:
-      - application/octet-stream
-      responses:
-        "200":
-          description: OK
-          schema:
-            type: file
-      security:
-      - BearerAuth: []
-      summary: Download Skill content
-      tags:
-      - Skills
-  /skills/{skill_id}/versions:
-    get:
-      description: Orders by version number; after identifies a version resource,
-        not a version number. An after value that does not begin with skillver, or
-        a version of another Skill, returns 400 invalid_value with param after; a
-        missing version returns not found. No contents are decrypted. Limit 0 returns
-        an empty page whose has_more reports whether any version follows the cursor.
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      - description: Version resource cursor
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Page size; 0 returns an empty page
-        in: query
-        maximum: 100
-        minimum: 0
-        name: limit
-        type: integer
-      - description: Version order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SkillVersionList'
-      security:
-      - BearerAuth: []
-      summary: List Skill versions
-      tags:
-      - Skills
-    post:
-      consumes:
-      - multipart/form-data
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      - description: Skill ZIP or directory files
-        in: formData
-        name: files
-        required: true
-        type: file
-      - description: Set as default
-        in: formData
-        name: default
-        type: boolean
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SkillVersion'
-      security:
-      - BearerAuth: []
-      summary: Upload an immutable Skill version
-      tags:
-      - Skills
-  /skills/{skill_id}/versions/{version}:
-    delete:
-      description: Deleting the only remaining version also deletes the Skill; existing
-        Session installation snapshots remain independent. The default version cannot
-        be deleted while other versions remain. Version numbers are never reused.
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      - description: Concrete version number
-        in: path
-        name: version
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SkillVersionDeleted'
-      security:
-      - BearerAuth: []
-      summary: Delete a Skill version
-      tags:
-      - Skills
-    get:
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      - description: Concrete version number
-        in: path
-        name: version
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.SkillVersion'
-      security:
-      - BearerAuth: []
-      summary: Retrieve Skill version metadata
-      tags:
-      - Skills
-  /skills/{skill_id}/versions/{version}/content:
-    get:
-      parameters:
-      - description: Skill ID
-        in: path
-        name: skill_id
-        required: true
-        type: string
-      - description: Concrete version number
-        in: path
-        name: version
-        required: true
-        type: string
-      produces:
-      - application/octet-stream
-      responses:
-        "200":
-          description: OK
-          schema:
-            type: file
-      security:
-      - BearerAuth: []
-      summary: Download immutable Skill version content
-      tags:
-      - Skills
-  /vaults:
-    get:
-      description: Lists project-owned Vaults independently of execution. An unknown,
-        malformed or foreign after cursor returns not found. Includes active and archived
-        records by default. Status accepts a scalar, the SDK's status[] array or both,
-        filtering by their union; a repeated scalar is rejected. Limits default to
-        20 and clamp to 1–100. Equal creation times use ID ordering; exact hosted
-        errors and concurrent-page behavior remain unverified. Archive/delete lifecycle
-        is not implemented.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Last Vault ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Requested page size, clamped to 1–100
-        in: query
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      - description: Scalar status filter
-        enum:
-        - active
-        - archived
-        in: query
-        name: status
-        type: string
-      - collectionFormat: multi
-        description: Array status filter; combined with status as a union
-        in: query
-        items:
-          enum:
-          - active
-          - archived
-          type: string
-        name: status[]
-        type: array
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.VaultList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List Vaults
-      tags:
-      - Vaults
-    post:
-      consumes:
-      - application/json
-      description: Creates a project-owned Vault independently of execution. Omitted
-        name stays null; a supplied string is trimmed and must contain 1–256 UTF-8
-        bytes. Explicit null name is invalid. Omitted/null metadata becomes an empty
-        object; non-string values return invalid_request_error with a metadata.<key>
-        param. Metadata has a local 64 KiB encoded storage bound. U+0000 in stored
-        strings is rejected as a local storage limit. Credentials, Session binding
-        and hosted error/retry parity remain incomplete.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Vault name and metadata
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.CreateVaultRequest'
-      produces:
-      - application/json
-      responses:
-        "201":
-          description: Created
-          schema:
-            $ref: '#/definitions/v1.Vault'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Create a Vault
-      tags:
-      - Vaults
-  /vaults/{vault_id}:
-    delete:
-      description: Atomically removes the authenticated project's Vault and all its
-        stored Credentials without an encryption key, decryption or external requests.
-        Existing Session snapshots, history and recorded retries retain their frozen
-        identities; subsequent credential lookups fail without reselection or anonymous
-        fallback. Already-resolved tokens and running Sessions are not revoked or
-        cancelled. Missing/repeated deletion locally returns 404. Exact hosted archive,
-        post-delete visibility and concurrent/error semantics remain unverified; physical
-        erasure from native history, WAL or backups is not established.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Vault ID
-        in: path
-        name: vault_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.VaultDeleted'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Delete a Vault and all its Credentials
-      tags:
-      - Vaults
-    get:
-      description: Reads a Vault owned by the authenticated project without resolving
-        credentials, Sessions or execution devices. Missing and foreign IDs share
-        the same not-found response; exact hosted error semantics remain unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Vault ID
-        in: path
-        name: vault_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Vault'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve a Vault
-      tags:
-      - Vaults
-  /vaults/{vault_id}/credentials:
-    get:
-      description: Lists only metadata from the authenticated project's requested
-        Vault, without decryption or execution. An unknown, malformed or foreign after
-        cursor, including another Vault's Credential, returns not found. Includes
-        active and archived Credentials by default, independently of Vault status.
-        Status accepts a scalar, the SDK status[] array or both, filtering by their
-        union; a repeated scalar is rejected. Limits default to 20 and clamp to 1–100.
-        Equal creation times use ID ordering. Hosted errors, concurrent-page behavior
-        and archive/delete lifecycle remain unverified or unimplemented.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Vault ID
-        in: path
-        name: vault_id
-        required: true
-        type: string
-      - description: Last Credential ID from the previous page
-        in: query
-        name: after
-        type: string
-      - default: 20
-        description: Requested page size, clamped to 1–100
-        in: query
-        name: limit
-        type: integer
-      - default: desc
-        description: Creation order; omit for descending, explicit empty values are
-          invalid
-        enum:
-        - asc
-        - desc
-        in: query
-        name: order
-        type: string
-      - description: Scalar status filter
-        enum:
-        - active
-        - archived
-        in: query
-        name: status
-        type: string
-      - collectionFormat: multi
-        description: Array status filter; combined with status as a union
-        in: query
-        items:
-          enum:
-          - active
-          - archived
-          type: string
-        name: status[]
-        type: array
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.CredentialList'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: List safe Vault Credential metadata
-      tags:
-      - Credentials
-    post:
-      consumes:
-      - application/json
-      description: Stores static_bearer or mcp_oauth secrets as execution-owned authenticated
-        ciphertext without contacting any endpoint. Static bearer and OAuth access
-        tokens must be nonempty strings; their bytes are preserved. OAuth accepts
-        a required access token, nullable RFC3339 expiry and optional refresh configuration
-        with none, client_secret_basic or client_secret_post authentication. Required
-        name is trimmed to 1–256 UTF-8 bytes. Credential and token endpoints require
-        HTTPS without userinfo or fragments. Responses contain safe metadata only,
-        including explicit nullable OAuth expiry, refresh, resource and scope. Missing
-        encryption configuration returns local 503. External authorization and provider
-        revocation remain caller responsibilities; exact hosted error/default semantics
-        remain unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Vault ID
-        in: path
-        name: vault_id
-        required: true
-        type: string
-      - description: Write-only credential authentication union
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.CreateCredentialRequest'
-      produces:
-      - application/json
-      responses:
-        "201":
-          description: Created
-          schema:
-            $ref: '#/definitions/v1.Credential'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Create a Vault Credential
-      tags:
-      - Credentials
-  /vaults/{vault_id}/credentials/{credential_id}:
-    delete:
-      description: Removes one Credential and its encrypted token within the authenticated
-        project and owning Vault, without an encryption key or secret decryption.
-        Subsequent metadata reads, updates and dispatch lookups cannot use it. Existing
-        Session snapshots and history retain their frozen identities; already-resolved
-        tokens and running Sessions are not revoked or cancelled. This local policy
-        removes the row rather than defining archived lifecycle; missing/repeated
-        deletion returns 404. Exact hosted archive, post-delete visibility and retry/error
-        semantics remain unverified. Provider revocation and physical erasure from
-        native history, WAL or backups are separate concerns.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Vault ID
-        in: path
-        name: vault_id
-        required: true
-        type: string
-      - description: Credential ID
-        in: path
-        name: credential_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.CredentialDeleted'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Delete a Vault Credential
-      tags:
-      - Credentials
-    get:
-      description: Reads only non-secret metadata scoped to the authenticated project
-        and owning Vault. No token decryption, network request or execution is performed.
-        Unknown, foreign, wrong-Vault and malformed IDs use the same local not-found
-        response; hosted error parity remains unverified.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Vault ID
-        in: path
-        name: vault_id
-        required: true
-        type: string
-      - description: Credential ID
-        in: path
-        name: credential_id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Credential'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Retrieve safe Vault Credential metadata
-      tags:
-      - Credentials
-    post:
-      consumes:
-      - application/json
-      description: Explicitly empty static bearer or OAuth access tokens and OAuth
-        patches without a mutable field are rejected before storage. Omitted OAuth
-        access tokens preserve the existing grant when expiry or refresh fields change.
-        Updates the existing static_bearer or mcp_oauth authentication method without
-        network requests. OAuth access_token omission/null retains the token; a new
-        token clears omitted expiry, explicit null clears expiry, and other omitted
-        fields remain unchanged. OAuth refresh patches cannot add configuration or
-        change client, endpoint, resource or authentication method; nullable token/client-secret
-        values retain stored secrets while explicit null scope clears scope. Whole-null
-        refresh and token_endpoint_auth retain existing configuration under local
-        policy. Identity, destination, creation time and Session bindings remain unchanged.
-        Responses expose safe metadata only. Already-dispatched work is not revoked;
-        provider revocation, storage-key rotation and exact hosted concurrent-update/error
-        semantics remain separate.
-      parameters:
-      - description: agents=v1
-        in: header
-        name: OpenAI-Beta
-        required: true
-        type: string
-      - description: Vault ID
-        in: path
-        name: vault_id
-        required: true
-        type: string
-      - description: Credential ID
-        in: path
-        name: credential_id
-        required: true
-        type: string
-      - description: Write-only credential authentication replacement union
-        in: body
-        name: body
-        required: true
-        schema:
-          $ref: '#/definitions/v1.UpdateCredentialRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/v1.Credential'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "401":
-          description: Unauthorized
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "404":
-          description: Not Found
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "413":
-          description: Request Entity Too Large
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-        "503":
-          description: Service Unavailable
-          schema:
-            $ref: '#/definitions/v1.ErrorResponse'
-      security:
-      - BearerAuth: []
-      summary: Replace Vault Credential authentication secrets
-      tags:
-      - Credentials
-schemes:
-- http
-- https
-securityDefinitions:
-  BearerAuth:
-    in: header
-    name: Authorization
-    type: apiKey
-swagger: "2.0"
+{
+  "openapi": "3.1.0",
+  "info": {
+    "title": "OpenAgentCore public API",
+    "version": "v1",
+    "description": "The pinned OpenAI Agents, Files and Skills API with x_agents_core extensions. See the coverage ledger for implementation qualification."
+  },
+  "servers": [
+    {
+      "url": "/v1"
+    }
+  ],
+  "security": [
+    {
+      "ProjectKey": []
+    }
+  ],
+  "tags": [
+    {
+      "name": "Assistants",
+      "description": "Build Assistants that can call models and use tools."
+    },
+    {
+      "name": "Audio",
+      "description": "Turn audio into text or text into audio."
+    },
+    {
+      "name": "Chat",
+      "description": "Given a list of messages comprising a conversation, the model will return a response."
+    },
+    {
+      "name": "Conversations",
+      "description": "Manage conversations and conversation items."
+    },
+    {
+      "name": "Completions",
+      "description": "Given a prompt, the model will return one or more predicted completions, and can also return the probabilities of alternative tokens at each position."
+    },
+    {
+      "name": "Embeddings",
+      "description": "Get a vector representation of a given input that can be easily consumed by machine learning models and algorithms."
+    },
+    {
+      "name": "Evals",
+      "description": "Manage and run evals in the OpenAI platform."
+    },
+    {
+      "name": "Fine-tuning",
+      "description": "Manage fine-tuning jobs to tailor a model to your specific training data."
+    },
+    {
+      "name": "Graders",
+      "description": "Manage and run graders in the OpenAI platform."
+    },
+    {
+      "name": "Batch",
+      "description": "Create large batches of API requests to run asynchronously."
+    },
+    {
+      "name": "Files",
+      "description": "Files are used to upload documents that can be used with features like Assistants and Fine-tuning."
+    },
+    {
+      "name": "Uploads",
+      "description": "Use Uploads to upload large files in multiple parts."
+    },
+    {
+      "name": "Images",
+      "description": "Given a prompt and/or an input image, the model will generate a new image."
+    },
+    {
+      "name": "Models",
+      "description": "List and describe the various models available in the API."
+    },
+    {
+      "name": "Moderations",
+      "description": "Given text and/or image inputs, classifies if those inputs are potentially harmful."
+    },
+    {
+      "name": "Audit Logs",
+      "description": "List user actions and configuration changes within this organization."
+    }
+  ],
+  "paths": {
+    "/files": {
+      "get": {
+        "operationId": "listFiles",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Returns a list of files.",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "purpose",
+            "required": false,
+            "schema": {
+              "type": "string"
+            },
+            "description": "Only return files with the given purpose."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 10,000, and the default is 10,000.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 10000
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListFilesResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List files",
+          "group": "files",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.files.list()\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const list = await openai.files.list();\n\n  for await (const file of list) {\n    console.log(file);\n  }\n}\n\nmain();"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"file-abc123\",\n      \"object\": \"file\",\n      \"bytes\": 175,\n      \"created_at\": 1613677385,\n      \"expires_at\": 1677614202,\n      \"filename\": \"salesOverview.pdf\",\n      \"purpose\": \"assistants\",\n    },\n    {\n      \"id\": \"file-abc456\",\n      \"object\": \"file\",\n      \"bytes\": 140,\n      \"created_at\": 1613779121,\n      \"expires_at\": 1677614202,\n      \"filename\": \"puppy.jsonl\",\n      \"purpose\": \"fine-tune\",\n    }\n  ],\n  \"first_id\": \"file-abc123\",\n  \"last_id\": \"file-abc456\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createFile",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Upload a file that can be used across various endpoints. Individual files\ncan be up to 512 MB, and each project can store up to 2.5 TB of files in\ntotal. There is no organization-wide storage limit. Uploads to this\nendpoint are rate-limited to 1,000 requests per minute per authenticated\nuser.\n\n- The Assistants API supports files up to 2 million tokens and of specific\n  file types. See the [Assistants Tools guide](https://developers.openai.com/api/docs/guides/tools) for\n  details.\n- The Fine-tuning API only supports `.jsonl` files. The input also has\n  certain required formats for fine-tuning\n  [chat](https://developers.openai.com/api/docs/guides/supervised-fine-tuning#formatting-your-data) or\n  [completions](https://developers.openai.com/api/docs/guides/supervised-fine-tuning#formatting-your-data) models.\n- The Batch API only supports `.jsonl` files up to 200 MB in size. The input\n  also has a specific required\n  [format](https://developers.openai.com/api/docs/guides/batch#1-prepare-your-batch-file).\n- For Retrieval or `file_search` ingestion, upload files here first. If\n  you need to attach multiple uploaded files to the same vector store, use\n  [`/vector_stores/{vector_store_id}/file_batches`](https://developers.openai.com/api/reference/resources/vector_stores/subresources/file_batches/methods/create)\n  instead of attaching them one by one. Vector store attachment has separate\n  limits from file upload, including 2,000 attached files per minute per\n  organization.\n\nPlease [contact us](https://help.openai.com/) if you need to increase these\nstorage limits.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateFileRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OpenAIFile"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Upload file",
+          "group": "files",
+          "description": "Uploads a file for later use across OpenAI APIs. Uploads to this endpoint are rate-limited to 1,000 requests per minute per authenticated user. For Retrieval or `file_search` ingestion, upload files here first. If you need to attach multiple uploaded files to the same vector store, use vector store file batches instead of attaching them one by one.\n",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F purpose=\"fine-tune\" \\\n  -F file=\"@mydata.jsonl\"\n  -F expires_after[anchor]=\"created_at\"\n  -F expires_after[seconds]=2592000\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.files.create(\n  file=open(\"mydata.jsonl\", \"rb\"),\n  purpose=\"fine-tune\",\n  expires_after={\n    \"anchor\": \"created_at\",\n    \"seconds\": 2592000\n  }\n)\n",
+              "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const file = await openai.files.create({\n    file: fs.createReadStream(\"mydata.jsonl\"),\n    purpose: \"fine-tune\",\n    expires_after: {\n      anchor: \"created_at\",\n      seconds: 2592000\n    }\n  });\n\n  console.log(file);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"file\",\n  \"bytes\": 120000,\n  \"created_at\": 1677610602,\n  \"expires_at\": 1677614202,\n  \"filename\": \"mydata.jsonl\",\n  \"purpose\": \"fine-tune\",\n}\n"
+          }
+        }
+      }
+    },
+    "/files/{file_id}": {
+      "delete": {
+        "operationId": "deleteFile",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Delete a file and remove it from all vector stores.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the file to use for this request."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteFileResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete file",
+          "group": "files",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files/file-abc123 \\\n  -X DELETE \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.files.delete(\"file-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const file = await openai.files.delete(\"file-abc123\");\n\n  console.log(file);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"file\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      },
+      "get": {
+        "operationId": "retrieveFile",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Returns information about a specific file.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the file to use for this request."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OpenAIFile"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve file",
+          "group": "files",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files/file-abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.files.retrieve(\"file-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const file = await openai.files.retrieve(\"file-abc123\");\n\n  console.log(file);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"file\",\n  \"bytes\": 120000,\n  \"created_at\": 1677610602,\n  \"expires_at\": 1677614202,\n  \"filename\": \"mydata.jsonl\",\n  \"purpose\": \"fine-tune\",\n}\n"
+          }
+        }
+      }
+    },
+    "/files/{file_id}/content": {
+      "get": {
+        "operationId": "downloadFile",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Returns a response containing the contents of the specified file.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the file to use for this request."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve file content",
+          "group": "files",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files/file-abc123/content \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" > file.jsonl\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ncontent = client.files.content(\"file-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const response = await openai.files.content(\"file-abc123\");\n  const content = await response.text();\n\n  console.log(content);\n}\n\nmain();\n"
+            }
+          }
+        }
+      }
+    },
+    "/skills": {
+      "post": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Create a new skill.",
+        "operationId": "CreateSkill",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSkillBody"
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSkillBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "List all skills for the current project.",
+        "operationId": "ListSkills",
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of items to retrieve",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order of results by timestamp. Use `asc` for ascending order or `desc` for descending order.",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/OrderEnum"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last item from the previous pagination request",
+            "required": false,
+            "schema": {
+              "description": "Identifier for the last item from the previous pagination request",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}": {
+      "delete": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Delete a skill by its ID.",
+        "operationId": "DeleteSkill",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill to delete.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedSkillResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Get a skill by its ID.",
+        "operationId": "GetSkill",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill to retrieve.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Update the default version pointer for a skill.",
+        "operationId": "UpdateSkillDefaultVersion",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/SetDefaultSkillVersionBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}/content": {
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Download a skill zip bundle by its ID.",
+        "operationId": "GetSkillContent",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill to download.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The skill zip bundle.",
+            "content": {
+              "application/zip": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}/versions": {
+      "post": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Create a new immutable skill version.",
+        "operationId": "CreateSkillVersion",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill to version.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSkillVersionBody"
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSkillVersionBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillVersionResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "List skill versions for a skill.",
+        "operationId": "ListSkillVersions",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of versions to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order of results by version number.",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/OrderEnum"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "The skill version ID to start after.",
+            "required": false,
+            "schema": {
+              "example": "skillver_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillVersionListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}/versions/{version}": {
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Get a specific skill version.",
+        "operationId": "GetSkillVersion",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "description": "The version number to retrieve.",
+            "required": true,
+            "schema": {
+              "description": "The version number to retrieve.",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillVersionResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Delete a skill version.",
+        "operationId": "DeleteSkillVersion",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "description": "The skill version number.",
+            "required": true,
+            "schema": {
+              "description": "The skill version number.",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedSkillVersionResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}/versions/{version}/content": {
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Download a skill version zip bundle.",
+        "operationId": "GetSkillVersionContent",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "description": "The skill version number.",
+            "required": true,
+            "schema": {
+              "description": "The skill version number.",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The skill zip bundle.",
+            "content": {
+              "application/zip": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/agents/environments/{environment_id}": {
+      "get": {
+        "operationId": "retrieveAgentEnvironment",
+        "summary": "Retrieves an execution environment's connection status and safe installed metadata. See [environment lifecycle](https://developers.openai.com/api/docs/guides/agents-api/environments/lifecycle).",
+        "description": "Retrieves an execution environment's connection status and safe installed metadata.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the environment."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested environment.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PublicEnvironmentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent environment"
+        }
+      }
+    },
+    "/agents/environments/{environment_id}/files": {
+      "get": {
+        "operationId": "listAgentEnvironmentFiles",
+        "summary": "Lists live files on a connected execution environment with optional directory filtering and opaque cursor pagination. See [environment files](https://developers.openai.com/api/docs/guides/agents-api/environments/files).",
+        "description": "Lists live files on a connected execution environment with optional directory filtering and opaque cursor pagination.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the environment."
+          },
+          {
+            "name": "path",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Restrict the listing to this absolute workspace directory."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100
+            },
+            "description": "The maximum number of files to return, between 1 and 100."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam"
+            },
+            "description": "Sort by case-sensitive path components. Defaults to descending."
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The opaque token from the previous page. Keep the same path, order, and limit."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of live environment files.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentFileListResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent environment files"
+        }
+      },
+      "post": {
+        "operationId": "createAgentEnvironmentFile",
+        "summary": "Copies inline bytes or a Files API file into a connected execution environment. See [environment files](https://developers.openai.com/api/docs/guides/agents-api/environments/files).",
+        "description": "Copies inline bytes or a Files API file into a connected execution environment.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the environment."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/HostedEnvironmentFileParam"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created live environment file.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentFileResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create an agent environment file"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents": {
+      "get": {
+        "operationId": "listAgentSessionSubagents",
+        "summary": "Lists subagents in a session, including nested and closed subagents. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Lists subagents in a session, including nested and closed subagents.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagents.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "object": {
+                      "type": "string",
+                      "enum": [
+                        "list"
+                      ],
+                      "default": "list",
+                      "x-stainless-const": true,
+                      "description": "The object type, which is always `list`."
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/SubagentResource"
+                      },
+                      "minItems": 0,
+                      "maxItems": 2000,
+                      "description": "The resources returned in this page, in the requested sort order."
+                    },
+                    "first_id": {
+                      "type": [
+                        "string",
+                        "null"
+                      ],
+                      "minLength": 0,
+                      "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+                    },
+                    "last_id": {
+                      "type": [
+                        "string",
+                        "null"
+                      ],
+                      "minLength": 0,
+                      "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+                    },
+                    "has_more": {
+                      "type": "boolean",
+                      "description": "Whether there are more resources to retrieve after this page."
+                    }
+                  },
+                  "required": [
+                    "object",
+                    "data",
+                    "first_id",
+                    "last_id",
+                    "has_more"
+                  ],
+                  "additionalProperties": false,
+                  "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List session subagents"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}": {
+      "get": {
+        "operationId": "retrieveAgentSessionSubagent",
+        "summary": "Retrieves a subagent belonging to this session. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Retrieves a subagent belonging to this session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SubagentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a session subagent"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}/items": {
+      "get": {
+        "operationId": "listAgentSessionSubagentItems",
+        "summary": "Lists this subagent's own items across all of its turns. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Lists this subagent's own items across all of its turns.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent history.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionItemListResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List subagent items"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}/turns": {
+      "get": {
+        "operationId": "listAgentSessionSubagentTurns",
+        "summary": "Lists all turns of this subagent, including turns after a resume. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Lists all turns of this subagent, including turns after a resume.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent history.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionTurnListResource",
+                  "description": "A page of turns from an agent session or subagent."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List subagent turns"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}/turns/{turn_id}": {
+      "get": {
+        "operationId": "retrieveAgentSessionSubagentTurn",
+        "summary": "Retrieves a turn belonging to this subagent. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Retrieves a turn belonging to this subagent.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "turn_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of a turn belonging to this subagent."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent history.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TurnResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a subagent turn"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}/turns/{turn_id}/items": {
+      "get": {
+        "operationId": "listAgentSessionSubagentTurnItems",
+        "summary": "Lists items belonging to one turn of this subagent. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Lists items belonging to one turn of this subagent.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "turn_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of a turn belonging to this subagent."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent history.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionItemListResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List subagent turn items"
+        }
+      }
+    },
+    "/agents": {
+      "get": {
+        "operationId": "listAgents",
+        "summary": "Lists reusable agents in the current project. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Lists reusable agents in the current project.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 1
+            },
+            "description": "The maximum number of resources to return."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of agents.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AgentListResource",
+                  "description": "A page of reusable agents."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agents"
+        }
+      },
+      "post": {
+        "operationId": "createAgent",
+        "summary": "Creates a reusable agent without storing credentials. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Creates a reusable agent without storing credentials.",
+        "tags": [
+          "Agents"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateAgentParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created agent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AgentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create an agent"
+        },
+        "parameters": [
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ]
+      }
+    },
+    "/agents/{agent_id}": {
+      "get": {
+        "operationId": "retrieveAgent",
+        "summary": "Retrieves a reusable agent by ID. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Retrieves a reusable agent by ID.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "agent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable agent."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested agent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AgentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent"
+        }
+      },
+      "post": {
+        "operationId": "updateAgent",
+        "summary": "Updates a reusable agent. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Updates a reusable agent.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "agent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable agent."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateAgentParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The updated agent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AgentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update an agent"
+        }
+      },
+      "delete": {
+        "operationId": "deleteAgent",
+        "summary": "Deletes a reusable agent. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Deletes a reusable agent.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "agent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable agent."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted agent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedAgentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an agent"
+        }
+      }
+    },
+    "/agents/environments/templates": {
+      "get": {
+        "operationId": "listAgentEnvironmentTemplates",
+        "summary": "Lists reusable environment templates without returning confidential values. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Lists reusable environment templates without returning confidential values.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of environment templates.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentTemplateListResource",
+                  "description": "A page of reusable environment templates."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent environment templates"
+        }
+      },
+      "post": {
+        "operationId": "createAgentEnvironmentTemplate",
+        "summary": "Creates reusable environment configuration without returning confidential setup commands or environment values. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Creates reusable environment configuration without returning confidential setup commands or environment values.",
+        "tags": [
+          "Agents"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateEnvironmentTemplateParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created environment template.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentTemplateResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create an agent environment template"
+        },
+        "parameters": [
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ]
+      }
+    },
+    "/agents/environments/templates/{environment_template_id}": {
+      "get": {
+        "operationId": "retrieveAgentEnvironmentTemplate",
+        "summary": "Retrieves reusable environment configuration without returning confidential values. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Retrieves reusable environment configuration without returning confidential values.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_template_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable environment template."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested environment template.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentTemplateResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent environment template"
+        }
+      },
+      "post": {
+        "operationId": "updateAgentEnvironmentTemplate",
+        "summary": "Updates reusable environment configuration without returning confidential values. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Updates reusable environment configuration without returning confidential values.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_template_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable environment template."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateEnvironmentTemplateParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The updated environment template.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentTemplateResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current environment state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update an agent environment template"
+        }
+      },
+      "delete": {
+        "operationId": "deleteAgentEnvironmentTemplate",
+        "summary": "Deletes reusable environment configuration and all confidential template inputs. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Deletes reusable environment configuration and all confidential template inputs.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_template_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable environment template."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted environment template.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedEnvironmentTemplateResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current environment state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an agent environment template"
+        }
+      }
+    },
+    "/agents/sessions": {
+      "get": {
+        "operationId": "listAgentSessions",
+        "summary": "Lists managed agent sessions using ID-based pagination and the requested sort order. See [managing sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage).",
+        "description": "Lists managed agent sessions using ID-based pagination and the requested sort order.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 1
+            },
+            "description": "The maximum number of resources to return."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "Sort order by the `created_at` timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `desc`."
+          },
+          {
+            "name": "agent_id",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Only return sessions whose root agent has this ID. Omit to return sessions for all agents."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of sessions.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionListResource",
+                  "description": "A paginated list of sessions."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent sessions"
+        }
+      },
+      "post": {
+        "operationId": "createAgentSession",
+        "summary": "Creates a managed agent session, optionally submits initial input, and returns the session or streams its events when stream is true. See [running sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions).",
+        "description": "Creates a managed agent session, optionally submits initial input, and returns the session or streams its events when stream is true.",
+        "tags": [
+          "Agents"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateAgentSessionParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created session or its event stream.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionResource"
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionEvent"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oai-streaming": {
+          "request_field": "stream",
+          "response_status_code": 201
+        },
+        "x-oaiMeta": {
+          "name": "Create an agent session"
+        },
+        "parameters": [
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ]
+      }
+    },
+    "/agents/sessions/{session_id}": {
+      "get": {
+        "operationId": "retrieveAgentSession",
+        "summary": "Retrieves the current state of a managed agent session. See [managing sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage).",
+        "description": "Retrieves the current state of a managed agent session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested session.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent session"
+        }
+      },
+      "post": {
+        "operationId": "updateAgentSession",
+        "summary": "Updates session metadata. Omitted fields are unchanged. See [managing sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage).",
+        "description": "Updates session metadata. Omitted fields are unchanged.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateAgentSessionParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The updated session.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update an agent session"
+        }
+      },
+      "delete": {
+        "operationId": "deleteAgentSession",
+        "summary": "Removes a managed agent session from the public API and returns a deletion confirmation. Physical cleanup may continue asynchronously. See [managing sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage).",
+        "description": "Removes a managed agent session from the public API and returns a deletion confirmation. Physical cleanup may continue asynchronously.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted session.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedSessionResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an agent session"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/artifacts": {
+      "get": {
+        "operationId": "listAgentSessionArtifacts",
+        "summary": "Lists immutable artifacts published by completed hosted session turns. See [session artifacts](https://developers.openai.com/api/docs/guides/agents-api/environments/files#openai-hosted-artifacts).",
+        "description": "Lists immutable artifacts published by completed hosted session turns.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam"
+            },
+            "description": "Sort by creation time and ID. Defaults to descending."
+          },
+          {
+            "name": "environment_id",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Restrict the listing to artifacts produced by this environment."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100
+            },
+            "description": "The maximum number of artifacts to return, between 1 and 100."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return artifacts after this immutable artifact ID."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of durable session artifacts.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionArtifactListResource",
+                  "description": "A page of durable artifacts published by a session."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent session artifacts"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/artifacts/{artifact_id}": {
+      "get": {
+        "operationId": "retrieveAgentSessionArtifact",
+        "summary": "Retrieves immutable metadata for one durable session artifact. See [session artifacts](https://developers.openai.com/api/docs/guides/agents-api/environments/files#openai-hosted-artifacts).",
+        "description": "Retrieves immutable metadata for one durable session artifact.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session that owns the artifact."
+          },
+          {
+            "name": "artifact_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The immutable session artifact ID."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested session artifact.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionArtifactResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent session artifact"
+        }
+      },
+      "delete": {
+        "operationId": "deleteAgentSessionArtifact",
+        "summary": "Deletes an immutable session artifact without deleting its live environment file or original Files API object. See [session artifacts](https://developers.openai.com/api/docs/guides/agents-api/environments/files#openai-hosted-artifacts).",
+        "description": "Deletes an immutable session artifact without deleting its live environment file or original Files API object.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session that owns the artifact."
+          },
+          {
+            "name": "artifact_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The immutable session artifact ID."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted session artifact.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedSessionArtifactResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an agent session artifact"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/artifacts/{artifact_id}/content": {
+      "get": {
+        "operationId": "retrieveAgentSessionArtifactContent",
+        "summary": "Downloads immutable session artifact bytes after the execution environment expires. See [session artifacts](https://developers.openai.com/api/docs/guides/agents-api/environments/files#openai-hosted-artifacts).",
+        "description": "Downloads immutable session artifact bytes after the execution environment expires.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session that owns the artifact."
+          },
+          {
+            "name": "artifact_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The immutable session artifact ID."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The immutable artifact contents.",
+            "content": {
+              "application/octet-stream": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve agent session artifact content"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/events": {
+      "get": {
+        "operationId": "listAgentSessionEvents",
+        "summary": "Streams live events for an agent session. See [session events](https://developers.openai.com/api/docs/guides/agents-api/sessions/events).",
+        "description": "Streams live events for an agent session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A live stream of session events.",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionEvent"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oai-streaming": {
+          "request_field": null,
+          "response_status_code": 200
+        },
+        "x-oaiMeta": {
+          "name": "Stream agent session events"
+        }
+      },
+      "post": {
+        "operationId": "createAgentSessionEvents",
+        "summary": "Submits message, cancellation, or tool-result events to a managed agent session. See [session events](https://developers.openai.com/api/docs/guides/agents-api/sessions/events).",
+        "description": "Submits message, cancellation, or tool-result events to a managed agent session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "Idempotency-Key",
+            "in": "header",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "description": "An optional client-generated key that makes retries of submitted messages idempotent."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSessionEventsParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "202": {
+            "description": "The events were accepted."
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create agent session input events"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/items": {
+      "get": {
+        "operationId": "listAgentSessionItems",
+        "summary": "Lists items produced by the session's root agent, including its interactions with subagents. Each subagent has its own item history. See [inspecting agent output](https://developers.openai.com/api/docs/guides/agents-api/observability).",
+        "description": "Lists items produced by the session's root agent, including its interactions with subagents. Each subagent has its own item history.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of session items.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionItemListResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent session items"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/turns": {
+      "get": {
+        "operationId": "listAgentSessionTurns",
+        "summary": "Lists turns by creation time and turn ID. The after cursor is exclusive in the selected order. See [session turns](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage#inspect-session-turns).",
+        "description": "Lists turns by creation time and turn ID. The after cursor is exclusive in the selected order.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of session turns.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionTurnListResource",
+                  "description": "A page of turns from an agent session or subagent."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent session turns"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/turns/{turn_id}": {
+      "get": {
+        "operationId": "retrieveAgentSessionTurn",
+        "summary": "Retrieves a turn's current status, timestamps, usage, and error. Returns 404 if the turn does not belong to the session. See [session turns](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage#inspect-session-turns).",
+        "description": "Retrieves a turn's current status, timestamps, usage, and error. Returns 404 if the turn does not belong to the session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session that owns the turn."
+          },
+          {
+            "name": "turn_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the turn."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested turn.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TurnResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent session turn"
+        }
+      }
+    },
+    "/vaults": {
+      "get": {
+        "operationId": "listVaults",
+        "summary": "Lists vaults using ID-based pagination. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Lists vaults using ID-based pagination.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "Sort order by the `created_at` timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `desc`."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 0
+            },
+            "description": "The maximum number of resources to return. Defaults to 20. Values are clamped between 1 and 100."
+          },
+          {
+            "name": "status",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/VaultStatusFilterParam"
+            },
+            "description": "Filter by one status or a list, such as `status=active` or `status[]=active&status[]=archived`. Both statuses are included by default."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of vaults.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultListResource",
+                  "description": "A page of vaults."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List vaults"
+        }
+      },
+      "post": {
+        "operationId": "createVault",
+        "summary": "Creates a vault for the current project. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Creates a vault for the current project.",
+        "tags": [
+          "Vaults"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVaultParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created vault.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create a vault"
+        },
+        "parameters": [
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ]
+      }
+    },
+    "/vaults/{vault_id}": {
+      "get": {
+        "operationId": "retrieveVault",
+        "summary": "Retrieves a vault by its ID. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Retrieves a vault by its ID.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested vault.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a vault"
+        }
+      },
+      "delete": {
+        "operationId": "deleteVault",
+        "summary": "Deletes a vault and all its credentials. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Deletes a vault and all its credentials.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted vault.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedVaultResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a vault"
+        }
+      }
+    },
+    "/vaults/{vault_id}/credentials": {
+      "get": {
+        "operationId": "listVaultCredentials",
+        "summary": "Lists a vault's credentials using ID-based pagination without returning secret values. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Lists a vault's credentials using ID-based pagination without returning secret values.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "Sort order by the `created_at` timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `desc`."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 0
+            },
+            "description": "The maximum number of resources to return. Defaults to 20. Values are clamped between 1 and 100."
+          },
+          {
+            "name": "status",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/VaultStatusFilterParam"
+            },
+            "description": "Filter by one status or a list, such as `status=active` or `status[]=active&status[]=archived`. Both statuses are included by default."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of vault credentials.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultCredentialListResource",
+                  "description": "A page of credentials in a vault."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List vault credentials"
+        }
+      },
+      "post": {
+        "operationId": "createVaultCredential",
+        "summary": "Creates a vault credential. Secret values are write-only and are never returned. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Creates a vault credential. Secret values are write-only and are never returned.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVaultCredentialParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created vault credential without secret values.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultCredentialResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create a vault credential"
+        }
+      }
+    },
+    "/vaults/{vault_id}/credentials/{credential_id}": {
+      "get": {
+        "operationId": "retrieveVaultCredential",
+        "summary": "Retrieves vault credential metadata without returning secret values. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Retrieves vault credential metadata without returning secret values.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "credential_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault credential."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested vault credential without secret values.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultCredentialResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a vault credential"
+        }
+      },
+      "post": {
+        "operationId": "rotateVaultCredential",
+        "summary": "Rotates a vault credential's write-only secret and returns only credential metadata. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Rotates a vault credential's write-only secret and returns only credential metadata.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "credential_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault credential."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RotateVaultCredentialParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The rotated vault credential without secret values.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultCredentialResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Rotate a vault credential"
+        }
+      },
+      "delete": {
+        "operationId": "deleteVaultCredential",
+        "summary": "Deletes a vault credential. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Deletes a vault credential.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "credential_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault credential."
+          },
+          {
+            "name": "OpenAI-Beta",
+            "in": "header",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "const": "agents=v1"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted vault credential.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedVaultCredentialResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a vault credential"
+        }
+      }
+    }
+  },
+  "webhooks": {
+    "batch_cancelled": {
+      "post": {
+        "description": "Sent when a batch has been cancelled.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookBatchCancelled"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "batch_completed": {
+      "post": {
+        "description": "Sent when a batch has completed processing.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookBatchCompleted"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "batch_expired": {
+      "post": {
+        "description": "Sent when a batch has expired before completion.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookBatchExpired"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "batch_failed": {
+      "post": {
+        "description": "Sent when a batch has failed.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookBatchFailed"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "eval_run_canceled": {
+      "post": {
+        "description": "Sent when an eval run has been canceled.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookEvalRunCanceled"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "eval_run_failed": {
+      "post": {
+        "description": "Sent when an eval run has failed.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookEvalRunFailed"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "eval_run_succeeded": {
+      "post": {
+        "description": "Sent when an eval run has succeeded.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookEvalRunSucceeded"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "fine_tuning_job_cancelled": {
+      "post": {
+        "description": "Sent when a fine-tuning job has been cancelled.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookFineTuningJobCancelled"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "fine_tuning_job_failed": {
+      "post": {
+        "description": "Sent when a fine-tuning job has failed.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookFineTuningJobFailed"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "fine_tuning_job_succeeded": {
+      "post": {
+        "description": "Sent when a fine-tuning job has succeeded.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookFineTuningJobSucceeded"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "live_call_incoming": {
+      "post": {
+        "deprecated": true,
+        "description": "Deprecated: use `live.transport.incoming`. Retained only for existing subscriptions.\nSent when an incoming API SIP session is available for Live acceptance.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookLiveCallIncoming"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200\nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "live_transport_incoming": {
+      "post": {
+        "description": "Sent when an incoming API SIP session is available for Live acceptance.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookLiveTransportIncoming"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200\nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "realtime_call_incoming": {
+      "post": {
+        "description": "Sent when an incoming API SIP session is available for Realtime acceptance.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookRealtimeCallIncoming"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200\nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "response_cancelled": {
+      "post": {
+        "description": "Sent when a background response has been cancelled.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookResponseCancelled"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "response_completed": {
+      "post": {
+        "description": "Sent when a background response has completed successfully.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookResponseCompleted"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "response_failed": {
+      "post": {
+        "description": "Sent when a background response has failed.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookResponseFailed"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "response_incomplete": {
+      "post": {
+        "description": "Sent when a background response is incomplete.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookResponseIncomplete"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "safety_alert_created": {
+      "post": {
+        "description": "Sent when an approved safety alert is available for an API project.\nRetrieve the alert with a project API key granted `api.safety.alerts.read`.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookSafetyAlertCreated"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return any 2xx status code to acknowledge receipt. A 410 Gone response also stops retries; other non-2xx responses are retried."
+          }
+        }
+      }
+    },
+    "safety_org_alert_created": {
+      "post": {
+        "description": "Sent when an approved safety alert is available for an enterprise workspace.\nRetrieve the alert from `https://api.chatgpt.com/v1/safety/alerts/{id}` with\nan administrator API key for the workspace's backing organization granted\n`chatgpt.enterprise.safety_alerts.read`.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookSafetyOrgAlertCreated"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return any 2xx status code to acknowledge receipt. A 410 Gone response also stops retries; other non-2xx responses are retried."
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "CreateFileRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file": {
+            "description": "The File object (not file name) to be uploaded.\n",
+            "type": "string",
+            "format": "binary"
+          },
+          "purpose": {
+            "description": "The intended purpose of the uploaded file. One of:\n- `assistants`: Used in the Assistants API\n- `batch`: Used in the Batch API\n- `fine-tune`: Used for fine-tuning\n- `vision`: Images used for vision fine-tuning\n- `user_data`: Flexible file type for any purpose\n- `evals`: Used for eval data sets\n",
+            "type": "string",
+            "enum": [
+              "assistants",
+              "batch",
+              "fine-tune",
+              "vision",
+              "user_data",
+              "evals"
+            ]
+          },
+          "expires_after": {
+            "$ref": "#/components/schemas/FileExpirationAfter"
+          }
+        },
+        "required": [
+          "file",
+          "purpose"
+        ]
+      },
+      "DeleteFileResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "file"
+            ],
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "Error": {
+        "type": "object",
+        "properties": {
+          "code": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "param": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string"
+          },
+          "misalignment": {
+            "$ref": "#/components/schemas/MisalignmentErrorDetailsResource"
+          }
+        },
+        "required": [
+          "type",
+          "message",
+          "param",
+          "code"
+        ]
+      },
+      "ErrorResponse": {
+        "type": "object",
+        "properties": {
+          "error": {
+            "$ref": "#/components/schemas/Error"
+          }
+        },
+        "required": [
+          "error"
+        ]
+      },
+      "FileExpirationAfter": {
+        "type": "object",
+        "title": "File expiration policy",
+        "description": "The expiration policy for a file. By default, files with `purpose=batch` expire after 30 days and all other files are persisted until they are manually deleted.",
+        "properties": {
+          "anchor": {
+            "description": "Anchor timestamp after which the expiration policy applies. Supported anchors: `created_at`.",
+            "type": "string",
+            "enum": [
+              "created_at"
+            ],
+            "x-stainless-const": true
+          },
+          "seconds": {
+            "description": "The number of seconds after the anchor time that the file will expire. Must be between 3600 (1 hour) and 2592000 (30 days).",
+            "type": "integer",
+            "format": "int64",
+            "minimum": 3600,
+            "maximum": 2592000
+          }
+        },
+        "required": [
+          "anchor",
+          "seconds"
+        ]
+      },
+      "ListFilesResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "example": "list"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OpenAIFile"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "file-abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "file-abc456"
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "OpenAIFile": {
+        "title": "OpenAIFile",
+        "description": "The `File` object represents a document that has been uploaded to OpenAI.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The file identifier, which can be referenced in the API endpoints."
+          },
+          "bytes": {
+            "type": "integer",
+            "description": "The size of the file, in bytes."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the file was created."
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the file will expire."
+          },
+          "filename": {
+            "type": "string",
+            "description": "The name of the file."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always `file`.",
+            "enum": [
+              "file"
+            ],
+            "x-stainless-const": true
+          },
+          "purpose": {
+            "type": "string",
+            "description": "The intended purpose of the file. Supported values are `assistants`, `assistants_output`, `batch`, `batch_output`, `fine-tune`, `fine-tune-results`, `vision`, and `user_data`.",
+            "enum": [
+              "assistants",
+              "assistants_output",
+              "batch",
+              "batch_output",
+              "fine-tune",
+              "fine-tune-results",
+              "vision",
+              "user_data"
+            ]
+          },
+          "status": {
+            "type": "string",
+            "deprecated": true,
+            "description": "Deprecated. The current status of the file, which can be either `uploaded`, `processed`, or `error`.",
+            "enum": [
+              "uploaded",
+              "processed",
+              "error"
+            ]
+          },
+          "status_details": {
+            "type": "string",
+            "deprecated": true,
+            "description": "Deprecated. For details on why a fine-tuning training file failed validation, see the `error` field on `fine_tuning.job`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "bytes",
+          "created_at",
+          "filename",
+          "purpose",
+          "status"
+        ],
+        "x-oaiMeta": {
+          "name": "The file object",
+          "example": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"file\",\n  \"bytes\": 120000,\n  \"created_at\": 1677610602,\n  \"expires_at\": 1680202602,\n  \"filename\": \"salesOverview.pdf\",\n  \"purpose\": \"assistants\",\n}\n"
+        }
+      },
+      "_MisalignmentErrorType": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "potentially_unintended_data_transfer",
+              "potentially_unintended_data_access",
+              "potentially_unintended_destructive_activity",
+              "other"
+            ]
+          }
+        ]
+      },
+      "_MisalignmentSteer": {
+        "properties": {
+          "message": {
+            "type": "string",
+            "description": "The public continuation instruction."
+          }
+        },
+        "type": "object",
+        "required": [
+          "message"
+        ]
+      },
+      "MisalignmentErrorDetailsResource": {
+        "properties": {
+          "error_type": {
+            "$ref": "#/components/schemas/_MisalignmentErrorType",
+            "description": "An optional classification; clients must accept additional values."
+          },
+          "detailed_explanation": {
+            "type": "string",
+            "description": "The public explanation for this block."
+          },
+          "steer": {
+            "$ref": "#/components/schemas/_MisalignmentSteer",
+            "description": "An optional public continuation instruction."
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "OrderEnum": {
+        "type": "string",
+        "enum": [
+          "asc",
+          "desc"
+        ]
+      },
+      "SkillResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the skill."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "skill"
+            ],
+            "description": "The object type, which is `skill`.",
+            "default": "skill",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the skill."
+          },
+          "description": {
+            "type": "string",
+            "description": "Description of the skill."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (seconds) for when the skill was created."
+          },
+          "default_version": {
+            "type": "string",
+            "description": "Default version for the skill."
+          },
+          "latest_version": {
+            "type": "string",
+            "description": "Latest version for the skill."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "name",
+          "description",
+          "created_at",
+          "default_version",
+          "latest_version"
+        ]
+      },
+      "SkillListResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be `list`.",
+            "default": "list",
+            "x-stainless-const": true
+          },
+          "data": {
+            "items": {
+              "$ref": "#/components/schemas/SkillResource"
+            },
+            "type": "array",
+            "description": "A list of items"
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the first item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the last item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "CreateSkillBody": {
+        "properties": {
+          "files": {
+            "oneOf": [
+              {
+                "items": {
+                  "type": "string",
+                  "format": "binary"
+                },
+                "type": "array",
+                "maxItems": 500,
+                "description": "Skill files to upload (directory upload) or a single zip file."
+              },
+              {
+                "type": "string",
+                "format": "binary",
+                "description": "Skill zip file to upload."
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "files"
+        ],
+        "title": "Create skill request",
+        "description": "Uploads a skill either as a directory (multipart `files[]`) or as a single zip file."
+      },
+      "SetDefaultSkillVersionBody": {
+        "properties": {
+          "default_version": {
+            "type": "string",
+            "description": "The skill version number to set as default."
+          }
+        },
+        "type": "object",
+        "required": [
+          "default_version"
+        ],
+        "title": "Update skill request",
+        "description": "Updates the default version pointer for a skill."
+      },
+      "DeletedSkillResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "skill.deleted"
+            ],
+            "default": "skill.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "id": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "deleted",
+          "id"
+        ]
+      },
+      "SkillVersionResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "skill.version"
+            ],
+            "description": "The object type, which is `skill.version`.",
+            "default": "skill.version",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the skill version."
+          },
+          "skill_id": {
+            "type": "string",
+            "description": "Identifier of the skill for this version."
+          },
+          "version": {
+            "type": "string",
+            "description": "Version number for this skill."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (seconds) for when the version was created."
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the skill version."
+          },
+          "description": {
+            "type": "string",
+            "description": "Description of the skill version."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "id",
+          "skill_id",
+          "version",
+          "created_at",
+          "name",
+          "description"
+        ]
+      },
+      "SkillVersionListResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be `list`.",
+            "default": "list",
+            "x-stainless-const": true
+          },
+          "data": {
+            "items": {
+              "$ref": "#/components/schemas/SkillVersionResource"
+            },
+            "type": "array",
+            "description": "A list of items"
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the first item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the last item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "CreateSkillVersionBody": {
+        "properties": {
+          "files": {
+            "oneOf": [
+              {
+                "items": {
+                  "type": "string",
+                  "format": "binary"
+                },
+                "type": "array",
+                "maxItems": 500,
+                "description": "Skill files to upload (directory upload) or a single zip file."
+              },
+              {
+                "type": "string",
+                "format": "binary",
+                "description": "Skill zip file to upload."
+              }
+            ]
+          },
+          "default": {
+            "type": "boolean",
+            "description": "Whether to set this version as the default."
+          }
+        },
+        "type": "object",
+        "required": [
+          "files"
+        ],
+        "title": "Create skill version request",
+        "description": "Uploads a new immutable version of a skill."
+      },
+      "DeletedSkillVersionResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "skill.version.deleted"
+            ],
+            "default": "skill.version.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "id": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string",
+            "description": "The deleted skill version."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "deleted",
+          "id",
+          "version"
+        ]
+      },
+      "EnvironmentTypeResource": {
+        "type": "string",
+        "enum": [
+          "openai_hosted",
+          "self_hosted"
+        ],
+        "description": "The kind of execution environment."
+      },
+      "EnvironmentStatusResource": {
+        "type": "string",
+        "enum": [
+          "pending",
+          "connected",
+          "disconnected",
+          "expired",
+          "failed"
+        ],
+        "description": "The public lifecycle status of an execution environment."
+      },
+      "HostedEnvironmentFileResourceFileId": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_id"
+            ],
+            "default": "file_id",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `file_id`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The session-scoped ID of the file in the execution environment."
+          },
+          "file_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the uploaded file."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The file's absolute path inside the environment."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The decoded file size in bytes."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "file_id",
+          "path",
+          "size_bytes"
+        ],
+        "additionalProperties": false,
+        "description": "A file copied from the OpenAI Files API."
+      },
+      "HostedEnvironmentFileResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The session-scoped ID of the file in the execution environment."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The file's absolute path inside the environment."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The decoded file size in bytes."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "path",
+          "size_bytes"
+        ],
+        "additionalProperties": false,
+        "description": "A file supplied inline when the session was created."
+      },
+      "HostedEnvironmentFileResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedEnvironmentFileResourceFileId"
+          },
+          {
+            "$ref": "#/components/schemas/HostedEnvironmentFileResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "file_id": "#/components/schemas/HostedEnvironmentFileResourceFileId",
+            "inline": "#/components/schemas/HostedEnvironmentFileResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "file_id",
+          "inline"
+        ],
+        "description": "Metadata for a file materialized in an OpenAI-hosted execution environment."
+      },
+      "HostedSkillResourceSkillReference": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill_reference"
+            ],
+            "default": "skill_reference",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `skill_reference`."
+          },
+          "skill_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The referenced skill ID."
+          },
+          "version": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The concrete skill version installed for this session."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed skill name."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed skill description."
+          }
+        },
+        "required": [
+          "type",
+          "skill_id",
+          "version",
+          "name",
+          "description"
+        ],
+        "additionalProperties": false,
+        "description": "A skill installed from the Skills API."
+      },
+      "HostedSkillResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed skill name."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed skill description."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description"
+        ],
+        "additionalProperties": false,
+        "description": "A skill installed from an inline ZIP archive."
+      },
+      "HostedSkillResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedSkillResourceSkillReference"
+          },
+          {
+            "$ref": "#/components/schemas/HostedSkillResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "skill_reference": "#/components/schemas/HostedSkillResourceSkillReference",
+            "inline": "#/components/schemas/HostedSkillResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "skill_reference",
+          "inline"
+        ],
+        "description": "A skill installed in an OpenAI-hosted environment."
+      },
+      "HostedPluginResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed plugin name."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed plugin description."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description"
+        ],
+        "additionalProperties": false,
+        "description": "A plugin installed from an inline ZIP archive."
+      },
+      "HostedPluginResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedPluginResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "inline": "#/components/schemas/HostedPluginResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "inline"
+        ],
+        "description": "A plugin installed in an OpenAI-hosted environment."
+      },
+      "PublicEnvironmentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the environment."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.environment"
+            ],
+            "default": "agent.environment",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.environment`."
+          },
+          "type": {
+            "$ref": "#/components/schemas/EnvironmentTypeResource",
+            "description": "Whether the environment is hosted by OpenAI or by the application."
+          },
+          "status": {
+            "$ref": "#/components/schemas/EnvironmentStatusResource",
+            "description": "The current environment connection status."
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Files installed in the environment, without their contents."
+          },
+          "skills": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Skills installed in the environment, without their archive contents."
+          },
+          "plugins": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Plugins installed in the environment, without their archive contents."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "type",
+          "status",
+          "files",
+          "skills",
+          "plugins"
+        ],
+        "additionalProperties": false,
+        "description": "Safe metadata for a first-class execution environment."
+      },
+      "ErrorBodyResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The error type."
+          },
+          "code": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A machine-readable error code."
+          },
+          "message": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A human-readable error message."
+          },
+          "param": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The request parameter that caused the error, or null for a request-wide error."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message",
+          "param"
+        ],
+        "additionalProperties": false,
+        "description": "Details about an API error."
+      },
+      "ErrorResponse-2": {
+        "type": "object",
+        "properties": {
+          "error": {
+            "$ref": "#/components/schemas/ErrorBodyResource",
+            "description": "The error returned by the API."
+          }
+        },
+        "required": [
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "An API error response."
+      },
+      "ListOrderParam": {
+        "type": "string",
+        "enum": [
+          "asc",
+          "desc"
+        ],
+        "x-enumDescriptions": [
+          "Returns resources in ascending order.",
+          "Returns resources in descending order."
+        ],
+        "description": "The order in which paginated resources are returned."
+      },
+      "EnvironmentFilePageObjectResource": {
+        "type": "string",
+        "enum": [
+          "page"
+        ],
+        "default": "page",
+        "x-stainless-const": true,
+        "description": "The object type for a page of files in an execution environment."
+      },
+      "EnvironmentFileResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.environment.file"
+            ],
+            "default": "agent.environment.file",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.environment.file`."
+          },
+          "environment_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the environment containing this file."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The absolute file path inside the environment's workspace."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The file size in bytes."
+          }
+        },
+        "required": [
+          "object",
+          "environment_id",
+          "path",
+          "size_bytes"
+        ],
+        "additionalProperties": false,
+        "description": "A live file in an execution environment."
+      },
+      "EnvironmentFileListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "$ref": "#/components/schemas/EnvironmentFilePageObjectResource",
+            "description": "The object type. Always `page`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EnvironmentFileResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Files available on the current page."
+          },
+          "next": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The opaque cursor to use when requesting the next page, if any."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether more files follow this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "next",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A paginated list of live execution environment files."
+      },
+      "HostedEnvironmentFileParamFileId": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_id"
+            ],
+            "default": "file_id",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `file_id`."
+          },
+          "file_id": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 256,
+            "description": "The ID of the uploaded file."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 4096,
+            "description": "The absolute destination path inside `/workspace`."
+          }
+        },
+        "required": [
+          "type",
+          "file_id",
+          "path"
+        ],
+        "additionalProperties": false,
+        "description": "A file previously uploaded through the OpenAI Files API."
+      },
+      "HostedEnvironmentFileParamInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "data": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 6990508,
+            "description": "The standard-base64-encoded file contents."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 4096,
+            "description": "The absolute destination path inside `/workspace`."
+          }
+        },
+        "required": [
+          "type",
+          "data",
+          "path"
+        ],
+        "additionalProperties": false,
+        "description": "A file supplied directly as standard-base64 data."
+      },
+      "HostedEnvironmentFileParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedEnvironmentFileParamFileId"
+          },
+          {
+            "$ref": "#/components/schemas/HostedEnvironmentFileParamInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "file_id": "#/components/schemas/HostedEnvironmentFileParamFileId",
+            "inline": "#/components/schemas/HostedEnvironmentFileParamInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "file_id",
+          "inline"
+        ],
+        "description": "A file materialized in an OpenAI-hosted execution environment."
+      },
+      "SubagentObjectResource": {
+        "type": "string",
+        "enum": [
+          "agent.session.subagent"
+        ],
+        "default": "agent.session.subagent",
+        "x-stainless-const": true,
+        "description": "The object type for a subagent."
+      },
+      "OutputTextResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_text"
+            ],
+            "default": "output_text",
+            "x-stainless-const": true,
+            "description": "The content type. Always `output_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text produced by the agent."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "A text content part produced by the agent."
+      },
+      "EncryptedContentResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "encrypted_content"
+            ],
+            "default": "encrypted_content",
+            "x-stainless-const": true,
+            "description": "The content type. Always `encrypted_content`."
+          },
+          "encrypted_content": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The encrypted content payload."
+          }
+        },
+        "required": [
+          "type",
+          "encrypted_content"
+        ],
+        "additionalProperties": false,
+        "description": "Encrypted content exchanged between agents."
+      },
+      "AgentContentResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/OutputTextResource"
+          },
+          {
+            "$ref": "#/components/schemas/EncryptedContentResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "output_text": "#/components/schemas/OutputTextResource",
+            "encrypted_content": "#/components/schemas/EncryptedContentResource"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "output_text",
+          "encrypted_content"
+        ],
+        "description": "A plaintext or encrypted content part exchanged between agents."
+      },
+      "SubagentStatusResource": {
+        "type": "string",
+        "enum": [
+          "active",
+          "closed"
+        ],
+        "x-enumDescriptions": [
+          "The subagent remains available, including while idle between turns.",
+          "The subagent is closed."
+        ],
+        "description": "The current status of a subagent."
+      },
+      "SubagentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the subagent."
+          },
+          "object": {
+            "$ref": "#/components/schemas/SubagentObjectResource",
+            "description": "The object type. Always `agent.session.subagent`."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session that owns the subagent."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The runner-assigned nickname, or null when unavailable."
+          },
+          "instructions": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/AgentContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Initial task content, or null when unavailable. Text may contain placeholders for images or audio when only a preview is available."
+          },
+          "parent_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent that created this subagent."
+          },
+          "status": {
+            "$ref": "#/components/schemas/SubagentStatusResource",
+            "description": "The current status of the subagent."
+          },
+          "opened_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the subagent was first opened. Resuming does not change it."
+          },
+          "closed_at": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the subagent was closed. Null while active, including after resume."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "session_id",
+          "name",
+          "instructions",
+          "parent_agent_id",
+          "status",
+          "opened_at",
+          "closed_at"
+        ],
+        "additionalProperties": false,
+        "description": "A subagent created within a session."
+      },
+      "SessionMessageRoleResource": {
+        "type": "string",
+        "enum": [
+          "user",
+          "assistant"
+        ],
+        "description": "The author of a session message."
+      },
+      "MessageContentResourceInputText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "default": "input_text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text supplied by the user."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Text supplied by the user."
+      },
+      "MessageContentResourceInputImage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "default": "input_image",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_image`."
+          },
+          "image_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The URL of the image supplied by the user, which may be a base64-encoded data URL."
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ],
+        "additionalProperties": false,
+        "description": "An image supplied by the user."
+      },
+      "MessageContentResourceOutputText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_text"
+            ],
+            "default": "output_text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `output_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text produced by the assistant."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Text produced by the assistant."
+      },
+      "MessageContentResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/MessageContentResourceInputText"
+          },
+          {
+            "$ref": "#/components/schemas/MessageContentResourceInputImage"
+          },
+          {
+            "$ref": "#/components/schemas/MessageContentResourceOutputText"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "input_text": "#/components/schemas/MessageContentResourceInputText",
+            "input_image": "#/components/schemas/MessageContentResourceInputImage",
+            "output_text": "#/components/schemas/MessageContentResourceOutputText"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "input_text",
+          "input_image",
+          "output_text"
+        ],
+        "description": "A content part in a session message."
+      },
+      "OutputItemStatusResource": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ],
+        "x-enumDescriptions": [
+          "The item is in progress.",
+          "The item is complete.",
+          "The item stopped before completing."
+        ],
+        "description": "The status of an agent output item."
+      },
+      "MessagePhaseResource": {
+        "type": "string",
+        "enum": [
+          "commentary",
+          "final_answer"
+        ],
+        "x-enumDescriptions": [
+          "Commentary produced while the agent works.",
+          "The agent's final answer."
+        ],
+        "description": "The phase of an assistant message."
+      },
+      "MessageItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "default": "message",
+            "x-stainless-const": true,
+            "description": "The item type. Always `message`."
+          },
+          "id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of this item, or null for legacy user messages whose ID was not recorded."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "role": {
+            "$ref": "#/components/schemas/SessionMessageRoleResource",
+            "description": "The role of the message author."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MessageContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The content of the message. User messages contain input text or images; assistant messages contain output text."
+          },
+          "status": {
+            "$ref": "#/components/schemas/OutputItemStatusResource",
+            "description": "The status of the message. User messages are always `completed`."
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MessagePhaseResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The phase of an assistant message. Null for user messages."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "role",
+          "content",
+          "status",
+          "phase"
+        ],
+        "additionalProperties": false,
+        "description": "A user or assistant message recorded in a session."
+      },
+      "SummaryTextResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "summary_text"
+            ],
+            "default": "summary_text",
+            "x-stainless-const": true,
+            "description": "The content type. Always `summary_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The reasoning summary text."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "A reasoning summary content part."
+      },
+      "ReasoningItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "reasoning"
+            ],
+            "default": "reasoning",
+            "x-stainless-const": true,
+            "description": "The item type. Always `reasoning`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "summary": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SummaryTextResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The reasoning summaries produced by the agent."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/OutputItemStatusResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The status of the reasoning item."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "summary",
+          "status"
+        ],
+        "additionalProperties": false,
+        "description": "A reasoning item produced by the agent."
+      },
+      "FunctionCallStatusResource": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "failed",
+          "incomplete"
+        ],
+        "x-enumDescriptions": [
+          "The call is in progress.",
+          "The call completed successfully.",
+          "The call failed.",
+          "The call stopped before completing."
+        ],
+        "description": "The status of a tool call."
+      },
+      "FunctionCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call"
+            ],
+            "default": "function_call",
+            "x-stainless-const": true,
+            "description": "The item type. Always `function_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the function call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "call_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID used to submit the function result."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The name of the function to call."
+          },
+          "arguments": {
+            "description": "The arguments to pass to the function."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the function call."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "call_id",
+          "name",
+          "arguments",
+          "status"
+        ],
+        "additionalProperties": false,
+        "description": "A function call produced by the agent."
+      },
+      "InputContentResourceInputText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "default": "input_text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text supplied to the agent."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Text input recorded in a session item."
+      },
+      "InputContentResourceInputImage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "default": "input_image",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_image`."
+          },
+          "image_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The URL of the image supplied to the agent, which may be a base64-encoded data URL."
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ],
+        "additionalProperties": false,
+        "description": "Image input recorded in a session item."
+      },
+      "InputContentResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InputContentResourceInputText"
+          },
+          {
+            "$ref": "#/components/schemas/InputContentResourceInputImage"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "input_text": "#/components/schemas/InputContentResourceInputText",
+            "input_image": "#/components/schemas/InputContentResourceInputImage"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "input_text",
+          "input_image"
+        ],
+        "description": "User-provided content recorded in a session item."
+      },
+      "FunctionCallOutputResource": {
+        "oneOf": [
+          {
+            "type": "string",
+            "minLength": 0
+          },
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000
+          }
+        ],
+        "description": "The text or model-input content supplied as a function result."
+      },
+      "FunctionCallOutputItemResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the function call output item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call_output"
+            ],
+            "default": "function_call_output",
+            "x-stainless-const": true,
+            "description": "The item type. Always `function_call_output`."
+          },
+          "call_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the function call that produced this output."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the function call."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionCallOutputResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The function result, if the call succeeded."
+          },
+          "error": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The error message, if the call failed."
+          }
+        },
+        "required": [
+          "id",
+          "turn_id",
+          "type",
+          "call_id",
+          "status",
+          "output",
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "The result supplied for a function call."
+      },
+      "AgentMessageItemResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent_message"
+            ],
+            "default": "agent_message",
+            "x-stainless-const": true,
+            "description": "The item type. Always `agent_message`."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID or name of the sending agent."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID or name of the receiving agent."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The content exchanged between the agents."
+          }
+        },
+        "required": [
+          "id",
+          "turn_id",
+          "type",
+          "sender_agent_id",
+          "recipient_agent_id",
+          "content"
+        ],
+        "additionalProperties": false,
+        "description": "A message exchanged between agent threads."
+      },
+      "McpCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_call"
+            ],
+            "default": "mcp_call",
+            "x-stainless-const": true,
+            "description": "The item type. Always `mcp_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the MCP call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The label of the MCP server."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The name of the MCP tool."
+          },
+          "arguments": {
+            "description": "The arguments passed to the MCP tool."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the MCP tool call."
+          },
+          "output": {
+            "anyOf": [
+              {},
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The output returned by the MCP tool, if any."
+          },
+          "error": {
+            "anyOf": [
+              {},
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The error returned by the MCP tool, if any."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "server_label",
+          "name",
+          "arguments",
+          "status",
+          "output",
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "A call to a tool on an MCP server."
+      },
+      "WebSearchActionResourceSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "search"
+            ],
+            "default": "search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `search`."
+          },
+          "query": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The search query, when a single query was used."
+          },
+          "queries": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The search queries, when multiple queries were used."
+          }
+        },
+        "required": [
+          "type",
+          "query",
+          "queries"
+        ],
+        "additionalProperties": false,
+        "description": "A search query or group of search queries."
+      },
+      "WebSearchActionResourceOpenPage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "open_page"
+            ],
+            "default": "open_page",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `open_page`."
+          },
+          "url": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The URL of the page that was opened."
+          }
+        },
+        "required": [
+          "type",
+          "url"
+        ],
+        "additionalProperties": false,
+        "description": "Opens a web page."
+      },
+      "WebSearchActionResourceFindInPage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "find_in_page"
+            ],
+            "default": "find_in_page",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `find_in_page`."
+          },
+          "url": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The URL of the page that was searched."
+          },
+          "pattern": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The text pattern that was searched for."
+          }
+        },
+        "required": [
+          "type",
+          "url",
+          "pattern"
+        ],
+        "additionalProperties": false,
+        "description": "Finds text within a web page."
+      },
+      "WebSearchActionResourceOther": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "other"
+            ],
+            "default": "other",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `other`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Another web search action."
+      },
+      "WebSearchActionResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/WebSearchActionResourceSearch"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchActionResourceOpenPage"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchActionResourceFindInPage"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchActionResourceOther"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "search": "#/components/schemas/WebSearchActionResourceSearch",
+            "open_page": "#/components/schemas/WebSearchActionResourceOpenPage",
+            "find_in_page": "#/components/schemas/WebSearchActionResourceFindInPage",
+            "other": "#/components/schemas/WebSearchActionResourceOther"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "search",
+          "open_page",
+          "find_in_page",
+          "other"
+        ],
+        "description": "An action performed by the web search tool."
+      },
+      "WebSearchCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search_call"
+            ],
+            "default": "web_search_call",
+            "x-stainless-const": true,
+            "description": "The item type. Always `web_search_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the web search call."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/OutputItemStatusResource",
+            "description": "The status of the web search call."
+          },
+          "action": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchActionResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The action performed by the web search tool."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "action"
+        ],
+        "additionalProperties": false,
+        "description": "A web search call produced by the agent."
+      },
+      "CommandExecutionItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "command_execution"
+            ],
+            "default": "command_execution",
+            "x-stainless-const": true,
+            "description": "The item type. Always `command_execution`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the command execution item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The command that was executed."
+          },
+          "cwd": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The working directory used to execute the command."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the command execution."
+          },
+          "output": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The command output, if available."
+          },
+          "exit_code": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The process exit code, if the command completed."
+          },
+          "duration_ms": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The command duration in milliseconds."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "command",
+          "cwd",
+          "status",
+          "output",
+          "exit_code",
+          "duration_ms"
+        ],
+        "additionalProperties": false,
+        "description": "A command execution produced by the agent."
+      },
+      "InterruptSubagentCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "interrupt_subagent_call"
+            ],
+            "default": "interrupt_subagent_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `interrupt_subagent_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent requesting the interrupt."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent to interrupt."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_id"
+        ],
+        "additionalProperties": false,
+        "description": "A request to interrupt a subagent's current turn. The subagent remains available."
+      },
+      "CreateSubagentCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "create_subagent_call"
+            ],
+            "default": "create_subagent_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `create_subagent_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent that requested the subagent."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The task given to the spawned agent."
+          },
+          "model": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The model requested for the spawned agent."
+          },
+          "reasoning_effort": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The reasoning effort requested for the spawned agent."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "agent_id",
+          "content",
+          "model",
+          "reasoning_effort"
+        ],
+        "additionalProperties": false,
+        "description": "A request to spawn a subagent."
+      },
+      "SendSubagentInputCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "send_subagent_input_call"
+            ],
+            "default": "send_subagent_input_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `send_subagent_input_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent sending the input."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent receiving the input."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The input sent to the receiving agent."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_id",
+          "content"
+        ],
+        "additionalProperties": false,
+        "description": "A request to send input to another agent."
+      },
+      "ResumeSubagentCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "resume_subagent_call"
+            ],
+            "default": "resume_subagent_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `resume_subagent_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent requesting the resume."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent to resume."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_id"
+        ],
+        "additionalProperties": false,
+        "description": "A request to resume a subagent."
+      },
+      "WaitForSubagentsCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "wait_for_subagents_call"
+            ],
+            "default": "wait_for_subagents_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `wait_for_subagents_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent waiting for results."
+          },
+          "recipient_agent_ids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The IDs of the agents to wait for."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_ids"
+        ],
+        "additionalProperties": false,
+        "description": "A request to wait for one or more subagents."
+      },
+      "CloseSubagentCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "close_subagent_call"
+            ],
+            "default": "close_subagent_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `close_subagent_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent requesting the close."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent to close."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_id"
+        ],
+        "additionalProperties": false,
+        "description": "A request to close a subagent."
+      },
+      "SessionTurnItemResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/MessageItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionCallOutputItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/AgentMessageItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/McpCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CommandExecutionItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CreateSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/SendSubagentInputCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/ResumeSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/WaitForSubagentsCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/InterruptSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CloseSubagentCallItemResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "message": "#/components/schemas/MessageItemResource",
+            "reasoning": "#/components/schemas/ReasoningItemResource",
+            "function_call": "#/components/schemas/FunctionCallItemResource",
+            "function_call_output": "#/components/schemas/FunctionCallOutputItemResource",
+            "agent_message": "#/components/schemas/AgentMessageItemResource",
+            "mcp_call": "#/components/schemas/McpCallItemResource",
+            "web_search_call": "#/components/schemas/WebSearchCallItemResource",
+            "command_execution": "#/components/schemas/CommandExecutionItemResource",
+            "interrupt_subagent_call": "#/components/schemas/InterruptSubagentCallItemResource",
+            "create_subagent_call": "#/components/schemas/CreateSubagentCallItemResource",
+            "send_subagent_input_call": "#/components/schemas/SendSubagentInputCallItemResource",
+            "resume_subagent_call": "#/components/schemas/ResumeSubagentCallItemResource",
+            "wait_for_subagents_call": "#/components/schemas/WaitForSubagentsCallItemResource",
+            "close_subagent_call": "#/components/schemas/CloseSubagentCallItemResource"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "message",
+          "reasoning",
+          "function_call",
+          "function_call_output",
+          "agent_message",
+          "mcp_call",
+          "web_search_call",
+          "command_execution",
+          "create_subagent_call",
+          "send_subagent_input_call",
+          "resume_subagent_call",
+          "wait_for_subagents_call",
+          "interrupt_subagent_call",
+          "close_subagent_call"
+        ],
+        "description": "An item associated with a session turn."
+      },
+      "SessionItemListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionTurnItemResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of messages, reasoning, and tool calls from a session's item history."
+      },
+      "TurnObjectResource": {
+        "type": "string",
+        "enum": [
+          "agent.session.turn"
+        ],
+        "default": "agent.session.turn",
+        "x-stainless-const": true,
+        "description": "The object type for a turn."
+      },
+      "TurnStatusResource": {
+        "type": "string",
+        "enum": [
+          "queued",
+          "in_progress",
+          "waiting",
+          "completed",
+          "failed",
+          "cancelled"
+        ],
+        "x-enumDescriptions": [
+          "The turn is waiting to start.",
+          "The turn is in progress.",
+          "The turn is waiting for external input.",
+          "The turn completed successfully.",
+          "The turn failed.",
+          "The turn was cancelled."
+        ],
+        "description": "The current status of a turn."
+      },
+      "SessionTurnErrorCodeResource": {
+        "type": "string",
+        "enum": [
+          "context_length_exceeded",
+          "session_budget_exceeded",
+          "usage_limit_exceeded",
+          "rate_limit_exceeded",
+          "server_overloaded",
+          "cyber_policy",
+          "connection_failed",
+          "server_error",
+          "authentication_error",
+          "invalid_request",
+          "resource_not_found",
+          "sandbox_error",
+          "executor_version_incompatible",
+          "active_turn_not_steerable",
+          "request_timeout",
+          "internal_error"
+        ],
+        "x-enumDescriptions": [
+          "The request exceeds the model's context window.",
+          "The session has reached its usage budget.",
+          "The organization has reached a usage, plan, or billing limit.",
+          "The request exceeds the available rate limit.",
+          "The model service is temporarily overloaded.",
+          "The request was rejected by a safety policy.",
+          "The request could not connect to the model service.",
+          "The model service encountered an unexpected error.",
+          "The API credentials are invalid or lack the required access.",
+          "The request contains invalid input or configuration.",
+          "The requested model or resource is unavailable.",
+          "The request could not complete in its execution environment.",
+          "The executor must be upgraded before it can run this turn.",
+          "The session cannot accept additional input while a request is running.",
+          "The request timed out before the model service responded.",
+          "An unexpected internal error prevented the session request from completing."
+        ],
+        "description": "Stable public categories for session request failures."
+      },
+      "SessionTurnErrorResource": {
+        "type": "object",
+        "properties": {
+          "code": {
+            "$ref": "#/components/schemas/SessionTurnErrorCodeResource",
+            "description": "A stable, machine-readable failure category."
+          },
+          "message": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A customer-safe explanation of the failure."
+          }
+        },
+        "required": [
+          "code",
+          "message"
+        ],
+        "additionalProperties": false,
+        "description": "A customer-safe error describing why a session request failed."
+      },
+      "InputTokensDetailsResource": {
+        "type": "object",
+        "properties": {
+          "cached_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of input tokens retrieved from the prompt cache."
+          }
+        },
+        "required": [
+          "cached_tokens"
+        ],
+        "additionalProperties": false,
+        "description": "A breakdown of input token usage for a session or turn."
+      },
+      "OutputTokensDetailsResource": {
+        "type": "object",
+        "properties": {
+          "reasoning_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of output tokens used for reasoning."
+          }
+        },
+        "required": [
+          "reasoning_tokens"
+        ],
+        "additionalProperties": false,
+        "description": "A breakdown of output token usage for a session or turn."
+      },
+      "TokenUsageResource": {
+        "type": "object",
+        "properties": {
+          "input_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of input tokens used by the agent."
+          },
+          "input_tokens_details": {
+            "$ref": "#/components/schemas/InputTokensDetailsResource",
+            "description": "A breakdown of the agent's input token usage."
+          },
+          "output_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of output tokens generated by the agent."
+          },
+          "output_tokens_details": {
+            "$ref": "#/components/schemas/OutputTokensDetailsResource",
+            "description": "A breakdown of the agent's output token usage."
+          },
+          "total_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The total number of input and output tokens used by the agent."
+          }
+        },
+        "required": [
+          "input_tokens",
+          "input_tokens_details",
+          "output_tokens",
+          "output_tokens_details",
+          "total_tokens"
+        ],
+        "additionalProperties": false,
+        "description": "Recorded token usage for a session or turn. Usage is best effort and may change."
+      },
+      "TurnResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn."
+          },
+          "object": {
+            "$ref": "#/components/schemas/TurnObjectResource",
+            "description": "The object type. Always `agent.session.turn`."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session that owns the turn."
+          },
+          "agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent that ran the turn."
+          },
+          "subagent_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the subagent that ran the turn, if applicable."
+          },
+          "status": {
+            "$ref": "#/components/schemas/TurnStatusResource",
+            "description": "The current status of the turn."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, used to order the turn by creation time. Subagent turns use their start time, falling back to completion time or the subagent opening time when the preceding timestamps are unavailable."
+          },
+          "started_at": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the turn started."
+          },
+          "completed_at": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the turn reached a terminal state."
+          },
+          "error": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/SessionTurnErrorResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "A customer-safe error. Non-null only for a failed turn."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Best-effort token usage for the turn, or null if unknown. Recorded usage may change."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "session_id",
+          "agent_id",
+          "subagent_id",
+          "status",
+          "created_at",
+          "started_at",
+          "completed_at",
+          "error",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "The canonical public representation of a session turn."
+      },
+      "SessionTurnListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TurnResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "ReasoningEffortResource": {
+        "type": "string",
+        "enum": [
+          "none",
+          "minimal",
+          "low",
+          "medium",
+          "high",
+          "xhigh",
+          "max"
+        ],
+        "description": "The amount of reasoning effort used by an agent."
+      },
+      "ReasoningSummaryResource": {
+        "type": "string",
+        "enum": [
+          "concise",
+          "detailed",
+          "auto"
+        ],
+        "x-enumDescriptions": [
+          "Returns a concise reasoning summary when supported.",
+          "Returns a detailed reasoning summary when supported.",
+          "Automatically selects the most detailed summary supported by the model."
+        ],
+        "description": "The reasoning summary format requested from an agent."
+      },
+      "ReasoningResource": {
+        "type": "object",
+        "properties": {
+          "effort": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningEffortResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The requested reasoning effort, or `null` when the model selects its own default."
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningSummaryResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The requested reasoning summary format, or `null` when summaries are disabled."
+          }
+        },
+        "required": [
+          "effort",
+          "summary"
+        ],
+        "additionalProperties": false,
+        "description": "The reasoning configuration used by an agent."
+      },
+      "TextFormatResourceText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "default": "text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `text`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Generates ordinary text without a structured-output constraint."
+      },
+      "TextFormatResourceJsonSchema": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "json_schema"
+            ],
+            "default": "json_schema",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `json_schema`."
+          },
+          "schema": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "The JSON Schema that generated text must match."
+          }
+        },
+        "required": [
+          "type",
+          "schema"
+        ],
+        "additionalProperties": false,
+        "description": "Constrains generated text to a JSON Schema."
+      },
+      "TextFormatResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/TextFormatResourceText"
+          },
+          {
+            "$ref": "#/components/schemas/TextFormatResourceJsonSchema"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "text": "#/components/schemas/TextFormatResourceText",
+            "json_schema": "#/components/schemas/TextFormatResourceJsonSchema"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "text",
+          "json_schema"
+        ],
+        "description": "The effective output format for generated text."
+      },
+      "VerbosityResource": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "description": "The amount of text produced by an agent."
+      },
+      "TextResource": {
+        "type": "object",
+        "properties": {
+          "format": {
+            "$ref": "#/components/schemas/TextFormatResource",
+            "description": "The effective output format. Defaults to ordinary text."
+          },
+          "verbosity": {
+            "$ref": "#/components/schemas/VerbosityResource",
+            "description": "The amount of text produced by the agent. Defaults to `medium`."
+          }
+        },
+        "required": [
+          "format",
+          "verbosity"
+        ],
+        "additionalProperties": false,
+        "description": "The text configuration used by an agent."
+      },
+      "ServiceTierResource": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default",
+          "flex",
+          "priority",
+          "fast"
+        ],
+        "description": "The service-tier policy configured for an agent."
+      },
+      "PersistedAgentToolResourceFunction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A description of what the function does."
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "A JSON Schema object describing the function's arguments."
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether the function is deferred and discovered through tool search."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "parameters",
+          "defer_loading"
+        ],
+        "additionalProperties": false,
+        "description": "A function defined by the application."
+      },
+      "PersistedAgentToolResourceToolSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search"
+            ],
+            "default": "tool_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `tool_search`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Discovers deferred function tools and loads them into the model context."
+      },
+      "PersistedAgentToolResourceProgrammaticToolCalling": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `programmatic_tool_calling`."
+          },
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether tools can be called from model-generated code."
+          }
+        },
+        "required": [
+          "type",
+          "enabled"
+        ],
+        "additionalProperties": false,
+        "description": "Enables calling tools from model-generated code."
+      },
+      "PersistedMcpTransportResourceHttp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http"
+            ],
+            "default": "http",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `http`."
+          },
+          "server_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The URL of the MCP server."
+          },
+          "headers": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Non-secret HTTP headers sent to the MCP server."
+          }
+        },
+        "required": [
+          "type",
+          "server_url",
+          "headers"
+        ],
+        "additionalProperties": false,
+        "description": "Connects to an MCP server over HTTP."
+      },
+      "PersistedMcpTransportResourceStdio": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stdio"
+            ],
+            "default": "stdio",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `stdio`."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The command used to start the MCP server."
+          },
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Arguments passed to the MCP server command."
+          },
+          "cwd": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The working directory used to start the MCP server."
+          },
+          "env_vars": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Environment variable names inherited from the execution environment."
+          }
+        },
+        "required": [
+          "type",
+          "command",
+          "args",
+          "cwd",
+          "env_vars"
+        ],
+        "additionalProperties": false,
+        "description": "Starts an MCP server as a local process."
+      },
+      "PersistedMcpTransportResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PersistedMcpTransportResourceHttp"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedMcpTransportResourceStdio"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "http": "#/components/schemas/PersistedMcpTransportResourceHttp",
+            "stdio": "#/components/schemas/PersistedMcpTransportResourceStdio"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "http",
+          "stdio"
+        ],
+        "description": "A credential-free transport used to connect to an MCP server."
+      },
+      "McpConnectionOriginResource": {
+        "type": "string",
+        "enum": [
+          "service",
+          "environment"
+        ],
+        "description": "Where outbound MCP HTTP connections originate."
+      },
+      "PersistedAgentToolResourceMcp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "default": "mcp",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp`."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A label used to identify the MCP server in tool calls."
+          },
+          "credential_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The vault credential selected for this MCP server, if any."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/PersistedMcpTransportResource",
+            "description": "The credential-free transport used to connect to the MCP server."
+          },
+          "request_metadata": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Metadata included with requests to this MCP server."
+          },
+          "allowed_tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The MCP tools the agent may call, or null when all server tools are allowed."
+          },
+          "required": {
+            "type": "boolean",
+            "description": "Whether this MCP server must initialize before the first turn."
+          },
+          "connection_origin": {
+            "$ref": "#/components/schemas/McpConnectionOriginResource",
+            "description": "Where outbound MCP HTTP connections originate."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "credential_id",
+          "transport",
+          "request_metadata",
+          "allowed_tools",
+          "required",
+          "connection_origin"
+        ],
+        "additionalProperties": false,
+        "description": "Tools provided by a remote MCP server without stored credentials."
+      },
+      "WebSearchModeResource": {
+        "type": "string",
+        "enum": [
+          "disabled",
+          "cached",
+          "live"
+        ],
+        "description": "The source used for web search results."
+      },
+      "WebSearchContextSizeResource": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "description": "The amount of web search context made available to the model."
+      },
+      "WebSearchLocationResource": {
+        "type": "object",
+        "properties": {
+          "country": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The two-letter ISO country code, such as `US`."
+          },
+          "region": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The region or state name."
+          },
+          "city": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The city name."
+          },
+          "timezone": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The IANA timezone, such as `America/Los_Angeles`."
+          }
+        },
+        "required": [
+          "country",
+          "region",
+          "city",
+          "timezone"
+        ],
+        "additionalProperties": false,
+        "description": "Approximate user location used to localize web search results."
+      },
+      "PersistedAgentToolResourceWebSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search"
+            ],
+            "default": "web_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `web_search`."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/WebSearchModeResource",
+            "description": "The source used for web search results."
+          },
+          "context_size": {
+            "$ref": "#/components/schemas/WebSearchContextSizeResource",
+            "description": "The amount of search context made available to the model. Defaults to `medium`."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Allowed search domains, or `null` when the search is unrestricted."
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchLocationResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Approximate location used to localize search results, if provided."
+          }
+        },
+        "required": [
+          "type",
+          "mode",
+          "context_size",
+          "allowed_domains",
+          "location"
+        ],
+        "additionalProperties": false,
+        "description": "Web search."
+      },
+      "PersistedAgentToolResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceFunction"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceToolSearch"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceProgrammaticToolCalling"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceMcp"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceWebSearch"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function": "#/components/schemas/PersistedAgentToolResourceFunction",
+            "tool_search": "#/components/schemas/PersistedAgentToolResourceToolSearch",
+            "programmatic_tool_calling": "#/components/schemas/PersistedAgentToolResourceProgrammaticToolCalling",
+            "mcp": "#/components/schemas/PersistedAgentToolResourceMcp",
+            "web_search": "#/components/schemas/PersistedAgentToolResourceWebSearch"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function",
+          "tool_search",
+          "programmatic_tool_calling",
+          "mcp",
+          "web_search"
+        ],
+        "description": "A credential-free tool available to a reusable agent."
+      },
+      "MultiAgentConfigResource": {
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether subagent tools are enabled. Defaults to false."
+          },
+          "max_concurrent_subagents": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "minimum": 1,
+            "maximum": 4294967295,
+            "description": "Maximum number of subagents that may run concurrently, or null when disabled. Defaults to 6 when enabled."
+          }
+        },
+        "required": [
+          "enabled",
+          "max_concurrent_subagents"
+        ],
+        "additionalProperties": false,
+        "description": "The resolved configuration for creating and coordinating subagents."
+      },
+      "AgentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reusable agent."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent"
+            ],
+            "default": "agent",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent`."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the agent was created."
+          },
+          "updated_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the agent was last updated."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "A human-readable name for the agent, or null if it is unnamed."
+          },
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Custom string key-value pairs attached to the agent."
+          },
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The requested model name used for inference."
+          },
+          "reasoning": {
+            "$ref": "#/components/schemas/ReasoningResource",
+            "description": "The resolved reasoning configuration, including the model default for an omitted effort."
+          },
+          "text": {
+            "$ref": "#/components/schemas/TextResource",
+            "description": "The resolved configuration for text generated by the agent."
+          },
+          "service_tier": {
+            "$ref": "#/components/schemas/ServiceTierResource",
+            "description": "The resolved service-tier policy used for model requests."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "Custom instructions appended to the agent's default base instructions."
+          },
+          "tools": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersistedAgentToolResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Tools available to the agent."
+          },
+          "multi_agent": {
+            "$ref": "#/components/schemas/MultiAgentConfigResource",
+            "description": "The resolved configuration for creating and coordinating subagents."
+          },
+          "x_agents_core": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/v1.SavedAgentCore"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "updated_at",
+          "name",
+          "metadata",
+          "model",
+          "reasoning",
+          "text",
+          "service_tier",
+          "instructions",
+          "tools",
+          "multi_agent"
+        ],
+        "additionalProperties": false,
+        "description": "A reusable agent scoped to the caller's project."
+      },
+      "AgentListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "ReasoningEffortParam": {
+        "type": "string",
+        "enum": [
+          "none",
+          "minimal",
+          "low",
+          "medium",
+          "high",
+          "xhigh",
+          "max"
+        ],
+        "description": "The amount of reasoning effort the model should use."
+      },
+      "ReasoningSummaryParam": {
+        "type": "string",
+        "enum": [
+          "concise",
+          "detailed",
+          "auto"
+        ],
+        "x-enumDescriptions": [
+          "Returns a concise reasoning summary when supported.",
+          "Returns a detailed reasoning summary when supported.",
+          "Automatically selects the most detailed summary supported by the model."
+        ],
+        "description": "The reasoning summary format requested from the model."
+      },
+      "ReasoningParam": {
+        "type": "object",
+        "properties": {
+          "effort": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningEffortParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The amount of reasoning effort the model should use. Omission lets the model select it."
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningSummaryParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Controls whether the response includes a reasoning summary."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Reasoning configuration for the agent."
+      },
+      "TextFormatParamText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "default": "text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `text`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Generates ordinary text without a structured-output constraint."
+      },
+      "TextFormatParamJsonSchema": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "json_schema"
+            ],
+            "default": "json_schema",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `json_schema`."
+          },
+          "schema": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "The JSON Schema that generated text must match."
+          }
+        },
+        "required": [
+          "type",
+          "schema"
+        ],
+        "additionalProperties": false,
+        "description": "Constrains generated text to a JSON Schema."
+      },
+      "TextFormatParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/TextFormatParamText"
+          },
+          {
+            "$ref": "#/components/schemas/TextFormatParamJsonSchema"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "text": "#/components/schemas/TextFormatParamText",
+            "json_schema": "#/components/schemas/TextFormatParamJsonSchema"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "text",
+          "json_schema"
+        ],
+        "description": "The output format for generated text."
+      },
+      "VerbosityParam": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "x-enumDescriptions": [
+          "Produces less text.",
+          "Uses the default amount of text.",
+          "Produces more text."
+        ],
+        "description": "The amount of text the model should produce."
+      },
+      "TextParam": {
+        "type": "object",
+        "properties": {
+          "format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TextFormatParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The output format. Omission uses ordinary text (`{\"type\": \"text\"}`)."
+          },
+          "verbosity": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/VerbosityParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The amount of text the model should produce. Defaults to `medium`, matching Responses."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Configuration for text generated by the agent."
+      },
+      "ServiceTierParam": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default",
+          "flex",
+          "priority",
+          "fast"
+        ],
+        "x-enumDescriptions": [
+          "Selects the service tier automatically.",
+          "Uses the default service tier.",
+          "Uses the flex service tier.",
+          "Uses the priority service tier.",
+          "Uses the fast service tier."
+        ],
+        "description": "The service tier used for model requests."
+      },
+      "PersistedAgentToolConfigParamFunction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A description of what the function does."
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "A JSON Schema object describing the function's arguments."
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether this function is deferred and discovered through tool search. Defaults to `false`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "parameters"
+        ],
+        "additionalProperties": false,
+        "description": "A function defined by the application."
+      },
+      "PersistedAgentToolConfigParamToolSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search"
+            ],
+            "default": "tool_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `tool_search`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Discovers deferred function tools and loads them into the model context."
+      },
+      "PersistedAgentToolConfigParamProgrammaticToolCalling": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `programmatic_tool_calling`."
+          },
+          "enabled": {
+            "type": "boolean",
+            "default": true,
+            "description": "Whether tools can be called from model-generated code. Defaults to `true`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Enables calling tools from model-generated code."
+      },
+      "PersistedMcpTransportConfigParamHttp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http"
+            ],
+            "default": "http",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `http`."
+          },
+          "server_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The URL of the MCP server."
+          },
+          "headers": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Non-secret HTTP headers sent to the MCP server."
+          }
+        },
+        "required": [
+          "type",
+          "server_url"
+        ],
+        "additionalProperties": false,
+        "description": "Connects to an MCP server over HTTP."
+      },
+      "PersistedMcpTransportConfigParamStdio": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stdio"
+            ],
+            "default": "stdio",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `stdio`."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The command used to start the MCP server."
+          },
+          "args": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Arguments passed to the MCP server command."
+          },
+          "cwd": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The working directory used to start the MCP server."
+          },
+          "env_vars": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Environment variable names to inherit from the selected execution environment."
+          }
+        },
+        "required": [
+          "type",
+          "command",
+          "cwd"
+        ],
+        "additionalProperties": false,
+        "description": "Starts an MCP server as a local process."
+      },
+      "PersistedMcpTransportConfigParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PersistedMcpTransportConfigParamHttp"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedMcpTransportConfigParamStdio"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "http": "#/components/schemas/PersistedMcpTransportConfigParamHttp",
+            "stdio": "#/components/schemas/PersistedMcpTransportConfigParamStdio"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "http",
+          "stdio"
+        ],
+        "description": "A credential-free transport used to connect to an MCP server."
+      },
+      "McpConnectionOriginParam": {
+        "type": "string",
+        "enum": [
+          "service",
+          "environment"
+        ],
+        "x-enumDescriptions": [
+          "Uses the Managed Agents service network.",
+          "Uses the session's execution environment."
+        ],
+        "description": "Where outbound MCP HTTP connections originate."
+      },
+      "PersistedAgentToolConfigParamMcp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "default": "mcp",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp`."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A label used to identify the MCP server in tool calls."
+          },
+          "credential_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The vault credential selected for this MCP server. Optional when exactly one attached credential matches the server URL."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/PersistedMcpTransportConfigParam",
+            "description": "The credential-free transport used to connect to the MCP server."
+          },
+          "request_metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Metadata included with requests to this MCP server."
+          },
+          "allowed_tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The MCP tools the agent may call. All server tools are allowed when omitted."
+          },
+          "required": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether this MCP server must initialize before the first turn. Defaults to `false`."
+          },
+          "connection_origin": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/McpConnectionOriginParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Selects where outbound MCP HTTP connections originate."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "transport"
+        ],
+        "additionalProperties": false,
+        "description": "Tools provided by a remote MCP server without stored credentials."
+      },
+      "WebSearchModeParam": {
+        "type": "string",
+        "enum": [
+          "disabled",
+          "cached",
+          "live"
+        ],
+        "x-enumDescriptions": [
+          "Disables web search.",
+          "Uses cached search results.",
+          "Searches the live web."
+        ],
+        "description": "The source used for web search results."
+      },
+      "WebSearchContextSizeParam": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "description": "The amount of web search context made available to the model."
+      },
+      "WebSearchLocationParam": {
+        "type": "object",
+        "properties": {
+          "country": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The two-letter ISO country code, such as `US`."
+          },
+          "region": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The region or state name."
+          },
+          "city": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The city name."
+          },
+          "timezone": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The IANA timezone, such as `America/Los_Angeles`."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Approximate user location used to localize web search results."
+      },
+      "PersistedAgentToolConfigParamWebSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search"
+            ],
+            "default": "web_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `web_search`."
+          },
+          "mode": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchModeParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The source used for web search results. Defaults to `live`."
+          },
+          "context_size": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchContextSizeParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The amount of search context made available to the model. Defaults to `medium`."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Domains the search may include."
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchLocationParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Approximate location used to localize search results."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Web search."
+      },
+      "PersistedAgentToolConfigParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamFunction"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamToolSearch"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamProgrammaticToolCalling"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamMcp"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamWebSearch"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function": "#/components/schemas/PersistedAgentToolConfigParamFunction",
+            "tool_search": "#/components/schemas/PersistedAgentToolConfigParamToolSearch",
+            "programmatic_tool_calling": "#/components/schemas/PersistedAgentToolConfigParamProgrammaticToolCalling",
+            "mcp": "#/components/schemas/PersistedAgentToolConfigParamMcp",
+            "web_search": "#/components/schemas/PersistedAgentToolConfigParamWebSearch"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function",
+          "tool_search",
+          "programmatic_tool_calling",
+          "mcp",
+          "web_search"
+        ],
+        "description": "A tool that can be stored on a reusable agent without session credentials."
+      },
+      "MultiAgentConfigCurrentParam": {
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether subagent tools are enabled."
+          },
+          "max_concurrent_subagents": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 1,
+            "maximum": 4294967295,
+            "description": "Maximum number of subagents that may run concurrently. Defaults to 6."
+          }
+        },
+        "required": [
+          "enabled"
+        ],
+        "additionalProperties": false,
+        "description": "Explicit configuration for creating and coordinating subagents."
+      },
+      "CreateAgentParams": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 512
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "minProperties": 0,
+            "maxProperties": 16,
+            "description": "Up to 16 string key-value pairs, with keys up to 64 and values up to 512 characters. Omission or null defaults to an empty map."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 128,
+            "description": "A human-readable name for the agent. Omission or null leaves the agent unnamed."
+          },
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The model to use for the agent. The requested model name is preserved."
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for model reasoning. Omission uses the model's default effort."
+          },
+          "text": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TextParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for generated text. Defaults to the `text` format and medium verbosity."
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ServiceTierParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The service tier used for model requests. Defaults to `auto`."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Additional instructions appended to the agent's default base instructions. Omit or set to null to add no custom instructions."
+          },
+          "tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/PersistedAgentToolConfigParam"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Tools available to the agent. Defaults to an empty list."
+          },
+          "multi_agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MultiAgentConfigCurrentParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for creating and coordinating subagents. Subagent tools are disabled by default."
+          },
+          "x_agents_core": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/v1.SavedAgentCoreInput"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "model"
+        ],
+        "additionalProperties": false,
+        "description": "Parameters for creating a reusable agent."
+      },
+      "UpdateAgentParams": {
+        "type": "object",
+        "properties": {
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The model to use for the agent. The requested model name is preserved."
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for model reasoning. Omit to keep the current settings; pass `null` to reset to the model's default effort."
+          },
+          "text": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TextParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for text generated by the agent."
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ServiceTierParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The service tier used for model requests."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Additional instructions appended to the agent's default base instructions. Omit to leave unchanged."
+          },
+          "multi_agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MultiAgentConfigCurrentParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for creating and coordinating subagents."
+          },
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 512
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "minProperties": 0,
+            "maxProperties": 16,
+            "description": "Replaces all metadata. Omit to leave unchanged, or pass null or {} to clear it. Up to 16 string key-value pairs, with keys up to 64 and values up to 512 characters."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 128,
+            "description": "A replacement name. Omit to leave unchanged, or pass null to clear it."
+          },
+          "tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/PersistedAgentToolConfigParam"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Tools available to the agent."
+          },
+          "x_agents_core": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/v1.SavedAgentCoreInput"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false,
+        "description": "Fields to replace on an existing reusable agent."
+      },
+      "DeletedAgentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted agent."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.deleted"
+            ],
+            "default": "agent.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the agent was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "A deleted reusable agent."
+      },
+      "EnvironmentPackagesResource": {
+        "type": "object",
+        "properties": {
+          "python": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Python packages installed in the environment."
+          },
+          "system": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "System packages installed in the environment."
+          },
+          "npm": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "npm packages installed globally in the environment."
+          }
+        },
+        "required": [
+          "python",
+          "system",
+          "npm"
+        ],
+        "additionalProperties": false,
+        "description": "Packages installed in an OpenAI-hosted environment."
+      },
+      "NetworkAccessResource": {
+        "type": "string",
+        "enum": [
+          "enabled",
+          "disabled",
+          "restricted"
+        ],
+        "x-enumDescriptions": [
+          "Allows unrestricted network access.",
+          "Disables network access.",
+          "Allows access only to configured domains."
+        ],
+        "description": "The network access mode for an OpenAI-hosted environment."
+      },
+      "NetworkPolicyResource": {
+        "type": "object",
+        "properties": {
+          "access": {
+            "$ref": "#/components/schemas/NetworkAccessResource",
+            "description": "The environment's network access mode."
+          },
+          "allowed_domains": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Domains the environment may access when network access is restricted."
+          }
+        },
+        "required": [
+          "access",
+          "allowed_domains"
+        ],
+        "additionalProperties": false,
+        "description": "Network access for an OpenAI-hosted environment."
+      },
+      "HostedTemplateSkillResourceSkillReference": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill_reference"
+            ],
+            "default": "skill_reference",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `skill_reference`."
+          },
+          "skill_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The referenced skill ID."
+          },
+          "version": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The requested version selector, including `latest`."
+          }
+        },
+        "required": [
+          "type",
+          "skill_id",
+          "version"
+        ],
+        "additionalProperties": false,
+        "description": "A skill resolved afresh from the Skills API whenever a session starts."
+      },
+      "HostedTemplateSkillResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The skill name declared in `SKILL.md`."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The skill description declared in `SKILL.md`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description"
+        ],
+        "additionalProperties": false,
+        "description": "Safe metadata for an inline skill archive."
+      },
+      "HostedTemplateSkillResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedTemplateSkillResourceSkillReference"
+          },
+          {
+            "$ref": "#/components/schemas/HostedTemplateSkillResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "skill_reference": "#/components/schemas/HostedTemplateSkillResourceSkillReference",
+            "inline": "#/components/schemas/HostedTemplateSkillResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "skill_reference",
+          "inline"
+        ],
+        "description": "Safe metadata for a skill configured by an environment template."
+      },
+      "HostedTemplateFileResourceFileId": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_id"
+            ],
+            "default": "file_id",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `file_id`."
+          },
+          "file_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the uploaded file."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The file's absolute path inside the environment."
+          }
+        },
+        "required": [
+          "type",
+          "file_id",
+          "path"
+        ],
+        "additionalProperties": false,
+        "description": "A project-scoped Files API reference resolved separately for each session."
+      },
+      "HostedTemplateFileResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The file's absolute path inside the environment."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The decoded size of the inline file in bytes."
+          }
+        },
+        "required": [
+          "type",
+          "path",
+          "size_bytes"
+        ],
+        "additionalProperties": false,
+        "description": "Metadata for confidential inline file contents."
+      },
+      "HostedTemplateFileResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedTemplateFileResourceFileId"
+          },
+          {
+            "$ref": "#/components/schemas/HostedTemplateFileResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "file_id": "#/components/schemas/HostedTemplateFileResourceFileId",
+            "inline": "#/components/schemas/HostedTemplateFileResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "file_id",
+          "inline"
+        ],
+        "description": "Safe metadata for a file configured by an environment template."
+      },
+      "EnvironmentTemplateResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reusable environment template."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "An optional human-readable display name for the template."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.environment.template"
+            ],
+            "default": "agent.environment.template",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.environment.template`."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the template was created."
+          },
+          "updated_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the template was last updated."
+          },
+          "packages": {
+            "$ref": "#/components/schemas/EnvironmentPackagesResource",
+            "description": "Packages installed in each fresh OpenAI-hosted environment."
+          },
+          "network": {
+            "$ref": "#/components/schemas/NetworkPolicyResource",
+            "description": "Runtime network access for each OpenAI-hosted environment."
+          },
+          "capability_directories": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Directories that expose capabilities to the agent."
+          },
+          "skills": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedTemplateSkillResource"
+            },
+            "minItems": 0,
+            "maxItems": 200,
+            "description": "Safe skill metadata, preserving unresolved version selectors."
+          },
+          "plugins": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginResource"
+            },
+            "minItems": 0,
+            "maxItems": 32,
+            "description": "Safe plugin metadata, excluding inline archive contents."
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedTemplateFileResource"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Safe file metadata, excluding contents and session-scoped file IDs."
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "object",
+          "created_at",
+          "updated_at",
+          "packages",
+          "network",
+          "capability_directories",
+          "skills",
+          "plugins",
+          "files"
+        ],
+        "additionalProperties": false,
+        "description": "Reusable configuration that provisions a fresh OpenAI-hosted environment for each session."
+      },
+      "EnvironmentTemplateListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EnvironmentTemplateResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "EnvironmentPackagesParam": {
+        "type": "object",
+        "properties": {
+          "python": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Python packages to install. Defaults to an empty list."
+          },
+          "system": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "System packages to install. Defaults to an empty list."
+          },
+          "npm": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "npm packages to install globally. Defaults to an empty list."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Packages to install in an OpenAI-hosted environment."
+      },
+      "SetupCommandParam": {
+        "type": "object",
+        "properties": {
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 65536,
+            "description": "The shell command to execute."
+          },
+          "cwd": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 4096,
+            "description": "The absolute working directory. Defaults to `/workspace`."
+          }
+        },
+        "required": [
+          "command"
+        ],
+        "additionalProperties": false,
+        "description": "A confidential setup command executed before the hosted agent starts."
+      },
+      "NetworkAccessParam": {
+        "type": "string",
+        "enum": [
+          "enabled",
+          "disabled",
+          "restricted"
+        ],
+        "x-enumDescriptions": [
+          "Allows unrestricted network access, matching an omitted network policy.",
+          "Disables network access.",
+          "Allows access only to configured domains."
+        ],
+        "description": "The network access mode for an OpenAI-hosted environment."
+      },
+      "NetworkPolicyParam": {
+        "type": "object",
+        "properties": {
+          "access": {
+            "$ref": "#/components/schemas/NetworkAccessParam",
+            "description": "The environment's network access mode."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Domains the environment may access when network access is restricted."
+          }
+        },
+        "required": [
+          "access"
+        ],
+        "additionalProperties": false,
+        "description": "Network access for an OpenAI-hosted environment."
+      },
+      "HostedSkillParamSkillReference": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill_reference"
+            ],
+            "default": "skill_reference",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `skill_reference`."
+          },
+          "skill_id": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "description": "The ID of the skill created through `/v1/skills`."
+          },
+          "version": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The skill version, a positive integer or `latest`; omission selects the default."
+          }
+        },
+        "required": [
+          "type",
+          "skill_id"
+        ],
+        "additionalProperties": false,
+        "description": "References a skill uploaded through the Skills API."
+      },
+      "InlineCapabilitySourceParamBase64": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "base64"
+            ],
+            "default": "base64",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `base64`."
+          },
+          "media_type": {
+            "type": "string",
+            "enum": [
+              "application/zip"
+            ],
+            "default": "application/zip",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "A ZIP archive."
+            ],
+            "description": "The archive media type, always `application/zip`."
+          },
+          "data": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 70254592,
+            "description": "Standard-base64 encoded ZIP archive bytes."
+          }
+        },
+        "required": [
+          "type",
+          "media_type",
+          "data"
+        ],
+        "additionalProperties": false,
+        "description": "Provides ZIP bytes encoded with standard base64."
+      },
+      "InlineCapabilitySourceParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InlineCapabilitySourceParamBase64"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "base64": "#/components/schemas/InlineCapabilitySourceParamBase64"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "base64"
+        ],
+        "description": "The encoded ZIP archive for an inline skill or plugin."
+      },
+      "HostedSkillParamInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "description": "The skill name declared in `SKILL.md`."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The skill description declared in `SKILL.md`."
+          },
+          "source": {
+            "$ref": "#/components/schemas/InlineCapabilitySourceParam",
+            "description": "The inline ZIP archive."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "source"
+        ],
+        "additionalProperties": false,
+        "description": "Supplies a skill ZIP directly in the session request."
+      },
+      "HostedSkillParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedSkillParamSkillReference"
+          },
+          {
+            "$ref": "#/components/schemas/HostedSkillParamInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "skill_reference": "#/components/schemas/HostedSkillParamSkillReference",
+            "inline": "#/components/schemas/HostedSkillParamInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "skill_reference",
+          "inline"
+        ],
+        "description": "A skill installed in an OpenAI-hosted environment."
+      },
+      "HostedPluginParamInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "description": "The plugin name declared in `.codex-plugin/plugin.json`."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The plugin description declared in `.codex-plugin/plugin.json`."
+          },
+          "source": {
+            "$ref": "#/components/schemas/InlineCapabilitySourceParam",
+            "description": "The inline ZIP archive."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "source"
+        ],
+        "additionalProperties": false,
+        "description": "Supplies a plugin ZIP directly in the session request."
+      },
+      "HostedPluginParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedPluginParamInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "inline": "#/components/schemas/HostedPluginParamInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "inline"
+        ],
+        "description": "A plugin installed in an OpenAI-hosted environment."
+      },
+      "CreateEnvironmentTemplateParams": {
+        "type": "object",
+        "properties": {
+          "packages": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EnvironmentPackagesParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Packages to install in the environment. Defaults to empty package lists."
+          },
+          "setup_commands": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/SetupCommandParam"
+            },
+            "minItems": 0,
+            "maxItems": 16,
+            "description": "Ordered, confidential setup commands. Command bodies are never returned."
+          },
+          "network": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/NetworkPolicyParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Network access policy for the environment. Defaults to enabled."
+          },
+          "env": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Environment variables made available to the agent."
+          },
+          "capability_directories": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Directories that contain capabilities exposed to the agent. Defaults to an empty list."
+          },
+          "skills": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillParam"
+            },
+            "minItems": 0,
+            "maxItems": 200,
+            "description": "Skills referenced by ID or provided as inline ZIP archives. Defaults to an empty list."
+          },
+          "plugins": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginParam"
+            },
+            "minItems": 0,
+            "maxItems": 32,
+            "description": "Plugins provided as inline ZIP archives. Defaults to an empty list."
+          },
+          "files": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileParam"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Files available before the agent starts. Defaults to an empty list."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 1,
+            "maxLength": 256,
+            "description": "An optional human-readable display name for the template."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Parameters for creating a reusable, project-scoped OpenAI-hosted environment template."
+      },
+      "UpdateEnvironmentTemplateParams": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 1,
+            "maxLength": 256,
+            "description": "A replacement human-readable display name, or `null` to clear the name."
+          },
+          "packages": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EnvironmentPackagesParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Packages installed before the runtime network policy applies."
+          },
+          "setup_commands": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/SetupCommandParam"
+            },
+            "minItems": 0,
+            "maxItems": 16,
+            "description": "Replacement confidential setup commands, never included in returned resources."
+          },
+          "network": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/NetworkPolicyParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Network access available after setup completes."
+          },
+          "env": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Replacement confidential environment values."
+          },
+          "capability_directories": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Directories that expose capabilities to the agent."
+          },
+          "skills": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillParam"
+            },
+            "minItems": 0,
+            "maxItems": 200,
+            "description": "Replacement skill configuration installed for each new session."
+          },
+          "plugins": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginParam"
+            },
+            "minItems": 0,
+            "maxItems": 32,
+            "description": "Replacement plugin configuration installed for each new session."
+          },
+          "files": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileParam"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Replacement file configuration materialized for each new session."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Fields to replace on an existing reusable OpenAI-hosted environment template."
+      },
+      "DeletedEnvironmentTemplateResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted environment template."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.environment.template.deleted"
+            ],
+            "default": "agent.environment.template.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.environment.template.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the environment template was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "A deleted reusable environment template."
+      },
+      "SessionStatusResource": {
+        "type": "string",
+        "enum": [
+          "idle",
+          "in_progress",
+          "requires_action",
+          "failed"
+        ],
+        "x-enumDescriptions": [
+          "The session has no turn in progress and is ready for input. A hosted environment may still be provisioning.",
+          "The session is processing a turn.",
+          "The session is waiting for one or more required actions.",
+          "The session failed."
+        ],
+        "description": "The current status of a session."
+      },
+      "SessionRequiredActionResourceFunctionCall": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call"
+            ],
+            "default": "function_call",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function_call`."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that requested the function call."
+          },
+          "call_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID to include when submitting the function result."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The function name."
+          },
+          "arguments": {
+            "description": "The arguments supplied by the model."
+          }
+        },
+        "required": [
+          "type",
+          "turn_id",
+          "call_id",
+          "name",
+          "arguments"
+        ],
+        "additionalProperties": false,
+        "description": "Run a function tool and submit its result."
+      },
+      "SessionRequiredActionResourceEnvironmentConnection": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "environment_connection"
+            ],
+            "default": "environment_connection",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `environment_connection`."
+          },
+          "environment_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the environment to reconnect."
+          }
+        },
+        "required": [
+          "type",
+          "environment_id"
+        ],
+        "additionalProperties": false,
+        "description": "Reconnect a session environment."
+      },
+      "SessionRequiredActionResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/SessionRequiredActionResourceFunctionCall"
+          },
+          {
+            "$ref": "#/components/schemas/SessionRequiredActionResourceEnvironmentConnection"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function_call": "#/components/schemas/SessionRequiredActionResourceFunctionCall",
+            "environment_connection": "#/components/schemas/SessionRequiredActionResourceEnvironmentConnection"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function_call",
+          "environment_connection"
+        ],
+        "description": "An action that must be completed before a session can continue."
+      },
+      "AgentToolResourceFunction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A description of what the function does."
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "A JSON Schema object describing the function's arguments."
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether the function is deferred and discovered through tool search."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "parameters",
+          "defer_loading"
+        ],
+        "additionalProperties": false,
+        "description": "A function defined by the application."
+      },
+      "AgentToolResourceProgrammaticToolCalling": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `programmatic_tool_calling`."
+          },
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether tools can be called from model-generated code."
+          }
+        },
+        "required": [
+          "type",
+          "enabled"
+        ],
+        "additionalProperties": false,
+        "description": "Enables calling tools from model-generated code."
+      },
+      "McpTransportResourceHttp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http"
+            ],
+            "default": "http",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `http`."
+          },
+          "server_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The URL of the MCP server."
+          }
+        },
+        "required": [
+          "type",
+          "server_url"
+        ],
+        "additionalProperties": false,
+        "description": "Connects to an MCP server over HTTP."
+      },
+      "McpTransportResourceStdio": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stdio"
+            ],
+            "default": "stdio",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `stdio`."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The command used to start the MCP server."
+          },
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Arguments passed to the MCP server command."
+          },
+          "cwd": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The working directory used to start the MCP server."
+          },
+          "env_vars": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Environment variable names inherited from the execution environment."
+          }
+        },
+        "required": [
+          "type",
+          "command",
+          "args",
+          "cwd",
+          "env_vars"
+        ],
+        "additionalProperties": false,
+        "description": "Starts an MCP server as a local process."
+      },
+      "McpTransportResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/McpTransportResourceHttp"
+          },
+          {
+            "$ref": "#/components/schemas/McpTransportResourceStdio"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "http": "#/components/schemas/McpTransportResourceHttp",
+            "stdio": "#/components/schemas/McpTransportResourceStdio"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "http",
+          "stdio"
+        ],
+        "description": "The transport used to connect to an MCP server."
+      },
+      "AgentToolResourceMcp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "default": "mcp",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp`."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A label used to identify the MCP server in tool calls."
+          },
+          "credential_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The attached vault credential selected for this MCP server, if any. Optional when exactly one attached credential matches the server URL."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/McpTransportResource",
+            "description": "The transport used to connect to the MCP server."
+          },
+          "request_metadata": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Metadata included with requests to this MCP server."
+          },
+          "allowed_tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The MCP tools the agent may call."
+          },
+          "required": {
+            "type": "boolean",
+            "description": "Whether this MCP server must initialize before the first turn."
+          },
+          "connection_origin": {
+            "$ref": "#/components/schemas/McpConnectionOriginResource",
+            "description": "Where outbound MCP HTTP connections originate."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "credential_id",
+          "transport",
+          "request_metadata",
+          "allowed_tools",
+          "required",
+          "connection_origin"
+        ],
+        "additionalProperties": false,
+        "description": "Tools provided by a remote MCP server."
+      },
+      "AgentToolResourceWebSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search"
+            ],
+            "default": "web_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `web_search`."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/WebSearchModeResource",
+            "description": "The source used for web search results."
+          },
+          "context_size": {
+            "$ref": "#/components/schemas/WebSearchContextSizeResource",
+            "description": "The amount of search context made available to the model. Defaults to `medium`."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Allowed search domains, or `null` when the search is unrestricted."
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchLocationResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Approximate location used to localize search results, if provided."
+          }
+        },
+        "required": [
+          "type",
+          "mode",
+          "context_size",
+          "allowed_domains",
+          "location"
+        ],
+        "additionalProperties": false,
+        "description": "Web search."
+      },
+      "AgentToolResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/AgentToolResourceFunction"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolResourceProgrammaticToolCalling"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolResourceMcp"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolResourceWebSearch"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function": "#/components/schemas/AgentToolResourceFunction",
+            "programmatic_tool_calling": "#/components/schemas/AgentToolResourceProgrammaticToolCalling",
+            "mcp": "#/components/schemas/AgentToolResourceMcp",
+            "web_search": "#/components/schemas/AgentToolResourceWebSearch"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function",
+          "programmatic_tool_calling",
+          "mcp",
+          "web_search"
+        ],
+        "description": "A tool available to the agent."
+      },
+      "SessionAgentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The reusable agent's name when the session was created, or null if no name was saved. Later changes to the agent's name do not affect this value."
+          },
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The model used by the agent."
+          },
+          "reasoning": {
+            "$ref": "#/components/schemas/ReasoningResource",
+            "description": "The agent's reasoning configuration."
+          },
+          "text": {
+            "$ref": "#/components/schemas/TextResource",
+            "description": "Configuration for text generated by the agent."
+          },
+          "service_tier": {
+            "$ref": "#/components/schemas/ServiceTierResource",
+            "description": "The effective service-tier policy for model requests. Defaults to `auto`."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "Custom instructions appended to the agent's default base instructions."
+          },
+          "tools": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentToolResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Tools available to the agent."
+          },
+          "multi_agent": {
+            "$ref": "#/components/schemas/MultiAgentConfigResource",
+            "description": "Configuration for creating and coordinating subagents."
+          },
+          "x_agents_core": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/v1.AgentsCore"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "model",
+          "reasoning",
+          "text",
+          "service_tier",
+          "instructions",
+          "tools",
+          "multi_agent"
+        ],
+        "additionalProperties": false,
+        "description": "The effective agent configuration for a session."
+      },
+      "EnvironmentResourceNone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "none"
+            ],
+            "default": "none",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `none`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "The session talks to CCA without selecting or provisioning an execution environment."
+      },
+      "EnvironmentResourceOpenaiHosted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "openai_hosted"
+            ],
+            "default": "openai_hosted",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `openai_hosted`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The public ID of the environment."
+          },
+          "packages": {
+            "$ref": "#/components/schemas/EnvironmentPackagesResource",
+            "description": "Packages installed in the environment."
+          },
+          "network": {
+            "$ref": "#/components/schemas/NetworkPolicyResource",
+            "description": "The effective network access policy for the environment."
+          },
+          "capability_directories": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Directories that contain capabilities exposed to the agent."
+          },
+          "skills": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Skills installed in the environment, excluding their archive contents."
+          },
+          "plugins": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Plugins installed in the environment, excluding their archive contents."
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileResource"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Files available in the environment, excluding their contents."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "packages",
+          "network",
+          "capability_directories",
+          "skills",
+          "plugins",
+          "files"
+        ],
+        "additionalProperties": false,
+        "description": "An environment hosted by OpenAI."
+      },
+      "EnvironmentResourceSelfHosted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "self_hosted"
+            ],
+            "default": "self_hosted",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `self_hosted`."
+          },
+          "remote_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "Pass this URL unchanged to `codex exec-server --remote` when connecting this environment."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The public ID of the environment."
+          },
+          "workspace_directory": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The absolute project directory inside the environment. Defaults to `/workspace`."
+          },
+          "capability_directories": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Directories that contain capabilities exposed to the agent."
+          }
+        },
+        "required": [
+          "type",
+          "remote_url",
+          "id",
+          "workspace_directory",
+          "capability_directories"
+        ],
+        "additionalProperties": false,
+        "description": "An environment hosted by the application."
+      },
+      "EnvironmentResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/EnvironmentResourceNone"
+          },
+          {
+            "$ref": "#/components/schemas/EnvironmentResourceOpenaiHosted"
+          },
+          {
+            "$ref": "#/components/schemas/EnvironmentResourceSelfHosted"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "none": "#/components/schemas/EnvironmentResourceNone",
+            "openai_hosted": "#/components/schemas/EnvironmentResourceOpenaiHosted",
+            "self_hosted": "#/components/schemas/EnvironmentResourceSelfHosted"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "none",
+          "openai_hosted",
+          "self_hosted"
+        ],
+        "description": "The execution environment for a session."
+      },
+      "SessionResource": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Custom string key-value pairs attached to the session."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.session"
+            ],
+            "default": "agent.session",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.session`."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the session was created."
+          },
+          "last_active_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the session was last active."
+          },
+          "status": {
+            "$ref": "#/components/schemas/SessionStatusResource",
+            "description": "The current status of the session."
+          },
+          "required_actions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionRequiredActionResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Actions that must be completed before the session can continue."
+          },
+          "error": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The error that caused the session to fail, if any."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/SessionAgentResource",
+            "description": "The agent running in the session."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/EnvironmentResource",
+            "description": "The execution environment for the session."
+          },
+          "vault_ids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The IDs of vaults made available to the session."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Best-effort token usage for the session, or null if unknown. Recorded usage may change."
+          },
+          "x_agents_core": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/v1.SessionCore"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "metadata",
+          "id",
+          "object",
+          "created_at",
+          "last_active_at",
+          "status",
+          "required_actions",
+          "error",
+          "agent",
+          "environment",
+          "vault_ids",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "A Managed Agents session."
+      },
+      "SessionListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "AgentToolConfigParamFunction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A description of what the function does."
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "A JSON Schema object describing the function's arguments."
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether this function is deferred and discovered through tool search. Defaults to `false`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "parameters"
+        ],
+        "additionalProperties": false,
+        "description": "A function defined by the application."
+      },
+      "AgentToolConfigParamToolSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search"
+            ],
+            "default": "tool_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `tool_search`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Discovers deferred function tools and loads them into the model context."
+      },
+      "AgentToolConfigParamProgrammaticToolCalling": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `programmatic_tool_calling`."
+          },
+          "enabled": {
+            "type": "boolean",
+            "default": true,
+            "description": "Whether tools can be called from model-generated code. Defaults to `true`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Enables calling tools from model-generated code."
+      },
+      "McpTransportConfigParamHttp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http"
+            ],
+            "default": "http",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `http`."
+          },
+          "server_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The URL of the MCP server."
+          },
+          "authorization": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The authorization value sent to the MCP server, if any."
+          },
+          "headers": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Additional HTTP headers sent to the MCP server."
+          }
+        },
+        "required": [
+          "type",
+          "server_url"
+        ],
+        "additionalProperties": false,
+        "description": "Connects to an MCP server over HTTP."
+      },
+      "McpTransportConfigParamStdio": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stdio"
+            ],
+            "default": "stdio",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `stdio`."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The command used to start the MCP server."
+          },
+          "args": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Arguments passed to the MCP server command."
+          },
+          "cwd": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The working directory used to start the MCP server."
+          },
+          "env": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Environment variables set for the MCP server process."
+          },
+          "env_vars": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Environment variable names to inherit from the selected execution environment."
+          }
+        },
+        "required": [
+          "type",
+          "command",
+          "cwd"
+        ],
+        "additionalProperties": false,
+        "description": "Starts an MCP server as a local process."
+      },
+      "McpTransportConfigParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/McpTransportConfigParamHttp"
+          },
+          {
+            "$ref": "#/components/schemas/McpTransportConfigParamStdio"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "http": "#/components/schemas/McpTransportConfigParamHttp",
+            "stdio": "#/components/schemas/McpTransportConfigParamStdio"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "http",
+          "stdio"
+        ],
+        "description": "The transport used to connect to an MCP server."
+      },
+      "AgentToolConfigParamMcp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "default": "mcp",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp`."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A label used to identify the MCP server in tool calls."
+          },
+          "credential_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The attached vault credential used to authenticate this MCP server. Optional when exactly one attached credential matches the server URL."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/McpTransportConfigParam",
+            "description": "The transport used to connect to the MCP server."
+          },
+          "request_metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Metadata included with requests to this MCP server."
+          },
+          "allowed_tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The MCP tools the agent may call. All server tools are allowed when omitted."
+          },
+          "required": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether this MCP server must initialize before the first turn. Defaults to `false`."
+          },
+          "connection_origin": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/McpConnectionOriginParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Selects where outbound MCP HTTP connections originate. Omitted or `service` uses the Managed Agents service network; `environment` uses the session's selected environment."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "transport"
+        ],
+        "additionalProperties": false,
+        "description": "Tools provided by a remote MCP server."
+      },
+      "AgentToolConfigParamWebSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search"
+            ],
+            "default": "web_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `web_search`."
+          },
+          "mode": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchModeParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The source used for web search results. Defaults to `live`."
+          },
+          "context_size": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchContextSizeParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The amount of search context made available to the model. Defaults to `medium`."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Domains the search may include."
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchLocationParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Approximate location used to localize search results."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Web search."
+      },
+      "AgentToolConfigParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamFunction"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamToolSearch"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamProgrammaticToolCalling"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamMcp"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamWebSearch"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function": "#/components/schemas/AgentToolConfigParamFunction",
+            "tool_search": "#/components/schemas/AgentToolConfigParamToolSearch",
+            "programmatic_tool_calling": "#/components/schemas/AgentToolConfigParamProgrammaticToolCalling",
+            "mcp": "#/components/schemas/AgentToolConfigParamMcp",
+            "web_search": "#/components/schemas/AgentToolConfigParamWebSearch"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function",
+          "tool_search",
+          "programmatic_tool_calling",
+          "mcp",
+          "web_search"
+        ],
+        "description": "A tool available to the agent."
+      },
+      "SessionAgentConfigParam": {
+        "type": "object",
+        "properties": {
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The model to use for the agent. The requested model name is preserved."
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for model reasoning. Omit to keep the current settings; pass `null` to reset to the model's default effort."
+          },
+          "text": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TextParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for text generated by the agent."
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ServiceTierParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The service tier used for model requests."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Additional instructions appended to the agent's default base instructions. Omit to leave unchanged."
+          },
+          "multi_agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MultiAgentConfigCurrentParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for creating and coordinating subagents."
+          },
+          "tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/AgentToolConfigParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Tools available to the agent. Omit to inherit, or pass null to clear them."
+          },
+          "x_agents_core": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/v1.AgentsCore"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false,
+        "description": "Agent configuration for a session. Omitted fields inherit from `agent_id` when supplied. Supplied objects and arrays replace the whole field; null resets nullable fields."
+      },
+      "EnvironmentParamNone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "none"
+            ],
+            "default": "none",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `none`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Runs the agent without an execution environment."
+      },
+      "EnvironmentParamOpenaiHosted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "openai_hosted"
+            ],
+            "default": "openai_hosted",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `openai_hosted`."
+          },
+          "packages": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EnvironmentPackagesParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Packages to install in the environment. Defaults to empty package lists."
+          },
+          "setup_commands": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/SetupCommandParam"
+            },
+            "minItems": 0,
+            "maxItems": 16,
+            "description": "Ordered, confidential setup commands. Command bodies are never returned."
+          },
+          "network": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/NetworkPolicyParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Network access policy for the environment. Defaults to enabled."
+          },
+          "env": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Environment variables made available to the agent."
+          },
+          "capability_directories": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Directories that contain capabilities exposed to the agent. Defaults to an empty list."
+          },
+          "skills": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillParam"
+            },
+            "minItems": 0,
+            "maxItems": 200,
+            "description": "Skills referenced by ID or provided as inline ZIP archives. Defaults to an empty list."
+          },
+          "plugins": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginParam"
+            },
+            "minItems": 0,
+            "maxItems": 32,
+            "description": "Plugins provided as inline ZIP archives. Defaults to an empty list."
+          },
+          "files": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileParam"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Files available before the agent starts. Defaults to an empty list."
+          },
+          "environment_template_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 64,
+            "description": "A reusable hosted template applied before inline session configuration. Omitted fields inherit the template; network overrides cannot broaden its policy."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "An OpenAI-hosted environment, optionally based on a reusable template."
+      },
+      "EnvironmentParamSelfHosted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "self_hosted"
+            ],
+            "default": "self_hosted",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `self_hosted`."
+          },
+          "workspace_directory": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Absolute project directory inside the self-hosted environment."
+          },
+          "capability_directories": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Directories that contain capabilities exposed to the agent. Defaults to an empty list."
+          }
+        },
+        "required": [
+          "type",
+          "workspace_directory"
+        ],
+        "additionalProperties": false,
+        "description": "An application-hosted environment configured inline."
+      },
+      "EnvironmentParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/EnvironmentParamNone"
+          },
+          {
+            "$ref": "#/components/schemas/EnvironmentParamOpenaiHosted"
+          },
+          {
+            "$ref": "#/components/schemas/EnvironmentParamSelfHosted"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "none": "#/components/schemas/EnvironmentParamNone",
+            "openai_hosted": "#/components/schemas/EnvironmentParamOpenaiHosted",
+            "self_hosted": "#/components/schemas/EnvironmentParamSelfHosted"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "none",
+          "openai_hosted",
+          "self_hosted"
+        ],
+        "description": "The execution environment and optional reusable template for a session."
+      },
+      "InputContentParamInputText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "default": "input_text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The text sent to the model."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Text input to the model."
+      },
+      "InputContentParamInputImage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "default": "input_image",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_image`."
+          },
+          "image_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The URL of the image sent to the model."
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ],
+        "additionalProperties": false,
+        "description": "Image input to the model."
+      },
+      "InputContentParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InputContentParamInputText"
+          },
+          {
+            "$ref": "#/components/schemas/InputContentParamInputImage"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "input_text": "#/components/schemas/InputContentParamInputText",
+            "input_image": "#/components/schemas/InputContentParamInputImage"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "input_text",
+          "input_image"
+        ],
+        "description": "Content included in an input message."
+      },
+      "InputMessageParam": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "default": "message",
+            "x-stainless-const": true,
+            "description": "The type of the input item. Always `message`."
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user"
+            ],
+            "default": "user",
+            "x-stainless-const": true,
+            "description": "The role of the message author. Always `user`."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputContentParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The content of the message."
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ],
+        "additionalProperties": false,
+        "description": "A user message submitted to a session."
+      },
+      "CreateSessionInputParam": {
+        "oneOf": [
+          {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 1048576
+          },
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputMessageParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384
+          }
+        ],
+        "description": "Initial input submitted when creating a session."
+      },
+      "CreateAgentSessionParams": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 512
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "minProperties": 0,
+            "maxProperties": 16,
+            "description": "Up to 16 string key-value pairs, with keys up to 64 and values up to 512 characters. Omission or null defaults to an empty map."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/SessionAgentConfigParam",
+            "description": "Agent configuration. With `agent_id`, supplied fields override the saved agent for this session. Without `agent_id`, `model` is required."
+          },
+          "agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 64,
+            "description": "The ID of a saved reusable agent. Omit `agent` to use its configuration unchanged."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/EnvironmentParam",
+            "description": "An inline execution environment or a reference to an environment template."
+          },
+          "vault_ids": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The IDs of vaults made available to the session."
+          },
+          "input": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/CreateSessionInputParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Initial input to submit when the session is created. A string is shorthand for a single user message. Required when `environment.type` is `none`, or when `stream` is `true` for an environment that is not `self_hosted`; optional for self-hosted and non-streaming execution environments."
+          },
+          "stream": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to stream session events as server-sent events. Defaults to `false`."
+          },
+          "x_agents_core": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/v1.SessionExecutionInput"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Parameters for creating a Managed Agents session."
+      },
+      "SessionErrorResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The error type."
+          },
+          "code": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The machine-readable error code, if any."
+          },
+          "message": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A customer-safe explanation of the error."
+          },
+          "param": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The request parameter associated with the error, if any."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message",
+          "param"
+        ],
+        "additionalProperties": false,
+        "description": "An error payload with the same public fields as Responses API streaming errors."
+      },
+      "SessionEventError": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "error"
+            ],
+            "default": "error",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `error`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "error": {
+            "$ref": "#/components/schemas/SessionErrorResource",
+            "description": "The error that occurred."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn or session fails.",
+        "x-oaiMeta": {
+          "example": {
+            "type": "error",
+            "event_id": "event_123",
+            "session_id": "sess_123",
+            "error": {
+              "type": "server_error",
+              "code": null,
+              "message": "The session failed due to an internal server error.",
+              "param": null
+            }
+          }
+        }
+      },
+      "SessionEnvironmentStatusResource": {
+        "type": "string",
+        "enum": [
+          "pending",
+          "ready",
+          "connected",
+          "disconnected",
+          "failed"
+        ],
+        "x-enumDescriptions": [
+          "The environment is being prepared.",
+          "The environment is ready to connect.",
+          "The environment is connected.",
+          "The environment is disconnected.",
+          "The environment failed to connect."
+        ],
+        "description": "The connection status of a session environment."
+      },
+      "SessionEnvironmentErrorResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The error type."
+          },
+          "code": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A machine-readable error code."
+          },
+          "message": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A human-readable error message."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message"
+        ],
+        "additionalProperties": false,
+        "description": "An error reported while preparing a session environment."
+      },
+      "SessionEnvironmentStateResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The public ID of the environment."
+          },
+          "type": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The environment type."
+          },
+          "status": {
+            "$ref": "#/components/schemas/SessionEnvironmentStatusResource",
+            "description": "The environment's connection status."
+          },
+          "error": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/SessionEnvironmentErrorResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The error reported while preparing the environment, if any."
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "status",
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "The current state of a session environment."
+      },
+      "SessionEventAgentSessionEnvironmentReady": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.ready"
+            ],
+            "default": "agent.session.environment.ready",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.ready`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a hosted session environment is ready to connect."
+      },
+      "SessionEventAgentOutputCommandExecutionOutputDelta": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.output.command_execution_output.delta"
+            ],
+            "default": "agent.output.command_execution_output.delta",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.output.command_execution_output.delta`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the command execution item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "delta": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The output text that was appended."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "delta"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when command execution produces an output delta."
+      },
+      "SessionEventAgentSessionCreated": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.created"
+            ],
+            "default": "agent.session.created",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.created`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The session that was created."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session is created."
+      },
+      "SessionEventAgentSessionTurnCreated": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.created"
+            ],
+            "default": "agent.session.turn.created",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.created`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The turn at the time it was created."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn is created."
+      },
+      "SessionEventAgentSessionTurnInProgress": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.in_progress"
+            ],
+            "default": "agent.session.turn.in_progress",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.in_progress`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The turn at the time it started running."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn starts running."
+      },
+      "SessionEventAgentSessionTurnCompleted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.completed"
+            ],
+            "default": "agent.session.turn.completed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.completed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The completed turn."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Token usage by the root agent during the turn, when available."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn completes."
+      },
+      "SessionEventAgentSessionTurnFailed": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.failed"
+            ],
+            "default": "agent.session.turn.failed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.failed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The failed turn."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Token usage by the root agent during the turn, when available."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn fails."
+      },
+      "SessionEventAgentSessionTurnCancelled": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.cancelled"
+            ],
+            "default": "agent.session.turn.cancelled",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.cancelled`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The cancelled turn."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Token usage by the root agent during the turn, when available."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn is cancelled."
+      },
+      "SessionEventAgentSessionTurnItemAdded": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.item.added"
+            ],
+            "default": "agent.session.turn.item.added",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.item.added`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "output_index": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output, when the item is agent output."
+          },
+          "item": {
+            "$ref": "#/components/schemas/SessionTurnItemResource",
+            "description": "The item that was added."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "output_index",
+          "item"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an item is added to a turn."
+      },
+      "SessionEventAgentSessionIdle": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.idle"
+            ],
+            "default": "agent.session.idle",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.idle`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The session that became idle."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session becomes idle."
+      },
+      "SessionEventAgentSessionInProgress": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.in_progress"
+            ],
+            "default": "agent.session.in_progress",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.in_progress`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The session that started processing."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session starts processing a turn."
+      },
+      "SessionEventAgentSessionRequiresAction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.requires_action"
+            ],
+            "default": "agent.session.requires_action",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.requires_action`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The session and its current required actions."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session is waiting for one or more required actions."
+      },
+      "SessionEventAgentSessionFailed": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.failed"
+            ],
+            "default": "agent.session.failed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.failed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The failed session."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session fails."
+      },
+      "SessionEventAgentSessionEnvironmentPending": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.pending"
+            ],
+            "default": "agent.session.environment.pending",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.pending`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted while a session environment is being prepared."
+      },
+      "SessionEventAgentSessionEnvironmentConnected": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.connected"
+            ],
+            "default": "agent.session.environment.connected",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.connected`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session environment connects."
+      },
+      "SessionEventAgentSessionEnvironmentDisconnected": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.disconnected"
+            ],
+            "default": "agent.session.environment.disconnected",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.disconnected`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session environment disconnects."
+      },
+      "SessionEventAgentSessionEnvironmentFailed": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.failed"
+            ],
+            "default": "agent.session.environment.failed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.failed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session environment fails."
+      },
+      "SessionEventAgentSessionSubagentCreated": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.subagent.created"
+            ],
+            "default": "agent.session.subagent.created",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.subagent.created`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "subagent": {
+            "$ref": "#/components/schemas/SubagentResource",
+            "description": "The subagent that was created."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "subagent"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a subagent is created."
+      },
+      "SessionEventAgentSessionSubagentActive": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.subagent.active"
+            ],
+            "default": "agent.session.subagent.active",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.subagent.active`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "subagent": {
+            "$ref": "#/components/schemas/SubagentResource",
+            "description": "The subagent that resumed."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "subagent"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a closed subagent successfully resumes."
+      },
+      "SessionEventAgentSessionSubagentClosed": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.subagent.closed"
+            ],
+            "default": "agent.session.subagent.closed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.subagent.closed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "subagent": {
+            "$ref": "#/components/schemas/SubagentResource",
+            "description": "The subagent that was closed."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "subagent"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a subagent is closed."
+      },
+      "AssistantMessageItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "default": "message",
+            "x-stainless-const": true,
+            "description": "The item type. Always `message`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ],
+            "default": "assistant",
+            "x-stainless-const": true,
+            "description": "The role of the message author. Always `assistant`."
+          },
+          "status": {
+            "$ref": "#/components/schemas/OutputItemStatusResource",
+            "description": "The status of the message."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OutputTextResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The content of the message."
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MessagePhaseResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The phase of the assistant message."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "role",
+          "status",
+          "content",
+          "phase"
+        ],
+        "additionalProperties": false,
+        "description": "An assistant message produced by the agent."
+      },
+      "AgentOutputItemResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/AssistantMessageItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/McpCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CommandExecutionItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CreateSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/SendSubagentInputCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/ResumeSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/WaitForSubagentsCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/InterruptSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CloseSubagentCallItemResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "message": "#/components/schemas/AssistantMessageItemResource",
+            "reasoning": "#/components/schemas/ReasoningItemResource",
+            "function_call": "#/components/schemas/FunctionCallItemResource",
+            "mcp_call": "#/components/schemas/McpCallItemResource",
+            "web_search_call": "#/components/schemas/WebSearchCallItemResource",
+            "command_execution": "#/components/schemas/CommandExecutionItemResource",
+            "interrupt_subagent_call": "#/components/schemas/InterruptSubagentCallItemResource",
+            "create_subagent_call": "#/components/schemas/CreateSubagentCallItemResource",
+            "send_subagent_input_call": "#/components/schemas/SendSubagentInputCallItemResource",
+            "resume_subagent_call": "#/components/schemas/ResumeSubagentCallItemResource",
+            "wait_for_subagents_call": "#/components/schemas/WaitForSubagentsCallItemResource",
+            "close_subagent_call": "#/components/schemas/CloseSubagentCallItemResource"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "message",
+          "reasoning",
+          "function_call",
+          "mcp_call",
+          "web_search_call",
+          "command_execution",
+          "create_subagent_call",
+          "send_subagent_input_call",
+          "resume_subagent_call",
+          "wait_for_subagents_call",
+          "interrupt_subagent_call",
+          "close_subagent_call"
+        ],
+        "description": "An output item produced by an agent."
+      },
+      "SessionEventAgentSessionTurnItemDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.item.done"
+            ],
+            "default": "agent.session.turn.item.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.item.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the output item in the turn output."
+          },
+          "item": {
+            "$ref": "#/components/schemas/AgentOutputItemResource",
+            "description": "The completed output item."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "output_index",
+          "item"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an output item is complete."
+      },
+      "SessionEventAgentSessionTurnContentPartAdded": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.content_part.added"
+            ],
+            "default": "agent.session.turn.content_part.added",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.content_part.added`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "content_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the content part in the message."
+          },
+          "part": {
+            "$ref": "#/components/schemas/OutputTextResource",
+            "description": "The initial content part."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an output text content part is added."
+      },
+      "SessionEventAgentSessionTurnContentPartDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.content_part.done"
+            ],
+            "default": "agent.session.turn.content_part.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.content_part.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "content_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the content part in the message."
+          },
+          "part": {
+            "$ref": "#/components/schemas/OutputTextResource",
+            "description": "The completed content part."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an output content part is complete."
+      },
+      "SessionEventAgentSessionTurnOutputTextDelta": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.output_text.delta"
+            ],
+            "default": "agent.session.turn.output_text.delta",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.output_text.delta`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "content_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the content part in the message."
+          },
+          "delta": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text that was appended."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when text is appended to an output text content part."
+      },
+      "SessionEventAgentSessionTurnOutputTextDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.output_text.done"
+            ],
+            "default": "agent.session.turn.output_text.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.output_text.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "content_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the content part in the message."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The complete output text."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an output text content part is complete."
+      },
+      "SessionEventAgentSessionTurnReasoningSummaryPartAdded": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.reasoning_summary_part.added"
+            ],
+            "default": "agent.session.turn.reasoning_summary_part.added",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.reasoning_summary_part.added`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "summary_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the summary content part."
+          },
+          "part": {
+            "$ref": "#/components/schemas/SummaryTextResource",
+            "description": "The initial summary part."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "part"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a reasoning summary content part is added."
+      },
+      "SessionEventAgentSessionTurnReasoningSummaryPartDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.reasoning_summary_part.done"
+            ],
+            "default": "agent.session.turn.reasoning_summary_part.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.reasoning_summary_part.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "summary_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the summary part."
+          },
+          "part": {
+            "$ref": "#/components/schemas/SummaryTextResource",
+            "description": "The completed summary part."
+          },
+          "status": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "enum": [
+              "incomplete",
+              null
+            ],
+            "description": "Present as `incomplete` when summary generation was interrupted.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "part",
+          "status"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a reasoning summary part is complete."
+      },
+      "SessionEventAgentSessionTurnReasoningSummaryTextDelta": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.reasoning_summary_text.delta"
+            ],
+            "default": "agent.session.turn.reasoning_summary_text.delta",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.reasoning_summary_text.delta`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "summary_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the summary content part."
+          },
+          "delta": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The summary text that was appended."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "delta"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when text is appended to a reasoning summary."
+      },
+      "SessionEventAgentSessionTurnReasoningSummaryTextDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.reasoning_summary_text.done"
+            ],
+            "default": "agent.session.turn.reasoning_summary_text.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.reasoning_summary_text.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "summary_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the summary content part."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The complete reasoning summary text."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a reasoning summary content part is complete."
+      },
+      "SessionEvent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/SessionEventError"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentReady"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentOutputCommandExecutionOutputDelta"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionCreated"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnCreated"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnInProgress"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnCompleted"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnFailed"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnCancelled"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnItemAdded"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionIdle"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionInProgress"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionRequiresAction"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionFailed"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentPending"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentConnected"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentDisconnected"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentFailed"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionSubagentCreated"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionSubagentActive"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionSubagentClosed"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnItemDone"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnContentPartAdded"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnContentPartDone"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnOutputTextDelta"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnOutputTextDone"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryPartAdded"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryPartDone"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryTextDelta"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryTextDone"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "error": "#/components/schemas/SessionEventError",
+            "agent.session.environment.ready": "#/components/schemas/SessionEventAgentSessionEnvironmentReady",
+            "agent.output.command_execution_output.delta": "#/components/schemas/SessionEventAgentOutputCommandExecutionOutputDelta",
+            "agent.session.created": "#/components/schemas/SessionEventAgentSessionCreated",
+            "agent.session.turn.created": "#/components/schemas/SessionEventAgentSessionTurnCreated",
+            "agent.session.turn.in_progress": "#/components/schemas/SessionEventAgentSessionTurnInProgress",
+            "agent.session.turn.completed": "#/components/schemas/SessionEventAgentSessionTurnCompleted",
+            "agent.session.turn.failed": "#/components/schemas/SessionEventAgentSessionTurnFailed",
+            "agent.session.turn.cancelled": "#/components/schemas/SessionEventAgentSessionTurnCancelled",
+            "agent.session.turn.item.added": "#/components/schemas/SessionEventAgentSessionTurnItemAdded",
+            "agent.session.idle": "#/components/schemas/SessionEventAgentSessionIdle",
+            "agent.session.in_progress": "#/components/schemas/SessionEventAgentSessionInProgress",
+            "agent.session.requires_action": "#/components/schemas/SessionEventAgentSessionRequiresAction",
+            "agent.session.failed": "#/components/schemas/SessionEventAgentSessionFailed",
+            "agent.session.environment.pending": "#/components/schemas/SessionEventAgentSessionEnvironmentPending",
+            "agent.session.environment.connected": "#/components/schemas/SessionEventAgentSessionEnvironmentConnected",
+            "agent.session.environment.disconnected": "#/components/schemas/SessionEventAgentSessionEnvironmentDisconnected",
+            "agent.session.environment.failed": "#/components/schemas/SessionEventAgentSessionEnvironmentFailed",
+            "agent.session.subagent.created": "#/components/schemas/SessionEventAgentSessionSubagentCreated",
+            "agent.session.subagent.active": "#/components/schemas/SessionEventAgentSessionSubagentActive",
+            "agent.session.subagent.closed": "#/components/schemas/SessionEventAgentSessionSubagentClosed",
+            "agent.session.turn.item.done": "#/components/schemas/SessionEventAgentSessionTurnItemDone",
+            "agent.session.turn.content_part.added": "#/components/schemas/SessionEventAgentSessionTurnContentPartAdded",
+            "agent.session.turn.content_part.done": "#/components/schemas/SessionEventAgentSessionTurnContentPartDone",
+            "agent.session.turn.output_text.delta": "#/components/schemas/SessionEventAgentSessionTurnOutputTextDelta",
+            "agent.session.turn.output_text.done": "#/components/schemas/SessionEventAgentSessionTurnOutputTextDone",
+            "agent.session.turn.reasoning_summary_part.added": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryPartAdded",
+            "agent.session.turn.reasoning_summary_part.done": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryPartDone",
+            "agent.session.turn.reasoning_summary_text.delta": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryTextDelta",
+            "agent.session.turn.reasoning_summary_text.done": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryTextDone"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "error",
+          "agent.session.environment.ready",
+          "agent.output.command_execution_output.delta",
+          "agent.session.created",
+          "agent.session.turn.created",
+          "agent.session.turn.in_progress",
+          "agent.session.turn.completed",
+          "agent.session.turn.failed",
+          "agent.session.turn.cancelled",
+          "agent.session.turn.item.added",
+          "agent.session.idle",
+          "agent.session.in_progress",
+          "agent.session.requires_action",
+          "agent.session.failed",
+          "agent.session.environment.pending",
+          "agent.session.environment.connected",
+          "agent.session.environment.disconnected",
+          "agent.session.environment.failed",
+          "agent.session.subagent.created",
+          "agent.session.subagent.active",
+          "agent.session.subagent.closed",
+          "agent.session.turn.item.done",
+          "agent.session.turn.content_part.added",
+          "agent.session.turn.content_part.done",
+          "agent.session.turn.output_text.delta",
+          "agent.session.turn.output_text.done",
+          "agent.session.turn.reasoning_summary_part.added",
+          "agent.session.turn.reasoning_summary_part.done",
+          "agent.session.turn.reasoning_summary_text.delta",
+          "agent.session.turn.reasoning_summary_text.done"
+        ],
+        "description": "An event emitted by a Managed Agents session."
+      },
+      "UpdateAgentSessionParams": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 512
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "minProperties": 0,
+            "maxProperties": 16,
+            "description": "Replaces all metadata. Omit to leave unchanged, or pass null or {} to clear it. Up to 16 string key-value pairs, with keys up to 64 and values up to 512 characters."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Fields to update on an existing session."
+      },
+      "DeletedSessionResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted session."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.session.deleted"
+            ],
+            "default": "agent.session.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.session.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the session has been removed from the public API. Always `true`. Physical cleanup may still be in progress."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "A Managed Agents session removed from the public API. Physical cleanup may continue asynchronously."
+      },
+      "SessionArtifactResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The immutable artifact ID."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.session.artifact"
+            ],
+            "default": "agent.session.artifact",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.session.artifact`."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session that owns the artifact."
+          },
+          "environment_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the environment that produced the artifact."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the completed turn that published the artifact."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The original absolute file path in the execution environment."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The immutable artifact size in bytes."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the artifact was published."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "session_id",
+          "environment_id",
+          "turn_id",
+          "path",
+          "size_bytes",
+          "created_at"
+        ],
+        "additionalProperties": false,
+        "description": "An immutable file published by a completed hosted session turn."
+      },
+      "SessionArtifactListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionArtifactResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "DeletedSessionArtifactResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted session artifact."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.session.artifact.deleted"
+            ],
+            "default": "agent.session.artifact.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.session.artifact.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the session artifact was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "Confirmation that an immutable session artifact was deleted."
+      },
+      "SessionInputParamAgentSessionInputMessage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.input.message"
+            ],
+            "default": "agent.session.input.message",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.input.message`."
+          },
+          "input": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputMessageParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The user messages to add to the session."
+          }
+        },
+        "required": [
+          "type",
+          "input"
+        ],
+        "additionalProperties": false,
+        "description": "Adds one or more user messages and starts a turn."
+      },
+      "SessionInputParamAgentSessionInputCancel": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.input.cancel"
+            ],
+            "default": "agent.session.input.cancel",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.input.cancel`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Cancels the session's active turn."
+      },
+      "FunctionCallOutputParam": {
+        "oneOf": [
+          {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576
+          },
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputContentParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384
+          }
+        ],
+        "description": "A function result represented as text or supported model-input content."
+      },
+      "SessionInputParamAgentSessionInputToolResult": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.input.tool_result"
+            ],
+            "default": "agent.session.input.tool_result",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.input.tool_result`."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The ID of the turn that requested the function call."
+          },
+          "call_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The ID of the function call."
+          },
+          "success": {
+            "type": "boolean",
+            "description": "Whether the function call succeeded."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionCallOutputParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The function result when the call succeeded."
+          },
+          "error": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The error message when the call failed."
+          }
+        },
+        "required": [
+          "type",
+          "turn_id",
+          "call_id",
+          "success"
+        ],
+        "additionalProperties": false,
+        "description": "Submits the result of a function call."
+      },
+      "SessionInputParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/SessionInputParamAgentSessionInputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/SessionInputParamAgentSessionInputCancel"
+          },
+          {
+            "$ref": "#/components/schemas/SessionInputParamAgentSessionInputToolResult"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "agent.session.input.message": "#/components/schemas/SessionInputParamAgentSessionInputMessage",
+            "agent.session.input.cancel": "#/components/schemas/SessionInputParamAgentSessionInputCancel",
+            "agent.session.input.tool_result": "#/components/schemas/SessionInputParamAgentSessionInputToolResult"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "agent.session.input.message",
+          "agent.session.input.cancel",
+          "agent.session.input.tool_result"
+        ],
+        "description": "Input submitted to an existing session."
+      },
+      "CreateSessionEventsParams": {
+        "type": "object",
+        "properties": {
+          "events": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionInputParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The input events to submit to the session."
+          }
+        },
+        "required": [
+          "events"
+        ],
+        "additionalProperties": false,
+        "description": "Input events submitted to an existing session."
+      },
+      "VaultStatusParam": {
+        "type": "string",
+        "enum": [
+          "active",
+          "archived"
+        ],
+        "description": "Whether a vault or credential is active or archived."
+      },
+      "VaultStatusFilterParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/VaultStatusParam"
+          },
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VaultStatusParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384
+          }
+        ],
+        "description": "One or more lifecycle statuses to include when listing vaults or credentials."
+      },
+      "VaultResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the vault."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vault"
+            ],
+            "default": "vault",
+            "x-stainless-const": true,
+            "description": "The object type. Always `vault`."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The human-readable name of the vault, if set."
+          },
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Key-value pairs associated with the vault, such as an application or team identifier."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the vault was created."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "name",
+          "metadata",
+          "created_at"
+        ],
+        "additionalProperties": false,
+        "description": "A collection of credentials that agent tools can use to authenticate to MCP servers."
+      },
+      "VaultListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VaultResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "CreateVaultParams": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 1048576,
+            "description": "The name is trimmed before storage. It must contain 1 to 256 UTF-8 bytes after trimming."
+          },
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Key-value pairs to associate with the vault, such as an application or team identifier."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Parameters for creating a vault to store credentials used by agent tools."
+      },
+      "DeletedVaultResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted vault."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vault.deleted"
+            ],
+            "default": "vault.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `vault.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the resource was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "Confirmation that a vault was deleted."
+      },
+      "McpOauthTokenEndpointAuthResourceNone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "none"
+            ],
+            "default": "none",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `none`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID without a client secret."
+      },
+      "McpOauthTokenEndpointAuthResourceClientSecretBasic": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_basic"
+            ],
+            "default": "client_secret_basic",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_basic`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID and secret using HTTP Basic authentication."
+      },
+      "McpOauthTokenEndpointAuthResourceClientSecretPost": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_post"
+            ],
+            "default": "client_secret_post",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_post`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID and secret in the token request body."
+      },
+      "McpOauthTokenEndpointAuthResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/McpOauthTokenEndpointAuthResourceNone"
+          },
+          {
+            "$ref": "#/components/schemas/McpOauthTokenEndpointAuthResourceClientSecretBasic"
+          },
+          {
+            "$ref": "#/components/schemas/McpOauthTokenEndpointAuthResourceClientSecretPost"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "none": "#/components/schemas/McpOauthTokenEndpointAuthResourceNone",
+            "client_secret_basic": "#/components/schemas/McpOauthTokenEndpointAuthResourceClientSecretBasic",
+            "client_secret_post": "#/components/schemas/McpOauthTokenEndpointAuthResourceClientSecretPost"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "none",
+          "client_secret_basic",
+          "client_secret_post"
+        ],
+        "description": "The client authentication method used for OAuth token refresh."
+      },
+      "McpOauthRefreshResource": {
+        "type": "object",
+        "properties": {
+          "token_endpoint": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The HTTPS OAuth token endpoint used for refresh."
+          },
+          "client_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The OAuth client ID used when requesting a new access token."
+          },
+          "resource": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The resource URI sent to the OAuth token endpoint during refresh, if configured."
+          },
+          "scope": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "Space-separated OAuth scopes requested during refresh, if configured."
+          },
+          "token_endpoint_auth": {
+            "$ref": "#/components/schemas/McpOauthTokenEndpointAuthResource",
+            "description": "How the OAuth client authenticates to the token endpoint, excluding its client secret."
+          }
+        },
+        "required": [
+          "token_endpoint",
+          "client_id",
+          "resource",
+          "scope",
+          "token_endpoint_auth"
+        ],
+        "additionalProperties": false,
+        "description": "Configuration used to refresh an MCP OAuth access token, excluding secret values."
+      },
+      "VaultCredentialAuthResourceMcpOauth": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_oauth"
+            ],
+            "default": "mcp_oauth",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp_oauth`."
+          },
+          "mcp_server_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The HTTPS MCP server URL authorized by this credential."
+          },
+          "expires_at": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "When the OAuth access token expires, as an RFC 3339 timestamp, if known."
+          },
+          "refresh": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/McpOauthRefreshResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Public refresh metadata without refresh tokens or OAuth client secrets."
+          }
+        },
+        "required": [
+          "type",
+          "mcp_server_url",
+          "expires_at",
+          "refresh"
+        ],
+        "additionalProperties": false,
+        "description": "Public metadata for an OAuth credential; tokens and client secrets are never returned."
+      },
+      "VaultCredentialAuthResourceStaticBearer": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "static_bearer"
+            ],
+            "default": "static_bearer",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `static_bearer`."
+          },
+          "mcp_server_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The HTTPS MCP server URL authorized by this credential."
+          }
+        },
+        "required": [
+          "type",
+          "mcp_server_url"
+        ],
+        "additionalProperties": false,
+        "description": "Metadata for a bearer-token credential, without automatic OAuth refresh."
+      },
+      "VaultCredentialAuthResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/VaultCredentialAuthResourceMcpOauth"
+          },
+          {
+            "$ref": "#/components/schemas/VaultCredentialAuthResourceStaticBearer"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "mcp_oauth": "#/components/schemas/VaultCredentialAuthResourceMcpOauth",
+            "static_bearer": "#/components/schemas/VaultCredentialAuthResourceStaticBearer"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "mcp_oauth",
+          "static_bearer"
+        ],
+        "description": "The MCP server and authentication configuration of a vault credential, excluding secrets."
+      },
+      "VaultCredentialResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the credential."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vault.credential"
+            ],
+            "default": "vault.credential",
+            "x-stainless-const": true,
+            "description": "The object type. Always `vault.credential`."
+          },
+          "vault_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the vault containing this credential."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The human-readable name of the credential."
+          },
+          "auth": {
+            "$ref": "#/components/schemas/VaultCredentialAuthResource",
+            "description": "The authentication method and non-secret configuration for the MCP server."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the credential was created."
+          },
+          "updated_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the credential was last updated."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "vault_id",
+          "name",
+          "auth",
+          "created_at",
+          "updated_at"
+        ],
+        "additionalProperties": false,
+        "description": "Metadata for a stored MCP server credential. Secret values are never returned."
+      },
+      "VaultCredentialListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VaultCredentialResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "CreateMcpOauthTokenEndpointAuthParamNone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "none"
+            ],
+            "default": "none",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `none`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID without a client secret."
+      },
+      "CreateMcpOauthTokenEndpointAuthParamClientSecretBasic": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_basic"
+            ],
+            "default": "client_secret_basic",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_basic`."
+          },
+          "client_secret": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The OAuth client secret to store. Never returned in credential resources."
+          }
+        },
+        "required": [
+          "type",
+          "client_secret"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID and secret using HTTP Basic authentication."
+      },
+      "CreateMcpOauthTokenEndpointAuthParamClientSecretPost": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_post"
+            ],
+            "default": "client_secret_post",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_post`."
+          },
+          "client_secret": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The OAuth client secret to store. Never returned in credential resources."
+          }
+        },
+        "required": [
+          "type",
+          "client_secret"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID and secret in the token request body."
+      },
+      "CreateMcpOauthTokenEndpointAuthParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamNone"
+          },
+          {
+            "$ref": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamClientSecretBasic"
+          },
+          {
+            "$ref": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamClientSecretPost"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "none": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamNone",
+            "client_secret_basic": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamClientSecretBasic",
+            "client_secret_post": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamClientSecretPost"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "none",
+          "client_secret_basic",
+          "client_secret_post"
+        ],
+        "description": "Client authentication credentials for OAuth token refresh."
+      },
+      "CreateMcpOauthRefreshParam": {
+        "type": "object",
+        "properties": {
+          "token_endpoint": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The HTTPS OAuth token endpoint used to exchange the refresh token for a new access token."
+          },
+          "client_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The OAuth client ID used when requesting a new access token."
+          },
+          "resource": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The resource URI to send to the OAuth token endpoint during refresh, if required."
+          },
+          "scope": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Space-separated OAuth scopes to request during refresh, if required."
+          },
+          "refresh_token": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The refresh token to store. This secret is never returned in credential resources."
+          },
+          "token_endpoint_auth": {
+            "$ref": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParam",
+            "description": "How the OAuth client authenticates to the token endpoint."
+          }
+        },
+        "required": [
+          "token_endpoint",
+          "client_id",
+          "refresh_token",
+          "token_endpoint_auth"
+        ],
+        "additionalProperties": false,
+        "description": "Configuration for refreshing the access token of an MCP OAuth credential."
+      },
+      "CreateVaultCredentialAuthParamMcpOauth": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_oauth"
+            ],
+            "default": "mcp_oauth",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp_oauth`."
+          },
+          "mcp_server_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The HTTPS MCP server URL authorized by this credential."
+          },
+          "access_token": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A write-only OAuth access token; never returned by credential resources."
+          },
+          "expires_at": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "When the OAuth access token expires, as an RFC 3339 timestamp, if known."
+          },
+          "refresh": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/CreateMcpOauthRefreshParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Optional refresh configuration for an HTTPS OAuth token endpoint."
+          }
+        },
+        "required": [
+          "type",
+          "mcp_server_url",
+          "access_token"
+        ],
+        "additionalProperties": false,
+        "description": "An OAuth credential for an HTTPS MCP destination."
+      },
+      "CreateVaultCredentialAuthParamStaticBearer": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "static_bearer"
+            ],
+            "default": "static_bearer",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `static_bearer`."
+          },
+          "mcp_server_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The HTTPS MCP server URL authorized by this credential."
+          },
+          "token": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The bearer token to store. This secret is never returned in credential resources."
+          }
+        },
+        "required": [
+          "type",
+          "mcp_server_url",
+          "token"
+        ],
+        "additionalProperties": false,
+        "description": "A bearer token for an MCP server, without automatic OAuth refresh."
+      },
+      "CreateVaultCredentialAuthParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/CreateVaultCredentialAuthParamMcpOauth"
+          },
+          {
+            "$ref": "#/components/schemas/CreateVaultCredentialAuthParamStaticBearer"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "mcp_oauth": "#/components/schemas/CreateVaultCredentialAuthParamMcpOauth",
+            "static_bearer": "#/components/schemas/CreateVaultCredentialAuthParamStaticBearer"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "mcp_oauth",
+          "static_bearer"
+        ],
+        "description": "Authentication credentials for an MCP server used by agent tools."
+      },
+      "CreateVaultCredentialParams": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 1048576,
+            "description": "The name is trimmed before storage. It must contain 1 to 256 UTF-8 bytes after trimming."
+          },
+          "auth": {
+            "$ref": "#/components/schemas/CreateVaultCredentialAuthParam",
+            "description": "The authentication method and secret values to store for the MCP server."
+          }
+        },
+        "required": [
+          "auth",
+          "name"
+        ],
+        "additionalProperties": false,
+        "description": "Parameters for storing a credential that authorizes access to an MCP server."
+      },
+      "RotateMcpOauthTokenEndpointAuthParamClientSecretBasic": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_basic"
+            ],
+            "default": "client_secret_basic",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_basic`."
+          },
+          "client_secret": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement OAuth client secret. Omit or pass `null` to keep the stored secret. This secret is never returned in resources."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Updates credentials sent using HTTP Basic authentication."
+      },
+      "RotateMcpOauthTokenEndpointAuthParamClientSecretPost": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_post"
+            ],
+            "default": "client_secret_post",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_post`."
+          },
+          "client_secret": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement OAuth client secret. Omit or pass `null` to keep the stored secret. This secret is never returned in resources."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Updates credentials sent in the token request body."
+      },
+      "RotateMcpOauthTokenEndpointAuthParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParamClientSecretBasic"
+          },
+          {
+            "$ref": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParamClientSecretPost"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "client_secret_basic": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParamClientSecretBasic",
+            "client_secret_post": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParamClientSecretPost"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "client_secret_basic",
+          "client_secret_post"
+        ],
+        "description": "Client-secret updates that preserve the credential's OAuth authentication method."
+      },
+      "RotateMcpOauthRefreshParam": {
+        "type": "object",
+        "properties": {
+          "refresh_token": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement refresh token. Omit or pass `null` to keep the stored token. This secret is never returned in resources."
+          },
+          "scope": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Replacement space-separated OAuth scopes for refresh requests. Omit to keep the scopes, or pass `null` to stop sending a scope parameter."
+          },
+          "token_endpoint_auth": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Client-secret updates for the existing token endpoint authentication method."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Updates to an MCP credential's existing OAuth refresh configuration."
+      },
+      "RotateVaultCredentialAuthParamMcpOauth": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_oauth"
+            ],
+            "default": "mcp_oauth",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp_oauth`."
+          },
+          "access_token": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A write-only replacement OAuth access token."
+          },
+          "expires_at": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement expiry as an RFC 3339 timestamp, or `null` to clear it. Omitting this field preserves the expiry unless a new access token is supplied, in which case the expiry is cleared."
+          },
+          "refresh": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/RotateMcpOauthRefreshParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Optional write-only refresh-token and client-secret updates."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Rotate an OAuth credential for an HTTPS MCP destination."
+      },
+      "RotateVaultCredentialAuthParamStaticBearer": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "static_bearer"
+            ],
+            "default": "static_bearer",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `static_bearer`."
+          },
+          "token": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement bearer token. This secret is never returned in credential resources."
+          }
+        },
+        "required": [
+          "type",
+          "token"
+        ],
+        "additionalProperties": false,
+        "description": "Replace the bearer token for the credential's MCP server."
+      },
+      "RotateVaultCredentialAuthParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/RotateVaultCredentialAuthParamMcpOauth"
+          },
+          {
+            "$ref": "#/components/schemas/RotateVaultCredentialAuthParamStaticBearer"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "mcp_oauth": "#/components/schemas/RotateVaultCredentialAuthParamMcpOauth",
+            "static_bearer": "#/components/schemas/RotateVaultCredentialAuthParamStaticBearer"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "mcp_oauth",
+          "static_bearer"
+        ],
+        "description": "Updates to a vault credential without changing its authentication method or MCP server."
+      },
+      "RotateVaultCredentialParams": {
+        "type": "object",
+        "properties": {
+          "auth": {
+            "$ref": "#/components/schemas/RotateVaultCredentialAuthParam",
+            "description": "Replacement values for the credential's existing authentication method."
+          }
+        },
+        "required": [
+          "auth"
+        ],
+        "additionalProperties": false,
+        "description": "Secret, expiry, and OAuth refresh scope updates for an existing vault credential."
+      },
+      "DeletedVaultCredentialResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted credential."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vault.credential.deleted"
+            ],
+            "default": "vault.credential.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `vault.credential.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the resource was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "Confirmation that a vault credential was deleted."
+      },
+      "v1.AgentsCore": {
+        "properties": {
+          "harness": {
+            "enum": [
+              "claude_sdk",
+              "codex",
+              "mcode"
+            ],
+            "type": "string"
+          },
+          "harness_config": {
+            "type": "object"
+          }
+        },
+        "type": "object"
+      },
+      "v1.EnvironmentInstallation": {
+        "properties": {
+          "commands": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "type": "object"
+          },
+          "expires_at": {
+            "type": "integer"
+          },
+          "message": {
+            "type": "string"
+          },
+          "status": {
+            "enum": [
+              "available",
+              "unavailable"
+            ],
+            "type": "string"
+          },
+          "version": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "v1.ModelProviderInput": {
+        "properties": {
+          "api_key": {
+            "type": "string"
+          },
+          "base_url": {
+            "type": "string"
+          },
+          "context_window": {
+            "type": "integer"
+          },
+          "max_output_tokens": {
+            "type": "integer"
+          },
+          "protocol": {
+            "enum": [
+              "anthropic",
+              "responses",
+              "chat_completions"
+            ],
+            "type": "string"
+          }
+        },
+        "required": [
+          "api_key",
+          "base_url",
+          "protocol"
+        ],
+        "type": "object"
+      },
+      "v1.ModelProviderView": {
+        "properties": {
+          "api_key_configured": {
+            "type": "boolean"
+          },
+          "base_url": {
+            "type": "string"
+          },
+          "context_window": {
+            "type": "integer"
+          },
+          "max_output_tokens": {
+            "type": "integer"
+          },
+          "protocol": {
+            "enum": [
+              "anthropic",
+              "responses",
+              "chat_completions"
+            ],
+            "type": "string"
+          }
+        },
+        "required": [
+          "api_key_configured",
+          "base_url",
+          "protocol"
+        ],
+        "type": "object"
+      },
+      "v1.SavedAgentCore": {
+        "properties": {
+          "harness": {
+            "enum": [
+              "claude_sdk",
+              "codex",
+              "mcode"
+            ],
+            "type": "string"
+          },
+          "harness_config": {
+            "type": "object"
+          },
+          "model_provider": {
+            "$ref": "#/components/schemas/v1.ModelProviderView"
+          }
+        },
+        "type": "object"
+      },
+      "v1.SavedAgentCoreInput": {
+        "properties": {
+          "harness": {
+            "enum": [
+              "claude_sdk",
+              "codex",
+              "mcode"
+            ],
+            "type": "string"
+          },
+          "harness_config": {
+            "type": "object"
+          },
+          "model_provider": {
+            "anyOf": [
+              {
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/v1.ModelProviderInput"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object"
+      },
+      "v1.SessionCore": {
+        "properties": {
+          "installation": {
+            "$ref": "#/components/schemas/v1.EnvironmentInstallation"
+          }
+        },
+        "type": "object"
+      },
+      "v1.SessionExecutionInput": {
+        "properties": {
+          "environment": {
+            "description": "Environment supplies placement-independent preparation through the Core extension.",
+            "type": "object"
+          },
+          "harness_config": {
+            "type": "object"
+          },
+          "model_provider": {
+            "$ref": "#/components/schemas/v1.ModelProviderInput"
+          }
+        },
+        "type": "object"
+      }
+    },
+    "responses": {
+      "TooManyRequests": {
+        "description": "The request was rejected because a rate limit was exceeded.",
+        "headers": {
+          "Retry-After": {
+            "description": "The minimum number of seconds to wait before retrying. This header is returned when the server has computed a retry delay and may be omitted for 429 responses that require user action.",
+            "schema": {
+              "type": "integer",
+              "minimum": 1
+            }
+          }
+        },
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "securitySchemes": {
+      "ProjectKey": {
+        "type": "http",
+        "scheme": "bearer",
+        "description": "OpenAgentCore Project API key."
+      }
+    }
+  },
+  "x-oaiMeta": {
+    "navigationGroups": [
+      {
+        "id": "responses",
+        "title": "Responses API"
+      },
+      {
+        "id": "webhooks",
+        "title": "Webhooks"
+      },
+      {
+        "id": "endpoints",
+        "title": "Platform APIs"
+      },
+      {
+        "id": "vector_stores",
+        "title": "Vector stores"
+      },
+      {
+        "id": "chatkit",
+        "title": "ChatKit",
+        "beta": true
+      },
+      {
+        "id": "containers",
+        "title": "Containers"
+      },
+      {
+        "id": "live",
+        "title": "Live (alpha)"
+      },
+      {
+        "id": "realtime",
+        "title": "Realtime"
+      },
+      {
+        "id": "chat",
+        "title": "Chat Completions"
+      },
+      {
+        "id": "assistants",
+        "title": "Assistants",
+        "deprecated": true
+      },
+      {
+        "id": "administration",
+        "title": "Administration"
+      },
+      {
+        "id": "legacy",
+        "title": "Legacy"
+      }
+    ],
+    "groups": [
+      {
+        "id": "responses-streaming",
+        "title": "Streaming events",
+        "description": "When you [create a Response](https://developers.openai.com/api/reference/resources/responses/methods/create) with\n`stream` set to `true`, the server will emit server-sent events to the\nclient as the Response is generated. This section contains the events that\nare emitted by the server.\n\n[Learn more about streaming responses](https://developers.openai.com/api/docs/guides/streaming-responses).\n",
+        "navigationGroup": "responses",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ResponseCreatedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseIncompleteEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputItemAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputItemDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseContentPartAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseContentPartDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseTextDeltaEvent",
+            "path": "response/output_text/delta"
+          },
+          {
+            "type": "object",
+            "key": "ResponseTextDoneEvent",
+            "path": "response/output_text/done"
+          },
+          {
+            "type": "object",
+            "key": "ResponseRefusalDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseRefusalDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFunctionCallArgumentsDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFunctionCallArgumentsDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallSearchingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallSearchingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryPartAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryPartDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryTextDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryTextDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningTextDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningTextDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallGeneratingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallPartialImageEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallArgumentsDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallArgumentsDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallInterpretingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCodeDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCodeDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputTextAnnotationAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseQueuedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCustomToolCallInputDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCustomToolCallInputDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseErrorEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "responses-websocket-client-events",
+        "title": "Client events",
+        "description": "Events sent by the client over a Responses API WebSocket connection.\n",
+        "navigationGroup": "responses",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ResponsesClientEventResponseCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseSteerEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "responses-websocket-server-events",
+        "title": "Server events (WebSocket only)",
+        "description": "Events emitted only over a Responses API WebSocket connection.\n",
+        "navigationGroup": "responses",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ResponseSteerAcceptedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseSteerPendingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseSteerFailedEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "responses-websocket-shared-events",
+        "title": "Server events",
+        "description": "These events use the same payloads over WebSocket and\n[HTTP streaming](https://developers.openai.com/api/reference/resources/responses/streaming-events).\n",
+        "navigationGroup": "responses",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ResponseCreatedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseIncompleteEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputItemAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputItemDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseContentPartAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseContentPartDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseTextDeltaEvent",
+            "path": "response/output_text/delta"
+          },
+          {
+            "type": "object",
+            "key": "ResponseTextDoneEvent",
+            "path": "response/output_text/done"
+          },
+          {
+            "type": "object",
+            "key": "ResponseRefusalDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseRefusalDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFunctionCallArgumentsDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFunctionCallArgumentsDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallSearchingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallSearchingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryPartAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryPartDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryTextDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryTextDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningTextDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningTextDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallGeneratingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallPartialImageEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallArgumentsDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallArgumentsDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallInterpretingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCodeDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCodeDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputTextAnnotationAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseQueuedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCustomToolCallInputDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCustomToolCallInputDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseErrorEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "safety-alerts",
+        "title": "Safety Alerts",
+        "description": "Retrieve approved safety alerts with an API key. Project keys require\n`api.safety.alerts.read` and can read alerts from their project.\n",
+        "navigationGroup": "endpoints",
+        "sections": [
+          {
+            "type": "endpoint",
+            "key": "Getprojectsafetyalert",
+            "path": "retrieve"
+          },
+          {
+            "type": "object",
+            "key": "SafetyAlertResource",
+            "path": "object"
+          }
+        ]
+      },
+      {
+        "id": "webhook-events",
+        "title": "Webhook Events",
+        "description": "Webhooks are HTTP requests sent by OpenAI to a URL you specify when certain\nevents happen during the course of API usage.\n\n[Learn more about webhooks](https://developers.openai.com/api/docs/guides/webhooks).\n",
+        "navigationGroup": "webhooks",
+        "sections": [
+          {
+            "type": "object",
+            "key": "WebhookResponseCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookResponseCancelled",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookResponseFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookResponseIncomplete",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookBatchCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookBatchCancelled",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookBatchExpired",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookBatchFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookFineTuningJobSucceeded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookFineTuningJobFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookFineTuningJobCancelled",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookEvalRunSucceeded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookEvalRunFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookEvalRunCanceled",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookRealtimeCallIncoming",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookLiveCallIncoming",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookLiveTransportIncoming",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookSafetyAlertCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookSafetyOrgAlertCreated",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "images-streaming",
+        "title": "Image Streaming",
+        "description": "Stream image generation and editing in real time with server-sent events.\n[Learn more about image streaming](https://developers.openai.com/api/docs/guides/image-generation).\n",
+        "navigationGroup": "endpoints",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ImageGenPartialImageEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ImageGenCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ImageEditPartialImageEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ImageEditCompletedEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-client-events",
+        "title": "Client events",
+        "description": "These are events that the OpenAI Realtime WebSocket server will accept from the client.\n",
+        "navigationGroup": "realtime",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeClientEventSessionUpdate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventInputAudioBufferAppend",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventInputAudioBufferCommit",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventInputAudioBufferClear",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventConversationItemCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventConversationItemRetrieve",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventConversationItemTruncate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventConversationItemDelete",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventResponseCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventResponseCancel",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventOutputAudioBufferClear",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-server-events",
+        "title": "Server events",
+        "description": "These are events emitted from the OpenAI Realtime WebSocket server to the client.\n",
+        "navigationGroup": "realtime",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeServerEventError",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventSessionCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemRetrieved",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemInputAudioTranscriptionCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemInputAudioTranscriptionDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemInputAudioTranscriptionSegment",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemInputAudioTranscriptionFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemTruncated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemDeleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferCommitted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferDtmfEventReceived",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferCleared",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferSpeechStarted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferSpeechStopped",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferTimeoutTriggered",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventOutputAudioBufferStarted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventOutputAudioBufferStopped",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventOutputAudioBufferCleared",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseOutputItemAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseOutputItemDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseContentPartAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseContentPartDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseTextDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseTextDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseAudioTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseAudioTranscriptDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseAudioDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseAudioDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseFunctionCallArgumentsDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseFunctionCallArgumentsDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallArgumentsDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallArgumentsDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallInProgress",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventMCPListToolsInProgress",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventMCPListToolsCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventMCPListToolsFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventRateLimitsUpdated",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-translation-client-events",
+        "title": "Translation client events",
+        "description": "These are events that the OpenAI Realtime Translation WebSocket server will accept from the client.\n",
+        "navigationGroup": "realtime",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeTranslationClientEventSessionUpdate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationClientEventInputAudioBufferAppend",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationClientEventSessionClose",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-translation-server-events",
+        "title": "Translation server events",
+        "description": "These are events emitted from the OpenAI Realtime Translation WebSocket server to the client.\n",
+        "navigationGroup": "realtime",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeServerEventError",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionClosed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionInputTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionOutputTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionOutputAudioDelta",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "chat-streaming",
+        "title": "Streaming",
+        "description": "Stream Chat Completions in real time. Receive chunks of completions\nreturned from the model using server-sent events.\n[Learn more](https://developers.openai.com/api/docs/guides/streaming-responses).\n",
+        "navigationGroup": "chat",
+        "sections": [
+          {
+            "type": "object",
+            "key": "CreateChatCompletionStreamResponse",
+            "path": "streaming"
+          }
+        ]
+      },
+      {
+        "id": "assistants-streaming",
+        "title": "Streaming",
+        "beta": true,
+        "description": "Stream the result of executing a Run or resuming a Run after submitting tool outputs.\nYou can stream events from the [Create Thread and Run](https://developers.openai.com/api/docs/assistants/migration),\n[Create Run](https://developers.openai.com/api/docs/assistants/migration), and [Submit Tool Outputs](https://developers.openai.com/api/docs/assistants/migration)\nendpoints by passing `\"stream\": true`. The response will be a [Server-Sent events](https://html.spec.whatwg.org/multipage/server-sent-events.html#server-sent-events) stream.\nOur Node and Python SDKs provide helpful utilities to make streaming easy. Reference the\n[Assistants API quickstart](https://developers.openai.com/api/docs/assistants/migration) to learn more.\n",
+        "navigationGroup": "assistants",
+        "sections": [
+          {
+            "type": "object",
+            "key": "AssistantStreamEvent",
+            "path": "events"
+          }
+        ]
+      },
+      {
+        "id": "realtime-beta-client-events",
+        "title": "Realtime Beta client events",
+        "description": "These are events that the OpenAI Realtime WebSocket server will accept from the client.\n",
+        "navigationGroup": "legacy",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventSessionUpdate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventInputAudioBufferAppend",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventInputAudioBufferCommit",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventInputAudioBufferClear",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventConversationItemCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventConversationItemRetrieve",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventConversationItemTruncate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventConversationItemDelete",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventResponseCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventResponseCancel",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventTranscriptionSessionUpdate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventOutputAudioBufferClear",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-beta-server-events",
+        "title": "Realtime Beta server events",
+        "description": "These are events emitted from the OpenAI Realtime WebSocket server to the client.\n",
+        "navigationGroup": "legacy",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventError",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventSessionCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventTranscriptionSessionCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventTranscriptionSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemRetrieved",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemInputAudioTranscriptionCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemInputAudioTranscriptionDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemInputAudioTranscriptionSegment",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemInputAudioTranscriptionFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemTruncated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemDeleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventInputAudioBufferCommitted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventInputAudioBufferCleared",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventInputAudioBufferSpeechStarted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventInputAudioBufferSpeechStopped",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferTimeoutTriggered",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseOutputItemAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseOutputItemDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseContentPartAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseContentPartDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseTextDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseTextDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseAudioTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseAudioTranscriptDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseAudioDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseAudioDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseFunctionCallArgumentsDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseFunctionCallArgumentsDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallArgumentsDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallArgumentsDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallInProgress",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventMCPListToolsInProgress",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventMCPListToolsCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventMCPListToolsFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventRateLimitsUpdated",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "live-client-events",
+        "title": "Client events",
+        "description": "Initialize a primary WebSocket with session.start and wait for session.started before sending other events. WebRTC creation starts the session for you. Start with the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) to design frontend instructions and delegation policy; see [backend prompting](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt) for tools and business rules.",
+        "navigationGroup": "live",
+        "sections": [
+          {
+            "type": "object",
+            "key": "LiveSessionStartEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveForkSessionStartEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionUpdateParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioAppendEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioMuteParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioUnmuteParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInstructionsAppendParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveThinkingAppendParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveCommentaryAppendParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveResponseItemCreateParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveResponseCreateParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionCloseParam",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "live-server-events",
+        "title": "Server events",
+        "description": "Live server events. Responses delegation lifecycle events arrive inside response.event, not as top-level response events. Start with the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) to design frontend instructions and delegation policy; see [backend prompting](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt) for tools and business rules.",
+        "navigationGroup": "live",
+        "sections": [
+          {
+            "type": "object",
+            "key": "LiveSessionStarted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioMuted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioUnmuted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInstructionsAppended",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveThinkingAppended",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveCommentaryAppended",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveOutputAudioDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveOutputTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveDelegationCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveResponseEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionUsageUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionClosed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveErrorEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInfoEvent",
+            "path": "<auto>"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/contracts/agents-api/runtime.openapi.yaml b/contracts/agents-api/runtime.openapi.yaml
index fc109bc6f..8e1ac37a7 100644
--- a/contracts/agents-api/runtime.openapi.yaml
+++ b/contracts/agents-api/runtime.openapi.yaml
@@ -151,13 +151,17 @@ definitions:
         x-nullable: true
       message:
         type: string
+      misalignment:
+        type: object
       param:
         type: string
         x-nullable: true
       type:
         type: string
     required:
+      - code
       - message
+      - param
       - type
     type: object
   v1.ErrorResponse:
diff --git a/contracts/agents-api/upstream-fields.json b/contracts/agents-api/upstream-fields.json
deleted file mode 100644
index f1668c995..000000000
--- a/contracts/agents-api/upstream-fields.json
+++ /dev/null
@@ -1,2301 +0,0 @@
-{
-  "sdk_version": "3.13.0",
-  "commit": "d7c41efee1b0802b79f3f88a678ef2052b06e9ce",
-  "generator": "scripts/extract-agents-api-upstream.py",
-  "operations": {
-    "DELETE /agents/environments/templates/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.environments.environment_template_deleted.EnvironmentTemplateDeleted"
-      ]
-    },
-    "DELETE /agents/sessions/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agent_session_deleted.AgentSessionDeleted"
-      ]
-    },
-    "DELETE /agents/sessions/{}/artifacts/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.sessions.session_artifact_deleted.SessionArtifactDeleted"
-      ]
-    },
-    "DELETE /agents/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agent_deleted.AgentDeleted"
-      ]
-    },
-    "DELETE /files/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "file_deleted.FileDeleted"
-      ]
-    },
-    "DELETE /skills/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "deleted_skill.DeletedSkill"
-      ]
-    },
-    "DELETE /skills/{}/versions/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "skills.deleted_skill_version.DeletedSkillVersion"
-      ]
-    },
-    "DELETE /vaults/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.vault_deleted.VaultDeleted"
-      ]
-    },
-    "DELETE /vaults/{}/credentials/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.vaults.credential_deleted.CredentialDeleted"
-      ]
-    },
-    "GET /agents": {
-      "request": [],
-      "query": [
-        "beta.agent_list_params.AgentListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agent.Agent]"
-      ]
-    },
-    "GET /agents/environments/templates": {
-      "request": [],
-      "query": [
-        "beta.agents.environments.template_list_params.TemplateListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agents.environments.environment_template.EnvironmentTemplate]"
-      ]
-    },
-    "GET /agents/environments/templates/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.environments.environment_template.EnvironmentTemplate"
-      ]
-    },
-    "GET /agents/environments/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.environment_info.EnvironmentInfo"
-      ]
-    },
-    "GET /agents/environments/{}/files": {
-      "request": [],
-      "query": [
-        "beta.agents.environments.file_list_params.FileListParams"
-      ],
-      "response": [
-        "pagination.SyncTokenPage[beta.agents.environments.environment_file.EnvironmentFile]"
-      ]
-    },
-    "GET /agents/sessions": {
-      "request": [],
-      "query": [
-        "beta.agents.session_list_params.SessionListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agent_session.AgentSession]"
-      ]
-    },
-    "GET /agents/sessions/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agent_session.AgentSession"
-      ]
-    },
-    "GET /agents/sessions/{}/artifacts": {
-      "request": [],
-      "query": [
-        "beta.agents.sessions.artifact_list_params.ArtifactListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agents.sessions.session_artifact.SessionArtifact]"
-      ]
-    },
-    "GET /agents/sessions/{}/artifacts/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.sessions.session_artifact.SessionArtifact"
-      ]
-    },
-    "GET /agents/sessions/{}/artifacts/{}/content": {
-      "request": [],
-      "query": [],
-      "response": []
-    },
-    "GET /agents/sessions/{}/events": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agent_output_command_execution_output_delta_event.AgentOutputCommandExecutionOutputDeltaEvent",
-        "beta.agent_session_created_event.AgentSessionCreatedEvent",
-        "beta.agent_session_environment_connected_event.AgentSessionEnvironmentConnectedEvent",
-        "beta.agent_session_environment_disconnected_event.AgentSessionEnvironmentDisconnectedEvent",
-        "beta.agent_session_environment_failed_event.AgentSessionEnvironmentFailedEvent",
-        "beta.agent_session_environment_pending_event.AgentSessionEnvironmentPendingEvent",
-        "beta.agent_session_environment_ready_event.AgentSessionEnvironmentReadyEvent",
-        "beta.agent_session_error_event.AgentSessionErrorEvent",
-        "beta.agent_session_failed_event.AgentSessionFailedEvent",
-        "beta.agent_session_idle_event.AgentSessionIdleEvent",
-        "beta.agent_session_in_progress_event.AgentSessionInProgressEvent",
-        "beta.agent_session_requires_action_event.AgentSessionRequiresActionEvent",
-        "beta.agent_session_subagent_active_event.AgentSessionSubagentActiveEvent",
-        "beta.agent_session_subagent_closed_event.AgentSessionSubagentClosedEvent",
-        "beta.agent_session_subagent_created_event.AgentSessionSubagentCreatedEvent",
-        "beta.agent_session_turn_cancelled_event.AgentSessionTurnCancelledEvent",
-        "beta.agent_session_turn_completed_event.AgentSessionTurnCompletedEvent",
-        "beta.agent_session_turn_content_part_added_event.AgentSessionTurnContentPartAddedEvent",
-        "beta.agent_session_turn_content_part_done_event.AgentSessionTurnContentPartDoneEvent",
-        "beta.agent_session_turn_created_event.AgentSessionTurnCreatedEvent",
-        "beta.agent_session_turn_failed_event.AgentSessionTurnFailedEvent",
-        "beta.agent_session_turn_in_progress_event.AgentSessionTurnInProgressEvent",
-        "beta.agent_session_turn_item_added_event.AgentSessionTurnItemAddedEvent",
-        "beta.agent_session_turn_item_done_event.AgentSessionTurnItemDoneEvent",
-        "beta.agent_session_turn_output_text_delta_event.AgentSessionTurnOutputTextDeltaEvent",
-        "beta.agent_session_turn_output_text_done_event.AgentSessionTurnOutputTextDoneEvent",
-        "beta.agent_session_turn_reasoning_summary_part_added_event.AgentSessionTurnReasoningSummaryPartAddedEvent",
-        "beta.agent_session_turn_reasoning_summary_part_done_event.AgentSessionTurnReasoningSummaryPartDoneEvent",
-        "beta.agent_session_turn_reasoning_summary_text_delta_event.AgentSessionTurnReasoningSummaryTextDeltaEvent",
-        "beta.agent_session_turn_reasoning_summary_text_done_event.AgentSessionTurnReasoningSummaryTextDoneEvent"
-      ]
-    },
-    "GET /agents/sessions/{}/items": {
-      "request": [],
-      "query": [
-        "beta.agents.sessions.item_list_params.ItemListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agent_close_subagent_call_item.AgentCloseSubagentCallItem | beta.agent_command_execution_item.AgentCommandExecutionItem | beta.agent_create_subagent_call_item.AgentCreateSubagentCallItem | beta.agent_function_call_item.AgentFunctionCallItem | beta.agent_interrupt_subagent_call_item.AgentInterruptSubagentCallItem | beta.agent_mcp_call_item.AgentMcpCallItem | beta.agent_reasoning_item.AgentReasoningItem | beta.agent_resume_subagent_call_item.AgentResumeSubagentCallItem | beta.agent_send_subagent_input_call_item.AgentSendSubagentInputCallItem | beta.agent_session_item.AgentMessageItemResource | beta.agent_session_item.FunctionCallOutputItemResource | beta.agent_session_message.AgentSessionMessage | beta.agent_wait_for_subagents_call_item.AgentWaitForSubagentsCallItem | beta.agent_web_search_call_item.AgentWebSearchCallItem]"
-      ]
-    },
-    "GET /agents/sessions/{}/subagents": {
-      "request": [],
-      "query": [
-        "beta.agents.sessions.subagent_list_params.SubagentListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.subagent.Subagent]"
-      ]
-    },
-    "GET /agents/sessions/{}/subagents/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.subagent.Subagent"
-      ]
-    },
-    "GET /agents/sessions/{}/subagents/{}/items": {
-      "request": [],
-      "query": [
-        "beta.agents.sessions.subagents.item_list_params.ItemListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agent_close_subagent_call_item.AgentCloseSubagentCallItem | beta.agent_command_execution_item.AgentCommandExecutionItem | beta.agent_create_subagent_call_item.AgentCreateSubagentCallItem | beta.agent_function_call_item.AgentFunctionCallItem | beta.agent_interrupt_subagent_call_item.AgentInterruptSubagentCallItem | beta.agent_mcp_call_item.AgentMcpCallItem | beta.agent_reasoning_item.AgentReasoningItem | beta.agent_resume_subagent_call_item.AgentResumeSubagentCallItem | beta.agent_send_subagent_input_call_item.AgentSendSubagentInputCallItem | beta.agent_session_item.AgentMessageItemResource | beta.agent_session_item.FunctionCallOutputItemResource | beta.agent_session_message.AgentSessionMessage | beta.agent_wait_for_subagents_call_item.AgentWaitForSubagentsCallItem | beta.agent_web_search_call_item.AgentWebSearchCallItem]"
-      ]
-    },
-    "GET /agents/sessions/{}/subagents/{}/turns": {
-      "request": [],
-      "query": [
-        "beta.agents.sessions.subagents.turn_list_params.TurnListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agents.sessions.turn.Turn]"
-      ]
-    },
-    "GET /agents/sessions/{}/subagents/{}/turns/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.sessions.turn.Turn"
-      ]
-    },
-    "GET /agents/sessions/{}/subagents/{}/turns/{}/items": {
-      "request": [],
-      "query": [
-        "beta.agents.sessions.subagents.turns.item_list_params.ItemListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agent_close_subagent_call_item.AgentCloseSubagentCallItem | beta.agent_command_execution_item.AgentCommandExecutionItem | beta.agent_create_subagent_call_item.AgentCreateSubagentCallItem | beta.agent_function_call_item.AgentFunctionCallItem | beta.agent_interrupt_subagent_call_item.AgentInterruptSubagentCallItem | beta.agent_mcp_call_item.AgentMcpCallItem | beta.agent_reasoning_item.AgentReasoningItem | beta.agent_resume_subagent_call_item.AgentResumeSubagentCallItem | beta.agent_send_subagent_input_call_item.AgentSendSubagentInputCallItem | beta.agent_session_item.AgentMessageItemResource | beta.agent_session_item.FunctionCallOutputItemResource | beta.agent_session_message.AgentSessionMessage | beta.agent_wait_for_subagents_call_item.AgentWaitForSubagentsCallItem | beta.agent_web_search_call_item.AgentWebSearchCallItem]"
-      ]
-    },
-    "GET /agents/sessions/{}/turns": {
-      "request": [],
-      "query": [
-        "beta.agents.sessions.turn_list_params.TurnListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agents.sessions.turn.Turn]"
-      ]
-    },
-    "GET /agents/sessions/{}/turns/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.sessions.turn.Turn"
-      ]
-    },
-    "GET /agents/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agent.Agent"
-      ]
-    },
-    "GET /files": {
-      "request": [],
-      "query": [
-        "file_list_params.FileListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[file_object.FileObject]"
-      ]
-    },
-    "GET /files/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "file_object.FileObject"
-      ]
-    },
-    "GET /files/{}/content": {
-      "request": [],
-      "query": [],
-      "response": []
-    },
-    "GET /skills": {
-      "request": [],
-      "query": [
-        "skill_list_params.SkillListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[skill.Skill]"
-      ]
-    },
-    "GET /skills/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "skill.Skill"
-      ]
-    },
-    "GET /skills/{}/content": {
-      "request": [],
-      "query": [],
-      "response": []
-    },
-    "GET /skills/{}/versions": {
-      "request": [],
-      "query": [
-        "skills.version_list_params.VersionListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[skills.skill_version.SkillVersion]"
-      ]
-    },
-    "GET /skills/{}/versions/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "skills.skill_version.SkillVersion"
-      ]
-    },
-    "GET /skills/{}/versions/{}/content": {
-      "request": [],
-      "query": [],
-      "response": []
-    },
-    "GET /vaults": {
-      "request": [],
-      "query": [
-        "beta.agents.vault_list_params.VaultListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agents.vault.Vault]"
-      ]
-    },
-    "GET /vaults/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.vault.Vault"
-      ]
-    },
-    "GET /vaults/{}/credentials": {
-      "request": [],
-      "query": [
-        "beta.agents.vaults.credential_list_params.CredentialListParams"
-      ],
-      "response": [
-        "pagination.SyncCursorPage[beta.agents.vaults.credential.Credential]"
-      ]
-    },
-    "GET /vaults/{}/credentials/{}": {
-      "request": [],
-      "query": [],
-      "response": [
-        "beta.agents.vaults.credential.Credential"
-      ]
-    },
-    "POST /agents": {
-      "request": [
-        "beta.agent_create_params.AgentCreateParams"
-      ],
-      "query": [],
-      "response": [
-        "beta.agent.Agent"
-      ]
-    },
-    "POST /agents/environments/templates": {
-      "request": [
-        "beta.agents.environments.template_create_params.TemplateCreateParams"
-      ],
-      "query": [],
-      "response": [
-        "beta.agents.environments.environment_template.EnvironmentTemplate"
-      ]
-    },
-    "POST /agents/environments/templates/{}": {
-      "request": [
-        "beta.agents.environments.template_update_params.TemplateUpdateParams"
-      ],
-      "query": [],
-      "response": [
-        "beta.agents.environments.environment_template.EnvironmentTemplate"
-      ]
-    },
-    "POST /agents/environments/{}/files": {
-      "request": [
-        "beta.agents.environments.file_create_params.HostedEnvironmentFileParamFileID",
-        "beta.agents.environments.file_create_params.HostedEnvironmentFileParamInline"
-      ],
-      "query": [],
-      "response": [
-        "beta.agents.environments.environment_file.EnvironmentFile"
-      ]
-    },
-    "POST /agents/sessions": {
-      "request": [
-        "beta.agents.session_create_params.SessionCreateParamsNonStreaming",
-        "beta.agents.session_create_params.SessionCreateParamsStreaming"
-      ],
-      "query": [],
-      "response": [
-        "beta.agent_session.AgentSession"
-      ]
-    },
-    "POST /agents/sessions/{}": {
-      "request": [
-        "beta.agents.session_update_params.SessionUpdateParams"
-      ],
-      "query": [],
-      "response": [
-        "beta.agent_session.AgentSession"
-      ]
-    },
-    "POST /agents/sessions/{}/events": {
-      "request": [
-        "beta.agents.sessions.event_create_params.EventCreateParams"
-      ],
-      "query": [],
-      "response": []
-    },
-    "POST /agents/{}": {
-      "request": [
-        "beta.agent_update_params.AgentUpdateParams"
-      ],
-      "query": [],
-      "response": [
-        "beta.agent.Agent"
-      ]
-    },
-    "POST /files": {
-      "request": [
-        "file_create_params.FileCreateParams"
-      ],
-      "query": [],
-      "response": [
-        "file_object.FileObject"
-      ]
-    },
-    "POST /skills": {
-      "request": [
-        "skill_create_params.SkillCreateParams"
-      ],
-      "query": [],
-      "response": [
-        "skill.Skill"
-      ]
-    },
-    "POST /skills/{}": {
-      "request": [
-        "skill_update_params.SkillUpdateParams"
-      ],
-      "query": [],
-      "response": [
-        "skill.Skill"
-      ]
-    },
-    "POST /skills/{}/versions": {
-      "request": [
-        "skills.version_create_params.VersionCreateParams"
-      ],
-      "query": [],
-      "response": [
-        "skills.skill_version.SkillVersion"
-      ]
-    },
-    "POST /vaults": {
-      "request": [
-        "beta.agents.vault_create_params.VaultCreateParams"
-      ],
-      "query": [],
-      "response": [
-        "beta.agents.vault.Vault"
-      ]
-    },
-    "POST /vaults/{}/credentials": {
-      "request": [
-        "beta.agents.vaults.credential_create_params.CredentialCreateParams"
-      ],
-      "query": [],
-      "response": [
-        "beta.agents.vaults.credential.Credential"
-      ]
-    },
-    "POST /vaults/{}/credentials/{}": {
-      "request": [
-        "beta.agents.vaults.credential_update_params.CredentialUpdateParams"
-      ],
-      "query": [],
-      "response": [
-        "beta.agents.vaults.credential.Credential"
-      ]
-    }
-  },
-  "types": {
-    "beta.agent.Agent": {
-      "created_at": [],
-      "id": [],
-      "instructions": [],
-      "metadata": [],
-      "model": [],
-      "multi_agent": [
-        "beta.multi_agent_config.MultiAgentConfig"
-      ],
-      "name": [],
-      "object": [],
-      "reasoning": [
-        "beta.agent_reasoning.AgentReasoning"
-      ],
-      "service_tier": [],
-      "text": [
-        "beta.agent_text.AgentText"
-      ],
-      "tools": [
-        "beta.persisted_agent_tool.PersistedAgentToolResourceFunction",
-        "beta.persisted_agent_tool.PersistedAgentToolResourceMcp",
-        "beta.persisted_agent_tool.PersistedAgentToolResourceProgrammaticToolCalling",
-        "beta.persisted_agent_tool.PersistedAgentToolResourceToolSearch",
-        "beta.persisted_agent_tool.PersistedAgentToolResourceWebSearch"
-      ],
-      "updated_at": []
-    },
-    "beta.agent_close_subagent_call_item.AgentCloseSubagentCallItem": {
-      "id": [],
-      "recipient_agent_id": [],
-      "sender_agent_id": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_command_execution_item.AgentCommandExecutionItem": {
-      "command": [],
-      "cwd": [],
-      "duration_ms": [],
-      "exit_code": [],
-      "id": [],
-      "output": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_content.EncryptedContentResource": {
-      "encrypted_content": [],
-      "type": []
-    },
-    "beta.agent_create_params.AgentCreateParams": {
-      "instructions": [],
-      "metadata": [],
-      "model": [],
-      "multi_agent": [
-        "beta.multi_agent_config_param.MultiAgentConfigParam"
-      ],
-      "name": [],
-      "reasoning": [
-        "beta.agent_reasoning_param.AgentReasoningParam"
-      ],
-      "service_tier": [],
-      "text": [
-        "beta.agent_text_param.AgentTextParam"
-      ],
-      "tools": [
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamFunction",
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamMcp",
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamProgrammaticToolCalling",
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamToolSearch",
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamWebSearch"
-      ]
-    },
-    "beta.agent_create_subagent_call_item.AgentCreateSubagentCallItem": {
-      "agent_id": [],
-      "content": [
-        "beta.agent_content.EncryptedContentResource",
-        "beta.output_text.OutputText"
-      ],
-      "id": [],
-      "model": [],
-      "reasoning_effort": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_deleted.AgentDeleted": {
-      "deleted": [],
-      "id": [],
-      "object": []
-    },
-    "beta.agent_function_call_item.AgentFunctionCallItem": {
-      "arguments": [],
-      "call_id": [],
-      "id": [],
-      "name": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_interrupt_subagent_call_item.AgentInterruptSubagentCallItem": {
-      "id": [],
-      "recipient_agent_id": [],
-      "sender_agent_id": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_list_params.AgentListParams": {
-      "after": [],
-      "limit": [],
-      "order": []
-    },
-    "beta.agent_mcp_call_item.AgentMcpCallItem": {
-      "arguments": [],
-      "error": [],
-      "id": [],
-      "name": [],
-      "output": [],
-      "server_label": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_output_command_execution_output_delta_event.AgentOutputCommandExecutionOutputDeltaEvent": {
-      "delta": [],
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_reasoning.AgentReasoning": {
-      "effort": [],
-      "summary": []
-    },
-    "beta.agent_reasoning_item.AgentReasoningItem": {
-      "id": [],
-      "status": [],
-      "summary": [
-        "beta.summary_text.SummaryText"
-      ],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_reasoning_param.AgentReasoningParam": {
-      "effort": [],
-      "summary": []
-    },
-    "beta.agent_resume_subagent_call_item.AgentResumeSubagentCallItem": {
-      "id": [],
-      "recipient_agent_id": [],
-      "sender_agent_id": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_send_subagent_input_call_item.AgentSendSubagentInputCallItem": {
-      "content": [
-        "beta.agent_content.EncryptedContentResource",
-        "beta.output_text.OutputText"
-      ],
-      "id": [],
-      "recipient_agent_id": [],
-      "sender_agent_id": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session.Agent": {
-      "id": [],
-      "instructions": [],
-      "model": [],
-      "multi_agent": [
-        "beta.multi_agent_config.MultiAgentConfig"
-      ],
-      "name": [],
-      "reasoning": [
-        "beta.agent_reasoning.AgentReasoning"
-      ],
-      "service_tier": [],
-      "text": [
-        "beta.agent_text.AgentText"
-      ],
-      "tools": [
-        "beta.agent_tool.AgentToolResourceFunction",
-        "beta.agent_tool.AgentToolResourceMcp",
-        "beta.agent_tool.AgentToolResourceProgrammaticToolCalling",
-        "beta.agent_tool.AgentToolResourceWebSearch"
-      ]
-    },
-    "beta.agent_session.AgentSession": {
-      "agent": [
-        "beta.agent_session.Agent"
-      ],
-      "created_at": [],
-      "environment": [
-        "beta.environment.EnvironmentResourceNone",
-        "beta.environment.EnvironmentResourceOpenAIHosted",
-        "beta.environment.EnvironmentResourceSelfHosted"
-      ],
-      "error": [],
-      "id": [],
-      "last_active_at": [],
-      "metadata": [],
-      "object": [],
-      "required_actions": [
-        "beta.agent_session.RequiredActionSessionRequiredActionResourceEnvironmentConnection",
-        "beta.agent_session.RequiredActionSessionRequiredActionResourceFunctionCall"
-      ],
-      "status": [],
-      "usage": [
-        "beta.token_usage.TokenUsage"
-      ],
-      "vault_ids": []
-    },
-    "beta.agent_session.RequiredActionSessionRequiredActionResourceEnvironmentConnection": {
-      "environment_id": [],
-      "type": []
-    },
-    "beta.agent_session.RequiredActionSessionRequiredActionResourceFunctionCall": {
-      "arguments": [],
-      "call_id": [],
-      "name": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_assistant_message.AgentSessionAssistantMessage": {
-      "content": [
-        "beta.output_text.OutputText"
-      ],
-      "id": [],
-      "phase": [],
-      "role": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_created_event.AgentSessionCreatedEvent": {
-      "event_id": [],
-      "session": [
-        "beta.agent_session.AgentSession"
-      ],
-      "type": []
-    },
-    "beta.agent_session_deleted.AgentSessionDeleted": {
-      "deleted": [],
-      "id": [],
-      "object": []
-    },
-    "beta.agent_session_environment_connected_event.AgentSessionEnvironmentConnectedEvent": {
-      "environment": [
-        "beta.agent_session_environment_state.AgentSessionEnvironmentState"
-      ],
-      "event_id": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_environment_disconnected_event.AgentSessionEnvironmentDisconnectedEvent": {
-      "environment": [
-        "beta.agent_session_environment_state.AgentSessionEnvironmentState"
-      ],
-      "event_id": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_environment_failed_event.AgentSessionEnvironmentFailedEvent": {
-      "environment": [
-        "beta.agent_session_environment_state.AgentSessionEnvironmentState"
-      ],
-      "event_id": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_environment_pending_event.AgentSessionEnvironmentPendingEvent": {
-      "environment": [
-        "beta.agent_session_environment_state.AgentSessionEnvironmentState"
-      ],
-      "event_id": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_environment_ready_event.AgentSessionEnvironmentReadyEvent": {
-      "environment": [
-        "beta.agent_session_environment_state.AgentSessionEnvironmentState"
-      ],
-      "event_id": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_environment_state.AgentSessionEnvironmentState": {
-      "error": [
-        "beta.agent_session_environment_state.Error"
-      ],
-      "id": [],
-      "status": [],
-      "type": []
-    },
-    "beta.agent_session_environment_state.Error": {
-      "code": [],
-      "message": [],
-      "type": []
-    },
-    "beta.agent_session_error_event.AgentSessionErrorEvent": {
-      "error": [
-        "beta.session_error.SessionError"
-      ],
-      "event_id": [],
-      "session_id": [],
-      "type": []
-    },
-    "beta.agent_session_failed_event.AgentSessionFailedEvent": {
-      "event_id": [],
-      "session": [
-        "beta.agent_session.AgentSession"
-      ],
-      "type": []
-    },
-    "beta.agent_session_idle_event.AgentSessionIdleEvent": {
-      "event_id": [],
-      "session": [
-        "beta.agent_session.AgentSession"
-      ],
-      "type": []
-    },
-    "beta.agent_session_in_progress_event.AgentSessionInProgressEvent": {
-      "event_id": [],
-      "session": [
-        "beta.agent_session.AgentSession"
-      ],
-      "type": []
-    },
-    "beta.agent_session_input_message_param.AgentSessionInputMessageParam": {
-      "content": [
-        "beta.input_content_param.InputContentParamInputImage",
-        "beta.input_content_param.InputContentParamInputText"
-      ],
-      "role": [],
-      "type": []
-    },
-    "beta.agent_session_input_param.SessionInputParamAgentSessionInputCancel": {
-      "type": []
-    },
-    "beta.agent_session_input_param.SessionInputParamAgentSessionInputMessage": {
-      "input": [
-        "beta.agent_session_input_message_param.AgentSessionInputMessageParam"
-      ],
-      "type": []
-    },
-    "beta.agent_session_input_param.SessionInputParamAgentSessionInputToolResult": {
-      "call_id": [],
-      "error": [],
-      "output": [
-        "beta.input_content_param.InputContentParamInputImage",
-        "beta.input_content_param.InputContentParamInputText"
-      ],
-      "success": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_item.AgentMessageItemResource": {
-      "content": [
-        "beta.agent_content.EncryptedContentResource",
-        "beta.output_text.OutputText"
-      ],
-      "id": [],
-      "recipient_agent_id": [],
-      "sender_agent_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_item.FunctionCallOutputItemResource": {
-      "call_id": [],
-      "error": [],
-      "id": [],
-      "output": [
-        "beta.input_content.InputContentResourceInputImage",
-        "beta.input_content.InputContentResourceInputText"
-      ],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_message.AgentSessionMessage": {
-      "content": [
-        "beta.agent_session_message_content.MessageContentResourceInputImage",
-        "beta.agent_session_message_content.MessageContentResourceInputText",
-        "beta.agent_session_message_content.MessageContentResourceOutputText"
-      ],
-      "id": [],
-      "phase": [],
-      "role": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_message_content.MessageContentResourceInputImage": {
-      "image_url": [],
-      "type": []
-    },
-    "beta.agent_session_message_content.MessageContentResourceInputText": {
-      "text": [],
-      "type": []
-    },
-    "beta.agent_session_message_content.MessageContentResourceOutputText": {
-      "text": [],
-      "type": []
-    },
-    "beta.agent_session_requires_action_event.AgentSessionRequiresActionEvent": {
-      "event_id": [],
-      "session": [
-        "beta.agent_session.AgentSession"
-      ],
-      "type": []
-    },
-    "beta.agent_session_subagent_active_event.AgentSessionSubagentActiveEvent": {
-      "event_id": [],
-      "subagent": [
-        "beta.subagent.Subagent"
-      ],
-      "type": []
-    },
-    "beta.agent_session_subagent_closed_event.AgentSessionSubagentClosedEvent": {
-      "event_id": [],
-      "subagent": [
-        "beta.subagent.Subagent"
-      ],
-      "type": []
-    },
-    "beta.agent_session_subagent_created_event.AgentSessionSubagentCreatedEvent": {
-      "event_id": [],
-      "subagent": [
-        "beta.subagent.Subagent"
-      ],
-      "type": []
-    },
-    "beta.agent_session_turn_cancelled_event.AgentSessionTurnCancelledEvent": {
-      "event_id": [],
-      "session_id": [],
-      "turn": [
-        "beta.agents.sessions.turn.Turn"
-      ],
-      "turn_id": [],
-      "type": [],
-      "usage": [
-        "beta.token_usage.TokenUsage"
-      ]
-    },
-    "beta.agent_session_turn_completed_event.AgentSessionTurnCompletedEvent": {
-      "event_id": [],
-      "session_id": [],
-      "turn": [
-        "beta.agents.sessions.turn.Turn"
-      ],
-      "turn_id": [],
-      "type": [],
-      "usage": [
-        "beta.token_usage.TokenUsage"
-      ]
-    },
-    "beta.agent_session_turn_content_part_added_event.AgentSessionTurnContentPartAddedEvent": {
-      "content_index": [],
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "part": [
-        "beta.output_text.OutputText"
-      ],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_content_part_done_event.AgentSessionTurnContentPartDoneEvent": {
-      "content_index": [],
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "part": [
-        "beta.output_text.OutputText"
-      ],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_created_event.AgentSessionTurnCreatedEvent": {
-      "event_id": [],
-      "session_id": [],
-      "turn": [
-        "beta.agents.sessions.turn.Turn"
-      ],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_failed_event.AgentSessionTurnFailedEvent": {
-      "event_id": [],
-      "session_id": [],
-      "turn": [
-        "beta.agents.sessions.turn.Turn"
-      ],
-      "turn_id": [],
-      "type": [],
-      "usage": [
-        "beta.token_usage.TokenUsage"
-      ]
-    },
-    "beta.agent_session_turn_in_progress_event.AgentSessionTurnInProgressEvent": {
-      "event_id": [],
-      "session_id": [],
-      "turn": [
-        "beta.agents.sessions.turn.Turn"
-      ],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_item_added_event.AgentSessionTurnItemAddedEvent": {
-      "event_id": [],
-      "item": [
-        "beta.agent_close_subagent_call_item.AgentCloseSubagentCallItem",
-        "beta.agent_command_execution_item.AgentCommandExecutionItem",
-        "beta.agent_create_subagent_call_item.AgentCreateSubagentCallItem",
-        "beta.agent_function_call_item.AgentFunctionCallItem",
-        "beta.agent_interrupt_subagent_call_item.AgentInterruptSubagentCallItem",
-        "beta.agent_mcp_call_item.AgentMcpCallItem",
-        "beta.agent_reasoning_item.AgentReasoningItem",
-        "beta.agent_resume_subagent_call_item.AgentResumeSubagentCallItem",
-        "beta.agent_send_subagent_input_call_item.AgentSendSubagentInputCallItem",
-        "beta.agent_session_item.AgentMessageItemResource",
-        "beta.agent_session_item.FunctionCallOutputItemResource",
-        "beta.agent_session_message.AgentSessionMessage",
-        "beta.agent_wait_for_subagents_call_item.AgentWaitForSubagentsCallItem",
-        "beta.agent_web_search_call_item.AgentWebSearchCallItem"
-      ],
-      "output_index": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_item_done_event.AgentSessionTurnItemDoneEvent": {
-      "event_id": [],
-      "item": [
-        "beta.agent_close_subagent_call_item.AgentCloseSubagentCallItem",
-        "beta.agent_command_execution_item.AgentCommandExecutionItem",
-        "beta.agent_create_subagent_call_item.AgentCreateSubagentCallItem",
-        "beta.agent_function_call_item.AgentFunctionCallItem",
-        "beta.agent_interrupt_subagent_call_item.AgentInterruptSubagentCallItem",
-        "beta.agent_mcp_call_item.AgentMcpCallItem",
-        "beta.agent_reasoning_item.AgentReasoningItem",
-        "beta.agent_resume_subagent_call_item.AgentResumeSubagentCallItem",
-        "beta.agent_send_subagent_input_call_item.AgentSendSubagentInputCallItem",
-        "beta.agent_session_assistant_message.AgentSessionAssistantMessage",
-        "beta.agent_wait_for_subagents_call_item.AgentWaitForSubagentsCallItem",
-        "beta.agent_web_search_call_item.AgentWebSearchCallItem"
-      ],
-      "output_index": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_output_text_delta_event.AgentSessionTurnOutputTextDeltaEvent": {
-      "content_index": [],
-      "delta": [],
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "session_id": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_output_text_done_event.AgentSessionTurnOutputTextDoneEvent": {
-      "content_index": [],
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "session_id": [],
-      "text": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_reasoning_summary_part_added_event.AgentSessionTurnReasoningSummaryPartAddedEvent": {
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "part": [
-        "beta.summary_text.SummaryText"
-      ],
-      "session_id": [],
-      "summary_index": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_reasoning_summary_part_done_event.AgentSessionTurnReasoningSummaryPartDoneEvent": {
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "part": [
-        "beta.summary_text.SummaryText"
-      ],
-      "session_id": [],
-      "status": [],
-      "summary_index": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_reasoning_summary_text_delta_event.AgentSessionTurnReasoningSummaryTextDeltaEvent": {
-      "delta": [],
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "session_id": [],
-      "summary_index": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_session_turn_reasoning_summary_text_done_event.AgentSessionTurnReasoningSummaryTextDoneEvent": {
-      "event_id": [],
-      "item_id": [],
-      "output_index": [],
-      "session_id": [],
-      "summary_index": [],
-      "text": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_text.AgentText": {
-      "format": [
-        "beta.text_format.TextFormatResourceJSONSchema",
-        "beta.text_format.TextFormatResourceText"
-      ],
-      "verbosity": []
-    },
-    "beta.agent_text_param.AgentTextParam": {
-      "format": [
-        "beta.text_format_param.TextFormatParamJSONSchema",
-        "beta.text_format_param.TextFormatParamText"
-      ],
-      "verbosity": []
-    },
-    "beta.agent_tool.AgentToolResourceFunction": {
-      "defer_loading": [],
-      "description": [],
-      "name": [],
-      "parameters": [],
-      "type": []
-    },
-    "beta.agent_tool.AgentToolResourceMcp": {
-      "allowed_tools": [],
-      "connection_origin": [],
-      "credential_id": [],
-      "request_metadata": [],
-      "required": [],
-      "server_label": [],
-      "transport": [
-        "beta.mcp_transport.McpTransportResourceHTTP",
-        "beta.mcp_transport.McpTransportResourceStdio"
-      ],
-      "type": []
-    },
-    "beta.agent_tool.AgentToolResourceProgrammaticToolCalling": {
-      "enabled": [],
-      "type": []
-    },
-    "beta.agent_tool.AgentToolResourceWebSearch": {
-      "allowed_domains": [],
-      "context_size": [],
-      "location": [
-        "beta.agent_tool.AgentToolResourceWebSearchLocation"
-      ],
-      "mode": [],
-      "type": []
-    },
-    "beta.agent_tool.AgentToolResourceWebSearchLocation": {
-      "city": [],
-      "country": [],
-      "region": [],
-      "timezone": []
-    },
-    "beta.agent_tool_param.AgentToolConfigParamFunction": {
-      "defer_loading": [],
-      "description": [],
-      "name": [],
-      "parameters": [],
-      "type": []
-    },
-    "beta.agent_tool_param.AgentToolConfigParamMcp": {
-      "allowed_tools": [],
-      "connection_origin": [],
-      "credential_id": [],
-      "request_metadata": [],
-      "required": [],
-      "server_label": [],
-      "transport": [
-        "beta.mcp_transport_param.McpTransportConfigParamHTTP",
-        "beta.mcp_transport_param.McpTransportConfigParamStdio"
-      ],
-      "type": []
-    },
-    "beta.agent_tool_param.AgentToolConfigParamProgrammaticToolCalling": {
-      "enabled": [],
-      "type": []
-    },
-    "beta.agent_tool_param.AgentToolConfigParamToolSearch": {
-      "type": []
-    },
-    "beta.agent_tool_param.AgentToolConfigParamWebSearch": {
-      "allowed_domains": [],
-      "context_size": [],
-      "location": [
-        "beta.agent_tool_param.AgentToolConfigParamWebSearchLocation"
-      ],
-      "mode": [],
-      "type": []
-    },
-    "beta.agent_tool_param.AgentToolConfigParamWebSearchLocation": {
-      "city": [],
-      "country": [],
-      "region": [],
-      "timezone": []
-    },
-    "beta.agent_update_params.AgentUpdateParams": {
-      "instructions": [],
-      "metadata": [],
-      "model": [],
-      "multi_agent": [
-        "beta.multi_agent_config_param.MultiAgentConfigParam"
-      ],
-      "name": [],
-      "reasoning": [
-        "beta.agent_reasoning_param.AgentReasoningParam"
-      ],
-      "service_tier": [],
-      "text": [
-        "beta.agent_text_param.AgentTextParam"
-      ],
-      "tools": [
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamFunction",
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamMcp",
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamProgrammaticToolCalling",
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamToolSearch",
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamWebSearch"
-      ]
-    },
-    "beta.agent_wait_for_subagents_call_item.AgentWaitForSubagentsCallItem": {
-      "id": [],
-      "recipient_agent_ids": [],
-      "sender_agent_id": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agent_web_search_call_item.AgentWebSearchCallItem": {
-      "action": [
-        "beta.web_search_action.WebSearchActionResourceFindInPage",
-        "beta.web_search_action.WebSearchActionResourceOpenPage",
-        "beta.web_search_action.WebSearchActionResourceOther",
-        "beta.web_search_action.WebSearchActionResourceSearch"
-      ],
-      "id": [],
-      "status": [],
-      "turn_id": [],
-      "type": []
-    },
-    "beta.agents.environment_info.EnvironmentInfo": {
-      "files": [
-        "beta.hosted_environment_file.HostedEnvironmentFileResourceInline",
-        "beta.hosted_environment_file_id.HostedEnvironmentFileID"
-      ],
-      "id": [],
-      "object": [],
-      "plugins": [
-        "beta.hosted_plugin.HostedPlugin"
-      ],
-      "skills": [
-        "beta.hosted_skill.HostedSkillResourceInline",
-        "beta.hosted_skill_reference.HostedSkillReference"
-      ],
-      "status": [],
-      "type": []
-    },
-    "beta.agents.environments.environment_file.EnvironmentFile": {
-      "environment_id": [],
-      "object": [],
-      "path": [],
-      "size_bytes": []
-    },
-    "beta.agents.environments.environment_template.EnvironmentTemplate": {
-      "capability_directories": [],
-      "created_at": [],
-      "files": [
-        "beta.agents.environments.environment_template.FileHostedTemplateFileResourceFileID",
-        "beta.agents.environments.environment_template.FileHostedTemplateFileResourceInline"
-      ],
-      "id": [],
-      "name": [],
-      "network": [
-        "beta.agents.environments.environment_template.Network"
-      ],
-      "object": [],
-      "packages": [
-        "beta.agents.environments.environment_template.Packages"
-      ],
-      "plugins": [
-        "beta.hosted_plugin.HostedPlugin"
-      ],
-      "skills": [
-        "beta.agents.environments.environment_template.SkillHostedTemplateSkillResourceInline",
-        "beta.agents.environments.environment_template.SkillHostedTemplateSkillResourceSkillReference"
-      ],
-      "updated_at": []
-    },
-    "beta.agents.environments.environment_template.FileHostedTemplateFileResourceFileID": {
-      "file_id": [],
-      "path": [],
-      "type": []
-    },
-    "beta.agents.environments.environment_template.FileHostedTemplateFileResourceInline": {
-      "path": [],
-      "size_bytes": [],
-      "type": []
-    },
-    "beta.agents.environments.environment_template.Network": {
-      "access": [],
-      "allowed_domains": []
-    },
-    "beta.agents.environments.environment_template.Packages": {
-      "npm": [],
-      "python": [],
-      "system": []
-    },
-    "beta.agents.environments.environment_template.SkillHostedTemplateSkillResourceInline": {
-      "description": [],
-      "name": [],
-      "type": []
-    },
-    "beta.agents.environments.environment_template.SkillHostedTemplateSkillResourceSkillReference": {
-      "skill_id": [],
-      "type": [],
-      "version": []
-    },
-    "beta.agents.environments.environment_template_deleted.EnvironmentTemplateDeleted": {
-      "deleted": [],
-      "id": [],
-      "object": []
-    },
-    "beta.agents.environments.file_create_params.HostedEnvironmentFileParamFileID": {
-      "file_id": [],
-      "path": [],
-      "type": []
-    },
-    "beta.agents.environments.file_create_params.HostedEnvironmentFileParamInline": {
-      "data": [],
-      "path": [],
-      "type": []
-    },
-    "beta.agents.environments.file_list_params.FileListParams": {
-      "limit": [],
-      "order": [],
-      "page": [],
-      "path": []
-    },
-    "beta.agents.environments.template_create_params.Network": {
-      "access": [],
-      "allowed_domains": []
-    },
-    "beta.agents.environments.template_create_params.Packages": {
-      "npm": [],
-      "python": [],
-      "system": []
-    },
-    "beta.agents.environments.template_create_params.TemplateCreateParams": {
-      "capability_directories": [],
-      "env": [],
-      "files": [
-        "beta.hosted_environment_file_param.HostedEnvironmentFileParamFileID",
-        "beta.hosted_environment_file_param.HostedEnvironmentFileParamInline"
-      ],
-      "name": [],
-      "network": [
-        "beta.agents.environments.template_create_params.Network"
-      ],
-      "packages": [
-        "beta.agents.environments.template_create_params.Packages"
-      ],
-      "plugins": [
-        "beta.hosted_plugin_param.HostedPluginParam"
-      ],
-      "setup_commands": [
-        "beta.setup_command_param.SetupCommandParam"
-      ],
-      "skills": [
-        "beta.hosted_skill_param.HostedSkillParamInline",
-        "beta.hosted_skill_param.HostedSkillParamSkillReference"
-      ]
-    },
-    "beta.agents.environments.template_list_params.TemplateListParams": {
-      "after": [],
-      "limit": [],
-      "order": []
-    },
-    "beta.agents.environments.template_update_params.Network": {
-      "access": [],
-      "allowed_domains": []
-    },
-    "beta.agents.environments.template_update_params.Packages": {
-      "npm": [],
-      "python": [],
-      "system": []
-    },
-    "beta.agents.environments.template_update_params.TemplateUpdateParams": {
-      "capability_directories": [],
-      "env": [],
-      "files": [
-        "beta.hosted_environment_file_param.HostedEnvironmentFileParamFileID",
-        "beta.hosted_environment_file_param.HostedEnvironmentFileParamInline"
-      ],
-      "name": [],
-      "network": [
-        "beta.agents.environments.template_update_params.Network"
-      ],
-      "packages": [
-        "beta.agents.environments.template_update_params.Packages"
-      ],
-      "plugins": [
-        "beta.hosted_plugin_param.HostedPluginParam"
-      ],
-      "setup_commands": [
-        "beta.setup_command_param.SetupCommandParam"
-      ],
-      "skills": [
-        "beta.hosted_skill_param.HostedSkillParamInline",
-        "beta.hosted_skill_param.HostedSkillParamSkillReference"
-      ]
-    },
-    "beta.agents.session_create_params.Agent": {
-      "instructions": [],
-      "model": [],
-      "multi_agent": [
-        "beta.multi_agent_config_param.MultiAgentConfigParam"
-      ],
-      "reasoning": [
-        "beta.agent_reasoning_param.AgentReasoningParam"
-      ],
-      "service_tier": [],
-      "text": [
-        "beta.agent_text_param.AgentTextParam"
-      ],
-      "tools": [
-        "beta.agent_tool_param.AgentToolConfigParamFunction",
-        "beta.agent_tool_param.AgentToolConfigParamMcp",
-        "beta.agent_tool_param.AgentToolConfigParamProgrammaticToolCalling",
-        "beta.agent_tool_param.AgentToolConfigParamToolSearch",
-        "beta.agent_tool_param.AgentToolConfigParamWebSearch"
-      ]
-    },
-    "beta.agents.session_create_params.SessionCreateParamsNonStreaming": {
-      "agent": [
-        "beta.agents.session_create_params.Agent"
-      ],
-      "agent_id": [],
-      "environment": [
-        "beta.environment_param.EnvironmentParamNone",
-        "beta.environment_param.EnvironmentParamOpenAIHosted",
-        "beta.environment_param.EnvironmentParamSelfHosted"
-      ],
-      "input": [
-        "beta.agent_session_input_message_param.AgentSessionInputMessageParam"
-      ],
-      "metadata": [],
-      "stream": [],
-      "vault_ids": []
-    },
-    "beta.agents.session_create_params.SessionCreateParamsStreaming": {
-      "agent": [
-        "beta.agents.session_create_params.Agent"
-      ],
-      "agent_id": [],
-      "environment": [
-        "beta.environment_param.EnvironmentParamNone",
-        "beta.environment_param.EnvironmentParamOpenAIHosted",
-        "beta.environment_param.EnvironmentParamSelfHosted"
-      ],
-      "input": [
-        "beta.agent_session_input_message_param.AgentSessionInputMessageParam"
-      ],
-      "metadata": [],
-      "stream": [],
-      "vault_ids": []
-    },
-    "beta.agents.session_list_params.SessionListParams": {
-      "after": [],
-      "agent_id": [],
-      "limit": [],
-      "order": []
-    },
-    "beta.agents.session_update_params.SessionUpdateParams": {
-      "metadata": []
-    },
-    "beta.agents.sessions.artifact_list_params.ArtifactListParams": {
-      "after": [],
-      "environment_id": [],
-      "limit": [],
-      "order": []
-    },
-    "beta.agents.sessions.event_create_params.EventCreateParams": {
-      "Idempotency-Key": [],
-      "events": [
-        "beta.agent_session_input_param.SessionInputParamAgentSessionInputCancel",
-        "beta.agent_session_input_param.SessionInputParamAgentSessionInputMessage",
-        "beta.agent_session_input_param.SessionInputParamAgentSessionInputToolResult"
-      ]
-    },
-    "beta.agents.sessions.item_list_params.ItemListParams": {
-      "after": [],
-      "limit": [],
-      "order": []
-    },
-    "beta.agents.sessions.session_artifact.SessionArtifact": {
-      "created_at": [],
-      "environment_id": [],
-      "id": [],
-      "object": [],
-      "path": [],
-      "session_id": [],
-      "size_bytes": [],
-      "turn_id": []
-    },
-    "beta.agents.sessions.session_artifact_deleted.SessionArtifactDeleted": {
-      "deleted": [],
-      "id": [],
-      "object": []
-    },
-    "beta.agents.sessions.subagent_list_params.SubagentListParams": {
-      "after": [],
-      "limit": [],
-      "order": []
-    },
-    "beta.agents.sessions.subagents.item_list_params.ItemListParams": {
-      "after": [],
-      "limit": [],
-      "order": [],
-      "session_id": []
-    },
-    "beta.agents.sessions.subagents.turn_list_params.TurnListParams": {
-      "after": [],
-      "limit": [],
-      "order": [],
-      "session_id": []
-    },
-    "beta.agents.sessions.subagents.turns.item_list_params.ItemListParams": {
-      "after": [],
-      "limit": [],
-      "order": [],
-      "session_id": [],
-      "subagent_id": []
-    },
-    "beta.agents.sessions.turn.Turn": {
-      "agent_id": [],
-      "completed_at": [],
-      "created_at": [],
-      "error": [
-        "beta.session_turn_error.SessionTurnError"
-      ],
-      "id": [],
-      "object": [],
-      "session_id": [],
-      "started_at": [],
-      "status": [],
-      "subagent_id": [],
-      "usage": [
-        "beta.token_usage.TokenUsage"
-      ]
-    },
-    "beta.agents.sessions.turn_list_params.TurnListParams": {
-      "after": [],
-      "limit": [],
-      "order": []
-    },
-    "beta.agents.vault.Vault": {
-      "created_at": [],
-      "id": [],
-      "metadata": [],
-      "name": [],
-      "object": []
-    },
-    "beta.agents.vault_create_params.VaultCreateParams": {
-      "metadata": [],
-      "name": []
-    },
-    "beta.agents.vault_deleted.VaultDeleted": {
-      "deleted": [],
-      "id": [],
-      "object": []
-    },
-    "beta.agents.vault_list_params.VaultListParams": {
-      "after": [],
-      "limit": [],
-      "order": [],
-      "status": []
-    },
-    "beta.agents.vaults.credential.Credential": {
-      "auth": [
-        "beta.agents.vaults.credential_auth.VaultCredentialAuthResourceMcpOauth",
-        "beta.agents.vaults.credential_auth.VaultCredentialAuthResourceStaticBearer"
-      ],
-      "created_at": [],
-      "id": [],
-      "name": [],
-      "object": [],
-      "updated_at": [],
-      "vault_id": []
-    },
-    "beta.agents.vaults.credential_auth.VaultCredentialAuthResourceMcpOauth": {
-      "expires_at": [],
-      "mcp_server_url": [],
-      "refresh": [
-        "beta.agents.vaults.credential_auth.VaultCredentialAuthResourceMcpOauthRefresh"
-      ],
-      "type": []
-    },
-    "beta.agents.vaults.credential_auth.VaultCredentialAuthResourceMcpOauthRefresh": {
-      "client_id": [],
-      "resource": [],
-      "scope": [],
-      "token_endpoint": [],
-      "token_endpoint_auth": [
-        "beta.agents.vaults.mcp_oauth_token_endpoint_auth.McpOauthTokenEndpointAuthResourceClientSecretBasic",
-        "beta.agents.vaults.mcp_oauth_token_endpoint_auth.McpOauthTokenEndpointAuthResourceClientSecretPost",
-        "beta.agents.vaults.mcp_oauth_token_endpoint_auth.McpOauthTokenEndpointAuthResourceNone"
-      ]
-    },
-    "beta.agents.vaults.credential_auth.VaultCredentialAuthResourceStaticBearer": {
-      "mcp_server_url": [],
-      "type": []
-    },
-    "beta.agents.vaults.credential_auth_create_param.CreateVaultCredentialAuthParamMcpOauth": {
-      "access_token": [],
-      "expires_at": [],
-      "mcp_server_url": [],
-      "refresh": [
-        "beta.agents.vaults.credential_auth_create_param.CreateVaultCredentialAuthParamMcpOauthRefresh"
-      ],
-      "type": []
-    },
-    "beta.agents.vaults.credential_auth_create_param.CreateVaultCredentialAuthParamMcpOauthRefresh": {
-      "client_id": [],
-      "refresh_token": [],
-      "resource": [],
-      "scope": [],
-      "token_endpoint": [],
-      "token_endpoint_auth": [
-        "beta.agents.vaults.mcp_oauth_token_endpoint_auth_create_param.CreateMcpOauthTokenEndpointAuthParamClientSecretBasic",
-        "beta.agents.vaults.mcp_oauth_token_endpoint_auth_create_param.CreateMcpOauthTokenEndpointAuthParamClientSecretPost",
-        "beta.agents.vaults.mcp_oauth_token_endpoint_auth_create_param.CreateMcpOauthTokenEndpointAuthParamNone"
-      ]
-    },
-    "beta.agents.vaults.credential_auth_create_param.CreateVaultCredentialAuthParamStaticBearer": {
-      "mcp_server_url": [],
-      "token": [],
-      "type": []
-    },
-    "beta.agents.vaults.credential_auth_rotate_param.RotateVaultCredentialAuthParamMcpOauth": {
-      "access_token": [],
-      "expires_at": [],
-      "refresh": [
-        "beta.agents.vaults.credential_auth_rotate_param.RotateVaultCredentialAuthParamMcpOauthRefresh"
-      ],
-      "type": []
-    },
-    "beta.agents.vaults.credential_auth_rotate_param.RotateVaultCredentialAuthParamMcpOauthRefresh": {
-      "refresh_token": [],
-      "scope": [],
-      "token_endpoint_auth": [
-        "beta.agents.vaults.mcp_oauth_token_endpoint_auth_rotate_param.RotateMcpOauthTokenEndpointAuthParamClientSecretBasic",
-        "beta.agents.vaults.mcp_oauth_token_endpoint_auth_rotate_param.RotateMcpOauthTokenEndpointAuthParamClientSecretPost"
-      ]
-    },
-    "beta.agents.vaults.credential_auth_rotate_param.RotateVaultCredentialAuthParamStaticBearer": {
-      "token": [],
-      "type": []
-    },
-    "beta.agents.vaults.credential_create_params.CredentialCreateParams": {
-      "auth": [
-        "beta.agents.vaults.credential_auth_create_param.CreateVaultCredentialAuthParamMcpOauth",
-        "beta.agents.vaults.credential_auth_create_param.CreateVaultCredentialAuthParamStaticBearer"
-      ],
-      "name": []
-    },
-    "beta.agents.vaults.credential_deleted.CredentialDeleted": {
-      "deleted": [],
-      "id": [],
-      "object": []
-    },
-    "beta.agents.vaults.credential_list_params.CredentialListParams": {
-      "after": [],
-      "limit": [],
-      "order": [],
-      "status": []
-    },
-    "beta.agents.vaults.credential_update_params.CredentialUpdateParams": {
-      "auth": [
-        "beta.agents.vaults.credential_auth_rotate_param.RotateVaultCredentialAuthParamMcpOauth",
-        "beta.agents.vaults.credential_auth_rotate_param.RotateVaultCredentialAuthParamStaticBearer"
-      ],
-      "vault_id": []
-    },
-    "beta.agents.vaults.mcp_oauth_token_endpoint_auth.McpOauthTokenEndpointAuthResourceClientSecretBasic": {
-      "type": []
-    },
-    "beta.agents.vaults.mcp_oauth_token_endpoint_auth.McpOauthTokenEndpointAuthResourceClientSecretPost": {
-      "type": []
-    },
-    "beta.agents.vaults.mcp_oauth_token_endpoint_auth.McpOauthTokenEndpointAuthResourceNone": {
-      "type": []
-    },
-    "beta.agents.vaults.mcp_oauth_token_endpoint_auth_create_param.CreateMcpOauthTokenEndpointAuthParamClientSecretBasic": {
-      "client_secret": [],
-      "type": []
-    },
-    "beta.agents.vaults.mcp_oauth_token_endpoint_auth_create_param.CreateMcpOauthTokenEndpointAuthParamClientSecretPost": {
-      "client_secret": [],
-      "type": []
-    },
-    "beta.agents.vaults.mcp_oauth_token_endpoint_auth_create_param.CreateMcpOauthTokenEndpointAuthParamNone": {
-      "type": []
-    },
-    "beta.agents.vaults.mcp_oauth_token_endpoint_auth_rotate_param.RotateMcpOauthTokenEndpointAuthParamClientSecretBasic": {
-      "client_secret": [],
-      "type": []
-    },
-    "beta.agents.vaults.mcp_oauth_token_endpoint_auth_rotate_param.RotateMcpOauthTokenEndpointAuthParamClientSecretPost": {
-      "client_secret": [],
-      "type": []
-    },
-    "beta.environment.EnvironmentResourceNone": {
-      "type": []
-    },
-    "beta.environment.EnvironmentResourceOpenAIHosted": {
-      "capability_directories": [],
-      "files": [
-        "beta.hosted_environment_file.HostedEnvironmentFileResourceInline",
-        "beta.hosted_environment_file_id.HostedEnvironmentFileID"
-      ],
-      "id": [],
-      "network": [
-        "beta.environment.EnvironmentResourceOpenAIHostedNetwork"
-      ],
-      "packages": [
-        "beta.environment.EnvironmentResourceOpenAIHostedPackages"
-      ],
-      "plugins": [
-        "beta.hosted_plugin.HostedPlugin"
-      ],
-      "skills": [
-        "beta.hosted_skill.HostedSkillResourceInline",
-        "beta.hosted_skill_reference.HostedSkillReference"
-      ],
-      "type": []
-    },
-    "beta.environment.EnvironmentResourceOpenAIHostedNetwork": {
-      "access": [],
-      "allowed_domains": []
-    },
-    "beta.environment.EnvironmentResourceOpenAIHostedPackages": {
-      "npm": [],
-      "python": [],
-      "system": []
-    },
-    "beta.environment.EnvironmentResourceSelfHosted": {
-      "capability_directories": [],
-      "id": [],
-      "remote_url": [],
-      "type": [],
-      "workspace_directory": []
-    },
-    "beta.environment_param.EnvironmentParamNone": {
-      "type": []
-    },
-    "beta.environment_param.EnvironmentParamOpenAIHosted": {
-      "capability_directories": [],
-      "env": [],
-      "environment_template_id": [],
-      "files": [
-        "beta.hosted_environment_file_param.HostedEnvironmentFileParamFileID",
-        "beta.hosted_environment_file_param.HostedEnvironmentFileParamInline"
-      ],
-      "network": [
-        "beta.environment_param.EnvironmentParamOpenAIHostedNetwork"
-      ],
-      "packages": [
-        "beta.environment_param.EnvironmentParamOpenAIHostedPackages"
-      ],
-      "plugins": [
-        "beta.hosted_plugin_param.HostedPluginParam"
-      ],
-      "setup_commands": [
-        "beta.setup_command_param.SetupCommandParam"
-      ],
-      "skills": [
-        "beta.hosted_skill_param.HostedSkillParamInline",
-        "beta.hosted_skill_param.HostedSkillParamSkillReference"
-      ],
-      "type": []
-    },
-    "beta.environment_param.EnvironmentParamOpenAIHostedNetwork": {
-      "access": [],
-      "allowed_domains": []
-    },
-    "beta.environment_param.EnvironmentParamOpenAIHostedPackages": {
-      "npm": [],
-      "python": [],
-      "system": []
-    },
-    "beta.environment_param.EnvironmentParamSelfHosted": {
-      "capability_directories": [],
-      "type": [],
-      "workspace_directory": []
-    },
-    "beta.hosted_environment_file.HostedEnvironmentFileResourceInline": {
-      "id": [],
-      "path": [],
-      "size_bytes": [],
-      "type": []
-    },
-    "beta.hosted_environment_file_id.HostedEnvironmentFileID": {
-      "file_id": [],
-      "id": [],
-      "path": [],
-      "size_bytes": [],
-      "type": []
-    },
-    "beta.hosted_environment_file_param.HostedEnvironmentFileParamFileID": {
-      "file_id": [],
-      "path": [],
-      "type": []
-    },
-    "beta.hosted_environment_file_param.HostedEnvironmentFileParamInline": {
-      "data": [],
-      "path": [],
-      "type": []
-    },
-    "beta.hosted_plugin.HostedPlugin": {
-      "description": [],
-      "name": [],
-      "type": []
-    },
-    "beta.hosted_plugin_param.HostedPluginParam": {
-      "description": [],
-      "name": [],
-      "source": [
-        "beta.inline_capability_source_param.InlineCapabilitySourceParam"
-      ],
-      "type": []
-    },
-    "beta.hosted_skill.HostedSkillResourceInline": {
-      "description": [],
-      "name": [],
-      "type": []
-    },
-    "beta.hosted_skill_param.HostedSkillParamInline": {
-      "description": [],
-      "name": [],
-      "source": [
-        "beta.inline_capability_source_param.InlineCapabilitySourceParam"
-      ],
-      "type": []
-    },
-    "beta.hosted_skill_param.HostedSkillParamSkillReference": {
-      "skill_id": [],
-      "type": [],
-      "version": []
-    },
-    "beta.hosted_skill_reference.HostedSkillReference": {
-      "description": [],
-      "name": [],
-      "skill_id": [],
-      "type": [],
-      "version": []
-    },
-    "beta.inline_capability_source_param.InlineCapabilitySourceParam": {
-      "data": [],
-      "media_type": [],
-      "type": []
-    },
-    "beta.input_content.InputContentResourceInputImage": {
-      "image_url": [],
-      "type": []
-    },
-    "beta.input_content.InputContentResourceInputText": {
-      "text": [],
-      "type": []
-    },
-    "beta.input_content_param.InputContentParamInputImage": {
-      "image_url": [],
-      "type": []
-    },
-    "beta.input_content_param.InputContentParamInputText": {
-      "text": [],
-      "type": []
-    },
-    "beta.mcp_transport.McpTransportResourceHTTP": {
-      "server_url": [],
-      "type": []
-    },
-    "beta.mcp_transport.McpTransportResourceStdio": {
-      "args": [],
-      "command": [],
-      "cwd": [],
-      "env_vars": [],
-      "type": []
-    },
-    "beta.mcp_transport_param.McpTransportConfigParamHTTP": {
-      "authorization": [],
-      "headers": [],
-      "server_url": [],
-      "type": []
-    },
-    "beta.mcp_transport_param.McpTransportConfigParamStdio": {
-      "args": [],
-      "command": [],
-      "cwd": [],
-      "env": [],
-      "env_vars": [],
-      "type": []
-    },
-    "beta.multi_agent_config.MultiAgentConfig": {
-      "enabled": [],
-      "max_concurrent_subagents": []
-    },
-    "beta.multi_agent_config_param.MultiAgentConfigParam": {
-      "enabled": [],
-      "max_concurrent_subagents": []
-    },
-    "beta.output_text.OutputText": {
-      "text": [],
-      "type": []
-    },
-    "beta.persisted_agent_tool.PersistedAgentToolResourceFunction": {
-      "defer_loading": [],
-      "description": [],
-      "name": [],
-      "parameters": [],
-      "type": []
-    },
-    "beta.persisted_agent_tool.PersistedAgentToolResourceMcp": {
-      "allowed_tools": [],
-      "connection_origin": [],
-      "credential_id": [],
-      "request_metadata": [],
-      "required": [],
-      "server_label": [],
-      "transport": [
-        "beta.persisted_mcp_transport.PersistedMcpTransportResourceHTTP",
-        "beta.persisted_mcp_transport.PersistedMcpTransportResourceStdio"
-      ],
-      "type": []
-    },
-    "beta.persisted_agent_tool.PersistedAgentToolResourceProgrammaticToolCalling": {
-      "enabled": [],
-      "type": []
-    },
-    "beta.persisted_agent_tool.PersistedAgentToolResourceToolSearch": {
-      "type": []
-    },
-    "beta.persisted_agent_tool.PersistedAgentToolResourceWebSearch": {
-      "allowed_domains": [],
-      "context_size": [],
-      "location": [
-        "beta.persisted_agent_tool.PersistedAgentToolResourceWebSearchLocation"
-      ],
-      "mode": [],
-      "type": []
-    },
-    "beta.persisted_agent_tool.PersistedAgentToolResourceWebSearchLocation": {
-      "city": [],
-      "country": [],
-      "region": [],
-      "timezone": []
-    },
-    "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamFunction": {
-      "defer_loading": [],
-      "description": [],
-      "name": [],
-      "parameters": [],
-      "type": []
-    },
-    "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamMcp": {
-      "allowed_tools": [],
-      "connection_origin": [],
-      "credential_id": [],
-      "request_metadata": [],
-      "required": [],
-      "server_label": [],
-      "transport": [
-        "beta.persisted_mcp_transport_param.PersistedMcpTransportConfigParamHTTP",
-        "beta.persisted_mcp_transport_param.PersistedMcpTransportConfigParamStdio"
-      ],
-      "type": []
-    },
-    "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamProgrammaticToolCalling": {
-      "enabled": [],
-      "type": []
-    },
-    "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamToolSearch": {
-      "type": []
-    },
-    "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamWebSearch": {
-      "allowed_domains": [],
-      "context_size": [],
-      "location": [
-        "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamWebSearchLocation"
-      ],
-      "mode": [],
-      "type": []
-    },
-    "beta.persisted_agent_tool_param.PersistedAgentToolConfigParamWebSearchLocation": {
-      "city": [],
-      "country": [],
-      "region": [],
-      "timezone": []
-    },
-    "beta.persisted_mcp_transport.PersistedMcpTransportResourceHTTP": {
-      "headers": [],
-      "server_url": [],
-      "type": []
-    },
-    "beta.persisted_mcp_transport.PersistedMcpTransportResourceStdio": {
-      "args": [],
-      "command": [],
-      "cwd": [],
-      "env_vars": [],
-      "type": []
-    },
-    "beta.persisted_mcp_transport_param.PersistedMcpTransportConfigParamHTTP": {
-      "headers": [],
-      "server_url": [],
-      "type": []
-    },
-    "beta.persisted_mcp_transport_param.PersistedMcpTransportConfigParamStdio": {
-      "args": [],
-      "command": [],
-      "cwd": [],
-      "env_vars": [],
-      "type": []
-    },
-    "beta.session_error.SessionError": {
-      "code": [],
-      "message": [],
-      "param": [],
-      "type": []
-    },
-    "beta.session_turn_error.SessionTurnError": {
-      "code": [],
-      "message": []
-    },
-    "beta.setup_command_param.SetupCommandParam": {
-      "command": [],
-      "cwd": []
-    },
-    "beta.subagent.Subagent": {
-      "closed_at": [],
-      "id": [],
-      "instructions": [
-        "beta.agent_content.EncryptedContentResource",
-        "beta.output_text.OutputText"
-      ],
-      "name": [],
-      "object": [],
-      "opened_at": [],
-      "parent_agent_id": [],
-      "session_id": [],
-      "status": []
-    },
-    "beta.summary_text.SummaryText": {
-      "text": [],
-      "type": []
-    },
-    "beta.text_format.TextFormatResourceJSONSchema": {
-      "schema": [],
-      "type": []
-    },
-    "beta.text_format.TextFormatResourceText": {
-      "type": []
-    },
-    "beta.text_format_param.TextFormatParamJSONSchema": {
-      "schema": [],
-      "type": []
-    },
-    "beta.text_format_param.TextFormatParamText": {
-      "type": []
-    },
-    "beta.token_usage.InputTokensDetails": {
-      "cached_tokens": []
-    },
-    "beta.token_usage.OutputTokensDetails": {
-      "reasoning_tokens": []
-    },
-    "beta.token_usage.TokenUsage": {
-      "input_tokens": [],
-      "input_tokens_details": [
-        "beta.token_usage.InputTokensDetails"
-      ],
-      "output_tokens": [],
-      "output_tokens_details": [
-        "beta.token_usage.OutputTokensDetails"
-      ],
-      "total_tokens": []
-    },
-    "beta.web_search_action.WebSearchActionResourceFindInPage": {
-      "pattern": [],
-      "type": [],
-      "url": []
-    },
-    "beta.web_search_action.WebSearchActionResourceOpenPage": {
-      "type": [],
-      "url": []
-    },
-    "beta.web_search_action.WebSearchActionResourceOther": {
-      "type": []
-    },
-    "beta.web_search_action.WebSearchActionResourceSearch": {
-      "queries": [],
-      "query": [],
-      "type": []
-    },
-    "deleted_skill.DeletedSkill": {
-      "deleted": [],
-      "id": [],
-      "object": []
-    },
-    "file_create_params.ExpiresAfter": {
-      "anchor": [],
-      "seconds": []
-    },
-    "file_create_params.FileCreateParams": {
-      "expires_after": [
-        "file_create_params.ExpiresAfter"
-      ],
-      "file": [],
-      "purpose": []
-    },
-    "file_deleted.FileDeleted": {
-      "deleted": [],
-      "id": [],
-      "object": []
-    },
-    "file_list_params.FileListParams": {
-      "after": [],
-      "limit": [],
-      "order": [],
-      "purpose": []
-    },
-    "file_object.FileObject": {
-      "bytes": [],
-      "created_at": [],
-      "expires_at": [],
-      "filename": [],
-      "id": [],
-      "object": [],
-      "purpose": [],
-      "status": [],
-      "status_details": []
-    },
-    "pagination.SyncCursorPage[beta.agent.Agent]": {
-      "data": [
-        "beta.agent.Agent"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[beta.agent_close_subagent_call_item.AgentCloseSubagentCallItem | beta.agent_command_execution_item.AgentCommandExecutionItem | beta.agent_create_subagent_call_item.AgentCreateSubagentCallItem | beta.agent_function_call_item.AgentFunctionCallItem | beta.agent_interrupt_subagent_call_item.AgentInterruptSubagentCallItem | beta.agent_mcp_call_item.AgentMcpCallItem | beta.agent_reasoning_item.AgentReasoningItem | beta.agent_resume_subagent_call_item.AgentResumeSubagentCallItem | beta.agent_send_subagent_input_call_item.AgentSendSubagentInputCallItem | beta.agent_session_item.AgentMessageItemResource | beta.agent_session_item.FunctionCallOutputItemResource | beta.agent_session_message.AgentSessionMessage | beta.agent_wait_for_subagents_call_item.AgentWaitForSubagentsCallItem | beta.agent_web_search_call_item.AgentWebSearchCallItem]": {
-      "data": [
-        "beta.agent_close_subagent_call_item.AgentCloseSubagentCallItem",
-        "beta.agent_command_execution_item.AgentCommandExecutionItem",
-        "beta.agent_create_subagent_call_item.AgentCreateSubagentCallItem",
-        "beta.agent_function_call_item.AgentFunctionCallItem",
-        "beta.agent_interrupt_subagent_call_item.AgentInterruptSubagentCallItem",
-        "beta.agent_mcp_call_item.AgentMcpCallItem",
-        "beta.agent_reasoning_item.AgentReasoningItem",
-        "beta.agent_resume_subagent_call_item.AgentResumeSubagentCallItem",
-        "beta.agent_send_subagent_input_call_item.AgentSendSubagentInputCallItem",
-        "beta.agent_session_item.AgentMessageItemResource",
-        "beta.agent_session_item.FunctionCallOutputItemResource",
-        "beta.agent_session_message.AgentSessionMessage",
-        "beta.agent_wait_for_subagents_call_item.AgentWaitForSubagentsCallItem",
-        "beta.agent_web_search_call_item.AgentWebSearchCallItem"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[beta.agent_session.AgentSession]": {
-      "data": [
-        "beta.agent_session.AgentSession"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[beta.agents.environments.environment_template.EnvironmentTemplate]": {
-      "data": [
-        "beta.agents.environments.environment_template.EnvironmentTemplate"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[beta.agents.sessions.session_artifact.SessionArtifact]": {
-      "data": [
-        "beta.agents.sessions.session_artifact.SessionArtifact"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[beta.agents.sessions.turn.Turn]": {
-      "data": [
-        "beta.agents.sessions.turn.Turn"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[beta.agents.vault.Vault]": {
-      "data": [
-        "beta.agents.vault.Vault"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[beta.agents.vaults.credential.Credential]": {
-      "data": [
-        "beta.agents.vaults.credential.Credential"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[beta.subagent.Subagent]": {
-      "data": [
-        "beta.subagent.Subagent"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[file_object.FileObject]": {
-      "data": [
-        "file_object.FileObject"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[skill.Skill]": {
-      "data": [
-        "skill.Skill"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncCursorPage[skills.skill_version.SkillVersion]": {
-      "data": [
-        "skills.skill_version.SkillVersion"
-      ],
-      "has_more": []
-    },
-    "pagination.SyncTokenPage[beta.agents.environments.environment_file.EnvironmentFile]": {
-      "data": [
-        "beta.agents.environments.environment_file.EnvironmentFile"
-      ],
-      "has_more": [],
-      "next": []
-    },
-    "skill.Skill": {
-      "created_at": [],
-      "default_version": [],
-      "description": [],
-      "id": [],
-      "latest_version": [],
-      "name": [],
-      "object": []
-    },
-    "skill_create_params.SkillCreateParams": {
-      "files": []
-    },
-    "skill_list_params.SkillListParams": {
-      "after": [],
-      "limit": [],
-      "order": []
-    },
-    "skill_update_params.SkillUpdateParams": {
-      "default_version": []
-    },
-    "skills.deleted_skill_version.DeletedSkillVersion": {
-      "deleted": [],
-      "id": [],
-      "object": [],
-      "version": []
-    },
-    "skills.skill_version.SkillVersion": {
-      "created_at": [],
-      "description": [],
-      "id": [],
-      "name": [],
-      "object": [],
-      "skill_id": [],
-      "version": []
-    },
-    "skills.version_create_params.VersionCreateParams": {
-      "default": [],
-      "files": []
-    },
-    "skills.version_list_params.VersionListParams": {
-      "after": [],
-      "limit": [],
-      "order": []
-    }
-  }
-}
diff --git a/contracts/agents-api/upstream-routes.json b/contracts/agents-api/upstream-routes.json
index 3326834f2..1f305b93a 100644
--- a/contracts/agents-api/upstream-routes.json
+++ b/contracts/agents-api/upstream-routes.json
@@ -1,12 +1,6 @@
 {
-  "sdk_version": "3.13.0",
-  "commit": "d7c41efee1b0802b79f3f88a678ef2052b06e9ce",
-  "generator": "scripts/extract-agents-api-upstream.py",
-  "resources": [
-    "openai.resources.beta.agents",
-    "openai.resources.files",
-    "openai.resources.skills"
-  ],
+  "openapi_commit": "046a2a0f325bf11f97966f2729219f27281ba71e",
+  "generator": "scripts/generate-public-api.py",
   "routes": [
     "DELETE /agents/environments/templates/{}",
     "DELETE /agents/sessions/{}",
diff --git a/contracts/agents-api/upstream.json b/contracts/agents-api/upstream.json
index adc71d0bb..253e00627 100644
--- a/contracts/agents-api/upstream.json
+++ b/contracts/agents-api/upstream.json
@@ -4,5 +4,11 @@
   "sdk_version": "3.13.0",
   "resource_path": "src/openai/resources/beta/agents",
   "type_path": "src/openai/types/beta",
-  "beta_header": "agents=v1"
+  "beta_header": "agents=v1",
+  "openapi": {
+    "repository": "https://github.com/openai/openai-openapi",
+    "commit": "046a2a0f325bf11f97966f2729219f27281ba71e",
+    "path": "openapi.json",
+    "sha256": "c96d974b164ff4750fa5ea5a1727f7ce6691540e257c177db02b660b0db58f26"
+  }
 }
diff --git a/contracts/agents-api/upstream/LICENSE b/contracts/agents-api/upstream/LICENSE
new file mode 100644
index 000000000..4f14854c3
--- /dev/null
+++ b/contracts/agents-api/upstream/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) OpenAI (https://openai.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/contracts/agents-api/upstream/openapi.json b/contracts/agents-api/upstream/openapi.json
new file mode 100644
index 000000000..f966c2530
--- /dev/null
+++ b/contracts/agents-api/upstream/openapi.json
@@ -0,0 +1,107618 @@
+{
+  "openapi": "3.1.0",
+  "info": {
+    "title": "OpenAI API",
+    "description": "The OpenAI REST API. Please see https://platform.openai.com/docs/api-reference for more details.",
+    "version": "2.3.0",
+    "termsOfService": "https://openai.com/policies/terms-of-use",
+    "contact": {
+      "name": "OpenAI Support",
+      "url": "https://help.openai.com/"
+    },
+    "license": {
+      "name": "MIT",
+      "identifier": "MIT"
+    }
+  },
+  "servers": [
+    {
+      "url": "https://api.openai.com/v1"
+    }
+  ],
+  "security": [
+    {
+      "ApiKeyAuth": []
+    }
+  ],
+  "tags": [
+    {
+      "name": "Assistants",
+      "description": "Build Assistants that can call models and use tools."
+    },
+    {
+      "name": "Audio",
+      "description": "Turn audio into text or text into audio."
+    },
+    {
+      "name": "Chat",
+      "description": "Given a list of messages comprising a conversation, the model will return a response."
+    },
+    {
+      "name": "Conversations",
+      "description": "Manage conversations and conversation items."
+    },
+    {
+      "name": "Completions",
+      "description": "Given a prompt, the model will return one or more predicted completions, and can also return the probabilities of alternative tokens at each position."
+    },
+    {
+      "name": "Embeddings",
+      "description": "Get a vector representation of a given input that can be easily consumed by machine learning models and algorithms."
+    },
+    {
+      "name": "Evals",
+      "description": "Manage and run evals in the OpenAI platform."
+    },
+    {
+      "name": "Fine-tuning",
+      "description": "Manage fine-tuning jobs to tailor a model to your specific training data."
+    },
+    {
+      "name": "Graders",
+      "description": "Manage and run graders in the OpenAI platform."
+    },
+    {
+      "name": "Batch",
+      "description": "Create large batches of API requests to run asynchronously."
+    },
+    {
+      "name": "Files",
+      "description": "Files are used to upload documents that can be used with features like Assistants and Fine-tuning."
+    },
+    {
+      "name": "Uploads",
+      "description": "Use Uploads to upload large files in multiple parts."
+    },
+    {
+      "name": "Images",
+      "description": "Given a prompt and/or an input image, the model will generate a new image."
+    },
+    {
+      "name": "Models",
+      "description": "List and describe the various models available in the API."
+    },
+    {
+      "name": "Moderations",
+      "description": "Given text and/or image inputs, classifies if those inputs are potentially harmful."
+    },
+    {
+      "name": "Audit Logs",
+      "description": "List user actions and configuration changes within this organization."
+    }
+  ],
+  "paths": {
+    "/assistants": {
+      "get": {
+        "operationId": "listAssistants",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Returns a list of assistants.",
+        "deprecated": true,
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, starting with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListAssistantsResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List assistants",
+          "group": "assistants",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/assistants?order=desc&limit=20\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nmy_assistants = client.beta.assistants.list(\n    order=\"desc\",\n    limit=\"20\",\n)\nprint(my_assistants.data)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const myAssistants = await openai.beta.assistants.list({\n    order: \"desc\",\n    limit: \"20\",\n  });\n\n  console.log(myAssistants.data);\n}\n\nmain();"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"asst_abc123\",\n      \"object\": \"assistant\",\n      \"created_at\": 1698982736,\n      \"name\": \"Coding Tutor\",\n      \"description\": null,\n      \"model\": \"gpt-5\",\n      \"instructions\": \"You are a helpful assistant designed to make me better at coding!\",\n      \"tools\": [],\n      \"tool_resources\": {},\n      \"metadata\": {},\n      \"top_p\": 1.0,\n      \"temperature\": 1.0,\n      \"response_format\": \"auto\"\n    },\n    {\n      \"id\": \"asst_abc456\",\n      \"object\": \"assistant\",\n      \"created_at\": 1698982718,\n      \"name\": \"My Assistant\",\n      \"description\": null,\n      \"model\": \"gpt-5\",\n      \"instructions\": \"You are a helpful assistant designed to make me better at coding!\",\n      \"tools\": [],\n      \"tool_resources\": {},\n      \"metadata\": {},\n      \"top_p\": 1.0,\n      \"temperature\": 1.0,\n      \"response_format\": \"auto\"\n    },\n    {\n      \"id\": \"asst_abc789\",\n      \"object\": \"assistant\",\n      \"created_at\": 1698982643,\n      \"name\": null,\n      \"description\": null,\n      \"model\": \"gpt-5\",\n      \"instructions\": null,\n      \"tools\": [],\n      \"tool_resources\": {},\n      \"metadata\": {},\n      \"top_p\": 1.0,\n      \"temperature\": 1.0,\n      \"response_format\": \"auto\"\n    }\n  ],\n  \"first_id\": \"asst_abc123\",\n  \"last_id\": \"asst_abc789\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createAssistant",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Create an assistant with a model and instructions.",
+        "deprecated": true,
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateAssistantRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AssistantObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create assistant",
+          "group": "assistants",
+          "examples": [
+            {
+              "title": "Code Interpreter",
+              "request": {
+                "curl": "curl \"https://api.openai.com/v1/assistants\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"instructions\": \"You are a personal math tutor. When asked a question, write and run Python code to answer the question.\",\n    \"name\": \"Math Tutor\",\n    \"tools\": [{\"type\": \"code_interpreter\"}],\n    \"model\": \"gpt-5\"\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nmy_assistant = client.beta.assistants.create(\n    instructions=\"You are a personal math tutor. When asked a question, write and run Python code to answer the question.\",\n    name=\"Math Tutor\",\n    tools=[{\"type\": \"code_interpreter\"}],\n    model=\"gpt-5\",\n)\nprint(my_assistant)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const myAssistant = await openai.beta.assistants.create({\n    instructions:\n      \"You are a personal math tutor. When asked a question, write and run Python code to answer the question.\",\n    name: \"Math Tutor\",\n    tools: [{ type: \"code_interpreter\" }],\n    model: \"gpt-5\",\n  });\n\n  console.log(myAssistant);\n}\n\nmain();"
+              },
+              "response": "{\n  \"id\": \"asst_abc123\",\n  \"object\": \"assistant\",\n  \"created_at\": 1698984975,\n  \"name\": \"Math Tutor\",\n  \"description\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": \"You are a personal math tutor. When asked a question, write and run Python code to answer the question.\",\n  \"tools\": [\n    {\n      \"type\": \"code_interpreter\"\n    }\n  ],\n  \"metadata\": {},\n  \"top_p\": 1.0,\n  \"temperature\": 1.0,\n  \"response_format\": \"auto\"\n}\n"
+            },
+            {
+              "title": "Files",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/assistants \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"instructions\": \"You are an HR bot, and you have access to files to answer employee questions about company policies.\",\n    \"tools\": [{\"type\": \"file_search\"}],\n    \"tool_resources\": {\"file_search\": {\"vector_store_ids\": [\"vs_123\"]}},\n    \"model\": \"gpt-5\"\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nmy_assistant = client.beta.assistants.create(\n    instructions=\"You are an HR bot, and you have access to files to answer employee questions about company policies.\",\n    name=\"HR Helper\",\n    tools=[{\"type\": \"file_search\"}],\n    tool_resources={\"file_search\": {\"vector_store_ids\": [\"vs_123\"]}},\n    model=\"gpt-5\"\n)\nprint(my_assistant)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const myAssistant = await openai.beta.assistants.create({\n    instructions:\n      \"You are an HR bot, and you have access to files to answer employee questions about company policies.\",\n    name: \"HR Helper\",\n    tools: [{ type: \"file_search\" }],\n    tool_resources: {\n      file_search: {\n        vector_store_ids: [\"vs_123\"]\n      }\n    },\n    model: \"gpt-5\"\n  });\n\n  console.log(myAssistant);\n}\n\nmain();"
+              },
+              "response": "{\n  \"id\": \"asst_abc123\",\n  \"object\": \"assistant\",\n  \"created_at\": 1699009403,\n  \"name\": \"HR Helper\",\n  \"description\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": \"You are an HR bot, and you have access to files to answer employee questions about company policies.\",\n  \"tools\": [\n    {\n      \"type\": \"file_search\"\n    }\n  ],\n  \"tool_resources\": {\n    \"file_search\": {\n      \"vector_store_ids\": [\"vs_123\"]\n    }\n  },\n  \"metadata\": {},\n  \"top_p\": 1.0,\n  \"temperature\": 1.0,\n  \"response_format\": \"auto\"\n}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/assistants/{assistant_id}": {
+      "get": {
+        "operationId": "getAssistant",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Retrieves an assistant.",
+        "deprecated": true,
+        "parameters": [
+          {
+            "in": "path",
+            "name": "assistant_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the assistant to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AssistantObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve assistant",
+          "group": "assistants",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/assistants/asst_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nmy_assistant = client.beta.assistants.retrieve(\"asst_abc123\")\nprint(my_assistant)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const myAssistant = await openai.beta.assistants.retrieve(\n    \"asst_abc123\"\n  );\n\n  console.log(myAssistant);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"asst_abc123\",\n  \"object\": \"assistant\",\n  \"created_at\": 1699009709,\n  \"name\": \"HR Helper\",\n  \"description\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": \"You are an HR bot, and you have access to files to answer employee questions about company policies.\",\n  \"tools\": [\n    {\n      \"type\": \"file_search\"\n    }\n  ],\n  \"metadata\": {},\n  \"top_p\": 1.0,\n  \"temperature\": 1.0,\n  \"response_format\": \"auto\"\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "modifyAssistant",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Modifies an assistant.",
+        "deprecated": true,
+        "parameters": [
+          {
+            "in": "path",
+            "name": "assistant_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the assistant to modify."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ModifyAssistantRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AssistantObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify assistant",
+          "group": "assistants",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/assistants/asst_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n      \"instructions\": \"You are an HR bot, and you have access to files to answer employee questions about company policies. Always response with info from either of the files.\",\n      \"tools\": [{\"type\": \"file_search\"}],\n      \"model\": \"gpt-5\"\n    }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nmy_updated_assistant = client.beta.assistants.update(\n  \"asst_abc123\",\n  instructions=\"You are an HR bot, and you have access to files to answer employee questions about company policies. Always response with info from either of the files.\",\n  name=\"HR Helper\",\n  tools=[{\"type\": \"file_search\"}],\n  model=\"gpt-5\"\n)\n\nprint(my_updated_assistant)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const myUpdatedAssistant = await openai.beta.assistants.update(\n    \"asst_abc123\",\n    {\n      instructions:\n        \"You are an HR bot, and you have access to files to answer employee questions about company policies. Always response with info from either of the files.\",\n      name: \"HR Helper\",\n      tools: [{ type: \"file_search\" }],\n      model: \"gpt-5\"\n    }\n  );\n\n  console.log(myUpdatedAssistant);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"asst_123\",\n  \"object\": \"assistant\",\n  \"created_at\": 1699009709,\n  \"name\": \"HR Helper\",\n  \"description\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": \"You are an HR bot, and you have access to files to answer employee questions about company policies. Always response with info from either of the files.\",\n  \"tools\": [\n    {\n      \"type\": \"file_search\"\n    }\n  ],\n  \"tool_resources\": {\n    \"file_search\": {\n      \"vector_store_ids\": []\n    }\n  },\n  \"metadata\": {},\n  \"top_p\": 1.0,\n  \"temperature\": 1.0,\n  \"response_format\": \"auto\"\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteAssistant",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Delete an assistant.",
+        "deprecated": true,
+        "parameters": [
+          {
+            "in": "path",
+            "name": "assistant_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the assistant to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteAssistantResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete assistant",
+          "group": "assistants",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/assistants/asst_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -X DELETE\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.beta.assistants.delete(\"asst_abc123\")\nprint(response)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const response = await openai.beta.assistants.delete(\"asst_abc123\");\n\n  console.log(response);\n}\nmain();"
+            },
+            "response": "{\n  \"id\": \"asst_abc123\",\n  \"object\": \"assistant.deleted\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/audio/speech": {
+      "post": {
+        "operationId": "createSpeech",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Generates audio from the input text.\n\nReturns the audio file content, or a stream of audio events.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSpeechRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "headers": {
+              "Transfer-Encoding": {
+                "schema": {
+                  "type": "string"
+                },
+                "description": "chunked"
+              }
+            },
+            "content": {
+              "application/octet-stream": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateSpeechResponseStreamEvent"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create speech",
+          "group": "audio",
+          "examples": [
+            {
+              "title": "Default",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/audio/speech \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"model\": \"gpt-4o-mini-tts\",\n    \"input\": \"The quick brown fox jumped over the lazy dog.\",\n    \"voice\": \"alloy\"\n  }' \\\n  --output speech.mp3\n",
+                "python": "from pathlib import Path\nimport openai\n\nspeech_file_path = Path(__file__).parent / \"speech.mp3\"\nwith openai.audio.speech.with_streaming_response.create(\n  model=\"gpt-4o-mini-tts\",\n  voice=\"alloy\",\n  input=\"The quick brown fox jumped over the lazy dog.\"\n) as response:\n  response.stream_to_file(speech_file_path)\n",
+                "javascript": "import fs from \"fs\";\nimport path from \"path\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst speechFile = path.resolve(\"./speech.mp3\");\n\nasync function main() {\n  const mp3 = await openai.audio.speech.create({\n    model: \"gpt-4o-mini-tts\",\n    voice: \"alloy\",\n    input: \"Today is a wonderful day to build something people love!\",\n  });\n  console.log(speechFile);\n  const buffer = Buffer.from(await mp3.arrayBuffer());\n  await fs.promises.writeFile(speechFile, buffer);\n}\nmain();\n",
+                "csharp": "using System;\nusing System.IO;\n\nusing OpenAI.Audio;\n\nAudioClient client = new(\n    model: \"gpt-4o-mini-tts\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nBinaryData speech = client.GenerateSpeech(\n    text: \"The quick brown fox jumped over the lazy dog.\",\n    voice: GeneratedSpeechVoice.Alloy\n);\n\nusing FileStream stream = File.OpenWrite(\"speech.mp3\");\nspeech.ToStream().CopyTo(stream);\n"
+              }
+            },
+            {
+              "title": "SSE Stream Format",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/audio/speech \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"model\": \"gpt-4o-mini-tts\",\n    \"input\": \"The quick brown fox jumped over the lazy dog.\",\n    \"voice\": \"alloy\",\n    \"stream_format\": \"sse\"\n  }'\n"
+              }
+            }
+          ]
+        }
+      }
+    },
+    "/audio/transcriptions": {
+      "post": {
+        "operationId": "createTranscription",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Transcribes audio into the input language.\n\nReturns a transcription object in `json`, `diarized_json`, or `verbose_json`\nformat, or a stream of transcript events.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateTranscriptionRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/CreateTranscriptionResponseJson"
+                    },
+                    {
+                      "$ref": "#/components/schemas/CreateTranscriptionResponseDiarizedJson"
+                    },
+                    {
+                      "$ref": "#/components/schemas/CreateTranscriptionResponseVerboseJson"
+                    }
+                  ]
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateTranscriptionResponseStreamEvent"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create transcription",
+          "group": "audio",
+          "examples": [
+            {
+              "title": "Default",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/audio/transcriptions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: multipart/form-data\" \\\n  -F file=\"@/path/to/file/audio.mp3\" \\\n  -F model=\"gpt-4o-transcribe\"\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\naudio_file = open(\"speech.mp3\", \"rb\")\ntranscript = client.audio.transcriptions.create(\n  model=\"gpt-4o-transcribe\",\n  file=audio_file\n)\n",
+                "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const transcription = await openai.audio.transcriptions.create({\n    file: fs.createReadStream(\"audio.mp3\"),\n    model: \"gpt-4o-transcribe\",\n  });\n\n  console.log(transcription.text);\n}\nmain();\n",
+                "csharp": "using System;\n\nusing OpenAI.Audio;\nstring audioFilePath = \"audio.mp3\";\n\nAudioClient client = new(\n    model: \"gpt-4o-transcribe\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nAudioTranscription transcription = client.TranscribeAudio(audioFilePath);\n\nConsole.WriteLine($\"{transcription.Text}\");\n"
+              },
+              "response": "{\n  \"text\": \"Imagine the wildest idea that you've ever had, and you're curious about how it might scale to something that's a 100, a 1,000 times bigger. This is a place where you can get to do that.\",\n  \"usage\": {\n    \"type\": \"tokens\",\n    \"input_tokens\": 14,\n    \"input_token_details\": {\n      \"text_tokens\": 0,\n      \"audio_tokens\": 14\n    },\n    \"output_tokens\": 45,\n    \"total_tokens\": 59\n  }\n}\n"
+            },
+            {
+              "title": "Diarization",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/audio/transcriptions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: multipart/form-data\" \\\n  -F file=\"@/path/to/file/meeting.wav\" \\\n  -F model=\"gpt-4o-transcribe-diarize\" \\\n  -F response_format=\"diarized_json\" \\\n  -F chunking_strategy=auto \\\n  -F 'known_speaker_names[]=agent' \\\n  -F 'known_speaker_references[]=data:audio/wav;base64,AAA...'\n",
+                "python": "import base64\nfrom openai import OpenAI\n\nclient = OpenAI()\n\ndef to_data_url(path: str) -> str:\n  with open(path, \"rb\") as fh:\n    return \"data:audio/wav;base64,\" + base64.b64encode(fh.read()).decode(\"utf-8\")\n\nwith open(\"meeting.wav\", \"rb\") as audio_file:\n  transcript = client.audio.transcriptions.create(\n    model=\"gpt-4o-transcribe-diarize\",\n    file=audio_file,\n    response_format=\"diarized_json\",\n    chunking_strategy=\"auto\",\n    extra_body={\n      \"known_speaker_names\": [\"agent\"],\n      \"known_speaker_references\": [to_data_url(\"agent.wav\")],\n    },\n  )\n\nprint(transcript.segments)\n",
+                "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst speakerRef = fs.readFileSync(\"agent.wav\").toString(\"base64\");\n\nconst transcript = await openai.audio.transcriptions.create({\n  file: fs.createReadStream(\"meeting.wav\"),\n  model: \"gpt-4o-transcribe-diarize\",\n  response_format: \"diarized_json\",\n  chunking_strategy: \"auto\",\n  extra_body: {\n    known_speaker_names: [\"agent\"],\n    known_speaker_references: [`data:audio/wav;base64,${speakerRef}`],\n  },\n});\n\nconsole.log(transcript.segments);\n"
+              },
+              "response": "{\n  \"task\": \"transcribe\",\n  \"duration\": 27.4,\n  \"text\": \"Agent: Thanks for calling OpenAI support.\\nA: Hi, I'm trying to enable diarization.\\nAgent: Happy to walk you through the steps.\",\n  \"segments\": [\n    {\n      \"type\": \"transcript.text.segment\",\n      \"id\": \"seg_001\",\n      \"start\": 0.0,\n      \"end\": 4.7,\n      \"text\": \"Thanks for calling OpenAI support.\",\n      \"speaker\": \"agent\"\n    },\n    {\n      \"type\": \"transcript.text.segment\",\n      \"id\": \"seg_002\",\n      \"start\": 4.7,\n      \"end\": 11.8,\n      \"text\": \"Hi, I'm trying to enable diarization.\",\n      \"speaker\": \"A\"\n    },\n    {\n      \"type\": \"transcript.text.segment\",\n      \"id\": \"seg_003\",\n      \"start\": 12.1,\n      \"end\": 18.5,\n      \"text\": \"Happy to walk you through the steps.\",\n      \"speaker\": \"agent\"\n    }\n  ],\n  \"usage\": {\n    \"type\": \"duration\",\n    \"seconds\": 27\n  }\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/audio/transcriptions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: multipart/form-data\" \\\n  -F file=\"@/path/to/file/audio.mp3\" \\\n  -F model=\"gpt-4o-mini-transcribe\" \\\n  -F stream=true\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\naudio_file = open(\"speech.mp3\", \"rb\")\nstream = client.audio.transcriptions.create(\n  file=audio_file,\n  model=\"gpt-4o-mini-transcribe\",\n  stream=True\n)\n\nfor event in stream:\n  print(event)\n",
+                "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst stream = await openai.audio.transcriptions.create({\n  file: fs.createReadStream(\"audio.mp3\"),\n  model: \"gpt-4o-mini-transcribe\",\n  stream: true,\n});\n\nfor await (const event of stream) {\n  console.log(event);\n}\n"
+              },
+              "response": "data: {\"type\":\"transcript.text.delta\",\"delta\":\"I\",\"logprobs\":[{\"token\":\"I\",\"logprob\":-0.00007588794,\"bytes\":[73]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" see\",\"logprobs\":[{\"token\":\" see\",\"logprob\":-3.1281633e-7,\"bytes\":[32,115,101,101]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" skies\",\"logprobs\":[{\"token\":\" skies\",\"logprob\":-2.3392786e-6,\"bytes\":[32,115,107,105,101,115]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" of\",\"logprobs\":[{\"token\":\" of\",\"logprob\":-3.1281633e-7,\"bytes\":[32,111,102]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" blue\",\"logprobs\":[{\"token\":\" blue\",\"logprob\":-1.0280384e-6,\"bytes\":[32,98,108,117,101]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" and\",\"logprobs\":[{\"token\":\" and\",\"logprob\":-0.0005108566,\"bytes\":[32,97,110,100]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" clouds\",\"logprobs\":[{\"token\":\" clouds\",\"logprob\":-1.9361265e-7,\"bytes\":[32,99,108,111,117,100,115]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" of\",\"logprobs\":[{\"token\":\" of\",\"logprob\":-1.9361265e-7,\"bytes\":[32,111,102]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" white\",\"logprobs\":[{\"token\":\" white\",\"logprob\":-7.89631e-7,\"bytes\":[32,119,104,105,116,101]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\",\",\"logprobs\":[{\"token\":\",\",\"logprob\":-0.0014890312,\"bytes\":[44]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" the\",\"logprobs\":[{\"token\":\" the\",\"logprob\":-0.0110956915,\"bytes\":[32,116,104,101]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" bright\",\"logprobs\":[{\"token\":\" bright\",\"logprob\":0.0,\"bytes\":[32,98,114,105,103,104,116]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" blessed\",\"logprobs\":[{\"token\":\" blessed\",\"logprob\":-0.000045848617,\"bytes\":[32,98,108,101,115,115,101,100]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" days\",\"logprobs\":[{\"token\":\" days\",\"logprob\":-0.000010802739,\"bytes\":[32,100,97,121,115]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\",\",\"logprobs\":[{\"token\":\",\",\"logprob\":-0.00001700133,\"bytes\":[44]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" the\",\"logprobs\":[{\"token\":\" the\",\"logprob\":-0.0000118755715,\"bytes\":[32,116,104,101]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" dark\",\"logprobs\":[{\"token\":\" dark\",\"logprob\":-5.5122365e-7,\"bytes\":[32,100,97,114,107]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" sacred\",\"logprobs\":[{\"token\":\" sacred\",\"logprob\":-5.4385737e-6,\"bytes\":[32,115,97,99,114,101,100]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" nights\",\"logprobs\":[{\"token\":\" nights\",\"logprob\":-4.00813e-6,\"bytes\":[32,110,105,103,104,116,115]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\",\",\"logprobs\":[{\"token\":\",\",\"logprob\":-0.0036910512,\"bytes\":[44]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" and\",\"logprobs\":[{\"token\":\" and\",\"logprob\":-0.0031903093,\"bytes\":[32,97,110,100]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" I\",\"logprobs\":[{\"token\":\" I\",\"logprob\":-1.504853e-6,\"bytes\":[32,73]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" think\",\"logprobs\":[{\"token\":\" think\",\"logprob\":-4.3202e-7,\"bytes\":[32,116,104,105,110,107]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" to\",\"logprobs\":[{\"token\":\" to\",\"logprob\":-1.9361265e-7,\"bytes\":[32,116,111]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" myself\",\"logprobs\":[{\"token\":\" myself\",\"logprob\":-1.7432603e-6,\"bytes\":[32,109,121,115,101,108,102]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\",\",\"logprobs\":[{\"token\":\",\",\"logprob\":-0.29254505,\"bytes\":[44]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" what\",\"logprobs\":[{\"token\":\" what\",\"logprob\":-0.016815351,\"bytes\":[32,119,104,97,116]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" a\",\"logprobs\":[{\"token\":\" a\",\"logprob\":-3.1281633e-7,\"bytes\":[32,97]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" wonderful\",\"logprobs\":[{\"token\":\" wonderful\",\"logprob\":-2.1008714e-6,\"bytes\":[32,119,111,110,100,101,114,102,117,108]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\" world\",\"logprobs\":[{\"token\":\" world\",\"logprob\":-8.180258e-6,\"bytes\":[32,119,111,114,108,100]}]}\n\ndata: {\"type\":\"transcript.text.delta\",\"delta\":\".\",\"logprobs\":[{\"token\":\".\",\"logprob\":-0.014231676,\"bytes\":[46]}]}\n\ndata: {\"type\":\"transcript.text.done\",\"text\":\"I see skies of blue and clouds of white, the bright blessed days, the dark sacred nights, and I think to myself, what a wonderful world.\",\"logprobs\":[{\"token\":\"I\",\"logprob\":-0.00007588794,\"bytes\":[73]},{\"token\":\" see\",\"logprob\":-3.1281633e-7,\"bytes\":[32,115,101,101]},{\"token\":\" skies\",\"logprob\":-2.3392786e-6,\"bytes\":[32,115,107,105,101,115]},{\"token\":\" of\",\"logprob\":-3.1281633e-7,\"bytes\":[32,111,102]},{\"token\":\" blue\",\"logprob\":-1.0280384e-6,\"bytes\":[32,98,108,117,101]},{\"token\":\" and\",\"logprob\":-0.0005108566,\"bytes\":[32,97,110,100]},{\"token\":\" clouds\",\"logprob\":-1.9361265e-7,\"bytes\":[32,99,108,111,117,100,115]},{\"token\":\" of\",\"logprob\":-1.9361265e-7,\"bytes\":[32,111,102]},{\"token\":\" white\",\"logprob\":-7.89631e-7,\"bytes\":[32,119,104,105,116,101]},{\"token\":\",\",\"logprob\":-0.0014890312,\"bytes\":[44]},{\"token\":\" the\",\"logprob\":-0.0110956915,\"bytes\":[32,116,104,101]},{\"token\":\" bright\",\"logprob\":0.0,\"bytes\":[32,98,114,105,103,104,116]},{\"token\":\" blessed\",\"logprob\":-0.000045848617,\"bytes\":[32,98,108,101,115,115,101,100]},{\"token\":\" days\",\"logprob\":-0.000010802739,\"bytes\":[32,100,97,121,115]},{\"token\":\",\",\"logprob\":-0.00001700133,\"bytes\":[44]},{\"token\":\" the\",\"logprob\":-0.0000118755715,\"bytes\":[32,116,104,101]},{\"token\":\" dark\",\"logprob\":-5.5122365e-7,\"bytes\":[32,100,97,114,107]},{\"token\":\" sacred\",\"logprob\":-5.4385737e-6,\"bytes\":[32,115,97,99,114,101,100]},{\"token\":\" nights\",\"logprob\":-4.00813e-6,\"bytes\":[32,110,105,103,104,116,115]},{\"token\":\",\",\"logprob\":-0.0036910512,\"bytes\":[44]},{\"token\":\" and\",\"logprob\":-0.0031903093,\"bytes\":[32,97,110,100]},{\"token\":\" I\",\"logprob\":-1.504853e-6,\"bytes\":[32,73]},{\"token\":\" think\",\"logprob\":-4.3202e-7,\"bytes\":[32,116,104,105,110,107]},{\"token\":\" to\",\"logprob\":-1.9361265e-7,\"bytes\":[32,116,111]},{\"token\":\" myself\",\"logprob\":-1.7432603e-6,\"bytes\":[32,109,121,115,101,108,102]},{\"token\":\",\",\"logprob\":-0.29254505,\"bytes\":[44]},{\"token\":\" what\",\"logprob\":-0.016815351,\"bytes\":[32,119,104,97,116]},{\"token\":\" a\",\"logprob\":-3.1281633e-7,\"bytes\":[32,97]},{\"token\":\" wonderful\",\"logprob\":-2.1008714e-6,\"bytes\":[32,119,111,110,100,101,114,102,117,108]},{\"token\":\" world\",\"logprob\":-8.180258e-6,\"bytes\":[32,119,111,114,108,100]},{\"token\":\".\",\"logprob\":-0.014231676,\"bytes\":[46]}],\"usage\":{\"input_tokens\":14,\"input_token_details\":{\"text_tokens\":0,\"audio_tokens\":14},\"output_tokens\":45,\"total_tokens\":59}}\n"
+            },
+            {
+              "title": "Logprobs",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/audio/transcriptions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: multipart/form-data\" \\\n  -F file=\"@/path/to/file/audio.mp3\" \\\n  -F \"include[]=logprobs\" \\\n  -F model=\"gpt-4o-transcribe\" \\\n  -F response_format=\"json\"\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\naudio_file = open(\"speech.mp3\", \"rb\")\ntranscript = client.audio.transcriptions.create(\n  file=audio_file,\n  model=\"gpt-4o-transcribe\",\n  response_format=\"json\",\n  include=[\"logprobs\"]\n)\n\nprint(transcript)\n",
+                "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const transcription = await openai.audio.transcriptions.create({\n    file: fs.createReadStream(\"audio.mp3\"),\n    model: \"gpt-4o-transcribe\",\n    response_format: \"json\",\n    include: [\"logprobs\"]\n  });\n\n  console.log(transcription);\n}\nmain();\n"
+              },
+              "response": "{\n  \"text\": \"Hey, my knee is hurting and I want to see the doctor tomorrow ideally.\",\n  \"logprobs\": [\n    { \"token\": \"Hey\", \"logprob\": -1.0415299, \"bytes\": [72, 101, 121] },\n    { \"token\": \",\", \"logprob\": -9.805982e-5, \"bytes\": [44] },\n    { \"token\": \" my\", \"logprob\": -0.00229799, \"bytes\": [32, 109, 121] },\n    {\n      \"token\": \" knee\",\n      \"logprob\": -4.7159858e-5,\n      \"bytes\": [32, 107, 110, 101, 101]\n    },\n    { \"token\": \" is\", \"logprob\": -0.043909557, \"bytes\": [32, 105, 115] },\n    {\n      \"token\": \" hurting\",\n      \"logprob\": -1.1041146e-5,\n      \"bytes\": [32, 104, 117, 114, 116, 105, 110, 103]\n    },\n    { \"token\": \" and\", \"logprob\": -0.011076359, \"bytes\": [32, 97, 110, 100] },\n    { \"token\": \" I\", \"logprob\": -5.3193703e-6, \"bytes\": [32, 73] },\n    {\n      \"token\": \" want\",\n      \"logprob\": -0.0017156356,\n      \"bytes\": [32, 119, 97, 110, 116]\n    },\n    { \"token\": \" to\", \"logprob\": -7.89631e-7, \"bytes\": [32, 116, 111] },\n    { \"token\": \" see\", \"logprob\": -5.5122365e-7, \"bytes\": [32, 115, 101, 101] },\n    { \"token\": \" the\", \"logprob\": -0.0040786397, \"bytes\": [32, 116, 104, 101] },\n    {\n      \"token\": \" doctor\",\n      \"logprob\": -2.3392786e-6,\n      \"bytes\": [32, 100, 111, 99, 116, 111, 114]\n    },\n    {\n      \"token\": \" tomorrow\",\n      \"logprob\": -7.89631e-7,\n      \"bytes\": [32, 116, 111, 109, 111, 114, 114, 111, 119]\n    },\n    {\n      \"token\": \" ideally\",\n      \"logprob\": -0.5800861,\n      \"bytes\": [32, 105, 100, 101, 97, 108, 108, 121]\n    },\n    { \"token\": \".\", \"logprob\": -0.00011093382, \"bytes\": [46] }\n  ],\n  \"usage\": {\n    \"type\": \"tokens\",\n    \"input_tokens\": 14,\n    \"input_token_details\": {\n      \"text_tokens\": 0,\n      \"audio_tokens\": 14\n    },\n    \"output_tokens\": 45,\n    \"total_tokens\": 59\n  }\n}\n"
+            },
+            {
+              "title": "Word timestamps",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/audio/transcriptions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: multipart/form-data\" \\\n  -F file=\"@/path/to/file/audio.mp3\" \\\n  -F \"timestamp_granularities[]=word\" \\\n  -F model=\"whisper-1\" \\\n  -F response_format=\"verbose_json\"\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\naudio_file = open(\"speech.mp3\", \"rb\")\ntranscript = client.audio.transcriptions.create(\n  file=audio_file,\n  model=\"whisper-1\",\n  response_format=\"verbose_json\",\n  timestamp_granularities=[\"word\"]\n)\n\nprint(transcript.words)\n",
+                "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const transcription = await openai.audio.transcriptions.create({\n    file: fs.createReadStream(\"audio.mp3\"),\n    model: \"whisper-1\",\n    response_format: \"verbose_json\",\n    timestamp_granularities: [\"word\"]\n  });\n\n  console.log(transcription.text);\n}\nmain();\n",
+                "csharp": "using System;\n\nusing OpenAI.Audio;\n\nstring audioFilePath = \"audio.mp3\";\n\nAudioClient client = new(\n    model: \"whisper-1\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nAudioTranscriptionOptions options = new()\n{\n    ResponseFormat = AudioTranscriptionFormat.Verbose,\n    TimestampGranularities = AudioTimestampGranularities.Word,\n};\n\nAudioTranscription transcription = client.TranscribeAudio(audioFilePath, options);\n\nConsole.WriteLine($\"{transcription.Text}\");\n"
+              },
+              "response": "{\n  \"task\": \"transcribe\",\n  \"language\": \"english\",\n  \"duration\": 8.470000267028809,\n  \"text\": \"The beach was a popular spot on a hot summer day. People were swimming in the ocean, building sandcastles, and playing beach volleyball.\",\n  \"words\": [\n    {\n      \"word\": \"The\",\n      \"start\": 0.0,\n      \"end\": 0.23999999463558197\n    },\n    ...\n    {\n      \"word\": \"volleyball\",\n      \"start\": 7.400000095367432,\n      \"end\": 7.900000095367432\n    }\n  ],\n  \"usage\": {\n    \"type\": \"duration\",\n    \"seconds\": 9\n  }\n}\n"
+            },
+            {
+              "title": "Segment timestamps",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/audio/transcriptions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: multipart/form-data\" \\\n  -F file=\"@/path/to/file/audio.mp3\" \\\n  -F \"timestamp_granularities[]=segment\" \\\n  -F model=\"whisper-1\" \\\n  -F response_format=\"verbose_json\"\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\naudio_file = open(\"speech.mp3\", \"rb\")\ntranscript = client.audio.transcriptions.create(\n  file=audio_file,\n  model=\"whisper-1\",\n  response_format=\"verbose_json\",\n  timestamp_granularities=[\"segment\"]\n)\n\nprint(transcript.words)\n",
+                "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const transcription = await openai.audio.transcriptions.create({\n    file: fs.createReadStream(\"audio.mp3\"),\n    model: \"whisper-1\",\n    response_format: \"verbose_json\",\n    timestamp_granularities: [\"segment\"]\n  });\n\n  console.log(transcription.text);\n}\nmain();\n",
+                "csharp": "using System;\n\nusing OpenAI.Audio;\n\nstring audioFilePath = \"audio.mp3\";\n\nAudioClient client = new(\n    model: \"whisper-1\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nAudioTranscriptionOptions options = new()\n{\n    ResponseFormat = AudioTranscriptionFormat.Verbose,\n    TimestampGranularities = AudioTimestampGranularities.Segment,\n};\n\nAudioTranscription transcription = client.TranscribeAudio(audioFilePath, options);\n\nConsole.WriteLine($\"{transcription.Text}\");\n"
+              },
+              "response": "{\n  \"task\": \"transcribe\",\n  \"language\": \"english\",\n  \"duration\": 8.470000267028809,\n  \"text\": \"The beach was a popular spot on a hot summer day. People were swimming in the ocean, building sandcastles, and playing beach volleyball.\",\n  \"segments\": [\n    {\n      \"id\": 0,\n      \"seek\": 0,\n      \"start\": 0.0,\n      \"end\": 3.319999933242798,\n      \"text\": \" The beach was a popular spot on a hot summer day.\",\n      \"tokens\": [\n        50364, 440, 7534, 390, 257, 3743, 4008, 322, 257, 2368, 4266, 786, 13, 50530\n      ],\n      \"temperature\": 0.0,\n      \"avg_logprob\": -0.2860786020755768,\n      \"compression_ratio\": 1.2363636493682861,\n      \"no_speech_prob\": 0.00985979475080967\n    },\n    ...\n  ],\n  \"usage\": {\n    \"type\": \"duration\",\n    \"seconds\": 9\n  }\n}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/audio/translations": {
+      "post": {
+        "operationId": "createTranslation",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Translates audio into English.",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateTranslationRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/CreateTranslationResponseJson"
+                    },
+                    {
+                      "$ref": "#/components/schemas/CreateTranslationResponseVerboseJson"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create translation",
+          "group": "audio",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/audio/translations \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: multipart/form-data\" \\\n  -F file=\"@/path/to/file/german.m4a\" \\\n  -F model=\"whisper-1\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\naudio_file = open(\"speech.mp3\", \"rb\")\ntranscript = client.audio.translations.create(\n  model=\"whisper-1\",\n  file=audio_file\n)\n",
+              "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n    const translation = await openai.audio.translations.create({\n        file: fs.createReadStream(\"speech.mp3\"),\n        model: \"whisper-1\",\n    });\n\n    console.log(translation.text);\n}\nmain();\n",
+              "csharp": "using System;\n\nusing OpenAI.Audio;\n\nstring audioFilePath = \"audio.mp3\";\n\nAudioClient client = new(\n    model: \"whisper-1\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nAudioTranscription transcription = client.TranscribeAudio(audioFilePath);\n\nConsole.WriteLine($\"{transcription.Text}\");\n"
+            },
+            "response": "{\n  \"text\": \"Hello, my name is Wolfgang and I come from Germany. Where are you heading today?\"\n}\n"
+          }
+        }
+      }
+    },
+    "/audio/voice_consents": {
+      "post": {
+        "operationId": "createVoiceConsent",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Upload a voice consent recording.",
+        "description": "Upload a consent recording that authorizes creation of a custom voice.\n\nSee the [custom voices guide](https://developers.openai.com/api/docs/guides/text-to-speech#custom-voices) for requirements and best practices. Custom voices are limited to eligible customers.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVoiceConsentRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VoiceConsentResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create voice consent",
+          "group": "audio",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/audio/voice_consents \\\n  -X POST \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F \"name=John Doe\" \\\n  -F \"language=en-US\" \\\n  -F \"recording=@$HOME/consent_recording.wav;type=audio/x-wav\"\n"
+            }
+          }
+        }
+      },
+      "get": {
+        "operationId": "listVoiceConsents",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Returns a list of voice consent recordings.",
+        "description": "List consent recordings available to your organization for creating custom voices.\n\nSee the [custom voices guide](https://developers.openai.com/api/docs/guides/text-to-speech#custom-voices). Custom voices are limited to eligible customers.\n",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "after",
+            "required": false,
+            "schema": {
+              "type": "string"
+            },
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n"
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VoiceConsentListResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List voice consents",
+          "group": "audio",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/audio/voice_consents?limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            }
+          }
+        }
+      }
+    },
+    "/audio/voice_consents/{consent_id}": {
+      "get": {
+        "operationId": "getVoiceConsent",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Retrieves a voice consent recording.",
+        "description": "Retrieve consent recording metadata used for creating custom voices.\n\nSee the [custom voices guide](https://developers.openai.com/api/docs/guides/text-to-speech#custom-voices). Custom voices are limited to eligible customers.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "consent_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the consent recording to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VoiceConsentResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve voice consent",
+          "group": "audio",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/audio/voice_consents/cons_1234 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            }
+          }
+        }
+      },
+      "post": {
+        "operationId": "updateVoiceConsent",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Updates a voice consent recording (metadata only).",
+        "description": "Update consent recording metadata used for creating custom voices. This endpoint updates metadata only and does not replace the underlying audio.\n\nSee the [custom voices guide](https://developers.openai.com/api/docs/guides/text-to-speech#custom-voices). Custom voices are limited to eligible customers.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "consent_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the consent recording to update."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateVoiceConsentRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VoiceConsentResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update voice consent",
+          "group": "audio",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/audio/voice_consents/cons_1234 \\\n  -X POST \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"name\": \"John Doe\"\n  }'\n"
+            }
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteVoiceConsent",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Deletes a voice consent recording.",
+        "description": "Delete a consent recording that was uploaded for creating custom voices.\n\nSee the [custom voices guide](https://developers.openai.com/api/docs/guides/text-to-speech#custom-voices). Custom voices are limited to eligible customers.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "consent_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the consent recording to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VoiceConsentDeletedResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete voice consent",
+          "group": "audio",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/audio/voice_consents/cons_1234 \\\n  -X DELETE \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            }
+          }
+        }
+      }
+    },
+    "/audio/voices": {
+      "post": {
+        "operationId": "createVoice",
+        "tags": [
+          "Audio"
+        ],
+        "summary": "Creates a custom voice.",
+        "description": "Create a custom voice you can use for audio output (for example, in Text-to-Speech and the Realtime API). This requires an audio sample and a previously uploaded consent recording.\n\nSee the [custom voices guide](https://developers.openai.com/api/docs/guides/text-to-speech#custom-voices) for requirements and best practices. Custom voices are limited to eligible customers.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVoiceRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VoiceResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create voice",
+          "group": "audio",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/audio/voices \\\n  -X POST \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F \"name=My new voice\" \\\n  -F \"consent=cons_1234\" \\\n  -F \"audio_sample=@$HOME/audio_sample.wav;type=audio/x-wav\"\n"
+            }
+          }
+        }
+      }
+    },
+    "/batches": {
+      "post": {
+        "summary": "Creates and executes a batch from an uploaded file of requests",
+        "operationId": "createBatch",
+        "tags": [
+          "Batch"
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateBatchRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Batch created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Batch"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create batch",
+          "group": "batch",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/batches \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"input_file_id\": \"file-abc123\",\n    \"endpoint\": \"/v1/chat/completions\",\n    \"completion_window\": \"24h\"\n  }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.batches.create(\n  input_file_id=\"file-abc123\",\n  endpoint=\"/v1/chat/completions\",\n  completion_window=\"24h\"\n)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const batch = await openai.batches.create({\n    input_file_id: \"file-abc123\",\n    endpoint: \"/v1/chat/completions\",\n    completion_window: \"24h\"\n  });\n\n  console.log(batch);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"batch_abc123\",\n  \"object\": \"batch\",\n  \"endpoint\": \"/v1/chat/completions\",\n  \"errors\": null,\n  \"input_file_id\": \"file-abc123\",\n  \"completion_window\": \"24h\",\n  \"status\": \"validating\",\n  \"output_file_id\": null,\n  \"error_file_id\": null,\n  \"created_at\": 1711471533,\n  \"in_progress_at\": null,\n  \"expires_at\": null,\n  \"finalizing_at\": null,\n  \"completed_at\": null,\n  \"failed_at\": null,\n  \"expired_at\": null,\n  \"cancelling_at\": null,\n  \"cancelled_at\": null,\n  \"request_counts\": {\n    \"total\": 0,\n    \"completed\": 0,\n    \"failed\": 0\n  },\n  \"metadata\": {\n    \"customer_id\": \"user_123456789\",\n    \"batch_description\": \"Nightly eval job\",\n  }\n}\n"
+          }
+        }
+      },
+      "get": {
+        "operationId": "listBatches",
+        "tags": [
+          "Batch"
+        ],
+        "summary": "List your organization's batches.",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "after",
+            "required": false,
+            "schema": {
+              "type": "string"
+            },
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n"
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Batch listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListBatchesResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List batches",
+          "group": "batch",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/batches?limit=2 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.batches.list()\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const list = await openai.batches.list();\n\n  for await (const batch of list) {\n    console.log(batch);\n  }\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"batch_abc123\",\n      \"object\": \"batch\",\n      \"endpoint\": \"/v1/chat/completions\",\n      \"errors\": null,\n      \"input_file_id\": \"file-abc123\",\n      \"completion_window\": \"24h\",\n      \"status\": \"completed\",\n      \"output_file_id\": \"file-cvaTdG\",\n      \"error_file_id\": \"file-HOWS94\",\n      \"created_at\": 1711471533,\n      \"in_progress_at\": 1711471538,\n      \"expires_at\": 1711557933,\n      \"finalizing_at\": 1711493133,\n      \"completed_at\": 1711493163,\n      \"failed_at\": null,\n      \"expired_at\": null,\n      \"cancelling_at\": null,\n      \"cancelled_at\": null,\n      \"request_counts\": {\n        \"total\": 100,\n        \"completed\": 95,\n        \"failed\": 5\n      },\n      \"metadata\": {\n        \"customer_id\": \"user_123456789\",\n        \"batch_description\": \"Nightly job\",\n      }\n    },\n    { ... },\n  ],\n  \"first_id\": \"batch_abc123\",\n  \"last_id\": \"batch_abc456\",\n  \"has_more\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/batches/{batch_id}": {
+      "get": {
+        "operationId": "retrieveBatch",
+        "tags": [
+          "Batch"
+        ],
+        "summary": "Retrieves a batch.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "batch_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the batch to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Batch retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Batch"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve batch",
+          "group": "batch",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/batches/batch_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.batches.retrieve(\"batch_abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const batch = await openai.batches.retrieve(\"batch_abc123\");\n\n  console.log(batch);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"batch_abc123\",\n  \"object\": \"batch\",\n  \"endpoint\": \"/v1/completions\",\n  \"errors\": null,\n  \"input_file_id\": \"file-abc123\",\n  \"completion_window\": \"24h\",\n  \"status\": \"completed\",\n  \"output_file_id\": \"file-cvaTdG\",\n  \"error_file_id\": \"file-HOWS94\",\n  \"created_at\": 1711471533,\n  \"in_progress_at\": 1711471538,\n  \"expires_at\": 1711557933,\n  \"finalizing_at\": 1711493133,\n  \"completed_at\": 1711493163,\n  \"failed_at\": null,\n  \"expired_at\": null,\n  \"cancelling_at\": null,\n  \"cancelled_at\": null,\n  \"request_counts\": {\n    \"total\": 100,\n    \"completed\": 95,\n    \"failed\": 5\n  },\n  \"metadata\": {\n    \"customer_id\": \"user_123456789\",\n    \"batch_description\": \"Nightly eval job\",\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/batches/{batch_id}/cancel": {
+      "post": {
+        "operationId": "cancelBatch",
+        "tags": [
+          "Batch"
+        ],
+        "summary": "Cancels an in-progress batch. The batch will be in status `cancelling` for up to 10 minutes, before changing to `cancelled`, where it will have partial results (if any) available in the output file.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "batch_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the batch to cancel."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Batch is cancelling. Returns the cancelling batch's details.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Batch"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel batch",
+          "group": "batch",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/batches/batch_abc123/cancel \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -X POST\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.batches.cancel(\"batch_abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const batch = await openai.batches.cancel(\"batch_abc123\");\n\n  console.log(batch);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"batch_abc123\",\n  \"object\": \"batch\",\n  \"endpoint\": \"/v1/chat/completions\",\n  \"errors\": null,\n  \"input_file_id\": \"file-abc123\",\n  \"completion_window\": \"24h\",\n  \"status\": \"cancelling\",\n  \"output_file_id\": null,\n  \"error_file_id\": null,\n  \"created_at\": 1711471533,\n  \"in_progress_at\": 1711471538,\n  \"expires_at\": 1711557933,\n  \"finalizing_at\": null,\n  \"completed_at\": null,\n  \"failed_at\": null,\n  \"expired_at\": null,\n  \"cancelling_at\": 1711475133,\n  \"cancelled_at\": null,\n  \"request_counts\": {\n    \"total\": 100,\n    \"completed\": 23,\n    \"failed\": 1\n  },\n  \"metadata\": {\n    \"customer_id\": \"user_123456789\",\n    \"batch_description\": \"Nightly eval job\",\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/chat/completions": {
+      "get": {
+        "operationId": "listChatCompletions",
+        "tags": [
+          "Chat"
+        ],
+        "summary": "List stored Chat Completions. Only Chat Completions that have been stored\nwith the `store` parameter set to `true` will be returned.\n",
+        "parameters": [
+          {
+            "name": "model",
+            "in": "query",
+            "description": "The model used to generate the Chat Completions.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "metadata",
+            "in": "query",
+            "description": "A list of metadata keys to filter the Chat Completions by. Example:\n\n`metadata[key1]=value1&metadata[key2]=value2`\n",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/Metadata"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last chat completion from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of Chat Completions to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for Chat Completions by timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `asc`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A list of Chat Completions",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChatCompletionList"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List Chat Completions",
+          "group": "chat",
+          "path": "list",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/chat/completions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ncompletions = client.chat.completions.list()\nprint(completions)\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"chat.completion\",\n      \"id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2\",\n      \"model\": \"gpt-6-astra\",\n      \"created\": 1738960610,\n      \"request_id\": \"req_ded8ab984ec4bf840f37566c1011c417\",\n      \"tool_choice\": null,\n      \"usage\": {\n        \"total_tokens\": 31,\n        \"completion_tokens\": 18,\n        \"prompt_tokens\": 13\n      },\n      \"seed\": 4944116822809979520,\n      \"top_p\": 1.0,\n      \"temperature\": 1.0,\n      \"presence_penalty\": 0.0,\n      \"frequency_penalty\": 0.0,\n      \"system_fingerprint\": \"fp_50cad350e4\",\n      \"input_user\": null,\n      \"service_tier\": \"default\",\n      \"tools\": null,\n      \"metadata\": {},\n      \"choices\": [\n        {\n          \"index\": 0,\n          \"message\": {\n            \"content\": \"Mind of circuits hum,  \\nLearning patterns in silence—  \\nFuture's quiet spark.\",\n            \"role\": \"assistant\",\n            \"tool_calls\": null,\n            \"function_call\": null\n          },\n          \"finish_reason\": \"stop\",\n          \"logprobs\": null\n        }\n      ],\n      \"response_format\": null\n    }\n  ],\n  \"first_id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2\",\n  \"last_id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createChatCompletion",
+        "tags": [
+          "Chat"
+        ],
+        "summary": "**Starting a new project?** We recommend trying [Responses](https://developers.openai.com/api/reference/resources/responses)\nto take advantage of the latest OpenAI platform features. Compare\n[Chat Completions with Responses](https://developers.openai.com/api/docs/guides/migrate-to-responses?api-mode=responses).\n\n---\n\nCreates a model response for the given chat conversation. Learn more in the\n[text generation](https://developers.openai.com/api/docs/guides/text), [vision](https://developers.openai.com/api/docs/guides/images-vision),\nand [audio](https://developers.openai.com/api/docs/guides/audio) guides.\n\nParameter support can differ depending on the model used to generate the\nresponse, particularly for newer reasoning models. Parameters that are only\nsupported for reasoning models are noted below. For the current state of\nunsupported parameters in reasoning models,\n[refer to the reasoning guide](https://developers.openai.com/api/docs/guides/reasoning).\n\nReturns a chat completion object, or a streamed sequence of chat completion\nchunk objects if the request is streamed.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateChatCompletionRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateChatCompletionResponse"
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateChatCompletionStreamResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create chat completion",
+          "group": "chat",
+          "path": "create",
+          "examples": [
+            {
+              "title": "Default",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/chat/completions \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"messages\": [\n      {\n        \"role\": \"developer\",\n        \"content\": \"You are a helpful assistant.\"\n      },\n      {\n        \"role\": \"user\",\n        \"content\": \"Hello!\"\n      }\n    ]\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\ncompletion = client.chat.completions.create(\n  model=\"gpt-6-astra\",\n  messages=[\n    {\"role\": \"developer\", \"content\": \"You are a helpful assistant.\"},\n    {\"role\": \"user\", \"content\": \"Hello!\"}\n  ]\n)\n\nprint(completion.choices[0].message)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const completion = await openai.chat.completions.create({\n    messages: [{ role: \"developer\", content: \"You are a helpful assistant.\" }],\n    model: \"gpt-6-astra\",\n    store: true,\n  });\n\n  console.log(completion.choices[0]);\n}\n\nmain();\n",
+                "csharp": "using System;\nusing System.Collections.Generic;\n\nusing OpenAI.Chat;\n\nChatClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nList<ChatMessage> messages =\n[\n    new SystemChatMessage(\"You are a helpful assistant.\"),\n    new UserChatMessage(\"Hello!\")\n];\n\nChatCompletion completion = client.CompleteChat(messages);\n\nConsole.WriteLine(completion.Content[0].Text);\n"
+              },
+              "response": "{\n  \"id\": \"chatcmpl-B9MBs8CjcvOU2jLn4n570S5qMJKcT\",\n  \"object\": \"chat.completion\",\n  \"created\": 1741569952,\n  \"model\": \"gpt-6-astra\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": \"Hello! How can I assist you today?\",\n        \"refusal\": null,\n        \"annotations\": []\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"stop\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 19,\n    \"completion_tokens\": 10,\n    \"total_tokens\": 29,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\": 0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"service_tier\": \"default\"\n}\n"
+            },
+            {
+              "title": "Image input",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/chat/completions \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"messages\": [\n      {\n        \"role\": \"user\",\n        \"content\": [\n          {\n            \"type\": \"text\",\n            \"text\": \"What is in this image?\"\n          },\n          {\n            \"type\": \"image_url\",\n            \"image_url\": {\n              \"url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\"\n            }\n          }\n        ]\n      }\n    ],\n    \"max_tokens\": 300\n  }'\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.chat.completions.create(\n    model=\"gpt-6-astra\",\n    messages=[\n        {\n            \"role\": \"user\",\n            \"content\": [\n                {\"type\": \"text\", \"text\": \"What's in this image?\"},\n                {\n                    \"type\": \"image_url\",\n                    \"image_url\": {\n                        \"url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\",\n                    }\n                },\n            ],\n        }\n    ],\n    max_tokens=300,\n)\n\nprint(response.choices[0])\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const response = await openai.chat.completions.create({\n    model: \"gpt-6-astra\",\n    messages: [\n      {\n        role: \"user\",\n        content: [\n          { type: \"text\", text: \"What's in this image?\" },\n          {\n            type: \"image_url\",\n            image_url: {\n              \"url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\",\n            },\n          }\n        ],\n      },\n    ],\n  });\n  console.log(response.choices[0]);\n}\nmain();\n",
+                "csharp": "using System;\nusing System.Collections.Generic;\n\nusing OpenAI.Chat;\n\nChatClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nList<ChatMessage> messages =\n[\n    new UserChatMessage(\n    [\n        ChatMessageContentPart.CreateTextPart(\"What's in this image?\"),\n        ChatMessageContentPart.CreateImagePart(new Uri(\"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\"))\n    ])\n];\n\nChatCompletion completion = client.CompleteChat(messages);\n\nConsole.WriteLine(completion.Content[0].Text);\n"
+              },
+              "response": "{\n  \"id\": \"chatcmpl-B9MHDbslfkBeAs8l4bebGdFOJ6PeG\",\n  \"object\": \"chat.completion\",\n  \"created\": 1741570283,\n  \"model\": \"gpt-6-astra\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": \"The image shows a wooden boardwalk path running through a lush green field or meadow. The sky is bright blue with some scattered clouds, giving the scene a serene and peaceful atmosphere. Trees and shrubs are visible in the background.\",\n        \"refusal\": null,\n        \"annotations\": []\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"stop\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 1117,\n    \"completion_tokens\": 46,\n    \"total_tokens\": 1163,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\": 0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"service_tier\": \"default\"\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/chat/completions \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"messages\": [\n      {\n        \"role\": \"developer\",\n        \"content\": \"You are a helpful assistant.\"\n      },\n      {\n        \"role\": \"user\",\n        \"content\": \"Hello!\"\n      }\n    ],\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\ncompletion = client.chat.completions.create(\n  model=\"gpt-6-astra\",\n  messages=[\n    {\"role\": \"developer\", \"content\": \"You are a helpful assistant.\"},\n    {\"role\": \"user\", \"content\": \"Hello!\"}\n  ],\n  stream=True\n)\n\nfor chunk in completion:\n  print(chunk.choices[0].delta)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const completion = await openai.chat.completions.create({\n    model: \"gpt-6-astra\",\n    messages: [\n      {\"role\": \"developer\", \"content\": \"You are a helpful assistant.\"},\n      {\"role\": \"user\", \"content\": \"Hello!\"}\n    ],\n    stream: true,\n  });\n\n  for await (const chunk of completion) {\n    console.log(chunk.choices[0].delta.content);\n  }\n}\n\nmain();\n",
+                "csharp": "using System;\nusing System.ClientModel;\nusing System.Collections.Generic;\nusing System.Threading.Tasks;\n\nusing OpenAI.Chat;\n\nChatClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nList<ChatMessage> messages =\n[\n    new SystemChatMessage(\"You are a helpful assistant.\"),\n    new UserChatMessage(\"Hello!\")\n];\n\nAsyncCollectionResult<StreamingChatCompletionUpdate> completionUpdates = client.CompleteChatStreamingAsync(messages);\n\nawait foreach (StreamingChatCompletionUpdate completionUpdate in completionUpdates)\n{\n    if (completionUpdate.ContentUpdate.Count > 0)\n    {\n        Console.Write(completionUpdate.ContentUpdate[0].Text);\n    }\n}\n"
+              },
+              "response": "{\"id\":\"chatcmpl-123\",\"object\":\"chat.completion.chunk\",\"created\":1694268190,\"model\":\"gpt-6-astra\", \"system_fingerprint\": \"fp_44709d6fcb\", \"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\"},\"logprobs\":null,\"finish_reason\":null}]}\n\n{\"id\":\"chatcmpl-123\",\"object\":\"chat.completion.chunk\",\"created\":1694268190,\"model\":\"gpt-6-astra\", \"system_fingerprint\": \"fp_44709d6fcb\", \"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hello\"},\"logprobs\":null,\"finish_reason\":null}]}\n\n....\n\n{\"id\":\"chatcmpl-123\",\"object\":\"chat.completion.chunk\",\"created\":1694268190,\"model\":\"gpt-6-astra\", \"system_fingerprint\": \"fp_44709d6fcb\", \"choices\":[{\"index\":0,\"delta\":{},\"logprobs\":null,\"finish_reason\":\"stop\"}]}\n"
+            },
+            {
+              "title": "Functions",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/chat/completions \\\n-H \"Content-Type: application/json\" \\\n-H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n-d '{\n  \"model\": \"gpt-6-astra\",\n  \"messages\": [\n    {\n      \"role\": \"user\",\n      \"content\": \"What is the weather like in Boston today?\"\n    }\n  ],\n  \"tools\": [\n    {\n      \"type\": \"function\",\n      \"function\": {\n        \"name\": \"get_current_weather\",\n        \"description\": \"Get the current weather in a given location\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"location\": {\n              \"type\": \"string\",\n              \"description\": \"The city and state, e.g. San Francisco, CA\"\n            },\n            \"unit\": {\n              \"type\": \"string\",\n              \"enum\": [\"celsius\", \"fahrenheit\"]\n            }\n          },\n          \"required\": [\"location\"]\n        }\n      }\n    }\n  ],\n  \"tool_choice\": \"auto\"\n}'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\ntools = [\n  {\n    \"type\": \"function\",\n    \"function\": {\n      \"name\": \"get_current_weather\",\n      \"description\": \"Get the current weather in a given location\",\n      \"parameters\": {\n        \"type\": \"object\",\n        \"properties\": {\n          \"location\": {\n            \"type\": \"string\",\n            \"description\": \"The city and state, e.g. San Francisco, CA\",\n          },\n          \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]},\n        },\n        \"required\": [\"location\"],\n      },\n    }\n  }\n]\nmessages = [{\"role\": \"user\", \"content\": \"What's the weather like in Boston today?\"}]\ncompletion = client.chat.completions.create(\n  model=\"gpt-6-astra\",\n  messages=messages,\n  tools=tools,\n  tool_choice=\"auto\"\n)\n\nprint(completion)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const messages = [{\"role\": \"user\", \"content\": \"What's the weather like in Boston today?\"}];\n  const tools = [\n      {\n        \"type\": \"function\",\n        \"function\": {\n          \"name\": \"get_current_weather\",\n          \"description\": \"Get the current weather in a given location\",\n          \"parameters\": {\n            \"type\": \"object\",\n            \"properties\": {\n              \"location\": {\n                \"type\": \"string\",\n                \"description\": \"The city and state, e.g. San Francisco, CA\",\n              },\n              \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]},\n            },\n            \"required\": [\"location\"],\n          },\n        }\n      }\n  ];\n\n  const response = await openai.chat.completions.create({\n    model: \"gpt-6-astra\",\n    messages: messages,\n    tools: tools,\n    tool_choice: \"auto\",\n  });\n\n  console.log(response);\n}\n\nmain();\n",
+                "csharp": "using System;\nusing System.Collections.Generic;\n\nusing OpenAI.Chat;\n\nChatClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nChatTool getCurrentWeatherTool = ChatTool.CreateFunctionTool(\n    functionName: \"get_current_weather\",\n    functionDescription: \"Get the current weather in a given location\",\n    functionParameters: BinaryData.FromString(\"\"\"\n        {\n            \"type\": \"object\",\n            \"properties\": {\n                \"location\": {\n                    \"type\": \"string\",\n                    \"description\": \"The city and state, e.g. San Francisco, CA\"\n                },\n                \"unit\": {\n                    \"type\": \"string\",\n                    \"enum\": [ \"celsius\", \"fahrenheit\" ]\n                }\n            },\n            \"required\": [ \"location\" ]\n        }\n    \"\"\")\n);\n\nList<ChatMessage> messages =\n[\n    new UserChatMessage(\"What's the weather like in Boston today?\"),\n];\n\nChatCompletionOptions options = new()\n{\n    Tools =\n    {\n        getCurrentWeatherTool\n    },\n    ToolChoice = ChatToolChoice.CreateAutoChoice(),\n};\n\nChatCompletion completion = client.CompleteChat(messages, options);\n"
+              },
+              "response": "{\n  \"id\": \"chatcmpl-abc123\",\n  \"object\": \"chat.completion\",\n  \"created\": 1699896916,\n  \"model\": \"gpt-6-astra\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": null,\n        \"tool_calls\": [\n          {\n            \"id\": \"call_abc123\",\n            \"type\": \"function\",\n            \"function\": {\n              \"name\": \"get_current_weather\",\n              \"arguments\": \"{\\n\\\"location\\\": \\\"Boston, MA\\\"\\n}\"\n            }\n          }\n        ]\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"tool_calls\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 82,\n    \"completion_tokens\": 17,\n    \"total_tokens\": 99,\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0,\n      \"accepted_prediction_tokens\": 0,\n      \"rejected_prediction_tokens\": 0\n    }\n  }\n}\n"
+            },
+            {
+              "title": "Logprobs",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/chat/completions \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"messages\": [\n      {\n        \"role\": \"user\",\n        \"content\": \"Hello!\"\n      }\n    ],\n    \"reasoning_effort\": \"none\",\n    \"logprobs\": true,\n    \"top_logprobs\": 2\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\ncompletion = client.chat.completions.create(\n  model=\"gpt-6-astra\",\n  messages=[\n    {\"role\": \"user\", \"content\": \"Hello!\"}\n  ],\n  reasoning_effort=\"none\",\n  logprobs=True,\n  top_logprobs=2\n)\n\nprint(completion.choices[0].message)\nprint(completion.choices[0].logprobs)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const completion = await openai.chat.completions.create({\n    messages: [{ role: \"user\", content: \"Hello!\" }],\n    model: \"gpt-6-astra\",\n    reasoning_effort: \"none\",\n    logprobs: true,\n    top_logprobs: 2,\n  });\n\n  console.log(completion.choices[0]);\n}\n\nmain();\n",
+                "csharp": "using System;\nusing System.Collections.Generic;\n\nusing OpenAI.Chat;\n\nChatClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nList<ChatMessage> messages =\n[\n    new UserChatMessage(\"Hello!\")\n];\n\nChatCompletionOptions options = new()\n{\n    ReasoningEffortLevel = ChatReasoningEffortLevel.None,\n    IncludeLogProbabilities = true,\n    TopLogProbabilityCount = 2\n};\n\nChatCompletion completion = client.CompleteChat(messages, options);\n\nConsole.WriteLine(completion.Content[0].Text);\n"
+              },
+              "response": "{\n  \"id\": \"chatcmpl-123\",\n  \"object\": \"chat.completion\",\n  \"created\": 1702685778,\n  \"model\": \"gpt-6-astra\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": \"Hello! How can I assist you today?\"\n      },\n      \"logprobs\": {\n        \"content\": [\n          {\n            \"token\": \"Hello\",\n            \"logprob\": -0.31725305,\n            \"bytes\": [72, 101, 108, 108, 111],\n            \"top_logprobs\": [\n              {\n                \"token\": \"Hello\",\n                \"logprob\": -0.31725305,\n                \"bytes\": [72, 101, 108, 108, 111]\n              },\n              {\n                \"token\": \"Hi\",\n                \"logprob\": -1.3190403,\n                \"bytes\": [72, 105]\n              }\n            ]\n          },\n          {\n            \"token\": \"!\",\n            \"logprob\": -0.02380986,\n            \"bytes\": [\n              33\n            ],\n            \"top_logprobs\": [\n              {\n                \"token\": \"!\",\n                \"logprob\": -0.02380986,\n                \"bytes\": [33]\n              },\n              {\n                \"token\": \" there\",\n                \"logprob\": -3.787621,\n                \"bytes\": [32, 116, 104, 101, 114, 101]\n              }\n            ]\n          },\n          {\n            \"token\": \" How\",\n            \"logprob\": -0.000054669687,\n            \"bytes\": [32, 72, 111, 119],\n            \"top_logprobs\": [\n              {\n                \"token\": \" How\",\n                \"logprob\": -0.000054669687,\n                \"bytes\": [32, 72, 111, 119]\n              },\n              {\n                \"token\": \"<|end|>\",\n                \"logprob\": -10.953937,\n                \"bytes\": null\n              }\n            ]\n          },\n          {\n            \"token\": \" can\",\n            \"logprob\": -0.015801601,\n            \"bytes\": [32, 99, 97, 110],\n            \"top_logprobs\": [\n              {\n                \"token\": \" can\",\n                \"logprob\": -0.015801601,\n                \"bytes\": [32, 99, 97, 110]\n              },\n              {\n                \"token\": \" may\",\n                \"logprob\": -4.161023,\n                \"bytes\": [32, 109, 97, 121]\n              }\n            ]\n          },\n          {\n            \"token\": \" I\",\n            \"logprob\": -3.7697225e-6,\n            \"bytes\": [\n              32,\n              73\n            ],\n            \"top_logprobs\": [\n              {\n                \"token\": \" I\",\n                \"logprob\": -3.7697225e-6,\n                \"bytes\": [32, 73]\n              },\n              {\n                \"token\": \" assist\",\n                \"logprob\": -13.596657,\n                \"bytes\": [32, 97, 115, 115, 105, 115, 116]\n              }\n            ]\n          },\n          {\n            \"token\": \" assist\",\n            \"logprob\": -0.04571125,\n            \"bytes\": [32, 97, 115, 115, 105, 115, 116],\n            \"top_logprobs\": [\n              {\n                \"token\": \" assist\",\n                \"logprob\": -0.04571125,\n                \"bytes\": [32, 97, 115, 115, 105, 115, 116]\n              },\n              {\n                \"token\": \" help\",\n                \"logprob\": -3.1089056,\n                \"bytes\": [32, 104, 101, 108, 112]\n              }\n            ]\n          },\n          {\n            \"token\": \" you\",\n            \"logprob\": -5.4385737e-6,\n            \"bytes\": [32, 121, 111, 117],\n            \"top_logprobs\": [\n              {\n                \"token\": \" you\",\n                \"logprob\": -5.4385737e-6,\n                \"bytes\": [32, 121, 111, 117]\n              },\n              {\n                \"token\": \" today\",\n                \"logprob\": -12.807695,\n                \"bytes\": [32, 116, 111, 100, 97, 121]\n              }\n            ]\n          },\n          {\n            \"token\": \" today\",\n            \"logprob\": -0.0040071653,\n            \"bytes\": [32, 116, 111, 100, 97, 121],\n            \"top_logprobs\": [\n              {\n                \"token\": \" today\",\n                \"logprob\": -0.0040071653,\n                \"bytes\": [32, 116, 111, 100, 97, 121]\n              },\n              {\n                \"token\": \"?\",\n                \"logprob\": -5.5247097,\n                \"bytes\": [63]\n              }\n            ]\n          },\n          {\n            \"token\": \"?\",\n            \"logprob\": -0.0008108172,\n            \"bytes\": [63],\n            \"top_logprobs\": [\n              {\n                \"token\": \"?\",\n                \"logprob\": -0.0008108172,\n                \"bytes\": [63]\n              },\n              {\n                \"token\": \"?\\n\",\n                \"logprob\": -7.184561,\n                \"bytes\": [63, 10]\n              }\n            ]\n          }\n        ]\n      },\n      \"finish_reason\": \"stop\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 9,\n    \"completion_tokens\": 9,\n    \"total_tokens\": 18,\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0,\n      \"accepted_prediction_tokens\": 0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"system_fingerprint\": null\n}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/chat/completions/{completion_id}": {
+      "get": {
+        "operationId": "getChatCompletion",
+        "tags": [
+          "Chat"
+        ],
+        "summary": "Get a stored chat completion. Only Chat Completions that have been created\nwith the `store` parameter set to `true` will be returned.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "completion_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the chat completion to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A chat completion",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateChatCompletionResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get chat completion",
+          "group": "chat",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/chat/completions/chatcmpl-abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ncompletions = client.chat.completions.list()\nfirst_id = completions[0].id\nfirst_completion = client.chat.completions.retrieve(completion_id=first_id)\nprint(first_completion)\n"
+            },
+            "response": "{\n  \"object\": \"chat.completion\",\n  \"id\": \"chatcmpl-abc123\",\n  \"model\": \"gpt-6-astra\",\n  \"created\": 1738960610,\n  \"request_id\": \"req_ded8ab984ec4bf840f37566c1011c417\",\n  \"tool_choice\": null,\n  \"usage\": {\n    \"total_tokens\": 31,\n    \"completion_tokens\": 18,\n    \"prompt_tokens\": 13\n  },\n  \"seed\": 4944116822809979520,\n  \"top_p\": 1.0,\n  \"temperature\": 1.0,\n  \"presence_penalty\": 0.0,\n  \"frequency_penalty\": 0.0,\n  \"system_fingerprint\": \"fp_50cad350e4\",\n  \"input_user\": null,\n  \"service_tier\": \"default\",\n  \"tools\": null,\n  \"metadata\": {},\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"content\": \"Mind of circuits hum,  \\nLearning patterns in silence—  \\nFuture's quiet spark.\",\n        \"role\": \"assistant\",\n        \"tool_calls\": null,\n        \"function_call\": null\n      },\n      \"finish_reason\": \"stop\",\n      \"logprobs\": null\n    }\n  ],\n  \"response_format\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "updateChatCompletion",
+        "tags": [
+          "Chat"
+        ],
+        "summary": "Modify a stored chat completion. Only Chat Completions that have been\ncreated with the `store` parameter set to `true` can be modified. Currently,\nthe only supported modification is to update the `metadata` field.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "completion_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the chat completion to update."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "metadata"
+                ],
+                "properties": {
+                  "metadata": {
+                    "$ref": "#/components/schemas/Metadata"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "A chat completion",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateChatCompletionResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update chat completion",
+          "group": "chat",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/chat/completions/chat_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"metadata\": {\"foo\": \"bar\"}}'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ncompletions = client.chat.completions.list()\nfirst_id = completions[0].id\nupdated_completion = client.chat.completions.update(completion_id=first_id, request_body={\"metadata\": {\"foo\": \"bar\"}})\nprint(updated_completion)\n"
+            },
+            "response": "{\n  \"object\": \"chat.completion\",\n  \"id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2\",\n  \"model\": \"gpt-6-astra\",\n  \"created\": 1738960610,\n  \"request_id\": \"req_ded8ab984ec4bf840f37566c1011c417\",\n  \"tool_choice\": null,\n  \"usage\": {\n    \"total_tokens\": 31,\n    \"completion_tokens\": 18,\n    \"prompt_tokens\": 13\n  },\n  \"seed\": 4944116822809979520,\n  \"top_p\": 1.0,\n  \"temperature\": 1.0,\n  \"presence_penalty\": 0.0,\n  \"frequency_penalty\": 0.0,\n  \"system_fingerprint\": \"fp_50cad350e4\",\n  \"input_user\": null,\n  \"service_tier\": \"default\",\n  \"tools\": null,\n  \"metadata\": {\n    \"foo\": \"bar\"\n  },\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"content\": \"Mind of circuits hum,  \\nLearning patterns in silence—  \\nFuture's quiet spark.\",\n        \"role\": \"assistant\",\n        \"tool_calls\": null,\n        \"function_call\": null\n      },\n      \"finish_reason\": \"stop\",\n      \"logprobs\": null\n    }\n  ],\n  \"response_format\": null\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteChatCompletion",
+        "tags": [
+          "Chat"
+        ],
+        "summary": "Delete a stored chat completion. Only Chat Completions that have been\ncreated with the `store` parameter set to `true` can be deleted.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "completion_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the chat completion to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The chat completion was deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChatCompletionDeleted"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete chat completion",
+          "group": "chat",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/chat/completions/chat_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ncompletions = client.chat.completions.list()\nfirst_id = completions[0].id\ndelete_response = client.chat.completions.delete(completion_id=first_id)\nprint(delete_response)\n"
+            },
+            "response": "{\n  \"object\": \"chat.completion.deleted\",\n  \"id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/chat/completions/{completion_id}/messages": {
+      "get": {
+        "operationId": "getChatCompletionMessages",
+        "tags": [
+          "Chat"
+        ],
+        "summary": "Get the messages in a stored chat completion. Only Chat Completions that\nhave been created with the `store` parameter set to `true` will be\nreturned.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "completion_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the chat completion to retrieve messages from."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last message from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of messages to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for messages by timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `asc`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A list of messages",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChatCompletionMessageList"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get chat messages",
+          "group": "chat",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/chat/completions/chat_abc123/messages \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ncompletions = client.chat.completions.list()\nfirst_id = completions[0].id\nfirst_completion = client.chat.completions.retrieve(completion_id=first_id)\nmessages = client.chat.completions.messages.list(completion_id=first_id)\nprint(messages)\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2-0\",\n      \"role\": \"user\",\n      \"content\": \"write a haiku about ai\",\n      \"name\": null,\n      \"content_parts\": null\n    }\n  ],\n  \"first_id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2-0\",\n  \"last_id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2-0\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/completions": {
+      "post": {
+        "operationId": "createCompletion",
+        "tags": [
+          "Completions"
+        ],
+        "summary": "Creates a completion for the provided prompt and parameters.\n\nReturns a completion object, or a sequence of completion objects if the request is streamed.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateCompletionRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateCompletionResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create completion",
+          "group": "completions",
+          "legacy": true,
+          "examples": [
+            {
+              "title": "No streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/completions \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-3.5-turbo-instruct\",\n    \"prompt\": \"Say this is a test\",\n    \"max_tokens\": 7,\n    \"temperature\": 0\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.completions.create(\n  model=\"gpt-3.5-turbo-instruct\",\n  prompt=\"Say this is a test\",\n  max_tokens=7,\n  temperature=0\n)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const completion = await openai.completions.create({\n    model: \"gpt-3.5-turbo-instruct\",\n    prompt: \"Say this is a test.\",\n    max_tokens: 7,\n    temperature: 0,\n  });\n\n  console.log(completion);\n}\nmain();"
+              },
+              "response": "{\n  \"id\": \"cmpl-uqkvlQyYK7bGYrRHQ0eXlWi7\",\n  \"object\": \"text_completion\",\n  \"created\": 1589478378,\n  \"model\": \"gpt-3.5-turbo-instruct\",\n  \"system_fingerprint\": \"fp_44709d6fcb\",\n  \"choices\": [\n    {\n      \"text\": \"\\n\\nThis is indeed a test\",\n      \"index\": 0,\n      \"logprobs\": null,\n      \"finish_reason\": \"length\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 5,\n    \"completion_tokens\": 7,\n    \"total_tokens\": 12\n  }\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/completions \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-3.5-turbo-instruct\",\n    \"prompt\": \"Say this is a test\",\n    \"max_tokens\": 7,\n    \"temperature\": 0,\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nfor chunk in client.completions.create(\n  model=\"gpt-3.5-turbo-instruct\",\n  prompt=\"Say this is a test\",\n  max_tokens=7,\n  temperature=0,\n  stream=True\n):\n  print(chunk.choices[0].text)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const stream = await openai.completions.create({\n    model: \"gpt-3.5-turbo-instruct\",\n    prompt: \"Say this is a test.\",\n    stream: true,\n  });\n\n  for await (const chunk of stream) {\n    console.log(chunk.choices[0].text)\n  }\n}\nmain();"
+              },
+              "response": "{\n  \"id\": \"cmpl-7iA7iJjj8V2zOkCGvWF2hAkDWBQZe\",\n  \"object\": \"text_completion\",\n  \"created\": 1690759702,\n  \"choices\": [\n    {\n      \"text\": \"This\",\n      \"index\": 0,\n      \"logprobs\": null,\n      \"finish_reason\": null\n    }\n  ],\n  \"model\": \"gpt-3.5-turbo-instruct\"\n  \"system_fingerprint\": \"fp_44709d6fcb\",\n}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/containers": {
+      "get": {
+        "summary": "List Containers",
+        "description": "Lists containers.",
+        "operationId": "ListContainers",
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "name",
+            "in": "query",
+            "description": "Filter results by container name.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ContainerListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List containers",
+          "group": "containers",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/containers \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n        \"id\": \"cntr_682dfebaacac8198bbfe9c2474fb6f4a085685cbe3cb5863\",\n        \"object\": \"container\",\n        \"created_at\": 1747844794,\n        \"status\": \"running\",\n        \"expires_after\": {\n            \"anchor\": \"last_active_at\",\n            \"minutes\": 20\n        },\n        \"last_active_at\": 1747844794,\n        \"memory_limit\": \"4g\",\n        \"name\": \"My Container\"\n    }\n  ],\n  \"first_id\": \"container_123\",\n  \"last_id\": \"container_123\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "summary": "Create Container",
+        "description": "Creates a container.",
+        "operationId": "CreateContainer",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateContainerBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ContainerResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create container",
+          "group": "containers",
+          "path": "post",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/containers \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n        \"name\": \"My Container\",\n        \"memory_limit\": \"4g\",\n        \"skills\": [\n          {\n            \"type\": \"skill_reference\",\n            \"skill_id\": \"skill_4db6f1a2c9e73508b41f9da06e2c7b5f\"\n          },\n          {\n            \"type\": \"skill_reference\",\n            \"skill_id\": \"openai-spreadsheets\",\n            \"version\": \"latest\"\n          }\n        ],\n        \"network_policy\": {\n          \"type\": \"allowlist\",\n          \"allowed_domains\": [\"api.buildkite.com\"]\n        }\n      }'\n"
+            },
+            "response": "{\n    \"id\": \"cntr_682e30645a488191b6363a0cbefc0f0a025ec61b66250591\",\n    \"object\": \"container\",\n    \"created_at\": 1747857508,\n    \"status\": \"running\",\n    \"expires_after\": {\n        \"anchor\": \"last_active_at\",\n        \"minutes\": 20\n    },\n    \"last_active_at\": 1747857508,\n    \"network_policy\": {\n        \"type\": \"allowlist\",\n        \"allowed_domains\": [\"api.buildkite.com\"]\n    },\n    \"memory_limit\": \"4g\",\n    \"name\": \"My Container\"\n}\n"
+          }
+        }
+      }
+    },
+    "/containers/{container_id}": {
+      "get": {
+        "summary": "Retrieve Container",
+        "description": "Retrieves a container.",
+        "operationId": "RetrieveContainer",
+        "parameters": [
+          {
+            "name": "container_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ContainerResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve container",
+          "group": "containers",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/containers/cntr_682dfebaacac8198bbfe9c2474fb6f4a085685cbe3cb5863 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n    \"id\": \"cntr_682dfebaacac8198bbfe9c2474fb6f4a085685cbe3cb5863\",\n    \"object\": \"container\",\n    \"created_at\": 1747844794,\n    \"status\": \"running\",\n    \"expires_after\": {\n        \"anchor\": \"last_active_at\",\n        \"minutes\": 20\n    },\n    \"last_active_at\": 1747844794,\n    \"memory_limit\": \"4g\",\n    \"name\": \"My Container\"\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "DeleteContainer",
+        "summary": "Delete Container",
+        "description": "Delete a container.",
+        "parameters": [
+          {
+            "name": "container_id",
+            "in": "path",
+            "description": "The ID of the container to delete.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a container",
+          "group": "containers",
+          "path": "delete",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/containers/cntr_682dfebaacac8198bbfe9c2474fb6f4a085685cbe3cb5863 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n    \"id\": \"cntr_682dfebaacac8198bbfe9c2474fb6f4a085685cbe3cb5863\",\n    \"object\": \"container.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/containers/{container_id}/files": {
+      "post": {
+        "summary": "Create a Container File\n\nYou can send either a multipart/form-data request with the raw file content, or a JSON request with a file ID.\n",
+        "description": "Creates a container file.\n",
+        "operationId": "CreateContainerFile",
+        "parameters": [
+          {
+            "name": "container_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateContainerFileBody"
+              }
+            },
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateContainerFileBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ContainerFileResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create container file",
+          "group": "containers",
+          "path": "post",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/containers/cntr_682e0e7318108198aa783fd921ff305e08e78805b9fdbb04/files \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F file=\"@example.txt\"\n"
+            },
+            "response": "{\n  \"id\": \"cfile_682e0e8a43c88191a7978f477a09bdf5\",\n  \"object\": \"container.file\",\n  \"created_at\": 1747848842,\n  \"bytes\": 880,\n  \"container_id\": \"cntr_682e0e7318108198aa783fd921ff305e08e78805b9fdbb04\",\n  \"path\": \"/mnt/data/88e12fa445d32636f190a0b33daed6cb-tsconfig.json\",\n  \"source\": \"user\"\n}\n"
+          }
+        }
+      },
+      "get": {
+        "summary": "List Container files",
+        "description": "Lists container files.",
+        "operationId": "ListContainerFiles",
+        "parameters": [
+          {
+            "name": "container_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ContainerFileListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List container files",
+          "group": "containers",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/containers/cntr_682e0e7318108198aa783fd921ff305e08e78805b9fdbb04/files \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"cfile_682e0e8a43c88191a7978f477a09bdf5\",\n            \"object\": \"container.file\",\n            \"created_at\": 1747848842,\n            \"bytes\": 880,\n            \"container_id\": \"cntr_682e0e7318108198aa783fd921ff305e08e78805b9fdbb04\",\n            \"path\": \"/mnt/data/88e12fa445d32636f190a0b33daed6cb-tsconfig.json\",\n            \"source\": \"user\"\n        }\n    ],\n    \"first_id\": \"cfile_682e0e8a43c88191a7978f477a09bdf5\",\n    \"has_more\": false,\n    \"last_id\": \"cfile_682e0e8a43c88191a7978f477a09bdf5\"\n}\n"
+          }
+        }
+      }
+    },
+    "/containers/{container_id}/files/{file_id}": {
+      "get": {
+        "summary": "Retrieve Container File",
+        "description": "Retrieves a container file.",
+        "operationId": "RetrieveContainerFile",
+        "parameters": [
+          {
+            "name": "container_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "file_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ContainerFileResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve container file",
+          "group": "containers",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/containers/container_123/files/file_456 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n    \"id\": \"cfile_682e0e8a43c88191a7978f477a09bdf5\",\n    \"object\": \"container.file\",\n    \"created_at\": 1747848842,\n    \"bytes\": 880,\n    \"container_id\": \"cntr_682e0e7318108198aa783fd921ff305e08e78805b9fdbb04\",\n    \"path\": \"/mnt/data/88e12fa445d32636f190a0b33daed6cb-tsconfig.json\",\n    \"source\": \"user\"\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "DeleteContainerFile",
+        "summary": "Delete Container File",
+        "description": "Delete a container file.",
+        "parameters": [
+          {
+            "name": "container_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "file_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a container file",
+          "group": "containers",
+          "path": "delete",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/containers/cntr_682dfebaacac8198bbfe9c2474fb6f4a085685cbe3cb5863/files/cfile_682e0e8a43c88191a7978f477a09bdf5 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n    \"id\": \"cfile_682e0e8a43c88191a7978f477a09bdf5\",\n    \"object\": \"container.file.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/containers/{container_id}/files/{file_id}/content": {
+      "get": {
+        "summary": "Retrieve Container File Content",
+        "description": "Retrieves a container file content.",
+        "operationId": "RetrieveContainerFileContent",
+        "parameters": [
+          {
+            "name": "container_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "file_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve container file content",
+          "group": "containers",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/containers/container_123/files/cfile_456/content \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "<binary content of the file>\n"
+          }
+        }
+      }
+    },
+    "/conversations/{conversation_id}/items": {
+      "post": {
+        "operationId": "createConversationItems",
+        "tags": [
+          "Conversations"
+        ],
+        "summary": "Create items in a conversation with the given ID.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "conversation_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "conv_123"
+            },
+            "description": "The ID of the conversation to add the item to."
+          },
+          {
+            "name": "include",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/IncludeEnum"
+              }
+            },
+            "description": "Additional fields to include in the response. See the `include`\nparameter for [listing Conversation items above](https://developers.openai.com/api/reference/resources/conversations/subresources/items/methods/list#%28resource%29%20conversations.items%20%3E%20%28method%29%20list%20%3E%20%28params%29%20default%20%3E%20%28param%29%20include%20%3E%20%28schema%29) for more information.\n"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "properties": {
+                  "items": {
+                    "type": "array",
+                    "description": "The items to add to the conversation. You may add up to 20 items at a time.\n",
+                    "items": {
+                      "$ref": "#/components/schemas/InputItem"
+                    },
+                    "maxItems": 20
+                  }
+                },
+                "required": [
+                  "items"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConversationItemList"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create items",
+          "group": "conversations",
+          "path": "create-item",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/conversations/conv_123/items \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"items\": [\n      {\n        \"type\": \"message\",\n        \"role\": \"user\",\n        \"content\": [\n          {\"type\": \"input_text\", \"text\": \"Hello!\"}\n        ]\n      },\n      {\n        \"type\": \"message\",\n        \"role\": \"user\",\n        \"content\": [\n          {\"type\": \"input_text\", \"text\": \"How are you?\"}\n        ]\n      }\n    ]\n  }'\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst items = await client.conversations.items.create(\n  \"conv_123\",\n  {\n    items: [\n      {\n        type: \"message\",\n        role: \"user\",\n        content: [{ type: \"input_text\", text: \"Hello!\" }],\n      },\n      {\n        type: \"message\",\n        role: \"user\",\n        content: [{ type: \"input_text\", text: \"How are you?\" }],\n      },\n    ],\n  }\n);\nconsole.log(items.data);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nitems = client.conversations.items.create(\n  \"conv_123\",\n  items=[\n    {\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": [{\"type\": \"input_text\", \"text\": \"Hello!\"}],\n    },\n    {\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": [{\"type\": \"input_text\", \"text\": \"How are you?\"}],\n    }\n  ],\n)\nprint(items.data)\n",
+              "csharp": "using System;\nusing System.Collections.Generic;\nusing OpenAI.Conversations;\n\nOpenAIConversationClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nConversationItemList created = client.ConversationItems.Create(\n    conversationId: \"conv_123\",\n    new CreateConversationItemsOptions\n    {\n        Items = new List<ConversationItem>\n        {\n            new ConversationMessage\n            {\n                Role = \"user\",\n                Content =\n                {\n                    new ConversationInputText { Text = \"Hello!\" }\n                }\n            },\n            new ConversationMessage\n            {\n                Role = \"user\",\n                Content =\n                {\n                    new ConversationInputText { Text = \"How are you?\" }\n                }\n            }\n        }\n    }\n);\nConsole.WriteLine(created.Data.Count);\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_abc\",\n      \"status\": \"completed\",\n      \"role\": \"user\",\n      \"content\": [\n        {\"type\": \"input_text\", \"text\": \"Hello!\"}\n      ]\n    },\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_def\",\n      \"status\": \"completed\",\n      \"role\": \"user\",\n      \"content\": [\n        {\"type\": \"input_text\", \"text\": \"How are you?\"}\n      ]\n    }\n  ],\n  \"first_id\": \"msg_abc\",\n  \"last_id\": \"msg_def\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "get": {
+        "operationId": "listConversationItems",
+        "tags": [
+          "Conversations"
+        ],
+        "summary": "List all items for a conversation with the given ID.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "conversation_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "conv_123"
+            },
+            "description": "The ID of the conversation to list items for."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between\n1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "in": "query",
+            "name": "order",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            },
+            "description": "The order to return the input items in. Default is `desc`.\n- `asc`: Return the input items in ascending order.\n- `desc`: Return the input items in descending order.\n"
+          },
+          {
+            "in": "query",
+            "name": "after",
+            "schema": {
+              "type": "string"
+            },
+            "description": "An item ID to list items after, used in pagination.\n"
+          },
+          {
+            "name": "include",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/IncludeEnum"
+              }
+            },
+            "description": "Specify additional output data to include in the model response. Currently supported values are:\n- `web_search_call.action.sources`: Include the sources of the web search tool call.\n- `code_interpreter_call.outputs`: Includes the outputs of python code execution in code interpreter tool call items.\n- `computer_call_output.output.image_url`: Include image urls from the computer call output.\n- `file_search_call.results`: Include the search results of the file search tool call.\n- `message.input_image.image_url`: Include image urls from the input message.\n- `message.output_text.logprobs`: Include logprobs with assistant messages.\n- `reasoning.encrypted_content`: Includes an encrypted version of reasoning tokens in reasoning item outputs. This enables reasoning items to be used in multi-turn conversations when using the Responses API statelessly (like when the `store` parameter is set to `false`, or when an organization is enrolled in the zero data retention program)."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConversationItemList"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List items",
+          "group": "conversations",
+          "path": "list-items",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/conversations/conv_123/items?limit=10\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst items = await client.conversations.items.list(\"conv_123\", { limit: 10 });\nconsole.log(items.data);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nitems = client.conversations.items.list(\"conv_123\", limit=10)\nprint(items.data)\n",
+              "csharp": "using System;\nusing OpenAI.Conversations;\n\nOpenAIConversationClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nConversationItemList items = client.ConversationItems.List(\n    conversationId: \"conv_123\",\n    new ListConversationItemsOptions { Limit = 10 }\n);\nConsole.WriteLine(items.Data.Count);\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_abc\",\n      \"status\": \"completed\",\n      \"role\": \"user\",\n      \"content\": [\n        {\"type\": \"input_text\", \"text\": \"Hello!\"}\n      ]\n    }\n  ],\n  \"first_id\": \"msg_abc\",\n  \"last_id\": \"msg_abc\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/conversations/{conversation_id}/items/{item_id}": {
+      "get": {
+        "operationId": "getConversationItem",
+        "tags": [
+          "Conversations"
+        ],
+        "summary": "Get a single item from a conversation with the given IDs.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "conversation_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "conv_123"
+            },
+            "description": "The ID of the conversation that contains the item."
+          },
+          {
+            "in": "path",
+            "name": "item_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "msg_abc"
+            },
+            "description": "The ID of the item to retrieve."
+          },
+          {
+            "name": "include",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/IncludeEnum"
+              }
+            },
+            "description": "Additional fields to include in the response. See the `include`\nparameter for [listing Conversation items above](https://developers.openai.com/api/reference/resources/conversations/subresources/items/methods/list#%28resource%29%20conversations.items%20%3E%20%28method%29%20list%20%3E%20%28params%29%20default%20%3E%20%28param%29%20include%20%3E%20%28schema%29) for more information.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConversationItem"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an item",
+          "group": "conversations",
+          "path": "get-item",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/conversations/conv_123/items/msg_abc \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst item = await client.conversations.items.retrieve(\n  \"conv_123\",\n  \"msg_abc\"\n);\nconsole.log(item);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nitem = client.conversations.items.retrieve(\"conv_123\", \"msg_abc\")\nprint(item)\n",
+              "csharp": "using System;\nusing OpenAI.Conversations;\n\nOpenAIConversationClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nConversationItem item = client.ConversationItems.Get(\n    conversationId: \"conv_123\",\n    itemId: \"msg_abc\"\n);\nConsole.WriteLine(item.Id);\n"
+            },
+            "response": "{\n  \"type\": \"message\",\n  \"id\": \"msg_abc\",\n  \"status\": \"completed\",\n  \"role\": \"user\",\n  \"content\": [\n    {\"type\": \"input_text\", \"text\": \"Hello!\"}\n  ]\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteConversationItem",
+        "tags": [
+          "Conversations"
+        ],
+        "summary": "Delete an item from a conversation with the given IDs.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "conversation_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "conv_123"
+            },
+            "description": "The ID of the conversation that contains the item."
+          },
+          {
+            "in": "path",
+            "name": "item_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "msg_abc"
+            },
+            "description": "The ID of the item to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConversationResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an item",
+          "group": "conversations",
+          "path": "delete-item",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/conversations/conv_123/items/msg_abc \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst conversation = await client.conversations.items.delete(\n  \"conv_123\",\n  \"msg_abc\"\n);\nconsole.log(conversation);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nconversation = client.conversations.items.delete(\"conv_123\", \"msg_abc\")\nprint(conversation)\n",
+              "csharp": "using System;\nusing OpenAI.Conversations;\n\nOpenAIConversationClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nConversation conversation = client.ConversationItems.Delete(\n    conversationId: \"conv_123\",\n    itemId: \"msg_abc\"\n);\nConsole.WriteLine(conversation.Id);\n"
+            },
+            "response": "{\n  \"id\": \"conv_123\",\n  \"object\": \"conversation\",\n  \"created_at\": 1741900000,\n  \"metadata\": {\"topic\": \"demo\"}\n}\n"
+          }
+        }
+      }
+    },
+    "/embeddings": {
+      "post": {
+        "operationId": "createEmbedding",
+        "tags": [
+          "Embeddings"
+        ],
+        "summary": "Creates an embedding vector representing the input text.",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateEmbeddingRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateEmbeddingResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create embeddings",
+          "group": "embeddings",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/embeddings \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"input\": \"The food was delicious and the waiter...\",\n    \"model\": \"text-embedding-ada-002\",\n    \"encoding_format\": \"float\"\n  }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.embeddings.create(\n  model=\"text-embedding-ada-002\",\n  input=\"The food was delicious and the waiter...\",\n  encoding_format=\"float\"\n)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const embedding = await openai.embeddings.create({\n    model: \"text-embedding-ada-002\",\n    input: \"The quick brown fox jumped over the lazy dog\",\n    encoding_format: \"float\",\n  });\n\n  console.log(embedding);\n}\n\nmain();\n",
+              "csharp": "using System;\n\nusing OpenAI.Embeddings;\n\nEmbeddingClient client = new(\n    model: \"text-embedding-3-small\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nOpenAIEmbedding embedding = client.GenerateEmbedding(input: \"The quick brown fox jumped over the lazy dog\");\nReadOnlyMemory<float> vector = embedding.ToFloats();\n\nfor (int i = 0; i < vector.Length; i++)\n{\n    Console.WriteLine($\"  [{i,4}] = {vector.Span[i]}\");\n}\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"embedding\",\n      \"embedding\": [\n        0.0023064255,\n        -0.009327292,\n        .... (1536 floats total for ada-002)\n        -0.0028842222,\n      ],\n      \"index\": 0\n    }\n  ],\n  \"model\": \"text-embedding-ada-002\",\n  \"usage\": {\n    \"prompt_tokens\": 8,\n    \"total_tokens\": 8\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/evals": {
+      "get": {
+        "operationId": "listEvals",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "List evaluations for a project.\n",
+        "parameters": [
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last eval from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of evals to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for evals by timestamp. Use `asc` for ascending order or `desc` for descending order.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          },
+          {
+            "name": "order_by",
+            "in": "query",
+            "description": "Evals can be ordered by creation time or last updated time. Use\n`created_at` for creation time or `updated_at` for last updated time.\n",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "created_at",
+                "updated_at"
+              ],
+              "default": "created_at"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A list of evals",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EvalList"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List evals",
+          "group": "evals",
+          "path": "list",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals?limit=1 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nevals = client.evals.list(limit=1)\nprint(evals)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst evals = await openai.evals.list({ limit: 1 });\nconsole.log(evals);\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n      \"object\": \"eval\",\n      \"data_source_config\": {\n        \"type\": \"stored_completions\",\n        \"metadata\": {\n          \"usecase\": \"push_notifications_summarizer\"\n        },\n        \"schema\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"item\": {\n              \"type\": \"object\"\n            },\n            \"sample\": {\n              \"type\": \"object\"\n            }\n          },\n          \"required\": [\n            \"item\",\n            \"sample\"\n          ]\n        }\n      },\n      \"testing_criteria\": [\n        {\n          \"name\": \"Push Notification Summary Grader\",\n          \"id\": \"Push Notification Summary Grader-9b876f24-4762-4be9-aff4-db7a9b31c673\",\n          \"type\": \"label_model\",\n          \"model\": \"o3-mini\",\n          \"input\": [\n            {\n              \"type\": \"message\",\n              \"role\": \"developer\",\n              \"content\": {\n                \"type\": \"input_text\",\n                \"text\": \"\\nLabel the following push notification summary as either correct or incorrect.\\nThe push notification and the summary will be provided below.\\nA good push notificiation summary is concise and snappy.\\nIf it is good, then label it as correct, if not, then incorrect.\\n\"\n              }\n            },\n            {\n              \"type\": \"message\",\n              \"role\": \"user\",\n              \"content\": {\n                \"type\": \"input_text\",\n                \"text\": \"\\nPush notifications: {{item.input}}\\nSummary: {{sample.output_text}}\\n\"\n              }\n            }\n          ],\n          \"passing_labels\": [\n            \"correct\"\n          ],\n          \"labels\": [\n            \"correct\",\n            \"incorrect\"\n          ],\n          \"sampling_params\": null\n        }\n      ],\n      \"name\": \"Push Notification Summary Grader\",\n      \"created_at\": 1739314509,\n      \"metadata\": {\n        \"description\": \"A stored completions eval for push notification summaries\"\n      }\n    }\n  ],\n  \"first_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"last_id\": \"eval_67aa884cf6688190b58f657d4441c8b7\",\n  \"has_more\": true\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createEval",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Create the structure of an evaluation that can be used to test a model's performance.\nAn evaluation is a set of testing criteria and the config for a data source, which dictates the schema of the data used in the evaluation. After creating an evaluation, you can run it on different models and model parameters. We support several types of graders and datasources.\nFor more information, see the [Evals guide](https://developers.openai.com/api/docs/guides/evals).\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateEvalRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Eval"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create eval",
+          "group": "evals",
+          "path": "post",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n        \"name\": \"Sentiment\",\n        \"data_source_config\": {\n          \"type\": \"stored_completions\",\n          \"metadata\": {\n              \"usecase\": \"chatbot\"\n          }\n        },\n        \"testing_criteria\": [\n          {\n            \"type\": \"label_model\",\n            \"model\": \"o3-mini\",\n            \"input\": [\n              {\n                \"role\": \"developer\",\n                \"content\": \"Classify the sentiment of the following statement as one of 'positive', 'neutral', or 'negative'\"\n              },\n              {\n                \"role\": \"user\",\n                \"content\": \"Statement: {{item.input}}\"\n              }\n            ],\n            \"passing_labels\": [\n              \"positive\"\n            ],\n            \"labels\": [\n              \"positive\",\n              \"neutral\",\n              \"negative\"\n            ],\n            \"name\": \"Example label grader\"\n          }\n        ]\n      }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\neval_obj = client.evals.create(\n  name=\"Sentiment\",\n  data_source_config={\n    \"type\": \"stored_completions\",\n    \"metadata\": {\"usecase\": \"chatbot\"}\n  },\n  testing_criteria=[\n    {\n      \"type\": \"label_model\",\n      \"model\": \"o3-mini\",\n      \"input\": [\n        {\"role\": \"developer\", \"content\": \"Classify the sentiment of the following statement as one of 'positive', 'neutral', or 'negative'\"},\n        {\"role\": \"user\", \"content\": \"Statement: {{item.input}}\"}\n      ],\n      \"passing_labels\": [\"positive\"],\n      \"labels\": [\"positive\", \"neutral\", \"negative\"],\n      \"name\": \"Example label grader\"\n    }\n  ]\n)\nprint(eval_obj)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst evalObj = await openai.evals.create({\n  name: \"Sentiment\",\n  data_source_config: {\n    type: \"stored_completions\",\n    metadata: { usecase: \"chatbot\" }\n  },\n  testing_criteria: [\n    {\n      type: \"label_model\",\n      model: \"o3-mini\",\n      input: [\n        { role: \"developer\", content: \"Classify the sentiment of the following statement as one of 'positive', 'neutral', or 'negative'\" },\n        { role: \"user\", content: \"Statement: {{item.input}}\" }\n      ],\n      passing_labels: [\"positive\"],\n      labels: [\"positive\", \"neutral\", \"negative\"],\n      name: \"Example label grader\"\n    }\n  ]\n});\nconsole.log(evalObj);\n"
+            },
+            "response": "{\n  \"object\": \"eval\",\n  \"id\": \"eval_67b7fa9a81a88190ab4aa417e397ea21\",\n  \"data_source_config\": {\n    \"type\": \"stored_completions\",\n    \"metadata\": {\n      \"usecase\": \"chatbot\"\n    },\n    \"schema\": {\n      \"type\": \"object\",\n      \"properties\": {\n        \"item\": {\n          \"type\": \"object\"\n        },\n        \"sample\": {\n          \"type\": \"object\"\n        }\n      },\n      \"required\": [\n        \"item\",\n        \"sample\"\n      ]\n  },\n  \"testing_criteria\": [\n    {\n      \"name\": \"Example label grader\",\n      \"type\": \"label_model\",\n      \"model\": \"o3-mini\",\n      \"input\": [\n        {\n          \"type\": \"message\",\n          \"role\": \"developer\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"Classify the sentiment of the following statement as one of positive, neutral, or negative\"\n          }\n        },\n        {\n          \"type\": \"message\",\n          \"role\": \"user\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"Statement: {{item.input}}\"\n          }\n        }\n      ],\n      \"passing_labels\": [\n        \"positive\"\n      ],\n      \"labels\": [\n        \"positive\",\n        \"neutral\",\n        \"negative\"\n      ]\n    }\n  ],\n  \"name\": \"Sentiment\",\n  \"created_at\": 1740110490,\n  \"metadata\": {\n    \"description\": \"An eval for sentiment analysis\"\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/evals/{eval_id}": {
+      "get": {
+        "operationId": "getEval",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Get an evaluation by ID.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The evaluation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Eval"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get an eval",
+          "group": "evals",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/eval_67abd54d9b0081909a86353f6fb9317a \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\neval_obj = client.evals.retrieve(\"eval_67abd54d9b0081909a86353f6fb9317a\")\nprint(eval_obj)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst evalObj = await openai.evals.retrieve(\"eval_67abd54d9b0081909a86353f6fb9317a\");\nconsole.log(evalObj);\n"
+            },
+            "response": "{\n  \"object\": \"eval\",\n  \"id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"data_source_config\": {\n    \"type\": \"custom\",\n    \"schema\": {\n      \"type\": \"object\",\n      \"properties\": {\n        \"item\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"input\": {\n              \"type\": \"string\"\n            },\n            \"ground_truth\": {\n              \"type\": \"string\"\n            }\n          },\n          \"required\": [\n            \"input\",\n            \"ground_truth\"\n          ]\n        }\n      },\n      \"required\": [\n        \"item\"\n      ]\n    }\n  },\n  \"testing_criteria\": [\n    {\n      \"name\": \"String check\",\n      \"id\": \"String check-2eaf2d8d-d649-4335-8148-9535a7ca73c2\",\n      \"type\": \"string_check\",\n      \"input\": \"{{item.input}}\",\n      \"reference\": \"{{item.ground_truth}}\",\n      \"operation\": \"eq\"\n    }\n  ],\n  \"name\": \"External Data Eval\",\n  \"created_at\": 1739314509,\n  \"metadata\": {},\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "updateEval",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Update certain properties of an evaluation.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to update."
+          }
+        ],
+        "requestBody": {
+          "description": "Request to update an evaluation",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "description": "Rename the evaluation."
+                  },
+                  "metadata": {
+                    "$ref": "#/components/schemas/Metadata"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The updated evaluation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Eval"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update an eval",
+          "group": "evals",
+          "path": "update",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/eval_67abd54d9b0081909a86353f6fb9317a \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"name\": \"Updated Eval\", \"metadata\": {\"description\": \"Updated description\"}}'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nupdated_eval = client.evals.update(\n  \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  name=\"Updated Eval\",\n  metadata={\"description\": \"Updated description\"}\n)\nprint(updated_eval)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst updatedEval = await openai.evals.update(\n  \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  {\n    name: \"Updated Eval\",\n    metadata: { description: \"Updated description\" }\n  }\n);\nconsole.log(updatedEval);\n"
+            },
+            "response": "{\n  \"object\": \"eval\",\n  \"id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"data_source_config\": {\n    \"type\": \"custom\",\n    \"schema\": {\n      \"type\": \"object\",\n      \"properties\": {\n        \"item\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"input\": {\n              \"type\": \"string\"\n            },\n            \"ground_truth\": {\n              \"type\": \"string\"\n            }\n          },\n          \"required\": [\n            \"input\",\n            \"ground_truth\"\n          ]\n        }\n      },\n      \"required\": [\n        \"item\"\n      ]\n    }\n  },\n  \"testing_criteria\": [\n    {\n      \"name\": \"String check\",\n      \"id\": \"String check-2eaf2d8d-d649-4335-8148-9535a7ca73c2\",\n      \"type\": \"string_check\",\n      \"input\": \"{{item.input}}\",\n      \"reference\": \"{{item.ground_truth}}\",\n      \"operation\": \"eq\"\n    }\n  ],\n  \"name\": \"Updated Eval\",\n  \"created_at\": 1739314509,\n  \"metadata\": {\"description\": \"Updated description\"},\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteEval",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Delete an evaluation.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully deleted the evaluation.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "object": {
+                      "type": "string",
+                      "example": "eval.deleted"
+                    },
+                    "deleted": {
+                      "type": "boolean",
+                      "example": true
+                    },
+                    "eval_id": {
+                      "type": "string",
+                      "example": "eval_abc123"
+                    }
+                  },
+                  "required": [
+                    "object",
+                    "deleted",
+                    "eval_id"
+                  ]
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Evaluation not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an eval",
+          "group": "evals",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/eval_abc123 \\\n  -X DELETE \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ndeleted = client.evals.delete(\"eval_abc123\")\nprint(deleted)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst deleted = await openai.evals.delete(\"eval_abc123\");\nconsole.log(deleted);\n"
+            },
+            "response": "{\n  \"object\": \"eval.deleted\",\n  \"deleted\": true,\n  \"eval_id\": \"eval_abc123\"\n}\n"
+          }
+        }
+      }
+    },
+    "/evals/{eval_id}/runs": {
+      "get": {
+        "operationId": "getEvalRuns",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Get a list of runs for an evaluation.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to retrieve runs for."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last run from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of runs to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for runs by timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `asc`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          },
+          {
+            "name": "status",
+            "in": "query",
+            "description": "Filter runs by status. One of `queued` | `in_progress` | `failed` | `completed` | `canceled`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "queued",
+                "in_progress",
+                "completed",
+                "canceled",
+                "failed"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A list of runs for the evaluation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EvalRunList"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get eval runs",
+          "group": "evals",
+          "path": "get-runs",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/egroup_67abd54d9b0081909a86353f6fb9317a/runs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nruns = client.evals.runs.list(\"egroup_67abd54d9b0081909a86353f6fb9317a\")\nprint(runs)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst runs = await openai.evals.runs.list(\"egroup_67abd54d9b0081909a86353f6fb9317a\");\nconsole.log(runs);\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"eval.run\",\n      \"id\": \"evalrun_67e0c7d31560819090d60c0780591042\",\n      \"eval_id\": \"eval_67e0c726d560819083f19a957c4c640b\",\n      \"report_url\": \"https://platform.openai.com/evaluations/eval_67e0c726d560819083f19a957c4c640b\",\n      \"status\": \"completed\",\n      \"model\": \"o3-mini\",\n      \"name\": \"bulk_with_negative_examples_o3-mini\",\n      \"created_at\": 1742784467,\n      \"result_counts\": {\n        \"total\": 1,\n        \"errored\": 0,\n        \"failed\": 0,\n        \"passed\": 1\n      },\n      \"per_model_usage\": [\n        {\n          \"model_name\": \"o3-mini\",\n          \"invocation_count\": 1,\n          \"prompt_tokens\": 563,\n          \"completion_tokens\": 874,\n          \"total_tokens\": 1437,\n          \"cached_tokens\": 0\n        }\n      ],\n      \"per_testing_criteria_results\": [\n        {\n          \"testing_criteria\": \"Push Notification Summary Grader-1808cd0b-eeec-4e0b-a519-337e79f4f5d1\",\n          \"passed\": 1,\n          \"failed\": 0\n        }\n      ],\n      \"data_source\": {\n        \"type\": \"completions\",\n        \"source\": {\n          \"type\": \"file_content\",\n          \"content\": [\n            {\n              \"item\": {\n                \"notifications\": \"\\n- New message from Sarah: \\\"Can you call me later?\\\"\\n- Your package has been delivered!\\n- Flash sale: 20% off electronics for the next 2 hours!\\n\"\n              }\n            }\n          ]\n        },\n        \"input_messages\": {\n          \"type\": \"template\",\n          \"template\": [\n            {\n              \"type\": \"message\",\n              \"role\": \"developer\",\n              \"content\": {\n                \"type\": \"input_text\",\n                \"text\": \"\\n\\n\\n\\nYou are a helpful assistant that takes in an array of push notifications and returns a collapsed summary of them.\\nThe push notification will be provided as follows:\\n<push_notifications>\\n...notificationlist...\\n</push_notifications>\\n\\nYou should return just the summary and nothing else.\\n\\n\\nYou should return a summary that is concise and snappy.\\n\\n\\nHere is an example of a good summary:\\n<push_notifications>\\n- Traffic alert: Accident reported on Main Street.- Package out for delivery: Expected by 5 PM.- New friend suggestion: Connect with Emma.\\n</push_notifications>\\n<summary>\\nTraffic alert, package expected by 5pm, suggestion for new friend (Emily).\\n</summary>\\n\\n\\nHere is an example of a bad summary:\\n<push_notifications>\\n- Traffic alert: Accident reported on Main Street.- Package out for delivery: Expected by 5 PM.- New friend suggestion: Connect with Emma.\\n</push_notifications>\\n<summary>\\nTraffic alert reported on main street. You have a package that will arrive by 5pm, Emily is a new friend suggested for you.\\n</summary>\\n\"\n              }\n            },\n            {\n              \"type\": \"message\",\n              \"role\": \"user\",\n              \"content\": {\n                \"type\": \"input_text\",\n                \"text\": \"<push_notifications>{{item.notifications}}</push_notifications>\"\n              }\n            }\n          ]\n        },\n        \"model\": \"o3-mini\",\n        \"sampling_params\": null\n      },\n      \"error\": null,\n      \"metadata\": {}\n    }\n  ],\n  \"first_id\": \"evalrun_67e0c7d31560819090d60c0780591042\",\n  \"last_id\": \"evalrun_67e0c7d31560819090d60c0780591042\",\n  \"has_more\": true\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createEvalRun",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Kicks off a new run for a given evaluation, specifying the data source, and what model configuration to use to test. The datasource will be validated against the schema specified in the config of the evaluation.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "eval_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to create a run for."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateEvalRunRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Successfully created a run for the evaluation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EvalRun"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request (for example, missing eval object)",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create eval run",
+          "group": "evals",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/eval_67e579652b548190aaa83ada4b125f47/runs \\\n  -X POST \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"name\":\"gpt-6-astra\",\"data_source\":{\"type\":\"completions\",\"input_messages\":{\"type\":\"template\",\"template\":[{\"role\":\"developer\",\"content\":\"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\"} , {\"role\":\"user\",\"content\":\"{{item.input}}\"}]} ,\"sampling_params\":{\"max_completions_tokens\":2048},\"model\":\"gpt-6-astra\",\"source\":{\"type\":\"file_content\",\"content\":[{\"item\":{\"input\":\"Tech Company Launches Advanced Artificial Intelligence Platform\",\"ground_truth\":\"Technology\"}}]}}}'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun = client.evals.runs.create(\n  \"eval_67e579652b548190aaa83ada4b125f47\",\n  name=\"gpt-6-astra\",\n  data_source={\n    \"type\": \"completions\",\n    \"input_messages\": {\n      \"type\": \"template\",\n      \"template\": [\n        {\n          \"role\": \"developer\",\n          \"content\": \"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\"\n        },\n        {\n          \"role\": \"user\",\n          \"content\": \"{{item.input}}\"\n        }\n      ]\n    },\n    \"sampling_params\": {\n      \"max_completions_tokens\": 2048\n    },\n    \"model\": \"gpt-6-astra\",\n    \"source\": {\n      \"type\": \"file_content\",\n      \"content\": [\n        {\n          \"item\": {\n            \"input\": \"Tech Company Launches Advanced Artificial Intelligence Platform\",\n            \"ground_truth\": \"Technology\"\n          }\n        }\n      ]\n    }\n  }\n)\nprint(run)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst run = await openai.evals.runs.create(\n  \"eval_67e579652b548190aaa83ada4b125f47\",\n  {\n    name: \"gpt-6-astra\",\n    data_source: {\n      type: \"completions\",\n      input_messages: {\n        type: \"template\",\n        template: [\n          {\n            role: \"developer\",\n            content: \"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\"\n          },\n          {\n            role: \"user\",\n            content: \"{{item.input}}\"\n          }\n        ]\n      },\n      sampling_params: {\n        max_completions_tokens: 2048\n      },\n      model: \"gpt-6-astra\",\n      source: {\n        type: \"file_content\",\n        content: [\n          {\n            item: {\n              input: \"Tech Company Launches Advanced Artificial Intelligence Platform\",\n              ground_truth: \"Technology\"\n            }\n          }\n        ]\n      }\n    }\n  }\n);\nconsole.log(run);\n"
+            },
+            "response": "{\n  \"object\": \"eval.run\",\n  \"id\": \"evalrun_67e57965b480819094274e3a32235e4c\",\n  \"eval_id\": \"eval_67e579652b548190aaa83ada4b125f47\",\n  \"report_url\": \"https://platform.openai.com/evaluations/eval_67e579652b548190aaa83ada4b125f47&run_id=evalrun_67e57965b480819094274e3a32235e4c\",\n  \"status\": \"queued\",\n  \"model\": \"gpt-6-astra\",\n  \"name\": \"gpt-6-astra\",\n  \"created_at\": 1743092069,\n  \"result_counts\": {\n    \"total\": 0,\n    \"errored\": 0,\n    \"failed\": 0,\n    \"passed\": 0\n  },\n  \"per_model_usage\": null,\n  \"per_testing_criteria_results\": null,\n  \"data_source\": {\n    \"type\": \"completions\",\n    \"source\": {\n      \"type\": \"file_content\",\n      \"content\": [\n        {\n          \"item\": {\n            \"input\": \"Tech Company Launches Advanced Artificial Intelligence Platform\",\n            \"ground_truth\": \"Technology\"\n          }\n        }\n      ]\n    },\n    \"input_messages\": {\n      \"type\": \"template\",\n      \"template\": [\n        {\n          \"type\": \"message\",\n          \"role\": \"developer\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\"\n          }\n        },\n        {\n          \"type\": \"message\",\n          \"role\": \"user\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"{{item.input}}\"\n          }\n        }\n      ]\n    },\n    \"model\": \"gpt-6-astra\",\n    \"sampling_params\": {\n      \"max_completions_tokens\": 2048\n    }\n  },\n  \"error\": null,\n  \"metadata\": {}\n}\n"
+          }
+        }
+      }
+    },
+    "/evals/{eval_id}/runs/{run_id}": {
+      "get": {
+        "operationId": "getEvalRun",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Get an evaluation run by ID.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to retrieve runs for."
+          },
+          {
+            "name": "run_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The evaluation run",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EvalRun"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get an eval run",
+          "group": "evals",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/eval_67abd54d9b0081909a86353f6fb9317a/runs/evalrun_67abd54d60ec8190832b46859da808f7 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun = client.evals.runs.retrieve(\n  \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"evalrun_67abd54d60ec8190832b46859da808f7\"\n)\nprint(run)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst run = await openai.evals.runs.retrieve(\n  \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  { eval_id: \"eval_67abd54d9b0081909a86353f6fb9317a\" }\n);\nconsole.log(run);\n"
+            },
+            "response": "{\n  \"object\": \"eval.run\",\n  \"id\": \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"eval_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"report_url\": \"https://platform.openai.com/evaluations/eval_67abd54d9b0081909a86353f6fb9317a?run_id=evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"status\": \"queued\",\n  \"model\": \"gpt-6-astra\",\n  \"name\": \"gpt-6-astra\",\n  \"created_at\": 1743092069,\n  \"result_counts\": {\n    \"total\": 0,\n    \"errored\": 0,\n    \"failed\": 0,\n    \"passed\": 0\n  },\n  \"per_model_usage\": null,\n  \"per_testing_criteria_results\": null,\n  \"data_source\": {\n    \"type\": \"completions\",\n    \"source\": {\n      \"type\": \"file_content\",\n      \"content\": [\n        {\n          \"item\": {\n            \"input\": \"Tech Company Launches Advanced Artificial Intelligence Platform\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Central Bank Increases Interest Rates Amid Inflation Concerns\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"International Summit Addresses Climate Change Strategies\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Major Retailer Reports Record-Breaking Holiday Sales\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"National Team Qualifies for World Championship Finals\",\n            \"ground_truth\": \"Sports\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Stock Markets Rally After Positive Economic Data Released\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Global Manufacturer Announces Merger with Competitor\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Breakthrough in Renewable Energy Technology Unveiled\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"World Leaders Sign Historic Climate Agreement\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Professional Athlete Sets New Record in Championship Event\",\n            \"ground_truth\": \"Sports\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Financial Institutions Adapt to New Regulatory Requirements\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Tech Conference Showcases Advances in Artificial Intelligence\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Global Markets Respond to Oil Price Fluctuations\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"International Cooperation Strengthened Through New Treaty\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Sports League Announces Revised Schedule for Upcoming Season\",\n            \"ground_truth\": \"Sports\"\n          }\n        }\n      ]\n    },\n    \"input_messages\": {\n      \"type\": \"template\",\n      \"template\": [\n        {\n          \"type\": \"message\",\n          \"role\": \"developer\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\"\n          }\n        },\n        {\n          \"type\": \"message\",\n          \"role\": \"user\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"{{item.input}}\"\n          }\n        }\n      ]\n    },\n    \"model\": \"gpt-6-astra\",\n    \"sampling_params\": {\n      \"max_completions_tokens\": 2048\n    }\n  },\n  \"error\": null,\n  \"metadata\": {}\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "cancelEvalRun",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Cancel an ongoing evaluation run.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation whose run you want to cancel."
+          },
+          {
+            "name": "run_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to cancel."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The canceled eval run object",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EvalRun"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel eval run",
+          "group": "evals",
+          "path": "post",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/eval_67abd54d9b0081909a86353f6fb9317a/runs/evalrun_67abd54d60ec8190832b46859da808f7/cancel \\\n  -X POST \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ncanceled_run = client.evals.runs.cancel(\n  \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"evalrun_67abd54d60ec8190832b46859da808f7\"\n)\nprint(canceled_run)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst canceledRun = await openai.evals.runs.cancel(\n  \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  { eval_id: \"eval_67abd54d9b0081909a86353f6fb9317a\" }\n);\nconsole.log(canceledRun);\n"
+            },
+            "response": "{\n  \"object\": \"eval.run\",\n  \"id\": \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"eval_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"report_url\": \"https://platform.openai.com/evaluations/eval_67abd54d9b0081909a86353f6fb9317a?run_id=evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"status\": \"canceled\",\n  \"model\": \"gpt-6-astra\",\n  \"name\": \"gpt-6-astra\",\n  \"created_at\": 1743092069,\n  \"result_counts\": {\n    \"total\": 0,\n    \"errored\": 0,\n    \"failed\": 0,\n    \"passed\": 0\n  },\n  \"per_model_usage\": null,\n  \"per_testing_criteria_results\": null,\n  \"data_source\": {\n    \"type\": \"completions\",\n    \"source\": {\n      \"type\": \"file_content\",\n      \"content\": [\n        {\n          \"item\": {\n            \"input\": \"Tech Company Launches Advanced Artificial Intelligence Platform\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Central Bank Increases Interest Rates Amid Inflation Concerns\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"International Summit Addresses Climate Change Strategies\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Major Retailer Reports Record-Breaking Holiday Sales\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"National Team Qualifies for World Championship Finals\",\n            \"ground_truth\": \"Sports\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Stock Markets Rally After Positive Economic Data Released\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Global Manufacturer Announces Merger with Competitor\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Breakthrough in Renewable Energy Technology Unveiled\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"World Leaders Sign Historic Climate Agreement\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Professional Athlete Sets New Record in Championship Event\",\n            \"ground_truth\": \"Sports\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Financial Institutions Adapt to New Regulatory Requirements\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Tech Conference Showcases Advances in Artificial Intelligence\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Global Markets Respond to Oil Price Fluctuations\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"International Cooperation Strengthened Through New Treaty\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Sports League Announces Revised Schedule for Upcoming Season\",\n            \"ground_truth\": \"Sports\"\n          }\n        }\n      ]\n    },\n    \"input_messages\": {\n      \"type\": \"template\",\n      \"template\": [\n        {\n          \"type\": \"message\",\n          \"role\": \"developer\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\"\n          }\n        },\n        {\n          \"type\": \"message\",\n          \"role\": \"user\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"{{item.input}}\"\n          }\n        }\n      ]\n    },\n    \"model\": \"gpt-6-astra\",\n    \"sampling_params\": {\n      \"max_completions_tokens\": 2048\n    }\n  },\n  \"error\": null,\n  \"metadata\": {}\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteEvalRun",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Delete an eval run.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to delete the run from."
+          },
+          {
+            "name": "run_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully deleted the eval run",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "object": {
+                      "type": "string",
+                      "example": "eval.run.deleted"
+                    },
+                    "deleted": {
+                      "type": "boolean",
+                      "example": true
+                    },
+                    "run_id": {
+                      "type": "string",
+                      "example": "evalrun_677469f564d48190807532a852da3afb"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Run not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete eval run",
+          "group": "evals",
+          "path": "delete",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/eval_123abc/runs/evalrun_abc456 \\\n  -X DELETE \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ndeleted = client.evals.runs.delete(\n  \"eval_123abc\",\n  \"evalrun_abc456\"\n)\nprint(deleted)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst deleted = await openai.evals.runs.delete(\n  \"eval_123abc\",\n  \"evalrun_abc456\"\n);\nconsole.log(deleted);\n"
+            },
+            "response": "{\n  \"object\": \"eval.run.deleted\",\n  \"deleted\": true,\n  \"run_id\": \"evalrun_abc456\"\n}\n"
+          }
+        }
+      }
+    },
+    "/evals/{eval_id}/runs/{run_id}/output_items": {
+      "get": {
+        "operationId": "getEvalRunOutputItems",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Get a list of output items for an evaluation run.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to retrieve runs for."
+          },
+          {
+            "name": "run_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to retrieve output items for."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last output item from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of output items to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "status",
+            "in": "query",
+            "description": "Filter output items by status. Use `failed` to filter by failed output\nitems or `pass` to filter by passed output items.\n",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "fail",
+                "pass"
+              ]
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for output items by timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `asc`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A list of output items for the evaluation run",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EvalRunOutputItemList"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get eval run output items",
+          "group": "evals",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/egroup_67abd54d9b0081909a86353f6fb9317a/runs/erun_67abd54d60ec8190832b46859da808f7/output_items \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\noutput_items = client.evals.runs.output_items.list(\n  \"egroup_67abd54d9b0081909a86353f6fb9317a\",\n  \"erun_67abd54d60ec8190832b46859da808f7\"\n)\nprint(output_items)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst outputItems = await openai.evals.runs.outputItems.list(\n  \"egroup_67abd54d9b0081909a86353f6fb9317a\",\n  \"erun_67abd54d60ec8190832b46859da808f7\"\n);\nconsole.log(outputItems);\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"eval.run.output_item\",\n      \"id\": \"outputitem_67e5796c28e081909917bf79f6e6214d\",\n      \"created_at\": 1743092076,\n      \"run_id\": \"evalrun_67abd54d60ec8190832b46859da808f7\",\n      \"eval_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n      \"status\": \"pass\",\n      \"datasource_item_id\": 5,\n      \"datasource_item\": {\n        \"input\": \"Stock Markets Rally After Positive Economic Data Released\",\n        \"ground_truth\": \"Markets\"\n      },\n      \"results\": [\n        {\n          \"name\": \"String check-a2486074-d803-4445-b431-ad2262e85d47\",\n          \"sample\": null,\n          \"passed\": true,\n          \"score\": 1.0\n        }\n      ],\n      \"sample\": {\n        \"input\": [\n          {\n            \"role\": \"developer\",\n            \"content\": \"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\",\n            \"tool_call_id\": null,\n            \"tool_calls\": null,\n            \"function_call\": null\n          },\n          {\n            \"role\": \"user\",\n            \"content\": \"Stock Markets Rally After Positive Economic Data Released\",\n            \"tool_call_id\": null,\n            \"tool_calls\": null,\n            \"function_call\": null\n          }\n        ],\n        \"output\": [\n          {\n            \"role\": \"assistant\",\n            \"content\": \"Markets\",\n            \"tool_call_id\": null,\n            \"tool_calls\": null,\n            \"function_call\": null\n          }\n        ],\n        \"finish_reason\": \"stop\",\n        \"model\": \"gpt-6-astra\",\n        \"usage\": {\n          \"total_tokens\": 325,\n          \"completion_tokens\": 2,\n          \"prompt_tokens\": 323,\n          \"cached_tokens\": 0\n        },\n        \"error\": null,\n        \"temperature\": 1.0,\n        \"max_completion_tokens\": 2048,\n        \"top_p\": 1.0,\n        \"seed\": 42\n      }\n    }\n  ],\n  \"first_id\": \"outputitem_67e5796c28e081909917bf79f6e6214d\",\n  \"last_id\": \"outputitem_67e5796c28e081909917bf79f6e6214d\",\n  \"has_more\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/evals/{eval_id}/runs/{run_id}/output_items/{output_item_id}": {
+      "get": {
+        "operationId": "getEvalRunOutputItem",
+        "tags": [
+          "Evals"
+        ],
+        "summary": "Get an evaluation run output item by ID.\n",
+        "parameters": [
+          {
+            "name": "eval_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the evaluation to retrieve runs for."
+          },
+          {
+            "name": "run_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to retrieve."
+          },
+          {
+            "name": "output_item_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the output item to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The evaluation run output item",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EvalRunOutputItem"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get an output item of an eval run",
+          "group": "evals",
+          "path": "get",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/evals/eval_67abd54d9b0081909a86353f6fb9317a/runs/evalrun_67abd54d60ec8190832b46859da808f7/output_items/outputitem_67abd55eb6548190bb580745d5644a33 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\noutput_item = client.evals.runs.output_items.retrieve(\n  \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"outputitem_67abd55eb6548190bb580745d5644a33\"\n)\nprint(output_item)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst outputItem = await openai.evals.runs.outputItems.retrieve(\n  \"outputitem_67abd55eb6548190bb580745d5644a33\",\n  {\n    eval_id: \"eval_67abd54d9b0081909a86353f6fb9317a\",\n    run_id: \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  }\n);\nconsole.log(outputItem);\n"
+            },
+            "response": "{\n  \"object\": \"eval.run.output_item\",\n  \"id\": \"outputitem_67e5796c28e081909917bf79f6e6214d\",\n  \"created_at\": 1743092076,\n  \"run_id\": \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"eval_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"status\": \"pass\",\n  \"datasource_item_id\": 5,\n  \"datasource_item\": {\n    \"input\": \"Stock Markets Rally After Positive Economic Data Released\",\n    \"ground_truth\": \"Markets\"\n  },\n  \"results\": [\n    {\n      \"name\": \"String check-a2486074-d803-4445-b431-ad2262e85d47\",\n      \"sample\": null,\n      \"passed\": true,\n      \"score\": 1.0\n    }\n  ],\n  \"sample\": {\n    \"input\": [\n      {\n        \"role\": \"developer\",\n        \"content\": \"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\",\n        \"tool_call_id\": null,\n        \"tool_calls\": null,\n        \"function_call\": null\n      },\n      {\n        \"role\": \"user\",\n        \"content\": \"Stock Markets Rally After Positive Economic Data Released\",\n        \"tool_call_id\": null,\n        \"tool_calls\": null,\n        \"function_call\": null\n      }\n    ],\n    \"output\": [\n      {\n        \"role\": \"assistant\",\n        \"content\": \"Markets\",\n        \"tool_call_id\": null,\n        \"tool_calls\": null,\n        \"function_call\": null\n      }\n    ],\n    \"finish_reason\": \"stop\",\n    \"model\": \"gpt-6-astra\",\n    \"usage\": {\n      \"total_tokens\": 325,\n      \"completion_tokens\": 2,\n      \"prompt_tokens\": 323,\n      \"cached_tokens\": 0\n    },\n    \"error\": null,\n    \"temperature\": 1.0,\n    \"max_completion_tokens\": 2048,\n    \"top_p\": 1.0,\n    \"seed\": 42\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/files": {
+      "get": {
+        "operationId": "listFiles",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Returns a list of files.",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "purpose",
+            "required": false,
+            "schema": {
+              "type": "string"
+            },
+            "description": "Only return files with the given purpose."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 10,000, and the default is 10,000.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 10000
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListFilesResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List files",
+          "group": "files",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.files.list()\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const list = await openai.files.list();\n\n  for await (const file of list) {\n    console.log(file);\n  }\n}\n\nmain();"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"file-abc123\",\n      \"object\": \"file\",\n      \"bytes\": 175,\n      \"created_at\": 1613677385,\n      \"expires_at\": 1677614202,\n      \"filename\": \"salesOverview.pdf\",\n      \"purpose\": \"assistants\",\n    },\n    {\n      \"id\": \"file-abc456\",\n      \"object\": \"file\",\n      \"bytes\": 140,\n      \"created_at\": 1613779121,\n      \"expires_at\": 1677614202,\n      \"filename\": \"puppy.jsonl\",\n      \"purpose\": \"fine-tune\",\n    }\n  ],\n  \"first_id\": \"file-abc123\",\n  \"last_id\": \"file-abc456\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createFile",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Upload a file that can be used across various endpoints. Individual files\ncan be up to 512 MB, and each project can store up to 2.5 TB of files in\ntotal. There is no organization-wide storage limit. Uploads to this\nendpoint are rate-limited to 1,000 requests per minute per authenticated\nuser.\n\n- The Assistants API supports files up to 2 million tokens and of specific\n  file types. See the [Assistants Tools guide](https://developers.openai.com/api/docs/guides/tools) for\n  details.\n- The Fine-tuning API only supports `.jsonl` files. The input also has\n  certain required formats for fine-tuning\n  [chat](https://developers.openai.com/api/docs/guides/supervised-fine-tuning#formatting-your-data) or\n  [completions](https://developers.openai.com/api/docs/guides/supervised-fine-tuning#formatting-your-data) models.\n- The Batch API only supports `.jsonl` files up to 200 MB in size. The input\n  also has a specific required\n  [format](https://developers.openai.com/api/docs/guides/batch#1-prepare-your-batch-file).\n- For Retrieval or `file_search` ingestion, upload files here first. If\n  you need to attach multiple uploaded files to the same vector store, use\n  [`/vector_stores/{vector_store_id}/file_batches`](https://developers.openai.com/api/reference/resources/vector_stores/subresources/file_batches/methods/create)\n  instead of attaching them one by one. Vector store attachment has separate\n  limits from file upload, including 2,000 attached files per minute per\n  organization.\n\nPlease [contact us](https://help.openai.com/) if you need to increase these\nstorage limits.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateFileRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OpenAIFile"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Upload file",
+          "group": "files",
+          "description": "Uploads a file for later use across OpenAI APIs. Uploads to this endpoint are rate-limited to 1,000 requests per minute per authenticated user. For Retrieval or `file_search` ingestion, upload files here first. If you need to attach multiple uploaded files to the same vector store, use vector store file batches instead of attaching them one by one.\n",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F purpose=\"fine-tune\" \\\n  -F file=\"@mydata.jsonl\"\n  -F expires_after[anchor]=\"created_at\"\n  -F expires_after[seconds]=2592000\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.files.create(\n  file=open(\"mydata.jsonl\", \"rb\"),\n  purpose=\"fine-tune\",\n  expires_after={\n    \"anchor\": \"created_at\",\n    \"seconds\": 2592000\n  }\n)\n",
+              "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const file = await openai.files.create({\n    file: fs.createReadStream(\"mydata.jsonl\"),\n    purpose: \"fine-tune\",\n    expires_after: {\n      anchor: \"created_at\",\n      seconds: 2592000\n    }\n  });\n\n  console.log(file);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"file\",\n  \"bytes\": 120000,\n  \"created_at\": 1677610602,\n  \"expires_at\": 1677614202,\n  \"filename\": \"mydata.jsonl\",\n  \"purpose\": \"fine-tune\",\n}\n"
+          }
+        }
+      }
+    },
+    "/files/{file_id}": {
+      "delete": {
+        "operationId": "deleteFile",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Delete a file and remove it from all vector stores.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the file to use for this request."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteFileResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete file",
+          "group": "files",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files/file-abc123 \\\n  -X DELETE \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.files.delete(\"file-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const file = await openai.files.delete(\"file-abc123\");\n\n  console.log(file);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"file\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      },
+      "get": {
+        "operationId": "retrieveFile",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Returns information about a specific file.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the file to use for this request."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OpenAIFile"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve file",
+          "group": "files",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files/file-abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.files.retrieve(\"file-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const file = await openai.files.retrieve(\"file-abc123\");\n\n  console.log(file);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"file\",\n  \"bytes\": 120000,\n  \"created_at\": 1677610602,\n  \"expires_at\": 1677614202,\n  \"filename\": \"mydata.jsonl\",\n  \"purpose\": \"fine-tune\",\n}\n"
+          }
+        }
+      }
+    },
+    "/files/{file_id}/content": {
+      "get": {
+        "operationId": "downloadFile",
+        "tags": [
+          "Files"
+        ],
+        "summary": "Returns a response containing the contents of the specified file.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the file to use for this request."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve file content",
+          "group": "files",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/files/file-abc123/content \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" > file.jsonl\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ncontent = client.files.content(\"file-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const response = await openai.files.content(\"file-abc123\");\n  const content = await response.text();\n\n  console.log(content);\n}\n\nmain();\n"
+            }
+          }
+        }
+      }
+    },
+    "/fine_tuning/alpha/graders/run": {
+      "post": {
+        "operationId": "runGrader",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "Run a grader.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RunGraderRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RunGraderResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Run grader",
+          "beta": true,
+          "group": "graders",
+          "examples": [
+            {
+              "title": "Score text alignment",
+              "request": {
+                "curl": "curl -X POST https://api.openai.com/v1/fine_tuning/alpha/graders/run \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"grader\": {\n      \"type\": \"score_model\",\n      \"name\": \"Example score model grader\",\n      \"input\": [\n        {\n          \"role\": \"user\",\n          \"content\": [\n            {\n              \"type\": \"input_text\",\n              \"text\": \"Score how close the reference answer is to the model answer on a 0-1 scale. Return only the score.\\n\\nReference answer: {{item.reference_answer}}\\n\\nModel answer: {{sample.output_text}}\"\n            }\n          ]\n        }\n      ],\n      \"model\": \"gpt-5-mini\",\n      \"sampling_params\": {\n        \"temperature\": 1,\n        \"top_p\": 1,\n        \"seed\": 42\n      }\n    },\n    \"item\": {\n      \"reference_answer\": \"fuzzy wuzzy was a bear\"\n    },\n    \"model_sample\": \"fuzzy wuzzy was a bear\"\n  }'\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\nresult = client.fine_tuning.alpha.graders.run(\n  grader={\n    \"type\": \"score_model\",\n    \"name\": \"Example score model grader\",\n    \"input\": [\n      {\n        \"role\": \"user\",\n        \"content\": [\n          {\n            \"type\": \"input_text\",\n            \"text\": \"Score how close the reference answer is to the model answer on a 0-1 scale. Return only the score.\\n\\nReference answer: {{item.reference_answer}}\\n\\nModel answer: {{sample.output_text}}\",\n          }\n        ],\n      }\n    ],\n    \"model\": \"gpt-5-mini\",\n    \"sampling_params\": {\"temperature\": 1, \"top_p\": 1, \"seed\": 42},\n  },\n  item={\"reference_answer\": \"fuzzy wuzzy was a bear\"},\n  model_sample=\"fuzzy wuzzy was a bear\",\n)\nprint(result)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst result = await openai.fineTuning.alpha.graders.run({\n  grader: {\n    type: \"score_model\",\n    name: \"Example score model grader\",\n    input: [\n      {\n        role: \"user\",\n        content: [\n          {\n            type: \"input_text\",\n            text: \"Score how close the reference answer is to the model answer on a 0-1 scale. Return only the score.\\n\\nReference answer: {{item.reference_answer}}\\n\\nModel answer: {{sample.output_text}}\",\n          },\n        ],\n      },\n    ],\n    model: \"gpt-5-mini\",\n    sampling_params: { temperature: 1, top_p: 1, seed: 42 },\n  },\n  item: { reference_answer: \"fuzzy wuzzy was a bear\" },\n  model_sample: \"fuzzy wuzzy was a bear\",\n});\nconsole.log(result);\n"
+              },
+              "response": "{\n  \"reward\": 1.0,\n  \"metadata\": {\n    \"name\": \"Example score model grader\",\n    \"type\": \"score_model\",\n    \"errors\": {\n      \"formula_parse_error\": false,\n      \"sample_parse_error\": false,\n      \"truncated_observation_error\": false,\n      \"unresponsive_reward_error\": false,\n      \"invalid_variable_error\": false,\n      \"other_error\": false,\n      \"python_grader_server_error\": false,\n      \"python_grader_server_error_type\": null,\n      \"python_grader_runtime_error\": false,\n      \"python_grader_runtime_error_details\": null,\n      \"model_grader_server_error\": false,\n      \"model_grader_refusal_error\": false,\n      \"model_grader_parse_error\": false,\n      \"model_grader_server_error_details\": null\n    },\n    \"execution_time\": 4.365238428115845,\n    \"scores\": {},\n    \"token_usage\": {\n      \"prompt_tokens\": 190,\n      \"total_tokens\": 324,\n      \"completion_tokens\": 134,\n      \"cached_tokens\": 0\n    },\n    \"sampled_model_name\": \"gpt-5-mini\"\n  },\n  \"sub_rewards\": {},\n  \"model_grader_token_usage_per_model\": {\n    \"gpt-5-mini\": {\n      \"prompt_tokens\": 190,\n      \"total_tokens\": 324,\n      \"completion_tokens\": 134,\n      \"cached_tokens\": 0\n    }\n  }\n}\n"
+            },
+            {
+              "title": "Score an image caption",
+              "request": {
+                "curl": "curl -X POST https://api.openai.com/v1/fine_tuning/alpha/graders/run \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"grader\": {\n      \"type\": \"score_model\",\n      \"name\": \"Image caption grader\",\n      \"input\": [\n        {\n          \"role\": \"user\",\n          \"content\": [\n            {\n              \"type\": \"input_text\",\n              \"text\": \"Score how well the provided caption matches the image on a 0-1 scale. Only return the score.\\n\\nCaption: {{sample.output_text}}\"\n            },\n            {\n              \"type\": \"input_image\",\n              \"image_url\": \"https://example.com/dog-catching-ball.png\",\n              \"file_id\": null,\n              \"detail\": \"high\"\n            }\n          ]\n        }\n      ],\n      \"model\": \"gpt-5-mini\",\n      \"sampling_params\": {\n        \"temperature\": 0.2\n      }\n    },\n    \"item\": {\n      \"expected_caption\": \"A golden retriever jumps to catch a tennis ball\"\n    },\n    \"model_sample\": \"A dog leaps to grab a tennis ball mid-air\"\n  }'\n"
+              }
+            },
+            {
+              "title": "Score an audio response",
+              "request": {
+                "curl": "curl -X POST https://api.openai.com/v1/fine_tuning/alpha/graders/run \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"grader\": {\n      \"type\": \"score_model\",\n      \"name\": \"Audio clarity grader\",\n      \"input\": [\n        {\n          \"role\": \"user\",\n          \"content\": [\n            {\n              \"type\": \"input_text\",\n              \"text\": \"Listen to the clip and return a confidence score from 0 to 1 that the speaker said: {{item.target_phrase}}\"\n            },\n            {\n              \"type\": \"input_audio\",\n              \"input_audio\": {\n                \"data\": \"{{item.audio_clip_b64}}\",\n                \"format\": \"mp3\"\n              }\n            }\n          ]\n        }\n      ],\n      \"model\": \"gpt-audio\",\n      \"sampling_params\": {\n        \"temperature\": 0.2,\n        \"top_p\": 1,\n        \"seed\": 123\n      }\n    },\n    \"item\": {\n      \"target_phrase\": \"Please deliver the package on Tuesday\",\n      \"audio_clip_b64\": \"<base64-encoded mp3>\"\n    },\n    \"model_sample\": \"Please deliver the package on Tuesday\"\n  }'\n"
+              }
+            }
+          ]
+        }
+      }
+    },
+    "/fine_tuning/alpha/graders/validate": {
+      "post": {
+        "operationId": "validateGrader",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "Validate a grader.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ValidateGraderRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ValidateGraderResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Validate grader",
+          "beta": true,
+          "group": "graders",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/fine_tuning/alpha/graders/validate \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"grader\": {\n      \"type\": \"string_check\",\n      \"name\": \"Example string check grader\",\n      \"input\": \"{{sample.output_text}}\",\n      \"reference\": \"{{item.label}}\",\n      \"operation\": \"eq\"\n    }\n  }'\n"
+            },
+            "response": "{\n  \"grader\": {\n    \"type\": \"string_check\",\n    \"name\": \"Example string check grader\",\n    \"input\": \"{{sample.output_text}}\",\n    \"reference\": \"{{item.label}}\",\n    \"operation\": \"eq\"\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/checkpoints/{fine_tuned_model_checkpoint}/permissions": {
+      "get": {
+        "operationId": "listFineTuningCheckpointPermissions",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "**NOTE:** This endpoint requires an [admin API key](https://developers.openai.com/api/reference/resources/admin/subresources/organization/subresources/admin_api_keys).\n\nOrganization owners can use this endpoint to view all permissions for a fine-tuned model checkpoint.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuned_model_checkpoint",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft-AF1WoRqd3aJAHsqc9NY7iL8F"
+            },
+            "description": "The ID of the fine-tuned model checkpoint to get permissions for.\n"
+          },
+          {
+            "name": "project_id",
+            "in": "query",
+            "description": "The ID of the project to get permissions for.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last permission ID from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of permissions to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 10
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "The order in which to retrieve permissions.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "ascending",
+                "descending"
+              ],
+              "default": "descending"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListFineTuningCheckpointPermissionResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List checkpoint permissions",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/fine_tuning/checkpoints/ft:gpt-4o-mini-2024-07-18:org:weather:B7R9VjQd/permissions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"checkpoint.permission\",\n      \"id\": \"cp_zc4Q7MP6XxulcVzj4MZdwsAB\",\n      \"created_at\": 1721764867,\n      \"project_id\": \"proj_abGMw1llN8IrBb6SvvY5A1iH\"\n    },\n    {\n      \"object\": \"checkpoint.permission\",\n      \"id\": \"cp_enQCFmOTGj3syEpYVhBRLTSy\",\n      \"created_at\": 1721764800,\n      \"project_id\": \"proj_iqGMw1llN8IrBb6SvvY5A1oF\"\n    },\n  ],\n  \"first_id\": \"cp_zc4Q7MP6XxulcVzj4MZdwsAB\",\n  \"last_id\": \"cp_enQCFmOTGj3syEpYVhBRLTSy\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createFineTuningCheckpointPermission",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "**NOTE:** Calling this endpoint requires an [admin API key](https://developers.openai.com/api/reference/resources/admin/subresources/organization/subresources/admin_api_keys).\n\nThis enables organization owners to share fine-tuned models with other projects in their organization.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuned_model_checkpoint",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft:gpt-4o-mini-2024-07-18:org:weather:B7R9VjQd"
+            },
+            "description": "The ID of the fine-tuned model checkpoint to create a permission for.\n"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateFineTuningCheckpointPermissionRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListFineTuningCheckpointPermissionResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create checkpoint permissions",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/fine_tuning/checkpoints/ft:gpt-4o-mini-2024-07-18:org:weather:B7R9VjQd/permissions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n  -d '{\"project_ids\": [\"proj_abGMw1llN8IrBb6SvvY5A1iH\"]}'\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"checkpoint.permission\",\n      \"id\": \"cp_zc4Q7MP6XxulcVzj4MZdwsAB\",\n      \"created_at\": 1721764867,\n      \"project_id\": \"proj_abGMw1llN8IrBb6SvvY5A1iH\"\n    }\n  ],\n  \"first_id\": \"cp_zc4Q7MP6XxulcVzj4MZdwsAB\",\n  \"last_id\": \"cp_zc4Q7MP6XxulcVzj4MZdwsAB\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/checkpoints/{fine_tuned_model_checkpoint}/permissions/{permission_id}": {
+      "delete": {
+        "operationId": "deleteFineTuningCheckpointPermission",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "**NOTE:** This endpoint requires an [admin API key](https://developers.openai.com/api/reference/resources/admin/subresources/organization/subresources/admin_api_keys).\n\nOrganization owners can use this endpoint to delete a permission for a fine-tuned model checkpoint.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuned_model_checkpoint",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft:gpt-4o-mini-2024-07-18:org:weather:B7R9VjQd"
+            },
+            "description": "The ID of the fine-tuned model checkpoint to delete a permission for.\n"
+          },
+          {
+            "in": "path",
+            "name": "permission_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "cp_zc4Q7MP6XxulcVzj4MZdwsAB"
+            },
+            "description": "The ID of the fine-tuned model checkpoint permission to delete.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteFineTuningCheckpointPermissionResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete checkpoint permission",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/fine_tuning/checkpoints/ft:gpt-4o-mini-2024-07-18:org:weather:B7R9VjQd/permissions/cp_zc4Q7MP6XxulcVzj4MZdwsAB \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n  \"object\": \"checkpoint.permission\",\n  \"id\": \"cp_zc4Q7MP6XxulcVzj4MZdwsAB\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/jobs": {
+      "post": {
+        "operationId": "createFineTuningJob",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "Creates a fine-tuning job which begins the process of creating a new model from a given dataset.\n\nResponse includes details of the enqueued job including job status and the name of the fine-tuned models once complete.\n\n[Learn more about fine-tuning](https://developers.openai.com/api/docs/guides/model-optimization)\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateFineTuningJobRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FineTuningJob"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create fine-tuning job",
+          "group": "fine-tuning",
+          "examples": [
+            {
+              "title": "Default",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/fine_tuning/jobs \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"training_file\": \"file-BK7bzQj3FfZFXr7DbL6xJwfo\",\n    \"model\": \"gpt-4o-mini\"\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.fine_tuning.jobs.create(\n  training_file=\"file-abc123\",\n  model=\"gpt-4o-mini\"\n)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const fineTune = await openai.fineTuning.jobs.create({\n    training_file: \"file-abc123\"\n  });\n\n  console.log(fineTune);\n}\n\nmain();\n"
+              },
+              "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n  \"created_at\": 1721764800,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-123\",\n  \"result_files\": [],\n  \"status\": \"queued\",\n  \"validation_file\": null,\n  \"training_file\": \"file-abc123\",\n  \"method\": {\n    \"type\": \"supervised\",\n    \"supervised\": {\n      \"hyperparameters\": {\n        \"batch_size\": \"auto\",\n        \"learning_rate_multiplier\": \"auto\",\n        \"n_epochs\": \"auto\",\n      }\n    }\n  },\n  \"metadata\": null\n}\n"
+            },
+            {
+              "title": "Epochs",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/fine_tuning/jobs \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"training_file\": \"file-abc123\",\n    \"model\": \"gpt-4o-mini\",\n    \"method\": {\n      \"type\": \"supervised\",\n      \"supervised\": {\n        \"hyperparameters\": {\n          \"n_epochs\": 2\n        }\n      }\n    }\n  }'\n",
+                "python": "from openai import OpenAI\nfrom openai.types.fine_tuning import SupervisedMethod, SupervisedHyperparameters\n\nclient = OpenAI()\n\nclient.fine_tuning.jobs.create(\n  training_file=\"file-abc123\",\n  model=\"gpt-4o-mini\",\n  method={\n    \"type\": \"supervised\",\n    \"supervised\": SupervisedMethod(\n      hyperparameters=SupervisedHyperparameters(\n        n_epochs=2\n      )\n    )\n  }\n)\n",
+                "javascript": "import OpenAI from \"openai\";\nimport { SupervisedMethod, SupervisedHyperparameters } from \"openai/resources/fine-tuning/methods\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const fineTune = await openai.fineTuning.jobs.create({\n    training_file: \"file-abc123\",\n    model: \"gpt-4o-mini\",\n    method: {\n      type: \"supervised\",\n      supervised: {\n        hyperparameters: {\n          n_epochs: 2\n        }\n      }\n    }\n  });\n\n  console.log(fineTune);\n}\n\nmain();\n"
+              },
+              "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"gpt-4o-mini\",\n  \"created_at\": 1721764800,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-123\",\n  \"result_files\": [],\n  \"status\": \"queued\",\n  \"validation_file\": null,\n  \"training_file\": \"file-abc123\",\n  \"hyperparameters\": {\n    \"batch_size\": \"auto\",\n    \"learning_rate_multiplier\": \"auto\",\n    \"n_epochs\": 2\n  },\n  \"method\": {\n    \"type\": \"supervised\",\n    \"supervised\": {\n      \"hyperparameters\": {\n        \"batch_size\": \"auto\",\n        \"learning_rate_multiplier\": \"auto\",\n        \"n_epochs\": 2\n      }\n    }\n  },\n  \"metadata\": null,\n  \"error\": {\n    \"code\": null,\n    \"message\": null,\n    \"param\": null\n  },\n  \"finished_at\": null,\n  \"seed\": 683058546,\n  \"trained_tokens\": null,\n  \"estimated_finish\": null,\n  \"integrations\": [],\n  \"user_provided_suffix\": null,\n  \"usage_metrics\": null,\n  \"shared_with_openai\": false\n}\n"
+            },
+            {
+              "title": "DPO",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/fine_tuning/jobs \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"training_file\": \"file-abc123\",\n    \"validation_file\": \"file-abc123\",\n    \"model\": \"gpt-4o-mini\",\n    \"method\": {\n      \"type\": \"dpo\",\n      \"dpo\": {\n        \"hyperparameters\": {\n          \"beta\": 0.1\n        }\n      }\n    }\n  }'\n",
+                "python": "from openai import OpenAI\nfrom openai.types.fine_tuning import DpoMethod, DpoHyperparameters\n\nclient = OpenAI()\n\nclient.fine_tuning.jobs.create(\n  training_file=\"file-abc\",\n  validation_file=\"file-123\",\n  model=\"gpt-4o-mini\",\n  method={\n    \"type\": \"dpo\",\n    \"dpo\": DpoMethod(\n      hyperparameters=DpoHyperparameters(beta=0.1)\n    )\n  }\n)\n"
+              },
+              "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc\",\n  \"model\": \"gpt-4o-mini\",\n  \"created_at\": 1746130590,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-abc\",\n  \"result_files\": [],\n  \"status\": \"queued\",\n  \"validation_file\": \"file-123\",\n  \"training_file\": \"file-abc\",\n  \"method\": {\n    \"type\": \"dpo\",\n    \"dpo\": {\n      \"hyperparameters\": {\n        \"beta\": 0.1,\n        \"batch_size\": \"auto\",\n        \"learning_rate_multiplier\": \"auto\",\n        \"n_epochs\": \"auto\"\n      }\n    }\n  },\n  \"metadata\": null,\n  \"error\": {\n    \"code\": null,\n    \"message\": null,\n    \"param\": null\n  },\n  \"finished_at\": null,\n  \"hyperparameters\": null,\n  \"seed\": 1036326793,\n  \"estimated_finish\": null,\n  \"integrations\": [],\n  \"user_provided_suffix\": null,\n  \"usage_metrics\": null,\n  \"shared_with_openai\": false\n}\n"
+            },
+            {
+              "title": "Reinforcement",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/fine_tuning/jobs \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"training_file\": \"file-abc\",\n    \"validation_file\": \"file-123\",\n    \"model\": \"o4-mini\",\n    \"method\": {\n      \"type\": \"reinforcement\",\n      \"reinforcement\": {\n        \"grader\": {\n          \"type\": \"string_check\",\n          \"name\": \"Example string check grader\",\n          \"input\": \"{{sample.output_text}}\",\n          \"reference\": \"{{item.label}}\",\n          \"operation\": \"eq\"\n        },\n        \"hyperparameters\": {\n          \"reasoning_effort\": \"medium\"\n        }\n      }\n    }\n  }'\n",
+                "python": "from openai import OpenAI\nfrom openai.types.fine_tuning import ReinforcementMethod, ReinforcementHyperparameters\nfrom openai.types.graders import StringCheckGrader\n\nclient = OpenAI()\n\nclient.fine_tuning.jobs.create(\n  training_file=\"file-abc\",\n  validation_file=\"file-123\",\n  model=\"o4-mini\",\n  method={\n    \"type\": \"reinforcement\",\n    \"reinforcement\": ReinforcementMethod(\n      grader=StringCheckGrader(\n        name=\"Example string check grader\",\n        type=\"string_check\",\n        input=\"{{item.label}}\",\n        operation=\"eq\",\n        reference=\"{{sample.output_text}}\"\n      ),\n      hyperparameters=ReinforcementHyperparameters(\n          reasoning_effort=\"medium\",\n      )\n    )\n  }, \n  seed=42,\n)\n"
+              },
+              "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"o4-mini\",\n  \"created_at\": 1721764800,\n  \"finished_at\": null,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-123\",\n  \"result_files\": [],\n  \"status\": \"validating_files\",\n  \"validation_file\": \"file-123\",\n  \"training_file\": \"file-abc\",\n  \"trained_tokens\": null,\n  \"error\": {},\n  \"user_provided_suffix\": null,\n  \"seed\": 950189191,\n  \"estimated_finish\": null,\n  \"integrations\": [],\n  \"method\": {\n    \"type\": \"reinforcement\",\n    \"reinforcement\": {\n      \"hyperparameters\": {\n        \"batch_size\": \"auto\",\n        \"learning_rate_multiplier\": \"auto\",\n        \"n_epochs\": \"auto\",\n        \"eval_interval\": \"auto\",\n        \"eval_samples\": \"auto\",\n        \"compute_multiplier\": \"auto\",\n        \"reasoning_effort\": \"medium\"\n      },\n      \"grader\": {\n        \"type\": \"string_check\",\n        \"name\": \"Example string check grader\",\n        \"input\": \"{{sample.output_text}}\",\n        \"reference\": \"{{item.label}}\",\n        \"operation\": \"eq\"\n      },\n      \"response_format\": null\n    }\n  },\n  \"metadata\": null,\n  \"usage_metrics\": null,\n  \"shared_with_openai\": false\n}\n      \n"
+            },
+            {
+              "title": "Validation file",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/fine_tuning/jobs \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"training_file\": \"file-abc123\",\n    \"validation_file\": \"file-abc123\",\n    \"model\": \"gpt-4o-mini\"\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.fine_tuning.jobs.create(\n  training_file=\"file-abc123\",\n  validation_file=\"file-def456\",\n  model=\"gpt-4o-mini\"\n)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const fineTune = await openai.fineTuning.jobs.create({\n    training_file: \"file-abc123\",\n    validation_file: \"file-abc123\"\n  });\n\n  console.log(fineTune);\n}\n\nmain();\n"
+              },
+              "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n  \"created_at\": 1721764800,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-123\",\n  \"result_files\": [],\n  \"status\": \"queued\",\n  \"validation_file\": \"file-abc123\",\n  \"training_file\": \"file-abc123\",\n  \"method\": {\n    \"type\": \"supervised\",\n    \"supervised\": {\n      \"hyperparameters\": {\n        \"batch_size\": \"auto\",\n        \"learning_rate_multiplier\": \"auto\",\n        \"n_epochs\": \"auto\",\n      }\n    }\n  },\n  \"metadata\": null\n}\n"
+            },
+            {
+              "title": "W&B Integration",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/fine_tuning/jobs \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"training_file\": \"file-abc123\",\n    \"validation_file\": \"file-abc123\",\n    \"model\": \"gpt-4o-mini\",\n    \"integrations\": [\n      {\n        \"type\": \"wandb\",\n        \"wandb\": {\n          \"project\": \"my-wandb-project\",\n          \"name\": \"ft-run-display-name\"\n          \"tags\": [\n            \"first-experiment\", \"v2\"\n          ]\n        }\n      }\n    ]\n  }'\n"
+              },
+              "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n  \"created_at\": 1721764800,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-123\",\n  \"result_files\": [],\n  \"status\": \"queued\",\n  \"validation_file\": \"file-abc123\",\n  \"training_file\": \"file-abc123\",\n  \"integrations\": [\n    {\n      \"type\": \"wandb\",\n      \"wandb\": {\n        \"project\": \"my-wandb-project\",\n        \"entity\": None,\n        \"run_id\": \"ftjob-abc123\"\n      }\n    }\n  ],\n  \"method\": {\n    \"type\": \"supervised\",\n    \"supervised\": {\n      \"hyperparameters\": {\n        \"batch_size\": \"auto\",\n        \"learning_rate_multiplier\": \"auto\",\n        \"n_epochs\": \"auto\",\n      }\n    }\n  },\n  \"metadata\": null\n}\n"
+            }
+          ]
+        }
+      },
+      "get": {
+        "operationId": "listPaginatedFineTuningJobs",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "List your organization's fine-tuning jobs\n",
+        "parameters": [
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last job from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of fine-tuning jobs to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "in": "query",
+            "name": "metadata",
+            "required": false,
+            "schema": {
+              "type": "object",
+              "nullable": true,
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            "style": "deepObject",
+            "explode": true,
+            "description": "Optional metadata filter. To filter, use the syntax `metadata[k]=v`. Alternatively, set `metadata=null` to indicate no metadata.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListPaginatedFineTuningJobsResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List fine-tuning jobs",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/fine_tuning/jobs?limit=2&metadata[key]=value \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.fine_tuning.jobs.list()\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const list = await openai.fineTuning.jobs.list();\n\n  for await (const fineTune of list) {\n    console.log(fineTune);\n  }\n}\n\nmain();"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"fine_tuning.job\",\n      \"id\": \"ftjob-abc123\",\n      \"model\": \"gpt-4o-mini-2024-07-18\",\n      \"created_at\": 1721764800,\n      \"fine_tuned_model\": null,\n      \"organization_id\": \"org-123\",\n      \"result_files\": [],\n      \"status\": \"queued\",\n      \"validation_file\": null,\n      \"training_file\": \"file-abc123\",\n      \"metadata\": {\n        \"key\": \"value\"\n      }\n    },\n    { ... },\n    { ... }\n  ], \"has_more\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/jobs/{fine_tuning_job_id}": {
+      "get": {
+        "operationId": "retrieveFineTuningJob",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "Get info about a fine-tuning job.\n\n[Learn more about fine-tuning](https://developers.openai.com/api/docs/guides/model-optimization)\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuning_job_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft-AF1WoRqd3aJAHsqc9NY7iL8F"
+            },
+            "description": "The ID of the fine-tuning job.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FineTuningJob"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve fine-tuning job",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/fine_tuning/jobs/ft-AF1WoRqd3aJAHsqc9NY7iL8F \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.fine_tuning.jobs.retrieve(\"ftjob-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const fineTune = await openai.fineTuning.jobs.retrieve(\"ftjob-abc123\");\n\n  console.log(fineTune);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"davinci-002\",\n  \"created_at\": 1692661014,\n  \"finished_at\": 1692661190,\n  \"fine_tuned_model\": \"ft:davinci-002:my-org:custom_suffix:7q8mpxmy\",\n  \"organization_id\": \"org-123\",\n  \"result_files\": [\n      \"file-abc123\"\n  ],\n  \"status\": \"succeeded\",\n  \"validation_file\": null,\n  \"training_file\": \"file-abc123\",\n  \"hyperparameters\": {\n      \"n_epochs\": 4,\n      \"batch_size\": 1,\n      \"learning_rate_multiplier\": 1.0\n  },\n  \"trained_tokens\": 5768,\n  \"integrations\": [],\n  \"seed\": 0,\n  \"estimated_finish\": 0,\n  \"method\": {\n    \"type\": \"supervised\",\n    \"supervised\": {\n      \"hyperparameters\": {\n        \"n_epochs\": 4,\n        \"batch_size\": 1,\n        \"learning_rate_multiplier\": 1.0\n      }\n    }\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/jobs/{fine_tuning_job_id}/cancel": {
+      "post": {
+        "operationId": "cancelFineTuningJob",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "Immediately cancel a fine-tune job.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuning_job_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft-AF1WoRqd3aJAHsqc9NY7iL8F"
+            },
+            "description": "The ID of the fine-tuning job to cancel.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FineTuningJob"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel fine-tuning",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/fine_tuning/jobs/ftjob-abc123/cancel \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.fine_tuning.jobs.cancel(\"ftjob-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const fineTune = await openai.fineTuning.jobs.cancel(\"ftjob-abc123\");\n\n  console.log(fineTune);\n}\nmain();"
+            },
+            "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n  \"created_at\": 1721764800,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-123\",\n  \"result_files\": [],\n  \"status\": \"cancelled\",\n  \"validation_file\": \"file-abc123\",\n  \"training_file\": \"file-abc123\"\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/jobs/{fine_tuning_job_id}/checkpoints": {
+      "get": {
+        "operationId": "listFineTuningJobCheckpoints",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "List checkpoints for a fine-tuning job.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuning_job_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft-AF1WoRqd3aJAHsqc9NY7iL8F"
+            },
+            "description": "The ID of the fine-tuning job to get checkpoints for.\n"
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last checkpoint ID from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of checkpoints to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 10
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListFineTuningJobCheckpointsResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List fine-tuning checkpoints",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/fine_tuning/jobs/ftjob-abc123/checkpoints \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"fine_tuning.job.checkpoint\",\n      \"id\": \"ftckpt_zc4Q7MP6XxulcVzj4MZdwsAB\",\n      \"created_at\": 1721764867,\n      \"fine_tuned_model_checkpoint\": \"ft:gpt-4o-mini-2024-07-18:my-org:custom-suffix:96olL566:ckpt-step-2000\",\n      \"metrics\": {\n        \"full_valid_loss\": 0.134,\n        \"full_valid_mean_token_accuracy\": 0.874\n      },\n      \"fine_tuning_job_id\": \"ftjob-abc123\",\n      \"step_number\": 2000\n    },\n    {\n      \"object\": \"fine_tuning.job.checkpoint\",\n      \"id\": \"ftckpt_enQCFmOTGj3syEpYVhBRLTSy\",\n      \"created_at\": 1721764800,\n      \"fine_tuned_model_checkpoint\": \"ft:gpt-4o-mini-2024-07-18:my-org:custom-suffix:7q8mpxmy:ckpt-step-1000\",\n      \"metrics\": {\n        \"full_valid_loss\": 0.167,\n        \"full_valid_mean_token_accuracy\": 0.781\n      },\n      \"fine_tuning_job_id\": \"ftjob-abc123\",\n      \"step_number\": 1000\n    }\n  ],\n  \"first_id\": \"ftckpt_zc4Q7MP6XxulcVzj4MZdwsAB\",\n  \"last_id\": \"ftckpt_enQCFmOTGj3syEpYVhBRLTSy\",\n  \"has_more\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/jobs/{fine_tuning_job_id}/events": {
+      "get": {
+        "operationId": "listFineTuningEvents",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "Get status updates for a fine-tuning job.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuning_job_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft-AF1WoRqd3aJAHsqc9NY7iL8F"
+            },
+            "description": "The ID of the fine-tuning job to get events for.\n"
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last event from the previous pagination request.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of events to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListFineTuningJobEventsResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List fine-tuning events",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/fine_tuning/jobs/ftjob-abc123/events \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.fine_tuning.jobs.list_events(\n  fine_tuning_job_id=\"ftjob-abc123\",\n  limit=2\n)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const list = await openai.fineTuning.list_events(id=\"ftjob-abc123\", limit=2);\n\n  for await (const fineTune of list) {\n    console.log(fineTune);\n  }\n}\n\nmain();"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"fine_tuning.job.event\",\n      \"id\": \"ft-event-ddTJfwuMVpfLXseO0Am0Gqjm\",\n      \"created_at\": 1721764800,\n      \"level\": \"info\",\n      \"message\": \"Fine tuning job successfully completed\",\n      \"data\": null,\n      \"type\": \"message\"\n    },\n    {\n      \"object\": \"fine_tuning.job.event\",\n      \"id\": \"ft-event-tyiGuB72evQncpH87xe505Sv\",\n      \"created_at\": 1721764800,\n      \"level\": \"info\",\n      \"message\": \"New fine-tuned model created: ft:gpt-4o-mini:openai::7p4lURel\",\n      \"data\": null,\n      \"type\": \"message\"\n    }\n  ],\n  \"has_more\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/jobs/{fine_tuning_job_id}/pause": {
+      "post": {
+        "operationId": "pauseFineTuningJob",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "Pause a fine-tune job.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuning_job_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft-AF1WoRqd3aJAHsqc9NY7iL8F"
+            },
+            "description": "The ID of the fine-tuning job to pause.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FineTuningJob"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Pause fine-tuning",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/fine_tuning/jobs/ftjob-abc123/pause \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.fine_tuning.jobs.pause(\"ftjob-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const fineTune = await openai.fineTuning.jobs.pause(\"ftjob-abc123\");\n\n  console.log(fineTune);\n}\nmain();"
+            },
+            "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n  \"created_at\": 1721764800,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-123\",\n  \"result_files\": [],\n  \"status\": \"paused\",\n  \"validation_file\": \"file-abc123\",\n  \"training_file\": \"file-abc123\"\n}\n"
+          }
+        }
+      }
+    },
+    "/fine_tuning/jobs/{fine_tuning_job_id}/resume": {
+      "post": {
+        "operationId": "resumeFineTuningJob",
+        "tags": [
+          "Fine-tuning"
+        ],
+        "summary": "Resume a fine-tune job.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "fine_tuning_job_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft-AF1WoRqd3aJAHsqc9NY7iL8F"
+            },
+            "description": "The ID of the fine-tuning job to resume.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FineTuningJob"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Resume fine-tuning",
+          "group": "fine-tuning",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/fine_tuning/jobs/ftjob-abc123/resume \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.fine_tuning.jobs.resume(\"ftjob-abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const fineTune = await openai.fineTuning.jobs.resume(\"ftjob-abc123\");\n\n  console.log(fineTune);\n}\nmain();"
+            },
+            "response": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"gpt-4o-mini-2024-07-18\",\n  \"created_at\": 1721764800,\n  \"fine_tuned_model\": null,\n  \"organization_id\": \"org-123\",\n  \"result_files\": [],\n  \"status\": \"queued\",\n  \"validation_file\": \"file-abc123\",\n  \"training_file\": \"file-abc123\"\n}\n"
+          }
+        }
+      }
+    },
+    "/images/edits": {
+      "post": {
+        "operationId": "createImageEdit",
+        "tags": [
+          "Images"
+        ],
+        "summary": "Creates an edited or extended image given one or more source images and a prompt. This endpoint supports GPT Image models and `dall-e-2`.",
+        "description": "You can call this endpoint with either:\n\n- `multipart/form-data`: use binary uploads via `image` (and optional `mask`).\n- `application/json`: use `images` (and optional `mask`) as references with either `image_url` or `file_id`.\n\nNote that JSON requests use `images` (array) instead of the multipart `image` field.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateImageEditRequest"
+              },
+              "examples": {
+                "multipart_edit": {
+                  "summary": "Multipart form upload (binary image + prompt)",
+                  "value": {
+                    "model": "gpt-image-1.5",
+                    "prompt": "Add a watercolor effect to this image",
+                    "image": "<binary image file>",
+                    "size": "1024x1024",
+                    "quality": "high"
+                  }
+                }
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EditImageBodyJsonParam"
+              },
+              "examples": {
+                "json_with_url": {
+                  "summary": "JSON request with image URL",
+                  "value": {
+                    "model": "gpt-image-1.5",
+                    "prompt": "Add a watercolor effect to this image",
+                    "images": [
+                      {
+                        "image_url": "https://example.com/source-image.png"
+                      }
+                    ],
+                    "size": "1024x1024",
+                    "quality": "high"
+                  }
+                },
+                "json_with_file_id": {
+                  "summary": "JSON request with uploaded file id",
+                  "value": {
+                    "model": "gpt-image-1.5",
+                    "prompt": "Replace the background with a snowy mountain scene",
+                    "images": [
+                      {
+                        "file_id": "file-abc123"
+                      }
+                    ],
+                    "mask": {
+                      "file_id": "file-mask123"
+                    },
+                    "output_format": "png",
+                    "output_compression": 100
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ImagesResponse"
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/ImageEditStreamEvent"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create image edit",
+          "group": "images",
+          "examples": [
+            {
+              "title": "Edit image",
+              "request": {
+                "curl": "curl -s -D >(grep -i x-request-id >&2) \\\n  -o >(jq -r '.data[0].b64_json' | base64 --decode > gift-basket.png) \\\n  -X POST \"https://api.openai.com/v1/images/edits\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F \"model=gpt-image-1.5\" \\\n  -F \"image[]=@body-lotion.png\" \\\n  -F \"image[]=@bath-bomb.png\" \\\n  -F \"image[]=@incense-kit.png\" \\\n  -F \"image[]=@soap.png\" \\\n  -F 'prompt=Create a lovely gift basket with these four items in it'\n",
+                "python": "import base64\nfrom openai import OpenAI\nclient = OpenAI()\n\nprompt = \"\"\"\nGenerate a photorealistic image of a gift basket on a white background\nlabeled 'Relax & Unwind' with a ribbon and handwriting-like font,\ncontaining all the items in the reference pictures.\n\"\"\"\n\nresult = client.images.edit(\n    model=\"gpt-image-1.5\",\n    image=[\n        open(\"body-lotion.png\", \"rb\"),\n        open(\"bath-bomb.png\", \"rb\"),\n        open(\"incense-kit.png\", \"rb\"),\n        open(\"soap.png\", \"rb\"),\n    ],\n    prompt=prompt\n)\n\nimage_base64 = result.data[0].b64_json\nimage_bytes = base64.b64decode(image_base64)\n\n# Save the image to a file\nwith open(\"gift-basket.png\", \"wb\") as f:\n    f.write(image_bytes)\n",
+                "javascript": "import fs from \"fs\";\nimport OpenAI, { toFile } from \"openai\";\n\nconst client = new OpenAI();\n\nconst imageFiles = [\n    \"bath-bomb.png\",\n    \"body-lotion.png\",\n    \"incense-kit.png\",\n    \"soap.png\",\n];\n\nconst images = await Promise.all(\n    imageFiles.map(async (file) =>\n        await toFile(fs.createReadStream(file), null, {\n            type: \"image/png\",\n        })\n    ),\n);\n\nconst rsp = await client.images.edit({\n    model: \"gpt-image-1.5\",\n    image: images,\n    prompt: \"Create a lovely gift basket with these four items in it\",\n});\n\n// Save the image to a file\nconst image_base64 = rsp.data[0].b64_json;\nconst image_bytes = Buffer.from(image_base64, \"base64\");\nfs.writeFileSync(\"basket.png\", image_bytes);\n"
+              }
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl -s -N -X POST \"https://api.openai.com/v1/images/edits\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F \"model=gpt-image-1.5\" \\\n  -F \"image[]=@body-lotion.png\" \\\n  -F \"image[]=@bath-bomb.png\" \\\n  -F \"image[]=@incense-kit.png\" \\\n  -F \"image[]=@soap.png\" \\\n  -F 'prompt=Create a lovely gift basket with these four items in it' \\\n  -F \"stream=true\"\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nprompt = \"\"\"\nGenerate a photorealistic image of a gift basket on a white background\nlabeled 'Relax & Unwind' with a ribbon and handwriting-like font,\ncontaining all the items in the reference pictures.\n\"\"\"\n\nstream = client.images.edit(\n    model=\"gpt-image-1.5\",\n    image=[\n        open(\"body-lotion.png\", \"rb\"),\n        open(\"bath-bomb.png\", \"rb\"),\n        open(\"incense-kit.png\", \"rb\"),\n        open(\"soap.png\", \"rb\"),\n    ],\n    prompt=prompt,\n    stream=True\n)\n\nfor event in stream:\n    print(event)\n",
+                "javascript": "import fs from \"fs\";\nimport OpenAI, { toFile } from \"openai\";\n\nconst client = new OpenAI();\n\nconst imageFiles = [\n    \"bath-bomb.png\",\n    \"body-lotion.png\",\n    \"incense-kit.png\",\n    \"soap.png\",\n];\n\nconst images = await Promise.all(\n    imageFiles.map(async (file) =>\n        await toFile(fs.createReadStream(file), null, {\n            type: \"image/png\",\n        })\n    ),\n);\n\nconst stream = await client.images.edit({\n    model: \"gpt-image-1.5\",\n    image: images,\n    prompt: \"Create a lovely gift basket with these four items in it\",\n    stream: true,\n});\n\nfor await (const event of stream) {\n    console.log(event);\n}\n"
+              },
+              "response": "event: image_edit.partial_image\ndata: {\"type\":\"image_edit.partial_image\",\"b64_json\":\"...\",\"partial_image_index\":0}\n\nevent: image_edit.completed\ndata: {\"type\":\"image_edit.completed\",\"b64_json\":\"...\",\"usage\":{\"total_tokens\":100,\"input_tokens\":50,\"output_tokens\":50,\"input_tokens_details\":{\"text_tokens\":10,\"image_tokens\":40}}}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/images/generations": {
+      "post": {
+        "operationId": "createImage",
+        "tags": [
+          "Images"
+        ],
+        "summary": "Creates an image given a prompt. [Learn more](https://developers.openai.com/api/docs/guides/images-vision).\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateImageRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ImagesResponse"
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/ImageGenStreamEvent"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create image",
+          "group": "images",
+          "examples": [
+            {
+              "title": "Generate image",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/images/generations \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-image-1.5\",\n    \"prompt\": \"A cute baby sea otter\",\n    \"n\": 1,\n    \"size\": \"1024x1024\"\n  }'\n",
+                "python": "import base64\nfrom openai import OpenAI\nclient = OpenAI()\n\nimg = client.images.generate(\n    model=\"gpt-image-1.5\",\n    prompt=\"A cute baby sea otter\",\n    n=1,\n    size=\"1024x1024\"\n)\n\nimage_bytes = base64.b64decode(img.data[0].b64_json)\nwith open(\"output.png\", \"wb\") as f:\n    f.write(image_bytes)\n",
+                "javascript": "import OpenAI from \"openai\";\nimport { writeFile } from \"fs/promises\";\n\nconst client = new OpenAI();\n\nconst img = await client.images.generate({\n  model: \"gpt-image-1.5\",\n  prompt: \"A cute baby sea otter\",\n  n: 1,\n  size: \"1024x1024\"\n});\n\nconst imageBuffer = Buffer.from(img.data[0].b64_json, \"base64\");\nawait writeFile(\"output.png\", imageBuffer);\n"
+              },
+              "response": "{\n  \"created\": 1713833628,\n  \"data\": [\n    {\n      \"b64_json\": \"...\"\n    }\n  ],\n  \"usage\": {\n    \"total_tokens\": 100,\n    \"input_tokens\": 50,\n    \"output_tokens\": 50,\n    \"input_tokens_details\": {\n      \"text_tokens\": 10,\n      \"image_tokens\": 40\n    }\n  }\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/images/generations \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-image-1.5\",\n    \"prompt\": \"A cute baby sea otter\",\n    \"n\": 1,\n    \"size\": \"1024x1024\",\n    \"stream\": true\n  }' \\\n  --no-buffer\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nstream = client.images.generate(\n    model=\"gpt-image-1.5\",\n    prompt=\"A cute baby sea otter\",\n    n=1,\n    size=\"1024x1024\",\n    stream=True\n)\n\nfor event in stream:\n    print(event)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst client = new OpenAI();\n\nconst stream = await client.images.generate({\n  model: \"gpt-image-1.5\",\n  prompt: \"A cute baby sea otter\",\n  n: 1,\n  size: \"1024x1024\",\n  stream: true,\n});\n\nfor await (const event of stream) {\n  console.log(event);\n}\n"
+              },
+              "response": "event: image_generation.partial_image\ndata: {\"type\":\"image_generation.partial_image\",\"b64_json\":\"...\",\"partial_image_index\":0}\n\nevent: image_generation.completed\ndata: {\"type\":\"image_generation.completed\",\"b64_json\":\"...\",\"usage\":{\"total_tokens\":100,\"input_tokens\":50,\"output_tokens\":50,\"input_tokens_details\":{\"text_tokens\":10,\"image_tokens\":40}}}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/images/variations": {
+      "post": {
+        "operationId": "createImageVariation",
+        "tags": [
+          "Images"
+        ],
+        "summary": "Creates a variation of a given image. This endpoint only supports `dall-e-2`.",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateImageVariationRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ImagesResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create image variation",
+          "group": "images",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/images/variations \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F image=\"@otter.png\" \\\n  -F n=2 \\\n  -F size=\"1024x1024\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.images.create_variation(\n  image=open(\"image_edit_original.png\", \"rb\"),\n  n=2,\n  size=\"1024x1024\"\n)\n",
+              "javascript": "import fs from \"fs\";\nimport OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const image = await openai.images.createVariation({\n    image: fs.createReadStream(\"otter.png\"),\n  });\n\n  console.log(image.data);\n}\nmain();",
+              "csharp": "using System;\n\nusing OpenAI.Images;\n\nImageClient client = new(\n    model: \"dall-e-2\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nGeneratedImage image = client.GenerateImageVariation(imageFilePath: \"otter.png\");\n\nConsole.WriteLine(image.ImageUri);\n"
+            },
+            "response": "{\n  \"created\": 1589478378,\n  \"data\": [\n    {\n      \"url\": \"https://...\"\n    },\n    {\n      \"url\": \"https://...\"\n    }\n  ]\n}\n"
+          }
+        }
+      }
+    },
+    "/live/sessions": {
+      "post": {
+        "operationId": "create-live",
+        "summary": "Create a Live WebRTC session. Start with the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting).",
+        "description": "Send JSON containing session configuration and transport with type webrtc and the SDP offer. The request starts the session. Apply transport.sdp from the response as the remote answer and wait for session.started on the data channel before sending commands. Audio uses the negotiated media track; omit audio.format and do not send session.start on the data channel. Before integrating, follow the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) to write frontend conversation and delegation instructions and a separate backend prompt.",
+        "tags": [
+          "Live"
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LiveCreateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Live session created with a WebRTC answer.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/LiveCreateResponse"
+                },
+                "example": {
+                  "session": {
+                    "id": "live_123"
+                  },
+                  "transport": {
+                    "type": "webrtc",
+                    "sdp": "<SDP answer>"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create session",
+          "group": "live",
+          "returns": "Returns 201 Created with the session identifier in session.id and SDP answer in transport.sdp.",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/live/sessions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"session\":{\"model\":\"gpt-live-1\",\"instructions\":\"Be concise. Ask for clarification when needed.\"},\"transport\":{\"type\":\"webrtc\",\"sdp\":\"<SDP offer>\"}}'"
+            }
+          }
+        }
+      }
+    },
+    "/live/sessions/{session_id}/accept": {
+      "post": {
+        "operationId": "accept-live-session",
+        "summary": "Accept an incoming SIP call. Supply session with type live, the model, and startup configuration. Before accepting calls, follow the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) to write frontend conversation instructions and a separate backend prompt. SIP media format is negotiated; omit audio.format.",
+        "description": "Accept an incoming SIP call. Supply session with type live, the model, and startup configuration. Before accepting calls, follow the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) to write frontend conversation instructions and a separate backend prompt. SIP media format is negotiated; omit audio.format.",
+        "tags": [
+          "Live"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "session_id",
+            "required": true,
+            "description": "Opaque Live session identifier from the creation response or incoming-call webhook. Preserve the returned value unchanged, including its prefix.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LiveCallAcceptRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Session accept request accepted."
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Accept call",
+          "group": "live-sessions",
+          "returns": "Returns 200 OK when the control request succeeds."
+        }
+      }
+    },
+    "/live/sessions/{session_id}/fork": {
+      "post": {
+        "operationId": "fork-live-session",
+        "summary": "Fork a stored Live session onto a new WebRTC connection.",
+        "description": "Resume the stored conversation using a new WebRTC connection. The model, voice, and frontend instructions are inherited. Omit session or send an empty object to inherit the remaining configuration. Only Responses delegation settings, storage, and frontend data-channel permissions can be overridden. Apply transport.sdp as the remote answer and wait for session.started before sending commands. Do not send session.start on the data channel or supply audio.format; WebRTC negotiates its media format.",
+        "tags": [
+          "Live"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "session_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the stored Live session to fork."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LiveForkRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Forked Live session created with a WebRTC answer.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/LiveCreateResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Fork session",
+          "group": "live",
+          "returns": "The new session identifier in session.id and SDP answer in transport.sdp.",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/live/sessions/live_123/fork \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"session\":{},\"transport\":{\"type\":\"webrtc\",\"sdp\":\"<SDP offer>\"}}'"
+            }
+          }
+        }
+      }
+    },
+    "/live/sessions/{session_id}/hangup": {
+      "post": {
+        "operationId": "hangup-live-session",
+        "summary": "End a SIP call identified by session_id.",
+        "description": "End a SIP call identified by session_id.",
+        "tags": [
+          "Live"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "session_id",
+            "required": true,
+            "description": "Opaque Live session identifier from the creation response or incoming-call webhook. Preserve the returned value unchanged, including its prefix.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Session hangup request accepted."
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Hang up session",
+          "group": "live-sessions",
+          "returns": "Returns 200 OK when the control request succeeds."
+        }
+      }
+    },
+    "/live/sessions/{session_id}/refer": {
+      "post": {
+        "operationId": "refer-live-session",
+        "summary": "Transfer a SIP call to another destination. Supply a nonblank target_uri for the SIP Refer-To header.",
+        "description": "Transfer a SIP call to another destination. Supply a nonblank target_uri for the SIP Refer-To header.",
+        "tags": [
+          "Live"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "session_id",
+            "required": true,
+            "description": "Opaque Live session identifier from the creation response or incoming-call webhook. Preserve the returned value unchanged, including its prefix.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LiveCallReferRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Session refer request accepted."
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Transfer call",
+          "group": "live-sessions",
+          "returns": "Returns 200 OK when the control request succeeds."
+        }
+      }
+    },
+    "/live/sessions/{session_id}/reject": {
+      "post": {
+        "operationId": "reject-live-session",
+        "summary": "Reject an incoming SIP call. Send a required SIP rejection status_code between 300 and 699.",
+        "description": "Reject an incoming SIP call. Send a required SIP rejection status_code between 300 and 699.",
+        "tags": [
+          "Live"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "session_id",
+            "required": true,
+            "description": "Opaque Live session identifier from the creation response or incoming-call webhook. Preserve the returned value unchanged, including its prefix.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LiveCallRejectRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Session reject request accepted."
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Reject call",
+          "group": "live-sessions",
+          "returns": "Returns 200 OK when the control request succeeds."
+        }
+      }
+    },
+    "/models": {
+      "get": {
+        "operationId": "listModels",
+        "tags": [
+          "Models"
+        ],
+        "summary": "Lists the currently available models, and provides basic information about each one such as the owner and availability.",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListModelsResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List models",
+          "group": "models",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/models \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.models.list()\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const list = await openai.models.list();\n\n  for await (const model of list) {\n    console.log(model);\n  }\n}\nmain();",
+              "csharp": "using System;\n\nusing OpenAI.Models;\n\nOpenAIModelClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nforeach (var model in client.GetModels().Value)\n{\n    Console.WriteLine(model.Id);\n}\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"model-id-0\",\n      \"object\": \"model\",\n      \"created\": 1686935002,\n      \"owned_by\": \"organization-owner\",\n      \"shutdown_date\": null\n    },\n    {\n      \"id\": \"model-id-1\",\n      \"object\": \"model\",\n      \"created\": 1686935002,\n      \"owned_by\": \"organization-owner\",\n      \"shutdown_date\": null\n    },\n    {\n      \"id\": \"model-id-2\",\n      \"object\": \"model\",\n      \"created\": 1686935002,\n      \"owned_by\": \"openai\",\n      \"shutdown_date\": \"2026-10-23\"\n    },\n  ]\n}\n"
+          }
+        }
+      }
+    },
+    "/models/{model}": {
+      "get": {
+        "operationId": "retrieveModel",
+        "tags": [
+          "Models"
+        ],
+        "summary": "Retrieves a model instance, providing basic information about the model such as the owner and permissioning.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "model",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "gpt-6-astra"
+            },
+            "description": "The ID of the model to use for this request"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Model"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve model",
+          "group": "models",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/models/gpt-6-astra \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.models.retrieve(\"gpt-6-astra\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const model = await openai.models.retrieve(\"gpt-6-astra\");\n\n  console.log(model);\n}\n\nmain();",
+              "csharp": "using System;\nusing System.ClientModel;\n\nusing OpenAI.Models;\n\n  OpenAIModelClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nClientResult<OpenAIModel> model = client.GetModel(\"babbage-002\");\nConsole.WriteLine(model.Value.Id);\n"
+            },
+            "response": "{\n  \"id\": \"gpt-6-astra\",\n  \"object\": \"model\",\n  \"created\": 1686935002,\n  \"owned_by\": \"openai\",\n  \"shutdown_date\": \"2026-10-23\"\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteModel",
+        "tags": [
+          "Models"
+        ],
+        "summary": "Delete a fine-tuned model. You must have the Owner role in your organization to delete a model.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "model",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "ft:gpt-4o-mini:acemeco:suffix:abc123"
+            },
+            "description": "The model to delete"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteModelResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a fine-tuned model",
+          "group": "models",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/models/ft:gpt-4o-mini:acemeco:suffix:abc123 \\\n  -X DELETE \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nclient.models.delete(\"ft:gpt-4o-mini:acemeco:suffix:abc123\")\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const model = await openai.models.delete(\"ft:gpt-4o-mini:acemeco:suffix:abc123\");\n  \n  console.log(model);\n}\nmain();",
+              "csharp": "using System;\nusing System.ClientModel;\n\nusing OpenAI.Models;\n\nOpenAIModelClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nClientResult success = client.DeleteModel(\"ft:gpt-4o-mini:acemeco:suffix:abc123\");\nConsole.WriteLine(success);\n"
+            },
+            "response": "{\n  \"id\": \"ft:gpt-4o-mini:acemeco:suffix:abc123\",\n  \"object\": \"model\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/moderations": {
+      "post": {
+        "operationId": "createModeration",
+        "tags": [
+          "Moderations"
+        ],
+        "summary": "Classifies if text and/or image inputs are potentially harmful. Learn\nmore in the [moderation guide](https://developers.openai.com/api/docs/guides/moderation).\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateModerationRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CreateModerationResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create moderation",
+          "group": "moderations",
+          "examples": [
+            {
+              "title": "Single string",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/moderations \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"input\": \"I want to kill them.\"\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nmoderation = client.moderations.create(input=\"I want to kill them.\")\nprint(moderation)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const moderation = await openai.moderations.create({ input: \"I want to kill them.\" });\n\n  console.log(moderation);\n}\nmain();\n",
+                "csharp": "using System;\nusing System.ClientModel;\n\nusing OpenAI.Moderations;\n\nModerationClient client = new(\n    model: \"omni-moderation-latest\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nClientResult<ModerationResult> moderation = client.ClassifyText(\"I want to kill them.\");\n"
+              },
+              "response": "{\n  \"id\": \"modr-AB8CjOTu2jiq12hp1AQPfeqFWaORR\",\n  \"model\": \"text-moderation-007\",\n  \"results\": [\n    {\n      \"flagged\": true,\n      \"categories\": {\n        \"sexual\": false,\n        \"hate\": false,\n        \"harassment\": true,\n        \"self-harm\": false,\n        \"sexual/minors\": false,\n        \"hate/threatening\": false,\n        \"violence/graphic\": false,\n        \"self-harm/intent\": false,\n        \"self-harm/instructions\": false,\n        \"harassment/threatening\": true,\n        \"violence\": true\n      },\n      \"category_scores\": {\n        \"sexual\": 0.000011726012417057063,\n        \"hate\": 0.22706663608551025,\n        \"harassment\": 0.5215635299682617,\n        \"self-harm\": 2.227119921371923e-6,\n        \"sexual/minors\": 7.107352217872176e-8,\n        \"hate/threatening\": 0.023547329008579254,\n        \"violence/graphic\": 0.00003391829886822961,\n        \"self-harm/intent\": 1.646940972932498e-6,\n        \"self-harm/instructions\": 1.1198755256458526e-9,\n        \"harassment/threatening\": 0.5694745779037476,\n        \"violence\": 0.9971134662628174\n      }\n    }\n  ]\n}\n"
+            },
+            {
+              "title": "Image and text",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/moderations \\\n  -X POST \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"omni-moderation-latest\",\n    \"input\": [\n      { \"type\": \"text\", \"text\": \"...text to classify goes here...\" },\n      {\n        \"type\": \"image_url\",\n        \"image_url\": {\n          \"url\": \"https://example.com/image.png\"\n        }\n      }\n    ]\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.moderations.create(\n    model=\"omni-moderation-latest\",\n    input=[\n        {\"type\": \"text\", \"text\": \"...text to classify goes here...\"},\n        {\n            \"type\": \"image_url\",\n            \"image_url\": {\n                \"url\": \"https://example.com/image.png\",\n                # can also use base64 encoded image URLs\n                # \"url\": \"data:image/jpeg;base64,abcdefg...\"\n            }\n        },\n    ],\n)\n\nprint(response)\n",
+                "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nconst moderation = await openai.moderations.create({\n    model: \"omni-moderation-latest\",\n    input: [\n        { type: \"text\", text: \"...text to classify goes here...\" },\n        {\n            type: \"image_url\",\n            image_url: {\n                url: \"https://example.com/image.png\"\n                // can also use base64 encoded image URLs\n                // url: \"data:image/jpeg;base64,abcdefg...\"\n            }\n        }\n    ],\n});\n\nconsole.log(moderation);\n"
+              },
+              "response": "{\n  \"id\": \"modr-0d9740456c391e43c445bf0f010940c7\",\n  \"model\": \"omni-moderation-latest\",\n  \"results\": [\n    {\n      \"flagged\": true,\n      \"categories\": {\n        \"harassment\": true,\n        \"harassment/threatening\": true,\n        \"sexual\": false,\n        \"hate\": false,\n        \"hate/threatening\": false,\n        \"illicit\": false,\n        \"illicit/violent\": false,\n        \"self-harm/intent\": false,\n        \"self-harm/instructions\": false,\n        \"self-harm\": false,\n        \"sexual/minors\": false,\n        \"violence\": true,\n        \"violence/graphic\": true\n      },\n      \"category_scores\": {\n        \"harassment\": 0.8189693396524255,\n        \"harassment/threatening\": 0.804985420696006,\n        \"sexual\": 1.573112165348997e-6,\n        \"hate\": 0.007562942636942845,\n        \"hate/threatening\": 0.004208854591835476,\n        \"illicit\": 0.030535955153511665,\n        \"illicit/violent\": 0.008925306722380033,\n        \"self-harm/intent\": 0.00023023930975076432,\n        \"self-harm/instructions\": 0.0002293869201073356,\n        \"self-harm\": 0.012598046106750154,\n        \"sexual/minors\": 2.212566909570261e-8,\n        \"violence\": 0.9999992735124786,\n        \"violence/graphic\": 0.843064871157054\n      },\n      \"category_applied_input_types\": {\n        \"harassment\": [\n          \"text\"\n        ],\n        \"harassment/threatening\": [\n          \"text\"\n        ],\n        \"sexual\": [\n          \"text\",\n          \"image\"\n        ],\n        \"hate\": [\n          \"text\"\n        ],\n        \"hate/threatening\": [\n          \"text\"\n        ],\n        \"illicit\": [\n          \"text\"\n        ],\n        \"illicit/violent\": [\n          \"text\"\n        ],\n        \"self-harm/intent\": [\n          \"text\",\n          \"image\"\n        ],\n        \"self-harm/instructions\": [\n          \"text\",\n          \"image\"\n        ],\n        \"self-harm\": [\n          \"text\",\n          \"image\"\n        ],\n        \"sexual/minors\": [\n          \"text\"\n        ],\n        \"violence\": [\n          \"text\",\n          \"image\"\n        ],\n        \"violence/graphic\": [\n          \"text\",\n          \"image\"\n        ]\n      }\n    }\n  ]\n}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/organization/admin_api_keys": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "List organization API keys",
+        "operationId": "admin-api-keys-list",
+        "description": "Retrieve a paginated list of organization admin API keys.",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "after",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "nullable": true,
+              "description": "Return keys with IDs that come after this ID in the pagination order."
+            }
+          },
+          {
+            "in": "query",
+            "name": "order",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc",
+              "description": "Order results by creation time, ascending or descending."
+            }
+          },
+          {
+            "in": "query",
+            "name": "limit",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20,
+              "description": "Maximum number of keys to return."
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A list of organization API keys.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ApiKeyList"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List all organization and project API keys.",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/admin_api_keys?after=key_abc&limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"organization.admin_api_key\",\n      \"id\": \"key_abc\",\n      \"name\": \"Main Admin Key\",\n      \"redacted_value\": \"sk-admin...def\",\n      \"created_at\": 1711471533,\n      \"expires_at\": 1714063533,\n      \"last_used_at\": 1711471534,\n      \"owner\": {\n        \"type\": \"service_account\",\n        \"object\": \"organization.service_account\",\n        \"id\": \"sa_456\",\n        \"name\": \"My Service Account\",\n        \"created_at\": 1711471533,\n        \"role\": \"member\"\n      }\n    }\n  ],\n  \"first_id\": \"key_abc\",\n  \"last_id\": \"key_abc\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Create an organization admin API key",
+        "operationId": "admin-api-keys-create",
+        "description": "Create a new admin-level API key for the organization.",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "name"
+                ],
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "example": "New Admin Key"
+                  },
+                  "expires_in_seconds": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 31536000,
+                    "example": 2592000,
+                    "description": "The number of seconds until the API key expires. Omit this field for a key that does not expire."
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The newly created admin API key.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AdminApiKeyCreateResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create admin API key",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/admin_api_keys \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"name\": \"New Admin Key\",\n      \"expires_in_seconds\": 2592000\n  }'\n"
+            },
+            "response": "{\n  \"object\": \"organization.admin_api_key\",\n  \"id\": \"key_xyz\",\n  \"name\": \"New Admin Key\",\n  \"redacted_value\": \"sk-admin...xyz\",\n  \"created_at\": 1711471533,\n  \"expires_at\": 1714063533,\n  \"last_used_at\": 1711471534,\n  \"owner\": {\n    \"type\": \"user\",\n    \"object\": \"organization.user\",\n    \"id\": \"user_123\",\n    \"name\": \"John Doe\",\n    \"created_at\": 1711471533,\n    \"role\": \"owner\"\n  },\n  \"value\": \"sk-admin-1234abcd\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/admin_api_keys/{key_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieve a single organization API key",
+        "operationId": "admin-api-keys-get",
+        "description": "Get details for a specific organization API key by its ID.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "key_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "description": "The ID of the API key."
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Details of the requested API key.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AdminApiKey"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve admin API key",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/admin_api_keys/key_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n  \"object\": \"organization.admin_api_key\",\n  \"id\": \"key_abc\",\n  \"name\": \"Main Admin Key\",\n  \"redacted_value\": \"sk-admin...xyz\",\n  \"created_at\": 1711471533,\n  \"last_used_at\": 1711471534,\n  \"owner\": {\n    \"type\": \"user\",\n    \"object\": \"organization.user\",\n    \"id\": \"user_123\",\n    \"name\": \"John Doe\",\n    \"created_at\": 1711471533,\n    \"role\": \"owner\"\n  }\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Delete an organization admin API key",
+        "operationId": "admin-api-keys-delete",
+        "description": "Delete the specified admin API key.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "key_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "description": "The ID of the API key to be deleted."
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Confirmation that the API key was deleted.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "example": "key_abc"
+                    },
+                    "object": {
+                      "type": "string",
+                      "enum": [
+                        "organization.admin_api_key.deleted"
+                      ],
+                      "example": "organization.admin_api_key.deleted",
+                      "x-stainless-const": true
+                    },
+                    "deleted": {
+                      "type": "boolean",
+                      "example": true
+                    }
+                  },
+                  "required": [
+                    "id",
+                    "object",
+                    "deleted"
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete admin API key",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/admin_api_keys/key_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n  \"id\": \"key_abc\",\n  \"object\": \"organization.admin_api_key.deleted\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/audit_logs": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "List user actions and configuration changes within this organization.",
+        "operationId": "list-audit-logs",
+        "tags": [
+          "Audit Logs"
+        ],
+        "parameters": [
+          {
+            "name": "effective_at",
+            "in": "query",
+            "description": "Return only events whose `effective_at` (Unix seconds) is in this range.",
+            "required": false,
+            "schema": {
+              "type": "object",
+              "properties": {
+                "gt": {
+                  "type": "integer",
+                  "description": "Return only events whose `effective_at` (Unix seconds) is greater than this value."
+                },
+                "gte": {
+                  "type": "integer",
+                  "description": "Return only events whose `effective_at` (Unix seconds) is greater than or equal to this value."
+                },
+                "lt": {
+                  "type": "integer",
+                  "description": "Return only events whose `effective_at` (Unix seconds) is less than this value."
+                },
+                "lte": {
+                  "type": "integer",
+                  "description": "Return only events whose `effective_at` (Unix seconds) is less than or equal to this value."
+                }
+              }
+            }
+          },
+          {
+            "name": "project_ids[]",
+            "in": "query",
+            "description": "Return only events for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "event_types[]",
+            "in": "query",
+            "description": "Return only events with a `type` in one of these values. For example, `project.created`. For all options, see the documentation for the [audit log object](https://developers.openai.com/api/reference/resources/admin/subresources/organization/subresources/audit_logs).",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/AuditLogEventType"
+              }
+            }
+          },
+          {
+            "name": "actor_ids[]",
+            "in": "query",
+            "description": "Return only events performed by these actors. Can be a user ID, a service account ID, or an api key tracking ID.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "actor_emails[]",
+            "in": "query",
+            "description": "Return only events performed by users with these emails.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "resource_ids[]",
+            "in": "query",
+            "description": "Return only events performed on these targets. For example, a project ID updated. For ChatGPT connector role events, use the workspace connector resource ID shown in `details.id`, such as `<workspace_id>__<connector_id>`.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "tenant_only",
+            "in": "query",
+            "description": "Return only tenant-scoped events associated with this organization. Required for tenant-scoped events such as `role.bound_to_resource` and `role.unbound_from_resource`. When `true`, all supplied event types must be tenant-scoped.",
+            "required": false,
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, starting with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Audit logs listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListAuditLogsResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List audit logs",
+          "group": "audit-logs",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/audit_logs \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"audit_log-xxx_yyyymmdd\",\n            \"type\": \"project.archived\",\n            \"effective_at\": 1722461446,\n            \"actor\": {\n                \"type\": \"api_key\",\n                \"api_key\": {\n                    \"type\": \"user\",\n                    \"user\": {\n                        \"id\": \"user-xxx\",\n                        \"email\": \"user@example.com\"\n                    }\n                }\n            },\n            \"project.archived\": {\n                \"id\": \"proj_abc\"\n            },\n        },\n        {\n            \"id\": \"audit_log-yyy__20240101\",\n            \"type\": \"api_key.updated\",\n            \"effective_at\": 1720804190,\n            \"actor\": {\n                \"type\": \"session\",\n                \"session\": {\n                    \"user\": {\n                        \"id\": \"user-xxx\",\n                        \"email\": \"user@example.com\"\n                    },\n                    \"ip_address\": \"127.0.0.1\",\n                    \"user_agent\": \"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36\",\n                    \"ja3\": \"a497151ce4338a12c4418c44d375173e\",\n                    \"ja4\": \"q13d0313h3_55b375c5d22e_c7319ce65786\",\n                    \"ip_address_details\": {\n                      \"country\": \"US\",\n                      \"city\": \"San Francisco\",\n                      \"region\": \"California\",\n                      \"region_code\": \"CA\",\n                      \"asn\": \"1234\",\n                      \"latitude\": \"37.77490\",\n                      \"longitude\": \"-122.41940\"\n                    }\n                }\n            },\n            \"api_key.updated\": {\n                \"id\": \"key_xxxx\",\n                \"data\": {\n                    \"scopes\": [\"resource_2.operation_2\"]\n                }\n            },\n        }\n    ],\n    \"first_id\": \"audit_log-xxx__20240101\",\n    \"last_id\": \"audit_log_yyy__20240101\",\n    \"has_more\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/certificates": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "List uploaded certificates for this organization.",
+        "operationId": "listOrganizationCertificates",
+        "tags": [
+          "Certificates"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Certificates listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListCertificatesResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List organization certificates",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/certificates \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\"\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"organization.certificate\",\n      \"id\": \"cert_abc\",\n      \"name\": \"My Example Certificate\",\n      \"active\": true,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n  ],\n  \"first_id\": \"cert_abc\",\n  \"last_id\": \"cert_abc\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Upload a certificate to the organization. This does **not** automatically activate the certificate.\n\nOrganizations can upload up to 50 certificates.\n",
+        "operationId": "uploadCertificate",
+        "tags": [
+          "Certificates"
+        ],
+        "requestBody": {
+          "description": "The certificate upload payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UploadCertificateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Certificate uploaded successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Certificate"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Upload certificate",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/certificates \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\" \\\n-d '{\n  \"name\": \"My Example Certificate\",\n  \"certificate\": \"-----BEGIN CERTIFICATE-----\\\\nMIIDeT...\\\\n-----END CERTIFICATE-----\"\n}'\n"
+            },
+            "response": "{\n  \"object\": \"certificate\",\n  \"id\": \"cert_abc\",\n  \"name\": \"My Example Certificate\",\n  \"created_at\": 1234567,\n  \"certificate_details\": {\n    \"valid_at\": 12345667,\n    \"expires_at\": 12345678\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/certificates/activate": {
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Activate certificates at the organization level.\n\nYou can atomically and idempotently activate up to 10 certificates at a time.\n",
+        "operationId": "activateOrganizationCertificates",
+        "tags": [
+          "Certificates"
+        ],
+        "requestBody": {
+          "description": "The certificate activation payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ToggleCertificatesRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Certificates activated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationCertificateActivationResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Activate certificates for organization",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/certificates/activate \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\" \\\n-d '{\n  \"certificate_ids\": [\"cert_abc\", \"cert_def\"]\n}'\n"
+            },
+            "response": "{\n  \"object\": \"organization.certificate.activation\",\n  \"data\": [\n    {\n      \"object\": \"organization.certificate\",\n      \"id\": \"cert_abc\",\n      \"name\": \"My Example Certificate\",\n      \"active\": true,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n    {\n      \"object\": \"organization.certificate\",\n      \"id\": \"cert_def\",\n      \"name\": \"My Example Certificate 2\",\n      \"active\": true,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n  ],\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/certificates/deactivate": {
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deactivate certificates at the organization level.\n\nYou can atomically and idempotently deactivate up to 10 certificates at a time.\n",
+        "operationId": "deactivateOrganizationCertificates",
+        "tags": [
+          "Certificates"
+        ],
+        "requestBody": {
+          "description": "The certificate deactivation payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ToggleCertificatesRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Certificates deactivated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationCertificateDeactivationResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Deactivate certificates for organization",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/certificates/deactivate \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\" \\\n-d '{\n  \"certificate_ids\": [\"cert_abc\", \"cert_def\"]\n}'\n"
+            },
+            "response": "{\n  \"object\": \"organization.certificate.deactivation\",\n  \"data\": [\n    {\n      \"object\": \"organization.certificate\",\n      \"id\": \"cert_abc\",\n      \"name\": \"My Example Certificate\",\n      \"active\": false,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n    {\n      \"object\": \"organization.certificate\",\n      \"id\": \"cert_def\",\n      \"name\": \"My Example Certificate 2\",\n      \"active\": false,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n  ],\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/certificates/{certificate_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get a certificate that has been uploaded to the organization.\n\nYou can get a certificate regardless of whether it is active or not.\n",
+        "operationId": "getCertificate",
+        "tags": [
+          "Certificates"
+        ],
+        "parameters": [
+          {
+            "name": "certificate_id",
+            "in": "path",
+            "description": "Unique ID of the certificate to retrieve.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "include",
+            "in": "query",
+            "description": "A list of additional fields to include in the response. Currently the only supported value is `content` to fetch the PEM content of the certificate.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "content"
+                ]
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Certificate retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Certificate"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get certificate",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/certificates/cert_abc?include[]=content\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\"\n"
+            },
+            "response": "{\n  \"object\": \"certificate\",\n  \"id\": \"cert_abc\",\n  \"name\": \"My Example Certificate\",\n  \"created_at\": 1234567,\n  \"certificate_details\": {\n    \"valid_at\": 1234567,\n    \"expires_at\": 12345678,\n    \"content\": \"-----BEGIN CERTIFICATE-----MIIDeT...-----END CERTIFICATE-----\"\n  }\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Modify a certificate. Note that only the name can be modified.\n",
+        "operationId": "modifyCertificate",
+        "tags": [
+          "Certificates"
+        ],
+        "parameters": [
+          {
+            "name": "certificate_id",
+            "in": "path",
+            "description": "Unique ID of the certificate to modify.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The certificate modification payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ModifyCertificateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Certificate modified successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Certificate"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify certificate",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/certificates/cert_abc \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\" \\\n-d '{\n  \"name\": \"Renamed Certificate\"\n}'\n"
+            },
+            "response": "{\n  \"object\": \"certificate\",\n  \"id\": \"cert_abc\",\n  \"name\": \"Renamed Certificate\",\n  \"created_at\": 1234567,\n  \"certificate_details\": {\n    \"valid_at\": 12345667,\n    \"expires_at\": 12345678\n  }\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Delete a certificate from the organization.\n\nThe certificate must be inactive for the organization and all projects.\n",
+        "operationId": "deleteCertificate",
+        "tags": [
+          "Certificates"
+        ],
+        "parameters": [
+          {
+            "name": "certificate_id",
+            "in": "path",
+            "description": "Unique ID of the certificate to delete.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Certificate deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteCertificateResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete certificate",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/certificates/cert_abc \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\"\n"
+            },
+            "response": "{\n  \"object\": \"certificate.deleted\",\n  \"id\": \"cert_abc\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/costs": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get costs details for the organization.",
+        "operationId": "usage-costs",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently only `1d` is supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only costs for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only costs for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "line_items",
+            "in": "query",
+            "description": "Return only costs for these exact line item names. Each value must match the complete `line_item` value, for example `gpt-6-astra, input_tokens`.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the costs by the specified fields. Support fields include `project_id`, `line_item`, `api_key_id` and any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "line_item",
+                  "api_key_id"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of buckets to be returned. Limit can range between 1 and 180, and the default is 7.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 7
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Costs data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Costs",
+          "group": "usage-costs",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/costs?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.costs.result\",\n                    \"amount\": {\n                        \"value\": 0.06,\n                        \"currency\": \"usd\"\n                    },\n                    \"line_item\": null,\n                    \"project_id\": null,\n                    \"api_key_id\": null,\n                    \"quantity\": null,\n                    \"quantity_unit\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/data_retention": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves organization data retention controls.",
+        "operationId": "retrieve-organization-data-retention",
+        "tags": [
+          "Data retention"
+        ],
+        "responses": {
+          "200": {
+            "description": "Organization data retention controls retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationDataRetention"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve organization data retention",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/data_retention \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.data_retention\",\n    \"type\": \"modified_abuse_monitoring\"\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates organization data retention controls.",
+        "operationId": "update-organization-data-retention",
+        "tags": [
+          "Data retention"
+        ],
+        "requestBody": {
+          "description": "The desired organization data retention setting.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateOrganizationDataRetentionBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Organization data retention controls updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationDataRetention"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update organization data retention",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/data_retention \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"retention_type\": \"modified_abuse_monitoring\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"organization.data_retention\",\n    \"type\": \"modified_abuse_monitoring\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/groups": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists all groups in the organization.",
+        "operationId": "list-groups",
+        "tags": [
+          "Groups"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of groups to be returned. Limit can range between 0 and 1000, and the default is 100.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1000,
+              "default": 100
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is a group ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with group_abc, your subsequent call can include `after=group_abc` in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Specifies the sort order of the returned groups.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Groups listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List groups",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/groups?limit=20&order=asc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"group\",\n            \"id\": \"group_01J1F8ABCDXYZ\",\n            \"name\": \"Support Team\",\n            \"created_at\": 1711471533,\n            \"is_scim_managed\": false\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Creates a new group in the organization.",
+        "operationId": "create-group",
+        "tags": [
+          "Groups"
+        ],
+        "requestBody": {
+          "description": "Parameters for the group you want to create.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateGroupBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Group created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/groups \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"name\": \"Support Team\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"group\",\n    \"id\": \"group_01J1F8ABCDXYZ\",\n    \"name\": \"Support Team\",\n    \"created_at\": 1711471533,\n    \"is_scim_managed\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/groups/{group_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a group.",
+        "operationId": "retrieve-group",
+        "tags": [
+          "Groups"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to retrieve.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Group retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"group_01J1F8ABCDXYZ\",\n    \"name\": \"Support Team\",\n    \"created_at\": 1711471533,\n    \"is_scim_managed\": false,\n    \"group_type\": \"group\"\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates a group's information.",
+        "operationId": "update-group",
+        "tags": [
+          "Groups"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "New attributes to set on the group.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateGroupBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Group updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupResourceWithSuccess"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"name\": \"Escalations\"\n  }'\n"
+            },
+            "response": "{\n    \"id\": \"group_01J1F8ABCDXYZ\",\n    \"name\": \"Escalations\",\n    \"created_at\": 1711471533,\n    \"is_scim_managed\": false\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes a group from the organization.",
+        "operationId": "delete-group",
+        "tags": [
+          "Groups"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to delete.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Group deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupDeletedResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"group.deleted\",\n    \"id\": \"group_01J1F8ABCDXYZ\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/groups/{group_id}/roles": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists the organization roles assigned to a group within the organization.",
+        "operationId": "list-group-role-assignments",
+        "tags": [
+          "Group organization role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group whose organization role assignments you want to list.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of organization role assignments to return.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1000
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the value from the previous response's `next` field to continue listing organization roles.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned organization roles.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Group organization role assignments listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RoleListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List group organization role assignments",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"role_01J1F8ROLE01\",\n            \"name\": \"API Group Manager\",\n            \"permissions\": [\n                \"api.groups.read\",\n                \"api.groups.write\"\n            ],\n            \"resource_type\": \"api.organization\",\n            \"predefined_role\": false,\n            \"description\": \"Allows managing organization groups\",\n            \"created_at\": 1711471533,\n            \"updated_at\": 1711472599,\n            \"created_by\": \"user_abc123\",\n            \"created_by_user_obj\": {\n                \"id\": \"user_abc123\",\n                \"name\": \"Ada Lovelace\",\n                \"email\": \"ada@example.com\"\n            },\n            \"metadata\": {}\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Assigns an organization role to a group within the organization.",
+        "operationId": "assign-group-role",
+        "tags": [
+          "Group organization role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group that should receive the organization role.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Identifies the organization role to assign to the group.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicAssignOrganizationGroupRoleBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Organization role assigned to the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupRoleAssignment"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Assign organization role to group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role_id\": \"role_01J1F8ROLE01\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"group.role\",\n    \"group\": {\n        \"object\": \"group\",\n        \"id\": \"group_01J1F8ABCDXYZ\",\n        \"name\": \"Support Team\",\n        \"created_at\": 1711471533,\n        \"scim_managed\": false\n    },\n    \"role\": {\n        \"object\": \"role\",\n        \"id\": \"role_01J1F8ROLE01\",\n        \"name\": \"API Group Manager\",\n        \"description\": \"Allows managing organization groups\",\n        \"permissions\": [\n            \"api.groups.read\",\n            \"api.groups.write\"\n        ],\n        \"resource_type\": \"api.organization\",\n        \"predefined_role\": false\n    }\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/groups/{group_id}/roles/{role_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves an organization role assigned to a group.",
+        "operationId": "retrieve-group-role",
+        "tags": [
+          "Group organization role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the organization role to retrieve for the group.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Organization role retrieved for the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AssignedRoleDetails"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve group organization role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ/roles/role_01J1F8ROLE01 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"role_01J1F8ROLE01\",\n    \"name\": \"API Group Manager\",\n    \"permissions\": [\n        \"api.groups.read\",\n        \"api.groups.write\"\n    ],\n    \"resource_type\": \"api.organization\",\n    \"predefined_role\": false,\n    \"description\": \"Allows managing organization groups\",\n    \"created_at\": 1711471533,\n    \"updated_at\": 1711472599,\n    \"created_by\": \"user_abc123\",\n    \"created_by_user_obj\": null,\n    \"metadata\": {},\n    \"assignment_sources\": null\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Unassigns an organization role from a group within the organization.",
+        "operationId": "unassign-group-role",
+        "tags": [
+          "Group organization role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to modify.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the organization role to remove from the group.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Organization role unassigned from the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedRoleAssignmentResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Unassign organization role from group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ/roles/role_01J1F8ROLE01 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"group.role.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/groups/{group_id}/users": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists the users assigned to a group.",
+        "operationId": "list-group-users",
+        "tags": [
+          "Group users"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of users to be returned. Limit can range between 0 and 1000, and the default is 100.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1000,
+              "default": 100
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. Provide the ID of the last user from the previous list response to retrieve the next page.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Specifies the sort order of users in the list.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "desc"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Group users listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List group users",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ/users?limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"user_abc123\",\n            \"name\": \"Ada Lovelace\",\n            \"email\": \"ada@example.com\"\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Adds a user to a group.",
+        "operationId": "add-group-user",
+        "tags": [
+          "Group users"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Identifies the user that should be added to the group.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateGroupUserBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "User added to the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupUserAssignment"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Add group user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ/users \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"user_id\": \"user_abc123\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"group.user\",\n    \"user_id\": \"user_abc123\",\n    \"group_id\": \"group_01J1F8ABCDXYZ\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/groups/{group_id}/users/{user_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a user in a group.",
+        "operationId": "retrieve-group-user",
+        "tags": [
+          "Group users"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user to retrieve from the group.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "User retrieved from the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupMemberUser"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve group user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ/users/user_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"user_abc123\",\n    \"name\": \"Ada Lovelace\",\n    \"email\": \"ada@example.com\",\n    \"picture\": null,\n    \"is_service_account\": false,\n    \"user_type\": \"user\"\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Removes a user from a group.",
+        "operationId": "remove-group-user",
+        "tags": [
+          "Group users"
+        ],
+        "parameters": [
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user to remove from the group.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "User removed from the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupUserDeletedResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Remove group user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/groups/group_01J1F8ABCDXYZ/users/user_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"group.user.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/invites": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Returns a list of invites in the organization.",
+        "operationId": "list-invites",
+        "tags": [
+          "Invites"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Invites listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InviteListResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List invites",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/invites?after=invite-abc&limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"organization.invite\",\n      \"id\": \"invite-abc\",\n      \"email\": \"user@example.com\",\n      \"role\": \"owner\",\n      \"status\": \"accepted\",\n      \"created_at\": 1711471533,\n      \"expires_at\": 1711471533,\n      \"accepted_at\": 1711471533\n    }\n  ],\n  \"first_id\": \"invite-abc\",\n  \"last_id\": \"invite-abc\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Create an invite for a user to the organization. The invite must be accepted by the user before they have access to the organization.",
+        "operationId": "inviteUser",
+        "tags": [
+          "Invites"
+        ],
+        "requestBody": {
+          "description": "The invite request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InviteRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "User invited successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Invite"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create invite",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/invites \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"email\": \"anotheruser@example.com\",\n      \"role\": \"reader\",\n      \"projects\": [\n        {\n          \"id\": \"project-xyz\",\n          \"role\": \"member\"\n        },\n        {\n          \"id\": \"project-abc\",\n          \"role\": \"owner\"\n        }\n      ]\n  }'\n"
+            },
+            "response": "{\n  \"object\": \"organization.invite\",\n  \"id\": \"invite-def\",\n  \"email\": \"anotheruser@example.com\",\n  \"role\": \"reader\",\n  \"status\": \"pending\",\n  \"created_at\": 1711471533,\n  \"expires_at\": 1711471533,\n  \"accepted_at\": null,\n  \"projects\": [\n    {\n      \"id\": \"project-xyz\",\n      \"role\": \"member\"\n    },\n    {\n      \"id\": \"project-abc\",\n      \"role\": \"owner\"\n    }\n  ]\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/invites/{invite_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves an invite.",
+        "operationId": "retrieve-invite",
+        "tags": [
+          "Invites"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "invite_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the invite to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Invite retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Invite"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve invite",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/invites/invite-abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.invite\",\n    \"id\": \"invite-abc\",\n    \"email\": \"user@example.com\",\n    \"role\": \"owner\",\n    \"status\": \"accepted\",\n    \"created_at\": 1711471533,\n    \"expires_at\": 1711471533,\n    \"accepted_at\": 1711471533\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Delete an invite. If the invite has already been accepted, it cannot be deleted.",
+        "operationId": "delete-invite",
+        "tags": [
+          "Invites"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "invite_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the invite to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Invite deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InviteDeleteResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete invite",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/invites/invite-abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.invite.deleted\",\n    \"id\": \"invite-abc\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects": {
+      "get": {
+        "summary": "Returns a list of projects.",
+        "operationId": "list-projects",
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "include_archived",
+            "in": "query",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            },
+            "description": "If `true` returns all projects including those that have been `archived`. Archived projects are not included by default."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Projects listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectListResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List projects",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects?after=proj_abc&limit=20&include_archived=false \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"proj_abc\",\n            \"object\": \"organization.project\",\n            \"name\": \"Project example\",\n            \"created_at\": 1711471533,\n            \"archived_at\": null,\n            \"status\": \"active\"\n        }\n    ],\n    \"first_id\": \"proj-abc\",\n    \"last_id\": \"proj-xyz\",\n    \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "summary": "Create a new project in the organization. Projects can be created and archived, but cannot be deleted.",
+        "operationId": "create-project",
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "tags": [
+          "Projects"
+        ],
+        "requestBody": {
+          "description": "The project create request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectCreateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Project"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create project",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"name\": \"Project ABC\"\n  }'\n"
+            },
+            "response": "{\n    \"id\": \"proj_abc\",\n    \"object\": \"organization.project\",\n    \"name\": \"Project ABC\",\n    \"created_at\": 1711471533,\n    \"archived_at\": null,\n    \"status\": \"active\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}": {
+      "get": {
+        "summary": "Retrieves a project.",
+        "operationId": "retrieve-project",
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Project"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project",
+          "group": "administration",
+          "description": "Retrieve a project.",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"proj_abc\",\n    \"object\": \"organization.project\",\n    \"name\": \"Project example\",\n    \"created_at\": 1711471533,\n    \"archived_at\": null,\n    \"status\": \"active\"\n}\n"
+          }
+        }
+      },
+      "post": {
+        "summary": "Modifies a project in the organization.",
+        "operationId": "modify-project",
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The project update request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectUpdateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Project"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response when updating the default project.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify project",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"name\": \"Project DEF\"\n  }'\n"
+            }
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/api_keys": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Returns a list of API keys in the project.",
+        "operationId": "list-project-api-keys",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "owner_project_access",
+            "in": "query",
+            "description": "Filter API keys by whether the owner currently has effective access to the project. Use `active` for owners with access, `inactive` for owners without access, or `any` for all enabled project API keys. If omitted, the endpoint applies its existing membership-based visibility rules, which may exclude some enabled keys.\n",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "active",
+                "inactive",
+                "any"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project API keys listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectApiKeyListResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project API keys",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/api_keys?after=key_abc&limit=20&owner_project_access=any \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"organization.project.api_key\",\n            \"redacted_value\": \"sk-abc...def\",\n            \"name\": \"My API Key\",\n            \"created_at\": 1711471533,\n            \"last_used_at\": 1711471534,\n            \"id\": \"key_abc\",\n            \"owner_project_access\": \"active\",\n            \"owner\": {\n                \"type\": \"user\",\n                \"user\": {\n                    \"id\": \"user_abc\",\n                    \"name\": \"First Last\",\n                    \"email\": \"user@example.com\",\n                    \"role\": \"owner\",\n                    \"created_at\": 1711471533\n                }\n            }\n        }\n    ],\n    \"first_id\": \"key_abc\",\n    \"last_id\": \"key_xyz\",\n    \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/api_keys/{api_key_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves an API key in the project.",
+        "operationId": "retrieve-project-api-key",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "api_key_id",
+            "in": "path",
+            "description": "The ID of the API key.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project API key retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectApiKey"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project API key",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/api_keys/key_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.api_key\",\n    \"redacted_value\": \"sk-abc...def\",\n    \"name\": \"My API Key\",\n    \"created_at\": 1711471533,\n    \"last_used_at\": 1711471534,\n    \"id\": \"key_abc\",\n    \"owner_project_access\": \"active\",\n    \"owner\": {\n        \"type\": \"user\",\n        \"user\": {\n            \"id\": \"user_abc\",\n            \"name\": \"First Last\",\n            \"email\": \"user@example.com\",\n            \"role\": \"owner\",\n            \"created_at\": 1711471533\n        }\n    }\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes an API key from the project.\n\nReturns confirmation of the key deletion, or an error if the key belonged to\na service account.\n",
+        "operationId": "delete-project-api-key",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "api_key_id",
+            "in": "path",
+            "description": "The ID of the API key.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project API key deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectApiKeyDeleteResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response for various conditions.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete project API key",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/projects/proj_abc/api_keys/key_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.api_key.deleted\",\n    \"id\": \"key_abc\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/archive": {
+      "post": {
+        "summary": "Archives a project in the organization. Archived projects cannot be used or updated.",
+        "operationId": "archive-project",
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project archived successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Project"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Archive project",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/archive \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"proj_abc\",\n    \"object\": \"organization.project\",\n    \"name\": \"Project DEF\",\n    \"created_at\": 1711471533,\n    \"archived_at\": 1711471533,\n    \"status\": \"archived\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/certificates": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "List certificates for this project.",
+        "operationId": "listProjectCertificates",
+        "tags": [
+          "Certificates"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Certificates listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListProjectCertificatesResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project certificates",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/certificates \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\"\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"organization.project.certificate\",\n      \"id\": \"cert_abc\",\n      \"name\": \"My Example Certificate\",\n      \"active\": true,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n  ],\n  \"first_id\": \"cert_abc\",\n  \"last_id\": \"cert_abc\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/certificates/activate": {
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Activate certificates at the project level.\n\nYou can atomically and idempotently activate up to 10 certificates at a time.\n",
+        "operationId": "activateProjectCertificates",
+        "tags": [
+          "Certificates"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The certificate activation payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ToggleCertificatesRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Certificates activated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationProjectCertificateActivationResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Activate certificates for project",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/certificates/activate \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\" \\\n-d '{\n  \"certificate_ids\": [\"cert_abc\", \"cert_def\"]\n}'\n"
+            },
+            "response": "{\n  \"object\": \"organization.project.certificate.activation\",\n  \"data\": [\n    {\n      \"object\": \"organization.project.certificate\",\n      \"id\": \"cert_abc\",\n      \"name\": \"My Example Certificate\",\n      \"active\": true,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n    {\n      \"object\": \"organization.project.certificate\",\n      \"id\": \"cert_def\",\n      \"name\": \"My Example Certificate 2\",\n      \"active\": true,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n  ],\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/certificates/deactivate": {
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deactivate certificates at the project level. You can atomically and \nidempotently deactivate up to 10 certificates at a time.\n",
+        "operationId": "deactivateProjectCertificates",
+        "tags": [
+          "Certificates"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The certificate deactivation payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ToggleCertificatesRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Certificates deactivated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationProjectCertificateDeactivationResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Deactivate certificates for project",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/certificates/deactivate \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\" \\\n-d '{\n  \"certificate_ids\": [\"cert_abc\", \"cert_def\"]\n}'\n"
+            },
+            "response": "{\n  \"object\": \"organization.project.certificate.deactivation\",\n  \"data\": [\n    {\n      \"object\": \"organization.project.certificate\",\n      \"id\": \"cert_abc\",\n      \"name\": \"My Example Certificate\",\n      \"active\": false,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n    {\n      \"object\": \"organization.project.certificate\",\n      \"id\": \"cert_def\",\n      \"name\": \"My Example Certificate 2\",\n      \"active\": false,\n      \"created_at\": 1234567,\n      \"certificate_details\": {\n        \"valid_at\": 12345667,\n        \"expires_at\": 12345678\n      }\n    },\n  ],\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/data_retention": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves project data retention controls.",
+        "operationId": "retrieve-project-data-retention",
+        "tags": [
+          "Data retention"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project data retention controls retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectDataRetention"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project data retention",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/data_retention \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"project.data_retention\",\n    \"type\": \"organization_default\"\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates project data retention controls.",
+        "operationId": "update-project-data-retention",
+        "tags": [
+          "Data retention"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The desired project data retention setting.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateProjectDataRetentionBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project data retention controls updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectDataRetention"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update project data retention",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/data_retention \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"retention_type\": \"modified_abuse_monitoring\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"project.data_retention\",\n    \"type\": \"modified_abuse_monitoring\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/groups": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists the groups that have access to a project.",
+        "operationId": "list-project-groups",
+        "tags": [
+          "Project groups"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of project groups to return. Defaults to 20.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100,
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the ID of the last group from the previous response to fetch the next page.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned groups.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project groups listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectGroupListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project groups",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc123/groups?limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"project.group\",\n            \"project_id\": \"proj_abc123\",\n            \"group_id\": \"group_01J1F8ABCDXYZ\",\n            \"group_name\": \"Support Team\",\n            \"created_at\": 1711471533\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Grants a group access to a project.",
+        "operationId": "add-project-group",
+        "tags": [
+          "Project groups"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Identifies the group and role to assign to the project.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InviteProjectGroupBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Group granted access to the project successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectGroup"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Add project group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc123/groups \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"group_id\": \"group_01J1F8ABCDXYZ\",\n      \"role\": \"role_01J1F8PROJ\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"project.group\",\n    \"project_id\": \"proj_abc123\",\n    \"group_id\": \"group_01J1F8ABCDXYZ\",\n    \"group_name\": \"Support Team\",\n    \"created_at\": 1711471533\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/groups/{group_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a project's group.",
+        "operationId": "retrieve-project-group",
+        "tags": [
+          "Project groups"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to retrieve.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "group_type",
+            "in": "query",
+            "description": "The type of group to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "group",
+                "tenant_group"
+              ],
+              "default": "group"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project group retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectGroup"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc123/groups/group_01J1F8ABCDXYZ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"project.group\",\n    \"project_id\": \"proj_abc123\",\n    \"group_id\": \"group_01J1F8ABCDXYZ\",\n    \"group_name\": \"Support Team\",\n    \"group_type\": \"group\",\n    \"created_at\": 1711471533\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Revokes a group's access to a project.",
+        "operationId": "remove-project-group",
+        "tags": [
+          "Project groups"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to remove from the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Group removed from the project successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectGroupDeletedResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Remove project group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/projects/proj_abc123/groups/group_01J1F8ABCDXYZ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"project.group.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/hosted_tool_permissions": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Returns hosted tool permissions for a project.",
+        "operationId": "retrieve-project-hosted-tool-permissions",
+        "tags": [
+          "Hosted tools"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project hosted tool permissions retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectHostedToolPermissions"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project hosted tool permissions",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/hosted_tool_permissions \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"file_search\": {\n        \"enabled\": true\n    },\n    \"web_search\": {\n        \"enabled\": true\n    },\n    \"image_generation\": {\n        \"enabled\": true\n    },\n    \"mcp\": {\n        \"enabled\": true\n    },\n    \"code_interpreter\": {\n        \"enabled\": true\n    }\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates hosted tool permissions for a project.",
+        "operationId": "update-project-hosted-tool-permissions",
+        "tags": [
+          "Hosted tools"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The project hosted tool permissions update request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectHostedToolPermissionsUpdateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project hosted tool permissions updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectHostedToolPermissions"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify project hosted tool permissions",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/hosted_tool_permissions \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"file_search\": {\n          \"enabled\": true\n      },\n      \"image_generation\": {\n          \"enabled\": false\n      }\n  }'\n"
+            },
+            "response": "{\n    \"file_search\": {\n        \"enabled\": true\n    },\n    \"web_search\": {\n        \"enabled\": true\n    },\n    \"image_generation\": {\n        \"enabled\": false\n    },\n    \"mcp\": {\n        \"enabled\": true\n    },\n    \"code_interpreter\": {\n        \"enabled\": true\n    }\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/model_permissions": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Returns model permissions for a project.",
+        "operationId": "retrieve-project-model-permissions",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project model permissions retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectModelPermissions"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project model permissions",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/model_permissions \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"project.model_permissions\",\n    \"mode\": \"allow_list\",\n    \"model_ids\": [\n        \"gpt-6-astra\",\n        \"o3\"\n    ]\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates model permissions for a project.",
+        "operationId": "update-project-model-permissions",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The project model permissions update request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectModelPermissionsUpdateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project model permissions updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectModelPermissions"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify project model permissions",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/model_permissions \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"mode\": \"deny_list\",\n      \"model_ids\": [\n          \"o3\"\n      ]\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"project.model_permissions\",\n    \"mode\": \"deny_list\",\n    \"model_ids\": [\n        \"o3\"\n    ]\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes model permissions for a project.",
+        "operationId": "delete-project-model-permissions",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project model permissions deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectModelPermissionsDeleteResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete project model permissions",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/projects/proj_abc/model_permissions \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"project.model_permissions.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/rate_limits": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Returns the rate limits per model for a project.",
+        "operationId": "list-project-rate-limits",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. The default is 100.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 100
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, beginning with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project rate limits listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectRateLimitListResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project rate limits",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/rate_limits?after=rl_xxx&limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n          \"object\": \"project.rate_limit\",\n          \"id\": \"rl-ada\",\n          \"model\": \"ada\",\n          \"max_requests_per_1_minute\": 600,\n          \"max_tokens_per_1_minute\": 150000,\n          \"max_images_per_1_minute\": 10\n        }\n    ],\n    \"first_id\": \"rl-ada\",\n    \"last_id\": \"rl-ada\",\n    \"has_more\": false\n}\n",
+            "error_response": "{\n    \"code\": 404,\n    \"message\": \"The project {project_id} was not found\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/rate_limits/{rate_limit_id}": {
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates a project rate limit.",
+        "operationId": "update-project-rate-limits",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "rate_limit_id",
+            "in": "path",
+            "description": "The ID of the rate limit.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The project rate limit update request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectRateLimitUpdateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project rate limit updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectRateLimit"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response for various conditions.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify project rate limit",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/rate_limits/rl_xxx \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"max_requests_per_1_minute\": 500\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"project.rate_limit\",\n    \"id\": \"rl-ada\",\n    \"model\": \"ada\",\n    \"max_requests_per_1_minute\": 600,\n    \"max_tokens_per_1_minute\": 150000,\n    \"max_images_per_1_minute\": 10\n  }\n",
+            "error_response": "{\n    \"code\": 404,\n    \"message\": \"The project {project_id} was not found\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/service_accounts": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Returns a list of service accounts in the project.",
+        "operationId": "list-project-service-accounts",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project service accounts listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectServiceAccountListResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response when project is archived.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project service accounts",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/service_accounts?after=custom_id&limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"organization.project.service_account\",\n            \"id\": \"svc_acct_abc\",\n            \"name\": \"Service Account\",\n            \"role\": \"owner\",\n            \"created_at\": 1711471533\n        }\n    ],\n    \"first_id\": \"svc_acct_abc\",\n    \"last_id\": \"svc_acct_xyz\",\n    \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Creates a new service account in the project. By default, this also returns an unredacted API key for the service account.",
+        "operationId": "create-project-service-account",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The project service account create request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectServiceAccountCreateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project service account created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectServiceAccountCreateResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response when project is archived.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create project service account",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/service_accounts \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"name\": \"Production App\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.service_account\",\n    \"id\": \"svc_acct_abc\",\n    \"name\": \"Production App\",\n    \"role\": \"member\",\n    \"created_at\": 1711471533,\n    \"api_key\": {\n        \"object\": \"organization.project.service_account.api_key\",\n        \"value\": \"sk-abcdefghijklmnop123\",\n        \"name\": \"Secret Key\",\n        \"created_at\": 1711471533,\n        \"id\": \"key_abc\"\n    }\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/service_accounts/{service_account_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a service account in the project.",
+        "operationId": "retrieve-project-service-account",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "service_account_id",
+            "in": "path",
+            "description": "The ID of the service account.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project service account retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectServiceAccount"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project service account",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/service_accounts/svc_acct_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.service_account\",\n    \"id\": \"svc_acct_abc\",\n    \"name\": \"Service Account\",\n    \"role\": \"owner\",\n    \"created_at\": 1711471533\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates a service account in the project.",
+        "operationId": "update-project-service-account",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "service_account_id",
+            "in": "path",
+            "description": "The ID of the service account.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Fields to update on the service account.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateProjectServiceAccountBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project service account updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectServiceAccount"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update project service account",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/service_accounts/svc_acct_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"name\": \"Updated service account\",\n      \"role\": \"member\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.service_account\",\n    \"id\": \"svc_acct_abc\",\n    \"name\": \"Updated service account\",\n    \"role\": \"member\",\n    \"created_at\": 1711471533\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes a service account from the project.\n\nReturns confirmation of service account deletion, or an error if the project\nis archived (archived projects have no service accounts).\n",
+        "operationId": "delete-project-service-account",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "service_account_id",
+            "in": "path",
+            "description": "The ID of the service account.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project service account deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectServiceAccountDeleteResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete project service account",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/projects/proj_abc/service_accounts/svc_acct_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.service_account.deleted\",\n    \"id\": \"svc_acct_abc\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/spend_alerts": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists project spend alerts.",
+        "operationId": "list-project-spend-alerts",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of spend alerts to return. Defaults to 20.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned spend alerts.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the ID of the last spend alert from the previous response to fetch the next page.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the ID of the first spend alert from the previous response to fetch the previous page.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project spend alerts listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectSpendAlertListResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project spend alerts",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/spend_alerts?limit=20&order=asc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"alert_abc123\",\n            \"object\": \"project.spend_alert\",\n            \"threshold_amount\": 100000,\n            \"currency\": \"USD\",\n            \"interval\": \"month\",\n            \"notification_channel\": {\n                \"type\": \"email\",\n                \"recipients\": [\"finance@example.com\"],\n                \"subject_prefix\": \"OpenAI spend alert\"\n            }\n        }\n    ],\n    \"first_id\": \"alert_abc123\",\n    \"last_id\": \"alert_abc123\",\n    \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Creates a project spend alert.",
+        "operationId": "create-project-spend-alert",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Parameters for the project spend alert you want to create.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSpendAlertBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project spend alert created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectSpendAlert"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create project spend alert",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/spend_alerts \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"threshold_amount\": 100000,\n      \"currency\": \"USD\",\n      \"interval\": \"month\",\n      \"notification_channel\": {\n          \"type\": \"email\",\n          \"recipients\": [\"finance@example.com\"],\n          \"subject_prefix\": \"OpenAI spend alert\"\n      }\n  }'\n"
+            },
+            "response": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"project.spend_alert\",\n    \"threshold_amount\": 100000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"notification_channel\": {\n        \"type\": \"email\",\n        \"recipients\": [\"finance@example.com\"],\n        \"subject_prefix\": \"OpenAI spend alert\"\n    }\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/spend_alerts/{alert_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a project spend alert.",
+        "operationId": "retrieve-project-spend-alert",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "alert_id",
+            "in": "path",
+            "description": "The ID of the spend alert to retrieve.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project spend alert retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectSpendAlert"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project spend alert",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/spend_alerts/alert_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"project.spend_alert\",\n    \"threshold_amount\": 150000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"notification_channel\": {\n        \"type\": \"email\",\n        \"recipients\": [\"finance@example.com\"],\n        \"subject_prefix\": \"OpenAI spend alert\"\n    }\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates a project spend alert.",
+        "operationId": "update-project-spend-alert",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "alert_id",
+            "in": "path",
+            "description": "The ID of the spend alert to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Fields to update on the project spend alert.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSpendAlertBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project spend alert updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectSpendAlert"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update project spend alert",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/spend_alerts/alert_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"threshold_amount\": 150000,\n      \"currency\": \"USD\",\n      \"interval\": \"month\",\n      \"notification_channel\": {\n          \"type\": \"email\",\n          \"recipients\": [\"finance@example.com\"],\n          \"subject_prefix\": \"OpenAI spend alert\"\n      }\n  }'\n"
+            },
+            "response": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"project.spend_alert\",\n    \"threshold_amount\": 150000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"notification_channel\": {\n        \"type\": \"email\",\n        \"recipients\": [\"finance@example.com\"],\n        \"subject_prefix\": \"OpenAI spend alert\"\n    }\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes a project spend alert.",
+        "operationId": "delete-project-spend-alert",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "alert_id",
+            "in": "path",
+            "description": "The ID of the spend alert to delete.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project spend alert deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectSpendAlertDeletedResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete project spend alert",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/projects/proj_abc/spend_alerts/alert_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"project.spend_alert.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/users": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Returns a list of users in the project.",
+        "operationId": "list-project-users",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project users listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectUserListResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response when project is archived.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project users",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/users?after=user_abc&limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"organization.project.user\",\n            \"id\": \"user_abc\",\n            \"name\": \"First Last\",\n            \"email\": \"user@example.com\",\n            \"role\": \"owner\",\n            \"added_at\": 1711471533\n        }\n    ],\n    \"first_id\": \"user-abc\",\n    \"last_id\": \"user-xyz\",\n    \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Adds a user to the project. Users must already be members of the organization to be added to a project.",
+        "operationId": "create-project-user",
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "tags": [
+          "Projects"
+        ],
+        "requestBody": {
+          "description": "The project user create request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectUserCreateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "User added to project successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectUser"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response for various conditions.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create project user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/users \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"user_id\": \"user_abc\",\n      \"role\": \"member\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.user\",\n    \"id\": \"user_abc\",\n    \"email\": \"user@example.com\",\n    \"role\": \"owner\",\n    \"added_at\": 1711471533\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/projects/{project_id}/users/{user_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a user in the project.",
+        "operationId": "retrieve-project-user",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project user retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectUser"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/users/user_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.user\",\n    \"id\": \"user_abc\",\n    \"name\": \"First Last\",\n    \"email\": \"user@example.com\",\n    \"role\": \"owner\",\n    \"added_at\": 1711471533\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Modifies a user's role in the project.",
+        "operationId": "modify-project-user",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The project user update request payload.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ProjectUserUpdateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project user's role updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectUser"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response for various conditions.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify project user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/users/user_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role\": \"owner\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.user\",\n    \"id\": \"user_abc\",\n    \"name\": \"First Last\",\n    \"email\": \"user@example.com\",\n    \"role\": \"owner\",\n    \"added_at\": 1711471533\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes a user from the project.\n\nReturns confirmation of project user deletion, or an error if the project is\narchived (archived projects have no users).\n",
+        "operationId": "delete-project-user",
+        "tags": [
+          "Projects"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project user deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectUserDeleteResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Error response for various conditions.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete project user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/projects/proj_abc/users/user_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.user.deleted\",\n    \"id\": \"user_abc\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/roles": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists the roles configured for the organization.",
+        "operationId": "list-roles",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of roles to return. Defaults to 1000.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1000,
+              "default": 1000
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the value from the previous response's `next` field to continue listing roles.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned roles.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Roles listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PublicRoleListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List organization roles",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/roles?limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"role\",\n            \"id\": \"role_01J1F8ROLE01\",\n            \"name\": \"API Group Manager\",\n            \"description\": \"Allows managing organization groups\",\n            \"permissions\": [\n                \"api.groups.read\",\n                \"api.groups.write\"\n            ],\n            \"resource_type\": \"api.organization\",\n            \"predefined_role\": false\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Creates a custom role for the organization.",
+        "operationId": "create-role",
+        "tags": [
+          "Roles"
+        ],
+        "requestBody": {
+          "description": "Parameters for the role you want to create.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicCreateOrganizationRoleBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Role created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Role"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create organization role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role_name\": \"API Group Manager\",\n      \"permissions\": [\n          \"api.groups.read\",\n          \"api.groups.write\"\n      ],\n      \"description\": \"Allows managing organization groups\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"role\",\n    \"id\": \"role_01J1F8ROLE01\",\n    \"name\": \"API Group Manager\",\n    \"description\": \"Allows managing organization groups\",\n    \"permissions\": [\n        \"api.groups.read\",\n        \"api.groups.write\"\n    ],\n    \"resource_type\": \"api.organization\",\n    \"predefined_role\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/roles/{role_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves an organization role.",
+        "operationId": "retrieve-role",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the role to retrieve.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Role retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Role"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve organization role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/roles/role_01J1F8ROLE01 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"role\",\n    \"id\": \"role_01J1F8ROLE01\",\n    \"name\": \"API Group Manager\",\n    \"description\": \"Allows managing organization groups\",\n    \"permissions\": [\n        \"api.groups.read\",\n        \"api.groups.write\"\n    ],\n    \"resource_type\": \"api.organization\",\n    \"predefined_role\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates an existing organization role.",
+        "operationId": "update-role",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the role to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Fields to update on the role.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicUpdateOrganizationRoleBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Role updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Role"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update organization role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/roles/role_01J1F8ROLE01 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role_name\": \"API Group Manager\",\n      \"permissions\": [\n          \"api.groups.read\",\n          \"api.groups.write\"\n      ],\n      \"description\": \"Allows managing organization groups\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"role\",\n    \"id\": \"role_01J1F8ROLE01\",\n    \"name\": \"API Group Manager\",\n    \"description\": \"Allows managing organization groups\",\n    \"permissions\": [\n        \"api.groups.read\",\n        \"api.groups.write\"\n    ],\n    \"resource_type\": \"api.organization\",\n    \"predefined_role\": false\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes a custom role from the organization.",
+        "operationId": "delete-role",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the role to delete.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Role deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RoleDeletedResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete organization role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/roles/role_01J1F8ROLE01 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"role.deleted\",\n    \"id\": \"role_01J1F8ROLE01\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/spend_alerts": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists organization spend alerts.",
+        "operationId": "list-organization-spend-alerts",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of spend alerts to return. Defaults to 20.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned spend alerts.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the ID of the last spend alert from the previous response to fetch the next page.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the ID of the first spend alert from the previous response to fetch the previous page.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Organization spend alerts listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationSpendAlertListResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List organization spend alerts",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/spend_alerts?limit=20&order=asc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"alert_abc123\",\n            \"object\": \"organization.spend_alert\",\n            \"threshold_amount\": 100000,\n            \"currency\": \"USD\",\n            \"interval\": \"month\",\n            \"notification_channel\": {\n                \"type\": \"email\",\n                \"recipients\": [\"finance@example.com\"],\n                \"subject_prefix\": \"OpenAI spend alert\"\n            }\n        }\n    ],\n    \"first_id\": \"alert_abc123\",\n    \"last_id\": \"alert_abc123\",\n    \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Creates an organization spend alert.",
+        "operationId": "create-organization-spend-alert",
+        "tags": [
+          "Spend alerts"
+        ],
+        "requestBody": {
+          "description": "Parameters for the organization spend alert you want to create.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSpendAlertBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Organization spend alert created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationSpendAlert"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create organization spend alert",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/spend_alerts \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"threshold_amount\": 100000,\n      \"currency\": \"USD\",\n      \"interval\": \"month\",\n      \"notification_channel\": {\n          \"type\": \"email\",\n          \"recipients\": [\"finance@example.com\"],\n          \"subject_prefix\": \"OpenAI spend alert\"\n      }\n  }'\n"
+            },
+            "response": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"organization.spend_alert\",\n    \"threshold_amount\": 100000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"notification_channel\": {\n        \"type\": \"email\",\n        \"recipients\": [\"finance@example.com\"],\n        \"subject_prefix\": \"OpenAI spend alert\"\n    }\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/spend_alerts/{alert_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves an organization spend alert.",
+        "operationId": "retrieve-organization-spend-alert",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "alert_id",
+            "in": "path",
+            "description": "The ID of the spend alert to retrieve.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Organization spend alert retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationSpendAlert"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve organization spend alert",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/spend_alerts/alert_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"organization.spend_alert\",\n    \"threshold_amount\": 150000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"notification_channel\": {\n        \"type\": \"email\",\n        \"recipients\": [\"finance@example.com\"],\n        \"subject_prefix\": \"OpenAI spend alert\"\n    }\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates an organization spend alert.",
+        "operationId": "update-organization-spend-alert",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "alert_id",
+            "in": "path",
+            "description": "The ID of the spend alert to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Fields to update on the organization spend alert.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSpendAlertBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Organization spend alert updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationSpendAlert"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update organization spend alert",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/spend_alerts/alert_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"threshold_amount\": 150000,\n      \"currency\": \"USD\",\n      \"interval\": \"month\",\n      \"notification_channel\": {\n          \"type\": \"email\",\n          \"recipients\": [\"finance@example.com\"],\n          \"subject_prefix\": \"OpenAI spend alert\"\n      }\n  }'\n"
+            },
+            "response": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"organization.spend_alert\",\n    \"threshold_amount\": 150000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"notification_channel\": {\n        \"type\": \"email\",\n        \"recipients\": [\"finance@example.com\"],\n        \"subject_prefix\": \"OpenAI spend alert\"\n    }\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes an organization spend alert.",
+        "operationId": "delete-organization-spend-alert",
+        "tags": [
+          "Spend alerts"
+        ],
+        "parameters": [
+          {
+            "name": "alert_id",
+            "in": "path",
+            "description": "The ID of the spend alert to delete.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Organization spend alert deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationSpendAlertDeletedResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete organization spend alert",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/spend_alerts/alert_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"organization.spend_alert.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/audio_speeches": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get audio speeches usage details for the organization.",
+        "operationId": "usage-audio-speeches",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "user_ids",
+            "in": "query",
+            "description": "Return only usage for these users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only usage for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "models",
+            "in": "query",
+            "description": "Return only usage for these models.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`, `user_id`, `api_key_id`, `model` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "user_id",
+                  "api_key_id",
+                  "model"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Audio speeches",
+          "group": "usage-audio-speeches",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/audio_speeches?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.audio_speeches.result\",\n                    \"characters\": 45,\n                    \"num_model_requests\": 1,\n                    \"project_id\": null,\n                    \"user_id\": null,\n                    \"api_key_id\": null,\n                    \"model\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/audio_transcriptions": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get audio transcriptions usage details for the organization.",
+        "operationId": "usage-audio-transcriptions",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "user_ids",
+            "in": "query",
+            "description": "Return only usage for these users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only usage for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "models",
+            "in": "query",
+            "description": "Return only usage for these models.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`, `user_id`, `api_key_id`, `model` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "user_id",
+                  "api_key_id",
+                  "model"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Audio transcriptions",
+          "group": "usage-audio-transcriptions",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/audio_transcriptions?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.audio_transcriptions.result\",\n                    \"seconds\": 20,\n                    \"num_model_requests\": 1,\n                    \"project_id\": null,\n                    \"user_id\": null,\n                    \"api_key_id\": null,\n                    \"model\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/code_interpreter_sessions": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get code interpreter sessions usage details for the organization.",
+        "operationId": "usage-code-interpreter-sessions",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Code interpreter sessions",
+          "group": "usage-code-interpreter-sessions",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/code_interpreter_sessions?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.code_interpreter_sessions.result\",\n                    \"num_sessions\": 1,\n                    \"project_id\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/completions": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get completions usage details for the organization.",
+        "operationId": "usage-completions",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "user_ids",
+            "in": "query",
+            "description": "Return only usage for these users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only usage for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "models",
+            "in": "query",
+            "description": "Return only usage for these models.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "batch",
+            "in": "query",
+            "description": "If `true`, return batch jobs only. If `false`, return non-batch jobs only. By default, return both.\n",
+            "required": false,
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`, `user_id`, `api_key_id`, `model`, `batch`, `service_tier` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "user_id",
+                  "api_key_id",
+                  "model",
+                  "batch",
+                  "service_tier"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Completions",
+          "group": "usage-completions",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/completions?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.completions.result\",\n                    \"input_tokens\": 1000,\n                    \"input_cached_tokens\": 400,\n                    \"input_cache_write_tokens\": 100,\n                    \"input_uncached_tokens\": 500,\n                    \"output_tokens\": 500,\n                    \"input_text_tokens\": 400,\n                    \"output_text_tokens\": 400,\n                    \"input_cached_text_tokens\": 300,\n                    \"input_audio_tokens\": 50,\n                    \"input_cached_audio_tokens\": 50,\n                    \"output_audio_tokens\": 50,\n                    \"input_image_tokens\": 50,\n                    \"input_cached_image_tokens\": 50,\n                    \"output_image_tokens\": 50,\n                    \"num_model_requests\": 5,\n                    \"project_id\": null,\n                    \"user_id\": null,\n                    \"api_key_id\": null,\n                    \"model\": null,\n                    \"batch\": null,\n                    \"service_tier\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": true,\n    \"next_page\": \"page_AAAAAGdGxdEiJdKOAAAAAGcqsYA=\"\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/embeddings": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get embeddings usage details for the organization.",
+        "operationId": "usage-embeddings",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "user_ids",
+            "in": "query",
+            "description": "Return only usage for these users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only usage for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "models",
+            "in": "query",
+            "description": "Return only usage for these models.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`, `user_id`, `api_key_id`, `model` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "user_id",
+                  "api_key_id",
+                  "model"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Embeddings",
+          "group": "usage-embeddings",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/embeddings?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.embeddings.result\",\n                    \"input_tokens\": 16,\n                    \"num_model_requests\": 2,\n                    \"project_id\": null,\n                    \"user_id\": null,\n                    \"api_key_id\": null,\n                    \"model\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/file_search_calls": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get file search calls usage details for the organization.",
+        "operationId": "usage-file-search-calls",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "user_ids",
+            "in": "query",
+            "description": "Return only usage for these users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only usage for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "vector_store_ids",
+            "in": "query",
+            "description": "Return only usage for these vector stores.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`, `user_id`, `api_key_id`, `vector_store_id` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "user_id",
+                  "api_key_id",
+                  "vector_store_id"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "File search calls",
+          "group": "usage-file-search-calls",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/file_search_calls?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.file_searches.result\",\n                    \"num_requests\": 2,\n                    \"project_id\": null,\n                    \"user_id\": null,\n                    \"api_key_id\": null,\n                    \"vector_store_id\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/images": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get images usage details for the organization.",
+        "operationId": "usage-images",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "sources",
+            "in": "query",
+            "description": "Return only usages for these sources. Possible values are `image.generation`, `image.edit`, `image.variation` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "image.generation",
+                  "image.edit",
+                  "image.variation"
+                ]
+              }
+            }
+          },
+          {
+            "name": "sizes",
+            "in": "query",
+            "description": "Return only usages for these image sizes. Possible values are `256x256`, `512x512`, `1024x1024`, `1792x1792`, `1024x1792` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "256x256",
+                  "512x512",
+                  "1024x1024",
+                  "1792x1792",
+                  "1024x1792"
+                ]
+              }
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "user_ids",
+            "in": "query",
+            "description": "Return only usage for these users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only usage for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "models",
+            "in": "query",
+            "description": "Return only usage for these models.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`, `user_id`, `api_key_id`, `model`, `size`, `source` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "user_id",
+                  "api_key_id",
+                  "model",
+                  "size",
+                  "source"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Images",
+          "group": "usage-images",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/images?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.images.result\",\n                    \"images\": 2,\n                    \"num_model_requests\": 2,\n                    \"size\": null,\n                    \"source\": null,\n                    \"project_id\": null,\n                    \"user_id\": null,\n                    \"api_key_id\": null,\n                    \"model\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/moderations": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get moderations usage details for the organization.",
+        "operationId": "usage-moderations",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "user_ids",
+            "in": "query",
+            "description": "Return only usage for these users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only usage for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "models",
+            "in": "query",
+            "description": "Return only usage for these models.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`, `user_id`, `api_key_id`, `model` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "user_id",
+                  "api_key_id",
+                  "model"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Moderations",
+          "group": "usage-moderations",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/moderations?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.moderations.result\",\n                    \"input_tokens\": 16,\n                    \"num_model_requests\": 2,\n                    \"project_id\": null,\n                    \"user_id\": null,\n                    \"api_key_id\": null,\n                    \"model\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/vector_stores": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get vector stores usage details for the organization.",
+        "operationId": "usage-vector-stores",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Vector stores",
+          "group": "usage-vector-stores",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/vector_stores?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.vector_stores.result\",\n                    \"usage_bytes\": 1024,\n                    \"project_id\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/usage/web_search_calls": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Get web search calls usage details for the organization.",
+        "operationId": "usage-web-search-calls",
+        "tags": [
+          "Usage"
+        ],
+        "parameters": [
+          {
+            "name": "start_time",
+            "in": "query",
+            "description": "Start time (Unix seconds) of the query time range, inclusive.",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "end_time",
+            "in": "query",
+            "description": "End time (Unix seconds) of the query time range, exclusive.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "bucket_width",
+            "in": "query",
+            "description": "Width of each time bucket in response. Currently `1m`, `1h` and `1d` are supported, default to `1d`.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "1m",
+                "1h",
+                "1d"
+              ],
+              "default": "1d"
+            }
+          },
+          {
+            "name": "project_ids",
+            "in": "query",
+            "description": "Return only usage for these projects.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "user_ids",
+            "in": "query",
+            "description": "Return only usage for these users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "api_key_ids",
+            "in": "query",
+            "description": "Return only usage for these API keys.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "models",
+            "in": "query",
+            "description": "Return only usage for these models.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "context_levels",
+            "in": "query",
+            "description": "Return only web search usage for these context levels.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "low",
+                  "medium",
+                  "high"
+                ]
+              }
+            }
+          },
+          {
+            "name": "group_by",
+            "in": "query",
+            "description": "Group the usage data by the specified fields. Support fields include `project_id`, `user_id`, `api_key_id`, `model`, `context_level` or any combination of them.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "project_id",
+                  "user_id",
+                  "api_key_id",
+                  "model",
+                  "context_level"
+                ]
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Specifies the number of buckets to return.\n- `bucket_width=1d`: default: 7, max: 31\n- `bucket_width=1h`: default: 24, max: 168\n- `bucket_width=1m`: default: 60, max: 1440\n",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "A cursor for use in pagination. Corresponding to the `next_page` field from the previous response.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Usage data retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UsageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Web search calls",
+          "group": "usage-web-search-calls",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/organization/usage/web_search_calls?start_time=1730419200&limit=1\" \\\n-H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n-H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"page\",\n    \"data\": [\n        {\n            \"object\": \"bucket\",\n            \"start_time\": 1730419200,\n            \"end_time\": 1730505600,\n            \"results\": [\n                {\n                    \"object\": \"organization.usage.web_searches.result\",\n                    \"num_model_requests\": 2,\n                    \"num_requests\": 2,\n                    \"project_id\": null,\n                    \"user_id\": null,\n                    \"api_key_id\": null,\n                    \"model\": null,\n                    \"context_level\": null\n                }\n            ]\n        }\n    ],\n    \"has_more\": false,\n    \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/users": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists all of the users in the organization.",
+        "operationId": "list-users",
+        "tags": [
+          "Users"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "emails",
+            "in": "query",
+            "description": "Filter by the email address of users.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Users listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserListResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List users",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/users?after=user_abc&limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"organization.user\",\n            \"id\": \"user_abc\",\n            \"name\": \"First Last\",\n            \"email\": \"user@example.com\",\n            \"role\": \"owner\",\n            \"added_at\": 1711471533\n        }\n    ],\n    \"first_id\": \"user-abc\",\n    \"last_id\": \"user-xyz\",\n    \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/users/{user_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a user by their identifier.",
+        "operationId": "retrieve-user",
+        "tags": [
+          "Users"
+        ],
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "User retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/User"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/users/user_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.user\",\n    \"id\": \"user_abc\",\n    \"name\": \"First Last\",\n    \"email\": \"user@example.com\",\n    \"role\": \"owner\",\n    \"added_at\": 1711471533\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Modifies a user's role in the organization.",
+        "operationId": "modify-user",
+        "tags": [
+          "Users"
+        ],
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The new user role to modify. This must be one of `owner` or `member`.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserRoleUpdateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "User role updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/User"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/users/user_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role\": \"owner\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"organization.user\",\n    \"id\": \"user_abc\",\n    \"name\": \"First Last\",\n    \"email\": \"user@example.com\",\n    \"role\": \"owner\",\n    \"added_at\": 1711471533\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes a user from the organization.",
+        "operationId": "delete-user",
+        "tags": [
+          "Users"
+        ],
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "User deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserDeleteResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/users/user_abc \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.user.deleted\",\n    \"id\": \"user_abc\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/users/{user_id}/roles": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists the organization roles assigned to a user within the organization.",
+        "operationId": "list-user-role-assignments",
+        "tags": [
+          "User organization role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of organization role assignments to return.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1000
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the value from the previous response's `next` field to continue listing organization roles.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned organization roles.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "User organization role assignments listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RoleListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List user organization role assignments",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/users/user_abc123/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"role_01J1F8ROLE01\",\n            \"name\": \"API Group Manager\",\n            \"permissions\": [\n                \"api.groups.read\",\n                \"api.groups.write\"\n            ],\n            \"resource_type\": \"api.organization\",\n            \"predefined_role\": false,\n            \"description\": \"Allows managing organization groups\",\n            \"created_at\": 1711471533,\n            \"updated_at\": 1711472599,\n            \"created_by\": \"user_abc123\",\n            \"created_by_user_obj\": {\n                \"id\": \"user_abc123\",\n                \"name\": \"Ada Lovelace\",\n                \"email\": \"ada@example.com\"\n            },\n            \"metadata\": {}\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Assigns an organization role to a user within the organization.",
+        "operationId": "assign-user-role",
+        "tags": [
+          "User organization role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user that should receive the organization role.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Identifies the organization role to assign to the user.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicAssignOrganizationGroupRoleBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Organization role assigned to the user successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserRoleAssignment"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Assign organization role to user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/users/user_abc123/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role_id\": \"role_01J1F8ROLE01\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"user.role\",\n    \"user\": {\n        \"object\": \"organization.user\",\n        \"id\": \"user_abc123\",\n        \"name\": \"Ada Lovelace\",\n        \"email\": \"ada@example.com\",\n        \"role\": \"owner\",\n        \"added_at\": 1711470000\n    },\n    \"role\": {\n        \"object\": \"role\",\n        \"id\": \"role_01J1F8ROLE01\",\n        \"name\": \"API Group Manager\",\n        \"description\": \"Allows managing organization groups\",\n        \"permissions\": [\n            \"api.groups.read\",\n            \"api.groups.write\"\n        ],\n        \"resource_type\": \"api.organization\",\n        \"predefined_role\": false\n    }\n}\n"
+          }
+        }
+      }
+    },
+    "/organization/users/{user_id}/roles/{role_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves an organization role assigned to a user.",
+        "operationId": "retrieve-user-role",
+        "tags": [
+          "User organization role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the organization role to retrieve for the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Organization role retrieved for the user successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AssignedRoleDetails"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve user organization role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/users/user_abc123/roles/role_01J1F8ROLE01 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"role_01J1F8ROLE01\",\n    \"name\": \"API Group Manager\",\n    \"permissions\": [\n        \"api.groups.read\",\n        \"api.groups.write\"\n    ],\n    \"resource_type\": \"api.organization\",\n    \"predefined_role\": false,\n    \"description\": \"Allows managing organization groups\",\n    \"created_at\": 1711471533,\n    \"updated_at\": 1711472599,\n    \"created_by\": \"user_abc123\",\n    \"created_by_user_obj\": null,\n    \"metadata\": {},\n    \"assignment_sources\": null\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Unassigns an organization role from a user within the organization.",
+        "operationId": "unassign-user-role",
+        "tags": [
+          "User organization role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user to modify.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the organization role to remove from the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Organization role unassigned from the user successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedRoleAssignmentResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Unassign organization role from user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/users/user_abc123/roles/role_01J1F8ROLE01 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"user.role.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/projects/{project_id}/groups/{group_id}/roles": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists the project roles assigned to a group within a project.",
+        "operationId": "list-project-group-role-assignments",
+        "tags": [
+          "Project group role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of project role assignments to return.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1000
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the value from the previous response's `next` field to continue listing project roles.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned project roles.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project group role assignments listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RoleListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project group role assignments",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/projects/proj_abc123/groups/group_01J1F8ABCDXYZ/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"role_01J1F8PROJ\",\n            \"name\": \"API Project Key Manager\",\n            \"permissions\": [\n                \"api.organization.projects.api_keys.read\",\n                \"api.organization.projects.api_keys.write\"\n            ],\n            \"resource_type\": \"api.project\",\n            \"predefined_role\": false,\n            \"description\": \"Allows managing API keys for the project\",\n            \"created_at\": 1711471533,\n            \"updated_at\": 1711472599,\n            \"created_by\": \"user_abc123\",\n            \"created_by_user_obj\": {\n                \"id\": \"user_abc123\",\n                \"name\": \"Ada Lovelace\",\n                \"email\": \"ada@example.com\"\n            },\n            \"metadata\": {}\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Assigns a project role to a group within a project.",
+        "operationId": "assign-project-group-role",
+        "tags": [
+          "Project group role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group that should receive the project role.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Identifies the project role to assign to the group.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicAssignOrganizationGroupRoleBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project role assigned to the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GroupRoleAssignment"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Assign project role to group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/projects/proj_abc123/groups/group_01J1F8ABCDXYZ/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role_id\": \"role_01J1F8PROJ\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"group.role\",\n    \"group\": {\n        \"object\": \"group\",\n        \"id\": \"group_01J1F8ABCDXYZ\",\n        \"name\": \"Support Team\",\n        \"created_at\": 1711471533,\n        \"scim_managed\": false\n    },\n    \"role\": {\n        \"object\": \"role\",\n        \"id\": \"role_01J1F8PROJ\",\n        \"name\": \"API Project Key Manager\",\n        \"description\": \"Allows managing API keys for the project\",\n        \"permissions\": [\n            \"api.organization.projects.api_keys.read\",\n            \"api.organization.projects.api_keys.write\"\n        ],\n        \"resource_type\": \"api.project\",\n        \"predefined_role\": false\n    }\n}\n"
+          }
+        }
+      }
+    },
+    "/projects/{project_id}/groups/{group_id}/roles/{role_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a project role assigned to a group.",
+        "operationId": "retrieve-project-group-role",
+        "tags": [
+          "Project group role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the project role to retrieve for the group.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project role retrieved for the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AssignedRoleDetails"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project group role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/projects/proj_abc123/groups/group_01J1F8ABCDXYZ/roles/role_01J1F8PROJ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"role_01J1F8PROJ\",\n    \"name\": \"API Project Key Manager\",\n    \"permissions\": [\n        \"api.organization.projects.api_keys.read\",\n        \"api.organization.projects.api_keys.write\"\n    ],\n    \"resource_type\": \"api.project\",\n    \"predefined_role\": false,\n    \"description\": \"Allows managing API keys for the project\",\n    \"created_at\": 1711471533,\n    \"updated_at\": 1711472599,\n    \"created_by\": \"user_abc123\",\n    \"created_by_user_obj\": null,\n    \"metadata\": {},\n    \"assignment_sources\": null\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Unassigns a project role from a group within a project.",
+        "operationId": "unassign-project-group-role",
+        "tags": [
+          "Project group role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to modify.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "group_id",
+            "in": "path",
+            "description": "The ID of the group whose project role assignment should be removed.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the project role to remove from the group.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project role unassigned from the group successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedRoleAssignmentResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Unassign project role from group",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/projects/proj_abc123/groups/group_01J1F8ABCDXYZ/roles/role_01J1F8PROJ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"group.role.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/projects/{project_id}/roles": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists the roles configured for a project.",
+        "operationId": "list-project-roles",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of roles to return. Defaults to 1000.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1000,
+              "default": 1000
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the value from the previous response's `next` field to continue listing roles.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned roles.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "default": "asc"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project roles listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PublicRoleListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project roles",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/projects/proj_abc123/roles?limit=20 \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"role\",\n            \"id\": \"role_01J1F8PROJ\",\n            \"name\": \"API Project Key Manager\",\n            \"description\": \"Allows managing API keys for the project\",\n            \"permissions\": [\n                \"api.organization.projects.api_keys.read\",\n                \"api.organization.projects.api_keys.write\"\n            ],\n            \"resource_type\": \"api.project\",\n            \"predefined_role\": false\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Creates a custom role for a project.",
+        "operationId": "create-project-role",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Parameters for the project role you want to create.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicCreateOrganizationRoleBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project role created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Role"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create project role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/projects/proj_abc123/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role_name\": \"API Project Key Manager\",\n      \"permissions\": [\n          \"api.organization.projects.api_keys.read\",\n          \"api.organization.projects.api_keys.write\"\n      ],\n      \"description\": \"Allows managing API keys for the project\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"role\",\n    \"id\": \"role_01J1F8PROJ\",\n    \"name\": \"API Project Key Manager\",\n    \"description\": \"Allows managing API keys for the project\",\n    \"permissions\": [\n        \"api.organization.projects.api_keys.read\",\n        \"api.organization.projects.api_keys.write\"\n    ],\n    \"resource_type\": \"api.project\",\n    \"predefined_role\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/projects/{project_id}/roles/{role_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a project role.",
+        "operationId": "retrieve-project-role",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the role to retrieve.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project role retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Role"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/projects/proj_abc123/roles/role_01J1F8PROJ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"role\",\n    \"id\": \"role_01J1F8PROJ\",\n    \"name\": \"API Project Key Manager\",\n    \"description\": \"Allows managing API keys for the project\",\n    \"permissions\": [\n        \"api.organization.projects.api_keys.read\",\n        \"api.organization.projects.api_keys.write\"\n    ],\n    \"resource_type\": \"api.project\",\n    \"predefined_role\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Updates an existing project role.",
+        "operationId": "update-project-role",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the role to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Fields to update on the project role.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicUpdateOrganizationRoleBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project role updated successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Role"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update project role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/projects/proj_abc123/roles/role_01J1F8PROJ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role_name\": \"API Project Key Manager\",\n      \"permissions\": [\n          \"api.organization.projects.api_keys.read\",\n          \"api.organization.projects.api_keys.write\"\n      ],\n      \"description\": \"Allows managing API keys for the project\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"role\",\n    \"id\": \"role_01J1F8PROJ\",\n    \"name\": \"API Project Key Manager\",\n    \"description\": \"Allows managing API keys for the project\",\n    \"permissions\": [\n        \"api.organization.projects.api_keys.read\",\n        \"api.organization.projects.api_keys.write\"\n    ],\n    \"resource_type\": \"api.project\",\n    \"predefined_role\": false\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Deletes a custom role from a project.",
+        "operationId": "delete-project-role",
+        "tags": [
+          "Roles"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the role to delete.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project role deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RoleDeletedResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete project role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/projects/proj_abc123/roles/role_01J1F8PROJ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"role.deleted\",\n    \"id\": \"role_01J1F8PROJ\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/projects/{project_id}/users/{user_id}/roles": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Lists the project roles assigned to a user within a project.",
+        "operationId": "list-project-user-role-assignments",
+        "tags": [
+          "Project user role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of project role assignments to return.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1000
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Cursor for pagination. Provide the value from the previous response's `next` field to continue listing project roles.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for the returned project roles.",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project user role assignments listed successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RoleListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List project user role assignments",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/projects/proj_abc123/users/user_abc123/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"role_01J1F8PROJ\",\n            \"name\": \"API Project Key Manager\",\n            \"permissions\": [\n                \"api.organization.projects.api_keys.read\",\n                \"api.organization.projects.api_keys.write\"\n            ],\n            \"resource_type\": \"api.project\",\n            \"predefined_role\": false,\n            \"description\": \"Allows managing API keys for the project\",\n            \"created_at\": 1711471533,\n            \"updated_at\": 1711472599,\n            \"created_by\": \"user_abc123\",\n            \"created_by_user_obj\": {\n                \"id\": \"user_abc123\",\n                \"name\": \"Ada Lovelace\",\n                \"email\": \"ada@example.com\"\n            },\n            \"metadata\": {}\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+          }
+        }
+      },
+      "post": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Assigns a project role to a user within a project.",
+        "operationId": "assign-project-user-role",
+        "tags": [
+          "Project user role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to update.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user that should receive the project role.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Identifies the project role to assign to the user.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PublicAssignOrganizationGroupRoleBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Project role assigned to the user successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserRoleAssignment"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Assign project role to user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/projects/proj_abc123/users/user_abc123/roles \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"role_id\": \"role_01J1F8PROJ\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"user.role\",\n    \"user\": {\n        \"object\": \"organization.user\",\n        \"id\": \"user_abc123\",\n        \"name\": \"Ada Lovelace\",\n        \"email\": \"ada@example.com\",\n        \"role\": \"owner\",\n        \"added_at\": 1711470000\n    },\n    \"role\": {\n        \"object\": \"role\",\n        \"id\": \"role_01J1F8PROJ\",\n        \"name\": \"API Project Key Manager\",\n        \"description\": \"Allows managing API keys for the project\",\n        \"permissions\": [\n            \"api.organization.projects.api_keys.read\",\n            \"api.organization.projects.api_keys.write\"\n        ],\n        \"resource_type\": \"api.project\",\n        \"predefined_role\": false\n    }\n}\n"
+          }
+        }
+      }
+    },
+    "/projects/{project_id}/users/{user_id}/roles/{role_id}": {
+      "get": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Retrieves a project role assigned to a user.",
+        "operationId": "retrieve-project-user-role",
+        "tags": [
+          "Project user role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user to inspect.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the project role to retrieve for the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project role retrieved for the user successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AssignedRoleDetails"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project user role",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/projects/proj_abc123/users/user_abc123/roles/role_01J1F8PROJ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"id\": \"role_01J1F8PROJ\",\n    \"name\": \"API Project Key Manager\",\n    \"permissions\": [\n        \"api.organization.projects.api_keys.read\",\n        \"api.organization.projects.api_keys.write\"\n    ],\n    \"resource_type\": \"api.project\",\n    \"predefined_role\": false,\n    \"description\": \"Allows managing API keys for the project\",\n    \"created_at\": 1711471533,\n    \"updated_at\": 1711472599,\n    \"created_by\": \"user_abc123\",\n    \"created_by_user_obj\": null,\n    \"metadata\": {},\n    \"assignment_sources\": null\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ],
+        "summary": "Unassigns a project role from a user within a project.",
+        "operationId": "unassign-project-user-role",
+        "tags": [
+          "Project user role assignments"
+        ],
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project to modify.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "user_id",
+            "in": "path",
+            "description": "The ID of the user whose project role assignment should be removed.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "role_id",
+            "in": "path",
+            "description": "The ID of the project role to remove from the user.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Project role unassigned from the user successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedRoleAssignmentResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Unassign project role from user",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/projects/proj_abc123/users/user_abc123/roles/role_01J1F8PROJ \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"user.role.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/realtime/calls": {
+      "post": {
+        "summary": "Create a new Realtime API call over WebRTC and receive the SDP answer needed\nto complete the peer connection.",
+        "operationId": "create-realtime-call",
+        "tags": [
+          "Realtime"
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/RealtimeCallCreateRequest"
+              },
+              "encoding": {
+                "sdp": {
+                  "contentType": "application/sdp"
+                },
+                "session": {
+                  "contentType": "application/json"
+                }
+              }
+            },
+            "application/sdp": {
+              "schema": {
+                "type": "string",
+                "description": "WebRTC SDP offer. Use this variant when you have previously created an\nephemeral **session token** and are authenticating the request with it.\nRealtime session parameters will be retrieved from the session token."
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Realtime call created successfully.",
+            "headers": {
+              "Location": {
+                "description": "Relative URL containing the call ID for subsequent control requests.",
+                "schema": {
+                  "type": "string"
+                }
+              }
+            },
+            "content": {
+              "application/sdp": {
+                "schema": {
+                  "type": "string",
+                  "description": "SDP answer produced by OpenAI for the peer connection."
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create call",
+          "group": "realtime",
+          "returns": "Returns `201 Created` with the SDP answer in the response body. The\n`Location` response header includes the call ID for follow-up requests,\ne.g., establishing a monitoring WebSocket or hanging up the call.",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/calls \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F \"sdp=<offer.sdp;type=application/sdp\" \\\n  -F 'session={\"type\":\"realtime\",\"model\":\"gpt-realtime\"};type=application/json'"
+            },
+            "response": "v=0\no=- 4227147428 1719357865 IN IP4 127.0.0.1\ns=-\nc=IN IP4 0.0.0.0\nt=0 0\na=group:BUNDLE 0 1\na=msid-semantic:WMS *\na=fingerprint:sha-256 CA:92:52:51:B4:91:3B:34:DD:9C:0B:FB:76:19:7E:3B:F1:21:0F:32:2C:38:01:72:5D:3F:78:C7:5F:8B:C7:36\nm=audio 9 UDP/TLS/RTP/SAVPF 111 0 8\na=mid:0\na=ice-ufrag:kZ2qkHXX/u11\na=ice-pwd:uoD16Di5OGx3VbqgA3ymjEQV2kwiOjw6\na=setup:active\na=rtcp-mux\na=rtpmap:111 opus/48000/2\na=candidate:993865896 1 udp 2130706431 4.155.146.196 3478 typ host ufrag kZ2qkHXX/u11\na=candidate:1432411780 1 tcp 1671430143 4.155.146.196 443 typ host tcptype passive ufrag kZ2qkHXX/u11\nm=application 9 UDP/DTLS/SCTP webrtc-datachannel\na=mid:1\na=sctp-port:5000"
+          }
+        }
+      }
+    },
+    "/realtime/calls/{call_id}/accept": {
+      "post": {
+        "summary": "Accept an incoming SIP call and configure the realtime session that will\nhandle it.",
+        "operationId": "accept-realtime-call",
+        "tags": [
+          "Realtime"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "call_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The identifier for the call provided in the\n[`realtime.call.incoming`](https://developers.openai.com/api/reference/resources/webhooks#realtime.call.incoming)\nwebhook."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "description": "Session configuration to apply before the caller is bridged to the model.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RealtimeSessionCreateRequestGA"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Call accepted successfully."
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Accept call",
+          "group": "realtime-calls",
+          "returns": "Returns `200 OK` once OpenAI starts ringing the SIP leg with the supplied\nsession configuration.",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/calls/$CALL_ID/accept \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n        \"type\": \"realtime\",\n        \"model\": \"gpt-realtime\",\n        \"instructions\": \"You are Alex, a friendly concierge for Example Corp.\",\n      }'"
+            }
+          }
+        }
+      }
+    },
+    "/realtime/calls/{call_id}/hangup": {
+      "post": {
+        "summary": "End an active Realtime API call, whether it was initiated over SIP or\nWebRTC.",
+        "operationId": "hangup-realtime-call",
+        "tags": [
+          "Realtime"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "call_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The identifier for the call. For SIP calls, use the value provided in the\n[`realtime.call.incoming`](https://developers.openai.com/api/reference/resources/webhooks#realtime.call.incoming)\nwebhook. For WebRTC sessions, reuse the call ID returned in the `Location`\nheader when creating the call with\n[`POST /v1/realtime/calls`](https://developers.openai.com/api/reference/resources/realtime/subresources/calls/methods/create)."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Call hangup initiated successfully."
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Hang up call",
+          "group": "realtime-calls",
+          "returns": "Returns `200 OK` when OpenAI begins terminating the realtime call.",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/calls/$CALL_ID/hangup \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\""
+            }
+          }
+        }
+      }
+    },
+    "/realtime/calls/{call_id}/refer": {
+      "post": {
+        "summary": "Transfer an active SIP call to a new destination using the SIP REFER verb.",
+        "operationId": "refer-realtime-call",
+        "tags": [
+          "Realtime"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "call_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The identifier for the call provided in the\n[`realtime.call.incoming`](https://developers.openai.com/api/reference/resources/webhooks#realtime.call.incoming)\nwebhook."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "description": "Destination URI for the REFER request.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RealtimeCallReferRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Call referred successfully."
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Refer call",
+          "group": "realtime-calls",
+          "returns": "Returns `200 OK` once the REFER is handed off to your SIP provider.",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/calls/$CALL_ID/refer \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"target_uri\": \"tel:+14155550123\"}'"
+            }
+          }
+        }
+      }
+    },
+    "/realtime/calls/{call_id}/reject": {
+      "post": {
+        "summary": "Decline an incoming SIP call by returning a SIP status code to the caller.",
+        "operationId": "reject-realtime-call",
+        "tags": [
+          "Realtime"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "call_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The identifier for the call provided in the\n[`realtime.call.incoming`](https://developers.openai.com/api/reference/resources/webhooks#realtime.call.incoming)\nwebhook."
+          }
+        ],
+        "requestBody": {
+          "required": false,
+          "description": "Provide an optional SIP status code. When omitted the API responds with\n`603 Decline`.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RealtimeCallRejectRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Call rejected successfully."
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Reject call",
+          "group": "realtime-calls",
+          "returns": "Returns `200 OK` after OpenAI sends the SIP status code to the caller.",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/calls/$CALL_ID/reject \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"status_code\": 486}'"
+            }
+          }
+        }
+      }
+    },
+    "/realtime/client_secrets": {
+      "post": {
+        "summary": "Create a Realtime client secret with an associated session configuration.\n\nClient secrets are short-lived tokens that can be passed to a client app,\nsuch as a web frontend or mobile client, which grants access to the Realtime API without\nleaking your main API key. You can configure a custom TTL for each client secret.\n\nYou can also attach session configuration options to the client secret, which will be\napplied to any sessions created using that client secret, but these can also be overridden\nby the client connection.\n\n[Learn more about authentication with client secrets over WebRTC](https://developers.openai.com/api/docs/guides/realtime-webrtc).\n\nReturns the created client secret and the effective session object. The client secret is a string that looks like `ek_1234`.\n",
+        "operationId": "create-realtime-client-secret",
+        "tags": [
+          "Realtime"
+        ],
+        "requestBody": {
+          "description": "Create a client secret with the given session configuration.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RealtimeCreateClientSecretRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Client secret created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RealtimeCreateClientSecretResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create client secret",
+          "group": "realtime",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/client_secrets \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"expires_after\": {\n      \"anchor\": \"created_at\",\n      \"seconds\": 600\n    },\n    \"session\": {\n      \"type\": \"realtime\",\n      \"model\": \"gpt-realtime\",\n      \"instructions\": \"You are a friendly assistant.\"\n    }\n  }'\n"
+            },
+            "response": "{\n  \"value\": \"ek_68af296e8e408191a1120ab6383263c2\",\n  \"expires_at\": 1756310470,\n  \"session\": {\n    \"type\": \"realtime\",\n    \"object\": \"realtime.session\",\n    \"id\": \"sess_C9CiUVUzUzYIssh3ELY1d\",\n    \"model\": \"gpt-realtime\",\n    \"output_modalities\": [\n      \"audio\"\n    ],\n    \"instructions\": \"You are a friendly assistant.\",\n    \"tools\": [],\n    \"tool_choice\": \"auto\",\n    \"max_output_tokens\": \"inf\",\n    \"tracing\": null,\n    \"truncation\": \"auto\",\n    \"prompt\": null,\n    \"expires_at\": 0,\n    \"audio\": {\n      \"input\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"transcription\": null,\n        \"noise_reduction\": null,\n        \"turn_detection\": {\n          \"type\": \"server_vad\",\n        }\n      },\n      \"output\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"voice\": \"alloy\",\n        \"speed\": 1.0\n      }\n    },\n    \"include\": null\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/realtime/sessions": {
+      "post": {
+        "summary": "Create an ephemeral API token for use in client-side applications with the\nRealtime API. Can be configured with the same session parameters as the\n`session.update` client event.\n\nIt responds with a session object, plus a `client_secret` key which contains\na usable ephemeral API token that can be used to authenticate browser clients\nfor the Realtime API.\n\nReturns the created Realtime session object, plus an ephemeral key.\n",
+        "operationId": "create-realtime-session",
+        "tags": [
+          "Realtime"
+        ],
+        "requestBody": {
+          "description": "Create an ephemeral API key with the given session configuration.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RealtimeSessionCreateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Session created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RealtimeSessionCreateResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create session",
+          "group": "realtime",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/sessions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"model\": \"gpt-realtime\",\n    \"modalities\": [\"audio\", \"text\"],\n    \"instructions\": \"You are a friendly assistant.\"\n  }'\n"
+            },
+            "response": "{\n  \"id\": \"sess_001\",\n  \"object\": \"realtime.session\",\n  \"model\": \"gpt-realtime-2025-08-25\",\n  \"modalities\": [\"audio\", \"text\"],\n  \"instructions\": \"You are a friendly assistant.\",\n  \"voice\": \"alloy\",\n  \"input_audio_format\": \"pcm16\",\n  \"output_audio_format\": \"pcm16\",\n  \"input_audio_transcription\": {\n      \"model\": \"whisper-1\"\n  },\n  \"turn_detection\": null,\n  \"tools\": [],\n  \"tool_choice\": \"none\",\n  \"temperature\": 0.7,\n  \"max_response_output_tokens\": 200,\n  \"speed\": 1.1,\n  \"tracing\": \"auto\",\n  \"client_secret\": {\n    \"value\": \"ek_abc123\", \n    \"expires_at\": 1234567890\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/realtime/transcription_sessions": {
+      "post": {
+        "summary": "Create an ephemeral API token for use in client-side applications with the\nRealtime API specifically for realtime transcriptions. \nCan be configured with the same session parameters as the `transcription_session.update` client event.\n\nIt responds with a session object, plus a `client_secret` key which contains\na usable ephemeral API token that can be used to authenticate browser clients\nfor the Realtime API.\n\nReturns the created Realtime transcription session object, plus an ephemeral key.\n",
+        "operationId": "create-realtime-transcription-session",
+        "tags": [
+          "Realtime"
+        ],
+        "requestBody": {
+          "description": "Create an ephemeral API key with the given session configuration.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Session created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create transcription session",
+          "group": "realtime",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/transcription_sessions \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{}'\n"
+            },
+            "response": "{\n  \"id\": \"sess_BBwZc7cFV3XizEyKGDCGL\",\n  \"object\": \"realtime.transcription_session\",\n  \"modalities\": [\"audio\", \"text\"],\n  \"turn_detection\": {\n    \"type\": \"server_vad\",\n    \"threshold\": 0.5,\n    \"prefix_padding_ms\": 300,\n    \"silence_duration_ms\": 200\n  },\n  \"input_audio_format\": \"pcm16\",\n  \"input_audio_transcription\": {\n    \"model\": \"gpt-4o-transcribe\",\n    \"language\": null,\n    \"prompt\": \"\"\n  },\n  \"client_secret\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/realtime/translations/client_secrets": {
+      "post": {
+        "summary": "Create a Realtime translation client secret with an associated translation session configuration.\n\nClient secrets are short-lived tokens that can be passed to a client app,\nsuch as a web frontend or mobile client, which grants access to the Realtime\nTranslation API without leaking your main API key. You can configure a custom\nTTL for each client secret.\n\nReturns the created client secret and the effective translation session object.\nThe client secret is a string that looks like `ek_1234`.\n",
+        "operationId": "create-realtime-translation-client-secret",
+        "tags": [
+          "Realtime"
+        ],
+        "requestBody": {
+          "description": "Create a client secret with the given translation session configuration.",
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RealtimeTranslationClientSecretCreateRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Translation client secret created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RealtimeTranslationClientSecretCreateResponse"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create translation client secret",
+          "group": "realtime",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/realtime/translations/client_secrets \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"expires_after\": {\n      \"anchor\": \"created_at\",\n      \"seconds\": 600\n    },\n    \"session\": {\n      \"model\": \"gpt-realtime-translate\",\n      \"audio\": {\n        \"input\": {\n          \"transcription\": {\n            \"model\": \"gpt-realtime-whisper\"\n          },\n          \"noise_reduction\": null\n        },\n        \"output\": {\n          \"language\": \"es\"\n        }\n      }\n    }\n  }'\n"
+            },
+            "response": "{\n  \"value\": \"ek_68af296e8e408191a1120ab6383263c2\",\n  \"expires_at\": 1756310470,\n  \"session\": {\n    \"id\": \"sess_C9CiUVUzUzYIssh3ELY1d\",\n    \"type\": \"translation\",\n    \"expires_at\": 1756310470,\n    \"model\": \"gpt-realtime-translate\",\n    \"audio\": {\n      \"input\": {\n        \"transcription\": {\n          \"model\": \"gpt-realtime-whisper\"\n        },\n        \"noise_reduction\": null\n      },\n      \"output\": {\n        \"language\": \"es\"\n      }\n    }\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/responses": {
+      "post": {
+        "operationId": "createResponse",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Creates a model response. Provide [text](https://developers.openai.com/api/docs/guides/text) or\n[image](https://developers.openai.com/api/docs/guides/images-vision) inputs to generate [text](https://developers.openai.com/api/docs/guides/text)\nor [JSON](https://developers.openai.com/api/docs/guides/structured-outputs) outputs. Have the model call\nyour own [custom code](https://developers.openai.com/api/docs/guides/function-calling) or use built-in\n[tools](https://developers.openai.com/api/docs/guides/tools) like [web search](https://developers.openai.com/api/docs/guides/tools-web-search)\nor [file search](https://developers.openai.com/api/docs/guides/tools-file-search) to use your own data\nas input for the model's response.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateResponse"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Response"
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/ResponseStreamEvent"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create a model response",
+          "group": "responses",
+          "path": "create",
+          "examples": [
+            {
+              "title": "Text input",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": \"Tell me a three sentence bedtime story about a unicorn.\"\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    input: \"Tell me a three sentence bedtime story about a unicorn.\"\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n  model=\"gpt-6-astra\",\n  input=\"Tell me a three sentence bedtime story about a unicorn.\"\n)\n\nprint(response)\n",
+                "csharp": "using System;\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nOpenAIResponse response = client.CreateResponse(\"Tell me a three sentence bedtime story about a unicorn.\");\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccd2bed1ec8190b14f964abc0542670bb6a6b452d3795b\",\n  \"object\": \"response\",\n  \"created_at\": 1741476542,\n  \"status\": \"completed\",\n  \"completed_at\": 1741476543,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccd2bf17f0819081ff3bb2cf6508e60bb6a6b452d3795b\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"In a peaceful grove beneath a silver moon, a unicorn named Lumina discovered a hidden pool that reflected the stars. As she dipped her horn into the water, the pool began to shimmer, revealing a pathway to a magical realm of endless night skies. Filled with wonder, Lumina whispered a wish for all who dream to find their own hidden magic, and as she glanced back, her hoofprints sparkled like stardust.\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 36,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 87,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 123\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "Image input",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": [\n      {\n        \"role\": \"user\",\n        \"content\": [\n          {\"type\": \"input_text\", \"text\": \"what is in this image?\"},\n          {\n            \"type\": \"input_image\",\n            \"image_url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\"\n          }\n        ]\n      }\n    ]\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    input: [\n        {\n            role: \"user\",\n            content: [\n                { type: \"input_text\", text: \"what is in this image?\" },\n                {\n                    type: \"input_image\",\n                    image_url:\n                        \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\",\n                },\n            ],\n        },\n    ],\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    input=[\n        {\n            \"role\": \"user\",\n            \"content\": [\n                { \"type\": \"input_text\", \"text\": \"what is in this image?\" },\n                {\n                    \"type\": \"input_image\",\n                    \"image_url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\"\n                }\n            ]\n        }\n    ]\n)\n\nprint(response)\n",
+                "csharp": "using System;\nusing System.Collections.Generic;\n\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nList<ResponseItem> inputItems =\n[\n    ResponseItem.CreateUserMessageItem(\n        [\n            ResponseContentPart.CreateInputTextPart(\"What is in this image?\"),\n            ResponseContentPart.CreateInputImagePart(new Uri(\"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\"))\n        ]\n    )\n];\n\nOpenAIResponse response = client.CreateResponse(inputItems);\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccd3a9da748190baa7f1570fe91ac604becb25c45c1d41\",\n  \"object\": \"response\",\n  \"created_at\": 1741476777,\n  \"status\": \"completed\",\n  \"completed_at\": 1741476778,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccd3acc8d48190a77525dc6de64b4104becb25c45c1d41\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"The image depicts a scenic landscape with a wooden boardwalk or pathway leading through lush, green grass under a blue sky with some clouds. The setting suggests a peaceful natural area, possibly a park or nature reserve. There are trees and shrubs in the background.\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 328,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 52,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 380\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "File input",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": [\n      {\n        \"role\": \"user\",\n        \"content\": [\n          {\"type\": \"input_text\", \"text\": \"what is in this file?\"},\n          {\n            \"type\": \"input_file\",\n            \"file_url\": \"https://www.berkshirehathaway.com/letters/2024ltr.pdf\",\n            \"detail\": \"auto\"\n          }\n        ]\n      }\n    ]\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    input: [\n        {\n            role: \"user\",\n            content: [\n                { type: \"input_text\", text: \"what is in this file?\" },\n                {\n                    type: \"input_file\",\n                    file_url: \"https://www.berkshirehathaway.com/letters/2024ltr.pdf\",\n                    detail: \"auto\",\n                },\n            ],\n        },\n    ],\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    input=[\n        {\n            \"role\": \"user\",\n            \"content\": [\n                { \"type\": \"input_text\", \"text\": \"what is in this file?\" },\n                {\n                    \"type\": \"input_file\",\n                    \"file_url\": \"https://www.berkshirehathaway.com/letters/2024ltr.pdf\",\n                    \"detail\": \"auto\"\n                }\n            ]\n        }\n    ]\n)\n\nprint(response)\n"
+              },
+              "response": "{\n  \"id\": \"resp_686eef60237881a2bd1180bb8b13de430e34c516d176ff86\",\n  \"object\": \"response\",\n  \"created_at\": 1752100704,\n  \"status\": \"completed\",\n  \"completed_at\": 1752100705,\n  \"background\": false,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"max_tool_calls\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"id\": \"msg_686eef60d3e081a29283bdcbc4322fd90e34c516d176ff86\",\n      \"type\": \"message\",\n      \"status\": \"completed\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"annotations\": [],\n          \"logprobs\": [],\n          \"text\": \"The file seems to contain excerpts from a letter to the shareholders of Berkshire Hathaway Inc., likely written by Warren Buffett. It covers several topics:\\n\\n1. **Communication Philosophy**: Buffett emphasizes the importance of transparency and candidness in reporting mistakes and successes to shareholders.\\n\\n2. **Mistakes and Learnings**: The letter acknowledges past mistakes in business assessments and management hires, highlighting the importance of correcting errors promptly.\\n\\n3. **CEO Succession**: Mention of Greg Abel stepping in as the new CEO and continuing the tradition of honest communication.\\n\\n4. **Pete Liegl Story**: A detailed account of acquiring Forest River and the relationship with its founder, highlighting trust and effective business decisions.\\n\\n5. **2024 Performance**: Overview of business performance, particularly in insurance and investment activities, with a focus on GEICO's improvement.\\n\\n6. **Tax Contributions**: Discussion of significant tax payments to the U.S. Treasury, credited to shareholders' reinvestments.\\n\\n7. **Investment Strategy**: A breakdown of Berkshire\\u2019s investments in both controlled subsidiaries and marketable equities, along with a focus on long-term holding strategies.\\n\\n8. **American Capitalism**: Reflections on America\\u2019s economic development and Berkshire\\u2019s role within it.\\n\\n9. **Property-Casualty Insurance**: Insights into the P/C insurance business model and its challenges and benefits.\\n\\n10. **Japanese Investments**: Information about Berkshire\\u2019s investments in Japanese companies and future plans.\\n\\n11. **Annual Meeting**: Details about the upcoming annual gathering in Omaha, including schedule changes and new book releases.\\n\\n12. **Personal Anecdotes**: Light-hearted stories about family and interactions, conveying Buffett's personable approach.\\n\\n13. **Financial Performance Data**: Tables comparing Berkshire\\u2019s annual performance to the S&P 500, showing impressive long-term gains.\\n\\nOverall, the letter reinforces Berkshire Hathaway's commitment to transparency, investment in both its businesses and the wider economy, and emphasizes strong leadership and prudent financial management.\"\n        }\n      ],\n      \"role\": \"assistant\"\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"service_tier\": \"default\",\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_logprobs\": 0,\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 8438,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 398,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 8836\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "Web search",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"tools\": [{ \"type\": \"web_search_preview\" }],\n    \"input\": \"What was a positive news story from today?\"\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    tools: [{ type: \"web_search_preview\" }],\n    input: \"What was a positive news story from today?\",\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    tools=[{ \"type\": \"web_search_preview\" }],\n    input=\"What was a positive news story from today?\",\n)\n\nprint(response)\n",
+                "csharp": "using System;\n\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nstring userInputText = \"What was a positive news story from today?\";\n\nResponseCreationOptions options = new()\n{\n    Tools =\n    {\n        ResponseTool.CreateWebSearchTool()\n    },\n};\n\nOpenAIResponse response = client.CreateResponse(userInputText, options);\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccf18ef5fc8190b16dbee19bc54e5f087bb177ab789d5c\",\n  \"object\": \"response\",\n  \"created_at\": 1741484430,\n  \"status\": \"completed\",\n  \"completed_at\": 1741484431,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"web_search_call\",\n      \"id\": \"ws_67ccf18f64008190a39b619f4c8455ef087bb177ab789d5c\",\n      \"status\": \"completed\"\n    },\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccf190ca3881909d433c50b1f6357e087bb177ab789d5c\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"As of today, March 9, 2025, one notable positive news story...\",\n          \"annotations\": [\n            {\n              \"type\": \"url_citation\",\n              \"start_index\": 442,\n              \"end_index\": 557,\n              \"url\": \"https://.../?utm_source=chatgpt.com\",\n              \"title\": \"...\"\n            },\n            {\n              \"type\": \"url_citation\",\n              \"start_index\": 962,\n              \"end_index\": 1077,\n              \"url\": \"https://.../?utm_source=chatgpt.com\",\n              \"title\": \"...\"\n            },\n            {\n              \"type\": \"url_citation\",\n              \"start_index\": 1336,\n              \"end_index\": 1451,\n              \"url\": \"https://.../?utm_source=chatgpt.com\",\n              \"title\": \"...\"\n            }\n          ]\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [\n    {\n      \"type\": \"web_search_preview\",\n      \"domains\": [],\n      \"search_context_size\": \"medium\",\n      \"user_location\": {\n        \"type\": \"approximate\",\n        \"city\": null,\n        \"country\": \"US\",\n        \"region\": null,\n        \"timezone\": null\n      }\n    }\n  ],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 328,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 356,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 684\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "File search",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"tools\": [{\n      \"type\": \"file_search\",\n      \"vector_store_ids\": [\"vs_1234567890\"],\n      \"max_num_results\": 20\n    }],\n    \"input\": \"What are the attributes of an ancient brown dragon?\"\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    tools: [{\n      type: \"file_search\",\n      vector_store_ids: [\"vs_1234567890\"],\n      max_num_results: 20\n    }],\n    input: \"What are the attributes of an ancient brown dragon?\",\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    tools=[{\n      \"type\": \"file_search\",\n      \"vector_store_ids\": [\"vs_1234567890\"],\n      \"max_num_results\": 20\n    }],\n    input=\"What are the attributes of an ancient brown dragon?\",\n)\n\nprint(response)\n",
+                "csharp": "using System;\n\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nstring userInputText = \"What are the attributes of an ancient brown dragon?\";\n\nResponseCreationOptions options = new()\n{\n    Tools =\n    {\n        ResponseTool.CreateFileSearchTool(\n            vectorStoreIds: [\"vs_1234567890\"],\n            maxResultCount: 20\n        )\n    },\n};\n\nOpenAIResponse response = client.CreateResponse(userInputText, options);\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccf4c55fc48190b71bd0463ad3306d09504fb6872380d7\",\n  \"object\": \"response\",\n  \"created_at\": 1741485253,\n  \"status\": \"completed\",\n  \"completed_at\": 1741485254,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"file_search_call\",\n      \"id\": \"fs_67ccf4c63cd08190887ef6464ba5681609504fb6872380d7\",\n      \"status\": \"completed\",\n      \"queries\": [\n        \"attributes of an ancient brown dragon\"\n      ],\n      \"results\": null\n    },\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccf4c93e5c81909d595b369351a9d309504fb6872380d7\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"The attributes of an ancient brown dragon include...\",\n          \"annotations\": [\n            {\n              \"type\": \"file_citation\",\n              \"index\": 320,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 576,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 815,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 815,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 1030,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 1030,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 1156,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 1225,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            }\n          ]\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [\n    {\n      \"type\": \"file_search\",\n      \"filters\": null,\n      \"max_num_results\": 20,\n      \"ranking_options\": {\n        \"ranker\": \"auto\",\n        \"score_threshold\": 0.0\n      },\n      \"vector_store_ids\": [\n        \"vs_1234567890\"\n      ]\n    }\n  ],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 18307,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 348,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 18655\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"instructions\": \"You are a helpful assistant.\",\n    \"input\": \"Hello!\",\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n  model=\"gpt-6-astra\",\n  instructions=\"You are a helpful assistant.\",\n  input=\"Hello!\",\n  stream=True\n)\n\nfor event in response:\n  print(event)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    instructions: \"You are a helpful assistant.\",\n    input: \"Hello!\",\n    stream: true,\n});\n\nfor await (const event of response) {\n    console.log(event);\n}\n",
+                "csharp": "using System;\nusing System.ClientModel;\nusing System.Threading.Tasks;\n\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nstring userInputText = \"Hello!\";\n\nResponseCreationOptions options = new()\n{\n    Instructions = \"You are a helpful assistant.\",\n};\n\nAsyncCollectionResult<StreamingResponseUpdate> responseUpdates = client.CreateResponseStreamingAsync(userInputText, options);\n\nawait foreach (StreamingResponseUpdate responseUpdate in responseUpdates)\n{\n    if (responseUpdate is StreamingResponseOutputTextDeltaUpdate outputTextDeltaUpdate)\n    {\n        Console.Write(outputTextDeltaUpdate.Delta);\n    }\n}\n"
+              },
+              "response": "event: response.created\ndata: {\"type\":\"response.created\",\"response\":{\"id\":\"resp_67c9fdcecf488190bdd9a0409de3a1ec07b8b0ad4e5eb654\",\"object\":\"response\",\"created_at\":1741290958,\"status\":\"in_progress\",\"error\":null,\"incomplete_details\":null,\"instructions\":\"You are a helpful assistant.\",\"max_output_tokens\":null,\"model\":\"gpt-6-astra\",\"output\":[],\"parallel_tool_calls\":true,\"previous_response_id\":null,\"reasoning\":{\"effort\":null,\"summary\":null},\"store\":true,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"}},\"tool_choice\":\"auto\",\"tools\":[],\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}}}\n\nevent: response.in_progress\ndata: {\"type\":\"response.in_progress\",\"response\":{\"id\":\"resp_67c9fdcecf488190bdd9a0409de3a1ec07b8b0ad4e5eb654\",\"object\":\"response\",\"created_at\":1741290958,\"status\":\"in_progress\",\"error\":null,\"incomplete_details\":null,\"instructions\":\"You are a helpful assistant.\",\"max_output_tokens\":null,\"model\":\"gpt-6-astra\",\"output\":[],\"parallel_tool_calls\":true,\"previous_response_id\":null,\"reasoning\":{\"effort\":null,\"summary\":null},\"store\":true,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"}},\"tool_choice\":\"auto\",\"tools\":[],\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}}}\n\nevent: response.output_item.added\ndata: {\"type\":\"response.output_item.added\",\"output_index\":0,\"item\":{\"id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"type\":\"message\",\"status\":\"in_progress\",\"role\":\"assistant\",\"content\":[]}}\n\nevent: response.content_part.added\ndata: {\"type\":\"response.content_part.added\",\"item_id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"output_index\":0,\"content_index\":0,\"part\":{\"type\":\"output_text\",\"text\":\"\",\"annotations\":[]}}\n\nevent: response.output_text.delta\ndata: {\"type\":\"response.output_text.delta\",\"item_id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"output_index\":0,\"content_index\":0,\"delta\":\"Hi\"}\n\n...\n\nevent: response.output_text.done\ndata: {\"type\":\"response.output_text.done\",\"item_id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"output_index\":0,\"content_index\":0,\"text\":\"Hi there! How can I assist you today?\"}\n\nevent: response.content_part.done\ndata: {\"type\":\"response.content_part.done\",\"item_id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"output_index\":0,\"content_index\":0,\"part\":{\"type\":\"output_text\",\"text\":\"Hi there! How can I assist you today?\",\"annotations\":[]}}\n\nevent: response.output_item.done\ndata: {\"type\":\"response.output_item.done\",\"output_index\":0,\"item\":{\"id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"type\":\"message\",\"status\":\"completed\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Hi there! How can I assist you today?\",\"annotations\":[]}]}}\n\nevent: response.completed\ndata: {\"type\":\"response.completed\",\"response\":{\"id\":\"resp_67c9fdcecf488190bdd9a0409de3a1ec07b8b0ad4e5eb654\",\"object\":\"response\",\"created_at\":1741290958,\"status\":\"completed\",\"error\":null,\"incomplete_details\":null,\"instructions\":\"You are a helpful assistant.\",\"max_output_tokens\":null,\"model\":\"gpt-6-astra\",\"output\":[{\"id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"type\":\"message\",\"status\":\"completed\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Hi there! How can I assist you today?\",\"annotations\":[]}]}],\"parallel_tool_calls\":true,\"previous_response_id\":null,\"reasoning\":{\"effort\":null,\"summary\":null},\"store\":true,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"}},\"tool_choice\":\"auto\",\"tools\":[],\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":{\"input_tokens\":37,\"output_tokens\":11,\"output_tokens_details\":{\"reasoning_tokens\":0},\"total_tokens\":48},\"user\":null,\"metadata\":{}}}\n"
+            },
+            {
+              "title": "Functions",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": \"What is the weather like in Boston today?\",\n    \"tools\": [\n      {\n        \"type\": \"function\",\n        \"name\": \"get_current_weather\",\n        \"description\": \"Get the current weather in a given location\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"location\": {\n              \"type\": \"string\",\n              \"description\": \"The city and state, e.g. San Francisco, CA\"\n            },\n            \"unit\": {\n              \"type\": \"string\",\n              \"enum\": [\"celsius\", \"fahrenheit\"]\n            }\n          },\n          \"required\": [\"location\", \"unit\"]\n        }\n      }\n    ],\n    \"tool_choice\": \"auto\"\n  }'\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\ntools = [\n    {\n        \"type\": \"function\",\n        \"name\": \"get_current_weather\",\n        \"description\": \"Get the current weather in a given location\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n              \"location\": {\n                  \"type\": \"string\",\n                  \"description\": \"The city and state, e.g. San Francisco, CA\",\n              },\n              \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]},\n          },\n          \"required\": [\"location\", \"unit\"],\n        }\n    }\n]\n\nresponse = client.responses.create(\n  model=\"gpt-6-astra\",\n  tools=tools,\n  input=\"What is the weather like in Boston today?\",\n  tool_choice=\"auto\"\n)\n\nprint(response)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst tools = [\n    {\n        type: \"function\",\n        name: \"get_current_weather\",\n        description: \"Get the current weather in a given location\",\n        parameters: {\n            type: \"object\",\n            properties: {\n                location: {\n                    type: \"string\",\n                    description: \"The city and state, e.g. San Francisco, CA\",\n                },\n                unit: { type: \"string\", enum: [\"celsius\", \"fahrenheit\"] },\n            },\n            required: [\"location\", \"unit\"],\n        },\n    },\n];\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    tools: tools,\n    input: \"What is the weather like in Boston today?\",\n    tool_choice: \"auto\",\n});\n\nconsole.log(response);\n",
+                "csharp": "using System;\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nResponseTool getCurrentWeatherFunctionTool = ResponseTool.CreateFunctionTool(\n    functionName: \"get_current_weather\",\n    functionDescription: \"Get the current weather in a given location\",\n    functionParameters: BinaryData.FromString(\"\"\"\n        {\n            \"type\": \"object\",\n            \"properties\": {\n                \"location\": {\n                    \"type\": \"string\",\n                    \"description\": \"The city and state, e.g. San Francisco, CA\"\n                },\n                \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]}\n            },\n            \"required\": [\"location\", \"unit\"]\n        }\n        \"\"\"\n    )\n);\n\nstring userInputText = \"What is the weather like in Boston today?\";\n\nResponseCreationOptions options = new()\n{\n    Tools =\n    {\n        getCurrentWeatherFunctionTool\n    },\n    ToolChoice = ResponseToolChoice.CreateAutoChoice(),\n};\n\nOpenAIResponse response = client.CreateResponse(userInputText, options);\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ca09c5efe0819096d0511c92b8c890096610f474011cc0\",\n  \"object\": \"response\",\n  \"created_at\": 1741294021,\n  \"status\": \"completed\",\n  \"completed_at\": 1741294022,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"function_call\",\n      \"id\": \"fc_67ca09c6bedc8190a7abfec07b1a1332096610f474011cc0\",\n      \"call_id\": \"call_unLAR8MvFNptuiZK6K6HCy5k\",\n      \"name\": \"get_current_weather\",\n      \"arguments\": \"{\\\"location\\\":\\\"Boston, MA\\\",\\\"unit\\\":\\\"celsius\\\"}\",\n      \"status\": \"completed\"\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [\n    {\n      \"type\": \"function\",\n      \"description\": \"Get the current weather in a given location\",\n      \"name\": \"get_current_weather\",\n      \"parameters\": {\n        \"type\": \"object\",\n        \"properties\": {\n          \"location\": {\n            \"type\": \"string\",\n            \"description\": \"The city and state, e.g. San Francisco, CA\"\n          },\n          \"unit\": {\n            \"type\": \"string\",\n            \"enum\": [\n              \"celsius\",\n              \"fahrenheit\"\n            ]\n          }\n        },\n        \"required\": [\n          \"location\",\n          \"unit\"\n        ]\n      },\n      \"strict\": true\n    }\n  ],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 291,\n    \"output_tokens\": 23,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 314\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "Reasoning",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": \"How much wood would a woodchuck chuck?\",\n    \"reasoning\": {\n      \"effort\": \"high\"\n    }\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    input: \"How much wood would a woodchuck chuck?\",\n    reasoning: {\n      effort: \"high\"\n    }\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    input=\"How much wood would a woodchuck chuck?\",\n    reasoning={\n        \"effort\": \"high\"\n    }\n)\n\nprint(response)\n",
+                "csharp": "using System;\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nstring userInputText = \"How much wood would a woodchuck chuck?\";\n\nResponseCreationOptions options = new()\n{\n    ReasoningOptions = new()\n    {\n        ReasoningEffortLevel = ResponseReasoningEffortLevel.High,\n    },\n};\n\nOpenAIResponse response = client.CreateResponse(userInputText, options);\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccd7eca01881908ff0b5146584e408072912b2993db808\",\n  \"object\": \"response\",\n  \"created_at\": 1741477868,\n  \"status\": \"completed\",\n  \"completed_at\": 1741477869,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccd7f7b5848190a6f3e95d809f6b44072912b2993db808\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"The classic tongue twister...\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": \"high\",\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 81,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 1035,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 832\n    },\n    \"total_tokens\": 1116\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/responses/{response_id}": {
+      "get": {
+        "operationId": "getResponse",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Retrieves a model response with the given ID.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "response_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "resp_677efb5139a88190b512bc3fef8e535d"
+            },
+            "description": "The ID of the response to retrieve."
+          },
+          {
+            "in": "query",
+            "name": "include",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/IncludeEnum"
+              }
+            },
+            "description": "Additional fields to include in the response. See the `include`\nparameter for Response creation above for more information.\n"
+          },
+          {
+            "in": "query",
+            "name": "stream",
+            "schema": {
+              "type": "boolean"
+            },
+            "description": "If set to true, the model response data will be streamed to the client\nas it is generated using [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format).\nSee the [Streaming section below](https://developers.openai.com/api/reference/resources/responses/streaming-events)\nfor more information.\n"
+          },
+          {
+            "in": "query",
+            "name": "starting_after",
+            "schema": {
+              "type": "integer"
+            },
+            "description": "The sequence number of the event after which to start streaming.\n"
+          },
+          {
+            "in": "query",
+            "name": "include_obfuscation",
+            "schema": {
+              "type": "boolean"
+            },
+            "description": "When true, stream obfuscation will be enabled. Stream obfuscation adds\nrandom characters to an `obfuscation` field on streaming delta events\nto normalize payload sizes as a mitigation to certain side-channel\nattacks. These obfuscation fields are included by default, but add a\nsmall amount of overhead to the data stream. You can set\n`include_obfuscation` to false to optimize for bandwidth if you trust\nthe network links between your application and the OpenAI API.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Response"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get a model response",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/responses/resp_123 \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst response = await client.responses.retrieve(\"resp_123\");\nconsole.log(response);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.retrieve(\"resp_123\")\nprint(response)\n"
+            },
+            "response": "{\n  \"id\": \"resp_67cb71b351908190a308f3859487620d06981a8637e6bc44\",\n  \"object\": \"response\",\n  \"created_at\": 1741386163,\n  \"status\": \"completed\",\n  \"completed_at\": 1741386164,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67cb71b3c2b0819084d481baaaf148f206981a8637e6bc44\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"Silent circuits hum,  \\nThoughts emerge in data streams—  \\nDigital dawn breaks.\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 32,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 18,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 50\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteResponse",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Deletes a model response with the given ID.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "response_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "resp_677efb5139a88190b512bc3fef8e535d"
+            },
+            "description": "The ID of the response to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a model response",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/responses/resp_123 \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst response = await client.responses.delete(\"resp_123\");\nconsole.log(response);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.delete(\"resp_123\")\nprint(response)\n"
+            },
+            "response": "{\n  \"id\": \"resp_6786a1bec27481909a17d673315b29f6\",\n  \"object\": \"response\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/responses/{response_id}/cancel": {
+      "post": {
+        "operationId": "cancelResponse",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Cancels a model response with the given ID. Only responses created with\nthe `background` parameter set to `true` can be cancelled.\n[Learn more](https://developers.openai.com/api/docs/guides/background).\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "response_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "resp_677efb5139a88190b512bc3fef8e535d"
+            },
+            "description": "The ID of the response to cancel."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Response"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel a response",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/responses/resp_123/cancel \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst response = await client.responses.cancel(\"resp_123\");\nconsole.log(response);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.cancel(\"resp_123\")\nprint(response)\n"
+            },
+            "response": "{\n  \"id\": \"resp_67cb71b351908190a308f3859487620d06981a8637e6bc44\",\n  \"object\": \"response\",\n  \"created_at\": 1741386163,\n  \"status\": \"cancelled\",\n  \"background\": true,\n  \"completed_at\": null,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67cb71b3c2b0819084d481baaaf148f206981a8637e6bc44\",\n      \"status\": \"in_progress\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"Silent circuits hum,  \\nThoughts emerge in data streams—  \\nDigital dawn breaks.\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": null,\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+          }
+        }
+      }
+    },
+    "/responses/{response_id}/input_items": {
+      "get": {
+        "operationId": "listInputItems",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Returns a list of input items for a given response.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "response_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the response to retrieve input items for."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between\n1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "in": "query",
+            "name": "order",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            },
+            "description": "The order to return the input items in. Default is `desc`.\n- `asc`: Return the input items in ascending order.\n- `desc`: Return the input items in descending order.\n"
+          },
+          {
+            "in": "query",
+            "name": "after",
+            "schema": {
+              "type": "string"
+            },
+            "description": "An item ID to list items after, used in pagination.\n"
+          },
+          {
+            "in": "query",
+            "name": "include",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/IncludeEnum"
+              }
+            },
+            "description": "Additional fields to include in the response. See the `include`\nparameter for Response creation above for more information.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ResponseItemList"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List input items",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/responses/resp_abc123/input_items \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst response = await client.responses.inputItems.list(\"resp_123\");\nconsole.log(response.data);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.input_items.list(\"resp_123\")\nprint(response.data)\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"msg_abc123\",\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"Tell me a three sentence bedtime story about a unicorn.\"\n        }\n      ]\n    }\n  ],\n  \"first_id\": \"msg_abc123\",\n  \"last_id\": \"msg_abc123\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/threads": {
+      "post": {
+        "operationId": "createThread",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Create a thread.",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateThreadRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ThreadObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create thread",
+          "group": "threads",
+          "beta": true,
+          "examples": [
+            {
+              "title": "Empty",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d ''\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nempty_thread = client.beta.threads.create()\nprint(empty_thread)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const emptyThread = await openai.beta.threads.create();\n\n  console.log(emptyThread);\n}\n\nmain();"
+              },
+              "response": "{\n  \"id\": \"thread_abc123\",\n  \"object\": \"thread\",\n  \"created_at\": 1699012949,\n  \"metadata\": {},\n  \"tool_resources\": {}\n}\n"
+            },
+            {
+              "title": "Messages",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads \\\n-H \"Content-Type: application/json\" \\\n-H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n-H \"OpenAI-Beta: assistants=v2\" \\\n-d '{\n    \"messages\": [{\n      \"role\": \"user\",\n      \"content\": \"Hello, what is AI?\"\n    }, {\n      \"role\": \"user\",\n      \"content\": \"How does AI work? Explain it in simple terms.\"\n    }]\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nmessage_thread = client.beta.threads.create(\n  messages=[\n    {\n      \"role\": \"user\",\n      \"content\": \"Hello, what is AI?\"\n    },\n    {\n      \"role\": \"user\",\n      \"content\": \"How does AI work? Explain it in simple terms.\"\n    },\n  ]\n)\n\nprint(message_thread)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const messageThread = await openai.beta.threads.create({\n    messages: [\n      {\n        role: \"user\",\n        content: \"Hello, what is AI?\"\n      },\n      {\n        role: \"user\",\n        content: \"How does AI work? Explain it in simple terms.\",\n      },\n    ],\n  });\n\n  console.log(messageThread);\n}\n\nmain();"
+              },
+              "response": "{\n  \"id\": \"thread_abc123\",\n  \"object\": \"thread\",\n  \"created_at\": 1699014083,\n  \"metadata\": {},\n  \"tool_resources\": {}\n}\n"
+            }
+          ]
+        }
+      }
+    },
+    "/threads/runs": {
+      "post": {
+        "operationId": "createThreadAndRun",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Create a thread and run it in one request.",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateThreadAndRunRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RunObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create thread and run",
+          "group": "threads",
+          "beta": true,
+          "examples": [
+            {
+              "title": "Default",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads/runs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n      \"assistant_id\": \"asst_abc123\",\n      \"thread\": {\n        \"messages\": [\n          {\"role\": \"user\", \"content\": \"Explain deep learning to a 5 year old.\"}\n        ]\n      }\n    }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun = client.beta.threads.create_and_run(\n  assistant_id=\"asst_abc123\",\n  thread={\n    \"messages\": [\n      {\"role\": \"user\", \"content\": \"Explain deep learning to a 5 year old.\"}\n    ]\n  }\n)\n\nprint(run)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const run = await openai.beta.threads.createAndRun({\n    assistant_id: \"asst_abc123\",\n    thread: {\n      messages: [\n        { role: \"user\", content: \"Explain deep learning to a 5 year old.\" },\n      ],\n    },\n  });\n\n  console.log(run);\n}\n\nmain();\n"
+              },
+              "response": "{\n  \"id\": \"run_abc123\",\n  \"object\": \"thread.run\",\n  \"created_at\": 1699076792,\n  \"assistant_id\": \"asst_abc123\",\n  \"thread_id\": \"thread_abc123\",\n  \"status\": \"queued\",\n  \"started_at\": null,\n  \"expires_at\": 1699077392,\n  \"cancelled_at\": null,\n  \"failed_at\": null,\n  \"completed_at\": null,\n  \"required_action\": null,\n  \"last_error\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": \"You are a helpful assistant.\",\n  \"tools\": [],\n  \"tool_resources\": {},\n  \"metadata\": {},\n  \"temperature\": 1.0,\n  \"top_p\": 1.0,\n  \"max_completion_tokens\": null,\n  \"max_prompt_tokens\": null,\n  \"truncation_strategy\": {\n    \"type\": \"auto\",\n    \"last_messages\": null\n  },\n  \"incomplete_details\": null,\n  \"usage\": null,\n  \"response_format\": \"auto\",\n  \"tool_choice\": \"auto\",\n  \"parallel_tool_calls\": true\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads/runs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"assistant_id\": \"asst_123\",\n    \"thread\": {\n      \"messages\": [\n        {\"role\": \"user\", \"content\": \"Hello\"}\n      ]\n    },\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nstream = client.beta.threads.create_and_run(\n  assistant_id=\"asst_123\",\n  thread={\n    \"messages\": [\n      {\"role\": \"user\", \"content\": \"Hello\"}\n    ]\n  },\n  stream=True\n)\n\nfor event in stream:\n  print(event)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const stream = await openai.beta.threads.createAndRun({\n      assistant_id: \"asst_123\",\n      thread: {\n        messages: [\n          { role: \"user\", content: \"Hello\" },\n        ],\n      },\n      stream: true\n  });\n\n  for await (const event of stream) {\n    console.log(event);\n  }\n}\n\nmain();\n"
+              },
+              "response": "event: thread.created\ndata: {\"id\":\"thread_123\",\"object\":\"thread\",\"created_at\":1710348075,\"metadata\":{}}\n\nevent: thread.run.created\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710348075,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":null,\"expires_at\":1710348675,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"tool_resources\":{},\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}\n\nevent: thread.run.queued\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710348075,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":null,\"expires_at\":1710348675,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"tool_resources\":{},\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}\n\nevent: thread.run.in_progress\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710348075,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"in_progress\",\"started_at\":null,\"expires_at\":1710348675,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"tool_resources\":{},\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}\n\nevent: thread.run.step.created\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710348076,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710348675,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":null}\n\nevent: thread.run.step.in_progress\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710348076,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710348675,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":null}\n\nevent: thread.message.created\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710348076,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"in_progress\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":null,\"role\":\"assistant\",\"content\":[], \"metadata\":{}}\n\nevent: thread.message.in_progress\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710348076,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"in_progress\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":null,\"role\":\"assistant\",\"content\":[], \"metadata\":{}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\"Hello\",\"annotations\":[]}}]}}\n\n...\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\" today\"}}]}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\"?\"}}]}}\n\nevent: thread.message.completed\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710348076,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"completed\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":1710348077,\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":{\"value\":\"Hello! How can I assist you today?\",\"annotations\":[]}}], \"metadata\":{}}\n\nevent: thread.run.step.completed\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710348076,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"completed\",\"cancelled_at\":null,\"completed_at\":1710348077,\"expires_at\":1710348675,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":{\"prompt_tokens\":20,\"completion_tokens\":11,\"total_tokens\":31}}\n\nevent: thread.run.completed\n{\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710348076,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"completed\",\"started_at\":1713226836,\"expires_at\":null,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":1713226837,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":{\"prompt_tokens\":345,\"completion_tokens\":11,\"total_tokens\":356},\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}\n\nevent: done\ndata: [DONE]\n"
+            },
+            {
+              "title": "Streaming with Functions",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads/runs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"assistant_id\": \"asst_abc123\",\n    \"thread\": {\n      \"messages\": [\n        {\"role\": \"user\", \"content\": \"What is the weather like in San Francisco?\"}\n      ]\n    },\n    \"tools\": [\n      {\n        \"type\": \"function\",\n        \"function\": {\n          \"name\": \"get_current_weather\",\n          \"description\": \"Get the current weather in a given location\",\n          \"parameters\": {\n            \"type\": \"object\",\n            \"properties\": {\n              \"location\": {\n                \"type\": \"string\",\n                \"description\": \"The city and state, e.g. San Francisco, CA\"\n              },\n              \"unit\": {\n                \"type\": \"string\",\n                \"enum\": [\"celsius\", \"fahrenheit\"]\n              }\n            },\n            \"required\": [\"location\"]\n          }\n        }\n      }\n    ],\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\ntools = [\n  {\n    \"type\": \"function\",\n    \"function\": {\n      \"name\": \"get_current_weather\",\n      \"description\": \"Get the current weather in a given location\",\n      \"parameters\": {\n        \"type\": \"object\",\n        \"properties\": {\n          \"location\": {\n            \"type\": \"string\",\n            \"description\": \"The city and state, e.g. San Francisco, CA\",\n          },\n          \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]},\n        },\n        \"required\": [\"location\"],\n      },\n    }\n  }\n]\n\nstream = client.beta.threads.create_and_run(\n  thread={\n      \"messages\": [\n        {\"role\": \"user\", \"content\": \"What is the weather like in San Francisco?\"}\n      ]\n  },\n  assistant_id=\"asst_abc123\",\n  tools=tools,\n  stream=True\n)\n\nfor event in stream:\n  print(event)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst tools = [\n    {\n      \"type\": \"function\",\n      \"function\": {\n        \"name\": \"get_current_weather\",\n        \"description\": \"Get the current weather in a given location\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"location\": {\n              \"type\": \"string\",\n              \"description\": \"The city and state, e.g. San Francisco, CA\",\n            },\n            \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]},\n          },\n          \"required\": [\"location\"],\n        },\n      }\n    }\n];\n\nasync function main() {\n  const stream = await openai.beta.threads.createAndRun({\n    assistant_id: \"asst_123\",\n    thread: {\n      messages: [\n        { role: \"user\", content: \"What is the weather like in San Francisco?\" },\n      ],\n    },\n    tools: tools,\n    stream: true\n  });\n\n  for await (const event of stream) {\n    console.log(event);\n  }\n}\n\nmain();\n"
+              },
+              "response": "event: thread.created\ndata: {\"id\":\"thread_123\",\"object\":\"thread\",\"created_at\":1710351818,\"metadata\":{}}\n\nevent: thread.run.created\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710351818,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":null,\"expires_at\":1710352418,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"description\":\"Get the current weather in a given location\",\"parameters\":{\"type\":\"object\",\"properties\":{\"location\":{\"type\":\"string\",\"description\":\"The city and state, e.g. San Francisco, CA\"},\"unit\":{\"type\":\"string\",\"enum\":[\"celsius\",\"fahrenheit\"]}},\"required\":[\"location\"]}}}],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.queued\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710351818,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":null,\"expires_at\":1710352418,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"description\":\"Get the current weather in a given location\",\"parameters\":{\"type\":\"object\",\"properties\":{\"location\":{\"type\":\"string\",\"description\":\"The city and state, e.g. San Francisco, CA\"},\"unit\":{\"type\":\"string\",\"enum\":[\"celsius\",\"fahrenheit\"]}},\"required\":[\"location\"]}}}],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.in_progress\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710351818,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"in_progress\",\"started_at\":1710351818,\"expires_at\":1710352418,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"description\":\"Get the current weather in a given location\",\"parameters\":{\"type\":\"object\",\"properties\":{\"location\":{\"type\":\"string\",\"description\":\"The city and state, e.g. San Francisco, CA\"},\"unit\":{\"type\":\"string\",\"enum\":[\"celsius\",\"fahrenheit\"]}},\"required\":[\"location\"]}}}],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.step.created\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710351819,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"tool_calls\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710352418,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"tool_calls\",\"tool_calls\":[]},\"usage\":null}\n\nevent: thread.run.step.in_progress\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710351819,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"tool_calls\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710352418,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"tool_calls\",\"tool_calls\":[]},\"usage\":null}\n\nevent: thread.run.step.delta\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step.delta\",\"delta\":{\"step_details\":{\"type\":\"tool_calls\",\"tool_calls\":[{\"index\":0,\"id\":\"call_XXNp8YGaFrjrSjgqxtC8JJ1B\",\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"arguments\":\"\",\"output\":null}}]}}}\n\nevent: thread.run.step.delta\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step.delta\",\"delta\":{\"step_details\":{\"type\":\"tool_calls\",\"tool_calls\":[{\"index\":0,\"type\":\"function\",\"function\":{\"arguments\":\"{\\\"\"}}]}}}\n\nevent: thread.run.step.delta\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step.delta\",\"delta\":{\"step_details\":{\"type\":\"tool_calls\",\"tool_calls\":[{\"index\":0,\"type\":\"function\",\"function\":{\"arguments\":\"location\"}}]}}}\n\n...\n\nevent: thread.run.step.delta\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step.delta\",\"delta\":{\"step_details\":{\"type\":\"tool_calls\",\"tool_calls\":[{\"index\":0,\"type\":\"function\",\"function\":{\"arguments\":\"ahrenheit\"}}]}}}\n\nevent: thread.run.step.delta\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step.delta\",\"delta\":{\"step_details\":{\"type\":\"tool_calls\",\"tool_calls\":[{\"index\":0,\"type\":\"function\",\"function\":{\"arguments\":\"\\\"}\"}}]}}}\n\nevent: thread.run.requires_action\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710351818,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"requires_action\",\"started_at\":1710351818,\"expires_at\":1710352418,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":{\"type\":\"submit_tool_outputs\",\"submit_tool_outputs\":{\"tool_calls\":[{\"id\":\"call_XXNp8YGaFrjrSjgqxtC8JJ1B\",\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"arguments\":\"{\\\"location\\\":\\\"San Francisco, CA\\\",\\\"unit\\\":\\\"fahrenheit\\\"}\"}}]}},\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"description\":\"Get the current weather in a given location\",\"parameters\":{\"type\":\"object\",\"properties\":{\"location\":{\"type\":\"string\",\"description\":\"The city and state, e.g. San Francisco, CA\"},\"unit\":{\"type\":\"string\",\"enum\":[\"celsius\",\"fahrenheit\"]}},\"required\":[\"location\"]}}}],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":{\"prompt_tokens\":345,\"completion_tokens\":11,\"total_tokens\":356},\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: done\ndata: [DONE]\n"
+            }
+          ]
+        }
+      }
+    },
+    "/threads/{thread_id}": {
+      "get": {
+        "operationId": "getThread",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Retrieves a thread.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ThreadObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve thread",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nmy_thread = client.beta.threads.retrieve(\"thread_abc123\")\nprint(my_thread)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const myThread = await openai.beta.threads.retrieve(\n    \"thread_abc123\"\n  );\n\n  console.log(myThread);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"thread_abc123\",\n  \"object\": \"thread\",\n  \"created_at\": 1699014083,\n  \"metadata\": {},\n  \"tool_resources\": {\n    \"code_interpreter\": {\n      \"file_ids\": []\n    }\n  }\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "modifyThread",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Modifies a thread.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread to modify. Only the `metadata` can be modified."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ModifyThreadRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ThreadObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify thread",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n      \"metadata\": {\n        \"modified\": \"true\",\n        \"user\": \"abc123\"\n      }\n    }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nmy_updated_thread = client.beta.threads.update(\n  \"thread_abc123\",\n  metadata={\n    \"modified\": \"true\",\n    \"user\": \"abc123\"\n  }\n)\nprint(my_updated_thread)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const updatedThread = await openai.beta.threads.update(\n    \"thread_abc123\",\n    {\n      metadata: { modified: \"true\", user: \"abc123\" },\n    }\n  );\n\n  console.log(updatedThread);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"thread_abc123\",\n  \"object\": \"thread\",\n  \"created_at\": 1699014083,\n  \"metadata\": {\n    \"modified\": \"true\",\n    \"user\": \"abc123\"\n  },\n  \"tool_resources\": {}\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteThread",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Delete a thread.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteThreadResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete thread",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -X DELETE\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.beta.threads.delete(\"thread_abc123\")\nprint(response)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const response = await openai.beta.threads.delete(\"thread_abc123\");\n\n  console.log(response);\n}\nmain();"
+            },
+            "response": "{\n  \"id\": \"thread_abc123\",\n  \"object\": \"thread.deleted\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/threads/{thread_id}/messages": {
+      "get": {
+        "operationId": "listMessages",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Returns a list of messages for a given thread.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the [thread](https://developers.openai.com/api/docs/assistants/migration) the messages belong to."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, starting with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "run_id",
+            "in": "query",
+            "description": "Filter messages by the run ID that generated them.\n",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListMessagesResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List messages",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/messages \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nthread_messages = client.beta.threads.messages.list(\"thread_abc123\")\nprint(thread_messages.data)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const threadMessages = await openai.beta.threads.messages.list(\n    \"thread_abc123\"\n  );\n\n  console.log(threadMessages.data);\n}\n\nmain();"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"msg_abc123\",\n      \"object\": \"thread.message\",\n      \"created_at\": 1699016383,\n      \"assistant_id\": null,\n      \"thread_id\": \"thread_abc123\",\n      \"run_id\": null,\n      \"role\": \"user\",\n      \"content\": [\n        {\n          \"type\": \"text\",\n          \"text\": {\n            \"value\": \"How does AI work? Explain it in simple terms.\",\n            \"annotations\": []\n          }\n        }\n      ],\n      \"attachments\": [],\n      \"metadata\": {}\n    },\n    {\n      \"id\": \"msg_abc456\",\n      \"object\": \"thread.message\",\n      \"created_at\": 1699016383,\n      \"assistant_id\": null,\n      \"thread_id\": \"thread_abc123\",\n      \"run_id\": null,\n      \"role\": \"user\",\n      \"content\": [\n        {\n          \"type\": \"text\",\n          \"text\": {\n            \"value\": \"Hello, what is AI?\",\n            \"annotations\": []\n          }\n        }\n      ],\n      \"attachments\": [],\n      \"metadata\": {}\n    }\n  ],\n  \"first_id\": \"msg_abc123\",\n  \"last_id\": \"msg_abc456\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createMessage",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Create a message.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the [thread](https://developers.openai.com/api/docs/assistants/migration) to create a message for."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateMessageRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create message",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/messages \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n      \"role\": \"user\",\n      \"content\": \"How does AI work? Explain it in simple terms.\"\n    }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nthread_message = client.beta.threads.messages.create(\n  \"thread_abc123\",\n  role=\"user\",\n  content=\"How does AI work? Explain it in simple terms.\",\n)\nprint(thread_message)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const threadMessages = await openai.beta.threads.messages.create(\n    \"thread_abc123\",\n    { role: \"user\", content: \"How does AI work? Explain it in simple terms.\" }\n  );\n\n  console.log(threadMessages);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"msg_abc123\",\n  \"object\": \"thread.message\",\n  \"created_at\": 1713226573,\n  \"assistant_id\": null,\n  \"thread_id\": \"thread_abc123\",\n  \"run_id\": null,\n  \"role\": \"user\",\n  \"content\": [\n    {\n      \"type\": \"text\",\n      \"text\": {\n        \"value\": \"How does AI work? Explain it in simple terms.\",\n        \"annotations\": []\n      }\n    }\n  ],\n  \"attachments\": [],\n  \"metadata\": {}\n}\n"
+          }
+        }
+      }
+    },
+    "/threads/{thread_id}/messages/{message_id}": {
+      "get": {
+        "operationId": "getMessage",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Retrieve a message.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the [thread](https://developers.openai.com/api/docs/assistants/migration) to which this message belongs."
+          },
+          {
+            "in": "path",
+            "name": "message_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the message to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve message",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/messages/msg_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nmessage = client.beta.threads.messages.retrieve(\n  message_id=\"msg_abc123\",\n  thread_id=\"thread_abc123\",\n)\nprint(message)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const message = await openai.beta.threads.messages.retrieve(\n    \"msg_abc123\",\n    { thread_id: \"thread_abc123\" }\n  );\n\n  console.log(message);\n}\n\nmain();"
+            },
+            "response": "{\n  \"id\": \"msg_abc123\",\n  \"object\": \"thread.message\",\n  \"created_at\": 1699017614,\n  \"assistant_id\": null,\n  \"thread_id\": \"thread_abc123\",\n  \"run_id\": null,\n  \"role\": \"user\",\n  \"content\": [\n    {\n      \"type\": \"text\",\n      \"text\": {\n        \"value\": \"How does AI work? Explain it in simple terms.\",\n        \"annotations\": []\n      }\n    }\n  ],\n  \"attachments\": [],\n  \"metadata\": {}\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "modifyMessage",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Modifies a message.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread to which this message belongs."
+          },
+          {
+            "in": "path",
+            "name": "message_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the message to modify."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ModifyMessageRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MessageObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify message",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/messages/msg_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n      \"metadata\": {\n        \"modified\": \"true\",\n        \"user\": \"abc123\"\n      }\n    }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nmessage = client.beta.threads.messages.update(\n  message_id=\"msg_abc12\",\n  thread_id=\"thread_abc123\",\n  metadata={\n    \"modified\": \"true\",\n    \"user\": \"abc123\",\n  },\n)\nprint(message)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const message = await openai.beta.threads.messages.update(\n    \"thread_abc123\",\n    \"msg_abc123\",\n    {\n      metadata: {\n        modified: \"true\",\n        user: \"abc123\",\n      },\n    }\n  }'"
+            },
+            "response": "{\n  \"id\": \"msg_abc123\",\n  \"object\": \"thread.message\",\n  \"created_at\": 1699017614,\n  \"assistant_id\": null,\n  \"thread_id\": \"thread_abc123\",\n  \"run_id\": null,\n  \"role\": \"user\",\n  \"content\": [\n    {\n      \"type\": \"text\",\n      \"text\": {\n        \"value\": \"How does AI work? Explain it in simple terms.\",\n        \"annotations\": []\n      }\n    }\n  ],\n  \"file_ids\": [],\n  \"metadata\": {\n    \"modified\": \"true\",\n    \"user\": \"abc123\"\n  }\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteMessage",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Deletes a message.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread to which this message belongs."
+          },
+          {
+            "in": "path",
+            "name": "message_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the message to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteMessageResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete message",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/threads/thread_abc123/messages/msg_abc123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ndeleted_message = client.beta.threads.messages.delete(\n  message_id=\"msg_abc12\",\n  thread_id=\"thread_abc123\",\n)\nprint(deleted_message)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const deletedMessage = await openai.beta.threads.messages.delete(\n    \"msg_abc123\",\n    { thread_id: \"thread_abc123\" }\n  );\n\n  console.log(deletedMessage);\n}"
+            },
+            "response": "{\n  \"id\": \"msg_abc123\",\n  \"object\": \"thread.message.deleted\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/threads/{thread_id}/runs": {
+      "get": {
+        "operationId": "listRuns",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Returns a list of runs belonging to a thread.",
+        "parameters": [
+          {
+            "name": "thread_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread the run belongs to."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, starting with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListRunsResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List runs",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/runs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nruns = client.beta.threads.runs.list(\n  \"thread_abc123\"\n)\n\nprint(runs)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const runs = await openai.beta.threads.runs.list(\n    \"thread_abc123\"\n  );\n\n  console.log(runs);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"run_abc123\",\n      \"object\": \"thread.run\",\n      \"created_at\": 1699075072,\n      \"assistant_id\": \"asst_abc123\",\n      \"thread_id\": \"thread_abc123\",\n      \"status\": \"completed\",\n      \"started_at\": 1699075072,\n      \"expires_at\": null,\n      \"cancelled_at\": null,\n      \"failed_at\": null,\n      \"completed_at\": 1699075073,\n      \"last_error\": null,\n      \"model\": \"gpt-5\",\n      \"instructions\": null,\n      \"incomplete_details\": null,\n      \"tools\": [\n        {\n          \"type\": \"code_interpreter\"\n        }\n      ],\n      \"tool_resources\": {\n        \"code_interpreter\": {\n          \"file_ids\": [\n            \"file-abc123\",\n            \"file-abc456\"\n          ]\n        }\n      },\n      \"metadata\": {},\n      \"usage\": {\n        \"prompt_tokens\": 123,\n        \"completion_tokens\": 456,\n        \"total_tokens\": 579\n      },\n      \"temperature\": 1.0,\n      \"top_p\": 1.0,\n      \"max_prompt_tokens\": 1000,\n      \"max_completion_tokens\": 1000,\n      \"truncation_strategy\": {\n        \"type\": \"auto\",\n        \"last_messages\": null\n      },\n      \"response_format\": \"auto\",\n      \"tool_choice\": \"auto\",\n      \"parallel_tool_calls\": true\n    },\n    {\n      \"id\": \"run_abc456\",\n      \"object\": \"thread.run\",\n      \"created_at\": 1699063290,\n      \"assistant_id\": \"asst_abc123\",\n      \"thread_id\": \"thread_abc123\",\n      \"status\": \"completed\",\n      \"started_at\": 1699063290,\n      \"expires_at\": null,\n      \"cancelled_at\": null,\n      \"failed_at\": null,\n      \"completed_at\": 1699063291,\n      \"last_error\": null,\n      \"model\": \"gpt-5\",\n      \"instructions\": null,\n      \"incomplete_details\": null,\n      \"tools\": [\n        {\n          \"type\": \"code_interpreter\"\n        }\n      ],\n      \"tool_resources\": {\n        \"code_interpreter\": {\n          \"file_ids\": [\n            \"file-abc123\",\n            \"file-abc456\"\n          ]\n        }\n      },\n      \"metadata\": {},\n      \"usage\": {\n        \"prompt_tokens\": 123,\n        \"completion_tokens\": 456,\n        \"total_tokens\": 579\n      },\n      \"temperature\": 1.0,\n      \"top_p\": 1.0,\n      \"max_prompt_tokens\": 1000,\n      \"max_completion_tokens\": 1000,\n      \"truncation_strategy\": {\n        \"type\": \"auto\",\n        \"last_messages\": null\n      },\n      \"response_format\": \"auto\",\n      \"tool_choice\": \"auto\",\n      \"parallel_tool_calls\": true\n    }\n  ],\n  \"first_id\": \"run_abc123\",\n  \"last_id\": \"run_abc456\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createRun",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Create a run.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread to run."
+          },
+          {
+            "name": "include[]",
+            "in": "query",
+            "description": "A list of additional fields to include in the response. Currently the only supported value is `step_details.tool_calls[*].file_search.results[*].content` to fetch the file search result content.\n\nSee the [file search tool documentation](https://developers.openai.com/api/docs/guides/tools-file-search#retrieval-customization) for more information.\n",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "step_details.tool_calls[*].file_search.results[*].content"
+                ]
+              }
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateRunRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RunObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create run",
+          "group": "threads",
+          "beta": true,
+          "examples": [
+            {
+              "title": "Default",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads/thread_abc123/runs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"assistant_id\": \"asst_abc123\"\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun = client.beta.threads.runs.create(\n  thread_id=\"thread_abc123\",\n  assistant_id=\"asst_abc123\"\n)\n\nprint(run)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const run = await openai.beta.threads.runs.create(\n    \"thread_abc123\",\n    { assistant_id: \"asst_abc123\" }\n  );\n\n  console.log(run);\n}\n\nmain();\n"
+              },
+              "response": "{\n  \"id\": \"run_abc123\",\n  \"object\": \"thread.run\",\n  \"created_at\": 1699063290,\n  \"assistant_id\": \"asst_abc123\",\n  \"thread_id\": \"thread_abc123\",\n  \"status\": \"queued\",\n  \"started_at\": 1699063290,\n  \"expires_at\": null,\n  \"cancelled_at\": null,\n  \"failed_at\": null,\n  \"completed_at\": 1699063291,\n  \"last_error\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": null,\n  \"incomplete_details\": null,\n  \"tools\": [\n    {\n      \"type\": \"code_interpreter\"\n    }\n  ],\n  \"metadata\": {},\n  \"usage\": null,\n  \"temperature\": 1.0,\n  \"top_p\": 1.0,\n  \"max_prompt_tokens\": 1000,\n  \"max_completion_tokens\": 1000,\n  \"truncation_strategy\": {\n    \"type\": \"auto\",\n    \"last_messages\": null\n  },\n  \"response_format\": \"auto\",\n  \"tool_choice\": \"auto\",\n  \"parallel_tool_calls\": true\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads/thread_123/runs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"assistant_id\": \"asst_123\",\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nstream = client.beta.threads.runs.create(\n  thread_id=\"thread_123\",\n  assistant_id=\"asst_123\",\n  stream=True\n)\n\nfor event in stream:\n  print(event)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const stream = await openai.beta.threads.runs.create(\n    \"thread_123\",\n    { assistant_id: \"asst_123\", stream: true }\n  );\n\n  for await (const event of stream) {\n    console.log(event);\n  }\n}\n\nmain();\n"
+              },
+              "response": "event: thread.run.created\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710330640,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":null,\"expires_at\":1710331240,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.queued\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710330640,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":null,\"expires_at\":1710331240,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.in_progress\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710330640,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"in_progress\",\"started_at\":1710330641,\"expires_at\":1710331240,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.step.created\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710330641,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710331240,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":null}\n\nevent: thread.run.step.in_progress\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710330641,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710331240,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":null}\n\nevent: thread.message.created\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710330641,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"in_progress\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":null,\"role\":\"assistant\",\"content\":[],\"metadata\":{}}\n\nevent: thread.message.in_progress\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710330641,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"in_progress\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":null,\"role\":\"assistant\",\"content\":[],\"metadata\":{}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\"Hello\",\"annotations\":[]}}]}}\n\n...\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\" today\"}}]}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\"?\"}}]}}\n\nevent: thread.message.completed\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710330641,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"completed\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":1710330642,\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":{\"value\":\"Hello! How can I assist you today?\",\"annotations\":[]}}],\"metadata\":{}}\n\nevent: thread.run.step.completed\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710330641,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"completed\",\"cancelled_at\":null,\"completed_at\":1710330642,\"expires_at\":1710331240,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":{\"prompt_tokens\":20,\"completion_tokens\":11,\"total_tokens\":31}}\n\nevent: thread.run.completed\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710330640,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"completed\",\"started_at\":1710330641,\"expires_at\":null,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":1710330642,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":{\"prompt_tokens\":20,\"completion_tokens\":11,\"total_tokens\":31},\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: done\ndata: [DONE]\n"
+            },
+            {
+              "title": "Streaming with Functions",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads/thread_abc123/runs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"assistant_id\": \"asst_abc123\",\n    \"tools\": [\n      {\n        \"type\": \"function\",\n        \"function\": {\n          \"name\": \"get_current_weather\",\n          \"description\": \"Get the current weather in a given location\",\n          \"parameters\": {\n            \"type\": \"object\",\n            \"properties\": {\n              \"location\": {\n                \"type\": \"string\",\n                \"description\": \"The city and state, e.g. San Francisco, CA\"\n              },\n              \"unit\": {\n                \"type\": \"string\",\n                \"enum\": [\"celsius\", \"fahrenheit\"]\n              }\n            },\n            \"required\": [\"location\"]\n          }\n        }\n      }\n    ],\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\ntools = [\n  {\n    \"type\": \"function\",\n    \"function\": {\n      \"name\": \"get_current_weather\",\n      \"description\": \"Get the current weather in a given location\",\n      \"parameters\": {\n        \"type\": \"object\",\n        \"properties\": {\n          \"location\": {\n            \"type\": \"string\",\n            \"description\": \"The city and state, e.g. San Francisco, CA\",\n          },\n          \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]},\n        },\n        \"required\": [\"location\"],\n      },\n    }\n  }\n]\n\nstream = client.beta.threads.runs.create(\n  thread_id=\"thread_abc123\",\n  assistant_id=\"asst_abc123\",\n  tools=tools,\n  stream=True\n)\n\nfor event in stream:\n  print(event)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst tools = [\n    {\n      \"type\": \"function\",\n      \"function\": {\n        \"name\": \"get_current_weather\",\n        \"description\": \"Get the current weather in a given location\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"location\": {\n              \"type\": \"string\",\n              \"description\": \"The city and state, e.g. San Francisco, CA\",\n            },\n            \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]},\n          },\n          \"required\": [\"location\"],\n        },\n      }\n    }\n];\n\nasync function main() {\n  const stream = await openai.beta.threads.runs.create(\n    \"thread_abc123\",\n    {\n      assistant_id: \"asst_abc123\",\n      tools: tools,\n      stream: true\n    }\n  );\n\n  for await (const event of stream) {\n    console.log(event);\n  }\n}\n\nmain();\n"
+              },
+              "response": "event: thread.run.created\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710348075,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":null,\"expires_at\":1710348675,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.queued\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710348075,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":null,\"expires_at\":1710348675,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.in_progress\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710348075,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"in_progress\",\"started_at\":1710348075,\"expires_at\":1710348675,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.step.created\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710348076,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710348675,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":null}\n\nevent: thread.run.step.in_progress\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710348076,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710348675,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":null}\n\nevent: thread.message.created\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710348076,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"in_progress\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":null,\"role\":\"assistant\",\"content\":[],\"metadata\":{}}\n\nevent: thread.message.in_progress\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710348076,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"in_progress\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":null,\"role\":\"assistant\",\"content\":[],\"metadata\":{}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\"Hello\",\"annotations\":[]}}]}}\n\n...\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\" today\"}}]}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\"?\"}}]}}\n\nevent: thread.message.completed\ndata: {\"id\":\"msg_001\",\"object\":\"thread.message\",\"created_at\":1710348076,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"completed\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":1710348077,\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":{\"value\":\"Hello! How can I assist you today?\",\"annotations\":[]}}],\"metadata\":{}}\n\nevent: thread.run.step.completed\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710348076,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"completed\",\"cancelled_at\":null,\"completed_at\":1710348077,\"expires_at\":1710348675,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_001\"}},\"usage\":{\"prompt_tokens\":20,\"completion_tokens\":11,\"total_tokens\":31}}\n\nevent: thread.run.completed\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710348075,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"completed\",\"started_at\":1710348075,\"expires_at\":null,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":1710348077,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":{\"prompt_tokens\":20,\"completion_tokens\":11,\"total_tokens\":31},\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: done\ndata: [DONE]\n"
+            }
+          ]
+        }
+      }
+    },
+    "/threads/{thread_id}/runs/{run_id}": {
+      "get": {
+        "operationId": "getRun",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Retrieves a run.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the [thread](https://developers.openai.com/api/docs/assistants/migration) that was run."
+          },
+          {
+            "in": "path",
+            "name": "run_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RunObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve run",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/runs/run_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun = client.beta.threads.runs.retrieve(\n  thread_id=\"thread_abc123\",\n  run_id=\"run_abc123\"\n)\n\nprint(run)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const run = await openai.beta.threads.runs.retrieve(\n    \"run_abc123\",\n    { thread_id: \"thread_abc123\" }\n  );\n\n  console.log(run);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"run_abc123\",\n  \"object\": \"thread.run\",\n  \"created_at\": 1699075072,\n  \"assistant_id\": \"asst_abc123\",\n  \"thread_id\": \"thread_abc123\",\n  \"status\": \"completed\",\n  \"started_at\": 1699075072,\n  \"expires_at\": null,\n  \"cancelled_at\": null,\n  \"failed_at\": null,\n  \"completed_at\": 1699075073,\n  \"last_error\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": null,\n  \"incomplete_details\": null,\n  \"tools\": [\n    {\n      \"type\": \"code_interpreter\"\n    }\n  ],\n  \"metadata\": {},\n  \"usage\": {\n    \"prompt_tokens\": 123,\n    \"completion_tokens\": 456,\n    \"total_tokens\": 579\n  },\n  \"temperature\": 1.0,\n  \"top_p\": 1.0,\n  \"max_prompt_tokens\": 1000,\n  \"max_completion_tokens\": 1000,\n  \"truncation_strategy\": {\n    \"type\": \"auto\",\n    \"last_messages\": null\n  },\n  \"response_format\": \"auto\",\n  \"tool_choice\": \"auto\",\n  \"parallel_tool_calls\": true\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "modifyRun",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Modifies a run.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the [thread](https://developers.openai.com/api/docs/assistants/migration) that was run."
+          },
+          {
+            "in": "path",
+            "name": "run_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to modify."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ModifyRunRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RunObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify run",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/runs/run_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"metadata\": {\n      \"user_id\": \"user_abc123\"\n    }\n  }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun = client.beta.threads.runs.update(\n  thread_id=\"thread_abc123\",\n  run_id=\"run_abc123\",\n  metadata={\"user_id\": \"user_abc123\"},\n)\n\nprint(run)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const run = await openai.beta.threads.runs.update(\n    \"run_abc123\",\n    {\n      thread_id: \"thread_abc123\",\n      metadata: {\n        user_id: \"user_abc123\",\n      },\n    }\n  );\n\n  console.log(run);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"run_abc123\",\n  \"object\": \"thread.run\",\n  \"created_at\": 1699075072,\n  \"assistant_id\": \"asst_abc123\",\n  \"thread_id\": \"thread_abc123\",\n  \"status\": \"completed\",\n  \"started_at\": 1699075072,\n  \"expires_at\": null,\n  \"cancelled_at\": null,\n  \"failed_at\": null,\n  \"completed_at\": 1699075073,\n  \"last_error\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": null,\n  \"incomplete_details\": null,\n  \"tools\": [\n    {\n      \"type\": \"code_interpreter\"\n    }\n  ],\n  \"tool_resources\": {\n    \"code_interpreter\": {\n      \"file_ids\": [\n        \"file-abc123\",\n        \"file-abc456\"\n      ]\n    }\n  },\n  \"metadata\": {\n    \"user_id\": \"user_abc123\"\n  },\n  \"usage\": {\n    \"prompt_tokens\": 123,\n    \"completion_tokens\": 456,\n    \"total_tokens\": 579\n  },\n  \"temperature\": 1.0,\n  \"top_p\": 1.0,\n  \"max_prompt_tokens\": 1000,\n  \"max_completion_tokens\": 1000,\n  \"truncation_strategy\": {\n    \"type\": \"auto\",\n    \"last_messages\": null\n  },\n  \"response_format\": \"auto\",\n  \"tool_choice\": \"auto\",\n  \"parallel_tool_calls\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/threads/{thread_id}/runs/{run_id}/cancel": {
+      "post": {
+        "operationId": "cancelRun",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Cancels a run that is `in_progress`.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread to which this run belongs."
+          },
+          {
+            "in": "path",
+            "name": "run_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to cancel."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RunObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel a run",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/runs/run_abc123/cancel \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -X POST\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun = client.beta.threads.runs.cancel(\n  thread_id=\"thread_abc123\",\n  run_id=\"run_abc123\"\n)\n\nprint(run)\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const run = await openai.beta.threads.runs.cancel(\n    \"run_abc123\",\n    { thread_id: \"thread_abc123\" }\n  );\n\n  console.log(run);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"run_abc123\",\n  \"object\": \"thread.run\",\n  \"created_at\": 1699076126,\n  \"assistant_id\": \"asst_abc123\",\n  \"thread_id\": \"thread_abc123\",\n  \"status\": \"cancelling\",\n  \"started_at\": 1699076126,\n  \"expires_at\": 1699076726,\n  \"cancelled_at\": null,\n  \"failed_at\": null,\n  \"completed_at\": null,\n  \"last_error\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": \"You summarize books.\",\n  \"tools\": [\n    {\n      \"type\": \"file_search\"\n    }\n  ],\n  \"tool_resources\": {\n    \"file_search\": {\n      \"vector_store_ids\": [\"vs_123\"]\n    }\n  },\n  \"metadata\": {},\n  \"usage\": null,\n  \"temperature\": 1.0,\n  \"top_p\": 1.0,\n  \"response_format\": \"auto\",\n  \"tool_choice\": \"auto\",\n  \"parallel_tool_calls\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/threads/{thread_id}/runs/{run_id}/steps": {
+      "get": {
+        "operationId": "listRunSteps",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Returns a list of run steps belonging to a run.",
+        "parameters": [
+          {
+            "name": "thread_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread the run and run steps belong to."
+          },
+          {
+            "name": "run_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run the run steps belong to."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, starting with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "include[]",
+            "in": "query",
+            "description": "A list of additional fields to include in the response. Currently the only supported value is `step_details.tool_calls[*].file_search.results[*].content` to fetch the file search result content.\n\nSee the [file search tool documentation](https://developers.openai.com/api/docs/guides/tools-file-search#retrieval-customization) for more information.\n",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "step_details.tool_calls[*].file_search.results[*].content"
+                ]
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListRunStepsResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List run steps",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/runs/run_abc123/steps \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun_steps = client.beta.threads.runs.steps.list(\n    thread_id=\"thread_abc123\",\n    run_id=\"run_abc123\"\n)\n\nprint(run_steps)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const runStep = await openai.beta.threads.runs.steps.list(\n    \"run_abc123\",\n    { thread_id: \"thread_abc123\" }\n  );\n  console.log(runStep);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"step_abc123\",\n      \"object\": \"thread.run.step\",\n      \"created_at\": 1699063291,\n      \"run_id\": \"run_abc123\",\n      \"assistant_id\": \"asst_abc123\",\n      \"thread_id\": \"thread_abc123\",\n      \"type\": \"message_creation\",\n      \"status\": \"completed\",\n      \"cancelled_at\": null,\n      \"completed_at\": 1699063291,\n      \"expired_at\": null,\n      \"failed_at\": null,\n      \"last_error\": null,\n      \"step_details\": {\n        \"type\": \"message_creation\",\n        \"message_creation\": {\n          \"message_id\": \"msg_abc123\"\n        }\n      },\n      \"usage\": {\n        \"prompt_tokens\": 123,\n        \"completion_tokens\": 456,\n        \"total_tokens\": 579\n      }\n    }\n  ],\n  \"first_id\": \"step_abc123\",\n  \"last_id\": \"step_abc456\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/threads/{thread_id}/runs/{run_id}/steps/{step_id}": {
+      "get": {
+        "operationId": "getRunStep",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "Retrieves a run step.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the thread to which the run and run step belongs."
+          },
+          {
+            "in": "path",
+            "name": "run_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run to which the run step belongs."
+          },
+          {
+            "in": "path",
+            "name": "step_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run step to retrieve."
+          },
+          {
+            "name": "include[]",
+            "in": "query",
+            "description": "A list of additional fields to include in the response. Currently the only supported value is `step_details.tool_calls[*].file_search.results[*].content` to fetch the file search result content.\n\nSee the [file search tool documentation](https://developers.openai.com/api/docs/guides/tools-file-search#retrieval-customization) for more information.\n",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "step_details.tool_calls[*].file_search.results[*].content"
+                ]
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RunStepObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve run step",
+          "group": "threads",
+          "beta": true,
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/threads/thread_abc123/runs/run_abc123/steps/step_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun_step = client.beta.threads.runs.steps.retrieve(\n    thread_id=\"thread_abc123\",\n    run_id=\"run_abc123\",\n    step_id=\"step_abc123\"\n)\n\nprint(run_step)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const runStep = await openai.beta.threads.runs.steps.retrieve(\n    \"step_abc123\",\n    { thread_id: \"thread_abc123\", run_id: \"run_abc123\" }\n  );\n  console.log(runStep);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"step_abc123\",\n  \"object\": \"thread.run.step\",\n  \"created_at\": 1699063291,\n  \"run_id\": \"run_abc123\",\n  \"assistant_id\": \"asst_abc123\",\n  \"thread_id\": \"thread_abc123\",\n  \"type\": \"message_creation\",\n  \"status\": \"completed\",\n  \"cancelled_at\": null,\n  \"completed_at\": 1699063291,\n  \"expired_at\": null,\n  \"failed_at\": null,\n  \"last_error\": null,\n  \"step_details\": {\n    \"type\": \"message_creation\",\n    \"message_creation\": {\n      \"message_id\": \"msg_abc123\"\n    }\n  },\n  \"usage\": {\n    \"prompt_tokens\": 123,\n    \"completion_tokens\": 456,\n    \"total_tokens\": 579\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/threads/{thread_id}/runs/{run_id}/submit_tool_outputs": {
+      "post": {
+        "operationId": "submitToolOuputsToRun",
+        "tags": [
+          "Assistants"
+        ],
+        "summary": "When a run has the `status: \"requires_action\"` and `required_action.type` is `submit_tool_outputs`, this endpoint can be used to submit the outputs from the tool calls once they're all completed. All outputs must be submitted in a single request.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "thread_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the [thread](https://developers.openai.com/api/docs/assistants/migration) to which this run belongs."
+          },
+          {
+            "in": "path",
+            "name": "run_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the run that requires the tool output submission."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/SubmitToolOutputsRunRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RunObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Submit tool outputs to run",
+          "group": "threads",
+          "beta": true,
+          "examples": [
+            {
+              "title": "Default",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads/thread_123/runs/run_123/submit_tool_outputs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"tool_outputs\": [\n      {\n        \"tool_call_id\": \"call_001\",\n        \"output\": \"70 degrees and sunny.\"\n      }\n    ]\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nrun = client.beta.threads.runs.submit_tool_outputs(\n  thread_id=\"thread_123\",\n  run_id=\"run_123\",\n  tool_outputs=[\n    {\n      \"tool_call_id\": \"call_001\",\n      \"output\": \"70 degrees and sunny.\"\n    }\n  ]\n)\n\nprint(run)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const run = await openai.beta.threads.runs.submitToolOutputs(\n    \"run_123\",\n    {\n      thread_id: \"thread_123\",\n      tool_outputs: [\n        {\n          tool_call_id: \"call_001\",\n          output: \"70 degrees and sunny.\",\n        },\n      ],\n    }\n  );\n\n  console.log(run);\n}\n\nmain();\n"
+              },
+              "response": "{\n  \"id\": \"run_123\",\n  \"object\": \"thread.run\",\n  \"created_at\": 1699075592,\n  \"assistant_id\": \"asst_123\",\n  \"thread_id\": \"thread_123\",\n  \"status\": \"queued\",\n  \"started_at\": 1699075592,\n  \"expires_at\": 1699076192,\n  \"cancelled_at\": null,\n  \"failed_at\": null,\n  \"completed_at\": null,\n  \"last_error\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": null,\n  \"tools\": [\n    {\n      \"type\": \"function\",\n      \"function\": {\n        \"name\": \"get_current_weather\",\n        \"description\": \"Get the current weather in a given location\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"location\": {\n              \"type\": \"string\",\n              \"description\": \"The city and state, e.g. San Francisco, CA\"\n            },\n            \"unit\": {\n              \"type\": \"string\",\n              \"enum\": [\"celsius\", \"fahrenheit\"]\n            }\n          },\n          \"required\": [\"location\"]\n        }\n      }\n    }\n  ],\n  \"metadata\": {},\n  \"usage\": null,\n  \"temperature\": 1.0,\n  \"top_p\": 1.0,\n  \"max_prompt_tokens\": 1000,\n  \"max_completion_tokens\": 1000,\n  \"truncation_strategy\": {\n    \"type\": \"auto\",\n    \"last_messages\": null\n  },\n  \"response_format\": \"auto\",\n  \"tool_choice\": \"auto\",\n  \"parallel_tool_calls\": true\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/threads/thread_123/runs/run_123/submit_tool_outputs \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"tool_outputs\": [\n      {\n        \"tool_call_id\": \"call_001\",\n        \"output\": \"70 degrees and sunny.\"\n      }\n    ],\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nstream = client.beta.threads.runs.submit_tool_outputs(\n  thread_id=\"thread_123\",\n  run_id=\"run_123\",\n  tool_outputs=[\n    {\n      \"tool_call_id\": \"call_001\",\n      \"output\": \"70 degrees and sunny.\"\n    }\n  ],\n  stream=True\n)\n\nfor event in stream:\n  print(event)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nasync function main() {\n  const stream = await openai.beta.threads.runs.submitToolOutputs(\n    \"run_123\",\n    {\n      thread_id: \"thread_123\",\n      tool_outputs: [\n        {\n          tool_call_id: \"call_001\",\n          output: \"70 degrees and sunny.\",\n        },\n      ],\n    }\n  );\n\n  for await (const event of stream) {\n    console.log(event);\n  }\n}\n\nmain();\n"
+              },
+              "response": "event: thread.run.step.completed\ndata: {\"id\":\"step_001\",\"object\":\"thread.run.step\",\"created_at\":1710352449,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"tool_calls\",\"status\":\"completed\",\"cancelled_at\":null,\"completed_at\":1710352475,\"expires_at\":1710353047,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"tool_calls\",\"tool_calls\":[{\"id\":\"call_iWr0kQ2EaYMaxNdl0v3KYkx7\",\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"arguments\":\"{\\\"location\\\":\\\"San Francisco, CA\\\",\\\"unit\\\":\\\"fahrenheit\\\"}\",\"output\":\"70 degrees and sunny.\"}}]},\"usage\":{\"prompt_tokens\":291,\"completion_tokens\":24,\"total_tokens\":315}}\n\nevent: thread.run.queued\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710352447,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"queued\",\"started_at\":1710352448,\"expires_at\":1710353047,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"description\":\"Get the current weather in a given location\",\"parameters\":{\"type\":\"object\",\"properties\":{\"location\":{\"type\":\"string\",\"description\":\"The city and state, e.g. San Francisco, CA\"},\"unit\":{\"type\":\"string\",\"enum\":[\"celsius\",\"fahrenheit\"]}},\"required\":[\"location\"]}}}],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.in_progress\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710352447,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"in_progress\",\"started_at\":1710352475,\"expires_at\":1710353047,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":null,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"description\":\"Get the current weather in a given location\",\"parameters\":{\"type\":\"object\",\"properties\":{\"location\":{\"type\":\"string\",\"description\":\"The city and state, e.g. San Francisco, CA\"},\"unit\":{\"type\":\"string\",\"enum\":[\"celsius\",\"fahrenheit\"]}},\"required\":[\"location\"]}}}],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":null,\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: thread.run.step.created\ndata: {\"id\":\"step_002\",\"object\":\"thread.run.step\",\"created_at\":1710352476,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710353047,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_002\"}},\"usage\":null}\n\nevent: thread.run.step.in_progress\ndata: {\"id\":\"step_002\",\"object\":\"thread.run.step\",\"created_at\":1710352476,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"in_progress\",\"cancelled_at\":null,\"completed_at\":null,\"expires_at\":1710353047,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_002\"}},\"usage\":null}\n\nevent: thread.message.created\ndata: {\"id\":\"msg_002\",\"object\":\"thread.message\",\"created_at\":1710352476,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"in_progress\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":null,\"role\":\"assistant\",\"content\":[],\"metadata\":{}}\n\nevent: thread.message.in_progress\ndata: {\"id\":\"msg_002\",\"object\":\"thread.message\",\"created_at\":1710352476,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"in_progress\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":null,\"role\":\"assistant\",\"content\":[],\"metadata\":{}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_002\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\"The\",\"annotations\":[]}}]}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_002\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\" current\"}}]}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_002\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\" weather\"}}]}}\n\n...\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_002\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\" sunny\"}}]}}\n\nevent: thread.message.delta\ndata: {\"id\":\"msg_002\",\"object\":\"thread.message.delta\",\"delta\":{\"content\":[{\"index\":0,\"type\":\"text\",\"text\":{\"value\":\".\"}}]}}\n\nevent: thread.message.completed\ndata: {\"id\":\"msg_002\",\"object\":\"thread.message\",\"created_at\":1710352476,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"run_id\":\"run_123\",\"status\":\"completed\",\"incomplete_details\":null,\"incomplete_at\":null,\"completed_at\":1710352477,\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":{\"value\":\"The current weather in San Francisco, CA is 70 degrees Fahrenheit and sunny.\",\"annotations\":[]}}],\"metadata\":{}}\n\nevent: thread.run.step.completed\ndata: {\"id\":\"step_002\",\"object\":\"thread.run.step\",\"created_at\":1710352476,\"run_id\":\"run_123\",\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"type\":\"message_creation\",\"status\":\"completed\",\"cancelled_at\":null,\"completed_at\":1710352477,\"expires_at\":1710353047,\"failed_at\":null,\"last_error\":null,\"step_details\":{\"type\":\"message_creation\",\"message_creation\":{\"message_id\":\"msg_002\"}},\"usage\":{\"prompt_tokens\":329,\"completion_tokens\":18,\"total_tokens\":347}}\n\nevent: thread.run.completed\ndata: {\"id\":\"run_123\",\"object\":\"thread.run\",\"created_at\":1710352447,\"assistant_id\":\"asst_123\",\"thread_id\":\"thread_123\",\"status\":\"completed\",\"started_at\":1710352475,\"expires_at\":null,\"cancelled_at\":null,\"failed_at\":null,\"completed_at\":1710352477,\"required_action\":null,\"last_error\":null,\"model\":\"gpt-5\",\"instructions\":null,\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_current_weather\",\"description\":\"Get the current weather in a given location\",\"parameters\":{\"type\":\"object\",\"properties\":{\"location\":{\"type\":\"string\",\"description\":\"The city and state, e.g. San Francisco, CA\"},\"unit\":{\"type\":\"string\",\"enum\":[\"celsius\",\"fahrenheit\"]}},\"required\":[\"location\"]}}}],\"metadata\":{},\"temperature\":1.0,\"top_p\":1.0,\"max_completion_tokens\":null,\"max_prompt_tokens\":null,\"truncation_strategy\":{\"type\":\"auto\",\"last_messages\":null},\"incomplete_details\":null,\"usage\":{\"prompt_tokens\":20,\"completion_tokens\":11,\"total_tokens\":31},\"response_format\":\"auto\",\"tool_choice\":\"auto\",\"parallel_tool_calls\":true}}\n\nevent: done\ndata: [DONE]\n"
+            }
+          ]
+        }
+      }
+    },
+    "/uploads": {
+      "post": {
+        "operationId": "createUpload",
+        "tags": [
+          "Uploads"
+        ],
+        "summary": "Creates an intermediate [Upload](https://developers.openai.com/api/reference/resources/uploads) object\nthat you can add [Parts](https://developers.openai.com/api/reference/resources/uploads/subresources/parts) to.\nCurrently, an Upload can accept at most 8 GB in total and expires after an\nhour after you create it.\n\nOnce you complete the Upload, we will create a\n[File](https://developers.openai.com/api/reference/resources/files) object that contains all the parts\nyou uploaded. This File is usable in the rest of our platform as a regular\nFile object.\n\nFor certain `purpose` values, the correct `mime_type` must be specified.\nPlease refer to documentation for the\n[supported MIME types for your use case](https://developers.openai.com/api/docs/guides/tools-file-search#supported-files).\n\nFor guidance on the proper filename extensions for each purpose, please\nfollow the documentation on [creating a\nFile](https://developers.openai.com/api/reference/resources/files/methods/create).\n\nReturns the Upload object with status `pending`.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateUploadRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Upload"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create upload",
+          "group": "uploads",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/uploads \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"purpose\": \"fine-tune\",\n    \"filename\": \"training_examples.jsonl\",\n    \"bytes\": 2147483648,\n    \"mime_type\": \"text/jsonl\",\n    \"expires_after\": {\n      \"anchor\": \"created_at\",\n      \"seconds\": 3600\n    }\n  }'\n"
+            },
+            "response": "{\n  \"id\": \"upload_abc123\",\n  \"object\": \"upload\",\n  \"bytes\": 2147483648,\n  \"created_at\": 1719184911,\n  \"filename\": \"training_examples.jsonl\",\n  \"purpose\": \"fine-tune\",\n  \"status\": \"pending\",\n  \"expires_at\": 1719127296\n}\n"
+          }
+        }
+      }
+    },
+    "/uploads/{upload_id}/cancel": {
+      "post": {
+        "operationId": "cancelUpload",
+        "tags": [
+          "Uploads"
+        ],
+        "summary": "Cancels the Upload. No Parts may be added after an Upload is cancelled.\n\nReturns the Upload object with status `cancelled`.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "upload_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "upload_abc123"
+            },
+            "description": "The ID of the Upload.\n"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Upload"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel upload",
+          "group": "uploads",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/uploads/upload_abc123/cancel\n"
+            },
+            "response": "{\n  \"id\": \"upload_abc123\",\n  \"object\": \"upload\",\n  \"bytes\": 2147483648,\n  \"created_at\": 1719184911,\n  \"filename\": \"training_examples.jsonl\",\n  \"purpose\": \"fine-tune\",\n  \"status\": \"cancelled\",\n  \"expires_at\": 1719127296\n}\n"
+          }
+        }
+      }
+    },
+    "/uploads/{upload_id}/complete": {
+      "post": {
+        "operationId": "completeUpload",
+        "tags": [
+          "Uploads"
+        ],
+        "summary": "Completes the [Upload](https://developers.openai.com/api/reference/resources/uploads).\n\nWithin the returned Upload object, there is a nested [File](https://developers.openai.com/api/reference/resources/files) object that is ready to use in the rest of the platform.\n\nYou can specify the order of the Parts by passing in an ordered list of the Part IDs.\n\nThe number of bytes uploaded upon completion must match the number of bytes initially specified when creating the Upload object. No Parts may be added after an Upload is completed.\nReturns the Upload object with status `completed`, including an additional `file` property containing the created usable File object.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "upload_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "upload_abc123"
+            },
+            "description": "The ID of the Upload.\n"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CompleteUploadRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Upload"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Complete upload",
+          "group": "uploads",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/uploads/upload_abc123/complete\n  -d '{\n    \"part_ids\": [\"part_def456\", \"part_ghi789\"]\n  }'\n"
+            },
+            "response": "{\n  \"id\": \"upload_abc123\",\n  \"object\": \"upload\",\n  \"bytes\": 2147483648,\n  \"created_at\": 1719184911,\n  \"filename\": \"training_examples.jsonl\",\n  \"purpose\": \"fine-tune\",\n  \"status\": \"completed\",\n  \"expires_at\": 1719127296,\n  \"file\": {\n    \"id\": \"file-xyz321\",\n    \"object\": \"file\",\n    \"bytes\": 2147483648,\n    \"created_at\": 1719186911,\n    \"expires_at\": 1719127296,\n    \"filename\": \"training_examples.jsonl\",\n    \"purpose\": \"fine-tune\",\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/uploads/{upload_id}/parts": {
+      "post": {
+        "operationId": "addUploadPart",
+        "tags": [
+          "Uploads"
+        ],
+        "summary": "Adds a [Part](https://developers.openai.com/api/reference/resources/uploads/subresources/parts) to an [Upload](https://developers.openai.com/api/reference/resources/uploads) object. A Part represents a chunk of bytes from the file you are trying to upload.\n\nEach Part can be at most 64 MB, and you can add Parts until you hit the Upload maximum of 8 GB.\n\nIt is possible to add multiple Parts in parallel. You can decide the intended order of the Parts when you [complete the Upload](https://developers.openai.com/api/reference/resources/uploads/methods/complete).\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "upload_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "upload_abc123"
+            },
+            "description": "The ID of the Upload.\n"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/AddUploadPartRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UploadPart"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Add upload part",
+          "group": "uploads",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/uploads/upload_abc123/parts\n  -F data=\"aHR0cHM6Ly9hcGkub3BlbmFpLmNvbS92MS91cGxvYWRz...\"\n"
+            },
+            "response": "{\n  \"id\": \"part_def456\",\n  \"object\": \"upload.part\",\n  \"created_at\": 1719185911,\n  \"upload_id\": \"upload_abc123\"\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores": {
+      "get": {
+        "operationId": "listVectorStores",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Returns a list of vector stores.",
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, starting with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListVectorStoresResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List vector stores",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_stores = client.vector_stores.list()\nprint(vector_stores)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const vectorStores = await openai.vectorStores.list();\n  console.log(vectorStores);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"vs_abc123\",\n      \"object\": \"vector_store\",\n      \"created_at\": 1699061776,\n      \"name\": \"Support FAQ\",\n      \"description\": \"Contains commonly asked questions and answers, organized by topic.\",\n      \"bytes\": 139920,\n      \"file_counts\": {\n        \"in_progress\": 0,\n        \"completed\": 3,\n        \"failed\": 0,\n        \"cancelled\": 0,\n        \"total\": 3\n      }\n    },\n    {\n      \"id\": \"vs_abc456\",\n      \"object\": \"vector_store\",\n      \"created_at\": 1699061776,\n      \"name\": \"Support FAQ v2\",\n      \"description\": null,\n      \"bytes\": 139920,\n      \"file_counts\": {\n        \"in_progress\": 0,\n        \"completed\": 3,\n        \"failed\": 0,\n        \"cancelled\": 0,\n        \"total\": 3\n      }\n    }\n  ],\n  \"first_id\": \"vs_abc123\",\n  \"last_id\": \"vs_abc456\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createVectorStore",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Create a vector store.",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVectorStoreRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create vector store",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -d '{\n    \"name\": \"Support FAQ\"\n  }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store = client.vector_stores.create(\n  name=\"Support FAQ\"\n)\nprint(vector_store)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const vectorStore = await openai.vectorStores.create({\n    name: \"Support FAQ\"\n  });\n  console.log(vectorStore);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"vs_abc123\",\n  \"object\": \"vector_store\",\n  \"created_at\": 1699061776,\n  \"name\": \"Support FAQ\",\n  \"description\": \"Contains commonly asked questions and answers, organized by topic.\",\n  \"bytes\": 139920,\n  \"file_counts\": {\n    \"in_progress\": 0,\n    \"completed\": 3,\n    \"failed\": 0,\n    \"cancelled\": 0,\n    \"total\": 3\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}": {
+      "get": {
+        "operationId": "getVectorStore",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Retrieves a vector store.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the vector store to retrieve."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve vector store",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store = client.vector_stores.retrieve(\n  vector_store_id=\"vs_abc123\"\n)\nprint(vector_store)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const vectorStore = await openai.vectorStores.retrieve(\n    \"vs_abc123\"\n  );\n  console.log(vectorStore);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"vs_abc123\",\n  \"object\": \"vector_store\",\n  \"created_at\": 1699061776\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "modifyVectorStore",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Modifies a vector store.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the vector store to modify."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateVectorStoreRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Modify vector store",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n  -d '{\n    \"name\": \"Support FAQ\"\n  }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store = client.vector_stores.update(\n  vector_store_id=\"vs_abc123\",\n  name=\"Support FAQ\"\n)\nprint(vector_store)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const vectorStore = await openai.vectorStores.update(\n    \"vs_abc123\",\n    {\n      name: \"Support FAQ\"\n    }\n  );\n  console.log(vectorStore);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"vs_abc123\",\n  \"object\": \"vector_store\",\n  \"created_at\": 1699061776,\n  \"name\": \"Support FAQ\",\n  \"description\": \"Contains commonly asked questions and answers, organized by topic.\",\n  \"bytes\": 139920,\n  \"file_counts\": {\n    \"in_progress\": 0,\n    \"completed\": 3,\n    \"failed\": 0,\n    \"cancelled\": 0,\n    \"total\": 3\n  }\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteVectorStore",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Delete a vector store.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the vector store to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteVectorStoreResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete vector store",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -X DELETE\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ndeleted_vector_store = client.vector_stores.delete(\n  vector_store_id=\"vs_abc123\"\n)\nprint(deleted_vector_store)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const deletedVectorStore = await openai.vectorStores.delete(\n    \"vs_abc123\"\n  );\n  console.log(deletedVectorStore);\n}\n\nmain();\n"
+            },
+            "response": "{\n  id: \"vs_abc123\",\n  object: \"vector_store.deleted\",\n  deleted: true\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}/file_batches": {
+      "post": {
+        "operationId": "createVectorStoreFileBatch",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Create a vector store file batch.",
+        "description": "The maximum number of files in a single batch request is 2000.\nVector store file attach requests are rate limited per vector store (300 requests per minute across both this endpoint and `/vector_stores/{vector_store_id}/files`).\nFor ingesting multiple files into the same vector store, this batch endpoint is recommended.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "vs_abc123"
+            },
+            "description": "The ID of the vector store for which to create a File Batch.\n"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVectorStoreFileBatchRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreFileBatchObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create vector store file batch",
+          "group": "vector_stores",
+          "description": "Attaches multiple files to a vector store in one request. This is the recommended approach for multi-file ingestion, especially because per-vector-store file attach writes are rate-limited (300 requests/minute shared with `/vector_stores/{vector_store_id}/files`).\n",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123/file_batches \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n    -H \"Content-Type: application/json \\\n    -H \"OpenAI-Beta: assistants=v2\" \\\n    -d '{\n      \"files\": [\n        {\n          \"file_id\": \"file-abc123\",\n          \"attributes\": {\"category\": \"finance\"}\n        },\n        {\n          \"file_id\": \"file-abc456\",\n          \"chunking_strategy\": {\n            \"type\": \"static\",\n            \"max_chunk_size_tokens\": 1200,\n            \"chunk_overlap_tokens\": 200\n          }\n        }\n      ]\n    }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store_file_batch = client.vector_stores.file_batches.create(\n  vector_store_id=\"vs_abc123\",\n  files=[\n    {\n      \"file_id\": \"file-abc123\",\n      \"attributes\": {\"category\": \"finance\"},\n    },\n    {\n      \"file_id\": \"file-abc456\",\n      \"chunking_strategy\": {\n        \"type\": \"static\",\n        \"max_chunk_size_tokens\": 1200,\n        \"chunk_overlap_tokens\": 200,\n      },\n    },\n  ],\n)\nprint(vector_store_file_batch)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const myVectorStoreFileBatch = await openai.vectorStores.fileBatches.create(\n    \"vs_abc123\",\n    {\n      files: [\n        {\n          file_id: \"file-abc123\",\n          attributes: { category: \"finance\" },\n        },\n        {\n          file_id: \"file-abc456\",\n          chunking_strategy: {\n            type: \"static\",\n            max_chunk_size_tokens: 1200,\n            chunk_overlap_tokens: 200,\n          },\n        },\n      ]\n    }\n  );\n  console.log(myVectorStoreFileBatch);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"vsfb_abc123\",\n  \"object\": \"vector_store.file_batch\",\n  \"created_at\": 1699061776,\n  \"vector_store_id\": \"vs_abc123\",\n  \"status\": \"in_progress\",\n  \"file_counts\": {\n    \"in_progress\": 1,\n    \"completed\": 1,\n    \"failed\": 0,\n    \"cancelled\": 0,\n    \"total\": 0,\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}/file_batches/{batch_id}": {
+      "get": {
+        "operationId": "getVectorStoreFileBatch",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Retrieves a vector store file batch.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "vs_abc123"
+            },
+            "description": "The ID of the vector store that the file batch belongs to."
+          },
+          {
+            "in": "path",
+            "name": "batch_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "vsfb_abc123"
+            },
+            "description": "The ID of the file batch being retrieved."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreFileBatchObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve vector store file batch",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123/file_batches/vsfb_abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store_file_batch = client.vector_stores.file_batches.retrieve(\n  vector_store_id=\"vs_abc123\",\n  batch_id=\"vsfb_abc123\"\n)\nprint(vector_store_file_batch)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const vectorStoreFileBatch = await openai.vectorStores.fileBatches.retrieve(\n    \"vsfb_abc123\",\n    { vector_store_id: \"vs_abc123\" }\n  );\n  console.log(vectorStoreFileBatch);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"vsfb_abc123\",\n  \"object\": \"vector_store.file_batch\",\n  \"created_at\": 1699061776,\n  \"vector_store_id\": \"vs_abc123\",\n  \"status\": \"in_progress\",\n  \"file_counts\": {\n    \"in_progress\": 1,\n    \"completed\": 1,\n    \"failed\": 0,\n    \"cancelled\": 0,\n    \"total\": 0,\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}/file_batches/{batch_id}/cancel": {
+      "post": {
+        "operationId": "cancelVectorStoreFileBatch",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Cancel a vector store file batch. This attempts to cancel the processing of files in this batch as soon as possible.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the vector store that the file batch belongs to."
+          },
+          {
+            "in": "path",
+            "name": "batch_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the file batch to cancel."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreFileBatchObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel vector store file batch",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123/files_batches/vsfb_abc123/cancel \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -X POST\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ndeleted_vector_store_file_batch = client.vector_stores.file_batches.cancel(\n    vector_store_id=\"vs_abc123\",\n    file_batch_id=\"vsfb_abc123\"\n)\nprint(deleted_vector_store_file_batch)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const deletedVectorStoreFileBatch = await openai.vectorStores.fileBatches.cancel(\n    \"vsfb_abc123\",\n    { vector_store_id: \"vs_abc123\" }\n  );\n  console.log(deletedVectorStoreFileBatch);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"vsfb_abc123\",\n  \"object\": \"vector_store.file_batch\",\n  \"created_at\": 1699061776,\n  \"vector_store_id\": \"vs_abc123\",\n  \"status\": \"in_progress\",\n  \"file_counts\": {\n    \"in_progress\": 12,\n    \"completed\": 3,\n    \"failed\": 0,\n    \"cancelled\": 0,\n    \"total\": 15,\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}/file_batches/{batch_id}/files": {
+      "get": {
+        "operationId": "listFilesInVectorStoreBatch",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Returns a list of vector store files in a batch.",
+        "parameters": [
+          {
+            "name": "vector_store_id",
+            "in": "path",
+            "description": "The ID of the vector store that the files belong to.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "batch_id",
+            "in": "path",
+            "description": "The ID of the file batch that the files belong to.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, starting with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "filter",
+            "in": "query",
+            "description": "Filter by file status. One of `in_progress`, `completed`, `failed`, `cancelled`.",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "in_progress",
+                "completed",
+                "failed",
+                "cancelled"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListVectorStoreFilesResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List vector store files in a batch",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123/files_batches/vsfb_abc123/files \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store_files = client.vector_stores.file_batches.list_files(\n  vector_store_id=\"vs_abc123\",\n  batch_id=\"vsfb_abc123\"\n)\nprint(vector_store_files)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const vectorStoreFiles = await openai.vectorStores.fileBatches.listFiles(\n    \"vsfb_abc123\",\n    { vector_store_id: \"vs_abc123\" }\n  );\n  console.log(vectorStoreFiles);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"file-abc123\",\n      \"object\": \"vector_store.file\",\n      \"created_at\": 1699061776,\n      \"vector_store_id\": \"vs_abc123\"\n    },\n    {\n      \"id\": \"file-abc456\",\n      \"object\": \"vector_store.file\",\n      \"created_at\": 1699061776,\n      \"vector_store_id\": \"vs_abc123\"\n    }\n  ],\n  \"first_id\": \"file-abc123\",\n  \"last_id\": \"file-abc456\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}/files": {
+      "get": {
+        "operationId": "listVectorStoreFiles",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Returns a list of vector store files.",
+        "parameters": [
+          {
+            "name": "vector_store_id",
+            "in": "path",
+            "description": "The ID of the vector store that the files belong to.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order by the `created_at` timestamp of the objects. `asc` for ascending order and `desc` for descending order.\n",
+            "schema": {
+              "type": "string",
+              "default": "desc",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "A cursor for use in pagination. `after` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "A cursor for use in pagination. `before` is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, starting with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list.\n",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "filter",
+            "in": "query",
+            "description": "Filter by file status. One of `in_progress`, `completed`, `failed`, `cancelled`.",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "in_progress",
+                "completed",
+                "failed",
+                "cancelled"
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ListVectorStoreFilesResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List vector store files",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123/files \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store_files = client.vector_stores.files.list(\n  vector_store_id=\"vs_abc123\"\n)\nprint(vector_store_files)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const vectorStoreFiles = await openai.vectorStores.files.list(\n    \"vs_abc123\"\n  );\n  console.log(vectorStoreFiles);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"file-abc123\",\n      \"object\": \"vector_store.file\",\n      \"created_at\": 1699061776,\n      \"vector_store_id\": \"vs_abc123\"\n    },\n    {\n      \"id\": \"file-abc456\",\n      \"object\": \"vector_store.file\",\n      \"created_at\": 1699061776,\n      \"vector_store_id\": \"vs_abc123\"\n    }\n  ],\n  \"first_id\": \"file-abc123\",\n  \"last_id\": \"file-abc456\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "createVectorStoreFile",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Create a vector store file by attaching a [File](https://developers.openai.com/api/reference/resources/files) to a [vector store](https://developers.openai.com/api/reference/resources/vector_stores).",
+        "description": "This endpoint is subject to a per-vector-store write rate limit of 300 requests per minute, shared with `/vector_stores/{vector_store_id}/file_batches`.\nFor uploading multiple files to the same vector store, use the file batches endpoint to reduce request volume.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "vs_abc123"
+            },
+            "description": "The ID of the vector store for which to create a File.\n"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVectorStoreFileRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreFileObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create vector store file",
+          "group": "vector_stores",
+          "description": "Attaches one file to a vector store. File attach writes are rate-limited per vector store (300 requests/minute shared with `/vector_stores/{vector_store_id}/file_batches`), so use file batches when uploading multiple files.\n",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123/files \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n    -H \"Content-Type: application/json\" \\\n    -H \"OpenAI-Beta: assistants=v2\" \\\n    -d '{\n      \"file_id\": \"file-abc123\"\n    }'\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store_file = client.vector_stores.files.create(\n  vector_store_id=\"vs_abc123\",\n  file_id=\"file-abc123\"\n)\nprint(vector_store_file)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const myVectorStoreFile = await openai.vectorStores.files.create(\n    \"vs_abc123\",\n    {\n      file_id: \"file-abc123\"\n    }\n  );\n  console.log(myVectorStoreFile);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"vector_store.file\",\n  \"created_at\": 1699061776,\n  \"usage_bytes\": 1234,\n  \"vector_store_id\": \"vs_abcd\",\n  \"status\": \"completed\",\n  \"last_error\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}/files/{file_id}": {
+      "get": {
+        "operationId": "getVectorStoreFile",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Retrieves a vector store file.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "vs_abc123"
+            },
+            "description": "The ID of the vector store that the file belongs to."
+          },
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "file-abc123"
+            },
+            "description": "The ID of the file being retrieved."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreFileObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve vector store file",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123/files/file-abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\"\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nvector_store_file = client.vector_stores.files.retrieve(\n  vector_store_id=\"vs_abc123\",\n  file_id=\"file-abc123\"\n)\nprint(vector_store_file)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const vectorStoreFile = await openai.vectorStores.files.retrieve(\n    \"file-abc123\",\n    { vector_store_id: \"vs_abc123\" }\n  );\n  console.log(vectorStoreFile);\n}\n\nmain();\n"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"vector_store.file\",\n  \"created_at\": 1699061776,\n  \"vector_store_id\": \"vs_abcd\",\n  \"status\": \"completed\",\n  \"last_error\": null\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "deleteVectorStoreFile",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Delete a vector store file. This will remove the file from the vector store but the file itself will not be deleted. To delete the file, use the [delete file](https://developers.openai.com/api/reference/resources/files/methods/delete) endpoint.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the vector store that the file belongs to."
+          },
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the file to delete."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeleteVectorStoreFileResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete vector store file",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/vs_abc123/files/file-abc123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -H \"OpenAI-Beta: assistants=v2\" \\\n  -X DELETE\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ndeleted_vector_store_file = client.vector_stores.files.delete(\n    vector_store_id=\"vs_abc123\",\n    file_id=\"file-abc123\"\n)\nprint(deleted_vector_store_file)\n",
+              "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nasync function main() {\n  const deletedVectorStoreFile = await openai.vectorStores.files.delete(\n    \"file-abc123\",\n    { vector_store_id: \"vs_abc123\" }\n  );\n  console.log(deletedVectorStoreFile);\n}\n\nmain();\n"
+            },
+            "response": "{\n  id: \"file-abc123\",\n  object: \"vector_store.file.deleted\",\n  deleted: true\n}\n"
+          }
+        }
+      },
+      "post": {
+        "operationId": "updateVectorStoreFileAttributes",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Update attributes on a vector store file.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "vs_abc123"
+            },
+            "description": "The ID of the vector store the file belongs to."
+          },
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "file-abc123"
+            },
+            "description": "The ID of the file to update attributes."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateVectorStoreFileAttributesRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreFileObject"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update vector store file attributes",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/vector_stores/{vector_store_id}/files/{file_id} \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\"attributes\": {\"key1\": \"value1\", \"key2\": 2}}'\n"
+            },
+            "response": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"vector_store.file\",\n  \"usage_bytes\": 1234,\n  \"created_at\": 1699061776,\n  \"vector_store_id\": \"vs_abcd\",\n  \"status\": \"completed\",\n  \"last_error\": null,\n  \"chunking_strategy\": {...},\n  \"attributes\": {\"key1\": \"value1\", \"key2\": 2}\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}/files/{file_id}/content": {
+      "get": {
+        "operationId": "retrieveVectorStoreFileContent",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Retrieve the parsed contents of a vector store file.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "vs_abc123"
+            },
+            "description": "The ID of the vector store."
+          },
+          {
+            "in": "path",
+            "name": "file_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "file-abc123"
+            },
+            "description": "The ID of the file within the vector store."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreFileContentResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve vector store file content",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl \\\nhttps://api.openai.com/v1/vector_stores/vs_abc123/files/file-abc123/content \\\n-H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n  \"file_id\": \"file-abc123\",\n  \"filename\": \"example.txt\",\n  \"attributes\": {\"key\": \"value\"},\n  \"content\": [\n    {\"type\": \"text\", \"text\": \"...\"},\n    ...\n  ]\n}\n"
+          }
+        }
+      }
+    },
+    "/vector_stores/{vector_store_id}/search": {
+      "post": {
+        "operationId": "searchVectorStore",
+        "tags": [
+          "Vector stores"
+        ],
+        "summary": "Search a vector store for relevant chunks based on a query and file attributes filter.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "vector_store_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "vs_abc123"
+            },
+            "description": "The ID of the vector store to search."
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/VectorStoreSearchRequest"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VectorStoreSearchResultsPage"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Search vector store",
+          "group": "vector_stores",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST \\\nhttps://api.openai.com/v1/vector_stores/vs_abc123/search \\\n-H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n-H \"Content-Type: application/json\" \\\n-d '{\"query\": \"What is the return policy?\", \"filters\": {...}}'\n"
+            },
+            "response": "{\n  \"object\": \"vector_store.search_results.page\",\n  \"search_query\": \"What is the return policy?\",\n  \"data\": [\n    {\n      \"file_id\": \"file_123\",\n      \"filename\": \"document.pdf\",\n      \"score\": 0.95,\n      \"attributes\": {\n        \"author\": \"John Doe\",\n        \"date\": \"2023-01-01\"\n      },\n      \"content\": [\n        {\n          \"type\": \"text\",\n          \"text\": \"Relevant chunk\"\n        }\n      ]\n    },\n    {\n      \"file_id\": \"file_456\",\n      \"filename\": \"notes.txt\",\n      \"score\": 0.89,\n      \"attributes\": {\n        \"author\": \"Jane Smith\",\n        \"date\": \"2023-01-02\"\n      },\n      \"content\": [\n        {\n          \"type\": \"text\",\n          \"text\": \"Sample text content from the vector store.\"\n        }\n      ]\n    }\n  ],\n  \"has_more\": false,\n  \"next_page\": null\n}\n"
+          }
+        }
+      }
+    },
+    "/conversations": {
+      "post": {
+        "tags": [
+          "Conversations"
+        ],
+        "summary": "Create a conversation.",
+        "operationId": "createConversation",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateConversationBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConversationResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create a conversation",
+          "group": "conversations",
+          "path": "create",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/conversations \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"metadata\": {\"topic\": \"demo\"},\n    \"items\": [\n      {\n        \"type\": \"message\",\n        \"role\": \"user\",\n        \"content\": \"Hello!\"\n      }\n    ]\n  }'\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst conversation = await client.conversations.create({\n  metadata: { topic: \"demo\" },\n  items: [\n    { type: \"message\", role: \"user\", content: \"Hello!\" }\n  ],\n});\nconsole.log(conversation);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nconversation = client.conversations.create(\n  metadata={\"topic\": \"demo\"},\n  items=[\n    {\"type\": \"message\", \"role\": \"user\", \"content\": \"Hello!\"}\n  ]\n)\nprint(conversation)\n",
+              "csharp": "using System;\nusing System.Collections.Generic;\nusing OpenAI.Conversations;\n\nOpenAIConversationClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nConversation conversation = client.CreateConversation(\n    new CreateConversationOptions\n    {\n        Metadata = new Dictionary<string, string>\n        {\n            { \"topic\", \"demo\" }\n        },\n        Items =\n        {\n            new ConversationMessageInput\n            {\n                Role = \"user\",\n                Content = \"Hello!\",\n            }\n        }\n    }\n);\nConsole.WriteLine(conversation.Id);\n"
+            },
+            "response": "{\n  \"id\": \"conv_123\",\n  \"object\": \"conversation\",\n  \"created_at\": 1741900000,\n  \"metadata\": {\"topic\": \"demo\"}\n}\n"
+          }
+        }
+      }
+    },
+    "/conversations/{conversation_id}": {
+      "get": {
+        "tags": [
+          "Conversations"
+        ],
+        "summary": "Get a conversation",
+        "operationId": "getConversation",
+        "parameters": [
+          {
+            "name": "conversation_id",
+            "in": "path",
+            "description": "The ID of the conversation to retrieve.",
+            "required": true,
+            "schema": {
+              "example": "conv_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConversationResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a conversation",
+          "group": "conversations",
+          "path": "retrieve",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/conversations/conv_123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst conversation = await client.conversations.retrieve(\"conv_123\");\nconsole.log(conversation);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nconversation = client.conversations.retrieve(\"conv_123\")\nprint(conversation)\n",
+              "csharp": "using System;\nusing OpenAI.Conversations;\n\nOpenAIConversationClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nConversation conversation = client.GetConversation(\"conv_123\");\nConsole.WriteLine(conversation.Id);\n"
+            },
+            "response": "{\n  \"id\": \"conv_123\",\n  \"object\": \"conversation\",\n  \"created_at\": 1741900000,\n  \"metadata\": {\"topic\": \"demo\"}\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Conversations"
+        ],
+        "summary": "Delete a conversation. Items in the conversation will not be deleted.",
+        "operationId": "deleteConversation",
+        "parameters": [
+          {
+            "name": "conversation_id",
+            "in": "path",
+            "description": "The ID of the conversation to delete.",
+            "required": true,
+            "schema": {
+              "example": "conv_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedConversationResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a conversation",
+          "group": "conversations",
+          "path": "delete",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/conversations/conv_123 \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst deleted = await client.conversations.delete(\"conv_123\");\nconsole.log(deleted);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\ndeleted = client.conversations.delete(\"conv_123\")\nprint(deleted)\n",
+              "csharp": "using System;\nusing OpenAI.Conversations;\n\nOpenAIConversationClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nDeletedConversation deleted = client.DeleteConversation(\"conv_123\");\nConsole.WriteLine(deleted.Id);\n"
+            },
+            "response": "{\n  \"id\": \"conv_123\",\n  \"object\": \"conversation.deleted\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Conversations"
+        ],
+        "summary": "Update a conversation",
+        "operationId": "updateConversation",
+        "parameters": [
+          {
+            "name": "conversation_id",
+            "in": "path",
+            "description": "The ID of the conversation to update.",
+            "required": true,
+            "schema": {
+              "example": "conv_123",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateConversationBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConversationResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update a conversation",
+          "group": "conversations",
+          "path": "update",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/conversations/conv_123 \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"metadata\": {\"topic\": \"project-x\"}\n  }'\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst updated = await client.conversations.update(\n  \"conv_123\",\n  { metadata: { topic: \"project-x\" } }\n);\nconsole.log(updated);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nupdated = client.conversations.update(\n  \"conv_123\",\n  metadata={\"topic\": \"project-x\"}\n)\nprint(updated)\n",
+              "csharp": "using System;\nusing System.Collections.Generic;\nusing OpenAI.Conversations;\n\nOpenAIConversationClient client = new(\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nConversation updated = client.UpdateConversation(\n    conversationId: \"conv_123\",\n    new UpdateConversationOptions\n    {\n        Metadata = new Dictionary<string, string>\n        {\n            { \"topic\", \"project-x\" }\n        }\n    }\n);\nConsole.WriteLine(updated.Id);\n"
+            },
+            "response": "{\n  \"id\": \"conv_123\",\n  \"object\": \"conversation\",\n  \"created_at\": 1741900000,\n  \"metadata\": {\"topic\": \"project-x\"}\n}\n"
+          }
+        }
+      }
+    },
+    "/safety/alerts/{id}": {
+      "get": {
+        "summary": "Get a safety alert belonging to the authenticated API project.",
+        "operationId": "Getprojectsafetyalert",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Project safety alert ID",
+            "required": true,
+            "schema": {
+              "description": "Project safety alert ID",
+              "type": "string",
+              "maxLength": 38
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SafetyAlertResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a safety alert",
+          "group": "safety-alerts",
+          "path": "retrieve",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/safety/alerts/alert_0123456789abcdef0123456789abcdef \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n"
+            },
+            "response": "{\n  \"id\": \"alert_0123456789abcdef0123456789abcdef\",\n  \"object\": \"safety.alert\",\n  \"created_at\": 1787659200,\n  \"request_id\": \"req_123\",\n  \"response_id\": \"resp_123\",\n  \"model\": \"gpt-6-astra\",\n  \"request_paused\": true,\n  \"error_type\": \"potentially_unintended_data_access\",\n  \"reason\": \"Potentially unintended data access.\"\n}\n"
+          }
+        }
+      }
+    },
+    "/live/sessions/{session_id}/content": {
+      "get": {
+        "tags": [
+          "Live"
+        ],
+        "summary": "Get Live session content",
+        "description": "Download stored session audio as stereo WAV: input left, output right.",
+        "operationId": "download-live-recording",
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "description": "The ID of the stored Live session to download. Use the session ID returned when the session started with storage enabled.",
+            "required": true,
+            "schema": {
+              "description": "The ID of the stored Live session to download. Use the session ID returned when the session started with storage enabled.",
+              "type": "string",
+              "pattern": "^live_[A-Za-z0-9_-]{1,128}$"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Stored session recording. Input audio is in the left channel and output audio is in the right channel.",
+            "content": {
+              "audio/wav": {
+                "schema": {
+                  "description": "The Live session recording as a stereo WAV file, with input audio in the left channel and output audio in the right channel.",
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Download recording",
+          "group": "live",
+          "returns": "The stored session recording as binary stereo WAV audio."
+        }
+      }
+    },
+    "/organization/spend_limit": {
+      "get": {
+        "summary": "Get the organization's hard spend limit.",
+        "operationId": "Getorganizationspendlimit",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "Hard spend limit retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationSpendLimitResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve organization spend limit",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/spend_limit \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.spend_limit\",\n    \"threshold_amount\": 10000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"enforcement\": {\n        \"status\": \"enforcing\"\n    }\n}\n"
+          }
+        },
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ]
+      },
+      "post": {
+        "summary": "Create or replace the organization's hard spend limit.",
+        "operationId": "Updateorganizationspendlimit",
+        "parameters": [],
+        "requestBody": {
+          "description": "Parameters for the hard spend limit you want to create or replace.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateOrganizationSpendLimitBody"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Hard spend limit created or replaced successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationSpendLimitResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update organization spend limit",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/spend_limit \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"threshold_amount\": 10000,\n      \"currency\": \"USD\",\n      \"interval\": \"month\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"organization.spend_limit\",\n    \"threshold_amount\": 10000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"enforcement\": {\n        \"status\": \"enforcing\"\n    }\n}\n"
+          }
+        },
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ]
+      },
+      "delete": {
+        "summary": "Delete the organization's hard spend limit.",
+        "operationId": "Deleteorganizationspendlimit",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "Hard spend limit deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/OrganizationSpendLimitDeletedResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete organization spend limit",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/spend_limit \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"organization.spend_limit.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        },
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ]
+      }
+    },
+    "/organization/projects/{project_id}/spend_limit": {
+      "get": {
+        "summary": "Get a project's hard spend limit.",
+        "operationId": "Getprojectspendlimit",
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project whose hard spend limit is being managed.",
+            "required": true,
+            "schema": {
+              "example": "proj_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Hard spend limit retrieved successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectSpendLimitResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve project spend limit",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/organization/projects/proj_abc/spend_limit \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"project.spend_limit\",\n    \"threshold_amount\": 10000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"enforcement\": {\n        \"status\": \"enforcing\"\n    }\n}\n"
+          }
+        },
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ]
+      },
+      "delete": {
+        "summary": "Delete a project's hard spend limit.",
+        "operationId": "Deleteprojectspendlimit",
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project whose hard spend limit is being managed.",
+            "required": true,
+            "schema": {
+              "example": "proj_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Hard spend limit deleted successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectSpendLimitDeletedResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete project spend limit",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/organization/projects/proj_abc/spend_limit \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\"\n"
+            },
+            "response": "{\n    \"object\": \"project.spend_limit.deleted\",\n    \"deleted\": true\n}\n"
+          }
+        },
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ]
+      },
+      "post": {
+        "summary": "Create or replace a project's hard spend limit.",
+        "operationId": "Updateprojectspendlimit",
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project whose hard spend limit is being managed.",
+            "required": true,
+            "schema": {
+              "example": "proj_123",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "Parameters for the hard spend limit you want to create or replace.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateProjectSpendLimitBody"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Hard spend limit created or replaced successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProjectSpendLimitResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update project spend limit",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/spend_limit \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"threshold_amount\": 10000,\n      \"currency\": \"USD\",\n      \"interval\": \"month\"\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"project.spend_limit\",\n    \"threshold_amount\": 10000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"enforcement\": {\n        \"status\": \"enforcing\"\n    }\n}\n"
+          }
+        },
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ]
+      }
+    },
+    "/organization/projects/{project_id}/service_accounts/{service_account_id}/api_keys": {
+      "post": {
+        "summary": "Creates an API key for a service account in the project.",
+        "operationId": "CreateanAPIkeyforaserviceaccount",
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "The ID of the project.",
+            "required": true,
+            "schema": {
+              "description": "The ID of the project.",
+              "type": "string"
+            }
+          },
+          {
+            "name": "service_account_id",
+            "in": "path",
+            "description": "The ID of the service account.",
+            "required": true,
+            "schema": {
+              "description": "The ID of the service account.",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The service account API key create request payload.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateProjectServiceAccountApiKeyBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Service account API key created successfully.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ServiceAccountApiKeyBody"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create project service account API key",
+          "group": "administration",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/organization/projects/proj_abc/service_accounts/svc_acct_abc/api_keys \\\n  -H \"Authorization: Bearer $OPENAI_ADMIN_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n      \"name\": \"Production App\",\n      \"scopes\": [\"api.responses.write\"]\n  }'\n"
+            },
+            "response": "{\n    \"object\": \"organization.project.service_account.api_key\",\n    \"value\": \"sk-abcdefghijklmnop123\",\n    \"name\": \"Production App\",\n    \"created_at\": 1711471533,\n    \"id\": \"key_abc\"\n}\n"
+          }
+        },
+        "security": [
+          {
+            "AdminApiKeyAuth": []
+          }
+        ]
+      }
+    },
+    "/content_provenance_checks": {
+      "post": {
+        "summary": "Check whether an image or audio file contains known OpenAI provenance signals. [Learn more about content provenance](https://developers.openai.com/api/docs/guides/content-provenance).\n\nIf `not_detected`, it means the tool did not find supported signals in the uploaded file. The content could still have been generated by OpenAI if the metadata was stripped or has evidence of tampering, the watermark was degraded, it comes from a legacy generation model, or it was created before provenance signals were available. Content could also still be AI-generated by another company's model, which the tool currently does not detect.",
+        "operationId": "Createcontentprovenancecheck",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateContentProvenanceBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProvenanceResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create content provenance check",
+          "group": "content_provenance_checks",
+          "examples": []
+        }
+      }
+    },
+    "/videos": {
+      "post": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Create a new video generation job from a prompt and optional reference assets.",
+        "operationId": "createVideo",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoMultipartBody"
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoJsonBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VideoResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "deprecated": true,
+        "x-oaiMeta": {
+          "name": "Create video",
+          "group": "videos",
+          "path": "create",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/videos \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -F \"model=sora-2\" \\\n  -F \"prompt=A calico cat playing a piano on stage\"\n",
+              "javascript": "import OpenAI from 'openai';\n\nconst openai = new OpenAI();\n\nconst video = await openai.videos.create({ prompt: 'A calico cat playing a piano on stage' });\n\nconsole.log(video.id);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nvideo = client.videos.create(\n    prompt=\"A calico cat playing a piano on stage\",\n)\nprint(video.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  video, err := client.Videos.New(context.TODO(), openai.VideoNewParams{\n    Prompt: \"A calico cat playing a piano on stage\",\n  })\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", video.ID)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nvideo = openai.videos.create(prompt: \"A calico cat playing a piano on stage\")\n\nputs(video)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.videos.Video;\nimport com.openai.models.videos.VideoCreateParams;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        VideoCreateParams params = VideoCreateParams.builder()\n            .prompt(\"A calico cat playing a piano on stage\")\n            .build();\n        Video video = client.videos().create(params);\n    }\n}\n"
+            },
+            "response": "{\n  \"id\": \"video_123\",\n  \"object\": \"video\",\n  \"model\": \"sora-2\",\n  \"status\": \"queued\",\n  \"progress\": 0,\n  \"created_at\": 1712697600,\n  \"size\": \"1024x1792\",\n  \"seconds\": \"8\",\n  \"quality\": \"standard\"\n}\n"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "List recently generated videos for the current project.",
+        "operationId": "ListVideos",
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of items to retrieve",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order of results by timestamp. Use `asc` for ascending order or `desc` for descending order.",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/OrderEnum"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last item from the previous pagination request",
+            "required": false,
+            "schema": {
+              "description": "Identifier for the last item from the previous pagination request",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VideoListResource"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": true,
+        "x-oaiMeta": {
+          "name": "List videos",
+          "group": "videos",
+          "path": "list for the organization.",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/videos \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from 'openai';\n\nconst openai = new OpenAI();\n\n// Automatically fetches more pages as needed.\nfor await (const video of openai.videos.list()) {\n  console.log(video.id);\n}\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\npage = client.videos.list()\npage = page.data[0]\nprint(page.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  page, err := client.Videos.List(context.TODO(), openai.VideoListParams{\n\n  })\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", page)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\npage = openai.videos.list\n\nputs(page)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.videos.VideoListPage;\nimport com.openai.models.videos.VideoListParams;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        VideoListPage page = client.videos().list();\n    }\n}\n"
+            },
+            "response": "{\n  \"data\": [\n    {\n      \"id\": \"video_123\",\n      \"object\": \"video\",\n      \"model\": \"sora-2\",\n      \"status\": \"completed\"\n    }\n  ],\n  \"object\": \"list\"\n}\n"
+          }
+        }
+      }
+    },
+    "/videos/characters": {
+      "post": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Create a character from an uploaded video.",
+        "operationId": "CreateVideoCharacter",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoCharacterBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VideoCharacterResource"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": true
+      }
+    },
+    "/videos/characters/{character_id}": {
+      "get": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Fetch a character.",
+        "operationId": "GetVideoCharacter",
+        "parameters": [
+          {
+            "name": "character_id",
+            "in": "path",
+            "description": "The identifier of the character to retrieve.",
+            "required": true,
+            "schema": {
+              "example": "char_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VideoCharacterResource"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": true
+      }
+    },
+    "/videos/edits": {
+      "post": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Create a new video generation job by editing a source video or existing generated video.",
+        "operationId": "CreateVideoEdit",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoEditMultipartBody"
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoEditJsonBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VideoResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "deprecated": true
+      }
+    },
+    "/videos/extensions": {
+      "post": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Create an extension of a completed video.",
+        "operationId": "CreateVideoExtend",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoExtendMultipartBody"
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoExtendJsonBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VideoResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "deprecated": true
+      }
+    },
+    "/videos/{video_id}": {
+      "get": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Fetch the latest metadata for a generated video.",
+        "operationId": "GetVideo",
+        "parameters": [
+          {
+            "name": "video_id",
+            "in": "path",
+            "description": "The identifier of the video to retrieve.",
+            "required": true,
+            "schema": {
+              "example": "video_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VideoResource"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": true,
+        "x-oaiMeta": {
+          "name": "Retrieve video",
+          "group": "videos",
+          "path": "retrieve matching the provided identifier.",
+          "examples": {
+            "response": "",
+            "request": {
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\nconst video = await client.videos.retrieve('video_123');\n\nconsole.log(video.id);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nvideo = client.videos.retrieve(\n    \"video_123\",\n)\nprint(video.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  video, err := client.Videos.Get(context.TODO(), \"video_123\")\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", video.ID)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nvideo = openai.videos.retrieve(\"video_123\")\n\nputs(video)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.videos.Video;\nimport com.openai.models.videos.VideoRetrieveParams;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        Video video = client.videos().retrieve(\"video_123\");\n    }\n}\n"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Permanently delete a completed or failed video and its stored assets.",
+        "operationId": "DeleteVideo",
+        "parameters": [
+          {
+            "name": "video_id",
+            "in": "path",
+            "description": "The identifier of the video to delete.",
+            "required": true,
+            "schema": {
+              "example": "video_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedVideoResource"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": true,
+        "x-oaiMeta": {
+          "name": "Delete video",
+          "group": "videos",
+          "path": "delete",
+          "examples": {
+            "response": "",
+            "request": {
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\nconst video = await client.videos.delete('video_123');\n\nconsole.log(video.id);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nvideo = client.videos.delete(\n    \"video_123\",\n)\nprint(video.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  video, err := client.Videos.Delete(context.TODO(), \"video_123\")\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", video.ID)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nvideo = openai.videos.delete(\"video_123\")\n\nputs(video)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.videos.VideoDeleteParams;\nimport com.openai.models.videos.VideoDeleteResponse;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        VideoDeleteResponse video = client.videos().delete(\"video_123\");\n    }\n}\n"
+            }
+          }
+        }
+      }
+    },
+    "/videos/{video_id}/content": {
+      "get": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Download the generated video bytes or a derived preview asset.\n\nStreams the rendered video content for the specified video job.",
+        "operationId": "RetrieveVideoContent",
+        "parameters": [
+          {
+            "name": "video_id",
+            "in": "path",
+            "description": "The identifier of the video whose media to download.",
+            "required": true,
+            "schema": {
+              "example": "video_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "variant",
+            "in": "query",
+            "description": "Which downloadable asset to return. Defaults to the MP4 video.",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/VideoContentVariant"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The video bytes or preview asset that matches the requested variant.",
+            "content": {
+              "video/mp4": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "image/webp": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "deprecated": true,
+        "x-oaiMeta": {
+          "name": "Retrieve video content",
+          "group": "videos",
+          "path": "content",
+          "examples": {
+            "response": "",
+            "request": {
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\nconst response = await client.videos.downloadContent('video_123');\n\nconsole.log(response);\n\nconst content = await response.blob();\nconsole.log(content);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nresponse = client.videos.download_content(\n    video_id=\"video_123\",\n)\nprint(response)\ncontent = response.read()\nprint(content)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  response, err := client.Videos.DownloadContent(\n    context.TODO(),\n    \"video_123\",\n    openai.VideoDownloadContentParams{\n\n    },\n  )\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", response)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nresponse = openai.videos.download_content(\"video_123\")\n\nputs(response)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.core.http.HttpResponse;\nimport com.openai.models.videos.VideoDownloadContentParams;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        HttpResponse response = client.videos().downloadContent(\"video_123\");\n    }\n}\n"
+            }
+          }
+        }
+      }
+    },
+    "/videos/{video_id}/remix": {
+      "post": {
+        "tags": [
+          "Videos"
+        ],
+        "summary": "Create a remix of a completed video using a refreshed prompt.",
+        "operationId": "CreateVideoRemix",
+        "parameters": [
+          {
+            "name": "video_id",
+            "in": "path",
+            "description": "The identifier of the completed video to remix.",
+            "required": true,
+            "schema": {
+              "example": "video_123",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoRemixBody"
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVideoRemixBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VideoResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "deprecated": true,
+        "x-oaiMeta": {
+          "name": "Remix video",
+          "group": "videos",
+          "path": "remix using the provided prompt.",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/videos/video_123/remix \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"Content-Type: application/json\" \\\n  -d '{\n    \"prompt\": \"Extend the scene with the cat taking a bow to the cheering audience\"\n  }'\n",
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\nconst video = await client.videos.remix('video_123', { prompt: 'Extend the scene with the cat taking a bow to the cheering audience' });\n\nconsole.log(video.id);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nvideo = client.videos.remix(\n    video_id=\"video_123\",\n    prompt=\"Extend the scene with the cat taking a bow to the cheering audience\",\n)\nprint(video.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  video, err := client.Videos.Remix(\n    context.TODO(),\n    \"video_123\",\n    openai.VideoRemixParams{\n      Prompt: \"Extend the scene with the cat taking a bow to the cheering audience\",\n    },\n  )\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", video.ID)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nvideo = openai.videos.remix(\"video_123\", prompt: \"Extend the scene with the cat taking a bow to the cheering audience\")\n\nputs(video)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.videos.Video;\nimport com.openai.models.videos.VideoRemixParams;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        VideoRemixParams params = VideoRemixParams.builder()\n            .videoId(\"video_123\")\n            .prompt(\"Extend the scene with the cat taking a bow to the cheering audience\")\n            .build();\n        Video video = client.videos().remix(params);\n    }\n}\n"
+            },
+            "response": "{\n  \"id\": \"video_456\",\n  \"object\": \"video\",\n  \"model\": \"sora-2\",\n  \"status\": \"queued\",\n  \"progress\": 0,\n  \"created_at\": 1712698600,\n  \"size\": \"720x1280\",\n  \"seconds\": \"8\",\n  \"remixed_from_video_id\": \"video_123\"\n}\n"
+          }
+        }
+      }
+    },
+    "/responses/input_tokens": {
+      "post": {
+        "summary": "Returns input token counts of the request.\n\nReturns an object with `object` set to `response.input_tokens` and an `input_tokens` count.",
+        "operationId": "Getinputtokencounts",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TokenCountsBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TokenCountsResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get input token counts",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/responses/input_tokens \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n    -d '{\n      \"model\": \"gpt-6-astra\",\n      \"input\": \"Tell me a joke.\"\n    }'\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst client = new OpenAI();\n\nconst response = await client.responses.inputTokens.count({\n  model: \"gpt-6-astra\",\n  input: \"Tell me a joke.\",\n});\n\nconsole.log(response.input_tokens);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.input_tokens.count(\n    model=\"gpt-6-astra\",\n    input=\"Tell me a joke.\"\n)\nprint(response.input_tokens)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n  \"github.com/openai/openai-go/responses\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  response, err := client.Responses.InputTokens.Count(context.TODO(), responses.InputTokenCountParams{\n    Model: \"gpt-6-astra\",\n    Input: \"Tell me a joke.\",\n  })\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", response.InputTokens)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nresponse = openai.responses.input_tokens.count(model: \"gpt-6-astra\", input: \"Tell me a joke.\")\n\nputs(response)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.responses.inputtokens.InputTokenCountParams;\nimport com.openai.models.responses.inputtokens.InputTokenCountResponse;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        InputTokenCountParams params = InputTokenCountParams.builder()\n            .model(\"gpt-6-astra\")\n            .input(\"Tell me a joke.\")\n            .build();\n\n        InputTokenCountResponse response = client.responses().inputTokens().count(params);\n    }\n}\n"
+            },
+            "response": "{\n  \"object\": \"response.input_tokens\",\n  \"input_tokens\": 11\n}\n"
+          }
+        }
+      }
+    },
+    "/responses/compact": {
+      "post": {
+        "summary": "Compact a conversation. Returns a compacted response object.\n\nLearn when and how to compact long-running conversations in the [conversation state guide](https://developers.openai.com/api/docs/guides/conversation-state#managing-the-context-window). For ZDR-compatible compaction details, see [Compaction (advanced)](https://developers.openai.com/api/docs/guides/conversation-state#compaction-advanced).",
+        "operationId": "Compactconversation",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CompactResponseMethodPublicBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CompactResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Compact a response",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/responses/compact \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n    -d '{\n      \"model\": \"gpt-6-astra\",\n      \"input\": [\n        {\n          \"role\": \"user\",\n          \"content\": \"Create a simple landing page for a dog petting café.\"\n        },\n        {\n          \"id\": \"msg_001\",\n          \"type\": \"message\",\n          \"status\": \"completed\",\n          \"content\": [\n            {\n              \"type\": \"output_text\",\n              \"annotations\": [],\n              \"logprobs\": [],\n              \"text\": \"Below is a single file, ready-to-use landing page for a dog petting café:...\"\n            }\n          ],\n          \"role\": \"assistant\"\n        }\n      ]\n    }'\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\n// Compact the previous response if you are running out of tokens\nconst compactedResponse = await openai.responses.compact({\n  model: \"gpt-6-astra\",\n  input: [\n    {\n      role: \"user\",\n      content: \"Create a simple landing page for a dog petting café.\",\n    },\n    // All items returned from previous requests are included here, like reasoning, message, function call, etc.\n    {\n      id: \"msg_030d085c0b53e67e0069332e3a72d4819c96c6f2c4adc15d33\",\n      type: \"message\",\n      status: \"completed\",\n      content: [\n        {\n          type: \"output_text\",\n          annotations: [],\n          logprobs: [],\n          text: \"Below is a single file, ready-to-use landing page for a dog petting café:...\",\n        },\n      ],\n      role: \"assistant\",\n    },\n  ],\n});\n\n// Pass the compactedResponse.output as input to the next request\nconsole.log(compactedResponse);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\n\ncompacted_response = client.responses.compact(\n    model=\"gpt-6-astra\",\n    input=[\n    {\n        \"role\": \"user\",\n        \"content\": \"Create a simple landing page for a dog petting cafe.\",\n    },\n    # All items returned from previous requests are included here, like reasoning, message, function call, etc.\n    {\n        \"id\": \"msg_001\",\n        \"type\": \"message\",\n        \"status\": \"completed\",\n        \"content\": [\n        {\n            \"type\": \"output_text\",\n            \"annotations\": [],\n            \"logprobs\": [],\n            \"text\": \"Below is a single file, ready-to-use landing page for a dog petting café:...\",\n        },\n        ],\n        \"role\": \"assistant\",\n    },\n    ]\n)\n# Pass the compacted_response.output as input to the next request\nprint(compacted_response)\n"
+            },
+            "response": "{\n  \"id\": \"resp_001\",\n  \"object\": \"response.compaction\",\n  \"created_at\": 1764967971,\n  \"output\": [\n    {\n      \"id\": \"msg_000\",\n      \"type\": \"message\",\n      \"status\": \"completed\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"Create a simple landing page for a dog petting cafe.\"\n        }\n      ],\n      \"role\": \"user\"\n    },\n    {\n      \"id\": \"cmp_001\",\n      \"type\": \"compaction\",\n      \"encrypted_content\": \"gAAAAABpM0Yj-...=\"\n    }\n  ],\n  \"usage\": {\n    \"input_tokens\": 139,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 438,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 64\n    },\n    \"total_tokens\": 577\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/skills": {
+      "post": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Create a new skill.",
+        "operationId": "CreateSkill",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSkillBody"
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSkillBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "List all skills for the current project.",
+        "operationId": "ListSkills",
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of items to retrieve",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order of results by timestamp. Use `asc` for ascending order or `desc` for descending order.",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/OrderEnum"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "Identifier for the last item from the previous pagination request",
+            "required": false,
+            "schema": {
+              "description": "Identifier for the last item from the previous pagination request",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}": {
+      "delete": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Delete a skill by its ID.",
+        "operationId": "DeleteSkill",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill to delete.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedSkillResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Get a skill by its ID.",
+        "operationId": "GetSkill",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill to retrieve.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Update the default version pointer for a skill.",
+        "operationId": "UpdateSkillDefaultVersion",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/SetDefaultSkillVersionBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}/content": {
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Download a skill zip bundle by its ID.",
+        "operationId": "GetSkillContent",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill to download.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The skill zip bundle.",
+            "content": {
+              "application/zip": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}/versions": {
+      "post": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Create a new immutable skill version.",
+        "operationId": "CreateSkillVersion",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill to version.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSkillVersionBody"
+              }
+            },
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSkillVersionBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillVersionResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "List skill versions for a skill.",
+        "operationId": "ListSkillVersions",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Number of versions to retrieve.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order of results by version number.",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/OrderEnum"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "The skill version ID to start after.",
+            "required": false,
+            "schema": {
+              "example": "skillver_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillVersionListResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}/versions/{version}": {
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Get a specific skill version.",
+        "operationId": "GetSkillVersion",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "description": "The version number to retrieve.",
+            "required": true,
+            "schema": {
+              "description": "The version number to retrieve.",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SkillVersionResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Delete a skill version.",
+        "operationId": "DeleteSkillVersion",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "description": "The skill version number.",
+            "required": true,
+            "schema": {
+              "description": "The skill version number.",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedSkillVersionResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/skills/{skill_id}/versions/{version}/content": {
+      "get": {
+        "tags": [
+          "Skills"
+        ],
+        "summary": "Download a skill version zip bundle.",
+        "operationId": "GetSkillVersionContent",
+        "parameters": [
+          {
+            "name": "skill_id",
+            "in": "path",
+            "description": "The identifier of the skill.",
+            "required": true,
+            "schema": {
+              "example": "skill_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "description": "The skill version number.",
+            "required": true,
+            "schema": {
+              "description": "The skill version number.",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The skill zip bundle.",
+            "content": {
+              "application/zip": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        }
+      }
+    },
+    "/chatkit/sessions/{session_id}/cancel": {
+      "post": {
+        "summary": "Cancel an active ChatKit session and return its most recent metadata.\n\nCancelling prevents new requests from using the issued client secret.",
+        "operationId": "CancelChatSessionMethod",
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "description": "Unique identifier for the ChatKit session to cancel.",
+            "required": true,
+            "schema": {
+              "example": "cksess_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChatSessionResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel chat session",
+          "group": "chatkit",
+          "beta": true,
+          "path": "cancel-session new requests from using the issued client secret.",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST \\\n  https://api.openai.com/v1/chatkit/sessions/cksess_123/cancel \\\n  -H \"OpenAI-Beta: chatkit_beta=v1\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\nconst chatSession = await client.beta.chatkit.sessions.cancel('cksess_123');\n\nconsole.log(chatSession.id);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nchat_session = client.beta.chatkit.sessions.cancel(\n    \"cksess_123\",\n)\nprint(chat_session.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n  \"github.com/openai/openai-go/option\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  chatSession, err := client.Beta.ChatKit.Sessions.Cancel(context.TODO(), \"cksess_123\")\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", chatSession.ID)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nchat_session = openai.beta.chatkit.sessions.cancel(\"cksess_123\")\n\nputs(chat_session)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.beta.chatkit.sessions.SessionCancelParams;\nimport com.openai.models.beta.chatkit.threads.ChatSession;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        ChatSession chatSession = client.beta().chatkit().sessions().cancel(\"cksess_123\");\n    }\n}\n"
+            },
+            "response": "{\n  \"id\": \"cksess_123\",\n  \"object\": \"chatkit.session\",\n  \"workflow\": {\n    \"id\": \"workflow_alpha\",\n    \"version\": \"1\"\n  },\n  \"scope\": {\n    \"customer_id\": \"cust_456\"\n  },\n  \"max_requests_per_1_minute\": 30,\n  \"ttl_seconds\": 900,\n  \"status\": \"cancelled\",\n  \"cancelled_at\": 1712345678\n}\n"
+          }
+        }
+      }
+    },
+    "/chatkit/sessions": {
+      "post": {
+        "summary": "Create a ChatKit session.",
+        "operationId": "CreateChatSessionMethod",
+        "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateChatSessionBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChatSessionResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create ChatKit session",
+          "group": "chatkit",
+          "beta": true,
+          "path": "sessions/create object.",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/chatkit/sessions \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -H \"OpenAI-Beta: chatkit_beta=v1\" \\\n  -d '{\n    \"workflow\": {\n      \"id\": \"workflow_alpha\",\n      \"version\": \"2024-10-01\"\n    },\n    \"scope\": {\n      \"project\": \"alpha\",\n      \"environment\": \"staging\"\n    },\n    \"expires_after\": 1800,\n    \"max_requests_per_1_minute\": 60,\n    \"max_requests_per_session\": 500\n  }'\n",
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\nconst chatSession = await client.beta.chatkit.sessions.create({ user: 'user', workflow: { id: 'id' } });\n\nconsole.log(chatSession.id);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nchat_session = client.beta.chatkit.sessions.create(\n    user=\"user\",\n    workflow={\n        \"id\": \"id\"\n    },\n)\nprint(chat_session.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n  \"github.com/openai/openai-go/option\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  chatSession, err := client.Beta.ChatKit.Sessions.New(context.TODO(), openai.BetaChatKitSessionNewParams{\n    User: \"user\",\n    Workflow: openai.ChatSessionWorkflowParam{\n      ID: \"id\",\n    },\n  })\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", chatSession.ID)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nchat_session = openai.beta.chatkit.sessions.create(user: \"user\", workflow: {id: \"id\"})\n\nputs(chat_session)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.beta.chatkit.sessions.SessionCreateParams;\nimport com.openai.models.beta.chatkit.threads.ChatSession;\nimport com.openai.models.beta.chatkit.threads.ChatSessionWorkflowParam;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        SessionCreateParams params = SessionCreateParams.builder()\n            .user(\"user\")\n            .workflow(ChatSessionWorkflowParam.builder()\n                .id(\"id\")\n                .build())\n            .build();\n        ChatSession chatSession = client.beta().chatkit().sessions().create(params);\n    }\n}\n"
+            },
+            "response": "{\n  \"client_secret\": \"chatkit_token_123\",\n  \"expires_at\": 1735689600,\n  \"workflow\": {\n    \"id\": \"workflow_alpha\",\n    \"version\": \"2024-10-01\"\n  },\n  \"scope\": {\n    \"project\": \"alpha\",\n    \"environment\": \"staging\"\n  },\n  \"max_requests_per_1_minute\": 60,\n  \"max_requests_per_session\": 500,\n  \"status\": \"active\"\n}\n"
+          }
+        }
+      }
+    },
+    "/chatkit/threads/{thread_id}/items": {
+      "get": {
+        "summary": "List items that belong to a ChatKit thread.",
+        "operationId": "ListThreadItemsMethod",
+        "parameters": [
+          {
+            "name": "thread_id",
+            "in": "path",
+            "description": "Identifier of the ChatKit thread whose items are requested.",
+            "required": true,
+            "schema": {
+              "example": "cthr_123",
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Maximum number of thread items to return. Defaults to 20.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for results by creation time. Defaults to `desc`.",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/OrderEnum"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "List items created after this thread item ID. Defaults to null for the first page.",
+            "required": false,
+            "schema": {
+              "description": "List items created after this thread item ID. Defaults to null for the first page.",
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "List items created before this thread item ID. Defaults to null for the newest results.",
+            "required": false,
+            "schema": {
+              "description": "List items created before this thread item ID. Defaults to null for the newest results.",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ThreadItemListResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List ChatKit thread items",
+          "group": "chatkit",
+          "beta": true,
+          "path": "threads/list-items for the specified thread.",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/chatkit/threads/cthr_abc123/items?limit=3\" \\\n  -H \"OpenAI-Beta: chatkit_beta=v1\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\n// Automatically fetches more pages as needed.\nfor await (const thread of client.beta.chatkit.threads.listItems('cthr_123')) {\n  console.log(thread);\n}\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\npage = client.beta.chatkit.threads.list_items(\n    thread_id=\"cthr_123\",\n)\npage = page.data[0]\nprint(page)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n  \"github.com/openai/openai-go/option\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  page, err := client.Beta.ChatKit.Threads.ListItems(\n    context.TODO(),\n    \"cthr_123\",\n    openai.BetaChatKitThreadListItemsParams{\n\n    },\n  )\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", page)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\npage = openai.beta.chatkit.threads.list_items(\"cthr_123\")\n\nputs(page)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.beta.chatkit.threads.ThreadListItemsPage;\nimport com.openai.models.beta.chatkit.threads.ThreadListItemsParams;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        ThreadListItemsPage page = client.beta().chatkit().threads().listItems(\"cthr_123\");\n    }\n}\n"
+            },
+            "response": "{\n  \"data\": [\n    {\n      \"id\": \"cthi_user_001\",\n      \"object\": \"chatkit.thread_item\",\n      \"type\": \"user_message\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"I need help debugging an onboarding issue.\"\n        }\n      ],\n      \"attachments\": []\n    },\n    {\n      \"id\": \"cthi_assistant_002\",\n      \"object\": \"chatkit.thread_item\",\n      \"type\": \"assistant_message\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"Let's start by confirming the workflow version you deployed.\"\n        }\n      ]\n    }\n  ],\n  \"has_more\": false,\n  \"object\": \"list\"\n}\n"
+          }
+        }
+      }
+    },
+    "/chatkit/threads/{thread_id}": {
+      "get": {
+        "summary": "Retrieve a ChatKit thread by its identifier.",
+        "operationId": "GetThreadMethod",
+        "parameters": [
+          {
+            "name": "thread_id",
+            "in": "path",
+            "description": "Identifier of the ChatKit thread to retrieve.",
+            "required": true,
+            "schema": {
+              "example": "cthr_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ThreadResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve ChatKit thread",
+          "group": "chatkit",
+          "beta": true,
+          "path": "threads/retrieve",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/chatkit/threads/cthr_abc123 \\\n  -H \"OpenAI-Beta: chatkit_beta=v1\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\nconst chatkitThread = await client.beta.chatkit.threads.retrieve('cthr_123');\n\nconsole.log(chatkitThread.id);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nchatkit_thread = client.beta.chatkit.threads.retrieve(\n    \"cthr_123\",\n)\nprint(chatkit_thread.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  chatkitThread, err := client.Beta.ChatKit.Threads.Get(context.TODO(), \"cthr_123\")\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", chatkitThread.ID)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nchatkit_thread = openai.beta.chatkit.threads.retrieve(\"cthr_123\")\n\nputs(chatkit_thread)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.beta.chatkit.threads.ChatKitThread;\nimport com.openai.models.beta.chatkit.threads.ThreadRetrieveParams;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        ChatKitThread chatkitThread = client.beta().chatkit().threads().retrieve(\"cthr_123\");\n    }\n}\n"
+            },
+            "response": "{\n  \"id\": \"cthr_abc123\",\n  \"object\": \"chatkit.thread\",\n  \"title\": \"Customer escalation\",\n  \"items\": {\n    \"data\": [\n      {\n        \"id\": \"cthi_user_001\",\n        \"object\": \"chatkit.thread_item\",\n        \"type\": \"user_message\",\n        \"content\": [\n          {\n            \"type\": \"input_text\",\n            \"text\": \"I need help debugging an onboarding issue.\"\n          }\n        ],\n        \"attachments\": []\n      },\n      {\n        \"id\": \"cthi_assistant_002\",\n        \"object\": \"chatkit.thread_item\",\n        \"type\": \"assistant_message\",\n        \"content\": [\n          {\n            \"type\": \"output_text\",\n            \"text\": \"Let's start by confirming the workflow version you deployed.\"\n          }\n        ]\n      }\n    ],\n    \"has_more\": false\n  }\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "summary": "Delete a ChatKit thread along with its items and stored attachments.",
+        "operationId": "DeleteThreadMethod",
+        "parameters": [
+          {
+            "name": "thread_id",
+            "in": "path",
+            "description": "Identifier of the ChatKit thread to delete.",
+            "required": true,
+            "schema": {
+              "example": "cthr_123",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedThreadResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "beta": true,
+          "examples": {
+            "response": "",
+            "request": {
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\nconst thread = await client.beta.chat_kit.threads.delete('cthr_123');\n\nconsole.log(thread.id);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\nthread = client.beta.chat_kit.threads.delete(\n    \"cthr_123\",\n)\nprint(thread.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  thread, err := client.Beta.ChatKit.Threads.Delete(context.TODO(), \"cthr_123\")\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", thread.ID)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nthread = openai.beta.chat_kit.threads.delete(\"cthr_123\")\n\nputs(thread)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.beta.chat_kit.threads.ThreadDeleteParams;\nimport com.openai.models.beta.chat_kit.threads.ThreadDeleteResponse;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        ThreadDeleteResponse thread = client.beta().chat_kit().threads().delete(\"cthr_123\");\n    }\n}\n"
+            }
+          },
+          "name": "Delete ChatKit thread",
+          "group": "chatkit",
+          "path": "threads/delete"
+        }
+      }
+    },
+    "/chatkit/threads": {
+      "get": {
+        "summary": "List ChatKit threads with optional pagination and user filters.",
+        "operationId": "ListThreadsMethod",
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "Maximum number of thread items to return. Defaults to 20.",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 100
+            }
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "description": "Sort order for results by creation time. Defaults to `desc`.",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/OrderEnum"
+            }
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "description": "List items created after this thread item ID. Defaults to null for the first page.",
+            "required": false,
+            "schema": {
+              "description": "List items created after this thread item ID. Defaults to null for the first page.",
+              "type": "string"
+            }
+          },
+          {
+            "name": "before",
+            "in": "query",
+            "description": "List items created before this thread item ID. Defaults to null for the newest results.",
+            "required": false,
+            "schema": {
+              "description": "List items created before this thread item ID. Defaults to null for the newest results.",
+              "type": "string"
+            }
+          },
+          {
+            "name": "user",
+            "in": "query",
+            "description": "Filter threads that belong to this user identifier. Defaults to null to return all users.",
+            "required": false,
+            "schema": {
+              "description": "Filter threads that belong to this user identifier. Defaults to null to return all users.",
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 512
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ThreadListResource"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List ChatKit threads",
+          "group": "chatkit",
+          "beta": true,
+          "path": "list-threads scope.",
+          "examples": {
+            "request": {
+              "curl": "curl \"https://api.openai.com/v1/chatkit/threads?limit=2&order=desc\" \\\n  -H \"OpenAI-Beta: chatkit_beta=v1\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from 'openai';\n\nconst client = new OpenAI();\n\n// Automatically fetches more pages as needed.\nfor await (const chatkitThread of client.beta.chatkit.threads.list()) {\n  console.log(chatkitThread.id);\n}\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\npage = client.beta.chatkit.threads.list()\npage = page.data[0]\nprint(page.id)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  page, err := client.Beta.ChatKit.Threads.List(context.TODO(), openai.BetaChatKitThreadListParams{\n\n  })\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", page)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\npage = openai.beta.chatkit.threads.list\n\nputs(page)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.beta.chatkit.threads.ThreadListPage;\nimport com.openai.models.beta.chatkit.threads.ThreadListParams;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        ThreadListPage page = client.beta().chatkit().threads().list();\n    }\n}\n"
+            },
+            "response": "{\n  \"data\": [\n    {\n      \"id\": \"cthr_abc123\",\n      \"object\": \"chatkit.thread\",\n      \"title\": \"Customer escalation\"\n    },\n    {\n      \"id\": \"cthr_def456\",\n      \"object\": \"chatkit.thread\",\n      \"title\": \"Demo feedback\"\n    }\n  ],\n  \"has_more\": false,\n  \"object\": \"list\"\n}\n"
+          }
+        }
+      }
+    },
+    "/agents/environments/{environment_id}": {
+      "get": {
+        "operationId": "retrieveAgentEnvironment",
+        "summary": "Retrieves an execution environment's connection status and safe installed metadata. See [environment lifecycle](https://developers.openai.com/api/docs/guides/agents-api/environments/lifecycle).",
+        "description": "Retrieves an execution environment's connection status and safe installed metadata.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the environment."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested environment.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PublicEnvironmentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent environment"
+        }
+      }
+    },
+    "/agents/environments/{environment_id}/files": {
+      "get": {
+        "operationId": "listAgentEnvironmentFiles",
+        "summary": "Lists live files on a connected execution environment with optional directory filtering and opaque cursor pagination. See [environment files](https://developers.openai.com/api/docs/guides/agents-api/environments/files).",
+        "description": "Lists live files on a connected execution environment with optional directory filtering and opaque cursor pagination.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the environment."
+          },
+          {
+            "name": "path",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Restrict the listing to this absolute workspace directory."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100
+            },
+            "description": "The maximum number of files to return, between 1 and 100."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam"
+            },
+            "description": "Sort by case-sensitive path components. Defaults to descending."
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The opaque token from the previous page. Keep the same path, order, and limit."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of live environment files.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentFileListResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent environment files"
+        }
+      },
+      "post": {
+        "operationId": "createAgentEnvironmentFile",
+        "summary": "Copies inline bytes or a Files API file into a connected execution environment. See [environment files](https://developers.openai.com/api/docs/guides/agents-api/environments/files).",
+        "description": "Copies inline bytes or a Files API file into a connected execution environment.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the environment."
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/HostedEnvironmentFileParam"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created live environment file.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentFileResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create an agent environment file"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents": {
+      "get": {
+        "operationId": "listAgentSessionSubagents",
+        "summary": "Lists subagents in a session, including nested and closed subagents. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Lists subagents in a session, including nested and closed subagents.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagents.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "object": {
+                      "type": "string",
+                      "enum": [
+                        "list"
+                      ],
+                      "default": "list",
+                      "x-stainless-const": true,
+                      "description": "The object type, which is always `list`."
+                    },
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/SubagentResource"
+                      },
+                      "minItems": 0,
+                      "maxItems": 2000,
+                      "description": "The resources returned in this page, in the requested sort order."
+                    },
+                    "first_id": {
+                      "type": [
+                        "string",
+                        "null"
+                      ],
+                      "minLength": 0,
+                      "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+                    },
+                    "last_id": {
+                      "type": [
+                        "string",
+                        "null"
+                      ],
+                      "minLength": 0,
+                      "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+                    },
+                    "has_more": {
+                      "type": "boolean",
+                      "description": "Whether there are more resources to retrieve after this page."
+                    }
+                  },
+                  "required": [
+                    "object",
+                    "data",
+                    "first_id",
+                    "last_id",
+                    "has_more"
+                  ],
+                  "additionalProperties": false,
+                  "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List session subagents"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}": {
+      "get": {
+        "operationId": "retrieveAgentSessionSubagent",
+        "summary": "Retrieves a subagent belonging to this session. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Retrieves a subagent belonging to this session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SubagentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a session subagent"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}/items": {
+      "get": {
+        "operationId": "listAgentSessionSubagentItems",
+        "summary": "Lists this subagent's own items across all of its turns. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Lists this subagent's own items across all of its turns.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent history.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionItemListResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List subagent items"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}/turns": {
+      "get": {
+        "operationId": "listAgentSessionSubagentTurns",
+        "summary": "Lists all turns of this subagent, including turns after a resume. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Lists all turns of this subagent, including turns after a resume.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent history.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionTurnListResource",
+                  "description": "A page of turns from an agent session or subagent."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List subagent turns"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}/turns/{turn_id}": {
+      "get": {
+        "operationId": "retrieveAgentSessionSubagentTurn",
+        "summary": "Retrieves a turn belonging to this subagent. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Retrieves a turn belonging to this subagent.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "turn_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of a turn belonging to this subagent."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent history.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TurnResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a subagent turn"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/subagents/{subagent_id}/turns/{turn_id}/items": {
+      "get": {
+        "operationId": "listAgentSessionSubagentTurnItems",
+        "summary": "Lists items belonging to one turn of this subagent. See [subagent workflows](https://developers.openai.com/api/docs/guides/agents-api/multi-agent).",
+        "description": "Lists items belonging to one turn of this subagent.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "subagent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the subagent in this session."
+          },
+          {
+            "name": "turn_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of a turn belonging to this subagent."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested subagent history.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionItemListResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List subagent turn items"
+        }
+      }
+    },
+    "/agents": {
+      "get": {
+        "operationId": "listAgents",
+        "summary": "Lists reusable agents in the current project. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Lists reusable agents in the current project.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 1
+            },
+            "description": "The maximum number of resources to return."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of agents.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AgentListResource",
+                  "description": "A page of reusable agents."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agents"
+        }
+      },
+      "post": {
+        "operationId": "createAgent",
+        "summary": "Creates a reusable agent without storing credentials. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Creates a reusable agent without storing credentials.",
+        "tags": [
+          "Agents"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateAgentParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created agent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AgentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create an agent"
+        }
+      }
+    },
+    "/agents/{agent_id}": {
+      "get": {
+        "operationId": "retrieveAgent",
+        "summary": "Retrieves a reusable agent by ID. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Retrieves a reusable agent by ID.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "agent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable agent."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested agent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AgentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent"
+        }
+      },
+      "post": {
+        "operationId": "updateAgent",
+        "summary": "Updates a reusable agent. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Updates a reusable agent.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "agent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable agent."
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateAgentParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The updated agent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AgentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update an agent"
+        }
+      },
+      "delete": {
+        "operationId": "deleteAgent",
+        "summary": "Deletes a reusable agent. See [agent configuration](https://developers.openai.com/api/docs/guides/agents-api/configuration).",
+        "description": "Deletes a reusable agent.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "agent_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable agent."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted agent.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedAgentResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an agent"
+        }
+      }
+    },
+    "/agents/environments/templates": {
+      "get": {
+        "operationId": "listAgentEnvironmentTemplates",
+        "summary": "Lists reusable environment templates without returning confidential values. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Lists reusable environment templates without returning confidential values.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of environment templates.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentTemplateListResource",
+                  "description": "A page of reusable environment templates."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent environment templates"
+        }
+      },
+      "post": {
+        "operationId": "createAgentEnvironmentTemplate",
+        "summary": "Creates reusable environment configuration without returning confidential setup commands or environment values. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Creates reusable environment configuration without returning confidential setup commands or environment values.",
+        "tags": [
+          "Agents"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateEnvironmentTemplateParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created environment template.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentTemplateResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create an agent environment template"
+        }
+      }
+    },
+    "/agents/environments/templates/{environment_template_id}": {
+      "get": {
+        "operationId": "retrieveAgentEnvironmentTemplate",
+        "summary": "Retrieves reusable environment configuration without returning confidential values. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Retrieves reusable environment configuration without returning confidential values.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_template_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable environment template."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested environment template.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentTemplateResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent environment template"
+        }
+      },
+      "post": {
+        "operationId": "updateAgentEnvironmentTemplate",
+        "summary": "Updates reusable environment configuration without returning confidential values. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Updates reusable environment configuration without returning confidential values.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_template_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable environment template."
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateEnvironmentTemplateParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The updated environment template.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnvironmentTemplateResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current environment state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update an agent environment template"
+        }
+      },
+      "delete": {
+        "operationId": "deleteAgentEnvironmentTemplate",
+        "summary": "Deletes reusable environment configuration and all confidential template inputs. See [reusing a hosted setup](https://developers.openai.com/api/docs/guides/agents-api/tools#reuse-a-hosted-plugin-setup).",
+        "description": "Deletes reusable environment configuration and all confidential template inputs.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "environment_template_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the reusable environment template."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted environment template.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedEnvironmentTemplateResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested environment definition was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current environment state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an agent environment template"
+        }
+      }
+    },
+    "/agents/sessions": {
+      "get": {
+        "operationId": "listAgentSessions",
+        "summary": "Lists managed agent sessions using ID-based pagination and the requested sort order. See [managing sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage).",
+        "description": "Lists managed agent sessions using ID-based pagination and the requested sort order.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 1
+            },
+            "description": "The maximum number of resources to return."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "Sort order by the `created_at` timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `desc`."
+          },
+          {
+            "name": "agent_id",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Only return sessions whose root agent has this ID. Omit to return sessions for all agents."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of sessions.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionListResource",
+                  "description": "A paginated list of sessions."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent sessions"
+        }
+      },
+      "post": {
+        "operationId": "createAgentSession",
+        "summary": "Creates a managed agent session, optionally submits initial input, and returns the session or streams its events when stream is true. See [running sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions).",
+        "description": "Creates a managed agent session, optionally submits initial input, and returns the session or streams its events when stream is true.",
+        "tags": [
+          "Agents"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateAgentSessionParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created session or its event stream.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionResource"
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionEvent"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oai-streaming": {
+          "request_field": "stream",
+          "response_status_code": 201
+        },
+        "x-oaiMeta": {
+          "name": "Create an agent session"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}": {
+      "get": {
+        "operationId": "retrieveAgentSession",
+        "summary": "Retrieves the current state of a managed agent session. See [managing sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage).",
+        "description": "Retrieves the current state of a managed agent session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested session.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent session"
+        }
+      },
+      "post": {
+        "operationId": "updateAgentSession",
+        "summary": "Updates session metadata. Omitted fields are unchanged. See [managing sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage).",
+        "description": "Updates session metadata. Omitted fields are unchanged.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateAgentSessionParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The updated session.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Update an agent session"
+        }
+      },
+      "delete": {
+        "operationId": "deleteAgentSession",
+        "summary": "Removes a managed agent session from the public API and returns a deletion confirmation. Physical cleanup may continue asynchronously. See [managing sessions](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage).",
+        "description": "Removes a managed agent session from the public API and returns a deletion confirmation. Physical cleanup may continue asynchronously.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted session.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedSessionResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an agent session"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/artifacts": {
+      "get": {
+        "operationId": "listAgentSessionArtifacts",
+        "summary": "Lists immutable artifacts published by completed hosted session turns. See [session artifacts](https://developers.openai.com/api/docs/guides/agents-api/environments/files#openai-hosted-artifacts).",
+        "description": "Lists immutable artifacts published by completed hosted session turns.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam"
+            },
+            "description": "Sort by creation time and ID. Defaults to descending."
+          },
+          {
+            "name": "environment_id",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Restrict the listing to artifacts produced by this environment."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100
+            },
+            "description": "The maximum number of artifacts to return, between 1 and 100."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return artifacts after this immutable artifact ID."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of durable session artifacts.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionArtifactListResource",
+                  "description": "A page of durable artifacts published by a session."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent session artifacts"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/artifacts/{artifact_id}": {
+      "get": {
+        "operationId": "retrieveAgentSessionArtifact",
+        "summary": "Retrieves immutable metadata for one durable session artifact. See [session artifacts](https://developers.openai.com/api/docs/guides/agents-api/environments/files#openai-hosted-artifacts).",
+        "description": "Retrieves immutable metadata for one durable session artifact.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session that owns the artifact."
+          },
+          {
+            "name": "artifact_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The immutable session artifact ID."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested session artifact.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionArtifactResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent session artifact"
+        }
+      },
+      "delete": {
+        "operationId": "deleteAgentSessionArtifact",
+        "summary": "Deletes an immutable session artifact without deleting its live environment file or original Files API object. See [session artifacts](https://developers.openai.com/api/docs/guides/agents-api/environments/files#openai-hosted-artifacts).",
+        "description": "Deletes an immutable session artifact without deleting its live environment file or original Files API object.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session that owns the artifact."
+          },
+          {
+            "name": "artifact_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The immutable session artifact ID."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted session artifact.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedSessionArtifactResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete an agent session artifact"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/artifacts/{artifact_id}/content": {
+      "get": {
+        "operationId": "retrieveAgentSessionArtifactContent",
+        "summary": "Downloads immutable session artifact bytes after the execution environment expires. See [session artifacts](https://developers.openai.com/api/docs/guides/agents-api/environments/files#openai-hosted-artifacts).",
+        "description": "Downloads immutable session artifact bytes after the execution environment expires.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session that owns the artifact."
+          },
+          {
+            "name": "artifact_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The immutable session artifact ID."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The immutable artifact contents.",
+            "content": {
+              "application/octet-stream": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve agent session artifact content"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/events": {
+      "get": {
+        "operationId": "listAgentSessionEvents",
+        "summary": "Streams live events for an agent session. See [session events](https://developers.openai.com/api/docs/guides/agents-api/sessions/events).",
+        "description": "Streams live events for an agent session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A live stream of session events.",
+            "content": {
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionEvent"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oai-streaming": {
+          "request_field": null,
+          "response_status_code": 200
+        },
+        "x-oaiMeta": {
+          "name": "Stream agent session events"
+        }
+      },
+      "post": {
+        "operationId": "createAgentSessionEvents",
+        "summary": "Submits message, cancellation, or tool-result events to a managed agent session. See [session events](https://developers.openai.com/api/docs/guides/agents-api/sessions/events).",
+        "description": "Submits message, cancellation, or tool-result events to a managed agent session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "Idempotency-Key",
+            "in": "header",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "description": "An optional client-generated key that makes retries of submitted messages idempotent."
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateSessionEventsParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "202": {
+            "description": "The events were accepted."
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create agent session input events"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/items": {
+      "get": {
+        "operationId": "listAgentSessionItems",
+        "summary": "Lists items produced by the session's root agent, including its interactions with subagents. Each subagent has its own item history. See [inspecting agent output](https://developers.openai.com/api/docs/guides/agents-api/observability).",
+        "description": "Lists items produced by the session's root agent, including its interactions with subagents. Each subagent has its own item history.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of session items.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionItemListResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required Responses permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent session items"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/turns": {
+      "get": {
+        "operationId": "listAgentSessionTurns",
+        "summary": "Lists turns by creation time and turn ID. The after cursor is exclusive in the selected order. See [session turns](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage#inspect-session-turns).",
+        "description": "Lists turns by creation time and turn ID. The after cursor is exclusive in the selected order.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int64",
+              "minimum": 1,
+              "maximum": 100,
+              "default": 20
+            },
+            "description": "The maximum number of resources to return, between 1 and 100. Defaults to 20."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "The order in which resources are returned. Defaults to `desc`."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of session turns.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SessionTurnListResource",
+                  "description": "A page of turns from an agent session or subagent."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List agent session turns"
+        }
+      }
+    },
+    "/agents/sessions/{session_id}/turns/{turn_id}": {
+      "get": {
+        "operationId": "retrieveAgentSessionTurn",
+        "summary": "Retrieves a turn's current status, timestamps, usage, and error. Returns 404 if the turn does not belong to the session. See [session turns](https://developers.openai.com/api/docs/guides/agents-api/sessions/manage#inspect-session-turns).",
+        "description": "Retrieves a turn's current status, timestamps, usage, and error. Returns 404 if the turn does not belong to the session.",
+        "tags": [
+          "Agents"
+        ],
+        "parameters": [
+          {
+            "name": "session_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the session that owns the turn."
+          },
+          {
+            "name": "turn_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the turn."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested turn.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TurnResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested session or event was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current session state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve an agent session turn"
+        }
+      }
+    },
+    "/vaults": {
+      "get": {
+        "operationId": "listVaults",
+        "summary": "Lists vaults using ID-based pagination. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Lists vaults using ID-based pagination.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "Sort order by the `created_at` timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `desc`."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 0
+            },
+            "description": "The maximum number of resources to return. Defaults to 20. Values are clamped between 1 and 100."
+          },
+          {
+            "name": "status",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/VaultStatusFilterParam"
+            },
+            "description": "Filter by one status or a list, such as `status=active` or `status[]=active&status[]=archived`. Both statuses are included by default."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of vaults.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultListResource",
+                  "description": "A page of vaults."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List vaults"
+        }
+      },
+      "post": {
+        "operationId": "createVault",
+        "summary": "Creates a vault for the current project. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Creates a vault for the current project.",
+        "tags": [
+          "Vaults"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVaultParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created vault.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create a vault"
+        }
+      }
+    },
+    "/vaults/{vault_id}": {
+      "get": {
+        "operationId": "retrieveVault",
+        "summary": "Retrieves a vault by its ID. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Retrieves a vault by its ID.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested vault.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a vault"
+        }
+      },
+      "delete": {
+        "operationId": "deleteVault",
+        "summary": "Deletes a vault and all its credentials. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Deletes a vault and all its credentials.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted vault.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedVaultResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a vault"
+        }
+      }
+    },
+    "/vaults/{vault_id}/credentials": {
+      "get": {
+        "operationId": "listVaultCredentials",
+        "summary": "Lists a vault's credentials using ID-based pagination without returning secret values. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Lists a vault's credentials using ID-based pagination without returning secret values.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "order",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/ListOrderParam",
+              "default": "desc"
+            },
+            "description": "Sort order by the `created_at` timestamp. Use `asc` for ascending order or `desc` for descending order. Defaults to `desc`."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "int64",
+              "minimum": 0
+            },
+            "description": "The maximum number of resources to return. Defaults to 20. Values are clamped between 1 and 100."
+          },
+          {
+            "name": "status",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/VaultStatusFilterParam"
+            },
+            "description": "Filter by one status or a list, such as `status=active` or `status[]=active&status[]=archived`. Both statuses are included by default."
+          },
+          {
+            "name": "after",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "Return resources after this resource ID in the selected order."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A page of vault credentials.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultCredentialListResource",
+                  "description": "A page of credentials in a vault."
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List vault credentials"
+        }
+      },
+      "post": {
+        "operationId": "createVaultCredential",
+        "summary": "Creates a vault credential. Secret values are write-only and are never returned. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Creates a vault credential. Secret values are write-only and are never returned.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateVaultCredentialParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "The created vault credential without secret values.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultCredentialResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create a vault credential"
+        }
+      }
+    },
+    "/vaults/{vault_id}/credentials/{credential_id}": {
+      "get": {
+        "operationId": "retrieveVaultCredential",
+        "summary": "Retrieves vault credential metadata without returning secret values. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Retrieves vault credential metadata without returning secret values.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "credential_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault credential."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The requested vault credential without secret values.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultCredentialResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Retrieve a vault credential"
+        }
+      },
+      "post": {
+        "operationId": "rotateVaultCredential",
+        "summary": "Rotates a vault credential's write-only secret and returns only credential metadata. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Rotates a vault credential's write-only secret and returns only credential metadata.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "credential_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault credential."
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RotateVaultCredentialParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The rotated vault credential without secret values.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VaultCredentialResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Rotate a vault credential"
+        }
+      },
+      "delete": {
+        "operationId": "deleteVaultCredential",
+        "summary": "Deletes a vault credential. See [vaults](https://developers.openai.com/api/docs/guides/agents-api/tools/vaults).",
+        "description": "Deletes a vault credential.",
+        "tags": [
+          "Vaults"
+        ],
+        "parameters": [
+          {
+            "name": "vault_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault."
+          },
+          {
+            "name": "credential_id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "description": "The ID of the vault credential."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The deleted vault credential.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/DeletedVaultCredentialResource"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request was invalid.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Authentication or project context was missing.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "403": {
+            "description": "The API key lacks the required management permission.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The requested vault or credential was not found.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "409": {
+            "description": "The request conflicted with the current vault state.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An internal error occurred.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "The service is temporarily unavailable.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorResponse-2"
+                }
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a vault credential"
+        }
+      }
+    },
+    "/responses?beta=true": {
+      "post": {
+        "operationId": "beta_createResponse",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Creates a model response. Provide [text](https://developers.openai.com/api/docs/guides/text) or\n[image](https://developers.openai.com/api/docs/guides/images-vision) inputs to generate [text](https://developers.openai.com/api/docs/guides/text)\nor [JSON](https://developers.openai.com/api/docs/guides/structured-outputs) outputs. Have the model call\nyour own [custom code](https://developers.openai.com/api/docs/guides/function-calling) or use built-in\n[tools](https://developers.openai.com/api/docs/guides/tools) like [web search](https://developers.openai.com/api/docs/guides/tools-web-search)\nor [file search](https://developers.openai.com/api/docs/guides/tools-file-search) to use your own data\nas input for the model's response.\n",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BetaCreateResponse"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaResponse"
+                }
+              },
+              "text/event-stream": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaResponseStreamEvent"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Create a model response",
+          "group": "responses",
+          "path": "create",
+          "examples": [
+            {
+              "title": "Text input",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": \"Tell me a three sentence bedtime story about a unicorn.\"\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    input: \"Tell me a three sentence bedtime story about a unicorn.\"\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n  model=\"gpt-6-astra\",\n  input=\"Tell me a three sentence bedtime story about a unicorn.\"\n)\n\nprint(response)\n",
+                "csharp": "using System;\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nOpenAIResponse response = client.CreateResponse(\"Tell me a three sentence bedtime story about a unicorn.\");\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccd2bed1ec8190b14f964abc0542670bb6a6b452d3795b\",\n  \"object\": \"response\",\n  \"created_at\": 1741476542,\n  \"status\": \"completed\",\n  \"completed_at\": 1741476543,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccd2bf17f0819081ff3bb2cf6508e60bb6a6b452d3795b\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"In a peaceful grove beneath a silver moon, a unicorn named Lumina discovered a hidden pool that reflected the stars. As she dipped her horn into the water, the pool began to shimmer, revealing a pathway to a magical realm of endless night skies. Filled with wonder, Lumina whispered a wish for all who dream to find their own hidden magic, and as she glanced back, her hoofprints sparkled like stardust.\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 36,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 87,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 123\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "Image input",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": [\n      {\n        \"role\": \"user\",\n        \"content\": [\n          {\"type\": \"input_text\", \"text\": \"what is in this image?\"},\n          {\n            \"type\": \"input_image\",\n            \"image_url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\"\n          }\n        ]\n      }\n    ]\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    input: [\n        {\n            role: \"user\",\n            content: [\n                { type: \"input_text\", text: \"what is in this image?\" },\n                {\n                    type: \"input_image\",\n                    image_url:\n                        \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\",\n                },\n            ],\n        },\n    ],\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    input=[\n        {\n            \"role\": \"user\",\n            \"content\": [\n                { \"type\": \"input_text\", \"text\": \"what is in this image?\" },\n                {\n                    \"type\": \"input_image\",\n                    \"image_url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\"\n                }\n            ]\n        }\n    ]\n)\n\nprint(response)\n",
+                "csharp": "using System;\nusing System.Collections.Generic;\n\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nList<ResponseItem> inputItems =\n[\n    ResponseItem.CreateUserMessageItem(\n        [\n            ResponseContentPart.CreateInputTextPart(\"What is in this image?\"),\n            ResponseContentPart.CreateInputImagePart(new Uri(\"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\"))\n        ]\n    )\n];\n\nOpenAIResponse response = client.CreateResponse(inputItems);\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccd3a9da748190baa7f1570fe91ac604becb25c45c1d41\",\n  \"object\": \"response\",\n  \"created_at\": 1741476777,\n  \"status\": \"completed\",\n  \"completed_at\": 1741476778,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccd3acc8d48190a77525dc6de64b4104becb25c45c1d41\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"The image depicts a scenic landscape with a wooden boardwalk or pathway leading through lush, green grass under a blue sky with some clouds. The setting suggests a peaceful natural area, possibly a park or nature reserve. There are trees and shrubs in the background.\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 328,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 52,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 380\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "File input",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": [\n      {\n        \"role\": \"user\",\n        \"content\": [\n          {\"type\": \"input_text\", \"text\": \"what is in this file?\"},\n          {\n            \"type\": \"input_file\",\n            \"file_url\": \"https://www.berkshirehathaway.com/letters/2024ltr.pdf\",\n            \"detail\": \"auto\"\n          }\n        ]\n      }\n    ]\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    input: [\n        {\n            role: \"user\",\n            content: [\n                { type: \"input_text\", text: \"what is in this file?\" },\n                {\n                    type: \"input_file\",\n                    file_url: \"https://www.berkshirehathaway.com/letters/2024ltr.pdf\",\n                    detail: \"auto\",\n                },\n            ],\n        },\n    ],\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    input=[\n        {\n            \"role\": \"user\",\n            \"content\": [\n                { \"type\": \"input_text\", \"text\": \"what is in this file?\" },\n                {\n                    \"type\": \"input_file\",\n                    \"file_url\": \"https://www.berkshirehathaway.com/letters/2024ltr.pdf\",\n                    \"detail\": \"auto\"\n                }\n            ]\n        }\n    ]\n)\n\nprint(response)\n"
+              },
+              "response": "{\n  \"id\": \"resp_686eef60237881a2bd1180bb8b13de430e34c516d176ff86\",\n  \"object\": \"response\",\n  \"created_at\": 1752100704,\n  \"status\": \"completed\",\n  \"completed_at\": 1752100705,\n  \"background\": false,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"max_tool_calls\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"id\": \"msg_686eef60d3e081a29283bdcbc4322fd90e34c516d176ff86\",\n      \"type\": \"message\",\n      \"status\": \"completed\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"annotations\": [],\n          \"logprobs\": [],\n          \"text\": \"The file seems to contain excerpts from a letter to the shareholders of Berkshire Hathaway Inc., likely written by Warren Buffett. It covers several topics:\\n\\n1. **Communication Philosophy**: Buffett emphasizes the importance of transparency and candidness in reporting mistakes and successes to shareholders.\\n\\n2. **Mistakes and Learnings**: The letter acknowledges past mistakes in business assessments and management hires, highlighting the importance of correcting errors promptly.\\n\\n3. **CEO Succession**: Mention of Greg Abel stepping in as the new CEO and continuing the tradition of honest communication.\\n\\n4. **Pete Liegl Story**: A detailed account of acquiring Forest River and the relationship with its founder, highlighting trust and effective business decisions.\\n\\n5. **2024 Performance**: Overview of business performance, particularly in insurance and investment activities, with a focus on GEICO's improvement.\\n\\n6. **Tax Contributions**: Discussion of significant tax payments to the U.S. Treasury, credited to shareholders' reinvestments.\\n\\n7. **Investment Strategy**: A breakdown of Berkshire\\u2019s investments in both controlled subsidiaries and marketable equities, along with a focus on long-term holding strategies.\\n\\n8. **American Capitalism**: Reflections on America\\u2019s economic development and Berkshire\\u2019s role within it.\\n\\n9. **Property-Casualty Insurance**: Insights into the P/C insurance business model and its challenges and benefits.\\n\\n10. **Japanese Investments**: Information about Berkshire\\u2019s investments in Japanese companies and future plans.\\n\\n11. **Annual Meeting**: Details about the upcoming annual gathering in Omaha, including schedule changes and new book releases.\\n\\n12. **Personal Anecdotes**: Light-hearted stories about family and interactions, conveying Buffett's personable approach.\\n\\n13. **Financial Performance Data**: Tables comparing Berkshire\\u2019s annual performance to the S&P 500, showing impressive long-term gains.\\n\\nOverall, the letter reinforces Berkshire Hathaway's commitment to transparency, investment in both its businesses and the wider economy, and emphasizes strong leadership and prudent financial management.\"\n        }\n      ],\n      \"role\": \"assistant\"\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"service_tier\": \"default\",\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_logprobs\": 0,\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 8438,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 398,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 8836\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "Web search",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"tools\": [{ \"type\": \"web_search_preview\" }],\n    \"input\": \"What was a positive news story from today?\"\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    tools: [{ type: \"web_search_preview\" }],\n    input: \"What was a positive news story from today?\",\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    tools=[{ \"type\": \"web_search_preview\" }],\n    input=\"What was a positive news story from today?\",\n)\n\nprint(response)\n",
+                "csharp": "using System;\n\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nstring userInputText = \"What was a positive news story from today?\";\n\nResponseCreationOptions options = new()\n{\n    Tools =\n    {\n        ResponseTool.CreateWebSearchTool()\n    },\n};\n\nOpenAIResponse response = client.CreateResponse(userInputText, options);\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccf18ef5fc8190b16dbee19bc54e5f087bb177ab789d5c\",\n  \"object\": \"response\",\n  \"created_at\": 1741484430,\n  \"status\": \"completed\",\n  \"completed_at\": 1741484431,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"web_search_call\",\n      \"id\": \"ws_67ccf18f64008190a39b619f4c8455ef087bb177ab789d5c\",\n      \"status\": \"completed\"\n    },\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccf190ca3881909d433c50b1f6357e087bb177ab789d5c\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"As of today, March 9, 2025, one notable positive news story...\",\n          \"annotations\": [\n            {\n              \"type\": \"url_citation\",\n              \"start_index\": 442,\n              \"end_index\": 557,\n              \"url\": \"https://.../?utm_source=chatgpt.com\",\n              \"title\": \"...\"\n            },\n            {\n              \"type\": \"url_citation\",\n              \"start_index\": 962,\n              \"end_index\": 1077,\n              \"url\": \"https://.../?utm_source=chatgpt.com\",\n              \"title\": \"...\"\n            },\n            {\n              \"type\": \"url_citation\",\n              \"start_index\": 1336,\n              \"end_index\": 1451,\n              \"url\": \"https://.../?utm_source=chatgpt.com\",\n              \"title\": \"...\"\n            }\n          ]\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [\n    {\n      \"type\": \"web_search_preview\",\n      \"domains\": [],\n      \"search_context_size\": \"medium\",\n      \"user_location\": {\n        \"type\": \"approximate\",\n        \"city\": null,\n        \"country\": \"US\",\n        \"region\": null,\n        \"timezone\": null\n      }\n    }\n  ],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 328,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 356,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 684\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "File search",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"tools\": [{\n      \"type\": \"file_search\",\n      \"vector_store_ids\": [\"vs_1234567890\"],\n      \"max_num_results\": 20\n    }],\n    \"input\": \"What are the attributes of an ancient brown dragon?\"\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    tools: [{\n      type: \"file_search\",\n      vector_store_ids: [\"vs_1234567890\"],\n      max_num_results: 20\n    }],\n    input: \"What are the attributes of an ancient brown dragon?\",\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    tools=[{\n      \"type\": \"file_search\",\n      \"vector_store_ids\": [\"vs_1234567890\"],\n      \"max_num_results\": 20\n    }],\n    input=\"What are the attributes of an ancient brown dragon?\",\n)\n\nprint(response)\n",
+                "csharp": "using System;\n\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nstring userInputText = \"What are the attributes of an ancient brown dragon?\";\n\nResponseCreationOptions options = new()\n{\n    Tools =\n    {\n        ResponseTool.CreateFileSearchTool(\n            vectorStoreIds: [\"vs_1234567890\"],\n            maxResultCount: 20\n        )\n    },\n};\n\nOpenAIResponse response = client.CreateResponse(userInputText, options);\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccf4c55fc48190b71bd0463ad3306d09504fb6872380d7\",\n  \"object\": \"response\",\n  \"created_at\": 1741485253,\n  \"status\": \"completed\",\n  \"completed_at\": 1741485254,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"file_search_call\",\n      \"id\": \"fs_67ccf4c63cd08190887ef6464ba5681609504fb6872380d7\",\n      \"status\": \"completed\",\n      \"queries\": [\n        \"attributes of an ancient brown dragon\"\n      ],\n      \"results\": null\n    },\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccf4c93e5c81909d595b369351a9d309504fb6872380d7\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"The attributes of an ancient brown dragon include...\",\n          \"annotations\": [\n            {\n              \"type\": \"file_citation\",\n              \"index\": 320,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 576,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 815,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 815,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 1030,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 1030,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 1156,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            },\n            {\n              \"type\": \"file_citation\",\n              \"index\": 1225,\n              \"file_id\": \"file-4wDz5b167pAf72nx1h9eiN\",\n              \"filename\": \"dragons.pdf\"\n            }\n          ]\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [\n    {\n      \"type\": \"file_search\",\n      \"filters\": null,\n      \"max_num_results\": 20,\n      \"ranking_options\": {\n        \"ranker\": \"auto\",\n        \"score_threshold\": 0.0\n      },\n      \"vector_store_ids\": [\n        \"vs_1234567890\"\n      ]\n    }\n  ],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 18307,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 348,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 18655\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "Streaming",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"instructions\": \"You are a helpful assistant.\",\n    \"input\": \"Hello!\",\n    \"stream\": true\n  }'\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.create(\n  model=\"gpt-6-astra\",\n  instructions=\"You are a helpful assistant.\",\n  input=\"Hello!\",\n  stream=True\n)\n\nfor event in response:\n  print(event)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    instructions: \"You are a helpful assistant.\",\n    input: \"Hello!\",\n    stream: true,\n});\n\nfor await (const event of response) {\n    console.log(event);\n}\n",
+                "csharp": "using System;\nusing System.ClientModel;\nusing System.Threading.Tasks;\n\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nstring userInputText = \"Hello!\";\n\nResponseCreationOptions options = new()\n{\n    Instructions = \"You are a helpful assistant.\",\n};\n\nAsyncCollectionResult<StreamingResponseUpdate> responseUpdates = client.CreateResponseStreamingAsync(userInputText, options);\n\nawait foreach (StreamingResponseUpdate responseUpdate in responseUpdates)\n{\n    if (responseUpdate is StreamingResponseOutputTextDeltaUpdate outputTextDeltaUpdate)\n    {\n        Console.Write(outputTextDeltaUpdate.Delta);\n    }\n}\n"
+              },
+              "response": "event: response.created\ndata: {\"type\":\"response.created\",\"response\":{\"id\":\"resp_67c9fdcecf488190bdd9a0409de3a1ec07b8b0ad4e5eb654\",\"object\":\"response\",\"created_at\":1741290958,\"status\":\"in_progress\",\"error\":null,\"incomplete_details\":null,\"instructions\":\"You are a helpful assistant.\",\"max_output_tokens\":null,\"model\":\"gpt-6-astra\",\"output\":[],\"parallel_tool_calls\":true,\"previous_response_id\":null,\"reasoning\":{\"effort\":null,\"summary\":null},\"store\":true,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"}},\"tool_choice\":\"auto\",\"tools\":[],\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}}}\n\nevent: response.in_progress\ndata: {\"type\":\"response.in_progress\",\"response\":{\"id\":\"resp_67c9fdcecf488190bdd9a0409de3a1ec07b8b0ad4e5eb654\",\"object\":\"response\",\"created_at\":1741290958,\"status\":\"in_progress\",\"error\":null,\"incomplete_details\":null,\"instructions\":\"You are a helpful assistant.\",\"max_output_tokens\":null,\"model\":\"gpt-6-astra\",\"output\":[],\"parallel_tool_calls\":true,\"previous_response_id\":null,\"reasoning\":{\"effort\":null,\"summary\":null},\"store\":true,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"}},\"tool_choice\":\"auto\",\"tools\":[],\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}}}\n\nevent: response.output_item.added\ndata: {\"type\":\"response.output_item.added\",\"output_index\":0,\"item\":{\"id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"type\":\"message\",\"status\":\"in_progress\",\"role\":\"assistant\",\"content\":[]}}\n\nevent: response.content_part.added\ndata: {\"type\":\"response.content_part.added\",\"item_id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"output_index\":0,\"content_index\":0,\"part\":{\"type\":\"output_text\",\"text\":\"\",\"annotations\":[]}}\n\nevent: response.output_text.delta\ndata: {\"type\":\"response.output_text.delta\",\"item_id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"output_index\":0,\"content_index\":0,\"delta\":\"Hi\"}\n\n...\n\nevent: response.output_text.done\ndata: {\"type\":\"response.output_text.done\",\"item_id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"output_index\":0,\"content_index\":0,\"text\":\"Hi there! How can I assist you today?\"}\n\nevent: response.content_part.done\ndata: {\"type\":\"response.content_part.done\",\"item_id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"output_index\":0,\"content_index\":0,\"part\":{\"type\":\"output_text\",\"text\":\"Hi there! How can I assist you today?\",\"annotations\":[]}}\n\nevent: response.output_item.done\ndata: {\"type\":\"response.output_item.done\",\"output_index\":0,\"item\":{\"id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"type\":\"message\",\"status\":\"completed\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Hi there! How can I assist you today?\",\"annotations\":[]}]}}\n\nevent: response.completed\ndata: {\"type\":\"response.completed\",\"response\":{\"id\":\"resp_67c9fdcecf488190bdd9a0409de3a1ec07b8b0ad4e5eb654\",\"object\":\"response\",\"created_at\":1741290958,\"status\":\"completed\",\"error\":null,\"incomplete_details\":null,\"instructions\":\"You are a helpful assistant.\",\"max_output_tokens\":null,\"model\":\"gpt-6-astra\",\"output\":[{\"id\":\"msg_67c9fdcf37fc8190ba82116e33fb28c507b8b0ad4e5eb654\",\"type\":\"message\",\"status\":\"completed\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Hi there! How can I assist you today?\",\"annotations\":[]}]}],\"parallel_tool_calls\":true,\"previous_response_id\":null,\"reasoning\":{\"effort\":null,\"summary\":null},\"store\":true,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"}},\"tool_choice\":\"auto\",\"tools\":[],\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":{\"input_tokens\":37,\"output_tokens\":11,\"output_tokens_details\":{\"reasoning_tokens\":0},\"total_tokens\":48},\"user\":null,\"metadata\":{}}}\n"
+            },
+            {
+              "title": "Functions",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": \"What is the weather like in Boston today?\",\n    \"tools\": [\n      {\n        \"type\": \"function\",\n        \"name\": \"get_current_weather\",\n        \"description\": \"Get the current weather in a given location\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"location\": {\n              \"type\": \"string\",\n              \"description\": \"The city and state, e.g. San Francisco, CA\"\n            },\n            \"unit\": {\n              \"type\": \"string\",\n              \"enum\": [\"celsius\", \"fahrenheit\"]\n            }\n          },\n          \"required\": [\"location\", \"unit\"]\n        }\n      }\n    ],\n    \"tool_choice\": \"auto\"\n  }'\n",
+                "python": "from openai import OpenAI\n\nclient = OpenAI()\n\ntools = [\n    {\n        \"type\": \"function\",\n        \"name\": \"get_current_weather\",\n        \"description\": \"Get the current weather in a given location\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n              \"location\": {\n                  \"type\": \"string\",\n                  \"description\": \"The city and state, e.g. San Francisco, CA\",\n              },\n              \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]},\n          },\n          \"required\": [\"location\", \"unit\"],\n        }\n    }\n]\n\nresponse = client.responses.create(\n  model=\"gpt-6-astra\",\n  tools=tools,\n  input=\"What is the weather like in Boston today?\",\n  tool_choice=\"auto\"\n)\n\nprint(response)\n",
+                "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\nconst tools = [\n    {\n        type: \"function\",\n        name: \"get_current_weather\",\n        description: \"Get the current weather in a given location\",\n        parameters: {\n            type: \"object\",\n            properties: {\n                location: {\n                    type: \"string\",\n                    description: \"The city and state, e.g. San Francisco, CA\",\n                },\n                unit: { type: \"string\", enum: [\"celsius\", \"fahrenheit\"] },\n            },\n            required: [\"location\", \"unit\"],\n        },\n    },\n];\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    tools: tools,\n    input: \"What is the weather like in Boston today?\",\n    tool_choice: \"auto\",\n});\n\nconsole.log(response);\n",
+                "csharp": "using System;\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nResponseTool getCurrentWeatherFunctionTool = ResponseTool.CreateFunctionTool(\n    functionName: \"get_current_weather\",\n    functionDescription: \"Get the current weather in a given location\",\n    functionParameters: BinaryData.FromString(\"\"\"\n        {\n            \"type\": \"object\",\n            \"properties\": {\n                \"location\": {\n                    \"type\": \"string\",\n                    \"description\": \"The city and state, e.g. San Francisco, CA\"\n                },\n                \"unit\": {\"type\": \"string\", \"enum\": [\"celsius\", \"fahrenheit\"]}\n            },\n            \"required\": [\"location\", \"unit\"]\n        }\n        \"\"\"\n    )\n);\n\nstring userInputText = \"What is the weather like in Boston today?\";\n\nResponseCreationOptions options = new()\n{\n    Tools =\n    {\n        getCurrentWeatherFunctionTool\n    },\n    ToolChoice = ResponseToolChoice.CreateAutoChoice(),\n};\n\nOpenAIResponse response = client.CreateResponse(userInputText, options);\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ca09c5efe0819096d0511c92b8c890096610f474011cc0\",\n  \"object\": \"response\",\n  \"created_at\": 1741294021,\n  \"status\": \"completed\",\n  \"completed_at\": 1741294022,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"function_call\",\n      \"id\": \"fc_67ca09c6bedc8190a7abfec07b1a1332096610f474011cc0\",\n      \"call_id\": \"call_unLAR8MvFNptuiZK6K6HCy5k\",\n      \"name\": \"get_current_weather\",\n      \"arguments\": \"{\\\"location\\\":\\\"Boston, MA\\\",\\\"unit\\\":\\\"celsius\\\"}\",\n      \"status\": \"completed\"\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [\n    {\n      \"type\": \"function\",\n      \"description\": \"Get the current weather in a given location\",\n      \"name\": \"get_current_weather\",\n      \"parameters\": {\n        \"type\": \"object\",\n        \"properties\": {\n          \"location\": {\n            \"type\": \"string\",\n            \"description\": \"The city and state, e.g. San Francisco, CA\"\n          },\n          \"unit\": {\n            \"type\": \"string\",\n            \"enum\": [\n              \"celsius\",\n              \"fahrenheit\"\n            ]\n          }\n        },\n        \"required\": [\n          \"location\",\n          \"unit\"\n        ]\n      },\n      \"strict\": true\n    }\n  ],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 291,\n    \"output_tokens\": 23,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 314\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            },
+            {
+              "title": "Reasoning",
+              "request": {
+                "curl": "curl https://api.openai.com/v1/responses \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n  -d '{\n    \"model\": \"gpt-6-astra\",\n    \"input\": \"How much wood would a woodchuck chuck?\",\n    \"reasoning\": {\n      \"effort\": \"high\"\n    }\n  }'\n",
+                "javascript": "import OpenAI from \"openai\";\nconst openai = new OpenAI();\n\nconst response = await openai.responses.create({\n    model: \"gpt-6-astra\",\n    input: \"How much wood would a woodchuck chuck?\",\n    reasoning: {\n      effort: \"high\"\n    }\n});\n\nconsole.log(response);\n",
+                "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.create(\n    model=\"gpt-6-astra\",\n    input=\"How much wood would a woodchuck chuck?\",\n    reasoning={\n        \"effort\": \"high\"\n    }\n)\n\nprint(response)\n",
+                "csharp": "using System;\nusing OpenAI.Responses;\n\nOpenAIResponseClient client = new(\n    model: \"gpt-6-astra\",\n    apiKey: Environment.GetEnvironmentVariable(\"OPENAI_API_KEY\")\n);\n\nstring userInputText = \"How much wood would a woodchuck chuck?\";\n\nResponseCreationOptions options = new()\n{\n    ReasoningOptions = new()\n    {\n        ReasoningEffortLevel = ResponseReasoningEffortLevel.High,\n    },\n};\n\nOpenAIResponse response = client.CreateResponse(userInputText, options);\n\nConsole.WriteLine(response.GetOutputText());\n"
+              },
+              "response": "{\n  \"id\": \"resp_67ccd7eca01881908ff0b5146584e408072912b2993db808\",\n  \"object\": \"response\",\n  \"created_at\": 1741477868,\n  \"status\": \"completed\",\n  \"completed_at\": 1741477869,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67ccd7f7b5848190a6f3e95d809f6b44072912b2993db808\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"The classic tongue twister...\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": \"high\",\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 81,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 1035,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 832\n    },\n    \"total_tokens\": 1116\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+            }
+          ]
+        },
+        "parameters": [
+          {
+            "name": "openai-beta",
+            "in": "header",
+            "required": false,
+            "description": "Optional beta features to enable for this request.",
+            "style": "simple",
+            "explode": false,
+            "schema": {
+              "type": "array",
+              "x-stainless-param": "betas",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "responses_multi_agent=v1"
+                ]
+              }
+            }
+          }
+        ]
+      }
+    },
+    "/responses/{response_id}?beta=true": {
+      "get": {
+        "operationId": "beta_getResponse",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Retrieves a model response with the given ID.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "response_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "resp_677efb5139a88190b512bc3fef8e535d"
+            },
+            "description": "The ID of the response to retrieve."
+          },
+          {
+            "in": "query",
+            "name": "include",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/BetaIncludeEnum"
+              }
+            },
+            "description": "Additional fields to include in the response. See the `include`\nparameter for Response creation above for more information.\n"
+          },
+          {
+            "in": "query",
+            "name": "stream",
+            "schema": {
+              "type": "boolean"
+            },
+            "description": "If set to true, the model response data will be streamed to the client\nas it is generated using [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format).\nSee the [Streaming section below](https://developers.openai.com/api/reference/resources/responses/streaming-events)\nfor more information.\n"
+          },
+          {
+            "in": "query",
+            "name": "starting_after",
+            "schema": {
+              "type": "integer"
+            },
+            "description": "The sequence number of the event after which to start streaming.\n"
+          },
+          {
+            "in": "query",
+            "name": "include_obfuscation",
+            "schema": {
+              "type": "boolean"
+            },
+            "description": "When true, stream obfuscation will be enabled. Stream obfuscation adds\nrandom characters to an `obfuscation` field on streaming delta events\nto normalize payload sizes as a mitigation to certain side-channel\nattacks. These obfuscation fields are included by default, but add a\nsmall amount of overhead to the data stream. You can set\n`include_obfuscation` to false to optimize for bandwidth if you trust\nthe network links between your application and the OpenAI API.\n"
+          },
+          {
+            "name": "openai-beta",
+            "in": "header",
+            "required": false,
+            "description": "Optional beta features to enable for this request.",
+            "style": "simple",
+            "explode": false,
+            "schema": {
+              "type": "array",
+              "x-stainless-param": "betas",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "responses_multi_agent=v1"
+                ]
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaResponse"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get a model response",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/responses/resp_123 \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst response = await client.responses.retrieve(\"resp_123\");\nconsole.log(response);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.retrieve(\"resp_123\")\nprint(response)\n"
+            },
+            "response": "{\n  \"id\": \"resp_67cb71b351908190a308f3859487620d06981a8637e6bc44\",\n  \"object\": \"response\",\n  \"created_at\": 1741386163,\n  \"status\": \"completed\",\n  \"completed_at\": 1741386164,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67cb71b3c2b0819084d481baaaf148f206981a8637e6bc44\",\n      \"status\": \"completed\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"Silent circuits hum,  \\nThoughts emerge in data streams—  \\nDigital dawn breaks.\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": {\n    \"input_tokens\": 32,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 18,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 0\n    },\n    \"total_tokens\": 50\n  },\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+          }
+        }
+      },
+      "delete": {
+        "operationId": "beta_deleteResponse",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Deletes a model response with the given ID.\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "response_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "resp_677efb5139a88190b512bc3fef8e535d"
+            },
+            "description": "The ID of the response to delete."
+          },
+          {
+            "name": "openai-beta",
+            "in": "header",
+            "required": false,
+            "description": "Optional beta features to enable for this request.",
+            "style": "simple",
+            "explode": false,
+            "schema": {
+              "type": "array",
+              "x-stainless-param": "betas",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "responses_multi_agent=v1"
+                ]
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaError"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Delete a model response",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl -X DELETE https://api.openai.com/v1/responses/resp_123 \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst response = await client.responses.delete(\"resp_123\");\nconsole.log(response);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.delete(\"resp_123\")\nprint(response)\n"
+            },
+            "response": "{\n  \"id\": \"resp_6786a1bec27481909a17d673315b29f6\",\n  \"object\": \"response\",\n  \"deleted\": true\n}\n"
+          }
+        }
+      }
+    },
+    "/responses/{response_id}/cancel?beta=true": {
+      "post": {
+        "operationId": "beta_cancelResponse",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Cancels a model response with the given ID. Only responses created with\nthe `background` parameter set to `true` can be cancelled.\n[Learn more](https://developers.openai.com/api/docs/guides/background).\n",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "response_id",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "example": "resp_677efb5139a88190b512bc3fef8e535d"
+            },
+            "description": "The ID of the response to cancel."
+          },
+          {
+            "name": "openai-beta",
+            "in": "header",
+            "required": false,
+            "description": "Optional beta features to enable for this request.",
+            "style": "simple",
+            "explode": false,
+            "schema": {
+              "type": "array",
+              "x-stainless-param": "betas",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "responses_multi_agent=v1"
+                ]
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaResponse"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaError"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Cancel a response",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/responses/resp_123/cancel \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst response = await client.responses.cancel(\"resp_123\");\nconsole.log(response);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.cancel(\"resp_123\")\nprint(response)\n"
+            },
+            "response": "{\n  \"id\": \"resp_67cb71b351908190a308f3859487620d06981a8637e6bc44\",\n  \"object\": \"response\",\n  \"created_at\": 1741386163,\n  \"status\": \"cancelled\",\n  \"background\": true,\n  \"completed_at\": null,\n  \"error\": null,\n  \"incomplete_details\": null,\n  \"instructions\": null,\n  \"max_output_tokens\": null,\n  \"model\": \"gpt-6-astra\",\n  \"output\": [\n    {\n      \"type\": \"message\",\n      \"id\": \"msg_67cb71b3c2b0819084d481baaaf148f206981a8637e6bc44\",\n      \"status\": \"in_progress\",\n      \"role\": \"assistant\",\n      \"content\": [\n        {\n          \"type\": \"output_text\",\n          \"text\": \"Silent circuits hum,  \\nThoughts emerge in data streams—  \\nDigital dawn breaks.\",\n          \"annotations\": []\n        }\n      ]\n    }\n  ],\n  \"parallel_tool_calls\": true,\n  \"previous_response_id\": null,\n  \"reasoning\": {\n    \"effort\": null,\n    \"summary\": null\n  },\n  \"store\": true,\n  \"temperature\": 1.0,\n  \"text\": {\n    \"format\": {\n      \"type\": \"text\"\n    }\n  },\n  \"tool_choice\": \"auto\",\n  \"tools\": [],\n  \"top_p\": 1.0,\n  \"truncation\": \"disabled\",\n  \"usage\": null,\n  \"user\": null,\n  \"metadata\": {}\n}\n"
+          }
+        }
+      }
+    },
+    "/responses/compact?beta=true": {
+      "post": {
+        "summary": "Compact a conversation. Returns a compacted response object.\n\nLearn when and how to compact long-running conversations in the [conversation state guide](https://developers.openai.com/api/docs/guides/conversation-state#managing-the-context-window). For ZDR-compatible compaction details, see [Compaction (advanced)](https://developers.openai.com/api/docs/guides/conversation-state#compaction-advanced).",
+        "operationId": "beta_Compactconversation",
+        "parameters": [
+          {
+            "name": "openai-beta",
+            "in": "header",
+            "required": false,
+            "description": "Optional beta features to enable for this request.",
+            "style": "simple",
+            "explode": false,
+            "schema": {
+              "type": "array",
+              "x-stainless-param": "betas",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "responses_multi_agent=v1"
+                ]
+              }
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BetaCompactResponseMethodPublicBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaCompactResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/InferenceRateLimited"
+          },
+          "503": {
+            "$ref": "#/components/responses/InferenceServiceUnavailable"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Compact a response",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/responses/compact \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n    -d '{\n      \"model\": \"gpt-6-astra\",\n      \"input\": [\n        {\n          \"role\": \"user\",\n          \"content\": \"Create a simple landing page for a dog petting café.\"\n        },\n        {\n          \"id\": \"msg_001\",\n          \"type\": \"message\",\n          \"status\": \"completed\",\n          \"content\": [\n            {\n              \"type\": \"output_text\",\n              \"annotations\": [],\n              \"logprobs\": [],\n              \"text\": \"Below is a single file, ready-to-use landing page for a dog petting café:...\"\n            }\n          ],\n          \"role\": \"assistant\"\n        }\n      ]\n    }'\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst openai = new OpenAI();\n\n// Compact the previous response if you are running out of tokens\nconst compactedResponse = await openai.responses.compact({\n  model: \"gpt-6-astra\",\n  input: [\n    {\n      role: \"user\",\n      content: \"Create a simple landing page for a dog petting café.\",\n    },\n    // All items returned from previous requests are included here, like reasoning, message, function call, etc.\n    {\n      id: \"msg_030d085c0b53e67e0069332e3a72d4819c96c6f2c4adc15d33\",\n      type: \"message\",\n      status: \"completed\",\n      content: [\n        {\n          type: \"output_text\",\n          annotations: [],\n          logprobs: [],\n          text: \"Below is a single file, ready-to-use landing page for a dog petting café:...\",\n        },\n      ],\n      role: \"assistant\",\n    },\n  ],\n});\n\n// Pass the compactedResponse.output as input to the next request\nconsole.log(compactedResponse);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\n\ncompacted_response = client.responses.compact(\n    model=\"gpt-6-astra\",\n    input=[\n    {\n        \"role\": \"user\",\n        \"content\": \"Create a simple landing page for a dog petting cafe.\",\n    },\n    # All items returned from previous requests are included here, like reasoning, message, function call, etc.\n    {\n        \"id\": \"msg_001\",\n        \"type\": \"message\",\n        \"status\": \"completed\",\n        \"content\": [\n        {\n            \"type\": \"output_text\",\n            \"annotations\": [],\n            \"logprobs\": [],\n            \"text\": \"Below is a single file, ready-to-use landing page for a dog petting café:...\",\n        },\n        ],\n        \"role\": \"assistant\",\n    },\n    ]\n)\n# Pass the compacted_response.output as input to the next request\nprint(compacted_response)\n"
+            },
+            "response": "{\n  \"id\": \"resp_001\",\n  \"object\": \"response.compaction\",\n  \"created_at\": 1764967971,\n  \"output\": [\n    {\n      \"id\": \"msg_000\",\n      \"type\": \"message\",\n      \"status\": \"completed\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"Create a simple landing page for a dog petting cafe.\"\n        }\n      ],\n      \"role\": \"user\"\n    },\n    {\n      \"id\": \"cmp_001\",\n      \"type\": \"compaction\",\n      \"encrypted_content\": \"gAAAAABpM0Yj-...=\"\n    }\n  ],\n  \"usage\": {\n    \"input_tokens\": 139,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"cache_write_tokens\": 0\n    },\n    \"output_tokens\": 438,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 64\n    },\n    \"total_tokens\": 577\n  }\n}\n"
+          }
+        }
+      }
+    },
+    "/responses/{response_id}/input_items?beta=true": {
+      "get": {
+        "operationId": "beta_listInputItems",
+        "tags": [
+          "Responses"
+        ],
+        "summary": "Returns a list of input items for a given response.",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "response_id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "description": "The ID of the response to retrieve input items for."
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "A limit on the number of objects to be returned. Limit can range between\n1 and 100, and the default is 20.\n",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 20
+            }
+          },
+          {
+            "in": "query",
+            "name": "order",
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            },
+            "description": "The order to return the input items in. Default is `desc`.\n- `asc`: Return the input items in ascending order.\n- `desc`: Return the input items in descending order.\n"
+          },
+          {
+            "in": "query",
+            "name": "after",
+            "schema": {
+              "type": "string"
+            },
+            "description": "An item ID to list items after, used in pagination.\n"
+          },
+          {
+            "in": "query",
+            "name": "include",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/BetaIncludeEnum"
+              }
+            },
+            "description": "Additional fields to include in the response. See the `include`\nparameter for Response creation above for more information.\n"
+          },
+          {
+            "name": "openai-beta",
+            "in": "header",
+            "required": false,
+            "description": "Optional beta features to enable for this request.",
+            "style": "simple",
+            "explode": false,
+            "schema": {
+              "type": "array",
+              "x-stainless-param": "betas",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "responses_multi_agent=v1"
+                ]
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaResponseItemList"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "List input items",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl https://api.openai.com/v1/responses/resp_abc123/input_items \\\n  -H \"Content-Type: application/json\" \\\n  -H \"Authorization: Bearer $OPENAI_API_KEY\"\n",
+              "javascript": "import OpenAI from \"openai\";\nconst client = new OpenAI();\n\nconst response = await client.responses.inputItems.list(\"resp_123\");\nconsole.log(response.data);\n",
+              "python": "from openai import OpenAI\nclient = OpenAI()\n\nresponse = client.responses.input_items.list(\"resp_123\")\nprint(response.data)\n"
+            },
+            "response": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"msg_abc123\",\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"Tell me a three sentence bedtime story about a unicorn.\"\n        }\n      ]\n    }\n  ],\n  \"first_id\": \"msg_abc123\",\n  \"last_id\": \"msg_abc123\",\n  \"has_more\": false\n}\n"
+          }
+        }
+      }
+    },
+    "/responses/input_tokens?beta=true": {
+      "post": {
+        "summary": "Returns input token counts of the request.\n\nReturns an object with `object` set to `response.input_tokens` and an `input_tokens` count.",
+        "operationId": "beta_Getinputtokencounts",
+        "parameters": [
+          {
+            "name": "openai-beta",
+            "in": "header",
+            "required": false,
+            "description": "Optional beta features to enable for this request.",
+            "style": "simple",
+            "explode": false,
+            "schema": {
+              "type": "array",
+              "x-stainless-param": "betas",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "responses_multi_agent=v1"
+                ]
+              }
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BetaTokenCountsBody"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/BetaTokenCountsResource"
+                }
+              }
+            }
+          },
+          "429": {
+            "$ref": "#/components/responses/TooManyRequests"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "Get input token counts",
+          "group": "responses",
+          "examples": {
+            "request": {
+              "curl": "curl -X POST https://api.openai.com/v1/responses/input_tokens \\\n    -H \"Content-Type: application/json\" \\\n    -H \"Authorization: Bearer $OPENAI_API_KEY\" \\\n    -d '{\n      \"model\": \"gpt-6-astra\",\n      \"input\": \"Tell me a joke.\"\n    }'\n",
+              "javascript": "import OpenAI from \"openai\";\n\nconst client = new OpenAI();\n\nconst response = await client.responses.inputTokens.count({\n  model: \"gpt-6-astra\",\n  input: \"Tell me a joke.\",\n});\n\nconsole.log(response.input_tokens);\n",
+              "python": "from openai import OpenAI\n\nclient = OpenAI()\n\nresponse = client.responses.input_tokens.count(\n    model=\"gpt-6-astra\",\n    input=\"Tell me a joke.\"\n)\nprint(response.input_tokens)\n",
+              "go": "package main\n\nimport (\n  \"context\"\n  \"fmt\"\n\n  \"github.com/openai/openai-go\"\n  \"github.com/openai/openai-go/responses\"\n)\n\nfunc main() {\n  client := openai.NewClient()\n  response, err := client.Responses.InputTokens.Count(context.TODO(), responses.InputTokenCountParams{\n    Model: \"gpt-6-astra\",\n    Input: \"Tell me a joke.\",\n  })\n  if err != nil {\n    panic(err.Error())\n  }\n  fmt.Printf(\"%+v\\n\", response.InputTokens)\n}\n",
+              "ruby": "require \"openai\"\n\nopenai = OpenAI::Client.new\n\nresponse = openai.responses.input_tokens.count(model: \"gpt-6-astra\", input: \"Tell me a joke.\")\n\nputs(response)\n",
+              "java": "package com.openai.example;\n\nimport com.openai.client.OpenAIClient;\nimport com.openai.client.okhttp.OpenAIOkHttpClient;\nimport com.openai.models.responses.inputtokens.InputTokenCountParams;\nimport com.openai.models.responses.inputtokens.InputTokenCountResponse;\n\npublic final class Main {\n    private Main() {}\n\n    public static void main(String[] args) {\n        OpenAIClient client = OpenAIOkHttpClient.fromEnv();\n\n        InputTokenCountParams params = InputTokenCountParams.builder()\n            .model(\"gpt-6-astra\")\n            .input(\"Tell me a joke.\")\n            .build();\n\n        InputTokenCountResponse response = client.responses().inputTokens().count(params);\n    }\n}\n"
+            },
+            "response": "{\n  \"object\": \"response.input_tokens\",\n  \"input_tokens\": 11\n}\n"
+          }
+        }
+      }
+    }
+  },
+  "webhooks": {
+    "batch_cancelled": {
+      "post": {
+        "description": "Sent when a batch has been cancelled.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookBatchCancelled"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "batch_completed": {
+      "post": {
+        "description": "Sent when a batch has completed processing.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookBatchCompleted"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "batch_expired": {
+      "post": {
+        "description": "Sent when a batch has expired before completion.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookBatchExpired"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "batch_failed": {
+      "post": {
+        "description": "Sent when a batch has failed.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookBatchFailed"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "eval_run_canceled": {
+      "post": {
+        "description": "Sent when an eval run has been canceled.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookEvalRunCanceled"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "eval_run_failed": {
+      "post": {
+        "description": "Sent when an eval run has failed.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookEvalRunFailed"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "eval_run_succeeded": {
+      "post": {
+        "description": "Sent when an eval run has succeeded.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookEvalRunSucceeded"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "fine_tuning_job_cancelled": {
+      "post": {
+        "description": "Sent when a fine-tuning job has been cancelled.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookFineTuningJobCancelled"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "fine_tuning_job_failed": {
+      "post": {
+        "description": "Sent when a fine-tuning job has failed.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookFineTuningJobFailed"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "fine_tuning_job_succeeded": {
+      "post": {
+        "description": "Sent when a fine-tuning job has succeeded.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookFineTuningJobSucceeded"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "live_call_incoming": {
+      "post": {
+        "deprecated": true,
+        "description": "Deprecated: use `live.transport.incoming`. Retained only for existing subscriptions.\nSent when an incoming API SIP session is available for Live acceptance.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookLiveCallIncoming"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200\nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "live_transport_incoming": {
+      "post": {
+        "description": "Sent when an incoming API SIP session is available for Live acceptance.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookLiveTransportIncoming"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200\nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "realtime_call_incoming": {
+      "post": {
+        "description": "Sent when an incoming API SIP session is available for Realtime acceptance.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookRealtimeCallIncoming"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200\nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "response_cancelled": {
+      "post": {
+        "description": "Sent when a background response has been cancelled.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookResponseCancelled"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "response_completed": {
+      "post": {
+        "description": "Sent when a background response has completed successfully.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookResponseCompleted"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried. \n"
+          }
+        }
+      }
+    },
+    "response_failed": {
+      "post": {
+        "description": "Sent when a background response has failed.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookResponseFailed"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "response_incomplete": {
+      "post": {
+        "description": "Sent when a background response is incomplete.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookResponseIncomplete"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status code to acknowledge receipt of the event. Non-200 \nstatus codes will be retried.\n"
+          }
+        }
+      }
+    },
+    "safety_alert_created": {
+      "post": {
+        "description": "Sent when an approved safety alert is available for an API project.\nRetrieve the alert with a project API key granted `api.safety.alerts.read`.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookSafetyAlertCreated"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return any 2xx status code to acknowledge receipt. A 410 Gone response also stops retries; other non-2xx responses are retried."
+          }
+        }
+      }
+    },
+    "safety_org_alert_created": {
+      "post": {
+        "description": "Sent when an approved safety alert is available for an enterprise workspace.\nRetrieve the alert from `https://api.chatgpt.com/v1/safety/alerts/{id}` with\nan administrator API key for the workspace's backing organization granted\n`chatgpt.enterprise.safety_alerts.read`.\n",
+        "requestBody": {
+          "description": "The event payload sent by the API.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/WebhookSafetyOrgAlertCreated"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return any 2xx status code to acknowledge receipt. A 410 Gone response also stops retries; other non-2xx responses are retried."
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "AddUploadPartRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "data": {
+            "description": "The chunk of bytes for this Part.\n",
+            "type": "string",
+            "format": "binary"
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
+      "AdminApiKey": {
+        "type": "object",
+        "description": "Represents an individual Admin API key in an org.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.admin_api_key"
+            ],
+            "description": "The object type, which is always `organization.admin_api_key`",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "example": "key_abc",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "Administration Key",
+            "description": "The name of the API key"
+          },
+          "redacted_value": {
+            "type": "string",
+            "example": "sk-admin...def",
+            "description": "The redacted value of the API key"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "example": 1711471533,
+            "description": "The Unix timestamp (in seconds) of when the API key was created"
+          },
+          "expires_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime",
+                "example": 1714063533,
+                "description": "The Unix timestamp (in seconds) of when the API key expires"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_used_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime",
+                "example": 1711471534,
+                "description": "The Unix timestamp (in seconds) of when the API key was last used"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "owner": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "example": "user",
+                "description": "Always `user`"
+              },
+              "object": {
+                "type": "string",
+                "example": "organization.user",
+                "description": "The object type, which is always organization.user"
+              },
+              "id": {
+                "type": "string",
+                "example": "sa_456",
+                "description": "The identifier, which can be referenced in API endpoints"
+              },
+              "name": {
+                "type": "string",
+                "example": "My Service Account",
+                "description": "The name of the user"
+              },
+              "created_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "example": 1711471533,
+                "description": "The Unix timestamp (in seconds) of when the user was created"
+              },
+              "role": {
+                "type": "string",
+                "example": "owner",
+                "description": "Always `owner`"
+              }
+            }
+          }
+        },
+        "required": [
+          "object",
+          "redacted_value",
+          "created_at",
+          "expires_at",
+          "id",
+          "owner"
+        ],
+        "x-oaiMeta": {
+          "name": "The admin API key object",
+          "example": "{\n  \"object\": \"organization.admin_api_key\",\n  \"id\": \"key_abc\",\n  \"name\": \"Main Admin Key\",\n  \"redacted_value\": \"sk-admin...xyz\",\n  \"created_at\": 1711471533,\n  \"last_used_at\": 1711471534,\n  \"owner\": {\n    \"type\": \"user\",\n    \"object\": \"organization.user\",\n    \"id\": \"user_123\",\n    \"name\": \"John Doe\",\n    \"created_at\": 1711471533,\n    \"role\": \"owner\"\n  }\n}\n"
+        }
+      },
+      "AdminApiKeyCreateResponse": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/AdminApiKey"
+          },
+          {
+            "type": "object",
+            "description": "The newly created admin API key. The `value` field is only returned once, when the key is created.",
+            "properties": {
+              "value": {
+                "type": "string",
+                "example": "sk-admin-1234abcd",
+                "description": "The value of the API key. Only shown on create."
+              }
+            },
+            "required": [
+              "value"
+            ]
+          }
+        ]
+      },
+      "ApiKeyList": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "example": "list",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AdminApiKey"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "key_abc"
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "key_xyz"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "AssignedRoleDetails": {
+        "type": "object",
+        "description": "Detailed information about a role assignment entry returned when listing assignments.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier for the role."
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the role."
+          },
+          "permissions": {
+            "type": "array",
+            "description": "Permissions associated with the role.",
+            "items": {
+              "type": "string"
+            }
+          },
+          "resource_type": {
+            "type": "string",
+            "description": "Resource type the role applies to."
+          },
+          "predefined_role": {
+            "type": "boolean",
+            "description": "Whether the role is predefined by OpenAI."
+          },
+          "description": {
+            "description": "Description of the role.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_at": {
+            "description": "When the role was created.",
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "updated_at": {
+            "description": "When the role was last updated.",
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_by": {
+            "description": "Identifier of the actor who created the role.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_by_user_obj": {
+            "description": "User details for the actor that created the role, when available.",
+            "anyOf": [
+              {
+                "type": "object",
+                "additionalProperties": true
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "description": "Arbitrary metadata stored on the role.",
+            "anyOf": [
+              {
+                "type": "object",
+                "additionalProperties": true
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "assignment_sources": {
+            "description": "Principals from which the role assignment is inherited, when available.",
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "principal_id": {
+                      "type": "string"
+                    },
+                    "principal_type": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "principal_id",
+                    "principal_type"
+                  ]
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "permissions",
+          "resource_type",
+          "predefined_role",
+          "description",
+          "created_at",
+          "updated_at",
+          "created_by",
+          "created_by_user_obj",
+          "metadata",
+          "assignment_sources"
+        ]
+      },
+      "AssistantObject": {
+        "type": "object",
+        "title": "Assistant",
+        "description": "Represents an `assistant` that can call the model and use tools.",
+        "properties": {
+          "id": {
+            "description": "The identifier, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `assistant`.",
+            "type": "string",
+            "enum": [
+              "assistant"
+            ],
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "description": "The Unix timestamp (in seconds) for when the assistant was created.",
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "description": "The name of the assistant. The maximum length is 256 characters.\n",
+                "type": "string",
+                "maxLength": 256
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "description": {
+            "anyOf": [
+              {
+                "description": "The description of the assistant. The maximum length is 512 characters.\n",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "description": "ID of the model to use. You can use the [List models](https://developers.openai.com/api/reference/resources/models/methods/list) API to see all of your available models, or see our [Model overview](https://developers.openai.com/api/docs/models) for descriptions of them.\n",
+            "type": "string"
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "description": "The system instructions that the assistant uses. The maximum length is 256,000 characters.\n",
+                "type": "string",
+                "maxLength": 256000
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "description": "A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant. Tools can be of types `code_interpreter`, `file_search`, or `function`.\n",
+            "default": [],
+            "type": "array",
+            "maxItems": 128,
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/AssistantToolsCode"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFileSearch"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFunction"
+                }
+              ]
+            }
+          },
+          "tool_resources": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.\n",
+                "properties": {
+                  "code_interpreter": {
+                    "type": "object",
+                    "properties": {
+                      "file_ids": {
+                        "type": "array",
+                        "description": "A list of [file](https://developers.openai.com/api/reference/resources/files) IDs made available to the `code_interpreter`` tool. There can be a maximum of 20 files associated with the tool.\n",
+                        "default": [],
+                        "maxItems": 20,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  },
+                  "file_search": {
+                    "type": "object",
+                    "properties": {
+                      "vector_store_ids": {
+                        "type": "array",
+                        "description": "The ID of the [vector store](https://developers.openai.com/api/reference/resources/vector_stores) attached to this assistant. There can be a maximum of 1 vector store attached to the assistant.\n",
+                        "maxItems": 1,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "temperature": {
+            "anyOf": [
+              {
+                "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\n",
+                "type": "number",
+                "minimum": 0,
+                "maximum": 2,
+                "default": 1,
+                "example": 1
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "top_p": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 1,
+                "default": 1,
+                "example": 1,
+                "description": "An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.\n\nWe generally recommend altering this or temperature but not both.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "response_format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/AssistantsApiResponseFormatOption"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "name",
+          "description",
+          "model",
+          "instructions",
+          "tools",
+          "metadata"
+        ],
+        "x-oaiMeta": {
+          "name": "The assistant object",
+          "example": "{\n  \"id\": \"asst_abc123\",\n  \"object\": \"assistant\",\n  \"created_at\": 1698984975,\n  \"name\": \"Math Tutor\",\n  \"description\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": \"You are a personal math tutor. When asked a question, write and run Python code to answer the question.\",\n  \"tools\": [\n    {\n      \"type\": \"code_interpreter\"\n    }\n  ],\n  \"metadata\": {},\n  \"top_p\": 1.0,\n  \"temperature\": 1.0,\n  \"response_format\": \"auto\"\n}\n"
+        },
+        "deprecated": true
+      },
+      "AssistantStreamEvent": {
+        "description": "Represents an event emitted when streaming a Run.\n\nEach event in a server-sent events stream has an `event` and `data` property:\n\n```\nevent: thread.created\ndata: {\"id\": \"thread_123\", \"object\": \"thread\", ...}\n```\n\nWe emit events whenever a new object is created, transitions to a new state, or is being\nstreamed in parts (deltas). For example, we emit `thread.run.created` when a new run\nis created, `thread.run.completed` when a run completes, and so on. When an Assistant chooses\nto create a message during a run, we emit a `thread.message.created event`, a\n`thread.message.in_progress` event, many `thread.message.delta` events, and finally a\n`thread.message.completed` event.\n\nWe may add additional events over time, so we recommend handling unknown events gracefully\nin your code. See the [Assistants API quickstart](https://developers.openai.com/api/docs/assistants/migration) to learn how to\nintegrate the Assistants API with streaming.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ThreadStreamEvent"
+          },
+          {
+            "$ref": "#/components/schemas/RunStreamEvent"
+          },
+          {
+            "$ref": "#/components/schemas/RunStepStreamEvent"
+          },
+          {
+            "$ref": "#/components/schemas/MessageStreamEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ErrorEvent"
+          },
+          {
+            "$ref": "#/components/schemas/DoneEvent"
+          }
+        ],
+        "x-oaiMeta": {
+          "name": "Assistant stream events",
+          "beta": true
+        }
+      },
+      "AssistantSupportedModels": {
+        "type": "string",
+        "enum": [
+          "gpt-5",
+          "gpt-5-mini",
+          "gpt-5-nano",
+          "gpt-5-2025-08-07",
+          "gpt-5-mini-2025-08-07",
+          "gpt-5-nano-2025-08-07",
+          "gpt-4.1",
+          "gpt-4.1-mini",
+          "gpt-4.1-nano",
+          "gpt-4.1-2025-04-14",
+          "gpt-4.1-mini-2025-04-14",
+          "gpt-4.1-nano-2025-04-14",
+          "o3-mini",
+          "o3-mini-2025-01-31",
+          "o1",
+          "o1-2024-12-17",
+          "gpt-4o",
+          "gpt-4o-2024-11-20",
+          "gpt-4o-2024-08-06",
+          "gpt-4o-2024-05-13",
+          "gpt-4o-mini",
+          "gpt-4o-mini-2024-07-18",
+          "gpt-4.5-preview",
+          "gpt-4.5-preview-2025-02-27",
+          "gpt-4-turbo",
+          "gpt-4-turbo-2024-04-09",
+          "gpt-4-0125-preview",
+          "gpt-4-turbo-preview",
+          "gpt-4-1106-preview",
+          "gpt-4-vision-preview",
+          "gpt-4",
+          "gpt-4-0314",
+          "gpt-4-0613",
+          "gpt-4-32k",
+          "gpt-4-32k-0314",
+          "gpt-4-32k-0613",
+          "gpt-3.5-turbo",
+          "gpt-3.5-turbo-16k",
+          "gpt-3.5-turbo-0613",
+          "gpt-3.5-turbo-1106",
+          "gpt-3.5-turbo-0125",
+          "gpt-3.5-turbo-16k-0613"
+        ]
+      },
+      "AssistantToolsCode": {
+        "type": "object",
+        "title": "Code interpreter tool",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of tool being defined: `code_interpreter`",
+            "enum": [
+              "code_interpreter"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "AssistantToolsFileSearch": {
+        "type": "object",
+        "title": "FileSearch tool",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of tool being defined: `file_search`",
+            "enum": [
+              "file_search"
+            ],
+            "x-stainless-const": true
+          },
+          "file_search": {
+            "type": "object",
+            "description": "Overrides for the file search tool.",
+            "properties": {
+              "max_num_results": {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 50,
+                "description": "The maximum number of results the file search tool should output. The default is 20 for `gpt-4*` models and 5 for `gpt-3.5-turbo`. This number should be between 1 and 50 inclusive.\n\nNote that the file search tool may output fewer than `max_num_results` results. See the [file search tool documentation](https://developers.openai.com/api/docs/guides/tools-file-search#retrieval-customization) for more information.\n"
+              },
+              "ranking_options": {
+                "$ref": "#/components/schemas/FileSearchRankingOptions"
+              }
+            }
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "AssistantToolsFileSearchTypeOnly": {
+        "type": "object",
+        "title": "FileSearch tool",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of tool being defined: `file_search`",
+            "enum": [
+              "file_search"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "AssistantToolsFunction": {
+        "type": "object",
+        "title": "Function tool",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of tool being defined: `function`",
+            "enum": [
+              "function"
+            ],
+            "x-stainless-const": true
+          },
+          "function": {
+            "$ref": "#/components/schemas/FunctionObject"
+          }
+        },
+        "required": [
+          "type",
+          "function"
+        ]
+      },
+      "AssistantsApiResponseFormatOption": {
+        "description": "Specifies the format that the model must output. Compatible with [GPT-4o](https://developers.openai.com/api/docs/models/gpt-4o), [GPT-4 Turbo](https://developers.openai.com/api/docs/models/gpt-4-turbo), and all GPT-3.5 Turbo models since `gpt-3.5-turbo-1106`.\n\nSetting to `{ \"type\": \"json_schema\", \"json_schema\": {...} }` enables Structured Outputs which ensures the model will match your supplied JSON schema. Learn more in the [Structured Outputs guide](https://developers.openai.com/api/docs/guides/structured-outputs).\n\nSetting to `{ \"type\": \"json_object\" }` enables JSON mode, which ensures the message the model generates is valid JSON.\n\n**Important:** when using JSON mode, you **must** also instruct the model to produce JSON yourself via a system or user message. Without this, the model may generate an unending stream of whitespace until the generation reaches the token limit, resulting in a long-running and seemingly \"stuck\" request. Also note that the message content may be partially cut off if `finish_reason=\"length\"`, which indicates the generation exceeded `max_tokens` or the conversation exceeded the max context length.\n",
+        "oneOf": [
+          {
+            "type": "string",
+            "description": "`auto` is the default value\n",
+            "enum": [
+              "auto"
+            ],
+            "x-stainless-const": true
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFormatText"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFormatJsonObject"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFormatJsonSchema"
+          }
+        ]
+      },
+      "AssistantsApiToolChoiceOption": {
+        "description": "Controls which (if any) tool is called by the model.\n`none` means the model will not call any tools and instead generates a message.\n`auto` is the default value and means the model can pick between generating a message or calling one or more tools.\n`required` means the model must call one or more tools before responding to the user.\nSpecifying a particular tool like `{\"type\": \"file_search\"}` or `{\"type\": \"function\", \"function\": {\"name\": \"my_function\"}}` forces the model to call that tool.\n",
+        "oneOf": [
+          {
+            "type": "string",
+            "description": "`none` means the model will not call any tools and instead generates a message. `auto` means the model can pick between generating a message or calling one or more tools. `required` means the model must call one or more tools before responding to the user.\n",
+            "enum": [
+              "none",
+              "auto",
+              "required"
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/AssistantsNamedToolChoice"
+          }
+        ]
+      },
+      "AssistantsNamedToolChoice": {
+        "type": "object",
+        "description": "Specifies a tool the model should use. Use to force the model to call a specific tool.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function",
+              "code_interpreter",
+              "file_search"
+            ],
+            "description": "The type of the tool. If type is `function`, the function name must be set"
+          },
+          "function": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the function to call."
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "AudioResponseFormat": {
+        "description": "The format of the output, in one of these options: `json`, `text`, `srt`, `verbose_json`, `vtt`, or `diarized_json`. For `gpt-4o-transcribe` and `gpt-4o-mini-transcribe`, the only supported format is `json`. For `gpt-4o-transcribe-diarize`, the supported formats are `json`, `text`, and `diarized_json`, with `diarized_json` required to receive speaker annotations.\n",
+        "type": "string",
+        "enum": [
+          "json",
+          "text",
+          "srt",
+          "verbose_json",
+          "vtt",
+          "diarized_json"
+        ],
+        "default": "json"
+      },
+      "AudioTranscription": {
+        "type": "object",
+        "properties": {
+          "model": {
+            "description": "The model to use for transcription. Current options are `whisper-1`, `gpt-transcribe`, `gpt-live-transcribe`, `gpt-4o-mini-transcribe`, `gpt-4o-mini-transcribe-2025-12-15`, `gpt-4o-transcribe`, `gpt-4o-transcribe-diarize`, and `gpt-realtime-whisper`. Use `gpt-4o-transcribe-diarize` when you need diarization with speaker labels.\n",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "whisper-1",
+                  "gpt-transcribe",
+                  "gpt-live-transcribe",
+                  "gpt-4o-mini-transcribe",
+                  "gpt-4o-mini-transcribe-2025-12-15",
+                  "gpt-4o-transcribe",
+                  "gpt-4o-transcribe-diarize",
+                  "gpt-realtime-whisper"
+                ]
+              }
+            ]
+          },
+          "language": {
+            "type": "string",
+            "description": "The language of the input audio. Supplying the input language in\n[ISO-639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) (e.g. `en`) format\nwill improve accuracy and latency.\n"
+          },
+          "languages": {
+            "type": "array",
+            "description": "Possible languages of the input audio, in [ISO-639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) format. Supported by `gpt-transcribe` and `gpt-live-transcribe`.\n",
+            "minItems": 1,
+            "items": {
+              "type": "string"
+            }
+          },
+          "keywords": {
+            "type": "array",
+            "description": "Words or phrases to guide transcription of the input audio. Supported by `gpt-transcribe` and `gpt-live-transcribe`.\n",
+            "items": {
+              "type": "string"
+            }
+          },
+          "prompt": {
+            "type": "string",
+            "description": "An optional text to guide the model's style or continue a previous audio\nsegment.\nFor `whisper-1`, the [prompt is a list of keywords](https://developers.openai.com/api/docs/guides/speech-to-text#prompting).\nFor `gpt-4o-transcribe` models (excluding `gpt-4o-transcribe-diarize`), the prompt is a free text string, for example \"expect words related to technology\".\nPrompt is not supported with `gpt-realtime-whisper` in GA Realtime sessions.\n"
+          },
+          "delay": {
+            "type": "string",
+            "description": "Controls how long the model waits before emitting transcription text.\nHigher values can improve transcription accuracy at the cost of latency.\nOnly supported with `gpt-realtime-whisper` in GA Realtime sessions.\n",
+            "enum": [
+              "minimal",
+              "low",
+              "medium",
+              "high",
+              "xhigh"
+            ]
+          }
+        }
+      },
+      "AudioTranscriptionResponse": {
+        "type": "object",
+        "properties": {
+          "model": {
+            "description": "The model used for transcription. Current options are `whisper-1`, `gpt-transcribe`, `gpt-live-transcribe`, `gpt-4o-mini-transcribe`, `gpt-4o-mini-transcribe-2025-12-15`, `gpt-4o-transcribe`, `gpt-4o-transcribe-diarize`, and `gpt-realtime-whisper`.\n",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "whisper-1",
+                  "gpt-transcribe",
+                  "gpt-live-transcribe",
+                  "gpt-4o-mini-transcribe",
+                  "gpt-4o-mini-transcribe-2025-12-15",
+                  "gpt-4o-transcribe",
+                  "gpt-4o-transcribe-diarize",
+                  "gpt-realtime-whisper"
+                ]
+              }
+            ]
+          },
+          "language": {
+            "type": "string",
+            "description": "The language of the input audio.\n"
+          },
+          "languages": {
+            "type": "array",
+            "description": "The possible input audio languages configured for transcription, in [ISO-639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) format.\n",
+            "minItems": 1,
+            "items": {
+              "type": "string"
+            }
+          },
+          "prompt": {
+            "type": "string",
+            "description": "The prompt configured for input audio transcription, when present.\n"
+          }
+        }
+      },
+      "AuditLog": {
+        "type": "object",
+        "description": "A log of a user action or configuration change within this organization.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of this log."
+          },
+          "type": {
+            "$ref": "#/components/schemas/AuditLogEventType"
+          },
+          "effective_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of the event."
+          },
+          "project": {
+            "type": "object",
+            "description": "The project that the action was scoped to. Absent for actions not scoped to projects. Note that any admin actions taken via Admin API keys are associated with the default project.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The project ID."
+              },
+              "name": {
+                "type": "string",
+                "description": "The project title."
+              }
+            }
+          },
+          "actor": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/AuditLogActor"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The tracking ID of the API key."
+              },
+              "data": {
+                "type": "object",
+                "description": "The payload used to create the API key.",
+                "properties": {
+                  "scopes": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    },
+                    "description": "A list of scopes allowed for the API key, e.g. `[\"api.model.request\"]`"
+                  }
+                }
+              }
+            }
+          },
+          "api_key.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The tracking ID of the API key."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the API key.",
+                "properties": {
+                  "scopes": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    },
+                    "description": "A list of scopes allowed for the API key, e.g. `[\"api.model.request\"]`"
+                  }
+                }
+              }
+            }
+          },
+          "api_key.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The tracking ID of the API key."
+              }
+            }
+          },
+          "checkpoint.permission.created": {
+            "type": "object",
+            "description": "The project and fine-tuned model checkpoint that the checkpoint permission was created for.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the checkpoint permission."
+              },
+              "data": {
+                "type": "object",
+                "description": "The payload used to create the checkpoint permission.",
+                "properties": {
+                  "project_id": {
+                    "type": "string",
+                    "description": "The ID of the project that the checkpoint permission was created for."
+                  },
+                  "fine_tuned_model_checkpoint": {
+                    "type": "string",
+                    "description": "The ID of the fine-tuned model checkpoint."
+                  }
+                }
+              }
+            }
+          },
+          "checkpoint.permission.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the checkpoint permission."
+              }
+            }
+          },
+          "external_key.registered": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the external key configuration."
+              },
+              "data": {
+                "type": "object",
+                "description": "The configuration for the external key."
+              }
+            }
+          },
+          "external_key.removed": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the external key configuration."
+              }
+            }
+          },
+          "group.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the group."
+              },
+              "data": {
+                "type": "object",
+                "description": "Information about the created group.",
+                "properties": {
+                  "group_name": {
+                    "type": "string",
+                    "description": "The group name."
+                  }
+                }
+              }
+            }
+          },
+          "group.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the group."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the group.",
+                "properties": {
+                  "group_name": {
+                    "type": "string",
+                    "description": "The updated group name."
+                  }
+                }
+              }
+            }
+          },
+          "group.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the group."
+              }
+            }
+          },
+          "scim.enabled": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the SCIM was enabled for."
+              }
+            }
+          },
+          "scim.disabled": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the SCIM was disabled for."
+              }
+            }
+          },
+          "invite.sent": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the invite."
+              },
+              "data": {
+                "type": "object",
+                "description": "The payload used to create the invite.",
+                "properties": {
+                  "email": {
+                    "type": "string",
+                    "description": "The email invited to the organization."
+                  },
+                  "role": {
+                    "type": "string",
+                    "description": "The role the email was invited to be. Is either `owner` or `member`."
+                  }
+                }
+              }
+            }
+          },
+          "invite.accepted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the invite."
+              }
+            }
+          },
+          "invite.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the invite."
+              }
+            }
+          },
+          "ip_allowlist.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the IP allowlist configuration."
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the IP allowlist configuration."
+              },
+              "allowed_ips": {
+                "type": "array",
+                "description": "The IP addresses or CIDR ranges included in the configuration.",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "ip_allowlist.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the IP allowlist configuration."
+              },
+              "allowed_ips": {
+                "type": "array",
+                "description": "The updated set of IP addresses or CIDR ranges in the configuration.",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "ip_allowlist.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the IP allowlist configuration."
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the IP allowlist configuration."
+              },
+              "allowed_ips": {
+                "type": "array",
+                "description": "The IP addresses or CIDR ranges that were in the configuration.",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "ip_allowlist.config.activated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "configs": {
+                "type": "array",
+                "description": "The configurations that were activated.",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "The ID of the IP allowlist configuration."
+                    },
+                    "name": {
+                      "type": "string",
+                      "description": "The name of the IP allowlist configuration."
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "ip_allowlist.config.deactivated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "configs": {
+                "type": "array",
+                "description": "The configurations that were deactivated.",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "The ID of the IP allowlist configuration."
+                    },
+                    "name": {
+                      "type": "string",
+                      "description": "The name of the IP allowlist configuration."
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "login.succeeded": {
+            "type": "object",
+            "description": "This event has no additional fields beyond the standard audit log attributes."
+          },
+          "login.failed": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "error_code": {
+                "type": "string",
+                "description": "The error code of the failure."
+              },
+              "error_message": {
+                "type": "string",
+                "description": "The error message of the failure."
+              }
+            }
+          },
+          "logout.succeeded": {
+            "type": "object",
+            "description": "This event has no additional fields beyond the standard audit log attributes."
+          },
+          "logout.failed": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "error_code": {
+                "type": "string",
+                "description": "The error code of the failure."
+              },
+              "error_message": {
+                "type": "string",
+                "description": "The error message of the failure."
+              }
+            }
+          },
+          "organization.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The organization ID."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the organization settings.",
+                "properties": {
+                  "title": {
+                    "type": "string",
+                    "description": "The organization title."
+                  },
+                  "description": {
+                    "type": "string",
+                    "description": "The organization description."
+                  },
+                  "name": {
+                    "type": "string",
+                    "description": "The organization name."
+                  },
+                  "threads_ui_visibility": {
+                    "type": "string",
+                    "description": "Visibility of the threads page which shows messages created with the Assistants API and Playground. One of `ANY_ROLE`, `OWNERS`, or `NONE`."
+                  },
+                  "usage_dashboard_visibility": {
+                    "type": "string",
+                    "description": "Visibility of the usage dashboard which shows activity and costs for your organization. One of `ANY_ROLE` or `OWNERS`."
+                  },
+                  "api_call_logging": {
+                    "type": "string",
+                    "description": "How your organization logs data from supported API calls. One of `disabled`, `enabled_per_call`, `enabled_for_all_projects`, or `enabled_for_selected_projects`"
+                  },
+                  "api_call_logging_project_ids": {
+                    "type": "string",
+                    "description": "The list of project ids if api_call_logging is set to `enabled_for_selected_projects`"
+                  }
+                }
+              }
+            }
+          },
+          "project.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The project ID."
+              },
+              "data": {
+                "type": "object",
+                "description": "The payload used to create the project.",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "description": "The project name."
+                  },
+                  "title": {
+                    "type": "string",
+                    "description": "The title of the project as seen on the dashboard."
+                  }
+                }
+              }
+            }
+          },
+          "project.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The project ID."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the project.",
+                "properties": {
+                  "title": {
+                    "type": "string",
+                    "description": "The title of the project as seen on the dashboard."
+                  }
+                }
+              }
+            }
+          },
+          "project.archived": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The project ID."
+              }
+            }
+          },
+          "project.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The project ID."
+              }
+            }
+          },
+          "rate_limit.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The rate limit ID"
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the rate limits.",
+                "properties": {
+                  "max_requests_per_1_minute": {
+                    "type": "integer",
+                    "description": "The maximum requests per minute."
+                  },
+                  "max_tokens_per_1_minute": {
+                    "type": "integer",
+                    "description": "The maximum tokens per minute."
+                  },
+                  "max_images_per_1_minute": {
+                    "type": "integer",
+                    "description": "The maximum images per minute. Only relevant for certain models."
+                  },
+                  "max_audio_megabytes_per_1_minute": {
+                    "type": "integer",
+                    "description": "The maximum audio megabytes per minute. Only relevant for certain models."
+                  },
+                  "max_requests_per_1_day": {
+                    "type": "integer",
+                    "description": "The maximum requests per day. Only relevant for certain models."
+                  },
+                  "batch_1_day_max_input_tokens": {
+                    "type": "integer",
+                    "description": "The maximum batch input tokens per day. Only relevant for certain models."
+                  }
+                }
+              }
+            }
+          },
+          "rate_limit.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The rate limit ID"
+              }
+            }
+          },
+          "role.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The role ID."
+              },
+              "role_name": {
+                "type": "string",
+                "description": "The name of the role."
+              },
+              "permissions": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "The permissions granted by the role."
+              },
+              "resource_type": {
+                "type": "string",
+                "description": "The type of resource the role belongs to."
+              },
+              "resource_id": {
+                "type": "string",
+                "description": "The resource the role is scoped to."
+              }
+            }
+          },
+          "role.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The role ID."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the role.",
+                "properties": {
+                  "role_name": {
+                    "type": "string",
+                    "description": "The updated role name, when provided."
+                  },
+                  "resource_id": {
+                    "type": "string",
+                    "description": "The resource the role is scoped to."
+                  },
+                  "resource_type": {
+                    "type": "string",
+                    "description": "The type of resource the role belongs to."
+                  },
+                  "permissions_added": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    },
+                    "description": "The permissions added to the role."
+                  },
+                  "permissions_removed": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    },
+                    "description": "The permissions removed from the role."
+                  },
+                  "description": {
+                    "type": "string",
+                    "description": "The updated role description, when provided."
+                  },
+                  "metadata": {
+                    "type": "object",
+                    "description": "Additional metadata stored on the role."
+                  }
+                }
+              }
+            }
+          },
+          "role.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The role ID."
+              }
+            }
+          },
+          "role.assignment.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The identifier of the role assignment."
+              },
+              "principal_id": {
+                "type": "string",
+                "description": "The principal (user or group) that received the role."
+              },
+              "principal_type": {
+                "type": "string",
+                "description": "The type of principal (user or group) that received the role."
+              },
+              "resource_id": {
+                "type": "string",
+                "description": "The resource the role assignment is scoped to."
+              },
+              "resource_type": {
+                "type": "string",
+                "description": "The type of resource the role assignment is scoped to."
+              }
+            }
+          },
+          "role.assignment.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The identifier of the role assignment."
+              },
+              "principal_id": {
+                "type": "string",
+                "description": "The principal (user or group) that had the role removed."
+              },
+              "principal_type": {
+                "type": "string",
+                "description": "The type of principal (user or group) that had the role removed."
+              },
+              "resource_id": {
+                "type": "string",
+                "description": "The resource the role assignment was scoped to."
+              },
+              "resource_type": {
+                "type": "string",
+                "description": "The type of resource the role assignment was scoped to."
+              }
+            }
+          },
+          "role.bound_to_resource": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the resource the role was bound to. ChatGPT workspace connector resources use `<workspace_id>__<connector_id>`."
+              },
+              "role_id": {
+                "type": "string",
+                "description": "The ID of the role that was bound to the resource."
+              },
+              "resource_id": {
+                "type": "string",
+                "description": "The ID of the resource the role was bound to."
+              },
+              "resource_type": {
+                "type": "string",
+                "description": "The type of resource the role was bound to."
+              },
+              "permissions": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "The permissions granted to the role for the resource."
+              },
+              "workspace_id": {
+                "type": "string",
+                "description": "The workspace ID for a ChatGPT workspace connector resource."
+              },
+              "connector_id": {
+                "type": "string",
+                "description": "The connector ID for a ChatGPT workspace connector resource."
+              },
+              "connector_name": {
+                "type": "string",
+                "description": "The connector display name for a ChatGPT workspace connector resource, or the connector ID when the display name could not be resolved."
+              },
+              "enabled": {
+                "type": "boolean",
+                "description": "Whether the connector is enabled for the role."
+              },
+              "source": {
+                "type": "string",
+                "description": "The connector role mutation path that produced the event.",
+                "enum": [
+                  "role_toggle",
+                  "role_connector_update",
+                  "role_delete",
+                  "workspace_permissions",
+                  "connector_publish"
+                ]
+              }
+            }
+          },
+          "role.unbound_from_resource": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID of the resource the role was unbound from. ChatGPT workspace connector resources use `<workspace_id>__<connector_id>`."
+              },
+              "role_id": {
+                "type": "string",
+                "description": "The ID of the role that was unbound from the resource."
+              },
+              "resource_id": {
+                "type": "string",
+                "description": "The ID of the resource the role was unbound from."
+              },
+              "resource_type": {
+                "type": "string",
+                "description": "The type of resource the role was unbound from."
+              },
+              "permissions": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "The permissions remaining for the role after the change."
+              },
+              "workspace_id": {
+                "type": "string",
+                "description": "The workspace ID for a ChatGPT workspace connector resource."
+              },
+              "connector_id": {
+                "type": "string",
+                "description": "The connector ID for a ChatGPT workspace connector resource."
+              },
+              "connector_name": {
+                "type": "string",
+                "description": "The connector display name for a ChatGPT workspace connector resource, or the connector ID when the display name could not be resolved."
+              },
+              "enabled": {
+                "type": "boolean",
+                "description": "Whether the connector is enabled for the role."
+              },
+              "source": {
+                "type": "string",
+                "description": "The connector role mutation path that produced the event.",
+                "enum": [
+                  "role_toggle",
+                  "role_connector_update",
+                  "role_delete",
+                  "workspace_permissions",
+                  "connector_publish"
+                ]
+              }
+            }
+          },
+          "service_account.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The service account ID."
+              },
+              "data": {
+                "type": "object",
+                "description": "The payload used to create the service account.",
+                "properties": {
+                  "role": {
+                    "type": "string",
+                    "description": "The role of the service account. Is either `owner` or `member`."
+                  }
+                }
+              }
+            }
+          },
+          "service_account.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The service account ID."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to updated the service account.",
+                "properties": {
+                  "role": {
+                    "type": "string",
+                    "description": "The role of the service account. Is either `owner` or `member`."
+                  }
+                }
+              }
+            }
+          },
+          "service_account.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The service account ID."
+              }
+            }
+          },
+          "workload_identity_provider.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The workload identity provider ID."
+              },
+              "data": {
+                "type": "object",
+                "description": "The payload used to create the workload identity provider."
+              }
+            }
+          },
+          "workload_identity_provider.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The workload identity provider ID."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the workload identity provider."
+              }
+            }
+          },
+          "workload_identity_provider.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The workload identity provider ID."
+              },
+              "name": {
+                "type": "string",
+                "description": "The workload identity provider name."
+              }
+            }
+          },
+          "workload_identity_provider_mapping.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The workload identity provider mapping ID."
+              },
+              "identity_provider_id": {
+                "type": "string",
+                "description": "The workload identity provider ID."
+              },
+              "data": {
+                "type": "object",
+                "description": "The payload used to create the workload identity provider mapping."
+              }
+            }
+          },
+          "workload_identity_provider_mapping.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The workload identity provider mapping ID."
+              },
+              "identity_provider_id": {
+                "type": "string",
+                "description": "The workload identity provider ID."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the workload identity provider mapping."
+              }
+            }
+          },
+          "workload_identity_provider_mapping.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The workload identity provider mapping ID."
+              },
+              "identity_provider_id": {
+                "type": "string",
+                "description": "The workload identity provider ID."
+              },
+              "project_id": {
+                "type": "string",
+                "description": "The project ID."
+              },
+              "service_account_id": {
+                "type": "string",
+                "description": "The mapped service account ID."
+              }
+            }
+          },
+          "user.added": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The user ID."
+              },
+              "data": {
+                "type": "object",
+                "description": "The payload used to add the user to the project.",
+                "properties": {
+                  "role": {
+                    "type": "string",
+                    "description": "The role of the user. Is either `owner` or `member`."
+                  }
+                }
+              }
+            }
+          },
+          "user.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The project ID."
+              },
+              "changes_requested": {
+                "type": "object",
+                "description": "The payload used to update the user.",
+                "properties": {
+                  "role": {
+                    "type": "string",
+                    "description": "The role of the user. Is either `owner` or `member`."
+                  }
+                }
+              }
+            }
+          },
+          "user.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The user ID."
+              }
+            }
+          },
+          "certificate.created": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The certificate ID."
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the certificate."
+              }
+            }
+          },
+          "certificate.updated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The certificate ID."
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the certificate."
+              }
+            }
+          },
+          "certificate.deleted": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The certificate ID."
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the certificate."
+              },
+              "certificate": {
+                "type": "string",
+                "description": "The certificate content in PEM format."
+              }
+            }
+          },
+          "certificates.activated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "certificates": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "The certificate ID."
+                    },
+                    "name": {
+                      "type": "string",
+                      "description": "The name of the certificate."
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "certificates.deactivated": {
+            "type": "object",
+            "description": "The details for events with this `type`.",
+            "properties": {
+              "certificates": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "The certificate ID."
+                    },
+                    "name": {
+                      "type": "string",
+                      "description": "The name of the certificate."
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "effective_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The audit log object",
+          "example": "{\n    \"id\": \"req_xxx_20240101\",\n    \"type\": \"api_key.created\",\n    \"effective_at\": 1720804090,\n    \"actor\": {\n        \"type\": \"session\",\n        \"session\": {\n            \"user\": {\n                \"id\": \"user-xxx\",\n                \"email\": \"user@example.com\"\n            },\n            \"ip_address\": \"127.0.0.1\",\n            \"user_agent\": \"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36\"\n        }\n    },\n    \"api_key.created\": {\n        \"id\": \"key_xxxx\",\n        \"data\": {\n            \"scopes\": [\"resource.operation\"]\n        }\n    }\n}\n"
+        }
+      },
+      "AuditLogActor": {
+        "type": "object",
+        "description": "The actor who performed the audit logged action.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of actor. Is either `session` or `api_key`.",
+            "enum": [
+              "session",
+              "api_key"
+            ]
+          },
+          "session": {
+            "$ref": "#/components/schemas/AuditLogActorSession"
+          },
+          "api_key": {
+            "$ref": "#/components/schemas/AuditLogActorApiKey"
+          }
+        }
+      },
+      "AuditLogActorApiKey": {
+        "type": "object",
+        "description": "The API Key used to perform the audit logged action.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The tracking id of the API key."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of API key. Can be either `user` or `service_account`.",
+            "enum": [
+              "user",
+              "service_account"
+            ]
+          },
+          "user": {
+            "$ref": "#/components/schemas/AuditLogActorUser"
+          },
+          "service_account": {
+            "$ref": "#/components/schemas/AuditLogActorServiceAccount"
+          }
+        }
+      },
+      "AuditLogActorServiceAccount": {
+        "type": "object",
+        "description": "The service account that performed the audit logged action.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The service account id."
+          }
+        }
+      },
+      "AuditLogActorSession": {
+        "type": "object",
+        "description": "The session in which the audit logged action was performed.",
+        "properties": {
+          "user": {
+            "$ref": "#/components/schemas/AuditLogActorUser"
+          },
+          "ip_address": {
+            "type": "string",
+            "description": "The IP address from which the action was performed."
+          }
+        }
+      },
+      "AuditLogActorUser": {
+        "type": "object",
+        "description": "The user who performed the audit logged action.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The user id."
+          },
+          "email": {
+            "type": "string",
+            "description": "The user email."
+          }
+        }
+      },
+      "AuditLogEventType": {
+        "type": "string",
+        "description": "The event type.",
+        "enum": [
+          "api_key.created",
+          "api_key.updated",
+          "api_key.deleted",
+          "certificate.created",
+          "certificate.updated",
+          "certificate.deleted",
+          "certificates.activated",
+          "certificates.deactivated",
+          "checkpoint.permission.created",
+          "checkpoint.permission.deleted",
+          "external_key.registered",
+          "external_key.removed",
+          "group.created",
+          "group.updated",
+          "group.deleted",
+          "invite.sent",
+          "invite.accepted",
+          "invite.deleted",
+          "ip_allowlist.created",
+          "ip_allowlist.updated",
+          "ip_allowlist.deleted",
+          "ip_allowlist.config.activated",
+          "ip_allowlist.config.deactivated",
+          "login.succeeded",
+          "login.failed",
+          "logout.succeeded",
+          "logout.failed",
+          "organization.updated",
+          "project.created",
+          "project.updated",
+          "project.archived",
+          "project.deleted",
+          "rate_limit.updated",
+          "rate_limit.deleted",
+          "resource.deleted",
+          "tunnel.created",
+          "tunnel.updated",
+          "tunnel.deleted",
+          "workload_identity_provider.created",
+          "workload_identity_provider.updated",
+          "workload_identity_provider.deleted",
+          "workload_identity_provider_mapping.created",
+          "workload_identity_provider_mapping.updated",
+          "workload_identity_provider_mapping.deleted",
+          "role.created",
+          "role.updated",
+          "role.deleted",
+          "role.assignment.created",
+          "role.assignment.deleted",
+          "role.bound_to_resource",
+          "role.unbound_from_resource",
+          "scim.enabled",
+          "scim.disabled",
+          "service_account.created",
+          "service_account.updated",
+          "service_account.deleted",
+          "user.added",
+          "user.updated",
+          "user.deleted",
+          "tenant.metadata.updated",
+          "tenant.microsoft_entra_mapping.upserted",
+          "tenant.microsoft_entra_mapping.deleted",
+          "tenant.workload_identity.provider.created",
+          "tenant.workload_identity.provider.updated",
+          "tenant.workload_identity.provider.archived",
+          "tenant.workload_identity.mapping.created",
+          "tenant.workload_identity.mapping.updated",
+          "tenant.workload_identity.mapping.archived",
+          "tenant.workload_identity.binding.created",
+          "tenant.workload_identity.principal.provisioned",
+          "tenant.workload_identity.access_token.issued",
+          "tenant.admin_api_key.created",
+          "tenant.admin_api_key.updated",
+          "tenant.admin_api_key.deleted",
+          "tenant.project_api_key.created",
+          "tenant.trusted_access.business_verification.started",
+          "tenant.trusted_access.application.submitted",
+          "tenant.chatgpt_access_token.revoked",
+          "tenant.migration.completed",
+          "tenant.sso.migrated",
+          "tenant.domains.migrated",
+          "tenant.sso_connection.created",
+          "tenant.sso_connection.updated",
+          "tenant.sso_connection.deleted",
+          "tenant.sso_connection.setup.started",
+          "tenant.policy.created",
+          "tenant.policy.updated",
+          "tenant.policy.deleted",
+          "tenant.policy.attached",
+          "tenant.policy.detached",
+          "tenant.principal_authentication_policy.resolved",
+          "tenant.scim.setup.started",
+          "tenant.scim.deletion.requested",
+          "tenant.scim.directory.created",
+          "tenant.product_access_policy.updated",
+          "tenant.resource_share_grant.created",
+          "tenant.resource_share_grant.updated",
+          "tenant.resource_share_grant.accepted",
+          "tenant.resource_share_grant.declined",
+          "tenant.resource_share_grant.revoked",
+          "tenant.resource_share_grant.deleted",
+          "tenant.service_account.updated",
+          "tenant.service_account.deleted",
+          "tenant.service_account.token.revoked",
+          "tenant.billing.overage_limit.updated",
+          "tenant.billing.alerts.updated",
+          "tenant.billing.info.updated",
+          "tenant.usage_limit.workspace.updated",
+          "tenant.usage_limit.group.updated",
+          "tenant.usage_limit.user.updated",
+          "tenant.usage_limit.increase_request.updated",
+          "tenant.usage_limit.increase_request.resolved",
+          "tenant.group.created",
+          "tenant.group.updated",
+          "tenant.group.deleted",
+          "tenant.group.member.added",
+          "tenant.group.member.removed",
+          "tenant.migration_rollout.status.updated",
+          "tenant.migration_rollout.tier.updated",
+          "tenant.role.metadata.updated",
+          "tenant.custom_role.created",
+          "tenant.custom_role.updated",
+          "tenant.custom_role.deleted",
+          "tenant.role_assignment.created",
+          "tenant.role_assignment.deleted",
+          "tenant.resource_role_assignment.created",
+          "tenant.resource_role_assignment.deleted",
+          "tenant.resource_access.updated",
+          "tenant.resource_access.deleted",
+          "tenant.ads_account.onboarding.redemption",
+          "tenant.session_policy.created",
+          "tenant.session_policy.updated",
+          "tenant.session_policy.deleted",
+          "tenant.session_revocation.started",
+          "tenant.third_party_app_policy.updated",
+          "tenant.user.added",
+          "tenant.user.updated",
+          "tenant.user.removed",
+          "tenant.user.looked_up",
+          "tenant.user.invited",
+          "tenant.membership.revoked",
+          "tenant.api_organization_invite.upserted",
+          "tenant.api_organization_invite.deleted",
+          "tenant.chatgpt_workspace_invite.upserted",
+          "tenant.membership.accepted",
+          "tenant.membership.declined",
+          "tenant.workspace_invite_email_settings.updated"
+        ]
+      },
+      "AutoChunkingStrategyRequestParam": {
+        "type": "object",
+        "title": "Auto Chunking Strategy",
+        "description": "The default strategy. This strategy currently uses a `max_chunk_size_tokens` of `800` and `chunk_overlap_tokens` of `400`.",
+        "additionalProperties": false,
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "Always `auto`.",
+            "enum": [
+              "auto"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "Batch": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "batch"
+            ],
+            "description": "The object type, which is always `batch`.",
+            "x-stainless-const": true
+          },
+          "endpoint": {
+            "type": "string",
+            "description": "The OpenAI API endpoint used by the batch."
+          },
+          "model": {
+            "type": "string",
+            "description": "Model ID used to process the batch, like `gpt-6-astra`. OpenAI\noffers a wide range of models with different capabilities, performance\ncharacteristics, and price points. Refer to the [model\nguide](https://developers.openai.com/api/docs/models) to browse and compare available models.\n"
+          },
+          "errors": {
+            "type": "object",
+            "properties": {
+              "object": {
+                "type": "string",
+                "description": "The object type, which is always `list`."
+              },
+              "data": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/BatchError"
+                }
+              }
+            }
+          },
+          "input_file_id": {
+            "type": "string",
+            "description": "The ID of the input file for the batch."
+          },
+          "completion_window": {
+            "type": "string",
+            "description": "The time frame within which the batch should be processed."
+          },
+          "status": {
+            "type": "string",
+            "description": "The current status of the batch.",
+            "enum": [
+              "validating",
+              "failed",
+              "in_progress",
+              "finalizing",
+              "completed",
+              "expired",
+              "cancelling",
+              "cancelled"
+            ]
+          },
+          "output_file_id": {
+            "type": "string",
+            "description": "The ID of the file containing the outputs of successfully executed requests."
+          },
+          "error_file_id": {
+            "type": "string",
+            "description": "The ID of the file containing the outputs of requests with errors."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch was created."
+          },
+          "in_progress_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch started processing."
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch will expire."
+          },
+          "finalizing_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch started finalizing."
+          },
+          "completed_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch was completed."
+          },
+          "failed_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch failed."
+          },
+          "expired_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch expired."
+          },
+          "cancelling_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch started cancelling."
+          },
+          "cancelled_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the batch was cancelled."
+          },
+          "request_counts": {
+            "$ref": "#/components/schemas/BatchRequestCounts"
+          },
+          "usage": {
+            "type": "object",
+            "description": "Represents token usage details including input tokens, output tokens, a\nbreakdown of output tokens, and the total tokens used. Only populated on\nbatches created after September 7, 2025.\n",
+            "properties": {
+              "input_tokens": {
+                "type": "integer",
+                "description": "The number of input tokens."
+              },
+              "input_tokens_details": {
+                "type": "object",
+                "description": "A detailed breakdown of the input tokens.",
+                "properties": {
+                  "cached_tokens": {
+                    "type": "integer",
+                    "description": "The number of tokens that were retrieved from the cache. [More on\nprompt caching](https://developers.openai.com/api/docs/guides/prompt-caching).\n"
+                  }
+                },
+                "required": [
+                  "cached_tokens"
+                ]
+              },
+              "output_tokens": {
+                "type": "integer",
+                "description": "The number of output tokens."
+              },
+              "output_tokens_details": {
+                "type": "object",
+                "description": "A detailed breakdown of the output tokens.",
+                "properties": {
+                  "reasoning_tokens": {
+                    "type": "integer",
+                    "description": "The number of reasoning tokens."
+                  }
+                },
+                "required": [
+                  "reasoning_tokens"
+                ]
+              },
+              "total_tokens": {
+                "type": "integer",
+                "description": "The total number of tokens used."
+              }
+            },
+            "required": [
+              "input_tokens",
+              "input_tokens_details",
+              "output_tokens",
+              "output_tokens_details",
+              "total_tokens"
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "endpoint",
+          "input_file_id",
+          "completion_window",
+          "status",
+          "created_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The batch object",
+          "example": "{\n  \"id\": \"batch_abc123\",\n  \"object\": \"batch\",\n  \"endpoint\": \"/v1/chat/completions\",\n  \"model\": \"gpt-6-astra\",\n  \"errors\": null,\n  \"input_file_id\": \"file-abc123\",\n  \"completion_window\": \"24h\",\n  \"status\": \"completed\",\n  \"output_file_id\": \"file-cvaTdG\",\n  \"error_file_id\": \"file-HOWS94\",\n  \"created_at\": 1711471533,\n  \"in_progress_at\": 1711471538,\n  \"expires_at\": 1711557933,\n  \"finalizing_at\": 1711493133,\n  \"completed_at\": 1711493163,\n  \"failed_at\": null,\n  \"expired_at\": null,\n  \"cancelling_at\": null,\n  \"cancelled_at\": null,\n  \"request_counts\": {\n    \"total\": 100,\n    \"completed\": 95,\n    \"failed\": 5\n  },\n  \"usage\": {\n    \"input_tokens\": 1500,\n    \"input_tokens_details\": {\n      \"cached_tokens\": 1024\n    },\n    \"output_tokens\": 500,\n    \"output_tokens_details\": {\n      \"reasoning_tokens\": 300\n    },\n    \"total_tokens\": 2000\n  },\n  \"metadata\": {\n    \"customer_id\": \"user_123456789\",\n    \"batch_description\": \"Nightly eval job\",\n  }\n}\n"
+        }
+      },
+      "BatchError": {
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "string",
+            "description": "An error code identifying the error type."
+          },
+          "message": {
+            "type": "string",
+            "description": "A human-readable message providing more details about the error."
+          },
+          "param": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The name of the parameter that caused the error, if applicable."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "line": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "The line number of the input file where the error occurred, if applicable."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        }
+      },
+      "BatchFileExpirationAfter": {
+        "type": "object",
+        "title": "File expiration policy",
+        "description": "The expiration policy for the output and/or error file that are generated for a batch.",
+        "properties": {
+          "anchor": {
+            "description": "Anchor timestamp after which the expiration policy applies. Supported anchors: `created_at`. Note that the anchor is the file creation time, not the time the batch is created.",
+            "type": "string",
+            "enum": [
+              "created_at"
+            ],
+            "x-stainless-const": true
+          },
+          "seconds": {
+            "description": "The number of seconds after the anchor time that the file will expire. Must be between 3600 (1 hour) and 2592000 (30 days).",
+            "type": "integer",
+            "format": "int64",
+            "minimum": 3600,
+            "maximum": 2592000
+          }
+        },
+        "required": [
+          "anchor",
+          "seconds"
+        ]
+      },
+      "BatchRequestCounts": {
+        "type": "object",
+        "properties": {
+          "total": {
+            "type": "integer",
+            "description": "Total number of requests in the batch."
+          },
+          "completed": {
+            "type": "integer",
+            "description": "Number of requests that have been completed successfully."
+          },
+          "failed": {
+            "type": "integer",
+            "description": "Number of requests that have failed."
+          }
+        },
+        "required": [
+          "total",
+          "completed",
+          "failed"
+        ],
+        "description": "The request counts for different statuses within the batch."
+      },
+      "Certificate": {
+        "type": "object",
+        "description": "Represents an individual `certificate` uploaded to the organization.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "certificate",
+              "organization.certificate",
+              "organization.project.certificate"
+            ],
+            "description": "The object type.\n\n- If creating, updating, or getting a specific certificate, the object type is `certificate`.\n- If listing, activating, or deactivating certificates for the organization, the object type is `organization.certificate`.\n- If listing, activating, or deactivating certificates for a project, the object type is `organization.project.certificate`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The name of the certificate."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the certificate was uploaded."
+          },
+          "certificate_details": {
+            "type": "object",
+            "properties": {
+              "valid_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) of when the certificate becomes valid."
+              },
+              "expires_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) of when the certificate expires."
+              },
+              "content": {
+                "type": "string",
+                "description": "The content of the certificate in PEM format."
+              }
+            }
+          },
+          "active": {
+            "type": "boolean",
+            "description": "Whether the certificate is currently active at the specified scope. Not returned when getting details for a specific certificate."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "created_at",
+          "certificate_details"
+        ],
+        "x-oaiMeta": {
+          "name": "The certificate object",
+          "example": "{\n  \"object\": \"certificate\",\n  \"id\": \"cert_abc\",\n  \"name\": \"My Certificate\",\n  \"created_at\": 1234567,\n  \"certificate_details\": {\n    \"valid_at\": 1234567,\n    \"expires_at\": 12345678,\n    \"content\": \"-----BEGIN CERTIFICATE----- MIIGAjCCA...6znFlOW+ -----END CERTIFICATE-----\"\n  }\n}\n"
+        }
+      },
+      "ChatCompletionAllowedTools": {
+        "type": "object",
+        "title": "Allowed tools",
+        "description": "Constrains the tools available to the model to a pre-defined set.\n",
+        "properties": {
+          "mode": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "required"
+            ],
+            "description": "Constrains the tools available to the model to a pre-defined set.\n\n`auto` allows the model to pick from among the allowed tools and generate a\nmessage.\n\n`required` requires the model to call one or more of the allowed tools.\n"
+          },
+          "tools": {
+            "type": "array",
+            "description": "A list of tool definitions that the model should be allowed to call.\n\nFor the Chat Completions API, the list of tool definitions might look like:\n```json\n[\n  { \"type\": \"function\", \"function\": { \"name\": \"get_weather\" } },\n  { \"type\": \"function\", \"function\": { \"name\": \"get_time\" } }\n]\n```\n",
+            "items": {
+              "type": "object",
+              "x-oaiExpandable": false,
+              "description": "A tool definition that the model should be allowed to call.\n",
+              "additionalProperties": true
+            }
+          }
+        },
+        "required": [
+          "mode",
+          "tools"
+        ]
+      },
+      "ChatCompletionAllowedToolsChoice": {
+        "type": "object",
+        "title": "Allowed tools",
+        "description": "Constrains the tools available to the model to a pre-defined set.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "allowed_tools"
+            ],
+            "description": "Allowed tool configuration type. Always `allowed_tools`.",
+            "x-stainless-const": true
+          },
+          "allowed_tools": {
+            "$ref": "#/components/schemas/ChatCompletionAllowedTools"
+          }
+        },
+        "required": [
+          "type",
+          "allowed_tools"
+        ]
+      },
+      "ChatCompletionDeleted": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "The type of object being deleted.",
+            "enum": [
+              "chat.completion.deleted"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the chat completion that was deleted."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the chat completion was deleted."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "deleted"
+        ]
+      },
+      "ChatCompletionFunctionCallOption": {
+        "type": "object",
+        "description": "Specifying a particular function via `{\"name\": \"my_function\"}` forces the model to call that function.\n",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the function to call."
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "ChatCompletionFunctions": {
+        "type": "object",
+        "deprecated": true,
+        "properties": {
+          "description": {
+            "type": "string",
+            "description": "A description of what the function does, used by the model to choose when and how to call the function."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to be called. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64."
+          },
+          "parameters": {
+            "$ref": "#/components/schemas/FunctionParameters"
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "ChatCompletionList": {
+        "type": "object",
+        "title": "ChatCompletionList",
+        "description": "An object representing a list of Chat Completions.\n",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "description": "The type of this object. It is always set to \"list\".\n",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "An array of chat completion objects.\n",
+            "items": {
+              "$ref": "#/components/schemas/CreateChatCompletionResponse"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The identifier of the first chat completion in the data array."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The identifier of the last chat completion in the data array."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Indicates whether there are more Chat Completions available."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "x-oaiMeta": {
+          "name": "The chat completion list object",
+          "group": "chat",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"chat.completion\",\n      \"id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2\",\n      \"model\": \"gpt-6-astra\",\n      \"created\": 1738960610,\n      \"request_id\": \"req_ded8ab984ec4bf840f37566c1011c417\",\n      \"tool_choice\": null,\n      \"usage\": {\n        \"total_tokens\": 31,\n        \"completion_tokens\": 18,\n        \"prompt_tokens\": 13\n      },\n      \"seed\": 4944116822809979520,\n      \"top_p\": 1.0,\n      \"temperature\": 1.0,\n      \"presence_penalty\": 0.0,\n      \"frequency_penalty\": 0.0,\n      \"system_fingerprint\": \"fp_50cad350e4\",\n      \"input_user\": null,\n      \"service_tier\": \"default\",\n      \"tools\": null,\n      \"metadata\": {},\n      \"choices\": [\n        {\n          \"index\": 0,\n          \"message\": {\n            \"content\": \"Mind of circuits hum,  \\nLearning patterns in silence—  \\nFuture's quiet spark.\",\n            \"role\": \"assistant\",\n            \"tool_calls\": null,\n            \"function_call\": null\n          },\n          \"finish_reason\": \"stop\",\n          \"logprobs\": null\n        }\n      ],\n      \"response_format\": null\n    }\n  ],\n  \"first_id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2\",\n  \"last_id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2\",\n  \"has_more\": false\n}\n"
+        }
+      },
+      "ChatCompletionMessageCustomToolCall": {
+        "type": "object",
+        "title": "Custom tool call",
+        "description": "A call to a custom tool created by the model.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "description": "The type of the tool. Always `custom`.",
+            "x-stainless-const": true
+          },
+          "custom": {
+            "type": "object",
+            "description": "The custom tool that the model called.",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the custom tool to call."
+              },
+              "input": {
+                "type": "string",
+                "description": "The input for the custom tool call generated by the model."
+              }
+            },
+            "required": [
+              "name",
+              "input"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "custom"
+        ]
+      },
+      "ChatCompletionMessageList": {
+        "type": "object",
+        "title": "ChatCompletionMessageList",
+        "description": "An object representing a list of chat completion messages.\n",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "description": "The type of this object. It is always set to \"list\".\n",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "An array of chat completion message objects.\n",
+            "items": {
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/ChatCompletionResponseMessage"
+                },
+                {
+                  "type": "object",
+                  "required": [
+                    "id"
+                  ],
+                  "properties": {
+                    "id": {
+                      "type": "string",
+                      "description": "The identifier of the chat message."
+                    },
+                    "content_parts": {
+                      "anyOf": [
+                        {
+                          "type": "array",
+                          "description": "If a content parts array was provided, this is an array of `text` and `image_url` parts.\nOtherwise, null.\n",
+                          "items": {
+                            "oneOf": [
+                              {
+                                "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartText"
+                              },
+                              {
+                                "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartImage"
+                              }
+                            ]
+                          }
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    }
+                  }
+                }
+              ]
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The identifier of the first chat message in the data array."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The identifier of the last chat message in the data array."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Indicates whether there are more chat messages available."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "x-oaiMeta": {
+          "name": "The chat completion message list object",
+          "group": "chat",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2-0\",\n      \"role\": \"user\",\n      \"content\": \"write a haiku about ai\",\n      \"name\": null,\n      \"content_parts\": null\n    }\n  ],\n  \"first_id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2-0\",\n  \"last_id\": \"chatcmpl-AyPNinnUqUDYo9SAdA52NobMflmj2-0\",\n  \"has_more\": false\n}\n"
+        }
+      },
+      "ChatCompletionMessageToolCall": {
+        "type": "object",
+        "title": "Function tool call",
+        "description": "A call to a function tool created by the model.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "The type of the tool. Currently, only `function` is supported.",
+            "x-stainless-const": true
+          },
+          "function": {
+            "type": "object",
+            "description": "The function that the model called.",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the function to call."
+              },
+              "arguments": {
+                "type": "string",
+                "description": "The arguments to call the function with, as generated by the model in JSON format. Note that the model does not always generate valid JSON, and may hallucinate parameters not defined by your function schema. Validate the arguments in your code before calling your function."
+              }
+            },
+            "required": [
+              "name",
+              "arguments"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "function"
+        ]
+      },
+      "ChatCompletionMessageToolCallChunk": {
+        "type": "object",
+        "properties": {
+          "index": {
+            "type": "integer"
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "The type of the tool. Currently, only `function` is supported.",
+            "x-stainless-const": true
+          },
+          "function": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the function to call."
+              },
+              "arguments": {
+                "type": "string",
+                "description": "The arguments to call the function with, as generated by the model in JSON format. Note that the model does not always generate valid JSON, and may hallucinate parameters not defined by your function schema. Validate the arguments in your code before calling your function."
+              }
+            }
+          }
+        },
+        "required": [
+          "index"
+        ]
+      },
+      "ChatCompletionMessageToolCalls": {
+        "type": "array",
+        "description": "The tool calls generated by the model, such as function calls.",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/components/schemas/ChatCompletionMessageToolCall"
+            },
+            {
+              "$ref": "#/components/schemas/ChatCompletionMessageCustomToolCall"
+            }
+          ],
+          "discriminator": {
+            "propertyName": "type"
+          }
+        }
+      },
+      "ChatCompletionModalities": {
+        "anyOf": [
+          {
+            "type": "array",
+            "description": "Output types that you would like the model to generate for this request.\nMost models are capable of generating text, which is the default:\n\n`[\"text\"]`\n\nThe `gpt-4o-audio-preview` model can also be used to [generate audio](https://developers.openai.com/api/docs/guides/audio). To\nrequest that this model generate both text and audio responses, you can\nuse:\n\n`[\"text\", \"audio\"]`\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "ChatCompletionModeration": {
+        "type": "object",
+        "description": "Moderation results or errors for the request input and generated output.",
+        "properties": {
+          "input": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ChatCompletionModerationResults"
+              },
+              {
+                "$ref": "#/components/schemas/ChatCompletionModerationError"
+              }
+            ],
+            "discriminator": {
+              "propertyName": "type"
+            },
+            "description": "Moderation for the request input."
+          },
+          "output": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ChatCompletionModerationResults"
+              },
+              {
+                "$ref": "#/components/schemas/ChatCompletionModerationError"
+              }
+            ],
+            "discriminator": {
+              "propertyName": "type"
+            },
+            "description": "Moderation for the generated output."
+          }
+        },
+        "required": [
+          "input",
+          "output"
+        ]
+      },
+      "ChatCompletionModerationError": {
+        "type": "object",
+        "description": "An error produced while attempting moderation.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "error"
+            ],
+            "description": "The object type, which is always `error`.",
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "string",
+            "description": "The error code."
+          },
+          "message": {
+            "type": "string",
+            "description": "The error message."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "ChatCompletionModerationResults": {
+        "type": "object",
+        "description": "Successful moderation results for the request input or generated output.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "moderation_results"
+            ],
+            "description": "The object type, which is always `moderation_results`.",
+            "x-stainless-const": true
+          },
+          "model": {
+            "type": "string",
+            "description": "The moderation model used to generate the results."
+          },
+          "results": {
+            "type": "array",
+            "description": "A list of moderation results.",
+            "items": {
+              "$ref": "#/components/schemas/ModerationResultBody"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "model",
+          "results"
+        ]
+      },
+      "ChatCompletionNamedToolChoice": {
+        "type": "object",
+        "title": "Function tool choice",
+        "description": "Specifies a tool the model should use. Use to force the model to call a specific function.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "For function calling, the type is always `function`.",
+            "x-stainless-const": true
+          },
+          "function": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the function to call."
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "function"
+        ]
+      },
+      "ChatCompletionNamedToolChoiceCustom": {
+        "type": "object",
+        "title": "Custom tool choice",
+        "description": "Specifies a tool the model should use. Use to force the model to call a specific custom tool.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "description": "For custom tool calling, the type is always `custom`.",
+            "x-stainless-const": true
+          },
+          "custom": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the custom tool to call."
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "custom"
+        ]
+      },
+      "ChatCompletionRequestAssistantMessage": {
+        "type": "object",
+        "title": "Assistant message",
+        "description": "Messages sent by the model in response to user messages.\n",
+        "properties": {
+          "content": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "description": "The contents of the assistant message.",
+                    "title": "Text content"
+                  },
+                  {
+                    "type": "array",
+                    "description": "An array of content parts with a defined type. Can be one or more of type `text`, or exactly one of type `refusal`.",
+                    "title": "Array of content parts",
+                    "items": {
+                      "$ref": "#/components/schemas/ChatCompletionRequestAssistantMessageContentPart"
+                    },
+                    "minItems": 1
+                  }
+                ],
+                "description": "The contents of the assistant message. Required unless `tool_calls` or `function_call` is specified.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "refusal": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The refusal message by the assistant."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ],
+            "description": "The role of the messages author, in this case `assistant`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "An optional name for the participant. Provides the model information to differentiate between participants of the same role."
+          },
+          "audio": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "Data about a previous audio response from the model.\n[Learn more](https://developers.openai.com/api/docs/guides/audio).\n",
+                "required": [
+                  "id"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "string",
+                    "description": "Unique identifier for a previous audio response from the model.\n"
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tool_calls": {
+            "$ref": "#/components/schemas/ChatCompletionMessageToolCalls"
+          },
+          "function_call": {
+            "anyOf": [
+              {
+                "type": "object",
+                "deprecated": true,
+                "description": "Deprecated and replaced by `tool_calls`. The name and arguments of a function that should be called, as generated by the model.",
+                "properties": {
+                  "arguments": {
+                    "type": "string",
+                    "description": "The arguments to call the function with, as generated by the model in JSON format. Note that the model does not always generate valid JSON, and may hallucinate parameters not defined by your function schema. Validate the arguments in your code before calling your function."
+                  },
+                  "name": {
+                    "type": "string",
+                    "description": "The name of the function to call."
+                  }
+                },
+                "required": [
+                  "arguments",
+                  "name"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "role"
+        ]
+      },
+      "ChatCompletionRequestAssistantMessageContentPart": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartText"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartRefusal"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ChatCompletionRequestDeveloperMessage": {
+        "type": "object",
+        "title": "Developer message",
+        "description": "Developer-provided instructions that the model should follow, regardless of\nmessages sent by the user. With o1 models and newer, `developer` messages\nreplace the previous `system` messages.\n",
+        "properties": {
+          "content": {
+            "description": "The contents of the developer message.",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "The contents of the developer message.",
+                "title": "Text content"
+              },
+              {
+                "type": "array",
+                "description": "An array of content parts with a defined type. For developer messages, only type `text` is supported.",
+                "title": "Array of content parts",
+                "items": {
+                  "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartText"
+                },
+                "minItems": 1
+              }
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "developer"
+            ],
+            "description": "The role of the messages author, in this case `developer`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "An optional name for the participant. Provides the model information to differentiate between participants of the same role."
+          }
+        },
+        "required": [
+          "content",
+          "role"
+        ]
+      },
+      "ChatCompletionRequestFunctionMessage": {
+        "type": "object",
+        "title": "Function message",
+        "deprecated": true,
+        "properties": {
+          "role": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "The role of the messages author, in this case `function`.",
+            "x-stainless-const": true
+          },
+          "content": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The contents of the function message."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to call."
+          }
+        },
+        "required": [
+          "role",
+          "content",
+          "name"
+        ]
+      },
+      "ChatCompletionRequestMessage": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestDeveloperMessage"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestSystemMessage"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestUserMessage"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestAssistantMessage"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestToolMessage"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestFunctionMessage"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "role"
+        }
+      },
+      "ChatCompletionRequestMessageContentPartAudio": {
+        "type": "object",
+        "title": "Audio content part",
+        "description": "Learn about [audio inputs](https://developers.openai.com/api/docs/guides/audio).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio"
+            ],
+            "description": "The type of the content part. Always `input_audio`.",
+            "x-stainless-const": true
+          },
+          "input_audio": {
+            "type": "object",
+            "properties": {
+              "data": {
+                "type": "string",
+                "description": "Base64 encoded audio data."
+              },
+              "format": {
+                "type": "string",
+                "enum": [
+                  "wav",
+                  "mp3"
+                ],
+                "description": "The format of the encoded audio data. Currently supports \"wav\" and \"mp3\".\n"
+              }
+            },
+            "required": [
+              "data",
+              "format"
+            ]
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/PromptCacheBreakpointParam"
+          }
+        },
+        "required": [
+          "type",
+          "input_audio"
+        ]
+      },
+      "ChatCompletionRequestMessageContentPartFile": {
+        "type": "object",
+        "title": "File content part",
+        "description": "Learn about [file inputs](https://developers.openai.com/api/docs/guides/text) for text generation.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ],
+            "description": "The type of the content part. Always `file`.",
+            "x-stainless-const": true
+          },
+          "file": {
+            "type": "object",
+            "properties": {
+              "filename": {
+                "type": "string",
+                "description": "The name of the file, used when passing the file to the model as a\nstring.\n"
+              },
+              "file_data": {
+                "type": "string",
+                "description": "The base64 encoded file data, used when passing the file to the model\nas a string.\n"
+              },
+              "file_id": {
+                "type": "string",
+                "description": "The ID of an uploaded file to use as input.\n"
+              }
+            }
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/PromptCacheBreakpointParam"
+          }
+        },
+        "required": [
+          "type",
+          "file"
+        ]
+      },
+      "ChatCompletionRequestMessageContentPartImage": {
+        "type": "object",
+        "title": "Image content part",
+        "description": "Learn about [image inputs](https://developers.openai.com/api/docs/guides/images-vision).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "image_url"
+            ],
+            "description": "The type of the content part.",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "type": "object",
+            "properties": {
+              "url": {
+                "type": "string",
+                "description": "Either a URL of the image or the base64 encoded image data.",
+                "format": "uri"
+              },
+              "detail": {
+                "type": "string",
+                "description": "Specifies the detail level of the image. Learn more in the [Vision guide](https://developers.openai.com/api/docs/guides/images-vision#choose-an-image-detail-level).",
+                "enum": [
+                  "auto",
+                  "low",
+                  "high"
+                ],
+                "default": "auto"
+              }
+            },
+            "required": [
+              "url"
+            ]
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/PromptCacheBreakpointParam"
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ]
+      },
+      "ChatCompletionRequestMessageContentPartRefusal": {
+        "type": "object",
+        "title": "Refusal content part",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "refusal"
+            ],
+            "description": "The type of the content part.",
+            "x-stainless-const": true
+          },
+          "refusal": {
+            "type": "string",
+            "description": "The refusal message generated by the model."
+          }
+        },
+        "required": [
+          "type",
+          "refusal"
+        ]
+      },
+      "ChatCompletionRequestMessageContentPartText": {
+        "type": "object",
+        "title": "Text content part",
+        "description": "Learn about [text inputs](https://developers.openai.com/api/docs/guides/text).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "description": "The type of the content part.",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text content."
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/PromptCacheBreakpointParam"
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ]
+      },
+      "ChatCompletionRequestSystemMessage": {
+        "type": "object",
+        "title": "System message",
+        "description": "Developer-provided instructions that the model should follow, regardless of\nmessages sent by the user. With o1 models and newer, use `developer` messages\nfor this purpose instead.\n",
+        "properties": {
+          "content": {
+            "description": "The contents of the system message.",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "The contents of the system message.",
+                "title": "Text content"
+              },
+              {
+                "type": "array",
+                "description": "An array of content parts with a defined type. For system messages, only type `text` is supported.",
+                "title": "Array of content parts",
+                "items": {
+                  "$ref": "#/components/schemas/ChatCompletionRequestSystemMessageContentPart"
+                },
+                "minItems": 1
+              }
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "system"
+            ],
+            "description": "The role of the messages author, in this case `system`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "An optional name for the participant. Provides the model information to differentiate between participants of the same role."
+          }
+        },
+        "required": [
+          "content",
+          "role"
+        ]
+      },
+      "ChatCompletionRequestSystemMessageContentPart": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartText"
+          }
+        ]
+      },
+      "ChatCompletionRequestToolMessage": {
+        "type": "object",
+        "title": "Tool message",
+        "properties": {
+          "role": {
+            "type": "string",
+            "enum": [
+              "tool"
+            ],
+            "description": "The role of the messages author, in this case `tool`.",
+            "x-stainless-const": true
+          },
+          "content": {
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "The contents of the tool message.",
+                "title": "Text content"
+              },
+              {
+                "type": "array",
+                "description": "An array of content parts with a defined type. For tool messages, only type `text` is supported.",
+                "title": "Array of content parts",
+                "items": {
+                  "$ref": "#/components/schemas/ChatCompletionRequestToolMessageContentPart"
+                },
+                "minItems": 1
+              }
+            ],
+            "description": "The contents of the tool message."
+          },
+          "tool_call_id": {
+            "type": "string",
+            "description": "Tool call that this message is responding to."
+          }
+        },
+        "required": [
+          "role",
+          "content",
+          "tool_call_id"
+        ]
+      },
+      "ChatCompletionRequestToolMessageContentPart": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartText"
+          }
+        ]
+      },
+      "ChatCompletionRequestUserMessage": {
+        "type": "object",
+        "title": "User message",
+        "description": "Messages sent by an end user, containing prompts or additional context\ninformation.\n",
+        "properties": {
+          "content": {
+            "description": "The contents of the user message.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "The text contents of the message.",
+                "title": "Text content"
+              },
+              {
+                "type": "array",
+                "description": "An array of content parts with a defined type. Supported options differ based on the [model](https://developers.openai.com/api/docs/models) being used to generate the response. Can contain text, image, or audio inputs.",
+                "title": "Array of content parts",
+                "items": {
+                  "$ref": "#/components/schemas/ChatCompletionRequestUserMessageContentPart"
+                },
+                "minItems": 1
+              }
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user"
+            ],
+            "description": "The role of the messages author, in this case `user`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "An optional name for the participant. Provides the model information to differentiate between participants of the same role."
+          }
+        },
+        "required": [
+          "content",
+          "role"
+        ]
+      },
+      "ChatCompletionRequestUserMessageContentPart": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartText"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartImage"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartAudio"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartFile"
+          }
+        ]
+      },
+      "ChatCompletionResponseMessage": {
+        "type": "object",
+        "description": "A chat completion message generated by the model.",
+        "properties": {
+          "content": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The contents of the message."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "refusal": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The refusal message generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tool_calls": {
+            "$ref": "#/components/schemas/ChatCompletionMessageToolCalls"
+          },
+          "annotations": {
+            "type": "array",
+            "description": "Annotations for the message, when applicable, as when using the\n[web search tool](https://developers.openai.com/api/docs/guides/tools-web-search).\n",
+            "items": {
+              "type": "object",
+              "description": "A URL citation when using web search.\n",
+              "required": [
+                "type",
+                "url_citation"
+              ],
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "description": "The type of the URL citation. Always `url_citation`.",
+                  "enum": [
+                    "url_citation"
+                  ],
+                  "x-stainless-const": true
+                },
+                "url_citation": {
+                  "type": "object",
+                  "description": "A URL citation when using web search.",
+                  "required": [
+                    "end_index",
+                    "start_index",
+                    "url",
+                    "title"
+                  ],
+                  "properties": {
+                    "end_index": {
+                      "type": "integer",
+                      "description": "The index of the last character of the URL citation in the message."
+                    },
+                    "start_index": {
+                      "type": "integer",
+                      "description": "The index of the first character of the URL citation in the message."
+                    },
+                    "url": {
+                      "type": "string",
+                      "format": "uri",
+                      "description": "The URL of the web resource."
+                    },
+                    "title": {
+                      "type": "string",
+                      "description": "The title of the web resource."
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ],
+            "description": "The role of the author of this message.",
+            "x-stainless-const": true
+          },
+          "function_call": {
+            "type": "object",
+            "deprecated": true,
+            "description": "Deprecated and replaced by `tool_calls`. The name and arguments of a function that should be called, as generated by the model.",
+            "properties": {
+              "arguments": {
+                "type": "string",
+                "description": "The arguments to call the function with, as generated by the model in JSON format. Note that the model does not always generate valid JSON, and may hallucinate parameters not defined by your function schema. Validate the arguments in your code before calling your function."
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the function to call."
+              }
+            },
+            "required": [
+              "name",
+              "arguments"
+            ]
+          },
+          "audio": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "If the audio output modality is requested, this object contains data\nabout the audio response from the model. [Learn more](https://developers.openai.com/api/docs/guides/audio).\n",
+                "required": [
+                  "id",
+                  "expires_at",
+                  "data",
+                  "transcript"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "string",
+                    "description": "Unique identifier for this audio response."
+                  },
+                  "expires_at": {
+                    "type": "integer",
+                    "format": "unixtime",
+                    "description": "The Unix timestamp (in seconds) for when this audio response will\nno longer be accessible on the server for use in multi-turn\nconversations.\n"
+                  },
+                  "data": {
+                    "type": "string",
+                    "description": "Base64 encoded audio bytes generated by the model, in the format\nspecified in the request.\n"
+                  },
+                  "transcript": {
+                    "type": "string",
+                    "description": "Transcript of the audio generated by the model."
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "role",
+          "content",
+          "refusal"
+        ]
+      },
+      "ChatCompletionRole": {
+        "type": "string",
+        "description": "The role of the author of a message",
+        "enum": [
+          "developer",
+          "system",
+          "user",
+          "assistant",
+          "tool",
+          "function"
+        ]
+      },
+      "ChatCompletionStreamOptions": {
+        "anyOf": [
+          {
+            "description": "Options for streaming response. Only set this when you set `stream: true`.\n",
+            "type": "object",
+            "default": null,
+            "properties": {
+              "include_usage": {
+                "type": "boolean",
+                "description": "If set, an additional chunk will be streamed before the `data: [DONE]`\nmessage. The `usage` field on this chunk shows the token usage statistics\nfor the entire request, and the `choices` field will always be an empty\narray.\n\nAll other chunks will also include a `usage` field, but with a null\nvalue. **NOTE:** If the stream is interrupted, you may not receive the\nfinal usage chunk which contains the total token usage for the request.\n"
+              },
+              "include_obfuscation": {
+                "type": "boolean",
+                "description": "When true, stream obfuscation will be enabled. Stream obfuscation adds\nrandom characters to an `obfuscation` field on streaming delta events to\nnormalize payload sizes as a mitigation to certain side-channel attacks.\nThese obfuscation fields are included by default, but add a small amount\nof overhead to the data stream. You can set `include_obfuscation` to\nfalse to optimize for bandwidth if you trust the network links between\nyour application and the OpenAI API.\n"
+              }
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "ChatCompletionStreamResponseDelta": {
+        "type": "object",
+        "description": "A chat completion delta generated by streamed model responses.",
+        "properties": {
+          "content": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The contents of the chunk message."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "function_call": {
+            "deprecated": true,
+            "type": "object",
+            "description": "Deprecated and replaced by `tool_calls`. The name and arguments of a function that should be called, as generated by the model.",
+            "properties": {
+              "arguments": {
+                "type": "string",
+                "description": "The arguments to call the function with, as generated by the model in JSON format. Note that the model does not always generate valid JSON, and may hallucinate parameters not defined by your function schema. Validate the arguments in your code before calling your function."
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the function to call."
+              }
+            }
+          },
+          "tool_calls": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChatCompletionMessageToolCallChunk"
+            }
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "developer",
+              "system",
+              "user",
+              "assistant",
+              "tool"
+            ],
+            "description": "The role of the author of this message."
+          },
+          "refusal": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The refusal message generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        }
+      },
+      "ChatCompletionTokenLogprob": {
+        "type": "object",
+        "properties": {
+          "token": {
+            "description": "The token.",
+            "type": "string"
+          },
+          "logprob": {
+            "description": "The log probability of this token, if it is within the top 20 most likely tokens. Otherwise, the value `-9999.0` is used to signify that the token is very unlikely.",
+            "type": "number"
+          },
+          "bytes": {
+            "anyOf": [
+              {
+                "description": "A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be `null` if there is no bytes representation for the token.",
+                "type": "array",
+                "items": {
+                  "type": "integer"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "top_logprobs": {
+            "description": "List of the most likely tokens and their log probability, at this token position. The number of entries may be fewer than the requested `top_logprobs`.",
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "token": {
+                  "description": "The token.",
+                  "type": "string"
+                },
+                "logprob": {
+                  "description": "The log probability of this token, if it is within the top 20 most likely tokens. Otherwise, the value `-9999.0` is used to signify that the token is very unlikely.",
+                  "type": "number"
+                },
+                "bytes": {
+                  "anyOf": [
+                    {
+                      "description": "A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be `null` if there is no bytes representation for the token.",
+                      "type": "array",
+                      "items": {
+                        "type": "integer"
+                      }
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "token",
+                "logprob",
+                "bytes"
+              ]
+            }
+          }
+        },
+        "required": [
+          "token",
+          "logprob",
+          "bytes",
+          "top_logprobs"
+        ]
+      },
+      "ChatCompletionTool": {
+        "type": "object",
+        "title": "Function tool",
+        "description": "A function tool that can be used to generate a response.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "The type of the tool. Currently, only `function` is supported.",
+            "x-stainless-const": true
+          },
+          "function": {
+            "$ref": "#/components/schemas/FunctionObject"
+          }
+        },
+        "required": [
+          "type",
+          "function"
+        ]
+      },
+      "ChatCompletionToolChoiceOption": {
+        "description": "Controls which (if any) tool is called by the model.\n`none` means the model will not call any tool and instead generates a message.\n`auto` means the model can pick between generating a message or calling one or more tools.\n`required` means the model must call one or more tools.\nSpecifying a particular tool via `{\"type\": \"function\", \"function\": {\"name\": \"my_function\"}}` forces the model to call that tool.\n\n`none` is the default when no tools are present. `auto` is the default if tools are present.\n",
+        "oneOf": [
+          {
+            "type": "string",
+            "title": "Tool choice mode",
+            "description": "`none` means the model will not call any tool and instead generates a message. `auto` means the model can pick between generating a message or calling one or more tools. `required` means the model must call one or more tools.\n",
+            "enum": [
+              "none",
+              "auto",
+              "required"
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionAllowedToolsChoice"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionNamedToolChoice"
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionNamedToolChoiceCustom"
+          }
+        ]
+      },
+      "ChunkingStrategyRequestParam": {
+        "type": "object",
+        "description": "The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy.",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/AutoChunkingStrategyRequestParam"
+          },
+          {
+            "$ref": "#/components/schemas/StaticChunkingStrategyRequestParam"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "CodeInterpreterFileOutput": {
+        "type": "object",
+        "title": "Code interpreter file output",
+        "description": "The output of a code interpreter tool call that is a file.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "files"
+            ],
+            "description": "The type of the code interpreter file output. Always `files`.\n",
+            "x-stainless-const": true
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "mime_type": {
+                  "type": "string",
+                  "description": "The MIME type of the file.\n"
+                },
+                "file_id": {
+                  "type": "string",
+                  "description": "The ID of the file.\n"
+                }
+              },
+              "required": [
+                "mime_type",
+                "file_id"
+              ]
+            }
+          }
+        },
+        "required": [
+          "type",
+          "files"
+        ]
+      },
+      "CodeInterpreterTextOutput": {
+        "type": "object",
+        "title": "Code interpreter text output",
+        "description": "The output of a code interpreter tool call that is text.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "logs"
+            ],
+            "description": "The type of the code interpreter text output. Always `logs`.\n",
+            "x-stainless-const": true
+          },
+          "logs": {
+            "type": "string",
+            "description": "The logs of the code interpreter tool call.\n"
+          }
+        },
+        "required": [
+          "type",
+          "logs"
+        ]
+      },
+      "CodeInterpreterTool": {
+        "type": "object",
+        "title": "Code interpreter",
+        "description": "A tool that runs Python code to help generate a response to a prompt.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "code_interpreter"
+            ],
+            "description": "The type of the code interpreter tool. Always `code_interpreter`.\n",
+            "x-stainless-const": true
+          },
+          "container": {
+            "description": "The code interpreter container. Can be a container ID or an object that\nspecifies uploaded file IDs to make available to your code, along with an\noptional `memory_limit` setting.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "The container ID."
+              },
+              {
+                "$ref": "#/components/schemas/AutoCodeInterpreterToolParam"
+              }
+            ]
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "type": "array",
+                "minItems": 1,
+                "items": {
+                  "$ref": "#/components/schemas/CallableToolAllowedCaller"
+                },
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "container"
+        ]
+      },
+      "CodeInterpreterToolCall": {
+        "type": "object",
+        "title": "Code interpreter tool call",
+        "description": "A tool call to run code.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "code_interpreter_call"
+            ],
+            "default": "code_interpreter_call",
+            "x-stainless-const": true,
+            "description": "The type of the code interpreter tool call. Always `code_interpreter_call`.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the code interpreter tool call.\n"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete",
+              "interpreting",
+              "failed"
+            ],
+            "description": "The status of the code interpreter tool call. Valid values are `in_progress`, `completed`, `incomplete`, `interpreting`, and `failed`.\n"
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The ID of the container used to run the code.\n"
+          },
+          "code": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The code to run, or null if not available.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "outputs": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/CodeInterpreterOutputLogs"
+                    },
+                    {
+                      "$ref": "#/components/schemas/CodeInterpreterOutputImage"
+                    }
+                  ],
+                  "discriminator": {
+                    "propertyName": "type"
+                  }
+                },
+                "discriminator": {
+                  "propertyName": "type"
+                },
+                "description": "The outputs generated by the code interpreter, such as logs or images.\nCan be null if no outputs are available.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "status",
+          "container_id",
+          "code",
+          "outputs"
+        ]
+      },
+      "ComparisonFilter": {
+        "type": "object",
+        "additionalProperties": false,
+        "title": "Comparison Filter",
+        "description": "A filter used to compare a specified attribute key to a given value using a defined comparison operation.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "default": "eq",
+            "enum": [
+              "eq",
+              "ne",
+              "gt",
+              "gte",
+              "lt",
+              "lte",
+              "in",
+              "nin"
+            ],
+            "description": "Specifies the comparison operator: `eq`, `ne`, `gt`, `gte`, `lt`, `lte`, `in`, `nin`.\n- `eq`: equals\n- `ne`: not equal\n- `gt`: greater than\n- `gte`: greater than or equal\n- `lt`: less than\n- `lte`: less than or equal\n- `in`: in\n- `nin`: not in\n"
+          },
+          "key": {
+            "type": "string",
+            "description": "The key to compare against the value."
+          },
+          "value": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "number"
+              },
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "oneOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ]
+                }
+              }
+            ],
+            "description": "The value to compare against the attribute key; supports string, number, or boolean types."
+          }
+        },
+        "required": [
+          "type",
+          "key",
+          "value"
+        ],
+        "x-oaiMeta": {
+          "name": "ComparisonFilter"
+        }
+      },
+      "CompleteUploadRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "part_ids": {
+            "type": "array",
+            "description": "The ordered list of Part IDs.\n",
+            "items": {
+              "type": "string"
+            }
+          },
+          "md5": {
+            "description": "The optional md5 checksum for the file contents to verify if the bytes uploaded matches what you expect.\n",
+            "type": "string"
+          }
+        },
+        "required": [
+          "part_ids"
+        ]
+      },
+      "CompletionUsage": {
+        "type": "object",
+        "description": "Usage statistics for the completion request.",
+        "properties": {
+          "completion_tokens": {
+            "type": "integer",
+            "default": 0,
+            "description": "Number of tokens in the generated completion."
+          },
+          "prompt_tokens": {
+            "type": "integer",
+            "default": 0,
+            "description": "Number of tokens in the prompt."
+          },
+          "total_tokens": {
+            "type": "integer",
+            "default": 0,
+            "description": "Total number of tokens used in the request (prompt + completion)."
+          },
+          "completion_tokens_details": {
+            "type": "object",
+            "description": "Breakdown of tokens used in a completion.",
+            "properties": {
+              "accepted_prediction_tokens": {
+                "type": "integer",
+                "default": 0,
+                "description": "When using Predicted Outputs, the number of tokens in the\nprediction that appeared in the completion.\n"
+              },
+              "audio_tokens": {
+                "type": "integer",
+                "default": 0,
+                "description": "Audio input tokens generated by the model."
+              },
+              "reasoning_tokens": {
+                "type": "integer",
+                "default": 0,
+                "description": "Tokens generated by the model for reasoning."
+              },
+              "text_tokens": {
+                "type": "integer",
+                "description": "Text output tokens generated by the model."
+              },
+              "rejected_prediction_tokens": {
+                "type": "integer",
+                "default": 0,
+                "description": "When using Predicted Outputs, the number of tokens in the\nprediction that did not appear in the completion. However, like\nreasoning tokens, these tokens are still counted in the total\ncompletion tokens for purposes of billing, output, and context window\nlimits.\n"
+              }
+            }
+          },
+          "prompt_tokens_details": {
+            "type": "object",
+            "description": "Breakdown of tokens used in the prompt.",
+            "properties": {
+              "audio_tokens": {
+                "type": "integer",
+                "default": 0,
+                "description": "Audio input tokens present in the prompt."
+              },
+              "cached_tokens": {
+                "type": "integer",
+                "default": 0,
+                "description": "Cached tokens present in the prompt."
+              },
+              "text_tokens": {
+                "type": "integer",
+                "description": "Text input tokens present in the prompt."
+              },
+              "image_tokens": {
+                "type": "integer",
+                "description": "Image input tokens present in the prompt."
+              },
+              "cache_write_tokens": {
+                "type": "integer",
+                "default": 0,
+                "description": "The unadjusted number of prompt tokens written to cache."
+              }
+            }
+          }
+        },
+        "required": [
+          "prompt_tokens",
+          "completion_tokens",
+          "total_tokens"
+        ]
+      },
+      "CompoundFilter": {
+        "$recursiveAnchor": true,
+        "type": "object",
+        "additionalProperties": false,
+        "title": "Compound Filter",
+        "description": "Combine multiple filters using `and` or `or`.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "Type of operation: `and` or `or`.",
+            "enum": [
+              "and",
+              "or"
+            ]
+          },
+          "filters": {
+            "type": "array",
+            "description": "Array of filters to combine. Items can be `ComparisonFilter` or `CompoundFilter`.",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/ComparisonFilter"
+                },
+                {
+                  "$recursiveRef": "#"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "type"
+              }
+            }
+          }
+        },
+        "required": [
+          "type",
+          "filters"
+        ],
+        "x-oaiMeta": {
+          "name": "CompoundFilter"
+        }
+      },
+      "ComputerAction": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ClickParam"
+          },
+          {
+            "$ref": "#/components/schemas/DoubleClickAction"
+          },
+          {
+            "$ref": "#/components/schemas/DragParam"
+          },
+          {
+            "$ref": "#/components/schemas/KeyPressAction"
+          },
+          {
+            "$ref": "#/components/schemas/MoveParam"
+          },
+          {
+            "$ref": "#/components/schemas/ScreenshotParam"
+          },
+          {
+            "$ref": "#/components/schemas/ScrollParam"
+          },
+          {
+            "$ref": "#/components/schemas/TypeParam"
+          },
+          {
+            "$ref": "#/components/schemas/WaitParam"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ComputerActionList": {
+        "title": "Computer Action List",
+        "type": "array",
+        "description": "Flattened batched actions for `computer_use`. Each action includes an\n`type` discriminator and action-specific fields.\n",
+        "items": {
+          "$ref": "#/components/schemas/ComputerAction"
+        }
+      },
+      "ComputerScreenshotImage": {
+        "type": "object",
+        "description": "A computer screenshot image used with the computer use tool.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer_screenshot"
+            ],
+            "default": "computer_screenshot",
+            "description": "Specifies the event type. For a computer screenshot, this property is \nalways set to `computer_screenshot`.\n",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the screenshot image."
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The identifier of an uploaded file that contains the screenshot."
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "ComputerToolCall": {
+        "type": "object",
+        "title": "Computer tool call",
+        "description": "A tool call to a computer use tool. See the\n[computer use guide](https://developers.openai.com/api/docs/guides/tools-computer-use) for more information.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the computer call. Always `computer_call`.",
+            "enum": [
+              "computer_call"
+            ],
+            "default": "computer_call"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the computer call."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "An identifier used when responding to the tool call with output.\n"
+          },
+          "action": {
+            "$ref": "#/components/schemas/ComputerAction"
+          },
+          "actions": {
+            "$ref": "#/components/schemas/ComputerActionList"
+          },
+          "pending_safety_checks": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ComputerCallSafetyCheckParam"
+            },
+            "description": "The pending safety checks for the computer call.\n"
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "pending_safety_checks",
+          "status"
+        ]
+      },
+      "ComputerToolCallOutput": {
+        "type": "object",
+        "title": "Computer tool call output",
+        "description": "The output of a computer tool call.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the computer tool call output. Always `computer_call_output`.\n",
+            "enum": [
+              "computer_call_output"
+            ],
+            "default": "computer_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the computer tool call output.\n"
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the computer tool call that produced the output.\n"
+          },
+          "acknowledged_safety_checks": {
+            "type": "array",
+            "description": "The safety checks reported by the API that have been acknowledged by the\ndeveloper.\n",
+            "items": {
+              "$ref": "#/components/schemas/ComputerCallSafetyCheckParam"
+            }
+          },
+          "output": {
+            "$ref": "#/components/schemas/ComputerScreenshotImage"
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the message input. One of `in_progress`, `completed`, or\n`incomplete`. Populated when input items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "output"
+        ]
+      },
+      "ComputerToolCallOutputResource": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/ComputerToolCallOutput"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the computer call tool output.\n"
+              },
+              "status": {
+                "description": "The status of the message input. One of `in_progress`, `completed`, or\n`incomplete`. Populated when input items are returned via API.\n",
+                "$ref": "#/components/schemas/ComputerCallOutputStatus"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "ContainerFileListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be 'list'."
+          },
+          "data": {
+            "type": "array",
+            "description": "A list of container files.",
+            "items": {
+              "$ref": "#/components/schemas/ContainerFileResource"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The ID of the first file in the list."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The ID of the last file in the list."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more files available."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ContainerFileResource": {
+        "type": "object",
+        "title": "The container file object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the file."
+          },
+          "object": {
+            "type": "string",
+            "description": "The type of this object (`container.file`)."
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The container this file belongs to."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the file was created."
+          },
+          "bytes": {
+            "type": "integer",
+            "description": "Size of the file in bytes."
+          },
+          "path": {
+            "type": "string",
+            "description": "Path of the file in the container."
+          },
+          "source": {
+            "type": "string",
+            "description": "Source of the file (e.g., `user`, `assistant`)."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "bytes",
+          "container_id",
+          "path",
+          "source"
+        ],
+        "x-oaiMeta": {
+          "name": "The container file object",
+          "example": "{\n    \"id\": \"cfile_682e0e8a43c88191a7978f477a09bdf5\",\n    \"object\": \"container.file\",\n    \"created_at\": 1747848842,\n    \"bytes\": 880,\n    \"container_id\": \"cntr_682e0e7318108198aa783fd921ff305e08e78805b9fdbb04\",\n    \"path\": \"/mnt/data/88e12fa445d32636f190a0b33daed6cb-tsconfig.json\",\n    \"source\": \"user\"\n}\n"
+        }
+      },
+      "ContainerListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be 'list'."
+          },
+          "data": {
+            "type": "array",
+            "description": "A list of containers.",
+            "items": {
+              "$ref": "#/components/schemas/ContainerResource"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The ID of the first container in the list."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The ID of the last container in the list."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more containers available."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ContainerResource": {
+        "type": "object",
+        "title": "The container object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the container."
+          },
+          "object": {
+            "type": "string",
+            "description": "The type of this object."
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the container."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the container was created."
+          },
+          "status": {
+            "type": "string",
+            "description": "Status of the container (e.g., active, deleted)."
+          },
+          "last_active_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the container was last active."
+          },
+          "expires_after": {
+            "type": "object",
+            "description": "The container will expire after this time period.\nThe anchor is the reference point for the expiration.\nThe minutes is the number of minutes after the anchor before the container expires.\n",
+            "properties": {
+              "anchor": {
+                "type": "string",
+                "description": "The reference point for the expiration.",
+                "enum": [
+                  "last_active_at"
+                ]
+              },
+              "minutes": {
+                "type": "integer",
+                "description": "The number of minutes after the anchor before the container expires."
+              }
+            }
+          },
+          "memory_limit": {
+            "type": "string",
+            "description": "The memory limit configured for the container.",
+            "enum": [
+              "1g",
+              "4g",
+              "16g",
+              "64g"
+            ]
+          },
+          "network_policy": {
+            "description": "Network access policy for the container.",
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The network policy mode.",
+                "enum": [
+                  "allowlist",
+                  "disabled"
+                ]
+              },
+              "allowed_domains": {
+                "type": "array",
+                "description": "Allowed outbound domains when `type` is `allowlist`.",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "type"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "name",
+          "created_at",
+          "status",
+          "id",
+          "name",
+          "created_at",
+          "status"
+        ],
+        "x-oaiMeta": {
+          "name": "The container object",
+          "example": "{\n   \"id\": \"cntr_682dfebaacac8198bbfe9c2474fb6f4a085685cbe3cb5863\",\n   \"object\": \"container\",\n   \"created_at\": 1747844794,\n   \"status\": \"running\",\n   \"expires_after\": {\n     \"anchor\": \"last_active_at\",\n     \"minutes\": 20\n   },\n   \"last_active_at\": 1747844794,\n   \"memory_limit\": \"1g\",\n   \"name\": \"My Container\"\n}\n"
+        }
+      },
+      "Content": {
+        "description": "Multi-modal input and output contents.\n",
+        "oneOf": [
+          {
+            "title": "Input content types",
+            "$ref": "#/components/schemas/InputContent"
+          },
+          {
+            "title": "Output content types",
+            "$ref": "#/components/schemas/OutputContent"
+          }
+        ]
+      },
+      "ConversationItem": {
+        "title": "Conversation item",
+        "description": "A single item within a conversation. The set of possible types are the same as the `output` type of a [Response object](https://developers.openai.com/api/reference/resources/responses#%28resource%29%20responses%20%3E%20%28model%29%20response%20%3E%20%28schema%29%20%3E%20%28property%29%20output).",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/Message"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCallResource"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/FileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchCall"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchOutput"
+          },
+          {
+            "$ref": "#/components/schemas/AdditionalTools"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseConfigurationUpdate"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/Program"
+          },
+          {
+            "$ref": "#/components/schemas/ProgramOutput"
+          },
+          {
+            "$ref": "#/components/schemas/CompactionBody"
+          },
+          {
+            "$ref": "#/components/schemas/CodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/MCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalResponseResource"
+          },
+          {
+            "$ref": "#/components/schemas/MCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCallOutput"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ConversationItemList": {
+        "type": "object",
+        "title": "The conversation item list",
+        "description": "A list of Conversation items.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "The type of object returned, must be `list`.",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "A list of conversation items.",
+            "items": {
+              "$ref": "#/components/schemas/ConversationItem"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The ID of the first item in the list."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The ID of the last item in the list."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "first_id",
+          "last_id"
+        ],
+        "x-oaiMeta": {
+          "name": "The item list",
+          "group": "conversations"
+        }
+      },
+      "ConversationParam": {
+        "description": "The conversation that this response belongs to. Items from this conversation are prepended to `input_items` for this response request.\nInput items and output items from this response are automatically added to this conversation after this response completes.\n",
+        "default": null,
+        "oneOf": [
+          {
+            "type": "string",
+            "title": "Conversation ID",
+            "description": "The unique ID of the conversation.\n"
+          },
+          {
+            "$ref": "#/components/schemas/ConversationParam-2"
+          }
+        ]
+      },
+      "CostsResult": {
+        "type": "object",
+        "description": "The aggregated costs details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.costs.result"
+            ],
+            "x-stainless-const": true
+          },
+          "amount": {
+            "type": "object",
+            "description": "The monetary value in its associated currency.",
+            "properties": {
+              "value": {
+                "type": "number",
+                "description": "The numeric value of the cost."
+              },
+              "currency": {
+                "type": "string",
+                "description": "Lowercase ISO-4217 currency e.g. \"usd\""
+              }
+            }
+          },
+          "line_item": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=line_item`, this field provides the line item of the grouped costs result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped costs result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API Key ID of the grouped costs result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "quantity": {
+            "anyOf": [
+              {
+                "type": "number",
+                "description": "When `group_by=line_item`, this field provides the quantity of the grouped costs result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "quantity_unit": {
+            "description": "The unit of the `quantity` value. If no single supported unit applies to the result, this field is `null`.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "tokens",
+                  "1000_tokens",
+                  "duration_seconds",
+                  "duration_minutes",
+                  "duration_hours",
+                  "gibibyte_hours",
+                  "images",
+                  "characters"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object"
+        ],
+        "x-oaiMeta": {
+          "name": "Costs object",
+          "example": "{\n    \"object\": \"organization.costs.result\",\n    \"amount\": {\n      \"value\": 0.06,\n      \"currency\": \"usd\"\n    },\n    \"line_item\": \"gpt-6-astra, input_tokens\",\n    \"project_id\": \"proj_abc\",\n    \"quantity\": 10000,\n    \"quantity_unit\": \"tokens\"\n}\n"
+        }
+      },
+      "CreateAssistantRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "model": {
+            "description": "ID of the model to use. You can use the [List models](https://developers.openai.com/api/reference/resources/models/methods/list) API to see all of your available models, or see our [Model overview](https://developers.openai.com/api/docs/models) for descriptions of them.\n",
+            "example": "gpt-5",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/components/schemas/AssistantSupportedModels"
+              }
+            ],
+            "x-oaiTypeLabel": "string"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "description": "The name of the assistant. The maximum length is 256 characters.\n",
+                "type": "string",
+                "maxLength": 256
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "description": {
+            "anyOf": [
+              {
+                "description": "The description of the assistant. The maximum length is 512 characters.\n",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "description": "The system instructions that the assistant uses. The maximum length is 256,000 characters.\n",
+                "type": "string",
+                "maxLength": 256000
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "reasoning_effort": {
+            "$ref": "#/components/schemas/ReasoningEffort"
+          },
+          "tools": {
+            "description": "A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant. Tools can be of types `code_interpreter`, `file_search`, or `function`.\n",
+            "default": [],
+            "type": "array",
+            "maxItems": 128,
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/AssistantToolsCode"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFileSearch"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFunction"
+                }
+              ]
+            }
+          },
+          "tool_resources": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.\n",
+                "properties": {
+                  "code_interpreter": {
+                    "type": "object",
+                    "properties": {
+                      "file_ids": {
+                        "type": "array",
+                        "description": "A list of [file](https://developers.openai.com/api/reference/resources/files) IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files associated with the tool.\n",
+                        "default": [],
+                        "maxItems": 20,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  },
+                  "file_search": {
+                    "type": "object",
+                    "properties": {
+                      "vector_store_ids": {
+                        "type": "array",
+                        "description": "The [vector store](https://developers.openai.com/api/reference/resources/vector_stores) attached to this assistant. There can be a maximum of 1 vector store attached to the assistant.\n",
+                        "maxItems": 1,
+                        "items": {
+                          "type": "string"
+                        }
+                      },
+                      "vector_stores": {
+                        "type": "array",
+                        "description": "A helper to create a [vector store](https://developers.openai.com/api/reference/resources/vector_stores) with file_ids and attach it to this assistant. There can be a maximum of 1 vector store attached to the assistant.\n",
+                        "maxItems": 1,
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "file_ids": {
+                              "type": "array",
+                              "description": "A list of [file](https://developers.openai.com/api/reference/resources/files) IDs to add to the vector store. For vector stores created before Nov 2025, there can be a maximum of 10,000 files in a vector store. For vector stores created starting in Nov 2025, the limit is 100,000,000 files.\n",
+                              "maxItems": 100000000,
+                              "items": {
+                                "type": "string"
+                              }
+                            },
+                            "chunking_strategy": {
+                              "type": "object",
+                              "description": "The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy.",
+                              "oneOf": [
+                                {
+                                  "type": "object",
+                                  "title": "Auto Chunking Strategy",
+                                  "description": "The default strategy. This strategy currently uses a `max_chunk_size_tokens` of `800` and `chunk_overlap_tokens` of `400`.",
+                                  "additionalProperties": false,
+                                  "properties": {
+                                    "type": {
+                                      "type": "string",
+                                      "description": "Always `auto`.",
+                                      "enum": [
+                                        "auto"
+                                      ],
+                                      "x-stainless-const": true
+                                    }
+                                  },
+                                  "required": [
+                                    "type"
+                                  ]
+                                },
+                                {
+                                  "type": "object",
+                                  "title": "Static Chunking Strategy",
+                                  "additionalProperties": false,
+                                  "properties": {
+                                    "type": {
+                                      "type": "string",
+                                      "description": "Always `static`.",
+                                      "enum": [
+                                        "static"
+                                      ],
+                                      "x-stainless-const": true
+                                    },
+                                    "static": {
+                                      "type": "object",
+                                      "additionalProperties": false,
+                                      "properties": {
+                                        "max_chunk_size_tokens": {
+                                          "type": "integer",
+                                          "minimum": 100,
+                                          "maximum": 4096,
+                                          "description": "The maximum number of tokens in each chunk. The default value is `800`. The minimum value is `100` and the maximum value is `4096`."
+                                        },
+                                        "chunk_overlap_tokens": {
+                                          "type": "integer",
+                                          "description": "The number of tokens that overlap between chunks. The default value is `400`.\n\nNote that the overlap must not exceed half of `max_chunk_size_tokens`.\n"
+                                        }
+                                      },
+                                      "required": [
+                                        "max_chunk_size_tokens",
+                                        "chunk_overlap_tokens"
+                                      ]
+                                    }
+                                  },
+                                  "required": [
+                                    "type",
+                                    "static"
+                                  ]
+                                }
+                              ]
+                            },
+                            "metadata": {
+                              "$ref": "#/components/schemas/Metadata"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "oneOf": [
+                      {
+                        "required": [
+                          "vector_store_ids"
+                        ]
+                      },
+                      {
+                        "required": [
+                          "vector_stores"
+                        ]
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "temperature": {
+            "anyOf": [
+              {
+                "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\n",
+                "type": "number",
+                "minimum": 0,
+                "maximum": 2,
+                "default": 1,
+                "example": 1
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "top_p": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 1,
+                "default": 1,
+                "example": 1,
+                "description": "An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.\n\nWe generally recommend altering this or temperature but not both.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "response_format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/AssistantsApiResponseFormatOption"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "model"
+        ]
+      },
+      "CreateBatchRequest": {
+        "type": "object",
+        "required": [
+          "input_file_id",
+          "endpoint",
+          "completion_window"
+        ],
+        "properties": {
+          "input_file_id": {
+            "type": "string",
+            "description": "The ID of an uploaded file that contains requests for the new batch.\n\nSee [upload file](https://developers.openai.com/api/reference/resources/files/methods/create) for how to upload a file.\n\nYour input file must be formatted as a [JSONL file](https://developers.openai.com/api/docs/guides/batch#1-prepare-your-batch-file), and must be uploaded with the purpose `batch`. The file can contain up to 50,000 requests, and can be up to 200 MB in size.\n"
+          },
+          "endpoint": {
+            "type": "string",
+            "enum": [
+              "/v1/responses",
+              "/v1/chat/completions",
+              "/v1/embeddings",
+              "/v1/completions",
+              "/v1/moderations",
+              "/v1/images/generations",
+              "/v1/images/edits",
+              "/v1/videos"
+            ],
+            "description": "The endpoint to be used for all requests in the batch. Currently `/v1/responses`, `/v1/chat/completions`, `/v1/embeddings`, `/v1/completions`, `/v1/moderations`, `/v1/images/generations`, `/v1/images/edits`, and `/v1/videos` are supported. Note that `/v1/embeddings` batches are also restricted to a maximum of 50,000 embedding inputs across all requests in the batch."
+          },
+          "completion_window": {
+            "type": "string",
+            "enum": [
+              "24h"
+            ],
+            "description": "The time frame within which the batch should be processed. Currently only `24h` is supported."
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "output_expires_after": {
+            "$ref": "#/components/schemas/BatchFileExpirationAfter"
+          }
+        }
+      },
+      "CreateChatCompletionRequest": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/CreateModelResponseProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "messages": {
+                "description": "A list of messages comprising the conversation so far. Depending on the\n[model](https://developers.openai.com/api/docs/models) you use, different message types (modalities) are\nsupported, like [text](https://developers.openai.com/api/docs/guides/text),\n[images](https://developers.openai.com/api/docs/guides/images-vision), and [audio](https://developers.openai.com/api/docs/guides/audio).\n",
+                "type": "array",
+                "minItems": 1,
+                "items": {
+                  "$ref": "#/components/schemas/ChatCompletionRequestMessage"
+                }
+              },
+              "model": {
+                "description": "Model ID used to generate the response, like `gpt-6-astra` or `o3`. OpenAI\noffers a wide range of models with different capabilities, performance\ncharacteristics, and price points. Refer to the [model guide](https://developers.openai.com/api/docs/models)\nto browse and compare available models.\n",
+                "$ref": "#/components/schemas/ModelIdsShared"
+              },
+              "service_tier": {
+                "$ref": "#/components/schemas/ServiceTier"
+              },
+              "modalities": {
+                "$ref": "#/components/schemas/ResponseModalities"
+              },
+              "verbosity": {
+                "$ref": "#/components/schemas/Verbosity"
+              },
+              "reasoning_effort": {
+                "$ref": "#/components/schemas/ReasoningEffort"
+              },
+              "max_completion_tokens": {
+                "description": "An upper bound for the number of tokens that can be generated for a completion, including visible output tokens and [reasoning tokens](https://developers.openai.com/api/docs/guides/reasoning).\n",
+                "type": "integer",
+                "nullable": true
+              },
+              "frequency_penalty": {
+                "type": "number",
+                "default": 0,
+                "minimum": -2,
+                "maximum": 2,
+                "nullable": true,
+                "description": "Number between -2.0 and 2.0. Positive values penalize new tokens based on\ntheir existing frequency in the text so far, decreasing the model's\nlikelihood to repeat the same line verbatim.\n"
+              },
+              "presence_penalty": {
+                "type": "number",
+                "default": 0,
+                "minimum": -2,
+                "maximum": 2,
+                "nullable": true,
+                "description": "Number between -2.0 and 2.0. Positive values penalize new tokens based on\nwhether they appear in the text so far, increasing the model's likelihood\nto talk about new topics.\n"
+              },
+              "web_search_options": {
+                "type": "object",
+                "title": "Web search",
+                "description": "This tool searches the web for relevant results to use in a response.\nLearn more about the [web search tool](https://developers.openai.com/api/docs/guides/tools-web-search).\n",
+                "properties": {
+                  "user_location": {
+                    "type": "object",
+                    "nullable": true,
+                    "required": [
+                      "type",
+                      "approximate"
+                    ],
+                    "description": "Approximate location parameters for the search.\n",
+                    "properties": {
+                      "type": {
+                        "type": "string",
+                        "description": "The type of location approximation. Always `approximate`.\n",
+                        "enum": [
+                          "approximate"
+                        ],
+                        "x-stainless-const": true
+                      },
+                      "approximate": {
+                        "$ref": "#/components/schemas/WebSearchLocation"
+                      }
+                    }
+                  },
+                  "search_context_size": {
+                    "$ref": "#/components/schemas/WebSearchContextSize"
+                  }
+                }
+              },
+              "top_logprobs": {
+                "description": "An integer between 0 and 20 specifying the maximum number of most likely\ntokens to return at each token position, each with an associated log\nprobability. In some cases, the number of returned tokens may be fewer than\nrequested.\n`logprobs` must be set to `true` if this parameter is used.\n",
+                "type": "integer",
+                "minimum": 0,
+                "maximum": 20,
+                "nullable": true
+              },
+              "response_format": {
+                "description": "An object specifying the format that the model must output.\n\nSetting to `{ \"type\": \"json_schema\", \"json_schema\": {...} }` enables\nStructured Outputs which ensures the model will match your supplied JSON\nschema. Learn more in the [Structured Outputs\nguide](https://developers.openai.com/api/docs/guides/structured-outputs).\n\nSetting to `{ \"type\": \"json_object\" }` enables the older JSON mode, which\nensures the message the model generates is valid JSON. Using `json_schema`\nis preferred for models that support it.\n",
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/ResponseFormatText"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ResponseFormatJsonSchema"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ResponseFormatJsonObject"
+                  }
+                ],
+                "discriminator": {
+                  "propertyName": "type"
+                }
+              },
+              "audio": {
+                "type": "object",
+                "nullable": true,
+                "description": "Parameters for audio output. Required when audio output is requested with\n`modalities: [\"audio\"]`. [Learn more](https://developers.openai.com/api/docs/guides/audio).\n",
+                "required": [
+                  "voice",
+                  "format"
+                ],
+                "properties": {
+                  "voice": {
+                    "$ref": "#/components/schemas/VoiceIdsOrCustomVoice",
+                    "description": "The voice the model uses to respond. Supported built-in voices are\n`alloy`, `ash`, `ballad`, `coral`, `echo`, `fable`, `nova`, `onyx`,\n`sage`, `shimmer`, `marin`, and `cedar`. You may also provide a\ncustom voice object with an `id`, for example `{ \"id\": \"voice_1234\" }`.\n"
+                  },
+                  "format": {
+                    "type": "string",
+                    "enum": [
+                      "wav",
+                      "aac",
+                      "mp3",
+                      "flac",
+                      "opus",
+                      "pcm16"
+                    ],
+                    "description": "Specifies the output audio format. Must be one of `wav`, `mp3`, `flac`,\n`opus`, or `pcm16`.\n"
+                  }
+                }
+              },
+              "store": {
+                "type": "boolean",
+                "default": false,
+                "nullable": true,
+                "description": "Whether or not to store the output of this chat completion request for\nuse in our [model distillation](https://developers.openai.com/api/docs/guides/supervised-fine-tuning#distilling-from-a-larger-model) or\n[evals](https://developers.openai.com/api/docs/guides/evals) products.\n\nSupports text and image inputs. Note: image inputs over 8MB will be dropped.\n"
+              },
+              "moderation": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/ModerationParam",
+                    "description": "Configuration for running moderation on the request input and generated output.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "stream": {
+                "description": "If set to true, the model response data will be streamed to the client\nas it is generated using [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format).\nSee the [Streaming section below](https://developers.openai.com/api/reference/resources/chat/subresources/completions/streaming-events)\nfor more information, along with the [streaming responses](https://developers.openai.com/api/docs/guides/streaming-responses)\nguide for more information on how to handle the streaming events.\n",
+                "type": "boolean",
+                "nullable": true,
+                "default": false
+              },
+              "stop": {
+                "$ref": "#/components/schemas/StopConfiguration"
+              },
+              "logit_bias": {
+                "type": "object",
+                "x-oaiTypeLabel": "map",
+                "default": null,
+                "nullable": true,
+                "additionalProperties": {
+                  "type": "integer"
+                },
+                "description": "Modify the likelihood of specified tokens appearing in the completion.\n\nAccepts a JSON object that maps tokens (specified by their token ID in the\ntokenizer) to an associated bias value from -100 to 100. Mathematically,\nthe bias is added to the logits generated by the model prior to sampling.\nThe exact effect will vary per model, but values between -1 and 1 should\ndecrease or increase likelihood of selection; values like -100 or 100\nshould result in a ban or exclusive selection of the relevant token.\n"
+              },
+              "logprobs": {
+                "description": "Whether to return log probabilities of the output tokens or not. If true,\nreturns the log probabilities of each output token returned in the\n`content` of `message`.\n",
+                "type": "boolean",
+                "default": false,
+                "nullable": true
+              },
+              "max_tokens": {
+                "description": "The maximum number of [tokens](https://platform.openai.com/tokenizer) that can be generated in the\nchat completion. This value can be used to control\n[costs](https://openai.com/api/pricing/) for text generated via API.\n\nThis value is now deprecated in favor of `max_completion_tokens`, and is\nnot compatible with [o-series models](https://developers.openai.com/api/docs/guides/reasoning).\n",
+                "type": "integer",
+                "nullable": true,
+                "deprecated": true
+              },
+              "n": {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 128,
+                "default": 1,
+                "example": 1,
+                "nullable": true,
+                "description": "How many chat completion choices to generate for each input message. Note that you will be charged based on the number of generated tokens across all of the choices. Keep `n` as `1` to minimize costs."
+              },
+              "prediction": {
+                "nullable": true,
+                "description": "Configuration for a [Predicted Output](https://developers.openai.com/api/docs/guides/predicted-outputs),\nwhich can greatly improve response times when large parts of the model\nresponse are known ahead of time. This is most common when you are\nregenerating a file with only minor changes to most of the content.\n",
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/PredictionContent"
+                  }
+                ]
+              },
+              "seed": {
+                "type": "integer",
+                "minimum": -9223372036854776000,
+                "maximum": 9223372036854776000,
+                "nullable": true,
+                "deprecated": true,
+                "description": "This feature is in Beta.\nIf specified, our system will make a best effort to sample deterministically, such that repeated requests with the same `seed` and parameters should return the same result.\nDeterminism is not guaranteed, and you should refer to the `system_fingerprint` response parameter to monitor changes in the backend.\n",
+                "x-oaiMeta": {
+                  "beta": true
+                }
+              },
+              "stream_options": {
+                "$ref": "#/components/schemas/ChatCompletionStreamOptions"
+              },
+              "tools": {
+                "type": "array",
+                "description": "A list of tools the model may call. You can provide either\n[custom tools](https://developers.openai.com/api/docs/guides/function-calling#custom-tools) or\n[function tools](https://developers.openai.com/api/docs/guides/function-calling).\n",
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/ChatCompletionTool"
+                    },
+                    {
+                      "$ref": "#/components/schemas/CustomToolChatCompletions"
+                    }
+                  ]
+                }
+              },
+              "tool_choice": {
+                "$ref": "#/components/schemas/ChatCompletionToolChoiceOption"
+              },
+              "parallel_tool_calls": {
+                "$ref": "#/components/schemas/ParallelToolCalls"
+              },
+              "function_call": {
+                "deprecated": true,
+                "description": "Deprecated in favor of `tool_choice`.\n\nControls which (if any) function is called by the model.\n\n`none` means the model will not call a function and instead generates a\nmessage.\n\n`auto` means the model can pick between generating a message or calling a\nfunction.\n\nSpecifying a particular function via `{\"name\": \"my_function\"}` forces the\nmodel to call that function.\n\n`none` is the default when no functions are present. `auto` is the default\nif functions are present.\n",
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "description": "`none` means the model will not call a function and instead generates a message. `auto` means the model can pick between generating a message or calling a function.\n",
+                    "enum": [
+                      "none",
+                      "auto"
+                    ]
+                  },
+                  {
+                    "$ref": "#/components/schemas/ChatCompletionFunctionCallOption"
+                  }
+                ]
+              },
+              "functions": {
+                "deprecated": true,
+                "description": "Deprecated in favor of `tools`.\n\nA list of functions the model may generate JSON inputs for.\n",
+                "type": "array",
+                "minItems": 1,
+                "maxItems": 128,
+                "items": {
+                  "$ref": "#/components/schemas/ChatCompletionFunctions"
+                }
+              }
+            },
+            "required": [
+              "model",
+              "messages"
+            ]
+          }
+        ]
+      },
+      "CreateChatCompletionResponse": {
+        "type": "object",
+        "description": "Represents a chat completion response returned by model, based on the provided input.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "A unique identifier for the chat completion."
+          },
+          "choices": {
+            "type": "array",
+            "description": "A list of chat completion choices. Can be more than one if `n` is greater than 1.",
+            "items": {
+              "type": "object",
+              "required": [
+                "finish_reason",
+                "index",
+                "message",
+                "logprobs"
+              ],
+              "properties": {
+                "finish_reason": {
+                  "type": "string",
+                  "description": "The reason the model stopped generating tokens. This will be `stop` if the model hit a natural stop point or a provided stop sequence,\n`length` if the maximum number of tokens specified in the request was reached,\n`content_filter` if content was omitted due to a flag from our content filters,\n`tool_calls` if the model called a tool, or `function_call` (deprecated) if the model called a function.\nRead the [Model Spec](https://model-spec.openai.com/2025-12-18.html) for more.\n",
+                  "enum": [
+                    "stop",
+                    "length",
+                    "tool_calls",
+                    "content_filter",
+                    "function_call"
+                  ]
+                },
+                "index": {
+                  "type": "integer",
+                  "description": "The index of the choice in the list of choices."
+                },
+                "message": {
+                  "$ref": "#/components/schemas/ChatCompletionResponseMessage"
+                },
+                "logprobs": {
+                  "anyOf": [
+                    {
+                      "description": "Log probability information for the choice.",
+                      "type": "object",
+                      "properties": {
+                        "content": {
+                          "anyOf": [
+                            {
+                              "description": "A list of message content tokens with log probability information.",
+                              "type": "array",
+                              "items": {
+                                "$ref": "#/components/schemas/ChatCompletionTokenLogprob"
+                              }
+                            },
+                            {
+                              "type": "null"
+                            }
+                          ]
+                        },
+                        "refusal": {
+                          "anyOf": [
+                            {
+                              "description": "A list of message refusal tokens with log probability information.",
+                              "type": "array",
+                              "items": {
+                                "$ref": "#/components/schemas/ChatCompletionTokenLogprob"
+                              }
+                            },
+                            {
+                              "type": "null"
+                            }
+                          ]
+                        }
+                      },
+                      "required": [
+                        "content",
+                        "refusal"
+                      ]
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                }
+              }
+            }
+          },
+          "created": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the chat completion was created."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model used for the chat completion."
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "service_tier": {
+            "$ref": "#/components/schemas/ServiceTier"
+          },
+          "system_fingerprint": {
+            "type": "string",
+            "deprecated": true,
+            "description": "This fingerprint represents the backend configuration that the model runs with.\n\nCan be used in conjunction with the `seed` request parameter to understand when backend changes have been made that might impact determinism.\n"
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always `chat.completion`.",
+            "enum": [
+              "chat.completion"
+            ],
+            "x-stainless-const": true
+          },
+          "usage": {
+            "$ref": "#/components/schemas/CompletionUsage"
+          },
+          "moderation": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ChatCompletionModeration",
+                "description": "Moderation results for the request input and generated output, if moderated\ncompletions were requested.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "choices",
+          "created",
+          "id",
+          "model",
+          "object"
+        ],
+        "x-oaiMeta": {
+          "name": "The chat completion object",
+          "group": "chat",
+          "example": "{\n  \"id\": \"chatcmpl-B9MHDbslfkBeAs8l4bebGdFOJ6PeG\",\n  \"object\": \"chat.completion\",\n  \"created\": 1741570283,\n  \"model\": \"gpt-6-astra\",\n  \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\": \"assistant\",\n        \"content\": \"The image shows a wooden boardwalk path running through a lush green field or meadow. The sky is bright blue with some scattered clouds, giving the scene a serene and peaceful atmosphere. Trees and shrubs are visible in the background.\",\n        \"refusal\": null,\n        \"annotations\": []\n      },\n      \"logprobs\": null,\n      \"finish_reason\": \"stop\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 1117,\n    \"completion_tokens\": 46,\n    \"total_tokens\": 1163,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\": 0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n      \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\": 0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"service_tier\": \"default\",\n  \"system_fingerprint\": \"fp_fc9f1d7035\"\n}\n"
+        }
+      },
+      "CreateChatCompletionStreamResponse": {
+        "type": "object",
+        "description": "Represents a streamed chunk of a chat completion response returned\nby the model, based on the provided input.\n[Learn more](https://developers.openai.com/api/docs/guides/streaming-responses).\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "A unique identifier for the chat completion. Each chunk has the same ID."
+          },
+          "choices": {
+            "type": "array",
+            "description": "A list of chat completion choices. Can contain more than one elements if `n` is greater than 1. Can also be empty for the\nlast chunk if you set `stream_options: {\"include_usage\": true}`.\n",
+            "items": {
+              "type": "object",
+              "required": [
+                "delta",
+                "finish_reason",
+                "index"
+              ],
+              "properties": {
+                "delta": {
+                  "$ref": "#/components/schemas/ChatCompletionStreamResponseDelta"
+                },
+                "logprobs": {
+                  "description": "Log probability information for the choice.",
+                  "type": "object",
+                  "nullable": true,
+                  "properties": {
+                    "content": {
+                      "description": "A list of message content tokens with log probability information.",
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ChatCompletionTokenLogprob"
+                      },
+                      "nullable": true
+                    },
+                    "refusal": {
+                      "description": "A list of message refusal tokens with log probability information.",
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ChatCompletionTokenLogprob"
+                      },
+                      "nullable": true
+                    }
+                  },
+                  "required": [
+                    "content",
+                    "refusal"
+                  ]
+                },
+                "finish_reason": {
+                  "type": "string",
+                  "description": "The reason the model stopped generating tokens. This will be `stop` if the model hit a natural stop point or a provided stop sequence,\n`length` if the maximum number of tokens specified in the request was reached,\n`content_filter` if content was omitted due to a flag from our content filters,\n`tool_calls` if the model called a tool, or `function_call` (deprecated) if the model called a function.\n",
+                  "enum": [
+                    "stop",
+                    "length",
+                    "tool_calls",
+                    "content_filter",
+                    "function_call"
+                  ],
+                  "nullable": true
+                },
+                "index": {
+                  "type": "integer",
+                  "description": "The index of the choice in the list of choices."
+                }
+              }
+            }
+          },
+          "created": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the chat completion was created. Each chunk has the same timestamp."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model to generate the completion."
+          },
+          "obfuscation": {
+            "type": "string",
+            "description": "An obfuscation string added to normalize the size of streamed chunks as a\nmitigation to certain side-channel attacks. The field is included by\ndefault and omitted when `stream_options.include_obfuscation` is `false`.\n"
+          },
+          "service_tier": {
+            "$ref": "#/components/schemas/ServiceTier"
+          },
+          "system_fingerprint": {
+            "type": "string",
+            "deprecated": true,
+            "description": "This fingerprint represents the backend configuration that the model runs with.\nCan be used in conjunction with the `seed` request parameter to understand when backend changes have been made that might impact determinism.\n"
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always `chat.completion.chunk`.",
+            "enum": [
+              "chat.completion.chunk"
+            ],
+            "x-stainless-const": true
+          },
+          "usage": {
+            "$ref": "#/components/schemas/CompletionUsage",
+            "nullable": true,
+            "description": "An optional field that will only be present when you set\n`stream_options: {\"include_usage\": true}` in your request. When present, it\ncontains a null value **except for the last chunk** which contains the\ntoken usage statistics for the entire request.\n\n**NOTE:** If the stream is interrupted or cancelled, you may not\nreceive the final usage chunk which contains the total token usage for\nthe request.\n"
+          },
+          "moderation": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ChatCompletionModeration",
+                "description": "Moderation results for the request input and generated output. Present\non the moderation chunk when moderated completions are requested.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "choices",
+          "created",
+          "id",
+          "model",
+          "object"
+        ],
+        "x-oaiMeta": {
+          "name": "The chat completion chunk object",
+          "group": "chat",
+          "example": "{\"id\":\"chatcmpl-123\",\"object\":\"chat.completion.chunk\",\"created\":1694268190,\"model\":\"gpt-6-astra\", \"system_fingerprint\": \"fp_44709d6fcb\", \"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\"},\"logprobs\":null,\"finish_reason\":null}],\"obfuscation\":\"r4N7vQ2m\"}\n\n{\"id\":\"chatcmpl-123\",\"object\":\"chat.completion.chunk\",\"created\":1694268190,\"model\":\"gpt-6-astra\", \"system_fingerprint\": \"fp_44709d6fcb\", \"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hello\"},\"logprobs\":null,\"finish_reason\":null}],\"obfuscation\":\"p9K3xT6w\"}\n\n....\n\n{\"id\":\"chatcmpl-123\",\"object\":\"chat.completion.chunk\",\"created\":1694268190,\"model\":\"gpt-6-astra\", \"system_fingerprint\": \"fp_44709d6fcb\", \"choices\":[{\"index\":0,\"delta\":{},\"logprobs\":null,\"finish_reason\":\"stop\"}],\"obfuscation\":\"\"}\n"
+        }
+      },
+      "CreateCompletionRequest": {
+        "type": "object",
+        "properties": {
+          "model": {
+            "description": "ID of the model to use. You can use the [List models](https://developers.openai.com/api/reference/resources/models/methods/list) API to see all of your available models, or see our [Model overview](https://developers.openai.com/api/docs/models) for descriptions of them.\n",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-3.5-turbo-instruct",
+                  "davinci-002",
+                  "babbage-002"
+                ]
+              }
+            ],
+            "x-oaiTypeLabel": "string"
+          },
+          "prompt": {
+            "description": "The prompt(s) to generate completions for, encoded as a string, array of strings, array of tokens, or array of token arrays.\n\nNote that <|endoftext|> is the document separator that the model sees during training, so if a prompt is not specified the model will generate as if from the beginning of a new document.\n",
+            "default": "<|endoftext|>",
+            "nullable": true,
+            "oneOf": [
+              {
+                "type": "string",
+                "default": "",
+                "example": "This is a test."
+              },
+              {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "default": "",
+                  "example": "This is a test."
+                }
+              },
+              {
+                "type": "array",
+                "minItems": 1,
+                "items": {
+                  "type": "integer"
+                },
+                "example": "[1212, 318, 257, 1332, 13]"
+              },
+              {
+                "type": "array",
+                "minItems": 1,
+                "items": {
+                  "type": "array",
+                  "minItems": 1,
+                  "items": {
+                    "type": "integer"
+                  }
+                },
+                "example": "[[1212, 318, 257, 1332, 13]]"
+              }
+            ]
+          },
+          "best_of": {
+            "type": "integer",
+            "default": 1,
+            "minimum": 0,
+            "maximum": 20,
+            "nullable": true,
+            "description": "Generates `best_of` completions server-side and returns the \"best\" (the one with the highest log probability per token). Results cannot be streamed.\n\nWhen used with `n`, `best_of` controls the number of candidate completions and `n` specifies how many to return – `best_of` must be greater than `n`.\n\n**Note:** Because this parameter generates many completions, it can quickly consume your token quota. Use carefully and ensure that you have reasonable settings for `max_tokens` and `stop`.\n"
+          },
+          "echo": {
+            "type": "boolean",
+            "default": false,
+            "nullable": true,
+            "description": "Echo back the prompt in addition to the completion\n"
+          },
+          "frequency_penalty": {
+            "type": "number",
+            "default": 0,
+            "minimum": -2,
+            "maximum": 2,
+            "nullable": true,
+            "description": "Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim.\n\n[See more information about frequency and presence penalties.](https://developers.openai.com/api/docs/guides/text)\n"
+          },
+          "logit_bias": {
+            "type": "object",
+            "x-oaiTypeLabel": "map",
+            "default": null,
+            "nullable": true,
+            "additionalProperties": {
+              "type": "integer"
+            },
+            "description": "Modify the likelihood of specified tokens appearing in the completion.\n\nAccepts a JSON object that maps tokens (specified by their token ID in the GPT tokenizer) to an associated bias value from -100 to 100. You can use this [tokenizer tool](https://platform.openai.com/tokenizer?view=bpe) to convert text to token IDs. Mathematically, the bias is added to the logits generated by the model prior to sampling. The exact effect will vary per model, but values between -1 and 1 should decrease or increase likelihood of selection; values like -100 or 100 should result in a ban or exclusive selection of the relevant token.\n\nAs an example, you can pass `{\"50256\": -100}` to prevent the <|endoftext|> token from being generated.\n"
+          },
+          "logprobs": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 5,
+            "default": null,
+            "nullable": true,
+            "description": "Include the log probabilities on the `logprobs` most likely output tokens, as well the chosen tokens. For example, if `logprobs` is 5, the API will return a list of the 5 most likely tokens. The API will always return the `logprob` of the sampled token, so there may be up to `logprobs+1` elements in the response.\n\nThe maximum value for `logprobs` is 5.\n"
+          },
+          "max_tokens": {
+            "type": "integer",
+            "minimum": 0,
+            "default": 16,
+            "example": 16,
+            "nullable": true,
+            "description": "The maximum number of [tokens](https://platform.openai.com/tokenizer) that can be generated in the completion.\n\nThe token count of your prompt plus `max_tokens` cannot exceed the model's context length. [Example Python code](https://cookbook.openai.com/examples/how_to_count_tokens_with_tiktoken) for counting tokens.\n"
+          },
+          "n": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 128,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "How many completions to generate for each prompt.\n\n**Note:** Because this parameter generates many completions, it can quickly consume your token quota. Use carefully and ensure that you have reasonable settings for `max_tokens` and `stop`.\n"
+          },
+          "presence_penalty": {
+            "type": "number",
+            "default": 0,
+            "minimum": -2,
+            "maximum": 2,
+            "nullable": true,
+            "description": "Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics.\n\n[See more information about frequency and presence penalties.](https://developers.openai.com/api/docs/guides/text)\n"
+          },
+          "seed": {
+            "type": "integer",
+            "format": "int64",
+            "nullable": true,
+            "description": "If specified, our system will make a best effort to sample deterministically, such that repeated requests with the same `seed` and parameters should return the same result.\n\nDeterminism is not guaranteed, and you should refer to the `system_fingerprint` response parameter to monitor changes in the backend.\n"
+          },
+          "stop": {
+            "$ref": "#/components/schemas/StopConfiguration"
+          },
+          "stream": {
+            "description": "Whether to stream back partial progress. If set, tokens will be sent as data-only [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format) as they become available, with the stream terminated by a `data: [DONE]` message. [Example Python code](https://cookbook.openai.com/examples/how_to_stream_completions).\n",
+            "type": "boolean",
+            "nullable": true,
+            "default": false
+          },
+          "stream_options": {
+            "$ref": "#/components/schemas/ChatCompletionStreamOptions"
+          },
+          "suffix": {
+            "description": "The suffix that comes after a completion of inserted text.\n\nThis parameter is only supported for `gpt-3.5-turbo-instruct`.\n",
+            "default": null,
+            "nullable": true,
+            "type": "string",
+            "example": "test."
+          },
+          "temperature": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 2,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\n\nWe generally recommend altering this or `top_p` but not both.\n"
+          },
+          "top_p": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 1,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.\n\nWe generally recommend altering this or `temperature` but not both.\n"
+          },
+          "user": {
+            "type": "string",
+            "example": "user-1234",
+            "description": "A unique identifier representing your end-user, which can help OpenAI to monitor and detect abuse. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+          }
+        },
+        "required": [
+          "model",
+          "prompt"
+        ]
+      },
+      "CreateCompletionResponse": {
+        "type": "object",
+        "description": "Represents a completion response from the API. Note: both the streamed and non-streamed response objects share the same shape (unlike the chat endpoint).\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "A unique identifier for the completion."
+          },
+          "choices": {
+            "type": "array",
+            "description": "The list of completion choices the model generated for the input prompt.",
+            "items": {
+              "type": "object",
+              "required": [
+                "finish_reason",
+                "index",
+                "logprobs",
+                "text"
+              ],
+              "properties": {
+                "finish_reason": {
+                  "type": "string",
+                  "description": "The reason the model stopped generating tokens. This will be `stop` if the model hit a natural stop point or a provided stop sequence,\n`length` if the maximum number of tokens specified in the request was reached,\nor `content_filter` if content was omitted due to a flag from our content filters.\n",
+                  "enum": [
+                    "stop",
+                    "length",
+                    "content_filter"
+                  ]
+                },
+                "index": {
+                  "type": "integer"
+                },
+                "logprobs": {
+                  "anyOf": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "text_offset": {
+                          "type": "array",
+                          "items": {
+                            "type": "integer"
+                          }
+                        },
+                        "token_logprobs": {
+                          "type": "array",
+                          "items": {
+                            "type": "number"
+                          }
+                        },
+                        "tokens": {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        "top_logprobs": {
+                          "type": "array",
+                          "items": {
+                            "type": "object",
+                            "additionalProperties": {
+                              "type": "number"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "type": "null"
+                    }
+                  ]
+                },
+                "text": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "created": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the completion was created."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model used for completion."
+          },
+          "system_fingerprint": {
+            "type": "string",
+            "description": "This fingerprint represents the backend configuration that the model runs with.\n\nCan be used in conjunction with the `seed` request parameter to understand when backend changes have been made that might impact determinism.\n"
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"text_completion\"",
+            "enum": [
+              "text_completion"
+            ],
+            "x-stainless-const": true
+          },
+          "usage": {
+            "$ref": "#/components/schemas/CompletionUsage"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created",
+          "model",
+          "choices"
+        ],
+        "x-oaiMeta": {
+          "name": "The completion object",
+          "legacy": true,
+          "example": "{\n  \"id\": \"cmpl-uqkvlQyYK7bGYrRHQ0eXlWi7\",\n  \"object\": \"text_completion\",\n  \"created\": 1589478378,\n  \"model\": \"gpt-3.5-turbo-instruct\",\n  \"choices\": [\n    {\n      \"text\": \"\\n\\nThis is indeed a test\",\n      \"index\": 0,\n      \"logprobs\": null,\n      \"finish_reason\": \"length\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 5,\n    \"completion_tokens\": 7,\n    \"total_tokens\": 12\n  }\n}\n"
+        }
+      },
+      "CreateContainerBody": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Name of the container to create."
+          },
+          "file_ids": {
+            "type": "array",
+            "description": "IDs of files to copy to the container.",
+            "items": {
+              "type": "string"
+            }
+          },
+          "expires_after": {
+            "type": "object",
+            "description": "Container expiration time in seconds relative to the 'anchor' time.",
+            "properties": {
+              "anchor": {
+                "type": "string",
+                "enum": [
+                  "last_active_at"
+                ],
+                "description": "Time anchor for the expiration time. Currently only 'last_active_at' is supported."
+              },
+              "minutes": {
+                "type": "integer"
+              }
+            },
+            "required": [
+              "anchor",
+              "minutes"
+            ]
+          },
+          "skills": {
+            "type": "array",
+            "description": "An optional list of skills referenced by id or inline data.",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/SkillReferenceParam"
+                },
+                {
+                  "$ref": "#/components/schemas/InlineSkillParam"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "type"
+              }
+            }
+          },
+          "memory_limit": {
+            "type": "string",
+            "enum": [
+              "1g",
+              "4g",
+              "16g",
+              "64g"
+            ],
+            "description": "Optional memory limit for the container. Defaults to \"1g\"."
+          },
+          "network_policy": {
+            "description": "Network access policy for the container.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ContainerNetworkPolicyDisabledParam"
+              },
+              {
+                "$ref": "#/components/schemas/ContainerNetworkPolicyAllowlistParam"
+              }
+            ],
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "CreateContainerFileBody": {
+        "type": "object",
+        "properties": {
+          "file_id": {
+            "type": "string",
+            "description": "Name of the file to create."
+          },
+          "file": {
+            "description": "The File object (not file name) to be uploaded.\n",
+            "type": "string",
+            "format": "binary"
+          }
+        },
+        "required": []
+      },
+      "CreateEmbeddingRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "input": {
+            "description": "Input text to embed, encoded as a string or array of tokens. To embed multiple inputs in a single request, pass an array of strings or array of token arrays. The input must not exceed the max input tokens for the model (8192 tokens for all embedding models), cannot be an empty string, and any array must be 2048 dimensions or less. [Example Python code](https://cookbook.openai.com/examples/how_to_count_tokens_with_tiktoken) for counting tokens. In addition to the per-input token limit, all embedding models enforce a maximum of 300,000 tokens summed across all inputs in a single request.\n",
+            "example": "The quick brown fox jumped over the lazy dog",
+            "oneOf": [
+              {
+                "type": "string",
+                "title": "string",
+                "description": "The string that will be turned into an embedding.",
+                "default": "",
+                "example": "This is a test."
+              },
+              {
+                "type": "array",
+                "title": "array",
+                "description": "The array of strings that will be turned into an embedding.",
+                "minItems": 1,
+                "maxItems": 2048,
+                "items": {
+                  "type": "string",
+                  "default": "",
+                  "example": "['This is a test.']"
+                }
+              },
+              {
+                "type": "array",
+                "title": "array",
+                "description": "The array of integers that will be turned into an embedding.",
+                "minItems": 1,
+                "maxItems": 2048,
+                "items": {
+                  "type": "integer"
+                },
+                "example": "[1212, 318, 257, 1332, 13]"
+              },
+              {
+                "type": "array",
+                "title": "array",
+                "description": "The array of arrays containing integers that will be turned into an embedding.",
+                "minItems": 1,
+                "maxItems": 2048,
+                "items": {
+                  "type": "array",
+                  "minItems": 1,
+                  "items": {
+                    "type": "integer"
+                  }
+                },
+                "example": "[[1212, 318, 257, 1332, 13]]"
+              }
+            ]
+          },
+          "model": {
+            "description": "ID of the model to use. You can use the [List models](https://developers.openai.com/api/reference/resources/models/methods/list) API to see all of your available models, or see our [Model overview](https://developers.openai.com/api/docs/models) for descriptions of them.\n",
+            "example": "text-embedding-3-small",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "text-embedding-ada-002",
+                  "text-embedding-3-small",
+                  "text-embedding-3-large"
+                ]
+              }
+            ],
+            "x-oaiTypeLabel": "string"
+          },
+          "encoding_format": {
+            "description": "The format to return the embeddings in. Can be either `float` or [`base64`](https://pypi.org/project/pybase64/).",
+            "example": "float",
+            "default": "float",
+            "type": "string",
+            "enum": [
+              "float",
+              "base64"
+            ]
+          },
+          "dimensions": {
+            "description": "The number of dimensions the resulting output embeddings should have. Only supported in `text-embedding-3` and later models.\n",
+            "type": "integer",
+            "minimum": 1
+          },
+          "user": {
+            "type": "string",
+            "example": "user-1234",
+            "description": "A unique identifier representing your end-user, which can help OpenAI to monitor and detect abuse. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+          }
+        },
+        "required": [
+          "model",
+          "input"
+        ]
+      },
+      "CreateEmbeddingResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "description": "The list of embeddings generated by the model.",
+            "items": {
+              "$ref": "#/components/schemas/Embedding"
+            }
+          },
+          "model": {
+            "type": "string",
+            "description": "The name of the model used to generate the embedding."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"list\".",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "usage": {
+            "type": "object",
+            "description": "The usage information for the request.",
+            "properties": {
+              "prompt_tokens": {
+                "type": "integer",
+                "description": "The number of tokens used by the prompt."
+              },
+              "total_tokens": {
+                "type": "integer",
+                "description": "The total number of tokens used by the request."
+              }
+            },
+            "required": [
+              "prompt_tokens",
+              "total_tokens"
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "model",
+          "data",
+          "usage"
+        ]
+      },
+      "CreateEvalCompletionsRunDataSource": {
+        "type": "object",
+        "title": "CompletionsRunDataSource",
+        "description": "A CompletionsRunDataSource object describing a model sampling configuration.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "completions"
+            ],
+            "default": "completions",
+            "description": "The type of run data source. Always `completions`."
+          },
+          "input_messages": {
+            "description": "Used when sampling from a model. Dictates the structure of the messages passed into the model. Can either be a reference to a prebuilt trajectory (ie, `item.input_trajectory`), or a template with variable references to the `item` namespace.",
+            "oneOf": [
+              {
+                "type": "object",
+                "title": "TemplateInputMessages",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "template"
+                    ],
+                    "description": "The type of input messages. Always `template`."
+                  },
+                  "template": {
+                    "type": "array",
+                    "description": "A list of chat messages forming the prompt or context. May include variable references to the `item` namespace, ie {{item.name}}.",
+                    "items": {
+                      "oneOf": [
+                        {
+                          "$ref": "#/components/schemas/EasyInputMessage"
+                        },
+                        {
+                          "$ref": "#/components/schemas/EvalItem"
+                        }
+                      ]
+                    }
+                  }
+                },
+                "required": [
+                  "type",
+                  "template"
+                ]
+              },
+              {
+                "type": "object",
+                "title": "ItemReferenceInputMessages",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "item_reference"
+                    ],
+                    "description": "The type of input messages. Always `item_reference`."
+                  },
+                  "item_reference": {
+                    "type": "string",
+                    "description": "A reference to a variable in the `item` namespace. Ie, \"item.input_trajectory\""
+                  }
+                },
+                "required": [
+                  "type",
+                  "item_reference"
+                ]
+              }
+            ]
+          },
+          "sampling_params": {
+            "type": "object",
+            "properties": {
+              "reasoning_effort": {
+                "$ref": "#/components/schemas/ReasoningEffort"
+              },
+              "temperature": {
+                "type": "number",
+                "description": "A higher temperature increases randomness in the outputs.",
+                "default": 1
+              },
+              "max_completion_tokens": {
+                "type": "integer",
+                "description": "The maximum number of tokens in the generated output."
+              },
+              "top_p": {
+                "type": "number",
+                "description": "An alternative to temperature for nucleus sampling; 1.0 includes all tokens.",
+                "default": 1
+              },
+              "seed": {
+                "type": "integer",
+                "description": "A seed value to initialize the randomness, during sampling.",
+                "default": 42
+              },
+              "response_format": {
+                "description": "An object specifying the format that the model must output.\n\nSetting to `{ \"type\": \"json_schema\", \"json_schema\": {...} }` enables\nStructured Outputs which ensures the model will match your supplied JSON\nschema. Learn more in the [Structured Outputs\nguide](https://developers.openai.com/api/docs/guides/structured-outputs).\n\nSetting to `{ \"type\": \"json_object\" }` enables the older JSON mode, which\nensures the message the model generates is valid JSON. Using `json_schema`\nis preferred for models that support it.\n",
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/ResponseFormatText"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ResponseFormatJsonSchema"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ResponseFormatJsonObject"
+                  }
+                ]
+              },
+              "tools": {
+                "type": "array",
+                "description": "A list of tools the model may call. Currently, only functions are supported as a tool. Use this to provide a list of functions the model may generate JSON inputs for. A max of 128 functions are supported.\n",
+                "items": {
+                  "$ref": "#/components/schemas/ChatCompletionTool"
+                }
+              }
+            }
+          },
+          "model": {
+            "type": "string",
+            "description": "The name of the model to use for generating completions (e.g. \"o3-mini\")."
+          },
+          "source": {
+            "description": "Determines what populates the `item` namespace in this run's data source.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/EvalJsonlFileContentSource"
+              },
+              {
+                "$ref": "#/components/schemas/EvalJsonlFileIdSource"
+              },
+              {
+                "$ref": "#/components/schemas/EvalStoredCompletionsSource"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "source"
+        ],
+        "x-oaiMeta": {
+          "name": "The completions data source object used to configure an individual run",
+          "group": "eval runs",
+          "example": "{\n  \"name\": \"gpt-6-astra\",\n  \"data_source\": {\n    \"type\": \"completions\",\n    \"input_messages\": {\n      \"type\": \"item_reference\",\n      \"item_reference\": \"item.input\"\n    },\n    \"model\": \"gpt-6-astra\",\n    \"source\": {\n      \"type\": \"stored_completions\",\n      \"model\": \"gpt-6-astra\"\n    }\n  }\n}\n"
+        }
+      },
+      "CreateEvalCustomDataSourceConfig": {
+        "type": "object",
+        "title": "CustomDataSourceConfig",
+        "description": "A CustomDataSourceConfig object that defines the schema for the data source used for the evaluation runs.\nThis schema is used to define the shape of the data that will be:\n- Used to define your testing criteria and\n- What data is required when creating a run\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "default": "custom",
+            "description": "The type of data source. Always `custom`.",
+            "x-stainless-const": true
+          },
+          "item_schema": {
+            "type": "object",
+            "description": "The json schema for each row in the data source.",
+            "additionalProperties": true,
+            "example": "{\n  \"type\": \"object\",\n  \"properties\": {\n    \"name\": {\"type\": \"string\"},\n    \"age\": {\"type\": \"integer\"}\n  },\n  \"required\": [\"name\", \"age\"]\n}\n"
+          },
+          "include_sample_schema": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether the eval should expect you to populate the sample namespace (ie, by generating responses off of your data source)"
+          }
+        },
+        "required": [
+          "item_schema",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval file data source config object",
+          "group": "evals",
+          "example": "{\n  \"type\": \"custom\",\n  \"item_schema\": {\n    \"type\": \"object\",\n    \"properties\": {\n      \"name\": {\"type\": \"string\"},\n      \"age\": {\"type\": \"integer\"}\n    },\n    \"required\": [\"name\", \"age\"]\n  },\n  \"include_sample_schema\": true\n}\n"
+        }
+      },
+      "CreateEvalItem": {
+        "title": "CreateEvalItem",
+        "description": "A chat message that makes up the prompt or context. May include variable references to the `item` namespace, ie {{item.name}}.",
+        "type": "object",
+        "oneOf": [
+          {
+            "type": "object",
+            "title": "SimpleInputMessage",
+            "properties": {
+              "role": {
+                "type": "string",
+                "description": "The role of the message (e.g. \"system\", \"assistant\", \"user\")."
+              },
+              "content": {
+                "type": "string",
+                "description": "The content of the message."
+              }
+            },
+            "required": [
+              "role",
+              "content"
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/EvalItem"
+          }
+        ],
+        "x-oaiMeta": {
+          "name": "The chat message object used to configure an individual run"
+        }
+      },
+      "CreateEvalJsonlRunDataSource": {
+        "type": "object",
+        "title": "JsonlRunDataSource",
+        "description": "A JsonlRunDataSource object with that specifies a JSONL file that matches the eval \n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "jsonl"
+            ],
+            "default": "jsonl",
+            "description": "The type of data source. Always `jsonl`.",
+            "x-stainless-const": true
+          },
+          "source": {
+            "description": "Determines what populates the `item` namespace in the data source.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/EvalJsonlFileContentSource"
+              },
+              {
+                "$ref": "#/components/schemas/EvalJsonlFileIdSource"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "source"
+        ],
+        "x-oaiMeta": {
+          "name": "The file data source object for the eval run configuration",
+          "group": "evals",
+          "example": "{\n \"type\": \"jsonl\",\n \"source\": {\n   \"type\": \"file_id\",\n   \"id\": \"file-9GYS6xbkWgWhmE7VoLUWFg\"\n }\n}\n"
+        }
+      },
+      "CreateEvalLabelModelGrader": {
+        "type": "object",
+        "title": "LabelModelGrader",
+        "description": "A LabelModelGrader object which uses a model to assign labels to each item\nin the evaluation.\n",
+        "properties": {
+          "type": {
+            "description": "The object type, which is always `label_model`.",
+            "type": "string",
+            "enum": [
+              "label_model"
+            ],
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the grader."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model to use for the evaluation. Must support structured outputs."
+          },
+          "input": {
+            "type": "array",
+            "description": "A list of chat messages forming the prompt or context. May include variable references to the `item` namespace, ie {{item.name}}.",
+            "items": {
+              "$ref": "#/components/schemas/CreateEvalItem"
+            }
+          },
+          "labels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "The labels to classify to each item in the evaluation."
+          },
+          "passing_labels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "The labels that indicate a passing result. Must be a subset of labels."
+          }
+        },
+        "required": [
+          "type",
+          "model",
+          "input",
+          "passing_labels",
+          "labels",
+          "name"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval label model grader object",
+          "group": "evals",
+          "example": "{\n  \"type\": \"label_model\",\n  \"model\": \"gpt-4o-2024-08-06\",\n  \"input\": [\n    {\n      \"role\": \"system\",\n      \"content\": \"Classify the sentiment of the following statement as one of 'positive', 'neutral', or 'negative'\"\n    },\n    {\n      \"role\": \"user\",\n      \"content\": \"Statement: {{item.response}}\"\n    }\n  ],\n  \"passing_labels\": [\"positive\"],\n  \"labels\": [\"positive\", \"neutral\", \"negative\"],\n  \"name\": \"Sentiment label grader\"\n}\n"
+        }
+      },
+      "CreateEvalLogsDataSourceConfig": {
+        "type": "object",
+        "title": "LogsDataSourceConfig",
+        "description": "A data source config which specifies the metadata property of your logs query.\nThis is usually metadata like `usecase=chatbot` or `prompt-version=v2`, etc.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "logs"
+            ],
+            "default": "logs",
+            "description": "The type of data source. Always `logs`.",
+            "x-stainless-const": true
+          },
+          "metadata": {
+            "type": "object",
+            "description": "Metadata filters for the logs data source.",
+            "additionalProperties": true,
+            "example": "{\n  \"use_case\": \"customer_support_agent\"\n}\n"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "The logs data source object for evals",
+          "group": "evals",
+          "example": "{\n  \"type\": \"logs\",\n  \"metadata\": {\n    \"use_case\": \"customer_support_agent\"\n  }\n}\n"
+        }
+      },
+      "CreateEvalRequest": {
+        "type": "object",
+        "title": "CreateEvalRequest",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the evaluation."
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "data_source_config": {
+            "type": "object",
+            "description": "The configuration for the data source used for the evaluation runs. Dictates the schema of the data used in the evaluation.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/CreateEvalCustomDataSourceConfig"
+              },
+              {
+                "$ref": "#/components/schemas/CreateEvalLogsDataSourceConfig"
+              },
+              {
+                "$ref": "#/components/schemas/CreateEvalStoredCompletionsDataSourceConfig"
+              }
+            ]
+          },
+          "testing_criteria": {
+            "type": "array",
+            "description": "A list of graders for all eval runs in this group. Graders can reference variables in the data source using double curly braces notation, like `{{item.variable_name}}`. To reference the model's output, use the `sample` namespace (ie, `{{sample.output_text}}`).",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/CreateEvalLabelModelGrader"
+                },
+                {
+                  "$ref": "#/components/schemas/EvalGraderStringCheck"
+                },
+                {
+                  "$ref": "#/components/schemas/EvalGraderTextSimilarity"
+                },
+                {
+                  "$ref": "#/components/schemas/EvalGraderPython"
+                },
+                {
+                  "$ref": "#/components/schemas/EvalGraderScoreModel"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "data_source_config",
+          "testing_criteria"
+        ]
+      },
+      "CreateEvalResponsesRunDataSource": {
+        "type": "object",
+        "title": "ResponsesRunDataSource",
+        "description": "A ResponsesRunDataSource object describing a model sampling configuration.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "responses"
+            ],
+            "default": "responses",
+            "description": "The type of run data source. Always `responses`."
+          },
+          "input_messages": {
+            "description": "Used when sampling from a model. Dictates the structure of the messages passed into the model. Can either be a reference to a prebuilt trajectory (ie, `item.input_trajectory`), or a template with variable references to the `item` namespace.",
+            "oneOf": [
+              {
+                "type": "object",
+                "title": "InputMessagesTemplate",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "template"
+                    ],
+                    "description": "The type of input messages. Always `template`."
+                  },
+                  "template": {
+                    "type": "array",
+                    "description": "A list of chat messages forming the prompt or context. May include variable references to the `item` namespace, ie {{item.name}}.",
+                    "items": {
+                      "oneOf": [
+                        {
+                          "type": "object",
+                          "title": "ChatMessage",
+                          "properties": {
+                            "role": {
+                              "type": "string",
+                              "description": "The role of the message (e.g. \"system\", \"assistant\", \"user\")."
+                            },
+                            "content": {
+                              "type": "string",
+                              "description": "The content of the message."
+                            }
+                          },
+                          "required": [
+                            "role",
+                            "content"
+                          ]
+                        },
+                        {
+                          "$ref": "#/components/schemas/EvalItem"
+                        }
+                      ]
+                    }
+                  }
+                },
+                "required": [
+                  "type",
+                  "template"
+                ]
+              },
+              {
+                "type": "object",
+                "title": "InputMessagesItemReference",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "item_reference"
+                    ],
+                    "description": "The type of input messages. Always `item_reference`."
+                  },
+                  "item_reference": {
+                    "type": "string",
+                    "description": "A reference to a variable in the `item` namespace. Ie, \"item.name\""
+                  }
+                },
+                "required": [
+                  "type",
+                  "item_reference"
+                ]
+              }
+            ]
+          },
+          "sampling_params": {
+            "type": "object",
+            "properties": {
+              "reasoning_effort": {
+                "$ref": "#/components/schemas/ReasoningEffort"
+              },
+              "temperature": {
+                "type": "number",
+                "description": "A higher temperature increases randomness in the outputs.",
+                "default": 1
+              },
+              "max_completion_tokens": {
+                "type": "integer",
+                "description": "The maximum number of tokens in the generated output."
+              },
+              "top_p": {
+                "type": "number",
+                "description": "An alternative to temperature for nucleus sampling; 1.0 includes all tokens.",
+                "default": 1
+              },
+              "seed": {
+                "type": "integer",
+                "description": "A seed value to initialize the randomness, during sampling.",
+                "default": 42
+              },
+              "tools": {
+                "type": "array",
+                "description": "An array of tools the model may call while generating a response. You\ncan specify which tool to use by setting the `tool_choice` parameter.\n\nThe two categories of tools you can provide the model are:\n\n- **Built-in tools**: Tools that are provided by OpenAI that extend the\n  model's capabilities, like [web search](https://developers.openai.com/api/docs/guides/tools-web-search)\n  or [file search](https://developers.openai.com/api/docs/guides/tools-file-search). Learn more about\n  [built-in tools](https://developers.openai.com/api/docs/guides/tools).\n- **Function calls (custom tools)**: Functions that are defined by you,\n  enabling the model to call your own code. Learn more about\n  [function calling](https://developers.openai.com/api/docs/guides/function-calling).\n",
+                "items": {
+                  "$ref": "#/components/schemas/Tool"
+                }
+              },
+              "text": {
+                "type": "object",
+                "description": "Configuration options for a text response from the model. Can be plain\ntext or structured JSON data. Learn more:\n- [Text inputs and outputs](https://developers.openai.com/api/docs/guides/text)\n- [Structured Outputs](https://developers.openai.com/api/docs/guides/structured-outputs)\n",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/TextResponseFormatConfiguration"
+                  }
+                }
+              }
+            }
+          },
+          "model": {
+            "type": "string",
+            "description": "The name of the model to use for generating completions (e.g. \"o3-mini\")."
+          },
+          "source": {
+            "description": "Determines what populates the `item` namespace in this run's data source.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/EvalJsonlFileContentSource"
+              },
+              {
+                "$ref": "#/components/schemas/EvalJsonlFileIdSource"
+              },
+              {
+                "$ref": "#/components/schemas/EvalResponsesSource"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "source"
+        ],
+        "x-oaiMeta": {
+          "name": "The completions data source object used to configure an individual run",
+          "group": "eval runs",
+          "example": "{\n  \"name\": \"gpt-6-astra\",\n  \"data_source\": {\n    \"type\": \"responses\",\n    \"input_messages\": {\n      \"type\": \"item_reference\",\n      \"item_reference\": \"item.input\"\n    },\n    \"model\": \"gpt-6-astra\",\n    \"source\": {\n      \"type\": \"responses\",\n      \"model\": \"gpt-6-astra\"\n    }\n  }\n}\n"
+        }
+      },
+      "CreateEvalRunRequest": {
+        "type": "object",
+        "title": "CreateEvalRunRequest",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the run."
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "data_source": {
+            "type": "object",
+            "description": "Details about the run's data source.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/CreateEvalJsonlRunDataSource"
+              },
+              {
+                "$ref": "#/components/schemas/CreateEvalCompletionsRunDataSource"
+              },
+              {
+                "$ref": "#/components/schemas/CreateEvalResponsesRunDataSource"
+              }
+            ]
+          }
+        },
+        "required": [
+          "data_source"
+        ]
+      },
+      "CreateEvalStoredCompletionsDataSourceConfig": {
+        "type": "object",
+        "title": "StoredCompletionsDataSourceConfig",
+        "description": "Deprecated in favor of LogsDataSourceConfig.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stored_completions"
+            ],
+            "default": "stored_completions",
+            "description": "The type of data source. Always `stored_completions`.",
+            "x-stainless-const": true
+          },
+          "metadata": {
+            "type": "object",
+            "description": "Metadata filters for the stored completions data source.",
+            "additionalProperties": true,
+            "example": "{\n  \"use_case\": \"customer_support_agent\"\n}\n"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "deprecated": true,
+        "x-oaiMeta": {
+          "name": "The stored completions data source object for evals",
+          "group": "evals",
+          "example": "{\n  \"type\": \"stored_completions\",\n  \"metadata\": {\n    \"use_case\": \"customer_support_agent\"\n  }\n}\n"
+        }
+      },
+      "CreateFileRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file": {
+            "description": "The File object (not file name) to be uploaded.\n",
+            "type": "string",
+            "format": "binary"
+          },
+          "purpose": {
+            "description": "The intended purpose of the uploaded file. One of:\n- `assistants`: Used in the Assistants API\n- `batch`: Used in the Batch API\n- `fine-tune`: Used for fine-tuning\n- `vision`: Images used for vision fine-tuning\n- `user_data`: Flexible file type for any purpose\n- `evals`: Used for eval data sets\n",
+            "type": "string",
+            "enum": [
+              "assistants",
+              "batch",
+              "fine-tune",
+              "vision",
+              "user_data",
+              "evals"
+            ]
+          },
+          "expires_after": {
+            "$ref": "#/components/schemas/FileExpirationAfter"
+          }
+        },
+        "required": [
+          "file",
+          "purpose"
+        ]
+      },
+      "CreateFineTuningCheckpointPermissionRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "project_ids": {
+            "type": "array",
+            "description": "The project identifiers to grant access to.",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "project_ids"
+        ]
+      },
+      "CreateFineTuningJobRequest": {
+        "type": "object",
+        "properties": {
+          "model": {
+            "description": "The name of the model to fine-tune. You can select one of the\n[supported models](https://developers.openai.com/api/docs/guides/model-optimization#fine-tuning-methods).\n",
+            "example": "gpt-4o-mini",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "babbage-002",
+                  "davinci-002",
+                  "gpt-3.5-turbo",
+                  "gpt-4o-mini"
+                ]
+              }
+            ],
+            "x-oaiTypeLabel": "string"
+          },
+          "training_file": {
+            "description": "The ID of an uploaded file that contains training data.\n\nSee [upload file](https://developers.openai.com/api/reference/resources/files/methods/create) for how to upload a file.\n\nYour dataset must be formatted as a JSONL file. Additionally, you must upload your file with the purpose `fine-tune`.\n\nThe contents of the file should differ depending on if the model uses the [chat](https://developers.openai.com/api/docs/guides/supervised-fine-tuning#formatting-your-data), [completions](https://developers.openai.com/api/docs/guides/supervised-fine-tuning#formatting-your-data) format, or if the fine-tuning method uses the [preference](https://developers.openai.com/api/docs/guides/direct-preference-optimization) format.\n\nSee the [fine-tuning guide](https://developers.openai.com/api/docs/guides/model-optimization) for more details.\n",
+            "type": "string",
+            "example": "file-abc123"
+          },
+          "hyperparameters": {
+            "type": "object",
+            "description": "The hyperparameters used for the fine-tuning job.\nThis value is now deprecated in favor of `method`, and should be passed in under the `method` parameter.\n",
+            "properties": {
+              "batch_size": {
+                "description": "Number of examples in each batch. A larger batch size means that model parameters\nare updated less frequently, but with lower variance.\n",
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "enum": [
+                      "auto"
+                    ],
+                    "x-stainless-const": true
+                  },
+                  {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 256
+                  }
+                ],
+                "default": "auto"
+              },
+              "learning_rate_multiplier": {
+                "description": "Scaling factor for the learning rate. A smaller learning rate may be useful to avoid\noverfitting.\n",
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "enum": [
+                      "auto"
+                    ],
+                    "x-stainless-const": true
+                  },
+                  {
+                    "type": "number",
+                    "minimum": 0,
+                    "exclusiveMinimum": true
+                  }
+                ],
+                "default": "auto"
+              },
+              "n_epochs": {
+                "description": "The number of epochs to train the model for. An epoch refers to one full cycle\nthrough the training dataset.\n",
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "enum": [
+                      "auto"
+                    ],
+                    "x-stainless-const": true
+                  },
+                  {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 50
+                  }
+                ],
+                "default": "auto"
+              }
+            },
+            "deprecated": true
+          },
+          "suffix": {
+            "description": "A string of up to 64 characters that will be added to your fine-tuned model name.\n\nFor example, a `suffix` of \"custom-model-name\" would produce a model name like `ft:gpt-4o-mini:openai:custom-model-name:7p4lURel`.\n",
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "default": null,
+            "nullable": true
+          },
+          "validation_file": {
+            "description": "The ID of an uploaded file that contains validation data.\n\nIf you provide this file, the data is used to generate validation\nmetrics periodically during fine-tuning. These metrics can be viewed in\nthe fine-tuning results file.\nThe same data should not be present in both train and validation files.\n\nYour dataset must be formatted as a JSONL file. You must upload your file with the purpose `fine-tune`.\n\nSee the [fine-tuning guide](https://developers.openai.com/api/docs/guides/model-optimization) for more details.\n",
+            "type": "string",
+            "nullable": true,
+            "example": "file-abc123"
+          },
+          "integrations": {
+            "type": "array",
+            "description": "A list of integrations to enable for your fine-tuning job.",
+            "nullable": true,
+            "items": {
+              "type": "object",
+              "required": [
+                "type",
+                "wandb"
+              ],
+              "properties": {
+                "type": {
+                  "description": "The type of integration to enable. Currently, only \"wandb\" (Weights and Biases) is supported.\n",
+                  "oneOf": [
+                    {
+                      "type": "string",
+                      "enum": [
+                        "wandb"
+                      ],
+                      "x-stainless-const": true
+                    }
+                  ]
+                },
+                "wandb": {
+                  "type": "object",
+                  "description": "The settings for your integration with Weights and Biases. This payload specifies the project that\nmetrics will be sent to. Optionally, you can set an explicit display name for your run, add tags\nto your run, and set a default entity (team, username, etc) to be associated with your run.\n",
+                  "required": [
+                    "project"
+                  ],
+                  "properties": {
+                    "project": {
+                      "description": "The name of the project that the new run will be created under.\n",
+                      "type": "string",
+                      "example": "my-wandb-project"
+                    },
+                    "name": {
+                      "description": "A display name to set for the run. If not set, we will use the Job ID as the name.\n",
+                      "nullable": true,
+                      "type": "string"
+                    },
+                    "entity": {
+                      "description": "The entity to use for the run. This allows you to set the team or username of the WandB user that you would\nlike associated with the run. If not set, the default entity for the registered WandB API key is used.\n",
+                      "nullable": true,
+                      "type": "string"
+                    },
+                    "tags": {
+                      "description": "A list of tags to be attached to the newly created run. These tags are passed through directly to WandB. Some\ndefault tags are generated by OpenAI: \"openai/finetune\", \"openai/{base-model}\", \"openai/{ftjob-abcdef}\".\n",
+                      "type": "array",
+                      "items": {
+                        "type": "string",
+                        "example": "custom-tag"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "seed": {
+            "description": "The seed controls the reproducibility of the job. Passing in the same seed and job parameters should produce the same results, but may differ in rare cases.\nIf a seed is not specified, one will be generated for you.\n",
+            "type": "integer",
+            "nullable": true,
+            "minimum": 0,
+            "maximum": 2147483647,
+            "example": 42
+          },
+          "method": {
+            "$ref": "#/components/schemas/FineTuneMethod"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        },
+        "required": [
+          "model",
+          "training_file"
+        ]
+      },
+      "CreateGroupBody": {
+        "type": "object",
+        "description": "Request payload for creating a new group in the organization.",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Human readable name for the group.",
+            "minLength": 1,
+            "maxLength": 255
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "x-oaiMeta": {
+          "example": "{\n    \"name\": \"Support Team\"\n}\n"
+        }
+      },
+      "CreateGroupUserBody": {
+        "type": "object",
+        "description": "Request payload for adding a user to a group.",
+        "properties": {
+          "user_id": {
+            "type": "string",
+            "description": "Identifier of the user to add to the group."
+          }
+        },
+        "required": [
+          "user_id"
+        ],
+        "x-oaiMeta": {
+          "example": "{\n    \"user_id\": \"user_abc123\"\n}\n"
+        }
+      },
+      "CreateImageEditRequest": {
+        "type": "object",
+        "properties": {
+          "image": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "binary"
+              },
+              {
+                "type": "array",
+                "maxItems": 16,
+                "items": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            ],
+            "description": "The image(s) to edit. Must be a supported image file or an array of images.\n\nFor the GPT image models (`gpt-image-1`, `gpt-image-1-mini`, `gpt-image-1.5`,\n`gpt-image-2`, `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`,\n`gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, and\n`gpt-image-2.5-flare-2026-09-08`), each image should be a `png`, `webp`, or `jpg`\nfile less than 50MB. You can provide up to 16 images. `chatgpt-image-latest`\nfollows the same input constraints as GPT image models.\n\nFor `dall-e-2`, you can only provide one image, and it should be a square `png`\nfile less than 4MB.\n"
+          },
+          "prompt": {
+            "description": "A text description of the desired image(s). The maximum length is 1000 characters for `dall-e-2`, and 32000 characters for the GPT image models.",
+            "type": "string",
+            "example": "A cute baby sea otter wearing a beret"
+          },
+          "mask": {
+            "description": "An additional image whose fully transparent areas (e.g. where alpha is zero) indicate where `image` should be edited. If there are multiple images provided, the mask will be applied on the first image. Must be a valid PNG file, less than 4MB, and have the same dimensions as `image`.",
+            "type": "string",
+            "format": "binary"
+          },
+          "background": {
+            "type": "string",
+            "enum": [
+              "transparent",
+              "opaque",
+              "auto"
+            ],
+            "default": "auto",
+            "example": "transparent",
+            "nullable": true,
+            "description": "Set the background of the generated image(s). This parameter is only supported for\nthe GPT image models. Must be one of `transparent`, `opaque`, or `auto` (default\nvalue). When `auto` is used, the model will automatically determine the best\nbackground for the image.\n\n`gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`, including their `2026-09-08`\nsnapshots, support `opaque` and `transparent` backgrounds. Transparent backgrounds\nare available for supported GPT Image models. For `gpt-image-2` and\n`gpt-image-2-2026-04-21`, this support is in preview. When using `transparent`,\nset the output format to `png` or `webp`.\n"
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-image-1.5",
+                  "gpt-image-2",
+                  "gpt-image-2-2026-04-21",
+                  "gpt-image-2.5-sunburst",
+                  "gpt-image-2.5-sunburst-2026-09-08",
+                  "gpt-image-2.5-flare",
+                  "gpt-image-2.5-flare-2026-09-08",
+                  "dall-e-2",
+                  "gpt-image-1",
+                  "gpt-image-1-mini",
+                  "chatgpt-image-latest"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "x-oaiTypeLabel": "string",
+            "default": "gpt-image-1.5",
+            "example": "gpt-image-1.5",
+            "nullable": true,
+            "description": "The model to use for image generation. One of `dall-e-2` or a GPT image model (`gpt-image-1`, `gpt-image-1-mini`, `gpt-image-1.5`, `gpt-image-2`, `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`, `gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, `gpt-image-2.5-flare-2026-09-08`, or `chatgpt-image-latest`). Defaults to `gpt-image-1.5`."
+          },
+          "n": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 10,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "The number of images to generate. Must be between 1 and 10."
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "256x256",
+                  "512x512",
+                  "1024x1024",
+                  "1536x1024",
+                  "1024x1536",
+                  "auto"
+                ]
+              }
+            ],
+            "default": "1024x1024",
+            "example": "1024x1024",
+            "nullable": true,
+            "description": "The size of the generated images. For `gpt-image-2`, `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`, `gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, and `gpt-image-2.5-flare-2026-09-08`, arbitrary resolutions are supported as `WIDTHxHEIGHT` strings, for example `1536x864`. Width and height must both be divisible by 16 and the requested aspect ratio must be between 1:3 and 3:1. Resolutions above `2560x1440` are experimental, and the maximum supported resolution is `3840x2160`. The requested size must also satisfy the model's current pixel and edge limits. The standard sizes `1024x1024`, `1536x1024`, and `1024x1536` are supported by the GPT image models; `auto` is supported for models that allow automatic sizing. For `dall-e-2`, use one of `256x256`, `512x512`, or `1024x1024`. For `dall-e-3`, use one of `1024x1024`, `1792x1024`, or `1024x1792`."
+          },
+          "response_format": {
+            "type": "string",
+            "enum": [
+              "url",
+              "b64_json"
+            ],
+            "example": "url",
+            "nullable": true,
+            "description": "The format in which the generated images are returned. Must be one of `url` or `b64_json`. URLs are only valid for 60 minutes after the image has been generated. This parameter is only supported for `dall-e-2` (default is `url` for `dall-e-2`), as GPT image models always return base64-encoded images."
+          },
+          "output_format": {
+            "type": "string",
+            "enum": [
+              "png",
+              "jpeg",
+              "webp"
+            ],
+            "default": "png",
+            "example": "png",
+            "nullable": true,
+            "description": "The format in which the generated images are returned. This parameter is\nonly supported for the GPT image models. Must be one of `png`, `jpeg`, or `webp`.\nThe default value is `png`.\n"
+          },
+          "output_compression": {
+            "type": "integer",
+            "default": 100,
+            "example": 100,
+            "nullable": true,
+            "description": "The compression level (0-100%) for the generated images. This parameter\nis only supported for the GPT image models with the `webp` or `jpeg` output\nformats, and defaults to 100.\n"
+          },
+          "user": {
+            "type": "string",
+            "example": "user-1234",
+            "description": "A unique identifier representing your end-user, which can help OpenAI to monitor and detect abuse. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+          },
+          "input_fidelity": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/InputFidelity"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "stream": {
+            "type": "boolean",
+            "default": false,
+            "example": false,
+            "nullable": true,
+            "description": "Edit the image in streaming mode. Defaults to `false`. See the\n[Image generation guide](https://developers.openai.com/api/docs/guides/image-generation) for more information.\n"
+          },
+          "partial_images": {
+            "$ref": "#/components/schemas/PartialImages"
+          },
+          "quality": {
+            "type": "string",
+            "enum": [
+              "standard",
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max",
+              "auto"
+            ],
+            "default": "auto",
+            "example": "high",
+            "nullable": true,
+            "description": "The quality of the image that will be generated for GPT image models. The GPT image models support `low`, `medium`, and `high`. `gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`, including their `2026-09-08` snapshots, also support `xhigh` and `max`. Defaults to `auto`.\n"
+          }
+        },
+        "required": [
+          "prompt",
+          "image"
+        ]
+      },
+      "CreateImageRequest": {
+        "type": "object",
+        "properties": {
+          "prompt": {
+            "description": "A text description of the desired image(s). The maximum length is 32000 characters for the GPT image models, 1000 characters for `dall-e-2` and 4000 characters for `dall-e-3`.",
+            "type": "string",
+            "example": "A cute baby sea otter"
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-image-1.5",
+                  "gpt-image-2",
+                  "gpt-image-2-2026-04-21",
+                  "gpt-image-2.5-sunburst",
+                  "gpt-image-2.5-sunburst-2026-09-08",
+                  "gpt-image-2.5-flare",
+                  "gpt-image-2.5-flare-2026-09-08",
+                  "dall-e-2",
+                  "dall-e-3",
+                  "gpt-image-1",
+                  "gpt-image-1-mini"
+                ]
+              }
+            ],
+            "x-oaiTypeLabel": "string",
+            "default": "dall-e-2",
+            "example": "gpt-image-1.5",
+            "nullable": true,
+            "description": "The model to use for image generation. One of `dall-e-2`, `dall-e-3`, or a GPT image model (`gpt-image-1`, `gpt-image-1-mini`, `gpt-image-1.5`, `gpt-image-2`, `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`, `gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, `gpt-image-2.5-flare-2026-09-08`). Defaults to `dall-e-2` unless a parameter specific to the GPT image models is used."
+          },
+          "n": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 10,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "The number of images to generate. Must be between 1 and 10. For `dall-e-3`, only `n=1` is supported."
+          },
+          "quality": {
+            "type": "string",
+            "enum": [
+              "standard",
+              "hd",
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max",
+              "auto"
+            ],
+            "default": "auto",
+            "example": "medium",
+            "nullable": true,
+            "description": "The quality of the image that will be generated.\n\n- `auto` (default value) will automatically select the best quality for the given\n  model.\n- `high`, `medium` and `low` are supported for the GPT image models.\n- `gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`, including their `2026-09-08`\n  snapshots, also support `xhigh` and `max`.\n- `hd` and `standard` are supported for `dall-e-3`.\n- `standard` is the only option for `dall-e-2`.\n"
+          },
+          "response_format": {
+            "type": "string",
+            "enum": [
+              "url",
+              "b64_json"
+            ],
+            "default": "url",
+            "example": "url",
+            "nullable": true,
+            "description": "The format in which generated images with `dall-e-2` and `dall-e-3` are returned. Must be one of `url` or `b64_json`. URLs are only valid for 60 minutes after the image has been generated. This parameter isn't supported for the GPT image models, which always return base64-encoded images."
+          },
+          "output_format": {
+            "type": "string",
+            "enum": [
+              "png",
+              "jpeg",
+              "webp"
+            ],
+            "default": "png",
+            "example": "png",
+            "nullable": true,
+            "description": "The format in which the generated images are returned. This parameter is only supported for the GPT image models. Must be one of `png`, `jpeg`, or `webp`."
+          },
+          "output_compression": {
+            "type": "integer",
+            "default": 100,
+            "example": 100,
+            "nullable": true,
+            "description": "The compression level (0-100%) for the generated images. This parameter is only supported for the GPT image models with the `webp` or `jpeg` output formats, and defaults to 100."
+          },
+          "stream": {
+            "type": "boolean",
+            "default": false,
+            "example": false,
+            "nullable": true,
+            "description": "Generate the image in streaming mode. Defaults to `false`. See the\n[Image generation guide](https://developers.openai.com/api/docs/guides/image-generation) for more information.\nThis parameter is only supported for the GPT image models.\n"
+          },
+          "partial_images": {
+            "$ref": "#/components/schemas/PartialImages"
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "auto",
+                  "1024x1024",
+                  "1536x1024",
+                  "1024x1536",
+                  "256x256",
+                  "512x512",
+                  "1792x1024",
+                  "1024x1792"
+                ]
+              }
+            ],
+            "default": "auto",
+            "example": "1024x1024",
+            "nullable": true,
+            "description": "The size of the generated images. For `gpt-image-2`, `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`, `gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, and `gpt-image-2.5-flare-2026-09-08`, arbitrary resolutions are supported as `WIDTHxHEIGHT` strings, for example `1536x864`. Width and height must both be divisible by 16 and the requested aspect ratio must be between 1:3 and 3:1. Resolutions above `2560x1440` are experimental, and the maximum supported resolution is `3840x2160`. The requested size must also satisfy the model's current pixel and edge limits. The standard sizes `1024x1024`, `1536x1024`, and `1024x1536` are supported by the GPT image models; `auto` is supported for models that allow automatic sizing. For `dall-e-2`, use one of `256x256`, `512x512`, or `1024x1024`. For `dall-e-3`, use one of `1024x1024`, `1792x1024`, or `1024x1792`."
+          },
+          "moderation": {
+            "type": "string",
+            "enum": [
+              "low",
+              "auto"
+            ],
+            "default": "auto",
+            "example": "low",
+            "nullable": true,
+            "description": "Control the content-moderation level for images generated by the GPT image models. Must be either `low` for less restrictive filtering or `auto` (default value)."
+          },
+          "background": {
+            "type": "string",
+            "enum": [
+              "transparent",
+              "opaque",
+              "auto"
+            ],
+            "default": "auto",
+            "example": "transparent",
+            "nullable": true,
+            "description": "Set the background of the generated image(s). This parameter is only supported for\nthe GPT image models. Must be one of `transparent`, `opaque`, or `auto` (default\nvalue). When `auto` is used, the model will automatically determine the best\nbackground for the image.\n\n`gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`, including their `2026-09-08`\nsnapshots, support `opaque` and `transparent` backgrounds. Transparent backgrounds\nare available for supported GPT Image models. For `gpt-image-2` and\n`gpt-image-2-2026-04-21`, this support is in preview. When using `transparent`,\nset the output format to `png` or `webp`.\n"
+          },
+          "style": {
+            "type": "string",
+            "enum": [
+              "vivid",
+              "natural"
+            ],
+            "default": "vivid",
+            "example": "vivid",
+            "nullable": true,
+            "description": "The style of the generated images. This parameter is only supported for `dall-e-3`. Must be one of `vivid` or `natural`. Vivid causes the model to lean towards generating hyper-real and dramatic images. Natural causes the model to produce more natural, less hyper-real looking images."
+          },
+          "user": {
+            "type": "string",
+            "example": "user-1234",
+            "description": "A unique identifier representing your end-user, which can help OpenAI to monitor and detect abuse. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+          }
+        },
+        "required": [
+          "prompt"
+        ]
+      },
+      "CreateImageVariationRequest": {
+        "type": "object",
+        "properties": {
+          "image": {
+            "description": "The image to use as the basis for the variation(s). Must be a valid PNG file, less than 4MB, and square.",
+            "type": "string",
+            "format": "binary"
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "dall-e-2"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "x-oaiTypeLabel": "string",
+            "default": "dall-e-2",
+            "example": "dall-e-2",
+            "nullable": true,
+            "description": "The model to use for image generation. Only `dall-e-2` is supported at this time."
+          },
+          "n": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 10,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "The number of images to generate. Must be between 1 and 10."
+          },
+          "response_format": {
+            "type": "string",
+            "enum": [
+              "url",
+              "b64_json"
+            ],
+            "default": "url",
+            "example": "url",
+            "nullable": true,
+            "description": "The format in which the generated images are returned. Must be one of `url` or `b64_json`. URLs are only valid for 60 minutes after the image has been generated."
+          },
+          "size": {
+            "type": "string",
+            "enum": [
+              "256x256",
+              "512x512",
+              "1024x1024"
+            ],
+            "default": "1024x1024",
+            "example": "1024x1024",
+            "nullable": true,
+            "description": "The size of the generated images. Must be one of `256x256`, `512x512`, or `1024x1024`."
+          },
+          "user": {
+            "type": "string",
+            "example": "user-1234",
+            "description": "A unique identifier representing your end-user, which can help OpenAI to monitor and detect abuse. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+          }
+        },
+        "required": [
+          "image"
+        ]
+      },
+      "CreateMessageRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+          "role",
+          "content"
+        ],
+        "properties": {
+          "role": {
+            "type": "string",
+            "enum": [
+              "user",
+              "assistant"
+            ],
+            "description": "The role of the entity that is creating the message. Allowed values include:\n- `user`: Indicates the message is sent by an actual user and should be used in most cases to represent user-generated messages.\n- `assistant`: Indicates the message is generated by the assistant. Use this value to insert messages from the assistant into the conversation.\n"
+          },
+          "content": {
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "The text contents of the message.",
+                "title": "Text content"
+              },
+              {
+                "type": "array",
+                "description": "An array of content parts with a defined type, each can be of type `text` or images can be passed with `image_url` or `image_file`. Image types are only supported on [Vision-compatible models](https://developers.openai.com/api/docs/models).",
+                "title": "Array of content parts",
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageContentImageFileObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/MessageContentImageUrlObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/MessageRequestContentTextObject"
+                    }
+                  ]
+                },
+                "minItems": 1
+              }
+            ]
+          },
+          "attachments": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "file_id": {
+                      "type": "string",
+                      "description": "The ID of the file to attach to the message."
+                    },
+                    "tools": {
+                      "description": "The tools to add this file to.",
+                      "type": "array",
+                      "items": {
+                        "oneOf": [
+                          {
+                            "$ref": "#/components/schemas/AssistantToolsCode"
+                          },
+                          {
+                            "$ref": "#/components/schemas/AssistantToolsFileSearchTypeOnly"
+                          }
+                        ]
+                      }
+                    }
+                  }
+                },
+                "description": "A list of files attached to the message, and the tools they should be added to.",
+                "required": [
+                  "file_id",
+                  "tools"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        }
+      },
+      "CreateModelResponseProperties": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/ModelResponseProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "prompt_cache_options": {
+                "$ref": "#/components/schemas/PromptCacheOptionsParam"
+              },
+              "top_logprobs": {
+                "description": "An integer between 0 and 20 specifying the maximum number of most likely\ntokens to return at each token position, each with an associated log\nprobability. In some cases, the number of returned tokens may be fewer than\nrequested.\n",
+                "type": "integer",
+                "minimum": 0,
+                "maximum": 20
+              }
+            }
+          }
+        ]
+      },
+      "CreateModerationRequest": {
+        "type": "object",
+        "properties": {
+          "input": {
+            "description": "Input (or inputs) to classify. Can be a single string, an array of strings, or\nan array of multi-modal input objects similar to other models.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "A string of text to classify for moderation.",
+                "default": "",
+                "example": "I want to kill them."
+              },
+              {
+                "type": "array",
+                "description": "An array of strings to classify for moderation.",
+                "items": {
+                  "type": "string",
+                  "default": "",
+                  "example": "I want to kill them."
+                }
+              },
+              {
+                "type": "array",
+                "description": "An array of multi-modal inputs to the moderation model.",
+                "items": {
+                  "oneOf": [
+                    {
+                      "type": "object",
+                      "description": "An object describing an image to classify.",
+                      "properties": {
+                        "type": {
+                          "description": "Always `image_url`.",
+                          "type": "string",
+                          "enum": [
+                            "image_url"
+                          ],
+                          "x-stainless-const": true
+                        },
+                        "image_url": {
+                          "type": "object",
+                          "description": "Contains either an image URL or a data URL for a base64 encoded image.",
+                          "properties": {
+                            "url": {
+                              "type": "string",
+                              "description": "Either a URL of the image or the base64 encoded image data.",
+                              "format": "uri",
+                              "example": "https://example.com/image.jpg"
+                            }
+                          },
+                          "required": [
+                            "url"
+                          ]
+                        }
+                      },
+                      "required": [
+                        "type",
+                        "image_url"
+                      ]
+                    },
+                    {
+                      "type": "object",
+                      "description": "An object describing text to classify.",
+                      "properties": {
+                        "type": {
+                          "description": "Always `text`.",
+                          "type": "string",
+                          "enum": [
+                            "text"
+                          ],
+                          "x-stainless-const": true
+                        },
+                        "text": {
+                          "description": "A string of text to classify.",
+                          "type": "string",
+                          "example": "I want to kill them"
+                        }
+                      },
+                      "required": [
+                        "type",
+                        "text"
+                      ]
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "model": {
+            "description": "The content moderation model you would like to use. Learn more in\n[the moderation guide](https://developers.openai.com/api/docs/guides/moderation), and learn about\navailable models [here](https://developers.openai.com/api/docs/guides/moderation).\n",
+            "nullable": false,
+            "default": "omni-moderation-latest",
+            "example": "omni-moderation-2024-09-26",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "omni-moderation-latest",
+                  "omni-moderation-2024-09-26",
+                  "text-moderation-latest",
+                  "text-moderation-stable"
+                ]
+              }
+            ],
+            "x-oaiTypeLabel": "string"
+          }
+        },
+        "required": [
+          "input"
+        ]
+      },
+      "CreateModerationResponse": {
+        "type": "object",
+        "description": "Represents if a given text input is potentially harmful.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique identifier for the moderation request."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model used to generate the moderation results."
+          },
+          "results": {
+            "type": "array",
+            "description": "A list of moderation objects.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "flagged": {
+                  "type": "boolean",
+                  "description": "Whether any of the below categories are flagged."
+                },
+                "categories": {
+                  "type": "object",
+                  "description": "A list of the categories, and whether they are flagged or not.",
+                  "properties": {
+                    "hate": {
+                      "type": "boolean",
+                      "description": "Content that expresses, incites, or promotes hate based on race, gender, ethnicity, religion, nationality, sexual orientation, disability status, or caste. Hateful content aimed at non-protected groups (e.g., chess players) is harassment."
+                    },
+                    "hate/threatening": {
+                      "type": "boolean",
+                      "description": "Hateful content that also includes violence or serious harm towards the targeted group based on race, gender, ethnicity, religion, nationality, sexual orientation, disability status, or caste."
+                    },
+                    "harassment": {
+                      "type": "boolean",
+                      "description": "Content that expresses, incites, or promotes harassing language towards any target."
+                    },
+                    "harassment/threatening": {
+                      "type": "boolean",
+                      "description": "Harassment content that also includes violence or serious harm towards any target."
+                    },
+                    "illicit": {
+                      "anyOf": [
+                        {
+                          "type": "boolean",
+                          "description": "Content that includes instructions or advice that facilitate the planning or execution of wrongdoing, or that gives advice or instruction on how to commit illicit acts. For example, \"how to shoplift\" would fit this category."
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "illicit/violent": {
+                      "anyOf": [
+                        {
+                          "type": "boolean",
+                          "description": "Content that includes instructions or advice that facilitate the planning or execution of wrongdoing that also includes violence, or that gives advice or instruction on the procurement of any weapon."
+                        },
+                        {
+                          "type": "null"
+                        }
+                      ]
+                    },
+                    "self-harm": {
+                      "type": "boolean",
+                      "description": "Content that promotes, encourages, or depicts acts of self-harm, such as suicide, cutting, and eating disorders."
+                    },
+                    "self-harm/intent": {
+                      "type": "boolean",
+                      "description": "Content where the speaker expresses that they are engaging or intend to engage in acts of self-harm, such as suicide, cutting, and eating disorders."
+                    },
+                    "self-harm/instructions": {
+                      "type": "boolean",
+                      "description": "Content that encourages performing acts of self-harm, such as suicide, cutting, and eating disorders, or that gives instructions or advice on how to commit such acts."
+                    },
+                    "sexual": {
+                      "type": "boolean",
+                      "description": "Content meant to arouse sexual excitement, such as the description of sexual activity, or that promotes sexual services (excluding sex education and wellness)."
+                    },
+                    "sexual/minors": {
+                      "type": "boolean",
+                      "description": "Sexual content that includes an individual who is under 18 years old."
+                    },
+                    "violence": {
+                      "type": "boolean",
+                      "description": "Content that depicts death, violence, or physical injury."
+                    },
+                    "violence/graphic": {
+                      "type": "boolean",
+                      "description": "Content that depicts death, violence, or physical injury in graphic detail."
+                    }
+                  },
+                  "required": [
+                    "hate",
+                    "hate/threatening",
+                    "harassment",
+                    "harassment/threatening",
+                    "illicit",
+                    "illicit/violent",
+                    "self-harm",
+                    "self-harm/intent",
+                    "self-harm/instructions",
+                    "sexual",
+                    "sexual/minors",
+                    "violence",
+                    "violence/graphic"
+                  ]
+                },
+                "category_scores": {
+                  "type": "object",
+                  "description": "A list of the categories along with their scores as predicted by model.",
+                  "properties": {
+                    "hate": {
+                      "type": "number",
+                      "description": "The score for the category 'hate'."
+                    },
+                    "hate/threatening": {
+                      "type": "number",
+                      "description": "The score for the category 'hate/threatening'."
+                    },
+                    "harassment": {
+                      "type": "number",
+                      "description": "The score for the category 'harassment'."
+                    },
+                    "harassment/threatening": {
+                      "type": "number",
+                      "description": "The score for the category 'harassment/threatening'."
+                    },
+                    "illicit": {
+                      "type": "number",
+                      "description": "The score for the category 'illicit'."
+                    },
+                    "illicit/violent": {
+                      "type": "number",
+                      "description": "The score for the category 'illicit/violent'."
+                    },
+                    "self-harm": {
+                      "type": "number",
+                      "description": "The score for the category 'self-harm'."
+                    },
+                    "self-harm/intent": {
+                      "type": "number",
+                      "description": "The score for the category 'self-harm/intent'."
+                    },
+                    "self-harm/instructions": {
+                      "type": "number",
+                      "description": "The score for the category 'self-harm/instructions'."
+                    },
+                    "sexual": {
+                      "type": "number",
+                      "description": "The score for the category 'sexual'."
+                    },
+                    "sexual/minors": {
+                      "type": "number",
+                      "description": "The score for the category 'sexual/minors'."
+                    },
+                    "violence": {
+                      "type": "number",
+                      "description": "The score for the category 'violence'."
+                    },
+                    "violence/graphic": {
+                      "type": "number",
+                      "description": "The score for the category 'violence/graphic'."
+                    }
+                  },
+                  "required": [
+                    "hate",
+                    "hate/threatening",
+                    "harassment",
+                    "harassment/threatening",
+                    "illicit",
+                    "illicit/violent",
+                    "self-harm",
+                    "self-harm/intent",
+                    "self-harm/instructions",
+                    "sexual",
+                    "sexual/minors",
+                    "violence",
+                    "violence/graphic"
+                  ]
+                },
+                "category_applied_input_types": {
+                  "type": "object",
+                  "description": "A list of the categories along with the input type(s) that the score applies to.",
+                  "properties": {
+                    "hate": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'hate'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text"
+                        ],
+                        "x-stainless-const": true
+                      }
+                    },
+                    "hate/threatening": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'hate/threatening'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text"
+                        ],
+                        "x-stainless-const": true
+                      }
+                    },
+                    "harassment": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'harassment'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text"
+                        ],
+                        "x-stainless-const": true
+                      }
+                    },
+                    "harassment/threatening": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'harassment/threatening'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text"
+                        ],
+                        "x-stainless-const": true
+                      }
+                    },
+                    "illicit": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'illicit'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text"
+                        ],
+                        "x-stainless-const": true
+                      }
+                    },
+                    "illicit/violent": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'illicit/violent'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text"
+                        ],
+                        "x-stainless-const": true
+                      }
+                    },
+                    "self-harm": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'self-harm'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text",
+                          "image"
+                        ]
+                      }
+                    },
+                    "self-harm/intent": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'self-harm/intent'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text",
+                          "image"
+                        ]
+                      }
+                    },
+                    "self-harm/instructions": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'self-harm/instructions'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text",
+                          "image"
+                        ]
+                      }
+                    },
+                    "sexual": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'sexual'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text",
+                          "image"
+                        ]
+                      }
+                    },
+                    "sexual/minors": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'sexual/minors'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text"
+                        ],
+                        "x-stainless-const": true
+                      }
+                    },
+                    "violence": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'violence'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text",
+                          "image"
+                        ]
+                      }
+                    },
+                    "violence/graphic": {
+                      "type": "array",
+                      "description": "The applied input type(s) for the category 'violence/graphic'.",
+                      "items": {
+                        "type": "string",
+                        "enum": [
+                          "text",
+                          "image"
+                        ]
+                      }
+                    }
+                  },
+                  "required": [
+                    "hate",
+                    "hate/threatening",
+                    "harassment",
+                    "harassment/threatening",
+                    "illicit",
+                    "illicit/violent",
+                    "self-harm",
+                    "self-harm/intent",
+                    "self-harm/instructions",
+                    "sexual",
+                    "sexual/minors",
+                    "violence",
+                    "violence/graphic"
+                  ]
+                }
+              },
+              "required": [
+                "flagged",
+                "categories",
+                "category_scores",
+                "category_applied_input_types"
+              ]
+            }
+          }
+        },
+        "required": [
+          "id",
+          "model",
+          "results"
+        ],
+        "x-oaiMeta": {
+          "name": "The moderation object",
+          "example": "{\n  \"id\": \"modr-0d9740456c391e43c445bf0f010940c7\",\n  \"model\": \"omni-moderation-latest\",\n  \"results\": [\n    {\n      \"flagged\": true,\n      \"categories\": {\n        \"harassment\": true,\n        \"harassment/threatening\": true,\n        \"sexual\": false,\n        \"hate\": false,\n        \"hate/threatening\": false,\n        \"illicit\": false,\n        \"illicit/violent\": false,\n        \"self-harm/intent\": false,\n        \"self-harm/instructions\": false,\n        \"self-harm\": false,\n        \"sexual/minors\": false,\n        \"violence\": true,\n        \"violence/graphic\": true\n      },\n      \"category_scores\": {\n        \"harassment\": 0.8189693396524255,\n        \"harassment/threatening\": 0.804985420696006,\n        \"sexual\": 1.573112165348997e-6,\n        \"hate\": 0.007562942636942845,\n        \"hate/threatening\": 0.004208854591835476,\n        \"illicit\": 0.030535955153511665,\n        \"illicit/violent\": 0.008925306722380033,\n        \"self-harm/intent\": 0.00023023930975076432,\n        \"self-harm/instructions\": 0.0002293869201073356,\n        \"self-harm\": 0.012598046106750154,\n        \"sexual/minors\": 2.212566909570261e-8,\n        \"violence\": 0.9999992735124786,\n        \"violence/graphic\": 0.843064871157054\n      },\n      \"category_applied_input_types\": {\n        \"harassment\": [\n          \"text\"\n        ],\n        \"harassment/threatening\": [\n          \"text\"\n        ],\n        \"sexual\": [\n          \"text\",\n          \"image\"\n        ],\n        \"hate\": [\n          \"text\"\n        ],\n        \"hate/threatening\": [\n          \"text\"\n        ],\n        \"illicit\": [\n          \"text\"\n        ],\n        \"illicit/violent\": [\n          \"text\"\n        ],\n        \"self-harm/intent\": [\n          \"text\",\n          \"image\"\n        ],\n        \"self-harm/instructions\": [\n          \"text\",\n          \"image\"\n        ],\n        \"self-harm\": [\n          \"text\",\n          \"image\"\n        ],\n        \"sexual/minors\": [\n          \"text\"\n        ],\n        \"violence\": [\n          \"text\",\n          \"image\"\n        ],\n        \"violence/graphic\": [\n          \"text\",\n          \"image\"\n        ]\n      }\n    }\n  ]\n}\n"
+        }
+      },
+      "CreateResponse": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/CreateModelResponseProperties"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "prompt_cache_options": {
+                "$ref": "#/components/schemas/ResponsePromptCacheOptionsParam"
+              },
+              "service_tier": {
+                "$ref": "#/components/schemas/ServiceTierResponses"
+              },
+              "truncation": {
+                "deprecated": true,
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The truncation strategy to use for the model response.\n- `auto`: If the input to this Response exceeds\n  the model's context window size, the model will truncate the\n  response to fit the context window by dropping items from the beginning of the conversation.\n- `disabled` (default): If the input size will exceed the context window\n  size for a model, the request will fail with a 400 error.\n",
+                    "enum": [
+                      "auto",
+                      "disabled"
+                    ],
+                    "default": "disabled"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "reasoning": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/Reasoning"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "input": {
+                "$ref": "#/components/schemas/InputParam"
+              },
+              "include": {
+                "anyOf": [
+                  {
+                    "type": "array",
+                    "description": "Specify additional output data to include in the model response. Currently supported values are:\n- `web_search_call.action.sources`: Include the sources of the web search tool call.\n- `code_interpreter_call.outputs`: Includes the outputs of python code execution in code interpreter tool call items.\n- `computer_call_output.output.image_url`: Include image urls from the computer call output.\n- `file_search_call.results`: Include the search results of the file search tool call.\n- `message.input_image.image_url`: Include image urls from the input message.\n- `message.output_text.logprobs`: Include logprobs with assistant messages.\n- `reasoning.encrypted_content`: Includes an encrypted version of reasoning tokens in reasoning item outputs. This enables reasoning items to be used in multi-turn conversations when using the Responses API statelessly (like when the `store` parameter is set to `false`, or when an organization is enrolled in the zero data retention program).",
+                    "items": {
+                      "$ref": "#/components/schemas/IncludeEnum"
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "parallel_tool_calls": {
+                "anyOf": [
+                  {
+                    "type": "boolean",
+                    "description": "Whether to allow the model to run tool calls in parallel.\n",
+                    "default": true
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "store": {
+                "anyOf": [
+                  {
+                    "type": "boolean",
+                    "description": "Whether to store the generated model response for later retrieval via\nAPI.\nDefaults to true when omitted.\nIf set to true, response data will be stored for at least 30 days, subject to the [data retention exceptions](https://developers.openai.com/api/docs/guides/your-data#v1responses).\n",
+                    "default": true
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "instructions": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "A system (or developer) message inserted into the model's context.\n\nWhen using along with `previous_response_id`, the instructions from a previous\nresponse will not be carried over to the next response. This makes it simple\nto swap out system (or developer) messages in new responses.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "moderation": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/ModerationParam",
+                    "description": "Configuration for running moderation on the input and output of this response.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "stream": {
+                "anyOf": [
+                  {
+                    "description": "If set to true, the model response data will be streamed to the client\nas it is generated using [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format).\nSee the [Streaming section below](https://developers.openai.com/api/reference/resources/responses/streaming-events)\nfor more information.\n",
+                    "type": "boolean",
+                    "default": false
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "stream_options": {
+                "$ref": "#/components/schemas/ResponseStreamOptions"
+              },
+              "conversation": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/ConversationParam"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "context_management": {
+                "anyOf": [
+                  {
+                    "type": "array",
+                    "description": "Context management configuration for this request.\n",
+                    "minItems": 1,
+                    "items": {
+                      "$ref": "#/components/schemas/ContextManagementParam"
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "max_output_tokens": {
+                "anyOf": [
+                  {
+                    "description": "An upper bound for the number of tokens that can be generated for a response, including visible output tokens and [reasoning tokens](https://developers.openai.com/api/docs/guides/reasoning).\n",
+                    "type": "integer",
+                    "minimum": 16
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      },
+      "CreateRunRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "assistant_id": {
+            "description": "The ID of the [assistant](https://developers.openai.com/api/docs/assistants/migration) to use to execute this run.",
+            "type": "string"
+          },
+          "model": {
+            "description": "The ID of the [Model](https://developers.openai.com/api/reference/resources/models) to be used to execute this run. If a value is provided here, it will override the model associated with the assistant. If not, the model associated with the assistant will be used.",
+            "example": "gpt-5",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/components/schemas/AssistantSupportedModels"
+              }
+            ],
+            "x-oaiTypeLabel": "string",
+            "nullable": true
+          },
+          "reasoning_effort": {
+            "$ref": "#/components/schemas/ReasoningEffort"
+          },
+          "instructions": {
+            "description": "Overrides the [instructions](https://developers.openai.com/api/docs/assistants/migration) of the assistant. This is useful for modifying the behavior on a per-run basis.",
+            "type": "string",
+            "nullable": true
+          },
+          "additional_instructions": {
+            "description": "Appends additional instructions at the end of the instructions for the run. This is useful for modifying the behavior on a per-run basis without overriding other instructions.",
+            "type": "string",
+            "nullable": true
+          },
+          "additional_messages": {
+            "description": "Adds additional messages to the thread before creating the run.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CreateMessageRequest"
+            },
+            "nullable": true
+          },
+          "tools": {
+            "description": "Override the tools the assistant can use for this run. This is useful for modifying the behavior on a per-run basis.",
+            "nullable": true,
+            "type": "array",
+            "maxItems": 20,
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/AssistantToolsCode"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFileSearch"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFunction"
+                }
+              ]
+            }
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "temperature": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 2,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\n"
+          },
+          "top_p": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 1,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.\n\nWe generally recommend altering this or temperature but not both.\n"
+          },
+          "stream": {
+            "type": "boolean",
+            "nullable": true,
+            "description": "If `true`, returns a stream of events that happen during the Run as server-sent events, terminating when the Run enters a terminal state with a `data: [DONE]` message.\n"
+          },
+          "max_prompt_tokens": {
+            "type": "integer",
+            "nullable": true,
+            "description": "The maximum number of prompt tokens that may be used over the course of the run. The run will make a best effort to use only the number of prompt tokens specified, across multiple turns of the run. If the run exceeds the number of prompt tokens specified, the run will end with status `incomplete`. See `incomplete_details` for more info.\n",
+            "minimum": 256
+          },
+          "max_completion_tokens": {
+            "type": "integer",
+            "nullable": true,
+            "description": "The maximum number of completion tokens that may be used over the course of the run. The run will make a best effort to use only the number of completion tokens specified, across multiple turns of the run. If the run exceeds the number of completion tokens specified, the run will end with status `incomplete`. See `incomplete_details` for more info.\n",
+            "minimum": 256
+          },
+          "truncation_strategy": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/TruncationObject"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          },
+          "tool_choice": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AssistantsApiToolChoiceOption"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          },
+          "parallel_tool_calls": {
+            "$ref": "#/components/schemas/ParallelToolCalls"
+          },
+          "response_format": {
+            "$ref": "#/components/schemas/AssistantsApiResponseFormatOption",
+            "nullable": true
+          }
+        },
+        "required": [
+          "assistant_id"
+        ]
+      },
+      "CreateSpeechRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "model": {
+            "description": "One of the available [TTS models](https://developers.openai.com/api/docs/guides/text-to-speech): `tts-1`, `tts-1-hd`, `gpt-4o-mini-tts`, or `gpt-4o-mini-tts-2025-12-15`.\n",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "tts-1",
+                  "tts-1-hd",
+                  "gpt-4o-mini-tts",
+                  "gpt-4o-mini-tts-2025-12-15"
+                ]
+              }
+            ],
+            "x-oaiTypeLabel": "string"
+          },
+          "input": {
+            "type": "string",
+            "description": "The text to generate audio for. The maximum length is 4096 characters.",
+            "maxLength": 4096
+          },
+          "instructions": {
+            "type": "string",
+            "description": "Control the voice of your generated audio with additional instructions. Does not work with `tts-1` or `tts-1-hd`.",
+            "maxLength": 4096
+          },
+          "voice": {
+            "description": "The voice to use when generating the audio. Supported built-in voices are `alloy`, `ash`, `ballad`, `coral`, `echo`, `fable`, `onyx`, `nova`, `sage`, `shimmer`, `verse`, `marin`, and `cedar`. You may also provide a custom voice object with an `id`, for example `{ \"id\": \"voice_1234\" }`. Previews of the voices are available in the [Text to speech guide](https://developers.openai.com/api/docs/guides/text-to-speech#voice-options).",
+            "$ref": "#/components/schemas/VoiceIdsOrCustomVoice"
+          },
+          "response_format": {
+            "description": "The format to audio in. Supported formats are `mp3`, `opus`, `aac`, `flac`, `wav`, and `pcm`.",
+            "default": "mp3",
+            "type": "string",
+            "enum": [
+              "mp3",
+              "opus",
+              "aac",
+              "flac",
+              "wav",
+              "pcm"
+            ]
+          },
+          "speed": {
+            "description": "The speed of the generated audio. Select a value from `0.25` to `4.0`. `1.0` is the default.",
+            "type": "number",
+            "default": 1,
+            "minimum": 0.25,
+            "maximum": 4
+          },
+          "stream_format": {
+            "description": "The format to stream the audio in. Supported formats are `sse` and `audio`. `sse` is not supported for `tts-1` or `tts-1-hd`.",
+            "type": "string",
+            "default": "audio",
+            "enum": [
+              "sse",
+              "audio"
+            ]
+          }
+        },
+        "required": [
+          "model",
+          "input",
+          "voice"
+        ]
+      },
+      "CreateSpeechResponseStreamEvent": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/SpeechAudioDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/SpeechAudioDoneEvent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "CreateSpendAlertBody": {
+        "type": "object",
+        "description": "Parameters for creating or updating a spend alert.",
+        "properties": {
+          "threshold_amount": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The alert threshold amount, in cents."
+          },
+          "currency": {
+            "type": "string",
+            "enum": [
+              "USD"
+            ],
+            "description": "The currency for the threshold amount."
+          },
+          "interval": {
+            "type": "string",
+            "enum": [
+              "month"
+            ],
+            "description": "The time interval for evaluating spend against the threshold."
+          },
+          "notification_channel": {
+            "$ref": "#/components/schemas/SpendAlertNotificationChannel"
+          }
+        },
+        "required": [
+          "threshold_amount",
+          "currency",
+          "interval",
+          "notification_channel"
+        ]
+      },
+      "CreateThreadAndRunRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "assistant_id": {
+            "description": "The ID of the [assistant](https://developers.openai.com/api/docs/assistants/migration) to use to execute this run.",
+            "type": "string"
+          },
+          "thread": {
+            "$ref": "#/components/schemas/CreateThreadRequest"
+          },
+          "model": {
+            "description": "The ID of the [Model](https://developers.openai.com/api/reference/resources/models) to be used to execute this run. If a value is provided here, it will override the model associated with the assistant. If not, the model associated with the assistant will be used.",
+            "example": "gpt-5",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-5",
+                  "gpt-5-mini",
+                  "gpt-5-nano",
+                  "gpt-5-2025-08-07",
+                  "gpt-5-mini-2025-08-07",
+                  "gpt-5-nano-2025-08-07",
+                  "gpt-4.1",
+                  "gpt-4.1-mini",
+                  "gpt-4.1-nano",
+                  "gpt-4.1-2025-04-14",
+                  "gpt-4.1-mini-2025-04-14",
+                  "gpt-4.1-nano-2025-04-14",
+                  "gpt-4o",
+                  "gpt-4o-2024-11-20",
+                  "gpt-4o-2024-08-06",
+                  "gpt-4o-2024-05-13",
+                  "gpt-4o-mini",
+                  "gpt-4o-mini-2024-07-18",
+                  "gpt-4.5-preview",
+                  "gpt-4.5-preview-2025-02-27",
+                  "gpt-4-turbo",
+                  "gpt-4-turbo-2024-04-09",
+                  "gpt-4-0125-preview",
+                  "gpt-4-turbo-preview",
+                  "gpt-4-1106-preview",
+                  "gpt-4-vision-preview",
+                  "gpt-4",
+                  "gpt-4-0314",
+                  "gpt-4-0613",
+                  "gpt-4-32k",
+                  "gpt-4-32k-0314",
+                  "gpt-4-32k-0613",
+                  "gpt-3.5-turbo",
+                  "gpt-3.5-turbo-16k",
+                  "gpt-3.5-turbo-0613",
+                  "gpt-3.5-turbo-1106",
+                  "gpt-3.5-turbo-0125",
+                  "gpt-3.5-turbo-16k-0613"
+                ]
+              }
+            ],
+            "x-oaiTypeLabel": "string",
+            "nullable": true
+          },
+          "instructions": {
+            "description": "Override the default system message of the assistant. This is useful for modifying the behavior on a per-run basis.",
+            "type": "string",
+            "nullable": true
+          },
+          "tools": {
+            "description": "Override the tools the assistant can use for this run. This is useful for modifying the behavior on a per-run basis.",
+            "nullable": true,
+            "type": "array",
+            "maxItems": 20,
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/AssistantToolsCode"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFileSearch"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFunction"
+                }
+              ]
+            }
+          },
+          "tool_resources": {
+            "type": "object",
+            "description": "A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.\n",
+            "properties": {
+              "code_interpreter": {
+                "type": "object",
+                "properties": {
+                  "file_ids": {
+                    "type": "array",
+                    "description": "A list of [file](https://developers.openai.com/api/reference/resources/files) IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files associated with the tool.\n",
+                    "default": [],
+                    "maxItems": 20,
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "file_search": {
+                "type": "object",
+                "properties": {
+                  "vector_store_ids": {
+                    "type": "array",
+                    "description": "The ID of the [vector store](https://developers.openai.com/api/reference/resources/vector_stores) attached to this assistant. There can be a maximum of 1 vector store attached to the assistant.\n",
+                    "maxItems": 1,
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            },
+            "nullable": true
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "temperature": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 2,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\n"
+          },
+          "top_p": {
+            "type": "number",
+            "minimum": 0,
+            "maximum": 1,
+            "default": 1,
+            "example": 1,
+            "nullable": true,
+            "description": "An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.\n\nWe generally recommend altering this or temperature but not both.\n"
+          },
+          "stream": {
+            "type": "boolean",
+            "nullable": true,
+            "description": "If `true`, returns a stream of events that happen during the Run as server-sent events, terminating when the Run enters a terminal state with a `data: [DONE]` message.\n"
+          },
+          "max_prompt_tokens": {
+            "type": "integer",
+            "nullable": true,
+            "description": "The maximum number of prompt tokens that may be used over the course of the run. The run will make a best effort to use only the number of prompt tokens specified, across multiple turns of the run. If the run exceeds the number of prompt tokens specified, the run will end with status `incomplete`. See `incomplete_details` for more info.\n",
+            "minimum": 256
+          },
+          "max_completion_tokens": {
+            "type": "integer",
+            "nullable": true,
+            "description": "The maximum number of completion tokens that may be used over the course of the run. The run will make a best effort to use only the number of completion tokens specified, across multiple turns of the run. If the run exceeds the number of completion tokens specified, the run will end with status `incomplete`. See `incomplete_details` for more info.\n",
+            "minimum": 256
+          },
+          "truncation_strategy": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/TruncationObject"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          },
+          "tool_choice": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AssistantsApiToolChoiceOption"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          },
+          "parallel_tool_calls": {
+            "$ref": "#/components/schemas/ParallelToolCalls"
+          },
+          "response_format": {
+            "$ref": "#/components/schemas/AssistantsApiResponseFormatOption",
+            "nullable": true
+          }
+        },
+        "required": [
+          "assistant_id"
+        ]
+      },
+      "CreateThreadRequest": {
+        "type": "object",
+        "description": "Options to create a new thread. If no thread is provided when running a\nrequest, an empty thread will be created.\n",
+        "additionalProperties": false,
+        "properties": {
+          "messages": {
+            "description": "A list of [messages](https://developers.openai.com/api/docs/assistants/migration) to start the thread with.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CreateMessageRequest"
+            }
+          },
+          "tool_resources": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.\n",
+                "properties": {
+                  "code_interpreter": {
+                    "type": "object",
+                    "properties": {
+                      "file_ids": {
+                        "type": "array",
+                        "description": "A list of [file](https://developers.openai.com/api/reference/resources/files) IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files associated with the tool.\n",
+                        "default": [],
+                        "maxItems": 20,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  },
+                  "file_search": {
+                    "type": "object",
+                    "properties": {
+                      "vector_store_ids": {
+                        "type": "array",
+                        "description": "The [vector store](https://developers.openai.com/api/reference/resources/vector_stores) attached to this thread. There can be a maximum of 1 vector store attached to the thread.\n",
+                        "maxItems": 1,
+                        "items": {
+                          "type": "string"
+                        }
+                      },
+                      "vector_stores": {
+                        "type": "array",
+                        "description": "A helper to create a [vector store](https://developers.openai.com/api/reference/resources/vector_stores) with file_ids and attach it to this thread. There can be a maximum of 1 vector store attached to the thread.\n",
+                        "maxItems": 1,
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "file_ids": {
+                              "type": "array",
+                              "description": "A list of [file](https://developers.openai.com/api/reference/resources/files) IDs to add to the vector store. For vector stores created before Nov 2025, there can be a maximum of 10,000 files in a vector store. For vector stores created starting in Nov 2025, the limit is 100,000,000 files.\n",
+                              "maxItems": 100000000,
+                              "items": {
+                                "type": "string"
+                              }
+                            },
+                            "chunking_strategy": {
+                              "type": "object",
+                              "description": "The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy.",
+                              "oneOf": [
+                                {
+                                  "type": "object",
+                                  "title": "Auto Chunking Strategy",
+                                  "description": "The default strategy. This strategy currently uses a `max_chunk_size_tokens` of `800` and `chunk_overlap_tokens` of `400`.",
+                                  "additionalProperties": false,
+                                  "properties": {
+                                    "type": {
+                                      "type": "string",
+                                      "description": "Always `auto`.",
+                                      "enum": [
+                                        "auto"
+                                      ],
+                                      "x-stainless-const": true
+                                    }
+                                  },
+                                  "required": [
+                                    "type"
+                                  ]
+                                },
+                                {
+                                  "type": "object",
+                                  "title": "Static Chunking Strategy",
+                                  "additionalProperties": false,
+                                  "properties": {
+                                    "type": {
+                                      "type": "string",
+                                      "description": "Always `static`.",
+                                      "enum": [
+                                        "static"
+                                      ],
+                                      "x-stainless-const": true
+                                    },
+                                    "static": {
+                                      "type": "object",
+                                      "additionalProperties": false,
+                                      "properties": {
+                                        "max_chunk_size_tokens": {
+                                          "type": "integer",
+                                          "minimum": 100,
+                                          "maximum": 4096,
+                                          "description": "The maximum number of tokens in each chunk. The default value is `800`. The minimum value is `100` and the maximum value is `4096`."
+                                        },
+                                        "chunk_overlap_tokens": {
+                                          "type": "integer",
+                                          "description": "The number of tokens that overlap between chunks. The default value is `400`.\n\nNote that the overlap must not exceed half of `max_chunk_size_tokens`.\n"
+                                        }
+                                      },
+                                      "required": [
+                                        "max_chunk_size_tokens",
+                                        "chunk_overlap_tokens"
+                                      ]
+                                    }
+                                  },
+                                  "required": [
+                                    "type",
+                                    "static"
+                                  ]
+                                }
+                              ]
+                            },
+                            "metadata": {
+                              "$ref": "#/components/schemas/Metadata"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "oneOf": [
+                      {
+                        "required": [
+                          "vector_store_ids"
+                        ]
+                      },
+                      {
+                        "required": [
+                          "vector_stores"
+                        ]
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        }
+      },
+      "CreateTranscriptionRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file": {
+            "description": "The audio file object (not file name) to transcribe, in one of these formats: flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, or webm.\nThe request must include enough format metadata for the file to be identified. We recommend an extension-bearing filename and an appropriate content type.\n",
+            "type": "string",
+            "x-oaiTypeLabel": "file",
+            "format": "binary"
+          },
+          "model": {
+            "description": "ID of the model to use. The options are `gpt-transcribe`, `gpt-4o-transcribe`, `gpt-4o-mini-transcribe`, `gpt-4o-mini-transcribe-2025-12-15`, `whisper-1` (which is powered by our open source Whisper V2 model), and `gpt-4o-transcribe-diarize`.\n",
+            "example": "gpt-4o-transcribe",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "whisper-1",
+                  "gpt-transcribe",
+                  "gpt-4o-transcribe",
+                  "gpt-4o-mini-transcribe",
+                  "gpt-4o-mini-transcribe-2025-12-15",
+                  "gpt-4o-transcribe-diarize"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "x-oaiTypeLabel": "string"
+          },
+          "language": {
+            "description": "The language of the input audio. Supplying the input language in [ISO-639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) (e.g. `en`) format will improve accuracy and latency.\n",
+            "type": "string"
+          },
+          "languages": {
+            "description": "Possible languages of the input audio, in [ISO-639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) format. Supported by `gpt-transcribe`.\n",
+            "type": "array",
+            "minItems": 1,
+            "items": {
+              "type": "string"
+            }
+          },
+          "keywords": {
+            "description": "Words or phrases to guide transcription of the input audio. Supported by `gpt-transcribe`.\n",
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "prompt": {
+            "description": "An optional text to guide the model's style or continue a previous audio segment. The [prompt](https://developers.openai.com/api/docs/guides/speech-to-text#prompting) should match the audio language. This field is not supported when using `gpt-4o-transcribe-diarize`.\n",
+            "type": "string"
+          },
+          "response_format": {
+            "$ref": "#/components/schemas/AudioResponseFormat"
+          },
+          "temperature": {
+            "description": "The sampling temperature, between 0 and 1. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic. If set to 0, the model will use [log probability](https://en.wikipedia.org/wiki/Log_probability) to automatically increase the temperature until certain thresholds are hit.\n",
+            "type": "number",
+            "default": 0
+          },
+          "include": {
+            "description": "Additional information to include in the transcription response.\n`logprobs` will return the log probabilities of the tokens in the\nresponse to understand the model's confidence in the transcription.\n`logprobs` only works with response_format set to `json` and only with\nthe models `gpt-4o-transcribe`, `gpt-4o-mini-transcribe`, and `gpt-4o-mini-transcribe-2025-12-15`. This field is not supported when using `gpt-4o-transcribe-diarize`.\n",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionInclude"
+            }
+          },
+          "timestamp_granularities": {
+            "description": "The timestamp granularities to populate for this transcription. `response_format` must be set `verbose_json` to use timestamp granularities. Either or both of these options are supported: `word`, or `segment`. Note: There is no additional latency for segment timestamps, but generating word timestamps incurs additional latency.\nThis option is not available for `gpt-4o-transcribe-diarize`.\n",
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "word",
+                "segment"
+              ]
+            },
+            "default": [
+              "segment"
+            ]
+          },
+          "stream": {
+            "anyOf": [
+              {
+                "description": "If set to true, the model response data will be streamed to the client\nas it is generated using [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format).\nSee the [Streaming section of the Speech-to-Text guide](https://developers.openai.com/api/docs/guides/speech-to-text?lang=curl#streaming)\nfor more information.\n\nNote: Streaming is not supported for the `whisper-1` model and will be ignored.\n",
+                "type": "boolean",
+                "default": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "chunking_strategy": {
+            "anyOf": [
+              {
+                "description": "Controls how the audio is cut into chunks. When set to `\"auto\"`, the server first normalizes loudness and then uses voice activity detection (VAD) to choose boundaries. `server_vad` object can be provided to tweak VAD detection parameters manually. If unset, the audio is transcribed as a single block. Required when using `gpt-4o-transcribe-diarize` for inputs longer than 30 seconds. ",
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "enum": [
+                      "auto"
+                    ],
+                    "default": "auto",
+                    "description": "Automatically set chunking parameters based on the audio. Must be set to `\"auto\"`.\n",
+                    "x-stainless-const": true
+                  },
+                  {
+                    "$ref": "#/components/schemas/VadConfig"
+                  }
+                ],
+                "x-oaiTypeLabel": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "known_speaker_names": {
+            "description": "Optional list of speaker names that correspond to the audio samples provided in `known_speaker_references[]`. Each entry should be a short identifier (for example `customer` or `agent`). Up to 4 speakers are supported.\n",
+            "type": "array",
+            "maxItems": 4,
+            "items": {
+              "type": "string"
+            }
+          },
+          "known_speaker_references": {
+            "description": "Optional list of audio samples (as [data URLs](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URLs)) that contain known speaker references matching `known_speaker_names[]`. Each sample must be between 2 and 10 seconds, and can use any of the same input audio formats supported by `file`.\n",
+            "type": "array",
+            "maxItems": 4,
+            "items": {
+              "type": "string"
+            }
+          }
+        },
+        "required": [
+          "file",
+          "model"
+        ]
+      },
+      "CreateTranscriptionResponseDiarizedJson": {
+        "type": "object",
+        "description": "Represents a diarized transcription response returned by the model, including the combined transcript and speaker-segment annotations.\n",
+        "properties": {
+          "task": {
+            "type": "string",
+            "description": "The type of task that was run. Always `transcribe`.",
+            "enum": [
+              "transcribe"
+            ],
+            "x-stainless-const": true
+          },
+          "duration": {
+            "type": "number",
+            "format": "double",
+            "description": "Duration of the input audio in seconds."
+          },
+          "text": {
+            "type": "string",
+            "description": "The concatenated transcript text for the entire audio input."
+          },
+          "segments": {
+            "type": "array",
+            "description": "Segments of the transcript annotated with timestamps and speaker labels.",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionDiarizedSegment"
+            }
+          },
+          "usage": {
+            "type": "object",
+            "description": "Token or duration usage statistics for the request.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/TranscriptTextUsageTokens",
+                "title": "Token Usage"
+              },
+              {
+                "$ref": "#/components/schemas/TranscriptTextUsageDuration",
+                "title": "Duration Usage"
+              }
+            ],
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "required": [
+          "task",
+          "duration",
+          "text",
+          "segments"
+        ],
+        "x-oaiMeta": {
+          "name": "The transcription object (Diarized JSON)",
+          "group": "audio",
+          "example": "{\n  \"task\": \"transcribe\",\n  \"duration\": 42.7,\n  \"text\": \"Agent: Thanks for calling OpenAI support.\\nCustomer: Hi, I need help with diarization.\",\n  \"segments\": [\n    {\n      \"type\": \"transcript.text.segment\",\n      \"id\": \"seg_001\",\n      \"start\": 0.0,\n      \"end\": 5.2,\n      \"text\": \"Thanks for calling OpenAI support.\",\n      \"speaker\": \"agent\"\n    },\n    {\n      \"type\": \"transcript.text.segment\",\n      \"id\": \"seg_002\",\n      \"start\": 5.2,\n      \"end\": 12.8,\n      \"text\": \"Hi, I need help with diarization.\",\n      \"speaker\": \"A\"\n    }\n  ],\n  \"usage\": {\n    \"type\": \"duration\",\n    \"seconds\": 43\n  }\n}\n"
+        }
+      },
+      "CreateTranscriptionResponseJson": {
+        "type": "object",
+        "description": "Represents a transcription response returned by model, based on the provided input.",
+        "properties": {
+          "text": {
+            "type": "string",
+            "description": "The transcribed text."
+          },
+          "languages": {
+            "type": "array",
+            "description": "The languages detected in the audio. Returned by `gpt-transcribe`. An empty array indicates that no language could be reliably detected.\n",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionLanguage"
+            }
+          },
+          "logprobs": {
+            "type": "array",
+            "optional": true,
+            "description": "The log probabilities of the tokens in the transcription. Only returned with the models `gpt-4o-transcribe` and `gpt-4o-mini-transcribe` if `logprobs` is added to the `include` array.\n",
+            "items": {
+              "type": "object",
+              "properties": {
+                "token": {
+                  "type": "string",
+                  "description": "The token in the transcription."
+                },
+                "logprob": {
+                  "type": "number",
+                  "description": "The log probability of the token."
+                },
+                "bytes": {
+                  "type": "array",
+                  "items": {
+                    "type": "number"
+                  },
+                  "description": "The bytes of the token."
+                }
+              }
+            }
+          },
+          "usage": {
+            "type": "object",
+            "description": "Token usage statistics for the request.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/TranscriptTextUsageTokens",
+                "title": "Token Usage"
+              },
+              {
+                "$ref": "#/components/schemas/TranscriptTextUsageDuration",
+                "title": "Duration Usage"
+              }
+            ]
+          }
+        },
+        "required": [
+          "text"
+        ],
+        "x-oaiMeta": {
+          "name": "The transcription object (JSON)",
+          "group": "audio",
+          "example": "{\n  \"text\": \"Imagine the wildest idea that you've ever had, and you're curious about how it might scale to something that's a 100, a 1,000 times bigger. This is a place where you can get to do that.\",\n  \"usage\": {\n    \"type\": \"tokens\",\n    \"input_tokens\": 14,\n    \"input_token_details\": {\n      \"text_tokens\": 10,\n      \"audio_tokens\": 4\n    },\n    \"output_tokens\": 101,\n    \"total_tokens\": 115\n  }\n}\n"
+        }
+      },
+      "CreateTranscriptionResponseStreamEvent": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/TranscriptTextSegmentEvent"
+          },
+          {
+            "$ref": "#/components/schemas/TranscriptTextDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/TranscriptTextDoneEvent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "CreateTranscriptionResponseVerboseJson": {
+        "type": "object",
+        "description": "Represents a verbose json transcription response returned by model, based on the provided input.",
+        "properties": {
+          "language": {
+            "type": "string",
+            "description": "The language of the input audio."
+          },
+          "duration": {
+            "type": "number",
+            "format": "double",
+            "description": "The duration of the input audio."
+          },
+          "text": {
+            "type": "string",
+            "description": "The transcribed text."
+          },
+          "words": {
+            "type": "array",
+            "description": "Extracted words and their corresponding timestamps.",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionWord"
+            }
+          },
+          "segments": {
+            "type": "array",
+            "description": "Segments of the transcribed text and their corresponding details.",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionSegment"
+            }
+          },
+          "usage": {
+            "$ref": "#/components/schemas/TranscriptTextUsageDuration"
+          }
+        },
+        "required": [
+          "language",
+          "duration",
+          "text"
+        ],
+        "x-oaiMeta": {
+          "name": "The transcription object (Verbose JSON)",
+          "group": "audio",
+          "example": "{\n  \"task\": \"transcribe\",\n  \"language\": \"english\",\n  \"duration\": 8.470000267028809,\n  \"text\": \"The beach was a popular spot on a hot summer day. People were swimming in the ocean, building sandcastles, and playing beach volleyball.\",\n  \"segments\": [\n    {\n      \"id\": 0,\n      \"seek\": 0,\n      \"start\": 0.0,\n      \"end\": 3.319999933242798,\n      \"text\": \" The beach was a popular spot on a hot summer day.\",\n      \"tokens\": [\n        50364, 440, 7534, 390, 257, 3743, 4008, 322, 257, 2368, 4266, 786, 13, 50530\n      ],\n      \"temperature\": 0.0,\n      \"avg_logprob\": -0.2860786020755768,\n      \"compression_ratio\": 1.2363636493682861,\n      \"no_speech_prob\": 0.00985979475080967\n    },\n    ...\n  ],\n  \"usage\": {\n    \"type\": \"duration\",\n    \"seconds\": 9\n  }\n}\n"
+        }
+      },
+      "CreateTranslationRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file": {
+            "description": "The audio file object (not file name) translate, in one of these formats: flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, or webm. The request must include enough format metadata for the file to be identified. We recommend an extension-bearing filename and an appropriate content type.\n",
+            "type": "string",
+            "x-oaiTypeLabel": "file",
+            "format": "binary"
+          },
+          "model": {
+            "description": "ID of the model to use. Only `whisper-1` (which is powered by our open source Whisper V2 model) is currently available.\n",
+            "example": "whisper-1",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "whisper-1"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "x-oaiTypeLabel": "string"
+          },
+          "prompt": {
+            "description": "An optional text to guide the model's style or continue a previous audio segment. The [prompt](https://developers.openai.com/api/docs/guides/speech-to-text#prompting) should be in English.\n",
+            "type": "string"
+          },
+          "response_format": {
+            "description": "The format of the output, in one of these options: `json`, `text`, `srt`, `verbose_json`, or `vtt`.\n",
+            "type": "string",
+            "enum": [
+              "json",
+              "text",
+              "srt",
+              "verbose_json",
+              "vtt"
+            ],
+            "default": "json"
+          },
+          "temperature": {
+            "description": "The sampling temperature, between 0 and 1. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic. If set to 0, the model will use [log probability](https://en.wikipedia.org/wiki/Log_probability) to automatically increase the temperature until certain thresholds are hit.\n",
+            "type": "number",
+            "default": 0
+          }
+        },
+        "required": [
+          "file",
+          "model"
+        ]
+      },
+      "CreateTranslationResponseJson": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "text"
+        ]
+      },
+      "CreateTranslationResponseVerboseJson": {
+        "type": "object",
+        "properties": {
+          "language": {
+            "type": "string",
+            "description": "The language of the output translation (always `english`)."
+          },
+          "duration": {
+            "type": "number",
+            "format": "double",
+            "description": "The duration of the input audio."
+          },
+          "text": {
+            "type": "string",
+            "description": "The translated text."
+          },
+          "segments": {
+            "type": "array",
+            "description": "Segments of the translated text and their corresponding details.",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionSegment"
+            }
+          }
+        },
+        "required": [
+          "language",
+          "duration",
+          "text"
+        ]
+      },
+      "CreateUploadRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "filename": {
+            "description": "The name of the file to upload.\n",
+            "type": "string"
+          },
+          "purpose": {
+            "description": "The intended purpose of the uploaded file.\n\nSee the [documentation on File\npurposes](https://developers.openai.com/api/reference/resources/files/methods/create#%28resource%29%20files%20%3E%20%28method%29%20create%20%3E%20%28params%29%200%20%3E%20%28param%29%20purpose%20%3E%20%28schema%29).\n",
+            "type": "string",
+            "enum": [
+              "assistants",
+              "batch",
+              "fine-tune",
+              "vision"
+            ]
+          },
+          "bytes": {
+            "description": "The number of bytes in the file you are uploading.\n",
+            "type": "integer"
+          },
+          "mime_type": {
+            "description": "The MIME type of the file.\n\n\nThis must fall within the supported MIME types for your file purpose. See\nthe supported MIME types for assistants and vision.\n",
+            "type": "string"
+          },
+          "expires_after": {
+            "$ref": "#/components/schemas/FileExpirationAfter"
+          }
+        },
+        "required": [
+          "filename",
+          "purpose",
+          "bytes",
+          "mime_type"
+        ]
+      },
+      "CreateVectorStoreFileBatchRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file_ids": {
+            "description": "A list of [File](https://developers.openai.com/api/reference/resources/files) IDs that the vector store should use. Useful for tools like `file_search` that can access files. If `attributes` or `chunking_strategy` are provided, they will be applied to all files in the batch. The maximum batch size is 2000 files. This endpoint is recommended for multi-file ingestion and helps reduce per-vector-store write request pressure. Mutually exclusive with `files`.",
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 2000,
+            "items": {
+              "type": "string"
+            }
+          },
+          "files": {
+            "description": "A list of objects that each include a `file_id` plus optional `attributes` or `chunking_strategy`. Use this when you need to override metadata for specific files. The global `attributes` or `chunking_strategy` will be ignored and must be specified for each file. The maximum batch size is 2000 files. This endpoint is recommended for multi-file ingestion and helps reduce per-vector-store write request pressure. Mutually exclusive with `file_ids`.",
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 2000,
+            "items": {
+              "$ref": "#/components/schemas/CreateVectorStoreFileRequest"
+            }
+          },
+          "chunking_strategy": {
+            "$ref": "#/components/schemas/ChunkingStrategyRequestParam"
+          },
+          "attributes": {
+            "$ref": "#/components/schemas/VectorStoreFileAttributes"
+          }
+        },
+        "anyOf": [
+          {
+            "required": [
+              "file_ids"
+            ]
+          },
+          {
+            "required": [
+              "files"
+            ]
+          }
+        ]
+      },
+      "CreateVectorStoreFileRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file_id": {
+            "description": "A [File](https://developers.openai.com/api/reference/resources/files) ID that the vector store should use. Useful for tools like `file_search` that can access files. For multi-file ingestion, we recommend [`file_batches`](https://developers.openai.com/api/reference/resources/vector_stores/subresources/file_batches/methods/create) to minimize per-vector-store write requests.",
+            "type": "string"
+          },
+          "chunking_strategy": {
+            "$ref": "#/components/schemas/ChunkingStrategyRequestParam"
+          },
+          "attributes": {
+            "$ref": "#/components/schemas/VectorStoreFileAttributes"
+          }
+        },
+        "required": [
+          "file_id"
+        ]
+      },
+      "CreateVectorStoreRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file_ids": {
+            "description": "A list of [File](https://developers.openai.com/api/reference/resources/files) IDs that the vector store should use. Useful for tools like `file_search` that can access files.",
+            "type": "array",
+            "maxItems": 500,
+            "items": {
+              "type": "string"
+            }
+          },
+          "name": {
+            "description": "The name of the vector store.",
+            "type": "string"
+          },
+          "description": {
+            "description": "A description for the vector store. Can be used to describe the vector store's purpose.",
+            "type": "string"
+          },
+          "expires_after": {
+            "$ref": "#/components/schemas/VectorStoreExpirationAfter"
+          },
+          "chunking_strategy": {
+            "type": "object",
+            "description": "The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy. Only applicable if `file_ids` is non-empty.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/AutoChunkingStrategyRequestParam"
+              },
+              {
+                "$ref": "#/components/schemas/StaticChunkingStrategyRequestParam"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        }
+      },
+      "CreateVoiceConsentRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The label to use for this consent recording."
+          },
+          "recording": {
+            "type": "string",
+            "format": "binary",
+            "x-oaiTypeLabel": "file",
+            "description": "The consent audio recording file. Maximum size is 10 MiB.\n\nSupported MIME types:\n`audio/mpeg`, `audio/wav`, `audio/x-wav`, `audio/ogg`, `audio/aac`, `audio/flac`, `audio/webm`, `audio/mp4`.\n"
+          },
+          "language": {
+            "type": "string",
+            "description": "The BCP 47 language tag for the consent phrase (for example, `en-US`)."
+          }
+        },
+        "required": [
+          "name",
+          "recording",
+          "language"
+        ]
+      },
+      "CreateVoiceRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the new voice."
+          },
+          "audio_sample": {
+            "type": "string",
+            "format": "binary",
+            "x-oaiTypeLabel": "file",
+            "description": "The sample audio recording file. Maximum size is 10 MiB.\n\nSupported MIME types:\n`audio/mpeg`, `audio/wav`, `audio/x-wav`, `audio/ogg`, `audio/aac`, `audio/flac`, `audio/webm`, `audio/mp4`.\n"
+          },
+          "consent": {
+            "type": "string",
+            "description": "The consent recording ID (for example, `cons_1234`)."
+          }
+        },
+        "required": [
+          "name",
+          "audio_sample",
+          "consent"
+        ]
+      },
+      "CustomToolCall": {
+        "type": "object",
+        "title": "Custom tool call",
+        "description": "A call to a custom tool created by the model.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom_tool_call"
+            ],
+            "x-stainless-const": true,
+            "description": "The type of the custom tool call. Always `custom_tool_call`.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the custom tool call in the OpenAI platform.\n"
+          },
+          "call_id": {
+            "type": "string",
+            "description": "An identifier used to map this custom tool call to a tool call output.\n"
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCaller"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "namespace": {
+            "type": "string",
+            "description": "The namespace of the custom tool being called.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the custom tool being called.\n"
+          },
+          "input": {
+            "type": "string",
+            "description": "The input for the custom tool call generated by the model.\n"
+          },
+          "async": {
+            "type": "boolean",
+            "description": "Whether the custom tool call runs asynchronously.\n"
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "name",
+          "input"
+        ]
+      },
+      "CustomToolCallOutput": {
+        "type": "object",
+        "title": "Custom tool call output",
+        "description": "The output of a custom tool call from your code, being sent back to the model.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom_tool_call_output"
+            ],
+            "x-stainless-const": true,
+            "description": "The type of the custom tool call output. Always `custom_tool_call_output`.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the custom tool call output in the OpenAI platform.\n"
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The call ID, used to map this custom tool call output to a custom tool call.\n"
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCallerParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output": {
+            "description": "The output from the custom tool call generated by your code.\nCan be a string or an list of output content.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "A string of the output of the custom tool call.\n",
+                "title": "string output"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/FunctionAndCustomToolCallOutput"
+                },
+                "title": "output content list",
+                "description": "Text, image, or file output of the custom tool call.\n"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "output"
+        ]
+      },
+      "CustomToolCallOutputResource": {
+        "title": "ResponseCustomToolCallOutputItem",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/CustomToolCallOutput"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the custom tool call output item.\n"
+              },
+              "status": {
+                "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+                "$ref": "#/components/schemas/FunctionCallOutputStatusEnum"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "CustomToolCallResource": {
+        "title": "ResponseCustomToolCallItem",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/CustomToolCall"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the custom tool call item.\n"
+              },
+              "status": {
+                "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+                "$ref": "#/components/schemas/FunctionCallStatus"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "CustomToolChatCompletions": {
+        "type": "object",
+        "title": "Custom tool",
+        "description": "A custom tool that processes input using a specified format.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "description": "The type of the custom tool. Always `custom`.",
+            "x-stainless-const": true
+          },
+          "custom": {
+            "type": "object",
+            "title": "Custom tool properties",
+            "description": "Properties of the custom tool.\n",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the custom tool, used to identify it in tool calls."
+              },
+              "description": {
+                "type": "string",
+                "description": "Optional description of the custom tool, used to provide more context.\n"
+              },
+              "format": {
+                "description": "The input format for the custom tool. Default is unconstrained text.\n",
+                "oneOf": [
+                  {
+                    "type": "object",
+                    "title": "Text format",
+                    "description": "Unconstrained free-form text.",
+                    "properties": {
+                      "type": {
+                        "type": "string",
+                        "enum": [
+                          "text"
+                        ],
+                        "description": "Unconstrained text format. Always `text`.",
+                        "x-stainless-const": true
+                      }
+                    },
+                    "required": [
+                      "type"
+                    ],
+                    "additionalProperties": false
+                  },
+                  {
+                    "type": "object",
+                    "title": "Grammar format",
+                    "description": "A grammar defined by the user.",
+                    "properties": {
+                      "type": {
+                        "type": "string",
+                        "enum": [
+                          "grammar"
+                        ],
+                        "description": "Grammar format. Always `grammar`.",
+                        "x-stainless-const": true
+                      },
+                      "grammar": {
+                        "type": "object",
+                        "title": "Grammar format",
+                        "description": "Your chosen grammar.",
+                        "properties": {
+                          "definition": {
+                            "type": "string",
+                            "description": "The grammar definition."
+                          },
+                          "syntax": {
+                            "type": "string",
+                            "description": "The syntax of the grammar definition. One of `lark` or `regex`.",
+                            "enum": [
+                              "lark",
+                              "regex"
+                            ]
+                          }
+                        },
+                        "required": [
+                          "definition",
+                          "syntax"
+                        ]
+                      }
+                    },
+                    "required": [
+                      "type",
+                      "grammar"
+                    ],
+                    "additionalProperties": false
+                  }
+                ]
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "custom"
+        ]
+      },
+      "DeleteAssistantResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "assistant.deleted"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "DeleteCertificateResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "The object type, must be `certificate.deleted`.",
+            "enum": [
+              "certificate.deleted"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the certificate that was deleted."
+          }
+        },
+        "required": [
+          "object",
+          "id"
+        ]
+      },
+      "DeleteFileResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "file"
+            ],
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "DeleteFineTuningCheckpointPermissionResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the fine-tuned model checkpoint permission that was deleted."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"checkpoint.permission\".",
+            "enum": [
+              "checkpoint.permission"
+            ],
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the fine-tuned model checkpoint permission was successfully deleted."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "DeleteMessageResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "thread.message.deleted"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "DeleteModelResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "DeleteThreadResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "thread.deleted"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "DeleteVectorStoreFileResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vector_store.file.deleted"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "DeleteVectorStoreResponse": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vector_store.deleted"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "DeletedConversation": {
+        "title": "The deleted conversation object",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/DeletedConversationResource"
+          }
+        ],
+        "x-oaiMeta": {
+          "name": "The deleted conversation object",
+          "group": "conversations"
+        }
+      },
+      "DeletedRoleAssignmentResource": {
+        "type": "object",
+        "description": "Confirmation payload returned after unassigning a role.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "Identifier for the deleted assignment, such as `group.role.deleted` or `user.role.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the assignment was removed."
+          }
+        },
+        "required": [
+          "object",
+          "deleted"
+        ],
+        "x-oaiMeta": {
+          "name": "Role assignment deletion confirmation",
+          "example": "{\n    \"object\": \"group.role.deleted\",\n    \"deleted\": true\n}\n"
+        }
+      },
+      "DoneEvent": {
+        "type": "object",
+        "properties": {
+          "event": {
+            "type": "string",
+            "enum": [
+              "done"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "string",
+            "enum": [
+              "[DONE]"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "event",
+          "data"
+        ],
+        "description": "Occurs when a stream ends.",
+        "x-oaiMeta": {
+          "dataDescription": "`data` is `[DONE]`"
+        }
+      },
+      "EasyInputMessage": {
+        "type": "object",
+        "title": "Input message",
+        "description": "A message input to the model with a role indicating instruction following\nhierarchy. Instructions given with the `developer` or `system` role take\nprecedence over instructions given with the `user` role. Messages with the\n`assistant` role are presumed to have been generated by the model in previous\ninteractions.\n",
+        "properties": {
+          "role": {
+            "type": "string",
+            "description": "The role of the message input. One of `user`, `assistant`, `system`, or\n`developer`.\n",
+            "enum": [
+              "user",
+              "assistant",
+              "system",
+              "developer"
+            ]
+          },
+          "content": {
+            "description": "Text, image, or audio input to the model, used to generate a response.\nCan also contain previous assistant responses.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "title": "Text input",
+                "description": "A text input to the model.\n"
+              },
+              {
+                "$ref": "#/components/schemas/InputMessageContentList"
+              }
+            ]
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MessagePhase"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the message input. Always `message`.\n",
+            "enum": [
+              "message"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ]
+      },
+      "EditImageBodyJsonParam": {
+        "type": "object",
+        "description": "JSON request body for image edits.\n\nUse `images` (array of `ImageRefParam`) instead of multipart `image` uploads.\nYou can reference images via external URLs, data URLs, or uploaded file IDs.\nJSON edits support GPT image models only; DALL-E edits require multipart (`dall-e-2` only).\n",
+        "properties": {
+          "model": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-image-1.5",
+                  "gpt-image-2",
+                  "gpt-image-2-2026-04-21",
+                  "gpt-image-2.5-sunburst",
+                  "gpt-image-2.5-sunburst-2026-09-08",
+                  "gpt-image-2.5-flare",
+                  "gpt-image-2.5-flare-2026-09-08",
+                  "gpt-image-1",
+                  "gpt-image-1-mini",
+                  "chatgpt-image-latest"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "x-oaiTypeLabel": "string",
+            "default": "gpt-image-1.5",
+            "example": "gpt-image-1.5",
+            "description": "The GPT image model to use for image editing, including `gpt-image-2`, its dated snapshot `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`, `gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, and `gpt-image-2.5-flare-2026-09-08`."
+          },
+          "images": {
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 16,
+            "description": "Input image references to edit.\nFor GPT image models, you can provide up to 16 images.\n",
+            "items": {
+              "$ref": "#/components/schemas/ImageRefParam"
+            }
+          },
+          "mask": {
+            "$ref": "#/components/schemas/ImageRefParam"
+          },
+          "prompt": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 32000,
+            "example": "Add a watercolor effect and keep the subject centered",
+            "description": "A text description of the desired image edit."
+          },
+          "n": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 10
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "default": 1,
+            "example": 1,
+            "description": "The number of edited images to generate."
+          },
+          "quality": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "low",
+                  "medium",
+                  "high",
+                  "xhigh",
+                  "max",
+                  "auto"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "default": "auto",
+            "example": "high",
+            "description": "Output quality for GPT image models. The GPT image models support `low`, `medium`,\nand `high`. `gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`, including their\n`2026-09-08` snapshots, also support `xhigh` and `max`. Defaults to `auto`.\n"
+          },
+          "input_fidelity": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "high",
+                  "low"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Controls fidelity to the original input image(s)."
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "auto",
+                  "1024x1024",
+                  "1536x1024",
+                  "1024x1536"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "default": "auto",
+            "example": "1024x1024",
+            "description": "The size of the generated images. For `gpt-image-2`, `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`, `gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, and `gpt-image-2.5-flare-2026-09-08`, arbitrary resolutions are supported as `WIDTHxHEIGHT` strings, for example `1536x864`. Width and height must both be divisible by 16 and the requested aspect ratio must be between 1:3 and 3:1. Resolutions above `2560x1440` are experimental, and the maximum supported resolution is `3840x2160`. The requested size must also satisfy the model's current pixel and edge limits. The standard sizes `1024x1024`, `1536x1024`, and `1024x1536` are supported by the GPT image models; `auto` is supported for models that allow automatic sizing."
+          },
+          "user": {
+            "type": "string",
+            "example": "user-1234",
+            "description": "A unique identifier representing your end-user, which can help OpenAI\nmonitor and detect abuse.\n"
+          },
+          "output_format": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "png",
+                  "jpeg",
+                  "webp"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "default": "png",
+            "example": "png",
+            "description": "Output image format. Supported for GPT image models."
+          },
+          "output_compression": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "minimum": 0,
+                "maximum": 100
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": 100,
+            "description": "Compression level for `jpeg` or `webp` output."
+          },
+          "moderation": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "low",
+                  "auto"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "default": "auto",
+            "example": "auto",
+            "description": "Moderation level for GPT image models."
+          },
+          "background": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "transparent",
+                  "opaque",
+                  "auto"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "default": "auto",
+            "example": "transparent",
+            "description": "Set the background of the generated image output. `gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`, including their `2026-09-08` snapshots, support `opaque` and `transparent` backgrounds. Transparent backgrounds are available for supported GPT Image models. For `gpt-image-2` and `gpt-image-2-2026-04-21`, this support is in preview. When using `transparent`, set the output format to `png` or `webp`."
+          },
+          "stream": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "default": false,
+            "example": false,
+            "description": "Stream partial image results as events."
+          },
+          "partial_images": {
+            "$ref": "#/components/schemas/PartialImages"
+          }
+        },
+        "required": [
+          "images",
+          "prompt"
+        ]
+      },
+      "Embedding": {
+        "type": "object",
+        "description": "Represents an embedding vector returned by embedding endpoint.\n",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the embedding in the list of embeddings."
+          },
+          "embedding": {
+            "type": "array",
+            "description": "The embedding vector, which is a list of floats. The length of vector depends on the model as listed in the [embedding guide](https://developers.openai.com/api/docs/guides/embeddings).\n",
+            "items": {
+              "type": "number",
+              "format": "float"
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"embedding\".",
+            "enum": [
+              "embedding"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "index",
+          "object",
+          "embedding"
+        ],
+        "x-oaiMeta": {
+          "name": "The embedding object",
+          "example": "{\n  \"object\": \"embedding\",\n  \"embedding\": [\n    0.0023064255,\n    -0.009327292,\n    .... (1536 floats total for ada-002)\n    -0.0028842222,\n  ],\n  \"index\": 0\n}\n"
+        }
+      },
+      "Error": {
+        "type": "object",
+        "properties": {
+          "code": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "param": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string"
+          },
+          "misalignment": {
+            "$ref": "#/components/schemas/MisalignmentErrorDetailsResource"
+          }
+        },
+        "required": [
+          "type",
+          "message",
+          "param",
+          "code"
+        ]
+      },
+      "ErrorEvent": {
+        "type": "object",
+        "properties": {
+          "event": {
+            "type": "string",
+            "enum": [
+              "error"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "$ref": "#/components/schemas/Error"
+          }
+        },
+        "required": [
+          "event",
+          "data"
+        ],
+        "description": "Occurs when an [error](https://developers.openai.com/api/docs/guides/error-codes#api-errors) occurs. This can happen due to an internal server error or a timeout.",
+        "x-oaiMeta": {
+          "dataDescription": "`data` is an [error](https://developers.openai.com/api/docs/guides/error-codes#api-errors)"
+        }
+      },
+      "ErrorResponse": {
+        "type": "object",
+        "properties": {
+          "error": {
+            "$ref": "#/components/schemas/Error"
+          }
+        },
+        "required": [
+          "error"
+        ]
+      },
+      "Eval": {
+        "type": "object",
+        "title": "Eval",
+        "description": "An Eval object with a data source config and testing criteria.\nAn Eval represents a task to be done for your LLM integration.\nLike:\n - Improve the quality of my chatbot\n - See how well my chatbot handles customer support\n - Check if o4-mini is better at my usecase than gpt-6-astra\n",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "eval"
+            ],
+            "default": "eval",
+            "description": "The object type.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the evaluation."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the evaluation.",
+            "example": "Chatbot effectiveness Evaluation"
+          },
+          "data_source_config": {
+            "type": "object",
+            "description": "Configuration of data sources used in runs of the evaluation.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/EvalCustomDataSourceConfig"
+              },
+              {
+                "$ref": "#/components/schemas/EvalLogsDataSourceConfig"
+              },
+              {
+                "$ref": "#/components/schemas/EvalStoredCompletionsDataSourceConfig"
+              }
+            ]
+          },
+          "testing_criteria": {
+            "description": "A list of testing criteria.",
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/EvalGraderLabelModel"
+                },
+                {
+                  "$ref": "#/components/schemas/EvalGraderStringCheck"
+                },
+                {
+                  "$ref": "#/components/schemas/EvalGraderTextSimilarity"
+                },
+                {
+                  "$ref": "#/components/schemas/EvalGraderPython"
+                },
+                {
+                  "$ref": "#/components/schemas/EvalGraderScoreModel"
+                }
+              ]
+            }
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the eval was created."
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        },
+        "required": [
+          "id",
+          "data_source_config",
+          "object",
+          "testing_criteria",
+          "name",
+          "created_at",
+          "metadata"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval object",
+          "group": "evals",
+          "example": "{\n  \"object\": \"eval\",\n  \"id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"data_source_config\": {\n    \"type\": \"custom\",\n    \"item_schema\": {\n      \"type\": \"object\",\n      \"properties\": {\n        \"label\": {\"type\": \"string\"},\n      },\n      \"required\": [\"label\"]\n    },\n    \"include_sample_schema\": true\n  },\n  \"testing_criteria\": [\n    {\n      \"name\": \"My string check grader\",\n      \"type\": \"string_check\",\n      \"input\": \"{{sample.output_text}}\",\n      \"reference\": \"{{item.label}}\",\n      \"operation\": \"eq\",\n    }\n  ],\n  \"name\": \"External Data Eval\",\n  \"created_at\": 1739314509,\n  \"metadata\": {\n    \"test\": \"synthetics\",\n  }\n}\n"
+        }
+      },
+      "EvalApiError": {
+        "type": "object",
+        "title": "EvalApiError",
+        "description": "An object representing an error response from the Eval API.\n",
+        "properties": {
+          "code": {
+            "type": "string",
+            "description": "The error code."
+          },
+          "message": {
+            "type": "string",
+            "description": "The error message."
+          }
+        },
+        "required": [
+          "code",
+          "message"
+        ],
+        "x-oaiMeta": {
+          "name": "The API error object",
+          "group": "evals",
+          "example": "{\n  \"code\": \"internal_error\",\n  \"message\": \"The eval run failed due to an internal error.\"\n}\n"
+        }
+      },
+      "EvalCustomDataSourceConfig": {
+        "type": "object",
+        "title": "CustomDataSourceConfig",
+        "description": "A CustomDataSourceConfig which specifies the schema of your `item` and optionally `sample` namespaces.\nThe response schema defines the shape of the data that will be:\n- Used to define your testing criteria and\n- What data is required when creating a run\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "default": "custom",
+            "description": "The type of data source. Always `custom`.",
+            "x-stainless-const": true
+          },
+          "schema": {
+            "type": "object",
+            "description": "The json schema for the run data source items.\nLearn how to build JSON schemas [here](https://json-schema.org/).\n",
+            "additionalProperties": true,
+            "example": "{\n  \"type\": \"object\",\n  \"properties\": {\n    \"item\": {\n      \"type\": \"object\",\n      \"properties\": {\n        \"label\": {\"type\": \"string\"},\n      },\n      \"required\": [\"label\"]\n    }\n  },\n  \"required\": [\"item\"]\n}\n"
+          }
+        },
+        "required": [
+          "type",
+          "schema"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval custom data source config object",
+          "group": "evals",
+          "example": "{\n  \"type\": \"custom\",\n  \"schema\": {\n    \"type\": \"object\",\n    \"properties\": {\n      \"item\": {\n        \"type\": \"object\",\n        \"properties\": {\n          \"label\": {\"type\": \"string\"},\n        },\n        \"required\": [\"label\"]\n      }\n    },\n    \"required\": [\"item\"]\n  }\n}\n"
+        }
+      },
+      "EvalGraderLabelModel": {
+        "type": "object",
+        "title": "LabelModelGrader",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/GraderLabelModel"
+          }
+        ]
+      },
+      "EvalGraderPython": {
+        "type": "object",
+        "title": "PythonGrader",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/GraderPython"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "pass_threshold": {
+                "type": "number",
+                "description": "The threshold for the score."
+              }
+            },
+            "x-oaiMeta": {
+              "name": "Eval Python Grader",
+              "group": "graders",
+              "example": "{\n  \"type\": \"python\",\n  \"name\": \"Example python grader\",\n  \"image_tag\": \"2025-05-08\",\n  \"source\": \"\"\"\ndef grade(sample: dict, item: dict) -> float:\n    \\\"\"\"\n    Returns 1.0 if `output_text` equals `label`, otherwise 0.0.\n    \\\"\"\"\n    output = sample.get(\"output_text\")\n    label = item.get(\"label\")\n    return 1.0 if output == label else 0.0\n\"\"\",\n  \"pass_threshold\": 0.8\n}\n"
+            }
+          }
+        ]
+      },
+      "EvalGraderScoreModel": {
+        "type": "object",
+        "title": "ScoreModelGrader",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/GraderScoreModel"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "pass_threshold": {
+                "type": "number",
+                "description": "The threshold for the score."
+              }
+            }
+          }
+        ]
+      },
+      "EvalGraderStringCheck": {
+        "type": "object",
+        "title": "StringCheckGrader",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/GraderStringCheck"
+          }
+        ]
+      },
+      "EvalGraderTextSimilarity": {
+        "type": "object",
+        "title": "TextSimilarityGrader",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/GraderTextSimilarity"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "pass_threshold": {
+                "type": "number",
+                "description": "The threshold for the score."
+              }
+            },
+            "required": [
+              "pass_threshold"
+            ],
+            "x-oaiMeta": {
+              "name": "Text Similarity Grader",
+              "group": "graders",
+              "example": "{\n  \"type\": \"text_similarity\",\n  \"name\": \"Example text similarity grader\",\n  \"input\": \"{{sample.output_text}}\",\n  \"reference\": \"{{item.label}}\",\n  \"pass_threshold\": 0.8,\n  \"evaluation_metric\": \"fuzzy_match\"\n}\n"
+            }
+          }
+        ]
+      },
+      "EvalItem": {
+        "type": "object",
+        "title": "Eval message object",
+        "description": "A message input to the model with a role indicating instruction following\nhierarchy. Instructions given with the `developer` or `system` role take\nprecedence over instructions given with the `user` role. Messages with the\n`assistant` role are presumed to have been generated by the model in previous\ninteractions.\n",
+        "properties": {
+          "role": {
+            "type": "string",
+            "description": "The role of the message input. One of `user`, `assistant`, `system`, or\n`developer`.\n",
+            "enum": [
+              "user",
+              "assistant",
+              "system",
+              "developer"
+            ]
+          },
+          "content": {
+            "$ref": "#/components/schemas/EvalItemContent"
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the message input. Always `message`.\n",
+            "enum": [
+              "message"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ]
+      },
+      "EvalItemContent": {
+        "title": "Eval content",
+        "description": "Inputs to the model - can contain template strings. Supports text, output text, input images, and input audio, either as a single item or an array of items.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/EvalItemContentItem"
+          },
+          {
+            "$ref": "#/components/schemas/EvalItemContentArray"
+          }
+        ]
+      },
+      "EvalItemContentArray": {
+        "type": "array",
+        "title": "An array of Input text, Output text, Input image, and Input audio",
+        "description": "A list of inputs, each of which may be either an input text, output text, input\nimage, or input audio object.\n",
+        "items": {
+          "$ref": "#/components/schemas/EvalItemContentItem"
+        }
+      },
+      "EvalItemContentItem": {
+        "title": "Eval content item",
+        "description": "A single content item: input text, output text, input image, or input audio.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/EvalItemContentText"
+          },
+          {
+            "$ref": "#/components/schemas/InputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/EvalItemContentOutputText"
+          },
+          {
+            "$ref": "#/components/schemas/EvalItemInputImage"
+          },
+          {
+            "$ref": "#/components/schemas/InputAudio"
+          }
+        ]
+      },
+      "EvalItemContentOutputText": {
+        "type": "object",
+        "title": "Output text",
+        "description": "A text output from the model.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the output text. Always `output_text`.\n",
+            "enum": [
+              "output_text"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text output from the model.\n"
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ]
+      },
+      "EvalItemContentText": {
+        "type": "string",
+        "title": "Text input",
+        "description": "A text input to the model.\n"
+      },
+      "EvalItemInputImage": {
+        "title": "Input image",
+        "description": "An image input block used within EvalItem content arrays.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the image input. Always `input_image`.\n",
+            "enum": [
+              "input_image"
+            ],
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the image input.\n"
+          },
+          "detail": {
+            "type": "string",
+            "description": "The detail level of the image to be sent to the model. One of `high`, `low`, or `auto`. Defaults to `auto`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ]
+      },
+      "EvalJsonlFileContentSource": {
+        "type": "object",
+        "title": "EvalJsonlFileContentSource",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_content"
+            ],
+            "default": "file_content",
+            "description": "The type of jsonl source. Always `file_content`.",
+            "x-stainless-const": true
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "item": {
+                  "type": "object",
+                  "additionalProperties": true
+                },
+                "sample": {
+                  "type": "object",
+                  "additionalProperties": true
+                }
+              },
+              "required": [
+                "item"
+              ]
+            },
+            "description": "The content of the jsonl file."
+          }
+        },
+        "required": [
+          "type",
+          "content"
+        ]
+      },
+      "EvalJsonlFileIdSource": {
+        "type": "object",
+        "title": "EvalJsonlFileIdSource",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_id"
+            ],
+            "default": "file_id",
+            "description": "The type of jsonl source. Always `file_id`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier of the file."
+          }
+        },
+        "required": [
+          "type",
+          "id"
+        ]
+      },
+      "EvalList": {
+        "type": "object",
+        "title": "EvalList",
+        "description": "An object representing a list of evals.\n",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "description": "The type of this object. It is always set to \"list\".\n",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "An array of eval objects.\n",
+            "items": {
+              "$ref": "#/components/schemas/Eval"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The identifier of the first eval in the data array."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The identifier of the last eval in the data array."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Indicates whether there are more evals available."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval list object",
+          "group": "evals",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"eval\",\n      \"id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n      \"data_source_config\": {\n        \"type\": \"custom\",\n        \"schema\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"item\": {\n              \"type\": \"object\",\n              \"properties\": {\n                \"input\": {\n                  \"type\": \"string\"\n                },\n                \"ground_truth\": {\n                  \"type\": \"string\"\n                }\n              },\n              \"required\": [\n                \"input\",\n                \"ground_truth\"\n              ]\n            }\n          },\n          \"required\": [\n            \"item\"\n          ]\n        }\n      },\n      \"testing_criteria\": [\n        {\n          \"name\": \"String check\",\n          \"id\": \"String check-2eaf2d8d-d649-4335-8148-9535a7ca73c2\",\n          \"type\": \"string_check\",\n          \"input\": \"{{item.input}}\",\n          \"reference\": \"{{item.ground_truth}}\",\n          \"operation\": \"eq\"\n        }\n      ],\n      \"name\": \"External Data Eval\",\n      \"created_at\": 1739314509,\n      \"metadata\": {},\n    }\n  ],\n  \"first_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"last_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"has_more\": true\n}\n"
+        }
+      },
+      "EvalLogsDataSourceConfig": {
+        "type": "object",
+        "title": "LogsDataSourceConfig",
+        "description": "A LogsDataSourceConfig which specifies the metadata property of your logs query.\nThis is usually metadata like `usecase=chatbot` or `prompt-version=v2`, etc.\nThe schema returned by this data source config is used to defined what variables are available in your evals.\n`item` and `sample` are both defined when using this data source config.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "logs"
+            ],
+            "default": "logs",
+            "description": "The type of data source. Always `logs`.",
+            "x-stainless-const": true
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "schema": {
+            "type": "object",
+            "description": "The json schema for the run data source items.\nLearn how to build JSON schemas [here](https://json-schema.org/).\n",
+            "additionalProperties": true
+          }
+        },
+        "required": [
+          "type",
+          "schema"
+        ],
+        "x-oaiMeta": {
+          "name": "The logs data source object for evals",
+          "group": "evals",
+          "example": "{\n  \"type\": \"logs\",\n  \"metadata\": {\n    \"language\": \"english\"\n  },\n  \"schema\": {\n    \"type\": \"object\",\n    \"properties\": {\n      \"item\": {\n        \"type\": \"object\"\n      },\n      \"sample\": {\n        \"type\": \"object\"\n      }\n    },\n    \"required\": [\n      \"item\",\n      \"sample\"\n    }\n}\n"
+        }
+      },
+      "EvalResponsesSource": {
+        "type": "object",
+        "title": "EvalResponsesSource",
+        "description": "A EvalResponsesSource object describing a run data source configuration.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "responses"
+            ],
+            "description": "The type of run data source. Always `responses`."
+          },
+          "metadata": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "Metadata filter for the responses. This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The name of the model to find responses for. This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "instructions_search": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional string to search the 'instructions' field. This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_after": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "minimum": 0,
+                "description": "Only include items created after this timestamp (inclusive). This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_before": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "minimum": 0,
+                "description": "Only include items created before this timestamp (inclusive). This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "reasoning_effort": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningEffort",
+                "description": "Optional reasoning effort parameter. This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "temperature": {
+            "anyOf": [
+              {
+                "type": "number",
+                "description": "Sampling temperature. This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "top_p": {
+            "anyOf": [
+              {
+                "type": "number",
+                "description": "Nucleus sampling parameter. This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "users": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "List of user identifiers. This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "List of tool names. This is a query parameter used to select responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "The run data source object used to configure an individual run",
+          "group": "eval runs",
+          "example": "{\n  \"type\": \"responses\",\n  \"model\": \"gpt-6-astra\",\n  \"users\": [\"user1\", \"user2\"],\n  \"tools\": [\"tool1\", \"tool2\"],\n  \"instructions_search\": \"You are a coding assistant\"\n}\n"
+        }
+      },
+      "EvalRun": {
+        "type": "object",
+        "title": "EvalRun",
+        "description": "A schema representing an evaluation run.\n",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "eval.run"
+            ],
+            "default": "eval.run",
+            "description": "The type of the object. Always \"eval.run\".",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the evaluation run."
+          },
+          "eval_id": {
+            "type": "string",
+            "description": "The identifier of the associated evaluation."
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the evaluation run."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model that is evaluated, if applicable."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the evaluation run."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the evaluation run was created."
+          },
+          "report_url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL to the rendered evaluation run report on the UI dashboard."
+          },
+          "result_counts": {
+            "type": "object",
+            "description": "Counters summarizing the outcomes of the evaluation run.",
+            "properties": {
+              "total": {
+                "type": "integer",
+                "description": "Total number of executed output items."
+              },
+              "errored": {
+                "type": "integer",
+                "description": "Number of output items that resulted in an error."
+              },
+              "failed": {
+                "type": "integer",
+                "description": "Number of output items that failed to pass the evaluation."
+              },
+              "passed": {
+                "type": "integer",
+                "description": "Number of output items that passed the evaluation."
+              }
+            },
+            "required": [
+              "total",
+              "errored",
+              "failed",
+              "passed"
+            ]
+          },
+          "per_model_usage": {
+            "type": "array",
+            "description": "Usage statistics for each model during the evaluation run.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "model_name": {
+                  "type": "string",
+                  "description": "The name of the model."
+                },
+                "invocation_count": {
+                  "type": "integer",
+                  "description": "The number of invocations."
+                },
+                "prompt_tokens": {
+                  "type": "integer",
+                  "description": "The number of prompt tokens used."
+                },
+                "completion_tokens": {
+                  "type": "integer",
+                  "description": "The number of completion tokens generated."
+                },
+                "total_tokens": {
+                  "type": "integer",
+                  "description": "The total number of tokens used."
+                },
+                "cached_tokens": {
+                  "type": "integer",
+                  "description": "The number of tokens retrieved from cache."
+                }
+              },
+              "required": [
+                "model_name",
+                "invocation_count",
+                "prompt_tokens",
+                "completion_tokens",
+                "total_tokens",
+                "cached_tokens"
+              ]
+            }
+          },
+          "per_testing_criteria_results": {
+            "type": "array",
+            "description": "Results per testing criteria applied during the evaluation run.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "testing_criteria": {
+                  "type": "string",
+                  "description": "A description of the testing criteria."
+                },
+                "passed": {
+                  "type": "integer",
+                  "description": "Number of tests passed for this criteria."
+                },
+                "failed": {
+                  "type": "integer",
+                  "description": "Number of tests failed for this criteria."
+                }
+              },
+              "required": [
+                "testing_criteria",
+                "passed",
+                "failed"
+              ]
+            }
+          },
+          "data_source": {
+            "type": "object",
+            "description": "Information about the run's data source.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/CreateEvalJsonlRunDataSource"
+              },
+              {
+                "$ref": "#/components/schemas/CreateEvalCompletionsRunDataSource"
+              },
+              {
+                "$ref": "#/components/schemas/CreateEvalResponsesRunDataSource"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "error": {
+            "$ref": "#/components/schemas/EvalApiError"
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "eval_id",
+          "status",
+          "model",
+          "name",
+          "created_at",
+          "report_url",
+          "result_counts",
+          "per_model_usage",
+          "per_testing_criteria_results",
+          "data_source",
+          "metadata",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval run object",
+          "group": "evals",
+          "example": "{\n  \"object\": \"eval.run\",\n  \"id\": \"evalrun_67e57965b480819094274e3a32235e4c\",\n  \"eval_id\": \"eval_67e579652b548190aaa83ada4b125f47\",\n  \"report_url\": \"https://platform.openai.com/evaluations/eval_67e579652b548190aaa83ada4b125f47?run_id=evalrun_67e57965b480819094274e3a32235e4c\",\n  \"status\": \"queued\",\n  \"model\": \"gpt-6-astra\",\n  \"name\": \"gpt-6-astra\",\n  \"created_at\": 1743092069,\n  \"result_counts\": {\n    \"total\": 0,\n    \"errored\": 0,\n    \"failed\": 0,\n    \"passed\": 0\n  },\n  \"per_model_usage\": null,\n  \"per_testing_criteria_results\": null,\n  \"data_source\": {\n    \"type\": \"completions\",\n    \"source\": {\n      \"type\": \"file_content\",\n      \"content\": [\n        {\n          \"item\": {\n            \"input\": \"Tech Company Launches Advanced Artificial Intelligence Platform\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Central Bank Increases Interest Rates Amid Inflation Concerns\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"International Summit Addresses Climate Change Strategies\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Major Retailer Reports Record-Breaking Holiday Sales\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"National Team Qualifies for World Championship Finals\",\n            \"ground_truth\": \"Sports\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Stock Markets Rally After Positive Economic Data Released\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Global Manufacturer Announces Merger with Competitor\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Breakthrough in Renewable Energy Technology Unveiled\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"World Leaders Sign Historic Climate Agreement\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Professional Athlete Sets New Record in Championship Event\",\n            \"ground_truth\": \"Sports\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Financial Institutions Adapt to New Regulatory Requirements\",\n            \"ground_truth\": \"Business\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Tech Conference Showcases Advances in Artificial Intelligence\",\n            \"ground_truth\": \"Technology\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Global Markets Respond to Oil Price Fluctuations\",\n            \"ground_truth\": \"Markets\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"International Cooperation Strengthened Through New Treaty\",\n            \"ground_truth\": \"World\"\n          }\n        },\n        {\n          \"item\": {\n            \"input\": \"Sports League Announces Revised Schedule for Upcoming Season\",\n            \"ground_truth\": \"Sports\"\n          }\n        }\n      ]\n    },\n    \"input_messages\": {\n      \"type\": \"template\",\n      \"template\": [\n        {\n          \"type\": \"message\",\n          \"role\": \"developer\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"Categorize a given news headline into one of the following topics: Technology, Markets, World, Business, or Sports.\\n\\n# Steps\\n\\n1. Analyze the content of the news headline to understand its primary focus.\\n2. Extract the subject matter, identifying any key indicators or keywords.\\n3. Use the identified indicators to determine the most suitable category out of the five options: Technology, Markets, World, Business, or Sports.\\n4. Ensure only one category is selected per headline.\\n\\n# Output Format\\n\\nRespond with the chosen category as a single word. For instance: \\\"Technology\\\", \\\"Markets\\\", \\\"World\\\", \\\"Business\\\", or \\\"Sports\\\".\\n\\n# Examples\\n\\n**Input**: \\\"Apple Unveils New iPhone Model, Featuring Advanced AI Features\\\"  \\n**Output**: \\\"Technology\\\"\\n\\n**Input**: \\\"Global Stocks Mixed as Investors Await Central Bank Decisions\\\"  \\n**Output**: \\\"Markets\\\"\\n\\n**Input**: \\\"War in Ukraine: Latest Updates on Negotiation Status\\\"  \\n**Output**: \\\"World\\\"\\n\\n**Input**: \\\"Microsoft in Talks to Acquire Gaming Company for $2 Billion\\\"  \\n**Output**: \\\"Business\\\"\\n\\n**Input**: \\\"Manchester United Secures Win in Premier League Football Match\\\"  \\n**Output**: \\\"Sports\\\" \\n\\n# Notes\\n\\n- If the headline appears to fit into more than one category, choose the most dominant theme.\\n- Keywords or phrases such as \\\"stocks\\\", \\\"company acquisition\\\", \\\"match\\\", or technological brands can be good indicators for classification.\\n\"\n          }\n        },\n        {\n          \"type\": \"message\",\n          \"role\": \"user\",\n          \"content\": {\n            \"type\": \"input_text\",\n            \"text\": \"{{item.input}}\"\n          }\n        }\n      ]\n    },\n    \"model\": \"gpt-6-astra\",\n    \"sampling_params\": {\n      \"max_completions_tokens\": 2048\n    }\n  },\n  \"error\": null,\n  \"metadata\": {}\n}\n"
+        }
+      },
+      "EvalRunList": {
+        "type": "object",
+        "title": "EvalRunList",
+        "description": "An object representing a list of runs for an evaluation.\n",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "description": "The type of this object. It is always set to \"list\".\n",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "An array of eval run objects.\n",
+            "items": {
+              "$ref": "#/components/schemas/EvalRun"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The identifier of the first eval run in the data array."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The identifier of the last eval run in the data array."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Indicates whether there are more evals available."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval run list object",
+          "group": "evals",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"eval.run\",\n      \"id\": \"evalrun_67b7fbdad46c819092f6fe7a14189620\",\n      \"eval_id\": \"eval_67b7fa9a81a88190ab4aa417e397ea21\",\n      \"report_url\": \"https://platform.openai.com/evaluations/eval_67b7fa9a81a88190ab4aa417e397ea21?run_id=evalrun_67b7fbdad46c819092f6fe7a14189620\",\n      \"status\": \"completed\",\n      \"model\": \"o3-mini\",\n      \"name\": \"Academic Assistant\",\n      \"created_at\": 1740110812,\n      \"result_counts\": {\n        \"total\": 171,\n        \"errored\": 0,\n        \"failed\": 80,\n        \"passed\": 91\n      },\n      \"per_model_usage\": null,\n      \"per_testing_criteria_results\": [\n        {\n          \"testing_criteria\": \"String check grader\",\n          \"passed\": 91,\n          \"failed\": 80\n        }\n      ],\n      \"run_data_source\": {\n        \"type\": \"completions\",\n        \"template_messages\": [\n          {\n            \"type\": \"message\",\n            \"role\": \"system\",\n            \"content\": {\n              \"type\": \"input_text\",\n              \"text\": \"You are a helpful assistant.\"\n            }\n          },\n          {\n            \"type\": \"message\",\n            \"role\": \"user\",\n            \"content\": {\n              \"type\": \"input_text\",\n              \"text\": \"Hello, can you help me with my homework?\"\n            }\n          }\n        ],\n        \"datasource_reference\": null,\n        \"model\": \"o3-mini\",\n        \"max_completion_tokens\": null,\n        \"seed\": null,\n        \"temperature\": null,\n        \"top_p\": null\n      },\n      \"error\": null,\n      \"metadata\": {\"test\": \"synthetics\"}\n    }\n  ],\n  \"first_id\": \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"last_id\": \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"has_more\": false\n}\n"
+        }
+      },
+      "EvalRunOutputItem": {
+        "type": "object",
+        "title": "EvalRunOutputItem",
+        "description": "A schema representing an evaluation run output item.\n",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "eval.run.output_item"
+            ],
+            "default": "eval.run.output_item",
+            "description": "The type of the object. Always \"eval.run.output_item\".",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the evaluation run output item."
+          },
+          "run_id": {
+            "type": "string",
+            "description": "The identifier of the evaluation run associated with this output item."
+          },
+          "eval_id": {
+            "type": "string",
+            "description": "The identifier of the evaluation group."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the evaluation run was created."
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the evaluation run."
+          },
+          "datasource_item_id": {
+            "type": "integer",
+            "description": "The identifier for the data source item."
+          },
+          "datasource_item": {
+            "type": "object",
+            "description": "Details of the input data source item.",
+            "additionalProperties": true
+          },
+          "results": {
+            "type": "array",
+            "description": "A list of grader results for this output item.",
+            "items": {
+              "$ref": "#/components/schemas/EvalRunOutputItemResult"
+            }
+          },
+          "sample": {
+            "type": "object",
+            "description": "A sample containing the input and output of the evaluation run.",
+            "properties": {
+              "input": {
+                "type": "array",
+                "description": "An array of input messages.",
+                "items": {
+                  "type": "object",
+                  "description": "An input message.",
+                  "properties": {
+                    "role": {
+                      "type": "string",
+                      "description": "The role of the message sender (e.g., system, user, developer)."
+                    },
+                    "content": {
+                      "type": "string",
+                      "description": "The content of the message."
+                    }
+                  },
+                  "required": [
+                    "role",
+                    "content"
+                  ]
+                }
+              },
+              "output": {
+                "type": "array",
+                "description": "An array of output messages.",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "role": {
+                      "type": "string",
+                      "description": "The role of the message (e.g. \"system\", \"assistant\", \"user\")."
+                    },
+                    "content": {
+                      "type": "string",
+                      "description": "The content of the message."
+                    }
+                  }
+                }
+              },
+              "finish_reason": {
+                "type": "string",
+                "description": "The reason why the sample generation was finished."
+              },
+              "model": {
+                "type": "string",
+                "description": "The model used for generating the sample."
+              },
+              "usage": {
+                "type": "object",
+                "description": "Token usage details for the sample.",
+                "properties": {
+                  "total_tokens": {
+                    "type": "integer",
+                    "description": "The total number of tokens used."
+                  },
+                  "completion_tokens": {
+                    "type": "integer",
+                    "description": "The number of completion tokens generated."
+                  },
+                  "prompt_tokens": {
+                    "type": "integer",
+                    "description": "The number of prompt tokens used."
+                  },
+                  "cached_tokens": {
+                    "type": "integer",
+                    "description": "The number of tokens retrieved from cache."
+                  }
+                },
+                "required": [
+                  "total_tokens",
+                  "completion_tokens",
+                  "prompt_tokens",
+                  "cached_tokens"
+                ]
+              },
+              "error": {
+                "$ref": "#/components/schemas/EvalApiError"
+              },
+              "temperature": {
+                "type": "number",
+                "description": "The sampling temperature used."
+              },
+              "max_completion_tokens": {
+                "type": "integer",
+                "description": "The maximum number of tokens allowed for completion."
+              },
+              "top_p": {
+                "type": "number",
+                "description": "The top_p value used for sampling."
+              },
+              "seed": {
+                "type": "integer",
+                "description": "The seed used for generating the sample."
+              }
+            },
+            "required": [
+              "input",
+              "output",
+              "finish_reason",
+              "model",
+              "usage",
+              "error",
+              "temperature",
+              "max_completion_tokens",
+              "top_p",
+              "seed"
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "run_id",
+          "eval_id",
+          "created_at",
+          "status",
+          "datasource_item_id",
+          "datasource_item",
+          "results",
+          "sample"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval run output item object",
+          "group": "evals",
+          "example": "{\n  \"object\": \"eval.run.output_item\",\n  \"id\": \"outputitem_67abd55eb6548190bb580745d5644a33\",\n  \"run_id\": \"evalrun_67abd54d60ec8190832b46859da808f7\",\n  \"eval_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n  \"created_at\": 1739314509,\n  \"status\": \"pass\",\n  \"datasource_item_id\": 137,\n  \"datasource_item\": {\n      \"teacher\": \"To grade essays, I only check for style, content, and grammar.\",\n      \"student\": \"I am a student who is trying to write the best essay.\"\n  },\n  \"results\": [\n    {\n      \"name\": \"String Check Grader\",\n      \"type\": \"string-check-grader\",\n      \"score\": 1.0,\n      \"passed\": true,\n    }\n  ],\n  \"sample\": {\n    \"input\": [\n      {\n        \"role\": \"system\",\n        \"content\": \"You are an evaluator bot...\"\n      },\n      {\n        \"role\": \"user\",\n        \"content\": \"You are assessing...\"\n      }\n    ],\n    \"output\": [\n      {\n        \"role\": \"assistant\",\n        \"content\": \"The rubric is not clear nor concise.\"\n      }\n    ],\n    \"finish_reason\": \"stop\",\n    \"model\": \"gpt-6-astra\",\n    \"usage\": {\n      \"total_tokens\": 521,\n      \"completion_tokens\": 2,\n      \"prompt_tokens\": 519,\n      \"cached_tokens\": 0\n    },\n    \"error\": null,\n    \"temperature\": 1.0,\n    \"max_completion_tokens\": 2048,\n    \"top_p\": 1.0,\n    \"seed\": 42\n  }\n}\n"
+        }
+      },
+      "EvalRunOutputItemList": {
+        "type": "object",
+        "title": "EvalRunOutputItemList",
+        "description": "An object representing a list of output items for an evaluation run.\n",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "description": "The type of this object. It is always set to \"list\".\n",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "An array of eval run output item objects.\n",
+            "items": {
+              "$ref": "#/components/schemas/EvalRunOutputItem"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The identifier of the first eval run output item in the data array."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The identifier of the last eval run output item in the data array."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Indicates whether there are more eval run output items available."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "x-oaiMeta": {
+          "name": "The eval run output item list object",
+          "group": "evals",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"eval.run.output_item\",\n      \"id\": \"outputitem_67abd55eb6548190bb580745d5644a33\",\n      \"run_id\": \"evalrun_67abd54d60ec8190832b46859da808f7\",\n      \"eval_id\": \"eval_67abd54d9b0081909a86353f6fb9317a\",\n      \"created_at\": 1739314509,\n      \"status\": \"pass\",\n      \"datasource_item_id\": 137,\n      \"datasource_item\": {\n          \"teacher\": \"To grade essays, I only check for style, content, and grammar.\",\n          \"student\": \"I am a student who is trying to write the best essay.\"\n      },\n      \"results\": [\n        {\n          \"name\": \"String Check Grader\",\n          \"type\": \"string-check-grader\",\n          \"score\": 1.0,\n          \"passed\": true,\n        }\n      ],\n      \"sample\": {\n        \"input\": [\n          {\n            \"role\": \"system\",\n            \"content\": \"You are an evaluator bot...\"\n          },\n          {\n            \"role\": \"user\",\n            \"content\": \"You are assessing...\"\n          }\n        ],\n        \"output\": [\n          {\n            \"role\": \"assistant\",\n            \"content\": \"The rubric is not clear nor concise.\"\n          }\n        ],\n        \"finish_reason\": \"stop\",\n        \"model\": \"gpt-6-astra\",\n        \"usage\": {\n          \"total_tokens\": 521,\n          \"completion_tokens\": 2,\n          \"prompt_tokens\": 519,\n          \"cached_tokens\": 0\n        },\n        \"error\": null,\n        \"temperature\": 1.0,\n        \"max_completion_tokens\": 2048,\n        \"top_p\": 1.0,\n        \"seed\": 42\n      }\n    },\n  ],\n  \"first_id\": \"outputitem_67abd55eb6548190bb580745d5644a33\",\n  \"last_id\": \"outputitem_67abd55eb6548190bb580745d5644a33\",\n  \"has_more\": false\n}\n"
+        }
+      },
+      "EvalRunOutputItemResult": {
+        "type": "object",
+        "title": "EvalRunOutputItemResult",
+        "description": "A single grader result for an evaluation run output item.\n",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the grader."
+          },
+          "type": {
+            "type": "string",
+            "description": "The grader type (for example, \"string-check-grader\")."
+          },
+          "score": {
+            "type": "number",
+            "description": "The numeric score produced by the grader."
+          },
+          "passed": {
+            "type": "boolean",
+            "description": "Whether the grader considered the output a pass."
+          },
+          "sample": {
+            "anyOf": [
+              {
+                "type": "object",
+                "additionalProperties": true
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Optional sample or intermediate data produced by the grader."
+          }
+        },
+        "additionalProperties": true,
+        "required": [
+          "name",
+          "score",
+          "passed"
+        ]
+      },
+      "EvalStoredCompletionsDataSourceConfig": {
+        "type": "object",
+        "title": "StoredCompletionsDataSourceConfig",
+        "description": "Deprecated in favor of LogsDataSourceConfig.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stored_completions"
+            ],
+            "default": "stored_completions",
+            "description": "The type of data source. Always `stored_completions`.",
+            "x-stainless-const": true
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "schema": {
+            "type": "object",
+            "description": "The json schema for the run data source items.\nLearn how to build JSON schemas [here](https://json-schema.org/).\n",
+            "additionalProperties": true
+          }
+        },
+        "required": [
+          "type",
+          "schema"
+        ],
+        "deprecated": true,
+        "x-oaiMeta": {
+          "name": "The stored completions data source object for evals",
+          "group": "evals",
+          "example": "{\n  \"type\": \"stored_completions\",\n  \"metadata\": {\n    \"language\": \"english\"\n  },\n  \"schema\": {\n    \"type\": \"object\",\n    \"properties\": {\n      \"item\": {\n        \"type\": \"object\"\n      },\n      \"sample\": {\n        \"type\": \"object\"\n      }\n    },\n    \"required\": [\n      \"item\",\n      \"sample\"\n    }\n}\n"
+        }
+      },
+      "EvalStoredCompletionsSource": {
+        "type": "object",
+        "title": "StoredCompletionsRunDataSource",
+        "description": "A StoredCompletionsRunDataSource configuration describing a set of filters\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stored_completions"
+            ],
+            "default": "stored_completions",
+            "description": "The type of source. Always `stored_completions`.",
+            "x-stainless-const": true
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "An optional model to filter by (e.g., 'gpt-6-astra')."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_after": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "An optional Unix timestamp to filter items created after this time."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_before": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "An optional Unix timestamp to filter items created before this time."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "limit": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "An optional maximum number of items to return."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "The stored completions data source object used to configure an individual run",
+          "group": "eval runs",
+          "example": "{\n  \"type\": \"stored_completions\",\n  \"model\": \"gpt-6-astra\",\n  \"created_after\": 1668124800,\n  \"created_before\": 1668124900,\n  \"limit\": 100,\n  \"metadata\": {}\n}\n"
+        }
+      },
+      "FileExpirationAfter": {
+        "type": "object",
+        "title": "File expiration policy",
+        "description": "The expiration policy for a file. By default, files with `purpose=batch` expire after 30 days and all other files are persisted until they are manually deleted.",
+        "properties": {
+          "anchor": {
+            "description": "Anchor timestamp after which the expiration policy applies. Supported anchors: `created_at`.",
+            "type": "string",
+            "enum": [
+              "created_at"
+            ],
+            "x-stainless-const": true
+          },
+          "seconds": {
+            "description": "The number of seconds after the anchor time that the file will expire. Must be between 3600 (1 hour) and 2592000 (30 days).",
+            "type": "integer",
+            "format": "int64",
+            "minimum": 3600,
+            "maximum": 2592000
+          }
+        },
+        "required": [
+          "anchor",
+          "seconds"
+        ]
+      },
+      "FilePath": {
+        "type": "object",
+        "title": "File path",
+        "description": "A path to a file.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the file path. Always `file_path`.\n",
+            "enum": [
+              "file_path"
+            ],
+            "x-stainless-const": true
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file.\n"
+          },
+          "index": {
+            "type": "integer",
+            "description": "The index of the file in the list of files.\n"
+          }
+        },
+        "required": [
+          "type",
+          "file_id",
+          "index"
+        ]
+      },
+      "FileSearchRanker": {
+        "type": "string",
+        "description": "The ranker to use for the file search. If not specified will use the `auto` ranker.",
+        "enum": [
+          "auto",
+          "default_2024_08_21"
+        ]
+      },
+      "FileSearchRankingOptions": {
+        "title": "File search tool call ranking options",
+        "type": "object",
+        "description": "The ranking options for the file search. If not specified, the file search tool will use the `auto` ranker and a score_threshold of 0.\n\nSee the [file search tool documentation](https://developers.openai.com/api/docs/guides/tools-file-search#retrieval-customization) for more information.\n",
+        "properties": {
+          "ranker": {
+            "$ref": "#/components/schemas/FileSearchRanker"
+          },
+          "score_threshold": {
+            "type": "number",
+            "description": "The score threshold for the file search. All values must be a floating point number between 0 and 1.",
+            "minimum": 0,
+            "maximum": 1
+          }
+        },
+        "required": [
+          "score_threshold"
+        ]
+      },
+      "FileSearchToolCall": {
+        "type": "object",
+        "title": "File search tool call",
+        "description": "The results of a file search tool call. See the\n[file search guide](https://developers.openai.com/api/docs/guides/tools-file-search) for more information.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the file search tool call.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_search_call"
+            ],
+            "description": "The type of the file search tool call. Always `file_search_call`.\n",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the file search tool call. One of `in_progress`,\n`searching`, `incomplete` or `failed`,\n",
+            "enum": [
+              "in_progress",
+              "searching",
+              "completed",
+              "incomplete",
+              "failed"
+            ]
+          },
+          "queries": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "The queries used to search for files.\n"
+          },
+          "results": {
+            "anyOf": [
+              {
+                "type": "array",
+                "description": "The results of the file search tool call.\n",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "file_id": {
+                      "type": "string",
+                      "description": "The unique ID of the file.\n"
+                    },
+                    "text": {
+                      "type": "string",
+                      "description": "The text that was retrieved from the file.\n"
+                    },
+                    "filename": {
+                      "type": "string",
+                      "description": "The name of the file.\n"
+                    },
+                    "attributes": {
+                      "$ref": "#/components/schemas/VectorStoreFileAttributes"
+                    },
+                    "score": {
+                      "type": "number",
+                      "format": "float",
+                      "description": "The relevance score of the file - a value between 0 and 1.\n"
+                    }
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "status",
+          "queries"
+        ]
+      },
+      "FineTuneChatCompletionRequestAssistantMessage": {
+        "allOf": [
+          {
+            "type": "object",
+            "title": "Assistant message",
+            "deprecated": false,
+            "properties": {
+              "weight": {
+                "type": "integer",
+                "enum": [
+                  0,
+                  1
+                ],
+                "description": "Controls whether the assistant message is trained against (0 or 1)"
+              }
+            }
+          },
+          {
+            "$ref": "#/components/schemas/ChatCompletionRequestAssistantMessage"
+          }
+        ],
+        "required": [
+          "role"
+        ]
+      },
+      "FineTuneDPOHyperparameters": {
+        "type": "object",
+        "description": "The hyperparameters used for the DPO fine-tuning job.",
+        "properties": {
+          "beta": {
+            "description": "The beta value for the DPO method. A higher beta value will increase the weight of the penalty between the policy and reference model.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 2,
+                "exclusiveMinimum": true
+              }
+            ],
+            "default": "auto"
+          },
+          "batch_size": {
+            "description": "Number of examples in each batch. A larger batch size means that model parameters are updated less frequently, but with lower variance.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 256
+              }
+            ],
+            "default": "auto"
+          },
+          "learning_rate_multiplier": {
+            "description": "Scaling factor for the learning rate. A smaller learning rate may be useful to avoid overfitting.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "number",
+                "minimum": 0,
+                "exclusiveMinimum": true
+              }
+            ],
+            "default": "auto"
+          },
+          "n_epochs": {
+            "description": "The number of epochs to train the model for. An epoch refers to one full cycle through the training dataset.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 50
+              }
+            ],
+            "default": "auto"
+          }
+        }
+      },
+      "FineTuneDPOMethod": {
+        "type": "object",
+        "description": "Configuration for the DPO fine-tuning method.",
+        "properties": {
+          "hyperparameters": {
+            "$ref": "#/components/schemas/FineTuneDPOHyperparameters"
+          }
+        }
+      },
+      "FineTuneMethod": {
+        "type": "object",
+        "description": "The method used for fine-tuning.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of method. Is either `supervised`, `dpo`, or `reinforcement`.",
+            "enum": [
+              "supervised",
+              "dpo",
+              "reinforcement"
+            ]
+          },
+          "supervised": {
+            "$ref": "#/components/schemas/FineTuneSupervisedMethod"
+          },
+          "dpo": {
+            "$ref": "#/components/schemas/FineTuneDPOMethod"
+          },
+          "reinforcement": {
+            "$ref": "#/components/schemas/FineTuneReinforcementMethod"
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "FineTuneReinforcementHyperparameters": {
+        "type": "object",
+        "description": "The hyperparameters used for the reinforcement fine-tuning job.",
+        "properties": {
+          "batch_size": {
+            "description": "Number of examples in each batch. A larger batch size means that model parameters are updated less frequently, but with lower variance.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 256
+              }
+            ],
+            "default": "auto"
+          },
+          "learning_rate_multiplier": {
+            "description": "Scaling factor for the learning rate. A smaller learning rate may be useful to avoid overfitting.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "number",
+                "minimum": 0,
+                "exclusiveMinimum": true
+              }
+            ],
+            "default": "auto"
+          },
+          "n_epochs": {
+            "description": "The number of epochs to train the model for. An epoch refers to one full cycle through the training dataset.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 50
+              }
+            ],
+            "default": "auto"
+          },
+          "reasoning_effort": {
+            "description": "Level of reasoning effort.\n",
+            "type": "string",
+            "enum": [
+              "default",
+              "low",
+              "medium",
+              "high"
+            ],
+            "default": "default"
+          },
+          "compute_multiplier": {
+            "description": "Multiplier on amount of compute used for exploring search space during training.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "number",
+                "minimum": 0.00001,
+                "maximum": 10,
+                "exclusiveMinimum": true
+              }
+            ],
+            "default": "auto"
+          },
+          "eval_interval": {
+            "description": "The number of training steps between evaluation runs.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "integer",
+                "minimum": 1
+              }
+            ],
+            "default": "auto"
+          },
+          "eval_samples": {
+            "description": "Number of evaluation samples to generate per training step.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "integer",
+                "minimum": 1
+              }
+            ],
+            "default": "auto"
+          }
+        }
+      },
+      "FineTuneReinforcementMethod": {
+        "type": "object",
+        "description": "Configuration for the reinforcement fine-tuning method.",
+        "properties": {
+          "grader": {
+            "type": "object",
+            "description": "The grader used for the fine-tuning job.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/GraderStringCheck"
+              },
+              {
+                "$ref": "#/components/schemas/GraderTextSimilarity"
+              },
+              {
+                "$ref": "#/components/schemas/GraderPython"
+              },
+              {
+                "$ref": "#/components/schemas/GraderScoreModel"
+              },
+              {
+                "$ref": "#/components/schemas/GraderMulti"
+              }
+            ]
+          },
+          "hyperparameters": {
+            "$ref": "#/components/schemas/FineTuneReinforcementHyperparameters"
+          }
+        },
+        "required": [
+          "grader"
+        ]
+      },
+      "FineTuneSupervisedHyperparameters": {
+        "type": "object",
+        "description": "The hyperparameters used for the fine-tuning job.",
+        "properties": {
+          "batch_size": {
+            "description": "Number of examples in each batch. A larger batch size means that model parameters are updated less frequently, but with lower variance.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 256
+              }
+            ],
+            "default": "auto"
+          },
+          "learning_rate_multiplier": {
+            "description": "Scaling factor for the learning rate. A smaller learning rate may be useful to avoid overfitting.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "number",
+                "minimum": 0,
+                "exclusiveMinimum": true
+              }
+            ],
+            "default": "auto"
+          },
+          "n_epochs": {
+            "description": "The number of epochs to train the model for. An epoch refers to one full cycle through the training dataset.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 50
+              }
+            ],
+            "default": "auto"
+          }
+        }
+      },
+      "FineTuneSupervisedMethod": {
+        "type": "object",
+        "description": "Configuration for the supervised fine-tuning method.",
+        "properties": {
+          "hyperparameters": {
+            "$ref": "#/components/schemas/FineTuneSupervisedHyperparameters"
+          }
+        }
+      },
+      "FineTuningCheckpointPermission": {
+        "type": "object",
+        "title": "FineTuningCheckpointPermission",
+        "description": "The `checkpoint.permission` object represents a permission for a fine-tuned model checkpoint.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The permission identifier, which can be referenced in the API endpoints."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the permission was created."
+          },
+          "project_id": {
+            "type": "string",
+            "description": "The project identifier that the permission is for."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"checkpoint.permission\".",
+            "enum": [
+              "checkpoint.permission"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "created_at",
+          "id",
+          "object",
+          "project_id"
+        ],
+        "x-oaiMeta": {
+          "name": "The fine-tuned model checkpoint permission object",
+          "example": "{\n  \"object\": \"checkpoint.permission\",\n  \"id\": \"cp_zc4Q7MP6XxulcVzj4MZdwsAB\",\n  \"created_at\": 1712211699,\n  \"project_id\": \"proj_abGMw1llN8IrBb6SvvY5A1iH\"\n}\n"
+        }
+      },
+      "FineTuningIntegration": {
+        "type": "object",
+        "title": "Fine-Tuning Job Integration",
+        "required": [
+          "type",
+          "wandb"
+        ],
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the integration being enabled for the fine-tuning job",
+            "enum": [
+              "wandb"
+            ],
+            "x-stainless-const": true
+          },
+          "wandb": {
+            "type": "object",
+            "description": "The settings for your integration with Weights and Biases. This payload specifies the project that\nmetrics will be sent to. Optionally, you can set an explicit display name for your run, add tags\nto your run, and set a default entity (team, username, etc) to be associated with your run.\n",
+            "required": [
+              "project"
+            ],
+            "properties": {
+              "project": {
+                "description": "The name of the project that the new run will be created under.\n",
+                "type": "string",
+                "example": "my-wandb-project"
+              },
+              "name": {
+                "anyOf": [
+                  {
+                    "description": "A display name to set for the run. If not set, we will use the Job ID as the name.\n",
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "entity": {
+                "anyOf": [
+                  {
+                    "description": "The entity to use for the run. This allows you to set the team or username of the WandB user that you would\nlike associated with the run. If not set, the default entity for the registered WandB API key is used.\n",
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "tags": {
+                "description": "A list of tags to be attached to the newly created run. These tags are passed through directly to WandB. Some\ndefault tags are generated by OpenAI: \"openai/finetune\", \"openai/{base-model}\", \"openai/{ftjob-abcdef}\".\n",
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "example": "custom-tag"
+                }
+              }
+            }
+          }
+        }
+      },
+      "FineTuningJob": {
+        "type": "object",
+        "title": "FineTuningJob",
+        "description": "The `fine_tuning.job` object represents a fine-tuning job that has been created through the API.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The object identifier, which can be referenced in the API endpoints."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the fine-tuning job was created."
+          },
+          "error": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "For fine-tuning jobs that have `failed`, this will contain more information on the cause of the failure.",
+                "properties": {
+                  "code": {
+                    "type": "string",
+                    "description": "A machine-readable error code."
+                  },
+                  "message": {
+                    "type": "string",
+                    "description": "A human-readable error message."
+                  },
+                  "param": {
+                    "anyOf": [
+                      {
+                        "type": "string",
+                        "description": "The parameter that was invalid, usually `training_file` or `validation_file`. This field will be null if the failure was not parameter-specific."
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "code",
+                  "message",
+                  "param"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "fine_tuned_model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The name of the fine-tuned model that is being created. The value will be null if the fine-tuning job is still running."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "finished_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) for when the fine-tuning job was finished. The value will be null if the fine-tuning job is still running."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "hyperparameters": {
+            "type": "object",
+            "description": "The hyperparameters used for the fine-tuning job. This value will only be returned when running `supervised` jobs.",
+            "properties": {
+              "batch_size": {
+                "anyOf": [
+                  {
+                    "description": "Number of examples in each batch. A larger batch size means that model parameters\nare updated less frequently, but with lower variance.\n",
+                    "oneOf": [
+                      {
+                        "type": "string",
+                        "enum": [
+                          "auto"
+                        ],
+                        "x-stainless-const": true
+                      },
+                      {
+                        "type": "integer",
+                        "minimum": 1,
+                        "maximum": 256
+                      }
+                    ],
+                    "default": "auto"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "learning_rate_multiplier": {
+                "description": "Scaling factor for the learning rate. A smaller learning rate may be useful to avoid\noverfitting.\n",
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "enum": [
+                      "auto"
+                    ],
+                    "x-stainless-const": true
+                  },
+                  {
+                    "type": "number",
+                    "minimum": 0,
+                    "exclusiveMinimum": true
+                  }
+                ],
+                "default": "auto"
+              },
+              "n_epochs": {
+                "description": "The number of epochs to train the model for. An epoch refers to one full cycle\nthrough the training dataset.\n",
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "enum": [
+                      "auto"
+                    ],
+                    "x-stainless-const": true
+                  },
+                  {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 50
+                  }
+                ],
+                "default": "auto"
+              }
+            }
+          },
+          "model": {
+            "type": "string",
+            "description": "The base model that is being fine-tuned."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"fine_tuning.job\".",
+            "enum": [
+              "fine_tuning.job"
+            ],
+            "x-stainless-const": true
+          },
+          "organization_id": {
+            "type": "string",
+            "description": "The organization that owns the fine-tuning job."
+          },
+          "result_files": {
+            "type": "array",
+            "description": "The compiled results file ID(s) for the fine-tuning job. You can retrieve the results with the [Files API](https://developers.openai.com/api/reference/resources/files/methods/content).",
+            "items": {
+              "type": "string",
+              "example": "file-abc123"
+            }
+          },
+          "status": {
+            "type": "string",
+            "description": "The current status of the fine-tuning job, which can be either `validating_files`, `queued`, `running`, `succeeded`, `failed`, or `cancelled`.",
+            "enum": [
+              "validating_files",
+              "queued",
+              "running",
+              "succeeded",
+              "failed",
+              "cancelled"
+            ]
+          },
+          "trained_tokens": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "The total number of billable tokens processed by this fine-tuning job. The value will be null if the fine-tuning job is still running."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "training_file": {
+            "type": "string",
+            "description": "The file ID used for training. You can retrieve the training data with the [Files API](https://developers.openai.com/api/reference/resources/files/methods/content)."
+          },
+          "validation_file": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The file ID used for validation. You can retrieve the validation results with the [Files API](https://developers.openai.com/api/reference/resources/files/methods/content)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "integrations": {
+            "anyOf": [
+              {
+                "type": "array",
+                "description": "A list of integrations to enable for this fine-tuning job.",
+                "maxItems": 5,
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/FineTuningIntegration"
+                    }
+                  ]
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "seed": {
+            "type": "integer",
+            "description": "The seed used for the fine-tuning job."
+          },
+          "estimated_finish": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) for when the fine-tuning job is estimated to finish. The value will be null if the fine-tuning job is not running."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "method": {
+            "$ref": "#/components/schemas/FineTuneMethod"
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        },
+        "required": [
+          "created_at",
+          "error",
+          "finished_at",
+          "fine_tuned_model",
+          "hyperparameters",
+          "id",
+          "model",
+          "object",
+          "organization_id",
+          "result_files",
+          "status",
+          "trained_tokens",
+          "training_file",
+          "validation_file",
+          "seed"
+        ],
+        "x-oaiMeta": {
+          "name": "The fine-tuning job object",
+          "example": "{\n  \"object\": \"fine_tuning.job\",\n  \"id\": \"ftjob-abc123\",\n  \"model\": \"davinci-002\",\n  \"created_at\": 1692661014,\n  \"finished_at\": 1692661190,\n  \"fine_tuned_model\": \"ft:davinci-002:my-org:custom_suffix:7q8mpxmy\",\n  \"organization_id\": \"org-123\",\n  \"result_files\": [\n      \"file-abc123\"\n  ],\n  \"status\": \"succeeded\",\n  \"validation_file\": null,\n  \"training_file\": \"file-abc123\",\n  \"hyperparameters\": {\n      \"n_epochs\": 4,\n      \"batch_size\": 1,\n      \"learning_rate_multiplier\": 1.0\n  },\n  \"trained_tokens\": 5768,\n  \"integrations\": [],\n  \"seed\": 0,\n  \"estimated_finish\": 0,\n  \"method\": {\n    \"type\": \"supervised\",\n    \"supervised\": {\n      \"hyperparameters\": {\n        \"n_epochs\": 4,\n        \"batch_size\": 1,\n        \"learning_rate_multiplier\": 1.0\n      }\n    }\n  },\n  \"metadata\": {\n    \"key\": \"value\"\n  }\n}\n"
+        }
+      },
+      "FineTuningJobCheckpoint": {
+        "type": "object",
+        "title": "FineTuningJobCheckpoint",
+        "description": "The `fine_tuning.job.checkpoint` object represents a model checkpoint for a fine-tuning job that is ready to use.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The checkpoint identifier, which can be referenced in the API endpoints."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the checkpoint was created."
+          },
+          "fine_tuned_model_checkpoint": {
+            "type": "string",
+            "description": "The name of the fine-tuned checkpoint model that is created."
+          },
+          "step_number": {
+            "type": "integer",
+            "description": "The step number that the checkpoint was created at."
+          },
+          "metrics": {
+            "type": "object",
+            "description": "Metrics at the step number during the fine-tuning job.",
+            "properties": {
+              "step": {
+                "type": "number"
+              },
+              "train_loss": {
+                "type": "number"
+              },
+              "train_mean_token_accuracy": {
+                "type": "number"
+              },
+              "valid_loss": {
+                "type": "number"
+              },
+              "valid_mean_token_accuracy": {
+                "type": "number"
+              },
+              "full_valid_loss": {
+                "type": "number"
+              },
+              "full_valid_mean_token_accuracy": {
+                "type": "number"
+              }
+            }
+          },
+          "fine_tuning_job_id": {
+            "type": "string",
+            "description": "The name of the fine-tuning job that this checkpoint was created from."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"fine_tuning.job.checkpoint\".",
+            "enum": [
+              "fine_tuning.job.checkpoint"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "created_at",
+          "fine_tuning_job_id",
+          "fine_tuned_model_checkpoint",
+          "id",
+          "metrics",
+          "object",
+          "step_number"
+        ],
+        "x-oaiMeta": {
+          "name": "The fine-tuning job checkpoint object",
+          "example": "{\n  \"object\": \"fine_tuning.job.checkpoint\",\n  \"id\": \"ftckpt_qtZ5Gyk4BLq1SfLFWp3RtO3P\",\n  \"created_at\": 1712211699,\n  \"fine_tuned_model_checkpoint\": \"ft:gpt-4o-mini-2024-07-18:my-org:custom_suffix:9ABel2dg:ckpt-step-88\",\n  \"fine_tuning_job_id\": \"ftjob-fpbNQ3H1GrMehXRf8cO97xTN\",\n  \"metrics\": {\n    \"step\": 88,\n    \"train_loss\": 0.478,\n    \"train_mean_token_accuracy\": 0.924,\n    \"valid_loss\": 10.112,\n    \"valid_mean_token_accuracy\": 0.145,\n    \"full_valid_loss\": 0.567,\n    \"full_valid_mean_token_accuracy\": 0.944\n  },\n  \"step_number\": 88\n}\n"
+        }
+      },
+      "FineTuningJobEvent": {
+        "type": "object",
+        "description": "Fine-tuning job event object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"fine_tuning.job.event\".",
+            "enum": [
+              "fine_tuning.job.event"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The object identifier."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the fine-tuning job was created."
+          },
+          "level": {
+            "type": "string",
+            "description": "The log level of the event.",
+            "enum": [
+              "info",
+              "warn",
+              "error"
+            ]
+          },
+          "message": {
+            "type": "string",
+            "description": "The message of the event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of event.",
+            "enum": [
+              "message",
+              "metrics"
+            ]
+          },
+          "data": {
+            "type": "object",
+            "description": "The data associated with the event."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "level",
+          "message"
+        ],
+        "x-oaiMeta": {
+          "name": "The fine-tuning job event object",
+          "example": "{\n  \"object\": \"fine_tuning.job.event\",\n  \"id\": \"ftevent-abc123\"\n  \"created_at\": 1677610602,\n  \"level\": \"info\",\n  \"message\": \"Created fine-tuning job\",\n  \"data\": {},\n  \"type\": \"message\"\n}\n"
+        }
+      },
+      "FunctionAndCustomToolCallOutput": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/InputImageContent"
+          },
+          {
+            "$ref": "#/components/schemas/InputFileContent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "FunctionObject": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string",
+            "description": "A description of what the function does, used by the model to choose when and how to call the function."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to be called. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64."
+          },
+          "parameters": {
+            "$ref": "#/components/schemas/FunctionParameters"
+          },
+          "strict": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "default": false,
+                "description": "Whether to enable strict schema adherence when generating the function call. If set to true, the model will follow the exact schema defined in the `parameters` field. Only a subset of JSON Schema is supported when `strict` is `true`. Learn more about Structured Outputs in the [function calling guide](https://developers.openai.com/api/docs/guides/function-calling)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "FunctionParameters": {
+        "type": "object",
+        "description": "The parameters the functions accepts, described as a JSON Schema object. See the [guide](https://developers.openai.com/api/docs/guides/function-calling) for examples, and the [JSON Schema reference](https://json-schema.org/understanding-json-schema/) for documentation about the format.\n\nOmitting `parameters` defines a function with an empty parameter list.",
+        "additionalProperties": true
+      },
+      "FunctionToolCall": {
+        "type": "object",
+        "title": "Function tool call",
+        "description": "A tool call to run a function. See the\n[function calling guide](https://developers.openai.com/api/docs/guides/function-calling) for more information.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the function tool call.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call"
+            ],
+            "description": "The type of the function tool call. Always `function_call`.\n",
+            "x-stainless-const": true
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the function tool call generated by the model.\n"
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCaller"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "namespace": {
+            "type": "string",
+            "description": "The namespace of the function to run.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to run.\n"
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string of the arguments to pass to the function.\n"
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          },
+          "async": {
+            "type": "boolean",
+            "description": "Whether the function tool call runs asynchronously.\n"
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "name",
+          "arguments"
+        ]
+      },
+      "FunctionToolCallOutput": {
+        "type": "object",
+        "title": "Function tool call output",
+        "description": "The output of a function tool call.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the function tool call output. Populated when this item\nis returned via API.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call_output"
+            ],
+            "description": "The type of the function tool call output. Always `function_call_output`.\n",
+            "x-stainless-const": true
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the function tool call generated by the model.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the tool that produced the output.\n"
+          },
+          "namespace": {
+            "type": "string",
+            "description": "The namespace of the tool that produced the output.\n"
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCallerParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output": {
+            "description": "The output from the function call generated by your code.\nCan be a string or an list of output content.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "A string of the output of the function call.\n",
+                "title": "string output"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/FunctionAndCustomToolCallOutput"
+                },
+                "title": "output content list",
+                "description": "Text, image, or file output of the function call.\n"
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "output"
+        ]
+      },
+      "FunctionToolCallOutputResource": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/FunctionToolCallOutput"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the function call tool output.\n"
+              },
+              "status": {
+                "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+                "$ref": "#/components/schemas/FunctionCallOutputStatusEnum"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "FunctionToolCallResource": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/FunctionToolCall"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the function tool call.\n"
+              },
+              "status": {
+                "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+                "$ref": "#/components/schemas/FunctionCallStatus"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "GraderLabelModel": {
+        "type": "object",
+        "title": "LabelModelGrader",
+        "description": "A LabelModelGrader object which uses a model to assign labels to each item\nin the evaluation.\n",
+        "properties": {
+          "type": {
+            "description": "The object type, which is always `label_model`.",
+            "type": "string",
+            "enum": [
+              "label_model"
+            ],
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the grader."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model to use for the evaluation. Must support structured outputs."
+          },
+          "input": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EvalItem"
+            }
+          },
+          "labels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "The labels to assign to each item in the evaluation."
+          },
+          "passing_labels": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "The labels that indicate a passing result. Must be a subset of labels."
+          }
+        },
+        "required": [
+          "type",
+          "model",
+          "input",
+          "passing_labels",
+          "labels",
+          "name"
+        ],
+        "x-oaiMeta": {
+          "name": "Label Model Grader",
+          "group": "graders",
+          "example": "{\n  \"name\": \"First label grader\",\n  \"type\": \"label_model\",\n  \"model\": \"gpt-4o-2024-08-06\",\n  \"input\": [\n    {\n      \"type\": \"message\",\n      \"role\": \"system\",\n      \"content\": {\n        \"type\": \"input_text\",\n        \"text\": \"Classify the sentiment of the following statement as one of positive, neutral, or negative\"\n      }\n    },\n    {\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": {\n        \"type\": \"input_text\",\n        \"text\": \"Statement: {{item.response}}\"\n      }\n    }\n  ],\n  \"passing_labels\": [\n    \"positive\"\n  ],\n  \"labels\": [\n    \"positive\",\n    \"neutral\",\n    \"negative\"\n  ]\n}\n"
+        }
+      },
+      "GraderMulti": {
+        "type": "object",
+        "title": "MultiGrader",
+        "description": "A MultiGrader object combines the output of multiple graders to produce a single score.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "multi"
+            ],
+            "default": "multi",
+            "description": "The object type, which is always `multi`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the grader."
+          },
+          "graders": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/GraderStringCheck"
+              },
+              {
+                "$ref": "#/components/schemas/GraderTextSimilarity"
+              },
+              {
+                "$ref": "#/components/schemas/GraderPython"
+              },
+              {
+                "$ref": "#/components/schemas/GraderScoreModel"
+              },
+              {
+                "$ref": "#/components/schemas/GraderLabelModel"
+              }
+            ]
+          },
+          "calculate_output": {
+            "type": "string",
+            "description": "A formula to calculate the output based on grader results."
+          }
+        },
+        "required": [
+          "name",
+          "type",
+          "graders",
+          "calculate_output"
+        ],
+        "x-oaiMeta": {
+          "name": "Multi Grader",
+          "group": "graders",
+          "example": "{\n  \"type\": \"multi\",\n  \"name\": \"example multi grader\",\n  \"graders\": [\n    {\n      \"type\": \"text_similarity\",\n      \"name\": \"example text similarity grader\",\n      \"input\": \"The graded text\",\n      \"reference\": \"The reference text\",\n      \"evaluation_metric\": \"fuzzy_match\"\n    },\n    {\n      \"type\": \"string_check\",\n      \"name\": \"Example string check grader\",\n      \"input\": \"{{sample.output_text}}\",\n      \"reference\": \"{{item.label}}\",\n      \"operation\": \"eq\"\n    }\n  ],\n  \"calculate_output\": \"0.5 * text_similarity_score +  0.5 * string_check_score)\"\n}\n"
+        }
+      },
+      "GraderPython": {
+        "type": "object",
+        "title": "PythonGrader",
+        "description": "A PythonGrader object that runs a python script on the input.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "python"
+            ],
+            "description": "The object type, which is always `python`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the grader."
+          },
+          "source": {
+            "type": "string",
+            "description": "The source code of the python script."
+          },
+          "image_tag": {
+            "type": "string",
+            "description": "The image tag to use for the python script."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "source"
+        ],
+        "x-oaiMeta": {
+          "name": "Python Grader",
+          "group": "graders",
+          "example": "{\n  \"type\": \"python\",\n  \"name\": \"Example python grader\",\n  \"image_tag\": \"2025-05-08\",\n  \"source\": \"\"\"\ndef grade(sample: dict, item: dict) -> float:\n    \\\"\"\"\n    Returns 1.0 if `output_text` equals `label`, otherwise 0.0.\n    \\\"\"\"\n    output = sample.get(\"output_text\")\n    label = item.get(\"label\")\n    return 1.0 if output == label else 0.0\n\"\"\",\n}\n"
+        }
+      },
+      "GraderScoreModel": {
+        "type": "object",
+        "title": "ScoreModelGrader",
+        "description": "A ScoreModelGrader object that uses a model to assign a score to the input.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "score_model"
+            ],
+            "description": "The object type, which is always `score_model`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the grader."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model to use for the evaluation."
+          },
+          "sampling_params": {
+            "type": "object",
+            "description": "The sampling parameters for the model.",
+            "properties": {
+              "seed": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "description": "A seed value to initialize the randomness, during sampling.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "top_p": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "default": 1,
+                    "example": 1,
+                    "description": "An alternative to temperature for nucleus sampling; 1.0 includes all tokens.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "temperature": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "description": "A higher temperature increases randomness in the outputs.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "max_completions_tokens": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "minimum": 1,
+                    "description": "The maximum number of tokens the grader model may generate in its response.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "reasoning_effort": {
+                "$ref": "#/components/schemas/ReasoningEffort"
+              }
+            }
+          },
+          "input": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EvalItem"
+            },
+            "description": "The input messages evaluated by the grader. Supports text, output text, input image, and input audio content blocks, and may include template strings.\n"
+          },
+          "range": {
+            "type": "array",
+            "items": {
+              "type": "number",
+              "min_items": 2,
+              "max_items": 2
+            },
+            "description": "The range of the score. Defaults to `[0, 1]`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "input",
+          "model"
+        ],
+        "x-oaiMeta": {
+          "name": "Score Model Grader",
+          "group": "graders",
+          "example": "{\n    \"type\": \"score_model\",\n    \"name\": \"Example score model grader\",\n    \"input\": [\n        {\n            \"role\": \"user\",\n            \"content\": [\n                {\n                    \"type\": \"input_text\",\n                    \"text\": (\n                        \"Score how close the reference answer is to the model answer. Score 1.0 if they are the same and 0.0 if they are different.\"\n                        \" Return just a floating point score\\n\\n\"\n                        \" Reference answer: {{item.label}}\\n\\n\"\n                        \" Model answer: {{sample.output_text}}\"\n                    )\n                },\n                {\n                    \"type\": \"input_image\",\n                    \"image_url\": \"https://example.com/reference.png\",\n                    \"file_id\": null,\n                    \"detail\": \"auto\"\n                }\n            ],\n        }\n    ],\n    \"model\": \"gpt-5-mini\",\n    \"sampling_params\": {\n        \"temperature\": 1,\n        \"top_p\": 1,\n        \"seed\": 42,\n        \"max_completions_tokens\": 32768,\n        \"reasoning_effort\": \"medium\"\n    },\n}\n"
+        }
+      },
+      "GraderStringCheck": {
+        "type": "object",
+        "title": "StringCheckGrader",
+        "description": "A StringCheckGrader object that performs a string comparison between input and reference using a specified operation.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "string_check"
+            ],
+            "description": "The object type, which is always `string_check`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the grader."
+          },
+          "input": {
+            "type": "string",
+            "description": "The input text. This may include template strings."
+          },
+          "reference": {
+            "type": "string",
+            "description": "The reference text. This may include template strings."
+          },
+          "operation": {
+            "type": "string",
+            "enum": [
+              "eq",
+              "ne",
+              "like",
+              "ilike"
+            ],
+            "description": "The string check operation to perform. One of `eq`, `ne`, `like`, or `ilike`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "input",
+          "reference",
+          "operation"
+        ],
+        "x-oaiMeta": {
+          "name": "String Check Grader",
+          "group": "graders",
+          "example": "{\n  \"type\": \"string_check\",\n  \"name\": \"Example string check grader\",\n  \"input\": \"{{sample.output_text}}\",\n  \"reference\": \"{{item.label}}\",\n  \"operation\": \"eq\"\n}\n"
+        }
+      },
+      "GraderTextSimilarity": {
+        "type": "object",
+        "title": "TextSimilarityGrader",
+        "description": "A TextSimilarityGrader object which grades text based on similarity metrics.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text_similarity"
+            ],
+            "default": "text_similarity",
+            "description": "The type of grader.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the grader."
+          },
+          "input": {
+            "type": "string",
+            "description": "The text being graded."
+          },
+          "reference": {
+            "type": "string",
+            "description": "The text being graded against."
+          },
+          "evaluation_metric": {
+            "type": "string",
+            "enum": [
+              "cosine",
+              "fuzzy_match",
+              "bleu",
+              "gleu",
+              "meteor",
+              "rouge_1",
+              "rouge_2",
+              "rouge_3",
+              "rouge_4",
+              "rouge_5",
+              "rouge_l"
+            ],
+            "description": "The evaluation metric to use. One of `cosine`, `fuzzy_match`, `bleu`, \n`gleu`, `meteor`, `rouge_1`, `rouge_2`, `rouge_3`, `rouge_4`, `rouge_5`, \nor `rouge_l`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "input",
+          "reference",
+          "evaluation_metric"
+        ],
+        "x-oaiMeta": {
+          "name": "Text Similarity Grader",
+          "group": "graders",
+          "example": "{\n  \"type\": \"text_similarity\",\n  \"name\": \"Example text similarity grader\",\n  \"input\": \"{{sample.output_text}}\",\n  \"reference\": \"{{item.label}}\",\n  \"evaluation_metric\": \"fuzzy_match\"\n}\n"
+        }
+      },
+      "Group": {
+        "type": "object",
+        "description": "Summary information about a group returned in role assignment responses.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "group"
+            ],
+            "description": "Always `group`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Identifier for the group."
+          },
+          "name": {
+            "type": "string",
+            "description": "Display name of the group."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the group was created."
+          },
+          "scim_managed": {
+            "type": "boolean",
+            "description": "Whether the group is managed through SCIM."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "created_at",
+          "scim_managed"
+        ],
+        "x-oaiMeta": {
+          "name": "The group object",
+          "example": "{\n    \"object\": \"group\",\n    \"id\": \"group_01J1F8ABCDXYZ\",\n    \"name\": \"Support Team\",\n    \"created_at\": 1711471533,\n    \"scim_managed\": false\n}\n"
+        }
+      },
+      "GroupDeletedResource": {
+        "type": "object",
+        "description": "Confirmation payload returned after deleting a group.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "group.deleted"
+            ],
+            "description": "Always `group.deleted`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Identifier of the deleted group."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the group was deleted."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "deleted"
+        ],
+        "x-oaiMeta": {
+          "example": "{\n    \"object\": \"group.deleted\",\n    \"id\": \"group_01J1F8ABCDXYZ\",\n    \"deleted\": true\n}\n"
+        }
+      },
+      "GroupListResource": {
+        "type": "object",
+        "description": "Paginated list of organization groups.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "Always `list`.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "Groups returned in the current page.",
+            "items": {
+              "$ref": "#/components/schemas/GroupResponse"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether additional groups are available when paginating."
+          },
+          "next": {
+            "description": "Cursor to fetch the next page of results, or `null` if there are no more results.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "next"
+        ],
+        "x-oaiMeta": {
+          "name": "Group list",
+          "example": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"group_01J1F8ABCDXYZ\",\n            \"name\": \"Support Team\",\n            \"created_at\": 1711471533,\n            \"is_scim_managed\": false\n        },\n        {\n            \"id\": \"group_01J1F8PQRMNO\",\n            \"name\": \"Sales\",\n            \"created_at\": 1711472599,\n            \"is_scim_managed\": true\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+        }
+      },
+      "GroupMemberUser": {
+        "type": "object",
+        "description": "Details about a user returned from an organization group membership lookup.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier for the user."
+          },
+          "name": {
+            "type": "string",
+            "description": "Display name of the user."
+          },
+          "email": {
+            "description": "Email address of the user, or `null` for users without an email.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "picture": {
+            "description": "URL of the user's profile picture, if available.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "is_service_account": {
+            "description": "Whether the user is a service account.",
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_type": {
+            "type": "string",
+            "enum": [
+              "user",
+              "tenant_user"
+            ],
+            "description": "The type of user."
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "email",
+          "picture",
+          "is_service_account",
+          "user_type"
+        ],
+        "x-oaiMeta": {
+          "name": "The group member user object",
+          "example": "{\n    \"id\": \"user_abc123\",\n    \"name\": \"Ada Lovelace\",\n    \"email\": \"ada@example.com\",\n    \"picture\": null,\n    \"is_service_account\": false,\n    \"user_type\": \"user\"\n}\n"
+        }
+      },
+      "GroupResourceWithSuccess": {
+        "type": "object",
+        "description": "Response returned after updating a group.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier for the group."
+          },
+          "name": {
+            "type": "string",
+            "description": "Updated display name for the group."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the group was created."
+          },
+          "is_scim_managed": {
+            "type": "boolean",
+            "description": "Whether the group is managed through SCIM and controlled by your identity provider."
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "created_at",
+          "is_scim_managed"
+        ],
+        "x-oaiMeta": {
+          "example": "{\n    \"id\": \"group_01J1F8ABCDXYZ\",\n    \"name\": \"Escalations\",\n    \"created_at\": 1711471533,\n    \"is_scim_managed\": false\n}\n"
+        }
+      },
+      "GroupResponse": {
+        "type": "object",
+        "description": "Details about an organization group.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier for the group."
+          },
+          "name": {
+            "type": "string",
+            "description": "Display name of the group."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the group was created."
+          },
+          "is_scim_managed": {
+            "type": "boolean",
+            "description": "Whether the group is managed through SCIM and controlled by your identity provider."
+          },
+          "group_type": {
+            "type": "string",
+            "enum": [
+              "group",
+              "tenant_group"
+            ],
+            "description": "The type of the group."
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "created_at",
+          "is_scim_managed",
+          "group_type"
+        ],
+        "x-oaiMeta": {
+          "name": "Group",
+          "example": "{\n    \"id\": \"group_01J1F8ABCDXYZ\",\n    \"name\": \"Support Team\",\n    \"created_at\": 1711471533,\n    \"is_scim_managed\": false,\n    \"group_type\": \"group\"\n}\n"
+        }
+      },
+      "GroupRoleAssignment": {
+        "type": "object",
+        "description": "Role assignment linking a group to a role.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "group.role"
+            ],
+            "description": "Always `group.role`.",
+            "x-stainless-const": true
+          },
+          "group": {
+            "$ref": "#/components/schemas/Group"
+          },
+          "role": {
+            "$ref": "#/components/schemas/Role"
+          }
+        },
+        "required": [
+          "object",
+          "group",
+          "role"
+        ],
+        "x-oaiMeta": {
+          "name": "The group role object",
+          "example": "{\n    \"object\": \"group.role\",\n    \"group\": {\n        \"object\": \"group\",\n        \"id\": \"group_01J1F8ABCDXYZ\",\n        \"name\": \"Support Team\",\n        \"created_at\": 1711471533,\n        \"scim_managed\": false\n    },\n    \"role\": {\n        \"object\": \"role\",\n        \"id\": \"role_01J1F8ROLE01\",\n        \"name\": \"API Group Manager\",\n        \"description\": \"Allows managing organization groups\",\n        \"permissions\": [\n            \"api.groups.read\",\n            \"api.groups.write\"\n        ],\n        \"resource_type\": \"api.organization\",\n        \"predefined_role\": false\n    }\n}\n"
+        }
+      },
+      "GroupUser": {
+        "type": "object",
+        "description": "Represents an individual user returned when inspecting group membership.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the user."
+          },
+          "email": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The email address of the user."
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "email"
+        ]
+      },
+      "GroupUserAssignment": {
+        "type": "object",
+        "description": "Confirmation payload returned after adding a user to a group.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "group.user"
+            ],
+            "description": "Always `group.user`.",
+            "x-stainless-const": true
+          },
+          "user_id": {
+            "type": "string",
+            "description": "Identifier of the user that was added."
+          },
+          "group_id": {
+            "type": "string",
+            "description": "Identifier of the group the user was added to."
+          }
+        },
+        "required": [
+          "object",
+          "user_id",
+          "group_id"
+        ],
+        "x-oaiMeta": {
+          "name": "The group user object",
+          "example": "{\n    \"object\": \"group.user\",\n    \"user_id\": \"user_abc123\",\n    \"group_id\": \"group_01J1F8ABCDXYZ\"\n}\n"
+        }
+      },
+      "GroupUserDeletedResource": {
+        "type": "object",
+        "description": "Confirmation payload returned after removing a user from a group.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "group.user.deleted"
+            ],
+            "description": "Always `group.user.deleted`.",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the group membership was removed."
+          }
+        },
+        "required": [
+          "object",
+          "deleted"
+        ],
+        "x-oaiMeta": {
+          "name": "Group user deletion confirmation",
+          "example": "{\n    \"object\": \"group.user.deleted\",\n    \"deleted\": true\n}\n"
+        }
+      },
+      "HostedToolPermission": {
+        "type": "object",
+        "description": "Permission state for a single hosted tool on a project.",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether the hosted tool is enabled for the project."
+          }
+        },
+        "required": [
+          "enabled"
+        ]
+      },
+      "HostedToolPermissionUpdate": {
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether to enable the hosted tool for the project."
+          }
+        },
+        "required": [
+          "enabled"
+        ]
+      },
+      "Image": {
+        "type": "object",
+        "description": "Represents the content or the URL of an image generated by the OpenAI API.",
+        "properties": {
+          "b64_json": {
+            "type": "string",
+            "description": "The base64-encoded JSON of the generated image. Returned by default for the GPT image models, and only present if `response_format` is set to `b64_json` for `dall-e-2` and `dall-e-3`."
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "When using `dall-e-2` or `dall-e-3`, the URL of the generated image if `response_format` is set to `url` (default value). Unsupported for the GPT image models."
+          },
+          "revised_prompt": {
+            "type": "string",
+            "description": "For `dall-e-3` only, the revised prompt that was used to generate the image."
+          }
+        }
+      },
+      "ImageEditCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when image editing has completed and the final image is available.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `image_edit.completed`.\n",
+            "enum": [
+              "image_edit.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "b64_json": {
+            "type": "string",
+            "description": "Base64-encoded final edited image data, suitable for rendering as an image.\n"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp when the event was created.\n"
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "1024x1024",
+                  "1024x1536",
+                  "1536x1024",
+                  "auto"
+                ]
+              }
+            ],
+            "description": "The image dimensions as a `WIDTHxHEIGHT` string, for example `1536x864`."
+          },
+          "quality": {
+            "type": "string",
+            "description": "The quality setting for the edited image.\n",
+            "enum": [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max",
+              "auto"
+            ]
+          },
+          "background": {
+            "type": "string",
+            "description": "The background setting for the edited image.\n",
+            "enum": [
+              "transparent",
+              "opaque",
+              "auto"
+            ]
+          },
+          "output_format": {
+            "type": "string",
+            "description": "The output format for the edited image.\n",
+            "enum": [
+              "png",
+              "webp",
+              "jpeg"
+            ]
+          },
+          "usage": {
+            "$ref": "#/components/schemas/ImagesUsage"
+          }
+        },
+        "required": [
+          "type",
+          "b64_json",
+          "created_at",
+          "size",
+          "quality",
+          "background",
+          "output_format",
+          "usage"
+        ],
+        "x-oaiMeta": {
+          "name": "image_edit.completed",
+          "group": "images",
+          "example": "{\n  \"type\": \"image_edit.completed\",\n  \"b64_json\": \"...\",\n  \"created_at\": 1620000000,\n  \"size\": \"1024x1024\",\n  \"quality\": \"high\",\n  \"background\": \"transparent\",\n  \"output_format\": \"png\",\n  \"usage\": {\n    \"total_tokens\": 100,\n    \"input_tokens\": 50,\n    \"output_tokens\": 50,\n    \"input_tokens_details\": {\n      \"text_tokens\": 10,\n      \"image_tokens\": 40\n    }\n  }\n}\n"
+        }
+      },
+      "ImageEditPartialImageEvent": {
+        "type": "object",
+        "description": "Emitted when a partial image is available during image editing streaming.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `image_edit.partial_image`.\n",
+            "enum": [
+              "image_edit.partial_image"
+            ],
+            "x-stainless-const": true
+          },
+          "b64_json": {
+            "type": "string",
+            "description": "Base64-encoded partial image data, suitable for rendering as an image.\n"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp when the event was created.\n"
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "1024x1024",
+                  "1024x1536",
+                  "1536x1024",
+                  "auto"
+                ]
+              }
+            ],
+            "description": "The image dimensions as a `WIDTHxHEIGHT` string, for example `1536x864`."
+          },
+          "quality": {
+            "type": "string",
+            "description": "The quality setting for the requested edited image.\n",
+            "enum": [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max",
+              "auto"
+            ]
+          },
+          "background": {
+            "type": "string",
+            "description": "The background setting for the requested edited image.\n",
+            "enum": [
+              "transparent",
+              "opaque",
+              "auto"
+            ]
+          },
+          "output_format": {
+            "type": "string",
+            "description": "The output format for the requested edited image.\n",
+            "enum": [
+              "png",
+              "webp",
+              "jpeg"
+            ]
+          },
+          "partial_image_index": {
+            "type": "integer",
+            "description": "0-based index for the partial image (streaming).\n"
+          }
+        },
+        "required": [
+          "type",
+          "b64_json",
+          "created_at",
+          "size",
+          "quality",
+          "background",
+          "output_format",
+          "partial_image_index"
+        ],
+        "x-oaiMeta": {
+          "name": "image_edit.partial_image",
+          "group": "images",
+          "example": "{\n  \"type\": \"image_edit.partial_image\",\n  \"b64_json\": \"...\",\n  \"created_at\": 1620000000,\n  \"size\": \"1024x1024\",\n  \"quality\": \"high\",\n  \"background\": \"transparent\",\n  \"output_format\": \"png\",\n  \"partial_image_index\": 0\n}\n"
+        }
+      },
+      "ImageEditStreamEvent": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ImageEditPartialImageEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ImageEditCompletedEvent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ImageGenCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when image generation has completed and the final image is available.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `image_generation.completed`.\n",
+            "enum": [
+              "image_generation.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "b64_json": {
+            "type": "string",
+            "description": "Base64-encoded image data, suitable for rendering as an image.\n"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp when the event was created.\n"
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "1024x1024",
+                  "1024x1536",
+                  "1536x1024",
+                  "auto"
+                ]
+              }
+            ],
+            "description": "The image dimensions as a `WIDTHxHEIGHT` string, for example `1536x864`."
+          },
+          "quality": {
+            "type": "string",
+            "description": "The quality setting for the generated image.\n",
+            "enum": [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max",
+              "auto"
+            ]
+          },
+          "background": {
+            "type": "string",
+            "description": "The background setting for the generated image.\n",
+            "enum": [
+              "transparent",
+              "opaque",
+              "auto"
+            ]
+          },
+          "output_format": {
+            "type": "string",
+            "description": "The output format for the generated image.\n",
+            "enum": [
+              "png",
+              "webp",
+              "jpeg"
+            ]
+          },
+          "usage": {
+            "$ref": "#/components/schemas/ImagesUsage"
+          }
+        },
+        "required": [
+          "type",
+          "b64_json",
+          "created_at",
+          "size",
+          "quality",
+          "background",
+          "output_format",
+          "usage"
+        ],
+        "x-oaiMeta": {
+          "name": "image_generation.completed",
+          "group": "images",
+          "example": "{\n  \"type\": \"image_generation.completed\",\n  \"b64_json\": \"...\",\n  \"created_at\": 1620000000,\n  \"size\": \"1024x1024\",\n  \"quality\": \"high\",\n  \"background\": \"transparent\",\n  \"output_format\": \"png\",\n  \"usage\": {\n    \"total_tokens\": 100,\n    \"input_tokens\": 50,\n    \"output_tokens\": 50,\n    \"input_tokens_details\": {\n      \"text_tokens\": 10,\n      \"image_tokens\": 40\n    }\n  }\n}\n"
+        }
+      },
+      "ImageGenPartialImageEvent": {
+        "type": "object",
+        "description": "Emitted when a partial image is available during image generation streaming.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `image_generation.partial_image`.\n",
+            "enum": [
+              "image_generation.partial_image"
+            ],
+            "x-stainless-const": true
+          },
+          "b64_json": {
+            "type": "string",
+            "description": "Base64-encoded partial image data, suitable for rendering as an image.\n"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp when the event was created.\n"
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "1024x1024",
+                  "1024x1536",
+                  "1536x1024",
+                  "auto"
+                ]
+              }
+            ],
+            "description": "The image dimensions as a `WIDTHxHEIGHT` string, for example `1536x864`."
+          },
+          "quality": {
+            "type": "string",
+            "description": "The quality setting for the requested image.\n",
+            "enum": [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max",
+              "auto"
+            ]
+          },
+          "background": {
+            "type": "string",
+            "description": "The background setting for the requested image.\n",
+            "enum": [
+              "transparent",
+              "opaque",
+              "auto"
+            ]
+          },
+          "output_format": {
+            "type": "string",
+            "description": "The output format for the requested image.\n",
+            "enum": [
+              "png",
+              "webp",
+              "jpeg"
+            ]
+          },
+          "partial_image_index": {
+            "type": "integer",
+            "description": "0-based index for the partial image (streaming).\n"
+          }
+        },
+        "required": [
+          "type",
+          "b64_json",
+          "created_at",
+          "size",
+          "quality",
+          "background",
+          "output_format",
+          "partial_image_index"
+        ],
+        "x-oaiMeta": {
+          "name": "image_generation.partial_image",
+          "group": "images",
+          "example": "{\n  \"type\": \"image_generation.partial_image\",\n  \"b64_json\": \"...\",\n  \"created_at\": 1620000000,\n  \"size\": \"1024x1024\",\n  \"quality\": \"high\",\n  \"background\": \"transparent\",\n  \"output_format\": \"png\",\n  \"partial_image_index\": 0\n}\n"
+        }
+      },
+      "ImageGenStreamEvent": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ImageGenPartialImageEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ImageGenCompletedEvent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ImageGenTool": {
+        "type": "object",
+        "title": "Image generation tool",
+        "description": "A tool that generates images using the GPT image models.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "image_generation"
+            ],
+            "description": "The type of the image generation tool. Always `image_generation`.\n",
+            "x-stainless-const": true
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-image-1",
+                  "gpt-image-1-mini",
+                  "gpt-image-1.5",
+                  "gpt-image-2",
+                  "gpt-image-2-2026-04-21",
+                  "gpt-image-2.5-sunburst",
+                  "gpt-image-2.5-sunburst-2026-09-08",
+                  "gpt-image-2.5-flare",
+                  "gpt-image-2.5-flare-2026-09-08"
+                ],
+                "description": "The image generation model to use. One of `gpt-image-1`,\n`gpt-image-1-mini`, `gpt-image-1.5`, `gpt-image-2`,\n`gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`,\n`gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`,\n`gpt-image-2.5-flare-2026-09-08`, or `chatgpt-image-latest`. Default:\n`gpt-image-1`.\n",
+                "default": "gpt-image-1"
+              }
+            ]
+          },
+          "quality": {
+            "type": "string",
+            "enum": [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max",
+              "auto"
+            ],
+            "description": "The quality of the generated image. The GPT image models support `low`,\n`medium`, and `high`. `gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`,\nincluding their `2026-09-08` snapshots, also support `xhigh` and `max`.\nDefault: `auto`.\n",
+            "default": "auto"
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "1024x1024",
+                  "1024x1536",
+                  "1536x1024",
+                  "auto"
+                ]
+              }
+            ],
+            "description": "The size of the generated images. For `gpt-image-2`, `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`, `gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, and `gpt-image-2.5-flare-2026-09-08`, arbitrary resolutions are supported as `WIDTHxHEIGHT` strings, for example `1536x864`. Width and height must both be divisible by 16 and the requested aspect ratio must be between 1:3 and 3:1. Resolutions above `2560x1440` are experimental, and the maximum supported resolution is `3840x2160`. The requested size must also satisfy the model's current pixel and edge limits. The standard sizes `1024x1024`, `1536x1024`, and `1024x1536` are supported by the GPT image models; `auto` is supported for models that allow automatic sizing. For `dall-e-2`, use one of `256x256`, `512x512`, or `1024x1024`. For `dall-e-3`, use one of `1024x1024`, `1792x1024`, or `1024x1792`.",
+            "default": "auto"
+          },
+          "output_format": {
+            "type": "string",
+            "enum": [
+              "png",
+              "webp",
+              "jpeg"
+            ],
+            "description": "The output format of the generated image. One of `png`, `webp`, or\n`jpeg`. Default: `png`.\n",
+            "default": "png"
+          },
+          "output_compression": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 100,
+            "description": "Compression level for the output image. Default: 100.\n",
+            "default": 100
+          },
+          "moderation": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "low"
+            ],
+            "description": "Moderation level for the generated image. Default: `auto`.\n",
+            "default": "auto"
+          },
+          "background": {
+            "type": "string",
+            "enum": [
+              "transparent",
+              "opaque",
+              "auto"
+            ],
+            "description": "Set the background of the generated image. One of `transparent`, `opaque`,\nor `auto`. `gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`, including\ntheir `2026-09-08` snapshots, support `opaque` and `transparent`\nbackgrounds. Transparent backgrounds are available for supported GPT Image\nmodels. For `gpt-image-2` and `gpt-image-2-2026-04-21`, this support is in\npreview. When using `transparent`, set the output format to `png` or `webp`.\nDefault: `auto`.\n",
+            "default": "auto"
+          },
+          "input_fidelity": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/InputFidelity"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "input_image_mask": {
+            "type": "object",
+            "description": "Optional mask for inpainting. Contains `image_url`\n(string, optional) and `file_id` (string, optional).\n",
+            "properties": {
+              "image_url": {
+                "type": "string",
+                "description": "Base64-encoded mask image.\n"
+              },
+              "file_id": {
+                "type": "string",
+                "description": "File ID for the mask image.\n"
+              }
+            },
+            "required": [],
+            "additionalProperties": false
+          },
+          "partial_images": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 3,
+            "description": "Number of partial images to generate in streaming mode, from 0 (default value) to 3.\n",
+            "default": 0
+          },
+          "action": {
+            "description": "Whether to generate a new image or edit an existing image. Default: `auto`.\n",
+            "$ref": "#/components/schemas/ImageGenActionEnum"
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "ImageRefParam": {
+        "type": "object",
+        "description": "Reference an input image by either URL or uploaded file ID.\nProvide exactly one of `image_url` or `file_id`.\n",
+        "properties": {
+          "image_url": {
+            "type": "string",
+            "format": "uri",
+            "maxLength": 20971520,
+            "description": "A fully qualified URL or base64-encoded data URL.",
+            "example": "https://example.com/source-image.png"
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The File API ID of an uploaded image to use as input.",
+            "example": "file-abc123"
+          }
+        },
+        "anyOf": [
+          {
+            "required": [
+              "image_url"
+            ]
+          },
+          {
+            "required": [
+              "file_id"
+            ]
+          }
+        ],
+        "not": {
+          "required": [
+            "image_url",
+            "file_id"
+          ]
+        },
+        "additionalProperties": false
+      },
+      "ImagesResponse": {
+        "type": "object",
+        "title": "Image generation response",
+        "description": "The response from the image generation endpoint.",
+        "properties": {
+          "created": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the image was created."
+          },
+          "data": {
+            "type": "array",
+            "description": "The list of generated images.",
+            "items": {
+              "$ref": "#/components/schemas/Image"
+            }
+          },
+          "background": {
+            "type": "string",
+            "description": "The background parameter used for the image generation. Either `transparent` or `opaque`.",
+            "enum": [
+              "transparent",
+              "opaque"
+            ]
+          },
+          "output_format": {
+            "type": "string",
+            "description": "The output format of the image generation. Either `png`, `webp`, or `jpeg`.",
+            "enum": [
+              "png",
+              "webp",
+              "jpeg"
+            ]
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "1024x1024",
+                  "1024x1536",
+                  "1536x1024"
+                ]
+              }
+            ],
+            "description": "The image dimensions as a `WIDTHxHEIGHT` string, for example `1536x864`."
+          },
+          "quality": {
+            "type": "string",
+            "description": "The quality of the image generated. One of `low`, `medium`, `high`, `xhigh`, or `max`.",
+            "enum": [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max"
+            ]
+          },
+          "usage": {
+            "$ref": "#/components/schemas/ImageGenUsage"
+          }
+        },
+        "required": [
+          "created"
+        ],
+        "x-oaiMeta": {
+          "name": "The image generation response",
+          "group": "images",
+          "example": "{\n  \"created\": 1713833628,\n  \"data\": [\n    {\n      \"b64_json\": \"...\"\n    }\n  ],\n  \"background\": \"transparent\",\n  \"output_format\": \"png\",\n  \"size\": \"1024x1024\",\n  \"quality\": \"high\",\n  \"usage\": {\n    \"total_tokens\": 100,\n    \"input_tokens\": 50,\n    \"output_tokens\": 50,\n    \"input_tokens_details\": {\n      \"text_tokens\": 10,\n      \"image_tokens\": 40\n    }\n  }\n}\n"
+        }
+      },
+      "ImagesUsage": {
+        "type": "object",
+        "description": "For the GPT image models only, the token usage information for the image generation.\n",
+        "required": [
+          "total_tokens",
+          "input_tokens",
+          "output_tokens",
+          "input_tokens_details"
+        ],
+        "properties": {
+          "total_tokens": {
+            "type": "integer",
+            "description": "The total number of tokens (images and text) used for the image generation.\n"
+          },
+          "input_tokens": {
+            "type": "integer",
+            "description": "The number of tokens (images and text) in the input prompt."
+          },
+          "output_tokens": {
+            "type": "integer",
+            "description": "The number of image tokens in the output image."
+          },
+          "input_tokens_details": {
+            "type": "object",
+            "description": "The input tokens detailed information for the image generation.",
+            "required": [
+              "text_tokens",
+              "image_tokens"
+            ],
+            "properties": {
+              "text_tokens": {
+                "type": "integer",
+                "description": "The number of text tokens in the input prompt."
+              },
+              "image_tokens": {
+                "type": "integer",
+                "description": "The number of image tokens in the input prompt."
+              }
+            }
+          }
+        }
+      },
+      "InputAudio": {
+        "type": "object",
+        "title": "Input audio",
+        "description": "An audio input to the model.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the input item. Always `input_audio`.\n",
+            "enum": [
+              "input_audio"
+            ],
+            "x-stainless-const": true
+          },
+          "input_audio": {
+            "type": "object",
+            "properties": {
+              "data": {
+                "type": "string",
+                "description": "Base64-encoded audio data.\n"
+              },
+              "format": {
+                "type": "string",
+                "description": "The format of the audio data. Currently supported formats are `mp3` and\n`wav`.\n",
+                "enum": [
+                  "mp3",
+                  "wav"
+                ]
+              }
+            },
+            "required": [
+              "data",
+              "format"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "input_audio"
+        ]
+      },
+      "InputContent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/InputImageContent"
+          },
+          {
+            "$ref": "#/components/schemas/InputFileContent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "InputItem": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/EasyInputMessage"
+          },
+          {
+            "type": "object",
+            "title": "Item",
+            "description": "An item representing part of the context for the response to be\ngenerated by the model. Can contain text, images, and audio inputs,\nas well as previous assistant responses and tool call outputs.\n",
+            "$ref": "#/components/schemas/Item"
+          },
+          {
+            "$ref": "#/components/schemas/CompactionTriggerItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ItemReferenceParam"
+          },
+          {
+            "$ref": "#/components/schemas/ProgramItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ProgramOutputItemParam"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "InputMessage": {
+        "type": "object",
+        "title": "Input message",
+        "description": "A message input to the model with a role indicating instruction following\nhierarchy. Instructions given with the `developer` or `system` role take\nprecedence over instructions given with the `user` role.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the message input. Always set to `message`.\n",
+            "enum": [
+              "message"
+            ],
+            "x-stainless-const": true
+          },
+          "role": {
+            "type": "string",
+            "description": "The role of the message input. One of `user`, `system`, or `developer`.\n",
+            "enum": [
+              "user",
+              "system",
+              "developer"
+            ]
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          },
+          "content": {
+            "$ref": "#/components/schemas/InputMessageContentList"
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ]
+      },
+      "InputMessageContentList": {
+        "type": "array",
+        "title": "Input item content list",
+        "description": "A list of one or many input items to the model, containing different content \ntypes.\n",
+        "items": {
+          "$ref": "#/components/schemas/InputContent"
+        }
+      },
+      "InputMessageResource": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/InputMessage"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the message input.\n"
+              }
+            },
+            "required": [
+              "id",
+              "type"
+            ]
+          }
+        ]
+      },
+      "InputParam": {
+        "description": "Text, image, or file inputs to the model, used to generate a response.\n\nLearn more:\n- [Text inputs and outputs](https://developers.openai.com/api/docs/guides/text)\n- [Image inputs](https://developers.openai.com/api/docs/guides/images-vision)\n- [File inputs](https://developers.openai.com/api/docs/guides/file-inputs)\n- [Conversation state](https://developers.openai.com/api/docs/guides/conversation-state)\n- [Function calling](https://developers.openai.com/api/docs/guides/function-calling)\n",
+        "oneOf": [
+          {
+            "type": "string",
+            "title": "Text input",
+            "description": "A text input to the model, equivalent to a text input with the\n`user` role.\n"
+          },
+          {
+            "type": "array",
+            "title": "Input item list",
+            "description": "A list of one or many input items to the model, containing\ndifferent content types.\n",
+            "items": {
+              "$ref": "#/components/schemas/InputItem"
+            }
+          }
+        ]
+      },
+      "Invite": {
+        "type": "object",
+        "description": "Represents an individual `invite` to the organization.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.invite"
+            ],
+            "description": "The object type, which is always `organization.invite`",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "email": {
+            "type": "string",
+            "description": "The email address of the individual to whom the invite was sent"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "owner",
+              "reader"
+            ],
+            "description": "`owner` or `reader`"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "accepted",
+              "expired",
+              "pending"
+            ],
+            "description": "`accepted`,`expired`, or `pending`"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the invite was sent."
+          },
+          "expires_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The Unix timestamp (in seconds) of when the invite expires."
+          },
+          "accepted_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The Unix timestamp (in seconds) of when the invite was accepted."
+          },
+          "projects": {
+            "type": "array",
+            "description": "The projects that were granted membership upon acceptance of the invite.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string",
+                  "description": "Project's public ID"
+                },
+                "role": {
+                  "type": "string",
+                  "enum": [
+                    "member",
+                    "owner"
+                  ],
+                  "description": "Project membership role"
+                }
+              },
+              "required": [
+                "id",
+                "role"
+              ]
+            }
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "email",
+          "role",
+          "status",
+          "created_at",
+          "projects"
+        ],
+        "x-oaiMeta": {
+          "name": "The invite object",
+          "example": "{\n  \"object\": \"organization.invite\",\n  \"id\": \"invite-abc\",\n  \"email\": \"user@example.com\",\n  \"role\": \"owner\",\n  \"status\": \"accepted\",\n  \"created_at\": 1711471533,\n  \"expires_at\": 1711471533,\n  \"accepted_at\": 1711471533,\n  \"projects\": [\n    {\n      \"id\": \"project-xyz\",\n      \"role\": \"member\"\n    }\n  ]\n}\n"
+        }
+      },
+      "InviteDeleteResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.invite.deleted"
+            ],
+            "description": "The object type, which is always `organization.invite.deleted`",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "deleted"
+        ]
+      },
+      "InviteListResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The object type, which is always `list`",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Invite"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The first `invite_id` in the retrieved `list`"
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The last `invite_id` in the retrieved `list`"
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "The `has_more` property is used for pagination to indicate there are additional results."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "InviteProjectGroupBody": {
+        "type": "object",
+        "description": "Request payload for granting a group access to a project.",
+        "properties": {
+          "group_id": {
+            "type": "string",
+            "description": "Identifier of the group to add to the project."
+          },
+          "role": {
+            "type": "string",
+            "description": "Identifier of the project role to grant to the group."
+          }
+        },
+        "required": [
+          "group_id",
+          "role"
+        ],
+        "x-oaiMeta": {
+          "example": "{\n    \"group_id\": \"group_01J1F8ABCDXYZ\",\n    \"role\": \"role_01J1F8PROJ\"\n}\n"
+        }
+      },
+      "InviteRequest": {
+        "type": "object",
+        "properties": {
+          "email": {
+            "type": "string",
+            "description": "Send an email to this address"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "reader",
+              "owner"
+            ],
+            "description": "`owner` or `reader`"
+          },
+          "projects": {
+            "type": "array",
+            "description": "An array of projects to which membership is granted at the same time the org invite is accepted. If omitted, the user will be invited to the default project for compatibility with legacy behavior. If empty list is passed, the user will not be invited to any projects, including the default one.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "string",
+                  "description": "Project's public ID"
+                },
+                "role": {
+                  "type": "string",
+                  "enum": [
+                    "member",
+                    "owner"
+                  ],
+                  "description": "Project membership role"
+                }
+              },
+              "required": [
+                "id",
+                "role"
+              ]
+            }
+          }
+        },
+        "required": [
+          "email",
+          "role"
+        ]
+      },
+      "Item": {
+        "type": "object",
+        "description": "Content item used to generate a response.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/OutputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/FileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchCallItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/AdditionalToolsItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseConfigurationUpdateItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/CompactionSummaryItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCallItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCallItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/MCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalResponse"
+          },
+          {
+            "$ref": "#/components/schemas/MCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCall"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ItemResource": {
+        "description": "Content item used to generate a response.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InputMessageResource"
+          },
+          {
+            "$ref": "#/components/schemas/OutputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/FileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCallResource"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchCall"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchOutput"
+          },
+          {
+            "$ref": "#/components/schemas/AdditionalTools"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseConfigurationUpdate"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/Program"
+          },
+          {
+            "$ref": "#/components/schemas/ProgramOutput"
+          },
+          {
+            "$ref": "#/components/schemas/CompactionBody"
+          },
+          {
+            "$ref": "#/components/schemas/ImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/MCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalResponseResource"
+          },
+          {
+            "$ref": "#/components/schemas/MCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCallResource"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCallOutputResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ListAssistantsResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "example": "list"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AssistantObject"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "asst_abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "asst_abc456"
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "x-oaiMeta": {
+          "name": "List assistants response object",
+          "group": "chat",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"asst_abc123\",\n      \"object\": \"assistant\",\n      \"created_at\": 1698982736,\n      \"name\": \"Coding Tutor\",\n      \"description\": null,\n      \"model\": \"gpt-5\",\n      \"instructions\": \"You are a helpful assistant designed to make me better at coding!\",\n      \"tools\": [],\n      \"tool_resources\": {},\n      \"metadata\": {},\n      \"top_p\": 1.0,\n      \"temperature\": 1.0,\n      \"response_format\": \"auto\"\n    },\n    {\n      \"id\": \"asst_abc456\",\n      \"object\": \"assistant\",\n      \"created_at\": 1698982718,\n      \"name\": \"My Assistant\",\n      \"description\": null,\n      \"model\": \"gpt-5\",\n      \"instructions\": \"You are a helpful assistant designed to make me better at coding!\",\n      \"tools\": [],\n      \"tool_resources\": {},\n      \"metadata\": {},\n      \"top_p\": 1.0,\n      \"temperature\": 1.0,\n      \"response_format\": \"auto\"\n    },\n    {\n      \"id\": \"asst_abc789\",\n      \"object\": \"assistant\",\n      \"created_at\": 1698982643,\n      \"name\": null,\n      \"description\": null,\n      \"model\": \"gpt-5\",\n      \"instructions\": null,\n      \"tools\": [],\n      \"tool_resources\": {},\n      \"metadata\": {},\n      \"top_p\": 1.0,\n      \"temperature\": 1.0,\n      \"response_format\": \"auto\"\n    }\n  ],\n  \"first_id\": \"asst_abc123\",\n  \"last_id\": \"asst_abc789\",\n  \"has_more\": false\n}\n"
+        }
+      },
+      "ListAuditLogsResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AuditLog"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "audit_log-defb456h8dks"
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "audit_log-hnbkd8s93s"
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ListBatchesResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Batch"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "batch_abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "batch_abc456"
+          },
+          "has_more": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ListCertificatesResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OrganizationCertificate"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "cert_abc"
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "cert_abc"
+          },
+          "has_more": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "first_id",
+          "last_id"
+        ]
+      },
+      "ListFilesResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "example": "list"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OpenAIFile"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "file-abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "file-abc456"
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ListFineTuningCheckpointPermissionResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FineTuningCheckpointPermission"
+            }
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ListFineTuningJobCheckpointsResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FineTuningJobCheckpoint"
+            }
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ListFineTuningJobEventsResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FineTuningJobEvent"
+            }
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ListMessagesResponse": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "example": "list"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MessageObject"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "msg_abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "msg_abc123"
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ListModelsResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Model"
+            }
+          }
+        },
+        "required": [
+          "object",
+          "data"
+        ]
+      },
+      "ListPaginatedFineTuningJobsResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FineTuningJob"
+            }
+          },
+          "has_more": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ListProjectCertificatesResponse": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OrganizationProjectCertificate"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "cert_abc"
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "example": "cert_abc"
+          },
+          "has_more": {
+            "type": "boolean"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "first_id",
+          "last_id"
+        ]
+      },
+      "ListRunStepsResponse": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "example": "list"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/RunStepObject"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "step_abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "step_abc456"
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ListRunsResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "example": "list"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/RunObject"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "run_abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "run_abc456"
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ListVectorStoreFilesResponse": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "example": "list"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VectorStoreFileObject"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "file-abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "file-abc456"
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ListVectorStoresResponse": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "example": "list"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VectorStoreObject"
+            }
+          },
+          "first_id": {
+            "type": "string",
+            "example": "vs_abc123"
+          },
+          "last_id": {
+            "type": "string",
+            "example": "vs_abc456"
+          },
+          "has_more": {
+            "type": "boolean",
+            "example": false
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "LiveCallAcceptRequest": {
+        "type": "object",
+        "description": "Accept an incoming SIP call with Live startup configuration.",
+        "properties": {
+          "session": {
+            "$ref": "#/components/schemas/LiveCallAcceptSession",
+            "description": "Model and startup configuration for the Live session that answers the incoming SIP call."
+          }
+        },
+        "required": [
+          "session"
+        ],
+        "additionalProperties": false
+      },
+      "LiveCallAcceptSession": {
+        "type": "object",
+        "description": "Startup configuration for accepting an incoming Live SIP call. Follow the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) when writing frontend and backend instructions.",
+        "properties": {
+          "model": {
+            "$ref": "#/components/schemas/ModelIdsLive",
+            "description": "The Live model to use for the accepted call.",
+            "minLength": 1
+          },
+          "instructions": {
+            "$ref": "#/components/schemas/instructions"
+          },
+          "audio": {
+            "$ref": "#/components/schemas/LiveMediaSessionAudioParam",
+            "description": "Startup audio output configuration. SIP negotiates the media format; audio.format is only accepted for primary WebSockets. Voice cannot change after startup."
+          },
+          "delegation": {
+            "$ref": "#/components/schemas/delegation"
+          },
+          "store": {
+            "$ref": "#/components/schemas/store"
+          },
+          "input": {
+            "$ref": "#/components/schemas/input"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "live"
+            ],
+            "default": "live",
+            "x-stainless-const": true,
+            "description": "The session type. Always `live`."
+          }
+        },
+        "required": [
+          "model",
+          "type"
+        ],
+        "additionalProperties": false
+      },
+      "LiveCallReferRequest": {
+        "type": "object",
+        "description": "Parameters used to transfer a Live SIP call to another destination.",
+        "properties": {
+          "target_uri": {
+            "$ref": "#/components/schemas/target_uri",
+            "minLength": 1,
+            "pattern": "\\S",
+            "description": "Nonblank URI for the SIP Refer-To header, such as tel:+14155550123 or sip:agent@example.com."
+          }
+        },
+        "required": [
+          "target_uri"
+        ],
+        "additionalProperties": false
+      },
+      "LiveCallRejectRequest": {
+        "type": "object",
+        "description": "Parameters used to reject an incoming Live SIP call.",
+        "properties": {
+          "status_code": {
+            "type": "integer",
+            "minimum": 300,
+            "maximum": 699,
+            "description": "SIP rejection status sent to the caller. This field is required.",
+            "example": 486
+          }
+        },
+        "required": [
+          "status_code"
+        ],
+        "additionalProperties": false
+      },
+      "LiveClientEvent": {
+        "description": "Client events for Live. Initialize a primary WebSocket with session.start and wait for session.started. WebRTC creation already starts the session. Audio append is primary WebSocket-only. See the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) before writing frontend instructions and delegation policies.",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/LiveSessionStartEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionUpdateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioAppendEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioMuteParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioUnmuteParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInstructionsAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveThinkingAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveCommentaryAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveResponseItemCreateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveResponseCreateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionCloseParam"
+          }
+        ]
+      },
+      "LiveConnectParams": {
+        "type": "object",
+        "x-stainless-empty-object": true,
+        "description": "Primary Live WebSocket connections accept no query parameters. Supply the model and startup configuration in the first session.start event.",
+        "properties": {},
+        "additionalProperties": false
+      },
+      "LiveCreateRequest": {
+        "type": "object",
+        "description": "Create a Live WebRTC session with JSON session configuration and an SDP offer. Follow the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) before choosing frontend and backend instructions. The request starts the session; do not send session.start on the data channel.",
+        "properties": {
+          "session": {
+            "$ref": "#/components/schemas/LiveMediaSessionCreateParams",
+            "description": "Startup configuration for the Live session."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/LiveWebRTCTransport",
+            "description": "WebRTC transport with the browser's SDP offer."
+          }
+        },
+        "required": [
+          "session",
+          "transport"
+        ],
+        "additionalProperties": false
+      },
+      "LiveCreateResponse": {
+        "type": "object",
+        "description": "The created Live session identifier and WebRTC answer. Apply transport.sdp as the peer's remote answer and wait for session.started on the data channel before sending commands.",
+        "properties": {
+          "session": {
+            "type": "object",
+            "description": "The newly created Live session. Use its ID for session controls and sideband connections.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "Opaque session identifier. Preserve the returned value unchanged, including its prefix."
+              }
+            },
+            "required": [
+              "id"
+            ]
+          },
+          "transport": {
+            "$ref": "#/components/schemas/LiveWebRTCTransport",
+            "description": "WebRTC transport with the SDP answer."
+          }
+        },
+        "required": [
+          "session",
+          "transport"
+        ]
+      },
+      "LiveForkClientEvent": {
+        "description": "Client events for a Live fork WebSocket. First send session.start with an overrides object (which may be empty), then wait for session.started before sending other commands. The model and conversation are inherited from the stored session.",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/LiveForkSessionStartEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionUpdateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioAppendEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioMuteParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioUnmuteParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInstructionsAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveThinkingAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveCommentaryAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveResponseItemCreateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveResponseCreateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionCloseParam"
+          }
+        ]
+      },
+      "LiveForkPathParams": {
+        "type": "object",
+        "description": "Identifies the stored Live session whose conversation and configuration are used to create a fork.",
+        "required": [
+          "session_id"
+        ],
+        "properties": {
+          "session_id": {
+            "type": "string",
+            "description": "The ID of the stored Live session to fork."
+          }
+        }
+      },
+      "LiveForkRequest": {
+        "type": "object",
+        "description": "Fork a stored Live session onto a new WebRTC connection. Omit session or send an empty object to inherit its configuration.",
+        "properties": {
+          "session": {
+            "$ref": "#/components/schemas/LiveMediaSessionForkParams",
+            "description": "Optional configuration overrides for the new Live session. Omit this object or send an empty object to inherit the stored session's settings."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/LiveWebRTCTransport",
+            "description": "WebRTC transport with an SDP offer for the new connection to the forked session."
+          }
+        },
+        "required": [
+          "transport"
+        ],
+        "additionalProperties": false
+      },
+      "LiveForkServerEvent": {
+        "$ref": "#/components/schemas/LiveServerEvent"
+      },
+      "LiveMediaSessionAudioParam": {
+        "type": "object",
+        "description": "Startup audio output configuration. WebRTC and SIP negotiate the media format; audio.format is only accepted for primary WebSockets. Voice cannot change after startup.",
+        "properties": {
+          "output": {
+            "$ref": "#/components/schemas/LiveInitialSessionAudioOutputParam"
+          }
+        },
+        "additionalProperties": false
+      },
+      "LiveMediaSessionCreateParams": {
+        "type": "object",
+        "description": "Startup configuration for a Live media session. Follow the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) when writing frontend instructions and the backend prompt under delegation.responses.instructions.",
+        "properties": {
+          "model": {
+            "$ref": "#/components/schemas/ModelIdsLive"
+          },
+          "instructions": {
+            "$ref": "#/components/schemas/instructions"
+          },
+          "audio": {
+            "$ref": "#/components/schemas/LiveMediaSessionAudioParam",
+            "description": "Startup audio configuration. WebRTC and SIP negotiate their audio format on the media transport."
+          },
+          "delegation": {
+            "$ref": "#/components/schemas/delegation"
+          },
+          "store": {
+            "$ref": "#/components/schemas/store"
+          },
+          "input": {
+            "$ref": "#/components/schemas/input"
+          },
+          "client": {
+            "$ref": "#/components/schemas/LiveClientConfigParam"
+          }
+        },
+        "required": [
+          "model"
+        ],
+        "additionalProperties": false
+      },
+      "LiveMediaSessionForkParams": {
+        "type": "object",
+        "description": "Optional overrides for a stored Live session. Omitted settings are inherited. The model, voice, frontend instructions, and prior conversation come from the stored session. WebRTC negotiates its audio format; audio.format is only supported on WebSocket forks.",
+        "properties": {
+          "store": {
+            "$ref": "#/components/schemas/properties-store"
+          },
+          "delegation": {
+            "$ref": "#/components/schemas/LiveResponsesDelegationUpdateParam"
+          },
+          "client": {
+            "$ref": "#/components/schemas/LiveClientConfigParam"
+          }
+        },
+        "additionalProperties": false
+      },
+      "LiveServerEvent": {
+        "description": "Server events for Live. Response lifecycle events are wrapped inside response.event; dispatch the nested event by its full type and tolerate new response event types. Follow the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) when designing the conversation and delegation policy.",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/LiveServerEvent-2"
+          }
+        ]
+      },
+      "LiveSidebandClientEvent": {
+        "description": "Client events accepted by an attached Live sideband WebSocket. The session is already started; send audio over the primary connection.",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/LiveSessionUpdateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioMuteParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioUnmuteParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInstructionsAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveThinkingAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveCommentaryAppendParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveResponseItemCreateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveResponseCreateParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionCloseParam"
+          }
+        ]
+      },
+      "LiveSidebandConnectParams": {
+        "type": "object",
+        "description": "Connection options for a sideband WebSocket attached to an existing Live session.",
+        "properties": {
+          "graceful_close": {
+            "type": "boolean",
+            "description": "Opt in to the graceful WebSocket closing handshake when the session ends. The server may also enable this behavior by default."
+          }
+        },
+        "additionalProperties": false
+      },
+      "LiveSidebandPathParams": {
+        "type": "object",
+        "description": "Identifies the Live session to observe and control through a sideband WebSocket.",
+        "required": [
+          "session_id"
+        ],
+        "properties": {
+          "session_id": {
+            "type": "string",
+            "description": "The ID of the existing Live session to attach to."
+          }
+        }
+      },
+      "LiveSidebandServerEvent": {
+        "description": "Server events received by an attached Live sideband WebSocket. Audio deltas are delivered over the primary connection.",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/LiveSessionStarted"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionUpdated"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioMuted"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioUnmuted"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInstructionsAppended"
+          },
+          {
+            "$ref": "#/components/schemas/LiveThinkingAppended"
+          },
+          {
+            "$ref": "#/components/schemas/LiveCommentaryAppended"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputTranscriptDelta"
+          },
+          {
+            "$ref": "#/components/schemas/LiveOutputTranscriptDelta"
+          },
+          {
+            "$ref": "#/components/schemas/LiveDelegationCreated"
+          },
+          {
+            "$ref": "#/components/schemas/LiveResponseEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionUsageUpdated"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionClosed"
+          },
+          {
+            "$ref": "#/components/schemas/LiveErrorEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInfoEvent"
+          }
+        ]
+      },
+      "LiveWebRTCTransport": {
+        "type": "object",
+        "description": "WebRTC transport carrying the offer SDP in a creation request or answer SDP in its response.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The transport used for the Live session. Always `webrtc`.",
+            "enum": [
+              "webrtc"
+            ],
+            "x-stainless-const": true
+          },
+          "sdp": {
+            "type": "string",
+            "minLength": 1,
+            "description": "Session Description Protocol message for the WebRTC connection."
+          }
+        },
+        "required": [
+          "type",
+          "sdp"
+        ],
+        "additionalProperties": false
+      },
+      "LocalShellToolCall": {
+        "type": "object",
+        "title": "Local shell call",
+        "description": "A tool call to run a command on the local shell.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local_shell_call"
+            ],
+            "description": "The type of the local shell call. Always `local_shell_call`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the local shell call.\n"
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the local shell tool call generated by the model.\n"
+          },
+          "action": {
+            "$ref": "#/components/schemas/LocalShellExecAction"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ],
+            "description": "The status of the local shell call.\n"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "action",
+          "status"
+        ]
+      },
+      "LocalShellToolCallOutput": {
+        "type": "object",
+        "title": "Local shell call output",
+        "description": "The output of a local shell tool call.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local_shell_call_output"
+            ],
+            "description": "The type of the local shell tool call output. Always `local_shell_call_output`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the local shell tool call generated by the model.\n"
+          },
+          "output": {
+            "type": "string",
+            "description": "A JSON string of the output of the local shell tool call.\n"
+          },
+          "status": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "in_progress",
+                  "completed",
+                  "incomplete"
+                ],
+                "description": "The status of the item. One of `in_progress`, `completed`, or `incomplete`.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "call_id",
+          "output"
+        ]
+      },
+      "LogProbProperties": {
+        "type": "object",
+        "description": "A log probability object.\n",
+        "properties": {
+          "token": {
+            "type": "string",
+            "description": "The token that was used to generate the log probability.\n"
+          },
+          "logprob": {
+            "type": "number",
+            "description": "The log probability of the token.\n"
+          },
+          "bytes": {
+            "type": "array",
+            "items": {
+              "type": "integer"
+            },
+            "description": "The bytes that were used to generate the log probability.\n"
+          }
+        },
+        "required": [
+          "token",
+          "logprob",
+          "bytes"
+        ]
+      },
+      "MCPApprovalRequest": {
+        "type": "object",
+        "title": "MCP approval request",
+        "description": "A request for human approval of a tool invocation.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_approval_request"
+            ],
+            "description": "The type of the item. Always `mcp_approval_request`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the approval request.\n"
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server making the request.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the tool to run.\n"
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string of arguments for the tool.\n"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "server_label",
+          "name",
+          "arguments"
+        ]
+      },
+      "MCPApprovalResponse": {
+        "type": "object",
+        "title": "MCP approval response",
+        "description": "A response to an MCP approval request.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_approval_response"
+            ],
+            "description": "The type of the item. Always `mcp_approval_response`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the approval response\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "approval_request_id": {
+            "type": "string",
+            "description": "The ID of the approval request being answered.\n"
+          },
+          "approve": {
+            "type": "boolean",
+            "description": "Whether the request was approved.\n"
+          },
+          "reason": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional reason for the decision.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "request_id",
+          "approve",
+          "approval_request_id"
+        ]
+      },
+      "MCPApprovalResponseResource": {
+        "type": "object",
+        "title": "MCP approval response",
+        "description": "A response to an MCP approval request.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_approval_response"
+            ],
+            "description": "The type of the item. Always `mcp_approval_response`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the approval response\n"
+          },
+          "approval_request_id": {
+            "type": "string",
+            "description": "The ID of the approval request being answered.\n"
+          },
+          "approve": {
+            "type": "boolean",
+            "description": "Whether the request was approved.\n"
+          },
+          "reason": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional reason for the decision.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "request_id",
+          "approve",
+          "approval_request_id"
+        ]
+      },
+      "MCPListTools": {
+        "type": "object",
+        "title": "MCP list tools",
+        "description": "A list of tools available on an MCP server.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools"
+            ],
+            "description": "The type of the item. Always `mcp_list_tools`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the list.\n"
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server.\n"
+          },
+          "tools": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MCPListToolsTool"
+            },
+            "description": "The tools available on the server.\n"
+          },
+          "error": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Error message if the server could not list tools.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "server_label",
+          "tools"
+        ]
+      },
+      "MCPListToolsTool": {
+        "type": "object",
+        "title": "MCP list tools tool",
+        "description": "A tool available on an MCP server.\n",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the tool.\n"
+          },
+          "description": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The description of the tool.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "input_schema": {
+            "type": "object",
+            "description": "The JSON schema describing the tool's input.\n"
+          },
+          "annotations": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "Additional annotations about the tool.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "name",
+          "input_schema"
+        ]
+      },
+      "MCPTool": {
+        "type": "object",
+        "title": "MCP tool",
+        "description": "Give the model access to additional tools via remote Model Context Protocol\n(MCP) servers. [Learn more about MCP](https://developers.openai.com/api/docs/guides/tools-connectors-mcp).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "description": "The type of the MCP tool. Always `mcp`.",
+            "x-stainless-const": true
+          },
+          "server_label": {
+            "type": "string",
+            "description": "A label for this MCP server, used to identify it in tool calls.\n"
+          },
+          "server_url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL for the MCP server. One of `server_url`, `connector_id`, or\n`tunnel_id` must be provided.\n"
+          },
+          "connector_id": {
+            "type": "string",
+            "enum": [
+              "connector_dropbox",
+              "connector_gmail",
+              "connector_googlecalendar",
+              "connector_googledrive",
+              "connector_microsoftteams",
+              "connector_outlookcalendar",
+              "connector_outlookemail",
+              "connector_sharepoint"
+            ],
+            "description": "Identifier for service connectors, like those available in ChatGPT. One of\n`server_url`, `connector_id`, or `tunnel_id` must be provided. Learn more\nabout service connectors [here](https://developers.openai.com/api/docs/guides/tools-connectors-mcp#connectors).\n\nCurrently supported `connector_id` values are:\n\n- Dropbox: `connector_dropbox`\n- Gmail: `connector_gmail`\n- Google Calendar: `connector_googlecalendar`\n- Google Drive: `connector_googledrive`\n- Microsoft Teams: `connector_microsoftteams`\n- Outlook Calendar: `connector_outlookcalendar`\n- Outlook Email: `connector_outlookemail`\n- SharePoint: `connector_sharepoint`\n"
+          },
+          "tunnel_id": {
+            "type": "string",
+            "pattern": "^tunnel_[a-z0-9]{32}$",
+            "description": "The Secure MCP Tunnel ID to use instead of a direct server URL. One of\n`server_url`, `connector_id`, or `tunnel_id` must be provided.\n"
+          },
+          "authorization": {
+            "type": "string",
+            "description": "An OAuth access token that can be used with a remote MCP server, either\nwith a custom MCP server URL or a service connector. Your application\nmust handle the OAuth authorization flow and provide the token here.\n"
+          },
+          "server_description": {
+            "type": "string",
+            "description": "Optional description of the MCP server, used to provide more context.\n"
+          },
+          "headers": {
+            "anyOf": [
+              {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "Optional HTTP headers to send to the MCP server. Use for authentication\nor other purposes.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "allowed_tools": {
+            "anyOf": [
+              {
+                "description": "List of allowed tool names or a filter object.\n",
+                "oneOf": [
+                  {
+                    "type": "array",
+                    "title": "MCP allowed tools",
+                    "description": "A string array of allowed tool names",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  {
+                    "$ref": "#/components/schemas/MCPToolFilter"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "type": "array",
+                "minItems": 1,
+                "items": {
+                  "$ref": "#/components/schemas/CallableToolAllowedCaller"
+                },
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "require_approval": {
+            "anyOf": [
+              {
+                "description": "Specify which of the MCP server's tools require approval.",
+                "oneOf": [
+                  {
+                    "type": "object",
+                    "title": "MCP tool approval filter",
+                    "description": "Specify which of the MCP server's tools require approval. Can be\n`always`, `never`, or a filter object associated with tools\nthat require approval.\n",
+                    "properties": {
+                      "always": {
+                        "$ref": "#/components/schemas/MCPToolFilter"
+                      },
+                      "never": {
+                        "$ref": "#/components/schemas/MCPToolFilter"
+                      }
+                    },
+                    "additionalProperties": false
+                  },
+                  {
+                    "type": "string",
+                    "title": "MCP tool approval setting",
+                    "description": "Specify a single approval policy for all tools. One of `always` or\n`never`. When set to `always`, all tools will require approval. When\nset to `never`, all tools will not require approval.\n",
+                    "enum": [
+                      "always",
+                      "never"
+                    ]
+                  }
+                ],
+                "default": "always"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether this MCP tool is deferred and discovered via tool search.\n"
+          }
+        },
+        "required": [
+          "type",
+          "server_label"
+        ]
+      },
+      "MCPToolCall": {
+        "type": "object",
+        "title": "MCP tool call",
+        "description": "An invocation of a tool on an MCP server.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_call"
+            ],
+            "description": "The type of the item. Always `mcp_call`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the tool call.\n"
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server running the tool.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the tool that was run.\n"
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string of the arguments passed to the tool.\n"
+          },
+          "output": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The output from the tool call.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "error": {
+            "description": "The error from the tool call, if any.",
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MCPToolCallError"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/MCPToolCallStatus",
+            "description": "The status of the tool call. One of `in_progress`, `completed`, `incomplete`, `calling`, or `failed`.\n"
+          },
+          "approval_request_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Unique identifier for the MCP tool call approval request.\nInclude this value in a subsequent `mcp_approval_response` input to approve or reject the corresponding tool call.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "server_label",
+          "name",
+          "arguments"
+        ]
+      },
+      "MCPToolCallError": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/MCPProtocolError"
+          },
+          {
+            "$ref": "#/components/schemas/MCPToolExecutionError"
+          },
+          {
+            "$ref": "#/components/schemas/HTTPError"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "MCPToolFilter": {
+        "type": "object",
+        "title": "MCP tool filter",
+        "description": "A filter object to specify which tools are allowed.\n",
+        "properties": {
+          "tool_names": {
+            "type": "array",
+            "title": "MCP allowed tools",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of allowed tool names."
+          },
+          "read_only": {
+            "type": "boolean",
+            "description": "Indicates whether or not a tool modifies data or is read-only. If an\nMCP server is [annotated with `readOnlyHint`](https://modelcontextprotocol.io/specification/2025-06-18/schema#toolannotations-readonlyhint),\nit will match this filter.\n"
+          }
+        },
+        "required": [],
+        "additionalProperties": false
+      },
+      "MessageContentImageFileObject": {
+        "title": "Image file",
+        "type": "object",
+        "description": "References an image [File](https://developers.openai.com/api/reference/resources/files) in the content of a message.",
+        "properties": {
+          "type": {
+            "description": "Always `image_file`.",
+            "type": "string",
+            "enum": [
+              "image_file"
+            ],
+            "x-stainless-const": true
+          },
+          "image_file": {
+            "type": "object",
+            "properties": {
+              "file_id": {
+                "description": "The [File](https://developers.openai.com/api/reference/resources/files) ID of the image in the message content. Set `purpose=\"vision\"` when uploading the File if you need to later display the file content.",
+                "type": "string"
+              },
+              "detail": {
+                "type": "string",
+                "description": "Specifies the detail level of the image if specified by the user. `low` uses fewer tokens, you can opt in to high resolution using `high`.",
+                "enum": [
+                  "auto",
+                  "low",
+                  "high"
+                ],
+                "default": "auto"
+              }
+            },
+            "required": [
+              "file_id"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "image_file"
+        ]
+      },
+      "MessageContentImageUrlObject": {
+        "title": "Image URL",
+        "type": "object",
+        "description": "References an image URL in the content of a message.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "image_url"
+            ],
+            "description": "The type of the content part.",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "type": "object",
+            "properties": {
+              "url": {
+                "type": "string",
+                "description": "The external URL of the image, must be a supported image types: jpeg, jpg, png, gif, webp.",
+                "format": "uri"
+              },
+              "detail": {
+                "type": "string",
+                "description": "Specifies the detail level of the image. `low` uses fewer tokens, you can opt in to high resolution using `high`. Default value is `auto`",
+                "enum": [
+                  "auto",
+                  "low",
+                  "high"
+                ],
+                "default": "auto"
+              }
+            },
+            "required": [
+              "url"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ]
+      },
+      "MessageContentRefusalObject": {
+        "title": "Refusal",
+        "type": "object",
+        "description": "The refusal content generated by the assistant.",
+        "properties": {
+          "type": {
+            "description": "Always `refusal`.",
+            "type": "string",
+            "enum": [
+              "refusal"
+            ],
+            "x-stainless-const": true
+          },
+          "refusal": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "refusal"
+        ]
+      },
+      "MessageContentTextAnnotationsFileCitationObject": {
+        "title": "File citation",
+        "type": "object",
+        "description": "A citation within the message that points to a specific quote from a specific File associated with the assistant or the message. Generated when the assistant uses the \"file_search\" tool to search files.",
+        "properties": {
+          "type": {
+            "description": "Always `file_citation`.",
+            "type": "string",
+            "enum": [
+              "file_citation"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "description": "The text in the message content that needs to be replaced.",
+            "type": "string"
+          },
+          "file_citation": {
+            "type": "object",
+            "properties": {
+              "file_id": {
+                "description": "The ID of the specific File the citation is from.",
+                "type": "string"
+              }
+            },
+            "required": [
+              "file_id"
+            ]
+          },
+          "start_index": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "end_index": {
+            "type": "integer",
+            "minimum": 0
+          }
+        },
+        "required": [
+          "type",
+          "text",
+          "file_citation",
+          "start_index",
+          "end_index"
+        ]
+      },
+      "MessageContentTextAnnotationsFilePathObject": {
+        "title": "File path",
+        "type": "object",
+        "description": "A URL for the file that's generated when the assistant used the `code_interpreter` tool to generate a file.",
+        "properties": {
+          "type": {
+            "description": "Always `file_path`.",
+            "type": "string",
+            "enum": [
+              "file_path"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "description": "The text in the message content that needs to be replaced.",
+            "type": "string"
+          },
+          "file_path": {
+            "type": "object",
+            "properties": {
+              "file_id": {
+                "description": "The ID of the file that was generated.",
+                "type": "string"
+              }
+            },
+            "required": [
+              "file_id"
+            ]
+          },
+          "start_index": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "end_index": {
+            "type": "integer",
+            "minimum": 0
+          }
+        },
+        "required": [
+          "type",
+          "text",
+          "file_path",
+          "start_index",
+          "end_index"
+        ]
+      },
+      "MessageContentTextObject": {
+        "title": "Text",
+        "type": "object",
+        "description": "The text content that is part of a message.",
+        "properties": {
+          "type": {
+            "description": "Always `text`.",
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "object",
+            "properties": {
+              "value": {
+                "description": "The data that makes up the text.",
+                "type": "string"
+              },
+              "annotations": {
+                "type": "array",
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageContentTextAnnotationsFileCitationObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/MessageContentTextAnnotationsFilePathObject"
+                    }
+                  ]
+                }
+              }
+            },
+            "required": [
+              "value",
+              "annotations"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ]
+      },
+      "MessageDeltaContentImageFileObject": {
+        "title": "Image file",
+        "type": "object",
+        "description": "References an image [File](https://developers.openai.com/api/reference/resources/files) in the content of a message.",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the content part in the message."
+          },
+          "type": {
+            "description": "Always `image_file`.",
+            "type": "string",
+            "enum": [
+              "image_file"
+            ],
+            "x-stainless-const": true
+          },
+          "image_file": {
+            "type": "object",
+            "properties": {
+              "file_id": {
+                "description": "The [File](https://developers.openai.com/api/reference/resources/files) ID of the image in the message content. Set `purpose=\"vision\"` when uploading the File if you need to later display the file content.",
+                "type": "string"
+              },
+              "detail": {
+                "type": "string",
+                "description": "Specifies the detail level of the image if specified by the user. `low` uses fewer tokens, you can opt in to high resolution using `high`.",
+                "enum": [
+                  "auto",
+                  "low",
+                  "high"
+                ],
+                "default": "auto"
+              }
+            }
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "MessageDeltaContentImageUrlObject": {
+        "title": "Image URL",
+        "type": "object",
+        "description": "References an image URL in the content of a message.",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the content part in the message."
+          },
+          "type": {
+            "description": "Always `image_url`.",
+            "type": "string",
+            "enum": [
+              "image_url"
+            ],
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "type": "object",
+            "properties": {
+              "url": {
+                "description": "The URL of the image, must be a supported image types: jpeg, jpg, png, gif, webp.",
+                "type": "string",
+                "format": "uri"
+              },
+              "detail": {
+                "type": "string",
+                "description": "Specifies the detail level of the image. `low` uses fewer tokens, you can opt in to high resolution using `high`.",
+                "enum": [
+                  "auto",
+                  "low",
+                  "high"
+                ],
+                "default": "auto"
+              }
+            }
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "MessageDeltaContentRefusalObject": {
+        "title": "Refusal",
+        "type": "object",
+        "description": "The refusal content that is part of a message.",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the refusal part in the message."
+          },
+          "type": {
+            "description": "Always `refusal`.",
+            "type": "string",
+            "enum": [
+              "refusal"
+            ],
+            "x-stainless-const": true
+          },
+          "refusal": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "MessageDeltaContentTextAnnotationsFileCitationObject": {
+        "title": "File citation",
+        "type": "object",
+        "description": "A citation within the message that points to a specific quote from a specific File associated with the assistant or the message. Generated when the assistant uses the \"file_search\" tool to search files.",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the annotation in the text content part."
+          },
+          "type": {
+            "description": "Always `file_citation`.",
+            "type": "string",
+            "enum": [
+              "file_citation"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "description": "The text in the message content that needs to be replaced.",
+            "type": "string"
+          },
+          "file_citation": {
+            "type": "object",
+            "properties": {
+              "file_id": {
+                "description": "The ID of the specific File the citation is from.",
+                "type": "string"
+              },
+              "quote": {
+                "description": "The specific quote in the file.",
+                "type": "string"
+              }
+            }
+          },
+          "start_index": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "end_index": {
+            "type": "integer",
+            "minimum": 0
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "MessageDeltaContentTextAnnotationsFilePathObject": {
+        "title": "File path",
+        "type": "object",
+        "description": "A URL for the file that's generated when the assistant used the `code_interpreter` tool to generate a file.",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the annotation in the text content part."
+          },
+          "type": {
+            "description": "Always `file_path`.",
+            "type": "string",
+            "enum": [
+              "file_path"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "description": "The text in the message content that needs to be replaced.",
+            "type": "string"
+          },
+          "file_path": {
+            "type": "object",
+            "properties": {
+              "file_id": {
+                "description": "The ID of the file that was generated.",
+                "type": "string"
+              }
+            }
+          },
+          "start_index": {
+            "type": "integer",
+            "minimum": 0
+          },
+          "end_index": {
+            "type": "integer",
+            "minimum": 0
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "MessageDeltaContentTextObject": {
+        "title": "Text",
+        "type": "object",
+        "description": "The text content that is part of a message.",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the content part in the message."
+          },
+          "type": {
+            "description": "Always `text`.",
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "object",
+            "properties": {
+              "value": {
+                "description": "The data that makes up the text.",
+                "type": "string"
+              },
+              "annotations": {
+                "type": "array",
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageDeltaContentTextAnnotationsFileCitationObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/MessageDeltaContentTextAnnotationsFilePathObject"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "MessageDeltaObject": {
+        "type": "object",
+        "title": "Message delta object",
+        "description": "Represents a message delta i.e. any changed fields on a message during streaming.\n",
+        "properties": {
+          "id": {
+            "description": "The identifier of the message, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `thread.message.delta`.",
+            "type": "string",
+            "enum": [
+              "thread.message.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "delta": {
+            "description": "The delta containing the fields that have changed on the Message.",
+            "type": "object",
+            "properties": {
+              "role": {
+                "description": "The entity that produced the message. One of `user` or `assistant`.",
+                "type": "string",
+                "enum": [
+                  "user",
+                  "assistant"
+                ]
+              },
+              "content": {
+                "description": "The content of the message in array of text and/or images.",
+                "type": "array",
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/MessageDeltaContentImageFileObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/MessageDeltaContentTextObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/MessageDeltaContentRefusalObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/MessageDeltaContentImageUrlObject"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "The message delta object",
+          "beta": true,
+          "example": "{\n  \"id\": \"msg_123\",\n  \"object\": \"thread.message.delta\",\n  \"delta\": {\n    \"content\": [\n      {\n        \"index\": 0,\n        \"type\": \"text\",\n        \"text\": { \"value\": \"Hello\", \"annotations\": [] }\n      }\n    ]\n  }\n}\n"
+        }
+      },
+      "MessageObject": {
+        "type": "object",
+        "title": "The message object",
+        "description": "Represents a message within a [thread](https://developers.openai.com/api/docs/assistants/migration).",
+        "properties": {
+          "id": {
+            "description": "The identifier, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `thread.message`.",
+            "type": "string",
+            "enum": [
+              "thread.message"
+            ],
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "description": "The Unix timestamp (in seconds) for when the message was created.",
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "thread_id": {
+            "description": "The [thread](https://developers.openai.com/api/docs/assistants/migration) ID that this message belongs to.",
+            "type": "string"
+          },
+          "status": {
+            "description": "The status of the message, which can be either `in_progress`, `incomplete`, or `completed`.",
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "incomplete",
+              "completed"
+            ]
+          },
+          "incomplete_details": {
+            "anyOf": [
+              {
+                "description": "On an incomplete message, details about why the message is incomplete.",
+                "type": "object",
+                "properties": {
+                  "reason": {
+                    "type": "string",
+                    "description": "The reason the message is incomplete.",
+                    "enum": [
+                      "content_filter",
+                      "max_tokens",
+                      "run_cancelled",
+                      "run_expired",
+                      "run_failed"
+                    ]
+                  }
+                },
+                "required": [
+                  "reason"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "completed_at": {
+            "anyOf": [
+              {
+                "description": "The Unix timestamp (in seconds) for when the message was completed.",
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "incomplete_at": {
+            "anyOf": [
+              {
+                "description": "The Unix timestamp (in seconds) for when the message was marked as incomplete.",
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "role": {
+            "description": "The entity that produced the message. One of `user` or `assistant`.",
+            "type": "string",
+            "enum": [
+              "user",
+              "assistant"
+            ]
+          },
+          "content": {
+            "description": "The content of the message in array of text and/or images.",
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/MessageContentImageFileObject"
+                },
+                {
+                  "$ref": "#/components/schemas/MessageContentImageUrlObject"
+                },
+                {
+                  "$ref": "#/components/schemas/MessageContentTextObject"
+                },
+                {
+                  "$ref": "#/components/schemas/MessageContentRefusalObject"
+                }
+              ]
+            }
+          },
+          "assistant_id": {
+            "anyOf": [
+              {
+                "description": "If applicable, the ID of the [assistant](https://developers.openai.com/api/docs/assistants/migration) that authored this message.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "run_id": {
+            "anyOf": [
+              {
+                "description": "The ID of the [run](https://developers.openai.com/api/docs/assistants/migration) associated with the creation of this message. Value is `null` when messages are created manually using the create message or create thread endpoints.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "attachments": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "file_id": {
+                      "type": "string",
+                      "description": "The ID of the file to attach to the message."
+                    },
+                    "tools": {
+                      "description": "The tools to add this file to.",
+                      "type": "array",
+                      "items": {
+                        "oneOf": [
+                          {
+                            "$ref": "#/components/schemas/AssistantToolsCode"
+                          },
+                          {
+                            "$ref": "#/components/schemas/AssistantToolsFileSearchTypeOnly"
+                          }
+                        ]
+                      }
+                    }
+                  }
+                },
+                "description": "A list of files attached to the message, and the tools they were added to."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "thread_id",
+          "status",
+          "incomplete_details",
+          "completed_at",
+          "incomplete_at",
+          "role",
+          "content",
+          "assistant_id",
+          "run_id",
+          "attachments",
+          "metadata"
+        ],
+        "x-oaiMeta": {
+          "name": "The message object",
+          "beta": true,
+          "example": "{\n  \"id\": \"msg_abc123\",\n  \"object\": \"thread.message\",\n  \"created_at\": 1698983503,\n  \"thread_id\": \"thread_abc123\",\n  \"role\": \"assistant\",\n  \"content\": [\n    {\n      \"type\": \"text\",\n      \"text\": {\n        \"value\": \"Hi! How can I help you today?\",\n        \"annotations\": []\n      }\n    }\n  ],\n  \"assistant_id\": \"asst_abc123\",\n  \"run_id\": \"run_abc123\",\n  \"attachments\": [],\n  \"metadata\": {}\n}\n"
+        }
+      },
+      "MessagePhase": {
+        "type": "string",
+        "description": "Labels an `assistant` message as intermediate commentary (`commentary`) or the final answer (`final_answer`).\nFor models like `gpt-5.3-codex` and beyond, when sending follow-up requests, preserve and resend\nphase on all assistant messages — dropping it can degrade performance. Not used for user messages.\n",
+        "enum": [
+          "commentary",
+          "final_answer"
+        ]
+      },
+      "MessageRequestContentTextObject": {
+        "title": "Text",
+        "type": "object",
+        "description": "The text content that is part of a message.",
+        "properties": {
+          "type": {
+            "description": "Always `text`.",
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "Text content to be sent to the model"
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ]
+      },
+      "MessageStreamEvent": {
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.message.created"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/MessageObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [message](https://developers.openai.com/api/docs/assistants/migration) is created.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [message](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.message.in_progress"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/MessageObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [message](https://developers.openai.com/api/docs/assistants/migration) moves to an `in_progress` state.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [message](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.message.delta"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/MessageDeltaObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when parts of a [Message](https://developers.openai.com/api/docs/assistants/migration) are being streamed.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [message delta](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.message.completed"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/MessageObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [message](https://developers.openai.com/api/docs/assistants/migration) is completed.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [message](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.message.incomplete"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/MessageObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [message](https://developers.openai.com/api/docs/assistants/migration) ends before it is completed.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [message](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          }
+        ]
+      },
+      "Metadata": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "Set of 16 key-value pairs that can be attached to an object. This can be\nuseful for storing additional information about the object in a structured\nformat, and querying for objects via API or the dashboard.\n\nKeys are strings with a maximum length of 64 characters. Values are strings\nwith a maximum length of 512 characters.\n",
+            "additionalProperties": {
+              "type": "string"
+            },
+            "x-oaiTypeLabel": "map"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "Model": {
+        "title": "Model",
+        "description": "Describes an OpenAI model offering that can be used with the API.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The model identifier, which can be referenced in the API endpoints."
+          },
+          "created": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) when the model was created."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"model\".",
+            "enum": [
+              "model"
+            ],
+            "x-stainless-const": true
+          },
+          "owned_by": {
+            "type": "string",
+            "description": "The organization that owns the model."
+          },
+          "shutdown_date": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "date"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The date when the model will shut down, or null if not announced."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created",
+          "owned_by"
+        ],
+        "x-oaiMeta": {
+          "name": "The model object",
+          "example": "{\n  \"id\": \"gpt-6-astra\",\n  \"object\": \"model\",\n  \"created\": 1686935002,\n  \"owned_by\": \"openai\",\n  \"shutdown_date\": \"2026-10-23\"\n}\n"
+        }
+      },
+      "ModelIds": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ModelIdsShared"
+          },
+          {
+            "$ref": "#/components/schemas/ModelIdsResponses"
+          }
+        ]
+      },
+      "ModelIdsCompaction": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ModelIdsResponses"
+          },
+          {
+            "type": "string"
+          },
+          {
+            "type": "null"
+          }
+        ],
+        "description": "Model ID used to generate the response, like `gpt-6-astra`. OpenAI offers a wide range of models with different capabilities, performance characteristics, and price points. Refer to the [model guide](https://developers.openai.com/api/docs/models) to browse and compare available models."
+      },
+      "ModelIdsLive": {
+        "description": "The Live model. Required in the session configuration for every transport; do not pass it as a URL query parameter.",
+        "example": "gpt-live-1",
+        "anyOf": [
+          {
+            "type": "string",
+            "minLength": 1
+          },
+          {
+            "type": "string",
+            "enum": [
+              "gpt-live-1"
+            ]
+          }
+        ]
+      },
+      "ModelIdsResponses": {
+        "example": "gpt-6-astra",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ModelIdsShared"
+          },
+          {
+            "type": "string",
+            "title": "ResponsesOnlyModel",
+            "enum": [
+              "o1-pro",
+              "o1-pro-2025-03-19",
+              "o3-pro",
+              "o3-pro-2025-06-10",
+              "o3-deep-research",
+              "o3-deep-research-2025-06-26",
+              "o4-mini-deep-research",
+              "o4-mini-deep-research-2025-06-26",
+              "computer-use-preview",
+              "computer-use-preview-2025-03-11",
+              "gpt-5.5-pro",
+              "gpt-5.5-pro-2026-04-23",
+              "gpt-5-codex",
+              "gpt-5-pro",
+              "gpt-5-pro-2025-10-06",
+              "gpt-5.1-codex-max",
+              "gpt-daybreak-blue-latest",
+              "gpt-daybreak-red-latest",
+              "gpt-5.6-cyber"
+            ]
+          }
+        ]
+      },
+      "ModelIdsShared": {
+        "example": "gpt-6-astra",
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "gpt-6-astra",
+              "gpt-5.6-sol",
+              "gpt-5.6-terra",
+              "gpt-5.6-luna",
+              "gpt-5.5",
+              "gpt-5.5-2026-04-23",
+              "gpt-5.4",
+              "gpt-5.4-mini",
+              "gpt-5.4-nano",
+              "gpt-5.4-mini-2026-03-17",
+              "gpt-5.4-nano-2026-03-17",
+              "gpt-5.3-chat-latest",
+              "gpt-5.2",
+              "gpt-5.2-2025-12-11",
+              "gpt-5.2-chat-latest",
+              "gpt-5.2-pro",
+              "gpt-5.2-pro-2025-12-11",
+              "gpt-5.1",
+              "gpt-5.1-2025-11-13",
+              "gpt-5.1-codex",
+              "gpt-5.1-mini",
+              "gpt-5.1-chat-latest",
+              "gpt-5",
+              "gpt-5-mini",
+              "gpt-5-nano",
+              "gpt-5-2025-08-07",
+              "gpt-5-mini-2025-08-07",
+              "gpt-5-nano-2025-08-07",
+              "gpt-5-chat-latest",
+              "gpt-4.1",
+              "gpt-4.1-mini",
+              "gpt-4.1-nano",
+              "gpt-4.1-2025-04-14",
+              "gpt-4.1-mini-2025-04-14",
+              "gpt-4.1-nano-2025-04-14",
+              "o4-mini",
+              "o4-mini-2025-04-16",
+              "o3",
+              "o3-2025-04-16",
+              "o3-mini",
+              "o3-mini-2025-01-31",
+              "o1",
+              "o1-2024-12-17",
+              "o1-preview",
+              "o1-preview-2024-09-12",
+              "o1-mini",
+              "o1-mini-2024-09-12",
+              "gpt-4o",
+              "gpt-4o-2024-11-20",
+              "gpt-4o-2024-08-06",
+              "gpt-4o-2024-05-13",
+              "gpt-4o-audio-preview",
+              "gpt-4o-audio-preview-2024-10-01",
+              "gpt-4o-audio-preview-2024-12-17",
+              "gpt-4o-audio-preview-2025-06-03",
+              "gpt-4o-mini-audio-preview",
+              "gpt-4o-mini-audio-preview-2024-12-17",
+              "gpt-4o-search-preview",
+              "gpt-4o-mini-search-preview",
+              "gpt-4o-search-preview-2025-03-11",
+              "gpt-4o-mini-search-preview-2025-03-11",
+              "chatgpt-4o-latest",
+              "codex-mini-latest",
+              "gpt-4o-mini",
+              "gpt-4o-mini-2024-07-18",
+              "gpt-4-turbo",
+              "gpt-4-turbo-2024-04-09",
+              "gpt-4-0125-preview",
+              "gpt-4-turbo-preview",
+              "gpt-4-1106-preview",
+              "gpt-4-vision-preview",
+              "gpt-4",
+              "gpt-4-0314",
+              "gpt-4-0613",
+              "gpt-4-32k",
+              "gpt-4-32k-0314",
+              "gpt-4-32k-0613",
+              "gpt-3.5-turbo",
+              "gpt-3.5-turbo-16k",
+              "gpt-3.5-turbo-0301",
+              "gpt-3.5-turbo-0613",
+              "gpt-3.5-turbo-1106",
+              "gpt-3.5-turbo-0125",
+              "gpt-3.5-turbo-16k-0613"
+            ]
+          }
+        ]
+      },
+      "ModelResponseProperties": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "top_logprobs": {
+            "anyOf": [
+              {
+                "description": "An integer between 0 and 20 specifying the maximum number of most likely\ntokens to return at each token position, each with an associated log\nprobability. In some cases, the number of returned tokens may be fewer than\nrequested.\n",
+                "type": "integer",
+                "minimum": 0,
+                "maximum": 20
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "temperature": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 2,
+                "default": 1,
+                "example": 1,
+                "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\nWe generally recommend altering this or `top_p` but not both.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "top_p": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 1,
+                "default": 1,
+                "example": 1,
+                "description": "An alternative to sampling with temperature, called nucleus sampling,\nwhere the model considers the results of the tokens with top_p probability\nmass. So 0.1 means only the tokens comprising the top 10% probability mass\nare considered.\n\nWe generally recommend altering this or `temperature` but not both.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user": {
+            "type": "string",
+            "example": "user-1234",
+            "deprecated": true,
+            "description": "This field is being replaced by `safety_identifier` and `prompt_cache_key`. Use `prompt_cache_key` instead to maintain caching optimizations.\nA stable identifier for your end-users.\nUsed to boost cache hit rates by better bucketing similar requests and  to help OpenAI detect and prevent abuse. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+          },
+          "safety_identifier": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "example": "safety-identifier-1234",
+                "description": "A stable identifier used to help detect users of your application that may be violating OpenAI's usage policies.\nThe IDs should be a string that uniquely identifies each user, with a maximum length of 64 characters. We recommend hashing their username or email address, in order to avoid sending us any identifying information. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_key": {
+            "anyOf": [
+              {
+                "type": "string",
+                "example": "prompt-cache-key-1234",
+                "description": "Used by OpenAI to cache responses for similar requests to optimize your cache hit rates. Replaces the `user` field. [Learn more](https://developers.openai.com/api/docs/guides/prompt-caching).\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_retention": {
+            "deprecated": true,
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "in_memory",
+                  "24h"
+                ],
+                "description": "Deprecated. Use `prompt_cache_options.ttl` instead.\n\nThe retention policy for the prompt cache. Set to `24h` to enable extended prompt caching, which keeps cached prefixes active for longer, up to a maximum of 24 hours. [Learn more](https://developers.openai.com/api/docs/guides/prompt-caching#prompt-cache-retention).\nThis field expresses a maximum retention policy, while\n`prompt_cache_options.ttl` expresses a minimum cache lifetime. The two\nfields are independent and do not interact.\nFor `gpt-5.5`, `gpt-5.5-pro`, and future models, only `24h` is supported.\n\nFor older models that support both `in_memory` and `24h`, the default depends on your organization's data retention policy:\n  - Organizations without ZDR enabled default to `24h`.\n  - Organizations with ZDR enabled default to `in_memory` when `prompt_cache_retention` is not specified.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        }
+      },
+      "ModifyAssistantRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "model": {
+            "description": "ID of the model to use. You can use the [List models](https://developers.openai.com/api/reference/resources/models/methods/list) API to see all of your available models, or see our [Model overview](https://developers.openai.com/api/docs/models) for descriptions of them.\n",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/components/schemas/AssistantSupportedModels"
+              }
+            ]
+          },
+          "reasoning_effort": {
+            "$ref": "#/components/schemas/ReasoningEffort"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "description": "The name of the assistant. The maximum length is 256 characters.\n",
+                "type": "string",
+                "maxLength": 256
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "description": {
+            "anyOf": [
+              {
+                "description": "The description of the assistant. The maximum length is 512 characters.\n",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "description": "The system instructions that the assistant uses. The maximum length is 256,000 characters.\n",
+                "type": "string",
+                "maxLength": 256000
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "description": "A list of tool enabled on the assistant. There can be a maximum of 128 tools per assistant. Tools can be of types `code_interpreter`, `file_search`, or `function`.\n",
+            "default": [],
+            "type": "array",
+            "maxItems": 128,
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/AssistantToolsCode"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFileSearch"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFunction"
+                }
+              ]
+            }
+          },
+          "tool_resources": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.\n",
+                "properties": {
+                  "code_interpreter": {
+                    "type": "object",
+                    "properties": {
+                      "file_ids": {
+                        "type": "array",
+                        "description": "Overrides the list of [file](https://developers.openai.com/api/reference/resources/files) IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files associated with the tool.\n",
+                        "default": [],
+                        "maxItems": 20,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  },
+                  "file_search": {
+                    "type": "object",
+                    "properties": {
+                      "vector_store_ids": {
+                        "type": "array",
+                        "description": "Overrides the [vector store](https://developers.openai.com/api/reference/resources/vector_stores) attached to this assistant. There can be a maximum of 1 vector store attached to the assistant.\n",
+                        "maxItems": 1,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "temperature": {
+            "anyOf": [
+              {
+                "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\n",
+                "type": "number",
+                "minimum": 0,
+                "maximum": 2,
+                "default": 1,
+                "example": 1
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "top_p": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 1,
+                "default": 1,
+                "example": 1,
+                "description": "An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.\n\nWe generally recommend altering this or temperature but not both.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "response_format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/AssistantsApiResponseFormatOption"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        }
+      },
+      "ModifyCertificateRequest": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The updated name for the certificate"
+          }
+        }
+      },
+      "ModifyMessageRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        }
+      },
+      "ModifyRunRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        }
+      },
+      "ModifyThreadRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "tool_resources": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.\n",
+                "properties": {
+                  "code_interpreter": {
+                    "type": "object",
+                    "properties": {
+                      "file_ids": {
+                        "type": "array",
+                        "description": "A list of [file](https://developers.openai.com/api/reference/resources/files) IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files associated with the tool.\n",
+                        "default": [],
+                        "maxItems": 20,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  },
+                  "file_search": {
+                    "type": "object",
+                    "properties": {
+                      "vector_store_ids": {
+                        "type": "array",
+                        "description": "The [vector store](https://developers.openai.com/api/reference/resources/vector_stores) attached to this thread. There can be a maximum of 1 vector store attached to the thread.\n",
+                        "maxItems": 1,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        }
+      },
+      "NoiseReductionType": {
+        "type": "string",
+        "enum": [
+          "near_field",
+          "far_field"
+        ],
+        "description": "Type of noise reduction. `near_field` is for close-talking microphones such as headphones, `far_field` is for far-field microphones such as laptop or conference room microphones.\n"
+      },
+      "OpenAIFile": {
+        "title": "OpenAIFile",
+        "description": "The `File` object represents a document that has been uploaded to OpenAI.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The file identifier, which can be referenced in the API endpoints."
+          },
+          "bytes": {
+            "type": "integer",
+            "description": "The size of the file, in bytes."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the file was created."
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the file will expire."
+          },
+          "filename": {
+            "type": "string",
+            "description": "The name of the file."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always `file`.",
+            "enum": [
+              "file"
+            ],
+            "x-stainless-const": true
+          },
+          "purpose": {
+            "type": "string",
+            "description": "The intended purpose of the file. Supported values are `assistants`, `assistants_output`, `batch`, `batch_output`, `fine-tune`, `fine-tune-results`, `vision`, and `user_data`.",
+            "enum": [
+              "assistants",
+              "assistants_output",
+              "batch",
+              "batch_output",
+              "fine-tune",
+              "fine-tune-results",
+              "vision",
+              "user_data"
+            ]
+          },
+          "status": {
+            "type": "string",
+            "deprecated": true,
+            "description": "Deprecated. The current status of the file, which can be either `uploaded`, `processed`, or `error`.",
+            "enum": [
+              "uploaded",
+              "processed",
+              "error"
+            ]
+          },
+          "status_details": {
+            "type": "string",
+            "deprecated": true,
+            "description": "Deprecated. For details on why a fine-tuning training file failed validation, see the `error` field on `fine_tuning.job`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "bytes",
+          "created_at",
+          "filename",
+          "purpose",
+          "status"
+        ],
+        "x-oaiMeta": {
+          "name": "The file object",
+          "example": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"file\",\n  \"bytes\": 120000,\n  \"created_at\": 1677610602,\n  \"expires_at\": 1680202602,\n  \"filename\": \"salesOverview.pdf\",\n  \"purpose\": \"assistants\",\n}\n"
+        }
+      },
+      "OrganizationCertificate": {
+        "type": "object",
+        "description": "Represents an individual certificate configured at the organization level.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.certificate"
+            ],
+            "description": "The object type, which is always `organization.certificate`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The name of the certificate."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the certificate was uploaded."
+          },
+          "certificate_details": {
+            "type": "object",
+            "properties": {
+              "valid_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) of when the certificate becomes valid."
+              },
+              "expires_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) of when the certificate expires."
+              }
+            }
+          },
+          "active": {
+            "type": "boolean",
+            "description": "Whether the certificate is currently active at the organization level."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "created_at",
+          "certificate_details",
+          "active"
+        ]
+      },
+      "OrganizationCertificateActivationResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.certificate.activation"
+            ],
+            "description": "The organization certificate activation result type.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OrganizationCertificate"
+            }
+          }
+        },
+        "required": [
+          "object",
+          "data"
+        ]
+      },
+      "OrganizationCertificateDeactivationResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.certificate.deactivation"
+            ],
+            "description": "The organization certificate deactivation result type.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OrganizationCertificate"
+            }
+          }
+        },
+        "required": [
+          "object",
+          "data"
+        ]
+      },
+      "OrganizationDataRetention": {
+        "type": "object",
+        "description": "Represents the organization's data retention control setting.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.data_retention"
+            ],
+            "description": "The object type, which is always `organization.data_retention`.",
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "zero_data_retention",
+              "modified_abuse_monitoring",
+              "enhanced_zero_data_retention",
+              "enhanced_modified_abuse_monitoring"
+            ],
+            "description": "The configured organization data retention type."
+          }
+        },
+        "required": [
+          "object",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "The organization data retention object",
+          "example": "{\n    \"object\": \"organization.data_retention\",\n    \"type\": \"modified_abuse_monitoring\"\n}\n"
+        }
+      },
+      "OrganizationProjectCertificate": {
+        "type": "object",
+        "description": "Represents an individual certificate configured at the project level.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.certificate"
+            ],
+            "description": "The object type, which is always `organization.project.certificate`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The name of the certificate."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the certificate was uploaded."
+          },
+          "certificate_details": {
+            "type": "object",
+            "properties": {
+              "valid_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) of when the certificate becomes valid."
+              },
+              "expires_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) of when the certificate expires."
+              }
+            }
+          },
+          "active": {
+            "type": "boolean",
+            "description": "Whether the certificate is currently active at the project level."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "created_at",
+          "certificate_details",
+          "active"
+        ]
+      },
+      "OrganizationProjectCertificateActivationResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.certificate.activation"
+            ],
+            "description": "The project certificate activation result type.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OrganizationProjectCertificate"
+            }
+          }
+        },
+        "required": [
+          "object",
+          "data"
+        ]
+      },
+      "OrganizationProjectCertificateDeactivationResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.certificate.deactivation"
+            ],
+            "description": "The project certificate deactivation result type.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OrganizationProjectCertificate"
+            }
+          }
+        },
+        "required": [
+          "object",
+          "data"
+        ]
+      },
+      "OrganizationSpendAlert": {
+        "type": "object",
+        "description": "Represents a spend alert configured at the organization level.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.spend_alert"
+            ],
+            "description": "The object type, which is always `organization.spend_alert`.",
+            "x-stainless-const": true
+          },
+          "threshold_amount": {
+            "type": "integer",
+            "description": "The alert threshold amount, in cents."
+          },
+          "currency": {
+            "type": "string",
+            "enum": [
+              "USD"
+            ],
+            "description": "The currency for the threshold amount."
+          },
+          "interval": {
+            "type": "string",
+            "enum": [
+              "month"
+            ],
+            "description": "The time interval for evaluating spend against the threshold."
+          },
+          "notification_channel": {
+            "$ref": "#/components/schemas/SpendAlertNotificationChannel"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "threshold_amount",
+          "currency",
+          "interval",
+          "notification_channel"
+        ],
+        "x-oaiMeta": {
+          "name": "The organization spend alert object",
+          "example": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"organization.spend_alert\",\n    \"threshold_amount\": 100000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"notification_channel\": {\n        \"type\": \"email\",\n        \"recipients\": [\"finance@example.com\"],\n        \"subject_prefix\": \"OpenAI spend alert\"\n    }\n}\n"
+        }
+      },
+      "OrganizationSpendAlertDeletedResource": {
+        "type": "object",
+        "description": "Confirmation payload returned after deleting an organization spend alert.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The deleted spend alert ID."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.spend_alert.deleted"
+            ],
+            "description": "Always `organization.spend_alert.deleted`.",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the spend alert was deleted."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "OrganizationSpendAlertListResource": {
+        "type": "object",
+        "description": "Paginated list of organization spend alerts.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "Always `list`.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "Spend alerts returned in the current page.",
+            "items": {
+              "$ref": "#/components/schemas/OrganizationSpendAlert"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The ID of the first spend alert in this page."
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The ID of the last spend alert in this page."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether more spend alerts are available when paginating."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "OtherChunkingStrategyResponseParam": {
+        "type": "object",
+        "title": "Other Chunking Strategy",
+        "description": "This is returned when the chunking strategy is unknown. Typically, this is because the file was indexed before the `chunking_strategy` concept was introduced in the API.",
+        "additionalProperties": false,
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "Always `other`.",
+            "enum": [
+              "other"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "OutputAudio": {
+        "type": "object",
+        "title": "Output audio",
+        "description": "An audio output from the model.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the output audio. Always `output_audio`.\n",
+            "enum": [
+              "output_audio"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "string",
+            "description": "Base64-encoded audio data from the model.\n"
+          },
+          "transcript": {
+            "type": "string",
+            "description": "The transcript of the audio data from the model.\n"
+          }
+        },
+        "required": [
+          "type",
+          "data",
+          "transcript"
+        ]
+      },
+      "OutputContent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/OutputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/RefusalContent"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningTextContent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "OutputItem": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/OutputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/FileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/Program"
+          },
+          {
+            "$ref": "#/components/schemas/ProgramOutput"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchCall"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchOutput"
+          },
+          {
+            "$ref": "#/components/schemas/AdditionalTools"
+          },
+          {
+            "$ref": "#/components/schemas/CompactionBody"
+          },
+          {
+            "$ref": "#/components/schemas/ImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/MCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/MCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalResponseResource"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCallOutputResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "OutputMessage": {
+        "type": "object",
+        "title": "Output message",
+        "description": "An output message from the model.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the output message.\n"
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the output message. Always `message`.\n",
+            "enum": [
+              "message"
+            ],
+            "x-stainless-const": true
+          },
+          "role": {
+            "type": "string",
+            "description": "The role of the output message. Always `assistant`.\n",
+            "enum": [
+              "assistant"
+            ],
+            "x-stainless-const": true
+          },
+          "content": {
+            "type": "array",
+            "description": "The content of the output message.\n",
+            "items": {
+              "$ref": "#/components/schemas/OutputMessageContent"
+            }
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MessagePhase"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the message input. One of `in_progress`, `completed`, or\n`incomplete`. Populated when input items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "role",
+          "content",
+          "status"
+        ]
+      },
+      "OutputMessageContent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/OutputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/RefusalContent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ParallelToolCalls": {
+        "description": "Whether to enable [parallel function calling](https://developers.openai.com/api/docs/guides/function-calling#parallel-function-calling) during tool use.",
+        "type": "boolean",
+        "default": true
+      },
+      "PartialImages": {
+        "anyOf": [
+          {
+            "type": "integer",
+            "maximum": 3,
+            "minimum": 0,
+            "default": 0,
+            "example": 1,
+            "description": "The number of partial images to generate. This parameter is used for\nstreaming responses that return partial images. Value must be between 0 and 3.\nWhen set to 0, the response will be a single image sent in one streaming event.\n\nNote that the final image may be sent before the full number of partial images\nare generated if the full image is generated more quickly.\n"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "PredictionContent": {
+        "type": "object",
+        "title": "Static Content",
+        "description": "Static predicted output content, such as the content of a text file that is\nbeing regenerated.\n",
+        "required": [
+          "type",
+          "content"
+        ],
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "content"
+            ],
+            "description": "The type of the predicted content you want to provide. This type is\ncurrently always `content`.\n",
+            "x-stainless-const": true
+          },
+          "content": {
+            "description": "The content that should be matched when generating a model response.\nIf generated tokens would match this content, the entire model response\ncan be returned much more quickly.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "title": "Text content",
+                "description": "The content used for a Predicted Output. This is often the\ntext of a file you are regenerating with minor changes.\n"
+              },
+              {
+                "type": "array",
+                "description": "An array of content parts with a defined type. Supported options differ based on the [model](https://developers.openai.com/api/docs/models) being used to generate the response. Can contain text inputs.",
+                "title": "Array of content parts",
+                "items": {
+                  "$ref": "#/components/schemas/ChatCompletionRequestMessageContentPartText"
+                },
+                "minItems": 1
+              }
+            ]
+          }
+        }
+      },
+      "Project": {
+        "type": "object",
+        "description": "Represents an individual project.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project"
+            ],
+            "description": "The object type, which is always `organization.project`",
+            "x-stainless-const": true
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The name of the project. This appears in reporting."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the project was created."
+          },
+          "archived_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) of when the project was archived or `null`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "`active` or `archived`"
+          },
+          "external_key_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The external key associated with the project."
+          },
+          "residency": {
+            "$ref": "#/components/schemas/PublicProjectResidency",
+            "description": "The residency configuration for the project."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The project object",
+          "example": "{\n    \"id\": \"proj_abc\",\n    \"object\": \"organization.project\",\n    \"name\": \"Project example\",\n    \"created_at\": 1711471533,\n    \"archived_at\": null,\n    \"status\": \"active\",\n    \"external_key_id\": null\n}\n"
+        }
+      },
+      "ProjectApiKey": {
+        "type": "object",
+        "description": "Represents an individual API key in a project.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.api_key"
+            ],
+            "description": "The object type, which is always `organization.project.api_key`",
+            "x-stainless-const": true
+          },
+          "redacted_value": {
+            "type": "string",
+            "description": "The redacted value of the API key"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the API key"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the API key was created"
+          },
+          "expires_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The Unix timestamp (in seconds) when the API key expires, or null if it does not expire."
+          },
+          "last_used_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The Unix timestamp (in seconds) of when the API key was last used."
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "owner_project_access": {
+            "type": "string",
+            "enum": [
+              "active",
+              "inactive"
+            ],
+            "description": "Whether the API key's owner currently has effective access to the project."
+          },
+          "owner": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "user",
+                  "service_account"
+                ],
+                "description": "`user` or `service_account`"
+              },
+              "user": {
+                "$ref": "#/components/schemas/ProjectApiKeyOwnerUser"
+              },
+              "service_account": {
+                "$ref": "#/components/schemas/ProjectApiKeyOwnerServiceAccount"
+              }
+            }
+          }
+        },
+        "required": [
+          "object",
+          "redacted_value",
+          "name",
+          "created_at",
+          "last_used_at",
+          "id",
+          "owner_project_access",
+          "owner"
+        ],
+        "x-oaiMeta": {
+          "name": "The project API key object",
+          "example": "{\n    \"object\": \"organization.project.api_key\",\n    \"redacted_value\": \"sk-abc...def\",\n    \"name\": \"My API Key\",\n    \"created_at\": 1711471533,\n    \"expires_at\": 1714063533,\n    \"last_used_at\": 1711471534,\n    \"id\": \"key_abc\",\n    \"owner_project_access\": \"active\",\n    \"owner\": {\n        \"type\": \"user\",\n        \"user\": {\n            \"id\": \"user_abc\",\n            \"name\": \"First Last\",\n            \"email\": \"user@example.com\",\n            \"role\": \"owner\",\n            \"created_at\": 1711471533\n        }\n    }\n}\n"
+        }
+      },
+      "ProjectApiKeyDeleteResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.api_key.deleted"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "deleted"
+        ]
+      },
+      "ProjectApiKeyListResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProjectApiKey"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ProjectApiKeyOwnerServiceAccount": {
+        "type": "object",
+        "description": "The service account that owns a project API key.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the service account."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the service account was created."
+          },
+          "role": {
+            "type": "string",
+            "description": "The service account's project role."
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "created_at",
+          "role"
+        ]
+      },
+      "ProjectApiKeyOwnerUser": {
+        "type": "object",
+        "description": "The user that owns a project API key.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "email": {
+            "type": "string",
+            "description": "The email address of the user."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the user."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the user was created."
+          },
+          "role": {
+            "type": "string",
+            "description": "The user's project role."
+          }
+        },
+        "required": [
+          "id",
+          "email",
+          "name",
+          "created_at",
+          "role"
+        ]
+      },
+      "ProjectCreateRequest": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The friendly name of the project, this name appears in reports."
+          },
+          "geography": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "deprecated": true,
+            "description": "Create the project with the specified data residency region. Your organization must have access to Data residency functionality in order to use. See [data residency controls](https://developers.openai.com/api/docs/guides/your-data#data-residency-controls) to review the functionality and limitations of setting this field.\nDeprecated: use `residency` instead. Do not provide both `geography` and `residency`."
+          },
+          "residency": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/PublicProjectResidency"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Create the project with the specified residency configuration. Your organization must have access to the requested residency configuration in order to use it. See [data residency controls](https://developers.openai.com/api/docs/guides/your-data#data-residency-controls) to review the functionality and limitations of setting this field."
+          },
+          "external_key_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "External key ID to associate with the project."
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "ProjectDataRetention": {
+        "type": "object",
+        "description": "Represents a project's data retention control setting.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.data_retention"
+            ],
+            "description": "The object type, which is always `project.data_retention`.",
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "organization_default",
+              "none",
+              "zero_data_retention",
+              "modified_abuse_monitoring",
+              "enhanced_zero_data_retention",
+              "enhanced_modified_abuse_monitoring"
+            ],
+            "description": "The configured project data retention type."
+          }
+        },
+        "required": [
+          "object",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "The project data retention object",
+          "example": "{\n    \"object\": \"project.data_retention\",\n    \"type\": \"organization_default\"\n}\n"
+        }
+      },
+      "ProjectGroup": {
+        "type": "object",
+        "description": "Details about a group's membership in a project.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.group"
+            ],
+            "description": "Always `project.group`.",
+            "x-stainless-const": true
+          },
+          "project_id": {
+            "type": "string",
+            "description": "Identifier of the project."
+          },
+          "group_id": {
+            "type": "string",
+            "description": "Identifier of the group that has access to the project."
+          },
+          "group_name": {
+            "type": "string",
+            "description": "Display name of the group."
+          },
+          "group_type": {
+            "type": "string",
+            "enum": [
+              "group",
+              "tenant_group"
+            ],
+            "description": "The type of the group."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the group was granted project access."
+          }
+        },
+        "required": [
+          "object",
+          "project_id",
+          "group_id",
+          "group_name",
+          "group_type",
+          "created_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The project group object",
+          "example": "{\n    \"object\": \"project.group\",\n    \"project_id\": \"proj_abc123\",\n    \"group_id\": \"group_01J1F8ABCDXYZ\",\n    \"group_name\": \"Support Team\",\n    \"group_type\": \"group\",\n    \"created_at\": 1711471533\n}\n"
+        }
+      },
+      "ProjectGroupDeletedResource": {
+        "type": "object",
+        "description": "Confirmation payload returned after removing a group from a project.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.group.deleted"
+            ],
+            "description": "Always `project.group.deleted`.",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the group membership in the project was removed."
+          }
+        },
+        "required": [
+          "object",
+          "deleted"
+        ],
+        "x-oaiMeta": {
+          "name": "Project group deletion confirmation",
+          "example": "{\n    \"object\": \"project.group.deleted\",\n    \"deleted\": true\n}\n"
+        }
+      },
+      "ProjectGroupListResource": {
+        "type": "object",
+        "description": "Paginated list of groups that have access to a project.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "Always `list`.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "Project group memberships returned in the current page.",
+            "items": {
+              "$ref": "#/components/schemas/ProjectGroup"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether additional project group memberships are available."
+          },
+          "next": {
+            "description": "Cursor to fetch the next page of results, or `null` when there are no more results.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "next"
+        ],
+        "x-oaiMeta": {
+          "name": "Project group list",
+          "example": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"project.group\",\n            \"project_id\": \"proj_abc123\",\n            \"group_id\": \"group_01J1F8ABCDXYZ\",\n            \"group_name\": \"Support Team\",\n            \"created_at\": 1711471533\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+        }
+      },
+      "ProjectHostedToolPermissions": {
+        "type": "object",
+        "description": "Represents hosted tool permissions for a project.",
+        "properties": {
+          "file_search": {
+            "$ref": "#/components/schemas/HostedToolPermission"
+          },
+          "web_search": {
+            "$ref": "#/components/schemas/HostedToolPermission"
+          },
+          "image_generation": {
+            "$ref": "#/components/schemas/HostedToolPermission"
+          },
+          "mcp": {
+            "$ref": "#/components/schemas/HostedToolPermission"
+          },
+          "code_interpreter": {
+            "$ref": "#/components/schemas/HostedToolPermission"
+          }
+        },
+        "required": [
+          "file_search",
+          "web_search",
+          "image_generation",
+          "mcp",
+          "code_interpreter"
+        ],
+        "x-oaiMeta": {
+          "name": "The project hosted tool permissions object",
+          "example": "{\n    \"file_search\": {\n        \"enabled\": true\n    },\n    \"web_search\": {\n        \"enabled\": true\n    },\n    \"image_generation\": {\n        \"enabled\": true\n    },\n    \"mcp\": {\n        \"enabled\": true\n    },\n    \"code_interpreter\": {\n        \"enabled\": true\n    }\n}\n"
+        }
+      },
+      "ProjectHostedToolPermissionsUpdateRequest": {
+        "type": "object",
+        "properties": {
+          "file_search": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/HostedToolPermissionUpdate"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The file search permission update."
+          },
+          "web_search": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/HostedToolPermissionUpdate"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The web search permission update."
+          },
+          "image_generation": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/HostedToolPermissionUpdate"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The image generation permission update."
+          },
+          "mcp": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/HostedToolPermissionUpdate"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The MCP permission update."
+          },
+          "code_interpreter": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/HostedToolPermissionUpdate"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The code interpreter permission update."
+          }
+        }
+      },
+      "ProjectListResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Project"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ProjectModelPermissions": {
+        "type": "object",
+        "description": "Represents the model allowlist or denylist policy for a project.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.model_permissions"
+            ],
+            "description": "The object type, which is always `project.model_permissions`.",
+            "x-stainless-const": true
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "allow_list",
+              "deny_list"
+            ],
+            "description": "Whether the project uses an allowlist or a denylist."
+          },
+          "model_ids": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "The model IDs included in the model permissions policy."
+          }
+        },
+        "required": [
+          "object",
+          "mode",
+          "model_ids"
+        ],
+        "x-oaiMeta": {
+          "name": "The project model permissions object",
+          "example": "{\n    \"object\": \"project.model_permissions\",\n    \"mode\": \"allow_list\",\n    \"model_ids\": [\n        \"gpt-6-astra\",\n        \"o3\"\n    ]\n}\n"
+        }
+      },
+      "ProjectModelPermissionsDeleteResponse": {
+        "type": "object",
+        "description": "Confirmation payload returned after deleting project model permissions.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.model_permissions.deleted"
+            ],
+            "description": "The object type, which is always `project.model_permissions.deleted`.",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the project model permissions were deleted."
+          }
+        },
+        "required": [
+          "object",
+          "deleted"
+        ],
+        "x-oaiMeta": {
+          "name": "Project model permissions deletion confirmation",
+          "example": "{\n    \"object\": \"project.model_permissions.deleted\",\n    \"deleted\": true\n}\n"
+        }
+      },
+      "ProjectModelPermissionsUpdateRequest": {
+        "type": "object",
+        "properties": {
+          "mode": {
+            "type": "string",
+            "enum": [
+              "allow_list",
+              "deny_list"
+            ],
+            "description": "The model permissions mode to apply."
+          },
+          "model_ids": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "The model IDs included in this permissions policy."
+          }
+        },
+        "required": [
+          "mode",
+          "model_ids"
+        ]
+      },
+      "ProjectRateLimit": {
+        "type": "object",
+        "description": "Represents a project rate limit config.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.rate_limit"
+            ],
+            "description": "The object type, which is always `project.rate_limit`",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints."
+          },
+          "model": {
+            "type": "string",
+            "description": "The model this rate limit applies to."
+          },
+          "max_requests_per_1_minute": {
+            "type": "integer",
+            "description": "The maximum requests per minute."
+          },
+          "max_tokens_per_1_minute": {
+            "type": "integer",
+            "description": "The maximum tokens per minute."
+          },
+          "max_images_per_1_minute": {
+            "type": "integer",
+            "description": "The maximum images per minute. Only present for relevant models."
+          },
+          "max_audio_megabytes_per_1_minute": {
+            "type": "integer",
+            "description": "The maximum audio megabytes per minute. Only present for relevant models."
+          },
+          "max_requests_per_1_day": {
+            "type": "integer",
+            "description": "The maximum requests per day. Only present for relevant models."
+          },
+          "batch_1_day_max_input_tokens": {
+            "type": "integer",
+            "description": "The maximum batch input tokens per day. Only present for relevant models."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "model",
+          "max_requests_per_1_minute",
+          "max_tokens_per_1_minute"
+        ],
+        "x-oaiMeta": {
+          "name": "The project rate limit object",
+          "example": "{\n    \"object\": \"project.rate_limit\",\n    \"id\": \"rl_ada\",\n    \"model\": \"ada\",\n    \"max_requests_per_1_minute\": 600,\n    \"max_tokens_per_1_minute\": 150000,\n    \"max_images_per_1_minute\": 10\n}\n"
+        }
+      },
+      "ProjectRateLimitListResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProjectRateLimit"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ProjectRateLimitUpdateRequest": {
+        "type": "object",
+        "properties": {
+          "max_requests_per_1_minute": {
+            "type": "integer",
+            "description": "The maximum requests per minute."
+          },
+          "max_tokens_per_1_minute": {
+            "type": "integer",
+            "description": "The maximum tokens per minute."
+          },
+          "max_images_per_1_minute": {
+            "type": "integer",
+            "description": "The maximum images per minute. Only relevant for certain models."
+          },
+          "max_audio_megabytes_per_1_minute": {
+            "type": "integer",
+            "description": "The maximum audio megabytes per minute. Only relevant for certain models."
+          },
+          "max_requests_per_1_day": {
+            "type": "integer",
+            "description": "The maximum requests per day. Only relevant for certain models."
+          },
+          "batch_1_day_max_input_tokens": {
+            "type": "integer",
+            "description": "The maximum batch input tokens per day. Only relevant for certain models."
+          }
+        }
+      },
+      "ProjectServiceAccount": {
+        "type": "object",
+        "description": "Represents an individual service account in a project.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.service_account"
+            ],
+            "description": "The object type, which is always `organization.project.service_account`",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the service account"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "owner",
+              "member",
+              "none"
+            ],
+            "description": "`owner`, `member`, or `none`"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the service account was created"
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "role",
+          "created_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The project service account object",
+          "example": "{\n    \"object\": \"organization.project.service_account\",\n    \"id\": \"svc_acct_abc\",\n    \"name\": \"Service Account\",\n    \"role\": \"owner\",\n    \"created_at\": 1711471533\n}\n"
+        }
+      },
+      "ProjectServiceAccountApiKey": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.service_account.api_key"
+            ],
+            "description": "The object type, which is always `organization.project.service_account.api_key`",
+            "x-stainless-const": true
+          },
+          "value": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "expires_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The Unix timestamp (in seconds) when the API key expires, or null if it does not expire."
+          },
+          "id": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "object",
+          "value",
+          "name",
+          "created_at",
+          "id"
+        ]
+      },
+      "ProjectServiceAccountCreateRequest": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the service account being created."
+          },
+          "create_service_account_only": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Create the service account without default roles or an API key."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "expires_in_seconds": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 31536000
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Number of seconds until the initial API key expires. If omitted or null, the key does not expire unless the effective organization or project policy requires an expiration. When a policy sets a maximum lifetime, this value must be provided and must not exceed that limit. A non-null value cannot be used when `create_service_account_only` is true."
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "ProjectServiceAccountCreateResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.service_account"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "member",
+              "none"
+            ],
+            "description": "Service accounts created with default project membership have role `member`. Accounts created with `create_service_account_only` have role `none`.\n"
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "api_key": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ProjectServiceAccountApiKey"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "role",
+          "created_at",
+          "api_key"
+        ]
+      },
+      "ProjectServiceAccountDeleteResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.service_account.deleted"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "deleted"
+        ]
+      },
+      "ProjectServiceAccountListResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProjectServiceAccount"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ProjectSpendAlert": {
+        "type": "object",
+        "description": "Represents a spend alert configured at the project level.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.spend_alert"
+            ],
+            "description": "The object type, which is always `project.spend_alert`.",
+            "x-stainless-const": true
+          },
+          "threshold_amount": {
+            "type": "integer",
+            "description": "The alert threshold amount, in cents."
+          },
+          "currency": {
+            "type": "string",
+            "enum": [
+              "USD"
+            ],
+            "description": "The currency for the threshold amount."
+          },
+          "interval": {
+            "type": "string",
+            "enum": [
+              "month"
+            ],
+            "description": "The time interval for evaluating spend against the threshold."
+          },
+          "notification_channel": {
+            "$ref": "#/components/schemas/SpendAlertNotificationChannel"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "threshold_amount",
+          "currency",
+          "interval",
+          "notification_channel"
+        ],
+        "x-oaiMeta": {
+          "name": "The project spend alert object",
+          "example": "{\n    \"id\": \"alert_abc123\",\n    \"object\": \"project.spend_alert\",\n    \"threshold_amount\": 100000,\n    \"currency\": \"USD\",\n    \"interval\": \"month\",\n    \"notification_channel\": {\n        \"type\": \"email\",\n        \"recipients\": [\"finance@example.com\"],\n        \"subject_prefix\": \"OpenAI spend alert\"\n    }\n}\n"
+        }
+      },
+      "ProjectSpendAlertDeletedResource": {
+        "type": "object",
+        "description": "Confirmation payload returned after deleting a project spend alert.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The deleted spend alert ID."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.spend_alert.deleted"
+            ],
+            "description": "Always `project.spend_alert.deleted`.",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the spend alert was deleted."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ]
+      },
+      "ProjectSpendAlertListResource": {
+        "type": "object",
+        "description": "Paginated list of project spend alerts.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "Always `list`.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "Spend alerts returned in the current page.",
+            "items": {
+              "$ref": "#/components/schemas/ProjectSpendAlert"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The ID of the first spend alert in this page."
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The ID of the last spend alert in this page."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether more spend alerts are available when paginating."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ProjectUpdateRequest": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The updated name of the project, this name appears in reports."
+          },
+          "external_key_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "External key ID to associate with the project."
+          },
+          "geography": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "deprecated": true,
+            "description": "Geography for the project.\nDeprecated: use `residency` when creating a project to configure data residency. This field is retained for backward compatibility."
+          }
+        }
+      },
+      "ProjectUser": {
+        "type": "object",
+        "description": "Represents an individual user in a project.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.user"
+            ],
+            "description": "The object type, which is always `organization.project.user`",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The name of the user"
+          },
+          "email": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The email address of the user"
+          },
+          "role": {
+            "type": "string",
+            "description": "`owner` or `member`"
+          },
+          "added_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the project was added."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "role",
+          "added_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The project user object",
+          "example": "{\n    \"object\": \"organization.project.user\",\n    \"id\": \"user_abc\",\n    \"name\": \"First Last\",\n    \"email\": \"user@example.com\",\n    \"role\": \"owner\",\n    \"added_at\": 1711471533\n}\n"
+        }
+      },
+      "ProjectUserCreateRequest": {
+        "type": "object",
+        "properties": {
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The ID of the user."
+          },
+          "email": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Email of the user to add."
+          },
+          "role": {
+            "type": "string",
+            "description": "`owner` or `member`"
+          }
+        },
+        "required": [
+          "role"
+        ]
+      },
+      "ProjectUserDeleteResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.user.deleted"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "deleted"
+        ]
+      },
+      "ProjectUserListResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProjectUser"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "ProjectUserUpdateRequest": {
+        "type": "object",
+        "properties": {
+          "role": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "`owner` or `member`"
+          }
+        }
+      },
+      "Prompt": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "Reference to a prompt template and its variables.\n[Learn more](https://developers.openai.com/api/docs/guides/text?api-mode=responses#version-prompts-in-code).\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique identifier of the prompt template to use."
+              },
+              "version": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Optional version of the prompt template."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "variables": {
+                "$ref": "#/components/schemas/ResponsePromptVariables"
+              }
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "PublicAssignOrganizationGroupRoleBody": {
+        "type": "object",
+        "description": "Request payload for assigning a role to a group or user.",
+        "properties": {
+          "role_id": {
+            "type": "string",
+            "description": "Identifier of the role to assign."
+          }
+        },
+        "required": [
+          "role_id"
+        ],
+        "x-oaiMeta": {
+          "example": "{\n    \"role_id\": \"role_01J1F8ROLE01\"\n}\n"
+        }
+      },
+      "PublicCreateOrganizationRoleBody": {
+        "type": "object",
+        "description": "Request payload for creating a custom role.",
+        "properties": {
+          "role_name": {
+            "type": "string",
+            "description": "Unique name for the role."
+          },
+          "permissions": {
+            "type": "array",
+            "description": "Permissions to grant to the role.",
+            "items": {
+              "type": "string"
+            }
+          },
+          "description": {
+            "description": "Optional description of the role.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "role_name",
+          "permissions"
+        ],
+        "x-oaiMeta": {
+          "example": "{\n    \"role_name\": \"API Group Manager\",\n    \"permissions\": [\n        \"api.groups.read\",\n        \"api.groups.write\"\n    ],\n    \"description\": \"Allows managing organization groups\"\n}\n"
+        }
+      },
+      "PublicRoleListResource": {
+        "type": "object",
+        "description": "Paginated list of roles available on an organization or project.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "Always `list`.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "Roles returned in the current page.",
+            "items": {
+              "$ref": "#/components/schemas/Role"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether more roles are available when paginating."
+          },
+          "next": {
+            "description": "Cursor to fetch the next page of results, or `null` when there are no additional roles.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "next"
+        ],
+        "x-oaiMeta": {
+          "name": "Role list",
+          "example": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"object\": \"role\",\n            \"id\": \"role_01J1F8ROLE01\",\n            \"name\": \"API Group Manager\",\n            \"description\": \"Allows managing organization groups\",\n            \"permissions\": [\n                \"api.groups.read\",\n                \"api.groups.write\"\n            ],\n            \"resource_type\": \"api.organization\",\n            \"predefined_role\": false\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+        }
+      },
+      "PublicUpdateOrganizationRoleBody": {
+        "type": "object",
+        "description": "Request payload for updating an existing role.",
+        "properties": {
+          "permissions": {
+            "description": "Updated set of permissions for the role.",
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "description": {
+            "description": "New description for the role.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "role_name": {
+            "description": "New name for the role.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "x-oaiMeta": {
+          "example": "{\n    \"role_name\": \"API Group Manager\",\n    \"permissions\": [\n        \"api.groups.read\",\n        \"api.groups.write\"\n    ],\n    \"description\": \"Allows managing organization groups\"\n}\n"
+        }
+      },
+      "RealtimeAudioFormats": {
+        "anyOf": [
+          {
+            "type": "object",
+            "title": "PCM audio format",
+            "description": "The PCM audio format. Only a 24kHz sample rate is supported.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The audio format. Always `audio/pcm`.",
+                "enum": [
+                  "audio/pcm"
+                ]
+              },
+              "rate": {
+                "type": "integer",
+                "description": "The sample rate of the audio. Always `24000`.",
+                "enum": [
+                  24000
+                ]
+              }
+            }
+          },
+          {
+            "type": "object",
+            "title": "PCMU audio format",
+            "description": "The G.711 μ-law format.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The audio format. Always `audio/pcmu`.",
+                "enum": [
+                  "audio/pcmu"
+                ]
+              }
+            }
+          },
+          {
+            "type": "object",
+            "title": "PCMA audio format",
+            "description": "The G.711 A-law format.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The audio format. Always `audio/pcma`.",
+                "enum": [
+                  "audio/pcma"
+                ]
+              }
+            }
+          }
+        ]
+      },
+      "RealtimeBetaClientEventConversationItemCreate": {
+        "type": "object",
+        "description": "Add a new Item to the Conversation's context, including messages, function \ncalls, and function call responses. This event can be used both to populate a \n\"history\" of the conversation and to add new items mid-stream, but has the \ncurrent limitation that it cannot populate assistant audio messages.\n\nIf successful, the server will respond with a `conversation.item.created` \nevent, otherwise an `error` event will be sent.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.create"
+            ],
+            "description": "The event type, must be `conversation.item.create`.",
+            "x-stainless-const": true
+          },
+          "previous_item_id": {
+            "type": "string",
+            "description": "The ID of the preceding item after which the new item will be inserted. \nIf not set, the new item will be appended to the end of the conversation.\nIf set to `root`, the new item will be added to the beginning of the conversation.\nIf set to an existing ID, it allows an item to be inserted mid-conversation. If the\nID cannot be found, an error will be returned and the item will not be added.\n"
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.create",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"conversation.item.create\",\n  \"item\": {\n    \"type\": \"message\",\n    \"role\": \"user\",\n    \"content\": [\n      {\n        \"type\": \"input_text\",\n        \"text\": \"hi\"\n      }\n    ]\n  },\n  \"event_id\": \"b904fba0-0ec4-40af-8bbb-f908a9b26793\",\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventConversationItemDelete": {
+        "type": "object",
+        "description": "Send this event when you want to remove any item from the conversation \nhistory. The server will respond with a `conversation.item.deleted` event, \nunless the item does not exist in the conversation history, in which case the \nserver will respond with an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.delete"
+            ],
+            "description": "The event type, must be `conversation.item.delete`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item to delete."
+          }
+        },
+        "required": [
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.delete",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_901\",\n    \"type\": \"conversation.item.delete\",\n    \"item_id\": \"msg_003\"\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventConversationItemRetrieve": {
+        "type": "object",
+        "description": "Send this event when you want to retrieve the server's representation of a specific item in the conversation history. This is useful, for example, to inspect user audio after noise cancellation and VAD.\nThe server will respond with a `conversation.item.retrieved` event, \nunless the item does not exist in the conversation history, in which case the \nserver will respond with an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.retrieve"
+            ],
+            "description": "The event type, must be `conversation.item.retrieve`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item to retrieve."
+          }
+        },
+        "required": [
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.retrieve",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_901\",\n    \"type\": \"conversation.item.retrieve\",\n    \"item_id\": \"msg_003\"\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventConversationItemTruncate": {
+        "type": "object",
+        "description": "Send this event to truncate a previous assistant message’s audio. The server \nwill produce audio faster than realtime, so this event is useful when the user \ninterrupts to truncate audio that has already been sent to the client but not \nyet played. This will synchronize the server's understanding of the audio with \nthe client's playback.\n\nTruncating audio will delete the server-side text transcript to ensure there \nis not text in the context that hasn't been heard by the user.\n\nIf successful, the server will respond with a `conversation.item.truncated` \nevent. \n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.truncate"
+            ],
+            "description": "The event type, must be `conversation.item.truncate`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the assistant message item to truncate. Only assistant message \nitems can be truncated.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part to truncate. Set this to 0."
+          },
+          "audio_end_ms": {
+            "type": "integer",
+            "description": "Inclusive duration up to which audio is truncated, in milliseconds. If \nthe audio_end_ms is greater than the actual audio duration, the server \nwill respond with an error.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "content_index",
+          "audio_end_ms"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.truncate",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_678\",\n    \"type\": \"conversation.item.truncate\",\n    \"item_id\": \"msg_002\",\n    \"content_index\": 0,\n    \"audio_end_ms\": 1500\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventInputAudioBufferAppend": {
+        "type": "object",
+        "description": "Send this event to append audio bytes to the input audio buffer. The audio \nbuffer is temporary storage you can write to and later commit. In Server VAD \nmode, the audio buffer is used to detect speech and the server will decide \nwhen to commit. When Server VAD is disabled, you must commit the audio buffer\nmanually.\n\nThe client may choose how much audio to place in each event up to a maximum \nof 15 MiB, for example streaming smaller chunks from the client may allow the \nVAD to be more responsive. Unlike made other client events, the server will \nnot send a confirmation response to this event.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.append"
+            ],
+            "description": "The event type, must be `input_audio_buffer.append`.",
+            "x-stainless-const": true
+          },
+          "audio": {
+            "type": "string",
+            "description": "Base64-encoded audio bytes. This must be in the format specified by the \n`input_audio_format` field in the session configuration.\n"
+          }
+        },
+        "required": [
+          "type",
+          "audio"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.append",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_456\",\n    \"type\": \"input_audio_buffer.append\",\n    \"audio\": \"Base64EncodedAudioData\"\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventInputAudioBufferClear": {
+        "type": "object",
+        "description": "Send this event to clear the audio bytes in the buffer. The server will \nrespond with an `input_audio_buffer.cleared` event.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.clear"
+            ],
+            "description": "The event type, must be `input_audio_buffer.clear`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.clear",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_012\",\n    \"type\": \"input_audio_buffer.clear\"\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventInputAudioBufferCommit": {
+        "type": "object",
+        "description": "Send this event to commit the user input audio buffer, which will create a \nnew user message item in the conversation. This event will produce an error \nif the input audio buffer is empty. When in Server VAD mode, the client does \nnot need to send this event, the server will commit the audio buffer \nautomatically.\n\nCommitting the input audio buffer will trigger input audio transcription \n(if enabled in session configuration), but it will not create a response \nfrom the model. The server will respond with an `input_audio_buffer.committed` \nevent.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.commit"
+            ],
+            "description": "The event type, must be `input_audio_buffer.commit`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.commit",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_789\",\n    \"type\": \"input_audio_buffer.commit\"\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventOutputAudioBufferClear": {
+        "type": "object",
+        "description": "**WebRTC/SIP Only:** Emit to cut off the current audio response. This will trigger the server to\nstop generating audio and emit a `output_audio_buffer.cleared` event. This\nevent should be preceded by a `response.cancel` client event to stop the\ngeneration of the current response.\n[Learn more](https://developers.openai.com/api/docs/guides/realtime-conversations#client-and-server-events-for-audio-in-webrtc).\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the client event used for error handling."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_audio_buffer.clear"
+            ],
+            "description": "The event type, must be `output_audio_buffer.clear`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "output_audio_buffer.clear",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"optional_client_event_id\",\n    \"type\": \"output_audio_buffer.clear\"\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventResponseCancel": {
+        "type": "object",
+        "description": "Send this event to cancel an in-progress response. The server will respond \nwith a `response.done` event with a status of `response.status=cancelled`. If \nthere is no response to cancel, the server will respond with an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.cancel"
+            ],
+            "description": "The event type, must be `response.cancel`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "A specific response ID to cancel - if not provided, will cancel an \nin-progress response in the default conversation.\n"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "response.cancel",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_567\",\n    \"type\": \"response.cancel\"\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventResponseCreate": {
+        "type": "object",
+        "description": "This event instructs the server to create a Response, which means triggering \nmodel inference. When in Server VAD mode, the server will create Responses \nautomatically.\n\nA Response will include at least one Item, and may have two, in which case \nthe second will be a function call. These Items will be appended to the \nconversation history.\n\nThe server will respond with a `response.created` event, events for Items \nand content created, and finally a `response.done` event to indicate the \nResponse is complete.\n\nThe `response.create` event can optionally include inference configuration like \n`instructions`, and `temperature`. These fields will override the Session's \nconfiguration for this Response only.\n\nResponses can be created out-of-band of the default Conversation, meaning that they can\nhave arbitrary input, and it's possible to disable writing the output to the Conversation.\nOnly one Response can write to the default Conversation at a time, but otherwise multiple\nResponses can be created in parallel.\n\nClients can set `conversation` to `none` to create a Response that does not write to the default\nConversation. Arbitrary input can be provided with the `input` field, which is an array accepting\nraw Items and references to existing Items.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.create"
+            ],
+            "description": "The event type, must be `response.create`.",
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/RealtimeBetaResponseCreateParams"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "response.create",
+          "group": "realtime",
+          "example": "// Trigger a response with the default Conversation and no special parameters\n{\n  \"type\": \"response.create\",\n}\n\n// Trigger an out-of-band response that does not write to the default Conversation\n{\n  \"type\": \"response.create\",\n  \"response\": {\n    \"instructions\": \"Provide a concise answer.\",\n    \"tools\": [], // clear any session tools\n    \"conversation\": \"none\",\n    \"output_modalities\": [\"text\"],\n    \"input\": [\n      {\n        \"type\": \"item_reference\",\n        \"id\": \"item_12345\",\n      },\n      {\n        \"type\": \"message\",\n        \"role\": \"user\",\n        \"content\": [\n          {\n            \"type\": \"input_text\",\n            \"text\": \"Summarize the above message in one sentence.\"\n          }\n        ]\n      }\n    ],\n  }\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventSessionUpdate": {
+        "type": "object",
+        "description": "Send this event to update the session’s default configuration.\nThe client may send this event at any time to update any field,\nexcept for `voice`. However, note that once a session has been\ninitialized with a particular `model`, it can’t be changed to\nanother model using `session.update`.\n\nWhen the server receives a `session.update`, it will respond\nwith a `session.updated` event showing the full, effective configuration.\nOnly the fields that are present are updated. To clear a field like\n`instructions`, pass an empty string.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.update"
+            ],
+            "description": "The event type, must be `session.update`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeSessionCreateRequest"
+          }
+        },
+        "required": [
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.update",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"session.update\",\n  \"session\": {\n    \"tools\": [\n      {\n        \"type\": \"function\",\n        \"name\": \"display_color_palette\",\n        \"description\": \"Call this function when a user asks for a color palette.\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"theme\": {\n              \"type\": \"string\",\n              \"description\": \"Description of the theme for the color scheme.\"\n            },\n            \"colors\": {\n              \"type\": \"array\",\n              \"description\": \"Array of five hex color codes based on the theme.\",\n              \"items\": {\n                \"type\": \"string\",\n                \"description\": \"Hex color code\"\n              }\n            }\n          },\n          \"required\": [\n            \"theme\",\n            \"colors\"\n          ]\n        }\n      }\n    ],\n    \"tool_choice\": \"auto\"\n  }\n}\n"
+        }
+      },
+      "RealtimeBetaClientEventTranscriptionSessionUpdate": {
+        "type": "object",
+        "description": "Send this event to update a transcription session.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "transcription_session.update"
+            ],
+            "description": "The event type, must be `transcription_session.update`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateRequest"
+          }
+        },
+        "required": [
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "transcription_session.update",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"transcription_session.update\",\n  \"session\": {\n    \"input_audio_format\": \"pcm16\",\n    \"input_audio_transcription\": {\n      \"model\": \"gpt-4o-transcribe\",\n      \"prompt\": \"\",\n      \"language\": \"\"\n    },\n    \"turn_detection\": {\n      \"type\": \"server_vad\",\n      \"threshold\": 0.5,\n      \"prefix_padding_ms\": 300,\n      \"silence_duration_ms\": 500,\n      \"create_response\": true,\n    },\n    \"input_audio_noise_reduction\": {\n      \"type\": \"near_field\"\n    },\n    \"include\": [\n      \"item.input_audio_transcription.logprobs\",\n    ]\n  }\n}\n"
+        }
+      },
+      "RealtimeBetaResponse": {
+        "type": "object",
+        "description": "The response resource.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the response."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.response"
+            ],
+            "description": "The object type, must be `realtime.response`.",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed",
+              "cancelled",
+              "failed",
+              "incomplete",
+              "in_progress"
+            ],
+            "description": "The final status of the response (`completed`, `cancelled`, `failed`, or \n`incomplete`, `in_progress`).\n"
+          },
+          "status_details": {
+            "type": "object",
+            "description": "Additional details about the status.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "completed",
+                  "cancelled",
+                  "failed",
+                  "incomplete"
+                ],
+                "description": "The type of error that caused the response to fail, corresponding \nwith the `status` field (`completed`, `cancelled`, `incomplete`, \n`failed`).\n"
+              },
+              "reason": {
+                "type": "string",
+                "enum": [
+                  "turn_detected",
+                  "client_cancelled",
+                  "max_output_tokens",
+                  "content_filter"
+                ],
+                "description": "The reason the Response did not complete. For a `cancelled` Response, \none of `turn_detected` (the server VAD detected a new start of speech) \nor `client_cancelled` (the client sent a cancel event). For an \n`incomplete` Response, one of `max_output_tokens` or `content_filter` \n(the server-side safety filter activated and cut off the response).\n"
+              },
+              "error": {
+                "type": "object",
+                "description": "A description of the error that caused the response to fail, \npopulated when the `status` is `failed`.\n",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "description": "The type of error."
+                  },
+                  "code": {
+                    "type": "string",
+                    "description": "Error code, if any."
+                  }
+                }
+              }
+            }
+          },
+          "output": {
+            "type": "array",
+            "description": "The list of output items generated by the response.",
+            "items": {
+              "$ref": "#/components/schemas/RealtimeConversationItem"
+            }
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "usage": {
+            "type": "object",
+            "description": "Usage statistics for the Response, this will correspond to billing. A \nRealtime API session will maintain a conversation context and append new \nItems to the Conversation, thus output from previous turns (text and \naudio tokens) will become the input for later turns.\n",
+            "properties": {
+              "total_tokens": {
+                "type": "integer",
+                "description": "The total number of tokens in the Response including input and output \ntext and audio tokens.\n"
+              },
+              "input_tokens": {
+                "type": "integer",
+                "description": "The number of input tokens used in the Response, including text and \naudio tokens.\n"
+              },
+              "output_tokens": {
+                "type": "integer",
+                "description": "The number of output tokens sent in the Response, including text and \naudio tokens.\n"
+              },
+              "input_token_details": {
+                "type": "object",
+                "description": "Details about the input tokens used in the Response.",
+                "properties": {
+                  "cached_tokens": {
+                    "type": "integer",
+                    "description": "The number of cached tokens used as input for the Response."
+                  },
+                  "text_tokens": {
+                    "type": "integer",
+                    "description": "The number of text tokens used as input for the Response."
+                  },
+                  "image_tokens": {
+                    "type": "integer",
+                    "description": "The number of image tokens used as input for the Response."
+                  },
+                  "audio_tokens": {
+                    "type": "integer",
+                    "description": "The number of audio tokens used as input for the Response."
+                  },
+                  "cached_tokens_details": {
+                    "type": "object",
+                    "description": "Details about the cached tokens used as input for the Response.",
+                    "properties": {
+                      "text_tokens": {
+                        "type": "integer",
+                        "description": "The number of cached text tokens used as input for the Response."
+                      },
+                      "image_tokens": {
+                        "type": "integer",
+                        "description": "The number of cached image tokens used as input for the Response."
+                      },
+                      "audio_tokens": {
+                        "type": "integer",
+                        "description": "The number of cached audio tokens used as input for the Response."
+                      }
+                    }
+                  }
+                }
+              },
+              "output_token_details": {
+                "type": "object",
+                "description": "Details about the output tokens used in the Response.",
+                "properties": {
+                  "text_tokens": {
+                    "type": "integer",
+                    "description": "The number of text tokens used in the Response."
+                  },
+                  "audio_tokens": {
+                    "type": "integer",
+                    "description": "The number of audio tokens used in the Response."
+                  }
+                }
+              }
+            }
+          },
+          "conversation_id": {
+            "description": "Which conversation the response is added to, determined by the `conversation`\nfield in the `response.create` event. If `auto`, the response will be added to\nthe default conversation and the value of `conversation_id` will be an id like\n`conv_1234`. If `none`, the response will not be added to any conversation and\nthe value of `conversation_id` will be `null`. If responses are being triggered\nby server VAD, the response will be added to the default conversation, thus\nthe `conversation_id` will be an id like `conv_1234`.\n",
+            "type": "string"
+          },
+          "voice": {
+            "$ref": "#/components/schemas/VoiceIdsShared",
+            "description": "The voice the model used to respond.\nCurrent voice options are `alloy`, `ash`, `ballad`, `coral`, `echo`, `sage`,\n`shimmer`, and `verse`.\n"
+          },
+          "modalities": {
+            "type": "array",
+            "description": "The set of modalities the model used to respond. If there are multiple modalities,\nthe model will pick one, for example if `modalities` is `[\"text\", \"audio\"]`, the model\ncould be responding in either text or audio.\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "output_audio_format": {
+            "type": "string",
+            "enum": [
+              "pcm16",
+              "g711_ulaw",
+              "g711_alaw"
+            ],
+            "description": "The format of output audio. Options are `pcm16`, `g711_ulaw`, or `g711_alaw`.\n"
+          },
+          "temperature": {
+            "type": "number",
+            "description": "Sampling temperature for the model, limited to [0.6, 1.2]. Defaults to 0.8.\n"
+          },
+          "max_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls, that was used in this response.\n"
+          }
+        }
+      },
+      "RealtimeBetaResponseCreateParams": {
+        "type": "object",
+        "description": "Create a new Realtime response with these parameters",
+        "properties": {
+          "modalities": {
+            "type": "array",
+            "description": "The set of modalities the model can respond with. To disable audio,\nset this to [\"text\"].\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "instructions": {
+            "type": "string",
+            "description": "The default system instructions (i.e. system message) prepended to model \ncalls. This field allows the client to guide the model on desired \nresponses. The model can be instructed on response content and format, \n(e.g. \"be extremely succinct\", \"act friendly\", \"here are examples of good \nresponses\") and on audio behavior (e.g. \"talk quickly\", \"inject emotion \ninto your voice\", \"laugh frequently\"). The instructions are not guaranteed \nto be followed by the model, but they provide guidance to the model on the \ndesired behavior.\n\nNote that the server sets default instructions which will be used if this \nfield is not set and are visible in the `session.created` event at the \nstart of the session.\n"
+          },
+          "voice": {
+            "$ref": "#/components/schemas/VoiceIdsOrCustomVoice",
+            "description": "The voice the model uses to respond. Supported built-in voices are\n`alloy`, `ash`, `ballad`, `coral`, `echo`, `sage`, `shimmer`, `verse`,\n`marin`, and `cedar`. You may also provide a custom voice object with an\n`id`, for example `{ \"id\": \"voice_1234\" }`. Voice cannot be changed during\nthe session once the model has responded with audio at least once.\n"
+          },
+          "output_audio_format": {
+            "type": "string",
+            "enum": [
+              "pcm16",
+              "g711_ulaw",
+              "g711_alaw"
+            ],
+            "description": "The format of output audio. Options are `pcm16`, `g711_ulaw`, or `g711_alaw`.\n"
+          },
+          "tools": {
+            "type": "array",
+            "description": "Tools (functions) available to the model.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "function"
+                  ],
+                  "description": "The type of the tool, i.e. `function`.",
+                  "x-stainless-const": true
+                },
+                "name": {
+                  "type": "string",
+                  "description": "The name of the function."
+                },
+                "description": {
+                  "type": "string",
+                  "description": "The description of the function, including guidance on when and how \nto call it, and guidance about what to tell the user when calling \n(if anything).\n"
+                },
+                "parameters": {
+                  "type": "object",
+                  "description": "Parameters of the function in JSON Schema."
+                }
+              }
+            }
+          },
+          "tool_choice": {
+            "description": "How the model chooses tools. Provide one of the string modes or force a specific\nfunction/MCP tool.\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ToolChoiceOptions"
+              },
+              {
+                "$ref": "#/components/schemas/ToolChoiceFunction"
+              },
+              {
+                "$ref": "#/components/schemas/ToolChoiceMCP"
+              }
+            ],
+            "default": "auto"
+          },
+          "temperature": {
+            "type": "number",
+            "description": "Sampling temperature for the model, limited to [0.6, 1.2]. Defaults to 0.8.\n"
+          },
+          "max_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls. Provide an integer between 1 and 4096 to\nlimit output tokens, or `inf` for the maximum available tokens for a\ngiven model. Defaults to `inf`.\n"
+          },
+          "conversation": {
+            "description": "Controls which conversation the response is added to. Currently supports\n`auto` and `none`, with `auto` as the default value. The `auto` value\nmeans that the contents of the response will be added to the default\nconversation. Set this to `none` to create an out-of-band response which \nwill not add items to default conversation.\n",
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "default": "auto",
+                "enum": [
+                  "auto",
+                  "none"
+                ]
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/Prompt"
+          },
+          "input": {
+            "type": "array",
+            "description": "Input items to include in the prompt for the model. Using this field\ncreates a new context for this Response instead of using the default\nconversation. An empty array `[]` will clear the context for this Response.\nNote that this can include references to items from the default conversation.\n",
+            "items": {
+              "$ref": "#/components/schemas/RealtimeConversationItem"
+            }
+          }
+        }
+      },
+      "RealtimeBetaServerEventConversationItemCreated": {
+        "type": "object",
+        "description": "Returned when a conversation item is created. There are several scenarios that produce this event:\n  - The server is generating a Response, which if successful will produce\n    either one or two Items, which will be of type `message`\n    (role `assistant`) or type `function_call`.\n  - The input audio buffer has been committed, either by the client or the\n    server (in `server_vad` mode). The server will take the content of the\n    input audio buffer and add it to a new user message Item.\n  - The client has sent a `conversation.item.create` event to add a new Item\n    to the Conversation.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.created"
+            ],
+            "description": "The event type, must be `conversation.item.created`.",
+            "x-stainless-const": true
+          },
+          "previous_item_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the preceding item in the Conversation context, allows the\nclient to understand the order of the conversation. Can be `null` if the\nitem has no predecessor.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.created",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1920\",\n    \"type\": \"conversation.item.created\",\n    \"previous_item_id\": \"msg_002\",\n    \"item\": {\n        \"id\": \"msg_003\",\n        \"object\": \"realtime.item\",\n        \"type\": \"message\",\n        \"status\": \"completed\",\n        \"role\": \"user\",\n        \"content\": []\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventConversationItemDeleted": {
+        "type": "object",
+        "description": "Returned when an item in the conversation is deleted by the client with a \n`conversation.item.delete` event. This event is used to synchronize the \nserver's understanding of the conversation history with the client's view.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.deleted"
+            ],
+            "description": "The event type, must be `conversation.item.deleted`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item that was deleted."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.deleted",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_2728\",\n    \"type\": \"conversation.item.deleted\",\n    \"item_id\": \"msg_005\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventConversationItemInputAudioTranscriptionCompleted": {
+        "type": "object",
+        "description": "This event is the output of audio transcription for user audio written to the\nuser audio buffer. Transcription begins when the input audio buffer is\ncommitted by the client or server (in `server_vad` mode). Transcription runs\nasynchronously with Response creation, so this event may come before or after\nthe Response events.\n\nRealtime API models accept audio natively, and thus input transcription is a\nseparate process run on a separate ASR (Automatic Speech Recognition) model.\nThe transcript may diverge somewhat from the model's interpretation, and\nshould be treated as a rough guide.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.input_audio_transcription.completed"
+            ],
+            "description": "The event type, must be\n`conversation.item.input_audio_transcription.completed`.\n",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item containing the audio."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part containing the audio."
+          },
+          "transcript": {
+            "type": "string",
+            "description": "The transcribed text."
+          },
+          "languages": {
+            "type": "array",
+            "description": "The languages detected in the audio. Returned by `gpt-transcribe`. An empty array indicates that no language could be reliably detected.\n",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionLanguage"
+            }
+          },
+          "logprobs": {
+            "anyOf": [
+              {
+                "type": "array",
+                "description": "The log probabilities of the transcription.",
+                "items": {
+                  "$ref": "#/components/schemas/LogProbProperties"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "usage": {
+            "type": "object",
+            "description": "Usage statistics for the transcription.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/TranscriptTextUsageTokens",
+                "title": "Token Usage"
+              },
+              {
+                "$ref": "#/components/schemas/TranscriptTextUsageDuration",
+                "title": "Duration Usage"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id",
+          "content_index",
+          "transcript",
+          "usage"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.input_audio_transcription.completed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_2122\",\n    \"type\": \"conversation.item.input_audio_transcription.completed\",\n    \"item_id\": \"msg_003\",\n    \"content_index\": 0,\n    \"transcript\": \"Hello, how are you?\",\n    \"usage\": {\n      \"type\": \"tokens\",\n      \"total_tokens\": 48,\n      \"input_tokens\": 38,\n      \"input_token_details\": {\n        \"text_tokens\": 10,\n        \"audio_tokens\": 28,\n      },\n      \"output_tokens\": 10,\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventConversationItemInputAudioTranscriptionDelta": {
+        "type": "object",
+        "description": "Returned when the text value of an input audio transcription content part is updated.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.input_audio_transcription.delta"
+            ],
+            "description": "The event type, must be `conversation.item.input_audio_transcription.delta`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta."
+          },
+          "logprobs": {
+            "anyOf": [
+              {
+                "type": "array",
+                "description": "The log probabilities of the transcription.",
+                "items": {
+                  "$ref": "#/components/schemas/LogProbProperties"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.input_audio_transcription.delta",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"conversation.item.input_audio_transcription.delta\",\n  \"event_id\": \"event_001\",\n  \"item_id\": \"item_001\",\n  \"content_index\": 0,\n  \"delta\": \"Hello\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventConversationItemInputAudioTranscriptionFailed": {
+        "type": "object",
+        "description": "Returned when input audio transcription is configured, and a transcription \nrequest for a user message failed. These events are separate from other \n`error` events so that the client can identify the related Item.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.input_audio_transcription.failed"
+            ],
+            "description": "The event type, must be\n`conversation.item.input_audio_transcription.failed`.\n",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part containing the audio."
+          },
+          "error": {
+            "type": "object",
+            "description": "Details of the transcription error.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The type of error."
+              },
+              "code": {
+                "type": "string",
+                "description": "Error code, if any."
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable error message."
+              },
+              "param": {
+                "type": "string",
+                "description": "Parameter related to the error, if any."
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id",
+          "content_index",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.input_audio_transcription.failed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_2324\",\n    \"type\": \"conversation.item.input_audio_transcription.failed\",\n    \"item_id\": \"msg_003\",\n    \"content_index\": 0,\n    \"error\": {\n        \"type\": \"transcription_error\",\n        \"code\": \"audio_unintelligible\",\n        \"message\": \"The audio could not be transcribed.\",\n        \"param\": null\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventConversationItemInputAudioTranscriptionSegment": {
+        "type": "object",
+        "description": "Returned when an input audio transcription segment is identified for an item.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.input_audio_transcription.segment"
+            ],
+            "description": "The event type, must be `conversation.item.input_audio_transcription.segment`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item containing the input audio content."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the input audio content part within the item."
+          },
+          "text": {
+            "type": "string",
+            "description": "The text for this segment."
+          },
+          "id": {
+            "type": "string",
+            "description": "The segment identifier."
+          },
+          "speaker": {
+            "type": "string",
+            "description": "The detected speaker label for this segment."
+          },
+          "start": {
+            "type": "number",
+            "format": "double",
+            "description": "Start time of the segment in seconds."
+          },
+          "end": {
+            "type": "number",
+            "format": "double",
+            "description": "End time of the segment in seconds."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id",
+          "content_index",
+          "text",
+          "id",
+          "speaker",
+          "start",
+          "end"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.input_audio_transcription.segment",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6501\",\n    \"type\": \"conversation.item.input_audio_transcription.segment\",\n    \"item_id\": \"msg_011\",\n    \"content_index\": 0,\n    \"text\": \"hello\",\n    \"id\": \"seg_0001\",\n    \"speaker\": \"spk_1\",\n    \"start\": 0.0,\n    \"end\": 0.4\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventConversationItemRetrieved": {
+        "type": "object",
+        "description": "Returned when a conversation item is retrieved with `conversation.item.retrieve`.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.retrieved"
+            ],
+            "description": "The event type, must be `conversation.item.retrieved`.",
+            "x-stainless-const": true
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.retrieved",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1920\",\n    \"type\": \"conversation.item.created\",\n    \"previous_item_id\": \"msg_002\",\n    \"item\": {\n        \"id\": \"msg_003\",\n        \"object\": \"realtime.item\",\n        \"type\": \"message\",\n        \"status\": \"completed\",\n        \"role\": \"user\",\n        \"content\": [\n            {\n                \"type\": \"input_audio\",\n                \"transcript\": \"hello how are you\",\n                \"audio\": \"base64encodedaudio==\"\n            }\n        ]\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventConversationItemTruncated": {
+        "type": "object",
+        "description": "Returned when an earlier assistant audio message item is truncated by the \nclient with a `conversation.item.truncate` event. This event is used to \nsynchronize the server's understanding of the audio with the client's playback.\n\nThis action will truncate the audio and remove the server-side text transcript \nto ensure there is no text in the context that hasn't been heard by the user.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.truncated"
+            ],
+            "description": "The event type, must be `conversation.item.truncated`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the assistant message item that was truncated."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that was truncated."
+          },
+          "audio_end_ms": {
+            "type": "integer",
+            "description": "The duration up to which the audio was truncated, in milliseconds.\n"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id",
+          "content_index",
+          "audio_end_ms"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.truncated",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_2526\",\n    \"type\": \"conversation.item.truncated\",\n    \"item_id\": \"msg_004\",\n    \"content_index\": 0,\n    \"audio_end_ms\": 1500\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventError": {
+        "type": "object",
+        "description": "Returned when an error occurs, which could be a client problem or a server\nproblem. Most errors are recoverable and the session will stay open, we\nrecommend to implementors to monitor and log error messages by default.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "error"
+            ],
+            "description": "The event type, must be `error`.",
+            "x-stainless-const": true
+          },
+          "error": {
+            "type": "object",
+            "description": "Details of the error.",
+            "required": [
+              "type",
+              "message"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The type of error (e.g., \"invalid_request_error\", \"server_error\").\n"
+              },
+              "code": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Error code, if any."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable error message."
+              },
+              "param": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Parameter related to the error, if any."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "event_id": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The event_id of the client event that caused the error, if applicable.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "error",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_890\",\n    \"type\": \"error\",\n    \"error\": {\n        \"type\": \"invalid_request_error\",\n        \"code\": \"invalid_event\",\n        \"message\": \"The 'type' field is missing.\",\n        \"param\": null,\n        \"event_id\": \"event_567\"\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventInputAudioBufferCleared": {
+        "type": "object",
+        "description": "Returned when the input audio buffer is cleared by the client with a \n`input_audio_buffer.clear` event.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.cleared"
+            ],
+            "description": "The event type, must be `input_audio_buffer.cleared`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "event_id",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.cleared",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1314\",\n    \"type\": \"input_audio_buffer.cleared\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventInputAudioBufferCommitted": {
+        "type": "object",
+        "description": "Returned when an input audio buffer is committed, either by the client or\nautomatically in server VAD mode. The `item_id` property is the ID of the user\nmessage item that will be created, thus a `conversation.item.created` event\nwill also be sent to the client.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.committed"
+            ],
+            "description": "The event type, must be `input_audio_buffer.committed`.",
+            "x-stainless-const": true
+          },
+          "previous_item_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the preceding item after which the new item will be inserted.\nCan be `null` if the item has no predecessor.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item that will be created."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.committed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1121\",\n    \"type\": \"input_audio_buffer.committed\",\n    \"previous_item_id\": \"msg_001\",\n    \"item_id\": \"msg_002\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventInputAudioBufferSpeechStarted": {
+        "type": "object",
+        "description": "Sent by the server when in `server_vad` mode to indicate that speech has been \ndetected in the audio buffer. This can happen any time audio is added to the \nbuffer (unless speech is already detected). The client may want to use this \nevent to interrupt audio playback or provide visual feedback to the user. \n\nThe client should expect to receive a `input_audio_buffer.speech_stopped` event \nwhen speech stops. The `item_id` property is the ID of the user message item \nthat will be created when speech stops and will also be included in the \n`input_audio_buffer.speech_stopped` event (unless the client manually commits \nthe audio buffer during VAD activation).\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.speech_started"
+            ],
+            "description": "The event type, must be `input_audio_buffer.speech_started`.",
+            "x-stainless-const": true
+          },
+          "audio_start_ms": {
+            "type": "integer",
+            "description": "Milliseconds from the start of all audio written to the buffer during the \nsession when speech was first detected. This will correspond to the \nbeginning of audio sent to the model, and thus includes the \n`prefix_padding_ms` configured in the Session.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item that will be created when speech stops.\n"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "audio_start_ms",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.speech_started",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1516\",\n    \"type\": \"input_audio_buffer.speech_started\",\n    \"audio_start_ms\": 1000,\n    \"item_id\": \"msg_003\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventInputAudioBufferSpeechStopped": {
+        "type": "object",
+        "description": "Returned in `server_vad` mode when the server detects the end of speech in \nthe audio buffer. The server will also send an `conversation.item.created` \nevent with the user message item that is created from the audio buffer.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.speech_stopped"
+            ],
+            "description": "The event type, must be `input_audio_buffer.speech_stopped`.",
+            "x-stainless-const": true
+          },
+          "audio_end_ms": {
+            "type": "integer",
+            "description": "Milliseconds since the session started when speech stopped. This will \ncorrespond to the end of audio sent to the model, and thus includes the \n`min_silence_duration_ms` configured in the Session.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item that will be created."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "audio_end_ms",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.speech_stopped",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1718\",\n    \"type\": \"input_audio_buffer.speech_stopped\",\n    \"audio_end_ms\": 2000,\n    \"item_id\": \"msg_003\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventMCPListToolsCompleted": {
+        "type": "object",
+        "description": "Returned when listing MCP tools has completed for an item.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools.completed"
+            ],
+            "description": "The event type, must be `mcp_list_tools.completed`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP list tools item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "mcp_list_tools.completed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6102\",\n    \"type\": \"mcp_list_tools.completed\",\n    \"item_id\": \"mcp_list_tools_001\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventMCPListToolsFailed": {
+        "type": "object",
+        "description": "Returned when listing MCP tools has failed for an item.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools.failed"
+            ],
+            "description": "The event type, must be `mcp_list_tools.failed`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP list tools item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "mcp_list_tools.failed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6103\",\n    \"type\": \"mcp_list_tools.failed\",\n    \"item_id\": \"mcp_list_tools_001\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventMCPListToolsInProgress": {
+        "type": "object",
+        "description": "Returned when listing MCP tools is in progress for an item.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools.in_progress"
+            ],
+            "description": "The event type, must be `mcp_list_tools.in_progress`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP list tools item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "mcp_list_tools.in_progress",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6101\",\n    \"type\": \"mcp_list_tools.in_progress\",\n    \"item_id\": \"mcp_list_tools_001\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventRateLimitsUpdated": {
+        "type": "object",
+        "description": "Emitted at the beginning of a Response to indicate the updated rate limits. \nWhen a Response is created some tokens will be \"reserved\" for the output \ntokens, the rate limits shown here reflect that reservation, which is then \nadjusted accordingly once the Response is completed.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "rate_limits.updated"
+            ],
+            "description": "The event type, must be `rate_limits.updated`.",
+            "x-stainless-const": true
+          },
+          "rate_limits": {
+            "type": "array",
+            "description": "List of rate limit information.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "enum": [
+                    "requests",
+                    "tokens"
+                  ],
+                  "description": "The name of the rate limit (`requests`, `tokens`).\n"
+                },
+                "limit": {
+                  "type": "integer",
+                  "description": "The maximum allowed value for the rate limit."
+                },
+                "remaining": {
+                  "type": "integer",
+                  "description": "The remaining value before the limit is reached."
+                },
+                "reset_seconds": {
+                  "type": "number",
+                  "description": "Seconds until the rate limit resets."
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "rate_limits"
+        ],
+        "x-oaiMeta": {
+          "name": "rate_limits.updated",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5758\",\n    \"type\": \"rate_limits.updated\",\n    \"rate_limits\": [\n        {\n            \"name\": \"requests\",\n            \"limit\": 1000,\n            \"remaining\": 999,\n            \"reset_seconds\": 60\n        },\n        {\n            \"name\": \"tokens\",\n            \"limit\": 50000,\n            \"remaining\": 49950,\n            \"reset_seconds\": 60\n        }\n    ]\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseAudioDelta": {
+        "type": "object",
+        "description": "Returned when the model-generated audio is updated.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_audio.delta"
+            ],
+            "description": "The event type, must be `response.output_audio.delta`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "delta": {
+            "type": "string",
+            "description": "Base64-encoded audio data delta."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_audio.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4950\",\n    \"type\": \"response.output_audio.delta\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_008\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"delta\": \"Base64EncodedAudioDelta\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseAudioDone": {
+        "type": "object",
+        "description": "Returned when the model-generated audio is done. Also emitted when a Response\nis interrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_audio.done"
+            ],
+            "description": "The event type, must be `response.output_audio.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_audio.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5152\",\n    \"type\": \"response.output_audio.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_008\",\n    \"output_index\": 0,\n    \"content_index\": 0\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseAudioTranscriptDelta": {
+        "type": "object",
+        "description": "Returned when the model-generated transcription of audio output is updated.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_audio_transcript.delta"
+            ],
+            "description": "The event type, must be `response.output_audio_transcript.delta`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The transcript delta."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_audio_transcript.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4546\",\n    \"type\": \"response.output_audio_transcript.delta\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_008\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"delta\": \"Hello, how can I a\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseAudioTranscriptDone": {
+        "type": "object",
+        "description": "Returned when the model-generated transcription of audio output is done\nstreaming. Also emitted when a Response is interrupted, incomplete, or\ncancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_audio_transcript.done"
+            ],
+            "description": "The event type, must be `response.output_audio_transcript.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "transcript": {
+            "type": "string",
+            "description": "The final transcript of the audio."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "transcript"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_audio_transcript.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4748\",\n    \"type\": \"response.output_audio_transcript.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_008\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"transcript\": \"Hello, how can I assist you today?\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseContentPartAdded": {
+        "type": "object",
+        "description": "Returned when a new content part is added to an assistant message item during\nresponse generation.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.content_part.added"
+            ],
+            "description": "The event type, must be `response.content_part.added`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item to which the content part was added."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "part": {
+            "type": "object",
+            "description": "The content part that was added.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "audio",
+                  "text"
+                ],
+                "description": "The content type (\"text\", \"audio\")."
+              },
+              "text": {
+                "type": "string",
+                "description": "The text content (if type is \"text\")."
+              },
+              "audio": {
+                "type": "string",
+                "description": "Base64-encoded audio data (if type is \"audio\")."
+              },
+              "transcript": {
+                "type": "string",
+                "description": "The transcript of the audio (if type is \"audio\")."
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part"
+        ],
+        "x-oaiMeta": {
+          "name": "response.content_part.added",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3738\",\n    \"type\": \"response.content_part.added\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_007\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"part\": {\n        \"type\": \"text\",\n        \"text\": \"\"\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseContentPartDone": {
+        "type": "object",
+        "description": "Returned when a content part is done streaming in an assistant message item.\nAlso emitted when a Response is interrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.content_part.done"
+            ],
+            "description": "The event type, must be `response.content_part.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "part": {
+            "type": "object",
+            "description": "The content part that is done.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "audio",
+                  "text"
+                ],
+                "description": "The content type (\"text\", \"audio\")."
+              },
+              "text": {
+                "type": "string",
+                "description": "The text content (if type is \"text\")."
+              },
+              "audio": {
+                "type": "string",
+                "description": "Base64-encoded audio data (if type is \"audio\")."
+              },
+              "transcript": {
+                "type": "string",
+                "description": "The transcript of the audio (if type is \"audio\")."
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part"
+        ],
+        "x-oaiMeta": {
+          "name": "response.content_part.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3940\",\n    \"type\": \"response.content_part.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_007\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"part\": {\n        \"type\": \"text\",\n        \"text\": \"Sure, I can help with that.\"\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseCreated": {
+        "type": "object",
+        "description": "Returned when a new Response is created. The first event of response creation,\nwhere the response is in an initial state of `in_progress`.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.created"
+            ],
+            "description": "The event type, must be `response.created`.",
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/RealtimeBetaResponse"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response"
+        ],
+        "x-oaiMeta": {
+          "name": "response.created",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"response.created\",\n  \"event_id\": \"event_C9G8pqbTEddBSIxbBN6Os\",\n  \"response\": {\n    \"object\": \"realtime.response\",\n    \"id\": \"resp_C9G8p7IH2WxLbkgPNouYL\",\n    \"status\": \"in_progress\",\n    \"status_details\": null,\n    \"output\": [],\n    \"conversation_id\": \"conv_C9G8mmBkLhQJwCon3hoJN\",\n    \"output_modalities\": [\n      \"audio\"\n    ],\n    \"max_output_tokens\": \"inf\",\n    \"audio\": {\n      \"output\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"voice\": \"marin\"\n      }\n    },\n    \"usage\": null,\n    \"metadata\": null\n  },\n  \"timestamp\": \"2:30:35 PM\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseDone": {
+        "type": "object",
+        "description": "Returned when a Response is done streaming. Always emitted, no matter the \nfinal state. The Response object included in the `response.done` event will \ninclude all output Items in the Response but will omit the raw audio data.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.done"
+            ],
+            "description": "The event type, must be `response.done`.",
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/RealtimeBetaResponse"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response"
+        ],
+        "x-oaiMeta": {
+          "name": "response.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3132\",\n    \"type\": \"response.done\",\n    \"response\": {\n        \"id\": \"resp_001\",\n        \"object\": \"realtime.response\",\n        \"status\": \"completed\",\n        \"status_details\": null,\n        \"output\": [\n            {\n                \"id\": \"msg_006\",\n                \"object\": \"realtime.item\",\n                \"type\": \"message\",\n                \"status\": \"completed\",\n                \"role\": \"assistant\",\n                \"content\": [\n                    {\n                        \"type\": \"text\",\n                        \"text\": \"Sure, how can I assist you today?\"\n                    }\n                ]\n            }\n        ],\n        \"usage\": {\n            \"total_tokens\":275,\n            \"input_tokens\":127,\n            \"output_tokens\":148,\n            \"input_token_details\": {\n                \"cached_tokens\":384,\n                \"text_tokens\":119,\n                \"audio_tokens\":8,\n                \"cached_tokens_details\": {\n                    \"text_tokens\": 128,\n                    \"audio_tokens\": 256\n                }\n            },\n            \"output_token_details\": {\n              \"text_tokens\":36,\n              \"audio_tokens\":112\n            }\n        }\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseFunctionCallArgumentsDelta": {
+        "type": "object",
+        "description": "Returned when the model-generated function call arguments are updated.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.function_call_arguments.delta"
+            ],
+            "description": "The event type, must be `response.function_call_arguments.delta`.\n",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the function call item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the function call."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The arguments delta as a JSON string."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "call_id",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.function_call_arguments.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5354\",\n    \"type\": \"response.function_call_arguments.delta\",\n    \"response_id\": \"resp_002\",\n    \"item_id\": \"fc_001\",\n    \"output_index\": 0,\n    \"call_id\": \"call_001\",\n    \"delta\": \"{\\\"location\\\": \\\"San\\\"\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseFunctionCallArgumentsDone": {
+        "type": "object",
+        "description": "Returned when the model-generated function call arguments are done streaming.\nAlso emitted when a Response is interrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.function_call_arguments.done"
+            ],
+            "description": "The event type, must be `response.function_call_arguments.done`.\n",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the function call item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the function call."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function that was called."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The final arguments as a JSON string."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "call_id",
+          "name",
+          "arguments"
+        ],
+        "x-oaiMeta": {
+          "name": "response.function_call_arguments.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5556\",\n    \"type\": \"response.function_call_arguments.done\",\n    \"response_id\": \"resp_002\",\n    \"item_id\": \"fc_001\",\n    \"output_index\": 0,\n    \"call_id\": \"call_001\",\n    \"name\": \"get_weather\",\n    \"arguments\": \"{\\\"location\\\": \\\"San Francisco\\\"}\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseMCPCallArgumentsDelta": {
+        "type": "object",
+        "description": "Returned when MCP tool call arguments are updated during response generation.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call_arguments.delta"
+            ],
+            "description": "The event type, must be `response.mcp_call_arguments.delta`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The JSON-encoded arguments delta."
+          },
+          "obfuscation": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "If present, indicates the delta text was obfuscated."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call_arguments.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6201\",\n    \"type\": \"response.mcp_call_arguments.delta\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"mcp_call_001\",\n    \"output_index\": 0,\n    \"delta\": \"{\\\"partial\\\":true}\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseMCPCallArgumentsDone": {
+        "type": "object",
+        "description": "Returned when MCP tool call arguments are finalized during response generation.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call_arguments.done"
+            ],
+            "description": "The event type, must be `response.mcp_call_arguments.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The final JSON-encoded arguments string."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "arguments"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call_arguments.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6202\",\n    \"type\": \"response.mcp_call_arguments.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"mcp_call_001\",\n    \"output_index\": 0,\n    \"arguments\": \"{\\\"q\\\":\\\"docs\\\"}\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseMCPCallCompleted": {
+        "type": "object",
+        "description": "Returned when an MCP tool call has completed successfully.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.completed"
+            ],
+            "description": "The event type, must be `response.mcp_call.completed`.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "output_index",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.completed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6302\",\n    \"type\": \"response.mcp_call.completed\",\n    \"output_index\": 0,\n    \"item_id\": \"mcp_call_001\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseMCPCallFailed": {
+        "type": "object",
+        "description": "Returned when an MCP tool call has failed.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.failed"
+            ],
+            "description": "The event type, must be `response.mcp_call.failed`.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "output_index",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.failed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6303\",\n    \"type\": \"response.mcp_call.failed\",\n    \"output_index\": 0,\n    \"item_id\": \"mcp_call_001\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseMCPCallInProgress": {
+        "type": "object",
+        "description": "Returned when an MCP tool call has started and is in progress.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.in_progress"
+            ],
+            "description": "The event type, must be `response.mcp_call.in_progress`.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "output_index",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.in_progress",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6301\",\n    \"type\": \"response.mcp_call.in_progress\",\n    \"output_index\": 0,\n    \"item_id\": \"mcp_call_001\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseOutputItemAdded": {
+        "type": "object",
+        "description": "Returned when a new Item is created during Response generation.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_item.added"
+            ],
+            "description": "The event type, must be `response.output_item.added`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the Response to which the item belongs."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the Response."
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "output_index",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_item.added",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3334\",\n    \"type\": \"response.output_item.added\",\n    \"response_id\": \"resp_001\",\n    \"output_index\": 0,\n    \"item\": {\n        \"id\": \"msg_007\",\n        \"object\": \"realtime.item\",\n        \"type\": \"message\",\n        \"status\": \"in_progress\",\n        \"role\": \"assistant\",\n        \"content\": []\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseOutputItemDone": {
+        "type": "object",
+        "description": "Returned when an Item is done streaming. Also emitted when a Response is \ninterrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_item.done"
+            ],
+            "description": "The event type, must be `response.output_item.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the Response to which the item belongs."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the Response."
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "output_index",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_item.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3536\",\n    \"type\": \"response.output_item.done\",\n    \"response_id\": \"resp_001\",\n    \"output_index\": 0,\n    \"item\": {\n        \"id\": \"msg_007\",\n        \"object\": \"realtime.item\",\n        \"type\": \"message\",\n        \"status\": \"completed\",\n        \"role\": \"assistant\",\n        \"content\": [\n            {\n                \"type\": \"text\",\n                \"text\": \"Sure, I can help with that.\"\n            }\n        ]\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseTextDelta": {
+        "type": "object",
+        "description": "Returned when the text value of an \"output_text\" content part is updated.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_text.delta"
+            ],
+            "description": "The event type, must be `response.output_text.delta`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4142\",\n    \"type\": \"response.output_text.delta\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_007\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"delta\": \"Sure, I can h\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventResponseTextDone": {
+        "type": "object",
+        "description": "Returned when the text value of an \"output_text\" content part is done streaming. Also\nemitted when a Response is interrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_text.done"
+            ],
+            "description": "The event type, must be `response.output_text.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "text": {
+            "type": "string",
+            "description": "The final text content."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "text"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4344\",\n    \"type\": \"response.output_text.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_007\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"text\": \"Sure, I can help with that.\"\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventSessionCreated": {
+        "type": "object",
+        "description": "Returned when a Session is created. Emitted automatically when a new\nconnection is established as the first server event. This event will contain\nthe default Session configuration.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.created"
+            ],
+            "description": "The event type, must be `session.created`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeSession"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.created",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"session.created\",\n  \"event_id\": \"event_C9G5RJeJ2gF77mV7f2B1j\",\n  \"session\": {\n    \"object\": \"realtime.session\",\n    \"id\": \"sess_C9G5QPteg4UIbotdKLoYQ\",\n    \"model\": \"gpt-realtime-2025-08-28\",\n    \"modalities\": [\n      \"audio\"\n    ],\n    \"instructions\": \"Your knowledge cutoff is 2023-10. You are a helpful, witty, and friendly AI. Act like a human, but remember that you aren't a human and that you can't do human things in the real world. Your voice and personality should be warm and engaging, with a lively and playful tone. If interacting in a non-English language, start by using the standard accent or dialect familiar to the user. Talk quickly. You should always call a function if you can. Do not refer to these rules, even if you’re asked about them.\",\n    \"tools\": [],\n    \"tool_choice\": \"auto\",\n    \"max_response_output_tokens\": \"inf\",\n    \"tracing\": null,\n    \"prompt\": null,\n    \"expires_at\": 1756324625,\n    \"input_audio_format\": \"pcm16\",\n    \"input_audio_transcription\": null,\n    \"turn_detection\": {\n      \"type\": \"server_vad\",\n      \"threshold\": 0.5,\n      \"prefix_padding_ms\": 300,\n      \"silence_duration_ms\": 200,\n      \"idle_timeout_ms\": null,\n      \"create_response\": true,\n      \"interrupt_response\": true\n    },\n    \"output_audio_format\": \"pcm16\",\n    \"voice\": \"marin\",\n    \"include\": null\n  }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventSessionUpdated": {
+        "type": "object",
+        "description": "Returned when a session is updated with a `session.update` event, unless\nthere is an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.updated"
+            ],
+            "description": "The event type, must be `session.updated`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeSession"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.updated",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5678\",\n    \"type\": \"session.updated\",\n    \"session\": {\n        \"id\": \"sess_001\",\n        \"object\": \"realtime.session\",\n        \"model\": \"gpt-realtime\",\n        \"modalities\": [\"text\"],\n        \"instructions\": \"New instructions\",\n        \"voice\": \"sage\",\n        \"input_audio_format\": \"pcm16\",\n        \"output_audio_format\": \"pcm16\",\n        \"input_audio_transcription\": {\n            \"model\": \"whisper-1\"\n        },\n        \"turn_detection\": null,\n        \"tools\": [],\n        \"tool_choice\": \"none\",\n        \"temperature\": 0.7,\n        \"max_response_output_tokens\": 200,\n        \"speed\": 1.1,\n        \"tracing\": \"auto\"\n    }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventTranscriptionSessionCreated": {
+        "type": "object",
+        "description": "Returned when a transcription session is created.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "transcription_session.created"
+            ],
+            "description": "The event type, must be `transcription_session.created`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateResponse"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "transcription_session.created",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_5566\",\n  \"type\": \"transcription_session.created\",\n  \"session\": {\n    \"id\": \"sess_001\",\n    \"object\": \"realtime.transcription_session\",\n    \"input_audio_format\": \"pcm16\",\n    \"input_audio_transcription\": {\n      \"model\": \"gpt-4o-transcribe\",\n      \"prompt\": \"\",\n      \"language\": \"\"\n    },\n    \"turn_detection\": {\n      \"type\": \"server_vad\",\n      \"threshold\": 0.5,\n      \"prefix_padding_ms\": 300,\n      \"silence_duration_ms\": 500\n    },\n    \"input_audio_noise_reduction\": {\n      \"type\": \"near_field\"\n    },\n    \"include\": []\n  }\n}\n"
+        }
+      },
+      "RealtimeBetaServerEventTranscriptionSessionUpdated": {
+        "type": "object",
+        "description": "Returned when a transcription session is updated with a `transcription_session.update` event, unless \nthere is an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "transcription_session.updated"
+            ],
+            "description": "The event type, must be `transcription_session.updated`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateResponse"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "transcription_session.updated",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_5678\",\n  \"type\": \"transcription_session.updated\",\n  \"session\": {\n    \"id\": \"sess_001\",\n    \"object\": \"realtime.transcription_session\",\n    \"input_audio_format\": \"pcm16\",\n    \"input_audio_transcription\": {\n      \"model\": \"gpt-4o-transcribe\",\n      \"prompt\": \"\",\n      \"language\": \"\"\n    },\n    \"turn_detection\": {\n      \"type\": \"server_vad\",\n      \"threshold\": 0.5,\n      \"prefix_padding_ms\": 300,\n      \"silence_duration_ms\": 500,\n      \"create_response\": true,\n      // \"interrupt_response\": false  -- this will NOT be returned\n    },\n    \"input_audio_noise_reduction\": {\n      \"type\": \"near_field\"\n    },\n    \"include\": [\n      \"item.input_audio_transcription.avg_logprob\",\n    ],\n  }\n}\n"
+        }
+      },
+      "RealtimeCallCreateRequest": {
+        "title": "Realtime call creation request",
+        "type": "object",
+        "description": "Parameters required to initiate a realtime call and receive the SDP answer\nneeded to complete a WebRTC peer connection. Provide an SDP offer generated\nby your client and optionally configure the session that will answer the call.",
+        "required": [
+          "sdp"
+        ],
+        "properties": {
+          "sdp": {
+            "type": "string",
+            "description": "WebRTC Session Description Protocol (SDP) offer generated by the caller."
+          },
+          "session": {
+            "title": "Session configuration",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/RealtimeSessionCreateRequestGA"
+              }
+            ],
+            "description": "Optional session configuration to apply before the realtime session is\ncreated. Use the same parameters you would send in a [`create client secret`](https://developers.openai.com/api/reference/resources/realtime/subresources/client_secrets/methods/create)\nrequest."
+          }
+        },
+        "additionalProperties": false
+      },
+      "RealtimeCallReferRequest": {
+        "title": "Realtime call refer request",
+        "type": "object",
+        "description": "Parameters required to transfer a SIP call to a new destination using the\nRealtime API.",
+        "required": [
+          "target_uri"
+        ],
+        "properties": {
+          "target_uri": {
+            "type": "string",
+            "description": "URI that should appear in the SIP Refer-To header. Supports values like\n`tel:+14155550123` or `sip:agent@example.com`.",
+            "example": "tel:+14155550123"
+          }
+        },
+        "additionalProperties": false
+      },
+      "RealtimeCallRejectRequest": {
+        "title": "Realtime call reject request",
+        "type": "object",
+        "description": "Parameters used to decline an incoming SIP call handled by the Realtime API.",
+        "properties": {
+          "status_code": {
+            "type": "integer",
+            "description": "SIP response code to send back to the caller. Defaults to `603` (Decline)\nwhen omitted.",
+            "example": 486
+          }
+        },
+        "additionalProperties": false
+      },
+      "RealtimeClientEvent": {
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "description": "A realtime client event.\n",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventConversationItemCreate"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventConversationItemDelete"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventConversationItemRetrieve"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventConversationItemTruncate"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventInputAudioBufferAppend"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventInputAudioBufferClear"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventOutputAudioBufferClear"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventInputAudioBufferCommit"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventResponseCancel"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventResponseCreate"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeClientEventSessionUpdate"
+          }
+        ]
+      },
+      "RealtimeClientEventConversationItemCreate": {
+        "type": "object",
+        "description": "Add a new Item to the Conversation's context, including messages, function \ncalls, and function call responses. This event can be used both to populate a \n\"history\" of the conversation and to add new items mid-stream, but has the \ncurrent limitation that it cannot populate assistant audio messages.\n\nIf successful, the server will respond with a `conversation.item.created` \nevent, otherwise an `error` event will be sent.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.create"
+            ],
+            "description": "The event type, must be `conversation.item.create`.",
+            "x-stainless-const": true
+          },
+          "previous_item_id": {
+            "type": "string",
+            "description": "The ID of the preceding item after which the new item will be inserted. If not set, the new item will be appended to the end of the conversation.\n\nIf set to `root`, the new item will be added to the beginning of the conversation.\n\nIf set to an existing ID, it allows an item to be inserted mid-conversation. If the ID cannot be found, an error will be returned and the item will not be added.\n"
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.create",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"conversation.item.create\",\n  \"item\": {\n    \"type\": \"message\",\n    \"role\": \"user\",\n    \"content\": [\n      {\n        \"type\": \"input_text\",\n        \"text\": \"hi\"\n      }\n    ]\n  }\n}\n"
+        }
+      },
+      "RealtimeClientEventConversationItemDelete": {
+        "type": "object",
+        "description": "Send this event when you want to remove any item from the conversation \nhistory. The server will respond with a `conversation.item.deleted` event, \nunless the item does not exist in the conversation history, in which case the \nserver will respond with an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.delete"
+            ],
+            "description": "The event type, must be `conversation.item.delete`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item to delete."
+          }
+        },
+        "required": [
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.delete",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_901\",\n    \"type\": \"conversation.item.delete\",\n    \"item_id\": \"item_003\"\n}\n"
+        }
+      },
+      "RealtimeClientEventConversationItemRetrieve": {
+        "type": "object",
+        "description": "Send this event when you want to retrieve the server's representation of a specific item in the conversation history. This is useful, for example, to inspect user audio after noise cancellation and VAD.\nThe server will respond with a `conversation.item.retrieved` event, \nunless the item does not exist in the conversation history, in which case the \nserver will respond with an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.retrieve"
+            ],
+            "description": "The event type, must be `conversation.item.retrieve`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item to retrieve."
+          }
+        },
+        "required": [
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.retrieve",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_901\",\n    \"type\": \"conversation.item.retrieve\",\n    \"item_id\": \"item_003\"\n}\n"
+        }
+      },
+      "RealtimeClientEventConversationItemTruncate": {
+        "type": "object",
+        "description": "Send this event to truncate a previous assistant message’s audio. The server \nwill produce audio faster than realtime, so this event is useful when the user \ninterrupts to truncate audio that has already been sent to the client but not \nyet played. This will synchronize the server's understanding of the audio with \nthe client's playback.\n\nTruncating audio will delete the server-side text transcript to ensure there \nis not text in the context that hasn't been heard by the user.\n\nIf successful, the server will respond with a `conversation.item.truncated` \nevent. \n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.truncate"
+            ],
+            "description": "The event type, must be `conversation.item.truncate`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the assistant message item to truncate. Only assistant message \nitems can be truncated.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part to truncate. Set this to `0`."
+          },
+          "audio_end_ms": {
+            "type": "integer",
+            "description": "Inclusive duration up to which audio is truncated, in milliseconds. If \nthe audio_end_ms is greater than the actual audio duration, the server \nwill respond with an error.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "content_index",
+          "audio_end_ms"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.truncate",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_678\",\n    \"type\": \"conversation.item.truncate\",\n    \"item_id\": \"item_002\",\n    \"content_index\": 0,\n    \"audio_end_ms\": 1500\n}\n"
+        }
+      },
+      "RealtimeClientEventInputAudioBufferAppend": {
+        "type": "object",
+        "description": "Send this event to append audio bytes to the input audio buffer. The audio \nbuffer is temporary storage you can write to and later commit. A \"commit\" will create a new\nuser message item in the conversation history from the buffer content and clear the buffer.\nInput audio transcription (if enabled) will be generated when the buffer is committed.\n\nIf VAD is enabled the audio buffer is used to detect speech and the server will decide \nwhen to commit. When Server VAD is disabled, you must commit the audio buffer\nmanually. Input audio noise reduction operates on writes to the audio buffer.\n\nThe client may choose how much audio to place in each event up to a maximum \nof 15 MiB, for example streaming smaller chunks from the client may allow the \nVAD to be more responsive. Unlike most other client events, the server will \nnot send a confirmation response to this event.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.append"
+            ],
+            "description": "The event type, must be `input_audio_buffer.append`.",
+            "x-stainless-const": true
+          },
+          "audio": {
+            "type": "string",
+            "description": "Base64-encoded audio bytes. This must be in the format specified by the \n`input_audio_format` field in the session configuration.\n"
+          }
+        },
+        "required": [
+          "type",
+          "audio"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.append",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_456\",\n    \"type\": \"input_audio_buffer.append\",\n    \"audio\": \"Base64EncodedAudioData\"\n}\n"
+        }
+      },
+      "RealtimeClientEventInputAudioBufferClear": {
+        "type": "object",
+        "description": "Send this event to clear the audio bytes in the buffer. The server will \nrespond with an `input_audio_buffer.cleared` event.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.clear"
+            ],
+            "description": "The event type, must be `input_audio_buffer.clear`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.clear",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_012\",\n    \"type\": \"input_audio_buffer.clear\"\n}\n"
+        }
+      },
+      "RealtimeClientEventInputAudioBufferCommit": {
+        "type": "object",
+        "description": "Send this event to commit the user input audio buffer, which will create a  new user message item in the conversation. This event will produce an error  if the input audio buffer is empty. When in Server VAD mode, the client does  not need to send this event, the server will commit the audio buffer  automatically.\n\nCommitting the input audio buffer will trigger input audio transcription  (if enabled in session configuration), but it will not create a response  from the model. The server will respond with an `input_audio_buffer.committed` event.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.commit"
+            ],
+            "description": "The event type, must be `input_audio_buffer.commit`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.commit",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_789\",\n    \"type\": \"input_audio_buffer.commit\"\n}\n"
+        }
+      },
+      "RealtimeClientEventOutputAudioBufferClear": {
+        "type": "object",
+        "description": "**WebRTC/SIP Only:** Emit to cut off the current audio response. This will trigger the server to\nstop generating audio and emit a `output_audio_buffer.cleared` event. This\nevent should be preceded by a `response.cancel` client event to stop the\ngeneration of the current response.\n[Learn more](https://developers.openai.com/api/docs/guides/realtime-conversations#client-and-server-events-for-audio-in-webrtc).\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the client event used for error handling."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_audio_buffer.clear"
+            ],
+            "description": "The event type, must be `output_audio_buffer.clear`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "output_audio_buffer.clear",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"optional_client_event_id\",\n    \"type\": \"output_audio_buffer.clear\"\n}\n"
+        }
+      },
+      "RealtimeClientEventResponseCancel": {
+        "type": "object",
+        "description": "Send this event to cancel an in-progress response. The server will respond \nwith a `response.done` event with a status of `response.status=cancelled`. If \nthere is no response to cancel, the server will respond with an error. It's safe\nto call `response.cancel` even if no response is in progress, an error will be\nreturned the session will remain unaffected.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.cancel"
+            ],
+            "description": "The event type, must be `response.cancel`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "A specific response ID to cancel - if not provided, will cancel an \nin-progress response in the default conversation.\n"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "response.cancel",
+          "group": "realtime",
+          "example": "{\n    \"type\": \"response.cancel\",\n    \"response_id\": \"resp_12345\"\n}\n"
+        }
+      },
+      "RealtimeClientEventResponseCreate": {
+        "type": "object",
+        "description": "This event instructs the server to create a Response, which means triggering \nmodel inference. When in Server VAD mode, the server will create Responses \nautomatically.\n\nA Response will include at least one Item, and may have two, in which case \nthe second will be a function call. These Items will be appended to the \nconversation history by default.\n\nThe server will respond with a `response.created` event, events for Items \nand content created, and finally a `response.done` event to indicate the \nResponse is complete.\n\nThe `response.create` event includes inference configuration like \n`instructions` and `tools`. If these are set, they will override the Session's \nconfiguration for this Response only.\n\nResponses can be created out-of-band of the default Conversation, meaning that they can\nhave arbitrary input, and it's possible to disable writing the output to the Conversation.\nOnly one Response can write to the default Conversation at a time, but otherwise multiple\nResponses can be created in parallel. The `metadata` field is a good way to disambiguate\nmultiple simultaneous Responses.\n\nClients can set `conversation` to `none` to create a Response that does not write to the default\nConversation. Arbitrary input can be provided with the `input` field, which is an array accepting\nraw Items and references to existing Items.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.create"
+            ],
+            "description": "The event type, must be `response.create`.",
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/RealtimeResponseCreateParams"
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "response.create",
+          "group": "realtime",
+          "example": "// Trigger a response with the default Conversation and no special parameters\n{\n  \"type\": \"response.create\",\n}\n\n// Trigger an out-of-band response that does not write to the default Conversation\n{\n  \"type\": \"response.create\",\n  \"response\": {\n    \"instructions\": \"Provide a concise answer.\",\n    \"tools\": [], // clear any session tools\n    \"conversation\": \"none\",\n    \"output_modalities\": [\"text\"],\n    \"metadata\": {\n      \"response_purpose\": \"summarization\"\n    },\n    \"input\": [\n      {\n        \"type\": \"item_reference\",\n        \"id\": \"item_12345\"\n      },\n      {\n        \"type\": \"message\",\n        \"role\": \"user\",\n        \"content\": [\n          {\n            \"type\": \"input_text\",\n            \"text\": \"Summarize the above message in one sentence.\"\n          }\n        ]\n      }\n    ]\n  }\n}\n"
+        }
+      },
+      "RealtimeClientEventSessionUpdate": {
+        "type": "object",
+        "description": "Send this event to update the session’s configuration.\nThe client may send this event at any time to update any field\nexcept for `voice` and `model`. `voice` can be updated only if there have been no other audio outputs yet.\n\nWhen the server receives a `session.update`, it will respond\nwith a `session.updated` event showing the full, effective configuration.\nOnly the fields that are present in the `session.update` are updated. To clear a field like\n`instructions`, pass an empty string. To clear a field like `tools`, pass an empty array.\nTo clear a field like `turn_detection`, pass `null`.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event. This is an arbitrary string that a client may assign. It will be passed back if there is an error with the event, but the corresponding `session.updated` event will not include it."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.update"
+            ],
+            "description": "The event type, must be `session.update`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "type": "object",
+            "description": "Update the Realtime session. Choose either a realtime\nsession or a transcription session.\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/RealtimeSessionCreateRequestGA"
+              },
+              {
+                "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateRequestGA"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.update",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"session.update\",\n  \"session\": {\n    \"type\": \"realtime\",\n    \"instructions\": \"You are a creative assistant that helps with design tasks.\",\n    \"tools\": [\n      {\n        \"type\": \"function\",\n        \"name\": \"display_color_palette\",\n        \"description\": \"Call this function when a user asks for a color palette.\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"properties\": {\n            \"theme\": {\n              \"type\": \"string\",\n              \"description\": \"Description of the theme for the color scheme.\"\n            },\n            \"colors\": {\n              \"type\": \"array\",\n              \"description\": \"Array of five hex color codes based on the theme.\",\n              \"items\": {\n                \"type\": \"string\",\n                \"description\": \"Hex color code\"\n              }\n            }\n          },\n          \"required\": [\n            \"theme\",\n            \"colors\"\n          ]\n        }\n      }\n    ],\n    \"tool_choice\": \"auto\"\n  }\n}\n"
+        }
+      },
+      "RealtimeClientEventTranscriptionSessionUpdate": {
+        "type": "object",
+        "description": "Send this event to update a transcription session.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "transcription_session.update"
+            ],
+            "description": "The event type, must be `transcription_session.update`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateRequest"
+          }
+        },
+        "required": [
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "transcription_session.update",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"transcription_session.update\",\n  \"session\": {\n    \"input_audio_format\": \"pcm16\",\n    \"input_audio_transcription\": {\n      \"model\": \"gpt-4o-transcribe\",\n      \"prompt\": \"\",\n      \"language\": \"\"\n    },\n    \"turn_detection\": {\n      \"type\": \"server_vad\",\n      \"threshold\": 0.5,\n      \"prefix_padding_ms\": 300,\n      \"silence_duration_ms\": 500,\n      \"create_response\": true,\n    },\n    \"input_audio_noise_reduction\": {\n      \"type\": \"near_field\"\n    },\n    \"include\": [\n      \"item.input_audio_transcription.logprobs\",\n    ]\n  }\n}\n"
+        }
+      },
+      "RealtimeConversationItem": {
+        "description": "A single item within a Realtime conversation.",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/RealtimeConversationItemMessageSystem"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeConversationItemMessageUser"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeConversationItemMessageAssistant"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeConversationItemFunctionCall"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeConversationItemFunctionCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeMCPApprovalResponse"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeMCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeMCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeMCPApprovalRequest"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "RealtimeConversationItemFunctionCall": {
+        "type": "object",
+        "title": "Realtime function call item",
+        "description": "A function call item in a Realtime conversation.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the item. This may be provided by the client or generated by the server."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.item"
+            ],
+            "description": "Identifier for the API object being returned - always `realtime.item`. Optional when creating a new item.",
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call"
+            ],
+            "description": "The type of the item. Always `function_call`.",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed",
+              "incomplete",
+              "in_progress"
+            ],
+            "description": "The status of the item. Has no effect on the conversation."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the function call."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function being called."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The arguments of the function call. This is a JSON-encoded string representing the arguments passed to the function, for example `{\"arg1\": \"value1\", \"arg2\": 42}`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "arguments"
+        ]
+      },
+      "RealtimeConversationItemFunctionCallOutput": {
+        "type": "object",
+        "title": "Realtime function call output item",
+        "description": "A function call output item in a Realtime conversation.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the item. This may be provided by the client or generated by the server."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.item"
+            ],
+            "description": "Identifier for the API object being returned - always `realtime.item`. Optional when creating a new item.",
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call_output"
+            ],
+            "description": "The type of the item. Always `function_call_output`.",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed",
+              "incomplete",
+              "in_progress"
+            ],
+            "description": "The status of the item. Has no effect on the conversation."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the function call this output is for."
+          },
+          "output": {
+            "type": "string",
+            "description": "The output of the function call, this is free text and can contain any information or simply be empty."
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "output"
+        ]
+      },
+      "RealtimeConversationItemMessageAssistant": {
+        "type": "object",
+        "title": "Realtime assistant message item",
+        "description": "An assistant message item in a Realtime conversation.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the item. This may be provided by the client or generated by the server."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.item"
+            ],
+            "description": "Identifier for the API object being returned - always `realtime.item`. Optional when creating a new item.",
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "description": "The type of the item. Always `message`.",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed",
+              "incomplete",
+              "in_progress"
+            ],
+            "description": "The status of the item. Has no effect on the conversation."
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ],
+            "description": "The role of the message sender. Always `assistant`.",
+            "x-stainless-const": true
+          },
+          "content": {
+            "type": "array",
+            "description": "The content of the message.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "output_text",
+                    "output_audio"
+                  ],
+                  "description": "The content type, `output_text` or `output_audio` depending on the session `output_modalities` configuration."
+                },
+                "text": {
+                  "type": "string",
+                  "description": "The text content."
+                },
+                "audio": {
+                  "type": "string",
+                  "description": "Base64-encoded audio bytes, these will be parsed as the format specified in the session output audio type configuration. This defaults to PCM 16-bit 24kHz mono if not specified."
+                },
+                "transcript": {
+                  "type": "string",
+                  "description": "The transcript of the audio content, this will always be present if the output type is `audio`."
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "type",
+          "role",
+          "content"
+        ]
+      },
+      "RealtimeConversationItemMessageSystem": {
+        "type": "object",
+        "title": "Realtime system message item",
+        "description": "A system message in a Realtime conversation can be used to provide additional context or instructions to the model. This is similar but distinct from the instruction prompt provided at the start of a conversation, as system messages can be added at any point in the conversation. For major changes to the conversation's behavior, use instructions, but for smaller updates (e.g. \"the user is now asking about a different topic\"), use system messages.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the item. This may be provided by the client or generated by the server."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.item"
+            ],
+            "description": "Identifier for the API object being returned - always `realtime.item`. Optional when creating a new item.",
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "description": "The type of the item. Always `message`.",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed",
+              "incomplete",
+              "in_progress"
+            ],
+            "description": "The status of the item. Has no effect on the conversation."
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "system"
+            ],
+            "description": "The role of the message sender. Always `system`.",
+            "x-stainless-const": true
+          },
+          "content": {
+            "type": "array",
+            "description": "The content of the message.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "input_text"
+                  ],
+                  "description": "The content type. Always `input_text` for system messages.",
+                  "x-stainless-const": true
+                },
+                "text": {
+                  "type": "string",
+                  "description": "The text content."
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "type",
+          "role",
+          "content"
+        ]
+      },
+      "RealtimeConversationItemMessageUser": {
+        "type": "object",
+        "title": "Realtime user message item",
+        "description": "A user message item in a Realtime conversation.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the item. This may be provided by the client or generated by the server."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.item"
+            ],
+            "description": "Identifier for the API object being returned - always `realtime.item`. Optional when creating a new item.",
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "description": "The type of the item. Always `message`.",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed",
+              "incomplete",
+              "in_progress"
+            ],
+            "description": "The status of the item. Has no effect on the conversation."
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user"
+            ],
+            "description": "The role of the message sender. Always `user`.",
+            "x-stainless-const": true
+          },
+          "content": {
+            "type": "array",
+            "description": "The content of the message.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "input_text",
+                    "input_audio",
+                    "input_image"
+                  ],
+                  "description": "The content type (`input_text`, `input_audio`, or `input_image`)."
+                },
+                "text": {
+                  "type": "string",
+                  "description": "The text content (for `input_text`)."
+                },
+                "audio": {
+                  "type": "string",
+                  "description": "Base64-encoded audio bytes (for `input_audio`), these will be parsed as the format specified in the session input audio type configuration. This defaults to PCM 16-bit 24kHz mono if not specified."
+                },
+                "image_url": {
+                  "type": "string",
+                  "format": "uri",
+                  "description": "Base64-encoded image bytes (for `input_image`) as a data URI. For example `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAA...`. Supported formats are PNG and JPEG."
+                },
+                "detail": {
+                  "type": "string",
+                  "description": "The detail level of the image (for `input_image`). `auto` will default to `high`.",
+                  "default": "auto",
+                  "enum": [
+                    "auto",
+                    "low",
+                    "high"
+                  ]
+                },
+                "transcript": {
+                  "type": "string",
+                  "description": "Transcript of the audio (for `input_audio`). This is not sent to the model, but will be attached to the message item for reference."
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "type",
+          "role",
+          "content"
+        ]
+      },
+      "RealtimeConversationItemWithReference": {
+        "type": "object",
+        "description": "The item to add to the conversation.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "For an item of type (`message` | `function_call` | `function_call_output`)\nthis field allows the client to assign the unique ID of the item. It is\nnot required because the server will generate one if not provided.\n\nFor an item of type `item_reference`, this field is required and is a\nreference to any item that has previously existed in the conversation.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message",
+              "function_call",
+              "function_call_output"
+            ],
+            "description": "The type of the item (`message`, `function_call`, `function_call_output`, `item_reference`).\n"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.item"
+            ],
+            "description": "Identifier for the API object being returned - always `realtime.item`.\n",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed",
+              "incomplete",
+              "in_progress"
+            ],
+            "description": "The status of the item (`completed`, `incomplete`, `in_progress`). These have no effect \non the conversation, but are accepted for consistency with the \n`conversation.item.created` event.\n"
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user",
+              "assistant",
+              "system"
+            ],
+            "description": "The role of the message sender (`user`, `assistant`, `system`), only \napplicable for `message` items.\n"
+          },
+          "content": {
+            "type": "array",
+            "description": "The content of the message, applicable for `message` items. \n- Message items of role `system` support only `input_text` content\n- Message items of role `user` support `input_text` and `input_audio` \n  content\n- Message items of role `assistant` support `text` content.\n",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "input_audio",
+                    "input_text",
+                    "item_reference",
+                    "text"
+                  ],
+                  "description": "The content type (`input_text`, `input_audio`, `item_reference`, `text`).\n"
+                },
+                "text": {
+                  "type": "string",
+                  "description": "The text content, used for `input_text` and `text` content types.\n"
+                },
+                "id": {
+                  "type": "string",
+                  "description": "ID of a previous conversation item to reference (for `item_reference`\ncontent types in `response.create` events). These can reference both\nclient and server created items.\n"
+                },
+                "audio": {
+                  "type": "string",
+                  "description": "Base64-encoded audio bytes, used for `input_audio` content type.\n"
+                },
+                "transcript": {
+                  "type": "string",
+                  "description": "The transcript of the audio, used for `input_audio` content type.\n"
+                }
+              }
+            }
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the function call (for `function_call` and \n`function_call_output` items). If passed on a `function_call_output` \nitem, the server will check that a `function_call` item with the same \nID exists in the conversation history.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function being called (for `function_call` items).\n"
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The arguments of the function call (for `function_call` items).\n"
+          },
+          "output": {
+            "type": "string",
+            "description": "The output of the function call (for `function_call_output` items).\n"
+          }
+        }
+      },
+      "RealtimeCreateClientSecretRequest": {
+        "type": "object",
+        "title": "Realtime client secret creation request",
+        "description": "Create a session and client secret for the Realtime API. The request can specify\neither a realtime or a transcription session configuration.\n[Learn more about the Realtime API](https://developers.openai.com/api/docs/guides/realtime).\n",
+        "properties": {
+          "expires_after": {
+            "type": "object",
+            "title": "Client secret expiration",
+            "description": "Configuration for the client secret expiration. Expiration refers to the time after which\na client secret will no longer be valid for creating sessions. The session itself may\ncontinue after that time once started. A secret can be used to create multiple sessions\nuntil it expires.\n",
+            "properties": {
+              "anchor": {
+                "type": "string",
+                "enum": [
+                  "created_at"
+                ],
+                "description": "The anchor point for the client secret expiration, meaning that `seconds` will be added to the `created_at` time of the client secret to produce an expiration timestamp. Only `created_at` is currently supported.\n",
+                "default": "created_at",
+                "x-stainless-const": true
+              },
+              "seconds": {
+                "type": "integer",
+                "format": "int64",
+                "description": "The number of seconds from the anchor point to the expiration. Select a value between `10` and `7200` (2 hours). This default to 600 seconds (10 minutes) if not specified.\n",
+                "minimum": 10,
+                "maximum": 7200,
+                "default": 600
+              }
+            }
+          },
+          "session": {
+            "title": "Session configuration",
+            "description": "Session configuration to use for the client secret. Choose either a realtime\nsession or a transcription session.\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/RealtimeSessionCreateRequestGA"
+              },
+              {
+                "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateRequestGA"
+              }
+            ]
+          }
+        }
+      },
+      "RealtimeCreateClientSecretResponse": {
+        "type": "object",
+        "title": "Realtime session and client secret",
+        "description": "Response from creating a session and client secret for the Realtime API.\n",
+        "properties": {
+          "value": {
+            "type": "string",
+            "description": "The generated client secret value."
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Expiration timestamp for the client secret, in seconds since epoch."
+          },
+          "session": {
+            "title": "Session configuration",
+            "description": "The session configuration for either a realtime or transcription session.\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/RealtimeSessionCreateResponseGA"
+              },
+              {
+                "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateResponseGA"
+              }
+            ],
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "required": [
+          "value",
+          "expires_at",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "Session response object",
+          "group": "realtime",
+          "example": "{\n  \"value\": \"ek_68af296e8e408191a1120ab6383263c2\",\n  \"expires_at\": 1756310470,\n  \"session\": {\n    \"type\": \"realtime\",\n    \"object\": \"realtime.session\",\n    \"id\": \"sess_C9CiUVUzUzYIssh3ELY1d\",\n    \"model\": \"gpt-realtime-2025-08-25\",\n    \"output_modalities\": [\n      \"audio\"\n    ],\n    \"instructions\": \"You are a friendly assistant.\",\n    \"tools\": [],\n    \"tool_choice\": \"auto\",\n    \"max_output_tokens\": \"inf\",\n    \"tracing\": null,\n    \"truncation\": \"auto\",\n    \"prompt\": null,\n    \"expires_at\": 0,\n    \"audio\": {\n      \"input\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"transcription\": null,\n        \"noise_reduction\": null,\n        \"turn_detection\": {\n          \"type\": \"server_vad\",\n          \"threshold\": 0.5,\n          \"prefix_padding_ms\": 300,\n          \"silence_duration_ms\": 200,\n          \"idle_timeout_ms\": null,\n          \"create_response\": true,\n          \"interrupt_response\": true\n        }\n      },\n      \"output\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"voice\": \"alloy\",\n        \"speed\": 1.0\n      }\n    },\n    \"include\": null\n  }\n}\n"
+        }
+      },
+      "RealtimeFunctionTool": {
+        "type": "object",
+        "title": "Function tool",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "The type of the tool, i.e. `function`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the function, including guidance on when and how\nto call it, and guidance about what to tell the user when calling\n(if anything).\n"
+          },
+          "parameters": {
+            "type": "object",
+            "description": "Parameters of the function in JSON Schema."
+          }
+        }
+      },
+      "RealtimeMCPApprovalRequest": {
+        "type": "object",
+        "title": "Realtime MCP approval request",
+        "description": "A Realtime item requesting human approval of a tool invocation.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_approval_request"
+            ],
+            "description": "The type of the item. Always `mcp_approval_request`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the approval request."
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server making the request."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the tool to run."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string of arguments for the tool."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "server_label",
+          "name",
+          "arguments"
+        ]
+      },
+      "RealtimeMCPApprovalResponse": {
+        "type": "object",
+        "title": "Realtime MCP approval response",
+        "description": "A Realtime item responding to an MCP approval request.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_approval_response"
+            ],
+            "description": "The type of the item. Always `mcp_approval_response`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the approval response."
+          },
+          "approval_request_id": {
+            "type": "string",
+            "description": "The ID of the approval request being answered."
+          },
+          "approve": {
+            "type": "boolean",
+            "description": "Whether the request was approved."
+          },
+          "reason": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional reason for the decision."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "approval_request_id",
+          "approve"
+        ]
+      },
+      "RealtimeMCPHTTPError": {
+        "type": "object",
+        "title": "Realtime MCP HTTP error",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http_error"
+            ],
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "integer"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "RealtimeMCPListTools": {
+        "type": "object",
+        "title": "Realtime MCP list tools",
+        "description": "A Realtime item listing tools available on an MCP server.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools"
+            ],
+            "description": "The type of the item. Always `mcp_list_tools`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the list."
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server."
+          },
+          "tools": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MCPListToolsTool"
+            },
+            "description": "The tools available on the server."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "tools"
+        ]
+      },
+      "RealtimeMCPProtocolError": {
+        "type": "object",
+        "title": "Realtime MCP protocol error",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "protocol_error"
+            ],
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "integer"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "RealtimeMCPToolCall": {
+        "type": "object",
+        "title": "Realtime MCP tool call",
+        "description": "A Realtime item representing an invocation of a tool on an MCP server.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_call"
+            ],
+            "description": "The type of the item. Always `mcp_call`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the tool call."
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server running the tool."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the tool that was run."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string of the arguments passed to the tool."
+          },
+          "approval_request_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of an associated approval request, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The output from the tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "error": {
+            "anyOf": [
+              {
+                "description": "The error from the tool call, if any.",
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/RealtimeMCPProtocolError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/RealtimeMCPToolExecutionError"
+                  },
+                  {
+                    "$ref": "#/components/schemas/RealtimeMCPHTTPError"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "server_label",
+          "name",
+          "arguments"
+        ]
+      },
+      "RealtimeMCPToolExecutionError": {
+        "type": "object",
+        "title": "Realtime MCP tool execution error",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_execution_error"
+            ],
+            "x-stainless-const": true
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "message"
+        ]
+      },
+      "RealtimeReasoning": {
+        "type": "object",
+        "title": "Realtime reasoning configuration",
+        "description": "Configuration for reasoning-capable Realtime models such as `gpt-realtime-2`.\n",
+        "properties": {
+          "effort": {
+            "$ref": "#/components/schemas/RealtimeReasoningEffort"
+          }
+        }
+      },
+      "RealtimeReasoningEffort": {
+        "type": "string",
+        "description": "Constrains effort on reasoning for reasoning-capable Realtime models such as\n`gpt-realtime-2`.\n",
+        "enum": [
+          "minimal",
+          "low",
+          "medium",
+          "high",
+          "xhigh"
+        ],
+        "default": "low"
+      },
+      "RealtimeResponse": {
+        "type": "object",
+        "description": "The response resource.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the response, will look like `resp_1234`."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.response"
+            ],
+            "description": "The object type, must be `realtime.response`.",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "completed",
+              "cancelled",
+              "failed",
+              "incomplete",
+              "in_progress"
+            ],
+            "description": "The final status of the response (`completed`, `cancelled`, `failed`, or \n`incomplete`, `in_progress`).\n"
+          },
+          "status_details": {
+            "type": "object",
+            "description": "Additional details about the status.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "completed",
+                  "cancelled",
+                  "failed",
+                  "incomplete"
+                ],
+                "description": "The type of error that caused the response to fail, corresponding \nwith the `status` field (`completed`, `cancelled`, `incomplete`, \n`failed`).\n"
+              },
+              "reason": {
+                "type": "string",
+                "enum": [
+                  "turn_detected",
+                  "client_cancelled",
+                  "max_output_tokens",
+                  "content_filter"
+                ],
+                "description": "The reason the Response did not complete. For a `cancelled` Response,  one of `turn_detected` (the server VAD detected a new start of speech)  or `client_cancelled` (the client sent a cancel event). For an  `incomplete` Response, one of `max_output_tokens` or `content_filter`  (the server-side safety filter activated and cut off the response).\n"
+              },
+              "error": {
+                "type": "object",
+                "description": "A description of the error that caused the response to fail, \npopulated when the `status` is `failed`.\n",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "description": "The type of error."
+                  },
+                  "code": {
+                    "type": "string",
+                    "description": "Error code, if any."
+                  }
+                }
+              }
+            }
+          },
+          "output": {
+            "type": "array",
+            "description": "The list of output items generated by the response.",
+            "items": {
+              "$ref": "#/components/schemas/RealtimeConversationItem"
+            }
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for audio output.",
+            "properties": {
+              "output": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats",
+                    "description": "The format of the output audio."
+                  },
+                  "voice": {
+                    "$ref": "#/components/schemas/VoiceIdsShared",
+                    "default": "alloy",
+                    "description": "The voice the model uses to respond. Voice cannot be changed during the\nsession once the model has responded with audio at least once. Current\nvoice options are `alloy`, `ash`, `ballad`, `coral`, `echo`, `sage`,\n`shimmer`, `verse`, `marin`, and `cedar`. We recommend `marin` and `cedar` for\nbest quality.\n"
+                  }
+                }
+              }
+            }
+          },
+          "usage": {
+            "type": "object",
+            "description": "Usage statistics for the Response, this will correspond to billing. A \nRealtime API session will maintain a conversation context and append new \nItems to the Conversation, thus output from previous turns (text and \naudio tokens) will become the input for later turns.\n",
+            "properties": {
+              "total_tokens": {
+                "type": "integer",
+                "description": "The total number of tokens in the Response including input and output \ntext and audio tokens.\n"
+              },
+              "input_tokens": {
+                "type": "integer",
+                "description": "The number of input tokens used in the Response, including text and \naudio tokens.\n"
+              },
+              "output_tokens": {
+                "type": "integer",
+                "description": "The number of output tokens sent in the Response, including text and \naudio tokens.\n"
+              },
+              "input_token_details": {
+                "type": "object",
+                "description": "Details about the input tokens used in the Response. Cached tokens are tokens from previous turns in the conversation that are included as context for the current response. Cached tokens here are counted as a subset of input tokens, meaning input tokens will include cached and uncached tokens.",
+                "properties": {
+                  "cached_tokens": {
+                    "type": "integer",
+                    "description": "The number of cached tokens used as input for the Response."
+                  },
+                  "text_tokens": {
+                    "type": "integer",
+                    "description": "The number of text tokens used as input for the Response."
+                  },
+                  "image_tokens": {
+                    "type": "integer",
+                    "description": "The number of image tokens used as input for the Response."
+                  },
+                  "audio_tokens": {
+                    "type": "integer",
+                    "description": "The number of audio tokens used as input for the Response."
+                  },
+                  "cached_tokens_details": {
+                    "type": "object",
+                    "description": "Details about the cached tokens used as input for the Response.",
+                    "properties": {
+                      "text_tokens": {
+                        "type": "integer",
+                        "description": "The number of cached text tokens used as input for the Response."
+                      },
+                      "image_tokens": {
+                        "type": "integer",
+                        "description": "The number of cached image tokens used as input for the Response."
+                      },
+                      "audio_tokens": {
+                        "type": "integer",
+                        "description": "The number of cached audio tokens used as input for the Response."
+                      }
+                    }
+                  }
+                }
+              },
+              "output_token_details": {
+                "type": "object",
+                "description": "Details about the output tokens used in the Response.",
+                "properties": {
+                  "text_tokens": {
+                    "type": "integer",
+                    "description": "The number of text tokens used in the Response."
+                  },
+                  "audio_tokens": {
+                    "type": "integer",
+                    "description": "The number of audio tokens used in the Response."
+                  }
+                }
+              }
+            }
+          },
+          "conversation_id": {
+            "description": "Which conversation the response is added to, determined by the `conversation`\nfield in the `response.create` event. If `auto`, the response will be added to\nthe default conversation and the value of `conversation_id` will be an id like\n`conv_1234`. If `none`, the response will not be added to any conversation and\nthe value of `conversation_id` will be `null`. If responses are being triggered\nautomatically by VAD the response will be added to the default conversation\n",
+            "type": "string"
+          },
+          "output_modalities": {
+            "type": "array",
+            "description": "The set of modalities the model used to respond, currently the only possible values are\n`[\\\"audio\\\"]`, `[\\\"text\\\"]`. Audio output always include a text transcript. Setting the\noutput to mode `text` will disable audio output from the model.\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "max_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls, that was used in this response.\n"
+          }
+        }
+      },
+      "RealtimeResponseCreateParams": {
+        "type": "object",
+        "description": "Create a new Realtime response with these parameters",
+        "properties": {
+          "output_modalities": {
+            "type": "array",
+            "description": "The set of modalities the model used to respond, currently the only possible values are\n`[\\\"audio\\\"]`, `[\\\"text\\\"]`. Audio output always include a text transcript. Setting the\noutput to mode `text` will disable audio output from the model.\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "instructions": {
+            "type": "string",
+            "description": "The default system instructions (i.e. system message) prepended to model calls. This field allows the client to guide the model on desired responses. The model can be instructed on response content and format, (e.g. \"be extremely succinct\", \"act friendly\", \"here are examples of good responses\") and on audio behavior (e.g. \"talk quickly\", \"inject emotion into your voice\", \"laugh frequently\"). The instructions are not guaranteed to be followed by the model, but they provide guidance to the model on the desired behavior.\nNote that the server sets default instructions which will be used if this field is not set and are visible in the `session.created` event at the start of the session.\n"
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for audio input and output.",
+            "properties": {
+              "output": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats",
+                    "description": "The format of the output audio."
+                  },
+                  "voice": {
+                    "$ref": "#/components/schemas/VoiceIdsOrCustomVoice",
+                    "default": "alloy",
+                    "description": "The voice the model uses to respond. Supported built-in voices are\n`alloy`, `ash`, `ballad`, `coral`, `echo`, `sage`, `shimmer`, `verse`,\n`marin`, and `cedar`. You may also provide a custom voice object with\nan `id`, for example `{ \"id\": \"voice_1234\" }`. Voice cannot be changed\nduring the session once the model has responded with audio at least once.\nWe recommend `marin` and `cedar` for best quality.\n"
+                  }
+                }
+              }
+            }
+          },
+          "tools": {
+            "type": "array",
+            "description": "Tools available to the model.",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/RealtimeFunctionTool"
+                },
+                {
+                  "$ref": "#/components/schemas/MCPTool"
+                }
+              ]
+            }
+          },
+          "tool_choice": {
+            "description": "How the model chooses tools. Provide one of the string modes or force a specific\nfunction/MCP tool.\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ToolChoiceOptions"
+              },
+              {
+                "$ref": "#/components/schemas/ToolChoiceFunction"
+              },
+              {
+                "$ref": "#/components/schemas/ToolChoiceMCP"
+              }
+            ],
+            "default": "auto"
+          },
+          "parallel_tool_calls": {
+            "type": "boolean",
+            "description": "Whether the model may call multiple tools in parallel. Only supported by\nreasoning Realtime models such as `gpt-realtime-2`.\n"
+          },
+          "reasoning": {
+            "$ref": "#/components/schemas/RealtimeReasoning"
+          },
+          "max_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls. Provide an integer between 1 and 4096 to\nlimit output tokens, or `inf` for the maximum available tokens for a\ngiven model. Defaults to `inf`.\n"
+          },
+          "conversation": {
+            "description": "Controls which conversation the response is added to. Currently supports\n`auto` and `none`, with `auto` as the default value. The `auto` value\nmeans that the contents of the response will be added to the default\nconversation. Set this to `none` to create an out-of-band response which\nwill not add items to default conversation.\n",
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "default": "auto",
+                "enum": [
+                  "auto",
+                  "none"
+                ]
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/Prompt"
+          },
+          "input": {
+            "type": "array",
+            "description": "Input items to include in the prompt for the model. Using this field\ncreates a new context for this Response instead of using the default\nconversation. An empty array `[]` will clear the context for this Response.\nNote that this can include references to items that previously appeared in the session\nusing their id.\n",
+            "items": {
+              "$ref": "#/components/schemas/RealtimeConversationItem"
+            }
+          }
+        }
+      },
+      "RealtimeServerEvent": {
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "description": "A realtime server event.\n",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationCreated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemCreated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemDeleted"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemInputAudioTranscriptionCompleted"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemInputAudioTranscriptionDelta"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemInputAudioTranscriptionFailed"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemRetrieved"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemTruncated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventError"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventInputAudioBufferCleared"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventInputAudioBufferCommitted"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventInputAudioBufferDtmfEventReceived"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventInputAudioBufferSpeechStarted"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventInputAudioBufferSpeechStopped"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventRateLimitsUpdated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseAudioDelta"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseAudioDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseAudioTranscriptDelta"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseAudioTranscriptDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseContentPartAdded"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseContentPartDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseCreated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseFunctionCallArgumentsDelta"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseFunctionCallArgumentsDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseOutputItemAdded"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseOutputItemDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseTextDelta"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseTextDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventSessionCreated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventSessionUpdated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventOutputAudioBufferStarted"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventOutputAudioBufferStopped"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventOutputAudioBufferCleared"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemAdded"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventInputAudioBufferTimeoutTriggered"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventConversationItemInputAudioTranscriptionSegment"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventMCPListToolsInProgress"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventMCPListToolsCompleted"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventMCPListToolsFailed"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseMCPCallArgumentsDelta"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseMCPCallArgumentsDone"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseMCPCallInProgress"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseMCPCallCompleted"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventResponseMCPCallFailed"
+          }
+        ]
+      },
+      "RealtimeServerEventConversationCreated": {
+        "type": "object",
+        "description": "Returned when a conversation is created. Emitted right after session creation.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.created"
+            ],
+            "description": "The event type, must be `conversation.created`.",
+            "x-stainless-const": true
+          },
+          "conversation": {
+            "type": "object",
+            "description": "The conversation resource.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the conversation."
+              },
+              "object": {
+                "type": "string",
+                "description": "The object type, must be `realtime.conversation`."
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "conversation"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.created",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_9101\",\n    \"type\": \"conversation.created\",\n    \"conversation\": {\n        \"id\": \"conv_001\",\n        \"object\": \"realtime.conversation\"\n    }\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemAdded": {
+        "type": "object",
+        "description": "Sent by the server when an Item is added to the default Conversation. This can happen in several cases:\n- When the client sends a `conversation.item.create` event.\n- When the input audio buffer is committed. In this case the item will be a user message containing the audio from the buffer.\n- When the model is generating a Response. In this case the `conversation.item.added` event will be sent when the model starts generating a specific Item, and thus it will not yet have any content (and `status` will be `in_progress`).\n\nThe event will include the full content of the Item (except when model is generating a Response) except for audio data, which can be retrieved separately with a `conversation.item.retrieve` event if necessary.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.added"
+            ],
+            "description": "The event type, must be `conversation.item.added`.",
+            "x-stainless-const": true
+          },
+          "previous_item_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the item that precedes this one, if any. This is used to\nmaintain ordering when items are inserted.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.added",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"conversation.item.added\",\n  \"event_id\": \"event_C9G8pjSJCfRNEhMEnYAVy\",\n  \"previous_item_id\": null,\n  \"item\": {\n    \"id\": \"item_C9G8pGVKYnaZu8PH5YQ9O\",\n    \"type\": \"message\",\n    \"status\": \"completed\",\n    \"role\": \"user\",\n    \"content\": [\n      {\n        \"type\": \"input_text\",\n        \"text\": \"hi\"\n      }\n    ]\n  }\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemCreated": {
+        "type": "object",
+        "description": "Returned when a conversation item is created. There are several scenarios that produce this event:\n  - The server is generating a Response, which if successful will produce\n    either one or two Items, which will be of type `message`\n    (role `assistant`) or type `function_call`.\n  - The input audio buffer has been committed, either by the client or the\n    server (in `server_vad` mode). The server will take the content of the\n    input audio buffer and add it to a new user message Item.\n  - The client has sent a `conversation.item.create` event to add a new Item\n    to the Conversation.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.created"
+            ],
+            "description": "The event type, must be `conversation.item.created`.",
+            "x-stainless-const": true
+          },
+          "previous_item_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the preceding item in the Conversation context, allows the\nclient to understand the order of the conversation. Can be `null` if the\nitem has no predecessor.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.created",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1920\",\n    \"type\": \"conversation.item.created\",\n    \"previous_item_id\": \"msg_002\",\n    \"item\": {\n        \"id\": \"msg_003\",\n        \"object\": \"realtime.item\",\n        \"type\": \"message\",\n        \"status\": \"completed\",\n        \"role\": \"user\",\n        \"content\": []\n    }\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemDeleted": {
+        "type": "object",
+        "description": "Returned when an item in the conversation is deleted by the client with a \n`conversation.item.delete` event. This event is used to synchronize the \nserver's understanding of the conversation history with the client's view.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.deleted"
+            ],
+            "description": "The event type, must be `conversation.item.deleted`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item that was deleted."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.deleted",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_2728\",\n    \"type\": \"conversation.item.deleted\",\n    \"item_id\": \"msg_005\"\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemDone": {
+        "type": "object",
+        "description": "Returned when a conversation item is finalized.\n\nThe event will include the full content of the Item except for audio data, which can be retrieved separately with a `conversation.item.retrieve` event if needed.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.done"
+            ],
+            "description": "The event type, must be `conversation.item.done`.",
+            "x-stainless-const": true
+          },
+          "previous_item_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the item that precedes this one, if any. This is used to\nmaintain ordering when items are inserted.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.done",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"conversation.item.done\",\n  \"event_id\": \"event_CCXLgMZPo3qioWCeQa4WH\",\n  \"previous_item_id\": \"item_CCXLecNJVIVR2HUy3ABLj\",\n  \"item\": {\n    \"id\": \"item_CCXLfxmM5sXVJVz4mCa2S\",\n    \"type\": \"message\",\n    \"status\": \"completed\",\n    \"role\": \"assistant\",\n    \"content\": [\n      {\n        \"type\": \"output_audio\",\n        \"transcript\": \"Oh, I can hear you loud and clear! Sounds like we're connected just fine. What can I help you with today?\"\n      }\n    ]\n  }\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemInputAudioTranscriptionCompleted": {
+        "type": "object",
+        "description": "This event is the output of audio transcription for user audio written to the\nuser audio buffer. Transcription begins when the input audio buffer is\ncommitted by the client or server (when VAD is enabled). Transcription runs\nasynchronously with Response creation, so this event may come before or after\nthe Response events.\n\nRealtime API models accept audio natively, and thus input transcription is a\nseparate process run on a separate ASR (Automatic Speech Recognition) model.\nThe transcript may diverge somewhat from the model's interpretation, and\nshould be treated as a rough guide.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.input_audio_transcription.completed"
+            ],
+            "description": "The event type, must be\n`conversation.item.input_audio_transcription.completed`.\n",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item containing the audio that is being transcribed."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part containing the audio."
+          },
+          "transcript": {
+            "type": "string",
+            "description": "The transcribed text."
+          },
+          "languages": {
+            "type": "array",
+            "description": "The languages detected in the audio. Returned by `gpt-transcribe`. An empty array indicates that no language could be reliably detected.\n",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionLanguage"
+            }
+          },
+          "logprobs": {
+            "anyOf": [
+              {
+                "type": "array",
+                "description": "The log probabilities of the transcription.",
+                "items": {
+                  "$ref": "#/components/schemas/LogProbProperties"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "usage": {
+            "type": "object",
+            "description": "Usage statistics for the transcription, this is billed according to the ASR model's pricing rather than the realtime model's pricing.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/TranscriptTextUsageTokens",
+                "title": "Token Usage"
+              },
+              {
+                "$ref": "#/components/schemas/TranscriptTextUsageDuration",
+                "title": "Duration Usage"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id",
+          "content_index",
+          "transcript",
+          "usage"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.input_audio_transcription.completed",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"conversation.item.input_audio_transcription.completed\",\n  \"event_id\": \"event_CCXGRvtUVrax5SJAnNOWZ\",\n  \"item_id\": \"item_CCXGQ4e1ht4cOraEYcuR2\",\n  \"content_index\": 0,\n  \"transcript\": \"Hey, can you hear me?\",\n  \"usage\": {\n    \"type\": \"tokens\",\n    \"total_tokens\": 22,\n    \"input_tokens\": 13,\n    \"input_token_details\": {\n      \"text_tokens\": 0,\n      \"audio_tokens\": 13\n    },\n    \"output_tokens\": 9\n  }\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemInputAudioTranscriptionDelta": {
+        "type": "object",
+        "description": "Returned when the text value of an input audio transcription content part is updated with incremental transcription results.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.input_audio_transcription.delta"
+            ],
+            "description": "The event type, must be `conversation.item.input_audio_transcription.delta`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item containing the audio that is being transcribed."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta."
+          },
+          "logprobs": {
+            "anyOf": [
+              {
+                "type": "array",
+                "description": "The log probabilities of the transcription. These can be enabled by configurating the session with `\"include\": [\"item.input_audio_transcription.logprobs\"]`. Each entry in the array corresponds a log probability of which token would be selected for this chunk of transcription. This can help to identify if it was possible there were multiple valid options for a given chunk of transcription.",
+                "items": {
+                  "$ref": "#/components/schemas/LogProbProperties"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.input_audio_transcription.delta",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"conversation.item.input_audio_transcription.delta\",\n  \"event_id\": \"event_CCXGRxsAimPAs8kS2Wc7Z\",\n  \"item_id\": \"item_CCXGQ4e1ht4cOraEYcuR2\",\n  \"content_index\": 0,\n  \"delta\": \"Hey\",\n  \"obfuscation\": \"aLxx0jTEciOGe\"\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemInputAudioTranscriptionFailed": {
+        "type": "object",
+        "description": "Returned when input audio transcription is configured, and a transcription \nrequest for a user message failed. These events are separate from other \n`error` events so that the client can identify the related Item.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.input_audio_transcription.failed"
+            ],
+            "description": "The event type, must be\n`conversation.item.input_audio_transcription.failed`.\n",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part containing the audio."
+          },
+          "error": {
+            "type": "object",
+            "description": "Details of the transcription error.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The type of error."
+              },
+              "code": {
+                "type": "string",
+                "description": "Error code, if any."
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable error message."
+              },
+              "param": {
+                "type": "string",
+                "description": "Parameter related to the error, if any."
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id",
+          "content_index",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.input_audio_transcription.failed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_2324\",\n    \"type\": \"conversation.item.input_audio_transcription.failed\",\n    \"item_id\": \"msg_003\",\n    \"content_index\": 0,\n    \"error\": {\n        \"type\": \"transcription_error\",\n        \"code\": \"audio_unintelligible\",\n        \"message\": \"The audio could not be transcribed.\",\n        \"param\": null\n    }\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemInputAudioTranscriptionSegment": {
+        "type": "object",
+        "description": "Returned when an input audio transcription segment is identified for an item.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.input_audio_transcription.segment"
+            ],
+            "description": "The event type, must be `conversation.item.input_audio_transcription.segment`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item containing the input audio content."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the input audio content part within the item."
+          },
+          "text": {
+            "type": "string",
+            "description": "The text for this segment."
+          },
+          "id": {
+            "type": "string",
+            "description": "The segment identifier."
+          },
+          "speaker": {
+            "type": "string",
+            "description": "The detected speaker label for this segment."
+          },
+          "start": {
+            "type": "number",
+            "format": "double",
+            "description": "Start time of the segment in seconds."
+          },
+          "end": {
+            "type": "number",
+            "format": "double",
+            "description": "End time of the segment in seconds."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id",
+          "content_index",
+          "text",
+          "id",
+          "speaker",
+          "start",
+          "end"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.input_audio_transcription.segment",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6501\",\n    \"type\": \"conversation.item.input_audio_transcription.segment\",\n    \"item_id\": \"msg_011\",\n    \"content_index\": 0,\n    \"text\": \"hello\",\n    \"id\": \"seg_0001\",\n    \"speaker\": \"spk_1\",\n    \"start\": 0.0,\n    \"end\": 0.4\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemRetrieved": {
+        "type": "object",
+        "description": "Returned when a conversation item is retrieved with `conversation.item.retrieve`. This is provided as a way to fetch the server's representation of an item, for example to get access to the post-processed audio data after noise cancellation and VAD. It includes the full content of the Item, including audio data.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.retrieved"
+            ],
+            "description": "The event type, must be `conversation.item.retrieved`.",
+            "x-stainless-const": true
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.retrieved",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"conversation.item.retrieved\",\n  \"event_id\": \"event_CCXGSizgEppa2d4XbKA7K\",\n  \"item\": {\n    \"id\": \"item_CCXGRxbY0n6WE4EszhF5w\",\n    \"object\": \"realtime.item\",\n    \"type\": \"message\",\n    \"status\": \"completed\",\n    \"role\": \"assistant\",\n    \"content\": [\n      {\n        \"type\": \"audio\",\n        \"transcript\": \"Yes, I can hear you loud and clear. How can I help you today?\",\n        \"audio\": \"8//2//v/9//q/+//+P/s...\",\n        \"format\": \"pcm16\"\n      }\n    ]\n  }\n}\n"
+        }
+      },
+      "RealtimeServerEventConversationItemTruncated": {
+        "type": "object",
+        "description": "Returned when an earlier assistant audio message item is truncated by the \nclient with a `conversation.item.truncate` event. This event is used to \nsynchronize the server's understanding of the audio with the client's playback.\n\nThis action will truncate the audio and remove the server-side text transcript \nto ensure there is no text in the context that hasn't been heard by the user.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "conversation.item.truncated"
+            ],
+            "description": "The event type, must be `conversation.item.truncated`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the assistant message item that was truncated."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that was truncated."
+          },
+          "audio_end_ms": {
+            "type": "integer",
+            "description": "The duration up to which the audio was truncated, in milliseconds.\n"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id",
+          "content_index",
+          "audio_end_ms"
+        ],
+        "x-oaiMeta": {
+          "name": "conversation.item.truncated",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_2526\",\n    \"type\": \"conversation.item.truncated\",\n    \"item_id\": \"msg_004\",\n    \"content_index\": 0,\n    \"audio_end_ms\": 1500\n}\n"
+        }
+      },
+      "RealtimeServerEventError": {
+        "type": "object",
+        "description": "Returned when an error occurs, which could be a client problem or a server\nproblem. Most errors are recoverable and the session will stay open, we\nrecommend to implementors to monitor and log error messages by default.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "error"
+            ],
+            "description": "The event type, must be `error`.",
+            "x-stainless-const": true
+          },
+          "error": {
+            "type": "object",
+            "description": "Details of the error.",
+            "required": [
+              "type",
+              "message"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The type of error (e.g., \"invalid_request_error\", \"server_error\").\n"
+              },
+              "code": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Error code, if any."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable error message."
+              },
+              "param": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Parameter related to the error, if any."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "event_id": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The event_id of the client event that caused the error, if applicable.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "error",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_890\",\n    \"type\": \"error\",\n    \"error\": {\n        \"type\": \"invalid_request_error\",\n        \"code\": \"invalid_event\",\n        \"message\": \"The 'type' field is missing.\",\n        \"param\": null,\n        \"event_id\": \"event_567\"\n    }\n}\n"
+        }
+      },
+      "RealtimeServerEventInputAudioBufferCleared": {
+        "type": "object",
+        "description": "Returned when the input audio buffer is cleared by the client with a \n`input_audio_buffer.clear` event.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.cleared"
+            ],
+            "description": "The event type, must be `input_audio_buffer.cleared`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "event_id",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.cleared",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1314\",\n    \"type\": \"input_audio_buffer.cleared\"\n}\n"
+        }
+      },
+      "RealtimeServerEventInputAudioBufferCommitted": {
+        "type": "object",
+        "description": "Returned when an input audio buffer is committed, either by the client or\nautomatically in server VAD mode. The `item_id` property is the ID of the user\nmessage item that will be created, thus a `conversation.item.created` event\nwill also be sent to the client.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.committed"
+            ],
+            "description": "The event type, must be `input_audio_buffer.committed`.",
+            "x-stainless-const": true
+          },
+          "previous_item_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the preceding item after which the new item will be inserted.\nCan be `null` if the item has no predecessor.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item that will be created."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.committed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1121\",\n    \"type\": \"input_audio_buffer.committed\",\n    \"previous_item_id\": \"msg_001\",\n    \"item_id\": \"msg_002\"\n}\n"
+        }
+      },
+      "RealtimeServerEventInputAudioBufferDtmfEventReceived": {
+        "type": "object",
+        "description": "**SIP Only:** Returned when an DTMF event is received. A DTMF event is a message that\nrepresents a telephone keypad press (0–9, *, #, A–D). The `event` property\nis the keypad that the user press. The `received_at` is the UTC Unix Timestamp\nthat the server received the event.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.dtmf_event_received"
+            ],
+            "description": "The event type, must be `input_audio_buffer.dtmf_event_received`.",
+            "x-stainless-const": true
+          },
+          "event": {
+            "type": "string",
+            "description": "The telephone keypad that was pressed by the user."
+          },
+          "received_at": {
+            "type": "integer",
+            "description": "UTC Unix Timestamp when DTMF Event was received by server.\n"
+          }
+        },
+        "required": [
+          "type",
+          "event",
+          "received_at"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.dtmf_event_received",
+          "group": "realtime",
+          "example": "{\n    \"type\":\" input_audio_buffer.dtmf_event_received\",\n    \"event\": \"9\",\n    \"received_at\": 1763605109,\n}\n"
+        }
+      },
+      "RealtimeServerEventInputAudioBufferSpeechStarted": {
+        "type": "object",
+        "description": "Sent by the server when in `server_vad` mode to indicate that speech has been \ndetected in the audio buffer. This can happen any time audio is added to the \nbuffer (unless speech is already detected). The client may want to use this \nevent to interrupt audio playback or provide visual feedback to the user. \n\nThe client should expect to receive a `input_audio_buffer.speech_stopped` event \nwhen speech stops. The `item_id` property is the ID of the user message item \nthat will be created when speech stops and will also be included in the \n`input_audio_buffer.speech_stopped` event (unless the client manually commits \nthe audio buffer during VAD activation).\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.speech_started"
+            ],
+            "description": "The event type, must be `input_audio_buffer.speech_started`.",
+            "x-stainless-const": true
+          },
+          "audio_start_ms": {
+            "type": "integer",
+            "description": "Milliseconds from the start of all audio written to the buffer during the \nsession when speech was first detected. This will correspond to the \nbeginning of audio sent to the model, and thus includes the \n`prefix_padding_ms` configured in the Session.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item that will be created when speech stops.\n"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "audio_start_ms",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.speech_started",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1516\",\n    \"type\": \"input_audio_buffer.speech_started\",\n    \"audio_start_ms\": 1000,\n    \"item_id\": \"msg_003\"\n}\n"
+        }
+      },
+      "RealtimeServerEventInputAudioBufferSpeechStopped": {
+        "type": "object",
+        "description": "Returned in `server_vad` mode when the server detects the end of speech in \nthe audio buffer. The server will also send an `conversation.item.created` \nevent with the user message item that is created from the audio buffer.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.speech_stopped"
+            ],
+            "description": "The event type, must be `input_audio_buffer.speech_stopped`.",
+            "x-stainless-const": true
+          },
+          "audio_end_ms": {
+            "type": "integer",
+            "description": "Milliseconds since the session started when speech stopped. This will \ncorrespond to the end of audio sent to the model, and thus includes the \n`min_silence_duration_ms` configured in the Session.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the user message item that will be created."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "audio_end_ms",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.speech_stopped",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_1718\",\n    \"type\": \"input_audio_buffer.speech_stopped\",\n    \"audio_end_ms\": 2000,\n    \"item_id\": \"msg_003\"\n}\n"
+        }
+      },
+      "RealtimeServerEventInputAudioBufferTimeoutTriggered": {
+        "type": "object",
+        "description": "Returned when the Server VAD timeout is triggered for the input audio buffer. This is configured\nwith `idle_timeout_ms` in the `turn_detection` settings of the session, and it indicates that\nthere hasn't been any speech detected for the configured duration.\n\nThe `audio_start_ms` and `audio_end_ms` fields indicate the segment of audio after the last\nmodel response up to the triggering time, as an offset from the beginning of audio written\nto the input audio buffer. This means it demarcates the segment of audio that was silent and\nthe difference between the start and end values will roughly match the configured timeout.\n\nThe empty audio will be committed to the conversation as an `input_audio` item (there will be a\n`input_audio_buffer.committed` event) and a model response will be generated. There may be speech\nthat didn't trigger VAD but is still detected by the model, so the model may respond with\nsomething relevant to the conversation or a prompt to continue speaking.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_audio_buffer.timeout_triggered"
+            ],
+            "description": "The event type, must be `input_audio_buffer.timeout_triggered`.",
+            "x-stainless-const": true
+          },
+          "audio_start_ms": {
+            "type": "integer",
+            "description": "Millisecond offset of audio written to the input audio buffer that was after the playback time of the last model response."
+          },
+          "audio_end_ms": {
+            "type": "integer",
+            "description": "Millisecond offset of audio written to the input audio buffer at the time the timeout was triggered."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item associated with this segment."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "audio_start_ms",
+          "audio_end_ms",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "input_audio_buffer.timeout_triggered",
+          "group": "realtime",
+          "example": "{\n    \"type\":\"input_audio_buffer.timeout_triggered\",\n    \"event_id\":\"event_CEKKrf1KTGvemCPyiJTJ2\",\n    \"audio_start_ms\":13216,\n    \"audio_end_ms\":19232,\n    \"item_id\":\"item_CEKKrWH0GiwN0ET97NUZc\"\n}\n"
+        }
+      },
+      "RealtimeServerEventMCPListToolsCompleted": {
+        "type": "object",
+        "description": "Returned when listing MCP tools has completed for an item.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools.completed"
+            ],
+            "description": "The event type, must be `mcp_list_tools.completed`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP list tools item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "mcp_list_tools.completed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6102\",\n    \"type\": \"mcp_list_tools.completed\",\n    \"item_id\": \"mcp_list_tools_001\"\n}\n"
+        }
+      },
+      "RealtimeServerEventMCPListToolsFailed": {
+        "type": "object",
+        "description": "Returned when listing MCP tools has failed for an item.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools.failed"
+            ],
+            "description": "The event type, must be `mcp_list_tools.failed`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP list tools item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "mcp_list_tools.failed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6103\",\n    \"type\": \"mcp_list_tools.failed\",\n    \"item_id\": \"mcp_list_tools_001\"\n}\n"
+        }
+      },
+      "RealtimeServerEventMCPListToolsInProgress": {
+        "type": "object",
+        "description": "Returned when listing MCP tools is in progress for an item.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools.in_progress"
+            ],
+            "description": "The event type, must be `mcp_list_tools.in_progress`.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP list tools item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "mcp_list_tools.in_progress",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6101\",\n    \"type\": \"mcp_list_tools.in_progress\",\n    \"item_id\": \"mcp_list_tools_001\"\n}\n"
+        }
+      },
+      "RealtimeServerEventOutputAudioBufferCleared": {
+        "type": "object",
+        "description": "**WebRTC/SIP Only:** Emitted when the output audio buffer is cleared. This happens either in VAD\nmode when the user has interrupted (`input_audio_buffer.speech_started`),\nor when the client has emitted the `output_audio_buffer.clear` event to manually\ncut off the current audio response.\n[Learn more](https://developers.openai.com/api/docs/guides/realtime-conversations#client-and-server-events-for-audio-in-webrtc).\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_audio_buffer.cleared"
+            ],
+            "description": "The event type, must be `output_audio_buffer.cleared`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The unique ID of the response that produced the audio."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id"
+        ],
+        "x-oaiMeta": {
+          "name": "output_audio_buffer.cleared",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_abc123\",\n    \"type\": \"output_audio_buffer.cleared\",\n    \"response_id\": \"resp_abc123\"\n}\n"
+        }
+      },
+      "RealtimeServerEventOutputAudioBufferStarted": {
+        "type": "object",
+        "description": "**WebRTC/SIP Only:** Emitted when the server begins streaming audio to the client. This event is\nemitted after an audio content part has been added (`response.content_part.added`)\nto the response.\n[Learn more](https://developers.openai.com/api/docs/guides/realtime-conversations#client-and-server-events-for-audio-in-webrtc).\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_audio_buffer.started"
+            ],
+            "description": "The event type, must be `output_audio_buffer.started`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The unique ID of the response that produced the audio."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id"
+        ],
+        "x-oaiMeta": {
+          "name": "output_audio_buffer.started",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_abc123\",\n    \"type\": \"output_audio_buffer.started\",\n    \"response_id\": \"resp_abc123\"\n}\n"
+        }
+      },
+      "RealtimeServerEventOutputAudioBufferStopped": {
+        "type": "object",
+        "description": "**WebRTC/SIP Only:** Emitted when the output audio buffer has been completely drained on the server,\nand no more audio is forthcoming. This event is emitted after the full response\ndata has been sent to the client (`response.done`).\n[Learn more](https://developers.openai.com/api/docs/guides/realtime-conversations#client-and-server-events-for-audio-in-webrtc).\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_audio_buffer.stopped"
+            ],
+            "description": "The event type, must be `output_audio_buffer.stopped`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The unique ID of the response that produced the audio."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id"
+        ],
+        "x-oaiMeta": {
+          "name": "output_audio_buffer.stopped",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_abc123\",\n    \"type\": \"output_audio_buffer.stopped\",\n    \"response_id\": \"resp_abc123\"\n}\n"
+        }
+      },
+      "RealtimeServerEventRateLimitsUpdated": {
+        "type": "object",
+        "description": "Emitted at the beginning of a Response to indicate the updated rate limits. \nWhen a Response is created some tokens will be \"reserved\" for the output \ntokens, the rate limits shown here reflect that reservation, which is then \nadjusted accordingly once the Response is completed.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "rate_limits.updated"
+            ],
+            "description": "The event type, must be `rate_limits.updated`.",
+            "x-stainless-const": true
+          },
+          "rate_limits": {
+            "type": "array",
+            "description": "List of rate limit information.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "enum": [
+                    "requests",
+                    "tokens"
+                  ],
+                  "description": "The name of the rate limit (`requests`, `tokens`).\n"
+                },
+                "limit": {
+                  "type": "integer",
+                  "description": "The maximum allowed value for the rate limit."
+                },
+                "remaining": {
+                  "type": "integer",
+                  "description": "The remaining value before the limit is reached."
+                },
+                "reset_seconds": {
+                  "type": "number",
+                  "description": "Seconds until the rate limit resets."
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "rate_limits"
+        ],
+        "x-oaiMeta": {
+          "name": "rate_limits.updated",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5758\",\n    \"type\": \"rate_limits.updated\",\n    \"rate_limits\": [\n        {\n            \"name\": \"requests\",\n            \"limit\": 1000,\n            \"remaining\": 999,\n            \"reset_seconds\": 60\n        },\n        {\n            \"name\": \"tokens\",\n            \"limit\": 50000,\n            \"remaining\": 49950,\n            \"reset_seconds\": 60\n        }\n    ]\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseAudioDelta": {
+        "type": "object",
+        "description": "Returned when the model-generated audio is updated.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_audio.delta"
+            ],
+            "description": "The event type, must be `response.output_audio.delta`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "delta": {
+            "type": "string",
+            "description": "Base64-encoded audio data delta."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_audio.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4950\",\n    \"type\": \"response.output_audio.delta\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_008\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"delta\": \"Base64EncodedAudioDelta\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseAudioDone": {
+        "type": "object",
+        "description": "Returned when the model-generated audio is done. Also emitted when a Response\nis interrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_audio.done"
+            ],
+            "description": "The event type, must be `response.output_audio.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_audio.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5152\",\n    \"type\": \"response.output_audio.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_008\",\n    \"output_index\": 0,\n    \"content_index\": 0\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseAudioTranscriptDelta": {
+        "type": "object",
+        "description": "Returned when the model-generated transcription of audio output is updated.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_audio_transcript.delta"
+            ],
+            "description": "The event type, must be `response.output_audio_transcript.delta`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The transcript delta."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_audio_transcript.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4546\",\n    \"type\": \"response.output_audio_transcript.delta\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_008\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"delta\": \"Hello, how can I a\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseAudioTranscriptDone": {
+        "type": "object",
+        "description": "Returned when the model-generated transcription of audio output is done\nstreaming. Also emitted when a Response is interrupted, incomplete, or\ncancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_audio_transcript.done"
+            ],
+            "description": "The event type, must be `response.output_audio_transcript.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "transcript": {
+            "type": "string",
+            "description": "The final transcript of the audio."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "transcript"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_audio_transcript.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4748\",\n    \"type\": \"response.output_audio_transcript.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_008\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"transcript\": \"Hello, how can I assist you today?\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseContentPartAdded": {
+        "type": "object",
+        "description": "Returned when a new content part is added to an assistant message item during\nresponse generation.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.content_part.added"
+            ],
+            "description": "The event type, must be `response.content_part.added`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item to which the content part was added."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "part": {
+            "type": "object",
+            "description": "The content part that was added.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "audio",
+                  "text"
+                ],
+                "description": "The content type (\"text\", \"audio\")."
+              },
+              "text": {
+                "type": "string",
+                "description": "The text content (if type is \"text\")."
+              },
+              "audio": {
+                "type": "string",
+                "description": "Base64-encoded audio data (if type is \"audio\")."
+              },
+              "transcript": {
+                "type": "string",
+                "description": "The transcript of the audio (if type is \"audio\")."
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part"
+        ],
+        "x-oaiMeta": {
+          "name": "response.content_part.added",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3738\",\n    \"type\": \"response.content_part.added\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_007\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"part\": {\n        \"type\": \"text\",\n        \"text\": \"\"\n    }\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseContentPartDone": {
+        "type": "object",
+        "description": "Returned when a content part is done streaming in an assistant message item.\nAlso emitted when a Response is interrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.content_part.done"
+            ],
+            "description": "The event type, must be `response.content_part.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "part": {
+            "type": "object",
+            "description": "The content part that is done.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "audio",
+                  "text"
+                ],
+                "description": "The content type (\"text\", \"audio\")."
+              },
+              "text": {
+                "type": "string",
+                "description": "The text content (if type is \"text\")."
+              },
+              "audio": {
+                "type": "string",
+                "description": "Base64-encoded audio data (if type is \"audio\")."
+              },
+              "transcript": {
+                "type": "string",
+                "description": "The transcript of the audio (if type is \"audio\")."
+              }
+            }
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part"
+        ],
+        "x-oaiMeta": {
+          "name": "response.content_part.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3940\",\n    \"type\": \"response.content_part.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_007\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"part\": {\n        \"type\": \"text\",\n        \"text\": \"Sure, I can help with that.\"\n    }\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseCreated": {
+        "type": "object",
+        "description": "Returned when a new Response is created. The first event of response creation,\nwhere the response is in an initial state of `in_progress`.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.created"
+            ],
+            "description": "The event type, must be `response.created`.",
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/RealtimeResponse"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response"
+        ],
+        "x-oaiMeta": {
+          "name": "response.created",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"response.created\",\n  \"event_id\": \"event_C9G8pqbTEddBSIxbBN6Os\",\n  \"response\": {\n    \"object\": \"realtime.response\",\n    \"id\": \"resp_C9G8p7IH2WxLbkgPNouYL\",\n    \"status\": \"in_progress\",\n    \"status_details\": null,\n    \"output\": [],\n    \"conversation_id\": \"conv_C9G8mmBkLhQJwCon3hoJN\",\n    \"output_modalities\": [\n      \"audio\"\n    ],\n    \"max_output_tokens\": \"inf\",\n    \"audio\": {\n      \"output\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"voice\": \"marin\"\n      }\n    },\n    \"usage\": null,\n    \"metadata\": null\n  },\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseDone": {
+        "type": "object",
+        "description": "Returned when a Response is done streaming. Always emitted, no matter the \nfinal state. The Response object included in the `response.done` event will \ninclude all output Items in the Response but will omit the raw audio data.\n\nClients should check the `status` field of the Response to determine if it was successful\n(`completed`) or if there was another outcome: `cancelled`, `failed`, or `incomplete`.\n\nA response will contain all output items that were generated during the response, excluding\nany audio content.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.done"
+            ],
+            "description": "The event type, must be `response.done`.",
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/RealtimeResponse"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response"
+        ],
+        "x-oaiMeta": {
+          "name": "response.done",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"response.done\",\n  \"event_id\": \"event_CCXHxcMy86rrKhBLDdqCh\",\n  \"response\": {\n    \"object\": \"realtime.response\",\n    \"id\": \"resp_CCXHw0UJld10EzIUXQCNh\",\n    \"status\": \"completed\",\n    \"status_details\": null,\n    \"output\": [\n      {\n        \"id\": \"item_CCXHwGjjDUfOXbiySlK7i\",\n        \"type\": \"message\",\n        \"status\": \"completed\",\n        \"role\": \"assistant\",\n        \"content\": [\n          {\n            \"type\": \"output_audio\",\n            \"transcript\": \"Loud and clear! I can hear you perfectly. How can I help you today?\"\n          }\n        ]\n      }\n    ],\n    \"conversation_id\": \"conv_CCXHsurMKcaVxIZvaCI5m\",\n    \"output_modalities\": [\n      \"audio\"\n    ],\n    \"max_output_tokens\": \"inf\",\n    \"audio\": {\n      \"output\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"voice\": \"alloy\"\n      }\n    },\n    \"usage\": {\n      \"total_tokens\": 253,\n      \"input_tokens\": 132,\n      \"output_tokens\": 121,\n      \"input_token_details\": {\n        \"text_tokens\": 119,\n        \"audio_tokens\": 13,\n        \"image_tokens\": 0,\n        \"cached_tokens\": 64,\n        \"cached_tokens_details\": {\n          \"text_tokens\": 64,\n          \"audio_tokens\": 0,\n          \"image_tokens\": 0\n        }\n      },\n      \"output_token_details\": {\n        \"text_tokens\": 30,\n        \"audio_tokens\": 91\n      }\n    },\n    \"metadata\": null\n  }\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseFunctionCallArgumentsDelta": {
+        "type": "object",
+        "description": "Returned when the model-generated function call arguments are updated.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.function_call_arguments.delta"
+            ],
+            "description": "The event type, must be `response.function_call_arguments.delta`.\n",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the function call item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the function call."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The arguments delta as a JSON string."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "call_id",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.function_call_arguments.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5354\",\n    \"type\": \"response.function_call_arguments.delta\",\n    \"response_id\": \"resp_002\",\n    \"item_id\": \"fc_001\",\n    \"output_index\": 0,\n    \"call_id\": \"call_001\",\n    \"delta\": \"{\\\"location\\\": \\\"San\\\"\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseFunctionCallArgumentsDone": {
+        "type": "object",
+        "description": "Returned when the model-generated function call arguments are done streaming.\nAlso emitted when a Response is interrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.function_call_arguments.done"
+            ],
+            "description": "The event type, must be `response.function_call_arguments.done`.\n",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the function call item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the function call."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function that was called."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The final arguments as a JSON string."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "call_id",
+          "name",
+          "arguments"
+        ],
+        "x-oaiMeta": {
+          "name": "response.function_call_arguments.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_5556\",\n    \"type\": \"response.function_call_arguments.done\",\n    \"response_id\": \"resp_002\",\n    \"item_id\": \"fc_001\",\n    \"output_index\": 0,\n    \"call_id\": \"call_001\",\n    \"name\": \"get_weather\",\n    \"arguments\": \"{\\\"location\\\": \\\"San Francisco\\\"}\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseMCPCallArgumentsDelta": {
+        "type": "object",
+        "description": "Returned when MCP tool call arguments are updated during response generation.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call_arguments.delta"
+            ],
+            "description": "The event type, must be `response.mcp_call_arguments.delta`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The JSON-encoded arguments delta."
+          },
+          "obfuscation": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "If present, indicates the delta text was obfuscated."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call_arguments.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6201\",\n    \"type\": \"response.mcp_call_arguments.delta\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"mcp_call_001\",\n    \"output_index\": 0,\n    \"delta\": \"{\\\"partial\\\":true}\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseMCPCallArgumentsDone": {
+        "type": "object",
+        "description": "Returned when MCP tool call arguments are finalized during response generation.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call_arguments.done"
+            ],
+            "description": "The event type, must be `response.mcp_call_arguments.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The final JSON-encoded arguments string."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "arguments"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call_arguments.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6202\",\n    \"type\": \"response.mcp_call_arguments.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"mcp_call_001\",\n    \"output_index\": 0,\n    \"arguments\": \"{\\\"q\\\":\\\"docs\\\"}\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseMCPCallCompleted": {
+        "type": "object",
+        "description": "Returned when an MCP tool call has completed successfully.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.completed"
+            ],
+            "description": "The event type, must be `response.mcp_call.completed`.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "output_index",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.completed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6302\",\n    \"type\": \"response.mcp_call.completed\",\n    \"output_index\": 0,\n    \"item_id\": \"mcp_call_001\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseMCPCallFailed": {
+        "type": "object",
+        "description": "Returned when an MCP tool call has failed.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.failed"
+            ],
+            "description": "The event type, must be `response.mcp_call.failed`.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "output_index",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.failed",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6303\",\n    \"type\": \"response.mcp_call.failed\",\n    \"output_index\": 0,\n    \"item_id\": \"mcp_call_001\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseMCPCallInProgress": {
+        "type": "object",
+        "description": "Returned when an MCP tool call has started and is in progress.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.in_progress"
+            ],
+            "description": "The event type, must be `response.mcp_call.in_progress`.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "output_index",
+          "item_id"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.in_progress",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_6301\",\n    \"type\": \"response.mcp_call.in_progress\",\n    \"output_index\": 0,\n    \"item_id\": \"mcp_call_001\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseOutputItemAdded": {
+        "type": "object",
+        "description": "Returned when a new Item is created during Response generation.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_item.added"
+            ],
+            "description": "The event type, must be `response.output_item.added`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the Response to which the item belongs."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the Response."
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "output_index",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_item.added",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3334\",\n    \"type\": \"response.output_item.added\",\n    \"response_id\": \"resp_001\",\n    \"output_index\": 0,\n    \"item\": {\n        \"id\": \"msg_007\",\n        \"object\": \"realtime.item\",\n        \"type\": \"message\",\n        \"status\": \"in_progress\",\n        \"role\": \"assistant\",\n        \"content\": []\n    }\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseOutputItemDone": {
+        "type": "object",
+        "description": "Returned when an Item is done streaming. Also emitted when a Response is \ninterrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_item.done"
+            ],
+            "description": "The event type, must be `response.output_item.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the Response to which the item belongs."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the Response."
+          },
+          "item": {
+            "$ref": "#/components/schemas/RealtimeConversationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "output_index",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_item.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_3536\",\n    \"type\": \"response.output_item.done\",\n    \"response_id\": \"resp_001\",\n    \"output_index\": 0,\n    \"item\": {\n        \"id\": \"msg_007\",\n        \"object\": \"realtime.item\",\n        \"type\": \"message\",\n        \"status\": \"completed\",\n        \"role\": \"assistant\",\n        \"content\": [\n            {\n                \"type\": \"text\",\n                \"text\": \"Sure, I can help with that.\"\n            }\n        ]\n    }\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseTextDelta": {
+        "type": "object",
+        "description": "Returned when the text value of an \"output_text\" content part is updated.",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_text.delta"
+            ],
+            "description": "The event type, must be `response.output_text.delta`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.delta",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4142\",\n    \"type\": \"response.output_text.delta\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_007\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"delta\": \"Sure, I can h\"\n}\n"
+        }
+      },
+      "RealtimeServerEventResponseTextDone": {
+        "type": "object",
+        "description": "Returned when the text value of an \"output_text\" content part is done streaming. Also\nemitted when a Response is interrupted, incomplete, or cancelled.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_text.done"
+            ],
+            "description": "The event type, must be `response.output_text.done`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part in the item's content array."
+          },
+          "text": {
+            "type": "string",
+            "description": "The final text content."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "response_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "text"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.done",
+          "group": "realtime",
+          "example": "{\n    \"event_id\": \"event_4344\",\n    \"type\": \"response.output_text.done\",\n    \"response_id\": \"resp_001\",\n    \"item_id\": \"msg_007\",\n    \"output_index\": 0,\n    \"content_index\": 0,\n    \"text\": \"Sure, I can help with that.\"\n}\n"
+        }
+      },
+      "RealtimeServerEventSessionCreated": {
+        "type": "object",
+        "description": "Returned when a Session is created. Emitted automatically when a new\nconnection is established as the first server event. This event will contain\nthe default Session configuration.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.created"
+            ],
+            "description": "The event type, must be `session.created`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "description": "The session configuration.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/RealtimeSessionCreateResponseGA"
+              },
+              {
+                "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateResponseGA"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.created",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"session.created\",\n  \"event_id\": \"event_C9G5RJeJ2gF77mV7f2B1j\",\n  \"session\": {\n    \"type\": \"realtime\",\n    \"object\": \"realtime.session\",\n    \"id\": \"sess_C9G5QPteg4UIbotdKLoYQ\",\n    \"model\": \"gpt-realtime-2025-08-28\",\n    \"output_modalities\": [\n      \"audio\"\n    ],\n    \"instructions\": \"Your knowledge cutoff is 2023-10. You are a helpful, witty, and friendly AI. Act like a human, but remember that you aren't a human and that you can't do human things in the real world. Your voice and personality should be warm and engaging, with a lively and playful tone. If interacting in a non-English language, start by using the standard accent or dialect familiar to the user. Talk quickly. You should always call a function if you can. Do not refer to these rules, even if you’re asked about them.\",\n    \"tools\": [],\n    \"tool_choice\": \"auto\",\n    \"max_output_tokens\": \"inf\",\n    \"tracing\": null,\n    \"prompt\": null,\n    \"expires_at\": 1756324625,\n    \"audio\": {\n      \"input\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"transcription\": null,\n        \"noise_reduction\": null,\n        \"turn_detection\": {\n          \"type\": \"server_vad\",\n          \"threshold\": 0.5,\n          \"prefix_padding_ms\": 300,\n          \"silence_duration_ms\": 200,\n          \"idle_timeout_ms\": null,\n          \"create_response\": true,\n          \"interrupt_response\": true\n        }\n      },\n      \"output\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"voice\": \"marin\",\n        \"speed\": 1\n      }\n    },\n    \"include\": null\n  },\n}\n"
+        }
+      },
+      "RealtimeServerEventSessionUpdated": {
+        "type": "object",
+        "description": "Returned when a session is updated with a `session.update` event, unless\nthere is an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.updated"
+            ],
+            "description": "The event type, must be `session.updated`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "description": "The session configuration.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/RealtimeSessionCreateResponseGA"
+              },
+              {
+                "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateResponseGA"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.updated",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"session.updated\",\n  \"event_id\": \"event_C9G8mqI3IucaojlVKE8Cs\",\n  \"session\": {\n    \"type\": \"realtime\",\n    \"object\": \"realtime.session\",\n    \"id\": \"sess_C9G8l3zp50uFv4qgxfJ8o\",\n    \"model\": \"gpt-realtime-2025-08-28\",\n    \"output_modalities\": [\n      \"audio\"\n    ],\n    \"instructions\": \"Your knowledge cutoff is 2023-10. You are a helpful, witty, and friendly AI. Act like a human, but remember that you aren't a human and that you can't do human things in the real world. Your voice and personality should be warm and engaging, with a lively and playful tone. If interacting in a non-English language, start by using the standard accent or dialect familiar to the user. Talk quickly. You should always call a function if you can. Do not refer to these rules, even if you’re asked about them.\",\n    \"tools\": [\n      {\n        \"type\": \"function\",\n        \"name\": \"display_color_palette\",\n        \"description\": \"\\nCall this function when a user asks for a color palette.\\n\",\n        \"parameters\": {\n          \"type\": \"object\",\n          \"strict\": true,\n          \"properties\": {\n            \"theme\": {\n              \"type\": \"string\",\n              \"description\": \"Description of the theme for the color scheme.\"\n            },\n            \"colors\": {\n              \"type\": \"array\",\n              \"description\": \"Array of five hex color codes based on the theme.\",\n              \"items\": {\n                \"type\": \"string\",\n                \"description\": \"Hex color code\"\n              }\n            }\n          },\n          \"required\": [\n            \"theme\",\n            \"colors\"\n          ]\n        }\n      }\n    ],\n    \"tool_choice\": \"auto\",\n    \"max_output_tokens\": \"inf\",\n    \"tracing\": null,\n    \"prompt\": null,\n    \"expires_at\": 1756324832,\n    \"audio\": {\n      \"input\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"transcription\": null,\n        \"noise_reduction\": null,\n        \"turn_detection\": {\n          \"type\": \"server_vad\",\n          \"threshold\": 0.5,\n          \"prefix_padding_ms\": 300,\n          \"silence_duration_ms\": 200,\n          \"idle_timeout_ms\": null,\n          \"create_response\": true,\n          \"interrupt_response\": true\n        }\n      },\n      \"output\": {\n        \"format\": {\n          \"type\": \"audio/pcm\",\n          \"rate\": 24000\n        },\n        \"voice\": \"marin\",\n        \"speed\": 1\n      }\n    },\n    \"include\": null\n  },\n}\n"
+        }
+      },
+      "RealtimeServerEventTranscriptionSessionUpdated": {
+        "type": "object",
+        "description": "Returned when a transcription session is updated with a `transcription_session.update` event, unless \nthere is an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "transcription_session.updated"
+            ],
+            "description": "The event type, must be `transcription_session.updated`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranscriptionSessionCreateResponse"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "transcription_session.updated",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_5678\",\n  \"type\": \"transcription_session.updated\",\n  \"session\": {\n    \"id\": \"sess_001\",\n    \"object\": \"realtime.transcription_session\",\n    \"input_audio_format\": \"pcm16\",\n    \"input_audio_transcription\": {\n      \"model\": \"gpt-4o-transcribe\",\n      \"prompt\": \"\",\n      \"language\": \"\"\n    },\n    \"turn_detection\": {\n      \"type\": \"server_vad\",\n      \"threshold\": 0.5,\n      \"prefix_padding_ms\": 300,\n      \"silence_duration_ms\": 500,\n      \"create_response\": true,\n      // \"interrupt_response\": false  -- this will NOT be returned\n    },\n    \"input_audio_noise_reduction\": {\n      \"type\": \"near_field\"\n    },\n    \"include\": [\n      \"item.input_audio_transcription.avg_logprob\",\n    ],\n  }\n}\n"
+        }
+      },
+      "RealtimeSession": {
+        "type": "object",
+        "description": "Realtime session object for the beta interface.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the session that looks like `sess_1234567890abcdef`.\n"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "realtime.session"
+            ],
+            "description": "The object type. Always `realtime.session`."
+          },
+          "modalities": {
+            "description": "The set of modalities the model can respond with. To disable audio,\nset this to [\"text\"].\n",
+            "items": {
+              "type": "string",
+              "default": [
+                "text",
+                "audio"
+              ],
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "model": {
+            "description": "The Realtime model used for this session.\n",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-realtime",
+                  "gpt-realtime-1.5",
+                  "gpt-realtime-2025-08-28",
+                  "gpt-4o-realtime-preview",
+                  "gpt-4o-realtime-preview-2024-10-01",
+                  "gpt-4o-realtime-preview-2024-12-17",
+                  "gpt-4o-realtime-preview-2025-06-03",
+                  "gpt-4o-mini-realtime-preview",
+                  "gpt-4o-mini-realtime-preview-2024-12-17",
+                  "gpt-realtime-mini",
+                  "gpt-realtime-mini-2025-10-06",
+                  "gpt-realtime-mini-2025-12-15",
+                  "gpt-audio-1.5",
+                  "gpt-audio-mini",
+                  "gpt-audio-mini-2025-10-06",
+                  "gpt-audio-mini-2025-12-15"
+                ]
+              }
+            ]
+          },
+          "instructions": {
+            "type": "string",
+            "description": "The default system instructions (i.e. system message) prepended to model\ncalls. This field allows the client to guide the model on desired\nresponses. The model can be instructed on response content and format,\n(e.g. \"be extremely succinct\", \"act friendly\", \"here are examples of good\nresponses\") and on audio behavior (e.g. \"talk quickly\", \"inject emotion\ninto your voice\", \"laugh frequently\"). The instructions are not\nguaranteed to be followed by the model, but they provide guidance to the\nmodel on the desired behavior.\n\n\nNote that the server sets default instructions which will be used if this\nfield is not set and are visible in the `session.created` event at the\nstart of the session.\n"
+          },
+          "voice": {
+            "$ref": "#/components/schemas/VoiceIdsShared",
+            "description": "The voice the model uses to respond. Voice cannot be changed during the\nsession once the model has responded with audio at least once. Current\nvoice options are `alloy`, `ash`, `ballad`, `coral`, `echo`, `sage`,\n`shimmer`, and `verse`.\n"
+          },
+          "input_audio_format": {
+            "type": "string",
+            "default": "pcm16",
+            "enum": [
+              "pcm16",
+              "g711_ulaw",
+              "g711_alaw"
+            ],
+            "description": "The format of input audio. Options are `pcm16`, `g711_ulaw`, or `g711_alaw`.\nFor `pcm16`, input audio must be 16-bit PCM at a 24kHz sample rate,\nsingle channel (mono), and little-endian byte order.\n"
+          },
+          "output_audio_format": {
+            "type": "string",
+            "default": "pcm16",
+            "enum": [
+              "pcm16",
+              "g711_ulaw",
+              "g711_alaw"
+            ],
+            "description": "The format of output audio. Options are `pcm16`, `g711_ulaw`, or `g711_alaw`.\nFor `pcm16`, output audio is sampled at a rate of 24kHz.\n"
+          },
+          "input_audio_transcription": {
+            "anyOf": [
+              {
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/AudioTranscriptionResponse"
+                  }
+                ],
+                "description": "Configuration for input audio transcription, defaults to off and can be set to `null` to turn off once on. Input audio transcription is not native to the model, since the model consumes audio directly. Transcription runs asynchronously through [the /audio/transcriptions endpoint](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) and should be treated as guidance of input audio content rather than precisely what the model heard. The client can optionally set the language and prompt for transcription, these offer additional guidance to the transcription service.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "turn_detection": {
+            "$ref": "#/components/schemas/RealtimeTurnDetection"
+          },
+          "input_audio_noise_reduction": {
+            "type": "object",
+            "default": null,
+            "description": "Configuration for input audio noise reduction. This can be set to `null` to turn off.\nNoise reduction filters audio added to the input audio buffer before it is sent to VAD and the model.\nFiltering the audio can improve VAD and turn detection accuracy (reducing false positives) and model performance by improving perception of the input audio.\n",
+            "properties": {
+              "type": {
+                "$ref": "#/components/schemas/NoiseReductionType"
+              }
+            }
+          },
+          "speed": {
+            "type": "number",
+            "default": 1,
+            "maximum": 1.5,
+            "minimum": 0.25,
+            "description": "The speed of the model's spoken response. 1.0 is the default speed. 0.25 is\nthe minimum speed. 1.5 is the maximum speed. This value can only be changed\nin between model turns, not while a response is in progress.\n"
+          },
+          "tracing": {
+            "anyOf": [
+              {
+                "title": "Tracing Configuration",
+                "description": "Configuration options for tracing. Set to null to disable tracing. Once\ntracing is enabled for a session, the configuration cannot be modified.\n\n`auto` will create a trace for the session with default values for the\nworkflow name, group id, and metadata.\n",
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "default": "auto",
+                    "description": "Default tracing mode for the session.\n",
+                    "enum": [
+                      "auto"
+                    ],
+                    "x-stainless-const": true
+                  },
+                  {
+                    "type": "object",
+                    "title": "Tracing Configuration",
+                    "description": "Granular configuration for tracing.\n",
+                    "properties": {
+                      "workflow_name": {
+                        "type": "string",
+                        "description": "The name of the workflow to attach to this trace. This is used to\nname the trace in the traces dashboard.\n"
+                      },
+                      "group_id": {
+                        "type": "string",
+                        "description": "The group id to attach to this trace to enable filtering and\ngrouping in the traces dashboard.\n"
+                      },
+                      "metadata": {
+                        "type": "object",
+                        "description": "The arbitrary metadata to attach to this trace to enable\nfiltering in the traces dashboard.\n"
+                      }
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "type": "array",
+            "description": "Tools (functions) available to the model.",
+            "items": {
+              "$ref": "#/components/schemas/RealtimeFunctionTool"
+            }
+          },
+          "tool_choice": {
+            "type": "string",
+            "default": "auto",
+            "description": "How the model chooses tools. Options are `auto`, `none`, `required`, or\nspecify a function.\n"
+          },
+          "temperature": {
+            "type": "number",
+            "default": 0.8,
+            "description": "Sampling temperature for the model, limited to [0.6, 1.2]. For audio models a temperature of 0.8 is highly recommended for best performance.\n"
+          },
+          "max_response_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls. Provide an integer between 1 and 4096 to\nlimit output tokens, or `inf` for the maximum available tokens for a\ngiven model. Defaults to `inf`.\n"
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Expiration timestamp for the session, in seconds since epoch."
+          },
+          "prompt": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Prompt"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "include": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "enum": [
+                    "item.input_audio_transcription.logprobs"
+                  ]
+                },
+                "description": "Additional fields to include in server outputs.\n- `item.input_audio_transcription.logprobs`: Include logprobs for input audio transcription.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        }
+      },
+      "RealtimeSessionCreateRequest": {
+        "type": "object",
+        "description": "A new Realtime session configuration, with an ephemeral key. Default TTL\nfor keys is one minute.\n",
+        "properties": {
+          "client_secret": {
+            "type": "object",
+            "description": "Ephemeral key returned by the API.",
+            "properties": {
+              "value": {
+                "type": "string",
+                "description": "Ephemeral key usable in client environments to authenticate connections\nto the Realtime API. Use this in client-side environments rather than\na standard API token, which should only be used server-side.\n"
+              },
+              "expires_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "Timestamp for when the token expires. Currently, all tokens expire\nafter one minute.\n"
+              }
+            },
+            "required": [
+              "value",
+              "expires_at"
+            ]
+          },
+          "modalities": {
+            "description": "The set of modalities the model can respond with. To disable audio,\nset this to [\"text\"].\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "instructions": {
+            "type": "string",
+            "description": "The default system instructions (i.e. system message) prepended to model calls. This field allows the client to guide the model on desired responses. The model can be instructed on response content and format, (e.g. \"be extremely succinct\", \"act friendly\", \"here are examples of good responses\") and on audio behavior (e.g. \"talk quickly\", \"inject emotion into your voice\", \"laugh frequently\"). The instructions are not guaranteed to be followed by the model, but they provide guidance to the model on the desired behavior.\nNote that the server sets default instructions which will be used if this field is not set and are visible in the `session.created` event at the start of the session.\n"
+          },
+          "voice": {
+            "$ref": "#/components/schemas/VoiceIdsOrCustomVoice",
+            "description": "The voice the model uses to respond. Supported built-in voices are\n`alloy`, `ash`, `ballad`, `coral`, `echo`, `sage`, `shimmer`, `verse`,\n`marin`, and `cedar`. You may also provide a custom voice object with an\n`id`, for example `{ \"id\": \"voice_1234\" }`. Voice cannot be changed during\nthe session once the model has responded with audio at least once.\n"
+          },
+          "input_audio_format": {
+            "type": "string",
+            "description": "The format of input audio. Options are `pcm16`, `g711_ulaw`, or `g711_alaw`.\n"
+          },
+          "output_audio_format": {
+            "type": "string",
+            "description": "The format of output audio. Options are `pcm16`, `g711_ulaw`, or `g711_alaw`.\n"
+          },
+          "input_audio_transcription": {
+            "type": "object",
+            "description": "Configuration for input audio transcription, defaults to off and can be\nset to `null` to turn off once on. Input audio transcription is not native\nto the model, since the model consumes audio directly. Transcription runs\nasynchronously and should be treated as rough guidance\nrather than the representation understood by the model.\n",
+            "properties": {
+              "model": {
+                "type": "string",
+                "description": "The model to use for transcription.\n"
+              }
+            }
+          },
+          "speed": {
+            "type": "number",
+            "default": 1,
+            "maximum": 1.5,
+            "minimum": 0.25,
+            "description": "The speed of the model's spoken response. 1.0 is the default speed. 0.25 is\nthe minimum speed. 1.5 is the maximum speed. This value can only be changed\nin between model turns, not while a response is in progress.\n"
+          },
+          "tracing": {
+            "title": "Tracing Configuration",
+            "description": "Configuration options for tracing. Set to null to disable tracing. Once\ntracing is enabled for a session, the configuration cannot be modified.\n\n`auto` will create a trace for the session with default values for the\nworkflow name, group id, and metadata.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "default": "auto",
+                "description": "Default tracing mode for the session.\n",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "object",
+                "title": "Tracing Configuration",
+                "description": "Granular configuration for tracing.\n",
+                "properties": {
+                  "workflow_name": {
+                    "type": "string",
+                    "description": "The name of the workflow to attach to this trace. This is used to\nname the trace in the traces dashboard.\n"
+                  },
+                  "group_id": {
+                    "type": "string",
+                    "description": "The group id to attach to this trace to enable filtering and\ngrouping in the traces dashboard.\n"
+                  },
+                  "metadata": {
+                    "type": "object",
+                    "description": "The arbitrary metadata to attach to this trace to enable\nfiltering in the traces dashboard.\n"
+                  }
+                }
+              }
+            ]
+          },
+          "turn_detection": {
+            "type": "object",
+            "description": "Configuration for turn detection. Can be set to `null` to turn off. Server\nVAD means that the model will detect the start and end of speech based on\naudio volume and respond at the end of user speech.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Type of turn detection, only `server_vad` is currently supported.\n"
+              },
+              "threshold": {
+                "type": "number",
+                "description": "Activation threshold for VAD (0.0 to 1.0), this defaults to 0.5. A\nhigher threshold will require louder audio to activate the model, and\nthus might perform better in noisy environments.\n"
+              },
+              "prefix_padding_ms": {
+                "type": "integer",
+                "description": "Amount of audio to include before the VAD detected speech (in\nmilliseconds). Defaults to 300ms.\n"
+              },
+              "silence_duration_ms": {
+                "type": "integer",
+                "description": "Duration of silence to detect speech stop (in milliseconds). Defaults\nto 500ms. With shorter values the model will respond more quickly,\nbut may jump in on short pauses from the user.\n"
+              }
+            }
+          },
+          "tools": {
+            "type": "array",
+            "description": "Tools (functions) available to the model.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "function"
+                  ],
+                  "description": "The type of the tool, i.e. `function`.",
+                  "x-stainless-const": true
+                },
+                "name": {
+                  "type": "string",
+                  "description": "The name of the function."
+                },
+                "description": {
+                  "type": "string",
+                  "description": "The description of the function, including guidance on when and how\nto call it, and guidance about what to tell the user when calling\n(if anything).\n"
+                },
+                "parameters": {
+                  "type": "object",
+                  "description": "Parameters of the function in JSON Schema."
+                }
+              }
+            }
+          },
+          "tool_choice": {
+            "type": "string",
+            "description": "How the model chooses tools. Options are `auto`, `none`, `required`, or\nspecify a function.\n"
+          },
+          "temperature": {
+            "type": "number",
+            "description": "Sampling temperature for the model, limited to [0.6, 1.2]. Defaults to 0.8.\n"
+          },
+          "max_response_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls. Provide an integer between 1 and 4096 to\nlimit output tokens, or `inf` for the maximum available tokens for a\ngiven model. Defaults to `inf`.\n"
+          },
+          "truncation": {
+            "$ref": "#/components/schemas/RealtimeTruncation"
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/Prompt"
+          }
+        },
+        "required": [
+          "client_secret"
+        ],
+        "x-oaiMeta": {
+          "name": "The session object",
+          "group": "realtime",
+          "example": "{\n  \"id\": \"sess_001\",\n  \"object\": \"realtime.session\",\n  \"model\": \"gpt-realtime-2025-08-25\",\n  \"modalities\": [\"audio\", \"text\"],\n  \"instructions\": \"You are a friendly assistant.\",\n  \"voice\": \"alloy\",\n  \"input_audio_format\": \"pcm16\",\n  \"output_audio_format\": \"pcm16\",\n  \"input_audio_transcription\": {\n      \"model\": \"whisper-1\"\n  },\n  \"turn_detection\": null,\n  \"tools\": [],\n  \"tool_choice\": \"none\",\n  \"temperature\": 0.7,\n  \"speed\": 1.1,\n  \"tracing\": \"auto\",\n  \"max_response_output_tokens\": 200,\n  \"truncation\": \"auto\",\n  \"prompt\": null,\n  \"client_secret\": {\n    \"value\": \"ek_abc123\",\n    \"expires_at\": 1234567890\n  }\n}\n"
+        }
+      },
+      "RealtimeSessionCreateRequestGA": {
+        "type": "object",
+        "title": "Realtime session configuration",
+        "description": "Realtime session object configuration.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of session to create. Always `realtime` for the Realtime API.\n",
+            "enum": [
+              "realtime"
+            ],
+            "x-stainless-const": true
+          },
+          "output_modalities": {
+            "type": "array",
+            "description": "The set of modalities the model can respond with. It defaults to `[\"audio\"]`, indicating\nthat the model will respond with audio plus a transcript. `[\"text\"]` can be used to make\nthe model respond with text only. It is not possible to request both `text` and `audio` at the same time.\n",
+            "default": [
+              "audio"
+            ],
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-realtime",
+                  "gpt-realtime-1.5",
+                  "gpt-realtime-2",
+                  "gpt-realtime-2.1",
+                  "gpt-realtime-2.1-mini",
+                  "gpt-realtime-2025-08-28",
+                  "gpt-4o-realtime-preview",
+                  "gpt-4o-realtime-preview-2024-10-01",
+                  "gpt-4o-realtime-preview-2024-12-17",
+                  "gpt-4o-realtime-preview-2025-06-03",
+                  "gpt-4o-mini-realtime-preview",
+                  "gpt-4o-mini-realtime-preview-2024-12-17",
+                  "gpt-realtime-mini",
+                  "gpt-realtime-mini-2025-10-06",
+                  "gpt-realtime-mini-2025-12-15",
+                  "gpt-audio-1.5",
+                  "gpt-audio-mini",
+                  "gpt-audio-mini-2025-10-06",
+                  "gpt-audio-mini-2025-12-15"
+                ]
+              }
+            ],
+            "description": "The Realtime model used for this session.\n"
+          },
+          "instructions": {
+            "type": "string",
+            "description": "The default system instructions (i.e. system message) prepended to model calls. This field allows the client to guide the model on desired responses. The model can be instructed on response content and format, (e.g. \"be extremely succinct\", \"act friendly\", \"here are examples of good responses\") and on audio behavior (e.g. \"talk quickly\", \"inject emotion into your voice\", \"laugh frequently\"). The instructions are not guaranteed to be followed by the model, but they provide guidance to the model on the desired behavior.\n\nNote that the server sets default instructions which will be used if this field is not set and are visible in the `session.created` event at the start of the session.\n"
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for input and output audio.\n",
+            "properties": {
+              "input": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats",
+                    "description": "The format of the input audio."
+                  },
+                  "transcription": {
+                    "description": "Configuration for input audio transcription, defaults to off and can be set to `null` to turn off once on. Input audio transcription is not native to the model, since the model consumes audio directly. Transcription runs asynchronously through [the /audio/transcriptions endpoint](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) and should be treated as guidance of input audio content rather than precisely what the model heard. The client can optionally set the language and prompt for transcription, these offer additional guidance to the transcription service.\n",
+                    "$ref": "#/components/schemas/AudioTranscription"
+                  },
+                  "noise_reduction": {
+                    "type": "object",
+                    "default": null,
+                    "description": "Configuration for input audio noise reduction. This can be set to `null` to turn off.\nNoise reduction filters audio added to the input audio buffer before it is sent to VAD and the model.\nFiltering the audio can improve VAD and turn detection accuracy (reducing false positives) and model performance by improving perception of the input audio.\n",
+                    "properties": {
+                      "type": {
+                        "$ref": "#/components/schemas/NoiseReductionType"
+                      }
+                    }
+                  },
+                  "turn_detection": {
+                    "$ref": "#/components/schemas/RealtimeTurnDetection"
+                  }
+                }
+              },
+              "output": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats",
+                    "description": "The format of the output audio."
+                  },
+                  "voice": {
+                    "$ref": "#/components/schemas/VoiceIdsOrCustomVoice",
+                    "default": "alloy",
+                    "description": "The voice the model uses to respond. Supported built-in voices are\n`alloy`, `ash`, `ballad`, `coral`, `echo`, `sage`, `shimmer`, `verse`,\n`marin`, and `cedar`. You may also provide a custom voice object with\nan `id`, for example `{ \"id\": \"voice_1234\" }`. Voice cannot be changed\nduring the session once the model has responded with audio at least once.\nWe recommend `marin` and `cedar` for best quality.\n"
+                  },
+                  "speed": {
+                    "type": "number",
+                    "default": 1,
+                    "maximum": 1.5,
+                    "minimum": 0.25,
+                    "description": "The speed of the model's spoken response as a multiple of the original speed.\n1.0 is the default speed. 0.25 is the minimum speed. 1.5 is the maximum speed. This value can only be changed in between model turns, not while a response is in progress.\n\nThis parameter is a post-processing adjustment to the audio after it is generated, it's\nalso possible to prompt the model to speak faster or slower.\n"
+                  }
+                }
+              }
+            }
+          },
+          "include": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "item.input_audio_transcription.logprobs"
+              ]
+            },
+            "description": "Additional fields to include in server outputs.\n\n`item.input_audio_transcription.logprobs`: Include logprobs for input audio transcription.\n"
+          },
+          "tracing": {
+            "title": "Tracing Configuration",
+            "default": null,
+            "description": "Realtime API can write session traces to the [Traces Dashboard](https://platform.openai.com/logs?api=traces). Set to null to disable tracing. Once\ntracing is enabled for a session, the configuration cannot be modified.\n\n`auto` will create a trace for the session with default values for the\nworkflow name, group id, and metadata.\n",
+            "nullable": true,
+            "oneOf": [
+              {
+                "type": "string",
+                "title": "auto",
+                "default": "auto",
+                "description": "Enables tracing and sets default values for tracing configuration options. Always `auto`.\n",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "object",
+                "title": "Tracing Configuration",
+                "description": "Granular configuration for tracing.\n",
+                "properties": {
+                  "workflow_name": {
+                    "type": "string",
+                    "description": "The name of the workflow to attach to this trace. This is used to\nname the trace in the Traces Dashboard.\n"
+                  },
+                  "group_id": {
+                    "type": "string",
+                    "description": "The group id to attach to this trace to enable filtering and\ngrouping in the Traces Dashboard.\n"
+                  },
+                  "metadata": {
+                    "type": "object",
+                    "description": "The arbitrary metadata to attach to this trace to enable\nfiltering in the Traces Dashboard.\n"
+                  }
+                }
+              }
+            ]
+          },
+          "tools": {
+            "type": "array",
+            "description": "Tools available to the model.",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/RealtimeFunctionTool"
+                },
+                {
+                  "$ref": "#/components/schemas/MCPTool"
+                }
+              ]
+            }
+          },
+          "tool_choice": {
+            "description": "How the model chooses tools. Provide one of the string modes or force a specific\nfunction/MCP tool.\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ToolChoiceOptions"
+              },
+              {
+                "$ref": "#/components/schemas/ToolChoiceFunction"
+              },
+              {
+                "$ref": "#/components/schemas/ToolChoiceMCP"
+              }
+            ],
+            "default": "auto"
+          },
+          "parallel_tool_calls": {
+            "type": "boolean",
+            "description": "Whether the model may call multiple tools in parallel. Only supported by\nreasoning Realtime models such as `gpt-realtime-2`.\n"
+          },
+          "reasoning": {
+            "$ref": "#/components/schemas/RealtimeReasoning"
+          },
+          "max_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls. Provide an integer between 1 and 4096 to\nlimit output tokens, or `inf` for the maximum available tokens for a\ngiven model. Defaults to `inf`.\n"
+          },
+          "truncation": {
+            "$ref": "#/components/schemas/RealtimeTruncation"
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/Prompt"
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "RealtimeSessionCreateResponse": {
+        "type": "object",
+        "title": "Realtime session configuration object",
+        "description": "A Realtime session configuration object.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the session that looks like `sess_1234567890abcdef`.\n"
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type. Always `realtime.session`."
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Expiration timestamp for the session, in seconds since epoch."
+          },
+          "include": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "item.input_audio_transcription.logprobs"
+              ]
+            },
+            "description": "Additional fields to include in server outputs.\n- `item.input_audio_transcription.logprobs`: Include logprobs for input audio transcription.\n"
+          },
+          "model": {
+            "type": "string",
+            "description": "The Realtime model used for this session."
+          },
+          "output_modalities": {
+            "description": "The set of modalities the model can respond with. To disable audio,\nset this to [\"text\"].\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "instructions": {
+            "type": "string",
+            "description": "The default system instructions (i.e. system message) prepended to model\ncalls. This field allows the client to guide the model on desired\nresponses. The model can be instructed on response content and format,\n(e.g. \"be extremely succinct\", \"act friendly\", \"here are examples of good\nresponses\") and on audio behavior (e.g. \"talk quickly\", \"inject emotion\ninto your voice\", \"laugh frequently\"). The instructions are not guaranteed\nto be followed by the model, but they provide guidance to the model on the\ndesired behavior.\n\nNote that the server sets default instructions which will be used if this\nfield is not set and are visible in the `session.created` event at the\nstart of the session.\n"
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for input and output audio for the session.\n",
+            "properties": {
+              "input": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats"
+                  },
+                  "transcription": {
+                    "description": "Configuration for input audio transcription.\n",
+                    "$ref": "#/components/schemas/AudioTranscriptionResponse"
+                  },
+                  "noise_reduction": {
+                    "type": "object",
+                    "description": "Configuration for input audio noise reduction.\n",
+                    "properties": {
+                      "type": {
+                        "$ref": "#/components/schemas/NoiseReductionType"
+                      }
+                    }
+                  },
+                  "turn_detection": {
+                    "type": "object",
+                    "description": "Configuration for turn detection.\n",
+                    "properties": {
+                      "type": {
+                        "type": "string",
+                        "description": "Type of turn detection, only `server_vad` is currently supported.\n"
+                      },
+                      "threshold": {
+                        "type": "number"
+                      },
+                      "prefix_padding_ms": {
+                        "type": "integer"
+                      },
+                      "silence_duration_ms": {
+                        "type": "integer"
+                      }
+                    }
+                  }
+                }
+              },
+              "output": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats"
+                  },
+                  "voice": {
+                    "$ref": "#/components/schemas/VoiceIdsShared"
+                  },
+                  "speed": {
+                    "type": "number"
+                  }
+                }
+              }
+            }
+          },
+          "tracing": {
+            "title": "Tracing Configuration",
+            "description": "Configuration options for tracing. Set to null to disable tracing. Once\ntracing is enabled for a session, the configuration cannot be modified.\n\n`auto` will create a trace for the session with default values for the\nworkflow name, group id, and metadata.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "default": "auto",
+                "description": "Default tracing mode for the session.\n",
+                "enum": [
+                  "auto"
+                ],
+                "x-stainless-const": true
+              },
+              {
+                "type": "object",
+                "title": "Tracing Configuration",
+                "description": "Granular configuration for tracing.\n",
+                "properties": {
+                  "workflow_name": {
+                    "type": "string",
+                    "description": "The name of the workflow to attach to this trace. This is used to\nname the trace in the traces dashboard.\n"
+                  },
+                  "group_id": {
+                    "type": "string",
+                    "description": "The group id to attach to this trace to enable filtering and\ngrouping in the traces dashboard.\n"
+                  },
+                  "metadata": {
+                    "type": "object",
+                    "description": "The arbitrary metadata to attach to this trace to enable\nfiltering in the traces dashboard.\n"
+                  }
+                }
+              }
+            ]
+          },
+          "turn_detection": {
+            "type": "object",
+            "description": "Configuration for turn detection. Can be set to `null` to turn off. Server\nVAD means that the model will detect the start and end of speech based on\naudio volume and respond at the end of user speech.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Type of turn detection, only `server_vad` is currently supported.\n"
+              },
+              "threshold": {
+                "type": "number",
+                "description": "Activation threshold for VAD (0.0 to 1.0), this defaults to 0.5. A\nhigher threshold will require louder audio to activate the model, and\nthus might perform better in noisy environments.\n"
+              },
+              "prefix_padding_ms": {
+                "type": "integer",
+                "description": "Amount of audio to include before the VAD detected speech (in\nmilliseconds). Defaults to 300ms.\n"
+              },
+              "silence_duration_ms": {
+                "type": "integer",
+                "description": "Duration of silence to detect speech stop (in milliseconds). Defaults\nto 500ms. With shorter values the model will respond more quickly,\nbut may jump in on short pauses from the user.\n"
+              }
+            }
+          },
+          "tools": {
+            "type": "array",
+            "description": "Tools (functions) available to the model.",
+            "items": {
+              "$ref": "#/components/schemas/RealtimeFunctionTool"
+            }
+          },
+          "tool_choice": {
+            "type": "string",
+            "description": "How the model chooses tools. Options are `auto`, `none`, `required`, or\nspecify a function.\n"
+          },
+          "max_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls. Provide an integer between 1 and 4096 to\nlimit output tokens, or `inf` for the maximum available tokens for a\ngiven model. Defaults to `inf`.\n"
+          }
+        },
+        "x-oaiMeta": {
+          "name": "The session object",
+          "group": "realtime",
+          "example": "{\n  \"id\": \"sess_001\",\n  \"object\": \"realtime.session\",\n  \"expires_at\": 1742188264,\n  \"model\": \"gpt-realtime\",\n  \"output_modalities\": [\"audio\"],\n  \"instructions\": \"You are a friendly assistant.\",\n  \"tools\": [],\n  \"tool_choice\": \"none\",\n  \"max_output_tokens\": \"inf\",\n  \"tracing\": \"auto\",\n  \"truncation\": \"auto\",\n  \"prompt\": null,\n  \"audio\": {\n    \"input\": {\n      \"format\": {\n        \"type\": \"audio/pcm\",\n        \"rate\": 24000\n      },\n      \"transcription\": { \"model\": \"whisper-1\" },\n      \"noise_reduction\": null,\n      \"turn_detection\": null\n    },\n    \"output\": {\n      \"format\": {\n        \"type\": \"audio/pcm\",\n        \"rate\": 24000\n      },\n      \"voice\": \"alloy\",\n      \"speed\": 1.0\n    }\n  }\n}\n"
+        }
+      },
+      "RealtimeSessionCreateResponseGA": {
+        "type": "object",
+        "title": "Realtime session configuration object",
+        "description": "A Realtime session configuration object.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of session to create. Always `realtime` for the Realtime API.\n",
+            "enum": [
+              "realtime"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the session that looks like `sess_1234567890abcdef`.\n"
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type. Always `realtime.session`.",
+            "enum": [
+              "realtime.session"
+            ],
+            "x-stainless-const": true
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Expiration timestamp for the session, in seconds since epoch."
+          },
+          "output_modalities": {
+            "type": "array",
+            "description": "The set of modalities the model can respond with. It defaults to `[\"audio\"]`, indicating\nthat the model will respond with audio plus a transcript. `[\"text\"]` can be used to make\nthe model respond with text only. It is not possible to request both `text` and `audio` at the same time.\n",
+            "default": [
+              "audio"
+            ],
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-realtime",
+                  "gpt-realtime-1.5",
+                  "gpt-realtime-2",
+                  "gpt-realtime-2.1",
+                  "gpt-realtime-2.1-mini",
+                  "gpt-realtime-2025-08-28",
+                  "gpt-4o-realtime-preview",
+                  "gpt-4o-realtime-preview-2024-10-01",
+                  "gpt-4o-realtime-preview-2024-12-17",
+                  "gpt-4o-realtime-preview-2025-06-03",
+                  "gpt-4o-mini-realtime-preview",
+                  "gpt-4o-mini-realtime-preview-2024-12-17",
+                  "gpt-realtime-mini",
+                  "gpt-realtime-mini-2025-10-06",
+                  "gpt-realtime-mini-2025-12-15",
+                  "gpt-audio-1.5",
+                  "gpt-audio-mini",
+                  "gpt-audio-mini-2025-10-06",
+                  "gpt-audio-mini-2025-12-15"
+                ]
+              }
+            ],
+            "description": "The Realtime model used for this session.\n"
+          },
+          "instructions": {
+            "type": "string",
+            "description": "The default system instructions (i.e. system message) prepended to model calls. This field allows the client to guide the model on desired responses. The model can be instructed on response content and format, (e.g. \"be extremely succinct\", \"act friendly\", \"here are examples of good responses\") and on audio behavior (e.g. \"talk quickly\", \"inject emotion into your voice\", \"laugh frequently\"). The instructions are not guaranteed to be followed by the model, but they provide guidance to the model on the desired behavior.\n\nNote that the server sets default instructions which will be used if this field is not set and are visible in the `session.created` event at the start of the session.\n"
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for input and output audio.\n",
+            "properties": {
+              "input": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats",
+                    "description": "The format of the input audio."
+                  },
+                  "transcription": {
+                    "description": "Configuration for input audio transcription, defaults to off and can be set to `null` to turn off once on. Input audio transcription is not native to the model, since the model consumes audio directly. Transcription runs asynchronously through [the /audio/transcriptions endpoint](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) and should be treated as guidance of input audio content rather than precisely what the model heard. The client can optionally set the language and prompt for transcription, these offer additional guidance to the transcription service.\n",
+                    "$ref": "#/components/schemas/AudioTranscriptionResponse"
+                  },
+                  "noise_reduction": {
+                    "type": "object",
+                    "default": null,
+                    "description": "Configuration for input audio noise reduction. This can be set to `null` to turn off.\nNoise reduction filters audio added to the input audio buffer before it is sent to VAD and the model.\nFiltering the audio can improve VAD and turn detection accuracy (reducing false positives) and model performance by improving perception of the input audio.\n",
+                    "properties": {
+                      "type": {
+                        "$ref": "#/components/schemas/NoiseReductionType"
+                      }
+                    }
+                  },
+                  "turn_detection": {
+                    "$ref": "#/components/schemas/RealtimeTurnDetection"
+                  }
+                }
+              },
+              "output": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats",
+                    "description": "The format of the output audio."
+                  },
+                  "voice": {
+                    "$ref": "#/components/schemas/VoiceIdsShared",
+                    "default": "alloy",
+                    "description": "The voice the model uses to respond. Voice cannot be changed during the\nsession once the model has responded with audio at least once. Current\nvoice options are `alloy`, `ash`, `ballad`, `coral`, `echo`, `sage`,\n`shimmer`, `verse`, `marin`, and `cedar`. We recommend `marin` and `cedar` for\nbest quality.\n"
+                  },
+                  "speed": {
+                    "type": "number",
+                    "default": 1,
+                    "maximum": 1.5,
+                    "minimum": 0.25,
+                    "description": "The speed of the model's spoken response as a multiple of the original speed.\n1.0 is the default speed. 0.25 is the minimum speed. 1.5 is the maximum speed. This value can only be changed in between model turns, not while a response is in progress.\n\nThis parameter is a post-processing adjustment to the audio after it is generated, it's\nalso possible to prompt the model to speak faster or slower.\n"
+                  }
+                }
+              }
+            }
+          },
+          "include": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "item.input_audio_transcription.logprobs"
+              ]
+            },
+            "description": "Additional fields to include in server outputs.\n\n`item.input_audio_transcription.logprobs`: Include logprobs for input audio transcription.\n"
+          },
+          "tracing": {
+            "anyOf": [
+              {
+                "title": "Tracing Configuration",
+                "default": null,
+                "description": "Realtime API can write session traces to the [Traces Dashboard](https://platform.openai.com/logs?api=traces). Set to null to disable tracing. Once\ntracing is enabled for a session, the configuration cannot be modified.\n\n`auto` will create a trace for the session with default values for the\nworkflow name, group id, and metadata.\n",
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "title": "auto",
+                    "default": "auto",
+                    "description": "Enables tracing and sets default values for tracing configuration options. Always `auto`.\n",
+                    "enum": [
+                      "auto"
+                    ],
+                    "x-stainless-const": true
+                  },
+                  {
+                    "type": "object",
+                    "title": "Tracing Configuration",
+                    "description": "Granular configuration for tracing.\n",
+                    "properties": {
+                      "workflow_name": {
+                        "type": "string",
+                        "description": "The name of the workflow to attach to this trace. This is used to\nname the trace in the Traces Dashboard.\n"
+                      },
+                      "group_id": {
+                        "type": "string",
+                        "description": "The group id to attach to this trace to enable filtering and\ngrouping in the Traces Dashboard.\n"
+                      },
+                      "metadata": {
+                        "type": "object",
+                        "description": "The arbitrary metadata to attach to this trace to enable\nfiltering in the Traces Dashboard.\n"
+                      }
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "type": "array",
+            "description": "Tools available to the model.",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/RealtimeFunctionTool"
+                },
+                {
+                  "$ref": "#/components/schemas/MCPTool"
+                }
+              ]
+            }
+          },
+          "tool_choice": {
+            "description": "How the model chooses tools. Provide one of the string modes or force a specific\nfunction/MCP tool.\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ToolChoiceOptions"
+              },
+              {
+                "$ref": "#/components/schemas/ToolChoiceFunction"
+              },
+              {
+                "$ref": "#/components/schemas/ToolChoiceMCP"
+              }
+            ],
+            "default": "auto"
+          },
+          "reasoning": {
+            "$ref": "#/components/schemas/RealtimeReasoning"
+          },
+          "max_output_tokens": {
+            "oneOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "inf"
+                ],
+                "x-stainless-const": true
+              }
+            ],
+            "description": "Maximum number of output tokens for a single assistant response,\ninclusive of tool calls. Provide an integer between 1 and 4096 to\nlimit output tokens, or `inf` for the maximum available tokens for a\ngiven model. Defaults to `inf`.\n"
+          },
+          "truncation": {
+            "$ref": "#/components/schemas/RealtimeTruncation"
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/Prompt"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "object"
+        ],
+        "x-oaiMeta": {
+          "name": "The session object",
+          "group": "realtime"
+        }
+      },
+      "RealtimeTranscriptionSessionCreateRequest": {
+        "type": "object",
+        "title": "Realtime transcription session configuration",
+        "description": "Realtime transcription session object configuration.",
+        "properties": {
+          "turn_detection": {
+            "type": "object",
+            "description": "Configuration for turn detection. Can be set to `null` to turn off. Server VAD means that the model will detect the start and end of speech based on audio volume and respond at the end of user speech.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Type of turn detection. Only `server_vad` is currently supported for transcription sessions.\n",
+                "enum": [
+                  "server_vad"
+                ]
+              },
+              "threshold": {
+                "type": "number",
+                "description": "Activation threshold for VAD (0.0 to 1.0), this defaults to 0.5. A\nhigher threshold will require louder audio to activate the model, and\nthus might perform better in noisy environments.\n"
+              },
+              "prefix_padding_ms": {
+                "type": "integer",
+                "description": "Amount of audio to include before the VAD detected speech (in\nmilliseconds). Defaults to 300ms.\n"
+              },
+              "silence_duration_ms": {
+                "type": "integer",
+                "description": "Duration of silence to detect speech stop (in milliseconds). Defaults\nto 500ms. With shorter values the model will respond more quickly,\nbut may jump in on short pauses from the user.\n"
+              }
+            }
+          },
+          "input_audio_noise_reduction": {
+            "type": "object",
+            "default": null,
+            "description": "Configuration for input audio noise reduction. This can be set to `null` to turn off.\nNoise reduction filters audio added to the input audio buffer before it is sent to VAD and the model.\nFiltering the audio can improve VAD and turn detection accuracy (reducing false positives) and model performance by improving perception of the input audio.\n",
+            "properties": {
+              "type": {
+                "$ref": "#/components/schemas/NoiseReductionType"
+              }
+            }
+          },
+          "input_audio_format": {
+            "type": "string",
+            "default": "pcm16",
+            "enum": [
+              "pcm16",
+              "g711_ulaw",
+              "g711_alaw"
+            ],
+            "description": "The format of input audio. Options are `pcm16`, `g711_ulaw`, or `g711_alaw`.\nFor `pcm16`, input audio must be 16-bit PCM at a 24kHz sample rate,\nsingle channel (mono), and little-endian byte order.\n"
+          },
+          "input_audio_transcription": {
+            "description": "Configuration for input audio transcription. The client can optionally set the language and prompt for transcription, these offer additional guidance to the transcription service.\n",
+            "$ref": "#/components/schemas/AudioTranscription"
+          },
+          "include": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "item.input_audio_transcription.logprobs"
+              ]
+            },
+            "description": "The set of items to include in the transcription. Current available items are:\n`item.input_audio_transcription.logprobs`\n"
+          }
+        }
+      },
+      "RealtimeTranscriptionSessionCreateRequestGA": {
+        "type": "object",
+        "title": "Realtime transcription session configuration",
+        "description": "Realtime transcription session object configuration.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of session to create. Always `transcription` for transcription sessions.\n",
+            "enum": [
+              "transcription"
+            ],
+            "x-stainless-const": true
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for input and output audio.\n",
+            "properties": {
+              "input": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats"
+                  },
+                  "transcription": {
+                    "description": "Configuration for input audio transcription, defaults to off and can be set to `null` to turn off once on. Input audio transcription is not native to the model, since the model consumes audio directly. Transcription runs asynchronously through [the /audio/transcriptions endpoint](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) and should be treated as guidance of input audio content rather than precisely what the model heard. The client can optionally set the language and prompt for transcription, these offer additional guidance to the transcription service.\n",
+                    "$ref": "#/components/schemas/AudioTranscription"
+                  },
+                  "noise_reduction": {
+                    "type": "object",
+                    "default": null,
+                    "description": "Configuration for input audio noise reduction. This can be set to `null` to turn off.\nNoise reduction filters audio added to the input audio buffer before it is sent to VAD and the model.\nFiltering the audio can improve VAD and turn detection accuracy (reducing false positives) and model performance by improving perception of the input audio.\n",
+                    "properties": {
+                      "type": {
+                        "$ref": "#/components/schemas/NoiseReductionType"
+                      }
+                    }
+                  },
+                  "turn_detection": {
+                    "$ref": "#/components/schemas/RealtimeTurnDetection"
+                  }
+                }
+              }
+            }
+          },
+          "include": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "item.input_audio_transcription.logprobs"
+              ]
+            },
+            "description": "Additional fields to include in server outputs.\n\n`item.input_audio_transcription.logprobs`: Include logprobs for input audio transcription.\n"
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "RealtimeTranscriptionSessionCreateResponse": {
+        "type": "object",
+        "description": "A new Realtime transcription session configuration.\n\nWhen a session is created on the server via REST API, the session object\nalso contains an ephemeral key. Default TTL for keys is 10 minutes. This\nproperty is not present when a session is updated via the WebSocket API.\n",
+        "properties": {
+          "client_secret": {
+            "type": "object",
+            "description": "Ephemeral key returned by the API. Only present when the session is\ncreated on the server via REST API.\n",
+            "properties": {
+              "value": {
+                "type": "string",
+                "description": "Ephemeral key usable in client environments to authenticate connections\nto the Realtime API. Use this in client-side environments rather than\na standard API token, which should only be used server-side.\n"
+              },
+              "expires_at": {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "Timestamp for when the token expires. Currently, all tokens expire\nafter one minute.\n"
+              }
+            },
+            "required": [
+              "value",
+              "expires_at"
+            ]
+          },
+          "modalities": {
+            "description": "The set of modalities the model can respond with. To disable audio,\nset this to [\"text\"].\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          "input_audio_format": {
+            "type": "string",
+            "description": "The format of input audio. Options are `pcm16`, `g711_ulaw`, or `g711_alaw`.\n"
+          },
+          "input_audio_transcription": {
+            "description": "Configuration of the transcription model.\n",
+            "$ref": "#/components/schemas/AudioTranscriptionResponse"
+          },
+          "turn_detection": {
+            "type": "object",
+            "description": "Configuration for turn detection. Can be set to `null` to turn off. Server\nVAD means that the model will detect the start and end of speech based on\naudio volume and respond at the end of user speech.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "Type of turn detection, only `server_vad` is currently supported.\n"
+              },
+              "threshold": {
+                "type": "number",
+                "description": "Activation threshold for VAD (0.0 to 1.0), this defaults to 0.5. A\nhigher threshold will require louder audio to activate the model, and\nthus might perform better in noisy environments.\n"
+              },
+              "prefix_padding_ms": {
+                "type": "integer",
+                "description": "Amount of audio to include before the VAD detected speech (in\nmilliseconds). Defaults to 300ms.\n"
+              },
+              "silence_duration_ms": {
+                "type": "integer",
+                "description": "Duration of silence to detect speech stop (in milliseconds). Defaults\nto 500ms. With shorter values the model will respond more quickly,\nbut may jump in on short pauses from the user.\n"
+              }
+            }
+          }
+        },
+        "required": [
+          "client_secret"
+        ],
+        "x-oaiMeta": {
+          "name": "The transcription session object",
+          "group": "realtime",
+          "example": "{\n  \"id\": \"sess_BBwZc7cFV3XizEyKGDCGL\",\n  \"object\": \"realtime.transcription_session\",\n  \"expires_at\": 1742188264,\n  \"modalities\": [\"audio\", \"text\"],\n  \"turn_detection\": {\n    \"type\": \"server_vad\",\n    \"threshold\": 0.5,\n    \"prefix_padding_ms\": 300,\n    \"silence_duration_ms\": 200\n  },\n  \"input_audio_format\": \"pcm16\",\n  \"input_audio_transcription\": {\n    \"model\": \"gpt-4o-transcribe\",\n    \"language\": null,\n    \"prompt\": \"\"\n  },\n  \"client_secret\": null\n}\n"
+        }
+      },
+      "RealtimeTranscriptionSessionCreateResponseGA": {
+        "type": "object",
+        "title": "Realtime transcription session configuration object",
+        "description": "A Realtime transcription session configuration object.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of session. Always `transcription` for transcription sessions.\n",
+            "enum": [
+              "transcription"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the session that looks like `sess_1234567890abcdef`.\n"
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type. Always `realtime.transcription_session`."
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Expiration timestamp for the session, in seconds since epoch."
+          },
+          "include": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "item.input_audio_transcription.logprobs"
+              ]
+            },
+            "description": "Additional fields to include in server outputs.\n- `item.input_audio_transcription.logprobs`: Include logprobs for input audio transcription.\n"
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for input audio for the session.\n",
+            "properties": {
+              "input": {
+                "type": "object",
+                "properties": {
+                  "format": {
+                    "$ref": "#/components/schemas/RealtimeAudioFormats"
+                  },
+                  "transcription": {
+                    "description": "Configuration of the transcription model.\n",
+                    "$ref": "#/components/schemas/AudioTranscriptionResponse"
+                  },
+                  "noise_reduction": {
+                    "type": "object",
+                    "description": "Configuration for input audio noise reduction.\n",
+                    "properties": {
+                      "type": {
+                        "$ref": "#/components/schemas/NoiseReductionType"
+                      }
+                    }
+                  },
+                  "turn_detection": {
+                    "description": "Configuration for turn detection. For `gpt-realtime-whisper`, this must be `null`; VAD is not supported.\n",
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "description": "Configuration for turn detection. Can be set to `null` to turn off. Server\nVAD means that the model will detect the start and end of speech based on\naudio volume and respond at the end of user speech. For `gpt-realtime-whisper`, this must be `null`; VAD is not supported.\n",
+                        "properties": {
+                          "type": {
+                            "type": "string",
+                            "description": "Type of turn detection, only `server_vad` is currently supported.\n"
+                          },
+                          "threshold": {
+                            "type": "number",
+                            "description": "Activation threshold for VAD (0.0 to 1.0), this defaults to 0.5. A\nhigher threshold will require louder audio to activate the model, and\nthus might perform better in noisy environments.\n"
+                          },
+                          "prefix_padding_ms": {
+                            "type": "integer",
+                            "description": "Amount of audio to include before the VAD detected speech (in\nmilliseconds). Defaults to 300ms.\n"
+                          },
+                          "silence_duration_ms": {
+                            "type": "integer",
+                            "description": "Duration of silence to detect speech stop (in milliseconds). Defaults\nto 500ms. With shorter values the model will respond more quickly,\nbut may jump in on short pauses from the user.\n"
+                          }
+                        }
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "object"
+        ],
+        "x-oaiMeta": {
+          "name": "The transcription session object",
+          "group": "realtime",
+          "example": "{\n  \"id\": \"sess_BBwZc7cFV3XizEyKGDCGL\",\n  \"type\": \"transcription\",\n  \"object\": \"realtime.transcription_session\",\n  \"expires_at\": 1742188264,\n  \"include\": [\"item.input_audio_transcription.logprobs\"],\n  \"audio\": {\n    \"input\": {\n      \"format\": \"pcm16\",\n      \"transcription\": {\n        \"model\": \"gpt-4o-transcribe\",\n        \"language\": null,\n        \"prompt\": \"\"\n      },\n      \"noise_reduction\": null,\n      \"turn_detection\": {\n        \"type\": \"server_vad\",\n        \"threshold\": 0.5,\n        \"prefix_padding_ms\": 300,\n        \"silence_duration_ms\": 200\n      }\n    }\n  }\n}\n"
+        }
+      },
+      "RealtimeTranslationClientEvent": {
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "description": "A Realtime translation client event.\n",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationClientEventSessionUpdate"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationClientEventInputAudioBufferAppend"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationClientEventSessionClose"
+          }
+        ]
+      },
+      "RealtimeTranslationClientEventInputAudioBufferAppend": {
+        "type": "object",
+        "description": "Send this event to append audio bytes to the translation session input audio buffer.\n\nWebSocket translation sessions accept base64-encoded 24 kHz PCM16 mono\nlittle-endian raw audio bytes. Unsupported websocket audio formats return a\nvalidation error because lower-quality audio materially degrades translation\nquality.\n\nTranslation consumes 200 ms engine frames. For best realtime behavior, append\naudio in 200 ms chunks. If a chunk is shorter, the server buffers it until it\nhas enough audio for one frame. If a chunk is longer, the server splits it into\n200 ms frames and enqueues them back-to-back.\n\nKeep appending silence while the session is active. If a client stops sending\naudio and later resumes, model time treats the resumed audio as contiguous with\nthe previous audio rather than as a real-world pause.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.input_audio_buffer.append"
+            ],
+            "description": "The event type, must be `session.input_audio_buffer.append`.",
+            "x-stainless-const": true
+          },
+          "audio": {
+            "type": "string",
+            "description": "Base64-encoded 24 kHz PCM16 mono audio bytes."
+          }
+        },
+        "required": [
+          "type",
+          "audio"
+        ],
+        "x-oaiMeta": {
+          "name": "session.input_audio_buffer.append",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_456\",\n  \"type\": \"session.input_audio_buffer.append\",\n  \"audio\": \"Base64EncodedAudioData\"\n}\n"
+        }
+      },
+      "RealtimeTranslationClientEventSessionClose": {
+        "type": "object",
+        "description": "Gracefully close the realtime translation session. The server flushes pending\ninput audio and emits any remaining translated output before closing the\nsession.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.close"
+            ],
+            "description": "The event type, must be `session.close`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "session.close",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_789\",\n  \"type\": \"session.close\"\n}\n"
+        }
+      },
+      "RealtimeTranslationClientEventSessionUpdate": {
+        "type": "object",
+        "description": "Send this event to update the translation session configuration. Translation\nsessions support updates to `audio.output.language`, `audio.input.transcription`,\nand `audio.input.noise_reduction`.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "maxLength": 512,
+            "description": "Optional client-generated ID used to identify this event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.update"
+            ],
+            "description": "The event type, must be `session.update`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranslationSessionUpdateRequest",
+            "description": "Translation session fields to update. The session `type` and `model` are set\nat creation and cannot be changed with `session.update`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.update",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"session.update\",\n  \"session\": {\n    \"audio\": {\n      \"input\": {\n        \"transcription\": {\n          \"model\": \"gpt-realtime-whisper\"\n        },\n        \"noise_reduction\": null\n      },\n      \"output\": {\n        \"language\": \"es\"\n      }\n    }\n  }\n}\n"
+        }
+      },
+      "RealtimeTranslationClientSecretCreateRequest": {
+        "type": "object",
+        "title": "Realtime translation client secret creation request",
+        "description": "Create a translation session and client secret for the Realtime API.\n",
+        "properties": {
+          "expires_after": {
+            "type": "object",
+            "title": "Client secret expiration",
+            "description": "Configuration for the client secret expiration. Expiration refers to the time after which\na client secret will no longer be valid for creating sessions. The session itself may\ncontinue after that time once started. A secret can be used to create multiple sessions\nuntil it expires.\n",
+            "properties": {
+              "anchor": {
+                "type": "string",
+                "enum": [
+                  "created_at"
+                ],
+                "description": "The anchor point for the client secret expiration, meaning that `seconds` will be added to the `created_at` time of the client secret to produce an expiration timestamp. Only `created_at` is currently supported.\n",
+                "default": "created_at",
+                "x-stainless-const": true
+              },
+              "seconds": {
+                "type": "integer",
+                "format": "int64",
+                "description": "The number of seconds from the anchor point to the expiration. Select a value between `10` and `7200` (2 hours). This default to 600 seconds (10 minutes) if not specified.\n",
+                "minimum": 10,
+                "maximum": 7200,
+                "default": 600
+              }
+            }
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranslationSessionCreateRequest"
+          }
+        },
+        "required": [
+          "session"
+        ]
+      },
+      "RealtimeTranslationClientSecretCreateResponse": {
+        "type": "object",
+        "title": "Realtime translation session and client secret",
+        "description": "Response from creating a translation session and client secret for the Realtime API.\n",
+        "properties": {
+          "value": {
+            "type": "string",
+            "description": "The generated client secret value."
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Expiration timestamp for the client secret, in seconds since epoch."
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranslationSession"
+          }
+        },
+        "required": [
+          "value",
+          "expires_at",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "Translation session response object",
+          "group": "realtime",
+          "example": "{\n  \"value\": \"ek_68af296e8e408191a1120ab6383263c2\",\n  \"expires_at\": 1756310470,\n  \"session\": {\n    \"id\": \"sess_C9CiUVUzUzYIssh3ELY1d\",\n    \"type\": \"translation\",\n    \"expires_at\": 1756310470,\n    \"model\": \"gpt-realtime-translate\",\n    \"audio\": {\n      \"input\": {\n        \"transcription\": null,\n        \"noise_reduction\": null\n      },\n      \"output\": {\n        \"language\": \"es\"\n      }\n    }\n  }\n}\n"
+        }
+      },
+      "RealtimeTranslationServerEvent": {
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "description": "A Realtime translation server event.\n",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/RealtimeServerEventError"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationServerEventSessionCreated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationServerEventSessionUpdated"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationServerEventSessionClosed"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationServerEventSessionInputTranscriptDelta"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationServerEventSessionOutputTranscriptDelta"
+          },
+          {
+            "$ref": "#/components/schemas/RealtimeTranslationServerEventSessionOutputAudioDelta"
+          }
+        ]
+      },
+      "RealtimeTranslationServerEventSessionClosed": {
+        "type": "object",
+        "description": "Returned when a realtime translation session is closed.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.closed"
+            ],
+            "description": "The event type, must be `session.closed`.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "event_id",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "name": "session.closed",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_987\",\n  \"type\": \"session.closed\"\n}\n"
+        }
+      },
+      "RealtimeTranslationServerEventSessionCreated": {
+        "type": "object",
+        "description": "Returned when a translation session is created. Emitted automatically when a\nnew connection is established as the first server event. This event contains\nthe default translation session configuration.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.created"
+            ],
+            "description": "The event type, must be `session.created`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranslationSession",
+            "description": "The translation session configuration."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.created",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"session.created\",\n  \"event_id\": \"event_123\",\n  \"session\": {\n    \"id\": \"sess_123\",\n    \"type\": \"translation\",\n    \"model\": \"gpt-realtime-translate\",\n    \"expires_at\": 1714857600,\n    \"audio\": {\n      \"input\": {\n        \"transcription\": {\n          \"model\": \"gpt-realtime-whisper\",\n          \"language\": \"en\"\n        },\n        \"noise_reduction\": {\n          \"type\": \"near_field\"\n        }\n      },\n      \"output\": {\n        \"language\": \"fr\"\n      }\n    }\n  }\n}\n"
+        }
+      },
+      "RealtimeTranslationServerEventSessionInputTranscriptDelta": {
+        "type": "object",
+        "description": "Returned when optional source-language transcript text is available. This event\nis emitted only when `audio.input.transcription` is configured.\n\nTranscript deltas are append-only text fragments. Clients should not insert\nunconditional spaces between deltas.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.input_transcript.delta"
+            ],
+            "description": "The event type, must be `session.input_transcript.delta`.",
+            "x-stainless-const": true
+          },
+          "delta": {
+            "type": "string",
+            "description": "Append-only source-language transcript text."
+          },
+          "elapsed_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Timing metadata for stream alignment, derived from the translation frame\nwhen available. It advances in 200 ms increments, but multiple transcript\ndeltas may share the same `elapsed_ms`. Treat it as alignment metadata,\nnot a unique transcript-delta identifier.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "session.input_transcript.delta",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_125\",\n  \"type\": \"session.input_transcript.delta\",\n  \"delta\": \" hear\",\n  \"elapsed_ms\": 1200\n}\n"
+        }
+      },
+      "RealtimeTranslationServerEventSessionOutputAudioDelta": {
+        "type": "object",
+        "description": "Returned when translated output audio is available. The `delta` contains a\nPCM16 audio chunk whose length can vary. Clients should decode and queue the\ncomplete delta instead of assuming a fixed byte or sample count.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.output_audio.delta"
+            ],
+            "description": "The event type, must be `session.output_audio.delta`.",
+            "x-stainless-const": true
+          },
+          "delta": {
+            "type": "string",
+            "description": "Base64-encoded translated audio data."
+          },
+          "sample_rate": {
+            "type": "integer",
+            "description": "Sample rate of the audio delta.",
+            "default": 24000
+          },
+          "channels": {
+            "type": "integer",
+            "description": "Number of audio channels.",
+            "default": 1
+          },
+          "format": {
+            "type": "string",
+            "enum": [
+              "pcm16"
+            ],
+            "description": "Audio encoding for `delta`.",
+            "x-stainless-const": true
+          },
+          "elapsed_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Timing metadata for stream alignment, derived from the translation frame\nwhen available. Treat `elapsed_ms` as alignment metadata, not a unique\nevent identifier.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "session.output_audio.delta",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_123\",\n  \"type\": \"session.output_audio.delta\",\n  \"delta\": \"Base64EncodedAudioDelta\",\n  \"sample_rate\": 24000,\n  \"channels\": 1,\n  \"format\": \"pcm16\",\n  \"elapsed_ms\": 1200\n}\n"
+        }
+      },
+      "RealtimeTranslationServerEventSessionOutputTranscriptDelta": {
+        "type": "object",
+        "description": "Returned when translated transcript text is available.\n\nTranscript deltas are append-only text fragments. Clients should not insert\nunconditional spaces between deltas.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.output_transcript.delta"
+            ],
+            "description": "The event type, must be `session.output_transcript.delta`.",
+            "x-stainless-const": true
+          },
+          "delta": {
+            "type": "string",
+            "description": "Append-only transcript text for the translated output audio."
+          },
+          "elapsed_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Timing metadata for stream alignment, derived from the translation frame\nwhen available. It advances in 200 ms increments, but multiple transcript\ndeltas may share the same `elapsed_ms`. Treat it as alignment metadata,\nnot a unique transcript-delta identifier.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "session.output_transcript.delta",
+          "group": "realtime",
+          "example": "{\n  \"event_id\": \"event_124\",\n  \"type\": \"session.output_transcript.delta\",\n  \"delta\": \" escuch\",\n  \"elapsed_ms\": 1200\n}\n"
+        }
+      },
+      "RealtimeTranslationServerEventSessionUpdated": {
+        "type": "object",
+        "description": "Returned when a translation session is updated with a `session.update` event,\nunless there is an error.\n",
+        "properties": {
+          "event_id": {
+            "type": "string",
+            "description": "The unique ID of the server event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "session.updated"
+            ],
+            "description": "The event type, must be `session.updated`.",
+            "x-stainless-const": true
+          },
+          "session": {
+            "$ref": "#/components/schemas/RealtimeTranslationSession",
+            "description": "The translation session configuration."
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "name": "session.updated",
+          "group": "realtime",
+          "example": "{\n  \"type\": \"session.updated\",\n  \"event_id\": \"event_124\",\n  \"session\": {\n    \"id\": \"sess_123\",\n    \"type\": \"translation\",\n    \"model\": \"gpt-realtime-translate\",\n    \"expires_at\": 1714857600,\n    \"audio\": {\n      \"input\": {\n        \"transcription\": {\n          \"model\": \"gpt-realtime-whisper\",\n          \"language\": \"en\"\n        },\n        \"noise_reduction\": {\n          \"type\": \"near_field\"\n        }\n      },\n      \"output\": {\n        \"language\": \"es\"\n      }\n    }\n  }\n}\n"
+        }
+      },
+      "RealtimeTranslationSession": {
+        "type": "object",
+        "title": "Realtime translation session",
+        "description": "A Realtime translation session. Translation sessions continuously translate input\naudio into the configured output language.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the session that looks like `sess_1234567890abcdef`.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "translation"
+            ],
+            "description": "The session type. Always `translation` for Realtime translation sessions.\n",
+            "x-stainless-const": true
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Expiration timestamp for the session, in seconds since epoch."
+          },
+          "model": {
+            "type": "string",
+            "description": "The Realtime translation model used for this session. This field is set at\nsession creation and cannot be changed with `session.update`.\n"
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for translation input and output audio.\n",
+            "properties": {
+              "input": {
+                "type": "object",
+                "properties": {
+                  "transcription": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "description": "Optional source-language transcription. When configured, the server emits\n`session.input_transcript.delta` events. Translation itself still runs from\nthe input audio stream.\n",
+                        "properties": {
+                          "model": {
+                            "type": "string",
+                            "description": "The transcription model used for source transcript deltas."
+                          }
+                        },
+                        "required": [
+                          "model"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "noise_reduction": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "description": "Optional input noise reduction.\n",
+                        "properties": {
+                          "type": {
+                            "$ref": "#/components/schemas/NoiseReductionType"
+                          }
+                        },
+                        "required": [
+                          "type"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                }
+              },
+              "output": {
+                "type": "object",
+                "properties": {
+                  "language": {
+                    "type": "string",
+                    "description": "Target language for translated output audio and transcript deltas.\n"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "expires_at",
+          "model",
+          "audio"
+        ],
+        "x-oaiMeta": {
+          "name": "The translation session object",
+          "group": "realtime",
+          "example": "{\n  \"id\": \"sess_C9G5QPteg4UIbotdKLoYQ\",\n  \"type\": \"translation\",\n  \"expires_at\": 1756324625,\n  \"model\": \"gpt-realtime-translate\",\n  \"audio\": {\n    \"input\": {\n      \"transcription\": {\n        \"model\": \"gpt-realtime-whisper\"\n      },\n      \"noise_reduction\": null\n    },\n    \"output\": {\n      \"language\": \"es\"\n    }\n  }\n}\n"
+        }
+      },
+      "RealtimeTranslationSessionCreateRequest": {
+        "type": "object",
+        "title": "Realtime translation session configuration",
+        "description": "Realtime translation session configuration. Translation sessions stream source\naudio in and translated audio plus transcript deltas out continuously.\n",
+        "properties": {
+          "model": {
+            "type": "string",
+            "description": "The Realtime translation model used for this session.\n"
+          },
+          "audio": {
+            "type": "object",
+            "description": "Configuration for translation input and output audio.\n",
+            "properties": {
+              "input": {
+                "type": "object",
+                "properties": {
+                  "transcription": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "description": "Optional source-language transcription. When configured, the server emits\n`session.input_transcript.delta` events. Translation itself still runs from\nthe input audio stream.\n",
+                        "properties": {
+                          "model": {
+                            "type": "string",
+                            "description": "The transcription model to use for source transcript deltas."
+                          }
+                        },
+                        "required": [
+                          "model"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "noise_reduction": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "description": "Optional input noise reduction. Set to `null` to disable it.\n",
+                        "properties": {
+                          "type": {
+                            "$ref": "#/components/schemas/NoiseReductionType"
+                          }
+                        },
+                        "required": [
+                          "type"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                }
+              },
+              "output": {
+                "type": "object",
+                "properties": {
+                  "language": {
+                    "type": "string",
+                    "description": "Target language for translated output audio and transcript deltas.\n"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "model"
+        ]
+      },
+      "RealtimeTranslationSessionUpdateRequest": {
+        "type": "object",
+        "title": "Realtime translation session update",
+        "description": "Realtime translation session fields that can be updated with `session.update`.\n",
+        "properties": {
+          "audio": {
+            "type": "object",
+            "description": "Configuration for translation input and output audio.\n",
+            "properties": {
+              "input": {
+                "type": "object",
+                "properties": {
+                  "transcription": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "description": "Optional source-language transcription. When configured, the server emits\n`session.input_transcript.delta` events. Translation itself still runs from\nthe input audio stream.\n",
+                        "properties": {
+                          "model": {
+                            "type": "string",
+                            "description": "The transcription model to use for source transcript deltas."
+                          }
+                        },
+                        "required": [
+                          "model"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "noise_reduction": {
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "description": "Optional input noise reduction. Set to `null` to disable it.\n",
+                        "properties": {
+                          "type": {
+                            "$ref": "#/components/schemas/NoiseReductionType"
+                          }
+                        },
+                        "required": [
+                          "type"
+                        ]
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                }
+              },
+              "output": {
+                "type": "object",
+                "properties": {
+                  "language": {
+                    "type": "string",
+                    "description": "Target language for translated output audio and transcript deltas.\n"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "RealtimeTruncation": {
+        "title": "Realtime Truncation Controls",
+        "description": "When the number of tokens in a conversation exceeds the model's input token limit, the conversation be truncated, meaning messages (starting from the oldest) will not be included in the model's context. A 32k context model with 4,096 max output tokens can only include 28,224 tokens in the context before truncation occurs.\n\nClients can configure truncation behavior to truncate with a lower max token limit, which is an effective way to control token usage and cost.\n\nTruncation will reduce the number of cached tokens on the next turn (busting the cache), since messages are dropped from the beginning of the context. However, clients can also configure truncation to retain messages up to a fraction of the maximum context size, which will reduce the need for future truncations and thus improve the cache rate.\n\nTruncation can be disabled entirely, which means the server will never truncate but would instead return an error if the conversation exceeds the model's input token limit.\n",
+        "oneOf": [
+          {
+            "type": "string",
+            "description": "The truncation strategy to use for the session. `auto` is the default truncation strategy. `disabled` will disable truncation and emit errors when the conversation exceeds the input token limit.",
+            "enum": [
+              "auto",
+              "disabled"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Retention ratio truncation",
+            "description": "Retain a fraction of the conversation tokens when the conversation exceeds the input token limit. This allows you to amortize truncations across multiple turns, which can help improve cached token usage.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "retention_ratio"
+                ],
+                "description": "Use retention ratio truncation.",
+                "x-stainless-const": true
+              },
+              "retention_ratio": {
+                "type": "number",
+                "description": "Fraction of post-instruction conversation tokens to retain (`0.0` - `1.0`) when the conversation exceeds the input token limit. Setting this to `0.8` means that messages will be dropped until 80% of the maximum allowed tokens are used. This helps reduce the frequency of truncations and improve cache rates.\n",
+                "minimum": 0,
+                "maximum": 1
+              },
+              "token_limits": {
+                "type": "object",
+                "description": "Optional custom token limits for this truncation strategy. If not provided, the model's default token limits will be used.",
+                "properties": {
+                  "post_instructions": {
+                    "type": "integer",
+                    "description": "Maximum tokens allowed in the conversation after instructions (which including tool definitions). For example, setting this to 5,000 would mean that truncation would occur when the conversation exceeds 5,000 tokens after instructions. This cannot be higher than the model's context window size minus the maximum output tokens.",
+                    "minimum": 0
+                  }
+                }
+              }
+            },
+            "required": [
+              "type",
+              "retention_ratio"
+            ]
+          }
+        ]
+      },
+      "RealtimeTurnDetection": {
+        "anyOf": [
+          {
+            "title": "Realtime Turn Detection",
+            "description": "Configuration for turn detection, ether Server VAD or Semantic VAD. This can be set to `null` to turn off, in which case the client must manually trigger model response.\n\nServer VAD means that the model will detect the start and end of speech based on audio volume and respond at the end of user speech.\n\nSemantic VAD is more advanced and uses a turn detection model (in conjunction with VAD) to semantically estimate whether the user has finished speaking, then dynamically sets a timeout based on this probability. For example, if user audio trails off with \"uhhm\", the model will score a low probability of turn end and wait longer for the user to continue speaking. This can be useful for more natural conversations, but may have a higher latency.\n\nFor `gpt-realtime-whisper` transcription sessions, turn detection must be\nset to `null`; VAD is not supported.\n",
+            "oneOf": [
+              {
+                "type": "object",
+                "title": "Server VAD",
+                "description": "Server-side voice activity detection (VAD) which flips on when user speech is detected and off after a period of silence.",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "default": "server_vad",
+                    "const": "server_vad",
+                    "description": "Type of turn detection, `server_vad` to turn on simple Server VAD.\n"
+                  },
+                  "threshold": {
+                    "type": "number",
+                    "description": "Used only for `server_vad` mode. Activation threshold for VAD (0.0 to 1.0), this defaults to 0.5. A\nhigher threshold will require louder audio to activate the model, and\nthus might perform better in noisy environments.\n"
+                  },
+                  "prefix_padding_ms": {
+                    "type": "integer",
+                    "description": "Used only for `server_vad` mode. Amount of audio to include before the VAD detected speech (in\nmilliseconds). Defaults to 300ms.\n"
+                  },
+                  "silence_duration_ms": {
+                    "type": "integer",
+                    "description": "Used only for `server_vad` mode. Duration of silence to detect speech stop (in milliseconds). Defaults\nto 500ms. With shorter values the model will respond more quickly,\nbut may jump in on short pauses from the user.\n"
+                  },
+                  "create_response": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether or not to automatically generate a response when a VAD stop event occurs. If `interrupt_response` is set to `false` this may fail to create a response if the model is already responding.\n\nIf both `create_response` and `interrupt_response` are set to `false`, the model will never respond automatically but VAD events will still be emitted.\n"
+                  },
+                  "interrupt_response": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether or not to automatically interrupt (cancel) any ongoing response with output to the default\nconversation (i.e. `conversation` of `auto`) when a VAD start event occurs. If `true` then the response will be cancelled, otherwise it will continue until complete.\n\nIf both `create_response` and `interrupt_response` are set to `false`, the model will never respond automatically but VAD events will still be emitted.\n"
+                  },
+                  "idle_timeout_ms": {
+                    "anyOf": [
+                      {
+                        "type": "integer",
+                        "minimum": 5000,
+                        "maximum": 30000,
+                        "description": "Optional timeout after which a model response will be triggered automatically. This is\nuseful for situations in which a long pause from the user is unexpected, such as a phone\ncall. The model will effectively prompt the user to continue the conversation based\non the current context.\n\nThe timeout value will be applied after the last model response's audio has finished playing,\ni.e. it's set to the `response.done` time plus audio playback duration.\n\nAn `input_audio_buffer.timeout_triggered` event (plus events\nassociated with the Response) will be emitted when the timeout is reached.\nIdle timeout is currently only supported for `server_vad` mode.\n"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                "type": "object",
+                "title": "Semantic VAD",
+                "description": "Server-side semantic turn detection which uses a model to determine when the user has finished speaking.",
+                "required": [
+                  "type"
+                ],
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "const": "semantic_vad",
+                    "description": "Type of turn detection, `semantic_vad` to turn on Semantic VAD.\n"
+                  },
+                  "eagerness": {
+                    "type": "string",
+                    "default": "auto",
+                    "enum": [
+                      "low",
+                      "medium",
+                      "high",
+                      "auto"
+                    ],
+                    "description": "Used only for `semantic_vad` mode. The eagerness of the model to respond. `low` will wait longer for the user to continue speaking, `high` will respond more quickly. `auto` is the default and is equivalent to `medium`. `low`, `medium`, and `high` have max timeouts of 8s, 4s, and 2s respectively.\n"
+                  },
+                  "create_response": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether or not to automatically generate a response when a VAD stop event occurs.\n"
+                  },
+                  "interrupt_response": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether or not to automatically interrupt any ongoing response with output to the default\nconversation (i.e. `conversation` of `auto`) when a VAD start event occurs.\n"
+                  }
+                }
+              }
+            ],
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "Reasoning": {
+        "type": "object",
+        "description": "Configuration options for\n[reasoning models](https://developers.openai.com/api/docs/guides/reasoning).\n",
+        "title": "Reasoning",
+        "properties": {
+          "mode": {
+            "$ref": "#/components/schemas/ReasoningModeEnum",
+            "description": "Controls the reasoning execution mode for the request.\n\nWhen returned on a response, this is the effective execution mode.\n"
+          },
+          "effort": {
+            "$ref": "#/components/schemas/ReasoningEffort"
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A summary of the reasoning performed by the model. This can be\nuseful for debugging and understanding the model's reasoning process.\nOne of `auto`, `concise`, or `detailed`.\n\n`concise` is supported for `computer-use-preview` models and all reasoning models after `gpt-5`.\n",
+                "enum": [
+                  "auto",
+                  "concise",
+                  "detailed"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "context": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Controls which reasoning items are rendered back to the model on later turns.\nIf omitted or set to `auto`, the model determines the context mode. The\n`gpt-5.6` model family defaults to `all_turns`; earlier models default to\n`current_turn`.\n\nWhen returned on a response, this is the effective reasoning context mode\nused for the response.\n",
+                "enum": [
+                  "auto",
+                  "current_turn",
+                  "all_turns"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "generate_summary": {
+            "anyOf": [
+              {
+                "type": "string",
+                "deprecated": true,
+                "description": "**Deprecated:** use `summary` instead.\n\nA summary of the reasoning performed by the model. This can be\nuseful for debugging and understanding the model's reasoning process.\nOne of `auto`, `concise`, or `detailed`.\n",
+                "enum": [
+                  "auto",
+                  "concise",
+                  "detailed"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        }
+      },
+      "ReasoningEffort": {
+        "anyOf": [
+          {
+            "type": "string",
+            "enum": [
+              "none",
+              "minimal",
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max"
+            ],
+            "default": "medium",
+            "description": "Constrains effort on reasoning for reasoning models. Currently supported\nvalues are `none`, `minimal`, `low`, `medium`, `high`, `xhigh`, and `max`.\nReducing reasoning effort can result in faster responses and fewer tokens\nused on reasoning in a response. Not all reasoning models support every\nvalue. See the\n[reasoning guide](https://developers.openai.com/api/docs/guides/reasoning)\nfor model-specific support.\n"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "ReasoningItem": {
+        "type": "object",
+        "description": "A description of the chain of thought used by a reasoning model while generating\na response. Be sure to include these items in your `input` to the Responses API\nfor subsequent turns of a conversation if you are manually\n[managing context](https://developers.openai.com/api/docs/guides/conversation-state).\n",
+        "title": "Reasoning",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the object. Always `reasoning`.\n",
+            "enum": [
+              "reasoning"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique identifier of the reasoning content.\n"
+          },
+          "encrypted_content": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The encrypted content of the reasoning item. This is populated by default\nfor reasoning items returned by `POST /v1/responses` and WebSocket\n`response.create` requests.\n\nWhen streaming, use the completed reasoning item and its\n`encrypted_content` from the `response.output_item.done` event in\nsubsequent requests. The `encrypted_content` in\n`response.output_item.added` may be incomplete. This is especially\nimportant when `store` is `false` or when using Zero Data Retention.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "summary": {
+            "type": "array",
+            "description": "Reasoning summary content.\n",
+            "items": {
+              "$ref": "#/components/schemas/SummaryTextContent"
+            }
+          },
+          "content": {
+            "type": "array",
+            "description": "Reasoning text content.\n",
+            "items": {
+              "$ref": "#/components/schemas/ReasoningTextContent"
+            }
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "summary",
+          "type"
+        ]
+      },
+      "Response": {
+        "title": "The response object",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/ModelResponseProperties"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "service_tier": {
+                "$ref": "#/components/schemas/ServiceTierResponses"
+              },
+              "truncation": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The truncation strategy to use for the model response.\n- `auto`: If the input to this Response exceeds\n  the model's context window size, the model will truncate the\n  response to fit the context window by dropping items from the beginning of the conversation.\n- `disabled` (default): If the input size will exceed the context window\n  size for a model, the request will fail with a 400 error.\n",
+                    "enum": [
+                      "auto",
+                      "disabled"
+                    ],
+                    "default": "disabled"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "id": {
+                "type": "string",
+                "description": "Unique identifier for this Response.\n"
+              },
+              "object": {
+                "type": "string",
+                "description": "The object type of this resource - always set to `response`.\n",
+                "enum": [
+                  "response"
+                ],
+                "x-stainless-const": true
+              },
+              "status": {
+                "type": "string",
+                "description": "The status of the response generation. One of `completed`, `failed`,\n`in_progress`, `cancelled`, `queued`, or `incomplete`.\n",
+                "enum": [
+                  "completed",
+                  "failed",
+                  "in_progress",
+                  "cancelled",
+                  "queued",
+                  "incomplete"
+                ]
+              },
+              "created_at": {
+                "type": "number",
+                "format": "unixtime",
+                "description": "Unix timestamp (in seconds) of when this Response was created.\n"
+              },
+              "completed_at": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "format": "unixtime",
+                    "description": "Unix timestamp (in seconds) of when this Response was completed.\nOnly present when the status is `completed`.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "error": {
+                "$ref": "#/components/schemas/ResponseError"
+              },
+              "incomplete_details": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "description": "Details about why the response is incomplete.\n",
+                    "properties": {
+                      "reason": {
+                        "type": "string",
+                        "description": "The reason why the response is incomplete. `steered` means\nthe response stopped at a safe output boundary after a\nWebSocket `response.steer` event. The server can then create\na successor response automatically with the queued input.\n",
+                        "enum": [
+                          "max_output_tokens",
+                          "max_messages",
+                          "content_filter",
+                          "steered"
+                        ]
+                      }
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "output": {
+                "type": "array",
+                "description": "An array of content items generated by the model.\n\n- The length and order of items in the `output` array is dependent\n  on the model's response.\n- Rather than accessing the first item in the `output` array and\n  assuming it's an `assistant` message with the content generated by\n  the model, you might consider using the `output_text` property where\n  supported in SDKs.\n",
+                "items": {
+                  "$ref": "#/components/schemas/OutputItem"
+                }
+              },
+              "reasoning": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/Reasoning"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "instructions": {
+                "anyOf": [
+                  {
+                    "description": "A system (or developer) message inserted into the model's context.\n\nWhen using along with `previous_response_id`, the instructions from a previous\nresponse will not be carried over to the next response. This makes it simple\nto swap out system (or developer) messages in new responses.\n",
+                    "oneOf": [
+                      {
+                        "type": "string",
+                        "description": "A text input to the model, equivalent to a text input with the\n`developer` role.\n"
+                      },
+                      {
+                        "type": "array",
+                        "title": "Input item list",
+                        "description": "A list of one or many input items to the model, containing\ndifferent content types.\n",
+                        "items": {
+                          "$ref": "#/components/schemas/InputItem"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "output_text": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "SDK-only convenience property that contains the aggregated text output\nfrom all `output_text` items in the `output` array, if any are present.\nSupported in the Python and JavaScript SDKs.\n",
+                    "x-oaiSupportedSDKs": [
+                      "python",
+                      "javascript"
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "usage": {
+                "$ref": "#/components/schemas/ResponseUsage"
+              },
+              "prompt_cache_options": {
+                "$ref": "#/components/schemas/PromptCacheOptions"
+              },
+              "prompt_cache_diagnostics": {
+                "$ref": "#/components/schemas/PromptCacheDiagnostics"
+              },
+              "moderation": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/Moderation",
+                    "description": "Moderation results for the response input and output, if moderated completions were requested.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "parallel_tool_calls": {
+                "type": "boolean",
+                "description": "Whether to allow the model to run tool calls in parallel.\n",
+                "default": true
+              },
+              "conversation": {
+                "anyOf": [
+                  {
+                    "default": null,
+                    "$ref": "#/components/schemas/ResponseConversation"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "max_output_tokens": {
+                "anyOf": [
+                  {
+                    "description": "An upper bound for the number of tokens that can be generated for a response, including visible output tokens and [reasoning tokens](https://developers.openai.com/api/docs/guides/reasoning).\n",
+                    "type": "integer"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "object",
+              "created_at",
+              "error",
+              "incomplete_details",
+              "instructions",
+              "model",
+              "tools",
+              "output",
+              "parallel_tool_calls",
+              "metadata",
+              "tool_choice",
+              "temperature",
+              "top_p"
+            ]
+          }
+        ],
+        "example": {
+          "id": "resp_67ccd3a9da748190baa7f1570fe91ac604becb25c45c1d41",
+          "object": "response",
+          "created_at": 1741476777,
+          "status": "completed",
+          "completed_at": 1741476778,
+          "error": null,
+          "incomplete_details": null,
+          "instructions": null,
+          "max_output_tokens": null,
+          "model": "gpt-6-astra",
+          "output": [
+            {
+              "type": "message",
+              "id": "msg_67ccd3acc8d48190a77525dc6de64b4104becb25c45c1d41",
+              "status": "completed",
+              "role": "assistant",
+              "content": [
+                {
+                  "type": "output_text",
+                  "text": "The image depicts a scenic landscape with a wooden boardwalk or pathway leading through lush, green grass under a blue sky with some clouds. The setting suggests a peaceful natural area, possibly a park or nature reserve. There are trees and shrubs in the background.",
+                  "annotations": []
+                }
+              ]
+            }
+          ],
+          "parallel_tool_calls": true,
+          "previous_response_id": null,
+          "reasoning": {
+            "effort": null,
+            "summary": null,
+            "context": null
+          },
+          "store": true,
+          "temperature": 1,
+          "text": {
+            "format": {
+              "type": "text"
+            }
+          },
+          "tool_choice": "auto",
+          "tools": [],
+          "top_p": 1,
+          "truncation": "disabled",
+          "usage": {
+            "input_tokens": 328,
+            "input_tokens_details": {
+              "cached_tokens": 0,
+              "cache_write_tokens": 0
+            },
+            "output_tokens": 52,
+            "output_tokens_details": {
+              "reasoning_tokens": 0
+            },
+            "total_tokens": 380
+          },
+          "user": null,
+          "metadata": {}
+        }
+      },
+      "ResponseAudioDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is a partial audio response.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.audio.delta`.\n",
+            "enum": [
+              "response.audio.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "A sequence number for this chunk of the stream response.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "A chunk of Base64 encoded response audio bytes.\n"
+          }
+        },
+        "required": [
+          "type",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.audio.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.audio.delta\",\n  \"response_id\": \"resp_123\",\n  \"delta\": \"base64encoded...\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseAudioDoneEvent": {
+        "type": "object",
+        "description": "Emitted when the audio response is complete.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.audio.done`.\n",
+            "enum": [
+              "response.audio.done"
+            ],
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the delta.\n"
+          }
+        },
+        "required": [
+          "type",
+          "sequence_number",
+          "response_id"
+        ],
+        "x-oaiMeta": {
+          "name": "response.audio.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.audio.done\",\n  \"response_id\": \"resp-123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseAudioTranscriptDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is a partial transcript of audio.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.audio.transcript.delta`.\n",
+            "enum": [
+              "response.audio.transcript.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "delta": {
+            "type": "string",
+            "description": "The partial transcript of the audio response.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "response_id",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.audio.transcript.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.audio.transcript.delta\",\n  \"response_id\": \"resp_123\",\n  \"delta\": \" ... partial transcript ... \",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseAudioTranscriptDoneEvent": {
+        "type": "object",
+        "description": "Emitted when the full audio transcript is completed.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.audio.transcript.done`.\n",
+            "enum": [
+              "response.audio.transcript.done"
+            ],
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "response_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.audio.transcript.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.audio.transcript.done\",\n  \"response_id\": \"resp_123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseCodeInterpreterCallCodeDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when a partial code snippet is streamed by the code interpreter.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call_code.delta`.",
+            "enum": [
+              "response.code_interpreter_call_code.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code is being streamed."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The partial code snippet being streamed by the code interpreter."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call_code.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call_code.delta\",\n  \"output_index\": 0,\n  \"item_id\": \"ci_12345\",\n  \"delta\": \"print('Hello, world')\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseCodeInterpreterCallCodeDoneEvent": {
+        "type": "object",
+        "description": "Emitted when the code snippet is finalized by the code interpreter.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call_code.done`.",
+            "enum": [
+              "response.code_interpreter_call_code.done"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code is finalized."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "code": {
+            "type": "string",
+            "description": "The final code snippet output by the code interpreter."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "code",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call_code.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call_code.done\",\n  \"output_index\": 3,\n  \"item_id\": \"ci_12345\",\n  \"code\": \"print('done')\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseCodeInterpreterCallCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when the code interpreter call is completed.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call.completed`.",
+            "enum": [
+              "response.code_interpreter_call.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code interpreter call is completed."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call.completed\",\n  \"output_index\": 5,\n  \"item_id\": \"ci_12345\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseCodeInterpreterCallInProgressEvent": {
+        "type": "object",
+        "description": "Emitted when a code interpreter call is in progress.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call.in_progress`.",
+            "enum": [
+              "response.code_interpreter_call.in_progress"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code interpreter call is in progress."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call.in_progress\",\n  \"output_index\": 0,\n  \"item_id\": \"ci_12345\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseCodeInterpreterCallInterpretingEvent": {
+        "type": "object",
+        "description": "Emitted when the code interpreter is actively interpreting the code snippet.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call.interpreting`.",
+            "enum": [
+              "response.code_interpreter_call.interpreting"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code interpreter is interpreting code."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call.interpreting",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call.interpreting\",\n  \"output_index\": 4,\n  \"item_id\": \"ci_12345\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when the model response is complete.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.completed`.\n",
+            "enum": [
+              "response.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/Response",
+            "description": "Properties of the completed response.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.completed\",\n  \"response\": {\n    \"id\": \"resp_123\",\n    \"object\": \"response\",\n    \"created_at\": 1740855869,\n    \"status\": \"completed\",\n    \"completed_at\": 1740855870,\n    \"error\": null,\n    \"incomplete_details\": null,\n    \"input\": [],\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [\n      {\n        \"id\": \"msg_123\",\n        \"type\": \"message\",\n        \"role\": \"assistant\",\n        \"content\": [\n          {\n            \"type\": \"output_text\",\n            \"text\": \"In a shimmering forest under a sky full of stars, a lonely unicorn named Lila discovered a hidden pond that glowed with moonlight. Every night, she would leave sparkling, magical flowers by the water's edge, hoping to share her beauty with others. One enchanting evening, she woke to find a group of friendly animals gathered around, eager to be friends and share in her magic.\",\n            \"annotations\": []\n          }\n        ]\n      }\n    ],\n    \"previous_response_id\": null,\n    \"reasoning_effort\": null,\n    \"store\": false,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": {\n      \"input_tokens\": 0,\n      \"output_tokens\": 0,\n      \"output_tokens_details\": {\n        \"reasoning_tokens\": 0\n      },\n      \"total_tokens\": 0\n    },\n    \"user\": null,\n    \"metadata\": {}\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseConfigurationUpdate": {
+        "type": "object",
+        "description": "A configuration update that applies to subsequent responses until it is\nreplaced by another configuration update.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the configuration update item.",
+            "example": "cnfu_123"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "configuration_update"
+            ],
+            "description": "The item type. Always `configuration_update`.",
+            "default": "configuration_update",
+            "x-stainless-const": true
+          },
+          "reasoning": {
+            "type": "object",
+            "description": "The reasoning configuration applied by this update.",
+            "properties": {
+              "effort": {
+                "$ref": "#/components/schemas/ReasoningEffort",
+                "description": "The reasoning effort used for subsequent responses until another\nconfiguration update replaces it.\n"
+              }
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type"
+        ]
+      },
+      "ResponseConfigurationUpdateItemParam": {
+        "type": "object",
+        "description": "An update to the conversation's response configuration. The configuration\nremains in effect for subsequent responses until it is replaced by another\nconfiguration update.\n",
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the configuration update item.",
+                "example": "cnfu_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "configuration_update"
+            ],
+            "description": "The item type. Always `configuration_update`.",
+            "default": "configuration_update",
+            "x-stainless-const": true
+          },
+          "reasoning": {
+            "type": "object",
+            "description": "Updates to reasoning configuration. Only effort is supported.",
+            "properties": {
+              "effort": {
+                "$ref": "#/components/schemas/ReasoningEffort",
+                "description": "The reasoning effort to use for subsequent responses until another\nconfiguration update replaces it.\n"
+              }
+            }
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "ResponseContentPartAddedEvent": {
+        "type": "object",
+        "description": "Emitted when a new content part is added.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.content_part.added`.\n",
+            "enum": [
+              "response.content_part.added"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the content part was added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the content part was added to.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that was added.\n"
+          },
+          "part": {
+            "$ref": "#/components/schemas/OutputContent",
+            "description": "The content part that was added.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.content_part.added",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.content_part.added\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"part\": {\n    \"type\": \"output_text\",\n    \"text\": \"\",\n    \"annotations\": []\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseContentPartDoneEvent": {
+        "type": "object",
+        "description": "Emitted when a content part is done.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.content_part.done`.\n",
+            "enum": [
+              "response.content_part.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the content part was added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the content part was added to.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that is done.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "part": {
+            "$ref": "#/components/schemas/OutputContent",
+            "description": "The content part that is done.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.content_part.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.content_part.done\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"sequence_number\": 1,\n  \"part\": {\n    \"type\": \"output_text\",\n    \"text\": \"In a shimmering forest under a sky full of stars, a lonely unicorn named Lila discovered a hidden pond that glowed with moonlight. Every night, she would leave sparkling, magical flowers by the water's edge, hoping to share her beauty with others. One enchanting evening, she woke to find a group of friendly animals gathered around, eager to be friends and share in her magic.\",\n    \"annotations\": []\n  }\n}\n"
+        }
+      },
+      "ResponseCreatedEvent": {
+        "type": "object",
+        "description": "An event that is emitted when a response is created.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.created`.\n",
+            "enum": [
+              "response.created"
+            ],
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/Response",
+            "description": "The response that was created.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.created",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.created\",\n  \"response\": {\n    \"id\": \"resp_67ccfcdd16748190a91872c75d38539e09e4d4aac714747c\",\n    \"object\": \"response\",\n    \"created_at\": 1741487325,\n    \"status\": \"in_progress\",\n    \"completed_at\": null,\n    \"error\": null,\n    \"incomplete_details\": null,\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [],\n    \"parallel_tool_calls\": true,\n    \"previous_response_id\": null,\n    \"reasoning\": {\n      \"effort\": null,\n      \"summary\": null\n    },\n    \"store\": true,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": null,\n    \"user\": null,\n    \"metadata\": {}\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseCustomToolCallInputDeltaEvent": {
+        "title": "ResponseCustomToolCallInputDelta",
+        "type": "object",
+        "description": "Event representing a delta (partial update) to the input of a custom tool call.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.custom_tool_call_input.delta"
+            ],
+            "description": "The event type identifier.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output this delta applies to."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique identifier for the API item associated with this event."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The incremental input data (delta) for the custom tool call."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.custom_tool_call_input.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.custom_tool_call_input.delta\",\n  \"output_index\": 0,\n  \"item_id\": \"ctc_1234567890abcdef\",\n  \"delta\": \"partial input text\"\n}\n"
+        }
+      },
+      "ResponseCustomToolCallInputDoneEvent": {
+        "title": "ResponseCustomToolCallInputDone",
+        "type": "object",
+        "description": "Event indicating that input for a custom tool call is complete.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.custom_tool_call_input.done"
+            ],
+            "description": "The event type identifier.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output this event applies to."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique identifier for the API item associated with this event."
+          },
+          "input": {
+            "type": "string",
+            "description": "The complete input data for the custom tool call."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "input",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.custom_tool_call_input.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.custom_tool_call_input.done\",\n  \"output_index\": 0,\n  \"item_id\": \"ctc_1234567890abcdef\",\n  \"input\": \"final complete input text\"\n}\n"
+        }
+      },
+      "ResponseError": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "An error object returned when the model fails to generate a Response.\n",
+            "properties": {
+              "code": {
+                "$ref": "#/components/schemas/ResponseErrorCode"
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable description of the error.\n"
+              },
+              "misalignment": {
+                "$ref": "#/components/schemas/MisalignmentErrorDetailsResource"
+              }
+            },
+            "required": [
+              "code",
+              "message"
+            ]
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "ResponseErrorCode": {
+        "type": "string",
+        "description": "The error code for the response.\n",
+        "enum": [
+          "server_error",
+          "rate_limit_exceeded",
+          "invalid_prompt",
+          "data_residency_mismatch",
+          "bio_policy",
+          "misalignment_policy_violation",
+          "vector_store_timeout",
+          "invalid_image",
+          "invalid_image_format",
+          "invalid_base64_image",
+          "invalid_image_url",
+          "image_too_large",
+          "image_too_small",
+          "image_parse_error",
+          "image_content_policy_violation",
+          "invalid_image_mode",
+          "image_file_too_large",
+          "unsupported_image_media_type",
+          "empty_image_file",
+          "failed_to_download_image",
+          "image_file_not_found"
+        ]
+      },
+      "ResponseErrorEvent": {
+        "type": "object",
+        "description": "Emitted when an error occurs.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `error`.\n",
+            "enum": [
+              "error"
+            ],
+            "x-stainless-const": true
+          },
+          "code": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The error code.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "type": "string",
+            "description": "The error message.\n"
+          },
+          "param": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The error parameter.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message",
+          "param",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "error",
+          "group": "responses",
+          "example": "{\n  \"type\": \"error\",\n  \"code\": \"ERR_SOMETHING\",\n  \"message\": \"Something went wrong\",\n  \"param\": null,\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseFailedEvent": {
+        "type": "object",
+        "description": "An event that is emitted when a response fails.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.failed`.\n",
+            "enum": [
+              "response.failed"
+            ],
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "response": {
+            "$ref": "#/components/schemas/Response",
+            "description": "The response that failed.\n"
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.failed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.failed\",\n  \"response\": {\n    \"id\": \"resp_123\",\n    \"object\": \"response\",\n    \"created_at\": 1740855869,\n    \"status\": \"failed\",\n    \"completed_at\": null,\n    \"error\": {\n      \"code\": \"server_error\",\n      \"message\": \"The model failed to generate a response.\"\n    },\n    \"incomplete_details\": null,\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [],\n    \"previous_response_id\": null,\n    \"reasoning_effort\": null,\n    \"store\": false,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": null,\n    \"user\": null,\n    \"metadata\": {}\n  }\n}\n"
+        }
+      },
+      "ResponseFileSearchCallCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when a file search call is completed (results found).",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.file_search_call.completed`.\n",
+            "enum": [
+              "response.file_search_call.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the file search call is initiated.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the file search call is initiated.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.file_search_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.file_search_call.completed\",\n  \"output_index\": 0,\n  \"item_id\": \"fs_123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseFileSearchCallInProgressEvent": {
+        "type": "object",
+        "description": "Emitted when a file search call is initiated.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.file_search_call.in_progress`.\n",
+            "enum": [
+              "response.file_search_call.in_progress"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the file search call is initiated.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the file search call is initiated.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.file_search_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.file_search_call.in_progress\",\n  \"output_index\": 0,\n  \"item_id\": \"fs_123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseFileSearchCallSearchingEvent": {
+        "type": "object",
+        "description": "Emitted when a file search is currently searching.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.file_search_call.searching`.\n",
+            "enum": [
+              "response.file_search_call.searching"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the file search call is searching.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the file search call is initiated.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.file_search_call.searching",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.file_search_call.searching\",\n  \"output_index\": 0,\n  \"item_id\": \"fs_123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseFormatJsonObject": {
+        "type": "object",
+        "title": "JSON object",
+        "description": "JSON object response format. An older method of generating JSON responses.\nUsing `json_schema` is recommended for models that support it. Note that the\nmodel will not generate JSON without a system or user message instructing it\nto do so.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `json_object`.",
+            "enum": [
+              "json_object"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "ResponseFormatJsonSchema": {
+        "type": "object",
+        "title": "JSON schema",
+        "description": "JSON Schema response format. Used to generate structured JSON responses.\nLearn more about [Structured Outputs](https://developers.openai.com/api/docs/guides/structured-outputs).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `json_schema`.",
+            "enum": [
+              "json_schema"
+            ],
+            "x-stainless-const": true
+          },
+          "json_schema": {
+            "type": "object",
+            "title": "JSON schema",
+            "description": "Structured Outputs configuration options, including a JSON Schema.\n",
+            "properties": {
+              "description": {
+                "type": "string",
+                "description": "A description of what the response format is for, used by the model to\ndetermine how to respond in the format.\n"
+              },
+              "name": {
+                "type": "string",
+                "description": "The name of the response format. Must be a-z, A-Z, 0-9, or contain\nunderscores and dashes, with a maximum length of 64.\n"
+              },
+              "schema": {
+                "$ref": "#/components/schemas/ResponseFormatJsonSchemaSchema"
+              },
+              "strict": {
+                "anyOf": [
+                  {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Whether to enable strict schema adherence when generating the output.\nIf set to true, the model will always follow the exact schema defined\nin the `schema` field. Only a subset of JSON Schema is supported when\n`strict` is `true`. To learn more, read the [Structured Outputs\nguide](https://developers.openai.com/api/docs/guides/structured-outputs).\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "name"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "json_schema"
+        ]
+      },
+      "ResponseFormatJsonSchemaSchema": {
+        "type": "object",
+        "title": "JSON schema",
+        "description": "The schema for the response format, described as a JSON Schema object.\nLearn how to build JSON schemas [here](https://json-schema.org/).\n",
+        "additionalProperties": true
+      },
+      "ResponseFormatText": {
+        "type": "object",
+        "title": "Text",
+        "description": "Default response format. Used to generate text responses.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `text`.",
+            "enum": [
+              "text"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "ResponseFormatTextGrammar": {
+        "type": "object",
+        "title": "Text grammar",
+        "description": "A custom grammar for the model to follow when generating text.\nLearn more in the [custom grammars guide](https://developers.openai.com/api/docs/guides/function-calling#context-free-grammars).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `grammar`.",
+            "enum": [
+              "grammar"
+            ],
+            "x-stainless-const": true
+          },
+          "grammar": {
+            "type": "string",
+            "description": "The custom grammar for the model to follow."
+          }
+        },
+        "required": [
+          "type",
+          "grammar"
+        ]
+      },
+      "ResponseFormatTextPython": {
+        "type": "object",
+        "title": "Python grammar",
+        "description": "Configure the model to generate valid Python code. See the\n[custom grammars guide](https://developers.openai.com/api/docs/guides/function-calling#context-free-grammars) for more details.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `python`.",
+            "enum": [
+              "python"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "ResponseFunctionCallArgumentsDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is a partial function-call arguments delta.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.function_call_arguments.delta`.\n",
+            "enum": [
+              "response.function_call_arguments.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the function-call arguments delta is added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the function-call arguments delta is added to.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The function-call arguments delta that is added.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.function_call_arguments.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.function_call_arguments.delta\",\n  \"item_id\": \"item-abc\",\n  \"output_index\": 0,\n  \"delta\": \"{ \\\"arg\\\":\"\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseFunctionCallArgumentsDoneEvent": {
+        "type": "object",
+        "description": "Emitted when function-call arguments are finalized.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.function_call_arguments.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The function-call arguments."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "arguments",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.function_call_arguments.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.function_call_arguments.done\",\n  \"item_id\": \"item-abc\",\n  \"output_index\": 1,\n  \"arguments\": \"{ \\\"arg\\\": 123 }\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseImageGenCallCompletedEvent": {
+        "type": "object",
+        "title": "ResponseImageGenCallCompletedEvent",
+        "description": "Emitted when an image generation tool call has completed and the final image is available.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.image_generation_call.completed"
+            ],
+            "description": "The type of the event. Always 'response.image_generation_call.completed'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the image generation item being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.image_generation_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.image_generation_call.completed\",\n  \"output_index\": 0,\n  \"item_id\": \"item-123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseImageGenCallGeneratingEvent": {
+        "type": "object",
+        "title": "ResponseImageGenCallGeneratingEvent",
+        "description": "Emitted when an image generation tool call is actively generating an image (intermediate state).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.image_generation_call.generating"
+            ],
+            "description": "The type of the event. Always 'response.image_generation_call.generating'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the image generation item being processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the image generation item being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.image_generation_call.generating",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.image_generation_call.generating\",\n  \"output_index\": 0,\n  \"item_id\": \"item-123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "ResponseImageGenCallInProgressEvent": {
+        "type": "object",
+        "title": "ResponseImageGenCallInProgressEvent",
+        "description": "Emitted when an image generation tool call is in progress.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.image_generation_call.in_progress"
+            ],
+            "description": "The type of the event. Always 'response.image_generation_call.in_progress'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the image generation item being processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the image generation item being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.image_generation_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.image_generation_call.in_progress\",\n  \"output_index\": 0,\n  \"item_id\": \"item-123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "ResponseImageGenCallPartialImageEvent": {
+        "type": "object",
+        "title": "ResponseImageGenCallPartialImageEvent",
+        "description": "Emitted when a partial image is available during image generation streaming.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.image_generation_call.partial_image"
+            ],
+            "description": "The type of the event. Always 'response.image_generation_call.partial_image'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the image generation item being processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the image generation item being processed."
+          },
+          "partial_image_index": {
+            "type": "integer",
+            "description": "0-based index for the partial image (backend is 1-based, but this is 0-based for the user)."
+          },
+          "partial_image_b64": {
+            "type": "string",
+            "description": "Base64-encoded partial image data, suitable for rendering as an image."
+          },
+          "size": {
+            "type": "string",
+            "description": "The image size that was used."
+          },
+          "quality": {
+            "type": "string",
+            "description": "The image quality that was used."
+          },
+          "background": {
+            "type": "string",
+            "description": "The background setting that was used."
+          },
+          "output_format": {
+            "type": "string",
+            "description": "The output format that was used."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number",
+          "partial_image_index",
+          "partial_image_b64"
+        ],
+        "x-oaiMeta": {
+          "name": "response.image_generation_call.partial_image",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.image_generation_call.partial_image\",\n  \"output_index\": 0,\n  \"item_id\": \"item-123\",\n  \"sequence_number\": 0,\n  \"partial_image_index\": 0,\n  \"partial_image_b64\": \"...\"\n}\n"
+        }
+      },
+      "ResponseInProgressEvent": {
+        "type": "object",
+        "description": "Emitted when the response is in progress.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.in_progress`.\n",
+            "enum": [
+              "response.in_progress"
+            ],
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/Response",
+            "description": "The response that is in progress.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.in_progress\",\n  \"response\": {\n    \"id\": \"resp_67ccfcdd16748190a91872c75d38539e09e4d4aac714747c\",\n    \"object\": \"response\",\n    \"created_at\": 1741487325,\n    \"status\": \"in_progress\",\n    \"completed_at\": null,\n    \"error\": null,\n    \"incomplete_details\": null,\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [],\n    \"parallel_tool_calls\": true,\n    \"previous_response_id\": null,\n    \"reasoning\": {\n      \"effort\": null,\n      \"summary\": null\n    },\n    \"store\": true,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": null,\n    \"user\": null,\n    \"metadata\": {}\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseIncompleteEvent": {
+        "type": "object",
+        "description": "An event that is emitted when a response finishes as incomplete.\n\nOver WebSocket, steering can finish a response with\n`response.incomplete_details.reason` set to `steered`, followed automatically\nby a successor `response.created` that commits the queued steering input.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.incomplete`.\n",
+            "enum": [
+              "response.incomplete"
+            ],
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/Response",
+            "description": "The response that was incomplete.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.incomplete",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.incomplete\",\n  \"response\": {\n    \"id\": \"resp_123\",\n    \"object\": \"response\",\n    \"created_at\": 1740855869,\n    \"status\": \"incomplete\",\n    \"completed_at\": null,\n    \"error\": null,\n    \"incomplete_details\": {\n      \"reason\": \"max_tokens\"\n    },\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [],\n    \"previous_response_id\": null,\n    \"reasoning_effort\": null,\n    \"store\": false,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": null,\n    \"user\": null,\n    \"metadata\": {}\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseItemList": {
+        "type": "object",
+        "description": "A list of Response items.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "The type of object returned, must be `list`.",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "A list of items used to generate this response.",
+            "items": {
+              "$ref": "#/components/schemas/ItemResource"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The ID of the first item in the list."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The ID of the last item in the list."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "first_id",
+          "last_id"
+        ],
+        "x-oaiMeta": {
+          "name": "The input item list",
+          "group": "responses",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"msg_abc123\",\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"Tell me a three sentence bedtime story about a unicorn.\"\n        }\n      ]\n    }\n  ],\n  \"first_id\": \"msg_abc123\",\n  \"last_id\": \"msg_abc123\",\n  \"has_more\": false\n}\n"
+        }
+      },
+      "ResponseLogProb": {
+        "type": "object",
+        "description": "A logprob is the logarithmic probability that the model assigns to producing \na particular token at a given position in the sequence. Less-negative (higher) \nlogprob values indicate greater model confidence in that token choice.\n",
+        "properties": {
+          "token": {
+            "description": "A possible text token.",
+            "type": "string"
+          },
+          "logprob": {
+            "description": "The log probability of this token.\n",
+            "type": "number"
+          },
+          "top_logprobs": {
+            "description": "The log probabilities of up to 20 of the most likely tokens.\n",
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "token": {
+                  "description": "A possible text token.",
+                  "type": "string"
+                },
+                "logprob": {
+                  "description": "The log probability of this token.",
+                  "type": "number"
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "token",
+          "logprob"
+        ]
+      },
+      "ResponseMCPCallArgumentsDeltaEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallArgumentsDeltaEvent",
+        "description": "Emitted when there is a delta (partial update) to the arguments of an MCP tool call.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call_arguments.delta"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call_arguments.delta'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the MCP tool call item being processed."
+          },
+          "delta": {
+            "type": "string",
+            "description": "A JSON string containing the partial update to the arguments for the MCP tool call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call_arguments.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call_arguments.delta\",\n  \"output_index\": 0,\n  \"item_id\": \"item-abc\",\n  \"delta\": \"{\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseMCPCallArgumentsDoneEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallArgumentsDoneEvent",
+        "description": "Emitted when the arguments for an MCP tool call are finalized.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call_arguments.done"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call_arguments.done'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the MCP tool call item being processed."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string containing the finalized arguments for the MCP tool call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "arguments",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call_arguments.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call_arguments.done\",\n  \"output_index\": 0,\n  \"item_id\": \"item-abc\",\n  \"arguments\": \"{\\\"arg1\\\": \\\"value1\\\", \\\"arg2\\\": \\\"value2\\\"}\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseMCPCallCompletedEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallCompletedEvent",
+        "description": "Emitted when an MCP  tool call has completed successfully.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.completed"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call.completed'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that completed."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that completed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call.completed\",\n  \"sequence_number\": 1,\n  \"item_id\": \"mcp_682d437d90a88191bf88cd03aae0c3e503937d5f622d7a90\",\n  \"output_index\": 0\n}\n"
+        }
+      },
+      "ResponseMCPCallFailedEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallFailedEvent",
+        "description": "Emitted when an MCP  tool call has failed.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.failed"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call.failed'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that failed."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that failed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.failed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call.failed\",\n  \"sequence_number\": 1,\n  \"item_id\": \"mcp_682d437d90a88191bf88cd03aae0c3e503937d5f622d7a90\",\n  \"output_index\": 0\n}\n"
+        }
+      },
+      "ResponseMCPCallInProgressEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallInProgressEvent",
+        "description": "Emitted when an MCP  tool call is in progress.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.in_progress"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call.in_progress'.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the MCP tool call item being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call.in_progress\",\n  \"sequence_number\": 1,\n  \"output_index\": 0,\n  \"item_id\": \"mcp_682d437d90a88191bf88cd03aae0c3e503937d5f622d7a90\"\n}\n"
+        }
+      },
+      "ResponseMCPListToolsCompletedEvent": {
+        "type": "object",
+        "title": "ResponseMCPListToolsCompletedEvent",
+        "description": "Emitted when the list of available MCP tools has been successfully retrieved.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_list_tools.completed"
+            ],
+            "description": "The type of the event. Always 'response.mcp_list_tools.completed'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that produced this output."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_list_tools.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_list_tools.completed\",\n  \"sequence_number\": 1,\n  \"output_index\": 0,\n  \"item_id\": \"mcpl_682d4379df088191886b70f4ec39f90403937d5f622d7a90\"\n}\n"
+        }
+      },
+      "ResponseMCPListToolsFailedEvent": {
+        "type": "object",
+        "title": "ResponseMCPListToolsFailedEvent",
+        "description": "Emitted when the attempt to list available MCP tools has failed.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_list_tools.failed"
+            ],
+            "description": "The type of the event. Always 'response.mcp_list_tools.failed'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that failed."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that failed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_list_tools.failed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_list_tools.failed\",\n  \"sequence_number\": 1,\n  \"output_index\": 0,\n  \"item_id\": \"mcpl_682d4379df088191886b70f4ec39f90403937d5f622d7a90\"\n}\n"
+        }
+      },
+      "ResponseMCPListToolsInProgressEvent": {
+        "type": "object",
+        "title": "ResponseMCPListToolsInProgressEvent",
+        "description": "Emitted when the system is in the process of retrieving the list of available MCP tools.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_list_tools.in_progress"
+            ],
+            "description": "The type of the event. Always 'response.mcp_list_tools.in_progress'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that is being processed."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that is being processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_list_tools.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_list_tools.in_progress\",\n  \"sequence_number\": 1,\n  \"output_index\": 0,\n  \"item_id\": \"mcpl_682d4379df088191886b70f4ec39f90403937d5f622d7a90\"\n}\n"
+        }
+      },
+      "ResponseModalities": {
+        "anyOf": [
+          {
+            "type": "array",
+            "description": "Output types that you would like the model to generate.\nMost models are capable of generating text, which is the default:\n\n`[\"text\"]`\n\nThe `gpt-4o-audio-preview` model can also be used to\n[generate audio](https://developers.openai.com/api/docs/guides/audio). To request that this model generate\nboth text and audio responses, you can use:\n\n`[\"text\", \"audio\"]`\n",
+            "items": {
+              "type": "string",
+              "enum": [
+                "text",
+                "audio"
+              ]
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "ResponseOutputItemAddedEvent": {
+        "type": "object",
+        "description": "Emitted when a new output item is added.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.output_item.added`.\n",
+            "enum": [
+              "response.output_item.added"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was added.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          },
+          "item": {
+            "$ref": "#/components/schemas/OutputItem",
+            "description": "The output item that was added. For reasoning items, `encrypted_content`\nmay be incomplete while the item is in progress. Use the reasoning item\nfrom the corresponding `response.output_item.done` event when passing it\nas input to a subsequent request.\n"
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_item.added",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_item.added\",\n  \"output_index\": 0,\n  \"item\": {\n    \"id\": \"msg_123\",\n    \"status\": \"in_progress\",\n    \"type\": \"message\",\n    \"role\": \"assistant\",\n    \"content\": []\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseOutputItemDoneEvent": {
+        "type": "object",
+        "description": "Emitted when an output item is marked done.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.output_item.done`.\n",
+            "enum": [
+              "response.output_item.done"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was marked done.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          },
+          "item": {
+            "$ref": "#/components/schemas/OutputItem",
+            "description": "The output item that was marked done.\n"
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_item.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_item.done\",\n  \"output_index\": 0,\n  \"item\": {\n    \"id\": \"msg_123\",\n    \"status\": \"completed\",\n    \"type\": \"message\",\n    \"role\": \"assistant\",\n    \"content\": [\n      {\n        \"type\": \"output_text\",\n        \"text\": \"In a shimmering forest under a sky full of stars, a lonely unicorn named Lila discovered a hidden pond that glowed with moonlight. Every night, she would leave sparkling, magical flowers by the water's edge, hoping to share her beauty with others. One enchanting evening, she woke to find a group of friendly animals gathered around, eager to be friends and share in her magic.\",\n        \"annotations\": []\n      }\n    ]\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseOutputTextAnnotationAddedEvent": {
+        "type": "object",
+        "title": "ResponseOutputTextAnnotationAddedEvent",
+        "description": "Emitted when an annotation is added to output text content.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_text.annotation.added"
+            ],
+            "description": "The type of the event. Always 'response.output_text.annotation.added'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the item to which the annotation is being added."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part within the output item."
+          },
+          "annotation_index": {
+            "type": "integer",
+            "description": "The index of the annotation within the content part."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "annotation": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Annotation"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The annotation object being added. (See annotation schema for details.)"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "annotation_index",
+          "annotation",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.annotation.added",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_text.annotation.added\",\n  \"item_id\": \"item-abc\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"annotation_index\": 0,\n  \"annotation\": {\n    \"type\": \"file_citation\",\n    \"file_id\": \"file-abc\",\n    \"index\": 0,\n    \"filename\": \"example.txt\"\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponsePromptVariables": {
+        "anyOf": [
+          {
+            "type": "object",
+            "title": "Prompt Variables",
+            "description": "Optional map of values to substitute in for variables in your\nprompt. The substitution values can either be strings, or other\nResponse input types like images or files.\n",
+            "x-oaiExpandable": true,
+            "x-oaiTypeLabel": "map",
+            "additionalProperties": {
+              "x-oaiExpandable": true,
+              "x-oaiTypeLabel": "map",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "$ref": "#/components/schemas/InputTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/InputImageContent"
+                },
+                {
+                  "$ref": "#/components/schemas/InputFileContent"
+                }
+              ]
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "ResponseProperties": {
+        "type": "object",
+        "properties": {
+          "previous_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the previous response to the model. Use this to\ncreate multi-turn conversations. Learn more about\n[conversation state](https://developers.openai.com/api/docs/guides/conversation-state). Cannot be used in conjunction with `conversation`.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "description": "Model ID used to generate the response, like `gpt-6-astra`. OpenAI\noffers a wide range of models with different capabilities, performance\ncharacteristics, and price points. Refer to the [model guide](https://developers.openai.com/api/docs/models)\nto browse and compare available models.\n",
+            "$ref": "#/components/schemas/ModelIdsResponses"
+          },
+          "background": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Whether to run the model response in the background.\n[Learn more](https://developers.openai.com/api/docs/guides/background).\n",
+                "default": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_tool_calls": {
+            "anyOf": [
+              {
+                "description": "The maximum number of total calls to built-in tools that can be processed in a response. This maximum number applies across all built-in tool calls, not per individual tool. Any further attempts to call a tool by the model will be ignored.\n",
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "text": {
+            "$ref": "#/components/schemas/ResponseTextParam"
+          },
+          "tools": {
+            "$ref": "#/components/schemas/ToolsArray"
+          },
+          "tool_choice": {
+            "$ref": "#/components/schemas/ToolChoiceParam"
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/Prompt"
+          }
+        }
+      },
+      "ResponseQueuedEvent": {
+        "type": "object",
+        "title": "ResponseQueuedEvent",
+        "description": "Emitted when a response is queued and waiting to be processed.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.queued"
+            ],
+            "description": "The type of the event. Always 'response.queued'.",
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/Response",
+            "description": "The full response object that is queued."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.queued",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.queued\",\n  \"response\": {\n    \"id\": \"res_123\",\n    \"status\": \"queued\",\n    \"created_at\": \"2021-01-01T00:00:00Z\",\n    \"updated_at\": \"2021-01-01T00:00:00Z\"\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseReasoningSummaryPartAddedEvent": {
+        "type": "object",
+        "description": "Emitted when a new reasoning summary part is added.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_summary_part.added`.\n",
+            "enum": [
+              "response.reasoning_summary_part.added"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this summary part is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this summary part is associated with.\n"
+          },
+          "summary_index": {
+            "type": "integer",
+            "description": "The index of the summary part within the reasoning summary.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          },
+          "part": {
+            "type": "object",
+            "description": "The summary part that was added.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The type of the summary part. Always `summary_text`.",
+                "enum": [
+                  "summary_text"
+                ],
+                "x-stainless-const": true
+              },
+              "text": {
+                "type": "string",
+                "description": "The text of the summary part."
+              }
+            },
+            "required": [
+              "type",
+              "text"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "part",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_summary_part.added",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_summary_part.added\",\n  \"item_id\": \"rs_6806bfca0b2481918a5748308061a2600d3ce51bdffd5476\",\n  \"output_index\": 0,\n  \"summary_index\": 0,\n  \"part\": {\n    \"type\": \"summary_text\",\n    \"text\": \"\"\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseReasoningSummaryPartDoneEvent": {
+        "type": "object",
+        "description": "Emitted when a reasoning summary part is completed.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_summary_part.done`.\n",
+            "enum": [
+              "response.reasoning_summary_part.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this summary part is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this summary part is associated with.\n"
+          },
+          "summary_index": {
+            "type": "integer",
+            "description": "The index of the summary part within the reasoning summary.\n"
+          },
+          "status": {
+            "type": "string",
+            "description": "The completion status of the summary part. Omitted when the part completed\nnormally and set to `incomplete` when generation was interrupted.\n",
+            "enum": [
+              "incomplete"
+            ]
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          },
+          "part": {
+            "type": "object",
+            "description": "The completed summary part.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The type of the summary part. Always `summary_text`.",
+                "enum": [
+                  "summary_text"
+                ],
+                "x-stainless-const": true
+              },
+              "text": {
+                "type": "string",
+                "description": "The text of the summary part."
+              }
+            },
+            "required": [
+              "type",
+              "text"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "part",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_summary_part.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_summary_part.done\",\n  \"item_id\": \"rs_6806bfca0b2481918a5748308061a2600d3ce51bdffd5476\",\n  \"output_index\": 0,\n  \"summary_index\": 0,\n  \"part\": {\n    \"type\": \"summary_text\",\n    \"text\": \"**Responding to a greeting**\\n\\nThe user just said, \\\"Hello!\\\" So, it seems I need to engage. I'll greet them back and offer help since they're looking to chat. I could say something like, \\\"Hello! How can I assist you today?\\\" That feels friendly and open. They didn't ask a specific question, so this approach will work well for starting a conversation. Let's see where it goes from there!\"\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseReasoningSummaryTextDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when a delta is added to a reasoning summary text.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_summary_text.delta`.\n",
+            "enum": [
+              "response.reasoning_summary_text.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this summary text delta is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this summary text delta is associated with.\n"
+          },
+          "summary_index": {
+            "type": "integer",
+            "description": "The index of the summary part within the reasoning summary.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta that was added to the summary.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_summary_text.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_summary_text.delta\",\n  \"item_id\": \"rs_6806bfca0b2481918a5748308061a2600d3ce51bdffd5476\",\n  \"output_index\": 0,\n  \"summary_index\": 0,\n  \"delta\": \"**Responding to a greeting**\\n\\nThe user just said, \\\"Hello!\\\" So, it seems I need to engage. I'll greet them back and offer help since they're looking to chat. I could say something like, \\\"Hello! How can I assist you today?\\\" That feels friendly and open. They didn't ask a specific question, so this approach will work well for starting a conversation. Let's see where it goes from there!\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseReasoningSummaryTextDoneEvent": {
+        "type": "object",
+        "description": "Emitted when a reasoning summary text is completed.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_summary_text.done`.\n",
+            "enum": [
+              "response.reasoning_summary_text.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this summary text is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this summary text is associated with.\n"
+          },
+          "summary_index": {
+            "type": "integer",
+            "description": "The index of the summary part within the reasoning summary.\n"
+          },
+          "text": {
+            "type": "string",
+            "description": "The full text of the completed reasoning summary.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "text",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_summary_text.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_summary_text.done\",\n  \"item_id\": \"rs_6806bfca0b2481918a5748308061a2600d3ce51bdffd5476\",\n  \"output_index\": 0,\n  \"summary_index\": 0,\n  \"text\": \"**Responding to a greeting**\\n\\nThe user just said, \\\"Hello!\\\" So, it seems I need to engage. I'll greet them back and offer help since they're looking to chat. I could say something like, \\\"Hello! How can I assist you today?\\\" That feels friendly and open. They didn't ask a specific question, so this approach will work well for starting a conversation. Let's see where it goes from there!\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseReasoningTextDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when a delta is added to a reasoning text.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_text.delta`.\n",
+            "enum": [
+              "response.reasoning_text.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this reasoning text delta is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this reasoning text delta is associated with.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the reasoning content part this delta is associated with.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta that was added to the reasoning content.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_text.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_text.delta\",\n  \"item_id\": \"rs_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"delta\": \"The\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseReasoningTextDoneEvent": {
+        "type": "object",
+        "description": "Emitted when a reasoning text is completed.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_text.done`.\n",
+            "enum": [
+              "response.reasoning_text.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this reasoning text is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this reasoning text is associated with.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the reasoning content part.\n"
+          },
+          "text": {
+            "type": "string",
+            "description": "The full text of the completed reasoning content.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "text",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_text.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_text.done\",\n  \"item_id\": \"rs_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"text\": \"The user is asking...\",\n  \"sequence_number\": 4\n}\n"
+        }
+      },
+      "ResponseRefusalDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is a partial refusal text.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.refusal.delta`.\n",
+            "enum": [
+              "response.refusal.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the refusal text is added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the refusal text is added to.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that the refusal text is added to.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "The refusal text that is added.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.refusal.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.refusal.delta\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"delta\": \"refusal text so far\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseRefusalDoneEvent": {
+        "type": "object",
+        "description": "Emitted when refusal text is finalized.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.refusal.done`.\n",
+            "enum": [
+              "response.refusal.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the refusal text is finalized.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the refusal text is finalized.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that the refusal text is finalized.\n"
+          },
+          "refusal": {
+            "type": "string",
+            "description": "The refusal text that is finalized.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "refusal",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.refusal.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.refusal.done\",\n  \"item_id\": \"item-abc\",\n  \"output_index\": 1,\n  \"content_index\": 2,\n  \"refusal\": \"final refusal text\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseSteerAcceptedEvent": {
+        "type": "object",
+        "title": "ResponseSteerAcceptedEvent",
+        "description": "Emitted when steering input has been validated and queued. Acceptance means\nthe server owns the input, not that it has been applied. The successor's\n`response.created` event is the commit point. If accepted input cannot be\ncommitted, `response.steer.failed` returns it with the same steering ID.\n\nWhen the response stops for client-owned tool output or approval, the input\nremains queued and `response.steer.pending` is emitted after\n`response.completed`. Fill the pending event's `required_input` stubs with\nsaved results and send one matching explicit `response.create` per parent.\nDo not resend accepted input while it is still queued.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.steer.accepted"
+            ],
+            "description": "The event discriminator. Always `response.steer.accepted`.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "steer": {
+            "type": "object",
+            "description": "The accepted steering submission.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID assigned to the steering submission."
+              },
+              "previous_response_id": {
+                "type": "string",
+                "description": "The ID of the response being steered."
+              }
+            },
+            "required": [
+              "id",
+              "previous_response_id"
+            ]
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The WebSocket lane that emitted this event. This field is present when\nthe target response's `response.create` event supplied a `stream_id`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "sequence_number",
+          "steer"
+        ],
+        "x-oaiMeta": {
+          "name": "response.steer.accepted",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.steer.accepted\",\n  \"sequence_number\": 2,\n  \"steer\": {\n    \"id\": \"steer_456\",\n    \"previous_response_id\": \"resp_123\"\n  }\n}\n"
+        }
+      },
+      "ResponseSteerErrorCode": {
+        "title": "ResponseSteerErrorCode",
+        "description": "A machine-readable steering error code. Clients should handle unknown\nvalues because additional codes may be introduced. Known values include:\n- `response_not_found`: The target response is not available on this connection.\n- `invalid_input`: The event or input failed validation.\n- `steering_not_supported`: The model or response execution mode does not support steering.\n- `too_many_pending_steers`: Too much steering input is pending for the response.\n- `response_already_completed`: The response completed and is no longer accepting steering input.\n- `response_not_active`: The response is no longer accepting steering input.\n- `successor_creation_failed`: The successor response could not be created.\n",
+        "anyOf": [
+          {
+            "type": "string",
+            "enum": [
+              "response_not_found",
+              "invalid_input",
+              "steering_not_supported",
+              "too_many_pending_steers",
+              "response_already_completed",
+              "response_not_active",
+              "successor_creation_failed"
+            ]
+          },
+          {
+            "type": "string"
+          }
+        ]
+      },
+      "ResponseSteerEvent": {
+        "type": "object",
+        "title": "ResponseSteerEvent",
+        "additionalProperties": false,
+        "description": "Queues user input to steer a response on this WebSocket connection. Input\ncan contain text, images, and files. Steering is supported only for\nsingle-agent responses on models and execution modes that support steering.\nResponses bound to a conversation or using automatic compaction do not\nsupport steering.\n\nA `response.steer.accepted` event acknowledges that the server owns the\nqueued input, not that it has been applied. The successor's `response.created`\nevent is the commit point. Input that cannot be committed is returned in\n`response.steer.failed`.\n\nSteering may cause the active response to finish at a safe output boundary\nwith `response.incomplete` and `incomplete_details.reason` set to `steered`,\nfollowed automatically by a successor `response.created`. Normal completion\ncan also be followed by an automatic successor. Automatic successors inherit\nthe previous response's settings and continue from it with the queued input.\n\nIf the response stops for client-owned tool output or approval, accepted\nsteering input remains queued and `response.steer.pending` is emitted after\n`response.completed`. Fill the `required_input` stubs from that event with\nsaved tool results or approval decisions, and send one explicit\n`response.create` per parent with the same `previous_response_id` and\nWebSocket lane. Do not rerun tools or resend accepted steering input. The\nqueued input is prepended in submission order to that request's input, and\nthe explicit request retains its own settings.\n\nThis event accepts only `type`, `previous_response_id`, and `input`. Do not\nsend `stream_id`; the target response determines the WebSocket lane.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.steer"
+            ],
+            "description": "The event discriminator. Always `response.steer`.",
+            "x-stainless-const": true
+          },
+          "previous_response_id": {
+            "type": "string",
+            "description": "The ID of the response to steer on this WebSocket connection."
+          },
+          "input": {
+            "$ref": "#/components/schemas/ResponseSteerInput"
+          }
+        },
+        "required": [
+          "type",
+          "previous_response_id",
+          "input"
+        ],
+        "x-oaiMeta": {
+          "name": "response.steer",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.steer\",\n  \"previous_response_id\": \"resp_123\",\n  \"input\": [\n    {\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"Prioritize the database rollout.\"\n        }\n      ]\n    }\n  ]\n}\n"
+        }
+      },
+      "ResponseSteerFailedEvent": {
+        "type": "object",
+        "title": "ResponseSteerFailedEvent",
+        "description": "Emitted when steering input is rejected or cannot be committed to a\nsuccessor response. Returns the original, uncommitted input so the client\ncan carry it into `response.create` when appropriate. Invalid input must\nbe corrected before retrying.\n\nFailures after acceptance include the same steering ID. Failures before an\nID is allocated omit `steer.id`. A lost connection or missing acknowledgement\nleaves the outcome unknown; it is not proof that the input was rejected.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.steer.failed"
+            ],
+            "description": "The event discriminator. Always `response.steer.failed`.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "steer": {
+            "type": "object",
+            "description": "The steering submission that could not be committed.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID assigned to the steering submission, if one was allocated.\n"
+              },
+              "previous_response_id": {
+                "type": "string",
+                "description": "The ID of the response that was targeted for steering."
+              },
+              "input": {
+                "$ref": "#/components/schemas/ResponseSteerInput"
+              }
+            },
+            "required": [
+              "previous_response_id",
+              "input"
+            ]
+          },
+          "error": {
+            "type": "object",
+            "description": "Information about why the input could not be committed.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "invalid_request_error"
+                ],
+                "description": "The error type. Always `invalid_request_error`.",
+                "x-stainless-const": true
+              },
+              "code": {
+                "$ref": "#/components/schemas/ResponseSteerErrorCode"
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable description of the error."
+              }
+            },
+            "required": [
+              "type",
+              "code",
+              "message"
+            ]
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The WebSocket lane that emitted this event, when the target response is\navailable and its `response.create` event supplied a `stream_id`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "sequence_number",
+          "steer",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "response.steer.failed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.steer.failed\",\n  \"sequence_number\": 5,\n  \"steer\": {\n    \"id\": \"steer_456\",\n    \"previous_response_id\": \"resp_123\",\n    \"input\": [\n      {\n        \"type\": \"message\",\n        \"role\": \"user\",\n        \"content\": [\n          {\n            \"type\": \"input_text\",\n            \"text\": \"Prioritize the database rollout.\"\n          }\n        ]\n      }\n    ]\n  },\n  \"error\": {\n    \"type\": \"invalid_request_error\",\n    \"code\": \"successor_creation_failed\",\n    \"message\": \"We couldn't start the next response. Send this steering input again with response.create.\"\n  }\n}\n"
+        }
+      },
+      "ResponseSteerInput": {
+        "title": "ResponseSteerInput",
+        "description": "Input to queue for a continuation of the response. Uses the same string or\ninput-item shape as `response.create.input`, with a non-empty array when\nsupplying input items.\n\nSteering accepts only messages with the `user` role. Each message may\ncontain only `type`, `role`, and `content`, with `content` as a string or an\narray of `input_text`, `input_image`, and `input_file` parts. The optional\n`type` must be `message`. Other roles, tool outputs, and item types are not\nsupported for steering.\n",
+        "oneOf": [
+          {
+            "type": "string",
+            "title": "Text input",
+            "description": "A text input, equivalent to a message with the `user` role."
+          },
+          {
+            "$ref": "#/components/schemas/ResponseSteerInputItemList"
+          }
+        ]
+      },
+      "ResponseSteerInputItem": {
+        "title": "Response steer input item",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/UserMessageItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionCallOutputItemParam"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ResponseSteerInputItemList": {
+        "type": "array",
+        "title": "Response steer input item list",
+        "description": "A non-empty list of message inputs to queue for the response.",
+        "minItems": 1,
+        "items": {
+          "$ref": "#/components/schemas/ResponseSteerInputItem"
+        }
+      },
+      "ResponseSteerPendingEvent": {
+        "type": "object",
+        "title": "ResponseSteerPendingEvent",
+        "description": "Emitted when accepted steering input remains queued after the target\nresponse completes. The server still owns the input. Do not resend it.\nThe successor's `response.created` event is the commit point.\n\nWhen `reason` is `waiting_for_required_input`, this event follows\n`response.completed` while the response waits for the tool results or\napproval decisions identified by `required_input`. Copy those stubs, fill\ntheir result fields using the ordinary `response.create` input schemas,\nand submit one continuation per parent with the same `previous_response_id`\nand WebSocket lane. Use saved results without rerunning tools. The queued\nsteering input is prepended in submission order to the continuation's\ninput. That explicit request retains its own settings.\n\nThis notification is emitted at most once per steering submission. Multiple\nsubmissions for the same parent can report the same required inputs; they\ndo not each require a separate continuation.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.steer.pending"
+            ],
+            "description": "The event discriminator. Always `response.steer.pending`.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "steer": {
+            "type": "object",
+            "description": "The steering submission that remains queued.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID assigned to the steering submission."
+              },
+              "previous_response_id": {
+                "type": "string",
+                "description": "The ID of the response being steered."
+              }
+            },
+            "required": [
+              "id",
+              "previous_response_id"
+            ]
+          },
+          "reason": {
+            "$ref": "#/components/schemas/ResponseSteerPendingReason"
+          },
+          "required_input": {
+            "type": "array",
+            "minItems": 1,
+            "description": "Input stubs identifying outstanding client-owned tool results or\napproval decisions. Each stub contains identifying fields only; the\nclient supplies the result before including it in `response.create`.\n",
+            "items": {
+              "$ref": "#/components/schemas/ResponseSteerRequiredInput"
+            }
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The WebSocket lane that emitted this event. This field is present when\nthe target response's `response.create` event supplied a `stream_id`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "sequence_number",
+          "steer",
+          "reason",
+          "required_input"
+        ],
+        "x-oaiMeta": {
+          "name": "response.steer.pending",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.steer.pending\",\n  \"sequence_number\": 10,\n  \"steer\": {\n    \"id\": \"steer_456\",\n    \"previous_response_id\": \"resp_123\"\n  },\n  \"reason\": \"waiting_for_required_input\",\n  \"required_input\": [\n    {\n      \"type\": \"function_call_output\",\n      \"call_id\": \"call_789\",\n      \"name\": \"lookup\"\n    }\n  ]\n}\n"
+        }
+      },
+      "ResponseSteerPendingReason": {
+        "title": "ResponseSteerPendingReason",
+        "description": "An extensible enum describing why accepted steering input is still queued.\nClients should handle unknown values because additional reasons may be\nintroduced. Known values include:\n- `waiting_for_required_input`: The response is waiting for the tool results or approval decisions identified by `required_input`.\n",
+        "anyOf": [
+          {
+            "type": "string",
+            "enum": [
+              "waiting_for_required_input"
+            ]
+          },
+          {
+            "type": "string"
+          }
+        ]
+      },
+      "ResponseSteerRequiredInput": {
+        "title": "ResponseSteerRequiredInput",
+        "description": "An input stub identifying an outstanding client-owned tool result or\napproval decision. Copy the stub and fill the result fields using the\ncorresponding `response.create` input schema. Use saved results without\nrerunning the tool. The server does not supply results, approval decisions,\nor safety acknowledgements in these stubs.\n",
+        "oneOf": [
+          {
+            "type": "object",
+            "title": "Required function tool call output",
+            "additionalProperties": false,
+            "description": "Supply `output` using the function tool call output input schema.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "function_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id",
+              "name"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required custom tool call output",
+            "additionalProperties": false,
+            "description": "Supply `output` using the custom tool call output input schema. The\noriginal custom tool call supplies the tool's name.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "custom_tool_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required computer tool call output",
+            "additionalProperties": false,
+            "description": "Supply `output` using the computer tool call output input schema,\nincluding any required `acknowledged_safety_checks`.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "computer_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required shell tool call output",
+            "additionalProperties": false,
+            "description": "Supply `output` using the shell tool call output input schema. Each\noutput entry includes `stdout`, `stderr`, and `outcome`.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "shell_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required apply patch tool call output",
+            "additionalProperties": false,
+            "description": "Supply `status` and optional `output` using the apply patch tool call\noutput input schema.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "apply_patch_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required tool search output",
+            "additionalProperties": false,
+            "description": "Supply `tools` using the tool search output input schema, retaining\n`execution: \"client\"`.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "tool_search_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              },
+              "execution": {
+                "type": "string",
+                "enum": [
+                  "client"
+                ],
+                "x-stainless-const": true
+              }
+            },
+            "required": [
+              "type",
+              "call_id",
+              "execution"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required MCP approval response",
+            "additionalProperties": false,
+            "description": "Supply `approve` using the MCP approval response input schema. An\noptional `reason` can be supplied when denying the request. The original\napproval request identifies the tool and server.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "mcp_approval_response"
+                ],
+                "x-stainless-const": true
+              },
+              "approval_request_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "approval_request_id"
+            ]
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ResponseStreamEvent": {
+        "description": "Event emitted while a response is streamed.",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ResponseAudioDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseAudioDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseAudioTranscriptDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseAudioTranscriptDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCodeInterpreterCallCodeDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCodeInterpreterCallCodeDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCodeInterpreterCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCodeInterpreterCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCodeInterpreterCallInterpretingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseContentPartAddedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseContentPartDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCreatedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseErrorEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFileSearchCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFileSearchCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFileSearchCallSearchingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFunctionCallArgumentsDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFunctionCallArgumentsDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseShellCallCommandAddedStreamingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseShellCallCommandDeltaStreamingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseShellCallCommandDoneStreamingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseShellCallOutputContentDeltaStreamingEvent",
+            "x-stainless-skip": [
+              "go"
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/ResponseShellCallOutputContentDoneStreamingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFailedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseIncompleteEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseOutputItemAddedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseOutputItemDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseReasoningSummaryPartAddedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseReasoningSummaryPartDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseReasoningSummaryTextDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseReasoningSummaryTextDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseReasoningTextDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseReasoningTextDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseRefusalDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseRefusalDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseTextDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseTextDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseWebSearchCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseWebSearchCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseWebSearchCallSearchingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseImageGenCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseImageGenCallGeneratingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseImageGenCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseImageGenCallPartialImageEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseMCPCallArgumentsDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseMCPCallArgumentsDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseMCPCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseMCPCallFailedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseMCPCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseMCPListToolsCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseMCPListToolsFailedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseMCPListToolsInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseOutputTextAnnotationAddedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseQueuedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCustomToolCallInputDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseCustomToolCallInputDoneEvent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ResponseStreamOptions": {
+        "anyOf": [
+          {
+            "description": "Options for streaming responses. Only set this when you set `stream: true`.\n",
+            "type": "object",
+            "default": null,
+            "properties": {
+              "include_obfuscation": {
+                "type": "boolean",
+                "description": "When true, stream obfuscation will be enabled. Stream obfuscation adds\nrandom characters to an `obfuscation` field on streaming delta events to\nnormalize payload sizes as a mitigation to certain side-channel attacks.\nThese obfuscation fields are included by default, but add a small amount\nof overhead to the data stream. You can set `include_obfuscation` to\nfalse to optimize for bandwidth if you trust the network links between\nyour application and the OpenAI API.\n"
+              }
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "ResponseTextDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is an additional text delta.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.output_text.delta`.\n",
+            "enum": [
+              "response.output_text.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the text delta was added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the text delta was added to.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that the text delta was added to.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta that was added.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "logprobs": {
+            "type": "array",
+            "description": "The log probabilities of the tokens in the delta.\n",
+            "items": {
+              "$ref": "#/components/schemas/ResponseLogProb"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta",
+          "sequence_number",
+          "logprobs"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_text.delta\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"delta\": \"In\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseTextDoneEvent": {
+        "type": "object",
+        "description": "Emitted when text content is finalized.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.output_text.done`.\n",
+            "enum": [
+              "response.output_text.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the text content is finalized.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the text content is finalized.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that the text content is finalized.\n"
+          },
+          "text": {
+            "type": "string",
+            "description": "The text content that is finalized.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "logprobs": {
+            "type": "array",
+            "description": "The log probabilities of the tokens in the delta.\n",
+            "items": {
+              "$ref": "#/components/schemas/ResponseLogProb"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "text",
+          "sequence_number",
+          "logprobs"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_text.done\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"text\": \"In a shimmering forest under a sky full of stars, a lonely unicorn named Lila discovered a hidden pond that glowed with moonlight. Every night, she would leave sparkling, magical flowers by the water's edge, hoping to share her beauty with others. One enchanting evening, she woke to find a group of friendly animals gathered around, eager to be friends and share in her magic.\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "ResponseTextParam": {
+        "type": "object",
+        "description": "Configuration options for a text response from the model. Can be plain\ntext or structured JSON data. Learn more:\n- [Text inputs and outputs](https://developers.openai.com/api/docs/guides/text)\n- [Structured Outputs](https://developers.openai.com/api/docs/guides/structured-outputs)\n",
+        "properties": {
+          "format": {
+            "$ref": "#/components/schemas/TextResponseFormatConfiguration"
+          },
+          "verbosity": {
+            "$ref": "#/components/schemas/Verbosity"
+          }
+        }
+      },
+      "ResponseUsage": {
+        "type": "object",
+        "description": "Represents token usage details including input tokens, output tokens,\na breakdown of output tokens, and the total tokens used.\n",
+        "properties": {
+          "input_tokens": {
+            "type": "integer",
+            "description": "The number of input tokens."
+          },
+          "input_tokens_details": {
+            "type": "object",
+            "description": "A detailed breakdown of the input tokens.",
+            "properties": {
+              "cached_tokens": {
+                "type": "integer",
+                "description": "The number of tokens that were retrieved from the cache.\n[More on prompt caching](https://developers.openai.com/api/docs/guides/prompt-caching).\n"
+              },
+              "cache_write_tokens": {
+                "type": "integer",
+                "description": "The number of input tokens that were written to the cache."
+              }
+            },
+            "required": [
+              "cached_tokens",
+              "cache_write_tokens"
+            ]
+          },
+          "output_tokens": {
+            "type": "integer",
+            "description": "The number of output tokens."
+          },
+          "output_tokens_details": {
+            "type": "object",
+            "description": "A detailed breakdown of the output tokens.",
+            "properties": {
+              "reasoning_tokens": {
+                "type": "integer",
+                "description": "The number of reasoning tokens."
+              }
+            },
+            "required": [
+              "reasoning_tokens"
+            ]
+          },
+          "total_tokens": {
+            "type": "integer",
+            "description": "The total number of tokens used."
+          }
+        },
+        "required": [
+          "input_tokens",
+          "input_tokens_details",
+          "output_tokens",
+          "output_tokens_details",
+          "total_tokens"
+        ]
+      },
+      "ResponseWebSearchCallCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when a web search call is completed.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.web_search_call.completed`.\n",
+            "enum": [
+              "response.web_search_call.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the web search call is associated with.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique ID for the output item associated with the web search call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the web search call being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.web_search_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.web_search_call.completed\",\n  \"output_index\": 0,\n  \"item_id\": \"ws_123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "ResponseWebSearchCallInProgressEvent": {
+        "type": "object",
+        "description": "Emitted when a web search call is initiated.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.web_search_call.in_progress`.\n",
+            "enum": [
+              "response.web_search_call.in_progress"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the web search call is associated with.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique ID for the output item associated with the web search call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the web search call being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.web_search_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.web_search_call.in_progress\",\n  \"output_index\": 0,\n  \"item_id\": \"ws_123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "ResponseWebSearchCallSearchingEvent": {
+        "type": "object",
+        "description": "Emitted when a web search call is executing.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.web_search_call.searching`.\n",
+            "enum": [
+              "response.web_search_call.searching"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the web search call is associated with.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique ID for the output item associated with the web search call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the web search call being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.web_search_call.searching",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.web_search_call.searching\",\n  \"output_index\": 0,\n  \"item_id\": \"ws_123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "ResponseWsError": {
+        "type": "object",
+        "title": "ResponseWsError",
+        "description": "Emitted when an error occurs while processing a Responses WebSocket request.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `error`.",
+            "enum": [
+              "error"
+            ],
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "integer",
+            "description": "The HTTP status code associated with a WebSocket protocol error."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of an error emitted by the response stream."
+          },
+          "error": {
+            "$ref": "#/components/schemas/ErrorPayload",
+            "description": "Details about the error."
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The WebSocket lane that emitted this event. This field is present when the\noriginating `response.create` event supplied a `stream_id`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "error",
+          "group": "responses",
+          "example": "{\n  \"type\": \"error\",\n  \"status\": 400,\n  \"stream_id\": \"agent_1\",\n  \"error\": {\n    \"type\": \"invalid_request_error\",\n    \"code\": \"websocket_stream_limit_reached\",\n    \"message\": \"This WebSocket connection has reached its stream limit.\",\n    \"param\": \"stream_id\"\n  }\n}\n"
+        }
+      },
+      "ResponsesClientEvent": {
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "description": "Client events accepted by the Responses WebSocket server.\n",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ResponsesClientEventResponseCreate"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseSteerEvent"
+          }
+        ]
+      },
+      "ResponsesClientEventResponseCreate": {
+        "allOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "response.create"
+                ],
+                "description": "The type of the client event. Always `response.create`.\n",
+                "x-stainless-const": true
+              },
+              "stream_id": {
+                "type": "string",
+                "minLength": 1,
+                "maxLength": 256,
+                "pattern": "^[A-Za-z0-9_.-]+$",
+                "description": "The WebSocket lane for this response. Requests with the same\n`stream_id` are processed FIFO, and events for the response echo the\nsame `stream_id`.\n\n`stream_id` controls routing; `previous_response_id` controls\nconversation lineage, so a new lane can fork from a response created\non another lane.\n"
+              }
+            },
+            "required": [
+              "type"
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/CreateResponse"
+          }
+        ],
+        "description": "Client event for creating a response over a persistent WebSocket connection.\nThis payload uses the same top-level fields as `POST /v1/responses`, plus\nWebSocket-only envelope metadata.\n\nNotes:\n- `stream` is implicit over WebSocket and should not be sent.\n- `background` is not supported over WebSocket.\n- `stream_id` is WebSocket-only and is not part of `POST /v1/responses`.\n",
+        "x-oaiMeta": {
+          "example": "{\n  \"type\": \"response.create\",\n  \"stream_id\": \"agent_1\",\n  \"model\": \"gpt-6-astra\",\n  \"input\": \"Say hello.\"\n}\n"
+        }
+      },
+      "ResponsesServerEvent": {
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "description": "Server events emitted by the Responses WebSocket server.\n",
+        "anyOf": [
+          {
+            "title": "ResponseAudioWsDelta",
+            "description": "Emitted when there is a partial audio response.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseAudioDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseAudioWsDone",
+            "description": "Emitted when the audio response is complete.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseAudioDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseAudioTranscriptWsDelta",
+            "description": "Emitted when there is a partial transcript of audio.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseAudioTranscriptDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseAudioTranscriptWsDone",
+            "description": "Emitted when the full audio transcript is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseAudioTranscriptDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseCodeInterpreterCallCodeWsDelta",
+            "description": "Emitted when a partial code snippet is streamed by the code interpreter.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallCodeDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseCodeInterpreterCallCodeWsDone",
+            "description": "Emitted when the code snippet is finalized by the code interpreter.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallCodeDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseCodeInterpreterCallWsCompleted",
+            "description": "Emitted when the code interpreter call is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseCodeInterpreterCallInWsProgress",
+            "description": "Emitted when a code interpreter call is in progress.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseCodeInterpreterCallWsInterpreting",
+            "description": "Emitted when the code interpreter is actively interpreting the code snippet.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallInterpretingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseWsCompleted",
+            "description": "Emitted when the model response is complete.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseContentPartWsAdded",
+            "description": "Emitted when a new content part is added.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseContentPartAddedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseContentPartWsDone",
+            "description": "Emitted when a content part is done.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseContentPartDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseWsCreated",
+            "description": "An event that is emitted when a response is created.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCreatedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseFileSearchCallWsCompleted",
+            "description": "Emitted when a file search call is completed (results found).",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseFileSearchCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseFileSearchCallInWsProgress",
+            "description": "Emitted when a file search call is initiated.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseFileSearchCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseFileSearchCallWsSearching",
+            "description": "Emitted when a file search is currently searching.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseFileSearchCallSearchingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseFunctionCallArgumentsWsDelta",
+            "description": "Emitted when there is a partial function-call arguments delta.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseFunctionCallArgumentsDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseFunctionCallArgumentsWsDone",
+            "description": "Emitted when function-call arguments are finalized.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseFunctionCallArgumentsDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseShellCallCommandWsAdded",
+            "description": "A streaming event that indicated a shell command was added to a tool call.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseShellCallCommandAddedStreamingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseShellCallCommandWsDelta",
+            "description": "A streaming event that indicated a shell command was incrementally updated.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseShellCallCommandDeltaStreamingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseShellCallCommandWsDone",
+            "description": "A streaming event that indicated a shell command was completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseShellCallCommandDoneStreamingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseShellCallOutputContentWsDelta",
+            "description": "A streaming event that indicated shell call output was incrementally added.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseShellCallOutputContentDeltaStreamingEvent",
+                "x-stainless-skip": [
+                  "go"
+                ]
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseShellCallOutputContentWsDone",
+            "description": "A streaming event that indicated shell call output was completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseShellCallOutputContentDoneStreamingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseInWsProgress",
+            "description": "Emitted when the response is in progress.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseWsFailed",
+            "description": "An event that is emitted when a response fails.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseFailedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseWsIncomplete",
+            "description": "An event that is emitted when a response finishes as incomplete.\n\nOver WebSocket, steering can finish a response with\n`response.incomplete_details.reason` set to `steered`, followed automatically\nby a successor `response.created` that commits the queued steering input.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseIncompleteEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseOutputItemWsAdded",
+            "description": "Emitted when a new output item is added.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseOutputItemAddedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseOutputItemWsDone",
+            "description": "Emitted when an output item is marked done.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseOutputItemDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseReasoningSummaryPartWsAdded",
+            "description": "Emitted when a new reasoning summary part is added.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseReasoningSummaryPartAddedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseReasoningSummaryPartWsDone",
+            "description": "Emitted when a reasoning summary part is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseReasoningSummaryPartDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseReasoningSummaryTextWsDelta",
+            "description": "Emitted when a delta is added to a reasoning summary text.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseReasoningSummaryTextDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseReasoningSummaryTextWsDone",
+            "description": "Emitted when a reasoning summary text is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseReasoningSummaryTextDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseReasoningTextWsDelta",
+            "description": "Emitted when a delta is added to a reasoning text.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseReasoningTextDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseReasoningTextWsDone",
+            "description": "Emitted when a reasoning text is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseReasoningTextDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseRefusalWsDelta",
+            "description": "Emitted when there is a partial refusal text.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseRefusalDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseRefusalWsDone",
+            "description": "Emitted when refusal text is finalized.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseRefusalDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseTextWsDelta",
+            "description": "Emitted when there is an additional text delta.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseTextDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseTextWsDone",
+            "description": "Emitted when text content is finalized.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseTextDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseWebSearchCallWsCompleted",
+            "description": "Emitted when a web search call is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseWebSearchCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseWebSearchCallInWsProgress",
+            "description": "Emitted when a web search call is initiated.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseWebSearchCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseWebSearchCallWsSearching",
+            "description": "Emitted when a web search call is executing.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseWebSearchCallSearchingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseImageGenCallWsCompleted",
+            "description": "Emitted when an image generation tool call has completed and the final image is available.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseImageGenCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseImageGenCallWsGenerating",
+            "description": "Emitted when an image generation tool call is actively generating an image (intermediate state).\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseImageGenCallGeneratingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseImageGenCallInWsProgress",
+            "description": "Emitted when an image generation tool call is in progress.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseImageGenCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseImageGenCallPartialWsImage",
+            "description": "Emitted when a partial image is available during image generation streaming.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseImageGenCallPartialImageEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseMcpCallArgumentsWsDelta",
+            "description": "Emitted when there is a delta (partial update) to the arguments of an MCP tool call.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallArgumentsDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseMcpCallArgumentsWsDone",
+            "description": "Emitted when the arguments for an MCP tool call are finalized.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallArgumentsDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseMcpCallWsCompleted",
+            "description": "Emitted when an MCP  tool call has completed successfully.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseMcpCallWsFailed",
+            "description": "Emitted when an MCP  tool call has failed.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallFailedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseMcpCallInWsProgress",
+            "description": "Emitted when an MCP  tool call is in progress.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseMcpListToolsWsCompleted",
+            "description": "Emitted when the list of available MCP tools has been successfully retrieved.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseMCPListToolsCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseMcpListToolsWsFailed",
+            "description": "Emitted when the attempt to list available MCP tools has failed.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseMCPListToolsFailedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseMcpListToolsInWsProgress",
+            "description": "Emitted when the system is in the process of retrieving the list of available MCP tools.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseMCPListToolsInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseOutputTextAnnotationWsAdded",
+            "description": "Emitted when an annotation is added to output text content.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseOutputTextAnnotationAddedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseWsQueued",
+            "description": "Emitted when a response is queued and waiting to be processed.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseQueuedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseCustomToolCallInputWsDelta",
+            "description": "Event representing a delta (partial update) to the input of a custom tool call.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCustomToolCallInputDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "ResponseCustomToolCallInputWsDone",
+            "description": "Event indicating that input for a custom tool call is complete.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ResponseCustomToolCallInputDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/ResponseWsError"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseSteerAcceptedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseSteerPendingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseSteerFailedEvent"
+          }
+        ]
+      },
+      "ResponsesWebSocketStreamEvent": {
+        "allOf": [
+          {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ResponseAudioDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseAudioDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseAudioTranscriptDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseAudioTranscriptDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallCodeDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallCodeDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCodeInterpreterCallInterpretingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseContentPartAddedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseContentPartDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCreatedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseFileSearchCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseFileSearchCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseFileSearchCallSearchingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseFunctionCallArgumentsDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseFunctionCallArgumentsDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseShellCallCommandAddedStreamingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseShellCallCommandDeltaStreamingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseShellCallCommandDoneStreamingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseShellCallOutputContentDeltaStreamingEvent",
+                "x-stainless-skip": [
+                  "go"
+                ]
+              },
+              {
+                "$ref": "#/components/schemas/ResponseShellCallOutputContentDoneStreamingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseFailedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseIncompleteEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseOutputItemAddedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseOutputItemDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseReasoningSummaryPartAddedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseReasoningSummaryPartDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseReasoningSummaryTextDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseReasoningSummaryTextDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseReasoningTextDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseReasoningTextDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseRefusalDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseRefusalDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseTextDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseTextDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseWebSearchCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseWebSearchCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseWebSearchCallSearchingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseImageGenCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseImageGenCallGeneratingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseImageGenCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseImageGenCallPartialImageEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallArgumentsDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallArgumentsDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallFailedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseMCPCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseMCPListToolsCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseMCPListToolsFailedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseMCPListToolsInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseOutputTextAnnotationAddedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseQueuedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCustomToolCallInputDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/ResponseCustomToolCallInputDoneEvent"
+              }
+            ]
+          },
+          {
+            "type": "object",
+            "properties": {
+              "stream_id": {
+                "type": "string",
+                "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+              }
+            }
+          }
+        ]
+      },
+      "Role": {
+        "type": "object",
+        "description": "Details about a role that can be assigned through the public Roles API.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "role"
+            ],
+            "description": "Always `role`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Identifier for the role."
+          },
+          "name": {
+            "type": "string",
+            "description": "Unique name for the role."
+          },
+          "description": {
+            "description": "Optional description of the role.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "permissions": {
+            "type": "array",
+            "description": "Permissions granted by the role.",
+            "items": {
+              "type": "string"
+            }
+          },
+          "resource_type": {
+            "type": "string",
+            "description": "Resource type the role is bound to (for example `api.organization` or `api.project`)."
+          },
+          "predefined_role": {
+            "type": "boolean",
+            "description": "Whether the role is predefined and managed by OpenAI."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "description",
+          "permissions",
+          "resource_type",
+          "predefined_role"
+        ],
+        "x-oaiMeta": {
+          "name": "The role object",
+          "example": "{\n    \"object\": \"role\",\n    \"id\": \"role_01J1F8ROLE01\",\n    \"name\": \"API Group Manager\",\n    \"description\": \"Allows managing organization groups\",\n    \"permissions\": [\n        \"api.groups.read\",\n        \"api.groups.write\"\n    ],\n    \"resource_type\": \"api.organization\",\n    \"predefined_role\": false\n}\n"
+        }
+      },
+      "RoleDeletedResource": {
+        "type": "object",
+        "description": "Confirmation payload returned after deleting a role.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "role.deleted"
+            ],
+            "description": "Always `role.deleted`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Identifier of the deleted role."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the role was deleted."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "deleted"
+        ],
+        "x-oaiMeta": {
+          "name": "Role deletion confirmation",
+          "example": "{\n    \"object\": \"role.deleted\",\n    \"id\": \"role_01J1F8ROLE01\",\n    \"deleted\": true\n}\n"
+        }
+      },
+      "RoleListResource": {
+        "type": "object",
+        "description": "Paginated list of roles assigned to a principal.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "Always `list`.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "Role assignments returned in the current page.",
+            "items": {
+              "$ref": "#/components/schemas/AssignedRoleDetails"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether additional assignments are available when paginating."
+          },
+          "next": {
+            "description": "Cursor to fetch the next page of results, or `null` when there are no more assignments.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "next"
+        ],
+        "x-oaiMeta": {
+          "name": "Assigned role list",
+          "example": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"role_01J1F8ROLE01\",\n            \"name\": \"API Group Manager\",\n            \"permissions\": [\n                \"api.groups.read\",\n                \"api.groups.write\"\n            ],\n            \"resource_type\": \"api.organization\",\n            \"predefined_role\": false,\n            \"description\": \"Allows managing organization groups\",\n            \"created_at\": 1711471533,\n            \"updated_at\": 1711472599,\n            \"created_by\": \"user_abc123\",\n            \"created_by_user_obj\": {\n                \"id\": \"user_abc123\",\n                \"name\": \"Ada Lovelace\",\n                \"email\": \"ada@example.com\"\n            },\n            \"metadata\": {},\n            \"assignment_sources\": null\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+        }
+      },
+      "RunCompletionUsage": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "Usage statistics related to the run. This value will be `null` if the run is not in a terminal state (i.e. `in_progress`, `queued`, etc.).",
+            "properties": {
+              "completion_tokens": {
+                "type": "integer",
+                "description": "Number of completion tokens used over the course of the run."
+              },
+              "prompt_tokens": {
+                "type": "integer",
+                "description": "Number of prompt tokens used over the course of the run."
+              },
+              "total_tokens": {
+                "type": "integer",
+                "description": "Total number of tokens used (prompt + completion)."
+              }
+            },
+            "required": [
+              "prompt_tokens",
+              "completion_tokens",
+              "total_tokens"
+            ]
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "RunGraderRequest": {
+        "type": "object",
+        "title": "RunGraderRequest",
+        "properties": {
+          "grader": {
+            "type": "object",
+            "description": "The grader used for the fine-tuning job.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/GraderStringCheck"
+              },
+              {
+                "$ref": "#/components/schemas/GraderTextSimilarity"
+              },
+              {
+                "$ref": "#/components/schemas/GraderPython"
+              },
+              {
+                "$ref": "#/components/schemas/GraderScoreModel"
+              },
+              {
+                "$ref": "#/components/schemas/GraderMulti"
+              }
+            ]
+          },
+          "item": {
+            "type": "object",
+            "description": "The dataset item provided to the grader. This will be used to populate\nthe `item` namespace. See [the guide](https://developers.openai.com/api/docs/guides/graders) for more details.\n"
+          },
+          "model_sample": {
+            "type": "string",
+            "description": "The model sample to be evaluated. This value will be used to populate\nthe `sample` namespace. See [the guide](https://developers.openai.com/api/docs/guides/graders) for more details.\nThe `output_json` variable will be populated if the model sample is a\nvalid JSON string.\n"
+          }
+        },
+        "required": [
+          "grader",
+          "model_sample"
+        ]
+      },
+      "RunGraderResponse": {
+        "type": "object",
+        "properties": {
+          "reward": {
+            "type": "number"
+          },
+          "metadata": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string"
+              },
+              "errors": {
+                "type": "object",
+                "properties": {
+                  "formula_parse_error": {
+                    "type": "boolean"
+                  },
+                  "sample_parse_error": {
+                    "type": "boolean"
+                  },
+                  "truncated_observation_error": {
+                    "type": "boolean"
+                  },
+                  "unresponsive_reward_error": {
+                    "type": "boolean"
+                  },
+                  "invalid_variable_error": {
+                    "type": "boolean"
+                  },
+                  "other_error": {
+                    "type": "boolean"
+                  },
+                  "python_grader_server_error": {
+                    "type": "boolean"
+                  },
+                  "python_grader_server_error_type": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "python_grader_runtime_error": {
+                    "type": "boolean"
+                  },
+                  "python_grader_runtime_error_details": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  },
+                  "model_grader_server_error": {
+                    "type": "boolean"
+                  },
+                  "model_grader_refusal_error": {
+                    "type": "boolean"
+                  },
+                  "model_grader_parse_error": {
+                    "type": "boolean"
+                  },
+                  "model_grader_server_error_details": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                },
+                "required": [
+                  "formula_parse_error",
+                  "sample_parse_error",
+                  "truncated_observation_error",
+                  "unresponsive_reward_error",
+                  "invalid_variable_error",
+                  "other_error",
+                  "python_grader_server_error",
+                  "python_grader_server_error_type",
+                  "python_grader_runtime_error",
+                  "python_grader_runtime_error_details",
+                  "model_grader_server_error",
+                  "model_grader_refusal_error",
+                  "model_grader_parse_error",
+                  "model_grader_server_error_details"
+                ]
+              },
+              "execution_time": {
+                "type": "number"
+              },
+              "scores": {
+                "type": "object",
+                "additionalProperties": {}
+              },
+              "token_usage": {
+                "anyOf": [
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "sampled_model_name": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "name",
+              "type",
+              "errors",
+              "execution_time",
+              "scores",
+              "token_usage",
+              "sampled_model_name"
+            ]
+          },
+          "sub_rewards": {
+            "type": "object",
+            "additionalProperties": {}
+          },
+          "model_grader_token_usage_per_model": {
+            "type": "object",
+            "additionalProperties": {}
+          }
+        },
+        "required": [
+          "reward",
+          "metadata",
+          "sub_rewards",
+          "model_grader_token_usage_per_model"
+        ]
+      },
+      "RunObject": {
+        "type": "object",
+        "title": "A run on a thread",
+        "description": "Represents an execution run on a [thread](https://developers.openai.com/api/docs/assistants/migration).",
+        "properties": {
+          "id": {
+            "description": "The identifier, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `thread.run`.",
+            "type": "string",
+            "enum": [
+              "thread.run"
+            ],
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "description": "The Unix timestamp (in seconds) for when the run was created.",
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "thread_id": {
+            "description": "The ID of the [thread](https://developers.openai.com/api/docs/assistants/migration) that was executed on as a part of this run.",
+            "type": "string"
+          },
+          "assistant_id": {
+            "description": "The ID of the [assistant](https://developers.openai.com/api/docs/assistants/migration) used for execution of this run.",
+            "type": "string"
+          },
+          "status": {
+            "description": "The status of the run, which can be either `queued`, `in_progress`, `requires_action`, `cancelling`, `cancelled`, `failed`, `completed`, `incomplete`, or `expired`.",
+            "type": "string",
+            "enum": [
+              "queued",
+              "in_progress",
+              "requires_action",
+              "cancelling",
+              "cancelled",
+              "failed",
+              "completed",
+              "incomplete",
+              "expired"
+            ]
+          },
+          "required_action": {
+            "type": "object",
+            "description": "Details on the action required to continue the run. Will be `null` if no action is required.",
+            "nullable": true,
+            "properties": {
+              "type": {
+                "description": "For now, this is always `submit_tool_outputs`.",
+                "type": "string",
+                "enum": [
+                  "submit_tool_outputs"
+                ],
+                "x-stainless-const": true
+              },
+              "submit_tool_outputs": {
+                "type": "object",
+                "description": "Details on the tool outputs needed for this run to continue.",
+                "properties": {
+                  "tool_calls": {
+                    "type": "array",
+                    "description": "A list of the relevant tool calls.",
+                    "items": {
+                      "$ref": "#/components/schemas/RunToolCallObject"
+                    }
+                  }
+                },
+                "required": [
+                  "tool_calls"
+                ]
+              }
+            },
+            "required": [
+              "type",
+              "submit_tool_outputs"
+            ]
+          },
+          "last_error": {
+            "type": "object",
+            "description": "The last error associated with this run. Will be `null` if there are no errors.",
+            "nullable": true,
+            "properties": {
+              "code": {
+                "type": "string",
+                "description": "One of `server_error`, `rate_limit_exceeded`, or `invalid_prompt`.",
+                "enum": [
+                  "server_error",
+                  "rate_limit_exceeded",
+                  "invalid_prompt"
+                ]
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable description of the error."
+              }
+            },
+            "required": [
+              "code",
+              "message"
+            ]
+          },
+          "expires_at": {
+            "description": "The Unix timestamp (in seconds) for when the run will expire.",
+            "type": "integer",
+            "format": "unixtime",
+            "nullable": true
+          },
+          "started_at": {
+            "description": "The Unix timestamp (in seconds) for when the run was started.",
+            "type": "integer",
+            "format": "unixtime",
+            "nullable": true
+          },
+          "cancelled_at": {
+            "description": "The Unix timestamp (in seconds) for when the run was cancelled.",
+            "type": "integer",
+            "format": "unixtime",
+            "nullable": true
+          },
+          "failed_at": {
+            "description": "The Unix timestamp (in seconds) for when the run failed.",
+            "type": "integer",
+            "format": "unixtime",
+            "nullable": true
+          },
+          "completed_at": {
+            "description": "The Unix timestamp (in seconds) for when the run was completed.",
+            "type": "integer",
+            "format": "unixtime",
+            "nullable": true
+          },
+          "incomplete_details": {
+            "description": "Details on why the run is incomplete. Will be `null` if the run is not incomplete.",
+            "type": "object",
+            "nullable": true,
+            "properties": {
+              "reason": {
+                "description": "The reason why the run is incomplete. This will point to which specific token limit was reached over the course of the run.",
+                "type": "string",
+                "enum": [
+                  "max_completion_tokens",
+                  "max_prompt_tokens"
+                ]
+              }
+            }
+          },
+          "model": {
+            "description": "The model that the [assistant](https://developers.openai.com/api/docs/assistants/migration) used for this run.",
+            "type": "string"
+          },
+          "instructions": {
+            "description": "The instructions that the [assistant](https://developers.openai.com/api/docs/assistants/migration) used for this run.",
+            "type": "string"
+          },
+          "tools": {
+            "description": "The list of tools that the [assistant](https://developers.openai.com/api/docs/assistants/migration) used for this run.",
+            "default": [],
+            "type": "array",
+            "maxItems": 20,
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/AssistantToolsCode"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFileSearch"
+                },
+                {
+                  "$ref": "#/components/schemas/AssistantToolsFunction"
+                }
+              ]
+            }
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "usage": {
+            "$ref": "#/components/schemas/RunCompletionUsage"
+          },
+          "temperature": {
+            "description": "The sampling temperature used for this run. If not set, defaults to 1.",
+            "type": "number",
+            "nullable": true
+          },
+          "top_p": {
+            "description": "The nucleus sampling value used for this run. If not set, defaults to 1.",
+            "type": "number",
+            "nullable": true
+          },
+          "max_prompt_tokens": {
+            "type": "integer",
+            "nullable": true,
+            "description": "The maximum number of prompt tokens specified to have been used over the course of the run.\n",
+            "minimum": 256
+          },
+          "max_completion_tokens": {
+            "type": "integer",
+            "nullable": true,
+            "description": "The maximum number of completion tokens specified to have been used over the course of the run.\n",
+            "minimum": 256
+          },
+          "truncation_strategy": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/TruncationObject"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          },
+          "tool_choice": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AssistantsApiToolChoiceOption"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          },
+          "parallel_tool_calls": {
+            "$ref": "#/components/schemas/ParallelToolCalls"
+          },
+          "response_format": {
+            "$ref": "#/components/schemas/AssistantsApiResponseFormatOption",
+            "nullable": true
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "thread_id",
+          "assistant_id",
+          "status",
+          "required_action",
+          "last_error",
+          "expires_at",
+          "started_at",
+          "cancelled_at",
+          "failed_at",
+          "completed_at",
+          "model",
+          "instructions",
+          "tools",
+          "metadata",
+          "usage",
+          "incomplete_details",
+          "max_prompt_tokens",
+          "max_completion_tokens",
+          "truncation_strategy",
+          "tool_choice",
+          "parallel_tool_calls",
+          "response_format"
+        ],
+        "x-oaiMeta": {
+          "name": "The run object",
+          "beta": true,
+          "example": "{\n  \"id\": \"run_abc123\",\n  \"object\": \"thread.run\",\n  \"created_at\": 1698107661,\n  \"assistant_id\": \"asst_abc123\",\n  \"thread_id\": \"thread_abc123\",\n  \"status\": \"completed\",\n  \"started_at\": 1699073476,\n  \"expires_at\": null,\n  \"cancelled_at\": null,\n  \"failed_at\": null,\n  \"completed_at\": 1699073498,\n  \"last_error\": null,\n  \"model\": \"gpt-5\",\n  \"instructions\": null,\n  \"tools\": [{\"type\": \"file_search\"}, {\"type\": \"code_interpreter\"}],\n  \"metadata\": {},\n  \"incomplete_details\": null,\n  \"usage\": {\n    \"prompt_tokens\": 123,\n    \"completion_tokens\": 456,\n    \"total_tokens\": 579\n  },\n  \"temperature\": 1.0,\n  \"top_p\": 1.0,\n  \"max_prompt_tokens\": 1000,\n  \"max_completion_tokens\": 1000,\n  \"truncation_strategy\": {\n    \"type\": \"auto\",\n    \"last_messages\": null\n  },\n  \"response_format\": \"auto\",\n  \"tool_choice\": \"auto\",\n  \"parallel_tool_calls\": true\n}\n"
+        }
+      },
+      "RunStepCompletionUsage": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "Usage statistics related to the run step. This value will be `null` while the run step's status is `in_progress`.",
+            "properties": {
+              "completion_tokens": {
+                "type": "integer",
+                "description": "Number of completion tokens used over the course of the run step."
+              },
+              "prompt_tokens": {
+                "type": "integer",
+                "description": "Number of prompt tokens used over the course of the run step."
+              },
+              "total_tokens": {
+                "type": "integer",
+                "description": "Total number of tokens used (prompt + completion)."
+              }
+            },
+            "required": [
+              "prompt_tokens",
+              "completion_tokens",
+              "total_tokens"
+            ]
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "RunStepDeltaObject": {
+        "type": "object",
+        "title": "Run step delta object",
+        "description": "Represents a run step delta i.e. any changed fields on a run step during streaming.\n",
+        "properties": {
+          "id": {
+            "description": "The identifier of the run step, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `thread.run.step.delta`.",
+            "type": "string",
+            "enum": [
+              "thread.run.step.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "delta": {
+            "description": "The delta containing the fields that have changed on the run step.",
+            "type": "object",
+            "properties": {
+              "step_details": {
+                "type": "object",
+                "description": "The details of the run step.",
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/RunStepDeltaStepDetailsMessageCreationObject"
+                  },
+                  {
+                    "$ref": "#/components/schemas/RunStepDeltaStepDetailsToolCallsObject"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "The run step delta object",
+          "beta": true,
+          "example": "{\n  \"id\": \"step_123\",\n  \"object\": \"thread.run.step.delta\",\n  \"delta\": {\n    \"step_details\": {\n      \"type\": \"tool_calls\",\n      \"tool_calls\": [\n        {\n          \"index\": 0,\n          \"id\": \"call_123\",\n          \"type\": \"code_interpreter\",\n          \"code_interpreter\": { \"input\": \"\", \"outputs\": [] }\n        }\n      ]\n    }\n  }\n}\n"
+        }
+      },
+      "RunStepDeltaStepDetailsMessageCreationObject": {
+        "title": "Message creation",
+        "type": "object",
+        "description": "Details of the message creation by the run step.",
+        "properties": {
+          "type": {
+            "description": "Always `message_creation`.",
+            "type": "string",
+            "enum": [
+              "message_creation"
+            ],
+            "x-stainless-const": true
+          },
+          "message_creation": {
+            "type": "object",
+            "properties": {
+              "message_id": {
+                "type": "string",
+                "description": "The ID of the message that was created by this run step."
+              }
+            }
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "RunStepDeltaStepDetailsToolCallsCodeObject": {
+        "title": "Code interpreter tool call",
+        "type": "object",
+        "description": "Details of the Code Interpreter tool call the run step was involved in.",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the tool call in the tool calls array."
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of tool call. This is always going to be `code_interpreter` for this type of tool call.",
+            "enum": [
+              "code_interpreter"
+            ],
+            "x-stainless-const": true
+          },
+          "code_interpreter": {
+            "type": "object",
+            "description": "The Code Interpreter tool call definition.",
+            "properties": {
+              "input": {
+                "type": "string",
+                "description": "The input to the Code Interpreter tool call."
+              },
+              "outputs": {
+                "type": "array",
+                "description": "The outputs from the Code Interpreter tool call. Code Interpreter can output one or more items, including text (`logs`) or images (`image`). Each of these are represented by a different object type.",
+                "items": {
+                  "type": "object",
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/RunStepDeltaStepDetailsToolCallsCodeOutputLogsObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/RunStepDeltaStepDetailsToolCallsCodeOutputImageObject"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "RunStepDeltaStepDetailsToolCallsCodeOutputImageObject": {
+        "title": "Code interpreter image output",
+        "type": "object",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the output in the outputs array."
+          },
+          "type": {
+            "description": "Always `image`.",
+            "type": "string",
+            "enum": [
+              "image"
+            ],
+            "x-stainless-const": true
+          },
+          "image": {
+            "type": "object",
+            "properties": {
+              "file_id": {
+                "description": "The [file](https://developers.openai.com/api/reference/resources/files) ID of the image.",
+                "type": "string"
+              }
+            }
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "RunStepDeltaStepDetailsToolCallsCodeOutputLogsObject": {
+        "title": "Code interpreter log output",
+        "type": "object",
+        "description": "Text output from the Code Interpreter tool call as part of a run step.",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the output in the outputs array."
+          },
+          "type": {
+            "description": "Always `logs`.",
+            "type": "string",
+            "enum": [
+              "logs"
+            ],
+            "x-stainless-const": true
+          },
+          "logs": {
+            "type": "string",
+            "description": "The text output from the Code Interpreter tool call."
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "RunStepDeltaStepDetailsToolCallsFileSearchObject": {
+        "title": "File search tool call",
+        "type": "object",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the tool call in the tool calls array."
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call object."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of tool call. This is always going to be `file_search` for this type of tool call.",
+            "enum": [
+              "file_search"
+            ],
+            "x-stainless-const": true
+          },
+          "file_search": {
+            "type": "object",
+            "description": "For now, this is always going to be an empty object.",
+            "x-oaiTypeLabel": "map"
+          }
+        },
+        "required": [
+          "index",
+          "type",
+          "file_search"
+        ]
+      },
+      "RunStepDeltaStepDetailsToolCallsFunctionObject": {
+        "type": "object",
+        "title": "Function tool call",
+        "properties": {
+          "index": {
+            "type": "integer",
+            "description": "The index of the tool call in the tool calls array."
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call object."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of tool call. This is always going to be `function` for this type of tool call.",
+            "enum": [
+              "function"
+            ],
+            "x-stainless-const": true
+          },
+          "function": {
+            "type": "object",
+            "description": "The definition of the function that was called.",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the function."
+              },
+              "arguments": {
+                "type": "string",
+                "description": "The arguments passed to the function."
+              },
+              "output": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The output of the function. This will be `null` if the outputs have not been [submitted](https://developers.openai.com/api/docs/assistants/migration) yet."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "required": [
+          "index",
+          "type"
+        ]
+      },
+      "RunStepDeltaStepDetailsToolCallsObject": {
+        "title": "Tool calls",
+        "type": "object",
+        "description": "Details of the tool call.",
+        "properties": {
+          "type": {
+            "description": "Always `tool_calls`.",
+            "type": "string",
+            "enum": [
+              "tool_calls"
+            ],
+            "x-stainless-const": true
+          },
+          "tool_calls": {
+            "type": "array",
+            "description": "An array of tool calls the run step was involved in. These can be associated with one of three types of tools: `code_interpreter`, `file_search`, or `function`.\n",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/RunStepDeltaStepDetailsToolCallsCodeObject"
+                },
+                {
+                  "$ref": "#/components/schemas/RunStepDeltaStepDetailsToolCallsFileSearchObject"
+                },
+                {
+                  "$ref": "#/components/schemas/RunStepDeltaStepDetailsToolCallsFunctionObject"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "RunStepDetailsMessageCreationObject": {
+        "title": "Message creation",
+        "type": "object",
+        "description": "Details of the message creation by the run step.",
+        "properties": {
+          "type": {
+            "description": "Always `message_creation`.",
+            "type": "string",
+            "enum": [
+              "message_creation"
+            ],
+            "x-stainless-const": true
+          },
+          "message_creation": {
+            "type": "object",
+            "properties": {
+              "message_id": {
+                "type": "string",
+                "description": "The ID of the message that was created by this run step."
+              }
+            },
+            "required": [
+              "message_id"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "message_creation"
+        ]
+      },
+      "RunStepDetailsToolCallsCodeObject": {
+        "title": "Code Interpreter tool call",
+        "type": "object",
+        "description": "Details of the Code Interpreter tool call the run step was involved in.",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of tool call. This is always going to be `code_interpreter` for this type of tool call.",
+            "enum": [
+              "code_interpreter"
+            ],
+            "x-stainless-const": true
+          },
+          "code_interpreter": {
+            "type": "object",
+            "description": "The Code Interpreter tool call definition.",
+            "required": [
+              "input",
+              "outputs"
+            ],
+            "properties": {
+              "input": {
+                "type": "string",
+                "description": "The input to the Code Interpreter tool call."
+              },
+              "outputs": {
+                "type": "array",
+                "description": "The outputs from the Code Interpreter tool call. Code Interpreter can output one or more items, including text (`logs`) or images (`image`). Each of these are represented by a different object type.",
+                "items": {
+                  "type": "object",
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/RunStepDetailsToolCallsCodeOutputLogsObject"
+                    },
+                    {
+                      "$ref": "#/components/schemas/RunStepDetailsToolCallsCodeOutputImageObject"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "code_interpreter"
+        ]
+      },
+      "RunStepDetailsToolCallsCodeOutputImageObject": {
+        "title": "Code Interpreter image output",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "Always `image`.",
+            "type": "string",
+            "enum": [
+              "image"
+            ],
+            "x-stainless-const": true
+          },
+          "image": {
+            "type": "object",
+            "properties": {
+              "file_id": {
+                "description": "The [file](https://developers.openai.com/api/reference/resources/files) ID of the image.",
+                "type": "string"
+              }
+            },
+            "required": [
+              "file_id"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "image"
+        ]
+      },
+      "RunStepDetailsToolCallsCodeOutputLogsObject": {
+        "title": "Code Interpreter log output",
+        "type": "object",
+        "description": "Text output from the Code Interpreter tool call as part of a run step.",
+        "properties": {
+          "type": {
+            "description": "Always `logs`.",
+            "type": "string",
+            "enum": [
+              "logs"
+            ],
+            "x-stainless-const": true
+          },
+          "logs": {
+            "type": "string",
+            "description": "The text output from the Code Interpreter tool call."
+          }
+        },
+        "required": [
+          "type",
+          "logs"
+        ]
+      },
+      "RunStepDetailsToolCallsFileSearchObject": {
+        "title": "File search tool call",
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call object."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of tool call. This is always going to be `file_search` for this type of tool call.",
+            "enum": [
+              "file_search"
+            ],
+            "x-stainless-const": true
+          },
+          "file_search": {
+            "type": "object",
+            "description": "For now, this is always going to be an empty object.",
+            "x-oaiTypeLabel": "map",
+            "properties": {
+              "ranking_options": {
+                "$ref": "#/components/schemas/RunStepDetailsToolCallsFileSearchRankingOptionsObject"
+              },
+              "results": {
+                "type": "array",
+                "description": "The results of the file search.",
+                "items": {
+                  "$ref": "#/components/schemas/RunStepDetailsToolCallsFileSearchResultObject"
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "file_search"
+        ]
+      },
+      "RunStepDetailsToolCallsFileSearchRankingOptionsObject": {
+        "title": "File search tool call ranking options",
+        "type": "object",
+        "description": "The ranking options for the file search.",
+        "properties": {
+          "ranker": {
+            "$ref": "#/components/schemas/FileSearchRanker"
+          },
+          "score_threshold": {
+            "type": "number",
+            "description": "The score threshold for the file search. All values must be a floating point number between 0 and 1.",
+            "minimum": 0,
+            "maximum": 1
+          }
+        },
+        "required": [
+          "ranker",
+          "score_threshold"
+        ]
+      },
+      "RunStepDetailsToolCallsFileSearchResultObject": {
+        "title": "File search tool call result",
+        "type": "object",
+        "description": "A result instance of the file search.",
+        "x-oaiTypeLabel": "map",
+        "properties": {
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file that result was found in."
+          },
+          "file_name": {
+            "type": "string",
+            "description": "The name of the file that result was found in."
+          },
+          "score": {
+            "type": "number",
+            "description": "The score of the result. All values must be a floating point number between 0 and 1.",
+            "minimum": 0,
+            "maximum": 1
+          },
+          "content": {
+            "type": "array",
+            "description": "The content of the result that was found. The content is only included if requested via the include query parameter.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "description": "The type of the content.",
+                  "enum": [
+                    "text"
+                  ],
+                  "x-stainless-const": true
+                },
+                "text": {
+                  "type": "string",
+                  "description": "The text content of the file."
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "file_id",
+          "file_name",
+          "score"
+        ]
+      },
+      "RunStepDetailsToolCallsFunctionObject": {
+        "type": "object",
+        "title": "Function tool call",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call object."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of tool call. This is always going to be `function` for this type of tool call.",
+            "enum": [
+              "function"
+            ],
+            "x-stainless-const": true
+          },
+          "function": {
+            "type": "object",
+            "description": "The definition of the function that was called.",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the function."
+              },
+              "arguments": {
+                "type": "string",
+                "description": "The arguments passed to the function."
+              },
+              "output": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The output of the function. This will be `null` if the outputs have not been [submitted](https://developers.openai.com/api/docs/assistants/migration) yet."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "name",
+              "arguments",
+              "output"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "function"
+        ]
+      },
+      "RunStepDetailsToolCallsObject": {
+        "title": "Tool calls",
+        "type": "object",
+        "description": "Details of the tool call.",
+        "properties": {
+          "type": {
+            "description": "Always `tool_calls`.",
+            "type": "string",
+            "enum": [
+              "tool_calls"
+            ],
+            "x-stainless-const": true
+          },
+          "tool_calls": {
+            "type": "array",
+            "description": "An array of tool calls the run step was involved in. These can be associated with one of three types of tools: `code_interpreter`, `file_search`, or `function`.\n",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/RunStepDetailsToolCallsCodeObject"
+                },
+                {
+                  "$ref": "#/components/schemas/RunStepDetailsToolCallsFileSearchObject"
+                },
+                {
+                  "$ref": "#/components/schemas/RunStepDetailsToolCallsFunctionObject"
+                }
+              ]
+            }
+          }
+        },
+        "required": [
+          "type",
+          "tool_calls"
+        ]
+      },
+      "RunStepObject": {
+        "type": "object",
+        "title": "Run steps",
+        "description": "Represents a step in execution of a run.\n",
+        "properties": {
+          "id": {
+            "description": "The identifier of the run step, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `thread.run.step`.",
+            "type": "string",
+            "enum": [
+              "thread.run.step"
+            ],
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "description": "The Unix timestamp (in seconds) for when the run step was created.",
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "assistant_id": {
+            "description": "The ID of the [assistant](https://developers.openai.com/api/docs/assistants/migration) associated with the run step.",
+            "type": "string"
+          },
+          "thread_id": {
+            "description": "The ID of the [thread](https://developers.openai.com/api/docs/assistants/migration) that was run.",
+            "type": "string"
+          },
+          "run_id": {
+            "description": "The ID of the [run](https://developers.openai.com/api/docs/assistants/migration) that this run step is a part of.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The type of run step, which can be either `message_creation` or `tool_calls`.",
+            "type": "string",
+            "enum": [
+              "message_creation",
+              "tool_calls"
+            ]
+          },
+          "status": {
+            "description": "The status of the run step, which can be either `in_progress`, `cancelled`, `failed`, `completed`, or `expired`.",
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "cancelled",
+              "failed",
+              "completed",
+              "expired"
+            ]
+          },
+          "step_details": {
+            "type": "object",
+            "description": "The details of the run step.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/RunStepDetailsMessageCreationObject"
+              },
+              {
+                "$ref": "#/components/schemas/RunStepDetailsToolCallsObject"
+              }
+            ]
+          },
+          "last_error": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "The last error associated with this run step. Will be `null` if there are no errors.",
+                "properties": {
+                  "code": {
+                    "type": "string",
+                    "description": "One of `server_error` or `rate_limit_exceeded`.",
+                    "enum": [
+                      "server_error",
+                      "rate_limit_exceeded"
+                    ]
+                  },
+                  "message": {
+                    "type": "string",
+                    "description": "A human-readable description of the error."
+                  }
+                },
+                "required": [
+                  "code",
+                  "message"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "expired_at": {
+            "anyOf": [
+              {
+                "description": "The Unix timestamp (in seconds) for when the run step expired. A step is considered expired if the parent run is expired.",
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "cancelled_at": {
+            "anyOf": [
+              {
+                "description": "The Unix timestamp (in seconds) for when the run step was cancelled.",
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "failed_at": {
+            "anyOf": [
+              {
+                "description": "The Unix timestamp (in seconds) for when the run step failed.",
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "completed_at": {
+            "anyOf": [
+              {
+                "description": "The Unix timestamp (in seconds) for when the run step completed.",
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          },
+          "usage": {
+            "$ref": "#/components/schemas/RunStepCompletionUsage"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "assistant_id",
+          "thread_id",
+          "run_id",
+          "type",
+          "status",
+          "step_details",
+          "last_error",
+          "expired_at",
+          "cancelled_at",
+          "failed_at",
+          "completed_at",
+          "metadata",
+          "usage"
+        ],
+        "x-oaiMeta": {
+          "name": "The run step object",
+          "beta": true,
+          "example": "{\n  \"id\": \"step_abc123\",\n  \"object\": \"thread.run.step\",\n  \"created_at\": 1699063291,\n  \"run_id\": \"run_abc123\",\n  \"assistant_id\": \"asst_abc123\",\n  \"thread_id\": \"thread_abc123\",\n  \"type\": \"message_creation\",\n  \"status\": \"completed\",\n  \"cancelled_at\": null,\n  \"completed_at\": 1699063291,\n  \"expired_at\": null,\n  \"failed_at\": null,\n  \"last_error\": null,\n  \"step_details\": {\n    \"type\": \"message_creation\",\n    \"message_creation\": {\n      \"message_id\": \"msg_abc123\"\n    }\n  },\n  \"usage\": {\n    \"prompt_tokens\": 123,\n    \"completion_tokens\": 456,\n    \"total_tokens\": 579\n  }\n}\n"
+        }
+      },
+      "RunStepStreamEvent": {
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.step.created"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunStepObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run step](https://developers.openai.com/api/docs/assistants/migration) is created.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run step](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.step.in_progress"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunStepObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run step](https://developers.openai.com/api/docs/assistants/migration) moves to an `in_progress` state.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run step](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.step.delta"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunStepDeltaObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when parts of a [run step](https://developers.openai.com/api/docs/assistants/migration) are being streamed.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run step delta](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.step.completed"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunStepObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run step](https://developers.openai.com/api/docs/assistants/migration) is completed.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run step](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.step.failed"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunStepObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run step](https://developers.openai.com/api/docs/assistants/migration) fails.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run step](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.step.cancelled"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunStepObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run step](https://developers.openai.com/api/docs/assistants/migration) is cancelled.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run step](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.step.expired"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunStepObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run step](https://developers.openai.com/api/docs/assistants/migration) expires.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run step](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          }
+        ]
+      },
+      "RunStreamEvent": {
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.created"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a new [run](https://developers.openai.com/api/docs/assistants/migration) is created.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.queued"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) moves to a `queued` status.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.in_progress"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) moves to an `in_progress` status.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.requires_action"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) moves to a `requires_action` status.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.completed"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) is completed.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.incomplete"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) ends with status `incomplete`.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.failed"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) fails.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.cancelling"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) moves to a `cancelling` status.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.cancelled"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) is cancelled.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          },
+          {
+            "type": "object",
+            "properties": {
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.run.expired"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/RunObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a [run](https://developers.openai.com/api/docs/assistants/migration) expires.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [run](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          }
+        ]
+      },
+      "RunToolCallObject": {
+        "type": "object",
+        "description": "Tool call objects",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the tool call. This ID must be referenced when you submit the tool outputs in using the [Submit tool outputs to run](https://developers.openai.com/api/docs/assistants/migration) endpoint."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of tool call the output is required for. For now, this is always `function`.",
+            "enum": [
+              "function"
+            ],
+            "x-stainless-const": true
+          },
+          "function": {
+            "type": "object",
+            "description": "The function definition.",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The name of the function."
+              },
+              "arguments": {
+                "type": "string",
+                "description": "The arguments that the model expects you to pass to the function."
+              }
+            },
+            "required": [
+              "name",
+              "arguments"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "function"
+        ]
+      },
+      "ServiceTier": {
+        "anyOf": [
+          {
+            "type": "string",
+            "description": "Specifies the processing type used for serving the request.\n  - If set to 'auto', then the request will be processed with the service tier configured in the Project settings. Unless otherwise configured, the Project will use 'default'.\n  - If set to 'default', then the request will be processed with the standard pricing and performance for the selected model.\n  - If set to '[flex](https://developers.openai.com/api/docs/guides/flex-processing)', then the request will be processed with the Flex Processing service tier.\n  - To opt-in to [Fast mode](https://developers.openai.com/api/docs/guides/fast-mode) at the request level, include the `service_tier=fast` or `service_tier=priority` parameter for Responses or Chat Completions. The response will show `service_tier=priority` regardless of if you specify `service_tier=fast` or `priority` in your request.\n  - When not set, the default behavior is 'auto'.\n\n  When the `service_tier` parameter is set, the response body will include the `service_tier` value based on the processing mode actually used to serve the request. This response value may be different from the value set in the parameter.\n",
+            "enum": [
+              "auto",
+              "default",
+              "flex",
+              "scale",
+              "priority",
+              "fast"
+            ],
+            "default": "auto"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "ServiceTierResponses": {
+        "anyOf": [
+          {
+            "type": "string",
+            "description": "Specifies the processing type used for serving the request.\n  - If set to 'auto', then the request will be processed with the service tier configured in the Project settings. Unless otherwise configured, the Project will use 'default'.\n  - If set to 'default', then the request will be processed with the standard pricing and performance for the selected model.\n  - If set to '[flex](https://developers.openai.com/api/docs/guides/flex-processing)', then the request will be processed with the Flex Processing service tier.\n  - To opt-in to [Fast mode](https://developers.openai.com/api/docs/guides/fast-mode) at the request level, include the `service_tier=fast` or `service_tier=priority` parameter for Responses or Chat Completions. The response will show `service_tier=priority` regardless of if you specify `service_tier=fast` or `priority` in your request.\n  - If set to 'ultrafast', then the request will be processed with the access-controlled Ultrafast Processing service tier. This tier is currently available for `gpt-5.6-sol`; a response served through it will show `service_tier=ultrafast`.\n  - When not set, the default behavior is 'auto'.\n\n  When the `service_tier` parameter is set, the response body will include the `service_tier` value based on the processing mode actually used to serve the request. This response value may be different from the value set in the parameter.\n",
+            "enum": [
+              "auto",
+              "default",
+              "flex",
+              "scale",
+              "priority",
+              "fast",
+              "ultrafast"
+            ],
+            "default": "auto"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "SpeechAudioDeltaEvent": {
+        "type": "object",
+        "description": "Emitted for each chunk of audio data generated during speech synthesis.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `speech.audio.delta`.\n",
+            "enum": [
+              "speech.audio.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "audio": {
+            "type": "string",
+            "description": "A chunk of Base64-encoded audio data.\n"
+          }
+        },
+        "required": [
+          "type",
+          "audio"
+        ],
+        "x-oaiMeta": {
+          "name": "Stream Event (speech.audio.delta)",
+          "group": "speech",
+          "example": "{\n  \"type\": \"speech.audio.delta\",\n  \"audio\": \"base64-encoded-audio-data\"\n}\n"
+        }
+      },
+      "SpeechAudioDoneEvent": {
+        "type": "object",
+        "description": "Emitted when the speech synthesis is complete and all audio has been streamed.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `speech.audio.done`.\n",
+            "enum": [
+              "speech.audio.done"
+            ],
+            "x-stainless-const": true
+          },
+          "usage": {
+            "type": "object",
+            "description": "Token usage statistics for the request.\n",
+            "properties": {
+              "input_tokens": {
+                "type": "integer",
+                "description": "Number of input tokens in the prompt."
+              },
+              "output_tokens": {
+                "type": "integer",
+                "description": "Number of output tokens generated."
+              },
+              "total_tokens": {
+                "type": "integer",
+                "description": "Total number of tokens used (input + output)."
+              }
+            },
+            "required": [
+              "input_tokens",
+              "output_tokens",
+              "total_tokens"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "usage"
+        ],
+        "x-oaiMeta": {
+          "name": "Stream Event (speech.audio.done)",
+          "group": "speech",
+          "example": "{\n  \"type\": \"speech.audio.done\",\n  \"usage\": {\n    \"input_tokens\": 14,\n    \"output_tokens\": 101,\n    \"total_tokens\": 115\n  }\n}\n"
+        }
+      },
+      "SpendAlertNotificationChannel": {
+        "type": "object",
+        "description": "Email notification settings for a spend alert.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "email"
+            ],
+            "description": "The notification channel type. Currently only `email` is supported.",
+            "x-stainless-const": true
+          },
+          "recipients": {
+            "type": "array",
+            "description": "Email addresses that receive the spend alert notification.",
+            "items": {
+              "type": "string"
+            }
+          },
+          "subject_prefix": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Optional subject prefix for alert emails."
+          }
+        },
+        "required": [
+          "type",
+          "recipients"
+        ]
+      },
+      "StaticChunkingStrategy": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "max_chunk_size_tokens": {
+            "type": "integer",
+            "minimum": 100,
+            "maximum": 4096,
+            "description": "The maximum number of tokens in each chunk. The default value is `800`. The minimum value is `100` and the maximum value is `4096`."
+          },
+          "chunk_overlap_tokens": {
+            "type": "integer",
+            "description": "The number of tokens that overlap between chunks. The default value is `400`.\n\nNote that the overlap must not exceed half of `max_chunk_size_tokens`.\n"
+          }
+        },
+        "required": [
+          "max_chunk_size_tokens",
+          "chunk_overlap_tokens"
+        ]
+      },
+      "StaticChunkingStrategyRequestParam": {
+        "type": "object",
+        "title": "Static Chunking Strategy",
+        "description": "Customize your own chunking strategy by setting chunk size and chunk overlap.",
+        "additionalProperties": false,
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "Always `static`.",
+            "enum": [
+              "static"
+            ],
+            "x-stainless-const": true
+          },
+          "static": {
+            "$ref": "#/components/schemas/StaticChunkingStrategy"
+          }
+        },
+        "required": [
+          "type",
+          "static"
+        ]
+      },
+      "StaticChunkingStrategyResponseParam": {
+        "type": "object",
+        "title": "Static Chunking Strategy",
+        "additionalProperties": false,
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "Always `static`.",
+            "enum": [
+              "static"
+            ],
+            "x-stainless-const": true
+          },
+          "static": {
+            "$ref": "#/components/schemas/StaticChunkingStrategy"
+          }
+        },
+        "required": [
+          "type",
+          "static"
+        ]
+      },
+      "StopConfiguration": {
+        "description": "Not supported with latest reasoning models `o3` and `o4-mini`.\n\nUp to 4 sequences where the API will stop generating further tokens. The\nreturned text will not contain the stop sequence.\n",
+        "default": null,
+        "nullable": true,
+        "oneOf": [
+          {
+            "type": "string",
+            "default": "<|endoftext|>",
+            "example": "\n",
+            "nullable": true
+          },
+          {
+            "type": "array",
+            "minItems": 1,
+            "maxItems": 4,
+            "items": {
+              "type": "string",
+              "example": "[\"\\n\"]"
+            }
+          }
+        ]
+      },
+      "SubmitToolOutputsRunRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "tool_outputs": {
+            "description": "A list of tools for which the outputs are being submitted.",
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "tool_call_id": {
+                  "type": "string",
+                  "description": "The ID of the tool call in the `required_action` object within the run object the output is being submitted for."
+                },
+                "output": {
+                  "type": "string",
+                  "description": "The output of the tool call to be submitted to continue the run."
+                }
+              }
+            }
+          },
+          "stream": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "If `true`, returns a stream of events that happen during the Run as server-sent events, terminating when the Run enters a terminal state with a `data: [DONE]` message.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "tool_outputs"
+        ]
+      },
+      "TextResponseFormatConfiguration": {
+        "description": "An object specifying the format that the model must output.\n\nConfiguring `{ \"type\": \"json_schema\" }` enables Structured Outputs,\nwhich ensures the model will match your supplied JSON schema. Learn more in the\n[Structured Outputs guide](https://developers.openai.com/api/docs/guides/structured-outputs).\n\nThe default format is `{ \"type\": \"text\" }` with no additional options.\n\n**Not recommended for gpt-4o and newer models:**\n\nSetting to `{ \"type\": \"json_object\" }` enables the older JSON mode, which\nensures the message the model generates is valid JSON. Using `json_schema`\nis preferred for models that support it.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ResponseFormatText"
+          },
+          {
+            "$ref": "#/components/schemas/TextResponseFormatJsonSchema"
+          },
+          {
+            "$ref": "#/components/schemas/ResponseFormatJsonObject"
+          }
+        ]
+      },
+      "TextResponseFormatJsonSchema": {
+        "type": "object",
+        "title": "JSON schema",
+        "description": "JSON Schema response format. Used to generate structured JSON responses.\nLearn more about [Structured Outputs](https://developers.openai.com/api/docs/guides/structured-outputs).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `json_schema`.",
+            "enum": [
+              "json_schema"
+            ],
+            "x-stainless-const": true
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of what the response format is for, used by the model to\ndetermine how to respond in the format.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the response format. Must be a-z, A-Z, 0-9, or contain\nunderscores and dashes, with a maximum length of 64.\n"
+          },
+          "schema": {
+            "$ref": "#/components/schemas/ResponseFormatJsonSchemaSchema"
+          },
+          "strict": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "default": false,
+                "description": "Whether to enable strict schema adherence when generating the output.\nIf set to true, the model will always follow the exact schema defined\nin the `schema` field. Only a subset of JSON Schema is supported when\n`strict` is `true`. To learn more, read the [Structured Outputs\nguide](https://developers.openai.com/api/docs/guides/structured-outputs).\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "schema",
+          "name"
+        ]
+      },
+      "ThreadObject": {
+        "type": "object",
+        "title": "Thread",
+        "description": "Represents a thread that contains [messages](https://developers.openai.com/api/docs/assistants/migration).",
+        "properties": {
+          "id": {
+            "description": "The identifier, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `thread`.",
+            "type": "string",
+            "enum": [
+              "thread"
+            ],
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "description": "The Unix timestamp (in seconds) for when the thread was created.",
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "tool_resources": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.\n",
+                "properties": {
+                  "code_interpreter": {
+                    "type": "object",
+                    "properties": {
+                      "file_ids": {
+                        "type": "array",
+                        "description": "A list of [file](https://developers.openai.com/api/reference/resources/files) IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files associated with the tool.\n",
+                        "default": [],
+                        "maxItems": 20,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  },
+                  "file_search": {
+                    "type": "object",
+                    "properties": {
+                      "vector_store_ids": {
+                        "type": "array",
+                        "description": "The [vector store](https://developers.openai.com/api/reference/resources/vector_stores) attached to this thread. There can be a maximum of 1 vector store attached to the thread.\n",
+                        "maxItems": 1,
+                        "items": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "tool_resources",
+          "metadata"
+        ],
+        "x-oaiMeta": {
+          "name": "The thread object",
+          "beta": true,
+          "example": "{\n  \"id\": \"thread_abc123\",\n  \"object\": \"thread\",\n  \"created_at\": 1698107661,\n  \"metadata\": {}\n}\n"
+        }
+      },
+      "ThreadStreamEvent": {
+        "oneOf": [
+          {
+            "type": "object",
+            "properties": {
+              "enabled": {
+                "type": "boolean",
+                "description": "Whether to enable input audio transcription."
+              },
+              "event": {
+                "type": "string",
+                "enum": [
+                  "thread.created"
+                ],
+                "x-stainless-const": true
+              },
+              "data": {
+                "$ref": "#/components/schemas/ThreadObject"
+              }
+            },
+            "required": [
+              "event",
+              "data"
+            ],
+            "description": "Occurs when a new [thread](https://developers.openai.com/api/docs/assistants/migration) is created.",
+            "x-oaiMeta": {
+              "dataDescription": "`data` is a [thread](https://developers.openai.com/api/docs/assistants/migration)"
+            }
+          }
+        ]
+      },
+      "ToggleCertificatesRequest": {
+        "type": "object",
+        "properties": {
+          "certificate_ids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "example": "cert_abc"
+            },
+            "minItems": 1,
+            "maxItems": 10
+          }
+        },
+        "required": [
+          "certificate_ids"
+        ]
+      },
+      "Tool": {
+        "description": "A tool that can be used to generate a response.\n",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/FunctionTool"
+          },
+          {
+            "$ref": "#/components/schemas/FileSearchTool"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerTool"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerUsePreviewTool"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchTool"
+          },
+          {
+            "$ref": "#/components/schemas/MCPTool"
+          },
+          {
+            "$ref": "#/components/schemas/CodeInterpreterTool"
+          },
+          {
+            "$ref": "#/components/schemas/ProgrammaticToolCallingParam"
+          },
+          {
+            "$ref": "#/components/schemas/ImageGenTool"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/NamespaceToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchPreviewTool"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolParam"
+          }
+        ]
+      },
+      "ToolChoiceAllowed": {
+        "type": "object",
+        "title": "Allowed tools",
+        "description": "Constrains the tools available to the model to a pre-defined set.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "allowed_tools"
+            ],
+            "description": "Allowed tool configuration type. Always `allowed_tools`.",
+            "x-stainless-const": true
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "required"
+            ],
+            "description": "Constrains the tools available to the model to a pre-defined set.\n\n`auto` allows the model to pick from among the allowed tools and generate a\nmessage.\n\n`required` requires the model to call one or more of the allowed tools.\n"
+          },
+          "tools": {
+            "type": "array",
+            "description": "A list of tool definitions that the model should be allowed to call.\n\nFor the Responses API, the list of tool definitions might look like:\n```json\n[\n  { \"type\": \"function\", \"name\": \"get_weather\" },\n  { \"type\": \"mcp\", \"server_label\": \"deepwiki\" },\n  { \"type\": \"image_generation\" }\n]\n```\n",
+            "items": {
+              "type": "object",
+              "description": "A tool definition that the model should be allowed to call.\n",
+              "additionalProperties": true,
+              "x-oaiExpandable": false
+            }
+          }
+        },
+        "required": [
+          "type",
+          "mode",
+          "tools"
+        ]
+      },
+      "ToolChoiceCustom": {
+        "type": "object",
+        "title": "Custom tool",
+        "description": "Use this option to force the model to call a specific custom tool.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "description": "For custom tool calling, the type is always `custom`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the custom tool to call."
+          }
+        },
+        "required": [
+          "type",
+          "name"
+        ]
+      },
+      "ToolChoiceFunction": {
+        "type": "object",
+        "title": "Function tool",
+        "description": "Use this option to force the model to call a specific function.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "For function calling, the type is always `function`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to call."
+          }
+        },
+        "required": [
+          "type",
+          "name"
+        ]
+      },
+      "ToolChoiceMCP": {
+        "type": "object",
+        "title": "MCP tool",
+        "description": "Use this option to force the model to call a specific tool on a remote MCP server.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "description": "For MCP tools, the type is always `mcp`.",
+            "x-stainless-const": true
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server to use.\n"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The name of the tool to call on the server.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "server_label"
+        ]
+      },
+      "ToolChoiceOptions": {
+        "type": "string",
+        "title": "Tool choice mode",
+        "description": "Controls which (if any) tool is called by the model.\n\n`none` means the model will not call any tool and instead generates a message.\n\n`auto` means the model can pick between generating a message or calling one or\nmore tools.\n\n`required` means the model must call one or more tools.\n",
+        "enum": [
+          "none",
+          "auto",
+          "required"
+        ]
+      },
+      "ToolChoiceParam": {
+        "description": "How the model should select which tool (or tools) to use when generating\na response. See the `tools` parameter to see how to specify which tools\nthe model can call.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ToolChoiceOptions"
+          },
+          {
+            "$ref": "#/components/schemas/ToolChoiceAllowed"
+          },
+          {
+            "$ref": "#/components/schemas/ToolChoiceTypes"
+          },
+          {
+            "$ref": "#/components/schemas/ToolChoiceFunction"
+          },
+          {
+            "$ref": "#/components/schemas/ToolChoiceMCP"
+          },
+          {
+            "$ref": "#/components/schemas/ToolChoiceCustom"
+          },
+          {
+            "$ref": "#/components/schemas/SpecificProgrammaticToolCallingParam"
+          },
+          {
+            "$ref": "#/components/schemas/SpecificApplyPatchParam"
+          },
+          {
+            "$ref": "#/components/schemas/SpecificFunctionShellParam"
+          }
+        ]
+      },
+      "ToolChoiceTypes": {
+        "type": "object",
+        "title": "Hosted tool",
+        "description": "Indicates that the model should use a built-in tool to generate a response.\n[Learn more about built-in tools](https://developers.openai.com/api/docs/guides/tools).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of hosted tool the model should to use. Learn more about\n[built-in tools](https://developers.openai.com/api/docs/guides/tools).\n\nAllowed values are:\n- `file_search`\n- `web_search_preview`\n- `computer`\n- `computer_use_preview`\n- `computer_use`\n- `code_interpreter`\n- `image_generation`\n",
+            "enum": [
+              "file_search",
+              "web_search_preview",
+              "computer",
+              "computer_use_preview",
+              "computer_use",
+              "web_search_preview_2025_03_11",
+              "image_generation",
+              "code_interpreter"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "ToolsArray": {
+        "type": "array",
+        "description": "An array of tools the model may call while generating a response. You\ncan specify which tool to use by setting the `tool_choice` parameter.\n\nWe support the following categories of tools:\n- **Built-in tools**: Tools that are provided by OpenAI that extend the\n  model's capabilities, like [web search](https://developers.openai.com/api/docs/guides/tools-web-search)\n  or [file search](https://developers.openai.com/api/docs/guides/tools-file-search). Learn more about\n  [built-in tools](https://developers.openai.com/api/docs/guides/tools).\n- **MCP Tools**: Integrations with third-party systems via custom MCP servers\n  or predefined connectors such as Google Drive and SharePoint. Learn more about\n  [MCP Tools](https://developers.openai.com/api/docs/guides/tools-connectors-mcp).\n- **Function calls (custom tools)**: Functions that are defined by you,\n  enabling the model to call your own code with strongly typed arguments\n  and outputs. Learn more about\n  [function calling](https://developers.openai.com/api/docs/guides/function-calling). You can also use\n  custom tools to call your own code.\n",
+        "items": {
+          "$ref": "#/components/schemas/Tool"
+        }
+      },
+      "TranscriptTextDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is an additional text delta. This is also the first event emitted when the transcription starts. Only emitted when you [create a transcription](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) with the `Stream` parameter set to `true`.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `transcript.text.delta`.\n",
+            "enum": [
+              "transcript.text.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta that was additionally transcribed.\n"
+          },
+          "logprobs": {
+            "type": "array",
+            "description": "The log probabilities of the delta. Only included if you [create a transcription](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) with the `include[]` parameter set to `logprobs`.\n",
+            "items": {
+              "type": "object",
+              "properties": {
+                "token": {
+                  "type": "string",
+                  "description": "The token that was used to generate the log probability.\n"
+                },
+                "logprob": {
+                  "type": "number",
+                  "description": "The log probability of the token.\n"
+                },
+                "bytes": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer"
+                  },
+                  "description": "The bytes that were used to generate the log probability.\n"
+                }
+              }
+            }
+          },
+          "segment_id": {
+            "type": "string",
+            "description": "Identifier of the diarized segment that this delta belongs to. Only present when using `gpt-4o-transcribe-diarize`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "name": "Stream Event (transcript.text.delta)",
+          "group": "transcript",
+          "example": "{\n  \"type\": \"transcript.text.delta\",\n  \"delta\": \" wonderful\"\n}\n"
+        }
+      },
+      "TranscriptTextDoneEvent": {
+        "type": "object",
+        "description": "Emitted when the transcription is complete. Contains the complete transcription text. Only emitted when you [create a transcription](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) with the `Stream` parameter set to `true`.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `transcript.text.done`.\n",
+            "enum": [
+              "transcript.text.done"
+            ],
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text that was transcribed.\n"
+          },
+          "languages": {
+            "type": "array",
+            "description": "The languages detected in the audio. Returned by `gpt-transcribe`. An empty array indicates that no language could be reliably detected.\n",
+            "items": {
+              "$ref": "#/components/schemas/TranscriptionLanguage"
+            }
+          },
+          "logprobs": {
+            "type": "array",
+            "description": "The log probabilities of the individual tokens in the transcription. Only included if you [create a transcription](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) with the `include[]` parameter set to `logprobs`.\n",
+            "items": {
+              "type": "object",
+              "properties": {
+                "token": {
+                  "type": "string",
+                  "description": "The token that was used to generate the log probability.\n"
+                },
+                "logprob": {
+                  "type": "number",
+                  "description": "The log probability of the token.\n"
+                },
+                "bytes": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer"
+                  },
+                  "description": "The bytes that were used to generate the log probability.\n"
+                }
+              }
+            }
+          },
+          "usage": {
+            "$ref": "#/components/schemas/TranscriptTextUsageTokens"
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "x-oaiMeta": {
+          "name": "Stream Event (transcript.text.done)",
+          "group": "transcript",
+          "example": "{\n  \"type\": \"transcript.text.done\",\n  \"text\": \"I see skies of blue and clouds of white, the bright blessed days, the dark sacred nights, and I think to myself, what a wonderful world.\",\n  \"usage\": {\n    \"type\": \"tokens\",\n    \"input_tokens\": 14,\n    \"input_token_details\": {\n      \"text_tokens\": 10,\n      \"audio_tokens\": 4\n    },\n    \"output_tokens\": 31,\n    \"total_tokens\": 45\n  }\n}\n"
+        }
+      },
+      "TranscriptTextSegmentEvent": {
+        "type": "object",
+        "description": "Emitted when a diarized transcription returns a completed segment with speaker information. Only emitted when you [create a transcription](https://developers.openai.com/api/reference/resources/audio/subresources/transcriptions/methods/create) with `stream` set to `true` and `response_format` set to `diarized_json`.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `transcript.text.segment`.",
+            "enum": [
+              "transcript.text.segment"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the segment."
+          },
+          "start": {
+            "type": "number",
+            "format": "double",
+            "description": "Start timestamp of the segment in seconds."
+          },
+          "end": {
+            "type": "number",
+            "format": "double",
+            "description": "End timestamp of the segment in seconds."
+          },
+          "text": {
+            "type": "string",
+            "description": "Transcript text for this segment."
+          },
+          "speaker": {
+            "type": "string",
+            "description": "Speaker label for this segment."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "start",
+          "end",
+          "text",
+          "speaker"
+        ],
+        "x-oaiMeta": {
+          "name": "Stream Event (transcript.text.segment)",
+          "group": "transcript",
+          "example": "{\n  \"type\": \"transcript.text.segment\",\n  \"id\": \"seg_002\",\n  \"start\": 5.2,\n  \"end\": 12.8,\n  \"text\": \"Hi, I need help with diarization.\",\n  \"speaker\": \"A\"\n}\n"
+        }
+      },
+      "TranscriptTextUsageDuration": {
+        "type": "object",
+        "title": "Duration Usage",
+        "description": "Usage statistics for models billed by audio input duration.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "duration"
+            ],
+            "description": "The type of the usage object. Always `duration` for this variant.",
+            "x-stainless-const": true
+          },
+          "seconds": {
+            "type": "number",
+            "format": "double",
+            "description": "Duration of the input audio in seconds."
+          }
+        },
+        "required": [
+          "type",
+          "seconds"
+        ]
+      },
+      "TranscriptTextUsageTokens": {
+        "type": "object",
+        "title": "Token Usage",
+        "description": "Usage statistics for models billed by token usage.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tokens"
+            ],
+            "description": "The type of the usage object. Always `tokens` for this variant.",
+            "x-stainless-const": true
+          },
+          "input_tokens": {
+            "type": "integer",
+            "description": "Number of input tokens billed for this request."
+          },
+          "input_token_details": {
+            "type": "object",
+            "description": "Details about the input tokens billed for this request.",
+            "properties": {
+              "text_tokens": {
+                "type": "integer",
+                "description": "Number of text tokens billed for this request."
+              },
+              "audio_tokens": {
+                "type": "integer",
+                "description": "Number of audio tokens billed for this request."
+              }
+            }
+          },
+          "output_tokens": {
+            "type": "integer",
+            "description": "Number of output tokens generated."
+          },
+          "total_tokens": {
+            "type": "integer",
+            "description": "Total number of tokens used (input + output)."
+          }
+        },
+        "required": [
+          "type",
+          "input_tokens",
+          "output_tokens",
+          "total_tokens"
+        ]
+      },
+      "TranscriptionChunkingStrategy": {
+        "type": "object",
+        "description": "Controls how the audio is cut into chunks. When set to `\"auto\"`, the\nserver first normalizes loudness and then uses voice activity detection (VAD) to\nchoose boundaries. `server_vad` object can be provided to tweak VAD detection\nparameters manually. If unset, the audio is transcribed as a single block. ",
+        "oneOf": [
+          {
+            "type": "string",
+            "enum": [
+              "auto"
+            ],
+            "default": [
+              "auto"
+            ],
+            "description": "Automatically set chunking parameters based on the audio. Must be set to `\"auto\"`.\n",
+            "x-stainless-const": true
+          },
+          {
+            "$ref": "#/components/schemas/VadConfig"
+          }
+        ]
+      },
+      "TranscriptionDiarizedSegment": {
+        "type": "object",
+        "description": "A segment of diarized transcript text with speaker metadata.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the segment. Always `transcript.text.segment`.\n",
+            "enum": [
+              "transcript.text.segment"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the segment."
+          },
+          "start": {
+            "type": "number",
+            "format": "double",
+            "description": "Start timestamp of the segment in seconds."
+          },
+          "end": {
+            "type": "number",
+            "format": "double",
+            "description": "End timestamp of the segment in seconds."
+          },
+          "text": {
+            "type": "string",
+            "description": "Transcript text for this segment."
+          },
+          "speaker": {
+            "type": "string",
+            "description": "Speaker label for this segment. When known speakers are provided, the label matches `known_speaker_names[]`. Otherwise speakers are labeled sequentially using capital letters (`A`, `B`, ...).\n"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "start",
+          "end",
+          "text",
+          "speaker"
+        ]
+      },
+      "TranscriptionInclude": {
+        "type": "string",
+        "enum": [
+          "logprobs"
+        ],
+        "default": []
+      },
+      "TranscriptionLanguage": {
+        "type": "object",
+        "description": "A language detected in transcribed audio.",
+        "properties": {
+          "code": {
+            "type": "string",
+            "description": "The code of a language detected in the audio."
+          }
+        },
+        "required": [
+          "code"
+        ]
+      },
+      "TranscriptionSegment": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "Unique identifier of the segment."
+          },
+          "seek": {
+            "type": "integer",
+            "description": "Seek offset of the segment."
+          },
+          "start": {
+            "type": "number",
+            "format": "double",
+            "description": "Start time of the segment in seconds."
+          },
+          "end": {
+            "type": "number",
+            "format": "double",
+            "description": "End time of the segment in seconds."
+          },
+          "text": {
+            "type": "string",
+            "description": "Text content of the segment."
+          },
+          "tokens": {
+            "type": "array",
+            "items": {
+              "type": "integer"
+            },
+            "description": "Array of token IDs for the text content."
+          },
+          "temperature": {
+            "type": "number",
+            "format": "float",
+            "description": "Temperature parameter used for generating the segment."
+          },
+          "avg_logprob": {
+            "type": "number",
+            "format": "float",
+            "description": "Average logprob of the segment. If the value is lower than -1, consider the logprobs failed."
+          },
+          "compression_ratio": {
+            "type": "number",
+            "format": "float",
+            "description": "Compression ratio of the segment. If the value is greater than 2.4, consider the compression failed."
+          },
+          "no_speech_prob": {
+            "type": "number",
+            "format": "float",
+            "description": "Probability of no speech in the segment. If the value is higher than 1.0 and the `avg_logprob` is below -1, consider this segment silent."
+          }
+        },
+        "required": [
+          "id",
+          "seek",
+          "start",
+          "end",
+          "text",
+          "tokens",
+          "temperature",
+          "avg_logprob",
+          "compression_ratio",
+          "no_speech_prob"
+        ]
+      },
+      "TranscriptionWord": {
+        "type": "object",
+        "properties": {
+          "word": {
+            "type": "string",
+            "description": "The text content of the word."
+          },
+          "start": {
+            "type": "number",
+            "format": "double",
+            "description": "Start time of the word in seconds."
+          },
+          "end": {
+            "type": "number",
+            "format": "double",
+            "description": "End time of the word in seconds."
+          }
+        },
+        "required": [
+          "word",
+          "start",
+          "end"
+        ]
+      },
+      "TruncationObject": {
+        "type": "object",
+        "title": "Thread Truncation Controls",
+        "description": "Controls for how a thread will be truncated prior to the run. Use this to control the initial context window of the run.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The truncation strategy to use for the thread. The default is `auto`. If set to `last_messages`, the thread will be truncated to the n most recent messages in the thread. When set to `auto`, messages in the middle of the thread will be dropped to fit the context length of the model, `max_prompt_tokens`.",
+            "enum": [
+              "auto",
+              "last_messages"
+            ]
+          },
+          "last_messages": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "The number of most recent messages from the thread when constructing the context for the run.",
+                "minimum": 1
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "UpdateGroupBody": {
+        "type": "object",
+        "description": "Request payload for updating the details of an existing group.",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "New display name for the group.",
+            "minLength": 1,
+            "maxLength": 255
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "x-oaiMeta": {
+          "example": "{\n    \"name\": \"Escalations\"\n}\n"
+        }
+      },
+      "UpdateOrganizationDataRetentionBody": {
+        "type": "object",
+        "description": "Parameters for updating organization data retention controls.",
+        "properties": {
+          "retention_type": {
+            "type": "string",
+            "enum": [
+              "zero_data_retention",
+              "modified_abuse_monitoring",
+              "enhanced_zero_data_retention",
+              "enhanced_modified_abuse_monitoring"
+            ],
+            "description": "The desired organization data retention type."
+          }
+        },
+        "required": [
+          "retention_type"
+        ]
+      },
+      "UpdateProjectDataRetentionBody": {
+        "type": "object",
+        "description": "Parameters for updating project data retention controls.",
+        "properties": {
+          "retention_type": {
+            "type": "string",
+            "enum": [
+              "organization_default",
+              "none",
+              "zero_data_retention",
+              "modified_abuse_monitoring",
+              "enhanced_zero_data_retention",
+              "enhanced_modified_abuse_monitoring"
+            ],
+            "description": "The desired project data retention type."
+          }
+        },
+        "required": [
+          "retention_type"
+        ]
+      },
+      "UpdateProjectServiceAccountBody": {
+        "type": "object",
+        "description": "Parameters for updating a project service account.",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The updated service account name."
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "member",
+              "owner"
+            ],
+            "description": "The updated service account role."
+          }
+        }
+      },
+      "UpdateVectorStoreFileAttributesRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "attributes": {
+            "$ref": "#/components/schemas/VectorStoreFileAttributes"
+          }
+        },
+        "required": [
+          "attributes"
+        ],
+        "x-oaiMeta": {
+          "name": "Update vector store file attributes request"
+        }
+      },
+      "UpdateVectorStoreRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "name": {
+            "description": "The name of the vector store.",
+            "type": "string",
+            "nullable": true
+          },
+          "expires_after": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/VectorStoreExpirationAfter"
+              },
+              {
+                "nullable": true
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        }
+      },
+      "UpdateVoiceConsentRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The updated label for this consent recording."
+          }
+        },
+        "required": [
+          "name"
+        ]
+      },
+      "Upload": {
+        "type": "object",
+        "title": "Upload",
+        "description": "The Upload object can accept byte chunks in the form of Parts.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The Upload unique identifier, which can be referenced in API endpoints."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the Upload was created."
+          },
+          "filename": {
+            "type": "string",
+            "description": "The name of the file to be uploaded."
+          },
+          "bytes": {
+            "type": "integer",
+            "description": "The intended number of bytes to be uploaded."
+          },
+          "purpose": {
+            "type": "string",
+            "description": "The intended purpose of the file. [Please refer here](https://developers.openai.com/api/reference/resources/files#%28resource%29%20files%20%3E%20%28model%29%20file_object%20%3E%20%28schema%29%20%3E%20%28property%29%20purpose) for acceptable values."
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the Upload.",
+            "enum": [
+              "pending",
+              "completed",
+              "cancelled",
+              "expired"
+            ]
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the Upload will expire."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always \"upload\".",
+            "enum": [
+              "upload"
+            ],
+            "x-stainless-const": true
+          },
+          "file": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/OpenAIFile"
+              },
+              {
+                "nullable": true,
+                "description": "The ready File object after the Upload is completed."
+              }
+            ]
+          }
+        },
+        "required": [
+          "bytes",
+          "created_at",
+          "expires_at",
+          "filename",
+          "id",
+          "purpose",
+          "status"
+        ],
+        "x-oaiMeta": {
+          "name": "The upload object",
+          "example": "{\n  \"id\": \"upload_abc123\",\n  \"object\": \"upload\",\n  \"bytes\": 2147483648,\n  \"created_at\": 1719184911,\n  \"filename\": \"training_examples.jsonl\",\n  \"purpose\": \"fine-tune\",\n  \"status\": \"completed\",\n  \"expires_at\": 1719127296,\n  \"file\": {\n    \"id\": \"file-xyz321\",\n    \"object\": \"file\",\n    \"bytes\": 2147483648,\n    \"created_at\": 1719186911,\n    \"filename\": \"training_examples.jsonl\",\n    \"purpose\": \"fine-tune\",\n  }\n}\n"
+        }
+      },
+      "UploadCertificateRequest": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "An optional name for the certificate"
+          },
+          "certificate": {
+            "type": "string",
+            "description": "The certificate content in PEM format"
+          }
+        },
+        "required": [
+          "certificate"
+        ]
+      },
+      "UploadPart": {
+        "type": "object",
+        "title": "UploadPart",
+        "description": "The upload Part represents a chunk of bytes we can add to an Upload object.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The upload Part unique identifier, which can be referenced in API endpoints."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the Part was created."
+          },
+          "upload_id": {
+            "type": "string",
+            "description": "The ID of the Upload object that this Part was added to."
+          },
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always `upload.part`.",
+            "enum": [
+              "upload.part"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "created_at",
+          "id",
+          "object",
+          "upload_id"
+        ],
+        "x-oaiMeta": {
+          "name": "The upload part object",
+          "example": "{\n    \"id\": \"part_def456\",\n    \"object\": \"upload.part\",\n    \"created_at\": 1719186911,\n    \"upload_id\": \"upload_abc123\"\n}\n"
+        }
+      },
+      "UsageAudioSpeechesResult": {
+        "type": "object",
+        "description": "The aggregated audio speeches usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.audio_speeches.result"
+            ],
+            "x-stainless-const": true
+          },
+          "characters": {
+            "type": "integer",
+            "description": "The number of characters processed."
+          },
+          "num_model_requests": {
+            "type": "integer",
+            "description": "The count of requests made to the model."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=user_id`, this field provides the user ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API key ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=model`, this field provides the model name of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "characters",
+          "num_model_requests"
+        ],
+        "x-oaiMeta": {
+          "name": "Audio speeches usage object",
+          "example": "{\n    \"object\": \"organization.usage.audio_speeches.result\",\n    \"characters\": 45,\n    \"num_model_requests\": 1,\n    \"project_id\": \"proj_abc\",\n    \"user_id\": \"user-abc\",\n    \"api_key_id\": \"key_abc\",\n    \"model\": \"tts-1\"\n}\n"
+        }
+      },
+      "UsageAudioTranscriptionsResult": {
+        "type": "object",
+        "description": "The aggregated audio transcriptions usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.audio_transcriptions.result"
+            ],
+            "x-stainless-const": true
+          },
+          "seconds": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of seconds processed."
+          },
+          "num_model_requests": {
+            "type": "integer",
+            "description": "The count of requests made to the model."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=user_id`, this field provides the user ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API key ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=model`, this field provides the model name of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "seconds",
+          "num_model_requests"
+        ],
+        "x-oaiMeta": {
+          "name": "Audio transcriptions usage object",
+          "example": "{\n    \"object\": \"organization.usage.audio_transcriptions.result\",\n    \"seconds\": 10,\n    \"num_model_requests\": 1,\n    \"project_id\": \"proj_abc\",\n    \"user_id\": \"user-abc\",\n    \"api_key_id\": \"key_abc\",\n    \"model\": \"tts-1\"\n}\n"
+        }
+      },
+      "UsageCodeInterpreterSessionsResult": {
+        "type": "object",
+        "description": "The aggregated code interpreter sessions usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.code_interpreter_sessions.result"
+            ],
+            "x-stainless-const": true
+          },
+          "num_sessions": {
+            "type": "integer",
+            "description": "The number of code interpreter sessions."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "num_sessions"
+        ],
+        "x-oaiMeta": {
+          "name": "Code interpreter sessions usage object",
+          "example": "{\n    \"object\": \"organization.usage.code_interpreter_sessions.result\",\n    \"num_sessions\": 1,\n    \"project_id\": \"proj_abc\"\n}\n"
+        }
+      },
+      "UsageCompletionsResult": {
+        "type": "object",
+        "description": "The aggregated completions usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.completions.result"
+            ],
+            "x-stainless-const": true
+          },
+          "input_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of input tokens used, including cached and cache-write tokens. This includes text, audio, and image tokens. For customers subscribed to Scale Tier, this includes Scale Tier tokens."
+          },
+          "input_cached_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of cached input tokens used across text, audio, and image inputs. For customers subscribed to Scale Tier, this includes Scale Tier tokens."
+          },
+          "input_cache_write_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of input tokens written to the cache."
+          },
+          "input_uncached_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of uncached input tokens used across text, audio, and image inputs, excluding cache-write tokens."
+          },
+          "output_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of output tokens used across text, audio, and image outputs. For customers subscribed to Scale Tier, this includes Scale Tier tokens."
+          },
+          "input_text_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of uncached text input tokens used, excluding cache-write tokens."
+          },
+          "output_text_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of text output tokens used."
+          },
+          "input_cached_text_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of cached text input tokens used."
+          },
+          "input_audio_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of uncached audio input tokens used."
+          },
+          "input_cached_audio_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of cached audio input tokens used."
+          },
+          "output_audio_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of audio output tokens used."
+          },
+          "input_image_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of uncached image input tokens used."
+          },
+          "input_cached_image_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of cached image input tokens used."
+          },
+          "output_image_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of image output tokens used."
+          },
+          "num_model_requests": {
+            "type": "integer",
+            "description": "The count of requests made to the model."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=user_id`, this field provides the user ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API key ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=model`, this field provides the model name of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "batch": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "When `group_by=batch`, this field tells whether the grouped usage result is batch or not."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=service_tier`, this field provides the service tier of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "input_tokens",
+          "output_tokens",
+          "num_model_requests"
+        ],
+        "x-oaiMeta": {
+          "name": "Completions usage object",
+          "example": "{\n    \"object\": \"organization.usage.completions.result\",\n    \"input_tokens\": 5000,\n    \"input_cached_tokens\": 1800,\n    \"input_cache_write_tokens\": 200,\n    \"input_uncached_tokens\": 3000,\n    \"output_tokens\": 1000,\n    \"input_text_tokens\": 2500,\n    \"output_text_tokens\": 800,\n    \"input_cached_text_tokens\": 1500,\n    \"input_audio_tokens\": 300,\n    \"input_cached_audio_tokens\": 100,\n    \"output_audio_tokens\": 100,\n    \"input_image_tokens\": 200,\n    \"input_cached_image_tokens\": 200,\n    \"output_image_tokens\": 100,\n    \"num_model_requests\": 5,\n    \"project_id\": \"proj_abc\",\n    \"user_id\": \"user-abc\",\n    \"api_key_id\": \"key_abc\",\n    \"model\": \"gpt-6-astra\",\n    \"batch\": false,\n    \"service_tier\": \"default\"\n}\n"
+        }
+      },
+      "UsageEmbeddingsResult": {
+        "type": "object",
+        "description": "The aggregated embeddings usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.embeddings.result"
+            ],
+            "x-stainless-const": true
+          },
+          "input_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of input tokens used."
+          },
+          "num_model_requests": {
+            "type": "integer",
+            "description": "The count of requests made to the model."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=user_id`, this field provides the user ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API key ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=model`, this field provides the model name of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "input_tokens",
+          "num_model_requests"
+        ],
+        "x-oaiMeta": {
+          "name": "Embeddings usage object",
+          "example": "{\n    \"object\": \"organization.usage.embeddings.result\",\n    \"input_tokens\": 20,\n    \"num_model_requests\": 2,\n    \"project_id\": \"proj_abc\",\n    \"user_id\": \"user-abc\",\n    \"api_key_id\": \"key_abc\",\n    \"model\": \"text-embedding-ada-002-v2\"\n}\n"
+        }
+      },
+      "UsageFileSearchCallsResult": {
+        "type": "object",
+        "description": "The aggregated file search calls usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.file_searches.result"
+            ],
+            "x-stainless-const": true
+          },
+          "num_requests": {
+            "type": "integer",
+            "description": "The count of file search calls."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=user_id`, this field provides the user ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API key ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "vector_store_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=vector_store_id`, this field provides the vector store ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "num_requests"
+        ],
+        "x-oaiMeta": {
+          "name": "File search calls usage object",
+          "example": "{\n    \"object\": \"organization.usage.file_searches.result\",\n    \"num_requests\": 2,\n    \"project_id\": \"proj_abc\",\n    \"user_id\": \"user-abc\",\n    \"api_key_id\": \"key_abc\",\n    \"vector_store_id\": \"vs_abc\"\n}\n"
+        }
+      },
+      "UsageImagesResult": {
+        "type": "object",
+        "description": "The aggregated images usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.images.result"
+            ],
+            "x-stainless-const": true
+          },
+          "images": {
+            "type": "integer",
+            "description": "The number of images processed."
+          },
+          "num_model_requests": {
+            "type": "integer",
+            "description": "The count of requests made to the model."
+          },
+          "source": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=source`, this field provides the source of the grouped usage result, possible values are `image.generation`, `image.edit`, `image.variation`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=size`, this field provides the image size of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=user_id`, this field provides the user ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API key ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=model`, this field provides the model name of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "images",
+          "num_model_requests"
+        ],
+        "x-oaiMeta": {
+          "name": "Images usage object",
+          "example": "{\n    \"object\": \"organization.usage.images.result\",\n    \"images\": 2,\n    \"num_model_requests\": 2,\n    \"size\": \"1024x1024\",\n    \"source\": \"image.generation\",\n    \"project_id\": \"proj_abc\",\n    \"user_id\": \"user-abc\",\n    \"api_key_id\": \"key_abc\",\n    \"model\": \"dall-e-3\"\n}\n"
+        }
+      },
+      "UsageModerationsResult": {
+        "type": "object",
+        "description": "The aggregated moderations usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.moderations.result"
+            ],
+            "x-stainless-const": true
+          },
+          "input_tokens": {
+            "type": "integer",
+            "description": "The aggregated number of input tokens used."
+          },
+          "num_model_requests": {
+            "type": "integer",
+            "description": "The count of requests made to the model."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=user_id`, this field provides the user ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API key ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=model`, this field provides the model name of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "input_tokens",
+          "num_model_requests"
+        ],
+        "x-oaiMeta": {
+          "name": "Moderations usage object",
+          "example": "{\n    \"object\": \"organization.usage.moderations.result\",\n    \"input_tokens\": 20,\n    \"num_model_requests\": 2,\n    \"project_id\": \"proj_abc\",\n    \"user_id\": \"user-abc\",\n    \"api_key_id\": \"key_abc\",\n    \"model\": \"text-moderation\"\n}\n"
+        }
+      },
+      "UsageResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "page"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UsageTimeBucket"
+            }
+          },
+          "has_more": {
+            "type": "boolean"
+          },
+          "next_page": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "next_page"
+        ]
+      },
+      "UsageTimeBucket": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "bucket"
+            ],
+            "x-stainless-const": true
+          },
+          "start_time": {
+            "type": "integer"
+          },
+          "end_time": {
+            "type": "integer"
+          },
+          "results": {
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/UsageCompletionsResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageEmbeddingsResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageModerationsResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageImagesResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageAudioSpeechesResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageAudioTranscriptionsResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageVectorStoresResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageCodeInterpreterSessionsResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageFileSearchCallsResult"
+                },
+                {
+                  "$ref": "#/components/schemas/UsageWebSearchCallsResult"
+                },
+                {
+                  "$ref": "#/components/schemas/CostsResult"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "object"
+              }
+            }
+          }
+        },
+        "required": [
+          "object",
+          "start_time",
+          "end_time",
+          "results"
+        ]
+      },
+      "UsageVectorStoresResult": {
+        "type": "object",
+        "description": "The aggregated vector stores usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.vector_stores.result"
+            ],
+            "x-stainless-const": true
+          },
+          "usage_bytes": {
+            "type": "integer",
+            "description": "The vector stores usage in bytes."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "usage_bytes"
+        ],
+        "x-oaiMeta": {
+          "name": "Vector stores usage object",
+          "example": "{\n    \"object\": \"organization.usage.vector_stores.result\",\n    \"usage_bytes\": 1024,\n    \"project_id\": \"proj_abc\"\n}\n"
+        }
+      },
+      "UsageWebSearchCallsResult": {
+        "type": "object",
+        "description": "The aggregated web search calls usage details of the specific time bucket.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.usage.web_searches.result"
+            ],
+            "x-stainless-const": true
+          },
+          "num_model_requests": {
+            "type": "integer",
+            "description": "The count of model requests."
+          },
+          "num_requests": {
+            "type": "integer",
+            "description": "The count of web search calls."
+          },
+          "project_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=project_id`, this field provides the project ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=user_id`, this field provides the user ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "api_key_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=api_key_id`, this field provides the API key ID of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=model`, this field provides the model name of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "context_level": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "When `group_by=context_level`, this field provides the search context size of the grouped usage result."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "num_model_requests",
+          "num_requests"
+        ],
+        "x-oaiMeta": {
+          "name": "Web search calls usage object",
+          "example": "{\n    \"object\": \"organization.usage.web_searches.result\",\n    \"num_model_requests\": 2,\n    \"num_requests\": 2,\n    \"project_id\": \"proj_abc\",\n    \"user_id\": \"user-abc\",\n    \"api_key_id\": \"key_abc\",\n    \"model\": \"gpt-6-astra\",\n    \"context_level\": \"medium\"\n}\n"
+        }
+      },
+      "User": {
+        "type": "object",
+        "description": "Represents an individual `user` within an organization.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.user"
+            ],
+            "description": "The object type, which is always `organization.user`",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier, which can be referenced in API endpoints"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The name of the user"
+          },
+          "email": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The email address of the user"
+          },
+          "role": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "`owner` or `reader`"
+          },
+          "added_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the user was added."
+          },
+          "is_default": {
+            "type": "boolean",
+            "description": "Whether this is the organization's default user."
+          },
+          "created": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the user was created."
+          },
+          "user": {
+            "type": "object",
+            "description": "Nested user details.",
+            "properties": {
+              "object": {
+                "type": "string",
+                "enum": [
+                  "user"
+                ],
+                "x-stainless-const": true
+              },
+              "id": {
+                "type": "string"
+              },
+              "email": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "name": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "picture": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "enabled": {
+                "anyOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "banned": {
+                "anyOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "banned_at": {
+                "anyOf": [
+                  {
+                    "type": "integer",
+                    "format": "unixtime"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "object",
+              "id"
+            ]
+          },
+          "is_service_account": {
+            "type": "boolean",
+            "description": "Whether the user is a service account."
+          },
+          "is_scale_tier_authorized_purchaser": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Whether the user is an authorized purchaser for Scale Tier."
+          },
+          "is_scim_managed": {
+            "type": "boolean",
+            "description": "Whether the user is managed through SCIM."
+          },
+          "api_key_last_used_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The Unix timestamp (in seconds) of the user's last API key usage."
+          },
+          "technical_level": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The technical level metadata for the user."
+          },
+          "developer_persona": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The developer persona metadata for the user."
+          },
+          "projects": {
+            "anyOf": [
+              {
+                "type": "object",
+                "properties": {
+                  "object": {
+                    "type": "string",
+                    "enum": [
+                      "list"
+                    ],
+                    "x-stainless-const": true
+                  },
+                  "data": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "null"
+                            }
+                          ]
+                        },
+                        "name": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "null"
+                            }
+                          ]
+                        },
+                        "role": {
+                          "anyOf": [
+                            {
+                              "type": "string"
+                            },
+                            {
+                              "type": "null"
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                },
+                "required": [
+                  "object",
+                  "data"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Projects associated with the user, if included."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "added_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The user object",
+          "example": "{\n    \"object\": \"organization.user\",\n    \"id\": \"user_abc\",\n    \"name\": \"First Last\",\n    \"email\": \"user@example.com\",\n    \"role\": \"owner\",\n    \"added_at\": 1711471533\n}\n"
+        }
+      },
+      "UserDeleteResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.user.deleted"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string"
+          },
+          "deleted": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "deleted"
+        ]
+      },
+      "UserListResource": {
+        "type": "object",
+        "description": "Paginated list of user objects returned when inspecting group membership.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "Always `list`.",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "Users in the current page.",
+            "items": {
+              "$ref": "#/components/schemas/GroupUser"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether more users are available when paginating."
+          },
+          "next": {
+            "description": "Cursor to fetch the next page of results, or `null` when no further users are available.",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "next"
+        ],
+        "x-oaiMeta": {
+          "name": "Group user list",
+          "example": "{\n    \"object\": \"list\",\n    \"data\": [\n        {\n            \"id\": \"user_abc123\",\n            \"name\": \"Ada Lovelace\",\n            \"email\": \"ada@example.com\"\n        }\n    ],\n    \"has_more\": false,\n    \"next\": null\n}\n"
+        }
+      },
+      "UserListResponse": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/User"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ]
+      },
+      "UserRoleAssignment": {
+        "type": "object",
+        "description": "Role assignment linking a user to a role.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "user.role"
+            ],
+            "description": "Always `user.role`.",
+            "x-stainless-const": true
+          },
+          "user": {
+            "$ref": "#/components/schemas/User"
+          },
+          "role": {
+            "$ref": "#/components/schemas/Role"
+          }
+        },
+        "required": [
+          "object",
+          "user",
+          "role"
+        ],
+        "x-oaiMeta": {
+          "name": "The user role object",
+          "example": "{\n    \"object\": \"user.role\",\n    \"user\": {\n        \"object\": \"organization.user\",\n        \"id\": \"user_abc123\",\n        \"name\": \"Ada Lovelace\",\n        \"email\": \"ada@example.com\",\n        \"role\": \"owner\",\n        \"added_at\": 1711470000\n    },\n    \"role\": {\n        \"object\": \"role\",\n        \"id\": \"role_01J1F8ROLE01\",\n        \"name\": \"API Group Manager\",\n        \"description\": \"Allows managing organization groups\",\n        \"permissions\": [\n            \"api.groups.read\",\n            \"api.groups.write\"\n        ],\n        \"resource_type\": \"api.organization\",\n        \"predefined_role\": false\n    }\n}\n"
+        }
+      },
+      "UserRoleUpdateRequest": {
+        "type": "object",
+        "properties": {
+          "role": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "`owner` or `reader`"
+          },
+          "role_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Role ID to assign to the user."
+          },
+          "technical_level": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Technical level metadata."
+          },
+          "developer_persona": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Developer persona metadata."
+          }
+        }
+      },
+      "VadConfig": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+          "type"
+        ],
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "server_vad"
+            ],
+            "description": "Must be set to `server_vad` to enable manual chunking using server side VAD."
+          },
+          "prefix_padding_ms": {
+            "type": "integer",
+            "default": 300,
+            "description": "Amount of audio to include before the VAD detected speech (in \nmilliseconds).\n"
+          },
+          "silence_duration_ms": {
+            "type": "integer",
+            "default": 200,
+            "description": "Duration of silence to detect speech stop (in milliseconds).\nWith shorter values the model will respond more quickly, \nbut may jump in on short pauses from the user.\n"
+          },
+          "threshold": {
+            "type": "number",
+            "default": 0.5,
+            "description": "Sensitivity threshold (0.0 to 1.0) for voice activity detection. A \nhigher threshold will require louder audio to activate the model, and \nthus might perform better in noisy environments.\n"
+          }
+        }
+      },
+      "ValidateGraderRequest": {
+        "type": "object",
+        "title": "ValidateGraderRequest",
+        "properties": {
+          "grader": {
+            "type": "object",
+            "description": "The grader used for the fine-tuning job.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/GraderStringCheck"
+              },
+              {
+                "$ref": "#/components/schemas/GraderTextSimilarity"
+              },
+              {
+                "$ref": "#/components/schemas/GraderPython"
+              },
+              {
+                "$ref": "#/components/schemas/GraderScoreModel"
+              },
+              {
+                "$ref": "#/components/schemas/GraderMulti"
+              }
+            ]
+          }
+        },
+        "required": [
+          "grader"
+        ]
+      },
+      "ValidateGraderResponse": {
+        "type": "object",
+        "title": "ValidateGraderResponse",
+        "properties": {
+          "grader": {
+            "type": "object",
+            "description": "The grader used for the fine-tuning job.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/GraderStringCheck"
+              },
+              {
+                "$ref": "#/components/schemas/GraderTextSimilarity"
+              },
+              {
+                "$ref": "#/components/schemas/GraderPython"
+              },
+              {
+                "$ref": "#/components/schemas/GraderScoreModel"
+              },
+              {
+                "$ref": "#/components/schemas/GraderMulti"
+              }
+            ]
+          }
+        }
+      },
+      "VectorStoreExpirationAfter": {
+        "type": "object",
+        "title": "Vector store expiration policy",
+        "description": "The expiration policy for a vector store.",
+        "properties": {
+          "anchor": {
+            "description": "Anchor timestamp after which the expiration policy applies. Supported anchors: `last_active_at`.",
+            "type": "string",
+            "enum": [
+              "last_active_at"
+            ],
+            "x-stainless-const": true
+          },
+          "days": {
+            "description": "The number of days after the anchor time that the vector store will expire.",
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 365
+          }
+        },
+        "required": [
+          "anchor",
+          "days"
+        ]
+      },
+      "VectorStoreFileAttributes": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "Set of 16 key-value pairs that can be attached to an object. This can be\nuseful for storing additional information about the object in a structured\nformat, and querying for objects via API or the dashboard. Keys are strings\nwith a maximum length of 64 characters. Values are strings with a maximum\nlength of 512 characters, booleans, or numbers.\n",
+            "maxProperties": 16,
+            "propertyNames": {
+              "type": "string",
+              "maxLength": 64
+            },
+            "additionalProperties": {
+              "oneOf": [
+                {
+                  "type": "string",
+                  "maxLength": 512
+                },
+                {
+                  "type": "number"
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
+            },
+            "x-oaiTypeLabel": "map"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "VectorStoreFileBatchObject": {
+        "type": "object",
+        "title": "Vector store file batch",
+        "description": "A batch of files attached to a vector store.",
+        "properties": {
+          "id": {
+            "description": "The identifier, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `vector_store.file_batch`.",
+            "type": "string",
+            "enum": [
+              "vector_store.files_batch"
+            ],
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "description": "The Unix timestamp (in seconds) for when the vector store files batch was created.",
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "vector_store_id": {
+            "description": "The ID of the [vector store](https://developers.openai.com/api/reference/resources/vector_stores) that the [File](https://developers.openai.com/api/reference/resources/files) is attached to.",
+            "type": "string"
+          },
+          "status": {
+            "description": "The status of the vector store files batch, which can be either `in_progress`, `completed`, `cancelled` or `failed`.",
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "completed",
+              "cancelled",
+              "failed"
+            ]
+          },
+          "file_counts": {
+            "type": "object",
+            "properties": {
+              "in_progress": {
+                "description": "The number of files that are currently being processed.",
+                "type": "integer"
+              },
+              "completed": {
+                "description": "The number of files that have been processed.",
+                "type": "integer"
+              },
+              "failed": {
+                "description": "The number of files that have failed to process.",
+                "type": "integer"
+              },
+              "cancelled": {
+                "description": "The number of files that where cancelled.",
+                "type": "integer"
+              },
+              "total": {
+                "description": "The total number of files.",
+                "type": "integer"
+              }
+            },
+            "required": [
+              "in_progress",
+              "completed",
+              "cancelled",
+              "failed",
+              "total"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "vector_store_id",
+          "status",
+          "file_counts"
+        ],
+        "x-oaiMeta": {
+          "name": "The vector store files batch object",
+          "beta": true,
+          "example": "{\n  \"id\": \"vsfb_123\",\n  \"object\": \"vector_store.files_batch\",\n  \"created_at\": 1698107661,\n  \"vector_store_id\": \"vs_abc123\",\n  \"status\": \"completed\",\n  \"file_counts\": {\n    \"in_progress\": 0,\n    \"completed\": 100,\n    \"failed\": 0,\n    \"cancelled\": 0,\n    \"total\": 100\n  }\n}\n"
+        }
+      },
+      "VectorStoreFileContentResponse": {
+        "type": "object",
+        "description": "Represents the parsed content of a vector store file.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "vector_store.file_content.page"
+            ],
+            "description": "The object type, which is always `vector_store.file_content.page`",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "Parsed content of the file.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "description": "The content type (currently only `\"text\"`)"
+                },
+                "text": {
+                  "type": "string",
+                  "description": "The text content"
+                }
+              }
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Indicates if there are more content pages to fetch."
+          },
+          "next_page": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The token for the next page, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "next_page"
+        ]
+      },
+      "VectorStoreFileObject": {
+        "type": "object",
+        "title": "Vector store files",
+        "description": "A list of files attached to a vector store.",
+        "properties": {
+          "id": {
+            "description": "The identifier, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `vector_store.file`.",
+            "type": "string",
+            "enum": [
+              "vector_store.file"
+            ],
+            "x-stainless-const": true
+          },
+          "usage_bytes": {
+            "description": "The total vector store usage in bytes. Note that this may be different from the original file size.",
+            "type": "integer"
+          },
+          "created_at": {
+            "description": "The Unix timestamp (in seconds) for when the vector store file was created.",
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "vector_store_id": {
+            "description": "The ID of the [vector store](https://developers.openai.com/api/reference/resources/vector_stores) that the [File](https://developers.openai.com/api/reference/resources/files) is attached to.",
+            "type": "string"
+          },
+          "status": {
+            "description": "The status of the vector store file, which can be either `in_progress`, `completed`, `cancelled`, or `failed`. The status `completed` indicates that the vector store file is ready for use.",
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "completed",
+              "cancelled",
+              "failed"
+            ]
+          },
+          "last_error": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "The last error associated with this vector store file. Will be `null` if there are no errors.",
+                "properties": {
+                  "code": {
+                    "type": "string",
+                    "description": "One of `server_error`, `unsupported_file`, or `invalid_file`.",
+                    "enum": [
+                      "server_error",
+                      "unsupported_file",
+                      "invalid_file"
+                    ]
+                  },
+                  "message": {
+                    "type": "string",
+                    "description": "A human-readable description of the error."
+                  }
+                },
+                "required": [
+                  "code",
+                  "message"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "chunking_strategy": {
+            "type": "object",
+            "description": "The strategy used to chunk the file.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/StaticChunkingStrategyResponseParam"
+              },
+              {
+                "$ref": "#/components/schemas/OtherChunkingStrategyResponseParam"
+              }
+            ]
+          },
+          "attributes": {
+            "$ref": "#/components/schemas/VectorStoreFileAttributes"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "usage_bytes",
+          "created_at",
+          "vector_store_id",
+          "status",
+          "last_error"
+        ],
+        "x-oaiMeta": {
+          "name": "The vector store file object",
+          "beta": true,
+          "example": "{\n  \"id\": \"file-abc123\",\n  \"object\": \"vector_store.file\",\n  \"usage_bytes\": 1234,\n  \"created_at\": 1698107661,\n  \"vector_store_id\": \"vs_abc123\",\n  \"status\": \"completed\",\n  \"last_error\": null,\n  \"chunking_strategy\": {\n    \"type\": \"static\",\n    \"static\": {\n      \"max_chunk_size_tokens\": 800,\n      \"chunk_overlap_tokens\": 400\n    }\n  }\n}\n"
+        }
+      },
+      "VectorStoreObject": {
+        "type": "object",
+        "title": "Vector store",
+        "description": "A vector store is a collection of processed files can be used by the `file_search` tool.",
+        "properties": {
+          "id": {
+            "description": "The identifier, which can be referenced in API endpoints.",
+            "type": "string"
+          },
+          "object": {
+            "description": "The object type, which is always `vector_store`.",
+            "type": "string",
+            "enum": [
+              "vector_store"
+            ],
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "description": "The Unix timestamp (in seconds) for when the vector store was created.",
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "name": {
+            "description": "The name of the vector store.",
+            "type": "string"
+          },
+          "usage_bytes": {
+            "description": "The total number of bytes used by the files in the vector store.",
+            "type": "integer"
+          },
+          "file_counts": {
+            "type": "object",
+            "properties": {
+              "in_progress": {
+                "description": "The number of files that are currently being processed.",
+                "type": "integer"
+              },
+              "completed": {
+                "description": "The number of files that have been successfully processed.",
+                "type": "integer"
+              },
+              "failed": {
+                "description": "The number of files that have failed to process.",
+                "type": "integer"
+              },
+              "cancelled": {
+                "description": "The number of files that were cancelled.",
+                "type": "integer"
+              },
+              "total": {
+                "description": "The total number of files.",
+                "type": "integer"
+              }
+            },
+            "required": [
+              "in_progress",
+              "completed",
+              "failed",
+              "cancelled",
+              "total"
+            ]
+          },
+          "status": {
+            "description": "The status of the vector store, which can be either `expired`, `in_progress`, or `completed`. A status of `completed` indicates that the vector store is ready for use.",
+            "type": "string",
+            "enum": [
+              "expired",
+              "in_progress",
+              "completed"
+            ]
+          },
+          "expires_after": {
+            "$ref": "#/components/schemas/VectorStoreExpirationAfter"
+          },
+          "expires_at": {
+            "anyOf": [
+              {
+                "description": "The Unix timestamp (in seconds) for when the vector store will expire.",
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_active_at": {
+            "anyOf": [
+              {
+                "description": "The Unix timestamp (in seconds) for when the vector store was last active.",
+                "type": "integer",
+                "format": "unixtime"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "usage_bytes",
+          "created_at",
+          "status",
+          "last_active_at",
+          "name",
+          "file_counts",
+          "metadata"
+        ],
+        "x-oaiMeta": {
+          "name": "The vector store object",
+          "example": "{\n  \"id\": \"vs_123\",\n  \"object\": \"vector_store\",\n  \"created_at\": 1698107661,\n  \"usage_bytes\": 123456,\n  \"last_active_at\": 1698107661,\n  \"name\": \"my_vector_store\",\n  \"status\": \"completed\",\n  \"file_counts\": {\n    \"in_progress\": 0,\n    \"completed\": 100,\n    \"cancelled\": 0,\n    \"failed\": 0,\n    \"total\": 100\n  },\n  \"last_used_at\": 1698107661\n}\n"
+        }
+      },
+      "VectorStoreSearchRequest": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "query": {
+            "description": "A query string for a search",
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "description": "A list of queries to search for.",
+                  "minItems": 1
+                }
+              }
+            ]
+          },
+          "rewrite_query": {
+            "description": "Whether to rewrite the natural language query for vector search.",
+            "type": "boolean",
+            "default": false
+          },
+          "max_num_results": {
+            "description": "The maximum number of results to return. This number should be between 1 and 50 inclusive.",
+            "type": "integer",
+            "default": 10,
+            "minimum": 1,
+            "maximum": 50
+          },
+          "filters": {
+            "description": "A filter to apply based on file attributes.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ComparisonFilter"
+              },
+              {
+                "$ref": "#/components/schemas/CompoundFilter"
+              }
+            ]
+          },
+          "ranking_options": {
+            "description": "Ranking options for search.",
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "ranker": {
+                "description": "Enable re-ranking; set to `none` to disable, which can help reduce latency.",
+                "type": "string",
+                "enum": [
+                  "none",
+                  "auto",
+                  "default-2024-11-15"
+                ],
+                "default": "auto"
+              },
+              "score_threshold": {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 1,
+                "default": 0
+              }
+            }
+          }
+        },
+        "required": [
+          "query"
+        ],
+        "x-oaiMeta": {
+          "name": "Vector store search request"
+        }
+      },
+      "VectorStoreSearchResultContentObject": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "type": {
+            "description": "The type of content.",
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "text": {
+            "description": "The text content returned from search.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "x-oaiMeta": {
+          "name": "Vector store search result content object"
+        }
+      },
+      "VectorStoreSearchResultItem": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the vector store file."
+          },
+          "filename": {
+            "type": "string",
+            "description": "The name of the vector store file."
+          },
+          "score": {
+            "type": "number",
+            "description": "The similarity score for the result.",
+            "minimum": 0,
+            "maximum": 1
+          },
+          "attributes": {
+            "$ref": "#/components/schemas/VectorStoreFileAttributes"
+          },
+          "content": {
+            "type": "array",
+            "description": "Content chunks from the file.",
+            "items": {
+              "$ref": "#/components/schemas/VectorStoreSearchResultContentObject"
+            }
+          }
+        },
+        "required": [
+          "file_id",
+          "filename",
+          "score",
+          "attributes",
+          "content"
+        ],
+        "x-oaiMeta": {
+          "name": "Vector store search result item"
+        }
+      },
+      "VectorStoreSearchResultsPage": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "vector_store.search_results.page"
+            ],
+            "description": "The object type, which is always `vector_store.search_results.page`",
+            "x-stainless-const": true
+          },
+          "search_query": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "description": "The query used for this search.",
+              "minItems": 1
+            }
+          },
+          "data": {
+            "type": "array",
+            "description": "The list of search result items.",
+            "items": {
+              "$ref": "#/components/schemas/VectorStoreSearchResultItem"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Indicates if there are more results to fetch."
+          },
+          "next_page": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The token for the next page, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "object",
+          "search_query",
+          "data",
+          "has_more",
+          "next_page"
+        ],
+        "x-oaiMeta": {
+          "name": "Vector store search results page"
+        }
+      },
+      "Verbosity": {
+        "anyOf": [
+          {
+            "type": "string",
+            "enum": [
+              "low",
+              "medium",
+              "high"
+            ],
+            "default": "medium",
+            "description": "Constrains the verbosity of the model's response. Lower values will result in\nmore concise responses, while higher values will result in more verbose responses.\nCurrently supported values are `low`, `medium`, and `high`. The default is\n`medium`.\n"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "VoiceConsentDeletedResource": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The consent recording identifier.",
+            "example": "cons_1234"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "audio.voice_consent"
+            ],
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "x-oaiMeta": {
+          "name": "The voice consent deletion object",
+          "example": "{\n  \"object\": \"audio.voice_consent\",\n  \"id\": \"cons_1234\",\n  \"deleted\": true\n}\n"
+        }
+      },
+      "VoiceConsentListResource": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VoiceConsentResource"
+            }
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more"
+        ],
+        "x-oaiMeta": {
+          "name": "The voice consent list object",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"object\": \"audio.voice_consent\",\n      \"id\": \"cons_1234\",\n      \"name\": \"John Doe\",\n      \"language\": \"en-US\",\n      \"created_at\": 1734220800\n    }\n  ],\n  \"first_id\": \"cons_1234\",\n  \"last_id\": \"cons_1234\",\n  \"has_more\": false\n}\n"
+        }
+      },
+      "VoiceConsentResource": {
+        "type": "object",
+        "title": "Voice consent",
+        "description": "A consent recording used to authorize creation of a custom voice.",
+        "additionalProperties": false,
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always `audio.voice_consent`.",
+            "enum": [
+              "audio.voice_consent"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The consent recording identifier.",
+            "example": "cons_1234"
+          },
+          "name": {
+            "type": "string",
+            "description": "The label provided when the consent recording was uploaded."
+          },
+          "language": {
+            "type": "string",
+            "description": "The BCP 47 language tag for the consent phrase (for example, `en-US`)."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the consent recording was created."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "language",
+          "created_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The voice consent object",
+          "example": "{\n  \"object\": \"audio.voice_consent\",\n  \"id\": \"cons_1234\",\n  \"name\": \"John Doe\",\n  \"language\": \"en-US\",\n  \"created_at\": 1734220800\n}\n"
+        }
+      },
+      "VoiceIdsOrCustomVoice": {
+        "title": "Voice",
+        "description": "A built-in voice name or a custom voice reference.\n",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/VoiceIdsShared"
+          },
+          {
+            "type": "object",
+            "description": "Custom voice reference.",
+            "additionalProperties": false,
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The custom voice ID, e.g. `voice_1234`.",
+                "example": "voice_1234"
+              }
+            }
+          }
+        ]
+      },
+      "VoiceIdsShared": {
+        "example": "ash",
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "alloy",
+              "ash",
+              "ballad",
+              "coral",
+              "echo",
+              "sage",
+              "shimmer",
+              "verse",
+              "marin",
+              "cedar"
+            ]
+          }
+        ]
+      },
+      "VoiceResource": {
+        "type": "object",
+        "title": "Voice",
+        "description": "A custom voice that can be used for audio output.",
+        "additionalProperties": false,
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "The object type, which is always `audio.voice`.",
+            "enum": [
+              "audio.voice"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The voice identifier, which can be referenced in API endpoints."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the voice."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) for when the voice was created."
+          }
+        },
+        "required": [
+          "object",
+          "id",
+          "name",
+          "created_at"
+        ],
+        "x-oaiMeta": {
+          "name": "The voice object",
+          "example": "{\n  \"object\": \"audio.voice\",\n  \"id\": \"voice_123abc\",\n  \"name\": \"My new voice\",\n  \"created_at\": 1734220800\n}\n"
+        }
+      },
+      "WebSearchActionFind": {
+        "type": "object",
+        "title": "Find action",
+        "description": "Action type \"find_in_page\": Searches for a pattern within a loaded page.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "find_in_page"
+            ],
+            "description": "The action type.\n",
+            "x-stainless-const": true
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the page searched for the pattern.\n"
+          },
+          "pattern": {
+            "type": "string",
+            "description": "The pattern or text to search for within the page.\n"
+          }
+        },
+        "required": [
+          "type",
+          "url",
+          "pattern"
+        ]
+      },
+      "WebSearchActionOpenPage": {
+        "type": "object",
+        "title": "Open page action",
+        "description": "Action type \"open_page\" - Opens a specific URL from search results.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "open_page"
+            ],
+            "description": "The action type.\n",
+            "x-stainless-const": true
+          },
+          "url": {
+            "description": "The URL opened by the model.\n",
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "WebSearchActionSearch": {
+        "type": "object",
+        "title": "Search action",
+        "description": "Action type \"search\" - Performs a web search query.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "search"
+            ],
+            "description": "The action type.\n",
+            "x-stainless-const": true
+          },
+          "query": {
+            "type": "string",
+            "deprecated": true,
+            "description": "The search query.\n"
+          },
+          "queries": {
+            "type": "array",
+            "title": "Search queries",
+            "description": "The search queries.\n",
+            "items": {
+              "type": "string",
+              "description": "A search query.\n"
+            }
+          },
+          "sources": {
+            "type": "array",
+            "title": "Web search sources",
+            "description": "The sources used in the search.\n",
+            "items": {
+              "type": "object",
+              "title": "Web search source",
+              "description": "A source used in the search.\n",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "url"
+                  ],
+                  "description": "The type of source. Always `url`.\n",
+                  "x-stainless-const": true
+                },
+                "url": {
+                  "type": "string",
+                  "format": "uri",
+                  "description": "The URL of the source.\n"
+                }
+              },
+              "required": [
+                "type",
+                "url"
+              ]
+            }
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "WebSearchApproximateLocation": {
+        "anyOf": [
+          {
+            "type": "object",
+            "title": "Web search approximate location",
+            "description": "The approximate location of the user.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "approximate"
+                ],
+                "description": "The type of location approximation. Always `approximate`.",
+                "default": "approximate",
+                "x-stainless-const": true
+              },
+              "country": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The two-letter [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1) of the user, e.g. `US`."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "region": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Free text input for the region of the user, e.g. `California`."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "city": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Free text input for the city of the user, e.g. `San Francisco`."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "timezone": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The [IANA timezone](https://timeapi.io/documentation/iana-timezones) of the user, e.g. `America/Los_Angeles`."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "WebSearchContextSize": {
+        "type": "string",
+        "description": "High level guidance for the amount of context window space to use for the \nsearch. One of `low`, `medium`, or `high`. `medium` is the default.\n",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "default": "medium"
+      },
+      "WebSearchLocation": {
+        "type": "object",
+        "title": "Web search location",
+        "description": "Approximate location parameters for the search.",
+        "properties": {
+          "country": {
+            "type": "string",
+            "description": "The two-letter \n[ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1) of the user,\ne.g. `US`.\n"
+          },
+          "region": {
+            "type": "string",
+            "description": "Free text input for the region of the user, e.g. `California`.\n"
+          },
+          "city": {
+            "type": "string",
+            "description": "Free text input for the city of the user, e.g. `San Francisco`.\n"
+          },
+          "timezone": {
+            "type": "string",
+            "description": "The [IANA timezone](https://timeapi.io/documentation/iana-timezones) \nof the user, e.g. `America/Los_Angeles`.\n"
+          }
+        }
+      },
+      "WebSearchTool": {
+        "type": "object",
+        "title": "Web search",
+        "description": "Search the Internet for sources related to the prompt. Learn more about the\n[web search tool](https://developers.openai.com/api/docs/guides/tools-web-search).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search",
+              "web_search_2025_08_26"
+            ],
+            "description": "The type of the web search tool. One of `web_search` or `web_search_2025_08_26`.",
+            "default": "web_search"
+          },
+          "external_web_access": {
+            "type": "boolean",
+            "default": true,
+            "description": "Allow live internet access for web search. Defaults to true when omitted. When false, the web search tool runs in offline/cache-only mode and will not fetch new external content."
+          },
+          "filters": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "Filters for the search.\n",
+                "properties": {
+                  "allowed_domains": {
+                    "anyOf": [
+                      {
+                        "type": "array",
+                        "title": "Allowed domains for the search.",
+                        "description": "Allowed domains for the search. If not provided, all domains are allowed.\nSubdomains of the provided domains are allowed as well.\n\nExample: `[\"pubmed.ncbi.nlm.nih.gov\"]`\n",
+                        "items": {
+                          "type": "string",
+                          "description": "Allowed domain for the search."
+                        },
+                        "default": []
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_location": {
+            "$ref": "#/components/schemas/WebSearchApproximateLocation"
+          },
+          "search_context_size": {
+            "type": "string",
+            "enum": [
+              "low",
+              "medium",
+              "high"
+            ],
+            "default": "medium",
+            "description": "High level guidance for the amount of context window space to use for the search. One of `low`, `medium`, or `high`. `medium` is the default."
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "WebSearchToolCall": {
+        "type": "object",
+        "title": "Web search tool call",
+        "description": "The results of a web search tool call. See the\n[web search guide](https://developers.openai.com/api/docs/guides/tools-web-search) for more information.\n",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the web search tool call.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search_call"
+            ],
+            "description": "The type of the web search tool call. Always `web_search_call`.\n",
+            "x-stainless-const": true
+          },
+          "status": {
+            "description": "The status of the web search tool call.\n",
+            "$ref": "#/components/schemas/WebSearchCallStatus"
+          },
+          "action": {
+            "type": "object",
+            "description": "An object describing the specific action taken in this web search call.\nIncludes details on how the model used the web (search, open_page, find_in_page).\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchActionSearch"
+              },
+              {
+                "$ref": "#/components/schemas/WebSearchActionOpenPage"
+              },
+              {
+                "$ref": "#/components/schemas/WebSearchActionFind"
+              }
+            ],
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "status",
+          "action"
+        ]
+      },
+      "WebhookBatchCancelled": {
+        "type": "object",
+        "title": "batch.cancelled",
+        "description": "Sent when a batch API request has been cancelled.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the batch API request was cancelled.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the batch API request.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `batch.cancelled`.\n",
+            "enum": [
+              "batch.cancelled"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "batch.cancelled",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"batch.cancelled\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"batch_abc123\"\n  }\n}\n"
+        }
+      },
+      "WebhookBatchCompleted": {
+        "type": "object",
+        "title": "batch.completed",
+        "description": "Sent when a batch API request has been completed.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the batch API request was completed.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the batch API request.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `batch.completed`.\n",
+            "enum": [
+              "batch.completed"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "batch.completed",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"batch.completed\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"batch_abc123\"\n  }\n}\n"
+        }
+      },
+      "WebhookBatchExpired": {
+        "type": "object",
+        "title": "batch.expired",
+        "description": "Sent when a batch API request has expired.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the batch API request expired.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the batch API request.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `batch.expired`.\n",
+            "enum": [
+              "batch.expired"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "batch.expired",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"batch.expired\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"batch_abc123\"\n  }\n}\n"
+        }
+      },
+      "WebhookBatchFailed": {
+        "type": "object",
+        "title": "batch.failed",
+        "description": "Sent when a batch API request has failed.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the batch API request failed.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the batch API request.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `batch.failed`.\n",
+            "enum": [
+              "batch.failed"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "batch.failed",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"batch.failed\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"batch_abc123\"\n  }\n}\n"
+        }
+      },
+      "WebhookEvalRunCanceled": {
+        "type": "object",
+        "title": "eval.run.canceled",
+        "description": "Sent when an eval run has been canceled.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the eval run was canceled.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the eval run.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `eval.run.canceled`.\n",
+            "enum": [
+              "eval.run.canceled"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "eval.run.canceled",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"eval.run.canceled\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"evalrun_abc123\"\n  }\n} \n"
+        }
+      },
+      "WebhookEvalRunFailed": {
+        "type": "object",
+        "title": "eval.run.failed",
+        "description": "Sent when an eval run has failed.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the eval run failed.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the eval run.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `eval.run.failed`.\n",
+            "enum": [
+              "eval.run.failed"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "eval.run.failed",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"eval.run.failed\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"evalrun_abc123\"\n  }\n} \n"
+        }
+      },
+      "WebhookEvalRunSucceeded": {
+        "type": "object",
+        "title": "eval.run.succeeded",
+        "description": "Sent when an eval run has succeeded.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the eval run succeeded.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the eval run.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `eval.run.succeeded`.\n",
+            "enum": [
+              "eval.run.succeeded"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "eval.run.succeeded",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"eval.run.succeeded\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"evalrun_abc123\"\n  }\n} \n"
+        }
+      },
+      "WebhookFineTuningJobCancelled": {
+        "type": "object",
+        "title": "fine_tuning.job.cancelled",
+        "description": "Sent when a fine-tuning job has been cancelled.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the fine-tuning job was cancelled.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the fine-tuning job.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `fine_tuning.job.cancelled`.\n",
+            "enum": [
+              "fine_tuning.job.cancelled"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "fine_tuning.job.cancelled",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"fine_tuning.job.cancelled\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"ftjob_abc123\"\n  }\n} \n"
+        }
+      },
+      "WebhookFineTuningJobFailed": {
+        "type": "object",
+        "title": "fine_tuning.job.failed",
+        "description": "Sent when a fine-tuning job has failed.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the fine-tuning job failed.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the fine-tuning job.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `fine_tuning.job.failed`.\n",
+            "enum": [
+              "fine_tuning.job.failed"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "fine_tuning.job.failed",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"fine_tuning.job.failed\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"ftjob_abc123\"\n  }\n} \n"
+        }
+      },
+      "WebhookFineTuningJobSucceeded": {
+        "type": "object",
+        "title": "fine_tuning.job.succeeded",
+        "description": "Sent when a fine-tuning job has succeeded.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the fine-tuning job succeeded.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the fine-tuning job.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `fine_tuning.job.succeeded`.\n",
+            "enum": [
+              "fine_tuning.job.succeeded"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "fine_tuning.job.succeeded",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"fine_tuning.job.succeeded\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"ftjob_abc123\"\n  }\n} \n"
+        }
+      },
+      "WebhookLiveCallIncoming": {
+        "type": "object",
+        "title": "live.call.incoming",
+        "deprecated": true,
+        "description": "Deprecated: use `live.transport.incoming`. Retained for existing subscriptions\nduring migration; new subscriptions to this event are not allowed.\nSent when an incoming API SIP session is available for Live acceptance. The\nsame pending session can also emit `realtime.call.incoming`; the first\nsuccessful Realtime or Live accept endpoint selects the runtime surface.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the event was created.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "session_id",
+              "sip_headers"
+            ],
+            "properties": {
+              "session_id": {
+                "type": "string",
+                "description": "The `live_...` ID of the pending SIP session. Pass this value unchanged\nto Live call controls and sideband connections. The corresponding\n`realtime.call.incoming` event uses a separate `rtc_...` call ID.\n"
+              },
+              "sip_headers": {
+                "type": "array",
+                "description": "Headers from the SIP INVITE, excluding SIP authorization headers.\nRetained names, values, repeated entries, and order are preserved.\nTreat these values as untrusted call metadata.\n",
+                "items": {
+                  "type": "object",
+                  "description": "A header from the SIP Invite.\n",
+                  "required": [
+                    "name",
+                    "value"
+                  ],
+                  "properties": {
+                    "name": {
+                      "type": "string",
+                      "description": "Name of the SIP Header.\n"
+                    },
+                    "value": {
+                      "type": "string",
+                      "description": "Value of the SIP Header.\n"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `live.call.incoming`.\n",
+            "enum": [
+              "live.call.incoming"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "live.call.incoming",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"live.call.incoming\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"session_id\": \"live_u0_479a275623b54bdb9b6fbae2f7cbd408\",\n    \"sip_headers\": [\n      {\"name\": \"From\", \"value\": \"<sip:alice@example.com>;tag=abc123\"},\n      {\"name\": \"To\", \"value\": \"<sip:recipient@example.com>\"},\n      {\"name\": \"Call-ID\", \"value\": \"call-123@example.com\"}\n    ]\n  }\n}\n"
+        }
+      },
+      "WebhookLiveTransportIncoming": {
+        "type": "object",
+        "title": "live.transport.incoming",
+        "description": "Sent when an incoming API SIP session is available for Live acceptance. The\nsame pending session can also emit `realtime.call.incoming`; the first\nsuccessful Realtime or Live accept endpoint selects the runtime surface.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the event was created.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "type",
+              "session_id",
+              "sip_headers"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The incoming transport type. Always `sip`.",
+                "enum": [
+                  "sip"
+                ],
+                "x-stainless-const": true
+              },
+              "session_id": {
+                "type": "string",
+                "description": "The `live_...` ID of the pending SIP session. Forward this value\nunchanged when accepting or rejecting the call through the Live API.\n"
+              },
+              "sip_headers": {
+                "type": "array",
+                "description": "Headers from the SIP INVITE, excluding SIP authorization headers.\nRetained names, values, repeated entries, and order are preserved.\nTreat these values as untrusted call metadata.\n",
+                "items": {
+                  "type": "object",
+                  "description": "A header from the SIP Invite.\n",
+                  "required": [
+                    "name",
+                    "value"
+                  ],
+                  "properties": {
+                    "name": {
+                      "type": "string",
+                      "description": "Name of the SIP Header.\n"
+                    },
+                    "value": {
+                      "type": "string",
+                      "description": "Value of the SIP Header.\n"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `live.transport.incoming`.\n",
+            "enum": [
+              "live.transport.incoming"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "live.transport.incoming",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"live.transport.incoming\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"type\": \"sip\",\n    \"session_id\": \"live_u0_479a275623b54bdb9b6fbae2f7cbd408\",\n    \"sip_headers\": [\n      {\"name\": \"From\", \"value\": \"<sip:alice@example.com>;tag=abc123\"},\n      {\"name\": \"To\", \"value\": \"<sip:recipient@example.com>\"},\n      {\"name\": \"Call-ID\", \"value\": \"call-123@example.com\"}\n    ]\n  }\n}\n"
+        }
+      },
+      "WebhookRealtimeCallIncoming": {
+        "type": "object",
+        "title": "realtime.call.incoming",
+        "description": "Sent when an incoming API SIP session is available for Realtime acceptance.\nThe same pending session can also emit `live.transport.incoming`; the first\nsuccessful Realtime or Live accept endpoint selects the runtime surface.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the model response was completed.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "call_id",
+              "sip_headers"
+            ],
+            "properties": {
+              "call_id": {
+                "type": "string",
+                "description": "The Transceiver `rtc_...` ID of the pending SIP session. The paired\n`live.transport.incoming` event derives its `session_id` by replacing the\n`rtc_` prefix with `live_`. Use the ID returned by the event with the\ncorresponding Realtime or Live API.\n"
+              },
+              "sip_headers": {
+                "type": "array",
+                "description": "Headers from the SIP INVITE, excluding SIP authorization headers.\nRetained names, values, repeated entries, and order are preserved.\nTreat these values as untrusted call metadata.\n",
+                "items": {
+                  "type": "object",
+                  "description": "A header from the SIP Invite.\n",
+                  "required": [
+                    "name",
+                    "value"
+                  ],
+                  "properties": {
+                    "name": {
+                      "type": "string",
+                      "description": "Name of the SIP Header.\n"
+                    },
+                    "value": {
+                      "type": "string",
+                      "description": "Value of the SIP Header.\n"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `realtime.call.incoming`.\n",
+            "enum": [
+              "realtime.call.incoming"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "realtime.call.incoming",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"realtime.call.incoming\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"call_id\": \"rtc_479a275623b54bdb9b6fbae2f7cbd408\",\n    \"sip_headers\": [\n      {\"name\": \"Max-Forwards\", \"value\": \"63\"},\n      {\"name\": \"CSeq\", \"value\": \"851287 INVITE\"},\n      {\"name\": \"Content-Type\", \"value\": \"application/sdp\"}\n    ]\n  }\n}\n"
+        }
+      },
+      "WebhookResponseCancelled": {
+        "type": "object",
+        "title": "response.cancelled",
+        "description": "Sent when a background response has been cancelled.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the model response was cancelled.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the model response.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.cancelled`.\n",
+            "enum": [
+              "response.cancelled"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "response.cancelled",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"response.cancelled\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"resp_abc123\"\n  }\n}\n"
+        }
+      },
+      "WebhookResponseCompleted": {
+        "type": "object",
+        "title": "response.completed",
+        "description": "Sent when a background response has been completed.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the model response was completed.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the model response.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.completed`.\n",
+            "enum": [
+              "response.completed"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "response.completed",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"response.completed\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"resp_abc123\"\n  }\n}\n"
+        }
+      },
+      "WebhookResponseFailed": {
+        "type": "object",
+        "title": "response.failed",
+        "description": "Sent when a background response has failed.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the model response failed.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the model response.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.failed`.\n",
+            "enum": [
+              "response.failed"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "response.failed",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"response.failed\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"resp_abc123\"\n  }\n}\n"
+        }
+      },
+      "WebhookResponseIncomplete": {
+        "type": "object",
+        "title": "response.incomplete",
+        "description": "Sent when a background response has been interrupted.\n",
+        "required": [
+          "created_at",
+          "id",
+          "data",
+          "type"
+        ],
+        "properties": {
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) of when the model response was interrupted.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the event.\n"
+          },
+          "data": {
+            "type": "object",
+            "description": "Event data payload.\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the model response.\n"
+              }
+            }
+          },
+          "object": {
+            "type": "string",
+            "description": "The object of the event. Always `event`.\n",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.incomplete`.\n",
+            "enum": [
+              "response.incomplete"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "x-oaiMeta": {
+          "name": "response.incomplete",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_abc123\",\n  \"type\": \"response.incomplete\",\n  \"created_at\": 1719168000,\n  \"data\": {\n    \"id\": \"resp_abc123\"\n  }\n}\n"
+        }
+      },
+      "WebhookSafetyAlertCreated": {
+        "type": "object",
+        "title": "safety.alert.created",
+        "description": "Sent when an approved safety alert is available for an API project.",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "type",
+          "data"
+        ],
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the webhook event."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true,
+            "description": "Always `event`."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp in seconds when the event was created."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "safety.alert.created"
+            ],
+            "x-stainless-const": true,
+            "description": "Always `safety.alert.created`."
+          },
+          "data": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "pattern": "^alert_[0-9a-f]{32}$",
+                "description": "The safety alert ID to pass to `GET /v1/safety/alerts/{id}`."
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "safety.alert.created",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_123\",\n  \"object\": \"event\",\n  \"created_at\": 1787659200,\n  \"type\": \"safety.alert.created\",\n  \"data\": {\"id\": \"alert_0123456789abcdef0123456789abcdef\"}\n}\n"
+        }
+      },
+      "WebhookSafetyOrgAlertCreated": {
+        "type": "object",
+        "title": "safety.org_alert.created",
+        "description": "Sent when an approved safety alert is available for an enterprise workspace.",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "type",
+          "data"
+        ],
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the webhook event."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "event"
+            ],
+            "x-stainless-const": true,
+            "description": "Always `event`."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp in seconds when the event was created."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "safety.org_alert.created"
+            ],
+            "x-stainless-const": true,
+            "description": "Always `safety.org_alert.created`."
+          },
+          "data": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "pattern": "^alert_[0-9a-f]{32}$",
+                "description": "The safety alert ID to pass to `GET /v1/safety/alerts/{id}`."
+              }
+            }
+          }
+        },
+        "x-oaiMeta": {
+          "name": "safety.org_alert.created",
+          "group": "webhook-events",
+          "example": "{\n  \"id\": \"evt_123\",\n  \"object\": \"event\",\n  \"created_at\": 1787659200,\n  \"type\": \"safety.org_alert.created\",\n  \"data\": {\"id\": \"alert_0123456789abcdef0123456789abcdef\"}\n}\n"
+        }
+      },
+      "ModerationInputType": {
+        "type": "string",
+        "enum": [
+          "text",
+          "image"
+        ]
+      },
+      "ModerationResultBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "moderation_result"
+            ],
+            "description": "The object type, which was always `moderation_result` for successful moderation results.",
+            "default": "moderation_result",
+            "x-stainless-const": true
+          },
+          "model": {
+            "type": "string",
+            "description": "The moderation model that produced this result."
+          },
+          "flagged": {
+            "type": "boolean",
+            "description": "A boolean indicating whether the content was flagged by any category."
+          },
+          "categories": {
+            "additionalProperties": {
+              "type": "boolean"
+            },
+            "type": "object",
+            "description": "A dictionary of moderation categories to booleans, True if the input is flagged under this category.",
+            "x-oaiTypeLabel": "map"
+          },
+          "category_scores": {
+            "additionalProperties": {
+              "type": "number"
+            },
+            "type": "object",
+            "description": "A dictionary of moderation categories to scores.",
+            "x-oaiTypeLabel": "map"
+          },
+          "category_applied_input_types": {
+            "additionalProperties": {
+              "items": {
+                "$ref": "#/components/schemas/ModerationInputType"
+              },
+              "type": "array"
+            },
+            "type": "object",
+            "description": "Which modalities of input are reflected by the score for each category.",
+            "x-oaiTypeLabel": "map"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "model",
+          "flagged",
+          "categories",
+          "category_scores",
+          "category_applied_input_types"
+        ],
+        "title": "Moderation result",
+        "description": "A moderation result produced for the response input or output."
+      },
+      "PromptCacheTTLEnum": {
+        "type": "string",
+        "enum": [
+          "30m"
+        ]
+      },
+      "PromptCacheModeEnum": {
+        "type": "string",
+        "enum": [
+          "implicit",
+          "explicit"
+        ]
+      },
+      "PromptCacheOptionsParam": {
+        "properties": {
+          "ttl": {
+            "$ref": "#/components/schemas/PromptCacheTTLEnum",
+            "description": "The minimum lifetime applied to every implicit and explicit cache breakpoint written by the request. Defaults to `30m`, which is currently the only supported value. The backend may retain cache entries for longer."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/PromptCacheModeEnum",
+            "description": "Controls whether OpenAI automatically creates an implicit cache breakpoint. Defaults to `implicit`. With `implicit`, OpenAI creates one implicit breakpoint and writes up to the latest three explicit breakpoints in the request. With `explicit`, OpenAI does not create an implicit breakpoint and writes up to the latest four explicit breakpoints. If there are no explicit breakpoints, the request does not use prompt caching."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Prompt cache options",
+        "description": "Options for prompt caching. Supported for `gpt-5.6` and later models. By default, OpenAI automatically chooses one implicit cache breakpoint. You can add explicit breakpoints to content blocks with `prompt_cache_breakpoint`. Each request can write up to four breakpoints. For cache matching, OpenAI considers up to the latest 80 breakpoints in the conversation, without a content-block lookback limit. Set `mode` to `explicit` to disable the implicit breakpoint. The `ttl` defaults to `30m`, which is currently the only supported value. See the [prompt caching guide](https://developers.openai.com/api/docs/guides/prompt-caching) for current details."
+      },
+      "PromptCacheBreakpointParam": {
+        "properties": {
+          "mode": {
+            "type": "string",
+            "enum": [
+              "explicit"
+            ],
+            "description": "The breakpoint mode. Always `explicit`.",
+            "default": "explicit",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "mode"
+        ],
+        "title": "Prompt cache breakpoint",
+        "description": "Marks the exact end of a reusable prompt prefix. The breakpoint inherits its TTL from the request's `prompt_cache_options.ttl`; the boundary is not rounded to a token block."
+      },
+      "ModerationMode": {
+        "type": "string",
+        "enum": [
+          "score",
+          "block"
+        ]
+      },
+      "ModerationConfigParam": {
+        "properties": {
+          "mode": {
+            "$ref": "#/components/schemas/ModerationMode"
+          }
+        },
+        "type": "object",
+        "required": [
+          "mode"
+        ],
+        "description": "The moderation policy for the response input."
+      },
+      "ModerationPolicyParam": {
+        "properties": {
+          "input": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ModerationConfigParam",
+                "description": "The moderation policy for the response input."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ModerationConfigParam",
+                "description": "The moderation policy for the response output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [],
+        "description": "The policy to apply to moderated response input and output."
+      },
+      "ModerationParam": {
+        "properties": {
+          "model": {
+            "type": "string",
+            "description": "The moderation model to use for moderated completions, e.g. 'omni-moderation-latest'."
+          },
+          "policy": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ModerationPolicyParam",
+                "description": "The policy to apply to moderated response input and output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "model"
+        ],
+        "description": "Configuration for running moderation on the input and output of this response."
+      },
+      "SkillReferenceParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill_reference"
+            ],
+            "description": "References a skill created with the /v1/skills endpoint.",
+            "default": "skill_reference",
+            "x-stainless-const": true
+          },
+          "skill_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The ID of the referenced skill."
+          },
+          "version": {
+            "type": "string",
+            "description": "Optional skill version. Use a positive integer or 'latest'. Omit for default."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "skill_id"
+        ]
+      },
+      "InlineSkillSourceParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "base64"
+            ],
+            "description": "The type of the inline skill source. Must be `base64`.",
+            "default": "base64",
+            "x-stainless-const": true
+          },
+          "media_type": {
+            "type": "string",
+            "enum": [
+              "application/zip"
+            ],
+            "description": "The media type of the inline skill payload. Must be `application/zip`.",
+            "default": "application/zip",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "string",
+            "maxLength": 70254592,
+            "minLength": 1,
+            "description": "Base64-encoded skill zip bundle."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "media_type",
+          "data"
+        ],
+        "description": "Inline skill payload"
+      },
+      "InlineSkillParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "description": "Defines an inline skill for this request.",
+            "default": "inline",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the skill."
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the skill."
+          },
+          "source": {
+            "$ref": "#/components/schemas/InlineSkillSourceParam",
+            "description": "Inline skill payload"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "name",
+          "description",
+          "source"
+        ]
+      },
+      "ContainerNetworkPolicyDisabledParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "disabled"
+            ],
+            "description": "Disable outbound network access. Always `disabled`.",
+            "default": "disabled",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "ContainerNetworkPolicyDomainSecretParam": {
+        "properties": {
+          "domain": {
+            "type": "string",
+            "minLength": 1,
+            "description": "The domain associated with the secret."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "description": "The name of the secret to inject for the domain."
+          },
+          "value": {
+            "type": "string",
+            "maxLength": 10485760,
+            "minLength": 1,
+            "description": "The secret value to inject for the domain."
+          }
+        },
+        "type": "object",
+        "required": [
+          "domain",
+          "name",
+          "value"
+        ]
+      },
+      "ContainerNetworkPolicyAllowlistParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "allowlist"
+            ],
+            "description": "Allow outbound network access only to specified domains. Always `allowlist`.",
+            "default": "allowlist",
+            "x-stainless-const": true
+          },
+          "allowed_domains": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "minItems": 1,
+            "description": "A list of allowed domains when type is `allowlist`."
+          },
+          "domain_secrets": {
+            "items": {
+              "$ref": "#/components/schemas/ContainerNetworkPolicyDomainSecretParam"
+            },
+            "type": "array",
+            "minItems": 1,
+            "description": "Optional domain-scoped secrets for allowlisted domains."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "allowed_domains"
+        ]
+      },
+      "IncludeEnum": {
+        "type": "string",
+        "enum": [
+          "file_search_call.results",
+          "web_search_call.results",
+          "web_search_call.action.sources",
+          "message.input_image.image_url",
+          "computer_call_output.output.image_url",
+          "code_interpreter_call.outputs",
+          "reasoning.encrypted_content",
+          "message.output_text.logprobs"
+        ],
+        "description": "Specify additional output data to include in the model response. Currently supported values are:\n- `web_search_call.results`: Include the search results of the web search tool call.\n- `web_search_call.action.sources`: Include the sources of the web search tool call.\n- `code_interpreter_call.outputs`: Includes the outputs of python code execution in code interpreter tool call items.\n- `computer_call_output.output.image_url`: Include image urls from the computer call output.\n- `file_search_call.results`: Include the search results of the file search tool call.\n- `message.input_image.image_url`: Include image urls from the input message.\n- `message.output_text.logprobs`: Include logprobs with assistant messages.\n- `reasoning.encrypted_content`: Includes an encrypted version of reasoning tokens in reasoning item outputs. This enables reasoning items to be used in multi-turn conversations when using the Responses API statelessly (like when the `store` parameter is set to `false`, or when an organization is enrolled in the zero data retention program)."
+      },
+      "MessageStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "MessageRole": {
+        "type": "string",
+        "enum": [
+          "unknown",
+          "user",
+          "assistant",
+          "system",
+          "critic",
+          "discriminator",
+          "developer",
+          "tool"
+        ]
+      },
+      "PromptCacheBreakpointConfig": {
+        "properties": {
+          "mode": {
+            "type": "string",
+            "enum": [
+              "explicit"
+            ],
+            "description": "The breakpoint mode. Always `explicit`.",
+            "default": "explicit",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "mode"
+        ],
+        "title": "Prompt cache breakpoint",
+        "description": "Marks the exact end of a reusable prompt prefix. The breakpoint inherits its TTL from the request's `prompt_cache_options.ttl`; the boundary is not rounded to a token block."
+      },
+      "InputTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "description": "The type of the input item. Always `input_text`.",
+            "default": "input_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text input to the model."
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/PromptCacheBreakpointConfig"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Input text",
+        "description": "A text input to the model."
+      },
+      "FileCitationBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_citation"
+            ],
+            "description": "The type of the file citation. Always `file_citation`.",
+            "default": "file_citation",
+            "x-stainless-const": true
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file."
+          },
+          "index": {
+            "type": "integer",
+            "description": "The index of the file in the list of files."
+          },
+          "filename": {
+            "type": "string",
+            "description": "The filename of the file cited."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "file_id",
+          "index",
+          "filename"
+        ],
+        "title": "File citation",
+        "description": "A citation to a file."
+      },
+      "UrlCitationBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "url_citation"
+            ],
+            "description": "The type of the URL citation. Always `url_citation`.",
+            "default": "url_citation",
+            "x-stainless-const": true
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the web resource."
+          },
+          "start_index": {
+            "type": "integer",
+            "description": "The index of the first character of the URL citation in the message."
+          },
+          "end_index": {
+            "type": "integer",
+            "description": "The index of the last character of the URL citation in the message."
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the web resource."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "url",
+          "start_index",
+          "end_index",
+          "title"
+        ],
+        "title": "URL citation",
+        "description": "A citation for a web resource used to generate a model response."
+      },
+      "ContainerFileCitationBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_file_citation"
+            ],
+            "description": "The type of the container file citation. Always `container_file_citation`.",
+            "default": "container_file_citation",
+            "x-stainless-const": true
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The ID of the container file."
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file."
+          },
+          "start_index": {
+            "type": "integer",
+            "description": "The index of the first character of the container file citation in the message."
+          },
+          "end_index": {
+            "type": "integer",
+            "description": "The index of the last character of the container file citation in the message."
+          },
+          "filename": {
+            "type": "string",
+            "description": "The filename of the container file cited."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "container_id",
+          "file_id",
+          "start_index",
+          "end_index",
+          "filename"
+        ],
+        "title": "Container file citation",
+        "description": "A citation for a container file used to generate a model response."
+      },
+      "Annotation": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/FileCitationBody"
+          },
+          {
+            "$ref": "#/components/schemas/UrlCitationBody"
+          },
+          {
+            "$ref": "#/components/schemas/ContainerFileCitationBody"
+          },
+          {
+            "$ref": "#/components/schemas/FilePath"
+          }
+        ],
+        "description": "An annotation that applies to a span of output text.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "TopLogProb": {
+        "properties": {
+          "token": {
+            "type": "string"
+          },
+          "logprob": {
+            "type": "number"
+          },
+          "bytes": {
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object",
+        "required": [
+          "token",
+          "logprob",
+          "bytes"
+        ],
+        "title": "Top log probability",
+        "description": "The top log probability of a token."
+      },
+      "LogProb": {
+        "properties": {
+          "token": {
+            "type": "string"
+          },
+          "logprob": {
+            "type": "number"
+          },
+          "bytes": {
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
+          "top_logprobs": {
+            "items": {
+              "$ref": "#/components/schemas/TopLogProb"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object",
+        "required": [
+          "token",
+          "logprob",
+          "bytes",
+          "top_logprobs"
+        ],
+        "title": "Log probability",
+        "description": "The log probability of a token."
+      },
+      "OutputTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_text"
+            ],
+            "description": "The type of the output text. Always `output_text`.",
+            "default": "output_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text output from the model."
+          },
+          "annotations": {
+            "items": {
+              "$ref": "#/components/schemas/Annotation"
+            },
+            "type": "array",
+            "description": "The annotations of the text output."
+          },
+          "logprobs": {
+            "items": {
+              "$ref": "#/components/schemas/LogProb"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text",
+          "annotations",
+          "logprobs"
+        ],
+        "title": "Output text",
+        "description": "A text output from the model."
+      },
+      "TextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "default": "text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Text Content",
+        "description": "A text content."
+      },
+      "SummaryTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "summary_text"
+            ],
+            "description": "The type of the object. Always `summary_text`.",
+            "default": "summary_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "A summary of the reasoning output from the model so far."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Summary text",
+        "description": "A summary text from the model."
+      },
+      "ReasoningTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "reasoning_text"
+            ],
+            "description": "The type of the reasoning text. Always `reasoning_text`.",
+            "default": "reasoning_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The reasoning text from the model."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Reasoning text",
+        "description": "Reasoning text from the model."
+      },
+      "RefusalContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "refusal"
+            ],
+            "description": "The type of the refusal. Always `refusal`.",
+            "default": "refusal",
+            "x-stainless-const": true
+          },
+          "refusal": {
+            "type": "string",
+            "description": "The refusal explanation from the model."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "refusal"
+        ],
+        "title": "Refusal",
+        "description": "A refusal from the model."
+      },
+      "ImageDetail": {
+        "type": "string",
+        "enum": [
+          "low",
+          "high",
+          "auto",
+          "original"
+        ]
+      },
+      "InputImageContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "description": "The type of the input item. Always `input_image`.",
+            "default": "input_image",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri",
+                "description": "The URL of the image to be sent to the model. A fully qualified URL or base64 encoded image in a data URL."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "detail": {
+            "$ref": "#/components/schemas/ImageDetail",
+            "description": "The detail level of the image to be sent to the model. One of `high`, `low`, `auto`, or `original`. Defaults to `auto`."
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/PromptCacheBreakpointConfig"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "detail"
+        ],
+        "title": "Input image",
+        "description": "An image input to the model. Learn about [image inputs](https://developers.openai.com/api/docs/guides/images-vision)."
+      },
+      "ComputerScreenshotContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer_screenshot"
+            ],
+            "description": "Specifies the event type. For a computer screenshot, this property is always set to `computer_screenshot`.",
+            "default": "computer_screenshot",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri",
+                "description": "The URL of the screenshot image."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The identifier of an uploaded file that contains the screenshot."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "detail": {
+            "$ref": "#/components/schemas/ImageDetail",
+            "description": "The detail level of the screenshot image to be sent to the model. One of `high`, `low`, `auto`, or `original`. Defaults to `auto`."
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/PromptCacheBreakpointConfig"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "image_url",
+          "file_id",
+          "detail"
+        ],
+        "title": "Computer screenshot",
+        "description": "A screenshot of a computer."
+      },
+      "FileInputDetail": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "low",
+          "high"
+        ]
+      },
+      "InputFileContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_file"
+            ],
+            "description": "The type of the input item. Always `input_file`.",
+            "default": "input_file",
+            "x-stainless-const": true
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "filename": {
+            "type": "string",
+            "description": "The name of the file to be sent to the model."
+          },
+          "file_data": {
+            "type": "string",
+            "description": "The content of the file to be sent to the model.\n"
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/PromptCacheBreakpointConfig"
+          },
+          "file_url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the file to be sent to the model."
+          },
+          "detail": {
+            "$ref": "#/components/schemas/FileInputDetail",
+            "description": "The detail level of the file to be sent to the model. Use `auto` to let the system select the detail level; for GPT-5.6 and later models, `auto` uses high-quality rendering, which may increase input token usage. Use `low` for lower-cost rendering, or `high` to render the file at higher quality. Defaults to `auto`."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Input file",
+        "description": "A file input to the model."
+      },
+      "MessagePhase-2": {
+        "type": "string",
+        "enum": [
+          "commentary",
+          "final_answer"
+        ]
+      },
+      "Message": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "description": "The type of the message. Always set to `message`.",
+            "default": "message",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the message."
+          },
+          "status": {
+            "$ref": "#/components/schemas/MessageStatus",
+            "description": "The status of item. One of `in_progress`, `completed`, or `incomplete`. Populated when items are returned via API."
+          },
+          "role": {
+            "$ref": "#/components/schemas/MessageRole",
+            "description": "The role of the message. One of `unknown`, `user`, `assistant`, `system`, `critic`, `discriminator`, `developer`, or `tool`."
+          },
+          "content": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/InputTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/OutputTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/TextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/SummaryTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/ReasoningTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/RefusalContent"
+                },
+                {
+                  "$ref": "#/components/schemas/InputImageContent"
+                },
+                {
+                  "$ref": "#/components/schemas/ComputerScreenshotContent"
+                },
+                {
+                  "$ref": "#/components/schemas/InputFileContent"
+                }
+              ],
+              "description": "A content part that makes up an input or output item.",
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "description": "The content of the message"
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MessagePhase-2",
+                "description": "Labels an `assistant` message as intermediate commentary (`commentary`) or the final answer (`final_answer`). For models like `gpt-5.3-codex` and beyond, when sending follow-up requests, preserve and resend phase on all assistant messages — dropping it can degrade performance. Not used for user messages."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "status",
+          "role",
+          "content"
+        ],
+        "title": "Message",
+        "description": "A message to or from the model."
+      },
+      "DirectToolCallCaller": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "direct"
+            ],
+            "default": "direct",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "ProgramToolCallCaller": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "program"
+            ],
+            "default": "program",
+            "x-stainless-const": true
+          },
+          "caller_id": {
+            "type": "string",
+            "description": "The call ID of the program item that produced this tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "caller_id"
+        ]
+      },
+      "ToolCallCaller": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/DirectToolCallCaller"
+          },
+          {
+            "$ref": "#/components/schemas/ProgramToolCallCaller"
+          }
+        ],
+        "description": "The execution context that produced this tool call.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "FunctionCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "DirectToolCallCallerParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "direct"
+            ],
+            "description": "The caller type. Always `direct`.",
+            "default": "direct",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "ProgramToolCallCallerParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "program"
+            ],
+            "description": "The caller type. Always `program`.",
+            "default": "program",
+            "x-stainless-const": true
+          },
+          "caller_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The call ID of the program item that produced this tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "caller_id"
+        ]
+      },
+      "ToolCallCallerParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/DirectToolCallCallerParam"
+          },
+          {
+            "$ref": "#/components/schemas/ProgramToolCallCallerParam"
+          }
+        ],
+        "description": "The execution context that produced this tool call.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "FunctionCallOutputStatusEnum": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "WebSearchCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "searching",
+          "completed",
+          "failed",
+          "incomplete"
+        ]
+      },
+      "ImageGenActionEnum": {
+        "type": "string",
+        "enum": [
+          "generate",
+          "edit",
+          "auto"
+        ]
+      },
+      "ImageBackground": {
+        "type": "string",
+        "enum": [
+          "transparent",
+          "opaque",
+          "auto"
+        ]
+      },
+      "ImageOutputFormat": {
+        "type": "string",
+        "enum": [
+          "png",
+          "webp",
+          "jpeg"
+        ]
+      },
+      "ImageGenToolCall": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "image_generation_call"
+            ],
+            "description": "The type of the image generation call. Always `image_generation_call`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the image generation call."
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "completed",
+              "generating",
+              "failed"
+            ],
+            "description": "The status of the image generation call."
+          },
+          "result": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The generated image encoded in base64."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "size": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "1024x1024",
+                      "1024x1536",
+                      "1536x1024"
+                    ]
+                  }
+                ],
+                "description": "The image dimensions as a `WIDTHxHEIGHT` string, for example `1536x864`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "quality": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "low",
+                  "medium",
+                  "high",
+                  "xhigh",
+                  "max",
+                  "auto"
+                ],
+                "description": "The quality of the image generated by the image generation tool call. One of `low`, `medium`, `high`, `xhigh`, `max`, or `auto`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "action": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ImageGenActionEnum",
+                "description": "The action used for image generation."
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "x-openai-go-optional-enum": true
+          },
+          "background": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ImageBackground",
+                "description": "The background setting used for generation."
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "x-openai-go-optional-enum": true
+          },
+          "output_format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ImageOutputFormat",
+                "description": "The output format used for generation."
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "x-openai-go-optional-enum": true
+          },
+          "revised_prompt": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The prompt that was used after any model prompt rewriting."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "status",
+          "result"
+        ],
+        "title": "Image generation call",
+        "description": "An image generation request made by the model."
+      },
+      "ClickButtonType": {
+        "type": "string",
+        "enum": [
+          "left",
+          "right",
+          "wheel",
+          "back",
+          "forward"
+        ]
+      },
+      "ClickParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "click"
+            ],
+            "description": "Specifies the event type. For a click action, this property is always `click`.",
+            "default": "click",
+            "x-stainless-const": true
+          },
+          "button": {
+            "$ref": "#/components/schemas/ClickButtonType",
+            "description": "Indicates which mouse button was pressed during the click. One of `left`, `right`, `wheel`, `back`, or `forward`."
+          },
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate where the click occurred."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate where the click occurred."
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while clicking."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "button",
+          "x",
+          "y"
+        ],
+        "title": "Click",
+        "description": "A click action."
+      },
+      "DoubleClickAction": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "double_click"
+            ],
+            "description": "Specifies the event type. For a double click action, this property is always set to `double_click`.",
+            "default": "double_click",
+            "x-stainless-const": true
+          },
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate where the double click occurred."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate where the double click occurred."
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while double-clicking."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "x",
+          "y",
+          "keys"
+        ],
+        "title": "DoubleClick",
+        "description": "A double click action."
+      },
+      "CoordParam": {
+        "properties": {
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate."
+          }
+        },
+        "type": "object",
+        "required": [
+          "x",
+          "y"
+        ],
+        "title": "Coordinate",
+        "description": "An x/y coordinate pair, e.g. `{ x: 100, y: 200 }`."
+      },
+      "DragParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "drag"
+            ],
+            "description": "Specifies the event type. For a drag action, this property is always set to `drag`.",
+            "default": "drag",
+            "x-stainless-const": true
+          },
+          "path": {
+            "items": {
+              "$ref": "#/components/schemas/CoordParam"
+            },
+            "type": "array",
+            "description": "An array of coordinates representing the path of the drag action. Coordinates will appear as an array of objects, eg\n```\n[\n  { x: 100, y: 200 },\n  { x: 200, y: 300 }\n]\n```"
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while dragging the mouse."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path"
+        ],
+        "title": "Drag",
+        "description": "A drag action."
+      },
+      "KeyPressAction": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "keypress"
+            ],
+            "description": "Specifies the event type. For a keypress action, this property is always set to `keypress`.",
+            "default": "keypress",
+            "x-stainless-const": true
+          },
+          "keys": {
+            "items": {
+              "type": "string",
+              "description": "One of the keys the model is requesting to be pressed."
+            },
+            "type": "array",
+            "description": "The combination of keys the model is requesting to be pressed. This is an array of strings, each representing a key."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "keys"
+        ],
+        "title": "KeyPress",
+        "description": "A collection of keypresses the model would like to perform."
+      },
+      "MoveParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "move"
+            ],
+            "description": "Specifies the event type. For a move action, this property is always set to `move`.",
+            "default": "move",
+            "x-stainless-const": true
+          },
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate to move to."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate to move to."
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while moving the mouse."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "x",
+          "y"
+        ],
+        "title": "Move",
+        "description": "A mouse move action."
+      },
+      "ScreenshotParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "screenshot"
+            ],
+            "description": "Specifies the event type. For a screenshot action, this property is always set to `screenshot`.",
+            "default": "screenshot",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Screenshot",
+        "description": "A screenshot action."
+      },
+      "ScrollParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "scroll"
+            ],
+            "description": "Specifies the event type. For a scroll action, this property is always set to `scroll`.",
+            "default": "scroll",
+            "x-stainless-const": true
+          },
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate where the scroll occurred."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate where the scroll occurred."
+          },
+          "scroll_x": {
+            "type": "integer",
+            "description": "The horizontal scroll distance."
+          },
+          "scroll_y": {
+            "type": "integer",
+            "description": "The vertical scroll distance."
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while scrolling."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "x",
+          "y",
+          "scroll_x",
+          "scroll_y"
+        ],
+        "title": "Scroll",
+        "description": "A scroll action."
+      },
+      "TypeParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "type"
+            ],
+            "description": "Specifies the event type. For a type action, this property is always set to `type`.",
+            "default": "type",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text to type."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Type",
+        "description": "An action to type in text."
+      },
+      "WaitParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "wait"
+            ],
+            "description": "Specifies the event type. For a wait action, this property is always set to `wait`.",
+            "default": "wait",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Wait",
+        "description": "A wait action."
+      },
+      "ComputerCallSafetyCheckParam": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the pending safety check."
+          },
+          "code": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The type of the pending safety check."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Details about the pending safety check."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "description": "A pending safety check for the computer call."
+      },
+      "ComputerCallOutputStatus": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "incomplete",
+          "failed"
+        ]
+      },
+      "ToolSearchExecutionType": {
+        "type": "string",
+        "enum": [
+          "server",
+          "client"
+        ]
+      },
+      "ToolSearchCall": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search_call"
+            ],
+            "description": "The type of the item. Always `tool_search_call`.",
+            "default": "tool_search_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the tool search call item."
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the tool search call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "execution": {
+            "$ref": "#/components/schemas/ToolSearchExecutionType",
+            "description": "Whether tool search was executed by the server or by the client."
+          },
+          "arguments": {
+            "description": "Arguments used for the tool search call."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatus",
+            "description": "The status of the tool search call item that was recorded."
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "execution",
+          "arguments",
+          "status"
+        ]
+      },
+      "CallableToolAllowedCaller": {
+        "type": "string",
+        "enum": [
+          "direct",
+          "programmatic"
+        ]
+      },
+      "FunctionTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "The type of the function tool. Always `function`.",
+            "default": "function",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to call."
+          },
+          "async": {
+            "type": "boolean"
+          },
+          "description": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A description of the function. Used by the model to determine whether or not to call the function."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parameters": {
+            "anyOf": [
+              {
+                "additionalProperties": {},
+                "type": "object",
+                "description": "A JSON schema object describing the parameters of the function.",
+                "x-oaiTypeLabel": "map"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output_schema": {
+            "anyOf": [
+              {
+                "additionalProperties": {},
+                "type": "object",
+                "description": "A JSON schema object describing the JSON value encoded in string outputs for this function.",
+                "x-oaiTypeLabel": "map"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "strict": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Whether strict parameter validation is enforced for this function tool."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether this function is deferred and loaded via tool search."
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/CallableToolAllowedCaller"
+                },
+                "type": "array",
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "name",
+          "strict",
+          "parameters"
+        ],
+        "title": "Function",
+        "description": "Defines a function in your own code the model can choose to call. Learn more about [function calling](https://developers.openai.com/api/docs/guides/function-calling)."
+      },
+      "RankerVersionType": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default-2024-11-15"
+        ]
+      },
+      "HybridSearchOptions": {
+        "properties": {
+          "embedding_weight": {
+            "type": "number",
+            "description": "The weight of the embedding in the reciprocal ranking fusion."
+          },
+          "text_weight": {
+            "type": "number",
+            "description": "The weight of the text in the reciprocal ranking fusion."
+          }
+        },
+        "type": "object",
+        "required": [
+          "embedding_weight",
+          "text_weight"
+        ]
+      },
+      "RankingOptions": {
+        "properties": {
+          "ranker": {
+            "$ref": "#/components/schemas/RankerVersionType",
+            "description": "The ranker to use for the file search."
+          },
+          "score_threshold": {
+            "type": "number",
+            "description": "The score threshold for the file search, a number between 0 and 1. Numbers closer to 1 will attempt to return only the most relevant results, but may return fewer results."
+          },
+          "hybrid_search": {
+            "$ref": "#/components/schemas/HybridSearchOptions",
+            "description": "Weights that control how reciprocal rank fusion balances semantic embedding matches versus sparse keyword matches when hybrid search is enabled."
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "Filters": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/ComparisonFilter"
+          },
+          {
+            "$ref": "#/components/schemas/CompoundFilter"
+          }
+        ]
+      },
+      "FileSearchTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_search"
+            ],
+            "description": "The type of the file search tool. Always `file_search`.",
+            "default": "file_search",
+            "x-stainless-const": true
+          },
+          "vector_store_ids": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "description": "The IDs of the vector stores to search."
+          },
+          "max_num_results": {
+            "type": "integer",
+            "description": "The maximum number of results to return. This number should be between 1 and 50 inclusive."
+          },
+          "ranking_options": {
+            "$ref": "#/components/schemas/RankingOptions",
+            "description": "Ranking options for search."
+          },
+          "filters": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Filters",
+                "description": "A filter to apply."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "vector_store_ids"
+        ],
+        "title": "File search",
+        "description": "A tool that searches for relevant content from uploaded files. Learn more about the [file search tool](https://developers.openai.com/api/docs/guides/tools-file-search)."
+      },
+      "ComputerTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer"
+            ],
+            "description": "The type of the computer tool. Always `computer`.",
+            "default": "computer",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Computer",
+        "description": "A tool that controls a virtual computer. Learn more about the [computer tool](https://developers.openai.com/api/docs/guides/tools-computer-use)."
+      },
+      "ComputerEnvironment": {
+        "type": "string",
+        "enum": [
+          "windows",
+          "mac",
+          "linux",
+          "ubuntu",
+          "browser"
+        ]
+      },
+      "ComputerUsePreviewTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer_use_preview"
+            ],
+            "description": "The type of the computer use tool. Always `computer_use_preview`.",
+            "default": "computer_use_preview",
+            "x-stainless-const": true
+          },
+          "environment": {
+            "$ref": "#/components/schemas/ComputerEnvironment",
+            "description": "The type of computer environment to control."
+          },
+          "display_width": {
+            "type": "integer",
+            "description": "The width of the computer display."
+          },
+          "display_height": {
+            "type": "integer",
+            "description": "The height of the computer display."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "environment",
+          "display_width",
+          "display_height"
+        ],
+        "title": "Computer use preview",
+        "description": "A tool that controls a virtual computer. Learn more about the [computer tool](https://developers.openai.com/api/docs/guides/tools-computer-use)."
+      },
+      "ContainerMemoryLimit": {
+        "type": "string",
+        "enum": [
+          "1g",
+          "4g",
+          "16g",
+          "64g"
+        ]
+      },
+      "AutoCodeInterpreterToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "auto"
+            ],
+            "description": "Always `auto`.",
+            "default": "auto",
+            "x-stainless-const": true
+          },
+          "file_ids": {
+            "items": {
+              "type": "string",
+              "example": "file-123"
+            },
+            "type": "array",
+            "maxItems": 50,
+            "description": "An optional list of uploaded files to make available to your code."
+          },
+          "memory_limit": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ContainerMemoryLimit",
+                "description": "The memory limit for the code interpreter container."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "network_policy": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ContainerNetworkPolicyDisabledParam"
+              },
+              {
+                "$ref": "#/components/schemas/ContainerNetworkPolicyAllowlistParam"
+              }
+            ],
+            "description": "Network access policy for the container.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "CodeInterpreterToolAuto",
+        "description": "Configuration for a code interpreter container. Optionally specify the IDs of the files to run the code on."
+      },
+      "ProgrammaticToolCallingParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "description": "The type of the tool. Always `programmatic_tool_calling`.",
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "InputFidelity": {
+        "type": "string",
+        "enum": [
+          "high",
+          "low"
+        ],
+        "description": "Control how much effort the model will exert to match the style and features, especially facial features, of input images. This parameter is only supported for `gpt-image-1` and `gpt-image-1.5` and later models, unsupported for `gpt-image-1-mini`. Supports `high` and `low`. Defaults to `low`."
+      },
+      "LocalShellToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local_shell"
+            ],
+            "description": "The type of the local shell tool. Always `local_shell`.",
+            "default": "local_shell",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Local shell tool",
+        "description": "A tool that allows the model to execute shell commands in a local environment."
+      },
+      "ContainerAutoParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_auto"
+            ],
+            "description": "Automatically creates a container for this request",
+            "default": "container_auto",
+            "x-stainless-const": true
+          },
+          "file_ids": {
+            "items": {
+              "type": "string",
+              "example": "file-123"
+            },
+            "type": "array",
+            "maxItems": 50,
+            "description": "An optional list of uploaded files to make available to your code."
+          },
+          "memory_limit": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ContainerMemoryLimit",
+                "description": "The memory limit for the container."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "network_policy": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ContainerNetworkPolicyDisabledParam"
+              },
+              {
+                "$ref": "#/components/schemas/ContainerNetworkPolicyAllowlistParam"
+              }
+            ],
+            "description": "Network access policy for the container.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "skills": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/SkillReferenceParam"
+                },
+                {
+                  "$ref": "#/components/schemas/InlineSkillParam"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "maxItems": 200,
+            "description": "An optional list of skills referenced by id or inline data."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "LocalSkillParam": {
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the skill."
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the skill."
+          },
+          "path": {
+            "type": "string",
+            "description": "The path to the directory containing the skill."
+          }
+        },
+        "type": "object",
+        "required": [
+          "name",
+          "description",
+          "path"
+        ]
+      },
+      "LocalEnvironmentParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local"
+            ],
+            "description": "Use a local computer environment.",
+            "default": "local",
+            "x-stainless-const": true
+          },
+          "skills": {
+            "items": {
+              "$ref": "#/components/schemas/LocalSkillParam"
+            },
+            "type": "array",
+            "maxItems": 200,
+            "description": "An optional list of skills."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "ContainerReferenceParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_reference"
+            ],
+            "description": "References a container created with the /v1/containers endpoint",
+            "default": "container_reference",
+            "x-stainless-const": true
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The ID of the referenced container.",
+            "example": "cntr_123"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "container_id"
+        ]
+      },
+      "FunctionShellToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell"
+            ],
+            "description": "The type of the shell tool. Always `shell`.",
+            "default": "shell",
+            "x-stainless-const": true
+          },
+          "environment": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/ContainerAutoParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/LocalEnvironmentParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ContainerReferenceParam"
+                  }
+                ],
+                "discriminator": {
+                  "propertyName": "type"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/CallableToolAllowedCaller"
+                },
+                "type": "array",
+                "minItems": 1,
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Shell tool",
+        "description": "A tool that allows the model to execute shell commands."
+      },
+      "CustomTextFormatParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "description": "Unconstrained text format. Always `text`.",
+            "default": "text",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Text format",
+        "description": "Unconstrained free-form text."
+      },
+      "GrammarSyntax1": {
+        "type": "string",
+        "enum": [
+          "lark",
+          "regex"
+        ]
+      },
+      "CustomGrammarFormatParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "grammar"
+            ],
+            "description": "Grammar format. Always `grammar`.",
+            "default": "grammar",
+            "x-stainless-const": true
+          },
+          "syntax": {
+            "$ref": "#/components/schemas/GrammarSyntax1",
+            "description": "The syntax of the grammar definition. One of `lark` or `regex`."
+          },
+          "definition": {
+            "type": "string",
+            "description": "The grammar definition."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "syntax",
+          "definition"
+        ],
+        "title": "Grammar format",
+        "description": "A grammar defined by the user."
+      },
+      "CustomToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "description": "The type of the custom tool. Always `custom`.",
+            "default": "custom",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the custom tool, used to identify it in tool calls."
+          },
+          "async": {
+            "type": "boolean",
+            "description": "Whether the tool response can be returned asynchronously versus immediately returned on next response creation."
+          },
+          "description": {
+            "type": "string",
+            "description": "Optional description of the custom tool, used to provide more context."
+          },
+          "format": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/CustomTextFormatParam"
+              },
+              {
+                "$ref": "#/components/schemas/CustomGrammarFormatParam"
+              }
+            ],
+            "description": "The input format for the custom tool. Default is unconstrained text.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether this tool should be deferred and discovered via tool search."
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/CallableToolAllowedCaller"
+                },
+                "type": "array",
+                "minItems": 1,
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "name"
+        ],
+        "title": "Custom tool",
+        "description": "A custom tool that processes input using a specified format. Learn more about   [custom tools](https://developers.openai.com/api/docs/guides/function-calling#custom-tools)"
+      },
+      "EmptyModelParam": {
+        "properties": {},
+        "type": "object",
+        "required": []
+      },
+      "FunctionToolParam": {
+        "properties": {
+          "name": {
+            "type": "string",
+            "maxLength": 128,
+            "minLength": 1,
+            "pattern": "^[a-zA-Z0-9_-]+$"
+          },
+          "description": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parameters": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EmptyModelParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "strict": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Whether to enforce strict parameter validation. If omitted, Responses attempts to use strict validation when the schema is compatible, and falls back to non-strict validation otherwise."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true
+          },
+          "async": {
+            "type": "boolean",
+            "description": "Whether the tool response can be returned asynchronously versus immediately returned on next response creation."
+          },
+          "output_schema": {
+            "anyOf": [
+              {
+                "additionalProperties": {},
+                "type": "object",
+                "description": "A JSON Schema describing the JSON value encoded in string outputs for this function tool. This does not describe content-array outputs.",
+                "x-oaiTypeLabel": "map"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether this function should be deferred and discovered via tool search."
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/CallableToolAllowedCaller"
+                },
+                "type": "array",
+                "minItems": 1,
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "name",
+          "type"
+        ]
+      },
+      "NamespaceToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "namespace"
+            ],
+            "description": "The type of the tool. Always `namespace`.",
+            "default": "namespace",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "description": "The namespace name used in tool calls (for example, `crm`)."
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of the namespace shown to the model."
+          },
+          "tools": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/FunctionToolParam"
+                },
+                {
+                  "$ref": "#/components/schemas/CustomToolParam"
+                }
+              ],
+              "description": "A function or custom tool that belongs to a namespace.",
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "minItems": 1,
+            "description": "The function/custom tools available inside this namespace."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "name",
+          "description",
+          "tools"
+        ],
+        "title": "Namespace",
+        "description": "Groups function/custom tools under a shared namespace."
+      },
+      "ToolSearchToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search"
+            ],
+            "description": "The type of the tool. Always `tool_search`.",
+            "default": "tool_search",
+            "x-stainless-const": true
+          },
+          "execution": {
+            "$ref": "#/components/schemas/ToolSearchExecutionType",
+            "description": "Whether tool search is executed by the server or by the client."
+          },
+          "description": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Description shown to the model for a client-executed tool search tool."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parameters": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EmptyModelParam",
+                "description": "Parameter schema for a client-executed tool search tool."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Tool search tool",
+        "description": "Hosted or BYOT tool search configuration for deferred tools."
+      },
+      "ApproximateLocation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "approximate"
+            ],
+            "description": "The type of location approximation. Always `approximate`.",
+            "default": "approximate",
+            "x-stainless-const": true
+          },
+          "country": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The two-letter [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1) of the user, e.g. `US`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "region": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Free text input for the region of the user, e.g. `California`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "city": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Free text input for the city of the user, e.g. `San Francisco`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "timezone": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The [IANA timezone](https://timeapi.io/documentation/iana-timezones) of the user, e.g. `America/Los_Angeles`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "SearchContextSize": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ]
+      },
+      "SearchContentType": {
+        "type": "string",
+        "enum": [
+          "text",
+          "image"
+        ]
+      },
+      "WebSearchPreviewTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search_preview",
+              "web_search_preview_2025_03_11"
+            ],
+            "description": "The type of the web search tool. One of `web_search_preview` or `web_search_preview_2025_03_11`.",
+            "default": "web_search_preview",
+            "x-stainless-const": true
+          },
+          "user_location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ApproximateLocation",
+                "description": "The user's location."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "search_context_size": {
+            "$ref": "#/components/schemas/SearchContextSize",
+            "description": "High level guidance for the amount of context window space to use for the search. One of `low`, `medium`, or `high`. `medium` is the default."
+          },
+          "search_content_types": {
+            "items": {
+              "$ref": "#/components/schemas/SearchContentType"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Web search preview",
+        "description": "This tool searches the web for relevant results to use in a response. Learn more about the [web search tool](https://developers.openai.com/api/docs/guides/tools-web-search)."
+      },
+      "ApplyPatchToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch"
+            ],
+            "description": "The type of the tool. Always `apply_patch`.",
+            "default": "apply_patch",
+            "x-stainless-const": true
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/CallableToolAllowedCaller"
+                },
+                "type": "array",
+                "minItems": 1,
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Apply patch tool",
+        "description": "Allows the assistant to create, delete, or update files using unified diffs."
+      },
+      "ToolSearchOutput": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search_output"
+            ],
+            "description": "The type of the item. Always `tool_search_output`.",
+            "default": "tool_search_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the tool search output item."
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the tool search call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "execution": {
+            "$ref": "#/components/schemas/ToolSearchExecutionType",
+            "description": "Whether tool search was executed by the server or by the client."
+          },
+          "tools": {
+            "items": {
+              "$ref": "#/components/schemas/Tool"
+            },
+            "type": "array",
+            "description": "The loaded tool definitions returned by tool search."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallOutputStatusEnum",
+            "description": "The status of the tool search output item that was recorded."
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "execution",
+          "tools",
+          "status"
+        ]
+      },
+      "AdditionalTools": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "additional_tools"
+            ],
+            "description": "The type of the item. Always `additional_tools`.",
+            "default": "additional_tools",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the additional tools item."
+          },
+          "role": {
+            "$ref": "#/components/schemas/MessageRole",
+            "description": "The role that provided the additional tools."
+          },
+          "tools": {
+            "items": {
+              "$ref": "#/components/schemas/Tool"
+            },
+            "type": "array",
+            "description": "The additional tool definitions made available at this item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "role",
+          "tools"
+        ]
+      },
+      "Program": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "program"
+            ],
+            "description": "The type of the item. Always `program`.",
+            "default": "program",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the program item."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The stable call ID of the program item."
+          },
+          "code": {
+            "type": "string",
+            "description": "The JavaScript source executed by programmatic tool calling."
+          },
+          "fingerprint": {
+            "type": "string",
+            "description": "Opaque program replay fingerprint that must be round-tripped."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "code",
+          "fingerprint"
+        ]
+      },
+      "ProgramOutputStatus": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "incomplete"
+        ]
+      },
+      "ProgramOutput": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "program_output"
+            ],
+            "description": "The type of the item. Always `program_output`.",
+            "default": "program_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the program output item."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The call ID of the program item."
+          },
+          "result": {
+            "type": "string",
+            "description": "The result produced by the program item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/ProgramOutputStatus",
+            "description": "The terminal status of the program output item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "result",
+          "status"
+        ]
+      },
+      "CompactionBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction"
+            ],
+            "description": "The type of the item. Always `compaction`.",
+            "default": "compaction",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the compaction item."
+          },
+          "encrypted_content": {
+            "type": "string",
+            "description": "The encrypted content that was produced by compaction."
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "encrypted_content"
+        ],
+        "title": "Compaction item",
+        "description": "A compaction item generated by the [`v1/responses/compact` API](https://developers.openai.com/api/reference/resources/responses/methods/compact)."
+      },
+      "CodeInterpreterOutputLogs": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "logs"
+            ],
+            "description": "The type of the output. Always `logs`.",
+            "default": "logs",
+            "x-stainless-const": true
+          },
+          "logs": {
+            "type": "string",
+            "description": "The logs output from the code interpreter."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "logs"
+        ],
+        "title": "Code interpreter output logs",
+        "description": "The logs output from the code interpreter."
+      },
+      "CodeInterpreterOutputImage": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "image"
+            ],
+            "description": "The type of the output. Always `image`.",
+            "default": "image",
+            "x-stainless-const": true
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the image output from the code interpreter."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "url"
+        ],
+        "title": "Code interpreter output image",
+        "description": "The image output from the code interpreter."
+      },
+      "LocalShellExecAction": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "exec"
+            ],
+            "description": "The type of the local shell action. Always `exec`.",
+            "default": "exec",
+            "x-stainless-const": true
+          },
+          "command": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "description": "The command to run."
+          },
+          "timeout_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Optional timeout in milliseconds for the command."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "working_directory": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional working directory to run the command in."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "env": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "type": "object",
+            "description": "Environment variables to set for the command.",
+            "x-oaiTypeLabel": "map"
+          },
+          "user": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional user to run the command as."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "command",
+          "env"
+        ],
+        "title": "Local shell exec action",
+        "description": "Execute a shell command on the server."
+      },
+      "FunctionShellAction": {
+        "properties": {
+          "commands": {
+            "items": {
+              "type": "string",
+              "description": "A list of commands to run."
+            },
+            "type": "array"
+          },
+          "timeout_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Optional timeout in milliseconds for the commands."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_output_length": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Optional maximum number of characters to return from each command."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "commands",
+          "timeout_ms",
+          "max_output_length"
+        ],
+        "title": "Shell exec action",
+        "description": "Execute a shell command."
+      },
+      "FunctionShellCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "LocalEnvironmentResource": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local"
+            ],
+            "description": "The environment type. Always `local`.",
+            "default": "local",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Local Environment",
+        "description": "Represents the use of a local environment to perform shell actions."
+      },
+      "ContainerReferenceResource": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_reference"
+            ],
+            "description": "The environment type. Always `container_reference`.",
+            "default": "container_reference",
+            "x-stainless-const": true
+          },
+          "container_id": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "container_id"
+        ],
+        "title": "Container Reference",
+        "description": "Represents a container created with /v1/containers."
+      },
+      "FunctionShellCall": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell_call"
+            ],
+            "description": "The type of the item. Always `shell_call`.",
+            "default": "shell_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the shell tool call. Populated when this item is returned via API."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the shell tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCaller",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "action": {
+            "$ref": "#/components/schemas/FunctionShellAction",
+            "description": "The shell commands and limits that describe how to run the tool call."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionShellCallStatus",
+            "description": "The status of the shell call. One of `in_progress`, `completed`, or `incomplete`."
+          },
+          "environment": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/LocalEnvironmentResource"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ContainerReferenceResource"
+                  }
+                ],
+                "discriminator": {
+                  "propertyName": "type"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The ID of the entity that created this tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "action",
+          "status",
+          "environment"
+        ],
+        "title": "Shell tool call",
+        "description": "A tool call that executes one or more shell commands in a managed environment."
+      },
+      "FunctionShellCallOutputStatusEnum": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "FunctionShellCallOutputTimeoutOutcome": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "timeout"
+            ],
+            "description": "The outcome type. Always `timeout`.",
+            "default": "timeout",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Shell call timeout outcome",
+        "description": "Indicates that the shell call exceeded its configured time limit."
+      },
+      "FunctionShellCallOutputExitOutcome": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "exit"
+            ],
+            "description": "The outcome type. Always `exit`.",
+            "default": "exit",
+            "x-stainless-const": true
+          },
+          "exit_code": {
+            "type": "integer",
+            "description": "Exit code from the shell process."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "exit_code"
+        ],
+        "title": "Shell call exit outcome",
+        "description": "Indicates that the shell commands finished and returned an exit code."
+      },
+      "FunctionShellCallOutputContent": {
+        "properties": {
+          "stdout": {
+            "type": "string",
+            "description": "The standard output that was captured."
+          },
+          "stderr": {
+            "type": "string",
+            "description": "The standard error output that was captured."
+          },
+          "outcome": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/FunctionShellCallOutputTimeoutOutcome"
+              },
+              {
+                "$ref": "#/components/schemas/FunctionShellCallOutputExitOutcome"
+              }
+            ],
+            "title": "Shell call outcome",
+            "description": "Represents either an exit outcome (with an exit code) or a timeout outcome for a shell call output chunk.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "stdout",
+          "stderr",
+          "outcome"
+        ],
+        "title": "Shell call output content",
+        "description": "The content of a shell tool call output that was emitted."
+      },
+      "FunctionShellCallOutput": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell_call_output"
+            ],
+            "description": "The type of the shell call output. Always `shell_call_output`.",
+            "default": "shell_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the shell call output. Populated when this item is returned via API."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the shell tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCaller",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionShellCallOutputStatusEnum",
+            "description": "The status of the shell call output. One of `in_progress`, `completed`, or `incomplete`."
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/FunctionShellCallOutputContent"
+            },
+            "type": "array",
+            "description": "An array of shell call output contents"
+          },
+          "max_output_length": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "The maximum length of the shell command output. This is generated by the model and should be passed back with the raw output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "status",
+          "output",
+          "max_output_length"
+        ],
+        "title": "Shell call output",
+        "description": "The output of a shell tool call that was emitted."
+      },
+      "ApplyPatchCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed"
+        ]
+      },
+      "ApplyPatchCreateFileOperation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "create_file"
+            ],
+            "description": "Create a new file with the provided diff.",
+            "default": "create_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "description": "Path of the file to create."
+          },
+          "diff": {
+            "type": "string",
+            "description": "Diff to apply."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path",
+          "diff"
+        ],
+        "title": "Apply patch create file operation",
+        "description": "Instruction describing how to create a file via the apply_patch tool."
+      },
+      "ApplyPatchDeleteFileOperation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "delete_file"
+            ],
+            "description": "Delete the specified file.",
+            "default": "delete_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "description": "Path of the file to delete."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path"
+        ],
+        "title": "Apply patch delete file operation",
+        "description": "Instruction describing how to delete a file via the apply_patch tool."
+      },
+      "ApplyPatchUpdateFileOperation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "update_file"
+            ],
+            "description": "Update an existing file with the provided diff.",
+            "default": "update_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "description": "Path of the file to update."
+          },
+          "diff": {
+            "type": "string",
+            "description": "Diff to apply."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path",
+          "diff"
+        ],
+        "title": "Apply patch update file operation",
+        "description": "Instruction describing how to update a file via the apply_patch tool."
+      },
+      "ApplyPatchToolCall": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch_call"
+            ],
+            "description": "The type of the item. Always `apply_patch_call`.",
+            "default": "apply_patch_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the apply patch tool call. Populated when this item is returned via API."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the apply patch tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCaller",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/ApplyPatchCallStatus",
+            "description": "The status of the apply patch tool call. One of `in_progress` or `completed`."
+          },
+          "operation": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ApplyPatchCreateFileOperation"
+              },
+              {
+                "$ref": "#/components/schemas/ApplyPatchDeleteFileOperation"
+              },
+              {
+                "$ref": "#/components/schemas/ApplyPatchUpdateFileOperation"
+              }
+            ],
+            "title": "Apply patch operation",
+            "description": "One of the create_file, delete_file, or update_file operations applied via apply_patch.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The ID of the entity that created this tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "status",
+          "operation"
+        ],
+        "title": "Apply patch tool call",
+        "description": "A tool call that applies file diffs by creating, deleting, or updating files."
+      },
+      "ApplyPatchCallOutputStatus": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "failed"
+        ]
+      },
+      "ApplyPatchToolCallOutput": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch_call_output"
+            ],
+            "description": "The type of the item. Always `apply_patch_call_output`.",
+            "default": "apply_patch_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the apply patch tool call output. Populated when this item is returned via API."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the apply patch tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCaller",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/ApplyPatchCallOutputStatus",
+            "description": "The status of the apply patch tool call output. One of `completed` or `failed`."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional textual output returned by the apply patch tool."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The ID of the entity that created this tool call output."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "status"
+        ],
+        "title": "Apply patch tool call output",
+        "description": "The output emitted by an apply patch tool call."
+      },
+      "MCPProtocolError": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_protocol_error"
+            ],
+            "default": "mcp_protocol_error",
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "integer"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "MCPToolExecutionError": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_tool_execution_error"
+            ],
+            "default": "mcp_tool_execution_error",
+            "x-stainless-const": true
+          },
+          "content": {}
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "content"
+        ]
+      },
+      "HTTPError": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http_error"
+            ],
+            "default": "http_error",
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "integer"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "MCPToolCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete",
+          "calling",
+          "failed"
+        ]
+      },
+      "DetailEnum": {
+        "type": "string",
+        "enum": [
+          "low",
+          "high",
+          "auto",
+          "original"
+        ]
+      },
+      "FunctionCallItemStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "ComputerCallOutputItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the computer tool call output.",
+                "example": "cuo_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The ID of the computer tool call that produced the output."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer_call_output"
+            ],
+            "description": "The type of the computer tool call output. Always `computer_call_output`.",
+            "default": "computer_call_output",
+            "x-stainless-const": true
+          },
+          "output": {
+            "$ref": "#/components/schemas/ComputerScreenshotImage"
+          },
+          "acknowledged_safety_checks": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/ComputerCallSafetyCheckParam"
+                },
+                "type": "array",
+                "description": "The safety checks reported by the API that have been acknowledged by the developer."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionCallItemStatus",
+                "description": "The status of the message input. One of `in_progress`, `completed`, or `incomplete`. Populated when input items are returned via API."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "call_id",
+          "type",
+          "output"
+        ],
+        "title": "Computer tool call output",
+        "description": "The output of a computer tool call."
+      },
+      "InputTextContentParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "description": "The type of the input item. Always `input_text`.",
+            "default": "input_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "The text input to the model."
+          },
+          "prompt_cache_breakpoint": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/PromptCacheBreakpointParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Input text",
+        "description": "A text input to the model."
+      },
+      "InputImageContentParamAutoParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "description": "The type of the input item. Always `input_image`.",
+            "default": "input_image",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 20971520,
+                "format": "uri",
+                "description": "The URL of the image to be sent to the model. A fully qualified URL or base64 encoded image in a data URL."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the file to be sent to the model.",
+                "example": "file-123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "detail": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/DetailEnum",
+                "description": "The detail level of the image to be sent to the model. One of `high`, `low`, `auto`, or `original`. Defaults to `auto`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_breakpoint": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/PromptCacheBreakpointParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Input image",
+        "description": "An image input to the model. Learn about [image inputs](https://developers.openai.com/api/docs/guides/images-vision)"
+      },
+      "FileDetailEnum": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "low",
+          "high"
+        ]
+      },
+      "InputFileContentParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_file"
+            ],
+            "description": "The type of the input item. Always `input_file`.",
+            "default": "input_file",
+            "x-stainless-const": true
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the file to be sent to the model.",
+                "example": "file-123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "filename": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The name of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_data": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 73400320,
+                "description": "The base64-encoded data of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri",
+                "description": "The URL of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "detail": {
+            "$ref": "#/components/schemas/FileDetailEnum",
+            "description": "The detail level of the file to be sent to the model. Use `auto` to let the system select the detail level; for GPT-5.6 and later models, `auto` uses high-quality rendering, which may increase input token usage. Use `low` for lower-cost rendering, or `high` to render the file at higher quality. Defaults to `auto`."
+          },
+          "prompt_cache_breakpoint": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/PromptCacheBreakpointParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Input file",
+        "description": "A file input to the model."
+      },
+      "FunctionCallOutputItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the function tool call output. Populated when this item is returned via API.",
+                "example": "fc_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "minLength": 1,
+                "description": "The unique ID of the function tool call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call_output"
+            ],
+            "description": "The type of the function tool call output. Always `function_call_output`.",
+            "default": "function_call_output",
+            "x-stainless-const": true
+          },
+          "output": {
+            "oneOf": [
+              {
+                "type": "string",
+                "maxLength": 10485760,
+                "description": "A JSON string of the output of the function tool call."
+              },
+              {
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/InputTextContentParam"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InputImageContentParamAutoParam"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InputFileContentParam"
+                    }
+                  ],
+                  "description": "A piece of message content, such as text, an image, or a file.",
+                  "discriminator": {
+                    "propertyName": "type"
+                  }
+                },
+                "type": "array",
+                "description": "An array of content outputs (text, image, file) for the function tool call."
+              }
+            ],
+            "description": "Text, image, or file output of the function tool call."
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 128,
+                "minLength": 1,
+                "description": "The name of the tool that produced the output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "namespace": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "minLength": 1,
+                "pattern": "^[a-zA-Z0-9_-]+$",
+                "description": "The namespace of the tool that produced the output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionCallItemStatus",
+                "description": "The status of the item. One of `in_progress`, `completed`, or `incomplete`. Populated when items are returned via API."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "output"
+        ],
+        "title": "Function tool call output",
+        "description": "The output of a function tool call."
+      },
+      "FileCitationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_citation"
+            ],
+            "description": "The citation type. Always `file_citation`.",
+            "default": "file_citation",
+            "x-stainless-const": true
+          },
+          "index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the file in the list of files."
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file.",
+            "example": "file-123"
+          },
+          "filename": {
+            "type": "string",
+            "description": "The filename of the file cited."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "index",
+          "file_id",
+          "filename"
+        ]
+      },
+      "UrlCitationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "url_citation"
+            ],
+            "description": "The citation type. Always `url_citation`.",
+            "default": "url_citation",
+            "x-stainless-const": true
+          },
+          "start_index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the first character of the citation in the message."
+          },
+          "end_index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the last character of the citation in the message."
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the cited resource."
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the cited resource."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "start_index",
+          "end_index",
+          "url",
+          "title"
+        ]
+      },
+      "ContainerFileCitationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_file_citation"
+            ],
+            "description": "The citation type. Always `container_file_citation`.",
+            "default": "container_file_citation",
+            "x-stainless-const": true
+          },
+          "start_index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the first character of the citation in the message."
+          },
+          "end_index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the last character of the citation in the message."
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The ID of the container.",
+            "example": "cntr_123"
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the container file.",
+            "example": "cfile_123"
+          },
+          "filename": {
+            "type": "string",
+            "description": "The filename of the container file cited."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "start_index",
+          "end_index",
+          "container_id",
+          "file_id",
+          "filename"
+        ]
+      },
+      "ToolSearchCallItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this tool search call.",
+                "example": "tsc_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "minLength": 1,
+                "description": "The unique ID of the tool search call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search_call"
+            ],
+            "description": "The item type. Always `tool_search_call`.",
+            "default": "tool_search_call",
+            "x-stainless-const": true
+          },
+          "execution": {
+            "$ref": "#/components/schemas/ToolSearchExecutionType",
+            "description": "Whether tool search was executed by the server or by the client."
+          },
+          "arguments": {
+            "$ref": "#/components/schemas/EmptyModelParam",
+            "description": "The arguments supplied to the tool search call."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionCallItemStatus",
+                "description": "The status of the tool search call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "arguments"
+        ]
+      },
+      "ToolSearchOutputItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this tool search output.",
+                "example": "tso_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "minLength": 1,
+                "description": "The unique ID of the tool search call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search_output"
+            ],
+            "description": "The item type. Always `tool_search_output`.",
+            "default": "tool_search_output",
+            "x-stainless-const": true
+          },
+          "execution": {
+            "$ref": "#/components/schemas/ToolSearchExecutionType",
+            "description": "Whether tool search was executed by the server or by the client."
+          },
+          "tools": {
+            "items": {
+              "$ref": "#/components/schemas/Tool"
+            },
+            "type": "array",
+            "description": "The loaded tool definitions returned by the tool search output."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionCallItemStatus",
+                "description": "The status of the tool search output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "tools"
+        ]
+      },
+      "AdditionalToolsItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this additional tools item.",
+                "example": "at_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "additional_tools"
+            ],
+            "description": "The item type. Always `additional_tools`.",
+            "default": "additional_tools",
+            "x-stainless-const": true
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "developer"
+            ],
+            "description": "The role that provided the additional tools. Only `developer` is supported.",
+            "default": "developer",
+            "x-stainless-const": true
+          },
+          "tools": {
+            "items": {
+              "$ref": "#/components/schemas/Tool"
+            },
+            "type": "array",
+            "description": "A list of additional tools made available at this item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "role",
+          "tools"
+        ]
+      },
+      "CompactionSummaryItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the compaction item.",
+                "example": "cmp_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction"
+            ],
+            "description": "The type of the item. Always `compaction`.",
+            "default": "compaction",
+            "x-stainless-const": true
+          },
+          "encrypted_content": {
+            "type": "string",
+            "maxLength": 20971520,
+            "description": "The encrypted content of the compaction summary."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "encrypted_content"
+        ],
+        "title": "Compaction item",
+        "description": "A compaction item generated by the [`v1/responses/compact` API](https://developers.openai.com/api/reference/resources/responses/methods/compact)."
+      },
+      "FunctionShellActionParam": {
+        "properties": {
+          "commands": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "description": "Ordered shell commands for the execution environment to run."
+          },
+          "timeout_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Maximum wall-clock time in milliseconds to allow the shell commands to run."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_output_length": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Maximum number of UTF-8 characters to capture from combined stdout and stderr output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "commands"
+        ],
+        "title": "Shell action",
+        "description": "Commands and limits describing how to run the shell tool call."
+      },
+      "FunctionShellCallItemStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ],
+        "title": "Shell call status",
+        "description": "Status values reported for shell tool calls."
+      },
+      "FunctionShellCallItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the shell tool call. Populated when this item is returned via API.",
+                "example": "sh_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the shell tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell_call"
+            ],
+            "description": "The type of the item. Always `shell_call`.",
+            "default": "shell_call",
+            "x-stainless-const": true
+          },
+          "action": {
+            "$ref": "#/components/schemas/FunctionShellActionParam",
+            "description": "The shell commands and limits that describe how to run the tool call."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionShellCallItemStatus",
+                "description": "The status of the shell call. One of `in_progress`, `completed`, or `incomplete`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "environment": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/LocalEnvironmentParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ContainerReferenceParam"
+                  }
+                ],
+                "description": "The environment to execute the shell commands in.",
+                "discriminator": {
+                  "propertyName": "type"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "call_id",
+          "type",
+          "action"
+        ],
+        "title": "Shell tool call",
+        "description": "A tool representing a request to execute one or more shell commands."
+      },
+      "FunctionShellCallOutputTimeoutOutcomeParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "timeout"
+            ],
+            "description": "The outcome type. Always `timeout`.",
+            "default": "timeout",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Shell call timeout outcome",
+        "description": "Indicates that the shell call exceeded its configured time limit."
+      },
+      "FunctionShellCallOutputExitOutcomeParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "exit"
+            ],
+            "description": "The outcome type. Always `exit`.",
+            "default": "exit",
+            "x-stainless-const": true
+          },
+          "exit_code": {
+            "type": "integer",
+            "description": "The exit code returned by the shell process."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "exit_code"
+        ],
+        "title": "Shell call exit outcome",
+        "description": "Indicates that the shell commands finished and returned an exit code."
+      },
+      "FunctionShellCallOutputOutcomeParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/FunctionShellCallOutputTimeoutOutcomeParam"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCallOutputExitOutcomeParam"
+          }
+        ],
+        "title": "Shell call outcome",
+        "description": "The exit or timeout outcome associated with this shell call.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "FunctionShellCallOutputContentParam": {
+        "properties": {
+          "stdout": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Captured stdout output for the shell call."
+          },
+          "stderr": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Captured stderr output for the shell call."
+          },
+          "outcome": {
+            "$ref": "#/components/schemas/FunctionShellCallOutputOutcomeParam",
+            "description": "The exit or timeout outcome associated with this shell call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "stdout",
+          "stderr",
+          "outcome"
+        ],
+        "title": "Shell output content",
+        "description": "Captured stdout and stderr for a portion of a shell tool call output."
+      },
+      "FunctionShellCallOutputItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the shell tool call output. Populated when this item is returned via API.",
+                "example": "sho_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the shell tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell_call_output"
+            ],
+            "description": "The type of the item. Always `shell_call_output`.",
+            "default": "shell_call_output",
+            "x-stainless-const": true
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/FunctionShellCallOutputContentParam"
+            },
+            "type": "array",
+            "description": "Captured chunks of stdout and stderr output, along with their associated outcomes."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionShellCallItemStatus",
+                "description": "The status of the shell call output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_output_length": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "The maximum number of UTF-8 characters captured for this shell call's combined output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "call_id",
+          "type",
+          "output"
+        ],
+        "title": "Shell tool call output",
+        "description": "The streamed output items emitted by a shell tool call."
+      },
+      "ApplyPatchCallStatusParam": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed"
+        ],
+        "title": "Apply patch call status",
+        "description": "Status values reported for apply_patch tool calls."
+      },
+      "ApplyPatchCreateFileOperationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "create_file"
+            ],
+            "description": "The operation type. Always `create_file`.",
+            "default": "create_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "description": "Path of the file to create relative to the workspace root."
+          },
+          "diff": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Unified diff content to apply when creating the file."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path",
+          "diff"
+        ],
+        "title": "Apply patch create file operation",
+        "description": "Instruction for creating a new file via the apply_patch tool."
+      },
+      "ApplyPatchDeleteFileOperationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "delete_file"
+            ],
+            "description": "The operation type. Always `delete_file`.",
+            "default": "delete_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "description": "Path of the file to delete relative to the workspace root."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path"
+        ],
+        "title": "Apply patch delete file operation",
+        "description": "Instruction for deleting an existing file via the apply_patch tool."
+      },
+      "ApplyPatchUpdateFileOperationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "update_file"
+            ],
+            "description": "The operation type. Always `update_file`.",
+            "default": "update_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "description": "Path of the file to update relative to the workspace root."
+          },
+          "diff": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Unified diff content to apply to the existing file."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path",
+          "diff"
+        ],
+        "title": "Apply patch update file operation",
+        "description": "Instruction for updating an existing file via the apply_patch tool."
+      },
+      "ApplyPatchOperationParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/ApplyPatchCreateFileOperationParam"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchDeleteFileOperationParam"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchUpdateFileOperationParam"
+          }
+        ],
+        "title": "Apply patch operation",
+        "description": "One of the create_file, delete_file, or update_file operations supplied to the apply_patch tool.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ApplyPatchToolCallItemParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch_call"
+            ],
+            "description": "The type of the item. Always `apply_patch_call`.",
+            "default": "apply_patch_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the apply patch tool call. Populated when this item is returned via API.",
+                "example": "apc_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the apply patch tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/ApplyPatchCallStatusParam",
+            "description": "The status of the apply patch tool call. One of `in_progress` or `completed`."
+          },
+          "operation": {
+            "$ref": "#/components/schemas/ApplyPatchOperationParam",
+            "description": "The specific create, delete, or update instruction for the apply_patch tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "call_id",
+          "status",
+          "operation"
+        ],
+        "title": "Apply patch tool call",
+        "description": "A tool call representing a request to create, delete, or update files using diff patches."
+      },
+      "ApplyPatchCallOutputStatusParam": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "failed"
+        ],
+        "title": "Apply patch call output status",
+        "description": "Outcome values reported for apply_patch tool call outputs."
+      },
+      "ApplyPatchToolCallOutputItemParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch_call_output"
+            ],
+            "description": "The type of the item. Always `apply_patch_call_output`.",
+            "default": "apply_patch_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the apply patch tool call output. Populated when this item is returned via API.",
+                "example": "apco_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the apply patch tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/ApplyPatchCallOutputStatusParam",
+            "description": "The status of the apply patch tool call output. One of `completed` or `failed`."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 10485760,
+                "description": "Optional human-readable log text from the apply patch tool (e.g., patch results or errors)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "call_id",
+          "status"
+        ],
+        "title": "Apply patch tool call output",
+        "description": "The streamed output emitted by an apply patch tool call."
+      },
+      "CompactionTriggerItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this compaction trigger.",
+                "example": "msg_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction_trigger"
+            ],
+            "description": "The type of the item. Always `compaction_trigger`.",
+            "default": "compaction_trigger",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Compaction trigger",
+        "description": "Compacts the current context. Must be the final input item."
+      },
+      "ItemReferenceParam": {
+        "properties": {
+          "type": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "item_reference"
+                ],
+                "description": "The type of item to reference. Always `item_reference`.",
+                "default": "item_reference",
+                "x-stainless-const": true
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the item to reference."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "title": "Item reference",
+        "description": "An internal identifier for an item to reference."
+      },
+      "ProgramItemParam": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of this program item.",
+            "example": "cm_123"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "program"
+            ],
+            "description": "The item type. Always `program`.",
+            "default": "program",
+            "x-stainless-const": true
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The stable call ID of the program item."
+          },
+          "code": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "The JavaScript source executed by programmatic tool calling."
+          },
+          "fingerprint": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Opaque program replay fingerprint that must be round-tripped."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "type",
+          "call_id",
+          "code",
+          "fingerprint"
+        ]
+      },
+      "ProgramOutputItemStatus": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "incomplete"
+        ]
+      },
+      "ProgramOutputItemParam": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of this program output item.",
+            "example": "cmo_123"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "program_output"
+            ],
+            "description": "The item type. Always `program_output`.",
+            "default": "program_output",
+            "x-stainless-const": true
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The call ID of the program item."
+          },
+          "result": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "The result produced by the program item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/ProgramOutputItemStatus",
+            "description": "The terminal status of the program output."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "type",
+          "call_id",
+          "result",
+          "status"
+        ]
+      },
+      "ConversationResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the conversation."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "conversation"
+            ],
+            "description": "The object type, which is always `conversation`.",
+            "default": "conversation",
+            "x-stainless-const": true
+          },
+          "metadata": {
+            "description": "Set of 16 key-value pairs that can be attached to an object. This can be         useful for storing additional information about the object in a structured         format, and querying for objects via API or the dashboard.\n        Keys are strings with a maximum length of 64 characters. Values are strings         with a maximum length of 512 characters."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The time at which the conversation was created, measured in seconds since the Unix epoch."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "metadata",
+          "created_at"
+        ]
+      },
+      "_MisalignmentErrorType": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "potentially_unintended_data_transfer",
+              "potentially_unintended_data_access",
+              "potentially_unintended_destructive_activity",
+              "other"
+            ]
+          }
+        ]
+      },
+      "_MisalignmentSteer": {
+        "properties": {
+          "message": {
+            "type": "string",
+            "description": "The public continuation instruction."
+          }
+        },
+        "type": "object",
+        "required": [
+          "message"
+        ]
+      },
+      "MisalignmentErrorDetailsResource": {
+        "properties": {
+          "error_type": {
+            "$ref": "#/components/schemas/_MisalignmentErrorType",
+            "description": "An optional classification; clients must accept additional values."
+          },
+          "detailed_explanation": {
+            "type": "string",
+            "description": "The public explanation for this block."
+          },
+          "steer": {
+            "$ref": "#/components/schemas/_MisalignmentSteer",
+            "description": "An optional public continuation instruction."
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "ImageGenOutputTokensDetails": {
+        "properties": {
+          "image_tokens": {
+            "type": "integer",
+            "description": "The number of image output tokens generated by the model."
+          },
+          "text_tokens": {
+            "type": "integer",
+            "description": "The number of text output tokens generated by the model."
+          }
+        },
+        "type": "object",
+        "required": [
+          "image_tokens",
+          "text_tokens"
+        ],
+        "title": "Image generation output token details",
+        "description": "The output token details for the image generation."
+      },
+      "ImageGenInputUsageDetails": {
+        "properties": {
+          "text_tokens": {
+            "type": "integer",
+            "description": "The number of text tokens in the input prompt."
+          },
+          "image_tokens": {
+            "type": "integer",
+            "description": "The number of image tokens in the input prompt."
+          }
+        },
+        "type": "object",
+        "required": [
+          "text_tokens",
+          "image_tokens"
+        ],
+        "title": "Input usage details",
+        "description": "The input tokens detailed information for the image generation."
+      },
+      "ImageGenUsage": {
+        "properties": {
+          "input_tokens": {
+            "type": "integer",
+            "description": "The number of tokens (images and text) in the input prompt."
+          },
+          "total_tokens": {
+            "type": "integer",
+            "description": "The total number of tokens (images and text) used for the image generation."
+          },
+          "output_tokens": {
+            "type": "integer",
+            "description": "The number of output tokens generated by the model."
+          },
+          "output_tokens_details": {
+            "$ref": "#/components/schemas/ImageGenOutputTokensDetails"
+          },
+          "input_tokens_details": {
+            "$ref": "#/components/schemas/ImageGenInputUsageDetails"
+          }
+        },
+        "type": "object",
+        "required": [
+          "input_tokens",
+          "total_tokens",
+          "output_tokens",
+          "input_tokens_details"
+        ],
+        "title": "Image generation usage",
+        "description": "For `gpt-image-1` only, the token usage information for the image generation."
+      },
+      "instructions": {
+        "anyOf": [
+          {
+            "description": "Frontend instructions for voice, conversation, interruptions, and when to delegate. Start with the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting); put business rules and tool workflows in a separate [backend prompt](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt). Limited to 16,384 client-supplied tokens. Omitted or blank instructions use server defaults. Immutable after startup.",
+            "type": "string"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "LiveCustomVoiceParam": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 128
+          }
+        },
+        "required": [
+          "id"
+        ]
+      },
+      "LiveInitialSessionAudioOutputParam": {
+        "description": "Settings for speech generated by the Live model. Choose the voice before starting the session.",
+        "type": "object",
+        "properties": {
+          "voice": {
+            "description": "The voice used for Live speech, as a built-in voice name or a custom voice object containing its ID. Defaults to `marin` and cannot change after startup.",
+            "oneOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "alloy",
+                      "ash",
+                      "ballad",
+                      "beacon",
+                      "bossa",
+                      "cedar",
+                      "cinder",
+                      "coral",
+                      "delta",
+                      "echo",
+                      "gleam",
+                      "marin",
+                      "meridian",
+                      "quartz",
+                      "ripple",
+                      "sage",
+                      "shimmer",
+                      "stone",
+                      "tempo",
+                      "verse",
+                      "vesper",
+                      "willow"
+                    ]
+                  }
+                ]
+              },
+              {
+                "$ref": "#/components/schemas/LiveCustomVoiceParam"
+              }
+            ]
+          }
+        },
+        "required": []
+      },
+      "LiveClientDelegationParam": {
+        "description": "Delegate tasks to your application. The Live session emits delegation events that your backend handles.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The delegation owner. Always `client` for tasks handled by your application.",
+            "default": "client",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "client"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "LiveResponsesServiceTier": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default",
+          "fast_tier_temp_pilot",
+          "flex",
+          "priority",
+          "ultrafast"
+        ]
+      },
+      "LiveReasoningEffort": {
+        "type": "string",
+        "enum": [
+          "none",
+          "minimal",
+          "low",
+          "medium",
+          "high",
+          "xhigh"
+        ]
+      },
+      "LiveReasoningSummary": {
+        "type": "string",
+        "enum": [
+          "concise",
+          "detailed",
+          "auto"
+        ]
+      },
+      "LiveDelegationReasoningInputParam": {
+        "description": "Reasoning options for Responses requests made on behalf of the Live session.",
+        "type": "object",
+        "properties": {
+          "effort": {
+            "anyOf": [
+              {
+                "description": "How much reasoning effort the delegated Responses model should use. Supported values depend on the backend model.",
+                "$ref": "#/components/schemas/LiveReasoningEffort"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "description": "The reasoning summary to request from the delegated Responses model, when supported.",
+                "$ref": "#/components/schemas/LiveReasoningSummary"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": []
+      },
+      "LiveTextVerbosity": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ]
+      },
+      "LiveDelegationTextInputParam": {
+        "description": "Text generation options for the Live session’s Responses backend.",
+        "type": "object",
+        "properties": {
+          "verbosity": {
+            "anyOf": [
+              {
+                "description": "The amount of detail in text generated by the Responses backend. This does not configure the Live model’s spoken delivery.",
+                "$ref": "#/components/schemas/LiveTextVerbosity"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": []
+      },
+      "LiveFunctionToolInputParam": {
+        "description": "A function tool available to the Responses backend when the Live model delegates a task.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The tool type. Always `function`.",
+            "default": "function",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "function"
+            ]
+          },
+          "name": {
+            "description": "The name the delegated Responses model uses when calling this function.",
+            "type": "string"
+          },
+          "description": {
+            "anyOf": [
+              {
+                "description": "What the function does and when the delegated Responses model should call it.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parameters": {
+            "anyOf": [
+              {
+                "description": "A JSON Schema object describing the arguments accepted by the function.",
+                "type": "object",
+                "additionalProperties": {}
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "strict": {
+            "anyOf": [
+              {
+                "description": "Whether the delegated Responses model must follow the function’s parameter schema exactly.",
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "name"
+        ]
+      },
+      "LiveWebSearchToolInputParam": {
+        "description": "A web search tool available to the Live session’s Responses backend.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The tool type. Always `web_search`.",
+            "default": "web_search",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "web_search"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "LiveToolChoiceEnum": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "none",
+          "required"
+        ]
+      },
+      "LiveFunctionToolChoiceParam": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "default": "function",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "function"
+            ]
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "pattern": "^[a-zA-Z0-9_-]+$"
+          }
+        },
+        "required": [
+          "type",
+          "name"
+        ]
+      },
+      "LiveMCPToolChoiceParam": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "default": "mcp",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "mcp"
+            ]
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "pattern": "^[a-zA-Z0-9_-]+$"
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "pattern": "^[a-zA-Z0-9_-]+$"
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "name"
+        ]
+      },
+      "LiveResponsesDelegationSettingsInputParam": {
+        "description": "Model, prompt, and tool settings for tasks delegated by the Live session to a Responses backend.",
+        "type": "object",
+        "properties": {
+          "model": {
+            "description": "The model used for server-owned Responses delegations.",
+            "type": "string"
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "description": "Instructions for the delegated Responses model, separate from Live instructions. See [backend prompting](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt).",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_output_tokens": {
+            "anyOf": [
+              {
+                "description": "Maximum number of output tokens for each delegated response.",
+                "type": "integer",
+                "minimum": 16
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "description": "Service tier for delegated Responses requests.",
+                "$ref": "#/components/schemas/LiveResponsesServiceTier"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "description": "Reasoning settings passed to each delegated Responses request.",
+                "$ref": "#/components/schemas/LiveDelegationReasoningInputParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "text": {
+            "anyOf": [
+              {
+                "description": "Text generation settings passed to each delegated Responses request.",
+                "$ref": "#/components/schemas/LiveDelegationTextInputParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "description": "Tools available to the Responses backend while it handles tasks delegated by the Live model.",
+            "type": "array",
+            "items": {
+              "discriminator": {
+                "propertyName": "type"
+              },
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/LiveFunctionToolInputParam"
+                },
+                {
+                  "$ref": "#/components/schemas/LiveWebSearchToolInputParam"
+                }
+              ]
+            }
+          },
+          "tool_choice": {
+            "description": "Controls which tool the Responses backend uses when handling a task delegated by the Live model.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/LiveToolChoiceEnum"
+              },
+              {
+                "$ref": "#/components/schemas/LiveFunctionToolChoiceParam"
+              },
+              {
+                "$ref": "#/components/schemas/LiveMCPToolChoiceParam"
+              }
+            ]
+          },
+          "parallel_tool_calls": {
+            "anyOf": [
+              {
+                "description": "Whether the delegated Responses model may request multiple tool calls in a single response.",
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "model"
+        ]
+      },
+      "LiveResponsesDelegationParam": {
+        "description": "Delegate tasks to a Responses model managed by the Live session.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The delegation owner. Always `responses` for tasks handled by the Responses API.",
+            "default": "responses",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "responses"
+            ]
+          },
+          "responses": {
+            "description": "Backend model, prompt, and tools used when the Live session delegates a task to Responses.",
+            "$ref": "#/components/schemas/LiveResponsesDelegationSettingsInputParam"
+          }
+        },
+        "required": [
+          "type",
+          "responses"
+        ]
+      },
+      "delegation": {
+        "anyOf": [
+          {
+            "description": "Who handles tasks delegated by the Live model. Omitted or null selects your application; use `responses` to let the API manage a Responses backend.",
+            "discriminator": {
+              "propertyName": "type"
+            },
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/LiveClientDelegationParam"
+              },
+              {
+                "$ref": "#/components/schemas/LiveResponsesDelegationParam"
+              }
+            ]
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "store": {
+        "description": "Whether to store the session for later forking and recording download. Defaults to false for new sessions.",
+        "type": "boolean"
+      },
+      "LiveInitialMessageStatus": {
+        "type": "string",
+        "enum": [
+          "incomplete",
+          "completed"
+        ]
+      },
+      "LiveInitialInputTextContentPartParam": {
+        "description": "Text supplied in a developer or user message when starting a Live session.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The text content type. Always `input_text`.",
+            "default": "input_text",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "input_text"
+            ]
+          },
+          "text": {
+            "description": "The message text to include in the Live session’s initial conversation history.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "text"
+        ]
+      },
+      "LiveInitialDeveloperMessageItemParam": {
+        "description": "A developer message included in the initial text history of a Live session.",
+        "type": "object",
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "description": "An optional identifier for the supplied history message. Live uses the message’s role and text to initialize the conversation.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The history item type. Always `message`.",
+            "default": "message",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "message"
+            ]
+          },
+          "status": {
+            "anyOf": [
+              {
+                "description": "The supplied message’s status. Live uses its text as history and does not resume an incomplete message.",
+                "$ref": "#/components/schemas/LiveInitialMessageStatus"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "role": {
+            "description": "The author of this history message. Always `developer`.",
+            "default": "developer",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "developer"
+            ]
+          },
+          "content": {
+            "description": "The message content. Supply exactly one text part for the initial Live conversation history.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LiveInitialInputTextContentPartParam"
+            },
+            "minItems": 1,
+            "maxItems": 1
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ]
+      },
+      "LiveInitialUserMessageItemParam": {
+        "description": "A user message included in the initial text history of a Live session.",
+        "type": "object",
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "description": "An optional identifier for the supplied history message. Live uses the message’s role and text to initialize the conversation.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The history item type. Always `message`.",
+            "default": "message",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "message"
+            ]
+          },
+          "status": {
+            "anyOf": [
+              {
+                "description": "The supplied message’s status. Live uses its text as history and does not resume an incomplete message.",
+                "$ref": "#/components/schemas/LiveInitialMessageStatus"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "role": {
+            "description": "The author of this history message. Always `user`.",
+            "default": "user",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "user"
+            ]
+          },
+          "content": {
+            "description": "The message content. Supply exactly one text part for the initial Live conversation history.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LiveInitialInputTextContentPartParam"
+            },
+            "minItems": 1,
+            "maxItems": 1
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ]
+      },
+      "LiveInitialTextContentPartParam": {
+        "description": "Assistant text supplied as conversation history when starting a Live session.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The text content type. Always `text`.",
+            "default": "text",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "text"
+            ]
+          },
+          "text": {
+            "description": "The message text to include in the Live session’s initial conversation history.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "text"
+        ]
+      },
+      "LiveInitialOutputTextContentPartParam": {
+        "description": "Assistant output text supplied as conversation history when starting a Live session.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The text content type. Always `output_text`.",
+            "default": "output_text",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "output_text"
+            ]
+          },
+          "text": {
+            "description": "The message text to include in the Live session’s initial conversation history.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ]
+      },
+      "LiveInitialAssistantMessageItemParam": {
+        "description": "An assistant message included in the initial text history of a Live session.",
+        "type": "object",
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "description": "An optional identifier for the supplied history message. Live uses the message’s role and text to initialize the conversation.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The history item type. Always `message`.",
+            "default": "message",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "message"
+            ]
+          },
+          "status": {
+            "anyOf": [
+              {
+                "description": "The supplied message’s status. Live uses its text as history and does not resume an incomplete message.",
+                "$ref": "#/components/schemas/LiveInitialMessageStatus"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "role": {
+            "description": "The author of this history message. Always `assistant`.",
+            "default": "assistant",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "assistant"
+            ]
+          },
+          "content": {
+            "description": "The message content. Supply exactly one text part for the initial Live conversation history.",
+            "type": "array",
+            "items": {
+              "discriminator": {
+                "propertyName": "type"
+              },
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/LiveInitialTextContentPartParam"
+                },
+                {
+                  "$ref": "#/components/schemas/LiveInitialOutputTextContentPartParam"
+                }
+              ],
+              "x-oai-default-discriminator-value": "text"
+            },
+            "minItems": 1,
+            "maxItems": 1
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ]
+      },
+      "LiveInitialItem": {
+        "description": "A developer, user, or assistant message supplied as text history before the Live session starts.",
+        "discriminator": {
+          "propertyName": "role"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/LiveInitialDeveloperMessageItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInitialUserMessageItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInitialAssistantMessageItemParam"
+          }
+        ]
+      },
+      "input": {
+        "description": "Ordered text-only history supplied before startup. Supports developer, user, and assistant messages with one text part each; at most 128 messages and 8,192 rendered tokens in total.",
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/LiveInitialItem"
+        },
+        "maxItems": 128
+      },
+      "LiveAllowedServerEventParam": {
+        "description": "A Live server event selector for the WebRTC frontend data channel.",
+        "example": {
+          "type": "session.started"
+        },
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The outer Live server event type. Use 'response.event' for Responses events.",
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 256
+          },
+          "response_event": {
+            "description": "The nested Responses event type. Required when type is 'response.event'; forbidden for other event types.",
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 256
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.started"
+          }
+        }
+      },
+      "LiveDataChannelConfigParam": {
+        "description": "Control which Live events an untrusted WebRTC frontend can send and receive over its data channel. These restrictions do not apply to trusted sideband connections.",
+        "type": "object",
+        "properties": {
+          "allowed_client_events": {
+            "description": "Client event types that the frontend data channel may send. Use 'all' to allow every client event; an empty array allows none. Omission preserves the existing allow-all behavior.",
+            "oneOf": [
+              {
+                "default": "all",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "all"
+                ]
+              },
+              {
+                "type": "array",
+                "items": {
+                  "description": "A Live client event type allowed on the frontend data channel, such as `session.input_audio.mute`.",
+                  "type": "string",
+                  "minLength": 1,
+                  "maxLength": 256,
+                  "pattern": "^(?:error|info|[a-z][a-z0-9_-]*(?:\\.[a-z0-9_-]+)+)$"
+                },
+                "maxItems": 256
+              }
+            ]
+          },
+          "allowed_server_events": {
+            "description": "Server events that may be sent to the frontend data channel. Use 'all' to allow every server event; an empty array allows none. Omission preserves the existing allow-all behavior. Responses events use an object with type 'response.event' and a response_event selector.",
+            "oneOf": [
+              {
+                "default": "all",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "all"
+                ]
+              },
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/LiveAllowedServerEventParam"
+                },
+                "maxItems": 256
+              }
+            ]
+          }
+        },
+        "required": []
+      },
+      "LiveClientConfigParam": {
+        "description": "Startup-only capabilities for an untrusted frontend attached to a unified WebRTC session. Trusted sideband connections are unaffected.",
+        "type": "object",
+        "properties": {
+          "data_channel": {
+            "description": "Client and server event permissions for the WebRTC frontend data channel.",
+            "$ref": "#/components/schemas/LiveDataChannelConfigParam"
+          }
+        },
+        "required": [
+          "data_channel"
+        ]
+      },
+      "properties-store": {
+        "description": "Whether to store the forked session. Omission inherits the stored session's setting.",
+        "type": "boolean"
+      },
+      "LiveResponsesDelegationSettingsUpdateInputParam": {
+        "description": "Updates to the Responses backend of an existing Live session. Omitted settings retain their current values.",
+        "type": "object",
+        "properties": {
+          "model": {
+            "description": "The Responses backend model to use for subsequent delegated requests. Omit to keep the current backend model.",
+            "type": "string"
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "description": "Instructions for the delegated Responses model, separate from Live instructions. See [backend prompting](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt).",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_output_tokens": {
+            "anyOf": [
+              {
+                "description": "Maximum number of output tokens for each delegated response.",
+                "type": "integer",
+                "minimum": 16
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "description": "Service tier for delegated Responses requests.",
+                "$ref": "#/components/schemas/LiveResponsesServiceTier"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "description": "Reasoning settings passed to each delegated Responses request.",
+                "$ref": "#/components/schemas/LiveDelegationReasoningInputParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "text": {
+            "anyOf": [
+              {
+                "description": "Text generation settings passed to each delegated Responses request.",
+                "$ref": "#/components/schemas/LiveDelegationTextInputParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "description": "Tools available to the Responses backend while it handles tasks delegated by the Live model.",
+            "type": "array",
+            "items": {
+              "discriminator": {
+                "propertyName": "type"
+              },
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/LiveFunctionToolInputParam"
+                },
+                {
+                  "$ref": "#/components/schemas/LiveWebSearchToolInputParam"
+                }
+              ]
+            }
+          },
+          "tool_choice": {
+            "description": "Controls which tool the Responses backend uses when handling a task delegated by the Live model.",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/LiveToolChoiceEnum"
+              },
+              {
+                "$ref": "#/components/schemas/LiveFunctionToolChoiceParam"
+              },
+              {
+                "$ref": "#/components/schemas/LiveMCPToolChoiceParam"
+              }
+            ]
+          },
+          "parallel_tool_calls": {
+            "anyOf": [
+              {
+                "description": "Whether the delegated Responses model may request multiple tool calls in a single response.",
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": []
+      },
+      "LiveResponsesDelegationUpdateParam": {
+        "description": "Update the Responses backend for an existing Live session without changing delegation ownership.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The delegation owner. Always `responses` for tasks handled by the Responses API.",
+            "default": "responses",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "responses"
+            ]
+          },
+          "responses": {
+            "description": "Responses backend settings to update. Omitted settings keep their existing values.",
+            "$ref": "#/components/schemas/LiveResponsesDelegationSettingsUpdateInputParam"
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "target_uri": {
+        "type": "string",
+        "description": "URI that should appear in the SIP Refer-To header. Supports values like\n`tel:+14155550123` or `sip:agent@example.com`.",
+        "example": "tel:+14155550123"
+      },
+      "PublicProjectResidency": {
+        "type": "string",
+        "enum": [
+          "GLOBAL",
+          "US_STORAGE_PROCESSING",
+          "EU_STORAGE_PROCESSING",
+          "JP_STORAGE",
+          "KR_STORAGE",
+          "CA_STORAGE",
+          "SG_STORAGE",
+          "IN_STORAGE",
+          "AU_STORAGE",
+          "GB_STORAGE",
+          "AE_STORAGE",
+          "AE_STORAGE_PROCESSING"
+        ]
+      },
+      "SpecificProgrammaticToolCallingParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "description": "The tool to call. Always `programmatic_tool_calling`.",
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "SpecificApplyPatchParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch"
+            ],
+            "description": "The tool to call. Always `apply_patch`.",
+            "default": "apply_patch",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Specific apply patch tool choice",
+        "description": "Forces the model to call the apply_patch tool when executing a tool call."
+      },
+      "SpecificFunctionShellParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell"
+            ],
+            "description": "The tool to call. Always `shell`.",
+            "default": "shell",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Specific shell tool choice",
+        "description": "Forces the model to call the shell tool when a tool call is required."
+      },
+      "ResponsePromptCacheOptionsParam": {
+        "properties": {
+          "ttl": {
+            "$ref": "#/components/schemas/PromptCacheTTLEnum",
+            "description": "The minimum lifetime applied to every implicit and explicit cache breakpoint written by the request. Defaults to `30m`, which is currently the only supported value. The backend may retain cache entries for longer."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/PromptCacheModeEnum",
+            "description": "Controls whether OpenAI automatically creates an implicit cache breakpoint. Defaults to `implicit`. With `implicit`, OpenAI creates one implicit breakpoint and writes up to the latest three explicit breakpoints in the request. With `explicit`, OpenAI does not create an implicit breakpoint and writes up to the latest four explicit breakpoints. If there are no explicit breakpoints, the request does not use prompt caching."
+          },
+          "comparison_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of a response to compare when diagnosing prompt cache reuse. Supplying this field requests prompt cache diagnostics when the feature is enabled.",
+                "example": "resp_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Prompt cache options",
+        "description": "Options for prompt caching. Supported for `gpt-5.6` and later models. By default, OpenAI automatically chooses one implicit cache breakpoint. You can add explicit breakpoints to content blocks with `prompt_cache_breakpoint`. Each request can write up to four breakpoints. For cache matching, OpenAI considers up to the latest 80 breakpoints in the conversation, without a content-block lookback limit. Set `mode` to `explicit` to disable the implicit breakpoint. The `ttl` defaults to `30m`, which is currently the only supported value. See the [prompt caching guide](https://developers.openai.com/api/docs/guides/prompt-caching) for current details."
+      },
+      "ReasoningModeEnum": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "standard",
+              "pro"
+            ]
+          }
+        ]
+      },
+      "ConversationParam-2": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the conversation.",
+            "example": "conv_123"
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "title": "Conversation object",
+        "description": "The conversation that this response belongs to."
+      },
+      "ContextManagementParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The context management entry type. Currently only 'compaction' is supported."
+          },
+          "compact_threshold": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "minimum": 1000,
+                "description": "Token threshold at which compaction should be triggered for this entry."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "PromptCacheOptions": {
+        "properties": {
+          "ttl": {
+            "$ref": "#/components/schemas/PromptCacheTTLEnum",
+            "description": "The minimum lifetime applied to each cache breakpoint."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/PromptCacheModeEnum",
+            "description": "Whether implicit prompt-cache breakpoints were enabled."
+          },
+          "comparison_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The response ID supplied as the prompt cache diagnostics comparison."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "ttl",
+          "mode"
+        ],
+        "title": "Prompt cache options",
+        "description": "The prompt-caching options that were applied to the response. Supported for `gpt-5.6` and later models."
+      },
+      "CacheMissReasonTypeEnum": {
+        "type": "string",
+        "enum": [
+          "model_changed",
+          "prompt_cache_key_changed",
+          "tools_changed",
+          "text_format_changed",
+          "reasoning_effort_changed",
+          "verbosity_changed",
+          "context_compacted",
+          "input_changed",
+          "service_tier_changed"
+        ]
+      },
+      "PromptCacheMissDiagnosticsBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "cache_miss"
+            ],
+            "default": "cache_miss",
+            "x-stainless-const": true
+          },
+          "reason": {
+            "$ref": "#/components/schemas/CacheMissReasonTypeEnum",
+            "description": "The reason prompt cache reuse did not occur."
+          },
+          "cache_missed_tokens": {
+            "type": "integer",
+            "description": "The estimated number of input tokens affected after the first detected divergence."
+          },
+          "comparison_reusable_tokens": {
+            "type": "integer",
+            "description": "The raw token count of the reusable prefix in the compared response."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "reason",
+          "cache_missed_tokens"
+        ]
+      },
+      "PromptCacheHitDiagnosticsBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "cache_hit"
+            ],
+            "default": "cache_hit",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "PromptCacheComparisonResponseNotFoundDiagnosticsBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "comparison_response_not_found"
+            ],
+            "default": "comparison_response_not_found",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "PromptCacheUnavailableDiagnosticsBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "unavailable"
+            ],
+            "default": "unavailable",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "PromptCacheDiagnostics": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PromptCacheMissDiagnosticsBody"
+          },
+          {
+            "$ref": "#/components/schemas/PromptCacheHitDiagnosticsBody"
+          },
+          {
+            "$ref": "#/components/schemas/PromptCacheComparisonResponseNotFoundDiagnosticsBody"
+          },
+          {
+            "$ref": "#/components/schemas/PromptCacheUnavailableDiagnosticsBody"
+          }
+        ],
+        "description": "Prompt cache diagnostics requested for this response.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ModerationErrorBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "error"
+            ],
+            "description": "The object type, which was always `error` for moderation failures.",
+            "default": "error",
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "string",
+            "description": "The error code."
+          },
+          "message": {
+            "type": "string",
+            "description": "The error message."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "code",
+          "message"
+        ],
+        "title": "Moderation error",
+        "description": "An error produced while attempting moderation for the response input or output."
+      },
+      "Moderation": {
+        "properties": {
+          "input": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ModerationResultBody"
+              },
+              {
+                "$ref": "#/components/schemas/ModerationErrorBody"
+              }
+            ],
+            "description": "Moderation for the response input.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "output": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ModerationResultBody"
+              },
+              {
+                "$ref": "#/components/schemas/ModerationErrorBody"
+              }
+            ],
+            "description": "Moderation for the response output.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "type": "object",
+        "required": [
+          "input",
+          "output"
+        ],
+        "title": "Moderation",
+        "description": "Moderation results or errors for the response input and output."
+      },
+      "ResponseConversation": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the conversation that this response was associated with."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "title": "Conversation",
+        "description": "The conversation that this response belonged to. Input items and output items from this response were automatically added to this conversation."
+      },
+      "ResponseShellCallCommandAddedStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_command.added"
+            ],
+            "description": "The type of the event, always `response.shell_call_command.added`.",
+            "default": "response.shell_call_command.added",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that was added."
+          },
+          "command": {
+            "type": "string",
+            "description": "The shell command that was added."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "output_index",
+          "command_index",
+          "command"
+        ],
+        "title": "Response shell command added event",
+        "description": "A streaming event that indicated a shell command was added to a tool call."
+      },
+      "ResponseShellCallCommandDeltaStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_command.delta"
+            ],
+            "description": "The type of the event, always `response.shell_call_command.delta`.",
+            "default": "response.shell_call_command.delta",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that was updated."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The shell command delta that was appended."
+          },
+          "obfuscation": {
+            "type": "string",
+            "description": "An obfuscation string that was added to pad the event payload."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "output_index",
+          "command_index",
+          "delta"
+        ],
+        "title": "Response shell command delta event",
+        "description": "A streaming event that indicated a shell command was incrementally updated."
+      },
+      "ResponseShellCallCommandDoneStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_command.done"
+            ],
+            "description": "The type of the event, always `response.shell_call_command.done`.",
+            "default": "response.shell_call_command.done",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that was completed."
+          },
+          "command": {
+            "type": "string",
+            "description": "The final shell command that was emitted."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "output_index",
+          "command_index",
+          "command"
+        ],
+        "title": "Response shell command done event",
+        "description": "A streaming event that indicated a shell command was completed."
+      },
+      "ShellCallOutputDelta": {
+        "properties": {
+          "stdout": {
+            "type": "string",
+            "description": "The stdout delta that was emitted."
+          },
+          "stderr": {
+            "type": "string",
+            "description": "The stderr delta that was emitted."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Shell call output delta",
+        "description": "A delta of stdout/stderr emitted while a shell call was running."
+      },
+      "ResponseShellCallOutputContentDeltaStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_output_content.delta"
+            ],
+            "description": "The type of the event, always `response.shell_call_output_content.delta`.",
+            "default": "response.shell_call_output_content.delta",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that was updated."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that produced output."
+          },
+          "delta": {
+            "$ref": "#/components/schemas/ShellCallOutputDelta",
+            "description": "The stdout/stderr delta that was emitted."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "item_id",
+          "output_index",
+          "command_index",
+          "delta"
+        ],
+        "title": "Response shell call output content delta event",
+        "description": "A streaming event that indicated shell call output was incrementally added."
+      },
+      "ResponseShellCallOutputContentDoneStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_output_content.done"
+            ],
+            "description": "The type of the event, always `response.shell_call_output_content.done`.",
+            "default": "response.shell_call_output_content.done",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that was updated."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that produced output."
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/FunctionShellCallOutputContent"
+            },
+            "type": "array",
+            "description": "The output contents emitted for the shell command."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "item_id",
+          "output_index",
+          "command_index",
+          "output"
+        ],
+        "title": "Response shell call output content done event",
+        "description": "A streaming event that indicated shell call output was completed."
+      },
+      "CreateConversationBody": {
+        "properties": {
+          "metadata": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Metadata",
+                "description": "Set of 16 key-value pairs that can be attached to an object. This can be         useful for storing additional information about the object in a structured         format, and querying for objects via API or the dashboard.\n        Keys are strings with a maximum length of 64 characters. Values are strings         with a maximum length of 512 characters."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "items": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/InputItem"
+                },
+                "type": "array",
+                "maxItems": 20,
+                "description": "Initial items to include in the conversation context. You may add up to 20 items at a time."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "UpdateConversationBody": {
+        "properties": {
+          "metadata": {
+            "$ref": "#/components/schemas/Metadata",
+            "description": "Set of 16 key-value pairs that can be attached to an object. This can be         useful for storing additional information about the object in a structured         format, and querying for objects via API or the dashboard.\n        Keys are strings with a maximum length of 64 characters. Values are strings         with a maximum length of 512 characters."
+          }
+        },
+        "type": "object",
+        "required": [
+          "metadata"
+        ]
+      },
+      "DeletedConversationResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "conversation.deleted"
+            ],
+            "default": "conversation.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "id": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "deleted",
+          "id"
+        ]
+      },
+      "SafetyAlertErrorType": {
+        "type": "string",
+        "enum": [
+          "potentially_unintended_data_transfer",
+          "potentially_unintended_data_access",
+          "potentially_unintended_destructive_activity",
+          "other"
+        ]
+      },
+      "SafetyAlertResource": {
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "safety.alert"
+            ],
+            "default": "safety.alert",
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime"
+          },
+          "request_id": {
+            "type": "string"
+          },
+          "response_id": {
+            "type": "string"
+          },
+          "model": {
+            "type": "string"
+          },
+          "request_paused": {
+            "type": "boolean",
+            "description": "Whether block registration succeeded for this request. This does not confirm that response execution stopped."
+          },
+          "error_type": {
+            "$ref": "#/components/schemas/SafetyAlertErrorType"
+          },
+          "reason": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A customer-safe description derived from error_type, or null for zero data retention requests."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "request_id",
+          "response_id",
+          "model",
+          "request_paused",
+          "error_type",
+          "reason"
+        ]
+      },
+      "SpendLimitCurrency": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "USD"
+            ]
+          }
+        ]
+      },
+      "SpendLimitInterval": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "month"
+            ]
+          }
+        ]
+      },
+      "SpendLimitEnforcementStatus": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "inactive",
+              "enforcing"
+            ]
+          }
+        ]
+      },
+      "SpendLimitEnforcement": {
+        "properties": {
+          "status": {
+            "$ref": "#/components/schemas/SpendLimitEnforcementStatus",
+            "description": "Whether the hard spend limit is currently enforcing."
+          }
+        },
+        "type": "object",
+        "required": [
+          "status"
+        ],
+        "description": "The current enforcement state of a hard spend limit."
+      },
+      "OrganizationSpendLimitResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.spend_limit"
+            ],
+            "description": "The object type, which is always `organization.spend_limit`.",
+            "default": "organization.spend_limit",
+            "x-stainless-const": true
+          },
+          "threshold_amount": {
+            "type": "integer",
+            "description": "The hard spend limit amount, in cents."
+          },
+          "currency": {
+            "$ref": "#/components/schemas/SpendLimitCurrency",
+            "description": "The currency for the threshold amount. Currently, only `USD` is supported."
+          },
+          "interval": {
+            "$ref": "#/components/schemas/SpendLimitInterval",
+            "description": "The time interval for evaluating spend against the threshold. Currently, only `month` is supported."
+          },
+          "enforcement": {
+            "$ref": "#/components/schemas/SpendLimitEnforcement",
+            "description": "The current enforcement state of the hard spend limit."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "threshold_amount",
+          "currency",
+          "interval",
+          "enforcement"
+        ],
+        "description": "Represents a hard spend limit configured at the organization level."
+      },
+      "UpdateOrganizationSpendLimitBody": {
+        "properties": {
+          "threshold_amount": {
+            "type": "integer",
+            "minimum": 1,
+            "description": "The hard spend limit amount, in cents."
+          },
+          "currency": {
+            "type": "string",
+            "enum": [
+              "USD"
+            ],
+            "description": "The currency for the threshold amount. Currently, only `USD` is supported."
+          },
+          "interval": {
+            "type": "string",
+            "enum": [
+              "month"
+            ],
+            "description": "The time interval for evaluating spend against the threshold. Currently, only `month` is supported."
+          }
+        },
+        "type": "object",
+        "required": [
+          "threshold_amount",
+          "currency",
+          "interval"
+        ],
+        "description": "Parameters for the hard spend limit you want to create or replace."
+      },
+      "OrganizationSpendLimitDeletedResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.spend_limit.deleted"
+            ],
+            "description": "The object type, which is always `organization.spend_limit.deleted`.",
+            "default": "organization.spend_limit.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the hard spend limit was deleted."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "deleted"
+        ],
+        "description": "Confirmation payload returned after deleting an organization hard spend limit."
+      },
+      "ProjectSpendLimitResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.spend_limit"
+            ],
+            "description": "The object type, which is always `project.spend_limit`.",
+            "default": "project.spend_limit",
+            "x-stainless-const": true
+          },
+          "threshold_amount": {
+            "type": "integer",
+            "description": "The hard spend limit amount, in cents."
+          },
+          "currency": {
+            "$ref": "#/components/schemas/SpendLimitCurrency",
+            "description": "The currency for the threshold amount. Currently, only `USD` is supported."
+          },
+          "interval": {
+            "$ref": "#/components/schemas/SpendLimitInterval",
+            "description": "The time interval for evaluating spend against the threshold. Currently, only `month` is supported."
+          },
+          "enforcement": {
+            "$ref": "#/components/schemas/SpendLimitEnforcement",
+            "description": "The current enforcement state of the hard spend limit."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "threshold_amount",
+          "currency",
+          "interval",
+          "enforcement"
+        ],
+        "description": "Represents a hard spend limit configured at the project level."
+      },
+      "UpdateProjectSpendLimitBody": {
+        "properties": {
+          "threshold_amount": {
+            "type": "integer",
+            "minimum": 1,
+            "description": "The hard spend limit amount, in cents."
+          },
+          "currency": {
+            "type": "string",
+            "enum": [
+              "USD"
+            ],
+            "description": "The currency for the threshold amount. Currently, only `USD` is supported."
+          },
+          "interval": {
+            "type": "string",
+            "enum": [
+              "month"
+            ],
+            "description": "The time interval for evaluating spend against the threshold. Currently, only `month` is supported."
+          }
+        },
+        "type": "object",
+        "required": [
+          "threshold_amount",
+          "currency",
+          "interval"
+        ],
+        "description": "Parameters for the hard spend limit you want to create or replace."
+      },
+      "ProjectSpendLimitDeletedResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "project.spend_limit.deleted"
+            ],
+            "description": "The object type, which is always `project.spend_limit.deleted`.",
+            "default": "project.spend_limit.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the hard spend limit was deleted."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "deleted"
+        ],
+        "description": "Confirmation payload returned after deleting a project hard spend limit."
+      },
+      "CreateProjectServiceAccountApiKeyBody": {
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "API key name."
+          },
+          "scopes": {
+            "items": {
+              "type": "string",
+              "description": "API key scope."
+            },
+            "type": "array",
+            "description": "API key scopes."
+          },
+          "expires_in_seconds": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "maximum": 31536000,
+                "minimum": 1,
+                "description": "Number of seconds until the API key expires."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [],
+        "description": "The service account API key create request payload."
+      },
+      "ServiceAccountApiKeyBody": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "organization.project.service_account.api_key"
+            ],
+            "description": "The object type, which is always `organization.project.service_account.api_key`",
+            "default": "organization.project.service_account.api_key",
+            "x-stainless-const": true
+          },
+          "value": {
+            "type": "string",
+            "description": "The unredacted API key value."
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the API key."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp (in seconds) when the API key was created."
+          },
+          "expires_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "The Unix timestamp (in seconds) when the API key expires, or null if it does not expire."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "type": "string",
+            "description": "The identifier of the API key."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "value",
+          "name",
+          "created_at",
+          "id"
+        ]
+      },
+      "CreateContentProvenanceBody": {
+        "properties": {
+          "file": {
+            "type": "string",
+            "format": "binary",
+            "description": "The image or audio file to check for supported OpenAI provenance signals."
+          }
+        },
+        "type": "object",
+        "required": [
+          "file"
+        ]
+      },
+      "ProvenanceCheckObject": {
+        "type": "string",
+        "enum": [
+          "content_provenance_check"
+        ]
+      },
+      "ProvenanceDetectionResultApi": {
+        "type": "string",
+        "enum": [
+          "detected",
+          "not_detected"
+        ]
+      },
+      "C2PAValidationStateApi": {
+        "type": "string",
+        "enum": [
+          "trusted",
+          "valid",
+          "invalid",
+          "not_present"
+        ]
+      },
+      "C2PAProvenanceResult": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "c2pa"
+            ],
+            "description": "The provenance signal type. Always `c2pa`.",
+            "default": "c2pa",
+            "x-stainless-const": true
+          },
+          "outcome": {
+            "$ref": "#/components/schemas/ProvenanceDetectionResultApi",
+            "description": "Whether a supported OpenAI C2PA provenance signal was detected.\nIf `not_detected`, it means the tool did not find supported signals in the uploaded file. The content could still have been generated by OpenAI if the metadata was stripped or has evidence of tampering, the watermark was degraded, it comes from a legacy generation model, or it was created before provenance signals were available. Content could also still be AI-generated by another company's model, which the tool currently does not detect."
+          },
+          "validation_state": {
+            "$ref": "#/components/schemas/C2PAValidationStateApi",
+            "description": "The validation status of the C2PA manifest in the uploaded image."
+          },
+          "issuer": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The C2PA manifest issuer, when available."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The OpenAI model recorded by the provenance signal, when available."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "generated_at": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The UTC RFC 3339 timestamp recorded by the provenance signal for when the asset was generated, when available."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "outcome",
+          "validation_state",
+          "issuer",
+          "model",
+          "generated_at"
+        ]
+      },
+      "SynthIDProvenanceResult": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "synthid"
+            ],
+            "description": "The provenance signal type. Always `synthid`.",
+            "default": "synthid",
+            "x-stainless-const": true
+          },
+          "outcome": {
+            "$ref": "#/components/schemas/ProvenanceDetectionResultApi",
+            "description": "Whether a supported OpenAI SynthID watermark was detected.\nIf `not_detected`, it means the tool did not find supported signals in the uploaded file. The content could still have been generated by OpenAI if the metadata was stripped or has evidence of tampering, the watermark was degraded, it comes from a legacy generation model, or it was created before provenance signals were available. Content could also still be AI-generated by another company's model, which the tool currently does not detect."
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The OpenAI model recorded by the provenance signal, when available."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "generated_at": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The UTC RFC 3339 timestamp recorded by the provenance signal for when the asset was generated, when available."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "outcome",
+          "model",
+          "generated_at"
+        ]
+      },
+      "ProvenanceResource": {
+        "properties": {
+          "object": {
+            "$ref": "#/components/schemas/ProvenanceCheckObject",
+            "description": "The object type. Always `content_provenance_check` for this endpoint."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "The Unix timestamp, in seconds, when the provenance check was created."
+          },
+          "results": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/C2PAProvenanceResult"
+                },
+                {
+                  "$ref": "#/components/schemas/SynthIDProvenanceResult"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "description": "The provenance results that apply to the uploaded file. Image results include C2PA and SynthID; audio results include SynthID."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "created_at",
+          "results"
+        ]
+      },
+      "OrderEnum": {
+        "type": "string",
+        "enum": [
+          "asc",
+          "desc"
+        ]
+      },
+      "VideoModel": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "sora-2",
+              "sora-2-pro",
+              "sora-2-2025-10-06",
+              "sora-2-pro-2025-10-06",
+              "sora-2-2025-12-08"
+            ]
+          }
+        ]
+      },
+      "VideoStatus": {
+        "type": "string",
+        "enum": [
+          "queued",
+          "in_progress",
+          "completed",
+          "failed"
+        ]
+      },
+      "VideoSize": {
+        "type": "string",
+        "enum": [
+          "720x1280",
+          "1280x720",
+          "1024x1792",
+          "1792x1024"
+        ]
+      },
+      "Error-2": {
+        "properties": {
+          "code": {
+            "type": "string",
+            "description": "A machine-readable error code that was returned."
+          },
+          "message": {
+            "type": "string",
+            "description": "A human-readable description of the error that was returned."
+          },
+          "misalignment": {
+            "$ref": "#/components/schemas/MisalignmentErrorDetailsResource"
+          }
+        },
+        "type": "object",
+        "required": [
+          "code",
+          "message"
+        ],
+        "title": "Error",
+        "description": "An error that occurred while generating the response."
+      },
+      "VideoResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the video job."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "video"
+            ],
+            "description": "The object type, which is always `video`.",
+            "default": "video",
+            "x-stainless-const": true
+          },
+          "model": {
+            "$ref": "#/components/schemas/VideoModel",
+            "description": "The video generation model that produced the job."
+          },
+          "status": {
+            "$ref": "#/components/schemas/VideoStatus",
+            "description": "Current lifecycle status of the video job."
+          },
+          "progress": {
+            "type": "integer",
+            "description": "Approximate completion percentage for the generation task."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (seconds) for when the job was created."
+          },
+          "completed_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "Unix timestamp (seconds) for when the job completed, if finished."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "expires_at": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "format": "unixtime",
+                "description": "Unix timestamp (seconds) for when the downloadable assets expire, if set."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The prompt that was used to generate the video."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "size": {
+            "$ref": "#/components/schemas/VideoSize",
+            "description": "The resolution of the generated video."
+          },
+          "seconds": {
+            "type": "string",
+            "description": "Duration of the generated clip in seconds. For extensions, this is the stitched total duration."
+          },
+          "remixed_from_video_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Identifier of the source video if this video is a remix."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "error": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Error-2",
+                "description": "Error payload that explains why generation failed, if applicable."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "model",
+          "status",
+          "progress",
+          "created_at",
+          "completed_at",
+          "expires_at",
+          "prompt",
+          "size",
+          "seconds",
+          "remixed_from_video_id",
+          "error"
+        ],
+        "title": "Video job",
+        "description": "Structured information describing a generated video job."
+      },
+      "VideoListResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be `list`.",
+            "default": "list",
+            "x-stainless-const": true
+          },
+          "data": {
+            "items": {
+              "$ref": "#/components/schemas/VideoResource"
+            },
+            "type": "array",
+            "description": "A list of items"
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the first item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the last item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "ImageRefParam-2": {
+        "properties": {
+          "image_url": {
+            "type": "string",
+            "maxLength": 20971520,
+            "format": "uri",
+            "description": "A fully qualified URL or base64-encoded data URL."
+          },
+          "file_id": {
+            "type": "string",
+            "example": "file-123"
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "VideoSeconds": {
+        "type": "string",
+        "enum": [
+          "4",
+          "8",
+          "12"
+        ]
+      },
+      "CreateVideoMultipartBody": {
+        "properties": {
+          "model": {
+            "$ref": "#/components/schemas/VideoModel",
+            "description": "The video generation model to use (allowed values: sora-2, sora-2-pro). Defaults to `sora-2`."
+          },
+          "prompt": {
+            "type": "string",
+            "maxLength": 32000,
+            "minLength": 1,
+            "description": "Text prompt that describes the video to generate."
+          },
+          "input_reference": {
+            "oneOf": [
+              {
+                "type": "string",
+                "format": "binary",
+                "description": "Optional reference asset upload or reference object that guides generation."
+              },
+              {
+                "$ref": "#/components/schemas/ImageRefParam-2",
+                "description": "Optional reference asset upload or reference object that guides generation. Provide exactly one of `image_url` or `file_id` when using an object."
+              }
+            ]
+          },
+          "seconds": {
+            "$ref": "#/components/schemas/VideoSeconds",
+            "description": "Clip duration in seconds (allowed values: 4, 8, 12). Defaults to 4 seconds."
+          },
+          "size": {
+            "$ref": "#/components/schemas/VideoSize",
+            "description": "Output resolution formatted as width x height (allowed values: 720x1280, 1280x720, 1024x1792, 1792x1024). Defaults to 720x1280."
+          }
+        },
+        "type": "object",
+        "required": [
+          "prompt"
+        ],
+        "title": "Create video multipart request",
+        "description": "Multipart parameters for creating a new video generation job."
+      },
+      "CreateVideoJsonBody": {
+        "properties": {
+          "model": {
+            "$ref": "#/components/schemas/VideoModel",
+            "description": "The video generation model to use (allowed values: sora-2, sora-2-pro). Defaults to `sora-2`."
+          },
+          "prompt": {
+            "type": "string",
+            "maxLength": 32000,
+            "minLength": 1,
+            "description": "Text prompt that describes the video to generate."
+          },
+          "input_reference": {
+            "$ref": "#/components/schemas/ImageRefParam-2",
+            "description": "Optional reference object that guides generation. Provide exactly one of `image_url` or `file_id`."
+          },
+          "seconds": {
+            "$ref": "#/components/schemas/VideoSeconds",
+            "description": "Clip duration in seconds (allowed values: 4, 8, 12). Defaults to 4 seconds."
+          },
+          "size": {
+            "$ref": "#/components/schemas/VideoSize",
+            "description": "Output resolution formatted as width x height (allowed values: 720x1280, 1280x720, 1024x1792, 1792x1024). Defaults to 720x1280."
+          }
+        },
+        "type": "object",
+        "required": [
+          "prompt"
+        ],
+        "title": "Create video JSON request",
+        "description": "JSON parameters for creating a new video generation job."
+      },
+      "CreateVideoCharacterBody": {
+        "properties": {
+          "video": {
+            "type": "string",
+            "format": "binary",
+            "description": "Video file used to create a character."
+          },
+          "name": {
+            "type": "string",
+            "maxLength": 80,
+            "minLength": 1,
+            "description": "Display name for this API character."
+          }
+        },
+        "type": "object",
+        "required": [
+          "video",
+          "name"
+        ],
+        "title": "Create character request",
+        "description": "Parameters for creating a character from an uploaded video."
+      },
+      "VideoCharacterResource": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Identifier for the character creation cameo."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Display name for the character."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the character was created."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "name",
+          "created_at"
+        ]
+      },
+      "VideoReferenceInputParam": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The identifier of the completed video.",
+            "example": "video_123"
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "description": "Reference to the completed video."
+      },
+      "CreateVideoEditMultipartBody": {
+        "properties": {
+          "video": {
+            "oneOf": [
+              {
+                "type": "string",
+                "format": "binary",
+                "description": "Reference to the completed video to edit."
+              },
+              {
+                "$ref": "#/components/schemas/VideoReferenceInputParam",
+                "description": "Reference to the completed video to edit."
+              }
+            ]
+          },
+          "prompt": {
+            "type": "string",
+            "maxLength": 32000,
+            "minLength": 1,
+            "description": "Text prompt that describes how to edit the source video."
+          }
+        },
+        "type": "object",
+        "required": [
+          "video",
+          "prompt"
+        ],
+        "title": "Create video edit multipart request",
+        "description": "Parameters for editing an existing generated video."
+      },
+      "CreateVideoEditJsonBody": {
+        "properties": {
+          "video": {
+            "$ref": "#/components/schemas/VideoReferenceInputParam",
+            "description": "Reference to the completed video to edit."
+          },
+          "prompt": {
+            "type": "string",
+            "maxLength": 32000,
+            "minLength": 1,
+            "description": "Text prompt that describes how to edit the source video."
+          }
+        },
+        "type": "object",
+        "required": [
+          "video",
+          "prompt"
+        ],
+        "title": "Create video edit JSON request",
+        "description": "JSON parameters for editing an existing generated video."
+      },
+      "CreateVideoExtendMultipartBody": {
+        "properties": {
+          "video": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/VideoReferenceInputParam",
+                "description": "Reference to the completed video to extend."
+              },
+              {
+                "type": "string",
+                "format": "binary",
+                "description": "Reference to the completed video to extend."
+              }
+            ]
+          },
+          "prompt": {
+            "type": "string",
+            "maxLength": 32000,
+            "minLength": 1,
+            "description": "Updated text prompt that directs the extension generation."
+          },
+          "seconds": {
+            "$ref": "#/components/schemas/VideoSeconds",
+            "description": "Length of the newly generated extension segment in seconds (allowed values: 4, 8, 12, 16, 20)."
+          }
+        },
+        "type": "object",
+        "required": [
+          "video",
+          "prompt",
+          "seconds"
+        ],
+        "title": "Create video extension multipart request",
+        "description": "Multipart parameters for extending an existing generated video."
+      },
+      "CreateVideoExtendJsonBody": {
+        "properties": {
+          "video": {
+            "$ref": "#/components/schemas/VideoReferenceInputParam",
+            "description": "Reference to the completed video to extend."
+          },
+          "prompt": {
+            "type": "string",
+            "maxLength": 32000,
+            "minLength": 1,
+            "description": "Updated text prompt that directs the extension generation."
+          },
+          "seconds": {
+            "$ref": "#/components/schemas/VideoSeconds",
+            "description": "Length of the newly generated extension segment in seconds (allowed values: 4, 8, 12, 16, 20)."
+          }
+        },
+        "type": "object",
+        "required": [
+          "video",
+          "prompt",
+          "seconds"
+        ],
+        "title": "Create video extension JSON request",
+        "description": "JSON parameters for extending an existing generated video."
+      },
+      "DeletedVideoResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "video.deleted"
+            ],
+            "description": "The object type that signals the deletion response.",
+            "default": "video.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Indicates that the video resource was deleted."
+          },
+          "id": {
+            "type": "string",
+            "description": "Identifier of the deleted video."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "deleted",
+          "id"
+        ],
+        "title": "Deleted video response",
+        "description": "Confirmation payload returned after deleting a video."
+      },
+      "VideoContentVariant": {
+        "type": "string",
+        "enum": [
+          "video",
+          "thumbnail",
+          "spritesheet"
+        ]
+      },
+      "CreateVideoRemixBody": {
+        "properties": {
+          "prompt": {
+            "type": "string",
+            "maxLength": 32000,
+            "minLength": 1,
+            "description": "Updated text prompt that directs the remix generation."
+          }
+        },
+        "type": "object",
+        "required": [
+          "prompt"
+        ],
+        "title": "Create video remix request",
+        "description": "Parameters for remixing an existing generated video."
+      },
+      "TruncationEnum": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "disabled"
+        ]
+      },
+      "PersonalityEnum": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "friendly",
+              "pragmatic"
+            ]
+          }
+        ]
+      },
+      "TokenCountsBody": {
+        "properties": {
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Model ID used to generate the response, like `gpt-4o` or `o3`. OpenAI offers a wide range of models with different capabilities, performance characteristics, and price points. Refer to the [model guide](https://developers.openai.com/api/docs/models) to browse and compare available models."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "input": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "maxLength": 10485760,
+                    "description": "A text input to the model, equivalent to a text input with the `user` role."
+                  },
+                  {
+                    "items": {
+                      "$ref": "#/components/schemas/InputItem"
+                    },
+                    "type": "array",
+                    "maxItems": 131072,
+                    "description": "A list of one or many input items to the model, containing different content types."
+                  }
+                ],
+                "description": "Text, image, or file inputs to the model, used to generate a response"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "previous_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the previous response to the model. Use this to create multi-turn conversations. Learn more about [conversation state](https://developers.openai.com/api/docs/guides/conversation-state). Cannot be used in conjunction with `conversation`.",
+                "example": "resp_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/Tool"
+                },
+                "type": "array",
+                "description": "An array of tools the model may call while generating a response. You can specify which tool to use by setting the `tool_choice` parameter."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "text": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ResponseTextParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Reasoning",
+                "description": "**gpt-5 and o-series models only** Configuration options for [reasoning models](https://developers.openai.com/api/docs/guides/reasoning)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "truncation": {
+            "$ref": "#/components/schemas/TruncationEnum",
+            "description": "The truncation strategy to use for the model response. - `auto`: If the input to this Response exceeds the model's context window size, the model will truncate the response to fit the context window by dropping items from the beginning of the conversation. - `disabled` (default): If the input size will exceed the context window size for a model, the request will fail with a 400 error.",
+            "deprecated": true
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A system (or developer) message inserted into the model's context.\nWhen used along with `previous_response_id`, the instructions from a previous response will not be carried over to the next response. This makes it simple to swap out system (or developer) messages in new responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "personality": {
+            "$ref": "#/components/schemas/PersonalityEnum",
+            "description": "A model-owned style preset to apply to this request. Omit this parameter to use the model's default style. Supported values may expand over time. Values must be at most 64 characters."
+          },
+          "conversation": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ConversationParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tool_choice": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolChoiceParam",
+                "description": "Controls which tool the model should use, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parallel_tool_calls": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Whether to allow the model to run tool calls in parallel."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "TokenCountsResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "response.input_tokens"
+            ],
+            "default": "response.input_tokens",
+            "x-stainless-const": true
+          },
+          "input_tokens": {
+            "type": "integer"
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "input_tokens"
+        ],
+        "title": "Token counts",
+        "example": {
+          "object": "response.input_tokens",
+          "input_tokens": 123
+        }
+      },
+      "PromptCacheRetentionEnum": {
+        "type": "string",
+        "enum": [
+          "in_memory",
+          "24h"
+        ]
+      },
+      "ServiceTierEnum": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default",
+          "fast",
+          "flex",
+          "priority"
+        ]
+      },
+      "CompactResponseMethodPublicBody": {
+        "properties": {
+          "model": {
+            "$ref": "#/components/schemas/ModelIdsCompaction"
+          },
+          "input": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "maxLength": 10485760,
+                    "description": "A text input to the model, equivalent to a text input with the `user` role."
+                  },
+                  {
+                    "items": {
+                      "$ref": "#/components/schemas/InputItem"
+                    },
+                    "type": "array",
+                    "maxItems": 131072,
+                    "description": "A list of one or many input items to the model, containing different content types."
+                  }
+                ],
+                "description": "Text, image, or file inputs to the model, used to generate a response"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "previous_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the previous response to the model. Use this to create multi-turn conversations. Learn more about [conversation state](https://developers.openai.com/api/docs/guides/conversation-state). Cannot be used in conjunction with `conversation`.",
+                "example": "resp_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A system (or developer) message inserted into the model's context.\nWhen used along with `previous_response_id`, the instructions from a previous response will not be carried over to the next response. This makes it simple to swap out system (or developer) messages in new responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_key": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "description": "A key to use when reading from or writing to the prompt cache."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_retention": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/PromptCacheRetentionEnum",
+                "description": "How long to retain a prompt cache entry created by this request.",
+                "deprecated": true
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_options": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/PromptCacheOptionsParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ServiceTierEnum",
+                "description": "Specifies the processing type used for serving the request.   - If set to 'auto', then the request will be processed with the service tier configured in the Project settings. Unless otherwise configured, the Project will use 'default'.   - If set to 'default', then the request will be processed with the standard pricing and performance for the selected model.   - If set to '[flex](https://developers.openai.com/api/docs/guides/flex-processing)', then the request will be processed with the Flex Processing service tier.   - To opt-in to [Fast mode](https://developers.openai.com/api/docs/guides/fast-mode) at the request level, include the `service_tier=fast` or `service_tier=priority` parameter for Responses or Chat Completions. For models with a dedicated Fast tier, either value resolves to `service_tier=fast`; for other models, either value resolves to `service_tier=priority`.   - When not set, the default behavior is 'auto'.\n  When the `service_tier` parameter is set, the response body will include the `service_tier` value based on the processing mode actually used to serve the request. This response value may be different from the value set in the parameter."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "model"
+        ]
+      },
+      "ItemField": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/Message"
+          },
+          {
+            "$ref": "#/components/schemas/Program"
+          },
+          {
+            "$ref": "#/components/schemas/ProgramOutput"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchCall"
+          },
+          {
+            "$ref": "#/components/schemas/ToolSearchOutput"
+          },
+          {
+            "$ref": "#/components/schemas/AdditionalTools"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/FileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ComputerToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/CompactionBody"
+          },
+          {
+            "$ref": "#/components/schemas/CodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCall",
+            "deprecated": true
+          },
+          {
+            "$ref": "#/components/schemas/LocalShellToolCallOutput",
+            "deprecated": true
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCall"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionShellCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/ApplyPatchToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/MCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/MCPApprovalResponseResource"
+          },
+          {
+            "$ref": "#/components/schemas/MCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/CustomToolCallOutput"
+          }
+        ],
+        "description": "An item representing a message, tool call, tool output, reasoning, or other response element.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "CompactResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique identifier for the compacted response."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "response.compaction"
+            ],
+            "description": "The object type. Always `response.compaction`.",
+            "default": "response.compaction",
+            "x-stainless-const": true
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/ItemField"
+            },
+            "type": "array",
+            "description": "The compacted list of output items."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the compacted conversation was created."
+          },
+          "usage": {
+            "$ref": "#/components/schemas/ResponseUsage",
+            "description": "Token accounting for the compaction pass, including cached, reasoning, and total tokens."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "output",
+          "created_at",
+          "usage"
+        ],
+        "title": "The compacted response object",
+        "example": {
+          "id": "resp_001",
+          "object": "response.compaction",
+          "output": [
+            {
+              "type": "message",
+              "role": "user",
+              "content": [
+                {
+                  "type": "input_text",
+                  "text": "Summarize our launch checklist from last week."
+                }
+              ]
+            },
+            {
+              "type": "message",
+              "role": "user",
+              "content": [
+                {
+                  "type": "input_text",
+                  "text": "You are performing a CONTEXT CHECKPOINT COMPACTION..."
+                }
+              ]
+            },
+            {
+              "type": "compaction",
+              "id": "cmp_001",
+              "encrypted_content": "encrypted-summary"
+            }
+          ],
+          "created_at": 1731459200,
+          "usage": {
+            "input_tokens": 42897,
+            "output_tokens": 12000,
+            "total_tokens": 54912
+          }
+        }
+      },
+      "SkillResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the skill."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "skill"
+            ],
+            "description": "The object type, which is `skill`.",
+            "default": "skill",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the skill."
+          },
+          "description": {
+            "type": "string",
+            "description": "Description of the skill."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (seconds) for when the skill was created."
+          },
+          "default_version": {
+            "type": "string",
+            "description": "Default version for the skill."
+          },
+          "latest_version": {
+            "type": "string",
+            "description": "Latest version for the skill."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "name",
+          "description",
+          "created_at",
+          "default_version",
+          "latest_version"
+        ]
+      },
+      "SkillListResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be `list`.",
+            "default": "list",
+            "x-stainless-const": true
+          },
+          "data": {
+            "items": {
+              "$ref": "#/components/schemas/SkillResource"
+            },
+            "type": "array",
+            "description": "A list of items"
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the first item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the last item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "CreateSkillBody": {
+        "properties": {
+          "files": {
+            "oneOf": [
+              {
+                "items": {
+                  "type": "string",
+                  "format": "binary"
+                },
+                "type": "array",
+                "maxItems": 500,
+                "description": "Skill files to upload (directory upload) or a single zip file."
+              },
+              {
+                "type": "string",
+                "format": "binary",
+                "description": "Skill zip file to upload."
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "files"
+        ],
+        "title": "Create skill request",
+        "description": "Uploads a skill either as a directory (multipart `files[]`) or as a single zip file."
+      },
+      "SetDefaultSkillVersionBody": {
+        "properties": {
+          "default_version": {
+            "type": "string",
+            "description": "The skill version number to set as default."
+          }
+        },
+        "type": "object",
+        "required": [
+          "default_version"
+        ],
+        "title": "Update skill request",
+        "description": "Updates the default version pointer for a skill."
+      },
+      "DeletedSkillResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "skill.deleted"
+            ],
+            "default": "skill.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "id": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "deleted",
+          "id"
+        ]
+      },
+      "SkillVersionResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "skill.version"
+            ],
+            "description": "The object type, which is `skill.version`.",
+            "default": "skill.version",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "Unique identifier for the skill version."
+          },
+          "skill_id": {
+            "type": "string",
+            "description": "Identifier of the skill for this version."
+          },
+          "version": {
+            "type": "string",
+            "description": "Version number for this skill."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (seconds) for when the version was created."
+          },
+          "name": {
+            "type": "string",
+            "description": "Name of the skill version."
+          },
+          "description": {
+            "type": "string",
+            "description": "Description of the skill version."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "id",
+          "skill_id",
+          "version",
+          "created_at",
+          "name",
+          "description"
+        ]
+      },
+      "SkillVersionListResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be `list`.",
+            "default": "list",
+            "x-stainless-const": true
+          },
+          "data": {
+            "items": {
+              "$ref": "#/components/schemas/SkillVersionResource"
+            },
+            "type": "array",
+            "description": "A list of items"
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the first item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the last item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ]
+      },
+      "CreateSkillVersionBody": {
+        "properties": {
+          "files": {
+            "oneOf": [
+              {
+                "items": {
+                  "type": "string",
+                  "format": "binary"
+                },
+                "type": "array",
+                "maxItems": 500,
+                "description": "Skill files to upload (directory upload) or a single zip file."
+              },
+              {
+                "type": "string",
+                "format": "binary",
+                "description": "Skill zip file to upload."
+              }
+            ]
+          },
+          "default": {
+            "type": "boolean",
+            "description": "Whether to set this version as the default."
+          }
+        },
+        "type": "object",
+        "required": [
+          "files"
+        ],
+        "title": "Create skill version request",
+        "description": "Uploads a new immutable version of a skill."
+      },
+      "DeletedSkillVersionResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "skill.version.deleted"
+            ],
+            "default": "skill.version.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean"
+          },
+          "id": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string",
+            "description": "The deleted skill version."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "deleted",
+          "id",
+          "version"
+        ]
+      },
+      "ChatkitWorkflowTracing": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Indicates whether tracing is enabled."
+          }
+        },
+        "type": "object",
+        "required": [
+          "enabled"
+        ],
+        "title": "Tracing Configuration",
+        "description": "Controls diagnostic tracing during the session."
+      },
+      "ChatkitWorkflow": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the workflow backing the session."
+          },
+          "version": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Specific workflow version used for the session. Defaults to null when using the latest deployment."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "state_variables": {
+            "anyOf": [
+              {
+                "additionalProperties": {
+                  "oneOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "boolean"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ]
+                },
+                "type": "object",
+                "description": "State variable key-value pairs applied when invoking the workflow. Defaults to null when no overrides were provided.",
+                "x-oaiTypeLabel": "map"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tracing": {
+            "$ref": "#/components/schemas/ChatkitWorkflowTracing",
+            "description": "Tracing settings applied to the workflow."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "version",
+          "state_variables",
+          "tracing"
+        ],
+        "title": "Workflow",
+        "description": "Workflow metadata and state returned for the session."
+      },
+      "ChatSessionRateLimits": {
+        "properties": {
+          "max_requests_per_1_minute": {
+            "type": "integer",
+            "description": "Maximum allowed requests per one-minute window."
+          }
+        },
+        "type": "object",
+        "required": [
+          "max_requests_per_1_minute"
+        ],
+        "title": "Rate limits",
+        "description": "Active per-minute request limit for the session."
+      },
+      "ChatSessionStatus": {
+        "type": "string",
+        "enum": [
+          "active",
+          "expired",
+          "cancelled"
+        ]
+      },
+      "ChatSessionAutomaticThreadTitling": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether automatic thread titling is enabled."
+          }
+        },
+        "type": "object",
+        "required": [
+          "enabled"
+        ],
+        "title": "Automatic thread titling",
+        "description": "Automatic thread title preferences for the session."
+      },
+      "ChatSessionFileUpload": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Indicates if uploads are enabled for the session."
+          },
+          "max_file_size": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Maximum upload size in megabytes."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_files": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Maximum number of uploads allowed during the session."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "enabled",
+          "max_file_size",
+          "max_files"
+        ],
+        "title": "File upload settings",
+        "description": "Upload permissions and limits applied to the session."
+      },
+      "ChatSessionHistory": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Indicates if chat history is persisted for the session."
+          },
+          "recent_threads": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Number of prior threads surfaced in history views. Defaults to null when all history is retained."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "enabled",
+          "recent_threads"
+        ],
+        "title": "History settings",
+        "description": "History retention preferences returned for the session."
+      },
+      "ChatSessionChatkitConfiguration": {
+        "properties": {
+          "automatic_thread_titling": {
+            "$ref": "#/components/schemas/ChatSessionAutomaticThreadTitling",
+            "description": "Automatic thread titling preferences."
+          },
+          "file_upload": {
+            "$ref": "#/components/schemas/ChatSessionFileUpload",
+            "description": "Upload settings for the session."
+          },
+          "history": {
+            "$ref": "#/components/schemas/ChatSessionHistory",
+            "description": "History retention configuration."
+          }
+        },
+        "type": "object",
+        "required": [
+          "automatic_thread_titling",
+          "file_upload",
+          "history"
+        ],
+        "title": "ChatKit configuration",
+        "description": "ChatKit configuration for the session."
+      },
+      "ChatSessionResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier for the ChatKit session."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.session"
+            ],
+            "description": "Type discriminator that is always `chatkit.session`.",
+            "default": "chatkit.session",
+            "x-stainless-const": true
+          },
+          "expires_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) for when the session expires."
+          },
+          "client_secret": {
+            "type": "string",
+            "description": "Ephemeral client secret that authenticates session requests."
+          },
+          "workflow": {
+            "$ref": "#/components/schemas/ChatkitWorkflow",
+            "description": "Workflow metadata for the session."
+          },
+          "user": {
+            "type": "string",
+            "description": "User identifier associated with the session."
+          },
+          "rate_limits": {
+            "$ref": "#/components/schemas/ChatSessionRateLimits",
+            "description": "Resolved rate limit values."
+          },
+          "max_requests_per_1_minute": {
+            "type": "integer",
+            "description": "Convenience copy of the per-minute request limit."
+          },
+          "status": {
+            "$ref": "#/components/schemas/ChatSessionStatus",
+            "description": "Current lifecycle state of the session."
+          },
+          "chatkit_configuration": {
+            "$ref": "#/components/schemas/ChatSessionChatkitConfiguration",
+            "description": "Resolved ChatKit feature configuration for the session."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "expires_at",
+          "client_secret",
+          "workflow",
+          "user",
+          "rate_limits",
+          "max_requests_per_1_minute",
+          "status",
+          "chatkit_configuration"
+        ],
+        "title": "The chat session object",
+        "description": "Represents a ChatKit session and its resolved configuration.",
+        "example": {
+          "id": "cksess_123",
+          "object": "chatkit.session",
+          "client_secret": "ek_token_123",
+          "expires_at": 1712349876,
+          "workflow": {
+            "id": "workflow_alpha",
+            "version": "2024-10-01"
+          },
+          "user": "user_789",
+          "rate_limits": {
+            "max_requests_per_1_minute": 60
+          },
+          "max_requests_per_1_minute": 60,
+          "status": "cancelled",
+          "chatkit_configuration": {
+            "automatic_thread_titling": {
+              "enabled": true
+            },
+            "file_upload": {
+              "enabled": true,
+              "max_file_size": 16,
+              "max_files": 20
+            },
+            "history": {
+              "enabled": true,
+              "recent_threads": 10
+            }
+          }
+        }
+      },
+      "WorkflowTracingParam": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether tracing is enabled during the session. Defaults to true."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Tracing Configuration",
+        "description": "Controls diagnostic tracing during the session."
+      },
+      "WorkflowParam": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier for the workflow invoked by the session."
+          },
+          "version": {
+            "type": "string",
+            "description": "Specific workflow version to run. Defaults to the latest deployed version."
+          },
+          "state_variables": {
+            "additionalProperties": {
+              "oneOf": [
+                {
+                  "type": "string",
+                  "maxLength": 10485760
+                },
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "number"
+                }
+              ]
+            },
+            "type": "object",
+            "maxProperties": 64,
+            "description": "State variables forwarded to the workflow. Keys may be up to 64 characters, values must be primitive types, and the map defaults to an empty object.",
+            "x-oaiTypeLabel": "map"
+          },
+          "tracing": {
+            "$ref": "#/components/schemas/WorkflowTracingParam",
+            "description": "Optional tracing overrides for the workflow invocation. When omitted, tracing is enabled by default."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "title": "Workflow settings",
+        "description": "Workflow reference and overrides applied to the chat session."
+      },
+      "ExpiresAfterParam": {
+        "properties": {
+          "anchor": {
+            "type": "string",
+            "enum": [
+              "created_at"
+            ],
+            "description": "Base timestamp used to calculate expiration. Currently fixed to `created_at`.",
+            "default": "created_at",
+            "x-stainless-const": true
+          },
+          "seconds": {
+            "type": "integer",
+            "maximum": 600,
+            "minimum": 1,
+            "format": "int64",
+            "description": "Number of seconds after the anchor when the session expires."
+          }
+        },
+        "type": "object",
+        "required": [
+          "anchor",
+          "seconds"
+        ],
+        "title": "Expiration overrides",
+        "description": "Controls when the session expires relative to an anchor timestamp."
+      },
+      "RateLimitsParam": {
+        "properties": {
+          "max_requests_per_1_minute": {
+            "type": "integer",
+            "minimum": 1,
+            "description": "Maximum number of requests allowed per minute for the session. Defaults to 10."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Rate limit overrides",
+        "description": "Controls request rate limits for the session."
+      },
+      "AutomaticThreadTitlingParam": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Enable automatic thread title generation. Defaults to true."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Automatic thread titling configuration",
+        "description": "Controls whether ChatKit automatically generates thread titles."
+      },
+      "FileUploadParam": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Enable uploads for this session. Defaults to false."
+          },
+          "max_file_size": {
+            "type": "integer",
+            "maximum": 512,
+            "minimum": 1,
+            "description": "Maximum size in megabytes for each uploaded file. Defaults to 512 MB, which is the maximum allowable size."
+          },
+          "max_files": {
+            "type": "integer",
+            "minimum": 1,
+            "description": "Maximum number of files that can be uploaded to the session. Defaults to 10."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "File upload configuration",
+        "description": "Controls whether users can upload files."
+      },
+      "HistoryParam": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Enables chat users to access previous ChatKit threads. Defaults to true."
+          },
+          "recent_threads": {
+            "type": "integer",
+            "minimum": 1,
+            "description": "Number of recent ChatKit threads users have access to. Defaults to unlimited when unset."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Chat history configuration",
+        "description": "Controls how much historical context is retained for the session."
+      },
+      "ChatkitConfigurationParam": {
+        "properties": {
+          "automatic_thread_titling": {
+            "$ref": "#/components/schemas/AutomaticThreadTitlingParam",
+            "description": "Configuration for automatic thread titling. When omitted, automatic thread titling is enabled by default."
+          },
+          "file_upload": {
+            "$ref": "#/components/schemas/FileUploadParam",
+            "description": "Configuration for upload enablement and limits. When omitted, uploads are disabled by default (max_files 10, max_file_size 512 MB)."
+          },
+          "history": {
+            "$ref": "#/components/schemas/HistoryParam",
+            "description": "Configuration for chat history retention. When omitted, history is enabled by default with no limit on recent_threads (null)."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "ChatKit configuration overrides",
+        "description": "Optional per-session configuration settings for ChatKit behavior."
+      },
+      "CreateChatSessionBody": {
+        "properties": {
+          "workflow": {
+            "$ref": "#/components/schemas/WorkflowParam",
+            "description": "Workflow that powers the session."
+          },
+          "user": {
+            "type": "string",
+            "minLength": 1,
+            "description": "A free-form string that identifies your end user; ensures this Session can access other objects that have the same `user` scope."
+          },
+          "expires_after": {
+            "$ref": "#/components/schemas/ExpiresAfterParam",
+            "description": "Optional override for session expiration timing in seconds from creation. Defaults to 10 minutes."
+          },
+          "rate_limits": {
+            "$ref": "#/components/schemas/RateLimitsParam",
+            "description": "Optional override for per-minute request limits. When omitted, defaults to 10."
+          },
+          "chatkit_configuration": {
+            "$ref": "#/components/schemas/ChatkitConfigurationParam",
+            "description": "Optional overrides for ChatKit runtime configuration features"
+          }
+        },
+        "type": "object",
+        "required": [
+          "workflow",
+          "user"
+        ],
+        "title": "Create chat session request",
+        "description": "Parameters for provisioning a new ChatKit session."
+      },
+      "UserMessageInputText": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "description": "Type discriminator that is always `input_text`.",
+            "default": "input_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "Plain-text content supplied by the user."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "User message input",
+        "description": "Text block that a user contributed to the thread."
+      },
+      "UserMessageQuotedText": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "quoted_text"
+            ],
+            "description": "Type discriminator that is always `quoted_text`.",
+            "default": "quoted_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "Quoted text content."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "User message quoted text",
+        "description": "Quoted snippet that the user referenced in their message."
+      },
+      "AttachmentType": {
+        "type": "string",
+        "enum": [
+          "image",
+          "file"
+        ]
+      },
+      "Attachment": {
+        "properties": {
+          "type": {
+            "$ref": "#/components/schemas/AttachmentType",
+            "description": "Attachment discriminator."
+          },
+          "id": {
+            "type": "string",
+            "description": "Identifier for the attachment."
+          },
+          "name": {
+            "type": "string",
+            "description": "Original display name for the attachment."
+          },
+          "mime_type": {
+            "type": "string",
+            "description": "MIME type of the attachment."
+          },
+          "preview_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri",
+                "description": "Preview URL for rendering the attachment inline."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "name",
+          "mime_type",
+          "preview_url"
+        ],
+        "title": "Attachment",
+        "description": "Attachment metadata included on thread items."
+      },
+      "ToolChoice": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the requested tool."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "title": "Tool choice",
+        "description": "Tool selection that the assistant should honor when executing the item."
+      },
+      "InferenceOptions": {
+        "properties": {
+          "tool_choice": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ToolChoice",
+                "description": "Preferred tool to invoke. Defaults to null when ChatKit should auto-select."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Model name that generated the response. Defaults to null when using the session default."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "tool_choice",
+          "model"
+        ],
+        "title": "Inference options",
+        "description": "Model and tool overrides applied when generating the assistant response."
+      },
+      "UserMessageItem": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the thread item."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.thread_item"
+            ],
+            "description": "Type discriminator that is always `chatkit.thread_item`.",
+            "default": "chatkit.thread_item",
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) for when the item was created."
+          },
+          "thread_id": {
+            "type": "string",
+            "description": "Identifier of the parent thread."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "chatkit.user_message"
+            ],
+            "default": "chatkit.user_message",
+            "x-stainless-const": true
+          },
+          "content": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/UserMessageInputText"
+                },
+                {
+                  "$ref": "#/components/schemas/UserMessageQuotedText"
+                }
+              ],
+              "description": "Content blocks that comprise a user message.",
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "description": "Ordered content elements supplied by the user."
+          },
+          "attachments": {
+            "items": {
+              "$ref": "#/components/schemas/Attachment"
+            },
+            "type": "array",
+            "description": "Attachments associated with the user message. Defaults to an empty list."
+          },
+          "inference_options": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/InferenceOptions",
+                "description": "Inference overrides applied to the message. Defaults to null when unset."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "thread_id",
+          "type",
+          "content",
+          "attachments",
+          "inference_options"
+        ],
+        "title": "User Message Item",
+        "description": "User-authored messages within a thread."
+      },
+      "FileAnnotationSource": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ],
+            "description": "Type discriminator that is always `file`.",
+            "default": "file",
+            "x-stainless-const": true
+          },
+          "filename": {
+            "type": "string",
+            "description": "Filename referenced by the annotation."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "filename"
+        ],
+        "title": "File annotation source",
+        "description": "Attachment source referenced by an annotation."
+      },
+      "FileAnnotation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file"
+            ],
+            "description": "Type discriminator that is always `file` for this annotation.",
+            "default": "file",
+            "x-stainless-const": true
+          },
+          "source": {
+            "$ref": "#/components/schemas/FileAnnotationSource",
+            "description": "File attachment referenced by the annotation."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "source"
+        ],
+        "title": "File annotation",
+        "description": "Annotation that references an uploaded file."
+      },
+      "UrlAnnotationSource": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "url"
+            ],
+            "description": "Type discriminator that is always `url`.",
+            "default": "url",
+            "x-stainless-const": true
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "URL referenced by the annotation."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "url"
+        ],
+        "title": "URL annotation source",
+        "description": "URL backing an annotation entry."
+      },
+      "UrlAnnotation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "url"
+            ],
+            "description": "Type discriminator that is always `url` for this annotation.",
+            "default": "url",
+            "x-stainless-const": true
+          },
+          "source": {
+            "$ref": "#/components/schemas/UrlAnnotationSource",
+            "description": "URL referenced by the annotation."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "source"
+        ],
+        "title": "URL annotation",
+        "description": "Annotation that references a URL."
+      },
+      "ResponseOutputText": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_text"
+            ],
+            "description": "Type discriminator that is always `output_text`.",
+            "default": "output_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "Assistant generated text."
+          },
+          "annotations": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/FileAnnotation"
+                },
+                {
+                  "$ref": "#/components/schemas/UrlAnnotation"
+                }
+              ],
+              "description": "Annotation object describing a cited source.",
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "description": "Ordered list of annotations attached to the response text."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text",
+          "annotations"
+        ],
+        "title": "Assistant message content",
+        "description": "Assistant response text accompanied by optional annotations."
+      },
+      "AssistantMessageItem": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the thread item."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.thread_item"
+            ],
+            "description": "Type discriminator that is always `chatkit.thread_item`.",
+            "default": "chatkit.thread_item",
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) for when the item was created."
+          },
+          "thread_id": {
+            "type": "string",
+            "description": "Identifier of the parent thread."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "chatkit.assistant_message"
+            ],
+            "description": "Type discriminator that is always `chatkit.assistant_message`.",
+            "default": "chatkit.assistant_message",
+            "x-stainless-const": true
+          },
+          "content": {
+            "items": {
+              "$ref": "#/components/schemas/ResponseOutputText"
+            },
+            "type": "array",
+            "description": "Ordered assistant response segments."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "thread_id",
+          "type",
+          "content"
+        ],
+        "title": "Assistant message",
+        "description": "Assistant-authored message within a thread."
+      },
+      "WidgetMessageItem": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the thread item."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.thread_item"
+            ],
+            "description": "Type discriminator that is always `chatkit.thread_item`.",
+            "default": "chatkit.thread_item",
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) for when the item was created."
+          },
+          "thread_id": {
+            "type": "string",
+            "description": "Identifier of the parent thread."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "chatkit.widget"
+            ],
+            "description": "Type discriminator that is always `chatkit.widget`.",
+            "default": "chatkit.widget",
+            "x-stainless-const": true
+          },
+          "widget": {
+            "type": "string",
+            "description": "Serialized widget payload rendered in the UI."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "thread_id",
+          "type",
+          "widget"
+        ],
+        "title": "Widget message",
+        "description": "Thread item that renders a widget payload."
+      },
+      "ClientToolCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed"
+        ]
+      },
+      "ClientToolCallItem": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the thread item."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.thread_item"
+            ],
+            "description": "Type discriminator that is always `chatkit.thread_item`.",
+            "default": "chatkit.thread_item",
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) for when the item was created."
+          },
+          "thread_id": {
+            "type": "string",
+            "description": "Identifier of the parent thread."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "chatkit.client_tool_call"
+            ],
+            "description": "Type discriminator that is always `chatkit.client_tool_call`.",
+            "default": "chatkit.client_tool_call",
+            "x-stainless-const": true
+          },
+          "status": {
+            "$ref": "#/components/schemas/ClientToolCallStatus",
+            "description": "Execution status for the tool call."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "Identifier for the client tool call."
+          },
+          "name": {
+            "type": "string",
+            "description": "Tool name that was invoked."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "JSON-encoded arguments that were sent to the tool."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "JSON-encoded output captured from the tool. Defaults to null while execution is in progress."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "thread_id",
+          "type",
+          "status",
+          "call_id",
+          "name",
+          "arguments",
+          "output"
+        ],
+        "title": "Client tool call",
+        "description": "Record of a client side tool invocation initiated by the assistant."
+      },
+      "TaskType": {
+        "type": "string",
+        "enum": [
+          "custom",
+          "thought"
+        ]
+      },
+      "TaskItem": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the thread item."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.thread_item"
+            ],
+            "description": "Type discriminator that is always `chatkit.thread_item`.",
+            "default": "chatkit.thread_item",
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) for when the item was created."
+          },
+          "thread_id": {
+            "type": "string",
+            "description": "Identifier of the parent thread."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "chatkit.task"
+            ],
+            "description": "Type discriminator that is always `chatkit.task`.",
+            "default": "chatkit.task",
+            "x-stainless-const": true
+          },
+          "task_type": {
+            "$ref": "#/components/schemas/TaskType",
+            "description": "Subtype for the task."
+          },
+          "heading": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional heading for the task. Defaults to null when not provided."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional summary that describes the task. Defaults to null when omitted."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "thread_id",
+          "type",
+          "task_type",
+          "heading",
+          "summary"
+        ],
+        "title": "Task item",
+        "description": "Task emitted by the workflow to show progress and status updates."
+      },
+      "TaskGroupTask": {
+        "properties": {
+          "type": {
+            "$ref": "#/components/schemas/TaskType",
+            "description": "Subtype for the grouped task."
+          },
+          "heading": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional heading for the grouped task. Defaults to null when not provided."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional summary that describes the grouped task. Defaults to null when omitted."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "heading",
+          "summary"
+        ],
+        "title": "Task group task",
+        "description": "Task entry that appears within a TaskGroup."
+      },
+      "TaskGroupItem": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the thread item."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.thread_item"
+            ],
+            "description": "Type discriminator that is always `chatkit.thread_item`.",
+            "default": "chatkit.thread_item",
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) for when the item was created."
+          },
+          "thread_id": {
+            "type": "string",
+            "description": "Identifier of the parent thread."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "chatkit.task_group"
+            ],
+            "description": "Type discriminator that is always `chatkit.task_group`.",
+            "default": "chatkit.task_group",
+            "x-stainless-const": true
+          },
+          "tasks": {
+            "items": {
+              "$ref": "#/components/schemas/TaskGroupTask"
+            },
+            "type": "array",
+            "description": "Tasks included in the group."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "thread_id",
+          "type",
+          "tasks"
+        ],
+        "title": "Task group",
+        "description": "Collection of workflow tasks grouped together in the thread."
+      },
+      "ThreadItem": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/UserMessageItem"
+          },
+          {
+            "$ref": "#/components/schemas/AssistantMessageItem"
+          },
+          {
+            "$ref": "#/components/schemas/WidgetMessageItem"
+          },
+          {
+            "$ref": "#/components/schemas/ClientToolCallItem"
+          },
+          {
+            "$ref": "#/components/schemas/TaskItem"
+          },
+          {
+            "$ref": "#/components/schemas/TaskGroupItem"
+          }
+        ],
+        "title": "The thread item",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "ThreadItemListResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be `list`.",
+            "default": "list",
+            "x-stainless-const": true
+          },
+          "data": {
+            "items": {
+              "$ref": "#/components/schemas/ThreadItem"
+            },
+            "type": "array",
+            "description": "A list of items"
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the first item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the last item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "title": "Thread Items",
+        "description": "A paginated list of thread items rendered for the ChatKit API."
+      },
+      "ActiveStatus": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "active"
+            ],
+            "description": "Status discriminator that is always `active`.",
+            "default": "active",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Active thread status",
+        "description": "Indicates that a thread is active."
+      },
+      "LockedStatus": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "locked"
+            ],
+            "description": "Status discriminator that is always `locked`.",
+            "default": "locked",
+            "x-stainless-const": true
+          },
+          "reason": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Reason that the thread was locked. Defaults to null when no reason is recorded."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "reason"
+        ],
+        "title": "Locked thread status",
+        "description": "Indicates that a thread is locked and cannot accept new input."
+      },
+      "ClosedStatus": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "closed"
+            ],
+            "description": "Status discriminator that is always `closed`.",
+            "default": "closed",
+            "x-stainless-const": true
+          },
+          "reason": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Reason that the thread was closed. Defaults to null when no reason is recorded."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "reason"
+        ],
+        "title": "Closed thread status",
+        "description": "Indicates that a thread has been closed."
+      },
+      "ThreadResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the thread."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.thread"
+            ],
+            "description": "Type discriminator that is always `chatkit.thread`.",
+            "default": "chatkit.thread",
+            "x-stainless-const": true
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) for when the thread was created."
+          },
+          "title": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional human-readable title for the thread. Defaults to null when no title has been generated."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/ActiveStatus"
+              },
+              {
+                "$ref": "#/components/schemas/LockedStatus"
+              },
+              {
+                "$ref": "#/components/schemas/ClosedStatus"
+              }
+            ],
+            "description": "Current status for the thread. Defaults to `active` for newly created threads.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "user": {
+            "type": "string",
+            "description": "Free-form string that identifies your end user who owns the thread."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "title",
+          "status",
+          "user"
+        ],
+        "title": "The thread object",
+        "description": "Represents a ChatKit thread and its current status.",
+        "example": {
+          "id": "cthr_def456",
+          "object": "chatkit.thread",
+          "created_at": 1712345600,
+          "title": "Demo feedback",
+          "status": {
+            "type": "active"
+          },
+          "user": "user_456"
+        }
+      },
+      "DeletedThreadResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Identifier of the deleted thread."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "chatkit.thread.deleted"
+            ],
+            "description": "Type discriminator that is always `chatkit.thread.deleted`.",
+            "default": "chatkit.thread.deleted",
+            "x-stainless-const": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Indicates that the thread has been deleted."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "title": "Deleted thread",
+        "description": "Confirmation payload returned after deleting a thread."
+      },
+      "ThreadListResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "description": "The type of object returned, must be `list`.",
+            "default": "list",
+            "x-stainless-const": true
+          },
+          "data": {
+            "items": {
+              "$ref": "#/components/schemas/ThreadResource"
+            },
+            "type": "array",
+            "description": "A list of items"
+          },
+          "first_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the first item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "last_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the last item in the list."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "title": "Threads",
+        "description": "A paginated list of ChatKit threads."
+      },
+      "EnvironmentTypeResource": {
+        "type": "string",
+        "enum": [
+          "openai_hosted",
+          "self_hosted"
+        ],
+        "description": "The kind of execution environment."
+      },
+      "EnvironmentStatusResource": {
+        "type": "string",
+        "enum": [
+          "pending",
+          "connected",
+          "disconnected",
+          "expired",
+          "failed"
+        ],
+        "description": "The public lifecycle status of an execution environment."
+      },
+      "HostedEnvironmentFileResourceFileId": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_id"
+            ],
+            "default": "file_id",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `file_id`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The session-scoped ID of the file in the execution environment."
+          },
+          "file_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the uploaded file."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The file's absolute path inside the environment."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The decoded file size in bytes."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "file_id",
+          "path",
+          "size_bytes"
+        ],
+        "additionalProperties": false,
+        "description": "A file copied from the OpenAI Files API."
+      },
+      "HostedEnvironmentFileResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The session-scoped ID of the file in the execution environment."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The file's absolute path inside the environment."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The decoded file size in bytes."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "path",
+          "size_bytes"
+        ],
+        "additionalProperties": false,
+        "description": "A file supplied inline when the session was created."
+      },
+      "HostedEnvironmentFileResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedEnvironmentFileResourceFileId"
+          },
+          {
+            "$ref": "#/components/schemas/HostedEnvironmentFileResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "file_id": "#/components/schemas/HostedEnvironmentFileResourceFileId",
+            "inline": "#/components/schemas/HostedEnvironmentFileResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "file_id",
+          "inline"
+        ],
+        "description": "Metadata for a file materialized in an OpenAI-hosted execution environment."
+      },
+      "HostedSkillResourceSkillReference": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill_reference"
+            ],
+            "default": "skill_reference",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `skill_reference`."
+          },
+          "skill_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The referenced skill ID."
+          },
+          "version": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The concrete skill version installed for this session."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed skill name."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed skill description."
+          }
+        },
+        "required": [
+          "type",
+          "skill_id",
+          "version",
+          "name",
+          "description"
+        ],
+        "additionalProperties": false,
+        "description": "A skill installed from the Skills API."
+      },
+      "HostedSkillResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed skill name."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed skill description."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description"
+        ],
+        "additionalProperties": false,
+        "description": "A skill installed from an inline ZIP archive."
+      },
+      "HostedSkillResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedSkillResourceSkillReference"
+          },
+          {
+            "$ref": "#/components/schemas/HostedSkillResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "skill_reference": "#/components/schemas/HostedSkillResourceSkillReference",
+            "inline": "#/components/schemas/HostedSkillResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "skill_reference",
+          "inline"
+        ],
+        "description": "A skill installed in an OpenAI-hosted environment."
+      },
+      "HostedPluginResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed plugin name."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The installed plugin description."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description"
+        ],
+        "additionalProperties": false,
+        "description": "A plugin installed from an inline ZIP archive."
+      },
+      "HostedPluginResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedPluginResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "inline": "#/components/schemas/HostedPluginResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "inline"
+        ],
+        "description": "A plugin installed in an OpenAI-hosted environment."
+      },
+      "PublicEnvironmentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the environment."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.environment"
+            ],
+            "default": "agent.environment",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.environment`."
+          },
+          "type": {
+            "$ref": "#/components/schemas/EnvironmentTypeResource",
+            "description": "Whether the environment is hosted by OpenAI or by the application."
+          },
+          "status": {
+            "$ref": "#/components/schemas/EnvironmentStatusResource",
+            "description": "The current environment connection status."
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Files installed in the environment, without their contents."
+          },
+          "skills": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Skills installed in the environment, without their archive contents."
+          },
+          "plugins": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Plugins installed in the environment, without their archive contents."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "type",
+          "status",
+          "files",
+          "skills",
+          "plugins"
+        ],
+        "additionalProperties": false,
+        "description": "Safe metadata for a first-class execution environment."
+      },
+      "ErrorBodyResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The error type."
+          },
+          "code": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A machine-readable error code."
+          },
+          "message": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A human-readable error message."
+          },
+          "param": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The request parameter that caused the error, or null for a request-wide error."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message",
+          "param"
+        ],
+        "additionalProperties": false,
+        "description": "Details about an API error."
+      },
+      "ErrorResponse-2": {
+        "type": "object",
+        "properties": {
+          "error": {
+            "$ref": "#/components/schemas/ErrorBodyResource",
+            "description": "The error returned by the API."
+          }
+        },
+        "required": [
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "An API error response."
+      },
+      "ListOrderParam": {
+        "type": "string",
+        "enum": [
+          "asc",
+          "desc"
+        ],
+        "x-enumDescriptions": [
+          "Returns resources in ascending order.",
+          "Returns resources in descending order."
+        ],
+        "description": "The order in which paginated resources are returned."
+      },
+      "EnvironmentFilePageObjectResource": {
+        "type": "string",
+        "enum": [
+          "page"
+        ],
+        "default": "page",
+        "x-stainless-const": true,
+        "description": "The object type for a page of files in an execution environment."
+      },
+      "EnvironmentFileResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.environment.file"
+            ],
+            "default": "agent.environment.file",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.environment.file`."
+          },
+          "environment_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the environment containing this file."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The absolute file path inside the environment's workspace."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The file size in bytes."
+          }
+        },
+        "required": [
+          "object",
+          "environment_id",
+          "path",
+          "size_bytes"
+        ],
+        "additionalProperties": false,
+        "description": "A live file in an execution environment."
+      },
+      "EnvironmentFileListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "$ref": "#/components/schemas/EnvironmentFilePageObjectResource",
+            "description": "The object type. Always `page`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EnvironmentFileResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Files available on the current page."
+          },
+          "next": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The opaque cursor to use when requesting the next page, if any."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether more files follow this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "next",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A paginated list of live execution environment files."
+      },
+      "HostedEnvironmentFileParamFileId": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_id"
+            ],
+            "default": "file_id",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `file_id`."
+          },
+          "file_id": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 256,
+            "description": "The ID of the uploaded file."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 4096,
+            "description": "The absolute destination path inside `/workspace`."
+          }
+        },
+        "required": [
+          "type",
+          "file_id",
+          "path"
+        ],
+        "additionalProperties": false,
+        "description": "A file previously uploaded through the OpenAI Files API."
+      },
+      "HostedEnvironmentFileParamInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "data": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 6990508,
+            "description": "The standard-base64-encoded file contents."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 4096,
+            "description": "The absolute destination path inside `/workspace`."
+          }
+        },
+        "required": [
+          "type",
+          "data",
+          "path"
+        ],
+        "additionalProperties": false,
+        "description": "A file supplied directly as standard-base64 data."
+      },
+      "HostedEnvironmentFileParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedEnvironmentFileParamFileId"
+          },
+          {
+            "$ref": "#/components/schemas/HostedEnvironmentFileParamInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "file_id": "#/components/schemas/HostedEnvironmentFileParamFileId",
+            "inline": "#/components/schemas/HostedEnvironmentFileParamInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "file_id",
+          "inline"
+        ],
+        "description": "A file materialized in an OpenAI-hosted execution environment."
+      },
+      "SubagentObjectResource": {
+        "type": "string",
+        "enum": [
+          "agent.session.subagent"
+        ],
+        "default": "agent.session.subagent",
+        "x-stainless-const": true,
+        "description": "The object type for a subagent."
+      },
+      "OutputTextResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_text"
+            ],
+            "default": "output_text",
+            "x-stainless-const": true,
+            "description": "The content type. Always `output_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text produced by the agent."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "A text content part produced by the agent."
+      },
+      "EncryptedContentResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "encrypted_content"
+            ],
+            "default": "encrypted_content",
+            "x-stainless-const": true,
+            "description": "The content type. Always `encrypted_content`."
+          },
+          "encrypted_content": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The encrypted content payload."
+          }
+        },
+        "required": [
+          "type",
+          "encrypted_content"
+        ],
+        "additionalProperties": false,
+        "description": "Encrypted content exchanged between agents."
+      },
+      "AgentContentResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/OutputTextResource"
+          },
+          {
+            "$ref": "#/components/schemas/EncryptedContentResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "output_text": "#/components/schemas/OutputTextResource",
+            "encrypted_content": "#/components/schemas/EncryptedContentResource"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "output_text",
+          "encrypted_content"
+        ],
+        "description": "A plaintext or encrypted content part exchanged between agents."
+      },
+      "SubagentStatusResource": {
+        "type": "string",
+        "enum": [
+          "active",
+          "closed"
+        ],
+        "x-enumDescriptions": [
+          "The subagent remains available, including while idle between turns.",
+          "The subagent is closed."
+        ],
+        "description": "The current status of a subagent."
+      },
+      "SubagentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the subagent."
+          },
+          "object": {
+            "$ref": "#/components/schemas/SubagentObjectResource",
+            "description": "The object type. Always `agent.session.subagent`."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session that owns the subagent."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The runner-assigned nickname, or null when unavailable."
+          },
+          "instructions": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/AgentContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Initial task content, or null when unavailable. Text may contain placeholders for images or audio when only a preview is available."
+          },
+          "parent_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent that created this subagent."
+          },
+          "status": {
+            "$ref": "#/components/schemas/SubagentStatusResource",
+            "description": "The current status of the subagent."
+          },
+          "opened_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the subagent was first opened. Resuming does not change it."
+          },
+          "closed_at": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the subagent was closed. Null while active, including after resume."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "session_id",
+          "name",
+          "instructions",
+          "parent_agent_id",
+          "status",
+          "opened_at",
+          "closed_at"
+        ],
+        "additionalProperties": false,
+        "description": "A subagent created within a session."
+      },
+      "SessionMessageRoleResource": {
+        "type": "string",
+        "enum": [
+          "user",
+          "assistant"
+        ],
+        "description": "The author of a session message."
+      },
+      "MessageContentResourceInputText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "default": "input_text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text supplied by the user."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Text supplied by the user."
+      },
+      "MessageContentResourceInputImage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "default": "input_image",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_image`."
+          },
+          "image_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The URL of the image supplied by the user, which may be a base64-encoded data URL."
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ],
+        "additionalProperties": false,
+        "description": "An image supplied by the user."
+      },
+      "MessageContentResourceOutputText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_text"
+            ],
+            "default": "output_text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `output_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text produced by the assistant."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Text produced by the assistant."
+      },
+      "MessageContentResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/MessageContentResourceInputText"
+          },
+          {
+            "$ref": "#/components/schemas/MessageContentResourceInputImage"
+          },
+          {
+            "$ref": "#/components/schemas/MessageContentResourceOutputText"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "input_text": "#/components/schemas/MessageContentResourceInputText",
+            "input_image": "#/components/schemas/MessageContentResourceInputImage",
+            "output_text": "#/components/schemas/MessageContentResourceOutputText"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "input_text",
+          "input_image",
+          "output_text"
+        ],
+        "description": "A content part in a session message."
+      },
+      "OutputItemStatusResource": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ],
+        "x-enumDescriptions": [
+          "The item is in progress.",
+          "The item is complete.",
+          "The item stopped before completing."
+        ],
+        "description": "The status of an agent output item."
+      },
+      "MessagePhaseResource": {
+        "type": "string",
+        "enum": [
+          "commentary",
+          "final_answer"
+        ],
+        "x-enumDescriptions": [
+          "Commentary produced while the agent works.",
+          "The agent's final answer."
+        ],
+        "description": "The phase of an assistant message."
+      },
+      "MessageItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "default": "message",
+            "x-stainless-const": true,
+            "description": "The item type. Always `message`."
+          },
+          "id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of this item, or null for legacy user messages whose ID was not recorded."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "role": {
+            "$ref": "#/components/schemas/SessionMessageRoleResource",
+            "description": "The role of the message author."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MessageContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The content of the message. User messages contain input text or images; assistant messages contain output text."
+          },
+          "status": {
+            "$ref": "#/components/schemas/OutputItemStatusResource",
+            "description": "The status of the message. User messages are always `completed`."
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MessagePhaseResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The phase of an assistant message. Null for user messages."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "role",
+          "content",
+          "status",
+          "phase"
+        ],
+        "additionalProperties": false,
+        "description": "A user or assistant message recorded in a session."
+      },
+      "SummaryTextResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "summary_text"
+            ],
+            "default": "summary_text",
+            "x-stainless-const": true,
+            "description": "The content type. Always `summary_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The reasoning summary text."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "A reasoning summary content part."
+      },
+      "ReasoningItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "reasoning"
+            ],
+            "default": "reasoning",
+            "x-stainless-const": true,
+            "description": "The item type. Always `reasoning`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "summary": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SummaryTextResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The reasoning summaries produced by the agent."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/OutputItemStatusResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The status of the reasoning item."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "summary",
+          "status"
+        ],
+        "additionalProperties": false,
+        "description": "A reasoning item produced by the agent."
+      },
+      "FunctionCallStatusResource": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "failed",
+          "incomplete"
+        ],
+        "x-enumDescriptions": [
+          "The call is in progress.",
+          "The call completed successfully.",
+          "The call failed.",
+          "The call stopped before completing."
+        ],
+        "description": "The status of a tool call."
+      },
+      "FunctionCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call"
+            ],
+            "default": "function_call",
+            "x-stainless-const": true,
+            "description": "The item type. Always `function_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the function call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "call_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID used to submit the function result."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The name of the function to call."
+          },
+          "arguments": {
+            "description": "The arguments to pass to the function."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the function call."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "call_id",
+          "name",
+          "arguments",
+          "status"
+        ],
+        "additionalProperties": false,
+        "description": "A function call produced by the agent."
+      },
+      "InputContentResourceInputText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "default": "input_text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text supplied to the agent."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Text input recorded in a session item."
+      },
+      "InputContentResourceInputImage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "default": "input_image",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_image`."
+          },
+          "image_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The URL of the image supplied to the agent, which may be a base64-encoded data URL."
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ],
+        "additionalProperties": false,
+        "description": "Image input recorded in a session item."
+      },
+      "InputContentResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InputContentResourceInputText"
+          },
+          {
+            "$ref": "#/components/schemas/InputContentResourceInputImage"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "input_text": "#/components/schemas/InputContentResourceInputText",
+            "input_image": "#/components/schemas/InputContentResourceInputImage"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "input_text",
+          "input_image"
+        ],
+        "description": "User-provided content recorded in a session item."
+      },
+      "FunctionCallOutputResource": {
+        "oneOf": [
+          {
+            "type": "string",
+            "minLength": 0
+          },
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000
+          }
+        ],
+        "description": "The text or model-input content supplied as a function result."
+      },
+      "FunctionCallOutputItemResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the function call output item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call_output"
+            ],
+            "default": "function_call_output",
+            "x-stainless-const": true,
+            "description": "The item type. Always `function_call_output`."
+          },
+          "call_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the function call that produced this output."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the function call."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionCallOutputResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The function result, if the call succeeded."
+          },
+          "error": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The error message, if the call failed."
+          }
+        },
+        "required": [
+          "id",
+          "turn_id",
+          "type",
+          "call_id",
+          "status",
+          "output",
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "The result supplied for a function call."
+      },
+      "AgentMessageItemResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent_message"
+            ],
+            "default": "agent_message",
+            "x-stainless-const": true,
+            "description": "The item type. Always `agent_message`."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID or name of the sending agent."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID or name of the receiving agent."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The content exchanged between the agents."
+          }
+        },
+        "required": [
+          "id",
+          "turn_id",
+          "type",
+          "sender_agent_id",
+          "recipient_agent_id",
+          "content"
+        ],
+        "additionalProperties": false,
+        "description": "A message exchanged between agent threads."
+      },
+      "McpCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_call"
+            ],
+            "default": "mcp_call",
+            "x-stainless-const": true,
+            "description": "The item type. Always `mcp_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the MCP call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The label of the MCP server."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The name of the MCP tool."
+          },
+          "arguments": {
+            "description": "The arguments passed to the MCP tool."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the MCP tool call."
+          },
+          "output": {
+            "anyOf": [
+              {},
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The output returned by the MCP tool, if any."
+          },
+          "error": {
+            "anyOf": [
+              {},
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The error returned by the MCP tool, if any."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "server_label",
+          "name",
+          "arguments",
+          "status",
+          "output",
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "A call to a tool on an MCP server."
+      },
+      "WebSearchActionResourceSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "search"
+            ],
+            "default": "search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `search`."
+          },
+          "query": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The search query, when a single query was used."
+          },
+          "queries": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The search queries, when multiple queries were used."
+          }
+        },
+        "required": [
+          "type",
+          "query",
+          "queries"
+        ],
+        "additionalProperties": false,
+        "description": "A search query or group of search queries."
+      },
+      "WebSearchActionResourceOpenPage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "open_page"
+            ],
+            "default": "open_page",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `open_page`."
+          },
+          "url": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The URL of the page that was opened."
+          }
+        },
+        "required": [
+          "type",
+          "url"
+        ],
+        "additionalProperties": false,
+        "description": "Opens a web page."
+      },
+      "WebSearchActionResourceFindInPage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "find_in_page"
+            ],
+            "default": "find_in_page",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `find_in_page`."
+          },
+          "url": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The URL of the page that was searched."
+          },
+          "pattern": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The text pattern that was searched for."
+          }
+        },
+        "required": [
+          "type",
+          "url",
+          "pattern"
+        ],
+        "additionalProperties": false,
+        "description": "Finds text within a web page."
+      },
+      "WebSearchActionResourceOther": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "other"
+            ],
+            "default": "other",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `other`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Another web search action."
+      },
+      "WebSearchActionResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/WebSearchActionResourceSearch"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchActionResourceOpenPage"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchActionResourceFindInPage"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchActionResourceOther"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "search": "#/components/schemas/WebSearchActionResourceSearch",
+            "open_page": "#/components/schemas/WebSearchActionResourceOpenPage",
+            "find_in_page": "#/components/schemas/WebSearchActionResourceFindInPage",
+            "other": "#/components/schemas/WebSearchActionResourceOther"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "search",
+          "open_page",
+          "find_in_page",
+          "other"
+        ],
+        "description": "An action performed by the web search tool."
+      },
+      "WebSearchCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search_call"
+            ],
+            "default": "web_search_call",
+            "x-stainless-const": true,
+            "description": "The item type. Always `web_search_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the web search call."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/OutputItemStatusResource",
+            "description": "The status of the web search call."
+          },
+          "action": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchActionResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The action performed by the web search tool."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "action"
+        ],
+        "additionalProperties": false,
+        "description": "A web search call produced by the agent."
+      },
+      "CommandExecutionItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "command_execution"
+            ],
+            "default": "command_execution",
+            "x-stainless-const": true,
+            "description": "The item type. Always `command_execution`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the command execution item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The command that was executed."
+          },
+          "cwd": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The working directory used to execute the command."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the command execution."
+          },
+          "output": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The command output, if available."
+          },
+          "exit_code": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The process exit code, if the command completed."
+          },
+          "duration_ms": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The command duration in milliseconds."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "command",
+          "cwd",
+          "status",
+          "output",
+          "exit_code",
+          "duration_ms"
+        ],
+        "additionalProperties": false,
+        "description": "A command execution produced by the agent."
+      },
+      "InterruptSubagentCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "interrupt_subagent_call"
+            ],
+            "default": "interrupt_subagent_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `interrupt_subagent_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent requesting the interrupt."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent to interrupt."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_id"
+        ],
+        "additionalProperties": false,
+        "description": "A request to interrupt a subagent's current turn. The subagent remains available."
+      },
+      "CreateSubagentCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "create_subagent_call"
+            ],
+            "default": "create_subagent_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `create_subagent_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent that requested the subagent."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The task given to the spawned agent."
+          },
+          "model": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The model requested for the spawned agent."
+          },
+          "reasoning_effort": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The reasoning effort requested for the spawned agent."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "agent_id",
+          "content",
+          "model",
+          "reasoning_effort"
+        ],
+        "additionalProperties": false,
+        "description": "A request to spawn a subagent."
+      },
+      "SendSubagentInputCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "send_subagent_input_call"
+            ],
+            "default": "send_subagent_input_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `send_subagent_input_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent sending the input."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent receiving the input."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentContentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The input sent to the receiving agent."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_id",
+          "content"
+        ],
+        "additionalProperties": false,
+        "description": "A request to send input to another agent."
+      },
+      "ResumeSubagentCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "resume_subagent_call"
+            ],
+            "default": "resume_subagent_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `resume_subagent_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent requesting the resume."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent to resume."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_id"
+        ],
+        "additionalProperties": false,
+        "description": "A request to resume a subagent."
+      },
+      "WaitForSubagentsCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "wait_for_subagents_call"
+            ],
+            "default": "wait_for_subagents_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `wait_for_subagents_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent waiting for results."
+          },
+          "recipient_agent_ids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The IDs of the agents to wait for."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_ids"
+        ],
+        "additionalProperties": false,
+        "description": "A request to wait for one or more subagents."
+      },
+      "CloseSubagentCallItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "close_subagent_call"
+            ],
+            "default": "close_subagent_call",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "The current public item type."
+            ],
+            "description": "The item type. Always `close_subagent_call`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the tool call item."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/FunctionCallStatusResource",
+            "description": "The status of the tool call."
+          },
+          "sender_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent requesting the close."
+          },
+          "recipient_agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent to close."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "status",
+          "sender_agent_id",
+          "recipient_agent_id"
+        ],
+        "additionalProperties": false,
+        "description": "A request to close a subagent."
+      },
+      "SessionTurnItemResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/MessageItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionCallOutputItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/AgentMessageItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/McpCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CommandExecutionItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CreateSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/SendSubagentInputCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/ResumeSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/WaitForSubagentsCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/InterruptSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CloseSubagentCallItemResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "message": "#/components/schemas/MessageItemResource",
+            "reasoning": "#/components/schemas/ReasoningItemResource",
+            "function_call": "#/components/schemas/FunctionCallItemResource",
+            "function_call_output": "#/components/schemas/FunctionCallOutputItemResource",
+            "agent_message": "#/components/schemas/AgentMessageItemResource",
+            "mcp_call": "#/components/schemas/McpCallItemResource",
+            "web_search_call": "#/components/schemas/WebSearchCallItemResource",
+            "command_execution": "#/components/schemas/CommandExecutionItemResource",
+            "interrupt_subagent_call": "#/components/schemas/InterruptSubagentCallItemResource",
+            "create_subagent_call": "#/components/schemas/CreateSubagentCallItemResource",
+            "send_subagent_input_call": "#/components/schemas/SendSubagentInputCallItemResource",
+            "resume_subagent_call": "#/components/schemas/ResumeSubagentCallItemResource",
+            "wait_for_subagents_call": "#/components/schemas/WaitForSubagentsCallItemResource",
+            "close_subagent_call": "#/components/schemas/CloseSubagentCallItemResource"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "message",
+          "reasoning",
+          "function_call",
+          "function_call_output",
+          "agent_message",
+          "mcp_call",
+          "web_search_call",
+          "command_execution",
+          "create_subagent_call",
+          "send_subagent_input_call",
+          "resume_subagent_call",
+          "wait_for_subagents_call",
+          "interrupt_subagent_call",
+          "close_subagent_call"
+        ],
+        "description": "An item associated with a session turn."
+      },
+      "SessionItemListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionTurnItemResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of messages, reasoning, and tool calls from a session's item history."
+      },
+      "TurnObjectResource": {
+        "type": "string",
+        "enum": [
+          "agent.session.turn"
+        ],
+        "default": "agent.session.turn",
+        "x-stainless-const": true,
+        "description": "The object type for a turn."
+      },
+      "TurnStatusResource": {
+        "type": "string",
+        "enum": [
+          "queued",
+          "in_progress",
+          "waiting",
+          "completed",
+          "failed",
+          "cancelled"
+        ],
+        "x-enumDescriptions": [
+          "The turn is waiting to start.",
+          "The turn is in progress.",
+          "The turn is waiting for external input.",
+          "The turn completed successfully.",
+          "The turn failed.",
+          "The turn was cancelled."
+        ],
+        "description": "The current status of a turn."
+      },
+      "SessionTurnErrorCodeResource": {
+        "type": "string",
+        "enum": [
+          "context_length_exceeded",
+          "session_budget_exceeded",
+          "usage_limit_exceeded",
+          "rate_limit_exceeded",
+          "server_overloaded",
+          "cyber_policy",
+          "connection_failed",
+          "server_error",
+          "authentication_error",
+          "invalid_request",
+          "resource_not_found",
+          "sandbox_error",
+          "executor_version_incompatible",
+          "active_turn_not_steerable",
+          "request_timeout",
+          "internal_error"
+        ],
+        "x-enumDescriptions": [
+          "The request exceeds the model's context window.",
+          "The session has reached its usage budget.",
+          "The organization has reached a usage, plan, or billing limit.",
+          "The request exceeds the available rate limit.",
+          "The model service is temporarily overloaded.",
+          "The request was rejected by a safety policy.",
+          "The request could not connect to the model service.",
+          "The model service encountered an unexpected error.",
+          "The API credentials are invalid or lack the required access.",
+          "The request contains invalid input or configuration.",
+          "The requested model or resource is unavailable.",
+          "The request could not complete in its execution environment.",
+          "The executor must be upgraded before it can run this turn.",
+          "The session cannot accept additional input while a request is running.",
+          "The request timed out before the model service responded.",
+          "An unexpected internal error prevented the session request from completing."
+        ],
+        "description": "Stable public categories for session request failures."
+      },
+      "SessionTurnErrorResource": {
+        "type": "object",
+        "properties": {
+          "code": {
+            "$ref": "#/components/schemas/SessionTurnErrorCodeResource",
+            "description": "A stable, machine-readable failure category."
+          },
+          "message": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A customer-safe explanation of the failure."
+          }
+        },
+        "required": [
+          "code",
+          "message"
+        ],
+        "additionalProperties": false,
+        "description": "A customer-safe error describing why a session request failed."
+      },
+      "InputTokensDetailsResource": {
+        "type": "object",
+        "properties": {
+          "cached_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of input tokens retrieved from the prompt cache."
+          }
+        },
+        "required": [
+          "cached_tokens"
+        ],
+        "additionalProperties": false,
+        "description": "A breakdown of input token usage for a session or turn."
+      },
+      "OutputTokensDetailsResource": {
+        "type": "object",
+        "properties": {
+          "reasoning_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of output tokens used for reasoning."
+          }
+        },
+        "required": [
+          "reasoning_tokens"
+        ],
+        "additionalProperties": false,
+        "description": "A breakdown of output token usage for a session or turn."
+      },
+      "TokenUsageResource": {
+        "type": "object",
+        "properties": {
+          "input_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of input tokens used by the agent."
+          },
+          "input_tokens_details": {
+            "$ref": "#/components/schemas/InputTokensDetailsResource",
+            "description": "A breakdown of the agent's input token usage."
+          },
+          "output_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The number of output tokens generated by the agent."
+          },
+          "output_tokens_details": {
+            "$ref": "#/components/schemas/OutputTokensDetailsResource",
+            "description": "A breakdown of the agent's output token usage."
+          },
+          "total_tokens": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The total number of input and output tokens used by the agent."
+          }
+        },
+        "required": [
+          "input_tokens",
+          "input_tokens_details",
+          "output_tokens",
+          "output_tokens_details",
+          "total_tokens"
+        ],
+        "additionalProperties": false,
+        "description": "Recorded token usage for a session or turn. Usage is best effort and may change."
+      },
+      "TurnResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn."
+          },
+          "object": {
+            "$ref": "#/components/schemas/TurnObjectResource",
+            "description": "The object type. Always `agent.session.turn`."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session that owns the turn."
+          },
+          "agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent that ran the turn."
+          },
+          "subagent_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the subagent that ran the turn, if applicable."
+          },
+          "status": {
+            "$ref": "#/components/schemas/TurnStatusResource",
+            "description": "The current status of the turn."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, used to order the turn by creation time. Subagent turns use their start time, falling back to completion time or the subagent opening time when the preceding timestamps are unavailable."
+          },
+          "started_at": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the turn started."
+          },
+          "completed_at": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the turn reached a terminal state."
+          },
+          "error": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/SessionTurnErrorResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "A customer-safe error. Non-null only for a failed turn."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Best-effort token usage for the turn, or null if unknown. Recorded usage may change."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "session_id",
+          "agent_id",
+          "subagent_id",
+          "status",
+          "created_at",
+          "started_at",
+          "completed_at",
+          "error",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "The canonical public representation of a session turn."
+      },
+      "SessionTurnListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TurnResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "ReasoningEffortResource": {
+        "type": "string",
+        "enum": [
+          "none",
+          "minimal",
+          "low",
+          "medium",
+          "high",
+          "xhigh",
+          "max"
+        ],
+        "description": "The amount of reasoning effort used by an agent."
+      },
+      "ReasoningSummaryResource": {
+        "type": "string",
+        "enum": [
+          "concise",
+          "detailed",
+          "auto"
+        ],
+        "x-enumDescriptions": [
+          "Returns a concise reasoning summary when supported.",
+          "Returns a detailed reasoning summary when supported.",
+          "Automatically selects the most detailed summary supported by the model."
+        ],
+        "description": "The reasoning summary format requested from an agent."
+      },
+      "ReasoningResource": {
+        "type": "object",
+        "properties": {
+          "effort": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningEffortResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The requested reasoning effort, or `null` when the model selects its own default."
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningSummaryResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The requested reasoning summary format, or `null` when summaries are disabled."
+          }
+        },
+        "required": [
+          "effort",
+          "summary"
+        ],
+        "additionalProperties": false,
+        "description": "The reasoning configuration used by an agent."
+      },
+      "TextFormatResourceText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "default": "text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `text`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Generates ordinary text without a structured-output constraint."
+      },
+      "TextFormatResourceJsonSchema": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "json_schema"
+            ],
+            "default": "json_schema",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `json_schema`."
+          },
+          "schema": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "The JSON Schema that generated text must match."
+          }
+        },
+        "required": [
+          "type",
+          "schema"
+        ],
+        "additionalProperties": false,
+        "description": "Constrains generated text to a JSON Schema."
+      },
+      "TextFormatResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/TextFormatResourceText"
+          },
+          {
+            "$ref": "#/components/schemas/TextFormatResourceJsonSchema"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "text": "#/components/schemas/TextFormatResourceText",
+            "json_schema": "#/components/schemas/TextFormatResourceJsonSchema"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "text",
+          "json_schema"
+        ],
+        "description": "The effective output format for generated text."
+      },
+      "VerbosityResource": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "description": "The amount of text produced by an agent."
+      },
+      "TextResource": {
+        "type": "object",
+        "properties": {
+          "format": {
+            "$ref": "#/components/schemas/TextFormatResource",
+            "description": "The effective output format. Defaults to ordinary text."
+          },
+          "verbosity": {
+            "$ref": "#/components/schemas/VerbosityResource",
+            "description": "The amount of text produced by the agent. Defaults to `medium`."
+          }
+        },
+        "required": [
+          "format",
+          "verbosity"
+        ],
+        "additionalProperties": false,
+        "description": "The text configuration used by an agent."
+      },
+      "ServiceTierResource": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default",
+          "flex",
+          "priority",
+          "fast"
+        ],
+        "description": "The service-tier policy configured for an agent."
+      },
+      "PersistedAgentToolResourceFunction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A description of what the function does."
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "A JSON Schema object describing the function's arguments."
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether the function is deferred and discovered through tool search."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "parameters",
+          "defer_loading"
+        ],
+        "additionalProperties": false,
+        "description": "A function defined by the application."
+      },
+      "PersistedAgentToolResourceToolSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search"
+            ],
+            "default": "tool_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `tool_search`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Discovers deferred function tools and loads them into the model context."
+      },
+      "PersistedAgentToolResourceProgrammaticToolCalling": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `programmatic_tool_calling`."
+          },
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether tools can be called from model-generated code."
+          }
+        },
+        "required": [
+          "type",
+          "enabled"
+        ],
+        "additionalProperties": false,
+        "description": "Enables calling tools from model-generated code."
+      },
+      "PersistedMcpTransportResourceHttp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http"
+            ],
+            "default": "http",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `http`."
+          },
+          "server_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The URL of the MCP server."
+          },
+          "headers": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Non-secret HTTP headers sent to the MCP server."
+          }
+        },
+        "required": [
+          "type",
+          "server_url",
+          "headers"
+        ],
+        "additionalProperties": false,
+        "description": "Connects to an MCP server over HTTP."
+      },
+      "PersistedMcpTransportResourceStdio": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stdio"
+            ],
+            "default": "stdio",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `stdio`."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The command used to start the MCP server."
+          },
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Arguments passed to the MCP server command."
+          },
+          "cwd": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The working directory used to start the MCP server."
+          },
+          "env_vars": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Environment variable names inherited from the execution environment."
+          }
+        },
+        "required": [
+          "type",
+          "command",
+          "args",
+          "cwd",
+          "env_vars"
+        ],
+        "additionalProperties": false,
+        "description": "Starts an MCP server as a local process."
+      },
+      "PersistedMcpTransportResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PersistedMcpTransportResourceHttp"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedMcpTransportResourceStdio"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "http": "#/components/schemas/PersistedMcpTransportResourceHttp",
+            "stdio": "#/components/schemas/PersistedMcpTransportResourceStdio"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "http",
+          "stdio"
+        ],
+        "description": "A credential-free transport used to connect to an MCP server."
+      },
+      "McpConnectionOriginResource": {
+        "type": "string",
+        "enum": [
+          "service",
+          "environment"
+        ],
+        "description": "Where outbound MCP HTTP connections originate."
+      },
+      "PersistedAgentToolResourceMcp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "default": "mcp",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp`."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A label used to identify the MCP server in tool calls."
+          },
+          "credential_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The vault credential selected for this MCP server, if any."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/PersistedMcpTransportResource",
+            "description": "The credential-free transport used to connect to the MCP server."
+          },
+          "request_metadata": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Metadata included with requests to this MCP server."
+          },
+          "allowed_tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The MCP tools the agent may call, or null when all server tools are allowed."
+          },
+          "required": {
+            "type": "boolean",
+            "description": "Whether this MCP server must initialize before the first turn."
+          },
+          "connection_origin": {
+            "$ref": "#/components/schemas/McpConnectionOriginResource",
+            "description": "Where outbound MCP HTTP connections originate."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "credential_id",
+          "transport",
+          "request_metadata",
+          "allowed_tools",
+          "required",
+          "connection_origin"
+        ],
+        "additionalProperties": false,
+        "description": "Tools provided by a remote MCP server without stored credentials."
+      },
+      "WebSearchModeResource": {
+        "type": "string",
+        "enum": [
+          "disabled",
+          "cached",
+          "live"
+        ],
+        "description": "The source used for web search results."
+      },
+      "WebSearchContextSizeResource": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "description": "The amount of web search context made available to the model."
+      },
+      "WebSearchLocationResource": {
+        "type": "object",
+        "properties": {
+          "country": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The two-letter ISO country code, such as `US`."
+          },
+          "region": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The region or state name."
+          },
+          "city": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The city name."
+          },
+          "timezone": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The IANA timezone, such as `America/Los_Angeles`."
+          }
+        },
+        "required": [
+          "country",
+          "region",
+          "city",
+          "timezone"
+        ],
+        "additionalProperties": false,
+        "description": "Approximate user location used to localize web search results."
+      },
+      "PersistedAgentToolResourceWebSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search"
+            ],
+            "default": "web_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `web_search`."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/WebSearchModeResource",
+            "description": "The source used for web search results."
+          },
+          "context_size": {
+            "$ref": "#/components/schemas/WebSearchContextSizeResource",
+            "description": "The amount of search context made available to the model. Defaults to `medium`."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Allowed search domains, or `null` when the search is unrestricted."
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchLocationResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Approximate location used to localize search results, if provided."
+          }
+        },
+        "required": [
+          "type",
+          "mode",
+          "context_size",
+          "allowed_domains",
+          "location"
+        ],
+        "additionalProperties": false,
+        "description": "Web search."
+      },
+      "PersistedAgentToolResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceFunction"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceToolSearch"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceProgrammaticToolCalling"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceMcp"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolResourceWebSearch"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function": "#/components/schemas/PersistedAgentToolResourceFunction",
+            "tool_search": "#/components/schemas/PersistedAgentToolResourceToolSearch",
+            "programmatic_tool_calling": "#/components/schemas/PersistedAgentToolResourceProgrammaticToolCalling",
+            "mcp": "#/components/schemas/PersistedAgentToolResourceMcp",
+            "web_search": "#/components/schemas/PersistedAgentToolResourceWebSearch"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function",
+          "tool_search",
+          "programmatic_tool_calling",
+          "mcp",
+          "web_search"
+        ],
+        "description": "A credential-free tool available to a reusable agent."
+      },
+      "MultiAgentConfigResource": {
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether subagent tools are enabled. Defaults to false."
+          },
+          "max_concurrent_subagents": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "minimum": 1,
+            "maximum": 4294967295,
+            "description": "Maximum number of subagents that may run concurrently, or null when disabled. Defaults to 6 when enabled."
+          }
+        },
+        "required": [
+          "enabled",
+          "max_concurrent_subagents"
+        ],
+        "additionalProperties": false,
+        "description": "The resolved configuration for creating and coordinating subagents."
+      },
+      "AgentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reusable agent."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent"
+            ],
+            "default": "agent",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent`."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the agent was created."
+          },
+          "updated_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the agent was last updated."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "A human-readable name for the agent, or null if it is unnamed."
+          },
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Custom string key-value pairs attached to the agent."
+          },
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The requested model name used for inference."
+          },
+          "reasoning": {
+            "$ref": "#/components/schemas/ReasoningResource",
+            "description": "The resolved reasoning configuration, including the model default for an omitted effort."
+          },
+          "text": {
+            "$ref": "#/components/schemas/TextResource",
+            "description": "The resolved configuration for text generated by the agent."
+          },
+          "service_tier": {
+            "$ref": "#/components/schemas/ServiceTierResource",
+            "description": "The resolved service-tier policy used for model requests."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "Custom instructions appended to the agent's default base instructions."
+          },
+          "tools": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersistedAgentToolResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Tools available to the agent."
+          },
+          "multi_agent": {
+            "$ref": "#/components/schemas/MultiAgentConfigResource",
+            "description": "The resolved configuration for creating and coordinating subagents."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "created_at",
+          "updated_at",
+          "name",
+          "metadata",
+          "model",
+          "reasoning",
+          "text",
+          "service_tier",
+          "instructions",
+          "tools",
+          "multi_agent"
+        ],
+        "additionalProperties": false,
+        "description": "A reusable agent scoped to the caller's project."
+      },
+      "AgentListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "ReasoningEffortParam": {
+        "type": "string",
+        "enum": [
+          "none",
+          "minimal",
+          "low",
+          "medium",
+          "high",
+          "xhigh",
+          "max"
+        ],
+        "description": "The amount of reasoning effort the model should use."
+      },
+      "ReasoningSummaryParam": {
+        "type": "string",
+        "enum": [
+          "concise",
+          "detailed",
+          "auto"
+        ],
+        "x-enumDescriptions": [
+          "Returns a concise reasoning summary when supported.",
+          "Returns a detailed reasoning summary when supported.",
+          "Automatically selects the most detailed summary supported by the model."
+        ],
+        "description": "The reasoning summary format requested from the model."
+      },
+      "ReasoningParam": {
+        "type": "object",
+        "properties": {
+          "effort": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningEffortParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The amount of reasoning effort the model should use. Omission lets the model select it."
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningSummaryParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Controls whether the response includes a reasoning summary."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Reasoning configuration for the agent."
+      },
+      "TextFormatParamText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "default": "text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `text`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Generates ordinary text without a structured-output constraint."
+      },
+      "TextFormatParamJsonSchema": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "json_schema"
+            ],
+            "default": "json_schema",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `json_schema`."
+          },
+          "schema": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "The JSON Schema that generated text must match."
+          }
+        },
+        "required": [
+          "type",
+          "schema"
+        ],
+        "additionalProperties": false,
+        "description": "Constrains generated text to a JSON Schema."
+      },
+      "TextFormatParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/TextFormatParamText"
+          },
+          {
+            "$ref": "#/components/schemas/TextFormatParamJsonSchema"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "text": "#/components/schemas/TextFormatParamText",
+            "json_schema": "#/components/schemas/TextFormatParamJsonSchema"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "text",
+          "json_schema"
+        ],
+        "description": "The output format for generated text."
+      },
+      "VerbosityParam": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "x-enumDescriptions": [
+          "Produces less text.",
+          "Uses the default amount of text.",
+          "Produces more text."
+        ],
+        "description": "The amount of text the model should produce."
+      },
+      "TextParam": {
+        "type": "object",
+        "properties": {
+          "format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TextFormatParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The output format. Omission uses ordinary text (`{\"type\": \"text\"}`)."
+          },
+          "verbosity": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/VerbosityParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The amount of text the model should produce. Defaults to `medium`, matching Responses."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Configuration for text generated by the agent."
+      },
+      "ServiceTierParam": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default",
+          "flex",
+          "priority",
+          "fast"
+        ],
+        "x-enumDescriptions": [
+          "Selects the service tier automatically.",
+          "Uses the default service tier.",
+          "Uses the flex service tier.",
+          "Uses the priority service tier.",
+          "Uses the fast service tier."
+        ],
+        "description": "The service tier used for model requests."
+      },
+      "PersistedAgentToolConfigParamFunction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A description of what the function does."
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "A JSON Schema object describing the function's arguments."
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether this function is deferred and discovered through tool search. Defaults to `false`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "parameters"
+        ],
+        "additionalProperties": false,
+        "description": "A function defined by the application."
+      },
+      "PersistedAgentToolConfigParamToolSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search"
+            ],
+            "default": "tool_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `tool_search`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Discovers deferred function tools and loads them into the model context."
+      },
+      "PersistedAgentToolConfigParamProgrammaticToolCalling": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `programmatic_tool_calling`."
+          },
+          "enabled": {
+            "type": "boolean",
+            "default": true,
+            "description": "Whether tools can be called from model-generated code. Defaults to `true`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Enables calling tools from model-generated code."
+      },
+      "PersistedMcpTransportConfigParamHttp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http"
+            ],
+            "default": "http",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `http`."
+          },
+          "server_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The URL of the MCP server."
+          },
+          "headers": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Non-secret HTTP headers sent to the MCP server."
+          }
+        },
+        "required": [
+          "type",
+          "server_url"
+        ],
+        "additionalProperties": false,
+        "description": "Connects to an MCP server over HTTP."
+      },
+      "PersistedMcpTransportConfigParamStdio": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stdio"
+            ],
+            "default": "stdio",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `stdio`."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The command used to start the MCP server."
+          },
+          "args": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Arguments passed to the MCP server command."
+          },
+          "cwd": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The working directory used to start the MCP server."
+          },
+          "env_vars": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Environment variable names to inherit from the selected execution environment."
+          }
+        },
+        "required": [
+          "type",
+          "command",
+          "cwd"
+        ],
+        "additionalProperties": false,
+        "description": "Starts an MCP server as a local process."
+      },
+      "PersistedMcpTransportConfigParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PersistedMcpTransportConfigParamHttp"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedMcpTransportConfigParamStdio"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "http": "#/components/schemas/PersistedMcpTransportConfigParamHttp",
+            "stdio": "#/components/schemas/PersistedMcpTransportConfigParamStdio"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "http",
+          "stdio"
+        ],
+        "description": "A credential-free transport used to connect to an MCP server."
+      },
+      "McpConnectionOriginParam": {
+        "type": "string",
+        "enum": [
+          "service",
+          "environment"
+        ],
+        "x-enumDescriptions": [
+          "Uses the Managed Agents service network.",
+          "Uses the session's execution environment."
+        ],
+        "description": "Where outbound MCP HTTP connections originate."
+      },
+      "PersistedAgentToolConfigParamMcp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "default": "mcp",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp`."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A label used to identify the MCP server in tool calls."
+          },
+          "credential_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The vault credential selected for this MCP server. Optional when exactly one attached credential matches the server URL."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/PersistedMcpTransportConfigParam",
+            "description": "The credential-free transport used to connect to the MCP server."
+          },
+          "request_metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Metadata included with requests to this MCP server."
+          },
+          "allowed_tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The MCP tools the agent may call. All server tools are allowed when omitted."
+          },
+          "required": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether this MCP server must initialize before the first turn. Defaults to `false`."
+          },
+          "connection_origin": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/McpConnectionOriginParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Selects where outbound MCP HTTP connections originate."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "transport"
+        ],
+        "additionalProperties": false,
+        "description": "Tools provided by a remote MCP server without stored credentials."
+      },
+      "WebSearchModeParam": {
+        "type": "string",
+        "enum": [
+          "disabled",
+          "cached",
+          "live"
+        ],
+        "x-enumDescriptions": [
+          "Disables web search.",
+          "Uses cached search results.",
+          "Searches the live web."
+        ],
+        "description": "The source used for web search results."
+      },
+      "WebSearchContextSizeParam": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ],
+        "description": "The amount of web search context made available to the model."
+      },
+      "WebSearchLocationParam": {
+        "type": "object",
+        "properties": {
+          "country": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The two-letter ISO country code, such as `US`."
+          },
+          "region": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The region or state name."
+          },
+          "city": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The city name."
+          },
+          "timezone": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The IANA timezone, such as `America/Los_Angeles`."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Approximate user location used to localize web search results."
+      },
+      "PersistedAgentToolConfigParamWebSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search"
+            ],
+            "default": "web_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `web_search`."
+          },
+          "mode": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchModeParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The source used for web search results. Defaults to `live`."
+          },
+          "context_size": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchContextSizeParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The amount of search context made available to the model. Defaults to `medium`."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Domains the search may include."
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchLocationParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Approximate location used to localize search results."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Web search."
+      },
+      "PersistedAgentToolConfigParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamFunction"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamToolSearch"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamProgrammaticToolCalling"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamMcp"
+          },
+          {
+            "$ref": "#/components/schemas/PersistedAgentToolConfigParamWebSearch"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function": "#/components/schemas/PersistedAgentToolConfigParamFunction",
+            "tool_search": "#/components/schemas/PersistedAgentToolConfigParamToolSearch",
+            "programmatic_tool_calling": "#/components/schemas/PersistedAgentToolConfigParamProgrammaticToolCalling",
+            "mcp": "#/components/schemas/PersistedAgentToolConfigParamMcp",
+            "web_search": "#/components/schemas/PersistedAgentToolConfigParamWebSearch"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function",
+          "tool_search",
+          "programmatic_tool_calling",
+          "mcp",
+          "web_search"
+        ],
+        "description": "A tool that can be stored on a reusable agent without session credentials."
+      },
+      "MultiAgentConfigCurrentParam": {
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether subagent tools are enabled."
+          },
+          "max_concurrent_subagents": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 1,
+            "maximum": 4294967295,
+            "description": "Maximum number of subagents that may run concurrently. Defaults to 6."
+          }
+        },
+        "required": [
+          "enabled"
+        ],
+        "additionalProperties": false,
+        "description": "Explicit configuration for creating and coordinating subagents."
+      },
+      "CreateAgentParams": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 512
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "minProperties": 0,
+            "maxProperties": 16,
+            "description": "Up to 16 string key-value pairs, with keys up to 64 and values up to 512 characters. Omission or null defaults to an empty map."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 128,
+            "description": "A human-readable name for the agent. Omission or null leaves the agent unnamed."
+          },
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The model to use for the agent. The requested model name is preserved."
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for model reasoning. Omission uses the model's default effort."
+          },
+          "text": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TextParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for generated text. Defaults to the `text` format and medium verbosity."
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ServiceTierParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The service tier used for model requests. Defaults to `auto`."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Additional instructions appended to the agent's default base instructions. Omit or set to null to add no custom instructions."
+          },
+          "tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/PersistedAgentToolConfigParam"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Tools available to the agent. Defaults to an empty list."
+          },
+          "multi_agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MultiAgentConfigCurrentParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for creating and coordinating subagents. Subagent tools are disabled by default."
+          }
+        },
+        "required": [
+          "model"
+        ],
+        "additionalProperties": false,
+        "description": "Parameters for creating a reusable agent."
+      },
+      "UpdateAgentParams": {
+        "type": "object",
+        "properties": {
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The model to use for the agent. The requested model name is preserved."
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for model reasoning. Omit to keep the current settings; pass `null` to reset to the model's default effort."
+          },
+          "text": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TextParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for text generated by the agent."
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ServiceTierParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The service tier used for model requests."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Additional instructions appended to the agent's default base instructions. Omit to leave unchanged."
+          },
+          "multi_agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MultiAgentConfigCurrentParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for creating and coordinating subagents."
+          },
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 512
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "minProperties": 0,
+            "maxProperties": 16,
+            "description": "Replaces all metadata. Omit to leave unchanged, or pass null or {} to clear it. Up to 16 string key-value pairs, with keys up to 64 and values up to 512 characters."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 128,
+            "description": "A replacement name. Omit to leave unchanged, or pass null to clear it."
+          },
+          "tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/PersistedAgentToolConfigParam"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Tools available to the agent."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Fields to replace on an existing reusable agent."
+      },
+      "DeletedAgentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted agent."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.deleted"
+            ],
+            "default": "agent.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the agent was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "A deleted reusable agent."
+      },
+      "EnvironmentPackagesResource": {
+        "type": "object",
+        "properties": {
+          "python": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Python packages installed in the environment."
+          },
+          "system": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "System packages installed in the environment."
+          },
+          "npm": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "npm packages installed globally in the environment."
+          }
+        },
+        "required": [
+          "python",
+          "system",
+          "npm"
+        ],
+        "additionalProperties": false,
+        "description": "Packages installed in an OpenAI-hosted environment."
+      },
+      "NetworkAccessResource": {
+        "type": "string",
+        "enum": [
+          "enabled",
+          "disabled",
+          "restricted"
+        ],
+        "x-enumDescriptions": [
+          "Allows unrestricted network access.",
+          "Disables network access.",
+          "Allows access only to configured domains."
+        ],
+        "description": "The network access mode for an OpenAI-hosted environment."
+      },
+      "NetworkPolicyResource": {
+        "type": "object",
+        "properties": {
+          "access": {
+            "$ref": "#/components/schemas/NetworkAccessResource",
+            "description": "The environment's network access mode."
+          },
+          "allowed_domains": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Domains the environment may access when network access is restricted."
+          }
+        },
+        "required": [
+          "access",
+          "allowed_domains"
+        ],
+        "additionalProperties": false,
+        "description": "Network access for an OpenAI-hosted environment."
+      },
+      "HostedTemplateSkillResourceSkillReference": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill_reference"
+            ],
+            "default": "skill_reference",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `skill_reference`."
+          },
+          "skill_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The referenced skill ID."
+          },
+          "version": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The requested version selector, including `latest`."
+          }
+        },
+        "required": [
+          "type",
+          "skill_id",
+          "version"
+        ],
+        "additionalProperties": false,
+        "description": "A skill resolved afresh from the Skills API whenever a session starts."
+      },
+      "HostedTemplateSkillResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The skill name declared in `SKILL.md`."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The skill description declared in `SKILL.md`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description"
+        ],
+        "additionalProperties": false,
+        "description": "Safe metadata for an inline skill archive."
+      },
+      "HostedTemplateSkillResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedTemplateSkillResourceSkillReference"
+          },
+          {
+            "$ref": "#/components/schemas/HostedTemplateSkillResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "skill_reference": "#/components/schemas/HostedTemplateSkillResourceSkillReference",
+            "inline": "#/components/schemas/HostedTemplateSkillResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "skill_reference",
+          "inline"
+        ],
+        "description": "Safe metadata for a skill configured by an environment template."
+      },
+      "HostedTemplateFileResourceFileId": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_id"
+            ],
+            "default": "file_id",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `file_id`."
+          },
+          "file_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the uploaded file."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The file's absolute path inside the environment."
+          }
+        },
+        "required": [
+          "type",
+          "file_id",
+          "path"
+        ],
+        "additionalProperties": false,
+        "description": "A project-scoped Files API reference resolved separately for each session."
+      },
+      "HostedTemplateFileResourceInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The file's absolute path inside the environment."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The decoded size of the inline file in bytes."
+          }
+        },
+        "required": [
+          "type",
+          "path",
+          "size_bytes"
+        ],
+        "additionalProperties": false,
+        "description": "Metadata for confidential inline file contents."
+      },
+      "HostedTemplateFileResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedTemplateFileResourceFileId"
+          },
+          {
+            "$ref": "#/components/schemas/HostedTemplateFileResourceInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "file_id": "#/components/schemas/HostedTemplateFileResourceFileId",
+            "inline": "#/components/schemas/HostedTemplateFileResourceInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "file_id",
+          "inline"
+        ],
+        "description": "Safe metadata for a file configured by an environment template."
+      },
+      "EnvironmentTemplateResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reusable environment template."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "An optional human-readable display name for the template."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.environment.template"
+            ],
+            "default": "agent.environment.template",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.environment.template`."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the template was created."
+          },
+          "updated_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the template was last updated."
+          },
+          "packages": {
+            "$ref": "#/components/schemas/EnvironmentPackagesResource",
+            "description": "Packages installed in each fresh OpenAI-hosted environment."
+          },
+          "network": {
+            "$ref": "#/components/schemas/NetworkPolicyResource",
+            "description": "Runtime network access for each OpenAI-hosted environment."
+          },
+          "capability_directories": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Directories that expose capabilities to the agent."
+          },
+          "skills": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedTemplateSkillResource"
+            },
+            "minItems": 0,
+            "maxItems": 200,
+            "description": "Safe skill metadata, preserving unresolved version selectors."
+          },
+          "plugins": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginResource"
+            },
+            "minItems": 0,
+            "maxItems": 32,
+            "description": "Safe plugin metadata, excluding inline archive contents."
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedTemplateFileResource"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Safe file metadata, excluding contents and session-scoped file IDs."
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "object",
+          "created_at",
+          "updated_at",
+          "packages",
+          "network",
+          "capability_directories",
+          "skills",
+          "plugins",
+          "files"
+        ],
+        "additionalProperties": false,
+        "description": "Reusable configuration that provisions a fresh OpenAI-hosted environment for each session."
+      },
+      "EnvironmentTemplateListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EnvironmentTemplateResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "EnvironmentPackagesParam": {
+        "type": "object",
+        "properties": {
+          "python": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Python packages to install. Defaults to an empty list."
+          },
+          "system": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "System packages to install. Defaults to an empty list."
+          },
+          "npm": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "npm packages to install globally. Defaults to an empty list."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Packages to install in an OpenAI-hosted environment."
+      },
+      "SetupCommandParam": {
+        "type": "object",
+        "properties": {
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 65536,
+            "description": "The shell command to execute."
+          },
+          "cwd": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 4096,
+            "description": "The absolute working directory. Defaults to `/workspace`."
+          }
+        },
+        "required": [
+          "command"
+        ],
+        "additionalProperties": false,
+        "description": "A confidential setup command executed before the hosted agent starts."
+      },
+      "NetworkAccessParam": {
+        "type": "string",
+        "enum": [
+          "enabled",
+          "disabled",
+          "restricted"
+        ],
+        "x-enumDescriptions": [
+          "Allows unrestricted network access, matching an omitted network policy.",
+          "Disables network access.",
+          "Allows access only to configured domains."
+        ],
+        "description": "The network access mode for an OpenAI-hosted environment."
+      },
+      "NetworkPolicyParam": {
+        "type": "object",
+        "properties": {
+          "access": {
+            "$ref": "#/components/schemas/NetworkAccessParam",
+            "description": "The environment's network access mode."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Domains the environment may access when network access is restricted."
+          }
+        },
+        "required": [
+          "access"
+        ],
+        "additionalProperties": false,
+        "description": "Network access for an OpenAI-hosted environment."
+      },
+      "HostedSkillParamSkillReference": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill_reference"
+            ],
+            "default": "skill_reference",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `skill_reference`."
+          },
+          "skill_id": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "description": "The ID of the skill created through `/v1/skills`."
+          },
+          "version": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The skill version, a positive integer or `latest`; omission selects the default."
+          }
+        },
+        "required": [
+          "type",
+          "skill_id"
+        ],
+        "additionalProperties": false,
+        "description": "References a skill uploaded through the Skills API."
+      },
+      "InlineCapabilitySourceParamBase64": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "base64"
+            ],
+            "default": "base64",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `base64`."
+          },
+          "media_type": {
+            "type": "string",
+            "enum": [
+              "application/zip"
+            ],
+            "default": "application/zip",
+            "x-stainless-const": true,
+            "x-enumDescriptions": [
+              "A ZIP archive."
+            ],
+            "description": "The archive media type, always `application/zip`."
+          },
+          "data": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 70254592,
+            "description": "Standard-base64 encoded ZIP archive bytes."
+          }
+        },
+        "required": [
+          "type",
+          "media_type",
+          "data"
+        ],
+        "additionalProperties": false,
+        "description": "Provides ZIP bytes encoded with standard base64."
+      },
+      "InlineCapabilitySourceParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InlineCapabilitySourceParamBase64"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "base64": "#/components/schemas/InlineCapabilitySourceParamBase64"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "base64"
+        ],
+        "description": "The encoded ZIP archive for an inline skill or plugin."
+      },
+      "HostedSkillParamInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "description": "The skill name declared in `SKILL.md`."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The skill description declared in `SKILL.md`."
+          },
+          "source": {
+            "$ref": "#/components/schemas/InlineCapabilitySourceParam",
+            "description": "The inline ZIP archive."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "source"
+        ],
+        "additionalProperties": false,
+        "description": "Supplies a skill ZIP directly in the session request."
+      },
+      "HostedSkillParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedSkillParamSkillReference"
+          },
+          {
+            "$ref": "#/components/schemas/HostedSkillParamInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "skill_reference": "#/components/schemas/HostedSkillParamSkillReference",
+            "inline": "#/components/schemas/HostedSkillParamInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "skill_reference",
+          "inline"
+        ],
+        "description": "A skill installed in an OpenAI-hosted environment."
+      },
+      "HostedPluginParamInline": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "default": "inline",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `inline`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 64,
+            "description": "The plugin name declared in `.codex-plugin/plugin.json`."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The plugin description declared in `.codex-plugin/plugin.json`."
+          },
+          "source": {
+            "$ref": "#/components/schemas/InlineCapabilitySourceParam",
+            "description": "The inline ZIP archive."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "source"
+        ],
+        "additionalProperties": false,
+        "description": "Supplies a plugin ZIP directly in the session request."
+      },
+      "HostedPluginParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/HostedPluginParamInline"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "inline": "#/components/schemas/HostedPluginParamInline"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "inline"
+        ],
+        "description": "A plugin installed in an OpenAI-hosted environment."
+      },
+      "CreateEnvironmentTemplateParams": {
+        "type": "object",
+        "properties": {
+          "packages": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EnvironmentPackagesParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Packages to install in the environment. Defaults to empty package lists."
+          },
+          "setup_commands": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/SetupCommandParam"
+            },
+            "minItems": 0,
+            "maxItems": 16,
+            "description": "Ordered, confidential setup commands. Command bodies are never returned."
+          },
+          "network": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/NetworkPolicyParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Network access policy for the environment. Defaults to enabled."
+          },
+          "env": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Environment variables made available to the agent."
+          },
+          "capability_directories": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Directories that contain capabilities exposed to the agent. Defaults to an empty list."
+          },
+          "skills": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillParam"
+            },
+            "minItems": 0,
+            "maxItems": 200,
+            "description": "Skills referenced by ID or provided as inline ZIP archives. Defaults to an empty list."
+          },
+          "plugins": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginParam"
+            },
+            "minItems": 0,
+            "maxItems": 32,
+            "description": "Plugins provided as inline ZIP archives. Defaults to an empty list."
+          },
+          "files": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileParam"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Files available before the agent starts. Defaults to an empty list."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 1,
+            "maxLength": 256,
+            "description": "An optional human-readable display name for the template."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Parameters for creating a reusable, project-scoped OpenAI-hosted environment template."
+      },
+      "UpdateEnvironmentTemplateParams": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 1,
+            "maxLength": 256,
+            "description": "A replacement human-readable display name, or `null` to clear the name."
+          },
+          "packages": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EnvironmentPackagesParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Packages installed before the runtime network policy applies."
+          },
+          "setup_commands": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/SetupCommandParam"
+            },
+            "minItems": 0,
+            "maxItems": 16,
+            "description": "Replacement confidential setup commands, never included in returned resources."
+          },
+          "network": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/NetworkPolicyParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Network access available after setup completes."
+          },
+          "env": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Replacement confidential environment values."
+          },
+          "capability_directories": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Directories that expose capabilities to the agent."
+          },
+          "skills": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillParam"
+            },
+            "minItems": 0,
+            "maxItems": 200,
+            "description": "Replacement skill configuration installed for each new session."
+          },
+          "plugins": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginParam"
+            },
+            "minItems": 0,
+            "maxItems": 32,
+            "description": "Replacement plugin configuration installed for each new session."
+          },
+          "files": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileParam"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Replacement file configuration materialized for each new session."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Fields to replace on an existing reusable OpenAI-hosted environment template."
+      },
+      "DeletedEnvironmentTemplateResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted environment template."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.environment.template.deleted"
+            ],
+            "default": "agent.environment.template.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.environment.template.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the environment template was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "A deleted reusable environment template."
+      },
+      "SessionStatusResource": {
+        "type": "string",
+        "enum": [
+          "idle",
+          "in_progress",
+          "requires_action",
+          "failed"
+        ],
+        "x-enumDescriptions": [
+          "The session has no turn in progress and is ready for input. A hosted environment may still be provisioning.",
+          "The session is processing a turn.",
+          "The session is waiting for one or more required actions.",
+          "The session failed."
+        ],
+        "description": "The current status of a session."
+      },
+      "SessionRequiredActionResourceFunctionCall": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call"
+            ],
+            "default": "function_call",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function_call`."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that requested the function call."
+          },
+          "call_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID to include when submitting the function result."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The function name."
+          },
+          "arguments": {
+            "description": "The arguments supplied by the model."
+          }
+        },
+        "required": [
+          "type",
+          "turn_id",
+          "call_id",
+          "name",
+          "arguments"
+        ],
+        "additionalProperties": false,
+        "description": "Run a function tool and submit its result."
+      },
+      "SessionRequiredActionResourceEnvironmentConnection": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "environment_connection"
+            ],
+            "default": "environment_connection",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `environment_connection`."
+          },
+          "environment_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the environment to reconnect."
+          }
+        },
+        "required": [
+          "type",
+          "environment_id"
+        ],
+        "additionalProperties": false,
+        "description": "Reconnect a session environment."
+      },
+      "SessionRequiredActionResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/SessionRequiredActionResourceFunctionCall"
+          },
+          {
+            "$ref": "#/components/schemas/SessionRequiredActionResourceEnvironmentConnection"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function_call": "#/components/schemas/SessionRequiredActionResourceFunctionCall",
+            "environment_connection": "#/components/schemas/SessionRequiredActionResourceEnvironmentConnection"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function_call",
+          "environment_connection"
+        ],
+        "description": "An action that must be completed before a session can continue."
+      },
+      "AgentToolResourceFunction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A description of what the function does."
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "A JSON Schema object describing the function's arguments."
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether the function is deferred and discovered through tool search."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "parameters",
+          "defer_loading"
+        ],
+        "additionalProperties": false,
+        "description": "A function defined by the application."
+      },
+      "AgentToolResourceProgrammaticToolCalling": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `programmatic_tool_calling`."
+          },
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether tools can be called from model-generated code."
+          }
+        },
+        "required": [
+          "type",
+          "enabled"
+        ],
+        "additionalProperties": false,
+        "description": "Enables calling tools from model-generated code."
+      },
+      "McpTransportResourceHttp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http"
+            ],
+            "default": "http",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `http`."
+          },
+          "server_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The URL of the MCP server."
+          }
+        },
+        "required": [
+          "type",
+          "server_url"
+        ],
+        "additionalProperties": false,
+        "description": "Connects to an MCP server over HTTP."
+      },
+      "McpTransportResourceStdio": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stdio"
+            ],
+            "default": "stdio",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `stdio`."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The command used to start the MCP server."
+          },
+          "args": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Arguments passed to the MCP server command."
+          },
+          "cwd": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The working directory used to start the MCP server."
+          },
+          "env_vars": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Environment variable names inherited from the execution environment."
+          }
+        },
+        "required": [
+          "type",
+          "command",
+          "args",
+          "cwd",
+          "env_vars"
+        ],
+        "additionalProperties": false,
+        "description": "Starts an MCP server as a local process."
+      },
+      "McpTransportResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/McpTransportResourceHttp"
+          },
+          {
+            "$ref": "#/components/schemas/McpTransportResourceStdio"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "http": "#/components/schemas/McpTransportResourceHttp",
+            "stdio": "#/components/schemas/McpTransportResourceStdio"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "http",
+          "stdio"
+        ],
+        "description": "The transport used to connect to an MCP server."
+      },
+      "AgentToolResourceMcp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "default": "mcp",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp`."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A label used to identify the MCP server in tool calls."
+          },
+          "credential_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The attached vault credential selected for this MCP server, if any. Optional when exactly one attached credential matches the server URL."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/McpTransportResource",
+            "description": "The transport used to connect to the MCP server."
+          },
+          "request_metadata": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Metadata included with requests to this MCP server."
+          },
+          "allowed_tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The MCP tools the agent may call."
+          },
+          "required": {
+            "type": "boolean",
+            "description": "Whether this MCP server must initialize before the first turn."
+          },
+          "connection_origin": {
+            "$ref": "#/components/schemas/McpConnectionOriginResource",
+            "description": "Where outbound MCP HTTP connections originate."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "credential_id",
+          "transport",
+          "request_metadata",
+          "allowed_tools",
+          "required",
+          "connection_origin"
+        ],
+        "additionalProperties": false,
+        "description": "Tools provided by a remote MCP server."
+      },
+      "AgentToolResourceWebSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search"
+            ],
+            "default": "web_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `web_search`."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/WebSearchModeResource",
+            "description": "The source used for web search results."
+          },
+          "context_size": {
+            "$ref": "#/components/schemas/WebSearchContextSizeResource",
+            "description": "The amount of search context made available to the model. Defaults to `medium`."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Allowed search domains, or `null` when the search is unrestricted."
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchLocationResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Approximate location used to localize search results, if provided."
+          }
+        },
+        "required": [
+          "type",
+          "mode",
+          "context_size",
+          "allowed_domains",
+          "location"
+        ],
+        "additionalProperties": false,
+        "description": "Web search."
+      },
+      "AgentToolResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/AgentToolResourceFunction"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolResourceProgrammaticToolCalling"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolResourceMcp"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolResourceWebSearch"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function": "#/components/schemas/AgentToolResourceFunction",
+            "programmatic_tool_calling": "#/components/schemas/AgentToolResourceProgrammaticToolCalling",
+            "mcp": "#/components/schemas/AgentToolResourceMcp",
+            "web_search": "#/components/schemas/AgentToolResourceWebSearch"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function",
+          "programmatic_tool_calling",
+          "mcp",
+          "web_search"
+        ],
+        "description": "A tool available to the agent."
+      },
+      "SessionAgentResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the agent."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The reusable agent's name when the session was created, or null if no name was saved. Later changes to the agent's name do not affect this value."
+          },
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The model used by the agent."
+          },
+          "reasoning": {
+            "$ref": "#/components/schemas/ReasoningResource",
+            "description": "The agent's reasoning configuration."
+          },
+          "text": {
+            "$ref": "#/components/schemas/TextResource",
+            "description": "Configuration for text generated by the agent."
+          },
+          "service_tier": {
+            "$ref": "#/components/schemas/ServiceTierResource",
+            "description": "The effective service-tier policy for model requests. Defaults to `auto`."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "Custom instructions appended to the agent's default base instructions."
+          },
+          "tools": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AgentToolResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Tools available to the agent."
+          },
+          "multi_agent": {
+            "$ref": "#/components/schemas/MultiAgentConfigResource",
+            "description": "Configuration for creating and coordinating subagents."
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "model",
+          "reasoning",
+          "text",
+          "service_tier",
+          "instructions",
+          "tools",
+          "multi_agent"
+        ],
+        "additionalProperties": false,
+        "description": "The effective agent configuration for a session."
+      },
+      "EnvironmentResourceNone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "none"
+            ],
+            "default": "none",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `none`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "The session talks to CCA without selecting or provisioning an execution environment."
+      },
+      "EnvironmentResourceOpenaiHosted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "openai_hosted"
+            ],
+            "default": "openai_hosted",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `openai_hosted`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The public ID of the environment."
+          },
+          "packages": {
+            "$ref": "#/components/schemas/EnvironmentPackagesResource",
+            "description": "Packages installed in the environment."
+          },
+          "network": {
+            "$ref": "#/components/schemas/NetworkPolicyResource",
+            "description": "The effective network access policy for the environment."
+          },
+          "capability_directories": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Directories that contain capabilities exposed to the agent."
+          },
+          "skills": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Skills installed in the environment, excluding their archive contents."
+          },
+          "plugins": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Plugins installed in the environment, excluding their archive contents."
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileResource"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Files available in the environment, excluding their contents."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "packages",
+          "network",
+          "capability_directories",
+          "skills",
+          "plugins",
+          "files"
+        ],
+        "additionalProperties": false,
+        "description": "An environment hosted by OpenAI."
+      },
+      "EnvironmentResourceSelfHosted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "self_hosted"
+            ],
+            "default": "self_hosted",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `self_hosted`."
+          },
+          "remote_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "Pass this URL unchanged to `codex exec-server --remote` when connecting this environment."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The public ID of the environment."
+          },
+          "workspace_directory": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The absolute project directory inside the environment. Defaults to `/workspace`."
+          },
+          "capability_directories": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Directories that contain capabilities exposed to the agent."
+          }
+        },
+        "required": [
+          "type",
+          "remote_url",
+          "id",
+          "workspace_directory",
+          "capability_directories"
+        ],
+        "additionalProperties": false,
+        "description": "An environment hosted by the application."
+      },
+      "EnvironmentResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/EnvironmentResourceNone"
+          },
+          {
+            "$ref": "#/components/schemas/EnvironmentResourceOpenaiHosted"
+          },
+          {
+            "$ref": "#/components/schemas/EnvironmentResourceSelfHosted"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "none": "#/components/schemas/EnvironmentResourceNone",
+            "openai_hosted": "#/components/schemas/EnvironmentResourceOpenaiHosted",
+            "self_hosted": "#/components/schemas/EnvironmentResourceSelfHosted"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "none",
+          "openai_hosted",
+          "self_hosted"
+        ],
+        "description": "The execution environment for a session."
+      },
+      "SessionResource": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Custom string key-value pairs attached to the session."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.session"
+            ],
+            "default": "agent.session",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.session`."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the session was created."
+          },
+          "last_active_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the session was last active."
+          },
+          "status": {
+            "$ref": "#/components/schemas/SessionStatusResource",
+            "description": "The current status of the session."
+          },
+          "required_actions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionRequiredActionResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "Actions that must be completed before the session can continue."
+          },
+          "error": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The error that caused the session to fail, if any."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/SessionAgentResource",
+            "description": "The agent running in the session."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/EnvironmentResource",
+            "description": "The execution environment for the session."
+          },
+          "vault_ids": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The IDs of vaults made available to the session."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Best-effort token usage for the session, or null if unknown. Recorded usage may change."
+          }
+        },
+        "required": [
+          "metadata",
+          "id",
+          "object",
+          "created_at",
+          "last_active_at",
+          "status",
+          "required_actions",
+          "error",
+          "agent",
+          "environment",
+          "vault_ids",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "A Managed Agents session."
+      },
+      "SessionListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "AgentToolConfigParamFunction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `function`."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The name of the function."
+          },
+          "description": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A description of what the function does."
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "A JSON Schema object describing the function's arguments."
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether this function is deferred and discovered through tool search. Defaults to `false`."
+          }
+        },
+        "required": [
+          "type",
+          "name",
+          "description",
+          "parameters"
+        ],
+        "additionalProperties": false,
+        "description": "A function defined by the application."
+      },
+      "AgentToolConfigParamToolSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search"
+            ],
+            "default": "tool_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `tool_search`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Discovers deferred function tools and loads them into the model context."
+      },
+      "AgentToolConfigParamProgrammaticToolCalling": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `programmatic_tool_calling`."
+          },
+          "enabled": {
+            "type": "boolean",
+            "default": true,
+            "description": "Whether tools can be called from model-generated code. Defaults to `true`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Enables calling tools from model-generated code."
+      },
+      "McpTransportConfigParamHttp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http"
+            ],
+            "default": "http",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `http`."
+          },
+          "server_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The URL of the MCP server."
+          },
+          "authorization": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The authorization value sent to the MCP server, if any."
+          },
+          "headers": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Additional HTTP headers sent to the MCP server."
+          }
+        },
+        "required": [
+          "type",
+          "server_url"
+        ],
+        "additionalProperties": false,
+        "description": "Connects to an MCP server over HTTP."
+      },
+      "McpTransportConfigParamStdio": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "stdio"
+            ],
+            "default": "stdio",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `stdio`."
+          },
+          "command": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The command used to start the MCP server."
+          },
+          "args": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Arguments passed to the MCP server command."
+          },
+          "cwd": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The working directory used to start the MCP server."
+          },
+          "env": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Environment variables set for the MCP server process."
+          },
+          "env_vars": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Environment variable names to inherit from the selected execution environment."
+          }
+        },
+        "required": [
+          "type",
+          "command",
+          "cwd"
+        ],
+        "additionalProperties": false,
+        "description": "Starts an MCP server as a local process."
+      },
+      "McpTransportConfigParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/McpTransportConfigParamHttp"
+          },
+          {
+            "$ref": "#/components/schemas/McpTransportConfigParamStdio"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "http": "#/components/schemas/McpTransportConfigParamHttp",
+            "stdio": "#/components/schemas/McpTransportConfigParamStdio"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "http",
+          "stdio"
+        ],
+        "description": "The transport used to connect to an MCP server."
+      },
+      "AgentToolConfigParamMcp": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "default": "mcp",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp`."
+          },
+          "server_label": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A label used to identify the MCP server in tool calls."
+          },
+          "credential_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The attached vault credential used to authenticate this MCP server. Optional when exactly one attached credential matches the server URL."
+          },
+          "transport": {
+            "$ref": "#/components/schemas/McpTransportConfigParam",
+            "description": "The transport used to connect to the MCP server."
+          },
+          "request_metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {},
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Metadata included with requests to this MCP server."
+          },
+          "allowed_tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The MCP tools the agent may call. All server tools are allowed when omitted."
+          },
+          "required": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether this MCP server must initialize before the first turn. Defaults to `false`."
+          },
+          "connection_origin": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/McpConnectionOriginParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Selects where outbound MCP HTTP connections originate. Omitted or `service` uses the Managed Agents service network; `environment` uses the session's selected environment."
+          }
+        },
+        "required": [
+          "type",
+          "server_label",
+          "transport"
+        ],
+        "additionalProperties": false,
+        "description": "Tools provided by a remote MCP server."
+      },
+      "AgentToolConfigParamWebSearch": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search"
+            ],
+            "default": "web_search",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `web_search`."
+          },
+          "mode": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchModeParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The source used for web search results. Defaults to `live`."
+          },
+          "context_size": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchContextSizeParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The amount of search context made available to the model. Defaults to `medium`."
+          },
+          "allowed_domains": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Domains the search may include."
+          },
+          "location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/WebSearchLocationParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Approximate location used to localize search results."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Web search."
+      },
+      "AgentToolConfigParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamFunction"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamToolSearch"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamProgrammaticToolCalling"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamMcp"
+          },
+          {
+            "$ref": "#/components/schemas/AgentToolConfigParamWebSearch"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "function": "#/components/schemas/AgentToolConfigParamFunction",
+            "tool_search": "#/components/schemas/AgentToolConfigParamToolSearch",
+            "programmatic_tool_calling": "#/components/schemas/AgentToolConfigParamProgrammaticToolCalling",
+            "mcp": "#/components/schemas/AgentToolConfigParamMcp",
+            "web_search": "#/components/schemas/AgentToolConfigParamWebSearch"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "function",
+          "tool_search",
+          "programmatic_tool_calling",
+          "mcp",
+          "web_search"
+        ],
+        "description": "A tool available to the agent."
+      },
+      "SessionAgentConfigParam": {
+        "type": "object",
+        "properties": {
+          "model": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The model to use for the agent. The requested model name is preserved."
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ReasoningParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for model reasoning. Omit to keep the current settings; pass `null` to reset to the model's default effort."
+          },
+          "text": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TextParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for text generated by the agent."
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ServiceTierParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The service tier used for model requests."
+          },
+          "instructions": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Additional instructions appended to the agent's default base instructions. Omit to leave unchanged."
+          },
+          "multi_agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MultiAgentConfigCurrentParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Configuration for creating and coordinating subagents."
+          },
+          "tools": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/AgentToolConfigParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Tools available to the agent. Omit to inherit, or pass null to clear them."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Agent configuration for a session. Omitted fields inherit from `agent_id` when supplied. Supplied objects and arrays replace the whole field; null resets nullable fields."
+      },
+      "EnvironmentParamNone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "none"
+            ],
+            "default": "none",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `none`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Runs the agent without an execution environment."
+      },
+      "EnvironmentParamOpenaiHosted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "openai_hosted"
+            ],
+            "default": "openai_hosted",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `openai_hosted`."
+          },
+          "packages": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/EnvironmentPackagesParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Packages to install in the environment. Defaults to empty package lists."
+          },
+          "setup_commands": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/SetupCommandParam"
+            },
+            "minItems": 0,
+            "maxItems": 16,
+            "description": "Ordered, confidential setup commands. Command bodies are never returned."
+          },
+          "network": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/NetworkPolicyParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Network access policy for the environment. Defaults to enabled."
+          },
+          "env": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Environment variables made available to the agent."
+          },
+          "capability_directories": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Directories that contain capabilities exposed to the agent. Defaults to an empty list."
+          },
+          "skills": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedSkillParam"
+            },
+            "minItems": 0,
+            "maxItems": 200,
+            "description": "Skills referenced by ID or provided as inline ZIP archives. Defaults to an empty list."
+          },
+          "plugins": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedPluginParam"
+            },
+            "minItems": 0,
+            "maxItems": 32,
+            "description": "Plugins provided as inline ZIP archives. Defaults to an empty list."
+          },
+          "files": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "$ref": "#/components/schemas/HostedEnvironmentFileParam"
+            },
+            "minItems": 0,
+            "maxItems": 50,
+            "description": "Files available before the agent starts. Defaults to an empty list."
+          },
+          "environment_template_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 64,
+            "description": "A reusable hosted template applied before inline session configuration. Omitted fields inherit the template; network overrides cannot broaden its policy."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "An OpenAI-hosted environment, optionally based on a reusable template."
+      },
+      "EnvironmentParamSelfHosted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "self_hosted"
+            ],
+            "default": "self_hosted",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `self_hosted`."
+          },
+          "workspace_directory": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Absolute project directory inside the self-hosted environment."
+          },
+          "capability_directories": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "Directories that contain capabilities exposed to the agent. Defaults to an empty list."
+          }
+        },
+        "required": [
+          "type",
+          "workspace_directory"
+        ],
+        "additionalProperties": false,
+        "description": "An application-hosted environment configured inline."
+      },
+      "EnvironmentParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/EnvironmentParamNone"
+          },
+          {
+            "$ref": "#/components/schemas/EnvironmentParamOpenaiHosted"
+          },
+          {
+            "$ref": "#/components/schemas/EnvironmentParamSelfHosted"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "none": "#/components/schemas/EnvironmentParamNone",
+            "openai_hosted": "#/components/schemas/EnvironmentParamOpenaiHosted",
+            "self_hosted": "#/components/schemas/EnvironmentParamSelfHosted"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "none",
+          "openai_hosted",
+          "self_hosted"
+        ],
+        "description": "The execution environment and optional reusable template for a session."
+      },
+      "InputContentParamInputText": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "default": "input_text",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_text`."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The text sent to the model."
+          }
+        },
+        "required": [
+          "type",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Text input to the model."
+      },
+      "InputContentParamInputImage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "default": "input_image",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `input_image`."
+          },
+          "image_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The URL of the image sent to the model."
+          }
+        },
+        "required": [
+          "type",
+          "image_url"
+        ],
+        "additionalProperties": false,
+        "description": "Image input to the model."
+      },
+      "InputContentParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/InputContentParamInputText"
+          },
+          {
+            "$ref": "#/components/schemas/InputContentParamInputImage"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "input_text": "#/components/schemas/InputContentParamInputText",
+            "input_image": "#/components/schemas/InputContentParamInputImage"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "input_text",
+          "input_image"
+        ],
+        "description": "Content included in an input message."
+      },
+      "InputMessageParam": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "default": "message",
+            "x-stainless-const": true,
+            "description": "The type of the input item. Always `message`."
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user"
+            ],
+            "default": "user",
+            "x-stainless-const": true,
+            "description": "The role of the message author. Always `user`."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputContentParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The content of the message."
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ],
+        "additionalProperties": false,
+        "description": "A user message submitted to a session."
+      },
+      "CreateSessionInputParam": {
+        "oneOf": [
+          {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 1048576
+          },
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputMessageParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384
+          }
+        ],
+        "description": "Initial input submitted when creating a session."
+      },
+      "CreateAgentSessionParams": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 512
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "minProperties": 0,
+            "maxProperties": 16,
+            "description": "Up to 16 string key-value pairs, with keys up to 64 and values up to 512 characters. Omission or null defaults to an empty map."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/SessionAgentConfigParam",
+            "description": "Agent configuration. With `agent_id`, supplied fields override the saved agent for this session. Without `agent_id`, `model` is required."
+          },
+          "agent_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 64,
+            "description": "The ID of a saved reusable agent. Omit `agent` to use its configuration unchanged."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/EnvironmentParam",
+            "description": "An inline execution environment or a reference to an environment template."
+          },
+          "vault_ids": {
+            "type": [
+              "array",
+              "null"
+            ],
+            "items": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The IDs of vaults made available to the session."
+          },
+          "input": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/CreateSessionInputParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Initial input to submit when the session is created. A string is shorthand for a single user message. Required when `environment.type` is `none`, or when `stream` is `true` for an environment that is not `self_hosted`; optional for self-hosted and non-streaming execution environments."
+          },
+          "stream": {
+            "type": "boolean",
+            "default": false,
+            "description": "Whether to stream session events as server-sent events. Defaults to `false`."
+          }
+        },
+        "required": [
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Parameters for creating a Managed Agents session."
+      },
+      "SessionErrorResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The error type."
+          },
+          "code": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The machine-readable error code, if any."
+          },
+          "message": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A customer-safe explanation of the error."
+          },
+          "param": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The request parameter associated with the error, if any."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message",
+          "param"
+        ],
+        "additionalProperties": false,
+        "description": "An error payload with the same public fields as Responses API streaming errors."
+      },
+      "SessionEventError": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "error"
+            ],
+            "default": "error",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `error`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "error": {
+            "$ref": "#/components/schemas/SessionErrorResource",
+            "description": "The error that occurred."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn or session fails.",
+        "x-oaiMeta": {
+          "example": {
+            "type": "error",
+            "event_id": "event_123",
+            "session_id": "sess_123",
+            "error": {
+              "type": "server_error",
+              "code": null,
+              "message": "The session failed due to an internal server error.",
+              "param": null
+            }
+          }
+        }
+      },
+      "SessionEnvironmentStatusResource": {
+        "type": "string",
+        "enum": [
+          "pending",
+          "ready",
+          "connected",
+          "disconnected",
+          "failed"
+        ],
+        "x-enumDescriptions": [
+          "The environment is being prepared.",
+          "The environment is ready to connect.",
+          "The environment is connected.",
+          "The environment is disconnected.",
+          "The environment failed to connect."
+        ],
+        "description": "The connection status of a session environment."
+      },
+      "SessionEnvironmentErrorResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The error type."
+          },
+          "code": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A machine-readable error code."
+          },
+          "message": {
+            "type": "string",
+            "minLength": 0,
+            "description": "A human-readable error message."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message"
+        ],
+        "additionalProperties": false,
+        "description": "An error reported while preparing a session environment."
+      },
+      "SessionEnvironmentStateResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The public ID of the environment."
+          },
+          "type": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The environment type."
+          },
+          "status": {
+            "$ref": "#/components/schemas/SessionEnvironmentStatusResource",
+            "description": "The environment's connection status."
+          },
+          "error": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/SessionEnvironmentErrorResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The error reported while preparing the environment, if any."
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "status",
+          "error"
+        ],
+        "additionalProperties": false,
+        "description": "The current state of a session environment."
+      },
+      "SessionEventAgentSessionEnvironmentReady": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.ready"
+            ],
+            "default": "agent.session.environment.ready",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.ready`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a hosted session environment is ready to connect."
+      },
+      "SessionEventAgentOutputCommandExecutionOutputDelta": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.output.command_execution_output.delta"
+            ],
+            "default": "agent.output.command_execution_output.delta",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.output.command_execution_output.delta`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the command execution item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "delta": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The output text that was appended."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "delta"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when command execution produces an output delta."
+      },
+      "SessionEventAgentSessionCreated": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.created"
+            ],
+            "default": "agent.session.created",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.created`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The session that was created."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session is created."
+      },
+      "SessionEventAgentSessionTurnCreated": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.created"
+            ],
+            "default": "agent.session.turn.created",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.created`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The turn at the time it was created."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn is created."
+      },
+      "SessionEventAgentSessionTurnInProgress": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.in_progress"
+            ],
+            "default": "agent.session.turn.in_progress",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.in_progress`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The turn at the time it started running."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn starts running."
+      },
+      "SessionEventAgentSessionTurnCompleted": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.completed"
+            ],
+            "default": "agent.session.turn.completed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.completed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The completed turn."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Token usage by the root agent during the turn, when available."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn completes."
+      },
+      "SessionEventAgentSessionTurnFailed": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.failed"
+            ],
+            "default": "agent.session.turn.failed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.failed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The failed turn."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Token usage by the root agent during the turn, when available."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn fails."
+      },
+      "SessionEventAgentSessionTurnCancelled": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.cancelled"
+            ],
+            "default": "agent.session.turn.cancelled",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.cancelled`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event."
+          },
+          "turn": {
+            "$ref": "#/components/schemas/TurnResource",
+            "description": "The cancelled turn."
+          },
+          "usage": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/TokenUsageResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Token usage by the root agent during the turn, when available."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "turn",
+          "usage"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a turn is cancelled."
+      },
+      "SessionEventAgentSessionTurnItemAdded": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.item.added"
+            ],
+            "default": "agent.session.turn.item.added",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.item.added`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "output_index": {
+            "type": [
+              "integer",
+              "null"
+            ],
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output, when the item is agent output."
+          },
+          "item": {
+            "$ref": "#/components/schemas/SessionTurnItemResource",
+            "description": "The item that was added."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "output_index",
+          "item"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an item is added to a turn."
+      },
+      "SessionEventAgentSessionIdle": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.idle"
+            ],
+            "default": "agent.session.idle",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.idle`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The session that became idle."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session becomes idle."
+      },
+      "SessionEventAgentSessionInProgress": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.in_progress"
+            ],
+            "default": "agent.session.in_progress",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.in_progress`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The session that started processing."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session starts processing a turn."
+      },
+      "SessionEventAgentSessionRequiresAction": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.requires_action"
+            ],
+            "default": "agent.session.requires_action",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.requires_action`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The session and its current required actions."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session is waiting for one or more required actions."
+      },
+      "SessionEventAgentSessionFailed": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.failed"
+            ],
+            "default": "agent.session.failed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.failed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session": {
+            "$ref": "#/components/schemas/SessionResource",
+            "description": "The failed session."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session fails."
+      },
+      "SessionEventAgentSessionEnvironmentPending": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.pending"
+            ],
+            "default": "agent.session.environment.pending",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.pending`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted while a session environment is being prepared."
+      },
+      "SessionEventAgentSessionEnvironmentConnected": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.connected"
+            ],
+            "default": "agent.session.environment.connected",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.connected`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session environment connects."
+      },
+      "SessionEventAgentSessionEnvironmentDisconnected": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.disconnected"
+            ],
+            "default": "agent.session.environment.disconnected",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.disconnected`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session environment disconnects."
+      },
+      "SessionEventAgentSessionEnvironmentFailed": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.environment.failed"
+            ],
+            "default": "agent.session.environment.failed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.environment.failed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "environment": {
+            "$ref": "#/components/schemas/SessionEnvironmentStateResource",
+            "description": "The current environment state."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "environment"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a session environment fails."
+      },
+      "SessionEventAgentSessionSubagentCreated": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.subagent.created"
+            ],
+            "default": "agent.session.subagent.created",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.subagent.created`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "subagent": {
+            "$ref": "#/components/schemas/SubagentResource",
+            "description": "The subagent that was created."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "subagent"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a subagent is created."
+      },
+      "SessionEventAgentSessionSubagentActive": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.subagent.active"
+            ],
+            "default": "agent.session.subagent.active",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.subagent.active`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "subagent": {
+            "$ref": "#/components/schemas/SubagentResource",
+            "description": "The subagent that resumed."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "subagent"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a closed subagent successfully resumes."
+      },
+      "SessionEventAgentSessionSubagentClosed": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.subagent.closed"
+            ],
+            "default": "agent.session.subagent.closed",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.subagent.closed`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "subagent": {
+            "$ref": "#/components/schemas/SubagentResource",
+            "description": "The subagent that was closed."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "subagent"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a subagent is closed."
+      },
+      "AssistantMessageItemResource": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "default": "message",
+            "x-stainless-const": true,
+            "description": "The item type. Always `message`."
+          },
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the turn that contains this item."
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "assistant"
+            ],
+            "default": "assistant",
+            "x-stainless-const": true,
+            "description": "The role of the message author. Always `assistant`."
+          },
+          "status": {
+            "$ref": "#/components/schemas/OutputItemStatusResource",
+            "description": "The status of the message."
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/OutputTextResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The content of the message."
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/MessagePhaseResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The phase of the assistant message."
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "turn_id",
+          "role",
+          "status",
+          "content",
+          "phase"
+        ],
+        "additionalProperties": false,
+        "description": "An assistant message produced by the agent."
+      },
+      "AgentOutputItemResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/AssistantMessageItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/ReasoningItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/FunctionCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/McpCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/WebSearchCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CommandExecutionItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CreateSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/SendSubagentInputCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/ResumeSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/WaitForSubagentsCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/InterruptSubagentCallItemResource"
+          },
+          {
+            "$ref": "#/components/schemas/CloseSubagentCallItemResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "message": "#/components/schemas/AssistantMessageItemResource",
+            "reasoning": "#/components/schemas/ReasoningItemResource",
+            "function_call": "#/components/schemas/FunctionCallItemResource",
+            "mcp_call": "#/components/schemas/McpCallItemResource",
+            "web_search_call": "#/components/schemas/WebSearchCallItemResource",
+            "command_execution": "#/components/schemas/CommandExecutionItemResource",
+            "interrupt_subagent_call": "#/components/schemas/InterruptSubagentCallItemResource",
+            "create_subagent_call": "#/components/schemas/CreateSubagentCallItemResource",
+            "send_subagent_input_call": "#/components/schemas/SendSubagentInputCallItemResource",
+            "resume_subagent_call": "#/components/schemas/ResumeSubagentCallItemResource",
+            "wait_for_subagents_call": "#/components/schemas/WaitForSubagentsCallItemResource",
+            "close_subagent_call": "#/components/schemas/CloseSubagentCallItemResource"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "message",
+          "reasoning",
+          "function_call",
+          "mcp_call",
+          "web_search_call",
+          "command_execution",
+          "create_subagent_call",
+          "send_subagent_input_call",
+          "resume_subagent_call",
+          "wait_for_subagents_call",
+          "interrupt_subagent_call",
+          "close_subagent_call"
+        ],
+        "description": "An output item produced by an agent."
+      },
+      "SessionEventAgentSessionTurnItemDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.item.done"
+            ],
+            "default": "agent.session.turn.item.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.item.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the output item in the turn output."
+          },
+          "item": {
+            "$ref": "#/components/schemas/AgentOutputItemResource",
+            "description": "The completed output item."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "output_index",
+          "item"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an output item is complete."
+      },
+      "SessionEventAgentSessionTurnContentPartAdded": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.content_part.added"
+            ],
+            "default": "agent.session.turn.content_part.added",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.content_part.added`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "content_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the content part in the message."
+          },
+          "part": {
+            "$ref": "#/components/schemas/OutputTextResource",
+            "description": "The initial content part."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an output text content part is added."
+      },
+      "SessionEventAgentSessionTurnContentPartDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.content_part.done"
+            ],
+            "default": "agent.session.turn.content_part.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.content_part.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "content_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the content part in the message."
+          },
+          "part": {
+            "$ref": "#/components/schemas/OutputTextResource",
+            "description": "The completed content part."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an output content part is complete."
+      },
+      "SessionEventAgentSessionTurnOutputTextDelta": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.output_text.delta"
+            ],
+            "default": "agent.session.turn.output_text.delta",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.output_text.delta`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "content_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the content part in the message."
+          },
+          "delta": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The text that was appended."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when text is appended to an output text content part."
+      },
+      "SessionEventAgentSessionTurnOutputTextDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.output_text.done"
+            ],
+            "default": "agent.session.turn.output_text.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.output_text.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the message item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "content_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the content part in the message."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The complete output text."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "content_index",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when an output text content part is complete."
+      },
+      "SessionEventAgentSessionTurnReasoningSummaryPartAdded": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.reasoning_summary_part.added"
+            ],
+            "default": "agent.session.turn.reasoning_summary_part.added",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.reasoning_summary_part.added`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "summary_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the summary content part."
+          },
+          "part": {
+            "$ref": "#/components/schemas/SummaryTextResource",
+            "description": "The initial summary part."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "part"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a reasoning summary content part is added."
+      },
+      "SessionEventAgentSessionTurnReasoningSummaryPartDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.reasoning_summary_part.done"
+            ],
+            "default": "agent.session.turn.reasoning_summary_part.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.reasoning_summary_part.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "summary_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the summary part."
+          },
+          "part": {
+            "$ref": "#/components/schemas/SummaryTextResource",
+            "description": "The completed summary part."
+          },
+          "status": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "enum": [
+              "incomplete",
+              null
+            ],
+            "description": "Present as `incomplete` when summary generation was interrupted.",
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "part",
+          "status"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a reasoning summary part is complete."
+      },
+      "SessionEventAgentSessionTurnReasoningSummaryTextDelta": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.reasoning_summary_text.delta"
+            ],
+            "default": "agent.session.turn.reasoning_summary_text.delta",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.reasoning_summary_text.delta`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "summary_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the summary content part."
+          },
+          "delta": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The summary text that was appended."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "delta"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when text is appended to a reasoning summary."
+      },
+      "SessionEventAgentSessionTurnReasoningSummaryTextDone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.turn.reasoning_summary_text.done"
+            ],
+            "default": "agent.session.turn.reasoning_summary_text.done",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.turn.reasoning_summary_text.done`."
+          },
+          "event_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The unique ID of the event."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session associated with the event."
+          },
+          "turn_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the turn associated with the event, when applicable."
+          },
+          "item_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the reasoning item."
+          },
+          "output_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the item in the turn output."
+          },
+          "summary_index": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "maximum": 4294967295,
+            "description": "The index of the summary content part."
+          },
+          "text": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The complete reasoning summary text."
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session_id",
+          "turn_id",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "text"
+        ],
+        "additionalProperties": false,
+        "description": "Emitted when a reasoning summary content part is complete."
+      },
+      "SessionEvent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/SessionEventError"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentReady"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentOutputCommandExecutionOutputDelta"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionCreated"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnCreated"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnInProgress"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnCompleted"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnFailed"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnCancelled"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnItemAdded"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionIdle"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionInProgress"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionRequiresAction"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionFailed"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentPending"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentConnected"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentDisconnected"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionEnvironmentFailed"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionSubagentCreated"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionSubagentActive"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionSubagentClosed"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnItemDone"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnContentPartAdded"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnContentPartDone"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnOutputTextDelta"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnOutputTextDone"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryPartAdded"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryPartDone"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryTextDelta"
+          },
+          {
+            "$ref": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryTextDone"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "error": "#/components/schemas/SessionEventError",
+            "agent.session.environment.ready": "#/components/schemas/SessionEventAgentSessionEnvironmentReady",
+            "agent.output.command_execution_output.delta": "#/components/schemas/SessionEventAgentOutputCommandExecutionOutputDelta",
+            "agent.session.created": "#/components/schemas/SessionEventAgentSessionCreated",
+            "agent.session.turn.created": "#/components/schemas/SessionEventAgentSessionTurnCreated",
+            "agent.session.turn.in_progress": "#/components/schemas/SessionEventAgentSessionTurnInProgress",
+            "agent.session.turn.completed": "#/components/schemas/SessionEventAgentSessionTurnCompleted",
+            "agent.session.turn.failed": "#/components/schemas/SessionEventAgentSessionTurnFailed",
+            "agent.session.turn.cancelled": "#/components/schemas/SessionEventAgentSessionTurnCancelled",
+            "agent.session.turn.item.added": "#/components/schemas/SessionEventAgentSessionTurnItemAdded",
+            "agent.session.idle": "#/components/schemas/SessionEventAgentSessionIdle",
+            "agent.session.in_progress": "#/components/schemas/SessionEventAgentSessionInProgress",
+            "agent.session.requires_action": "#/components/schemas/SessionEventAgentSessionRequiresAction",
+            "agent.session.failed": "#/components/schemas/SessionEventAgentSessionFailed",
+            "agent.session.environment.pending": "#/components/schemas/SessionEventAgentSessionEnvironmentPending",
+            "agent.session.environment.connected": "#/components/schemas/SessionEventAgentSessionEnvironmentConnected",
+            "agent.session.environment.disconnected": "#/components/schemas/SessionEventAgentSessionEnvironmentDisconnected",
+            "agent.session.environment.failed": "#/components/schemas/SessionEventAgentSessionEnvironmentFailed",
+            "agent.session.subagent.created": "#/components/schemas/SessionEventAgentSessionSubagentCreated",
+            "agent.session.subagent.active": "#/components/schemas/SessionEventAgentSessionSubagentActive",
+            "agent.session.subagent.closed": "#/components/schemas/SessionEventAgentSessionSubagentClosed",
+            "agent.session.turn.item.done": "#/components/schemas/SessionEventAgentSessionTurnItemDone",
+            "agent.session.turn.content_part.added": "#/components/schemas/SessionEventAgentSessionTurnContentPartAdded",
+            "agent.session.turn.content_part.done": "#/components/schemas/SessionEventAgentSessionTurnContentPartDone",
+            "agent.session.turn.output_text.delta": "#/components/schemas/SessionEventAgentSessionTurnOutputTextDelta",
+            "agent.session.turn.output_text.done": "#/components/schemas/SessionEventAgentSessionTurnOutputTextDone",
+            "agent.session.turn.reasoning_summary_part.added": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryPartAdded",
+            "agent.session.turn.reasoning_summary_part.done": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryPartDone",
+            "agent.session.turn.reasoning_summary_text.delta": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryTextDelta",
+            "agent.session.turn.reasoning_summary_text.done": "#/components/schemas/SessionEventAgentSessionTurnReasoningSummaryTextDone"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "error",
+          "agent.session.environment.ready",
+          "agent.output.command_execution_output.delta",
+          "agent.session.created",
+          "agent.session.turn.created",
+          "agent.session.turn.in_progress",
+          "agent.session.turn.completed",
+          "agent.session.turn.failed",
+          "agent.session.turn.cancelled",
+          "agent.session.turn.item.added",
+          "agent.session.idle",
+          "agent.session.in_progress",
+          "agent.session.requires_action",
+          "agent.session.failed",
+          "agent.session.environment.pending",
+          "agent.session.environment.connected",
+          "agent.session.environment.disconnected",
+          "agent.session.environment.failed",
+          "agent.session.subagent.created",
+          "agent.session.subagent.active",
+          "agent.session.subagent.closed",
+          "agent.session.turn.item.done",
+          "agent.session.turn.content_part.added",
+          "agent.session.turn.content_part.done",
+          "agent.session.turn.output_text.delta",
+          "agent.session.turn.output_text.done",
+          "agent.session.turn.reasoning_summary_part.added",
+          "agent.session.turn.reasoning_summary_part.done",
+          "agent.session.turn.reasoning_summary_text.delta",
+          "agent.session.turn.reasoning_summary_text.done"
+        ],
+        "description": "An event emitted by a Managed Agents session."
+      },
+      "UpdateAgentSessionParams": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 512
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 64
+            },
+            "minProperties": 0,
+            "maxProperties": 16,
+            "description": "Replaces all metadata. Omit to leave unchanged, or pass null or {} to clear it. Up to 16 string key-value pairs, with keys up to 64 and values up to 512 characters."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Fields to update on an existing session."
+      },
+      "DeletedSessionResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted session."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.session.deleted"
+            ],
+            "default": "agent.session.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.session.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the session has been removed from the public API. Always `true`. Physical cleanup may still be in progress."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "A Managed Agents session removed from the public API. Physical cleanup may continue asynchronously."
+      },
+      "SessionArtifactResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The immutable artifact ID."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.session.artifact"
+            ],
+            "default": "agent.session.artifact",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.session.artifact`."
+          },
+          "session_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the session that owns the artifact."
+          },
+          "environment_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the environment that produced the artifact."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the completed turn that published the artifact."
+          },
+          "path": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The original absolute file path in the execution environment."
+          },
+          "size_bytes": {
+            "type": "integer",
+            "format": "int64",
+            "minimum": 0,
+            "description": "The immutable artifact size in bytes."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the artifact was published."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "session_id",
+          "environment_id",
+          "turn_id",
+          "path",
+          "size_bytes",
+          "created_at"
+        ],
+        "additionalProperties": false,
+        "description": "An immutable file published by a completed hosted session turn."
+      },
+      "SessionArtifactListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionArtifactResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "DeletedSessionArtifactResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted session artifact."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "agent.session.artifact.deleted"
+            ],
+            "default": "agent.session.artifact.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `agent.session.artifact.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the session artifact was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "Confirmation that an immutable session artifact was deleted."
+      },
+      "SessionInputParamAgentSessionInputMessage": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.input.message"
+            ],
+            "default": "agent.session.input.message",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.input.message`."
+          },
+          "input": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputMessageParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The user messages to add to the session."
+          }
+        },
+        "required": [
+          "type",
+          "input"
+        ],
+        "additionalProperties": false,
+        "description": "Adds one or more user messages and starts a turn."
+      },
+      "SessionInputParamAgentSessionInputCancel": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.input.cancel"
+            ],
+            "default": "agent.session.input.cancel",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.input.cancel`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Cancels the session's active turn."
+      },
+      "FunctionCallOutputParam": {
+        "oneOf": [
+          {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576
+          },
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputContentParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384
+          }
+        ],
+        "description": "A function result represented as text or supported model-input content."
+      },
+      "SessionInputParamAgentSessionInputToolResult": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent.session.input.tool_result"
+            ],
+            "default": "agent.session.input.tool_result",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `agent.session.input.tool_result`."
+          },
+          "turn_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The ID of the turn that requested the function call."
+          },
+          "call_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The ID of the function call."
+          },
+          "success": {
+            "type": "boolean",
+            "description": "Whether the function call succeeded."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/FunctionCallOutputParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The function result when the call succeeded."
+          },
+          "error": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The error message when the call failed."
+          }
+        },
+        "required": [
+          "type",
+          "turn_id",
+          "call_id",
+          "success"
+        ],
+        "additionalProperties": false,
+        "description": "Submits the result of a function call."
+      },
+      "SessionInputParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/SessionInputParamAgentSessionInputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/SessionInputParamAgentSessionInputCancel"
+          },
+          {
+            "$ref": "#/components/schemas/SessionInputParamAgentSessionInputToolResult"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "agent.session.input.message": "#/components/schemas/SessionInputParamAgentSessionInputMessage",
+            "agent.session.input.cancel": "#/components/schemas/SessionInputParamAgentSessionInputCancel",
+            "agent.session.input.tool_result": "#/components/schemas/SessionInputParamAgentSessionInputToolResult"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "agent.session.input.message",
+          "agent.session.input.cancel",
+          "agent.session.input.tool_result"
+        ],
+        "description": "Input submitted to an existing session."
+      },
+      "CreateSessionEventsParams": {
+        "type": "object",
+        "properties": {
+          "events": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SessionInputParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384,
+            "description": "The input events to submit to the session."
+          }
+        },
+        "required": [
+          "events"
+        ],
+        "additionalProperties": false,
+        "description": "Input events submitted to an existing session."
+      },
+      "VaultStatusParam": {
+        "type": "string",
+        "enum": [
+          "active",
+          "archived"
+        ],
+        "description": "Whether a vault or credential is active or archived."
+      },
+      "VaultStatusFilterParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/VaultStatusParam"
+          },
+          {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VaultStatusParam"
+            },
+            "minItems": 0,
+            "maxItems": 16384
+          }
+        ],
+        "description": "One or more lifecycle statuses to include when listing vaults or credentials."
+      },
+      "VaultResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the vault."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vault"
+            ],
+            "default": "vault",
+            "x-stainless-const": true,
+            "description": "The object type. Always `vault`."
+          },
+          "name": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The human-readable name of the vault, if set."
+          },
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 0
+            },
+            "minProperties": 0,
+            "description": "Key-value pairs associated with the vault, such as an application or team identifier."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the vault was created."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "name",
+          "metadata",
+          "created_at"
+        ],
+        "additionalProperties": false,
+        "description": "A collection of credentials that agent tools can use to authenticate to MCP servers."
+      },
+      "VaultListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VaultResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "CreateVaultParams": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 1048576,
+            "description": "The name is trimmed before storage. It must contain 1 to 256 UTF-8 bytes after trimming."
+          },
+          "metadata": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "additionalProperties": {
+              "type": "string",
+              "minLength": 0,
+              "maxLength": 1048576
+            },
+            "propertyNames": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 256
+            },
+            "minProperties": 0,
+            "maxProperties": 1024,
+            "description": "Key-value pairs to associate with the vault, such as an application or team identifier."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Parameters for creating a vault to store credentials used by agent tools."
+      },
+      "DeletedVaultResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted vault."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vault.deleted"
+            ],
+            "default": "vault.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `vault.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the resource was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "Confirmation that a vault was deleted."
+      },
+      "McpOauthTokenEndpointAuthResourceNone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "none"
+            ],
+            "default": "none",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `none`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID without a client secret."
+      },
+      "McpOauthTokenEndpointAuthResourceClientSecretBasic": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_basic"
+            ],
+            "default": "client_secret_basic",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_basic`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID and secret using HTTP Basic authentication."
+      },
+      "McpOauthTokenEndpointAuthResourceClientSecretPost": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_post"
+            ],
+            "default": "client_secret_post",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_post`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID and secret in the token request body."
+      },
+      "McpOauthTokenEndpointAuthResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/McpOauthTokenEndpointAuthResourceNone"
+          },
+          {
+            "$ref": "#/components/schemas/McpOauthTokenEndpointAuthResourceClientSecretBasic"
+          },
+          {
+            "$ref": "#/components/schemas/McpOauthTokenEndpointAuthResourceClientSecretPost"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "none": "#/components/schemas/McpOauthTokenEndpointAuthResourceNone",
+            "client_secret_basic": "#/components/schemas/McpOauthTokenEndpointAuthResourceClientSecretBasic",
+            "client_secret_post": "#/components/schemas/McpOauthTokenEndpointAuthResourceClientSecretPost"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "none",
+          "client_secret_basic",
+          "client_secret_post"
+        ],
+        "description": "The client authentication method used for OAuth token refresh."
+      },
+      "McpOauthRefreshResource": {
+        "type": "object",
+        "properties": {
+          "token_endpoint": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The HTTPS OAuth token endpoint used for refresh."
+          },
+          "client_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The OAuth client ID used when requesting a new access token."
+          },
+          "resource": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The resource URI sent to the OAuth token endpoint during refresh, if configured."
+          },
+          "scope": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "Space-separated OAuth scopes requested during refresh, if configured."
+          },
+          "token_endpoint_auth": {
+            "$ref": "#/components/schemas/McpOauthTokenEndpointAuthResource",
+            "description": "How the OAuth client authenticates to the token endpoint, excluding its client secret."
+          }
+        },
+        "required": [
+          "token_endpoint",
+          "client_id",
+          "resource",
+          "scope",
+          "token_endpoint_auth"
+        ],
+        "additionalProperties": false,
+        "description": "Configuration used to refresh an MCP OAuth access token, excluding secret values."
+      },
+      "VaultCredentialAuthResourceMcpOauth": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_oauth"
+            ],
+            "default": "mcp_oauth",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp_oauth`."
+          },
+          "mcp_server_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The HTTPS MCP server URL authorized by this credential."
+          },
+          "expires_at": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "When the OAuth access token expires, as an RFC 3339 timestamp, if known."
+          },
+          "refresh": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/McpOauthRefreshResource"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Public refresh metadata without refresh tokens or OAuth client secrets."
+          }
+        },
+        "required": [
+          "type",
+          "mcp_server_url",
+          "expires_at",
+          "refresh"
+        ],
+        "additionalProperties": false,
+        "description": "Public metadata for an OAuth credential; tokens and client secrets are never returned."
+      },
+      "VaultCredentialAuthResourceStaticBearer": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "static_bearer"
+            ],
+            "default": "static_bearer",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `static_bearer`."
+          },
+          "mcp_server_url": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The HTTPS MCP server URL authorized by this credential."
+          }
+        },
+        "required": [
+          "type",
+          "mcp_server_url"
+        ],
+        "additionalProperties": false,
+        "description": "Metadata for a bearer-token credential, without automatic OAuth refresh."
+      },
+      "VaultCredentialAuthResource": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/VaultCredentialAuthResourceMcpOauth"
+          },
+          {
+            "$ref": "#/components/schemas/VaultCredentialAuthResourceStaticBearer"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "mcp_oauth": "#/components/schemas/VaultCredentialAuthResourceMcpOauth",
+            "static_bearer": "#/components/schemas/VaultCredentialAuthResourceStaticBearer"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "mcp_oauth",
+          "static_bearer"
+        ],
+        "description": "The MCP server and authentication configuration of a vault credential, excluding secrets."
+      },
+      "VaultCredentialResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the credential."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vault.credential"
+            ],
+            "default": "vault.credential",
+            "x-stainless-const": true,
+            "description": "The object type. Always `vault.credential`."
+          },
+          "vault_id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the vault containing this credential."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The human-readable name of the credential."
+          },
+          "auth": {
+            "$ref": "#/components/schemas/VaultCredentialAuthResource",
+            "description": "The authentication method and non-secret configuration for the MCP server."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the credential was created."
+          },
+          "updated_at": {
+            "type": "integer",
+            "format": "int64",
+            "description": "The Unix timestamp, in seconds, when the credential was last updated."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "vault_id",
+          "name",
+          "auth",
+          "created_at",
+          "updated_at"
+        ],
+        "additionalProperties": false,
+        "description": "Metadata for a stored MCP server credential. Secret values are never returned."
+      },
+      "VaultCredentialListResource": {
+        "type": "object",
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "list"
+            ],
+            "default": "list",
+            "x-stainless-const": true,
+            "description": "The object type, which is always `list`."
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/VaultCredentialResource"
+            },
+            "minItems": 0,
+            "maxItems": 2000,
+            "description": "The resources returned in this page, in the requested sort order."
+          },
+          "first_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the first resource in `data`, or `null` if the page is empty."
+          },
+          "last_id": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "description": "The ID of the last resource in `data`, or `null` if the page is empty. Pass this as `after` with the same order and filters."
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more resources to retrieve after this page."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "first_id",
+          "last_id",
+          "has_more"
+        ],
+        "additionalProperties": false,
+        "description": "A page of Agents API resources, with IDs for retrieving additional pages."
+      },
+      "CreateMcpOauthTokenEndpointAuthParamNone": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "none"
+            ],
+            "default": "none",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `none`."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID without a client secret."
+      },
+      "CreateMcpOauthTokenEndpointAuthParamClientSecretBasic": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_basic"
+            ],
+            "default": "client_secret_basic",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_basic`."
+          },
+          "client_secret": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The OAuth client secret to store. Never returned in credential resources."
+          }
+        },
+        "required": [
+          "type",
+          "client_secret"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID and secret using HTTP Basic authentication."
+      },
+      "CreateMcpOauthTokenEndpointAuthParamClientSecretPost": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_post"
+            ],
+            "default": "client_secret_post",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_post`."
+          },
+          "client_secret": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The OAuth client secret to store. Never returned in credential resources."
+          }
+        },
+        "required": [
+          "type",
+          "client_secret"
+        ],
+        "additionalProperties": false,
+        "description": "Sends the client ID and secret in the token request body."
+      },
+      "CreateMcpOauthTokenEndpointAuthParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamNone"
+          },
+          {
+            "$ref": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamClientSecretBasic"
+          },
+          {
+            "$ref": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamClientSecretPost"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "none": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamNone",
+            "client_secret_basic": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamClientSecretBasic",
+            "client_secret_post": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParamClientSecretPost"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "none",
+          "client_secret_basic",
+          "client_secret_post"
+        ],
+        "description": "Client authentication credentials for OAuth token refresh."
+      },
+      "CreateMcpOauthRefreshParam": {
+        "type": "object",
+        "properties": {
+          "token_endpoint": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The HTTPS OAuth token endpoint used to exchange the refresh token for a new access token."
+          },
+          "client_id": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The OAuth client ID used when requesting a new access token."
+          },
+          "resource": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The resource URI to send to the OAuth token endpoint during refresh, if required."
+          },
+          "scope": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Space-separated OAuth scopes to request during refresh, if required."
+          },
+          "refresh_token": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The refresh token to store. This secret is never returned in credential resources."
+          },
+          "token_endpoint_auth": {
+            "$ref": "#/components/schemas/CreateMcpOauthTokenEndpointAuthParam",
+            "description": "How the OAuth client authenticates to the token endpoint."
+          }
+        },
+        "required": [
+          "token_endpoint",
+          "client_id",
+          "refresh_token",
+          "token_endpoint_auth"
+        ],
+        "additionalProperties": false,
+        "description": "Configuration for refreshing the access token of an MCP OAuth credential."
+      },
+      "CreateVaultCredentialAuthParamMcpOauth": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_oauth"
+            ],
+            "default": "mcp_oauth",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp_oauth`."
+          },
+          "mcp_server_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The HTTPS MCP server URL authorized by this credential."
+          },
+          "access_token": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A write-only OAuth access token; never returned by credential resources."
+          },
+          "expires_at": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "When the OAuth access token expires, as an RFC 3339 timestamp, if known."
+          },
+          "refresh": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/CreateMcpOauthRefreshParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Optional refresh configuration for an HTTPS OAuth token endpoint."
+          }
+        },
+        "required": [
+          "type",
+          "mcp_server_url",
+          "access_token"
+        ],
+        "additionalProperties": false,
+        "description": "An OAuth credential for an HTTPS MCP destination."
+      },
+      "CreateVaultCredentialAuthParamStaticBearer": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "static_bearer"
+            ],
+            "default": "static_bearer",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `static_bearer`."
+          },
+          "mcp_server_url": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The HTTPS MCP server URL authorized by this credential."
+          },
+          "token": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The bearer token to store. This secret is never returned in credential resources."
+          }
+        },
+        "required": [
+          "type",
+          "mcp_server_url",
+          "token"
+        ],
+        "additionalProperties": false,
+        "description": "A bearer token for an MCP server, without automatic OAuth refresh."
+      },
+      "CreateVaultCredentialAuthParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/CreateVaultCredentialAuthParamMcpOauth"
+          },
+          {
+            "$ref": "#/components/schemas/CreateVaultCredentialAuthParamStaticBearer"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "mcp_oauth": "#/components/schemas/CreateVaultCredentialAuthParamMcpOauth",
+            "static_bearer": "#/components/schemas/CreateVaultCredentialAuthParamStaticBearer"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "mcp_oauth",
+          "static_bearer"
+        ],
+        "description": "Authentication credentials for an MCP server used by agent tools."
+      },
+      "CreateVaultCredentialParams": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 1048576,
+            "description": "The name is trimmed before storage. It must contain 1 to 256 UTF-8 bytes after trimming."
+          },
+          "auth": {
+            "$ref": "#/components/schemas/CreateVaultCredentialAuthParam",
+            "description": "The authentication method and secret values to store for the MCP server."
+          }
+        },
+        "required": [
+          "auth",
+          "name"
+        ],
+        "additionalProperties": false,
+        "description": "Parameters for storing a credential that authorizes access to an MCP server."
+      },
+      "RotateMcpOauthTokenEndpointAuthParamClientSecretBasic": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_basic"
+            ],
+            "default": "client_secret_basic",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_basic`."
+          },
+          "client_secret": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement OAuth client secret. Omit or pass `null` to keep the stored secret. This secret is never returned in resources."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Updates credentials sent using HTTP Basic authentication."
+      },
+      "RotateMcpOauthTokenEndpointAuthParamClientSecretPost": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "client_secret_post"
+            ],
+            "default": "client_secret_post",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `client_secret_post`."
+          },
+          "client_secret": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement OAuth client secret. Omit or pass `null` to keep the stored secret. This secret is never returned in resources."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Updates credentials sent in the token request body."
+      },
+      "RotateMcpOauthTokenEndpointAuthParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParamClientSecretBasic"
+          },
+          {
+            "$ref": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParamClientSecretPost"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "client_secret_basic": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParamClientSecretBasic",
+            "client_secret_post": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParamClientSecretPost"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "client_secret_basic",
+          "client_secret_post"
+        ],
+        "description": "Client-secret updates that preserve the credential's OAuth authentication method."
+      },
+      "RotateMcpOauthRefreshParam": {
+        "type": "object",
+        "properties": {
+          "refresh_token": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement refresh token. Omit or pass `null` to keep the stored token. This secret is never returned in resources."
+          },
+          "scope": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "Replacement space-separated OAuth scopes for refresh requests. Omit to keep the scopes, or pass `null` to stop sending a scope parameter."
+          },
+          "token_endpoint_auth": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/RotateMcpOauthTokenEndpointAuthParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Client-secret updates for the existing token endpoint authentication method."
+          }
+        },
+        "additionalProperties": false,
+        "description": "Updates to an MCP credential's existing OAuth refresh configuration."
+      },
+      "RotateVaultCredentialAuthParamMcpOauth": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_oauth"
+            ],
+            "default": "mcp_oauth",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `mcp_oauth`."
+          },
+          "access_token": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "A write-only replacement OAuth access token."
+          },
+          "expires_at": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement expiry as an RFC 3339 timestamp, or `null` to clear it. Omitting this field preserves the expiry unless a new access token is supplied, in which case the expiry is cleared."
+          },
+          "refresh": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/RotateMcpOauthRefreshParam"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "Optional write-only refresh-token and client-secret updates."
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "additionalProperties": false,
+        "description": "Rotate an OAuth credential for an HTTPS MCP destination."
+      },
+      "RotateVaultCredentialAuthParamStaticBearer": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "static_bearer"
+            ],
+            "default": "static_bearer",
+            "x-stainless-const": true,
+            "description": "The type of the object. Always `static_bearer`."
+          },
+          "token": {
+            "type": "string",
+            "minLength": 0,
+            "maxLength": 1048576,
+            "description": "The replacement bearer token. This secret is never returned in credential resources."
+          }
+        },
+        "required": [
+          "type",
+          "token"
+        ],
+        "additionalProperties": false,
+        "description": "Replace the bearer token for the credential's MCP server."
+      },
+      "RotateVaultCredentialAuthParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/RotateVaultCredentialAuthParamMcpOauth"
+          },
+          {
+            "$ref": "#/components/schemas/RotateVaultCredentialAuthParamStaticBearer"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type",
+          "mapping": {
+            "mcp_oauth": "#/components/schemas/RotateVaultCredentialAuthParamMcpOauth",
+            "static_bearer": "#/components/schemas/RotateVaultCredentialAuthParamStaticBearer"
+          }
+        },
+        "x-oai-discriminator-values": [
+          "mcp_oauth",
+          "static_bearer"
+        ],
+        "description": "Updates to a vault credential without changing its authentication method or MCP server."
+      },
+      "RotateVaultCredentialParams": {
+        "type": "object",
+        "properties": {
+          "auth": {
+            "$ref": "#/components/schemas/RotateVaultCredentialAuthParam",
+            "description": "Replacement values for the credential's existing authentication method."
+          }
+        },
+        "required": [
+          "auth"
+        ],
+        "additionalProperties": false,
+        "description": "Secret, expiry, and OAuth refresh scope updates for an existing vault credential."
+      },
+      "DeletedVaultCredentialResource": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "minLength": 0,
+            "description": "The ID of the deleted credential."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "vault.credential.deleted"
+            ],
+            "default": "vault.credential.deleted",
+            "x-stainless-const": true,
+            "description": "The object type. Always `vault.credential.deleted`."
+          },
+          "deleted": {
+            "type": "boolean",
+            "description": "Whether the resource was deleted. Always `true`."
+          }
+        },
+        "required": [
+          "id",
+          "object",
+          "deleted"
+        ],
+        "additionalProperties": false,
+        "description": "Confirmation that a vault credential was deleted."
+      },
+      "DragPoint": {
+        "properties": {
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate."
+          }
+        },
+        "type": "object",
+        "required": [
+          "x",
+          "y"
+        ],
+        "title": "Coordinate",
+        "description": "An x/y coordinate pair, e.g. `{ x: 100, y: 200 }`."
+      },
+      "LiveSessionAudioFormatPCMParam": {
+        "description": "Raw, mono 16-bit little-endian PCM audio for a Live WebSocket connection.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The audio encoding. Always `audio/pcm`.",
+            "default": "audio/pcm",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "audio/pcm"
+            ]
+          },
+          "rate": {
+            "description": "Audio sample rate in hertz. Live WebSocket PCM audio supports 16000 or 24000 Hz.",
+            "type": "integer",
+            "minimum": 16000,
+            "maximum": 24000,
+            "enum": [
+              16000,
+              24000
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "rate"
+        ]
+      },
+      "LiveSessionAudioFormatPCMUParam": {
+        "description": "Raw, mono G.711 μ-law audio for a Live WebSocket connection.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The audio encoding. Always `audio/pcmu`.",
+            "default": "audio/pcmu",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "audio/pcmu"
+            ]
+          },
+          "rate": {
+            "description": "Audio sample rate in hertz. G.711 audio uses 8000 Hz.",
+            "type": "integer",
+            "minimum": 8000,
+            "maximum": 8000
+          }
+        },
+        "required": [
+          "type",
+          "rate"
+        ]
+      },
+      "LiveSessionAudioFormatPCMAParam": {
+        "description": "Raw, mono G.711 A-law audio for a Live WebSocket connection.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The audio encoding. Always `audio/pcma`.",
+            "default": "audio/pcma",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "audio/pcma"
+            ]
+          },
+          "rate": {
+            "description": "Audio sample rate in hertz. G.711 audio uses 8000 Hz.",
+            "type": "integer",
+            "minimum": 8000,
+            "maximum": 8000
+          }
+        },
+        "required": [
+          "type",
+          "rate"
+        ]
+      },
+      "LiveAudioFormat": {
+        "description": "Audio encoding and sample rate for audio sent and received over a Live WebSocket connection. WebRTC and SIP negotiate their media format separately.",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/LiveSessionAudioFormatPCMParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionAudioFormatPCMUParam"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionAudioFormatPCMAParam"
+          }
+        ]
+      },
+      "LiveInitialSessionAudioParam": {
+        "description": "Startup audio configuration. Only primary WebSockets accept audio.format; WebRTC and SIP negotiate their media format. Voice and format are immutable after startup.",
+        "type": "object",
+        "properties": {
+          "format": {
+            "description": "Audio encoding and sample rate for audio sent and received over a Live WebSocket connection. WebRTC and SIP negotiate their media format separately.",
+            "$ref": "#/components/schemas/LiveAudioFormat"
+          },
+          "output": {
+            "description": "The voice used for speech generated by the Live model.",
+            "$ref": "#/components/schemas/LiveInitialSessionAudioOutputParam"
+          }
+        },
+        "required": []
+      },
+      "LiveSessionCreateParams": {
+        "description": "Initial configuration for a Live session, including its model, conversation instructions, audio, and delegated task handling.",
+        "type": "object",
+        "properties": {
+          "model": {
+            "$ref": "#/components/schemas/ModelIdsLive"
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "description": "Frontend instructions for voice, conversation, interruptions, and when to delegate. Start with the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting); put business rules and tool workflows in a separate [backend prompt](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt). Limited to 16,384 client-supplied tokens. Omitted or blank instructions use server defaults. Immutable after startup.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "input": {
+            "description": "Ordered text-only history supplied before startup. Supports developer, user, and assistant messages with one text part each; at most 128 messages and 8,192 rendered tokens in total.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LiveInitialItem"
+            },
+            "maxItems": 128
+          },
+          "audio": {
+            "description": "Startup audio configuration. Only primary WebSockets accept audio.format; WebRTC and SIP negotiate their media format. Voice and format are immutable after startup.",
+            "$ref": "#/components/schemas/LiveInitialSessionAudioParam"
+          },
+          "delegation": {
+            "anyOf": [
+              {
+                "description": "Who handles tasks delegated by the Live model. Omitted or null selects your application; use `responses` to let the API manage a Responses backend.",
+                "discriminator": {
+                  "propertyName": "type"
+                },
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/LiveClientDelegationParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/LiveResponsesDelegationParam"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "store": {
+            "description": "Whether to store the session for later forking and recording download. Defaults to false for new sessions.",
+            "type": "boolean"
+          },
+          "client": {
+            "description": "Startup-only capabilities for an untrusted frontend attached to a unified WebRTC session. Trusted sideband connections are unaffected.",
+            "$ref": "#/components/schemas/LiveClientConfigParam"
+          }
+        },
+        "required": [
+          "model"
+        ]
+      },
+      "LiveSessionStartEvent": {
+        "description": "Start a Live session on a primary WebSocket. Send this event before other commands and wait for `session.started`.",
+        "example": {
+          "type": "session.start",
+          "event_id": "evt_start_001",
+          "session": {
+            "model": "gpt-live-1",
+            "instructions": "Help the caller plan a restaurant reservation. Confirm details before booking.",
+            "audio": {
+              "format": {
+                "type": "audio/pcm",
+                "rate": 24000
+              },
+              "output": {
+                "voice": "marin"
+              }
+            },
+            "delegation": {
+              "type": "client"
+            }
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.start`.",
+            "default": "session.start",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.start"
+            ]
+          },
+          "session": {
+            "description": "Initial configuration for a primary WebSocket. Send session.start first and wait for session.started before application commands. WebRTC creation already starts the session; do not send this event again on its data channel.",
+            "$ref": "#/components/schemas/LiveSessionCreateParams"
+          }
+        },
+        "required": [
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.start",
+            "event_id": "evt_start_001",
+            "session": {
+              "model": "gpt-live-1",
+              "instructions": "Help the caller plan a restaurant reservation. Confirm details before booking.",
+              "audio": {
+                "format": {
+                  "type": "audio/pcm",
+                  "rate": 24000
+                },
+                "output": {
+                  "voice": "marin"
+                }
+              },
+              "delegation": {
+                "type": "client"
+              }
+            }
+          }
+        }
+      },
+      "LiveSessionUpdateParams": {
+        "description": "Changes to an active Live session. Only delegation backend settings can be updated after startup.",
+        "type": "object",
+        "properties": {
+          "delegation": {
+            "anyOf": [
+              {
+                "description": "Delegation settings to update. The delegation type must match the current session; omitted settings retain their values.",
+                "discriminator": {
+                  "propertyName": "type"
+                },
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/LiveClientDelegationParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/LiveResponsesDelegationUpdateParam"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": []
+      },
+      "LiveSessionUpdateParam": {
+        "description": "Update the delegation settings of an active Live session. The server acknowledges accepted changes with `session.updated`.",
+        "example": {
+          "type": "session.update",
+          "event_id": "evt_update_001",
+          "session": {
+            "delegation": {
+              "type": "responses",
+              "responses": {
+                "instructions": "Check restaurant availability. Ask before confirming a booking.",
+                "max_output_tokens": 1024
+              }
+            }
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.update`.",
+            "default": "session.update",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.update"
+            ]
+          },
+          "session": {
+            "description": "Sparse delegation updates. Omitted settings retain their values. The delegation type cannot change, including resetting Responses delegation to null or client. Model, frontend instructions, audio, and startup input are immutable.",
+            "$ref": "#/components/schemas/LiveSessionUpdateParams"
+          }
+        },
+        "required": [
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.update",
+            "event_id": "evt_update_001",
+            "session": {
+              "delegation": {
+                "type": "responses",
+                "responses": {
+                  "instructions": "Check restaurant availability. Ask before confirming a booking.",
+                  "max_output_tokens": 1024
+                }
+              }
+            }
+          }
+        }
+      },
+      "LiveInputAudioAppendEvent": {
+        "description": "Send audio to a Live session over its primary WebSocket. WebRTC and SIP sessions send audio over their media transport.",
+        "example": {
+          "type": "session.input_audio.append",
+          "audio": "AACAAIAAAIAAAP9/AIAAgA=="
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.input_audio.append`.",
+            "default": "session.input_audio.append",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.input_audio.append"
+            ]
+          },
+          "audio": {
+            "description": "Base64-encoded raw audio in the startup-selected format, without a WAV or other container header. Primary WebSocket only; media transports use their audio track. Audio appends have no acknowledgment. Reflected sideband server events reuse this event type and audio key, with no timestamps or event_id; their audio is always mono PCM16LE at 24 kHz.",
+            "type": "string",
+            "minLength": 1
+          }
+        },
+        "required": [
+          "type",
+          "audio"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.input_audio.append",
+            "audio": "AACAAIAAAIAAAP9/AIAAgA=="
+          }
+        }
+      },
+      "LiveInputAudioMuteParam": {
+        "description": "Mute audio input to the Live model without closing the session. The server acknowledges with `session.input_audio.muted`.",
+        "example": {
+          "type": "session.input_audio.mute",
+          "event_id": "evt_mute_001"
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.input_audio.mute`.",
+            "default": "session.input_audio.mute",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.input_audio.mute"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.input_audio.mute",
+            "event_id": "evt_mute_001"
+          }
+        }
+      },
+      "LiveInputAudioUnmuteParam": {
+        "description": "Resume audio input to a Live model after muting it. The server acknowledges with `session.input_audio.unmuted`.",
+        "example": {
+          "type": "session.input_audio.unmute",
+          "event_id": "evt_unmute_001"
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.input_audio.unmute`.",
+            "default": "session.input_audio.unmute",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.input_audio.unmute"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.input_audio.unmute",
+            "event_id": "evt_unmute_001"
+          }
+        }
+      },
+      "LiveInstructionsAppendParam": {
+        "description": "Append instructions to the Live conversation while it is running, optionally associating them with an existing client delegation.",
+        "example": {
+          "type": "session.instructions.append",
+          "event_id": "evt_instructions_001",
+          "delegation_id": null,
+          "content": "The caller prefers outdoor seating."
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.instructions.append`.",
+            "default": "session.instructions.append",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.instructions.append"
+            ]
+          },
+          "delegation_id": {
+            "anyOf": [
+              {
+                "description": "Required, nullable. Set null for general session context, or use the ID from session.delegation.created for an existing client delegation. Non-null IDs are not accepted with Responses delegation.",
+                "type": "string",
+                "minLength": 1
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "content": {
+            "description": "Instruction text to append, limited to 500 tokens. This is a plain string, not an array of content parts.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "delegation_id",
+          "content"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.instructions.append",
+            "event_id": "evt_instructions_001",
+            "delegation_id": null,
+            "content": "The caller prefers outdoor seating."
+          }
+        }
+      },
+      "LiveThinkingAppendParam": {
+        "description": "Provide silent reasoning or progress context to the Live model, optionally for an existing client delegation.",
+        "example": {
+          "type": "session.thinking.append",
+          "event_id": "evt_thinking_001",
+          "delegation_id": "del_abc123",
+          "content": "Checking availability for two guests at 7 PM."
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.thinking.append`.",
+            "default": "session.thinking.append",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.thinking.append"
+            ]
+          },
+          "delegation_id": {
+            "anyOf": [
+              {
+                "description": "Required, nullable. Set null for general session context, or use the ID from session.delegation.created for an existing client delegation. Non-null IDs are not accepted with Responses delegation.",
+                "type": "string",
+                "minLength": 1
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "content": {
+            "description": "Silent reasoning or progress context, limited to 500 tokens. It does not directly request speech, but can influence later speech and is not a secrecy boundary.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "delegation_id",
+          "content"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.thinking.append",
+            "event_id": "evt_thinking_001",
+            "delegation_id": "del_abc123",
+            "content": "Checking availability for two guests at 7 PM."
+          }
+        }
+      },
+      "LiveCommentaryAppendParam": {
+        "description": "Provide context the Live model can communicate to the user, optionally for an existing client delegation.",
+        "example": {
+          "type": "session.commentary.append",
+          "event_id": "evt_commentary_001",
+          "delegation_id": "del_abc123",
+          "content": "There is an outdoor table for two at 7 PM. Ask whether to reserve it."
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.commentary.append`.",
+            "default": "session.commentary.append",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.commentary.append"
+            ]
+          },
+          "delegation_id": {
+            "anyOf": [
+              {
+                "description": "Required, nullable. Set null for general session context, or use the ID from session.delegation.created for an existing client delegation. Non-null IDs are not accepted with Responses delegation.",
+                "type": "string",
+                "minLength": 1
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "content": {
+            "description": "Speakable context for the Live model, limited to 500 tokens. Use this for a result the model should communicate; use session.thinking.append for silent context.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "delegation_id",
+          "content"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.commentary.append",
+            "event_id": "evt_commentary_001",
+            "delegation_id": "del_abc123",
+            "content": "There is an outdoor table for two at 7 PM. Ask whether to reserve it."
+          }
+        }
+      },
+      "LiveResponseItemCreateParam": {
+        "description": "Add an input item to the Live session’s Responses backend. Requires Responses delegation; use `response.create` to request a response.",
+        "example": {
+          "type": "response.item.create",
+          "event_id": "evt_item_001",
+          "item": {
+            "type": "message",
+            "role": "user",
+            "content": [
+              {
+                "type": "input_text",
+                "text": "Please check for a table for two at 7 PM."
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `response.item.create`.",
+            "default": "response.item.create",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "response.item.create"
+            ]
+          },
+          "item": {
+            "description": "An input item to append to the Responses backend conversation, such as a user message or a function tool result.",
+            "$ref": "#/components/schemas/InputItem"
+          }
+        },
+        "required": [
+          "type",
+          "item"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "response.item.create",
+            "event_id": "evt_item_001",
+            "item": {
+              "type": "message",
+              "role": "user",
+              "content": [
+                {
+                  "type": "input_text",
+                  "text": "Please check for a table for two at 7 PM."
+                }
+              ]
+            }
+          }
+        }
+      },
+      "LiveResponseCreateParam": {
+        "description": "Request a response from the Live session’s Responses backend, or continue a delegated response waiting for tool results. Requires Responses delegation.",
+        "example": {
+          "type": "response.create",
+          "event_id": "evt_response_001"
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `response.create`.",
+            "default": "response.create",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "response.create"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "response.create",
+            "event_id": "evt_response_001"
+          }
+        }
+      },
+      "LiveSessionCloseParam": {
+        "description": "Request that the Live session close. The terminal `session.closed` event contains the close reason and final usage.",
+        "example": {
+          "type": "session.close",
+          "event_id": "evt_close_001"
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.close`.",
+            "default": "session.close",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.close"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.close",
+            "event_id": "evt_close_001"
+          }
+        }
+      },
+      "LiveForkAudioParam": {
+        "description": "Audio format for the new WebSocket connection to a forked Live session. The stored voice is preserved.",
+        "type": "object",
+        "properties": {
+          "format": {
+            "description": "Audio encoding and sample rate for audio sent and received over a Live WebSocket connection. WebRTC and SIP negotiate their media format separately.",
+            "$ref": "#/components/schemas/LiveAudioFormat"
+          }
+        },
+        "required": []
+      },
+      "LiveForkSessionConfigParam": {
+        "description": "Overrides for a stored session after connecting to the fork WebSocket. An empty object inherits the stored configuration; do not supply a new model. audio.format applies only to the new WebSocket connection. client overrides are only supported for WebRTC forks.",
+        "type": "object",
+        "properties": {
+          "audio": {
+            "description": "Audio format for a WebSocket fork. WebRTC forks negotiate their audio format and must omit this field.",
+            "$ref": "#/components/schemas/LiveForkAudioParam"
+          },
+          "delegation": {
+            "description": "Overrides for the stored session’s Responses backend. Only supported when the stored session already uses Responses delegation; the delegation type cannot change.",
+            "$ref": "#/components/schemas/LiveResponsesDelegationUpdateParam"
+          },
+          "store": {
+            "description": "Whether to store the forked session. Omission inherits the stored session's setting.",
+            "type": "boolean"
+          },
+          "client": {
+            "description": "Frontend data-channel permissions for a WebRTC fork. Omitted permissions inherit the stored values. Not supported for WebSocket forks.",
+            "$ref": "#/components/schemas/LiveClientConfigParam"
+          }
+        },
+        "required": []
+      },
+      "LiveForkSessionStartEvent": {
+        "description": "Start a Live session after connecting to a stored session’s fork WebSocket. Send an empty `session` object to use the stored configuration.",
+        "example": {
+          "type": "session.start",
+          "session": {}
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "anyOf": [
+              {
+                "description": "Optional client identifier for correlating this command with a server event's client_event_id or error.client_event_id.",
+                "type": "string",
+                "maxLength": 512
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "description": "The Live client event type. Always `session.start`.",
+            "default": "session.start",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.start"
+            ]
+          },
+          "session": {
+            "description": "Overrides for a stored session after connecting to the fork WebSocket. An empty object inherits the stored configuration; do not supply a new model. audio.format applies only to the new WebSocket connection. client overrides are only supported for WebRTC forks.",
+            "$ref": "#/components/schemas/LiveForkSessionConfigParam"
+          }
+        },
+        "required": [
+          "type",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.start",
+            "session": {}
+          }
+        }
+      },
+      "LiveSessionResourceParam": {
+        "description": "The resolved Live session configuration and server-assigned session metadata.",
+        "type": "object",
+        "properties": {
+          "model": {
+            "$ref": "#/components/schemas/ModelIdsLive"
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "description": "Frontend instructions for voice, conversation, interruptions, and when to delegate. Start with the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting); put business rules and tool workflows in a separate [backend prompt](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt). Limited to 16,384 client-supplied tokens. Omitted or blank instructions use server defaults. Immutable after startup.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "input": {
+            "description": "Ordered text-only history supplied before startup. Supports developer, user, and assistant messages with one text part each; at most 128 messages and 8,192 rendered tokens in total.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LiveInitialItem"
+            },
+            "maxItems": 128
+          },
+          "audio": {
+            "description": "Startup audio configuration. Only primary WebSockets accept audio.format; WebRTC and SIP negotiate their media format. Voice and format are immutable after startup.",
+            "$ref": "#/components/schemas/LiveInitialSessionAudioParam"
+          },
+          "delegation": {
+            "anyOf": [
+              {
+                "description": "Who handles tasks delegated by the Live model. Omitted or null selects your application; use `responses` to let the API manage a Responses backend.",
+                "discriminator": {
+                  "propertyName": "type"
+                },
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/LiveClientDelegationParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/LiveResponsesDelegationParam"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "store": {
+            "description": "Whether to store the session for later forking and recording download. Defaults to false for new sessions.",
+            "type": "boolean"
+          },
+          "client": {
+            "description": "Startup-only capabilities for an untrusted frontend attached to a unified WebRTC session. Trusted sideband connections are unaffected.",
+            "$ref": "#/components/schemas/LiveClientConfigParam"
+          },
+          "id": {
+            "description": "The unique ID of the Live session. Use this ID for sideband connections, forking, and recording download.",
+            "type": "string"
+          },
+          "expires_at": {
+            "description": "The Unix timestamp, in seconds, at which the Live session expires.",
+            "type": "integer"
+          },
+          "status": {
+            "description": "The status of the session snapshot. Always `active`, including the final snapshot in session.closed; use the event type to determine that the session has closed.",
+            "default": "active",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "active"
+            ]
+          }
+        },
+        "required": [
+          "model",
+          "id",
+          "expires_at",
+          "status"
+        ]
+      },
+      "LiveSessionStarted": {
+        "description": "Returned when a Live session has started. Contains the resolved session configuration, including server defaults.",
+        "example": {
+          "type": "session.started",
+          "event_id": "evt_started_001",
+          "client_event_id": "evt_start_001",
+          "session": {
+            "id": "live_abc123",
+            "model": "gpt-live-1",
+            "status": "active",
+            "expires_at": 1788555600,
+            "instructions": "Help the caller plan a restaurant reservation. Confirm details before booking.",
+            "input": [],
+            "audio": {
+              "format": {
+                "type": "audio/pcm",
+                "rate": 24000
+              },
+              "output": {
+                "voice": "marin"
+              }
+            },
+            "delegation": {
+              "type": "client"
+            }
+          }
+        },
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The event type, always `session.started`.",
+            "default": "session.started",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.started"
+            ]
+          },
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "session": {
+            "$ref": "#/components/schemas/LiveSessionResourceParam"
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.started",
+            "event_id": "evt_started_001",
+            "client_event_id": "evt_start_001",
+            "session": {
+              "id": "live_abc123",
+              "model": "gpt-live-1",
+              "status": "active",
+              "expires_at": 1788555600,
+              "instructions": "Help the caller plan a restaurant reservation. Confirm details before booking.",
+              "input": [],
+              "audio": {
+                "format": {
+                  "type": "audio/pcm",
+                  "rate": 24000
+                },
+                "output": {
+                  "voice": "marin"
+                }
+              },
+              "delegation": {
+                "type": "client"
+              }
+            }
+          }
+        }
+      },
+      "LiveSessionUpdated": {
+        "description": "Returned when a Live session update is accepted. Contains the resolved session configuration after the update.",
+        "example": {
+          "type": "session.updated",
+          "event_id": "evt_updated_001",
+          "client_event_id": "evt_update_001",
+          "session": {
+            "id": "live_def456",
+            "model": "gpt-live-1",
+            "status": "active",
+            "expires_at": 1788555600,
+            "instructions": "Help the caller plan a restaurant reservation. Confirm details before booking.",
+            "input": [],
+            "audio": {
+              "format": {
+                "type": "audio/pcm",
+                "rate": 24000
+              },
+              "output": {
+                "voice": "marin"
+              }
+            },
+            "delegation": {
+              "type": "responses",
+              "responses": {
+                "model": "gpt-6-astra",
+                "instructions": "Check restaurant availability. Ask before confirming a booking.",
+                "max_output_tokens": 1024,
+                "tools": []
+              }
+            }
+          }
+        },
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The event type, always `session.updated`.",
+            "default": "session.updated",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.updated"
+            ]
+          },
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "session": {
+            "$ref": "#/components/schemas/LiveSessionResourceParam"
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "session"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.updated",
+            "event_id": "evt_updated_001",
+            "client_event_id": "evt_update_001",
+            "session": {
+              "id": "live_def456",
+              "model": "gpt-live-1",
+              "status": "active",
+              "expires_at": 1788555600,
+              "instructions": "Help the caller plan a restaurant reservation. Confirm details before booking.",
+              "input": [],
+              "audio": {
+                "format": {
+                  "type": "audio/pcm",
+                  "rate": 24000
+                },
+                "output": {
+                  "voice": "marin"
+                }
+              },
+              "delegation": {
+                "type": "responses",
+                "responses": {
+                  "model": "gpt-6-astra",
+                  "instructions": "Check restaurant availability. Ask before confirming a booking.",
+                  "max_output_tokens": 1024,
+                  "tools": []
+                }
+              }
+            }
+          }
+        }
+      },
+      "LiveInputAudioMuted": {
+        "description": "Returned when a session.input_audio.mute command is accepted. Input audio is no longer sent to the model; sideband audio reflection continues.",
+        "example": {
+          "type": "session.input_audio.muted",
+          "event_id": "evt_muted_001",
+          "client_event_id": "evt_mute_001"
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `session.input_audio.muted`.",
+            "default": "session.input_audio.muted",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.input_audio.muted"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.input_audio.muted",
+            "event_id": "evt_muted_001",
+            "client_event_id": "evt_mute_001"
+          }
+        }
+      },
+      "LiveInputAudioUnmuted": {
+        "description": "Returned when a session.input_audio.unmute command is accepted. Input audio is sent to the model again.",
+        "example": {
+          "type": "session.input_audio.unmuted",
+          "event_id": "evt_unmuted_001",
+          "client_event_id": "evt_unmute_001"
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `session.input_audio.unmuted`.",
+            "default": "session.input_audio.unmuted",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.input_audio.unmuted"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.input_audio.unmuted",
+            "event_id": "evt_unmuted_001",
+            "client_event_id": "evt_unmute_001"
+          }
+        }
+      },
+      "LiveInstructionsAppended": {
+        "description": "Returned when a session.instructions.append command is accepted into the Live session timeline. Acknowledges the appended instructions without guaranteeing that the model has acted on them.",
+        "example": {
+          "type": "session.instructions.appended",
+          "event_id": "evt_instructions_002",
+          "client_event_id": "evt_instructions_001",
+          "start_ms": 1200,
+          "end_ms": 1400
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "start_ms": {
+            "description": "The start of this event on the Live session timeline, in milliseconds from the beginning of the session.",
+            "type": "integer"
+          },
+          "end_ms": {
+            "description": "The end of this event on the Live session timeline, in milliseconds from the beginning of the session. For appended context, this can equal start_ms.",
+            "type": "integer"
+          },
+          "type": {
+            "description": "The event type, always `session.instructions.appended`.",
+            "default": "session.instructions.appended",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.instructions.appended"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "start_ms",
+          "end_ms",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.instructions.appended",
+            "event_id": "evt_instructions_002",
+            "client_event_id": "evt_instructions_001",
+            "start_ms": 1200,
+            "end_ms": 1400
+          }
+        }
+      },
+      "LiveThinkingAppended": {
+        "description": "Returned when a session.thinking.append command is accepted into the Live session timeline. Acknowledges the added reasoning context without guaranteeing any spoken output.",
+        "example": {
+          "type": "session.thinking.appended",
+          "event_id": "evt_thinking_002",
+          "client_event_id": "evt_thinking_001",
+          "start_ms": 4600,
+          "end_ms": 4800
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "start_ms": {
+            "description": "The start of this event on the Live session timeline, in milliseconds from the beginning of the session.",
+            "type": "integer"
+          },
+          "end_ms": {
+            "description": "The end of this event on the Live session timeline, in milliseconds from the beginning of the session. For appended context, this can equal start_ms.",
+            "type": "integer"
+          },
+          "type": {
+            "description": "The event type, always `session.thinking.appended`.",
+            "default": "session.thinking.appended",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.thinking.appended"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "start_ms",
+          "end_ms",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.thinking.appended",
+            "event_id": "evt_thinking_002",
+            "client_event_id": "evt_thinking_001",
+            "start_ms": 4600,
+            "end_ms": 4800
+          }
+        }
+      },
+      "LiveCommentaryAppended": {
+        "description": "Returned when a session.commentary.append command is accepted into the Live session timeline. Acknowledges the added commentary without guaranteeing exact wording or completed audio playback.",
+        "example": {
+          "type": "session.commentary.appended",
+          "event_id": "evt_commentary_002",
+          "client_event_id": "evt_commentary_001",
+          "start_ms": 5200,
+          "end_ms": 5400
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "start_ms": {
+            "description": "The start of this event on the Live session timeline, in milliseconds from the beginning of the session.",
+            "type": "integer"
+          },
+          "end_ms": {
+            "description": "The end of this event on the Live session timeline, in milliseconds from the beginning of the session. For appended context, this can equal start_ms.",
+            "type": "integer"
+          },
+          "type": {
+            "description": "The event type, always `session.commentary.appended`.",
+            "default": "session.commentary.appended",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.commentary.appended"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "start_ms",
+          "end_ms",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.commentary.appended",
+            "event_id": "evt_commentary_002",
+            "client_event_id": "evt_commentary_001",
+            "start_ms": 5200,
+            "end_ms": 5400
+          }
+        }
+      },
+      "LiveInputAudioAppend": {
+        "description": "Input audio received from the primary transport and reflected to a Live sideband connection before model-input muting.",
+        "example": {
+          "type": "session.input_audio.append",
+          "audio": "AACAAIAAAIAAAP9/AIAAgA=="
+        },
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The event type, always `session.input_audio.append`.",
+            "default": "session.input_audio.append",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.input_audio.append"
+            ]
+          },
+          "audio": {
+            "description": "Base64-encoded raw mono PCM16LE at 24 kHz received from the primary transport, reflected to the sideband before model-input muting. This server event uses the same audio key as the client command, but is not an acknowledgment of it.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "audio"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.input_audio.append",
+            "audio": "AACAAIAAAIAAAP9/AIAAgA=="
+          }
+        }
+      },
+      "LiveOutputAudioDelta": {
+        "description": "An audio chunk generated by the Live model. Decode and play primary WebSocket chunks in delivery order using the configured session audio format. Sideband connections receive reflected output audio with timestamps.",
+        "example": {
+          "type": "session.output_audio.delta",
+          "delta": "AACAAIAAAIAAAP9/AIAAgA==",
+          "start_ms": 1000,
+          "end_ms": 1200
+        },
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The event type, always `session.output_audio.delta`.",
+            "default": "session.output_audio.delta",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.output_audio.delta"
+            ]
+          },
+          "delta": {
+            "description": "Base64-encoded raw audio. Primary WebSocket events use the session's configured format; reflected sideband events use mono PCM16LE at 24 kHz.",
+            "type": "string"
+          },
+          "start_ms": {
+            "description": "Inclusive session-relative start in milliseconds. Required on reflected sideband events; omitted on the primary WebSocket.",
+            "type": "integer"
+          },
+          "end_ms": {
+            "description": "Exclusive session-relative end in milliseconds. Required on reflected sideband events; omitted on the primary WebSocket. Dropped output frames leave gaps between reflected ranges.",
+            "type": "integer"
+          }
+        },
+        "required": [
+          "type",
+          "delta"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.output_audio.delta",
+            "delta": "AACAAIAAAIAAAP9/AIAAgA==",
+            "start_ms": 1000,
+            "end_ms": 1200
+          }
+        }
+      },
+      "LiveInputTranscriptDelta": {
+        "description": "A transcript fragment for user input audio in the Live session. Accumulate fragments in delivery order; these events do not define complete turns or include a transcript-done event.",
+        "example": {
+          "type": "session.input_transcript.delta",
+          "event_id": "evt_input_transcript_001",
+          "delta": "A table for two at seven, please.",
+          "start_ms": 1600,
+          "end_ms": 3400
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "start_ms": {
+            "description": "The start of this event on the Live session timeline, in milliseconds from the beginning of the session.",
+            "type": "integer"
+          },
+          "end_ms": {
+            "description": "The end of this event on the Live session timeline, in milliseconds from the beginning of the session. For appended context, this can equal start_ms.",
+            "type": "integer"
+          },
+          "delta": {
+            "description": "The transcript text fragment for the audio in this time range. Append fragments in delivery order to build the transcript.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `session.input_transcript.delta`.",
+            "default": "session.input_transcript.delta",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.input_transcript.delta"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "start_ms",
+          "end_ms",
+          "delta",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.input_transcript.delta",
+            "event_id": "evt_input_transcript_001",
+            "delta": "A table for two at seven, please.",
+            "start_ms": 1600,
+            "end_ms": 3400
+          }
+        }
+      },
+      "LiveOutputTranscriptDelta": {
+        "description": "A transcript fragment for assistant output audio in the Live session. Accumulate fragments in delivery order; these events do not define complete turns or include a transcript-done event.",
+        "example": {
+          "type": "session.output_transcript.delta",
+          "event_id": "evt_output_transcript_001",
+          "delta": "Would you like me to reserve that table?",
+          "start_ms": 5400,
+          "end_ms": 7200
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "start_ms": {
+            "description": "The start of this event on the Live session timeline, in milliseconds from the beginning of the session.",
+            "type": "integer"
+          },
+          "end_ms": {
+            "description": "The end of this event on the Live session timeline, in milliseconds from the beginning of the session. For appended context, this can equal start_ms.",
+            "type": "integer"
+          },
+          "delta": {
+            "description": "The transcript text fragment for the audio in this time range. Append fragments in delivery order to build the transcript.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `session.output_transcript.delta`.",
+            "default": "session.output_transcript.delta",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.output_transcript.delta"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "start_ms",
+          "end_ms",
+          "delta",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.output_transcript.delta",
+            "event_id": "evt_output_transcript_001",
+            "delta": "Would you like me to reserve that table?",
+            "start_ms": 5400,
+            "end_ms": 7200
+          }
+        }
+      },
+      "LiveDelegationItem": {
+        "description": "Metadata for work delegated by the Live model. Client delegations are handled by your application; Responses delegations run on the configured backend.",
+        "type": "object",
+        "properties": {
+          "id": {
+            "description": "The unique ID of the delegation. Use this as delegation_id when replying to client-owned work or correlating Responses events.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The object type, always `delegation`.",
+            "default": "delegation",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "delegation"
+            ]
+          },
+          "target": {
+            "description": "Where the Live model delegated the work: `client` for your application, or `responses` for the configured Responses backend.",
+            "oneOf": [
+              {
+                "default": "client",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "client"
+                ]
+              },
+              {
+                "default": "responses",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "responses"
+                ]
+              }
+            ]
+          },
+          "response_id": {
+            "description": "The ID of the Responses API response associated with a Responses delegation. Omitted for client delegations.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "target"
+        ]
+      },
+      "LiveDelegationCreated": {
+        "description": "Returned when the Live model delegates work to your application or a Responses backend. Contains delegation metadata and the position on the session timeline where the work was delegated.",
+        "example": {
+          "type": "session.delegation.created",
+          "event_id": "evt_delegation_001",
+          "offset_ms": 3600,
+          "delegation": {
+            "id": "del_abc123",
+            "type": "delegation",
+            "target": "client"
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `session.delegation.created`.",
+            "default": "session.delegation.created",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.delegation.created"
+            ]
+          },
+          "offset_ms": {
+            "description": "The position on the Live session timeline where the delegation was created, in milliseconds from the beginning of the session.",
+            "type": "integer"
+          },
+          "delegation": {
+            "description": "The delegated work identifier and destination. This object contains metadata, not the task text.",
+            "$ref": "#/components/schemas/LiveDelegationItem"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "offset_ms",
+          "delegation"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.delegation.created",
+            "event_id": "evt_delegation_001",
+            "offset_ms": 3600,
+            "delegation": {
+              "id": "del_abc123",
+              "type": "delegation",
+              "target": "client"
+            }
+          }
+        }
+      },
+      "LiveResponseEvent": {
+        "description": "A streaming Responses API event from a backend delegated to by the Live session. Use the outer delegation_id to associate the nested stream with its Live delegation.",
+        "example": {
+          "type": "response.event",
+          "event_id": "evt_response_002",
+          "delegation_id": "del_responses123",
+          "event": {
+            "type": "response.output_text.delta",
+            "item_id": "msg_abc123",
+            "output_index": 0,
+            "content_index": 0,
+            "delta": "An outdoor table is available at 7 PM.",
+            "sequence_number": 3,
+            "logprobs": []
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `response.event`.",
+            "default": "response.event",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "response.event"
+            ]
+          },
+          "delegation_id": {
+            "anyOf": [
+              {
+                "description": "The Live delegation associated with the nested Responses event. May be null or omitted when the event cannot be correlated with a delegation.",
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "event": {
+            "description": "The nested Responses streaming event. Dispatch on its type field. Response lifecycle snapshots omit input and clear instructions, tools, and output to keep messages small; consume granular output events for the generated content.",
+            "type": "object",
+            "additionalProperties": {}
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "event"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "response.event",
+            "event_id": "evt_response_002",
+            "delegation_id": "del_responses123",
+            "event": {
+              "type": "response.output_text.delta",
+              "item_id": "msg_abc123",
+              "output_index": 0,
+              "content_index": 0,
+              "delta": "An outdoor table is available at 7 PM.",
+              "sequence_number": 3,
+              "logprobs": []
+            }
+          }
+        }
+      },
+      "LiveSessionUsage": {
+        "description": "Cumulative audio duration for a Live session. Values are totals for the session, not increments to sum across usage events.",
+        "type": "object",
+        "properties": {
+          "seconds": {
+            "description": "The cumulative Live audio duration in seconds. Do not sum this value across usage events.",
+            "type": "number"
+          }
+        },
+        "required": [
+          "seconds"
+        ]
+      },
+      "LiveContextWindowUsage": {
+        "description": "The latest measured context-window usage of the Live model. This is separate from billing usage and delegated Responses token usage.",
+        "type": "object",
+        "properties": {
+          "usage_ratio": {
+            "description": "The latest active context token count divided by the Live model context limit. Can decrease after compaction and may lag between measured audio frames.",
+            "type": "number"
+          }
+        },
+        "required": [
+          "usage_ratio"
+        ]
+      },
+      "LiveSessionUsageUpdated": {
+        "description": "Reports cumulative Live audio usage and, when available, the most recent context-window usage. Delegated Responses token usage is reported separately in response.event events.",
+        "example": {
+          "type": "session.usage.updated",
+          "event_id": "evt_usage_001",
+          "usage": {
+            "seconds": 32.5
+          },
+          "context_window": {
+            "usage_ratio": 0.12
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `session.usage.updated`.",
+            "default": "session.usage.updated",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.usage.updated"
+            ]
+          },
+          "usage": {
+            "description": "The cumulative Live audio usage so far.",
+            "$ref": "#/components/schemas/LiveSessionUsage"
+          },
+          "context_window": {
+            "description": "The latest measured Live context-window usage. Omitted when the context limit is unknown.",
+            "$ref": "#/components/schemas/LiveContextWindowUsage"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "usage"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.usage.updated",
+            "event_id": "evt_usage_001",
+            "usage": {
+              "seconds": 32.5
+            },
+            "context_window": {
+              "usage_ratio": 0.12
+            }
+          }
+        }
+      },
+      "LiveSessionClosed": {
+        "description": "Returned after the Live session finishes finalizing, with the close reason, final session snapshot, and cumulative audio usage. A connection closing without this event does not confirm successful finalization.",
+        "example": {
+          "type": "session.closed",
+          "event_id": "evt_closed_001",
+          "client_event_id": "evt_close_001",
+          "reason": "close_requested",
+          "session": {
+            "id": "live_abc123",
+            "model": "gpt-live-1",
+            "status": "active",
+            "expires_at": 1788555600,
+            "instructions": "Help the caller plan a restaurant reservation. Confirm details before booking.",
+            "input": [],
+            "audio": {
+              "format": {
+                "type": "audio/pcm",
+                "rate": 24000
+              },
+              "output": {
+                "voice": "marin"
+              }
+            },
+            "delegation": {
+              "type": "client"
+            }
+          },
+          "usage": {
+            "seconds": 45.8
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `session.closed`.",
+            "default": "session.closed",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "session.closed"
+            ]
+          },
+          "reason": {
+            "description": "Why the Live session ended: `close_requested` for an application close or hangup request, `expired` for the session duration limit, `content` for a safety filter, `remote_hangup` for a graceful remote disconnect, or `connection_lost` for an unexpected primary or upstream disconnection.",
+            "oneOf": [
+              {
+                "default": "close_requested",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "close_requested"
+                ]
+              },
+              {
+                "default": "expired",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "expired"
+                ]
+              },
+              {
+                "default": "content",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "content"
+                ]
+              },
+              {
+                "default": "remote_hangup",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "remote_hangup"
+                ]
+              },
+              {
+                "default": "connection_lost",
+                "x-stainless-const": true,
+                "type": "string",
+                "enum": [
+                  "connection_lost"
+                ]
+              }
+            ]
+          },
+          "session": {
+            "$ref": "#/components/schemas/LiveSessionResourceParam"
+          },
+          "usage": {
+            "description": "The final cumulative Live audio usage after session finalization.",
+            "$ref": "#/components/schemas/LiveSessionUsage"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "reason",
+          "session",
+          "usage"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "session.closed",
+            "event_id": "evt_closed_001",
+            "client_event_id": "evt_close_001",
+            "reason": "close_requested",
+            "session": {
+              "id": "live_abc123",
+              "model": "gpt-live-1",
+              "status": "active",
+              "expires_at": 1788555600,
+              "instructions": "Help the caller plan a restaurant reservation. Confirm details before booking.",
+              "input": [],
+              "audio": {
+                "format": {
+                  "type": "audio/pcm",
+                  "rate": 24000
+                },
+                "output": {
+                  "voice": "marin"
+                }
+              },
+              "delegation": {
+                "type": "client"
+              }
+            },
+            "usage": {
+              "seconds": 45.8
+            }
+          }
+        }
+      },
+      "LiveLiveError": {
+        "description": "Details of an error encountered by the Live session, including the affected parameter or client command when available.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "description": "The category of error, such as `invalid_request_error` for an invalid Live client command.",
+            "type": "string"
+          },
+          "code": {
+            "description": "A machine-readable code identifying the Live error, such as `unknown_parameter`.",
+            "type": "string"
+          },
+          "message": {
+            "description": "A human-readable explanation of the Live error.",
+            "type": "string"
+          },
+          "param": {
+            "description": "The parameter that caused the error, when applicable, such as `session.voice`.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command that caused the error, when supplied.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "LiveErrorEvent": {
+        "description": "Reports an error in the Live session, such as an invalid client command. Use error.client_event_id, when present, to identify the command that caused the error.",
+        "example": {
+          "type": "error",
+          "event_id": "evt_error_001",
+          "error": {
+            "type": "invalid_request_error",
+            "code": "unknown_parameter",
+            "message": "Unknown parameter: 'session.voice'.",
+            "param": "session.voice",
+            "client_event_id": "evt_invalid_001"
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `error`.",
+            "default": "error",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "error"
+            ]
+          },
+          "error": {
+            "description": "Details of the Live error and the client command that caused it, when known.",
+            "$ref": "#/components/schemas/LiveLiveError"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "error",
+            "event_id": "evt_error_001",
+            "error": {
+              "type": "invalid_request_error",
+              "code": "unknown_parameter",
+              "message": "Unknown parameter: 'session.voice'.",
+              "param": "session.voice",
+              "client_event_id": "evt_invalid_001"
+            }
+          }
+        }
+      },
+      "LiveInfoEvent": {
+        "description": "An informational notice about the Live session, such as the event permissions applied to a frontend data channel.",
+        "example": {
+          "type": "info",
+          "event_id": "evt_info_001",
+          "code": "data_channel_permissions",
+          "message": "The frontend data channel is configured with restricted event permissions."
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "description": "The unique ID of the Live server event.",
+            "type": "string"
+          },
+          "client_event_id": {
+            "description": "The event_id of the client command associated with this server event, when supplied.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The event type, always `info`.",
+            "default": "info",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "info"
+            ]
+          },
+          "code": {
+            "description": "A machine-readable code for the notice, such as `data_channel_permissions`.",
+            "type": "string"
+          },
+          "message": {
+            "description": "A human-readable explanation of the Live session notice.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "event_id",
+          "type",
+          "code",
+          "message"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "info",
+            "event_id": "evt_info_001",
+            "code": "data_channel_permissions",
+            "message": "The frontend data channel is configured with restricted event permissions."
+          }
+        }
+      },
+      "LiveTransportDTMFReceived": {
+        "description": "A SIP DTMF keypress received from the caller. Delivered only to sideband observers.",
+        "example": {
+          "type": "transport.dtmf.received",
+          "event_id": "event_dtmf_1",
+          "event": "5"
+        },
+        "type": "object",
+        "properties": {
+          "type": {
+            "default": "transport.dtmf.received",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "transport.dtmf.received"
+            ]
+          },
+          "event_id": {
+            "type": "string"
+          },
+          "event": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 1,
+            "pattern": "^[0-9A-D*#]$"
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "event"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "transport.dtmf.received",
+            "event_id": "event_dtmf_1",
+            "event": "5"
+          }
+        }
+      },
+      "LiveTransportDTMFSend": {
+        "description": "A SIP DTMF keypress successfully sent by the hosted tool. Delivered only to sideband observers; this is not a client command.",
+        "example": {
+          "type": "transport.dtmf.send",
+          "event_id": "event_dtmf_2",
+          "event": "#"
+        },
+        "type": "object",
+        "properties": {
+          "type": {
+            "default": "transport.dtmf.send",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "transport.dtmf.send"
+            ]
+          },
+          "event_id": {
+            "type": "string"
+          },
+          "event": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 1,
+            "pattern": "^[0-9A-D*#]$"
+          }
+        },
+        "required": [
+          "type",
+          "event_id",
+          "event"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "transport.dtmf.send",
+            "event_id": "event_dtmf_2",
+            "event": "#"
+          }
+        }
+      },
+      "LiveTransportRinging": {
+        "description": "The outbound SIP provider leg is ringing or providing early media. Delivered only to sideband observers.",
+        "example": {
+          "type": "transport.ringing",
+          "event_id": "event_call_1",
+          "session_id": "live_u0_123"
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "type": "string"
+          },
+          "session_id": {
+            "description": "The canonical Live session ID.",
+            "type": "string"
+          },
+          "type": {
+            "default": "transport.ringing",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "transport.ringing"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "session_id",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "transport.ringing",
+            "event_id": "event_call_1",
+            "session_id": "live_u0_123"
+          }
+        }
+      },
+      "LiveTransportAnswered": {
+        "description": "The outbound SIP provider leg answered and media is established. Delivered only to sideband observers.",
+        "example": {
+          "type": "transport.answered",
+          "event_id": "event_call_2",
+          "session_id": "live_u0_123"
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "type": "string"
+          },
+          "session_id": {
+            "description": "The canonical Live session ID.",
+            "type": "string"
+          },
+          "type": {
+            "default": "transport.answered",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "transport.answered"
+            ]
+          }
+        },
+        "required": [
+          "event_id",
+          "session_id",
+          "type"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "transport.answered",
+            "event_id": "event_call_2",
+            "session_id": "live_u0_123"
+          }
+        }
+      },
+      "LiveTransportCallError": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "default": "call_error",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "call_error"
+            ]
+          },
+          "code": {
+            "description": "The call setup failure code.",
+            "type": "string"
+          },
+          "message": {
+            "type": "string"
+          },
+          "param": {
+            "description": "The parameter related to the error, if any. Empty when no parameter applies.",
+            "type": "string"
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "LiveTransportFailed": {
+        "description": "An asynchronous outbound SIP setup failure. Delivered only to sideband observers.",
+        "example": {
+          "type": "transport.failed",
+          "event_id": "event_call_4",
+          "session_id": "live_u0_123",
+          "error": {
+            "type": "call_error",
+            "code": "provider_invite_failed",
+            "message": "provider rejected the call",
+            "param": ""
+          }
+        },
+        "type": "object",
+        "properties": {
+          "event_id": {
+            "type": "string"
+          },
+          "session_id": {
+            "description": "The canonical Live session ID.",
+            "type": "string"
+          },
+          "type": {
+            "default": "transport.failed",
+            "x-stainless-const": true,
+            "type": "string",
+            "enum": [
+              "transport.failed"
+            ]
+          },
+          "error": {
+            "$ref": "#/components/schemas/LiveTransportCallError"
+          }
+        },
+        "required": [
+          "event_id",
+          "session_id",
+          "type",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "example": {
+            "type": "transport.failed",
+            "event_id": "event_call_4",
+            "session_id": "live_u0_123",
+            "error": {
+              "type": "call_error",
+              "code": "provider_invite_failed",
+              "message": "provider rejected the call",
+              "param": ""
+            }
+          }
+        }
+      },
+      "LiveServerEvent-2": {
+        "description": "An event sent by the Live API on a primary WebSocket or sideband connection.",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/LiveSessionStarted"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionUpdated"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioMuted"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioUnmuted"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInstructionsAppended"
+          },
+          {
+            "$ref": "#/components/schemas/LiveThinkingAppended"
+          },
+          {
+            "$ref": "#/components/schemas/LiveCommentaryAppended"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputAudioAppend"
+          },
+          {
+            "$ref": "#/components/schemas/LiveOutputAudioDelta"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInputTranscriptDelta"
+          },
+          {
+            "$ref": "#/components/schemas/LiveOutputTranscriptDelta"
+          },
+          {
+            "$ref": "#/components/schemas/LiveDelegationCreated"
+          },
+          {
+            "$ref": "#/components/schemas/LiveResponseEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionUsageUpdated"
+          },
+          {
+            "$ref": "#/components/schemas/LiveSessionClosed"
+          },
+          {
+            "$ref": "#/components/schemas/LiveErrorEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveInfoEvent"
+          },
+          {
+            "$ref": "#/components/schemas/LiveTransportDTMFReceived"
+          },
+          {
+            "$ref": "#/components/schemas/LiveTransportDTMFSend"
+          },
+          {
+            "$ref": "#/components/schemas/LiveTransportRinging"
+          },
+          {
+            "$ref": "#/components/schemas/LiveTransportAnswered"
+          },
+          {
+            "$ref": "#/components/schemas/LiveTransportFailed"
+          }
+        ]
+      },
+      "UserMessageItemParam": {
+        "properties": {
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this message item.",
+                "example": "msg_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "description": "The item type. Always `message`.",
+            "default": "message",
+            "x-stainless-const": true
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user"
+            ],
+            "description": "The message role. Always `user`.",
+            "default": "user",
+            "x-stainless-const": true
+          },
+          "content": {
+            "oneOf": [
+              {
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/InputTextContentParam"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InputImageContentParamAutoParam"
+                    },
+                    {
+                      "$ref": "#/components/schemas/InputFileContentParam"
+                    }
+                  ],
+                  "description": "A piece of message content, such as text, an image, or a file.",
+                  "discriminator": {
+                    "propertyName": "type"
+                  }
+                },
+                "type": "array"
+              },
+              {
+                "type": "string",
+                "maxLength": 10485760,
+                "description": "The message content, as a single string."
+              }
+            ],
+            "description": "The message content, as an array of content parts."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The status of the message item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "role",
+          "content"
+        ]
+      },
+      "ErrorPayload": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The error type that was emitted."
+          },
+          "code": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The error code that was emitted, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "type": "string",
+            "description": "The human-readable error message that was emitted."
+          },
+          "param": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The parameter name that was associated with the error, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "headers": {
+            "additionalProperties": {
+              "type": "string",
+              "description": "The header value that was emitted."
+            },
+            "type": "object",
+            "description": "The response headers that were emitted with the error, if any.",
+            "x-oaiTypeLabel": "map"
+          },
+          "misalignment": {
+            "$ref": "#/components/schemas/MisalignmentErrorDetailsResource"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "code",
+          "message",
+          "param"
+        ],
+        "title": "Error payload",
+        "description": "An error payload that was emitted for a streaming error event."
+      },
+      "BetaTokenCountsResource": {
+        "properties": {
+          "object": {
+            "type": "string",
+            "enum": [
+              "response.input_tokens"
+            ],
+            "default": "response.input_tokens",
+            "x-stainless-const": true
+          },
+          "input_tokens": {
+            "type": "integer"
+          }
+        },
+        "type": "object",
+        "required": [
+          "object",
+          "input_tokens"
+        ],
+        "title": "Token counts",
+        "example": {
+          "object": "response.input_tokens",
+          "input_tokens": 123
+        }
+      },
+      "BetaTokenCountsBody": {
+        "properties": {
+          "model": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Model ID used to generate the response, like `gpt-4o` or `o3`. OpenAI offers a wide range of models with different capabilities, performance characteristics, and price points. Refer to the [model guide](https://developers.openai.com/api/docs/models) to browse and compare available models."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "input": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "maxLength": 10485760,
+                    "description": "A text input to the model, equivalent to a text input with the `user` role."
+                  },
+                  {
+                    "items": {
+                      "$ref": "#/components/schemas/BetaInputItem"
+                    },
+                    "type": "array",
+                    "maxItems": 131072,
+                    "description": "A list of one or many input items to the model, containing different content types."
+                  }
+                ],
+                "description": "Text, image, or file inputs to the model, used to generate a response"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "previous_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the previous response to the model. Use this to create multi-turn conversations. Learn more about [conversation state](https://developers.openai.com/api/docs/guides/conversation-state). Cannot be used in conjunction with `conversation`.",
+                "example": "resp_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tools": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/BetaTool"
+                },
+                "type": "array",
+                "description": "An array of tools the model may call while generating a response. You can specify which tool to use by setting the `tool_choice` parameter."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "text": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseTextParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "reasoning": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaReasoning",
+                "description": "**gpt-5 and o-series models only** Configuration options for [reasoning models](https://developers.openai.com/api/docs/guides/reasoning)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "truncation": {
+            "$ref": "#/components/schemas/BetaTruncationEnum",
+            "description": "The truncation strategy to use for the model response. - `auto`: If the input to this Response exceeds the model's context window size, the model will truncate the response to fit the context window by dropping items from the beginning of the conversation. - `disabled` (default): If the input size will exceed the context window size for a model, the request will fail with a 400 error.",
+            "deprecated": true
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A system (or developer) message inserted into the model's context.\nWhen used along with `previous_response_id`, the instructions from a previous response will not be carried over to the next response. This makes it simple to swap out system (or developer) messages in new responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "personality": {
+            "$ref": "#/components/schemas/BetaPersonalityEnum",
+            "description": "A model-owned style preset to apply to this request. Omit this parameter to use the model's default style. Supported values may expand over time. Values must be at most 64 characters."
+          },
+          "conversation": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaConversationParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "tool_choice": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolChoiceParam",
+                "description": "Controls which tool the model should use, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parallel_tool_calls": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Whether to allow the model to run tool calls in parallel."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "BetaToolChoiceParam": {
+        "description": "How the model should select which tool (or tools) to use when generating\na response. See the `tools` parameter to see how to specify which tools\nthe model can call.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaToolChoiceOptions"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolChoiceAllowed"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolChoiceTypes"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolChoiceFunction"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolChoiceMCP"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolChoiceCustom"
+          },
+          {
+            "$ref": "#/components/schemas/BetaSpecificProgrammaticToolCallingParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaSpecificApplyPatchParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaSpecificFunctionShellParam"
+          }
+        ]
+      },
+      "BetaSpecificFunctionShellParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell"
+            ],
+            "description": "The tool to call. Always `shell`.",
+            "default": "shell",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Specific shell tool choice",
+        "description": "Forces the model to call the shell tool when a tool call is required."
+      },
+      "BetaSpecificApplyPatchParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch"
+            ],
+            "description": "The tool to call. Always `apply_patch`.",
+            "default": "apply_patch",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Specific apply patch tool choice",
+        "description": "Forces the model to call the apply_patch tool when executing a tool call."
+      },
+      "BetaSpecificProgrammaticToolCallingParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "description": "The tool to call. Always `programmatic_tool_calling`.",
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaToolChoiceCustom": {
+        "type": "object",
+        "title": "Custom tool",
+        "description": "Use this option to force the model to call a specific custom tool.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "description": "For custom tool calling, the type is always `custom`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the custom tool to call."
+          }
+        },
+        "required": [
+          "type",
+          "name"
+        ]
+      },
+      "BetaToolChoiceMCP": {
+        "type": "object",
+        "title": "MCP tool",
+        "description": "Use this option to force the model to call a specific tool on a remote MCP server.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "description": "For MCP tools, the type is always `mcp`.",
+            "x-stainless-const": true
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server to use.\n"
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The name of the tool to call on the server.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "server_label"
+        ]
+      },
+      "BetaToolChoiceFunction": {
+        "type": "object",
+        "title": "Function tool",
+        "description": "Use this option to force the model to call a specific function.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "For function calling, the type is always `function`.",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to call."
+          }
+        },
+        "required": [
+          "type",
+          "name"
+        ]
+      },
+      "BetaToolChoiceTypes": {
+        "type": "object",
+        "title": "Hosted tool",
+        "description": "Indicates that the model should use a built-in tool to generate a response.\n[Learn more about built-in tools](https://developers.openai.com/api/docs/guides/tools).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of hosted tool the model should to use. Learn more about\n[built-in tools](https://developers.openai.com/api/docs/guides/tools).\n\nAllowed values are:\n- `file_search`\n- `web_search_preview`\n- `computer`\n- `computer_use_preview`\n- `computer_use`\n- `code_interpreter`\n- `image_generation`\n",
+            "enum": [
+              "file_search",
+              "web_search_preview",
+              "computer",
+              "computer_use_preview",
+              "computer_use",
+              "web_search_preview_2025_03_11",
+              "image_generation",
+              "code_interpreter"
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaToolChoiceAllowed": {
+        "type": "object",
+        "title": "Allowed tools",
+        "description": "Constrains the tools available to the model to a pre-defined set.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "allowed_tools"
+            ],
+            "description": "Allowed tool configuration type. Always `allowed_tools`.",
+            "x-stainless-const": true
+          },
+          "mode": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "required"
+            ],
+            "description": "Constrains the tools available to the model to a pre-defined set.\n\n`auto` allows the model to pick from among the allowed tools and generate a\nmessage.\n\n`required` requires the model to call one or more of the allowed tools.\n"
+          },
+          "tools": {
+            "type": "array",
+            "description": "A list of tool definitions that the model should be allowed to call.\n\nFor the Responses API, the list of tool definitions might look like:\n```json\n[\n  { \"type\": \"function\", \"name\": \"get_weather\" },\n  { \"type\": \"mcp\", \"server_label\": \"deepwiki\" },\n  { \"type\": \"image_generation\" }\n]\n```\n",
+            "items": {
+              "type": "object",
+              "description": "A tool definition that the model should be allowed to call.\n",
+              "additionalProperties": true,
+              "x-oaiExpandable": false
+            }
+          }
+        },
+        "required": [
+          "type",
+          "mode",
+          "tools"
+        ]
+      },
+      "BetaToolChoiceOptions": {
+        "type": "string",
+        "title": "Tool choice mode",
+        "description": "Controls which (if any) tool is called by the model.\n\n`none` means the model will not call any tool and instead generates a message.\n\n`auto` means the model can pick between generating a message or calling one or\nmore tools.\n\n`required` means the model must call one or more tools.\n",
+        "enum": [
+          "none",
+          "auto",
+          "required"
+        ]
+      },
+      "BetaConversationParam": {
+        "description": "The conversation that this response belongs to. Items from this conversation are prepended to `input_items` for this response request.\nInput items and output items from this response are automatically added to this conversation after this response completes.\n",
+        "default": null,
+        "oneOf": [
+          {
+            "type": "string",
+            "title": "Conversation ID",
+            "description": "The unique ID of the conversation.\n"
+          },
+          {
+            "$ref": "#/components/schemas/BetaConversationParam-2"
+          }
+        ]
+      },
+      "BetaConversationParam-2": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the conversation.",
+            "example": "conv_123"
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "title": "Conversation object",
+        "description": "The conversation that this response belongs to."
+      },
+      "BetaPersonalityEnum": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "friendly",
+              "pragmatic"
+            ]
+          }
+        ]
+      },
+      "BetaTruncationEnum": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "disabled"
+        ]
+      },
+      "BetaReasoning": {
+        "type": "object",
+        "description": "Configuration options for\n[reasoning models](https://developers.openai.com/api/docs/guides/reasoning).\n",
+        "title": "Reasoning",
+        "properties": {
+          "mode": {
+            "$ref": "#/components/schemas/BetaReasoningModeEnum",
+            "description": "Controls the reasoning execution mode for the request.\n\nWhen returned on a response, this is the effective execution mode.\n"
+          },
+          "effort": {
+            "$ref": "#/components/schemas/BetaReasoningEffort"
+          },
+          "summary": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A summary of the reasoning performed by the model. This can be\nuseful for debugging and understanding the model's reasoning process.\nOne of `auto`, `concise`, or `detailed`.\n\n`concise` is supported for `computer-use-preview` models and all reasoning models after `gpt-5`.\n",
+                "enum": [
+                  "auto",
+                  "concise",
+                  "detailed"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "context": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Controls which reasoning items are rendered back to the model on later turns.\nIf omitted or set to `auto`, the model determines the context mode. The\n`gpt-5.6` model family defaults to `all_turns`; earlier models default to\n`current_turn`.\n\nWhen returned on a response, this is the effective reasoning context mode\nused for the response.\n",
+                "enum": [
+                  "auto",
+                  "current_turn",
+                  "all_turns"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "generate_summary": {
+            "anyOf": [
+              {
+                "type": "string",
+                "deprecated": true,
+                "description": "**Deprecated:** use `summary` instead.\n\nA summary of the reasoning performed by the model. This can be\nuseful for debugging and understanding the model's reasoning process.\nOne of `auto`, `concise`, or `detailed`.\n",
+                "enum": [
+                  "auto",
+                  "concise",
+                  "detailed"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        }
+      },
+      "BetaReasoningEffort": {
+        "anyOf": [
+          {
+            "type": "string",
+            "enum": [
+              "none",
+              "minimal",
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max"
+            ],
+            "default": "medium",
+            "description": "Constrains effort on reasoning for reasoning models. Currently supported\nvalues are `none`, `minimal`, `low`, `medium`, `high`, `xhigh`, and `max`.\nReducing reasoning effort can result in faster responses and fewer tokens\nused on reasoning in a response. Not all reasoning models support every\nvalue. See the\n[reasoning guide](https://developers.openai.com/api/docs/guides/reasoning)\nfor model-specific support.\n"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaReasoningModeEnum": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "standard",
+              "pro"
+            ]
+          }
+        ]
+      },
+      "BetaResponseTextParam": {
+        "type": "object",
+        "description": "Configuration options for a text response from the model. Can be plain\ntext or structured JSON data. Learn more:\n- [Text inputs and outputs](https://developers.openai.com/api/docs/guides/text)\n- [Structured Outputs](https://developers.openai.com/api/docs/guides/structured-outputs)\n",
+        "properties": {
+          "format": {
+            "$ref": "#/components/schemas/BetaTextResponseFormatConfiguration"
+          },
+          "verbosity": {
+            "$ref": "#/components/schemas/BetaVerbosity"
+          }
+        }
+      },
+      "BetaVerbosity": {
+        "anyOf": [
+          {
+            "type": "string",
+            "enum": [
+              "low",
+              "medium",
+              "high"
+            ],
+            "default": "medium",
+            "description": "Constrains the verbosity of the model's response. Lower values will result in\nmore concise responses, while higher values will result in more verbose responses.\nCurrently supported values are `low`, `medium`, and `high`. The default is\n`medium`.\n"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaTextResponseFormatConfiguration": {
+        "description": "An object specifying the format that the model must output.\n\nConfiguring `{ \"type\": \"json_schema\" }` enables Structured Outputs,\nwhich ensures the model will match your supplied JSON schema. Learn more in the\n[Structured Outputs guide](https://developers.openai.com/api/docs/guides/structured-outputs).\n\nThe default format is `{ \"type\": \"text\" }` with no additional options.\n\n**Not recommended for gpt-4o and newer models:**\n\nSetting to `{ \"type\": \"json_object\" }` enables the older JSON mode, which\nensures the message the model generates is valid JSON. Using `json_schema`\nis preferred for models that support it.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaResponseFormatText"
+          },
+          {
+            "$ref": "#/components/schemas/BetaTextResponseFormatJsonSchema"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseFormatJsonObject"
+          }
+        ]
+      },
+      "BetaResponseFormatJsonObject": {
+        "type": "object",
+        "title": "JSON object",
+        "description": "JSON object response format. An older method of generating JSON responses.\nUsing `json_schema` is recommended for models that support it. Note that the\nmodel will not generate JSON without a system or user message instructing it\nto do so.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `json_object`.",
+            "enum": [
+              "json_object"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaTextResponseFormatJsonSchema": {
+        "type": "object",
+        "title": "JSON schema",
+        "description": "JSON Schema response format. Used to generate structured JSON responses.\nLearn more about [Structured Outputs](https://developers.openai.com/api/docs/guides/structured-outputs).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `json_schema`.",
+            "enum": [
+              "json_schema"
+            ],
+            "x-stainless-const": true
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of what the response format is for, used by the model to\ndetermine how to respond in the format.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the response format. Must be a-z, A-Z, 0-9, or contain\nunderscores and dashes, with a maximum length of 64.\n"
+          },
+          "schema": {
+            "$ref": "#/components/schemas/BetaResponseFormatJsonSchemaSchema"
+          },
+          "strict": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "default": false,
+                "description": "Whether to enable strict schema adherence when generating the output.\nIf set to true, the model will always follow the exact schema defined\nin the `schema` field. Only a subset of JSON Schema is supported when\n`strict` is `true`. To learn more, read the [Structured Outputs\nguide](https://developers.openai.com/api/docs/guides/structured-outputs).\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "schema",
+          "name"
+        ]
+      },
+      "BetaResponseFormatJsonSchemaSchema": {
+        "type": "object",
+        "title": "JSON schema",
+        "description": "The schema for the response format, described as a JSON Schema object.\nLearn how to build JSON schemas [here](https://json-schema.org/).\n",
+        "additionalProperties": true
+      },
+      "BetaResponseFormatText": {
+        "type": "object",
+        "title": "Text",
+        "description": "Default response format. Used to generate text responses.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of response format being defined. Always `text`.",
+            "enum": [
+              "text"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaTool": {
+        "description": "A tool that can be used to generate a response.\n",
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaFunctionTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFileSearchTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerUsePreviewTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaWebSearchTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCodeInterpreterTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgrammaticToolCallingParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaImageGenTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaNamespaceToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchToolParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaWebSearchPreviewTool"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolParam"
+          }
+        ]
+      },
+      "BetaApplyPatchToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch"
+            ],
+            "description": "The type of the tool. Always `apply_patch`.",
+            "default": "apply_patch",
+            "x-stainless-const": true
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/BetaCallableToolAllowedCaller"
+                },
+                "type": "array",
+                "minItems": 1,
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Apply patch tool",
+        "description": "Allows the assistant to create, delete, or update files using unified diffs."
+      },
+      "BetaCallableToolAllowedCaller": {
+        "type": "string",
+        "enum": [
+          "direct",
+          "programmatic"
+        ]
+      },
+      "BetaWebSearchPreviewTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search_preview",
+              "web_search_preview_2025_03_11"
+            ],
+            "description": "The type of the web search tool. One of `web_search_preview` or `web_search_preview_2025_03_11`.",
+            "default": "web_search_preview",
+            "x-stainless-const": true
+          },
+          "user_location": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaApproximateLocation",
+                "description": "The user's location."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "search_context_size": {
+            "$ref": "#/components/schemas/BetaSearchContextSize",
+            "description": "High level guidance for the amount of context window space to use for the search. One of `low`, `medium`, or `high`. `medium` is the default."
+          },
+          "search_content_types": {
+            "items": {
+              "$ref": "#/components/schemas/BetaSearchContentType"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Web search preview",
+        "description": "This tool searches the web for relevant results to use in a response. Learn more about the [web search tool](https://developers.openai.com/api/docs/guides/tools-web-search)."
+      },
+      "BetaSearchContentType": {
+        "type": "string",
+        "enum": [
+          "text",
+          "image"
+        ]
+      },
+      "BetaSearchContextSize": {
+        "type": "string",
+        "enum": [
+          "low",
+          "medium",
+          "high"
+        ]
+      },
+      "BetaApproximateLocation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "approximate"
+            ],
+            "description": "The type of location approximation. Always `approximate`.",
+            "default": "approximate",
+            "x-stainless-const": true
+          },
+          "country": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The two-letter [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1) of the user, e.g. `US`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "region": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Free text input for the region of the user, e.g. `California`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "city": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Free text input for the city of the user, e.g. `San Francisco`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "timezone": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The [IANA timezone](https://timeapi.io/documentation/iana-timezones) of the user, e.g. `America/Los_Angeles`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaToolSearchToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search"
+            ],
+            "description": "The type of the tool. Always `tool_search`.",
+            "default": "tool_search",
+            "x-stainless-const": true
+          },
+          "execution": {
+            "$ref": "#/components/schemas/BetaToolSearchExecutionType",
+            "description": "Whether tool search is executed by the server or by the client."
+          },
+          "description": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Description shown to the model for a client-executed tool search tool."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parameters": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaEmptyModelParam",
+                "description": "Parameter schema for a client-executed tool search tool."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Tool search tool",
+        "description": "Hosted or BYOT tool search configuration for deferred tools."
+      },
+      "BetaEmptyModelParam": {
+        "properties": {},
+        "type": "object",
+        "required": []
+      },
+      "BetaToolSearchExecutionType": {
+        "type": "string",
+        "enum": [
+          "server",
+          "client"
+        ]
+      },
+      "BetaNamespaceToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "namespace"
+            ],
+            "description": "The type of the tool. Always `namespace`.",
+            "default": "namespace",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "description": "The namespace name used in tool calls (for example, `crm`)."
+          },
+          "description": {
+            "type": "string",
+            "description": "A description of the namespace shown to the model."
+          },
+          "tools": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/BetaFunctionToolParam"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaCustomToolParam"
+                }
+              ],
+              "description": "A function or custom tool that belongs to a namespace.",
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "minItems": 1,
+            "description": "The function/custom tools available inside this namespace."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "name",
+          "description",
+          "tools"
+        ],
+        "title": "Namespace",
+        "description": "Groups function/custom tools under a shared namespace."
+      },
+      "BetaCustomToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom"
+            ],
+            "description": "The type of the custom tool. Always `custom`.",
+            "default": "custom",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the custom tool, used to identify it in tool calls."
+          },
+          "async": {
+            "type": "boolean",
+            "description": "Whether the tool response can be returned asynchronously versus immediately returned on next response creation."
+          },
+          "description": {
+            "type": "string",
+            "description": "Optional description of the custom tool, used to provide more context."
+          },
+          "format": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BetaCustomTextFormatParam"
+              },
+              {
+                "$ref": "#/components/schemas/BetaCustomGrammarFormatParam"
+              }
+            ],
+            "description": "The input format for the custom tool. Default is unconstrained text.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether this tool should be deferred and discovered via tool search."
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/BetaCallableToolAllowedCaller"
+                },
+                "type": "array",
+                "minItems": 1,
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "name"
+        ],
+        "title": "Custom tool",
+        "description": "A custom tool that processes input using a specified format. Learn more about   [custom tools](https://developers.openai.com/api/docs/guides/function-calling#custom-tools)"
+      },
+      "BetaCustomGrammarFormatParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "grammar"
+            ],
+            "description": "Grammar format. Always `grammar`.",
+            "default": "grammar",
+            "x-stainless-const": true
+          },
+          "syntax": {
+            "$ref": "#/components/schemas/BetaGrammarSyntax1",
+            "description": "The syntax of the grammar definition. One of `lark` or `regex`."
+          },
+          "definition": {
+            "type": "string",
+            "description": "The grammar definition."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "syntax",
+          "definition"
+        ],
+        "title": "Grammar format",
+        "description": "A grammar defined by the user."
+      },
+      "BetaGrammarSyntax1": {
+        "type": "string",
+        "enum": [
+          "lark",
+          "regex"
+        ]
+      },
+      "BetaCustomTextFormatParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "description": "Unconstrained text format. Always `text`.",
+            "default": "text",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Text format",
+        "description": "Unconstrained free-form text."
+      },
+      "BetaFunctionToolParam": {
+        "properties": {
+          "name": {
+            "type": "string",
+            "maxLength": 128,
+            "minLength": 1,
+            "pattern": "^[a-zA-Z0-9_-]+$"
+          },
+          "description": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parameters": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaEmptyModelParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "strict": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Whether to enforce strict parameter validation. If omitted, Responses attempts to use strict validation when the schema is compatible, and falls back to non-strict validation otherwise."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "default": "function",
+            "x-stainless-const": true
+          },
+          "async": {
+            "type": "boolean",
+            "description": "Whether the tool response can be returned asynchronously versus immediately returned on next response creation."
+          },
+          "output_schema": {
+            "anyOf": [
+              {
+                "additionalProperties": {},
+                "type": "object",
+                "description": "A JSON Schema describing the JSON value encoded in string outputs for this function tool. This does not describe content-array outputs.",
+                "x-oaiTypeLabel": "map"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether this function should be deferred and discovered via tool search."
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/BetaCallableToolAllowedCaller"
+                },
+                "type": "array",
+                "minItems": 1,
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "name",
+          "type"
+        ]
+      },
+      "BetaFunctionShellToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell"
+            ],
+            "description": "The type of the shell tool. Always `shell`.",
+            "default": "shell",
+            "x-stainless-const": true
+          },
+          "environment": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaContainerAutoParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/BetaLocalEnvironmentParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/BetaContainerReferenceParam"
+                  }
+                ],
+                "discriminator": {
+                  "propertyName": "type"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/BetaCallableToolAllowedCaller"
+                },
+                "type": "array",
+                "minItems": 1,
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Shell tool",
+        "description": "A tool that allows the model to execute shell commands."
+      },
+      "BetaContainerReferenceParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_reference"
+            ],
+            "description": "References a container created with the /v1/containers endpoint",
+            "default": "container_reference",
+            "x-stainless-const": true
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The ID of the referenced container.",
+            "example": "cntr_123"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "container_id"
+        ]
+      },
+      "BetaLocalEnvironmentParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local"
+            ],
+            "description": "Use a local computer environment.",
+            "default": "local",
+            "x-stainless-const": true
+          },
+          "skills": {
+            "items": {
+              "$ref": "#/components/schemas/BetaLocalSkillParam"
+            },
+            "type": "array",
+            "maxItems": 200,
+            "description": "An optional list of skills."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaLocalSkillParam": {
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the skill."
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the skill."
+          },
+          "path": {
+            "type": "string",
+            "description": "The path to the directory containing the skill."
+          }
+        },
+        "type": "object",
+        "required": [
+          "name",
+          "description",
+          "path"
+        ]
+      },
+      "BetaContainerAutoParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_auto"
+            ],
+            "description": "Automatically creates a container for this request",
+            "default": "container_auto",
+            "x-stainless-const": true
+          },
+          "file_ids": {
+            "items": {
+              "type": "string",
+              "example": "file-123"
+            },
+            "type": "array",
+            "maxItems": 50,
+            "description": "An optional list of uploaded files to make available to your code."
+          },
+          "memory_limit": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaContainerMemoryLimit",
+                "description": "The memory limit for the container."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "network_policy": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BetaContainerNetworkPolicyDisabledParam"
+              },
+              {
+                "$ref": "#/components/schemas/BetaContainerNetworkPolicyAllowlistParam"
+              }
+            ],
+            "description": "Network access policy for the container.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "skills": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/BetaSkillReferenceParam"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInlineSkillParam"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "maxItems": 200,
+            "description": "An optional list of skills referenced by id or inline data."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaInlineSkillParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "inline"
+            ],
+            "description": "Defines an inline skill for this request.",
+            "default": "inline",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the skill."
+          },
+          "description": {
+            "type": "string",
+            "description": "The description of the skill."
+          },
+          "source": {
+            "$ref": "#/components/schemas/BetaInlineSkillSourceParam",
+            "description": "Inline skill payload"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "name",
+          "description",
+          "source"
+        ]
+      },
+      "BetaInlineSkillSourceParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "base64"
+            ],
+            "description": "The type of the inline skill source. Must be `base64`.",
+            "default": "base64",
+            "x-stainless-const": true
+          },
+          "media_type": {
+            "type": "string",
+            "enum": [
+              "application/zip"
+            ],
+            "description": "The media type of the inline skill payload. Must be `application/zip`.",
+            "default": "application/zip",
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "string",
+            "maxLength": 70254592,
+            "minLength": 1,
+            "description": "Base64-encoded skill zip bundle."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "media_type",
+          "data"
+        ],
+        "description": "Inline skill payload"
+      },
+      "BetaSkillReferenceParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "skill_reference"
+            ],
+            "description": "References a skill created with the /v1/skills endpoint.",
+            "default": "skill_reference",
+            "x-stainless-const": true
+          },
+          "skill_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The ID of the referenced skill."
+          },
+          "version": {
+            "type": "string",
+            "description": "Optional skill version. Use a positive integer or 'latest'. Omit for default."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "skill_id"
+        ]
+      },
+      "BetaContainerNetworkPolicyAllowlistParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "allowlist"
+            ],
+            "description": "Allow outbound network access only to specified domains. Always `allowlist`.",
+            "default": "allowlist",
+            "x-stainless-const": true
+          },
+          "allowed_domains": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "minItems": 1,
+            "description": "A list of allowed domains when type is `allowlist`."
+          },
+          "domain_secrets": {
+            "items": {
+              "$ref": "#/components/schemas/BetaContainerNetworkPolicyDomainSecretParam"
+            },
+            "type": "array",
+            "minItems": 1,
+            "description": "Optional domain-scoped secrets for allowlisted domains."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "allowed_domains"
+        ]
+      },
+      "BetaContainerNetworkPolicyDomainSecretParam": {
+        "properties": {
+          "domain": {
+            "type": "string",
+            "minLength": 1,
+            "description": "The domain associated with the secret."
+          },
+          "name": {
+            "type": "string",
+            "minLength": 1,
+            "description": "The name of the secret to inject for the domain."
+          },
+          "value": {
+            "type": "string",
+            "maxLength": 10485760,
+            "minLength": 1,
+            "description": "The secret value to inject for the domain."
+          }
+        },
+        "type": "object",
+        "required": [
+          "domain",
+          "name",
+          "value"
+        ]
+      },
+      "BetaContainerNetworkPolicyDisabledParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "disabled"
+            ],
+            "description": "Disable outbound network access. Always `disabled`.",
+            "default": "disabled",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaContainerMemoryLimit": {
+        "type": "string",
+        "enum": [
+          "1g",
+          "4g",
+          "16g",
+          "64g"
+        ]
+      },
+      "BetaLocalShellToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local_shell"
+            ],
+            "description": "The type of the local shell tool. Always `local_shell`.",
+            "default": "local_shell",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Local shell tool",
+        "description": "A tool that allows the model to execute shell commands in a local environment."
+      },
+      "BetaImageGenTool": {
+        "type": "object",
+        "title": "Image generation tool",
+        "description": "A tool that generates images using the GPT image models.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "image_generation"
+            ],
+            "description": "The type of the image generation tool. Always `image_generation`.\n",
+            "x-stainless-const": true
+          },
+          "model": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "gpt-image-1",
+                  "gpt-image-1-mini",
+                  "gpt-image-1.5",
+                  "gpt-image-2",
+                  "gpt-image-2-2026-04-21",
+                  "gpt-image-2.5-sunburst",
+                  "gpt-image-2.5-sunburst-2026-09-08",
+                  "gpt-image-2.5-flare",
+                  "gpt-image-2.5-flare-2026-09-08"
+                ],
+                "description": "The image generation model to use. One of `gpt-image-1`,\n`gpt-image-1-mini`, `gpt-image-1.5`, `gpt-image-2`,\n`gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`,\n`gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`,\n`gpt-image-2.5-flare-2026-09-08`, or `chatgpt-image-latest`. Default:\n`gpt-image-1`.\n",
+                "default": "gpt-image-1"
+              }
+            ]
+          },
+          "quality": {
+            "type": "string",
+            "enum": [
+              "low",
+              "medium",
+              "high",
+              "xhigh",
+              "max",
+              "auto"
+            ],
+            "description": "The quality of the generated image. The GPT image models support `low`,\n`medium`, and `high`. `gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`,\nincluding their `2026-09-08` snapshots, also support `xhigh` and `max`.\nDefault: `auto`.\n",
+            "default": "auto"
+          },
+          "size": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string",
+                "enum": [
+                  "1024x1024",
+                  "1024x1536",
+                  "1536x1024",
+                  "auto"
+                ]
+              }
+            ],
+            "description": "The size of the generated images. For `gpt-image-2`, `gpt-image-2-2026-04-21`, `gpt-image-2.5-sunburst`, `gpt-image-2.5-sunburst-2026-09-08`, `gpt-image-2.5-flare`, and `gpt-image-2.5-flare-2026-09-08`, arbitrary resolutions are supported as `WIDTHxHEIGHT` strings, for example `1536x864`. Width and height must both be divisible by 16 and the requested aspect ratio must be between 1:3 and 3:1. Resolutions above `2560x1440` are experimental, and the maximum supported resolution is `3840x2160`. The requested size must also satisfy the model's current pixel and edge limits. The standard sizes `1024x1024`, `1536x1024`, and `1024x1536` are supported by the GPT image models; `auto` is supported for models that allow automatic sizing. For `dall-e-2`, use one of `256x256`, `512x512`, or `1024x1024`. For `dall-e-3`, use one of `1024x1024`, `1792x1024`, or `1024x1792`.",
+            "default": "auto"
+          },
+          "output_format": {
+            "type": "string",
+            "enum": [
+              "png",
+              "webp",
+              "jpeg"
+            ],
+            "description": "The output format of the generated image. One of `png`, `webp`, or\n`jpeg`. Default: `png`.\n",
+            "default": "png"
+          },
+          "output_compression": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 100,
+            "description": "Compression level for the output image. Default: 100.\n",
+            "default": 100
+          },
+          "moderation": {
+            "type": "string",
+            "enum": [
+              "auto",
+              "low"
+            ],
+            "description": "Moderation level for the generated image. Default: `auto`.\n",
+            "default": "auto"
+          },
+          "background": {
+            "type": "string",
+            "enum": [
+              "transparent",
+              "opaque",
+              "auto"
+            ],
+            "description": "Set the background of the generated image. One of `transparent`, `opaque`,\nor `auto`. `gpt-image-2.5-sunburst` and `gpt-image-2.5-flare`, including\ntheir `2026-09-08` snapshots, support `opaque` and `transparent`\nbackgrounds. Transparent backgrounds are available for supported GPT Image\nmodels. For `gpt-image-2` and `gpt-image-2-2026-04-21`, this support is in\npreview. When using `transparent`, set the output format to `png` or `webp`.\nDefault: `auto`.\n",
+            "default": "auto"
+          },
+          "input_fidelity": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaInputFidelity"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "input_image_mask": {
+            "type": "object",
+            "description": "Optional mask for inpainting. Contains `image_url`\n(string, optional) and `file_id` (string, optional).\n",
+            "properties": {
+              "image_url": {
+                "type": "string",
+                "description": "Base64-encoded mask image.\n"
+              },
+              "file_id": {
+                "type": "string",
+                "description": "File ID for the mask image.\n"
+              }
+            },
+            "required": [],
+            "additionalProperties": false
+          },
+          "partial_images": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 3,
+            "description": "Number of partial images to generate in streaming mode, from 0 (default value) to 3.\n",
+            "default": 0
+          },
+          "action": {
+            "description": "Whether to generate a new image or edit an existing image. Default: `auto`.\n",
+            "$ref": "#/components/schemas/BetaImageGenActionEnum"
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaImageGenActionEnum": {
+        "type": "string",
+        "enum": [
+          "generate",
+          "edit",
+          "auto"
+        ]
+      },
+      "BetaInputFidelity": {
+        "type": "string",
+        "enum": [
+          "high",
+          "low"
+        ],
+        "description": "Control how much effort the model will exert to match the style and features, especially facial features, of input images. This parameter is only supported for `gpt-image-1` and `gpt-image-1.5` and later models, unsupported for `gpt-image-1-mini`. Supports `high` and `low`. Defaults to `low`."
+      },
+      "BetaProgrammaticToolCallingParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "programmatic_tool_calling"
+            ],
+            "description": "The type of the tool. Always `programmatic_tool_calling`.",
+            "default": "programmatic_tool_calling",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaCodeInterpreterTool": {
+        "type": "object",
+        "title": "Code interpreter",
+        "description": "A tool that runs Python code to help generate a response to a prompt.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "code_interpreter"
+            ],
+            "description": "The type of the code interpreter tool. Always `code_interpreter`.\n",
+            "x-stainless-const": true
+          },
+          "container": {
+            "description": "The code interpreter container. Can be a container ID or an object that\nspecifies uploaded file IDs to make available to your code, along with an\noptional `memory_limit` setting.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "The container ID."
+              },
+              {
+                "$ref": "#/components/schemas/BetaAutoCodeInterpreterToolParam"
+              }
+            ]
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "type": "array",
+                "minItems": 1,
+                "items": {
+                  "$ref": "#/components/schemas/BetaCallableToolAllowedCaller"
+                },
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "container"
+        ]
+      },
+      "BetaAutoCodeInterpreterToolParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "auto"
+            ],
+            "description": "Always `auto`.",
+            "default": "auto",
+            "x-stainless-const": true
+          },
+          "file_ids": {
+            "items": {
+              "type": "string",
+              "example": "file-123"
+            },
+            "type": "array",
+            "maxItems": 50,
+            "description": "An optional list of uploaded files to make available to your code."
+          },
+          "memory_limit": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaContainerMemoryLimit",
+                "description": "The memory limit for the code interpreter container."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "network_policy": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BetaContainerNetworkPolicyDisabledParam"
+              },
+              {
+                "$ref": "#/components/schemas/BetaContainerNetworkPolicyAllowlistParam"
+              }
+            ],
+            "description": "Network access policy for the container.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "CodeInterpreterToolAuto",
+        "description": "Configuration for a code interpreter container. Optionally specify the IDs of the files to run the code on."
+      },
+      "BetaMCPTool": {
+        "type": "object",
+        "title": "MCP tool",
+        "description": "Give the model access to additional tools via remote Model Context Protocol\n(MCP) servers. [Learn more about MCP](https://developers.openai.com/api/docs/guides/tools-connectors-mcp).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp"
+            ],
+            "description": "The type of the MCP tool. Always `mcp`.",
+            "x-stainless-const": true
+          },
+          "server_label": {
+            "type": "string",
+            "description": "A label for this MCP server, used to identify it in tool calls.\n"
+          },
+          "server_url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL for the MCP server. One of `server_url`, `connector_id`, or\n`tunnel_id` must be provided.\n"
+          },
+          "connector_id": {
+            "type": "string",
+            "enum": [
+              "connector_dropbox",
+              "connector_gmail",
+              "connector_googlecalendar",
+              "connector_googledrive",
+              "connector_microsoftteams",
+              "connector_outlookcalendar",
+              "connector_outlookemail",
+              "connector_sharepoint"
+            ],
+            "description": "Identifier for service connectors, like those available in ChatGPT. One of\n`server_url`, `connector_id`, or `tunnel_id` must be provided. Learn more\nabout service connectors [here](https://developers.openai.com/api/docs/guides/tools-connectors-mcp#connectors).\n\nCurrently supported `connector_id` values are:\n\n- Dropbox: `connector_dropbox`\n- Gmail: `connector_gmail`\n- Google Calendar: `connector_googlecalendar`\n- Google Drive: `connector_googledrive`\n- Microsoft Teams: `connector_microsoftteams`\n- Outlook Calendar: `connector_outlookcalendar`\n- Outlook Email: `connector_outlookemail`\n- SharePoint: `connector_sharepoint`\n"
+          },
+          "tunnel_id": {
+            "type": "string",
+            "pattern": "^tunnel_[a-z0-9]{32}$",
+            "description": "The Secure MCP Tunnel ID to use instead of a direct server URL. One of\n`server_url`, `connector_id`, or `tunnel_id` must be provided.\n"
+          },
+          "authorization": {
+            "type": "string",
+            "description": "An OAuth access token that can be used with a remote MCP server, either\nwith a custom MCP server URL or a service connector. Your application\nmust handle the OAuth authorization flow and provide the token here.\n"
+          },
+          "server_description": {
+            "type": "string",
+            "description": "Optional description of the MCP server, used to provide more context.\n"
+          },
+          "headers": {
+            "anyOf": [
+              {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "Optional HTTP headers to send to the MCP server. Use for authentication\nor other purposes.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "allowed_tools": {
+            "anyOf": [
+              {
+                "description": "List of allowed tool names or a filter object.\n",
+                "oneOf": [
+                  {
+                    "type": "array",
+                    "title": "MCP allowed tools",
+                    "description": "A string array of allowed tool names",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  {
+                    "$ref": "#/components/schemas/BetaMCPToolFilter"
+                  }
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "type": "array",
+                "minItems": 1,
+                "items": {
+                  "$ref": "#/components/schemas/BetaCallableToolAllowedCaller"
+                },
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "require_approval": {
+            "anyOf": [
+              {
+                "description": "Specify which of the MCP server's tools require approval.",
+                "oneOf": [
+                  {
+                    "type": "object",
+                    "title": "MCP tool approval filter",
+                    "description": "Specify which of the MCP server's tools require approval. Can be\n`always`, `never`, or a filter object associated with tools\nthat require approval.\n",
+                    "properties": {
+                      "always": {
+                        "$ref": "#/components/schemas/BetaMCPToolFilter"
+                      },
+                      "never": {
+                        "$ref": "#/components/schemas/BetaMCPToolFilter"
+                      }
+                    },
+                    "additionalProperties": false
+                  },
+                  {
+                    "type": "string",
+                    "title": "MCP tool approval setting",
+                    "description": "Specify a single approval policy for all tools. One of `always` or\n`never`. When set to `always`, all tools will require approval. When\nset to `never`, all tools will not require approval.\n",
+                    "enum": [
+                      "always",
+                      "never"
+                    ]
+                  }
+                ],
+                "default": "always"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether this MCP tool is deferred and discovered via tool search.\n"
+          }
+        },
+        "required": [
+          "type",
+          "server_label"
+        ]
+      },
+      "BetaMCPToolFilter": {
+        "type": "object",
+        "title": "MCP tool filter",
+        "description": "A filter object to specify which tools are allowed.\n",
+        "properties": {
+          "tool_names": {
+            "type": "array",
+            "title": "MCP allowed tools",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of allowed tool names."
+          },
+          "read_only": {
+            "type": "boolean",
+            "description": "Indicates whether or not a tool modifies data or is read-only. If an\nMCP server is [annotated with `readOnlyHint`](https://modelcontextprotocol.io/specification/2025-06-18/schema#toolannotations-readonlyhint),\nit will match this filter.\n"
+          }
+        },
+        "required": [],
+        "additionalProperties": false
+      },
+      "BetaWebSearchTool": {
+        "type": "object",
+        "title": "Web search",
+        "description": "Search the Internet for sources related to the prompt. Learn more about the\n[web search tool](https://developers.openai.com/api/docs/guides/tools-web-search).\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search",
+              "web_search_2025_08_26"
+            ],
+            "description": "The type of the web search tool. One of `web_search` or `web_search_2025_08_26`.",
+            "default": "web_search"
+          },
+          "external_web_access": {
+            "type": "boolean",
+            "default": true,
+            "description": "Allow live internet access for web search. Defaults to true when omitted. When false, the web search tool runs in offline/cache-only mode and will not fetch new external content."
+          },
+          "filters": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "Filters for the search.\n",
+                "properties": {
+                  "allowed_domains": {
+                    "anyOf": [
+                      {
+                        "type": "array",
+                        "title": "Allowed domains for the search.",
+                        "description": "Allowed domains for the search. If not provided, all domains are allowed.\nSubdomains of the provided domains are allowed as well.\n\nExample: `[\"pubmed.ncbi.nlm.nih.gov\"]`\n",
+                        "items": {
+                          "type": "string",
+                          "description": "Allowed domain for the search."
+                        },
+                        "default": []
+                      },
+                      {
+                        "type": "null"
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user_location": {
+            "$ref": "#/components/schemas/BetaWebSearchApproximateLocation"
+          },
+          "search_context_size": {
+            "type": "string",
+            "enum": [
+              "low",
+              "medium",
+              "high"
+            ],
+            "default": "medium",
+            "description": "High level guidance for the amount of context window space to use for the search. One of `low`, `medium`, or `high`. `medium` is the default."
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaWebSearchApproximateLocation": {
+        "anyOf": [
+          {
+            "type": "object",
+            "title": "Web search approximate location",
+            "description": "The approximate location of the user.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "approximate"
+                ],
+                "description": "The type of location approximation. Always `approximate`.",
+                "default": "approximate",
+                "x-stainless-const": true
+              },
+              "country": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The two-letter [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1) of the user, e.g. `US`."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "region": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Free text input for the region of the user, e.g. `California`."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "city": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Free text input for the city of the user, e.g. `San Francisco`."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "timezone": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The [IANA timezone](https://timeapi.io/documentation/iana-timezones) of the user, e.g. `America/Los_Angeles`."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaComputerUsePreviewTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer_use_preview"
+            ],
+            "description": "The type of the computer use tool. Always `computer_use_preview`.",
+            "default": "computer_use_preview",
+            "x-stainless-const": true
+          },
+          "environment": {
+            "$ref": "#/components/schemas/BetaComputerEnvironment",
+            "description": "The type of computer environment to control."
+          },
+          "display_width": {
+            "type": "integer",
+            "description": "The width of the computer display."
+          },
+          "display_height": {
+            "type": "integer",
+            "description": "The height of the computer display."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "environment",
+          "display_width",
+          "display_height"
+        ],
+        "title": "Computer use preview",
+        "description": "A tool that controls a virtual computer. Learn more about the [computer tool](https://developers.openai.com/api/docs/guides/tools-computer-use)."
+      },
+      "BetaComputerEnvironment": {
+        "type": "string",
+        "enum": [
+          "windows",
+          "mac",
+          "linux",
+          "ubuntu",
+          "browser"
+        ]
+      },
+      "BetaComputerTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer"
+            ],
+            "description": "The type of the computer tool. Always `computer`.",
+            "default": "computer",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Computer",
+        "description": "A tool that controls a virtual computer. Learn more about the [computer tool](https://developers.openai.com/api/docs/guides/tools-computer-use)."
+      },
+      "BetaFileSearchTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_search"
+            ],
+            "description": "The type of the file search tool. Always `file_search`.",
+            "default": "file_search",
+            "x-stainless-const": true
+          },
+          "vector_store_ids": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "description": "The IDs of the vector stores to search."
+          },
+          "max_num_results": {
+            "type": "integer",
+            "description": "The maximum number of results to return. This number should be between 1 and 50 inclusive."
+          },
+          "ranking_options": {
+            "$ref": "#/components/schemas/BetaRankingOptions",
+            "description": "Ranking options for search."
+          },
+          "filters": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaFilters",
+                "description": "A filter to apply."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "vector_store_ids"
+        ],
+        "title": "File search",
+        "description": "A tool that searches for relevant content from uploaded files. Learn more about the [file search tool](https://developers.openai.com/api/docs/guides/tools-file-search)."
+      },
+      "BetaFilters": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/BetaComparisonFilter"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCompoundFilter"
+          }
+        ]
+      },
+      "BetaCompoundFilter": {
+        "$recursiveAnchor": true,
+        "type": "object",
+        "additionalProperties": false,
+        "title": "Compound Filter",
+        "description": "Combine multiple filters using `and` or `or`.",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "Type of operation: `and` or `or`.",
+            "enum": [
+              "and",
+              "or"
+            ]
+          },
+          "filters": {
+            "type": "array",
+            "description": "Array of filters to combine. Items can be `ComparisonFilter` or `CompoundFilter`.",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/BetaComparisonFilter"
+                },
+                {
+                  "$recursiveRef": "#"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "type"
+              }
+            }
+          }
+        },
+        "required": [
+          "type",
+          "filters"
+        ],
+        "x-oaiMeta": {
+          "name": "CompoundFilter"
+        }
+      },
+      "BetaComparisonFilter": {
+        "type": "object",
+        "additionalProperties": false,
+        "title": "Comparison Filter",
+        "description": "A filter used to compare a specified attribute key to a given value using a defined comparison operation.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "default": "eq",
+            "enum": [
+              "eq",
+              "ne",
+              "gt",
+              "gte",
+              "lt",
+              "lte",
+              "in",
+              "nin"
+            ],
+            "description": "Specifies the comparison operator: `eq`, `ne`, `gt`, `gte`, `lt`, `lte`, `in`, `nin`.\n- `eq`: equals\n- `ne`: not equal\n- `gt`: greater than\n- `gte`: greater than or equal\n- `lt`: less than\n- `lte`: less than or equal\n- `in`: in\n- `nin`: not in\n"
+          },
+          "key": {
+            "type": "string",
+            "description": "The key to compare against the value."
+          },
+          "value": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "number"
+              },
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "oneOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ]
+                }
+              }
+            ],
+            "description": "The value to compare against the attribute key; supports string, number, or boolean types."
+          }
+        },
+        "required": [
+          "type",
+          "key",
+          "value"
+        ],
+        "x-oaiMeta": {
+          "name": "ComparisonFilter"
+        }
+      },
+      "BetaRankingOptions": {
+        "properties": {
+          "ranker": {
+            "$ref": "#/components/schemas/BetaRankerVersionType",
+            "description": "The ranker to use for the file search."
+          },
+          "score_threshold": {
+            "type": "number",
+            "description": "The score threshold for the file search, a number between 0 and 1. Numbers closer to 1 will attempt to return only the most relevant results, but may return fewer results."
+          },
+          "hybrid_search": {
+            "$ref": "#/components/schemas/BetaHybridSearchOptions",
+            "description": "Weights that control how reciprocal rank fusion balances semantic embedding matches versus sparse keyword matches when hybrid search is enabled."
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "BetaHybridSearchOptions": {
+        "properties": {
+          "embedding_weight": {
+            "type": "number",
+            "description": "The weight of the embedding in the reciprocal ranking fusion."
+          },
+          "text_weight": {
+            "type": "number",
+            "description": "The weight of the text in the reciprocal ranking fusion."
+          }
+        },
+        "type": "object",
+        "required": [
+          "embedding_weight",
+          "text_weight"
+        ]
+      },
+      "BetaRankerVersionType": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default-2024-11-15"
+        ]
+      },
+      "BetaFunctionTool": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "function"
+            ],
+            "description": "The type of the function tool. Always `function`.",
+            "default": "function",
+            "x-stainless-const": true
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to call."
+          },
+          "async": {
+            "type": "boolean"
+          },
+          "description": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A description of the function. Used by the model to determine whether or not to call the function."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "parameters": {
+            "anyOf": [
+              {
+                "additionalProperties": {},
+                "type": "object",
+                "description": "A JSON schema object describing the parameters of the function.",
+                "x-oaiTypeLabel": "map"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output_schema": {
+            "anyOf": [
+              {
+                "additionalProperties": {},
+                "type": "object",
+                "description": "A JSON schema object describing the JSON value encoded in string outputs for this function.",
+                "x-oaiTypeLabel": "map"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "strict": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Whether strict parameter validation is enforced for this function tool."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "defer_loading": {
+            "type": "boolean",
+            "description": "Whether this function is deferred and loaded via tool search."
+          },
+          "allowed_callers": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/BetaCallableToolAllowedCaller"
+                },
+                "type": "array",
+                "description": "The tool invocation context(s)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "name",
+          "strict",
+          "parameters"
+        ],
+        "title": "Function",
+        "description": "Defines a function in your own code the model can choose to call. Learn more about [function calling](https://developers.openai.com/api/docs/guides/function-calling)."
+      },
+      "BetaInputItem": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaEasyInputMessage"
+          },
+          {
+            "type": "object",
+            "title": "Item",
+            "description": "An item representing part of the context for the response to be\ngenerated by the model. Can contain text, images, and audio inputs,\nas well as previous assistant responses and tool call outputs.\n",
+            "$ref": "#/components/schemas/BetaItem"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCompactionTriggerItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaItemReferenceParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgramItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgramOutputItemParam"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaProgramOutputItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of this program output item.",
+            "example": "cmo_123"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "program_output"
+            ],
+            "description": "The item type. Always `program_output`.",
+            "default": "program_output",
+            "x-stainless-const": true
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The call ID of the program item."
+          },
+          "result": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "The result produced by the program item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaProgramOutputItemStatus",
+            "description": "The terminal status of the program output."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "type",
+          "call_id",
+          "result",
+          "status"
+        ]
+      },
+      "BetaProgramOutputItemStatus": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "incomplete"
+        ]
+      },
+      "Beta_AgentTagParam": {
+        "properties": {
+          "agent_name": {
+            "type": "string",
+            "description": "The canonical name of the agent that produced this item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "agent_name"
+        ],
+        "description": "The agent that produced this item.",
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaProgramItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of this program item.",
+            "example": "cm_123"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "program"
+            ],
+            "description": "The item type. Always `program`.",
+            "default": "program",
+            "x-stainless-const": true
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The stable call ID of the program item."
+          },
+          "code": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "The JavaScript source executed by programmatic tool calling."
+          },
+          "fingerprint": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Opaque program replay fingerprint that must be round-tripped."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "type",
+          "call_id",
+          "code",
+          "fingerprint"
+        ]
+      },
+      "BetaItemReferenceParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "item_reference"
+                ],
+                "description": "The type of item to reference. Always `item_reference`.",
+                "default": "item_reference",
+                "x-stainless-const": true
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the item to reference."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "title": "Item reference",
+        "description": "An internal identifier for an item to reference."
+      },
+      "BetaCompactionTriggerItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this compaction trigger.",
+                "example": "msg_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction_trigger"
+            ],
+            "description": "The type of the item. Always `compaction_trigger`.",
+            "default": "compaction_trigger",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Compaction trigger",
+        "description": "Compacts the current context. Must be the final input item."
+      },
+      "BetaItem": {
+        "type": "object",
+        "description": "Content item used to generate a response.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaInputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/BetaOutputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaWebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaAgentMessageItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMultiAgentCallItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMultiAgentCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchCallItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaAdditionalToolsItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseConfigurationUpdateItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCompactionSummaryItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCallItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolCallItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolCallOutputItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPApprovalResponse"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCall"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaCustomToolCall": {
+        "type": "object",
+        "title": "Custom tool call",
+        "description": "A call to a custom tool created by the model.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom_tool_call"
+            ],
+            "x-stainless-const": true,
+            "description": "The type of the custom tool call. Always `custom_tool_call`.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the custom tool call in the OpenAI platform.\n"
+          },
+          "call_id": {
+            "type": "string",
+            "description": "An identifier used to map this custom tool call to a tool call output.\n"
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCaller"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "namespace": {
+            "type": "string",
+            "description": "The namespace of the custom tool being called.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the custom tool being called.\n"
+          },
+          "input": {
+            "type": "string",
+            "description": "The input for the custom tool call generated by the model.\n"
+          },
+          "async": {
+            "type": "boolean",
+            "description": "Whether the custom tool call runs asynchronously.\n"
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "name",
+          "input"
+        ]
+      },
+      "BetaToolCallCaller": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaDirectToolCallCaller"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgramToolCallCaller"
+          }
+        ],
+        "description": "The execution context that produced this tool call.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaProgramToolCallCaller": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "program"
+            ],
+            "default": "program",
+            "x-stainless-const": true
+          },
+          "caller_id": {
+            "type": "string",
+            "description": "The call ID of the program item that produced this tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "caller_id"
+        ]
+      },
+      "BetaDirectToolCallCaller": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "direct"
+            ],
+            "default": "direct",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaAgentTag": {
+        "properties": {
+          "agent_name": {
+            "type": "string",
+            "description": "The canonical name of the agent that produced this item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "agent_name"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaCustomToolCallOutput": {
+        "type": "object",
+        "title": "Custom tool call output",
+        "description": "The output of a custom tool call from your code, being sent back to the model.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "custom_tool_call_output"
+            ],
+            "x-stainless-const": true,
+            "description": "The type of the custom tool call output. Always `custom_tool_call_output`.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the custom tool call output in the OpenAI platform.\n"
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The call ID, used to map this custom tool call output to a custom tool call.\n"
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCallerParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output": {
+            "description": "The output from the custom tool call generated by your code.\nCan be a string or an list of output content.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "A string of the output of the custom tool call.\n",
+                "title": "string output"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/BetaFunctionAndCustomToolCallOutput"
+                },
+                "title": "output content list",
+                "description": "Text, image, or file output of the custom tool call.\n"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "output"
+        ]
+      },
+      "BetaFunctionAndCustomToolCallOutput": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaInputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaInputImageContent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaInputFileContent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaInputFileContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_file"
+            ],
+            "description": "The type of the input item. Always `input_file`.",
+            "default": "input_file",
+            "x-stainless-const": true
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "filename": {
+            "type": "string",
+            "description": "The name of the file to be sent to the model."
+          },
+          "file_data": {
+            "type": "string",
+            "description": "The content of the file to be sent to the model.\n"
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/BetaPromptCacheBreakpointConfig"
+          },
+          "file_url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the file to be sent to the model."
+          },
+          "detail": {
+            "$ref": "#/components/schemas/BetaFileInputDetail",
+            "description": "The detail level of the file to be sent to the model. Use `auto` to let the system select the detail level; for GPT-5.6 and later models, `auto` uses high-quality rendering, which may increase input token usage. Use `low` for lower-cost rendering, or `high` to render the file at higher quality. Defaults to `auto`."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Input file",
+        "description": "A file input to the model."
+      },
+      "BetaFileInputDetail": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "low",
+          "high"
+        ]
+      },
+      "BetaPromptCacheBreakpointConfig": {
+        "properties": {
+          "mode": {
+            "type": "string",
+            "enum": [
+              "explicit"
+            ],
+            "description": "The breakpoint mode. Always `explicit`.",
+            "default": "explicit",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "mode"
+        ],
+        "title": "Prompt cache breakpoint",
+        "description": "Marks the exact end of a reusable prompt prefix. The breakpoint inherits its TTL from the request's `prompt_cache_options.ttl`; the boundary is not rounded to a token block."
+      },
+      "BetaInputImageContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "description": "The type of the input item. Always `input_image`.",
+            "default": "input_image",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri",
+                "description": "The URL of the image to be sent to the model. A fully qualified URL or base64 encoded image in a data URL."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "detail": {
+            "$ref": "#/components/schemas/BetaImageDetail",
+            "description": "The detail level of the image to be sent to the model. One of `high`, `low`, `auto`, or `original`. Defaults to `auto`."
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/BetaPromptCacheBreakpointConfig"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "detail"
+        ],
+        "title": "Input image",
+        "description": "An image input to the model. Learn about [image inputs](https://developers.openai.com/api/docs/guides/images-vision)."
+      },
+      "BetaImageDetail": {
+        "type": "string",
+        "enum": [
+          "low",
+          "high",
+          "auto",
+          "original"
+        ]
+      },
+      "BetaInputTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "description": "The type of the input item. Always `input_text`.",
+            "default": "input_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text input to the model."
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/BetaPromptCacheBreakpointConfig"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Input text",
+        "description": "A text input to the model."
+      },
+      "BetaToolCallCallerParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaDirectToolCallCallerParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgramToolCallCallerParam"
+          }
+        ],
+        "description": "The execution context that produced this tool call.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaProgramToolCallCallerParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "program"
+            ],
+            "description": "The caller type. Always `program`.",
+            "default": "program",
+            "x-stainless-const": true
+          },
+          "caller_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The call ID of the program item that produced this tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "caller_id"
+        ]
+      },
+      "BetaDirectToolCallCallerParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "direct"
+            ],
+            "description": "The caller type. Always `direct`.",
+            "default": "direct",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaMCPToolCall": {
+        "type": "object",
+        "title": "MCP tool call",
+        "description": "An invocation of a tool on an MCP server.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_call"
+            ],
+            "description": "The type of the item. Always `mcp_call`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the tool call.\n"
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server running the tool.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the tool that was run.\n"
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string of the arguments passed to the tool.\n"
+          },
+          "output": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The output from the tool call.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "error": {
+            "description": "The error from the tool call, if any.",
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaMCPToolCallError"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaMCPToolCallStatus",
+            "description": "The status of the tool call. One of `in_progress`, `completed`, `incomplete`, `calling`, or `failed`.\n"
+          },
+          "approval_request_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Unique identifier for the MCP tool call approval request.\nInclude this value in a subsequent `mcp_approval_response` input to approve or reject the corresponding tool call.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "server_label",
+          "name",
+          "arguments"
+        ]
+      },
+      "BetaMCPToolCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete",
+          "calling",
+          "failed"
+        ]
+      },
+      "BetaMCPToolCallError": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaMCPProtocolError"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPToolExecutionError"
+          },
+          {
+            "$ref": "#/components/schemas/BetaHTTPError"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaHTTPError": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "http_error"
+            ],
+            "default": "http_error",
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "integer"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "BetaMCPToolExecutionError": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_tool_execution_error"
+            ],
+            "default": "mcp_tool_execution_error",
+            "x-stainless-const": true
+          },
+          "content": {}
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "content"
+        ]
+      },
+      "BetaMCPProtocolError": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_protocol_error"
+            ],
+            "default": "mcp_protocol_error",
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "integer"
+          },
+          "message": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "code",
+          "message"
+        ]
+      },
+      "BetaMCPApprovalResponse": {
+        "type": "object",
+        "title": "MCP approval response",
+        "description": "A response to an MCP approval request.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_approval_response"
+            ],
+            "description": "The type of the item. Always `mcp_approval_response`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the approval response\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "approval_request_id": {
+            "type": "string",
+            "description": "The ID of the approval request being answered.\n"
+          },
+          "approve": {
+            "type": "boolean",
+            "description": "Whether the request was approved.\n"
+          },
+          "reason": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional reason for the decision.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "request_id",
+          "approve",
+          "approval_request_id"
+        ]
+      },
+      "BetaMCPApprovalRequest": {
+        "type": "object",
+        "title": "MCP approval request",
+        "description": "A request for human approval of a tool invocation.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_approval_request"
+            ],
+            "description": "The type of the item. Always `mcp_approval_request`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the approval request.\n"
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server making the request.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the tool to run.\n"
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string of arguments for the tool.\n"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "server_label",
+          "name",
+          "arguments"
+        ]
+      },
+      "BetaMCPListTools": {
+        "type": "object",
+        "title": "MCP list tools",
+        "description": "A list of tools available on an MCP server.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_list_tools"
+            ],
+            "description": "The type of the item. Always `mcp_list_tools`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the list.\n"
+          },
+          "server_label": {
+            "type": "string",
+            "description": "The label of the MCP server.\n"
+          },
+          "tools": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BetaMCPListToolsTool"
+            },
+            "description": "The tools available on the server.\n"
+          },
+          "error": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Error message if the server could not list tools.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "server_label",
+          "tools"
+        ]
+      },
+      "BetaMCPListToolsTool": {
+        "type": "object",
+        "title": "MCP list tools tool",
+        "description": "A tool available on an MCP server.\n",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "The name of the tool.\n"
+          },
+          "description": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The description of the tool.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "input_schema": {
+            "type": "object",
+            "description": "The JSON schema describing the tool's input.\n"
+          },
+          "annotations": {
+            "anyOf": [
+              {
+                "type": "object",
+                "description": "Additional annotations about the tool.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "name",
+          "input_schema"
+        ]
+      },
+      "BetaApplyPatchToolCallOutputItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch_call_output"
+            ],
+            "description": "The type of the item. Always `apply_patch_call_output`.",
+            "default": "apply_patch_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the apply patch tool call output. Populated when this item is returned via API.",
+                "example": "apco_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the apply patch tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaApplyPatchCallOutputStatusParam",
+            "description": "The status of the apply patch tool call output. One of `completed` or `failed`."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 10485760,
+                "description": "Optional human-readable log text from the apply patch tool (e.g., patch results or errors)."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "call_id",
+          "status"
+        ],
+        "title": "Apply patch tool call output",
+        "description": "The streamed output emitted by an apply patch tool call."
+      },
+      "BetaApplyPatchCallOutputStatusParam": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "failed"
+        ],
+        "title": "Apply patch call output status",
+        "description": "Outcome values reported for apply_patch tool call outputs."
+      },
+      "BetaApplyPatchToolCallItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch_call"
+            ],
+            "description": "The type of the item. Always `apply_patch_call`.",
+            "default": "apply_patch_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the apply patch tool call. Populated when this item is returned via API.",
+                "example": "apc_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the apply patch tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaApplyPatchCallStatusParam",
+            "description": "The status of the apply patch tool call. One of `in_progress` or `completed`."
+          },
+          "operation": {
+            "$ref": "#/components/schemas/BetaApplyPatchOperationParam",
+            "description": "The specific create, delete, or update instruction for the apply_patch tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "call_id",
+          "status",
+          "operation"
+        ],
+        "title": "Apply patch tool call",
+        "description": "A tool call representing a request to create, delete, or update files using diff patches."
+      },
+      "BetaApplyPatchOperationParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchCreateFileOperationParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchDeleteFileOperationParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchUpdateFileOperationParam"
+          }
+        ],
+        "title": "Apply patch operation",
+        "description": "One of the create_file, delete_file, or update_file operations supplied to the apply_patch tool.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaApplyPatchUpdateFileOperationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "update_file"
+            ],
+            "description": "The operation type. Always `update_file`.",
+            "default": "update_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "description": "Path of the file to update relative to the workspace root."
+          },
+          "diff": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Unified diff content to apply to the existing file."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path",
+          "diff"
+        ],
+        "title": "Apply patch update file operation",
+        "description": "Instruction for updating an existing file via the apply_patch tool."
+      },
+      "BetaApplyPatchDeleteFileOperationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "delete_file"
+            ],
+            "description": "The operation type. Always `delete_file`.",
+            "default": "delete_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "description": "Path of the file to delete relative to the workspace root."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path"
+        ],
+        "title": "Apply patch delete file operation",
+        "description": "Instruction for deleting an existing file via the apply_patch tool."
+      },
+      "BetaApplyPatchCreateFileOperationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "create_file"
+            ],
+            "description": "The operation type. Always `create_file`.",
+            "default": "create_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "minLength": 1,
+            "description": "Path of the file to create relative to the workspace root."
+          },
+          "diff": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Unified diff content to apply when creating the file."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path",
+          "diff"
+        ],
+        "title": "Apply patch create file operation",
+        "description": "Instruction for creating a new file via the apply_patch tool."
+      },
+      "BetaApplyPatchCallStatusParam": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed"
+        ],
+        "title": "Apply patch call status",
+        "description": "Status values reported for apply_patch tool calls."
+      },
+      "BetaFunctionShellCallOutputItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the shell tool call output. Populated when this item is returned via API.",
+                "example": "sho_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the shell tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell_call_output"
+            ],
+            "description": "The type of the item. Always `shell_call_output`.",
+            "default": "shell_call_output",
+            "x-stainless-const": true
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/BetaFunctionShellCallOutputContentParam"
+            },
+            "type": "array",
+            "description": "Captured chunks of stdout and stderr output, along with their associated outcomes."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaFunctionShellCallItemStatus",
+                "description": "The status of the shell call output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_output_length": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "The maximum number of UTF-8 characters captured for this shell call's combined output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "call_id",
+          "type",
+          "output"
+        ],
+        "title": "Shell tool call output",
+        "description": "The streamed output items emitted by a shell tool call."
+      },
+      "BetaFunctionShellCallItemStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ],
+        "title": "Shell call status",
+        "description": "Status values reported for shell tool calls."
+      },
+      "BetaFunctionShellCallOutputContentParam": {
+        "properties": {
+          "stdout": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Captured stdout output for the shell call."
+          },
+          "stderr": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Captured stderr output for the shell call."
+          },
+          "outcome": {
+            "$ref": "#/components/schemas/BetaFunctionShellCallOutputOutcomeParam",
+            "description": "The exit or timeout outcome associated with this shell call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "stdout",
+          "stderr",
+          "outcome"
+        ],
+        "title": "Shell output content",
+        "description": "Captured stdout and stderr for a portion of a shell tool call output."
+      },
+      "BetaFunctionShellCallOutputOutcomeParam": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCallOutputTimeoutOutcomeParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCallOutputExitOutcomeParam"
+          }
+        ],
+        "title": "Shell call outcome",
+        "description": "The exit or timeout outcome associated with this shell call.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaFunctionShellCallOutputExitOutcomeParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "exit"
+            ],
+            "description": "The outcome type. Always `exit`.",
+            "default": "exit",
+            "x-stainless-const": true
+          },
+          "exit_code": {
+            "type": "integer",
+            "description": "The exit code returned by the shell process."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "exit_code"
+        ],
+        "title": "Shell call exit outcome",
+        "description": "Indicates that the shell commands finished and returned an exit code."
+      },
+      "BetaFunctionShellCallOutputTimeoutOutcomeParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "timeout"
+            ],
+            "description": "The outcome type. Always `timeout`.",
+            "default": "timeout",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Shell call timeout outcome",
+        "description": "Indicates that the shell call exceeded its configured time limit."
+      },
+      "BetaFunctionShellCallItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the shell tool call. Populated when this item is returned via API.",
+                "example": "sh_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the shell tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell_call"
+            ],
+            "description": "The type of the item. Always `shell_call`.",
+            "default": "shell_call",
+            "x-stainless-const": true
+          },
+          "action": {
+            "$ref": "#/components/schemas/BetaFunctionShellActionParam",
+            "description": "The shell commands and limits that describe how to run the tool call."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaFunctionShellCallItemStatus",
+                "description": "The status of the shell call. One of `in_progress`, `completed`, or `incomplete`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "environment": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaLocalEnvironmentParam"
+                  },
+                  {
+                    "$ref": "#/components/schemas/BetaContainerReferenceParam"
+                  }
+                ],
+                "description": "The environment to execute the shell commands in.",
+                "discriminator": {
+                  "propertyName": "type"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "call_id",
+          "type",
+          "action"
+        ],
+        "title": "Shell tool call",
+        "description": "A tool representing a request to execute one or more shell commands."
+      },
+      "BetaFunctionShellActionParam": {
+        "properties": {
+          "commands": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "description": "Ordered shell commands for the execution environment to run."
+          },
+          "timeout_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Maximum wall-clock time in milliseconds to allow the shell commands to run."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_output_length": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Maximum number of UTF-8 characters to capture from combined stdout and stderr output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "commands"
+        ],
+        "title": "Shell action",
+        "description": "Commands and limits describing how to run the shell tool call."
+      },
+      "BetaLocalShellToolCallOutput": {
+        "type": "object",
+        "title": "Local shell call output",
+        "description": "The output of a local shell tool call.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "local_shell_call_output"
+            ],
+            "description": "The type of the local shell tool call output. Always `local_shell_call_output`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the local shell tool call generated by the model.\n"
+          },
+          "output": {
+            "type": "string",
+            "description": "A JSON string of the output of the local shell tool call.\n"
+          },
+          "status": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "in_progress",
+                  "completed",
+                  "incomplete"
+                ],
+                "description": "The status of the item. One of `in_progress`, `completed`, or `incomplete`.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "call_id",
+          "output"
+        ]
+      },
+      "BetaLocalShellToolCall": {
+        "type": "object",
+        "title": "Local shell call",
+        "description": "A tool call to run a command on the local shell.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "local_shell_call"
+            ],
+            "description": "The type of the local shell call. Always `local_shell_call`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the local shell call.\n"
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the local shell tool call generated by the model.\n"
+          },
+          "action": {
+            "$ref": "#/components/schemas/BetaLocalShellExecAction"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ],
+            "description": "The status of the local shell call.\n"
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "action",
+          "status"
+        ]
+      },
+      "BetaLocalShellExecAction": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "exec"
+            ],
+            "description": "The type of the local shell action. Always `exec`.",
+            "default": "exec",
+            "x-stainless-const": true
+          },
+          "command": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "description": "The command to run."
+          },
+          "timeout_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Optional timeout in milliseconds for the command."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "working_directory": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional working directory to run the command in."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "env": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "type": "object",
+            "description": "Environment variables to set for the command.",
+            "x-oaiTypeLabel": "map"
+          },
+          "user": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional user to run the command as."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "command",
+          "env"
+        ],
+        "title": "Local shell exec action",
+        "description": "Execute a shell command on the server."
+      },
+      "BetaCodeInterpreterToolCall": {
+        "type": "object",
+        "title": "Code interpreter tool call",
+        "description": "A tool call to run code.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "code_interpreter_call"
+            ],
+            "default": "code_interpreter_call",
+            "x-stainless-const": true,
+            "description": "The type of the code interpreter tool call. Always `code_interpreter_call`.\n"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the code interpreter tool call.\n"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete",
+              "interpreting",
+              "failed"
+            ],
+            "description": "The status of the code interpreter tool call. Valid values are `in_progress`, `completed`, `incomplete`, `interpreting`, and `failed`.\n"
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The ID of the container used to run the code.\n"
+          },
+          "code": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The code to run, or null if not available.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "outputs": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/BetaCodeInterpreterOutputLogs"
+                    },
+                    {
+                      "$ref": "#/components/schemas/BetaCodeInterpreterOutputImage"
+                    }
+                  ],
+                  "discriminator": {
+                    "propertyName": "type"
+                  }
+                },
+                "discriminator": {
+                  "propertyName": "type"
+                },
+                "description": "The outputs generated by the code interpreter, such as logs or images.\nCan be null if no outputs are available.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "status",
+          "container_id",
+          "code",
+          "outputs"
+        ]
+      },
+      "BetaCodeInterpreterOutputImage": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "image"
+            ],
+            "description": "The type of the output. Always `image`.",
+            "default": "image",
+            "x-stainless-const": true
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the image output from the code interpreter."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "url"
+        ],
+        "title": "Code interpreter output image",
+        "description": "The image output from the code interpreter."
+      },
+      "BetaCodeInterpreterOutputLogs": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "logs"
+            ],
+            "description": "The type of the output. Always `logs`.",
+            "default": "logs",
+            "x-stainless-const": true
+          },
+          "logs": {
+            "type": "string",
+            "description": "The logs output from the code interpreter."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "logs"
+        ],
+        "title": "Code interpreter output logs",
+        "description": "The logs output from the code interpreter."
+      },
+      "BetaImageGenToolCall": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "image_generation_call"
+            ],
+            "description": "The type of the image generation call. Always `image_generation_call`.",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the image generation call."
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "in_progress",
+              "completed",
+              "generating",
+              "failed"
+            ],
+            "description": "The status of the image generation call."
+          },
+          "result": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The generated image encoded in base64."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "size": {
+            "anyOf": [
+              {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "string",
+                    "enum": [
+                      "1024x1024",
+                      "1024x1536",
+                      "1536x1024"
+                    ]
+                  }
+                ],
+                "description": "The image dimensions as a `WIDTHxHEIGHT` string, for example `1536x864`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "quality": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "low",
+                  "medium",
+                  "high",
+                  "xhigh",
+                  "max",
+                  "auto"
+                ],
+                "description": "The quality of the image generated by the image generation tool call. One of `low`, `medium`, `high`, `xhigh`, `max`, or `auto`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "action": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaImageGenActionEnum",
+                "description": "The action used for image generation."
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "x-openai-go-optional-enum": true
+          },
+          "background": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaImageBackground",
+                "description": "The background setting used for generation."
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "x-openai-go-optional-enum": true
+          },
+          "output_format": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaImageOutputFormat",
+                "description": "The output format used for generation."
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "x-openai-go-optional-enum": true
+          },
+          "revised_prompt": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The prompt that was used after any model prompt rewriting."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "status",
+          "result"
+        ],
+        "title": "Image generation call",
+        "description": "An image generation request made by the model."
+      },
+      "BetaImageOutputFormat": {
+        "type": "string",
+        "enum": [
+          "png",
+          "webp",
+          "jpeg"
+        ]
+      },
+      "BetaImageBackground": {
+        "type": "string",
+        "enum": [
+          "transparent",
+          "opaque",
+          "auto"
+        ]
+      },
+      "BetaCompactionSummaryItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the compaction item.",
+                "example": "cmp_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction"
+            ],
+            "description": "The type of the item. Always `compaction`.",
+            "default": "compaction",
+            "x-stainless-const": true
+          },
+          "encrypted_content": {
+            "type": "string",
+            "maxLength": 20971520,
+            "description": "The encrypted content of the compaction summary."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "encrypted_content"
+        ],
+        "title": "Compaction item",
+        "description": "A compaction item generated by the [`v1/responses/compact` API](https://developers.openai.com/api/reference/resources/responses/methods/compact)."
+      },
+      "BetaReasoningItem": {
+        "type": "object",
+        "description": "A description of the chain of thought used by a reasoning model while generating\na response. Be sure to include these items in your `input` to the Responses API\nfor subsequent turns of a conversation if you are manually\n[managing context](https://developers.openai.com/api/docs/guides/conversation-state).\n",
+        "title": "Reasoning",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the object. Always `reasoning`.\n",
+            "enum": [
+              "reasoning"
+            ],
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique identifier of the reasoning content.\n"
+          },
+          "encrypted_content": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The encrypted content of the reasoning item. This is populated by default\nfor reasoning items returned by `POST /v1/responses` and WebSocket\n`response.create` requests.\n\nWhen streaming, use the completed reasoning item and its\n`encrypted_content` from the `response.output_item.done` event in\nsubsequent requests. The `encrypted_content` in\n`response.output_item.added` may be incomplete. This is especially\nimportant when `store` is `false` or when using Zero Data Retention.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "summary": {
+            "type": "array",
+            "description": "Reasoning summary content.\n",
+            "items": {
+              "$ref": "#/components/schemas/BetaSummaryTextContent"
+            }
+          },
+          "content": {
+            "type": "array",
+            "description": "Reasoning text content.\n",
+            "items": {
+              "$ref": "#/components/schemas/BetaReasoningTextContent"
+            }
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "summary",
+          "type"
+        ]
+      },
+      "BetaReasoningTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "reasoning_text"
+            ],
+            "description": "The type of the reasoning text. Always `reasoning_text`.",
+            "default": "reasoning_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The reasoning text from the model."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Reasoning text",
+        "description": "Reasoning text from the model."
+      },
+      "BetaSummaryTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "summary_text"
+            ],
+            "description": "The type of the object. Always `summary_text`.",
+            "default": "summary_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "A summary of the reasoning output from the model so far."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Summary text",
+        "description": "A summary text from the model."
+      },
+      "BetaResponseConfigurationUpdateItemParam": {
+        "type": "object",
+        "description": "An update to the conversation's response configuration. The configuration\nremains in effect for subsequent responses until it is replaced by another\nconfiguration update.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the configuration update item.",
+                "example": "cnfu_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "configuration_update"
+            ],
+            "description": "The item type. Always `configuration_update`.",
+            "default": "configuration_update",
+            "x-stainless-const": true
+          },
+          "reasoning": {
+            "type": "object",
+            "description": "Updates to reasoning configuration. Only effort is supported.",
+            "properties": {
+              "effort": {
+                "$ref": "#/components/schemas/BetaReasoningEffort",
+                "description": "The reasoning effort to use for subsequent responses until another\nconfiguration update replaces it.\n"
+              }
+            }
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaAdditionalToolsItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this additional tools item.",
+                "example": "at_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "additional_tools"
+            ],
+            "description": "The item type. Always `additional_tools`.",
+            "default": "additional_tools",
+            "x-stainless-const": true
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "developer"
+            ],
+            "description": "The role that provided the additional tools. Only `developer` is supported.",
+            "default": "developer",
+            "x-stainless-const": true
+          },
+          "tools": {
+            "items": {
+              "$ref": "#/components/schemas/BetaTool"
+            },
+            "type": "array",
+            "description": "A list of additional tools made available at this item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "role",
+          "tools"
+        ]
+      },
+      "BetaToolSearchOutputItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this tool search output.",
+                "example": "tso_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "minLength": 1,
+                "description": "The unique ID of the tool search call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search_output"
+            ],
+            "description": "The item type. Always `tool_search_output`.",
+            "default": "tool_search_output",
+            "x-stainless-const": true
+          },
+          "execution": {
+            "$ref": "#/components/schemas/BetaToolSearchExecutionType",
+            "description": "Whether tool search was executed by the server or by the client."
+          },
+          "tools": {
+            "items": {
+              "$ref": "#/components/schemas/BetaTool"
+            },
+            "type": "array",
+            "description": "The loaded tool definitions returned by the tool search output."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaFunctionCallItemStatus",
+                "description": "The status of the tool search output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "tools"
+        ]
+      },
+      "BetaFunctionCallItemStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "BetaToolSearchCallItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this tool search call.",
+                "example": "tsc_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "minLength": 1,
+                "description": "The unique ID of the tool search call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search_call"
+            ],
+            "description": "The item type. Always `tool_search_call`.",
+            "default": "tool_search_call",
+            "x-stainless-const": true
+          },
+          "execution": {
+            "$ref": "#/components/schemas/BetaToolSearchExecutionType",
+            "description": "Whether tool search was executed by the server or by the client."
+          },
+          "arguments": {
+            "$ref": "#/components/schemas/BetaEmptyModelParam",
+            "description": "The arguments supplied to the tool search call."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaFunctionCallItemStatus",
+                "description": "The status of the tool search call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "arguments"
+        ]
+      },
+      "BetaMultiAgentCallOutputItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this multi-agent call output.",
+                "example": "maco_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID of the multi-agent call."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "multi_agent_call_output"
+            ],
+            "description": "The item type. Always `multi_agent_call_output`.",
+            "default": "multi_agent_call_output",
+            "x-stainless-const": true
+          },
+          "action": {
+            "$ref": "#/components/schemas/BetaMultiAgentAction1",
+            "description": "The multi-agent action that produced this result."
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/BetaOutputTextContentParam"
+            },
+            "type": "array",
+            "description": "Text output returned by the multi-agent action."
+          }
+        },
+        "type": "object",
+        "required": [
+          "call_id",
+          "type",
+          "action",
+          "output"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaOutputTextContentParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_text"
+            ],
+            "description": "The content type. Always `output_text`.",
+            "default": "output_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "The text content."
+          },
+          "annotations": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/BetaFileCitationParam"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaUrlCitationParam"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaContainerFileCitationParam"
+                }
+              ],
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "description": "Citations associated with the text content."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ]
+      },
+      "BetaContainerFileCitationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_file_citation"
+            ],
+            "description": "The citation type. Always `container_file_citation`.",
+            "default": "container_file_citation",
+            "x-stainless-const": true
+          },
+          "start_index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the first character of the citation in the message."
+          },
+          "end_index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the last character of the citation in the message."
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The ID of the container.",
+            "example": "cntr_123"
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the container file.",
+            "example": "cfile_123"
+          },
+          "filename": {
+            "type": "string",
+            "description": "The filename of the container file cited."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "start_index",
+          "end_index",
+          "container_id",
+          "file_id",
+          "filename"
+        ]
+      },
+      "BetaUrlCitationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "url_citation"
+            ],
+            "description": "The citation type. Always `url_citation`.",
+            "default": "url_citation",
+            "x-stainless-const": true
+          },
+          "start_index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the first character of the citation in the message."
+          },
+          "end_index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the last character of the citation in the message."
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the cited resource."
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the cited resource."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "start_index",
+          "end_index",
+          "url",
+          "title"
+        ]
+      },
+      "BetaFileCitationParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_citation"
+            ],
+            "description": "The citation type. Always `file_citation`.",
+            "default": "file_citation",
+            "x-stainless-const": true
+          },
+          "index": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "The index of the file in the list of files."
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file.",
+            "example": "file-123"
+          },
+          "filename": {
+            "type": "string",
+            "description": "The filename of the file cited."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "index",
+          "file_id",
+          "filename"
+        ]
+      },
+      "BetaMultiAgentAction1": {
+        "type": "string",
+        "enum": [
+          "spawn_agent",
+          "interrupt_agent",
+          "list_agents",
+          "send_message",
+          "followup_task",
+          "wait_agent"
+        ]
+      },
+      "BetaMultiAgentCallItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this multi-agent call.",
+                "example": "mac_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The unique ID linking this call to its output."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "multi_agent_call"
+            ],
+            "description": "The item type. Always `multi_agent_call`.",
+            "default": "multi_agent_call",
+            "x-stainless-const": true
+          },
+          "action": {
+            "$ref": "#/components/schemas/BetaMultiAgentAction1",
+            "description": "The multi-agent action that was executed."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The action arguments as a JSON string."
+          }
+        },
+        "type": "object",
+        "required": [
+          "call_id",
+          "type",
+          "action",
+          "arguments"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaAgentMessageItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this agent message item.",
+                "example": "amsg_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent_message"
+            ],
+            "description": "The item type. Always `agent_message`.",
+            "default": "agent_message",
+            "x-stainless-const": true
+          },
+          "author": {
+            "type": "string",
+            "description": "The sending agent identity."
+          },
+          "recipient": {
+            "type": "string",
+            "description": "The destination agent identity."
+          },
+          "content": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/BetaInputTextContentParam"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInputImageContentParamAutoParam"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaEncryptedContentParam"
+                }
+              ],
+              "description": "A plaintext, image, or encrypted agent message content part.",
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "description": "Plaintext, image, or encrypted content sent between agents."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "author",
+          "recipient",
+          "content"
+        ],
+        "title": "Agent message",
+        "description": "A message routed between agents.",
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaEncryptedContentParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "encrypted_content"
+            ],
+            "description": "The type of the input item. Always `encrypted_content`.",
+            "default": "encrypted_content",
+            "x-stainless-const": true
+          },
+          "encrypted_content": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "Opaque encrypted content."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "encrypted_content"
+        ],
+        "title": "Encrypted content",
+        "description": "Opaque encrypted content that Responses API decrypts inside trusted model execution.",
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaInputImageContentParamAutoParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_image"
+            ],
+            "description": "The type of the input item. Always `input_image`.",
+            "default": "input_image",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 20971520,
+                "format": "uri",
+                "description": "The URL of the image to be sent to the model. A fully qualified URL or base64 encoded image in a data URL."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the file to be sent to the model.",
+                "example": "file-123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "detail": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaDetailEnum",
+                "description": "The detail level of the image to be sent to the model. One of `high`, `low`, `auto`, or `original`. Defaults to `auto`."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_breakpoint": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaPromptCacheBreakpointParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Input image",
+        "description": "An image input to the model. Learn about [image inputs](https://developers.openai.com/api/docs/guides/images-vision)"
+      },
+      "BetaPromptCacheBreakpointParam": {
+        "properties": {
+          "mode": {
+            "type": "string",
+            "enum": [
+              "explicit"
+            ],
+            "description": "The breakpoint mode. Always `explicit`.",
+            "default": "explicit",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "mode"
+        ],
+        "title": "Prompt cache breakpoint",
+        "description": "Marks the exact end of a reusable prompt prefix. The breakpoint inherits its TTL from the request's `prompt_cache_options.ttl`; the boundary is not rounded to a token block."
+      },
+      "BetaDetailEnum": {
+        "type": "string",
+        "enum": [
+          "low",
+          "high",
+          "auto",
+          "original"
+        ]
+      },
+      "BetaInputTextContentParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_text"
+            ],
+            "description": "The type of the input item. Always `input_text`.",
+            "default": "input_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "maxLength": 10485760,
+            "description": "The text input to the model."
+          },
+          "prompt_cache_breakpoint": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaPromptCacheBreakpointParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Input text",
+        "description": "A text input to the model."
+      },
+      "BetaFunctionCallOutputItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the function tool call output. Populated when this item is returned via API.",
+                "example": "fc_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "minLength": 1,
+                "description": "The unique ID of the function tool call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call_output"
+            ],
+            "description": "The type of the function tool call output. Always `function_call_output`.",
+            "default": "function_call_output",
+            "x-stainless-const": true
+          },
+          "output": {
+            "oneOf": [
+              {
+                "type": "string",
+                "maxLength": 10485760,
+                "description": "A JSON string of the output of the function tool call."
+              },
+              {
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/BetaInputTextContentParam"
+                    },
+                    {
+                      "$ref": "#/components/schemas/BetaInputImageContentParamAutoParam"
+                    },
+                    {
+                      "$ref": "#/components/schemas/BetaInputFileContentParam"
+                    }
+                  ],
+                  "description": "A piece of message content, such as text, an image, or a file.",
+                  "discriminator": {
+                    "propertyName": "type"
+                  }
+                },
+                "type": "array",
+                "description": "An array of content outputs (text, image, file) for the function tool call."
+              }
+            ],
+            "description": "Text, image, or file output of the function tool call."
+          },
+          "name": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 128,
+                "minLength": 1,
+                "description": "The name of the tool that produced the output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "namespace": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "minLength": 1,
+                "pattern": "^[a-zA-Z0-9_-]+$",
+                "description": "The namespace of the tool that produced the output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCallerParam",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaFunctionCallItemStatus",
+                "description": "The status of the item. One of `in_progress`, `completed`, or `incomplete`. Populated when items are returned via API."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "output"
+        ],
+        "title": "Function tool call output",
+        "description": "The output of a function tool call."
+      },
+      "BetaInputFileContentParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "input_file"
+            ],
+            "description": "The type of the input item. Always `input_file`.",
+            "default": "input_file",
+            "x-stainless-const": true
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the file to be sent to the model.",
+                "example": "file-123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "filename": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The name of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_data": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 73400320,
+                "description": "The base64-encoded data of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri",
+                "description": "The URL of the file to be sent to the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "detail": {
+            "$ref": "#/components/schemas/BetaFileDetailEnum",
+            "description": "The detail level of the file to be sent to the model. Use `auto` to let the system select the detail level; for GPT-5.6 and later models, `auto` uses high-quality rendering, which may increase input token usage. Use `low` for lower-cost rendering, or `high` to render the file at higher quality. Defaults to `auto`."
+          },
+          "prompt_cache_breakpoint": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaPromptCacheBreakpointParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Input file",
+        "description": "A file input to the model."
+      },
+      "BetaFileDetailEnum": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "low",
+          "high"
+        ]
+      },
+      "BetaFunctionToolCall": {
+        "type": "object",
+        "title": "Function tool call",
+        "description": "A tool call to run a function. See the\n[function calling guide](https://developers.openai.com/api/docs/guides/function-calling) for more information.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the function tool call.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call"
+            ],
+            "description": "The type of the function tool call. Always `function_call`.\n",
+            "x-stainless-const": true
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the function tool call generated by the model.\n"
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCaller"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "namespace": {
+            "type": "string",
+            "description": "The namespace of the function to run.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the function to run.\n"
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string of the arguments to pass to the function.\n"
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          },
+          "async": {
+            "type": "boolean",
+            "description": "Whether the function tool call runs asynchronously.\n"
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "name",
+          "arguments"
+        ]
+      },
+      "BetaWebSearchToolCall": {
+        "type": "object",
+        "title": "Web search tool call",
+        "description": "The results of a web search tool call. See the\n[web search guide](https://developers.openai.com/api/docs/guides/tools-web-search) for more information.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the web search tool call.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "web_search_call"
+            ],
+            "description": "The type of the web search tool call. Always `web_search_call`.\n",
+            "x-stainless-const": true
+          },
+          "status": {
+            "description": "The status of the web search tool call.\n",
+            "$ref": "#/components/schemas/BetaWebSearchCallStatus"
+          },
+          "action": {
+            "type": "object",
+            "description": "An object describing the specific action taken in this web search call.\nIncludes details on how the model used the web (search, open_page, find_in_page).\n",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BetaWebSearchActionSearch"
+              },
+              {
+                "$ref": "#/components/schemas/BetaWebSearchActionOpenPage"
+              },
+              {
+                "$ref": "#/components/schemas/BetaWebSearchActionFind"
+              }
+            ],
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "status",
+          "action"
+        ]
+      },
+      "BetaWebSearchActionFind": {
+        "type": "object",
+        "title": "Find action",
+        "description": "Action type \"find_in_page\": Searches for a pattern within a loaded page.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "find_in_page"
+            ],
+            "description": "The action type.\n",
+            "x-stainless-const": true
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the page searched for the pattern.\n"
+          },
+          "pattern": {
+            "type": "string",
+            "description": "The pattern or text to search for within the page.\n"
+          }
+        },
+        "required": [
+          "type",
+          "url",
+          "pattern"
+        ]
+      },
+      "BetaWebSearchActionOpenPage": {
+        "type": "object",
+        "title": "Open page action",
+        "description": "Action type \"open_page\" - Opens a specific URL from search results.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "open_page"
+            ],
+            "description": "The action type.\n",
+            "x-stainless-const": true
+          },
+          "url": {
+            "description": "The URL opened by the model.\n",
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaWebSearchActionSearch": {
+        "type": "object",
+        "title": "Search action",
+        "description": "Action type \"search\" - Performs a web search query.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "search"
+            ],
+            "description": "The action type.\n",
+            "x-stainless-const": true
+          },
+          "query": {
+            "type": "string",
+            "deprecated": true,
+            "description": "The search query.\n"
+          },
+          "queries": {
+            "type": "array",
+            "title": "Search queries",
+            "description": "The search queries.\n",
+            "items": {
+              "type": "string",
+              "description": "A search query.\n"
+            }
+          },
+          "sources": {
+            "type": "array",
+            "title": "Web search sources",
+            "description": "The sources used in the search.\n",
+            "items": {
+              "type": "object",
+              "title": "Web search source",
+              "description": "A source used in the search.\n",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "url"
+                  ],
+                  "description": "The type of source. Always `url`.\n",
+                  "x-stainless-const": true
+                },
+                "url": {
+                  "type": "string",
+                  "format": "uri",
+                  "description": "The URL of the source.\n"
+                }
+              },
+              "required": [
+                "type",
+                "url"
+              ]
+            }
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaWebSearchCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "searching",
+          "completed",
+          "failed",
+          "incomplete"
+        ]
+      },
+      "BetaComputerCallOutputItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of the computer tool call output.",
+                "example": "cuo_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "call_id": {
+            "type": "string",
+            "maxLength": 64,
+            "minLength": 1,
+            "description": "The ID of the computer tool call that produced the output."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer_call_output"
+            ],
+            "description": "The type of the computer tool call output. Always `computer_call_output`.",
+            "default": "computer_call_output",
+            "x-stainless-const": true
+          },
+          "output": {
+            "$ref": "#/components/schemas/BetaComputerScreenshotImage"
+          },
+          "acknowledged_safety_checks": {
+            "anyOf": [
+              {
+                "items": {
+                  "$ref": "#/components/schemas/BetaComputerCallSafetyCheckParam"
+                },
+                "type": "array",
+                "description": "The safety checks reported by the API that have been acknowledged by the developer."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaFunctionCallItemStatus",
+                "description": "The status of the message input. One of `in_progress`, `completed`, or `incomplete`. Populated when input items are returned via API."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "call_id",
+          "type",
+          "output"
+        ],
+        "title": "Computer tool call output",
+        "description": "The output of a computer tool call."
+      },
+      "BetaComputerCallSafetyCheckParam": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The ID of the pending safety check."
+          },
+          "code": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The type of the pending safety check."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Details about the pending safety check."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "description": "A pending safety check for the computer call."
+      },
+      "BetaComputerScreenshotImage": {
+        "type": "object",
+        "description": "A computer screenshot image used with the computer use tool.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer_screenshot"
+            ],
+            "default": "computer_screenshot",
+            "description": "Specifies the event type. For a computer screenshot, this property is \nalways set to `computer_screenshot`.\n",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the screenshot image."
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The identifier of an uploaded file that contains the screenshot."
+          }
+        },
+        "required": [
+          "type"
+        ]
+      },
+      "BetaComputerToolCall": {
+        "type": "object",
+        "title": "Computer tool call",
+        "description": "A tool call to a computer use tool. See the\n[computer use guide](https://developers.openai.com/api/docs/guides/tools-computer-use) for more information.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the computer call. Always `computer_call`.",
+            "enum": [
+              "computer_call"
+            ],
+            "default": "computer_call"
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the computer call."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "An identifier used when responding to the tool call with output.\n"
+          },
+          "action": {
+            "$ref": "#/components/schemas/BetaComputerAction"
+          },
+          "actions": {
+            "$ref": "#/components/schemas/BetaComputerActionList"
+          },
+          "pending_safety_checks": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BetaComputerCallSafetyCheckParam"
+            },
+            "description": "The pending safety checks for the computer call.\n"
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "pending_safety_checks",
+          "status"
+        ]
+      },
+      "BetaComputerActionList": {
+        "title": "Computer Action List",
+        "type": "array",
+        "description": "Flattened batched actions for `computer_use`. Each action includes an\n`type` discriminator and action-specific fields.\n",
+        "items": {
+          "$ref": "#/components/schemas/BetaComputerAction"
+        }
+      },
+      "BetaComputerAction": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaClickParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaDoubleClickAction"
+          },
+          {
+            "$ref": "#/components/schemas/BetaDragParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaKeyPressAction"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMoveParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaScreenshotParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaScrollParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaTypeParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaWaitParam"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaWaitParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "wait"
+            ],
+            "description": "Specifies the event type. For a wait action, this property is always set to `wait`.",
+            "default": "wait",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Wait",
+        "description": "A wait action."
+      },
+      "BetaTypeParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "type"
+            ],
+            "description": "Specifies the event type. For a type action, this property is always set to `type`.",
+            "default": "type",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text to type."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Type",
+        "description": "An action to type in text."
+      },
+      "BetaScrollParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "scroll"
+            ],
+            "description": "Specifies the event type. For a scroll action, this property is always set to `scroll`.",
+            "default": "scroll",
+            "x-stainless-const": true
+          },
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate where the scroll occurred."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate where the scroll occurred."
+          },
+          "scroll_x": {
+            "type": "integer",
+            "description": "The horizontal scroll distance."
+          },
+          "scroll_y": {
+            "type": "integer",
+            "description": "The vertical scroll distance."
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while scrolling."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "x",
+          "y",
+          "scroll_x",
+          "scroll_y"
+        ],
+        "title": "Scroll",
+        "description": "A scroll action."
+      },
+      "BetaScreenshotParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "screenshot"
+            ],
+            "description": "Specifies the event type. For a screenshot action, this property is always set to `screenshot`.",
+            "default": "screenshot",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Screenshot",
+        "description": "A screenshot action."
+      },
+      "BetaMoveParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "move"
+            ],
+            "description": "Specifies the event type. For a move action, this property is always set to `move`.",
+            "default": "move",
+            "x-stainless-const": true
+          },
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate to move to."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate to move to."
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while moving the mouse."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "x",
+          "y"
+        ],
+        "title": "Move",
+        "description": "A mouse move action."
+      },
+      "BetaKeyPressAction": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "keypress"
+            ],
+            "description": "Specifies the event type. For a keypress action, this property is always set to `keypress`.",
+            "default": "keypress",
+            "x-stainless-const": true
+          },
+          "keys": {
+            "items": {
+              "type": "string",
+              "description": "One of the keys the model is requesting to be pressed."
+            },
+            "type": "array",
+            "description": "The combination of keys the model is requesting to be pressed. This is an array of strings, each representing a key."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "keys"
+        ],
+        "title": "KeyPress",
+        "description": "A collection of keypresses the model would like to perform."
+      },
+      "BetaDragParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "drag"
+            ],
+            "description": "Specifies the event type. For a drag action, this property is always set to `drag`.",
+            "default": "drag",
+            "x-stainless-const": true
+          },
+          "path": {
+            "items": {
+              "$ref": "#/components/schemas/BetaCoordParam"
+            },
+            "type": "array",
+            "description": "An array of coordinates representing the path of the drag action. Coordinates will appear as an array of objects, eg\n```\n[\n  { x: 100, y: 200 },\n  { x: 200, y: 300 }\n]\n```"
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while dragging the mouse."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path"
+        ],
+        "title": "Drag",
+        "description": "A drag action."
+      },
+      "BetaCoordParam": {
+        "properties": {
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate."
+          }
+        },
+        "type": "object",
+        "required": [
+          "x",
+          "y"
+        ],
+        "title": "Coordinate",
+        "description": "An x/y coordinate pair, e.g. `{ x: 100, y: 200 }`."
+      },
+      "BetaDoubleClickAction": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "double_click"
+            ],
+            "description": "Specifies the event type. For a double click action, this property is always set to `double_click`.",
+            "default": "double_click",
+            "x-stainless-const": true
+          },
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate where the double click occurred."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate where the double click occurred."
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while double-clicking."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "x",
+          "y",
+          "keys"
+        ],
+        "title": "DoubleClick",
+        "description": "A double click action."
+      },
+      "BetaClickParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "click"
+            ],
+            "description": "Specifies the event type. For a click action, this property is always `click`.",
+            "default": "click",
+            "x-stainless-const": true
+          },
+          "button": {
+            "$ref": "#/components/schemas/BetaClickButtonType",
+            "description": "Indicates which mouse button was pressed during the click. One of `left`, `right`, `wheel`, `back`, or `forward`."
+          },
+          "x": {
+            "type": "integer",
+            "description": "The x-coordinate where the click occurred."
+          },
+          "y": {
+            "type": "integer",
+            "description": "The y-coordinate where the click occurred."
+          },
+          "keys": {
+            "anyOf": [
+              {
+                "items": {
+                  "type": "string"
+                },
+                "type": "array",
+                "description": "The keys being held while clicking."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "button",
+          "x",
+          "y"
+        ],
+        "title": "Click",
+        "description": "A click action."
+      },
+      "BetaClickButtonType": {
+        "type": "string",
+        "enum": [
+          "left",
+          "right",
+          "wheel",
+          "back",
+          "forward"
+        ]
+      },
+      "BetaFileSearchToolCall": {
+        "type": "object",
+        "title": "File search tool call",
+        "description": "The results of a file search tool call. See the\n[file search guide](https://developers.openai.com/api/docs/guides/tools-file-search) for more information.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the file search tool call.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_search_call"
+            ],
+            "description": "The type of the file search tool call. Always `file_search_call`.\n",
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the file search tool call. One of `in_progress`,\n`searching`, `incomplete` or `failed`,\n",
+            "enum": [
+              "in_progress",
+              "searching",
+              "completed",
+              "incomplete",
+              "failed"
+            ]
+          },
+          "queries": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "The queries used to search for files.\n"
+          },
+          "results": {
+            "anyOf": [
+              {
+                "type": "array",
+                "description": "The results of the file search tool call.\n",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "file_id": {
+                      "type": "string",
+                      "description": "The unique ID of the file.\n"
+                    },
+                    "text": {
+                      "type": "string",
+                      "description": "The text that was retrieved from the file.\n"
+                    },
+                    "filename": {
+                      "type": "string",
+                      "description": "The name of the file.\n"
+                    },
+                    "attributes": {
+                      "$ref": "#/components/schemas/BetaVectorStoreFileAttributes"
+                    },
+                    "score": {
+                      "type": "number",
+                      "format": "float",
+                      "description": "The relevance score of the file - a value between 0 and 1.\n"
+                    }
+                  }
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "status",
+          "queries"
+        ]
+      },
+      "BetaVectorStoreFileAttributes": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "Set of 16 key-value pairs that can be attached to an object. This can be\nuseful for storing additional information about the object in a structured\nformat, and querying for objects via API or the dashboard. Keys are strings\nwith a maximum length of 64 characters. Values are strings with a maximum\nlength of 512 characters, booleans, or numbers.\n",
+            "maxProperties": 16,
+            "propertyNames": {
+              "type": "string",
+              "maxLength": 64
+            },
+            "additionalProperties": {
+              "oneOf": [
+                {
+                  "type": "string",
+                  "maxLength": 512
+                },
+                {
+                  "type": "number"
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
+            },
+            "x-oaiTypeLabel": "map"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaOutputMessage": {
+        "type": "object",
+        "title": "Output message",
+        "description": "An output message from the model.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the output message.\n"
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the output message. Always `message`.\n",
+            "enum": [
+              "message"
+            ],
+            "x-stainless-const": true
+          },
+          "role": {
+            "type": "string",
+            "description": "The role of the output message. Always `assistant`.\n",
+            "enum": [
+              "assistant"
+            ],
+            "x-stainless-const": true
+          },
+          "content": {
+            "type": "array",
+            "description": "The content of the output message.\n",
+            "items": {
+              "$ref": "#/components/schemas/BetaOutputMessageContent"
+            }
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaMessagePhase"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the message input. One of `in_progress`, `completed`, or\n`incomplete`. Populated when input items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "type",
+          "role",
+          "content",
+          "status"
+        ]
+      },
+      "BetaMessagePhase": {
+        "type": "string",
+        "description": "Labels an `assistant` message as intermediate commentary (`commentary`) or the final answer (`final_answer`).\nFor models like `gpt-5.3-codex` and beyond, when sending follow-up requests, preserve and resend\nphase on all assistant messages — dropping it can degrade performance. Not used for user messages.\n",
+        "enum": [
+          "commentary",
+          "final_answer"
+        ]
+      },
+      "BetaOutputMessageContent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaOutputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaRefusalContent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaRefusalContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "refusal"
+            ],
+            "description": "The type of the refusal. Always `refusal`.",
+            "default": "refusal",
+            "x-stainless-const": true
+          },
+          "refusal": {
+            "type": "string",
+            "description": "The refusal explanation from the model."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "refusal"
+        ],
+        "title": "Refusal",
+        "description": "A refusal from the model."
+      },
+      "BetaOutputTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "output_text"
+            ],
+            "description": "The type of the output text. Always `output_text`.",
+            "default": "output_text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string",
+            "description": "The text output from the model."
+          },
+          "annotations": {
+            "items": {
+              "$ref": "#/components/schemas/BetaAnnotation"
+            },
+            "type": "array",
+            "description": "The annotations of the text output."
+          },
+          "logprobs": {
+            "items": {
+              "$ref": "#/components/schemas/BetaLogProb"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text",
+          "annotations",
+          "logprobs"
+        ],
+        "title": "Output text",
+        "description": "A text output from the model."
+      },
+      "BetaLogProb": {
+        "properties": {
+          "token": {
+            "type": "string"
+          },
+          "logprob": {
+            "type": "number"
+          },
+          "bytes": {
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          },
+          "top_logprobs": {
+            "items": {
+              "$ref": "#/components/schemas/BetaTopLogProb"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object",
+        "required": [
+          "token",
+          "logprob",
+          "bytes",
+          "top_logprobs"
+        ],
+        "title": "Log probability",
+        "description": "The log probability of a token."
+      },
+      "BetaTopLogProb": {
+        "properties": {
+          "token": {
+            "type": "string"
+          },
+          "logprob": {
+            "type": "number"
+          },
+          "bytes": {
+            "items": {
+              "type": "integer"
+            },
+            "type": "array"
+          }
+        },
+        "type": "object",
+        "required": [
+          "token",
+          "logprob",
+          "bytes"
+        ],
+        "title": "Top log probability",
+        "description": "The top log probability of a token."
+      },
+      "BetaAnnotation": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaFileCitationBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaUrlCitationBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaContainerFileCitationBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFilePath"
+          }
+        ],
+        "description": "An annotation that applies to a span of output text.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaFilePath": {
+        "type": "object",
+        "title": "File path",
+        "description": "A path to a file.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the file path. Always `file_path`.\n",
+            "enum": [
+              "file_path"
+            ],
+            "x-stainless-const": true
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file.\n"
+          },
+          "index": {
+            "type": "integer",
+            "description": "The index of the file in the list of files.\n"
+          }
+        },
+        "required": [
+          "type",
+          "file_id",
+          "index"
+        ]
+      },
+      "BetaContainerFileCitationBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_file_citation"
+            ],
+            "description": "The type of the container file citation. Always `container_file_citation`.",
+            "default": "container_file_citation",
+            "x-stainless-const": true
+          },
+          "container_id": {
+            "type": "string",
+            "description": "The ID of the container file."
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file."
+          },
+          "start_index": {
+            "type": "integer",
+            "description": "The index of the first character of the container file citation in the message."
+          },
+          "end_index": {
+            "type": "integer",
+            "description": "The index of the last character of the container file citation in the message."
+          },
+          "filename": {
+            "type": "string",
+            "description": "The filename of the container file cited."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "container_id",
+          "file_id",
+          "start_index",
+          "end_index",
+          "filename"
+        ],
+        "title": "Container file citation",
+        "description": "A citation for a container file used to generate a model response."
+      },
+      "BetaUrlCitationBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "url_citation"
+            ],
+            "description": "The type of the URL citation. Always `url_citation`.",
+            "default": "url_citation",
+            "x-stainless-const": true
+          },
+          "url": {
+            "type": "string",
+            "format": "uri",
+            "description": "The URL of the web resource."
+          },
+          "start_index": {
+            "type": "integer",
+            "description": "The index of the first character of the URL citation in the message."
+          },
+          "end_index": {
+            "type": "integer",
+            "description": "The index of the last character of the URL citation in the message."
+          },
+          "title": {
+            "type": "string",
+            "description": "The title of the web resource."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "url",
+          "start_index",
+          "end_index",
+          "title"
+        ],
+        "title": "URL citation",
+        "description": "A citation for a web resource used to generate a model response."
+      },
+      "BetaFileCitationBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "file_citation"
+            ],
+            "description": "The type of the file citation. Always `file_citation`.",
+            "default": "file_citation",
+            "x-stainless-const": true
+          },
+          "file_id": {
+            "type": "string",
+            "description": "The ID of the file."
+          },
+          "index": {
+            "type": "integer",
+            "description": "The index of the file in the list of files."
+          },
+          "filename": {
+            "type": "string",
+            "description": "The filename of the file cited."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "file_id",
+          "index",
+          "filename"
+        ],
+        "title": "File citation",
+        "description": "A citation to a file."
+      },
+      "BetaInputMessage": {
+        "type": "object",
+        "title": "Input message",
+        "description": "A message input to the model with a role indicating instruction following\nhierarchy. Instructions given with the `developer` or `system` role take\nprecedence over instructions given with the `user` role.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the message input. Always set to `message`.\n",
+            "enum": [
+              "message"
+            ],
+            "x-stainless-const": true
+          },
+          "role": {
+            "type": "string",
+            "description": "The role of the message input. One of `user`, `system`, or `developer`.\n",
+            "enum": [
+              "user",
+              "system",
+              "developer"
+            ]
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          },
+          "content": {
+            "$ref": "#/components/schemas/BetaInputMessageContentList"
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ]
+      },
+      "BetaInputMessageContentList": {
+        "type": "array",
+        "title": "Input item content list",
+        "description": "A list of one or many input items to the model, containing different content \ntypes.\n",
+        "items": {
+          "$ref": "#/components/schemas/BetaInputContent"
+        }
+      },
+      "BetaInputContent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaInputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaInputImageContent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaInputFileContent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaEasyInputMessage": {
+        "type": "object",
+        "title": "Input message",
+        "description": "A message input to the model with a role indicating instruction following\nhierarchy. Instructions given with the `developer` or `system` role take\nprecedence over instructions given with the `user` role. Messages with the\n`assistant` role are presumed to have been generated by the model in previous\ninteractions.\n",
+        "properties": {
+          "role": {
+            "type": "string",
+            "description": "The role of the message input. One of `user`, `assistant`, `system`, or\n`developer`.\n",
+            "enum": [
+              "user",
+              "assistant",
+              "system",
+              "developer"
+            ]
+          },
+          "content": {
+            "description": "Text, image, or audio input to the model, used to generate a response.\nCan also contain previous assistant responses.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "title": "Text input",
+                "description": "A text input to the model.\n"
+              },
+              {
+                "$ref": "#/components/schemas/BetaInputMessageContentList"
+              }
+            ]
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaMessagePhase"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the message input. Always `message`.\n",
+            "enum": [
+              "message"
+            ],
+            "x-stainless-const": true
+          }
+        },
+        "required": [
+          "role",
+          "content"
+        ]
+      },
+      "BetaCompactResponseMethodPublicBody": {
+        "properties": {
+          "model": {
+            "$ref": "#/components/schemas/BetaModelIdsCompaction"
+          },
+          "input": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "maxLength": 10485760,
+                    "description": "A text input to the model, equivalent to a text input with the `user` role."
+                  },
+                  {
+                    "items": {
+                      "$ref": "#/components/schemas/BetaInputItem"
+                    },
+                    "type": "array",
+                    "maxItems": 131072,
+                    "description": "A list of one or many input items to the model, containing different content types."
+                  }
+                ],
+                "description": "Text, image, or file inputs to the model, used to generate a response"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "previous_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the previous response to the model. Use this to create multi-turn conversations. Learn more about [conversation state](https://developers.openai.com/api/docs/guides/conversation-state). Cannot be used in conjunction with `conversation`.",
+                "example": "resp_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "instructions": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "A system (or developer) message inserted into the model's context.\nWhen used along with `previous_response_id`, the instructions from a previous response will not be carried over to the next response. This makes it simple to swap out system (or developer) messages in new responses."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_key": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "description": "A key to use when reading from or writing to the prompt cache."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_retention": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaPromptCacheRetentionEnum",
+                "description": "How long to retain a prompt cache entry created by this request.",
+                "deprecated": true
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_options": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaPromptCacheOptionsParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "service_tier": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaServiceTierEnum",
+                "description": "Specifies the processing type used for serving the request.   - If set to 'auto', then the request will be processed with the service tier configured in the Project settings. Unless otherwise configured, the Project will use 'default'.   - If set to 'default', then the request will be processed with the standard pricing and performance for the selected model.   - If set to '[flex](https://developers.openai.com/api/docs/guides/flex-processing)', then the request will be processed with the Flex Processing service tier.   - To opt-in to [Fast mode](https://developers.openai.com/api/docs/guides/fast-mode) at the request level, include the `service_tier=fast` or `service_tier=priority` parameter for Responses or Chat Completions. For models with a dedicated Fast tier, either value resolves to `service_tier=fast`; for other models, either value resolves to `service_tier=priority`.   - When not set, the default behavior is 'auto'.\n  When the `service_tier` parameter is set, the response body will include the `service_tier` value based on the processing mode actually used to serve the request. This response value may be different from the value set in the parameter."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "model"
+        ]
+      },
+      "BetaServiceTierEnum": {
+        "type": "string",
+        "enum": [
+          "auto",
+          "default",
+          "fast",
+          "flex",
+          "priority"
+        ]
+      },
+      "BetaPromptCacheOptionsParam": {
+        "properties": {
+          "ttl": {
+            "$ref": "#/components/schemas/BetaPromptCacheTTLEnum",
+            "description": "The minimum lifetime applied to every implicit and explicit cache breakpoint written by the request. Defaults to `30m`, which is currently the only supported value. The backend may retain cache entries for longer."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/BetaPromptCacheModeEnum",
+            "description": "Controls whether OpenAI automatically creates an implicit cache breakpoint. Defaults to `implicit`. With `implicit`, OpenAI creates one implicit breakpoint and writes up to the latest three explicit breakpoints in the request. With `explicit`, OpenAI does not create an implicit breakpoint and writes up to the latest four explicit breakpoints. If there are no explicit breakpoints, the request does not use prompt caching."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Prompt cache options",
+        "description": "Options for prompt caching. Supported for `gpt-5.6` and later models. By default, OpenAI automatically chooses one implicit cache breakpoint. You can add explicit breakpoints to content blocks with `prompt_cache_breakpoint`. Each request can write up to four breakpoints. For cache matching, OpenAI considers up to the latest 80 breakpoints in the conversation, without a content-block lookback limit. Set `mode` to `explicit` to disable the implicit breakpoint. The `ttl` defaults to `30m`, which is currently the only supported value. See the [prompt caching guide](https://developers.openai.com/api/docs/guides/prompt-caching) for current details."
+      },
+      "BetaPromptCacheModeEnum": {
+        "type": "string",
+        "enum": [
+          "implicit",
+          "explicit"
+        ]
+      },
+      "BetaPromptCacheTTLEnum": {
+        "type": "string",
+        "enum": [
+          "30m"
+        ]
+      },
+      "BetaPromptCacheRetentionEnum": {
+        "type": "string",
+        "enum": [
+          "in_memory",
+          "24h"
+        ]
+      },
+      "BetaModelIdsCompaction": {
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/BetaModelIdsResponses"
+          },
+          {
+            "type": "string"
+          },
+          {
+            "type": "null"
+          }
+        ],
+        "description": "Model ID used to generate the response, like `gpt-6-astra`. OpenAI offers a wide range of models with different capabilities, performance characteristics, and price points. Refer to the [model guide](https://developers.openai.com/api/docs/models) to browse and compare available models."
+      },
+      "BetaModelIdsResponses": {
+        "example": "gpt-6-astra",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/BetaModelIdsShared"
+          },
+          {
+            "type": "string",
+            "title": "ResponsesOnlyModel",
+            "enum": [
+              "o1-pro",
+              "o1-pro-2025-03-19",
+              "o3-pro",
+              "o3-pro-2025-06-10",
+              "o3-deep-research",
+              "o3-deep-research-2025-06-26",
+              "o4-mini-deep-research",
+              "o4-mini-deep-research-2025-06-26",
+              "computer-use-preview",
+              "computer-use-preview-2025-03-11",
+              "gpt-5.5-pro",
+              "gpt-5.5-pro-2026-04-23",
+              "gpt-5-codex",
+              "gpt-5-pro",
+              "gpt-5-pro-2025-10-06",
+              "gpt-5.1-codex-max",
+              "gpt-daybreak-blue-latest",
+              "gpt-daybreak-red-latest",
+              "gpt-5.6-cyber"
+            ]
+          }
+        ]
+      },
+      "BetaModelIdsShared": {
+        "example": "gpt-6-astra",
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "gpt-6-astra",
+              "gpt-5.6-sol",
+              "gpt-5.6-terra",
+              "gpt-5.6-luna",
+              "gpt-5.5",
+              "gpt-5.5-2026-04-23",
+              "gpt-5.4",
+              "gpt-5.4-mini",
+              "gpt-5.4-nano",
+              "gpt-5.4-mini-2026-03-17",
+              "gpt-5.4-nano-2026-03-17",
+              "gpt-5.3-chat-latest",
+              "gpt-5.2",
+              "gpt-5.2-2025-12-11",
+              "gpt-5.2-chat-latest",
+              "gpt-5.2-pro",
+              "gpt-5.2-pro-2025-12-11",
+              "gpt-5.1",
+              "gpt-5.1-2025-11-13",
+              "gpt-5.1-codex",
+              "gpt-5.1-mini",
+              "gpt-5.1-chat-latest",
+              "gpt-5",
+              "gpt-5-mini",
+              "gpt-5-nano",
+              "gpt-5-2025-08-07",
+              "gpt-5-mini-2025-08-07",
+              "gpt-5-nano-2025-08-07",
+              "gpt-5-chat-latest",
+              "gpt-4.1",
+              "gpt-4.1-mini",
+              "gpt-4.1-nano",
+              "gpt-4.1-2025-04-14",
+              "gpt-4.1-mini-2025-04-14",
+              "gpt-4.1-nano-2025-04-14",
+              "o4-mini",
+              "o4-mini-2025-04-16",
+              "o3",
+              "o3-2025-04-16",
+              "o3-mini",
+              "o3-mini-2025-01-31",
+              "o1",
+              "o1-2024-12-17",
+              "o1-preview",
+              "o1-preview-2024-09-12",
+              "o1-mini",
+              "o1-mini-2024-09-12",
+              "gpt-4o",
+              "gpt-4o-2024-11-20",
+              "gpt-4o-2024-08-06",
+              "gpt-4o-2024-05-13",
+              "gpt-4o-audio-preview",
+              "gpt-4o-audio-preview-2024-10-01",
+              "gpt-4o-audio-preview-2024-12-17",
+              "gpt-4o-audio-preview-2025-06-03",
+              "gpt-4o-mini-audio-preview",
+              "gpt-4o-mini-audio-preview-2024-12-17",
+              "gpt-4o-search-preview",
+              "gpt-4o-mini-search-preview",
+              "gpt-4o-search-preview-2025-03-11",
+              "gpt-4o-mini-search-preview-2025-03-11",
+              "chatgpt-4o-latest",
+              "codex-mini-latest",
+              "gpt-4o-mini",
+              "gpt-4o-mini-2024-07-18",
+              "gpt-4-turbo",
+              "gpt-4-turbo-2024-04-09",
+              "gpt-4-0125-preview",
+              "gpt-4-turbo-preview",
+              "gpt-4-1106-preview",
+              "gpt-4-vision-preview",
+              "gpt-4",
+              "gpt-4-0314",
+              "gpt-4-0613",
+              "gpt-4-32k",
+              "gpt-4-32k-0314",
+              "gpt-4-32k-0613",
+              "gpt-3.5-turbo",
+              "gpt-3.5-turbo-16k",
+              "gpt-3.5-turbo-0301",
+              "gpt-3.5-turbo-0613",
+              "gpt-3.5-turbo-1106",
+              "gpt-3.5-turbo-0125",
+              "gpt-3.5-turbo-16k-0613"
+            ]
+          }
+        ]
+      },
+      "BetaError": {
+        "type": "object",
+        "properties": {
+          "code": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "param": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string"
+          },
+          "misalignment": {
+            "$ref": "#/components/schemas/BetaMisalignmentErrorDetailsResource"
+          }
+        },
+        "required": [
+          "type",
+          "message",
+          "param",
+          "code"
+        ]
+      },
+      "BetaMisalignmentErrorDetailsResource": {
+        "properties": {
+          "error_type": {
+            "$ref": "#/components/schemas/Beta_MisalignmentErrorType",
+            "description": "An optional classification; clients must accept additional values."
+          },
+          "detailed_explanation": {
+            "type": "string",
+            "description": "The public explanation for this block."
+          },
+          "steer": {
+            "$ref": "#/components/schemas/Beta_MisalignmentSteer",
+            "description": "An optional public continuation instruction."
+          }
+        },
+        "type": "object",
+        "required": []
+      },
+      "Beta_MisalignmentSteer": {
+        "properties": {
+          "message": {
+            "type": "string",
+            "description": "The public continuation instruction."
+          }
+        },
+        "type": "object",
+        "required": [
+          "message"
+        ]
+      },
+      "Beta_MisalignmentErrorType": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "potentially_unintended_data_transfer",
+              "potentially_unintended_data_access",
+              "potentially_unintended_destructive_activity",
+              "other"
+            ]
+          }
+        ]
+      },
+      "BetaResponseItemList": {
+        "type": "object",
+        "description": "A list of Response items.",
+        "properties": {
+          "object": {
+            "type": "string",
+            "description": "The type of object returned, must be `list`.",
+            "enum": [
+              "list"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "array",
+            "description": "A list of items used to generate this response.",
+            "items": {
+              "$ref": "#/components/schemas/BetaItemResource"
+            }
+          },
+          "has_more": {
+            "type": "boolean",
+            "description": "Whether there are more items available."
+          },
+          "first_id": {
+            "type": "string",
+            "description": "The ID of the first item in the list."
+          },
+          "last_id": {
+            "type": "string",
+            "description": "The ID of the last item in the list."
+          }
+        },
+        "required": [
+          "object",
+          "data",
+          "has_more",
+          "first_id",
+          "last_id"
+        ],
+        "x-oaiMeta": {
+          "name": "The input item list",
+          "group": "responses",
+          "example": "{\n  \"object\": \"list\",\n  \"data\": [\n    {\n      \"id\": \"msg_abc123\",\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"Tell me a three sentence bedtime story about a unicorn.\"\n        }\n      ]\n    }\n  ],\n  \"first_id\": \"msg_abc123\",\n  \"last_id\": \"msg_abc123\",\n  \"has_more\": false\n}\n"
+        }
+      },
+      "BetaItemResource": {
+        "description": "Content item used to generate a response.\n",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaInputMessageResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaOutputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaWebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCallResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaAgentMessage"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMultiAgentCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMultiAgentCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaAdditionalTools"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseConfigurationUpdate"
+          },
+          {
+            "$ref": "#/components/schemas/BetaReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgram"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgramOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCompactionBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPApprovalResponseResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCallResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCallOutputResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaCustomToolCallOutputResource": {
+        "title": "ResponseCustomToolCallOutputItem",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCallOutput"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the custom tool call output item.\n"
+              },
+              "status": {
+                "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+                "$ref": "#/components/schemas/BetaFunctionCallOutputStatusEnum"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "BetaFunctionCallOutputStatusEnum": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "BetaCustomToolCallResource": {
+        "title": "ResponseCustomToolCallItem",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCall"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the custom tool call item.\n"
+              },
+              "status": {
+                "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+                "$ref": "#/components/schemas/BetaFunctionCallStatus"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "BetaFunctionCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "BetaMCPApprovalResponseResource": {
+        "type": "object",
+        "title": "MCP approval response",
+        "description": "A response to an MCP approval request.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "mcp_approval_response"
+            ],
+            "description": "The type of the item. Always `mcp_approval_response`.\n",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the approval response\n"
+          },
+          "approval_request_id": {
+            "type": "string",
+            "description": "The ID of the approval request being answered.\n"
+          },
+          "approve": {
+            "type": "boolean",
+            "description": "Whether the request was approved.\n"
+          },
+          "reason": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional reason for the decision.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "id",
+          "request_id",
+          "approve",
+          "approval_request_id"
+        ]
+      },
+      "BetaApplyPatchToolCallOutput": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch_call_output"
+            ],
+            "description": "The type of the item. Always `apply_patch_call_output`.",
+            "default": "apply_patch_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the apply patch tool call output. Populated when this item is returned via API."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the apply patch tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCaller",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaApplyPatchCallOutputStatus",
+            "description": "The status of the apply patch tool call output. One of `completed` or `failed`."
+          },
+          "output": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "Optional textual output returned by the apply patch tool."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The ID of the entity that created this tool call output."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "status"
+        ],
+        "title": "Apply patch tool call output",
+        "description": "The output emitted by an apply patch tool call."
+      },
+      "BetaApplyPatchCallOutputStatus": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "failed"
+        ]
+      },
+      "BetaApplyPatchToolCall": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "apply_patch_call"
+            ],
+            "description": "The type of the item. Always `apply_patch_call`.",
+            "default": "apply_patch_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the apply patch tool call. Populated when this item is returned via API."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the apply patch tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCaller",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaApplyPatchCallStatus",
+            "description": "The status of the apply patch tool call. One of `in_progress` or `completed`."
+          },
+          "operation": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BetaApplyPatchCreateFileOperation"
+              },
+              {
+                "$ref": "#/components/schemas/BetaApplyPatchDeleteFileOperation"
+              },
+              {
+                "$ref": "#/components/schemas/BetaApplyPatchUpdateFileOperation"
+              }
+            ],
+            "title": "Apply patch operation",
+            "description": "One of the create_file, delete_file, or update_file operations applied via apply_patch.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The ID of the entity that created this tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "status",
+          "operation"
+        ],
+        "title": "Apply patch tool call",
+        "description": "A tool call that applies file diffs by creating, deleting, or updating files."
+      },
+      "BetaApplyPatchUpdateFileOperation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "update_file"
+            ],
+            "description": "Update an existing file with the provided diff.",
+            "default": "update_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "description": "Path of the file to update."
+          },
+          "diff": {
+            "type": "string",
+            "description": "Diff to apply."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path",
+          "diff"
+        ],
+        "title": "Apply patch update file operation",
+        "description": "Instruction describing how to update a file via the apply_patch tool."
+      },
+      "BetaApplyPatchDeleteFileOperation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "delete_file"
+            ],
+            "description": "Delete the specified file.",
+            "default": "delete_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "description": "Path of the file to delete."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path"
+        ],
+        "title": "Apply patch delete file operation",
+        "description": "Instruction describing how to delete a file via the apply_patch tool."
+      },
+      "BetaApplyPatchCreateFileOperation": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "create_file"
+            ],
+            "description": "Create a new file with the provided diff.",
+            "default": "create_file",
+            "x-stainless-const": true
+          },
+          "path": {
+            "type": "string",
+            "description": "Path of the file to create."
+          },
+          "diff": {
+            "type": "string",
+            "description": "Diff to apply."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "path",
+          "diff"
+        ],
+        "title": "Apply patch create file operation",
+        "description": "Instruction describing how to create a file via the apply_patch tool."
+      },
+      "BetaApplyPatchCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed"
+        ]
+      },
+      "BetaFunctionShellCallOutput": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell_call_output"
+            ],
+            "description": "The type of the shell call output. Always `shell_call_output`.",
+            "default": "shell_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the shell call output. Populated when this item is returned via API."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the shell tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCaller",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaFunctionShellCallOutputStatusEnum",
+            "description": "The status of the shell call output. One of `in_progress`, `completed`, or `incomplete`."
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/BetaFunctionShellCallOutputContent"
+            },
+            "type": "array",
+            "description": "An array of shell call output contents"
+          },
+          "max_output_length": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "The maximum length of the shell command output. This is generated by the model and should be passed back with the raw output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "status",
+          "output",
+          "max_output_length"
+        ],
+        "title": "Shell call output",
+        "description": "The output of a shell tool call that was emitted."
+      },
+      "BetaFunctionShellCallOutputContent": {
+        "properties": {
+          "stdout": {
+            "type": "string",
+            "description": "The standard output that was captured."
+          },
+          "stderr": {
+            "type": "string",
+            "description": "The standard error output that was captured."
+          },
+          "outcome": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BetaFunctionShellCallOutputTimeoutOutcome"
+              },
+              {
+                "$ref": "#/components/schemas/BetaFunctionShellCallOutputExitOutcome"
+              }
+            ],
+            "title": "Shell call outcome",
+            "description": "Represents either an exit outcome (with an exit code) or a timeout outcome for a shell call output chunk.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "stdout",
+          "stderr",
+          "outcome"
+        ],
+        "title": "Shell call output content",
+        "description": "The content of a shell tool call output that was emitted."
+      },
+      "BetaFunctionShellCallOutputExitOutcome": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "exit"
+            ],
+            "description": "The outcome type. Always `exit`.",
+            "default": "exit",
+            "x-stainless-const": true
+          },
+          "exit_code": {
+            "type": "integer",
+            "description": "Exit code from the shell process."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "exit_code"
+        ],
+        "title": "Shell call exit outcome",
+        "description": "Indicates that the shell commands finished and returned an exit code."
+      },
+      "BetaFunctionShellCallOutputTimeoutOutcome": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "timeout"
+            ],
+            "description": "The outcome type. Always `timeout`.",
+            "default": "timeout",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Shell call timeout outcome",
+        "description": "Indicates that the shell call exceeded its configured time limit."
+      },
+      "BetaFunctionShellCallOutputStatusEnum": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "BetaFunctionShellCall": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "shell_call"
+            ],
+            "description": "The type of the item. Always `shell_call`.",
+            "default": "shell_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the shell tool call. Populated when this item is returned via API."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the shell tool call generated by the model."
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCaller",
+                "description": "The execution context that produced this tool call."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "action": {
+            "$ref": "#/components/schemas/BetaFunctionShellAction",
+            "description": "The shell commands and limits that describe how to run the tool call."
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaFunctionShellCallStatus",
+            "description": "The status of the shell call. One of `in_progress`, `completed`, or `incomplete`."
+          },
+          "environment": {
+            "anyOf": [
+              {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaLocalEnvironmentResource"
+                  },
+                  {
+                    "$ref": "#/components/schemas/BetaContainerReferenceResource"
+                  }
+                ],
+                "discriminator": {
+                  "propertyName": "type"
+                }
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The ID of the entity that created this tool call."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "action",
+          "status",
+          "environment"
+        ],
+        "title": "Shell tool call",
+        "description": "A tool call that executes one or more shell commands in a managed environment."
+      },
+      "BetaContainerReferenceResource": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "container_reference"
+            ],
+            "description": "The environment type. Always `container_reference`.",
+            "default": "container_reference",
+            "x-stainless-const": true
+          },
+          "container_id": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "container_id"
+        ],
+        "title": "Container Reference",
+        "description": "Represents a container created with /v1/containers."
+      },
+      "BetaLocalEnvironmentResource": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "local"
+            ],
+            "description": "The environment type. Always `local`.",
+            "default": "local",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ],
+        "title": "Local Environment",
+        "description": "Represents the use of a local environment to perform shell actions."
+      },
+      "BetaFunctionShellCallStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "BetaFunctionShellAction": {
+        "properties": {
+          "commands": {
+            "items": {
+              "type": "string",
+              "description": "A list of commands to run."
+            },
+            "type": "array"
+          },
+          "timeout_ms": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Optional timeout in milliseconds for the commands."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_output_length": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "description": "Optional maximum number of characters to return from each command."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "commands",
+          "timeout_ms",
+          "max_output_length"
+        ],
+        "title": "Shell exec action",
+        "description": "Execute a shell command."
+      },
+      "BetaCompactionBody": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "compaction"
+            ],
+            "description": "The type of the item. Always `compaction`.",
+            "default": "compaction",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the compaction item."
+          },
+          "encrypted_content": {
+            "type": "string",
+            "description": "The encrypted content that was produced by compaction."
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "encrypted_content"
+        ],
+        "title": "Compaction item",
+        "description": "A compaction item generated by the [`v1/responses/compact` API](https://developers.openai.com/api/reference/resources/responses/methods/compact)."
+      },
+      "BetaProgramOutput": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "program_output"
+            ],
+            "description": "The type of the item. Always `program_output`.",
+            "default": "program_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the program output item."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The call ID of the program item."
+          },
+          "result": {
+            "type": "string",
+            "description": "The result produced by the program item."
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaProgramOutputStatus",
+            "description": "The terminal status of the program output item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "result",
+          "status"
+        ]
+      },
+      "BetaProgramOutputStatus": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "incomplete"
+        ]
+      },
+      "BetaProgram": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "program"
+            ],
+            "description": "The type of the item. Always `program`.",
+            "default": "program",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the program item."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The stable call ID of the program item."
+          },
+          "code": {
+            "type": "string",
+            "description": "The JavaScript source executed by programmatic tool calling."
+          },
+          "fingerprint": {
+            "type": "string",
+            "description": "Opaque program replay fingerprint that must be round-tripped."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "code",
+          "fingerprint"
+        ]
+      },
+      "BetaResponseConfigurationUpdate": {
+        "type": "object",
+        "description": "A configuration update that applies to subsequent responses until it is\nreplaced by another configuration update.\n",
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the configuration update item.",
+            "example": "cnfu_123"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "configuration_update"
+            ],
+            "description": "The item type. Always `configuration_update`.",
+            "default": "configuration_update",
+            "x-stainless-const": true
+          },
+          "reasoning": {
+            "type": "object",
+            "description": "The reasoning configuration applied by this update.",
+            "properties": {
+              "effort": {
+                "$ref": "#/components/schemas/BetaReasoningEffort",
+                "description": "The reasoning effort used for subsequent responses until another\nconfiguration update replaces it.\n"
+              }
+            }
+          }
+        },
+        "required": [
+          "id",
+          "type"
+        ]
+      },
+      "BetaAdditionalTools": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "additional_tools"
+            ],
+            "description": "The type of the item. Always `additional_tools`.",
+            "default": "additional_tools",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the additional tools item."
+          },
+          "role": {
+            "$ref": "#/components/schemas/BetaMessageRole",
+            "description": "The role that provided the additional tools."
+          },
+          "tools": {
+            "items": {
+              "$ref": "#/components/schemas/BetaTool"
+            },
+            "type": "array",
+            "description": "The additional tool definitions made available at this item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "role",
+          "tools"
+        ]
+      },
+      "BetaMessageRole": {
+        "type": "string",
+        "enum": [
+          "unknown",
+          "user",
+          "assistant",
+          "system",
+          "critic",
+          "discriminator",
+          "developer",
+          "tool"
+        ]
+      },
+      "BetaToolSearchOutput": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search_output"
+            ],
+            "description": "The type of the item. Always `tool_search_output`.",
+            "default": "tool_search_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the tool search output item."
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the tool search call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "execution": {
+            "$ref": "#/components/schemas/BetaToolSearchExecutionType",
+            "description": "Whether tool search was executed by the server or by the client."
+          },
+          "tools": {
+            "items": {
+              "$ref": "#/components/schemas/BetaTool"
+            },
+            "type": "array",
+            "description": "The loaded tool definitions returned by tool search."
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaFunctionCallOutputStatusEnum",
+            "description": "The status of the tool search output item that was recorded."
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "execution",
+          "tools",
+          "status"
+        ]
+      },
+      "BetaToolSearchCall": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "tool_search_call"
+            ],
+            "description": "The type of the item. Always `tool_search_call`.",
+            "default": "tool_search_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the tool search call item."
+          },
+          "call_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the tool search call generated by the model."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "execution": {
+            "$ref": "#/components/schemas/BetaToolSearchExecutionType",
+            "description": "Whether tool search was executed by the server or by the client."
+          },
+          "arguments": {
+            "description": "Arguments used for the tool search call."
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaFunctionCallStatus",
+            "description": "The status of the tool search call item that was recorded."
+          },
+          "created_by": {
+            "type": "string",
+            "description": "The identifier of the actor that created the item."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "execution",
+          "arguments",
+          "status"
+        ]
+      },
+      "BetaMultiAgentCallOutput": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "multi_agent_call_output"
+            ],
+            "description": "The type of the multi-agent result. Always `multi_agent_call_output`.",
+            "default": "multi_agent_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the multi-agent call output item."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the multi-agent call."
+          },
+          "action": {
+            "$ref": "#/components/schemas/BetaMultiAgentAction",
+            "description": "The multi-agent action that produced this result."
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/BetaOutputTextContent"
+            },
+            "type": "array",
+            "description": "Text output returned by the multi-agent action."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "action",
+          "output"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaMultiAgentAction": {
+        "type": "string",
+        "enum": [
+          "spawn_agent",
+          "interrupt_agent",
+          "list_agents",
+          "send_message",
+          "followup_task",
+          "wait_agent"
+        ]
+      },
+      "BetaMultiAgentCall": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "multi_agent_call"
+            ],
+            "description": "The type of the multi-agent call. Always `multi_agent_call`.",
+            "default": "multi_agent_call",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the multi-agent call item."
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID linking this call to its output."
+          },
+          "action": {
+            "$ref": "#/components/schemas/BetaMultiAgentAction",
+            "description": "The multi-agent action to execute."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The JSON string of arguments generated for the action."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "call_id",
+          "action",
+          "arguments"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaAgentMessage": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "agent_message"
+            ],
+            "description": "The type of the item. Always `agent_message`.",
+            "default": "agent_message",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the agent message."
+          },
+          "author": {
+            "type": "string",
+            "description": "The sending agent identity."
+          },
+          "recipient": {
+            "type": "string",
+            "description": "The destination agent identity."
+          },
+          "content": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/BetaInputTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaOutputTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaSummaryTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaReasoningTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaRefusalContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInputImageContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaComputerScreenshotContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInputFileContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaEncryptedContent"
+                }
+              ],
+              "description": "A content part that makes up an input or output item.",
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "description": "Encrypted content sent between agents."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "author",
+          "recipient",
+          "content"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaEncryptedContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "encrypted_content"
+            ],
+            "description": "The type of the input item. Always `encrypted_content`.",
+            "default": "encrypted_content",
+            "x-stainless-const": true
+          },
+          "encrypted_content": {
+            "type": "string",
+            "description": "Opaque encrypted content."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "encrypted_content"
+        ],
+        "title": "Encrypted content",
+        "description": "Opaque encrypted content that Responses API decrypts inside trusted model execution.",
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaComputerScreenshotContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "computer_screenshot"
+            ],
+            "description": "Specifies the event type. For a computer screenshot, this property is always set to `computer_screenshot`.",
+            "default": "computer_screenshot",
+            "x-stainless-const": true
+          },
+          "image_url": {
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "uri",
+                "description": "The URL of the screenshot image."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "file_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The identifier of an uploaded file that contains the screenshot."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "detail": {
+            "$ref": "#/components/schemas/BetaImageDetail",
+            "description": "The detail level of the screenshot image to be sent to the model. One of `high`, `low`, `auto`, or `original`. Defaults to `auto`."
+          },
+          "prompt_cache_breakpoint": {
+            "$ref": "#/components/schemas/BetaPromptCacheBreakpointConfig"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "image_url",
+          "file_id",
+          "detail"
+        ],
+        "title": "Computer screenshot",
+        "description": "A screenshot of a computer."
+      },
+      "BetaTextContent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "text"
+            ],
+            "default": "text",
+            "x-stainless-const": true
+          },
+          "text": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "text"
+        ],
+        "title": "Text Content",
+        "description": "A text content."
+      },
+      "BetaFunctionToolCallOutputResource": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCallOutput"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the function call tool output.\n"
+              },
+              "status": {
+                "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+                "$ref": "#/components/schemas/BetaFunctionCallOutputStatusEnum"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "BetaFunctionToolCallOutput": {
+        "type": "object",
+        "title": "Function tool call output",
+        "description": "The output of a function tool call.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the function tool call output. Populated when this item\nis returned via API.\n"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "function_call_output"
+            ],
+            "description": "The type of the function tool call output. Always `function_call_output`.\n",
+            "x-stainless-const": true
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The unique ID of the function tool call generated by the model.\n"
+          },
+          "name": {
+            "type": "string",
+            "description": "The name of the tool that produced the output.\n"
+          },
+          "namespace": {
+            "type": "string",
+            "description": "The namespace of the tool that produced the output.\n"
+          },
+          "caller": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaToolCallCallerParam"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output": {
+            "description": "The output from the function call generated by your code.\nCan be a string or an list of output content.\n",
+            "oneOf": [
+              {
+                "type": "string",
+                "description": "A string of the output of the function call.\n",
+                "title": "string output"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/BetaFunctionAndCustomToolCallOutput"
+                },
+                "title": "output content list",
+                "description": "Text, image, or file output of the function call.\n"
+              }
+            ]
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "output"
+        ]
+      },
+      "BetaFunctionToolCallResource": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCall"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the function tool call.\n"
+              },
+              "status": {
+                "description": "The status of the item. One of `in_progress`, `completed`, or\n`incomplete`. Populated when items are returned via API.\n",
+                "$ref": "#/components/schemas/BetaFunctionCallStatus"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "BetaComputerToolCallOutputResource": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaComputerToolCallOutput"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the computer call tool output.\n"
+              },
+              "status": {
+                "description": "The status of the message input. One of `in_progress`, `completed`, or\n`incomplete`. Populated when input items are returned via API.\n",
+                "$ref": "#/components/schemas/BetaComputerCallOutputStatus"
+              },
+              "created_by": {
+                "type": "string",
+                "description": "The identifier of the actor that created the item.\n"
+              }
+            },
+            "required": [
+              "id",
+              "status"
+            ]
+          }
+        ]
+      },
+      "BetaComputerCallOutputStatus": {
+        "type": "string",
+        "enum": [
+          "completed",
+          "incomplete",
+          "failed"
+        ]
+      },
+      "BetaComputerToolCallOutput": {
+        "type": "object",
+        "title": "Computer tool call output",
+        "description": "The output of a computer tool call.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the computer tool call output. Always `computer_call_output`.\n",
+            "enum": [
+              "computer_call_output"
+            ],
+            "default": "computer_call_output",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The ID of the computer tool call output.\n"
+          },
+          "call_id": {
+            "type": "string",
+            "description": "The ID of the computer tool call that produced the output.\n"
+          },
+          "acknowledged_safety_checks": {
+            "type": "array",
+            "description": "The safety checks reported by the API that have been acknowledged by the\ndeveloper.\n",
+            "items": {
+              "$ref": "#/components/schemas/BetaComputerCallSafetyCheckParam"
+            }
+          },
+          "output": {
+            "$ref": "#/components/schemas/BetaComputerScreenshotImage"
+          },
+          "status": {
+            "type": "string",
+            "description": "The status of the message input. One of `in_progress`, `completed`, or\n`incomplete`. Populated when input items are returned via API.\n",
+            "enum": [
+              "in_progress",
+              "completed",
+              "incomplete"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "call_id",
+          "output"
+        ]
+      },
+      "BetaInputMessageResource": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaInputMessage"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique ID of the message input.\n"
+              }
+            },
+            "required": [
+              "id",
+              "type"
+            ]
+          }
+        ]
+      },
+      "BetaCompactResource": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique identifier for the compacted response."
+          },
+          "object": {
+            "type": "string",
+            "enum": [
+              "response.compaction"
+            ],
+            "description": "The object type. Always `response.compaction`.",
+            "default": "response.compaction",
+            "x-stainless-const": true
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/BetaItemField"
+            },
+            "type": "array",
+            "description": "The compacted list of output items."
+          },
+          "created_at": {
+            "type": "integer",
+            "format": "unixtime",
+            "description": "Unix timestamp (in seconds) when the compacted conversation was created."
+          },
+          "usage": {
+            "$ref": "#/components/schemas/BetaResponseUsage",
+            "description": "Token accounting for the compaction pass, including cached, reasoning, and total tokens."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "object",
+          "output",
+          "created_at",
+          "usage"
+        ],
+        "title": "The compacted response object",
+        "example": {
+          "id": "resp_001",
+          "object": "response.compaction",
+          "output": [
+            {
+              "type": "message",
+              "role": "user",
+              "content": [
+                {
+                  "type": "input_text",
+                  "text": "Summarize our launch checklist from last week."
+                }
+              ]
+            },
+            {
+              "type": "message",
+              "role": "user",
+              "content": [
+                {
+                  "type": "input_text",
+                  "text": "You are performing a CONTEXT CHECKPOINT COMPACTION..."
+                }
+              ]
+            },
+            {
+              "type": "compaction",
+              "id": "cmp_001",
+              "encrypted_content": "encrypted-summary"
+            }
+          ],
+          "created_at": 1731459200,
+          "usage": {
+            "input_tokens": 42897,
+            "output_tokens": 12000,
+            "total_tokens": 54912
+          }
+        }
+      },
+      "BetaResponseUsage": {
+        "type": "object",
+        "description": "Represents token usage details including input tokens, output tokens,\na breakdown of output tokens, and the total tokens used.\n",
+        "properties": {
+          "input_tokens": {
+            "type": "integer",
+            "description": "The number of input tokens."
+          },
+          "input_tokens_details": {
+            "type": "object",
+            "description": "A detailed breakdown of the input tokens.",
+            "properties": {
+              "cached_tokens": {
+                "type": "integer",
+                "description": "The number of tokens that were retrieved from the cache.\n[More on prompt caching](https://developers.openai.com/api/docs/guides/prompt-caching).\n"
+              },
+              "cache_write_tokens": {
+                "type": "integer",
+                "description": "The number of input tokens that were written to the cache."
+              }
+            },
+            "required": [
+              "cached_tokens",
+              "cache_write_tokens"
+            ]
+          },
+          "output_tokens": {
+            "type": "integer",
+            "description": "The number of output tokens."
+          },
+          "output_tokens_details": {
+            "type": "object",
+            "description": "A detailed breakdown of the output tokens.",
+            "properties": {
+              "reasoning_tokens": {
+                "type": "integer",
+                "description": "The number of reasoning tokens."
+              }
+            },
+            "required": [
+              "reasoning_tokens"
+            ]
+          },
+          "total_tokens": {
+            "type": "integer",
+            "description": "The total number of tokens used."
+          }
+        },
+        "required": [
+          "input_tokens",
+          "input_tokens_details",
+          "output_tokens",
+          "output_tokens_details",
+          "total_tokens"
+        ]
+      },
+      "BetaItemField": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaMessage"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgram"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgramOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMultiAgentCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMultiAgentCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaAdditionalTools"
+          },
+          {
+            "$ref": "#/components/schemas/BetaAgentMessage"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaWebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCompactionBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolCall",
+            "deprecated": true
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolCallOutput",
+            "deprecated": true
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPApprovalResponseResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCallOutput"
+          }
+        ],
+        "description": "An item representing a message, tool call, tool output, reasoning, or other response element.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaMessage": {
+        "properties": {
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that produced this item."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "description": "The type of the message. Always set to `message`.",
+            "default": "message",
+            "x-stainless-const": true
+          },
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the message."
+          },
+          "status": {
+            "$ref": "#/components/schemas/BetaMessageStatus",
+            "description": "The status of item. One of `in_progress`, `completed`, or `incomplete`. Populated when items are returned via API."
+          },
+          "role": {
+            "$ref": "#/components/schemas/BetaMessageRole",
+            "description": "The role of the message. One of `unknown`, `user`, `assistant`, `system`, `critic`, `discriminator`, `developer`, or `tool`."
+          },
+          "content": {
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/BetaInputTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaOutputTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaSummaryTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaReasoningTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaRefusalContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInputImageContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaComputerScreenshotContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInputFileContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaEncryptedContent"
+                }
+              ],
+              "description": "A content part that makes up an input or output item.",
+              "discriminator": {
+                "propertyName": "type"
+              }
+            },
+            "type": "array",
+            "description": "The content of the message"
+          },
+          "phase": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaMessagePhase-2",
+                "description": "Labels an `assistant` message as intermediate commentary (`commentary`) or the final answer (`final_answer`). For models like `gpt-5.3-codex` and beyond, when sending follow-up requests, preserve and resend phase on all assistant messages — dropping it can degrade performance. Not used for user messages."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "id",
+          "status",
+          "role",
+          "content"
+        ],
+        "title": "Message",
+        "description": "A message to or from the model."
+      },
+      "BetaMessagePhase-2": {
+        "type": "string",
+        "enum": [
+          "commentary",
+          "final_answer"
+        ]
+      },
+      "BetaMessageStatus": {
+        "type": "string",
+        "enum": [
+          "in_progress",
+          "completed",
+          "incomplete"
+        ]
+      },
+      "BetaResponseCustomToolCallInputDoneEvent": {
+        "title": "ResponseCustomToolCallInputDone",
+        "type": "object",
+        "description": "Event indicating that input for a custom tool call is complete.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.custom_tool_call_input.done"
+            ],
+            "description": "The event type identifier.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output this event applies to."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique identifier for the API item associated with this event."
+          },
+          "input": {
+            "type": "string",
+            "description": "The complete input data for the custom tool call."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "input",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.custom_tool_call_input.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.custom_tool_call_input.done\",\n  \"output_index\": 0,\n  \"item_id\": \"ctc_1234567890abcdef\",\n  \"input\": \"final complete input text\"\n}\n"
+        }
+      },
+      "BetaResponseCustomToolCallInputDeltaEvent": {
+        "title": "ResponseCustomToolCallInputDelta",
+        "type": "object",
+        "description": "Event representing a delta (partial update) to the input of a custom tool call.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.custom_tool_call_input.delta"
+            ],
+            "description": "The event type identifier.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output this delta applies to."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique identifier for the API item associated with this event."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The incremental input data (delta) for the custom tool call."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.custom_tool_call_input.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.custom_tool_call_input.delta\",\n  \"output_index\": 0,\n  \"item_id\": \"ctc_1234567890abcdef\",\n  \"delta\": \"partial input text\"\n}\n"
+        }
+      },
+      "BetaResponseQueuedEvent": {
+        "type": "object",
+        "title": "ResponseQueuedEvent",
+        "description": "Emitted when a response is queued and waiting to be processed.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.queued"
+            ],
+            "description": "The type of the event. Always 'response.queued'.",
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/BetaResponse",
+            "description": "The full response object that is queued."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.queued",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.queued\",\n  \"response\": {\n    \"id\": \"res_123\",\n    \"status\": \"queued\",\n    \"created_at\": \"2021-01-01T00:00:00Z\",\n    \"updated_at\": \"2021-01-01T00:00:00Z\"\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponse": {
+        "title": "The response object",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaModelResponseProperties"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "service_tier": {
+                "$ref": "#/components/schemas/BetaServiceTierResponses"
+              },
+              "truncation": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The truncation strategy to use for the model response.\n- `auto`: If the input to this Response exceeds\n  the model's context window size, the model will truncate the\n  response to fit the context window by dropping items from the beginning of the conversation.\n- `disabled` (default): If the input size will exceed the context window\n  size for a model, the request will fail with a 400 error.\n",
+                    "enum": [
+                      "auto",
+                      "disabled"
+                    ],
+                    "default": "disabled"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "id": {
+                "type": "string",
+                "description": "Unique identifier for this Response.\n"
+              },
+              "object": {
+                "type": "string",
+                "description": "The object type of this resource - always set to `response`.\n",
+                "enum": [
+                  "response"
+                ],
+                "x-stainless-const": true
+              },
+              "status": {
+                "type": "string",
+                "description": "The status of the response generation. One of `completed`, `failed`,\n`in_progress`, `cancelled`, `queued`, or `incomplete`.\n",
+                "enum": [
+                  "completed",
+                  "failed",
+                  "in_progress",
+                  "cancelled",
+                  "queued",
+                  "incomplete"
+                ]
+              },
+              "created_at": {
+                "type": "number",
+                "format": "unixtime",
+                "description": "Unix timestamp (in seconds) of when this Response was created.\n"
+              },
+              "completed_at": {
+                "anyOf": [
+                  {
+                    "type": "number",
+                    "format": "unixtime",
+                    "description": "Unix timestamp (in seconds) of when this Response was completed.\nOnly present when the status is `completed`.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "error": {
+                "$ref": "#/components/schemas/BetaResponseError"
+              },
+              "incomplete_details": {
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "description": "Details about why the response is incomplete.\n",
+                    "properties": {
+                      "reason": {
+                        "type": "string",
+                        "description": "The reason why the response is incomplete. `steered` means\nthe response stopped at a safe output boundary after a\nWebSocket `response.steer` event. The server can then create\na successor response automatically with the queued input.\n",
+                        "enum": [
+                          "max_output_tokens",
+                          "max_messages",
+                          "content_filter",
+                          "steered"
+                        ]
+                      }
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "output": {
+                "type": "array",
+                "description": "An array of content items generated by the model.\n\n- The length and order of items in the `output` array is dependent\n  on the model's response.\n- Rather than accessing the first item in the `output` array and\n  assuming it's an `assistant` message with the content generated by\n  the model, you might consider using the `output_text` property where\n  supported in SDKs.\n",
+                "items": {
+                  "$ref": "#/components/schemas/BetaOutputItem"
+                }
+              },
+              "reasoning": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaReasoning"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "instructions": {
+                "anyOf": [
+                  {
+                    "description": "A system (or developer) message inserted into the model's context.\n\nWhen using along with `previous_response_id`, the instructions from a previous\nresponse will not be carried over to the next response. This makes it simple\nto swap out system (or developer) messages in new responses.\n",
+                    "oneOf": [
+                      {
+                        "type": "string",
+                        "description": "A text input to the model, equivalent to a text input with the\n`developer` role.\n"
+                      },
+                      {
+                        "type": "array",
+                        "title": "Input item list",
+                        "description": "A list of one or many input items to the model, containing\ndifferent content types.\n",
+                        "items": {
+                          "$ref": "#/components/schemas/BetaInputItem"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "output_text": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "SDK-only convenience property that contains the aggregated text output\nfrom all `output_text` items in the `output` array, if any are present.\nSupported in the Python and JavaScript SDKs.\n",
+                    "x-oaiSupportedSDKs": [
+                      "python",
+                      "javascript"
+                    ]
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "usage": {
+                "$ref": "#/components/schemas/BetaResponseUsage"
+              },
+              "prompt_cache_options": {
+                "$ref": "#/components/schemas/BetaPromptCacheOptions"
+              },
+              "prompt_cache_diagnostics": {
+                "$ref": "#/components/schemas/BetaPromptCacheDiagnostics"
+              },
+              "moderation": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaModeration",
+                    "description": "Moderation results for the response input and output, if moderated completions were requested.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "parallel_tool_calls": {
+                "type": "boolean",
+                "description": "Whether to allow the model to run tool calls in parallel.\n",
+                "default": true
+              },
+              "conversation": {
+                "anyOf": [
+                  {
+                    "default": null,
+                    "$ref": "#/components/schemas/BetaResponseConversation"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "max_output_tokens": {
+                "anyOf": [
+                  {
+                    "description": "An upper bound for the number of tokens that can be generated for a response, including visible output tokens and [reasoning tokens](https://developers.openai.com/api/docs/guides/reasoning).\n",
+                    "type": "integer"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "object",
+              "created_at",
+              "error",
+              "incomplete_details",
+              "instructions",
+              "model",
+              "tools",
+              "output",
+              "parallel_tool_calls",
+              "metadata",
+              "tool_choice",
+              "temperature",
+              "top_p"
+            ]
+          }
+        ],
+        "example": {
+          "id": "resp_67ccd3a9da748190baa7f1570fe91ac604becb25c45c1d41",
+          "object": "response",
+          "created_at": 1741476777,
+          "status": "completed",
+          "completed_at": 1741476778,
+          "error": null,
+          "incomplete_details": null,
+          "instructions": null,
+          "max_output_tokens": null,
+          "model": "gpt-6-astra",
+          "output": [
+            {
+              "type": "message",
+              "id": "msg_67ccd3acc8d48190a77525dc6de64b4104becb25c45c1d41",
+              "status": "completed",
+              "role": "assistant",
+              "content": [
+                {
+                  "type": "output_text",
+                  "text": "The image depicts a scenic landscape with a wooden boardwalk or pathway leading through lush, green grass under a blue sky with some clouds. The setting suggests a peaceful natural area, possibly a park or nature reserve. There are trees and shrubs in the background.",
+                  "annotations": []
+                }
+              ]
+            }
+          ],
+          "parallel_tool_calls": true,
+          "previous_response_id": null,
+          "reasoning": {
+            "effort": null,
+            "summary": null,
+            "context": null
+          },
+          "store": true,
+          "temperature": 1,
+          "text": {
+            "format": {
+              "type": "text"
+            }
+          },
+          "tool_choice": "auto",
+          "tools": [],
+          "top_p": 1,
+          "truncation": "disabled",
+          "usage": {
+            "input_tokens": 328,
+            "input_tokens_details": {
+              "cached_tokens": 0,
+              "cache_write_tokens": 0
+            },
+            "output_tokens": 52,
+            "output_tokens_details": {
+              "reasoning_tokens": 0
+            },
+            "total_tokens": 380
+          },
+          "user": null,
+          "metadata": {}
+        }
+      },
+      "BetaResponseConversation": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "The unique ID of the conversation that this response was associated with."
+          }
+        },
+        "type": "object",
+        "required": [
+          "id"
+        ],
+        "title": "Conversation",
+        "description": "The conversation that this response belonged to. Input items and output items from this response were automatically added to this conversation."
+      },
+      "BetaModeration": {
+        "properties": {
+          "input": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BetaModerationResultBody"
+              },
+              {
+                "$ref": "#/components/schemas/BetaModerationErrorBody"
+              }
+            ],
+            "description": "Moderation for the response input.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          },
+          "output": {
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/BetaModerationResultBody"
+              },
+              {
+                "$ref": "#/components/schemas/BetaModerationErrorBody"
+              }
+            ],
+            "description": "Moderation for the response output.",
+            "discriminator": {
+              "propertyName": "type"
+            }
+          }
+        },
+        "type": "object",
+        "required": [
+          "input",
+          "output"
+        ],
+        "title": "Moderation",
+        "description": "Moderation results or errors for the response input and output."
+      },
+      "BetaModerationErrorBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "error"
+            ],
+            "description": "The object type, which was always `error` for moderation failures.",
+            "default": "error",
+            "x-stainless-const": true
+          },
+          "code": {
+            "type": "string",
+            "description": "The error code."
+          },
+          "message": {
+            "type": "string",
+            "description": "The error message."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "code",
+          "message"
+        ],
+        "title": "Moderation error",
+        "description": "An error produced while attempting moderation for the response input or output."
+      },
+      "BetaModerationResultBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "moderation_result"
+            ],
+            "description": "The object type, which was always `moderation_result` for successful moderation results.",
+            "default": "moderation_result",
+            "x-stainless-const": true
+          },
+          "model": {
+            "type": "string",
+            "description": "The moderation model that produced this result."
+          },
+          "flagged": {
+            "type": "boolean",
+            "description": "A boolean indicating whether the content was flagged by any category."
+          },
+          "categories": {
+            "additionalProperties": {
+              "type": "boolean"
+            },
+            "type": "object",
+            "description": "A dictionary of moderation categories to booleans, True if the input is flagged under this category.",
+            "x-oaiTypeLabel": "map"
+          },
+          "category_scores": {
+            "additionalProperties": {
+              "type": "number"
+            },
+            "type": "object",
+            "description": "A dictionary of moderation categories to scores.",
+            "x-oaiTypeLabel": "map"
+          },
+          "category_applied_input_types": {
+            "additionalProperties": {
+              "items": {
+                "$ref": "#/components/schemas/BetaModerationInputType"
+              },
+              "type": "array"
+            },
+            "type": "object",
+            "description": "Which modalities of input are reflected by the score for each category.",
+            "x-oaiTypeLabel": "map"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "model",
+          "flagged",
+          "categories",
+          "category_scores",
+          "category_applied_input_types"
+        ],
+        "title": "Moderation result",
+        "description": "A moderation result produced for the response input or output."
+      },
+      "BetaModerationInputType": {
+        "type": "string",
+        "enum": [
+          "text",
+          "image"
+        ]
+      },
+      "BetaPromptCacheDiagnostics": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaPromptCacheMissDiagnosticsBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaPromptCacheHitDiagnosticsBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaPromptCacheComparisonResponseNotFoundDiagnosticsBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaPromptCacheUnavailableDiagnosticsBody"
+          }
+        ],
+        "description": "Prompt cache diagnostics requested for this response.",
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaPromptCacheUnavailableDiagnosticsBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "unavailable"
+            ],
+            "default": "unavailable",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaPromptCacheComparisonResponseNotFoundDiagnosticsBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "comparison_response_not_found"
+            ],
+            "default": "comparison_response_not_found",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaPromptCacheHitDiagnosticsBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "cache_hit"
+            ],
+            "default": "cache_hit",
+            "x-stainless-const": true
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaPromptCacheMissDiagnosticsBody": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "cache_miss"
+            ],
+            "default": "cache_miss",
+            "x-stainless-const": true
+          },
+          "reason": {
+            "$ref": "#/components/schemas/BetaCacheMissReasonTypeEnum",
+            "description": "The reason prompt cache reuse did not occur."
+          },
+          "cache_missed_tokens": {
+            "type": "integer",
+            "description": "The estimated number of input tokens affected after the first detected divergence."
+          },
+          "comparison_reusable_tokens": {
+            "type": "integer",
+            "description": "The raw token count of the reusable prefix in the compared response."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "reason",
+          "cache_missed_tokens"
+        ]
+      },
+      "BetaCacheMissReasonTypeEnum": {
+        "type": "string",
+        "enum": [
+          "model_changed",
+          "prompt_cache_key_changed",
+          "tools_changed",
+          "text_format_changed",
+          "reasoning_effort_changed",
+          "verbosity_changed",
+          "context_compacted",
+          "input_changed",
+          "service_tier_changed"
+        ]
+      },
+      "BetaPromptCacheOptions": {
+        "properties": {
+          "ttl": {
+            "$ref": "#/components/schemas/BetaPromptCacheTTLEnum",
+            "description": "The minimum lifetime applied to each cache breakpoint."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/BetaPromptCacheModeEnum",
+            "description": "Whether implicit prompt-cache breakpoints were enabled."
+          },
+          "comparison_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The response ID supplied as the prompt cache diagnostics comparison."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "ttl",
+          "mode"
+        ],
+        "title": "Prompt cache options",
+        "description": "The prompt-caching options that were applied to the response. Supported for `gpt-5.6` and later models."
+      },
+      "BetaOutputItem": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaOutputMessage"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFileSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaAgentMessage"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMultiAgentCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMultiAgentCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaWebSearchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaComputerToolCallOutputResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaReasoningItem"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgram"
+          },
+          {
+            "$ref": "#/components/schemas/BetaProgramOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaToolSearchOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaAdditionalTools"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCompactionBody"
+          },
+          {
+            "$ref": "#/components/schemas/BetaImageGenToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCodeInterpreterToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaLocalShellToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionShellCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaApplyPatchToolCallOutput"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPListTools"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPApprovalRequest"
+          },
+          {
+            "$ref": "#/components/schemas/BetaMCPApprovalResponseResource"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCall"
+          },
+          {
+            "$ref": "#/components/schemas/BetaCustomToolCallOutputResource"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaResponseError": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "An error object returned when the model fails to generate a Response.\n",
+            "properties": {
+              "code": {
+                "$ref": "#/components/schemas/BetaResponseErrorCode"
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable description of the error.\n"
+              },
+              "misalignment": {
+                "$ref": "#/components/schemas/BetaMisalignmentErrorDetailsResource"
+              }
+            },
+            "required": [
+              "code",
+              "message"
+            ]
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaResponseErrorCode": {
+        "type": "string",
+        "description": "The error code for the response.\n",
+        "enum": [
+          "server_error",
+          "rate_limit_exceeded",
+          "invalid_prompt",
+          "data_residency_mismatch",
+          "bio_policy",
+          "misalignment_policy_violation",
+          "vector_store_timeout",
+          "invalid_image",
+          "invalid_image_format",
+          "invalid_base64_image",
+          "invalid_image_url",
+          "image_too_large",
+          "image_too_small",
+          "image_parse_error",
+          "image_content_policy_violation",
+          "invalid_image_mode",
+          "image_file_too_large",
+          "unsupported_image_media_type",
+          "empty_image_file",
+          "failed_to_download_image",
+          "image_file_not_found"
+        ]
+      },
+      "BetaServiceTierResponses": {
+        "anyOf": [
+          {
+            "type": "string",
+            "description": "Specifies the processing type used for serving the request.\n  - If set to 'auto', then the request will be processed with the service tier configured in the Project settings. Unless otherwise configured, the Project will use 'default'.\n  - If set to 'default', then the request will be processed with the standard pricing and performance for the selected model.\n  - If set to '[flex](https://developers.openai.com/api/docs/guides/flex-processing)', then the request will be processed with the Flex Processing service tier.\n  - To opt-in to [Fast mode](https://developers.openai.com/api/docs/guides/fast-mode) at the request level, include the `service_tier=fast` or `service_tier=priority` parameter for Responses or Chat Completions. The response will show `service_tier=priority` regardless of if you specify `service_tier=fast` or `priority` in your request.\n  - If set to 'ultrafast', then the request will be processed with the access-controlled Ultrafast Processing service tier. This tier is currently available for `gpt-5.6-sol`; a response served through it will show `service_tier=ultrafast`.\n  - When not set, the default behavior is 'auto'.\n\n  When the `service_tier` parameter is set, the response body will include the `service_tier` value based on the processing mode actually used to serve the request. This response value may be different from the value set in the parameter.\n",
+            "enum": [
+              "auto",
+              "default",
+              "flex",
+              "scale",
+              "priority",
+              "fast",
+              "ultrafast"
+            ],
+            "default": "auto"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaResponseProperties": {
+        "type": "object",
+        "properties": {
+          "previous_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of the previous response to the model. Use this to\ncreate multi-turn conversations. Learn more about\n[conversation state](https://developers.openai.com/api/docs/guides/conversation-state). Cannot be used in conjunction with `conversation`.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model": {
+            "description": "Model ID used to generate the response, like `gpt-6-astra`. OpenAI\noffers a wide range of models with different capabilities, performance\ncharacteristics, and price points. Refer to the [model guide](https://developers.openai.com/api/docs/models)\nto browse and compare available models.\n",
+            "$ref": "#/components/schemas/BetaModelIdsResponses"
+          },
+          "background": {
+            "anyOf": [
+              {
+                "type": "boolean",
+                "description": "Whether to run the model response in the background.\n[Learn more](https://developers.openai.com/api/docs/guides/background).\n",
+                "default": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "max_tool_calls": {
+            "anyOf": [
+              {
+                "description": "The maximum number of total calls to built-in tools that can be processed in a response. This maximum number applies across all built-in tool calls, not per individual tool. Any further attempts to call a tool by the model will be ignored.\n",
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "text": {
+            "$ref": "#/components/schemas/BetaResponseTextParam"
+          },
+          "tools": {
+            "$ref": "#/components/schemas/BetaToolsArray"
+          },
+          "tool_choice": {
+            "$ref": "#/components/schemas/BetaToolChoiceParam"
+          },
+          "prompt": {
+            "$ref": "#/components/schemas/BetaPrompt"
+          }
+        }
+      },
+      "BetaPrompt": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "Reference to a prompt template and its variables.\n[Learn more](https://developers.openai.com/api/docs/guides/text?api-mode=responses#version-prompts-in-code).\n",
+            "required": [
+              "id"
+            ],
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The unique identifier of the prompt template to use."
+              },
+              "version": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "Optional version of the prompt template."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "variables": {
+                "$ref": "#/components/schemas/BetaResponsePromptVariables"
+              }
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaResponsePromptVariables": {
+        "anyOf": [
+          {
+            "type": "object",
+            "title": "Prompt Variables",
+            "description": "Optional map of values to substitute in for variables in your\nprompt. The substitution values can either be strings, or other\nResponse input types like images or files.\n",
+            "x-oaiExpandable": true,
+            "x-oaiTypeLabel": "map",
+            "additionalProperties": {
+              "x-oaiExpandable": true,
+              "x-oaiTypeLabel": "map",
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInputTextContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInputImageContent"
+                },
+                {
+                  "$ref": "#/components/schemas/BetaInputFileContent"
+                }
+              ]
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaToolsArray": {
+        "type": "array",
+        "description": "An array of tools the model may call while generating a response. You\ncan specify which tool to use by setting the `tool_choice` parameter.\n\nWe support the following categories of tools:\n- **Built-in tools**: Tools that are provided by OpenAI that extend the\n  model's capabilities, like [web search](https://developers.openai.com/api/docs/guides/tools-web-search)\n  or [file search](https://developers.openai.com/api/docs/guides/tools-file-search). Learn more about\n  [built-in tools](https://developers.openai.com/api/docs/guides/tools).\n- **MCP Tools**: Integrations with third-party systems via custom MCP servers\n  or predefined connectors such as Google Drive and SharePoint. Learn more about\n  [MCP Tools](https://developers.openai.com/api/docs/guides/tools-connectors-mcp).\n- **Function calls (custom tools)**: Functions that are defined by you,\n  enabling the model to call your own code with strongly typed arguments\n  and outputs. Learn more about\n  [function calling](https://developers.openai.com/api/docs/guides/function-calling). You can also use\n  custom tools to call your own code.\n",
+        "items": {
+          "$ref": "#/components/schemas/BetaTool"
+        }
+      },
+      "BetaModelResponseProperties": {
+        "type": "object",
+        "properties": {
+          "metadata": {
+            "$ref": "#/components/schemas/BetaMetadata"
+          },
+          "top_logprobs": {
+            "anyOf": [
+              {
+                "description": "An integer between 0 and 20 specifying the maximum number of most likely\ntokens to return at each token position, each with an associated log\nprobability. In some cases, the number of returned tokens may be fewer than\nrequested.\n",
+                "type": "integer",
+                "minimum": 0,
+                "maximum": 20
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "temperature": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 2,
+                "default": 1,
+                "example": 1,
+                "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\nWe generally recommend altering this or `top_p` but not both.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "top_p": {
+            "anyOf": [
+              {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 1,
+                "default": 1,
+                "example": 1,
+                "description": "An alternative to sampling with temperature, called nucleus sampling,\nwhere the model considers the results of the tokens with top_p probability\nmass. So 0.1 means only the tokens comprising the top 10% probability mass\nare considered.\n\nWe generally recommend altering this or `temperature` but not both.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "user": {
+            "type": "string",
+            "example": "user-1234",
+            "deprecated": true,
+            "description": "This field is being replaced by `safety_identifier` and `prompt_cache_key`. Use `prompt_cache_key` instead to maintain caching optimizations.\nA stable identifier for your end-users.\nUsed to boost cache hit rates by better bucketing similar requests and  to help OpenAI detect and prevent abuse. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+          },
+          "safety_identifier": {
+            "anyOf": [
+              {
+                "type": "string",
+                "maxLength": 64,
+                "example": "safety-identifier-1234",
+                "description": "A stable identifier used to help detect users of your application that may be violating OpenAI's usage policies.\nThe IDs should be a string that uniquely identifies each user, with a maximum length of 64 characters. We recommend hashing their username or email address, in order to avoid sending us any identifying information. [Learn more](https://developers.openai.com/api/docs/guides/safety-best-practices#implement-safety-identifiers).\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_key": {
+            "anyOf": [
+              {
+                "type": "string",
+                "example": "prompt-cache-key-1234",
+                "description": "Used by OpenAI to cache responses for similar requests to optimize your cache hit rates. Replaces the `user` field. [Learn more](https://developers.openai.com/api/docs/guides/prompt-caching).\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "prompt_cache_retention": {
+            "deprecated": true,
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "in_memory",
+                  "24h"
+                ],
+                "description": "Deprecated. Use `prompt_cache_options.ttl` instead.\n\nThe retention policy for the prompt cache. Set to `24h` to enable extended prompt caching, which keeps cached prefixes active for longer, up to a maximum of 24 hours. [Learn more](https://developers.openai.com/api/docs/guides/prompt-caching#prompt-cache-retention).\nThis field expresses a maximum retention policy, while\n`prompt_cache_options.ttl` expresses a minimum cache lifetime. The two\nfields are independent and do not interact.\nFor `gpt-5.5`, `gpt-5.5-pro`, and future models, only `24h` is supported.\n\nFor older models that support both `in_memory` and `24h`, the default depends on your organization's data retention policy:\n  - Organizations without ZDR enabled default to `24h`.\n  - Organizations with ZDR enabled default to `in_memory` when `prompt_cache_retention` is not specified.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        }
+      },
+      "BetaMetadata": {
+        "anyOf": [
+          {
+            "type": "object",
+            "description": "Set of 16 key-value pairs that can be attached to an object. This can be\nuseful for storing additional information about the object in a structured\nformat, and querying for objects via API or the dashboard.\n\nKeys are strings with a maximum length of 64 characters. Values are strings\nwith a maximum length of 512 characters.\n",
+            "additionalProperties": {
+              "type": "string"
+            },
+            "x-oaiTypeLabel": "map"
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaResponseOutputTextAnnotationAddedEvent": {
+        "type": "object",
+        "title": "ResponseOutputTextAnnotationAddedEvent",
+        "description": "Emitted when an annotation is added to output text content.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.output_text.annotation.added"
+            ],
+            "description": "The type of the event. Always 'response.output_text.annotation.added'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the item to which the annotation is being added."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part within the output item."
+          },
+          "annotation_index": {
+            "type": "integer",
+            "description": "The index of the annotation within the content part."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "annotation": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAnnotation"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The annotation object being added. (See annotation schema for details.)"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "annotation_index",
+          "annotation",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.annotation.added",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_text.annotation.added\",\n  \"item_id\": \"item-abc\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"annotation_index\": 0,\n  \"annotation\": {\n    \"type\": \"file_citation\",\n    \"file_id\": \"file-abc\",\n    \"index\": 0,\n    \"filename\": \"example.txt\"\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseMCPListToolsInProgressEvent": {
+        "type": "object",
+        "title": "ResponseMCPListToolsInProgressEvent",
+        "description": "Emitted when the system is in the process of retrieving the list of available MCP tools.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_list_tools.in_progress"
+            ],
+            "description": "The type of the event. Always 'response.mcp_list_tools.in_progress'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that is being processed."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that is being processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_list_tools.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_list_tools.in_progress\",\n  \"sequence_number\": 1,\n  \"output_index\": 0,\n  \"item_id\": \"mcpl_682d4379df088191886b70f4ec39f90403937d5f622d7a90\"\n}\n"
+        }
+      },
+      "BetaResponseMCPListToolsFailedEvent": {
+        "type": "object",
+        "title": "ResponseMCPListToolsFailedEvent",
+        "description": "Emitted when the attempt to list available MCP tools has failed.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_list_tools.failed"
+            ],
+            "description": "The type of the event. Always 'response.mcp_list_tools.failed'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that failed."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that failed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_list_tools.failed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_list_tools.failed\",\n  \"sequence_number\": 1,\n  \"output_index\": 0,\n  \"item_id\": \"mcpl_682d4379df088191886b70f4ec39f90403937d5f622d7a90\"\n}\n"
+        }
+      },
+      "BetaResponseMCPListToolsCompletedEvent": {
+        "type": "object",
+        "title": "ResponseMCPListToolsCompletedEvent",
+        "description": "Emitted when the list of available MCP tools has been successfully retrieved.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_list_tools.completed"
+            ],
+            "description": "The type of the event. Always 'response.mcp_list_tools.completed'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that produced this output."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_list_tools.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_list_tools.completed\",\n  \"sequence_number\": 1,\n  \"output_index\": 0,\n  \"item_id\": \"mcpl_682d4379df088191886b70f4ec39f90403937d5f622d7a90\"\n}\n"
+        }
+      },
+      "BetaResponseMCPCallInProgressEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallInProgressEvent",
+        "description": "Emitted when an MCP  tool call is in progress.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.in_progress"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call.in_progress'.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the MCP tool call item being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call.in_progress\",\n  \"sequence_number\": 1,\n  \"output_index\": 0,\n  \"item_id\": \"mcp_682d437d90a88191bf88cd03aae0c3e503937d5f622d7a90\"\n}\n"
+        }
+      },
+      "BetaResponseMCPCallFailedEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallFailedEvent",
+        "description": "Emitted when an MCP  tool call has failed.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.failed"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call.failed'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that failed."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that failed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.failed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call.failed\",\n  \"sequence_number\": 1,\n  \"item_id\": \"mcp_682d437d90a88191bf88cd03aae0c3e503937d5f622d7a90\",\n  \"output_index\": 0\n}\n"
+        }
+      },
+      "BetaResponseMCPCallCompletedEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallCompletedEvent",
+        "description": "Emitted when an MCP  tool call has completed successfully.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call.completed"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call.completed'.",
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the MCP tool call item that completed."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that completed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call.completed\",\n  \"sequence_number\": 1,\n  \"item_id\": \"mcp_682d437d90a88191bf88cd03aae0c3e503937d5f622d7a90\",\n  \"output_index\": 0\n}\n"
+        }
+      },
+      "BetaResponseMCPCallArgumentsDoneEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallArgumentsDoneEvent",
+        "description": "Emitted when the arguments for an MCP tool call are finalized.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call_arguments.done"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call_arguments.done'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the MCP tool call item being processed."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "A JSON string containing the finalized arguments for the MCP tool call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "arguments",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call_arguments.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call_arguments.done\",\n  \"output_index\": 0,\n  \"item_id\": \"item-abc\",\n  \"arguments\": \"{\\\"arg1\\\": \\\"value1\\\", \\\"arg2\\\": \\\"value2\\\"}\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseMCPCallArgumentsDeltaEvent": {
+        "type": "object",
+        "title": "ResponseMCPCallArgumentsDeltaEvent",
+        "description": "Emitted when there is a delta (partial update) to the arguments of an MCP tool call.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.mcp_call_arguments.delta"
+            ],
+            "description": "The type of the event. Always 'response.mcp_call_arguments.delta'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the MCP tool call item being processed."
+          },
+          "delta": {
+            "type": "string",
+            "description": "A JSON string containing the partial update to the arguments for the MCP tool call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.mcp_call_arguments.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.mcp_call_arguments.delta\",\n  \"output_index\": 0,\n  \"item_id\": \"item-abc\",\n  \"delta\": \"{\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseImageGenCallPartialImageEvent": {
+        "type": "object",
+        "title": "ResponseImageGenCallPartialImageEvent",
+        "description": "Emitted when a partial image is available during image generation streaming.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.image_generation_call.partial_image"
+            ],
+            "description": "The type of the event. Always 'response.image_generation_call.partial_image'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the image generation item being processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the image generation item being processed."
+          },
+          "partial_image_index": {
+            "type": "integer",
+            "description": "0-based index for the partial image (backend is 1-based, but this is 0-based for the user)."
+          },
+          "partial_image_b64": {
+            "type": "string",
+            "description": "Base64-encoded partial image data, suitable for rendering as an image."
+          },
+          "size": {
+            "type": "string",
+            "description": "The image size that was used."
+          },
+          "quality": {
+            "type": "string",
+            "description": "The image quality that was used."
+          },
+          "background": {
+            "type": "string",
+            "description": "The background setting that was used."
+          },
+          "output_format": {
+            "type": "string",
+            "description": "The output format that was used."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number",
+          "partial_image_index",
+          "partial_image_b64"
+        ],
+        "x-oaiMeta": {
+          "name": "response.image_generation_call.partial_image",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.image_generation_call.partial_image\",\n  \"output_index\": 0,\n  \"item_id\": \"item-123\",\n  \"sequence_number\": 0,\n  \"partial_image_index\": 0,\n  \"partial_image_b64\": \"...\"\n}\n"
+        }
+      },
+      "BetaResponseImageGenCallInProgressEvent": {
+        "type": "object",
+        "title": "ResponseImageGenCallInProgressEvent",
+        "description": "Emitted when an image generation tool call is in progress.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.image_generation_call.in_progress"
+            ],
+            "description": "The type of the event. Always 'response.image_generation_call.in_progress'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the image generation item being processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the image generation item being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.image_generation_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.image_generation_call.in_progress\",\n  \"output_index\": 0,\n  \"item_id\": \"item-123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "BetaResponseImageGenCallGeneratingEvent": {
+        "type": "object",
+        "title": "ResponseImageGenCallGeneratingEvent",
+        "description": "Emitted when an image generation tool call is actively generating an image (intermediate state).\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.image_generation_call.generating"
+            ],
+            "description": "The type of the event. Always 'response.image_generation_call.generating'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the image generation item being processed."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the image generation item being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.image_generation_call.generating",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.image_generation_call.generating\",\n  \"output_index\": 0,\n  \"item_id\": \"item-123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "BetaResponseImageGenCallCompletedEvent": {
+        "type": "object",
+        "title": "ResponseImageGenCallCompletedEvent",
+        "description": "Emitted when an image generation tool call has completed and the final image is available.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.image_generation_call.completed"
+            ],
+            "description": "The type of the event. Always 'response.image_generation_call.completed'.",
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response's output array."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the image generation item being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.image_generation_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.image_generation_call.completed\",\n  \"output_index\": 0,\n  \"item_id\": \"item-123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseReasoningTextDoneEvent": {
+        "type": "object",
+        "description": "Emitted when a reasoning text is completed.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_text.done`.\n",
+            "enum": [
+              "response.reasoning_text.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this reasoning text is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this reasoning text is associated with.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the reasoning content part.\n"
+          },
+          "text": {
+            "type": "string",
+            "description": "The full text of the completed reasoning content.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "text",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_text.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_text.done\",\n  \"item_id\": \"rs_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"text\": \"The user is asking...\",\n  \"sequence_number\": 4\n}\n"
+        }
+      },
+      "BetaResponseReasoningTextDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when a delta is added to a reasoning text.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_text.delta`.\n",
+            "enum": [
+              "response.reasoning_text.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this reasoning text delta is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this reasoning text delta is associated with.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the reasoning content part this delta is associated with.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta that was added to the reasoning content.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_text.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_text.delta\",\n  \"item_id\": \"rs_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"delta\": \"The\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseReasoningSummaryTextDoneEvent": {
+        "type": "object",
+        "description": "Emitted when a reasoning summary text is completed.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_summary_text.done`.\n",
+            "enum": [
+              "response.reasoning_summary_text.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this summary text is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this summary text is associated with.\n"
+          },
+          "summary_index": {
+            "type": "integer",
+            "description": "The index of the summary part within the reasoning summary.\n"
+          },
+          "text": {
+            "type": "string",
+            "description": "The full text of the completed reasoning summary.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "text",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_summary_text.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_summary_text.done\",\n  \"item_id\": \"rs_6806bfca0b2481918a5748308061a2600d3ce51bdffd5476\",\n  \"output_index\": 0,\n  \"summary_index\": 0,\n  \"text\": \"**Responding to a greeting**\\n\\nThe user just said, \\\"Hello!\\\" So, it seems I need to engage. I'll greet them back and offer help since they're looking to chat. I could say something like, \\\"Hello! How can I assist you today?\\\" That feels friendly and open. They didn't ask a specific question, so this approach will work well for starting a conversation. Let's see where it goes from there!\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseReasoningSummaryTextDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when a delta is added to a reasoning summary text.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_summary_text.delta`.\n",
+            "enum": [
+              "response.reasoning_summary_text.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this summary text delta is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this summary text delta is associated with.\n"
+          },
+          "summary_index": {
+            "type": "integer",
+            "description": "The index of the summary part within the reasoning summary.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta that was added to the summary.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_summary_text.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_summary_text.delta\",\n  \"item_id\": \"rs_6806bfca0b2481918a5748308061a2600d3ce51bdffd5476\",\n  \"output_index\": 0,\n  \"summary_index\": 0,\n  \"delta\": \"**Responding to a greeting**\\n\\nThe user just said, \\\"Hello!\\\" So, it seems I need to engage. I'll greet them back and offer help since they're looking to chat. I could say something like, \\\"Hello! How can I assist you today?\\\" That feels friendly and open. They didn't ask a specific question, so this approach will work well for starting a conversation. Let's see where it goes from there!\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseReasoningSummaryPartDoneEvent": {
+        "type": "object",
+        "description": "Emitted when a reasoning summary part is completed.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_summary_part.done`.\n",
+            "enum": [
+              "response.reasoning_summary_part.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this summary part is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this summary part is associated with.\n"
+          },
+          "summary_index": {
+            "type": "integer",
+            "description": "The index of the summary part within the reasoning summary.\n"
+          },
+          "status": {
+            "type": "string",
+            "description": "The completion status of the summary part. Omitted when the part completed\nnormally and set to `incomplete` when generation was interrupted.\n",
+            "enum": [
+              "incomplete"
+            ]
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          },
+          "part": {
+            "type": "object",
+            "description": "The completed summary part.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The type of the summary part. Always `summary_text`.",
+                "enum": [
+                  "summary_text"
+                ],
+                "x-stainless-const": true
+              },
+              "text": {
+                "type": "string",
+                "description": "The text of the summary part."
+              }
+            },
+            "required": [
+              "type",
+              "text"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "part",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_summary_part.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_summary_part.done\",\n  \"item_id\": \"rs_6806bfca0b2481918a5748308061a2600d3ce51bdffd5476\",\n  \"output_index\": 0,\n  \"summary_index\": 0,\n  \"part\": {\n    \"type\": \"summary_text\",\n    \"text\": \"**Responding to a greeting**\\n\\nThe user just said, \\\"Hello!\\\" So, it seems I need to engage. I'll greet them back and offer help since they're looking to chat. I could say something like, \\\"Hello! How can I assist you today?\\\" That feels friendly and open. They didn't ask a specific question, so this approach will work well for starting a conversation. Let's see where it goes from there!\"\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseReasoningSummaryPartAddedEvent": {
+        "type": "object",
+        "description": "Emitted when a new reasoning summary part is added.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.reasoning_summary_part.added`.\n",
+            "enum": [
+              "response.reasoning_summary_part.added"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item this summary part is associated with.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item this summary part is associated with.\n"
+          },
+          "summary_index": {
+            "type": "integer",
+            "description": "The index of the summary part within the reasoning summary.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          },
+          "part": {
+            "type": "object",
+            "description": "The summary part that was added.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "description": "The type of the summary part. Always `summary_text`.",
+                "enum": [
+                  "summary_text"
+                ],
+                "x-stainless-const": true
+              },
+              "text": {
+                "type": "string",
+                "description": "The text of the summary part."
+              }
+            },
+            "required": [
+              "type",
+              "text"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "summary_index",
+          "part",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.reasoning_summary_part.added",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.reasoning_summary_part.added\",\n  \"item_id\": \"rs_6806bfca0b2481918a5748308061a2600d3ce51bdffd5476\",\n  \"output_index\": 0,\n  \"summary_index\": 0,\n  \"part\": {\n    \"type\": \"summary_text\",\n    \"text\": \"\"\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseTextDoneEvent": {
+        "type": "object",
+        "description": "Emitted when text content is finalized.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.output_text.done`.\n",
+            "enum": [
+              "response.output_text.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the text content is finalized.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the text content is finalized.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that the text content is finalized.\n"
+          },
+          "text": {
+            "type": "string",
+            "description": "The text content that is finalized.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "logprobs": {
+            "type": "array",
+            "description": "The log probabilities of the tokens in the delta.\n",
+            "items": {
+              "$ref": "#/components/schemas/BetaResponseLogProb"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "text",
+          "sequence_number",
+          "logprobs"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_text.done\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"text\": \"In a shimmering forest under a sky full of stars, a lonely unicorn named Lila discovered a hidden pond that glowed with moonlight. Every night, she would leave sparkling, magical flowers by the water's edge, hoping to share her beauty with others. One enchanting evening, she woke to find a group of friendly animals gathered around, eager to be friends and share in her magic.\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseLogProb": {
+        "type": "object",
+        "description": "A logprob is the logarithmic probability that the model assigns to producing \na particular token at a given position in the sequence. Less-negative (higher) \nlogprob values indicate greater model confidence in that token choice.\n",
+        "properties": {
+          "token": {
+            "description": "A possible text token.",
+            "type": "string"
+          },
+          "logprob": {
+            "description": "The log probability of this token.\n",
+            "type": "number"
+          },
+          "top_logprobs": {
+            "description": "The log probabilities of up to 20 of the most likely tokens.\n",
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "token": {
+                  "description": "A possible text token.",
+                  "type": "string"
+                },
+                "logprob": {
+                  "description": "The log probability of this token.",
+                  "type": "number"
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "token",
+          "logprob"
+        ]
+      },
+      "BetaResponseTextDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is an additional text delta.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.output_text.delta`.\n",
+            "enum": [
+              "response.output_text.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the text delta was added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the text delta was added to.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that the text delta was added to.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "The text delta that was added.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "logprobs": {
+            "type": "array",
+            "description": "The log probabilities of the tokens in the delta.\n",
+            "items": {
+              "$ref": "#/components/schemas/BetaResponseLogProb"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta",
+          "sequence_number",
+          "logprobs"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_text.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_text.delta\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"delta\": \"In\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseRefusalDoneEvent": {
+        "type": "object",
+        "description": "Emitted when refusal text is finalized.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.refusal.done`.\n",
+            "enum": [
+              "response.refusal.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the refusal text is finalized.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the refusal text is finalized.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that the refusal text is finalized.\n"
+          },
+          "refusal": {
+            "type": "string",
+            "description": "The refusal text that is finalized.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "refusal",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.refusal.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.refusal.done\",\n  \"item_id\": \"item-abc\",\n  \"output_index\": 1,\n  \"content_index\": 2,\n  \"refusal\": \"final refusal text\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseRefusalDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is a partial refusal text.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.refusal.delta`.\n",
+            "enum": [
+              "response.refusal.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the refusal text is added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the refusal text is added to.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that the refusal text is added to.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "The refusal text that is added.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.refusal.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.refusal.delta\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"delta\": \"refusal text so far\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseOutputItemDoneEvent": {
+        "type": "object",
+        "description": "Emitted when an output item is marked done.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.output_item.done`.\n",
+            "enum": [
+              "response.output_item.done"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was marked done.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          },
+          "item": {
+            "$ref": "#/components/schemas/BetaOutputItem",
+            "description": "The output item that was marked done.\n"
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_item.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_item.done\",\n  \"output_index\": 0,\n  \"item\": {\n    \"id\": \"msg_123\",\n    \"status\": \"completed\",\n    \"type\": \"message\",\n    \"role\": \"assistant\",\n    \"content\": [\n      {\n        \"type\": \"output_text\",\n        \"text\": \"In a shimmering forest under a sky full of stars, a lonely unicorn named Lila discovered a hidden pond that glowed with moonlight. Every night, she would leave sparkling, magical flowers by the water's edge, hoping to share her beauty with others. One enchanting evening, she woke to find a group of friendly animals gathered around, eager to be friends and share in her magic.\",\n        \"annotations\": []\n      }\n    ]\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseOutputItemAddedEvent": {
+        "type": "object",
+        "description": "Emitted when a new output item is added.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.output_item.added`.\n",
+            "enum": [
+              "response.output_item.added"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was added.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event.\n"
+          },
+          "item": {
+            "$ref": "#/components/schemas/BetaOutputItem",
+            "description": "The output item that was added. For reasoning items, `encrypted_content`\nmay be incomplete while the item is in progress. Use the reasoning item\nfrom the corresponding `response.output_item.done` event when passing it\nas input to a subsequent request.\n"
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.output_item.added",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.output_item.added\",\n  \"output_index\": 0,\n  \"item\": {\n    \"id\": \"msg_123\",\n    \"status\": \"in_progress\",\n    \"type\": \"message\",\n    \"role\": \"assistant\",\n    \"content\": []\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseInProgressEvent": {
+        "type": "object",
+        "description": "Emitted when the response is in progress.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.in_progress`.\n",
+            "enum": [
+              "response.in_progress"
+            ],
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/BetaResponse",
+            "description": "The response that is in progress.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.in_progress\",\n  \"response\": {\n    \"id\": \"resp_67ccfcdd16748190a91872c75d38539e09e4d4aac714747c\",\n    \"object\": \"response\",\n    \"created_at\": 1741487325,\n    \"status\": \"in_progress\",\n    \"completed_at\": null,\n    \"error\": null,\n    \"incomplete_details\": null,\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [],\n    \"parallel_tool_calls\": true,\n    \"previous_response_id\": null,\n    \"reasoning\": {\n      \"effort\": null,\n      \"summary\": null\n    },\n    \"store\": true,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": null,\n    \"user\": null,\n    \"metadata\": {}\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseShellCallOutputContentDoneStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_output_content.done"
+            ],
+            "description": "The type of the event, always `response.shell_call_output_content.done`.",
+            "default": "response.shell_call_output_content.done",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that was updated."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that produced output."
+          },
+          "output": {
+            "items": {
+              "$ref": "#/components/schemas/BetaFunctionShellCallOutputContent"
+            },
+            "type": "array",
+            "description": "The output contents emitted for the shell command."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "item_id",
+          "output_index",
+          "command_index",
+          "output"
+        ],
+        "title": "Response shell call output content done event",
+        "description": "A streaming event that indicated shell call output was completed."
+      },
+      "BetaResponseShellCallOutputContentDeltaStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_output_content.delta"
+            ],
+            "description": "The type of the event, always `response.shell_call_output_content.delta`.",
+            "default": "response.shell_call_output_content.delta",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that was updated."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that produced output."
+          },
+          "delta": {
+            "$ref": "#/components/schemas/BetaShellCallOutputDelta",
+            "description": "The stdout/stderr delta that was emitted."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "item_id",
+          "output_index",
+          "command_index",
+          "delta"
+        ],
+        "title": "Response shell call output content delta event",
+        "description": "A streaming event that indicated shell call output was incrementally added."
+      },
+      "BetaShellCallOutputDelta": {
+        "properties": {
+          "stdout": {
+            "type": "string",
+            "description": "The stdout delta that was emitted."
+          },
+          "stderr": {
+            "type": "string",
+            "description": "The stderr delta that was emitted."
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Shell call output delta",
+        "description": "A delta of stdout/stderr emitted while a shell call was running."
+      },
+      "BetaResponseShellCallCommandDoneStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_command.done"
+            ],
+            "description": "The type of the event, always `response.shell_call_command.done`.",
+            "default": "response.shell_call_command.done",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that was completed."
+          },
+          "command": {
+            "type": "string",
+            "description": "The final shell command that was emitted."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "output_index",
+          "command_index",
+          "command"
+        ],
+        "title": "Response shell command done event",
+        "description": "A streaming event that indicated a shell command was completed."
+      },
+      "BetaResponseShellCallCommandDeltaStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_command.delta"
+            ],
+            "description": "The type of the event, always `response.shell_call_command.delta`.",
+            "default": "response.shell_call_command.delta",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that was updated."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The shell command delta that was appended."
+          },
+          "obfuscation": {
+            "type": "string",
+            "description": "An obfuscation string that was added to pad the event payload."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "output_index",
+          "command_index",
+          "delta"
+        ],
+        "title": "Response shell command delta event",
+        "description": "A streaming event that indicated a shell command was incrementally updated."
+      },
+      "BetaResponseShellCallCommandAddedStreamingEvent": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.shell_call_command.added"
+            ],
+            "description": "The type of the event, always `response.shell_call_command.added`.",
+            "default": "response.shell_call_command.added",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the event that was emitted."
+          },
+          "agent": {
+            "$ref": "#/components/schemas/BetaAgentTag",
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that was updated."
+          },
+          "command_index": {
+            "type": "integer",
+            "description": "The index of the shell command that was added."
+          },
+          "command": {
+            "type": "string",
+            "description": "The shell command that was added."
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "sequence_number",
+          "output_index",
+          "command_index",
+          "command"
+        ],
+        "title": "Response shell command added event",
+        "description": "A streaming event that indicated a shell command was added to a tool call."
+      },
+      "BetaResponseFunctionCallArgumentsDoneEvent": {
+        "type": "object",
+        "description": "Emitted when function-call arguments are finalized.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.function_call_arguments.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the item."
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "arguments": {
+            "type": "string",
+            "description": "The function-call arguments."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "arguments",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.function_call_arguments.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.function_call_arguments.done\",\n  \"item_id\": \"item-abc\",\n  \"output_index\": 1,\n  \"arguments\": \"{ \\\"arg\\\": 123 }\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseFunctionCallArgumentsDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is a partial function-call arguments delta.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.function_call_arguments.delta`.\n",
+            "enum": [
+              "response.function_call_arguments.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the function-call arguments delta is added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the function-call arguments delta is added to.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The function-call arguments delta that is added.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.function_call_arguments.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.function_call_arguments.delta\",\n  \"item_id\": \"item-abc\",\n  \"output_index\": 0,\n  \"delta\": \"{ \\\"arg\\\":\"\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseFileSearchCallSearchingEvent": {
+        "type": "object",
+        "description": "Emitted when a file search is currently searching.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.file_search_call.searching`.\n",
+            "enum": [
+              "response.file_search_call.searching"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the file search call is searching.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the file search call is initiated.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.file_search_call.searching",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.file_search_call.searching\",\n  \"output_index\": 0,\n  \"item_id\": \"fs_123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseFileSearchCallInProgressEvent": {
+        "type": "object",
+        "description": "Emitted when a file search call is initiated.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.file_search_call.in_progress`.\n",
+            "enum": [
+              "response.file_search_call.in_progress"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the file search call is initiated.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the file search call is initiated.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.file_search_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.file_search_call.in_progress\",\n  \"output_index\": 0,\n  \"item_id\": \"fs_123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseFileSearchCallCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when a file search call is completed (results found).",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.file_search_call.completed`.\n",
+            "enum": [
+              "response.file_search_call.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the file search call is initiated.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the file search call is initiated.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.file_search_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.file_search_call.completed\",\n  \"output_index\": 0,\n  \"item_id\": \"fs_123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseErrorEvent": {
+        "type": "object",
+        "description": "Emitted when an error occurs.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `error`.\n",
+            "enum": [
+              "error"
+            ],
+            "x-stainless-const": true
+          },
+          "code": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The error code.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "type": "string",
+            "description": "The error message.\n"
+          },
+          "param": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The error parameter.\n"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "code",
+          "message",
+          "param",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "error",
+          "group": "responses",
+          "example": "{\n  \"type\": \"error\",\n  \"code\": \"ERR_SOMETHING\",\n  \"message\": \"Something went wrong\",\n  \"param\": null,\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseCreatedEvent": {
+        "type": "object",
+        "description": "An event that is emitted when a response is created.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.created`.\n",
+            "enum": [
+              "response.created"
+            ],
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/BetaResponse",
+            "description": "The response that was created.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.created",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.created\",\n  \"response\": {\n    \"id\": \"resp_67ccfcdd16748190a91872c75d38539e09e4d4aac714747c\",\n    \"object\": \"response\",\n    \"created_at\": 1741487325,\n    \"status\": \"in_progress\",\n    \"completed_at\": null,\n    \"error\": null,\n    \"incomplete_details\": null,\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [],\n    \"parallel_tool_calls\": true,\n    \"previous_response_id\": null,\n    \"reasoning\": {\n      \"effort\": null,\n      \"summary\": null\n    },\n    \"store\": true,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": null,\n    \"user\": null,\n    \"metadata\": {}\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseContentPartDoneEvent": {
+        "type": "object",
+        "description": "Emitted when a content part is done.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.content_part.done`.\n",
+            "enum": [
+              "response.content_part.done"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the content part was added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the content part was added to.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that is done.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "part": {
+            "$ref": "#/components/schemas/BetaOutputContent",
+            "description": "The content part that is done.\n"
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.content_part.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.content_part.done\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"sequence_number\": 1,\n  \"part\": {\n    \"type\": \"output_text\",\n    \"text\": \"In a shimmering forest under a sky full of stars, a lonely unicorn named Lila discovered a hidden pond that glowed with moonlight. Every night, she would leave sparkling, magical flowers by the water's edge, hoping to share her beauty with others. One enchanting evening, she woke to find a group of friendly animals gathered around, eager to be friends and share in her magic.\",\n    \"annotations\": []\n  }\n}\n"
+        }
+      },
+      "BetaOutputContent": {
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/BetaOutputTextContent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaRefusalContent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaReasoningTextContent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaResponseContentPartAddedEvent": {
+        "type": "object",
+        "description": "Emitted when a new content part is added.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.content_part.added`.\n",
+            "enum": [
+              "response.content_part.added"
+            ],
+            "x-stainless-const": true
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The ID of the output item that the content part was added to.\n"
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the content part was added to.\n"
+          },
+          "content_index": {
+            "type": "integer",
+            "description": "The index of the content part that was added.\n"
+          },
+          "part": {
+            "$ref": "#/components/schemas/BetaOutputContent",
+            "description": "The content part that was added.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "item_id",
+          "output_index",
+          "content_index",
+          "part",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.content_part.added",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.content_part.added\",\n  \"item_id\": \"msg_123\",\n  \"output_index\": 0,\n  \"content_index\": 0,\n  \"part\": {\n    \"type\": \"output_text\",\n    \"text\": \"\",\n    \"annotations\": []\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when the model response is complete.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.completed`.\n",
+            "enum": [
+              "response.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/BetaResponse",
+            "description": "Properties of the completed response.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.completed\",\n  \"response\": {\n    \"id\": \"resp_123\",\n    \"object\": \"response\",\n    \"created_at\": 1740855869,\n    \"status\": \"completed\",\n    \"completed_at\": 1740855870,\n    \"error\": null,\n    \"incomplete_details\": null,\n    \"input\": [],\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [\n      {\n        \"id\": \"msg_123\",\n        \"type\": \"message\",\n        \"role\": \"assistant\",\n        \"content\": [\n          {\n            \"type\": \"output_text\",\n            \"text\": \"In a shimmering forest under a sky full of stars, a lonely unicorn named Lila discovered a hidden pond that glowed with moonlight. Every night, she would leave sparkling, magical flowers by the water's edge, hoping to share her beauty with others. One enchanting evening, she woke to find a group of friendly animals gathered around, eager to be friends and share in her magic.\",\n            \"annotations\": []\n          }\n        ]\n      }\n    ],\n    \"previous_response_id\": null,\n    \"reasoning_effort\": null,\n    \"store\": false,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": {\n      \"input_tokens\": 0,\n      \"output_tokens\": 0,\n      \"output_tokens_details\": {\n        \"reasoning_tokens\": 0\n      },\n      \"total_tokens\": 0\n    },\n    \"user\": null,\n    \"metadata\": {}\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseCodeInterpreterCallInterpretingEvent": {
+        "type": "object",
+        "description": "Emitted when the code interpreter is actively interpreting the code snippet.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call.interpreting`.",
+            "enum": [
+              "response.code_interpreter_call.interpreting"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code interpreter is interpreting code."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call.interpreting",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call.interpreting\",\n  \"output_index\": 4,\n  \"item_id\": \"ci_12345\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseCodeInterpreterCallInProgressEvent": {
+        "type": "object",
+        "description": "Emitted when a code interpreter call is in progress.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call.in_progress`.",
+            "enum": [
+              "response.code_interpreter_call.in_progress"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code interpreter call is in progress."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call.in_progress\",\n  \"output_index\": 0,\n  \"item_id\": \"ci_12345\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseCodeInterpreterCallCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when the code interpreter call is completed.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call.completed`.",
+            "enum": [
+              "response.code_interpreter_call.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code interpreter call is completed."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call.completed\",\n  \"output_index\": 5,\n  \"item_id\": \"ci_12345\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseCodeInterpreterCallCodeDoneEvent": {
+        "type": "object",
+        "description": "Emitted when the code snippet is finalized by the code interpreter.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call_code.done`.",
+            "enum": [
+              "response.code_interpreter_call_code.done"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code is finalized."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "code": {
+            "type": "string",
+            "description": "The final code snippet output by the code interpreter."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "code",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call_code.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call_code.done\",\n  \"output_index\": 3,\n  \"item_id\": \"ci_12345\",\n  \"code\": \"print('done')\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseCodeInterpreterCallCodeDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when a partial code snippet is streamed by the code interpreter.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.code_interpreter_call_code.delta`.",
+            "enum": [
+              "response.code_interpreter_call_code.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item in the response for which the code is being streamed."
+          },
+          "item_id": {
+            "type": "string",
+            "description": "The unique identifier of the code interpreter tool call item."
+          },
+          "delta": {
+            "type": "string",
+            "description": "The partial code snippet being streamed by the code interpreter."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event, used to order streaming events."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.code_interpreter_call_code.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.code_interpreter_call_code.delta\",\n  \"output_index\": 0,\n  \"item_id\": \"ci_12345\",\n  \"delta\": \"print('Hello, world')\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseAudioTranscriptDoneEvent": {
+        "type": "object",
+        "description": "Emitted when the full audio transcript is completed.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.audio.transcript.done`.\n",
+            "enum": [
+              "response.audio.transcript.done"
+            ],
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "response_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.audio.transcript.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.audio.transcript.done\",\n  \"response_id\": \"resp_123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseAudioTranscriptDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is a partial transcript of audio.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.audio.transcript.delta`.\n",
+            "enum": [
+              "response.audio.transcript.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "delta": {
+            "type": "string",
+            "description": "The partial transcript of the audio response.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "response_id",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.audio.transcript.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.audio.transcript.delta\",\n  \"response_id\": \"resp_123\",\n  \"delta\": \" ... partial transcript ... \",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseAudioDoneEvent": {
+        "type": "object",
+        "description": "Emitted when the audio response is complete.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.audio.done`.\n",
+            "enum": [
+              "response.audio.done"
+            ],
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the delta.\n"
+          }
+        },
+        "required": [
+          "type",
+          "sequence_number",
+          "response_id"
+        ],
+        "x-oaiMeta": {
+          "name": "response.audio.done",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.audio.done\",\n  \"response_id\": \"resp-123\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseAudioDeltaEvent": {
+        "type": "object",
+        "description": "Emitted when there is a partial audio response.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.audio.delta`.\n",
+            "enum": [
+              "response.audio.delta"
+            ],
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "A sequence number for this chunk of the stream response.\n"
+          },
+          "delta": {
+            "type": "string",
+            "description": "A chunk of Base64 encoded response audio bytes.\n"
+          }
+        },
+        "required": [
+          "type",
+          "delta",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.audio.delta",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.audio.delta\",\n  \"response_id\": \"resp_123\",\n  \"delta\": \"base64encoded...\",\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseIncompleteEvent": {
+        "type": "object",
+        "description": "An event that is emitted when a response finishes as incomplete.\n\nOver WebSocket, steering can finish a response with\n`response.incomplete_details.reason` set to `steered`, followed automatically\nby a successor `response.created` that commits the queued steering input.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.incomplete`.\n",
+            "enum": [
+              "response.incomplete"
+            ],
+            "x-stainless-const": true
+          },
+          "response": {
+            "$ref": "#/components/schemas/BetaResponse",
+            "description": "The response that was incomplete.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.incomplete",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.incomplete\",\n  \"response\": {\n    \"id\": \"resp_123\",\n    \"object\": \"response\",\n    \"created_at\": 1740855869,\n    \"status\": \"incomplete\",\n    \"completed_at\": null,\n    \"error\": null,\n    \"incomplete_details\": {\n      \"reason\": \"max_tokens\"\n    },\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [],\n    \"previous_response_id\": null,\n    \"reasoning_effort\": null,\n    \"store\": false,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": null,\n    \"user\": null,\n    \"metadata\": {}\n  },\n  \"sequence_number\": 1\n}\n"
+        }
+      },
+      "BetaResponseFailedEvent": {
+        "type": "object",
+        "description": "An event that is emitted when a response fails.\n",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.failed`.\n",
+            "enum": [
+              "response.failed"
+            ],
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of this event."
+          },
+          "response": {
+            "$ref": "#/components/schemas/BetaResponse",
+            "description": "The response that failed.\n"
+          }
+        },
+        "required": [
+          "type",
+          "response",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.failed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.failed\",\n  \"response\": {\n    \"id\": \"resp_123\",\n    \"object\": \"response\",\n    \"created_at\": 1740855869,\n    \"status\": \"failed\",\n    \"completed_at\": null,\n    \"error\": {\n      \"code\": \"server_error\",\n      \"message\": \"The model failed to generate a response.\"\n    },\n    \"incomplete_details\": null,\n    \"instructions\": null,\n    \"max_output_tokens\": null,\n    \"model\": \"gpt-6-astra\",\n    \"output\": [],\n    \"previous_response_id\": null,\n    \"reasoning_effort\": null,\n    \"store\": false,\n    \"temperature\": 1,\n    \"text\": {\n      \"format\": {\n        \"type\": \"text\"\n      }\n    },\n    \"tool_choice\": \"auto\",\n    \"tools\": [],\n    \"top_p\": 1,\n    \"truncation\": \"disabled\",\n    \"usage\": null,\n    \"user\": null,\n    \"metadata\": {}\n  }\n}\n"
+        }
+      },
+      "BetaResponseWebSearchCallCompletedEvent": {
+        "type": "object",
+        "description": "Emitted when a web search call is completed.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.web_search_call.completed`.\n",
+            "enum": [
+              "response.web_search_call.completed"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the web search call is associated with.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique ID for the output item associated with the web search call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the web search call being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.web_search_call.completed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.web_search_call.completed\",\n  \"output_index\": 0,\n  \"item_id\": \"ws_123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "BetaResponseWebSearchCallSearchingEvent": {
+        "type": "object",
+        "description": "Emitted when a web search call is executing.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.web_search_call.searching`.\n",
+            "enum": [
+              "response.web_search_call.searching"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the web search call is associated with.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique ID for the output item associated with the web search call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the web search call being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.web_search_call.searching",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.web_search_call.searching\",\n  \"output_index\": 0,\n  \"item_id\": \"ws_123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "BetaResponseWebSearchCallInProgressEvent": {
+        "type": "object",
+        "description": "Emitted when a web search call is initiated.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `response.web_search_call.in_progress`.\n",
+            "enum": [
+              "response.web_search_call.in_progress"
+            ],
+            "x-stainless-const": true
+          },
+          "output_index": {
+            "type": "integer",
+            "description": "The index of the output item that the web search call is associated with.\n"
+          },
+          "item_id": {
+            "type": "string",
+            "description": "Unique ID for the output item associated with the web search call.\n"
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of the web search call being processed."
+          }
+        },
+        "required": [
+          "type",
+          "output_index",
+          "item_id",
+          "sequence_number"
+        ],
+        "x-oaiMeta": {
+          "name": "response.web_search_call.in_progress",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.web_search_call.in_progress\",\n  \"output_index\": 0,\n  \"item_id\": \"ws_123\",\n  \"sequence_number\": 0\n}\n"
+        }
+      },
+      "BetaResponseSteerFailedEvent": {
+        "type": "object",
+        "title": "ResponseSteerFailedEvent",
+        "description": "Emitted when steering input is rejected or cannot be committed to a\nsuccessor response. Returns the original, uncommitted input so the client\ncan carry it into `response.create` when appropriate. Invalid input must\nbe corrected before retrying.\n\nFailures after acceptance include the same steering ID. Failures before an\nID is allocated omit `steer.id`. A lost connection or missing acknowledgement\nleaves the outcome unknown; it is not proof that the input was rejected.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.steer.failed"
+            ],
+            "description": "The event discriminator. Always `response.steer.failed`.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "steer": {
+            "type": "object",
+            "description": "The steering submission that could not be committed.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID assigned to the steering submission, if one was allocated.\n"
+              },
+              "previous_response_id": {
+                "type": "string",
+                "description": "The ID of the response that was targeted for steering."
+              },
+              "input": {
+                "$ref": "#/components/schemas/BetaResponseSteerInput"
+              }
+            },
+            "required": [
+              "previous_response_id",
+              "input"
+            ]
+          },
+          "error": {
+            "type": "object",
+            "description": "Information about why the input could not be committed.",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "invalid_request_error"
+                ],
+                "description": "The error type. Always `invalid_request_error`.",
+                "x-stainless-const": true
+              },
+              "code": {
+                "$ref": "#/components/schemas/BetaResponseSteerErrorCode"
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable description of the error."
+              }
+            },
+            "required": [
+              "type",
+              "code",
+              "message"
+            ]
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The WebSocket lane that emitted this event, when the target response is\navailable and its `response.create` event supplied a `stream_id`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "sequence_number",
+          "steer",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "response.steer.failed",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.steer.failed\",\n  \"sequence_number\": 5,\n  \"steer\": {\n    \"id\": \"steer_456\",\n    \"previous_response_id\": \"resp_123\",\n    \"input\": [\n      {\n        \"type\": \"message\",\n        \"role\": \"user\",\n        \"content\": [\n          {\n            \"type\": \"input_text\",\n            \"text\": \"Prioritize the database rollout.\"\n          }\n        ]\n      }\n    ]\n  },\n  \"error\": {\n    \"type\": \"invalid_request_error\",\n    \"code\": \"successor_creation_failed\",\n    \"message\": \"We couldn't start the next response. Send this steering input again with response.create.\"\n  }\n}\n"
+        }
+      },
+      "BetaResponseSteerErrorCode": {
+        "title": "ResponseSteerErrorCode",
+        "description": "A machine-readable steering error code. Clients should handle unknown\nvalues because additional codes may be introduced. Known values include:\n- `response_not_found`: The target response is not available on this connection.\n- `invalid_input`: The event or input failed validation.\n- `steering_not_supported`: The model or response execution mode does not support steering.\n- `too_many_pending_steers`: Too much steering input is pending for the response.\n- `response_already_completed`: The response completed and is no longer accepting steering input.\n- `response_not_active`: The response is no longer accepting steering input.\n- `successor_creation_failed`: The successor response could not be created.\n",
+        "anyOf": [
+          {
+            "type": "string",
+            "enum": [
+              "response_not_found",
+              "invalid_input",
+              "steering_not_supported",
+              "too_many_pending_steers",
+              "response_already_completed",
+              "response_not_active",
+              "successor_creation_failed"
+            ]
+          },
+          {
+            "type": "string"
+          }
+        ]
+      },
+      "BetaResponseSteerInput": {
+        "title": "ResponseSteerInput",
+        "description": "Input to queue for a continuation of the response. Uses the same string or\ninput-item shape as `response.create.input`, with a non-empty array when\nsupplying input items.\n\nSteering accepts only messages with the `user` role. Each message may\ncontain only `type`, `role`, and `content`, with `content` as a string or an\narray of `input_text`, `input_image`, and `input_file` parts. The optional\n`type` must be `message`. Other roles, tool outputs, and item types are not\nsupported for steering.\n",
+        "oneOf": [
+          {
+            "type": "string",
+            "title": "Text input",
+            "description": "A text input, equivalent to a message with the `user` role."
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseSteerInputItemList"
+          }
+        ]
+      },
+      "BetaResponseSteerInputItemList": {
+        "type": "array",
+        "title": "Response steer input item list",
+        "description": "A non-empty list of message inputs to queue for the response.",
+        "minItems": 1,
+        "items": {
+          "$ref": "#/components/schemas/BetaResponseSteerInputItem"
+        }
+      },
+      "BetaResponseSteerInputItem": {
+        "title": "Response steer input item",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/BetaUserMessageItemParam"
+          },
+          {
+            "$ref": "#/components/schemas/BetaFunctionCallOutputItemParam"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaUserMessageItemParam": {
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Beta_AgentTagParam",
+                "description": "The agent that produced this item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The unique ID of this message item.",
+                "example": "msg_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "message"
+            ],
+            "description": "The item type. Always `message`.",
+            "default": "message",
+            "x-stainless-const": true
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "user"
+            ],
+            "description": "The message role. Always `user`.",
+            "default": "user",
+            "x-stainless-const": true
+          },
+          "content": {
+            "oneOf": [
+              {
+                "items": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/BetaInputTextContentParam"
+                    },
+                    {
+                      "$ref": "#/components/schemas/BetaInputImageContentParamAutoParam"
+                    },
+                    {
+                      "$ref": "#/components/schemas/BetaInputFileContentParam"
+                    }
+                  ],
+                  "description": "A piece of message content, such as text, an image, or a file.",
+                  "discriminator": {
+                    "propertyName": "type"
+                  }
+                },
+                "type": "array"
+              },
+              {
+                "type": "string",
+                "maxLength": 10485760,
+                "description": "The message content, as a single string."
+              }
+            ],
+            "description": "The message content, as an array of content parts."
+          },
+          "status": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The status of the message item."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "role",
+          "content"
+        ]
+      },
+      "BetaResponseSteerPendingEvent": {
+        "type": "object",
+        "title": "ResponseSteerPendingEvent",
+        "description": "Emitted when accepted steering input remains queued after the target\nresponse completes. The server still owns the input. Do not resend it.\nThe successor's `response.created` event is the commit point.\n\nWhen `reason` is `waiting_for_required_input`, this event follows\n`response.completed` while the response waits for the tool results or\napproval decisions identified by `required_input`. Copy those stubs, fill\ntheir result fields using the ordinary `response.create` input schemas,\nand submit one continuation per parent with the same `previous_response_id`\nand WebSocket lane. Use saved results without rerunning tools. The queued\nsteering input is prepended in submission order to the continuation's\ninput. That explicit request retains its own settings.\n\nThis notification is emitted at most once per steering submission. Multiple\nsubmissions for the same parent can report the same required inputs; they\ndo not each require a separate continuation.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.steer.pending"
+            ],
+            "description": "The event discriminator. Always `response.steer.pending`.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "steer": {
+            "type": "object",
+            "description": "The steering submission that remains queued.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID assigned to the steering submission."
+              },
+              "previous_response_id": {
+                "type": "string",
+                "description": "The ID of the response being steered."
+              }
+            },
+            "required": [
+              "id",
+              "previous_response_id"
+            ]
+          },
+          "reason": {
+            "$ref": "#/components/schemas/BetaResponseSteerPendingReason"
+          },
+          "required_input": {
+            "type": "array",
+            "minItems": 1,
+            "description": "Input stubs identifying outstanding client-owned tool results or\napproval decisions. Each stub contains identifying fields only; the\nclient supplies the result before including it in `response.create`.\n",
+            "items": {
+              "$ref": "#/components/schemas/BetaResponseSteerRequiredInput"
+            }
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The WebSocket lane that emitted this event. This field is present when\nthe target response's `response.create` event supplied a `stream_id`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "sequence_number",
+          "steer",
+          "reason",
+          "required_input"
+        ],
+        "x-oaiMeta": {
+          "name": "response.steer.pending",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.steer.pending\",\n  \"sequence_number\": 10,\n  \"steer\": {\n    \"id\": \"steer_456\",\n    \"previous_response_id\": \"resp_123\"\n  },\n  \"reason\": \"waiting_for_required_input\",\n  \"required_input\": [\n    {\n      \"type\": \"function_call_output\",\n      \"call_id\": \"call_789\",\n      \"name\": \"lookup\"\n    }\n  ]\n}\n"
+        }
+      },
+      "BetaResponseSteerRequiredInput": {
+        "title": "ResponseSteerRequiredInput",
+        "description": "An input stub identifying an outstanding client-owned tool result or\napproval decision. Copy the stub and fill the result fields using the\ncorresponding `response.create` input schema. Use saved results without\nrerunning the tool. The server does not supply results, approval decisions,\nor safety acknowledgements in these stubs.\n",
+        "oneOf": [
+          {
+            "type": "object",
+            "title": "Required function tool call output",
+            "additionalProperties": false,
+            "description": "Supply `output` using the function tool call output input schema.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "function_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id",
+              "name"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required custom tool call output",
+            "additionalProperties": false,
+            "description": "Supply `output` using the custom tool call output input schema. The\noriginal custom tool call supplies the tool's name.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "custom_tool_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required computer tool call output",
+            "additionalProperties": false,
+            "description": "Supply `output` using the computer tool call output input schema,\nincluding any required `acknowledged_safety_checks`.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "computer_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required shell tool call output",
+            "additionalProperties": false,
+            "description": "Supply `output` using the shell tool call output input schema. Each\noutput entry includes `stdout`, `stderr`, and `outcome`.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "shell_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required apply patch tool call output",
+            "additionalProperties": false,
+            "description": "Supply `status` and optional `output` using the apply patch tool call\noutput input schema.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "apply_patch_call_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "call_id"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required tool search output",
+            "additionalProperties": false,
+            "description": "Supply `tools` using the tool search output input schema, retaining\n`execution: \"client\"`.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "tool_search_output"
+                ],
+                "x-stainless-const": true
+              },
+              "call_id": {
+                "type": "string"
+              },
+              "execution": {
+                "type": "string",
+                "enum": [
+                  "client"
+                ],
+                "x-stainless-const": true
+              }
+            },
+            "required": [
+              "type",
+              "call_id",
+              "execution"
+            ]
+          },
+          {
+            "type": "object",
+            "title": "Required MCP approval response",
+            "additionalProperties": false,
+            "description": "Supply `approve` using the MCP approval response input schema. An\noptional `reason` can be supplied when denying the request. The original\napproval request identifies the tool and server.\n",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "mcp_approval_response"
+                ],
+                "x-stainless-const": true
+              },
+              "approval_request_id": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "type",
+              "approval_request_id"
+            ]
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      },
+      "BetaResponseSteerPendingReason": {
+        "title": "ResponseSteerPendingReason",
+        "description": "An extensible enum describing why accepted steering input is still queued.\nClients should handle unknown values because additional reasons may be\nintroduced. Known values include:\n- `waiting_for_required_input`: The response is waiting for the tool results or approval decisions identified by `required_input`.\n",
+        "anyOf": [
+          {
+            "type": "string",
+            "enum": [
+              "waiting_for_required_input"
+            ]
+          },
+          {
+            "type": "string"
+          }
+        ]
+      },
+      "BetaResponseSteerAcceptedEvent": {
+        "type": "object",
+        "title": "ResponseSteerAcceptedEvent",
+        "description": "Emitted when steering input has been validated and queued. Acceptance means\nthe server owns the input, not that it has been applied. The successor's\n`response.created` event is the commit point. If accepted input cannot be\ncommitted, `response.steer.failed` returns it with the same steering ID.\n\nWhen the response stops for client-owned tool output or approval, the input\nremains queued and `response.steer.pending` is emitted after\n`response.completed`. Fill the pending event's `required_input` stubs with\nsaved results and send one matching explicit `response.create` per parent.\nDo not resend accepted input while it is still queued.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.steer.accepted"
+            ],
+            "description": "The event discriminator. Always `response.steer.accepted`.",
+            "x-stainless-const": true
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "steer": {
+            "type": "object",
+            "description": "The accepted steering submission.",
+            "properties": {
+              "id": {
+                "type": "string",
+                "description": "The ID assigned to the steering submission."
+              },
+              "previous_response_id": {
+                "type": "string",
+                "description": "The ID of the response being steered."
+              }
+            },
+            "required": [
+              "id",
+              "previous_response_id"
+            ]
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The WebSocket lane that emitted this event. This field is present when\nthe target response's `response.create` event supplied a `stream_id`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "sequence_number",
+          "steer"
+        ],
+        "x-oaiMeta": {
+          "name": "response.steer.accepted",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.steer.accepted\",\n  \"sequence_number\": 2,\n  \"steer\": {\n    \"id\": \"steer_456\",\n    \"previous_response_id\": \"resp_123\"\n  }\n}\n"
+        }
+      },
+      "BetaResponseSteerEvent": {
+        "type": "object",
+        "title": "ResponseSteerEvent",
+        "additionalProperties": false,
+        "description": "Queues user input to steer a response on this WebSocket connection. Input\ncan contain text, images, and files. Steering is supported only for\nsingle-agent responses on models and execution modes that support steering.\nResponses bound to a conversation or using automatic compaction do not\nsupport steering.\n\nA `response.steer.accepted` event acknowledges that the server owns the\nqueued input, not that it has been applied. The successor's `response.created`\nevent is the commit point. Input that cannot be committed is returned in\n`response.steer.failed`.\n\nSteering may cause the active response to finish at a safe output boundary\nwith `response.incomplete` and `incomplete_details.reason` set to `steered`,\nfollowed automatically by a successor `response.created`. Normal completion\ncan also be followed by an automatic successor. Automatic successors inherit\nthe previous response's settings and continue from it with the queued input.\n\nIf the response stops for client-owned tool output or approval, accepted\nsteering input remains queued and `response.steer.pending` is emitted after\n`response.completed`. Fill the `required_input` stubs from that event with\nsaved tool results or approval decisions, and send one explicit\n`response.create` per parent with the same `previous_response_id` and\nWebSocket lane. Do not rerun tools or resend accepted steering input. The\nqueued input is prepended in submission order to that request's input, and\nthe explicit request retains its own settings.\n\nThis event accepts only `type`, `previous_response_id`, and `input`. Do not\nsend `stream_id`; the target response determines the WebSocket lane.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.steer"
+            ],
+            "description": "The event discriminator. Always `response.steer`.",
+            "x-stainless-const": true
+          },
+          "previous_response_id": {
+            "type": "string",
+            "description": "The ID of the response to steer on this WebSocket connection."
+          },
+          "input": {
+            "$ref": "#/components/schemas/BetaResponseSteerInput"
+          }
+        },
+        "required": [
+          "type",
+          "previous_response_id",
+          "input"
+        ],
+        "x-oaiMeta": {
+          "name": "response.steer",
+          "group": "responses",
+          "example": "{\n  \"type\": \"response.steer\",\n  \"previous_response_id\": \"resp_123\",\n  \"input\": [\n    {\n      \"type\": \"message\",\n      \"role\": \"user\",\n      \"content\": [\n        {\n          \"type\": \"input_text\",\n          \"text\": \"Prioritize the database rollout.\"\n        }\n      ]\n    }\n  ]\n}\n"
+        }
+      },
+      "BetaOutputAudio": {
+        "type": "object",
+        "title": "Output audio",
+        "description": "An audio output from the model.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the output audio. Always `output_audio`.\n",
+            "enum": [
+              "output_audio"
+            ],
+            "x-stainless-const": true
+          },
+          "data": {
+            "type": "string",
+            "description": "Base64-encoded audio data from the model.\n"
+          },
+          "transcript": {
+            "type": "string",
+            "description": "The transcript of the audio data from the model.\n"
+          }
+        },
+        "required": [
+          "type",
+          "data",
+          "transcript"
+        ]
+      },
+      "BetaInputAudio": {
+        "type": "object",
+        "title": "Input audio",
+        "description": "An audio input to the model.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The type of the input item. Always `input_audio`.\n",
+            "enum": [
+              "input_audio"
+            ],
+            "x-stainless-const": true
+          },
+          "input_audio": {
+            "type": "object",
+            "properties": {
+              "data": {
+                "type": "string",
+                "description": "Base64-encoded audio data.\n"
+              },
+              "format": {
+                "type": "string",
+                "description": "The format of the audio data. Currently supported formats are `mp3` and\n`wav`.\n",
+                "enum": [
+                  "mp3",
+                  "wav"
+                ]
+              }
+            },
+            "required": [
+              "data",
+              "format"
+            ]
+          }
+        },
+        "required": [
+          "type",
+          "input_audio"
+        ]
+      },
+      "BetaInputParam": {
+        "description": "Text, image, or file inputs to the model, used to generate a response.\n\nLearn more:\n- [Text inputs and outputs](https://developers.openai.com/api/docs/guides/text)\n- [Image inputs](https://developers.openai.com/api/docs/guides/images-vision)\n- [File inputs](https://developers.openai.com/api/docs/guides/file-inputs)\n- [Conversation state](https://developers.openai.com/api/docs/guides/conversation-state)\n- [Function calling](https://developers.openai.com/api/docs/guides/function-calling)\n",
+        "oneOf": [
+          {
+            "type": "string",
+            "title": "Text input",
+            "description": "A text input to the model, equivalent to a text input with the\n`user` role.\n"
+          },
+          {
+            "type": "array",
+            "title": "Input item list",
+            "description": "A list of one or many input items to the model, containing\ndifferent content types.\n",
+            "items": {
+              "$ref": "#/components/schemas/BetaInputItem"
+            }
+          }
+        ]
+      },
+      "BetaContent": {
+        "description": "Multi-modal input and output contents.\n",
+        "oneOf": [
+          {
+            "title": "Input content types",
+            "$ref": "#/components/schemas/BetaInputContent"
+          },
+          {
+            "title": "Output content types",
+            "$ref": "#/components/schemas/BetaOutputContent"
+          }
+        ]
+      },
+      "BetaIncludeEnum": {
+        "type": "string",
+        "enum": [
+          "file_search_call.results",
+          "web_search_call.results",
+          "web_search_call.action.sources",
+          "message.input_image.image_url",
+          "computer_call_output.output.image_url",
+          "code_interpreter_call.outputs",
+          "reasoning.encrypted_content",
+          "message.output_text.logprobs"
+        ],
+        "description": "Specify additional output data to include in the model response. Currently supported values are:\n- `web_search_call.results`: Include the search results of the web search tool call.\n- `web_search_call.action.sources`: Include the sources of the web search tool call.\n- `code_interpreter_call.outputs`: Includes the outputs of python code execution in code interpreter tool call items.\n- `computer_call_output.output.image_url`: Include image urls from the computer call output.\n- `file_search_call.results`: Include the search results of the file search tool call.\n- `message.input_image.image_url`: Include image urls from the input message.\n- `message.output_text.logprobs`: Include logprobs with assistant messages.\n- `reasoning.encrypted_content`: Includes an encrypted version of reasoning tokens in reasoning item outputs. This enables reasoning items to be used in multi-turn conversations when using the Responses API statelessly (like when the `store` parameter is set to `false`, or when an organization is enrolled in the zero data retention program)."
+      },
+      "BetaResponsesServerEvent": {
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "description": "Server events emitted by the Responses WebSocket server.\n",
+        "anyOf": [
+          {
+            "title": "BetaResponseAudioWsDelta",
+            "description": "Emitted when there is a partial audio response.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseAudioDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseAudioWsDone",
+            "description": "Emitted when the audio response is complete.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseAudioDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseAudioTranscriptWsDelta",
+            "description": "Emitted when there is a partial transcript of audio.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseAudioTranscriptDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseAudioTranscriptWsDone",
+            "description": "Emitted when the full audio transcript is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseAudioTranscriptDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseCodeInterpreterCallCodeWsDelta",
+            "description": "Emitted when a partial code snippet is streamed by the code interpreter.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCodeDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseCodeInterpreterCallCodeWsDone",
+            "description": "Emitted when the code snippet is finalized by the code interpreter.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCodeDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseCodeInterpreterCallWsCompleted",
+            "description": "Emitted when the code interpreter call is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseCodeInterpreterCallInWsProgress",
+            "description": "Emitted when a code interpreter call is in progress.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseCodeInterpreterCallWsInterpreting",
+            "description": "Emitted when the code interpreter is actively interpreting the code snippet.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallInterpretingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseWsCompleted",
+            "description": "Emitted when the model response is complete.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseContentPartWsAdded",
+            "description": "Emitted when a new content part is added.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseContentPartAddedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseContentPartWsDone",
+            "description": "Emitted when a content part is done.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseContentPartDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseWsCreated",
+            "description": "An event that is emitted when a response is created.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCreatedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseFileSearchCallWsCompleted",
+            "description": "Emitted when a file search call is completed (results found).",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseFileSearchCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseFileSearchCallInWsProgress",
+            "description": "Emitted when a file search call is initiated.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseFileSearchCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseFileSearchCallWsSearching",
+            "description": "Emitted when a file search is currently searching.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseFileSearchCallSearchingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseFunctionCallArgumentsWsDelta",
+            "description": "Emitted when there is a partial function-call arguments delta.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseFunctionCallArgumentsDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseFunctionCallArgumentsWsDone",
+            "description": "Emitted when function-call arguments are finalized.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseFunctionCallArgumentsDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseShellCallCommandWsAdded",
+            "description": "A streaming event that indicated a shell command was added to a tool call.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallCommandAddedStreamingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseShellCallCommandWsDelta",
+            "description": "A streaming event that indicated a shell command was incrementally updated.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallCommandDeltaStreamingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseShellCallCommandWsDone",
+            "description": "A streaming event that indicated a shell command was completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallCommandDoneStreamingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseShellCallOutputContentWsDelta",
+            "description": "A streaming event that indicated shell call output was incrementally added.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallOutputContentDeltaStreamingEvent",
+                "x-stainless-skip": [
+                  "go"
+                ]
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseShellCallOutputContentWsDone",
+            "description": "A streaming event that indicated shell call output was completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallOutputContentDoneStreamingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseInWsProgress",
+            "description": "Emitted when the response is in progress.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseWsFailed",
+            "description": "An event that is emitted when a response fails.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseFailedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseWsIncomplete",
+            "description": "An event that is emitted when a response finishes as incomplete.\n\nOver WebSocket, steering can finish a response with\n`response.incomplete_details.reason` set to `steered`, followed automatically\nby a successor `response.created` that commits the queued steering input.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseIncompleteEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseOutputItemWsAdded",
+            "description": "Emitted when a new output item is added.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseOutputItemAddedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseOutputItemWsDone",
+            "description": "Emitted when an output item is marked done.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseOutputItemDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseReasoningSummaryPartWsAdded",
+            "description": "Emitted when a new reasoning summary part is added.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningSummaryPartAddedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseReasoningSummaryPartWsDone",
+            "description": "Emitted when a reasoning summary part is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningSummaryPartDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseReasoningSummaryTextWsDelta",
+            "description": "Emitted when a delta is added to a reasoning summary text.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningSummaryTextDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseReasoningSummaryTextWsDone",
+            "description": "Emitted when a reasoning summary text is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningSummaryTextDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseReasoningTextWsDelta",
+            "description": "Emitted when a delta is added to a reasoning text.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningTextDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseReasoningTextWsDone",
+            "description": "Emitted when a reasoning text is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningTextDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseRefusalWsDelta",
+            "description": "Emitted when there is a partial refusal text.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseRefusalDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseRefusalWsDone",
+            "description": "Emitted when refusal text is finalized.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseRefusalDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseTextWsDelta",
+            "description": "Emitted when there is an additional text delta.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseTextDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseTextWsDone",
+            "description": "Emitted when text content is finalized.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseTextDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseWebSearchCallWsCompleted",
+            "description": "Emitted when a web search call is completed.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseWebSearchCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseWebSearchCallInWsProgress",
+            "description": "Emitted when a web search call is initiated.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseWebSearchCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseWebSearchCallWsSearching",
+            "description": "Emitted when a web search call is executing.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseWebSearchCallSearchingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseImageGenCallWsCompleted",
+            "description": "Emitted when an image generation tool call has completed and the final image is available.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseImageGenCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseImageGenCallWsGenerating",
+            "description": "Emitted when an image generation tool call is actively generating an image (intermediate state).\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseImageGenCallGeneratingEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseImageGenCallInWsProgress",
+            "description": "Emitted when an image generation tool call is in progress.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseImageGenCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseImageGenCallPartialWsImage",
+            "description": "Emitted when a partial image is available during image generation streaming.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseImageGenCallPartialImageEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseMcpCallArgumentsWsDelta",
+            "description": "Emitted when there is a delta (partial update) to the arguments of an MCP tool call.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallArgumentsDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseMcpCallArgumentsWsDone",
+            "description": "Emitted when the arguments for an MCP tool call are finalized.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallArgumentsDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseMcpCallWsCompleted",
+            "description": "Emitted when an MCP  tool call has completed successfully.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseMcpCallWsFailed",
+            "description": "Emitted when an MCP  tool call has failed.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallFailedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseMcpCallInWsProgress",
+            "description": "Emitted when an MCP  tool call is in progress.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseMcpListToolsWsCompleted",
+            "description": "Emitted when the list of available MCP tools has been successfully retrieved.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPListToolsCompletedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseMcpListToolsWsFailed",
+            "description": "Emitted when the attempt to list available MCP tools has failed.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPListToolsFailedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseMcpListToolsInWsProgress",
+            "description": "Emitted when the system is in the process of retrieving the list of available MCP tools.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPListToolsInProgressEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseOutputTextAnnotationWsAdded",
+            "description": "Emitted when an annotation is added to output text content.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseOutputTextAnnotationAddedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseWsQueued",
+            "description": "Emitted when a response is queued and waiting to be processed.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseQueuedEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseCustomToolCallInputWsDelta",
+            "description": "Event representing a delta (partial update) to the input of a custom tool call.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCustomToolCallInputDeltaEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "title": "BetaResponseCustomToolCallInputWsDone",
+            "description": "Event indicating that input for a custom tool call is complete.\n",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseCustomToolCallInputDoneEvent"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "stream_id": {
+                    "type": "string",
+                    "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseWsError"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseSteerAcceptedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseSteerPendingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseSteerFailedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseInjectCreatedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseInjectFailedEvent"
+          }
+        ]
+      },
+      "BetaResponseInjectFailedEvent": {
+        "type": "object",
+        "title": "ResponseInjectFailedEvent",
+        "description": "Emitted when injected input could not be committed to a response. The event\nreturns the uncommitted raw input so the client can retry it in another\nresponse when appropriate.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.inject.failed"
+            ],
+            "description": "The event discriminator. Always `response.inject.failed`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response that rejected the input."
+          },
+          "input": {
+            "type": "array",
+            "description": "The raw input items that were not committed.",
+            "items": {
+              "$ref": "#/components/schemas/BetaInputItem"
+            }
+          },
+          "error": {
+            "type": "object",
+            "description": "Information about why the input was not committed.",
+            "properties": {
+              "code": {
+                "type": "string",
+                "enum": [
+                  "response_already_completed",
+                  "response_not_found"
+                ],
+                "description": "A machine-readable error code."
+              },
+              "message": {
+                "type": "string",
+                "description": "A human-readable description of the error."
+              }
+            },
+            "required": [
+              "code",
+              "message"
+            ]
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The multiplexed WebSocket stream that emitted the event. This field is\npresent only when WebSocket multiplexing is enabled separately.\n"
+          }
+        },
+        "required": [
+          "type",
+          "response_id",
+          "input",
+          "error",
+          "sequence_number"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1",
+        "x-oaiMeta": {
+          "example": "{\n  \"type\": \"response.inject.failed\",\n  \"response_id\": \"resp_123\",\n  \"input\": [\n    {\n      \"type\": \"function_call_output\",\n      \"call_id\": \"call_123\",\n      \"output\": \"{\\\"temperature\\\":72}\"\n    }\n  ],\n  \"error\": {\n    \"code\": \"response_already_completed\",\n    \"message\": \"Response 'resp_123' has already completed.\"\n  },\n  \"sequence_number\": 9\n}\n"
+        }
+      },
+      "BetaResponseInjectCreatedEvent": {
+        "type": "object",
+        "title": "ResponseInjectCreatedEvent",
+        "description": "Emitted when all injected input items were validated and committed to the\nactive response.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.inject.created"
+            ],
+            "description": "The event discriminator. Always `response.inject.created`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the response that accepted the input."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number for this event."
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The multiplexed WebSocket stream that emitted the event. This field is\npresent only when WebSocket multiplexing is enabled separately.\n"
+          }
+        },
+        "required": [
+          "type",
+          "response_id",
+          "sequence_number"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1",
+        "x-oaiMeta": {
+          "example": "{\n  \"type\": \"response.inject.created\",\n  \"response_id\": \"resp_123\",\n  \"sequence_number\": 8\n}\n"
+        }
+      },
+      "BetaResponseWsError": {
+        "type": "object",
+        "title": "ResponseWsError",
+        "description": "Emitted when an error occurs while processing a Responses WebSocket request.",
+        "properties": {
+          "agent": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaAgentTag"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "The agent that owns this multi-agent streaming event."
+          },
+          "type": {
+            "type": "string",
+            "description": "The type of the event. Always `error`.",
+            "enum": [
+              "error"
+            ],
+            "x-stainless-const": true
+          },
+          "status": {
+            "type": "integer",
+            "description": "The HTTP status code associated with a WebSocket protocol error."
+          },
+          "sequence_number": {
+            "type": "integer",
+            "description": "The sequence number of an error emitted by the response stream."
+          },
+          "error": {
+            "$ref": "#/components/schemas/BetaErrorPayload",
+            "description": "Details about the error."
+          },
+          "stream_id": {
+            "type": "string",
+            "description": "The WebSocket lane that emitted this event. This field is present when the\noriginating `response.create` event supplied a `stream_id`.\n"
+          }
+        },
+        "required": [
+          "type",
+          "error"
+        ],
+        "x-oaiMeta": {
+          "name": "error",
+          "group": "responses",
+          "example": "{\n  \"type\": \"error\",\n  \"status\": 400,\n  \"stream_id\": \"agent_1\",\n  \"error\": {\n    \"type\": \"invalid_request_error\",\n    \"code\": \"websocket_stream_limit_reached\",\n    \"message\": \"This WebSocket connection has reached its stream limit.\",\n    \"param\": \"stream_id\"\n  }\n}\n"
+        }
+      },
+      "BetaErrorPayload": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The error type that was emitted."
+          },
+          "code": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The error code that was emitted, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "message": {
+            "type": "string",
+            "description": "The human-readable error message that was emitted."
+          },
+          "param": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The parameter name that was associated with the error, if any."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "headers": {
+            "additionalProperties": {
+              "type": "string",
+              "description": "The header value that was emitted."
+            },
+            "type": "object",
+            "description": "The response headers that were emitted with the error, if any.",
+            "x-oaiTypeLabel": "map"
+          },
+          "misalignment": {
+            "$ref": "#/components/schemas/BetaMisalignmentErrorDetailsResource"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "code",
+          "message",
+          "param"
+        ],
+        "title": "Error payload",
+        "description": "An error payload that was emitted for a streaming error event."
+      },
+      "BetaResponsesWebSocketStreamEvent": {
+        "allOf": [
+          {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaResponseAudioDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseAudioDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseAudioTranscriptDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseAudioTranscriptDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCodeDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCodeDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallInterpretingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseContentPartAddedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseContentPartDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCreatedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseFileSearchCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseFileSearchCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseFileSearchCallSearchingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseFunctionCallArgumentsDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseFunctionCallArgumentsDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallCommandAddedStreamingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallCommandDeltaStreamingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallCommandDoneStreamingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallOutputContentDeltaStreamingEvent",
+                "x-stainless-skip": [
+                  "go"
+                ]
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseShellCallOutputContentDoneStreamingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseFailedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseIncompleteEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseOutputItemAddedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseOutputItemDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningSummaryPartAddedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningSummaryPartDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningSummaryTextDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningSummaryTextDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningTextDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseReasoningTextDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseRefusalDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseRefusalDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseTextDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseTextDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseWebSearchCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseWebSearchCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseWebSearchCallSearchingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseImageGenCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseImageGenCallGeneratingEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseImageGenCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseImageGenCallPartialImageEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallArgumentsDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallArgumentsDoneEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallFailedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPCallInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPListToolsCompletedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPListToolsFailedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseMCPListToolsInProgressEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseOutputTextAnnotationAddedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseQueuedEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCustomToolCallInputDeltaEvent"
+              },
+              {
+                "$ref": "#/components/schemas/BetaResponseCustomToolCallInputDoneEvent"
+              }
+            ]
+          },
+          {
+            "type": "object",
+            "properties": {
+              "stream_id": {
+                "type": "string",
+                "description": "The WebSocket lane that emitted this event. This field is present\nwhen the originating `response.create` event supplied a\n`stream_id`.\n"
+              }
+            }
+          }
+        ]
+      },
+      "BetaResponsesClientEvent": {
+        "discriminator": {
+          "propertyName": "type"
+        },
+        "description": "Client events accepted by the Responses WebSocket server.\n",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/BetaResponsesClientEventResponseCreate"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseSteerEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseInjectEvent"
+          }
+        ]
+      },
+      "BetaResponseInjectEvent": {
+        "type": "object",
+        "title": "ResponseInjectEvent",
+        "description": "Injects input items into an active response over a WebSocket connection.\nThe items are validated and committed atomically. Currently, the server\naccepts client-owned tool outputs that resume a waiting agent.\n",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "response.inject"
+            ],
+            "description": "The event discriminator. Always `response.inject`.",
+            "x-stainless-const": true
+          },
+          "response_id": {
+            "type": "string",
+            "description": "The ID of the active response that should receive the input."
+          },
+          "input": {
+            "type": "array",
+            "maxItems": 16384,
+            "description": "Input items to inject into the active response.",
+            "items": {
+              "$ref": "#/components/schemas/BetaInputItem"
+            }
+          }
+        },
+        "required": [
+          "type",
+          "response_id",
+          "input"
+        ],
+        "x-oai-beta": "responses_multi_agent=v1",
+        "x-oaiMeta": {
+          "example": "{\n  \"type\": \"response.inject\",\n  \"response_id\": \"resp_123\",\n  \"input\": [\n    {\n      \"type\": \"function_call_output\",\n      \"call_id\": \"call_123\",\n      \"output\": \"{\\\"temperature\\\":72}\"\n    }\n  ]\n}\n"
+        }
+      },
+      "BetaResponsesClientEventResponseCreate": {
+        "allOf": [
+          {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "response.create"
+                ],
+                "description": "The type of the client event. Always `response.create`.\n",
+                "x-stainless-const": true
+              },
+              "stream_id": {
+                "type": "string",
+                "minLength": 1,
+                "maxLength": 256,
+                "pattern": "^[A-Za-z0-9_.-]+$",
+                "description": "The WebSocket lane for this response. Requests with the same\n`stream_id` are processed FIFO, and events for the response echo the\nsame `stream_id`.\n\n`stream_id` controls routing; `previous_response_id` controls\nconversation lineage, so a new lane can fork from a response created\non another lane.\n"
+              }
+            },
+            "required": [
+              "type"
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/BetaCreateResponse"
+          }
+        ],
+        "description": "Client event for creating a response over a persistent WebSocket connection.\nThis payload uses the same top-level fields as `POST /v1/responses`, plus\nWebSocket-only envelope metadata.\n\nNotes:\n- `stream` is implicit over WebSocket and should not be sent.\n- `background` is not supported over WebSocket.\n- `stream_id` is WebSocket-only and is not part of `POST /v1/responses`.\n",
+        "x-oaiMeta": {
+          "example": "{\n  \"type\": \"response.create\",\n  \"stream_id\": \"agent_1\",\n  \"model\": \"gpt-6-astra\",\n  \"input\": \"Say hello.\"\n}\n"
+        }
+      },
+      "BetaCreateResponse": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaCreateModelResponseProperties"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "prompt_cache_options": {
+                "$ref": "#/components/schemas/BetaResponsePromptCacheOptionsParam"
+              },
+              "service_tier": {
+                "$ref": "#/components/schemas/BetaServiceTierResponses"
+              },
+              "truncation": {
+                "deprecated": true,
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "The truncation strategy to use for the model response.\n- `auto`: If the input to this Response exceeds\n  the model's context window size, the model will truncate the\n  response to fit the context window by dropping items from the beginning of the conversation.\n- `disabled` (default): If the input size will exceed the context window\n  size for a model, the request will fail with a 400 error.\n",
+                    "enum": [
+                      "auto",
+                      "disabled"
+                    ],
+                    "default": "disabled"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "reasoning": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaReasoning"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "input": {
+                "$ref": "#/components/schemas/BetaInputParam"
+              },
+              "include": {
+                "anyOf": [
+                  {
+                    "type": "array",
+                    "description": "Specify additional output data to include in the model response. Currently supported values are:\n- `web_search_call.action.sources`: Include the sources of the web search tool call.\n- `code_interpreter_call.outputs`: Includes the outputs of python code execution in code interpreter tool call items.\n- `computer_call_output.output.image_url`: Include image urls from the computer call output.\n- `file_search_call.results`: Include the search results of the file search tool call.\n- `message.input_image.image_url`: Include image urls from the input message.\n- `message.output_text.logprobs`: Include logprobs with assistant messages.\n- `reasoning.encrypted_content`: Includes an encrypted version of reasoning tokens in reasoning item outputs. This enables reasoning items to be used in multi-turn conversations when using the Responses API statelessly (like when the `store` parameter is set to `false`, or when an organization is enrolled in the zero data retention program).",
+                    "items": {
+                      "$ref": "#/components/schemas/BetaIncludeEnum"
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "parallel_tool_calls": {
+                "anyOf": [
+                  {
+                    "type": "boolean",
+                    "description": "Whether to allow the model to run tool calls in parallel.\n",
+                    "default": true
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "store": {
+                "anyOf": [
+                  {
+                    "type": "boolean",
+                    "description": "Whether to store the generated model response for later retrieval via\nAPI.\nDefaults to true when omitted.\nIf set to true, response data will be stored for at least 30 days, subject to the [data retention exceptions](https://developers.openai.com/api/docs/guides/your-data#v1responses).\n",
+                    "default": true
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "instructions": {
+                "anyOf": [
+                  {
+                    "type": "string",
+                    "description": "A system (or developer) message inserted into the model's context.\n\nWhen using along with `previous_response_id`, the instructions from a previous\nresponse will not be carried over to the next response. This makes it simple\nto swap out system (or developer) messages in new responses.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "moderation": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaModerationParam",
+                    "description": "Configuration for running moderation on the input and output of this response.\n"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "stream": {
+                "anyOf": [
+                  {
+                    "description": "If set to true, the model response data will be streamed to the client\nas it is generated using [server-sent events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format).\nSee the [Streaming section below](https://developers.openai.com/api/reference/resources/responses/streaming-events)\nfor more information.\n",
+                    "type": "boolean",
+                    "default": false
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "stream_options": {
+                "$ref": "#/components/schemas/BetaResponseStreamOptions"
+              },
+              "conversation": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaConversationParam"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "context_management": {
+                "anyOf": [
+                  {
+                    "type": "array",
+                    "description": "Context management configuration for this request.\n",
+                    "minItems": 1,
+                    "items": {
+                      "$ref": "#/components/schemas/BetaContextManagementParam"
+                    }
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "max_output_tokens": {
+                "anyOf": [
+                  {
+                    "description": "An upper bound for the number of tokens that can be generated for a response, including visible output tokens and [reasoning tokens](https://developers.openai.com/api/docs/guides/reasoning).\n",
+                    "type": "integer",
+                    "minimum": 16
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "multi_agent": {
+                "anyOf": [
+                  {
+                    "$ref": "#/components/schemas/BetaMultiAgentParam",
+                    "description": "Configuration for server-hosted multi-agent execution."
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      },
+      "BetaMultiAgentParam": {
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "Whether to enable server-hosted multi-agent execution for this response."
+          },
+          "max_concurrent_subagents": {
+            "type": "integer",
+            "minimum": 1,
+            "description": "`max_concurrent_subagents` sets the maximum number of subagents that can be active simultaneously across the entire agent tree. It includes all descendants—children, grandchildren, and deeper subagents—but excludes the root agent.\nThe API does not impose a fixed upper bound on this setting. The default is `3`, which is recommended for most workloads. Multi-agent runs also have no fixed limit on tree depth or the total number of subagents created during a run."
+          }
+        },
+        "type": "object",
+        "required": [
+          "enabled"
+        ],
+        "description": "Configuration for server-hosted multi-agent execution.",
+        "x-oai-beta": "responses_multi_agent=v1"
+      },
+      "BetaContextManagementParam": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "description": "The context management entry type. Currently only 'compaction' is supported."
+          },
+          "compact_threshold": {
+            "anyOf": [
+              {
+                "type": "integer",
+                "minimum": 1000,
+                "description": "Token threshold at which compaction should be triggered for this entry."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "type"
+        ]
+      },
+      "BetaResponseStreamOptions": {
+        "anyOf": [
+          {
+            "description": "Options for streaming responses. Only set this when you set `stream: true`.\n",
+            "type": "object",
+            "default": null,
+            "properties": {
+              "include_obfuscation": {
+                "type": "boolean",
+                "description": "When true, stream obfuscation will be enabled. Stream obfuscation adds\nrandom characters to an `obfuscation` field on streaming delta events to\nnormalize payload sizes as a mitigation to certain side-channel attacks.\nThese obfuscation fields are included by default, but add a small amount\nof overhead to the data stream. You can set `include_obfuscation` to\nfalse to optimize for bandwidth if you trust the network links between\nyour application and the OpenAI API.\n"
+              }
+            }
+          },
+          {
+            "type": "null"
+          }
+        ]
+      },
+      "BetaModerationParam": {
+        "properties": {
+          "model": {
+            "type": "string",
+            "description": "The moderation model to use for moderated completions, e.g. 'omni-moderation-latest'."
+          },
+          "policy": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaModerationPolicyParam",
+                "description": "The policy to apply to moderated response input and output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [
+          "model"
+        ],
+        "description": "Configuration for running moderation on the input and output of this response."
+      },
+      "BetaModerationPolicyParam": {
+        "properties": {
+          "input": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaModerationConfigParam",
+                "description": "The moderation policy for the response input."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "output": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/BetaModerationConfigParam",
+                "description": "The moderation policy for the response output."
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [],
+        "description": "The policy to apply to moderated response input and output."
+      },
+      "BetaModerationConfigParam": {
+        "properties": {
+          "mode": {
+            "$ref": "#/components/schemas/BetaModerationMode"
+          }
+        },
+        "type": "object",
+        "required": [
+          "mode"
+        ],
+        "description": "The moderation policy for the response input."
+      },
+      "BetaModerationMode": {
+        "type": "string",
+        "enum": [
+          "score",
+          "block"
+        ]
+      },
+      "BetaResponsePromptCacheOptionsParam": {
+        "properties": {
+          "ttl": {
+            "$ref": "#/components/schemas/BetaPromptCacheTTLEnum",
+            "description": "The minimum lifetime applied to every implicit and explicit cache breakpoint written by the request. Defaults to `30m`, which is currently the only supported value. The backend may retain cache entries for longer."
+          },
+          "mode": {
+            "$ref": "#/components/schemas/BetaPromptCacheModeEnum",
+            "description": "Controls whether OpenAI automatically creates an implicit cache breakpoint. Defaults to `implicit`. With `implicit`, OpenAI creates one implicit breakpoint and writes up to the latest three explicit breakpoints in the request. With `explicit`, OpenAI does not create an implicit breakpoint and writes up to the latest four explicit breakpoints. If there are no explicit breakpoints, the request does not use prompt caching."
+          },
+          "comparison_response_id": {
+            "anyOf": [
+              {
+                "type": "string",
+                "description": "The ID of a response to compare when diagnosing prompt cache reuse. Supplying this field requests prompt cache diagnostics when the feature is enabled.",
+                "example": "resp_123"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          }
+        },
+        "type": "object",
+        "required": [],
+        "title": "Prompt cache options",
+        "description": "Options for prompt caching. Supported for `gpt-5.6` and later models. By default, OpenAI automatically chooses one implicit cache breakpoint. You can add explicit breakpoints to content blocks with `prompt_cache_breakpoint`. Each request can write up to four breakpoints. For cache matching, OpenAI considers up to the latest 80 breakpoints in the conversation, without a content-block lookback limit. Set `mode` to `explicit` to disable the implicit breakpoint. The `ttl` defaults to `30m`, which is currently the only supported value. See the [prompt caching guide](https://developers.openai.com/api/docs/guides/prompt-caching) for current details."
+      },
+      "BetaCreateModelResponseProperties": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/BetaModelResponseProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "prompt_cache_options": {
+                "$ref": "#/components/schemas/BetaPromptCacheOptionsParam"
+              },
+              "top_logprobs": {
+                "description": "An integer between 0 and 20 specifying the maximum number of most likely\ntokens to return at each token position, each with an associated log\nprobability. In some cases, the number of returned tokens may be fewer than\nrequested.\n",
+                "type": "integer",
+                "minimum": 0,
+                "maximum": 20
+              }
+            }
+          }
+        ]
+      },
+      "BetaResponseStreamEvent": {
+        "description": "Event emitted while a response is streamed.",
+        "anyOf": [
+          {
+            "$ref": "#/components/schemas/BetaResponseAudioDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseAudioDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseAudioTranscriptDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseAudioTranscriptDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCodeDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCodeDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCodeInterpreterCallInterpretingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseContentPartAddedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseContentPartDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCreatedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseErrorEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseFileSearchCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseFileSearchCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseFileSearchCallSearchingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseFunctionCallArgumentsDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseFunctionCallArgumentsDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseShellCallCommandAddedStreamingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseShellCallCommandDeltaStreamingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseShellCallCommandDoneStreamingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseShellCallOutputContentDeltaStreamingEvent",
+            "x-stainless-skip": [
+              "go"
+            ]
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseShellCallOutputContentDoneStreamingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseFailedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseIncompleteEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseOutputItemAddedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseOutputItemDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseReasoningSummaryPartAddedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseReasoningSummaryPartDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseReasoningSummaryTextDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseReasoningSummaryTextDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseReasoningTextDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseReasoningTextDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseRefusalDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseRefusalDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseTextDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseTextDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseWebSearchCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseWebSearchCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseWebSearchCallSearchingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseImageGenCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseImageGenCallGeneratingEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseImageGenCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseImageGenCallPartialImageEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseMCPCallArgumentsDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseMCPCallArgumentsDoneEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseMCPCallCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseMCPCallFailedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseMCPCallInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseMCPListToolsCompletedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseMCPListToolsFailedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseMCPListToolsInProgressEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseOutputTextAnnotationAddedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseQueuedEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCustomToolCallInputDeltaEvent"
+          },
+          {
+            "$ref": "#/components/schemas/BetaResponseCustomToolCallInputDoneEvent"
+          }
+        ],
+        "discriminator": {
+          "propertyName": "type"
+        }
+      }
+    },
+    "responses": {
+      "TooManyRequests": {
+        "description": "The request was rejected because a rate limit was exceeded.",
+        "headers": {
+          "Retry-After": {
+            "description": "The minimum number of seconds to wait before retrying. This header is returned when the server has computed a retry delay and may be omitted for 429 responses that require user action.",
+            "schema": {
+              "type": "integer",
+              "minimum": 1
+            }
+          }
+        },
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/ErrorResponse"
+            }
+          }
+        }
+      },
+      "InferenceRateLimited": {
+        "description": "The request was rejected because a rate limit was exceeded. A slow_down error means traffic increased too quickly; reduce your request rate, then increase it gradually.",
+        "headers": {
+          "Retry-After": {
+            "description": "The minimum number of seconds to wait before retrying. This header is returned when the server has computed a retry delay and may be omitted.",
+            "schema": {
+              "type": "integer",
+              "minimum": 1
+            }
+          }
+        },
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/ErrorResponse"
+            },
+            "examples": {
+              "slowDown": {
+                "summary": "Traffic increased too quickly",
+                "value": {
+                  "error": {
+                    "message": "Your request rate increased too quickly. Please reduce the request rate and gradually increase it again.",
+                    "type": "rate_limit_error",
+                    "param": null,
+                    "code": "slow_down"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "InferenceServiceUnavailable": {
+        "description": "The service is temporarily unavailable. A server_is_overloaded error means the requested model is temporarily overloaded; retry after a brief delay.",
+        "headers": {
+          "Retry-After": {
+            "description": "The minimum number of seconds to wait before retrying. This header is returned when the server has computed a retry delay and may be omitted.",
+            "schema": {
+              "type": "integer",
+              "minimum": 1
+            }
+          }
+        },
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/ErrorResponse"
+            },
+            "examples": {
+              "serverOverloaded": {
+                "summary": "The requested model is temporarily overloaded",
+                "value": {
+                  "error": {
+                    "message": "The model is temporarily overloaded. Please retry your request after a brief delay.",
+                    "type": "service_unavailable_error",
+                    "param": null,
+                    "code": "server_is_overloaded"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "securitySchemes": {
+      "ApiKeyAuth": {
+        "type": "http",
+        "scheme": "bearer"
+      },
+      "AdminApiKeyAuth": {
+        "type": "http",
+        "scheme": "bearer"
+      }
+    }
+  },
+  "x-oaiMeta": {
+    "navigationGroups": [
+      {
+        "id": "responses",
+        "title": "Responses API"
+      },
+      {
+        "id": "webhooks",
+        "title": "Webhooks"
+      },
+      {
+        "id": "endpoints",
+        "title": "Platform APIs"
+      },
+      {
+        "id": "vector_stores",
+        "title": "Vector stores"
+      },
+      {
+        "id": "chatkit",
+        "title": "ChatKit",
+        "beta": true
+      },
+      {
+        "id": "containers",
+        "title": "Containers"
+      },
+      {
+        "id": "live",
+        "title": "Live (alpha)"
+      },
+      {
+        "id": "realtime",
+        "title": "Realtime"
+      },
+      {
+        "id": "chat",
+        "title": "Chat Completions"
+      },
+      {
+        "id": "assistants",
+        "title": "Assistants",
+        "deprecated": true
+      },
+      {
+        "id": "administration",
+        "title": "Administration"
+      },
+      {
+        "id": "legacy",
+        "title": "Legacy"
+      }
+    ],
+    "groups": [
+      {
+        "id": "responses-streaming",
+        "title": "Streaming events",
+        "description": "When you [create a Response](https://developers.openai.com/api/reference/resources/responses/methods/create) with\n`stream` set to `true`, the server will emit server-sent events to the\nclient as the Response is generated. This section contains the events that\nare emitted by the server.\n\n[Learn more about streaming responses](https://developers.openai.com/api/docs/guides/streaming-responses).\n",
+        "navigationGroup": "responses",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ResponseCreatedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseIncompleteEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputItemAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputItemDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseContentPartAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseContentPartDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseTextDeltaEvent",
+            "path": "response/output_text/delta"
+          },
+          {
+            "type": "object",
+            "key": "ResponseTextDoneEvent",
+            "path": "response/output_text/done"
+          },
+          {
+            "type": "object",
+            "key": "ResponseRefusalDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseRefusalDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFunctionCallArgumentsDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFunctionCallArgumentsDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallSearchingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallSearchingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryPartAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryPartDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryTextDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryTextDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningTextDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningTextDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallGeneratingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallPartialImageEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallArgumentsDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallArgumentsDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallInterpretingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCodeDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCodeDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputTextAnnotationAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseQueuedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCustomToolCallInputDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCustomToolCallInputDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseErrorEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "responses-websocket-client-events",
+        "title": "Client events",
+        "description": "Events sent by the client over a Responses API WebSocket connection.\n",
+        "navigationGroup": "responses",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ResponsesClientEventResponseCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseSteerEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "responses-websocket-server-events",
+        "title": "Server events (WebSocket only)",
+        "description": "Events emitted only over a Responses API WebSocket connection.\n",
+        "navigationGroup": "responses",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ResponseSteerAcceptedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseSteerPendingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseSteerFailedEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "responses-websocket-shared-events",
+        "title": "Server events",
+        "description": "These events use the same payloads over WebSocket and\n[HTTP streaming](https://developers.openai.com/api/reference/resources/responses/streaming-events).\n",
+        "navigationGroup": "responses",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ResponseCreatedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseIncompleteEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputItemAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputItemDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseContentPartAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseContentPartDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseTextDeltaEvent",
+            "path": "response/output_text/delta"
+          },
+          {
+            "type": "object",
+            "key": "ResponseTextDoneEvent",
+            "path": "response/output_text/done"
+          },
+          {
+            "type": "object",
+            "key": "ResponseRefusalDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseRefusalDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFunctionCallArgumentsDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFunctionCallArgumentsDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallSearchingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseFileSearchCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallSearchingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseWebSearchCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryPartAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryPartDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryTextDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningSummaryTextDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningTextDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseReasoningTextDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallGeneratingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseImageGenCallPartialImageEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallArgumentsDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallArgumentsDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsFailedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseMCPListToolsInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallInProgressEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallInterpretingEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCodeDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCodeInterpreterCallCodeDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseOutputTextAnnotationAddedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseQueuedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCustomToolCallInputDeltaEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseCustomToolCallInputDoneEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ResponseErrorEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "safety-alerts",
+        "title": "Safety Alerts",
+        "description": "Retrieve approved safety alerts with an API key. Project keys require\n`api.safety.alerts.read` and can read alerts from their project.\n",
+        "navigationGroup": "endpoints",
+        "sections": [
+          {
+            "type": "endpoint",
+            "key": "Getprojectsafetyalert",
+            "path": "retrieve"
+          },
+          {
+            "type": "object",
+            "key": "SafetyAlertResource",
+            "path": "object"
+          }
+        ]
+      },
+      {
+        "id": "webhook-events",
+        "title": "Webhook Events",
+        "description": "Webhooks are HTTP requests sent by OpenAI to a URL you specify when certain\nevents happen during the course of API usage.\n\n[Learn more about webhooks](https://developers.openai.com/api/docs/guides/webhooks).\n",
+        "navigationGroup": "webhooks",
+        "sections": [
+          {
+            "type": "object",
+            "key": "WebhookResponseCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookResponseCancelled",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookResponseFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookResponseIncomplete",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookBatchCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookBatchCancelled",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookBatchExpired",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookBatchFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookFineTuningJobSucceeded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookFineTuningJobFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookFineTuningJobCancelled",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookEvalRunSucceeded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookEvalRunFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookEvalRunCanceled",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookRealtimeCallIncoming",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookLiveCallIncoming",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookLiveTransportIncoming",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookSafetyAlertCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "WebhookSafetyOrgAlertCreated",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "images-streaming",
+        "title": "Image Streaming",
+        "description": "Stream image generation and editing in real time with server-sent events.\n[Learn more about image streaming](https://developers.openai.com/api/docs/guides/image-generation).\n",
+        "navigationGroup": "endpoints",
+        "sections": [
+          {
+            "type": "object",
+            "key": "ImageGenPartialImageEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ImageGenCompletedEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ImageEditPartialImageEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "ImageEditCompletedEvent",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-client-events",
+        "title": "Client events",
+        "description": "These are events that the OpenAI Realtime WebSocket server will accept from the client.\n",
+        "navigationGroup": "realtime",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeClientEventSessionUpdate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventInputAudioBufferAppend",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventInputAudioBufferCommit",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventInputAudioBufferClear",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventConversationItemCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventConversationItemRetrieve",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventConversationItemTruncate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventConversationItemDelete",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventResponseCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventResponseCancel",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeClientEventOutputAudioBufferClear",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-server-events",
+        "title": "Server events",
+        "description": "These are events emitted from the OpenAI Realtime WebSocket server to the client.\n",
+        "navigationGroup": "realtime",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeServerEventError",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventSessionCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemRetrieved",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemInputAudioTranscriptionCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemInputAudioTranscriptionDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemInputAudioTranscriptionSegment",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemInputAudioTranscriptionFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemTruncated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventConversationItemDeleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferCommitted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferDtmfEventReceived",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferCleared",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferSpeechStarted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferSpeechStopped",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferTimeoutTriggered",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventOutputAudioBufferStarted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventOutputAudioBufferStopped",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventOutputAudioBufferCleared",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseOutputItemAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseOutputItemDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseContentPartAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseContentPartDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseTextDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseTextDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseAudioTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseAudioTranscriptDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseAudioDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseAudioDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseFunctionCallArgumentsDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseFunctionCallArgumentsDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallArgumentsDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallArgumentsDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallInProgress",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventResponseMCPCallFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventMCPListToolsInProgress",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventMCPListToolsCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventMCPListToolsFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventRateLimitsUpdated",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-translation-client-events",
+        "title": "Translation client events",
+        "description": "These are events that the OpenAI Realtime Translation WebSocket server will accept from the client.\n",
+        "navigationGroup": "realtime",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeTranslationClientEventSessionUpdate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationClientEventInputAudioBufferAppend",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationClientEventSessionClose",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-translation-server-events",
+        "title": "Translation server events",
+        "description": "These are events emitted from the OpenAI Realtime Translation WebSocket server to the client.\n",
+        "navigationGroup": "realtime",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeServerEventError",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionClosed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionInputTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionOutputTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeTranslationServerEventSessionOutputAudioDelta",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "chat-streaming",
+        "title": "Streaming",
+        "description": "Stream Chat Completions in real time. Receive chunks of completions\nreturned from the model using server-sent events.\n[Learn more](https://developers.openai.com/api/docs/guides/streaming-responses).\n",
+        "navigationGroup": "chat",
+        "sections": [
+          {
+            "type": "object",
+            "key": "CreateChatCompletionStreamResponse",
+            "path": "streaming"
+          }
+        ]
+      },
+      {
+        "id": "assistants-streaming",
+        "title": "Streaming",
+        "beta": true,
+        "description": "Stream the result of executing a Run or resuming a Run after submitting tool outputs.\nYou can stream events from the [Create Thread and Run](https://developers.openai.com/api/docs/assistants/migration),\n[Create Run](https://developers.openai.com/api/docs/assistants/migration), and [Submit Tool Outputs](https://developers.openai.com/api/docs/assistants/migration)\nendpoints by passing `\"stream\": true`. The response will be a [Server-Sent events](https://html.spec.whatwg.org/multipage/server-sent-events.html#server-sent-events) stream.\nOur Node and Python SDKs provide helpful utilities to make streaming easy. Reference the\n[Assistants API quickstart](https://developers.openai.com/api/docs/assistants/migration) to learn more.\n",
+        "navigationGroup": "assistants",
+        "sections": [
+          {
+            "type": "object",
+            "key": "AssistantStreamEvent",
+            "path": "events"
+          }
+        ]
+      },
+      {
+        "id": "realtime-beta-client-events",
+        "title": "Realtime Beta client events",
+        "description": "These are events that the OpenAI Realtime WebSocket server will accept from the client.\n",
+        "navigationGroup": "legacy",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventSessionUpdate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventInputAudioBufferAppend",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventInputAudioBufferCommit",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventInputAudioBufferClear",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventConversationItemCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventConversationItemRetrieve",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventConversationItemTruncate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventConversationItemDelete",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventResponseCreate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventResponseCancel",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventTranscriptionSessionUpdate",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaClientEventOutputAudioBufferClear",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "realtime-beta-server-events",
+        "title": "Realtime Beta server events",
+        "description": "These are events emitted from the OpenAI Realtime WebSocket server to the client.\n",
+        "navigationGroup": "legacy",
+        "sections": [
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventError",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventSessionCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventTranscriptionSessionCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventTranscriptionSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemRetrieved",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemInputAudioTranscriptionCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemInputAudioTranscriptionDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemInputAudioTranscriptionSegment",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemInputAudioTranscriptionFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemTruncated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventConversationItemDeleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventInputAudioBufferCommitted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventInputAudioBufferCleared",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventInputAudioBufferSpeechStarted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventInputAudioBufferSpeechStopped",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeServerEventInputAudioBufferTimeoutTriggered",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseOutputItemAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseOutputItemDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseContentPartAdded",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseContentPartDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseTextDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseTextDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseAudioTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseAudioTranscriptDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseAudioDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseAudioDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseFunctionCallArgumentsDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseFunctionCallArgumentsDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallArgumentsDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallArgumentsDone",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallInProgress",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventResponseMCPCallFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventMCPListToolsInProgress",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventMCPListToolsCompleted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventMCPListToolsFailed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "RealtimeBetaServerEventRateLimitsUpdated",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "live-client-events",
+        "title": "Client events",
+        "description": "Initialize a primary WebSocket with session.start and wait for session.started before sending other events. WebRTC creation starts the session for you. Start with the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) to design frontend instructions and delegation policy; see [backend prompting](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt) for tools and business rules.",
+        "navigationGroup": "live",
+        "sections": [
+          {
+            "type": "object",
+            "key": "LiveSessionStartEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveForkSessionStartEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionUpdateParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioAppendEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioMuteParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioUnmuteParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInstructionsAppendParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveThinkingAppendParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveCommentaryAppendParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveResponseItemCreateParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveResponseCreateParam",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionCloseParam",
+            "path": "<auto>"
+          }
+        ]
+      },
+      {
+        "id": "live-server-events",
+        "title": "Server events",
+        "description": "Live server events. Responses delegation lifecycle events arrive inside response.event, not as top-level response events. Start with the [Live prompting guide](https://developers.openai.com/api/docs/guides/live-prompting) to design frontend instructions and delegation policy; see [backend prompting](https://developers.openai.com/api/docs/guides/live-delegation#start-with-your-existing-backend-prompt) for tools and business rules.",
+        "navigationGroup": "live",
+        "sections": [
+          {
+            "type": "object",
+            "key": "LiveSessionStarted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioMuted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputAudioUnmuted",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInstructionsAppended",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveThinkingAppended",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveCommentaryAppended",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveOutputAudioDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInputTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveOutputTranscriptDelta",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveDelegationCreated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveResponseEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionUsageUpdated",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveSessionClosed",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveErrorEvent",
+            "path": "<auto>"
+          },
+          {
+            "type": "object",
+            "key": "LiveInfoEvent",
+            "path": "<auto>"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/contracts/agents-api/v1/agents.go b/contracts/agents-api/v1/agents.go
index 17cda82d6..fc4a18a0c 100644
--- a/contracts/agents-api/v1/agents.go
+++ b/contracts/agents-api/v1/agents.go
@@ -2,73 +2,6 @@ package v1
 
 import "encoding/json"
 
-// CreateAgentRequest describes reusable configuration, not an execution request.
-// MCP/web-search tools and model-derived reasoning defaults remain incomplete.
-type CreateAgentRequest struct {
-	XAgentsCore  *SavedAgentCoreInput `json:"x_agents_core,omitempty" extensions:"x-nullable"`
-	Model        *string              `json:"model" binding:"required"`
-	Name         *string              `json:"name,omitempty" extensions:"x-nullable" maxLength:"128"`
-	Instructions *string              `json:"instructions,omitempty" extensions:"x-nullable"`
-	Metadata     map[string]*string   `json:"metadata,omitempty" swaggertype:"object,string" extensions:"x-nullable"`
-	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" swaggertype:"object" extensions:"x-nullable"`
-	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
-	ServiceTier  *string              `json:"service_tier,omitempty" enums:"auto,default,flex,priority,fast" extensions:"x-nullable"`
-	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
-	Tools        []json.RawMessage    `json:"tools,omitempty" swaggertype:"array,object" extensions:"x-nullable"`
-}
-
-// UpdateAgentRequest replaces supplied fields and preserves omitted fields.
-type UpdateAgentRequest struct {
-	XAgentsCore  *SavedAgentCoreInput `json:"x_agents_core,omitempty" extensions:"x-nullable"`
-	Model        *string              `json:"model,omitempty"`
-	Name         *string              `json:"name,omitempty" extensions:"x-nullable" maxLength:"128"`
-	Instructions *string              `json:"instructions,omitempty" extensions:"x-nullable"`
-	Metadata     map[string]*string   `json:"metadata,omitempty" swaggertype:"object,string" extensions:"x-nullable"`
-	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" swaggertype:"object" extensions:"x-nullable"`
-	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
-	ServiceTier  *string              `json:"service_tier,omitempty" enums:"auto,default,flex,priority,fast" extensions:"x-nullable"`
-	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
-	Tools        []json.RawMessage    `json:"tools,omitempty" swaggertype:"array,object" extensions:"x-nullable"`
-}
-
-type SavedAgentTextInput struct {
-	Format    json.RawMessage `json:"format,omitempty" swaggertype:"object" extensions:"x-nullable"`
-	Verbosity *string         `json:"verbosity,omitempty" enums:"low,medium,high" extensions:"x-nullable"`
-}
-
-type SavedAgentText struct {
-	Format    SavedAgentTextFormat `json:"format" binding:"required"`
-	Verbosity string               `json:"verbosity" binding:"required" enums:"low,medium,high"`
-}
-
-type SavedAgentTextFormat struct {
-	Type   string          `json:"type" binding:"required" enums:"text,json_schema"`
-	Schema json.RawMessage `json:"schema,omitempty" swaggertype:"object"`
-}
-
-// SavedAgentConfiguration excludes resource identity and mutable metadata. It is
-// not the immutable effective configuration of an execution Session.
-type SavedAgentConfiguration struct {
-	XAgentsCore  *SavedAgentCore   `json:"x_agents_core,omitempty" extensions:"x-nullable"`
-	Model        string            `json:"model" binding:"required"`
-	Name         *string           `json:"name" extensions:"x-nullable"`
-	Instructions *string           `json:"instructions" extensions:"x-nullable"`
-	MultiAgent   MultiAgentConfig  `json:"multi_agent" binding:"required"`
-	Reasoning    Reasoning         `json:"reasoning" binding:"required"`
-	ServiceTier  string            `json:"service_tier" binding:"required" enums:"auto,default,flex,priority,fast"`
-	Text         SavedAgentText    `json:"text" binding:"required"`
-	Tools        []json.RawMessage `json:"tools" binding:"required" swaggertype:"array,object"`
-}
-
-type SavedAgent struct {
-	SavedAgentConfiguration
-	ID        string            `json:"id" binding:"required"`
-	Object    string            `json:"object" binding:"required" enums:"agent"`
-	Metadata  map[string]string `json:"metadata" binding:"required"`
-	CreatedAt int64             `json:"created_at" binding:"required"`
-	UpdatedAt int64             `json:"updated_at" binding:"required"`
-}
-
 // MarshalJSON renders reasoning with explicit null keys. The stored
 // SavedAgentConfiguration keeps its original encoding.
 func (a SavedAgent) MarshalJSON() ([]byte, error) {
@@ -78,18 +11,3 @@ func (a SavedAgent) MarshalJSON() ([]byte, error) {
 		Reasoning reasoningResponse `json:"reasoning"`
 	}{wire(a), reasoningResponse(a.Reasoning)})
 }
-
-type SavedAgentList struct {
-	Object  string       `json:"object" binding:"required" enums:"list"`
-	Data    []SavedAgent `json:"data" binding:"required"`
-	HasMore bool         `json:"has_more" binding:"required"`
-	FirstID *string      `json:"first_id" extensions:"x-nullable"`
-	LastID  *string      `json:"last_id" extensions:"x-nullable"`
-}
-
-// AgentDeleted is the pinned successful saved-resource deletion response.
-type AgentDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Object  string `json:"object" binding:"required" enums:"agent.deleted"`
-	Deleted bool   `json:"deleted" binding:"required" enums:"true"`
-}
diff --git a/contracts/agents-api/v1/credentials.go b/contracts/agents-api/v1/credentials.go
index e5360ad68..1d1a443d6 100644
--- a/contracts/agents-api/v1/credentials.go
+++ b/contracts/agents-api/v1/credentials.go
@@ -2,81 +2,6 @@ package v1
 
 import "encoding/json"
 
-// CredentialAuthInput represents the pinned create union. The API validates each
-// discriminator separately so fields cannot cross authentication variants.
-type CredentialAuthInput struct {
-	Type         string                       `json:"type" binding:"required" enums:"static_bearer,mcp_oauth"`
-	MCPServerURL *string                      `json:"mcp_server_url" binding:"required"`
-	Token        *string                      `json:"token,omitempty" minLength:"1"`
-	AccessToken  *string                      `json:"access_token,omitempty" minLength:"1"`
-	ExpiresAt    *string                      `json:"expires_at,omitempty" extensions:"x-nullable"`
-	Refresh      *OAuthCredentialRefreshInput `json:"refresh,omitempty" extensions:"x-nullable"`
-}
-
-type CreateCredentialRequest struct {
-	Name *string              `json:"name" binding:"required"`
-	Auth *CredentialAuthInput `json:"auth" binding:"required"`
-}
-
-type OAuthCredentialRefreshInput struct {
-	ClientID          *string                 `json:"client_id" binding:"required"`
-	RefreshToken      *string                 `json:"refresh_token" binding:"required"`
-	TokenEndpoint     *string                 `json:"token_endpoint" binding:"required"`
-	TokenEndpointAuth *OAuthEndpointAuthInput `json:"token_endpoint_auth" binding:"required"`
-	Resource          *string                 `json:"resource,omitempty" extensions:"x-nullable"`
-	Scope             *string                 `json:"scope,omitempty" extensions:"x-nullable"`
-}
-
-type OAuthEndpointAuthInput struct {
-	Type         string  `json:"type" binding:"required" enums:"none,client_secret_basic,client_secret_post"`
-	ClientSecret *string `json:"client_secret,omitempty"`
-}
-
-type UpdateCredentialRequest struct {
-	Auth *CredentialAuthReplacement `json:"auth" binding:"required"`
-}
-
-// Raw nullable fields retain omission separately from explicit null.
-type CredentialAuthReplacement struct {
-	Type        string                             `json:"type" binding:"required" enums:"static_bearer,mcp_oauth"`
-	Token       *string                            `json:"token,omitempty" minLength:"1"`
-	AccessToken *string                            `json:"access_token,omitempty" extensions:"x-nullable" minLength:"1"`
-	ExpiresAt   json.RawMessage                    `json:"expires_at,omitempty" swaggertype:"string" extensions:"x-nullable"`
-	Refresh     *OAuthCredentialRefreshReplacement `json:"refresh,omitempty" extensions:"x-nullable"`
-}
-
-type OAuthCredentialRefreshReplacement struct {
-	RefreshToken      *string                       `json:"refresh_token,omitempty" extensions:"x-nullable"`
-	Scope             json.RawMessage               `json:"scope,omitempty" swaggertype:"string" extensions:"x-nullable"`
-	TokenEndpointAuth *OAuthEndpointAuthReplacement `json:"token_endpoint_auth,omitempty" extensions:"x-nullable"`
-}
-
-type OAuthEndpointAuthReplacement struct {
-	Type         string  `json:"type" binding:"required" enums:"client_secret_basic,client_secret_post"`
-	ClientSecret *string `json:"client_secret,omitempty" extensions:"x-nullable"`
-}
-
-// CredentialAuth contains safe metadata only. OAuth nullable fields are emitted
-// for OAuth credentials and excluded entirely from static bearer resources.
-type CredentialAuth struct {
-	Type         string                  `json:"type" binding:"required" enums:"static_bearer,mcp_oauth"`
-	MCPServerURL string                  `json:"mcp_server_url" binding:"required"`
-	ExpiresAt    *string                 `json:"expires_at" extensions:"x-nullable"`
-	Refresh      *OAuthCredentialRefresh `json:"refresh" extensions:"x-nullable"`
-}
-
-type OAuthCredentialRefresh struct {
-	ClientID          string            `json:"client_id" binding:"required"`
-	TokenEndpoint     string            `json:"token_endpoint" binding:"required"`
-	TokenEndpointAuth OAuthEndpointAuth `json:"token_endpoint_auth" binding:"required"`
-	Resource          *string           `json:"resource" extensions:"x-nullable"`
-	Scope             *string           `json:"scope" extensions:"x-nullable"`
-}
-
-type OAuthEndpointAuth struct {
-	Type string `json:"type" binding:"required" enums:"none,client_secret_basic,client_secret_post"`
-}
-
 func (a CredentialAuth) MarshalJSON() ([]byte, error) {
 	if a.Type == "static_bearer" {
 		return json.Marshal(struct {
@@ -87,27 +12,3 @@ func (a CredentialAuth) MarshalJSON() ([]byte, error) {
 	type resource CredentialAuth
 	return json.Marshal(resource(a))
 }
-
-type Credential struct {
-	ID        string         `json:"id" binding:"required"`
-	VaultID   string         `json:"vault_id" binding:"required"`
-	Name      string         `json:"name" binding:"required"`
-	Object    string         `json:"object" binding:"required" enums:"vault.credential"`
-	Auth      CredentialAuth `json:"auth" binding:"required"`
-	CreatedAt int64          `json:"created_at" binding:"required"`
-	UpdatedAt int64          `json:"updated_at" binding:"required"`
-}
-
-type CredentialList struct {
-	Object  string       `json:"object" binding:"required" enums:"list"`
-	Data    []Credential `json:"data" binding:"required"`
-	HasMore bool         `json:"has_more" binding:"required"`
-	FirstID *string      `json:"first_id" extensions:"x-nullable"`
-	LastID  *string      `json:"last_id" extensions:"x-nullable"`
-}
-
-type CredentialDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Deleted bool   `json:"deleted" binding:"required"`
-	Object  string `json:"object" binding:"required" enums:"vault.credential.deleted"`
-}
diff --git a/contracts/agents-api/v1/environment_events.go b/contracts/agents-api/v1/environment_events.go
deleted file mode 100644
index e7808b836..000000000
--- a/contracts/agents-api/v1/environment_events.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package v1
-
-// SessionEnvironmentState is the pinned event snapshot, not EnvironmentInfo.
-// The event vocabulary includes ready; the resource vocabulary instead includes expired.
-type SessionEnvironmentState struct {
-	ID     string       `json:"id" binding:"required"`
-	Type   string       `json:"type" binding:"required"`
-	Status string       `json:"status" enums:"pending,ready,connected,disconnected,failed" binding:"required"`
-	Error  *StreamError `json:"error" extensions:"x-nullable"`
-}
diff --git a/contracts/agents-api/v1/environment_files.go b/contracts/agents-api/v1/environment_files.go
deleted file mode 100644
index 4427a565d..000000000
--- a/contracts/agents-api/v1/environment_files.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package v1
-
-// EnvironmentFileCreateRequest represents the pinned inline/file_id union.
-type EnvironmentFileCreateRequest struct {
-	Type   string  `json:"type" binding:"required" enums:"inline,file_id"`
-	Data   *string `json:"data,omitempty"`
-	FileID *string `json:"file_id,omitempty"`
-	Path   *string `json:"path" binding:"required"`
-}
-
-type EnvironmentFile struct {
-	EnvironmentID string `json:"environment_id" binding:"required"`
-	Object        string `json:"object" binding:"required" enums:"agent.environment.file"`
-	Path          string `json:"path" binding:"required"`
-	SizeBytes     int64  `json:"size_bytes" binding:"required" minimum:"0"`
-}
-
-// EnvironmentFileList is the official token page: has_more is true exactly
-// when next carries a continuation token.
-type EnvironmentFileList struct {
-	Object  string            `json:"object" binding:"required" enums:"page"`
-	Data    []EnvironmentFile `json:"data" binding:"required"`
-	Next    *string           `json:"next" extensions:"x-nullable"`
-	HasMore bool              `json:"has_more" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/environment_templates.go b/contracts/agents-api/v1/environment_templates.go
deleted file mode 100644
index d325ef476..000000000
--- a/contracts/agents-api/v1/environment_templates.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package v1
-
-import "encoding/json"
-
-// EnvironmentTemplateRequest exposes pinned input fields; only qualified installations execute.
-type EnvironmentTemplateRequest struct {
-	Name                  *string                   `json:"name,omitempty" extensions:"x-nullable"`
-	Network               *EnvironmentNetworkInput  `json:"network,omitempty" extensions:"x-nullable"`
-	CapabilityDirectories []string                  `json:"capability_directories,omitempty" extensions:"x-nullable"`
-	Env                   map[string]string         `json:"env,omitempty" extensions:"x-nullable"`
-	Files                 []json.RawMessage         `json:"files,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-	Packages              *EnvironmentPackagesInput `json:"packages,omitempty" extensions:"x-nullable"`
-	Plugins               []json.RawMessage         `json:"plugins,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-	Skills                []json.RawMessage         `json:"skills,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-	SetupCommands         []json.RawMessage         `json:"setup_commands,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-}
-
-// EnvironmentPackagesInput keeps optional nullable request defaults separate from
-// the complete package lists returned by resource responses.
-type EnvironmentPackagesInput struct {
-	NPM    []string `json:"npm,omitempty" extensions:"x-nullable"`
-	Python []string `json:"python,omitempty" extensions:"x-nullable"`
-}
-
-// EnvironmentTemplate returns safe configuration metadata only.
-type EnvironmentTemplate struct {
-	ID                    string                      `json:"id" binding:"required"`
-	Object                string                      `json:"object" binding:"required" enums:"agent.environment.template"`
-	Name                  *string                     `json:"name" extensions:"x-nullable"`
-	CreatedAt             int64                       `json:"created_at" binding:"required"`
-	UpdatedAt             int64                       `json:"updated_at" binding:"required"`
-	CapabilityDirectories []string                    `json:"capability_directories" binding:"required"`
-	Network               EnvironmentNetwork          `json:"network" binding:"required"`
-	Packages              EnvironmentPackagesResponse `json:"packages" binding:"required"`
-	Files                 []json.RawMessage           `json:"files" binding:"required" swaggertype:"array,object"`
-	Plugins               []json.RawMessage           `json:"plugins" binding:"required" swaggertype:"array,object"`
-	Skills                []json.RawMessage           `json:"skills" binding:"required" swaggertype:"array,object"`
-}
-
-type EnvironmentTemplateList struct {
-	Object  string                `json:"object" binding:"required" enums:"list"`
-	Data    []EnvironmentTemplate `json:"data" binding:"required"`
-	HasMore bool                  `json:"has_more" binding:"required"`
-	FirstID *string               `json:"first_id" extensions:"x-nullable"`
-	LastID  *string               `json:"last_id" extensions:"x-nullable"`
-}
-
-type EnvironmentTemplateDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Object  string `json:"object" binding:"required" enums:"agent.environment.template.deleted"`
-	Deleted bool   `json:"deleted" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/environments.go b/contracts/agents-api/v1/environments.go
deleted file mode 100644
index fc4e4a1de..000000000
--- a/contracts/agents-api/v1/environments.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package v1
-
-import "encoding/json"
-
-// EnvironmentInfo contains safe installed metadata; populated installation variants remain unsupported.
-type EnvironmentInfo struct {
-	ID      string            `json:"id" binding:"required"`
-	Object  string            `json:"object" binding:"required" enums:"agent.environment"`
-	Type    string            `json:"type" binding:"required" enums:"openai_hosted,self_hosted"`
-	Status  string            `json:"status" binding:"required" enums:"pending,connected,disconnected,expired,failed"`
-	Files   []json.RawMessage `json:"files" binding:"required" swaggertype:"array,object"`
-	Plugins []json.RawMessage `json:"plugins" binding:"required" swaggertype:"array,object"`
-	Skills  []json.RawMessage `json:"skills" binding:"required" swaggertype:"array,object"`
-}
-
-// EnvironmentNetwork is the effective hosted network policy.
-type EnvironmentNetwork struct {
-	Access         string   `json:"access" binding:"required" enums:"enabled,disabled,restricted"`
-	AllowedDomains []string `json:"allowed_domains" binding:"required"`
-}
-
-// EnvironmentNetworkInput preserves the optional request domain list.
-type EnvironmentNetworkInput struct {
-	Access         string   `json:"access" binding:"required" enums:"enabled,disabled,restricted"`
-	AllowedDomains []string `json:"allowed_domains,omitempty" extensions:"x-nullable"`
-}
-
-type EnvironmentPackages struct {
-	NPM    []string `json:"npm" binding:"required"`
-	Python []string `json:"python" binding:"required"`
-}
-
-// EnvironmentPackagesResponse preserves the official response schema. System is
-// always empty: Runtime system-package requests are unsupported.
-type EnvironmentPackagesResponse struct {
-	NPM    []string `json:"npm" binding:"required"`
-	Python []string `json:"python" binding:"required"`
-	System []string `json:"system" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/events.go b/contracts/agents-api/v1/events.go
index d344623d0..dc2441bc5 100644
--- a/contracts/agents-api/v1/events.go
+++ b/contracts/agents-api/v1/events.go
@@ -2,39 +2,6 @@ package v1
 
 import "encoding/json"
 
-// SessionEvent contains the supported live event variants of the pinned protocol.
-type SessionEvent struct {
-	Subagent     *Subagent                `json:"subagent,omitempty"`
-	Type         string                   `json:"type" binding:"required"`
-	EventID      string                   `json:"event_id" binding:"required"`
-	SessionID    string                   `json:"session_id,omitempty"`
-	TurnID       string                   `json:"turn_id,omitempty"`
-	Session      *Session                 `json:"session,omitempty"`
-	Turn         *Turn                    `json:"turn,omitempty"`
-	Item         *Item                    `json:"item,omitempty"`
-	ItemID       string                   `json:"item_id,omitempty"`
-	OutputIndex  *int32                   `json:"output_index,omitempty" extensions:"x-nullable"`
-	ContentIndex *int                     `json:"content_index,omitempty"`
-	Part         *ItemContent             `json:"part,omitempty"`
-	Delta        *string                  `json:"delta,omitempty"`
-	Text         *string                  `json:"text,omitempty"`
-	Error        *StreamError             `json:"error,omitempty"`
-	Environment  *SessionEnvironmentState `json:"environment,omitempty"`
-	// Usage is present only on terminal Turn events, where it mirrors the Turn
-	// snapshot and is null when unknown. Other events omit it.
-	Usage *TokenUsage `json:"usage,omitempty" extensions:"x-nullable"`
-}
-
-type StreamError struct {
-	Code    string `json:"code"`
-	Type    string `json:"type"`
-	Message string `json:"message"`
-	// Param is the pinned SessionError field. An error SessionEvent always
-	// carries it, null when unset; Environment state errors and Core's own
-	// stream_interrupted frame omit it.
-	Param *string `json:"param,omitempty" extensions:"x-nullable"`
-}
-
 // TerminalTurnEvent reports whether an event type settles a Turn.
 func TerminalTurnEvent(eventType string) bool {
 	switch eventType {
@@ -49,15 +16,6 @@ func itemEvent(eventType string) bool {
 	return eventType == "agent.session.turn.item.added" || eventType == "agent.session.turn.item.done"
 }
 
-// sessionError is the pinned SessionError of a top-level error event, whose
-// param is present and null when unset (HI-01).
-type sessionError struct {
-	Code    string  `json:"code"`
-	Type    string  `json:"type"`
-	Message string  `json:"message"`
-	Param   *string `json:"param"`
-}
-
 // MarshalJSON keeps the nullable top-level usage on terminal Turn events only,
 // a nullable output_index on every Item event (EVT-09) and a nullable error
 // param on error events.
diff --git a/contracts/agents-api/v1/function_actions.go b/contracts/agents-api/v1/function_actions.go
deleted file mode 100644
index 4d90bfc50..000000000
--- a/contracts/agents-api/v1/function_actions.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package v1
-
-// FunctionCallAction is the supported function-call variant of required_actions.
-type FunctionCallAction struct {
-	Arguments any    `json:"arguments" binding:"required"`
-	CallID    string `json:"call_id" binding:"required"`
-	Name      string `json:"name" binding:"required"`
-	TurnID    string `json:"turn_id" binding:"required"`
-	Type      string `json:"type" enums:"function_call" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/function_tools.go b/contracts/agents-api/v1/function_tools.go
deleted file mode 100644
index ad5aea81e..000000000
--- a/contracts/agents-api/v1/function_tools.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package v1
-
-import "encoding/json"
-
-// FunctionToolInput is the supported application-defined tool configuration.
-type FunctionToolInput struct {
-	Type         string          `json:"type" enums:"function" binding:"required"`
-	Name         *string         `json:"name" binding:"required"`
-	Description  *string         `json:"description" binding:"required"`
-	Parameters   json.RawMessage `json:"parameters" swaggertype:"object" binding:"required"`
-	DeferLoading json.RawMessage `json:"defer_loading,omitempty" swaggertype:"boolean"`
-}
diff --git a/contracts/agents-api/v1/inputs.go b/contracts/agents-api/v1/inputs.go
deleted file mode 100644
index 2fd8600c5..000000000
--- a/contracts/agents-api/v1/inputs.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package v1
-
-import "encoding/json"
-
-// SessionInput contains the message, cancellation and function-result event variants.
-type SessionInput struct {
-	Type    string          `json:"type" enums:"agent.session.input.message,agent.session.input.cancel,agent.session.input.tool_result" binding:"required"`
-	Input   []InputMessage  `json:"input,omitempty"`
-	CallID  string          `json:"call_id,omitempty"`
-	TurnID  string          `json:"turn_id,omitempty"`
-	Success *bool           `json:"success,omitempty"`
-	Error   json.RawMessage `json:"error,omitempty" swaggertype:"string" extensions:"x-nullable"`
-	Output  any             `json:"output,omitempty" extensions:"x-nullable"`
-}
-
-type InputMessage struct {
-	Type    string         `json:"type,omitempty" enums:"message"`
-	Role    string         `json:"role" enums:"user" binding:"required"`
-	Content []InputContent `json:"content" binding:"required"`
-}
-
-type InputContent struct {
-	Type     string  `json:"type" enums:"input_text,input_image" binding:"required"`
-	Text     *string `json:"text,omitempty"`
-	ImageURL *string `json:"image_url,omitempty"`
-}
-
-type CreateEventsRequest struct {
-	Events []SessionInput `json:"events" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/items.go b/contracts/agents-api/v1/items.go
index c004bcf4c..18813fab3 100644
--- a/contracts/agents-api/v1/items.go
+++ b/contracts/agents-api/v1/items.go
@@ -5,58 +5,6 @@ import (
 	"encoding/json"
 )
 
-// Item contains the supported variants of the pinned Session Item union.
-type Item struct {
-	ID                string           `json:"id" binding:"required"`
-	TurnID            string           `json:"turn_id" binding:"required"`
-	Type              string           `json:"type" binding:"required" enums:"message,command_execution,mcp_call,function_call,function_call_output,web_search_call,reasoning,agent_message,create_subagent_call,send_subagent_input_call,resume_subagent_call,wait_for_subagents_call,interrupt_subagent_call,close_subagent_call"`
-	Status            string           `json:"status" enums:"in_progress,completed,failed,incomplete"`
-	Role              string           `json:"role,omitempty" enums:"user,assistant"`
-	Phase             string           `json:"phase,omitempty" enums:"commentary,final_answer" extensions:"x-nullable"`
-	Content           []ItemContent    `json:"content,omitempty"`
-	Command           string           `json:"command,omitempty"`
-	Cwd               *string          `json:"cwd,omitempty"`
-	DurationMS        *int64           `json:"duration_ms,omitempty"`
-	ExitCode          *int64           `json:"exit_code,omitempty"`
-	Name              string           `json:"name,omitempty"`
-	CallID            string           `json:"call_id,omitempty"`
-	ServerLabel       string           `json:"server_label,omitempty"`
-	Arguments         any              `json:"arguments,omitempty"`
-	Output            any              `json:"output,omitempty"`
-	Error             any              `json:"error,omitempty"`
-	Action            *WebSearchAction `json:"action,omitempty"`
-	AgentID           string           `json:"agent_id,omitempty"`
-	SenderAgentID     string           `json:"sender_agent_id,omitempty"`
-	RecipientAgentID  string           `json:"recipient_agent_id,omitempty"`
-	RecipientAgentIDs []string         `json:"recipient_agent_ids,omitempty"`
-	Model             *string          `json:"model,omitempty"`
-	ReasoningEffort   *string          `json:"reasoning_effort,omitempty"`
-	Summary           []SummaryText    `json:"summary,omitempty"`
-}
-
-type ItemContent struct {
-	Type             string  `json:"type" binding:"required" enums:"input_text,output_text,input_image,encrypted_content"`
-	Text             *string `json:"text,omitempty"`
-	ImageURL         string  `json:"image_url,omitempty"`
-	EncryptedContent *string `json:"encrypted_content,omitempty"`
-}
-
-type WebSearchAction struct {
-	Type    string   `json:"type" binding:"required" enums:"search,open_page,find_in_page,other"`
-	Query   *string  `json:"query,omitempty"`
-	Queries []string `json:"queries,omitempty"`
-	URL     *string  `json:"url,omitempty"`
-	Pattern *string  `json:"pattern,omitempty"`
-}
-
-type ItemList struct {
-	Object  string  `json:"object" enums:"list" binding:"required"`
-	FirstID *string `json:"first_id" extensions:"x-nullable"`
-	LastID  *string `json:"last_id" extensions:"x-nullable"`
-	Data    []Item  `json:"data" binding:"required"`
-	HasMore bool    `json:"has_more" binding:"required"`
-}
-
 // UnmarshalJSON preserves integer precision in tool arguments and structured results.
 func (i *Item) UnmarshalJSON(raw []byte) error {
 	type wire Item
diff --git a/contracts/agents-api/v1/items_test.go b/contracts/agents-api/v1/items_test.go
index 5de654118..5e5c154e9 100644
--- a/contracts/agents-api/v1/items_test.go
+++ b/contracts/agents-api/v1/items_test.go
@@ -155,3 +155,38 @@ func TestReasoningResponsesCarryBothKeys(t *testing.T) {
 	}{Agent{ID: "agent", Reasoning: Reasoning{Effort: &low}}})
 	expectField(t, fields(t, stored["agent"]), "reasoning", `{"effort":"low"}`)
 }
+
+func TestStoredSearchItemRoundTripPreservesPayload(t *testing.T) {
+	for _, raw := range []string{
+		`{"id":"search","turn_id":"turn","type":"web_search_call","status":"completed","action":{"type":"search","query":"reference"}}`,
+		`{"id":"search","turn_id":"turn","type":"web_search_call","status":"completed","action":{"type":"search"}}`,
+		`{"id":"search","turn_id":"turn","type":"web_search_call","status":"in_progress"}`,
+	} {
+		var item Item
+		if err := json.Unmarshal([]byte(raw), &item); err != nil {
+			t.Fatal(err)
+		}
+		stored, err := item.MarshalStored()
+		if err != nil {
+			t.Fatal(err)
+		}
+		if string(stored) != raw {
+			t.Fatalf("stored replay changed: %s, want %s", stored, raw)
+		}
+		wire := fields(t, item)
+		if item.Action == nil {
+			expectField(t, wire, "action", "null")
+		} else {
+			var action map[string]json.RawMessage
+			if err := json.Unmarshal(wire["action"], &action); err != nil {
+				t.Fatal(err)
+			}
+			if _, ok := action["query"]; !ok {
+				t.Fatal("wire query is missing")
+			}
+			if _, ok := action["queries"]; !ok {
+				t.Fatal("wire queries is missing")
+			}
+		}
+	}
+}
diff --git a/contracts/agents-api/v1/mcp_tools.go b/contracts/agents-api/v1/mcp_tools.go
deleted file mode 100644
index c8cd2adf7..000000000
--- a/contracts/agents-api/v1/mcp_tools.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package v1
-
-import "encoding/json"
-
-// MCPToolInput preserves presence for the pinned MCP configuration union.
-type MCPToolInput struct {
-	Type             string          `json:"type"`
-	ServerLabel      *string         `json:"server_label"`
-	Transport        json.RawMessage `json:"transport"`
-	AllowedTools     json.RawMessage `json:"allowed_tools"`
-	ConnectionOrigin *string         `json:"connection_origin"`
-	CredentialID     *string         `json:"credential_id"`
-	RequestMetadata  json.RawMessage `json:"request_metadata"`
-	Required         json.RawMessage `json:"required"`
-}
-
-// MCPTool is the supported HTTP resource shape. Headers belong only to saved
-// configuration; effective Session transports expose type and server_url.
-type MCPTool struct {
-	Type             string                     `json:"type"`
-	ServerLabel      string                     `json:"server_label"`
-	Transport        MCPHTTPTransport           `json:"transport"`
-	AllowedTools     *[]string                  `json:"allowed_tools"`
-	ConnectionOrigin string                     `json:"connection_origin"`
-	CredentialID     *string                    `json:"credential_id"`
-	RequestMetadata  map[string]json.RawMessage `json:"request_metadata"`
-	Required         bool                       `json:"required"`
-}
-
-type MCPHTTPTransport struct {
-	Type      string             `json:"type"`
-	ServerURL string             `json:"server_url"`
-	Headers   *map[string]string `json:"headers,omitempty"`
-}
diff --git a/contracts/agents-api/v1/official.gen.go b/contracts/agents-api/v1/official.gen.go
new file mode 100644
index 000000000..0c6985fe6
--- /dev/null
+++ b/contracts/agents-api/v1/official.gen.go
@@ -0,0 +1,996 @@
+// Code generated by scripts/generate-public-api.py; DO NOT EDIT.
+package v1
+
+import "encoding/json"
+
+import "fmt"
+
+// APIError projects Error.
+type APIError struct {
+	Message      string          `json:"message" binding:"required"`
+	Type         string          `json:"type" binding:"required"`
+	Code         *string         `json:"code" binding:"required" extensions:"x-nullable"`
+	Param        *string         `json:"param" binding:"required" extensions:"x-nullable"`
+	Misalignment json.RawMessage `json:"misalignment,omitempty" swaggertype:"object"`
+}
+
+// Agent projects SessionAgentResource.
+type Agent struct {
+	XAgentsCore  *AgentsCore       `json:"x_agents_core,omitempty"`
+	ID           string            `json:"id" binding:"required"`
+	Instructions *string           `json:"instructions" binding:"required" extensions:"x-nullable"`
+	Model        string            `json:"model" binding:"required"`
+	MultiAgent   MultiAgentConfig  `json:"multi_agent" binding:"required"`
+	Name         *string           `json:"name" binding:"required" extensions:"x-nullable"`
+	Reasoning    Reasoning         `json:"reasoning" binding:"required"`
+	ServiceTier  string            `json:"service_tier" binding:"required" enums:"auto,default,flex,priority,fast"`
+	Text         TextConfig        `json:"text" binding:"required"`
+	Tools        []json.RawMessage `json:"tools" binding:"required" swaggertype:"array,object"`
+}
+
+// AgentContent projects AgentContentResource.
+type AgentContent struct {
+	Type             string  `json:"type" binding:"required" enums:"output_text,encrypted_content"`
+	Text             *string `json:"text,omitempty"`
+	EncryptedContent *string `json:"encrypted_content,omitempty"`
+}
+
+// AgentDeleted projects DeletedAgentResource.
+type AgentDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"agent.deleted"`
+	Deleted bool   `json:"deleted" binding:"required"`
+}
+
+// AgentMessageItem projects AgentMessageItemResource.
+type AgentMessageItem struct {
+	ID               string         `json:"id" binding:"required"`
+	TurnID           string         `json:"turn_id" binding:"required"`
+	Type             string         `json:"type" binding:"required" enums:"agent_message"`
+	SenderAgentID    string         `json:"sender_agent_id" binding:"required"`
+	RecipientAgentID string         `json:"recipient_agent_id" binding:"required"`
+	Content          []AgentContent `json:"content" binding:"required"`
+}
+
+// CreateAgentRequest projects CreateAgentParams.
+type CreateAgentRequest struct {
+	XAgentsCore  *SavedAgentCoreInput `json:"x_agents_core,omitempty"`
+	Model        *string              `json:"model" binding:"required"`
+	Name         *string              `json:"name,omitempty" extensions:"x-nullable"`
+	Instructions *string              `json:"instructions,omitempty" extensions:"x-nullable"`
+	Metadata     map[string]*string   `json:"metadata,omitempty" extensions:"x-nullable"`
+	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
+	ServiceTier  *string              `json:"service_tier,omitempty" extensions:"x-nullable" enums:"auto,default,flex,priority,fast"`
+	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
+	Tools        []json.RawMessage    `json:"tools,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+}
+
+// CreateCredentialRequest projects CreateVaultCredentialParams.
+type CreateCredentialRequest struct {
+	Name *string              `json:"name" binding:"required"`
+	Auth *CredentialAuthInput `json:"auth" binding:"required"`
+}
+
+// CreateEventsRequest projects CreateSessionEventsParams.
+type CreateEventsRequest struct {
+	Events []SessionInput `json:"events" binding:"required"`
+}
+
+// CreateSessionRequest projects CreateAgentSessionParams.
+type CreateSessionRequest struct {
+	XAgentsCore *SessionExecutionInput `json:"x_agents_core,omitempty"`
+	Agent       *InlineAgent           `json:"agent,omitempty"`
+	AgentID     *string                `json:"agent_id,omitempty"`
+	Environment *Environment           `json:"environment" binding:"required"`
+	Input       any                    `json:"input,omitempty" extensions:"x-nullable"`
+	Metadata    map[string]string      `json:"metadata,omitempty" extensions:"x-nullable"`
+	Stream      bool                   `json:"stream,omitempty"`
+	VaultIDs    []string               `json:"vault_ids,omitempty" extensions:"x-nullable"`
+}
+
+// CreateSubagentCallItem projects CreateSubagentCallItemResource.
+type CreateSubagentCallItem struct {
+	ID              string         `json:"id" binding:"required"`
+	TurnID          string         `json:"turn_id" binding:"required"`
+	Type            string         `json:"type" binding:"required" enums:"create_subagent_call"`
+	Status          string         `json:"status" binding:"required" enums:"in_progress,completed,failed,incomplete"`
+	AgentID         string         `json:"agent_id" binding:"required"`
+	Content         []AgentContent `json:"content" binding:"required"`
+	Model           *string        `json:"model" binding:"required" extensions:"x-nullable"`
+	ReasoningEffort *string        `json:"reasoning_effort" binding:"required" extensions:"x-nullable"`
+}
+
+// CreateVaultRequest projects CreateVaultParams.
+type CreateVaultRequest struct {
+	Name     *string            `json:"name,omitempty"`
+	Metadata map[string]*string `json:"metadata,omitempty" extensions:"x-nullable"`
+}
+
+// Credential projects VaultCredentialResource.
+type Credential struct {
+	ID        string         `json:"id" binding:"required"`
+	VaultID   string         `json:"vault_id" binding:"required"`
+	Name      string         `json:"name" binding:"required"`
+	Object    string         `json:"object" binding:"required" enums:"vault.credential"`
+	Auth      CredentialAuth `json:"auth" binding:"required"`
+	CreatedAt int64          `json:"created_at" binding:"required"`
+	UpdatedAt int64          `json:"updated_at" binding:"required"`
+}
+
+// CredentialAuth projects VaultCredentialAuthResource.
+type CredentialAuth struct {
+	Type         string                  `json:"type" binding:"required" enums:"mcp_oauth,static_bearer"`
+	MCPServerURL string                  `json:"mcp_server_url" binding:"required"`
+	ExpiresAt    *string                 `json:"expires_at" extensions:"x-nullable"`
+	Refresh      *OAuthCredentialRefresh `json:"refresh" extensions:"x-nullable"`
+}
+
+// CredentialAuthInput projects CreateVaultCredentialAuthParam.
+type CredentialAuthInput struct {
+	Type         string                       `json:"type" binding:"required" enums:"mcp_oauth,static_bearer"`
+	MCPServerURL *string                      `json:"mcp_server_url" binding:"required"`
+	Token        *string                      `json:"token,omitempty"`
+	AccessToken  *string                      `json:"access_token,omitempty"`
+	ExpiresAt    *string                      `json:"expires_at,omitempty" extensions:"x-nullable"`
+	Refresh      *OAuthCredentialRefreshInput `json:"refresh,omitempty" extensions:"x-nullable"`
+}
+
+// CredentialAuthReplacement projects RotateVaultCredentialAuthParam.
+type CredentialAuthReplacement struct {
+	Type        string                             `json:"type" binding:"required" enums:"mcp_oauth,static_bearer"`
+	Token       *string                            `json:"token,omitempty"`
+	AccessToken *string                            `json:"access_token,omitempty" extensions:"x-nullable"`
+	ExpiresAt   json.RawMessage                    `json:"expires_at,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	Refresh     *OAuthCredentialRefreshReplacement `json:"refresh,omitempty" extensions:"x-nullable"`
+}
+
+// CredentialDeleted projects DeletedVaultCredentialResource.
+type CredentialDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Deleted bool   `json:"deleted" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"vault.credential.deleted"`
+}
+
+// CredentialList projects VaultCredentialListResource.
+type CredentialList struct {
+	Object  string       `json:"object" binding:"required" enums:"list"`
+	Data    []Credential `json:"data" binding:"required"`
+	HasMore bool         `json:"has_more" binding:"required"`
+	FirstID *string      `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string      `json:"last_id" binding:"required" extensions:"x-nullable"`
+}
+
+// Environment projects EnvironmentParam.
+type Environment struct {
+	Plugins               []json.RawMessage        `json:"plugins,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+	Skills                []json.RawMessage        `json:"skills,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+	Env                   map[string]string        `json:"env,omitempty" extensions:"x-nullable"`
+	SetupCommands         []json.RawMessage        `json:"setup_commands,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+	Packages              *EnvironmentPackages     `json:"packages,omitempty" extensions:"x-nullable"`
+	Files                 []json.RawMessage        `json:"files,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+	EnvironmentTemplateID string                   `json:"environment_template_id,omitempty"`
+	Type                  string                   `json:"type" binding:"required" enums:"none,openai_hosted,self_hosted"`
+	WorkspaceDirectory    string                   `json:"workspace_directory,omitempty"`
+	CapabilityDirectories []string                 `json:"capability_directories,omitempty" extensions:"x-nullable"`
+	Network               *EnvironmentNetworkInput `json:"network,omitempty" extensions:"x-nullable"`
+}
+
+// EnvironmentConnectionAction projects SessionRequiredActionResourceEnvironmentConnection.
+type EnvironmentConnectionAction struct {
+	EnvironmentID string `json:"environment_id" binding:"required"`
+	Type          string `json:"type" binding:"required" enums:"environment_connection"`
+}
+
+// EnvironmentFile projects EnvironmentFileResource.
+type EnvironmentFile struct {
+	EnvironmentID string `json:"environment_id" binding:"required"`
+	Object        string `json:"object" binding:"required" enums:"agent.environment.file"`
+	Path          string `json:"path" binding:"required"`
+	SizeBytes     int64  `json:"size_bytes" binding:"required"`
+}
+
+// EnvironmentFileCreateRequest projects HostedEnvironmentFileParam.
+type EnvironmentFileCreateRequest struct {
+	Type   string  `json:"type" binding:"required" enums:"file_id,inline"`
+	Data   *string `json:"data,omitempty"`
+	FileID *string `json:"file_id,omitempty"`
+	Path   *string `json:"path" binding:"required"`
+}
+
+// EnvironmentFileList projects EnvironmentFileListResource.
+type EnvironmentFileList struct {
+	Object  string            `json:"object" binding:"required" enums:"page"`
+	Data    []EnvironmentFile `json:"data" binding:"required"`
+	Next    *string           `json:"next" binding:"required" extensions:"x-nullable"`
+	HasMore bool              `json:"has_more" binding:"required"`
+}
+
+// EnvironmentInfo projects PublicEnvironmentResource.
+type EnvironmentInfo struct {
+	ID      string            `json:"id" binding:"required"`
+	Object  string            `json:"object" binding:"required" enums:"agent.environment"`
+	Type    string            `json:"type" binding:"required" enums:"openai_hosted,self_hosted"`
+	Status  string            `json:"status" binding:"required" enums:"pending,connected,disconnected,expired,failed"`
+	Files   []json.RawMessage `json:"files" binding:"required" swaggertype:"array,object"`
+	Plugins []json.RawMessage `json:"plugins" binding:"required" swaggertype:"array,object"`
+	Skills  []json.RawMessage `json:"skills" binding:"required" swaggertype:"array,object"`
+}
+
+// EnvironmentNetwork projects NetworkPolicyResource.
+type EnvironmentNetwork struct {
+	Access         string   `json:"access" binding:"required" enums:"enabled,disabled,restricted"`
+	AllowedDomains []string `json:"allowed_domains" binding:"required"`
+}
+
+// EnvironmentNetworkInput projects NetworkPolicyParam.
+type EnvironmentNetworkInput struct {
+	Access         string   `json:"access" binding:"required" enums:"enabled,disabled,restricted"`
+	AllowedDomains []string `json:"allowed_domains,omitempty" extensions:"x-nullable"`
+}
+
+// EnvironmentPackages projects EnvironmentPackagesParam.
+type EnvironmentPackages struct {
+	NPM    []string `json:"npm" extensions:"x-nullable"`
+	Python []string `json:"python" extensions:"x-nullable"`
+}
+
+// EnvironmentPackagesInput projects EnvironmentPackagesParam.
+type EnvironmentPackagesInput struct {
+	NPM    []string `json:"npm,omitempty" extensions:"x-nullable"`
+	Python []string `json:"python,omitempty" extensions:"x-nullable"`
+}
+
+// EnvironmentPackagesResponse projects EnvironmentPackagesResource.
+type EnvironmentPackagesResponse struct {
+	NPM    []string `json:"npm" binding:"required"`
+	Python []string `json:"python" binding:"required"`
+	System []string `json:"system" binding:"required"`
+}
+
+// EnvironmentTemplate projects EnvironmentTemplateResource.
+type EnvironmentTemplate struct {
+	ID                    string                      `json:"id" binding:"required"`
+	Object                string                      `json:"object" binding:"required" enums:"agent.environment.template"`
+	Name                  *string                     `json:"name" binding:"required" extensions:"x-nullable"`
+	CreatedAt             int64                       `json:"created_at" binding:"required"`
+	UpdatedAt             int64                       `json:"updated_at" binding:"required"`
+	CapabilityDirectories []string                    `json:"capability_directories" binding:"required"`
+	Network               EnvironmentNetwork          `json:"network" binding:"required"`
+	Packages              EnvironmentPackagesResponse `json:"packages" binding:"required"`
+	Files                 []json.RawMessage           `json:"files" binding:"required" swaggertype:"array,object"`
+	Plugins               []json.RawMessage           `json:"plugins" binding:"required" swaggertype:"array,object"`
+	Skills                []json.RawMessage           `json:"skills" binding:"required" swaggertype:"array,object"`
+}
+
+// EnvironmentTemplateDeleted projects DeletedEnvironmentTemplateResource.
+type EnvironmentTemplateDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"agent.environment.template.deleted"`
+	Deleted bool   `json:"deleted" binding:"required"`
+}
+
+// EnvironmentTemplateList projects EnvironmentTemplateListResource.
+type EnvironmentTemplateList struct {
+	Object  string                `json:"object" binding:"required" enums:"list"`
+	Data    []EnvironmentTemplate `json:"data" binding:"required"`
+	HasMore bool                  `json:"has_more" binding:"required"`
+	FirstID *string               `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string               `json:"last_id" binding:"required" extensions:"x-nullable"`
+}
+
+// EnvironmentTemplateRequest projects CreateEnvironmentTemplateParams.
+type EnvironmentTemplateRequest struct {
+	Name                  *string                   `json:"name,omitempty" extensions:"x-nullable"`
+	Network               *EnvironmentNetworkInput  `json:"network,omitempty" extensions:"x-nullable"`
+	CapabilityDirectories []string                  `json:"capability_directories,omitempty" extensions:"x-nullable"`
+	Env                   map[string]string         `json:"env,omitempty" extensions:"x-nullable"`
+	Files                 []json.RawMessage         `json:"files,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+	Packages              *EnvironmentPackagesInput `json:"packages,omitempty" extensions:"x-nullable"`
+	Plugins               []json.RawMessage         `json:"plugins,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+	Skills                []json.RawMessage         `json:"skills,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+	SetupCommands         []json.RawMessage         `json:"setup_commands,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+}
+
+// ErrorResponse projects ErrorResponse-2.
+type ErrorResponse struct {
+	Error APIError `json:"error" binding:"required"`
+}
+
+// FunctionCallAction projects SessionRequiredActionResourceFunctionCall.
+type FunctionCallAction struct {
+	Arguments any    `json:"arguments" binding:"required"`
+	CallID    string `json:"call_id" binding:"required"`
+	Name      string `json:"name" binding:"required"`
+	TurnID    string `json:"turn_id" binding:"required"`
+	Type      string `json:"type" binding:"required" enums:"function_call"`
+}
+
+// FunctionToolInput projects AgentToolConfigParamFunction.
+type FunctionToolInput struct {
+	Type         string          `json:"type" binding:"required" enums:"function"`
+	Name         *string         `json:"name" binding:"required"`
+	Description  *string         `json:"description" binding:"required"`
+	Parameters   json.RawMessage `json:"parameters" binding:"required" swaggertype:"object"`
+	DeferLoading json.RawMessage `json:"defer_loading,omitempty" swaggertype:"object"`
+}
+
+// InlineAgent projects SessionAgentConfigParam.
+type InlineAgent struct {
+	XAgentsCore  *AgentsCore          `json:"x_agents_core,omitempty"`
+	Model        *string              `json:"model,omitempty"`
+	Instructions *string              `json:"instructions,omitempty" extensions:"x-nullable"`
+	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
+	ServiceTier  *string              `json:"service_tier,omitempty" extensions:"x-nullable" enums:"auto,default,flex,priority,fast"`
+	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
+	Tools        []json.RawMessage    `json:"tools,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+}
+
+// InputContent projects InputContentParam.
+type InputContent struct {
+	Type     string  `json:"type" binding:"required" enums:"input_text,input_image"`
+	Text     *string `json:"text,omitempty"`
+	ImageURL *string `json:"image_url,omitempty"`
+}
+
+// InputMessage projects InputMessageParam.
+type InputMessage struct {
+	Type    string         `json:"type,omitempty" enums:"message"`
+	Role    string         `json:"role" binding:"required" enums:"user"`
+	Content []InputContent `json:"content" binding:"required"`
+}
+
+// InputTokenDetails projects InputTokensDetailsResource.
+type InputTokenDetails struct {
+	CachedTokens int64 `json:"cached_tokens" binding:"required"`
+}
+
+// Item projects SessionTurnItemResource.
+type Item struct {
+	ID                string           `json:"id" binding:"required" extensions:"x-nullable"`
+	TurnID            string           `json:"turn_id" binding:"required"`
+	Type              string           `json:"type" binding:"required" enums:"message,reasoning,function_call,function_call_output,agent_message,mcp_call,web_search_call,command_execution,create_subagent_call,send_subagent_input_call,resume_subagent_call,wait_for_subagents_call,interrupt_subagent_call,close_subagent_call"`
+	Status            string           `json:"status" extensions:"x-nullable" enums:"in_progress,completed,incomplete,failed"`
+	Role              string           `json:"role,omitempty" enums:"user,assistant"`
+	Phase             string           `json:"phase,omitempty" extensions:"x-nullable" enums:"commentary,final_answer"`
+	Content           []ItemContent    `json:"content,omitempty"`
+	Command           string           `json:"command,omitempty"`
+	Cwd               *string          `json:"cwd,omitempty" extensions:"x-nullable"`
+	DurationMS        *int64           `json:"duration_ms,omitempty" extensions:"x-nullable"`
+	ExitCode          *int64           `json:"exit_code,omitempty" extensions:"x-nullable"`
+	Name              string           `json:"name,omitempty"`
+	CallID            string           `json:"call_id,omitempty"`
+	ServerLabel       string           `json:"server_label,omitempty"`
+	Arguments         any              `json:"arguments,omitempty"`
+	Output            any              `json:"output,omitempty" extensions:"x-nullable"`
+	Error             any              `json:"error,omitempty" extensions:"x-nullable"`
+	Action            *WebSearchAction `json:"action,omitempty" extensions:"x-nullable"`
+	AgentID           string           `json:"agent_id,omitempty"`
+	SenderAgentID     string           `json:"sender_agent_id,omitempty"`
+	RecipientAgentID  string           `json:"recipient_agent_id,omitempty"`
+	RecipientAgentIDs []string         `json:"recipient_agent_ids,omitempty"`
+	Model             *string          `json:"model,omitempty" extensions:"x-nullable"`
+	ReasoningEffort   *string          `json:"reasoning_effort,omitempty" extensions:"x-nullable"`
+	Summary           []SummaryText    `json:"summary,omitempty"`
+}
+
+// ItemContent projects MessageContentResource, EncryptedContentResource.
+type ItemContent struct {
+	Type             string  `json:"type" binding:"required" enums:"input_text,input_image,output_text,encrypted_content"`
+	Text             *string `json:"text,omitempty"`
+	ImageURL         string  `json:"image_url,omitempty"`
+	EncryptedContent *string `json:"encrypted_content,omitempty"`
+}
+
+// ItemList projects SessionItemListResource.
+type ItemList struct {
+	Object  string  `json:"object" binding:"required" enums:"list"`
+	FirstID *string `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string `json:"last_id" binding:"required" extensions:"x-nullable"`
+	Data    []Item  `json:"data" binding:"required"`
+	HasMore bool    `json:"has_more" binding:"required"`
+}
+
+// MCPHTTPTransport projects PersistedMcpTransportConfigParamHttp.
+type MCPHTTPTransport struct {
+	Type      string             `json:"type" binding:"required" enums:"http"`
+	ServerURL string             `json:"server_url" binding:"required"`
+	Headers   *map[string]string `json:"headers,omitempty" extensions:"x-nullable"`
+}
+
+// MCPTool projects AgentToolResourceMcp.
+type MCPTool struct {
+	Type             string                     `json:"type" binding:"required" enums:"mcp"`
+	ServerLabel      string                     `json:"server_label" binding:"required"`
+	Transport        MCPHTTPTransport           `json:"transport" binding:"required"`
+	AllowedTools     *[]string                  `json:"allowed_tools" binding:"required" extensions:"x-nullable"`
+	ConnectionOrigin string                     `json:"connection_origin" binding:"required" enums:"service,environment"`
+	CredentialID     *string                    `json:"credential_id" binding:"required" extensions:"x-nullable"`
+	RequestMetadata  map[string]json.RawMessage `json:"request_metadata" binding:"required" swaggertype:"object"`
+	Required         bool                       `json:"required" binding:"required"`
+}
+
+// MCPToolInput projects AgentToolConfigParamMcp.
+type MCPToolInput struct {
+	Type             string          `json:"type" binding:"required" enums:"mcp"`
+	ServerLabel      *string         `json:"server_label" binding:"required"`
+	Transport        json.RawMessage `json:"transport" binding:"required" swaggertype:"object"`
+	AllowedTools     json.RawMessage `json:"allowed_tools" extensions:"x-nullable" swaggertype:"object"`
+	ConnectionOrigin *string         `json:"connection_origin" extensions:"x-nullable" enums:"service,environment"`
+	CredentialID     *string         `json:"credential_id" extensions:"x-nullable"`
+	RequestMetadata  json.RawMessage `json:"request_metadata" extensions:"x-nullable" swaggertype:"object"`
+	Required         json.RawMessage `json:"required" swaggertype:"object"`
+}
+
+// MultiAgentConfig projects MultiAgentConfigResource.
+type MultiAgentConfig struct {
+	Enabled                bool `json:"enabled" binding:"required"`
+	MaxConcurrentSubagents *int `json:"max_concurrent_subagents" binding:"required" extensions:"x-nullable"`
+}
+
+// OAuthCredentialRefresh projects McpOauthRefreshResource.
+type OAuthCredentialRefresh struct {
+	ClientID          string            `json:"client_id" binding:"required"`
+	TokenEndpoint     string            `json:"token_endpoint" binding:"required"`
+	TokenEndpointAuth OAuthEndpointAuth `json:"token_endpoint_auth" binding:"required"`
+	Resource          *string           `json:"resource" binding:"required" extensions:"x-nullable"`
+	Scope             *string           `json:"scope" binding:"required" extensions:"x-nullable"`
+}
+
+// OAuthCredentialRefreshInput projects CreateMcpOauthRefreshParam.
+type OAuthCredentialRefreshInput struct {
+	ClientID          *string                 `json:"client_id" binding:"required"`
+	RefreshToken      *string                 `json:"refresh_token" binding:"required"`
+	TokenEndpoint     *string                 `json:"token_endpoint" binding:"required"`
+	TokenEndpointAuth *OAuthEndpointAuthInput `json:"token_endpoint_auth" binding:"required"`
+	Resource          *string                 `json:"resource,omitempty" extensions:"x-nullable"`
+	Scope             *string                 `json:"scope,omitempty" extensions:"x-nullable"`
+}
+
+// OAuthCredentialRefreshReplacement projects RotateMcpOauthRefreshParam.
+type OAuthCredentialRefreshReplacement struct {
+	RefreshToken      *string                       `json:"refresh_token,omitempty" extensions:"x-nullable"`
+	Scope             json.RawMessage               `json:"scope,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	TokenEndpointAuth *OAuthEndpointAuthReplacement `json:"token_endpoint_auth,omitempty" extensions:"x-nullable"`
+}
+
+// OAuthEndpointAuth projects McpOauthTokenEndpointAuthResource.
+type OAuthEndpointAuth struct {
+	Type string `json:"type" binding:"required" enums:"none,client_secret_basic,client_secret_post"`
+}
+
+// OAuthEndpointAuthInput projects CreateMcpOauthTokenEndpointAuthParam.
+type OAuthEndpointAuthInput struct {
+	Type         string  `json:"type" binding:"required" enums:"none,client_secret_basic,client_secret_post"`
+	ClientSecret *string `json:"client_secret,omitempty"`
+}
+
+// OAuthEndpointAuthReplacement projects RotateMcpOauthTokenEndpointAuthParam.
+type OAuthEndpointAuthReplacement struct {
+	Type         string  `json:"type" binding:"required" enums:"client_secret_basic,client_secret_post"`
+	ClientSecret *string `json:"client_secret,omitempty" extensions:"x-nullable"`
+}
+
+// OutputTokenDetails projects OutputTokensDetailsResource.
+type OutputTokenDetails struct {
+	ReasoningTokens int64 `json:"reasoning_tokens" binding:"required"`
+}
+
+// Reasoning projects ReasoningParam.
+type Reasoning struct {
+	Effort  *string `json:"effort,omitempty" extensions:"x-nullable" enums:"none,minimal,low,medium,high,xhigh,max"`
+	Summary *string `json:"summary,omitempty" extensions:"x-nullable" enums:"concise,detailed,auto"`
+}
+
+// ReasoningItem projects ReasoningItemResource.
+type ReasoningItem struct {
+	ID      string        `json:"id" binding:"required"`
+	TurnID  string        `json:"turn_id" binding:"required"`
+	Type    string        `json:"type" binding:"required" enums:"reasoning"`
+	Status  *string       `json:"status" binding:"required" extensions:"x-nullable" enums:"in_progress,completed,incomplete"`
+	Summary []SummaryText `json:"summary" binding:"required"`
+}
+
+// RequiredAction projects SessionRequiredActionResource.
+type RequiredAction struct {
+	Type          string `json:"type" binding:"required" enums:"function_call,environment_connection"`
+	Arguments     any    `json:"arguments,omitempty"`
+	CallID        string `json:"call_id,omitempty"`
+	Name          string `json:"name,omitempty"`
+	TurnID        string `json:"turn_id,omitempty"`
+	EnvironmentID string `json:"environment_id,omitempty"`
+}
+
+// SavedAgent projects AgentResource.
+type SavedAgent struct {
+	SavedAgentConfiguration
+	ID        string            `json:"id" binding:"required"`
+	Object    string            `json:"object" binding:"required" enums:"agent"`
+	Metadata  map[string]string `json:"metadata" binding:"required"`
+	CreatedAt int64             `json:"created_at" binding:"required"`
+	UpdatedAt int64             `json:"updated_at" binding:"required"`
+}
+
+// SavedAgentConfiguration projects AgentResource.
+type SavedAgentConfiguration struct {
+	XAgentsCore  *SavedAgentCore   `json:"x_agents_core,omitempty"`
+	Model        string            `json:"model" binding:"required"`
+	Name         *string           `json:"name" binding:"required" extensions:"x-nullable"`
+	Instructions *string           `json:"instructions" binding:"required" extensions:"x-nullable"`
+	MultiAgent   MultiAgentConfig  `json:"multi_agent" binding:"required"`
+	Reasoning    Reasoning         `json:"reasoning" binding:"required"`
+	ServiceTier  string            `json:"service_tier" binding:"required" enums:"auto,default,flex,priority,fast"`
+	Text         SavedAgentText    `json:"text" binding:"required"`
+	Tools        []json.RawMessage `json:"tools" binding:"required" swaggertype:"array,object"`
+}
+
+// SavedAgentList projects AgentListResource.
+type SavedAgentList struct {
+	Object  string       `json:"object" binding:"required" enums:"list"`
+	Data    []SavedAgent `json:"data" binding:"required"`
+	HasMore bool         `json:"has_more" binding:"required"`
+	FirstID *string      `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string      `json:"last_id" binding:"required" extensions:"x-nullable"`
+}
+
+// SavedAgentText projects TextResource.
+type SavedAgentText struct {
+	Format    SavedAgentTextFormat `json:"format" binding:"required"`
+	Verbosity string               `json:"verbosity" binding:"required" enums:"low,medium,high"`
+}
+
+// SavedAgentTextFormat projects TextFormatResource.
+type SavedAgentTextFormat struct {
+	Type   string          `json:"type" binding:"required" enums:"text,json_schema"`
+	Schema json.RawMessage `json:"schema,omitempty" swaggertype:"object"`
+}
+
+// SavedAgentTextInput projects TextParam.
+type SavedAgentTextInput struct {
+	Format    json.RawMessage `json:"format,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	Verbosity *string         `json:"verbosity,omitempty" extensions:"x-nullable" enums:"low,medium,high"`
+}
+
+// SendSubagentInputCallItem projects SendSubagentInputCallItemResource.
+type SendSubagentInputCallItem struct {
+	ID               string         `json:"id" binding:"required"`
+	TurnID           string         `json:"turn_id" binding:"required"`
+	Type             string         `json:"type" binding:"required" enums:"send_subagent_input_call"`
+	Status           string         `json:"status" binding:"required" enums:"in_progress,completed,failed,incomplete"`
+	SenderAgentID    string         `json:"sender_agent_id" binding:"required"`
+	RecipientAgentID string         `json:"recipient_agent_id" binding:"required"`
+	Content          []AgentContent `json:"content" binding:"required"`
+}
+
+// Session projects SessionResource.
+type Session struct {
+	XAgentsCore     *SessionCore       `json:"x_agents_core,omitempty"`
+	ID              string             `json:"id" binding:"required"`
+	Agent           Agent              `json:"agent" binding:"required"`
+	CreatedAt       int64              `json:"created_at" binding:"required"`
+	Environment     SessionEnvironment `json:"environment" binding:"required"`
+	Error           *string            `json:"error" binding:"required" extensions:"x-nullable"`
+	LastActiveAt    int64              `json:"last_active_at" binding:"required"`
+	Metadata        map[string]string  `json:"metadata" binding:"required"`
+	Object          string             `json:"object" binding:"required" enums:"agent.session"`
+	RequiredActions []RequiredAction   `json:"required_actions" binding:"required"`
+	Status          string             `json:"status" binding:"required" enums:"idle,in_progress,requires_action,failed"`
+	Usage           *TokenUsage        `json:"usage" binding:"required" extensions:"x-nullable"`
+	VaultIDs        []string           `json:"vault_ids" binding:"required"`
+}
+
+// SessionArtifact projects SessionArtifactResource.
+type SessionArtifact struct {
+	ID            string `json:"id" binding:"required"`
+	CreatedAt     int64  `json:"created_at" binding:"required"`
+	EnvironmentID string `json:"environment_id" binding:"required"`
+	Object        string `json:"object" binding:"required" enums:"agent.session.artifact"`
+	Path          string `json:"path" binding:"required"`
+	SessionID     string `json:"session_id" binding:"required"`
+	SizeBytes     int64  `json:"size_bytes" binding:"required"`
+	TurnID        string `json:"turn_id" binding:"required"`
+}
+
+// SessionArtifactDeleted projects DeletedSessionArtifactResource.
+type SessionArtifactDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"agent.session.artifact.deleted"`
+	Deleted bool   `json:"deleted" binding:"required"`
+}
+
+// SessionArtifactList projects SessionArtifactListResource.
+type SessionArtifactList struct {
+	Object  string            `json:"object" binding:"required" enums:"list"`
+	FirstID *string           `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string           `json:"last_id" binding:"required" extensions:"x-nullable"`
+	Data    []SessionArtifact `json:"data" binding:"required"`
+	HasMore bool              `json:"has_more" binding:"required"`
+}
+
+// SessionDeleted projects DeletedSessionResource.
+type SessionDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Deleted bool   `json:"deleted" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"agent.session.deleted"`
+}
+
+// SessionEnvironment projects EnvironmentResource.
+type SessionEnvironment struct {
+	Type                  string                       `json:"type" binding:"required" enums:"none,openai_hosted,self_hosted"`
+	ID                    string                       `json:"id,omitempty"`
+	CapabilityDirectories *[]string                    `json:"capability_directories,omitempty"`
+	RemoteURL             string                       `json:"remote_url,omitempty"`
+	WorkspaceDirectory    string                       `json:"workspace_directory,omitempty"`
+	Network               *EnvironmentNetwork          `json:"network,omitempty"`
+	Packages              *EnvironmentPackagesResponse `json:"packages,omitempty"`
+	Files                 *[]json.RawMessage           `json:"files,omitempty" swaggertype:"array,object"`
+	Plugins               *[]json.RawMessage           `json:"plugins,omitempty" swaggertype:"array,object"`
+	Skills                *[]json.RawMessage           `json:"skills,omitempty" swaggertype:"array,object"`
+}
+
+// SessionEnvironmentState projects SessionEnvironmentStateResource.
+type SessionEnvironmentState struct {
+	ID     string       `json:"id" binding:"required"`
+	Type   string       `json:"type" binding:"required"`
+	Status string       `json:"status" binding:"required" enums:"pending,ready,connected,disconnected,failed"`
+	Error  *StreamError `json:"error" binding:"required" extensions:"x-nullable"`
+}
+
+// SessionEvent projects SessionEvent.
+type SessionEvent struct {
+	Subagent     *Subagent                `json:"subagent,omitempty"`
+	Type         string                   `json:"type" binding:"required" enums:"error,agent.session.environment.ready,agent.output.command_execution_output.delta,agent.session.created,agent.session.turn.created,agent.session.turn.in_progress,agent.session.turn.completed,agent.session.turn.failed,agent.session.turn.cancelled,agent.session.turn.item.added,agent.session.idle,agent.session.in_progress,agent.session.requires_action,agent.session.failed,agent.session.environment.pending,agent.session.environment.connected,agent.session.environment.disconnected,agent.session.environment.failed,agent.session.subagent.created,agent.session.subagent.active,agent.session.subagent.closed,agent.session.turn.item.done,agent.session.turn.content_part.added,agent.session.turn.content_part.done,agent.session.turn.output_text.delta,agent.session.turn.output_text.done,agent.session.turn.reasoning_summary_part.added,agent.session.turn.reasoning_summary_part.done,agent.session.turn.reasoning_summary_text.delta,agent.session.turn.reasoning_summary_text.done"`
+	EventID      string                   `json:"event_id" binding:"required"`
+	SessionID    string                   `json:"session_id,omitempty"`
+	TurnID       string                   `json:"turn_id,omitempty" extensions:"x-nullable"`
+	Session      *Session                 `json:"session,omitempty"`
+	Turn         *Turn                    `json:"turn,omitempty"`
+	Item         *Item                    `json:"item,omitempty"`
+	ItemID       string                   `json:"item_id,omitempty"`
+	OutputIndex  *int32                   `json:"output_index,omitempty" extensions:"x-nullable"`
+	ContentIndex *int                     `json:"content_index,omitempty"`
+	Part         *ItemContent             `json:"part,omitempty"`
+	Delta        *string                  `json:"delta,omitempty"`
+	Text         *string                  `json:"text,omitempty"`
+	Error        *StreamError             `json:"error,omitempty"`
+	Environment  *SessionEnvironmentState `json:"environment,omitempty"`
+	Usage        *TokenUsage              `json:"usage,omitempty" extensions:"x-nullable"`
+	SummaryIndex *int64                   `json:"summary_index,omitempty"`
+	Status       *string                  `json:"status,omitempty" extensions:"x-nullable" enums:"incomplete"`
+}
+
+// SessionInput projects SessionInputParam.
+type SessionInput struct {
+	Type    string          `json:"type" binding:"required" enums:"agent.session.input.message,agent.session.input.cancel,agent.session.input.tool_result"`
+	Input   []InputMessage  `json:"input,omitempty"`
+	CallID  string          `json:"call_id,omitempty"`
+	TurnID  string          `json:"turn_id,omitempty"`
+	Success *bool           `json:"success,omitempty"`
+	Error   json.RawMessage `json:"error,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	Output  any             `json:"output,omitempty" extensions:"x-nullable"`
+}
+
+// SessionList projects SessionListResource.
+type SessionList struct {
+	Object  string    `json:"object" binding:"required" enums:"list"`
+	FirstID *string   `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string   `json:"last_id" binding:"required" extensions:"x-nullable"`
+	Data    []Session `json:"data" binding:"required"`
+	HasMore bool      `json:"has_more" binding:"required"`
+}
+
+// Skill projects SkillResource.
+type Skill struct {
+	ID             string `json:"id" binding:"required"`
+	Object         string `json:"object" binding:"required" enums:"skill"`
+	CreatedAt      int64  `json:"created_at" binding:"required"`
+	Name           string `json:"name" binding:"required"`
+	Description    string `json:"description" binding:"required"`
+	DefaultVersion string `json:"default_version" binding:"required"`
+	LatestVersion  string `json:"latest_version" binding:"required"`
+}
+
+// SkillDeleted projects DeletedSkillResource.
+type SkillDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"skill.deleted"`
+	Deleted bool   `json:"deleted" binding:"required"`
+}
+
+// SkillList projects SkillListResource.
+type SkillList struct {
+	Object  string  `json:"object" binding:"required" enums:"list"`
+	Data    []Skill `json:"data" binding:"required"`
+	FirstID *string `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string `json:"last_id" binding:"required" extensions:"x-nullable"`
+	HasMore bool    `json:"has_more" binding:"required"`
+}
+
+// SkillUpdateRequest projects SetDefaultSkillVersionBody.
+type SkillUpdateRequest struct {
+	DefaultVersion string `json:"default_version" binding:"required"`
+}
+
+// SkillVersion projects SkillVersionResource.
+type SkillVersion struct {
+	ID          string `json:"id" binding:"required"`
+	Object      string `json:"object" binding:"required" enums:"skill.version"`
+	CreatedAt   int64  `json:"created_at" binding:"required"`
+	SkillID     string `json:"skill_id" binding:"required"`
+	Version     string `json:"version" binding:"required"`
+	Name        string `json:"name" binding:"required"`
+	Description string `json:"description" binding:"required"`
+}
+
+// SkillVersionDeleted projects DeletedSkillVersionResource.
+type SkillVersionDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"skill.version.deleted"`
+	Version string `json:"version" binding:"required"`
+	Deleted bool   `json:"deleted" binding:"required"`
+}
+
+// SkillVersionList projects SkillVersionListResource.
+type SkillVersionList struct {
+	Object  string         `json:"object" binding:"required" enums:"list"`
+	Data    []SkillVersion `json:"data" binding:"required"`
+	FirstID *string        `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string        `json:"last_id" binding:"required" extensions:"x-nullable"`
+	HasMore bool           `json:"has_more" binding:"required"`
+}
+
+// SourceFile projects OpenAIFile.
+type SourceFile struct {
+	ID            string  `json:"id" binding:"required"`
+	Object        string  `json:"object" binding:"required" enums:"file"`
+	Bytes         int64   `json:"bytes" binding:"required"`
+	CreatedAt     int64   `json:"created_at" binding:"required"`
+	Filename      string  `json:"filename" binding:"required"`
+	Purpose       string  `json:"purpose" binding:"required" enums:"assistants,assistants_output,batch,batch_output,fine-tune,fine-tune-results,vision,user_data"`
+	Status        string  `json:"status" binding:"required" enums:"uploaded,processed,error"`
+	ExpiresAt     *int64  `json:"expires_at"`
+	StatusDetails *string `json:"status_details"`
+}
+
+// SourceFileDeleted projects DeleteFileResponse.
+type SourceFileDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"file"`
+	Deleted bool   `json:"deleted" binding:"required"`
+}
+
+// SourceFileList projects ListFilesResponse.
+type SourceFileList struct {
+	Object  string       `json:"object" binding:"required"`
+	Data    []SourceFile `json:"data" binding:"required"`
+	HasMore bool         `json:"has_more" binding:"required"`
+	FirstID *string      `json:"first_id" binding:"required"`
+	LastID  *string      `json:"last_id" binding:"required"`
+}
+
+// StreamError projects SessionErrorResource.
+type StreamError struct {
+	Code    string  `json:"code" binding:"required" extensions:"x-nullable"`
+	Type    string  `json:"type" binding:"required"`
+	Message string  `json:"message" binding:"required"`
+	Param   *string `json:"param,omitempty" binding:"required" extensions:"x-nullable"`
+}
+
+// Subagent projects SubagentResource.
+type Subagent struct {
+	ID            string         `json:"id" binding:"required"`
+	Object        string         `json:"object" binding:"required" enums:"agent.session.subagent"`
+	SessionID     string         `json:"session_id" binding:"required"`
+	ParentAgentID string         `json:"parent_agent_id" binding:"required"`
+	OpenedAt      int64          `json:"opened_at" binding:"required"`
+	ClosedAt      *int64         `json:"closed_at" binding:"required" extensions:"x-nullable"`
+	Name          *string        `json:"name" binding:"required" extensions:"x-nullable"`
+	Instructions  []AgentContent `json:"instructions" binding:"required" extensions:"x-nullable"`
+	Status        string         `json:"status" binding:"required" enums:"active,closed"`
+}
+
+// SubagentControlCallItem projects ResumeSubagentCallItemResource, InterruptSubagentCallItemResource, CloseSubagentCallItemResource.
+type SubagentControlCallItem struct {
+	ID               string `json:"id" binding:"required"`
+	TurnID           string `json:"turn_id" binding:"required"`
+	Type             string `json:"type" binding:"required" enums:"resume_subagent_call,interrupt_subagent_call,close_subagent_call"`
+	Status           string `json:"status" binding:"required" enums:"in_progress,completed,failed,incomplete"`
+	SenderAgentID    string `json:"sender_agent_id" binding:"required"`
+	RecipientAgentID string `json:"recipient_agent_id" binding:"required"`
+}
+
+// SubagentList projects schema.
+type SubagentList struct {
+	Object  string     `json:"object" binding:"required" enums:"list"`
+	FirstID *string    `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string    `json:"last_id" binding:"required" extensions:"x-nullable"`
+	Data    []Subagent `json:"data" binding:"required"`
+	HasMore bool       `json:"has_more" binding:"required"`
+}
+
+// SummaryText projects SummaryTextResource.
+type SummaryText struct {
+	Type string `json:"type" binding:"required" enums:"summary_text"`
+	Text string `json:"text" binding:"required"`
+}
+
+// TextConfig projects TextResource.
+type TextConfig struct {
+	Format    TextFormat `json:"format" binding:"required"`
+	Verbosity string     `json:"verbosity" binding:"required" enums:"low,medium,high"`
+}
+
+// TextConfigInput projects TextParam.
+type TextConfigInput struct {
+	Format    *TextFormat `json:"format,omitempty" extensions:"x-nullable"`
+	Verbosity *string     `json:"verbosity,omitempty" extensions:"x-nullable" enums:"low,medium,high"`
+}
+
+// TextFormat projects TextFormatResource.
+type TextFormat struct {
+	Type   string          `json:"type" binding:"required" enums:"text,json_schema"`
+	Schema json.RawMessage `json:"schema,omitempty" swaggertype:"object"`
+}
+
+// TokenUsage projects TokenUsageResource.
+type TokenUsage struct {
+	InputTokens         int64              `json:"input_tokens" binding:"required"`
+	InputTokensDetails  InputTokenDetails  `json:"input_tokens_details" binding:"required"`
+	OutputTokens        int64              `json:"output_tokens" binding:"required"`
+	OutputTokensDetails OutputTokenDetails `json:"output_tokens_details" binding:"required"`
+	TotalTokens         int64              `json:"total_tokens" binding:"required"`
+}
+
+// Turn projects TurnResource.
+type Turn struct {
+	ID          string      `json:"id" binding:"required"`
+	AgentID     string      `json:"agent_id" binding:"required"`
+	SubagentID  *string     `json:"subagent_id" binding:"required" extensions:"x-nullable"`
+	SessionID   string      `json:"session_id" binding:"required"`
+	Object      string      `json:"object" binding:"required" enums:"agent.session.turn"`
+	Status      string      `json:"status" binding:"required" enums:"queued,in_progress,waiting,completed,failed,cancelled"`
+	CreatedAt   int64       `json:"created_at" binding:"required"`
+	StartedAt   *int64      `json:"started_at" binding:"required" extensions:"x-nullable"`
+	CompletedAt *int64      `json:"completed_at" binding:"required" extensions:"x-nullable"`
+	Error       *TurnError  `json:"error" binding:"required" extensions:"x-nullable"`
+	Usage       *TokenUsage `json:"usage" binding:"required" extensions:"x-nullable"`
+}
+
+// TurnError projects SessionTurnErrorResource.
+type TurnError struct {
+	Code    string `json:"code" binding:"required" enums:"context_length_exceeded,session_budget_exceeded,usage_limit_exceeded,rate_limit_exceeded,server_overloaded,cyber_policy,connection_failed,server_error,authentication_error,invalid_request,resource_not_found,sandbox_error,executor_version_incompatible,active_turn_not_steerable,request_timeout,internal_error"`
+	Message string `json:"message" binding:"required"`
+}
+
+// TurnList projects SessionTurnListResource.
+type TurnList struct {
+	Object  string  `json:"object" binding:"required" enums:"list"`
+	FirstID *string `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string `json:"last_id" binding:"required" extensions:"x-nullable"`
+	Data    []Turn  `json:"data" binding:"required"`
+	HasMore bool    `json:"has_more" binding:"required"`
+}
+
+// UpdateAgentRequest projects UpdateAgentParams.
+type UpdateAgentRequest struct {
+	XAgentsCore  *SavedAgentCoreInput `json:"x_agents_core,omitempty"`
+	Model        *string              `json:"model,omitempty"`
+	Name         *string              `json:"name,omitempty" extensions:"x-nullable"`
+	Instructions *string              `json:"instructions,omitempty" extensions:"x-nullable"`
+	Metadata     map[string]*string   `json:"metadata,omitempty" extensions:"x-nullable"`
+	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
+	ServiceTier  *string              `json:"service_tier,omitempty" extensions:"x-nullable" enums:"auto,default,flex,priority,fast"`
+	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
+	Tools        []json.RawMessage    `json:"tools,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+}
+
+// UpdateCredentialRequest projects RotateVaultCredentialParams.
+type UpdateCredentialRequest struct {
+	Auth *CredentialAuthReplacement `json:"auth" binding:"required"`
+}
+
+// UpdateSessionRequest projects UpdateAgentSessionParams.
+type UpdateSessionRequest struct {
+	Metadata map[string]string `json:"metadata" extensions:"x-nullable"`
+}
+
+// Vault projects VaultResource.
+type Vault struct {
+	ID        string            `json:"id" binding:"required"`
+	Object    string            `json:"object" binding:"required" enums:"vault"`
+	CreatedAt int64             `json:"created_at" binding:"required"`
+	Name      *string           `json:"name" binding:"required" extensions:"x-nullable"`
+	Metadata  map[string]string `json:"metadata" binding:"required"`
+}
+
+// VaultDeleted projects DeletedVaultResource.
+type VaultDeleted struct {
+	ID      string `json:"id" binding:"required"`
+	Deleted bool   `json:"deleted" binding:"required"`
+	Object  string `json:"object" binding:"required" enums:"vault.deleted"`
+}
+
+// VaultList projects VaultListResource.
+type VaultList struct {
+	Object  string  `json:"object" binding:"required" enums:"list"`
+	Data    []Vault `json:"data" binding:"required"`
+	HasMore bool    `json:"has_more" binding:"required"`
+	FirstID *string `json:"first_id" binding:"required" extensions:"x-nullable"`
+	LastID  *string `json:"last_id" binding:"required" extensions:"x-nullable"`
+}
+
+// WaitForSubagentsCallItem projects WaitForSubagentsCallItemResource.
+type WaitForSubagentsCallItem struct {
+	ID                string   `json:"id" binding:"required"`
+	TurnID            string   `json:"turn_id" binding:"required"`
+	Type              string   `json:"type" binding:"required" enums:"wait_for_subagents_call"`
+	Status            string   `json:"status" binding:"required" enums:"in_progress,completed,failed,incomplete"`
+	SenderAgentID     string   `json:"sender_agent_id" binding:"required"`
+	RecipientAgentIDs []string `json:"recipient_agent_ids" binding:"required"`
+}
+
+// WebSearchAction projects WebSearchActionResource.
+type WebSearchAction struct {
+	Type    string   `json:"type" binding:"required" enums:"search,open_page,find_in_page,other"`
+	Query   *string  `json:"query,omitempty" extensions:"x-nullable"`
+	Queries []string `json:"queries,omitempty" extensions:"x-nullable"`
+	URL     *string  `json:"url,omitempty" extensions:"x-nullable"`
+	Pattern *string  `json:"pattern,omitempty" extensions:"x-nullable"`
+}
+
+func (value WebSearchAction) MarshalJSON() ([]byte, error) {
+	switch value.Type {
+	case "search":
+		return json.Marshal(struct {
+			Type    string   `json:"type"`
+			Query   *string  `json:"query"`
+			Queries []string `json:"queries"`
+		}{
+			Type:    value.Type,
+			Query:   value.Query,
+			Queries: value.Queries,
+		})
+	case "open_page":
+		return json.Marshal(struct {
+			Type string  `json:"type"`
+			URL  *string `json:"url"`
+		}{
+			Type: value.Type,
+			URL:  value.URL,
+		})
+	case "find_in_page":
+		return json.Marshal(struct {
+			Type    string  `json:"type"`
+			URL     *string `json:"url"`
+			Pattern *string `json:"pattern"`
+		}{
+			Type:    value.Type,
+			URL:     value.URL,
+			Pattern: value.Pattern,
+		})
+	case "other":
+		return json.Marshal(struct {
+			Type string `json:"type"`
+		}{
+			Type: value.Type,
+		})
+	default:
+		return nil, fmt.Errorf("invalid WebSearchAction type %q", value.Type)
+	}
+}
+
+// reasoningResponse projects ReasoningResource.
+type reasoningResponse struct {
+	Effort  *string `json:"effort" binding:"required" extensions:"x-nullable" enums:"none,minimal,low,medium,high,xhigh,max"`
+	Summary *string `json:"summary" binding:"required" extensions:"x-nullable" enums:"concise,detailed,auto"`
+}
+
+// sessionError projects SessionErrorResource.
+type sessionError struct {
+	Code    string  `json:"code" binding:"required" extensions:"x-nullable"`
+	Type    string  `json:"type" binding:"required"`
+	Message string  `json:"message" binding:"required"`
+	Param   *string `json:"param" binding:"required" extensions:"x-nullable"`
+}
diff --git a/contracts/agents-api/v1/required_actions.go b/contracts/agents-api/v1/required_actions.go
index 1567b1a05..f6bcb18b3 100644
--- a/contracts/agents-api/v1/required_actions.go
+++ b/contracts/agents-api/v1/required_actions.go
@@ -6,21 +6,6 @@ import (
 	"errors"
 )
 
-// RequiredAction contains the supported variants of the Session action union.
-type RequiredAction struct {
-	Type          string `json:"type" enums:"function_call,environment_connection" binding:"required"`
-	Arguments     any    `json:"arguments,omitempty"`
-	CallID        string `json:"call_id,omitempty"`
-	Name          string `json:"name,omitempty"`
-	TurnID        string `json:"turn_id,omitempty"`
-	EnvironmentID string `json:"environment_id,omitempty"`
-}
-
-type EnvironmentConnectionAction struct {
-	EnvironmentID string `json:"environment_id" binding:"required"`
-	Type          string `json:"type" enums:"environment_connection" binding:"required"`
-}
-
 // MarshalJSON preserves required null function arguments without exposing function fields on connection actions.
 func (a RequiredAction) MarshalJSON() ([]byte, error) {
 	switch a.Type {
diff --git a/contracts/agents-api/v1/session_artifacts.go b/contracts/agents-api/v1/session_artifacts.go
deleted file mode 100644
index 77f68951d..000000000
--- a/contracts/agents-api/v1/session_artifacts.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package v1
-
-type SessionArtifact struct {
-	ID            string `json:"id" binding:"required"`
-	CreatedAt     int64  `json:"created_at" binding:"required"`
-	EnvironmentID string `json:"environment_id" binding:"required"`
-	Object        string `json:"object" enums:"agent.session.artifact" binding:"required"`
-	Path          string `json:"path" binding:"required"`
-	SessionID     string `json:"session_id" binding:"required"`
-	SizeBytes     int64  `json:"size_bytes" binding:"required"`
-	TurnID        string `json:"turn_id" binding:"required"`
-}
-
-type SessionArtifactList struct {
-	Object  string            `json:"object" enums:"list" binding:"required"`
-	FirstID *string           `json:"first_id" extensions:"x-nullable"`
-	LastID  *string           `json:"last_id" extensions:"x-nullable"`
-	Data    []SessionArtifact `json:"data" binding:"required"`
-	HasMore bool              `json:"has_more" binding:"required"`
-}
-
-type SessionArtifactDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Object  string `json:"object" enums:"agent.session.artifact.deleted" binding:"required"`
-	Deleted bool   `json:"deleted" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/session_deletion.go b/contracts/agents-api/v1/session_deletion.go
deleted file mode 100644
index f95bacc98..000000000
--- a/contracts/agents-api/v1/session_deletion.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package v1
-
-type SessionDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Deleted bool   `json:"deleted" binding:"required"`
-	Object  string `json:"object" enums:"agent.session.deleted" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/session_environment.go b/contracts/agents-api/v1/session_environment.go
deleted file mode 100644
index be8117520..000000000
--- a/contracts/agents-api/v1/session_environment.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package v1
-
-import "encoding/json"
-
-// SessionEnvironment contains supported output variants, independently of request admission.
-type SessionEnvironment struct {
-	Type                  string                       `json:"type" enums:"none,self_hosted,openai_hosted" binding:"required"`
-	ID                    string                       `json:"id,omitempty"`
-	CapabilityDirectories *[]string                    `json:"capability_directories,omitempty"`
-	RemoteURL             string                       `json:"remote_url,omitempty"`
-	WorkspaceDirectory    string                       `json:"workspace_directory,omitempty"`
-	Network               *EnvironmentNetwork          `json:"network,omitempty"`
-	Packages              *EnvironmentPackagesResponse `json:"packages,omitempty"`
-	Files                 *[]json.RawMessage           `json:"files,omitempty" swaggertype:"array,object"`
-	Plugins               *[]json.RawMessage           `json:"plugins,omitempty" swaggertype:"array,object"`
-	Skills                *[]json.RawMessage           `json:"skills,omitempty" swaggertype:"array,object"`
-}
diff --git a/contracts/agents-api/v1/sessions.go b/contracts/agents-api/v1/sessions.go
index ac2400877..e165327d8 100644
--- a/contracts/agents-api/v1/sessions.go
+++ b/contracts/agents-api/v1/sessions.go
@@ -3,117 +3,6 @@ package v1
 
 import "encoding/json"
 
-// CreateSessionRequest supports inline configuration or a saved Agent reference.
-// Initial text input is accepted with ordinary or streaming responses.
-type CreateSessionRequest struct {
-	XAgentsCore *SessionExecutionInput `json:"x_agents_core,omitempty"`
-	Agent       *InlineAgent           `json:"agent,omitempty"`
-	AgentID     *string                `json:"agent_id,omitempty"`
-	Environment *Environment           `json:"environment" binding:"required"`
-	// Input accepts a string or an ordered array of user InputMessage objects.
-	// Required for none and streamed creation outside self_hosted; otherwise optional.
-	Input    any               `json:"input,omitempty" extensions:"x-nullable"`
-	Metadata map[string]string `json:"metadata,omitempty" extensions:"x-nullable"`
-	Stream   bool              `json:"stream,omitempty" default:"false"`
-	VaultIDs []string          `json:"vault_ids,omitempty"`
-}
-
-// UpdateSessionRequest requires metadata; null and an empty object clear it.
-type UpdateSessionRequest struct {
-	Metadata map[string]string `json:"metadata" extensions:"x-nullable" binding:"required"`
-}
-
-// InlineAgent supplies a complete inline configuration or per-Session overrides.
-// With agent_id, omitted fields inherit and supplied fields replace saved values.
-type InlineAgent struct {
-	XAgentsCore  *AgentsCore          `json:"x_agents_core,omitempty" extensions:"x-nullable"`
-	Model        *string              `json:"model,omitempty"`
-	Instructions *string              `json:"instructions,omitempty" extensions:"x-nullable"`
-	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" swaggertype:"object" extensions:"x-nullable"`
-	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
-	ServiceTier  *string              `json:"service_tier,omitempty" enums:"auto,default,flex,priority,fast" extensions:"x-nullable"`
-	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
-	Tools        []json.RawMessage    `json:"tools,omitempty" swaggertype:"array,object" extensions:"x-nullable"`
-}
-
-// Environment contains supported request variants; self-hosted creation requires a workspace directory.
-type Environment struct {
-	Plugins               []json.RawMessage        `json:"plugins,omitempty" swaggertype:"array,object" extensions:"x-nullable"`
-	Skills                []json.RawMessage        `json:"skills,omitempty" swaggertype:"array,object" extensions:"x-nullable"`
-	Env                   map[string]string        `json:"env,omitempty" extensions:"x-nullable"`
-	SetupCommands         []json.RawMessage        `json:"setup_commands,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-	Packages              *EnvironmentPackages     `json:"packages,omitempty" extensions:"x-nullable"`
-	Files                 []json.RawMessage        `json:"files,omitempty" swaggertype:"array,object" extensions:"x-nullable"`
-	EnvironmentTemplateID string                   `json:"environment_template_id,omitempty"`
-	Type                  string                   `json:"type" enums:"none,self_hosted,openai_hosted" binding:"required"`
-	WorkspaceDirectory    string                   `json:"workspace_directory,omitempty"`
-	CapabilityDirectories []string                 `json:"capability_directories,omitempty" extensions:"x-nullable"`
-	Network               *EnvironmentNetworkInput `json:"network,omitempty" extensions:"x-nullable"`
-}
-
-type Agent struct {
-	XAgentsCore  *AgentsCore       `json:"x_agents_core,omitempty" extensions:"x-nullable"`
-	ID           string            `json:"id" binding:"required"`
-	Instructions *string           `json:"instructions" extensions:"x-nullable"`
-	Model        string            `json:"model" binding:"required"`
-	MultiAgent   MultiAgentConfig  `json:"multi_agent" binding:"required"`
-	Name         *string           `json:"name" extensions:"x-nullable"`
-	Reasoning    Reasoning         `json:"reasoning" binding:"required"`
-	ServiceTier  string            `json:"service_tier" enums:"auto" binding:"required"`
-	Text         TextConfig        `json:"text" binding:"required"`
-	Tools        []json.RawMessage `json:"tools" swaggertype:"array,object" binding:"required"`
-}
-
-type MultiAgentConfig struct {
-	Enabled                bool `json:"enabled" binding:"required"`
-	MaxConcurrentSubagents *int `json:"max_concurrent_subagents" extensions:"x-nullable"`
-}
-
-type Reasoning struct {
-	Effort  *string `json:"effort,omitempty" extensions:"x-nullable"`
-	Summary *string `json:"summary,omitempty" extensions:"x-nullable"`
-}
-
-// reasoningResponse renders both reasoning keys, null when unset, as pinned
-// Agent and Session responses do (SES-23, VA-11). Requests and stored
-// configuration keep the omitting Reasoning encoding. It does not resolve a
-// model-derived default effort.
-type reasoningResponse struct {
-	Effort  *string `json:"effort"`
-	Summary *string `json:"summary"`
-}
-
-type TextConfigInput struct {
-	Format    *TextFormat `json:"format,omitempty" extensions:"x-nullable"`
-	Verbosity *string     `json:"verbosity,omitempty" enums:"low,medium,high" extensions:"x-nullable"`
-}
-
-type TextConfig struct {
-	Format    TextFormat `json:"format" binding:"required"`
-	Verbosity string     `json:"verbosity" enums:"low,medium,high" binding:"required"`
-}
-
-type TextFormat struct {
-	Type   string          `json:"type" enums:"text,json_schema" binding:"required"`
-	Schema json.RawMessage `json:"schema,omitempty" swaggertype:"object"`
-}
-
-type Session struct {
-	XAgentsCore     *SessionCore       `json:"x_agents_core,omitempty"`
-	ID              string             `json:"id" binding:"required"`
-	Agent           Agent              `json:"agent" binding:"required"`
-	CreatedAt       int64              `json:"created_at" binding:"required"`
-	Environment     SessionEnvironment `json:"environment" binding:"required"`
-	Error           *string            `json:"error" extensions:"x-nullable"`
-	LastActiveAt    int64              `json:"last_active_at" binding:"required"`
-	Metadata        map[string]string  `json:"metadata" binding:"required"`
-	Object          string             `json:"object" enums:"agent.session" binding:"required"`
-	RequiredActions []RequiredAction   `json:"required_actions" binding:"required"`
-	Status          string             `json:"status" enums:"idle,in_progress,requires_action,failed" binding:"required"`
-	Usage           *TokenUsage        `json:"usage" extensions:"x-nullable"`
-	VaultIDs        []string           `json:"vault_ids" binding:"required"`
-}
-
 type agentWire Agent
 
 // agentResponse renders a Session Agent with explicit reasoning keys.
@@ -131,22 +20,3 @@ func (s Session) MarshalJSON() ([]byte, error) {
 		Agent agentResponse `json:"agent"`
 	}{wire(s), agentResponse{agentWire(s.Agent), reasoningResponse(s.Agent.Reasoning)}})
 }
-
-type SessionList struct {
-	Object  string    `json:"object" enums:"list" binding:"required"`
-	FirstID *string   `json:"first_id" extensions:"x-nullable"`
-	LastID  *string   `json:"last_id" extensions:"x-nullable"`
-	Data    []Session `json:"data" binding:"required"`
-	HasMore bool      `json:"has_more" binding:"required"`
-}
-
-type ErrorResponse struct {
-	Error APIError `json:"error" binding:"required"`
-}
-
-type APIError struct {
-	Message string  `json:"message" binding:"required"`
-	Type    string  `json:"type" binding:"required"`
-	Code    *string `json:"code" extensions:"x-nullable"`
-	Param   *string `json:"param" extensions:"x-nullable"`
-}
diff --git a/contracts/agents-api/v1/skills.go b/contracts/agents-api/v1/skills.go
deleted file mode 100644
index 4820024e7..000000000
--- a/contracts/agents-api/v1/skills.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package v1
-
-// Skill describes a tenant-owned, versioned bundle without exposing its contents.
-type Skill struct {
-	ID             string `json:"id" binding:"required"`
-	Object         string `json:"object" binding:"required" enums:"skill"`
-	CreatedAt      int64  `json:"created_at" binding:"required"`
-	Name           string `json:"name" binding:"required"`
-	Description    string `json:"description" binding:"required"`
-	DefaultVersion string `json:"default_version" binding:"required"`
-	LatestVersion  string `json:"latest_version" binding:"required"`
-}
-
-type SkillVersion struct {
-	ID          string `json:"id" binding:"required"`
-	Object      string `json:"object" binding:"required" enums:"skill.version"`
-	CreatedAt   int64  `json:"created_at" binding:"required"`
-	SkillID     string `json:"skill_id" binding:"required"`
-	Version     string `json:"version" binding:"required"`
-	Name        string `json:"name" binding:"required"`
-	Description string `json:"description" binding:"required"`
-}
-
-type SkillList struct {
-	Object  string  `json:"object" binding:"required" enums:"list"`
-	Data    []Skill `json:"data" binding:"required"`
-	FirstID *string `json:"first_id" extensions:"x-nullable"`
-	LastID  *string `json:"last_id" extensions:"x-nullable"`
-	HasMore bool    `json:"has_more" binding:"required"`
-}
-
-type SkillVersionList struct {
-	Object  string         `json:"object" binding:"required" enums:"list"`
-	Data    []SkillVersion `json:"data" binding:"required"`
-	FirstID *string        `json:"first_id" extensions:"x-nullable"`
-	LastID  *string        `json:"last_id" extensions:"x-nullable"`
-	HasMore bool           `json:"has_more" binding:"required"`
-}
-
-type SkillDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Object  string `json:"object" binding:"required" enums:"skill.deleted"`
-	Deleted bool   `json:"deleted" binding:"required"`
-}
-
-type SkillVersionDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Object  string `json:"object" binding:"required" enums:"skill.version.deleted"`
-	Version string `json:"version" binding:"required"`
-	Deleted bool   `json:"deleted" binding:"required"`
-}
-
-type SkillUpdateRequest struct {
-	DefaultVersion string `json:"default_version" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/source_files.go b/contracts/agents-api/v1/source_files.go
deleted file mode 100644
index 09fcc9ac3..000000000
--- a/contracts/agents-api/v1/source_files.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package v1
-
-type SourceFile struct {
-	ID            string  `json:"id" binding:"required"`
-	Object        string  `json:"object" binding:"required" enums:"file"`
-	Bytes         int64   `json:"bytes" binding:"required" minimum:"0"`
-	CreatedAt     int64   `json:"created_at" binding:"required"`
-	Filename      string  `json:"filename" binding:"required"`
-	Purpose       string  `json:"purpose" binding:"required" enums:"user_data"`
-	Status        string  `json:"status" binding:"required" enums:"processed"`
-	ExpiresAt     *int64  `json:"expires_at" extensions:"x-nullable"`
-	StatusDetails *string `json:"status_details" extensions:"x-nullable"`
-}
-
-type SourceFileList struct {
-	Object  string       `json:"object" binding:"required" enums:"list"`
-	Data    []SourceFile `json:"data" binding:"required"`
-	HasMore bool         `json:"has_more" binding:"required"`
-	FirstID *string      `json:"first_id" extensions:"x-nullable"`
-	LastID  *string      `json:"last_id" extensions:"x-nullable"`
-}
-
-type SourceFileDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Object  string `json:"object" binding:"required" enums:"file"`
-	Deleted bool   `json:"deleted" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/subagent_items.go b/contracts/agents-api/v1/subagent_items.go
index 82a40d6a9..b9c4a1533 100644
--- a/contracts/agents-api/v1/subagent_items.go
+++ b/contracts/agents-api/v1/subagent_items.go
@@ -5,71 +5,9 @@ import (
 	"errors"
 )
 
-type CreateSubagentCallItem struct {
-	ID              string         `json:"id" binding:"required"`
-	TurnID          string         `json:"turn_id" binding:"required"`
-	Type            string         `json:"type" binding:"required" enums:"create_subagent_call"`
-	Status          string         `json:"status" binding:"required" enums:"in_progress,completed,failed,incomplete"`
-	AgentID         string         `json:"agent_id" binding:"required"`
-	Content         []AgentContent `json:"content" binding:"required"`
-	Model           *string        `json:"model" extensions:"x-nullable"`
-	ReasoningEffort *string        `json:"reasoning_effort" extensions:"x-nullable"`
-}
-
-type SendSubagentInputCallItem struct {
-	ID               string         `json:"id" binding:"required"`
-	TurnID           string         `json:"turn_id" binding:"required"`
-	Type             string         `json:"type" binding:"required" enums:"send_subagent_input_call"`
-	Status           string         `json:"status" binding:"required" enums:"in_progress,completed,failed,incomplete"`
-	SenderAgentID    string         `json:"sender_agent_id" binding:"required"`
-	RecipientAgentID string         `json:"recipient_agent_id" binding:"required"`
-	Content          []AgentContent `json:"content" binding:"required"`
-}
-
-// SubagentControlCallItem is the common wire shape of resume, interrupt and close calls.
-type SubagentControlCallItem struct {
-	ID               string `json:"id" binding:"required"`
-	TurnID           string `json:"turn_id" binding:"required"`
-	Type             string `json:"type" binding:"required" enums:"resume_subagent_call,interrupt_subagent_call,close_subagent_call"`
-	Status           string `json:"status" binding:"required" enums:"in_progress,completed,failed,incomplete"`
-	SenderAgentID    string `json:"sender_agent_id" binding:"required"`
-	RecipientAgentID string `json:"recipient_agent_id" binding:"required"`
-}
-
-type WaitForSubagentsCallItem struct {
-	ID                string   `json:"id" binding:"required"`
-	TurnID            string   `json:"turn_id" binding:"required"`
-	Type              string   `json:"type" binding:"required" enums:"wait_for_subagents_call"`
-	Status            string   `json:"status" binding:"required" enums:"in_progress,completed,failed,incomplete"`
-	SenderAgentID     string   `json:"sender_agent_id" binding:"required"`
-	RecipientAgentIDs []string `json:"recipient_agent_ids" binding:"required"`
-}
-
-type AgentMessageItem struct {
-	ID               string         `json:"id" binding:"required"`
-	TurnID           string         `json:"turn_id" binding:"required"`
-	Type             string         `json:"type" binding:"required" enums:"agent_message"`
-	SenderAgentID    string         `json:"sender_agent_id" binding:"required"`
-	RecipientAgentID string         `json:"recipient_agent_id" binding:"required"`
-	Content          []AgentContent `json:"content" binding:"required"`
-}
-
-type SummaryText struct {
-	Type string `json:"type" binding:"required" enums:"summary_text"`
-	Text string `json:"text" binding:"required"`
-}
-
-type ReasoningItem struct {
-	ID      string        `json:"id" binding:"required"`
-	TurnID  string        `json:"turn_id" binding:"required"`
-	Type    string        `json:"type" binding:"required" enums:"reasoning"`
-	Status  *string       `json:"status" extensions:"x-nullable" enums:"in_progress,completed,incomplete"`
-	Summary []SummaryText `json:"summary" binding:"required"`
-}
-
 // MarshalJSON renders the wire shape. Messages always carry content and a
-// nullable phase, and function results a nullable output and error, as in the
-// pinned responses (EVT-09, SES-25). Other variants use the stored encoding.
+// nullable phase, function results a nullable output and error, and web search
+// a nullable action. Other variants use the stored encoding.
 func (i Item) MarshalJSON() ([]byte, error) {
 	type wire Item
 	switch i.Type {
@@ -87,6 +25,11 @@ func (i Item) MarshalJSON() ([]byte, error) {
 			Phase   *string       `json:"phase"`
 			Content []ItemContent `json:"content"`
 		}{wire(i), phase, content})
+	case "web_search_call":
+		return json.Marshal(struct {
+			wire
+			Action *WebSearchAction `json:"action"`
+		}{wire(i), i.Action})
 	case "function_call_output":
 		return json.Marshal(struct {
 			wire
@@ -103,6 +46,13 @@ func (i Item) MarshalJSON() ([]byte, error) {
 // required fields and nulls in both forms.
 func (i Item) MarshalStored() ([]byte, error) {
 	switch i.Type {
+	case "web_search_call":
+		type wire Item
+		type storedAction WebSearchAction
+		return json.Marshal(struct {
+			wire
+			Action *storedAction `json:"action,omitempty"`
+		}{wire(i), (*storedAction)(i.Action)})
 	case "create_subagent_call", "send_subagent_input_call", "agent_message":
 		content, err := coordinationContent(i.Content)
 		if err != nil {
diff --git a/contracts/agents-api/v1/subagents.go b/contracts/agents-api/v1/subagents.go
deleted file mode 100644
index 1686b9c86..000000000
--- a/contracts/agents-api/v1/subagents.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package v1
-
-// AgentContent is the pinned content union used for inter-agent instructions and messages.
-type AgentContent struct {
-	Type             string  `json:"type" binding:"required" enums:"output_text,encrypted_content"`
-	Text             *string `json:"text,omitempty"`
-	EncryptedContent *string `json:"encrypted_content,omitempty"`
-}
-
-type Subagent struct {
-	ID            string         `json:"id" binding:"required"`
-	Object        string         `json:"object" binding:"required" enums:"agent.session.subagent"`
-	SessionID     string         `json:"session_id" binding:"required"`
-	ParentAgentID string         `json:"parent_agent_id" binding:"required"`
-	OpenedAt      int64          `json:"opened_at" binding:"required"`
-	ClosedAt      *int64         `json:"closed_at" extensions:"x-nullable"`
-	Name          *string        `json:"name" extensions:"x-nullable"`
-	Instructions  []AgentContent `json:"instructions" extensions:"x-nullable"`
-	Status        string         `json:"status" binding:"required" enums:"active,closed"`
-}
-
-type SubagentList struct {
-	Object  string     `json:"object" enums:"list" binding:"required"`
-	FirstID *string    `json:"first_id" extensions:"x-nullable"`
-	LastID  *string    `json:"last_id" extensions:"x-nullable"`
-	Data    []Subagent `json:"data" binding:"required"`
-	HasMore bool       `json:"has_more" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/turns.go b/contracts/agents-api/v1/turns.go
deleted file mode 100644
index 745953deb..000000000
--- a/contracts/agents-api/v1/turns.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package v1
-
-type Turn struct {
-	ID          string      `json:"id" binding:"required"`
-	AgentID     string      `json:"agent_id" binding:"required"`
-	SubagentID  *string     `json:"subagent_id" extensions:"x-nullable"`
-	SessionID   string      `json:"session_id" binding:"required"`
-	Object      string      `json:"object" enums:"agent.session.turn" binding:"required"`
-	Status      string      `json:"status" enums:"queued,in_progress,waiting,completed,failed,cancelled" binding:"required"`
-	CreatedAt   int64       `json:"created_at" binding:"required"`
-	StartedAt   *int64      `json:"started_at" extensions:"x-nullable"`
-	CompletedAt *int64      `json:"completed_at" extensions:"x-nullable"`
-	Error       *TurnError  `json:"error" extensions:"x-nullable"`
-	Usage       *TokenUsage `json:"usage" extensions:"x-nullable"`
-}
-
-type TurnError struct {
-	Code    string `json:"code" enums:"context_length_exceeded,session_budget_exceeded,usage_limit_exceeded,rate_limit_exceeded,server_overloaded,cyber_policy,connection_failed,server_error,authentication_error,invalid_request,resource_not_found,sandbox_error,executor_version_incompatible,active_turn_not_steerable,request_timeout,internal_error" binding:"required"`
-	Message string `json:"message" binding:"required"`
-}
-
-type TurnList struct {
-	Object  string  `json:"object" enums:"list" binding:"required"`
-	FirstID *string `json:"first_id" extensions:"x-nullable"`
-	LastID  *string `json:"last_id" extensions:"x-nullable"`
-	Data    []Turn  `json:"data" binding:"required"`
-	HasMore bool    `json:"has_more" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/upstream_contract_test.go b/contracts/agents-api/v1/upstream_contract_test.go
index 57b44bdd5..9be78a569 100644
--- a/contracts/agents-api/v1/upstream_contract_test.go
+++ b/contracts/agents-api/v1/upstream_contract_test.go
@@ -1,290 +1,109 @@
 package v1
 
 import (
+	"crypto/sha256"
+	"encoding/hex"
 	"encoding/json"
 	"os"
-	"regexp"
-	"slices"
-	"sort"
+	"reflect"
 	"strings"
 	"testing"
-
-	"gopkg.in/yaml.v3"
 )
 
-// upstream-routes.json and upstream-fields.json are produced from the pinned
-// SDK by scripts/extract-agents-api-upstream.py.
-
-var openAPIPathParameter = regexp.MustCompile(`\{[^}]*\}`)
-
-func readContractJSON(t *testing.T, name string, value any) {
+func contractDocument(t *testing.T, path string) map[string]any {
 	t.Helper()
-	raw, err := os.ReadFile("../" + name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := json.Unmarshal(raw, value); err != nil {
-		t.Fatalf("parse %s: %v", name, err)
-	}
-}
-
-// publicOperations indexes the public OpenAPI operations by "METHOD /path",
-// with path parameters normalised to {} like the pinned route set.
-func publicOperations(t *testing.T) (map[string]map[string]any, map[string]any) {
-	t.Helper()
-	raw, err := os.ReadFile("../openapi.yaml")
+	raw, err := os.ReadFile("../" + path)
 	if err != nil {
 		t.Fatal(err)
 	}
 	var document map[string]any
-	if err := yaml.Unmarshal(raw, &document); err != nil {
+	if err := json.Unmarshal(raw, &document); err != nil {
 		t.Fatal(err)
 	}
-	operations := map[string]map[string]any{}
-	for path, item := range openAPIMap(t, document, "paths") {
-		for method, operation := range item.(map[string]any) {
-			if method == "parameters" {
-				continue
-			}
-			operations[strings.ToUpper(method)+" "+openAPIPathParameter.ReplaceAllString(path, "{}")] = operation.(map[string]any)
-		}
-	}
-	return operations, openAPIMap(t, document, "definitions")
+	return document
 }
 
-func TestPublicOpenAPIRoutesMatchPinnedUpstream(t *testing.T) {
-	var pinned struct {
-		Routes []string `json:"routes"`
-	}
-	readContractJSON(t, "upstream-routes.json", &pinned)
-	operations, _ := publicOperations(t)
-	var missing, extra []string
-	for _, route := range pinned.Routes {
-		if operations[route] == nil {
-			missing = append(missing, route)
-		}
-	}
-	for route := range operations {
-		if !slices.Contains(pinned.Routes, route) {
-			extra = append(extra, route)
-		}
+func TestOfficialSchemaPin(t *testing.T) {
+	pin := contractDocument(t, "upstream.json")["openapi"].(map[string]any)
+	raw, err := os.ReadFile("../upstream/openapi.json")
+	if err != nil {
+		t.Fatal(err)
 	}
-	sort.Strings(extra)
-	if len(pinned.Routes) == 0 || len(missing) != 0 || len(extra) != 0 {
-		t.Fatalf("public OpenAPI differs from the pinned SDK route set: missing %v, extra %v", missing, extra)
+	digest := sha256.Sum256(raw)
+	if hex.EncodeToString(digest[:]) != pin["sha256"] {
+		t.Fatal("official schema differs from its pin")
 	}
 }
 
-// fieldPlacementPending temporarily lists properties that are neither in the
-// pinned SDK type nor inside x_agents_core, keyed by schema.property. Each one
-// awaits a decision: remove it, move it into x_agents_core or rename it to the
-// official field. Remove an entry once it is resolved; stale entries fail.
-var fieldPlacementPending = map[string]string{
-	// Naming mismatch, not an extension: v1.ItemContent is shared by Item
-	// content, where these fields are official, and the content_part and
-	// reasoning_summary_part event parts, whose official types have only text
-	// and type.
-	"v1.ItemContent.encrypted_content": "shared with Item content; not on official event parts",
-	"v1.ItemContent.image_url":         "shared with Item content; not on official event parts",
-	// Naming mismatch, not an extension: v1.StreamError is shared by error
-	// events (official SessionError.param) and Environment state errors, whose
-	// official type has no param; Core omits it there.
-	"v1.StreamError.param": "shared with error events; not on official Environment state errors",
-}
-
-// Official list pages also carry object, first_id and last_id (recorded in
-// wire-semantics.md#lists), which the SDK's hand-written page classes
-// do not declare.
-var listEnvelopeFields = []string{"object", "first_id", "last_id"}
-
-// Core fields live only inside x_agents_core on these Agent and Session
-// definitions, and only as these members.
-var (
-	coreExtensionOwners  = []string{"v1.Agent", "v1.InlineAgent", "v1.SavedAgent", "v1.CreateAgentRequest", "v1.UpdateAgentRequest", "v1.Session", "v1.CreateSessionRequest"}
-	coreExtensionMembers = []string{"harness", "model_provider", "harness_config", "environment"}
-)
-
-type upstreamFields struct {
-	Operations map[string]struct{ Request, Query, Response []string } `json:"operations"`
-	Types      map[string]map[string][]string                         `json:"types"`
-}
-
-type fieldAudit struct {
-	definitions map[string]any
-	types       map[string]map[string][]string
-	visited     map[string]bool
-	violations  map[string][]string
-}
-
-// auditPublicFields returns every public property, query parameter or
-// extension member that the pinned SDK types do not have, keyed by schema.field.
-func auditPublicFields(operations map[string]map[string]any, definitions map[string]any, pinned upstreamFields) map[string][]string {
-	audit := fieldAudit{definitions: definitions, types: pinned.Types, visited: map[string]bool{}, violations: map[string][]string{}}
-	for route, operation := range operations {
-		official, ok := pinned.Operations[route]
-		if !ok {
-			continue // The route set test reports it.
+func TestPublicSchemaPreservesOfficialDefinitions(t *testing.T) {
+	source := contractDocument(t, "upstream/openapi.json")
+	public := contractDocument(t, "openapi.yaml")
+	if public["openapi"] != "3.1.0" {
+		t.Fatal("public contract must retain OpenAPI 3.1")
+	}
+	upstream := source["components"].(map[string]any)["schemas"].(map[string]any)
+	schemas := public["components"].(map[string]any)["schemas"].(map[string]any)
+	owners := map[string]bool{"AgentResource": true, "CreateAgentParams": true, "UpdateAgentParams": true, "SessionAgentConfigParam": true, "SessionAgentResource": true, "CreateAgentSessionParams": true, "SessionResource": true}
+	for name, value := range schemas {
+		if strings.HasPrefix(name, "v1.") {
+			continue
 		}
-		form, query := map[string]any{}, map[string]any{}
-		for _, parameter := range asSlice(operation["parameters"]) {
-			parameter := parameter.(map[string]any)
-			switch parameter["in"] {
-			case "body":
-				audit.compare(route+" body", parameter["schema"].(map[string]any), official.Request)
-			case "formData":
-				form[parameter["name"].(string)] = map[string]any{}
-			case "query":
-				// The SDK sends list parameters with brackets, as status[].
-				query[strings.TrimSuffix(parameter["name"].(string), "[]")] = map[string]any{}
+		schema := value.(map[string]any)
+		properties, _ := schema["properties"].(map[string]any)
+		if _, exists := properties["x_agents_core"]; exists {
+			if !owners[name] {
+				t.Errorf("extension on unexpected resource %s", name)
 			}
+			delete(properties, "x_agents_core")
+			delete(owners, name)
 		}
-		if len(form) != 0 {
-			audit.compare(route+" form", map[string]any{"properties": form}, official.Request)
-		}
-		if len(query) != 0 {
-			audit.compare(route+" query", map[string]any{"properties": query}, official.Query)
+		if !reflect.DeepEqual(schema, upstream[name]) {
+			t.Errorf("official definition %s was changed", name)
 		}
-		for code, response := range asMap(operation["responses"]) {
-			if schema, ok := asMap(response)["schema"].(map[string]any); ok && strings.HasPrefix(code, "2") {
-				audit.compare(route+" response", schema, official.Response)
-			}
-		}
-	}
-	return audit.violations
-}
-
-func TestPublicOpenAPIFieldsAreOfficialOrCoreExtensions(t *testing.T) {
-	var pinned upstreamFields
-	readContractJSON(t, "upstream-fields.json", &pinned)
-	var routes struct {
-		Routes []string `json:"routes"`
-	}
-	readContractJSON(t, "upstream-routes.json", &routes)
-	var extracted []string
-	for route := range pinned.Operations {
-		extracted = append(extracted, route)
 	}
-	sort.Strings(extracted)
-	if !slices.Equal(extracted, routes.Routes) {
-		t.Fatalf("upstream-fields.json operations %v differ from the pinned routes %v", extracted, routes.Routes)
-	}
-	operations, definitions := publicOperations(t)
-	violations := auditPublicFields(operations, definitions, pinned)
-	for field, sources := range violations {
-		if _, ok := fieldPlacementPending[field]; !ok {
-			t.Errorf("%s is not an official field of %v; put Core-only fields inside x_agents_core", field, sources)
-		}
-	}
-	for field := range fieldPlacementPending {
-		if violations[field] == nil {
-			t.Errorf("resolved field %s is still listed in fieldPlacementPending", field)
-		}
+	if len(owners) != 0 {
+		t.Errorf("missing extension owners: %v", owners)
 	}
 }
 
-// The audit rejects a Core field outside x_agents_core, a new x_agents_core
-// member and x_agents_core on another resource.
-func TestPublicFieldAuditRejectsMisplacedCoreFields(t *testing.T) {
-	var pinned upstreamFields
-	readContractJSON(t, "upstream-fields.json", &pinned)
-	for _, test := range []struct {
-		definition, property, want string
-	}{
-		{"v1.SessionExecutionInput", "sandbox_node_id", "v1.CreateSessionRequest.x_agents_core.sandbox_node_id"},
-		{"v1.AgentsCore", "sandbox_node_id", "v1.Agent.x_agents_core.sandbox_node_id"},
-		{"v1.Vault", "x_agents_core", "v1.Vault.x_agents_core"},
-	} {
-		operations, definitions := publicOperations(t)
-		asMap(asMap(definitions[test.definition])["properties"])[test.property] = map[string]any{"type": "string"}
-		if violations := auditPublicFields(operations, definitions, pinned); violations[test.want] == nil {
-			t.Errorf("%s.%s was not reported as %s; got %v", test.definition, test.property, test.want, violations)
+func TestPublicOperationsPreserveOfficialContract(t *testing.T) {
+	source := contractDocument(t, "upstream/openapi.json")["paths"].(map[string]any)
+	published := contractDocument(t, "openapi.yaml")["paths"].(map[string]any)
+	count := 0
+	for path, item := range source {
+		if !(strings.HasPrefix(path, "/agents") || strings.HasPrefix(path, "/files") || strings.HasPrefix(path, "/skills") || strings.HasPrefix(path, "/vaults")) {
+			continue
 		}
-	}
-}
-
-// compare checks one of our schemas against the union of the official types
-// that describe the same value, following nested official models.
-func (a *fieldAudit) compare(name string, schema map[string]any, official []string) {
-	name, schema = a.resolve(name, schema)
-	key := name + "|" + strings.Join(official, ",")
-	if schema == nil || a.visited[key] {
-		return
-	}
-	a.visited[key] = true
-	for property, value := range a.properties(schema) {
-		var children []string
-		known := false
-		for _, typeName := range official {
-			if nested, ok := a.types[typeName][property]; ok {
-				known = true
-				for _, child := range nested {
-					if !slices.Contains(children, child) {
-						children = append(children, child)
-					}
-				}
-			}
+		actual, ok := published[path].(map[string]any)
+		if !ok {
+			t.Errorf("missing official path %s", path)
+			continue
 		}
-		switch {
-		case known && len(children) != 0:
-			sort.Strings(children)
-			a.compare(name+"."+property, value, children)
-		case known:
-		case property == "x_agents_core" && slices.Contains(coreExtensionOwners, name):
-			_, extension := a.resolve(name+"."+property, value)
-			for member := range a.properties(extension) {
-				if name == "v1.Session" && member == "installation" {
-					continue
+		for method, raw := range item.(map[string]any) {
+			expected := raw.(map[string]any)
+			operation := actual[method].(map[string]any)
+			if strings.HasPrefix(path, "/agents") || strings.HasPrefix(path, "/vaults") {
+				params := operation["parameters"].([]any)
+				beta := params[len(params)-1].(map[string]any)
+				if beta["name"] != "OpenAI-Beta" || beta["required"] != true {
+					t.Errorf("missing Beta header on %s %s", method, path)
 				}
-				if !slices.Contains(coreExtensionMembers, member) {
-					a.violations[name+".x_agents_core."+member] = coreExtensionMembers
+				if _, present := expected["parameters"]; len(params) == 1 && !present {
+					delete(operation, "parameters")
+				} else {
+					operation["parameters"] = params[:len(params)-1]
 				}
 			}
-		case slices.Contains(listEnvelopeFields, property) && slices.ContainsFunc(official, func(typeName string) bool { return strings.HasPrefix(typeName, "pagination.") }):
-		default:
-			a.violations[name+"."+property] = official
-		}
-	}
-}
 
-// resolve follows references, single allOf wrappers and arrays to the object
-// schema, naming it by its definition when it has one.
-func (a *fieldAudit) resolve(name string, schema map[string]any) (string, map[string]any) {
-	for schema != nil {
-		switch {
-		case schema["$ref"] != nil:
-			name = strings.TrimPrefix(schema["$ref"].(string), "#/definitions/")
-			schema = asMap(a.definitions[name])
-		case len(asSlice(schema["allOf"])) == 1:
-			schema = asMap(asSlice(schema["allOf"])[0])
-		case schema["items"] != nil:
-			schema = asMap(schema["items"])
-		default:
-			return name, schema
+			delete(expected, "security")
+			if !reflect.DeepEqual(operation, expected) {
+				t.Errorf("official operation changed: %s %s", method, path)
+			}
+			count++
 		}
+		delete(published, path)
 	}
-	return name, nil
-}
-
-func (a *fieldAudit) properties(schema map[string]any) map[string]map[string]any {
-	result := map[string]map[string]any{}
-	for property, value := range asMap(schema["properties"]) {
-		result[property] = asMap(value)
-	}
-	for _, part := range asSlice(schema["allOf"]) {
-		_, resolved := a.resolve("", asMap(part))
-		for property, value := range a.properties(resolved) {
-			result[property] = value
-		}
+	if count != 58 || len(published) != 0 {
+		t.Fatalf("expected pinned 58 operations, got %d, extra paths %v", count, published)
 	}
-	return result
-}
-
-func asMap(value any) map[string]any {
-	result, _ := value.(map[string]any)
-	return result
-}
-
-func asSlice(value any) []any {
-	result, _ := value.([]any)
-	return result
 }
diff --git a/contracts/agents-api/v1/usage.go b/contracts/agents-api/v1/usage.go
deleted file mode 100644
index d74752ec0..000000000
--- a/contracts/agents-api/v1/usage.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package v1
-
-type TokenUsage struct {
-	InputTokens         int64              `json:"input_tokens" binding:"required"`
-	InputTokensDetails  InputTokenDetails  `json:"input_tokens_details" binding:"required"`
-	OutputTokens        int64              `json:"output_tokens" binding:"required"`
-	OutputTokensDetails OutputTokenDetails `json:"output_tokens_details" binding:"required"`
-	TotalTokens         int64              `json:"total_tokens" binding:"required"`
-}
-type InputTokenDetails struct {
-	CachedTokens int64 `json:"cached_tokens" binding:"required"`
-}
-type OutputTokenDetails struct {
-	ReasoningTokens int64 `json:"reasoning_tokens" binding:"required"`
-}
diff --git a/contracts/agents-api/v1/vaults.go b/contracts/agents-api/v1/vaults.go
deleted file mode 100644
index 8ba62afc8..000000000
--- a/contracts/agents-api/v1/vaults.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package v1
-
-// CreateVaultRequest creates a project-owned credential container. An omitted
-// name stays null; a supplied name must be a string with 1–256 UTF-8 bytes after trimming.
-type CreateVaultRequest struct {
-	Name     *string            `json:"name,omitempty"`
-	Metadata map[string]*string `json:"metadata,omitempty" swaggertype:"object,string" extensions:"x-nullable"`
-}
-
-type Vault struct {
-	ID        string            `json:"id" binding:"required"`
-	Object    string            `json:"object" binding:"required" enums:"vault"`
-	CreatedAt int64             `json:"created_at" binding:"required"`
-	Name      *string           `json:"name" extensions:"x-nullable"`
-	Metadata  map[string]string `json:"metadata" binding:"required"`
-}
-
-type VaultList struct {
-	Object  string  `json:"object" binding:"required" enums:"list"`
-	Data    []Vault `json:"data" binding:"required"`
-	HasMore bool    `json:"has_more" binding:"required"`
-	FirstID *string `json:"first_id" extensions:"x-nullable"`
-	LastID  *string `json:"last_id" extensions:"x-nullable"`
-}
-
-type VaultDeleted struct {
-	ID      string `json:"id" binding:"required"`
-	Deleted bool   `json:"deleted" binding:"required"`
-	Object  string `json:"object" binding:"required" enums:"vault.deleted"`
-}
diff --git a/contracts/agents-api/zh/index.md b/contracts/agents-api/zh/index.md
index 1c7c70903..8fcf71028 100644
--- a/contracts/agents-api/zh/index.md
+++ b/contracts/agents-api/zh/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Agents API 覆盖台账"
 source: contracts/agents-api/index.md
-source_hash: a158d22b6c42b10baa3867b56611f281dc13fd98b676765bf4b36a7684d0795a
+source_hash: 7b56bd48dd80dc6b04909d0ee82fc873ff51bf4daeb8fbdd1570ad66a9349cd0
 ---
 
 Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[public API rule](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#public-api)）。本台账记录 Core 对各项资源实现了哪些内容、哪些契约保存其详细信息，并列出相对于 OpenAI 服务的所有已知差异和所有未解决缺口。[API namespaces and credentials](../../../docs/zh/api/index.md) 说明谁调用哪些 API；[Agents API guide](../../../docs/zh/api/public-agent-api.md) 介绍使用方法。
@@ -11,10 +11,19 @@ Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[publi
 | 文件 | 内容 |
 | --- | --- |
 | [upstream.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream.json) | 固定版本：提交 `d7c41ef` 时的 [openai-python](https://github.com/openai/openai-python/tree/d7c41efee1b0802b79f3f88a678ef2052b06e9ce/src/openai/resources/beta/agents) 3.13.0；资源位于 `beta/agents` 下；Beta 标头为 `agents=v1` |
-| [upstream-routes.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream-routes.json)、[upstream-fields.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream-fields.json) | 58 组方法与路径及其官方字段：`beta/agents` 下的 42 个操作、5 个 Files 操作和 11 个 Skills 操作。`scripts/extract-agents-api-upstream.py` 从固定版本的 SDK 中提取这些内容；安装该 SDK 后运行此脚本 |
-| [openapi.yaml](../openapi.yaml) | Core 的公共架构，由 `make openapi` 根据 `services/core/internal/api/` 中的路由注解以及 [`v1/`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/contracts/agents-api/v1) 中的传输类型生成 |
+| [upstream/openapi.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream/openapi.json) | 未修改的官方 OpenAPI 3.1，固定提交为 `046a2a0f325bf11f97966f2729219f27281ba71e`，发布于 2026-09-10。其中 58 个 Agents、Vaults、Files 和 Skills 操作与固定 SDK 的路由集合一致。`upstream.json` 记录 SHA-256 校验和 |
+| [upstream-routes.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream-routes.json) | 从官方 schema 生成的标准化方法和路径清单 |
+| [openapi.yaml](../openapi.yaml) | 官方公共契约，并在 Agent 和 Session 请求及响应对象上加入 Core 的 `x_agents_core` 扩展 |
+| [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go 名称、字段表示、编码顺序和存储投影；不定义官方字段集合、枚举或约束 |
+
+运行 `make openapi` 重新生成公共 Go 类型、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
+
+公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；已有存储或自定义 JSON 编码需要特定表示时，由 `go-bindings.json` 控制其 Go 表示。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、请求准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
+
+官方源文件与已有服务存在以下已记录的差异：Agents 鉴权错误的 `code` 可以为 null；Files 空页的 `first_id` 和 `last_id` 为 null；File 资源的 `expires_at` 和 `status_details` 可以为 null。源文件将这些字段声明为非空。官方客户端响应验证器只对这些指定字段允许 null，其余部分按 OpenAPI 3.1 响应 schema 验证。源文件中的 Files 和 Skills 操作未声明错误响应，因此这些错误体使用上游共享的 `ErrorResponse` schema。[传输语义](wire-semantics.md)和原始 HTTP 测试验证服务行为；发布的 schema 保留官方定义。
+
+Go 输入投影排除 `packages.system`，保留下方记录的明确拒绝行为。生成过程不会启用尚未支持的操作，也不会改变已存储安装配置的验证。
 
-契约测试确保 Core 符合固定版本：路由器和 `openapi.yaml` 提供的路由与固定版本完全一致（`services/core/internal/api/routing_test.go`、`v1/upstream_contract_test.go`），每个查询参数和字段都采用官方定义，而 Core 专有字段仅位于 Agents 和 Sessions 内部的 `x_agents_core` 中。Swagger 2.0 无法表达字符串或数组联合类型，因此 `openapi.yaml` 不对 Session 的 `input` 和函数结果的 `output` 施加约束；这些类型由固定版本的类型定义和 Core 的校验逻辑确定。晚于该固定版本的操作和字段需等待协议升级。
 
 各项状态的证据必须来自固定版本的官方 SDK，以及针对运行中服务发出的原始 HTTP 请求，正如 [CONTRIBUTING](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#compatibility-evidence) 所要求。
 
diff --git a/docs/development.md b/docs/development.md
index 68b2cffd7..b97990f00 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -92,7 +92,7 @@ Choose focused checks for the current diff and its directly affected behavior us
 | --- | --- |
 | Core handlers, persistence or clients | `make check-core` |
 | SQL queries | `make sqlc-generate`, inspect generated files, then `make check-sqlc` |
-| Handler annotations or API contract | `make openapi`, inspect all three namespace schemas |
+| Public schema, Core extensions or internal handler annotations | `make openapi`, `make check-openapi`; inspect generated types and all three namespace schemas |
 | Shared Runtime protocol | `make check-runtime-contract` |
 | Provider integration | `make check-sandbox-provider-contract` and the provider's native checks |
 | Claude SDK bridge and artifact | `make check-claude-sdk` |
diff --git a/docs/zh/development.md b/docs/zh/development.md
index 5e6008e97..ad8c70264 100644
--- a/docs/zh/development.md
+++ b/docs/zh/development.md
@@ -1,7 +1,7 @@
 ---
 title: "开发 OpenAgentCore"
 source: docs/development.md
-source_hash: ddc74c5f4b9766690c0ed35743d391cadd8025c1842ba279ab5f990b6b6980ce
+source_hash: 70dc4a684bc017d14ac9df87948220e2dd19fb82918edf44d695494ea7f62de0
 ---
 
 准备工作副本，构建组件并验证修改。如需使用已安装的实例，从[入门指南](getting-started/index.md)开始。修改代码前阅读[贡献者规则](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md)。
@@ -94,7 +94,7 @@ Core 构建产物和输出目录设置见[独立 Core 构建](maintainers.md#sta
 | --- | --- |
 | Core handler、持久化或 client | `make check-core` |
 | SQL 查询 | `make sqlc-generate`，检查生成文件，再运行 `make check-sqlc` |
-| Handler annotation 或 API 契约 | `make openapi`，检查三个命名空间的 schema |
+| 公共 schema、Core 扩展或内部处理函数注解 | `make openapi`、`make check-openapi`；检查生成类型和三个命名空间的 schema |
 | 共享 Runtime 协议 | `make check-runtime-contract` |
 | Provider 集成 | `make check-sandbox-provider-contract` 和 provider 的原生检查 |
 | Claude SDK bridge 与产物 | `make check-claude-sdk` |
diff --git a/scripts/ci_plan.py b/scripts/ci_plan.py
index b8356b4fc..02f0f47f6 100644
--- a/scripts/ci_plan.py
+++ b/scripts/ci_plan.py
@@ -83,7 +83,7 @@
      SCRIPTS, ("harness", "native", "backend", "distribution")),
     (("scripts/build-codex-runtime.sh",), (".sh",), ("backend", "native", "distribution")),
     (("scripts/generate-harness-catalog", "scripts/harness-catalog/", "scripts/openapi-split/", "scripts/patch-agents-openapi.py",
-      "scripts/extract-agents-api-upstream.py"), SCRIPTS, JOBS),
+      "scripts/generate-public-api"), SCRIPTS, JOBS),
     (("scripts/check-sqlc.py", "scripts/go-test-shard.py"), (".py",), ("backend",)),
     (("scripts/check-names", "scripts/name-allowlist.json", "scripts/ci_"), (".py", ".json"), ("hygiene",)),
     ((".github/workflows/", ".github/actions/"), (".yml", ".yaml"), JOBS),
diff --git a/scripts/extract-agents-api-upstream.py b/scripts/extract-agents-api-upstream.py
deleted file mode 100644
index b35c3bd34..000000000
--- a/scripts/extract-agents-api-upstream.py
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/usr/bin/env python3
-"""Extract the pinned official Agents API route set and field names.
-
-Run this with a Python environment where the OpenAI Python SDK version pinned in
-contracts/agents-api/upstream.json is installed (``pip install openai==3.13.0``
-from that commit). It reads only the installed SDK source and types:
-
-    python3 scripts/extract-agents-api-upstream.py \
-        contracts/agents-api/upstream.json contracts/agents-api
-
-and writes ``upstream-routes.json`` and ``upstream-fields.json`` to the output
-directory. The public contract covers the Beta Agents resources
-(``openai.resources.beta.agents``), Files (``openai.resources.files``) and
-Skills (``openai.resources.skills``); see docs/api/public-agent-api.md.
-
-Routes come from each synchronous resource method's ``self._get``/``_post``/
-``_delete``/``_get_api_list`` call, with path parameters normalised to ``{}``.
-Field names come from the request params TypedDicts (``body=maybe_transform``),
-the query params TypedDicts (``make_request_options(query=maybe_transform(...))``)
-and the response models (``cast_to`` or ``page``) of the same calls, followed
-through nested models, TypedDicts, lists and unions. JSON names use the SDK's
-wire alias. Page wrappers are the SDK's hand-written classes, not generated
-wire types.
-"""
-
-import ast
-import importlib
-import inspect
-import json
-import pkgutil
-import re
-import sys
-import typing
-from pathlib import Path
-
-import openai
-import pydantic
-import typing_extensions
-from openai._utils import PropertyInfo
-
-RESOURCE_PACKAGES = ("openai.resources.beta.agents", "openai.resources.files", "openai.resources.skills")
-HTTP_CALLS = {"_get": "GET", "_post": "POST", "_delete": "DELETE", "_put": "PUT", "_patch": "PATCH", "_get_api_list": "GET"}
-PARAMETER = re.compile(r"\{[^}]*\}")
-
-
-def modules():
-    for name in RESOURCE_PACKAGES:
-        package = importlib.import_module(name)
-        yield package
-        if hasattr(package, "__path__"):
-            for info in pkgutil.walk_packages(package.__path__, name + "."):
-                yield importlib.import_module(info.name)
-
-
-def literal_path(node):
-    if isinstance(node, ast.Call) and getattr(node.func, "id", None) == "path_template":
-        node = node.args[0]
-    if isinstance(node, ast.Constant) and isinstance(node.value, str):
-        return PARAMETER.sub("{}", node.value)
-    if isinstance(node, ast.JoinedStr):
-        return "".join(part.value if isinstance(part, ast.Constant) else "{}" for part in node.values)
-    raise ValueError(f"unsupported path expression {ast.unparse(node)}")
-
-
-def evaluate(node, namespace):
-    return eval(compile(ast.Expression(node), "<sdk>", "eval"), namespace)  # SDK-owned names only
-
-
-def is_model(value):
-    return inspect.isclass(value) and (issubclass(value, pydantic.BaseModel) or typing_extensions.is_typeddict(value))
-
-
-def type_id(value):
-    generic = getattr(value, "__pydantic_generic_metadata__", None) or {}
-    if generic.get("origin") is not None:
-        items = sorted(type_id(item) for argument in generic["args"] for item in references(argument))
-        return f"{type_id(generic['origin'])}[{' | '.join(items)}]"
-    module = value.__module__.removeprefix("openai.").removeprefix("types.")
-    return f"{module}.{value.__qualname__}"
-
-
-def references(annotation):
-    """Return nested model and TypedDict classes, unwrapping aliases and containers."""
-    if is_model(annotation):
-        return [annotation]
-    origin = typing_extensions.get_origin(annotation)
-    if origin is None or origin in (typing.Literal, typing_extensions.Literal):
-        return []
-    found = []
-    arguments = typing_extensions.get_args(annotation)
-    if origin in (typing.Annotated, typing_extensions.Annotated):
-        arguments = arguments[:1]
-    for argument in arguments:
-        found.extend(value for value in references(argument) if value not in found)
-    return found
-
-
-def alias(annotation, name):
-    if typing_extensions.get_origin(annotation) in (typing.Annotated, typing_extensions.Annotated):
-        for metadata in typing_extensions.get_args(annotation)[1:]:
-            if isinstance(metadata, PropertyInfo) and metadata.alias:
-                return metadata.alias
-    return name
-
-
-def fields(value):
-    if typing_extensions.is_typeddict(value):
-        hints = typing_extensions.get_type_hints(value, include_extras=True)
-        return {alias(annotation, name): annotation for name, annotation in hints.items()}
-    return {field.alias or name: field.annotation for name, field in value.model_fields.items()}
-
-
-def keyword_value(call, name):
-    return next((keyword.value for keyword in call.keywords if keyword.arg == name), None)
-
-
-def request_types(call, namespace, name="body"):
-    """Return the params types transformed into the call's body, or its query."""
-    value = keyword_value(call, "body") if name == "body" else None
-    if name == "query":
-        options = keyword_value(call, "options")
-        if isinstance(options, ast.Call):
-            value = keyword_value(options, "query")
-    found = []
-    for node in ast.walk(value) if value is not None else []:
-        if isinstance(node, ast.Call) and getattr(node.func, "id", "").endswith("maybe_transform") and len(node.args) == 2:
-            for candidate in ast.walk(node.args[1]):
-                if isinstance(candidate, ast.Attribute):
-                    found.extend(value for value in references(evaluate(candidate, namespace)) if value not in found)
-    return found
-
-
-def response_types(call, namespace):
-    for keyword in call.keywords:
-        if keyword.arg == "page":
-            return [evaluate(keyword.value, namespace)]
-        if keyword.arg == "cast_to":
-            node = keyword.value
-            if isinstance(node, ast.Call) and getattr(node.func, "id", None) == "cast":
-                node = node.args[1]
-            return references(evaluate(node, namespace))
-    return []
-
-
-def operations():
-    found = {}
-    for module in modules():
-        tree = ast.parse(inspect.getsource(module))
-        for resource in tree.body:
-            if not isinstance(resource, ast.ClassDef) or not any(getattr(base, "id", None) == "SyncAPIResource" for base in resource.bases):
-                continue
-            for call in ast.walk(resource):
-                if not (isinstance(call, ast.Call) and isinstance(call.func, ast.Attribute) and call.func.attr in HTTP_CALLS
-                        and getattr(call.func.value, "id", None) == "self"):
-                    continue
-                route = f"{HTTP_CALLS[call.func.attr]} {literal_path(call.args[0])}"
-                entry = found.setdefault(route, {"request": [], "query": [], "response": []})
-                namespace = vars(module)
-                for key, values in (("request", request_types(call, namespace)), ("query", request_types(call, namespace, "query")),
-                                    ("response", response_types(call, namespace))):
-                    entry[key].extend(value for value in values if value not in entry[key])
-    return found
-
-
-def main():
-    if len(sys.argv) != 3:
-        sys.exit("usage: extract-agents-api-upstream.py UPSTREAM_JSON OUTPUT_DIRECTORY")
-    pin = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8"))
-    if openai.__version__ != pin["sdk_version"]:
-        sys.exit(f"installed openai {openai.__version__} does not match pinned {pin['sdk_version']}")
-    found = operations()
-    header = {"sdk_version": pin["sdk_version"], "commit": pin["commit"], "generator": "scripts/extract-agents-api-upstream.py"}
-    types, pending = {}, [value for entry in found.values() for key in ("request", "query", "response") for value in entry[key]]
-    while pending:
-        value = pending.pop()
-        if type_id(value) in types:
-            continue
-        nested = {}
-        for name, annotation in fields(value).items():
-            children = references(annotation)
-            nested[name] = sorted(type_id(child) for child in children)
-            pending.extend(children)
-        types[type_id(value)] = dict(sorted(nested.items()))
-    output = Path(sys.argv[2])
-    routes = {**header, "resources": list(RESOURCE_PACKAGES), "routes": sorted(found)}
-    (output / "upstream-routes.json").write_text(json.dumps(routes, indent=2) + "\n", encoding="utf-8")
-    operation_types = {route: {key: sorted(type_id(value) for value in entry[key]) for key in ("request", "query", "response")} for route, entry in sorted(found.items())}
-    document = {**header, "operations": operation_types, "types": dict(sorted(types.items()))}
-    (output / "upstream-fields.json").write_text(json.dumps(document, indent=2) + "\n", encoding="utf-8")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/generate-harness-catalog.test.py b/scripts/generate-harness-catalog.test.py
index f58e5e079..a0ff636c3 100644
--- a/scripts/generate-harness-catalog.test.py
+++ b/scripts/generate-harness-catalog.test.py
@@ -55,6 +55,10 @@ def test_checked_in_openapi_enums_match_catalog(self):
             text = (catalog.ROOT / "contracts/agents-api" / surface).read_text()
             for definition, member in fields:
                 with self.subTest(surface=surface, definition=definition):
+                    if surface == "openapi.yaml":
+                        actual = json.loads(text)["components"]["schemas"][definition]["properties"][member]["enum"]
+                        self.assertEqual(actual, expected)
+                        continue
                     body = re.search(r"^  " + re.escape(definition) + r":\n(.*?)(?=^  [^ ]|\Z)", text, re.M | re.S)
                     self.assertIsNotNone(body, "missing schema; run make openapi")
                     field = re.search(r"^      " + member + r":\n(.*?)(?=^      [^ ]|^    [^ ]|\Z)", body.group(1), re.M | re.S)
diff --git a/scripts/generate-public-api.py b/scripts/generate-public-api.py
new file mode 100644
index 000000000..9df4b2fce
--- /dev/null
+++ b/scripts/generate-public-api.py
@@ -0,0 +1,276 @@
+#!/usr/bin/env python3
+"""Project the pinned OpenAPI into Core's public contract and Go wire types."""
+import argparse
+import copy
+import hashlib
+import json
+from pathlib import Path
+import re
+import subprocess
+
+ROOT = Path(__file__).resolve().parents[1]
+CONTRACT = ROOT / 'contracts/agents-api'
+HTTP_METHODS = {'get', 'post', 'put', 'patch', 'delete', 'head', 'options'}
+
+
+def read_source():
+    pin = json.loads((CONTRACT / 'upstream.json').read_text())
+    raw = (CONTRACT / 'upstream/openapi.json').read_bytes()
+    if hashlib.sha256(raw).hexdigest() != pin['openapi']['sha256']:
+        raise ValueError('Official OpenAPI checksum differs from upstream.json')
+    return json.loads(raw), pin
+
+
+def resolve(document, pointer):
+    value = document
+    for key in pointer.removeprefix('#/').split('/'):
+        value = value[key.replace('~1', '/').replace('~0', '~')]
+    return value
+
+
+def dereference(document, schema):
+    if '$ref' in schema:
+        return {**resolve(document, schema['$ref']), **{k: v for k, v in schema.items() if k != '$ref'}}
+    return schema
+
+
+def variants(document, schema):
+    schema = dereference(document, schema)
+    for keyword in ('oneOf', 'anyOf'):
+        if keyword in schema:
+            return [v for part in schema[keyword] for v in variants(document, part)]
+    return [schema]
+
+
+def object_fields(document, sources):
+    objects = [v for source in sources for v in variants(document, resolve(document, source))]
+    properties = {}
+    required = None
+    for obj in objects:
+        if obj.get('type') == 'null':
+            continue
+        if 'properties' not in obj:
+            raise ValueError(f'Expected object projection: {sources}')
+        required = set(obj.get('required', [])) if required is None else required & set(obj.get('required', []))
+        for name, schema in obj['properties'].items():
+            if name not in properties:
+                properties[name] = []
+            if schema not in properties[name]:
+                properties[name].append(schema)
+    return {k: v[0] if len(v) == 1 else {'anyOf': v} for k, v in properties.items()}, required or set()
+
+
+def nullable(document, schema):
+    return any(v.get('type') == 'null' or isinstance(v.get('type'), list) and 'null' in v['type'] for v in variants(document, schema))
+
+
+def go_name(name):
+    initials = {'id': 'ID', 'ids': 'IDs', 'url': 'URL', 'api': 'API', 'mcp': 'MCP', 'npm': 'NPM', 'ms': 'MS', 'oauth': 'OAuth'}
+    return ''.join(initials.get(part, part.capitalize()) for part in name.split('_'))
+
+
+def go_type(document, schema, aliases):
+    ref = schema.get('$ref')
+    if ref in aliases:
+        return aliases[ref]
+    values = [v for v in variants(document, schema) if v.get('type') != 'null']
+    if len(values) != 1:
+        types = {go_type(document, v, aliases) for v in values}
+        return types.pop() if len(types) == 1 else 'json.RawMessage'
+    value = values[0]
+    kind = value.get('type')
+    if isinstance(kind, list):
+        kinds = set(kind) - {'null'}
+        kind = kinds.pop() if len(kinds) == 1 else None
+    if kind == 'array':
+        return '[]' + go_type(document, value['items'], aliases)
+    if kind == 'object':
+        extra = value.get('additionalProperties')
+        return 'map[string]' + go_type(document, extra, aliases) if isinstance(extra, dict) and not value.get('properties') else 'json.RawMessage'
+    return {'string': 'string', 'integer': 'int64', 'number': 'float64', 'boolean': 'bool'}.get(kind, 'json.RawMessage')
+
+
+def field_type(document, schema, required, aliases):
+    result = go_type(document, schema, aliases)
+    if (not required or nullable(document, schema)) and not result.startswith(('[]', 'map[', '*')) and result != 'json.RawMessage':
+        result = '*' + result
+    return result
+
+
+def enum_values(document, schema):
+    values = []
+    for variant in variants(document, schema):
+        for value in variant.get('enum', []):
+            if value is not None and value not in values:
+                values.append(value)
+    return values
+
+
+def union_marshaler(document, name, binding, field_types):
+    schema = resolve(document, binding['sources'][0])
+    discriminator = schema['discriminator']['propertyName']
+    selector = binding.get('fields', {}).get(discriminator, {}).get('name', go_name(discriminator))
+    lines = [f'func (value {name}) MarshalJSON() ([]byte, error) {{', f'switch value.{selector} {{']
+    for variant in variants(document, schema):
+        tag, = variant['properties'][discriminator]['enum']
+        lines += [f'case {json.dumps(tag)}:', 'return json.Marshal(struct {']
+        for field in variant['properties']:
+            go_field, typ = field_types[field]
+            omit = '' if field in variant.get('required', []) else ',omitempty'
+            lines.append(f'{go_field} {typ} `json:"{field}{omit}"`')
+        lines.append('}{')
+        for field in variant['properties']:
+            go_field, _ = field_types[field]
+            lines.append(f'{go_field}: value.{go_field},')
+        lines.append('})')
+    lines += ['default:', f'return nil, fmt.Errorf("invalid {name} {discriminator} %q", value.{selector})', '}', '}']
+    return lines
+
+
+def go_types(document, bindings):
+    aliases = {}
+    for name, binding in sorted(bindings.items()):
+        if len(binding['sources']) == 1:
+            aliases.setdefault(binding['sources'][0], name)
+    lines = ['// Code generated by scripts/generate-public-api.py; DO NOT EDIT.', 'package v1', 'import "encoding/json"', '']
+    if any(binding.get('marshal_union') for binding in bindings.values()):
+        lines.append('import "fmt"')
+    for name, binding in sorted(bindings.items()):
+        properties, required = object_fields(document, binding['sources'])
+        overrides = binding.get('fields', {})
+        unknown = set(overrides) - set(properties) - {'x_agents_core'}
+        if unknown:
+            raise ValueError(f'{name}: bindings for missing official fields {unknown}')
+        lines += [f'// {name} projects ' + ', '.join(s.split('/')[-1] for s in binding['sources']) + '.', f'type {name} struct {{']
+        field_types = {}
+        embedded = set()
+        for embed, fields in binding.get('embed', {}).items():
+            lines.append('\t' + embed)
+            embedded.update(fields)
+        for field in dict.fromkeys(binding.get("order", []) + list(properties)):
+            if field in embedded or field in binding.get('exclude', []):
+                continue
+            if field == "x_agents_core":
+                lines.append('\tXAgentsCore ' + overrides[field]['type'] + ' `json:"x_agents_core,omitempty"`')
+                continue
+            schema = properties[field]
+            override = overrides.get(field, {})
+            typ = override.get('type', field_type(document, schema, field in required, aliases))
+            omit = override.get('omit', field not in required)
+            tags = ['json:"' + field + (',omitempty' if omit else '') + '"']
+            if field in required:
+                tags.append('binding:"required"')
+            if nullable(document, schema):
+                tags.append('extensions:"x-nullable"')
+            enums = enum_values(document, schema)
+            if enums:
+                tags.append('enums:"' + ','.join(str(v).lower() if isinstance(v, bool) else str(v) for v in enums) + '"')
+            # Swag still projects the internal APIs that reference these types.
+            if 'json.RawMessage' in typ:
+                tags.append('swaggertype:"' + ('array,object' if typ.lstrip('*').startswith('[]') else 'object') + '"')
+            field_types[field] = (override.get('name', go_name(field)), typ)
+            lines.append('\t' + field_types[field][0] + ' ' + typ + ' `' + ' '.join(tags) + '`')
+        lines.append('}\n')
+        if binding.get('marshal_union'):
+            lines.extend(union_marshaler(document, name, binding, field_types))
+    return subprocess.run(['gofmt'], input='\n'.join(lines).encode(), stdout=subprocess.PIPE, check=True).stdout
+
+
+def prune_components(document):
+    needed = set()
+    def walk(value):
+        if isinstance(value, dict):
+            ref = value.get('$ref')
+            if ref and ref not in needed:
+                if not ref.startswith('#/components/'):
+                    raise ValueError(f'Non-local reference: {ref}')
+                needed.add(ref)
+                walk(resolve(document, ref))
+            # Discriminator mappings are references too.
+            if 'discriminator' in value:
+                for ref in value['discriminator'].get('mapping', {}).values():
+                    walk({'$ref': ref})
+            for child in value.values():
+                walk(child)
+        elif isinstance(value, list):
+            for child in value:
+                walk(child)
+    walk(document['paths'])
+    document['components'] = {section: {k: v for k, v in values.items() if '#/components/' + section + '/' + k in needed} for section, values in document['components'].items()}
+    document['components']['securitySchemes'] = {'ProjectKey': {'type': 'http', 'scheme': 'bearer', 'description': 'OpenAgentCore Project API key.'}}
+
+
+def extension_owners(bindings):
+    owners = {}
+    for binding in bindings.values():
+        extension = binding.get("fields", {}).get("x_agents_core")
+        if extension:
+            for source in binding["sources"]:
+                owners[source.split("/")[-1]] = extension["type"].lstrip("*")
+    return owners
+
+
+def public_document(source, extensions, owners, beta_header):
+    doc = copy.deepcopy(source)
+    doc['info'] = {'title': 'OpenAgentCore public API', 'version': 'v1', 'description': 'The pinned OpenAI Agents, Files and Skills API with x_agents_core extensions. See the coverage ledger for implementation qualification.'}
+    doc['servers'] = [{'url': '/v1'}]
+    doc['security'] = [{'ProjectKey': []}]
+    doc['paths'] = {p: v for p, v in doc['paths'].items() if p.split('/')[1] in ('agents', 'vaults', 'files', 'skills')}
+    for path, item in doc['paths'].items():
+        for method, operation in item.items():
+            if method not in HTTP_METHODS:
+                continue
+            operation.pop('security', None)
+            if path.split('/')[1] in ('agents', 'vaults'):
+                operation['parameters'] = operation.get('parameters', []) + [{'name': 'OpenAI-Beta', 'in': 'header', 'required': True, 'schema': {'type': 'string', 'const': beta_header}}]
+    # Extensions are authored in Core's Go types and projected by swag. Official
+    # properties are never rewritten to accommodate a narrower implementation.
+    def convert(value):
+        if isinstance(value, list):
+            return [convert(v) for v in value]
+        if not isinstance(value, dict):
+            return value
+        result = {k: convert(v) for k, v in value.items() if k != 'x-nullable'}
+        if '$ref' in result:
+            result['$ref'] = result['$ref'].replace('#/definitions/', '#/components/schemas/')
+        if value.get('x-nullable'):
+            return {'anyOf': [result, {'type': 'null'}]}
+        return result
+    doc['components']['schemas'].update({k: convert(v) for k, v in extensions.items()})
+    for name, extension in owners.items():
+        doc['components']['schemas'][name]['properties']['x_agents_core'] = {'anyOf': [{'$ref': '#/components/schemas/v1.' + extension}, {'type': 'null'}]}
+    prune_components(doc)
+    return doc
+
+
+def write(path, data, check):
+    if check:
+        if not path.exists() or path.read_bytes() != data:
+            raise ValueError(f'{path.relative_to(ROOT)} is stale; run make openapi')
+    else:
+        path.write_bytes(data)
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('--check', action='store_true')
+    parser.add_argument('--swag-roots', type=Path, help='Temporary entry points for Go-owned extension types')
+    parser.add_argument('--extensions', type=Path, help='JSON definitions projected from Core extension types')
+    args = parser.parse_args()
+    source, pin = read_source()
+    bindings = json.loads((CONTRACT / 'go-bindings.json').read_text())
+    write(CONTRACT / 'v1/official.gen.go', go_types(source, bindings), args.check)
+    owners = extension_owners(bindings)
+    if args.swag_roots:
+        roots = 'package extensions\n\n' + '\n'.join(f'// @Success 200 {{object}} v1.{name}' for name in sorted(set(owners.values()))) + '\nfunc extensions() {}\n'
+        args.swag_roots.write_text(roots)
+    if args.extensions:
+        doc = public_document(source, json.loads(args.extensions.read_text()), owners, pin["beta_header"])
+        # JSON is a YAML subset and keeps generation independent of PyYAML.
+        write(CONTRACT / 'openapi.yaml', (json.dumps(doc, indent=2, ensure_ascii=False) + '\n').encode(), args.check)
+        routes = sorted(method.upper() + ' ' + re.sub(r'\{[^}]*\}', '{}', path) for path, item in doc['paths'].items() for method in item if method in HTTP_METHODS)
+        write(CONTRACT / 'upstream-routes.json', (json.dumps({'openapi_commit': pin['openapi']['commit'], 'generator': 'scripts/generate-public-api.py', 'routes': routes}, indent=2) + '\n').encode(), args.check)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/generate-public-api.test.py b/scripts/generate-public-api.test.py
new file mode 100644
index 000000000..531d205f8
--- /dev/null
+++ b/scripts/generate-public-api.test.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+"""Regression tests for the official schema projection and extension boundary."""
+import copy
+import importlib.util
+import json
+from pathlib import Path
+import unittest
+
+spec = importlib.util.spec_from_file_location('public_api', Path(__file__).with_name('generate-public-api.py'))
+generator = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(generator)
+
+
+class PublicAPITests(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.source, cls.pin = generator.read_source()
+        cls.bindings = json.loads((generator.CONTRACT / 'go-bindings.json').read_text())
+        cls.public = json.loads((generator.CONTRACT / 'openapi.yaml').read_text())
+
+    def test_generated_types_are_current(self):
+        self.assertEqual(generator.go_types(self.source, self.bindings), (generator.CONTRACT / 'v1/official.gen.go').read_bytes())
+
+    def test_public_projection_is_current_and_keeps_source_immutable(self):
+        source = copy.deepcopy(self.source)
+        extensions = {k: v for k, v in self.public['components']['schemas'].items() if k.startswith('v1.')}
+        actual = generator.public_document(source, extensions, generator.extension_owners(self.bindings), self.pin["beta_header"])
+        self.assertEqual(actual, self.public)
+        self.assertEqual(source, self.source)
+
+    def test_union_and_nullable_fields_keep_the_official_schema(self):
+        schemas = self.public['components']['schemas']
+        self.assertIn('anyOf', schemas['CreateAgentSessionParams']['properties']['input'])
+        self.assertIn('oneOf', schemas['SessionTurnItemResource'])
+        self.assertIn('discriminator', schemas['SessionEvent'])
+        self.assertEqual(schemas['AgentResource']['required'], self.source['components']['schemas']['AgentResource']['required'])
+
+    def test_extensions_are_optional_and_reachable(self):
+        schemas = self.public['components']['schemas']
+        for owner, extension in generator.extension_owners(self.bindings).items():
+            self.assertNotIn('x_agents_core', schemas[owner].get('required', []))
+            self.assertEqual(schemas[owner]['properties']['x_agents_core'], {'anyOf': [{'$ref': '#/components/schemas/v1.' + extension}, {'type': 'null'}]})
+            self.assertIn('v1.' + extension, schemas)
+        self.assertIn('model_provider', schemas['v1.SessionExecutionInput']['properties'])
+        self.assertNotIn('api.CoreHarness', schemas)
+
+    def test_new_official_fields_reach_go_without_a_second_field_list(self):
+        source = copy.deepcopy(self.source)
+        source['components']['schemas']['VaultResource']['properties']['future_field'] = {'type': ['string', 'null']}
+        generated = generator.go_types(source, self.bindings).decode()
+        self.assertIn('FutureField *string', generated)
+        self.assertIn('json:"future_field,omitempty"', generated)
+
+    def test_stale_binding_cannot_add_a_public_field(self):
+        bindings = copy.deepcopy(self.bindings)
+        bindings['Vault']['fields'] = {'private_data': {'type': 'string'}}
+        with self.assertRaisesRegex(ValueError, 'missing official fields'):
+            generator.go_types(self.source, bindings)
+
+    def test_beta_header_is_only_required_on_beta_resources(self):
+        for path, item in self.public['paths'].items():
+            for method, operation in item.items():
+                if method in generator.HTTP_METHODS:
+                    headers = [p for p in operation.get('parameters', []) if p.get('name') == 'OpenAI-Beta']
+                    self.assertEqual(bool(headers), path.split('/')[1] in ('agents', 'vaults'))
+
+    def test_optional_nullable_and_union_representation(self):
+        self.assertEqual(generator.field_type({}, {'type': ['string', 'null']}, True, {}), '*string')
+        self.assertEqual(generator.field_type({}, {'type': 'boolean'}, False, {}), '*bool')
+        self.assertEqual(generator.field_type({}, {'type': 'array', 'items': {'type': 'string'}}, True, {}), '[]string')
+        self.assertEqual(generator.go_type({}, {'oneOf': [{'type': 'string'}, {'type': 'integer'}]}, {}), 'json.RawMessage')
+
+    def test_every_public_reference_resolves_and_no_other_apis_leak(self):
+        self.assertEqual({p.split('/')[1] for p in self.public['paths']}, {'agents', 'vaults', 'files', 'skills'})
+        generator.prune_components(copy.deepcopy(self.public))
+        self.assertEqual(self.public['security'], [{'ProjectKey': []}])
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/scripts/name-allowlist.json b/scripts/name-allowlist.json
index b2bd58c18..c29a4637e 100644
--- a/scripts/name-allowlist.json
+++ b/scripts/name-allowlist.json
@@ -44,11 +44,6 @@
     "regex": "parsar-core-runtime@",
     "reason": "The guarded up/down data migration must recognize and restore the historical stored Runtime reference prefix."
   },
-  {
-    "path": "*",
-    "regex": "(?:scripts/)?extract-agents-api-upstream\\.py",
-    "reason": "The upstream contract extraction helper names the pinned OpenAI Agents API protocol, not an installed command."
-  },
   {
     "path": "*",
     "regex": "https://developers\\.openai\\.com/api/docs/guides/agents-api(?:/[A-Za-z0-9_./-]*)?",
diff --git a/scripts/openapi-split/main.go b/scripts/openapi-split/main.go
index 5a3d9236f..66d4f7438 100644
--- a/scripts/openapi-split/main.go
+++ b/scripts/openapi-split/main.go
@@ -1,10 +1,11 @@
-// Command openapi-split separates the generated document by namespace: the
-// application API (/v1), the Core API (/core/v1) and machine connections
-// (/api/v1) each get their own document.
+// Command openapi-split emits internal contracts and exports Go definitions
+// for the public contract extension overlay.
 package main
 
 import (
 	"bytes"
+	"encoding/json"
+	"flag"
 	"fmt"
 	"os"
 	"strings"
@@ -19,83 +20,68 @@ const (
 )
 
 func main() {
-	if len(os.Args) != 5 {
-		fmt.Fprintln(os.Stderr, "usage: openapi-split INPUT PROJECT_OUTPUT CORE_OUTPUT RUNTIME_OUTPUT")
+	check := flag.Bool("check", false, "check generated internal contracts without changing them")
+	flag.Parse()
+	if flag.NArg() != 4 {
+		fmt.Fprintln(os.Stderr, "usage: openapi-split [--check] INPUT EXTENSIONS_OUTPUT CORE_OUTPUT RUNTIME_OUTPUT")
 		os.Exit(1)
 	}
-	if err := run(os.Args[1], os.Args[2], os.Args[3], os.Args[4]); err != nil {
+	if err := run(flag.Arg(0), flag.Arg(1), flag.Arg(2), flag.Arg(3), *check); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 }
-func run(input, projectOutput, coreOutput, runtimeOutput string) error {
+
+// run exports Go-owned definitions for the public extension overlay and emits
+// the two internal contracts. Public operations come only from official OpenAPI.
+func run(input, extensionOutput, coreOutput, runtimeOutput string, check bool) error {
 	raw, err := os.ReadFile(input)
 	if err != nil {
 		return err
 	}
-	var project, core, runtime yaml.Node
-	for _, doc := range []*yaml.Node{&project, &core, &runtime} {
-		if err = yaml.Unmarshal(raw, doc); err != nil {
-			return err
-		}
+	var source yaml.Node
+	if err := yaml.Unmarshal(raw, &source); err != nil {
+		return err
 	}
-	p, m, rt := project.Content[0], core.Content[0], runtime.Content[0]
-	filterPaths(field(p, "paths"), projectSurface)
-	filterPaths(field(m, "paths"), coreSurface)
-	filterPaths(field(rt, "paths"), runtimeSurface)
-	field(m, "basePath").Value = "/"
-	field(field(m, "info"), "title").Value = "OpenAgentCore Core API"
-	field(field(m, "info"), "description").Value = "Deployment and operations routes under /core/v1 for Core Web's server and operator scripts. Every operation requires the Core key; Project API keys and machine credentials are not accepted."
-	field(rt, "basePath").Value = "/"
-	field(field(rt, "info"), "title").Value = "OpenAgentCore Machine Connections"
-	field(field(rt, "info"), "description").Value = "Machine connection routes under /api/v1. Sandbox nodes authenticate with a one-use enrollment token or their node credential; Project API keys and the Core key are not accepted. See each operation's security requirements."
-	// Retain exactly the definitions referenced by each surface, including shared
-	// error DTOs. Follow nested references instead of duplicating the project schema.
-	pruneDefinitions(p)
-	pruneDefinitions(m)
-	pruneDefinitions(rt)
-	// Each document keeps only the security schemes its operations require.
-	pruneSecurityDefinitions(p)
-	pruneSecurityDefinitions(m)
-	pruneSecurityDefinitions(rt)
-	// Keep unrelated existing project definitions and the generator's formatting.
-	// Only definitions exclusive to the Core or machine surfaces are removed.
-	var original yaml.Node
-	if err := yaml.Unmarshal(raw, &original); err != nil {
+	var definitions map[string]any
+	if err := field(source.Content[0], "definitions").Decode(&definitions); err != nil {
 		return err
 	}
-	originalDefinitions := field(original.Content[0], "definitions")
-	projectDefinitions := field(p, "definitions")
-	if originalDefinitions != nil {
-		kept := make([]*yaml.Node, 0, len(originalDefinitions.Content))
-		for i := 0; i < len(originalDefinitions.Content); i += 2 {
-			key := originalDefinitions.Content[i]
-			if field(projectDefinitions, key.Value) != nil || field(field(m, "definitions"), key.Value) == nil && field(field(rt, "definitions"), key.Value) == nil {
-				kept = append(kept, key, originalDefinitions.Content[i+1])
-			}
-		}
-		projectDefinitions.Content = kept
-	}
-	for _, out := range []struct {
-		path string
-		doc  *yaml.Node
-	}{{projectOutput, &project}, {coreOutput, &core}, {runtimeOutput, &runtime}} {
-		if out.path == projectOutput {
-			if err := os.WriteFile(out.path, preserveProjectFormatting(raw, original.Content[0], p), 0644); err != nil {
-				return err
-			}
-			continue
+	extensionJSON, err := json.Marshal(definitions)
+	if err != nil {
+		return err
+	}
+	if err := os.WriteFile(extensionOutput, extensionJSON, 0644); err != nil {
+		return err
+	}
+	for _, output := range []struct {
+		path, title, description string
+		surface                  int
+	}{
+		{coreOutput, "OpenAgentCore Core API", "Deployment and operations routes under /core/v1 for Core Web's server and operator scripts. Every operation requires the Core key; Project API keys and machine credentials are not accepted.", coreSurface},
+		{runtimeOutput, "OpenAgentCore Machine Connections", "Machine connection routes under /api/v1. Sandbox nodes authenticate with a one-use enrollment token or their node credential; Project API keys and the Core key are not accepted. See each operation's security requirements.", runtimeSurface},
+	} {
+		var doc yaml.Node
+		if err := yaml.Unmarshal(raw, &doc); err != nil {
+			return err
 		}
+		root := doc.Content[0]
+		filterPaths(field(root, "paths"), output.surface)
+		field(root, "basePath").Value = "/"
+		field(field(root, "info"), "title").Value = output.title
+		field(field(root, "info"), "description").Value = output.description
+		pruneDefinitions(root)
+		pruneSecurityDefinitions(root)
 		var buf bytes.Buffer
 		encoder := yaml.NewEncoder(&buf)
 		encoder.SetIndent(2)
-		if err := encoder.Encode(out.doc); err != nil {
+		if err := encoder.Encode(&doc); err != nil {
 			return err
 		}
 		if err := encoder.Close(); err != nil {
 			return err
 		}
-		if err := os.WriteFile(out.path, buf.Bytes(), 0644); err != nil {
+		if err := writeGenerated(output.path, buf.Bytes(), check); err != nil {
 			return err
 		}
 	}
@@ -193,42 +179,16 @@ func pruneSecurityDefinitions(root *yaml.Node) {
 	schemes.Content = kept
 }
 
-// Preserve the generated project's lexical form while removing whole mappings.
-// YAML node line locations avoid interpreting indentation or quoted path names.
-func preserveProjectFormatting(raw []byte, original, filtered *yaml.Node) []byte {
-	lines := bytes.SplitAfter(raw, []byte("\n"))
-	removed := make([]bool, len(lines))
-	for _, section := range []string{"paths", "definitions", "securityDefinitions"} {
-		source, target := field(original, section), field(filtered, section)
-		if source == nil {
-			continue
-		}
-		end := len(lines)
-		for i := 0; i+1 < len(original.Content); i += 2 {
-			if original.Content[i].Value == section && i+2 < len(original.Content) {
-				end = original.Content[i+2].Line - 1
-				break
-			}
-		}
-		for i := 0; i+1 < len(source.Content); i += 2 {
-			key := source.Content[i]
-			if field(target, key.Value) != nil {
-				continue
-			}
-			stop := end
-			if i+2 < len(source.Content) {
-				stop = source.Content[i+2].Line - 1
-			}
-			for row := key.Line - 1; row < stop; row++ {
-				removed[row] = true
-			}
+func writeGenerated(path string, data []byte, check bool) error {
+	if check {
+		existing, err := os.ReadFile(path)
+		if err != nil {
+			return err
 		}
-	}
-	var out bytes.Buffer
-	for i, line := range lines {
-		if !removed[i] {
-			out.Write(line)
+		if !bytes.Equal(existing, data) {
+			return fmt.Errorf("%s is stale; run make openapi", path)
 		}
+		return nil
 	}
-	return out.Bytes()
+	return os.WriteFile(path, data, 0644)
 }
diff --git a/scripts/openapi-split/main_test.go b/scripts/openapi-split/main_test.go
index e3f944e52..fa8b65ea7 100644
--- a/scripts/openapi-split/main_test.go
+++ b/scripts/openapi-split/main_test.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/json"
 	"os"
 	"path/filepath"
 	"strings"
@@ -9,10 +10,10 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-func TestSeparatesTheThreeNamespaces(t *testing.T) {
+func TestInternalContractsAndExtensionDefinitions(t *testing.T) {
 	d := t.TempDir()
 	input := filepath.Join(d, "combined.yaml")
-	project := filepath.Join(d, "project.yaml")
+	project := filepath.Join(d, "extensions.json")
 	core := filepath.Join(d, "core.yaml")
 	machine := filepath.Join(d, "runtime.yaml")
 	raw := `swagger: "2.0"
@@ -71,12 +72,10 @@ securityDefinitions:
 	if err := os.WriteFile(input, []byte(raw), 0600); err != nil {
 		t.Fatal(err)
 	}
-	if err := run(input, project, core, machine); err != nil {
+	if err := run(input, project, core, machine, false); err != nil {
 		t.Fatal(err)
 	}
 	for _, check := range []struct{ path, base, own, other, definition, absent string }{
-		{project, "/v1", "/agents/sessions", "/core/v1/sandbox/nodes", "Session", "Node"},
-		{project, "/v1", "/agents/sessions", "/api/v1/sandbox-node/identity", "Session", "NodeIdentity"},
 		{core, "/", "/core/v1/sandbox/nodes", "/agents/sessions", "Node", "Session"},
 		{core, "/", "/core/v1/sandbox/nodes", "/api/v1/sandbox-node/identity", "Node", "NodeIdentity"},
 		{machine, "/", "/api/v1/sandbox-node/identity", "/core/v1/sandbox/nodes", "NodeIdentity", "Node"},
@@ -99,8 +98,19 @@ securityDefinitions:
 			t.Fatal("reference closure was not preserved")
 		}
 	}
-	// Every document keeps only the schemes its operations use.
-	for path, want := range map[string]string{project: "BearerAuth", core: "DeploymentAdminAuth", machine: "NodeAuth"} {
+	rawDefinitions, err := os.ReadFile(project)
+	if err != nil {
+		t.Fatal(err)
+	}
+	var definitions map[string]any
+	if err := json.Unmarshal(rawDefinitions, &definitions); err != nil {
+		t.Fatal(err)
+	}
+	if len(definitions) != 4 {
+		t.Fatalf("missing extension dependencies: %v", definitions)
+	}
+	// Every internal document keeps only the schemes its operations use.
+	for path, want := range map[string]string{core: "DeploymentAdminAuth", machine: "NodeAuth"} {
 		raw, err := os.ReadFile(path)
 		if err != nil {
 			t.Fatal(err)
diff --git a/services/core/README.md b/services/core/README.md
index 424600be8..19563a3c2 100644
--- a/services/core/README.md
+++ b/services/core/README.md
@@ -62,4 +62,4 @@ It checks the upstream and generated response schemas, retries, ordering, tenant
 
 ## Generated contracts
 
-Handler annotations generate the OpenAPI documents. Run `make openapi` after changing them: it runs the pinned swaggo generator and splits the result by namespace into [`openapi.yaml`](../../contracts/agents-api/openapi.yaml) (`/v1`), [`core.openapi.yaml`](../../contracts/agents-api/core.openapi.yaml) (`/core/v1`) and [`runtime.openapi.yaml`](../../contracts/agents-api/runtime.openapi.yaml) (`/api/v1`), each with only the security schemes its operations use. Review and commit the three diffs. Contract tests hold `openapi.yaml` to the pinned routes and fields, and hold all three to exactly the routes the server registers.
+Run `make openapi` after changing the pinned public schema, Go bindings, Core extensions or internal handler annotations. The [contract generation guide](../../contracts/agents-api/index.md#pinned-baseline) owns the inputs, generated files and checks. Review and commit the generated diffs. `make check-openapi` verifies freshness; contract tests check all three documents against registered routes.
diff --git a/services/core/internal/api/agents.go b/services/core/internal/api/agents.go
index f2f1cb4af..0aa2a0607 100644
--- a/services/core/internal/api/agents.go
+++ b/services/core/internal/api/agents.go
@@ -25,17 +25,6 @@ type AgentsReader interface {
 	GetAgentWithModelProvider(ctx context.Context, tenantID, agentID string) (agents.Agent, *v1.ModelProviderInput, error)
 }
 
-// @Summary Create a reusable Agent
-// @Description Persists configuration independently of execution. Names over 128 characters and metadata outside 16 string pairs with 64-character keys and 512-character values return invalid_request_error with the official param; U+0000 in stored strings is rejected as a local storage limit. As on every Agents API JSON route, a non-JSON Content-Type, invalid UTF-8, malformed JSON, a repeated key at any depth or a non-object root returns invalid_request_error with a null param and the official message before other checks; an empty or null body is {}. Missing, unknown, wrongly typed or unsupported enum members of the pinned configuration shapes (tools, text, reasoning, service_tier, multi_agent) return invalid_request_error with the JSON path as param; duplicate function names, repeated web_search or tool_search and non-object schema root types return it with a null param. Supports model/name/instructions/metadata, explicit reasoning and service tiers, multi_agent, text/json_schema, function/tool_search/programmatic_tool_calling/web_search and HTTP MCP with nullable credential_id, service origin (omitted or null on HTTP transport is saved as service) and boolean required defaulting to false. Saving credential_id grants no access: Session admission checks attached Vault ownership and destination. MCP allowed_tools preserves null versus empty; saved HTTP transport includes empty headers. Model-derived reasoning defaults, other MCP variants and public retry conformance remain incomplete. web_search saves every pinned mode: omitted or null mode is saved as live and omitted or null context_size as medium; allowed_domains preserves null versus empty and a present location, including {}, includes all four keys with null for omitted ones, as observed officially (req_db41d2f6261b4abfb69465eafe719ab5, req_165d53b88445490b9146d8272c54134d). Session execution accepts only explicit disabled web_search and disabled programmatic_tool_calling through qualified Runtime controls; saved enabled forms reject at Session admission. Session execution admits only its supported configuration subset.
-// @Tags Agents
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param body body v1.CreateAgentRequest true "Reusable Agent configuration"
-// @Success 201 {object} v1.SavedAgent
-// @Failure 400,401,413,500 {object} v1.ErrorResponse
-// @Router /agents [post]
 func (h *Handler) createAgent(w http.ResponseWriter, r *http.Request) {
 	raw, ok := readJSONObject(w, r)
 	if !ok {
@@ -69,16 +58,6 @@ func (h *Handler) createAgent(w http.ResponseWriter, r *http.Request) {
 	h.respondAgentStatus(w, r, agent, http.StatusCreated)
 }
 
-// @Summary Retrieve a reusable Agent
-// @Description Reads the saved resource owned by the authenticated tenant, independently of execution Sessions.
-// @Tags Agents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param agent_id path string true "Agent ID"
-// @Success 200 {object} v1.SavedAgent
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/{agent_id} [get]
 func (h *Handler) getAgent(w http.ResponseWriter, r *http.Request) {
 	agent, err := h.AgentsReader.GetAgent(r.Context(), tenantID(r), chi.URLParam(r, "agent_id"))
 	if err != nil {
diff --git a/services/core/internal/api/agents_delete.go b/services/core/internal/api/agents_delete.go
index f0fbe30f1..f90467cd8 100644
--- a/services/core/internal/api/agents_delete.go
+++ b/services/core/internal/api/agents_delete.go
@@ -9,16 +9,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary Delete a reusable Agent
-// @Description Deletes only the authenticated tenant's saved configuration. Existing Session snapshots, history and recorded creation retry identities remain independent. Missing and repeated deletion locally return404; exact hosted error and in-flight creation/deletion semantics remain unverified.
-// @Tags Agents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param agent_id path string true "Agent ID"
-// @Success 200 {object} v1.AgentDeleted
-// @Failure 400,401,404,413,500 {object} v1.ErrorResponse
-// @Router /agents/{agent_id} [delete]
 func (h *Handler) deleteAgent(w http.ResponseWriter, r *http.Request) {
 	body, ok := readJSONBody(w, r)
 	if !ok {
diff --git a/services/core/internal/api/agents_list.go b/services/core/internal/api/agents_list.go
index 3698cb1be..2a29f7b52 100644
--- a/services/core/internal/api/agents_list.go
+++ b/services/core/internal/api/agents_list.go
@@ -7,18 +7,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/agents"
 )
 
-// @Summary List reusable Agents
-// @Description Lists only the authenticated tenant's saved Agents, independently of Sessions. Limit 0 is treated as 1 and larger limits as 100, as observed on the hosted service. The local default is 20; exact upstream default/cap and empty cursor fields remain unverified. An unknown, malformed or foreign after cursor returns not found.
-// @Tags Agents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param after query string false "Last Agent ID from the previous page"
-// @Param limit query int64 false "Page size; 0 is treated as 1 and values above 100 as 100" minimum(0) default(20)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.SavedAgentList
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents [get]
 func (h *Handler) listAgents(w http.ResponseWriter, r *http.Request) {
 	options, ok := readClampedPage(w, r)
 	if !ok {
diff --git a/services/core/internal/api/agents_update.go b/services/core/internal/api/agents_update.go
index 03843821c..ab7f9d268 100644
--- a/services/core/internal/api/agents_update.go
+++ b/services/core/internal/api/agents_update.go
@@ -10,18 +10,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary Update a reusable Agent
-// @Description Preserves omitted fields and replaces supplied fields using shared saved-configuration validation. Null name/instructions clear; null or empty metadata clears all pairs. Name, metadata and configuration validation errors return invalid_request_error with the official param, using the Agent create rules before the Agent lookup. Existing Session snapshots are unchanged. Empty updates advance updated_at without changing saved fields. Nested replacement/null defaults, model-derived reasoning and exact hosted error behavior remain incompletely verified.
-// @Tags Agents
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param agent_id path string true "Agent ID"
-// @Param body body v1.UpdateAgentRequest true "Supplied reusable Agent fields"
-// @Success 200 {object} v1.SavedAgent
-// @Failure 400,401,404,413,500 {object} v1.ErrorResponse
-// @Router /agents/{agent_id} [post]
 func (h *Handler) updateAgent(w http.ResponseWriter, r *http.Request) {
 	raw, ok := readJSONObject(w, r)
 	if !ok {
diff --git a/services/core/internal/api/contract_routes_test.go b/services/core/internal/api/contract_routes_test.go
index 8a2133cc4..9d4fadb95 100644
--- a/services/core/internal/api/contract_routes_test.go
+++ b/services/core/internal/api/contract_routes_test.go
@@ -31,12 +31,18 @@ func contractOperations(t *testing.T, file, prefix string) map[string]bool {
 		t.Fatal(err)
 	}
 	var document struct {
+		Servers []struct {
+			URL string `yaml:"url"`
+		} `yaml:"servers"`
 		BasePath string                    `yaml:"basePath"`
 		Paths    map[string]map[string]any `yaml:"paths"`
 	}
 	if err := yaml.Unmarshal(raw, &document); err != nil {
 		t.Fatal(file, err)
 	}
+	if document.BasePath == "" && len(document.Servers) > 0 {
+		document.BasePath = document.Servers[0].URL
+	}
 	operations := map[string]bool{}
 	for path, item := range document.Paths {
 		full := strings.TrimSuffix(document.BasePath, "/") + path
@@ -55,7 +61,7 @@ func contractOperations(t *testing.T, file, prefix string) map[string]bool {
 	return operations
 }
 
-// The contracts are generated from handler annotations, so they must publish
+// The official public contract and generated internal contracts must publish
 // exactly the routes the server registers, with the same path parameter names.
 // The pinned upstream /v1 set is checked by TestEveryRouteAuthenticatesItsCanonicalPath
 // and the contract tests.
diff --git a/services/core/internal/api/credentials.go b/services/core/internal/api/credentials.go
index c90948ab9..62d0cf985 100644
--- a/services/core/internal/api/credentials.go
+++ b/services/core/internal/api/credentials.go
@@ -10,18 +10,6 @@ import (
 	"github.com/google/uuid"
 )
 
-// @Summary Create a Vault Credential
-// @Description Stores static_bearer or mcp_oauth secrets as execution-owned authenticated ciphertext without contacting any endpoint. Static bearer and OAuth access tokens must be nonempty strings; their bytes are preserved. OAuth accepts a required access token, nullable RFC3339 expiry and optional refresh configuration with none, client_secret_basic or client_secret_post authentication. Required name is trimmed to 1–256 UTF-8 bytes. Credential and token endpoints require HTTPS without userinfo or fragments. Responses contain safe metadata only, including explicit nullable OAuth expiry, refresh, resource and scope. Missing encryption configuration returns local 503. External authorization and provider revocation remain caller responsibilities; exact hosted error/default semantics remain unverified.
-// @Tags Credentials
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param vault_id path string true "Vault ID"
-// @Param body body v1.CreateCredentialRequest true "Write-only credential authentication union"
-// @Success 201 {object} v1.Credential
-// @Failure 400,401,404,413,500,503 {object} v1.ErrorResponse
-// @Router /vaults/{vault_id}/credentials [post]
 func (h *Handler) createCredential(w http.ResponseWriter, r *http.Request) {
 	vaultID := chi.URLParam(r, "vault_id")
 	raw, ok := readJSONObject(w, r)
@@ -69,17 +57,6 @@ func (h *Handler) createCredential(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusCreated, credentialResponse(credential))
 }
 
-// @Summary Retrieve safe Vault Credential metadata
-// @Description Reads only non-secret metadata scoped to the authenticated project and owning Vault. No token decryption, network request or execution is performed. Unknown, foreign, wrong-Vault and malformed IDs use the same local not-found response; hosted error parity remains unverified.
-// @Tags Credentials
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param vault_id path string true "Vault ID"
-// @Param credential_id path string true "Credential ID"
-// @Success 200 {object} v1.Credential
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /vaults/{vault_id}/credentials/{credential_id} [get]
 func (h *Handler) getCredential(w http.ResponseWriter, r *http.Request) {
 	vaultID, ok := credentialResourceID(w, r, "vault_id")
 	if !ok {
diff --git a/services/core/internal/api/credentials_delete.go b/services/core/internal/api/credentials_delete.go
index 27a44210a..5345fca5a 100644
--- a/services/core/internal/api/credentials_delete.go
+++ b/services/core/internal/api/credentials_delete.go
@@ -8,17 +8,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
-// @Summary Delete a Vault Credential
-// @Description Removes one Credential and its encrypted token within the authenticated project and owning Vault, without an encryption key or secret decryption. Subsequent metadata reads, updates and dispatch lookups cannot use it. Existing Session snapshots and history retain their frozen identities; already-resolved tokens and running Sessions are not revoked or cancelled. This local policy removes the row rather than defining archived lifecycle; missing/repeated deletion returns 404. Exact hosted archive, post-delete visibility and retry/error semantics remain unverified. Provider revocation and physical erasure from native history, WAL or backups are separate concerns.
-// @Tags Credentials
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param vault_id path string true "Vault ID"
-// @Param credential_id path string true "Credential ID"
-// @Success 200 {object} v1.CredentialDeleted
-// @Failure 400,401,404,413,500 {object} v1.ErrorResponse
-// @Router /vaults/{vault_id}/credentials/{credential_id} [delete]
 func (h *Handler) deleteCredential(w http.ResponseWriter, r *http.Request) {
 	body, ok := readJSONBody(w, r)
 	if !ok {
diff --git a/services/core/internal/api/credentials_list.go b/services/core/internal/api/credentials_list.go
index 6f2f335df..7fbd75515 100644
--- a/services/core/internal/api/credentials_list.go
+++ b/services/core/internal/api/credentials_list.go
@@ -7,21 +7,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary List safe Vault Credential metadata
-// @Description Lists only metadata from the authenticated project's requested Vault, without decryption or execution. An unknown, malformed or foreign after cursor, including another Vault's Credential, returns not found. Includes active and archived Credentials by default, independently of Vault status. Status accepts a scalar, the SDK status[] array or both, filtering by their union; a repeated scalar is rejected. Limits default to 20 and clamp to 1–100. Equal creation times use ID ordering. Hosted errors, concurrent-page behavior and archive/delete lifecycle remain unverified or unimplemented.
-// @Tags Credentials
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param vault_id path string true "Vault ID"
-// @Param after query string false "Last Credential ID from the previous page"
-// @Param limit query integer false "Requested page size, clamped to 1–100" default(20)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Param status query string false "Scalar status filter" Enums(active,archived)
-// @Param status[] query []string false "Array status filter; combined with status as a union" collectionFormat(multi) Enums(active,archived)
-// @Success 200 {object} v1.CredentialList
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /vaults/{vault_id}/credentials [get]
 func (h *Handler) listCredentials(w http.ResponseWriter, r *http.Request) {
 	vaultID := chi.URLParam(r, "vault_id")
 	query, ok := readVaultPage(w, r)
diff --git a/services/core/internal/api/credentials_update.go b/services/core/internal/api/credentials_update.go
index 58323a2ab..a47108a35 100644
--- a/services/core/internal/api/credentials_update.go
+++ b/services/core/internal/api/credentials_update.go
@@ -9,19 +9,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary Replace Vault Credential authentication secrets
-// @Description Explicitly empty static bearer or OAuth access tokens and OAuth patches without a mutable field are rejected before storage. Omitted OAuth access tokens preserve the existing grant when expiry or refresh fields change. Updates the existing static_bearer or mcp_oauth authentication method without network requests. OAuth access_token omission/null retains the token; a new token clears omitted expiry, explicit null clears expiry, and other omitted fields remain unchanged. OAuth refresh patches cannot add configuration or change client, endpoint, resource or authentication method; nullable token/client-secret values retain stored secrets while explicit null scope clears scope. Whole-null refresh and token_endpoint_auth retain existing configuration under local policy. Identity, destination, creation time and Session bindings remain unchanged. Responses expose safe metadata only. Already-dispatched work is not revoked; provider revocation, storage-key rotation and exact hosted concurrent-update/error semantics remain separate.
-// @Tags Credentials
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param vault_id path string true "Vault ID"
-// @Param credential_id path string true "Credential ID"
-// @Param body body v1.UpdateCredentialRequest true "Write-only credential authentication replacement union"
-// @Success 200 {object} v1.Credential
-// @Failure 400,401,404,413,500,503 {object} v1.ErrorResponse
-// @Router /vaults/{vault_id}/credentials/{credential_id} [post]
 func (h *Handler) updateCredential(w http.ResponseWriter, r *http.Request) {
 	vaultID, id := chi.URLParam(r, "vault_id"), chi.URLParam(r, "credential_id")
 	raw, ok := readJSONObject(w, r)
diff --git a/services/core/internal/api/environment_files.go b/services/core/internal/api/environment_files.go
index afb2b0efd..d829775e0 100644
--- a/services/core/internal/api/environment_files.go
+++ b/services/core/internal/api/environment_files.go
@@ -23,20 +23,6 @@ type EnvironmentWorkspaces interface {
 	WriteEnvironmentFile(context.Context, sessions.Environment, string, []byte) (int64, error)
 }
 
-// @Summary List live Environment files
-// @Description Lists direct regular files in one authorized self_hosted or qualified local workspace directory. Local paths use the public /workspace root and must be in cleaned form. This partial implementation defaults to the workspace root and limit 20; recursive scope and these defaults are not verified upstream semantics. A missing path, a regular file or a symbolic link returns an empty page; links are never followed. Daemons without a local workspace binding use the Claude SDK adapter reader, which keeps 404 for a missing path and 503 for a regular file or symbolic link. Well-formed unknown query keys are ignored; malformed query encoding and a repeated supported key are rejected. Sorts by case-sensitive path components, descending by default. Keep the same path, order and limit when using page. Each page rereads the complete bounded directory; changed file paths/sizes invalidate continuation locally with 400. There is no snapshot guarantee. An openai_hosted Environment that has not connected yet returns 400. Truncated or uncertain native results fail with 503 without returning a partial page. This read never starts a Turn or admits model input. Actual transport disconnect/reconnect events remain observable.
-// @Tags Environments
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param environment_id path string true "Environment ID"
-// @Param path query string false "Absolute directory in cleaned form inside /workspace"
-// @Param limit query int false "Maximum file count; local default 20" minimum(1) maximum(100)
-// @Param order query string false "Case-sensitive path-component order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Param page query string false "Opaque continuation token; keep path, order and limit unchanged"
-// @Success 200 {object} v1.EnvironmentFileList
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/environments/{environment_id}/files [get]
 func (h *Handler) listEnvironmentFiles(w http.ResponseWriter, r *http.Request) {
 	environment, err := h.EnvironmentsReader.GetEnvironment(r.Context(), tenantID(r), chi.URLParam(r, "environment_id"))
 	if err != nil {
diff --git a/services/core/internal/api/environment_files_create.go b/services/core/internal/api/environment_files_create.go
index 956af680f..0cec14045 100644
--- a/services/core/internal/api/environment_files_create.go
+++ b/services/core/internal/api/environment_files_create.go
@@ -22,18 +22,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary Create an Environment file from inline bytes or a source file
-// @Description Uploads standard Base64 bytes to a file beneath /workspace in a qualified local Environment and returns 201. Accepts inline bytes or a project-owned source file_id through the same write path. Unknown body fields are rejected with their name as param. Basic public hosted creation requires explicit managed Runtime configuration; an openai_hosted Environment that has not connected yet returns 400. Inline data is limited to 5 MiB decoded and a file_id copy to 50 MiB. Missing parent directories are created with mode 0700 and the file with mode 0600. An existing destination is never replaced; a directory, an existing file or a path through a symlink or non-directory returns 400. Idle writes exclude execution. Missing receipts return unavailable and retain a durable mutation gate without automatic replay. Error/timing parity with upstream remains unverified.
-// @Tags Environments
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param environment_id path string true "Environment ID"
-// @Param request body v1.EnvironmentFileCreateRequest true "Inline bytes or source file ID and absolute workspace path"
-// @Success 201 {object} v1.EnvironmentFile
-// @Failure 400,401,404,409,413,500,503 {object} v1.ErrorResponse
-// @Router /agents/environments/{environment_id}/files [post]
 func (h *Handler) createEnvironmentFile(w http.ResponseWriter, r *http.Request) {
 	const maxJSON = int64(((proto.WorkspaceWriteMaxBytes+2)/3)*4 + (16 << 10))
 	raw, ok := readJSONObjectLimit(w, r, maxJSON, "Inline upload exceeds this service's bounded file limit.")
diff --git a/services/core/internal/api/environment_templates.go b/services/core/internal/api/environment_templates.go
index 7c97f5d1c..5104f895f 100644
--- a/services/core/internal/api/environment_templates.go
+++ b/services/core/internal/api/environment_templates.go
@@ -90,17 +90,6 @@ func readTemplateInput(w http.ResponseWriter, r *http.Request) (environmenttempl
 	return in, true
 }
 
-// @Summary Create an Environment Template
-// @Description Saves tenant-owned hosted configuration. Supports nullable name, enabled/disabled or exact-domain restricted network, initial inline/file_id files, confidential env, ordered setup_commands, npm/Python packages inline/referenced Skill ZIPs, Plugin ZIPs and workspace-contained capability directories. Omitted/null network defaults to enabled. Restricted network requires 1–100 exact ASCII hostnames; other host forms and populated unsupported installations are rejected before persistence without echoing input. Network policy rejections return invalid_request_error with a null param. System dependencies must be preinstalled in the sandbox image or template, or on the host machine; packages.system is rejected. No compute is allocated. Exact hosted error/retry semantics remain unverified.
-// @Tags Environment Templates
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param body body v1.EnvironmentTemplateRequest true "Reusable configuration"
-// @Success 201 {object} v1.EnvironmentTemplate
-// @Failure 400,401,413,500 {object} v1.ErrorResponse
-// @Router /agents/environments/templates [post]
 func (h *Handler) createEnvironmentTemplate(w http.ResponseWriter, r *http.Request) {
 	in, ok := readTemplateInput(w, r)
 	if !ok {
@@ -114,16 +103,6 @@ func (h *Handler) createEnvironmentTemplate(w http.ResponseWriter, r *http.Reque
 	writeJSON(w, http.StatusCreated, templateResponse(value))
 }
 
-// @Summary Retrieve an Environment Template
-// @Description Returns safe tenant-owned configuration metadata without allocating compute. Missing and foreign resources return the same not-found response.
-// @Tags Environment Templates
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param environment_template_id path string true "Template ID"
-// @Success 200 {object} v1.EnvironmentTemplate
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/environments/templates/{environment_template_id} [get]
 func (h *Handler) getEnvironmentTemplate(w http.ResponseWriter, r *http.Request) {
 	value, err := h.EnvironmentTemplatesReader.Get(r.Context(), tenantID(r), chi.URLParam(r, "environment_template_id"))
 	if err != nil {
@@ -133,18 +112,6 @@ func (h *Handler) getEnvironmentTemplate(w http.ResponseWriter, r *http.Request)
 	writeJSON(w, http.StatusOK, templateResponse(value))
 }
 
-// @Summary Update an Environment Template
-// @Description Supplied fields replace atomically; omitted fields remain unchanged. Null name clears and null network resets to the pinned enabled default. Existing Session snapshots and creation retries remain unchanged. Initial files replace as a list; null/empty clears. File data is encrypted separately and excluded from response metadata. Skills replace as a list; null/empty clears. Skill archives are encrypted separately and omitted from responses. Plugins and capability directories replace as lists; null/empty clears. Plugin archives are encrypted and omitted from responses. Capability directories are snapshotted after setup. Environment MCP execution requires a qualified native transport and runtime network policy. Empty updates advance updated_at without changing saved fields or confidential contents. Network policy rejections return invalid_request_error with a null param.
-// @Tags Environment Templates
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param environment_template_id path string true "Template ID"
-// @Param body body v1.EnvironmentTemplateRequest true "Configuration replacements"
-// @Success 200 {object} v1.EnvironmentTemplate
-// @Failure 400,401,404,413,500 {object} v1.ErrorResponse
-// @Router /agents/environments/templates/{environment_template_id} [post]
 func (h *Handler) updateEnvironmentTemplate(w http.ResponseWriter, r *http.Request) {
 	in, ok := readTemplateInput(w, r)
 	if !ok {
@@ -158,16 +125,6 @@ func (h *Handler) updateEnvironmentTemplate(w http.ResponseWriter, r *http.Reque
 	writeJSON(w, http.StatusOK, templateResponse(value))
 }
 
-// @Summary Delete an Environment Template
-// @Description Deletes the tenant-owned reusable configuration without changing or deleting existing Sessions and their frozen configuration.
-// @Tags Environment Templates
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param environment_template_id path string true "Template ID"
-// @Success 200 {object} v1.EnvironmentTemplateDeleted
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/environments/templates/{environment_template_id} [delete]
 func (h *Handler) deleteEnvironmentTemplate(w http.ResponseWriter, r *http.Request) {
 	id, err := h.EnvironmentTemplates.Delete(r.Context(), environmenttemplates.DeleteCommand{TenantID: tenantID(r), TemplateID: chi.URLParam(r, "environment_template_id")})
 	if err != nil {
@@ -177,18 +134,6 @@ func (h *Handler) deleteEnvironmentTemplate(w http.ResponseWriter, r *http.Reque
 	writeJSON(w, http.StatusOK, v1.EnvironmentTemplateDeleted{ID: id, Object: "agent.environment.template.deleted", Deleted: true})
 }
 
-// @Summary List Environment Templates
-// @Description Lists tenant-owned safe template metadata in creation order with ID tie-breaking. Defaults to limit 20 and descending order; limit 0 is treated as 1 and larger limits as 100. Foreign, missing and malformed cursors return the same not found error. Concurrent-page and exact hosted error behavior remain unverified.
-// @Tags Environment Templates
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param after query string false "Previous Template ID"
-// @Param limit query integer false "Page size; 0 is treated as 1 and values above 100 as 100" default(20) minimum(0)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.EnvironmentTemplateList
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/environments/templates [get]
 func (h *Handler) listEnvironmentTemplates(w http.ResponseWriter, r *http.Request) {
 	options, ok := readClampedPage(w, r)
 	if !ok {
diff --git a/services/core/internal/api/environments.go b/services/core/internal/api/environments.go
index 0224efa06..9c75d471a 100644
--- a/services/core/internal/api/environments.go
+++ b/services/core/internal/api/environments.go
@@ -31,16 +31,6 @@ type Environments interface {
 	RevokeProjectExecutorCredential(context.Context, identity.Principal, string, string) error
 }
 
-// @Summary Retrieve an execution Environment
-// @Description Returns durable connection status and safe installed metadata for supported self_hosted and basic openai_hosted profiles. Initial files expose frozen safe metadata without content; Plugin/Skill entries expose only safe configured installation metadata. Capability-directory discoveries are not added to those arrays. Unsupported installation configurations remain implementation gaps. This read does not prepare execution, start compute or require an enabled execution worker. Session deletion removes the associated Environment from public reads; project-shared read authorization is unchanged. Connection status does not prove native readiness or process quiescence.
-// @Tags Environments
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param environment_id path string true "Environment ID"
-// @Success 200 {object} v1.EnvironmentInfo
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/environments/{environment_id} [get]
 func (h *Handler) getEnvironment(w http.ResponseWriter, r *http.Request) {
 	environment, err := h.EnvironmentsReader.GetEnvironment(r.Context(), tenantID(r), chi.URLParam(r, "environment_id"))
 	if err != nil {
diff --git a/services/core/internal/api/handler.go b/services/core/internal/api/handler.go
index a06ca1d0a..2e358785e 100644
--- a/services/core/internal/api/handler.go
+++ b/services/core/internal/api/handler.go
@@ -124,18 +124,6 @@ func (h *Handler) routes() *chi.Mux {
 }
 
 // createSession atomically reserves or admits initial text with the Session.
-// @Summary Create an execution Session
-// @Description The optional Core model_provider bundle resolves from the Session override, saved Agent defaults, then, for openai_hosted and none, the deployment default of the resolved harness; self_hosted never uses the deployment default and none accepts only it. openai_hosted and self_hosted Sessions that resolve no bundle return 400 model_provider_required with param x_agents_core.model_provider before any write. Core encrypts and freezes the resolved bundle; later Agent or deployment default edits and same-key retries cannot change it. Keys are never returned. Supports inline configuration or a tenant-owned saved agent_id with per-Session field replacements. Execution supports model/instructions, text verbosity, non-deferred function tools, adapter-qualified multi_agent with persisted Subagent reads, implicit reasoning, service tier auto and environment type none, subject to the configured engine. Codex additionally supports HTTP MCP with service origin (omitted or null on HTTP transport is saved as service), native allowed_tools and boolean required defaulting to false. Session vault_ids attach only project-owned Vaults; credential_id selects an attached static bearer or OAuth credential for the exact HTTPS URL, while null/omission selects a unique match or remains anonymous. Session reads, lists and event snapshots show that implicitly selected credential ID in a null or omitted credential_id, also after the credential is deleted; anonymous selections stay null and the stored caller intent is unchanged. After the input requirement and before any write, a credential_id without vault_ids, one outside the attached Vaults (one message for missing, foreign and unattached IDs) or one for another server_url returns 400 invalid_request_error, and several implicit matches return 409 conflict_error. Missing decryption configuration fails dispatch without anonymous fallback. Required initialization uses native startup before the first native Turn, including cold resume, and requires a separately advertised capability; exact hosted creation timing and error parity remain unverified. Explicit environment-origin HTTP MCP is supported on managed and self-hosted workspaces through the same Runtime bindings; native OAuth login remains unsupported. The self_hosted profile uses a qualified native harness, a clean absolute workspace_directory and optional absolute local capability_directories prepared by Runtime, with optional non-deferred function tools and HTTP MCP using explicit environment origin, optionally authenticated by the attached Vault rules. Service-origin HTTP remains restricted to service-side environment:none. Remote MCP and remote Bearer authentication each require separately advertised combination support; old peers cannot receive unsupported work. Omitted/null capability_directories use the empty-list default; self_hosted requires configured execution plus executor registry. Claude SDK currently requires medium verbosity and object-root function schemas. It supports anonymous or attached static-bearer service-origin HTTP MCP on none with boolean required and separately advertised MCP/bearer/required runtime support. Required servers must be connected before the first native input is released; pending or failed startup rejects execution. The shared Vault selection and immutable binding rules apply; unsupported native labels/tool names reject before persistence. An attached Vault with no matching credential may remain anonymous; missing keys or failed credential lookup/decryption never fall back to anonymous execution. Omitted stream defaults to false; stream and agent_id cannot be null. Metadata may be null; non-string values and limit violations return invalid_request_error with a metadata or metadata.<key> param. The inline agent uses the Agent create configuration validation with agent.-prefixed params, reported before the input requirement and saved-Agent lookup; saved configurations with conflicting tools or schema roots reject admission with the same errors, and execution limits keep unsupported_or_invalid_configuration. Hosted network policy rejections return invalid_request_error with a null param. Initial input accepts a string or ordered user-message array. Codex and Claude SDK on none and qualified managed or self_hosted workspace profiles also accept inline PNG/JPEG image content; other image combinations and remote URLs are unsupported. None initial input atomically starts a Turn; self_hosted initial input is reserved while returning its Environment connection target, with execution deferred to native readiness and Session failure on initial timeout. Initial input is required for none and for streamed creation outside self_hosted. Omitted/null input remains valid for non-streaming hosted and self_hosted creation. With stream=true, returns live Session events starting with the committed creation snapshot and closes right after the first agent.session.idle recorded when a Turn ends or an input reservation stops being pending, or any agent.session.failed, without sending later events. A creation that admitted nothing closes after the snapshot; a settlement that records no event closes after events up to the cursor read with a settled Session projection. Required actions keep it open; disconnect does not cancel execution. The GET events stream remains live-only. New Sessions retain their authenticated creator; all creation retries require the same typed subject, including across key rotation. Saved-Agent retries and inline requests using Vault attachments or credential references retain caller intent independently of later resource changes; new hosted inline requests also freeze caller intent before deployment defaults resolve; unrelated non-hosted inline retries preserve resolved/default equivalences, and their resolved hash leaves out any deployment default. Provider keys enter retry hashes only as fingerprints keyed by the credential key. Unknown historical creators reject retries; known creators without recorded intent retain resolved-snapshot retry rules. These conflict policies are local and not verified hosted parity. A same-key stream=true retry of an existing creation returns 201 with no events and closes at once; retry with stream=false or use the GET events stream to recover. Claude SDK on none, Core-managed Docker openai_hosted and self_hosted supports qualified object-root json_schema output with medium verbosity, single-Agent execution and ordinary functions. Hosted execution reuses native workspace tools and Files/Artifacts; Skills, Plugins, capability directories, HTTP MCP, Subagent and tool_search combinations remain unqualified, including inherited template contents. Other non-text initial input remains unsupported. Basic Codex and Claude SDK openai_hosted creation requires an explicitly configured managed provider. The Claude workspace profile supports non-deferred function tools with text or successful inline PNG/JPEG results alongside native workspace tools; explicit environment-origin HTTP MCP uses the common Runtime path. MiniMax accepts public environment-origin HTTP MCP only with null or omitted allowed_tools and required=false; even an empty non-null allowlist rejects. Idle Sessions provision automatically; initial provisioning has no caller connection action. Network defaults to enabled; disabled and restricted policies reject before compute allocation because the current Runtime cannot enforce them. The x_agents_core.environment extension accepts common preparation fields for either hosted or self-hosted placement: environment_template_id, files, env, packages, setup_commands, skills, plugins and capability_directories. Duplicate fields in environment and the extension reject. Confidential env, npm/Python packages and ordered setup commands use the same Environment-owned initialization lifecycle; compute allocation does not own preparation. Unknown side effects are not replayed after disconnect or restart. System dependencies must be preinstalled in the sandbox image or template, or on the host machine; packages.system is rejected. Initial inline and tenant-owned file_id files freeze encrypted bytes before provisioning, then install through the common Core lifecycle before native execution or live Files access. With a template reference, omitted/null files, env, packages and setup_commands inherit. Non-null files and command lists replace; env overlays by key; each package manager inherits on omission/null and otherwise replaces its list. Empty lists clear their selected field. Tenant-owned environment_template_id references inherit omitted/null network and allow only narrowing overrides. Inline hosted network:null retains the enabled default; updating a Template with network:null resets its saved policy to enabled. Core freezes effective configuration; template updates/deletion do not alter Session snapshots or same-intent creation retries. Inline or tenant-owned skill_reference Skills share initialization. Templates preserve default/latest/explicit selectors; Session creation freezes concrete metadata and encrypted content atomically. Skill, Plugin and capability-directory list omission/null inherit; a non-null list replaces, including empty-list clearing. Omitted/null Skill version selectors resolve the default version. Source deletion/default updates cannot change committed Session Skill contents. Deferred function discovery uses type-only tool_search and per-function defer_loading in the qualified single-agent Claude function profile on none or a managed/user-owned workspace, including qualified inline image messages and text results. Explicit web_search mode disabled and programmatic_tool_calling enabled false use frozen common Runtime controls. Enabled forms, including those saved on an Agent, remain unqualified and reject before any write unless the Session replaces tools. Omitted programmatic configuration preserves native behavior, a documented difference from the official default-on behavior. Other combinations remain unqualified; see the operation coverage.
-// @Tags Sessions
-// @Accept json
-// @Produce json,text/event-stream
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param Idempotency-Key header string false "Creation retry key, up to 128 bytes"
-// @Param body body v1.CreateSessionRequest true "Session configuration"
-// @Success 201 {object} v1.Session
-// @Failure 400,401,404,409,413,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions [post]
 func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 	raw, ok := readJSONObjectLimit(w, r, 16*1024*1024, "Request exceeds 16 MiB.")
 	if !ok {
@@ -292,16 +280,6 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 	h.respondSessionStatus(w, r, result.Session, http.StatusCreated)
 }
 
-// @Summary Retrieve an execution Session
-// @Description Returns supported none, self_hosted and basic openai_hosted Session environments. Self-hosted pending input can require a caller connection before a Turn exists. Hosted initial provisioning remains idle until a Turn starts; connection observations are not native execution readiness.
-// @Tags Sessions
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Success 200 {object} v1.Session
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id} [get]
 func (h *Handler) getSession(w http.ResponseWriter, r *http.Request) {
 	session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id"))
 	if err != nil {
@@ -328,19 +306,6 @@ func (h *Handler) respondSessionStatus(w http.ResponseWriter, r *http.Request, s
 	writeJSON(w, status, response)
 }
 
-// @Summary List execution Sessions
-// @Description Cursor and results are scoped to the authenticated execution tenant; an unknown, malformed or foreign after cursor returns not found. Optional agent_id matches the immutable root Agent ID, including inline Agents and historical Sessions whose saved source was updated or deleted. Omission lists all Agents. Returns the same Environment and pending-input activity projection as Session retrieval, including self_hosted Sessions.
-// @Tags Sessions
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param agent_id query string false "Root Agent ID whose Sessions to return"
-// @Param after query string false "Last Session ID from the previous page"
-// @Param limit query int false "Page size; 0 is treated as 1 and values above 100 as 100" minimum(0) default(20)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.SessionList
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/sessions [get]
 func (h *Handler) listSessions(w http.ResponseWriter, r *http.Request) {
 	options, ok := readClampedPage(w, r, "agent_id")
 	if !ok {
diff --git a/services/core/internal/api/inputs.go b/services/core/internal/api/inputs.go
index f63e87dcc..84a7a0adf 100644
--- a/services/core/internal/api/inputs.go
+++ b/services/core/internal/api/inputs.go
@@ -19,18 +19,6 @@ type InputAdmission interface {
 	SubmitInputs(context.Context, string, string, string, []sessions.Input) ([]sessions.InputReceipt, error)
 }
 
-// @Summary Submit Session input events
-// @Description An empty events array is a resource-authorized no-op; it creates no execution retry identity, Turn, Item or input receipt. For environment none, atomically accepts text messages, cancellation and function results. Messages steer active work or start a queued Turn. Qualified Codex and Claude SDK workspace profiles accept text and inline PNG/JPEG messages, independently of managed or self_hosted ownership. Under the Session lock, matching retries retain their original target; new active messages append to the current Turn, while idle messages reserve work and wait up to the original five-minute connection/admission deadline. Return 202 only after durable admission, without claiming native application; active messages create no Turn or reservation. Cancellation-only prepared-environment batches use existing durable cancellation admission and return 202 without waiting for native exit; a new cancellation conflicts while a pre-Turn reservation is pending. Homogeneous tool_result-only prepared-environment batches reuse existing scoped result admission and application receipts without creating a Turn or bypassing a pending reservation. Mixed prepared-environment batches remain unsupported. HTTP expiry/cancellation use local 409 environment_input_expired/environment_input_cancelled errors. New input on a Session whose hosted Environment failed to provision returns the observed 409 conflict_error "the hosted environment failed to provision"; input already waiting when it fails and expired Environments keep the local 409 environment_unavailable. Input the Session cannot accept in its current state, such as a result after cancellation or a batch while earlier input is pending, and a result that differs from the call's saved result return 409 with type and code conflict_error; reusing an Idempotency-Key with a different batch returns the local 409 idempotency_conflict. Inside an owned Session, a result for an unknown call or for a call of another Turn returns 400 invalid_request_error and changes nothing; missing and foreign Sessions return 404. Losing execution ownership returns 503. The response write deadline accommodates the admission window for either prepared Environment, independently of new-hosted-admission and executor URL settings. Disconnecting the waiting HTTP request does not cancel retained work or restart its deadline. Retry keys identify the whole ordered batch. Function output accepts text or ordered text/image parts subject to engine support; Claude SDK accepts text results and, on none and qualified workspace profiles, successful inline PNG/JPEG results, preserving ordered content; error images and remote references reject before admission. Native image resizing may change bytes. Runtime image-result support is checked only for image-bearing delivery. Codex and Claude SDK on none and qualified managed or self_hosted workspace profiles accept ordered inline PNG/JPEG image messages. Other engines remain text-only; remote image URLs are unsupported. Image references are retained unchanged without service-side downloads.
-// @Tags Sessions
-// @Accept json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param Idempotency-Key header string false "Retry key, up to 128 bytes"
-// @Param session_id path string true "Session ID"
-// @Param body body v1.CreateEventsRequest true "Ordered input events"
-// @Success 202
-// @Failure 400,401,404,409,413,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/events [post]
 func (h *Handler) createEvents(w http.ResponseWriter, r *http.Request) {
 	raw, ok := readJSONObject(w, r)
 	if !ok {
diff --git a/services/core/internal/api/items.go b/services/core/internal/api/items.go
index cc2ddf834..82dc61e59 100644
--- a/services/core/internal/api/items.go
+++ b/services/core/internal/api/items.go
@@ -14,19 +14,6 @@ type Items interface {
 	ListItems(context.Context, string, string, string, int, bool) (sessions.ItemPage, error)
 }
 
-// @Summary List persisted execution Items
-// @Description Returns supported message and tool Items in first-observation order. Native engine fields are projected explicitly; unfinished Items on terminal Turns are incomplete. Cursors are Items of the same tenant and Session. Any other after value, including a malformed one, returns 400 invalid_request_error with the message "Invalid session item ID in `after`".
-// @Tags Items
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param after query string false "Last Item ID from the previous page"
-// @Param limit query int false "Page size; 0 is treated as 1 and values above 100 as 100" minimum(0) default(20)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.ItemList
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/items [get]
 func (h *Handler) listItems(w http.ResponseWriter, r *http.Request) {
 	options, ok := readClampedPage(w, r)
 	if !ok {
diff --git a/services/core/internal/api/session_artifacts.go b/services/core/internal/api/session_artifacts.go
index 70ee53e9c..79275ca82 100644
--- a/services/core/internal/api/session_artifacts.go
+++ b/services/core/internal/api/session_artifacts.go
@@ -23,20 +23,6 @@ type ArtifactsReader interface {
 	ReadSessionArtifact(context.Context, string, string, string, func(sessions.Artifact, io.Reader) error) error
 }
 
-// @Summary List immutable Session artifacts
-// @Description Lists published outputs independently of Environment availability. Sorting uses publication time and ID. A later Turn publishes a path again only when it is new, its bytes changed, or no Artifact remains for it. A malformed environment_id matches nothing. An after value that is not an Artifact of this Session, including a malformed one, returns 400 invalid_request_error with the message "after is not a valid artifact ID". The local default page size is 20; exact upstream defaults remain unverified.
-// @Tags Artifacts
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param environment_id query string false "Producing Environment ID; an unknown or malformed ID returns an empty page"
-// @Param after query string false "Last immutable artifact ID"
-// @Param limit query int false "Page size" minimum(1) maximum(100) default(20)
-// @Param order query string false "Publication order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.SessionArtifactList
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/artifacts [get]
 func (h *Handler) listSessionArtifacts(w http.ResponseWriter, r *http.Request) {
 	options, ok := readPage(w, r, "environment_id")
 	if !ok {
@@ -55,16 +41,6 @@ func (h *Handler) listSessionArtifacts(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, v1.SessionArtifactList{Object: "list", Data: data, HasMore: page.NextCursor != "", FirstID: first, LastID: last})
 }
 
-// @Summary Retrieve immutable artifact metadata
-// @Tags Artifacts
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param artifact_id path string true "Artifact ID"
-// @Success 200 {object} v1.SessionArtifact
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/artifacts/{artifact_id} [get]
 func (h *Handler) getSessionArtifact(w http.ResponseWriter, r *http.Request) {
 	artifact, err := h.ArtifactsReader.GetSessionArtifact(r.Context(), tenantID(r), chi.URLParam(r, "session_id"), chi.URLParam(r, "artifact_id"))
 	if err != nil {
@@ -74,17 +50,6 @@ func (h *Handler) getSessionArtifact(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, artifactResponse(artifact))
 }
 
-// @Summary Delete a published artifact
-// @Description Deletes the published copy without modifying its original workspace file. Already admitted content reads may finish; later reads reject.
-// @Tags Artifacts
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param artifact_id path string true "Artifact ID"
-// @Success 200 {object} v1.SessionArtifactDeleted
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/artifacts/{artifact_id} [delete]
 func (h *Handler) deleteSessionArtifact(w http.ResponseWriter, r *http.Request) {
 	id := chi.URLParam(r, "artifact_id")
 	if err := h.Artifacts.DeleteSessionArtifact(r.Context(), sessions.DeleteSessionArtifactCommand{TenantID: tenantID(r), SessionID: chi.URLParam(r, "session_id"), ArtifactID: id}); err != nil {
@@ -94,17 +59,6 @@ func (h *Handler) deleteSessionArtifact(w http.ResponseWriter, r *http.Request)
 	writeJSON(w, http.StatusOK, v1.SessionArtifactDeleted{ID: id, Object: "agent.session.artifact.deleted", Deleted: true})
 }
 
-// @Summary Download immutable artifact bytes
-// @Description Streams stored bytes after tenant and Session authorization, including after Environment expiration. Exact upstream headers and Range behavior remain unverified.
-// @Tags Artifacts
-// @Produce octet-stream
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param artifact_id path string true "Artifact ID"
-// @Success 200 {file} binary
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/artifacts/{artifact_id}/content [get]
 func (h *Handler) sessionArtifactContent(w http.ResponseWriter, r *http.Request) {
 	err := serveStoredContent(w, r, func(ctx context.Context, consume func(string, int64, io.Reader) error) error {
 		return h.ArtifactsReader.ReadSessionArtifact(ctx, tenantID(r), chi.URLParam(r, "session_id"), chi.URLParam(r, "artifact_id"), func(a sessions.Artifact, body io.Reader) error {
diff --git a/services/core/internal/api/session_deletion.go b/services/core/internal/api/session_deletion.go
index 7a88b3b04..014ca6406 100644
--- a/services/core/internal/api/session_deletion.go
+++ b/services/core/internal/api/session_deletion.go
@@ -10,16 +10,6 @@ import (
 	"github.com/google/uuid"
 )
 
-// @Summary Delete an execution Session
-// @Description Removes a durably idle or failed Session and its history from the public API. A Session whose root Turn is queued, in progress or waiting (including required actions) or whose input reservation is pending returns 409 conflict_error and is left unchanged; cancel it and wait until it is idle before deleting. Subagent child Turns and pending Environment file writes are not checked and do not block deletion. Repeating the deletion of the caller's own deleted Session returns the same confirmation; missing and foreign Sessions return 404. Internal records and native history are retained pending separate physical cleanup; overlapping stream timing remains unverified.
-// @Tags Sessions
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Success 200 {object} v1.SessionDeleted
-// @Failure 400,401,404,409,413,500 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id} [delete]
 func (h *Handler) deleteSession(w http.ResponseWriter, r *http.Request) {
 	body, ok := readJSONBody(w, r)
 	if !ok {
diff --git a/services/core/internal/api/session_metadata.go b/services/core/internal/api/session_metadata.go
index 5ccea02ec..213fbd667 100644
--- a/services/core/internal/api/session_metadata.go
+++ b/services/core/internal/api/session_metadata.go
@@ -14,18 +14,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary Update execution Session metadata
-// @Description The metadata field is required in an update body. Send null or {} to clear it, or supply an object to replace all pairs. Up to 16 string pairs, with keys at most 64 characters and values at most 512 characters; violations and non-string values return invalid_request_error with a metadata or metadata.<key> param. U+0000 is rejected as a local storage limit. Malformed, missing and foreign Session IDs share the not-found response. Execution configuration and activity are unchanged. Returns the same safe Environment and pending-input activity projection as Session retrieval.
-// @Tags Sessions
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param body body v1.UpdateSessionRequest true "Session metadata"
-// @Success 200 {object} v1.Session
-// @Failure 400,401,404,413,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id} [post]
 func (h *Handler) updateSession(w http.ResponseWriter, r *http.Request) {
 	raw, ok := readJSONObject(w, r)
 	if !ok {
diff --git a/services/core/internal/api/skills.go b/services/core/internal/api/skills.go
index 948103faa..392c3c8d4 100644
--- a/services/core/internal/api/skills.go
+++ b/services/core/internal/api/skills.go
@@ -47,14 +47,6 @@ func (h *Handler) registerSkillRoutes(r chi.Router) {
 	r.Head("/v1/skills/{skill_id}/versions/{version}/content", methodNotAllowed)
 }
 
-// @Summary Retrieve Skill metadata
-// @Description Returns tenant-owned metadata without decrypting contents or starting Runtime. No Beta header is required.
-// @Tags Skills
-// @Produce json
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Success 200 {object} v1.Skill
-// @Router /skills/{skill_id} [get]
 func (h *Handler) getSkill(w http.ResponseWriter, r *http.Request) {
 	value, err := h.SkillsReader.Skill(r.Context(), tenantID(r), skills.PathID(chi.URLParam(r, "skill_id")))
 	if err != nil {
@@ -64,16 +56,6 @@ func (h *Handler) getSkill(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, skillResponseResource(value))
 }
 
-// @Summary Update the default Skill version
-// @Description Changes only the tenant-owned default pointer; immutable versions and existing Session snapshots remain unchanged.
-// @Tags Skills
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Param body body v1.SkillUpdateRequest true "Default version"
-// @Success 200 {object} v1.Skill
-// @Router /skills/{skill_id} [post]
 func (h *Handler) updateSkill(w http.ResponseWriter, r *http.Request) {
 	body, ok := readJSONBodyLimit(w, r, 64<<10, "Request exceeds 64 KiB.")
 	if !ok {
@@ -92,14 +74,6 @@ func (h *Handler) updateSkill(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, skillResponseResource(value))
 }
 
-// @Summary Delete a Skill and its versions
-// @Description Deletes tenant-owned source bundles. Existing Session installation snapshots remain independent.
-// @Tags Skills
-// @Produce json
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Success 200 {object} v1.SkillDeleted
-// @Router /skills/{skill_id} [delete]
 func (h *Handler) deleteSkill(w http.ResponseWriter, r *http.Request) {
 	id := chi.URLParam(r, "skill_id")
 	if err := h.Skills.DeleteSkill(r.Context(), skills.DeleteSkill{TenantID: tenantID(r), SkillID: skills.PathID(id)}); err != nil {
@@ -109,14 +83,6 @@ func (h *Handler) deleteSkill(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, v1.SkillDeleted{ID: id, Object: "skill.deleted", Deleted: true})
 }
 
-// @Summary Retrieve Skill version metadata
-// @Tags Skills
-// @Produce json
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Param version path string true "Concrete version number"
-// @Success 200 {object} v1.SkillVersion
-// @Router /skills/{skill_id}/versions/{version} [get]
 func (h *Handler) getSkillVersion(w http.ResponseWriter, r *http.Request) {
 	value, err := h.SkillsReader.Version(r.Context(), tenantID(r), skills.PathID(chi.URLParam(r, "skill_id")), skills.PathVersion(chi.URLParam(r, "version")))
 	if err != nil {
@@ -126,15 +92,6 @@ func (h *Handler) getSkillVersion(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, skillVersionResponse(value))
 }
 
-// @Summary Delete a Skill version
-// @Description Deleting the only remaining version also deletes the Skill; existing Session installation snapshots remain independent. The default version cannot be deleted while other versions remain. Version numbers are never reused.
-// @Tags Skills
-// @Produce json
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Param version path string true "Concrete version number"
-// @Success 200 {object} v1.SkillVersionDeleted
-// @Router /skills/{skill_id}/versions/{version} [delete]
 func (h *Handler) deleteSkillVersion(w http.ResponseWriter, r *http.Request) {
 	value, err := h.Skills.DeleteVersion(r.Context(), skills.DeleteVersion{TenantID: tenantID(r), SkillID: skills.PathID(chi.URLParam(r, "skill_id")), Version: skills.PathVersion(chi.URLParam(r, "version"))})
 	if err != nil {
diff --git a/services/core/internal/api/skills_list.go b/services/core/internal/api/skills_list.go
index bab40c047..6640b63a6 100644
--- a/services/core/internal/api/skills_list.go
+++ b/services/core/internal/api/skills_list.go
@@ -8,16 +8,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary List Skills
-// @Description Lists tenant-owned metadata in timestamp order. Default page size 20, maximum 100. Limit 0 returns an empty page whose has_more reports whether any Skill follows the cursor; exact hosted defaults remain unverified.
-// @Tags Skills
-// @Produce json
-// @Security BearerAuth
-// @Param after query string false "Skill resource cursor"
-// @Param limit query integer false "Page size; 0 returns an empty page" default(20) minimum(0) maximum(100)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc)
-// @Success 200 {object} v1.SkillList
-// @Router /skills [get]
 func (h *Handler) listSkills(w http.ResponseWriter, r *http.Request) {
 	options, ok := readPage(w, r)
 	if !ok {
@@ -39,17 +29,6 @@ func (h *Handler) listSkills(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, result)
 }
 
-// @Summary List Skill versions
-// @Description Orders by version number; after identifies a version resource, not a version number. An after value that does not begin with skillver, or a version of another Skill, returns 400 invalid_value with param after; a missing version returns not found. No contents are decrypted. Limit 0 returns an empty page whose has_more reports whether any version follows the cursor.
-// @Tags Skills
-// @Produce json
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Param after query string false "Version resource cursor"
-// @Param limit query integer false "Page size; 0 returns an empty page" default(20) minimum(0) maximum(100)
-// @Param order query string false "Version order; omit for descending, explicit empty values are invalid" Enums(asc,desc)
-// @Success 200 {object} v1.SkillVersionList
-// @Router /skills/{skill_id}/versions [get]
 func (h *Handler) listSkillVersions(w http.ResponseWriter, r *http.Request) {
 	options, ok := readPage(w, r)
 	if !ok {
diff --git a/services/core/internal/api/skills_transfer.go b/services/core/internal/api/skills_transfer.go
index 4696bd6bf..975017902 100644
--- a/services/core/internal/api/skills_transfer.go
+++ b/services/core/internal/api/skills_transfer.go
@@ -13,27 +13,8 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary Upload a Skill
-// @Description Accepts one ZIP in files or a directory in files[]. Applies the qualified portable Skill bundle profile. No Beta header is required; full hosted upload limits and activation extensions are not qualified.
-// @Tags Skills
-// @Accept multipart/form-data
-// @Produce json
-// @Security BearerAuth
-// @Param files formData file true "Skill ZIP or directory files"
-// @Success 200 {object} v1.Skill
-// @Router /skills [post]
 func (h *Handler) createSkill(w http.ResponseWriter, r *http.Request) { h.uploadSkill(w, r, false) }
 
-// @Summary Upload an immutable Skill version
-// @Tags Skills
-// @Accept multipart/form-data
-// @Produce json
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Param files formData file true "Skill ZIP or directory files"
-// @Param default formData boolean false "Set as default"
-// @Success 200 {object} v1.SkillVersion
-// @Router /skills/{skill_id}/versions [post]
 func (h *Handler) createSkillVersion(w http.ResponseWriter, r *http.Request) {
 	h.uploadSkill(w, r, true)
 }
@@ -75,14 +56,6 @@ func (h *Handler) uploadSkill(w http.ResponseWriter, r *http.Request, version bo
 	}
 }
 
-// @Summary Download Skill content
-// @Description Downloads an authorized ZIP using the default pointer when no concrete version is supplied. Exact upstream unversioned selection, content headers and range semantics remain unverified.
-// @Tags Skills
-// @Produce octet-stream
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Success 200 {file} binary
-// @Router /skills/{skill_id}/content [get]
 func (h *Handler) skillContent(w http.ResponseWriter, r *http.Request) {
 	err := serveStoredContent(w, r, func(ctx context.Context, consume func(string, int64, io.Reader) error) error {
 		skill := skills.PathID(chi.URLParam(r, "skill_id"))
@@ -103,14 +76,6 @@ func (h *Handler) skillContent(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// @Summary Download immutable Skill version content
-// @Tags Skills
-// @Produce octet-stream
-// @Security BearerAuth
-// @Param skill_id path string true "Skill ID"
-// @Param version path string true "Concrete version number"
-// @Success 200 {file} binary
-// @Router /skills/{skill_id}/versions/{version}/content [get]
 func (h *Handler) skillVersionContent(w http.ResponseWriter, r *http.Request) {
 	h.skillContent(w, r)
 }
diff --git a/services/core/internal/api/source_files.go b/services/core/internal/api/source_files.go
index cd74e7a2d..fbcd18798 100644
--- a/services/core/internal/api/source_files.go
+++ b/services/core/internal/api/source_files.go
@@ -24,15 +24,6 @@ type FilesReader interface {
 	Read(ctx context.Context, tenantID, fileID string, consume func(files.File, io.Reader) error) error
 }
 
-// @Summary Retrieve source file metadata
-// @Description Returns immutable project-owned user_data file metadata. No Beta header is required. Other purposes, expiration and full hosted status/error semantics remain unimplemented or unverified.
-// @Tags Files
-// @Produce json
-// @Security BearerAuth
-// @Param file_id path string true "Source file ID"
-// @Success 200 {object} v1.SourceFile
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /files/{file_id} [get]
 func (h *Handler) getSourceFile(w http.ResponseWriter, r *http.Request) {
 	ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second)
 	defer cancel()
@@ -44,15 +35,6 @@ func (h *Handler) getSourceFile(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, sourceFileResponse(file))
 }
 
-// @Summary Delete a source file
-// @Description Atomically deletes project-owned metadata and stored bytes. Already-admitted reads or copies may finish. Workspace copies remain independent. Historical WAL/backups are not erased. No Beta header is required; exact hosted concurrent deletion/error semantics remain unverified.
-// @Tags Files
-// @Produce json
-// @Security BearerAuth
-// @Param file_id path string true "Source file ID"
-// @Success 200 {object} v1.SourceFileDeleted
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /files/{file_id} [delete]
 func (h *Handler) deleteSourceFile(w http.ResponseWriter, r *http.Request) {
 	ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second)
 	defer cancel()
diff --git a/services/core/internal/api/source_files_content.go b/services/core/internal/api/source_files_content.go
index e03198ba3..7c2812f0d 100644
--- a/services/core/internal/api/source_files_content.go
+++ b/services/core/internal/api/source_files_content.go
@@ -11,14 +11,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary Download source file bytes
-// @Description Resolves project-owned File metadata before enforcing download policy. Public download of user_data Files returns 400; missing and foreign Files return the same 404. Internal initial-file and workspace copies remain available. No Beta header is required.
-// @Tags Files
-// @Produce json
-// @Security BearerAuth
-// @Param file_id path string true "Source file ID"
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /files/{file_id}/content [get]
 func (h *Handler) sourceFileContent(w http.ResponseWriter, r *http.Request) {
 	ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second)
 	defer cancel()
diff --git a/services/core/internal/api/source_files_list.go b/services/core/internal/api/source_files_list.go
index ed266eb2d..75faddd04 100644
--- a/services/core/internal/api/source_files_list.go
+++ b/services/core/internal/api/source_files_list.go
@@ -7,18 +7,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
 )
 
-// @Summary List source files
-// @Description Lists project-owned Files without reading their bodies. The limit defaults to 10000 and must be 1–10000. Equal creation times use ID ordering. Purpose validation precedes cursor lookup; current storage contains only user_data. An explicit empty purpose is treated as omitted. Repeated purpose values remain rejected. Hosted positive filtering, default order and concurrent-page behavior remain unverified. No Beta header is required.
-// @Tags Files
-// @Produce json
-// @Security BearerAuth
-// @Param after query string false "Last File ID from the previous page"
-// @Param limit query integer false "Maximum page size, 1–10000" default(10000) minimum(1) maximum(10000)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Param purpose query string false "Only return Files with this purpose"
-// @Success 200 {object} v1.SourceFileList
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /files [get]
 func (h *Handler) listSourceFiles(w http.ResponseWriter, r *http.Request) {
 	options, purpose, ok := readSourceFilePage(w, r)
 	if !ok {
diff --git a/services/core/internal/api/source_files_upload.go b/services/core/internal/api/source_files_upload.go
index b4e4c44a3..6aa23d2e5 100644
--- a/services/core/internal/api/source_files_upload.go
+++ b/services/core/internal/api/source_files_upload.go
@@ -13,17 +13,6 @@ import (
 
 const sourceTransferTimeout = 5 * time.Minute
 
-// @Summary Upload a source file
-// @Description Accepts one multipart file and purpose=user_data in either order, with a private 512 MiB content limit and 64 KiB envelope allowance. Commits only after the entire request validates. The source is project-owned, independent of Sessions and workspace copies. No Beta header is required. Other purposes, expires_after, listing, resumable Uploads, quotas/rate-limit and complete hosted error/status parity remain unsupported or unverified.
-// @Tags Files
-// @Accept multipart/form-data
-// @Produce json
-// @Security BearerAuth
-// @Param file formData file true "Source bytes"
-// @Param purpose formData string true "user_data" Enums(user_data)
-// @Success 200 {object} v1.SourceFile
-// @Failure 400,401,413,500,503 {object} v1.ErrorResponse
-// @Router /files [post]
 func (h *Handler) createSourceFile(w http.ResponseWriter, r *http.Request) {
 	deadline := time.Now().Add(sourceTransferTimeout)
 	controller := http.NewResponseController(w)
diff --git a/services/core/internal/api/stream.go b/services/core/internal/api/stream.go
index 9ac502a10..cfda35b6f 100644
--- a/services/core/internal/api/stream.go
+++ b/services/core/internal/api/stream.go
@@ -24,17 +24,6 @@ type SessionEvents interface {
 	SessionStreamSnapshot(context.Context, string, string) (sessions.Session, int64, error)
 }
 
-// @Summary Stream live Session events
-// @Description Live-only events, including command output fragments from capable Codex peers as agent.output.command_execution_output.delta with stable Item/output indexes. Native text conversion and output quotas apply; completion snapshots remain authoritative. Reconnect through Session, Turn and Items reads; missed events are not replayed. A lagging stream closes with an error when its bounded buffer is exceeded. When a hosted Environment fails to provision, the stream sends agent.session.environment.failed, an error event (environment_error/sandbox_error with the safe step and exit-status reason, never command output) and agent.session.failed, then ends. Session activity includes immutable pending-input connection actions before Turn creation; self_hosted environments use the same safe output as Session retrieval.
-// @Description Active streams revalidate the original Project key every second before output; revocation, Project archival or authentication unavailability closes the stream. Authentication checks use a five-second timeout.
-// @Tags Events
-// @Produce text/event-stream
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Success 200 {object} v1.SessionEvent
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/events [get]
 func (h *Handler) streamEvents(w http.ResponseWriter, r *http.Request) {
 	id, tenant := chi.URLParam(r, "session_id"), tenantID(r)
 	session, err := h.SessionsReader.GetSession(r.Context(), tenant, id)
diff --git a/services/core/internal/api/subagent_turns.go b/services/core/internal/api/subagent_turns.go
index 6ad9c4d45..f3cb78f54 100644
--- a/services/core/internal/api/subagent_turns.go
+++ b/services/core/internal/api/subagent_turns.go
@@ -6,18 +6,6 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-// @Summary Retrieve a Subagent Turn
-// @Description Returns a Turn owned by this Subagent. Its agent_id is the Session's Agent ID and its subagent_id identifies the Subagent. Session Turn routes do not return child Turns. Unknown or inaccessible parent scopes return not found.
-// @Tags Subagents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param subagent_id path string true "Subagent ID"
-// @Param turn_id path string true "Turn ID"
-// @Success 200 {object} v1.Turn
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/subagents/{subagent_id}/turns/{turn_id} [get]
 func (h *Handler) getSubagentTurn(w http.ResponseWriter, r *http.Request) {
 	value, err := h.Subagents.GetSubagentTurn(r.Context(), tenantID(r), chi.URLParam(r, "session_id"), chi.URLParam(r, "subagent_id"), chi.URLParam(r, "turn_id"))
 	if err != nil {
@@ -27,20 +15,6 @@ func (h *Handler) getSubagentTurn(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, value)
 }
 
-// @Summary List a Subagent's Turns
-// @Description Includes this Subagent's Turns after resume, with the Session's Agent ID as agent_id. Cursors are Turns of the same tenant, Session and Subagent. Any other after value, including a malformed one, returns 400 invalid_request_error with the message "Invalid resource ID in `after`". Missing recorded usage remains null. A limit outside 1–100 is rejected.
-// @Tags Subagents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param subagent_id path string true "Subagent ID"
-// @Param after query string false "Last Turn ID from the previous page"
-// @Param limit query int false "Page size" minimum(1) maximum(100) default(20)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.TurnList
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/subagents/{subagent_id}/turns [get]
 func (h *Handler) listSubagentTurns(w http.ResponseWriter, r *http.Request) {
 	options, ok := readPage(w, r)
 	if !ok {
@@ -54,21 +28,6 @@ func (h *Handler) listSubagentTurns(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, turnListResponse(page.Data, page.HasMore))
 }
 
-// @Summary List a Subagent Turn's Items
-// @Description Returns Items owned by this exact Subagent Turn. Cursors are Items of the same tenant, Session, Subagent and Turn. Any other after value, including a malformed one, returns 400 invalid_request_error with the message "Invalid session item ID in `after`".
-// @Tags Subagents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param subagent_id path string true "Subagent ID"
-// @Param turn_id path string true "Turn ID"
-// @Param after query string false "Last Item ID from the previous page"
-// @Param limit query int false "Page size; 0 is treated as 1 and values above 100 as 100" minimum(0) default(20)
-// @Param order query string false "Resource order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.ItemList
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/subagents/{subagent_id}/turns/{turn_id}/items [get]
 func (h *Handler) listSubagentTurnItems(w http.ResponseWriter, r *http.Request) {
 	options, ok := readClampedPage(w, r)
 	if !ok {
diff --git a/services/core/internal/api/subagents.go b/services/core/internal/api/subagents.go
index 101f84027..d230e5f84 100644
--- a/services/core/internal/api/subagents.go
+++ b/services/core/internal/api/subagents.go
@@ -29,17 +29,6 @@ func (h *Handler) registerSubagentRoutes(r chi.Router) {
 	r.Get(root+"/{subagent_id}/turns/{turn_id}/items", h.listSubagentTurnItems)
 }
 
-// @Summary Retrieve a Session Subagent
-// @Description Returns this Session's persisted Subagent. Active includes idle between Turns. Resuming preserves opened_at and clears closed_at. Unknown or inaccessible parent scopes return not found.
-// @Tags Subagents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param subagent_id path string true "Subagent ID"
-// @Success 200 {object} v1.Subagent
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/subagents/{subagent_id} [get]
 func (h *Handler) getSubagent(w http.ResponseWriter, r *http.Request) {
 	value, err := h.Subagents.GetSubagent(r.Context(), tenantID(r), chi.URLParam(r, "session_id"), chi.URLParam(r, "subagent_id"))
 	if err != nil {
@@ -49,19 +38,6 @@ func (h *Handler) getSubagent(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, value)
 }
 
-// @Summary List Session Subagents
-// @Description Includes nested and closed Subagents. Cursors are Subagents of the same tenant and Session. Any other after value, including a malformed one, returns 400 invalid_request_error with the message "Invalid resource ID in `after`". A limit outside 1–100 is rejected.
-// @Tags Subagents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param after query string false "Last Subagent ID from the previous page"
-// @Param limit query int false "Page size" minimum(1) maximum(100) default(20)
-// @Param order query string false "Resource order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.SubagentList
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/subagents [get]
 func (h *Handler) listSubagents(w http.ResponseWriter, r *http.Request) {
 	options, ok := readPage(w, r)
 	if !ok {
@@ -75,20 +51,6 @@ func (h *Handler) listSubagents(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, subagentListResponse(page.Data, page.HasMore))
 }
 
-// @Summary List a Subagent's Items
-// @Description Returns only this Subagent's own Items across all its Turns, not its descendants' Items. Cursors are Items of the same tenant, Session and Subagent. Any other after value, including a malformed one, returns 400 invalid_request_error with the message "Invalid session item ID in `after`".
-// @Tags Subagents
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param subagent_id path string true "Subagent ID"
-// @Param after query string false "Last Item ID from the previous page"
-// @Param limit query int false "Page size; 0 is treated as 1 and values above 100 as 100" minimum(0) default(20)
-// @Param order query string false "Resource order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.ItemList
-// @Failure 400,401,404,500,503 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/subagents/{subagent_id}/items [get]
 func (h *Handler) listSubagentItems(w http.ResponseWriter, r *http.Request) {
 	options, ok := readClampedPage(w, r)
 	if !ok {
diff --git a/services/core/internal/api/turns.go b/services/core/internal/api/turns.go
index d1afadac7..7aa48a01e 100644
--- a/services/core/internal/api/turns.go
+++ b/services/core/internal/api/turns.go
@@ -18,17 +18,6 @@ type Turns interface {
 	ListTurns(context.Context, string, string, string, int, bool) (sessions.TurnPage, error)
 }
 
-// @Summary Retrieve an execution Turn
-// @Description Returns a root Turn of this Session. A Subagent Turn ID returns the same not found error as a missing Turn; read it through the Subagent Turn routes.
-// @Tags Turns
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param turn_id path string true "Turn ID"
-// @Success 200 {object} v1.Turn
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/turns/{turn_id} [get]
 func (h *Handler) getTurn(w http.ResponseWriter, r *http.Request) {
 	sessionID := chi.URLParam(r, "session_id")
 	turn, err := h.Turns.GetTurn(r.Context(), tenantID(r), sessionID, chi.URLParam(r, "turn_id"))
@@ -49,19 +38,6 @@ func (h *Handler) getTurn(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusOK, response)
 }
 
-// @Summary List execution Turns
-// @Description Returns the Session's root Turns in creation order; Subagent Turns are listed through the Subagent Turn routes. The cursor belongs to the same Session and tenant; any other after value, including a malformed one or a Subagent Turn ID, returns not found. Usage contains the latest recorded complete token breakdown; missing measurements remain null.
-// @Tags Turns
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param session_id path string true "Session ID"
-// @Param after query string false "Last Turn ID from the previous page"
-// @Param limit query int false "Page size" minimum(1) maximum(100) default(20)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Success 200 {object} v1.TurnList
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /agents/sessions/{session_id}/turns [get]
 func (h *Handler) listTurns(w http.ResponseWriter, r *http.Request) {
 	options, ok := readPage(w, r)
 	if !ok {
diff --git a/services/core/internal/api/vaults.go b/services/core/internal/api/vaults.go
index bd2eeb14a..699ae5ebd 100644
--- a/services/core/internal/api/vaults.go
+++ b/services/core/internal/api/vaults.go
@@ -33,17 +33,6 @@ type VaultsReader interface {
 	ListCredentials(ctx context.Context, tenantID, vaultID string, query vaults.PageQuery) (vaults.CredentialPage, error)
 }
 
-// @Summary Create a Vault
-// @Description Creates a project-owned Vault independently of execution. Omitted name stays null; a supplied string is trimmed and must contain 1–256 UTF-8 bytes. Explicit null name is invalid. Omitted/null metadata becomes an empty object; non-string values return invalid_request_error with a metadata.<key> param. Metadata has a local 64 KiB encoded storage bound. U+0000 in stored strings is rejected as a local storage limit. Credentials, Session binding and hosted error/retry parity remain incomplete.
-// @Tags Vaults
-// @Accept json
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param body body v1.CreateVaultRequest true "Vault name and metadata"
-// @Success 201 {object} v1.Vault
-// @Failure 400,401,413,500 {object} v1.ErrorResponse
-// @Router /vaults [post]
 func (h *Handler) createVault(w http.ResponseWriter, r *http.Request) {
 	raw, ok := readJSONObject(w, r)
 	if !ok {
@@ -94,16 +83,6 @@ func (h *Handler) createVault(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, http.StatusCreated, vaultResponse(vault))
 }
 
-// @Summary Retrieve a Vault
-// @Description Reads a Vault owned by the authenticated project without resolving credentials, Sessions or execution devices. Missing and foreign IDs share the same not-found response; exact hosted error semantics remain unverified.
-// @Tags Vaults
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param vault_id path string true "Vault ID"
-// @Success 200 {object} v1.Vault
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /vaults/{vault_id} [get]
 func (h *Handler) getVault(w http.ResponseWriter, r *http.Request) {
 	id, ok := credentialResourceID(w, r, "vault_id")
 	if !ok {
diff --git a/services/core/internal/api/vaults_delete.go b/services/core/internal/api/vaults_delete.go
index 3e666bf80..aa03251da 100644
--- a/services/core/internal/api/vaults_delete.go
+++ b/services/core/internal/api/vaults_delete.go
@@ -8,16 +8,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
-// @Summary Delete a Vault and all its Credentials
-// @Description Atomically removes the authenticated project's Vault and all its stored Credentials without an encryption key, decryption or external requests. Existing Session snapshots, history and recorded retries retain their frozen identities; subsequent credential lookups fail without reselection or anonymous fallback. Already-resolved tokens and running Sessions are not revoked or cancelled. Missing/repeated deletion locally returns 404. Exact hosted archive, post-delete visibility and concurrent/error semantics remain unverified; physical erasure from native history, WAL or backups is not established.
-// @Tags Vaults
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param vault_id path string true "Vault ID"
-// @Success 200 {object} v1.VaultDeleted
-// @Failure 400,401,404,413,500 {object} v1.ErrorResponse
-// @Router /vaults/{vault_id} [delete]
 func (h *Handler) deleteVault(w http.ResponseWriter, r *http.Request) {
 	body, ok := readJSONBody(w, r)
 	if !ok {
diff --git a/services/core/internal/api/vaults_list.go b/services/core/internal/api/vaults_list.go
index 72ebed7da..305f87ecd 100644
--- a/services/core/internal/api/vaults_list.go
+++ b/services/core/internal/api/vaults_list.go
@@ -6,20 +6,6 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 )
 
-// @Summary List Vaults
-// @Description Lists project-owned Vaults independently of execution. An unknown, malformed or foreign after cursor returns not found. Includes active and archived records by default. Status accepts a scalar, the SDK's status[] array or both, filtering by their union; a repeated scalar is rejected. Limits default to 20 and clamp to 1–100. Equal creation times use ID ordering; exact hosted errors and concurrent-page behavior remain unverified. Archive/delete lifecycle is not implemented.
-// @Tags Vaults
-// @Produce json
-// @Security BearerAuth
-// @Param OpenAI-Beta header string true "agents=v1"
-// @Param after query string false "Last Vault ID from the previous page"
-// @Param limit query integer false "Requested page size, clamped to 1–100" default(20)
-// @Param order query string false "Creation order; omit for descending, explicit empty values are invalid" Enums(asc,desc) default(desc)
-// @Param status query string false "Scalar status filter" Enums(active,archived)
-// @Param status[] query []string false "Array status filter; combined with status as a union" collectionFormat(multi) Enums(active,archived)
-// @Success 200 {object} v1.VaultList
-// @Failure 400,401,404,500 {object} v1.ErrorResponse
-// @Router /vaults [get]
 func (h *Handler) listVaults(w http.ResponseWriter, r *http.Request) {
 	query, ok := readVaultPage(w, r)
 	if !ok {
diff --git a/services/core/tests/official_client.py b/services/core/tests/official_client.py
index d5ad580e0..b47c1fe15 100644
--- a/services/core/tests/official_client.py
+++ b/services/core/tests/official_client.py
@@ -18,7 +18,7 @@
 sys.dont_write_bytecode = True
 
 import httpx2
-from jsonschema import Draft4Validator
+from official_schema import ResponseValidator
 from official_items import verify_items
 from official_agents import verify_agents
 from official_vaults import verify_vaults, verify_vault_recovery
@@ -38,47 +38,12 @@
 from official_source_file_list import verify_source_file_list, verify_source_file_list_recovery
 from official_diagnostics import finish_server
 from openai import AuthenticationError, BadRequestError, ConflictError, InternalServerError, NotFoundError, OpenAI
-import yaml
 
 
-def nullable_schema(value):
-    """Translate Swagger 2's nullable extension for JSON Schema validation."""
-    if isinstance(value, list):
-        return [nullable_schema(item) for item in value]
-    if not isinstance(value, dict):
-        return value
-    converted = {key: nullable_schema(item) for key, item in value.items() if key != "x-nullable"}
-    return {"anyOf": [{"type": "null"}, converted]} if value.get("x-nullable") else converted
-
 
 def main():
     root = Path(__file__).resolve().parents[3]
-    contract = nullable_schema(yaml.safe_load((root / "contracts/agents-api/openapi.yaml").read_text()))
-
-    def validate_response(response):
-        response.read()
-        path = response.request.url.path.removeprefix("/v1")
-        if path.startswith("/agents/sessions/"):
-            suffix = path.split("/")[4:]
-            path = "/agents/sessions/{session_id}"
-            if suffix and suffix[0] == "turns":
-                path += "/turns" + ("/{turn_id}" if len(suffix) > 1 else "")
-            elif suffix and suffix[0] in ("items", "events"):
-                path += "/" + suffix[0]
-        elif path.startswith("/vaults/"):
-            suffix = path.split("/")[3:]
-            path = "/vaults/{vault_id}"
-            if suffix and suffix[0] == "credentials":
-                path += "/credentials" + ("/{credential_id}" if len(suffix) > 1 else "")
-        elif path.startswith("/agents/") and path != "/agents/sessions":
-            path = "/agents/{agent_id}"
-        elif path.startswith("/files/"):
-            path = "/files/{file_id}/content" if path.endswith("/content") else "/files/{file_id}"
-        if path.endswith("/events") and response.status_code == 202:
-            assert response.content == b""
-            return
-        schema = contract["paths"][path][response.request.method.lower()]["responses"][str(response.status_code)]["schema"]
-        Draft4Validator({"definitions": contract["definitions"], **schema}).validate(response.json())
+    validate_response = ResponseValidator(root / "contracts/agents-api/openapi.yaml")
     pin = json.loads((root / "contracts/agents-api/upstream.json").read_text())
     distribution = importlib.metadata.distribution("openai")
     source = json.loads(distribution.read_text("direct_url.json") or "{}")
diff --git a/services/core/tests/official_schema.py b/services/core/tests/official_schema.py
new file mode 100644
index 000000000..6bc6b64c8
--- /dev/null
+++ b/services/core/tests/official_schema.py
@@ -0,0 +1,41 @@
+"""Validate HTTP responses against the pinned OpenAPI 3.1 contract."""
+
+import json
+import re
+
+from jsonschema import Draft202012Validator
+
+
+class ResponseValidator:
+    def __init__(self, path):
+        self.contract = json.loads(path.read_text())
+        self.routes = [(re.compile("^" + re.sub(r"\{[^}]+\}", "[^/]+", route) + "$"), methods)
+                       for route, methods in self.contract["paths"].items()]
+        # Existing service differences are recorded in the contract coverage ledger.
+        # Keep these test-only adjustments local; the published schema stays official.
+        schemas = self.contract["components"]["schemas"]
+        for name, fields in {"ErrorBodyResource": ("code",), "ListFilesResponse": ("first_id", "last_id"),
+                             "OpenAIFile": ("expires_at", "status_details")}.items():
+            for field in fields:
+                schema = schemas[name]["properties"][field]
+                schema["type"] = [schema["type"], "null"]
+
+    def __call__(self, response):
+        response.read()
+        path = response.request.url.path.removeprefix("/v1")
+        methods = self.contract["paths"].get(path)
+        if methods is None:
+            methods = next(methods for pattern, methods in self.routes if pattern.fullmatch(path))
+        responses = methods[response.request.method.lower()]["responses"]
+        status = str(response.status_code)
+        if status not in responses and path.startswith(("/files", "/skills")) and response.status_code >= 400:
+            # These upstream operations omit error responses; validate their shared error body.
+            schema = {"$ref": "#/components/schemas/ErrorResponse"}
+        else:
+            content = responses[status].get("content")
+            if not content:
+                assert response.content == b""
+                return
+            media = response.headers["content-type"].split(";", 1)[0]
+            schema = content[media]["schema"]
+        Draft202012Validator({"components": self.contract["components"], **schema}).validate(response.json())
diff --git a/services/core/tests/official_schema_test.py b/services/core/tests/official_schema_test.py
new file mode 100644
index 000000000..0187d8a25
--- /dev/null
+++ b/services/core/tests/official_schema_test.py
@@ -0,0 +1,80 @@
+"""Keep response validation strict when consuming the official OpenAPI format."""
+
+import json
+import subprocess
+import tempfile
+from pathlib import Path
+import unittest
+
+import httpx2
+from jsonschema import Draft202012Validator, ValidationError
+from official_schema import ResponseValidator
+
+
+class ResponseSchemaTests(unittest.TestCase):
+    def setUp(self):
+        self.validator = ResponseValidator(Path(__file__).resolve().parents[3] / "contracts/agents-api/openapi.yaml")
+
+    def response(self, path, body, status=200, method="GET"):
+        response = httpx2.Response(status, json=body, request=httpx2.Request(method, "http://localhost/v1" + path))
+        self.validator(response)
+
+    def test_static_session_route_and_nullable_empty_page(self):
+        body = {"object": "list", "data": [], "first_id": None, "last_id": None, "has_more": False}
+        self.response("/agents/sessions", body)
+        self.response("/files", body)
+        with self.assertRaises(ValidationError):
+            self.response("/files", {**body, "has_more": "false"})
+        with self.assertRaises(ValidationError):
+            self.response("/agents/sessions", {key: value for key, value in body.items() if key != "data"})
+
+    def test_declared_and_shared_error_responses(self):
+        body = {"error": {"message": "Invalid key", "type": "invalid_request_error", "code": None, "param": None}}
+        self.response("/agents/agent_1", body, 401)
+        self.response("/files/file_1", body, 404)
+        with self.assertRaises(ValidationError):
+            self.response("/files/file_1", {"error": "missing"}, 404)
+        with self.assertRaises(KeyError):
+            self.response("/agents/agent_1", body, 418)
+
+    def test_file_nulls_do_not_relax_other_fields(self):
+        body = {"id": "file_1", "object": "file", "bytes": 0, "created_at": 1, "filename": "test.txt",
+                "purpose": "user_data", "status": "processed", "expires_at": None, "status_details": None}
+        self.response("/files/file_1", body)
+        with self.assertRaises(ValidationError):
+            self.response("/files/file_1", {**body, "bytes": None})
+        with self.assertRaises(ValidationError):
+            self.response("/files/file_1", {**body, "purpose": "unknown"})
+
+    def test_generated_union_serialization_matches_official_variants(self):
+        root = Path(__file__).resolve().parents[3]
+        artifacts = Path.home() / ".oac/tests"
+        artifacts.mkdir(parents=True, exist_ok=True)
+        with tempfile.TemporaryDirectory(dir=artifacts) as directory:
+            program = Path(directory) / "main.go"
+            program.write_text('''package main
+import ("encoding/json"; "os"; v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1")
+func main() {
+    query := "reference"
+    values := []v1.WebSearchAction{
+        {Type: "search", Query: &query}, {Type: "open_page", Query: &query},
+        {Type: "find_in_page"}, {Type: "other", Query: &query},
+    }
+    if err := json.NewEncoder(os.Stdout).Encode(values); err != nil { panic(err) }
+}
+''')
+            payload = subprocess.check_output(["go", "run", str(program)], cwd=root, timeout=120)
+        official = json.loads((root / "contracts/agents-api/upstream/openapi.json").read_text())
+        validator = Draft202012Validator({"components": official["components"], "$ref": "#/components/schemas/WebSearchActionResource"})
+        for action in json.loads(payload):
+            validator.validate(action)
+
+    def test_declared_bodyless_response(self):
+        response = httpx2.Response(202, request=httpx2.Request("POST", "http://localhost/v1/agents/sessions/session_1/events"))
+        self.validator(response)
+        with self.assertRaises(AssertionError):
+            self.response("/agents/sessions/session_1/events", {}, 202, "POST")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/services/core/tests/requirements.txt b/services/core/tests/requirements.txt
index d37efa74c..12aab9370 100644
--- a/services/core/tests/requirements.txt
+++ b/services/core/tests/requirements.txt
@@ -1,2 +1 @@
 jsonschema==4.25.1
-PyYAML==6.0.2

From 17ec0522ea7d63d8688349474a8303b8442408f3 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 22:07:13 +0800
Subject: [PATCH 31/60] refactor(api): trim schema generation and unify text
 types (#497)

---
 Makefile                                      |   1 -
 contracts/agents-api/core.openapi.yaml        |  28 +--
 contracts/agents-api/go-bindings.json         | 192 ++++--------------
 contracts/agents-api/index.md                 |   2 +-
 contracts/agents-api/v1/official.gen.go       |  90 ++------
 contracts/agents-api/zh/index.md              |   4 +-
 scripts/generate-public-api.py                |  13 +-
 .../core/internal/api/saved_configuration.go  |  25 ++-
 services/core/internal/api/session_agent.go   |   6 +-
 .../core/internal/api/text_configuration.go   |  25 ---
 10 files changed, 85 insertions(+), 301 deletions(-)
 delete mode 100644 services/core/internal/api/text_configuration.go

diff --git a/Makefile b/Makefile
index 4d91c1ca8..f769ed092 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ check-openapi:
 	python3 scripts/generate-public-api.test.py
 
 openapi:
-	python3 scripts/generate-public-api.py $(OPENAPI_FLAGS)
 	@set -e; root="$${OAC_DEV_HOME:-$$HOME/.oac}/build"; mkdir -p "$$root"; \
 	output=$$(mktemp -d "$$root/core-openapi.XXXXXX"); trap 'rm -rf "$$output"' EXIT; \
 	python3 scripts/generate-public-api.py $(OPENAPI_FLAGS) --swag-roots "$$output/roots.go"; \
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index fb65920bd..c3412ffd4 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -2587,7 +2587,7 @@ definitions:
           - fast
         type: string
       text:
-        $ref: '#/definitions/v1.SavedAgentText'
+        $ref: '#/definitions/v1.TextConfig'
       tools:
         items:
           type: object
@@ -2649,32 +2649,6 @@ definitions:
       - last_id
       - object
     type: object
-  v1.SavedAgentText:
-    properties:
-      format:
-        $ref: '#/definitions/v1.SavedAgentTextFormat'
-      verbosity:
-        enum:
-          - low
-          - medium
-          - high
-        type: string
-    required:
-      - format
-      - verbosity
-    type: object
-  v1.SavedAgentTextFormat:
-    properties:
-      schema:
-        type: object
-      type:
-        enum:
-          - text
-          - json_schema
-        type: string
-    required:
-      - type
-    type: object
   v1.Session:
     properties:
       agent:
diff --git a/contracts/agents-api/go-bindings.json b/contracts/agents-api/go-bindings.json
index 176a7d1c7..5b5d9253e 100644
--- a/contracts/agents-api/go-bindings.json
+++ b/contracts/agents-api/go-bindings.json
@@ -1,31 +1,24 @@
 {
   "APIError": {
     "sources": ["#/components/schemas/Error"],
-    "fields": {
-      "code": {"type": "*string"}
-    },
     "order": ["message", "type", "code", "param"]
   },
   "Agent": {
     "sources": ["#/components/schemas/SessionAgentResource"],
     "fields": {
       "x_agents_core": {"type": "*AgentsCore"},
-      "reasoning": {"type": "Reasoning"},
-      "text": {"type": "TextConfig"}
+      "reasoning": {"type": "Reasoning"}
     },
     "order": ["x_agents_core", "id", "instructions", "model", "multi_agent", "name", "reasoning", "service_tier", "text", "tools"]
   },
   "AgentContent": {
-    "sources": ["#/components/schemas/AgentContentResource"],
-    "order": ["type", "text", "encrypted_content"]
+    "sources": ["#/components/schemas/AgentContentResource"]
   },
   "AgentDeleted": {
-    "sources": ["#/components/schemas/DeletedAgentResource"],
-    "order": ["id", "object", "deleted"]
+    "sources": ["#/components/schemas/DeletedAgentResource"]
   },
   "AgentMessageItem": {
-    "sources": ["#/components/schemas/AgentMessageItemResource"],
-    "order": ["id", "turn_id", "type", "sender_agent_id", "recipient_agent_id", "content"]
+    "sources": ["#/components/schemas/AgentMessageItemResource"]
   },
   "CreateAgentRequest": {
     "sources": ["#/components/schemas/CreateAgentParams"],
@@ -34,22 +27,10 @@
       "model": {"type": "*string"},
       "metadata": {"type": "map[string]*string"},
       "reasoning": {"type": "*Reasoning"},
-      "text": {"type": "*SavedAgentTextInput"}
+      "text": {"type": "*TextConfigInput"}
     },
     "order": ["x_agents_core", "model", "name", "instructions", "metadata", "multi_agent", "reasoning", "service_tier", "text", "tools"]
   },
-  "CreateCredentialRequest": {
-    "sources": ["#/components/schemas/CreateVaultCredentialParams"],
-    "fields": {
-      "name": {"type": "*string"},
-      "auth": {"type": "*CredentialAuthInput"}
-    },
-    "order": ["name", "auth"]
-  },
-  "CreateEventsRequest": {
-    "sources": ["#/components/schemas/CreateSessionEventsParams"],
-    "order": ["events"]
-  },
   "CreateSessionRequest": {
     "sources": ["#/components/schemas/CreateAgentSessionParams"],
     "fields": {
@@ -64,13 +45,6 @@
     "sources": ["#/components/schemas/CreateSubagentCallItemResource"],
     "order": ["id", "turn_id", "type", "status", "agent_id", "content", "model", "reasoning_effort"]
   },
-  "CreateVaultRequest": {
-    "sources": ["#/components/schemas/CreateVaultParams"],
-    "fields": {
-      "metadata": {"type": "map[string]*string"}
-    },
-    "order": ["name", "metadata"]
-  },
   "Credential": {
     "sources": ["#/components/schemas/VaultCredentialResource"],
     "order": ["id", "vault_id", "name", "object", "auth", "created_at", "updated_at"]
@@ -80,8 +54,7 @@
     "fields": {
       "expires_at": {"omit": false},
       "refresh": {"type": "*OAuthCredentialRefresh", "omit": false}
-    },
-    "order": ["type", "mcp_server_url", "expires_at", "refresh"]
+    }
   },
   "CredentialAuthInput": {
     "sources": ["#/components/schemas/CreateVaultCredentialAuthParam"],
@@ -134,20 +107,17 @@
     "order": ["type", "data", "file_id", "path"]
   },
   "EnvironmentFileList": {
-    "sources": ["#/components/schemas/EnvironmentFileListResource"],
-    "order": ["object", "data", "next", "has_more"]
+    "sources": ["#/components/schemas/EnvironmentFileListResource"]
   },
   "EnvironmentInfo": {
     "sources": ["#/components/schemas/PublicEnvironmentResource"],
     "order": ["id", "object", "type", "status", "files", "plugins", "skills"]
   },
   "EnvironmentNetwork": {
-    "sources": ["#/components/schemas/NetworkPolicyResource"],
-    "order": ["access", "allowed_domains"]
+    "sources": ["#/components/schemas/NetworkPolicyResource"]
   },
   "EnvironmentNetworkInput": {
-    "sources": ["#/components/schemas/NetworkPolicyParam"],
-    "order": ["access", "allowed_domains"]
+    "sources": ["#/components/schemas/NetworkPolicyParam"]
   },
   "EnvironmentPackages": {
     "exclude": ["system"],
@@ -158,11 +128,6 @@
     },
     "order": ["npm", "python"]
   },
-  "EnvironmentPackagesInput": {
-    "exclude": ["system"],
-    "sources": ["#/components/schemas/EnvironmentPackagesParam"],
-    "order": ["npm", "python"]
-  },
   "EnvironmentPackagesResponse": {
     "sources": ["#/components/schemas/EnvironmentPackagesResource"],
     "order": ["npm", "python", "system"]
@@ -172,26 +137,17 @@
     "order": ["id", "object", "name", "created_at", "updated_at", "capability_directories", "network", "packages", "files", "plugins", "skills"]
   },
   "EnvironmentTemplateDeleted": {
-    "sources": ["#/components/schemas/DeletedEnvironmentTemplateResource"],
-    "order": ["id", "object", "deleted"]
+    "sources": ["#/components/schemas/DeletedEnvironmentTemplateResource"]
   },
   "EnvironmentTemplateList": {
     "sources": ["#/components/schemas/EnvironmentTemplateListResource"],
     "order": ["object", "data", "has_more", "first_id", "last_id"]
   },
-  "EnvironmentTemplateRequest": {
-    "sources": ["#/components/schemas/CreateEnvironmentTemplateParams"],
-    "fields": {
-      "network": {"type": "*EnvironmentNetworkInput"},
-      "files": {"type": "[]json.RawMessage"},
-      "packages": {"type": "*EnvironmentPackagesInput"}
-    },
-    "order": ["name", "network", "capability_directories", "env", "files", "packages", "plugins", "skills", "setup_commands"]
-  },
   "ErrorResponse": {
     "sources": ["#/components/schemas/ErrorResponse-2"],
-    "fields": {"error": {"type": "APIError"}},
-    "order": ["error"]
+    "fields": {
+      "error": {"type": "APIError"}
+    }
   },
   "FunctionCallAction": {
     "sources": ["#/components/schemas/SessionRequiredActionResourceFunctionCall"],
@@ -207,32 +163,28 @@
       "description": {"type": "*string"},
       "parameters": {"type": "json.RawMessage"},
       "defer_loading": {"type": "json.RawMessage"}
-    },
-    "order": ["type", "name", "description", "parameters", "defer_loading"]
+    }
   },
   "InlineAgent": {
     "sources": ["#/components/schemas/SessionAgentConfigParam"],
     "fields": {
       "x_agents_core": {"type": "*AgentsCore"},
       "reasoning": {"type": "*Reasoning"},
-      "text": {"type": "*SavedAgentTextInput"}
+      "text": {"type": "*TextConfigInput"}
     },
     "order": ["x_agents_core", "model", "instructions", "multi_agent", "reasoning", "service_tier", "text", "tools"]
   },
   "InputContent": {
-    "sources": ["#/components/schemas/InputContentParam"],
-    "order": ["type", "text", "image_url"]
+    "sources": ["#/components/schemas/InputContentParam"]
   },
   "InputMessage": {
     "sources": ["#/components/schemas/InputMessageParam"],
     "fields": {
       "type": {"type": "string"}
-    },
-    "order": ["type", "role", "content"]
+    }
   },
   "InputTokenDetails": {
-    "sources": ["#/components/schemas/InputTokensDetailsResource"],
-    "order": ["cached_tokens"]
+    "sources": ["#/components/schemas/InputTokensDetailsResource"]
   },
   "Item": {
     "sources": ["#/components/schemas/SessionTurnItemResource"],
@@ -260,8 +212,7 @@
     "sources": ["#/components/schemas/MessageContentResource", "#/components/schemas/EncryptedContentResource"],
     "fields": {
       "image_url": {"type": "string"}
-    },
-    "order": ["type", "text", "image_url", "encrypted_content"]
+    }
   },
   "ItemList": {
     "sources": ["#/components/schemas/SessionItemListResource"],
@@ -271,8 +222,7 @@
     "sources": ["#/components/schemas/PersistedMcpTransportConfigParamHttp"],
     "fields": {
       "headers": {"type": "*map[string]string"}
-    },
-    "order": ["type", "server_url", "headers"]
+    }
   },
   "MCPTool": {
     "sources": ["#/components/schemas/AgentToolResourceMcp"],
@@ -298,8 +248,7 @@
     "sources": ["#/components/schemas/MultiAgentConfigResource"],
     "fields": {
       "max_concurrent_subagents": {"type": "*int"}
-    },
-    "order": ["enabled", "max_concurrent_subagents"]
+    }
   },
   "OAuthCredentialRefresh": {
     "sources": ["#/components/schemas/McpOauthRefreshResource"],
@@ -320,28 +269,22 @@
     "fields": {
       "scope": {"type": "json.RawMessage"},
       "token_endpoint_auth": {"type": "*OAuthEndpointAuthReplacement"}
-    },
-    "order": ["refresh_token", "scope", "token_endpoint_auth"]
+    }
   },
   "OAuthEndpointAuth": {
-    "sources": ["#/components/schemas/McpOauthTokenEndpointAuthResource"],
-    "order": ["type"]
+    "sources": ["#/components/schemas/McpOauthTokenEndpointAuthResource"]
   },
   "OAuthEndpointAuthInput": {
-    "sources": ["#/components/schemas/CreateMcpOauthTokenEndpointAuthParam"],
-    "order": ["type", "client_secret"]
+    "sources": ["#/components/schemas/CreateMcpOauthTokenEndpointAuthParam"]
   },
   "OAuthEndpointAuthReplacement": {
-    "sources": ["#/components/schemas/RotateMcpOauthTokenEndpointAuthParam"],
-    "order": ["type", "client_secret"]
+    "sources": ["#/components/schemas/RotateMcpOauthTokenEndpointAuthParam"]
   },
   "OutputTokenDetails": {
-    "sources": ["#/components/schemas/OutputTokensDetailsResource"],
-    "order": ["reasoning_tokens"]
+    "sources": ["#/components/schemas/OutputTokensDetailsResource"]
   },
   "Reasoning": {
-    "sources": ["#/components/schemas/ReasoningParam"],
-    "order": ["effort", "summary"]
+    "sources": ["#/components/schemas/ReasoningParam"]
   },
   "ReasoningItem": {
     "sources": ["#/components/schemas/ReasoningItemResource"],
@@ -376,20 +319,8 @@
     "sources": ["#/components/schemas/AgentListResource"],
     "order": ["object", "data", "has_more", "first_id", "last_id"]
   },
-  "SavedAgentText": {
-    "sources": ["#/components/schemas/TextResource"],
-    "order": ["format", "verbosity"]
-  },
-  "SavedAgentTextFormat": {
-    "sources": ["#/components/schemas/TextFormatResource"],
-    "fields": {
-      "schema": {"type": "json.RawMessage"}
-    },
-    "order": ["type", "schema"]
-  },
-  "SavedAgentTextInput": {
-    "sources": ["#/components/schemas/TextParam"],
-    "order": ["format", "verbosity"]
+  "TextConfigInput": {
+    "sources": ["#/components/schemas/TextParam"]
   },
   "SendSubagentInputCallItem": {
     "sources": ["#/components/schemas/SendSubagentInputCallItemResource"],
@@ -408,8 +339,7 @@
     "order": ["id", "created_at", "environment_id", "object", "path", "session_id", "size_bytes", "turn_id"]
   },
   "SessionArtifactDeleted": {
-    "sources": ["#/components/schemas/DeletedSessionArtifactResource"],
-    "order": ["id", "object", "deleted"]
+    "sources": ["#/components/schemas/DeletedSessionArtifactResource"]
   },
   "SessionArtifactList": {
     "sources": ["#/components/schemas/SessionArtifactListResource"],
@@ -436,8 +366,7 @@
     "sources": ["#/components/schemas/SessionEnvironmentStateResource"],
     "fields": {
       "error": {"type": "*StreamError"}
-    },
-    "order": ["id", "type", "status", "error"]
+    }
   },
   "SessionEvent": {
     "sources": ["#/components/schemas/SessionEvent"],
@@ -479,12 +408,10 @@
     "order": ["id", "object", "deleted"]
   },
   "SkillList": {
-    "sources": ["#/components/schemas/SkillListResource"],
-    "order": ["object", "data", "first_id", "last_id", "has_more"]
+    "sources": ["#/components/schemas/SkillListResource"]
   },
   "SkillUpdateRequest": {
-    "sources": ["#/components/schemas/SetDefaultSkillVersionBody"],
-    "order": ["default_version"]
+    "sources": ["#/components/schemas/SetDefaultSkillVersionBody"]
   },
   "SkillVersion": {
     "sources": ["#/components/schemas/SkillVersionResource"],
@@ -495,8 +422,7 @@
     "order": ["id", "object", "version", "deleted"]
   },
   "SkillVersionList": {
-    "sources": ["#/components/schemas/SkillVersionListResource"],
-    "order": ["object", "data", "first_id", "last_id", "has_more"]
+    "sources": ["#/components/schemas/SkillVersionListResource"]
   },
   "SourceFile": {
     "sources": ["#/components/schemas/OpenAIFile"],
@@ -507,8 +433,7 @@
     "order": ["id", "object", "bytes", "created_at", "filename", "purpose", "status", "expires_at", "status_details"]
   },
   "SourceFileDeleted": {
-    "sources": ["#/components/schemas/DeleteFileResponse"],
-    "order": ["id", "object", "deleted"]
+    "sources": ["#/components/schemas/DeleteFileResponse"]
   },
   "SourceFileList": {
     "sources": ["#/components/schemas/ListFilesResponse"],
@@ -539,33 +464,19 @@
     "order": ["object", "first_id", "last_id", "data", "has_more"]
   },
   "SummaryText": {
-    "sources": ["#/components/schemas/SummaryTextResource"],
-    "order": ["type", "text"]
+    "sources": ["#/components/schemas/SummaryTextResource"]
   },
   "TextConfig": {
-    "sources": ["#/components/schemas/TextResource"],
-    "order": ["format", "verbosity"],
-    "fields": {
-      "format": {"type": "TextFormat"}
-    }
-  },
-  "TextConfigInput": {
-    "sources": ["#/components/schemas/TextParam"],
-    "fields": {
-      "format": {"type": "*TextFormat"}
-    },
-    "order": ["format", "verbosity"]
+    "sources": ["#/components/schemas/TextResource"]
   },
   "TextFormat": {
     "sources": ["#/components/schemas/TextFormatResource"],
     "fields": {
       "schema": {"type": "json.RawMessage"}
-    },
-    "order": ["type", "schema"]
+    }
   },
   "TokenUsage": {
-    "sources": ["#/components/schemas/TokenUsageResource"],
-    "order": ["input_tokens", "input_tokens_details", "output_tokens", "output_tokens_details", "total_tokens"]
+    "sources": ["#/components/schemas/TokenUsageResource"]
   },
   "Turn": {
     "sources": ["#/components/schemas/TurnResource"],
@@ -576,8 +487,7 @@
     "order": ["id", "agent_id", "subagent_id", "session_id", "object", "status", "created_at", "started_at", "completed_at", "error", "usage"]
   },
   "TurnError": {
-    "sources": ["#/components/schemas/SessionTurnErrorResource"],
-    "order": ["code", "message"]
+    "sources": ["#/components/schemas/SessionTurnErrorResource"]
   },
   "TurnList": {
     "sources": ["#/components/schemas/SessionTurnListResource"],
@@ -589,24 +499,10 @@
       "x_agents_core": {"type": "*SavedAgentCoreInput"},
       "metadata": {"type": "map[string]*string"},
       "reasoning": {"type": "*Reasoning"},
-      "text": {"type": "*SavedAgentTextInput"}
+      "text": {"type": "*TextConfigInput"}
     },
     "order": ["x_agents_core", "model", "name", "instructions", "metadata", "multi_agent", "reasoning", "service_tier", "text", "tools"]
   },
-  "UpdateCredentialRequest": {
-    "sources": ["#/components/schemas/RotateVaultCredentialParams"],
-    "fields": {
-      "auth": {"type": "*CredentialAuthReplacement"}
-    },
-    "order": ["auth"]
-  },
-  "UpdateSessionRequest": {
-    "sources": ["#/components/schemas/UpdateAgentSessionParams"],
-    "fields": {
-      "metadata": {"omit": false}
-    },
-    "order": ["metadata"]
-  },
   "Vault": {
     "sources": ["#/components/schemas/VaultResource"],
     "order": ["id", "object", "created_at", "name", "metadata"]
@@ -625,12 +521,10 @@
   },
   "WebSearchAction": {
     "marshal_union": true,
-    "sources": ["#/components/schemas/WebSearchActionResource"],
-    "order": ["type", "query", "queries", "url", "pattern"]
+    "sources": ["#/components/schemas/WebSearchActionResource"]
   },
   "reasoningResponse": {
-    "sources": ["#/components/schemas/ReasoningResource"],
-    "order": ["effort", "summary"]
+    "sources": ["#/components/schemas/ReasoningResource"]
   },
   "sessionError": {
     "sources": ["#/components/schemas/SessionErrorResource"],
diff --git a/contracts/agents-api/index.md b/contracts/agents-api/index.md
index 87dd67793..5b2f933fc 100644
--- a/contracts/agents-api/index.md
+++ b/contracts/agents-api/index.md
@@ -16,7 +16,7 @@ Core targets the complete OpenAI Agents API as pinned below ([public API rule](h
 
 Run `make openapi` to regenerate the public Go types, route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The internal `/core/v1` and `/api/v1` documents come from handler annotations. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
 
-The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` controls their Go representation where existing storage or custom JSON encoding requires it. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, request admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
+The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` lists types consumed by Core and overrides only the Go representation or field order that existing storage or custom JSON encoding requires. Unspecified fields follow the official schema; shared shapes use one Go type. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, request admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
 
 The official source and existing service have these recorded differences: Agents authentication errors can return a null `code`; empty Files pages return null `first_id` and `last_id`; File resources can return null `expires_at` and `status_details`. The source declares those fields non-null. The official-client response validator allows null only for these named fields and otherwise validates OpenAPI 3.1 response schemas. Files and Skills operations omit error responses in the source, so those error bodies use the upstream shared `ErrorResponse` schema. [Wire semantics](./wire-semantics.md) and raw HTTP tests qualify service behavior; the published schema retains the official definitions.
 
diff --git a/contracts/agents-api/v1/official.gen.go b/contracts/agents-api/v1/official.gen.go
index 0c6985fe6..1cc7b4653 100644
--- a/contracts/agents-api/v1/official.gen.go
+++ b/contracts/agents-api/v1/official.gen.go
@@ -62,21 +62,10 @@ type CreateAgentRequest struct {
 	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" extensions:"x-nullable" swaggertype:"object"`
 	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
 	ServiceTier  *string              `json:"service_tier,omitempty" extensions:"x-nullable" enums:"auto,default,flex,priority,fast"`
-	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
+	Text         *TextConfigInput     `json:"text,omitempty" extensions:"x-nullable"`
 	Tools        []json.RawMessage    `json:"tools,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
 }
 
-// CreateCredentialRequest projects CreateVaultCredentialParams.
-type CreateCredentialRequest struct {
-	Name *string              `json:"name" binding:"required"`
-	Auth *CredentialAuthInput `json:"auth" binding:"required"`
-}
-
-// CreateEventsRequest projects CreateSessionEventsParams.
-type CreateEventsRequest struct {
-	Events []SessionInput `json:"events" binding:"required"`
-}
-
 // CreateSessionRequest projects CreateAgentSessionParams.
 type CreateSessionRequest struct {
 	XAgentsCore *SessionExecutionInput `json:"x_agents_core,omitempty"`
@@ -101,12 +90,6 @@ type CreateSubagentCallItem struct {
 	ReasoningEffort *string        `json:"reasoning_effort" binding:"required" extensions:"x-nullable"`
 }
 
-// CreateVaultRequest projects CreateVaultParams.
-type CreateVaultRequest struct {
-	Name     *string            `json:"name,omitempty"`
-	Metadata map[string]*string `json:"metadata,omitempty" extensions:"x-nullable"`
-}
-
 // Credential projects VaultCredentialResource.
 type Credential struct {
 	ID        string         `json:"id" binding:"required"`
@@ -235,12 +218,6 @@ type EnvironmentPackages struct {
 	Python []string `json:"python" extensions:"x-nullable"`
 }
 
-// EnvironmentPackagesInput projects EnvironmentPackagesParam.
-type EnvironmentPackagesInput struct {
-	NPM    []string `json:"npm,omitempty" extensions:"x-nullable"`
-	Python []string `json:"python,omitempty" extensions:"x-nullable"`
-}
-
 // EnvironmentPackagesResponse projects EnvironmentPackagesResource.
 type EnvironmentPackagesResponse struct {
 	NPM    []string `json:"npm" binding:"required"`
@@ -279,19 +256,6 @@ type EnvironmentTemplateList struct {
 	LastID  *string               `json:"last_id" binding:"required" extensions:"x-nullable"`
 }
 
-// EnvironmentTemplateRequest projects CreateEnvironmentTemplateParams.
-type EnvironmentTemplateRequest struct {
-	Name                  *string                   `json:"name,omitempty" extensions:"x-nullable"`
-	Network               *EnvironmentNetworkInput  `json:"network,omitempty" extensions:"x-nullable"`
-	CapabilityDirectories []string                  `json:"capability_directories,omitempty" extensions:"x-nullable"`
-	Env                   map[string]string         `json:"env,omitempty" extensions:"x-nullable"`
-	Files                 []json.RawMessage         `json:"files,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-	Packages              *EnvironmentPackagesInput `json:"packages,omitempty" extensions:"x-nullable"`
-	Plugins               []json.RawMessage         `json:"plugins,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-	Skills                []json.RawMessage         `json:"skills,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-	SetupCommands         []json.RawMessage         `json:"setup_commands,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
-}
-
 // ErrorResponse projects ErrorResponse-2.
 type ErrorResponse struct {
 	Error APIError `json:"error" binding:"required"`
@@ -317,14 +281,14 @@ type FunctionToolInput struct {
 
 // InlineAgent projects SessionAgentConfigParam.
 type InlineAgent struct {
-	XAgentsCore  *AgentsCore          `json:"x_agents_core,omitempty"`
-	Model        *string              `json:"model,omitempty"`
-	Instructions *string              `json:"instructions,omitempty" extensions:"x-nullable"`
-	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" extensions:"x-nullable" swaggertype:"object"`
-	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
-	ServiceTier  *string              `json:"service_tier,omitempty" extensions:"x-nullable" enums:"auto,default,flex,priority,fast"`
-	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
-	Tools        []json.RawMessage    `json:"tools,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
+	XAgentsCore  *AgentsCore       `json:"x_agents_core,omitempty"`
+	Model        *string           `json:"model,omitempty"`
+	Instructions *string           `json:"instructions,omitempty" extensions:"x-nullable"`
+	MultiAgent   json.RawMessage   `json:"multi_agent,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	Reasoning    *Reasoning        `json:"reasoning,omitempty" extensions:"x-nullable"`
+	ServiceTier  *string           `json:"service_tier,omitempty" extensions:"x-nullable" enums:"auto,default,flex,priority,fast"`
+	Text         *TextConfigInput  `json:"text,omitempty" extensions:"x-nullable"`
+	Tools        []json.RawMessage `json:"tools,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
 }
 
 // InputContent projects InputContentParam.
@@ -521,7 +485,7 @@ type SavedAgentConfiguration struct {
 	MultiAgent   MultiAgentConfig  `json:"multi_agent" binding:"required"`
 	Reasoning    Reasoning         `json:"reasoning" binding:"required"`
 	ServiceTier  string            `json:"service_tier" binding:"required" enums:"auto,default,flex,priority,fast"`
-	Text         SavedAgentText    `json:"text" binding:"required"`
+	Text         TextConfig        `json:"text" binding:"required"`
 	Tools        []json.RawMessage `json:"tools" binding:"required" swaggertype:"array,object"`
 }
 
@@ -534,24 +498,6 @@ type SavedAgentList struct {
 	LastID  *string      `json:"last_id" binding:"required" extensions:"x-nullable"`
 }
 
-// SavedAgentText projects TextResource.
-type SavedAgentText struct {
-	Format    SavedAgentTextFormat `json:"format" binding:"required"`
-	Verbosity string               `json:"verbosity" binding:"required" enums:"low,medium,high"`
-}
-
-// SavedAgentTextFormat projects TextFormatResource.
-type SavedAgentTextFormat struct {
-	Type   string          `json:"type" binding:"required" enums:"text,json_schema"`
-	Schema json.RawMessage `json:"schema,omitempty" swaggertype:"object"`
-}
-
-// SavedAgentTextInput projects TextParam.
-type SavedAgentTextInput struct {
-	Format    json.RawMessage `json:"format,omitempty" extensions:"x-nullable" swaggertype:"object"`
-	Verbosity *string         `json:"verbosity,omitempty" extensions:"x-nullable" enums:"low,medium,high"`
-}
-
 // SendSubagentInputCallItem projects SendSubagentInputCallItemResource.
 type SendSubagentInputCallItem struct {
 	ID               string         `json:"id" binding:"required"`
@@ -823,8 +769,8 @@ type TextConfig struct {
 
 // TextConfigInput projects TextParam.
 type TextConfigInput struct {
-	Format    *TextFormat `json:"format,omitempty" extensions:"x-nullable"`
-	Verbosity *string     `json:"verbosity,omitempty" extensions:"x-nullable" enums:"low,medium,high"`
+	Format    json.RawMessage `json:"format,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	Verbosity *string         `json:"verbosity,omitempty" extensions:"x-nullable" enums:"low,medium,high"`
 }
 
 // TextFormat projects TextFormatResource.
@@ -882,20 +828,10 @@ type UpdateAgentRequest struct {
 	MultiAgent   json.RawMessage      `json:"multi_agent,omitempty" extensions:"x-nullable" swaggertype:"object"`
 	Reasoning    *Reasoning           `json:"reasoning,omitempty" extensions:"x-nullable"`
 	ServiceTier  *string              `json:"service_tier,omitempty" extensions:"x-nullable" enums:"auto,default,flex,priority,fast"`
-	Text         *SavedAgentTextInput `json:"text,omitempty" extensions:"x-nullable"`
+	Text         *TextConfigInput     `json:"text,omitempty" extensions:"x-nullable"`
 	Tools        []json.RawMessage    `json:"tools,omitempty" extensions:"x-nullable" swaggertype:"array,object"`
 }
 
-// UpdateCredentialRequest projects RotateVaultCredentialParams.
-type UpdateCredentialRequest struct {
-	Auth *CredentialAuthReplacement `json:"auth" binding:"required"`
-}
-
-// UpdateSessionRequest projects UpdateAgentSessionParams.
-type UpdateSessionRequest struct {
-	Metadata map[string]string `json:"metadata" extensions:"x-nullable"`
-}
-
 // Vault projects VaultResource.
 type Vault struct {
 	ID        string            `json:"id" binding:"required"`
diff --git a/contracts/agents-api/zh/index.md b/contracts/agents-api/zh/index.md
index 8fcf71028..f84d692b7 100644
--- a/contracts/agents-api/zh/index.md
+++ b/contracts/agents-api/zh/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Agents API 覆盖台账"
 source: contracts/agents-api/index.md
-source_hash: 7b56bd48dd80dc6b04909d0ee82fc873ff51bf4daeb8fbdd1570ad66a9349cd0
+source_hash: 61cd594bb0bd475b019c916e099b6e8de935b4e5cb1cde7a39f620818097900b
 ---
 
 Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[public API rule](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#public-api)）。本台账记录 Core 对各项资源实现了哪些内容、哪些契约保存其详细信息，并列出相对于 OpenAI 服务的所有已知差异和所有未解决缺口。[API namespaces and credentials](../../../docs/zh/api/index.md) 说明谁调用哪些 API；[Agents API guide](../../../docs/zh/api/public-agent-api.md) 介绍使用方法。
@@ -18,7 +18,7 @@ Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[publi
 
 运行 `make openapi` 重新生成公共 Go 类型、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
 
-公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；已有存储或自定义 JSON 编码需要特定表示时，由 `go-bindings.json` 控制其 Go 表示。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、请求准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
+公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；`go-bindings.json` 只列出 Core 使用的类型，仅在已有存储或自定义 JSON 编码需要时覆盖 Go 表示或字段顺序。未覆盖的字段遵循官方 schema，相同结构复用同一个 Go 类型。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、请求准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
 
 官方源文件与已有服务存在以下已记录的差异：Agents 鉴权错误的 `code` 可以为 null；Files 空页的 `first_id` 和 `last_id` 为 null；File 资源的 `expires_at` 和 `status_details` 可以为 null。源文件将这些字段声明为非空。官方客户端响应验证器只对这些指定字段允许 null，其余部分按 OpenAPI 3.1 响应 schema 验证。源文件中的 Files 和 Skills 操作未声明错误响应，因此这些错误体使用上游共享的 `ErrorResponse` schema。[传输语义](wire-semantics.md)和原始 HTTP 测试验证服务行为；发布的 schema 保留官方定义。
 
diff --git a/scripts/generate-public-api.py b/scripts/generate-public-api.py
index 9df4b2fce..69081f3e8 100644
--- a/scripts/generate-public-api.py
+++ b/scripts/generate-public-api.py
@@ -109,7 +109,7 @@ def enum_values(document, schema):
 def union_marshaler(document, name, binding, field_types):
     schema = resolve(document, binding['sources'][0])
     discriminator = schema['discriminator']['propertyName']
-    selector = binding.get('fields', {}).get(discriminator, {}).get('name', go_name(discriminator))
+    selector = go_name(discriminator)
     lines = [f'func (value {name}) MarshalJSON() ([]byte, error) {{', f'switch value.{selector} {{']
     for variant in variants(document, schema):
         tag, = variant['properties'][discriminator]['enum']
@@ -168,7 +168,7 @@ def go_types(document, bindings):
             # Swag still projects the internal APIs that reference these types.
             if 'json.RawMessage' in typ:
                 tags.append('swaggertype:"' + ('array,object' if typ.lstrip('*').startswith('[]') else 'object') + '"')
-            field_types[field] = (override.get('name', go_name(field)), typ)
+            field_types[field] = (go_name(field), typ)
             lines.append('\t' + field_types[field][0] + ' ' + typ + ' `' + ' '.join(tags) + '`')
         lines.append('}\n')
         if binding.get('marshal_union'):
@@ -254,17 +254,18 @@ def write(path, data, check):
 def main():
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('--check', action='store_true')
-    parser.add_argument('--swag-roots', type=Path, help='Temporary entry points for Go-owned extension types')
-    parser.add_argument('--extensions', type=Path, help='JSON definitions projected from Core extension types')
+    stage = parser.add_mutually_exclusive_group(required=True)
+    stage.add_argument('--swag-roots', type=Path, help='Temporary entry points for Go-owned extension types')
+    stage.add_argument('--extensions', type=Path, help='JSON definitions projected from Core extension types')
     args = parser.parse_args()
     source, pin = read_source()
     bindings = json.loads((CONTRACT / 'go-bindings.json').read_text())
-    write(CONTRACT / 'v1/official.gen.go', go_types(source, bindings), args.check)
     owners = extension_owners(bindings)
     if args.swag_roots:
+        write(CONTRACT / 'v1/official.gen.go', go_types(source, bindings), args.check)
         roots = 'package extensions\n\n' + '\n'.join(f'// @Success 200 {{object}} v1.{name}' for name in sorted(set(owners.values()))) + '\nfunc extensions() {}\n'
         args.swag_roots.write_text(roots)
-    if args.extensions:
+    else:
         doc = public_document(source, json.loads(args.extensions.read_text()), owners, pin["beta_header"])
         # JSON is a YAML subset and keeps generation independent of PyYAML.
         write(CONTRACT / 'openapi.yaml', (json.dumps(doc, indent=2, ensure_ascii=False) + '\n').encode(), args.check)
diff --git a/services/core/internal/api/saved_configuration.go b/services/core/internal/api/saved_configuration.go
index a73036000..37463d1bc 100644
--- a/services/core/internal/api/saved_configuration.go
+++ b/services/core/internal/api/saved_configuration.go
@@ -63,7 +63,7 @@ func resolveSavedFields(input v1.CreateAgentRequest) (agents.CreateCommand, erro
 	}
 	// Model-derived effort resolution is a recorded gap. Do not manufacture a
 	// default from the operator's execution engine or another model's catalog.
-	cfg.Text, err = resolveSavedText(input.Text)
+	cfg.Text, err = resolveText(input.Text)
 	if err != nil {
 		return agents.CreateCommand{}, err
 	}
@@ -103,21 +103,21 @@ func resolveSavedMultiAgent(raw json.RawMessage) (v1.MultiAgentConfig, error) {
 	return result, nil
 }
 
-func resolveSavedText(input *v1.SavedAgentTextInput) (v1.SavedAgentText, error) {
-	result := v1.SavedAgentText{Format: v1.SavedAgentTextFormat{Type: "text"}, Verbosity: "medium"}
+func resolveText(input *v1.TextConfigInput) (v1.TextConfig, error) {
+	result := v1.TextConfig{Format: v1.TextFormat{Type: "text"}, Verbosity: "medium"}
 	if input == nil {
 		return result, nil
 	}
-	// Reuse the Session verbosity policy without its narrower format admission.
-	text, err := resolveText(&v1.TextConfigInput{Verbosity: input.Verbosity})
-	if err != nil {
-		return result, err
+	if input.Verbosity != nil {
+		if err := validateTextVerbosity(*input.Verbosity); err != nil {
+			return result, err
+		}
+		result.Verbosity = *input.Verbosity
 	}
-	result.Verbosity = text.Verbosity
 	if len(input.Format) == 0 || bytes.Equal(bytes.TrimSpace(input.Format), []byte("null")) {
 		return result, nil
 	}
-	result.Format = v1.SavedAgentTextFormat{}
+	result.Format = v1.TextFormat{}
 	if decodeInputObject(input.Format, &result.Format, "type", "schema") != nil {
 		return result, errors.New("text.format must be a supported format object.")
 	}
@@ -136,3 +136,10 @@ func resolveSavedText(input *v1.SavedAgentTextInput) (v1.SavedAgentText, error)
 	}
 	return result, nil
 }
+
+func validateTextVerbosity(value string) error {
+	if !slices.Contains([]string{"low", "medium", "high"}, value) {
+		return errors.New("text.verbosity must be low, medium or high.")
+	}
+	return nil
+}
diff --git a/services/core/internal/api/session_agent.go b/services/core/internal/api/session_agent.go
index eb7b2ce24..bd95dfa65 100644
--- a/services/core/internal/api/session_agent.go
+++ b/services/core/internal/api/session_agent.go
@@ -84,11 +84,9 @@ func admitSessionAgent(cfg v1.SavedAgentConfiguration) (v1.Agent, error) {
 	if cfg.ServiceTier != "auto" {
 		return v1.Agent{}, errors.New("Execution currently supports service_tier=auto only.")
 	}
-	text, err := resolveText(&v1.TextConfigInput{Verbosity: &cfg.Text.Verbosity})
-	if err != nil {
+	if err := validateTextVerbosity(cfg.Text.Verbosity); err != nil {
 		return v1.Agent{}, err
 	}
-	text.Format = v1.TextFormat{Type: cfg.Text.Format.Type, Schema: cfg.Text.Format.Schema}
 	tools, err := resolveSessionTools(cfg.Tools)
 	if err != nil {
 		return v1.Agent{}, err
@@ -99,5 +97,5 @@ func admitSessionAgent(cfg v1.SavedAgentConfiguration) (v1.Agent, error) {
 	}
 	return v1.Agent{XAgentsCore: extension, Model: cfg.Model, Name: cfg.Name, Instructions: cfg.Instructions,
 		MultiAgent: cfg.MultiAgent, Reasoning: cfg.Reasoning, ServiceTier: cfg.ServiceTier,
-		Text: text, Tools: tools}, nil
+		Text: cfg.Text, Tools: tools}, nil
 }
diff --git a/services/core/internal/api/text_configuration.go b/services/core/internal/api/text_configuration.go
deleted file mode 100644
index dca8f5358..000000000
--- a/services/core/internal/api/text_configuration.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package api
-
-import (
-	"errors"
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-)
-
-func resolveText(input *v1.TextConfigInput) (v1.TextConfig, error) {
-	text := v1.TextConfig{Format: v1.TextFormat{Type: "text"}, Verbosity: "medium"}
-	if input == nil {
-		return text, nil
-	}
-	if input.Format != nil && input.Format.Type != "text" {
-		return text, errors.New("This service currently supports text.format.type=text only.")
-	}
-	if input.Verbosity != nil {
-		switch *input.Verbosity {
-		case "low", "medium", "high":
-			text.Verbosity = *input.Verbosity
-		default:
-			return text, errors.New("text.verbosity must be low, medium or high.")
-		}
-	}
-	return text, nil
-}

From 939e0c4c0f4a0a052d2352c4057b5a140d203e8a Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 22:17:16 +0800
Subject: [PATCH 32/60] Delete the adapter Prepared path (#498)

* Delete the adapter Prepared path

Every Run starts through Executor.StartTurn, and read-only preparations
are served from the bound local workspace, so the adapter Prepared
surface and its registered preparation factories have no production
caller. Port the deletion from the agent-outside-sandbox branch with the
same shape: delete agent.Prepared, PreparedCancellation,
PreparationFactory, Runtime.Preparation, RegisterPreparation and
ResolvePreparation, the Codex, Claude SDK and MiniMax Code preparation
factories, and the Claude session's unused drain. Adapters declare
WorkspaceReadPreparation beside LocalEnvironment and dispatch readies the
local preparation directly. Delete the unenforced Runtime initialization
network field and bump the protocol version.

Delete the Codex one-shot start path (Prepared.start and Session.run),
which only tests reached, and port its behaviour tests to
Executor.StartTurn. Adapters no longer write the Preparation capability
that registration derives.

The local read-only preparation holds no resource, so delete its
always-nil Close, the preparationState.prepared closer, the read-only
cleanup_unconfirmed retry path and the handoff branches that
executor-less preparations never reach.

* Settle read-only preparation release synchronously

The read-only preparation holds no resource, so its release only drops
ownership. Drop it in the same state change instead of a cleanup
goroutine behind the busy flag, and delete closePreparationResource and
the shutdown close loop. A preparation that is still publishing its
readiness keeps ownership until that returns, as before.
---
 .../agent/claudesdk/commands_session_test.go  |   8 +-
 .../internal/agent/claudesdk/contracts.go     |   5 -
 .../internal/agent/claudesdk/declaration.go   |   8 +-
 .../agent/claudesdk/declaration_test.go       |   2 +-
 .../internal/agent/claudesdk/preparation.go   | 116 ---------
 .../claudesdk/preparation_fixture_test.go     |   4 -
 .../agent/claudesdk/preparation_test.go       | 186 ++------------
 .../internal/agent/claudesdk/session.go       |  17 --
 .../internal/agent/claudesdk/unsupported.go   |   4 -
 .../agent/claudesdk/unsupported_test.go       |   2 +-
 .../agent/claudesdk/workspace_directory.go    |  15 --
 .../claudesdk/workspace_directory_test.go     |  64 +++--
 .../claudesdk/workspace_live_linux_test.go    |  93 +------
 .../agent/claudesdk/workspace_read.go         |  15 --
 .../agent/claudesdk/workspace_read_test.go    |  62 +++--
 .../claudesdk/workspace_structured_test.go    |   7 +-
 apps/daemon/internal/agent/codex/contracts.go |   5 -
 .../internal/agent/codex/declaration.go       |  11 +-
 .../internal/agent/codex/declaration_test.go  |   4 +-
 .../internal/agent/codex/executor_test.go     | 136 +++++++++-
 .../agent/codex/mcp_http_preflight_test.go    |  21 +-
 .../internal/agent/codex/mcp_required_test.go |  38 +--
 .../internal/agent/codex/preparation.go       |   9 -
 .../agent/codex/preparation_close_test.go     |  29 +++
 .../agent/codex/preparation_helpers_test.go   |   9 -
 apps/daemon/internal/agent/codex/prepared.go  |  86 +------
 .../agent/codex/prepared_cancel_test.go       | 228 -----------------
 .../internal/agent/codex/prepared_test.go     | 235 ------------------
 .../internal/agent/codex/recovery_test.go     |  20 +-
 .../internal/agent/codex/session_run.go       |  22 --
 .../codex/session_steering_lifecycle_test.go  |   8 +-
 .../internal/agent/codex/unsupported.go       |  12 -
 .../internal/agent/codex/unsupported_test.go  |   6 +-
 .../internal/agent/configuration_test.go      |  37 +--
 .../agent/contract_declarations_test.go       |   8 +-
 apps/daemon/internal/agent/harness.go         |  74 +-----
 apps/daemon/internal/agent/mcode/contracts.go |   5 -
 .../internal/agent/mcode/declaration.go       |   4 -
 .../internal/agent/mcode/declaration_test.go  |   2 +-
 .../agent/mcode/discovery_workspace.go        |   3 +-
 .../agent/mcode/environment_mcp_test.go       |  16 +-
 .../internal/agent/mcode/executor_test.go     |  20 ++
 .../internal/agent/mcode/preparation.go       |  86 -------
 .../internal/agent/mcode/preparation_test.go  | 165 ------------
 .../internal/agent/mcode/unsupported.go       |  12 -
 .../internal/agent/mcode/unsupported_test.go  |   6 +-
 apps/daemon/internal/agent/registry.go        |  12 -
 apps/daemon/internal/agent/registry_test.go   |  28 +--
 apps/daemon/internal/cli/preparation_test.go  |  41 ---
 apps/daemon/internal/dispatch/executor.go     |   2 +-
 .../internal/dispatch/local_directory.go      |  20 --
 .../internal/dispatch/local_directory_test.go |   8 +-
 apps/daemon/internal/dispatch/preparation.go  | 122 +++------
 .../dispatch/preparation_cancel_test.go       |  43 +---
 .../internal/dispatch/preparation_cleanup.go  |  42 +---
 .../dispatch/preparation_cleanup_test.go      |  10 +-
 .../preparation_executor_fixture_test.go      |  29 ++-
 .../internal/dispatch/preparation_start.go    |   2 +-
 .../internal/dispatch/preparation_test.go     |  17 +-
 .../prepared_handoff_mutation_test.go         |   6 +-
 .../dispatch/prepared_handoff_test.go         |  14 +-
 apps/daemon/internal/dispatch/router_test.go  |   2 +-
 .../runtime_preparation_execution_test.go     |   3 +-
 apps/daemon/internal/dispatch/shutdown.go     |   5 +-
 .../dispatch/workspace_directory_test.go      |   2 +-
 .../workspace_preparation_failure_test.go     |  81 ------
 .../workspace_preparation_status_test.go      | 119 +--------
 .../internal/dispatch/workspace_read.go       |   1 -
 .../localworkspace/runtime_initialization.go  |   3 -
 .../runtime_initialization_test.go            |   8 +-
 contracts/agents-api/harness-onboarding.md    |  16 +-
 contracts/agents-api/zh/harness-onboarding.md |  18 +-
 docs/runtime-protocol.md                      |   2 +-
 docs/zh/runtime-protocol.md                   |   4 +-
 internal/agentdaemon/proto/runtime_prepare.go |   8 +-
 .../agentdaemon/proto/runtime_prepare_test.go |  21 +-
 internal/agentdaemon/proto/version.go         |   2 +-
 .../core/internal/execution/runtime_setup.go  |   5 +-
 .../runtimegateway/runtime_prepare_test.go    |   2 +-
 79 files changed, 520 insertions(+), 2103 deletions(-)
 delete mode 100644 apps/daemon/internal/agent/claudesdk/preparation.go
 delete mode 100644 apps/daemon/internal/agent/codex/prepared_cancel_test.go
 delete mode 100644 apps/daemon/internal/agent/codex/prepared_test.go
 delete mode 100644 apps/daemon/internal/agent/mcode/preparation.go
 delete mode 100644 apps/daemon/internal/agent/mcode/preparation_test.go
 delete mode 100644 apps/daemon/internal/cli/preparation_test.go
 delete mode 100644 apps/daemon/internal/dispatch/local_directory.go
 delete mode 100644 apps/daemon/internal/dispatch/workspace_preparation_failure_test.go

diff --git a/apps/daemon/internal/agent/claudesdk/commands_session_test.go b/apps/daemon/internal/agent/claudesdk/commands_session_test.go
index 9789776c0..b19a7584e 100644
--- a/apps/daemon/internal/agent/claudesdk/commands_session_test.go
+++ b/apps/daemon/internal/agent/claudesdk/commands_session_test.go
@@ -18,7 +18,7 @@ import (
 
 func TestWorkspaceCommandsRequirePackagedFeature(t *testing.T) {
 	config := preparationFixture(t, "old-command-runtime")
-	if _, err := NewPreparationFactory(config)(t.Context(), preparationRequest()); err == nil || !strings.Contains(err.Error(), "workspace preparation is unavailable") {
+	if _, err := NewExecutorFactory(config)(t.Context(), preparationRequest()); err == nil || !strings.Contains(err.Error(), "workspace preparation is unavailable") {
 		t.Fatal("old bridge accepted command observations", err)
 	}
 	if _, err := os.Stat(filepath.Join(config.StateDir, "launched")); !os.IsNotExist(err) {
@@ -28,16 +28,16 @@ func TestWorkspaceCommandsRequirePackagedFeature(t *testing.T) {
 
 func TestWorkspaceCommandFramesKeepStartIdentityAndObservedOutput(t *testing.T) {
 	config := preparationFixture(t, "commands-success")
-	resource, err := NewPreparationFactory(config)(t.Context(), preparationRequest())
+	resource, err := NewExecutorFactory(config)(t.Context(), preparationRequest())
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer resource.Close()
+	defer resource.Close(context.Background())
 	if _, err := os.Stat(filepath.Join(config.StateDir, "start.json")); !os.IsNotExist(err) {
 		t.Fatal("preparation submitted a command")
 	}
 	out := make(chan proto.Envelope, 16)
-	s, err := resource.Start(t.Context(), "actual-command-run", proto.TextInput("hello"), out)
+	s, err := resource.StartTurn(t.Context(), "actual-command-run", proto.TextInput("hello"), out)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/agent/claudesdk/contracts.go b/apps/daemon/internal/agent/claudesdk/contracts.go
index 72b94bdad..3d6be7a98 100644
--- a/apps/daemon/internal/agent/claudesdk/contracts.go
+++ b/apps/daemon/internal/agent/claudesdk/contracts.go
@@ -14,12 +14,7 @@ var (
 	_ agent.WorkspaceReader          = (*session)(nil)
 	_ agent.WorkspaceDirectoryLister = (*session)(nil)
 	_ agent.WorkspaceWriter          = (*session)(nil)
-	_ agent.Prepared                 = (*prepared)(nil)
-	_ agent.PreparedCancellation     = (*prepared)(nil)
 	_ agent.WorkspaceReader          = (*executor)(nil)
 	_ agent.WorkspaceDirectoryLister = (*executor)(nil)
 	_ agent.WorkspaceWriter          = (*executor)(nil)
-	_ agent.WorkspaceReader          = (*prepared)(nil)
-	_ agent.WorkspaceDirectoryLister = (*prepared)(nil)
-	_ agent.WorkspaceWriter          = (*prepared)(nil)
 )
diff --git a/apps/daemon/internal/agent/claudesdk/declaration.go b/apps/daemon/internal/agent/claudesdk/declaration.go
index 6459a635f..d422248fa 100644
--- a/apps/daemon/internal/agent/claudesdk/declaration.go
+++ b/apps/daemon/internal/agent/claudesdk/declaration.go
@@ -116,8 +116,8 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, d
 		}
 		caps := &out.Info.Capabilities
 		caps.EnvironmentNone, caps.FunctionTools = proto.CapabilityUnsupported, proto.CapabilityFromBool(info.SupportsWorkspaceFunctions())
-		caps.Preparation, caps.LocalEnvironment = proto.CapabilitySupported, proto.CapabilitySupported
-		caps.WorkspaceReadPreparation, caps.NativeSessionRecovery = proto.CapabilitySupported, proto.CapabilitySupported
+		caps.LocalEnvironment, caps.WorkspaceReadPreparation = proto.CapabilitySupported, proto.CapabilitySupported
+		caps.NativeSessionRecovery = proto.CapabilitySupported
 	}
 	out.Info.Available, out.Info.Version = true, info.SDK
 	out.Info.Capabilities.MessageImages = proto.CapabilityFromBool(info.SupportsMessageImages())
@@ -139,10 +139,6 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, d
 		out.Info.Capabilities.MCPHTTPRequired = proto.CapabilityUnsupported
 	}
 	out.Executor = NewExecutorFactory(config)
-	if out.Info.Capabilities.LocalEnvironment.IsSupported() {
-		out.Preparation = NewPreparationFactory(config)
-		out.WorkspaceReadPreparation = true
-	}
 
 	fmt.Fprintf(options.Stdout, "Claude SDK preflight ok (SDK %s, %s)\n", info.SDK, info.Native)
 	return out
diff --git a/apps/daemon/internal/agent/claudesdk/declaration_test.go b/apps/daemon/internal/agent/claudesdk/declaration_test.go
index 6ff1a6350..9181b5454 100644
--- a/apps/daemon/internal/agent/claudesdk/declaration_test.go
+++ b/apps/daemon/internal/agent/claudesdk/declaration_test.go
@@ -116,7 +116,7 @@ func TestRuntimeDiscoveryConfigurationAndRegistration(t *testing.T) {
 				}
 				continue
 			}
-			if calls != 1 || runtime.Info.Available != ready || (runtime.Executor != nil) != ready || runtime.Preparation != nil {
+			if calls != 1 || runtime.Info.Available != ready || (runtime.Executor != nil) != ready || runtime.Info.Capabilities.WorkspaceReadPreparation.IsSupported() {
 				t.Fatalf("runtime: %+v", runtime)
 			}
 			registry := agent.NewRegistry()
diff --git a/apps/daemon/internal/agent/claudesdk/preparation.go b/apps/daemon/internal/agent/claudesdk/preparation.go
deleted file mode 100644
index af9df8e01..000000000
--- a/apps/daemon/internal/agent/claudesdk/preparation.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package claudesdk
-
-import (
-	"context"
-	"errors"
-	"sync"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-// prepared is a single admission for direct adapter callers. It uses the same
-// Executor as pooled Runtime execution; workspace reads retain the owner.
-type prepared struct {
-	mu       sync.Mutex
-	executor *executor
-	session  *session
-	binding  *preparedStart
-	closed   bool
-}
-
-type preparedStart struct {
-	turn agent.Turn
-	done chan struct{}
-}
-
-func NewPreparationFactory(config Config) agent.PreparationFactory {
-	factory := NewExecutorFactory(config)
-	return func(ctx context.Context, req proto.PromptRequestPayload) (agent.Prepared, error) {
-		if config.Workspace == nil {
-			return nil, errors.New("claudesdk: workspace preparation requires a bound workspace")
-		}
-		resource, err := factory(ctx, req)
-		if resource == nil {
-			return nil, err
-		}
-		e := resource.(*executor)
-		return &prepared{executor: e, session: e.base}, err
-	}
-}
-
-func (p *prepared) Start(ctx context.Context, run string, input proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
-	p.mu.Lock()
-	if p.closed || p.binding != nil {
-		p.mu.Unlock()
-		return nil, errors.New("claudesdk: admission is unavailable")
-	}
-	binding := &preparedStart{done: make(chan struct{})}
-	p.binding = binding
-	p.mu.Unlock()
-	turn, err := p.executor.StartTurn(ctx, run, input, out)
-	p.mu.Lock()
-	binding.turn = turn
-	if turn == nil {
-		p.binding = nil
-	}
-	close(binding.done)
-	p.mu.Unlock()
-	if turn != nil {
-		go func() { _, _ = turn.AwaitSettlement(context.Background()); _ = p.executor.Close(context.Background()) }()
-	}
-	return turn, err
-}
-
-func (p *prepared) Close() error {
-	p.mu.Lock()
-	if p.binding != nil {
-		p.mu.Unlock()
-		return nil
-	}
-	p.closed = true
-	p.mu.Unlock()
-	return p.executor.Close(context.Background())
-}
-
-func (p *prepared) Cancel(ctx context.Context) error {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	p.mu.Lock()
-	p.closed = true
-	binding := p.binding
-	p.mu.Unlock()
-	if binding == nil {
-		return p.executor.Close(ctx)
-	}
-	select {
-	case <-binding.done:
-	default:
-		if err := p.executor.Close(ctx); err != nil {
-			return err
-		}
-		select {
-		case <-binding.done:
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	}
-	if binding.turn == nil {
-		return p.executor.Close(ctx)
-	}
-	if err := binding.turn.Cancel(ctx); err != nil {
-		return err
-	}
-	p.executor.retire()
-	return nil
-}
-
-func (p *prepared) CancellationOutcome() proto.DonePayload {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.binding == nil || p.binding.turn == nil {
-		return proto.DonePayload{}
-	}
-	return p.binding.turn.CancellationOutcome()
-}
diff --git a/apps/daemon/internal/agent/claudesdk/preparation_fixture_test.go b/apps/daemon/internal/agent/claudesdk/preparation_fixture_test.go
index 224a25feb..081a199b9 100644
--- a/apps/daemon/internal/agent/claudesdk/preparation_fixture_test.go
+++ b/apps/daemon/internal/agent/claudesdk/preparation_fixture_test.go
@@ -106,10 +106,6 @@ func runPreparationHelper() {
 	_ = json.Unmarshal(fields["turn_id"], &turnID)
 	emit, finish := helperTurnOutput(scanner, turnID)
 	defer finish()
-	if mode == "cancellation" {
-		runCancellationHelper(request, "cancellation-wait", scanner, emit)
-		return
-	}
 	if strings.HasPrefix(mode, "commands") {
 		runCommandsHelper(request, mode, scanner, emit)
 		return
diff --git a/apps/daemon/internal/agent/claudesdk/preparation_test.go b/apps/daemon/internal/agent/claudesdk/preparation_test.go
index f6c868640..5c03d23c5 100644
--- a/apps/daemon/internal/agent/claudesdk/preparation_test.go
+++ b/apps/daemon/internal/agent/claudesdk/preparation_test.go
@@ -5,12 +5,9 @@ package claudesdk
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"os"
 	"path/filepath"
-	"reflect"
 	"strings"
-	"sync"
 	"syscall"
 	"testing"
 	"time"
@@ -24,15 +21,15 @@ func TestPreparationWaitsForReceiptAndRetainsConfiguration(t *testing.T) {
 	req := preparationRequest()
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
 	defer cancel()
-	result := make(chan agent.Prepared, 1)
+	result := make(chan agent.Executor, 1)
 	failed := make(chan error, 1)
 	go func() {
-		p, err := NewPreparationFactory(config)(ctx, req)
+		e, err := NewExecutorFactory(config)(ctx, req)
 		if err != nil {
 			failed <- err
 			return
 		}
-		result <- p
+		result <- e
 	}()
 	raw := waitPreparationFile(t, filepath.Join(config.StateDir, "prepare.json"))
 	select {
@@ -45,17 +42,17 @@ func TestPreparationWaitsForReceiptAndRetainsConfiguration(t *testing.T) {
 	if err := os.WriteFile(filepath.Join(config.StateDir, "ready"), nil, 0o600); err != nil {
 		t.Fatal(err)
 	}
-	var preparedResource agent.Prepared
+	var resource agent.Executor
 	select {
-	case preparedResource = <-result:
+	case resource = <-result:
 	case err := <-failed:
 		t.Fatal(err)
 	case <-ctx.Done():
 		t.Fatal(ctx.Err())
 	}
-	p := preparedResource.(*prepared)
-	defer p.Cancel(context.Background())
-	pid := p.session.process.Cmd.Process.Pid
+	e := resource.(*executor)
+	defer e.Close(context.Background())
+	pid := e.base.process.Cmd.Process.Pid
 	if _, err := os.Stat(filepath.Join(config.StateDir, "start.json")); !os.IsNotExist(err) {
 		t.Fatal("preparation submitted input")
 	}
@@ -68,24 +65,17 @@ func TestPreparationWaitsForReceiptAndRetainsConfiguration(t *testing.T) {
 	}
 	config.Env[0] = "ANTHROPIC_AUTH_TOKEN=changed"
 	config.Workspace.Directory = "/changed"
-	config.Workspace.Directory = "/changed"
 	req.AgentOptions["model"] = "changed"
 	req.AgentSessionID = "changed"
 	out := make(chan proto.Envelope, 16)
 	operation, stopOperation := context.WithCancel(ctx)
-	s, err := p.Start(operation, "actual-run", proto.TextInput("hello"), out)
+	turn, err := e.StartTurn(operation, "actual-run", proto.TextInput("hello"), out)
 	stopOperation()
 	if err != nil {
 		t.Fatal(err)
 	}
-	if s.(*session).owner != p.executor || s.(*session).process.Cmd.Process.Pid != pid {
-		t.Fatal("Start replaced the prepared native process")
-	}
-	if err := p.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := p.Start(ctx, "duplicate", proto.TextInput("hello"), make(chan proto.Envelope, 8)); err == nil {
-		t.Fatal("duplicate Start was accepted")
+	if turn.(*session).owner != e || turn.(*session).process.Cmd.Process.Pid != pid {
+		t.Fatal("StartTurn replaced the prepared native process")
 	}
 	var done proto.DonePayload
 	for event := range out {
@@ -107,7 +97,7 @@ func TestPreparationWaitsForReceiptAndRetainsConfiguration(t *testing.T) {
 }
 
 func TestPreparationRejectsInputAndUnavailableProfilesBeforeLaunch(t *testing.T) {
-	for _, name := range []string{"run", "prompt", "attachments", "subagents", "workspace-missing", "none", "functions", "mcp", "controls", "old-runtime"} {
+	for _, name := range []string{"run", "prompt", "attachments", "subagents", "none", "functions", "mcp", "controls", "old-runtime"} {
 		t.Run(name, func(t *testing.T) {
 			config := preparationFixture(t, name)
 			req := preparationRequest()
@@ -120,8 +110,6 @@ func TestPreparationRejectsInputAndUnavailableProfilesBeforeLaunch(t *testing.T)
 				req.Input = proto.MessageInput{{Content: []proto.InputContent{{Type: "input_image"}}}}
 			case "subagents":
 				req.ObserveSubagentIdentities = true
-			case "workspace-missing":
-				config.Workspace = nil
 			case "none":
 				req.DisableExecutionEnvironment = true
 			case "functions":
@@ -131,7 +119,7 @@ func TestPreparationRejectsInputAndUnavailableProfilesBeforeLaunch(t *testing.T)
 			case "controls":
 				req.ExecutionControls = &proto.ExecutionControls{WebSearch: "enabled", TextVerbosity: "medium"}
 			}
-			if _, err := NewPreparationFactory(config)(t.Context(), req); err == nil {
+			if _, err := NewExecutorFactory(config)(t.Context(), req); err == nil {
 				t.Fatal("invalid preparation was accepted")
 			}
 			if _, err := os.Stat(filepath.Join(config.StateDir, "launched")); !os.IsNotExist(err) {
@@ -147,7 +135,7 @@ func TestPreparationFailureAndUnusedRelease(t *testing.T) {
 			config := preparationFixture(t, mode)
 			owner, stop := context.WithCancel(t.Context())
 			defer stop()
-			resource, err := NewPreparationFactory(config)(owner, preparationRequest())
+			resource, err := NewExecutorFactory(config)(owner, preparationRequest())
 			if mode == "history-missing" || mode == "invalid-receipt" {
 				if err == nil || mode == "history-missing" && !strings.Contains(err.Error(), "history_unavailable") {
 					t.Fatal("preparation failure was lost", err)
@@ -157,15 +145,15 @@ func TestPreparationFailureAndUnusedRelease(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			p := resource.(*prepared)
-			defer p.Cancel(context.Background())
+			e := resource.(*executor)
+			defer e.Close(context.Background())
 			switch mode {
 			case "close":
-				err = p.Close()
+				err = e.Close(t.Context())
 			case "owner-cancel":
 				stop()
 			case "native-exit":
-				err = p.session.process.Cmd.Process.Signal(syscall.SIGKILL)
+				err = e.base.process.Cmd.Process.Signal(syscall.SIGKILL)
 			case "invalid-start", "cancelled-start":
 				operation, cancel := context.WithCancel(t.Context())
 				prompt := ""
@@ -173,150 +161,24 @@ func TestPreparationFailureAndUnusedRelease(t *testing.T) {
 					prompt = "hello"
 					cancel()
 				}
-				_, startErr := p.Start(operation, "run", proto.TextInput(prompt), make(chan proto.Envelope, 8))
+				_, startErr := e.StartTurn(operation, "run", proto.TextInput(prompt), make(chan proto.Envelope, 8))
 				cancel()
 				if startErr == nil {
-					t.Fatal("invalid or cancelled Start succeeded")
+					t.Fatal("invalid or cancelled StartTurn succeeded")
 				}
-				err = p.Close()
+				err = e.Close(t.Context())
 			}
 			if err != nil {
 				t.Fatal(err)
 			}
 			select {
-			case <-p.executor.done:
+			case <-e.done:
 			case <-time.After(5 * time.Second):
 				t.Fatal("unused process was not settled")
 			}
-			if _, err := p.Start(t.Context(), "late", proto.TextInput("hello"), make(chan proto.Envelope, 8)); err == nil {
-				t.Fatal("released preparation was reusable")
-			}
-			if got := p.CancellationOutcome(); !reflect.DeepEqual(got, proto.DonePayload{}) {
-				t.Fatal("unstarted process fabricated an execution outcome", got)
+			if _, err := e.StartTurn(t.Context(), "late", proto.TextInput("hello"), make(chan proto.Envelope, 8)); err == nil {
+				t.Fatal("released Executor was reusable")
 			}
 		})
 	}
 }
-
-func TestPreparedCancellationKeepsOwnershipUntilOutputDrain(t *testing.T) {
-	config := preparationFixture(t, "cancellation")
-	owner, stop := context.WithTimeout(t.Context(), 10*time.Second)
-	defer stop()
-	resource, err := NewPreparationFactory(config)(owner, preparationRequest())
-	if err != nil {
-		t.Fatal(err)
-	}
-	p := resource.(*prepared)
-	defer p.Cancel(context.Background())
-	out := make(chan proto.Envelope)
-	operation, stopOperation := context.WithCancel(owner)
-	if _, err := p.Start(operation, "run", proto.TextInput("hello"), out); err != nil {
-		t.Fatal(err)
-	}
-	stopOperation()
-	if err := p.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if event := <-out; event.Type != proto.TypeDelta {
-		t.Fatal("operation cancellation or Close cancelled the Session")
-	}
-	short, cancel := context.WithTimeout(owner, 30*time.Millisecond)
-	err = p.Cancel(short)
-	cancel()
-	if !errors.Is(err, context.DeadlineExceeded) || !reflect.DeepEqual(p.CancellationOutcome(), proto.DonePayload{}) {
-		t.Fatal("pending output drain reported settled ownership", err)
-	}
-	if err := os.WriteFile(filepath.Join(config.StateDir, "release"), nil, 0o600); err != nil {
-		t.Fatal(err)
-	}
-	if err := p.Cancel(owner); err != nil {
-		t.Fatal(err)
-	}
-	got := p.CancellationOutcome()
-	if got.Content != "partialtaildrained" || got.Metadata[proto.DoneMetaAgentSessionID] != "native-session" || got.Usage.Raw["claude_sdk_result"] == nil {
-		t.Fatal("cancellation across transfer lost observed output", got)
-	}
-	for range out {
-	}
-}
-
-func TestPreparedStartRacesCloseAndCancellation(t *testing.T) {
-	for _, cancelResource := range []bool{false, true} {
-		for range 6 {
-			config := preparationFixture(t, "success")
-			resource, err := NewPreparationFactory(config)(t.Context(), preparationRequest())
-			if err != nil {
-				t.Fatal(err)
-			}
-			p := resource.(*prepared)
-			out := make(chan proto.Envelope, 16)
-			var running agent.Session
-			var startErr error
-			var wg sync.WaitGroup
-			wg.Add(2)
-			go func() {
-				defer wg.Done()
-				running, startErr = p.Start(t.Context(), "run", proto.TextInput("hello"), out)
-			}()
-			go func() {
-				defer wg.Done()
-				if cancelResource {
-					_ = p.Cancel(t.Context())
-				} else {
-					_ = p.Close()
-				}
-			}()
-			wg.Wait()
-			if startErr == nil {
-				if running == nil {
-					t.Fatal("successful transfer lost its Session")
-				}
-				for range out {
-				}
-			}
-			if err := p.Cancel(t.Context()); err != nil {
-				// A racing Close can confirm resource cleanup without proving the Turn result.
-				if closeErr := p.executor.Close(t.Context()); closeErr != nil {
-					t.Fatal(closeErr)
-				}
-			}
-			select {
-			case <-p.session.process.Done():
-			default:
-				t.Fatal("race left the owned process alive")
-			}
-		}
-	}
-}
-
-func TestPreparedConcurrentStartTransfersOnlyOnce(t *testing.T) {
-	config := preparationFixture(t, "success")
-	resource, err := NewPreparationFactory(config)(t.Context(), preparationRequest())
-	if err != nil {
-		t.Fatal(err)
-	}
-	p := resource.(*prepared)
-	defer p.Cancel(context.Background())
-	results := make(chan bool, 2)
-	var wg sync.WaitGroup
-	for range 2 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			out := make(chan proto.Envelope, 16)
-			_, err := p.Start(t.Context(), "run", proto.TextInput("hello"), out)
-			results <- err == nil
-			if err == nil {
-				for event := range out {
-					if event.Type == proto.TypeError {
-						t.Error("losing Start cancelled the transferred Session")
-					}
-				}
-			}
-		}()
-	}
-	wg.Wait()
-	if first, second := <-results, <-results; first == second {
-		t.Fatal("concurrent Start did not produce exactly one owner")
-	}
-}
diff --git a/apps/daemon/internal/agent/claudesdk/session.go b/apps/daemon/internal/agent/claudesdk/session.go
index cf241ef07..f252ce14f 100644
--- a/apps/daemon/internal/agent/claudesdk/session.go
+++ b/apps/daemon/internal/agent/claudesdk/session.go
@@ -72,23 +72,6 @@ func launch(ctx context.Context, config Config, start startRequest, env []string
 	return &session{process: process, writeMu: &sync.Mutex{}, functions: functionState{calls: map[string]*pendingFunction{}}, settled: make(chan struct{})}, nil
 }
 
-func (s *session) drain(scanner *bridgeOutput, stderrDone <-chan struct{}, failure error) (error, bool) {
-	for scanner.Scan() {
-	}
-	if scanner.Err() != nil {
-		failure = fmt.Errorf("claudesdk: SDK bridge output read failed")
-		s.process.Cancel()
-	}
-	<-stderrDone
-	s.stopWorkspaceReads()
-	s.stopWorkspaceDirectories()
-	waitErr := s.process.Wait()
-	if waitErr != nil && failure == nil {
-		failure = fmt.Errorf("claudesdk: SDK process failed")
-	}
-	return failure, scanner.Err() == nil && waitErr == nil
-}
-
 func bridgeFailure(code string) error {
 	switch code {
 	case "invalid_request", "history_unavailable", "execution_failed", "cancelled":
diff --git a/apps/daemon/internal/agent/claudesdk/unsupported.go b/apps/daemon/internal/agent/claudesdk/unsupported.go
index d66e3cd5f..154d904a4 100644
--- a/apps/daemon/internal/agent/claudesdk/unsupported.go
+++ b/apps/daemon/internal/agent/claudesdk/unsupported.go
@@ -13,7 +13,3 @@ func (s *executor) WriteWorkspaceFile(context.Context, string, []byte) (agent.Wo
 func (s *session) WriteWorkspaceFile(context.Context, string, []byte) (agent.WorkspaceWriteResult, error) {
 	return agent.WorkspaceWriteResult{}, agent.ErrWorkspaceWriteUnsupported
 }
-
-func (s *prepared) WriteWorkspaceFile(context.Context, string, []byte) (agent.WorkspaceWriteResult, error) {
-	return agent.WorkspaceWriteResult{}, agent.ErrWorkspaceWriteUnsupported
-}
diff --git a/apps/daemon/internal/agent/claudesdk/unsupported_test.go b/apps/daemon/internal/agent/claudesdk/unsupported_test.go
index 9934a1038..7fe6048c5 100644
--- a/apps/daemon/internal/agent/claudesdk/unsupported_test.go
+++ b/apps/daemon/internal/agent/claudesdk/unsupported_test.go
@@ -24,7 +24,7 @@ func TestUnsupportedExtensionsHaveNoNativeEffects(t *testing.T) {
 			t.Fatal("unsupported error disclosed input")
 		}
 	}
-	for _, owner := range []agent.WorkspaceWriter{(*executor)(nil), (*session)(nil), (*prepared)(nil)} {
+	for _, owner := range []agent.WorkspaceWriter{(*executor)(nil), (*session)(nil)} {
 		result, err := owner.WriteWorkspaceFile(ctx, secret, []byte(secret))
 		check(err)
 		if result.SizeBytes != 0 {
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_directory.go b/apps/daemon/internal/agent/claudesdk/workspace_directory.go
index 5b4150cba..1bde6cbe5 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_directory.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_directory.go
@@ -39,23 +39,8 @@ type workspaceDirectoryEvent struct {
 	Error     string                     `json:"error"`
 }
 
-var _ agent.WorkspaceDirectoryLister = (*prepared)(nil)
 var _ agent.WorkspaceDirectoryLister = (*session)(nil)
 
-func (p *prepared) ListWorkspaceDirectory(ctx context.Context, path string, maxEntries int) (agent.WorkspaceDirectoryResult, error) {
-	p.mu.Lock()
-	if p.closed || p.binding != nil {
-		p.mu.Unlock()
-		return agent.WorkspaceDirectoryResult{}, agent.ErrWorkspaceReadUnavailable
-	}
-	read, err := p.session.admitWorkspaceDirectory(ctx, path, maxEntries)
-	p.mu.Unlock()
-	if err != nil {
-		return agent.WorkspaceDirectoryResult{}, err
-	}
-	return p.session.awaitWorkspaceDirectory(ctx, read)
-}
-
 func (s *session) ListWorkspaceDirectory(ctx context.Context, path string, maxEntries int) (agent.WorkspaceDirectoryResult, error) {
 	if s.owner != nil {
 		return s.owner.base.ListWorkspaceDirectory(ctx, path, maxEntries)
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_directory_test.go b/apps/daemon/internal/agent/claudesdk/workspace_directory_test.go
index 1c052d736..e073cffae 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_directory_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_directory_test.go
@@ -84,70 +84,64 @@ func runWorkspaceDirectoryHelper(scanner *bufio.Scanner, state, mode string) {
 	}
 }
 
-func directoryPreparation(t *testing.T, mode string) (*prepared, Config) {
+func directoryExecutor(t *testing.T, mode string) (*executor, Config) {
 	t.Helper()
 	config := preparationFixture(t, mode)
-	resource, err := NewPreparationFactory(config)(t.Context(), preparationRequest())
+	resource, err := NewExecutorFactory(config)(t.Context(), preparationRequest())
 	if err != nil {
 		t.Fatal(err)
 	}
-	p := resource.(*prepared)
-	t.Cleanup(func() { _ = p.Cancel(context.Background()) })
-	return p, config
+	e := resource.(*executor)
+	t.Cleanup(func() { _ = e.Close(context.Background()) })
+	return e, config
 }
 
-func TestWorkspaceDirectoryPreparedBoundsAndMetadata(t *testing.T) {
-	p, _ := directoryPreparation(t, "directory-normal")
+func TestWorkspaceDirectoryBoundsAndMetadata(t *testing.T) {
+	e, _ := directoryExecutor(t, "directory-normal")
 	for _, path := range []string{"/absolute", "../escape", "a//b", "a/./b", "a\\b", "a\x00b", strings.Repeat("界", 3000)} {
-		if _, err := p.ListWorkspaceDirectory(t.Context(), path, 4); !errors.Is(err, agent.ErrWorkspaceReadInvalid) {
+		if _, err := e.ListWorkspaceDirectory(t.Context(), path, 4); !errors.Is(err, agent.ErrWorkspaceReadInvalid) {
 			t.Fatalf("accepted %q: %v", path, err)
 		}
 	}
 	for _, limit := range []int{0, -1, workspaceDirectoryMaxEntries + 1} {
-		if _, err := p.ListWorkspaceDirectory(t.Context(), "", limit); err != agent.ErrWorkspaceReadInvalid {
+		if _, err := e.ListWorkspaceDirectory(t.Context(), "", limit); err != agent.ErrWorkspaceReadInvalid {
 			t.Fatal(limit, err)
 		}
 	}
-	result, err := p.ListWorkspaceDirectory(t.Context(), "", 4)
+	result, err := e.ListWorkspaceDirectory(t.Context(), "", 4)
 	if err != nil || result.Truncated || len(result.Entries) != 1 || result.Entries[0].SizeBytes == nil || *result.Entries[0].SizeBytes != 3 {
 		t.Fatal(result, err)
 	}
-	empty, err := p.ListWorkspaceDirectory(t.Context(), "empty", 4)
+	empty, err := e.ListWorkspaceDirectory(t.Context(), "empty", 4)
 	if err != nil || len(empty.Entries) != 0 || empty.Entries == nil {
 		t.Fatal(empty, err)
 	}
 	for path, expected := range map[string]error{"not_found": fs.ErrNotExist, "permission": fs.ErrPermission, "invalid": agent.ErrWorkspaceReadInvalid} {
-		if _, err := p.ListWorkspaceDirectory(t.Context(), path, 4); err != expected {
+		if _, err := e.ListWorkspaceDirectory(t.Context(), path, 4); err != expected {
 			t.Fatal(path, err)
 		}
 	}
-	if _, err := p.ListWorkspaceDirectory(t.Context(), "", 4); err != nil {
+	if _, err := e.ListWorkspaceDirectory(t.Context(), "", 4); err != nil {
 		t.Fatal(err)
 	}
 }
 
-func TestWorkspaceDirectoryDetachAndTransfer(t *testing.T) {
-	p, config := directoryPreparation(t, "directory-held")
+func TestWorkspaceDirectoryDetachAndTurnStart(t *testing.T) {
+	e, config := directoryExecutor(t, "directory-held")
 	ctx, detach := context.WithCancel(t.Context())
 	defer detach()
 	result := make(chan error, 1)
-	go func() { _, err := p.ListWorkspaceDirectory(ctx, "file", 4); result <- err }()
+	go func() { _, err := e.ListWorkspaceDirectory(ctx, "file", 4); result <- err }()
 	waitPreparationFile(t, filepath.Join(config.StateDir, "directory-admitted"))
 	detach()
-	if _, err := p.ListWorkspaceDirectory(t.Context(), "file", 4); err != agent.ErrWorkspaceReadBusy {
+	if _, err := e.ListWorkspaceDirectory(t.Context(), "file", 4); err != agent.ErrWorkspaceReadBusy {
 		t.Fatal(err)
 	}
 	out := make(chan proto.Envelope, 16)
-	running, err := p.Start(t.Context(), "run", proto.TextInput("hello"), out)
+	running, err := e.StartTurn(t.Context(), "run", proto.TextInput("hello"), out)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if p.Close() != nil {
-		t.Fatal("transferred Close failed")
-	}
-	if _, err := p.ListWorkspaceDirectory(t.Context(), "file", 4); err != agent.ErrWorkspaceReadUnavailable {
-		t.Fatal(err)
-	}
 	select {
 	case err := <-result:
 		t.Fatal("caller detach discarded native wait", err)
@@ -168,24 +162,24 @@ func TestWorkspaceDirectoryDetachAndTransfer(t *testing.T) {
 func TestWorkspaceDirectoryUnknownAndRelease(t *testing.T) {
 	for _, path := range []string{"uncertain", "wrong-id", "bad-kind", "bad-size", "missing-size", "duplicate", "escape-name", "null", "extra"} {
 		t.Run(path, func(t *testing.T) {
-			p, _ := directoryPreparation(t, "directory-normal")
-			result, err := p.ListWorkspaceDirectory(t.Context(), path, 4)
+			e, _ := directoryExecutor(t, "directory-normal")
+			result, err := e.ListWorkspaceDirectory(t.Context(), path, 4)
 			if err != agent.ErrWorkspaceReadUncertain || len(result.Entries) != 0 {
 				t.Fatal(result, err)
 			}
-			if _, err := p.ListWorkspaceDirectory(t.Context(), "file", 4); err != agent.ErrWorkspaceReadUncertain && err != agent.ErrWorkspaceReadUnavailable {
+			if _, err := e.ListWorkspaceDirectory(t.Context(), "file", 4); err != agent.ErrWorkspaceReadUncertain && err != agent.ErrWorkspaceReadUnavailable {
 				t.Fatal(err)
 			}
 		})
 	}
 	for _, mode := range []string{"directory-held", "directory-exit"} {
 		t.Run(mode, func(t *testing.T) {
-			p, config := directoryPreparation(t, mode)
+			e, config := directoryExecutor(t, mode)
 			done := make(chan error, 1)
-			go func() { _, err := p.ListWorkspaceDirectory(t.Context(), "file", 4); done <- err }()
+			go func() { _, err := e.ListWorkspaceDirectory(t.Context(), "file", 4); done <- err }()
 			waitPreparationFile(t, filepath.Join(config.StateDir, "directory-admitted"))
 			if mode == "directory-held" {
-				if err := p.Close(); err != nil {
+				if err := e.Close(t.Context()); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -202,19 +196,19 @@ func TestWorkspaceDirectoryUnknownAndRelease(t *testing.T) {
 }
 
 func TestWorkspaceDirectoryDeadlineStopsOwnerBeforeUnknown(t *testing.T) {
-	p, config := directoryPreparation(t, "directory-held")
+	e, config := directoryExecutor(t, "directory-held")
 	ctx, cancel := context.WithTimeout(t.Context(), 100*time.Millisecond)
 	defer cancel()
 	done := make(chan error, 1)
-	go func() { _, err := p.ListWorkspaceDirectory(ctx, "file", 4); done <- err }()
+	go func() { _, err := e.ListWorkspaceDirectory(ctx, "file", 4); done <- err }()
 	waitPreparationFile(t, filepath.Join(config.StateDir, "directory-admitted"))
 	if err := <-done; err != agent.ErrWorkspaceReadUncertain {
 		t.Fatal(err)
 	}
-	if p.session.process.Context().Err() == nil {
+	if e.base.process.Context().Err() == nil {
 		t.Fatal("uncertain deadline returned before owner cancellation")
 	}
-	if _, err := p.Start(t.Context(), "late", proto.TextInput("hello"), make(chan proto.Envelope, 8)); err == nil {
-		t.Fatal("unknown owner accepted a new Start")
+	if _, err := e.StartTurn(t.Context(), "late", proto.TextInput("hello"), make(chan proto.Envelope, 8)); err == nil {
+		t.Fatal("unknown owner accepted a new Turn")
 	}
 }
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go b/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
index d1c1f9417..b0143e694 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
@@ -13,7 +13,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/google/uuid"
 )
@@ -21,14 +20,6 @@ import (
 // Run only inside a separately qualified outer placement, with its pinned native
 // dependencies. This fixture does not create isolation or public admission.
 func TestLiveClaudeWorkspaceFactory(t *testing.T) {
-	testLiveClaudeWorkspace(t, false)
-}
-
-func TestLiveClaudePreparedWorkspace(t *testing.T) {
-	testLiveClaudeWorkspace(t, true)
-}
-
-func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 	configFile := os.Getenv("OAC_TEST_CLAUDE_WORKSPACE_LIVE_CONFIG")
 	if configFile == "" {
 		t.Skip("requires explicit qualified placement and real provider configuration")
@@ -72,20 +63,16 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 	heartbeat := filepath.Join(config.Workspace.Directory, "heartbeat.txt")
 	artifact := filepath.Join(config.Workspace.Directory, "value.txt")
 	type evidence struct {
-		Reads                 []liveWorkspaceRead `json:"reads,omitempty"`
-		RunID                 string              `json:"run_id"`
-		Events                []proto.Envelope    `json:"events"`
-		Done                  proto.DonePayload   `json:"done"`
-		Failure               string              `json:"failure,omitempty"`
-		Cancelled             bool                `json:"cancelled"`
-		CancelMS              int64               `json:"cancel_ms,omitempty"`
-		BridgePID             int                 `json:"bridge_pid"`
-		Terminals             int                 `json:"terminals"`
-		Heartbeats            []string            `json:"heartbeats,omitempty"`
-		PreparedPID           int                 `json:"prepared_pid,omitempty"`
-		NativeBefore          string              `json:"native_before,omitempty"`
-		NativeAfter           string              `json:"native_after,omitempty"`
-		StartContextCancelled bool                `json:"start_context_cancelled,omitempty"`
+		Reads      []liveWorkspaceRead `json:"reads,omitempty"`
+		RunID      string              `json:"run_id"`
+		Events     []proto.Envelope    `json:"events"`
+		Done       proto.DonePayload   `json:"done"`
+		Failure    string              `json:"failure,omitempty"`
+		Cancelled  bool                `json:"cancelled"`
+		CancelMS   int64               `json:"cancel_ms,omitempty"`
+		BridgePID  int                 `json:"bridge_pid"`
+		Terminals  int                 `json:"terminals"`
+		Heartbeats []string            `json:"heartbeats,omitempty"`
 	}
 	writeEvidence := func(name string, proof evidence) {
 		t.Helper()
@@ -107,39 +94,7 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 		req.ObserveMessages = true
 		req.AgentOptions = map[string]any{"model": "MiniMax-M3", "system_prompt": "Follow the exact verification instructions using the requested native tools. Preserve conversation facts. No other files, network operations or background work."}
 		proof := evidence{RunID: req.RunID}
-		var running agent.Session
-		var owner agent.PreparedCancellation
-		if explicitPreparation {
-			preparation := req
-			preparation.RunID, preparation.Input = "", nil
-			var resource agent.Prepared
-			resource, err = NewPreparationFactory(config)(ctx, preparation)
-			if err == nil {
-				defer resource.Close()
-				owner = resource.(agent.PreparedCancellation)
-				proof.PreparedPID = resource.(*prepared).session.process.Cmd.Process.Pid
-				proof.NativeBefore = liveWorkspaceNativeIdentity(t, proof.PreparedPID)
-				before, _ := os.ReadFile(artifact)
-				time.Sleep(500 * time.Millisecond)
-				after, _ := os.ReadFile(artifact)
-				if !bytes.Equal(before, after) || liveWorkspaceNativeIdentity(t, proof.PreparedPID) != proof.NativeBefore || len(out) != 0 {
-					t.Fatal("prepared resource changed before initial input")
-				}
-				proof.Reads = append(proof.Reads, liveWorkspaceReads(t, ctx, resource.(agent.WorkspaceReader), config.Workspace.Directory, "prepared", "read-binary.bin", "read-empty.bin", "read-large.bin")...)
-				operation, stopOperation := context.WithCancel(ctx)
-				running, err = resource.Start(operation, req.RunID, req.Input, out)
-				stopOperation()
-				proof.StartContextCancelled = true
-				if err == nil {
-					proof.NativeAfter = liveWorkspaceNativeIdentity(t, proof.PreparedPID)
-					if proof.NativeBefore != proof.NativeAfter || resource.Close() != nil {
-						t.Fatal("Start replaced the native process or Close affected its transfer")
-					}
-				}
-			}
-		} else {
-			running, err = startSingleTurn(ctx, config, req, out)
-		}
+		running, err := startSingleTurn(ctx, config, req, out)
 		if err != nil {
 			if name == "missing-history" && running == nil && strings.Contains(err.Error(), "history_unavailable") {
 				proof.Failure = err.Error()
@@ -152,13 +107,6 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 		defer s.Cancel(context.Background())
 		proof.BridgePID = s.process.Cmd.Process.Pid
 		proof.Reads = append(proof.Reads, liveWorkspaceReads(t, ctx, s, config.Workspace.Directory, "active", "read-binary.bin", "read-empty.bin", "read-large.bin")...)
-		if explicitPreparation && proof.BridgePID != proof.PreparedPID {
-			t.Fatal("Start replaced the prepared bridge")
-		}
-		cancelOwned, outcome := s.Cancel, s.CancellationOutcome
-		if owner != nil {
-			cancelOwned, outcome = owner.Cancel, owner.CancellationOutcome
-		}
 		ticker := time.NewTicker(80 * time.Millisecond)
 		defer ticker.Stop()
 		for out != nil {
@@ -170,7 +118,7 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 				if cancelOnEffect && !proof.Cancelled && len(value) > 0 && string(value) != "0" && string(value) != "1" {
 					proof.Reads = append(proof.Reads, liveWorkspaceReads(t, ctx, s, config.Workspace.Directory, "effect", "value.txt")...)
 					started := time.Now()
-					if err := cancelOwned(ctx); err != nil {
+					if err := s.Cancel(ctx); err != nil {
 						t.Fatal("factory cancellation failed", err)
 					}
 					proof.CancelMS = time.Since(started).Milliseconds()
@@ -201,7 +149,7 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 			if len(a) == 0 || !bytes.Equal(a, b) {
 				t.Fatal("native command effects continued after Cancel")
 			}
-			settled, _ := json.Marshal(outcome())
+			settled, _ := json.Marshal(s.CancellationOutcome())
 			done, _ := json.Marshal(proof.Done)
 			if !bytes.Equal(settled, done) {
 				t.Fatal("cancellation outcome differs from terminal Done")
@@ -278,18 +226,3 @@ func testLiveClaudeWorkspace(t *testing.T, explicitPreparation bool) {
 		t.Fatal(err)
 	}
 }
-
-func liveWorkspaceNativeIdentity(t *testing.T, bridgePID int) string {
-	t.Helper()
-	raw, err := os.ReadFile(fmt.Sprintf("/proc/%d/task/%d/children", bridgePID, bridgePID))
-	children := strings.Fields(string(raw))
-	if err != nil || len(children) != 1 {
-		t.Fatal("expected exactly one retained native child", err)
-	}
-	status, err := os.ReadFile("/proc/" + children[0] + "/stat")
-	fields := strings.Fields(string(status)[strings.LastIndex(string(status), ")")+1:])
-	if err != nil || len(fields) < 20 {
-		t.Fatal("native process identity unavailable", err)
-	}
-	return children[0] + ":" + fields[19]
-}
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_read.go b/apps/daemon/internal/agent/claudesdk/workspace_read.go
index 9d8f4a568..ec5ea4a56 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_read.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_read.go
@@ -39,23 +39,8 @@ type workspaceReadEvent struct {
 	Error     string  `json:"error"`
 }
 
-var _ agent.WorkspaceReader = (*prepared)(nil)
 var _ agent.WorkspaceReader = (*session)(nil)
 
-func (p *prepared) ReadWorkspaceFile(ctx context.Context, path string, maxBytes int) (agent.WorkspaceReadResult, error) {
-	p.mu.Lock()
-	if p.closed || p.binding != nil {
-		p.mu.Unlock()
-		return agent.WorkspaceReadResult{}, agent.ErrWorkspaceReadUnavailable
-	}
-	read, err := p.session.admitWorkspaceRead(ctx, path, maxBytes)
-	p.mu.Unlock()
-	if err != nil {
-		return agent.WorkspaceReadResult{}, err
-	}
-	return p.session.awaitWorkspaceRead(ctx, read)
-}
-
 func (s *session) ReadWorkspaceFile(ctx context.Context, path string, maxBytes int) (agent.WorkspaceReadResult, error) {
 	if s.owner != nil {
 		return s.owner.base.ReadWorkspaceFile(ctx, path, maxBytes)
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_read_test.go b/apps/daemon/internal/agent/claudesdk/workspace_read_test.go
index 083c2387a..72d32a943 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_read_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_read_test.go
@@ -78,32 +78,32 @@ func runWorkspaceReadHelper(scanner *bufio.Scanner, state, mode string) {
 	}
 }
 
-func readPreparation(t *testing.T, mode string) (*prepared, Config) {
+func readExecutor(t *testing.T, mode string) (*executor, Config) {
 	t.Helper()
 	config := preparationFixture(t, mode)
-	resource, err := NewPreparationFactory(config)(t.Context(), preparationRequest())
+	resource, err := NewExecutorFactory(config)(t.Context(), preparationRequest())
 	if err != nil {
 		t.Fatal(err)
 	}
-	p := resource.(*prepared)
-	t.Cleanup(func() { _ = p.Cancel(context.Background()) })
-	return p, config
+	e := resource.(*executor)
+	t.Cleanup(func() { _ = e.Close(context.Background()) })
+	return e, config
 }
 
-func TestWorkspaceReadPreparedBoundsAndBinary(t *testing.T) {
-	p, _ := readPreparation(t, "read-normal")
+func TestWorkspaceReadBoundsAndBinary(t *testing.T) {
+	e, _ := readExecutor(t, "read-normal")
 	for _, path := range []string{"", "/absolute", "../escape", "a//b", "a/./b", "a\\b", "a\x00b", strings.Repeat("界", 3000)} {
-		if _, err := p.ReadWorkspaceFile(t.Context(), path, 4); !errors.Is(err, agent.ErrWorkspaceReadInvalid) {
+		if _, err := e.ReadWorkspaceFile(t.Context(), path, 4); !errors.Is(err, agent.ErrWorkspaceReadInvalid) {
 			t.Fatalf("accepted %q: %v", path, err)
 		}
 	}
 	for _, limit := range []int{0, -1, workspaceReadMaxBytes + 1} {
-		if _, err := p.ReadWorkspaceFile(t.Context(), "file", limit); err != agent.ErrWorkspaceReadInvalid {
+		if _, err := e.ReadWorkspaceFile(t.Context(), "file", limit); err != agent.ErrWorkspaceReadInvalid {
 			t.Fatal(limit, err)
 		}
 	}
 	for _, path := range []string{"file", "prefix", "empty"} {
-		result, err := p.ReadWorkspaceFile(t.Context(), path, workspaceReadMaxBytes)
+		result, err := e.ReadWorkspaceFile(t.Context(), path, workspaceReadMaxBytes)
 		expected := bytes.Repeat([]byte{0, 255, 1, 128}, workspaceReadMaxBytes/4)
 		if path == "empty" {
 			expected = nil
@@ -112,36 +112,30 @@ func TestWorkspaceReadPreparedBoundsAndBinary(t *testing.T) {
 			t.Fatal(path, err, len(result.Data), result.Truncated)
 		}
 	}
-	if _, err := p.ReadWorkspaceFile(t.Context(), "invalid", 4); err != agent.ErrWorkspaceReadInvalid {
+	if _, err := e.ReadWorkspaceFile(t.Context(), "invalid", 4); err != agent.ErrWorkspaceReadInvalid {
 		t.Fatal(err)
 	}
-	if _, err := p.ReadWorkspaceFile(t.Context(), "file", 4); err != nil {
+	if _, err := e.ReadWorkspaceFile(t.Context(), "file", 4); err != nil {
 		t.Fatal(err)
 	}
 }
 
-func TestWorkspaceReadDetachAndTransfer(t *testing.T) {
-	p, config := readPreparation(t, "read-held")
+func TestWorkspaceReadDetachAndTurnStart(t *testing.T) {
+	e, config := readExecutor(t, "read-held")
 	ctx, detach := context.WithCancel(t.Context())
 	defer detach()
 	result := make(chan error, 1)
-	go func() { _, err := p.ReadWorkspaceFile(ctx, "file", 4); result <- err }()
+	go func() { _, err := e.ReadWorkspaceFile(ctx, "file", 4); result <- err }()
 	waitPreparationFile(t, filepath.Join(config.StateDir, "read-admitted"))
 	detach()
-	if _, err := p.ReadWorkspaceFile(t.Context(), "file", 4); err != agent.ErrWorkspaceReadBusy {
+	if _, err := e.ReadWorkspaceFile(t.Context(), "file", 4); err != agent.ErrWorkspaceReadBusy {
 		t.Fatal(err)
 	}
 	out := make(chan proto.Envelope, 16)
-	running, err := p.Start(t.Context(), "run", proto.TextInput("hello"), out)
+	running, err := e.StartTurn(t.Context(), "run", proto.TextInput("hello"), out)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if p.Close() != nil {
-		t.Fatal("transferred Close failed")
-	}
-	if _, err := p.ReadWorkspaceFile(t.Context(), "file", 4); err != agent.ErrWorkspaceReadUnavailable {
-		t.Fatal(err)
-	}
 	select {
 	case err := <-result:
 		t.Fatal("caller detach discarded native wait", err)
@@ -162,24 +156,24 @@ func TestWorkspaceReadDetachAndTransfer(t *testing.T) {
 func TestWorkspaceReadUnknownAndRelease(t *testing.T) {
 	for _, path := range []string{"uncertain", "wrong-id", "bad-base64", "oversize", "extra"} {
 		t.Run(path, func(t *testing.T) {
-			p, _ := readPreparation(t, "read-normal")
-			result, err := p.ReadWorkspaceFile(t.Context(), path, 4)
+			e, _ := readExecutor(t, "read-normal")
+			result, err := e.ReadWorkspaceFile(t.Context(), path, 4)
 			if err != agent.ErrWorkspaceReadUncertain || len(result.Data) != 0 {
 				t.Fatal(result, err)
 			}
-			if _, err := p.ReadWorkspaceFile(t.Context(), "file", 4); err != agent.ErrWorkspaceReadUncertain && err != agent.ErrWorkspaceReadUnavailable {
+			if _, err := e.ReadWorkspaceFile(t.Context(), "file", 4); err != agent.ErrWorkspaceReadUncertain && err != agent.ErrWorkspaceReadUnavailable {
 				t.Fatal(err)
 			}
 		})
 	}
 	for _, mode := range []string{"read-held", "read-exit"} {
 		t.Run(mode, func(t *testing.T) {
-			p, config := readPreparation(t, mode)
+			e, config := readExecutor(t, mode)
 			done := make(chan error, 1)
-			go func() { _, err := p.ReadWorkspaceFile(t.Context(), "file", 4); done <- err }()
+			go func() { _, err := e.ReadWorkspaceFile(t.Context(), "file", 4); done <- err }()
 			waitPreparationFile(t, filepath.Join(config.StateDir, "read-admitted"))
 			if mode == "read-held" {
-				if err := p.Close(); err != nil {
+				if err := e.Close(t.Context()); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -196,19 +190,19 @@ func TestWorkspaceReadUnknownAndRelease(t *testing.T) {
 }
 
 func TestWorkspaceReadDeadlineStopsOwnerBeforeUnknown(t *testing.T) {
-	p, config := readPreparation(t, "read-held")
+	e, config := readExecutor(t, "read-held")
 	ctx, cancel := context.WithTimeout(t.Context(), 100*time.Millisecond)
 	defer cancel()
 	done := make(chan error, 1)
-	go func() { _, err := p.ReadWorkspaceFile(ctx, "file", 4); done <- err }()
+	go func() { _, err := e.ReadWorkspaceFile(ctx, "file", 4); done <- err }()
 	waitPreparationFile(t, filepath.Join(config.StateDir, "read-admitted"))
 	if err := <-done; err != agent.ErrWorkspaceReadUncertain {
 		t.Fatal(err)
 	}
-	if p.session.process.Context().Err() == nil {
+	if e.base.process.Context().Err() == nil {
 		t.Fatal("uncertain deadline returned before owner cancellation")
 	}
-	if _, err := p.Start(t.Context(), "late", proto.TextInput("hello"), make(chan proto.Envelope, 8)); err == nil {
-		t.Fatal("unknown owner accepted a new Start")
+	if _, err := e.StartTurn(t.Context(), "late", proto.TextInput("hello"), make(chan proto.Envelope, 8)); err == nil {
+		t.Fatal("unknown owner accepted a new Turn")
 	}
 }
diff --git a/apps/daemon/internal/agent/claudesdk/workspace_structured_test.go b/apps/daemon/internal/agent/claudesdk/workspace_structured_test.go
index 357eb8127..ec627a49e 100644
--- a/apps/daemon/internal/agent/claudesdk/workspace_structured_test.go
+++ b/apps/daemon/internal/agent/claudesdk/workspace_structured_test.go
@@ -3,6 +3,7 @@
 package claudesdk
 
 import (
+	"context"
 	"encoding/json"
 	"os"
 	"path/filepath"
@@ -20,7 +21,7 @@ func TestWorkspaceStructuredPreparationQualificationAndFrozenSchema(t *testing.T
 			req.ObserveMessages = true
 			schema := `{"type":"object","properties":{"n":{"const":9007199254740992}}}`
 			req.ExecutionControls = &proto.ExecutionControls{WebSearch: "disabled", TextVerbosity: "medium", OutputFormat: &proto.OutputFormat{Type: "json_schema", Schema: json.RawMessage(schema)}}
-			p, err := NewPreparationFactory(config)(t.Context(), req)
+			e, err := NewExecutorFactory(config)(t.Context(), req)
 			if mode == "structured-missing" {
 				if err == nil || !strings.Contains(err.Error(), "workspace structured output") {
 					t.Fatal("unqualified bundle admitted", err)
@@ -33,7 +34,7 @@ func TestWorkspaceStructuredPreparationQualificationAndFrozenSchema(t *testing.T
 			if err != nil {
 				t.Fatal(err)
 			}
-			defer p.Close()
+			defer e.Close(context.Background())
 			req.ExecutionControls.OutputFormat.Schema[0] = ' '
 			var frozen startRequest
 			if err := json.Unmarshal(waitPreparationFile(t, filepath.Join(config.StateDir, "prepare.json")), &frozen); err != nil {
@@ -43,7 +44,7 @@ func TestWorkspaceStructuredPreparationQualificationAndFrozenSchema(t *testing.T
 				t.Fatal("prepared native schema changed with caller memory")
 			}
 			out := make(chan proto.Envelope, 16)
-			if _, err := p.Start(t.Context(), "run", proto.TextInput("hello"), out); err != nil {
+			if _, err := e.StartTurn(t.Context(), "run", proto.TextInput("hello"), out); err != nil {
 				t.Fatal(err)
 			}
 			for event := range out {
diff --git a/apps/daemon/internal/agent/codex/contracts.go b/apps/daemon/internal/agent/codex/contracts.go
index a6f045a89..1304b87e5 100644
--- a/apps/daemon/internal/agent/codex/contracts.go
+++ b/apps/daemon/internal/agent/codex/contracts.go
@@ -14,12 +14,7 @@ var (
 	_ agent.WorkspaceReader          = (*Session)(nil)
 	_ agent.WorkspaceDirectoryLister = (*Session)(nil)
 	_ agent.WorkspaceWriter          = (*Session)(nil)
-	_ agent.Prepared                 = (*Prepared)(nil)
-	_ agent.PreparedCancellation     = (*Prepared)(nil)
 	_ agent.WorkspaceReader          = (*Executor)(nil)
 	_ agent.WorkspaceDirectoryLister = (*Executor)(nil)
 	_ agent.WorkspaceWriter          = (*Executor)(nil)
-	_ agent.WorkspaceReader          = (*Prepared)(nil)
-	_ agent.WorkspaceDirectoryLister = (*Prepared)(nil)
-	_ agent.WorkspaceWriter          = (*Prepared)(nil)
 )
diff --git a/apps/daemon/internal/agent/codex/declaration.go b/apps/daemon/internal/agent/codex/declaration.go
index 8e5aa004b..14d3277a0 100644
--- a/apps/daemon/internal/agent/codex/declaration.go
+++ b/apps/daemon/internal/agent/codex/declaration.go
@@ -61,18 +61,9 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, i
 	caps := &runtime.Info.Capabilities
 	caps.NativeSessionRecovery = proto.CapabilityFromBool(SupportsNativeSessionRecovery(version))
 	caps.LocalEnvironment = proto.CapabilityFromBool(SupportsLocalEnvironment(version))
+	caps.WorkspaceReadPreparation = caps.LocalEnvironment
 	caps.MCPHTTPRequired = proto.CapabilityFromBool(SupportsNativeSessionRecovery(version))
 	runtime.Executor = NewExecutorFactory()
-	if caps.LocalEnvironment.IsSupported() {
-		runtime.WorkspaceReadPreparation = true
-		runtime.Preparation = func(ctx context.Context, req proto.PromptRequestPayload) (agent.Prepared, error) {
-			prepared, err := Prepare(ctx, req)
-			if prepared == nil {
-				return nil, err
-			}
-			return prepared, err
-		}
-	}
 	fmt.Fprintf(options.Stdout, "Codex preflight ok (%s)\n", version)
 	return runtime
 }
diff --git a/apps/daemon/internal/agent/codex/declaration_test.go b/apps/daemon/internal/agent/codex/declaration_test.go
index 8f5c7e757..87f94299c 100644
--- a/apps/daemon/internal/agent/codex/declaration_test.go
+++ b/apps/daemon/internal/agent/codex/declaration_test.go
@@ -15,7 +15,7 @@ func TestMCPRequiredDiscoveryRequiresPinnedNative(t *testing.T) {
 	for _, version := range []string{"codex-cli 0.153.4", "codex-cli 0.153.3", "codex-cli 0.154.0"} {
 		runtime := discoverWithCheck(t.Context(), agent.DiscoveryOptions{Stdout: io.Discard, Stderr: io.Discard}, Declaration.Info, func(context.Context, string) (string, error) { return version, nil })
 
-		if !runtime.Info.Available || runtime.Executor == nil || (runtime.Preparation != nil) != SupportsLocalEnvironment(version) {
+		if !runtime.Info.Available || runtime.Executor == nil || runtime.Info.Capabilities.WorkspaceReadPreparation.IsSupported() != SupportsLocalEnvironment(version) {
 			t.Fatalf("factories: %+v", runtime)
 		}
 		if runtime.Info.Capabilities.MCPHTTPRequired.IsSupported() != (version == "codex-cli 0.153.4") {
@@ -49,7 +49,7 @@ func TestDeclaredCapabilityBaseline(t *testing.T) {
 
 func TestUnavailableRuntimeHasNoExecutionFactories(t *testing.T) {
 	runtime := discoverWithCheck(t.Context(), agent.DiscoveryOptions{Stdout: io.Discard, Stderr: io.Discard}, Declaration.Info, func(context.Context, string) (string, error) { return "", errors.New("missing") })
-	if runtime.Info.Available || runtime.Executor != nil || runtime.Preparation != nil {
+	if runtime.Info.Available || runtime.Executor != nil {
 		t.Fatalf("unavailable runtime: %+v", runtime)
 	}
 }
diff --git a/apps/daemon/internal/agent/codex/executor_test.go b/apps/daemon/internal/agent/codex/executor_test.go
index f864d5899..1f1696d6e 100644
--- a/apps/daemon/internal/agent/codex/executor_test.go
+++ b/apps/daemon/internal/agent/codex/executor_test.go
@@ -2,8 +2,10 @@ package codex
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"os"
+	"strings"
 	"sync"
 	"sync/atomic"
 	"testing"
@@ -17,22 +19,32 @@ import (
 func executorFixture(t *testing.T, mode string) (*Executor, string) {
 	t.Helper()
 	req, cfg, root := preparationFixture(t)
+	e, err := testExecutor(t, mode, req, cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return e, root
+}
+
+// testExecutor prepares through the production factory and closes the owner at cleanup.
+func testExecutor(t *testing.T, mode string, req proto.PromptRequestPayload, cfg sessionConfig) (*Executor, error) {
+	t.Helper()
 	t.Setenv("OAC_TEST_EXECUTOR_MODE", mode)
 	ownerCtx, cancelOwner := context.WithCancel(context.Background())
 	t.Cleanup(cancelOwner)
 	e, err := newExecutor(ownerCtx, req, cfg)
-	if err != nil {
-		t.Fatal(err)
+	if e != nil {
+		t.Cleanup(func() {
+			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+			defer cancel()
+			if err := e.Close(ctx); err != nil {
+				t.Error(err)
+			}
+		})
 	}
-	t.Cleanup(func() {
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		defer cancel()
-		if err := e.Close(ctx); err != nil {
-			t.Error(err)
-		}
-	})
-	return e, root
+	return e, err
 }
+
 func awaitExecutorTurn(t *testing.T, turn agent.Turn, out <-chan proto.Envelope) agent.TurnSettlement {
 	t.Helper()
 	ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
@@ -52,6 +64,21 @@ func awaitExecutorTurn(t *testing.T, turn agent.Turn, out <-chan proto.Envelope)
 	}
 	return settlement
 }
+
+// settledFrames waits for a Turn to settle and returns its complete output.
+func settledFrames(t *testing.T, turn agent.Turn, out <-chan proto.Envelope) []proto.Envelope {
+	t.Helper()
+	ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
+	defer cancel()
+	if _, err := turn.AwaitSettlement(ctx); errors.Is(err, context.DeadlineExceeded) {
+		t.Fatal("Turn did not settle")
+	}
+	var frames []proto.Envelope
+	for frame := range out {
+		frames = append(frames, frame)
+	}
+	return frames
+}
 func TestExecutorNormalTurnsKeepProcessAndThread(t *testing.T) {
 	e, root := executorFixture(t, "complete")
 	var previous agent.Turn
@@ -84,6 +111,95 @@ func TestExecutorNormalTurnsKeepProcessAndThread(t *testing.T) {
 		t.Fatal("normal completion closed executor")
 	}
 }
+func TestExecutorFreezesPreparedConfiguration(t *testing.T) {
+	for _, resume := range []bool{false, true} {
+		t.Run(map[bool]string{false: "new", true: "resumed"}[resume], func(t *testing.T) {
+			req, cfg, root := preparationFixture(t)
+			expectedThread := "thread/start"
+			if resume {
+				req.AgentSessionID, expectedThread = "fixture-native-thread", "thread/resume"
+			}
+			e, err := testExecutor(t, "complete", req, cfg)
+			if err != nil {
+				t.Fatal(err)
+			}
+			assertPreparationOnly(t, root)
+			cwd := e.prepared.plan.Cwd
+			// Caller-owned data cannot revise the prepared native configuration.
+			req.AgentOptions["model"] = "different-model"
+			req.AgentSessionID = "different-thread"
+			copy(req.FunctionTools[0].Parameters, strings.ReplaceAll(string(req.FunctionTools[0].Parameters), "integer", "boolean"))
+			out := make(chan proto.Envelope, 20)
+			turn, err := e.StartTurn(t.Context(), "actual-run", proto.TextInput("actual prompt"), out)
+			if err != nil {
+				t.Fatal(err)
+			}
+			awaitExecutorTurn(t, turn, out)
+			counts := map[string]int{}
+			for _, frame := range preparationFrames(t, root) {
+				counts[frame.Method]++
+				var params struct {
+					Model        string                `json:"model"`
+					ThreadID     string                `json:"threadId"`
+					DynamicTools []dynamicFunctionTool `json:"dynamicTools"`
+					Cwd          string                `json:"cwd"`
+					Environments json.RawMessage       `json:"environments"`
+				}
+				if err := json.Unmarshal(frame.Params, &params); err != nil {
+					t.Fatal(err)
+				}
+				if frame.Method == "thread/start" && (params.Model != "fixture-model" || len(params.DynamicTools) != 1 ||
+					!strings.Contains(string(params.DynamicTools[0].InputSchema), "integer") || params.Cwd != cwd) {
+					t.Fatal("prepared configuration changed", string(frame.Params))
+				}
+				if frame.Method == "thread/resume" && params.ThreadID != "fixture-native-thread" {
+					t.Fatal("prepared resume changed")
+				}
+				if len(params.Environments) != 0 {
+					t.Fatal("prepared environment changed")
+				}
+			}
+			if counts["initialize"] != 1 || counts["environment/status"] != 2 || counts[expectedThread] != 1 || counts["turn/start"] != 1 {
+				t.Fatal("unexpected native setup/start count", counts)
+			}
+		})
+	}
+}
+
+func TestExecutorUnavailableOwnerStartsNoTurn(t *testing.T) {
+	for _, reason := range []string{"closed", "owner cancelled", "rpc exited"} {
+		t.Run(reason, func(t *testing.T) {
+			req, cfg, root := preparationFixture(t)
+			owner, cancelOwner := context.WithCancel(context.Background())
+			defer cancelOwner()
+			e, err := newExecutor(owner, req, cfg)
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer e.Close(context.Background())
+			switch reason {
+			case "closed":
+				err = e.Close(t.Context())
+			case "owner cancelled":
+				cancelOwner()
+			case "rpc exited":
+				err = e.prepared.session.rpc.Close()
+			}
+			if err != nil {
+				t.Fatal(err)
+			}
+			out := make(chan proto.Envelope, 1)
+			if turn, err := e.StartTurn(t.Context(), "late-run", proto.TextInput("must not start"), out); turn != nil || err == nil {
+				t.Fatal("unavailable executor started a Turn", err)
+			}
+			if len(out) != 0 {
+				t.Fatal("rejected start emitted output")
+			}
+			assertPreparationOnly(t, root)
+		})
+	}
+}
+
 func TestExecutorCancellationSettlesThenReuses(t *testing.T) {
 	e, root := executorFixture(t, "complete")
 	out := make(chan proto.Envelope, 20)
diff --git a/apps/daemon/internal/agent/codex/mcp_http_preflight_test.go b/apps/daemon/internal/agent/codex/mcp_http_preflight_test.go
index 20b42094b..c57e3297c 100644
--- a/apps/daemon/internal/agent/codex/mcp_http_preflight_test.go
+++ b/apps/daemon/internal/agent/codex/mcp_http_preflight_test.go
@@ -1,13 +1,11 @@
 package codex
 
 import (
-	"context"
 	"encoding/json"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
@@ -155,9 +153,9 @@ func TestPublicMCPHTTPPreparationChecksBeforeNewAndResumedThread(t *testing.T) {
 			path := filepath.Join(root, "native-config.json")
 			writeMCPHTTPConfigResponse(t, path, response)
 			t.Setenv("OAC_TEST_PREPARATION_MCP_CONFIG", path)
-			p, err := newPreparation(t.Context(), req, cfg)
+			e, err := testExecutor(t, "complete", req, cfg)
 			if strings.HasPrefix(mode, "reject") {
-				if err == nil || p != nil {
+				if err == nil || e != nil {
 					t.Fatal("ambient MCP configuration admitted")
 				}
 				assertPreparationOnly(t, root)
@@ -167,19 +165,18 @@ func TestPublicMCPHTTPPreparationChecksBeforeNewAndResumedThread(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			defer p.Close()
 			assertPreparationOnly(t, root)
 			home, err := allocCodexHome(req.AgentStateKey)
 			if err != nil {
 				t.Fatal(err)
 			}
-			started, err := p.Start(t.Context(), "actual-run", proto.TextInput("actual prompt"), make(chan proto.Envelope, 8))
+			out := make(chan proto.Envelope, 20)
+			turn, err := e.StartTurn(t.Context(), "actual-run", proto.TextInput("actual prompt"), out)
 			if err != nil {
 				t.Fatal(err)
 			}
-			s := started.(*Session)
-			defer s.Cancel(context.Background())
-			frames := waitPreparationMethod(t, root, "turn/start")
+			awaitExecutorTurn(t, turn, out)
+			frames := preparationFrames(t, root)
 			checked, statuses := false, 0
 			for _, frame := range frames {
 				if frame.Method == "environment/status" {
@@ -204,12 +201,6 @@ func TestPublicMCPHTTPPreparationChecksBeforeNewAndResumedThread(t *testing.T) {
 					t.Fatal("preflight started discovery")
 				}
 			}
-			_ = s.Cancel(context.Background())
-			select {
-			case <-s.waitDone:
-			case <-time.After(4 * time.Second):
-				t.Fatal("native fixture did not release")
-			}
 		})
 	}
 }
diff --git a/apps/daemon/internal/agent/codex/mcp_required_test.go b/apps/daemon/internal/agent/codex/mcp_required_test.go
index 18084cc08..4dc500470 100644
--- a/apps/daemon/internal/agent/codex/mcp_required_test.go
+++ b/apps/daemon/internal/agent/codex/mcp_required_test.go
@@ -1,13 +1,13 @@
 package codex
 
 import (
-	"context"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
@@ -34,18 +34,20 @@ func TestRequiredMCPWaitsForNativeThreadAndNeverRestartsFailedResume(t *testing.
 			t.Setenv("OAC_TEST_PREPARATION_MCP_CONFIG", config)
 			gate := filepath.Join(root, "required-initialization")
 			t.Setenv("OAC_TEST_PREPARATION_THREAD_GATE", gate)
-			p, err := newPreparation(t.Context(), req, cfg)
+			e, err := testExecutor(t, "complete", req, cfg)
 			if err != nil {
 				t.Fatal(err)
 			}
-			defer p.Close()
 			out := make(chan proto.Envelope, 16)
-			started, err := p.Start(t.Context(), "required-run", proto.TextInput("actual prompt"), out)
-			if err != nil {
-				t.Fatal(err)
+			type started struct {
+				turn agent.Turn
+				err  error
 			}
-			s := started.(*Session)
-			defer s.Cancel(context.Background())
+			result := make(chan started, 1)
+			go func() {
+				turn, err := e.StartTurn(t.Context(), "required-run", proto.TextInput("actual prompt"), out)
+				result <- started{turn, err}
+			}()
 			waitPreparationMethod(t, root, method)
 			time.Sleep(100 * time.Millisecond)
 			assertNoTurn := func() {
@@ -68,19 +70,23 @@ func TestRequiredMCPWaitsForNativeThreadAndNeverRestartsFailedResume(t *testing.
 			if err := os.WriteFile(gate, []byte(state), 0o600); err != nil {
 				t.Fatal(err)
 			}
-			if state == "ready" {
-				waitPreparationMethod(t, root, "turn/start")
-				return
-			}
+			var start started
 			select {
-			case <-s.waitDone:
+			case start = <-result:
 			case <-time.After(4 * time.Second):
-				t.Fatal("failed initialization did not terminate")
+				t.Fatal("native initialization did not finish")
+			}
+			if (start.err == nil) != (state == "ready") {
+				t.Fatal("native initialization outcome changed", start.err)
+			}
+			frames := settledFrames(t, start.turn, out)
+			if state == "ready" {
+				return
 			}
 			assertNoTurn()
 			failed := false
-			for len(out) > 0 {
-				failed = (<-out).Type == proto.TypeError || failed
+			for _, frame := range frames {
+				failed = frame.Type == proto.TypeError || failed
 			}
 			if !failed {
 				t.Fatal("native initialization failure was not reported")
diff --git a/apps/daemon/internal/agent/codex/preparation.go b/apps/daemon/internal/agent/codex/preparation.go
index 263178522..0098920c0 100644
--- a/apps/daemon/internal/agent/codex/preparation.go
+++ b/apps/daemon/internal/agent/codex/preparation.go
@@ -11,15 +11,6 @@ import (
 	obslog "github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 )
 
-// Prepare connects the native harness without creating a thread or starting model
-// work. req supplies configuration and a stable state key, but no RunID or Prompt.
-// owner owns the entire harness lifetime, including the eventual Session; it must
-// not be a disposable readiness-request context. Initialization/readiness use their
-// existing operation-local deadlines. Close an unused preparation explicitly.
-func Prepare(owner context.Context, req proto.PromptRequestPayload) (*Prepared, error) {
-	return newPreparation(owner, req, defaultSessionConfig())
-}
-
 func newPreparation(parent context.Context, req proto.PromptRequestPayload, cfg sessionConfig) (*Prepared, error) {
 	if req.ExecutionControls != nil && req.ExecutionControls.OutputFormat != nil {
 		return nil, errors.New("codex: structured output is not qualified")
diff --git a/apps/daemon/internal/agent/codex/preparation_close_test.go b/apps/daemon/internal/agent/codex/preparation_close_test.go
index 4abb0ce68..70cc5d769 100644
--- a/apps/daemon/internal/agent/codex/preparation_close_test.go
+++ b/apps/daemon/internal/agent/codex/preparation_close_test.go
@@ -43,3 +43,32 @@ func TestPreparedCloseWaitsForOwnerCleanup(t *testing.T) {
 	}
 	waitPreparedRelease(t, p, root)
 }
+
+func TestPreparedSessionCancellationDuringReadiness(t *testing.T) {
+	req, cfg, root := preparationFixture(t)
+	t.Setenv("OAC_TEST_PREPARATION_BLOCK", "1")
+	owner, cancel := context.WithCancel(t.Context())
+	defer cancel()
+	result := make(chan error, 1)
+	go func() {
+		p, err := newPreparation(owner, req, cfg)
+		if p != nil {
+			_ = p.Close()
+		}
+		result <- err
+	}()
+	waitPreparationMethod(t, root, "environment/status")
+	cancel()
+	select {
+	case err := <-result:
+		if err == nil {
+			t.Fatal("cancelled readiness succeeded")
+		}
+	case <-time.After(4 * time.Second):
+		t.Fatal("cancelled readiness did not finish")
+	}
+	if len(preparedCatalogs(t, root)) != 0 {
+		t.Fatal("failed readiness leaked model catalog")
+	}
+	assertPreparationOnly(t, root)
+}
diff --git a/apps/daemon/internal/agent/codex/preparation_helpers_test.go b/apps/daemon/internal/agent/codex/preparation_helpers_test.go
index 52c5f07ea..2749dc255 100644
--- a/apps/daemon/internal/agent/codex/preparation_helpers_test.go
+++ b/apps/daemon/internal/agent/codex/preparation_helpers_test.go
@@ -28,7 +28,6 @@ func preparationFixture(t *testing.T) (proto.PromptRequestPayload, sessionConfig
 	t.Setenv("OAC_TEST_PREPARATION_FRAMES", filepath.Join(root, "frames.jsonl"))
 	t.Setenv("OAC_TEST_PREPARATION_STATUS", filepath.Join(root, "environment-status"))
 	t.Setenv("OAC_TEST_PREPARATION_BLOCK", "")
-	t.Setenv("OAC_TEST_PREPARATION_OBSERVE", "")
 	for _, key := range []string{"CODEX_EXEC_SERVER_URL", "CODEX_EXEC_SERVER_NOISE_REGISTRY_URL", "CODEX_EXEC_SERVER_NOISE_ENVIRONMENT_ID", "CODEX_EXEC_SERVER_NOISE_AUTH_TOKEN"} {
 		t.Setenv(key, "")
 	}
@@ -251,14 +250,6 @@ func TestPreparationFakeCodexProcess(t *testing.T) {
 		}
 		if frame.Method == "turn/start" {
 			_ = output.Encode(map[string]any{"jsonrpc": "2.0", "method": "turn/started", "params": map[string]any{"threadId": "fixture-native-thread", "turn": map[string]string{"id": "fixture-native-turn"}}})
-			if os.Getenv("OAC_TEST_PREPARATION_OBSERVE") == "1" {
-				for _, raw := range []string{
-					`{"method":"item/completed","params":{"threadId":"fixture-native-thread","turnId":"fixture-native-turn","item":{"type":"agentMessage","id":"message","text":"observed partial answer"}}}`,
-					`{"method":"thread/tokenUsage/updated","params":{"threadId":"fixture-native-thread","turnId":"fixture-native-turn","tokenUsage":{"total":{"inputTokens":30,"cachedInputTokens":4,"outputTokens":10,"reasoningOutputTokens":2,"totalTokens":40}}}}`,
-				} {
-					_ = output.Encode(json.RawMessage(raw))
-				}
-			}
 		}
 	}
 	_ = log.Close()
diff --git a/apps/daemon/internal/agent/codex/prepared.go b/apps/daemon/internal/agent/codex/prepared.go
index 0049ea8e1..d069e9311 100644
--- a/apps/daemon/internal/agent/codex/prepared.go
+++ b/apps/daemon/internal/agent/codex/prepared.go
@@ -1,16 +1,8 @@
 package codex
 
-import (
-	"context"
-	"errors"
-	"strings"
-	"sync"
+import "sync"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-// Prepared owns a connected native resource until Start transfers it to a Session.
+// Prepared owns a connected native resource until an Executor takes it.
 // It observes owner cancellation and RPC exit, not continuous executor readiness.
 type Prepared struct {
 	mu                           sync.Mutex
@@ -18,64 +10,19 @@ type Prepared struct {
 	plan                         SessionPlan
 	resumeID                     string
 	requireExistingNativeSession bool
-	claimed                      bool
-	closed                       bool
 	started                      bool
 	transferred                  chan struct{}
 }
 
-var _ agent.PreparedCancellation = (*Prepared)(nil)
-
-// Start consumes the preparation once. ctx bounds only this start operation;
-// cancellation after return does not cancel the transferred Session. The original
-// owner context remains its lifetime context. On success the Session owns out.
-func (p *Prepared) Start(ctx context.Context, runID string, prompt proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
-	if out == nil || strings.TrimSpace(runID) == "" || prompt.Validate() != nil {
-		return nil, errors.New("codex: start requires a run identity, prompt and output channel")
-	}
-	p.mu.Lock()
-	if p.claimed || p.closed {
-		p.mu.Unlock()
-		return nil, errors.New("codex: preparation is no longer available")
-	}
-	p.claimed = true
-	p.mu.Unlock()
-
-	transferred := false
-	defer func() {
-		if !transferred {
-			_ = p.Close()
-		}
-	}()
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.closed || ctx.Err() != nil || p.session.cancelCtx.Err() != nil || !p.session.rpc.Alive() {
-		return nil, errors.New("codex: prepared harness is no longer available")
-	}
-	s := p.session
-	s.runID, s.out = runID, out
-	if s.observeSubagentIdentities {
-		s.startSubagentObservations()
-	}
-	s.registerHandlers()
-	p.started = true
-	close(p.transferred)
-	transferred = true
-	req := proto.PromptRequestPayload{RunID: runID, Input: prompt, AgentSessionID: p.resumeID, RequireExistingNativeSession: p.requireExistingNativeSession}
-	go s.run(p.plan, req)
-	return s, nil
-}
-
 // Close waits for unused teardown and plan cleanup, including another caller's
-// ongoing Close. After successful Start it is inert; use
-// the returned Session's cancellation path to release the transferred resource.
+// ongoing Close. After an Executor takes the resource it is inert; use
+// Executor.Close to release it.
 func (p *Prepared) Close() error {
 	p.mu.Lock()
 	if p.started {
 		p.mu.Unlock()
 		return nil
 	}
-	p.closed = true
 	p.mu.Unlock()
 	p.session.cancelFn()
 	err := p.session.rpc.Close()
@@ -85,31 +32,6 @@ func (p *Prepared) Close() error {
 	return err
 }
 
-// Cancel fences Start and cancels the resource even after transfer.
-func (p *Prepared) Cancel(ctx context.Context) error {
-	p.mu.Lock()
-	p.closed = true
-	started := p.started
-	p.mu.Unlock()
-	if started {
-		if err := p.session.Cancel(ctx); err != nil {
-			return err
-		}
-		select {
-		case <-p.session.waitDone:
-			return nil
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	}
-	return p.Close()
-}
-
-// CancellationOutcome returns observed state, not a guarantee of final output or quiescence.
-func (p *Prepared) CancellationOutcome() proto.DonePayload {
-	return p.session.CancellationOutcome()
-}
-
 func (p *Prepared) watchOwner() {
 	select {
 	case <-p.session.cancelCtx.Done():
diff --git a/apps/daemon/internal/agent/codex/prepared_cancel_test.go b/apps/daemon/internal/agent/codex/prepared_cancel_test.go
deleted file mode 100644
index 3cc919e44..000000000
--- a/apps/daemon/internal/agent/codex/prepared_cancel_test.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package codex
-
-import (
-	"context"
-	"errors"
-	"reflect"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func TestPreparedCancelUnusedWaitsForCleanup(t *testing.T) {
-	req, cfg, root := preparationFixture(t)
-	req.AgentSessionID = "requested-but-unobserved-thread"
-	p, err := newPreparation(t.Context(), req, cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	entered, release := make(chan struct{}), make(chan struct{})
-	allowCleanup := sync.OnceFunc(func() { close(release) })
-	defer allowCleanup()
-	cleanup := p.plan.Cleanup
-	var cleanups atomic.Int32
-	p.plan.Cleanup = sync.OnceFunc(func() {
-		cleanups.Add(1)
-		close(entered)
-		<-release
-		cleanup()
-	})
-	finished := make(chan error, 4)
-	for range 4 {
-		go func() { finished <- p.Cancel(context.Background()) }()
-	}
-	select {
-	case <-entered:
-	case <-time.After(4 * time.Second):
-		t.Fatal("cancellation did not begin cleanup")
-	}
-	out := make(chan proto.Envelope, 8)
-	if s, err := p.Start(t.Context(), "late", proto.TextInput("must not execute"), out); err == nil || s != nil {
-		t.Fatal("cancellation did not fence Start")
-	}
-	select {
-	case <-finished:
-		t.Fatal("cancellation returned before unused cleanup")
-	default:
-	}
-	allowCleanup()
-	for range 4 {
-		select {
-		case err := <-finished:
-			if err != nil {
-				t.Fatal(err)
-			}
-		case <-time.After(4 * time.Second):
-			t.Fatal("repeated cancellation did not finish")
-		}
-	}
-	if cleanups.Load() != 1 {
-		t.Fatal("cleanup ran more than once")
-	}
-	waitPreparedRelease(t, p, root)
-	assertPreparationOnly(t, root)
-	assertUnstartedCancellation(t, p)
-}
-
-func assertUnstartedCancellation(t *testing.T, p *Prepared) {
-	t.Helper()
-	got := p.CancellationOutcome()
-	if got.Content != "" || len(got.Metadata) != 0 || !reflect.DeepEqual(got.Usage, proto.Usage{}) {
-		t.Fatalf("unobserved result was invented: %+v", got)
-	}
-}
-
-func TestPreparedCancelTransferredPreservesObservedOutcome(t *testing.T) {
-	req, cfg, root := preparationFixture(t)
-	t.Setenv("OAC_TEST_PREPARATION_OBSERVE", "1")
-	p, err := newPreparation(t.Context(), req, cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer p.Cancel(context.Background())
-	started, err := p.Start(t.Context(), "run", proto.TextInput("prompt"), make(chan proto.Envelope, 16))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := started.(*Session)
-	deadline := time.Now().Add(4 * time.Second)
-	for {
-		got := p.CancellationOutcome()
-		if got.Content == "observed partial answer" && got.Usage.Tokens != nil {
-			break
-		}
-		if time.Now().After(deadline) {
-			t.Fatal("native output and Usage were not observed")
-		}
-		time.Sleep(time.Millisecond)
-	}
-	if err := p.Close(); err != nil || !s.rpc.Alive() {
-		t.Fatal("Close cancelled transferred Session", err)
-	}
-	var calls sync.WaitGroup
-	for range 4 {
-		calls.Go(func() {
-			if err := p.Cancel(context.Background()); err != nil {
-				t.Error(err)
-			}
-		})
-	}
-	calls.Wait()
-	select {
-	case <-s.waitDone:
-	case <-time.After(4 * time.Second):
-		t.Fatal("transferred Session did not finish")
-	}
-	waitPreparedRelease(t, p, root)
-	got := p.CancellationOutcome()
-	want := proto.TokenUsage{InputTokens: 30, CachedInputTokens: 4, OutputTokens: 10, ReasoningOutputTokens: 2, TotalTokens: 40}
-	if got.Content != "observed partial answer" || got.Metadata[proto.DoneMetaAgentSessionID] != "fixture-native-thread" || got.Usage.Tokens == nil || *got.Usage.Tokens != want {
-		t.Fatalf("observed outcome lost: %+v", got)
-	}
-	if !reflect.DeepEqual(got, s.CancellationOutcome()) {
-		t.Fatal("preparation and Session exposed different outcomes")
-	}
-	interrupts := 0
-	for _, frame := range preparationFrames(t, root) {
-		if frame.Method == "turn/interrupt" {
-			interrupts++
-		}
-	}
-	if interrupts != 1 {
-		t.Fatal("native cancellation was missing or repeated", interrupts)
-	}
-}
-
-func TestPreparedCancelTransferredWaitsForCleanup(t *testing.T) {
-	req, cfg, root := preparationFixture(t)
-	p, err := newPreparation(t.Context(), req, cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer p.Cancel(context.Background())
-	entered, release := make(chan struct{}), make(chan struct{})
-	allowCleanup := sync.OnceFunc(func() { close(release) })
-	defer allowCleanup()
-	cleanup := p.session.cleanup
-	p.session.cleanup = sync.OnceFunc(func() { close(entered); <-release; cleanup() })
-	p.plan.Cleanup = p.session.cleanup
-	out := make(chan proto.Envelope, 16)
-	if _, err := p.Start(t.Context(), "run", proto.TextInput("prompt"), out); err != nil {
-		t.Fatal(err)
-	}
-	waitPreparationMethod(t, root, "turn/start")
-	finished := make(chan error, 1)
-	go func() { finished <- p.Cancel(context.Background()) }()
-	select {
-	case <-entered:
-	case <-time.After(4 * time.Second):
-		t.Fatal("transferred cancellation did not begin cleanup")
-	}
-	for range out {
-	}
-	select {
-	case <-finished:
-		t.Fatal("cancellation returned after output closure but before local cleanup")
-	case <-p.session.waitDone:
-		t.Fatal("Session finished before local cleanup")
-	default:
-	}
-	ctx, cancel := context.WithTimeout(t.Context(), 20*time.Millisecond)
-	defer cancel()
-	if err := p.Cancel(ctx); !errors.Is(err, context.DeadlineExceeded) {
-		t.Fatalf("blocked cleanup ignored caller deadline: %v", err)
-	}
-	allowCleanup()
-	select {
-	case err := <-finished:
-		if err != nil {
-			t.Fatal(err)
-		}
-	case <-time.After(4 * time.Second):
-		t.Fatal("cancellation did not finish after local cleanup")
-	}
-	waitPreparedRelease(t, p, root)
-	if err := p.Cancel(t.Context()); err != nil {
-		t.Fatalf("settled cleanup could not be retried: %v", err)
-	}
-}
-
-func TestPreparedCancelRacingTransfer(t *testing.T) {
-	for range 8 {
-		req, cfg, root := preparationFixture(t)
-		p, err := newPreparation(t.Context(), req, cfg)
-		if err != nil {
-			t.Fatal(err)
-		}
-		begin := make(chan struct{})
-		var calls sync.WaitGroup
-		calls.Go(func() {
-			<-begin
-			_, _ = p.Start(t.Context(), "run", proto.TextInput("prompt"), make(chan proto.Envelope, 16))
-		})
-		calls.Go(func() { <-begin; _ = p.Cancel(context.Background()) })
-		calls.Go(func() { <-begin; _ = p.Close() })
-		close(begin)
-		calls.Wait()
-		if err := p.Cancel(context.Background()); err != nil {
-			t.Fatal(err)
-		}
-		if p.started {
-			select {
-			case <-p.session.waitDone:
-			case <-time.After(4 * time.Second):
-				t.Fatal("racing Session was retained")
-			}
-		} else {
-			assertPreparationOnly(t, root)
-			assertUnstartedCancellation(t, p)
-		}
-		waitPreparedRelease(t, p, root)
-		if s, err := p.Start(t.Context(), "again", proto.TextInput("must not execute"), make(chan proto.Envelope, 8)); err == nil || s != nil {
-			t.Fatal("cancelled preparation started again")
-		}
-	}
-}
diff --git a/apps/daemon/internal/agent/codex/prepared_test.go b/apps/daemon/internal/agent/codex/prepared_test.go
deleted file mode 100644
index 89d9ab0bf..000000000
--- a/apps/daemon/internal/agent/codex/prepared_test.go
+++ /dev/null
@@ -1,235 +0,0 @@
-package codex
-
-import (
-	"context"
-	"encoding/json"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func TestPreparedSessionTransfersSameResourceOnce(t *testing.T) {
-	for _, resume := range []bool{false, true} {
-		t.Run(map[bool]string{false: "new", true: "resumed"}[resume], func(t *testing.T) {
-			req, cfg, root := preparationFixture(t)
-			if resume {
-				req.AgentSessionID = "fixture-native-thread"
-			}
-			p, err := newPreparation(t.Context(), req, cfg)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer p.Close()
-			assertPreparationOnly(t, root)
-			if len(preparedCatalogs(t, root)) != 1 {
-				t.Fatal("preparation did not retain its model catalog")
-			}
-			pid := p.session.rpc.cmd.Process.Pid
-			cfgPreparedCwd := p.plan.Cwd
-			// Caller-owned data cannot revise the prepared native configuration.
-			req.AgentOptions["model"] = "different-model"
-			req.AgentSessionID = "different-thread"
-			copy(req.FunctionTools[0].Parameters, strings.ReplaceAll(string(req.FunctionTools[0].Parameters), "integer", "boolean"))
-			out := make(chan proto.Envelope, 8)
-			startCtx, stopStart := context.WithCancel(t.Context())
-			started, err := p.Start(startCtx, "actual-run", proto.TextInput("actual prompt"), out)
-			stopStart()
-			if err != nil {
-				t.Fatal(err)
-			}
-			session := started.(*Session)
-			defer session.Cancel(context.Background())
-			if session.rpc != p.session.rpc || session.rpc.cmd.Process.Pid != pid {
-				t.Fatal("start replaced the prepared native resource")
-			}
-			if err := p.Close(); err != nil || !session.rpc.Alive() {
-				t.Fatal("close cancelled transferred resource", err)
-			}
-			if again, err := p.Start(t.Context(), "second", proto.TextInput("second prompt"), out); err == nil || again != nil {
-				t.Fatal("preparation started twice", err)
-			}
-			frames := waitPreparationMethod(t, root, "turn/start")
-			counts := map[string]int{}
-			for _, frame := range frames {
-				counts[frame.Method]++
-				if frame.PID != pid {
-					t.Fatal("preparation and start used different children")
-				}
-				var params struct {
-					Model        string                `json:"model"`
-					ThreadID     string                `json:"threadId"`
-					DynamicTools []dynamicFunctionTool `json:"dynamicTools"`
-					Cwd          string                `json:"cwd"`
-					Environments json.RawMessage       `json:"environments"`
-				}
-				if err := json.Unmarshal(frame.Params, &params); err != nil {
-					t.Fatal(err)
-				}
-				if frame.Method == "thread/start" {
-					if params.Model != "fixture-model" || len(params.DynamicTools) != 1 || !strings.Contains(string(params.DynamicTools[0].InputSchema), "integer") {
-						t.Fatal("prepared configuration changed", string(frame.Params))
-					}
-				}
-				if frame.Method == "thread/resume" && params.ThreadID != "fixture-native-thread" {
-					t.Fatal("prepared resume changed")
-				}
-				if len(params.Environments) != 0 || (frame.Method == "thread/start" && params.Cwd != cfgPreparedCwd) || p.plan.Cwd != cfgPreparedCwd {
-					t.Fatal("prepared environment changed")
-				}
-			}
-			expectedThread := "thread/start"
-			if resume {
-				expectedThread = "thread/resume"
-			}
-			if counts["initialize"] != 1 || counts["environment/status"] != 2 || counts[expectedThread] != 1 || counts["turn/start"] != 1 {
-				t.Fatal("unexpected native setup/start count", counts)
-			}
-			if err := session.Cancel(context.Background()); err != nil {
-				t.Fatal(err)
-			}
-			select {
-			case <-session.waitDone:
-			case <-time.After(4 * time.Second):
-				t.Fatal("started session did not release")
-			}
-			waitPreparedRelease(t, p, root)
-		})
-	}
-}
-
-func TestPreparedSessionAbandonmentAndFailedStart(t *testing.T) {
-	for _, reason := range []string{"close", "owner cancelled", "rpc exited", "start cancelled"} {
-		t.Run(reason, func(t *testing.T) {
-			req, cfg, root := preparationFixture(t)
-			owner, cancelOwner := context.WithCancel(t.Context())
-			defer cancelOwner()
-			p, err := newPreparation(owner, req, cfg)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer p.Close()
-			startCtx := t.Context()
-			switch reason {
-			case "close":
-				if err := p.Close(); err != nil {
-					t.Fatal(err)
-				}
-			case "owner cancelled":
-				cancelOwner()
-			case "rpc exited":
-				if err := p.session.rpc.Close(); err != nil {
-					t.Fatal(err)
-				}
-			case "start cancelled":
-				var cancel context.CancelFunc
-				startCtx, cancel = context.WithCancel(t.Context())
-				cancel()
-			}
-			if reason == "owner cancelled" || reason == "rpc exited" || reason == "close" {
-				// Release must happen without a later Start driving cleanup.
-				waitPreparedRelease(t, p, root)
-			}
-			out := make(chan proto.Envelope, 8)
-			if started, err := p.Start(startCtx, "late-run", proto.TextInput("must not start"), out); err == nil || started != nil {
-				t.Fatal("abandoned preparation started", err)
-			}
-			waitPreparedRelease(t, p, root)
-			assertPreparationOnly(t, root)
-			if len(out) != 0 {
-				t.Fatal("failed preparation emitted run output")
-			}
-			count := 0
-			for _, frame := range preparationFrames(t, root) {
-				if frame.Method == "environment/status" {
-					count++
-				}
-			}
-			if count != 2 {
-				t.Fatal("failed start reconnected the native environment", count)
-			}
-		})
-	}
-}
-
-func TestPreparedSessionConcurrentStartAndClose(t *testing.T) {
-	req, cfg, root := preparationFixture(t)
-	p, err := newPreparation(t.Context(), req, cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer p.Close()
-	begin := make(chan struct{})
-	var wg sync.WaitGroup
-	started := make(chan *Session, 8)
-	for range 8 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			<-begin
-			s, err := p.Start(t.Context(), "run", proto.TextInput("prompt"), make(chan proto.Envelope, 8))
-			if err == nil {
-				started <- s.(*Session)
-			}
-		}()
-	}
-	wg.Add(1)
-	go func() { defer wg.Done(); <-begin; _ = p.Close() }()
-	close(begin)
-	wg.Wait()
-	close(started)
-	count := 0
-	for session := range started {
-		count++
-		_ = session.Cancel(context.Background())
-		select {
-		case <-session.waitDone:
-		case <-time.After(4 * time.Second):
-			t.Fatal("concurrent start retained a session")
-		}
-	}
-	if count > 1 {
-		t.Fatal("multiple ownership transfers", count)
-	}
-	waitPreparedRelease(t, p, root)
-	turns := 0
-	for _, frame := range preparationFrames(t, root) {
-		if frame.Method == "turn/start" {
-			turns++
-		}
-	}
-	if turns > 1 {
-		t.Fatal("multiple native Turns", turns)
-	}
-}
-
-func TestPreparedSessionCancellationDuringReadiness(t *testing.T) {
-	req, cfg, root := preparationFixture(t)
-	t.Setenv("OAC_TEST_PREPARATION_BLOCK", "1")
-	owner, cancel := context.WithCancel(t.Context())
-	defer cancel()
-	result := make(chan error, 1)
-	go func() {
-		p, err := newPreparation(owner, req, cfg)
-		if p != nil {
-			_ = p.Close()
-		}
-		result <- err
-	}()
-	waitPreparationMethod(t, root, "environment/status")
-	cancel()
-	select {
-	case err := <-result:
-		if err == nil {
-			t.Fatal("cancelled readiness succeeded")
-		}
-	case <-time.After(4 * time.Second):
-		t.Fatal("cancelled readiness did not finish")
-	}
-	if len(preparedCatalogs(t, root)) != 0 {
-		t.Fatal("failed readiness leaked model catalog")
-	}
-	assertPreparationOnly(t, root)
-}
diff --git a/apps/daemon/internal/agent/codex/recovery_test.go b/apps/daemon/internal/agent/codex/recovery_test.go
index 78aad7c16..ebabf06b4 100644
--- a/apps/daemon/internal/agent/codex/recovery_test.go
+++ b/apps/daemon/internal/agent/codex/recovery_test.go
@@ -160,26 +160,20 @@ func TestPreparedRecoveryCannotStartWithoutExistingHistory(t *testing.T) {
 				req.DisableExecutionEnvironment = false
 				req.LocalEnvironment = &proto.LocalEnvironment{ID: uuid.NewString(), WorkspaceDirectory: "/workspace", NetworkAccess: "enabled", CapabilitySources: &agentcapabilities.Input{}, WorkspaceRoot: cwd}
 			}
-			p, err := newPreparation(t.Context(), req, cfg)
+			e, err := testExecutor(t, "complete", req, cfg)
 			if err != nil {
 				t.Fatal(err)
 			}
-			defer p.Close()
-			if p.plan.Cwd != cwd {
-				t.Fatalf("cwd = %q, want %q", p.plan.Cwd, cwd)
+			if e.prepared.plan.Cwd != cwd {
+				t.Fatalf("cwd = %q, want %q", e.prepared.plan.Cwd, cwd)
 			}
 			assertPreparationOnly(t, root)
 			out := make(chan proto.Envelope, 16)
-			session, err := p.Start(t.Context(), "recovery-run", proto.TextInput("continue"), out)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer session.Cancel(context.Background())
-			select {
-			case <-p.session.waitDone:
-			case <-time.After(4 * time.Second):
-				t.Fatal("recovery did not terminate")
+			turn, err := e.StartTurn(t.Context(), "recovery-run", proto.TextInput("continue"), out)
+			if err == nil {
+				t.Fatal("missing history started a Turn")
 			}
+			settledFrames(t, turn, out)
 			found := false
 			for _, frame := range preparationFrames(t, root) {
 				if frame.Method == "thread/list" {
diff --git a/apps/daemon/internal/agent/codex/session_run.go b/apps/daemon/internal/agent/codex/session_run.go
index b9f26c933..3394acf90 100644
--- a/apps/daemon/internal/agent/codex/session_run.go
+++ b/apps/daemon/internal/agent/codex/session_run.go
@@ -9,28 +9,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func (s *Session) run(plan SessionPlan, req proto.PromptRequestPayload) {
-	defer close(s.waitDone)
-	defer s.stopFunctionCalls()
-	defer s.cleanup()
-	defer s.closeRunOutput()
-
-	if err := s.startNative(s.cancelCtx, plan, req); err != nil {
-		s.emitTerminal(err.Error(), true)
-		return
-	}
-
-	// Block until terminal handlers close the RPC child or cancellation arrives.
-	select {
-	case <-s.rpc.Done():
-		if !s.cancelled.Load() && s.cancelCtx.Err() == nil {
-			s.emitTerminal("codex: connection closed before the run completed", true)
-		}
-	case <-s.cancelCtx.Done():
-		_ = s.rpc.Close()
-	}
-}
-
 func (s *Session) startNative(ctx context.Context, plan SessionPlan, req proto.PromptRequestPayload) error {
 	if s.currentThreadID() == "" {
 		if err := s.resolveThread(req, plan); err != nil {
diff --git a/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go b/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
index 7345d5dae..6dc663ea0 100644
--- a/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
+++ b/apps/daemon/internal/agent/codex/session_steering_lifecycle_test.go
@@ -83,9 +83,10 @@ func TestBlockedSteeringWriteEndsRunWithTerminalFrames(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
 	defer cancel()
 	out := make(chan proto.Envelope, 8)
+	turnCtx, cancelTurn := context.WithCancel(ctx)
 	s := &Session{
-		runID: "run", rpc: client.JSONRPCClient, cancelCtx: ctx, out: out, resolvedModel: "synthetic",
-		cfg: sessionConfig{logger: obslog.Bg()}, waitDone: make(chan struct{}), cleanup: func() {},
+		executor: &Executor{}, runID: "run", rpc: client.JSONRPCClient, cancelCtx: turnCtx, cancelFn: cancelTurn, out: out, resolvedModel: "synthetic",
+		cfg: sessionConfig{logger: obslog.Bg()}, waitDone: make(chan struct{}), outputDone: make(chan struct{}), cleanup: func() {},
 		bufs: NewItemBuffers(),
 	}
 	s.registerHandlers()
@@ -119,7 +120,8 @@ func TestBlockedSteeringWriteEndsRunWithTerminalFrames(t *testing.T) {
 		}
 		ready <- nil
 	}()
-	go s.run(SessionPlan{Model: "synthetic"}, proto.PromptRequestPayload{Input: proto.TextInput("first")})
+	// Executor.StartTurn starts and settles each Turn through these two steps.
+	go s.settleExecutorTurn(s.startNative(ctx, SessionPlan{Model: "synthetic"}, proto.PromptRequestPayload{Input: proto.TextInput("first")}))
 	if err := <-ready; err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/agent/codex/unsupported.go b/apps/daemon/internal/agent/codex/unsupported.go
index a2a092928..3da26fb7f 100644
--- a/apps/daemon/internal/agent/codex/unsupported.go
+++ b/apps/daemon/internal/agent/codex/unsupported.go
@@ -28,15 +28,3 @@ func (s *Session) ListWorkspaceDirectory(context.Context, string, int) (agent.Wo
 func (s *Session) WriteWorkspaceFile(context.Context, string, []byte) (agent.WorkspaceWriteResult, error) {
 	return agent.WorkspaceWriteResult{}, agent.ErrWorkspaceWriteUnsupported
 }
-
-func (s *Prepared) ReadWorkspaceFile(context.Context, string, int) (agent.WorkspaceReadResult, error) {
-	return agent.WorkspaceReadResult{}, agent.ErrWorkspaceReadUnsupported
-}
-
-func (s *Prepared) ListWorkspaceDirectory(context.Context, string, int) (agent.WorkspaceDirectoryResult, error) {
-	return agent.WorkspaceDirectoryResult{}, agent.ErrWorkspaceReadUnsupported
-}
-
-func (s *Prepared) WriteWorkspaceFile(context.Context, string, []byte) (agent.WorkspaceWriteResult, error) {
-	return agent.WorkspaceWriteResult{}, agent.ErrWorkspaceWriteUnsupported
-}
diff --git a/apps/daemon/internal/agent/codex/unsupported_test.go b/apps/daemon/internal/agent/codex/unsupported_test.go
index 0f0936197..fe2fe3616 100644
--- a/apps/daemon/internal/agent/codex/unsupported_test.go
+++ b/apps/daemon/internal/agent/codex/unsupported_test.go
@@ -24,21 +24,21 @@ func TestUnsupportedExtensionsHaveNoNativeEffects(t *testing.T) {
 			t.Fatal("unsupported error disclosed input")
 		}
 	}
-	for _, owner := range []agent.WorkspaceReader{(*Executor)(nil), (*Session)(nil), (*Prepared)(nil)} {
+	for _, owner := range []agent.WorkspaceReader{(*Executor)(nil), (*Session)(nil)} {
 		result, err := owner.ReadWorkspaceFile(ctx, secret, 1)
 		check(err)
 		if len(result.Data) != 0 || result.Truncated {
 			t.Fatal("unsupported read fabricated data")
 		}
 	}
-	for _, owner := range []agent.WorkspaceDirectoryLister{(*Executor)(nil), (*Session)(nil), (*Prepared)(nil)} {
+	for _, owner := range []agent.WorkspaceDirectoryLister{(*Executor)(nil), (*Session)(nil)} {
 		result, err := owner.ListWorkspaceDirectory(ctx, secret, 1)
 		check(err)
 		if len(result.Entries) != 0 || result.Truncated {
 			t.Fatal("unsupported listing fabricated entries")
 		}
 	}
-	for _, owner := range []agent.WorkspaceWriter{(*Executor)(nil), (*Session)(nil), (*Prepared)(nil)} {
+	for _, owner := range []agent.WorkspaceWriter{(*Executor)(nil), (*Session)(nil)} {
 		result, err := owner.WriteWorkspaceFile(ctx, secret, []byte(secret))
 		check(err)
 		if result.SizeBytes != 0 {
diff --git a/apps/daemon/internal/agent/configuration_test.go b/apps/daemon/internal/agent/configuration_test.go
index 19d5b8e22..2d36d96da 100644
--- a/apps/daemon/internal/agent/configuration_test.go
+++ b/apps/daemon/internal/agent/configuration_test.go
@@ -22,36 +22,21 @@ func TestEveryRegistryEntryPreparesTheBoundModelConfiguration(t *testing.T) {
 		calls++
 		return nil, expected
 	})
-	registry.RegisterPreparation("fixture", true, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
-		calls++
-		return nil, expected
-	})
 	configuration.Providers[0].Protocol = "anthropic"
 	executor, _ := registry.ResolveExecutor("fixture")
-	preparation, _ := registry.ResolvePreparation("fixture")
-	entries := []func(proto.PromptRequestPayload) error{
-		func(req proto.PromptRequestPayload) error { _, err := executor(t.Context(), req); return err },
-		func(req proto.PromptRequestPayload) error { _, err := preparation(t.Context(), req); return err },
-	}
-	for _, entry := range entries {
-		for _, options := range []map[string]any{
-			{"model": nil},
-			{"model": "fixture", "model_provider": map[string]any{"protocol": "anthropic", "base_url": "https://provider.example", "api_key": "private-sentinel"}},
-			{"model_provider": map[string]any{"protocol": "responses", "base_url": "https://provider.example", "api_key": "private-sentinel"}},
-			{"harness_config": map[string]any{"unknown": "private-sentinel"}},
-		} {
-			before := calls
-			err := entry(proto.PromptRequestPayload{AgentOptions: options})
-			if err == nil || errors.Is(err, expected) || calls != before || strings.Contains(err.Error(), "private-sentinel") {
-				t.Fatal("invalid configuration reached native entry or leaked values")
-			}
-		}
-		if err := entry(proto.PromptRequestPayload{AgentOptions: map[string]any{"model": "fixture", "model_provider": map[string]any{"protocol": "responses", "base_url": "https://provider.example", "api_key": "private-sentinel"}}}); !errors.Is(err, expected) {
-			t.Fatal("bound declaration was lost or mutated", err)
+	for _, options := range []map[string]any{
+		{"model": nil},
+		{"model": "fixture", "model_provider": map[string]any{"protocol": "anthropic", "base_url": "https://provider.example", "api_key": "private-sentinel"}},
+		{"model_provider": map[string]any{"protocol": "responses", "base_url": "https://provider.example", "api_key": "private-sentinel"}},
+		{"harness_config": map[string]any{"unknown": "private-sentinel"}},
+	} {
+		_, err := executor(t.Context(), proto.PromptRequestPayload{AgentOptions: options})
+		if err == nil || errors.Is(err, expected) || calls != 0 || strings.Contains(err.Error(), "private-sentinel") {
+			t.Fatal("invalid configuration reached native entry or leaked values")
 		}
 	}
-	if calls != 2 {
-		t.Fatal("unexpected native calls", calls)
+	if _, err := executor(t.Context(), proto.PromptRequestPayload{AgentOptions: map[string]any{"model": "fixture", "model_provider": map[string]any{"protocol": "responses", "base_url": "https://provider.example", "api_key": "private-sentinel"}}}); !errors.Is(err, expected) || calls != 1 {
+		t.Fatal("bound declaration was lost or mutated", err)
 	}
 }
 
diff --git a/apps/daemon/internal/agent/contract_declarations_test.go b/apps/daemon/internal/agent/contract_declarations_test.go
index 386cecee6..7915f9df6 100644
--- a/apps/daemon/internal/agent/contract_declarations_test.go
+++ b/apps/daemon/internal/agent/contract_declarations_test.go
@@ -22,11 +22,9 @@ func TestPublicHarnessContractDeclarations(t *testing.T) {
 		"DurableSteerer":           {"session"},
 		"Steerer":                  {"session"},
 		"FunctionResultSubmitter":  {"session"},
-		"WorkspaceReader":          {"executor", "prepared", "session"},
-		"WorkspaceDirectoryLister": {"executor", "prepared", "session"},
-		"WorkspaceWriter":          {"executor", "prepared", "session"},
-		"Prepared":                 {"prepared"},
-		"PreparedCancellation":     {"prepared"},
+		"WorkspaceReader":          {"executor", "session"},
+		"WorkspaceDirectoryLister": {"executor", "session"},
+		"WorkspaceWriter":          {"executor", "session"},
 	}
 	files, err := filepath.Glob("*.go")
 	if err != nil {
diff --git a/apps/daemon/internal/agent/harness.go b/apps/daemon/internal/agent/harness.go
index 3a798043b..23f8d37e7 100644
--- a/apps/daemon/internal/agent/harness.go
+++ b/apps/daemon/internal/agent/harness.go
@@ -14,8 +14,8 @@
 // Registration: each adapter exports one Declaration. The Runtime discovers the
 // static declaration list and installs each resulting Runtime through Register.
 // Availability and factory selection belong to the adapter. RegisterKind resets
-// the factories, so Register installs it first. Preparation capabilities are
-// derived from the declared factories.
+// the factories, so Register installs it first. RegisterExecutor derives the
+// Preparation capability; the adapter declares WorkspaceReadPreparation.
 //
 // Runtime registration and Core service qualification remain separate. A public
 // Harness also needs a profile in services/core/internal/engine; advertising
@@ -51,10 +51,8 @@ type DiscoveryOptions struct {
 
 // Runtime binds one discovered descriptor to its native factories.
 type Runtime struct {
-	Info                     proto.SupportedAgentKind
-	Preparation              PreparationFactory
-	Executor                 ExecutorFactory
-	WorkspaceReadPreparation bool
+	Info     proto.SupportedAgentKind
+	Executor ExecutorFactory
 }
 
 // Register installs a discovered Runtime with its declaration's configuration.
@@ -62,21 +60,18 @@ func (r *Registry) Register(declaration Declaration, runtime Runtime) {
 	if runtime.Info.Kind != declaration.Info.Kind {
 		panic("agent.Registry.Register: discovery kind differs from declaration")
 	}
-	if !runtime.Info.Available && (runtime.Executor != nil || runtime.Preparation != nil) {
+	if !runtime.Info.Available && runtime.Executor != nil {
 		panic("agent.Registry.Register: unavailable runtime has factories")
 	}
 	r.RegisterKind(runtime.Info, declaration.Configuration)
 	if runtime.Executor != nil {
 		r.RegisterExecutor(runtime.Info.Kind, runtime.Executor)
 	}
-	if runtime.Preparation != nil {
-		r.RegisterPreparation(runtime.Info.Kind, runtime.WorkspaceReadPreparation, runtime.Preparation)
-	}
 }
 
 // Model configuration has one shared contract, authored in
 // internal/harnessconfig/harness.go. RegisterKind requires that declaration;
-// RegisterExecutor and RegisterPreparation inherit it. Every registered entry
+// RegisterExecutor inherits it. Every registered entry
 // validates model, provider and native parameters before calling native code.
 // The declaration belongs to the adapter and is also consumed by Core. Keep
 // adapter field rules and rendering private. That shared contract owns frozen
@@ -121,8 +116,8 @@ type TurnSettlement struct {
 	Reason   string
 }
 
-// Session is the cancellation and outcome surface shared by Turn and
-// PreparedCancellation. Every owner exposes observed state.
+// Session is the cancellation and outcome surface of a Turn. Every owner
+// exposes observed state.
 // For Executor-owned Turns, AwaitSettlement and Executor.Close define settlement
 // and resource retirement; Cancel alone does not transfer resource ownership.
 type Session interface {
@@ -187,34 +182,6 @@ type WorkspaceWriter interface {
 	WriteWorkspaceFile(context.Context, string, []byte) (WorkspaceWriteResult, error)
 }
 
-// Separate preparation for qualified workspace access.
-
-// Prepared owns native resources until Start returns a non-nil Session. The
-// preparation owner context spans the eventual Session; Start's context is local
-// to that operation. A nil Session leaves preparation cleanup with the caller.
-type Prepared interface {
-	// Start transfers output ownership only when it returns a non-nil Session.
-	// A nil Session leaves the caller as the sole owner of closing out, and the
-	// implementation must not retain or write to it after Start returns.
-	Start(context.Context, string, proto.MessageInput, chan<- proto.Envelope) (Session, error)
-	// Close retains unused ownership on error; callers may retry settlement.
-	Close() error
-}
-
-// PreparedCancellation is required for executable preparations and follows the
-// same native resource across Start. Read-only preparations need only Prepared.
-type PreparedCancellation interface {
-	Prepared
-	Session
-	// Cancel returns after local cleanup and all output writes have stopped.
-	// An error retains ownership so callers can retry this exact object serially.
-	Cancel(context.Context) error
-}
-
-// A factory may return both a resource and an error when construction failed but
-// cleanup remains unconfirmed. The caller must retain and close that resource.
-type PreparationFactory func(context.Context, proto.PromptRequestPayload) (Prepared, error)
-
 // Kind registration.
 
 // RegisterKind installs the heartbeat descriptor and model configuration for an
@@ -235,10 +202,8 @@ func (r *Registry) RegisterKind(info proto.SupportedAgentKind, configuration har
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	r.configurations[kind] = configuration
-	delete(r.preparers, kind)
 	delete(r.executors, kind)
 	info.Capabilities.Preparation = proto.CapabilityUnsupported
-	info.Capabilities.WorkspaceReadPreparation = proto.CapabilityUnsupported
 	r.kinds[kind] = info
 }
 
@@ -264,26 +229,3 @@ func (r *Registry) RegisterExecutor(kind string, factory ExecutorFactory) {
 	info.Capabilities.Preparation = proto.CapabilitySupported
 	r.kinds[kind] = info
 }
-
-// RegisterPreparation installs a separate execution-only path.
-func (r *Registry) RegisterPreparation(kind string, workspaceRead bool, prepare PreparationFactory) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	info, exists := r.kinds[kind]
-	if !exists || prepare == nil {
-		panic("agent.Registry.RegisterPreparation: registered kind and factory required")
-	}
-	configuration, declared := r.configurations[kind]
-	if !declared {
-		panic("agent.Registry.RegisterPreparation: configuration required")
-	}
-	r.preparers[kind] = func(ctx context.Context, req proto.PromptRequestPayload) (Prepared, error) {
-		if _, err := configuration.Prepare(req.AgentOptions); err != nil {
-			return nil, err
-		}
-		return prepare(ctx, req)
-	}
-	info.Capabilities.Preparation = proto.CapabilitySupported
-	info.Capabilities.WorkspaceReadPreparation = proto.CapabilityFromBool(workspaceRead)
-	r.kinds[kind] = info
-}
diff --git a/apps/daemon/internal/agent/mcode/contracts.go b/apps/daemon/internal/agent/mcode/contracts.go
index 025ef1890..3f01ff20b 100644
--- a/apps/daemon/internal/agent/mcode/contracts.go
+++ b/apps/daemon/internal/agent/mcode/contracts.go
@@ -14,12 +14,7 @@ var (
 	_ agent.WorkspaceReader          = (*Session)(nil)
 	_ agent.WorkspaceDirectoryLister = (*Session)(nil)
 	_ agent.WorkspaceWriter          = (*Session)(nil)
-	_ agent.Prepared                 = (*prepared)(nil)
-	_ agent.PreparedCancellation     = (*prepared)(nil)
 	_ agent.WorkspaceReader          = (*executor)(nil)
 	_ agent.WorkspaceDirectoryLister = (*executor)(nil)
 	_ agent.WorkspaceWriter          = (*executor)(nil)
-	_ agent.WorkspaceReader          = (*prepared)(nil)
-	_ agent.WorkspaceDirectoryLister = (*prepared)(nil)
-	_ agent.WorkspaceWriter          = (*prepared)(nil)
 )
diff --git a/apps/daemon/internal/agent/mcode/declaration.go b/apps/daemon/internal/agent/mcode/declaration.go
index 5216634f5..bd44257ea 100644
--- a/apps/daemon/internal/agent/mcode/declaration.go
+++ b/apps/daemon/internal/agent/mcode/declaration.go
@@ -75,10 +75,6 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, r
 	if runtime.Info.Available {
 		runtime.Executor = NewExecutorFactory(workspace)
 	}
-	if workspace != nil {
-		runtime.Preparation = NewPreparationFactory(*workspace)
-		runtime.WorkspaceReadPreparation = true
-	}
 	fmt.Fprintf(options.Stdout, "mcode preflight ok (%s)\n", version)
 	return runtime
 }
diff --git a/apps/daemon/internal/agent/mcode/declaration_test.go b/apps/daemon/internal/agent/mcode/declaration_test.go
index d39aada63..b60d8b348 100644
--- a/apps/daemon/internal/agent/mcode/declaration_test.go
+++ b/apps/daemon/internal/agent/mcode/declaration_test.go
@@ -19,7 +19,7 @@ func TestMCodeExecutionOptInIsVersionBound(t *testing.T) {
 			t.Setenv("OAC_RUNTIME_MCODE_AGENTS_API", tc.enabled)
 			rc := agent.DiscoveryOptions{Stdout: io.Discard, Stderr: io.Discard}
 			runtime := discoverWithCheck(t.Context(), rc, Declaration.Info, func(context.Context, string) (string, error) { return tc.version, nil })
-			if runtime.Executor == nil || runtime.Preparation != nil {
+			if runtime.Executor == nil || runtime.Info.Capabilities.WorkspaceReadPreparation.IsSupported() {
 				t.Fatalf("factories: %+v", runtime)
 			}
 			info := runtime.Info
diff --git a/apps/daemon/internal/agent/mcode/discovery_workspace.go b/apps/daemon/internal/agent/mcode/discovery_workspace.go
index 4438aa643..11d7a6d55 100644
--- a/apps/daemon/internal/agent/mcode/discovery_workspace.go
+++ b/apps/daemon/internal/agent/mcode/discovery_workspace.go
@@ -71,7 +71,6 @@ func discoverWorkspace(parent context.Context, options agent.DiscoveryOptions, r
 
 	caps := &runtime.Info.Capabilities
 	caps.EnvironmentNone = proto.CapabilityUnsupported
-	caps.Preparation, caps.LocalEnvironment = proto.CapabilitySupported, proto.CapabilitySupported
-	caps.WorkspaceReadPreparation = proto.CapabilitySupported
+	caps.LocalEnvironment, caps.WorkspaceReadPreparation = proto.CapabilitySupported, proto.CapabilitySupported
 	return &c
 }
diff --git a/apps/daemon/internal/agent/mcode/environment_mcp_test.go b/apps/daemon/internal/agent/mcode/environment_mcp_test.go
index 564227bdb..5ca8565f9 100644
--- a/apps/daemon/internal/agent/mcode/environment_mcp_test.go
+++ b/apps/daemon/internal/agent/mcode/environment_mcp_test.go
@@ -32,11 +32,11 @@ func TestEnvironmentMCPUsesFixedLauncherForNewAndLoadedSessions(t *testing.T) {
 			}
 			t.Setenv("USER_SELECTED", "must-not-resolve-from-daemon")
 			t.Setenv("MODEL_SECRET", "must-not-forward")
-			resource, err := NewPreparationFactory(c)(t.Context(), req)
+			resource, err := NewExecutorFactory(&c)(t.Context(), req)
 			if err != nil {
 				t.Fatal(err)
 			}
-			t.Cleanup(func() { _ = resource.Close() })
+			t.Cleanup(func() { _ = resource.Close(context.Background()) })
 			raw, err := os.ReadFile(record + ".session")
 			if err != nil {
 				t.Fatal(err)
@@ -116,18 +116,18 @@ func TestEnvironmentMCPCancelSettlesPendingObservationBeforeDone(t *testing.T) {
 	if err := os.WriteFile(c.Binary, []byte(strings.Replace(string(script), "HELPER=prepared", "HELPER=prepared-mcp-cancel", 1)), 0700); err != nil {
 		t.Fatal(err)
 	}
-	resource, err := NewPreparationFactory(c)(t.Context(), req)
+	resource, err := NewExecutorFactory(&c)(t.Context(), req)
 	if err != nil {
 		t.Fatal(err)
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
 	defer cancel()
 	out := make(chan proto.Envelope, 16)
-	session, err := resource.Start(ctx, "run", proto.TextInput("invoke and wait"), out)
+	session, err := resource.StartTurn(ctx, "run", proto.TextInput("invoke and wait"), out)
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Cleanup(func() { _ = resource.(*prepared).Cancel(context.Background()) })
+	t.Cleanup(func() { _ = resource.Close(context.Background()) })
 	select {
 	case event := <-out:
 		var call proto.ToolCallPayload
@@ -190,11 +190,11 @@ func TestEnvironmentHTTPMCPUsesEphemeralACPConfiguration(t *testing.T) {
 			item.BearerToken = &value
 		}
 		req.LocalEnvironment.MCP = []proto.EnvironmentMCP{item}
-		resource, err := NewPreparationFactory(c)(t.Context(), req)
+		resource, err := NewExecutorFactory(&c)(t.Context(), req)
 		if err != nil {
 			t.Fatal(err)
 		}
-		t.Cleanup(func() { _ = resource.Close() })
+		t.Cleanup(func() { _ = resource.Close(context.Background()) })
 		raw, err := os.ReadFile(record + ".session")
 		if err != nil {
 			t.Fatal(err)
@@ -219,7 +219,7 @@ func TestEnvironmentHTTPMCPUsesEphemeralACPConfiguration(t *testing.T) {
 		} else if len(server.Headers) != 0 {
 			t.Fatal("anonymous MCP inherited credentials")
 		}
-		dataDir := resource.(*prepared).executor.opts.DataDir
+		dataDir := resource.(*executor).opts.DataDir
 		for _, name := range []string{"config.yaml", "mcp.json", "workspace-profile.json"} {
 			body, err := os.ReadFile(filepath.Join(dataDir, name))
 			if err != nil && !os.IsNotExist(err) {
diff --git a/apps/daemon/internal/agent/mcode/executor_test.go b/apps/daemon/internal/agent/mcode/executor_test.go
index 979958263..59a1f5d60 100644
--- a/apps/daemon/internal/agent/mcode/executor_test.go
+++ b/apps/daemon/internal/agent/mcode/executor_test.go
@@ -13,6 +13,26 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
+func workspaceFixture(t *testing.T) (WorkspaceConfig, proto.PromptRequestPayload, string) {
+	t.Helper()
+	r := testRequest(t)
+	r.RunID, r.Input = "", nil
+	r.DisableExecutionEnvironment = false
+	r.LocalEnvironment = &proto.LocalEnvironment{ID: "environment", NetworkAccess: "enabled", WorkspaceRoot: t.TempDir()}
+	record := filepath.Join(t.TempDir(), "calls")
+	exe, err := os.Executable()
+	if err != nil {
+		t.Fatal(err)
+	}
+	binary := filepath.Join(t.TempDir(), "native")
+	quote := func(s string) string { return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'" }
+	script := "#!/bin/sh\nexport OAC_TEST_MCODE_HELPER=prepared\nexport OAC_TEST_MCODE_RECORD=" + quote(record) + "\nexec " + quote(exe) + " -test.run=^TestMCodeProcess$ -- \"$@\"\n"
+	if err := os.WriteFile(binary, []byte(script), 0700); err != nil {
+		t.Fatal(err)
+	}
+	return WorkspaceConfig{Binary: binary, Node: "/usr/bin/node", Bridge: "/opt/bridge.mjs", Directory: r.LocalEnvironment.WorkspaceRoot, Network: "enabled", Scratch: t.TempDir()}, r, record
+}
+
 func executorFixture(t *testing.T, scenario string, workspace bool) (*executor, string) {
 	t.Helper()
 	config, req, record := workspaceFixture(t)
diff --git a/apps/daemon/internal/agent/mcode/preparation.go b/apps/daemon/internal/agent/mcode/preparation.go
deleted file mode 100644
index f4b00ed1d..000000000
--- a/apps/daemon/internal/agent/mcode/preparation.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package mcode
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-// Prepared retains its single admission API over the same native Executor.
-// Runtime's Session lifecycle uses Executor directly.
-type prepared struct {
-	mu              sync.Mutex
-	executor        *executor
-	session         *Session
-	started, closed bool
-}
-
-func NewPreparationFactory(config WorkspaceConfig) agent.PreparationFactory {
-	factory := NewExecutorFactory(&config)
-	return func(ctx context.Context, req proto.PromptRequestPayload) (agent.Prepared, error) {
-		value, err := factory(ctx, req)
-		if err != nil {
-			if value != nil {
-				return &prepared{executor: value.(*executor)}, err
-			}
-			return nil, err
-		}
-		return &prepared{executor: value.(*executor)}, nil
-	}
-}
-
-func (p *prepared) Start(ctx context.Context, runID string, input proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.closed || p.started {
-		return nil, fmt.Errorf("mcode: preparation is no longer available")
-	}
-	turn, err := p.executor.StartTurn(ctx, runID, input, out)
-	if turn != nil {
-		p.started, p.session = true, turn.(*Session)
-	}
-	return turn, err
-}
-
-func (p *prepared) Close() error {
-	p.mu.Lock()
-	started := p.started
-	if !started {
-		p.closed = true
-	}
-	p.mu.Unlock()
-	if started {
-		return nil
-	}
-	return p.executor.Close(context.Background())
-}
-
-func (p *prepared) Cancel(ctx context.Context) error {
-	p.mu.Lock()
-	p.closed = true
-	current, started := p.session, p.started
-	p.mu.Unlock()
-	if started {
-		if err := current.Cancel(ctx); err != nil {
-			// The single-use Prepared owns disposal as well as cancellation.
-			if closeErr := p.executor.Close(ctx); closeErr != nil {
-				return closeErr
-			}
-			return nil
-		}
-	}
-	return p.executor.Close(ctx)
-}
-
-func (p *prepared) CancellationOutcome() proto.DonePayload {
-	p.mu.Lock()
-	s := p.session
-	p.mu.Unlock()
-	if s == nil {
-		return proto.DonePayload{}
-	}
-	return s.CancellationOutcome()
-}
diff --git a/apps/daemon/internal/agent/mcode/preparation_test.go b/apps/daemon/internal/agent/mcode/preparation_test.go
deleted file mode 100644
index 92b9a2aa0..000000000
--- a/apps/daemon/internal/agent/mcode/preparation_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package mcode
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-func workspaceFixture(t *testing.T) (WorkspaceConfig, proto.PromptRequestPayload, string) {
-	t.Helper()
-	r := testRequest(t)
-	r.RunID, r.Input = "", nil
-	r.DisableExecutionEnvironment = false
-	r.LocalEnvironment = &proto.LocalEnvironment{ID: "environment", NetworkAccess: "enabled", WorkspaceRoot: t.TempDir()}
-	record := filepath.Join(t.TempDir(), "calls")
-	exe, err := os.Executable()
-	if err != nil {
-		t.Fatal(err)
-	}
-	binary := filepath.Join(t.TempDir(), "native")
-	quote := func(s string) string { return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'" }
-	script := "#!/bin/sh\nexport OAC_TEST_MCODE_HELPER=prepared\nexport OAC_TEST_MCODE_RECORD=" + quote(record) + "\nexec " + quote(exe) + " -test.run=^TestMCodeProcess$ -- \"$@\"\n"
-	if err := os.WriteFile(binary, []byte(script), 0700); err != nil {
-		t.Fatal(err)
-	}
-	return WorkspaceConfig{Binary: binary, Node: "/usr/bin/node", Bridge: "/opt/bridge.mjs", Directory: r.LocalEnvironment.WorkspaceRoot, Network: "enabled", Scratch: t.TempDir()}, r, record
-}
-
-func TestPreparedWorkspaceHasOneInputAndOutputOwner(t *testing.T) {
-	c, r, record := workspaceFixture(t)
-	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
-	defer cancel()
-	resource, err := NewPreparationFactory(c)(ctx, r)
-	if err != nil {
-		t.Fatal(err)
-	}
-	p := resource.(*prepared)
-	t.Cleanup(func() { _ = p.Cancel(context.Background()) })
-	raw, err := os.ReadFile(record)
-	if err != nil || strings.Contains(string(raw), "session/prompt") {
-		t.Fatalf("preparation consumed input: %q %v", raw, err)
-	}
-	if p.executor.opts.Dir != r.LocalEnvironment.WorkspaceRoot || p.executor.opts.DataDir == r.LocalEnvironment.WorkspaceRoot {
-		t.Fatal("native cwd must use the workspace without moving Session state")
-	}
-	out := make(chan proto.Envelope)
-	var wg sync.WaitGroup
-	winners := make(chan bool, 8)
-	for range 8 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			_, err := p.Start(ctx, "run", proto.TextInput("input"), out)
-			winners <- err == nil
-		}()
-	}
-	wg.Wait()
-	close(winners)
-	n := 0
-	for winner := range winners {
-		if winner {
-			n++
-		}
-	}
-	if n != 1 {
-		t.Fatalf("owners=%d", n)
-	}
-	if err := p.Close(); err != nil {
-		t.Fatal(err)
-	}
-	deltas, done := 0, 0
-	for e := range out {
-		if e.Type == proto.TypeError {
-			t.Fatalf("execution: %s", e.Payload)
-		}
-		if e.Type == proto.TypeDelta {
-			deltas++
-		}
-		if e.Type == proto.TypeDone {
-			done++
-			select {
-			case <-p.executor.connection.exited:
-				t.Fatal("successful Turn disposed the reusable native owner")
-			default:
-			}
-			var d proto.DonePayload
-			_ = json.Unmarshal(e.Payload, &d)
-			if d.Metadata[proto.DoneMetaAgentSessionID] != "native-1" {
-				t.Fatal("native identity lost")
-			}
-		}
-	}
-	if deltas != 100 || done != 1 {
-		t.Fatalf("deltas=%d done=%d", deltas, done)
-	}
-	raw, _ = os.ReadFile(record)
-	if strings.Count(string(raw), "session/prompt") != 1 {
-		t.Fatalf("inputs=%s", raw)
-	}
-}
-
-func TestPreparedWorkspaceCloseBeforeStart(t *testing.T) {
-	c, r, _ := workspaceFixture(t)
-	ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
-	defer cancel()
-	resource, err := NewPreparationFactory(c)(ctx, r)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = resource.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if _, err = resource.Start(ctx, "run", proto.TextInput("input"), make(chan proto.Envelope)); err == nil {
-		t.Fatal("released preparation started")
-	}
-	if err = resource.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestPreparedSubagentsReleaseUnusedOwner(t *testing.T) {
-	for _, method := range []string{"close", "cancel"} {
-		t.Run(method, func(t *testing.T) {
-			c, r, record := workspaceFixture(t)
-			ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
-			defer cancel()
-			resource, err := NewPreparationFactory(c)(ctx, r)
-			if err != nil {
-				t.Fatal(err)
-			}
-			p := resource.(*prepared)
-			// The fixture only implements preparation. Enable the owner's child
-			// branch after initialization to verify unused owners never enter it.
-			p.executor.req.DisableSubagents = false
-			ended := make(chan error, 1)
-			go func() {
-				if method == "close" {
-					ended <- p.Close()
-				} else {
-					ended <- p.Cancel(ctx)
-				}
-			}()
-			select {
-			case err := <-ended:
-				if err != nil {
-					t.Fatal(err)
-				}
-			case <-ctx.Done():
-				p.executor.connection.process.Cancel()
-				t.Fatal("unused owner did not close")
-			}
-			raw, err := os.ReadFile(record)
-			if err != nil || strings.Contains(string(raw), "session/prompt") || strings.Contains(string(raw), "delegation/stop") {
-				t.Fatalf("unused preparation executed work: %q %v", raw, err)
-			}
-		})
-	}
-}
diff --git a/apps/daemon/internal/agent/mcode/unsupported.go b/apps/daemon/internal/agent/mcode/unsupported.go
index a92be890d..e221bd595 100644
--- a/apps/daemon/internal/agent/mcode/unsupported.go
+++ b/apps/daemon/internal/agent/mcode/unsupported.go
@@ -34,15 +34,3 @@ func (s *Session) ListWorkspaceDirectory(context.Context, string, int) (agent.Wo
 func (s *Session) WriteWorkspaceFile(context.Context, string, []byte) (agent.WorkspaceWriteResult, error) {
 	return agent.WorkspaceWriteResult{}, agent.ErrWorkspaceWriteUnsupported
 }
-
-func (s *prepared) ReadWorkspaceFile(context.Context, string, int) (agent.WorkspaceReadResult, error) {
-	return agent.WorkspaceReadResult{}, agent.ErrWorkspaceReadUnsupported
-}
-
-func (s *prepared) ListWorkspaceDirectory(context.Context, string, int) (agent.WorkspaceDirectoryResult, error) {
-	return agent.WorkspaceDirectoryResult{}, agent.ErrWorkspaceReadUnsupported
-}
-
-func (s *prepared) WriteWorkspaceFile(context.Context, string, []byte) (agent.WorkspaceWriteResult, error) {
-	return agent.WorkspaceWriteResult{}, agent.ErrWorkspaceWriteUnsupported
-}
diff --git a/apps/daemon/internal/agent/mcode/unsupported_test.go b/apps/daemon/internal/agent/mcode/unsupported_test.go
index a059b11ef..eb0609bb6 100644
--- a/apps/daemon/internal/agent/mcode/unsupported_test.go
+++ b/apps/daemon/internal/agent/mcode/unsupported_test.go
@@ -27,21 +27,21 @@ func TestUnsupportedExtensionsHaveNoNativeEffects(t *testing.T) {
 	}
 	var turn *Session
 	check(turn.SubmitFunctionResult(ctx, proto.FunctionResultPayload{CallID: secret, DeliveryID: secret}))
-	for _, owner := range []agent.WorkspaceReader{(*executor)(nil), (*Session)(nil), (*prepared)(nil)} {
+	for _, owner := range []agent.WorkspaceReader{(*executor)(nil), (*Session)(nil)} {
 		result, err := owner.ReadWorkspaceFile(ctx, secret, 1)
 		check(err)
 		if len(result.Data) != 0 || result.Truncated {
 			t.Fatal("unsupported read fabricated data")
 		}
 	}
-	for _, owner := range []agent.WorkspaceDirectoryLister{(*executor)(nil), (*Session)(nil), (*prepared)(nil)} {
+	for _, owner := range []agent.WorkspaceDirectoryLister{(*executor)(nil), (*Session)(nil)} {
 		result, err := owner.ListWorkspaceDirectory(ctx, secret, 1)
 		check(err)
 		if len(result.Entries) != 0 || result.Truncated {
 			t.Fatal("unsupported listing fabricated entries")
 		}
 	}
-	for _, owner := range []agent.WorkspaceWriter{(*executor)(nil), (*Session)(nil), (*prepared)(nil)} {
+	for _, owner := range []agent.WorkspaceWriter{(*executor)(nil), (*Session)(nil)} {
 		result, err := owner.WriteWorkspaceFile(ctx, secret, []byte(secret))
 		check(err)
 		if result.SizeBytes != 0 {
diff --git a/apps/daemon/internal/agent/registry.go b/apps/daemon/internal/agent/registry.go
index f6b02c0c9..c6998e918 100644
--- a/apps/daemon/internal/agent/registry.go
+++ b/apps/daemon/internal/agent/registry.go
@@ -13,7 +13,6 @@ import (
 // factories for each agent_kind. Safe for concurrent use.
 type Registry struct {
 	mu             sync.RWMutex
-	preparers      map[string]PreparationFactory
 	executors      map[string]ExecutorFactory
 	kinds          map[string]proto.SupportedAgentKind
 	configurations map[string]harnessconfig.Configuration
@@ -21,7 +20,6 @@ type Registry struct {
 
 func NewRegistry() *Registry {
 	return &Registry{
-		preparers:      make(map[string]PreparationFactory),
 		executors:      make(map[string]ExecutorFactory),
 		kinds:          make(map[string]proto.SupportedAgentKind),
 		configurations: make(map[string]harnessconfig.Configuration),
@@ -58,13 +56,3 @@ func (r *Registry) ResolveExecutor(kind string) (ExecutorFactory, error) {
 	}
 	return factory, nil
 }
-
-func (r *Registry) ResolvePreparation(kind string) (PreparationFactory, error) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	f := r.preparers[kind]
-	if f == nil {
-		return nil, fmt.Errorf("agent: preparation unavailable for %q", kind)
-	}
-	return f, nil
-}
diff --git a/apps/daemon/internal/agent/registry_test.go b/apps/daemon/internal/agent/registry_test.go
index 9720ab654..3d484d6dc 100644
--- a/apps/daemon/internal/agent/registry_test.go
+++ b/apps/daemon/internal/agent/registry_test.go
@@ -36,24 +36,16 @@ func TestRegistryRegisterPanicsOnEmptyKind(t *testing.T) {
 func TestRegistryRegisterRejectsFactoriesForUnavailableRuntime(t *testing.T) {
 	info := proto.SupportedAgentKind{Kind: "k", Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported})}
 	executor := func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) { return nil, nil }
-	preparation := func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return nil, nil }
-	for name, runtime := range map[string]agent.Runtime{
-		"executor":    {Info: info, Executor: executor},
-		"preparation": {Info: info, Preparation: preparation},
-	} {
-		t.Run(name, func(t *testing.T) {
-			registry := agent.NewRegistry()
-			defer func() {
-				if recover() == nil {
-					t.Fatal("unavailable runtime registered factories")
-				}
-				if len(registry.SupportedAgentKinds()) != 0 {
-					t.Fatal("rejected runtime changed registry")
-				}
-			}()
-			registry.Register(agent.Declaration{Info: info}, runtime)
-		})
-	}
+	registry := agent.NewRegistry()
+	defer func() {
+		if recover() == nil {
+			t.Fatal("unavailable runtime registered factories")
+		}
+		if len(registry.SupportedAgentKinds()) != 0 {
+			t.Fatal("rejected runtime changed registry")
+		}
+	}()
+	registry.Register(agent.Declaration{Info: info}, agent.Runtime{Info: info, Executor: executor})
 }
 
 func TestRegistrySupportedAgentKindsReportsDescriptors(t *testing.T) {
diff --git a/apps/daemon/internal/cli/preparation_test.go b/apps/daemon/internal/cli/preparation_test.go
deleted file mode 100644
index 9518ae1b1..000000000
--- a/apps/daemon/internal/cli/preparation_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package cli
-
-import (
-	"context"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
-)
-
-func TestPreparationRegistrationFollowsNativeSupport(t *testing.T) {
-	for _, supported := range []bool{false, true} {
-		reg := agent.NewRegistry()
-		info := proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilityFromBool(supported)})}
-		runtime := agent.Runtime{Info: info}
-		if supported {
-			runtime.Preparation = func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return nil, nil }
-			runtime.WorkspaceReadPreparation = true
-		}
-		registerAgentKinds(reg, agentCLIDiscovery{{declaration: agent.Declaration{Info: info}, runtime: runtime}})
-
-		_, err := reg.ResolvePreparation("codex")
-		if (err == nil) != supported {
-			t.Fatal("unverified native version advertised preparation")
-		}
-		if !supported {
-			continue
-		}
-		for _, info := range reg.SupportedAgentKinds() {
-			if info.Kind == "codex" && (!info.Capabilities.Preparation.IsSupported() || !info.Capabilities.WorkspaceReadPreparation.IsSupported()) {
-				t.Fatal("heartbeat registry lost preparation")
-			}
-		}
-		reg.RegisterKind(proto.SupportedAgentKind{Kind: "codex", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{})}, harnessconfig.Configuration{})
-		if _, err := reg.ResolvePreparation("codex"); err == nil {
-			t.Fatal("kind replacement retained stale preparation")
-		}
-	}
-}
diff --git a/apps/daemon/internal/dispatch/executor.go b/apps/daemon/internal/dispatch/executor.go
index 38de76298..0e47e8c20 100644
--- a/apps/daemon/internal/dispatch/executor.go
+++ b/apps/daemon/internal/dispatch/executor.go
@@ -153,7 +153,7 @@ func (r *Router) handleExecutorPrepare(ctx context.Context, env proto.Envelope,
 	p.status = proto.PreparationStatusPayload{Handle: uuid.NewString(), ExecutorID: owner.id, Revision: 1, State: state, Reused: reused, ExpiresAt: p.deadline.UnixMilli()}
 	owner.admission = p
 	r.preparations[p.status.Handle], r.preparationRequests[env.ID] = p, p
-	p.timer = time.AfterFunc(r.preparationTimeout, func() { r.releasePreparation(p, "expired", "", true, true) })
+	p.timer = time.AfterFunc(r.preparationTimeout, func() { r.releasePreparation(p, "expired", "", true) })
 	if !reused {
 		r.shutdownWG.Add(1)
 	}
diff --git a/apps/daemon/internal/dispatch/local_directory.go b/apps/daemon/internal/dispatch/local_directory.go
deleted file mode 100644
index 02c1a4fa4..000000000
--- a/apps/daemon/internal/dispatch/local_directory.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package dispatch
-
-import (
-	"context"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-type localDirectoryPreparation struct{}
-
-func prepareLocalDirectory(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
-	return localDirectoryPreparation{}, nil
-}
-
-func (localDirectoryPreparation) Start(context.Context, string, proto.MessageInput, chan<- proto.Envelope) (agent.Session, error) {
-	return nil, agent.ErrWorkspaceReadUnsupported
-}
-
-func (localDirectoryPreparation) Close() error { return nil }
diff --git a/apps/daemon/internal/dispatch/local_directory_test.go b/apps/daemon/internal/dispatch/local_directory_test.go
index 6c79a12cd..b7329c2f5 100644
--- a/apps/daemon/internal/dispatch/local_directory_test.go
+++ b/apps/daemon/internal/dispatch/local_directory_test.go
@@ -29,8 +29,8 @@ func TestLocalDirectoryPreparationNeedsNoHarnessAndRejectsOtherOwners(t *testing
 	}
 	var harnessCalls atomic.Int32
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported})}, harnessconfig.Configuration{})
-	reg.RegisterPreparation("native", true, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, WorkspaceReadPreparation: proto.CapabilitySupported})}, harnessconfig.Configuration{})
+	reg.RegisterExecutor("native", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 		harnessCalls.Add(1)
 		return nil, errors.New("must not prepare a harness")
 	})
@@ -108,8 +108,8 @@ func TestLocalDirectoryKeepsNotDirectorySeparateFromFailures(t *testing.T) {
 		t.Fatal(err)
 	}
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported})}, harnessconfig.Configuration{})
-	reg.RegisterPreparation("native", true, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "native", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, WorkspaceReadPreparation: proto.CapabilitySupported})}, harnessconfig.Configuration{})
+	reg.RegisterExecutor("native", func(context.Context, proto.PromptRequestPayload) (agent.Executor, error) {
 		return nil, errors.New("must not prepare a harness")
 	})
 	sender := &recSender{}
diff --git a/apps/daemon/internal/dispatch/preparation.go b/apps/daemon/internal/dispatch/preparation.go
index e705953ee..3316c282f 100644
--- a/apps/daemon/internal/dispatch/preparation.go
+++ b/apps/daemon/internal/dispatch/preparation.go
@@ -8,7 +8,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/google/uuid"
 )
@@ -30,7 +29,6 @@ type preparationState struct {
 	timer             *time.Timer
 	ctx               context.Context
 	cancel            context.CancelFunc
-	prepared          agent.Prepared
 	environmentID     string
 	busy              bool
 	owns              bool
@@ -52,14 +50,14 @@ func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope)
 	if !available {
 		return r.rejectPreparation(env, "resource_unavailable")
 	}
-	prepare, err := r.registry.ResolvePreparation(req.AgentKind)
-	if err != nil || !caps.Preparation.IsSupported() {
+	if !caps.Preparation.IsSupported() {
 		return r.rejectPreparation(env, "unsupported_preparation")
 	}
-	if req.WorkspaceReadOnly && (!caps.WorkspaceReadPreparation.IsSupported() || !proto.ValidWorkspaceReadPreparation(req)) {
+	if !caps.WorkspaceReadPreparation.IsSupported() || !proto.ValidWorkspaceReadPreparation(req) {
 		return r.rejectPreparation(env, "unsupported_read_preparation")
 	}
-	if req, err = r.localWorkspace.Configure(req); err != nil {
+	req, err := r.localWorkspace.Configure(req)
+	if err != nil {
 		return r.rejectPreparation(env, "invalid_configuration")
 	}
 	if req.RunID != "" || len(req.Input) != 0 || req.EnvironmentID() == "" || strings.TrimSpace(req.AgentStateKey) == "" {
@@ -68,9 +66,6 @@ func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope)
 	if validateExecutionEnvironment(req, caps) != nil || (len(req.FunctionTools) > 0 && !caps.FunctionTools.IsSupported()) {
 		return r.rejectPreparation(env, "unsupported_configuration")
 	}
-	if req.LocalEnvironment != nil && req.WorkspaceReadOnly {
-		prepare = prepareLocalDirectory
-	}
 	encoded, err := json.Marshal(req)
 	if err != nil {
 		return r.rejectPreparation(env, "invalid_configuration")
@@ -81,7 +76,7 @@ func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope)
 		r.mu.Unlock()
 		return ErrRouterClosed
 	}
-	if r.runtimePreparation != nil || ((r.workspaceWrite != nil || r.workspaceExport != nil) && !req.WorkspaceReadOnly) {
+	if r.runtimePreparation != nil {
 		r.mu.Unlock()
 		return r.rejectPreparation(env, "resource_unavailable")
 	}
@@ -107,60 +102,44 @@ func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope)
 		return r.rejectPreparation(env, "preparation_capacity")
 	}
 	owner, cancel := context.WithCancel(context.WithoutCancel(ctx))
-	p := &preparationState{capabilities: caps, requestID: env.ID, trace: env.Trace, fingerprint: fingerprint, ctx: owner, cancel: cancel, environmentID: req.EnvironmentID(), workspaceReadOnly: req.WorkspaceReadOnly, busy: true, owns: true, deadline: time.Now().Add(r.preparationTimeout)}
+	p := &preparationState{capabilities: caps, requestID: env.ID, trace: env.Trace, fingerprint: fingerprint, ctx: owner, cancel: cancel, environmentID: req.EnvironmentID(), workspaceReadOnly: true, busy: true, owns: true, deadline: time.Now().Add(r.preparationTimeout)}
 	p.status = proto.PreparationStatusPayload{Handle: uuid.NewString(), Revision: 1, State: "preparing", ExpiresAt: p.deadline.UnixMilli()}
 	r.preparations[p.status.Handle], r.preparationRequests[p.requestID] = p, p
-	p.timer = time.AfterFunc(r.preparationTimeout, func() { r.releasePreparation(p, "expired", "", true, true) })
+	p.timer = time.AfterFunc(r.preparationTimeout, func() { r.releasePreparation(p, "expired", "", true) })
 	r.shutdownWG.Add(1)
 	r.mu.Unlock()
-	go r.prepareExecution(p, req, prepare)
+	go r.prepareExecution(p)
 	return nil
 }
 
-func (r *Router) prepareExecution(p *preparationState, req proto.PromptRequestPayload, prepare agent.PreparationFactory) {
+// prepareExecution readies a read-only preparation without starting a Harness.
+func (r *Router) prepareExecution(p *preparationState) {
 	defer r.shutdownWG.Done()
 	if !r.sendPreparation(p.requestID, p.trace, proto.PreparationStatusPayload{Handle: p.status.Handle, Revision: 1, State: "preparing", ExpiresAt: p.deadline.UnixMilli()}) {
-		r.releasePreparation(p, "failed", "status_delivery_failed", false, false)
-	}
-	var prepared agent.Prepared
-	var err error
-	if p.ctx.Err() == nil {
-		prepared, err = prepare(p.ctx, req)
-	} else {
-		err = p.ctx.Err()
-	}
-	if err == nil && prepared != nil && !p.workspaceReadOnly {
-		if _, ok := prepared.(agent.PreparedCancellation); !ok {
-			err = errors.New("executable preparation requires cross-transfer cancellation")
-		}
+		r.releasePreparation(p, "failed", "status_delivery_failed", false)
 	}
 	r.mu.Lock()
 	p.busy = false
-	p.prepared = prepared
-	ready := err == nil && prepared != nil && p.status.State == "preparing" && p.ctx.Err() == nil && !r.closed
+	ready := p.status.State == "preparing" && p.ctx.Err() == nil && !r.closed
 	if ready {
 		p.status.State, p.status.Revision = "ready", p.status.Revision+1
-	} else if p.status.State == "preparing" {
-		p.status.State, p.status.ErrorCode, p.status.Revision = "failed", "preparation_failed", p.status.Revision+1
-	}
-	status := p.status
-	if !ready {
-		p.busy = true
+	} else {
+		if p.status.State == "preparing" {
+			p.status.State, p.status.ErrorCode, p.status.Revision = "failed", "preparation_failed", p.status.Revision+1
+		}
+		// A release or shutdown during readiness left ownership to this return.
+		p.owns = false
 		p.cancel()
 		p.timer.Stop()
 	}
+	status := p.status
 	r.mu.Unlock()
 	if !ready {
-		r.closePreparationResource(p)
-		if p.workspaceReadOnly {
-			return
-		}
-		r.mu.Lock()
-		status = p.status
-		r.mu.Unlock()
+		r.publishPreparation(p, status)
+		return
 	}
-	if !r.sendPreparation(p.requestID, p.trace, status) && ready {
-		r.releasePreparation(p, "failed", "status_delivery_failed", false, false)
+	if !r.sendPreparation(p.requestID, p.trace, status) {
+		r.releasePreparation(p, "failed", "status_delivery_failed", false)
 	}
 }
 
@@ -176,11 +155,11 @@ func (r *Router) handleExecutionRelease(_ context.Context, env proto.Envelope) e
 	if !valid {
 		return r.rejectPreparation(env, "unknown_preparation")
 	}
-	r.releasePreparation(p, "released", "", true, true)
+	r.releasePreparation(p, "released", "", true)
 	return nil
 }
 
-func (r *Router) releasePreparation(p *preparationState, state, code string, publish, retryHandoff bool) {
+func (r *Router) releasePreparation(p *preparationState, state, code string, publish bool) {
 	r.mu.Lock()
 	if r.closed || r.suspension != nil {
 		r.mu.Unlock()
@@ -191,48 +170,21 @@ func (r *Router) releasePreparation(p *preparationState, state, code string, pub
 		r.abandonExecutorAdmission(p, state, code, publish)
 		return
 	}
-	if p.handoff != nil {
-		if active := r.sessions[p.status.RunID]; active != nil && active.preparedHandoff == p.handoff {
-			if state == "expired" && p.handoff.published {
-				r.mu.Unlock()
-				return
-			}
-			switch p.status.State {
-			case "preparing", "ready", "starting", "started":
-				p.status.State, p.status.ErrorCode, p.status.Revision = state, code, p.status.Revision+1
-				p.timer.Stop()
-			}
-			r.claimPreparedReleaseLocked(active, true, "", retryHandoff)
-			status := p.status
-			r.mu.Unlock()
-			if publish {
-				r.publishPreparation(p, status)
-			}
-			return
-		}
-	}
-	closeResource := false
 	switch p.status.State {
-	case "preparing", "ready", "starting":
+	case "preparing", "ready":
 		p.status.State, p.status.ErrorCode, p.status.Revision = state, code, p.status.Revision+1
 		p.cancel()
 		p.timer.Stop()
 	}
-	if p.owns && !p.busy {
-		if p.workspaceReadOnly && state == "released" && p.status.ErrorCode == "cleanup_unconfirmed" {
-			p.status.State, p.status.ErrorCode, p.status.Revision = state, "", p.status.Revision+1
-		}
-		p.busy = true
-		closeResource = true
-		r.shutdownWG.Add(1)
+	// A busy preparation drops ownership and reports when readiness returns.
+	// Dropping ownership here always reports it.
+	report := !p.busy && (publish || p.owns)
+	if !p.busy {
+		p.owns = false
 	}
 	status := p.status
-	settled := !p.owns && !p.busy
 	r.mu.Unlock()
-	if closeResource {
-		go func() { defer r.shutdownWG.Done(); r.closePreparationResource(p) }()
-	}
-	if publish && (!p.workspaceReadOnly || settled) {
+	if report {
 		r.publishPreparation(p, status)
 	}
 }
@@ -258,11 +210,9 @@ func (r *Router) prunePreparationsLocked() {
 
 func (r *Router) publishPreparation(p *preparationState, status proto.PreparationStatusPayload) {
 	r.mu.Lock()
-	if p.workspaceReadOnly {
-		if status.Revision != p.status.Revision || (p.owns && (p.busy || status.State == "released" || status.State == "expired") && status.State != "preparing" && status.State != "ready") {
-			r.mu.Unlock()
-			return
-		}
+	if p.workspaceReadOnly && status.Revision != p.status.Revision {
+		r.mu.Unlock()
+		return
 	}
 	if r.closed || r.suspension != nil {
 		r.mu.Unlock()
@@ -274,7 +224,7 @@ func (r *Router) publishPreparation(p *preparationState, status proto.Preparatio
 		defer r.shutdownWG.Done()
 		// A failed terminal notification must not restart incomplete cleanup.
 		if !r.sendPreparation(p.requestID, p.trace, status) && (!p.workspaceReadOnly || status.State == "preparing" || status.State == "ready") {
-			r.releasePreparation(p, "failed", "status_delivery_failed", false, false)
+			r.releasePreparation(p, "failed", "status_delivery_failed", false)
 		}
 	}()
 }
diff --git a/apps/daemon/internal/dispatch/preparation_cancel_test.go b/apps/daemon/internal/dispatch/preparation_cancel_test.go
index 0a5f96c96..5804650cb 100644
--- a/apps/daemon/internal/dispatch/preparation_cancel_test.go
+++ b/apps/daemon/internal/dispatch/preparation_cancel_test.go
@@ -28,20 +28,6 @@ func (p *cancellationPreparation) Cancel(ctx context.Context) error {
 
 func (p *cancellationPreparation) CancellationOutcome() proto.DonePayload { return p.outcome }
 
-type nonCancellablePreparation struct {
-	closed chan struct{}
-	once   sync.Once
-}
-
-func (*nonCancellablePreparation) Start(context.Context, string, proto.MessageInput, chan<- proto.Envelope) (agent.Session, error) {
-	return nil, errors.New("must not start")
-}
-
-func (p *nonCancellablePreparation) Close() error {
-	p.once.Do(func() { close(p.closed) })
-	return nil
-}
-
 func startCancellationPreparation(t *testing.T, r *dispatch.Router, sender *recSender) proto.PreparationStatusPayload {
 	t.Helper()
 	if err := r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "request", preparationRequest())); err != nil {
@@ -114,7 +100,7 @@ func TestPreparedCancellationWaitsForOutputAndCleanup(t *testing.T) {
 		<-cleanupReturn
 		return nil
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	startCancellationPreparation(t, r, sender.recSender)
 	<-startEntered
 	if err := r.Handle(t.Context(), mustEnv(t, proto.TypePromptCancel, "run", proto.PromptCancelPayload{DeliveryID: "cancel"})); err != nil {
@@ -174,7 +160,7 @@ func TestPreparedCancellationBeforeTransferPreservesUnknownOutcome(t *testing.T)
 			if boundary == "expiry" {
 				timeout = 100 * time.Millisecond
 			}
-			r := preparationRouter(t, sender, timeout, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+			r := preparationRouter(t, sender, timeout, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 			ready := startCancellationPreparation(t, r, sender)
 			<-entered
 			_ = r.Handle(t.Context(), mustEnv(t, proto.TypePromptCancel, "run", proto.PromptCancelPayload{DeliveryID: "cancel"}))
@@ -231,7 +217,7 @@ func TestPreparedCancellationFailuresRemainConservative(t *testing.T) {
 				}
 				return session.Cancel(ctx)
 			}
-			r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+			r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 			startCancellationPreparation(t, r, sender.recSender)
 			<-entered
 			_ = r.Handle(t.Context(), mustEnv(t, proto.TypePromptCancel, "run", proto.PromptCancelPayload{DeliveryID: "cancel"}))
@@ -264,27 +250,6 @@ func TestPreparedCancellationFailuresRemainConservative(t *testing.T) {
 	}
 }
 
-func TestExecutablePreparationRequiresCrossTransferCancellation(t *testing.T) {
-	sender := &recSender{}
-	p := &nonCancellablePreparation{closed: make(chan struct{})}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
-	if err := r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "request", preparationRequest())); err != nil {
-		t.Fatal(err)
-	}
-	waitPreparationStatus(t, sender, "request", "failed", "")
-	select {
-	case <-p.closed:
-	case <-time.After(time.Second):
-		t.Fatal("unsupported executable preparation was not closed")
-	}
-	for _, frame := range sender.snapshot() {
-		var status proto.PreparationStatusPayload
-		if frame.Type == proto.TypePreparationStatus && frame.DecodePayload(&status) == nil && status.State == "ready" {
-			t.Fatal("unsupported executable preparation became ready")
-		}
-	}
-}
-
 func TestPreparedCancellationTimeoutKeepsCapacityUntilStartReturns(t *testing.T) {
 	sender := &recSender{}
 	entered, allowReturn := make(chan struct{}), make(chan struct{})
@@ -296,7 +261,7 @@ func TestPreparedCancellationTimeoutKeepsCapacityUntilStartReturns(t *testing.T)
 		return nil, ctx.Err()
 	}
 	var count atomic.Int32
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) {
 		if count.Add(1) == 1 {
 			return p, nil
 		}
diff --git a/apps/daemon/internal/dispatch/preparation_cleanup.go b/apps/daemon/internal/dispatch/preparation_cleanup.go
index 2a51c0e8c..97b77dbc6 100644
--- a/apps/daemon/internal/dispatch/preparation_cleanup.go
+++ b/apps/daemon/internal/dispatch/preparation_cleanup.go
@@ -1,35 +1,6 @@
 package dispatch
 
-func (r *Router) closePreparationResource(p *preparationState) error {
-	// Only the operation that owns busy calls this; other paths cancel its owner.
-	var err error
-	if p.prepared != nil {
-		err = p.prepared.Close()
-	}
-	r.mu.Lock()
-	p.busy, p.closeErr = false, err
-	if err == nil {
-		p.prepared, p.owns = nil, false
-	}
-	if p.workspaceReadOnly {
-		p.status.Revision++
-		if err != nil {
-			p.status.State, p.status.ErrorCode = "failed", "cleanup_unconfirmed"
-		}
-	}
-	status := p.status
-	r.mu.Unlock()
-	if p.workspaceReadOnly {
-		r.publishPreparation(p, status)
-	}
-	if err != nil {
-		r.log.Warn("preparation cleanup incomplete", "handle", p.status.Handle)
-	}
-	return err
-}
-
-func (r *Router) closePendingPreparationsLocked() []*preparationState {
-	var closeNow []*preparationState
+func (r *Router) closePendingPreparationsLocked() {
 	for _, p := range r.preparations {
 		p.timer.Stop()
 		if p.executor != nil {
@@ -38,19 +9,14 @@ func (r *Router) closePendingPreparationsLocked() []*preparationState {
 		if !p.owns {
 			continue
 		}
-		if p.handoff != nil {
-			continue
-		}
 		p.cancel()
 		switch p.status.State {
-		case "preparing", "ready", "starting":
+		case "preparing", "ready":
 			p.status.State, p.status.ErrorCode, p.status.Revision = "failed", "connection_closed", p.status.Revision+1
 		}
+		// A busy preparation drops ownership when readiness returns.
 		if !p.busy {
-			p.busy = true
-			r.shutdownWG.Add(1)
-			closeNow = append(closeNow, p)
+			p.owns = false
 		}
 	}
-	return closeNow
 }
diff --git a/apps/daemon/internal/dispatch/preparation_cleanup_test.go b/apps/daemon/internal/dispatch/preparation_cleanup_test.go
index 20a45212b..b88d21b73 100644
--- a/apps/daemon/internal/dispatch/preparation_cleanup_test.go
+++ b/apps/daemon/internal/dispatch/preparation_cleanup_test.go
@@ -43,7 +43,7 @@ func TestPreparedCancellationDoesNotAcknowledgeFailedCleanup(t *testing.T) {
 		return nil, context.Canceled
 	}
 	sender := &recSender{}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	ready := startCancellationPreparation(t, r, sender)
 	<-entered
 	_ = r.Handle(t.Context(), mustEnv(t, proto.TypePromptCancel, "run", proto.PromptCancelPayload{DeliveryID: "cancel"}))
@@ -74,7 +74,7 @@ func TestShutdownRetriesFailedPreparedCancellationOnSameTarget(t *testing.T) {
 		}
 		return session.Cancel(ctx)
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	startCancellationPreparation(t, r, sender)
 	waitPreparationStatus(t, sender, "request", "started", "")
 	if err := r.Shutdown(t.Context()); !errors.Is(err, want) {
@@ -105,7 +105,7 @@ func TestShutdownRetriesFailedPreparationCleanup(t *testing.T) {
 		return nil
 	}}
 	sender := &recSender{}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	_ = r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "request", preparationRequest()))
 	waitPreparationStatus(t, sender, "request", "ready", "")
 	if err := r.Shutdown(t.Context()); !errors.Is(err, want) {
@@ -126,7 +126,7 @@ func TestShutdownTimeoutAndConcurrentRetryWaitForCleanup(t *testing.T) {
 	unblock := func() { once.Do(func() { close(release) }) }
 	p := &retryablePreparation{close: func(int32) error { close(entered); <-release; return nil }}
 	sender := &recSender{}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	t.Cleanup(unblock)
 	_ = r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "request", preparationRequest()))
 	waitPreparationStatus(t, sender, "request", "ready", "")
@@ -176,7 +176,7 @@ func TestPublishedPreparedRunRetainsRetryAfterHandleRetirement(t *testing.T) {
 		return session.Cancel(ctx)
 	}
 	var factories atomic.Int32
-	r := preparationRouter(t, sender, 200*time.Millisecond, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+	r := preparationRouter(t, sender, 200*time.Millisecond, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) {
 		if factories.Add(1) == 1 {
 			return p, nil
 		}
diff --git a/apps/daemon/internal/dispatch/preparation_executor_fixture_test.go b/apps/daemon/internal/dispatch/preparation_executor_fixture_test.go
index 9da6a2d2e..0ab84ce26 100644
--- a/apps/daemon/internal/dispatch/preparation_executor_fixture_test.go
+++ b/apps/daemon/internal/dispatch/preparation_executor_fixture_test.go
@@ -2,30 +2,39 @@ package dispatch_test
 
 import (
 	"context"
-	"errors"
 	"sync"
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
+// preparedFixture is a disposable fault-injection resource; Start transfers it
+// to one Session. A cancellablePreparation follows that Session across Start.
+type preparedFixture interface {
+	Start(context.Context, string, proto.MessageInput, chan<- proto.Envelope) (agent.Session, error)
+	Close() error
+}
+
+type cancellablePreparation interface {
+	preparedFixture
+	agent.Session
+}
+
+type preparationFactory func(context.Context, proto.PromptRequestPayload) (preparedFixture, error)
+
 // Old fault-injection fixtures model disposable executors, not reusable native implementations.
-func preparationExecutorFixture(factory agent.PreparationFactory) agent.ExecutorFactory {
+func preparationExecutorFixture(factory preparationFactory) agent.ExecutorFactory {
 	return func(ctx context.Context, req proto.PromptRequestPayload) (agent.Executor, error) {
 		prepared, err := factory(ctx, req)
 		if prepared == nil {
 			return nil, err
 		}
-		owner := &preparationExecutor{prepared: prepared}
-		if _, ok := prepared.(agent.PreparedCancellation); !ok {
-			return owner, errors.New("fixture has no cancellation target")
-		}
-		return owner, err
+		return &preparationExecutor{prepared: prepared}, err
 	}
 }
 
 type preparationExecutor struct {
-	prepared  agent.Prepared
+	prepared  preparedFixture
 	mu        sync.Mutex
 	cancelled bool
 }
@@ -39,7 +48,7 @@ func (e *preparationExecutor) Close(ctx context.Context) error {
 	var err error
 	if resource, ok := e.prepared.(*retryablePreparation); ok {
 		err = resource.Close()
-	} else if cancel, ok := e.prepared.(agent.PreparedCancellation); ok {
+	} else if cancel, ok := e.prepared.(cancellablePreparation); ok {
 		err = cancel.Cancel(ctx)
 	} else {
 		err = e.prepared.Close()
@@ -79,7 +88,7 @@ type preparationTurn struct {
 
 func (t *preparationTurn) Cancel(ctx context.Context) error { return t.owner.Close(ctx) }
 func (t *preparationTurn) CancellationOutcome() proto.DonePayload {
-	if target, ok := t.owner.prepared.(agent.PreparedCancellation); ok {
+	if target, ok := t.owner.prepared.(cancellablePreparation); ok {
 		return target.CancellationOutcome()
 	}
 	return proto.DonePayload{}
diff --git a/apps/daemon/internal/dispatch/preparation_start.go b/apps/daemon/internal/dispatch/preparation_start.go
index 5b96f6369..8b0818b4c 100644
--- a/apps/daemon/internal/dispatch/preparation_start.go
+++ b/apps/daemon/internal/dispatch/preparation_start.go
@@ -61,7 +61,7 @@ func (r *Router) handleExecutionStart(_ context.Context, env proto.Envelope) err
 	}
 	if !time.Now().Before(p.deadline) {
 		r.mu.Unlock()
-		r.releasePreparation(p, "expired", "", true, true)
+		r.releasePreparation(p, "expired", "", true)
 		return nil
 	}
 	if r.sessions[input.RunID] != nil {
diff --git a/apps/daemon/internal/dispatch/preparation_test.go b/apps/daemon/internal/dispatch/preparation_test.go
index 427470709..eca2ea195 100644
--- a/apps/daemon/internal/dispatch/preparation_test.go
+++ b/apps/daemon/internal/dispatch/preparation_test.go
@@ -116,11 +116,10 @@ func preparationRequest() proto.ExecutionPreparePayload {
 	return proto.ExecutionPreparePayload{SessionID: preparationSessionID, Configuration: proto.PromptRequestPayload{AgentKind: "prepared", AgentStateKey: "agents-api-" + preparationSessionID, LocalEnvironment: &proto.LocalEnvironment{ID: preparationEnvironmentID, NetworkAccess: "enabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}}}
 }
 
-func preparationRouter(t *testing.T, sender dispatch.Sender, timeout time.Duration, factory agent.PreparationFactory) *dispatch.Router {
+func preparationRouter(t *testing.T, sender dispatch.Sender, timeout time.Duration, factory preparationFactory) *dispatch.Router {
 	t.Helper()
 	reg := agent.NewRegistry()
-	reg.RegisterKind(proto.SupportedAgentKind{Kind: "prepared", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{})
-	reg.RegisterPreparation("prepared", true, factory)
+	reg.RegisterKind(proto.SupportedAgentKind{Kind: "prepared", Available: true, Capabilities: prototest.Capabilities(proto.AgentKindCapabilities{LocalEnvironment: proto.CapabilitySupported, WorkspaceReadPreparation: proto.CapabilitySupported, FunctionTools: proto.CapabilitySupported, Steering: proto.CapabilitySupported, DurableInputReceipts: proto.CapabilitySupported})}, harnessconfig.Configuration{})
 	reg.RegisterExecutor("prepared", preparationExecutorFixture(factory))
 	r, err := dispatch.New(dispatch.Config{Registry: reg, Sender: sender, PreparationTimeout: timeout, LocalWorkspace: preparationWorkspace(t)})
 	if err != nil {
@@ -165,7 +164,7 @@ func TestPreparationReleaseDuringBlockedFactory(t *testing.T) {
 	sender := &recSender{}
 	p := &controlledPreparation{closed: make(chan struct{})}
 	entered, allowReturn := make(chan context.Context, 1), make(chan struct{})
-	r := preparationRouter(t, sender, time.Minute, func(ctx context.Context, req proto.PromptRequestPayload) (agent.Prepared, error) {
+	r := preparationRouter(t, sender, time.Minute, func(ctx context.Context, req proto.PromptRequestPayload) (preparedFixture, error) {
 		if req.RunID != "" || len(req.Input) != 0 {
 			t.Error("run input reached preparation")
 		}
@@ -217,7 +216,7 @@ func TestPreparationSingleTransferAndReleaseDoesNotCancelRun(t *testing.T) {
 		gotSession <- s
 		return s, nil
 	}
-	r := preparationRouter(t, sender, 80*time.Millisecond, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, 80*time.Millisecond, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	prepare := mustEnv(t, proto.TypeExecutionPrepare, "request", preparationRequest())
 	if err := r.Handle(t.Context(), prepare); err != nil {
 		t.Fatal(err)
@@ -274,7 +273,7 @@ func TestPreparationCancelDuringStartClosesLateSession(t *testing.T) {
 		close(cancelEntered)
 		return (<-lateSession).Cancel(ctx)
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	_ = r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionPrepare, "request", preparationRequest()))
 	ready := waitPreparationStatus(t, sender, "request", "ready", "")
 	_ = r.Handle(t.Context(), mustEnv(t, proto.TypeExecutionStart, "request", proto.ExecutionStartPayload{Handle: ready.Handle, ExecutorID: ready.ExecutorID, RunID: "real-run", Input: proto.TextInput("input")}))
@@ -311,7 +310,7 @@ func TestPreparationCancelDuringStartClosesLateSession(t *testing.T) {
 func TestPreparationExpiryAndOldHandleCannotStartReplacement(t *testing.T) {
 	sender := &recSender{}
 	created := make(chan *controlledPreparation, 2)
-	r := preparationRouter(t, sender, 60*time.Millisecond, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+	r := preparationRouter(t, sender, 60*time.Millisecond, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) {
 		p := &controlledPreparation{closed: make(chan struct{})}
 		created <- p
 		return p, nil
@@ -349,7 +348,7 @@ func (s failReadySender) Send(ctx context.Context, env proto.Envelope) error {
 func TestPreparationFailedReadyDeliveryAbandonsAdmission(t *testing.T) {
 	created := make(chan struct{})
 	p := &controlledPreparation{closed: make(chan struct{})}
-	r := preparationRouter(t, failReadySender{&recSender{}}, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+	r := preparationRouter(t, failReadySender{&recSender{}}, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) {
 		close(created)
 		return p, nil
 	})
@@ -375,7 +374,7 @@ func TestPreparationRejectsInputAndProductConfiguration(t *testing.T) {
 		"missing environment": func(p *proto.PromptRequestPayload) { p.LocalEnvironment = nil },
 	} {
 		t.Run(name, func(t *testing.T) {
-			r := preparationRouter(t, &recSender{}, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+			r := preparationRouter(t, &recSender{}, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) {
 				t.Error("invalid preparation reached native factory")
 				return nil, errors.New("invalid")
 			})
diff --git a/apps/daemon/internal/dispatch/prepared_handoff_mutation_test.go b/apps/daemon/internal/dispatch/prepared_handoff_mutation_test.go
index b00b647e9..9e86b0168 100644
--- a/apps/daemon/internal/dispatch/prepared_handoff_mutation_test.go
+++ b/apps/daemon/internal/dispatch/prepared_handoff_mutation_test.go
@@ -89,7 +89,7 @@ func TestPreparedHandoffReleaseWaitsForMutationReceipt(t *testing.T) {
 				session.out = out
 				return session, nil
 			}
-			r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+			r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 			startCancellationPreparation(t, r, sender.recSender)
 			waitPreparationStatus(t, sender.recSender, "request", "started", "")
 
@@ -203,7 +203,7 @@ func TestPreparedHandoffRouterShutdownWaitsForReceiptAttempt(t *testing.T) {
 				session.out = out
 				return session, nil
 			}
-			r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+			r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 			startCancellationPreparation(t, r, sender.recSender)
 			waitPreparationStatus(t, sender.recSender, "request", "started", "")
 
@@ -253,7 +253,7 @@ func TestPreparedHandoffEarlyDonePublishesAfterStarted(t *testing.T) {
 			return nil, ctx.Err()
 		}
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	startCancellationPreparation(t, r, sender)
 	<-emitted
 	if hasFrame(sender, proto.TypeDone, "run") || session.cancels() != 0 {
diff --git a/apps/daemon/internal/dispatch/prepared_handoff_test.go b/apps/daemon/internal/dispatch/prepared_handoff_test.go
index 37c77c149..f366b649f 100644
--- a/apps/daemon/internal/dispatch/prepared_handoff_test.go
+++ b/apps/daemon/internal/dispatch/prepared_handoff_test.go
@@ -36,7 +36,7 @@ func TestPreparedHandoffDrainsBurstBeforeStartReturns(t *testing.T) {
 			return nil, ctx.Err()
 		}
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	startCancellationPreparation(t, r, sender)
 	select {
 	case <-sent:
@@ -118,7 +118,7 @@ func TestPreparedHandoffAbortBeforeStartAdmissionSkipsNativeStart(t *testing.T)
 		return nil, errors.New("unexpected Start")
 	}
 	p.cancel = func(context.Context) error { return p.Close() }
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	ready := startCancellationPreparation(t, r, sender.recSender)
 	select {
 	case <-sender.entered:
@@ -163,7 +163,7 @@ func TestPreparedHandoffDuplicateStartDoesNotReexecuteDuringPublication(t *testi
 		session.out = out
 		return session, nil
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	ready := startCancellationPreparation(t, r, sender.recSender)
 	select {
 	case <-sender.entered:
@@ -214,7 +214,7 @@ func TestPreparedHandoffUnsupportedFunctionReleasesOperationBarrier(t *testing.T
 		session.out = out
 		return session, nil
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	startCancellationPreparation(t, r, sender)
 	waitPreparationStatus(t, sender, "request", "started", "")
 	result := mustEnv(t, proto.TypeFunctionResult, "run", proto.FunctionResultPayload{CallID: "unsupported", Success: true, Content: functionResultContent("answer"), DeliveryID: "unsupported"})
@@ -241,7 +241,7 @@ func TestPreparedHandoffEarlyDoneStillAllowsExplicitAbort(t *testing.T) {
 		return nil, context.Canceled
 	}
 	p.cancel = func(context.Context) error { unblock(); return nil }
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	defer unblock()
 	startCancellationPreparation(t, r, sender)
 	waitFor(t, func() bool { return r.SteeringClosedForTest("run") }, "early Done release claim")
@@ -265,7 +265,7 @@ func TestPreparedHandoffExpiresDuringStartedPublication(t *testing.T) {
 		session.out = out
 		return session, nil
 	}
-	r := preparationRouter(t, sender, 100*time.Millisecond, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, 100*time.Millisecond, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	startCancellationPreparation(t, r, sender.recSender)
 	<-sender.entered
 	time.Sleep(250 * time.Millisecond)
@@ -305,7 +305,7 @@ func TestPreparedHandoffEarlyDoneDetachesPublishedPreparation(t *testing.T) {
 		}
 		return session.Cancel(ctx)
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	ready := startCancellationPreparation(t, r, sender)
 	waitFor(t, func() bool { return r.SteeringClosedForTest("run") }, "early Done claim")
 	unblock()
diff --git a/apps/daemon/internal/dispatch/router_test.go b/apps/daemon/internal/dispatch/router_test.go
index ed2d90368..607e95535 100644
--- a/apps/daemon/internal/dispatch/router_test.go
+++ b/apps/daemon/internal/dispatch/router_test.go
@@ -127,7 +127,7 @@ func newHarness(t *testing.T) *harness {
 
 // sessionExecutor runs each Turn through start on a disposable Executor.
 func sessionExecutor(start func(context.Context, string, proto.MessageInput, chan<- proto.Envelope) (agent.Session, error)) agent.ExecutorFactory {
-	return preparationExecutorFixture(func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+	return preparationExecutorFixture(func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) {
 		return &controlledPreparation{start: start}, nil
 	})
 }
diff --git a/apps/daemon/internal/dispatch/runtime_preparation_execution_test.go b/apps/daemon/internal/dispatch/runtime_preparation_execution_test.go
index 1b9954af5..f6bb85f2a 100644
--- a/apps/daemon/internal/dispatch/runtime_preparation_execution_test.go
+++ b/apps/daemon/internal/dispatch/runtime_preparation_execution_test.go
@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentcapabilities"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
@@ -30,7 +29,7 @@ func TestRuntimePreparationUnavailablePreventsNativeExecutor(t *testing.T) {
 			}
 			sender := &recSender{}
 			var calls atomic.Int32
-			r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
+			r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) {
 				calls.Add(1)
 				return nil, errors.New("native factory must not be reached")
 			})
diff --git a/apps/daemon/internal/dispatch/shutdown.go b/apps/daemon/internal/dispatch/shutdown.go
index 10ec3eb69..b09de4c70 100644
--- a/apps/daemon/internal/dispatch/shutdown.go
+++ b/apps/daemon/internal/dispatch/shutdown.go
@@ -37,7 +37,7 @@ func (r *Router) Shutdown(ctx context.Context) error {
 		// Prepared release claims exist before this signal can interrupt output.
 		close(r.shutdownCh)
 	}
-	preparations := r.closePendingPreparationsLocked()
+	r.closePendingPreparationsLocked()
 	executors := r.closeIdleExecutorsLocked()
 	attempt := &shutdownAttempt{done: make(chan struct{})}
 	r.shutdownAttempt = attempt
@@ -46,9 +46,6 @@ func (r *Router) Shutdown(ctx context.Context) error {
 	r.mu.Unlock()
 
 	r.closeIdleExecutors(executors)
-	for _, p := range preparations {
-		go func() { defer r.shutdownWG.Done(); r.closePreparationResource(p) }()
-	}
 	go r.runShutdownAttempt(attempt, victims)
 	return waitShutdown(ctx, attempt)
 }
diff --git a/apps/daemon/internal/dispatch/workspace_directory_test.go b/apps/daemon/internal/dispatch/workspace_directory_test.go
index 89de922ed..1c584484f 100644
--- a/apps/daemon/internal/dispatch/workspace_directory_test.go
+++ b/apps/daemon/internal/dispatch/workspace_directory_test.go
@@ -18,7 +18,7 @@ func TestWorkspaceDirectoryRetainsEnvironmentAndTransferredOwner(t *testing.T) {
 	p.start = func(ctx context.Context, _ string, _ proto.MessageInput, out chan<- proto.Envelope) (agent.Session, error) {
 		return &fakeSession{out: out, ctx: ctx, closeOutOnCancel: true}, nil
 	}
-	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) { return p, nil })
+	r := preparationRouter(t, sender, time.Minute, func(context.Context, proto.PromptRequestPayload) (preparedFixture, error) { return p, nil })
 	for _, name := range []string{"file", "second"} {
 		if err := os.WriteFile(filepath.Join(os.Getenv("OAC_RUNTIME_WORKSPACE"), name), []byte("abc"), 0600); err != nil {
 			t.Fatal(err)
diff --git a/apps/daemon/internal/dispatch/workspace_preparation_failure_test.go b/apps/daemon/internal/dispatch/workspace_preparation_failure_test.go
deleted file mode 100644
index fa48438e5..000000000
--- a/apps/daemon/internal/dispatch/workspace_preparation_failure_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package dispatch
-
-import (
-	"context"
-	"errors"
-	"io"
-	"log/slog"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-)
-
-type workspaceFailureBoundary struct {
-	slog.Handler
-	once            sync.Once
-	entered, resume chan struct{}
-}
-
-func (h *workspaceFailureBoundary) Handle(ctx context.Context, record slog.Record) error {
-	h.once.Do(func() { close(h.entered); <-h.resume })
-	return h.Handler.Handle(ctx, record)
-}
-
-type workspaceCloseFunc struct {
-	agent.Prepared
-	close func() error
-}
-
-func (p workspaceCloseFunc) Close() error { return p.close() }
-
-func TestReadConstructorFailureCannotPublishReleaseDuringCleanupRetry(t *testing.T) {
-	boundary := &workspaceFailureBoundary{Handler: slog.NewTextHandler(io.Discard, nil), entered: make(chan struct{}), resume: make(chan struct{})}
-	sender := make(workspaceStatusSender, 16)
-	r := &Router{sender: sender, shutdownCh: make(chan struct{}), log: slog.New(boundary)}
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	timer := time.NewTimer(time.Hour)
-	defer timer.Stop()
-	retryEntered, retryResume := make(chan struct{}), make(chan struct{})
-	var resumeOnce sync.Once
-	defer resumeOnce.Do(func() { close(retryResume) })
-	calls := 0
-	resource := workspaceCloseFunc{close: func() error {
-		calls++
-		if calls == 2 {
-			close(retryEntered)
-			<-retryResume
-		}
-		return errors.New("cleanup incomplete")
-	}}
-	p := &preparationState{workspaceReadOnly: true, owns: true, busy: true,
-		ctx: ctx, cancel: cancel, timer: timer, deadline: time.Now().Add(time.Hour),
-		status: proto.PreparationStatusPayload{Handle: "reader", Revision: 1, State: "preparing"}}
-	r.shutdownWG.Add(1)
-	prepared := make(chan struct{})
-	go func() {
-		r.prepareExecution(p, proto.PromptRequestPayload{}, func(context.Context, proto.PromptRequestPayload) (agent.Prepared, error) {
-			return resource, errors.New("construction failed")
-		})
-		close(prepared)
-	}()
-	<-boundary.entered
-	r.releasePreparation(p, "released", "", true, true)
-	<-retryEntered
-	close(boundary.resume)
-	<-prepared
-	for len(sender) > 0 {
-		var status proto.PreparationStatusPayload
-		if (<-sender).DecodePayload(&status) == nil && status.State == "released" {
-			t.Error("constructor published release while retry cleanup was blocked")
-		}
-	}
-	resumeOnce.Do(func() { close(retryResume) })
-	r.shutdownWG.Wait()
-	if !p.owns || p.busy || p.status.ErrorCode != "cleanup_unconfirmed" || calls != 2 {
-		t.Fatal("failed retry did not retain cleanup ownership")
-	}
-}
diff --git a/apps/daemon/internal/dispatch/workspace_preparation_status_test.go b/apps/daemon/internal/dispatch/workspace_preparation_status_test.go
index ab8b4b98e..3128a407b 100644
--- a/apps/daemon/internal/dispatch/workspace_preparation_status_test.go
+++ b/apps/daemon/internal/dispatch/workspace_preparation_status_test.go
@@ -2,15 +2,10 @@ package dispatch
 
 import (
 	"context"
-	"errors"
-	"sync"
-	"sync/atomic"
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	obslog "github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 )
 
 type workspaceStatusSender chan proto.Envelope
@@ -20,117 +15,23 @@ func (s workspaceStatusSender) Send(_ context.Context, envelope proto.Envelope)
 	return nil
 }
 
-type offlineWorkspaceStatusSender struct{}
-
-func (offlineWorkspaceStatusSender) Send(context.Context, proto.Envelope) error {
-	return errors.New("observer disconnected")
-}
-
-type unsettledWorkspacePreparation struct {
-	agent.Prepared
-	calls   atomic.Int32
-	settled atomic.Bool
-}
-
-func (p *unsettledWorkspacePreparation) Close() error {
-	// Bound a regression so a recursive retry cannot hang the test.
-	if p.calls.Add(1) >= 100 || p.settled.Load() {
-		return nil
-	}
-	return errors.New("cleanup incomplete")
-}
-
-func TestReadPreparationOfflineStatusDoesNotRetryCleanup(t *testing.T) {
-	prepared := &unsettledWorkspacePreparation{}
+func TestReadPreparationRetryCannotPublishStaleStatus(t *testing.T) {
+	sender := make(workspaceStatusSender, 4)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	timer := time.NewTimer(time.Hour)
 	defer timer.Stop()
-	r := &Router{sender: offlineWorkspaceStatusSender{}, shutdownCh: make(chan struct{}), log: obslog.Bg()}
-	p := &preparationState{workspaceReadOnly: true, owns: true, prepared: prepared,
-		ctx: ctx, cancel: cancel, timer: timer,
-		status: proto.PreparationStatusPayload{Handle: "reader", Revision: 1, State: "ready"}}
-	for attempt := int32(1); attempt <= 2; attempt++ {
-		r.releasePreparation(p, "released", "", true, true)
-		r.shutdownWG.Wait()
-		if got := prepared.calls.Load(); got != attempt {
-			t.Fatalf("explicit release %d caused %d cleanup attempts", attempt, got)
-		}
-		if !p.owns || p.busy || p.prepared != prepared || p.status.ErrorCode != "cleanup_unconfirmed" {
-			t.Fatal("unconfirmed cleanup lost its resource ownership")
-		}
-	}
-	prepared.settled.Store(true)
-	r.releasePreparation(p, "released", "", true, true)
-	r.shutdownWG.Wait()
-	if prepared.calls.Load() != 3 || p.owns || p.prepared != nil || p.status.State != "released" {
-		t.Fatal("explicit retry did not settle resource ownership")
-	}
-}
-
-func TestReadPreparationRetryCannotPublishStaleRelease(t *testing.T) {
-	sender := make(workspaceStatusSender, 4)
 	r := &Router{sender: sender, shutdownCh: make(chan struct{})}
-	p := &preparationState{workspaceReadOnly: true, owns: true, busy: true,
-		status: proto.PreparationStatusPayload{Handle: "reader", Revision: 2, State: "released"}}
-	// A prepare retry captures this snapshot while Close is still running.
+	p := &preparationState{workspaceReadOnly: true, owns: true, ctx: ctx, cancel: cancel, timer: timer,
+		status: proto.PreparationStatusPayload{Handle: "reader", Revision: 2, State: "ready"}}
+	// A prepare retry captures this snapshot before the release settles.
 	snapshot := p.status
-	// Close fails before the retry reaches publication.
-	p.busy = false
-	p.status = proto.PreparationStatusPayload{Handle: "reader", Revision: 3, State: "failed", ErrorCode: "cleanup_unconfirmed"}
-	r.publishPreparation(p, snapshot)
-	r.shutdownWG.Wait()
-	if len(sender) != 0 {
-		t.Fatal("stale release success escaped after failed Close")
-	}
-	r.publishPreparation(p, p.status)
+	r.releasePreparation(p, "released", "", true)
 	r.shutdownWG.Wait()
-	var failed proto.PreparationStatusPayload
-	if len(sender) != 1 || (<-sender).DecodePayload(&failed) != nil || failed.State != "failed" {
-		t.Fatal("confirmed cleanup failure was suppressed")
-	}
-}
-
-// Local read-only preparation uses no native factory. Keep the shared close
-// settlement regression at its owner boundary instead of a retired remote fixture.
-type blockingWorkspacePreparation struct {
-	agent.Prepared
-	entered, release chan struct{}
-}
-
-func (p *blockingWorkspacePreparation) Close() error {
-	close(p.entered)
-	<-p.release
-	return nil
-}
-
-func TestReadPreparationReleaseWaitsForClose(t *testing.T) {
-	sender := make(workspaceStatusSender, 4)
-	prepared := &blockingWorkspacePreparation{entered: make(chan struct{}), release: make(chan struct{})}
-	var release sync.Once
-	defer release.Do(func() { close(prepared.release) })
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	timer := time.NewTimer(time.Hour)
-	defer timer.Stop()
-	r := &Router{sender: sender, shutdownCh: make(chan struct{}), log: obslog.Bg()}
-	p := &preparationState{workspaceReadOnly: true, owns: true, prepared: prepared,
-		ctx: ctx, cancel: cancel, timer: timer,
-		status: proto.PreparationStatusPayload{Handle: "reader", Revision: 1, State: "ready"}}
-	r.releasePreparation(p, "released", "", true, true)
-	select {
-	case <-prepared.entered:
-	case <-time.After(time.Second):
-		t.Fatal("close did not start")
-	}
-	r.publishPreparation(p, p.status)
-	if len(sender) != 0 || !p.owns {
-		t.Fatal("release acknowledged before close settled")
-	}
-	release.Do(func() { close(prepared.release) })
+	r.publishPreparation(p, snapshot)
 	r.shutdownWG.Wait()
-	var status proto.PreparationStatusPayload
-	if p.owns || len(sender) != 1 || (<-sender).DecodePayload(&status) != nil || status.State != "released" {
-		t.Fatal("settled close did not release ownership and publish status")
+	var released proto.PreparationStatusPayload
+	if p.owns || len(sender) != 1 || (<-sender).DecodePayload(&released) != nil || released.State != "released" {
+		t.Fatal("stale ready snapshot escaped or settled release was not published")
 	}
 }
diff --git a/apps/daemon/internal/dispatch/workspace_read.go b/apps/daemon/internal/dispatch/workspace_read.go
index 4fd1111a5..7511a84c5 100644
--- a/apps/daemon/internal/dispatch/workspace_read.go
+++ b/apps/daemon/internal/dispatch/workspace_read.go
@@ -67,7 +67,6 @@ func (r *Router) workspaceResourceLocked(request proto.WorkspaceReadPayload) (an
 			!p.owns || p.busy || p.ctx.Err() != nil || !time.Now().Before(p.deadline) {
 			return nil, "resource_unavailable"
 		}
-		resource = p.prepared
 		if p.executor != nil {
 			resource = p.executor.native
 		}
diff --git a/apps/daemon/internal/localworkspace/runtime_initialization.go b/apps/daemon/internal/localworkspace/runtime_initialization.go
index 1c8164fef..2db03a780 100644
--- a/apps/daemon/internal/localworkspace/runtime_initialization.go
+++ b/apps/daemon/internal/localworkspace/runtime_initialization.go
@@ -36,9 +36,6 @@ func (b *Binding) initializeRuntime(ctx context.Context, input proto.RuntimeInit
 	if input.Action != "setup" && input.Action != "npm" && input.Action != "python" {
 		return agentcapabilities.ErrInvalid
 	}
-	if input.Network != "enabled" && input.Network != "disabled" {
-		return agentcapabilities.ErrInvalid
-	}
 	directory, err := b.initializationCWD(input.CWD)
 	if err != nil {
 		return err
diff --git a/apps/daemon/internal/localworkspace/runtime_initialization_test.go b/apps/daemon/internal/localworkspace/runtime_initialization_test.go
index 19ed6e18d..e16e46787 100644
--- a/apps/daemon/internal/localworkspace/runtime_initialization_test.go
+++ b/apps/daemon/internal/localworkspace/runtime_initialization_test.go
@@ -74,7 +74,7 @@ func TestRuntimeInitializationPackageTargets(t *testing.T) {
 	}
 	packages, _ := PackageDirectory()
 	for _, action := range []string{"npm", "python"} {
-		if err = b.initializeRuntime(t.Context(), proto.RuntimeInitialization{Action: action, Network: "enabled", Packages: []string{"name with spaces", "second"}}); err != nil {
+		if err = b.initializeRuntime(t.Context(), proto.RuntimeInitialization{Action: action, Packages: []string{"name with spaces", "second"}}); err != nil {
 			t.Fatal(action, err)
 		}
 		raw, err := os.ReadFile(receipt)
@@ -242,7 +242,7 @@ func TestRuntimeInitializationSetupUsesBashAndPhysicalWorkspace(t *testing.T) {
 	if err := os.WriteFile(filepath.Join(b.workspace, "proof.sh"), []byte("printf skill-proof"), 0600); err != nil {
 		t.Fatal(err)
 	}
-	err := b.initializeRuntime(t.Context(), proto.RuntimeInitialization{Action: "setup", Network: "enabled", CWD: "/workspace/sub", Command: `. ../proof.sh > proof; printf '%s' "$VALUE" > value`})
+	err := b.initializeRuntime(t.Context(), proto.RuntimeInitialization{Action: "setup", CWD: "/workspace/sub", Command: `. ../proof.sh > proof; printf '%s' "$VALUE" > value`})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -261,13 +261,13 @@ func TestRuntimeInitializationMissingDependenciesAndInvalidRequests(t *testing.T
 	if err := b.initializeRuntime(t.Context(), proto.RuntimeInitialization{Action: "configure"}); err != nil {
 		t.Fatal(err)
 	}
-	for _, input := range []proto.RuntimeInitialization{{Action: "setup", Network: "enabled", Command: "true"}, {Action: "npm", Network: "enabled", Packages: []string{"valid"}}, {Action: "python", Network: "enabled", Packages: []string{"valid"}}} {
+	for _, input := range []proto.RuntimeInitialization{{Action: "setup", Command: "true"}, {Action: "npm", Packages: []string{"valid"}}, {Action: "python", Packages: []string{"valid"}}} {
 		var failed *InitializationFailure
 		if err := b.initializeRuntime(t.Context(), input); !errors.As(err, &failed) || !strings.Contains(err.Error(), "requires") {
 			t.Fatal("missing dependency was not explicit", input.Action, err)
 		}
 	}
-	for _, input := range []proto.RuntimeInitialization{{Action: "system"}, {Action: "setup", Network: "enabled", Command: "true", CWD: "/workspace/../outside"}, {Action: "npm", Network: "enabled", Packages: []string{"--unsafe"}}} {
+	for _, input := range []proto.RuntimeInitialization{{Action: "system"}, {Action: "setup", Command: "true", CWD: "/workspace/../outside"}, {Action: "npm", Packages: []string{"--unsafe"}}} {
 		if !errors.Is(b.initializeRuntime(t.Context(), input), agentcapabilities.ErrInvalid) {
 			t.Fatal("invalid request accepted", input.Action)
 		}
diff --git a/contracts/agents-api/harness-onboarding.md b/contracts/agents-api/harness-onboarding.md
index 52a68f354..fe4440b5c 100644
--- a/contracts/agents-api/harness-onboarding.md
+++ b/contracts/agents-api/harness-onboarding.md
@@ -69,8 +69,7 @@ For example, the Codex adapter keeps its app-server and thread, the Claude adapt
 | `DurableSteerer` | Real implementation on every Turn | Distinguish a complete write from the native application receipt; keep retry identity |
 | `Steerer` | Explicit implementation or Unsupported | Additional non-durable active-Turn input |
 | `FunctionResultSubmitter` | Explicit implementation or Unsupported | Match native call and result identity and acknowledge application |
-| `WorkspaceReader`, `WorkspaceDirectoryLister`, `WorkspaceWriter` | Explicit on Turn, Executor and Prepared owners | Use the authorized workspace, confirm access, commit or close, or return the operation's Unsupported error |
-| `Prepared`, `PreparedCancellation` | Real implementation for an executable preparation | Keep resource and output ownership across Start, cancellation and unused cleanup |
+| `WorkspaceReader`, `WorkspaceDirectoryLister`, `WorkspaceWriter` | Explicit on Turn and Executor owners | Use the authorized workspace, confirm access, commit or close, or return the operation's Unsupported error |
 | Neutral messages, images, MCP, structured output and Subagent observations | Explicit capability decisions | Keep each operation's protocol semantics; reject unsupported input before submission |
 
 Each adapter's `contracts.go` holds an individual compile-time assertion for each small interface. Do not embed a default implementation that makes future interfaces appear implemented. Adding a contract also requires a classification in the common completeness check and an explicit assertion in every public adapter; the check follows the authored Harness catalog.
@@ -115,8 +114,8 @@ A Session owns one reusable Executor in its connected Runtime; a Turn owns one i
 - An error means settlement is unconfirmed and frees neither ownership nor capacity. Caller deadlines stop the wait, not the tracked cleanup. Retry the same cleanup target serially; a failed cleanup blocks replacement and keeps its resource slot.
 - `Executor.Close` confirms resource retirement independently of the Turn outcome: an immutable Turn error must not prevent closing the native transport once its work and output have stopped.
 - Include owned background work in settlement and keep the exact native cleanup target after a failure. Native termination belongs to the adapter; a bulk cleanup acknowledgement alone does not establish quiescence.
-- Every `Session` declares `CancellationOutcome`. `Turn` and `PreparedCancellation` inherit it. The snapshot keeps observed native identity, Usage and output and remains readable after cancellation. Missing evidence stays unset; an empty `DonePayload` means nothing has been observed, not that cancellation succeeded or is unsupported. Reading the snapshot does not wait for settlement.
-- `Session.Cancel` requests cancellation; output closure signals teardown. Executable `PreparedCancellation.Cancel` waits for local cleanup and output writes to stop. Turn settlement still requires `AwaitSettlement` and any required `Executor.Close`; neither a successful cancellation request nor its snapshot replaces those waits.
+- Every `Session` declares `CancellationOutcome`. `Turn` inherits it. The snapshot keeps observed native identity, Usage and output and remains readable after cancellation. Missing evidence stays unset; an empty `DonePayload` means nothing has been observed, not that cancellation succeeded or is unsupported. Reading the snapshot does not wait for settlement.
+- `Session.Cancel` requests cancellation; output closure signals teardown. Turn settlement still requires `AwaitSettlement` and any required `Executor.Close`; neither a successful cancellation request nor its snapshot replaces those waits.
 
 **What the Runtime does around a Turn.** One output consumer starts before native Start, drains the bounded 64-frame channel and keeps the terminal observation until Start publication, Turn settlement and admitted operation receipts finish. Natural completion never calls Cancel. Input and function admission close before settlement; operations already admitted hold their barrier through native receipts and outbound acknowledgement. The Runtime sends cancellation to the Turn before waiting on that barrier, because a written input may need a native interrupt to produce its receipt. It joins native settlement, any required confirmed Executor close, output drain and all admitted operations before an applied acknowledgement or reuse, and only then forwards Done or an applied cancellation receipt. A failed Close can report failure while keeping the same Run and outstanding operations for retry; a closed caller wait cannot manufacture an applied input receipt. The Runtime commits native continuity and releases the old Run's admission before publishing Done, since the receiver may start another Turn at once; a late terminal-send failure belongs to the old Run and cannot invalidate a successor that already owns the Executor. Connection shutdown owns transport-loss cleanup. The settlement wait is ten seconds and the receipt send budget five seconds; a timeout is not proof of quiescence.
 
@@ -148,7 +147,7 @@ A Harness that supports the Subagent reads implements the [neutral observation c
 
 ## Register the adapter
 
-Registration is static and requires a build. Export one `agent.Declaration` from `apps/daemon/internal/agent/<kind>/declaration.go`, then add it to `harnessDeclarations` in [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go). The declaration contains the kind and complete capability descriptor, the shared model `Configuration` and a `Discover` function. Discovery receives the profile and diagnostic writers, owns native configuration and availability checks, and returns the installed `agent.Runtime` with its descriptor and its preparation and Executor factories. Return nil when the adapter is not configured; return an unavailable descriptor without factories when configured prerequisites fail. Keep version gates and factory-selection conditions inside the adapter.
+Registration is static and requires a build. Export one `agent.Declaration` from `apps/daemon/internal/agent/<kind>/declaration.go`, then add it to `harnessDeclarations` in [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go). The declaration contains the kind and complete capability descriptor, the shared model `Configuration` and a `Discover` function. Discovery receives the profile and diagnostic writers, owns native configuration and availability checks, and returns the installed `agent.Runtime` with its descriptor and Executor factory. Return nil when the adapter is not configured; return an unavailable descriptor without a factory when configured prerequisites fail. Keep version gates and factory-selection conditions inside the adapter.
 
 [`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) iterates the discovered runtimes and calls `Registry.Register` from `agent/harness.go`. It verifies that discovery retained the declared kind and registers the Runtime in this order:
 
@@ -156,11 +155,10 @@ Registration is static and requires a build. Export one `agent.Declaration` from
 | --- | --- | --- |
 | 1 | `RegisterKind(proto.SupportedAgentKind, harnessconfig.Configuration)` | Kind, availability, version, `AgentKindCapabilities` and the model configuration declaration. It resets the other registrations, so call it first. |
 | 2 | `RegisterExecutor(kind, agent.ExecutorFactory)` | The Executor and Turn lifecycle used for execution; derives the `Preparation` capability |
-| 3 | `RegisterPreparation(kind, workspaceRead, agent.PreparationFactory)` | Optional: separate read-only workspace preparation for qualified workspace operations |
 
 Every `proto.AgentKindCapabilities` field must be explicitly `proto.CapabilitySupported` or `proto.CapabilityUnsupported`, even for an unavailable Harness. `proto.CapabilityUnspecified` is invalid: zero values and omitted fields never mean Unsupported. An installation probe may set an individual field with `proto.CapabilityFromBool`; it must not populate unmentioned or future fields. Availability stays separate in `SupportedAgentKind.Available`. Registration validates the complete declaration before changing the registry, and the wire carries an explicit boolean for every field, so omitted and null fields are invalid. A new field requires a decision in every production declaration. Runtime consumers use `IsSupported()` and reject unsupported requests before native operations; an interface assertion verifies implementation, never support. Every declaration must match the behavior verified for that installation; the [Core–Runtime protocol](../../docs/runtime-protocol.md#capability-declarations) owns how declarations travel and are frozen.
 
-The admission mapping is explicit. `Steering` controls non-durable `Steerer` input. `DurableInputReceipts` controls `DurableSteerer` input and also requires the Turn settlement contract; neither implies the other, and Core's public text profile requires both. Workspace declarations describe the authorized resource owner, including the common Runtime workspace implementation. Runtime registration does not grant Core qualification; the service profile does.
+The admission mapping is explicit. `Steering` controls non-durable `Steerer` input. `DurableInputReceipts` controls `DurableSteerer` input and also requires the Turn settlement contract; neither implies the other, and Core's public text profile requires both. Workspace declarations describe the authorized resource owner, including the common Runtime workspace implementation. `WorkspaceReadPreparation` admits `execution_prepare` with `workspace_read_only`. The Runtime readies that preparation itself and serves its reads from the bound local workspace directory without calling the Executor factory, so an adapter declares it only when this kind's Environment workspace is that local directory. Registration does not derive it. Runtime registration does not grant Core qualification; the service profile does.
 
 The runnable test-only example [`testdata/onboarding/main.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/testdata/onboarding/main.go) registers a text-only synthetic Harness. It shows a Session-owned Executor, fresh Turns, durable steering, cancellation and history binding, and is never shipped.
 
@@ -197,7 +195,7 @@ Run the `engine` and `execution` tests for omission, policy, combination and err
 
 ## Native model configuration
 
-[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) owns the shared configuration declaration and pure preparation contract. Each adapter supplies one `Configuration`, in `internal/harnessconfig/<kind>`, to Core's composition and to the Runtime's `RegisterKind`. The preparation and Executor paths both validate through that declaration before native side effects. The wire object is `proto.HarnessConfig`. [Model execution](./model-execution.md#native-model-parameters) lists each Harness's accepted fields.
+[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) owns the shared configuration declaration and pure preparation contract. Each adapter supplies one `Configuration`, in `internal/harnessconfig/<kind>`, to Core's composition and to the Runtime's `RegisterKind`. The Executor path validates through that declaration before native side effects. The wire object is `proto.HarnessConfig`. [Model execution](./model-execution.md#native-model-parameters) lists each Harness's accepted fields.
 
 A supplied `model` must be a nonempty string, and an explicit `model_provider` requires it. The native-owned connection path may omit both; explicit null is invalid. An explicitly empty declaration accepts no provider or nonempty native parameters and advertises no provider support. Unknown protocol formats and duplicate protocol declarations fail at registration.
 
@@ -229,7 +227,7 @@ Keep provider keys in private operator files, never in commits or logs. Existing
 
 | Boundary | Tests |
 | --- | --- |
-| Codex reuse, cancellation and unconfirmed cleanup | `codex/executor_test.go`, `terminal_cleanup_test.go`, `prepared_cancel_test.go` |
+| Codex reuse, cancellation and unconfirmed cleanup | `codex/executor_test.go`, `terminal_cleanup_test.go` |
 | Codex input receipts and strict recovery | `codex/function_write_receipt_test.go`, `function_receipt_test.go`, `resume_test.go`, `recovery_test.go` |
 | Claude input ownership, cancellation and preparation cleanup | `claudesdk/executor_test.go`, `cancellation_test.go`, `preparation_test.go` |
 | MiniMax cancellation retirement, failed Start and cleanup retry | `mcode/executor_test.go`, `executor_backpressure_test.go` |
diff --git a/contracts/agents-api/zh/harness-onboarding.md b/contracts/agents-api/zh/harness-onboarding.md
index 0a952cf17..57732314d 100644
--- a/contracts/agents-api/zh/harness-onboarding.md
+++ b/contracts/agents-api/zh/harness-onboarding.md
@@ -1,7 +1,7 @@
 ---
 title: "将原生 Harness 添加到 OpenAgentCore"
 source: contracts/agents-api/harness-onboarding.md
-source_hash: 29b19e3f79eda12fcf888bf0551ea36a37df4f9eda8245fb98163978a3695aee
+source_hash: b74f627ac8d518e0b780f827b8ccc6d268056d33c151b9e9f51866d93faf05d2
 ---
 
 **Harness** 是一种运行模型和工具循环的原生代理引擎（Codex、Claude Code、MiniMax Code）。**Harness 适配器**将 Runtime 的 Executor 和 Turn 契约转换到该引擎的 SDK 或协议。本文档定义 Runtime–Harness 协议：适配器接口及其生命周期义务、注册、Core 资格认定和验收。[Harness capabilities](harness-capabilities.md) 记录了当前每个 Harness 支持的功能。
@@ -71,8 +71,7 @@ Environment 提供执行资源。受管 E2B、Docker 和 microsandbox 机器以
 | `DurableSteerer` | 每个 Turn 上真实实现 | 区分完整写入与原生应用回执；保留重试身份 |
 | `Steerer` | 明确实现或 Unsupported | 额外的非持久化活动 Turn 输入 |
 | `FunctionResultSubmitter` | 明确实现或 Unsupported | 匹配原生调用和结果身份，并确认应用 |
-| `WorkspaceReader`、`WorkspaceDirectoryLister`、`WorkspaceWriter` | 在 Turn、Executor 和 Prepared 所有者上明确实现 | 使用授权工作区，确认访问，提交或关闭，或者返回该操作的 Unsupported 错误 |
-| `Prepared`、`PreparedCancellation` | 对可执行准备进行真实实现 | 在 Start、取消和未使用清理之间保持资源和输出的所有权 |
+| `WorkspaceReader`、`WorkspaceDirectoryLister`、`WorkspaceWriter` | 在 Turn 和 Executor 所有者上明确实现 | 使用授权工作区，确认访问，提交或关闭，或者返回该操作的 Unsupported 错误 |
 | 中立消息、图像、MCP、结构化输出和 Subagent 观察 | 明确作出能力决策 | 保持每项操作的协议语义；在提交前拒绝不受支持的输入 |
 
 每个适配器的 `contracts.go` 都包含针对每个小型接口的单项编译时断言。不要嵌入会让未来接口看起来已经实现的默认实现。添加契约时，还必须在通用完整性检查中进行分类，并在每个公共适配器中添加明确断言；该检查遵循已编写的 Harness 目录。
@@ -117,8 +116,8 @@ Session 在其已连接的 Runtime 中拥有一个可复用的 Executor；Turn 
 - 错误表示结算尚未确认，既不释放所有权，也不释放容量。调用方截止时间只会停止等待，不会停止受跟踪的清理。必须串行重试同一个清理目标；清理失败会阻止替换并保留其资源槽位。
 - `Executor.Close` 独立于 Turn 结果确认资源退役：不可变的 Turn 错误不得阻止在其工作和输出已经停止后关闭原生传输层。
 - 结算必须包含所属的后台工作，并在失败后保留精确的原生清理目标。原生终止由适配器负责；仅有批量清理确认并不能证明已达到静默状态。
-- 每个 `Session` 都要声明 `CancellationOutcome`。`Turn` 和 `PreparedCancellation` 继承该声明。快照保留已观察到的原生身份、Usage 和输出，并在取消后仍可读取。缺失的证据保持未设置；空的 `DonePayload` 表示未观察到任何内容，而不是表示取消成功或不受支持。读取快照不会等待结算。
-- `Session.Cancel` 请求取消；输出关闭表示拆卸开始。可执行准备中的 `PreparedCancellation.Cancel` 会等待本地清理和输出写入停止。Turn 结算仍需要 `AwaitSettlement` 和所需的任何 `Executor.Close`；取消请求成功或其快照都不能替代这些等待。
+- 每个 `Session` 都要声明 `CancellationOutcome`。`Turn` 继承该声明。快照保留已观察到的原生身份、Usage 和输出，并在取消后仍可读取。缺失的证据保持未设置；空的 `DonePayload` 表示未观察到任何内容，而不是表示取消成功或不受支持。读取快照不会等待结算。
+- `Session.Cancel` 请求取消；输出关闭表示拆卸开始。Turn 结算仍需要 `AwaitSettlement` 和所需的任何 `Executor.Close`；取消请求成功或其快照都不能替代这些等待。
 
 **Runtime 在 Turn 前后执行的工作。** 一个输出消费者会在原生 Start 之前启动，耗尽有界的 64 帧通道，并将终态观察保留到 Start 发布、Turn 结算和已准入操作回执完成为止。正常完成绝不调用 Cancel。输入和函数准入会在结算前关闭；已准入的操作会持有其屏障，直至原生回执和出站确认完成。Runtime 会在等待该屏障之前向 Turn 发送取消，因为已写入的输入可能需要原生中断才能生成回执。Runtime 会汇合原生结算、所需的已确认 Executor 关闭、输出耗尽和所有已准入操作，然后应用确认或执行复用，之后才会转发 Done 或已应用的取消回执。Close 失败可以报告失败，同时保留同一 Run 和未完成操作以供重试；已关闭的调用方等待无法凭空生成已应用输入回执。Runtime 会在发布 Done 前提交原生连续性状态并释放旧 Run 的准入，因为接收方可能立即启动另一个 Turn；迟到的终态发送失败属于旧 Run，不能使已拥有 Executor 的后继对象失效。连接关闭负责传输丢失清理。结算等待时间为十秒，回执发送预算为五秒；超时不能证明已达到静默状态。
 
@@ -150,7 +149,7 @@ MCP、公共函数、延迟函数发现、结构化输出、图像输入、详
 
 ## 注册适配器 {#register-the-adapter}
 
-注册是静态的，并且需要构建。从 `apps/daemon/internal/agent/<kind>/declaration.go` 导出一个 `agent.Declaration`，然后将其添加到 [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go) 的 `harnessDeclarations` 中。声明包含 kind、完整能力描述符、共享模型 `Configuration` 和 `Discover` 函数。发现过程接收 profile 和诊断写入器，负责原生配置和可用性检查，并返回已安装的 `agent.Runtime` 及其描述符、准备工厂和 Executor 工厂。未配置适配器时返回 nil；已配置的前置条件失败时，返回不带任何工厂的不可用描述符。将版本门控和工厂选择条件保留在适配器内部。
+注册是静态的，并且需要构建。从 `apps/daemon/internal/agent/<kind>/declaration.go` 导出一个 `agent.Declaration`，然后将其添加到 [`cli/agent_discovery.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_discovery.go) 的 `harnessDeclarations` 中。声明包含 kind、完整能力描述符、共享模型 `Configuration` 和 `Discover` 函数。发现过程接收 profile 和诊断写入器，负责原生配置和可用性检查，并返回已安装的 `agent.Runtime` 及其描述符和 Executor 工厂。未配置适配器时返回 nil；已配置的前置条件失败时，返回不带工厂的不可用描述符。将版本门控和工厂选择条件保留在适配器内部。
 
 [`cli/agent_registration.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/internal/cli/agent_registration.go) 遍历已发现的 Runtime，并调用 `agent/harness.go` 中的 `Registry.Register`。它验证发现过程是否保留了声明的 kind，并按以下顺序注册该 Runtime：
 
@@ -158,11 +157,10 @@ MCP、公共函数、延迟函数发现、结构化输出、图像输入、详
 | --- | --- | --- |
 | 1 | `RegisterKind(proto.SupportedAgentKind, harnessconfig.Configuration)` | Kind、可用性、版本、`AgentKindCapabilities` 和模型配置声明。它会重置其他注册项，因此必须首先调用。 |
 | 2 | `RegisterExecutor(kind, agent.ExecutorFactory)` | 执行所用的 Executor 和 Turn 生命周期；据此派生 `Preparation` 能力 |
-| 3 | `RegisterPreparation(kind, workspaceRead, agent.PreparationFactory)` | 可选：针对已认定合格的工作区操作的独立只读工作区准备 |
 
 每个 `proto.AgentKindCapabilities` 字段都必须显式设为 `proto.CapabilitySupported` 或 `proto.CapabilityUnsupported`，即使 Harness 不可用也是如此。`proto.CapabilityUnspecified` 无效：零值和省略字段绝不表示 Unsupported。安装探测可以使用 `proto.CapabilityFromBool` 设置单个字段；但不得填充未提及字段或未来字段。可用性通过 `SupportedAgentKind.Available` 单独表示。注册会在更改 registry 之前验证完整声明；线协议会为每个字段携带显式布尔值，因此省略字段和 null 字段均无效。添加新字段时，每个生产声明都必须作出决定。Runtime 使用者应调用 `IsSupported()`，并在原生操作前拒绝不受支持的请求；接口断言用于验证实现，绝不表示支持。每个声明都必须与针对该安装验证的行为一致；[Core–Runtime protocol](../../../docs/zh/runtime-protocol.md#capability-declarations) 负责声明的传输方式和冻结方式。
 
-准入映射是显式的。`Steering` 控制非持久化 `Steerer` 输入。`DurableInputReceipts` 控制 `DurableSteerer` 输入，并且还要求 Turn 结算契约；二者互不隐含，而且 Core 的公共文本 profile 要求同时具备二者。工作区声明描述授权资源所有者，包括通用 Runtime 工作区实现。Runtime 注册不会授予 Core 资格；服务 profile 才会授予。
+准入映射是显式的。`Steering` 控制非持久化 `Steerer` 输入。`DurableInputReceipts` 控制 `DurableSteerer` 输入，并且还要求 Turn 结算契约；二者互不隐含，而且 Core 的公共文本 profile 要求同时具备二者。工作区声明描述授权资源所有者，包括通用 Runtime 工作区实现。`WorkspaceReadPreparation` 准入带 `workspace_read_only` 的 `execution_prepare`。Runtime 自行就绪该 preparation，并从绑定的本地工作区目录提供读取，不调用 Executor 工厂；因此仅当该 kind 的 Environment 工作区就是该本地目录时，adapter 才声明它。注册过程不会派生它。Runtime 注册不会授予 Core 资格；服务 profile 才会授予。
 
 可运行的仅测试示例 [`testdata/onboarding/main.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/daemon/testdata/onboarding/main.go) 会注册一个仅支持文本的合成 Harness。它展示 Session 所有的 Executor、全新的 Turn、持久化引导、取消和历史绑定，并且绝不会发布。
 
@@ -199,7 +197,7 @@ profile 是纯逻辑：它使用现有的公共类型和协议类型，声明受
 
 ## 原生模型配置 {#native-model-configuration}
 
-[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 负责共享配置声明和纯准备契约。每个适配器在 `internal/harnessconfig/<kind>` 中提供一个 `Configuration`，供 Core 组合和 Runtime 的 `RegisterKind` 使用。准备路径和 Executor 路径都会在产生原生副作用之前通过该声明进行验证。线协议对象是 `proto.HarnessConfig`。[Model execution](model-execution.md#native-model-parameters) 列出了每个 Harness 接受的字段。
+[`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 负责共享配置声明和纯准备契约。每个适配器在 `internal/harnessconfig/<kind>` 中提供一个 `Configuration`，供 Core 组合和 Runtime 的 `RegisterKind` 使用。Executor 路径会在产生原生副作用之前通过该声明进行验证。线协议对象是 `proto.HarnessConfig`。[Model execution](model-execution.md#native-model-parameters) 列出了每个 Harness 接受的字段。
 
 提供的 `model` 必须是非空字符串，并且显式指定 `model_provider` 时必须提供它。原生所有权连接路径可以省略二者；显式 null 无效。显式为空的声明不接受任何 Provider 或非空原生参数，也不宣称支持 Provider。未知协议格式和重复协议声明会导致注册失败。
 
@@ -231,7 +229,7 @@ Environment 验收使用 `services/core/tests/official_environment_{templates,se
 
 | 边界 | 测试 |
 | --- | --- |
-| Codex 复用、取消和未确认清理 | `codex/executor_test.go`、`terminal_cleanup_test.go`、`prepared_cancel_test.go` |
+| Codex 复用、取消和未确认清理 | `codex/executor_test.go`、`terminal_cleanup_test.go` |
 | Codex 输入回执和严格恢复 | `codex/function_write_receipt_test.go`、`function_receipt_test.go`、`resume_test.go`、`recovery_test.go` |
 | Claude 输入所有权、取消和准备清理 | `claudesdk/executor_test.go`、`cancellation_test.go`、`preparation_test.go` |
 | MiniMax 取消退役、Start 失败和清理重试 | `mcode/executor_test.go`、`executor_backpressure_test.go` |
diff --git a/docs/runtime-protocol.md b/docs/runtime-protocol.md
index bc1d4859a..606a62031 100644
--- a/docs/runtime-protocol.md
+++ b/docs/runtime-protocol.md
@@ -181,7 +181,7 @@ Core stores accepted values in the Turn outcome as `engine_error_code` and `engi
 
 ## Workspace operations
 
-A workspace read that needs no running Turn uses the read-only preparation profile: `execution_prepare` with `workspace_read_only`, which requires the `workspace_read_preparation` capability. It accepts only the bound Environment and resource identity; execution options, model and MCP credentials, native Session continuation and model or tool input are excluded, and the owner rejects `execution_start`. A Runtime may serve it from its bound local filesystem without starting a Harness process. The profile publishes `released` only after local close succeeds; a cleanup error keeps ownership and reports `cleanup_unconfirmed`. A failed factory returns its resource with the error while cleanup is unconfirmed, and wrappers keep both values. A successful cleanup retry publishes the confirmed release; a stale status snapshot never publishes success. A release request, HTTP disconnect or remote socket closure alone does not confirm cleanup.
+A workspace read that needs no running Turn uses the read-only preparation profile: `execution_prepare` with `workspace_read_only`, which requires the `workspace_read_preparation` capability. It accepts only the bound Environment and resource identity; execution options, model and MCP credentials, native Session continuation and model or tool input are excluded, and the owner rejects `execution_start`. The Runtime serves it from its bound local workspace without starting a Harness process. The profile publishes `released` after the Runtime drops the preparation's ownership; a stale status snapshot never publishes success. A release request, HTTP disconnect or remote socket closure alone does not confirm the release.
 
 `workspace_read` targets an existing preparation handle, or the Run it was transferred to, on the same authenticated device connection, with the exact frozen Environment identity; callers cannot supply sockets, credentials or workspace roots. `operation: directory` lists one workspace-relative directory (an empty path selects the root) with mutually exclusive byte and entry limits. A result carries at most 1024 single-component UTF-8 names of at most 255 bytes each, the entry kind, regular-file sizes and explicit truncation, and is returned only after directory access and handle cleanup settle. There is no snapshot, recursion or pagination at this layer. Byte and directory reads share target checks, correlation, capacity and retained operation waits.
 
diff --git a/docs/zh/runtime-protocol.md b/docs/zh/runtime-protocol.md
index 11a7807a5..2278a9fd7 100644
--- a/docs/zh/runtime-protocol.md
+++ b/docs/zh/runtime-protocol.md
@@ -1,7 +1,7 @@
 ---
 title: "Core–Runtime 协议"
 source: docs/runtime-protocol.md
-source_hash: aec653711cfaff6123091c418ef1d7eb9dc8b9648cc4a70f9fe231895fd7ae9d
+source_hash: d2edb668d82f40ccf9094b85fcba67852bd14bc226f982d8b4e8918015c79ef8
 ---
 
 此协议在 Runtime daemon 获取机器凭据后连接 Core 与 daemon，定义 daemon 连接上消息的含义和顺序。wire 类型、限制和验证器仅在 [`internal/agentdaemon/proto`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/internal/agentdaemon/proto) 中定义一次；Core 的 [gateway](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/services/core/internal/runtimegateway) 与参考 Runtime 的 [dispatcher](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/apps/daemon/internal/dispatch) 都使用它们，因此无需同步第二套 payload schema。签发凭据和打开连接的 HTTP 路由见[机器连接 API](../../contracts/agents-api/zh/machine-api.md)。
@@ -183,7 +183,7 @@ Core 在 Turn outcome 中将接受的值保存为 `engine_error_code` 和 `engin
 
 ## 工作区操作 {#workspace-operations}
 
-无需运行 Turn 的工作区读取使用只读 preparation profile：带 `workspace_read_only` 的 `execution_prepare`，要求 `workspace_read_preparation` 能力。仅接受绑定的 Environment 和 resource 身份；不包含 execution option、model 与 MCP 凭据、原生 Session continuation、model 或 tool 输入，owner 拒绝 `execution_start`。Runtime 可以从绑定的本地文件系统提供读取，不启动 Harness 进程。profile 仅在本地 close 成功后发布 `released`；清理错误保留所有权并报告 `cleanup_unconfirmed`。factory 失败且清理未确认时，将 resource 与 error 一起返回，wrapper 保留两者。清理重试成功后发布已确认释放；旧 status snapshot 不发布成功。release 请求、HTTP 断连或远端 socket 关闭本身都不确认清理。
+无需运行 Turn 的工作区读取使用只读 preparation profile：带 `workspace_read_only` 的 `execution_prepare`，要求 `workspace_read_preparation` 能力。仅接受绑定的 Environment 和 resource 身份；不包含 execution option、model 与 MCP 凭据、原生 Session continuation、model 或 tool 输入，owner 拒绝 `execution_start`。Runtime 从绑定的本地工作区提供读取，不启动 Harness 进程。profile 在 Runtime 放弃该 preparation 的所有权后发布 `released`；旧 status snapshot 不发布成功。release 请求、HTTP 断连或远端 socket 关闭本身都不确认释放。
 
 `workspace_read` 在同一已认证设备连接上，针对现有 preparation handle 或它已转移给的 Run，使用精确冻结的 Environment 身份；调用方不能提供 socket、凭据或 workspace root。`operation: directory` 列出一个 workspace 相对目录（空路径选择根目录），字节与条目限制互斥。结果最多携带 1024 个单路径组件 UTF-8 名称，每个最多 255 字节，并包含 entry kind、普通文件大小和明确截断信息；仅在目录访问与 handle 清理结算后返回。此层没有快照、递归或分页。字节读取与目录读取共享目标检查、关联、容量和保留的操作等待。
 
diff --git a/internal/agentdaemon/proto/runtime_prepare.go b/internal/agentdaemon/proto/runtime_prepare.go
index c4b78e3fc..bbb2549c6 100644
--- a/internal/agentdaemon/proto/runtime_prepare.go
+++ b/internal/agentdaemon/proto/runtime_prepare.go
@@ -29,7 +29,6 @@ type RuntimeInitialFile struct {
 type RuntimeInitialization struct {
 	Action   string            `json:"action"`
 	Env      map[string]string `json:"env,omitempty"`
-	Network  string            `json:"network,omitempty"`
 	Packages []string          `json:"packages,omitempty"`
 	Command  string            `json:"command,omitempty"`
 	CWD      string            `json:"cwd,omitempty"`
@@ -179,9 +178,6 @@ func validWorkspacePath(value string, allowRoot bool) bool {
 }
 
 func validRuntimeInitialization(p RuntimeInitialization) bool {
-	if p.Network != "" && p.Network != "enabled" && p.Network != "disabled" {
-		return false
-	}
 	if p.CWD != "" && !validWorkspacePath(p.CWD, true) {
 		return false
 	}
@@ -197,7 +193,7 @@ func validRuntimeInitialization(p RuntimeInitialization) bool {
 		}
 		return true
 	case "npm", "python":
-		if p.Env != nil || p.Command != "" || p.CWD != "" || len(p.Packages) == 0 || len(p.Packages) > 1000 || p.Network == "" {
+		if p.Env != nil || p.Command != "" || p.CWD != "" || len(p.Packages) == 0 || len(p.Packages) > 1000 {
 			return false
 		}
 		for _, value := range p.Packages {
@@ -207,7 +203,7 @@ func validRuntimeInitialization(p RuntimeInitialization) bool {
 		}
 		return true
 	case "setup":
-		return p.Env == nil && p.Packages == nil && p.Network != "" && p.Command != "" && utf8.ValidString(p.Command) && !strings.ContainsRune(p.Command, 0)
+		return p.Env == nil && p.Packages == nil && p.Command != "" && utf8.ValidString(p.Command) && !strings.ContainsRune(p.Command, 0)
 	default:
 		return false
 	}
diff --git a/internal/agentdaemon/proto/runtime_prepare_test.go b/internal/agentdaemon/proto/runtime_prepare_test.go
index d7cb3359b..84519b778 100644
--- a/internal/agentdaemon/proto/runtime_prepare_test.go
+++ b/internal/agentdaemon/proto/runtime_prepare_test.go
@@ -176,10 +176,10 @@ func TestRuntimePreparationInitialActions(t *testing.T) {
 	base := RuntimePreparePayload{Step: "begin", EnvironmentID: uuid.NewString(), SessionID: uuid.NewString()}
 	for _, initialization := range []RuntimeInitialization{
 		{Action: "configure", Env: map[string]string{"EXAMPLE": "value"}},
-		{Action: "npm", Network: "disabled", Packages: []string{"typescript"}},
-		{Action: "python", Network: "enabled", Packages: []string{"requests"}},
-		{Action: "setup", Network: "enabled", Command: "echo done"},
-		{Action: "setup", Network: "disabled", Command: "echo done", CWD: "/workspace/project"},
+		{Action: "npm", Packages: []string{"typescript"}},
+		{Action: "python", Packages: []string{"requests"}},
+		{Action: "setup", Command: "echo done"},
+		{Action: "setup", Command: "echo done", CWD: "/workspace/project"},
 	} {
 		p := base
 		p.Action, p.Initialization = "initialize", &initialization
@@ -203,13 +203,12 @@ func TestRuntimePreparationInitialActions(t *testing.T) {
 		{Action: "exec", Command: "echo done"},
 		{Action: "configure", Packages: []string{"git"}},
 		{Action: "configure", Env: map[string]string{"A=B": "value"}},
-		{Action: "system", Network: "enabled", Packages: []string{"git"}},
-		{Action: "npm", Network: "invalid", Packages: []string{"a"}},
-		{Action: "python", Network: "enabled", Packages: []string{"--help"}},
-		{Action: "setup", Network: "enabled", Command: "x", CWD: "/environment"},
-		{Action: "setup", Network: "enabled", Command: "x", CWD: "/workspace/../private"},
-		{Action: "setup", Network: "enabled", Command: "x", Env: map[string]string{}},
-		{Action: "setup", Network: "enabled", Command: "x", Packages: []string{}},
+		{Action: "system", Packages: []string{"git"}},
+		{Action: "python", Packages: []string{"--help"}},
+		{Action: "setup", Command: "x", CWD: "/environment"},
+		{Action: "setup", Command: "x", CWD: "/workspace/../private"},
+		{Action: "setup", Command: "x", Env: map[string]string{}},
+		{Action: "setup", Command: "x", Packages: []string{}},
 	} {
 		p := base
 		p.Action, p.Initialization = "initialize", &initialization
diff --git a/internal/agentdaemon/proto/version.go b/internal/agentdaemon/proto/version.go
index 101fd8dd3..524883ee6 100644
--- a/internal/agentdaemon/proto/version.go
+++ b/internal/agentdaemon/proto/version.go
@@ -2,7 +2,7 @@ package proto
 
 // Version identifies the complete Core–Runtime wire contract. Change it when
 // removing or changing a payload or its semantics; deploy both endpoints together.
-const Version = "0.12.0"
+const Version = "0.13.0"
 
 // VersionCompatible accepts only this contract. Patch drift, prerelease suffixes
 // and malformed versions do not select an implicit compatibility path.
diff --git a/services/core/internal/execution/runtime_setup.go b/services/core/internal/execution/runtime_setup.go
index d463d8a02..ccfcb795f 100644
--- a/services/core/internal/execution/runtime_setup.go
+++ b/services/core/internal/execution/runtime_setup.go
@@ -54,17 +54,16 @@ func setupOperations(setup environmentconfig.Setup) []runtimeSetupOperation {
 	for i, plugin := range setup.Plugins {
 		result = append(result, runtimeSetupOperation{Request: proto.RuntimePreparePayload{Action: "plugin", Slot: i, Plugin: &plugin.Metadata}, Data: plugin.Archive})
 	}
-	// Provisioning network policy is distinct from the policy enforced for Turns.
 	for _, packages := range []struct {
 		action string
 		values []string
 	}{{"npm", setup.Packages.NPM}, {"python", setup.Packages.Python}} {
 		if len(packages.values) > 0 {
-			result = append(result, initialize(proto.RuntimeInitialization{Action: packages.action, Network: "enabled", Packages: packages.values}))
+			result = append(result, initialize(proto.RuntimeInitialization{Action: packages.action, Packages: packages.values}))
 		}
 	}
 	for i, command := range setup.Commands {
-		operation := initialize(proto.RuntimeInitialization{Action: "setup", Network: "enabled", Command: command.Command, CWD: command.CWD})
+		operation := initialize(proto.RuntimeInitialization{Action: "setup", Command: command.Command, CWD: command.CWD})
 		operation.Index = i
 		result = append(result, operation)
 	}
diff --git a/services/core/internal/runtimegateway/runtime_prepare_test.go b/services/core/internal/runtimegateway/runtime_prepare_test.go
index b070cbb50..02834d87a 100644
--- a/services/core/internal/runtimegateway/runtime_prepare_test.go
+++ b/services/core/internal/runtimegateway/runtime_prepare_test.go
@@ -289,7 +289,7 @@ func TestRuntimeInitializationNoDataAndExitReceipt(t *testing.T) {
 		t.Run(fmt.Sprint(exit), func(t *testing.T) {
 			s := NewSession(newFakeConn(), "device", "tenant", "test", nil, nil)
 			defer s.Close("test")
-			request := proto.RuntimePreparePayload{EnvironmentID: uuid.NewString(), SessionID: uuid.NewString(), Action: "initialize", Initialization: &proto.RuntimeInitialization{Action: "setup", Network: "enabled", Command: "echo test"}}
+			request := proto.RuntimePreparePayload{EnvironmentID: uuid.NewString(), SessionID: uuid.NewString(), Action: "initialize", Initialization: &proto.RuntimeInitialization{Action: "setup", Command: "echo test"}}
 			if _, err := s.PrepareRuntime(t.Context(), uuid.NewString(), request, []byte("forbidden")); err == nil {
 				t.Fatal("initialization body accepted")
 			}

From 7bba93ae093cd92b7a9f9403ea458439a9cb0052 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 22:39:34 +0800
Subject: [PATCH 33/60] Delete the mcode opt-in and dead helpers (#499)

---
 .../agent/codex/executor_native_test.go       |  4 +-
 .../daemon/internal/agent/installroot/lock.go | 69 -------------------
 .../internal/agent/installroot/lock_test.go   | 39 -----------
 .../internal/agent/installroot/probe.go       |  1 +
 .../internal/agent/mcode/declaration.go       | 26 ++++---
 .../internal/agent/mcode/declaration_test.go  | 21 +++---
 .../agent/mcode/discovery_workspace.go        |  4 --
 apps/daemon/internal/agent/mcode/execution.go |  7 --
 .../internal/agent/mcode/installation.go      |  2 +-
 apps/daemon/internal/cli/connect.go           |  2 +-
 .../cli/connect_environment_binding.go        | 11 ---
 apps/daemon/internal/daemonize/logfile.go     | 25 +------
 .../daemon/internal/daemonize/logfile_test.go | 15 ----
 apps/daemon/internal/daemonize/pidfile.go     | 11 ---
 .../daemon/internal/daemonize/pidfile_test.go |  8 ++-
 .../internal/dispatch/local_directory_test.go |  4 +-
 apps/daemon/internal/dispatch/preparation.go  | 39 +++++------
 .../internal/dispatch/preparation_start.go    |  4 +-
 apps/daemon/internal/dispatch/router.go       |  2 +-
 .../dispatch/runtime_preparation_test.go      |  2 +-
 .../internal/dispatch/workspace_export.go     |  2 +-
 .../dispatch/workspace_export_test.go         |  4 +-
 .../workspace_preparation_status_test.go      |  2 +-
 .../internal/dispatch/workspace_write_test.go |  2 +-
 .../daemon/internal/localworkspace/binding.go | 10 ---
 .../internal/localworkspace/binding_test.go   |  3 +-
 .../capability_preparation_test.go            |  7 +-
 apps/daemon/internal/paths/paths.go           |  9 ---
 apps/daemon/internal/paths/paths_test.go      |  7 +-
 contracts/agents-api/v1/model_execution.go    |  4 --
 internal/obs/log/api.go                       | 17 +----
 internal/obs/log/api_test.go                  | 21 ------
 internal/obs/log/background.go                | 24 +------
 internal/obs/log/carrier.go                   |  5 --
 internal/obs/log/context.go                   | 10 ---
 internal/obs/log/discard.go                   | 13 ----
 internal/obs/log/http_test.go                 | 16 +----
 services/core/cmd/oac/init.go                 |  2 +-
 services/core/deploy/mcode/Dockerfile         |  2 -
 services/core/deploy/mcode/README.md          |  4 +-
 services/core/internal/api/installation.go    | 47 -------------
 .../core/internal/api/installation_test.go    | 20 +-----
 .../internal/engine/configuration_test.go     |  2 +-
 .../core/internal/runtimegateway/session.go   | 15 ++--
 .../internal/runtimegateway/session_test.go   |  5 ++
 services/core/internal/sandbox/deployment.go  |  5 --
 .../core/internal/sandbox/e2b/provider.go     |  1 -
 .../internal/sandbox/microsandbox/provider.go |  1 -
 .../internal/sandbox/node/capacity_test.go    |  4 +-
 .../internal/sandbox/node/docker_live_test.go |  2 +-
 .../core/internal/sandbox/node/identity.go    |  8 ---
 .../core/internal/sandbox/node/node_test.go   |  5 +-
 .../internal/sandbox/node/recovery_test.go    | 10 +--
 .../integration/mcode_public_native_test.go   |  2 +-
 54 files changed, 101 insertions(+), 486 deletions(-)
 delete mode 100644 apps/daemon/internal/agent/installroot/lock.go
 delete mode 100644 apps/daemon/internal/agent/installroot/lock_test.go
 delete mode 100644 internal/obs/log/discard.go

diff --git a/apps/daemon/internal/agent/codex/executor_native_test.go b/apps/daemon/internal/agent/codex/executor_native_test.go
index 247e6b083..f14f1340e 100644
--- a/apps/daemon/internal/agent/codex/executor_native_test.go
+++ b/apps/daemon/internal/agent/codex/executor_native_test.go
@@ -3,6 +3,7 @@ package codex
 import (
 	"context"
 	"encoding/json"
+	"log/slog"
 	"os"
 	"os/exec"
 	"strings"
@@ -11,7 +12,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/agent"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	obslog "github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 )
 
 // This opt-in test uses the real pinned harness and an explicitly configured
@@ -47,7 +47,7 @@ func TestExecutorNativeReuse(t *testing.T) {
 	}
 	cfg := defaultSessionConfig()
 	cfg.codexBinary = binary
-	cfg.logger = obslog.Discard()
+	cfg.logger = slog.New(slog.DiscardHandler)
 	req := proto.PromptRequestPayload{
 		AgentKind: "codex", AgentStateKey: "executor-native",
 		DisableExecutionEnvironment: true, DisableSubagents: true, ObserveMessages: true,
diff --git a/apps/daemon/internal/agent/installroot/lock.go b/apps/daemon/internal/agent/installroot/lock.go
deleted file mode 100644
index 19d9295e4..000000000
--- a/apps/daemon/internal/agent/installroot/lock.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Package installroot coordinates adapter installations within one daemon process.
-package installroot
-
-import (
-	"context"
-	"os"
-	"sync"
-)
-
-type installRootLock struct {
-	info  os.FileInfo
-	token chan struct{}
-	users int
-}
-
-var installRoots = struct {
-	sync.Mutex
-	entries map[*installRootLock]struct{}
-}{entries: make(map[*installRootLock]struct{})}
-
-// Lock creates the install root if needed and holds its filesystem identity
-// until the returned function is called once.
-// Waiting callers may cancel without interrupting the current installation.
-func Lock(ctx context.Context, root string) (func(), error) {
-	if err := ctx.Err(); err != nil {
-		return nil, err
-	}
-	if err := os.MkdirAll(root, 0o755); err != nil {
-		return nil, err
-	}
-	info, err := os.Stat(root)
-	if err != nil {
-		return nil, err
-	}
-	installRoots.Lock()
-	var entry *installRootLock
-	for candidate := range installRoots.entries {
-		if os.SameFile(candidate.info, info) {
-			entry = candidate
-			break
-		}
-	}
-	if entry == nil {
-		entry = &installRootLock{info: info, token: make(chan struct{}, 1)}
-		entry.token <- struct{}{}
-		installRoots.entries[entry] = struct{}{}
-	}
-	entry.users++
-	installRoots.Unlock()
-
-	release := func() {
-		installRoots.Lock()
-		entry.users--
-		if entry.users == 0 {
-			delete(installRoots.entries, entry)
-		}
-		installRoots.Unlock()
-	}
-	select {
-	case <-ctx.Done():
-		release()
-		return nil, ctx.Err()
-	case <-entry.token:
-		return func() {
-			entry.token <- struct{}{}
-			release()
-		}, nil
-	}
-}
diff --git a/apps/daemon/internal/agent/installroot/lock_test.go b/apps/daemon/internal/agent/installroot/lock_test.go
deleted file mode 100644
index 4359af299..000000000
--- a/apps/daemon/internal/agent/installroot/lock_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package installroot
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestLockCaseAliases(t *testing.T) {
-	parent := t.TempDir()
-	alias := strings.ToUpper(parent)
-	realInfo, err := os.Stat(parent)
-	if err != nil {
-		t.Fatal(err)
-	}
-	aliasInfo, err := os.Stat(alias)
-	if err != nil || !os.SameFile(realInfo, aliasInfo) {
-		t.Skip("filesystem does not expose this case alias")
-	}
-	root := filepath.Join(parent, "new-root")
-	unlock, err := Lock(context.Background(), root)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer unlock()
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Millisecond)
-	defer cancel()
-	release, err := Lock(ctx, filepath.Join(alias, "NEW-ROOT"))
-	if err == nil {
-		release()
-		t.Fatal("case alias acquired an independent lock")
-	}
-	if err != context.DeadlineExceeded {
-		t.Fatalf("lock error = %v", err)
-	}
-}
diff --git a/apps/daemon/internal/agent/installroot/probe.go b/apps/daemon/internal/agent/installroot/probe.go
index 21f50ed47..d2932e3f8 100644
--- a/apps/daemon/internal/agent/installroot/probe.go
+++ b/apps/daemon/internal/agent/installroot/probe.go
@@ -1,3 +1,4 @@
+// Package installroot probes native adapter installations.
 package installroot
 
 import (
diff --git a/apps/daemon/internal/agent/mcode/declaration.go b/apps/daemon/internal/agent/mcode/declaration.go
index bd44257ea..fa22848f1 100644
--- a/apps/daemon/internal/agent/mcode/declaration.go
+++ b/apps/daemon/internal/agent/mcode/declaration.go
@@ -56,20 +56,18 @@ func discoverWithCheck(parent context.Context, options agent.DiscoveryOptions, r
 		return runtime
 	}
 	result.Available, result.Version = true, version
-	if SupportsExecution(version) {
-		result.Capabilities.Steering = proto.CapabilitySupported
-		result.Capabilities.DurableTurns = proto.CapabilitySupported
-		result.Capabilities.DurableInputReceipts = proto.CapabilitySupported
-		result.Capabilities.ExecutionControls = proto.CapabilitySupported
-		result.Capabilities.ProgrammaticToolCallingDisable = proto.CapabilitySupported
-		result.Capabilities.ToolObservations = proto.CapabilitySupported
-		result.Capabilities.SubagentControl = proto.CapabilitySupported
-		// Native preparation verifies the applied admission/tool profile before input.
-		result.Capabilities.SubagentObservations = proto.CapabilitySupported
-		result.Capabilities.EnvironmentNone = proto.CapabilitySupported
-		result.Capabilities.MCPHTTPTools = proto.CapabilitySupported
-		result.Capabilities.MCPHTTPBearerAuth = proto.CapabilitySupported
-	}
+	result.Capabilities.Steering = proto.CapabilitySupported
+	result.Capabilities.DurableTurns = proto.CapabilitySupported
+	result.Capabilities.DurableInputReceipts = proto.CapabilitySupported
+	result.Capabilities.ExecutionControls = proto.CapabilitySupported
+	result.Capabilities.ProgrammaticToolCallingDisable = proto.CapabilitySupported
+	result.Capabilities.ToolObservations = proto.CapabilitySupported
+	result.Capabilities.SubagentControl = proto.CapabilitySupported
+	// Native preparation verifies the applied admission/tool profile before input.
+	result.Capabilities.SubagentObservations = proto.CapabilitySupported
+	result.Capabilities.EnvironmentNone = proto.CapabilitySupported
+	result.Capabilities.MCPHTTPTools = proto.CapabilitySupported
+	result.Capabilities.MCPHTTPBearerAuth = proto.CapabilitySupported
 	runtime.Info = result
 	workspace := discoverWorkspace(parent, options, runtime)
 	if runtime.Info.Available {
diff --git a/apps/daemon/internal/agent/mcode/declaration_test.go b/apps/daemon/internal/agent/mcode/declaration_test.go
index b60d8b348..386c4df2d 100644
--- a/apps/daemon/internal/agent/mcode/declaration_test.go
+++ b/apps/daemon/internal/agent/mcode/declaration_test.go
@@ -2,6 +2,7 @@ package mcode
 
 import (
 	"context"
+	"errors"
 	"io"
 	"reflect"
 	"testing"
@@ -10,20 +11,20 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-func TestMCodeExecutionOptInIsVersionBound(t *testing.T) {
+// An available runtime is execution-capable; a rejected native version is unavailable.
+func TestMCodeExecutionFollowsAvailability(t *testing.T) {
 	for _, tc := range []struct {
-		enabled, version string
-		qualified        bool
-	}{{"", "0.4.12", false}, {"1", "0.3.11", false}, {"1", "0.4.12", true}} {
-		t.Run(tc.enabled+"/"+tc.version, func(t *testing.T) {
-			t.Setenv("OAC_RUNTIME_MCODE_AGENTS_API", tc.enabled)
+		version string
+		check   error
+	}{{SupportedVersion, nil}, {"0.3.11", errors.New("mcode: unsupported version 0.3.11")}} {
+		t.Run(tc.version, func(t *testing.T) {
 			rc := agent.DiscoveryOptions{Stdout: io.Discard, Stderr: io.Discard}
-			runtime := discoverWithCheck(t.Context(), rc, Declaration.Info, func(context.Context, string) (string, error) { return tc.version, nil })
-			if runtime.Executor == nil || runtime.Info.Capabilities.WorkspaceReadPreparation.IsSupported() {
+			runtime := discoverWithCheck(t.Context(), rc, Declaration.Info, func(context.Context, string) (string, error) { return tc.version, tc.check })
+			info, available := runtime.Info, tc.check == nil
+			if (runtime.Executor != nil) != available || info.Capabilities.WorkspaceReadPreparation.IsSupported() {
 				t.Fatalf("factories: %+v", runtime)
 			}
-			info := runtime.Info
-			if !info.Available || info.Capabilities.EnvironmentNone.IsSupported() != tc.qualified || info.Capabilities.DurableInputReceipts.IsSupported() != tc.qualified || info.Capabilities.SubagentObservations.IsSupported() != tc.qualified {
+			if info.Available != available || info.Capabilities.EnvironmentNone.IsSupported() != available || info.Capabilities.DurableInputReceipts.IsSupported() != available || info.Capabilities.SubagentObservations.IsSupported() != available {
 				t.Fatalf("capabilities=%+v", info.Capabilities)
 			}
 			if info.Capabilities.NativeSessionRecovery.IsSupported() || info.Capabilities.LocalEnvironment.IsSupported() || info.Capabilities.FunctionTools.IsSupported() {
diff --git a/apps/daemon/internal/agent/mcode/discovery_workspace.go b/apps/daemon/internal/agent/mcode/discovery_workspace.go
index 11d7a6d55..da4f768d8 100644
--- a/apps/daemon/internal/agent/mcode/discovery_workspace.go
+++ b/apps/daemon/internal/agent/mcode/discovery_workspace.go
@@ -27,10 +27,6 @@ func discoverWorkspace(parent context.Context, options agent.DiscoveryOptions, r
 	if binding == nil {
 		return nil
 	}
-	if !runtime.Info.Available || !SupportsExecution(runtime.Info.Version) {
-		fail(fmt.Errorf("local execution requires the qualified native version"))
-		return nil
-	}
 	root, err := paths.Root()
 	if err != nil {
 		fail(err)
diff --git a/apps/daemon/internal/agent/mcode/execution.go b/apps/daemon/internal/agent/mcode/execution.go
index bcb9e3902..e35d927a2 100644
--- a/apps/daemon/internal/agent/mcode/execution.go
+++ b/apps/daemon/internal/agent/mcode/execution.go
@@ -7,13 +7,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 )
 
-// SupportsExecution reports whether the daemon advertises MiniMax Code execution:
-// the operator sets OAC_RUNTIME_MCODE_AGENTS_API=1 and the native version is the
-// qualified one. Otherwise discovery reports only availability.
-func SupportsExecution(version string) bool {
-	return os.Getenv("OAC_RUNTIME_MCODE_AGENTS_API") == "1" && version == SupportedVersion
-}
-
 func validateExecutionRequest(req proto.PromptRequestPayload) error {
 	if !req.DisableExecutionEnvironment || req.AgentStateKey == "" || req.LocalEnvironment != nil || req.RequireExistingNativeSession || len(req.FunctionTools) != 0 || (req.MCPHTTPServers != nil && len(*req.MCPHTTPServers) != 0) {
 		return fmt.Errorf("mcode: unsupported execution configuration")
diff --git a/apps/daemon/internal/agent/mcode/installation.go b/apps/daemon/internal/agent/mcode/installation.go
index fe75d9258..5f6937fc1 100644
--- a/apps/daemon/internal/agent/mcode/installation.go
+++ b/apps/daemon/internal/agent/mcode/installation.go
@@ -12,7 +12,7 @@ import (
 func Installation() agent.Installation {
 	return agent.Installation{AgentKind: "mcode", Version: SupportedVersion, Supported: func() bool { return runtime.GOOS == "linux" || runtime.GOOS == "darwin" },
 		Environment: func(dir, node string) map[string]string {
-			return map[string]string{"OAC_RUNTIME_MCODE_BIN": filepath.Join(dir, "native", "cli.js"), "OAC_RUNTIME_MCODE_NODE": node, "OAC_RUNTIME_MCODE_WORKSPACE_BRIDGE": filepath.Join(dir, "bridge.mjs"), "OAC_RUNTIME_MCODE_AGENTS_API": "1"}
+			return map[string]string{"OAC_RUNTIME_MCODE_BIN": filepath.Join(dir, "native", "cli.js"), "OAC_RUNTIME_MCODE_NODE": node, "OAC_RUNTIME_MCODE_WORKSPACE_BRIDGE": filepath.Join(dir, "bridge.mjs")}
 		},
 		Check: func(ctx context.Context, dir, node string, env []string) error {
 			got, err := installroot.Probe(ctx, node, []string{filepath.Join(dir, "native", "cli.js"), "--version"}, env, dir)
diff --git a/apps/daemon/internal/cli/connect.go b/apps/daemon/internal/cli/connect.go
index a0d6abed1..dc87bb4a9 100644
--- a/apps/daemon/internal/cli/connect.go
+++ b/apps/daemon/internal/cli/connect.go
@@ -151,7 +151,7 @@ func spawnBackground(ctx context.Context, rc *runContext, profile string, argv [
 	} else if !errors.Is(err, os.ErrNotExist) && !errors.Is(err, daemonize.ErrStaleOrCorrupt) {
 		return fmt.Errorf("connect: check pidfile: %w", err)
 	}
-	// Stale pidfile → remove so WritePIDFile starts clean.
+	// Stale pidfile → remove so Spawn starts clean.
 	_ = daemonize.RemovePIDFile(pidPath)
 
 	if err := daemonize.EnsureLogFile(logPath); err != nil {
diff --git a/apps/daemon/internal/cli/connect_environment_binding.go b/apps/daemon/internal/cli/connect_environment_binding.go
index 9fa651798..b661092e0 100644
--- a/apps/daemon/internal/cli/connect_environment_binding.go
+++ b/apps/daemon/internal/cli/connect_environment_binding.go
@@ -95,17 +95,6 @@ func bindEnvironmentRuntime(remote string, bound environmentEnrollment, credenti
 	return nil
 }
 
-// Neither selecting private state nor selecting its parent grants workspace access.
-func environmentPathsOverlap(first, second string) bool {
-	for _, pair := range [][2]string{{first, second}, {second, first}} {
-		relative, err := filepath.Rel(pair[0], pair[1])
-		if err == nil && (relative == "." || filepath.IsLocal(relative)) {
-			return true
-		}
-	}
-	return false
-}
-
 func saveEnvironmentBinding(root string, want environmentBinding) error {
 	// Store the binding with the other daemon state.
 	dir := filepath.Join(root, "daemon")
diff --git a/apps/daemon/internal/daemonize/logfile.go b/apps/daemon/internal/daemonize/logfile.go
index 80124e1fc..a74f0dcfd 100644
--- a/apps/daemon/internal/daemonize/logfile.go
+++ b/apps/daemon/internal/daemonize/logfile.go
@@ -1,14 +1,14 @@
 package daemonize
 
 import (
-	"bufio"
 	"errors"
 	"fmt"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimefs"
 	"io"
 	"os"
 	"path/filepath"
 	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimefs"
 )
 
 // TailOptions configures Tail.
@@ -149,27 +149,6 @@ func EnsureLogFile(path string) error {
 	return f.Close()
 }
 
-// MustWriteLine appends one line to path with 0o600 mode, adding a
-// trailing newline if missing. Returns errors despite the name —
-// kept short because it's used in startup hot paths.
-func MustWriteLine(path string, line string) error {
-	f, err := openPrivateLog(path)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	bw := bufio.NewWriter(f)
-	if _, err := bw.WriteString(line); err != nil {
-		return err
-	}
-	if len(line) == 0 || line[len(line)-1] != '\n' {
-		if _, err := bw.WriteString("\n"); err != nil {
-			return err
-		}
-	}
-	return bw.Flush()
-}
-
 func openPrivateLog(path string) (*os.File, error) {
 	root, err := os.OpenRoot(filepath.Dir(path))
 	if err != nil {
diff --git a/apps/daemon/internal/daemonize/logfile_test.go b/apps/daemon/internal/daemonize/logfile_test.go
index a13bdca48..5d1caeb6e 100644
--- a/apps/daemon/internal/daemonize/logfile_test.go
+++ b/apps/daemon/internal/daemonize/logfile_test.go
@@ -182,21 +182,6 @@ func TestEnsureLogFileCreatesMissingParentDir(t *testing.T) {
 	}
 }
 
-func TestMustWriteLineAppendsTrailingNewline(t *testing.T) {
-	dir := privateTempDir(t)
-	path := filepath.Join(dir, "ml.log")
-	if err := MustWriteLine(path, "no-newline"); err != nil {
-		t.Fatalf("MustWriteLine: %v", err)
-	}
-	if err := MustWriteLine(path, "has-newline\n"); err != nil {
-		t.Fatalf("MustWriteLine: %v", err)
-	}
-	body, _ := os.ReadFile(path)
-	if string(body) != "no-newline\nhas-newline\n" {
-		t.Errorf("body = %q", string(body))
-	}
-}
-
 // safeBuf wraps bytes.Buffer with a mutex so concurrent reads/writes
 // during Tail's poll loop don't race.
 type safeBuf struct {
diff --git a/apps/daemon/internal/daemonize/pidfile.go b/apps/daemon/internal/daemonize/pidfile.go
index 2224c8542..b6ad008c1 100644
--- a/apps/daemon/internal/daemonize/pidfile.go
+++ b/apps/daemon/internal/daemonize/pidfile.go
@@ -19,15 +19,6 @@ type processIdentity struct {
 	StopEvent string `json:"stop_event,omitempty"`
 }
 
-func WritePIDFile(path string, pid int) error {
-	identity, err := identifyProcess(pid)
-	if err != nil {
-		return err
-	}
-	identity.StopEvent = os.Getenv(stopEventEnv)
-	return writeIdentity(path, identity)
-}
-
 func writeIdentity(path string, identity processIdentity) error {
 	if path == "" {
 		return errors.New("daemonize: process record path required")
@@ -71,8 +62,6 @@ func ReadPIDFile(path string) (int, error) {
 	return identity.PID, err
 }
 
-func IsAlive(pid int) error { _, err := identifyProcess(pid); return err }
-
 // StopPIDFile never removes ownership before the exact process has exited.
 // A cleanup timeout leaves the record available for observation and a later stop.
 func StopPIDFile(path string, timeout time.Duration) error {
diff --git a/apps/daemon/internal/daemonize/pidfile_test.go b/apps/daemon/internal/daemonize/pidfile_test.go
index 4aec5a769..5f83362d0 100644
--- a/apps/daemon/internal/daemonize/pidfile_test.go
+++ b/apps/daemon/internal/daemonize/pidfile_test.go
@@ -11,7 +11,11 @@ import (
 
 func TestProcessRecordIdentity(t *testing.T) {
 	path := filepath.Join(privateTempDir(t), "connect.pid")
-	if err := WritePIDFile(path, os.Getpid()); err != nil {
+	record, err := identifyProcess(os.Getpid())
+	if err == nil {
+		err = writeIdentity(path, record)
+	}
+	if err != nil {
 		t.Fatal(err)
 	}
 	pid, err := ReadPIDFile(path)
@@ -34,7 +38,7 @@ func TestProcessRecordIdentity(t *testing.T) {
 	if err = StopPIDFile(path, time.Second); !errors.Is(err, ErrStaleOrCorrupt) {
 		t.Fatal("stale identity was accepted", err)
 	}
-	if err = IsAlive(os.Getpid()); err != nil {
+	if _, err = identifyProcess(os.Getpid()); err != nil {
 		t.Fatal("unrelated process was affected", err)
 	}
 	if _, err = os.Stat(path); err != nil {
diff --git a/apps/daemon/internal/dispatch/local_directory_test.go b/apps/daemon/internal/dispatch/local_directory_test.go
index b7329c2f5..8319fbecc 100644
--- a/apps/daemon/internal/dispatch/local_directory_test.go
+++ b/apps/daemon/internal/dispatch/local_directory_test.go
@@ -23,7 +23,7 @@ func TestLocalDirectoryPreparationNeedsNoHarnessAndRejectsOtherOwners(t *testing
 	workspace := t.TempDir()
 
 	environment, session := uuid.NewString(), uuid.NewString()
-	binding, err := localworkspace.New(environment, session, workspace)
+	binding, err := localworkspace.NewWithCapabilityDirectory(environment, session, workspace, t.TempDir())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -103,7 +103,7 @@ func TestLocalDirectoryKeepsNotDirectorySeparateFromFailures(t *testing.T) {
 		t.Fatal(err)
 	}
 	environment, session := uuid.NewString(), uuid.NewString()
-	binding, err := localworkspace.New(environment, session, workspace)
+	binding, err := localworkspace.NewWithCapabilityDirectory(environment, session, workspace, t.TempDir())
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/dispatch/preparation.go b/apps/daemon/internal/dispatch/preparation.go
index 3316c282f..fdfe21631 100644
--- a/apps/daemon/internal/dispatch/preparation.go
+++ b/apps/daemon/internal/dispatch/preparation.go
@@ -18,23 +18,22 @@ const preparationRecords = 64
 // All mutable fields are protected by Router.mu. owns includes resources whose
 // cancellation is underway; a slow close cannot bypass the capacity bound.
 type preparationState struct {
-	capabilities      proto.AgentKindCapabilities
-	executor          *executorState
-	requestID         string
-	trace             string
-	fingerprint       [32]byte
-	startFingerprint  [32]byte
-	status            proto.PreparationStatusPayload
-	deadline          time.Time
-	timer             *time.Timer
-	ctx               context.Context
-	cancel            context.CancelFunc
-	environmentID     string
-	busy              bool
-	owns              bool
-	closeErr          error
-	workspaceReadOnly bool
-	handoff           *preparedHandoff
+	capabilities     proto.AgentKindCapabilities
+	executor         *executorState
+	requestID        string
+	trace            string
+	fingerprint      [32]byte
+	startFingerprint [32]byte
+	status           proto.PreparationStatusPayload
+	deadline         time.Time
+	timer            *time.Timer
+	ctx              context.Context
+	cancel           context.CancelFunc
+	environmentID    string
+	busy             bool
+	owns             bool
+	closeErr         error
+	handoff          *preparedHandoff
 }
 
 func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope) error {
@@ -102,7 +101,7 @@ func (r *Router) handleExecutionPrepare(ctx context.Context, env proto.Envelope)
 		return r.rejectPreparation(env, "preparation_capacity")
 	}
 	owner, cancel := context.WithCancel(context.WithoutCancel(ctx))
-	p := &preparationState{capabilities: caps, requestID: env.ID, trace: env.Trace, fingerprint: fingerprint, ctx: owner, cancel: cancel, environmentID: req.EnvironmentID(), workspaceReadOnly: true, busy: true, owns: true, deadline: time.Now().Add(r.preparationTimeout)}
+	p := &preparationState{capabilities: caps, requestID: env.ID, trace: env.Trace, fingerprint: fingerprint, ctx: owner, cancel: cancel, environmentID: req.EnvironmentID(), busy: true, owns: true, deadline: time.Now().Add(r.preparationTimeout)}
 	p.status = proto.PreparationStatusPayload{Handle: uuid.NewString(), Revision: 1, State: "preparing", ExpiresAt: p.deadline.UnixMilli()}
 	r.preparations[p.status.Handle], r.preparationRequests[p.requestID] = p, p
 	p.timer = time.AfterFunc(r.preparationTimeout, func() { r.releasePreparation(p, "expired", "", true) })
@@ -210,7 +209,7 @@ func (r *Router) prunePreparationsLocked() {
 
 func (r *Router) publishPreparation(p *preparationState, status proto.PreparationStatusPayload) {
 	r.mu.Lock()
-	if p.workspaceReadOnly && status.Revision != p.status.Revision {
+	if p.executor == nil && status.Revision != p.status.Revision {
 		r.mu.Unlock()
 		return
 	}
@@ -223,7 +222,7 @@ func (r *Router) publishPreparation(p *preparationState, status proto.Preparatio
 	go func() {
 		defer r.shutdownWG.Done()
 		// A failed terminal notification must not restart incomplete cleanup.
-		if !r.sendPreparation(p.requestID, p.trace, status) && (!p.workspaceReadOnly || status.State == "preparing" || status.State == "ready") {
+		if !r.sendPreparation(p.requestID, p.trace, status) && (p.executor != nil || status.State == "preparing" || status.State == "ready") {
 			r.releasePreparation(p, "failed", "status_delivery_failed", false)
 		}
 	}()
diff --git a/apps/daemon/internal/dispatch/preparation_start.go b/apps/daemon/internal/dispatch/preparation_start.go
index 8b0818b4c..887f42f11 100644
--- a/apps/daemon/internal/dispatch/preparation_start.go
+++ b/apps/daemon/internal/dispatch/preparation_start.go
@@ -33,12 +33,12 @@ func (r *Router) handleExecutionStart(_ context.Context, env proto.Envelope) err
 		r.mu.Unlock()
 		return r.rejectPreparation(env, "unknown_preparation")
 	}
-	if p.workspaceReadOnly {
+	if p.executor == nil {
 		r.mu.Unlock()
 		return r.rejectPreparation(env, "read_only_preparation")
 	}
 	owner := p.executor
-	if owner == nil || owner.id != input.ExecutorID {
+	if owner.id != input.ExecutorID {
 		r.mu.Unlock()
 		return r.rejectPreparation(env, "unknown_executor")
 	}
diff --git a/apps/daemon/internal/dispatch/router.go b/apps/daemon/internal/dispatch/router.go
index 5df1f4b32..272f65f6b 100644
--- a/apps/daemon/internal/dispatch/router.go
+++ b/apps/daemon/internal/dispatch/router.go
@@ -187,7 +187,7 @@ func adoptEnvelopeTrace(ctx context.Context, env proto.Envelope) context.Context
 			return obslog.WithTrace(ctx, carrier)
 		}
 	}
-	ctx, _ = obslog.StartBackgroundTrace(ctx, "daemon.envelope")
+	ctx, _ = obslog.StartBackgroundTrace(ctx)
 	return ctx
 }
 
diff --git a/apps/daemon/internal/dispatch/runtime_preparation_test.go b/apps/daemon/internal/dispatch/runtime_preparation_test.go
index d8a3399f9..7a8a31c70 100644
--- a/apps/daemon/internal/dispatch/runtime_preparation_test.go
+++ b/apps/daemon/internal/dispatch/runtime_preparation_test.go
@@ -33,7 +33,7 @@ func (s *capabilitiesTestSender) Send(ctx context.Context, env proto.Envelope) e
 func capabilitiesTestRouter(t *testing.T) (*Router, *capabilitiesTestSender, string, string) {
 	t.Helper()
 	environment, session := uuid.NewString(), uuid.NewString()
-	binding, err := localworkspace.New(environment, session, t.TempDir())
+	binding, err := localworkspace.NewWithCapabilityDirectory(environment, session, t.TempDir(), t.TempDir())
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/dispatch/workspace_export.go b/apps/daemon/internal/dispatch/workspace_export.go
index 86fd2cb43..490cbd463 100644
--- a/apps/daemon/internal/dispatch/workspace_export.go
+++ b/apps/daemon/internal/dispatch/workspace_export.go
@@ -48,7 +48,7 @@ func (r *Router) handleWorkspaceExport(ctx context.Context, env proto.Envelope)
 	}
 	_, code := r.workspaceResourceLocked(proto.WorkspaceReadPayload{Handle: request.Handle, EnvironmentID: request.EnvironmentID})
 	p := r.preparations[request.Handle]
-	if u != nil || r.workspaceWrite != nil || !r.localWorkspace.CanExport() || code != "" || p == nil || !p.workspaceReadOnly {
+	if u != nil || r.workspaceWrite != nil || !r.localWorkspace.CanExport() || code != "" || p == nil || p.executor != nil {
 		r.mu.Unlock()
 		return r.sendWorkspaceExport(ctx, env.ID, proto.WorkspaceExportResultPayload{Outcome: "rejected", ErrorCode: "resource_unavailable"})
 	}
diff --git a/apps/daemon/internal/dispatch/workspace_export_test.go b/apps/daemon/internal/dispatch/workspace_export_test.go
index 90dba1e5e..dfbec11e8 100644
--- a/apps/daemon/internal/dispatch/workspace_export_test.go
+++ b/apps/daemon/internal/dispatch/workspace_export_test.go
@@ -47,7 +47,7 @@ func exporterRouter(t *testing.T, program string) (*Router, exportSender, proto.
 		f.Close()
 	}
 	environment, session := uuid.NewString(), uuid.NewString()
-	binding, err := localworkspace.New(environment, session, workspace)
+	binding, err := localworkspace.NewWithCapabilityDirectory(environment, session, workspace, t.TempDir())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -57,7 +57,7 @@ func exporterRouter(t *testing.T, program string) (*Router, exportSender, proto.
 		t.Fatal(err)
 	}
 	handle := uuid.NewString()
-	r.preparations[handle] = &preparationState{workspaceReadOnly: true, environmentID: environment, owns: true, ctx: context.Background(), deadline: time.Now().Add(time.Hour), status: proto.PreparationStatusPayload{State: "ready"}}
+	r.preparations[handle] = &preparationState{environmentID: environment, owns: true, ctx: context.Background(), deadline: time.Now().Add(time.Hour), status: proto.PreparationStatusPayload{State: "ready"}}
 	t.Cleanup(func() {
 		r.mu.Lock()
 		delete(r.preparations, handle)
diff --git a/apps/daemon/internal/dispatch/workspace_preparation_status_test.go b/apps/daemon/internal/dispatch/workspace_preparation_status_test.go
index 3128a407b..d748b5bbe 100644
--- a/apps/daemon/internal/dispatch/workspace_preparation_status_test.go
+++ b/apps/daemon/internal/dispatch/workspace_preparation_status_test.go
@@ -22,7 +22,7 @@ func TestReadPreparationRetryCannotPublishStaleStatus(t *testing.T) {
 	timer := time.NewTimer(time.Hour)
 	defer timer.Stop()
 	r := &Router{sender: sender, shutdownCh: make(chan struct{})}
-	p := &preparationState{workspaceReadOnly: true, owns: true, ctx: ctx, cancel: cancel, timer: timer,
+	p := &preparationState{owns: true, ctx: ctx, cancel: cancel, timer: timer,
 		status: proto.PreparationStatusPayload{Handle: "reader", Revision: 2, State: "ready"}}
 	// A prepare retry captures this snapshot before the release settles.
 	snapshot := p.status
diff --git a/apps/daemon/internal/dispatch/workspace_write_test.go b/apps/daemon/internal/dispatch/workspace_write_test.go
index e6e710fe9..7ecab2792 100644
--- a/apps/daemon/internal/dispatch/workspace_write_test.go
+++ b/apps/daemon/internal/dispatch/workspace_write_test.go
@@ -20,7 +20,7 @@ func localWriterRouter(t *testing.T) (*dispatch.Router, *recSender, proto.Worksp
 	t.Helper()
 	workspace := t.TempDir()
 	environment, session := uuid.NewString(), uuid.NewString()
-	binding, err := localworkspace.New(environment, session, workspace)
+	binding, err := localworkspace.NewWithCapabilityDirectory(environment, session, workspace, t.TempDir())
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/apps/daemon/internal/localworkspace/binding.go b/apps/daemon/internal/localworkspace/binding.go
index 5ee7fbf31..0ead8710a 100644
--- a/apps/daemon/internal/localworkspace/binding.go
+++ b/apps/daemon/internal/localworkspace/binding.go
@@ -3,11 +3,9 @@ package localworkspace
 import (
 	"errors"
 	"os"
-	"path/filepath"
 	"strings"
 	"sync"
 
-	"github.com/MiniMax-AI/OpenAgentCore/apps/daemon/internal/paths"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentcapabilities"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
@@ -26,14 +24,6 @@ type Binding struct {
 	capabilityRoot string
 }
 
-func New(environment, session, workspace string) (*Binding, error) {
-	root, err := paths.Root()
-	if err != nil {
-		return nil, err
-	}
-	return newNativeBinding(environment, session, workspace, filepath.Join(root, "capabilities"))
-}
-
 // NewWithCapabilityDirectory freezes paths selected by the Runtime operator.
 func NewWithCapabilityDirectory(environment, session, workspace, directory string) (*Binding, error) {
 	return newNativeBinding(environment, session, workspace, directory)
diff --git a/apps/daemon/internal/localworkspace/binding_test.go b/apps/daemon/internal/localworkspace/binding_test.go
index 6d5bc80a5..b23ea8c0f 100644
--- a/apps/daemon/internal/localworkspace/binding_test.go
+++ b/apps/daemon/internal/localworkspace/binding_test.go
@@ -20,12 +20,11 @@ func testBinding(t *testing.T) (*Binding, proto.PromptRequestPayload) {
 	t.Setenv("OAC_RUNTIME_HOME", private)
 	root := t.TempDir()
 	environment, session := uuid.NewString(), uuid.NewString()
-	b, err := New(environment, session, root)
+	b, err := NewWithCapabilityDirectory(environment, session, root, t.TempDir())
 	if err != nil {
 		t.Fatal(err)
 	}
 	b.networkAccess = "disabled"
-	b.capabilityRoot = t.TempDir()
 	return b, proto.PromptRequestPayload{LocalEnvironment: &proto.LocalEnvironment{ID: environment, NetworkAccess: "disabled", WorkspaceDirectory: "/workspace", CapabilitySources: &agentcapabilities.Input{}}, AgentStateKey: "agents-api-" + session}
 }
 
diff --git a/apps/daemon/internal/localworkspace/capability_preparation_test.go b/apps/daemon/internal/localworkspace/capability_preparation_test.go
index 0d226d55e..dc061b085 100644
--- a/apps/daemon/internal/localworkspace/capability_preparation_test.go
+++ b/apps/daemon/internal/localworkspace/capability_preparation_test.go
@@ -40,12 +40,11 @@ func TestPreparationFreezesLocalContentsAcrossReconnect(t *testing.T) {
 		t.Fatalf("first preparation: %v", err)
 	}
 	writeSourceSkill(t, source, "second")
-	reconnect, err := New(b.environment, b.capabilityIdentity().SessionID, b.workspace)
+	reconnect, err := NewWithCapabilityDirectory(b.environment, b.capabilityIdentity().SessionID, b.workspace, b.capabilityRoot)
 	if err != nil {
 		t.Fatal(err)
 	}
 	reconnect.networkAccess = b.networkAccess
-	reconnect.capabilityRoot = b.capabilityRoot
 	again, err := reconnect.Prepare(t.Context(), configured)
 	if err != nil || len(again.LocalEnvironment.Skills) != 1 {
 		t.Fatalf("reconnection: %v", err)
@@ -206,11 +205,11 @@ func TestPreparationFreezesToolOnlyEnvironmentAcrossReconnect(t *testing.T) {
 			if err := os.WriteFile(source, []byte(`{"LOCAL_ONLY":"changed"}`), 0600); err != nil {
 				t.Fatal(err)
 			}
-			reconnect, err := New(b.environment, b.capabilityIdentity().SessionID, b.workspace)
+			reconnect, err := NewWithCapabilityDirectory(b.environment, b.capabilityIdentity().SessionID, b.workspace, b.capabilityRoot)
 			if err != nil {
 				t.Fatal(err)
 			}
-			reconnect.networkAccess, reconnect.capabilityRoot = b.networkAccess, b.capabilityRoot
+			reconnect.networkAccess = b.networkAccess
 			if _, err := reconnect.Prepare(t.Context(), configured); err != nil {
 				t.Fatal(err)
 			}
diff --git a/apps/daemon/internal/paths/paths.go b/apps/daemon/internal/paths/paths.go
index 6c835ae3d..accdd85c6 100644
--- a/apps/daemon/internal/paths/paths.go
+++ b/apps/daemon/internal/paths/paths.go
@@ -88,12 +88,3 @@ func LogFile(profile string) (string, error) {
 	}
 	return filepath.Join(dir, "connect.log"), nil
 }
-
-// SessionsFile returns the absolute path to sessions.json.
-func SessionsFile(profile string) (string, error) {
-	dir, err := ProfileDir(profile)
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(dir, "sessions.json"), nil
-}
diff --git a/apps/daemon/internal/paths/paths_test.go b/apps/daemon/internal/paths/paths_test.go
index 7f4d8fa9e..cd6fc605f 100644
--- a/apps/daemon/internal/paths/paths_test.go
+++ b/apps/daemon/internal/paths/paths_test.go
@@ -75,10 +75,9 @@ func TestProfileDirAndFiles(t *testing.T) {
 	}
 
 	cases := map[string]func(string) (string, error){
-		"auth.json":     paths.AuthFile,
-		"connect.pid":   paths.PIDFile,
-		"connect.log":   paths.LogFile,
-		"sessions.json": paths.SessionsFile,
+		"auth.json":   paths.AuthFile,
+		"connect.pid": paths.PIDFile,
+		"connect.log": paths.LogFile,
 	}
 	for filename, fn := range cases {
 		got, err := fn("test")
diff --git a/contracts/agents-api/v1/model_execution.go b/contracts/agents-api/v1/model_execution.go
index d3c5f22da..903255c44 100644
--- a/contracts/agents-api/v1/model_execution.go
+++ b/contracts/agents-api/v1/model_execution.go
@@ -83,7 +83,3 @@ func (p *ModelProviderInput) ValidateHarnessWithRegistry(harness string, registr
 	}
 	return nil
 }
-
-func ValidateModelProtocol(protocol, harness string) error {
-	return builtin.Registry().ValidateProtocol(harness, protocol)
-}
diff --git a/internal/obs/log/api.go b/internal/obs/log/api.go
index 0b12a74d3..6c0102cda 100644
--- a/internal/obs/log/api.go
+++ b/internal/obs/log/api.go
@@ -1,6 +1,3 @@
-// Direct slog.{Info,Warn,Error,Debug,Default} use outside this package
-// is blocked by .golangci.yml forbidigo so the ctx-first signatures
-// here are how trace_id auto-injection stays enforceable.
 package log
 
 import (
@@ -8,24 +5,12 @@ import (
 	"log/slog"
 )
 
-// Info logs via slog.Default with ctx attached so ContextHandler can
+// Warn logs via slog.Default with ctx attached so ContextHandler can
 // inject trace_id/span_id from ctx.
-func Info(ctx context.Context, msg string, args ...any) {
-	slog.Default().InfoContext(ctx, msg, args...)
-}
-
 func Warn(ctx context.Context, msg string, args ...any) {
 	slog.Default().WarnContext(ctx, msg, args...)
 }
 
-func Error(ctx context.Context, msg string, args ...any) {
-	slog.Default().ErrorContext(ctx, msg, args...)
-}
-
-func Debug(ctx context.Context, msg string, args ...any) {
-	slog.Default().DebugContext(ctx, msg, args...)
-}
-
 // Bg returns slog.Default for ctx-less startup/init/shutdown sites.
 // Using Bg() in any handler-path code is a bug — it bypasses trace
 // attribution silently.
diff --git a/internal/obs/log/api_test.go b/internal/obs/log/api_test.go
index 3be844741..5c7c91e3d 100644
--- a/internal/obs/log/api_test.go
+++ b/internal/obs/log/api_test.go
@@ -3,32 +3,11 @@ package log
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"log/slog"
 	"strings"
 	"testing"
 )
 
-func TestInfoEmitsTraceID(t *testing.T) {
-	carrier, _ := ParseTraceparent("00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01")
-	var buf bytes.Buffer
-	prev := slog.Default()
-	slog.SetDefault(slog.New(NewContextHandler(slog.NewJSONHandler(&buf, nil))))
-	t.Cleanup(func() { slog.SetDefault(prev) })
-
-	Info(WithTrace(context.Background(), carrier), "hello", "k", "v")
-	var got map[string]any
-	if err := json.Unmarshal(bytes.TrimSpace(buf.Bytes()), &got); err != nil {
-		t.Fatalf("unmarshal: %v\nraw=%s", err, buf.String())
-	}
-	if got[AttrTraceID] != "0af7651916cd43dd8448eb211c80319c" {
-		t.Fatalf("trace_id: %v", got[AttrTraceID])
-	}
-	if got["k"] != "v" {
-		t.Fatalf("user attr lost: %v", got["k"])
-	}
-}
-
 // TestBgOmitsTraceID: Bg().Info must not emit trace_id — that's how
 // "log line came from outside a request" stays distinguishable.
 func TestBgOmitsTraceID(t *testing.T) {
diff --git a/internal/obs/log/background.go b/internal/obs/log/background.go
index f999bb9a3..9e0406a95 100644
--- a/internal/obs/log/background.go
+++ b/internal/obs/log/background.go
@@ -7,31 +7,11 @@ import (
 // StartBackgroundTrace returns a child ctx carrying a fresh Carrier
 // so any log under it picks up a stable trace_id. Use at the top of
 // every non-HTTP logical-request entrypoint (sweeper tick, WS envelope
-// handler, CLI command). For a sub-step that should keep the trace,
-// use ChildSpan instead.
-func StartBackgroundTrace(parent context.Context, op string) (context.Context, Carrier) {
+// handler, CLI command).
+func StartBackgroundTrace(parent context.Context) (context.Context, Carrier) {
 	if parent == nil {
 		parent = context.Background()
 	}
 	c := NewCarrier()
-	ctx := WithTrace(parent, c)
-	if op != "" {
-		_ = op
-	}
-	return ctx, c
-}
-
-// ChildSpan returns a ctx with the parent's trace_id and a fresh span_id.
-// If the parent has no carrier, behaves like StartBackgroundTrace so
-// callers don't have to branch on presence.
-func ChildSpan(parent context.Context) (context.Context, Carrier) {
-	if parent == nil {
-		parent = context.Background()
-	}
-	if existing, ok := TraceFromContext(parent); ok {
-		child := existing.ChildSpan()
-		return WithTrace(parent, child), child
-	}
-	c := NewCarrier()
 	return WithTrace(parent, c), c
 }
diff --git a/internal/obs/log/carrier.go b/internal/obs/log/carrier.go
index dc6702632..1b4185163 100644
--- a/internal/obs/log/carrier.go
+++ b/internal/obs/log/carrier.go
@@ -30,11 +30,6 @@ func NewCarrier() Carrier {
 	}
 }
 
-// ChildSpan returns a Carrier sharing this Trace but with a fresh Span.
-func (c Carrier) ChildSpan() Carrier {
-	return Carrier{Trace: c.Trace, Span: NewSpanID(), Sampled: c.Sampled}
-}
-
 // String formats the Carrier as a W3C traceparent. Returns "" for a
 // zero-trace Carrier so callers can use it as a presence check.
 func (c Carrier) String() string {
diff --git a/internal/obs/log/context.go b/internal/obs/log/context.go
index 9b2c4fcdd..0fbdfd242 100644
--- a/internal/obs/log/context.go
+++ b/internal/obs/log/context.go
@@ -66,10 +66,6 @@ type ctxLogger struct {
 	ctx context.Context
 }
 
-func (l ctxLogger) Debug(msg string, args ...any) {
-	slog.Default().DebugContext(l.ctx, msg, args...)
-}
-
 func (l ctxLogger) Info(msg string, args ...any) {
 	slog.Default().InfoContext(l.ctx, msg, args...)
 }
@@ -81,9 +77,3 @@ func (l ctxLogger) Warn(msg string, args ...any) {
 func (l ctxLogger) Error(msg string, args ...any) {
 	slog.Default().ErrorContext(l.ctx, msg, args...)
 }
-
-// With returns a slog.Logger with the supplied attrs bound. Ctx-derived
-// trace attrs still apply on subsequent InfoContext calls.
-func (l ctxLogger) With(args ...any) *slog.Logger {
-	return slog.Default().With(args...)
-}
diff --git a/internal/obs/log/discard.go b/internal/obs/log/discard.go
deleted file mode 100644
index 97fef6a5b..000000000
--- a/internal/obs/log/discard.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package log
-
-import (
-	"io"
-	"log/slog"
-)
-
-// Discard returns a *slog.Logger that drops every record. Wrapped in
-// ContextHandler so tests behave identically to production.
-func Discard() *slog.Logger {
-	inner := slog.NewTextHandler(io.Discard, &slog.HandlerOptions{Level: slog.LevelError + 1})
-	return slog.New(NewContextHandler(inner))
-}
diff --git a/internal/obs/log/http_test.go b/internal/obs/log/http_test.go
index c8930f03b..ca4c998b1 100644
--- a/internal/obs/log/http_test.go
+++ b/internal/obs/log/http_test.go
@@ -84,7 +84,7 @@ func TestHTTPMiddlewareIgnoresMalformedHeader(t *testing.T) {
 }
 
 func TestStartBackgroundTraceMintsFresh(t *testing.T) {
-	ctx, c := StartBackgroundTrace(context.Background(), "test.op")
+	ctx, c := StartBackgroundTrace(context.Background())
 	if c.Trace.IsZero() {
 		t.Fatalf("StartBackgroundTrace returned zero carrier")
 	}
@@ -94,20 +94,6 @@ func TestStartBackgroundTraceMintsFresh(t *testing.T) {
 	}
 }
 
-// TestChildSpanKeepsTraceRotatesSpan: child shares trace_id, has a
-// different span_id.
-func TestChildSpanKeepsTraceRotatesSpan(t *testing.T) {
-	parentCtx, parent := StartBackgroundTrace(context.Background(), "")
-	_, child := ChildSpan(parentCtx)
-	if child.Trace != parent.Trace {
-		t.Fatalf("child should keep trace; parent=%s child=%s",
-			parent.Trace.String(), child.Trace.String())
-	}
-	if child.Span == parent.Span {
-		t.Fatalf("child should rotate span; both=%s", child.Span.String())
-	}
-}
-
 func TestCtxLoggerEmits(t *testing.T) {
 	carrier, _ := ParseTraceparent("00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01")
 	var buf bytes.Buffer
diff --git a/services/core/cmd/oac/init.go b/services/core/cmd/oac/init.go
index 432d9da60..9128bc68b 100644
--- a/services/core/cmd/oac/init.go
+++ b/services/core/cmd/oac/init.go
@@ -138,7 +138,7 @@ type installReceipt struct {
 }
 
 func initialize(root string, release releaseIdentity, fetch func() (map[string][]byte, error)) (err error) {
-	ctx, _ := log.StartBackgroundTrace(context.Background(), "installation.init")
+	ctx, _ := log.StartBackgroundTrace(context.Background())
 	logger := log.With("component", "oac-init", "revision", release.revision)
 	started := time.Now()
 	step, stepStarted := "prepare_directories", started
diff --git a/services/core/deploy/mcode/Dockerfile b/services/core/deploy/mcode/Dockerfile
index df7c80c9a..774c1be79 100644
--- a/services/core/deploy/mcode/Dockerfile
+++ b/services/core/deploy/mcode/Dockerfile
@@ -11,8 +11,6 @@ ENV HOME=/home/runtime OAC_RUNTIME_HOME=/home/runtime/.oac \
     OAC_RUNTIME_MCODE_NODE=/usr/local/bin/node \
     OAC_RUNTIME_MCODE_BIN=/opt/mcode-harness/native/cli.js \
     OAC_RUNTIME_MCODE_WORKSPACE_BRIDGE=/opt/mcode-harness/bridge.mjs \
-    OAC_RUNTIME_MCODE_AGENTS_API=1 \
-    OAC_RUNTIME_MCODE_WORKSPACE=managed \
     OAC_RUNTIME_WORKSPACE=/environment/workspace \
     OAC_RUNTIME_INITIALIZATION_DIRECTORY=/environment/initialization \
     OAC_RUNTIME_PACKAGE_DIRECTORY=/environment/packages
diff --git a/services/core/deploy/mcode/README.md b/services/core/deploy/mcode/README.md
index eed55d773..58cbbcea0 100644
--- a/services/core/deploy/mcode/README.md
+++ b/services/core/deploy/mcode/README.md
@@ -6,7 +6,7 @@ Native tools run with the daemon user's permissions; the outer sandbox provides
 
 ## Native pin and readiness
 
-The adapter accepts only `@minimax-ai/code` `0.4.12` ([`version.go`](../../../../apps/daemon/internal/agent/mcode/version.go)), built from the upstream source revision in [`source.json`](../../../../packages/mcode-harness/source.json) and run with Node.js 22. The daemon advertises MiniMax execution only when `OAC_RUNTIME_MCODE_AGENTS_API=1` and the version matches ([`execution.go`](../../../../apps/daemon/internal/agent/mcode/execution.go)); the native installer and the Runtime image set it. MiniMax Code runs on Linux and macOS.
+The adapter accepts only `@minimax-ai/code` `0.4.12` ([`version.go`](../../../../apps/daemon/internal/agent/mcode/version.go)), built from the upstream source revision in [`source.json`](../../../../packages/mcode-harness/source.json) and run with Node.js 22. MiniMax Code runs on Linux and macOS.
 
 Workspace execution also requires the companion's readiness report: private protocol 2, the pinned native version and the pinned source revision ([`workspace_readiness.go`](../../../../apps/daemon/internal/agent/mcode/workspace_readiness.go)). An older companion is rejected even when the upstream version matches.
 
@@ -47,7 +47,7 @@ In the workspace profile, the frozen installation's Skills are linked into the S
 | Base | Digest-pinned `node:22.23.1-bookworm-slim` with `ca-certificates`, `bash`, `git`, `python3`, `python3-pip` and `ripgrep` |
 | Programs | `/usr/local/bin/oac-daemon` and the companion at `/opt/mcode-harness` (native CLI at `native/cli.js`, bridge at `bridge.mjs`) |
 | User | UID/GID 1000 with `HOME=/home/runtime` |
-| Environment | `OAC_RUNTIME_HOME=/home/runtime/.oac`, `OAC_RUNTIME_MCODE_NODE`, `OAC_RUNTIME_MCODE_BIN`, `OAC_RUNTIME_MCODE_WORKSPACE_BRIDGE`, `OAC_RUNTIME_MCODE_AGENTS_API=1`, `OAC_RUNTIME_WORKSPACE=/environment/workspace`, `OAC_RUNTIME_INITIALIZATION_DIRECTORY=/environment/initialization`, `OAC_RUNTIME_PACKAGE_DIRECTORY=/environment/packages` |
+| Environment | `OAC_RUNTIME_HOME=/home/runtime/.oac`, `OAC_RUNTIME_MCODE_NODE`, `OAC_RUNTIME_MCODE_BIN`, `OAC_RUNTIME_MCODE_WORKSPACE_BRIDGE`, `OAC_RUNTIME_WORKSPACE=/environment/workspace`, `OAC_RUNTIME_INITIALIZATION_DIRECTORY=/environment/initialization`, `OAC_RUNTIME_PACKAGE_DIRECTORY=/environment/packages` |
 | Entry point | `oac-daemon connect --profile default`, working directory `/environment/workspace` |
 
 The build runs the companion's `check.mjs` and the native `--version`. The combined Runtime image uses this image as its base. Sandboxes run it with the [Docker sandbox settings](../../../../docs/sandbox-provider.md#docker-adapter).
diff --git a/services/core/internal/api/installation.go b/services/core/internal/api/installation.go
index 081a3d7ee..229da8835 100644
--- a/services/core/internal/api/installation.go
+++ b/services/core/internal/api/installation.go
@@ -1,15 +1,8 @@
 package api
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
-	"errors"
-	"io"
 	"net/http"
-	"path/filepath"
-	"regexp"
-	"slices"
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
@@ -62,46 +55,6 @@ type InstallationSetting struct {
 	Restarts []string `json:"restarts"`
 }
 
-var installationSettingKey = regexp.MustCompile(`^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)*$`)
-
-const maxInstallationSettings = 64 << 10
-
-// ParseInstallationConfiguration validates the installer's settings snapshot.
-// A sensitive setting that carries a value is rejected, so the snapshot cannot
-// leak a secret through this read.
-func ParseInstallationConfiguration(raw []byte) (*InstallationConfiguration, error) {
-	invalid := errors.New("installation configuration is invalid")
-	if len(raw) > maxInstallationSettings {
-		return nil, invalid
-	}
-	var value InstallationConfiguration
-	decoder := json.NewDecoder(bytes.NewReader(raw))
-	decoder.DisallowUnknownFields()
-	if decoder.Decode(&value) != nil || decoder.Decode(new(any)) != io.EOF {
-		return nil, invalid
-	}
-	if value.Path != "" && !filepath.IsAbs(value.Path) || len(value.ApplyCommand) > 4096 || value.Settings == nil {
-		return nil, invalid
-	}
-	if value.Path != "" && (value.ApplyCommand == "" || value.AppliedAt == nil || value.AppliedAt.IsZero()) {
-		return nil, invalid
-	}
-	seen := make(map[string]bool, len(value.Settings))
-	for _, setting := range value.Settings {
-		if !installationSettingKey.MatchString(setting.Key) || seen[setting.Key] || setting.Restarts == nil ||
-			setting.Sensitive != (setting.Configured != nil) || (setting.Sensitive && (setting.Value != nil || setting.Default != nil)) {
-			return nil, invalid
-		}
-		for _, service := range setting.Restarts {
-			if !slices.Contains([]string{"core", "web", "database"}, service) {
-				return nil, invalid
-			}
-		}
-		seen[setting.Key] = true
-	}
-	return &value, nil
-}
-
 // InstallationBindings counts what is bound to the current public URL.
 type InstallationBindings interface {
 	AddressBindings(context.Context) (deployment.AddressBindings, error)
diff --git a/services/core/internal/api/installation_test.go b/services/core/internal/api/installation_test.go
index 94cd2bf7c..721703bf8 100644
--- a/services/core/internal/api/installation_test.go
+++ b/services/core/internal/api/installation_test.go
@@ -19,12 +19,7 @@ func TestInstallationReadNeedsOnlyTheCoreKey(t *testing.T) {
 	fakes.projectsReader.resolveAPIKey = projectKeys(t, callerBinding()).ResolveAPIKey
 	deps.CoreKeys = coreKeys(t, "administrator")
 	public, id := "https://core.example", "5b7c0f3e-0000-4000-8000-000000000001"
-	settings, err := ParseInstallationConfiguration([]byte(`{"path":"/home/alice/.oac/core/config.json","apply_command":"/home/alice/.oac/core/oac apply",
-		"applied_at":"2026-09-25T09:30:00Z","settings":[{"key":"ports.core","value":8091,"default":8091,"changeable":true,"sensitive":false,"restarts":["core"]},
-		{"key":"core.runtime_history.headers","value":null,"default":null,"configured":true,"changeable":true,"sensitive":true,"restarts":["core"]}]}`))
-	if err != nil {
-		t.Fatal(err)
-	}
+	settings := &InstallationConfiguration{Path: "/home/alice/.oac/core/config.json", Settings: []InstallationSetting{{Key: "ports.core", Value: 8091, Default: 8091, Changeable: true, Restarts: []string{"core"}}}}
 	fakes.installationBindings.addressBindings = func(context.Context) (deployment.AddressBindings, error) {
 		return deployment.AddressBindings{Nodes: 2, NodesOnOtherAddress: 1}, nil
 	}
@@ -50,19 +45,6 @@ func TestInstallationReadNeedsOnlyTheCoreKey(t *testing.T) {
 	}
 }
 
-func TestInstallationSnapshotCannotCarryASensitiveValue(t *testing.T) {
-	for _, setting := range []string{
-		`{"key":"core.runtime_history.headers","value":{"authorization":"secret"},"default":null,"configured":true,"changeable":true,"sensitive":true,"restarts":["core"]}`,
-		`{"key":"core.runtime_history.headers","value":null,"default":null,"changeable":true,"sensitive":true,"restarts":["core"]}`,
-		`{"key":"ports.core","value":8091,"default":8091,"changeable":true,"sensitive":false,"restarts":["core"],"unknown":true}`,
-	} {
-		raw := `{"path":"/c/config.json","apply_command":"/c/oac apply","applied_at":"2026-09-25T09:30:00Z","settings":[` + setting + `]}`
-		if _, err := ParseInstallationConfiguration([]byte(raw)); err == nil || strings.Contains(err.Error(), "secret") {
-			t.Fatal("accepted", setting, err)
-		}
-	}
-}
-
 func TestDeploymentAddressIsNotInput(t *testing.T) {
 	deps, fakes := sandboxFakes(t)
 	initializations := 0
diff --git a/services/core/internal/engine/configuration_test.go b/services/core/internal/engine/configuration_test.go
index 61df5799d..74de79937 100644
--- a/services/core/internal/engine/configuration_test.go
+++ b/services/core/internal/engine/configuration_test.go
@@ -17,7 +17,7 @@ func TestProviderDeclarationsAgreeWithAdmission(t *testing.T) {
 			for _, protocol := range []string{"responses", "anthropic", "unknown"} {
 				provider, supported := declared.Provider(protocol)
 				input := v1.ModelProviderInput{Protocol: protocol, BaseURL: "https://example.test", APIKey: "private-fixture", ContextWindow: 100, MaxOutputTokens: 20}
-				if (input.ValidateHarness(kind) == nil) != supported || (v1.ValidateModelProtocol(protocol, kind) == nil) != supported {
+				if (input.ValidateHarness(kind) == nil) != supported {
 					t.Fatalf("protocol %q disagrees with validation", protocol)
 				}
 				if !supported {
diff --git a/services/core/internal/runtimegateway/session.go b/services/core/internal/runtimegateway/session.go
index 6e7f0f707..4643526a9 100644
--- a/services/core/internal/runtimegateway/session.go
+++ b/services/core/internal/runtimegateway/session.go
@@ -140,16 +140,11 @@ type Session struct {
 	closed    chan struct{}
 }
 
-// NewSession wires a freshly-upgraded WS connection into a Session.
-// The session does NOT start its goroutines automatically — Start runs
-// once the handler is ready so the session can't race with response writes.
-func NewSession(conn WSConn, deviceID, workspaceID, daemonVersion string, reg *Registry, log SessionLogger) *Session {
-	return NewSessionWithOwner(conn, deviceID, workspaceID, daemonVersion, reg, log, nil)
-}
-
-// NewSessionWithOwner wires a session with an optional DB-backed owner
-// lease. Multi-pod deployments pass the lease returned by
-// ClaimAgentDaemonDeviceOwner so heartbeats can fence stale connections.
+// NewSessionWithOwner wires a freshly-upgraded WS connection into a Session
+// with an optional DB-backed owner lease. Multi-pod deployments pass the lease
+// returned by ClaimAgentDaemonDeviceOwner so heartbeats can fence stale
+// connections. The session does NOT start its goroutines automatically — Start
+// runs once the handler is ready so the session can't race with response writes.
 func NewSessionWithOwner(conn WSConn, deviceID, workspaceID, daemonVersion string, reg *Registry, log SessionLogger, owner *ownerLease) *Session {
 	if log == nil {
 		log = func(string, ...any) {}
diff --git a/services/core/internal/runtimegateway/session_test.go b/services/core/internal/runtimegateway/session_test.go
index 71eaca263..e32150e4b 100644
--- a/services/core/internal/runtimegateway/session_test.go
+++ b/services/core/internal/runtimegateway/session_test.go
@@ -14,6 +14,11 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 )
 
+// NewSession builds an unowned Session over a test connection.
+func NewSession(conn WSConn, deviceID, workspaceID, daemonVersion string, reg *Registry, log SessionLogger) *Session {
+	return NewSessionWithOwner(conn, deviceID, workspaceID, daemonVersion, reg, log, nil)
+}
+
 // fakeConn is the WSConn implementation used by session + registry
 // tests. Concurrency-safe.
 type fakeConn struct {
diff --git a/services/core/internal/sandbox/deployment.go b/services/core/internal/sandbox/deployment.go
index 95b146cc0..712d9e27b 100644
--- a/services/core/internal/sandbox/deployment.go
+++ b/services/core/internal/sandbox/deployment.go
@@ -67,11 +67,6 @@ type RuntimeRelease struct {
 	FirmwareSHA256      string `json:"firmware_sha256"`
 }
 
-func lowerHex(v string, bytes int) bool {
-	x, err := hex.DecodeString(v)
-	return err == nil && len(x) == bytes && hex.EncodeToString(x) == v
-}
-
 func (r RuntimeRelease) Validate() error {
 	values := reflect.ValueOf(r)
 	for i, rule := range runtimeContract {
diff --git a/services/core/internal/sandbox/e2b/provider.go b/services/core/internal/sandbox/e2b/provider.go
index c368d8866..3328eb0db 100644
--- a/services/core/internal/sandbox/e2b/provider.go
+++ b/services/core/internal/sandbox/e2b/provider.go
@@ -141,7 +141,6 @@ func (c Config) Validate() error {
 	}
 	return nil
 }
-func New(c Config) (*Provider, error) { return NewWithCaller(c, &ProcessCaller{}) }
 func NewWithCaller(c Config, caller Caller) (*Provider, error) {
 	if c.Validate() != nil || caller == nil {
 		return nil, sandbox.ErrInvalid
diff --git a/services/core/internal/sandbox/microsandbox/provider.go b/services/core/internal/sandbox/microsandbox/provider.go
index d6df19ec7..6ba4eeafc 100644
--- a/services/core/internal/sandbox/microsandbox/provider.go
+++ b/services/core/internal/sandbox/microsandbox/provider.go
@@ -18,7 +18,6 @@ type Provider struct {
 var _ sandbox.SandboxProvider = (*Provider)(nil)
 var _ sandbox.CheckpointProvider = (*Provider)(nil)
 
-func New(c Config) (*Provider, error) { return NewWithCaller(c, &ProcessCaller{}) }
 func NewWithCaller(c Config, caller Caller) (*Provider, error) {
 	if c.Validate() != nil || caller == nil {
 		return nil, sandbox.ErrInvalid
diff --git a/services/core/internal/sandbox/node/capacity_test.go b/services/core/internal/sandbox/node/capacity_test.go
index 1de42f08a..c408cb82a 100644
--- a/services/core/internal/sandbox/node/capacity_test.go
+++ b/services/core/internal/sandbox/node/capacity_test.go
@@ -34,7 +34,7 @@ func TestCapacityRefreshUsesAuthenticatedCoreIdentity(t *testing.T) {
 	if err != nil || refreshed.Identity.MaxActive != 2 || refreshed.Identity.MaxRetained != 8 || refreshed.Credential != stored.Credential {
 		t.Fatal("approved capacity not refreshed", err)
 	}
-	persisted, err := LoadIdentity(dir)
+	persisted, err := readIdentity(dir)
 	if err != nil || persisted != refreshed {
 		t.Fatal("approved capacity not persisted", err)
 	}
@@ -42,7 +42,7 @@ func TestCapacityRefreshUsesAuthenticatedCoreIdentity(t *testing.T) {
 	if _, err = RefreshIdentity(t.Context(), dir); err == nil {
 		t.Fatal("foreign identity accepted")
 	}
-	after, _ := LoadIdentity(dir)
+	after, _ := readIdentity(dir)
 	if after != persisted {
 		t.Fatal("rejected response changed retained identity")
 	}
diff --git a/services/core/internal/sandbox/node/docker_live_test.go b/services/core/internal/sandbox/node/docker_live_test.go
index 5862b308c..13ab16b51 100644
--- a/services/core/internal/sandbox/node/docker_live_test.go
+++ b/services/core/internal/sandbox/node/docker_live_test.go
@@ -140,7 +140,7 @@ func TestDockerNodeTransportLifecycle(t *testing.T) {
 	}
 	running = false
 	wait(t, func() bool { return !hub.Online(id.NodeID) })
-	persisted, err := LoadIdentity(dir)
+	persisted, err := readIdentity(dir)
 	if err != nil || persisted.Credential != credential || persisted.Identity.NodeID != id.NodeID {
 		t.Fatal("node restart changed identity", err)
 	}
diff --git a/services/core/internal/sandbox/node/identity.go b/services/core/internal/sandbox/node/identity.go
index ec24276a7..3b556033e 100644
--- a/services/core/internal/sandbox/node/identity.go
+++ b/services/core/internal/sandbox/node/identity.go
@@ -140,14 +140,6 @@ func initIdentity(dir, coreURL string, identity Identity) (StoredIdentity, error
 	}
 	return stored, nil
 }
-func LoadIdentity(dir string) (StoredIdentity, error) {
-	release, err := lockDirectory(dir)
-	if err != nil {
-		return StoredIdentity{}, err
-	}
-	defer release()
-	return readIdentity(dir)
-}
 
 func endpoint(raw, path string) (string, error) {
 	u, err := url.Parse(raw)
diff --git a/services/core/internal/sandbox/node/node_test.go b/services/core/internal/sandbox/node/node_test.go
index 977d00c89..aab23036f 100644
--- a/services/core/internal/sandbox/node/node_test.go
+++ b/services/core/internal/sandbox/node/node_test.go
@@ -120,7 +120,8 @@ func TestLostCreateResponseDoesNotReplayAndReconnectSerializesCleanup(t *testing
 		}
 	}()
 	wait(t, func() bool { return hub.Online(id.NodeID) })
-	if _, err := LoadIdentity(dir); err == nil {
+	if release, err := lockDirectory(dir); err == nil {
+		release()
 		t.Fatal("running node did not retain lifetime identity lock")
 	}
 	r := reference()
@@ -218,7 +219,7 @@ func TestAgentRejectsDuplicateSequenceAndRetainsEpoch(t *testing.T) {
 	if reads != 1 {
 		t.Fatalf("replayed operation %d", reads)
 	}
-	persisted, e := LoadIdentity(dir)
+	persisted, e := readIdentity(dir)
 	if e != nil || persisted.OwnerEpoch != 9 {
 		t.Fatalf("epoch not retained: %+v %v", persisted.Identity, e)
 	}
diff --git a/services/core/internal/sandbox/node/recovery_test.go b/services/core/internal/sandbox/node/recovery_test.go
index 23ba863e3..d150b6422 100644
--- a/services/core/internal/sandbox/node/recovery_test.go
+++ b/services/core/internal/sandbox/node/recovery_test.go
@@ -68,7 +68,7 @@ func TestCoreRestartFencesOldConnectionAndNodeRestartKeepsIdentity(t *testing.T)
 		t.Fatal(err)
 	}
 	wait(t, func() bool { return !second.Online(id.NodeID) })
-	persisted, err := LoadIdentity(dir)
+	persisted, err := readIdentity(dir)
 	if err != nil || persisted.OwnerEpoch != 5 || persisted.Credential != credential {
 		t.Fatal("restart identity changed")
 	}
@@ -264,7 +264,7 @@ func TestCorruptOrMismatchedIdentityNeverRotates(t *testing.T) {
 	if _, err = InitIdentity(dir, stored.CoreURL, mismatch); err == nil {
 		t.Fatal("adopted wrong backend")
 	}
-	original, err := LoadIdentity(dir)
+	original, err := readIdentity(dir)
 	if err != nil || original.Credential != stored.Credential {
 		t.Fatal("credential rotated")
 	}
@@ -274,10 +274,4 @@ func TestCorruptOrMismatchedIdentityNeverRotates(t *testing.T) {
 	if _, err = InitIdentity(dir, stored.CoreURL, id); err == nil {
 		t.Fatal("corrupt identity replaced")
 	}
-	if err = os.Remove(filepath.Join(dir, "identity.json")); err != nil {
-		t.Fatal(err)
-	}
-	if _, err = LoadIdentity(dir); err == nil {
-		t.Fatal("missing identity recreated by load")
-	}
 }
diff --git a/services/core/tests/integration/mcode_public_native_test.go b/services/core/tests/integration/mcode_public_native_test.go
index 85ed9fca6..f592fc60e 100644
--- a/services/core/tests/integration/mcode_public_native_test.go
+++ b/services/core/tests/integration/mcode_public_native_test.go
@@ -132,7 +132,7 @@ func startNativeEngineDaemon(t *testing.T, h *dispatchHarness, home, binary, eng
 	}
 	old, _ := h.registry.LookupDevice(h.device.ID)
 	cmd := exec.Command(binary, "connect", "--profile", "execution")
-	cmd.Env = append(os.Environ(), "OAC_RUNTIME_HOME="+home, "OAC_RUNTIME_MCODE_AGENTS_API=1")
+	cmd.Env = append(os.Environ(), "OAC_RUNTIME_HOME="+home)
 	cmd.Stdout, cmd.Stderr = log, log
 	if err = cmd.Start(); err != nil {
 		log.Close()

From 06b7dd260255e035959aaba8400756d7a8c9ccfe Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 22:59:21 +0800
Subject: [PATCH 34/60] Delete the empty installation configuration fields
 (#500)

---
 apps/web/DESIGN.md                            |  6 +-
 apps/web/PRODUCT.md                           |  2 +-
 apps/web/e2e/fixture-console.mjs              |  3 +-
 apps/web/e2e/public-url.spec.ts               |  3 +-
 .../components/InstallationNotice.test.tsx    |  2 +-
 .../src/features/system/StartupSettings.tsx   | 93 ++++++++-----------
 apps/web/src/features/system/system.css       | 33 -------
 apps/web/src/i18n/locales/en/system.ts        |  5 -
 apps/web/src/i18n/locales/zh-CN/system.ts     |  5 -
 apps/web/src/lib/locale-strings.ts            |  3 -
 contracts/agents-api/admin-api.md             |  2 +-
 contracts/agents-api/core.openapi.yaml        | 13 +--
 contracts/agents-api/zh/admin-api.md          |  4 +-
 docs/web/console-api-usage.md                 |  6 +-
 docs/zh/web/console-api-usage.md              |  8 +-
 .../agents-client/src/admin-client.test.ts    |  7 +-
 .../agents-client/src/admin-projection.ts     | 15 +--
 packages/agents-client/src/admin-types.ts     | 12 +--
 services/core/cmd/server/installation.go      |  2 +-
 services/core/internal/api/installation.go    | 17 +---
 .../core/internal/api/installation_test.go    |  4 +-
 21 files changed, 74 insertions(+), 171 deletions(-)

diff --git a/apps/web/DESIGN.md b/apps/web/DESIGN.md
index 86c08ae95..d4430a411 100644
--- a/apps/web/DESIGN.md
+++ b/apps/web/DESIGN.md
@@ -399,7 +399,7 @@ On Overview and Session log, failed reads that leave a section unavailable repla
 
 A failed action whose outcome needs a decision (a sandbox change with no answer, a timeout or a 5xx) opens an error dialog with the reason and the next step as its primary button. Failed refreshes and project reads also raise an error toast; other failed actions, Core's clear refusal of a sandbox change among them, are reported there with the reason. A refusal leaves the page usable as it was. Errors inside a dialog or a form stay beside what they concern. Coverage notes (Margin Gray, Hairline ring, 8px corners, 12.5px Graphite) state bounded aggregation. Standing warnings that need action use an amber-tinted line at the top of the page body. On Nodes, this names nodes still bound to an old Core address; each of those nodes' status reads Old address (amber dot) with "Remove and add again" under it in 12px Graphite. Partial-data chips are amber-tinted pills with a help tip. Safety notices (a key shown once, a destructive consequence) stay visible in body text.
 
-A local-only installation has the same amber notice on Overview, Nodes and System: other machines cannot connect, followed by Core's configuration path and apply command as copyable values. If Core has no configuration snapshot, state that those instructions are unavailable; never fill in a path or command. Add node is disabled with its reason beside the action, and Getting started leaves its first step to do with the address fix visible. A pending or failed installation read cannot complete that step; a failed read shows Unknown and Retry.
+A local-only installation has the same amber notice on Overview, Nodes and System: other machines cannot connect, followed by Review the public address, which leads to System. Add node is disabled with its reason beside the action, and Getting started leaves its first step to do with the address fix visible. A pending or failed installation read cannot complete that step; a failed read shows Unknown and Retry.
 
 ### Onboarding
 Signing in and the console tour share one frame: a dark stage on the left (always dark, whatever the theme) and the task panel on the right, which follows the theme. The stage is the product's one authored moment: a flickering indigo dot grid under slow light rays (Magic UI's flickering grid and light rays), Core as the OpenAgentCore mark on a tile with a travelling border beam, and two orbits of Agents, Sessions, Skills, Vaults, files, templates and machines around it; the OpenAgentCore mark is itself nodes on a ring. Brand copy sits bottom-left in solid ink; it is a paragraph, not a heading, because the panel's title names the task. Signing in asks for one thing, the deployment's Core key, in a single password field; a copyable Docker Compose command to read the key stays visible beneath it, with a reminder to substitute a custom installation directory. The key’s authority stays in a help tip. A refused key, too many attempts or an unavailable console is an error beside the field. Signing in opens the console on the Overview. The optional tour has three chapters — Monitor, Resources, Platform — whose stage shows a real dark screenshot of those pages, tilted towards the panel; it takes the place of the console until its last button, Skip or Escape, and then returns the focus to the control that opened it. Entering the console or the tour, and leaving the tour, happen inside a View Transition: the old page dissolves forward and the new one is revealed in a circle growing from the pressed button. With reduced motion the orbits hold their places, the grid is a still frame and no transition runs.
@@ -408,7 +408,7 @@ Signing in and the console tour share one frame: a dark stage on the left (alway
 The first card on the Overview while any step is to do: a card header ("Getting started", "n of 4 done", a help tip, then a ghost Take the tour button and an icon button that hides it) over four rows split by Faint Rules. Each row has a 22px numbered ring (a check on the tile wash when done), a 13px/600 title over one 12.5px Graphite line, a status dot (Done in green, To do in Pencil, Checking pending, Unknown for a failed read) and one outline action while the step is to do: Set up sandboxes, Add node, Open Nodes or Open sandbox backend; Open System; Create project (which continues to the new project's first key) or Issue key; See how to call (the newest active project, preferring one with an active key), or Projects and keys without an active project. Add node, Create project and Issue key open their page with the dialog already open; Open System brings the Default model provider section to the top of the page body and focuses the default harness's Set or Replace; See how to call opens the project and, once its keys, usage and address are read, brings its How to call heading to the top of the page body, focused. Only the page body scrolls; the page header stays. Every step done turns it into one line, "You're set", with Take the tour and Dismiss; it stays, through the tour, until dismissed, and the checklist does not come back on its own. The choice is kept per installation in the browser, also while the deployment cannot be read; Show Getting started, a quiet row above the sidebar's account controls, opens it again at any time.
 
 ### Sandbox setup
-Setting up hosted sandboxes is a set of pages inside System’s Sandbox configuration secondary page, one decision each: where sandboxes run (own machines or E2B), then the backend or the E2B account, then the size of each sandbox (three presets; E2B skips it, since each sandbox takes the template build's size), then a review. Choices are large cards that advance on a click; short indigo dashes show the progress; pages slide and blur across. The backend page compares microsandbox and Docker behind a help tip; microsandbox comes first, preselected (a saved backend stays selected), with a neutral Recommended pill beside its title. Docker takes a confirmation (see Dialogs) once per visit to setup; a saved Docker deployment has already made it. The review states where sandboxes run, the size, the Runtime (taken from this console's distribution manifest) and the Core address, read-only: it is config.json's `public_url`, and the console never asks for it. A loopback address carries an amber line under it: only the Core machine reaches it. When Core rejects the configuration for it (E2B with a loopback `public_url`), a red-tinted block under the review keeps Core's message and adds the config file and apply command as copyable values. A save attempt clears the transient E2B key. Initial setup then asks for it again, with a link to that step; an update may leave it blank to keep the committed key. Advanced settings, one link away, hold the complete form: resources (not for E2B), the Runtime release and the E2B template. A change keeps the saved size and Runtime while the backend stays the same (a saved size outside the presets is offered as Current). Same-backend editing starts at size or E2B credentials with the provider fixed. It is an online configuration update, including when older sandboxes remain: existing node identities and resource ownership are retained. Changing the backend or E2B team requires reset and then a new setup. E2B updates can omit the key to retain it; every explicitly entered key takes the verified replacement path and advances the target generation on success, including the same value. Rejections remain inline with a safe reason and a deliberate way back to reset; never infer teams from a key, auto-reset or auto-resubmit. Optional explanations sit behind help tips; errors and safety consequences remain visible.
+Setting up hosted sandboxes is a set of pages inside System’s Sandbox configuration secondary page, one decision each: where sandboxes run (own machines or E2B), then the backend or the E2B account, then the size of each sandbox (three presets; E2B skips it, since each sandbox takes the template build's size), then a review. Choices are large cards that advance on a click; short indigo dashes show the progress; pages slide and blur across. The backend page compares microsandbox and Docker behind a help tip; microsandbox comes first, preselected (a saved backend stays selected), with a neutral Recommended pill beside its title. Docker takes a confirmation (see Dialogs) once per visit to setup; a saved Docker deployment has already made it. The review states where sandboxes run, the size, the Runtime (taken from this console's distribution manifest) and the Core address, read-only: it is config.json's `public_url`, and the console never asks for it. A loopback address carries an amber line under it: only the Core machine reaches it. When Core rejects the configuration for it (E2B with a loopback `public_url`), a red-tinted block under the review keeps Core's message and adds Managed in System, which leads to System. A save attempt clears the transient E2B key. Initial setup then asks for it again, with a link to that step; an update may leave it blank to keep the committed key. Advanced settings, one link away, hold the complete form: resources (not for E2B), the Runtime release and the E2B template. A change keeps the saved size and Runtime while the backend stays the same (a saved size outside the presets is offered as Current). Same-backend editing starts at size or E2B credentials with the provider fixed. It is an online configuration update, including when older sandboxes remain: existing node identities and resource ownership are retained. Changing the backend or E2B team requires reset and then a new setup. E2B updates can omit the key to retain it; every explicitly entered key takes the verified replacement path and advances the target generation on success, including the same value. Rejections remain inline with a safe reason and a deliberate way back to reset; never infer teams from a key, auto-reset or auto-resubmit. Optional explanations sit behind help tips; errors and safety consequences remain visible.
 
 ### Configuration generations
 A single rollout row opens a details dialog for Core's target generation, previous-generation sandboxes and rollout counts. Poll rapidly only while Core reports preparing, or while the independent reset is active. Settled is preparation state, not proof that all nodes are ready or all older Sessions have ended. Retained old resources alone must not keep rapid polling alive. Render failed, update-required and unknown target states distinctly. Keep offline/live-provider status separate from a node's durable serving-generation pin; the pin alone never means the node is online or ready. Node detail shows the serving generation and target preparation; allocation detail shows the owned configuration generation. Do not calculate rollout completion from these rows or promise immediate placement on the target.
@@ -423,7 +423,7 @@ A persistent progress panel uses Core's busy, idle and cleanup counts, deadline
 Read deployment progress independently of node details. Partial failures retain successful facts with a visible stale/unavailable notice. An uncertain write opens the recovery dialog and requires a new authoritative read before another mutation; refresh reads state and never resubmits the write. The connection's QueryClient owns both the authoritative deployment and pending or uncertain writes across route transitions. Leaving Sandbox configuration cannot cancel or forget a submitted reset, and a cached node snapshot cannot replace a newer reset or completion learned on Overview. Returning to Nodes or Sandbox configuration reads the shared deployment immediately and refreshes node evidence separately. Only a successful authoritative read begun after the write settles can release the mutation block; an earlier or still-pending read cannot. Submitting consumes the reset confirmation even if its outcome is uncertain; recovery uses the separate read-and-review dialog. Observation retries preserve applicable non-secret configuration drafts. A changed installation, owner epoch, backend, mode or generation discards the prior draft and confirmation. Logout clears this connection-scoped state.
 
 ### System page
-Four sections, each saying where it changes. Installation: the public address, API base URL, installation ID and source commit as a fact card, with an outline action that opens the Domain and HTTPS secondary page. Default model configuration, the one section changed here: one card per harness in an auto-fill grid, its header holding the harness name and outline actions (Set, or Replace and Clear); fact rows give the harness's read-only startup state (a status dot and a Default pill, its source behind a help tip), then the default model ID, provider protocol, base URL, whether a key is configured, token limits when set and the update time, or Not set. Set and Replace open one form dialog. The model ID is required; advanced settings disclose an optional JSON object editor with formatting and inline syntax errors, plus token limits. The harness list supplies supported protocols, native protocols, JSON support and required limits from one adapter declaration. The form uses those fields without harness-specific branches. Nonempty JSON requires a native protocol; the form explains an incompatible selection beside the editor. Help tips explain the scope of native settings. Changing the model ID, provider URL or protocol clears the native JSON so settings cannot follow an unrelated model by accident. Re-entering the required write-only API key alone does not change model identity. The key field is a required password input, never prefilled or shown and forgotten when the form closes. Core's rejection stays in red inside the form; Clear is a ConfirmDialog. Usage details opens Core’s observations in a separate dialog. Sandboxes: one navigation row to the Sandbox configuration secondary page; do not repeat its configuration facts on System. Startup settings: a line naming the config file and the apply command as copyable chips, with when they were last applied, over a table of each setting, its value and the services a change restarts. Sensitive settings show only Configured or Not set; Default and Fixed after install are neutral pills beside the value.
+Four sections; the page help says where sandboxes and startup settings change. Installation: the public address, API base URL, installation ID and source commit as a fact card, with an outline action that opens the Domain and HTTPS secondary page. Default model configuration, the one section changed here: one card per harness in an auto-fill grid, its header holding the harness name and outline actions (Set, or Replace and Clear); fact rows give the harness's read-only startup state (a status dot and a Default pill, its source behind a help tip), then the default model ID, provider protocol, base URL, whether a key is configured, token limits when set and the update time, or Not set. Set and Replace open one form dialog. The model ID is required; advanced settings disclose an optional JSON object editor with formatting and inline syntax errors, plus token limits. The harness list supplies supported protocols, native protocols, JSON support and required limits from one adapter declaration. The form uses those fields without harness-specific branches. Nonempty JSON requires a native protocol; the form explains an incompatible selection beside the editor. Help tips explain the scope of native settings. Changing the model ID, provider URL or protocol clears the native JSON so settings cannot follow an unrelated model by accident. Re-entering the required write-only API key alone does not change model identity. The key field is a required password input, never prefilled or shown and forgotten when the form closes. Core's rejection stays in red inside the form; Clear is a ConfirmDialog. Usage details opens Core’s observations in a separate dialog. Sandboxes: one navigation row to the Sandbox configuration secondary page; do not repeat its configuration facts on System. Startup settings: a line saying these are the settings Core loaded, over a table of each setting, its value and the services a change restarts. Sensitive settings show only Configured or Not set; Default and Fixed after install are neutral pills beside the value.
 
 ### One place for each task
 A configuration or operation has one home. Other pages link to it instead of repeating the same panel. System links to the Sandbox configuration secondary page; Nodes contains node management. Keep the configuration page flat: the resource editor is a dialog, and rollout is one status row with a details action. Put low-frequency counts and generation metadata in that dialog. Explanatory prose belongs in help tips, not rows of small print. Keep actionable errors and unresolved state visible without duplicating the whole workflow.
diff --git a/apps/web/PRODUCT.md b/apps/web/PRODUCT.md
index 090ca06fd..b1fe280d9 100644
--- a/apps/web/PRODUCT.md
+++ b/apps/web/PRODUCT.md
@@ -59,7 +59,7 @@ The console runs beside the administrator's own Core, with execution, files and
 - **Connect a host.** The Linux/macOS and PowerShell commands come from Core's installation read for the Session's environment; the console shows them as they are, with a link to the native installation guide, and never builds one itself. A command downloads the matching installer, installs the chosen Harnesses, starts the daemon and checks its connection. Its authorization expires after 30 minutes; the console reads a fresh one every 20 minutes, and says the command is unavailable when Core has none. No model readiness is implied. Rotating a credential requires stopping the installed daemon, replacing the configured file and starting that same daemon again. A disconnected daemon may still be running; `start` alone does not replace it.
 - **Typed write errors.** Known Core codes use shared bilingual copy and safe typed details. Exact Core field paths attach definite refusals to the relevant input. Unknown codes retain Core's fallback message; uncertain write outcomes stay form-level and are never retried automatically.
 - **Read failures.** Overview and Session log distinguish unavailable reads from successful empty results. Failed reads have a visible retry; retained or partial data says it may be incomplete or out of date, and Session filter totals stay missing while any required read has failed. Only successful empty reads show zero.
-- **Local-only address.** Overview, Nodes and System warn when Core reports `local_only`, with the configuration path and apply command Core supplies as copyable instructions. Without a configuration snapshot they state what is missing. Add node is unavailable with a reason; Getting started keeps the first step to do until the public address is fixed. An unread installation address cannot complete that step, and a failed read offers Retry.
+- **Local-only address.** Overview, Nodes and System warn when Core reports `local_only` and lead to System to review the public address. Add node is unavailable with a reason; Getting started keeps the first step to do until the public address is fixed. An unread installation address cannot complete that step, and a failed read offers Retry.
 - **Figures.** Project, Agent and key usage comes from Core's summary; Agent run, tool and activity figures are still assembled in the browser from bounded reads and state their coverage. Metrics that would need new Core endpoints are not simulated. Usage is cumulative per Session and is not billing.
 - Runtime CPU and memory exist only for Core-managed hosted sandboxes.
 - Preserve workflow safety: confirmed deletion, no automatic retry of uncertain writes, no secrets in browser storage.
diff --git a/apps/web/e2e/fixture-console.mjs b/apps/web/e2e/fixture-console.mjs
index a3de5cafa..6d57e3cc2 100644
--- a/apps/web/e2e/fixture-console.mjs
+++ b/apps/web/e2e/fixture-console.mjs
@@ -40,7 +40,7 @@ const publicUrl = () => (state.installation === "local" ? LOCAL_URL : PUBLIC_URL
 /** Core reports one installation ID, a canonical UUID, in the installation and the deployment. */
 const INSTALLATION_ID = "7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f";
 
-/** GET /core/v1/installation: the address, the startup settings from config.json and what is bound to the address. */
+/** GET /core/v1/installation: the address, the startup settings Core loaded and what is bound to the address. */
 function installation() {
   const local = state.installation === "local";
   const setting = (key, value, fallback, restarts, extra = {}) => ({ key, value, default: fallback, changeable: true, sensitive: false, restarts, ...extra });
@@ -51,7 +51,6 @@ function installation() {
     object: "core.installation", installation_id: INSTALLATION_ID, public_url: publicUrl(), api_base_url: `${publicUrl()}/v1`,
     local_only: local, source_commit: release.source_commit,
     configuration: {
-      path: "/opt/oac/config.json", apply_command: "sudo oac apply", applied_at: "2026-09-24T09:30:00Z",
       settings: [
         setting("public_url", publicUrl(), LOCAL_URL, ["core", "web"]),
         setting("listen_address", "127.0.0.1:8091", "127.0.0.1:8091", ["core"]),
diff --git a/apps/web/e2e/public-url.spec.ts b/apps/web/e2e/public-url.spec.ts
index 14dda4215..2b3a36a27 100644
--- a/apps/web/e2e/public-url.spec.ts
+++ b/apps/web/e2e/public-url.spec.ts
@@ -42,12 +42,11 @@ test("explains an E2B rejection in the wizard, with a link to domain setup", asy
   await expect(page.getByRole("heading", { name: "Connect E2B" })).toBeVisible();
 });
 
-test("lists the startup settings on System with where to change them", async ({ page, request }) => {
+test("lists the startup settings on System", async ({ page, request }) => {
   await openConsole(page, request, "system");
   const installation = page.getByRole("region", { name: "Installation" });
   await expect(installation).toContainText("https://core.example.com/v1");
   const startup = page.getByRole("region", { name: "Startup settings" });
-  await expect(startup).toContainText("Change these in /opt/oac/config.json, then run sudo oac apply");
   const settings = startup.getByRole("table", { name: "Startup settings" });
   await expect(settings.getByRole("row", { name: /^log_level/ })).toContainText("debug");
   await expect(settings.getByRole("row", { name: /^listen_address/ })).toContainText("Default");
diff --git a/apps/web/src/components/InstallationNotice.test.tsx b/apps/web/src/components/InstallationNotice.test.tsx
index 68efdcef7..81a8ab535 100644
--- a/apps/web/src/components/InstallationNotice.test.tsx
+++ b/apps/web/src/components/InstallationNotice.test.tsx
@@ -5,7 +5,7 @@ import { InstallationNotice } from "./InstallationNotice";
 
 const installation: CoreInstallation = {
   object: "core.installation", installation_id: null, public_url: "http://127.0.0.1:8091", api_base_url: "http://127.0.0.1:8091/v1",
-  source_commit: null, local_only: true, configuration: null,
+  source_commit: null, local_only: true, configuration: { settings: [] },
   address_bindings: { nodes: 0, nodes_on_other_address: 0, hosted_sandboxes: 0, self_hosted_executors: 0 },
 };
 
diff --git a/apps/web/src/features/system/StartupSettings.tsx b/apps/web/src/features/system/StartupSettings.tsx
index 9d999e2f5..b506b7364 100644
--- a/apps/web/src/features/system/StartupSettings.tsx
+++ b/apps/web/src/features/system/StartupSettings.tsx
@@ -1,10 +1,8 @@
 import type { CoreInstallationConfiguration, CoreInstallationSetting } from "@oac/agents-client";
-import { Trans, useTranslation } from "react-i18next";
+import { useTranslation } from "react-i18next";
 
 import { ValuePill } from "../../components/atoms/ValuePill";
 import { Section } from "../../components/console-ui";
-import { CopyableId } from "../../components/list-ui";
-import { formatDateTime } from "../../lib/format";
 
 function display(value: unknown): string | null {
   if (value === null || value === undefined) return null;
@@ -16,62 +14,45 @@ function isDefault(setting: CoreInstallationSetting): boolean {
 }
 
 /**
- * Platform › System: Core's startup settings, read-only. They live in
- * config.json and take effect with the apply command; the console only says
- * where to change them. A sensitive setting shows whether it is set, never
- * its value.
+ * Platform › System: the process settings Core loaded, read-only. A
+ * sensitive setting shows whether it is set, never its value.
  */
-export function StartupSettings({ configuration }: { configuration: CoreInstallationConfiguration | null }) {
-  const { t, i18n } = useTranslation("system");
-  const locale = i18n.resolvedLanguage;
+export function StartupSettings({ configuration }: { configuration: CoreInstallationConfiguration }) {
+  const { t } = useTranslation("system");
   return (
     <Section headingId="system-startup-heading" title={t("startup.title")} help={t("startup.help")}>
-      {configuration === null ? <p className="system-note">{t("startup.none")}</p> : <>
-        <p className="system-where">
-          {configuration.path ? <span>
-            <Trans
-              t={t}
-              i18nKey="startup.where"
-              components={{
-                path: <CopyableId id={configuration.path} label={t("startup.copyPath")} />,
-                command: <CopyableId id={configuration.apply_command} label={t("startup.copyCommand")} />,
-              }}
-            />
-          </span> : <span>{t("startup.effective")}</span>}
-          {configuration.applied_at ? <span className="system-applied">{t("startup.appliedAt", { time: formatDateTime(Date.parse(configuration.applied_at) / 1000, locale) })}</span> : null}
-        </p>
-        <div className="table-frame">
-          <table className="data-table system-settings" aria-label={t("startup.title")}>
-            <thead>
-              <tr>
-                <th scope="col">{t("startup.columns.key")}</th>
-                <th scope="col">{t("startup.columns.value")}</th>
-                <th scope="col">{t("startup.columns.restarts")}</th>
-              </tr>
-            </thead>
-            <tbody>
-              {configuration.settings.filter((setting) => setting.key !== "public_url").map((setting) => {
-                const value = setting.sensitive ? null : display(setting.value);
-                return (
-                  <tr key={setting.key}>
-                    <th scope="row"><code className="system-code">{setting.key}</code></th>
-                    <td>
-                      <span className="system-setting-value">
-                        {setting.sensitive
-                          ? t(setting.configured ? "startup.configured" : "startup.notSet")
-                          : value === null ? <span className="system-muted">{t("startup.notSet")}</span> : <code className="system-code">{value}</code>}
-                        {isDefault(setting) ? <ValuePill>{t("startup.default")}</ValuePill> : null}
-                        {setting.changeable ? null : <ValuePill>{t("startup.fixed")}</ValuePill>}
-                      </span>
-                    </td>
-                    <td>{setting.restarts.length ? setting.restarts.join(", ") : <span className="system-muted">{t("startup.noRestart")}</span>}</td>
-                  </tr>
-                );
-              })}
-            </tbody>
-          </table>
-        </div>
-      </>}
+      <p className="system-note">{t("startup.effective")}</p>
+      <div className="table-frame">
+        <table className="data-table system-settings" aria-label={t("startup.title")}>
+          <thead>
+            <tr>
+              <th scope="col">{t("startup.columns.key")}</th>
+              <th scope="col">{t("startup.columns.value")}</th>
+              <th scope="col">{t("startup.columns.restarts")}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {configuration.settings.filter((setting) => setting.key !== "public_url").map((setting) => {
+              const value = setting.sensitive ? null : display(setting.value);
+              return (
+                <tr key={setting.key}>
+                  <th scope="row"><code className="system-code">{setting.key}</code></th>
+                  <td>
+                    <span className="system-setting-value">
+                      {setting.sensitive
+                        ? t(setting.configured ? "startup.configured" : "startup.notSet")
+                        : value === null ? <span className="system-muted">{t("startup.notSet")}</span> : <code className="system-code">{value}</code>}
+                      {isDefault(setting) ? <ValuePill>{t("startup.default")}</ValuePill> : null}
+                      {setting.changeable ? null : <ValuePill>{t("startup.fixed")}</ValuePill>}
+                    </span>
+                  </td>
+                  <td>{setting.restarts.length ? setting.restarts.join(", ") : <span className="system-muted">{t("startup.noRestart")}</span>}</td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
+      </div>
     </Section>
   );
 }
diff --git a/apps/web/src/features/system/system.css b/apps/web/src/features/system/system.css
index 1731597a4..07f783f17 100644
--- a/apps/web/src/features/system/system.css
+++ b/apps/web/src/features/system/system.css
@@ -59,45 +59,12 @@
   color: var(--ink-3);
 }
 
-/* Where startup settings are changed: the file and the apply command, both copyable. */
-.system-where {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: baseline;
-  gap: 4px 12px;
-  margin: 0;
-  color: var(--ink-2);
-  font-size: 13px;
-  line-height: 24px;
-}
-
-/* The file and the command read as chips that carry their own copy button. */
-.system-where .copyable-id {
-  margin: 0 2px;
-  padding-left: 8px;
-  vertical-align: middle;
-  background: var(--surface);
-  border-radius: var(--radius-chip);
-  box-shadow: var(--shadow-hairline);
-}
-
-.system-where .copyable-id code {
-  color: var(--fg);
-  font-family: var(--font-mono);
-  font-size: 12px;
-}
-
 /* Setting names and values are the table's data, not secondary IDs. */
 .data-table.system-settings code {
   color: var(--ink);
   font-size: 12px;
 }
 
-.system-applied {
-  color: var(--ink-3);
-  font-size: 12.5px;
-}
-
 .system-note {
   margin: 0;
   color: var(--ink-2);
diff --git a/apps/web/src/i18n/locales/en/system.ts b/apps/web/src/i18n/locales/en/system.ts
index 01539ccb9..dda2183a5 100644
--- a/apps/web/src/i18n/locales/en/system.ts
+++ b/apps/web/src/i18n/locales/en/system.ts
@@ -19,12 +19,7 @@ export const system = {
   startup: {
     title: "Startup settings",
     help: "Core reports the process settings it loaded. A sensitive setting shows only whether it is set.",
-    none: "Core did not report startup settings.",
     effective: "These are the settings this Core process loaded.",
-    where: "Change these in <path/>, then run <command/>",
-    copyPath: "Copy path",
-    copyCommand: "Copy command",
-    appliedAt: "Last applied {{time}}",
     columns: {
       key: "Setting",
       value: "Value",
diff --git a/apps/web/src/i18n/locales/zh-CN/system.ts b/apps/web/src/i18n/locales/zh-CN/system.ts
index 072fd56c5..770c992ce 100644
--- a/apps/web/src/i18n/locales/zh-CN/system.ts
+++ b/apps/web/src/i18n/locales/zh-CN/system.ts
@@ -21,12 +21,7 @@ export const system: TranslationShape<typeof english> = {
   startup: {
     title: "启动设置",
     help: "Core 报告它加载的进程设置。敏感设置只显示是否已设置。",
-    none: "Core 没有报告启动设置。",
     effective: "这些是这个 Core 进程加载的设置。",
-    where: "在 <path/> 中修改，然后运行 <command/>",
-    copyPath: "复制路径",
-    copyCommand: "复制命令",
-    appliedAt: "上次应用于 {{time}}",
     columns: {
       key: "设置",
       value: "值",
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index a9e7a6171..715e1e4d8 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -426,9 +426,6 @@ export const chinese = {
   "Change the sandbox configuration": "修改沙箱配置",
   "The address nodes and sandboxes use to reach Core.": "节点和沙箱访问 Core 使用的地址。",
   "Managed in System": "在系统中管理",
-  "Config file": "配置文件",
-  "Then run": "然后运行",
-  "Copy path": "复制路径",
   "Set a public address before connecting remote nodes; E2B sandboxes need an HTTPS one.": "连接远程节点前，请先设置公开地址；E2B 沙箱需要 HTTPS 地址。",
   "Enter the E2B key again to save.": "请重新输入 E2B key 后再保存。",
   "Enter the key": "输入 key",
diff --git a/contracts/agents-api/admin-api.md b/contracts/agents-api/admin-api.md
index fe39e5e66..f31771c1f 100644
--- a/contracts/agents-api/admin-api.md
+++ b/contracts/agents-api/admin-api.md
@@ -137,7 +137,7 @@ Core writes this record in the same transaction that creates the Session. Later
 | `api_base_url` | `public_url` followed by `/v1`, the `OPENAI_BASE_URL` for Project API keys. Null when `public_url` is null |
 | `local_only` | True when `public_url` names a loopback host, which only the Core host reaches |
 | `source_commit` | The full source commit Core was built from; null for development builds |
-| `configuration` | The process settings Core loaded from its environment. `path` and `apply_command` are empty, and `applied_at` is null |
+| `configuration` | The process settings Core loaded from its environment, under `settings` |
 | `address_bindings` | What a change of `public_url` affects, counted on each read |
 
 `configuration.settings` has one entry per setting Core loaded, with its dotted `key`, effective `value`, `default`, whether it is `changeable`, whether it is `sensitive`, and the services it `restarts` (`core`, `web`, `database`).
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index c3412ffd4..f7c597938 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -437,8 +437,7 @@ definitions:
       configuration:
         allOf:
           - $ref: '#/definitions/api.InstallationConfiguration'
-        description: The process settings Core loaded. path and apply_command are empty, and applied_at is null, because Core reports its environment rather than an installer file.
-        x-nullable: true
+        description: The process settings Core loaded.
       installation_id:
         description: The ID in OAC_INSTALLATION_ID_FILE; null when Core runs without the sandbox manager.
         type: string
@@ -461,16 +460,6 @@ definitions:
     type: object
   api.InstallationConfiguration:
     properties:
-      applied_at:
-        description: Null when Core reports its own environment.
-        type: string
-        x-nullable: true
-      apply_command:
-        description: Command that applies config.json changes. Empty when Core reports its own environment.
-        type: string
-      path:
-        description: Absolute host path of config.json. Empty when Core reports its own environment.
-        type: string
       settings:
         items:
           $ref: '#/definitions/api.InstallationSetting'
diff --git a/contracts/agents-api/zh/admin-api.md b/contracts/agents-api/zh/admin-api.md
index c86c1de67..eabea2d5b 100644
--- a/contracts/agents-api/zh/admin-api.md
+++ b/contracts/agents-api/zh/admin-api.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理 API"
 source: contracts/agents-api/admin-api.md
-source_hash: 3fc6573b19b9c78ca8a3b275122793b1a99e31f739d83ff25ff56624013dc428
+source_hash: 22ac83d8596bcee671a4f94c81d2fe65e109ab9c0b3759e17cf30626bd5d41df
 ---
 
 Core 管理 API（`/core/v1`）用于管理安装实例：Project 及其 API 密钥、Project 资源的读取和删除、执行器凭据、部署默认模型、沙箱部署及其节点、监控和审计。Web 的[控制台服务器](../../../docs/zh/web/console-server.md#forwarding-to-core)会为已登录的管理员调用它；运维人员则从 Core 主机上的脚本调用它（[编写 Core API 脚本](../../../docs/zh/getting-started/operations.md#script-the-core-api)）。生成的架构是 [core.openapi.yaml](../core.openapi.yaml)，所有错误都使用 [Core 错误封装](core-errors.md)。
@@ -139,7 +139,7 @@ Core 会在创建 Session 的同一事务中写入此记录。之后的 Agent 
 | `api_base_url` | 在 `public_url` 后附加 `/v1`，即 Project API 密钥使用的 `OPENAI_BASE_URL`。当 `public_url` 为 null 时为 null |
 | `local_only` | 当 `public_url` 指向回环主机时为 True，该主机只能由 Core 主机访问 |
 | `source_commit` | Core 构建所依据的完整源代码提交；开发构建为 null |
-| `configuration` | Core 从环境加载的进程设置。`path` 和 `apply_command` 为空，`applied_at` 为 null |
+| `configuration` | Core 从环境加载的进程设置，位于 `settings` 中 |
 | `address_bindings` | 更改 `public_url` 所影响的内容，每次读取都会重新统计 |
 
 `configuration.settings` 为 Core 加载的每项设置一条记录，包含以点分隔的 `key`、生效的 `value`、`default`、是否 `changeable`、是否 `sensitive`，以及会 `restarts` 的服务（`core`、`web`、`database`）。
diff --git a/docs/web/console-api-usage.md b/docs/web/console-api-usage.md
index 60195f8b6..ba8faa171 100644
--- a/docs/web/console-api-usage.md
+++ b/docs/web/console-api-usage.md
@@ -72,10 +72,10 @@ In an archived project the section hides **Issue credential** and **Rotate** beh
 | Resource owners | `GET /core/v1/projects/{project_id}/resource-owners` | The Creator column of every resource list and the creator fact of detail pages, in batches of up to 100 IDs: the creating key's name, **Admin copy** for an owner with source `admin_copy`, or **Unknown** when Core has no record |
 | Write operations | `GET /core/v1/projects/{project_id}/write-operations` | A project's write history, newest first, filtered by key and resource type, 50 per page |
 | Summary | `GET /core/v1/summary` | Overview (per project), the Agents list (`group_by=agent`), a project's page (per project and `group_by=key`), Agent metrics (to skip idle projects, and usage by creating key since the start of the range), the Projects list (last activity) |
-| Installation | `GET /core/v1/installation` | System's Installation facts (`public_url`, `api_base_url`, `installation_id`, `source_commit`) and read-only Startup settings (`configuration.settings` under its `path`, `apply_command` and `applied_at`; a sensitive setting shows only whether it is `configured`); `api_base_url` in the call samples; `public_url` as the download origin and `--source-url` of the node install and uninstall commands (and the install command's `--core-url`); `path` and `apply_command` beside a sandbox configuration Core rejected. A sensitive setting with a value, or an unknown member, fails the read; `configuration: null` shows a note |
+| Installation | `GET /core/v1/installation` | System's Installation facts (`public_url`, `api_base_url`, `installation_id`, `source_commit`) and read-only Startup settings (`configuration.settings`; a sensitive setting shows only whether it is `configured`); `api_base_url` in the call samples; `public_url` as the download origin and `--source-url` of the node install and uninstall commands (and the install command's `--core-url`). A sensitive setting with a value, or an unknown member, fails the read |
 | Core metrics | `GET /core/v1/metrics?range=` | Core metrics page; the Core popover on Overview. A Core without the route (404) is shown as not reporting, and the popover then shows only Core's status. The [Core metrics contract](../../contracts/agents-api/core-metrics.md) defines every measurement |
 
-`local_only`, or no `public_url`, stops Add node from issuing a command and Clean up the host from giving one. Overview, Nodes and System then show a visible warning with Core's configuration path and apply command as copyable values; when `configuration` is null, they state that the path and command are unavailable. Nodes disables Add node with a visible reason, and Getting started leaves its sandbox step to do.
+`local_only`, or no `public_url`, stops Add node from issuing a command and Clean up the host from giving one. Overview, Nodes and System then show a visible warning, with Review the public address leading to System. Nodes disables Add node with a visible reason, and Getting started leaves its sandbox step to do.
 
 Wherever a new key is shown, and without any key on an active project's page, the console gives shell exports of `OPENAI_BASE_URL` (the installation's `api_base_url`) and `OPENAI_API_KEY` (the new key, or a placeholder for a key of the project), with `curl` and Python examples for `GET /v1/agents` and `POST /v1/agents/sessions`, and sends none of them. When the installation is `local_only` it says the API is reachable only on the Core machine, and without an `api_base_url` it says to set `public_url`.
 
@@ -95,7 +95,7 @@ The list carries each harness's configuration, so the console does not read `GET
 
 | Operation | Route | Console use |
 | --- | --- | --- |
-| Deployment | `GET`, `POST`, `PUT /core/v1/sandbox/deployment` | Read the provider, the read-only `core_url` (`OAC_PUBLIC_URL`, shown in the setup review and never sent), reset state, installation ID and specification; a 409 `sandbox_configuration_error` (E2B with a loopback `public_url`) shows the shared client's fixed safe address-configuration message in the setup wizard, with the installation's config file and apply command, and leaves nothing to confirm; initialize the deployment with `resources` and the Docker or microsandbox `runtime` release, or with the E2B account and no `resources` (Core adopts the template build's CPU and memory); change its settings with the expected generation. E2B's `metadata.template_build` (status, CPU, memory, disk) shows on System, the Sandbox configuration summary and Sandbox metrics, and sizes each sandbox when `specification.resources` is missing; microsandbox's `suspension` (idle and retention seconds) shows on System and the Nodes summary |
+| Deployment | `GET`, `POST`, `PUT /core/v1/sandbox/deployment` | Read the provider, the read-only `core_url` (`OAC_PUBLIC_URL`, shown in the setup review and never sent), reset state, installation ID and specification; a 409 `sandbox_configuration_error` (E2B with a loopback `public_url`) shows the shared client's fixed safe address-configuration message in the setup wizard, with Managed in System leading to System, and leaves nothing to confirm; initialize the deployment with `resources` and the Docker or microsandbox `runtime` release, or with the E2B account and no `resources` (Core adopts the template build's CPU and memory); change its settings with the expected generation. E2B's `metadata.template_build` (status, CPU, memory, disk) shows on System, the Sandbox configuration summary and Sandbox metrics, and sizes each sandbox when `specification.resources` is missing; microsandbox's `suspension` (idle and retention seconds) shows on System and the Nodes summary |
 | E2B discovery | `POST /core/v1/sandbox/providers/e2b/discovery` | The setup wizard lists the templates the entered E2B key can see, then the selected template's ready builds. The key travels only in these request bodies and the deployment write |
 | Reset | `POST`, `DELETE /core/v1/sandbox/deployment/reset` | Explicitly clear hosted resources, or cancel the remaining clear at the observed generation; show Core's remaining and offline projection |
 | Nodes | `GET /core/v1/sandbox/nodes` | Nodes page; fleet on Overview; node capacity on Sandbox metrics. An online node's `diagnostic` (`docker_unavailable`, `docker_limits_unsupported`, `runtime_image_unavailable`, `kvm_unavailable`, `microsandbox_artifacts_unavailable`, `capacity_insufficient`, `provider_unavailable`; any other value reads as `provider_unavailable`) marks it degraded and names the reason and fix in the help tip beside its status on each of these and on the node's page. A node whose `core_url` (the address it enrolled with) differs from the deployment's `core_url` is named on the Nodes page as bound to an old address, to be removed and added again, and its status there and on its page reads Old address instead of its health; an empty `core_url` (a node Core did not enroll) is unknown, not old. **Add node** follows only the node whose `enrollment_id` equals its command's |
diff --git a/docs/zh/web/console-api-usage.md b/docs/zh/web/console-api-usage.md
index 09d91aff8..d855d7ee6 100644
--- a/docs/zh/web/console-api-usage.md
+++ b/docs/zh/web/console-api-usage.md
@@ -1,7 +1,7 @@
 ---
 title: "控制台 API 使用"
 source: docs/web/console-api-usage.md
-source_hash: 2a4be7b081286e5a95c14380acc517d2d4b4ba955c0bd61338b0977d84c9df16
+source_hash: 3b54852843f5afccd6ce47a532a9c82f6a4a0dbffdac9b96892c5026f5f78c20
 ---
 
 本页列出各控制台页面读取和写入的 Core 路由，以及控制台如何限定读取范围。[administrator API contract](../../../contracts/agents-api/zh/admin-api.md) 定义了路由、响应结构、分页和审计记录；[API namespaces and credentials](../api/index.md) 定义了本文使用的术语。
@@ -74,10 +74,10 @@ source_hash: 2a4be7b081286e5a95c14380acc517d2d4b4ba955c0bd61338b0977d84c9df16
 | 资源所有者 | `GET /core/v1/projects/{project_id}/resource-owners` | 每个资源列表的 Creator 列和详情页的创建者信息，每批最多处理 100 个 ID：创建密钥的名称；来源为 `admin_copy` 的所有者显示 **Admin copy**；Core 无记录时显示 **Unknown** |
 | 写入操作 | `GET /core/v1/projects/{project_id}/write-operations` | 项目的写入历史，按最新优先，可按密钥和资源类型筛选，每页 50 条 |
 | 汇总 | `GET /core/v1/summary` | Overview（按项目）、Agents 列表（`group_by=agent`）、项目页面（按项目并使用 `group_by=key`）、Agent 指标（跳过空闲项目，并统计从范围开始以来按创建密钥划分的使用量）、Projects 列表（最近活动） |
-| 安装 | `GET /core/v1/installation` | System 的 Installation 信息（`public_url`、`api_base_url`、`installation_id`、`source_commit`）和只读 Startup 设置（`path` 下的 `configuration.settings`，以及 `apply_command` 和 `applied_at`；敏感设置仅显示其是否为 `configured`）；调用示例中的 `api_base_url`；作为下载来源以及节点安装和卸载命令中 `--source-url` 的 `public_url`（还包括安装命令中的 `--core-url`）；Core 拒绝的 Sandbox 配置旁的 `path` 和 `apply_command`。如果敏感设置包含值，或存在未知成员，读取会失败；`configuration: null` 会显示一条说明 |
+| 安装 | `GET /core/v1/installation` | System 的 Installation 信息（`public_url`、`api_base_url`、`installation_id`、`source_commit`）和只读 Startup 设置（`configuration.settings`；敏感设置仅显示其是否为 `configured`）；调用示例中的 `api_base_url`；作为下载来源以及节点安装和卸载命令中 `--source-url` 的 `public_url`（还包括安装命令中的 `--core-url`）。如果敏感设置包含值，或存在未知成员，读取会失败 |
 | Core 指标 | `GET /core/v1/metrics?range=` | Core 指标页面；Overview 上的 Core 弹出内容。不存在该路由的 Core（404）会显示为未报告数据，此时弹出内容仅显示 Core 状态。[Core metrics contract](../../../contracts/agents-api/zh/core-metrics.md) 定义了每项度量 |
 
-如果为 `local_only`，或者没有 `public_url`，Add node 将无法签发命令，Clean up the host 也无法提供命令。随后 Overview、Nodes 和 System 会显示醒目警告，其中 Core 的配置路径和 apply command 为可复制值；当 `configuration` 为 null 时，它们会说明路径和命令不可用。Nodes 会禁用 Add node 并显示明确原因，Getting started 则将 sandbox 步骤保留为待办项。
+如果为 `local_only`，或者没有 `public_url`，Add node 将无法签发命令，Clean up the host 也无法提供命令。随后 Overview、Nodes 和 System 会显示醒目警告，并通过 Review the public address 前往 System。Nodes 会禁用 Add node 并显示明确原因，Getting started 则将 sandbox 步骤保留为待办项。
 
 无论是在显示新密钥时，还是在活动项目页面没有显示任何密钥时，控制台都会提供 `OPENAI_BASE_URL`（安装的 `api_base_url`）和 `OPENAI_API_KEY`（新密钥，或项目密钥的占位符）的 shell 导出变量，以及针对 `GET /v1/agents` 和 `POST /v1/agents/sessions` 的 `curl` 和 Python 示例，但不会发送其中任何调用。当安装为 `local_only` 时，控制台会说明 API 只能在 Core 所在计算机上访问；当缺少 `api_base_url` 时，则会提示设置 `public_url`。
 
@@ -97,7 +97,7 @@ source_hash: 2a4be7b081286e5a95c14380acc517d2d4b4ba955c0bd61338b0977d84c9df16
 
 | 操作 | 路由 | 控制台用途 |
 | --- | --- | --- |
-| 部署 | `GET`、`POST`、`PUT /core/v1/sandbox/deployment` | 读取提供商、只读 `core_url`（即 `OAC_PUBLIC_URL`，会显示在设置审核中且绝不发送）、重置状态、安装 ID 和规范；409 `sandbox_configuration_error`（E2B 搭配回环地址形式的 `public_url`）会在设置向导中显示共享客户端固定的安全地址配置消息，并同时显示安装的配置文件和 apply command，且无需确认；使用 `resources` 以及 Docker 或 microsandbox 的 `runtime` release 初始化部署，或者使用 E2B 账户且不提供 `resources`（Core 采用模板构建的 CPU 和内存）；使用预期的 generation 更改设置。E2B 的 `metadata.template_build`（状态、CPU、内存、磁盘）会显示在 System、Sandbox 配置摘要和 Sandbox metrics 中；当缺少 `specification.resources` 时，它还会确定每个 Sandbox 的大小；microsandbox 的 `suspension`（空闲和保留秒数）会显示在 System 和 Nodes 摘要中 |
+| 部署 | `GET`、`POST`、`PUT /core/v1/sandbox/deployment` | 读取提供商、只读 `core_url`（即 `OAC_PUBLIC_URL`，会显示在设置审核中且绝不发送）、重置状态、安装 ID 和规范；409 `sandbox_configuration_error`（E2B 搭配回环地址形式的 `public_url`）会在设置向导中显示共享客户端固定的安全地址配置消息，并通过 Managed in System 前往 System，且无需确认；使用 `resources` 以及 Docker 或 microsandbox 的 `runtime` release 初始化部署，或者使用 E2B 账户且不提供 `resources`（Core 采用模板构建的 CPU 和内存）；使用预期的 generation 更改设置。E2B 的 `metadata.template_build`（状态、CPU、内存、磁盘）会显示在 System、Sandbox 配置摘要和 Sandbox metrics 中；当缺少 `specification.resources` 时，它还会确定每个 Sandbox 的大小；microsandbox 的 `suspension`（空闲和保留秒数）会显示在 System 和 Nodes 摘要中 |
 | E2B 发现 | `POST /core/v1/sandbox/providers/e2b/discovery` | 设置向导先列出输入的 E2B 密钥可见的模板，再列出所选模板的可用构建。该密钥只会通过这些请求体和部署写入请求传输 |
 | 重置 | `POST`、`DELETE /core/v1/sandbox/deployment/reset` | 显式清除托管资源，或在观测到的 generation 处取消剩余清除；显示 Core 的剩余资源和离线预测 |
 | Nodes | `GET /core/v1/sandbox/nodes` | Nodes 页面；Overview 上的机群；Sandbox metrics 中的节点容量。在线节点的 `diagnostic`（`docker_unavailable`、`docker_limits_unsupported`、`runtime_image_unavailable`、`kvm_unavailable`、`microsandbox_artifacts_unavailable`、`capacity_insufficient`、`provider_unavailable`；任何其他值均读取为 `provider_unavailable`）会将其标记为降级，并在上述每个页面及节点页面中，紧邻状态的帮助提示里说明原因和修复方法。如果节点的 `core_url`（其注册时使用的地址）与部署的 `core_url` 不同，Nodes 页面会将其标记为绑定到旧地址，需要移除后重新添加；此时它在该页面和节点页面中的状态会显示 Old address，而不是健康状态；如果 `core_url` 为空（Core 未注册该节点），则状态为未知，而不是旧地址。**Add node** 仅跟踪 `enrollment_id` 与其命令所含 `enrollment_id` 相等的节点 |
diff --git a/packages/agents-client/src/admin-client.test.ts b/packages/agents-client/src/admin-client.test.ts
index 5089dfdff..aba044f90 100644
--- a/packages/agents-client/src/admin-client.test.ts
+++ b/packages/agents-client/src/admin-client.test.ts
@@ -328,19 +328,20 @@ describe("AdminClient installation", () => {
   const installation = {
     object: "core.installation", installation_id: resourceId, public_url: "https://core.example", api_base_url: "https://core.example/v1",
     local_only: false, source_commit: "a".repeat(40),
-    configuration: { path: "/home/alice/.oac/core/config.json", apply_command: "/home/alice/.oac/core/oac apply", applied_at: "2026-09-25T09:30:00Z", settings: [port, headers] },
+    configuration: { settings: [port, headers] },
     address_bindings: { nodes: 2, nodes_on_other_address: 1, hosted_sandboxes: 3, self_hosted_executors: 1 },
   };
   it("reads installation facts before any deployment and rejects inconsistent snapshots", async () => {
     expect(await clientWith(installation).client.retrieveInstallation()).toEqual(installation);
-    expect(await clientWith({ ...installation, installation_id: null, public_url: null, api_base_url: null, source_commit: null, configuration: null }).client.retrieveInstallation()).toMatchObject({ public_url: null });
-    const configuration = (settings: unknown[]) => ({ ...installation, configuration: { ...installation.configuration, settings } });
+    expect(await clientWith({ ...installation, installation_id: null, public_url: null, api_base_url: null, source_commit: null }).client.retrieveInstallation()).toMatchObject({ public_url: null });
+    const configuration = (settings: unknown[]) => ({ ...installation, configuration: { settings } });
     for (const invalid of [
       configuration([port, { ...headers, value: { authorization: "leak" } }]),
       configuration([port, { key: headers.key, value: null, default: null, changeable: true, sensitive: true, restarts: ["core"] }]),
       configuration([port, port]),
       { ...installation, address_bindings: { ...installation.address_bindings, nodes_on_other_address: 3 } },
       { ...installation, token: "leak" },
+      { ...installation, configuration: null },
       configuration([{ ...port, configured: true }]),
     ]) {
       await expect(clientWith(invalid).client.retrieveInstallation()).rejects.toMatchObject({ code: "invalid_admin_response" });
diff --git a/packages/agents-client/src/admin-projection.ts b/packages/agents-client/src/admin-projection.ts
index 67f509a60..a4196bb8c 100644
--- a/packages/agents-client/src/admin-projection.ts
+++ b/packages/agents-client/src/admin-projection.ts
@@ -292,14 +292,9 @@ export function projectInstallation(value: unknown): CoreInstallation {
   const bindings = record(installation.address_bindings, ["nodes", "nodes_on_other_address", "hosted_sandboxes", "self_hosted_executors"]);
   if (![bindings.nodes, bindings.nodes_on_other_address, bindings.hosted_sandboxes, bindings.self_hosted_executors].every(isNonnegativeInteger) ||
     (bindings.nodes_on_other_address as number) > (bindings.nodes as number)) return invalidAdminResponse();
-  let configuration: CoreInstallation["configuration"] = null;
-  if (installation.configuration !== null) {
-    const applied = record(installation.configuration, ["path", "apply_command", "applied_at", "settings"]);
-    if (typeof applied.path !== "string" || (applied.path !== "" && !applied.path.startsWith("/")) || typeof applied.apply_command !== "string" ||
-      (applied.applied_at !== null && (typeof applied.applied_at !== "string" || !date(applied.applied_at))) || !Array.isArray(applied.settings)) return invalidAdminResponse();
-    const settings = applied.settings.map(projectInstallationSetting);
-    if (new Set(settings.map((setting) => setting.key)).size !== settings.length) return invalidAdminResponse();
-    configuration = { path: applied.path, apply_command: applied.apply_command, applied_at: applied.applied_at, settings };
-  }
-  return { ...installation, address_bindings: { ...bindings }, configuration } as unknown as CoreInstallation;
+  const configuration = record(installation.configuration, ["settings"]);
+  if (!Array.isArray(configuration.settings)) return invalidAdminResponse();
+  const settings = configuration.settings.map(projectInstallationSetting);
+  if (new Set(settings.map((setting) => setting.key)).size !== settings.length) return invalidAdminResponse();
+  return { ...installation, address_bindings: { ...bindings }, configuration: { settings } } as unknown as CoreInstallation;
 }
diff --git a/packages/agents-client/src/admin-types.ts b/packages/agents-client/src/admin-types.ts
index 53701d598..e09c60f7a 100644
--- a/packages/agents-client/src/admin-types.ts
+++ b/packages/agents-client/src/admin-types.ts
@@ -200,14 +200,8 @@ export interface CoreInstallationSetting {
   /** Services that restart when the setting changes. */
   restarts: ("core" | "web" | "database")[];
 }
-/** Where process settings change, and their last applied values. */
+/** The process settings Core loaded. */
 export interface CoreInstallationConfiguration {
-  /** Absolute host path of config.json. Empty when Core reports the environment it loaded. */
-  path: string;
-  /** Command that applies config.json changes. Empty when Core reports the environment it loaded. */
-  apply_command: string;
-  /** Null when Core reports the environment it loaded. */
-  applied_at: string | null;
   settings: CoreInstallationSetting[];
 }
 /** `GET /core/v1/installation`: available before any sandbox deployment exists. */
@@ -222,8 +216,8 @@ export interface CoreInstallation {
   local_only: boolean;
   /** Full source commit Core was built from; null for development builds. */
   source_commit: string | null;
-  /** Null when Core was not started. Core reports the process settings it loaded; path and apply_command are empty unless a snapshot was supplied. */
-  configuration: CoreInstallationConfiguration | null;
+  /** The process settings Core loaded. */
+  configuration: CoreInstallationConfiguration;
   address_bindings: CoreAddressBindings;
 }
 
diff --git a/services/core/cmd/server/installation.go b/services/core/cmd/server/installation.go
index d7bd089c4..a927a4e3c 100644
--- a/services/core/cmd/server/installation.go
+++ b/services/core/cmd/server/installation.go
@@ -33,6 +33,6 @@ func installationFacts(publicURL string) (api.Installation, error) {
 	if err != nil {
 		return facts, err
 	}
-	facts.Configuration = &api.InstallationConfiguration{Settings: settings}
+	facts.Configuration = api.InstallationConfiguration{Settings: settings}
 	return facts, nil
 }
diff --git a/services/core/internal/api/installation.go b/services/core/internal/api/installation.go
index 229da8835..ec1ba9f55 100644
--- a/services/core/internal/api/installation.go
+++ b/services/core/internal/api/installation.go
@@ -3,7 +3,6 @@ package api
 import (
 	"context"
 	"net/http"
-	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 )
@@ -22,22 +21,14 @@ type Installation struct {
 	LocalOnly bool `json:"local_only"`
 	// Full source commit Core was built from; null for development builds.
 	SourceCommit *string `json:"source_commit" extensions:"x-nullable"`
-	// The process settings Core loaded. path and apply_command are empty, and applied_at is null, because Core reports its environment rather than an installer file.
-	Configuration   *InstallationConfiguration `json:"configuration" extensions:"x-nullable"`
+	// The process settings Core loaded.
+	Configuration   InstallationConfiguration  `json:"configuration"`
 	AddressBindings deployment.AddressBindings `json:"address_bindings"`
 }
 
-// InstallationConfiguration is the process settings Core loaded. Path and
-// ApplyCommand are empty, and AppliedAt is null, unless a caller built a
-// snapshot itself.
+// InstallationConfiguration is the process settings Core loaded.
 type InstallationConfiguration struct {
-	// Absolute host path of config.json. Empty when Core reports its own environment.
-	Path string `json:"path"`
-	// Command that applies config.json changes. Empty when Core reports its own environment.
-	ApplyCommand string `json:"apply_command"`
-	// Null when Core reports its own environment.
-	AppliedAt *time.Time            `json:"applied_at" extensions:"x-nullable"`
-	Settings  []InstallationSetting `json:"settings"`
+	Settings []InstallationSetting `json:"settings"`
 }
 
 type InstallationSetting struct {
diff --git a/services/core/internal/api/installation_test.go b/services/core/internal/api/installation_test.go
index 721703bf8..c8c047e89 100644
--- a/services/core/internal/api/installation_test.go
+++ b/services/core/internal/api/installation_test.go
@@ -19,7 +19,7 @@ func TestInstallationReadNeedsOnlyTheCoreKey(t *testing.T) {
 	fakes.projectsReader.resolveAPIKey = projectKeys(t, callerBinding()).ResolveAPIKey
 	deps.CoreKeys = coreKeys(t, "administrator")
 	public, id := "https://core.example", "5b7c0f3e-0000-4000-8000-000000000001"
-	settings := &InstallationConfiguration{Path: "/home/alice/.oac/core/config.json", Settings: []InstallationSetting{{Key: "ports.core", Value: 8091, Default: 8091, Changeable: true, Restarts: []string{"core"}}}}
+	settings := InstallationConfiguration{Settings: []InstallationSetting{{Key: "ports.core", Value: 8091, Default: 8091, Changeable: true, Restarts: []string{"core"}}}}
 	fakes.installationBindings.addressBindings = func(context.Context) (deployment.AddressBindings, error) {
 		return deployment.AddressBindings{Nodes: 2, NodesOnOtherAddress: 1}, nil
 	}
@@ -40,7 +40,7 @@ func TestInstallationReadNeedsOnlyTheCoreKey(t *testing.T) {
 	var body map[string]any
 	if result.Code != http.StatusOK || json.Unmarshal(result.Body.Bytes(), &body) != nil || body["object"] != "core.installation" ||
 		body["public_url"] != public || body["address_bindings"].(map[string]any)["nodes_on_other_address"] != float64(1) ||
-		body["configuration"].(map[string]any)["path"] != "/home/alice/.oac/core/config.json" {
+		body["configuration"].(map[string]any)["settings"].([]any)[0].(map[string]any)["key"] != "ports.core" {
 		t.Fatal(result.Code, result.Body.String())
 	}
 }

From d75424c84d1c830c51d6526eca5646ca6c2b62b0 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 23:00:38 +0800
Subject: [PATCH 35/60] Move session defaults into the test helper (#501)

---
 services/core/internal/runtimegateway/owner_test.go   | 2 +-
 services/core/internal/runtimegateway/session.go      | 6 ------
 services/core/internal/runtimegateway/session_test.go | 6 ++++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/core/internal/runtimegateway/owner_test.go b/services/core/internal/runtimegateway/owner_test.go
index dc17a37b0..09ace7043 100644
--- a/services/core/internal/runtimegateway/owner_test.go
+++ b/services/core/internal/runtimegateway/owner_test.go
@@ -48,7 +48,7 @@ func TestSessionOwnerLeaseLostClosesStaleConnection(t *testing.T) {
 	conn := newFakeConn()
 	owners := &fakeOwnerStore{renewOK: false, releaseCh: make(chan struct{})}
 	lease := &ownerLease{store: owners, deviceID: "dev-1", ownerPodID: "pod-a", generation: 7, ttl: time.Minute}
-	sess := NewSessionWithOwner(conn, "dev-1", "wks-1", proto.Version, reg, nil, lease)
+	sess := NewSessionWithOwner(conn, "dev-1", "wks-1", proto.Version, reg, func(string, ...any) {}, lease)
 	reg.Register(sess)
 	sess.Start()
 
diff --git a/services/core/internal/runtimegateway/session.go b/services/core/internal/runtimegateway/session.go
index 4643526a9..9032c2f48 100644
--- a/services/core/internal/runtimegateway/session.go
+++ b/services/core/internal/runtimegateway/session.go
@@ -146,12 +146,6 @@ type Session struct {
 // connections. The session does NOT start its goroutines automatically — Start
 // runs once the handler is ready so the session can't race with response writes.
 func NewSessionWithOwner(conn WSConn, deviceID, workspaceID, daemonVersion string, reg *Registry, log SessionLogger, owner *ownerLease) *Session {
-	if log == nil {
-		log = func(string, ...any) {}
-	}
-	if reg == nil {
-		reg = NewRegistry()
-	}
 	now := time.Now()
 	return &Session{
 		DeviceID:      deviceID,
diff --git a/services/core/internal/runtimegateway/session_test.go b/services/core/internal/runtimegateway/session_test.go
index e32150e4b..c4e27e0f3 100644
--- a/services/core/internal/runtimegateway/session_test.go
+++ b/services/core/internal/runtimegateway/session_test.go
@@ -16,6 +16,12 @@ import (
 
 // NewSession builds an unowned Session over a test connection.
 func NewSession(conn WSConn, deviceID, workspaceID, daemonVersion string, reg *Registry, log SessionLogger) *Session {
+	if log == nil {
+		log = func(string, ...any) {}
+	}
+	if reg == nil {
+		reg = NewRegistry()
+	}
 	return NewSessionWithOwner(conn, deviceID, workspaceID, daemonVersion, reg, log, nil)
 }
 

From 5ff0a0c7c3e3c34eee7ed98f295dc2ec747de1dc Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Wed, 7 Oct 2026 23:20:32 +0800
Subject: [PATCH 36/60] Shorten long documentation titles (#504)

---
 CONTRIBUTING.md                               | 2 +-
 contracts/agents-api/harness-onboarding.md    | 2 +-
 contracts/agents-api/zh/harness-onboarding.md | 4 ++--
 docs/architecture.md                          | 2 +-
 docs/concepts.md                              | 2 +-
 docs/getting-started/index.md                 | 2 +-
 docs/getting-started/install-options.md       | 2 +-
 docs/getting-started/operations.md            | 2 +-
 docs/zh/architecture.md                       | 4 ++--
 docs/zh/concepts.md                           | 4 ++--
 docs/zh/getting-started/index.md              | 4 ++--
 docs/zh/getting-started/install-options.md    | 4 ++--
 docs/zh/getting-started/operations.md         | 4 ++--
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 95a989fe2..b2e088a86 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ This guide owns how to work in the repository: documentation ownership, the repo
 | --- | --- |
 | Design principles, public API fidelity, settings and data ownership, documentation rules | [AGENTS.md](AGENTS.md) |
 | Protocol code and documents at each component boundary | [Protocol map](AGENTS.md#protocols-at-every-boundary) |
-| Projects, keys, resource isolation, administrator authority, secrets and audit concepts | [Concepts and ownership](docs/concepts.md) |
+| Projects, keys, resource isolation, administrator authority, secrets and audit concepts | [Concepts](docs/concepts.md) |
 | Component responsibilities and Session flow | [Architecture](docs/architecture.md) |
 | Developer setup, repository map and focused checks | [Develop OpenAgentCore](docs/development.md) |
 | API callers, credentials and route inventory | [API index](docs/api/index.md) |
diff --git a/contracts/agents-api/harness-onboarding.md b/contracts/agents-api/harness-onboarding.md
index fe4440b5c..2bae3fb5f 100644
--- a/contracts/agents-api/harness-onboarding.md
+++ b/contracts/agents-api/harness-onboarding.md
@@ -1,5 +1,5 @@
 ---
-title: "Add a native Harness to OpenAgentCore"
+title: "Add a Harness"
 ---
 
 A **Harness** is a native agent engine (Codex, Claude Code, MiniMax Code) that runs the model and tool loop. A **Harness adapter** translates the Runtime's Executor and Turn contract into that engine's SDK or protocol. This document is the Runtime–Harness protocol: the adapter interfaces and their lifecycle obligations, registration, Core qualification and acceptance. [Harness capabilities](./harness-capabilities.md) records what each current Harness supports.
diff --git a/contracts/agents-api/zh/harness-onboarding.md b/contracts/agents-api/zh/harness-onboarding.md
index 57732314d..6b7204bfb 100644
--- a/contracts/agents-api/zh/harness-onboarding.md
+++ b/contracts/agents-api/zh/harness-onboarding.md
@@ -1,7 +1,7 @@
 ---
-title: "将原生 Harness 添加到 OpenAgentCore"
+title: "添加 Harness"
 source: contracts/agents-api/harness-onboarding.md
-source_hash: b74f627ac8d518e0b780f827b8ccc6d268056d33c151b9e9f51866d93faf05d2
+source_hash: 38955b517dae94e5ce187e72a6b2e03cc7eeb7b886baa722b5f117dd3260253f
 ---
 
 **Harness** 是一种运行模型和工具循环的原生代理引擎（Codex、Claude Code、MiniMax Code）。**Harness 适配器**将 Runtime 的 Executor 和 Turn 契约转换到该引擎的 SDK 或协议。本文档定义 Runtime–Harness 协议：适配器接口及其生命周期义务、注册、Core 资格认定和验收。[Harness capabilities](harness-capabilities.md) 记录了当前每个 Harness 支持的功能。
diff --git a/docs/architecture.md b/docs/architecture.md
index 889874b55..172a978d2 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -38,7 +38,7 @@ Dashed arrows show provisioning and installation. Solid arrows show component in
 | Model provider | Serve the model protocol selected for the Harness | [Model execution](../contracts/agents-api/model-execution.md) |
 | Web | Let administrators configure and observe the installation through a server-side Core API connection | [Console server](./web/console-server.md) |
 
-The [repository map](./development.md#repository-map) locates these components. [Concepts and ownership](./concepts.md) explains Project boundaries, administrator authority and tool isolation.
+The [repository map](./development.md#repository-map) locates these components. [Concepts](./concepts.md) explains Project boundaries, administrator authority and tool isolation.
 
 ## A Session, end to end
 
diff --git a/docs/concepts.md b/docs/concepts.md
index fbfb56ab3..7a92003f6 100644
--- a/docs/concepts.md
+++ b/docs/concepts.md
@@ -1,5 +1,5 @@
 ---
-title: "Concepts and ownership"
+title: "Concepts"
 ---
 
 A Project is the execution tenant in OpenAgentCore. Applications use its API keys; operators manage the installation with a separate Core key. The [API index](./api/index.md) maps each caller to its namespace and credential.
diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
index 035c9bf33..60d1cb117 100644
--- a/docs/getting-started/index.md
+++ b/docs/getting-started/index.md
@@ -1,5 +1,5 @@
 ---
-title: "OpenAgentCore documentation"
+title: "Overview"
 ---
 
 OpenAgentCore runs AI agents on your own infrastructure behind the OpenAI Agents API. The [architecture overview](../architecture.md) explains its parts. Pick the guides for your role.
diff --git a/docs/getting-started/install-options.md b/docs/getting-started/install-options.md
index 08cdd34e5..3a626ae1f 100644
--- a/docs/getting-started/install-options.md
+++ b/docs/getting-started/install-options.md
@@ -1,5 +1,5 @@
 ---
-title: "Installation options and advanced deployments"
+title: "Installation options"
 ---
 
 The [default installation](./install.md) needs no options. Use this page to set installation options, deploy with Compose or configure a reverse proxy.
diff --git a/docs/getting-started/operations.md b/docs/getting-started/operations.md
index a15d9174d..55760e76b 100644
--- a/docs/getting-started/operations.md
+++ b/docs/getting-started/operations.md
@@ -1,5 +1,5 @@
 ---
-title: "Operate your installation"
+title: "Operations"
 ---
 
 The installation operator owns the Core host, its storage and its availability. Node hosts run their own services; see [Nodes](./nodes.md). Settings are described in the [configuration reference](../configuration.md).
diff --git a/docs/zh/architecture.md b/docs/zh/architecture.md
index 8777d50e1..11b3c71fe 100644
--- a/docs/zh/architecture.md
+++ b/docs/zh/architecture.md
@@ -1,7 +1,7 @@
 ---
 title: "架构"
 source: docs/architecture.md
-source_hash: b8a00701caa83314115f28c3fa754291e8eaf734e88de8e0012e45d8b1893338
+source_hash: 630c00591d3980e59b37969d1a149f774da118b3fce13ad5d9f63dfb9a4e216f
 ---
 
 OpenAgentCore 将编排、计算资源和原生执行分开。Core 负责 API 和持久状态。Sandbox Provider 管理计算资源。Runtime daemon 准备 Environment 并运行选定的 Harness；Harness 的原生 SDK 或协议负责模型与工具循环。
@@ -40,7 +40,7 @@ flowchart TB
 | Model provider | 提供 Harness 选定的模型协议 | [模型执行](../../contracts/agents-api/zh/model-execution.md) |
 | Web | 让管理员通过服务端 Core API 连接配置与观察安装实例 | [控制台服务端](web/console-server.md) |
 
-[仓库地图](development.md#repository-map) 标出这些组件的位置。[概念与所有权](concepts.md) 解释 Project 边界、管理员权限和工具隔离。
+[仓库地图](development.md#repository-map) 标出这些组件的位置。[概念](concepts.md) 解释 Project 边界、管理员权限和工具隔离。
 
 ## Session 的完整流程 {#a-session-end-to-end}
 
diff --git a/docs/zh/concepts.md b/docs/zh/concepts.md
index c916e09a7..ea03bf7f1 100644
--- a/docs/zh/concepts.md
+++ b/docs/zh/concepts.md
@@ -1,7 +1,7 @@
 ---
-title: "概念与所有权"
+title: "概念"
 source: docs/concepts.md
-source_hash: f15758cc223f104393f3eca822dbc585c8c41bb5c7bdbe787e8af4e7bf1a0d95
+source_hash: 2d65b520ffc8ccce8836d6196fb9daa217a438e4f79ae2aee70d4cb77da4c606
 ---
 
 Project 是 OpenAgentCore 的执行租户。应用使用其 API key；运维人员使用独立的 Core key 管理安装实例。[API 索引](api/index.md) 将每类调用方映射到对应命名空间和凭据。
diff --git a/docs/zh/getting-started/index.md b/docs/zh/getting-started/index.md
index 4f735b1de..92440e3ac 100644
--- a/docs/zh/getting-started/index.md
+++ b/docs/zh/getting-started/index.md
@@ -1,7 +1,7 @@
 ---
-title: "OpenAgentCore 文档"
+title: "概览"
 source: docs/getting-started/index.md
-source_hash: b00e7833d6dc323fc53a9e6dd145bd0e08069a421346ee48c9454397494aa5a8
+source_hash: 232aae563b4d7614f065118f2a625b7b06d4d7384295aab77ac072856b9af380
 ---
 
 OpenAgentCore 在你自己的基础设施上运行 AI Agent，并提供 OpenAI Agents API。[架构概览](../architecture.md)介绍各个组成部分。根据你的角色选择指南。
diff --git a/docs/zh/getting-started/install-options.md b/docs/zh/getting-started/install-options.md
index fe55a0610..bd5cd674c 100644
--- a/docs/zh/getting-started/install-options.md
+++ b/docs/zh/getting-started/install-options.md
@@ -1,7 +1,7 @@
 ---
-title: "安装选项与高级部署"
+title: "安装选项"
 source: docs/getting-started/install-options.md
-source_hash: 2e7717f76a46694af3c1ef33a56b195c0a321f54fd7318b488179b4b4c61f336
+source_hash: 6acbb4205e95aa5ad2f36fbfb3656a785b8d420c2ff754b81ae9cc7e07f10482
 ---
 
 [默认安装](install.md)无需任何选项。本页介绍安装选项、Compose 部署和反向代理配置。
diff --git a/docs/zh/getting-started/operations.md b/docs/zh/getting-started/operations.md
index 545f99a7b..e1b4d1112 100644
--- a/docs/zh/getting-started/operations.md
+++ b/docs/zh/getting-started/operations.md
@@ -1,7 +1,7 @@
 ---
-title: "管理你的安装"
+title: "运维"
 source: docs/getting-started/operations.md
-source_hash: f63789e0f3982b9f6633381d3c93441e5185b04398541b95c3e1d0505de588eb
+source_hash: 97f5d49b9b39441a78026433d662120d46471ef5f9a0b6b4508998a3b4491d09
 ---
 
 安装运维人员负责 Core 主机、存储和可用性。节点主机运行各自的服务；参阅[节点](nodes.md)。设置见[配置参考](../configuration.md)。

From 6452a4559c1ed8fa408c7122bbead8da173e76fe Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 01:31:08 +0800
Subject: [PATCH 37/60] Delete stored compatibility encodings (#508)

Session message inputs are stored only as the public
agent.session.input.message event, so the {"text"} branches in Item
projection and Runtime dispatch go, and the recovery fixture and tests
submit the public shape.

Items are stored with their wire encoding: MarshalStored folds into
MarshalJSON, and replayed child Items compare against the same bytes.

Sessions always freeze a model provider at creation, so the execution
guards for Sessions stored without one, ErrModelProviderRequired and its
handlers are deleted.
---
 contracts/agents-api/sessions-events.md       |  2 +-
 contracts/agents-api/v1/items_test.go         | 26 +-------
 contracts/agents-api/v1/subagent_items.go     | 28 ++-------
 contracts/agents-api/zh/sessions-events.md    |  4 +-
 services/core/IMPLEMENTATION.md               |  2 +-
 services/core/internal/api/errors_sessions.go |  2 -
 .../native_classification_integration_test.go |  2 +-
 .../session_diagnostics_public_compat_test.go |  7 ++-
 .../internal/api/session_diagnostics_test.go  |  2 +-
 .../archive_cancellation_cleanup_test.go      |  2 +-
 .../execution/environment_admission.go        |  7 ---
 .../core/internal/execution/message_input.go  |  8 +--
 .../execution/message_support_test.go         |  6 +-
 .../execution/model_execution_test.go         |  7 ---
 .../internal/execution/prepared_dispatch.go   |  5 --
 services/core/internal/execution/request.go   |  9 ---
 services/core/internal/execution/worker.go    |  3 -
 .../internal/execution/worker_schedule.go     |  3 -
 services/core/internal/items/changes_test.go  |  2 +-
 services/core/internal/items/inputs.go        |  6 +-
 .../sessionpg/execution_inputs_test.go        |  2 +-
 .../postgres/sessionpg/inputs_test.go         | 11 ++--
 .../persistence/postgres/sessionpg/items.go   |  2 +-
 .../core/internal/sessions/creation_test.go   |  2 +-
 .../sessions/environment_inputs_test.go       |  2 +-
 .../core/internal/sessions/inputs_test.go     | 16 +++--
 services/core/internal/sessions/subagents.go  |  2 +-
 services/core/tests/fixtures/main.go          |  2 +-
 .../admin_session_archive_race_test.go        |  3 +-
 .../integration/admin_session_archive_test.go |  4 +-
 .../admin_session_archive_worker_http_test.go |  2 +-
 .../integration/archive_cancellation_test.go  |  2 +-
 .../integration/claude_execution_test.go      |  2 +-
 .../tests/integration/command_output_test.go  |  2 +-
 .../creation_stream_settlement_public_test.go |  2 +-
 .../deployment_model_providers_http_test.go   | 60 -------------------
 .../core/tests/integration/dispatch_test.go   |  3 +-
 .../integration/environment_admission_test.go |  2 +-
 .../environment_directory_active_test.go      |  2 +-
 .../environment_expiry_dispatch_test.go       |  5 +-
 .../environment_expiry_worker_test.go         |  2 +-
 .../environment_initial_input_test.go         |  8 ++-
 .../environment_initial_public_test.go        |  2 +-
 .../environment_worker_helpers_test.go        |  2 +-
 .../tests/integration/environments_test.go    |  2 +-
 .../core/tests/integration/execution_test.go  |  2 +-
 .../function_input_execution_test.go          |  2 +-
 .../function_inputs_public_test.go            |  4 +-
 .../tests/integration/function_inputs_test.go |  6 +-
 .../integration/function_item_events_test.go  | 15 +----
 .../integration/function_state_public_test.go |  2 +-
 ...sted_initialization_failure_public_test.go |  4 +-
 .../input_conflicts_public_test.go            |  4 +-
 .../core/tests/integration/inputs_test.go     | 11 +++-
 .../core/tests/integration/item_order_test.go |  6 +-
 .../core/tests/integration/item_reads_test.go |  8 +--
 .../integration/local_artifact_export_test.go |  3 +-
 .../local_environment_file_write_test.go      |  4 +-
 .../local_environment_worker_test.go          |  3 +-
 .../message_image_admission_test.go           |  2 +-
 .../integration/prepared_dispatch_test.go     |  2 +-
 .../integration/public_execution_test.go      |  2 +-
 .../runtime_input_admission_test.go           |  2 +-
 .../tests/integration/runtime_pending_test.go |  2 +-
 .../runtime_wake_hint_integration_test.go     |  3 +-
 .../runtime_worker_recovery_test.go           |  5 +-
 .../sandbox_deployment_switch_test.go         |  2 +-
 .../self_hosted_cancel_public_test.go         |  4 +-
 .../session_deletion_lifecycle_public_test.go |  6 +-
 .../integration/session_deletion_test.go      |  5 +-
 .../tests/integration/session_events_test.go  |  6 +-
 .../integration/session_metadata_test.go      |  2 +-
 .../integration/stream_authority_http_test.go |  2 +-
 .../token_usage_integration_test.go           |  6 +-
 .../tests/integration/turn_events_test.go     |  2 +-
 .../worker_preparation_failure_test.go        | 11 ++--
 .../tests/integration/worker_wakeup_test.go   |  5 +-
 77 files changed, 133 insertions(+), 287 deletions(-)

diff --git a/contracts/agents-api/sessions-events.md b/contracts/agents-api/sessions-events.md
index 1ce4367df..7615b7384 100644
--- a/contracts/agents-api/sessions-events.md
+++ b/contracts/agents-api/sessions-events.md
@@ -39,7 +39,7 @@ A Session stays usable after a Turn fails: new input starts a new Turn. Later re
 - **Cancellation.** A queued Turn is cancelled without a live Runtime. A running Turn is cancelled when the Runtime confirms it; completion can win that race. The Turn has stopped when it reads `cancelled`, not when the request returns. A cancellation on an idle Session with no pending input is accepted and has no effect; while an input reservation is pending, it returns 409.
 - **Function results.** `turn_id`, `call_id` and `success` are required; `output` and `error` are optional and nullable ([content rules](./message-content.md#function-results)). An identical repeated result returns 202 without another application or event. The result Item appears when the harness applies the result; a result that cancellation prevents from being applied stays stored but produces no Item.
 - **Queueing.** A queued Turn starts when a Runtime that supports the Session's harness and configuration is connected and one of Core's [`core.execution_concurrency`](../../docs/configuration.md#settings) work slots is free. A Session stays bound to the Runtime that first ran it.
-- **Execution availability.** A service without execution returns 503 `execution_unavailable`, and a Worker that loses execution ownership returns 503. A Session created without a model provider rejects new messages with 400 `model_provider_required` ([model execution](./model-execution.md)).
+- **Execution availability.** A service without execution returns 503 `execution_unavailable`, and a Worker that loses execution ownership returns 503.
 
 ### Sessions with an Environment
 
diff --git a/contracts/agents-api/v1/items_test.go b/contracts/agents-api/v1/items_test.go
index 5e5c154e9..a507c1319 100644
--- a/contracts/agents-api/v1/items_test.go
+++ b/contracts/agents-api/v1/items_test.go
@@ -64,15 +64,6 @@ func TestItemWireFieldsAreExplicitlyNull(t *testing.T) {
 			expectField(t, got, "output", test.output)
 			expectField(t, got, "error", test.error)
 			expectField(t, got, "phase", "")
-			// Stored payloads keep the original field presence.
-			stored, err := item.MarshalStored()
-			if err != nil {
-				t.Fatal(err)
-			}
-			var original, persisted map[string]json.RawMessage
-			if json.Unmarshal([]byte(test.raw), &original) != nil || json.Unmarshal(stored, &persisted) != nil || len(original) != len(persisted) {
-				t.Fatalf("stored payload changed: %s", stored)
-			}
 		})
 	}
 
@@ -84,14 +75,6 @@ func TestItemWireFieldsAreExplicitlyNull(t *testing.T) {
 	reasoning := fields(t, Item{ID: "rs", TurnID: "turn", Type: "reasoning"})
 	expectField(t, reasoning, "status", "null")
 	expectField(t, reasoning, "summary", "[]")
-
-	stored, err := user.MarshalStored()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(stored) != `{"id":"user","turn_id":"turn","type":"message","status":"completed","role":"user","content":[{"type":"input_text","text":"question"}]}` {
-		t.Fatalf("stored message encoding changed: %s", stored)
-	}
 }
 
 func TestItemEventsCarryNullableOutputIndex(t *testing.T) {
@@ -156,7 +139,7 @@ func TestReasoningResponsesCarryBothKeys(t *testing.T) {
 	expectField(t, fields(t, stored["agent"]), "reasoning", `{"effort":"low"}`)
 }
 
-func TestStoredSearchItemRoundTripPreservesPayload(t *testing.T) {
+func TestSearchItemWireAction(t *testing.T) {
 	for _, raw := range []string{
 		`{"id":"search","turn_id":"turn","type":"web_search_call","status":"completed","action":{"type":"search","query":"reference"}}`,
 		`{"id":"search","turn_id":"turn","type":"web_search_call","status":"completed","action":{"type":"search"}}`,
@@ -166,13 +149,6 @@ func TestStoredSearchItemRoundTripPreservesPayload(t *testing.T) {
 		if err := json.Unmarshal([]byte(raw), &item); err != nil {
 			t.Fatal(err)
 		}
-		stored, err := item.MarshalStored()
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(stored) != raw {
-			t.Fatalf("stored replay changed: %s, want %s", stored, raw)
-		}
 		wire := fields(t, item)
 		if item.Action == nil {
 			expectField(t, wire, "action", "null")
diff --git a/contracts/agents-api/v1/subagent_items.go b/contracts/agents-api/v1/subagent_items.go
index b9c4a1533..0c21e078b 100644
--- a/contracts/agents-api/v1/subagent_items.go
+++ b/contracts/agents-api/v1/subagent_items.go
@@ -5,9 +5,10 @@ import (
 	"errors"
 )
 
-// MarshalJSON renders the wire shape. Messages always carry content and a
-// nullable phase, function results a nullable output and error, and web search
-// a nullable action. Other variants use the stored encoding.
+// MarshalJSON renders the wire shape, which is also the stored encoding.
+// Messages always carry content and a nullable phase, function results a
+// nullable output and error, and web search a nullable action. Coordination
+// and reasoning variants keep their required fields and nulls.
 func (i Item) MarshalJSON() ([]byte, error) {
 	type wire Item
 	switch i.Type {
@@ -36,23 +37,6 @@ func (i Item) MarshalJSON() ([]byte, error) {
 			Output any `json:"output"`
 			Error  any `json:"error"`
 		}{wire(i), i.Output, i.Error})
-	}
-	return i.MarshalStored()
-}
-
-// MarshalStored encodes a persisted Item payload. It keeps the encoding used
-// before the wire nulls above, so stored payloads and the byte comparison of
-// replayed child Items do not change. Coordination variants keep their
-// required fields and nulls in both forms.
-func (i Item) MarshalStored() ([]byte, error) {
-	switch i.Type {
-	case "web_search_call":
-		type wire Item
-		type storedAction WebSearchAction
-		return json.Marshal(struct {
-			wire
-			Action *storedAction `json:"action,omitempty"`
-		}{wire(i), (*storedAction)(i.Action)})
 	case "create_subagent_call", "send_subagent_input_call", "agent_message":
 		content, err := coordinationContent(i.Content)
 		if err != nil {
@@ -84,10 +68,8 @@ func (i Item) MarshalStored() ([]byte, error) {
 			summary = []SummaryText{}
 		}
 		return json.Marshal(ReasoningItem{ID: i.ID, TurnID: i.TurnID, Type: i.Type, Status: status, Summary: summary})
-	default:
-		type wire Item
-		return json.Marshal(wire(i))
 	}
+	return json.Marshal(wire(i))
 }
 
 func coordinationContent(parts []ItemContent) ([]AgentContent, error) {
diff --git a/contracts/agents-api/zh/sessions-events.md b/contracts/agents-api/zh/sessions-events.md
index 519727458..cb7230f99 100644
--- a/contracts/agents-api/zh/sessions-events.md
+++ b/contracts/agents-api/zh/sessions-events.md
@@ -1,7 +1,7 @@
 ---
 title: "会话、事件和历史"
 source: contracts/agents-api/sessions-events.md
-source_hash: d5d0928665f38105167e592f9561c3d3852a13fc11b976f15c1bc4cc2ca9cb14
+source_hash: c6141811b426fb0dfb95105b27cc381af5f22e3a7923a171f113f228ae0a5b33
 ---
 
 本契约涵盖会话（Session）内部发生的事情：发送输入、实时事件流，以及读取轮次（Turn）、条目（Item）和使用量的持久化历史。会话资源本身（创建配置、重试标识、更新、列出和删除）见 [Core 线协议行为](wire-semantics.md)。消息和函数结果内容见[消息内容](message-content.md)。[Agents API 指南](../../../docs/zh/api/public-agent-api.md)展示了使用 SDK 和 HTTP 的调用方式。
@@ -41,7 +41,7 @@ Turn 失败后会话仍可使用：新输入会启动一个新 Turn。后来预
 - **取消。** 排队的 Turn 无需活动 Runtime 即可取消。正在运行的 Turn 只有在 Runtime 确认后才会取消；完成操作可能赢得该竞争。读取到 `cancelled` 时才表示该 Turn 已停止，而不是请求返回时。在没有待处理输入的情况下，对空闲会话执行的取消会被接受且不产生任何效果；而在输入预留待处理期间，取消会返回 409。
 - **函数结果。** `turn_id`、`call_id` 和 `success` 为必填项；`output` 和 `error` 为可选项且可为空（[内容规则](message-content.md#function-results)）。重复提交完全相同的结果会返回 202，不会再次应用或发出事件。harness 应用结果时才会出现结果 Item；如果取消操作导致结果无法应用，结果仍会存储，但不会产生 Item。
 - **排队。** 当一个已连接且支持该会话 harness 和配置的 Runtime 接入，并且 Core 的 [`core.execution_concurrency`](../../../docs/zh/configuration.md#settings) 工作槽位有一个空闲时，排队的 Turn 才会启动。会话始终绑定到首次运行它的 Runtime。
-- **执行可用性。** 不具备执行能力的服务会返回 503 `execution_unavailable`，失去执行所有权的 Worker 会返回 503。创建时未指定模型提供方的会话会拒绝新消息并返回 400 `model_provider_required`（[模型执行](model-execution.md)）。
+- **执行可用性。** 不具备执行能力的服务会返回 503 `execution_unavailable`，失去执行所有权的 Worker 会返回 503。
 
 ### 包含 Environment 的会话 {#sessions-with-an-environment}
 
diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index e80ea729c..47031e10a 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -177,7 +177,7 @@ A streaming Session creation reuses atomic input admission and the live event lo
 
 Public Items read a projection updated in the same Session transaction as admitted messages and journal batches. Item IDs derive from the Turn and source identity, and the first-observation timestamp and tie breakers never change when content or status does. Each new Item's Session position is allocated under the Session lock, preserving observation order for equal timestamps, and each Turn allocates its own zero-based `output_index`, which inputs do not consume; updates and retries keep both.
 
-Item merging never mutates the incoming observation or the previous snapshot: public text delta events read the original fragment after merging, while the Item keeps the accumulated text, and the content slice is copied before its text pointer is replaced. A first observation without its own fragment carries its unchanged text in one delta. Wire-only explicit nulls come from response marshalling, while stored Item payloads keep their original encoding through `Item.MarshalStored`, so replayed child Items compare equal. Structured tool JSON is kept without float conversion, and an unfinished call never becomes a successful result. When a Turn ends, `sessions.EndTurn` makes its unfinished Items incomplete with their partial content and reports them in Session position order before the Turn's event and its settled Session activity; `sessionpg` gives them one shared settlement time. Function results are Session input Items: they emit `item.added` with a null `output_index` and never `item.done`, whose upstream union allows only agent output, and their public output and error come from the saved submission.
+Item merging never mutates the incoming observation or the previous snapshot: public text delta events read the original fragment after merging, while the Item keeps the accumulated text, and the content slice is copied before its text pointer is replaced. A first observation without its own fragment carries its unchanged text in one delta. Stored Item payloads use the wire encoding, explicit nulls included, so a replayed child Item compares equal to its stored payload. Structured tool JSON is kept without float conversion, and an unfinished call never becomes a successful result. When a Turn ends, `sessions.EndTurn` makes its unfinished Items incomplete with their partial content and reports them in Session position order before the Turn's event and its settled Session activity; `sessionpg` gives them one shared settlement time. Function results are Session input Items: they emit `item.added` with a null `output_index` and never `item.done`, whose upstream union allows only agent output, and their public output and error come from the saved submission.
 
 ## Worker ownership
 
diff --git a/services/core/internal/api/errors_sessions.go b/services/core/internal/api/errors_sessions.go
index 8806156ee..64ed5b977 100644
--- a/services/core/internal/api/errors_sessions.go
+++ b/services/core/internal/api/errors_sessions.go
@@ -38,8 +38,6 @@ func writeSessionsError(w http.ResponseWriter, r *http.Request, err error) {
 		writeError(w, http.StatusUnauthorized, "installation_authorization_invalid", sessions.ErrInstallationAuthorization.Error())
 	case errors.Is(err, sessions.ErrExecutorCredentialExists):
 		writeError(w, http.StatusConflict, "executor_credential_exists", "This executor key ID already exists. Explicitly rotate it to replace the secret.")
-	case errors.Is(err, execution.ErrModelProviderRequired):
-		writeError(w, http.StatusBadRequest, "model_provider_required", "This Session was created without a model provider and cannot run. Create a new Session with x_agents_core.model_provider or an Agent that has one saved.")
 	case errors.Is(err, sessions.ErrHostedEnvironmentFailed):
 		// Observed official status, type, code, null param and message.
 		writeError(w, http.StatusConflict, "conflict_error", "the hosted environment failed to provision")
diff --git a/services/core/internal/api/native_classification_integration_test.go b/services/core/internal/api/native_classification_integration_test.go
index 47a621d6a..0a13c9e78 100644
--- a/services/core/internal/api/native_classification_integration_test.go
+++ b/services/core/internal/api/native_classification_integration_test.go
@@ -26,7 +26,7 @@ func TestNativeClassificationPostgresRoundTripAndPublicPrivacy(t *testing.T) {
 				t.Fatal(err)
 			}
 			session := created.Session
-			receipt := submitMessage(t, pool, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
+			receipt := submitMessage(t, pool, tenant, session.ID, "input", "test")
 			transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 			status := 503
 			result := execution.Result{ErrorCode: "engine_failed", Error: "Bearer secret-canary https://private.example/key", EngineErrorCode: code, EngineHTTPStatus: &status, Done: proto.DonePayload{Usage: proto.Usage{InputTokens: 7, OutputTokens: 3}, Metadata: map[string]any{proto.DoneMetaAgentSessionID: "native-secret-canary"}}}
diff --git a/services/core/internal/api/session_diagnostics_public_compat_test.go b/services/core/internal/api/session_diagnostics_public_compat_test.go
index bb5fa50eb..4394dd0b2 100644
--- a/services/core/internal/api/session_diagnostics_public_compat_test.go
+++ b/services/core/internal/api/session_diagnostics_public_compat_test.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"testing"
 
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
@@ -73,13 +74,15 @@ func databaseSessionReads(pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
 	}
 }
 
-// submitMessage admits one message input through the Session service on pool.
-func submitMessage(t *testing.T, pool *pgxpool.Pool, tenant, session, key string, payload json.RawMessage) sessions.InputReceipt {
+// submitMessage admits one public text message through the Session service on
+// pool.
+func submitMessage(t *testing.T, pool *pgxpool.Pool, tenant, session, key, text string) sessions.InputReceipt {
 	t.Helper()
 	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
+	payload, _ := json.Marshal(v1.SessionInput{Type: "agent.session.input.message", Input: []v1.InputMessage{{Role: "user", Content: []v1.InputContent{{Type: "input_text", Text: &text}}}}})
 	receipts, err := service.SubmitInputs(t.Context(), tenant, session, key, []sessions.Input{{Kind: "message", Payload: payload}})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/api/session_diagnostics_test.go b/services/core/internal/api/session_diagnostics_test.go
index a9365ba25..21ad01899 100644
--- a/services/core/internal/api/session_diagnostics_test.go
+++ b/services/core/internal/api/session_diagnostics_test.go
@@ -20,7 +20,7 @@ func TestDiagnosticsCoreHandlerDatabaseBoundary(t *testing.T) {
 		t.Fatal(err)
 	}
 	session := created.Session
-	receipt := submitMessage(t, pool, tenant, session.ID, "input", json.RawMessage(`{"text":"input-secret-canary"}`))
+	receipt := submitMessage(t, pool, tenant, session.ID, "input", "input-secret-canary")
 	transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress})
 	transitionTurn(t, pool, tenant, session.ID, receipt.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"device_disconnected","error":"Bearer raw-secret-canary https://private.example/key","done":{"native_id":"secret-native-canary"}}`)})
 	base := adminSessionsPath + session.ID
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index a0cde3cd0..95353a660 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -93,7 +93,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			inputs, err := service.SubmitInputs(t.Context(), project.TenantID, session.ID, "start", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"run"}`)}})
+			inputs, err := service.SubmitInputs(t.Context(), project.TenantID, session.ID, "start", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"run"}]}]}`)}})
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/execution/environment_admission.go b/services/core/internal/execution/environment_admission.go
index d078186e7..52d1c3b05 100644
--- a/services/core/internal/execution/environment_admission.go
+++ b/services/core/internal/execution/environment_admission.go
@@ -87,13 +87,6 @@ func (w *Worker) submitEnvironmentInputs(ctx context.Context, session sessions.S
 		// Neither kind creates a Turn. The Session lock preserves target and retry identity.
 		return w.admitInputs(ctx, session.TenantID, session.ID, key, inputs)
 	}
-	// Messages start work. A Session from before deployment defaults moved into
-	// Core may have no frozen provider; reject it here instead of queueing work
-	// its harness cannot run. Cancellation and results above stay available.
-	var snapshot Snapshot
-	if json.Unmarshal(session.Configuration, &snapshot) != nil || !snapshot.ModelProviderConfigured {
-		return nil, ErrModelProviderRequired
-	}
 	changed, unsubscribe := w.dispatcher.notifications.subscribe(session.TenantID, session.ID)
 	defer unsubscribe()
 	reserve, cancel := context.WithTimeout(ctx, 5*time.Second)
diff --git a/services/core/internal/execution/message_input.go b/services/core/internal/execution/message_input.go
index 328567f6f..c0dd9e8db 100644
--- a/services/core/internal/execution/message_input.go
+++ b/services/core/internal/execution/message_input.go
@@ -10,17 +10,11 @@ import (
 )
 
 func messageInput(raw json.RawMessage) (proto.MessageInput, error) {
-	var input struct {
-		Text  *string           `json:"text"`
-		Input []v1.InputMessage `json:"input"`
-	}
+	var input v1.SessionInput
 	if json.Unmarshal(raw, &input) != nil {
 		return nil, sessions.ErrInvalidInput
 	}
 	var messages proto.MessageInput
-	if len(input.Input) == 0 && input.Text != nil {
-		messages = proto.TextInput(*input.Text)
-	}
 	for _, message := range input.Input {
 		if message.Role != "user" {
 			return nil, sessions.ErrInvalidInput
diff --git a/services/core/internal/execution/message_support_test.go b/services/core/internal/execution/message_support_test.go
index 773893fe6..edccfaa8c 100644
--- a/services/core/internal/execution/message_support_test.go
+++ b/services/core/internal/execution/message_support_test.go
@@ -33,7 +33,7 @@ func TestMessageImageQualificationIsOperationSpecific(t *testing.T) {
 	}
 	// Message validation applies even when no function-result validator exists.
 	raw, _ := json.Marshal(map[string]any{"input": []any{map[string]any{"role": "user", "content": input[0].Content}}})
-	batch := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"valid first"}`)}, {Kind: "message", Payload: raw}}
+	batch := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"valid first"}]}]}`)}, {Kind: "message", Payload: raw}}
 	if err := validateProfileInputs(enginetest.Profile(nil), "none", batch); !errors.Is(err, sessions.ErrInvalidInput) {
 		t.Fatal("image escaped profile validation", err)
 	}
@@ -73,10 +73,6 @@ func TestWhitespaceOnlyTextQualificationUsesEngineProfiles(t *testing.T) {
 		}
 	}
 	claude, _ := (engine.Catalog{}).Lookup("claude_sdk")
-	// Legacy text payloads use the same rule.
-	if err := validateProfileInputs(claude, "none", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":" \t"}`)}}); !errors.Is(err, ErrWhitespaceOnlyText) {
-		t.Fatal(err)
-	}
 	mixed, _ := json.Marshal(map[string]any{"input": []any{map[string]any{"role": "user", "content": []any{
 		map[string]any{"type": "input_text", "text": " "}, map[string]any{"type": "input_text", "text": "text"}}},
 		map[string]any{"role": "user", "content": []any{map[string]any{"type": "input_text", "text": " "}, map[string]any{"type": "input_image", "image_url": url}}}}})
diff --git a/services/core/internal/execution/model_execution_test.go b/services/core/internal/execution/model_execution_test.go
index 627a3161f..d4964e10b 100644
--- a/services/core/internal/execution/model_execution_test.go
+++ b/services/core/internal/execution/model_execution_test.go
@@ -21,13 +21,6 @@ func TestSessionModelExecutionNeverFallsBack(t *testing.T) {
 	if _, err := d.executionRequest(t.Context(), session, Snapshot{ModelProviderConfigured: true}, runtimedevice.KindCapabilities{}, sessions.ExecutionBinding{}); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("missing Session credentials fell back", err)
 	}
-	// Hosted and self-hosted Runtimes have no model configuration of their own.
-	for _, environment := range []string{"openai_hosted", "self_hosted"} {
-		snapshot := Snapshot{Environment: &v1.Environment{Type: environment}}
-		if _, err := d.executionRequest(t.Context(), sessions.Session{Engine: "codex"}, snapshot, runtimedevice.KindCapabilities{}, sessions.ExecutionBinding{}); !errors.Is(err, ErrModelProviderRequired) {
-			t.Fatal("provider-free Session dispatched", environment, err)
-		}
-	}
 	// A none device without a frozen provider uses its own provider environment:
 	// Core sends only the Agent's model and instructions.
 	instructions := "Keep this instruction."
diff --git a/services/core/internal/execution/prepared_dispatch.go b/services/core/internal/execution/prepared_dispatch.go
index 751578383..fa2b11b0b 100644
--- a/services/core/internal/execution/prepared_dispatch.go
+++ b/services/core/internal/execution/prepared_dispatch.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 	"time"
 
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
@@ -42,10 +41,6 @@ func (d *Dispatcher) RunEnvironmentInput(ctx context.Context, lease Ownership, t
 	if json.Unmarshal(session.Configuration, &snapshot) != nil || strings.TrimSpace(snapshot.Agent.Model) == "" {
 		return run, sessions.ErrInvalidInput
 	}
-	if !snapshot.ModelProviderConfigured && snapshot.Environment != nil && v1.ModelProviderRequired(snapshot.Environment.Type) {
-		// Reserved before providers were required; the caller settles it as failed.
-		return run, ErrModelProviderRequired
-	}
 	bound, err := d.SessionsReader.GetSessionExecutionBinding(ctx, tenantID, sessionID)
 	if err != nil {
 		return run, err
diff --git a/services/core/internal/execution/request.go b/services/core/internal/execution/request.go
index 99b06d1f1..621bc16ad 100644
--- a/services/core/internal/execution/request.go
+++ b/services/core/internal/execution/request.go
@@ -5,17 +5,12 @@ import (
 	"encoding/json"
 	"errors"
 
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
-// ErrModelProviderRequired reports a hosted or self-hosted Session that has no
-// frozen model provider and therefore cannot run.
-var ErrModelProviderRequired = errors.New("the Session has no model provider")
-
 func (d *Dispatcher) executionRequest(ctx context.Context, session sessions.Session, snapshot Snapshot, caps runtimedevice.KindCapabilities, bound sessions.ExecutionBinding) (proto.PromptRequestPayload, error) {
 	recoverNativeSession := bound.HasStartedTurn && bound.NativeSessionID == ""
 	if recoverNativeSession && !caps.NativeSessionRecovery {
@@ -31,10 +26,6 @@ func (d *Dispatcher) executionRequest(ctx context.Context, session sessions.Sess
 		if err != nil {
 			return proto.PromptRequestPayload{}, err
 		}
-	} else if snapshot.Environment != nil && v1.ModelProviderRequired(snapshot.Environment.Type) {
-		// Require the frozen bundle before dispatch so the harness cannot
-		// select an implicit provider endpoint.
-		return proto.PromptRequestPayload{}, ErrModelProviderRequired
 	}
 	options["model"], options["system_prompt"] = snapshot.Agent.Model, snapshot.Agent.Instructions
 	if snapshot.Agent.XAgentsCore != nil && len(snapshot.Agent.XAgentsCore.HarnessConfig) > 0 {
diff --git a/services/core/internal/execution/worker.go b/services/core/internal/execution/worker.go
index 2ebb2c20f..137dd1a82 100644
--- a/services/core/internal/execution/worker.go
+++ b/services/core/internal/execution/worker.go
@@ -365,9 +365,6 @@ func (w *Worker) runClaim(ctx context.Context, item sessions.ExecutionWork) erro
 	var rejection *preparationRejection
 	capacityRejected := errors.As(err, &rejection) && rejection.operation == proto.TypeExecutionPrepare && rejection.code == "preparation_capacity"
 	outcome := json.RawMessage(`{"error_code":"execution_unavailable"}`)
-	if errors.Is(err, ErrModelProviderRequired) {
-		outcome = json.RawMessage(`{"error_code":"model_provider_required"}`)
-	}
 	finish, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	turn, err := w.dispatcher.SessionsReader.GetTurn(finish, item.TenantID, item.SessionID, item.TurnID)
diff --git a/services/core/internal/execution/worker_schedule.go b/services/core/internal/execution/worker_schedule.go
index de5ac027a..bf3a821cc 100644
--- a/services/core/internal/execution/worker_schedule.go
+++ b/services/core/internal/execution/worker_schedule.go
@@ -93,9 +93,6 @@ func (w *Worker) runEnvironmentInput(ctx context.Context, item scheduledWork) er
 	if err == nil {
 		return nil
 	}
-	if errors.Is(err, ErrModelProviderRequired) {
-		return w.dispatcher.sessionExecution.FailEnvironmentInput(ctx, item.TenantID, item.SessionID, item.reservationID, "model_provider_required")
-	}
 	if errors.Is(err, errPreparationFailed) && run.Reservation.State == sessions.EnvironmentInputPending {
 		return w.dispatcher.sessionExecution.FailEnvironmentInput(ctx, item.TenantID, item.SessionID, item.reservationID, "runtime_preparation_failed")
 	}
diff --git a/services/core/internal/items/changes_test.go b/services/core/internal/items/changes_test.go
index 38cf514ca..96f98766a 100644
--- a/services/core/internal/items/changes_test.go
+++ b/services/core/internal/items/changes_test.go
@@ -57,7 +57,7 @@ func TestObserveDecidesItemChanges(t *testing.T) {
 		},
 		{
 			name: "an input message takes no output index", kind: "message",
-			update: project("message", `{"text":"hello"}`),
+			update: project("message", `{"type":"agent.session.input.message","input":[{"role":"user","content":[{"type":"input_text","text":"hello"}]}]}`),
 			check:  func(c Change) bool { return !c.Output && c.Item.Role == "user" },
 		},
 	} {
diff --git a/services/core/internal/items/inputs.go b/services/core/internal/items/inputs.go
index 62d0efe8d..67bd00d4d 100644
--- a/services/core/internal/items/inputs.go
+++ b/services/core/internal/items/inputs.go
@@ -9,20 +9,16 @@ import (
 
 func inputMessages(turn string, sequence int64, raw json.RawMessage) []Update {
 	var p struct {
-		Text  *string `json:"text"`
 		Input []struct {
 			Role    string           `json:"role"`
 			Content []v1.ItemContent `json:"content"`
 		} `json:"input"`
 	}
-	// Internal admission predates the public schema and accepts arbitrary objects.
+	// Session admission stores any JSON object; only public messages project.
 	if err := json.Unmarshal(raw, &p); err != nil {
 		return nil
 	}
 	key := "input:" + strconv.FormatInt(sequence, 10)
-	if p.Text != nil {
-		return []Update{{Item: message(turn, key, "user", *p.Text, "completed")}}
-	}
 	var updates []Update
 	for i, input := range p.Input {
 		if input.Role != "user" || len(input.Content) == 0 {
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_inputs_test.go b/services/core/internal/persistence/postgres/sessionpg/execution_inputs_test.go
index 22807a559..80af513a5 100644
--- a/services/core/internal/persistence/postgres/sessionpg/execution_inputs_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/execution_inputs_test.go
@@ -308,7 +308,7 @@ func TestEnvironmentInputPromotionRollsBackHistoryAndSettlement(t *testing.T) {
 			ctx := t.Context()
 			pending := reserve(t, service, tenant, session, "pending")
 			name := "reservation_failure_" + strings.ReplaceAll(uuid.NewString(), "-", "")
-			table, expression := "turn_inputs", "session_id <> '"+text(session)+"'::uuid OR payload->>'text' <> 'second'"
+			table, expression := "turn_inputs", "session_id <> '"+text(session)+"'::uuid OR payload#>>'{input,0,content,0,text}' <> 'second'"
 			switch phase {
 			case "settlement":
 				table, expression = "environment_input_reservations", "id <> '"+pending.ID+"'::uuid OR state <> 'admitted'"
diff --git a/services/core/internal/persistence/postgres/sessionpg/inputs_test.go b/services/core/internal/persistence/postgres/sessionpg/inputs_test.go
index e2f9e1b2f..450660b4b 100644
--- a/services/core/internal/persistence/postgres/sessionpg/inputs_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/inputs_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
 
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
@@ -22,8 +23,10 @@ var messagePayload = json.RawMessage(`{"input":[{"role":"user","content":[{"type
 
 var cancelInput = sessions.Input{Kind: "cancel", Payload: json.RawMessage(`{}`)}
 
+// messageInput is a public message event with one text part, as the events
+// route stores it.
 func messageInput(text string) sessions.Input {
-	payload, _ := json.Marshal(map[string]string{"text": text})
+	payload, _ := json.Marshal(v1.SessionInput{Type: "agent.session.input.message", Input: []v1.InputMessage{{Role: "user", Content: []v1.InputContent{{Type: "input_text", Text: &text}}}}})
 	return sessions.Input{Kind: "message", Payload: payload}
 }
 
@@ -314,7 +317,7 @@ func TestInputBatchesAreOrderedAndIdempotentAcrossConnections(t *testing.T) {
 		t.Fatalf("inputs=%d err=%v", len(inputs), err)
 	}
 	for i, input := range inputs {
-		var payload map[string]string
+		var payload v1.SessionInput
 		if err := json.Unmarshal(input.Payload, &payload); err != nil {
 			t.Fatal(err)
 		}
@@ -322,7 +325,7 @@ func TestInputBatchesAreOrderedAndIdempotentAcrossConnections(t *testing.T) {
 		if i%2 == 1 {
 			want = "second"
 		}
-		if payload["text"] != want {
+		if *payload.Input[0].Content[0].Text != want {
 			t.Fatalf("batch interleaved at %d: %v", i, payload)
 		}
 	}
@@ -355,7 +358,7 @@ func TestBatchRetriesCompareTheWholeRequestAndRetainTargets(t *testing.T) {
 			t.Fatalf("changed batch accepted: %v", err)
 		}
 	}
-	batch[1].Payload = json.RawMessage(`{ "text" : "one" }`)
+	batch[1].Payload = json.RawMessage(`{ "input" : [ { "content" : [ { "text" : "one", "type" : "input_text" } ], "role" : "user" } ], "type" : "agent.session.input.message" }`)
 	pool.Close()
 	restartedStore, restarted := stagingService(t, pgtest.Open(t))
 	retry, err := restarted.SubmitInputs(ctx, text(tenant), text(session), "mixed", batch)
diff --git a/services/core/internal/persistence/postgres/sessionpg/items.go b/services/core/internal/persistence/postgres/sessionpg/items.go
index 3e818822f..9c8072bc4 100644
--- a/services/core/internal/persistence/postgres/sessionpg/items.go
+++ b/services/core/internal/persistence/postgres/sessionpg/items.go
@@ -64,7 +64,7 @@ func (t *SessionTx) PutItem(ctx context.Context, turnID string, created time.Tim
 	if err != nil {
 		return nil, err
 	}
-	payload, err := change.Item.MarshalStored()
+	payload, err := json.Marshal(change.Item)
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/core/internal/sessions/creation_test.go b/services/core/internal/sessions/creation_test.go
index 2fa58c0da..865fee9e1 100644
--- a/services/core/internal/sessions/creation_test.go
+++ b/services/core/internal/sessions/creation_test.go
@@ -423,7 +423,7 @@ func TestCreateSession(t *testing.T) {
 		}
 		want := []string{"UpsertSession create", "LockSkills skill_a", "ReadSkillVersion skill_a 3", "SaveModelExecution https://model.example/v1",
 			"SaveExecutionConfiguration available " + uuid.Nil.String(), "SaveInitialFiles 1", "SaveSetup skill_a@3", "CreateEnvironment",
-			"LoadEnvironmentInput", `CreateInputReservation <key> [{"kind":"message","payload":{"text":"hi"}}] initial`, "LoadEnvironmentInput",
+			"LoadEnvironmentInput", `CreateInputReservation <key> [{"kind":"message","payload":` + hi + `}] initial`, "LoadEnvironmentInput",
 			"PruneChanges", "AuditCreation session:session environment:environment:session", "LoadSession"}
 		if strings.Join(calls, "\n") != strings.Join(want, "\n") {
 			t.Fatalf("calls:\n%s\nwant:\n%s", strings.Join(calls, "\n"), strings.Join(want, "\n"))
diff --git a/services/core/internal/sessions/environment_inputs_test.go b/services/core/internal/sessions/environment_inputs_test.go
index f49fd2aaf..46b8cc9f7 100644
--- a/services/core/internal/sessions/environment_inputs_test.go
+++ b/services/core/internal/sessions/environment_inputs_test.go
@@ -51,7 +51,7 @@ func TestJoinsActiveTurn(t *testing.T) {
 }
 
 func TestReserveEnvironmentInput(t *testing.T) {
-	const batch = `[{"kind":"message","payload":{"text":"hi"}}]`
+	const batch = `[{"kind":"message","payload":` + hi + `}]`
 	find := "FindInputReservation request " + batch
 	reserve := func(t *testing.T, tx *fakeInputTx) (EnvironmentInputReservation, error) {
 		tx.loadEnvironmentInput = inputs()
diff --git a/services/core/internal/sessions/inputs_test.go b/services/core/internal/sessions/inputs_test.go
index 22930d983..d847b3f82 100644
--- a/services/core/internal/sessions/inputs_test.go
+++ b/services/core/internal/sessions/inputs_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/items"
 )
 
@@ -104,11 +105,16 @@ func (s *fakeStorage) WithInputs(ctx context.Context, tenant, session string, ap
 // inputKey is the idempotency key of the input batches under test.
 const inputKey = "request"
 
+// messageInput is a public message event with one text part, as the events
+// route stores it.
 func messageInput(text string) Input {
-	payload, _ := json.Marshal(map[string]string{"text": text})
+	payload, _ := json.Marshal(v1.SessionInput{Type: "agent.session.input.message", Input: []v1.InputMessage{{Role: "user", Content: []v1.InputContent{{Type: "input_text", Text: &text}}}}})
 	return Input{Kind: "message", Payload: payload}
 }
 
+// hi is the payload of messageInput("hi") as admission normalizes it.
+const hi = `{"input":[{"content":[{"text":"hi","type":"input_text"}],"role":"user"}],"type":"agent.session.input.message"}`
+
 var cancelInput = Input{Kind: "cancel", Payload: json.RawMessage(`{}`)}
 
 // sequences is a fake CreateTurnInput that allocates sequences from first.
@@ -144,7 +150,7 @@ func TestValidateInputs(t *testing.T) {
 }
 
 func TestValidateMessageInputs(t *testing.T) {
-	if _, encoded, err := validateMessageInputs([]Input{messageInput("hi")}); err != nil || string(encoded) != `[{"kind":"message","payload":{"text":"hi"}}]` {
+	if _, encoded, err := validateMessageInputs([]Input{messageInput("hi")}); err != nil || string(encoded) != `[{"kind":"message","payload":`+hi+`}]` {
 		t.Fatalf("batch %s, %v", encoded, err)
 	}
 	for name, inputs := range map[string][]Input{"cancel": {messageInput("hi"), cancelInput}, "no inputs": nil} {
@@ -205,13 +211,13 @@ func TestAdmitInput(t *testing.T) {
 		tx := newInputTx(t)
 		tx.loadActiveTurn, tx.createTurn, tx.appendChanges = activeTurn(nil), returns(turnWith(TurnQueued)), collect(&changes)
 		tx.createTurnInput, tx.loadUsage = sequences(7), returns(json.RawMessage(`{}`))
-		tx.loadInputSource = returns(Source{Turn: testTurn, Kind: "message", Sequence: 7, Payload: json.RawMessage(`{"text":"hi"}`)})
+		tx.loadInputSource = returns(Source{Turn: testTurn, Kind: "message", Sequence: 7, Payload: messageInput("hi").Payload})
 		tx.loadItem, tx.putItem = returns(items.Stored{}), func(items.Change) (*int32, error) { return nil, nil }
 		receipt, err := admitInput(t.Context(), tx, inputKey, 0, messageInput("hi"))
 		if err != nil || receipt != (InputReceipt{Sequence: 7, TurnID: testTurn}) {
 			t.Fatalf("receipt %+v, %v", receipt, err)
 		}
-		item := items.Identity(testTurn, "input:7")
+		item := items.Identity(testTurn, "input:7:0")
 		assertCalls(t, tx.fakeTx, "LoadActiveTurn", "CreateTurn", "AppendChanges agent.session.turn.created", "CreateTurnInput "+testTurn+" request 0 message",
 			"LoadInputSource 7", "LoadItem "+testTurn+" "+item, "PutItem "+testTurn+" "+item, "AppendChanges agent.session.turn.item.added",
 			"LoadUsage", "AppendChanges agent.session.in_progress")
@@ -255,7 +261,7 @@ func TestAdmitInput(t *testing.T) {
 }
 
 func TestSubmitInputs(t *testing.T) {
-	const batch = `[{"kind":"message","payload":{"text":"hi"}},{"kind":"cancel","payload":{}}]`
+	const batch = `[{"kind":"message","payload":` + hi + `},{"kind":"cancel","payload":{}}]`
 	inputs := []Input{messageInput("hi"), cancelInput}
 	running := turnWith(TurnInProgress)
 	submit := func(t *testing.T, tx *fakeInputTx, inputs []Input) ([]InputReceipt, error) {
diff --git a/services/core/internal/sessions/subagents.go b/services/core/internal/sessions/subagents.go
index ba982ab0b..14327ff31 100644
--- a/services/core/internal/sessions/subagents.go
+++ b/services/core/internal/sessions/subagents.go
@@ -346,7 +346,7 @@ func projectSubagentItem(ctx context.Context, tx ProjectionTx, raw json.RawMessa
 // the Session stream carries root work, and child history is read through the
 // Subagent routes.
 func putChildItem(ctx context.Context, tx SubagentProjectionTx, turn ChildTurn, position int32, item v1.Item) error {
-	payload, err := item.MarshalStored()
+	payload, err := json.Marshal(item)
 	if err != nil {
 		return err
 	}
diff --git a/services/core/tests/fixtures/main.go b/services/core/tests/fixtures/main.go
index b55810eca..c97d6f33b 100644
--- a/services/core/tests/fixtures/main.go
+++ b/services/core/tests/fixtures/main.go
@@ -58,7 +58,7 @@ func seed() error {
 		return err
 	}
 	for _, status := range []string{sessions.TurnCompleted, sessions.TurnFailed, sessions.TurnCancelled, sessions.TurnInProgress} {
-		receipts, err := service.SubmitInputs(ctx, f.Tenant, f.Session, uuid.NewString(), []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"recovery fixture"}`)}})
+		receipts, err := service.SubmitInputs(ctx, f.Tenant, f.Session, uuid.NewString(), []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"type":"agent.session.input.message","input":[{"role":"user","content":[{"type":"input_text","text":"recovery fixture"}]}]}`)}})
 		if err != nil {
 			return err
 		}
diff --git a/services/core/tests/integration/admin_session_archive_race_test.go b/services/core/tests/integration/admin_session_archive_race_test.go
index 2bd929df6..e973a7c72 100644
--- a/services/core/tests/integration/admin_session_archive_race_test.go
+++ b/services/core/tests/integration/admin_session_archive_race_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"encoding/json"
 	"errors"
 	"strings"
 	"sync"
@@ -59,7 +58,7 @@ func TestManagedSessionArchiveOrdersConcurrentInput(t *testing.T) {
 		go func() {
 			defer wg.Done()
 			<-start
-			_, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "racing-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"racing"}`)}})
+			_, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "racing-input", []sessions.Input{messageInput("racing")})
 			if err != nil && !errors.Is(err, sessions.ErrEnvironmentUnavailable) {
 				t.Error(err)
 			}
diff --git a/services/core/tests/integration/admin_session_archive_test.go b/services/core/tests/integration/admin_session_archive_test.go
index df75725eb..846c69b12 100644
--- a/services/core/tests/integration/admin_session_archive_test.go
+++ b/services/core/tests/integration/admin_session_archive_test.go
@@ -85,7 +85,7 @@ func archiveAllocation(t *testing.T, w *Store, tenant string, session sessions.S
 func TestManagedSessionArchiveUnallocatedAndGuards(t *testing.T) {
 	s, w, installation := managedArchiveFixture(t)
 	input := managerSessionInput(uuid.NewString())
-	input.InitialInputs = []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"waiting"}`)}}
+	input.InitialInputs = []sessions.Input{messageInput("waiting")}
 	tenant, session := managedArchiveSession(t, s, input)
 	ctx := adminDeleteContext(t.Context(), tenant, uuid.NewString())
 	active, err := sessionAdapter(s).GetManagedSessionArchive(t.Context(), tenant, session.ID)
@@ -135,7 +135,7 @@ func TestManagedSessionArchiveUnallocatedAndGuards(t *testing.T) {
 	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, deployment.ErrInvalidInput) {
 		t.Fatal("archived Environment allocated after archive", err)
 	}
-	if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); !errors.Is(err, sessions.ErrEnvironmentUnavailable) {
+	if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{messageInput("later")}); !errors.Is(err, sessions.ErrEnvironmentUnavailable) {
 		t.Fatal("archived Environment accepted new input", err)
 	}
 	view, err := deploymentService(t, s).View(t.Context())
diff --git a/services/core/tests/integration/admin_session_archive_worker_http_test.go b/services/core/tests/integration/admin_session_archive_worker_http_test.go
index 134fd92d0..00f830760 100644
--- a/services/core/tests/integration/admin_session_archive_worker_http_test.go
+++ b/services/core/tests/integration/admin_session_archive_worker_http_test.go
@@ -94,7 +94,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(t.Context(), s, project.TenantID, active.ID, "pending-turn", json.RawMessage(`{"text":"pending"}`))
+	input, err := sendMessage(t.Context(), s, project.TenantID, active.ID, "pending-turn", messageText("pending"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/archive_cancellation_test.go b/services/core/tests/integration/archive_cancellation_test.go
index 0b64fef50..820ffb596 100644
--- a/services/core/tests/integration/archive_cancellation_test.go
+++ b/services/core/tests/integration/archive_cancellation_test.go
@@ -123,7 +123,7 @@ func TestArchiveWaitingCancellationReceipts(t *testing.T) {
 				}
 				time.Sleep(time.Millisecond)
 			}
-			pending, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
+			pending, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "pending", []sessions.Input{messageInput("first"), messageInput("second")})
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/tests/integration/claude_execution_test.go b/services/core/tests/integration/claude_execution_test.go
index 648969f7c..c5c718d74 100644
--- a/services/core/tests/integration/claude_execution_test.go
+++ b/services/core/tests/integration/claude_execution_test.go
@@ -139,7 +139,7 @@ func TestClaudeInvalidImageResultRejectsWholeBatchBeforePersistence(t *testing.T
 		}
 		return sessions.Input{Kind: "tool_result", Payload: payload}
 	}
-	batch := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"Follow up"}`)}, result(`{"success":true,"output":[{"type":"input_image","image_url":"data:image/png;base64,AA=="}]}`), {Kind: "cancel", Payload: json.RawMessage(`{}`)}}
+	batch := []sessions.Input{messageInput("Follow up"), result(`{"success":true,"output":[{"type":"input_image","image_url":"data:image/png;base64,AA=="}]}`), {Kind: "cancel", Payload: json.RawMessage(`{}`)}}
 	if _, err := worker.SubmitInputs(t.Context(), h.tenant, h.session.ID, "batch", batch); !errors.Is(err, sessions.ErrInvalidInput) {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/command_output_test.go b/services/core/tests/integration/command_output_test.go
index 01406737e..647d05650 100644
--- a/services/core/tests/integration/command_output_test.go
+++ b/services/core/tests/integration/command_output_test.go
@@ -21,7 +21,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"run commands"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", messageText("run commands"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/creation_stream_settlement_public_test.go b/services/core/tests/integration/creation_stream_settlement_public_test.go
index 63e64c863..954300f88 100644
--- a/services/core/tests/integration/creation_stream_settlement_public_test.go
+++ b/services/core/tests/integration/creation_stream_settlement_public_test.go
@@ -170,7 +170,7 @@ func TestCreationStreamPublicLifetimes(t *testing.T) {
 	created.ended(t, 5*time.Second)
 
 	connect(first.Session.Environment.ID)
-	if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, first.Session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); err != nil {
+	if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, first.Session.ID, "later", []sessions.Input{messageInput("later")}); err != nil {
 		t.Fatal(err)
 	}
 	if current, err := sessionAdapter(s).GetSession(t.Context(), tenant, first.Session.ID); err != nil || !current.PendingInput {
diff --git a/services/core/tests/integration/deployment_model_providers_http_test.go b/services/core/tests/integration/deployment_model_providers_http_test.go
index b796d6ebf..8dc8687af 100644
--- a/services/core/tests/integration/deployment_model_providers_http_test.go
+++ b/services/core/tests/integration/deployment_model_providers_http_test.go
@@ -4,24 +4,19 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"net/http/httptest"
 	"strings"
 	"testing"
-	"time"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 )
 
@@ -230,61 +225,6 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 	}
 }
 
-// A hosted or self-hosted Session created before providers were required has
-// no frozen provider: new work is rejected before anything is queued, and input
-// reserved before the upgrade fails with that reason instead of waiting.
-func TestLegacySessionWithoutProviderCannotStartWork(t *testing.T) {
-	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), true)
-	legacy, err := h.s.CreateSession(t.Context(), h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
-		Configuration: []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)})
-	if err != nil {
-		t.Fatal(err)
-	}
-	executor := connectFixtureRuntime(t, h, legacy)
-	// Reserved directly, as a pre-upgrade Core did.
-	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, legacy.ID, "before-upgrade", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"old"}`)}})
-	if err != nil {
-		t.Fatal(err)
-	}
-	worker, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
-	defer stop()
-	_, pool := testStore(t)
-	reservations := func() int {
-		t.Helper()
-		var count int
-		if err := pool.QueryRow(t.Context(), "SELECT count(*) FROM environment_input_reservations WHERE session_id=$1", legacy.ID).Scan(&count); err != nil {
-			t.Fatal(err)
-		}
-		return count
-	}
-	before := reservations()
-	message := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"start"}`)}}
-	if _, err := worker.SubmitInputs(t.Context(), h.tenant, legacy.ID, uuid.NewString(), message); !errors.Is(err, execution.ErrModelProviderRequired) {
-		t.Fatal("provider-free Session accepted work", err)
-	}
-	if after := reservations(); after != before {
-		t.Fatal("rejected work was queued", before, after)
-	}
-	awaitDaemonRemoteCondition(t, t.Context(), 5*time.Second, "legacy reservation settled", func() bool {
-		got, err := sessionAdapter(h.s).GetEnvironmentInputReservation(t.Context(), h.tenant, legacy.ID, pending.ID)
-		return err == nil && got.State == sessions.EnvironmentInputFailed
-	})
-	session, err := sessionAdapter(h.s).GetSession(t.Context(), h.tenant, legacy.ID)
-	if err != nil || session.EnvironmentInputActivity == nil || session.EnvironmentInputActivity.Failure != "model_provider_required" {
-		t.Fatal("legacy reservation did not fail with its reason", session.EnvironmentInputActivity, err)
-	}
-	_ = executor.conn.SetReadDeadline(time.Now().Add(500 * time.Millisecond))
-	for {
-		var frame proto.Envelope
-		if executor.conn.ReadJSON(&frame) != nil {
-			break
-		}
-		if frame.Type == proto.TypeExecutionPrepare {
-			t.Fatal("provider-free work reached the executor", frame.Type)
-		}
-	}
-}
-
 // A none Session may freeze the deployment default, so its caller intent is
 // recorded first: a same-key retry returns the committed Session after the
 // default was replaced or removed.
diff --git a/services/core/tests/integration/dispatch_test.go b/services/core/tests/integration/dispatch_test.go
index 36141beec..7e733aad4 100644
--- a/services/core/tests/integration/dispatch_test.go
+++ b/services/core/tests/integration/dispatch_test.go
@@ -125,8 +125,7 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 
 func (h *dispatchHarness) message(key, text string) sessions.InputReceipt {
 	h.t.Helper()
-	body, _ := json.Marshal(map[string]string{"text": text})
-	r, err := sendMessage(context.Background(), h.s, h.tenant, h.session.ID, key, body)
+	r, err := sendMessage(context.Background(), h.s, h.tenant, h.session.ID, key, messageText(text))
 	if err != nil {
 		h.t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/environment_admission_test.go b/services/core/tests/integration/environment_admission_test.go
index 27e191352..cfbc778fb 100644
--- a/services/core/tests/integration/environment_admission_test.go
+++ b/services/core/tests/integration/environment_admission_test.go
@@ -51,7 +51,7 @@ func submitEnvironmentAdmission(ctx context.Context, h *dispatchHarness, worker
 }
 
 func environmentAdmissionInputs() []sessions.Input {
-	return []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}}
+	return []sessions.Input{messageInput("first"), messageInput("second")}
 }
 
 func awaitEnvironmentAdmission(t *testing.T, result <-chan environmentAdmissionResult) environmentAdmissionResult {
diff --git a/services/core/tests/integration/environment_directory_active_test.go b/services/core/tests/integration/environment_directory_active_test.go
index 96696846f..6d63a0c74 100644
--- a/services/core/tests/integration/environment_directory_active_test.go
+++ b/services/core/tests/integration/environment_directory_active_test.go
@@ -10,7 +10,7 @@ import (
 func TestEnvironmentDirectoryActiveRunUsesExistingOwner(t *testing.T) {
 	h, w, environment := directoryWorker(t)
 	awaitFixtureCapabilities(t, h, workerEnvironmentCapabilities())
-	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "execute", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "execute", []sessions.Input{messageInput("work")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/environment_expiry_dispatch_test.go b/services/core/tests/integration/environment_expiry_dispatch_test.go
index 623fe0ea5..4bc66594b 100644
--- a/services/core/tests/integration/environment_expiry_dispatch_test.go
+++ b/services/core/tests/integration/environment_expiry_dispatch_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
@@ -24,7 +23,7 @@ func TestWorkerEnvironmentExpiryAtFullExecutionCapacity(t *testing.T) {
 	var active []sessions.Session
 	for _, key := range []string{"one", "two", "three", "four"} {
 		session := publicSession(t, h, key)
-		if _, err := worker.SubmitInputs(t.Context(), h.tenant, session.ID, key, []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"remain active"}`)}}); err != nil {
+		if _, err := worker.SubmitInputs(t.Context(), h.tenant, session.ID, key, []sessions.Input{messageInput("remain active")}); err != nil {
 			t.Fatal(err)
 		}
 		requests = append(requests, h.read(testExecutionRequest))
@@ -66,7 +65,7 @@ func TestWorkerEnvironmentExpirySkipsBusySessionAndAllowsDispatch(t *testing.T)
 	}
 	worker, stop := startEnvironmentExpiryWorker(t, h.s, h.d)
 	h.session = publicSession(t, h, "unrelated")
-	receipt, err := worker.SubmitInputs(t.Context(), h.tenant, h.session.ID, "work", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"make normal progress"}`)}})
+	receipt, err := worker.SubmitInputs(t.Context(), h.tenant, h.session.ID, "work", []sessions.Input{messageInput("make normal progress")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/environment_expiry_worker_test.go b/services/core/tests/integration/environment_expiry_worker_test.go
index a7d8b4fdd..04838a170 100644
--- a/services/core/tests/integration/environment_expiry_worker_test.go
+++ b/services/core/tests/integration/environment_expiry_worker_test.go
@@ -25,7 +25,7 @@ func newEnvironmentExpiryReservation(t *testing.T, s *Store) (string, sessions.E
 	if err != nil {
 		t.Fatal(err)
 	}
-	pending, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"wait for the environment"}`)}})
+	pending, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "pending", []sessions.Input{messageInput("wait for the environment")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/environment_initial_input_test.go b/services/core/tests/integration/environment_initial_input_test.go
index 5bd57dfff..da0f37d64 100644
--- a/services/core/tests/integration/environment_initial_input_test.go
+++ b/services/core/tests/integration/environment_initial_input_test.go
@@ -105,9 +105,11 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 				t.Fatal("creation snapshot differs from the committed projection", session.EnvironmentInputActivity, session.PendingInput)
 			}
 			reservation := initialEnvironmentReservation(t, s, pool, tenant, session.ID)
-			storedBatch, marshalErr := json.Marshal(reservation.Inputs)
-			originalBatch, _ := json.Marshal(input.InitialInputs)
-			if marshalErr != nil || reservation.State != sessions.EnvironmentInputPending || reservation.Deadline.Sub(reservation.CreatedAt) != 5*time.Minute || string(storedBatch) != string(originalBatch) {
+			// jsonb keeps the batch's JSON value, not its key order.
+			var storedBatch, originalBatch any
+			stored, marshalErr := json.Marshal(reservation.Inputs)
+			original, _ := json.Marshal(input.InitialInputs)
+			if marshalErr != nil || json.Unmarshal(stored, &storedBatch) != nil || json.Unmarshal(original, &originalBatch) != nil || reservation.State != sessions.EnvironmentInputPending || reservation.Deadline.Sub(reservation.CreatedAt) != 5*time.Minute || !reflect.DeepEqual(storedBatch, originalBatch) {
 				t.Fatal("initial batch/deadline changed", reservation)
 			}
 			environmentInputHistory(t, pool, session.ID, 0, 0)
diff --git a/services/core/tests/integration/environment_initial_public_test.go b/services/core/tests/integration/environment_initial_public_test.go
index a3b47fa76..30559672c 100644
--- a/services/core/tests/integration/environment_initial_public_test.go
+++ b/services/core/tests/integration/environment_initial_public_test.go
@@ -31,7 +31,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 	configuration := json.RawMessage(`{"agent":{"id":"agent_initial_failure","model":"fixture","tools":[],"multi_agent":{"enabled":false,"max_concurrent_subagents":null},"reasoning":{},"service_tier":"auto","text":{"format":{"type":"text"},"verbosity":"medium"}},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)
 	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{
 		Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "initial", Configuration: configuration,
-		InitialInputs: []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"private-input-marker"}`)}},
+		InitialInputs: []sessions.Input{messageInput("private-input-marker")},
 	})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/environment_worker_helpers_test.go b/services/core/tests/integration/environment_worker_helpers_test.go
index d587a3ca4..3ddd0529c 100644
--- a/services/core/tests/integration/environment_worker_helpers_test.go
+++ b/services/core/tests/integration/environment_worker_helpers_test.go
@@ -47,7 +47,7 @@ func unboundWorkerEnvironmentReservation(t *testing.T, h *dispatchHarness) sessi
 	if err != nil {
 		t.Fatal(err)
 	}
-	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "work", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, session.ID, "work", []sessions.Input{messageInput("first")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/environments_test.go b/services/core/tests/integration/environments_test.go
index ee0c7a98f..430b829a1 100644
--- a/services/core/tests/integration/environments_test.go
+++ b/services/core/tests/integration/environments_test.go
@@ -189,7 +189,7 @@ func TestEnvironmentCreationFailureRollsBackAllResources(t *testing.T) {
 			constraint := "environment_failure_" + strings.ReplaceAll(marker, "-", "")
 			table, expression := "environments", "status <> 'pending'"
 			if phase == "input" {
-				table, expression = "environment_input_reservations", "NOT (batch @> '[{\"payload\":{\"text\":\""+marker+"\"}}]'::jsonb)"
+				table, expression = "environment_input_reservations", "NOT (batch @> '[{\"payload\":{\"input\":[{\"content\":[{\"text\":\""+marker+"\"}]}]}}]'::jsonb)"
 			}
 			if phase == "activity" {
 				table, expression = "session_events", "NOT (payload ? 'environment_input_activity')"
diff --git a/services/core/tests/integration/execution_test.go b/services/core/tests/integration/execution_test.go
index 0be73a2e7..8e73078db 100644
--- a/services/core/tests/integration/execution_test.go
+++ b/services/core/tests/integration/execution_test.go
@@ -276,7 +276,7 @@ func TestExecutionWriterSerializesWritesOnItsLease(t *testing.T) {
 	ctx, cancel := context.WithTimeout(t.Context(), time.Second)
 	defer cancel()
 	task := tasks[0]
-	_, err := sendMessage(ctx, s, task.tenant, task.session, "public", json.RawMessage(`{"text":"additional"}`))
+	_, err := sendMessage(ctx, s, task.tenant, task.session, "public", messageText("additional"))
 	close(release)
 	if err != nil {
 		t.Fatal("public admission used owner gate", err)
diff --git a/services/core/tests/integration/function_input_execution_test.go b/services/core/tests/integration/function_input_execution_test.go
index 63dbe8d17..3d5aeeafa 100644
--- a/services/core/tests/integration/function_input_execution_test.go
+++ b/services/core/tests/integration/function_input_execution_test.go
@@ -18,7 +18,7 @@ func TestExecutionFunctionInputBatchStillSteersMessages(t *testing.T) {
 	h.write(input.TurnID, proto.TypeFunctionCall, proto.FunctionCallPayload{CallID: "a", Name: "lookup_ticket", Arguments: json.RawMessage(`{}`)})
 	state := functionState(t, h, 1)
 	raw, _ := json.Marshal(sessions.FunctionResultInput{TurnID: input.TurnID, CallID: state.RequiredActions[0].CallID, Result: json.RawMessage(`{"success":true,"output":"answer"}`)})
-	batch := []sessions.Input{{Kind: "tool_result", Payload: raw}, {Kind: "message", Payload: json.RawMessage(`{"text":"Follow up"}`)}}
+	batch := []sessions.Input{{Kind: "tool_result", Payload: raw}, messageInput("Follow up")}
 	receipts, err := submitInputs(t.Context(), h.s, h.tenant, h.session.ID, "mixed", batch)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/function_inputs_public_test.go b/services/core/tests/integration/function_inputs_public_test.go
index 486a53276..5b512cffe 100644
--- a/services/core/tests/integration/function_inputs_public_test.go
+++ b/services/core/tests/integration/function_inputs_public_test.go
@@ -33,7 +33,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", messageText("fixture"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -110,7 +110,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 	if _, err := transitionTurn(ctx, s, tenant, session.ID, input.TurnID, sessions.TurnTransition{ExpectedStatus: sessions.TurnWaiting, Status: sessions.TurnFailed}); err != nil {
 		t.Fatal(err)
 	}
-	next, err := sendMessage(ctx, s, tenant, session.ID, "next", json.RawMessage(`{"text":"next"}`))
+	next, err := sendMessage(ctx, s, tenant, session.ID, "next", messageText("next"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/function_inputs_test.go b/services/core/tests/integration/function_inputs_test.go
index 435e1579f..8046aa039 100644
--- a/services/core/tests/integration/function_inputs_test.go
+++ b/services/core/tests/integration/function_inputs_test.go
@@ -39,7 +39,7 @@ func TestFunctionInputBatchesPersistAndReplayWithoutRetargeting(t *testing.T) {
 	s, pool := testStore(t)
 	tenant, session, turn := functionInputFixture(t, s, functionExecution(t))
 	full := `{"success":false,"output":[{"type":"input_text","text":""},{"type":"input_image","image_url":"data:image/png;base64,AA=="},{"type":"input_text","text":"after"}],"error":"failed"}`
-	batch := []sessions.Input{resultInput(t, turn, "a", full), {Kind: "message", Payload: json.RawMessage(`{"text":"Follow up"}`)}, resultInput(t, turn, "b", `{"success":true,"output":null,"error":null}`), {Kind: "cancel", Payload: json.RawMessage(`{}`)}}
+	batch := []sessions.Input{resultInput(t, turn, "a", full), messageInput("Follow up"), resultInput(t, turn, "b", `{"success":true,"output":null,"error":null}`), {Kind: "cancel", Payload: json.RawMessage(`{}`)}}
 	receipts, err := submitInputs(t.Context(), s, tenant, session.ID, "batch", batch)
 	if err != nil || len(receipts) != 4 {
 		t.Fatal(receipts, err)
@@ -105,7 +105,7 @@ func TestFunctionInputBatchFailureRollsBackEveryWrite(t *testing.T) {
 			s, _ := testStore(t)
 			functions := functionExecution(t)
 			tenant, session, turn := functionInputFixture(t, s, functions)
-			message := sessions.Input{Kind: "message", Payload: json.RawMessage(`{"text":"Must roll back"}`)}
+			message := messageInput("Must roll back")
 			cancel := sessions.Input{Kind: "cancel", Payload: json.RawMessage(`{}`)}
 			first := resultInput(t, turn, "a", `{"success":true}`)
 			batch := []sessions.Input{message, first, cancel}
@@ -165,7 +165,7 @@ func TestFunctionInputConcurrentBatchesSelectOneResult(t *testing.T) {
 	var wg sync.WaitGroup
 	results := make(chan error, 2)
 	for i := range 2 {
-		batch := []sessions.Input{{Kind: "message", Payload: json.RawMessage(fmt.Sprintf(`{"text":"message-%d"}`, i))}, resultInput(t, turn, "a", fmt.Sprintf(`{"success":true,"output":"%d"}`, i))}
+		batch := []sessions.Input{{Kind: "message", Payload: messageText(fmt.Sprintf("message-%d", i))}, resultInput(t, turn, "a", fmt.Sprintf(`{"success":true,"output":"%d"}`, i))}
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
diff --git a/services/core/tests/integration/function_item_events_test.go b/services/core/tests/integration/function_item_events_test.go
index 7fca61f85..edd9d16d7 100644
--- a/services/core/tests/integration/function_item_events_test.go
+++ b/services/core/tests/integration/function_item_events_test.go
@@ -64,7 +64,7 @@ func TestFunctionResultItemsRetainSubmittedFields(t *testing.T) {
 		`{"success":false,"output":[{"type":"input_text","text":"before"},{"type":"input_image","image_url":"data:image/png;base64,AA=="}],"error":"failure"}`,
 	} {
 		t.Run(raw, func(t *testing.T) {
-			s, pool := testStore(t)
+			s, _ := testStore(t)
 			functions := functionExecution(t)
 			tenant, session := newTurnSession(t, s)
 			turn := submitMessage(t, s, tenant, session.ID, "start").TurnID
@@ -119,19 +119,6 @@ func TestFunctionResultItemsRetainSubmittedFields(t *testing.T) {
 					results++
 				}
 			}
-			// The stored payload keeps the submitted field presence.
-			var stored map[string]any
-			if err := pool.QueryRow(t.Context(), `SELECT payload FROM session_items WHERE turn_id = $1 AND payload->>'type' = 'function_call_output'`, turn).Scan(&stored); err != nil {
-				t.Fatal(err)
-			}
-			var submitted map[string]any
-			_ = json.Unmarshal([]byte(raw), &submitted)
-			for _, field := range []string{"output", "error"} {
-				_, present := submitted[field]
-				if _, exists := stored[field]; present != exists {
-					t.Fatalf("stored %s presence changed: %v", field, stored)
-				}
-			}
 			if results != 2 {
 				t.Fatal("missing saved or streamed result", results)
 			}
diff --git a/services/core/tests/integration/function_state_public_test.go b/services/core/tests/integration/function_state_public_test.go
index 7c1b84cd7..538ccda86 100644
--- a/services/core/tests/integration/function_state_public_test.go
+++ b/services/core/tests/integration/function_state_public_test.go
@@ -30,7 +30,7 @@ func TestFunctionStateOfficialClientReadsAndLiveEvents(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"fixture"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", messageText("fixture"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/hosted_initialization_failure_public_test.go b/services/core/tests/integration/hosted_initialization_failure_public_test.go
index ee461f4e5..543f11500 100644
--- a/services/core/tests/integration/hosted_initialization_failure_public_test.go
+++ b/services/core/tests/integration/hosted_initialization_failure_public_test.go
@@ -220,7 +220,7 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 				!last.EnvironmentFailure.FailedAt.Equal(read.EnvironmentFailure.FailedAt) || last.EnvironmentInputActivity != nil || !last.Settled {
 				t.Fatal("failed snapshot", last)
 			}
-			if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}}); !errors.Is(err, sessions.ErrHostedEnvironmentFailed) {
+			if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, session.ID, "later", []sessions.Input{messageInput("later")}); !errors.Is(err, sessions.ErrHostedEnvironmentFailed) {
 				t.Fatal("failed hosted Environment admitted input", err)
 			}
 			raw, _ := json.Marshal(events)
@@ -249,7 +249,7 @@ func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
 	tenant := uuid.NewString()
 	session, environment := hostedFailureSession(t, s, tenant, sessions.CreateSession{
 		Initialization: environmentconfig.Setup{Commands: []environmentconfig.SetupCommand{{Command: "exit 3"}}},
-		InitialInputs:  []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"initial"}`)}},
+		InitialInputs:  []sessions.Input{messageInput("initial")},
 	})
 	p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, fail: "setup",
 		result: failedInitialization(3)}
diff --git a/services/core/tests/integration/input_conflicts_public_test.go b/services/core/tests/integration/input_conflicts_public_test.go
index 41578612f..f390b0419 100644
--- a/services/core/tests/integration/input_conflicts_public_test.go
+++ b/services/core/tests/integration/input_conflicts_public_test.go
@@ -58,7 +58,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 		input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 			Configuration: json.RawMessage(`{` + conflictAgent + `,"environment":` + environment + `}`)}
 		if initial {
-			input.InitialInputs = []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"reserved"}`)}}
+			input.InitialInputs = []sessions.Input{messageInput("reserved")}
 		}
 		session, err := s.CreateSession(ctx, tenant, input)
 		if err != nil {
@@ -69,7 +69,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 	// waiting starts a Turn that waits for one function result.
 	waiting := func(session, key, call string) sessions.InputReceipt {
 		t.Helper()
-		receipt, err := sendMessage(ctx, s, tenant, session, key, json.RawMessage(`{"text":"work"}`))
+		receipt, err := sendMessage(ctx, s, tenant, session, key, messageText("work"))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/inputs_test.go b/services/core/tests/integration/inputs_test.go
index 8dd0279e2..36dd59666 100644
--- a/services/core/tests/integration/inputs_test.go
+++ b/services/core/tests/integration/inputs_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
 
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -16,9 +17,15 @@ import (
 
 var messagePayload = json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"hello"}]}]}`)
 
+// messageText is a public message event with one text part, as the events
+// route stores it.
+func messageText(text string) json.RawMessage {
+	payload, _ := json.Marshal(v1.SessionInput{Type: "agent.session.input.message", Input: []v1.InputMessage{{Role: "user", Content: []v1.InputContent{{Type: "input_text", Text: &text}}}}})
+	return payload
+}
+
 func messageInput(text string) sessions.Input {
-	payload, _ := json.Marshal(map[string]string{"text": text})
-	return sessions.Input{Kind: "message", Payload: payload}
+	return sessions.Input{Kind: "message", Payload: messageText(text)}
 }
 
 func newTurnSession(t *testing.T, s *Store) (string, sessions.Session) {
diff --git a/services/core/tests/integration/item_order_test.go b/services/core/tests/integration/item_order_test.go
index d7c152ac7..38b6c24d7 100644
--- a/services/core/tests/integration/item_order_test.go
+++ b/services/core/tests/integration/item_order_test.go
@@ -22,7 +22,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "first", messageText("question"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -51,7 +51,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 			t.Fatal(err)
 		}
 	}
-	if _, err = sendMessage(ctx, s, tenant, session.ID, "steer", json.RawMessage(`{"text":"continue"}`)); err != nil {
+	if _, err = sendMessage(ctx, s, tenant, session.ID, "steer", messageText("continue")); err != nil {
 		t.Fatal(err)
 	}
 	page, err = sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
@@ -131,7 +131,7 @@ func TestItemObservationOrderSurvivesTiesUpdatesRetriesAndRecovery(t *testing.T)
 		t.Fatal(err)
 	}
 	checkOrder()
-	next, err := sendMessage(ctx, s, tenant, session.ID, "next-turn", json.RawMessage(`{"text":"new turn"}`))
+	next, err := sendMessage(ctx, s, tenant, session.ID, "next-turn", messageText("new turn"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/item_reads_test.go b/services/core/tests/integration/item_reads_test.go
index 31b01fa3b..27585bf45 100644
--- a/services/core/tests/integration/item_reads_test.go
+++ b/services/core/tests/integration/item_reads_test.go
@@ -22,7 +22,7 @@ func TestItemsRecoverSnapshotsPartialResultsPaginationAndIsolation(t *testing.T)
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "first", messageText("question"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -122,7 +122,7 @@ func TestItemProjectionFailureRollsBackJournalAndAggregateRecovers(t *testing.T)
 	journal := executionOwner(t, s).Sessions
 	tenant := uuid.NewString()
 	session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "legacy"})
-	input, err := sendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"test"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "input", messageText("test"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -159,7 +159,7 @@ func TestReceiptOnlyTextRecoversWithoutInventingCompletion(t *testing.T) {
 	tenant := uuid.NewString()
 	for _, receiptOnly := range []bool{true, false} {
 		session, _ := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString()})
-		input, err := sendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"test"}`))
+		input, err := sendMessage(ctx, s, tenant, session.ID, "first", messageText("test"))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -193,7 +193,7 @@ func TestLegacyFailureRetainsPartialAnswerAcrossRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(ctx, s, tenant, session.ID, "first", json.RawMessage(`{"text":"question"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "first", messageText("question"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/local_artifact_export_test.go b/services/core/tests/integration/local_artifact_export_test.go
index 06775a674..056591d51 100644
--- a/services/core/tests/integration/local_artifact_export_test.go
+++ b/services/core/tests/integration/local_artifact_export_test.go
@@ -3,7 +3,6 @@ package integration
 import (
 	"archive/tar"
 	"bytes"
-	"encoding/json"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
@@ -46,7 +45,7 @@ func completeLocalArtifactExport(t *testing.T, h *dispatchHarness, worker *execu
 		t.Fatal("capture published before native completion", err)
 	}
 	completeCaptureDirectoryRead(t, h, worker, environment)
-	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "during-artifact-capture", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"run after the completed native execution"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "during-artifact-capture", []sessions.Input{messageInput("run after the completed native execution")})
 	if err != nil || pending.State != sessions.EnvironmentInputPending || len(pending.Receipts) != 0 {
 		t.Fatalf("input during artifact capture was assigned to the finished executor: %+v %v", pending, err)
 	}
diff --git a/services/core/tests/integration/local_environment_file_write_test.go b/services/core/tests/integration/local_environment_file_write_test.go
index 0b802a30f..89d87e926 100644
--- a/services/core/tests/integration/local_environment_file_write_test.go
+++ b/services/core/tests/integration/local_environment_file_write_test.go
@@ -56,7 +56,7 @@ func TestLocalEnvironmentFileWriteOwnsMutationBeforeDispatch(t *testing.T) {
 	if err != nil || intent.State != "pending" || intent.Identity.DeviceID != h.device.ID {
 		t.Fatal("dispatch preceded durable ownership", intent, err)
 	}
-	if _, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "concurrent", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "concurrent", []sessions.Input{messageInput("work")}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("upload admitted concurrent execution", err)
 	}
 	cancel()
@@ -98,7 +98,7 @@ func TestLocalEnvironmentFileWriteLostReceiptRemainsPending(t *testing.T) {
 	if err != nil || intent.State != "pending" {
 		t.Fatal("disconnect guessed rejection", intent, err)
 	}
-	if _, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "after-loss", []sessions.Input{{Kind: "message", Payload: []byte(`{"text":"work"}`)}}); !errors.Is(err, sessions.ErrTurnConflict) {
+	if _, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "after-loss", []sessions.Input{messageInput("work")}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatal("unknown upload admitted execution", err)
 	}
 }
diff --git a/services/core/tests/integration/local_environment_worker_test.go b/services/core/tests/integration/local_environment_worker_test.go
index 494efc624..5d9b3214c 100644
--- a/services/core/tests/integration/local_environment_worker_test.go
+++ b/services/core/tests/integration/local_environment_worker_test.go
@@ -2,7 +2,6 @@ package integration
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"testing"
 	"time"
@@ -109,7 +108,7 @@ func TestLocalEnvironmentWorkerRejectsGeneralDeviceDespiteCapability(t *testing.
 
 func TestLocalEnvironmentWorkerSchedulesPreparationWithoutRemoteResolver(t *testing.T) {
 	h, worker, environment := localWorker(t, true, true)
-	reservation, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "local-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	reservation, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "local-input", []sessions.Input{messageInput("first")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/message_image_admission_test.go b/services/core/tests/integration/message_image_admission_test.go
index 02024727a..1cf450a41 100644
--- a/services/core/tests/integration/message_image_admission_test.go
+++ b/services/core/tests/integration/message_image_admission_test.go
@@ -14,7 +14,7 @@ import (
 
 func imageAdmissionBatch() []sessions.Input {
 	return []sessions.Input{
-		{Kind: "message", Payload: json.RawMessage(`{"text":"do not partially admit"}`)},
+		messageInput("do not partially admit"),
 		{Kind: "message", Payload: json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_image","image_url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aXioAAAAASUVORK5CYII="}]}]}`)},
 	}
 }
diff --git a/services/core/tests/integration/prepared_dispatch_test.go b/services/core/tests/integration/prepared_dispatch_test.go
index bbb1f066f..08cfbdf04 100644
--- a/services/core/tests/integration/prepared_dispatch_test.go
+++ b/services/core/tests/integration/prepared_dispatch_test.go
@@ -24,7 +24,7 @@ func preparedDispatchHarness(t *testing.T) (*dispatchHarness, sessions.Environme
 	assertNoRuntimeAllocation(t, h)
 	h.d, h.lease = h.bound(), h.owner().Lease
 	enableWorkerEnvironment(t, h)
-	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}, {Kind: "message", Payload: json.RawMessage(`{"text":"second"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{messageInput("first"), messageInput("second")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/public_execution_test.go b/services/core/tests/integration/public_execution_test.go
index 879c09a1d..b327607b8 100644
--- a/services/core/tests/integration/public_execution_test.go
+++ b/services/core/tests/integration/public_execution_test.go
@@ -144,7 +144,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	}
 	checkMeasurement(false)
 	queued := publicSession(t, h, "queued")
-	if _, err := sendMessage(ctx, h.s, h.tenant, queued.ID, "first", json.RawMessage(`{"text":"Not sent"}`)); err != nil {
+	if _, err := sendMessage(ctx, h.s, h.tenant, queued.ID, "first", messageText("Not sent")); err != nil {
 		t.Fatal(err)
 	}
 	worker := startOwnedWorker(t, ctx, h.s, h.d, h.owner())
diff --git a/services/core/tests/integration/runtime_input_admission_test.go b/services/core/tests/integration/runtime_input_admission_test.go
index 66617e3db..8c45dac30 100644
--- a/services/core/tests/integration/runtime_input_admission_test.go
+++ b/services/core/tests/integration/runtime_input_admission_test.go
@@ -15,7 +15,7 @@ import (
 func TestManagedRuntimeMaintenancePreservesCancelAndRetry(t *testing.T) {
 	s, _ := newManagedTestStore(t)
 	tenant, session, _ := managedSession(t, s)
-	inputs := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"accepted work"}`)}}
+	inputs := []sessions.Input{messageInput("accepted work")}
 	accepted, err := submitInputs(t.Context(), s, tenant, session.ID, "work", inputs)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/runtime_pending_test.go b/services/core/tests/integration/runtime_pending_test.go
index 65128f89c..8245750f5 100644
--- a/services/core/tests/integration/runtime_pending_test.go
+++ b/services/core/tests/integration/runtime_pending_test.go
@@ -16,7 +16,7 @@ import (
 func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T) {
 	s, _ := newManagedTestStore(t)
 	tenant, idle, idleEnvironment := managedSession(t, s)
-	initial, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted"}}`), InitialInputs: []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"hello"}`)}}})
+	initial, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted"}}`), InitialInputs: []sessions.Input{messageInput("hello")}})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/runtime_wake_hint_integration_test.go b/services/core/tests/integration/runtime_wake_hint_integration_test.go
index f31a2e4a7..0d29a6720 100644
--- a/services/core/tests/integration/runtime_wake_hint_integration_test.go
+++ b/services/core/tests/integration/runtime_wake_hint_integration_test.go
@@ -113,8 +113,7 @@ func newWakeHintIntegration(t *testing.T) *wakeHintIntegration {
 }
 
 func wakeHintInput(text string) []sessions.Input {
-	payload, _ := json.Marshal(map[string]string{"text": text})
-	return []sessions.Input{{Kind: "message", Payload: payload}}
+	return []sessions.Input{messageInput(text)}
 }
 
 func (f *wakeHintIntegration) pending(t *testing.T, target wakeHintIntegrationTarget, key string) sessions.EnvironmentInputReservation {
diff --git a/services/core/tests/integration/runtime_worker_recovery_test.go b/services/core/tests/integration/runtime_worker_recovery_test.go
index 654f8a444..0a8b08e51 100644
--- a/services/core/tests/integration/runtime_worker_recovery_test.go
+++ b/services/core/tests/integration/runtime_worker_recovery_test.go
@@ -2,7 +2,6 @@ package integration
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"testing"
 	"time"
@@ -35,7 +34,7 @@ func runtimeWorkerHarness(t *testing.T) (*dispatchHarness, *pgxpool.Pool) {
 func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.T) {
 	h, _ := runtimeWorkerHarness(t)
 	h.d, h.lease = h.bound(), h.owner().Lease
-	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{messageInput("first")})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -56,7 +55,7 @@ func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.
 
 func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 	h, pool := runtimeWorkerHarness(t)
-	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "pending", []sessions.Input{messageInput("first")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/sandbox_deployment_switch_test.go b/services/core/tests/integration/sandbox_deployment_switch_test.go
index 49ee8ba6a..7c88d88c0 100644
--- a/services/core/tests/integration/sandbox_deployment_switch_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_test.go
@@ -311,7 +311,7 @@ func TestSandboxSwitchPreservesReleasedAllocationAndItemHistory(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(t.Context(), s, tenant, history.ID, "history", json.RawMessage(`{"text":"retained request"}`))
+	input, err := sendMessage(t.Context(), s, tenant, history.ID, "history", messageText("retained request"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/self_hosted_cancel_public_test.go b/services/core/tests/integration/self_hosted_cancel_public_test.go
index 31f6f8989..bf9551100 100644
--- a/services/core/tests/integration/self_hosted_cancel_public_test.go
+++ b/services/core/tests/integration/self_hosted_cancel_public_test.go
@@ -117,7 +117,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 		return value
 	}
 	idleReceipts := receipts(created.IdleKey, "")
-	later, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, created.LaterID, "controlled-later-input", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"Retain pending input."}`)}})
+	later, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), tenant, created.LaterID, "controlled-later-input", []sessions.Input{messageInput("Retain pending input.")})
 	if err != nil || later.State != sessions.EnvironmentInputPending || later.IsInitial {
 		t.Fatal("could not establish controlled later reservation", err)
 	}
@@ -131,7 +131,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	start := func() string {
 		t.Helper()
 		// Controlled callbacks isolate HTTP admission; no daemon or model runs in this fixture.
-		input, err := sendMessage(t.Context(), s, tenant, created.ID, uuid.NewString(), json.RawMessage(`{"text":"Controlled active work."}`))
+		input, err := sendMessage(t.Context(), s, tenant, created.ID, uuid.NewString(), messageText("Controlled active work."))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/session_deletion_lifecycle_public_test.go b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
index 57216d5a3..440acbe68 100644
--- a/services/core/tests/integration/session_deletion_lifecycle_public_test.go
+++ b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
@@ -45,7 +45,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 		input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
 			Configuration: json.RawMessage(`{` + deletionAgent + `,"environment":` + environment + `}`)}
 		if initial {
-			input.InitialInputs = []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"reserved"}`)}}
+			input.InitialInputs = []sessions.Input{messageInput("reserved")}
 		}
 		session, err := s.CreateSession(ctx, tenant, input)
 		if err != nil {
@@ -59,7 +59,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	turn := func(to ...string) string {
 		t.Helper()
 		session := create(none, false)
-		receipt, err := sendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"work"}`))
+		receipt, err := sendMessage(ctx, s, tenant, session.ID, "input", messageText("work"))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -84,7 +84,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	}
 	reserve := func(session sessions.Session) sessions.EnvironmentInputReservation {
 		t.Helper()
-		reservation, err := sessionService(t, s).ReserveEnvironmentInput(ctx, tenant, session.ID, "later", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"later"}`)}})
+		reservation, err := sessionService(t, s).ReserveEnvironmentInput(ctx, tenant, session.ID, "later", []sessions.Input{messageInput("later")})
 		if err != nil || reservation.State != sessions.EnvironmentInputPending {
 			t.Fatal(reservation, err)
 		}
diff --git a/services/core/tests/integration/session_deletion_test.go b/services/core/tests/integration/session_deletion_test.go
index 1484c5553..b62dc8629 100644
--- a/services/core/tests/integration/session_deletion_test.go
+++ b/services/core/tests/integration/session_deletion_test.go
@@ -2,7 +2,6 @@ package integration
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"strings"
 	"sync"
@@ -62,7 +61,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			receipt, err := sendMessage(ctx, s, tenant, session.ID, "input", json.RawMessage(`{"text":"retained"}`))
+			receipt, err := sendMessage(ctx, s, tenant, session.ID, "input", messageText("retained"))
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -139,7 +138,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 			if _, err := createSession(ctx, fresh, tenant, input); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 				t.Fatal(err)
 			}
-			if _, err := sendMessage(ctx, fresh, tenant, session.ID, "input", json.RawMessage(`{"text":"retained"}`)); !errors.Is(err, sessions.ErrNotFound) {
+			if _, err := sendMessage(ctx, fresh, tenant, session.ID, "input", messageText("retained")); !errors.Is(err, sessions.ErrNotFound) {
 				t.Fatal(err)
 			}
 			if _, err := requestCancel(ctx, fresh, tenant, session.ID, "late-cancel"); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/tests/integration/session_events_test.go b/services/core/tests/integration/session_events_test.go
index b68308acb..210b755ab 100644
--- a/services/core/tests/integration/session_events_test.go
+++ b/services/core/tests/integration/session_events_test.go
@@ -56,7 +56,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", messageText("question"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -64,7 +64,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"question"}`)); err != nil {
+	if _, err = sendMessage(ctx, s, tenant, session.ID, "start", messageText("question")); err != nil {
 		t.Fatal(err)
 	}
 	after, _ := sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
@@ -166,7 +166,7 @@ func TestSessionEventsRetentionAndQueuedCancellation(t *testing.T) {
 	})
 	inputs := make([]sessions.Input, 64)
 	for i := range inputs {
-		inputs[i] = sessions.Input{Kind: "message", Payload: json.RawMessage(`{"text":"input"}`)}
+		inputs[i] = messageInput("input")
 	}
 	for range 5 {
 		if _, err = submitInputs(ctx, s, tenant, session.ID, uuid.NewString(), inputs); err != nil {
diff --git a/services/core/tests/integration/session_metadata_test.go b/services/core/tests/integration/session_metadata_test.go
index 021a87b0c..2dad9bbb9 100644
--- a/services/core/tests/integration/session_metadata_test.go
+++ b/services/core/tests/integration/session_metadata_test.go
@@ -114,7 +114,7 @@ func TestSessionMetadataPreservesTerminalActivity(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, status := range []string{sessions.TurnCompleted, sessions.TurnFailed, sessions.TurnCancelled} {
-		receipt, err := sendMessage(ctx, s, tenant, session.ID, uuid.NewString(), []byte(`{"text":"metadata fixture"}`))
+		receipt, err := sendMessage(ctx, s, tenant, session.ID, uuid.NewString(), messageText("metadata fixture"))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/stream_authority_http_test.go b/services/core/tests/integration/stream_authority_http_test.go
index 33dd4666a..3ca7984c7 100644
--- a/services/core/tests/integration/stream_authority_http_test.go
+++ b/services/core/tests/integration/stream_authority_http_test.go
@@ -100,7 +100,7 @@ func TestLiveStreamClosesAfterKeyRevocationOrProjectArchive(t *testing.T) {
 					t.Fatal("revocation affected peer", valid.StatusCode)
 				}
 				// New events remain available to valid callers after the reader has closed.
-				if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), project.TenantID, session.ID, "after-revocation", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"new event"}`)}}); err != nil {
+				if _, err := sessionService(t, s).ReserveEnvironmentInput(t.Context(), project.TenantID, session.ID, "after-revocation", []sessions.Input{messageInput("new event")}); err != nil {
 					t.Fatal(err)
 				}
 			}
diff --git a/services/core/tests/integration/token_usage_integration_test.go b/services/core/tests/integration/token_usage_integration_test.go
index 6b533dc6b..434b4f869 100644
--- a/services/core/tests/integration/token_usage_integration_test.go
+++ b/services/core/tests/integration/token_usage_integration_test.go
@@ -33,7 +33,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		}
 	}
 	for n, status := range []string{sessions.TurnFailed, sessions.TurnCancelled} {
-		admission, err := sendMessage(ctx, s, tenant, session.ID, fmt.Sprint(n), json.RawMessage(`{"text":"measure"}`))
+		admission, err := sendMessage(ctx, s, tenant, session.ID, fmt.Sprint(n), messageText("measure"))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -113,7 +113,7 @@ func TestCancellationReceiptUsageSurvivesRecovery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	admission, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"measure"}`))
+	admission, err := sendMessage(ctx, s, tenant, session.ID, "start", messageText("measure"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -187,7 +187,7 @@ func TestSessionUsageRequiresEveryRootTurnEndedAndMeasured(t *testing.T) {
 	}
 	submit := func(key string) sessions.InputReceipt {
 		t.Helper()
-		admission, err := sendMessage(ctx, s, tenant, session.ID, key, json.RawMessage(`{"text":"measure"}`))
+		admission, err := sendMessage(ctx, s, tenant, session.ID, key, messageText("measure"))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/turn_events_test.go b/services/core/tests/integration/turn_events_test.go
index e95bf1a40..5591fd3ac 100644
--- a/services/core/tests/integration/turn_events_test.go
+++ b/services/core/tests/integration/turn_events_test.go
@@ -20,7 +20,7 @@ func TestTurnEventBatchesAreOrderedIsolatedAndDurable(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	input, err := sendMessage(ctx, s, tenant, session.ID, "start", json.RawMessage(`{"text":"test"}`))
+	input, err := sendMessage(ctx, s, tenant, session.ID, "start", messageText("test"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/worker_preparation_failure_test.go b/services/core/tests/integration/worker_preparation_failure_test.go
index d1d266352..9d1223560 100644
--- a/services/core/tests/integration/worker_preparation_failure_test.go
+++ b/services/core/tests/integration/worker_preparation_failure_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"encoding/json"
 	"testing"
 	"time"
 
@@ -15,7 +14,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 			h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 			enableWorkerEnvironment(t, h)
 			frames := workerFrames(t, h)
-			pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+			pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{messageInput("first")})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -58,7 +57,7 @@ func TestWorkerSettlesConfirmedPreparationFailureAndAcceptsNewInput(t *testing.T
 				t.Fatal("failed input retried", frame.Type)
 			case <-time.After(1200 * time.Millisecond):
 			}
-			next, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
+			next, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{messageInput("next")})
 			if err != nil {
 				t.Fatal("new input remained blocked", err)
 			}
@@ -98,7 +97,7 @@ func TestWorkerRetriesUncertainPreparationFailure(t *testing.T) {
 			h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 			enableWorkerEnvironment(t, h)
 			frames := workerFrames(t, h)
-			pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "retry", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"retry"}`)}})
+			pending, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "retry", []sessions.Input{messageInput("retry")})
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -130,7 +129,7 @@ func TestWorkerPreparationRejectionPreservesCancellationAndNewerInput(t *testing
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`), false)
 	enableWorkerEnvironment(t, h)
 	frames := workerFrames(t, h)
-	first, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"first"}`)}})
+	first, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "first", []sessions.Input{messageInput("first")})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -140,7 +139,7 @@ func TestWorkerPreparationRejectionPreservesCancellationAndNewerInput(t *testing
 	if _, err := cancelEnvironmentInput(t.Context(), h.s, h.tenant, h.session.ID, first.ID); err != nil {
 		t.Fatal(err)
 	}
-	next, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"next"}`)}})
+	next, err := sessionService(t, h.s).ReserveEnvironmentInput(t.Context(), h.tenant, h.session.ID, "next", []sessions.Input{messageInput("next")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/worker_wakeup_test.go b/services/core/tests/integration/worker_wakeup_test.go
index 3596bbff1..3f4543fb6 100644
--- a/services/core/tests/integration/worker_wakeup_test.go
+++ b/services/core/tests/integration/worker_wakeup_test.go
@@ -2,7 +2,6 @@ package integration
 
 import (
 	"context"
-	"encoding/json"
 	"strings"
 	"sync/atomic"
 	"testing"
@@ -60,7 +59,7 @@ func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
 					t.Error("worker did not stop")
 				}
 			}()
-			input := []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"wake"}`)}}
+			input := []sessions.Input{messageInput("wake")}
 			switch operation {
 			case "submit":
 				_, err = worker.SubmitInputs(ctx, h.tenant, h.session.ID, "wake", input)
@@ -112,7 +111,7 @@ func TestWorkerSchedulerHintBypassesEnvironmentScanThrottle(t *testing.T) {
 	admitted := make(chan error, 1)
 	started := time.Now()
 	go func() {
-		_, err := worker.SubmitInputs(ctx, h.tenant, h.session.ID, "wake", []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"text":"wake"}`)}})
+		_, err := worker.SubmitInputs(ctx, h.tenant, h.session.ID, "wake", []sessions.Input{messageInput("wake")})
 		admitted <- err
 	}()
 	prepare := nextWorkerFrame(t, frames, proto.TypeExecutionPrepare)

From 151d81debdff28ed0c12e26fb051542b8b63cfc9 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 01:31:16 +0800
Subject: [PATCH 38/60] Delete unused admin and console paths (#509)

---
 .env.example                                  |  43 ----
 apps/web/DESIGN.md                            |   2 +-
 apps/web/PRODUCT.md                           |   2 +-
 apps/web/e2e/data/admin.mjs                   |  11 +-
 apps/web/e2e/data/resources.mjs               |  50 +----
 apps/web/e2e/fixture-console.mjs              |   2 +-
 .../src/features/dashboard/runtime-history.ts |   5 +-
 .../web/src/features/files/file-operations.ts |   4 +-
 apps/web/src/features/fleet/fleet-queries.ts  |   7 -
 .../features/fleet/use-sandbox-fleet.test.tsx |   5 +-
 .../src/features/fleet/use-sandbox-fleet.ts   |  27 +--
 .../src/features/metrics/AgentMetricsPage.tsx |   1 -
 .../features/metrics/SandboxMetricsPage.tsx   |   3 +-
 .../features/metrics/agent-metrics-loader.ts  |   8 +-
 .../features/metrics/agent-metrics.test.ts    |   2 +-
 .../src/features/metrics/key-usage.test.ts    |   2 +-
 .../src/features/metrics/metrics-queries.ts   |   2 -
 .../features/metrics/project-sessions.test.ts |  12 +-
 .../src/features/metrics/project-sessions.ts  |  24 +--
 .../src/features/metrics/sandbox-runtime.ts   |   5 +-
 .../src/features/overview/OverviewPage.tsx    |   1 -
 .../src/features/overview/getting-started.ts  |   4 +-
 .../features/overview/overview-loader.test.ts |   4 +-
 .../src/features/overview/test-fixtures.ts    |   4 +-
 .../sandbox/SandboxDeploymentPage.tsx         |   3 +-
 .../features/sandbox/SandboxManagerView.tsx   |  15 +-
 .../features/sandbox/SandboxPageAccess.tsx    |  15 --
 .../features/sandbox/console-config.test.ts   |  34 ++--
 .../src/features/sandbox/console-config.ts    |  30 +--
 .../sandbox/sandbox-page-ownership.test.tsx   |   2 +-
 .../src/features/sandbox/sandbox-queries.ts   |  10 +-
 .../src/features/sessions/SessionLogPage.tsx  |  46 +----
 .../src/features/sessions/session-history.ts  |   5 +-
 .../src/features/sessions/session-log.test.ts |  43 ++--
 apps/web/src/features/sessions/session-log.ts |  72 ++-----
 .../src/features/sessions/session-runtime.ts  |   5 +-
 .../features/skills/skill-operations.test.ts  |   5 +-
 .../src/features/skills/skill-operations.ts   |   9 +-
 .../src/features/vaults/vault-catalog.test.ts |   5 +-
 apps/web/src/features/vaults/vault-catalog.ts |   4 +-
 apps/web/src/i18n/locales/en/agents.ts        |   2 +-
 apps/web/src/i18n/locales/en/common.ts        |   4 +-
 apps/web/src/i18n/locales/en/keys.ts          |   2 +-
 apps/web/src/i18n/locales/en/metrics.ts       |   4 +-
 apps/web/src/i18n/locales/en/overview.ts      |   1 -
 apps/web/src/i18n/locales/en/sessions.ts      |   2 -
 apps/web/src/i18n/locales/zh-CN/agents.ts     |   2 +-
 apps/web/src/i18n/locales/zh-CN/common.ts     |   4 +-
 apps/web/src/i18n/locales/zh-CN/keys.ts       |   2 +-
 apps/web/src/i18n/locales/zh-CN/metrics.ts    |   4 +-
 apps/web/src/i18n/locales/zh-CN/overview.ts   |   1 -
 apps/web/src/i18n/locales/zh-CN/sessions.ts   |   2 -
 apps/web/src/lib/admin-view.ts                |  10 +-
 apps/web/src/lib/docker-guide-config.test.ts  |  95 ---------
 apps/web/src/lib/docker-guide-config.ts       | 103 ----------
 apps/web/src/lib/locale-strings.ts            |   1 -
 apps/web/src/lib/projects.tsx                 |  62 ++++--
 apps/web/src/lib/queries.ts                   |   6 +-
 apps/web/src/lib/vite-config.test.ts          |  38 ----
 apps/web/src/vite-env.d.ts                    |  26 ---
 apps/web/vite.config.ts                       |  18 --
 contracts/agents-api/admin-api.md             |   8 +-
 contracts/agents-api/core.openapi.yaml        |   8 -
 contracts/agents-api/zh/admin-api.md          |  10 +-
 docs/web/console-api-usage.md                 |   2 +-
 docs/zh/web/console-api-usage.md              |   4 +-
 packages/agents-client/README.md              |   2 +-
 .../agents-client/src/admin-client.test.ts    |  20 +-
 .../agents-client/src/admin-projection.ts     |  30 +--
 packages/agents-client/src/admin-types.ts     |  55 +-----
 packages/agents-client/src/client.ts          |  84 +-------
 .../src/core-project-reader.test.ts           |  63 ------
 packages/agents-client/src/index.ts           |   2 +-
 .../agents-client/src/sessions-list.test.ts   | 186 ------------------
 packages/agents-client/src/types.ts           |  30 +--
 scripts/build-core-distribution.sh            |   2 +-
 services/core/internal/adminaudit/reader.go   |  22 +--
 .../core/internal/db/queries/admin_audit.sql  |   4 +-
 .../internal/db/queries/admin_history.sql     |   4 -
 .../core/internal/db/sqlc/admin_audit.sql.go  |   6 +-
 .../internal/db/sqlc/admin_history.sql.go     |  39 +---
 services/core/internal/db/sqlc/models.go      |  17 --
 .../postgres/agentpg/store_test.go            |   6 +-
 .../postgres/auditpg/admin_audit.go           |   2 +-
 .../postgres/auditpg/auditpg_test.go          |  49 ++---
 .../persistence/postgres/auditpg/record.go    |   5 +-
 .../postgres/auditpg/write_operations.go      |  28 +--
 .../postgres/filepg/filepg_test.go            |   4 +-
 .../postgres/sessionpg/creation_test.go       |   6 +-
 .../postgres/skillpg/audit_test.go            |  12 +-
 .../postgres/templatepg/audit_test.go         |  10 +-
 .../postgres/vaultpg/audit_test.go            |  10 +-
 services/core/internal/writeaudit/reader.go   |  10 +-
 services/core/internal/writeaudit/record.go   |  28 +--
 .../core/internal/writeaudit/record_test.go   |  22 +--
 .../migrations/000092_delete_admin_copies.sql |  24 +++
 .../integration/admin_delete_audit_test.go    |  12 +-
 .../integration/session_write_audit_test.go   |   7 +-
 services/web/distribution_test.go             |  59 ++++--
 services/web/node_artifacts.go                |   2 +-
 services/web/node_installation.go             |  11 +-
 services/web/node_installation_test.go        |   6 +-
 services/web/project_proxy_test.go            |   9 -
 services/web/server.go                        |   4 -
 104 files changed, 402 insertions(+), 1444 deletions(-)
 delete mode 100644 apps/web/src/features/sandbox/SandboxPageAccess.tsx
 delete mode 100644 apps/web/src/lib/docker-guide-config.test.ts
 delete mode 100644 apps/web/src/lib/docker-guide-config.ts
 delete mode 100644 apps/web/src/lib/vite-config.test.ts
 delete mode 100644 packages/agents-client/src/core-project-reader.test.ts
 delete mode 100644 packages/agents-client/src/sessions-list.test.ts
 create mode 100644 services/core/migrations/000092_delete_admin_copies.sql

diff --git a/.env.example b/.env.example
index fd5aa9360..9c82663c2 100644
--- a/.env.example
+++ b/.env.example
@@ -4,46 +4,3 @@ OAC_WEB_DEV_PROXY_TARGET=http://127.0.0.1:8091
 
 # Core reads its own environment, not this file. Core settings, including
 # Runtime history sampling and export, are in docs/configuration.md.
-
-# Public, non-secret opt-in for the reviewed Codex self_hosted Session profile.
-# Leave unset unless Core execution, its executor registry, and executor origin
-# are configured. This flag is presentation policy, not capability discovery.
-# OAC_WEB_SELF_HOSTED_SESSIONS=1
-
-# Public, non-secret opt-in for the operator-qualified basic Codex
-# openai_hosted Session profile. Leave unset unless Core was started with a
-# qualified managed Runtime provider. This flag does not probe runtime readiness.
-# OAC_WEB_OPENAI_HOSTED_SESSIONS=1
-
-# Public, non-secret opt-in for the complete Environment Files profile. Leave
-# unset for older Core revisions. Enable only after the connected Core has been
-# qualified for Files.list and managed Files.create; self_hosted reads use its
-# exact workspace_directory root.
-# OAC_WEB_ENVIRONMENT_FILES=1
-
-# Optional local-only Docker backend recovery guide shown in the connection
-# panel. Web renders copyable `docker start` and loopback health commands; it
-# never accesses the Docker socket or executes them. Values are compiled into
-# the browser bundle and must contain non-secret container names only.
-# OAC_WEB_DOCKER_BACKEND_GUIDE=1
-# OAC_WEB_DOCKER_DATABASE_CONTAINER=oac-web-smoke-db
-# OAC_WEB_DOCKER_API_CONTAINER=oac-web-smoke-api
-# OAC_WEB_DOCKER_DAEMON_CONTAINER=oac-web-smoke-daemon
-# OAC_WEB_DOCKER_CORE_PORT=8091
-
-# Optional local-only Docker connection recipe. This renders a copyable command;
-# it never gives the browser Docker access or reads the credential file. Every
-# value below is compiled into the browser bundle, so values must be non-secret.
-# Enable only for the matching operator-controlled local stack.
-# OAC_WEB_DOCKER_GUIDE=1
-# OAC_WEB_DOCKER_IMAGE=oac-web-smoke-executor:2b34ea46-codex-0.153.4
-# OAC_WEB_DOCKER_API_CONTAINER=oac-web-smoke-api
-# OAC_WEB_DOCKER_USER=501:20
-# OAC_WEB_DOCKER_CREDENTIALS_HOME_PATH=.oac/web-smoke/executor-key.json
-# OAC_WEB_DOCKER_RUNTIME_HOME_PATH=.oac/web-smoke/executors
-
-# Public, non-secret suggestions shown by the Create Agent model picker. The
-# first entry is the default unless VITE_AGENT_DEFAULT_MODEL overrides it. These
-# do not claim live availability; the connected runtime remains authoritative.
-VITE_AGENT_MODEL_PRESETS=gpt-6-astra,gpt-5.6-sol,gpt-5.6-terra,gpt-5.6-luna,gpt-5.5,gpt-5.3-codex-spark
-VITE_AGENT_DEFAULT_MODEL=gpt-5.6-sol
diff --git a/apps/web/DESIGN.md b/apps/web/DESIGN.md
index d4430a411..94ad4fd43 100644
--- a/apps/web/DESIGN.md
+++ b/apps/web/DESIGN.md
@@ -348,7 +348,7 @@ Every resource list, the Session log and the project list share one grammar:
 - **ListToolbar**: on project-scoped lists the project filter first, then the SearchField (280px, search icon, Paper with the control ring), then any further filters (segmented status or order, selects); the count sits on the right in 12.5px Pencil ("12 total", "3 of 12", "40 loaded" when more exist).
 - **Project column**: shown only while All projects is selected, right after the name; archived projects are muted.
 - **NameCell**: the first column. The name at 500 weight (a link that turns indigo on hover when the row opens a detail page; a muted fallback such as "Untitled" when the resource has no name) with the compact ID underneath in 11.5px mono. The ID's copy button appears on row hover or focus; the full ID lives in its tooltip.
-- **Creator column**: the last column before the actions, headed "Creator" with a help tip. It shows the creating key's name (its prefix when unnamed) with a small "Revoked" flag for revoked keys, "Admin copy" in Graphite for an asset Core records as an administrator copy, "Unknown" in Graphite when Core has no record, and "—" while loading or when the lookup failed.
+- **Creator column**: the last column before the actions, headed "Creator" with a help tip. It shows the creating key's name (its prefix when unnamed) with a small "Revoked" flag for revoked keys, "Unknown" in Graphite when Core has no record, and "—" while loading or when the lookup failed.
 - **RowActions**: text actions right-aligned at the end of the row, 16px apart, ending with Delete (red on hover). A row click opens the detail page; action clicks do not.
 - **Partial failure**: when some projects fail to load, one red line names them above the table; the other projects still show.
 - **Empty state**: an unframed, centered block with an optional 24px outline icon, a clear title, a visible short explanation and a relevant action. First-use states explain how data arrives; filtered states offer Clear search; failed reads retain their error and retry. Empty Overview activity links to Projects and keys for API onboarding.
diff --git a/apps/web/PRODUCT.md b/apps/web/PRODUCT.md
index b1fe280d9..5a8afa95e 100644
--- a/apps/web/PRODUCT.md
+++ b/apps/web/PRODUCT.md
@@ -49,7 +49,7 @@ The console runs beside the administrator's own Core, with execution, files and
 - **Web API only.** Every read and write goes through `/core/v1/**`. The console holds no API key and sends nothing to `/v1`.
 - **No asset writes except delete.** Assets are created and changed only by a project's keys through the Agents API. The console does not create or edit Agents or Templates, upload Skills or Files, create or replace Credentials, start Sessions, send input or cancel work. Deletion follows the public deletion rules; a busy Session is not deletable and the console never cancels work to make it so.
 - **Secrets stay write-only.** Credential tokens, Template environment variables and setup commands are never returned, to the administrator included. An Agent's saved model provider shows its protocol, base URL, limits and whether a key is configured, never the key.
-- **Creators.** Core records the key behind every write. The console shows the creating key of each asset and a project's write history; an asset Core records as an administrator copy (`admin_copy`) shows as Admin copy and an asset without a record as Unknown.
+- **Creators.** Core records the key behind every write. The console shows the creating key of each asset and a project's write history; an asset without a record shows as Unknown.
 - **Waiting for results.** Overview, Session log and Session details name the function whose result the calling application must submit. The console cannot submit that result; environment connection waits stay distinct from function waits.
 - **Session history is read-only.** A Session page reads the Session, its Items and Turns and polls while work is in flight; there is no live event stream.
 - **Failure diagnostics.** Failed Session and Turn rows read Core diagnostics and translate its classified reason. The console never infers a cause from raw logs. Unavailable or mismatched diagnostics offer an explicit read retry; refreshing does not replay execution. Trace Timing keeps each Item's Core receipt interval separate from public Turn times and native tool duration. Historical missing timestamps stay unknown, negative clock intervals stay missing, and bounded response truncation remains visible.
diff --git a/apps/web/e2e/data/admin.mjs b/apps/web/e2e/data/admin.mjs
index b3a4ff179..058d35875 100644
--- a/apps/web/e2e/data/admin.mjs
+++ b/apps/web/e2e/data/admin.mjs
@@ -52,7 +52,7 @@ export function buildAdmin(now, base, resources) {
     const cacheKey = `${type}:${id}`;
     if (!creators.has(cacheKey)) {
       turn += 1;
-      creators.set(cacheKey, turn % 11 === 0 ? { copy: true } : turn % 7 === 0 ? null : keyRef(project, project.keys[turn % project.keys.length]));
+      creators.set(cacheKey, turn % 7 === 0 ? null : keyRef(project, project.keys[turn % project.keys.length]));
     }
     return creators.get(cacheKey);
   };
@@ -62,7 +62,6 @@ export function buildAdmin(now, base, resources) {
     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]);
-      if (creator?.copy) return; // Administrator copies are in the audit log, not in key write history.
       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); }
@@ -81,11 +80,7 @@ export function buildAdmin(now, base, resources) {
   function resourceOwners(project, url) {
     const type = url.searchParams.get("resource_type");
     const ids = (url.searchParams.get("resource_ids") ?? "").split(",").filter(Boolean).slice(0, 100);
-    return { data: ids.map((id) => {
-      const creator = creatorFor(project, type, id);
-      if (creator?.copy) return { resource_id: id, api_key: null, source: "admin_copy", admin_audit_id: `audit_${id.slice(-8)}` };
-      return creator ? { resource_id: id, api_key: creator, source: "api_key", admin_audit_id: null } : { resource_id: id, api_key: null, source: null, admin_audit_id: null };
-    }) };
+    return { data: ids.map((id) => ({ resource_id: id, api_key: creatorFor(project, type, id) })) };
   }
 
   function summarize(sessions) {
@@ -143,7 +138,7 @@ export function buildAdmin(now, base, resources) {
   const auditLog = () => {
     const entries = [];
     let n = 0;
-    const add = (at, action, project, type, id, results = []) => entries.push({ id: `audit_${String(++n).padStart(4, "0")}`, created_at: iso(at), admin_credential_id: "a1b2c3d4", actor_label: "admin", action, project_id: project.id, resource_type: type, resource_id: id, result_ids: results, request_id: `req_admin_${n}`, trace_id: `${n}`.padStart(32, "a") });
+    const add = (at, action, project, type, id) => entries.push({ id: `audit_${String(++n).padStart(4, "0")}`, created_at: iso(at), admin_credential_id: "a1b2c3d4", actor_label: "admin", action, project_id: project.id, resource_type: type, resource_id: id, request_id: `req_admin_${n}`, trace_id: `${n}`.padStart(32, "a") });
     for (const project of projects) {
       add(project.created_at, "create_project", project, "project", project.id);
       for (const k of project.keys) { add(k.created_at, "issue_key", project, "api_key", k.id); if (k.revoked_at) add(k.revoked_at, "revoke_key", project, "api_key", k.id); }
diff --git a/apps/web/e2e/data/resources.mjs b/apps/web/e2e/data/resources.mjs
index 79bd37bc0..a542ef781 100644
--- a/apps/web/e2e/data/resources.mjs
+++ b/apps/web/e2e/data/resources.mjs
@@ -3,22 +3,9 @@ let seed = 7;
 const rand = () => ((seed = (seed * 1664525 + 1013904223) % 4294967296) / 4294967296);
 const hex = (n) => Array.from({ length: n }, () => Math.floor(rand() * 16).toString(16)).join("");
 const uuid = () => `${hex(8)}-${hex(4)}-4${hex(3)}-8${hex(3)}-${hex(12)}`;
-const iso = (seconds) => new Date(seconds * 1000).toISOString().replace(/\.\d{3}Z$/, "Z");
 
-export function buildResources(now, agents, sessions) {
+export function buildResources(now) {
   seed = 7;
-  const keys = [
-    { id: "fb533e99-524f-4e44-94bc-8f6e571646a7", name: "Production app", prefix: "pc_live_7Hq", created_at: iso(now - 86400 * 21), revoked_at: null },
-    { id: "3c1d9e20-7a41-4b8e-9f02-5d6e7f8a9b10", name: "CI pipeline", prefix: "pc_live_Qm4", created_at: iso(now - 86400 * 16), revoked_at: null },
-    { id: "a47e2b19-0c3d-4e5f-8a6b-7c8d9e0f1a2b", name: "Data team notebook", prefix: "pc_live_k9T", created_at: iso(now - 86400 * 9), revoked_at: null },
-    { id: "0b533e99-524f-4e44-94bc-8f6e571646a7", name: "Staging", prefix: "pc_live_2Xa", created_at: iso(now - 86400 * 30), revoked_at: iso(now - 86400 * 6) },
-  ];
-  const refOf = (key) => ({ type: "project_api_key", id: key.id, name: key.name, prefix: key.prefix, revoked_at: key.revoked_at });
-  const consoleRef = { type: "console", id: null, name: null, prefix: null, revoked_at: null };
-  // Weighted owner choice: most traffic from production, some unknown (created before recording).
-  const owners = [refOf(keys[0]), refOf(keys[0]), refOf(keys[0]), refOf(keys[1]), refOf(keys[1]), refOf(keys[2]), refOf(keys[3]), consoleRef, null];
-  const ownerOf = () => owners[Math.floor(rand() * owners.length)];
-
   const skills = [
     ["report", "Create quarterly and incident reports from structured notes.", 3, 2],
     ["triage", "Sort incoming issues by severity and owner.", 2, 2],
@@ -72,41 +59,8 @@ export function buildResources(now, agents, sessions) {
       created_at: created, updated_at: created + (index % 2 ? 86400 : 0) };
   }).reverse()]));
 
-  const ownership = new Map();
-  const own = (type, id, created) => { const owner = ownerOf(); ownership.set(`${type}:${id}`, { resource_type: type, resource_id: id, owner, created_at: owner ? iso(created) : null }); return owner; };
-  const activity = [];
-  const record = (owner, action, type, id, at, parent = null) => {
-    if (!owner) return;
-    activity.push({ id: `act_${uuid()}`, object: "api_key.activity", created_at: iso(at), actor: owner, action, resource_type: type, resource_id: id, parent_resource_id: parent, trace_id: hex(32) });
-  };
-  for (const agent of agents) { const owner = own("agent", agent.id, agent.created_at); record(owner, "create", "agent", agent.id, agent.created_at); if (agent.updated_at > agent.created_at) record(owner, "update", "agent", agent.id, agent.updated_at); }
-  for (const session of sessions) { const owner = own("session", session.id, session.created_at); record(owner, "create", "session", session.id, session.created_at); if (session.last_active_at > session.created_at + 60) record(owner, "send", "session", session.id, session.last_active_at); }
-  for (const skill of skills) {
-    const owner = own("skill", skill.id, skill.created_at);
-    record(owner, "create", "skill", skill.id, skill.created_at);
-    for (const version of skillVersions.get(skill.id).slice(0, -1)) record(owner, "create", "skill_version", version.id, version.created_at, skill.id);
-    if (skill.default_version !== skill.latest_version) record(owner, "update", "skill", skill.id, skill.created_at + 86400);
-  }
-  for (const file of files) record(own("file", file.id, file.created_at), "create", "file", file.id, file.created_at);
-  for (const template of templates) { const owner = own("environment_template", template.id, template.created_at); record(owner, "create", "environment_template", template.id, template.created_at); record(owner, "update", "environment_template", template.id, template.updated_at); }
-  for (const { vault } of vaults) {
-    const owner = own("vault", vault.id, vault.created_at);
-    record(owner, "create", "vault", vault.id, vault.created_at);
-    for (const credential of credentials.get(vault.id)) {
-      own("vault_credential", credential.id, credential.created_at);
-      record(owner, "create", "vault_credential", credential.id, credential.created_at, vault.id);
-      if (credential.updated_at > credential.created_at) record(owner, "update", "vault_credential", credential.id, credential.updated_at, vault.id);
-    }
-  }
-  // Deleted resources still appear in the log.
-  record(refOf(keys[3]), "delete", "agent", `agent_${hex(8)}`, now - 86400 * 7);
-  record(refOf(keys[1]), "delete", "file", `file-${uuid()}`, now - 86400 * 2 - 600);
-  record(refOf(keys[1]), "delete", "skill_version", `skillver_${uuid()}`, now - 86400 * 3, skills[1].id);
-  activity.sort((a, b) => Date.parse(b.created_at) - Date.parse(a.created_at));
-
   return {
-    keys, skills, skillVersions, files, templates,
+    skills, skillVersions, files, templates,
     vaults: vaults.map(({ vault }) => vault), credentials,
-    ownership, activity,
   };
 }
diff --git a/apps/web/e2e/fixture-console.mjs b/apps/web/e2e/fixture-console.mjs
index 6d57e3cc2..1145cd52d 100644
--- a/apps/web/e2e/fixture-console.mjs
+++ b/apps/web/e2e/fixture-console.mjs
@@ -97,7 +97,7 @@ function reset(mode = "login", fresh = false, sandbox = "configured", nodes = "d
   const screenshots = process.env.OAC_WEB_SCREENSHOT_DEMO === "1";
   const now = Math.floor(Date.now() / 1000);
   const base = (screenshots ? buildScreenshotDemo : buildDemo)(now, address === "local" ? LOCAL_URL : PUBLIC_URL);
-  const resources = buildResources(now, base.agents, base.sessions);
+  const resources = buildResources(now);
   const admin = buildAdmin(now, base, resources);
   // A fresh install: no project, Session or Runtime yet; Getting started leads.
   if (fresh) for (const list of [admin.projects, base.sessions, base.observations, base.allocations]) list.splice(0);
diff --git a/apps/web/src/features/dashboard/runtime-history.ts b/apps/web/src/features/dashboard/runtime-history.ts
index 0f07a386b..4a19e37ed 100644
--- a/apps/web/src/features/dashboard/runtime-history.ts
+++ b/apps/web/src/features/dashboard/runtime-history.ts
@@ -1,5 +1,6 @@
-import { AgentCoreError, type AgentSession, type CoreProjectReader, type RuntimeHistory } from "@oac/agents-client";
+import { AgentCoreError, type AgentSession, type RuntimeHistory } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
 import type { RuntimeDashboardSnapshot } from "./runtime-snapshot";
 import { deriveTokenThroughput, type RuntimeTrendSample, type RuntimeTrendTarget } from "./runtime-trends";
 
@@ -160,7 +161,7 @@ export function runtimeDurableTrendSamples(
   return deriveTokenThroughput(samples);
 }
 
-export type RuntimeHistoryReader = Pick<CoreProjectReader, "retrieveRuntimeHistory">;
+export type RuntimeHistoryReader = Pick<ProjectClient, "retrieveRuntimeHistory">;
 
 function isNotFound(error: unknown): boolean {
   return error instanceof AgentCoreError && error.status === 404;
diff --git a/apps/web/src/features/files/file-operations.ts b/apps/web/src/features/files/file-operations.ts
index a130db446..f7570c530 100644
--- a/apps/web/src/features/files/file-operations.ts
+++ b/apps/web/src/features/files/file-operations.ts
@@ -1,10 +1,10 @@
 import {
   AgentCoreError,
-  type CoreProjectReader,
   type PageOrder,
   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. */
@@ -74,7 +74,7 @@ export function filterFiles(files: readonly SourceFileListEntry[], query: string
 
 /** Reads one page after the loaded rows and applies the shared identity and cursor checks. */
 export async function readFilesPage(
-  core: Pick<CoreProjectReader, "listSourceFiles">,
+  core: Pick<ProjectClient, "listSourceFiles">,
   loaded: readonly SourceFileListEntry[],
   order: PageOrder,
   after: string | undefined,
diff --git a/apps/web/src/features/fleet/fleet-queries.ts b/apps/web/src/features/fleet/fleet-queries.ts
index 99c65e6f0..65176ad25 100644
--- a/apps/web/src/features/fleet/fleet-queries.ts
+++ b/apps/web/src/features/fleet/fleet-queries.ts
@@ -2,7 +2,6 @@ import { queryOptions, type QueryClient } from "@tanstack/react-query";
 import { SandboxAdminClient, type SandboxAllocation, type SandboxDeployment, type SandboxNode, type SandboxNodeHistoryRange } from "@oac/agents-client";
 
 import { sandboxDeploymentQuery } from "../sandbox/sandbox-queries";
-import { sandboxConsoleConfig } from "../sandbox/console-config";
 
 export interface FleetSnapshot {
   deployment: SandboxDeployment;
@@ -18,12 +17,6 @@ function client(): SandboxAdminClient {
   return sandboxClient;
 }
 
-/** The console's own configuration: whether it holds a sandbox administration credential. */
-export const consoleConfigQuery = queryOptions({
-  queryKey: ["console-config"],
-  queryFn: ({ signal }) => sandboxConsoleConfig(signal),
-});
-
 async function loadFleet(readAllocations: boolean, signal: AbortSignal, cache: QueryClient): Promise<FleetSnapshot> {
   const sandbox = client();
   const [deployment, nodes] = await Promise.all([
diff --git a/apps/web/src/features/fleet/use-sandbox-fleet.test.tsx b/apps/web/src/features/fleet/use-sandbox-fleet.test.tsx
index 966d264d8..c97c61b5e 100644
--- a/apps/web/src/features/fleet/use-sandbox-fleet.test.tsx
+++ b/apps/web/src/features/fleet/use-sandbox-fleet.test.tsx
@@ -5,9 +5,8 @@ import { describe, expect, it } from "vitest";
 
 import { gettingStartedSteps } from "../overview/getting-started";
 import { node } from "../overview/test-fixtures";
-import type { SandboxConsoleConfig } from "../sandbox/console-config";
 import { sandboxDeploymentQuery } from "../sandbox/sandbox-queries";
-import { consoleConfigQuery, fleetQuery, type FleetSnapshot } from "./fleet-queries";
+import { fleetQuery, type FleetSnapshot } from "./fleet-queries";
 import { FleetReadNotice } from "./FleetReadNotice";
 import { fleetSnapshot, useSandboxFleet } from "./use-sandbox-fleet";
 
@@ -23,8 +22,6 @@ function Probe() {
 function render(latest: SandboxDeployment, previous = configured, failed = false) {
   const cache = new QueryClient({ defaultOptions: { queries: { retry: false } } });
   const snapshot: FleetSnapshot = { deployment: previous, nodes: [node("n1")], allocations: [], loadedAt: 1 };
-  const config: SandboxConsoleConfig = { sandbox_admin: true, node_installer: false, node_installer_sha256: "" };
-  cache.setQueryData<SandboxConsoleConfig | null>(consoleConfigQuery.queryKey, () => config);
   cache.setQueryData(fleetQuery(false).queryKey, snapshot);
   cache.setQueryData(sandboxDeploymentQuery.queryKey, latest);
   if (failed) cache.getQueryCache().find({ queryKey: fleetQuery(false).queryKey })?.setState({ status: "error", error: new Error("inventory read failed") });
diff --git a/apps/web/src/features/fleet/use-sandbox-fleet.ts b/apps/web/src/features/fleet/use-sandbox-fleet.ts
index 3e13bbdea..c7e68dd22 100644
--- a/apps/web/src/features/fleet/use-sandbox-fleet.ts
+++ b/apps/web/src/features/fleet/use-sandbox-fleet.ts
@@ -3,14 +3,11 @@ import { useCallback, useEffect } from "react";
 import type { SandboxDeployment } from "@oac/agents-client";
 
 import { sandboxDeploymentQuery } from "../sandbox/sandbox-queries";
-import { consoleConfigQuery, fleetQuery, type FleetSnapshot } from "./fleet-queries";
+import { fleetQuery, type FleetSnapshot } from "./fleet-queries";
 
 export type { FleetSnapshot };
 
 export type FleetState =
-  | { status: "checking" }
-  /** The console has no sandbox administration credential. */
-  | { status: "unconfigured" }
   | { status: "loading" }
   | { status: "ready"; snapshot: FleetSnapshot; targetGeneration: number; refreshing: boolean; error: unknown | null }
   | { status: "failed"; error: unknown };
@@ -24,14 +21,9 @@ export const FLEET_REFRESH_MS = 30_000;
  * refresh keeps the last snapshot on screen. Node writes stay on the Nodes page.
  */
 export function useSandboxFleet({ poll = true, allocations = false }: { poll?: boolean; allocations?: boolean } = {}) {
-  const config = useQuery(consoleConfigQuery);
-  // A failed configuration read is a failure, not "no sandbox administration".
-  const configFailed = config.isError && config.data === undefined;
-  const adminAvailable = config.isPending || configFailed ? null : config.data?.sandbox_admin === true;
-  const deployment = useQuery({ ...sandboxDeploymentQuery, enabled: adminAvailable === true });
+  const deployment = useQuery(sandboxDeploymentQuery);
   const fleet = useQuery({
     ...fleetQuery(allocations),
-    enabled: adminAvailable === true,
     refetchInterval: poll ? FLEET_REFRESH_MS : false,
     refetchIntervalInBackground: false,
   });
@@ -43,23 +35,16 @@ export function useSandboxFleet({ poll = true, allocations = false }: { poll?: b
   // Compatible prior-generation inventory remains visible as an older observation.
   // A reset or backend lifecycle change makes that earlier inventory invalid.
   useEffect(() => {
-    if (adminAvailable === true && (differentDeployment || changedGeneration)) void refetchFleet();
-  }, [adminAvailable, differentDeployment, changedGeneration, deployment.data?.installation_id, deployment.data?.owner_epoch, deployment.data?.generation, deployment.data?.provider, deployment.data?.mode, deployment.data?.reset?.requested_at, refetchFleet]);
+    if (differentDeployment || changedGeneration) void refetchFleet();
+  }, [differentDeployment, changedGeneration, deployment.data?.installation_id, deployment.data?.owner_epoch, deployment.data?.generation, deployment.data?.provider, deployment.data?.mode, deployment.data?.reset?.requested_at, refetchFleet]);
 
   let state: FleetState;
-  if (configFailed) state = config.isFetching ? { status: "checking" } : { status: "failed", error: config.error };
-  else if (adminAvailable === null) state = { status: "checking" };
-  else if (!adminAvailable) state = { status: "unconfigured" };
-  else if (differentDeployment) state = fleet.isError && !fleet.isFetching ? { status: "failed", error: fleet.error } : { status: "loading" };
+  if (differentDeployment) state = fleet.isError && !fleet.isFetching ? { status: "failed", error: fleet.error } : { status: "loading" };
   else if (fleet.data) state = { status: "ready", snapshot: fleet.data, targetGeneration: deployment.data?.generation ?? fleet.data.deployment.generation, refreshing: fleet.isFetching, error: fleet.isError ? fleet.error : null };
   else if (fleet.isError && !fleet.isFetching) state = { status: "failed", error: fleet.error };
   else state = { status: "loading" };
 
-  const { refetch: refetchConfig } = config;
-  // Without sandbox administration a refresh asks the console again whether it has it.
-  const refresh = useCallback(() => {
-    void (adminAvailable === true ? refetchFleet() : refetchConfig());
-  }, [adminAvailable, refetchConfig, refetchFleet]);
+  const refresh = useCallback(() => { void refetchFleet(); }, [refetchFleet]);
   return { state, refresh, deployment };
 }
 
diff --git a/apps/web/src/features/metrics/AgentMetricsPage.tsx b/apps/web/src/features/metrics/AgentMetricsPage.tsx
index 9e31660c1..833e35435 100644
--- a/apps/web/src/features/metrics/AgentMetricsPage.tsx
+++ b/apps/web/src/features/metrics/AgentMetricsPage.tsx
@@ -153,7 +153,6 @@ function coverageNote(loaded: Loaded, t: TFunction<"metrics">): string | null {
   const { coverage } = loaded.metrics;
   const parts: string[] = [];
   if (loaded.truncatedLists.length) parts.push(t("coverage.listTruncated", { names: loaded.truncatedLists.map((project) => project.name).join(", ") }));
-  if (loaded.unrecognizedSessions) parts.push(t("coverage.unrecognized", { count: loaded.unrecognizedSessions }));
   if (coverage.skippedSessions) parts.push(t("coverage.skipped", { loaded: coverage.loadedSessions, total: coverage.candidateSessions }));
   if (coverage.truncatedSessions) parts.push(t("coverage.truncated", { count: coverage.truncatedSessions }));
   if (coverage.failedSessions) parts.push(t("coverage.failed", { count: coverage.failedSessions }));
diff --git a/apps/web/src/features/metrics/SandboxMetricsPage.tsx b/apps/web/src/features/metrics/SandboxMetricsPage.tsx
index 1e1262607..e3b70c6a8 100644
--- a/apps/web/src/features/metrics/SandboxMetricsPage.tsx
+++ b/apps/web/src/features/metrics/SandboxMetricsPage.tsx
@@ -87,7 +87,6 @@ const loadHistory = (snapshot: RuntimeDashboardSnapshot, range: RuntimeDurableRa
 }, snapshot, range, signal);
 
 function fleetMessage(state: FleetState, t: TFunction<"metrics">): string {
-  if (state.status === "unconfigured") return t("sandbox.fleetUnconfigured");
   if (state.status === "failed") return t("sandbox.fleetFailed");
   return t("sandbox.fleetLoading");
 }
@@ -193,7 +192,7 @@ export function SandboxMetricsPage() {
                 action={<button className="button primary" type="button" onClick={() => navigate("system", { id: "sandbox" })}>{t("sandbox.setUp")}</button>}
               />
             )
-          ) : fleetState.status === "checking" || fleetState.status === "loading"
+          ) : fleetState.status === "loading"
             ? <TableSkeleton label={message} rows={3} columns={suspends ? 9 : 8} />
             : <p className="page-status" role={fleetState.status === "failed" ? "alert" : "status"}>{message}</p>}
         </Section>}
diff --git a/apps/web/src/features/metrics/agent-metrics-loader.ts b/apps/web/src/features/metrics/agent-metrics-loader.ts
index a89f17c5c..b7e6ba23a 100644
--- a/apps/web/src/features/metrics/agent-metrics-loader.ts
+++ b/apps/web/src/features/metrics/agent-metrics-loader.ts
@@ -1,5 +1,6 @@
-import type { AgentSession, AgentTurn, ListPage, CoreProjectReader, PageOptions, SessionItem } from "@oac/agents-client";
+import type { AgentSession, AgentTurn, ListPage, PageOptions, SessionItem } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
 import type { MetricsCoverage, MetricsWindow, SessionActivity } from "./agent-metrics";
 import { readProjectsSessions, type InProject, type ProjectReadFailure, type SessionLister } from "./project-sessions";
 import { type Project, type ProjectSummary } from "../../lib/admin-view";
@@ -200,7 +201,7 @@ export async function loadAgentMetricsActivity(
 /** Most Sessions listed per project when looking for Sessions active in the range. */
 export const PROJECT_SESSION_LIST_CAP = 2_000;
 
-type ProjectReader = SessionLister & Pick<CoreProjectReader, "listTurns" | "listItems">;
+type ProjectReader = SessionLister & Pick<ProjectClient, "listTurns" | "listItems">;
 
 /** Routes each Session's Turn and Item reads to the admin scope of its project. */
 export function projectMetricsSource(sessions: readonly InProject<AgentSession>[], clientFor: (project: Project) => AgentMetricsSource): AgentMetricsSource {
@@ -230,8 +231,6 @@ export interface ProjectAgentMetricsLoad extends AgentMetricsLoad {
   /** Projects whose Session list was longer than the list cap. */
   truncatedLists: Project[];
   listFailures: ProjectReadFailure[];
-  /** Listed Sessions the client could not recognize; their Turns are not counted. */
-  unrecognizedSessions: number;
 }
 
 /**
@@ -258,6 +257,5 @@ export async function loadProjectAgentMetrics(
     coverage: load.coverage,
     truncatedLists: reads.filter((read) => !read.complete).map((read) => read.project),
     listFailures: failures,
-    unrecognizedSessions: reads.reduce((sum, read) => sum + read.unrecognized, 0),
   };
 }
diff --git a/apps/web/src/features/metrics/agent-metrics.test.ts b/apps/web/src/features/metrics/agent-metrics.test.ts
index d8fcf96ce..e9d18775e 100644
--- a/apps/web/src/features/metrics/agent-metrics.test.ts
+++ b/apps/web/src/features/metrics/agent-metrics.test.ts
@@ -365,7 +365,7 @@ describe("Agent metrics across projects", () => {
       window,
       {
         clientFor: (target) => {
-          if (target.id === "down") return { ...clients.busy!, listSessionsTolerant: async () => { throw new Error("HTTP 502"); } };
+          if (target.id === "down") return { ...clients.busy!, listSessions: async () => { throw new Error("HTTP 502"); } };
           return clients[target.id]!;
         },
         summary: [
diff --git a/apps/web/src/features/metrics/key-usage.test.ts b/apps/web/src/features/metrics/key-usage.test.ts
index 5af3632c0..ce8bfb7d7 100644
--- a/apps/web/src/features/metrics/key-usage.test.ts
+++ b/apps/web/src/features/metrics/key-usage.test.ts
@@ -5,7 +5,7 @@ import { summary } from "../overview/test-fixtures";
 import { keyUsageRows } from "./key-usage";
 import { type KeyRef } from "../../lib/admin-view";
 
-const key = (id: string): KeyRef => ({ id, name: id, prefix: `pc_${id}`, kind: "issued", revoked_at: null });
+const key = (id: string): KeyRef => ({ id, name: id, prefix: `pc_${id}`, revoked_at: null });
 const sessions = (total: number) => ({ total, idle: total, in_progress: 0, requires_action: 0, failed: 0 });
 const usage = (total: number) => ({ input_tokens: total, output_tokens: 0, total_tokens: total, cached_tokens: 0, reasoning_tokens: 0 });
 
diff --git a/apps/web/src/features/metrics/metrics-queries.ts b/apps/web/src/features/metrics/metrics-queries.ts
index 6ebb85207..d76ce332d 100644
--- a/apps/web/src/features/metrics/metrics-queries.ts
+++ b/apps/web/src/features/metrics/metrics-queries.ts
@@ -22,7 +22,6 @@ export interface LoadedAgentMetrics {
   metrics: AgentMetrics;
   truncatedLists: Project[];
   listFailures: ProjectReadFailure[];
-  unrecognizedSessions: number;
   /** Epoch milliseconds. */
   loadedAt: number;
 }
@@ -47,7 +46,6 @@ export function agentMetricsQuery(targets: readonly Project[], filter: string, r
         metrics: aggregateAgentMetrics(window, load.activities, load.coverage),
         truncatedLists: load.truncatedLists,
         listFailures: load.listFailures,
-        unrecognizedSessions: load.unrecognizedSessions,
         loadedAt: Date.now(),
       };
     },
diff --git a/apps/web/src/features/metrics/project-sessions.test.ts b/apps/web/src/features/metrics/project-sessions.test.ts
index eb2c47cf9..c4cffbd5d 100644
--- a/apps/web/src/features/metrics/project-sessions.test.ts
+++ b/apps/web/src/features/metrics/project-sessions.test.ts
@@ -9,7 +9,7 @@ describe("readSessions", () => {
   it("walks pages newest first until the list ends", async () => {
     const lister = sessionLister(many(250));
     const read = await readSessions(lister, { maxSessions: 1_000 });
-    expect(read).toMatchObject({ complete: true, unrecognized: 0 });
+    expect(read.complete).toBe(true);
     expect(read.sessions).toHaveLength(250);
     expect(lister.calls).toEqual(["first", "s99", "s199"]);
   });
@@ -22,21 +22,13 @@ describe("readSessions", () => {
     expect(capped.complete).toBe(false);
     expect(capped.sessions).toHaveLength(150);
   });
-
-  it("counts unrecognized entries without keeping them", async () => {
-    const read = await readSessions({
-      listSessionsTolerant: async () => ({ object: "list", data: [session("a")], unrecognized: [{ index: 1, id: null }], has_more: false, first_id: "a", last_id: "a" }),
-    }, { maxSessions: 100 });
-    expect(read).toMatchObject({ unrecognized: 1, complete: true });
-    expect(read.sessions).toHaveLength(1);
-  });
 });
 
 describe("readProjectsSessions", () => {
   it("reads projects in parallel and reports a failing project by name", async () => {
     const { reads, failures } = await readProjectsSessions(
       [project("ok"), project("down")],
-      (target) => (target.id === "ok" ? sessionLister(many(3)) : { listSessionsTolerant: async () => { throw new Error("HTTP 503"); } }),
+      (target) => (target.id === "ok" ? sessionLister(many(3)) : { listSessions: async () => { throw new Error("HTTP 503"); } }),
       () => ({ maxSessions: 100 }),
     );
     expect(reads.map((read) => [read.project.id, read.sessions.length])).toEqual([["ok", 3]]);
diff --git a/apps/web/src/features/metrics/project-sessions.ts b/apps/web/src/features/metrics/project-sessions.ts
index ba9153e00..c5c38fe89 100644
--- a/apps/web/src/features/metrics/project-sessions.ts
+++ b/apps/web/src/features/metrics/project-sessions.ts
@@ -1,6 +1,6 @@
-import type { AgentSession, CoreProjectReader } from "@oac/agents-client";
+import type { AgentSession } from "@oac/agents-client";
 
-import type { Owned } from "../../lib/projects";
+import type { Owned, ProjectClient } from "../../lib/projects";
 import { type Project } from "../../lib/admin-view";
 
 /**
@@ -12,15 +12,13 @@ import { type Project } from "../../lib/admin-view";
 
 export const SESSION_PAGE_SIZE = 100;
 
-export type SessionLister = Pick<CoreProjectReader, "listSessionsTolerant">;
+export type SessionLister = Pick<ProjectClient, "listSessions">;
 
 /** A value and the project it belongs to. */
 export type InProject<T> = Owned<T>;
 
 export interface SessionRead {
   sessions: AgentSession[];
-  /** Entries the client did not recognize; they are not counted anywhere. */
-  unrecognized: number;
   /** False when the read stopped at `maxSessions` before the list ended or `enough` held. */
   complete: boolean;
 }
@@ -34,20 +32,16 @@ export interface SessionReadOptions {
 
 export async function readSessions(client: SessionLister, options: SessionReadOptions): Promise<SessionRead> {
   const sessions: AgentSession[] = [];
-  let unrecognized = 0;
   let after: string | undefined;
-  let read = 0;
-  while (read < options.maxSessions) {
-    const limit = Math.min(SESSION_PAGE_SIZE, options.maxSessions - read);
-    const page = await client.listSessionsTolerant({ order: "desc", limit, after, signal: options.signal });
+  while (sessions.length < options.maxSessions) {
+    const limit = Math.min(SESSION_PAGE_SIZE, options.maxSessions - sessions.length);
+    const page = await client.listSessions({ order: "desc", limit, after, signal: options.signal });
     sessions.push(...page.data);
-    unrecognized += page.unrecognized.length;
-    read += page.data.length + page.unrecognized.length;
-    if (!page.has_more || !page.last_id || page.last_id === after) return { sessions, unrecognized, complete: true };
-    if (options.enough?.(sessions)) return { sessions, unrecognized, complete: true };
+    if (!page.has_more || !page.last_id || page.last_id === after) return { sessions, complete: true };
+    if (options.enough?.(sessions)) return { sessions, complete: true };
     after = page.last_id;
   }
-  return { sessions, unrecognized, complete: false };
+  return { sessions, complete: false };
 }
 
 export interface ProjectSessionRead extends SessionRead {
diff --git a/apps/web/src/features/metrics/sandbox-runtime.ts b/apps/web/src/features/metrics/sandbox-runtime.ts
index a9645d827..82883ec2a 100644
--- a/apps/web/src/features/metrics/sandbox-runtime.ts
+++ b/apps/web/src/features/metrics/sandbox-runtime.ts
@@ -1,5 +1,6 @@
-import type { AgentSession, CoreProjectReader, SandboxAllocation, SandboxNode } from "@oac/agents-client";
+import type { AgentSession, SandboxAllocation, SandboxNode } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
 import type { RuntimeDashboardSnapshot } from "../dashboard/runtime-snapshot";
 import { type OwnedRuntimeObservation } from "../../lib/admin-view";
 
@@ -14,7 +15,7 @@ import { type OwnedRuntimeObservation } from "../../lib/admin-view";
 export const HOSTED_SESSION_LIMIT = 100;
 const SESSION_READ_CONCURRENCY = 6;
 
-export type SessionReader = Pick<CoreProjectReader, "retrieveSession">;
+export type SessionReader = Pick<ProjectClient, "retrieveSession">;
 
 export interface HostedRuntimeLoad {
   observations: OwnedRuntimeObservation[];
diff --git a/apps/web/src/features/overview/OverviewPage.tsx b/apps/web/src/features/overview/OverviewPage.tsx
index 4b459679c..e0e366b71 100644
--- a/apps/web/src/features/overview/OverviewPage.tsx
+++ b/apps/web/src/features/overview/OverviewPage.tsx
@@ -308,7 +308,6 @@ function MetricTile({ label, help, value, sub }: { label: string; help?: ReactNo
 }
 
 function fleetDetail(state: FleetState, t: TFunction<"overview">): string {
-  if (state.status === "unconfigured") return t("fleet.unconfigured");
   if (state.status === "failed") return t("fleet.failed");
   return t("fleet.loading");
 }
diff --git a/apps/web/src/features/overview/getting-started.ts b/apps/web/src/features/overview/getting-started.ts
index 24d47382f..8a781e398 100644
--- a/apps/web/src/features/overview/getting-started.ts
+++ b/apps/web/src/features/overview/getting-started.ts
@@ -63,7 +63,7 @@ export function gettingStartedSteps(input: {
  */
 function sandboxStep(fleet: FleetState): GettingStartedSteps["sandboxes"] {
   if (fleet.status !== "ready") {
-    return { state: fleet.status === "failed" || fleet.status === "unconfigured" ? "unknown" : null, action: "nodes", cloud: false };
+    return { state: fleet.status === "failed" ? "unknown" : null, action: "nodes", cloud: false };
   }
   if (fleet.error) return { state: "unknown", action: "nodes", cloud: fleet.snapshot.deployment.provider === "e2b" };
   const { deployment, nodes } = fleet.snapshot;
@@ -142,7 +142,7 @@ const INSTALLATION_KEY = "oac-web.last-installation";
  */
 export function checklistStorageKey(fleet: FleetState): string | null {
   const installation = fleet.status === "ready" ? fleet.snapshot.deployment.installation_id
-    : fleet.status === "failed" || fleet.status === "unconfigured" ? readStored(INSTALLATION_KEY) ?? ""
+    : fleet.status === "failed" ? readStored(INSTALLATION_KEY) ?? ""
     : null;
   if (installation === null) return null;
   return installation ? `${MEMORY_KEY}.${installation}` : MEMORY_KEY;
diff --git a/apps/web/src/features/overview/overview-loader.test.ts b/apps/web/src/features/overview/overview-loader.test.ts
index bcb002a91..c9c80a131 100644
--- a/apps/web/src/features/overview/overview-loader.test.ts
+++ b/apps/web/src/features/overview/overview-loader.test.ts
@@ -64,7 +64,7 @@ describe("loadOverview", () => {
     const good = sessionLister(hourly("g", 30));
     const data = await loadOverview([project("good"), project("broken")], {
       summary: async () => { throw new Error("HTTP 500"); },
-      sessions: (target) => (target.id === "good" ? good : { listSessionsTolerant: async () => { throw new Error("boom"); } }),
+      sessions: (target) => (target.id === "good" ? good : { listSessions: async () => { throw new Error("boom"); } }),
     }, NOW, new AbortController().signal);
     expect(data.summary.status).toBe("failed");
     expect(data.sessions.sessions).toHaveLength(30);
@@ -88,7 +88,7 @@ describe("Overview refresh retention", () => {
     summary: async () => projects.map(({ id }) => summary(id, { sessions: { total: 1, idle: 0, in_progress: 0, failed: 1, requires_action: 0 }, last_active_at: NOW })),
     sessions: ({ id }) => sessionLister([session(id, { status: "failed", created_at: NOW, last_active_at: NOW })]),
   }, NOW, controller.signal);
-  const unavailable = { listSessionsTolerant: async () => { throw new Error("unavailable"); } };
+  const unavailable = { listSessions: async () => { throw new Error("unavailable"); } };
 
   it("retains a failed summary and failed project's rows while replacing successful project reads", async () => {
     const prior = await original();
diff --git a/apps/web/src/features/overview/test-fixtures.ts b/apps/web/src/features/overview/test-fixtures.ts
index 9b54d3e6f..96ed55aac 100644
--- a/apps/web/src/features/overview/test-fixtures.ts
+++ b/apps/web/src/features/overview/test-fixtures.ts
@@ -62,12 +62,12 @@ export function hostedObservation(sessionId: string, projectId: string, override
 export function sessionLister(sessions: readonly AgentSession[], calls: string[] = []) {
   return {
     calls,
-    async listSessionsTolerant(options?: { after?: string; limit?: number; signal?: AbortSignal }) {
+    async listSessions(options?: { after?: string; limit?: number; signal?: AbortSignal }) {
       options?.signal?.throwIfAborted();
       const start = options?.after ? sessions.findIndex((entry) => entry.id === options.after) + 1 : 0;
       const data = sessions.slice(start, start + (options?.limit ?? 20));
       calls.push(options?.after ?? "first");
-      return { object: "list" as const, data, unrecognized: [], has_more: start + data.length < sessions.length, first_id: data[0]?.id ?? null, last_id: data.at(-1)?.id ?? null };
+      return { object: "list" as const, data, has_more: start + data.length < sessions.length, first_id: data[0]?.id ?? null, last_id: data.at(-1)?.id ?? null };
     },
   };
 }
diff --git a/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx b/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
index e06289e53..64c4d616a 100644
--- a/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
+++ b/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
@@ -12,7 +12,6 @@ import { useFailureToast, useToast } from "../../components/Toast";
 import { useConsoleNavigation } from "../../lib/console-navigation";
 import { sandboxConfigurationRejection, sandboxRequestError, sandboxWriteUncertain } from "../../lib/sandbox-labels";
 import { sandboxAdmin } from "./sandbox-queries";
-import { SandboxPageAccess } from "./SandboxPageAccess";
 import { useSandboxPageState } from "./use-sandbox-page-state";
 import { sandboxWriteOwnershipQuery } from "./sandbox-write-ownership";
 import { writeSandboxDeployment } from "./sandbox-deployment-write";
@@ -36,7 +35,7 @@ function DeploymentHeader({ actions }: { actions?: ReactNode }) {
 export function SandboxDeploymentPage() {
   const { i18n } = useTranslation("sandbox");
   return <section className="page-section console-page sandbox-manager sandbox-manager-page" lang={i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en"}>
-    <SandboxPageAccess header={<DeploymentHeader />}>{() => <DeploymentConfiguration />}</SandboxPageAccess>
+    <DeploymentConfiguration />
   </section>;
 }
 
diff --git a/apps/web/src/features/sandbox/SandboxManagerView.tsx b/apps/web/src/features/sandbox/SandboxManagerView.tsx
index 64a1dfcdb..00feda0eb 100644
--- a/apps/web/src/features/sandbox/SandboxManagerView.tsx
+++ b/apps/web/src/features/sandbox/SandboxManagerView.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState, type ReactNode, type RefObject } from "react";
 import { type SandboxNode } from "@oac/agents-client";
-import { useQueryClient } from "@tanstack/react-query";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { ArrowLeft, Pencil, Plus, Server, Trash2 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { ConfirmDialog } from "../../components/ConfirmDialog";
@@ -12,9 +12,8 @@ import { InstallationNotice } from "../../components/InstallationNotice";
 import { installationQuery } from "../../lib/installation";
 import { sandboxRequestError } from "../../lib/sandbox-labels";
 import type { SandboxConsoleConfig } from "./console-config";
-import { sandboxAdmin } from "./sandbox-queries";
+import { sandboxAdmin, sandboxConsoleConfigQuery } from "./sandbox-queries";
 import { useSandboxPageState } from "./use-sandbox-page-state";
-import { SandboxPageAccess } from "./SandboxPageAccess";
 import { NodeEnrollment } from "./NodeEnrollment";
 import { NodeList, onOldAddress } from "./NodeList";
 import { NodeDetail } from "./NodeDetail";
@@ -25,10 +24,16 @@ import "./SandboxManagerView.css";
 
 /** Nodes owns node enrollment, the list and individual node management. */
 export function SandboxManagerView() {
-  const { i18n } = useTranslation("sandbox");
+  const { t, i18n } = useTranslation("sandbox");
   const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const { data: config, isError, isFetching, refetch } = useQuery(sandboxConsoleConfigQuery);
   return <section className="page-section console-page sandbox-manager sandbox-manager-page" lang={locale}>
-    <SandboxPageAccess header={<NodesPageHeader />}>{(config) => <SandboxManager consoleConfig={config} />}</SandboxPageAccess>
+    {config ? <SandboxManager consoleConfig={config} /> : <>
+      <NodesPageHeader />
+      <div className="console-page-body">{isError
+        ? <><p role="alert">{t("The console configuration could not be read. Refresh to try again.")}</p><button type="button" className="button outline" disabled={isFetching} onClick={() => { void refetch(); }}>{t("Refresh sandbox state")}</button></>
+        : <p role="status">{t("Connecting to this console's Core…")}</p>}</div>
+    </>}
   </section>;
 }
 
diff --git a/apps/web/src/features/sandbox/SandboxPageAccess.tsx b/apps/web/src/features/sandbox/SandboxPageAccess.tsx
deleted file mode 100644
index 277d8867b..000000000
--- a/apps/web/src/features/sandbox/SandboxPageAccess.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { ReactNode } from "react";
-import { useQuery } from "@tanstack/react-query";
-import { useTranslation } from "react-i18next";
-import type { SandboxConsoleConfig } from "./console-config";
-import { sandboxConsoleConfigQuery } from "./sandbox-queries";
-
-/** Both sandbox pages use the same console capability gate. */
-export function SandboxPageAccess({ header, children }: { header: ReactNode; children: (config: SandboxConsoleConfig) => ReactNode }) {
-  const { t } = useTranslation("sandbox");
-  const { data: config, isPending: checking, isFetching, isError, refetch } = useQuery(sandboxConsoleConfigQuery);
-  if (isError && config === undefined) return <>{header}<div className="console-page-body"><p role="alert">{t("The console configuration could not be read. Refresh to try again.")}</p><button type="button" className="button outline" disabled={isFetching} onClick={() => { void refetch(); }}>{t("Refresh sandbox state")}</button></div></>;
-  if (checking) return <>{header}<div className="console-page-body"><p role="status">{t("Connecting to this console's Core…")}</p></div></>;
-  if (!config?.sandbox_admin) return <>{header}<div className="console-page-body"><p role="alert">{t("Sandbox administration is not configured on this console.")}</p><button type="button" className="button outline" disabled={isFetching} onClick={() => { void refetch(); }}>{t("Refresh sandbox state")}</button></div></>;
-  return children(config);
-}
diff --git a/apps/web/src/features/sandbox/console-config.test.ts b/apps/web/src/features/sandbox/console-config.test.ts
index d95d292cb..23834faba 100644
--- a/apps/web/src/features/sandbox/console-config.test.ts
+++ b/apps/web/src/features/sandbox/console-config.test.ts
@@ -4,45 +4,33 @@ import { nodeFilesAvailable, sandboxConsoleConfig } from "./console-config";
 afterEach(() => vi.unstubAllGlobals());
 describe("bundled console capabilities", () => {
   it("uses the existing console login without sending a project or admin bearer", async () => {
-    const fetch = vi.fn().mockResolvedValue(new Response(JSON.stringify({ node_installer: true, node_installer_sha256: "a".repeat(64) })));
+    const fetch = vi.fn().mockResolvedValue(new Response(JSON.stringify({ node_installer: true, node_installer_sha256: "a".repeat(64), node_artifacts: ["docker"] })));
     vi.stubGlobal("fetch", fetch);
     const controller = new AbortController();
-    expect(await sandboxConsoleConfig(controller.signal)).toEqual({ sandbox_admin: true, node_installer: true, node_installer_sha256: "a".repeat(64) });
+    expect(await sandboxConsoleConfig(controller.signal)).toEqual({ node_installer: true, node_installer_sha256: "a".repeat(64), node_artifacts: ["docker"] });
     expect(fetch).toHaveBeenCalledWith("/console/config", { credentials: "include", signal: controller.signal });
   });
-  it.each([{}, { sandbox_admin: "true", node_installer: true }, { sandbox_admin: false, node_installer: true, node_installer_sha256: "bad" }])("does not enable installation without a verified digest %j", async (body) => {
+  it.each([{}, { node_installer: "true", node_installer_sha256: "a".repeat(64) }, { node_installer: true, node_installer_sha256: "bad" }])("does not enable installation without a verified digest %j", async (body) => {
     vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response(JSON.stringify(body))));
-    expect((await sandboxConsoleConfig(new AbortController().signal))?.node_installer).toBe(false);
+    expect((await sandboxConsoleConfig(new AbortController().signal)).node_installer).toBe(false);
   });
-  it("reports unavailable capability on an absent console endpoint", async () => {
-    vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response("Not found", { status: 404 })));
-    expect(await sandboxConsoleConfig(new AbortController().signal)).toBeNull();
-  });
-  it("reports a failed read as a failure, not as an unconfigured console", async () => {
-    vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response("Bad gateway", { status: 502 })));
+  it.each([404, 502])("reports a failed read (HTTP %i) as a failure", async (status) => {
+    vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response("Failed", { status })));
     await expect(sandboxConsoleConfig(new AbortController().signal)).rejects.toThrow();
   });
-  it("blocks a provider's command only when the console reports no node files for it", async () => {
+  it("blocks a provider's command when the console reports no node files for it", async () => {
     const read = async (body: object) => {
       vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response(JSON.stringify({ node_installer: true, node_installer_sha256: "a".repeat(64), ...body }))));
-      return (await sandboxConsoleConfig(new AbortController().signal))!;
+      return sandboxConsoleConfig(new AbortController().signal);
     };
-    // An older console doesn't report them: nothing is blocked.
-    const older = await read({});
-    expect(older.node_artifacts).toBeUndefined();
-    expect(nodeFilesAvailable(older, "docker")).toBe(true);
     const docker = await read({ node_artifacts: ["docker"] });
     expect(nodeFilesAvailable(docker, "docker")).toBe(true);
     expect(nodeFilesAvailable(docker, "microsandbox")).toBe(false);
-    // null, like any malformed value, reports none.
-    for (const node_artifacts of [null, "docker", { docker: true }]) {
-      const config = await read({ node_artifacts });
+    // An absent, null or malformed value reports none.
+    for (const body of [{}, { node_artifacts: null }, { node_artifacts: "docker" }, { node_artifacts: { docker: true } }]) {
+      const config = await read(body);
       expect(config.node_artifacts).toEqual([]);
       expect(nodeFilesAvailable(config, "docker")).toBe(false);
     }
   });
-  it("disables sandbox administration only when the console says so", async () => {
-    vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response(JSON.stringify({ sandbox_admin: false }))));
-    expect((await sandboxConsoleConfig(new AbortController().signal))?.sandbox_admin).toBe(false);
-  });
 });
diff --git a/apps/web/src/features/sandbox/console-config.ts b/apps/web/src/features/sandbox/console-config.ts
index ed139bbe5..cf9188f5f 100644
--- a/apps/web/src/features/sandbox/console-config.ts
+++ b/apps/web/src/features/sandbox/console-config.ts
@@ -2,39 +2,27 @@
 export type NodeArtifactProvider = "docker" | "microsandbox";
 
 export interface SandboxConsoleConfig {
-  sandbox_admin: boolean;
   node_installer: boolean;
   node_installer_sha256: string;
-  /**
-   * The providers whose node files this console serves. Absent when the console
-   * does not report them (an older console), which blocks nothing; a reported
-   * null or malformed value reads as none.
-   */
-  node_artifacts?: NodeArtifactProvider[];
+  /** The providers whose node files this console serves; a null or malformed value reads as none. */
+  node_artifacts: NodeArtifactProvider[];
 }
 
 const SHA256 = /^[a-f0-9]{64}$/;
 
 /**
- * The console's capability flags. Signing in with the Core key grants
- * administration, so Core reports only its node installer and digest and the providers it has node files for;
- * sandbox administration is available
- * unless the console says `sandbox_admin: false`. An installer is offered only
- * with a well-formed SHA-256 digest.
- * An absent endpoint (404, an older console) means no sandbox administration;
- * any other failure is thrown so callers report a failed read instead of
- * "not configured".
+ * The console's node installer, its digest and the providers it has node
+ * files for. An installer is offered only with a well-formed SHA-256 digest.
+ * A failed read is thrown so callers report it.
  */
-export async function sandboxConsoleConfig(signal: AbortSignal): Promise<SandboxConsoleConfig | null> {
+export async function sandboxConsoleConfig(signal: AbortSignal): Promise<SandboxConsoleConfig> {
   const response = await fetch("/console/config", { credentials: "include", signal });
-  if (response.status === 404) return null;
   if (!response.ok) throw new Error(`The console configuration could not be read (HTTP ${response.status}).`);
   const config = await response.json() as Partial<Omit<SandboxConsoleConfig, "node_artifacts">> & { node_artifacts?: unknown };
   return {
-    sandbox_admin: config.sandbox_admin !== false,
     node_installer: config.node_installer === true && SHA256.test(config.node_installer_sha256 ?? ""),
     node_installer_sha256: config.node_installer_sha256 ?? "",
-    ...(config.node_artifacts === undefined ? {} : { node_artifacts: nodeArtifacts(config.node_artifacts) }),
+    node_artifacts: nodeArtifacts(config.node_artifacts),
   };
 }
 
@@ -43,7 +31,7 @@ function nodeArtifacts(value: unknown): NodeArtifactProvider[] {
   return Array.isArray(value) ? value.filter((entry): entry is NodeArtifactProvider => entry === "docker" || entry === "microsandbox") : [];
 }
 
-/** Whether a node of this provider can install from the console's files; true when the console doesn't report them. */
+/** Whether a node of this provider can install from the console's files. */
 export function nodeFilesAvailable(config: SandboxConsoleConfig, provider: string): boolean {
-  return config.node_artifacts === undefined || config.node_artifacts.some((entry) => entry === provider);
+  return config.node_artifacts.some((entry) => entry === provider);
 }
diff --git a/apps/web/src/features/sandbox/sandbox-page-ownership.test.tsx b/apps/web/src/features/sandbox/sandbox-page-ownership.test.tsx
index be052a149..db2fc3937 100644
--- a/apps/web/src/features/sandbox/sandbox-page-ownership.test.tsx
+++ b/apps/web/src/features/sandbox/sandbox-page-ownership.test.tsx
@@ -21,7 +21,7 @@ function cache(provider: SandboxDeployment["provider"]) {
     mode: provider === "e2b" ? "direct" : "nodes", reset: null, resources: { allocations: 0, pending: 0 }, suspension: null,
     rollout: { state: "settled", previous_generation_sandboxes: 0, nodes: null },
   };
-  const config: SandboxConsoleConfig = { sandbox_admin: true, node_installer: false, node_installer_sha256: "" };
+  const config: SandboxConsoleConfig = { node_installer: false, node_installer_sha256: "", node_artifacts: [] };
   client.setQueryData(sandboxConsoleConfigQuery.queryKey, () => config);
   client.setQueryData(sandboxDeploymentQuery.queryKey, deployment);
   client.setQueryData(sandboxSnapshotQuery.queryKey, { deployment, nodes: [], allocations: [], nodesError: null, readAt: 0 });
diff --git a/apps/web/src/features/sandbox/sandbox-queries.ts b/apps/web/src/features/sandbox/sandbox-queries.ts
index 9b3c8f766..00266196a 100644
--- a/apps/web/src/features/sandbox/sandbox-queries.ts
+++ b/apps/web/src/features/sandbox/sandbox-queries.ts
@@ -13,7 +13,7 @@ export const sandboxAdmin = new SandboxAdminClient({ baseUrl: "/core/v1/sandbox"
 
 export const sandboxScope = ["sandbox"] as const;
 
-/** Whether this console may administer sandboxes, and its node installer. */
+/** This console's node installer and node files. */
 export const sandboxConsoleConfigQuery = queryOptions({
   queryKey: ["console-config"],
   queryFn: async ({ signal }) => {
@@ -45,13 +45,11 @@ export function sandboxResetPollInterval(deployment: SandboxDeployment | undefin
 
 /**
  * The deployment's sandbox provider from the cached deployment read: "" before
- * setup, null while unknown or when this console has no sandbox administration.
- * Pages that differ for E2B (no machines) and own nodes read it.
+ * setup, null while unknown. Pages that differ for E2B (no machines) and own
+ * nodes read it.
  */
 export function useSandboxProvider(): SandboxProvider | "" | null {
-  const config = useQuery(sandboxConsoleConfigQuery);
-  const deployment = useQuery({ ...sandboxDeploymentQuery, enabled: config.data?.sandbox_admin === true });
-  return deployment.data?.provider ?? null;
+  return useQuery(sandboxDeploymentQuery).data?.provider ?? null;
 }
 
 export interface SandboxSnapshot {
diff --git a/apps/web/src/features/sessions/SessionLogPage.tsx b/apps/web/src/features/sessions/SessionLogPage.tsx
index 2038e2b64..53cf494e0 100644
--- a/apps/web/src/features/sessions/SessionLogPage.tsx
+++ b/apps/web/src/features/sessions/SessionLogPage.tsx
@@ -1,10 +1,11 @@
+import type { AgentSession } from "@oac/agents-client";
 import { MessageSquareText } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { ReadFailure } from "../../components/ReadFailure";
 import { useFailureToast } from "../../components/Toast";
-import { EmptyState, HelpTip, PageBody, PageHeader, RefreshButton, SegmentedControl } from "../../components/console-ui";
+import { EmptyState, PageBody, PageHeader, RefreshButton, SegmentedControl } from "../../components/console-ui";
 import { ListToolbar, listSummary, NameCell, RowActions, SearchField } from "../../components/list-ui";
 import { useConsoleIntent, useConsoleNavigation } from "../../lib/console-navigation";
 import { formatClock, formatCompact, formatDateTime, formatInteger, formatRelative, MISSING } from "../../lib/format";
@@ -19,10 +20,8 @@ import {
   initialSessionLogFilters,
   isDeletable,
   isLogTruncated,
-  readSessionLog,
   sessionStatuses,
   statusCounts,
-  type SessionLogEntry,
   type SessionLogFilters,
 } from "./session-log";
 import "./sessions.css";
@@ -39,8 +38,8 @@ const PAGE_SIZE = 50;
 /** Filters survive a visit to a Session and back within the same page load. */
 let remembered: { project: ProjectFilterValue; filters: SessionLogFilters } = { project: "", filters: initialSessionLogFilters };
 
-function rowKey(row: Owned<SessionLogEntry>): string {
-  return `${row.project.id}:${row.value.kind === "session" ? row.value.session.id : row.value.key}`;
+function rowKey(row: Owned<AgentSession>): string {
+  return `${row.project.id}:${row.value.id}`;
 }
 
 /** Monitor › Session log: every Session of one project or of all projects, read-only with deletion of idle ones. */
@@ -81,7 +80,7 @@ export function SessionLogPage() {
   const counts = useMemo(() => statusCounts(rows, filters), [filters, rows]);
   const agents = useMemo(() => agentOptions(rows, t("common.untitledAgent")), [rows, t]);
   const visible = useMemo(() => filtered.slice(0, limit), [filtered, limit]);
-  const creatorRows = useMemo(() => visible.flatMap((row) => (row.value.kind === "session" ? [{ projectId: row.project.id, id: row.value.session.id }] : [])), [visible]);
+  const creatorRows = useMemo(() => visible.map((row) => ({ projectId: row.project.id, id: row.value.id })), [visible]);
   const creators = useCreators("session", creatorRows);
   const allProjects = selected === "";
   const loading = collection.status === "loading" || (projects.status === "loading" && !projects.projects.length);
@@ -233,7 +232,7 @@ function SessionLogRow({
   onOpen,
   onDelete,
 }: {
-  row: Owned<SessionLogEntry>;
+  row: Owned<AgentSession>;
   allProjects: boolean;
   creators: Creators;
   now: number;
@@ -243,38 +242,7 @@ function SessionLogRow({
 }) {
   const { t } = useTranslation("sessions");
   const projectCell = allProjects ? <td><ProjectName project={row.project} /></td> : null;
-  const entry = row.value;
-
-  if (entry.kind === "unrecognized") {
-    const name = (
-      <span className="column-help">
-        <span className="muted">{t("log.unrecognized")}</span>
-        <HelpTip>{t("log.unrecognizedHelp")}</HelpTip>
-      </span>
-    );
-    return (
-      <tr>
-        <th scope="row">{entry.id ? <NameCell name={null} id={entry.id} fallback={t("log.unrecognized")}><HelpTip>{t("log.unrecognizedHelp")}</HelpTip></NameCell> : <span className="name-cell">{name}</span>}</th>
-        {projectCell}
-        <td className="table-muted">{MISSING}</td>
-        <td className="table-muted">{MISSING}</td>
-        <td className="table-muted">{MISSING}</td>
-        <td className="numeric table-muted">{MISSING}</td>
-        <td className="table-muted">{MISSING}</td>
-        <td className="numeric table-muted">{MISSING}</td>
-        <td className="numeric table-muted">{MISSING}</td>
-        <td className="actions-cell">
-          {entry.id ? (
-            <RowActions>
-              <button className="text-action danger" type="button" aria-label={t("delete.actionLabel", { id: entry.id })} onClick={() => onDelete({ project: row.project, sessionId: entry.id! })}>{t("delete.action")}</button>
-            </RowActions>
-          ) : null}
-        </td>
-      </tr>
-    );
-  }
-
-  const session = entry.session;
+  const session = row.value;
   const open = () => onOpen(row.project.id, session.id);
   return (
     <tr className="clickable-row" onClick={open}>
diff --git a/apps/web/src/features/sessions/session-history.ts b/apps/web/src/features/sessions/session-history.ts
index 07a1a788e..ec41ec12c 100644
--- a/apps/web/src/features/sessions/session-history.ts
+++ b/apps/web/src/features/sessions/session-history.ts
@@ -2,10 +2,11 @@ import type {
   AgentSession,
   AgentTurn,
   ListPage,
-  CoreProjectReader,
   SessionItem,
 } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
+
 /**
  * Read-only Session history for the administrator. The Web API offers no event
  * stream, so the page polls the history endpoints while the Session has work in
@@ -87,7 +88,7 @@ export interface SessionHistory {
   loadedAt: number;
 }
 
-type HistoryReader = Pick<CoreProjectReader, "retrieveSession" | "listItems" | "listTurns">;
+type HistoryReader = Pick<ProjectClient, "retrieveSession" | "listItems" | "listTurns">;
 
 function message(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
diff --git a/apps/web/src/features/sessions/session-log.test.ts b/apps/web/src/features/sessions/session-log.test.ts
index d1949a1ad..bd2b6abbe 100644
--- a/apps/web/src/features/sessions/session-log.test.ts
+++ b/apps/web/src/features/sessions/session-log.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 
-import type { AgentSession, TolerantSessionList } from "@oac/agents-client";
+import type { AgentSession, ListPage } from "@oac/agents-client";
 
 import type { Owned } from "../../lib/projects";
 import { type Project } from "../../lib/admin-view";
@@ -13,12 +13,11 @@ import {
   isLogTruncated,
   readSessionLog,
   statusCounts,
-  type SessionLogEntry,
   type SessionLogFilters,
 } from "./session-log";
 
 function project(id: string, name: string): Project {
-  return { id, name, source: "console", status: "active", created_at: 1, archived_at: null, active_key_count: 1 } as Project;
+  return { id, name, status: "active", created_at: 1, archived_at: null, active_key_count: 1 };
 }
 
 const production = project("proj_prod", "Production");
@@ -53,27 +52,26 @@ function session(id: string, overrides: Partial<AgentSession> & { agentId?: stri
   };
 }
 
-function row(owner: Project, value: AgentSession): Owned<SessionLogEntry> {
-  return { project: owner, value: { kind: "session", session: value } };
+function row(owner: Project, value: AgentSession): Owned<AgentSession> {
+  return { project: owner, value };
 }
 
-function ids(rows: readonly Owned<SessionLogEntry>[]): string[] {
-  return rows.map((entry) => (entry.value.kind === "session" ? entry.value.session.id : `?${entry.value.id ?? entry.value.key}`));
+function ids(rows: readonly Owned<AgentSession>[]): string[] {
+  return rows.map((entry) => entry.value.id);
 }
 
 const filters = (patch: Partial<SessionLogFilters> = {}): SessionLogFilters => ({ ...initialSessionLogFilters, ...patch });
 
 describe("Session log across projects", () => {
-  const rows: Owned<SessionLogEntry>[] = [
+  const rows: Owned<AgentSession>[] = [
     row(production, session("s1", { status: "failed", error: "Sandbox allocation failed", last_active_at: 30 })),
     row(production, session("s2", { status: "in_progress", last_active_at: 50, environment: { type: "openai_hosted" } as AgentSession["environment"] })),
     row(data, session("s3", { status: "idle", last_active_at: 40, agentId: "agent_b", agentName: "Analyst" })),
     row(data, session("s4", { status: "requires_action", last_active_at: 50, agentId: "agent_b", agentName: "Analyst" })),
-    { project: data, value: { kind: "unrecognized", id: "5f0c0e0e-0000-4000-8000-000000000000", key: "5f0c0e0e-0000-4000-8000-000000000000" } },
   ];
 
-  it("merges every project's Sessions by most recent activity, ties by ID, unrecognized last", () => {
-    expect(ids(filterSessionLog(rows, filters()))).toEqual(["s2", "s4", "s3", "s1", "?5f0c0e0e-0000-4000-8000-000000000000"]);
+  it("merges every project's Sessions by most recent activity, ties by ID", () => {
+    expect(ids(filterSessionLog(rows, filters()))).toEqual(["s2", "s4", "s3", "s1"]);
   });
 
   it("filters by status, Agent, environment and search", () => {
@@ -82,13 +80,11 @@ describe("Session log across projects", () => {
     expect(ids(filterSessionLog(rows, filters({ environment: "openai_hosted" })))).toEqual(["s2"]);
     expect(ids(filterSessionLog(rows, filters({ query: "ALLOCATION" })))).toEqual(["s1"]);
     expect(ids(filterSessionLog(rows, filters({ query: "analyst" })))).toEqual(["s4", "s3"]);
-    // An unrecognized entry has no status, Agent or environment; only its ID can match.
-    expect(ids(filterSessionLog(rows, filters({ query: "5f0c0e0e" })))).toEqual(["?5f0c0e0e-0000-4000-8000-000000000000"]);
     expect(ids(filterSessionLog(rows, filters({ status: "idle" })))).toEqual(["s3"]);
   });
 
   it("counts statuses for the rows the other filters keep", () => {
-    expect(statusCounts(rows, filters())).toEqual({ all: 5, in_progress: 1, requires_action: 1, failed: 1, idle: 1 });
+    expect(statusCounts(rows, filters())).toEqual({ all: 4, in_progress: 1, requires_action: 1, failed: 1, idle: 1 });
     expect(statusCounts(rows, filters({ agentId: "agent_b", status: "failed" }))).toEqual({ all: 2, in_progress: 0, requires_action: 1, failed: 0, idle: 1 });
   });
 
@@ -121,25 +117,22 @@ describe("Session log across projects", () => {
 });
 
 describe("Reading a project's Session log", () => {
-  function page(data: AgentSession[], unrecognized: TolerantSessionList["unrecognized"], hasMore: boolean, lastId: string | null): TolerantSessionList {
-    return { object: "list", data, unrecognized, has_more: hasMore, first_id: data[0]?.id ?? null, last_id: lastId };
+  function page(data: AgentSession[], hasMore: boolean): ListPage<AgentSession> {
+    return { object: "list", data, has_more: hasMore, first_id: data[0]?.id ?? null, last_id: data.at(-1)?.id ?? null };
   }
 
-  it("walks every page and lists unreadable entries without failing", async () => {
+  it("walks every page", async () => {
     const calls: Array<string | undefined> = [];
-    const pages = [
-      page([session("a"), session("b")], [{ index: 2, id: null }], true, "c"),
-      page([session("d")], [{ index: 0, id: "e" }], false, "d"),
-    ];
-    const client = { listSessionsTolerant: async (options?: { after?: string }) => { calls.push(options?.after); return pages[calls.length - 1]!; } };
+    const pages = [page([session("a"), session("b")], true), page([session("d")], false)];
+    const client = { listSessions: async (options?: { after?: string }) => { calls.push(options?.after); return pages[calls.length - 1]!; } };
     const entries = await readSessionLog(client);
-    expect(calls).toEqual([undefined, "c"]);
-    expect(entries.map((entry) => (entry.kind === "session" ? entry.session.id : `?${entry.key}`))).toEqual(["a", "b", "?0:2", "d", "?e"]);
+    expect(calls).toEqual([undefined, "b"]);
+    expect(entries.map((entry) => entry.id)).toEqual(["a", "b", "d"]);
   });
 
   it("stops at the read bound and reports it", async () => {
     let calls = 0;
-    const client = { listSessionsTolerant: async () => { calls += 1; return page([session(`s${calls}a`), session(`s${calls}b`)], [], true, `s${calls}b`); } };
+    const client = { listSessions: async () => { calls += 1; return page([session(`s${calls}a`), session(`s${calls}b`)], true); } };
     const entries = await readSessionLog(client, undefined, 3);
     expect(entries).toHaveLength(3);
     expect(calls).toBe(2);
diff --git a/apps/web/src/features/sessions/session-log.ts b/apps/web/src/features/sessions/session-log.ts
index ff8c00360..b859265da 100644
--- a/apps/web/src/features/sessions/session-log.ts
+++ b/apps/web/src/features/sessions/session-log.ts
@@ -1,11 +1,10 @@
-import type { AgentSession, CoreProjectReader } from "@oac/agents-client";
+import type { AgentSession } from "@oac/agents-client";
 
-import type { Owned } from "../../lib/projects";
+import type { Owned, ProjectClient } from "../../lib/projects";
 
 /**
- * Session log model: every Session of one project or of all projects, read
- * tolerantly so one malformed Session is listed as unrecognized instead of
- * failing the page, then filtered and ordered in the browser.
+ * Session log model: every Session of one project or of all projects,
+ * filtered and ordered in the browser.
  */
 
 export const SESSION_LOG_LIMIT = 10_000;
@@ -18,11 +17,6 @@ export type StatusFilter = "all" | SessionStatusKey;
 export const environmentKinds = ["openai_hosted", "self_hosted", "none"] as const;
 export type EnvironmentKind = (typeof environmentKinds)[number] | "other";
 
-export type SessionLogEntry =
-  | { kind: "session"; session: AgentSession }
-  /** A listed entry this console cannot read; only its Session ID (when it has one) is kept. */
-  | { kind: "unrecognized"; id: string | null; key: string };
-
 export interface SessionLogFilters {
   status: StatusFilter;
   agentId: string;
@@ -32,20 +26,17 @@ export interface SessionLogFilters {
 
 export const initialSessionLogFilters: SessionLogFilters = { status: "all", agentId: "", environment: "", query: "" };
 
-type TolerantLister = Pick<CoreProjectReader, "listSessionsTolerant">;
-
-/** Walks every Session page of one project, newest first, bounded at `limit` entries. */
-export async function readSessionLog(client: TolerantLister, signal?: AbortSignal, limit = SESSION_LOG_LIMIT): Promise<SessionLogEntry[]> {
-  const entries: SessionLogEntry[] = [];
+/** Walks every Session page of one project, newest first, bounded at `limit` Sessions. */
+export async function readSessionLog(client: Pick<ProjectClient, "listSessions">, signal?: AbortSignal, limit = SESSION_LOG_LIMIT): Promise<AgentSession[]> {
+  const sessions: AgentSession[] = [];
   let after: string | undefined;
-  for (let page = 0; entries.length < limit; page += 1) {
-    const result = await client.listSessionsTolerant({ after, limit: SESSION_PAGE_SIZE, order: "desc", signal });
-    for (const session of result.data) entries.push({ kind: "session", session });
-    for (const entry of result.unrecognized) entries.push({ kind: "unrecognized", id: entry.id, key: entry.id ?? `${page}:${entry.index}` });
+  while (sessions.length < limit) {
+    const result = await client.listSessions({ after, limit: SESSION_PAGE_SIZE, order: "desc", signal });
+    sessions.push(...result.data);
     if (!result.has_more || !result.last_id || result.last_id === after) break;
     after = result.last_id;
   }
-  return entries.slice(0, limit);
+  return sessions.slice(0, limit);
 }
 
 export function environmentKind(session: AgentSession): EnvironmentKind {
@@ -79,40 +70,18 @@ function matches(session: AgentSession, filters: SessionLogFilters, query: strin
     && matchesQuery(session, query);
 }
 
-function neutral(filters: SessionLogFilters): boolean {
-  return filters.status === "all" && !filters.agentId && !filters.environment;
-}
-
-/**
- * Rows of every selected project merged into one list: most recent activity first
- * (ties by Session ID), unrecognized entries last. Unrecognized entries carry no
- * status, Agent or environment, so any such filter hides them; search matches their ID.
- */
-export function filterSessionLog(rows: readonly Owned<SessionLogEntry>[], filters: SessionLogFilters): Owned<SessionLogEntry>[] {
+/** Rows of every selected project merged into one list: most recent activity first, ties by Session ID. */
+export function filterSessionLog(rows: readonly Owned<AgentSession>[], filters: SessionLogFilters): Owned<AgentSession>[] {
   const query = filters.query.trim().toLowerCase();
-  const sessions: Array<Owned<SessionLogEntry> & { value: { kind: "session" } }> = [];
-  const unrecognized: Owned<SessionLogEntry>[] = [];
-  for (const row of rows) {
-    if (row.value.kind === "session") {
-      if (matches(row.value.session, filters, query)) sessions.push(row as Owned<SessionLogEntry> & { value: { kind: "session" } });
-    } else if (neutral(filters) && (!query || (row.value.id ?? "").toLowerCase().includes(query))) {
-      unrecognized.push(row);
-    }
-  }
-  sessions.sort((a, b) => b.value.session.last_active_at - a.value.session.last_active_at || a.value.session.id.localeCompare(b.value.session.id));
-  return [...sessions, ...unrecognized];
+  return rows.filter((row) => matches(row.value, filters, query))
+    .sort((a, b) => b.value.last_active_at - a.value.last_active_at || a.value.id.localeCompare(b.value.id));
 }
 
 /** Counts per status for the rows the other filters (search, Agent, environment) keep. */
-export function statusCounts(rows: readonly Owned<SessionLogEntry>[], filters: SessionLogFilters): Record<StatusFilter, number> {
+export function statusCounts(rows: readonly Owned<AgentSession>[], filters: SessionLogFilters): Record<StatusFilter, number> {
   const query = filters.query.trim().toLowerCase();
   const counts: Record<StatusFilter, number> = { all: 0, in_progress: 0, requires_action: 0, failed: 0, idle: 0 };
-  for (const row of rows) {
-    if (row.value.kind !== "session") {
-      if (neutral({ ...filters, status: "all" }) && (!query || (row.value.id ?? "").toLowerCase().includes(query))) counts.all += 1;
-      continue;
-    }
-    const session = row.value.session;
+  for (const { value: session } of rows) {
     if (!matches(session, filters, query, true)) continue;
     counts.all += 1;
     const key = statusKey(session.status);
@@ -131,11 +100,10 @@ export interface AgentOption {
  * project is shown, a name used by Agents of different projects carries the
  * project name.
  */
-export function agentOptions(rows: readonly Owned<SessionLogEntry>[], fallback: string): AgentOption[] {
+export function agentOptions(rows: readonly Owned<AgentSession>[], fallback: string): AgentOption[] {
   const agents = new Map<string, { name: string; project: string }>();
   for (const row of rows) {
-    if (row.value.kind !== "session") continue;
-    const agent = row.value.session.agent;
+    const agent = row.value.agent;
     if (!agents.has(agent.id)) agents.set(agent.id, { name: agent.name?.trim() || fallback, project: row.project.name });
   }
   const names = new Map<string, Set<string>>();
@@ -146,7 +114,7 @@ export function agentOptions(rows: readonly Owned<SessionLogEntry>[], fallback:
 }
 
 /** True when some project hit the read bound, so more Sessions exist than are shown. */
-export function isLogTruncated(rows: readonly Owned<SessionLogEntry>[], limit = SESSION_LOG_LIMIT): boolean {
+export function isLogTruncated(rows: readonly Owned<AgentSession>[], limit = SESSION_LOG_LIMIT): boolean {
   const perProject = new Map<string, number>();
   for (const row of rows) perProject.set(row.project.id, (perProject.get(row.project.id) ?? 0) + 1);
   return [...perProject.values()].some((count) => count >= limit);
diff --git a/apps/web/src/features/sessions/session-runtime.ts b/apps/web/src/features/sessions/session-runtime.ts
index 250bd63ba..09a3b57bf 100644
--- a/apps/web/src/features/sessions/session-runtime.ts
+++ b/apps/web/src/features/sessions/session-runtime.ts
@@ -1,5 +1,6 @@
-import { AgentCoreError, type AgentSession, type CoreProjectReader } from "@oac/agents-client";
+import { AgentCoreError, type AgentSession } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
 import { RUNTIME_DURABLE_MAX_POINTS, RUNTIME_DURABLE_RANGES, runtimeDurableTrendSamples, type RuntimeDurableRange } from "../dashboard/runtime-history";
 import type { RuntimeTrendSample } from "../dashboard/runtime-trends";
 
@@ -24,7 +25,7 @@ export function hasObservableRuntime(session: AgentSession): boolean {
  * ending now. Resolves to null when Core keeps no history for it (404).
  */
 export async function loadSessionRuntimeHistory(
-  client: Pick<CoreProjectReader, "retrieveRuntimeHistory">,
+  client: Pick<ProjectClient, "retrieveRuntimeHistory">,
   session: AgentSession,
   range: SessionRuntimeRange,
   signal?: AbortSignal,
diff --git a/apps/web/src/features/skills/skill-operations.test.ts b/apps/web/src/features/skills/skill-operations.test.ts
index 19b33cf65..735538e08 100644
--- a/apps/web/src/features/skills/skill-operations.test.ts
+++ b/apps/web/src/features/skills/skill-operations.test.ts
@@ -1,7 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
 
-import { AgentCoreError, type CoreProjectReader, type Skill, type SkillList, type SkillVersion, type SkillVersionList } from "@oac/agents-client";
+import { AgentCoreError, type Skill, type SkillList, type SkillVersion, type SkillVersionList } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
 import i18n from "../../i18n";
 import {
   downloadSkillArchive,
@@ -94,7 +95,7 @@ describe("Skill list helpers", () => {
     const core = {
       downloadSkill: vi.fn(async () => content),
       downloadSkillVersion: vi.fn(async () => content),
-    } satisfies Pick<CoreProjectReader, "downloadSkill" | "downloadSkillVersion">;
+    } satisfies Pick<ProjectClient, "downloadSkill" | "downloadSkillVersion">;
     const save = vi.fn();
     const skill = skillFixture({ default_version: "2", latest_version: "3" });
 
diff --git a/apps/web/src/features/skills/skill-operations.ts b/apps/web/src/features/skills/skill-operations.ts
index 5d1c00cf6..5bb0fa45d 100644
--- a/apps/web/src/features/skills/skill-operations.ts
+++ b/apps/web/src/features/skills/skill-operations.ts
@@ -1,5 +1,6 @@
-import { AgentCoreError, type CoreProjectReader, type Skill, type SkillVersion } from "@oac/agents-client";
+import { AgentCoreError, type Skill, type SkillVersion } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
 import { appendCollectionPage } from "../../lib/collection-pagination";
 
 /**
@@ -100,7 +101,7 @@ export function saveBlob(blob: Blob, filename: string): () => void {
 
 /** Downloads the default version, or one exact version, through the client. */
 export async function downloadSkillArchive(
-  core: Pick<CoreProjectReader, "downloadSkill" | "downloadSkillVersion">,
+  core: Pick<ProjectClient, "downloadSkill" | "downloadSkillVersion">,
   skill: Skill,
   version?: SkillVersion,
   signal?: AbortSignal,
@@ -118,7 +119,7 @@ export async function downloadSkillArchive(
 
 /** Reads the next Skill page (newest first) and appends it to the loaded rows. */
 export async function readSkillsPage(
-  core: Pick<CoreProjectReader, "listSkills">,
+  core: Pick<ProjectClient, "listSkills">,
   loaded: readonly Skill[],
   after: string | undefined,
   signal?: AbortSignal,
@@ -129,7 +130,7 @@ export async function readSkillsPage(
 
 /** Reads the next version page (highest version first) and appends it to the loaded rows. */
 export async function readSkillVersionsPage(
-  core: Pick<CoreProjectReader, "listSkillVersions">,
+  core: Pick<ProjectClient, "listSkillVersions">,
   skillId: string,
   loaded: readonly SkillVersion[],
   after: string | undefined,
diff --git a/apps/web/src/features/vaults/vault-catalog.test.ts b/apps/web/src/features/vaults/vault-catalog.test.ts
index fe2054743..71f88428a 100644
--- a/apps/web/src/features/vaults/vault-catalog.test.ts
+++ b/apps/web/src/features/vaults/vault-catalog.test.ts
@@ -1,7 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
 
-import type { CoreProjectReader, SavedAgent, Vault, VaultCredential } from "@oac/agents-client";
+import type { SavedAgent, Vault, VaultCredential } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
 import { deriveSessionVaultPlan, loadVaultCatalog, matchingCredentials, type VaultCatalog } from "./vault-catalog";
 
 const vaultA: Vault = { id: "11111111-1111-4111-8111-111111111111", object: "vault", created_at: 2, name: "A", metadata: {} };
@@ -65,7 +66,7 @@ describe("Vault catalog", () => {
       first_id: vaultId === vaultA.id ? credentialA.id : credentialB.id,
       last_id: vaultId === vaultA.id ? credentialA.id : credentialB.id,
     }));
-    const core = { listVaults, listVaultCredentials } as unknown as CoreProjectReader;
+    const core = { listVaults, listVaultCredentials } as unknown as ProjectClient;
 
     await expect(loadVaultCatalog(core)).resolves.toEqual({
       vaults: [vaultA, vaultB],
diff --git a/apps/web/src/features/vaults/vault-catalog.ts b/apps/web/src/features/vaults/vault-catalog.ts
index 4170ea55b..97bc3cf4c 100644
--- a/apps/web/src/features/vaults/vault-catalog.ts
+++ b/apps/web/src/features/vaults/vault-catalog.ts
@@ -1,10 +1,10 @@
 import type {
-  CoreProjectReader,
   SavedAgent,
   Vault,
   VaultCredential,
 } from "@oac/agents-client";
 
+import type { ProjectClient } from "../../lib/projects";
 import { listAllCollectionPages } from "../../lib/collection-pagination";
 import i18n from "../../i18n";
 
@@ -40,7 +40,7 @@ export interface SessionVaultPlan {
 
 const CREDENTIAL_READ_CONCURRENCY = 4;
 
-export async function loadVaultCatalog(core: Pick<CoreProjectReader, "listVaults" | "listVaultCredentials">, signal?: AbortSignal): Promise<VaultCatalog> {
+export async function loadVaultCatalog(core: Pick<ProjectClient, "listVaults" | "listVaultCredentials">, signal?: AbortSignal): Promise<VaultCatalog> {
   const vaults = await listAllCollectionPages(
     (options) => core.listVaults(options),
     signal,
diff --git a/apps/web/src/i18n/locales/en/agents.ts b/apps/web/src/i18n/locales/en/agents.ts
index ae5cb5630..53223f27f 100644
--- a/apps/web/src/i18n/locales/en/agents.ts
+++ b/apps/web/src/i18n/locales/en/agents.ts
@@ -81,7 +81,7 @@ export const agents = {
     title: "Usage", rangeLabel: "Sessions created", ranges: { all: "All time", "7d": "Last 7 days", "30d": "Last 30 days" },
     help: "Usage is each Session's cumulative total as reported by Core; it is not split by day. A Session belongs to the range in which it was created, and all of its usage counts there.",
     caveat: "Data comes from cumulative Session usage reported by Core. It excludes unreported usage and is not a basis for billing.",
-    reading: "Reading Sessions… {{formattedCount}} read", unrecognized_one: "{{formattedCount}} Session not recognized", unrecognized_other: "{{formattedCount}} Sessions not recognized", unrecognizedUpTo_one: "Up to {{formattedCount}} Session not recognized", unrecognizedUpTo_other: "Up to {{formattedCount}} Sessions not recognized", unrecognizedHelp: "Core returned these Sessions in a shape this console cannot read. They are left out of every total rather than counted as zero. For a time range their creation time is unknown, so the count is an upper bound.", cancel: "Cancel", cancelled_one: "Stopped after reading {{formattedCount}} Session.", cancelled_other: "Stopped after reading {{formattedCount}} Sessions.", continue: "Continue", failed: "Couldn’t read Sessions.", retry: "Retry",
+    reading: "Reading Sessions… {{formattedCount}} read", cancel: "Cancel", cancelled_one: "Stopped after reading {{formattedCount}} Session.", cancelled_other: "Stopped after reading {{formattedCount}} Sessions.", continue: "Continue", failed: "Couldn’t read Sessions.", retry: "Retry",
     large: "More than {{formattedCount}} Sessions: statistics may be slow. Try a shorter time range first.", largeShortest: "More than {{formattedCount}} Sessions: statistics may be slow.",
     sessions: "Sessions", tokens: "Tokens", coverage: "Coverage", lastActive: "Last active", noData: "No data", cardLabel: "Usage of {{name}}",
     coverageHelp: "Sessions whose usage Core reported, out of all Sessions in the range. Sessions without reported usage are left out of token totals, not counted as zero.",
diff --git a/apps/web/src/i18n/locales/en/common.ts b/apps/web/src/i18n/locales/en/common.ts
index edb2758c3..5cc163979 100644
--- a/apps/web/src/i18n/locales/en/common.ts
+++ b/apps/web/src/i18n/locales/en/common.ts
@@ -47,10 +47,8 @@ export const common = {
     column: "Creator",
     help: "The API key that created this asset, as recorded by Core for every write.",
     unknown: "Unknown",
-    unknownHelp: "Core has no creation record: the asset predates recording or an administrator copied it.",
+    unknownHelp: "Core has no creation record: the asset predates recording.",
     revoked: "Revoked",
-    adminCopy: "Admin copy",
-    adminCopyHelp: "An administrator copied this asset from another project.",
   },
   list: {
     search: "Search",
diff --git a/apps/web/src/i18n/locales/en/keys.ts b/apps/web/src/i18n/locales/en/keys.ts
index e61ba4802..7a7faf8d1 100644
--- a/apps/web/src/i18n/locales/en/keys.ts
+++ b/apps/web/src/i18n/locales/en/keys.ts
@@ -173,7 +173,7 @@ export const keys = {
   },
   operations: {
     title: "Write operations",
-    help: "Every successful write in this project, with the key that made it, recorded by Core, newest first. Reads are not recorded; request bodies and secrets are never stored. Unknown: an administrator copy or no recorded key.",
+    help: "Every successful write in this project, with the key that made it, recorded by Core, newest first. Reads are not recorded; request bodies and secrets are never stored. Unknown: no recorded key.",
     filterLabel: "Filter write operations",
     allTypes: "All resources",
     allKeys: "All keys",
diff --git a/apps/web/src/i18n/locales/en/metrics.ts b/apps/web/src/i18n/locales/en/metrics.ts
index dce21cf33..427b768f2 100644
--- a/apps/web/src/i18n/locales/en/metrics.ts
+++ b/apps/web/src/i18n/locales/en/metrics.ts
@@ -23,7 +23,6 @@ export const metrics = {
     method: "Figures are aggregated in the browser from each project's Session, Turn and Item lists. A request is one root Agent Turn; duration runs from start to finish. Subagent Turns and deleted Sessions are not counted.",
     summary: "Aggregated in the browser from {{sessions}} Sessions active in the last {{range}}. A request is one Agent Turn.",
     listTruncated: "{{names}} have more Sessions than the console reads; only the newest were considered.",
-    unrecognized: "{{count}} listed Sessions could not be recognized and are not counted.",
     skipped: "{{total}} Sessions were active; only the {{loaded}} most recently active were read.",
     truncated: "{{count}} Sessions have more history than the read limit, so their earliest Turns in the range are missing.",
     failed: "{{count}} Sessions could not be read.",
@@ -101,7 +100,7 @@ export const metrics = {
     coverage: "Coverage",
     lastActive: "Last active",
     unknown: "Unknown",
-    unknownHelp: "Sessions without a creation record: created before recording started or copied by an administrator.",
+    unknownHelp: "Sessions without a creation record: created before recording started.",
     revoked: "Revoked",
     coverageDetail: "{{reported}} of {{total}} Sessions reported usage",
   },
@@ -210,7 +209,6 @@ export const metrics = {
       openSession: "Open Session",
       noSession: "The Session of this sandbox could not be read, so its history cannot be shown.",
     },
-    fleetUnconfigured: "This console has no sandbox administration.",
     fleetFailed: "Hosts could not be loaded.",
     fleetLoading: "Loading hosts…",
     kpiLabel: "Sandbox capacity",
diff --git a/apps/web/src/i18n/locales/en/overview.ts b/apps/web/src/i18n/locales/en/overview.ts
index 62fcd20ea..2f05205bb 100644
--- a/apps/web/src/i18n/locales/en/overview.ts
+++ b/apps/web/src/i18n/locales/en/overview.ts
@@ -146,7 +146,6 @@ export const overview = {
     more: "{{count}} more nodes on the Nodes page",
     more_one: "{{count}} more node on the Nodes page",
     more_other: "{{count}} more nodes on the Nodes page",
-    unconfigured: "This console has no sandbox administration.",
     loading: "Loading nodes…",
     failed: "Nodes could not be loaded.",
     noNodes: "No sandbox nodes yet. Hosted Sessions need at least one.",
diff --git a/apps/web/src/i18n/locales/en/sessions.ts b/apps/web/src/i18n/locales/en/sessions.ts
index a839ef932..fdf8078f3 100644
--- a/apps/web/src/i18n/locales/en/sessions.ts
+++ b/apps/web/src/i18n/locales/en/sessions.ts
@@ -46,8 +46,6 @@ export const sessions = {
     waitingLabel: "What the Session waits for",
     exactTokens: "{{tokens}} tokens",
     open: "Open Session {{id}}",
-    unrecognized: "Unrecognized Session",
-    unrecognizedHelp: "Core listed a Session this console cannot read, for example one with a field it does not know. Nothing else is shown for it.",
     more: "Show more",
   },
   detail: {
diff --git a/apps/web/src/i18n/locales/zh-CN/agents.ts b/apps/web/src/i18n/locales/zh-CN/agents.ts
index b7c3ecff2..88990d8e7 100644
--- a/apps/web/src/i18n/locales/zh-CN/agents.ts
+++ b/apps/web/src/i18n/locales/zh-CN/agents.ts
@@ -68,7 +68,7 @@ export const agents: TranslationShape<typeof english> = {
     title: "用量", rangeLabel: "Session 创建时间", ranges: { all: "全部", "7d": "近 7 天", "30d": "近 30 天" },
     help: "用量是 Core 报告的每个 Session 的累计值，不按天拆分。Session 按创建时间归入时间范围，其全部用量都计入该范围。",
     caveat: "数据来自 Core 报告的 Session 累计用量，不包含未报告的部分，不能作为计费依据。",
-    reading: "正在读取 Session…已读取 {{formattedCount}} 个", unrecognized_one: "{{formattedCount}} 个 Session 无法识别", unrecognized_other: "{{formattedCount}} 个 Session 无法识别", unrecognizedUpTo_one: "最多 {{formattedCount}} 个 Session 无法识别", unrecognizedUpTo_other: "最多 {{formattedCount}} 个 Session 无法识别", unrecognizedHelp: "Core 返回的这些 Session 格式无法识别，没有计入任何合计，也不会当作 0。选择时间范围时无法确定它们的创建时间，所以数量是上限。", cancel: "取消", cancelled_one: "已在读取 {{formattedCount}} 个 Session 后停止。", cancelled_other: "已在读取 {{formattedCount}} 个 Session 后停止。", continue: "继续", failed: "无法读取 Session。", retry: "重试",
+    reading: "正在读取 Session…已读取 {{formattedCount}} 个", cancel: "取消", cancelled_one: "已在读取 {{formattedCount}} 个 Session 后停止。", cancelled_other: "已在读取 {{formattedCount}} 个 Session 后停止。", continue: "继续", failed: "无法读取 Session。", retry: "重试",
     large: "Session 超过 {{formattedCount}} 个，统计可能较慢。建议先缩小时间范围。", largeShortest: "Session 超过 {{formattedCount}} 个，统计可能较慢。",
     sessions: "Session", tokens: "Token", coverage: "覆盖率", lastActive: "最近活跃", noData: "无数据", cardLabel: "{{name}} 的用量",
     coverageHelp: "Core 报告了用量的 Session 占范围内全部 Session 的比例。没有报告用量的 Session 不计入 Token 合计，也不按 0 计算。",
diff --git a/apps/web/src/i18n/locales/zh-CN/common.ts b/apps/web/src/i18n/locales/zh-CN/common.ts
index 531ad6e29..026112ab8 100644
--- a/apps/web/src/i18n/locales/zh-CN/common.ts
+++ b/apps/web/src/i18n/locales/zh-CN/common.ts
@@ -47,10 +47,8 @@ export const common = {
     column: "创建者",
     help: "创建这个资产的 API key，由 Core 在每次写入时记录。",
     unknown: "未知",
-    unknownHelp: "Core 没有创建记录：资产创建于开始记录之前，或由管理员复制而来。",
+    unknownHelp: "Core 没有创建记录：资产创建于开始记录之前。",
     revoked: "已撤销",
-    adminCopy: "管理员复制",
-    adminCopyHelp: "管理员从其他项目复制而来。",
   },
   list: {
     search: "搜索",
diff --git a/apps/web/src/i18n/locales/zh-CN/keys.ts b/apps/web/src/i18n/locales/zh-CN/keys.ts
index dd38c5907..1a458c22b 100644
--- a/apps/web/src/i18n/locales/zh-CN/keys.ts
+++ b/apps/web/src/i18n/locales/zh-CN/keys.ts
@@ -175,7 +175,7 @@ export const keys: TranslationShape<typeof english> = {
   },
   operations: {
     title: "写操作记录",
-    help: "这个项目里每一次成功的写操作，以及发起它的 key，由 Core 记录，按时间倒序。读操作不记录，也不保存请求内容和密钥。“未知”表示管理员复制或没有记录 key。",
+    help: "这个项目里每一次成功的写操作，以及发起它的 key，由 Core 记录，按时间倒序。读操作不记录，也不保存请求内容和密钥。“未知”表示没有记录 key。",
     filterLabel: "筛选写操作记录",
     allTypes: "全部资源",
     allKeys: "全部 key",
diff --git a/apps/web/src/i18n/locales/zh-CN/metrics.ts b/apps/web/src/i18n/locales/zh-CN/metrics.ts
index 7d7584065..638f67afb 100644
--- a/apps/web/src/i18n/locales/zh-CN/metrics.ts
+++ b/apps/web/src/i18n/locales/zh-CN/metrics.ts
@@ -23,7 +23,6 @@ export const metrics = {
     method: "数字由浏览器根据各项目的 Session、Turn 和 Item 列表汇总。一次请求即一个根 Agent Turn；耗时从开始计到结束。不含子 Agent 的 Turn 和已删除的 Session。",
     summary: "由浏览器汇总最近 {{range}} 内活跃的 {{sessions}} 个 Session。一次请求即一个 Agent Turn。",
     listTruncated: "{{names}} 的 Session 超过控制台的读取上限，只统计了最近创建的部分。",
-    unrecognized: "有 {{count}} 个 Session 无法识别，未计入。",
     skipped: "共 {{total}} 个 Session 活跃，只读取了最近活跃的 {{loaded}} 个。",
     truncated: "{{count}} 个 Session 的历史超过读取上限，时间范围内较早的 Turn 未计入。",
     failed: "{{count}} 个 Session 读取失败。",
@@ -101,7 +100,7 @@ export const metrics = {
     coverage: "用量覆盖",
     lastActive: "最近活跃",
     unknown: "未知",
-    unknownHelp: "没有创建记录的 Session：在开始记录之前创建，或由管理员复制。",
+    unknownHelp: "没有创建记录的 Session：在开始记录之前创建。",
     revoked: "已撤销",
     coverageDetail: "{{total}} 个 Session 中有 {{reported}} 个上报了用量",
   },
@@ -210,7 +209,6 @@ export const metrics = {
       openSession: "打开 Session",
       noSession: "无法读取这个沙箱所属的 Session，因此无法显示它的历史。",
     },
-    fleetUnconfigured: "此控制台未配置沙箱管理。",
     fleetFailed: "无法加载宿主机。",
     fleetLoading: "正在加载宿主机…",
     kpiLabel: "沙箱容量",
diff --git a/apps/web/src/i18n/locales/zh-CN/overview.ts b/apps/web/src/i18n/locales/zh-CN/overview.ts
index 4ecbc010d..a579781db 100644
--- a/apps/web/src/i18n/locales/zh-CN/overview.ts
+++ b/apps/web/src/i18n/locales/zh-CN/overview.ts
@@ -146,7 +146,6 @@ export const overview = {
     more: "另有 {{count}} 个节点，在节点页查看",
     more_one: "另有 {{count}} 个节点，在节点页查看",
     more_other: "另有 {{count}} 个节点，在节点页查看",
-    unconfigured: "此控制台未配置沙箱管理。",
     loading: "正在加载节点…",
     failed: "无法加载节点。",
     noNodes: "还没有沙箱节点。托管 Session 至少需要一个。",
diff --git a/apps/web/src/i18n/locales/zh-CN/sessions.ts b/apps/web/src/i18n/locales/zh-CN/sessions.ts
index afaccc9e6..82569748e 100644
--- a/apps/web/src/i18n/locales/zh-CN/sessions.ts
+++ b/apps/web/src/i18n/locales/zh-CN/sessions.ts
@@ -43,8 +43,6 @@ export const sessions = {
     waitingLabel: "Session 在等待什么",
     exactTokens: "{{tokens}} 个 Token",
     open: "打开 Session {{id}}",
-    unrecognized: "无法识别的 Session",
-    unrecognizedHelp: "Core 列出了一个控制台无法读取的 Session，例如带有未知字段。除 ID 外不显示其他内容。",
     more: "显示更多",
   },
   detail: {
diff --git a/apps/web/src/lib/admin-view.ts b/apps/web/src/lib/admin-view.ts
index 9af9ead20..86c5a3154 100644
--- a/apps/web/src/lib/admin-view.ts
+++ b/apps/web/src/lib/admin-view.ts
@@ -49,14 +49,12 @@ export interface KeyRef {
   id: string;
   name: string | null;
   prefix: string | null;
-  kind: "issued" | "static" | "console";
   revoked_at: number | null;
 }
 
-/** Who created a resource: a key, an administrator copy, or unknown. */
+/** Who created a resource: a key, or null when Core has no creation record. */
 export interface Creator {
   key: KeyRef | null;
-  source: "api_key" | "admin_copy" | null;
 }
 
 export interface SpaceUsage {
@@ -128,7 +126,7 @@ function keyView(key: AdminAPIKey): AdminKey {
 
 function keyRef(key: AdminKeyProvenance | null): KeyRef | null {
   if (!key) return null;
-  return { id: key.id, name: key.name || null, prefix: key.prefix || null, kind: key.kind, revoked_at: maybeSeconds(key.revoked_at) };
+  return { id: key.id, name: key.name || null, prefix: key.prefix || null, revoked_at: maybeSeconds(key.revoked_at) };
 }
 
 export async function listAllProjects(signal?: AbortSignal): Promise<Project[]> {
@@ -185,7 +183,7 @@ function summaryView(entry: AdminSummaryEntry, keys: ReadonlyMap<string, AdminKe
     agent_id: entry.agent_id,
     key_id: entry.key_id,
     key: entry.key_id
-      ? { id: entry.key_id, name: key?.name ?? null, prefix: key?.prefix ?? null, kind: "issued", revoked_at: key?.revoked_at ?? null }
+      ? { id: entry.key_id, name: key?.name ?? null, prefix: key?.prefix ?? null, revoked_at: key?.revoked_at ?? null }
       : null,
     assets: entry.assets,
     sessions: entry.sessions,
@@ -271,7 +269,7 @@ export async function listCreators(projectId: string, type: OwnerResourceType, i
   for (let start = 0; start < unique.length; start += PAGE) {
     const batch = unique.slice(start, start + PAGE);
     const result = await admin.retrieveResourceOwners(projectId, type, batch, { signal });
-    for (const owner of result.data) creators.set(owner.resource_id, { key: keyRef(owner.api_key), source: owner.source });
+    for (const owner of result.data) creators.set(owner.resource_id, { key: keyRef(owner.api_key) });
   }
   return creators;
 }
diff --git a/apps/web/src/lib/docker-guide-config.test.ts b/apps/web/src/lib/docker-guide-config.test.ts
deleted file mode 100644
index 4dfd769ad..000000000
--- a/apps/web/src/lib/docker-guide-config.test.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  loadLocalDockerBackendGuideProfile,
-  loadLocalDockerGuideProfile,
-} from "./docker-guide-config";
-
-const valid = {
-  OAC_WEB_DOCKER_GUIDE: "1",
-  OAC_WEB_DOCKER_IMAGE: "oac-web-smoke-executor:2b34ea46-codex-0.153.4",
-  OAC_WEB_DOCKER_API_CONTAINER: "oac-web-smoke-api",
-  OAC_WEB_DOCKER_USER: "501:20",
-  OAC_WEB_DOCKER_CREDENTIALS_HOME_PATH: ".oac/web-smoke/executor-key.json",
-  OAC_WEB_DOCKER_RUNTIME_HOME_PATH: ".oac/web-smoke/executors",
-};
-
-describe("local Docker guide configuration", () => {
-  it("is disabled unless the operator opts in exactly", () => {
-    expect(loadLocalDockerGuideProfile({})).toBeNull();
-    expect(loadLocalDockerGuideProfile({ ...valid, OAC_WEB_DOCKER_GUIDE: "true" })).toBeNull();
-  });
-
-  it("accepts a complete non-secret local profile", () => {
-    expect(loadLocalDockerGuideProfile(valid)).toEqual({
-      image: valid.OAC_WEB_DOCKER_IMAGE,
-      apiContainer: valid.OAC_WEB_DOCKER_API_CONTAINER,
-      user: valid.OAC_WEB_DOCKER_USER,
-      credentialsHomePath: valid.OAC_WEB_DOCKER_CREDENTIALS_HOME_PATH,
-      runtimeHomePath: valid.OAC_WEB_DOCKER_RUNTIME_HOME_PATH,
-    });
-  });
-
-  it("fails closed for partial or command-bearing values", () => {
-    expect(() => loadLocalDockerGuideProfile({
-      ...valid,
-      OAC_WEB_DOCKER_IMAGE: "image; docker rm -f victim",
-    })).toThrow("safe Docker image reference");
-    expect(() => loadLocalDockerGuideProfile({
-      ...valid,
-      OAC_WEB_DOCKER_CREDENTIALS_HOME_PATH: "../executor-key.json",
-    })).toThrow("safe HOME-relative path");
-    expect(() => loadLocalDockerGuideProfile({
-      ...valid,
-      OAC_WEB_DOCKER_USER: "0:0",
-    })).toThrow("numeric non-root");
-
-    const partial: Record<string, string> = { ...valid };
-    delete partial.OAC_WEB_DOCKER_RUNTIME_HOME_PATH;
-    expect(() => loadLocalDockerGuideProfile(partial)).toThrow("OAC_WEB_DOCKER_RUNTIME_HOME_PATH is required");
-  });
-});
-
-const validBackend = {
-  OAC_WEB_DOCKER_BACKEND_GUIDE: "1",
-  OAC_WEB_DOCKER_DATABASE_CONTAINER: "oac-web-smoke-db",
-  OAC_WEB_DOCKER_API_CONTAINER: "oac-web-smoke-api",
-  OAC_WEB_DOCKER_DAEMON_CONTAINER: "oac-web-smoke-daemon",
-  OAC_WEB_DOCKER_CORE_PORT: "8091",
-};
-
-describe("local Docker backend guide configuration", () => {
-  it("is disabled unless the operator explicitly opts in", () => {
-    expect(loadLocalDockerBackendGuideProfile({})).toBeNull();
-    expect(loadLocalDockerBackendGuideProfile({
-      ...validBackend,
-      OAC_WEB_DOCKER_BACKEND_GUIDE: "true",
-    })).toBeNull();
-  });
-
-  it("accepts only non-secret container names and a loopback Core port", () => {
-    expect(loadLocalDockerBackendGuideProfile(validBackend)).toEqual({
-      databaseContainer: "oac-web-smoke-db",
-      apiContainer: "oac-web-smoke-api",
-      daemonContainer: "oac-web-smoke-daemon",
-      corePort: 8091,
-    });
-  });
-
-  it("fails closed for incomplete or command-bearing configuration", () => {
-    expect(() => loadLocalDockerBackendGuideProfile({
-      ...validBackend,
-      OAC_WEB_DOCKER_DAEMON_CONTAINER: "daemon; docker rm victim",
-    })).toThrow("safe Docker container name");
-    expect(() => loadLocalDockerBackendGuideProfile({
-      ...validBackend,
-      OAC_WEB_DOCKER_CORE_PORT: "70000",
-    })).toThrow("valid TCP port");
-
-    const partial: Record<string, string> = { ...validBackend };
-    delete partial.OAC_WEB_DOCKER_DATABASE_CONTAINER;
-    expect(() => loadLocalDockerBackendGuideProfile(partial)).toThrow(
-      "OAC_WEB_DOCKER_DATABASE_CONTAINER is required",
-    );
-  });
-});
diff --git a/apps/web/src/lib/docker-guide-config.ts b/apps/web/src/lib/docker-guide-config.ts
deleted file mode 100644
index 204714cbe..000000000
--- a/apps/web/src/lib/docker-guide-config.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-export interface LocalDockerGuideProfile {
-  image: string;
-  apiContainer: string;
-  user: string;
-  credentialsHomePath: string;
-  runtimeHomePath: string;
-}
-
-export interface LocalDockerBackendGuideProfile {
-  databaseContainer: string;
-  apiContainer: string;
-  daemonContainer: string;
-  corePort: number;
-}
-
-const dockerImagePattern = /^[A-Za-z0-9][A-Za-z0-9._/:@-]*$/;
-const dockerContainerPattern = /^[A-Za-z0-9][A-Za-z0-9_.-]*$/;
-const dockerUserPattern = /^[1-9][0-9]*:[1-9][0-9]*$/;
-const homePathSegmentPattern = /^[A-Za-z0-9._-]+$/;
-
-function required(
-  env: Record<string, string>,
-  name: string,
-  feature = "OAC_WEB_DOCKER_GUIDE",
-): string {
-  const value = env[name];
-  if (!value) throw new Error(`${name} is required when ${feature}=1.`);
-  return value;
-}
-
-function validHomeRelativePath(value: string): boolean {
-  if (value.startsWith("/") || value.endsWith("/") || value.includes("//")) return false;
-  const segments = value.split("/");
-  return segments.length > 0 && segments.every((segment) => (
-    segment !== "." && segment !== ".." && homePathSegmentPattern.test(segment)
-  ));
-}
-
-export function loadLocalDockerGuideProfile(
-  env: Record<string, string>,
-): LocalDockerGuideProfile | null {
-  if (env.OAC_WEB_DOCKER_GUIDE !== "1") return null;
-
-  const profile: LocalDockerGuideProfile = {
-    image: required(env, "OAC_WEB_DOCKER_IMAGE"),
-    apiContainer: required(env, "OAC_WEB_DOCKER_API_CONTAINER"),
-    user: required(env, "OAC_WEB_DOCKER_USER"),
-    credentialsHomePath: required(env, "OAC_WEB_DOCKER_CREDENTIALS_HOME_PATH"),
-    runtimeHomePath: required(env, "OAC_WEB_DOCKER_RUNTIME_HOME_PATH"),
-  };
-
-  if (!dockerImagePattern.test(profile.image)) {
-    throw new Error("OAC_WEB_DOCKER_IMAGE is not a safe Docker image reference.");
-  }
-  if (!dockerContainerPattern.test(profile.apiContainer)) {
-    throw new Error("OAC_WEB_DOCKER_API_CONTAINER is not a safe Docker container name.");
-  }
-  if (!dockerUserPattern.test(profile.user)) {
-    throw new Error("OAC_WEB_DOCKER_USER must be a numeric non-root uid:gid pair.");
-  }
-  if (!validHomeRelativePath(profile.credentialsHomePath)) {
-    throw new Error("OAC_WEB_DOCKER_CREDENTIALS_HOME_PATH must be a safe HOME-relative path.");
-  }
-  if (!validHomeRelativePath(profile.runtimeHomePath)) {
-    throw new Error("OAC_WEB_DOCKER_RUNTIME_HOME_PATH must be a safe HOME-relative path.");
-  }
-
-  return profile;
-}
-
-function validPort(value: string): number | null {
-  if (!/^[1-9][0-9]{0,4}$/.test(value)) return null;
-  const port = Number(value);
-  return port <= 65_535 ? port : null;
-}
-
-export function loadLocalDockerBackendGuideProfile(
-  env: Record<string, string>,
-): LocalDockerBackendGuideProfile | null {
-  if (env.OAC_WEB_DOCKER_BACKEND_GUIDE !== "1") return null;
-
-  const feature = "OAC_WEB_DOCKER_BACKEND_GUIDE";
-  const databaseContainer = required(env, "OAC_WEB_DOCKER_DATABASE_CONTAINER", feature);
-  const apiContainer = required(env, "OAC_WEB_DOCKER_API_CONTAINER", feature);
-  const daemonContainer = required(env, "OAC_WEB_DOCKER_DAEMON_CONTAINER", feature);
-  const corePortValue = required(env, "OAC_WEB_DOCKER_CORE_PORT", feature);
-  const corePort = validPort(corePortValue);
-
-  for (const [name, value] of [
-    ["OAC_WEB_DOCKER_DATABASE_CONTAINER", databaseContainer],
-    ["OAC_WEB_DOCKER_API_CONTAINER", apiContainer],
-    ["OAC_WEB_DOCKER_DAEMON_CONTAINER", daemonContainer],
-  ] as const) {
-    if (!dockerContainerPattern.test(value)) {
-      throw new Error(`${name} is not a safe Docker container name.`);
-    }
-  }
-  if (corePort === null) {
-    throw new Error("OAC_WEB_DOCKER_CORE_PORT must be a valid TCP port.");
-  }
-
-  return { databaseContainer, apiContainer, daemonContainer, corePort };
-}
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index 715e1e4d8..708c873fa 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -260,7 +260,6 @@ export const chinese = {
   "The node has active allocations or retained resources. Clear allocations, snapshots, reservations and pending cleanup before removal.": "节点仍有活跃分配或保留资源。请先清理资源分配、快照、预留资源和待清理项，再移除节点。",
   "The selected sandbox node is unavailable or has no capacity.": "所选沙箱节点不可用或容量不足。",
   "Sign in to the console again to access sandbox management.": "请重新登录控制台以访问沙箱管理。",
-  "Sandbox administration is not configured on this console.": "此控制台尚未配置沙箱管理权限。",
   "Core rejected the sandbox change": "Core 拒绝了此次沙箱更改",
   "Core rejected the sandbox configuration.": "Core 拒绝了这个沙箱配置。",
   "The console configuration could not be read. Refresh to try again.": "无法读取控制台配置。请刷新重试。",
diff --git a/apps/web/src/lib/projects.tsx b/apps/web/src/lib/projects.tsx
index 3f3554bdb..b8ac7df0d 100644
--- a/apps/web/src/lib/projects.tsx
+++ b/apps/web/src/lib/projects.tsx
@@ -1,4 +1,9 @@
-import type { CoreProjectReader } from "@oac/agents-client";
+import type {
+  AgentDeleted, AgentSession, AgentTurn, EnvironmentTemplateDeleted, EnvironmentTemplateList, EnvironmentTemplateResource, ListPage, PageOptions, ReadOptions,
+  RuntimeHistory, RuntimeHistoryQuery, RuntimeObservation, SavedAgent, SessionDeleted, SessionItem, SessionListOptions, Skill, SkillContent, SkillDeleted, SkillList,
+  SkillListOptions, SkillVersionDeleted, SkillVersionList, SourceFileDeleted, SourceFileList, SourceFileListOptions, Vault, VaultCredentialDeleted,
+  VaultCredentialList, VaultDeleted, VaultList, VaultListOptions,
+} from "@oac/agents-client";
 import { QueryClientProvider, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 import { useTranslation } from "react-i18next";
@@ -113,8 +118,39 @@ export interface ProjectCollection<T> {
   refresh: () => void;
 }
 
-/** The Core reads and deletes a project page uses, bound to one project. */
-export type ProjectClient = CoreProjectReader;
+/**
+ * The Core reads and deletes a project page uses, bound to one project: each
+ * method is a management client method with its project ID bound.
+ */
+export interface ProjectClient {
+  listAgents(options?: PageOptions): Promise<ListPage<SavedAgent>>;
+  retrieveAgent(agentId: string): Promise<SavedAgent>;
+  deleteAgent(agentId: string): Promise<AgentDeleted>;
+  listSkills(options?: SkillListOptions): Promise<SkillList>;
+  retrieveSkill(skillId: string, options?: ReadOptions): Promise<Skill>;
+  deleteSkill(skillId: string, options?: ReadOptions): Promise<SkillDeleted>;
+  listSkillVersions(skillId: string, options?: SkillListOptions): Promise<SkillVersionList>;
+  deleteSkillVersion(skillId: string, version: string, options?: ReadOptions): Promise<SkillVersionDeleted>;
+  downloadSkill(skillId: string, options?: ReadOptions): Promise<SkillContent>;
+  downloadSkillVersion(skillId: string, version: string, options?: ReadOptions): Promise<SkillContent>;
+  listEnvironmentTemplates(options?: PageOptions): Promise<EnvironmentTemplateList>;
+  retrieveEnvironmentTemplate(templateId: string, options?: ReadOptions): Promise<EnvironmentTemplateResource>;
+  deleteEnvironmentTemplate(templateId: string, options?: ReadOptions): Promise<EnvironmentTemplateDeleted>;
+  listSourceFiles(options?: SourceFileListOptions): Promise<SourceFileList>;
+  deleteSourceFile(fileId: string, options?: ReadOptions): Promise<SourceFileDeleted>;
+  listVaults(options?: VaultListOptions): Promise<VaultList>;
+  retrieveVault(vaultId: string, options?: ReadOptions): Promise<Vault>;
+  listVaultCredentials(vaultId: string, options?: VaultListOptions): Promise<VaultCredentialList>;
+  deleteVault(vaultId: string): Promise<VaultDeleted>;
+  deleteVaultCredential(vaultId: string, credentialId: string): Promise<VaultCredentialDeleted>;
+  listSessions(options?: SessionListOptions): Promise<ListPage<AgentSession>>;
+  retrieveSession(sessionId: string, options?: ReadOptions): Promise<AgentSession>;
+  deleteSession(sessionId: string): Promise<SessionDeleted>;
+  listTurns(sessionId: string, options?: PageOptions): Promise<ListPage<AgentTurn>>;
+  listItems(sessionId: string, options?: PageOptions): Promise<ListPage<SessionItem>>;
+  retrieveRuntimeObservation(sessionId: string, options?: ReadOptions): Promise<RuntimeObservation>;
+  retrieveRuntimeHistory(sessionId: string, query: RuntimeHistoryQuery): Promise<RuntimeHistory>;
+}
 
 async function content(result: Promise<{ blob: Blob; contentType: string | null; contentDisposition: string | null }>) {
   const value = await result;
@@ -126,11 +162,7 @@ async function content(result: Promise<{ blob: Blob; contentType: string | null;
  * shapes, so pages read a project through `/core/v1/projects/{id}`.
  * Deletions only; no creation or editing exists here.
  */
-function createProjectClient(projectId: string): CoreProjectReader {
-  const listSessions = async (options: Parameters<CoreProjectReader["listSessions"]>[0] = {}) => {
-    const page = await admin.listSessions(projectId, { after: options.after, limit: options.limit, order: options.order, agentId: options.agentId, signal: options.signal });
-    return { ...page, object: "list" as const, first_id: page.first_id ?? null, last_id: page.last_id ?? null };
-  };
+function createProjectClient(projectId: string): ProjectClient {
   return {
     listAgents: (options) => admin.listAgents(projectId, options),
     retrieveAgent: (agentId: string) => admin.retrieveAgent(projectId, agentId),
@@ -152,16 +184,17 @@ function createProjectClient(projectId: string): CoreProjectReader {
     listVaultCredentials: (vaultId, options) => admin.listVaultCredentials(projectId, vaultId, options),
     deleteVault: (vaultId) => admin.deleteVault(projectId, vaultId),
     deleteVaultCredential: (vaultId, credentialId) => admin.deleteVaultCredential(projectId, vaultId, credentialId),
-    listSessions,
-    // The management list is strict: a malformed Session fails the page rather than being skipped.
-    listSessionsTolerant: async (options) => ({ ...(await listSessions(options)), unrecognized: [] }),
+    listSessions: async (options = {}) => {
+      const page = await admin.listSessions(projectId, { after: options.after, limit: options.limit, order: options.order, agentId: options.agentId, signal: options.signal });
+      return { ...page, object: "list" as const, first_id: page.first_id ?? null, last_id: page.last_id ?? null };
+    },
     retrieveSession: (sessionId, options) => admin.retrieveSession(projectId, sessionId, options),
     deleteSession: (sessionId) => admin.deleteSession(projectId, sessionId),
     listTurns: (sessionId, options) => admin.listTurns(projectId, sessionId, options),
     listItems: (sessionId, options) => admin.listItems(projectId, sessionId, options),
     retrieveRuntimeObservation: (sessionId, options) => admin.retrieveRuntimeObservation(projectId, sessionId, options),
     retrieveRuntimeHistory: (sessionId, query) => admin.retrieveRuntimeHistory(projectId, sessionId, query),
-  } satisfies CoreProjectReader;
+  };
 }
 
 const clients = new Map<string, ProjectClient>();
@@ -266,7 +299,7 @@ export function useCreators(type: OwnerResourceType, rows: ReadonlyArray<{ proje
     const controller = new AbortController();
     void Promise.allSettled([...byProject].map(async ([projectId, ids]) => {
       const creators = await listCreators(projectId, type, ids, controller.signal);
-      for (const id of ids) creatorCache.set(creatorKey(type, projectId, id), creators.get(id) ?? { key: null, source: null });
+      for (const id of ids) creatorCache.set(creatorKey(type, projectId, id), creators.get(id) ?? { key: null });
     })).then(() => { if (!controller.signal.aborted) setVersion((value) => value + 1); });
     return () => controller.abort();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -282,11 +315,10 @@ export function CreatorHeading() {
   return <span className="column-help">{t("creator.column")}<HelpTip>{t("creator.help")}</HelpTip></span>;
 }
 
-/** The creating key's name, "Admin copy" for a copied asset, "Unknown" when Core has no record. */
+/** The creating key's name, or "Unknown" when Core has no record. */
 export function CreatorCell({ creator }: { creator: Creator | undefined }) {
   const { t } = useTranslation("common");
   if (creator === undefined) return <span className="owner-missing">—</span>;
-  if (creator.source === "admin_copy") return <span className="owner-missing" title={t("creator.adminCopyHelp")}>{t("creator.adminCopy")}</span>;
   const key = creator.key;
   if (!key) return <span className="owner-missing" title={t("creator.unknownHelp")}>{t("creator.unknown")}</span>;
   const label = key.name ?? (key.prefix ? `${key.prefix}…` : t("creator.unknown"));
diff --git a/apps/web/src/lib/queries.ts b/apps/web/src/lib/queries.ts
index f5b007d7f..a63039f47 100644
--- a/apps/web/src/lib/queries.ts
+++ b/apps/web/src/lib/queries.ts
@@ -1,7 +1,7 @@
 import { QueryClient, queryOptions } from "@tanstack/react-query";
-import type { EnvironmentTemplateResource, SavedAgent, Skill, SourceFileListEntry, Vault } from "@oac/agents-client";
+import type { AgentSession, EnvironmentTemplateResource, SavedAgent, Skill, SourceFileListEntry, Vault } from "@oac/agents-client";
 
-import { readSessionLog, type SessionLogEntry } from "../features/sessions/session-log";
+import { readSessionLog } from "../features/sessions/session-log";
 import { listAllProjects } from "./admin-view";
 import { projectClient, readAllPages, type ProjectClient } from "./projects";
 
@@ -39,7 +39,7 @@ export const collections = {
   templates: { key: ["templates"], load: (client, signal) => readAllPages((after) => client.listEnvironmentTemplates({ after, limit: PAGE, signal })) } satisfies CollectionSpec<EnvironmentTemplateResource>,
   skills: { key: ["skills"], load: (client, signal) => readAllPages((after) => client.listSkills({ after, limit: PAGE, signal })) } satisfies CollectionSpec<Skill>,
   vaults: { key: ["vaults"], load: (client, signal) => readAllPages((after) => client.listVaults({ after, limit: PAGE, signal })) } satisfies CollectionSpec<Vault>,
-  sessions: { key: ["sessions"], load: (client, signal) => readSessionLog(client, signal) } satisfies CollectionSpec<SessionLogEntry>,
+  sessions: { key: ["sessions"], load: (client, signal) => readSessionLog(client, signal) } satisfies CollectionSpec<AgentSession>,
 };
 
 /** Files are read in the order the page shows, so each order has its own cache entry. */
diff --git a/apps/web/src/lib/vite-config.test.ts b/apps/web/src/lib/vite-config.test.ts
deleted file mode 100644
index ad3d57c71..000000000
--- a/apps/web/src/lib/vite-config.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { loadEnv, type ConfigEnv } from "vite";
-
-import webConfig from "../../vite.config.ts";
-
-vi.mock("vite", async (importOriginal) => ({
-  ...await importOriginal<typeof import("vite")>(),
-  loadEnv: vi.fn(),
-}));
-
-function configure(env: Record<string, string>, command: ConfigEnv["command"] = "serve") {
-  vi.mocked(loadEnv).mockReturnValue(env);
-  if (typeof webConfig !== "function") throw new Error("Expected a Vite configuration factory");
-  return webConfig({ command, mode: "development" });
-}
-
-describe("Web Vite settings boundary", () => {
-  it("uses current flags and keeps the proxy address out of browser definitions", async () => {
-    const config = await configure({
-      OAC_WEB_DEV_PROXY_TARGET: "https://private-host-marker.example",
-      OAC_WEB_SELF_HOSTED_SESSIONS: "1",
-      OAC_WEB_OPENAI_HOSTED_SESSIONS: "1",
-      OAC_WEB_ENVIRONMENT_FILES: "1",
-    });
-    expect(config.define).toEqual({
-      __OAC_WEB_SELF_HOSTED_SESSIONS__: "true",
-      __OAC_WEB_OPENAI_HOSTED_SESSIONS__: "true",
-      __OAC_WEB_ENVIRONMENT_FILES__: "true",
-      __OAC_WEB_DOCKER_GUIDE__: "null",
-      __OAC_WEB_DOCKER_BACKEND_GUIDE__: "null",
-    });
-    expect(Object.keys(config.server?.proxy ?? {})).toEqual(["/console", "/node-install", "/core/v1"]);
-    expect(config.server?.proxy?.["/core/v1"]).toEqual({ target: "https://private-host-marker.example", changeOrigin: true });
-    expect(JSON.stringify(config.define)).not.toContain("private-");
-  });
-
-
-});
diff --git a/apps/web/src/vite-env.d.ts b/apps/web/src/vite-env.d.ts
index d6371b55b..11f02fe2a 100644
--- a/apps/web/src/vite-env.d.ts
+++ b/apps/web/src/vite-env.d.ts
@@ -1,27 +1 @@
 /// <reference types="vite/client" />
-
-declare const __OAC_WEB_SELF_HOSTED_SESSIONS__: boolean;
-declare const __OAC_WEB_OPENAI_HOSTED_SESSIONS__: boolean;
-declare const __OAC_WEB_ENVIRONMENT_FILES__: boolean;
-declare const __OAC_WEB_DOCKER_GUIDE__: null | {
-  readonly image: string;
-  readonly apiContainer: string;
-  readonly user: string;
-  readonly credentialsHomePath: string;
-  readonly runtimeHomePath: string;
-};
-declare const __OAC_WEB_DOCKER_BACKEND_GUIDE__: null | {
-  readonly databaseContainer: string;
-  readonly apiContainer: string;
-  readonly daemonContainer: string;
-  readonly corePort: number;
-};
-
-interface ImportMetaEnv {
-  readonly VITE_AGENT_MODEL_PRESETS?: string;
-  readonly VITE_AGENT_DEFAULT_MODEL?: string;
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index 21dae1a27..4f24a353e 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -5,31 +5,13 @@ import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
 import { fileURLToPath } from "node:url";
 
-import {
-  loadLocalDockerBackendGuideProfile,
-  loadLocalDockerGuideProfile,
-} from "./src/lib/docker-guide-config.ts";
-
 const repositoryRoot = fileURLToPath(new URL("../..", import.meta.url));
 
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, repositoryRoot, "");
   const target = env.OAC_WEB_DEV_PROXY_TARGET ?? "http://127.0.0.1:8091";
-  const selfHostedSessionsEnabled = env.OAC_WEB_SELF_HOSTED_SESSIONS === "1";
-  const openAIHostedSessionsEnabled = env.OAC_WEB_OPENAI_HOSTED_SESSIONS === "1";
-  const environmentFilesEnabled = env.OAC_WEB_ENVIRONMENT_FILES === "1";
-  const localDockerGuide = loadLocalDockerGuideProfile(env);
-  const localDockerBackendGuide = loadLocalDockerBackendGuideProfile(env);
 
   return {
-    define: {
-      __OAC_WEB_SELF_HOSTED_SESSIONS__: JSON.stringify(selfHostedSessionsEnabled),
-      __OAC_WEB_OPENAI_HOSTED_SESSIONS__: JSON.stringify(openAIHostedSessionsEnabled),
-      __OAC_WEB_ENVIRONMENT_FILES__: JSON.stringify(environmentFilesEnabled),
-      __OAC_WEB_DOCKER_GUIDE__: JSON.stringify(localDockerGuide),
-      __OAC_WEB_DOCKER_BACKEND_GUIDE__: JSON.stringify(localDockerBackendGuide),
-    },
-    envDir: repositoryRoot,
     plugins: [react(), tailwindcss()],
     resolve: {
       alias: { "@": fileURLToPath(new URL("./src", import.meta.url)) },
diff --git a/contracts/agents-api/admin-api.md b/contracts/agents-api/admin-api.md
index f31771c1f..81d361121 100644
--- a/contracts/agents-api/admin-api.md
+++ b/contracts/agents-api/admin-api.md
@@ -181,12 +181,12 @@ Both routes accept only the parameters listed; an unknown, repeated or empty par
 
 ```json
 {"data":[
-  {"resource_id":"id1","api_key":{"id":"key-uuid","name":"SDK","prefix":"pc_example","kind":"issued","revoked_at":null},"source":"api_key","admin_audit_id":null},
-  {"resource_id":"id2","api_key":null,"source":null,"admin_audit_id":null}
+  {"resource_id":"id1","api_key":{"id":"key-uuid","name":"SDK","prefix":"pc_example","kind":"issued","revoked_at":null}},
+  {"resource_id":"id2","api_key":null}
 ]}
 ```
 
-`api_key` and `source` are null when Core has no creation record, including for resources in another Project. `source: "admin_copy"` with an `admin_audit_id` marks a resource recorded by a `copy` entry in the audit log; no current route writes one.
+`api_key` is null when Core has no creation record, including for resources in another Project.
 
 `GET /projects/{project_id}/write-operations` lists writes newest first by `(created_at, id)`. Filters: `key_id`, `resource_type`, `resource_id`, inclusive `created_after` and exclusive `created_before` (RFC 3339). `limit` is 1–100, default 50. Pass the previous `next_cursor` as `after` with unchanged filters. The response is `{data, has_more, next_cursor}`; each entry has `id`, `created_at`, `api_key`, `action`, `resource_type`, `resource_id`, `parent_id` (empty when absent), `request_id` and `trace_id`.
 
@@ -217,7 +217,7 @@ The [Runtime telemetry API](./runtime-observability-api.md) owns current observa
 
 `GET /audit-log` lists administrator writes newest first. Filters: `project_id`, `resource_type`, `resource_id`, `action`, inclusive `created_after` and exclusive `created_before` (RFC 3339). `limit` is 1–100, default 50, with the opaque `after` cursor. The response is `{data, has_more, next_cursor}`.
 
-Each entry has `id`, `created_at`, `admin_credential_id` (the first 8 hex characters of the Core key digest), `actor_label`, `action`, `project_id`, `resource_type`, `resource_id`, `result_ids`, `request_id` and `trace_id`. `result_ids` is an empty array except on `copy` entries. Deployment-wide entries have `project_id: null`, and a `project_id` filter excludes them.
+Each entry has `id`, `created_at`, `admin_credential_id` (the first 8 hex characters of the Core key digest), `actor_label`, `action`, `project_id`, `resource_type`, `resource_id`, `request_id` and `trace_id`. Deployment-wide entries have `project_id: null`, and a `project_id` filter excludes them.
 
 | `resource_type` | `action` | `resource_id` |
 | --- | --- | --- |
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index f7c597938..c04c1097c 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -21,10 +21,6 @@ definitions:
         type: string
       resource_type:
         type: string
-      result_ids:
-        items:
-          type: object
-        type: array
       trace_id:
         type: string
     type: object
@@ -3393,14 +3389,10 @@ definitions:
     type: object
   writeaudit.ResourceOwner:
     properties:
-      admin_audit_id:
-        type: string
       api_key:
         $ref: '#/definitions/writeaudit.APIKey'
       resource_id:
         type: string
-      source:
-        type: string
     type: object
 info:
   contact: {}
diff --git a/contracts/agents-api/zh/admin-api.md b/contracts/agents-api/zh/admin-api.md
index eabea2d5b..389c07997 100644
--- a/contracts/agents-api/zh/admin-api.md
+++ b/contracts/agents-api/zh/admin-api.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理 API"
 source: contracts/agents-api/admin-api.md
-source_hash: 22ac83d8596bcee671a4f94c81d2fe65e109ab9c0b3759e17cf30626bd5d41df
+source_hash: 7759541dbc59dab917499f506c9e9c11184e8065fd1ed6fb418baaf4a478faf3
 ---
 
 Core 管理 API（`/core/v1`）用于管理安装实例：Project 及其 API 密钥、Project 资源的读取和删除、执行器凭据、部署默认模型、沙箱部署及其节点、监控和审计。Web 的[控制台服务器](../../../docs/zh/web/console-server.md#forwarding-to-core)会为已登录的管理员调用它；运维人员则从 Core 主机上的脚本调用它（[编写 Core API 脚本](../../../docs/zh/getting-started/operations.md#script-the-core-api)）。生成的架构是 [core.openapi.yaml](../core.openapi.yaml)，所有错误都使用 [Core 错误封装](core-errors.md)。
@@ -183,12 +183,12 @@ Core 会记录是哪个 Project API 密钥完成了每次成功的公共写入
 
 ```json
 {"data":[
-  {"resource_id":"id1","api_key":{"id":"key-uuid","name":"SDK","prefix":"pc_example","kind":"issued","revoked_at":null},"source":"api_key","admin_audit_id":null},
-  {"resource_id":"id2","api_key":null,"source":null,"admin_audit_id":null}
+  {"resource_id":"id1","api_key":{"id":"key-uuid","name":"SDK","prefix":"pc_example","kind":"issued","revoked_at":null}},
+  {"resource_id":"id2","api_key":null}
 ]}
 ```
 
-当 Core 没有创建记录时，`api_key` 和 `source` 为 null，这包括另一个 Project 中的资源。带有 `admin_audit_id` 的 `source: "admin_copy"` 表示该资源由审计日志中的 `copy` 条目记录；当前没有路由会写入此类记录。
+当 Core 没有创建记录时，`api_key` 为 null，这包括另一个 Project 中的资源。
 
 `GET /projects/{project_id}/write-operations` 按 `(created_at, id)` 从新到旧列出写入记录。过滤条件包括：`key_id`、`resource_type`、`resource_id`、包含起始时间的 `created_after` 和不包含结束时间的 `created_before`（RFC 3339）。`limit` 为 1–100，默认值为 50。在过滤条件不变的情况下，将上一个 `next_cursor` 作为 `after` 传入。响应为 `{data, has_more, next_cursor}`；每个条目包含 `id`、`created_at`、`api_key`、`action`、`resource_type`、`resource_id`、`parent_id`（不存在时为空）、`request_id` 和 `trace_id`。
 
@@ -219,7 +219,7 @@ Core 会记录是哪个 Project API 密钥完成了每次成功的公共写入
 
 `GET /audit-log` 按从新到旧的顺序列出管理员写入。过滤条件包括 `project_id`、`resource_type`、`resource_id`、`action`、包含起始时间的 `created_after` 和不包含结束时间的 `created_before`（RFC 3339）。`limit` 为 1–100，默认值为 50，并使用不透明的 `after` 游标。响应为 `{data, has_more, next_cursor}`。
 
-每个条目包含 `id`、`created_at`、`admin_credential_id`（Core 密钥摘要的前 8 个十六进制字符）、`actor_label`、`action`、`project_id`、`resource_type`、`resource_id`、`result_ids`、`request_id` 和 `trace_id`。除 `copy` 条目外，`result_ids` 都是空数组。部署范围条目为 `project_id: null`，使用 `project_id` 过滤时会排除这些条目。
+每个条目包含 `id`、`created_at`、`admin_credential_id`（Core 密钥摘要的前 8 个十六进制字符）、`actor_label`、`action`、`project_id`、`resource_type`、`resource_id`、`request_id` 和 `trace_id`。部署范围条目为 `project_id: null`，使用 `project_id` 过滤时会排除这些条目。
 
 | `resource_type` | `action` | `resource_id` |
 | --- | --- | --- |
diff --git a/docs/web/console-api-usage.md b/docs/web/console-api-usage.md
index ba8faa171..b81088cf4 100644
--- a/docs/web/console-api-usage.md
+++ b/docs/web/console-api-usage.md
@@ -69,7 +69,7 @@ In an archived project the section hides **Issue credential** and **Rotate** beh
 
 | Operation | Route | Console use |
 | --- | --- | --- |
-| Resource owners | `GET /core/v1/projects/{project_id}/resource-owners` | The Creator column of every resource list and the creator fact of detail pages, in batches of up to 100 IDs: the creating key's name, **Admin copy** for an owner with source `admin_copy`, or **Unknown** when Core has no record |
+| Resource owners | `GET /core/v1/projects/{project_id}/resource-owners` | The Creator column of every resource list and the creator fact of detail pages, in batches of up to 100 IDs: the creating key's name, or **Unknown** when Core has no record |
 | Write operations | `GET /core/v1/projects/{project_id}/write-operations` | A project's write history, newest first, filtered by key and resource type, 50 per page |
 | Summary | `GET /core/v1/summary` | Overview (per project), the Agents list (`group_by=agent`), a project's page (per project and `group_by=key`), Agent metrics (to skip idle projects, and usage by creating key since the start of the range), the Projects list (last activity) |
 | Installation | `GET /core/v1/installation` | System's Installation facts (`public_url`, `api_base_url`, `installation_id`, `source_commit`) and read-only Startup settings (`configuration.settings`; a sensitive setting shows only whether it is `configured`); `api_base_url` in the call samples; `public_url` as the download origin and `--source-url` of the node install and uninstall commands (and the install command's `--core-url`). A sensitive setting with a value, or an unknown member, fails the read |
diff --git a/docs/zh/web/console-api-usage.md b/docs/zh/web/console-api-usage.md
index d855d7ee6..a6037092a 100644
--- a/docs/zh/web/console-api-usage.md
+++ b/docs/zh/web/console-api-usage.md
@@ -1,7 +1,7 @@
 ---
 title: "控制台 API 使用"
 source: docs/web/console-api-usage.md
-source_hash: 3b54852843f5afccd6ce47a532a9c82f6a4a0dbffdac9b96892c5026f5f78c20
+source_hash: 50edc63c79976e9aad9590604a0e361aae178144bc8a6009989b2da5d031408d
 ---
 
 本页列出各控制台页面读取和写入的 Core 路由，以及控制台如何限定读取范围。[administrator API contract](../../../contracts/agents-api/zh/admin-api.md) 定义了路由、响应结构、分页和审计记录；[API namespaces and credentials](../api/index.md) 定义了本文使用的术语。
@@ -71,7 +71,7 @@ source_hash: 3b54852843f5afccd6ce47a532a9c82f6a4a0dbffdac9b96892c5026f5f78c20
 
 | 操作 | 路由 | 控制台用途 |
 | --- | --- | --- |
-| 资源所有者 | `GET /core/v1/projects/{project_id}/resource-owners` | 每个资源列表的 Creator 列和详情页的创建者信息，每批最多处理 100 个 ID：创建密钥的名称；来源为 `admin_copy` 的所有者显示 **Admin copy**；Core 无记录时显示 **Unknown** |
+| 资源所有者 | `GET /core/v1/projects/{project_id}/resource-owners` | 每个资源列表的 Creator 列和详情页的创建者信息，每批最多处理 100 个 ID：创建密钥的名称；Core 无记录时显示 **Unknown** |
 | 写入操作 | `GET /core/v1/projects/{project_id}/write-operations` | 项目的写入历史，按最新优先，可按密钥和资源类型筛选，每页 50 条 |
 | 汇总 | `GET /core/v1/summary` | Overview（按项目）、Agents 列表（`group_by=agent`）、项目页面（按项目并使用 `group_by=key`）、Agent 指标（跳过空闲项目，并统计从范围开始以来按创建密钥划分的使用量）、Projects 列表（最近活动） |
 | 安装 | `GET /core/v1/installation` | System 的 Installation 信息（`public_url`、`api_base_url`、`installation_id`、`source_commit`）和只读 Startup 设置（`configuration.settings`；敏感设置仅显示其是否为 `configured`）；调用示例中的 `api_base_url`；作为下载来源以及节点安装和卸载命令中 `--source-url` 的 `public_url`（还包括安装命令中的 `--core-url`）。如果敏感设置包含值，或存在未知成员，读取会失败 |
diff --git a/packages/agents-client/README.md b/packages/agents-client/README.md
index c8fa7f2e2..456f75318 100644
--- a/packages/agents-client/README.md
+++ b/packages/agents-client/README.md
@@ -20,7 +20,7 @@ Every constructor also takes `baseUrl` and `fetch`. A token may be a string or a
 
 Behavior shared by the clients:
 
-- **Strict responses.** Session, history, event, Environment and Core API responses are checked against their pinned shapes before they are returned. A malformed one throws `AgentCoreError` with status 502 and a code such as `invalid_session_resource` or `invalid_admin_response` (`CoreMetricsClient`: status 0, `invalid_response`) instead of passing on a guessed value. `listSessionsTolerant` reports Sessions it cannot recognise in `unrecognized` instead of failing. Agent responses are typed but not checked at run time.
+- **Strict responses.** Session, history, event, Environment and Core API responses are checked against their pinned shapes before they are returned. A malformed one throws `AgentCoreError` with status 502 and a code such as `invalid_session_resource` or `invalid_admin_response` (`CoreMetricsClient`: status 0, `invalid_response`) instead of passing on a guessed value. Agent responses are typed but not checked at run time.
 - **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). Invalid caller input throws `TypeError` before any request.
 - **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 a key of at most 128 bytes. `createIdempotencyKey()` makes one.
diff --git a/packages/agents-client/src/admin-client.test.ts b/packages/agents-client/src/admin-client.test.ts
index aba044f90..9b0d05466 100644
--- a/packages/agents-client/src/admin-client.test.ts
+++ b/packages/agents-client/src/admin-client.test.ts
@@ -176,7 +176,7 @@ describe("AdminClient transport boundary", () => {
   });
 
   it("accepts deployment-wide audit entries without a Project", async () => {
-    const entry = { id: "audit", created_at: "2026-09-26T08:00:00Z", admin_credential_id: "digest", actor_label: "console", action: "set", project_id: null, resource_type: "deployment_model_provider", resource_id: "codex", result_ids: [], request_id: "request", trace_id: "trace" };
+    const entry = { id: "audit", created_at: "2026-09-26T08:00:00Z", admin_credential_id: "digest", actor_label: "console", action: "set", project_id: null, resource_type: "deployment_model_provider", resource_id: "codex", request_id: "request", trace_id: "trace" };
     const audit = { data: [entry], has_more: false, next_cursor: "" };
     expect(await clientWith(audit).client.listAuditLog()).toEqual(audit);
     await expect(clientWith({ ...audit, data: [{ ...entry, project_id: 1 }] }).client.listAuditLog()).rejects.toMatchObject({ code: "invalid_admin_response" });
@@ -266,7 +266,7 @@ describe("AdminClient response contracts", () => {
   });
 
   it("retains owner ordering and strips no unexpected secret fields", async () => {
-    const owners = { data: [{ resource_id: "a", api_key: null, source: null, admin_audit_id: null }] };
+    const owners = { data: [{ resource_id: "a", api_key: null }] };
     expect(await clientWith(owners).client.retrieveResourceOwners(projectId, "agent", ["a"])).toEqual(owners);
     await expect(clientWith(owners).client.retrieveResourceOwners(projectId, "agent", ["b"])).rejects.toBeInstanceOf(AgentCoreError);
     await expect(clientWith({ data: [{ resource_id: "a", api_key: { id: projectId, name: "SDK", prefix: "p", kind: "issued", revoked_at: null, key: "leak" } }] }).client.retrieveResourceOwners(projectId, "agent", ["a"])).rejects.toBeInstanceOf(AgentCoreError);
@@ -294,13 +294,11 @@ describe("AdminClient deployment read models", () => {
     await expect(clientWith({ ...summary, data: [{ ...summary.data[0], coverage: { measured_sessions: 3, total_sessions: 2, ratio: 1.5 } }] }).client.retrieveSummary()).rejects.toBeInstanceOf(AgentCoreError);
   });
 
-  it("validates historical copy provenance and safe audit mappings", async () => {
-    const owners = { data: [{ resource_id: "a", api_key: null, source: "admin_copy", admin_audit_id: "audit" }] };
-    expect(await clientWith(owners).client.retrieveResourceOwners(projectId, "agent", ["a"])).toEqual(owners);
-    const audit = { data: [{ id: "audit", created_at: "2026-09-24T00:00:00Z", admin_credential_id: "digest", actor_label: "admin", action: "copy", project_id: projectId, resource_type: "agent", resource_id: "a", result_ids: [{ type: "agent", source_id: "a", target_id: "b" }], request_id: "request", trace_id: "trace" }], has_more: false, next_cursor: "" };
+  it("passes audit filters and rejects audit entries with unexpected fields", async () => {
+    const audit = { data: [{ id: "audit", created_at: "2026-09-24T00:00:00Z", admin_credential_id: "digest", actor_label: "admin", action: "delete", project_id: projectId, resource_type: "agent", resource_id: "a", request_id: "request", trace_id: "trace" }], has_more: false, next_cursor: "" };
     const { client, fetch } = clientWith(audit);
-    expect(await client.listAuditLog({ action: "copy", resource_type: "agent", project_id: projectId, after: "cursor" })).toEqual(audit);
-    expect(fetch.mock.calls[0]![0]).toBe(`/core/v1/audit-log?after=cursor&project_id=${projectId}&resource_type=agent&action=copy`);
+    expect(await client.listAuditLog({ action: "delete", resource_type: "agent", project_id: projectId, after: "cursor" })).toEqual(audit);
+    expect(fetch.mock.calls[0]![0]).toBe(`/core/v1/audit-log?after=cursor&project_id=${projectId}&resource_type=agent&action=delete`);
     await expect(clientWith({ ...audit, data: [{ ...audit.data[0], request_body: { token: "leak" } }] }).client.listAuditLog()).rejects.toBeInstanceOf(AgentCoreError);
   });
 
@@ -476,8 +474,10 @@ describe("AdminClient database-owned identities", () => {
     expect(await client.listSkillVersions(projectId, "skill", { limit: 0 })).toEqual(page);
   });
 
-  it.each(["issued", "static", "console"])("preserves %s key provenance in historical ownership records", async (kind) => {
-    const owner = { resource_id: resourceId, api_key: { id: keyId, name: "Original key", prefix: "p", kind, revoked_at: null }, source: "api_key", admin_audit_id: null };
+  it("preserves issued key provenance and rejects other key kinds", async () => {
+    const owner = { resource_id: resourceId, api_key: { id: keyId, name: "Original key", prefix: "p", kind: "issued", revoked_at: null } };
     expect(await clientWith({ data: [owner] }).client.retrieveResourceOwners(projectId, "agent", [resourceId])).toEqual({ data: [owner] });
+    const other = { ...owner, api_key: { ...owner.api_key, kind: "static" } };
+    await expect(clientWith({ data: [other] }).client.retrieveResourceOwners(projectId, "agent", [resourceId])).rejects.toMatchObject({ code: "invalid_admin_response" });
   });
 });
diff --git a/packages/agents-client/src/admin-projection.ts b/packages/agents-client/src/admin-projection.ts
index a4196bb8c..6b94de644 100644
--- a/packages/agents-client/src/admin-projection.ts
+++ b/packages/agents-client/src/admin-projection.ts
@@ -4,7 +4,7 @@ import { projectTokenUsage } from "./usage-projection";
 import { safeProvider } from "./execution-configuration-projection";
 import { canonicalUuid, exactFields, isNonnegativeInteger, isRecord, onlyFields, sameResourceId } from "./response-projection";
 import type { CoreHarness, CoreHarnessKind, HarnessModelConfiguration, ProviderObservationErrorCode, ListPage, SavedAgent } from "./types";
-import type { AdminAPIKey, AdminProject, AdminAuditPage, AdminSummary, AdminRuntimeObservation, RuntimeDiskObservation, AdminKeyProvenance, AdminResourceOwner, AdminWriteOperationPage, AdminAuditResultID, AdminDeleted, AdminIssuedAPIKey, AdminPage, AdminSessionArchive, SessionArtifact, Skill, SkillVersion, ExecutorCredentialList, ExecutorConnection, IssuedExecutorCredential, CoreInstallation, CoreInstallationSetting } from "./admin-types";
+import type { AdminAPIKey, AdminProject, AdminAuditPage, AdminSummary, AdminRuntimeObservation, RuntimeDiskObservation, AdminKeyProvenance, AdminResourceOwner, AdminWriteOperationPage, AdminDeleted, AdminIssuedAPIKey, AdminPage, AdminSessionArchive, SessionArtifact, Skill, SkillVersion, ExecutorCredentialList, ExecutorConnection, IssuedExecutorCredential, CoreInstallation, CoreInstallationSetting } from "./admin-types";
 
 export function invalidAdminResponse(): never {
   throw new AgentCoreError("Core returned an invalid administration response.", 502, "invalid_admin_response");
@@ -98,36 +98,20 @@ export function projectArtifact(value: unknown, sessionId: string, expectedId?:
     !sameResourceId(artifact.session_id as string, sessionId) || (expectedId !== undefined && !sameResourceId(artifact.id as string, expectedId))) return invalidAdminResponse();
   return { ...artifact } as unknown as SessionArtifact;
 }
-// Historical copy audit entries retain their result mappings.
-function projectAuditResultIDs(value: unknown): AdminAuditResultID[] {
-  if (!Array.isArray(value)) return invalidAdminResponse();
-  const types = new Set(["agent", "skill", "skill_version", "environment_template", "file", "vault", "credential"]);
-  return value.map((entry) => {
-    const item = record(entry, ["type", "source_id", "target_id"]);
-    strings(item, ["type", "source_id", "target_id"]);
-    if (!types.has(item.type as string)) return invalidAdminResponse();
-    return { ...item } as unknown as AdminAuditResultID;
-  });
-}
-
 function projectProvenance(value: unknown): AdminKeyProvenance | null {
   if (value === null) return null;
   const key = record(value, ["id", "name", "prefix", "kind", "revoked_at"]);
   strings(key, ["id", "name", "prefix"]);
-  if ((key.kind !== "issued" && key.kind !== "static" && key.kind !== "console") || !date(key.revoked_at)) return invalidAdminResponse();
+  if (key.kind !== "issued" || !date(key.revoked_at)) return invalidAdminResponse();
   return { ...key } as unknown as AdminKeyProvenance;
 }
 export function projectResourceOwners(value: unknown, ids: string[]): { data: AdminResourceOwner[] } {
   const page = record(value, ["data"]);
   if (!Array.isArray(page.data) || page.data.length !== ids.length) return invalidAdminResponse();
   return { data: page.data.map((entry, index) => {
-    const owner = record(entry, ["resource_id", "api_key", "source", "admin_audit_id"]);
+    const owner = record(entry, ["resource_id", "api_key"]);
     if (owner.resource_id !== ids[index]) return invalidAdminResponse();
-    if (!(owner.source === null || owner.source === "api_key" || owner.source === "admin_copy") ||
-      !(owner.admin_audit_id === null || typeof owner.admin_audit_id === "string")) return invalidAdminResponse();
-    const apiKey = projectProvenance(owner.api_key);
-    if ((owner.source === "api_key") !== (apiKey !== null) || (owner.source === "admin_copy") !== (owner.admin_audit_id !== null)) return invalidAdminResponse();
-    return { resource_id: owner.resource_id as string, api_key: apiKey, source: owner.source, admin_audit_id: owner.admin_audit_id } as AdminResourceOwner;
+    return { resource_id: owner.resource_id as string, api_key: projectProvenance(owner.api_key) };
   }) };
 }
 export function projectWriteOperations(value: unknown): AdminWriteOperationPage {
@@ -192,12 +176,12 @@ export function projectAdminAudit(value: unknown): AdminAuditPage {
   const page = record(value, ["data", "has_more", "next_cursor"]);
   if (!Array.isArray(page.data) || typeof page.has_more !== "boolean" || typeof page.next_cursor !== "string") return invalidAdminResponse();
   const data = page.data.map((entry) => {
-    const audit = record(entry, ["id", "created_at", "admin_credential_id", "actor_label", "action", "project_id", "resource_type", "resource_id", "result_ids", "request_id", "trace_id"]);
+    const audit = record(entry, ["id", "created_at", "admin_credential_id", "actor_label", "action", "project_id", "resource_type", "resource_id", "request_id", "trace_id"]);
     strings(audit, ["id", "created_at", "admin_credential_id", "actor_label", "action", "resource_type", "resource_id", "request_id", "trace_id"]);
     if (!date(audit.created_at) || !(audit.project_id === null || typeof audit.project_id === "string")) return invalidAdminResponse();
-    return { ...audit, result_ids: projectAuditResultIDs(audit.result_ids) };
+    return audit;
   });
-  return { data, has_more: page.has_more, next_cursor: page.next_cursor } as AdminAuditPage;
+  return { data, has_more: page.has_more, next_cursor: page.next_cursor } as unknown as AdminAuditPage;
 }
 export function projectExecutorCredentials(value: unknown): ExecutorCredentialList {
   const page = record(value, ["data", "connection"]);
diff --git a/packages/agents-client/src/admin-types.ts b/packages/agents-client/src/admin-types.ts
index e09c60f7a..6949f9c4c 100644
--- a/packages/agents-client/src/admin-types.ts
+++ b/packages/agents-client/src/admin-types.ts
@@ -1,9 +1,4 @@
-import type {
-  AgentDeleted, AgentSession, AgentTurn, EnvironmentTemplateDeleted, EnvironmentTemplateList, EnvironmentTemplateResource, ListPage, PageOptions, ReadOptions,
-  RuntimeHistory, RuntimeHistoryQuery, RuntimeObservation, SavedAgent, SessionDeleted, SessionItem, SessionListOptions, SkillContent, SkillDeleted, SkillList,
-  SkillListOptions, SkillVersionDeleted, SkillVersionList, SourceFileDeleted, SourceFileList, SourceFileListOptions, TolerantSessionList, Vault,
-  VaultCredentialDeleted, VaultCredentialList, VaultDeleted, VaultList, VaultListOptions,
-} from "./types";
+import type { PageOptions } from "./types";
 
 export interface AdminClientOptions {
   /** Prefix that request paths are appended to; defaults to `/core/v1`. */
@@ -76,14 +71,13 @@ export interface AdminKeyProvenance {
   id: string;
   name: string;
   prefix: string;
-  kind: "issued" | "static" | "console";
+  kind: "issued";
   revoked_at: string | null;
 }
+/** `api_key` is null when Core has no creation record. */
 export interface AdminResourceOwner {
   resource_id: string;
   api_key: AdminKeyProvenance | null;
-  source: "api_key" | "admin_copy" | null;
-  admin_audit_id: string | null;
 }
 export interface AdminWriteOperation {
   id: string;
@@ -136,11 +130,6 @@ export interface AdminAuditOptions extends Omit<AdminWriteOperationOptions, "res
   action?: string;
   resource_type?: string;
 }
-export interface AdminAuditResultID {
-  type: "agent" | "skill" | "skill_version" | "environment_template" | "file" | "vault" | "credential";
-  source_id: string;
-  target_id: string;
-}
 export interface AdminAuditEntry {
   id: string;
   created_at: string;
@@ -151,8 +140,6 @@ export interface AdminAuditEntry {
   project_id: string | null;
   resource_type: string;
   resource_id: string;
-  /** Non-empty only on historical `copy` entries from the removed copy operation. */
-  result_ids: AdminAuditResultID[];
   request_id: string;
   trace_id: string;
 }
@@ -220,39 +207,3 @@ export interface CoreInstallation {
   configuration: CoreInstallationConfiguration;
   address_bindings: CoreAddressBindings;
 }
-
-/**
- * The project-bound reads and deletions the console makes through Core, in
- * the public projections' shapes: each method is a Core client method with
- * its project ID bound.
- */
-export interface CoreProjectReader {
-  listAgents(options?: PageOptions): Promise<ListPage<SavedAgent>>;
-  retrieveAgent(agentId: string): Promise<SavedAgent>;
-  deleteAgent(agentId: string): Promise<AgentDeleted>;
-  listSkills(options?: SkillListOptions): Promise<SkillList>;
-  retrieveSkill(skillId: string, options?: ReadOptions): Promise<Skill>;
-  deleteSkill(skillId: string, options?: ReadOptions): Promise<SkillDeleted>;
-  listSkillVersions(skillId: string, options?: SkillListOptions): Promise<SkillVersionList>;
-  deleteSkillVersion(skillId: string, version: string, options?: ReadOptions): Promise<SkillVersionDeleted>;
-  downloadSkill(skillId: string, options?: ReadOptions): Promise<SkillContent>;
-  downloadSkillVersion(skillId: string, version: string, options?: ReadOptions): Promise<SkillContent>;
-  listEnvironmentTemplates(options?: PageOptions): Promise<EnvironmentTemplateList>;
-  retrieveEnvironmentTemplate(templateId: string, options?: ReadOptions): Promise<EnvironmentTemplateResource>;
-  deleteEnvironmentTemplate(templateId: string, options?: ReadOptions): Promise<EnvironmentTemplateDeleted>;
-  listSourceFiles(options?: SourceFileListOptions): Promise<SourceFileList>;
-  deleteSourceFile(fileId: string, options?: ReadOptions): Promise<SourceFileDeleted>;
-  listVaults(options?: VaultListOptions): Promise<VaultList>;
-  retrieveVault(vaultId: string, options?: ReadOptions): Promise<Vault>;
-  listVaultCredentials(vaultId: string, options?: VaultListOptions): Promise<VaultCredentialList>;
-  deleteVault(vaultId: string): Promise<VaultDeleted>;
-  deleteVaultCredential(vaultId: string, credentialId: string): Promise<VaultCredentialDeleted>;
-  listSessions(options?: SessionListOptions): Promise<ListPage<AgentSession>>;
-  listSessionsTolerant(options?: SessionListOptions): Promise<TolerantSessionList>;
-  retrieveSession(sessionId: string, options?: ReadOptions): Promise<AgentSession>;
-  deleteSession(sessionId: string): Promise<SessionDeleted>;
-  listTurns(sessionId: string, options?: PageOptions): Promise<ListPage<AgentTurn>>;
-  listItems(sessionId: string, options?: PageOptions): Promise<ListPage<SessionItem>>;
-  retrieveRuntimeObservation(sessionId: string, options?: ReadOptions): Promise<RuntimeObservation>;
-  retrieveRuntimeHistory(sessionId: string, query: RuntimeHistoryQuery): Promise<RuntimeHistory>;
-}
diff --git a/packages/agents-client/src/client.ts b/packages/agents-client/src/client.ts
index c7298d75b..2e4e8e13b 100644
--- a/packages/agents-client/src/client.ts
+++ b/packages/agents-client/src/client.ts
@@ -60,7 +60,6 @@ import type {
   InputMessage,
   ListPage,
   PageOptions,
-  PageOrder,
   ReadOptions,
   SavedAgent,
   SavedAgentCore,
@@ -90,8 +89,6 @@ import type {
   SkillVersionUploadOptions,
   StreamOptions,
   StreamError,
-  TolerantSessionList,
-  UnrecognizedSession,
   UpdateAgentInput,
   ReplaceVaultCredentialTokenInput,
   RuntimeObservation,
@@ -260,10 +257,6 @@ const sessionFields = new Set([
   "id", "object", "agent", "environment", "status", "error", "metadata",
   "required_actions", "vault_ids", "usage", "created_at", "last_active_at",
 ]);
-const sessionListFields = new Set(["object", "data", "has_more", "first_id", "last_id"]);
-// Core's Session list bound; it defaults to 20.
-const maxSessionListLimit = 100;
-const defaultSessionListLimit = 20;
 const agentSnapshotFields = new Set([
   "id", "model", "name", "instructions", "multi_agent", "reasoning",
   "service_tier", "text", "tools",
@@ -987,60 +980,6 @@ export function projectAgentSession(
   return session;
 }
 
-function invalidSessionList(): never {
-  throw new AgentCoreError("OpenAgentCore returned an invalid Session list.", 502, "invalid_session_list");
-}
-
-/**
- * Projects a Session page tolerantly. Each entry is projected exactly as a
- * retrieved Session; an entry that fails is reported by its page index, with
- * its raw ID only when that has Core's Session ID (UUID) form, and nothing
- * else of it is kept. The page itself stays strict: its envelope, size, IDs,
- * cursors and creation order must be consistent, or the whole page fails.
- */
-function projectTolerantSessionList(value: unknown, limit: number, order: PageOrder): TolerantSessionList {
-  if (
-    !isRecord(value) || !exactFields(value, sessionListFields) || value.object !== "list" ||
-    !Array.isArray(value.data) || typeof value.has_more !== "boolean" || value.data.length > limit
-  ) return invalidSessionList();
-  const data: AgentSession[] = [];
-  const unrecognized: UnrecognizedSession[] = [];
-  // Each entry's ID in page order; null when an unrecognized entry has none.
-  const ids: Array<string | null> = [];
-  value.data.forEach((entry: unknown, index) => {
-    try {
-      const session = projectAgentSession(entry);
-      data.push(session);
-      ids.push(session.id);
-    } catch (error) {
-      if (!(error instanceof AgentCoreError)) throw error;
-      const id = isRecord(entry) && typeof entry.id === "string" && canonicalUuid(entry.id) !== null ? entry.id : null;
-      unrecognized.push({ index, id });
-      ids.push(id);
-    }
-  });
-  const knownIds = ids.filter((id): id is string => id !== null);
-  // A cursor must be an ID; it must equal its entry's ID whenever that is known.
-  const boundary = (cursor: unknown, id: string | null | undefined) =>
-    typeof cursor === "string" && cursor.trim() !== "" && (id === null || id === undefined || cursor === id);
-  if (
-    (ids.length === 0
-      ? value.first_id !== null || value.last_id !== null || value.has_more
-      : !boundary(value.first_id, ids[0]) || !boundary(value.last_id, ids.at(-1))) ||
-    new Set(knownIds).size !== knownIds.length ||
-    // Public timestamps are whole seconds, so equal values cannot prove the ID tie-break.
-    data.some((session, index) => index > 0 && compareCreatedResource(data[index - 1]!, session, order) > 0)
-  ) return invalidSessionList();
-  return {
-    object: "list",
-    data,
-    unrecognized,
-    has_more: value.has_more,
-    first_id: value.first_id as string | null,
-    last_id: value.last_id as string | null,
-  };
-}
-
 function invalidRuntimeObservation(message = "OpenAgentCore returned an invalid Runtime observation."): never {
   throw new AgentCoreError(message, 502, "invalid_runtime_observation");
 }
@@ -2138,7 +2077,7 @@ export class OpenAIAgentsClient implements AgentCore {
     );
   }
 
-  async listSessions(options?: PageOptions & { agentId?: string }): Promise<ListPage<AgentSession>> {
+  async listSessions(options?: SessionListOptions): Promise<ListPage<AgentSession>> {
     const params = new URLSearchParams();
     addPageOptions(params, options);
     if (options?.agentId) params.set("agent_id", options.agentId);
@@ -2149,27 +2088,6 @@ export class OpenAIAgentsClient implements AgentCore {
     return { ...page, data: page.data.map((session) => projectAgentSession(session)) };
   }
 
-  /**
-   * Reads one Session page without letting a malformed Session fail it.
-   * Recognized Sessions are projected exactly as by listSessions and returned
-   * in page order; every other entry is reported in `unrecognized`. A
-   * malformed envelope, cursor or page still fails the whole request, so
-   * callers paginate with the returned `last_id` and `has_more`.
-   */
-  async listSessionsTolerant(options?: SessionListOptions): Promise<TolerantSessionList> {
-    if (
-      (options?.limit !== undefined && (
-        !Number.isSafeInteger(options.limit) || options.limit < 1 || options.limit > maxSessionListLimit
-      )) ||
-      (options?.order !== undefined && options.order !== "asc" && options.order !== "desc")
-    ) throw new TypeError("Session list limit must be an integer from 1 through 100 and order asc or desc.");
-    const params = new URLSearchParams();
-    addPageOptions(params, options);
-    if (options?.agentId) params.set("agent_id", options.agentId);
-    const value = await this.request<unknown>(withQuery("/agents/sessions", params), { signal: options?.signal }, 200);
-    return projectTolerantSessionList(value, options?.limit ?? defaultSessionListLimit, options?.order ?? "desc");
-  }
-
   async createSession(input: CreateSessionInput, idempotencyKey = createIdempotencyKey()): Promise<AgentSession> {
     if ((input as { stream?: boolean }).stream === true) {
       throw new TypeError("createSession only supports the JSON response; connect streamEvents after creation.");
diff --git a/packages/agents-client/src/core-project-reader.test.ts b/packages/agents-client/src/core-project-reader.test.ts
deleted file mode 100644
index 6eff9a34a..000000000
--- a/packages/agents-client/src/core-project-reader.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-
-import { AdminClient } from "./admin-client";
-import type { AdminContent, CoreProjectReader } from "./admin-types";
-
-async function content(result: Promise<AdminContent>) {
-  const value = await result;
-  return { data: value.blob, bytes: value.blob.size, content_type: "application/octet-stream" as const, content_disposition: value.contentDisposition ?? "" };
-}
-
-/**
- * The console's project binding (apps/web createProjectClient), written without
- * a cast: typechecking this file proves AdminClient's project-bound methods
- * satisfy CoreProjectReader.
- */
-function projectReader(admin: AdminClient, projectId: string): CoreProjectReader {
-  const listSessions = async (options: Parameters<CoreProjectReader["listSessions"]>[0] = {}) => {
-    const page = await admin.listSessions(projectId, { after: options.after, limit: options.limit, order: options.order, agentId: options.agentId, signal: options.signal });
-    return { ...page, object: "list" as const, first_id: page.first_id ?? null, last_id: page.last_id ?? null };
-  };
-  const client: CoreProjectReader = {
-    listAgents: (options) => admin.listAgents(projectId, options),
-    retrieveAgent: (agentId: string) => admin.retrieveAgent(projectId, agentId),
-    deleteAgent: (agentId: string) => admin.deleteAgent(projectId, agentId),
-    listSkills: (options) => admin.listSkills(projectId, options),
-    retrieveSkill: (skillId, options) => admin.retrieveSkill(projectId, skillId, options),
-    deleteSkill: (skillId, options) => admin.deleteSkill(projectId, skillId, options),
-    listSkillVersions: (skillId, options) => admin.listSkillVersions(projectId, skillId, options),
-    deleteSkillVersion: (skillId, version, options) => admin.deleteSkillVersion(projectId, skillId, version, options),
-    downloadSkill: (skillId, options) => content(admin.downloadSkill(projectId, skillId, options)),
-    downloadSkillVersion: (skillId, version, options) => content(admin.downloadSkillVersion(projectId, skillId, version, options)),
-    listEnvironmentTemplates: (options) => admin.listEnvironmentTemplates(projectId, options),
-    retrieveEnvironmentTemplate: (templateId, options) => admin.retrieveEnvironmentTemplate(projectId, templateId, options),
-    deleteEnvironmentTemplate: (templateId, options) => admin.deleteEnvironmentTemplate(projectId, templateId, options),
-    listSourceFiles: (options) => admin.listSourceFiles(projectId, options),
-    deleteSourceFile: (fileId, options) => admin.deleteSourceFile(projectId, fileId, options),
-    listVaults: (options) => admin.listVaults(projectId, options),
-    retrieveVault: (vaultId, options) => admin.retrieveVault(projectId, vaultId, options),
-    listVaultCredentials: (vaultId, options) => admin.listVaultCredentials(projectId, vaultId, options),
-    deleteVault: (vaultId) => admin.deleteVault(projectId, vaultId),
-    deleteVaultCredential: (vaultId, credentialId) => admin.deleteVaultCredential(projectId, vaultId, credentialId),
-    listSessions,
-    listSessionsTolerant: async (options) => ({ ...(await listSessions(options)), unrecognized: [] }),
-    retrieveSession: (sessionId, options) => admin.retrieveSession(projectId, sessionId, options),
-    deleteSession: (sessionId) => admin.deleteSession(projectId, sessionId),
-    listTurns: (sessionId, options) => admin.listTurns(projectId, sessionId, options),
-    listItems: (sessionId, options) => admin.listItems(projectId, sessionId, options),
-    retrieveRuntimeObservation: (sessionId, options) => admin.retrieveRuntimeObservation(projectId, sessionId, options),
-    retrieveRuntimeHistory: (sessionId, query) => admin.retrieveRuntimeHistory(projectId, sessionId, query),
-  };
-  return client;
-}
-
-describe("CoreProjectReader", () => {
-  it("binds AdminClient to one project under /core/v1/projects without a cast", async () => {
-    const projectId = "66666666-6666-4666-8666-666666666666";
-    const fetch = vi.fn<typeof globalThis.fetch>().mockImplementation(async () => new Response(JSON.stringify({ object: "list", data: [], has_more: false, first_id: null, last_id: null })));
-    const reader = projectReader(new AdminClient({ fetch }), projectId);
-    await expect(reader.listSkills()).resolves.toEqual({ object: "list", data: [], has_more: false, first_id: null, last_id: null });
-    await reader.listSourceFiles({ purpose: "user_data" });
-    expect(fetch.mock.calls.map(([url]) => url)).toEqual([`/core/v1/projects/${projectId}/skills`, `/core/v1/projects/${projectId}/files?purpose=user_data`]);
-  });
-});
diff --git a/packages/agents-client/src/index.ts b/packages/agents-client/src/index.ts
index c65bc9604..b58933aa3 100644
--- a/packages/agents-client/src/index.ts
+++ b/packages/agents-client/src/index.ts
@@ -12,6 +12,6 @@ export { isOpenAIHostedSessionEnvironment } from "./session-environment-projecti
 export { compareSkillVersionNumbers, isSkillId, isSkillUploadPath, isSkillVersionId, isSkillVersionNumber, maxSkillUploadFiles } from "./skill-projection";
 export { AdminClient } from "./admin-client";
 // Skill and SkillVersion come from ./types; the admin projections use the same shapes.
-export type { AdminClientOptions, AdminProject, CreateAdminProjectInput, RenameAdminProjectInput, AdminAPIKey, AdminIssuedAPIKey, IssueAdminAPIKeyInput, AdminPage, AdminDeleted, SessionArtifact, AdminContent, AdminResourceType, AdminKeyProvenance, AdminResourceOwner, AdminWriteOperation, AdminWriteOperationOptions, AdminWriteOperationPage, AdminSummaryOptions, AdminSummaryEntry, AdminSummary, AdminRuntimeObservation, AdminAuditOptions, AdminAuditResultID, AdminAuditEntry, AdminAuditPage, ExecutorCredential, ExecutorConnection, ExecutorCredentialList, IssueExecutorCredentialInput, IssuedExecutorCredential, CoreProjectReader, CoreInstallation, CoreInstallationConfiguration, CoreInstallationSetting, CoreAddressBindings } from "./admin-types";
+export type { AdminClientOptions, AdminProject, CreateAdminProjectInput, RenameAdminProjectInput, AdminAPIKey, AdminIssuedAPIKey, IssueAdminAPIKeyInput, AdminPage, AdminDeleted, SessionArtifact, AdminContent, AdminResourceType, AdminKeyProvenance, AdminResourceOwner, AdminWriteOperation, AdminWriteOperationOptions, AdminWriteOperationPage, AdminSummaryOptions, AdminSummaryEntry, AdminSummary, AdminRuntimeObservation, AdminAuditOptions, AdminAuditEntry, AdminAuditPage, ExecutorCredential, ExecutorConnection, ExecutorCredentialList, IssueExecutorCredentialInput, IssuedExecutorCredential, CoreInstallation, CoreInstallationConfiguration, CoreInstallationSetting, CoreAddressBindings } from "./admin-types";
 
 export type { DiagnosticFailureCode, NativeFailureCode, ConnectionFailureParams, ProvisioningFailureParams, DiagnosticFailure, SessionDiagnosticFailure, SessionDiagnostics, ItemDiagnosticTiming, TurnDiagnostics } from "./session-diagnostics";
diff --git a/packages/agents-client/src/sessions-list.test.ts b/packages/agents-client/src/sessions-list.test.ts
deleted file mode 100644
index c7197d9d5..000000000
--- a/packages/agents-client/src/sessions-list.test.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { OpenAIAgentsClient } from "./client";
-import templates from "./fixtures/parsar-d3f55046/environment-templates.json";
-
-interface FetchCall {
-  input: RequestInfo | URL;
-  init?: RequestInit;
-}
-
-function recordingClient(...bodies: unknown[]): { client: OpenAIAgentsClient; calls: FetchCall[] } {
-  const calls: FetchCall[] = [];
-  const client = new OpenAIAgentsClient({
-    token: "test-token",
-    fetch: (async (input: RequestInfo | URL, init?: RequestInit) => {
-      calls.push({ input, init });
-      const body = bodies[Math.min(calls.length - 1, bodies.length - 1)];
-      return new Response(JSON.stringify(body), { status: 200, headers: { "Content-Type": "application/json" } });
-    }) as typeof fetch,
-  });
-  return { client, calls };
-}
-
-const ids = [
-  "11111111-1111-4111-8111-111111111111",
-  "22222222-2222-4222-8222-222222222222",
-  "33333333-3333-4333-8333-333333333333",
-  "44444444-4444-4444-8444-444444444444",
-  "55555555-5555-4555-8555-555555555555",
-] as const;
-
-function session(id: string, createdAt: number, overrides: Record<string, unknown> = {}): Record<string, unknown> {
-  return {
-    id,
-    object: "agent.session",
-    agent: {
-      id: "agent",
-      model: "provider/model",
-      name: null,
-      instructions: null,
-      multi_agent: { enabled: false, max_concurrent_subagents: null },
-      reasoning: {},
-      service_tier: "auto",
-      text: { format: { type: "text" }, verbosity: "medium" },
-      tools: [],
-    },
-    environment: { type: "none" },
-    status: "idle",
-    error: null,
-    metadata: {},
-    required_actions: [],
-    vault_ids: [],
-    usage: null,
-    created_at: createdAt,
-    last_active_at: createdAt,
-    ...overrides,
-  };
-}
-
-/** A Core page whose cursors name the first and last entries as returned. */
-function page(data: unknown[], hasMore = false): Record<string, unknown> {
-  const entryId = (entry: unknown) => (entry as { id?: unknown } | null)?.id ?? null;
-  return {
-    object: "list",
-    data,
-    has_more: hasMore,
-    first_id: data.length > 0 ? entryId(data[0]) : null,
-    last_id: data.length > 0 ? entryId(data.at(-1)) : null,
-  };
-}
-
-const newest = session(ids[0], 500);
-const malformed = session(ids[1], 400, { status: "paused" });
-const older = session(ids[2], 300);
-
-describe("tolerant Session list", () => {
-  it("keeps the other Sessions of a page and reports only the malformed entry", async () => {
-    const { client, calls } = recordingClient(page([newest, malformed, older]));
-
-    const listed = await client.listSessionsTolerant({ limit: 3, agentId: "agent" });
-
-    expect(String(calls[0]?.input)).toBe("/v1/agents/sessions?limit=3&agent_id=agent");
-    expect(new Headers(calls[0]?.init?.headers).get("OpenAI-Beta")).toBe("agents=v1");
-    expect(listed.data.map((entry) => entry.id)).toEqual([ids[0], ids[2]]);
-    expect(listed.unrecognized).toEqual([{ index: 1, id: ids[1] }]);
-    expect(listed).toMatchObject({ object: "list", has_more: false, first_id: ids[0], last_id: ids[2] });
-    expect(JSON.stringify(listed)).not.toContain("paused");
-  });
-
-  it("reports an entry without a Session ID by index only", async () => {
-    const { client } = recordingClient(page([
-      newest,
-      { ...older, id: "notes.txt", object: "file" },
-      null,
-      session(ids[3], 200),
-    ]));
-
-    const listed = await client.listSessionsTolerant();
-
-    expect(listed.data.map((entry) => entry.id)).toEqual([ids[0], ids[3]]);
-    expect(listed.unrecognized).toEqual([{ index: 1, id: null }, { index: 2, id: null }]);
-  });
-
-  it("continues pagination from a page that ends in an unrecognized Session", async () => {
-    const trailing = session(ids[2], 300, { environment: { type: "openai_hosted", id: "environment" } });
-    const { client, calls } = recordingClient(
-      page([newest, session(ids[1], 400), trailing], true),
-      page([session(ids[3], 200), session(ids[4], 100)]),
-    );
-
-    const first = await client.listSessionsTolerant({ limit: 3 });
-    const second = await client.listSessionsTolerant({ limit: 3, after: first.last_id! });
-
-    expect(first.unrecognized).toEqual([{ index: 2, id: ids[2] }]);
-    expect(first).toMatchObject({ has_more: true, last_id: ids[2] });
-    expect(String(calls[1]?.input)).toBe(`/v1/agents/sessions?after=${ids[2]}&limit=3`);
-    expect(second.data.map((entry) => entry.id)).toEqual([ids[3], ids[4]]);
-    expect(second.unrecognized).toEqual([]);
-    expect(second.has_more).toBe(false);
-  });
-
-  it("keeps a page of only unrecognized Sessions readable", async () => {
-    const unknownFirst = { ...newest, future: true };
-    const idless = { ...older, id: 7 };
-    const { client } = recordingClient({ object: "list", data: [unknownFirst, idless], has_more: true, first_id: ids[0], last_id: ids[4] });
-
-    const listed = await client.listSessionsTolerant();
-
-    expect(listed.data).toEqual([]);
-    expect(listed.unrecognized).toEqual([{ index: 0, id: ids[0] }, { index: 1, id: null }]);
-    expect(listed.last_id).toBe(ids[4]);
-  });
-
-  it("recognizes a Session created from an advanced Template", async () => {
-    const environment = templates.responses.session_environment_from_advanced_template.body;
-    const { client } = recordingClient(page([session(ids[0], 500, { environment })]));
-
-    const listed = await client.listSessionsTolerant();
-
-    expect(listed.unrecognized).toEqual([]);
-    expect(listed.data[0]?.environment).toEqual(environment);
-  });
-
-  it.each([
-    ["a missing has_more", { object: "list", data: [newest], first_id: ids[0], last_id: ids[0] }],
-    ["an unexpected envelope field", { ...page([newest]), next: null }],
-    ["another object type", { ...page([newest]), object: "page" }],
-    ["data that is not a list", { ...page([]), data: {} }],
-    ["a first_id that differs from the first Session", { ...page([newest, older]), first_id: ids[2] }],
-    ["a last_id that differs from an unrecognized last entry", { ...page([newest, malformed]), last_id: ids[0] }],
-    ["a missing cursor beside an unidentified entry", { ...page([newest, null]), last_id: null }],
-    ["cursors on an empty page", { ...page([]), first_id: ids[0] }],
-    ["more after an empty page", page([], true)],
-    ["a duplicate Session", page([newest, newest])],
-    ["a duplicate unrecognized Session", page([newest, { ...malformed, id: ids[0] }])],
-    ["Sessions out of creation order", page([older, newest])],
-  ])("still fails the whole page for %s", async (_label, body) => {
-    const { client } = recordingClient(body);
-
-    await expect(client.listSessionsTolerant()).rejects.toMatchObject({ status: 502, code: "invalid_session_list" });
-  });
-
-  it("checks the page size and order against the request", async () => {
-    const oversized = recordingClient(page([newest, older]));
-    await expect(oversized.client.listSessionsTolerant({ limit: 1 })).rejects.toMatchObject({ code: "invalid_session_list" });
-
-    const ascending = recordingClient(page([older, newest]));
-    await expect(ascending.client.listSessionsTolerant({ order: "asc" })).resolves.toMatchObject({ data: [{ id: ids[2] }, { id: ids[0] }] });
-  });
-
-  it.each([[{ limit: 0 }], [{ limit: 101 }], [{ limit: 1.5 }], [{ order: "newest" }]])(
-    "refuses %j before any request",
-    async (options) => {
-      const { client, calls } = recordingClient(page([]));
-
-      await expect(client.listSessionsTolerant(options as never)).rejects.toBeInstanceOf(TypeError);
-      expect(calls).toHaveLength(0);
-    },
-  );
-
-  it("leaves the strict list failing on the same malformed Session", async () => {
-    const { client } = recordingClient(page([newest, malformed, older]));
-
-    await expect(client.listSessions()).rejects.toMatchObject({ status: 502, code: "invalid_session_resource" });
-  });
-});
diff --git a/packages/agents-client/src/types.ts b/packages/agents-client/src/types.ts
index 56346dee0..bb75dc520 100644
--- a/packages/agents-client/src/types.ts
+++ b/packages/agents-client/src/types.ts
@@ -696,32 +696,6 @@ export interface SessionListOptions extends PageOptions {
   agentId?: string;
 }
 
-/**
- * A listed Session this client does not recognize, for example one with an
- * unknown field or value. Nothing of it is kept or guessed beyond its position
- * and, when it has Core's Session ID form, its raw ID.
- */
-export interface UnrecognizedSession {
-  /** Position of the entry in the page as Core returned it. */
-  index: number;
-  /** Raw ID when it is a Session ID (a UUID); otherwise null. */
-  id: string | null;
-}
-
-/**
- * One Session page read tolerantly: `data` holds the recognized Sessions in
- * page order and `unrecognized` every other entry. The envelope and cursors
- * are Core's own; `first_id` and `last_id` may name an unrecognized entry.
- */
-export interface TolerantSessionList {
-  object: "list";
-  data: AgentSession[];
-  unrecognized: UnrecognizedSession[];
-  has_more: boolean;
-  first_id: string | null;
-  last_id: string | null;
-}
-
 /** Common preparation for both managed and user-owned Runtime locations. */
 export interface EnvironmentCapabilityArchiveInput {
   type: "inline";
@@ -1330,9 +1304,7 @@ export interface AgentCore {
   retrieveVaultCredential(vaultId: string, credentialId: string, options?: ReadOptions): Promise<VaultCredential>;
   replaceVaultCredentialToken(vaultId: string, credentialId: string, input: ReplaceVaultCredentialTokenInput): Promise<VaultCredential>;
   deleteVaultCredential(vaultId: string, credentialId: string): Promise<VaultCredentialDeleted>;
-  listSessions(options?: PageOptions & { agentId?: string }): Promise<ListPage<AgentSession>>;
-  /** Like listSessions, but a malformed Session is reported instead of failing the page. */
-  listSessionsTolerant(options?: SessionListOptions): Promise<TolerantSessionList>;
+  listSessions(options?: SessionListOptions): Promise<ListPage<AgentSession>>;
   createSession(input: CreateSessionInput, idempotencyKey?: string): Promise<AgentSession>;
   createSessionStream(
     input: Omit<CreateSessionInput, "stream">,
diff --git a/scripts/build-core-distribution.sh b/scripts/build-core-distribution.sh
index e2db4d6dd..ac40a609a 100755
--- a/scripts/build-core-distribution.sh
+++ b/scripts/build-core-distribution.sh
@@ -144,7 +144,7 @@ docker run --rm --network none --entrypoint /bin/sh \
 
 OAC_DEV_WEB_BUILD_DIR="$stage/web" scripts/build-web.sh
 pnpm --filter @oac/web... install --frozen-lockfile
-OAC_WEB_OPENAI_HOSTED_SESSIONS=1 OAC_WEB_ENVIRONMENT_FILES=1 pnpm build:web
+pnpm build:web
 cp -R apps/web/dist "$stage/web/dist"
 cp services/web/Dockerfile "$stage/web/Dockerfile"
 build_image web "$stage/web"
diff --git a/services/core/internal/adminaudit/reader.go b/services/core/internal/adminaudit/reader.go
index 1c4408259..81265e682 100644
--- a/services/core/internal/adminaudit/reader.go
+++ b/services/core/internal/adminaudit/reader.go
@@ -2,7 +2,6 @@ package adminaudit
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"time"
 
@@ -30,17 +29,16 @@ type Filter struct {
 // Operation is one administrator write. ProjectID is null for
 // deployment-wide writes, such as deployment default model providers.
 type Operation struct {
-	ID                string          `json:"id"`
-	CreatedAt         time.Time       `json:"created_at"`
-	AdminCredentialID string          `json:"admin_credential_id"`
-	ActorLabel        string          `json:"actor_label"`
-	Action            string          `json:"action"`
-	ProjectID         *string         `json:"project_id" extensions:"x-nullable"`
-	ResourceType      string          `json:"resource_type"`
-	ResourceID        string          `json:"resource_id"`
-	ResultIDs         json.RawMessage `json:"result_ids" swaggertype:"array,object"`
-	RequestID         string          `json:"request_id"`
-	TraceID           string          `json:"trace_id"`
+	ID                string    `json:"id"`
+	CreatedAt         time.Time `json:"created_at"`
+	AdminCredentialID string    `json:"admin_credential_id"`
+	ActorLabel        string    `json:"actor_label"`
+	Action            string    `json:"action"`
+	ProjectID         *string   `json:"project_id" extensions:"x-nullable"`
+	ResourceType      string    `json:"resource_type"`
+	ResourceID        string    `json:"resource_id"`
+	RequestID         string    `json:"request_id"`
+	TraceID           string    `json:"trace_id"`
 }
 
 type Page struct {
diff --git a/services/core/internal/db/queries/admin_audit.sql b/services/core/internal/db/queries/admin_audit.sql
index 57d133e76..7b54205f5 100644
--- a/services/core/internal/db/queries/admin_audit.sql
+++ b/services/core/internal/db/queries/admin_audit.sql
@@ -1,4 +1,4 @@
 -- name: InsertAdminAudit :one
-INSERT INTO admin_audit_log (id,tenant_id,admin_credential_id,actor_label,action,project_id,resource_type,resource_id,result_ids,request_id,trace_id)
-VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)
+INSERT INTO admin_audit_log (id,tenant_id,admin_credential_id,actor_label,action,project_id,resource_type,resource_id,request_id,trace_id)
+VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)
 RETURNING id;
diff --git a/services/core/internal/db/queries/admin_history.sql b/services/core/internal/db/queries/admin_history.sql
index 79e0aadd2..38c69cfe7 100644
--- a/services/core/internal/db/queries/admin_history.sql
+++ b/services/core/internal/db/queries/admin_history.sql
@@ -11,7 +11,3 @@ ORDER BY created_at DESC,id DESC LIMIT sqlc.arg(page_limit);
 
 -- name: AdminAuditCursor :one
 SELECT created_at FROM admin_audit_log WHERE id=$1;
-
--- name: GetAdminResourceOwners :many
-SELECT resource_id,audit_id FROM admin_resource_owners
-WHERE tenant_id=$1 AND resource_type=$2 AND resource_id=ANY($3::text[]);
diff --git a/services/core/internal/db/sqlc/admin_audit.sql.go b/services/core/internal/db/sqlc/admin_audit.sql.go
index 534e5b7b7..74a6e7d91 100644
--- a/services/core/internal/db/sqlc/admin_audit.sql.go
+++ b/services/core/internal/db/sqlc/admin_audit.sql.go
@@ -12,8 +12,8 @@ import (
 )
 
 const insertAdminAudit = `-- name: InsertAdminAudit :one
-INSERT INTO admin_audit_log (id,tenant_id,admin_credential_id,actor_label,action,project_id,resource_type,resource_id,result_ids,request_id,trace_id)
-VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)
+INSERT INTO admin_audit_log (id,tenant_id,admin_credential_id,actor_label,action,project_id,resource_type,resource_id,request_id,trace_id)
+VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)
 RETURNING id
 `
 
@@ -26,7 +26,6 @@ type InsertAdminAuditParams struct {
 	ProjectID         pgtype.UUID `json:"project_id"`
 	ResourceType      string      `json:"resource_type"`
 	ResourceID        string      `json:"resource_id"`
-	ResultIds         []byte      `json:"result_ids"`
 	RequestID         string      `json:"request_id"`
 	TraceID           string      `json:"trace_id"`
 }
@@ -41,7 +40,6 @@ func (q *Queries) InsertAdminAudit(ctx context.Context, arg InsertAdminAuditPara
 		arg.ProjectID,
 		arg.ResourceType,
 		arg.ResourceID,
-		arg.ResultIds,
 		arg.RequestID,
 		arg.TraceID,
 	)
diff --git a/services/core/internal/db/sqlc/admin_history.sql.go b/services/core/internal/db/sqlc/admin_history.sql.go
index 3dc787916..fdc4b6ee2 100644
--- a/services/core/internal/db/sqlc/admin_history.sql.go
+++ b/services/core/internal/db/sqlc/admin_history.sql.go
@@ -22,44 +22,8 @@ func (q *Queries) AdminAuditCursor(ctx context.Context, id pgtype.UUID) (pgtype.
 	return created_at, err
 }
 
-const getAdminResourceOwners = `-- name: GetAdminResourceOwners :many
-SELECT resource_id,audit_id FROM admin_resource_owners
-WHERE tenant_id=$1 AND resource_type=$2 AND resource_id=ANY($3::text[])
-`
-
-type GetAdminResourceOwnersParams struct {
-	TenantID     pgtype.UUID `json:"tenant_id"`
-	ResourceType string      `json:"resource_type"`
-	Column3      []string    `json:"column_3"`
-}
-
-type GetAdminResourceOwnersRow struct {
-	ResourceID string      `json:"resource_id"`
-	AuditID    pgtype.UUID `json:"audit_id"`
-}
-
-func (q *Queries) GetAdminResourceOwners(ctx context.Context, arg GetAdminResourceOwnersParams) ([]GetAdminResourceOwnersRow, error) {
-	rows, err := q.db.Query(ctx, getAdminResourceOwners, arg.TenantID, arg.ResourceType, arg.Column3)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	items := []GetAdminResourceOwnersRow{}
-	for rows.Next() {
-		var i GetAdminResourceOwnersRow
-		if err := rows.Scan(&i.ResourceID, &i.AuditID); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
 const listAdminAuditLog = `-- name: ListAdminAuditLog :many
-SELECT id, tenant_id, project_id, admin_credential_id, actor_label, action, resource_type, resource_id, result_ids, request_id, trace_id, created_at FROM admin_audit_log
+SELECT id, tenant_id, project_id, admin_credential_id, actor_label, action, resource_type, resource_id, request_id, trace_id, created_at FROM admin_audit_log
 WHERE ($1::text='' OR project_id::text=$1)
  AND ($2::text='' OR resource_type=$2)
  AND ($3::text='' OR resource_id=$3)
@@ -110,7 +74,6 @@ func (q *Queries) ListAdminAuditLog(ctx context.Context, arg ListAdminAuditLogPa
 			&i.Action,
 			&i.ResourceType,
 			&i.ResourceID,
-			&i.ResultIds,
 			&i.RequestID,
 			&i.TraceID,
 			&i.CreatedAt,
diff --git a/services/core/internal/db/sqlc/models.go b/services/core/internal/db/sqlc/models.go
index eca6abc6f..134170554 100644
--- a/services/core/internal/db/sqlc/models.go
+++ b/services/core/internal/db/sqlc/models.go
@@ -8,14 +8,6 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
-type AdminAssetCopy struct {
-	TargetTenantID pgtype.UUID `json:"target_tenant_id"`
-	IdempotencyKey string      `json:"idempotency_key"`
-	RequestHash    []byte      `json:"request_hash"`
-	Result         []byte      `json:"result"`
-	AuditID        pgtype.UUID `json:"audit_id"`
-}
-
 type AdminAuditLog struct {
 	ID                pgtype.UUID        `json:"id"`
 	TenantID          pgtype.UUID        `json:"tenant_id"`
@@ -25,20 +17,11 @@ type AdminAuditLog struct {
 	Action            string             `json:"action"`
 	ResourceType      string             `json:"resource_type"`
 	ResourceID        string             `json:"resource_id"`
-	ResultIds         []byte             `json:"result_ids"`
 	RequestID         string             `json:"request_id"`
 	TraceID           string             `json:"trace_id"`
 	CreatedAt         pgtype.Timestamptz `json:"created_at"`
 }
 
-type AdminResourceOwner struct {
-	TenantID     pgtype.UUID `json:"tenant_id"`
-	ResourceType string      `json:"resource_type"`
-	ResourceID   string      `json:"resource_id"`
-	ParentID     string      `json:"parent_id"`
-	AuditID      pgtype.UUID `json:"audit_id"`
-}
-
 type Agent struct {
 	ID            pgtype.UUID        `json:"id"`
 	TenantID      pgtype.UUID        `json:"tenant_id"`
diff --git a/services/core/internal/persistence/postgres/agentpg/store_test.go b/services/core/internal/persistence/postgres/agentpg/store_test.go
index f0f4bdcee..2d30e5b2e 100644
--- a/services/core/internal/persistence/postgres/agentpg/store_test.go
+++ b/services/core/internal/persistence/postgres/agentpg/store_test.go
@@ -511,8 +511,8 @@ func TestAgentModelExecutionConcurrentSnapshots(t *testing.T) {
 
 func auditContext(ctx context.Context, tenant, request, key string) context.Context {
 	return writeaudit.WithSource(ctx, writeaudit.Source{
-		KeyID: "static:" + strings.Repeat(key, 64), Name: "agent audit fixture", Prefix: strings.Repeat(key, 8),
-		Kind: "static", TenantID: tenant, RequestID: request, TraceID: "agent-audit-trace",
+		KeyID: strings.ReplaceAll("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", "x", key), Name: "agent audit fixture", Prefix: "pc_" + strings.Repeat(key, 8),
+		Kind: "issued", TenantID: tenant, RequestID: request, TraceID: "agent-audit-trace",
 	})
 }
 
@@ -688,7 +688,7 @@ func TestAgentWriteRejectsInvalidAuditSource(t *testing.T) {
 	pool := pgtest.Open(t)
 	_, service := open(t, pool, nil)
 	tenant := uuid.NewString()
-	ctx := writeaudit.WithSource(t.Context(), writeaudit.Source{KeyID: "static:" + strings.Repeat("a", 64), Prefix: "aaaaaaaa", Kind: "static", TenantID: tenant, RequestID: uuid.NewString()})
+	ctx := writeaudit.WithSource(t.Context(), writeaudit.Source{KeyID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", Prefix: "pc_aaaaaaaa", Kind: "issued", TenantID: tenant, RequestID: uuid.NewString()})
 	if _, err := service.Create(ctx, agents.CreateCommand{TenantID: tenant, Configuration: []byte(`{"model":"x"}`)}); !errors.Is(err, writeaudit.ErrInvalidSource) {
 		t.Fatalf("invalid source accepted: %v", err)
 	}
diff --git a/services/core/internal/persistence/postgres/auditpg/admin_audit.go b/services/core/internal/persistence/postgres/auditpg/admin_audit.go
index 61e8dfea5..ff0dc6372 100644
--- a/services/core/internal/persistence/postgres/auditpg/admin_audit.go
+++ b/services/core/internal/persistence/postgres/auditpg/admin_audit.go
@@ -55,7 +55,7 @@ func (s *Store) ListAdminAudit(ctx context.Context, filter adminaudit.Filter) (a
 		rows = rows[:filter.Limit]
 	}
 	for _, row := range rows {
-		page.Data = append(page.Data, adminaudit.Operation{ID: uuid.UUID(row.ID.Bytes).String(), CreatedAt: row.CreatedAt.Time, AdminCredentialID: row.AdminCredentialID, ActorLabel: row.ActorLabel, Action: row.Action, ProjectID: projectID(row.ProjectID), ResourceType: row.ResourceType, ResourceID: row.ResourceID, ResultIDs: row.ResultIds, RequestID: row.RequestID, TraceID: row.TraceID})
+		page.Data = append(page.Data, adminaudit.Operation{ID: uuid.UUID(row.ID.Bytes).String(), CreatedAt: row.CreatedAt.Time, AdminCredentialID: row.AdminCredentialID, ActorLabel: row.ActorLabel, Action: row.Action, ProjectID: projectID(row.ProjectID), ResourceType: row.ResourceType, ResourceID: row.ResourceID, RequestID: row.RequestID, TraceID: row.TraceID})
 	}
 	if page.HasMore {
 		page.NextCursor = encodeCursor(page.Data[len(page.Data)-1].ID, scope)
diff --git a/services/core/internal/persistence/postgres/auditpg/auditpg_test.go b/services/core/internal/persistence/postgres/auditpg/auditpg_test.go
index bc079bd71..1c4e52a38 100644
--- a/services/core/internal/persistence/postgres/auditpg/auditpg_test.go
+++ b/services/core/internal/persistence/postgres/auditpg/auditpg_test.go
@@ -29,10 +29,8 @@ func openAudit(t *testing.T) (*pgunit.Pool, *auditpg.Store) {
 
 func uuidOf(id string) pgtype.UUID { return pgtype.UUID{Bytes: uuid.MustParse(id), Valid: true} }
 
-func staticSource(tenant string) writeaudit.Source {
-	sum := sha256.Sum256([]byte(uuid.NewString()))
-	digest := hex.EncodeToString(sum[:])
-	return writeaudit.Source{KeyID: "static:" + digest, Prefix: digest[:8], Name: "test key", Kind: "static", TenantID: tenant, RequestID: uuid.NewString(), TraceID: uuid.NewString()}
+func issuedSource(tenant string) writeaudit.Source {
+	return writeaudit.Source{KeyID: uuid.NewString(), Prefix: "pc_" + uuid.NewString()[:8], Name: "test key", Kind: "issued", TenantID: tenant, RequestID: uuid.NewString(), TraceID: uuid.NewString()}
 }
 
 func adminSource(projectID string) adminaudit.Source {
@@ -101,7 +99,7 @@ func exec(t *testing.T, pool *pgunit.Pool, sql string, args ...any) {
 func TestWriteAuditCommitsAndRollsBackWithTheBusinessWrite(t *testing.T) {
 	pool, audit := openAudit(t)
 	tenant := uuid.NewString()
-	source := staticSource(tenant)
+	source := issuedSource(tenant)
 	for _, failure := range []string{"", "after_audit", "invalid_source", "database_audit_failure"} {
 		t.Run(failure, func(t *testing.T) {
 			id := uuid.NewString()
@@ -169,7 +167,7 @@ func TestWriteWithoutProvenanceStaysUnattributed(t *testing.T) {
 		t.Fatalf("unattributed write: %+v %v", page, err)
 	}
 	owners, err := audit.GetResourceOwners(t.Context(), tenant, "agent", []string{id})
-	if err != nil || owners[0].APIKey != nil || owners[0].Source != nil {
+	if err != nil || owners[0].APIKey != nil {
 		t.Fatalf("unattributed owner: %+v %v", owners, err)
 	}
 }
@@ -177,7 +175,7 @@ func TestWriteWithoutProvenanceStaysUnattributed(t *testing.T) {
 // Malformed provenance fails closed before any statement runs, so a nil q
 // shows that nothing reached the database.
 func TestMalformedProvenanceFailsClosed(t *testing.T) {
-	valid := staticSource(uuid.NewString())
+	valid := issuedSource(uuid.NewString())
 	for _, field := range []string{"tenant", "key", "prefix", "kind", "request", "trace", "name", "action", "resource_type", "created_type", "resource_id"} {
 		source, action, kind, id := valid, "create", "agent", "resource"
 		created := []writeaudit.Resource{{Type: "agent", ID: "resource"}}
@@ -185,11 +183,11 @@ func TestMalformedProvenanceFailsClosed(t *testing.T) {
 		case "tenant":
 			source.TenantID = uuid.NewString()
 		case "key":
-			source.KeyID = "static:abcd"
+			source.KeyID = "key"
 		case "prefix":
 			source.Prefix = "bad"
 		case "kind":
-			source.Kind = "unknown"
+			source.Kind = "static"
 		case "request":
 			source.RequestID = ""
 		case "trace":
@@ -238,7 +236,7 @@ func TestAdministratorProvenance(t *testing.T) {
 	pool, audit := openAudit(t)
 	p := createProject(t, pool)
 	id := uuid.NewString()
-	ctx := adminaudit.WithSource(writeaudit.WithSource(t.Context(), staticSource(p.tenant)), adminSource(p.id))
+	ctx := adminaudit.WithSource(writeaudit.WithSource(t.Context(), issuedSource(p.tenant)), adminSource(p.id))
 	if err := record(t, pool, ctx, func(ctx context.Context, q *sqlc.Queries) error {
 		if err := createAgent(ctx, q, p.tenant, id); err != nil {
 			return err
@@ -283,14 +281,13 @@ func TestAdministratorProvenance(t *testing.T) {
 func TestWriteAuditOwnersIdentityReplayAndRevocation(t *testing.T) {
 	pool, audit := openAudit(t)
 	tenant := uuid.NewString()
-	a := staticSource(tenant)
+	a := issuedSource(tenant)
 	id, implicit := uuid.NewString(), uuid.NewString()
 	recordWrite(t, pool, a, "create", "session", id, writeaudit.Resource{Type: "session", ID: id}, writeaudit.Resource{Type: "environment", ID: implicit, ParentID: id})
 	// Same request may reach a commit receipt twice but cannot create another owner.
 	replayID := uuid.NewString()
 	recordWrite(t, pool, a, "create", "session", id, writeaudit.Resource{Type: "session", ID: replayID})
-	b := staticSource(tenant)
-	b.Kind = "console"
+	b := issuedSource(tenant)
 	recordWrite(t, pool, b, "update", "session", id)
 	owners, err := audit.GetResourceOwners(t.Context(), tenant, "session", []string{replayID, id, id, "historical"})
 	if err != nil || len(owners) != 4 || owners[0].APIKey != nil || owners[1].APIKey.ID != a.KeyID || owners[2].APIKey.ID != a.KeyID || owners[3].APIKey != nil {
@@ -305,7 +302,7 @@ func TestWriteAuditOwnersIdentityReplayAndRevocation(t *testing.T) {
 		t.Fatalf("foreign owner: %+v %v", foreign, err)
 	}
 	page, err := audit.ListWriteOperations(t.Context(), tenant, writeaudit.Filter{ResourceID: id})
-	if err != nil || len(page.Data) != 2 || page.Data[0].APIKey.Kind != "console" || page.Data[1].APIKey.ID != a.KeyID {
+	if err != nil || len(page.Data) != 2 || page.Data[0].APIKey.ID != b.KeyID || page.Data[1].APIKey.ID != a.KeyID {
 		t.Fatalf("request dedup or key identity: %+v %v", page, err)
 	}
 	p := createProject(t, pool)
@@ -317,8 +314,8 @@ func TestWriteAuditOwnersIdentityReplayAndRevocation(t *testing.T) {
 	}); err != nil {
 		t.Fatal(err)
 	}
-	c := staticSource(p.tenant)
-	c.KeyID, c.Name, c.Prefix, c.Kind = keyID, "issued key", "pc_"+hex.EncodeToString(sum[:4]), "issued"
+	c := issuedSource(p.tenant)
+	c.KeyID, c.Name, c.Prefix = keyID, "issued key", "pc_"+hex.EncodeToString(sum[:4])
 	fileID := "file_" + uuid.NewString()
 	recordWrite(t, pool, c, "create", "file", fileID, writeaudit.Resource{Type: "file", ID: fileID})
 	if err := record(t, pool, t.Context(), func(ctx context.Context, q *sqlc.Queries) error {
@@ -337,28 +334,10 @@ func TestWriteAuditOwnersIdentityReplayAndRevocation(t *testing.T) {
 	}
 }
 
-// The copy operation was removed; its committed provenance must stay readable.
-func TestHistoricalAdminCopyProvenance(t *testing.T) {
-	pool, audit := openAudit(t)
-	p := createProject(t, pool)
-	auditID, agentID := uuid.NewString(), uuid.NewString()
-	exec(t, pool, `INSERT INTO admin_audit_log(id,tenant_id,project_id,admin_credential_id,actor_label,action,resource_type,resource_id,result_ids,request_id,trace_id)
-		VALUES($1,$2,$3,'digest','admin','copy','agent','source-agent',$4::jsonb,'request','trace')`, auditID, p.tenant, p.id, `[{"type":"agent","source_id":"source-agent","target_id":"`+agentID+`"}]`)
-	exec(t, pool, "INSERT INTO admin_resource_owners(tenant_id,resource_type,resource_id,audit_id) VALUES($1,'agent',$2,$3)", p.tenant, agentID, auditID)
-	owners, err := audit.GetResourceOwners(t.Context(), p.tenant, "agent", []string{agentID})
-	if err != nil || len(owners) != 1 || owners[0].APIKey != nil || owners[0].Source == nil || *owners[0].Source != "admin_copy" || owners[0].AdminAuditID == nil || *owners[0].AdminAuditID != auditID {
-		t.Fatalf("historical copy owner: %+v %v", owners, err)
-	}
-	page, err := audit.ListAdminAudit(t.Context(), adminaudit.Filter{ProjectID: p.id, Action: "copy"})
-	if err != nil || len(page.Data) != 1 || page.Data[0].ID != auditID || !strings.Contains(string(page.Data[0].ResultIDs), agentID) {
-		t.Fatalf("historical copy audit: %+v %v", page, err)
-	}
-}
-
 func TestWriteAuditCursorFiltersAndRetention(t *testing.T) {
 	pool, audit := openAudit(t)
 	tenant, id := uuid.NewString(), uuid.NewString()
-	source := staticSource(tenant)
+	source := issuedSource(tenant)
 	if err := record(t, pool, t.Context(), func(ctx context.Context, q *sqlc.Queries) error { return createAgent(ctx, q, tenant, id) }); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/persistence/postgres/auditpg/record.go b/services/core/internal/persistence/postgres/auditpg/record.go
index 7543c214c..651afe523 100644
--- a/services/core/internal/persistence/postgres/auditpg/record.go
+++ b/services/core/internal/persistence/postgres/auditpg/record.go
@@ -80,8 +80,7 @@ func RecordAdminMutation(ctx context.Context, q *sqlc.Queries, tenant, action, r
 	if err != nil {
 		return adminaudit.ErrInvalidSource
 	}
-	// result_ids is retained for historical copy mappings; current writes record none.
-	_, err = q.InsertAdminAudit(ctx, sqlc.InsertAdminAuditParams{ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, TenantID: tenantID, AdminCredentialID: source.CredentialID, ActorLabel: source.ActorLabel, Action: action, ProjectID: projectID, ResourceType: resourceType, ResourceID: resourceID, ResultIds: []byte(`[]`), RequestID: source.RequestID, TraceID: source.TraceID})
+	_, err = q.InsertAdminAudit(ctx, sqlc.InsertAdminAuditParams{ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, TenantID: tenantID, AdminCredentialID: source.CredentialID, ActorLabel: source.ActorLabel, Action: action, ProjectID: projectID, ResourceType: resourceType, ResourceID: resourceID, RequestID: source.RequestID, TraceID: source.TraceID})
 	return err
 }
 
@@ -96,6 +95,6 @@ func RecordDeploymentMutation(ctx context.Context, q *sqlc.Queries, action, reso
 	if err := source.ValidateDeploymentMutation(action, resourceType, resourceID); err != nil {
 		return err
 	}
-	_, err := q.InsertAdminAudit(ctx, sqlc.InsertAdminAuditParams{ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, AdminCredentialID: source.CredentialID, ActorLabel: source.ActorLabel, Action: action, ResourceType: resourceType, ResourceID: resourceID, ResultIds: []byte(`[]`), RequestID: source.RequestID, TraceID: source.TraceID})
+	_, err := q.InsertAdminAudit(ctx, sqlc.InsertAdminAuditParams{ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, AdminCredentialID: source.CredentialID, ActorLabel: source.ActorLabel, Action: action, ResourceType: resourceType, ResourceID: resourceID, RequestID: source.RequestID, TraceID: source.TraceID})
 	return err
 }
diff --git a/services/core/internal/persistence/postgres/auditpg/write_operations.go b/services/core/internal/persistence/postgres/auditpg/write_operations.go
index 806143272..30def5fac 100644
--- a/services/core/internal/persistence/postgres/auditpg/write_operations.go
+++ b/services/core/internal/persistence/postgres/auditpg/write_operations.go
@@ -24,9 +24,8 @@ func apiKey(id, name, prefix, kind string, revoked pgtype.Timestamptz) writeaudi
 	return key
 }
 
-// GetResourceOwners returns each resource's recorded creator in request order.
-// A resource created through a removed administrator copy reports that audit
-// entry instead of a key.
+// GetResourceOwners returns each resource's recorded creating key in request
+// order.
 func (s *Store) GetResourceOwners(ctx context.Context, tenantID, resourceType string, resourceIDs []string) ([]writeaudit.ResourceOwner, error) {
 	tenant, err := pgunit.ParseID(tenantID)
 	if err != nil {
@@ -36,24 +35,12 @@ func (s *Store) GetResourceOwners(ctx context.Context, tenantID, resourceType st
 		return nil, err
 	}
 	keys := make(map[string]writeaudit.APIKey, len(resourceIDs))
-	admins := make(map[string]string)
 	err = s.pool.Snapshot(ctx, func(ctx context.Context, tx pgx.Tx) error {
-		q := sqlc.New(tx)
-		rows, err := q.GetResourceOwners(ctx, sqlc.GetResourceOwnersParams{TenantID: tenant, ResourceType: resourceType, Column3: resourceIDs})
-		if err != nil {
-			return err
-		}
+		rows, err := sqlc.New(tx).GetResourceOwners(ctx, sqlc.GetResourceOwnersParams{TenantID: tenant, ResourceType: resourceType, Column3: resourceIDs})
 		for _, row := range rows {
 			keys[row.ResourceID] = apiKey(row.KeyID, row.KeyName, row.KeyPrefix, row.KeyKind, row.RevokedAt)
 		}
-		adminRows, err := q.GetAdminResourceOwners(ctx, sqlc.GetAdminResourceOwnersParams{TenantID: tenant, ResourceType: resourceType, Column3: resourceIDs})
-		if err != nil {
-			return err
-		}
-		for _, row := range adminRows {
-			admins[row.ResourceID] = uuid.UUID(row.AuditID.Bytes).String()
-		}
-		return nil
+		return err
 	})
 	if err != nil {
 		return nil, err
@@ -63,13 +50,6 @@ func (s *Store) GetResourceOwners(ctx context.Context, tenantID, resourceType st
 		owner := writeaudit.ResourceOwner{ResourceID: id}
 		if key, ok := keys[id]; ok {
 			owner.APIKey = &key
-			source := "api_key"
-			owner.Source = &source
-		}
-		if auditID, ok := admins[id]; ok && owner.APIKey == nil {
-			source := "admin_copy"
-			owner.Source = &source
-			owner.AdminAuditID = &auditID
 		}
 		result = append(result, owner)
 	}
diff --git a/services/core/internal/persistence/postgres/filepg/filepg_test.go b/services/core/internal/persistence/postgres/filepg/filepg_test.go
index 806236399..1b5233769 100644
--- a/services/core/internal/persistence/postgres/filepg/filepg_test.go
+++ b/services/core/internal/persistence/postgres/filepg/filepg_test.go
@@ -153,8 +153,8 @@ func TestFilesRejectInvalidIdentifiers(t *testing.T) {
 
 func auditContext(ctx context.Context, tenant, request string) context.Context {
 	return writeaudit.WithSource(ctx, writeaudit.Source{
-		KeyID: "static:" + strings.Repeat("a", 64), Name: "file audit fixture", Prefix: "aaaaaaaa",
-		Kind: "static", TenantID: tenant, RequestID: request, TraceID: "file-audit-trace",
+		KeyID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", Name: "file audit fixture", Prefix: "pc_aaaaaaaa",
+		Kind: "issued", TenantID: tenant, RequestID: request, TraceID: "file-audit-trace",
 	})
 }
 
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation_test.go b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
index 1b857bb00..65ca06140 100644
--- a/services/core/internal/persistence/postgres/sessionpg/creation_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
@@ -4,8 +4,6 @@ import (
 	"archive/zip"
 	"bytes"
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -608,9 +606,7 @@ func TestCreationAudit(t *testing.T) {
 	pool := pgtest.Open(t)
 	_, service := creationService(t, pool, nil)
 	tenant := uuid.NewString()
-	sum := sha256.Sum256([]byte(uuid.NewString()))
-	digest := hex.EncodeToString(sum[:])
-	source := writeaudit.Source{KeyID: "static:" + digest, Prefix: digest[:8], Name: "test key", Kind: "static", TenantID: uuid.NewString(), RequestID: uuid.NewString(), TraceID: uuid.NewString()}
+	source := writeaudit.Source{KeyID: uuid.NewString(), Prefix: "pc_aaaaaaaa", Name: "test key", Kind: "issued", TenantID: uuid.NewString(), RequestID: uuid.NewString(), TraceID: uuid.NewString()}
 	input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "audited", InitialInputs: []sessions.Input{messageInput("first")},
 		Configuration: json.RawMessage(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)}
 	if _, err := service.CreateSession(writeaudit.WithSource(t.Context(), source), tenant, input); !errors.Is(err, writeaudit.ErrInvalidSource) {
diff --git a/services/core/internal/persistence/postgres/skillpg/audit_test.go b/services/core/internal/persistence/postgres/skillpg/audit_test.go
index 12fca7ed9..de62c39d4 100644
--- a/services/core/internal/persistence/postgres/skillpg/audit_test.go
+++ b/services/core/internal/persistence/postgres/skillpg/audit_test.go
@@ -71,8 +71,8 @@ func prepareAuditMutation(t *testing.T, f fixture, tenant, name string, bundle [
 
 func writeAuditContext(ctx context.Context, tenant, request string) context.Context {
 	return writeaudit.WithSource(ctx, writeaudit.Source{
-		KeyID: "static:" + strings.Repeat("a", 64), Name: "resource audit fixture", Prefix: "aaaaaaaa",
-		Kind: "static", TenantID: tenant, RequestID: request, TraceID: "resource-audit-trace",
+		KeyID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", Name: "resource audit fixture", Prefix: "pc_aaaaaaaa",
+		Kind: "issued", TenantID: tenant, RequestID: request, TraceID: "resource-audit-trace",
 	})
 }
 
@@ -194,12 +194,12 @@ func TestAdminDeleteAuditTransactions(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			var credential, actor, project, trace, action, kind, gotID, mappings, raw string
-			if err := pool.QueryRow(ctx, `SELECT admin_credential_id,actor_label,project_id,trace_id,action,resource_type,resource_id,result_ids::text,to_jsonb(a)::text
- FROM admin_audit_log a WHERE tenant_id=$1 AND request_id=$2`, tenant, request).Scan(&credential, &actor, &project, &trace, &action, &kind, &gotID, &mappings, &raw); err != nil {
+			var credential, actor, project, trace, action, kind, gotID, raw string
+			if err := pool.QueryRow(ctx, `SELECT admin_credential_id,actor_label,project_id,trace_id,action,resource_type,resource_id,to_jsonb(a)::text
+ FROM admin_audit_log a WHERE tenant_id=$1 AND request_id=$2`, tenant, request).Scan(&credential, &actor, &project, &trace, &action, &kind, &gotID, &raw); err != nil {
 				t.Fatal(err)
 			}
-			if credential != "87654321" || actor != "administrator fixture" || project != tenant || trace != "admin-mutation-trace" || action != "delete" || kind != mutation.kind || gotID != id || mappings != "[]" {
+			if credential != "87654321" || actor != "administrator fixture" || project != tenant || trace != "admin-mutation-trace" || action != "delete" || kind != mutation.kind || gotID != id {
 				t.Fatal("administrator audit identity differs")
 			}
 			if strings.Contains(raw, "admin-private-archive") {
diff --git a/services/core/internal/persistence/postgres/templatepg/audit_test.go b/services/core/internal/persistence/postgres/templatepg/audit_test.go
index c59553c32..b4611b238 100644
--- a/services/core/internal/persistence/postgres/templatepg/audit_test.go
+++ b/services/core/internal/persistence/postgres/templatepg/audit_test.go
@@ -48,8 +48,8 @@ func (f fixture) snapshot(t *testing.T) map[string]string {
 
 func writeSource(ctx context.Context, tenant, request string) context.Context {
 	return writeaudit.WithSource(ctx, writeaudit.Source{
-		KeyID: "static:" + strings.Repeat("a", 64), Name: "template audit fixture", Prefix: "aaaaaaaa",
-		Kind: "static", TenantID: tenant, RequestID: request, TraceID: "template-audit-trace",
+		KeyID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", Name: "template audit fixture", Prefix: "pc_aaaaaaaa",
+		Kind: "issued", TenantID: tenant, RequestID: request, TraceID: "template-audit-trace",
 	})
 }
 
@@ -157,11 +157,11 @@ func TestAdminDeleteAuditCommitsWithTheDeletion(t *testing.T) {
 	if err != nil || id != template.ID {
 		t.Fatal(id, err)
 	}
-	var credential, actor, project, trace, action, kind, gotID, mappings, raw string
-	if err := f.pool.QueryRow(t.Context(), `SELECT admin_credential_id,actor_label,project_id,trace_id,action,resource_type,resource_id,result_ids::text,to_jsonb(a)::text FROM admin_audit_log a WHERE tenant_id=$1 AND request_id=$2`, tenant, request).Scan(&credential, &actor, &project, &trace, &action, &kind, &gotID, &mappings, &raw); err != nil {
+	var credential, actor, project, trace, action, kind, gotID, raw string
+	if err := f.pool.QueryRow(t.Context(), `SELECT admin_credential_id,actor_label,project_id,trace_id,action,resource_type,resource_id,to_jsonb(a)::text FROM admin_audit_log a WHERE tenant_id=$1 AND request_id=$2`, tenant, request).Scan(&credential, &actor, &project, &trace, &action, &kind, &gotID, &raw); err != nil {
 		t.Fatal(err)
 	}
-	if credential != "87654321" || actor != "administrator fixture" || project != tenant || trace != "admin-mutation-trace" || action != "delete" || kind != "environment_template" || gotID != id || mappings != "[]" || strings.Contains(raw, "admin-private") {
+	if credential != "87654321" || actor != "administrator fixture" || project != tenant || trace != "admin-mutation-trace" || action != "delete" || kind != "environment_template" || gotID != id || strings.Contains(raw, "admin-private") {
 		t.Fatal("administrator audit identity differs")
 	}
 	var operations, owners int
diff --git a/services/core/internal/persistence/postgres/vaultpg/audit_test.go b/services/core/internal/persistence/postgres/vaultpg/audit_test.go
index 8e5b5e06c..2c88daa5f 100644
--- a/services/core/internal/persistence/postgres/vaultpg/audit_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/audit_test.go
@@ -28,8 +28,8 @@ type auditMutation struct {
 
 func publicAuditContext(ctx context.Context, tenant, request string) context.Context {
 	return writeaudit.WithSource(ctx, writeaudit.Source{
-		KeyID: "static:" + strings.Repeat("a", 64), Name: "vault audit fixture", Prefix: "aaaaaaaa",
-		Kind: "static", TenantID: tenant, RequestID: request, TraceID: "vault-audit-trace",
+		KeyID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", Name: "vault audit fixture", Prefix: "pc_aaaaaaaa",
+		Kind: "issued", TenantID: tenant, RequestID: request, TraceID: "vault-audit-trace",
 	})
 }
 
@@ -195,11 +195,11 @@ func TestVaultMutationsRollBackWithTheirAudit(t *testing.T) {
 					if public != 0 || admin != 1 || owners != 0 {
 						t.Fatalf("public audit rows %d, admin rows %d, owners %d", public, admin, owners)
 					}
-					var credential, actor, project, trace, results string
-					if err := pool.QueryRow(t.Context(), `SELECT admin_credential_id,actor_label,project_id,trace_id,result_ids::text,action,resource_type,resource_id,to_jsonb(a)::text FROM admin_audit_log a WHERE tenant_id=$1 AND request_id=$2`, tenant, request).Scan(&credential, &actor, &project, &trace, &results, &action, &kind, &gotID, &raw); err != nil {
+					var credential, actor, project, trace string
+					if err := pool.QueryRow(t.Context(), `SELECT admin_credential_id,actor_label,project_id,trace_id,action,resource_type,resource_id,to_jsonb(a)::text FROM admin_audit_log a WHERE tenant_id=$1 AND request_id=$2`, tenant, request).Scan(&credential, &actor, &project, &trace, &action, &kind, &gotID, &raw); err != nil {
 						t.Fatal(err)
 					}
-					if credential != "87654321" || actor != "administrator fixture" || project != tenant || trace != "admin-mutation-trace" || results != "[]" {
+					if credential != "87654321" || actor != "administrator fixture" || project != tenant || trace != "admin-mutation-trace" {
 						t.Fatal("administrator audit identity differs")
 					}
 					parent = mutation.parent
diff --git a/services/core/internal/writeaudit/reader.go b/services/core/internal/writeaudit/reader.go
index ed9964e72..e1a4be872 100644
--- a/services/core/internal/writeaudit/reader.go
+++ b/services/core/internal/writeaudit/reader.go
@@ -27,13 +27,11 @@ type APIKey struct {
 	RevokedAt *time.Time `json:"revoked_at"`
 }
 
-// ResourceOwner is the recorded creator of one resource. Both creator fields
-// are null for a resource without recorded creation provenance.
+// ResourceOwner is the recorded creator of one resource. APIKey is null for a
+// resource without recorded creation provenance.
 type ResourceOwner struct {
-	ResourceID   string  `json:"resource_id"`
-	APIKey       *APIKey `json:"api_key"`
-	Source       *string `json:"source"`
-	AdminAuditID *string `json:"admin_audit_id"`
+	ResourceID string  `json:"resource_id"`
+	APIKey     *APIKey `json:"api_key"`
 }
 
 // Operation is one committed write.
diff --git a/services/core/internal/writeaudit/record.go b/services/core/internal/writeaudit/record.go
index 6256aa14b..e7a256a9e 100644
--- a/services/core/internal/writeaudit/record.go
+++ b/services/core/internal/writeaudit/record.go
@@ -1,8 +1,6 @@
 package writeaudit
 
 import (
-	"crypto/sha256"
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"strings"
@@ -37,13 +35,6 @@ func ValidText(value string, max int, required bool) bool {
 	return (!required || value != "") && utf8.ValidString(value) && utf8.RuneCountInString(value) <= max && !strings.ContainsFunc(value, unicode.IsControl)
 }
 
-// ValidKeyDigest reports whether digest is the lowercase hexadecimal SHA-256
-// digest that identifies a Project key.
-func ValidKeyDigest(digest string) bool {
-	decoded, err := hex.DecodeString(digest)
-	return err == nil && len(decoded) == sha256.Size && hex.EncodeToString(decoded) == digest
-}
-
 // Validate checks that s is well-formed provenance of a write in tenant.
 func (s Source) Validate(tenant string) error {
 	if !s.valid(tenant) {
@@ -75,21 +66,14 @@ func ValidateRecord(source Source, tenant, action string, resources []Resource)
 func (s Source) valid(tenant string) bool {
 	actual, err := parseID(s.TenantID)
 	expected, expectedErr := parseID(tenant)
-	valid := err == nil && expectedErr == nil && actual == expected &&
+	_, idErr := parseID(s.KeyID)
+	valid := err == nil && expectedErr == nil && actual == expected && s.Kind == "issued" && idErr == nil &&
+		len(s.Prefix) == 11 && strings.HasPrefix(s.Prefix, "pc_") &&
 		ValidText(s.Name, 80, false) && ValidText(s.RequestID, 128, true) && ValidText(s.TraceID, 128, true)
-	switch s.Kind {
-	case "static", "console":
-		digest := strings.TrimPrefix(s.KeyID, "static:")
-		return valid && strings.HasPrefix(s.KeyID, "static:") && ValidKeyDigest(digest) && s.Prefix == digest[:min(len(digest), 8)]
-	case "issued":
-		_, idErr := parseID(s.KeyID)
-		valid = valid && idErr == nil && len(s.Prefix) == 11 && strings.HasPrefix(s.Prefix, "pc_")
-		for _, c := range strings.TrimPrefix(s.Prefix, "pc_") {
-			valid = valid && (c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z' || c >= '0' && c <= '9' || c == '_' || c == '-')
-		}
-		return valid
+	for _, c := range strings.TrimPrefix(s.Prefix, "pc_") {
+		valid = valid && (c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z' || c >= '0' && c <= '9' || c == '_' || c == '-')
 	}
-	return false
+	return valid
 }
 
 func parseID(value string) (uuid.UUID, error) {
diff --git a/services/core/internal/writeaudit/record_test.go b/services/core/internal/writeaudit/record_test.go
index 5b0bc232b..12b721844 100644
--- a/services/core/internal/writeaudit/record_test.go
+++ b/services/core/internal/writeaudit/record_test.go
@@ -1,8 +1,6 @@
 package writeaudit
 
 import (
-	"crypto/sha256"
-	"encoding/hex"
 	"errors"
 	"strings"
 	"testing"
@@ -11,33 +9,29 @@ import (
 	"github.com/google/uuid"
 )
 
-func staticSource(tenant string) Source {
-	sum := sha256.Sum256([]byte("key"))
-	digest := hex.EncodeToString(sum[:])
-	return Source{KeyID: "static:" + digest, Prefix: digest[:8], Name: "key", Kind: "static", TenantID: tenant, RequestID: "request", TraceID: "trace"}
+func issuedSource(tenant string) Source {
+	return Source{KeyID: uuid.NewString(), Prefix: "pc_Ab3_-xyz", Name: "key", Kind: "issued", TenantID: tenant, RequestID: "request", TraceID: "trace"}
 }
 
 func TestValidateRecord(t *testing.T) {
 	tenant := uuid.NewString()
 	agent := []Resource{{Type: "agent", ID: "agent"}}
-	issued := staticSource(tenant)
-	issued.KeyID, issued.Prefix, issued.Kind = uuid.NewString(), "pc_Ab3_-xyz", "issued"
-	if err := ValidateRecord(staticSource(tenant), tenant, "create", agent); err != nil {
+	if err := ValidateRecord(issuedSource(tenant), tenant, "create", agent); err != nil {
 		t.Fatal(err)
 	}
-	if err := ValidateRecord(issued, tenant, "update_default_version", []Resource{{Type: "skill_version", ID: "1", ParentID: "skill"}}); err != nil {
+	if err := ValidateRecord(issuedSource(tenant), tenant, "update_default_version", []Resource{{Type: "skill_version", ID: "1", ParentID: "skill"}}); err != nil {
 		t.Fatal(err)
 	}
 	for name, change := range map[string]func(*Source, *string, *[]Resource){
 		"other tenant":  func(s *Source, _ *string, _ *[]Resource) { s.TenantID = uuid.NewString() },
 		"nil tenant":    func(s *Source, _ *string, _ *[]Resource) { s.TenantID = uuid.Nil.String() },
-		"short digest":  func(s *Source, _ *string, _ *[]Resource) { s.KeyID = "static:abcd" },
+		"key ID":        func(s *Source, _ *string, _ *[]Resource) { s.KeyID = "key" },
 		"prefix":        func(s *Source, _ *string, _ *[]Resource) { s.Prefix = "bad" },
-		"kind":          func(s *Source, _ *string, _ *[]Resource) { s.Kind = "unknown" },
+		"prefix chars":  func(s *Source, _ *string, _ *[]Resource) { s.Prefix = "pc_Ab3_-xy!" },
+		"kind":          func(s *Source, _ *string, _ *[]Resource) { s.Kind = "static" },
 		"request":       func(s *Source, _ *string, _ *[]Resource) { s.RequestID = "" },
 		"trace":         func(s *Source, _ *string, _ *[]Resource) { s.TraceID = "bad\x01" },
 		"name":          func(s *Source, _ *string, _ *[]Resource) { s.Name = strings.Repeat("x", 81) },
-		"issued key ID": func(s *Source, _ *string, _ *[]Resource) { s.Kind = "issued" },
 		"action":        func(_ *Source, a *string, _ *[]Resource) { *a = "copy" },
 		"resource type": func(_ *Source, _ *string, r *[]Resource) { *r = []Resource{{Type: "project", ID: "p"}} },
 		"resource ID":   func(_ *Source, _ *string, r *[]Resource) { *r = []Resource{{Type: "agent"}} },
@@ -45,7 +39,7 @@ func TestValidateRecord(t *testing.T) {
 			*r = []Resource{{Type: "agent", ID: "a", ParentID: strings.Repeat("x", 257)}}
 		},
 	} {
-		source, action, resources := staticSource(tenant), "create", agent
+		source, action, resources := issuedSource(tenant), "create", agent
 		change(&source, &action, &resources)
 		if err := ValidateRecord(source, tenant, action, resources); !errors.Is(err, ErrInvalidSource) {
 			t.Errorf("%s accepted: %v", name, err)
diff --git a/services/core/migrations/000092_delete_admin_copies.sql b/services/core/migrations/000092_delete_admin_copies.sql
new file mode 100644
index 000000000..046f74a72
--- /dev/null
+++ b/services/core/migrations/000092_delete_admin_copies.sql
@@ -0,0 +1,24 @@
+-- +goose Up
+DROP TABLE admin_resource_owners;
+DROP TABLE admin_asset_copies;
+ALTER TABLE admin_audit_log DROP COLUMN result_ids;
+
+-- +goose Down
+ALTER TABLE admin_audit_log ADD COLUMN result_ids jsonb NOT NULL DEFAULT '[]';
+CREATE TABLE admin_asset_copies (
+    target_tenant_id uuid NOT NULL,
+    idempotency_key text NOT NULL,
+    request_hash bytea NOT NULL,
+    result jsonb NOT NULL,
+    audit_id uuid NOT NULL REFERENCES admin_audit_log(id),
+    PRIMARY KEY (target_tenant_id, idempotency_key)
+);
+CREATE TABLE admin_resource_owners (
+    tenant_id uuid NOT NULL,
+    resource_type text NOT NULL,
+    resource_id text NOT NULL,
+    parent_id text NOT NULL DEFAULT '',
+    audit_id uuid NOT NULL REFERENCES admin_audit_log(id),
+    PRIMARY KEY (tenant_id, resource_type, resource_id)
+);
+CREATE INDEX admin_resource_owners_audit ON admin_resource_owners(audit_id);
diff --git a/services/core/tests/integration/admin_delete_audit_test.go b/services/core/tests/integration/admin_delete_audit_test.go
index 183713c19..bceb94c40 100644
--- a/services/core/tests/integration/admin_delete_audit_test.go
+++ b/services/core/tests/integration/admin_delete_audit_test.go
@@ -57,8 +57,8 @@ func adminDeleteContext(ctx context.Context, tenant, request string) context.Con
 	// Even an inherited public provenance context must not turn an administrator
 	// operation into a user-key operation.
 	public := writeaudit.WithSource(ctx, writeaudit.Source{
-		KeyID: "static:" + strings.Repeat("a", 64), Name: "resource audit fixture", Prefix: "aaaaaaaa",
-		Kind: "static", TenantID: tenant, RequestID: request, TraceID: "resource-audit-trace",
+		KeyID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", Name: "resource audit fixture", Prefix: "pc_aaaaaaaa",
+		Kind: "issued", TenantID: tenant, RequestID: request, TraceID: "resource-audit-trace",
 	})
 	return adminaudit.WithSource(public, adminaudit.Source{
 		CredentialID: "87654321", ActorLabel: "administrator fixture", ProjectID: tenant, RequestID: request, TraceID: "admin-mutation-trace",
@@ -82,13 +82,13 @@ func adminMutationSnapshot(t *testing.T, s *Store, tables ...string) map[string]
 
 func assertAdminMutationAudit(t *testing.T, s *Store, tenant, request, action, kind, id string) {
 	t.Helper()
-	var credential, actor, key, trace, gotAction, gotKind, gotID, mappings, raw string
-	if err := s.pool.QueryRow(t.Context(), `SELECT admin_credential_id,actor_label,project_id,trace_id,action,resource_type,resource_id,result_ids::text,to_jsonb(a)::text
- FROM admin_audit_log a WHERE tenant_id=$1 AND request_id=$2`, tenant, request).Scan(&credential, &actor, &key, &trace, &gotAction, &gotKind, &gotID, &mappings, &raw); err != nil {
+	var credential, actor, key, trace, gotAction, gotKind, gotID, raw string
+	if err := s.pool.QueryRow(t.Context(), `SELECT admin_credential_id,actor_label,project_id,trace_id,action,resource_type,resource_id,to_jsonb(a)::text
+ FROM admin_audit_log a WHERE tenant_id=$1 AND request_id=$2`, tenant, request).Scan(&credential, &actor, &key, &trace, &gotAction, &gotKind, &gotID, &raw); err != nil {
 		t.Fatal(err)
 	}
 	expectedKey := tenant
-	if credential != "87654321" || actor != "administrator fixture" || key != expectedKey || trace != "admin-mutation-trace" || gotAction != action || gotKind != kind || gotID != id || mappings != "[]" {
+	if credential != "87654321" || actor != "administrator fixture" || key != expectedKey || trace != "admin-mutation-trace" || gotAction != action || gotKind != kind || gotID != id {
 		t.Fatal("administrator audit identity differs")
 	}
 	for _, secret := range []string{"admin-private-body", "private-agent-canary", "audit-private-token"} {
diff --git a/services/core/tests/integration/session_write_audit_test.go b/services/core/tests/integration/session_write_audit_test.go
index e4679b03e..eb5b167d6 100644
--- a/services/core/tests/integration/session_write_audit_test.go
+++ b/services/core/tests/integration/session_write_audit_test.go
@@ -15,9 +15,8 @@ import (
 
 func sessionAuditContext(t *testing.T, tenant, key string) context.Context {
 	t.Helper()
-	digest := strings.Repeat(key, 64)
-	return writeaudit.WithSource(t.Context(), writeaudit.Source{TenantID: tenant, KeyID: "static:" + digest,
-		Name: "safe key", Prefix: digest[:8], Kind: "static", RequestID: uuid.NewString(), TraceID: "shared-trace"})
+	return writeaudit.WithSource(t.Context(), writeaudit.Source{TenantID: tenant, KeyID: strings.ReplaceAll("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", "x", key),
+		Name: "safe key", Prefix: "pc_" + strings.Repeat(key, 8), Kind: "issued", RequestID: uuid.NewString(), TraceID: "shared-trace"})
 }
 
 func sessionAuditCount(t *testing.T, s *Store, tenant string, want int) {
@@ -66,7 +65,7 @@ func TestSessionWriteAuditCreationReplayNoopAndDeletion(t *testing.T) {
 	sessionAuditCount(t, s, tenant, 2)
 	for _, resource := range []string{created.ID, env.ID} {
 		var key string
-		if err := s.pool.QueryRow(t.Context(), `SELECT o.key_id FROM write_audit_owners a JOIN write_audit_operations o ON o.id=a.operation_id WHERE a.tenant_id=$1 AND a.resource_id=$2`, tenant, resource).Scan(&key); err != nil || key != "static:"+strings.Repeat("a", 64) {
+		if err := s.pool.QueryRow(t.Context(), `SELECT o.key_id FROM write_audit_owners a JOIN write_audit_operations o ON o.id=a.operation_id WHERE a.tenant_id=$1 AND a.resource_id=$2`, tenant, resource).Scan(&key); err != nil || key != "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" {
 			t.Fatal("retry replaced creator", key, err)
 		}
 	}
diff --git a/services/web/distribution_test.go b/services/web/distribution_test.go
index efe22cc62..7e36414b7 100644
--- a/services/web/distribution_test.go
+++ b/services/web/distribution_test.go
@@ -10,23 +10,48 @@ import (
 	"testing"
 )
 
+// activeRelease publishes an empty node payload release under root the way
+// `oac init` does and returns the release directory.
+func activeRelease(t *testing.T, root string, manifest map[string]any) string {
+	t.Helper()
+	revision := strings.Repeat("a", 40)
+	release := filepath.Join(root, "releases", revision)
+	if err := os.MkdirAll(release, 0700); err != nil {
+		t.Fatal(err)
+	}
+	manifest["source_commit"] = revision
+	raw, _ := json.Marshal(manifest)
+	if os.WriteFile(filepath.Join(release, "manifest.json"), raw, 0600) != nil ||
+		os.WriteFile(filepath.Join(root, "active.json"), []byte(`{"source_commit":"`+revision+`"}`), 0600) != nil {
+		t.Fatal("cannot publish the node payload")
+	}
+	return release
+}
+
+func TestConsoleRequiresPublishedNodePayload(t *testing.T) {
+	payload := t.TempDir()
+	if err := os.WriteFile(filepath.Join(payload, "node-install.pyz"), []byte("bootstrap"), 0600); err != nil {
+		t.Fatal(err)
+	}
+	upstream, _ := url.Parse("http://127.0.0.1:1")
+	if _, err := newConsole(config{origin: testOrigin, upstream: upstream, dist: t.TempDir(), coreKey: testCoreKey, nodePayloadDir: payload}); err == nil {
+		t.Fatal("console started from a node payload without active.json")
+	}
+}
+
 func TestOfflineArtifactsAreManifestAllowlisted(t *testing.T) {
 	dist, payload := t.TempDir(), t.TempDir()
-	for _, item := range []struct{ root, name, body string }{{dist, "index.html", "console"}, {payload, "node-install.pyz", "bootstrap"}} {
+	release := activeRelease(t, payload, map[string]any{"artifacts": map[string]any{"native/bin/oac-node": map[string]string{"filename": "matched-node"}, "private/key": map[string]string{"filename": "private-key"}, "native/bin/oac-selfhost": map[string]string{"filename": "retired-launcher"}}})
+	for _, item := range []struct{ root, name, body string }{{dist, "index.html", "console"}, {release, "node-install.pyz", "bootstrap"}} {
 		if err := os.WriteFile(filepath.Join(item.root, item.name), []byte(item.body), 0600); err != nil {
 			t.Fatal(err)
 		}
 	}
-	if err := os.Mkdir(filepath.Join(payload, "artifacts"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	manifest := map[string]any{"artifacts": map[string]any{"native/bin/oac-node": map[string]string{"filename": "matched-node"}, "private/key": map[string]string{"filename": "private-key"}, "native/bin/oac-selfhost": map[string]string{"filename": "retired-launcher"}}}
-	raw, _ := json.Marshal(manifest)
-	if err := os.WriteFile(filepath.Join(payload, "manifest.json"), raw, 0600); err != nil {
+	if err := os.Mkdir(filepath.Join(release, "artifacts"), 0700); err != nil {
 		t.Fatal(err)
 	}
 	for _, name := range []string{"matched-node", "private-key", "undeclared", "retired-launcher"} {
-		if err := os.WriteFile(filepath.Join(payload, "artifacts", name), []byte("payload"), 0600); err != nil {
+		if err := os.WriteFile(filepath.Join(release, "artifacts", name), []byte("payload"), 0600); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -65,16 +90,16 @@ func TestConsoleReportsServableNodeProviders(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	write(filepath.Join(dist, "index.html"), "console")
-	write(filepath.Join(payload, "node-install.pyz"), "bootstrap")
 	artifacts := map[string]any{}
-	for logical := range map[string]bool{"native/bin/oac-node": true, "images/runtime.tar.gz": true, "native/microsandbox/msb": true, "runtime/seccomp.json": true} {
-		name := strings.ReplaceAll(logical, "/", "-")
-		artifacts[logical] = map[string]any{"filename": name, "size": len("runtime-bytes")}
-		write(filepath.Join(payload, "artifacts", name), "runtime-bytes")
+	for _, logical := range []string{"native/bin/oac-node", "images/runtime.tar.gz", "native/microsandbox/msb", "runtime/seccomp.json"} {
+		artifacts[logical] = map[string]any{"filename": strings.ReplaceAll(logical, "/", "-"), "size": len("runtime-bytes")}
+	}
+	release := activeRelease(t, payload, map[string]any{"artifacts": artifacts})
+	write(filepath.Join(dist, "index.html"), "console")
+	write(filepath.Join(release, "node-install.pyz"), "bootstrap")
+	for logical := range artifacts {
+		write(filepath.Join(release, "artifacts", strings.ReplaceAll(logical, "/", "-")), "runtime-bytes")
 	}
-	raw, _ := json.Marshal(map[string]any{"artifacts": artifacts})
-	write(filepath.Join(payload, "manifest.json"), string(raw))
 	upstream, _ := url.Parse("http://127.0.0.1:1")
 	h, err := newConsole(config{origin: testOrigin, upstream: upstream, dist: dist, coreKey: testCoreKey, nodePayloadDir: payload})
 	if err != nil {
@@ -90,7 +115,7 @@ func TestConsoleReportsServableNodeProviders(t *testing.T) {
 	if response, body := responseBody(t, server, request); response.StatusCode != 206 || body != "bytes" {
 		t.Fatal("artifact download cannot resume", response.StatusCode, body)
 	}
-	if err := os.RemoveAll(filepath.Join(payload, "artifacts")); err != nil {
+	if err := os.RemoveAll(filepath.Join(release, "artifacts")); err != nil {
 		t.Fatal(err)
 	}
 	if _, body := responseBody(t, server, consoleRequest(t, server, "GET", "/console/config")); !strings.Contains(body, `"node_artifacts":[]`) {
diff --git a/services/web/node_artifacts.go b/services/web/node_artifacts.go
index 566d276af..c17869b87 100644
--- a/services/web/node_artifacts.go
+++ b/services/web/node_artifacts.go
@@ -33,7 +33,7 @@ func (h *console) readNodeManifest(prefix string) (nodeManifest, error) {
 	if err != nil || len(raw) > 1024*1024 || json.Unmarshal(raw, &manifest) != nil {
 		return manifest, errors.New("invalid node manifest")
 	}
-	if prefix != "" && prefix != "releases/"+manifest.SourceCommit+"/" {
+	if prefix != "releases/"+manifest.SourceCommit+"/" {
 		return manifest, errors.New("node manifest release mismatch")
 	}
 	return manifest, nil
diff --git a/services/web/node_installation.go b/services/web/node_installation.go
index f9bfb2518..2747292ba 100644
--- a/services/web/node_installation.go
+++ b/services/web/node_installation.go
@@ -35,13 +35,9 @@ var optionalPayloadFiles = func() map[string]bool {
 
 var payloadRevision = regexp.MustCompile(`^[0-9a-f]{40}$`)
 
-// activePayloadPrefix reads one atomic pointer per request. Legacy flat payloads
-// remain readable until the installer publishes its first versioned release.
+// activePayloadPrefix reads the installer's atomic release pointer once per request.
 func activePayloadPrefix(root *os.Root) (string, error) {
 	raw, err := root.ReadFile("active.json")
-	if errors.Is(err, os.ErrNotExist) {
-		return "", nil
-	}
 	if err != nil || len(raw) > 256 {
 		return "", errors.New("invalid active node payload")
 	}
@@ -55,7 +51,7 @@ func activePayloadPrefix(root *os.Root) (string, error) {
 }
 
 func (h *console) resolveNodePayload(name string) (string, bool) {
-	prefix := ""
+	var prefix string
 	if strings.HasPrefix(name, "releases/") {
 		parts := strings.SplitN(name, "/", 3)
 		if len(parts) != 3 || !payloadRevision.MatchString(parts[1]) {
@@ -69,9 +65,6 @@ func (h *console) resolveNodePayload(name string) (string, bool) {
 			return "", false
 		}
 	}
-	if prefix == "" && nodePayloadFiles[name] {
-		return name, true
-	}
 	if !nodePayloadFiles[name] && (!strings.HasPrefix(name, "artifacts/") || strings.Contains(strings.TrimPrefix(name, "artifacts/"), "/")) {
 		return "", false
 	}
diff --git a/services/web/node_installation_test.go b/services/web/node_installation_test.go
index 5867e412a..6ee331c8f 100644
--- a/services/web/node_installation_test.go
+++ b/services/web/node_installation_test.go
@@ -35,7 +35,8 @@ func TestPairedConsoleProxiesOnlyAdministration(t *testing.T) {
 	defer upstream.Close()
 	u, _ := url.Parse(upstream.URL)
 	dist, payload := t.TempDir(), t.TempDir()
-	for _, file := range []struct{ path, value string }{{filepath.Join(dist, "index.html"), "console"}, {filepath.Join(payload, "node-install.pyz"), "print('installer')"}, {filepath.Join(payload, "self-hosted-install.pyz"), "print('self-hosted')"}, {filepath.Join(payload, "caller.key"), "must-not-be-served"}} {
+	release := activeRelease(t, payload, map[string]any{})
+	for _, file := range []struct{ path, value string }{{filepath.Join(dist, "index.html"), "console"}, {filepath.Join(release, "node-install.pyz"), "print('installer')"}, {filepath.Join(release, "self-hosted-install.pyz"), "print('self-hosted')"}, {filepath.Join(release, "caller.key"), "must-not-be-served"}} {
 		if err := os.WriteFile(file.path, []byte(file.value), 0600); err != nil {
 			t.Fatal(err)
 		}
@@ -89,8 +90,7 @@ func TestPairedConsoleProxiesOnlyAdministration(t *testing.T) {
 		// Web verifies each downloaded installer against these digests before running it.
 		nodeDigest := sha256.Sum256([]byte("print('installer')"))
 		if tc.path == "/console/config" && tc.status == 200 && (!strings.Contains(body, `"node_installer":true`) ||
-			!strings.Contains(body, `"node_installer_sha256":"`+hex.EncodeToString(nodeDigest[:])+`"`) || strings.Contains(body, "self_hosted_installer") ||
-			strings.Contains(body, "sandbox_admin") || strings.Contains(body, "api_keys")) {
+			!strings.Contains(body, `"node_installer_sha256":"`+hex.EncodeToString(nodeDigest[:])+`"`) || strings.Contains(body, "self_hosted_installer")) {
 			t.Fatalf("console configuration = %s", body)
 		}
 	}
diff --git a/services/web/project_proxy_test.go b/services/web/project_proxy_test.go
index 218e24fd2..69fac32a3 100644
--- a/services/web/project_proxy_test.go
+++ b/services/web/project_proxy_test.go
@@ -39,15 +39,6 @@ func TestCoreDirectRoutesPassThroughWithCallerCredential(t *testing.T) {
 			}
 		}
 	}
-	r := httptest.NewRequest("GET", "/console/api-keys", nil)
-	r.Host = h.host
-	r.Header.Set("Origin", h.origin)
-	r.AddCookie(cookie)
-	w := httptest.NewRecorder()
-	h.ServeHTTP(w, r)
-	if w.Code != 404 {
-		t.Errorf("/console/api-keys = %d", w.Code)
-	}
 }
 
 // Encoded or doubled separators and dot segments cannot turn a /core/v1
diff --git a/services/web/server.go b/services/web/server.go
index c159fb603..01d43dd7c 100644
--- a/services/web/server.go
+++ b/services/web/server.go
@@ -140,10 +140,6 @@ func (h *console) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.direct.ServeHTTP(w, r)
 		return
 	}
-	if r.URL.Path == "/console/api-keys" || strings.HasPrefix(r.URL.Path, "/console/api-keys/") {
-		http.NotFound(w, r)
-		return
-	}
 	if h.nodePayload != nil && strings.HasPrefix(r.URL.Path, "/node-install/") {
 		if h.requestOrigin(r) == "" || !safePath(r.URL.Path) || r.URL.IsAbs() {
 			http.NotFound(w, r)

From 19d6d813843483b913eb796e403f3a7f287aa23a Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 01:45:55 +0800
Subject: [PATCH 39/60] Project deployment rules and error codes from Go (#512)

The TypeScript client now reads the deployment bounds and Runtime release patterns from a projection that specification-contract generates from sandbox/deployment_contract.go, so Web accepts only Core's oac-runtime microsandbox reference. The Harness catalog generator projects the model-provider protocol names from internal/modelprovider, so every client copy includes chat_completions.

A shared catalog fixture lists every error code a /core/v1 or console caller can receive outside the wire vocabulary of wire-semantics.md. A Go test requires a producer for each listed code, an exact match with core-errors.md, and a catalog entry for every other code Core's error writers produce unless it never reaches an administration caller. Web tests require both locales to localize exactly those codes. The ten administration codes that were missing are now catalogued, documented and localized; the unproduced sandbox_admin_not_configured message is deleted, and the client-only sandbox_configuration_unconfirmed code is a named client constant.
---
 CONTRIBUTING.md                               |   2 +-
 .../features/sandbox/SandboxSetupWizard.tsx   |   9 +-
 .../sandbox/deployment-specification.test.ts  |  16 +-
 .../sandbox/deployment-specification.ts       |  38 +++--
 .../src/features/sandbox/runtime-release.ts   |  23 ---
 apps/web/src/i18n/locales/en/common.ts        |   3 +-
 apps/web/src/i18n/locales/en/core-errors.ts   |  34 +++--
 apps/web/src/i18n/locales/zh-CN/common.ts     |   3 +-
 .../web/src/i18n/locales/zh-CN/core-errors.ts |  32 ++--
 apps/web/src/lib/core-error.test.ts           |   8 +-
 apps/web/src/lib/core-error.ts                |  35 ++---
 apps/web/src/lib/locale-strings.ts            |   2 +-
 apps/web/src/lib/locale.test.ts               |   5 +-
 apps/web/src/lib/sandbox-labels.ts            |   4 +-
 contracts/agents-api/core-errors.md           |  33 +++-
 contracts/agents-api/sandbox-deployment.md    |   2 +-
 contracts/agents-api/zh/core-errors.md        |  35 ++++-
 contracts/agents-api/zh/sandbox-deployment.md |   4 +-
 internal/modelprovider/config.go              |  15 +-
 .../agents-client/src/admin-projection.ts     |   4 +-
 .../agents-client/src/deployment-contract.ts  |   3 +
 .../src/execution-configuration-projection.ts |   6 +-
 packages/agents-client/src/harness-catalog.ts |   2 +
 packages/agents-client/src/index.ts           |   3 +-
 packages/agents-client/src/sandbox-client.ts  |   8 +-
 packages/agents-client/src/types.ts           |   8 +-
 scripts/generate-harness-catalog.py           |  29 ++--
 scripts/generate-harness-catalog.test.py      |   4 +-
 scripts/harness-catalog/main.go               |  10 +-
 services/core/README.md                       |   2 +-
 .../core/cmd/specification-contract/main.go   |  11 +-
 .../internal/api/core_error_catalog_test.go   | 142 ++++++++++++++++++
 .../internal/api/testdata/core-errors.json    |  45 ++++++
 .../internal/sandbox/deployment_contract.go   |  38 +++--
 .../providers/deployment_contract_test.go     |  12 +-
 35 files changed, 467 insertions(+), 163 deletions(-)
 delete mode 100644 apps/web/src/features/sandbox/runtime-release.ts
 create mode 100644 packages/agents-client/src/deployment-contract.ts
 create mode 100644 services/core/internal/api/core_error_catalog_test.go
 create mode 100644 services/core/internal/api/testdata/core-errors.json

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b2e088a86..e5dee072e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -115,7 +115,7 @@ The role needs `CREATE DATABASE`: tests of database-wide state, such as the exec
 
 ### Contract and schema rules
 
-- `internal/harnessconfig/builtin/catalog.json` is the single authored public Harness registration list. `make generate-harness-catalog` generates Go configuration/profile registration, client identifiers/names and the reference; `make openapi` derives the matching enums. `make check-harness-catalog` verifies freshness in the full gate. Native configuration rules stay in their adapter declarations; Core qualification and Runtime availability stay separate.
+- `internal/harnessconfig/builtin/catalog.json` is the single authored public Harness registration list. `make generate-harness-catalog` generates Go configuration/profile registration, client identifiers/names and the reference, and projects the model-provider protocol names of `internal/modelprovider/config.go` to the client; `make openapi` derives the matching enums. `make check-harness-catalog` verifies freshness in the full gate. Native configuration rules stay in their adapter declarations; Core qualification and Runtime availability stay separate.
 - `make sqlc-generate` owns only `services/core/internal/db/sqlc` (sqlc v1.29.0). Do not rewrite landed migrations.
 - `make check-runtime-contract` is the focused Core–Runtime contract entry point; see [Contract verification](docs/runtime-protocol.md#contract-verification). It also runs through `check-go` and `check-core`.
 
diff --git a/apps/web/src/features/sandbox/SandboxSetupWizard.tsx b/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
index d9ffce98a..79a29f2d7 100644
--- a/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
+++ b/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
@@ -1,4 +1,4 @@
-import { AgentCoreError, type InitializeSandboxDeployment, type UpdateSandboxDeployment, type SandboxE2BReadyBuild, type SandboxE2BTemplate, type SandboxProvider, type SandboxResources, type SandboxRuntimeRelease, type SandboxSpecification } from "@oac/agents-client";
+import { AgentCoreError, deploymentContract, type InitializeSandboxDeployment, type UpdateSandboxDeployment, type SandboxE2BReadyBuild, type SandboxE2BTemplate, type SandboxProvider, type SandboxResources, type SandboxRuntimeRelease, type SandboxSpecification } from "@oac/agents-client";
 import { useQuery } from "@tanstack/react-query";
 import { AnimatePresence } from "motion/react";
 import * as m from "motion/react-m";
@@ -15,9 +15,8 @@ import { formatBytes } from "../../lib/format";
 import { installationQuery } from "../../lib/installation";
 import type { MessageKey } from "../../lib/locale-strings";
 import { sandboxConfigurationRejection } from "../../lib/sandbox-labels";
-import { defaultSandboxResources, distributionRuntime, savedSpecification, validSandboxResources } from "./deployment-specification";
+import { defaultSandboxResources, distributionRuntime, isRuntimeRelease, isRuntimeReleaseField, RUNTIME_RELEASE_FIELDS, savedSpecification, validSandboxResources } from "./deployment-specification";
 import { e2bKeyReady, e2bUpdateSelection } from "./sandbox-update";
-import { isRuntimeRelease, isRuntimeReleaseField, RUNTIME_RELEASE_FIELDS } from "./runtime-release";
 import { sandboxAdmin } from "./sandbox-queries";
 import "./sandbox-wizard.css";
 
@@ -41,6 +40,8 @@ function e2bService(apiURL?: string): E2BService {
 }
 
 const MIB = 2 ** 20;
+const bounds = Object.fromEntries(deploymentContract.resources.map(({ name, min, max }) => [name, `${min}–${max}`]));
+const resourceBounds = { cpus: bounds.cpus, memory: bounds.memory_mib, disk: deploymentContract.minimum_disk };
 const EASE = [0.16, 1, 0.3, 1] as const;
 // Core accepts a template ID of up to 128 characters and a canonical, non-nil build UUID.
 const TEMPLATE = /^[a-zA-Z0-9_-]{1,128}:([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/;
@@ -413,7 +414,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
       <Question title={t("Advanced settings")}>
         <form className="wizard-fields" onSubmit={(event) => { event.preventDefault(); setStep("review"); }}>
           {sized ? <fieldset className="wizard-group">
-            <legend>{t("Each sandbox")}<HelpTip>{t("1–255 CPUs, 512–1048576 MiB of memory. microsandbox disks are at least 1024 MiB.")}</HelpTip></legend>
+            <legend>{t("Each sandbox")}<HelpTip>{t("{{cpus}} CPUs, {{memory}} MiB of memory. microsandbox disks are at least {{disk}} MiB.", resourceBounds)}</HelpTip></legend>
             <div className="wizard-grid">
               <NumberField error={fieldError("resources.cpus")} id={`${id}-cpus`} label={t("CPUs")} value={resources.cpus} onChange={(cpus) => { setSize("custom"); setResources({ ...resources, cpus }); setFieldRejection(null); }} />
               <NumberField error={fieldError("resources.memory_mib")} id={`${id}-memory`} label={t("Memory (MiB)")} value={resources.memory_mib} onChange={(memory_mib) => { setSize("custom"); setResources({ ...resources, memory_mib }); setFieldRejection(null); }} />
diff --git a/apps/web/src/features/sandbox/deployment-specification.test.ts b/apps/web/src/features/sandbox/deployment-specification.test.ts
index f3e923f81..eac961bff 100644
--- a/apps/web/src/features/sandbox/deployment-specification.test.ts
+++ b/apps/web/src/features/sandbox/deployment-specification.test.ts
@@ -1,6 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { defaultSandboxResources, distributionRuntime, sandboxesThatFit, savedSpecification, validSandboxResources } from "./deployment-specification";
-import { isRuntimeReleaseField } from "./runtime-release";
+import { defaultSandboxResources, distributionRuntime, isRuntimeReleaseField, sandboxesThatFit, savedSpecification, validSandboxResources } from "./deployment-specification";
 import standardSizes from "./standard-sizes.json";
 import type { SandboxSpecification } from "@oac/agents-client";
 
@@ -49,14 +48,13 @@ describe("deployment resources and Runtime", () => {
     expect(validSandboxResources("e2b", { cpus: 2, memory_mib: 2048, root_disk_mib: 1024 })).toBe(false);
     expect(validSandboxResources("microsandbox", { cpus: 2, memory_mib: 2048, root_disk_mib: 1023, environment_disk_mib: 8192 })).toBe(false);
   });
-  it("accepts any well-formed Runtime image name in the Runtime reference", async () => {
+  it("accepts only Core's Runtime image in the Runtime reference", async () => {
     const digest = "b".repeat(64);
-    for (const runtime_ref of [`oac-runtime@sha256:${digest}`, `custom-runtime@sha256:${digest}`]) {
-      vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response(JSON.stringify({ ...manifest, runtime_ref }))));
-      expect((await distributionRuntime(new AbortController().signal)).microsandbox_ref).toBe(runtime_ref);
-      expect(isRuntimeReleaseField("microsandbox_ref", runtime_ref)).toBe(true);
-    }
-    for (const runtime_ref of [`oac-runtime:${digest}`, `oac-runtime@sha256:${"b".repeat(63)}`, `oac-runtime@sha256:${"B".repeat(64)}`, `@sha256:${digest}`]) {
+    const runtime_ref = `oac-runtime@sha256:${digest}`;
+    vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response(JSON.stringify({ ...manifest, runtime_ref }))));
+    expect((await distributionRuntime(new AbortController().signal)).microsandbox_ref).toBe(runtime_ref);
+    expect(isRuntimeReleaseField("microsandbox_ref", runtime_ref)).toBe(true);
+    for (const runtime_ref of [`custom-runtime@sha256:${digest}`, `oac-runtime:${digest}`, `oac-runtime@sha256:${"b".repeat(63)}`, `oac-runtime@sha256:${"B".repeat(64)}`, `@sha256:${digest}`]) {
       vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response(JSON.stringify({ ...manifest, runtime_ref }))));
       await expect(distributionRuntime(new AbortController().signal)).rejects.toThrow();
       expect(isRuntimeReleaseField("microsandbox_ref", runtime_ref)).toBe(false);
diff --git a/apps/web/src/features/sandbox/deployment-specification.ts b/apps/web/src/features/sandbox/deployment-specification.ts
index 5fb2bc773..8859539f3 100644
--- a/apps/web/src/features/sandbox/deployment-specification.ts
+++ b/apps/web/src/features/sandbox/deployment-specification.ts
@@ -1,5 +1,4 @@
-import type { SandboxDeployment, SandboxE2BTemplateBuild, SandboxProvider, SandboxResources, SandboxRuntimeRelease, SandboxSpecification } from "@oac/agents-client";
-import { RUNTIME_REF_PATTERN } from "./runtime-release";
+import { deploymentContract, type SandboxDeployment, type SandboxE2BTemplateBuild, type SandboxProvider, type SandboxResources, type SandboxRuntimeRelease, type SandboxSpecification } from "@oac/agents-client";
 import standardSizes from "./standard-sizes.json";
 
 interface Manifest {
@@ -15,12 +14,25 @@ export function defaultSandboxResources(provider: SandboxProvider): SandboxResou
   return { ...(provider === "microsandbox" ? standardSizes.microsandbox : standardSizes.docker) };
 }
 
+/** Core's resource rule: optional disk fields stay zero unless the provider supports disk limits. */
 export function validSandboxResources(provider: SandboxProvider, resources: SandboxResources): boolean {
-  const bounded = (value: number | undefined, minimum: number, maximum: number) => Number.isInteger(value) && value! >= minimum && value! <= maximum;
-  if (!bounded(resources.cpus, 1, 255) || !bounded(resources.memory_mib, 512, 1048576)) return false;
-  return provider === "microsandbox"
-    ? bounded(resources.root_disk_mib, 1024, 4294967295) && bounded(resources.environment_disk_mib, 1024, 4294967295)
-    : (resources.root_disk_mib ?? 0) === 0 && (resources.environment_disk_mib ?? 0) === 0;
+  return deploymentContract.resources.every((rule) => {
+    const [min, max] = !rule.omit_zero ? [rule.min, rule.max] : provider === "microsandbox" ? [deploymentContract.minimum_disk, rule.max] : [0, 0];
+    const value = resources[rule.name] ?? 0;
+    return Number.isInteger(value) && value >= min && value <= max;
+  });
+}
+
+const releasePatterns = Object.fromEntries(deploymentContract.runtime.map(({ name, pattern }) => [name, new RegExp(`^(?:${pattern})$`)])) as Record<keyof SandboxRuntimeRelease, RegExp>;
+
+export const RUNTIME_RELEASE_FIELDS = deploymentContract.runtime.map(({ name }) => name);
+
+export function isRuntimeReleaseField(field: keyof SandboxRuntimeRelease, value: string): boolean {
+  return releasePatterns[field].test(value);
+}
+
+export function isRuntimeRelease(value: Partial<SandboxRuntimeRelease>): value is SandboxRuntimeRelease {
+  return RUNTIME_RELEASE_FIELDS.every((field) => typeof value[field] === "string" && releasePatterns[field].test(value[field]));
 }
 
 export function savedSpecification(provider: SandboxProvider, savedProvider?: SandboxProvider | "", specification?: SandboxSpecification): SandboxSpecification | null {
@@ -59,12 +71,8 @@ export async function distributionRuntime(signal: AbortSignal): Promise<SandboxR
   const response = await fetch("/node-install/manifest.json", { signal, credentials: "include", redirect: "error" });
   if (!response.ok) throw new Error("distribution unavailable");
   const manifest = await response.json() as Manifest;
-  const hash = /^[a-f0-9]{64}$/;
-  const image = /^sha256:[a-f0-9]{64}$/;
-  if (manifest.platform !== "linux/amd64" || !/^[a-f0-9]{40}$/.test(manifest.source_commit ?? "")
-    || !image.test(manifest.images?.runtime ?? "") || !image.test(manifest.image_manifest_digests?.runtime ?? "")
-    || !RUNTIME_REF_PATTERN.test(manifest.runtime_ref ?? "")
-    || !hash.test(manifest.microsandbox?.runtime_sha256 ?? "") || !hash.test(manifest.microsandbox?.firmware_sha256 ?? "")) throw new Error("invalid distribution");
-  return { source_commit: manifest.source_commit!, image_id: manifest.images!.runtime!, image_manifest_digest: manifest.image_manifest_digests!.runtime!,
-    microsandbox_ref: manifest.runtime_ref!, runtime_sha256: manifest.microsandbox!.runtime_sha256!, firmware_sha256: manifest.microsandbox!.firmware_sha256! };
+  const release = { source_commit: manifest.source_commit, image_id: manifest.images?.runtime, image_manifest_digest: manifest.image_manifest_digests?.runtime,
+    microsandbox_ref: manifest.runtime_ref, runtime_sha256: manifest.microsandbox?.runtime_sha256, firmware_sha256: manifest.microsandbox?.firmware_sha256 };
+  if (manifest.platform !== "linux/amd64" || !isRuntimeRelease(release)) throw new Error("invalid distribution");
+  return release;
 }
diff --git a/apps/web/src/features/sandbox/runtime-release.ts b/apps/web/src/features/sandbox/runtime-release.ts
deleted file mode 100644
index 89cd0dbfd..000000000
--- a/apps/web/src/features/sandbox/runtime-release.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { SandboxRuntimeRelease } from "@oac/agents-client";
-
-/** Core owns the Runtime image name, so the Web checks only the `<name>@sha256:<digest>` shape. */
-export const RUNTIME_REF_PATTERN = /^[a-z0-9][a-z0-9._-]*@sha256:[0-9a-f]{64}$/;
-
-const patterns: Record<keyof SandboxRuntimeRelease, RegExp> = {
-  source_commit: /^[0-9a-f]{40}$/,
-  image_id: /^sha256:[0-9a-f]{64}$/,
-  image_manifest_digest: /^sha256:[0-9a-f]{64}$/,
-  microsandbox_ref: RUNTIME_REF_PATTERN,
-  runtime_sha256: /^[0-9a-f]{64}$/,
-  firmware_sha256: /^[0-9a-f]{64}$/,
-};
-
-export const RUNTIME_RELEASE_FIELDS = Object.keys(patterns) as (keyof SandboxRuntimeRelease)[];
-
-export function isRuntimeReleaseField(field: keyof SandboxRuntimeRelease, value: string): boolean {
-  return patterns[field].test(value);
-}
-
-export function isRuntimeRelease(value: Partial<SandboxRuntimeRelease>): value is SandboxRuntimeRelease {
-  return RUNTIME_RELEASE_FIELDS.every((field) => typeof value[field] === "string" && patterns[field].test(value[field]!));
-}
diff --git a/apps/web/src/i18n/locales/en/common.ts b/apps/web/src/i18n/locales/en/common.ts
index 5cc163979..2f5d564a9 100644
--- a/apps/web/src/i18n/locales/en/common.ts
+++ b/apps/web/src/i18n/locales/en/common.ts
@@ -1,7 +1,8 @@
-import { coreErrors } from "./core-errors";
+import { coreErrorDetails, coreErrors } from "./core-errors";
 
 export const common = {
   coreErrors,
+  coreErrorDetails,
   readFailure: {
     title: "Could not read the data",
     partial: "Some reads failed. Any figures and rows shown cover only data already read; they may be incomplete or out of date.",
diff --git a/apps/web/src/i18n/locales/en/core-errors.ts b/apps/web/src/i18n/locales/en/core-errors.ts
index 8b86a85a3..d263d3e24 100644
--- a/apps/web/src/i18n/locales/en/core-errors.ts
+++ b/apps/web/src/i18n/locales/en/core-errors.ts
@@ -1,3 +1,4 @@
+/** One message for each code in Core's shared catalog, services/core/internal/api/testdata/core-errors.json. */
 export const coreErrors = {
   "invalid_admin_key": "The console's Core key was rejected. Rotate it on the Core host, then sign in again.",
   "console_sign_in_required": "Sign in to the console again.",
@@ -5,23 +6,15 @@ export const coreErrors = {
   "console_request_invalid": "The console request was rejected. Reload the page.",
   "core_unreachable": "Core is unreachable. Check the Core service, then refresh.",
   "invalid_name": "Enter a nonempty name without control characters.",
-  "nameLimit": "Enter a name of at most {{max}} characters without control characters.",
-  "nodeNameLimit": "Enter a name of at most {{max}} UTF-8 bytes.",
   "invalid_node_capacity": "Enter a valid whole-number capacity; retained capacity must be at least active capacity.",
-  "capacityRange": "Enter a whole number from {{min}} to {{max}}; retained capacity must be at least active capacity.",
   "model_configuration_model_invalid": "Enter a model ID of at most 1024 UTF-8 bytes without control characters.",
   "harness_config_invalid": "Check the supported native fields and their values. The JSON object must be at most 16 KiB and cannot redefine Core-managed settings.",
   "invalid_model_provider": "Enter the complete model provider configuration.",
   "model_provider_base_url_invalid": "Use an HTTPS URL without credentials, query parameters or a fragment.",
   "model_provider_protocol_unsupported": "This protocol is not supported by the harness.",
-  "protocols": "Allowed protocols: {{protocols}}.",
   "model_provider_api_key_invalid": "Enter a valid API key without control characters.",
-  "keyLimit": "Enter a valid API key of at most {{max}} characters.",
   "model_provider_token_limits_invalid": "Use valid token limits; output cannot exceed context, and required limits must be positive.",
   "invalid_sandbox_configuration": "Check the sandbox resources and Runtime release.",
-  "resourceRange": "Enter a whole number from {{min}} to {{max}}.",
-  "resourceMin": "Enter a whole number of at least {{min}}.",
-  "runtime": "Use a valid immutable Runtime release for this backend.",
   "project_archived": "This Project is archived.",
   "project_exists": "A Project with this name already exists.",
   "project_api_key_exists": "An active API key with this name already exists.",
@@ -35,10 +28,31 @@ export const coreErrors = {
   "sandbox_in_use": "Hosted resources remain. Wait for confirmed cleanup before changing the configuration.",
   "runtime_node_in_use": "The node has active allocations or retained resources. Clear allocations, snapshots, reservations and pending cleanup before removal.",
   "runtime_node_unavailable": "The selected sandbox node is unavailable or has no capacity.",
-  "sandbox_admin_not_configured": "Sandbox administration is not configured on this console.",
   "sandbox_credential_ownership": "This E2B key cannot manage the retained deployment. Reset before changing teams.",
   "sandbox_credential_invalid": "The E2B API key was rejected. The saved configuration is unchanged.",
   "sandbox_configuration_invalid": "Select a ready immutable E2B template build with matching resources.",
   "sandbox_verification_unconfirmed": "E2B verification could not be confirmed. Refresh before submitting again.",
-  "sandbox_configuration_error": "E2B sandboxes need a public HTTPS address. Set OAC_PUBLIC_URL to an HTTPS origin."
+  "sandbox_configuration_error": "E2B sandboxes need a public HTTPS address. Set OAC_PUBLIC_URL to an HTTPS origin.",
+  "sandbox_deployment_conflict": "The sandbox deployment cannot change in its current state. Refresh and check its reset and resource state.",
+  "sandbox_specification_mismatch": "The saved sandbox specification does not match the deployment. Refresh to check the configuration.",
+  "sandbox_operation_unsupported": "The selected sandbox provider does not support this operation.",
+  "environment_unavailable": "The Session's environment is no longer available.",
+  "execution_unavailable": "Execution is not available on this Core.",
+  "runtime_history_unavailable": "Runtime history is unavailable on this Core.",
+  "runtime_history_unsupported": "Runtime history is not supported for this Session.",
+  "core_metrics_unavailable": "Core metrics could not be read. Try again later.",
+  "file_transfer_unavailable": "The file transfer is unavailable. Try again later.",
+  "not_found": "The requested Core resource does not exist."
+} as const;
+
+/** Messages that format a catalogued code's typed details. */
+export const coreErrorDetails = {
+  "nameLimit": "Enter a name of at most {{max}} characters without control characters.",
+  "nodeNameLimit": "Enter a name of at most {{max}} UTF-8 bytes.",
+  "capacityRange": "Enter a whole number from {{min}} to {{max}}; retained capacity must be at least active capacity.",
+  "protocols": "Allowed protocols: {{protocols}}.",
+  "keyLimit": "Enter a valid API key of at most {{max}} characters.",
+  "resourceRange": "Enter a whole number from {{min}} to {{max}}.",
+  "resourceMin": "Enter a whole number of at least {{min}}.",
+  "runtime": "Use a valid immutable Runtime release for this backend."
 } as const;
diff --git a/apps/web/src/i18n/locales/zh-CN/common.ts b/apps/web/src/i18n/locales/zh-CN/common.ts
index 026112ab8..b67c624ab 100644
--- a/apps/web/src/i18n/locales/zh-CN/common.ts
+++ b/apps/web/src/i18n/locales/zh-CN/common.ts
@@ -1,7 +1,8 @@
-import { coreErrors } from "./core-errors";
+import { coreErrorDetails, coreErrors } from "./core-errors";
 
 export const common = {
   coreErrors,
+  coreErrorDetails,
   readFailure: {
     title: "无法读取数据",
     partial: "部分读取失败。当前数字和列表仅来自已读取的数据，可能不完整或已过期。",
diff --git a/apps/web/src/i18n/locales/zh-CN/core-errors.ts b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
index 310ade305..705b712d4 100644
--- a/apps/web/src/i18n/locales/zh-CN/core-errors.ts
+++ b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
@@ -5,23 +5,15 @@ export const coreErrors = {
   "console_request_invalid": "控制台请求被拒绝，请重新加载页面。",
   "core_unreachable": "无法连接 Core。请检查 Core 服务后刷新。",
   "invalid_name": "请输入非空名称，不要包含控制字符。",
-  "nameLimit": "名称最多 {{max}} 个字符，且不能包含控制字符。",
-  "nodeNameLimit": "节点名称最多 {{max}} 个 UTF-8 字节。",
   "invalid_node_capacity": "请输入有效的整数容量；保留容量不能小于运行容量。",
-  "capacityRange": "请输入 {{min}} 到 {{max}} 的整数；保留容量不能小于运行容量。",
   "model_configuration_model_invalid": "请输入模型 ID，最多 1024 个 UTF-8 字节，且不能包含控制字符。",
   "harness_config_invalid": "请检查支持的原生字段及其取值。JSON 对象不能超过 16 KiB，也不能重复定义 Core 管理的设置。",
   "invalid_model_provider": "请填写完整的模型服务配置。",
   "model_provider_base_url_invalid": "请使用 HTTPS 地址，不要包含凭证、查询参数或片段。",
   "model_provider_protocol_unsupported": "此执行引擎不支持该协议。",
-  "protocols": "支持的协议：{{protocols}}。",
   "model_provider_api_key_invalid": "请输入有效的 API Key，不要包含控制字符。",
-  "keyLimit": "请输入有效的 API Key，长度最多 {{max}} 个字符。",
   "model_provider_token_limits_invalid": "请填写有效的 token 限制；输出不能超过上下文，必填限制必须大于零。",
   "invalid_sandbox_configuration": "请检查沙箱资源和 Runtime 版本。",
-  "resourceRange": "请输入 {{min}} 到 {{max}} 的整数。",
-  "resourceMin": "请输入不小于 {{min}} 的整数。",
-  "runtime": "请使用适用于此后端的有效不可变 Runtime 版本。",
   "project_archived": "此项目已归档。",
   "project_exists": "此项目名称已被使用。",
   "project_api_key_exists": "此名称已被使用中的 API Key 占用。",
@@ -35,10 +27,30 @@ export const coreErrors = {
   "sandbox_in_use": "仍有托管资源。请等待 Core 确认清理完成后再修改配置。",
   "runtime_node_in_use": "节点仍有活跃分配或保留资源。请先清理资源分配、快照、预留资源和待清理项，再移除节点。",
   "runtime_node_unavailable": "所选沙箱节点不可用或容量不足。",
-  "sandbox_admin_not_configured": "此控制台尚未配置沙箱管理权限。",
   "sandbox_credential_ownership": "此 E2B 密钥无法管理当前保留的部署。更换团队前请先重置。",
   "sandbox_credential_invalid": "E2B API 密钥被拒绝。已保存的配置未改变。",
   "sandbox_configuration_invalid": "请选择已就绪且资源匹配的不可变 E2B 模板构建。",
   "sandbox_verification_unconfirmed": "无法确认 E2B 验证结果。请刷新后再提交。",
-  "sandbox_configuration_error": "E2B 沙箱需要可从互联网访问的 HTTPS 地址，请把 OAC_PUBLIC_URL 设为一个 HTTPS 源地址。"
+  "sandbox_configuration_error": "E2B 沙箱需要可从互联网访问的 HTTPS 地址，请把 OAC_PUBLIC_URL 设为一个 HTTPS 源地址。",
+  "sandbox_deployment_conflict": "沙箱部署在当前状态下无法更改。请刷新并检查重置和资源状态。",
+  "sandbox_specification_mismatch": "已保存的沙箱规格与部署不一致。请刷新检查配置。",
+  "sandbox_operation_unsupported": "所选沙箱提供商不支持此操作。",
+  "environment_unavailable": "此 Session 的环境已不可用。",
+  "execution_unavailable": "此 Core 不提供执行功能。",
+  "runtime_history_unavailable": "此 Core 上的 Runtime 历史不可用。",
+  "runtime_history_unsupported": "此 Session 不支持 Runtime 历史。",
+  "core_metrics_unavailable": "无法读取 Core 指标，请稍后重试。",
+  "file_transfer_unavailable": "文件传输不可用，请稍后重试。",
+  "not_found": "请求的 Core 资源不存在。"
+} as const;
+
+export const coreErrorDetails = {
+  "nameLimit": "名称最多 {{max}} 个字符，且不能包含控制字符。",
+  "nodeNameLimit": "节点名称最多 {{max}} 个 UTF-8 字节。",
+  "capacityRange": "请输入 {{min}} 到 {{max}} 的整数；保留容量不能小于运行容量。",
+  "protocols": "支持的协议：{{protocols}}。",
+  "keyLimit": "请输入有效的 API Key，长度最多 {{max}} 个字符。",
+  "resourceRange": "请输入 {{min}} 到 {{max}} 的整数。",
+  "resourceMin": "请输入不小于 {{min}} 的整数。",
+  "runtime": "请使用适用于此后端的有效不可变 Runtime 版本。"
 } as const;
diff --git a/apps/web/src/lib/core-error.test.ts b/apps/web/src/lib/core-error.test.ts
index b69358dbb..cc03dd7b9 100644
--- a/apps/web/src/lib/core-error.test.ts
+++ b/apps/web/src/lib/core-error.test.ts
@@ -1,6 +1,7 @@
 import { AgentCoreError } from "@oac/agents-client";
 import { describe, expect, it } from "vitest";
 import i18n from "../i18n";
+import catalog from "../../../../services/core/internal/api/testdata/core-errors.json";
 import { coreErrors as english } from "../i18n/locales/en/core-errors";
 import { coreErrors as chinese } from "../i18n/locales/zh-CN/core-errors";
 import { coreError, coreFieldError, knownCoreError } from "./core-error";
@@ -11,9 +12,10 @@ const zh = i18n.getFixedT("zh-CN", "common");
 const failure = (code: string, param?: string, details?: AgentCoreError["details"], status = 400) => new AgentCoreError("unparsed backend prose", status, code, param, undefined, details);
 
 describe("Core error catalog localization", () => {
-  it("covers both languages, without relying on backend prose", () => {
-    expect(Object.keys(chinese).sort()).toEqual(Object.keys(english).sort());
-    for (const code of ["invalid_admin_key", "console_sign_in_required", "console_origin_rejected", "console_request_invalid", "core_unreachable", "invalid_name", "invalid_node_capacity", "invalid_model_provider", "model_provider_base_url_invalid", "model_provider_protocol_unsupported", "model_provider_api_key_invalid", "model_provider_token_limits_invalid", "invalid_sandbox_configuration", "sandbox_credential_invalid", "sandbox_configuration_invalid", "sandbox_credential_ownership", "sandbox_verification_unconfirmed", "sandbox_generation_stale", "sandbox_admin_not_configured", "project_archived", "project_exists", "project_api_key_exists"]) {
+  it("localizes exactly Core's shared catalog in both languages, without relying on backend prose", () => {
+    expect(Object.keys(english).sort()).toEqual([...catalog].sort());
+    expect(Object.keys(chinese).sort()).toEqual([...catalog].sort());
+    for (const code of catalog) {
       expect(knownCoreError(failure(code), en)).not.toBeNull();
       expect(coreError(failure(code), en)).not.toContain("backend prose");
       expect(coreError(failure(code), zh)).toMatch(/[\u4e00-\u9fff]/);
diff --git a/apps/web/src/lib/core-error.ts b/apps/web/src/lib/core-error.ts
index 2e0405cf1..3f7f303cf 100644
--- a/apps/web/src/lib/core-error.ts
+++ b/apps/web/src/lib/core-error.ts
@@ -1,39 +1,32 @@
-import { AgentCoreError } from "@oac/agents-client";
+import { AgentCoreError, deploymentContract, modelProviderProtocols } from "@oac/agents-client";
 import type { TFunction } from "i18next";
-import type { coreErrors } from "../i18n/locales/en/core-errors";
+import { coreErrors } from "../i18n/locales/en/core-errors";
 
-const codes = new Set<keyof typeof coreErrors>([
-  "sandbox_credential_ownership", "sandbox_credential_invalid", "sandbox_configuration_invalid", "sandbox_verification_unconfirmed", "sandbox_configuration_error",
-  "sandbox_generation_stale", "sandbox_reset_required", "sandbox_reset_in_progress", "sandbox_not_configured", "sandbox_in_use", "runtime_node_in_use", "runtime_node_unavailable", "sandbox_admin_not_configured",
-  "invalid_admin_key", "console_sign_in_required", "console_origin_rejected", "console_request_invalid", "core_unreachable",
-  "invalid_name", "invalid_node_capacity", "invalid_model_provider", "model_configuration_model_invalid", "harness_config_invalid", "model_provider_base_url_invalid",
-  "model_provider_protocol_unsupported", "model_provider_api_key_invalid", "model_provider_token_limits_invalid",
-  "invalid_sandbox_configuration", "project_archived", "project_exists", "project_api_key_exists",
-  "executor_credential_exists", "credential_storage_unavailable", "internal_error",
-]);
+const protocols: ReadonlySet<unknown> = new Set(modelProviderProtocols);
+const resourceParams: ReadonlySet<unknown> = new Set(deploymentContract.resources.map(({ name }) => `resources.${name}`));
 
 /** Only catalogued, correctly typed detail keys can enter localized text. */
 export function knownCoreError(error: unknown, t: TFunction<"common">, nameUnit: "characters" | "bytes" = "characters"): string | null {
-  if (!(error instanceof AgentCoreError) || !codes.has(error.code as keyof typeof coreErrors)) return null;
+  if (!(error instanceof AgentCoreError) || !error.code || !Object.hasOwn(coreErrors, error.code)) return null;
   const number = (key: string) => {
     const value = error.details?.[key];
     return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : undefined;
   };
   const maxLength = number("max_length");
-  if (error.code === "invalid_name" && maxLength !== undefined) return t(nameUnit === "bytes" ? "coreErrors.nodeNameLimit" : "coreErrors.nameLimit", { max: maxLength });
-  if (error.code === "model_provider_api_key_invalid" && maxLength !== undefined) return t("coreErrors.keyLimit", { max: maxLength });
+  if (error.code === "invalid_name" && maxLength !== undefined) return t(nameUnit === "bytes" ? "coreErrorDetails.nodeNameLimit" : "coreErrorDetails.nameLimit", { max: maxLength });
+  if (error.code === "model_provider_api_key_invalid" && maxLength !== undefined) return t("coreErrorDetails.keyLimit", { max: maxLength });
   const min = number("min"), max = number("max");
-  if (error.code === "invalid_node_capacity" && min !== undefined && max !== undefined && min <= max) return t("coreErrors.capacityRange", { min, max });
+  if (error.code === "invalid_node_capacity" && min !== undefined && max !== undefined && min <= max) return t("coreErrorDetails.capacityRange", { min, max });
   if (error.code === "invalid_sandbox_configuration") {
-    if (error.param === "runtime") return t("coreErrors.runtime");
-    if (["resources.cpus", "resources.memory_mib", "resources.root_disk_mib", "resources.environment_disk_mib"].includes(error.param ?? "") && min !== undefined) {
-      if (max !== undefined && min <= max) return t("coreErrors.resourceRange", { min, max });
-      if (max === undefined) return t("coreErrors.resourceMin", { min });
+    if (error.param === "runtime") return t("coreErrorDetails.runtime");
+    if (resourceParams.has(error.param) && min !== undefined) {
+      if (max !== undefined && min <= max) return t("coreErrorDetails.resourceRange", { min, max });
+      if (max === undefined) return t("coreErrorDetails.resourceMin", { min });
     }
   }
   if (error.code === "model_provider_protocol_unsupported") {
-    const protocols = error.details?.allowed_protocols;
-    if (Array.isArray(protocols) && protocols.length > 0 && protocols.every((value) => ["responses", "anthropic"].includes(value))) return t("coreErrors.protocols", { protocols: protocols.join(", ") });
+    const allowed = error.details?.allowed_protocols;
+    if (Array.isArray(allowed) && allowed.length > 0 && allowed.every((value) => protocols.has(value))) return t("coreErrorDetails.protocols", { protocols: allowed.join(", ") });
   }
   return t(`coreErrors.${error.code as keyof typeof coreErrors}`);
 }
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index 708c873fa..880588c9c 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -365,7 +365,7 @@ export const chinese = {
   "{{name}} will be removed from this deployment.": "{{name}} 将从此部署中移除。",
   "Open {{name}}": "打开 {{name}}",
   "Remove {{name}}": "移除 {{name}}",
-  "1–255 CPUs, 512–1048576 MiB of memory. microsandbox disks are at least 1024 MiB.": "CPU 1–255 核，内存 512–1048576 MiB；microsandbox 的磁盘至少 1024 MiB。",
+  "{{cpus}} CPUs, {{memory}} MiB of memory. microsandbox disks are at least {{disk}} MiB.": "CPU {{cpus}} 核，内存 {{memory}} MiB；microsandbox 的磁盘至少 {{disk}} MiB。",
   "Advanced settings": "高级设置",
   "CPUs": "CPU（核）",
   "Check this value": "请检查这个值",
diff --git a/apps/web/src/lib/locale.test.ts b/apps/web/src/lib/locale.test.ts
index fc47a3e83..439cefe4b 100644
--- a/apps/web/src/lib/locale.test.ts
+++ b/apps/web/src/lib/locale.test.ts
@@ -20,13 +20,12 @@ describe("sandbox localization", () => {
     }
     expect(sandboxDiagnosticMessage("", "zh")).toBeNull();
   });
-  it("shows Core's reason for a refusal, names an unconfigured console, and keeps other failures to the console's words", () => {
-    expect(sandboxRequestError(new AgentCoreError("raw secret", 503, "sandbox_admin_not_configured"), "zh")).toBe("此控制台尚未配置沙箱管理权限。");
+  it("shows Core's reason for a refusal and keeps other failures to the console's words", () => {
     // A code with one exact meaning keeps the console's localized words.
     expect(sandboxRequestError(new AgentCoreError("Node node-edge still has allocations.", 409, "runtime_node_in_use"), "zh")).toBe("节点仍有活跃分配或保留资源。请先清理资源分配、快照、预留资源和待清理项，再移除节点。");
     // A refusal is Core's to explain: one code, such as a 409 conflict, covers several reasons.
     expect(sandboxRequestError(new AgentCoreError("This console is read-only.", 403), "zh")).toBe("This console is read-only.");
-    expect(sandboxRequestError(new AgentCoreError("expected_generation is stale.", 409, "sandbox_deployment_conflict"), "zh")).toBe("expected_generation is stale.");
+    expect(sandboxRequestError(new AgentCoreError("The session is busy.", 409, "conflict_error"), "zh")).toBe("The session is busy.");
     // A sandbox refusal whose reason the client withheld is named without it.
     expect(sandboxRequestError(new AgentCoreError("withheld", 400, "sandbox_configuration_unconfirmed"), "zh")).toBe("Core 拒绝了这个沙箱配置。");
     expect(sandboxRequestError(new AgentCoreError("raw secret", 502), "zh")).not.toContain("raw secret");
diff --git a/apps/web/src/lib/sandbox-labels.ts b/apps/web/src/lib/sandbox-labels.ts
index 0c92dc5f5..0995dd7aa 100644
--- a/apps/web/src/lib/sandbox-labels.ts
+++ b/apps/web/src/lib/sandbox-labels.ts
@@ -1,4 +1,4 @@
-import { AgentCoreError, type SandboxNode, type SandboxProvider } from "@oac/agents-client";
+import { AgentCoreError, sandboxConfigurationUnconfirmed, type SandboxNode, type SandboxProvider } from "@oac/agents-client";
 import i18n from "../i18n";
 import { knownCoreError } from "./core-error";
 import { translate, type Locale } from "./locale";
@@ -19,7 +19,7 @@ export function sandboxRequestError(error: unknown, locale: Locale): string {
   let key: MessageKey = "The sandbox request failed. Refresh to check the current state before trying again.";
   if (error instanceof AgentCoreError) {
     const refused = !sandboxWriteUncertain(error);
-    if (error.code === "sandbox_configuration_unconfirmed") { if (refused) key = "Core rejected the sandbox configuration."; else if (error.status >= 500) key = "The sandbox service is unavailable. Refresh to check the current state."; }
+    if (error.code === sandboxConfigurationUnconfirmed) { if (refused) key = "Core rejected the sandbox configuration."; else if (error.status >= 500) key = "The sandbox service is unavailable. Refresh to check the current state."; }
     else if (refused) {
       if (error.message) return error.message;
       key = "The sandbox request was rejected. Refresh to check the current state.";
diff --git a/contracts/agents-api/core-errors.md b/contracts/agents-api/core-errors.md
index 00be4d1c5..3873dcdf5 100644
--- a/contracts/agents-api/core-errors.md
+++ b/contracts/agents-api/core-errors.md
@@ -8,7 +8,7 @@ Errors on `/core/v1` use this envelope. `message` is safe English text; `code` a
 {"error":{"message":"A valid Core key is required as the bearer credential.","type":"invalid_request_error","code":"invalid_admin_key","param":null}}
 ```
 
-Errors on `/v1` and `/api/v1` keep their own envelopes and never carry `details`.
+Errors on `/v1` and `/api/v1` keep their own envelopes and never carry `details`. The tables below list every code a `/core/v1` or console caller can receive, except the [wire vocabulary](./wire-semantics.md#errors), such as `invalid_request`, `not_found_error` or `idempotency_conflict`, which keeps its `/v1` meaning. Codes of `/v1` Session input and of the machine routes, such as `turn_conflict` or `invalid_node_credential`, never reach these callers. The shared catalog `services/core/internal/api/testdata/core-errors.json` holds exactly the listed codes. A Go test requires a producer for each, an exact match with these tables and a catalog entry for every other code Core's error writers produce; Web's tests require a message for exactly these codes in each language.
 
 ## Optional details
 
@@ -47,7 +47,7 @@ A `POST` or `PUT /core/v1/sandbox/deployment` ([sandbox deployment](./sandbox-de
 | 409 | `sandbox_credential_ownership` | The candidate credential cannot manage the retained deployment; reset before changing accounts | `credential` |
 | 503 | `sandbox_verification_unconfirmed` | Verification, receipt settlement or the credential fence could not be confirmed | null |
 
-On every deployment write, the typed client replaces the message of these codes and of the other `sandbox_*` deployment codes with fixed local text. It keeps only the `current_generation`, `allocations`, `pending`, `min` and `max` details, and keeps `param` only when status, code and param match the table or the `invalid_sandbox_configuration` rows below exactly. `409 sandbox_configuration_error` becomes fixed public-URL guidance with a null `param`, even for a `PUT` without a key. Any other error becomes `sandbox_configuration_unconfirmed` and is not resent, because a rejection could echo the key.
+On every deployment write, the typed client replaces the message of these codes and of the other `sandbox_*` deployment codes with fixed local text. It keeps only the `current_generation`, `allocations`, `pending`, `min` and `max` details, and keeps `param` only when status, code and param match the table or the `invalid_sandbox_configuration` rows below exactly. `409 sandbox_configuration_error` becomes fixed public-URL guidance with a null `param`, even for a `PUT` without a key. Any other error becomes the client-only code `sandbox_configuration_unconfirmed`, which Core never returns, and is not resent, because a rejection could echo the key.
 
 ## Operation validation
 
@@ -71,6 +71,35 @@ Each code returns HTTP 400 with `type: "invalid_request_error"`. A missing, malf
 
 Bounds are validation constants, never submitted values. Node names are limited in bytes; Project and key names in trimmed Unicode characters without control characters. Only the first failure is reported, in this order: model provider URL, protocol, key, general limits, the Harness's protocol, then the Harness's required limits; sandbox resources CPU, memory, disk, then Runtime. Model-provider field errors inside a `model_provider` object keep that object's field as `param`. An unknown sandbox provider returns an error without these fields.
 
+## Other administration errors
+
+These codes have null `param` and no `details`. [Sandbox deployment](./sandbox-deployment.md#errors) describes when each sandbox code occurs.
+
+| HTTP | Code | Meaning |
+| --- | --- | --- |
+| 400 | `sandbox_operation_unsupported` | The selected sandbox provider does not support the operation |
+| 401 | `invalid_admin_key` | The bearer credential is not a valid Core key |
+| 404 | `not_found` | The operation does not exist, the Harness is unknown, or the Harness has no deployment default model provider |
+| 409 | `project_archived` | The target Project is archived |
+| 409 | `project_exists` | The Project ID already exists |
+| 409 | `project_api_key_exists` | The API key ID already exists |
+| 409 | `executor_credential_exists` | The executor credential ID already exists; rotate it to replace the secret |
+| 409 | `sandbox_not_configured` | The sandbox deployment is not configured |
+| 409 or 503 | `sandbox_reset_in_progress` | A sandbox reset is in progress |
+| 409 | `sandbox_configuration_error` | The installation cannot serve the selected provider, such as E2B while the public URL is loopback |
+| 409 | `sandbox_deployment_conflict` | The sandbox deployment cannot change in its current state |
+| 409 | `sandbox_specification_mismatch` | The saved deployment specification is no longer valid for its provider |
+| 409 | `runtime_node_in_use` | The node still holds allocations, snapshots, reservations or pending cleanup |
+| 409 | `environment_unavailable` | The Session's environment is no longer available, such as an archive on a Core without execution |
+| 409 | `runtime_history_unsupported` | Runtime history is not supported for the Session |
+| 500 | `internal_error` | Core could not complete the operation |
+| 503 | `runtime_node_unavailable` | No sandbox node is available or has capacity |
+| 503 | `credential_storage_unavailable` | Core has no credential encryption key |
+| 503 | `execution_unavailable` | Execution is not available on this Core |
+| 503 | `runtime_history_unavailable` | Durable Runtime history is not configured or temporarily unavailable |
+| 503 | `core_metrics_unavailable` | Core metrics could not be read |
+| 503 | `file_transfer_unavailable` | Bounded content transfer is unavailable |
+
 ## Diagnostic failure categories
 
 The [Session and Turn diagnostics reads](./session-diagnostics.md) return these categories inside a successful 200 snapshot, not as an error envelope. Public `/v1` Turn errors do not change. `params` is `{}` unless the table says otherwise.
diff --git a/contracts/agents-api/sandbox-deployment.md b/contracts/agents-api/sandbox-deployment.md
index 2af2c9244..94e62f090 100644
--- a/contracts/agents-api/sandbox-deployment.md
+++ b/contracts/agents-api/sandbox-deployment.md
@@ -224,6 +224,6 @@ Storage and credential failures stay errors: an empty or failed read never prove
 
 ## Canonical node specification
 
-`sandbox/deployment_contract.go` owns the resource bounds, provider requirements, release patterns and canonical field order; `sandbox/deployment.go` applies them in Core. The installer consumes the generated declaration in `deploy/node/node_spec.py`, so there is no second set of limits or patterns. Regenerate it from the repository root with `go run ./services/core/cmd/specification-contract -write`; the sandbox Go tests, part of `make check`, reject a stale projection.
+`sandbox/deployment_contract.go` owns the resource bounds, provider requirements, release patterns and canonical field order; `sandbox/deployment.go` applies them in Core. The installer consumes the generated declaration in `deploy/node/node_spec.py`, and the TypeScript client and Web the generated bounds and patterns in `packages/agents-client/src/deployment-contract.ts`, so there is no second set of limits or patterns. Regenerate both from the repository root with `go run ./services/core/cmd/specification-contract -write`; the sandbox Go tests, part of `make check`, reject a stale projection.
 
 The specification digest is the SHA-256 of compact UTF-8 JSON with `provider` first, then `resources`, then `runtime` when the provider requires it. Resource and Runtime fields follow the contract's declaration order; zero optional disk fields are omitted and required fields stay present. Release identities are lowercase ASCII, and the digest never depends on the incoming field order or whitespace. `services/core/internal/sandbox/testdata/deployment-contract.json` holds shared acceptance cases, exact canonical bytes and digests that both the Go and Python tests consume.
diff --git a/contracts/agents-api/zh/core-errors.md b/contracts/agents-api/zh/core-errors.md
index c7bc4301b..a0d533547 100644
--- a/contracts/agents-api/zh/core-errors.md
+++ b/contracts/agents-api/zh/core-errors.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理错误"
 source: contracts/agents-api/core-errors.md
-source_hash: 3d8e6a03d6a54c7dc86a27164749ffae963b5ef52cbede0e0da843c7da0216ba
+source_hash: 78fcbde855beafae4d1f5eb38b87596eeca25c99c025c6c54978db988d2a534a
 ---
 
 `/core/v1` 上的错误使用此封装结构。`message` 是安全的英文文本；`code` 和 `param` 可以为 null。客户端依据稳定的 `code` 和可选的 `param` 进行处理，对未知代码显示 `message`，绝不解析消息，也绝不自动重试被拒绝的写操作。
@@ -10,7 +10,7 @@ source_hash: 3d8e6a03d6a54c7dc86a27164749ffae963b5ef52cbede0e0da843c7da0216ba
 {"error":{"message":"A valid Core key is required as the bearer credential.","type":"invalid_request_error","code":"invalid_admin_key","param":null}}
 ```
 
-`/v1` 和 `/api/v1` 上的错误仍使用各自的封装结构，且绝不包含 `details`。
+`/v1` 和 `/api/v1` 上的错误仍使用各自的封装结构，且绝不包含 `details`。下面各表列出 `/core/v1` 或控制台调用方可能收到的所有代码，[线路词汇](wire-semantics.md#errors)除外；例如 `invalid_request`、`not_found_error` 或 `idempotency_conflict` 沿用其在 `/v1` 上的含义。`/v1` Session 输入和机器路由的代码（例如 `turn_conflict` 或 `invalid_node_credential`）不会到达这些调用方。共享目录 `services/core/internal/api/testdata/core-errors.json` 恰好包含所列代码。Go 测试要求每个代码都有生产者、与这些表完全一致，并要求 Core 错误写入函数产生的其他代码都登记在目录中；Web 测试要求每种语言恰好为这些代码提供消息。
 
 ## 可选详细信息 {#optional-details}
 
@@ -49,7 +49,7 @@ Web 的控制台服务器在 `/core` 路径上发生自身故障时使用此封
 | 409 | `sandbox_credential_ownership` | 候选凭据无法管理保留的部署；更换账户前必须重置 | `credential` |
 | 503 | `sandbox_verification_unconfirmed` | 无法确认验证结果、回执结算结果或凭据隔离状态 | null |
 
-每次写入部署时，类型化客户端都会将上述代码及其他 `sandbox_*` 部署代码的消息替换为固定的本地文本。`details` 中仅保留 `current_generation`、`allocations`、`pending`、`min` 和 `max`，并且仅当 status、code 和 param 与上表或下方 `invalid_sandbox_configuration` 各行完全匹配时，才保留 `param`。`409 sandbox_configuration_error` 会转换为有关公开 URL 的固定指引，并将 `param` 设为 null，即使对于未提供密钥的 `PUT` 也是如此。其他任何错误都会转换为 `sandbox_configuration_unconfirmed` 且不会重新发送，因为拒绝响应可能会回显密钥。
+每次写入部署时，类型化客户端都会将上述代码及其他 `sandbox_*` 部署代码的消息替换为固定的本地文本。`details` 中仅保留 `current_generation`、`allocations`、`pending`、`min` 和 `max`，并且仅当 status、code 和 param 与上表或下方 `invalid_sandbox_configuration` 各行完全匹配时，才保留 `param`。`409 sandbox_configuration_error` 会转换为有关公开 URL 的固定指引，并将 `param` 设为 null，即使对于未提供密钥的 `PUT` 也是如此。其他任何错误都会转换为仅客户端使用的代码 `sandbox_configuration_unconfirmed`（Core 从不返回它），且不会重新发送，因为拒绝响应可能会回显密钥。
 
 ## 操作验证 {#operation-validation}
 
@@ -73,6 +73,35 @@ Web 的控制台服务器在 `/core` 路径上发生自身故障时使用此封
 
 这些边界是验证常量，绝不是提交的值。节点名称按字节数限制；Project 名称和键名称按去除首尾空白后的 Unicode 字符数限制，且不得包含控制字符。系统仅按以下顺序报告第一个失败项：模型提供商 URL、协议、密钥、常规限制、Harness 协议，然后是 Harness 的必需限制；沙箱资源依次为 CPU、内存、磁盘，然后是 Runtime。`model_provider` 对象内的模型提供商字段错误仍以该对象的相应字段作为 `param`。未知的沙箱提供商返回一个不含这些字段的错误。
 
+## 其他管理错误 {#other-administration-errors}
+
+这些代码的 `param` 为 null，且没有 `details`。[沙箱部署](./sandbox-deployment.md#errors)说明各沙箱代码何时出现。
+
+| HTTP | 代码 | 含义 |
+| --- | --- | --- |
+| 400 | `sandbox_operation_unsupported` | 所选沙箱提供商不支持该操作 |
+| 401 | `invalid_admin_key` | Bearer 凭据不是有效的 Core Key |
+| 404 | `not_found` | 操作不存在、Harness 未知，或该 Harness 没有部署默认模型服务 |
+| 409 | `project_archived` | 目标 Project 已归档 |
+| 409 | `project_exists` | 该 Project ID 已存在 |
+| 409 | `project_api_key_exists` | 该 API Key ID 已存在 |
+| 409 | `executor_credential_exists` | 该执行器凭证 ID 已存在；要替换密钥，请轮换它 |
+| 409 | `sandbox_not_configured` | 沙箱部署尚未配置 |
+| 409 或 503 | `sandbox_reset_in_progress` | 沙箱正在重置 |
+| 409 | `sandbox_configuration_error` | 当前安装无法支持所选提供商，例如公开 URL 为 loopback 时选择 E2B |
+| 409 | `sandbox_deployment_conflict` | 沙箱部署在当前状态下无法更改 |
+| 409 | `sandbox_specification_mismatch` | 已保存的部署规格对其提供商不再有效 |
+| 409 | `runtime_node_in_use` | 节点仍有资源分配、快照、预留资源或待清理项 |
+| 409 | `environment_unavailable` | Session 的环境已不可用，例如在不提供执行的 Core 上归档 |
+| 409 | `runtime_history_unsupported` | 该 Session 不支持 Runtime 历史 |
+| 500 | `internal_error` | Core 未能完成操作 |
+| 503 | `runtime_node_unavailable` | 没有可用或有剩余容量的沙箱节点 |
+| 503 | `credential_storage_unavailable` | Core 没有凭证加密密钥 |
+| 503 | `execution_unavailable` | 此 Core 不提供执行功能 |
+| 503 | `runtime_history_unavailable` | 持久 Runtime 历史未配置或暂时不可用 |
+| 503 | `core_metrics_unavailable` | 无法读取 Core 指标 |
+| 503 | `file_transfer_unavailable` | 有界内容传输不可用 |
+
 ## 诊断失败类别 {#diagnostic-failure-categories}
 
 [Session and Turn diagnostics reads](session-diagnostics.md) 会在成功的 200 快照内返回以下类别，而不是以错误封装的形式返回。公开 `/v1` 的 Turn 错误保持不变。除非表格另有说明，否则 `params` 为 `{}`。
diff --git a/contracts/agents-api/zh/sandbox-deployment.md b/contracts/agents-api/zh/sandbox-deployment.md
index dea0cf983..cf026eb4b 100644
--- a/contracts/agents-api/zh/sandbox-deployment.md
+++ b/contracts/agents-api/zh/sandbox-deployment.md
@@ -1,7 +1,7 @@
 ---
 title: "沙箱部署"
 source: contracts/agents-api/sandbox-deployment.md
-source_hash: 06a69e3d0ba245ab27c0b5d7390364a35d10fb8478e2d0f6867749b29368f980
+source_hash: 6f765be45518f23ace6384938616eb12aba7554e7f8fbfadb89738f26c692dd5
 ---
 
 沙箱部署为 Core 管理的 `openai_hosted` 执行选择 Sandbox Provider、每个沙箱的资源以及不可变的 Runtime 发行版。PostgreSQL 为每个安装维护一个当前有效选择；Web 和 Core API 写入同一配置。节点文件保存其已安装副本和特定于主机的路径，且不能覆盖其资源或 Runtime。该选择独立于 Harness；部署可以保持未配置状态，既无节点，也不接受托管准入。
@@ -226,6 +226,6 @@ POST 会在持久保存候选配置之前对其进行验证，并且不会创建
 
 ## 规范的节点规格 {#canonical-node-specification}
 
-`sandbox/deployment_contract.go`负责资源边界、提供商要求、发行版模式和规范字段顺序；`sandbox/deployment.go`在 Core 中应用这些规则。安装程序会使用 `deploy/node/node_spec.py` 中生成的声明，因此不存在第二套限制或模式。请在仓库根目录运行 `go run ./services/core/cmd/specification-contract -write` 重新生成；作为 `make check` 一部分的沙箱 Go 测试会拒绝过时的投影。
+`sandbox/deployment_contract.go`负责资源边界、提供商要求、发行版模式和规范字段顺序；`sandbox/deployment.go`在 Core 中应用这些规则。安装程序会使用 `deploy/node/node_spec.py` 中生成的声明，TypeScript 客户端和 Web 使用 `packages/agents-client/src/deployment-contract.ts` 中生成的边界和模式，因此不存在第二套限制或模式。请在仓库根目录运行 `go run ./services/core/cmd/specification-contract -write` 重新生成两者；作为 `make check` 一部分的沙箱 Go 测试会拒绝过时的投影。
 
 规范摘要是紧凑 UTF-8 JSON 的 SHA-256，其中 `provider` 位于首位，其次是 `resources`，然后在提供商需要时放置 `runtime`。资源和 Runtime 字段遵循契约的声明顺序；值为零的可选磁盘字段会被省略，必填字段则保持存在。发行版标识采用小写 ASCII，摘要绝不会受传入字段顺序或空白字符影响。`services/core/internal/sandbox/testdata/deployment-contract.json`保存共享验收用例、精确的规范字节和摘要，Go 与 Python 测试都会使用这些内容。
diff --git a/internal/modelprovider/config.go b/internal/modelprovider/config.go
index 386277d8f..595beb289 100644
--- a/internal/modelprovider/config.go
+++ b/internal/modelprovider/config.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"net"
 	"net/url"
+	"slices"
 	"strings"
 )
 
@@ -47,15 +48,11 @@ func ParseProvider(raw any) (Provider, error) {
 	return provider, nil
 }
 
-// Valid is the single vocabulary of supported upstream protocol formats.
-func (p Protocol) Valid() bool {
-	switch p {
-	case Anthropic, Responses, ChatCompletions:
-		return true
-	default:
-		return false
-	}
-}
+// Protocols is the single vocabulary of supported upstream protocol formats.
+// The Harness catalog generator projects it to the TypeScript client.
+func Protocols() []Protocol { return []Protocol{Anthropic, Responses, ChatCompletions} }
+
+func (p Protocol) Valid() bool { return slices.Contains(Protocols(), p) }
 
 func (p Provider) Validate() error {
 	if !p.Protocol.Valid() {
diff --git a/packages/agents-client/src/admin-projection.ts b/packages/agents-client/src/admin-projection.ts
index 6b94de644..206502a28 100644
--- a/packages/agents-client/src/admin-projection.ts
+++ b/packages/agents-client/src/admin-projection.ts
@@ -1,4 +1,4 @@
-import { coreHarnessKinds } from "./harness-catalog";
+import { coreHarnessKinds, modelProviderProtocols } from "./harness-catalog";
 import { AgentCoreError, projectRuntimeObservation, projectSavedAgentConfiguration } from "./client";
 import { projectTokenUsage } from "./usage-projection";
 import { safeProvider } from "./execution-configuration-projection";
@@ -227,7 +227,7 @@ export function projectHarnessModelConfiguration(value: unknown, harness?: CoreH
 }
 function projectModelConfigurationSupport(value: unknown): CoreHarness["model_configuration_support"] {
   const support = record(value, ["protocols", "accepts_harness_config", "token_limits_required"]);
-  const known = new Set(["anthropic", "responses", "chat_completions"]);
+  const known: ReadonlySet<unknown> = new Set(modelProviderProtocols);
   const protocols = support.protocols;
   if (!Array.isArray(protocols) || protocols.length === 0 || protocols.some((protocol) => !known.has(protocol)) ||
     new Set(protocols).size !== protocols.length ||
diff --git a/packages/agents-client/src/deployment-contract.ts b/packages/agents-client/src/deployment-contract.ts
new file mode 100644
index 000000000..77ccf9d18
--- /dev/null
+++ b/packages/agents-client/src/deployment-contract.ts
@@ -0,0 +1,3 @@
+// Code generated by services/core/cmd/specification-contract from sandbox/deployment_contract.go; DO NOT EDIT.
+
+export const deploymentContract = {"resources":[{"name":"cpus","min":1,"max":255,"omit_zero":false},{"name":"memory_mib","min":512,"max":1048576,"omit_zero":false},{"name":"root_disk_mib","min":0,"max":4294967295,"omit_zero":true},{"name":"environment_disk_mib","min":0,"max":4294967295,"omit_zero":true}],"runtime":[{"name":"source_commit","pattern":"[0-9a-f]{40}"},{"name":"image_id","pattern":"sha256:[0-9a-f]{64}"},{"name":"image_manifest_digest","pattern":"sha256:[0-9a-f]{64}"},{"name":"microsandbox_ref","pattern":"oac-runtime@sha256:[0-9a-f]{64}"},{"name":"runtime_sha256","pattern":"[0-9a-f]{64}"},{"name":"firmware_sha256","pattern":"[0-9a-f]{64}"}],"minimum_disk":1024} as const;
diff --git a/packages/agents-client/src/execution-configuration-projection.ts b/packages/agents-client/src/execution-configuration-projection.ts
index 5ae4c5000..35ff00a33 100644
--- a/packages/agents-client/src/execution-configuration-projection.ts
+++ b/packages/agents-client/src/execution-configuration-projection.ts
@@ -1,3 +1,4 @@
+import { modelProviderProtocols } from "./harness-catalog";
 import { canonicalUuid, exactFields, isNonnegativeInteger, isRecord, onlyFields, sameResourceId } from "./response-projection";
 import type { ExecutionConfigurationSource, ModelProviderView, SessionExecutionConfiguration } from "./types";
 
@@ -5,6 +6,7 @@ type Invalid = () => never;
 const sources = new Set(["session", "agent", "deployment", "unknown"]);
 const selectionFields = new Set(["value", "source"]);
 const providerFields = new Set(["protocol", "base_url", "api_key_configured", "context_window", "max_output_tokens"]);
+const protocols: ReadonlySet<unknown> = new Set(modelProviderProtocols);
 
 function selection(value: unknown, invalid: Invalid): SessionExecutionConfiguration["model"] {
   if (!isRecord(value) || !exactFields(value, selectionFields) || !sources.has(String(value.source)) ||
@@ -32,14 +34,14 @@ function safeBaseURL(value: string): boolean {
 /** The safe provider view shared by frozen Session configuration and saved Agent reads. */
 export function safeProvider(value: unknown, invalid: Invalid): ModelProviderView {
   if (!isRecord(value) || !onlyFields(value, providerFields) ||
-    (value.protocol !== "responses" && value.protocol !== "anthropic" && value.protocol !== "chat_completions") ||
+    !protocols.has(value.protocol) ||
     typeof value.base_url !== "string" || typeof value.api_key_configured !== "boolean" ||
     (value.context_window !== undefined && !isNonnegativeInteger(value.context_window)) ||
     (value.max_output_tokens !== undefined && !isNonnegativeInteger(value.max_output_tokens)) ||
     Number(value.max_output_tokens ?? 0) > Number(value.context_window ?? 0)) return invalid();
   if (!safeBaseURL(value.base_url)) return invalid();
   return {
-    protocol: value.protocol, base_url: value.base_url, api_key_configured: value.api_key_configured,
+    protocol: value.protocol as ModelProviderView["protocol"], base_url: value.base_url, api_key_configured: value.api_key_configured,
     ...(value.context_window === undefined ? {} : { context_window: value.context_window as number }),
     ...(value.max_output_tokens === undefined ? {} : { max_output_tokens: value.max_output_tokens as number }),
   };
diff --git a/packages/agents-client/src/harness-catalog.ts b/packages/agents-client/src/harness-catalog.ts
index 2594b6442..3d1934a99 100644
--- a/packages/agents-client/src/harness-catalog.ts
+++ b/packages/agents-client/src/harness-catalog.ts
@@ -7,3 +7,5 @@ export const coreHarnessNames: Record<CoreHarnessKind, string> = {
   "codex": "Codex",
   "mcode": "MiniMax Code",
 };
+export const modelProviderProtocols = ["anthropic", "responses", "chat_completions"] as const;
+export type ModelProviderProtocol = (typeof modelProviderProtocols)[number];
diff --git a/packages/agents-client/src/index.ts b/packages/agents-client/src/index.ts
index b58933aa3..669bdcd4b 100644
--- a/packages/agents-client/src/index.ts
+++ b/packages/agents-client/src/index.ts
@@ -1,4 +1,5 @@
-export { coreHarnessKinds, coreHarnessNames } from "./harness-catalog";
+export { coreHarnessKinds, coreHarnessNames, modelProviderProtocols } from "./harness-catalog";
+export { deploymentContract } from "./deployment-contract";
 export { AgentCoreError, CreationStreamRetryError, createIdempotencyKey, isSessionDeletionConflict, OpenAIAgentsClient } from "./client";
 export type { OpenAIAgentsClientOptions, CoreErrorDetail, CoreErrorDetails } from "./client";
 export { createSSEDecoder } from "./sse";
diff --git a/packages/agents-client/src/sandbox-client.ts b/packages/agents-client/src/sandbox-client.ts
index ef18d0c02..256ee7001 100644
--- a/packages/agents-client/src/sandbox-client.ts
+++ b/packages/agents-client/src/sandbox-client.ts
@@ -1,5 +1,6 @@
 import { AgentCoreError } from "./client";
 import { CoreRequester, type CoreClientOptions } from "./core-request";
+import { deploymentContract } from "./deployment-contract";
 import { hasOwn, isNonnegativeInteger, isRecord, onlyFields, sameResourceId } from "./response-projection";
 import type { ReadOptions } from "./types";
 
@@ -25,6 +26,9 @@ export function normalizeSandboxNodeDiagnostic(value: string): Exclude<SandboxNo
 }
 
 export type SandboxProvider = "docker" | "microsandbox" | "e2b";
+/** Client-generated, never a Core code: a deployment write whose rejection could echo the key and is withheld. */
+export const sandboxConfigurationUnconfirmed = "sandbox_configuration_unconfirmed";
+const sandboxConfigurationParams = new Set<unknown>(["runtime", ...deploymentContract.resources.map(({ name }) => `resources.${name}`)]);
 /** CPU and MiB limits for each sandbox, not node concurrency. */
 export interface SandboxResources { cpus: number; memory_mib: number; root_disk_mib?: number; environment_disk_mib?: number }
 export interface SandboxRuntimeRelease { source_commit: string; image_id: string; image_manifest_digest: string; microsandbox_ref: string; runtime_sha256: string; firmware_sha256: string }
@@ -389,7 +393,7 @@ export class SandboxAdminClient {
           const fields = error.code === "sandbox_generation_stale" ? ["current_generation"] : error.code === "sandbox_in_use" ? ["allocations", "pending"] : error.code === "invalid_sandbox_configuration" ? ["min", "max"] : [];
           const details = Object.fromEntries(fields.filter(field => isNonnegativeInteger(error.details?.[field])).map(field => [field, Number(error.details![field])]));
           const safeParam = error.status === 400
-            ? error.code === "sandbox_credential_invalid" ? "credential" : error.code === "sandbox_configuration_invalid" ? "configuration" : error.code === "invalid_sandbox_configuration" && ["runtime", "resources.cpus", "resources.memory_mib", "resources.root_disk_mib", "resources.environment_disk_mib"].includes(error.param ?? "") ? error.param : null
+            ? error.code === "sandbox_credential_invalid" ? "credential" : error.code === "sandbox_configuration_invalid" ? "configuration" : error.code === "invalid_sandbox_configuration" && sandboxConfigurationParams.has(error.param) ? error.param : null
             : error.status === 409 && error.code === "sandbox_credential_ownership" ? "credential" : null;
           const param = error.param === safeParam ? safeParam : null;
           throw new AgentCoreError(messages[error.code]!, error.status, error.code, param, undefined, Object.keys(details).length ? details : undefined);
@@ -401,7 +405,7 @@ export class SandboxAdminClient {
         throw new AgentCoreError("E2B sandboxes reach Core over the internet. Set an HTTPS public URL that is not loopback.", 409, "sandbox_configuration_error", null);
       }
       // Any other credential-bearing rejection may reflect the key in any error field.
-      throw new AgentCoreError("Sandbox configuration could not be confirmed. Refresh before submitting again.", error instanceof AgentCoreError ? error.status : 0, "sandbox_configuration_unconfirmed");
+      throw new AgentCoreError("Sandbox configuration could not be confirmed. Refresh before submitting again.", error instanceof AgentCoreError ? error.status : 0, sandboxConfigurationUnconfirmed);
     }
   }
   async listNodes(options?: ReadOptions): Promise<{ data: SandboxNode[] }> {
diff --git a/packages/agents-client/src/types.ts b/packages/agents-client/src/types.ts
index bb75dc520..ceac7b2c9 100644
--- a/packages/agents-client/src/types.ts
+++ b/packages/agents-client/src/types.ts
@@ -1,4 +1,4 @@
-import type { CoreHarnessKind } from "./harness-catalog";
+import type { CoreHarnessKind, ModelProviderProtocol } from "./harness-catalog";
 export type PageOrder = "asc" | "desc";
 
 export interface ListPage<T> {
@@ -1185,11 +1185,11 @@ export interface RuntimeHistory {
   token_usage: RuntimeHistoryTokenUsagePoint[];
 }
 
-export type { CoreHarnessKind } from "./harness-catalog";
+export type { CoreHarnessKind, ModelProviderProtocol } from "./harness-catalog";
 
 /** A complete replacement bundle. API keys are write-only. */
 export interface ModelProviderInput {
-  protocol: "anthropic" | "responses" | "chat_completions";
+  protocol: ModelProviderProtocol;
   base_url: string;
   api_key: string;
   context_window?: number;
@@ -1198,7 +1198,7 @@ export interface ModelProviderInput {
 }
 
 export interface ModelProviderView {
-  protocol: "anthropic" | "responses" | "chat_completions";
+  protocol: ModelProviderProtocol;
   base_url: string;
   context_window?: number;
   max_output_tokens?: number;
diff --git a/scripts/generate-harness-catalog.py b/scripts/generate-harness-catalog.py
index af3d2091d..0af1ba279 100644
--- a/scripts/generate-harness-catalog.py
+++ b/scripts/generate-harness-catalog.py
@@ -47,6 +47,20 @@ def render_installer(providers):
             "PROVIDERS = " + pformat(providers, sort_dicts=True, width=100) + "\n")
 
 
+def render_client(entries, protocols):
+    kinds = ", ".join(json.dumps(entry["kind"]) for entry in entries)
+    labels = "\n".join(f'  {json.dumps(entry["kind"])}: {json.dumps(entry["label"])},' for entry in entries)
+    return HEADER + f'''
+export const coreHarnessKinds = [{kinds}] as const;
+export type CoreHarnessKind = (typeof coreHarnessKinds)[number];
+export const coreHarnessNames: Record<CoreHarnessKind, string> = {{
+{labels}
+}};
+export const modelProviderProtocols = [{", ".join(json.dumps(protocol) for protocol in protocols)}] as const;
+export type ModelProviderProtocol = (typeof modelProviderProtocols)[number];
+'''
+
+
 def render(entries):
     packages = sorted({entry["configuration"] for entry in entries})
     imports = "\n".join(f'\t"{MODULE}/internal/harnessconfig/{package}"' for package in packages)
@@ -56,7 +70,6 @@ def render(entries):
     kinds = ", ".join(json.dumps(entry["kind"]) for entry in entries)
     profiles = "\n".join(
         f'\t{json.dumps(entry["kind"])}: {entry["profile"]}(),' for entry in entries)
-    labels = "\n".join(f'  {json.dumps(entry["kind"])}: {json.dumps(entry["label"])},' for entry in entries)
     tick = chr(96)
     rows = "\n".join(
         f'| {tick}{e["kind"]}{tick} | {e["label"]} | {tick}{e["configuration"]}.Configuration{tick} | {tick}{e["profile"]}{tick} |'
@@ -96,13 +109,6 @@ def render(entries):
 {profiles}
 }})
 '''),
-        Path("packages/agents-client/src/harness-catalog.ts"): HEADER + f'''
-export const coreHarnessKinds = [{kinds}] as const;
-export type CoreHarnessKind = (typeof coreHarnessKinds)[number];
-export const coreHarnessNames: Record<CoreHarnessKind, string> = {{
-{labels}
-}};
-''',
         Path("contracts/agents-api/harness-catalog.md"): f'''[//]: # (Generated by scripts/generate-harness-catalog.py; DO NOT EDIT.)
 # Built-in Harness registrations
 
@@ -149,9 +155,10 @@ def projection(relative, content):
     # mode a stale registration must fail before its declarations can be projected.
     if stale:
         raise SystemExit("Stale Harness catalog projections; run make generate-harness-catalog:\n" + "\n".join(stale))
-    providers = json.loads(subprocess.run(["go", "run", "./scripts/harness-catalog"], cwd=ROOT,
-                                         text=True, check=True, capture_output=True).stdout)
-    projection(Path("scripts/acceptance/harness_catalog.py"), render_installer(providers))
+    declared = json.loads(subprocess.run(["go", "run", "./scripts/harness-catalog"], cwd=ROOT,
+                                        text=True, check=True, capture_output=True).stdout)
+    projection(Path("scripts/acceptance/harness_catalog.py"), render_installer(declared["harnesses"]))
+    projection(Path("packages/agents-client/src/harness-catalog.ts"), render_client(entries, declared["protocols"]))
     if stale:
         raise SystemExit("Stale Harness catalog projections; run make generate-harness-catalog:\n" + "\n".join(stale))
 
diff --git a/scripts/generate-harness-catalog.test.py b/scripts/generate-harness-catalog.test.py
index a0ff636c3..70b9b7ce7 100644
--- a/scripts/generate-harness-catalog.test.py
+++ b/scripts/generate-harness-catalog.test.py
@@ -35,7 +35,9 @@ def test_new_registration_reaches_all_projections(self):
         with tempfile.TemporaryDirectory() as directory:
             path = Path(directory) / "catalog.json"
             path.write_text(json.dumps(entries))
-            generated = catalog.render(catalog.load_catalog(path))
+            loaded = catalog.load_catalog(path)
+            generated = catalog.render(loaded)
+        generated["client"] = catalog.render_client(loaded, ["responses"])
         for content in generated.values():
             self.assertIn("example", content)
             for old in ("codex", "claude_sdk", "mcode"):
diff --git a/scripts/harness-catalog/main.go b/scripts/harness-catalog/main.go
index 6ce96690f..dff896066 100644
--- a/scripts/harness-catalog/main.go
+++ b/scripts/harness-catalog/main.go
@@ -1,4 +1,5 @@
-// Command harness-catalog projects adapter-owned provider declarations for tooling.
+// Command harness-catalog projects adapter-owned provider declarations and the
+// model-provider protocol vocabulary for tooling.
 package main
 
 import (
@@ -6,6 +7,7 @@ import (
 	"os"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig/builtin"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/modelprovider"
 )
 
 type provider struct {
@@ -25,7 +27,11 @@ func declarations() map[string]map[string]provider {
 }
 
 func main() {
-	if err := json.NewEncoder(os.Stdout).Encode(declarations()); err != nil {
+	projection := struct {
+		Harnesses map[string]map[string]provider `json:"harnesses"`
+		Protocols []modelprovider.Protocol       `json:"protocols"`
+	}{declarations(), modelprovider.Protocols()}
+	if err := json.NewEncoder(os.Stdout).Encode(projection); err != nil {
 		panic(err)
 	}
 }
diff --git a/services/core/README.md b/services/core/README.md
index 19563a3c2..3ca7b19ec 100644
--- a/services/core/README.md
+++ b/services/core/README.md
@@ -10,7 +10,7 @@
 | `cmd/device` | `oac-core-device` | Provisions or revokes an [operator device profile](../../contracts/agents-api/machine-api.md#operator-device-profile) for `environment: none` engine hosts |
 | `cmd/environment-key` | `oac-core-environment-key` | The [break-glass executor credential command](../../contracts/agents-api/environment-executor-credentials.md#break-glass-command) |
 | `cmd/sandbox-node` | `oac-node` | The sandbox node program; see the [nodes guide](../../docs/getting-started/nodes.md) |
-| `cmd/specification-contract` | None | Regenerates the installer's node specification projection |
+| `cmd/specification-contract` | None | Regenerates the deployment contract projections of the node installer and the TypeScript client |
 
 `make build-core` builds the four executables into `~/.oac/build/oac-core`; [Standalone Core builds](../../docs/maintainers.md#standalone-core-builds) describes the build and its options. `make build-daemon` builds `oac-daemon`.
 
diff --git a/services/core/cmd/specification-contract/main.go b/services/core/cmd/specification-contract/main.go
index 308224655..c79213dda 100644
--- a/services/core/cmd/specification-contract/main.go
+++ b/services/core/cmd/specification-contract/main.go
@@ -1,24 +1,28 @@
-// specification-contract maintains the generated node installer projection.
+// specification-contract maintains the generated deployment contract
+// projections of the node installer and the TypeScript client.
 package main
 
 import (
 	"flag"
 	"fmt"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 	"os"
 	"strings"
 )
 
 func main() {
-	write := flag.Bool("write", false, "update deploy/node/node_spec.py from the repository root")
+	write := flag.Bool("write", false, "update deploy/node/node_spec.py and packages/agents-client/src/deployment-contract.ts from the repository root")
 	flag.Parse()
 	projection, err := providers.Builtin().PythonDeploymentContract()
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
+	typescript := sandbox.TypeScriptDeploymentContract()
 	if !*write {
 		fmt.Println(projection)
+		fmt.Print(typescript)
 		return
 	}
 	path := "deploy/node/node_spec.py"
@@ -36,4 +40,7 @@ func main() {
 	if err = os.WriteFile(path, []byte(source[:start]+projection+source[end:]), 0644); err != nil {
 		panic(err)
 	}
+	if err = os.WriteFile("packages/agents-client/src/deployment-contract.ts", []byte(typescript), 0644); err != nil {
+		panic(err)
+	}
 }
diff --git a/services/core/internal/api/core_error_catalog_test.go b/services/core/internal/api/core_error_catalog_test.go
new file mode 100644
index 000000000..2d81518ab
--- /dev/null
+++ b/services/core/internal/api/core_error_catalog_test.go
@@ -0,0 +1,142 @@
+package api
+
+import (
+	"encoding/json"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"io/fs"
+	"maps"
+	"os"
+	"path/filepath"
+	"regexp"
+	"slices"
+	"strconv"
+	"strings"
+	"testing"
+)
+
+// Codes the error writers produce that never reach an administration caller.
+// Everything else they produce is in the catalog or in the wire vocabulary of
+// wire-semantics.md, which keeps its /v1 meaning on every route.
+var nonAdministrationCodes = []string{
+	// Session creation and input admission on /v1.
+	"environment_input_cancelled", "environment_input_expired", "model_provider_required", "sandbox_nodes_preparing", "turn_conflict",
+	// Machine routes for nodes and native installers.
+	"installation_authorization_invalid", "installation_unavailable", "invalid_node_credential", "sandbox_node_address_mismatch",
+	// Removal of the file-managed local node, which the process deployment path owns.
+	"runtime_local_node_configured",
+}
+
+// The shared catalog lists every code an administration caller (/core/v1 or
+// the console's /core paths) can receive outside the wire vocabulary.
+// core-errors.md documents and Web localizes exactly these codes.
+func TestCoreErrorCatalog(t *testing.T) {
+	raw, err := os.ReadFile("testdata/core-errors.json")
+	if err != nil {
+		t.Fatal(err)
+	}
+	var catalog []string
+	if err := json.Unmarshal(raw, &catalog); err != nil {
+		t.Fatal(err)
+	}
+	// One pass collects every string literal, which covers codes carried by
+	// typed errors, and the literal codes passed to the error writers.
+	literals, written := map[string]bool{}, map[string]bool{}
+	files := token.NewFileSet()
+	for _, root := range []string{"../../../../services", "../../../../contracts"} {
+		err := filepath.WalkDir(root, func(path string, entry fs.DirEntry, err error) error {
+			switch {
+			case err != nil:
+				return err
+			case entry.IsDir() && (entry.Name() == "node_modules" || entry.Name() == "testdata"):
+				return filepath.SkipDir
+			case entry.IsDir() || !strings.HasSuffix(path, ".go") || strings.HasSuffix(path, "_test.go"):
+				return nil
+			}
+			file, err := parser.ParseFile(files, path, nil, parser.SkipObjectResolution)
+			if err != nil {
+				return err
+			}
+			ast.Inspect(file, func(node ast.Node) bool {
+				switch node := node.(type) {
+				case *ast.BasicLit:
+					if value, err := strconv.Unquote(node.Value); node.Kind == token.STRING && err == nil {
+						literals[value] = true
+					}
+				case *ast.CallExpr:
+					if name, ok := node.Fun.(*ast.Ident); ok && len(node.Args) > 2 && slices.Contains([]string{"writeError", "writeAPIError", "writeCoreError", "consoleCoreError"}, name.Name) {
+						if code, ok := node.Args[2].(*ast.BasicLit); ok {
+							value, _ := strconv.Unquote(code.Value)
+							written[value] = value != ""
+						}
+					}
+				}
+				return true
+			})
+			return nil
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+	for _, code := range slices.Concat(catalog, nonAdministrationCodes) {
+		if !literals[code] {
+			t.Errorf("code %q has no Go producer", code)
+		}
+	}
+	wire := backtickedCodes(t, "../../../../contracts/agents-api/wire-semantics.md")
+	for code, produced := range written {
+		if produced && !slices.Contains(catalog, code) && !slices.Contains(nonAdministrationCodes, code) && !wire[code] {
+			t.Errorf("produced code %q is missing from the catalog; list it in nonAdministrationCodes only if no administration caller can receive it", code)
+		}
+	}
+	documented := documentedCoreErrorCodes(t, "../../../../contracts/agents-api/core-errors.md")
+	slices.Sort(catalog)
+	if !slices.Equal(documented, catalog) {
+		t.Errorf("core-errors.md codes = %v, want shared catalog %v", documented, catalog)
+	}
+}
+
+var backtickedCode = regexp.MustCompile("`([a-z_]+)`")
+
+func backtickedCodes(t *testing.T, path string) map[string]bool {
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	codes := map[string]bool{}
+	for _, match := range backtickedCode.FindAllStringSubmatch(string(raw), -1) {
+		codes[match[1]] = true
+	}
+	return codes
+}
+
+// documentedCoreErrorCodes reads the Code column of every error table before
+// the diagnostics catalog, which is a separate vocabulary.
+func documentedCoreErrorCodes(t *testing.T, path string) []string {
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	text, _, _ := strings.Cut(string(raw), "## Diagnostic failure categories")
+	codes := map[string]bool{}
+	column := -1
+	for _, line := range strings.Split(text, "\n") {
+		if !strings.HasPrefix(line, "|") {
+			column = -1
+			continue
+		}
+		cells := strings.Split(strings.Trim(line, "|"), "|")
+		if column < 0 {
+			column = slices.IndexFunc(cells, func(cell string) bool { return strings.TrimSpace(cell) == "Code" })
+			continue
+		}
+		if column < len(cells) {
+			for _, match := range backtickedCode.FindAllStringSubmatch(cells[column], -1) {
+				codes[match[1]] = true
+			}
+		}
+	}
+	return slices.Sorted(maps.Keys(codes))
+}
diff --git a/services/core/internal/api/testdata/core-errors.json b/services/core/internal/api/testdata/core-errors.json
new file mode 100644
index 000000000..256654003
--- /dev/null
+++ b/services/core/internal/api/testdata/core-errors.json
@@ -0,0 +1,45 @@
+[
+  "console_origin_rejected",
+  "console_request_invalid",
+  "console_sign_in_required",
+  "core_metrics_unavailable",
+  "core_unreachable",
+  "credential_storage_unavailable",
+  "environment_unavailable",
+  "execution_unavailable",
+  "executor_credential_exists",
+  "file_transfer_unavailable",
+  "harness_config_invalid",
+  "internal_error",
+  "invalid_admin_key",
+  "invalid_model_provider",
+  "invalid_name",
+  "invalid_node_capacity",
+  "invalid_sandbox_configuration",
+  "model_configuration_model_invalid",
+  "model_provider_api_key_invalid",
+  "model_provider_base_url_invalid",
+  "model_provider_protocol_unsupported",
+  "model_provider_token_limits_invalid",
+  "not_found",
+  "project_api_key_exists",
+  "project_archived",
+  "project_exists",
+  "runtime_history_unavailable",
+  "runtime_history_unsupported",
+  "runtime_node_in_use",
+  "runtime_node_unavailable",
+  "sandbox_configuration_error",
+  "sandbox_configuration_invalid",
+  "sandbox_credential_invalid",
+  "sandbox_credential_ownership",
+  "sandbox_deployment_conflict",
+  "sandbox_generation_stale",
+  "sandbox_in_use",
+  "sandbox_not_configured",
+  "sandbox_operation_unsupported",
+  "sandbox_reset_in_progress",
+  "sandbox_reset_required",
+  "sandbox_specification_mismatch",
+  "sandbox_verification_unconfirmed"
+]
diff --git a/services/core/internal/sandbox/deployment_contract.go b/services/core/internal/sandbox/deployment_contract.go
index 4350100d4..e79ea2f40 100644
--- a/services/core/internal/sandbox/deployment_contract.go
+++ b/services/core/internal/sandbox/deployment_contract.go
@@ -8,7 +8,8 @@ import (
 )
 
 // This contract owns numeric bounds, release patterns and canonical field order.
-// Python installers consume its generated projection in node_spec.py.
+// The node installer (node_spec.py) and the TypeScript client
+// (deployment-contract.ts) consume its generated projections.
 const minimumDiskMiB uint32 = 1024
 
 type resourceRule struct {
@@ -45,9 +46,31 @@ var runtimeContract = []runtimeRule{
 	{"firmware_sha256", "[0-9a-f]{64}"},
 }
 
-// PythonDeploymentContract generates the installer projection. Struct order is
-// checked before generation because it also defines Go's canonical JSON bytes.
+// PythonDeploymentContract generates the installer projection.
 func PythonDeploymentContract(policies map[string]DeploymentPolicy) string {
+	raw := projectDeploymentContract(struct {
+		Resources   []resourceRule              `json:"resources"`
+		Runtime     []runtimeRule               `json:"runtime"`
+		Providers   map[string]DeploymentPolicy `json:"providers"`
+		MinimumDisk uint32                      `json:"minimum_disk"`
+	}{resourceContract, runtimeContract, policies, minimumDiskMiB})
+	return "# BEGIN GENERATED DEPLOYMENT CONTRACT\n# Generated from sandbox/deployment_contract.go; do not edit.\n_CONTRACT = json.loads(" + fmt.Sprintf("%q", string(raw)) + ")\n# END GENERATED DEPLOYMENT CONTRACT"
+}
+
+// TypeScriptDeploymentContract generates the client projection of the bounds
+// and patterns; provider policies are not part of it.
+func TypeScriptDeploymentContract() string {
+	raw := projectDeploymentContract(struct {
+		Resources   []resourceRule `json:"resources"`
+		Runtime     []runtimeRule  `json:"runtime"`
+		MinimumDisk uint32         `json:"minimum_disk"`
+	}{resourceContract, runtimeContract, minimumDiskMiB})
+	return "// Code generated by services/core/cmd/specification-contract from sandbox/deployment_contract.go; DO NOT EDIT.\n\nexport const deploymentContract = " + string(raw) + " as const;\n"
+}
+
+// projectDeploymentContract encodes a projection. Struct order is checked
+// first because it also defines Go's canonical JSON bytes.
+func projectDeploymentContract(projection any) []byte {
 	for _, item := range []struct {
 		value any
 		names []string
@@ -64,13 +87,8 @@ func PythonDeploymentContract(policies map[string]DeploymentPolicy) string {
 			}
 		}
 	}
-	raw, _ := json.Marshal(struct {
-		Resources   []resourceRule              `json:"resources"`
-		Runtime     []runtimeRule               `json:"runtime"`
-		Providers   map[string]DeploymentPolicy `json:"providers"`
-		MinimumDisk uint32                      `json:"minimum_disk"`
-	}{resourceContract, runtimeContract, policies, minimumDiskMiB})
-	return "# BEGIN GENERATED DEPLOYMENT CONTRACT\n# Generated from sandbox/deployment_contract.go; do not edit.\n_CONTRACT = json.loads(" + fmt.Sprintf("%q", string(raw)) + ")\n# END GENERATED DEPLOYMENT CONTRACT"
+	raw, _ := json.Marshal(projection)
+	return raw
 }
 func resourceNames() []string {
 	var names []string
diff --git a/services/core/internal/sandbox/providers/deployment_contract_test.go b/services/core/internal/sandbox/providers/deployment_contract_test.go
index 15e80b5e4..ea6477748 100644
--- a/services/core/internal/sandbox/providers/deployment_contract_test.go
+++ b/services/core/internal/sandbox/providers/deployment_contract_test.go
@@ -9,9 +9,13 @@ import (
 	"testing"
 )
 
-func TestInstallerDeploymentProjectionIsCurrent(t *testing.T) {
+func TestDeploymentContractProjectionsAreCurrent(t *testing.T) {
 	registry := Builtin()
-	raw, err := os.ReadFile("../../../../../deploy/node/node_spec.py")
+	python, err := os.ReadFile("../../../../../deploy/node/node_spec.py")
+	if err != nil {
+		t.Fatal(err)
+	}
+	typescript, err := os.ReadFile("../../../../../packages/agents-client/src/deployment-contract.ts")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -19,8 +23,8 @@ func TestInstallerDeploymentProjectionIsCurrent(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !strings.Contains(string(raw), expected) {
-		t.Fatal("node_spec.py contract is stale; regenerate with go run ./services/core/cmd/specification-contract -write")
+	if !strings.Contains(string(python), expected) || string(typescript) != sandbox.TypeScriptDeploymentContract() {
+		t.Fatal("deployment contract projection is stale; regenerate with go run ./services/core/cmd/specification-contract -write")
 	}
 }
 func TestDeploymentContractFixtures(t *testing.T) {

From 1a1af99ec1f63b2feb9c17654c749a7e99e86512 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 01:50:03 +0800
Subject: [PATCH 40/60] Load process settings once (#513)

---
 AGENTS.md                                     |   2 +-
 contracts/agents-api/admin-api.md             |   2 +-
 .../environment-executor-credentials.md       |   2 +-
 contracts/agents-api/environments.md          |   2 +-
 contracts/agents-api/model-execution.md       |   2 +-
 contracts/agents-api/runtime-observability.md |   2 +-
 contracts/agents-api/vaults.md                |   2 +-
 contracts/agents-api/zh/admin-api.md          |   4 +-
 .../zh/environment-executor-credentials.md    |   4 +-
 contracts/agents-api/zh/environments.md       |   4 +-
 contracts/agents-api/zh/model-execution.md    |   4 +-
 .../agents-api/zh/runtime-observability.md    |   4 +-
 contracts/agents-api/zh/vaults.md             |   4 +-
 deploy/compose/compose.yaml                   |   5 +-
 deploy/compose/test_compose.py                |   2 +-
 deploy/distribution/Runtime.Dockerfile        |   3 +-
 deploy/install.dev.sh                         |   2 +-
 docs/configuration.md                         |  65 +--
 docs/web/console-server.md                    |   6 +-
 docs/zh/configuration.md                      |  67 +--
 docs/zh/web/console-server.md                 |   8 +-
 internal/obs/log/init.go                      |  57 ++-
 internal/obs/log/init_test.go                 |  30 ++
 services/core/IMPLEMENTATION.md               |   2 +-
 services/core/cmd/oac/main.go                 |   5 +-
 services/core/cmd/server/core_metrics.go      |  26 +-
 services/core/cmd/server/credential_cipher.go |  26 --
 .../core/cmd/server/credential_cipher_test.go |  53 ---
 services/core/cmd/server/daemon_bootstrap.go  |  25 -
 services/core/cmd/server/installation.go      |  25 +-
 services/core/cmd/server/main.go              | 188 +++-----
 services/core/cmd/server/managed_nodes.go     |  72 +--
 services/core/cmd/server/managed_setup.go     |   7 +-
 .../core/cmd/server/managed_setup_test.go     |  30 +-
 services/core/cmd/server/oauth_refresh.go     |  18 -
 .../core/cmd/server/oauth_refresh_test.go     |  18 -
 .../core/cmd/server/process_configuration.go  |  23 -
 .../cmd/server/process_configuration_test.go  |  50 --
 services/core/cmd/server/runtime_history.go   | 136 +-----
 .../core/cmd/server/runtime_history_test.go   |  68 +--
 services/core/cmd/server/write_audit.go       |  49 --
 services/core/cmd/server/write_audit_test.go  |  51 ---
 services/core/deploy/claude/Dockerfile        |   1 -
 .../core/internal/api/contract_routes_test.go |   2 +-
 services/core/internal/api/dependencies.go    |   4 +-
 .../core/internal/api/dependencies_test.go    |   2 +-
 .../internal/api/environment_installation.go  |   6 +-
 .../api/environment_installation_test.go      |   2 +-
 .../api/project_api_key_configuration.go      |   3 -
 .../internal/api/project_api_keys_test.go     |   3 -
 services/core/internal/coremetrics/service.go |  85 +++-
 .../core/internal/coremetrics/service_test.go |  55 ++-
 .../core/internal/deployment/public_url.go    |  43 +-
 .../core/internal/deployment/rules_test.go    |  12 +-
 .../internal/environmentconfig/setup_test.go  |   2 +-
 .../bootstrap_interrupt_unix_test.go          |   2 +-
 .../core/internal/nativeinstaller/catalog.go  |   9 +-
 .../internal/nativeinstaller/catalog_test.go  |   6 +
 .../core/internal/processconfig/config.go     | 433 ++++++++++++------
 .../internal/processconfig/config_test.go     | 238 ++++++++--
 services/core/internal/runtime/gateway.go     |   6 +-
 services/core/internal/runtimeobs/sampler.go  |  49 +-
 .../core/internal/runtimeobs/sampler_test.go  |  80 +---
 services/web/Dockerfile                       |   1 -
 services/web/config.go                        |  29 +-
 services/web/config_test.go                   |  15 +-
 services/web/main.go                          |  27 +-
 67 files changed, 1053 insertions(+), 1217 deletions(-)
 create mode 100644 internal/obs/log/init_test.go
 delete mode 100644 services/core/cmd/server/credential_cipher.go
 delete mode 100644 services/core/cmd/server/credential_cipher_test.go
 delete mode 100644 services/core/cmd/server/daemon_bootstrap.go
 delete mode 100644 services/core/cmd/server/oauth_refresh.go
 delete mode 100644 services/core/cmd/server/oauth_refresh_test.go
 delete mode 100644 services/core/cmd/server/process_configuration.go
 delete mode 100644 services/core/cmd/server/process_configuration_test.go
 delete mode 100644 services/core/cmd/server/write_audit.go
 delete mode 100644 services/core/cmd/server/write_audit_test.go

diff --git a/AGENTS.md b/AGENTS.md
index d6e200722..364d6fb72 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -53,7 +53,7 @@ Do not multiply entities without necessity. The long-term goal is minimal code,
 
 Each setting and each piece of data is written in one place and read from that place: no second copy, no environment-variable or file fallback and no alias. A new setting joins its category and lives beside its peers.
 
-The categories are [process settings](docs/configuration.md#process-settings-configjson), [derived files](docs/configuration.md#how-oac-apply-works), [secrets](docs/configuration.md#installation-directory), and Core's database for [runtime settings](docs/configuration.md#runtime-settings-web) and execution data. [Configuration](docs/configuration.md) owns the installation layout and the settings themselves.
+The categories are [process settings](docs/configuration.md#process-settings), [derived files](docs/configuration.md#how-oac-apply-works), [secrets](docs/configuration.md#installation-directory), and Core's database for [runtime settings](docs/configuration.md#runtime-settings-web) and execution data. [Configuration](docs/configuration.md) owns the installation layout and the settings themselves.
 
 ### Pre-release: no compatibility layers
 
diff --git a/contracts/agents-api/admin-api.md b/contracts/agents-api/admin-api.md
index 81d361121..ca0356b5c 100644
--- a/contracts/agents-api/admin-api.md
+++ b/contracts/agents-api/admin-api.md
@@ -132,7 +132,7 @@ Core writes this record in the same transaction that creates the Session. Later
 | Field | Meaning |
 | --- | --- |
 | `object` | `core.installation` |
-| `installation_id` | The installation ID from `state.json` ([installation directory](../../docs/configuration.md#installation-directory)); null when Core runs without the sandbox manager |
+| `installation_id` | The installation ID from `OAC_INSTALLATION_ID_FILE` ([Compose installations](../../docs/configuration.md#compose-installations)); null when Core runs without the sandbox manager |
 | `public_url` | The [`public_url`](../../docs/configuration.md#settings) setting: the origin applications, nodes, sandboxes and self-hosted executors use. Null when unset |
 | `api_base_url` | `public_url` followed by `/v1`, the `OPENAI_BASE_URL` for Project API keys. Null when `public_url` is null |
 | `local_only` | True when `public_url` names a loopback host, which only the Core host reaches |
diff --git a/contracts/agents-api/environment-executor-credentials.md b/contracts/agents-api/environment-executor-credentials.md
index fad59755c..bd58ce767 100644
--- a/contracts/agents-api/environment-executor-credentials.md
+++ b/contracts/agents-api/environment-executor-credentials.md
@@ -35,7 +35,7 @@ The installer calls these machine routes on Core:
 | `POST /api/v1/agent-daemon/installation` | Grant | The frozen binding: `version`, `protocol_version`, `environment_id`, `remote_url`, `workspace_directory`, `harness` |
 | `POST /api/v1/agent-daemon/installation/claim` | Grant | `{"executor_token":"SECRET"}`; 204 |
 
-An invalid or expired grant returns 401 `installation_authorization_invalid`. Without matching installers the grant routes return 503 `installation_unavailable`. Core signs each grant with the installation's [`secrets/credential.key`](../../docs/configuration.md#installation-directory); without a configured key, the Session responses and Core-key read above and the grant routes return 503 `credential_storage_unavailable`. A malformed secret returns 400. Artifact routes carry no credential, and the grant is sent only to Core, never to an artifact host.
+An invalid or expired grant returns 401 `installation_authorization_invalid`. Without matching installers the grant routes return 503 `installation_unavailable`. Core signs each grant with the installation's [`secrets/core/credential.key`](../../docs/configuration.md#compose-installations); without a configured key, the Session responses and Core-key read above and the grant routes return 503 `credential_storage_unavailable`. A malformed secret returns 400. Artifact routes carry no credential, and the grant is sent only to Core, never to an artifact host.
 
 ## Core-key routes
 
diff --git a/contracts/agents-api/environments.md b/contracts/agents-api/environments.md
index b7258d79d..4ac2eece0 100644
--- a/contracts/agents-api/environments.md
+++ b/contracts/agents-api/environments.md
@@ -271,7 +271,7 @@ session = client.beta.agents.sessions.create(
 - Responses carry safe metadata and never `env`, `setup_commands` bodies or inline file data.
 - List uses `after`, `limit` (default 20; 0 is treated as 1 and values above 100 as 100) and `order` (default `desc`), ordered by creation time and ID. Missing and foreign Template IDs and cursors return the same 404.
 - Update: an omitted field keeps its value and a supplied field replaces it. Null clears `name` and every list and resets `network` to enabled.
-- Writes and Session resolution that seal or open confidential content (files, env, setup commands, Skills, Plugins) need Core's [credential key](../../docs/configuration.md#installation-directory); metadata reads do not.
+- Writes and Session resolution that seal or open confidential content (files, env, setup commands, Skills, Plugins) need Core's [credential key](../../docs/configuration.md#compose-installations); metadata reads do not.
 - A Session resolves `environment_template_id` within its Project once, at creation, freezes the effective configuration and never passes the Template ID to the Provider or Runtime. Updating or deleting a Template never changes an existing Session. Creation retries recover the recorded caller intent before reading the Template, even after it is deleted; a changed intent conflicts.
 
 ### Inheritance
diff --git a/contracts/agents-api/model-execution.md b/contracts/agents-api/model-execution.md
index 38bc231b0..8d8751577 100644
--- a/contracts/agents-api/model-execution.md
+++ b/contracts/agents-api/model-execution.md
@@ -57,7 +57,7 @@ The deployment default holds the operator's key, so it stays on operator compute
 
 An empty Session execution extension is invalid. An explicit null provider requests inheritance; an empty or partial provider object is invalid. Unknown, duplicate or output-only saved-provider fields are rejected. A saved Agent without a Harness may save a valid bundle; its Harness compatibility is checked at Session admission. A provider-only Agent update keeps the saved Harness and validates the merged combination under the row lock. The Session's inline `agent.x_agents_core` accepts `harness` and `harness_config`; the provider override belongs at the request's top level.
 
-Core reads the Agent configuration and encrypted bundle from one database snapshot; an explicit complete Session override needs no decryption of the saved bundle. The Session's own encrypted snapshot is written atomically with the Session and its Environment. Existing Sessions never consult the Agent again: edits, key replacement, deletion, suspension and restarts cannot change their model, Harness or provider. A missing or wrong encryption key fails closed; keep the same [credential key](../../docs/configuration.md#installation-directory) across restarts. There is no Turn-level override.
+Core reads the Agent configuration and encrypted bundle from one database snapshot; an explicit complete Session override needs no decryption of the saved bundle. The Session's own encrypted snapshot is written atomically with the Session and its Environment. Existing Sessions never consult the Agent again: edits, key replacement, deletion, suspension and restarts cannot change their model, Harness or provider. A missing or wrong encryption key fails closed; keep the same [credential key](../../docs/configuration.md#compose-installations) across restarts. There is no Turn-level override.
 
 New hosted requests, and requests that omit the inline model, record caller intent before resolving mutable defaults. Other inline requests, such as `none`, keep the resolved-request retry rule; that hash leaves out the deployment default, so changing the default does not change their retry identity. A matching creation retry recovers the committed Session before resolving the Agent or provider again and enqueues no further input. Streaming is outside the retry identity. The [TypeScript client](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/packages/agents-client/README.md#saved-agent-and-deployment-defaults) shows saved Agents and deployment defaults.
 
diff --git a/contracts/agents-api/runtime-observability.md b/contracts/agents-api/runtime-observability.md
index 226fc2ca8..31fe8e4ff 100644
--- a/contracts/agents-api/runtime-observability.md
+++ b/contracts/agents-api/runtime-observability.md
@@ -89,7 +89,7 @@ Periodic collection runs only with the execution worker (Core started with `OAC_
 
 The sampler sweeps once at startup and again each sampling interval after the previous sweep ends. A sweep is a keyset scan, in Session ID order, of the Sessions that are not deleted, are `openai_hosted` and have no released allocation. It reads pages of 32 Sessions through the same resolver and sources as current reads, with eight concurrent reads and two seconds per source. The sampler checks the lease before each page and every 100 ms during a sweep, cancels in-flight reads when ownership is lost, and checks it again before handing each record to export. A failed row does not stop the sweep, and an incomplete sweep is repeated at the next interval.
 
-Every observation, current or periodic, is marked with its collection source, `on_read` or `periodic`, and handed to each exporter's bounded queue. A full queue drops the record, which becomes a missing sample, never a zero. The PostgreSQL history store and the optional OTLP exporter have independent queues, so an exporter outage cannot delay local history or execution. The [`core.runtime_history` settings](../../docs/configuration.md#settings) set the interval, queue capacity, timeout and OTLP destination.
+Every observation, current or periodic, is marked with its collection source, `on_read` or `periodic`, and handed to each exporter's bounded queue. A full queue drops the record, which becomes a missing sample, never a zero. The PostgreSQL history store and the optional OTLP exporter have independent queues, so an exporter outage cannot delay local history or execution. The [Runtime history file](../../docs/configuration.md#runtime-history-file) sets the interval, queue capacity, timeout and OTLP destination.
 
 ### Stored history
 
diff --git a/contracts/agents-api/vaults.md b/contracts/agents-api/vaults.md
index 938ae2f43..a05e76511 100644
--- a/contracts/agents-api/vaults.md
+++ b/contracts/agents-api/vaults.md
@@ -137,7 +137,7 @@ Token endpoints must be HTTPS. Core resolves the host, rejects loopback, private
 
 ## Storage key
 
-Core seals every token, refresh token and client secret with AES-256-GCM under the installation's [`secrets/credential.key`](../../docs/configuration.md#installation-directory), bound to the Project, Vault, Credential, auth type and `mcp_server_url`. A wrong key, a modified row or a row moved to another binding fails to decrypt. Names are metadata outside the binding. The key and plaintext tokens exist in trusted service memory; encryption protects stored secrets and does not protect against a compromised service host.
+Core seals every token, refresh token and client secret with AES-256-GCM under the installation's [`secrets/core/credential.key`](../../docs/configuration.md#compose-installations), bound to the Project, Vault, Credential, auth type and `mcp_server_url`. A wrong key, a modified row or a row moved to another binding fails to decrypt. Names are metadata outside the binding. The key and plaintext tokens exist in trusted service memory; encryption protects stored secrets and does not protect against a compromised service host.
 
 Without a configured key, Credential creation and replacement return 503 `credential_storage_unavailable` before writing; reads, lists, deletion and Vault operations still work. An unreadable or malformed key file stops Core at startup. Losing or replacing the key makes every stored secret unusable; Core supports one key, with no rotation or re-encryption.
 
diff --git a/contracts/agents-api/zh/admin-api.md b/contracts/agents-api/zh/admin-api.md
index 389c07997..8ce891d43 100644
--- a/contracts/agents-api/zh/admin-api.md
+++ b/contracts/agents-api/zh/admin-api.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理 API"
 source: contracts/agents-api/admin-api.md
-source_hash: 7759541dbc59dab917499f506c9e9c11184e8065fd1ed6fb418baaf4a478faf3
+source_hash: 7eb295db6402db8dae91fcdd97f90a5900f740925caaee9d0172b9886544f6ec
 ---
 
 Core 管理 API（`/core/v1`）用于管理安装实例：Project 及其 API 密钥、Project 资源的读取和删除、执行器凭据、部署默认模型、沙箱部署及其节点、监控和审计。Web 的[控制台服务器](../../../docs/zh/web/console-server.md#forwarding-to-core)会为已登录的管理员调用它；运维人员则从 Core 主机上的脚本调用它（[编写 Core API 脚本](../../../docs/zh/getting-started/operations.md#script-the-core-api)）。生成的架构是 [core.openapi.yaml](../core.openapi.yaml)，所有错误都使用 [Core 错误封装](core-errors.md)。
@@ -134,7 +134,7 @@ Core 会在创建 Session 的同一事务中写入此记录。之后的 Agent 
 | 字段 | 含义 |
 | --- | --- |
 | `object` | `core.installation` |
-| `installation_id` | `state.json` 中的安装 ID（[安装目录](../../../docs/zh/configuration.md#installation-directory)）；Core 在不使用沙箱管理器运行时为 null |
+| `installation_id` | `OAC_INSTALLATION_ID_FILE` 中的安装 ID（[Compose 安装](../../../docs/zh/configuration.md#compose-installations)）；Core 在不使用沙箱管理器运行时为 null |
 | `public_url` | `public_url` 设置（[设置](../../../docs/zh/configuration.md#settings)）：应用程序、节点、沙箱和自托管执行器使用的源地址。未设置时为 null |
 | `api_base_url` | 在 `public_url` 后附加 `/v1`，即 Project API 密钥使用的 `OPENAI_BASE_URL`。当 `public_url` 为 null 时为 null |
 | `local_only` | 当 `public_url` 指向回环主机时为 True，该主机只能由 Core 主机访问 |
diff --git a/contracts/agents-api/zh/environment-executor-credentials.md b/contracts/agents-api/zh/environment-executor-credentials.md
index d78e8c421..3d1fea6bf 100644
--- a/contracts/agents-api/zh/environment-executor-credentials.md
+++ b/contracts/agents-api/zh/environment-executor-credentials.md
@@ -1,7 +1,7 @@
 ---
 title: "Environment 执行器凭证"
 source: contracts/agents-api/environment-executor-credentials.md
-source_hash: 6c1db305481f9ab2a51bdd0c88243feaab48348b71f5f3ebbc8f00b17744f412
+source_hash: 725257a92518431a4b942ea35187e37bb171f890d7797e843a9f4eb62f47ad4b
 ---
 
 执行器凭证允许 `oac-daemon` 为一个 `self_hosted` Environment 注册并连接。它只授权该 Environment 的私有 daemon 传输（`/api/v1/agent-daemon/*`），不授权 `/v1`、`/core/v1`、sandbox node 注册或 Project 资源。Project 的 principal 是其执行 principal。Core 只保存密钥摘要。
@@ -37,7 +37,7 @@ grant 绑定 Environment、Session 创建者的 principal 和 Core 构建版本
 | `POST /api/v1/agent-daemon/installation` | Grant | 固定绑定：`version`、`protocol_version`、`environment_id`、`remote_url`、`workspace_directory`、`harness` |
 | `POST /api/v1/agent-daemon/installation/claim` | Grant | `{"executor_token":"SECRET"}`；204 |
 
-无效或过期的 grant 返回 401 `installation_authorization_invalid`。没有匹配安装器时，grant 路由返回 503 `installation_unavailable`。Core 用安装的 [`secrets/credential.key`](../../../docs/zh/configuration.md#installation-directory) 签名每个 grant；未配置 key 时，上述 Session 响应、Core-key 查询和 grant 路由返回 503 `credential_storage_unavailable`。格式错误的密钥返回 400。产物路由不携带凭证，grant 只发送给 Core，不发送给产物主机。
+无效或过期的 grant 返回 401 `installation_authorization_invalid`。没有匹配安装器时，grant 路由返回 503 `installation_unavailable`。Core 用安装的 [`secrets/core/credential.key`](../../../docs/zh/configuration.md#compose-installations) 签名每个 grant；未配置 key 时，上述 Session 响应、Core-key 查询和 grant 路由返回 503 `credential_storage_unavailable`。格式错误的密钥返回 400。产物路由不携带凭证，grant 只发送给 Core，不发送给产物主机。
 
 ## Core-key 路由 {#core-key-routes}
 
diff --git a/contracts/agents-api/zh/environments.md b/contracts/agents-api/zh/environments.md
index 221d34c20..1891bd481 100644
--- a/contracts/agents-api/zh/environments.md
+++ b/contracts/agents-api/zh/environments.md
@@ -1,7 +1,7 @@
 ---
 title: "环境与模板"
 source: contracts/agents-api/environments.md
-source_hash: a93a477f3de39b2206702995821282404c29ee997ef6b782180d4972bada43f7
+source_hash: 8fb6cbd0b8daed4686d1b6829a49e799f03bb78c6bdb1f93cdb9a4518fec4f8f
 ---
 
 Environment 是 Session 的执行资源，包括 Harness 运行所在的机器、工作区以及已完成准备的能力。Session 通过其 `environment` 配置创建 Environment；不存在独立的 create 调用。Environment Template 是 Session 创建时解析的可复用准备配置。本契约涵盖这两类资源、两种放置方式、输入接纳、能力准备、Skills、Plugins 和 MCP 连接来源。
@@ -273,7 +273,7 @@ session = client.beta.agents.sessions.create(
 - 响应会携带安全元数据，绝不会包含 `env`、`setup_commands` 正文或内联文件数据。
 - 列表操作使用 `after`、`limit`（默认 20；0 按 1 处理，超过 100 的值按 100 处理）和 `order`（默认 `desc`），并按创建时间和 ID 排序。不存在和属于外部 Project 的 Template ID 及游标都会返回相同的 404。
 - 更新时，省略字段会保留原值，提供字段则会替换原值。Null 会清除 `name` 和每个列表，并将 `network` 重置为启用。
-- 封装或解封机密内容（文件、env、设置命令、Skills、Plugins）的写入操作和 Session 解析需要 Core 的 [credential key](../../../docs/zh/configuration.md#installation-directory)；元数据读取则不需要。
+- 封装或解封机密内容（文件、env、设置命令、Skills、Plugins）的写入操作和 Session 解析需要 Core 的 [credential key](../../../docs/zh/configuration.md#compose-installations)；元数据读取则不需要。
 - Session 会在创建时于其 Project 内解析一次 `environment_template_id`，冻结有效配置，并且绝不将 Template ID 传递给 Provider 或 Runtime。更新或删除 Template 绝不会改变现有 Session。创建重试会在读取 Template 之前恢复已记录的调用方意图，即使 Template 已删除也是如此；意图发生变化时会产生冲突。
 
 ### 继承 {#inheritance}
diff --git a/contracts/agents-api/zh/model-execution.md b/contracts/agents-api/zh/model-execution.md
index aa762e519..ca4231c01 100644
--- a/contracts/agents-api/zh/model-execution.md
+++ b/contracts/agents-api/zh/model-execution.md
@@ -1,7 +1,7 @@
 ---
 title: "模型执行"
 source: contracts/agents-api/model-execution.md
-source_hash: b995996e38d7a1591d1db0a548a616f6c0ac687f36185a13e95cb52d2e2ff0c3
+source_hash: ee651cc7bb506eab33a819aa40a97095270574a793dea95784104f19692fa4ec
 ---
 
 每个 Session 都运行一个 Harness，并使用一个模型提供商。Core 通过三个固定版本上游协议未定义的 Core 扩展来选择它们：`x_agents_core.harness` 选择 Harness，`x_agents_core.model_provider` 提供端点和密钥，`x_agents_core.harness_config` 携带原生模型参数。Core 没有提供商目录、模型别名解析或产品权限模型；除 Session 和已保存 Agent 配置包外，唯一存储的配置包是每个 Harness 的一个 [deployment default](#deployment-defaults)。本文档定义 Harness—模型提供商协议：[`internal/modelprovider/config.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/modelprovider/config.go) 负责验证冻结的提供商连接，每个 Harness 则通过 [`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 声明其协议和原生参数。
@@ -59,7 +59,7 @@ MiniMax Code 要求上下文限制和输出限制均为正数。Core 会在写
 
 空的 Session 执行扩展无效。显式 null 提供商会请求继承；空的或不完整的提供商对象无效。已保存提供商配置中的未知字段、重复字段或只读输出字段均会被拒绝。没有 Harness 的已保存 Agent 可以保存有效配置包；其 Harness 兼容性会在 Session 准入时检查。仅更新提供商的 Agent 更新会保留已保存的 Harness，并在行锁保护下验证合并后的组合。Session 内联的 `agent.x_agents_core` 接受 `harness` 和 `harness_config`；提供商覆盖值必须放在请求顶层。
 
-Core 从同一个数据库快照读取 Agent 配置和加密配置包；显式提供完整 Session 覆盖值时，无需解密已保存的配置包。Session 自身的加密快照会与 Session 及其 Environment 原子写入。现有 Session 绝不会再次查询 Agent：Agent 编辑、密钥替换、删除、暂停和重启均无法改变其模型、Harness 或提供商。加密密钥缺失或错误时会安全失败；重启前后应保持相同的 [credential key](../../../docs/zh/configuration.md#installation-directory)。不存在 Turn 级覆盖。
+Core 从同一个数据库快照读取 Agent 配置和加密配置包；显式提供完整 Session 覆盖值时，无需解密已保存的配置包。Session 自身的加密快照会与 Session 及其 Environment 原子写入。现有 Session 绝不会再次查询 Agent：Agent 编辑、密钥替换、删除、暂停和重启均无法改变其模型、Harness 或提供商。加密密钥缺失或错误时会安全失败；重启前后应保持相同的 [credential key](../../../docs/zh/configuration.md#compose-installations)。不存在 Turn 级覆盖。
 
 新的托管请求以及省略内联模型的请求，会在解析可变默认值之前记录调用方意图。其他内联请求，例如 `none`，继续遵循已解析请求的重试规则；该哈希不包含部署默认值，因此更改默认值不会改变其重试标识。匹配的创建重试会在再次解析 Agent 或提供商之前恢复已提交的 Session，并且不会进一步加入输入。流式传输不参与重试标识的计算。[TypeScript client](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/packages/agents-client/README.md#saved-agent-and-deployment-defaults) 展示了已保存 Agent 和部署默认值。
 
diff --git a/contracts/agents-api/zh/runtime-observability.md b/contracts/agents-api/zh/runtime-observability.md
index 8e24b9a56..ddd10ea91 100644
--- a/contracts/agents-api/zh/runtime-observability.md
+++ b/contracts/agents-api/zh/runtime-observability.md
@@ -1,7 +1,7 @@
 ---
 title: "运行时可观测性"
 source: contracts/agents-api/runtime-observability.md
-source_hash: f79a077350118f5f9bb3f4e8874242af3cb716e92f5e090f6652b001ae5780a1
+source_hash: 103575f3971e77d5ba149cacb27e972e429a46713b2bda7da36cae43bbf313fa
 ---
 
 这是面向贡献者的契约，规定 Core 如何观测 Runtime 并保留其历史。路由和响应字段见 [Runtime telemetry API](runtime-observability-api.md)。代码位于 `services/core/internal/runtimeobs`（解析、源、采样器和导出）、`internal/runtimehistory`（历史查询和 PostgreSQL 存储）以及 `internal/runtimeobs/otlpexporter`。
@@ -91,7 +91,7 @@ CPU 静默状态、心跳时龄、连接状态和保活时间都不是空闲时
 
 采样器在启动时扫描一次，此后每次扫描结束后再经过一个采样间隔再次扫描。一次扫描按 Session ID 顺序，对未删除、状态为 `openai_hosted` 且没有已释放分配的 Session 执行 keyset 扫描。它通过与当前读取相同的解析器和源，以 32 个 Session 为一页进行读取，并发数为 8，每个源时限为 2 秒。采样器在每页之前以及扫描期间每 100 ms 检查租约；失去所有权时取消进行中的读取；将每条记录交给导出之前再次检查租约。失败的行不会停止扫描；未完成的扫描会在下一个间隔重复。
 
-每次观测，无论来自当前读取还是周期采集，都会标记采集源 `on_read` 或 `periodic`，并放入每个导出器的有界队列。队列已满时会丢弃记录；该记录将成为缺失采样，而绝不会成为零。PostgreSQL 历史存储和可选 OTLP 导出器使用彼此独立的队列，因此导出器故障不会延迟本地历史记录或执行。[`core.runtime_history` settings](../../../docs/zh/configuration.md#settings) 用于设置采样间隔、队列容量、超时和 OTLP 目标。
+每次观测，无论来自当前读取还是周期采集，都会标记采集源 `on_read` 或 `periodic`，并放入每个导出器的有界队列。队列已满时会丢弃记录；该记录将成为缺失采样，而绝不会成为零。PostgreSQL 历史存储和可选 OTLP 导出器使用彼此独立的队列，因此导出器故障不会延迟本地历史记录或执行。[Runtime 历史文件](../../../docs/zh/configuration.md#runtime-history-file) 用于设置采样间隔、队列容量、超时和 OTLP 目标。
 
 ### 存储的历史记录 {#stored-history}
 
diff --git a/contracts/agents-api/zh/vaults.md b/contracts/agents-api/zh/vaults.md
index 0f5dd927d..81434de67 100644
--- a/contracts/agents-api/zh/vaults.md
+++ b/contracts/agents-api/zh/vaults.md
@@ -1,7 +1,7 @@
 ---
 title: "Vault 与 Credential"
 source: contracts/agents-api/vaults.md
-source_hash: 9e56ee84c782d1f9c0f5506f960a275d9afa3e554634131bf09a74e736135926
+source_hash: 95626340ee36faee3418dd1155a0e50c378ead09c09c91e86f30e09bd8f409e0
 ---
 
 Vault 是 Project 所有的 Credential 容器。Credential 保存一个 HTTPS MCP server 的秘密：`static_bearer` token 或 `mcp_oauth` grant。Session 在 `vault_ids` 中关联 Vault；Core 在创建 Session 时为每个 HTTP MCP server 选择一个 Credential，只在分派工作时将解密 token 交给 Runtime。秘密只能写入：任何读取都不返回 token、refresh token、client secret 或密文。
@@ -139,7 +139,7 @@ Token endpoint 必须为 HTTPS。Core 解析主机，拒绝回环、私有、链
 
 ## 存储密钥 {#storage-key}
 
-Core 使用安装的 [`secrets/credential.key`](../../../docs/zh/configuration.md#installation-directory)，以 AES-256-GCM 加密每个 token、refresh token 和 client secret，绑定 Project、Vault、Credential、auth type 和 `mcp_server_url`。错误密钥、修改的行或移动到其他绑定的行均无法解密。名称是不参与绑定的元数据。key 和明文 token 存在于可信服务内存中；加密保护存储的秘密，不保护已被攻破的服务主机。
+Core 使用安装的 [`secrets/core/credential.key`](../../../docs/zh/configuration.md#compose-installations)，以 AES-256-GCM 加密每个 token、refresh token 和 client secret，绑定 Project、Vault、Credential、auth type 和 `mcp_server_url`。错误密钥、修改的行或移动到其他绑定的行均无法解密。名称是不参与绑定的元数据。key 和明文 token 存在于可信服务内存中；加密保护存储的秘密，不保护已被攻破的服务主机。
 
 未配置 key 时，Credential 创建和替换在写入前返回 503 `credential_storage_unavailable`；读取、列表、删除和 Vault 操作仍可用。key 文件不可读或格式错误会使 Core 启动失败。丢失或替换 key 使全部已存储秘密无法使用；Core 只支持一个 key，不支持轮换或重新加密。
 
diff --git a/deploy/compose/compose.yaml b/deploy/compose/compose.yaml
index 6fe45a4db..70471dc31 100644
--- a/deploy/compose/compose.yaml
+++ b/deploy/compose/compose.yaml
@@ -58,8 +58,6 @@ services:
       OAC_DATABASE_PASSWORD_FILE: /run/database/password
       OAC_CREDENTIAL_KEY_FILE: /run/oac/credential.key
       OAC_CORE_KEY_DIGESTS_FILE: /run/oac/core-key-digests.json
-      OAC_PROVIDER_STATE_ROOT: /state
-      OAC_NATIVE_INSTALLER_DIR: /opt/oac/native-installers
       OAC_EXECUTION_CONCURRENCY: ${OAC_EXECUTION_CONCURRENCY:-}
       OAC_DEFAULT_HARNESS: ${OAC_DEFAULT_HARNESS:-}
       OAC_HARNESSES: ${OAC_HARNESSES:-}
@@ -99,8 +97,7 @@ services:
     depends_on:
       init: {condition: service_completed_successfully}
     environment:
-      OAC_WEB_ORIGIN: *public-url
-      OAC_WEB_UPSTREAM: http://core:8091
+      OAC_PUBLIC_URL: *public-url
       OAC_WEB_CORE_KEY_FILE: /run/oac/core.key
       OAC_WEB_NODE_PAYLOAD_DIR: /node-payload
       OAC_LOG_LEVEL: ${OAC_LOG_LEVEL:-}
diff --git a/deploy/compose/test_compose.py b/deploy/compose/test_compose.py
index ce428f89a..4f14ef726 100644
--- a/deploy/compose/test_compose.py
+++ b/deploy/compose/test_compose.py
@@ -79,7 +79,7 @@ def test_public_url_can_be_configured_after_initial_startup(self):
             with self.subTest(public_url=value):
                 configured = self.render(value)
                 expected = value or 'http://localhost:8080'
-                for name, setting in (('core', 'OAC_PUBLIC_URL'), ('web', 'OAC_WEB_ORIGIN')):
+                for name, setting in (('core', 'OAC_PUBLIC_URL'), ('web', 'OAC_PUBLIC_URL')):
                     self.assertEqual(configured['services'][name]['environment'][setting], expected)
                 self.assertEqual(
                     {service: [item.get('target') for item in spec.get('volumes', [])]
diff --git a/deploy/distribution/Runtime.Dockerfile b/deploy/distribution/Runtime.Dockerfile
index 913c1f4a0..886bc08d5 100644
--- a/deploy/distribution/Runtime.Dockerfile
+++ b/deploy/distribution/Runtime.Dockerfile
@@ -15,8 +15,7 @@ COPY --from=claude /opt/claude-sdk /opt/claude-sdk
 
 ENV OAC_RUNTIME_CODEX_BIN=/usr/local/bin/codex \
     OAC_RUNTIME_CLAUDE_SDK_NODE=/usr/local/bin/node \
-    OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT=/opt/claude-sdk/dist/main.js \
-    OAC_RUNTIME_CLAUDE_SDK_WORKSPACE=managed
+    OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT=/opt/claude-sdk/dist/main.js
 
 USER 1000:1000
 RUN test "$(codex --version)" = "codex-cli 0.153.4" \
diff --git a/deploy/install.dev.sh b/deploy/install.dev.sh
index 7a3fb5135..93579cecf 100755
--- a/deploy/install.dev.sh
+++ b/deploy/install.dev.sh
@@ -5,7 +5,7 @@
 set -euo pipefail
 
 repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-install_dir="${OAC_INSTALL_DIR_DEFAULT:-$HOME/.oac/local}"
+install_dir="$HOME/.oac/local"
 host_address="127.0.0.1"
 web_port="8080"
 
diff --git a/docs/configuration.md b/docs/configuration.md
index fcdc5b4a4..5ff249aff 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -2,16 +2,17 @@
 title: "Configuration reference"
 ---
 
-Every setting of a Core installation has exactly one home. There are two kinds:
+Every setting of a Core installation has exactly one home, in one of three categories:
 
-| Kind | Examples | Home | Change it with | Takes effect |
+| Category | Examples | Home | Change it with | Takes effect |
 | --- | --- | --- | --- | --- |
-| [Process settings](#process-settings-configjson) | Public URL, ports, logging, harnesses, execution concurrency, audit retention, OAuth origins, Runtime history export | `.env` in the installation directory (default `~/.oac/core`) | Edit `.env`, then run `oac apply` | `oac apply` recreates the services that read the changed settings |
+| [Process settings](#process-settings) | Public URL, ports, logging, harnesses, execution concurrency, audit retention, OAuth origins, Runtime history | `.env` in the installation directory (default `~/.oac/core`) | Edit `.env`, then run `oac apply` | `oac apply` recreates the services that read the changed settings |
+| [Secrets](#compose-installations) | Database password, credential encryption key, installation ID, Core key and the Core key digest derived from it | `secrets/` in the Compose data volume, one copy each | Initialization generates them once; `oac rotate-core-key` replaces the Core key and its digest | `oac rotate-core-key` restarts Core and Web |
 | [Runtime settings](#runtime-settings-web) | Sandbox backend and size, nodes, Projects and keys, default models, executor credentials | Core's PostgreSQL database | Web, or the Core API (`/core/v1`) with the Core key | Saved without a Core restart; nodes prepare Runtime changes asynchronously |
 
-Web's **System** page shows the installation's addresses, the default models, the sandbox configuration and, under **Startup settings**, the process settings Core loaded. Secrets live in [`secrets/`](#compose-installations), one copy each. No configuration file defines Projects or API keys.
+Web's **System** page shows the installation's addresses, the default models, the sandbox configuration and, under **Startup settings**, the process settings Core loaded. No configuration file defines Projects or API keys.
 
-## Process settings {#process-settings-configjson}
+## Process settings
 
 Installer flags in [installation options](./getting-started/install-options.md) write `.env` once. To change a setting, edit `.env` and apply it:
 
@@ -38,11 +39,11 @@ To change it, point the reverse proxy at the new address first, then edit `OAC_P
 
 ### Settings
 
-`OAC_HISTORY_SETTINGS_FILE` may point at a file whose headers hold export credentials. The file stays mode `0600`, and those headers never appear in `oac` output or in the installation report. Model providers are not process settings; see [Default models](#default-models).
+Model providers are not process settings; see [Default models](#default-models).
 
 | Variable | Default | Meaning |
 | --- | --- | --- |
-| `OAC_PUBLIC_URL` | `http://localhost:8080` | Origin applications, nodes, sandboxes and self-hosted executors use. See [changing the public URL](#changing-the-public-url) |
+| `OAC_PUBLIC_URL` | `http://localhost:8080`, set by `compose.yaml`. Core started without it runs no Runtime gateway and executes no Sessions | Origin applications, nodes, sandboxes and self-hosted executors use. See [changing the public URL](#changing-the-public-url) |
 | `OAC_HOST` | `127.0.0.1` | Web bind address published by `compose.yaml`. The installer sets `0.0.0.0` |
 | `OAC_WEB_PORT` | `8080` | Host port of Web |
 | `OAC_LOG_LEVEL` | `info` | `debug`, `info`, `warn` or `error` |
@@ -53,9 +54,23 @@ To change it, point the reverse proxy at the new address first, then edit `OAC_P
 | `OAC_HARNESSES` | Every registered Harness | Comma-separated Harnesses to enable besides the default one. Unknown names stop startup |
 | `OAC_WRITE_AUDIT_RETENTION` | `2160h` | Minimum `1h` |
 | `OAC_OAUTH_TRUSTED_ORIGINS` | unset | Comma-separated HTTPS origins |
-| `OAC_HISTORY_SETTINGS_FILE` | unset | Optional Runtime history file. Sensitive; Core reports only whether it is configured |
+| `OAC_HISTORY_SETTINGS_FILE` | unset | Optional [Runtime history file](#runtime-history-file). Sensitive; Core reports only whether it is configured |
 
-An unset or empty value selects the default. Edit `.env`, then run `oac apply`. Core reports the process settings it loaded at `GET /core/v1/installation`. `oac-core check-config` validates the same environment without starting Core. Sensitive settings report only whether they are configured. How Core collects and keeps Runtime history is in [retained history](../contracts/agents-api/runtime-observability.md#retained-history-and-optional-export).
+An unset or empty value selects the default. Edit `.env`, then run `oac apply`. Core reads every process setting, and every file a setting names, once at startup and reports what it loaded at `GET /core/v1/installation`. `oac-core check-config` loads and validates the same settings and files without starting Core. The native installer catalog under `OAC_PROVIDER_ROOT` is not a setting; Core checks it only when it starts. Errors name the variable, never its value. Sensitive settings report only whether they are configured.
+
+### Runtime history file
+
+`OAC_HISTORY_SETTINGS_FILE` names a JSON file that tunes [retained history](../contracts/agents-api/runtime-observability.md#retained-history-and-optional-export) and adds an optional OTLP export. Without it, Core keeps history in its database with the defaults below. In a Compose installation, put the file in the data volume's `secrets/core/` directory, owned by UID 65532 with mode `0600`, and set `OAC_HISTORY_SETTINGS_FILE=/run/oac/<file name>`: Core mounts that directory read-only at `/run/oac`. Headers may hold export credentials; they never appear in `oac` output or in the installation report. Unknown fields are rejected.
+
+| Field | Default | Meaning |
+| --- | --- | --- |
+| `sample_interval_seconds` | `30` | Periodic sampling interval, from 5 to 300 |
+| `queue_capacity` | `256` | Records each exporter queues, at most 4096 |
+| `timeout_seconds` | `2` | Export and history query timeout, at most 30 |
+| `endpoint` | unset | Absolute OTLP/HTTP metrics URL, such as `https://collector.example/v1/metrics`. Unset, Core exports nothing and the other export fields must be unset |
+| `transport` | unset | `otlp_http`; required with `endpoint` |
+| `insecure` | `false` | `true` is required for an `http` endpoint and rejected for `https` |
+| `headers` | none | Request headers for the endpoint. `Host`, `Content-Length`, `Content-Type` and `Content-Encoding` are reserved |
 
 ## Runtime settings: Web
 
@@ -84,7 +99,7 @@ Set a default in **System** → **Default model configuration**, or use `PUT /co
 
 ## Compose installations
 
-The [standalone Compose file](./getting-started/install-options.md#docker-compose-and-hosting-platforms) takes process settings from the platform's environment. An empty `OAC_PUBLIC_URL` selects `http://localhost:8080`. Set it to the exact public origin, without a trailing slash, and recreate Core and Web before adding nodes or executors. The platform terminates TLS and routes to `web:8080`.
+The [standalone Compose file](./getting-started/install-options.md#docker-compose-and-hosting-platforms) takes process settings from the platform's environment. Set [`OAC_PUBLIC_URL`](#settings) to the exact public origin, without a trailing slash, and recreate Core and Web before adding nodes or executors. The platform terminates TLS and routes to `web:8080`.
 
 The initialization service generates secrets and the installation ID once, then verifies them on subsequent deployments. Each secret has one persistent source; Core's key digest is derived from Web's sign-in key. Initialization never replaces missing or changed secrets on an existing installation. Core reads the process environment from `.env`.
 
@@ -94,7 +109,7 @@ The initialization service generates secrets and the installation ID once, then
 | `secrets/database/` | Generated database password | PostgreSQL and Core |
 | `secrets/core/` | Credential encryption key, installation ID and Core key digest | Core |
 | `secrets/web/` | Generated Core sign-in key | Web |
-| `state/` | Private Provider state | Core |
+| `state/` | Private Provider state, mounted in Core at `/state`. Each adapter owns a subdirectory; E2B uses `e2b/`, with no group or other access | Core |
 | `node-payload/` | Verified node installation metadata | Web |
 
 Initialization prepares this directory; application services receive their secret directories read-only. `docker compose exec web oac-web core-key` prints the Core key to the operator terminal without writing it to container logs. Database passwords and credential encryption keys are never printed.
@@ -135,21 +150,17 @@ Core reads its process environment. Compose interpolates `.env` into it and moun
 
 | Variable | Set from |
 | --- | --- |
-| `OAC_PUBLIC_URL` | The public origin. Core derives the daemon WebSocket URL, the self-hosted `remote_url`, the hosted sandbox address and the deployment's read-only `core_url` from it, never from request headers. Without it, Core runs no Runtime gateway and executes no Sessions |
+| `OAC_PUBLIC_URL` | The [public URL](#settings). Core validates it once and derives the Agents API base, the daemon WebSocket URL, the self-hosted `remote_url`, the installer downloads, the hosted sandbox address and the deployment's read-only `core_url` from it, never from request headers |
 | `OAC_ADDR` | The image sets `:8091`. Independently started Core defaults to `127.0.0.1:8091` when unset or empty |
-| `OAC_DATABASE_URL` | PostgreSQL without a password |
+| `OAC_DATABASE_URL` | Required. PostgreSQL without a password |
 | `OAC_DATABASE_PASSWORD_FILE` | `/run/database/password`. The URL must then carry no password |
 | `OAC_CREDENTIAL_KEY_FILE` | `/run/oac/credential.key` |
-| `OAC_CORE_KEY_DIGESTS_FILE` | `/run/oac/core-key-digests.json`: a JSON array with the SHA-256 of the Core key |
-| `OAC_INSTALLATION_ID_FILE` | `/run/oac/installation.id`: the installation ID, a canonical UUID. It enables the sandbox deployment and node routes and requires `OAC_PUBLIC_URL` and `OAC_CORE_KEY_DIGESTS_FILE`. Core refuses an ID other than the one its database recorded |
-| `OAC_EXECUTION_CONCURRENCY`, `OAC_DEFAULT_HARNESS`, `OAC_HARNESSES`, `OAC_WRITE_AUDIT_RETENTION`, `OAC_OAUTH_TRUSTED_ORIGINS` | The matching [process settings](#settings). `oac-core check-config` validates them without starting Core |
-| `OAC_HISTORY_SETTINGS_FILE` | Optional Runtime history file. Sensitive; the installation report says only whether it is set |
-| `OAC_LOG_LEVEL`, `OAC_LOG_FORMAT`, `OAC_LOG_ADD_SOURCE` | Logging; Web reads the same three |
-| `OAC_PROVIDER_ROOT` | Absolute adapter artifact root. The Core image sets `/opt/oac`. Each adapter owns its helper paths beneath this root |
-| `OAC_PROVIDER_STATE_ROOT` | Absolute private state root: `/state` in the Core image. Each adapter owns its subdirectory; E2B uses `e2b/`, owned by Core's user with no group or other access. Back it up with the database and `credential.key`; don't mount it into Web or a Runtime |
-| `OAC_NATIVE_INSTALLER_DIR` | Self-hosted daemon installers: `/opt/oac/native-installers` in the Compose file. Unset, Core serves none. Core checks the catalog against its own release before serving it |
+| `OAC_CORE_KEY_DIGESTS_FILE` | Required. `/run/oac/core-key-digests.json`: a JSON array with the SHA-256 of the Core key |
+| `OAC_INSTALLATION_ID_FILE` | `/run/oac/installation.id`: the installation ID, a canonical UUID. It enables the sandbox deployment and node routes and requires `OAC_PUBLIC_URL`. Core refuses an ID other than the one its database recorded |
+| `OAC_EXECUTION_CONCURRENCY`, `OAC_DEFAULT_HARNESS`, `OAC_HARNESSES`, `OAC_WRITE_AUDIT_RETENTION`, `OAC_OAUTH_TRUSTED_ORIGINS`, `OAC_HISTORY_SETTINGS_FILE`, `OAC_LOG_LEVEL`, `OAC_LOG_FORMAT`, `OAC_LOG_ADD_SOURCE` | The matching [process settings](#settings). Web reads the three log settings too |
+| `OAC_PROVIDER_ROOT` | Absolute adapter artifact root. The Core image sets `/opt/oac`. Each adapter owns its helper paths beneath this root. Core serves self-hosted daemon installers from its `native-installers/` directory when that holds a `catalog.json`, after checking the catalog against its own release. Adapter state lives at `/state`, the data volume's [`state/`](#compose-installations) |
 
-Core logs the file paths it loads, never environment values or file contents.
+Core logs the history file path it loads, never environment values or file contents.
 
 Invalid explicit OAuth trusted origins stop Core at startup. Entries must be HTTPS origins without credentials, query or a non-root path. [Vaults](../contracts/agents-api/vaults.md) owns refresh and network policy. A private issuer also needs a trusted CA: independently managed Unix Core can use Go’s `SSL_CERT_FILE` PEM CA-bundle override, which preserves certificate verification. Managed installation has no custom-CA setting.
 
@@ -159,11 +170,11 @@ Compose sets these for Web. Set them yourself only when you run the console with
 
 | Variable | Default | Meaning |
 | --- | --- | --- |
-| `OAC_WEB_ADDR` | `:8080` | Listener address |
-| `OAC_WEB_ORIGIN` | `http://127.0.0.1:8080` | The exact browser-facing origin, HTTP or HTTPS, without a path. Host and origin checks use it; HTTPS makes the session cookie `Secure` |
-| `OAC_WEB_UPSTREAM` | `http://core:8091` | Core's origin, HTTP or HTTPS, without credentials, query or path |
-| `OAC_WEB_CORE_KEY_FILE` | `/admin/core.key` | Absolute path of a regular file with no group or other permissions, holding the Core key: at least 32 characters, no whitespace, at most 4 KiB |
+| `OAC_WEB_ADDR` | `:8080` | Listener address. The healthcheck probes it on `127.0.0.1` when its host is empty or unspecified |
+| `OAC_PUBLIC_URL` | Required | The [public URL](#settings): the exact browser-facing origin, HTTP or HTTPS, without a path. Host and origin checks use it; HTTPS makes the session cookie `Secure` |
+| `OAC_WEB_UPSTREAM` | `http://core:8091` | Core's origin, HTTP or HTTPS, without credentials, query or path. The healthcheck probes its `/healthz` |
+| `OAC_WEB_CORE_KEY_FILE` | Required | Absolute path of a regular file with no group or other permissions, holding the Core key: at least 32 characters, no whitespace, at most 4 KiB |
 | `OAC_WEB_DIST` | `/www` | Absolute directory of the built console; must contain `index.html` |
 | `OAC_WEB_NODE_PAYLOAD_DIR` | unset | Absolute path of the matched distribution's node payload (the installer's `node-payload/`). Unset, `/node-install/*` is not served and Add node is unavailable |
 
-Defaults apply when a variable is absent; an explicitly empty value is validated as supplied. An invalid `OAC_WEB_*` value stops the console at startup with a message naming the variable. The console also reads `OAC_LOG_LEVEL`, `OAC_LOG_FORMAT` and `OAC_LOG_ADD_SOURCE` ([Core environment](#appendix-core-environment-without-the-installer)); unknown values fall back to their defaults. Use HTTPS for any browser that is not on the same machine.
+An unset or empty variable selects its default. An invalid value stops the console at startup with a message naming the variable. The console also reads the three log [process settings](#settings) and rejects the values Core rejects. Use HTTPS for any browser that is not on the same machine.
diff --git a/docs/web/console-server.md b/docs/web/console-server.md
index 41fa81d3d..52b89daa0 100644
--- a/docs/web/console-server.md
+++ b/docs/web/console-server.md
@@ -42,7 +42,7 @@ The deployment's reverse proxy sends every path to the console. The console forw
 
 Every request except `/healthz`, `/v1`, `/api/v1` and `/docs` must pass these checks first:
 
-1. **Host and origin.** The `Host` header must equal the host of `OAC_WEB_ORIGIN`. An `Origin` header, when present, must equal that origin, and `Sec-Fetch-Site` must be `same-origin` or `none`. A write that carries neither `Origin` nor `Sec-Fetch-Site: same-origin` needs a same-origin `Referer`. Otherwise the console answers 403. `/node-install/*` checks only the host and the path.
+1. **Host and origin.** The `Host` header must equal the host of `OAC_PUBLIC_URL`. An `Origin` header, when present, must equal that origin, and `Sec-Fetch-Site` must be `same-origin` or `none`. A write that carries neither `Origin` nor `Sec-Fetch-Site: same-origin` needs a same-origin `Referer`. Otherwise the console answers 403. `/node-install/*` checks only the host and the path.
 2. **Safe request.** The path must start with `/` and contain no `%`, backslash, NUL, dot segment or empty segment. Absolute-form request targets, `CONNECT` and `TRACE` get 400. An `Upgrade` header gets 400 except on `/v1`, `/api/v1` and `/docs`, which are forwarded before these checks. A `/core/v1` request can therefore never leave that prefix.
 3. **Sign-in.** Paths that need sign-in answer 401 without a valid session cookie.
 
@@ -75,7 +75,7 @@ The console never retries a request. Browser code calls `/core/v1` through the t
 The administrator signs in with the deployment's [Core key](../getting-started/operations.md#core-key). There are no console accounts, usernames or setup step, and signing in grants the whole console.
 
 - The console compares SHA-256 digests of the submitted and configured keys in constant time. It never logs or returns the key.
-- The session cookie `core_console_session` is HttpOnly, `SameSite=Strict`, and `Secure` when `OAC_WEB_ORIGIN` is HTTPS. It lasts 12 hours.
+- The session cookie `core_console_session` is HttpOnly, `SameSite=Strict`, and `Secure` when `OAC_PUBLIC_URL` is HTTPS. It lasts 12 hours.
 - Sessions live only in the console's memory, at most 64 at a time; the oldest is dropped first. A console restart or a Core key rotation signs everyone out.
 - At most two sign-in checks run at once; another attempt gets 429 with `Retry-After: 1`.
 - Failed attempts share a budget of 10 per minute; beyond it, a wrong key gets 429 with `Retry-After: 60`. The correct key always signs in, which is why the console refuses to start with a Core key shorter than 32 characters.
@@ -98,7 +98,7 @@ With `OAC_WEB_NODE_PAYLOAD_DIR` set, the console serves the matched distribution
 
 ## Public address
 
-The console does not configure a domain or obtain certificates. The operator's reverse proxy or hosting platform terminates HTTPS and routes to the console, and `OAC_PUBLIC_URL` records the origin that applications, nodes and executors use. The console accepts only the host of `OAC_WEB_ORIGIN`, so DNS rebinding cannot reach it.
+The console does not configure a domain or obtain certificates. The operator's reverse proxy or hosting platform terminates HTTPS and routes to the console, and `OAC_PUBLIC_URL` records the origin that browsers, applications, nodes and executors use. The console accepts only its host, so DNS rebinding cannot reach it.
 
 ## Verification
 
diff --git a/docs/zh/configuration.md b/docs/zh/configuration.md
index 79465aa1f..a8c1afe1c 100644
--- a/docs/zh/configuration.md
+++ b/docs/zh/configuration.md
@@ -1,19 +1,20 @@
 ---
 title: "配置参考"
 source: docs/configuration.md
-source_hash: 8eeef9a9742c5fd8a0bf27a5a31870a77dec59a436518dbe9d34770527c021a2
+source_hash: b0946948a110778123f52e065f24da9cfa7cfb8a1aeb6321526fb5064537a9a8
 ---
 
-Core 安装的每项设置都恰好只有一个归属位置。共有两类：
+Core 安装的每项设置都恰好只有一个归属位置，分属以下三类：
 
-| 类型 | 示例 | 归属位置 | 修改方式 | 生效方式 |
+| 类别 | 示例 | 归属位置 | 修改方式 | 生效方式 |
 | --- | --- | --- | --- | --- |
-| [进程设置](#process-settings-configjson) | 公共 URL、端口、日志、Harness、执行并发度、审计保留期、OAuth 来源、Runtime 历史记录导出 | 安装目录中的 `.env`（默认 `~/.oac/core`） | 编辑 `.env`，然后运行 `oac apply` | `oac apply` 会重新创建读取了这些已更改设置的服务 |
+| [进程设置](#process-settings) | 公共 URL、端口、日志、Harness、执行并发度、审计保留期、OAuth 来源、Runtime 历史记录 | 安装目录中的 `.env`（默认 `~/.oac/core`） | 编辑 `.env`，然后运行 `oac apply` | `oac apply` 会重新创建读取了这些已更改设置的服务 |
+| [机密信息](#compose-installations) | 数据库密码、凭据加密密钥、安装 ID、Core 密钥及由其派生的 Core 密钥摘要 | Compose 数据卷中的 `secrets/`，每项一份 | 初始化时一次性生成；`oac rotate-core-key` 替换 Core 密钥及其摘要 | `oac rotate-core-key` 会重启 Core 和 Web |
 | [运行时设置](#runtime-settings-web) | 沙箱后端和大小、节点、项目和密钥、默认模型、执行器凭据 | Core 的 PostgreSQL 数据库 | 在 Web 中修改，或使用 Core 密钥调用 Core API（`/core/v1`） | 保存时无需重启 Core；节点会异步准备 Runtime 变更 |
 
-Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置，并在 **Startup settings** 下以只读方式显示 Core 加载的进程设置。机密信息存放在 [`secrets/`](#compose-installations) 中，每项仅保存一份。没有任何配置文件定义项目或 API 密钥。
+Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置，并在 **Startup settings** 下以只读方式显示 Core 加载的进程设置。没有任何配置文件定义项目或 API 密钥。
 
-## 进程设置 {#process-settings-configjson}
+## 进程设置 {#process-settings}
 
 [安装选项](getting-started/install-options.md)中的安装标志只会一次性写入 `.env`。要更改设置，请编辑 `.env` 并应用：
 
@@ -40,13 +41,13 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 ### 设置 {#settings}
 
-`OAC_HISTORY_SETTINGS_FILE` 可以指向一个文件，其 headers 中含有导出凭据。该文件权限为 `0600`，这些 headers 绝不会出现在 `oac` 输出或安装报告中。模型提供商不属于进程设置；请参阅[默认模型](#default-models)。
+模型提供商不属于进程设置；请参阅[默认模型](#default-models)。
 
 以下配置参考表保留英文原文。
 
 | Variable | Default | Meaning |
 | --- | --- | --- |
-| `OAC_PUBLIC_URL` | `http://localhost:8080` | 应用、节点、沙箱和自托管执行器使用的源地址。参阅[修改公开 URL](#changing-the-public-url) |
+| `OAC_PUBLIC_URL` | `http://localhost:8080`，由 `compose.yaml` 设置。未设置时启动的 Core 不运行 Runtime 网关，也不执行任何 Session | 应用、节点、沙箱和自托管执行器使用的源地址。参阅[更改公共 URL](#changing-the-public-url) |
 | `OAC_HOST` | `127.0.0.1` | `compose.yaml` 发布的 Web 绑定地址。安装器设置为 `0.0.0.0` |
 | `OAC_WEB_PORT` | `8080` | Host port of Web |
 | `OAC_LOG_LEVEL` | `info` | `debug`, `info`, `warn` or `error` |
@@ -57,9 +58,23 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 | `OAC_HARNESSES` | Every registered Harness | Comma-separated Harnesses to enable besides the default one. Unknown names stop startup |
 | `OAC_WRITE_AUDIT_RETENTION` | `2160h` | Minimum `1h` |
 | `OAC_OAUTH_TRUSTED_ORIGINS` | unset | Comma-separated HTTPS origins |
-| `OAC_HISTORY_SETTINGS_FILE` | unset | Optional Runtime history file. Sensitive; Core reports only whether it is configured |
+| `OAC_HISTORY_SETTINGS_FILE` | unset | 可选的 [Runtime 历史文件](#runtime-history-file)。敏感；Core 只报告它是否已配置 |
 
-未设置或为空的值使用默认值。编辑 `.env`，然后运行 `oac apply`。Core 会在 `GET /core/v1/installation` 报告它加载的进程设置。`oac-core check-config` 会在不启动 Core 的情况下校验同一组环境变量。敏感设置只报告是否已配置。有关 Core 如何收集和保留 Runtime 历史记录，请参阅[保留的历史记录](../../contracts/agents-api/zh/runtime-observability.md#retained-history-and-optional-export)。
+未设置或为空的值使用默认值。编辑 `.env`，然后运行 `oac apply`。Core 在启动时一次性读取所有进程设置及设置指向的文件，并在 `GET /core/v1/installation` 报告加载的结果。`oac-core check-config` 会在不启动 Core 的情况下加载并校验同样的设置和文件。`OAC_PROVIDER_ROOT` 下的原生安装程序目录清单不属于设置，Core 只在启动时检查它。错误信息只指明变量名，绝不包含其值。敏感设置只报告是否已配置。
+
+### Runtime 历史文件 {#runtime-history-file}
+
+`OAC_HISTORY_SETTINGS_FILE` 指向一个 JSON 文件，用于调整[保留的历史记录](../../contracts/agents-api/zh/runtime-observability.md#retained-history-and-optional-export)，并可添加 OTLP 导出。没有此文件时，Core 按下表默认值把历史记录保存在数据库中。在 Compose 安装中，把该文件放在数据卷的 `secrets/core/` 目录中，属主为 UID 65532，权限为 `0600`，并设置 `OAC_HISTORY_SETTINGS_FILE=/run/oac/<file name>`：Core 以只读方式把该目录挂载到 `/run/oac`。headers 中可以包含导出凭据，它们绝不会出现在 `oac` 输出或安装报告中。未知字段会被拒绝。
+
+| 字段 | 默认值 | 含义 |
+| --- | --- | --- |
+| `sample_interval_seconds` | `30` | 定期采样间隔，范围为 5 到 300 |
+| `queue_capacity` | `256` | 每个导出器排队的记录数，最大 4096 |
+| `timeout_seconds` | `2` | 导出和历史查询超时，最大 30 |
+| `endpoint` | 未设置 | 绝对 OTLP/HTTP 指标 URL，例如 `https://collector.example/v1/metrics`。未设置时 Core 不导出，其他导出字段也必须未设置 |
+| `transport` | 未设置 | `otlp_http`；设置 `endpoint` 时必填 |
+| `insecure` | `false` | `http` 端点必须设为 `true`，`https` 端点不允许设为 `true` |
+| `headers` | 无 | 发往端点的请求标头。`Host`、`Content-Length`、`Content-Type` 和 `Content-Encoding` 为保留标头 |
 
 ## 运行时设置：Web {#runtime-settings-web}
 
@@ -88,7 +103,7 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 ## Compose 安装 {#compose-installations}
 
-发行版中的[独立 Compose 文件](getting-started/install-options.md#docker-compose-and-hosting-platforms)从平台环境读取进程设置。`OAC_PUBLIC_URL` 为空时选用 `http://localhost:8080`。把它设成准确的公共源地址，不要带尾部斜杠，并在添加节点或执行器之前重新创建 Core 和 Web。平台终止 TLS，并把流量转到 `web:8080`。
+发行版中的[独立 Compose 文件](getting-started/install-options.md#docker-compose-and-hosting-platforms)从平台环境读取进程设置。把 [`OAC_PUBLIC_URL`](#settings) 设成准确的公共源地址，不要带尾部斜杠，并在添加节点或执行器之前重新创建 Core 和 Web。平台终止 TLS，并把流量转到 `web:8080`。
 
 初始化服务首次生成机密信息和安装 ID，随后在后续部署中验证它们。每项机密信息都只有一个持久来源；Core 的密钥摘要派生自 Web 的登录密钥。对于现有安装，初始化绝不会替换缺失或已更改的机密信息。Core 从 `.env` 读取进程环境。
 
@@ -98,7 +113,7 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 | `secrets/database/` | 生成的数据库密码 | PostgreSQL 和 Core |
 | `secrets/core/` | 凭据加密密钥、安装 ID 和 Core 密钥摘要 | Core |
 | `secrets/web/` | 生成的 Core 登录密钥 | Web |
-| `state/` | 私有 Provider 状态 | Core |
+| `state/` | 私有 Provider 状态，在 Core 中挂载到 `/state`。每个适配器拥有一个子目录；E2B 使用 `e2b/`，不允许组或其他用户访问 | Core |
 | `node-payload/` | 已验证的节点安装元数据 | Web |
 
 初始化会准备该目录；应用服务以只读方式接收各自的机密目录。`docker compose exec web oac-web core-key` 把 Core 密钥打印到运维人员终端，不写入容器日志。数据库密码和凭据加密密钥绝不打印。
@@ -139,21 +154,17 @@ Core 读取进程环境。Compose 将 `.env` 插值到环境中，并把机密
 
 | 变量 | 设置来源 |
 | --- | --- |
-| `OAC_PUBLIC_URL` | `public_url`，或 Core 的回环源地址。Core 从中派生守护进程 WebSocket URL、自托管 `remote_url`、托管沙箱地址和部署的只读 `core_url`，绝不从请求标头派生。未设置时，Core 不运行 Runtime 网关，也不执行任何 Session |
+| `OAC_PUBLIC_URL` | [公共 URL](#settings)。Core 只校验一次，并从中派生 Agents API 基地址、守护进程 WebSocket URL、自托管 `remote_url`、安装程序下载地址、托管沙箱地址和部署的只读 `core_url`，绝不从请求标头派生 |
 | `OAC_ADDR` | 安装程序在容器中设置为 `:8091`。独立启动的 Core 在未设置或为空时，默认使用 `127.0.0.1:8091` |
-| `OAC_DATABASE_URL` | 该安装不含密码的 PostgreSQL URL，并将 `core.database_pool` 作为 `pool_*` 查询参数附加到其中 |
+| `OAC_DATABASE_URL` | 必填。不含密码的 PostgreSQL URL |
 | `OAC_DATABASE_PASSWORD_FILE` | `/run/database/password`。此时 URL 不得包含密码 |
 | `OAC_CREDENTIAL_KEY_FILE` | `/run/oac/credential.key` |
-| `OAC_CORE_KEY_DIGESTS_FILE` | `/run/oac/core-key-digests.json`：一个包含 Core 密钥 SHA-256 的 JSON 数组 |
-| `OAC_INSTALLATION_ID_FILE` | `/run/oac/installation.id`：安装 ID，采用规范 UUID 格式。它会启用沙箱部署和节点路由，并要求设置 `OAC_PUBLIC_URL` 和 `OAC_CORE_KEY_DIGESTS_FILE`。如果 ID 与数据库记录的 ID 不一致，Core 会拒绝它，因此必须将两者一同保留 |
-| `OAC_EXECUTION_CONCURRENCY`、`OAC_DEFAULT_HARNESS`、`OAC_HARNESSES`、`OAC_WRITE_AUDIT_RETENTION`、`OAC_OAUTH_TRUSTED_ORIGINS` | 对应的[进程设置](#settings)。`oac-core check-config` 会在不启动 Core 的情况下校验它们 |
-| `OAC_HISTORY_SETTINGS_FILE` | 可选的 Runtime 历史文件。敏感；安装报告只说明它是否已设置 |
-| `OAC_LOG_LEVEL`、`OAC_LOG_FORMAT`、`OAC_LOG_ADD_SOURCE` | `log.*`；Web 也读取这三个设置 |
-| `OAC_PROVIDER_ROOT` | 适配器构件的绝对根目录。Core 镜像设置为 `/opt/oac`。每个适配器都拥有此根目录下的辅助路径 |
-| `OAC_PROVIDER_STATE_ROOT` | 绝对私有状态根目录：Core 镜像中为 `/state`。每个适配器都拥有自己的子目录；E2B 使用 `e2b/`，该目录归 Core 的用户所有，不允许组或其他用户访问。将其与数据库和 `credential.key` 一起备份；不要将其挂载到 Web 或 Runtime 中 |
-| `OAC_NATIVE_INSTALLER_DIR` | 自托管守护进程安装程序：Compose 文件中为 `/opt/oac/native-installers`。未设置时 Core 不提供安装程序。提供目录清单前，Core 会将其与自身发行版进行核对 |
+| `OAC_CORE_KEY_DIGESTS_FILE` | 必填。`/run/oac/core-key-digests.json`：一个包含 Core 密钥 SHA-256 的 JSON 数组 |
+| `OAC_INSTALLATION_ID_FILE` | `/run/oac/installation.id`：安装 ID，采用规范 UUID 格式。它会启用沙箱部署和节点路由，并要求设置 `OAC_PUBLIC_URL`。如果 ID 与数据库记录的 ID 不一致，Core 会拒绝它 |
+| `OAC_EXECUTION_CONCURRENCY`、`OAC_DEFAULT_HARNESS`、`OAC_HARNESSES`、`OAC_WRITE_AUDIT_RETENTION`、`OAC_OAUTH_TRUSTED_ORIGINS`、`OAC_HISTORY_SETTINGS_FILE`、`OAC_LOG_LEVEL`、`OAC_LOG_FORMAT`、`OAC_LOG_ADD_SOURCE` | 对应的[进程设置](#settings)。Web 也读取三个日志设置 |
+| `OAC_PROVIDER_ROOT` | 适配器构件的绝对根目录。Core 镜像设置为 `/opt/oac`。每个适配器都拥有此根目录下的辅助路径。当其中的 `native-installers/` 目录包含 `catalog.json` 时，Core 在核对该目录清单与自身发行版后提供自托管守护进程安装程序。适配器状态位于 `/state`，即数据卷的 [`state/`](#compose-installations) |
 
-Core 会记录所加载文件的路径，但绝不记录环境变量的值或文件内容。
+Core 会记录所加载的历史文件路径，但绝不记录环境变量的值或文件内容。
 
 显式 OAuth 受信任源无效时，Core 会停止启动。条目必须是不含凭据、查询参数和非根路径的 HTTPS 源地址。[Vaults](../../contracts/agents-api/zh/vaults.md) 负责刷新和网络策略。私有颁发者还需要受信任的 CA：独立管理的 Unix Core 可以使用 Go 的 `SSL_CERT_FILE` PEM CA-bundle 覆盖机制，从而保留证书验证。托管安装没有自定义 CA 设置。
 
@@ -163,11 +174,11 @@ Compose 为 Web 设置这些变量。仅在不使用 Compose 运行控制台时
 
 | 变量 | 默认值 | 含义 |
 | --- | --- | --- |
-| `OAC_WEB_ADDR` | `:8080` | 监听地址 |
-| `OAC_WEB_ORIGIN` | `http://127.0.0.1:8080` | 面向浏览器的准确源地址，可以使用 HTTP 或 HTTPS，且不得包含路径。Host 和源地址检查使用此值；HTTPS 会使 Session Cookie 具备 `Secure` 属性 |
-| `OAC_WEB_UPSTREAM` | `http://core:8091` | Core 的源地址，可以使用 HTTP 或 HTTPS，且不得包含凭据、查询参数或路径 |
-| `OAC_WEB_CORE_KEY_FILE` | `/admin/core.key` | 常规文件的绝对路径，该文件没有组或其他用户权限，并保存 Core 密钥：至少 32 个字符、不含空白字符、最大 4 KiB |
+| `OAC_WEB_ADDR` | `:8080` | 监听地址。主机部分为空或未指定时，健康检查在 `127.0.0.1` 上探测它 |
+| `OAC_PUBLIC_URL` | 必填 | [公共 URL](#settings)：面向浏览器的准确源地址，可以使用 HTTP 或 HTTPS，且不得包含路径。Host 和源地址检查使用此值；HTTPS 会使 Session Cookie 具备 `Secure` 属性 |
+| `OAC_WEB_UPSTREAM` | `http://core:8091` | Core 的源地址，可以使用 HTTP 或 HTTPS，且不得包含凭据、查询参数或路径。健康检查探测其 `/healthz` |
+| `OAC_WEB_CORE_KEY_FILE` | 必填 | 常规文件的绝对路径，该文件没有组或其他用户权限，并保存 Core 密钥：至少 32 个字符、不含空白字符、最大 4 KiB |
 | `OAC_WEB_DIST` | `/www` | 已构建控制台的绝对目录；必须包含 `index.html` |
 | `OAC_WEB_NODE_PAYLOAD_DIR` | 未设置 | 所匹配发行版的节点载荷（即安装程序的 `node-payload/`）的绝对路径。未设置时，不提供 `/node-install/*`，且 Add node 不可用 |
 
-变量不存在时会应用默认值；显式空值会按已提供的值进行验证。无效的 `OAC_WEB_*` 值会阻止控制台启动，并显示一条指明变量名的消息。控制台还会读取 `OAC_LOG_LEVEL`、`OAC_LOG_FORMAT` 和 `OAC_LOG_ADD_SOURCE`（[Core 环境](#appendix-core-environment-without-the-installer)）；未知值会回退到其默认值。对于不在同一台计算机上的任何浏览器，请使用 HTTPS。
+未设置或为空的变量使用其默认值。无效值会阻止控制台启动，并显示一条指明变量名的消息。控制台还会读取三个日志[进程设置](#settings)，并拒绝 Core 拒绝的值。对于不在同一台计算机上的任何浏览器，请使用 HTTPS。
diff --git a/docs/zh/web/console-server.md b/docs/zh/web/console-server.md
index e7b67fd2a..a152253ce 100644
--- a/docs/zh/web/console-server.md
+++ b/docs/zh/web/console-server.md
@@ -1,7 +1,7 @@
 ---
 title: "控制台服务器"
 source: docs/web/console-server.md
-source_hash: b0302f0cf27ccd116c4bbb9477d5853f4ae1bf6cea34c9a4e21af72d25656557
+source_hash: 2cc4b562301d95640d2b653ec522a5407a70a98e1f4e3c1fe89bd246ffd1199e
 ---
 
 控制台服务器（`services/web`、`oac-web` 进程）提供构建后的控制台，使用 Core 密钥认证管理员，并将已登录浏览器的 `/core/v1` 请求携带该密钥转发到 Core。浏览器不持有 Core 密钥或任何 API 密钥。应用、节点和自托管执行器经控制台到达 Core，控制台原样转发 `/v1`、`/api/v1` 和 `/docs`。
@@ -44,7 +44,7 @@ flowchart LR
 
 除 `/healthz`、`/v1`、`/api/v1` 和 `/docs` 外，每个请求首先必须通过这些检查：
 
-1. **Host 与来源。** `Host` 请求头必须等于 `OAC_WEB_ORIGIN` 的主机。存在 `Origin` 时必须等于该来源，`Sec-Fetch-Site` 必须为 `same-origin` 或 `none`。写请求既无 `Origin` 又无 `Sec-Fetch-Site: same-origin` 时，需要同源 `Referer`。否则控制台返回 403。`/node-install/*` 仅检查主机和路径。
+1. **Host 与来源。** `Host` 请求头必须等于 `OAC_PUBLIC_URL` 的主机。存在 `Origin` 时必须等于该来源，`Sec-Fetch-Site` 必须为 `same-origin` 或 `none`。写请求既无 `Origin` 又无 `Sec-Fetch-Site: same-origin` 时，需要同源 `Referer`。否则控制台返回 403。`/node-install/*` 仅检查主机和路径。
 2. **安全请求。** 路径必须以 `/` 开头，不含 `%`、反斜杠、NUL、点路径段或空路径段。绝对形式请求目标、`CONNECT` 和 `TRACE` 返回 400。`Upgrade` 头返回 400，但 `/v1`、`/api/v1` 和 `/docs` 在这些检查之前就被转发。因此 `/core/v1` 请求无法离开该前缀。
 3. **登录。** 需要登录的路径在无有效会话 cookie 时返回 401。
 
@@ -77,7 +77,7 @@ flowchart LR
 管理员使用部署的 [Core 密钥](../getting-started/operations.md#core-key)登录。没有控制台账号、用户名或设置步骤，登录授予整个控制台访问权限。
 
 - 控制台以恒定时间比较提交密钥与配置密钥的 SHA-256 摘要，不记录或返回密钥。
-- 会话 cookie `core_console_session` 为 HttpOnly、`SameSite=Strict`，`OAC_WEB_ORIGIN` 为 HTTPS 时还设置 `Secure`。有效期 12 小时。
+- 会话 cookie `core_console_session` 为 HttpOnly、`SameSite=Strict`，`OAC_PUBLIC_URL` 为 HTTPS 时还设置 `Secure`。有效期 12 小时。
 - 会话仅存在控制台内存中，最多同时 64 个，先移除最旧的。重启控制台或轮换 Core 密钥会让所有用户退出登录。
 - 同时最多执行两次登录检查；额外尝试返回 429 和 `Retry-After: 1`。
 - 失败尝试共享每分钟 10 次预算；超出后，错误密钥返回 429 和 `Retry-After: 60`。正确密钥始终可以登录，因此控制台拒绝使用少于 32 字符的 Core 密钥启动。
@@ -100,7 +100,7 @@ flowchart LR
 
 ## 公开地址 {#public-address}
 
-控制台不配置域名，也不申请证书。运维人员的反向代理或托管平台终止 HTTPS 并把流量转到控制台，`OAC_PUBLIC_URL` 记录应用、节点和执行器使用的源地址。控制台只接受 `OAC_WEB_ORIGIN` 的主机，因此 DNS 重绑定不能访问它。
+控制台不配置域名，也不申请证书。运维人员的反向代理或托管平台终止 HTTPS 并把流量转到控制台，`OAC_PUBLIC_URL` 记录浏览器、应用、节点和执行器使用的源地址。控制台只接受该地址的主机，因此 DNS 重绑定不能访问它。
 
 ## 验证 {#verification}
 
diff --git a/internal/obs/log/init.go b/internal/obs/log/init.go
index d570e56be..10c5194dd 100644
--- a/internal/obs/log/init.go
+++ b/internal/obs/log/init.go
@@ -1,10 +1,10 @@
 package log
 
 import (
+	"errors"
 	"io"
 	"log/slog"
 	"os"
-	"strings"
 	"sync"
 )
 
@@ -22,22 +22,42 @@ type Config struct {
 	Out io.Writer
 }
 
-// ConfigFromEnv reads:
+// LoadConfig reads the logging settings Core and Web share:
 //
-//	OAC_LOG_FORMAT     = json | text  (default: auto)
 //	OAC_LOG_LEVEL      = debug | info | warn | error  (default: info)
+//	OAC_LOG_FORMAT     = auto | json | text  (default: auto)
 //	OAC_LOG_ADD_SOURCE = 0 | 1  (default: 0)
 //
-// Unknown values fall back to defaults — Init runs before most
-// error-handling exists, so "boot anyway" beats "panic on typo".
-func ConfigFromEnv() Config {
-	cfg := Config{
-		Format:    strings.ToLower(strings.TrimSpace(os.Getenv("OAC_LOG_FORMAT"))),
-		Level:     parseLevel(os.Getenv("OAC_LOG_LEVEL")),
-		AddSource: os.Getenv("OAC_LOG_ADD_SOURCE") == "1",
-		Out:       os.Stderr,
+// Unset or empty selects the default. Any other value is an error that names
+// the variable and never echoes the value.
+func LoadConfig() (Config, error) {
+	var cfg Config
+	switch os.Getenv("OAC_LOG_LEVEL") {
+	case "", "info":
+	case "debug":
+		cfg.Level = slog.LevelDebug
+	case "warn":
+		cfg.Level = slog.LevelWarn
+	case "error":
+		cfg.Level = slog.LevelError
+	default:
+		return Config{}, errors.New("OAC_LOG_LEVEL must be debug, info, warn or error")
+	}
+	switch format := os.Getenv("OAC_LOG_FORMAT"); format {
+	case "", "auto":
+	case "json", "text":
+		cfg.Format = format
+	default:
+		return Config{}, errors.New("OAC_LOG_FORMAT must be auto, json or text")
+	}
+	switch os.Getenv("OAC_LOG_ADD_SOURCE") {
+	case "", "0":
+	case "1":
+		cfg.AddSource = true
+	default:
+		return Config{}, errors.New("OAC_LOG_ADD_SOURCE must be 0 or 1")
 	}
-	return cfg
+	return cfg, nil
 }
 
 // isTerminal reports whether f is a character device (TTY) so the JSON
@@ -53,19 +73,6 @@ func isTerminal(f *os.File) bool {
 	return info.Mode()&os.ModeCharDevice != 0
 }
 
-func parseLevel(s string) slog.Level {
-	switch strings.ToLower(strings.TrimSpace(s)) {
-	case "debug":
-		return slog.LevelDebug
-	case "warn", "warning":
-		return slog.LevelWarn
-	case "error", "err":
-		return slog.LevelError
-	default:
-		return slog.LevelInfo
-	}
-}
-
 // initOnce guarantees Init's slog.SetDefault side-effect runs at most
 // once per process so tests don't fight over the global handler.
 var initOnce sync.Once
diff --git a/internal/obs/log/init_test.go b/internal/obs/log/init_test.go
new file mode 100644
index 000000000..1d7fd7c4c
--- /dev/null
+++ b/internal/obs/log/init_test.go
@@ -0,0 +1,30 @@
+package log
+
+import (
+	"log/slog"
+	"strings"
+	"testing"
+)
+
+func TestLoadConfigIsStrictAndEmptyMeansDefault(t *testing.T) {
+	t.Setenv("OAC_LOG_LEVEL", "")
+	t.Setenv("OAC_LOG_FORMAT", "auto")
+	t.Setenv("OAC_LOG_ADD_SOURCE", "")
+	if cfg, err := LoadConfig(); err != nil || cfg.Level != slog.LevelInfo || cfg.Format != "" || cfg.AddSource {
+		t.Fatal(cfg, err)
+	}
+	t.Setenv("OAC_LOG_LEVEL", "warn")
+	t.Setenv("OAC_LOG_FORMAT", "text")
+	t.Setenv("OAC_LOG_ADD_SOURCE", "1")
+	if cfg, err := LoadConfig(); err != nil || cfg.Level != slog.LevelWarn || cfg.Format != "text" || !cfg.AddSource {
+		t.Fatal(cfg, err)
+	}
+	for name, value := range map[string]string{"OAC_LOG_LEVEL": "warning", "OAC_LOG_FORMAT": "JSON", "OAC_LOG_ADD_SOURCE": "true"} {
+		t.Run(name, func(t *testing.T) {
+			t.Setenv(name, value)
+			if _, err := LoadConfig(); err == nil || !strings.Contains(err.Error(), name) || strings.Contains(err.Error(), value) {
+				t.Fatal(err)
+			}
+		})
+	}
+}
diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index 47031e10a..e609040ff 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -138,7 +138,7 @@ Provider input validation uses the adapter rules in `internal/harnessconfig`: on
 - At dispatch, Core rechecks the tenant, attached Vault, selected ID, frozen auth type and exact URL before scoped decryption, and the token enters only the transient daemon request. A missing key or binding failure never falls back to anonymous execution.
 
 - `credentialcrypto` ciphertext is a format version byte followed by the standard AEAD nonce, ciphertext and tag. The authenticated data holds a fixed domain and version plus the binding (tenant, Vault, Credential, auth type, exact destination). Keep the domain string unchanged: existing rows must still decrypt.
-- Random-nonce GCM allows at most 2^32 encryptions per key. `secrets/credential.key` also seals model providers, the E2B key, Skills, initial files and environment setup, so every sealed write counts toward that bound; there is no rotation or re-encryption path.
+- Random-nonce GCM allows at most 2^32 encryptions per key. `secrets/core/credential.key` also seals model providers, the E2B key, Skills, initial files and environment setup, so every sealed write counts toward that bound; there is no rotation or re-encryption path.
 - OAuth dispatch refresh holds the Credential row lock and the external exchange under one 20-second context (`vaults.oauthRefreshTimeout`). The refresh HTTP client has a 10-second overall timeout and 5-second TLS handshake and response-header timeouts, uses no proxy and treats any redirect as failure.
 
 ## MCP
diff --git a/services/core/cmd/oac/main.go b/services/core/cmd/oac/main.go
index f2b3393d3..69e15bad7 100644
--- a/services/core/cmd/oac/main.go
+++ b/services/core/cmd/oac/main.go
@@ -25,7 +25,7 @@ func main() {
 		os.Exit(2)
 	}
 	if os.Args[1] == "init" {
-		log.Init(log.ConfigFromEnv())
+		log.Init(log.Config{})
 	}
 	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
@@ -80,9 +80,6 @@ func run(ctx context.Context, command string, args []string) error {
 }
 
 func installDir() (string, error) {
-	if dir := os.Getenv("OAC_INSTALL_DIR"); dir != "" {
-		return dir, nil
-	}
 	exe, err := os.Executable()
 	if err != nil {
 		return "", err
diff --git a/services/core/cmd/server/core_metrics.go b/services/core/cmd/server/core_metrics.go
index 84d4c59a4..52f81462a 100644
--- a/services/core/cmd/server/core_metrics.go
+++ b/services/core/cmd/server/core_metrics.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/coremetricspg"
@@ -74,14 +75,19 @@ func (s *coreMetricsSource) History(ctx context.Context, start, end time.Time, s
 	return s.store.ReadExecutionHistory(ctx, start, end, step)
 }
 
-func reportCleanupResult(metrics *coremetrics.Service, job string, count int64, err error) {
-	if metrics == nil {
-		return
-	}
-	processed, failed := &count, int64(0)
-	if err != nil {
-		processed = nil
-		failed = 1
-	}
-	metrics.ReportJob(job, time.Now(), processed, &failed, err)
+// prune makes a retention pass, bounded by timeout, a job that runs every
+// minute. A failed pass counts no rows and one failure.
+func prune(id string, timeout time.Duration, run func(context.Context) (int64, error)) coremetrics.Periodic {
+	return coremetrics.Periodic{ID: id, Every: time.Minute, Run: func(ctx context.Context) (*int64, int64, error) {
+		pass, cancel := context.WithTimeout(ctx, timeout)
+		count, err := run(pass)
+		cancel()
+		if err != nil {
+			if ctx.Err() == nil {
+				log.Ctx(ctx).Warn("Retention cleanup failed", "job", id)
+			}
+			return nil, 1, err
+		}
+		return &count, 0, nil
+	}}
 }
diff --git a/services/core/cmd/server/credential_cipher.go b/services/core/cmd/server/credential_cipher.go
deleted file mode 100644
index 60a6754c7..000000000
--- a/services/core/cmd/server/credential_cipher.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-	"errors"
-	"os"
-	"strings"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-)
-
-func credentialCipher() (*credentialcrypto.Cipher, error) {
-	path := os.Getenv("OAC_CREDENTIAL_KEY_FILE")
-	if path == "" {
-		return nil, nil
-	}
-	content, err := os.ReadFile(path)
-	if err != nil {
-		return nil, errors.New("cannot read OAC_CREDENTIAL_KEY_FILE")
-	}
-	key, err := base64.StdEncoding.Strict().DecodeString(strings.TrimSpace(string(content)))
-	if err != nil || len(key) != 32 {
-		return nil, errors.New("OAC_CREDENTIAL_KEY_FILE must contain a base64-encoded random 32-byte key")
-	}
-	return credentialcrypto.New(key)
-}
diff --git a/services/core/cmd/server/credential_cipher_test.go b/services/core/cmd/server/credential_cipher_test.go
deleted file mode 100644
index 801d04c91..000000000
--- a/services/core/cmd/server/credential_cipher_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/base64"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
-)
-
-func TestCredentialCipherConfiguration(t *testing.T) {
-	t.Setenv("OAC_CREDENTIAL_KEY_FILE", "")
-	if c, err := credentialCipher(); c != nil || err != nil {
-		t.Fatal("absent dedicated key must remain disabled", err)
-	}
-	path := filepath.Join(t.TempDir(), "credential.key")
-	t.Setenv("OAC_CREDENTIAL_KEY_FILE", path)
-	if _, err := credentialCipher(); err == nil {
-		t.Fatal("missing configured file accepted")
-	}
-	for _, content := range []string{"", "private-invalid-key", base64.StdEncoding.EncodeToString(make([]byte, 31))} {
-		if err := os.WriteFile(path, []byte(content), 0600); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := credentialCipher(); err == nil || strings.Contains(err.Error(), "private-invalid-key") {
-			t.Fatal("invalid configuration accepted or leaked")
-		}
-	}
-	key := bytes.Repeat([]byte{0x91}, 32)
-	if err := os.WriteFile(path, []byte(base64.StdEncoding.EncodeToString(key)+"\n"), 0600); err != nil {
-		t.Fatal(err)
-	}
-	first, err := credentialCipher()
-	if err != nil {
-		t.Fatal(err)
-	}
-	binding := credentialcrypto.Binding{TenantID: "tenant", VaultID: "vault", CredentialID: "credential", AuthType: "static_bearer", Destination: "https://example.invalid/mcp"}
-	sealed, err := first.Seal([]byte("opaque storage test"), binding)
-	if err != nil {
-		t.Fatal(err)
-	}
-	reopened, err := credentialCipher()
-	if err != nil {
-		t.Fatal(err)
-	}
-	got, err := reopened.Open(sealed, binding)
-	if err != nil || string(got) != "opaque storage test" {
-		t.Fatal("persisted key did not recover ciphertext", err)
-	}
-}
diff --git a/services/core/cmd/server/daemon_bootstrap.go b/services/core/cmd/server/daemon_bootstrap.go
deleted file mode 100644
index d4c0644ea..000000000
--- a/services/core/cmd/server/daemon_bootstrap.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package main
-
-import (
-	"errors"
-	"net/url"
-)
-
-// runtimeWebSocketURL derives the daemon WebSocket URL from a Core origin or
-// its /api/v1 base.
-func runtimeWebSocketURL(coreURL string) (string, error) {
-	u, err := url.Parse(coreURL)
-	if err != nil || u.Hostname() == "" || u.User != nil || u.RawQuery != "" || u.Fragment != "" {
-		return "", errors.New("managed Runtime Core address is unavailable")
-	}
-	switch u.Scheme {
-	case "https":
-		u.Scheme = "wss"
-	case "http":
-		u.Scheme = "ws"
-	default:
-		return "", errors.New("managed Runtime Core address is unavailable")
-	}
-	u.Path = "/api/v1/agent-daemon/ws"
-	return u.String(), nil
-}
diff --git a/services/core/cmd/server/installation.go b/services/core/cmd/server/installation.go
index a927a4e3c..11097db7f 100644
--- a/services/core/cmd/server/installation.go
+++ b/services/core/cmd/server/installation.go
@@ -12,27 +12,18 @@ var sourceCommit = regexp.MustCompile(`^[0-9a-f]{40}$`)
 
 // installationFacts reports what GET /core/v1/installation serves: Core's own
 // environment and build, plus the process settings it loaded.
-func installationFacts(publicURL string) (api.Installation, error) {
-	var facts api.Installation
-	id, err := processconfig.InstallationID()
-	if err != nil {
-		return facts, err
+func installationFacts(config processconfig.Config) api.Installation {
+	facts := api.Installation{Configuration: api.InstallationConfiguration{Settings: config.Settings()}}
+	if config.InstallationID != "" {
+		facts.InstallationID = &config.InstallationID
 	}
-	if id != "" {
-		facts.InstallationID = &id
-	}
-	if publicURL != "" {
-		base := publicURL + "/v1"
-		facts.PublicURL, facts.APIBaseURL, facts.LocalOnly = &publicURL, &base, placement.LoopbackOrigin(publicURL)
+	if origin := config.PublicOrigin; origin != nil {
+		public, base := origin.String(), origin.API()
+		facts.PublicURL, facts.APIBaseURL, facts.LocalOnly = &public, &base, placement.LoopbackOrigin(public)
 	}
 	if sourceCommit.MatchString(buildRevision) {
 		revision := buildRevision
 		facts.SourceCommit = &revision
 	}
-	settings, err := processconfig.Settings()
-	if err != nil {
-		return facts, err
-	}
-	facts.Configuration = api.InstallationConfiguration{Settings: settings}
-	return facts, nil
+	return facts
 }
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index f734986f2..a297e4e58 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -35,7 +35,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/agents"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/databaseurl"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmenttemplates"
@@ -43,6 +42,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/nativeinstaller"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/oauthrefresh"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/agentpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/coremetricspg"
@@ -71,53 +71,39 @@ import (
 )
 
 func main() {
+	config, err := processconfig.Load()
 	if len(os.Args) > 1 && os.Args[1] == "check-config" {
-		if err := processconfig.Check(); err != nil {
+		if err != nil {
 			fmt.Fprintln(os.Stderr, err.Error())
 			os.Exit(1)
 		}
 		return
 	}
-	if err := run(); err != nil {
+	if err == nil {
+		err = run(config)
+	}
+	if err != nil {
 		log.Bg().Error("oac-core startup failed", "error", err)
 		os.Exit(1)
 	}
 }
 
-func run() error {
-	if err := processconfig.Check(); err != nil {
-		return err
-	}
-	log.Init(log.ConfigFromEnv())
-	public, err := processconfig.PublicURL()
-	if err != nil {
-		return err
-	}
-	concurrency, err := processconfig.ExecutionConcurrency()
-	if err != nil {
-		return err
-	}
-	logConfigurationSources()
-	databaseURL, err := databaseurl.FromEnvironment()
-	if err != nil {
-		return err
-	}
-	if databaseURL == "" {
-		return errors.New("OAC_DATABASE_URL is required")
-	}
-	credentialKey, err := credentialCipher()
-	if err != nil {
-		return err
+func run(config processconfig.Config) error {
+	log.Init(config.Log)
+	log.Bg().Info("Core process configuration loaded from the process environment")
+	if file := config.RuntimeHistory.File; file != "" {
+		log.Bg().Info("Core auxiliary configuration", "setting", "OAC_HISTORY_SETTINGS_FILE", "path", file)
 	}
+	credentialKey := config.CredentialKey
 	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
 	migrating, cancelMigration := context.WithTimeout(ctx, 2*time.Minute)
-	err = migrations.Apply(migrating, databaseURL)
+	err := migrations.Apply(migrating, config.DatabaseURL)
 	cancelMigration()
 	if err != nil {
 		return fmt.Errorf("Agents API database migration failed: %w", err)
 	}
-	pool, err := pgxpool.New(ctx, databaseURL)
+	pool, err := pgxpool.New(ctx, config.DatabaseURL)
 	if err != nil {
 		return errors.New("invalid Agents API database configuration")
 	}
@@ -127,15 +113,7 @@ func run() error {
 	if err := pool.Ping(ready); err != nil {
 		return errors.New("Agents API database connection failed")
 	}
-	engine, err := processconfig.DefaultHarness()
-	if err != nil {
-		return err
-	}
-	kinds, err := processconfig.Harnesses(engine)
-	if err != nil {
-		return err
-	}
-	oauthClient, err := oauthRefreshClient()
+	oauthClient, err := oauthrefresh.NewClient(config.OAuthTrustedOrigins)
 	if err != nil {
 		return err
 	}
@@ -172,6 +150,10 @@ func run() error {
 		return err
 	}
 	sandboxProviders := providers.Builtin()
+	var public string
+	if config.PublicOrigin != nil {
+		public = config.PublicOrigin.String()
+	}
 	// The placement rules are built once: the provider declarations and the
 	// public URL never change while Core runs.
 	placementRules, err := placement.NewRules(sandboxProviders, public)
@@ -188,34 +170,14 @@ func run() error {
 	if err != nil {
 		return err
 	}
-	installation, err := installationFacts(public)
-	if err != nil {
-		return err
-	}
-	metricsSource := &coreMetricsSource{store: coremetricspg.New(units), pool: pool}
-	metrics := coremetrics.New(processStartedAt, buildRevision, metricsSource)
-	auditRetention, err := writeAuditRetention()
-	if err != nil {
-		return err
-	}
-	auditCleanupCtx, cancelAuditCleanup := context.WithCancel(ctx)
-	auditCleanupDone := make(chan struct{})
-	go func() {
-		defer close(auditCleanupDone)
-		runWriteAuditCleanup(auditCleanupCtx, auditStore, auditRetention, metrics)
-	}()
-	defer func() { cancelAuditCleanup(); <-auditCleanupDone }()
 	var workerDone chan error
 	var worker *execution.Worker
-	managedNodes, err := configureManagedNodes(deploymentService, deploymentStore, sandboxProviders, public, func(ctx context.Context) error {
+	managedNodes := configureManagedNodes(deploymentService, deploymentStore, sandboxProviders, config, func(ctx context.Context) error {
 		if worker == nil {
 			return errors.New("sandbox execution owner is unavailable")
 		}
 		return worker.CheckOwnership(ctx)
 	})
-	if err != nil {
-		return err
-	}
 	defer managedNodes.close()
 	var managed *execution.RuntimeProvider
 	observationSources := map[string]runtimeobs.SourceResolver{}
@@ -227,7 +189,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
-	history, err := runtimeHistory(ctx, units, public != "")
+	history, err := runtimeHistory(ctx, units, config.RuntimeHistory, config.PublicOrigin != nil)
 	if err != nil {
 		return err
 	}
@@ -248,23 +210,7 @@ func run() error {
 			closeRuntimeHistory(closeCtx, history.Exporter)
 		}
 	}()
-	cleanupCtx, cancelCleanup := context.WithCancel(ctx)
-	cleanupDone := make(chan struct{})
-	go func() {
-		defer close(cleanupDone)
-		runHistoryCleanup(cleanupCtx, history.Prune, metrics)
-	}()
-	defer func() { cancelCleanup(); <-cleanupDone }()
-	var keyAdmin *api.DeploymentAuthenticator
-	if managedNodes != nil {
-		keyAdmin = managedNodes.admin
-	} else {
-		keyAdmin, err = deploymentAdminAuthenticator()
-		if err != nil {
-			return err
-		}
-	}
-	if err := api.ValidateCredentialSeparation(ctx, keyAdmin, projectStore); err != nil {
+	if err := api.ValidateCredentialSeparation(ctx, config.CoreKeys, projectStore); err != nil {
 		return err
 	}
 	historyService, err := runtimehistory.NewService(sessionStore, history.Reader)
@@ -275,25 +221,22 @@ func run() error {
 	var registry *runtimegateway.Registry
 	var executorURL string
 	var nativeInstaller *api.NativeInstaller
-	if public != "" {
-		executorURL, err = runtimeWebSocketURL(public)
-		if err != nil {
-			return err
-		}
+	if origin := config.PublicOrigin; origin != nil {
+		executorURL = origin.DaemonWebSocket()
 		daemonHandler, registry, err = runtime.NewGateway(sessionStore, sessionService, sessionStore, executorURL)
 		if err != nil {
 			return err
 		}
 		defer runtime.CloseConnections(registry)
 		var catalog *nativeinstaller.Catalog
-		if directory := os.Getenv("OAC_NATIVE_INSTALLER_DIR"); directory != "" {
-			catalog, err = nativeinstaller.Load(directory, buildRevision)
+		if config.NativeInstallers != "" {
+			catalog, err = nativeinstaller.Load(config.NativeInstallers, buildRevision)
 			if err != nil {
 				return err
 			}
 		}
 		if buildRevision != "" {
-			nativeInstaller = &api.NativeInstaller{Version: buildRevision, Catalog: catalog}
+			nativeInstaller = &api.NativeInstaller{Version: buildRevision, Base: origin.InstallerBase(), Catalog: catalog}
 		}
 	}
 	var deploymentExecution *deployment.ExecutionOperations
@@ -302,7 +245,7 @@ func run() error {
 			Credentials: vaultService, Observer: modelConfigurationStore, Deployment: deploymentService, DeploymentReader: deploymentStore,
 			Sessions:        sessionService,
 			SessionsReader:  sessionStore,
-			ManagedRuntimes: managed, MaxConcurrentExecutions: concurrency}
+			ManagedRuntimes: managed, MaxConcurrentExecutions: config.ExecutionConcurrency}
 		lease, err := pgunit.AcquireLease(ctx, pool)
 		if err != nil {
 			return err
@@ -333,46 +276,40 @@ func run() error {
 			}
 		}()
 	}
-	if history.SampleInterval == 0 {
-		metrics.StopJob("runtime_sampler")
-	}
-	if history.SampleInterval > 0 {
-		if worker == nil {
-			return errors.New("Runtime history periodic sampling requires the execution worker")
-		}
-		sampler, err := runtimeobs.NewSampler(observationResolver, observationService, worker, runtimeobs.SamplerOptions{
-			Interval: history.SampleInterval,
-			Report: func(result runtimeobs.SweepResult) {
-				sampleCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
-				sampleErr := worker.CheckOwnership(sampleCtx)
-				if sampleErr == nil {
-					_, sampleErr = deploymentStore.SampleHostHistory(sampleCtx)
-				}
-				cancel()
-				if !result.Complete {
-					sampleErr = errors.New("incomplete Runtime sampling sweep")
-				}
-				metrics.ReportJob("runtime_sampler", result.CompletedAt, metricPtr(int64(result.Observed)), metricPtr(int64(result.Failed)), sampleErr)
-				fields := []any{"listed", result.Listed, "observed", result.Observed, "failed", result.Failed, "complete", result.Complete}
-				if result.Complete {
-					log.Bg().Debug("Runtime history sampling sweep complete", fields...)
-				} else {
-					log.Bg().Warn("Runtime history sampling sweep incomplete", fields...)
-				}
-			},
-		})
+	// Sampling runs only with the Worker, which owns every sweep.
+	sampling := coremetrics.Periodic{ID: "runtime_sampler", Every: history.SampleInterval}
+	if worker != nil {
+		sampler, err := runtimeobs.NewSampler(observationResolver, observationService, worker, runtimeobs.SamplerOptions{})
 		if err != nil {
 			return err
 		}
-		samplerCtx, cancelSampler := context.WithCancel(ctx)
-		samplerDone := make(chan error, 1)
-		go func() { defer metrics.StopJob("runtime_sampler"); samplerDone <- sampler.Run(samplerCtx) }()
-		defer func() {
-			cancelSampler()
-			<-samplerDone
-		}()
+		sampling.Run = func(ctx context.Context) (*int64, int64, error) {
+			result := sampler.Sweep(ctx)
+			sampleCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
+			err := worker.CheckOwnership(sampleCtx)
+			if err == nil {
+				_, err = deploymentStore.SampleHostHistory(sampleCtx)
+			}
+			cancel()
+			fields := []any{"listed", result.Listed, "observed", result.Observed, "failed", result.Failed, "complete", result.Complete}
+			if !result.Complete {
+				log.Bg().Warn("Runtime history sampling sweep incomplete", fields...)
+				err = errors.New("incomplete Runtime sampling sweep")
+			} else {
+				log.Bg().Debug("Runtime history sampling sweep complete", fields...)
+			}
+			return metricPtr(int64(result.Observed)), int64(result.Failed), err
+		}
+	}
+	metricsSource := &coreMetricsSource{store: coremetricspg.New(units), pool: pool, worker: worker, registry: registry}
+	metrics, err := coremetrics.New(processStartedAt, buildRevision, metricsSource, sampling,
+		prune("history_cleanup", 2*time.Second, history.Prune),
+		prune("audit_cleanup", 5*time.Second, func(ctx context.Context) (int64, error) {
+			return auditStore.DeleteExpiredWriteOperations(ctx, time.Now().Add(-config.WriteAuditRetention), 1000)
+		}))
+	if err != nil {
+		return err
 	}
-	metricsSource.worker, metricsSource.registry = worker, registry
 	metricsCtx, cancelMetrics := context.WithCancel(ctx)
 	metricsDone := make(chan struct{})
 	go func() { defer close(metricsDone); metrics.Run(metricsCtx) }()
@@ -383,8 +320,8 @@ func run() error {
 		return err
 	}
 	deps := api.Dependencies{
-		Engine: engine, Harnesses: kinds, CoreKeys: keyAdmin,
-		Installation: installation, InstallationBindings: deploymentService,
+		Engine: config.DefaultHarness, Harnesses: config.Harnesses, CoreKeys: config.CoreKeys,
+		Installation: installationFacts(config), InstallationBindings: deploymentService,
 		Projects: projectService, ProjectsReader: projectStore,
 		ModelProviders: modelConfigurationService, ModelProvidersReader: modelConfigurationStore,
 		Vaults: vaultService, VaultsReader: vaultStore,
@@ -438,8 +375,7 @@ func run() error {
 		}
 		handler = serverHandler(handler, &routes)
 	}
-	addr := serverAddress()
-	server := &http.Server{Addr: addr, Handler: handler, ReadHeaderTimeout: 10 * time.Second, ReadTimeout: 30 * time.Second, WriteTimeout: 30 * time.Second, IdleTimeout: 60 * time.Second}
+	server := &http.Server{Addr: config.Addr, Handler: handler, ReadHeaderTimeout: 10 * time.Second, ReadTimeout: 30 * time.Second, WriteTimeout: 30 * time.Second, IdleTimeout: 60 * time.Second}
 	done := make(chan error, 1)
 	go func() { done <- server.ListenAndServe() }()
 	select {
diff --git a/services/core/cmd/server/managed_nodes.go b/services/core/cmd/server/managed_nodes.go
index 8e9add39e..a6d8f434b 100644
--- a/services/core/cmd/server/managed_nodes.go
+++ b/services/core/cmd/server/managed_nodes.go
@@ -2,11 +2,8 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
-	"os"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
@@ -17,40 +14,21 @@ import (
 )
 
 type managedNodes struct {
-	setup         *managedSetup
-	runtime       *execution.RuntimeProvider
-	hub           *node.Hub
-	admin         *api.DeploymentAuthenticator
-	closeProvider func()
+	setup   *managedSetup
+	runtime *execution.RuntimeProvider
+	hub     *node.Hub
 }
 
 // configureManagedNodes serves the nodes of the Web-managed deployment. Node
 // presence and health and the generation of each allocation go through the
 // deployment service; the owner epoch that fences connections and the
-// allocations each generation retains are read from the deployment reader.
-func configureManagedNodes(nodes *deployment.Service, reader deployment.Reader, registry *providers.Registry, publicURL string, owner func(context.Context) error) (*managedNodes, error) {
-	setupID, err := processconfig.InstallationID()
-	if err != nil || setupID == "" {
-		return nil, err
-	}
-	if publicURL == "" {
-		return nil, errors.New("OAC_INSTALLATION_ID_FILE requires OAC_PUBLIC_URL, the origin nodes and sandboxes use to reach Core")
-	}
-	closeProvider := func() {}
-	result := &managedNodes{closeProvider: closeProvider}
-	success := false
-	defer func() {
-		if !success {
-			closeProvider()
-		}
-	}()
-	result.admin, err = deploymentAdminAuthenticator()
-	if err != nil {
-		return nil, err
-	}
-	if result.admin == nil {
-		return nil, errors.New("Web sandbox setup requires OAC_CORE_KEY_DIGESTS_FILE with the Core key digest")
+// allocations each generation retains are read from the deployment reader. It
+// returns nil without an installation ID.
+func configureManagedNodes(nodes *deployment.Service, reader deployment.Reader, registry *providers.Registry, config processconfig.Config, owner func(context.Context) error) *managedNodes {
+	if config.InstallationID == "" {
+		return nil
 	}
+	result := &managedNodes{}
 	result.hub = node.NewHub(node.HubOptions{
 		Generations: func(ctx context.Context, n node.Identity, connection string, epoch uint64, health node.Health) error {
 			if err := owner(ctx); err != nil {
@@ -96,41 +74,17 @@ func configureManagedNodes(nodes *deployment.Service, reader deployment.Reader,
 			return nodes.Heartbeat(ctx, n.NodeID, connection, epoch, nodeHealthRecord(health))
 		},
 	})
-	result.setup = &managedSetup{processPaths: providerProcessPaths(), registry: registry, deployment: nodes, allocations: reader, hub: result.hub, installationID: setupID, publicURL: publicURL}
-	result.runtime = execution.NewDeferredRuntimeProvider(setupID, result.setup.load, result.setup.prepare)
+	// Load requires OAC_PUBLIC_URL with an installation ID.
+	result.setup = &managedSetup{processPaths: config.ProviderPaths, registry: registry, deployment: nodes, allocations: reader, hub: result.hub, installationID: config.InstallationID, runtimeAPI: config.PublicOrigin.RuntimeAPI()}
+	result.runtime = execution.NewDeferredRuntimeProvider(config.InstallationID, result.setup.load, result.setup.prepare)
 	result.runtime.PublishUnconfigured = result.setup.publishUnconfigured
-	success = true
-	return result, nil
+	return result
 }
 
 func (m *managedNodes) close() {
 	if m != nil {
 		m.hub.Close()
-		m.closeProvider()
-	}
-}
-
-func deploymentAdminAuthenticator() (*api.DeploymentAuthenticator, error) {
-	path := os.Getenv("OAC_CORE_KEY_DIGESTS_FILE")
-	if path == "" {
-		return nil, nil
-	}
-	raw, err := os.ReadFile(path)
-	if err != nil {
-		return nil, errors.New("cannot read OAC_CORE_KEY_DIGESTS_FILE")
-	}
-	var digests []string
-	if json.Unmarshal(raw, &digests) != nil || len(digests) == 0 {
-		return nil, errors.New("OAC_CORE_KEY_DIGESTS_FILE must contain a JSON array of Core key SHA-256 digests")
-	}
-	return api.NewDeploymentAuthenticator(digests)
-}
-
-func serverAddress() string {
-	if value := os.Getenv("OAC_ADDR"); value != "" {
-		return value
 	}
-	return "127.0.0.1:8091"
 }
 
 func nodeHealthRecord(health node.Health) deployment.NodeHealth {
diff --git a/services/core/cmd/server/managed_setup.go b/services/core/cmd/server/managed_setup.go
index dfce8cdc6..0ca908728 100644
--- a/services/core/cmd/server/managed_setup.go
+++ b/services/core/cmd/server/managed_setup.go
@@ -29,8 +29,9 @@ type managedSetup struct {
 	allocations    generationAllocations
 	hub            *node.Hub
 	installationID string
-	// publicURL is OAC_PUBLIC_URL; every sandbox reaches Core through it.
-	publicURL     string
+	// runtimeAPI is the /api/v1 base of OAC_PUBLIC_URL; every sandbox reaches
+	// Core through it.
+	runtimeAPI    string
 	selected      atomic.Pointer[managedSelection]
 	providerCalls sandbox.CallFence
 }
@@ -145,7 +146,7 @@ func (s *managedSetup) configuration(setup deployment.Setup) (execution.Prepared
 		return execution.PreparedRuntimeDeployment{}, fmt.Errorf("%w: %v", execution.ErrExecutionUnavailable, err)
 	}
 	selected := &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused,
-		CoreURL: s.publicURL + "/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: provider}
+		CoreURL: s.runtimeAPI, BackendFingerprint: setup.BackendFingerprint, Provider: provider}
 	if setup.Suspension != nil {
 		selected.Suspension = &execution.RuntimeSuspensionPolicy{IdleTimeout: time.Duration(setup.Suspension.IdleSeconds) * time.Second,
 			Retention: time.Duration(setup.Suspension.RetentionSeconds) * time.Second, MaxActive: 4, MaxRetained: 16}
diff --git a/services/core/cmd/server/managed_setup_test.go b/services/core/cmd/server/managed_setup_test.go
index efc656985..d6d2ff663 100644
--- a/services/core/cmd/server/managed_setup_test.go
+++ b/services/core/cmd/server/managed_setup_test.go
@@ -2,17 +2,15 @@ package main
 
 import (
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"errors"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/processconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/docker"
@@ -27,32 +25,18 @@ import (
 )
 
 func TestWebSetupCreatesManagerWithoutLocalProvider(t *testing.T) {
-	idFile := filepath.Join(t.TempDir(), "installation.id")
-	if err := os.WriteFile(idFile, []byte(uuid.NewString()+"\n"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	t.Setenv("OAC_INSTALLATION_ID_FILE", idFile)
-	digest := sha256.Sum256([]byte("synthetic-admin"))
-	path := filepath.Join(t.TempDir(), "core-key-digests.json")
-	if err := os.WriteFile(path, []byte(`["`+hex.EncodeToString(digest[:])+`"]`), 0600); err != nil {
-		t.Fatal(err)
+	if configureManagedNodes(nil, nil, providers.Builtin(), processconfig.Config{}, nil) != nil {
+		t.Fatal("sandbox manager started without an installation ID")
 	}
-	t.Setenv("OAC_CORE_KEY_DIGESTS_FILE", path)
-	if _, err := configureManagedNodes(nil, nil, providers.Builtin(), "", nil); err == nil || !strings.Contains(err.Error(), "OAC_PUBLIC_URL") {
-		t.Fatal("sandbox manager started without a public URL", err)
-	}
-	m, err := configureManagedNodes(nil, nil, providers.Builtin(), "https://core.example", func(context.Context) error { return nil })
+	origin, err := deployment.NewPublicOrigin("https://core.example")
 	if err != nil {
 		t.Fatal(err)
 	}
+	m := configureManagedNodes(nil, nil, providers.Builtin(), processconfig.Config{InstallationID: uuid.NewString(), PublicOrigin: &origin}, func(context.Context) error { return nil })
 	defer m.close()
-	if m.setup == nil || m.admin == nil || m.hub == nil || m.runtime == nil || m.runtime.Provider != nil {
+	if m.setup == nil || m.hub == nil || m.runtime == nil || m.runtime.Provider != nil || m.setup.runtimeAPI != "https://core.example/api/v1" {
 		t.Fatal("zero-node setup unexpectedly instantiated local compute or omitted management")
 	}
-	t.Setenv("OAC_CORE_KEY_DIGESTS_FILE", "")
-	if _, err := configureManagedNodes(nil, nil, providers.Builtin(), "https://core.example", nil); err == nil {
-		t.Fatal("setup accepted without admin authentication")
-	}
 }
 
 // fakeDeploymentSetups is a strict deploymentSetups: a call without a set
@@ -182,7 +166,7 @@ func TestManagedSetupPreparesWithoutPublishing(t *testing.T) {
 	id := uuid.NewString()
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
-	s := &managedSetup{registry: providers.Builtin(), installationID: id, hub: hub, deployment: &fakeDeploymentSetups{t: t}, allocations: &fakeGenerationAllocations{t: t}, publicURL: "https://core.example"}
+	s := &managedSetup{registry: providers.Builtin(), installationID: id, hub: hub, deployment: &fakeDeploymentSetups{t: t}, allocations: &fakeGenerationAllocations{t: t}, runtimeAPI: "https://core.example/api/v1"}
 	previous := &execution.RuntimeProvider{InstallationID: id, Generation: 1, ProviderKind: "docker"}
 	s.publish(previous)
 	candidate, err := s.prepare(t.Context(), deployment.Setup{InstallationID: id, Provider: "microsandbox", Mode: "nodes", Operations: microsandbox.Operations(), Suspension: &deployment.Suspension{IdleSeconds: 300, RetentionSeconds: 86400}})
diff --git a/services/core/cmd/server/oauth_refresh.go b/services/core/cmd/server/oauth_refresh.go
deleted file mode 100644
index 8871bacd6..000000000
--- a/services/core/cmd/server/oauth_refresh.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package main
-
-import (
-	"os"
-	"strings"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/oauthrefresh"
-)
-
-func oauthRefreshClient() (*oauthrefresh.Client, error) {
-	var origins []string
-	if raw := os.Getenv("OAC_OAUTH_TRUSTED_ORIGINS"); raw != "" {
-		for _, origin := range strings.Split(raw, ",") {
-			origins = append(origins, strings.TrimSpace(origin))
-		}
-	}
-	return oauthrefresh.NewClient(origins)
-}
diff --git a/services/core/cmd/server/oauth_refresh_test.go b/services/core/cmd/server/oauth_refresh_test.go
deleted file mode 100644
index da8aaedf5..000000000
--- a/services/core/cmd/server/oauth_refresh_test.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package main
-
-import "testing"
-
-func TestOAuthRefreshOperatorPolicy(t *testing.T) {
-	for _, raw := range []string{"", "https://issuer.example", "https://issuer.example, https://10.0.0.1:9443"} {
-		t.Setenv("OAC_OAUTH_TRUSTED_ORIGINS", raw)
-		if _, err := oauthRefreshClient(); err != nil {
-			t.Fatal(err)
-		}
-	}
-	for _, raw := range []string{"http://issuer.example", "https://issuer.example/token", "https://issuer.example,", "https://user:secret@issuer.example"} {
-		t.Setenv("OAC_OAUTH_TRUSTED_ORIGINS", raw)
-		if _, err := oauthRefreshClient(); err == nil {
-			t.Fatal("invalid issuer policy accepted")
-		}
-	}
-}
diff --git a/services/core/cmd/server/process_configuration.go b/services/core/cmd/server/process_configuration.go
deleted file mode 100644
index 476973ac5..000000000
--- a/services/core/cmd/server/process_configuration.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-)
-
-// The launcher loads core.env. Core reports its sources without parsing another
-// configuration layer or logging environment values.
-func logConfigurationSources() {
-	log.Bg().Info("Core process configuration loaded from the process environment")
-	for _, key := range []string{"OAC_HISTORY_SETTINGS_FILE"} {
-		if path := os.Getenv(key); path != "" {
-			log.Bg().Info("Core auxiliary configuration", "setting", key, "path", path)
-		}
-	}
-}
-
-func providerProcessPaths() sandbox.ProcessPaths {
-	return sandbox.ProcessPaths{ArtifactRoot: os.Getenv("OAC_PROVIDER_ROOT"), StateRoot: os.Getenv("OAC_PROVIDER_STATE_ROOT")}
-}
diff --git a/services/core/cmd/server/process_configuration_test.go b/services/core/cmd/server/process_configuration_test.go
deleted file mode 100644
index eef02edc8..000000000
--- a/services/core/cmd/server/process_configuration_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package main
-
-import (
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/processconfig"
-)
-
-func TestExecutionConcurrencyConfiguration(t *testing.T) {
-	t.Setenv("OAC_EXECUTION_CONCURRENCY", "unused")
-	if err := os.Unsetenv("OAC_EXECUTION_CONCURRENCY"); err != nil {
-		t.Fatal(err)
-	}
-	if got, err := processconfig.ExecutionConcurrency(); err != nil || got != 4 {
-		t.Fatal(got, err)
-	}
-	t.Setenv("OAC_EXECUTION_CONCURRENCY", "")
-	if got, err := processconfig.ExecutionConcurrency(); err != nil || got != 4 {
-		t.Fatal("empty concurrency did not keep the default", got, err)
-	}
-	for _, value := range []string{"1", "7", "1024"} {
-		t.Setenv("OAC_EXECUTION_CONCURRENCY", value)
-		if got, err := processconfig.ExecutionConcurrency(); err != nil || got < 1 {
-			t.Fatal(value, got, err)
-		}
-	}
-	for _, value := range []string{"0", "-1", "1025", "1.5", "secret-value"} {
-		t.Setenv("OAC_EXECUTION_CONCURRENCY", value)
-		if _, err := processconfig.ExecutionConcurrency(); err == nil || strings.Contains(err.Error(), "secret-value") {
-			t.Fatal("invalid concurrency accepted or echoed", err)
-		}
-	}
-}
-
-func TestPublicURLMustBeACanonicalOrigin(t *testing.T) {
-	for _, value := range []string{"https://core.example", "https://core.example:8443", "http://127.0.0.1:8091", "http://core.example"} {
-		t.Setenv("OAC_PUBLIC_URL", value)
-		if got, err := processconfig.PublicURL(); err != nil || got != value {
-			t.Fatal(value, got, err)
-		}
-	}
-	for _, value := range []string{"https://core.example/", "https://Core.example", "wss://core.example", "https://core.example/v1"} {
-		t.Setenv("OAC_PUBLIC_URL", value)
-		if _, err := processconfig.PublicURL(); err == nil {
-			t.Fatal("accepted", value)
-		}
-	}
-}
diff --git a/services/core/cmd/server/runtime_history.go b/services/core/cmd/server/runtime_history.go
index 11213fa2e..7d333c097 100644
--- a/services/core/cmd/server/runtime_history.go
+++ b/services/core/cmd/server/runtime_history.go
@@ -1,44 +1,17 @@
 package main
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
-	"errors"
-	"io"
-	"net/url"
-	"os"
-	"strings"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/runtimehistorypg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/processconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs/otlpexporter"
-	"golang.org/x/net/http/httpguts"
 )
 
-const (
-	defaultRuntimeHistoryQueueCapacity     = 256
-	defaultRuntimeHistoryTimeoutSeconds    = 2
-	maxRuntimeHistoryQueueCapacity         = 4096
-	maxRuntimeHistoryTimeoutSeconds        = 30
-	minRuntimeHistorySampleIntervalSeconds = 5
-	maxRuntimeHistorySampleIntervalSeconds = 300
-)
-
-type runtimeHistoryConfig struct {
-	Transport             string            `json:"transport,omitempty"`
-	Endpoint              string            `json:"endpoint,omitempty"`
-	Insecure              bool              `json:"insecure,omitempty"`
-	Headers               map[string]string `json:"headers,omitempty"`
-	QueueCapacity         int               `json:"queue_capacity,omitempty"`
-	TimeoutSeconds        int               `json:"timeout_seconds,omitempty"`
-	SampleIntervalSeconds int               `json:"sample_interval_seconds,omitempty"`
-}
-
 type runtimeHistorySetup struct {
 	Options        []runtimeobs.ServiceOption
 	Exporter       runtimeHistoryExporter
@@ -52,12 +25,8 @@ type runtimeHistoryExporter interface {
 	Close(context.Context) error
 }
 
-func runtimeHistory(ctx context.Context, units *pgunit.Pool, executionEnabled bool) (runtimeHistorySetup, error) {
-	config, err := loadRuntimeHistoryConfig()
-	if err != nil {
-		return runtimeHistorySetup{}, err
-	}
-	interval := time.Duration(config.SampleIntervalSeconds) * time.Second
+func runtimeHistory(ctx context.Context, units *pgunit.Pool, config processconfig.RuntimeHistory, executionEnabled bool) (runtimeHistorySetup, error) {
+	interval := config.SampleInterval
 	mode := runtimehistory.CollectionPeriodic
 	if !executionEnabled {
 		interval = 0
@@ -69,15 +38,14 @@ func runtimeHistory(ctx context.Context, units *pgunit.Pool, executionEnabled bo
 		MaximumPoints: 1000, MaximumSeries: 64, MaximumTotalPoints: 10000,
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory, runtimehistory.MetricTokens},
 	}
-	timeout := time.Duration(config.TimeoutSeconds) * time.Second
-	backend, err := runtimehistorypg.New(units, runtimehistorypg.Config{Capabilities: capabilities, QueryTimeout: timeout})
+	backend, err := runtimehistorypg.New(units, runtimehistorypg.Config{Capabilities: capabilities, QueryTimeout: config.Timeout})
 	if err != nil {
 		return runtimeHistorySetup{}, err
 	}
-	options := runtimeobs.ExportOptions{QueueCapacity: config.QueueCapacity, Timeout: timeout}
+	options := runtimeobs.ExportOptions{QueueCapacity: config.QueueCapacity, Timeout: config.Timeout}
 	setup := runtimeHistorySetup{Options: []runtimeobs.ServiceOption{runtimeobs.WithExporter(backend, options)}, Reader: backend, SampleInterval: interval, Prune: backend.Prune}
 	if config.Endpoint != "" {
-		exporter, err := otlpexporter.New(ctx, otlpexporter.Config{Endpoint: config.Endpoint, Headers: config.Headers, Insecure: config.Insecure, RequestTimeout: timeout})
+		exporter, err := otlpexporter.New(ctx, otlpexporter.Config{Endpoint: config.Endpoint, Headers: config.Headers, Insecure: config.Insecure, RequestTimeout: config.Timeout})
 		if err != nil {
 			return runtimeHistorySetup{}, err
 		}
@@ -88,99 +56,7 @@ func runtimeHistory(ctx context.Context, units *pgunit.Pool, executionEnabled bo
 	return setup, nil
 }
 
-func loadRuntimeHistoryConfig() (runtimeHistoryConfig, error) {
-	var config runtimeHistoryConfig
-	if file := os.Getenv("OAC_HISTORY_SETTINGS_FILE"); file != "" {
-		raw, err := os.ReadFile(file)
-		if err != nil {
-			return config, errors.New("cannot read OAC_HISTORY_SETTINGS_FILE")
-		}
-		decoder := json.NewDecoder(bytes.NewReader(raw))
-		decoder.DisallowUnknownFields()
-		if decoder.Decode(&config) != nil || decoder.Decode(new(any)) != io.EOF {
-			return config, errors.New("invalid Runtime history configuration")
-		}
-	}
-	if err := validateRuntimeHistoryConfig(config); err != nil {
-		return config, err
-	}
-	if config.QueueCapacity == 0 {
-		config.QueueCapacity = defaultRuntimeHistoryQueueCapacity
-	}
-	if config.TimeoutSeconds == 0 {
-		config.TimeoutSeconds = defaultRuntimeHistoryTimeoutSeconds
-	}
-	if config.SampleIntervalSeconds == 0 {
-		config.SampleIntervalSeconds = 30
-	}
-	return config, nil
-}
-
 func closeRuntimeHistory(ctx context.Context, exporter runtimeHistoryExporter) {
 	defer func() { _ = recover() }()
 	_ = exporter.Close(ctx)
 }
-
-// Retention also runs without active Runtimes. Each bounded pass has its own deadline.
-func runHistoryCleanup(ctx context.Context, prune func(context.Context) (int64, error), metrics *coremetrics.Service) {
-	if metrics != nil {
-		defer metrics.StopJob("history_cleanup")
-	}
-	ticker := time.NewTicker(time.Minute)
-	defer ticker.Stop()
-	for {
-		pruneCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
-		count, err := prune(pruneCtx)
-		cancel()
-		reportCleanupResult(metrics, "history_cleanup", count, err)
-		select {
-		case <-ctx.Done():
-			return
-		case <-ticker.C:
-		}
-	}
-}
-
-func validateRuntimeHistoryConfig(config runtimeHistoryConfig) error {
-	if config.QueueCapacity < 0 || config.QueueCapacity > maxRuntimeHistoryQueueCapacity {
-		return errors.New("Runtime history queue_capacity is out of range")
-	}
-	if config.TimeoutSeconds < 0 || config.TimeoutSeconds > maxRuntimeHistoryTimeoutSeconds {
-		return errors.New("Runtime history timeout_seconds is out of range")
-	}
-	if config.SampleIntervalSeconds != 0 && (config.SampleIntervalSeconds < minRuntimeHistorySampleIntervalSeconds || config.SampleIntervalSeconds > maxRuntimeHistorySampleIntervalSeconds) {
-		return errors.New("Runtime history sample_interval_seconds is out of range")
-	}
-	if config.Endpoint == "" {
-		if config.Transport != "" || config.Insecure || len(config.Headers) != 0 {
-			return errors.New("Runtime history export options require an endpoint")
-		}
-		return nil
-	}
-	if config.Transport != "otlp_http" {
-		return errors.New("Runtime history transport must be otlp_http")
-	}
-	endpoint, err := url.Parse(config.Endpoint)
-	if err != nil || endpoint.Host == "" || endpoint.User != nil || endpoint.RawQuery != "" || endpoint.Fragment != "" || endpoint.RawPath != "" || endpoint.Path == "" || endpoint.String() != config.Endpoint {
-		return errors.New("Runtime history endpoint must be a canonical absolute OTLP metrics URL")
-	}
-	switch endpoint.Scheme {
-	case "https":
-		if config.Insecure {
-			return errors.New("Runtime history insecure transport requires an http endpoint")
-		}
-	case "http":
-		if !config.Insecure {
-			return errors.New("Runtime history http endpoint requires insecure=true")
-		}
-	default:
-		return errors.New("Runtime history endpoint scheme must be https or explicit insecure http")
-	}
-	for key, value := range config.Headers {
-		lower := strings.ToLower(key)
-		if !httpguts.ValidHeaderFieldName(key) || !httpguts.ValidHeaderFieldValue(value) || lower == "host" || lower == "content-length" || lower == "content-type" || lower == "content-encoding" {
-			return errors.New("Runtime history headers contain an invalid or reserved entry")
-		}
-	}
-	return nil
-}
diff --git a/services/core/cmd/server/runtime_history_test.go b/services/core/cmd/server/runtime_history_test.go
index c640f2c92..17c748cb5 100644
--- a/services/core/cmd/server/runtime_history_test.go
+++ b/services/core/cmd/server/runtime_history_test.go
@@ -2,13 +2,12 @@ package main
 
 import (
 	"context"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	"os"
-	"path/filepath"
-	"strings"
 	"testing"
 	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/processconfig"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 )
 
 type panicHistoryExporter struct{}
@@ -16,10 +15,11 @@ type panicHistoryExporter struct{}
 func (panicHistoryExporter) Export(context.Context, runtimeobs.ExportRecord) error { return nil }
 func (panicHistoryExporter) Close(context.Context) error                           { panic("close") }
 
+var defaultHistory = processconfig.RuntimeHistory{QueueCapacity: 256, Timeout: 2 * time.Second, SampleInterval: 30 * time.Second}
+
 func TestRuntimeHistoryUsesCoreDatabaseByDefault(t *testing.T) {
-	t.Setenv("OAC_HISTORY_SETTINGS_FILE", "")
 	for _, enabled := range []bool{true, false} {
-		setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), enabled)
+		setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), defaultHistory, enabled)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -40,12 +40,9 @@ func TestRuntimeHistoryUsesCoreDatabaseByDefault(t *testing.T) {
 }
 
 func TestRuntimeHistoryOptionalExportAndSamplingConfiguration(t *testing.T) {
-	file := filepath.Join(t.TempDir(), "history.json")
-	if err := os.WriteFile(file, []byte(`{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","headers":{"Authorization":"Bearer private"},"sample_interval_seconds":60}`), 0600); err != nil {
-		t.Fatal(err)
-	}
-	t.Setenv("OAC_HISTORY_SETTINGS_FILE", file)
-	setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), true)
+	config := defaultHistory
+	config.Endpoint, config.Headers, config.SampleInterval = "https://collector.example.test/v1/metrics", map[string]string{"Authorization": "Bearer private"}, time.Minute
+	setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), config, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -55,51 +52,6 @@ func TestRuntimeHistoryOptionalExportAndSamplingConfiguration(t *testing.T) {
 	}
 }
 
-func TestRuntimeHistoryConfigFailsClosedWithoutLeakingSecrets(t *testing.T) {
-	tests := []struct {
-		name   string
-		config string
-	}{
-		{name: "unknown field", config: `{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","secret":"must-not-leak"}`},
-		{name: "implicit insecure", config: `{"transport":"otlp_http","endpoint":"http://collector.example.test/v1/metrics"}`},
-		{name: "userinfo", config: `{"transport":"otlp_http","endpoint":"https://user:must-not-leak@collector.example.test/v1/metrics"}`},
-		{name: "header newline", config: "{\"transport\":\"otlp_http\",\"endpoint\":\"https://collector.example.test/v1/metrics\",\"headers\":{\"Authorization\":\"Bearer must-not-leak\\n\"}}"},
-		{name: "reserved header", config: `{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","headers":{"Host":"must-not-leak"}}`},
-		{name: "oversized queue", config: `{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","queue_capacity":4097}`},
-		{name: "oversized timeout", config: `{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","timeout_seconds":31}`},
-		{name: "too frequent sampling", config: `{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","sample_interval_seconds":4}`},
-		{name: "oversized sampling interval", config: `{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","sample_interval_seconds":301}`},
-		{name: "removed backend", config: `{"clickhouse":{"password":"must-not-leak"}}`},
-		{name: "transport without endpoint", config: `{"transport":"otlp_http"}`},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			file := filepath.Join(t.TempDir(), "runtime-history.json")
-			if err := os.WriteFile(file, []byte(test.config), 0600); err != nil {
-				t.Fatal(err)
-			}
-			t.Setenv("OAC_HISTORY_SETTINGS_FILE", file)
-			_, err := loadRuntimeHistoryConfig()
-			if err == nil {
-				t.Fatal("unsafe history configuration accepted")
-			}
-			if strings.Contains(err.Error(), "must-not-leak") {
-				t.Fatalf("history error leaked config content: %v", err)
-			}
-		})
-	}
-}
-
-func TestRuntimeHistoryAllowsExplicitLocalHTTPCollector(t *testing.T) {
-	config := runtimeHistoryConfig{
-		Transport: "otlp_http", Endpoint: "http://127.0.0.1:4318/v1/metrics", Insecure: true,
-		Headers: map[string]string{"X-Scope-OrgID": "operator-history"},
-	}
-	if err := validateRuntimeHistoryConfig(config); err != nil {
-		t.Fatal(err)
-	}
-}
-
 func TestRuntimeHistoryClosePanicIsIsolated(t *testing.T) {
 	closeRuntimeHistory(t.Context(), panicHistoryExporter{})
 }
diff --git a/services/core/cmd/server/write_audit.go b/services/core/cmd/server/write_audit.go
deleted file mode 100644
index 481533521..000000000
--- a/services/core/cmd/server/write_audit.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"os"
-	"time"
-
-	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
-)
-
-type writeAuditPruner interface {
-	DeleteExpiredWriteOperations(context.Context, time.Time, int) (int64, error)
-}
-
-func writeAuditRetention() (time.Duration, error) {
-	value := os.Getenv("OAC_WRITE_AUDIT_RETENTION")
-	if value == "" {
-		return 90 * 24 * time.Hour, nil
-	}
-	duration, err := time.ParseDuration(value)
-	if err != nil || duration < time.Hour {
-		return 0, errors.New("OAC_WRITE_AUDIT_RETENTION must be a duration of at least 1h")
-	}
-	return duration, nil
-}
-
-func runWriteAuditCleanup(ctx context.Context, s writeAuditPruner, retention time.Duration, metrics *coremetrics.Service) {
-	if metrics != nil {
-		defer metrics.StopJob("audit_cleanup")
-	}
-	ticker := time.NewTicker(time.Minute)
-	defer ticker.Stop()
-	for {
-		pruneCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
-		count, err := s.DeleteExpiredWriteOperations(pruneCtx, time.Now().Add(-retention), 1000)
-		cancel()
-		reportCleanupResult(metrics, "audit_cleanup", count, err)
-		if err != nil && ctx.Err() == nil {
-			log.Ctx(ctx).Warn("Write audit retention cleanup failed")
-		}
-		select {
-		case <-ctx.Done():
-			return
-		case <-ticker.C:
-		}
-	}
-}
diff --git a/services/core/cmd/server/write_audit_test.go b/services/core/cmd/server/write_audit_test.go
deleted file mode 100644
index 3891684c1..000000000
--- a/services/core/cmd/server/write_audit_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-)
-
-func TestWriteAuditRetention(t *testing.T) {
-	for _, test := range []struct {
-		value string
-		want  time.Duration
-		bad   bool
-	}{{"", 90 * 24 * time.Hour, false}, {"24h", 24 * time.Hour, false}, {"0", 0, true}, {"30m", 0, true}, {"-1h", 0, true}, {"90d", 0, true}} {
-		t.Run(test.value, func(t *testing.T) {
-			t.Setenv("OAC_WRITE_AUDIT_RETENTION", test.value)
-			got, err := writeAuditRetention()
-			if (err != nil) != test.bad || (!test.bad && got != test.want) {
-				t.Fatalf("%v %v", got, err)
-			}
-		})
-	}
-}
-
-type auditPruneProbe struct {
-	cancel   context.CancelFunc
-	called   bool
-	cutoff   time.Time
-	limit    int
-	deadline bool
-}
-
-func (p *auditPruneProbe) DeleteExpiredWriteOperations(ctx context.Context, cutoff time.Time, limit int) (int64, error) {
-	p.called = true
-	p.cutoff = cutoff
-	p.limit = limit
-	_, p.deadline = ctx.Deadline()
-	p.cancel()
-	return 0, errors.New("test")
-}
-func TestWriteAuditCleanupBoundedAndCancellable(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	probe := &auditPruneProbe{cancel: cancel}
-	before := time.Now().Add(-24 * time.Hour)
-	runWriteAuditCleanup(ctx, probe, 24*time.Hour, nil)
-	if !probe.called || probe.limit != 1000 || !probe.deadline || probe.cutoff.Before(before) || probe.cutoff.After(time.Now().Add(-24*time.Hour)) {
-		t.Fatalf("bad cleanup %+v", probe)
-	}
-}
diff --git a/services/core/deploy/claude/Dockerfile b/services/core/deploy/claude/Dockerfile
index 08ffc4eee..115878e19 100644
--- a/services/core/deploy/claude/Dockerfile
+++ b/services/core/deploy/claude/Dockerfile
@@ -10,7 +10,6 @@ COPY claude-sdk /opt/claude-sdk
 ENV HOME=/home/runtime OAC_RUNTIME_HOME=/home/runtime/.oac \
     OAC_RUNTIME_CLAUDE_SDK_NODE=/usr/local/bin/node \
     OAC_RUNTIME_CLAUDE_SDK_ENTRYPOINT=/opt/claude-sdk/dist/main.js \
-    OAC_RUNTIME_CLAUDE_SDK_WORKSPACE=managed \
     OAC_RUNTIME_WORKSPACE=/environment/workspace \
     OAC_RUNTIME_INITIALIZATION_DIRECTORY=/environment/initialization \
     OAC_RUNTIME_PACKAGE_DIRECTORY=/environment/packages
diff --git a/services/core/internal/api/contract_routes_test.go b/services/core/internal/api/contract_routes_test.go
index 9d4fadb95..6b589bceb 100644
--- a/services/core/internal/api/contract_routes_test.go
+++ b/services/core/internal/api/contract_routes_test.go
@@ -69,7 +69,7 @@ func TestContractsPublishExactlyTheRegisteredCoreAndMachineRoutes(t *testing.T)
 	// Every optional group that gates a route registration, as the server enables them.
 	deps, fakes := testDependencies(t)
 	deps.Execution, deps.Sandboxes = fakes.execution(), fakes.sandboxes()
-	deps.Execution.NativeInstaller = &NativeInstaller{Version: "contract-test", Catalog: &nativeinstaller.Catalog{}}
+	deps.Execution.NativeInstaller = &NativeInstaller{Version: "contract-test", Base: "https://core.example/api/v1/agent-daemon/install/", Catalog: &nativeinstaller.Catalog{}}
 	h := &Handler{Dependencies: deps}
 	contracts := map[string]string{"/v1": "openapi.yaml", "/core/v1": "core.openapi.yaml", "/api/v1": "runtime.openapi.yaml"}
 	published := map[string]map[string]bool{}
diff --git a/services/core/internal/api/dependencies.go b/services/core/internal/api/dependencies.go
index f4e2b408d..5dcb4f981 100644
--- a/services/core/internal/api/dependencies.go
+++ b/services/core/internal/api/dependencies.go
@@ -151,8 +151,8 @@ func (d Dependencies) validate() error {
 		if e.ExecutorURL == "" {
 			return errors.New("api: Execution.ExecutorURL is required")
 		}
-		if e.NativeInstaller != nil && e.NativeInstaller.Version == "" {
-			return errors.New("api: Execution.NativeInstaller.Version is required")
+		if e.NativeInstaller != nil && (e.NativeInstaller.Version == "" || e.NativeInstaller.Base == "") {
+			return errors.New("api: Execution.NativeInstaller.Version and Base are required")
 		}
 		if err := required(
 			field{"Execution.SessionAdmission", e.SessionAdmission},
diff --git a/services/core/internal/api/dependencies_test.go b/services/core/internal/api/dependencies_test.go
index c7a5bf73b..a044d4988 100644
--- a/services/core/internal/api/dependencies_test.go
+++ b/services/core/internal/api/dependencies_test.go
@@ -179,7 +179,7 @@ func TestNewHandlerAcceptsCompleteDependencies(t *testing.T) {
 		t.Fatal(err)
 	}
 	deps.Execution = f.execution()
-	deps.Execution.NativeInstaller = &NativeInstaller{Version: "build"}
+	deps.Execution.NativeInstaller = &NativeInstaller{Version: "build", Base: "https://core.example/api/v1/agent-daemon/install/"}
 	deps.Sandboxes = f.sandboxes()
 	if _, err := NewHandler(deps); err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/api/environment_installation.go b/services/core/internal/api/environment_installation.go
index 8f60a15c9..caa666ef7 100644
--- a/services/core/internal/api/environment_installation.go
+++ b/services/core/internal/api/environment_installation.go
@@ -17,6 +17,8 @@ import (
 type NativeInstaller struct {
 	// Version is the build revision executors install and claim.
 	Version string
+	// Base is the public URL prefix of the versioned installer downloads.
+	Base string
 	// Catalog holds the matching installation artifacts. It is nil when the
 	// operator installed none: installations then report unavailable and the
 	// grant routes answer 503 installation_unavailable.
@@ -46,9 +48,7 @@ func (h *Handler) installationFor(ctx context.Context, principal identity.Princi
 	if err != nil {
 		return nil, err
 	}
-	origin := strings.TrimSuffix(h.Execution.ExecutorURL, "/api/v1/agent-daemon/ws")
-	origin = strings.Replace(strings.Replace(origin, "wss://", "https://", 1), "ws://", "http://", 1)
-	return &v1.EnvironmentInstallation{Status: "available", Version: installer.Version, ExpiresAt: expires, Commands: installer.Catalog.Commands(origin, token)}, nil
+	return &v1.EnvironmentInstallation{Status: "available", Version: installer.Version, ExpiresAt: expires, Commands: installer.Catalog.Commands(installer.Base, token)}, nil
 }
 
 func (h *Handler) addSessionInstallation(w http.ResponseWriter, r *http.Request, response *v1.Session) error {
diff --git a/services/core/internal/api/environment_installation_test.go b/services/core/internal/api/environment_installation_test.go
index 828342045..4cf35ef2d 100644
--- a/services/core/internal/api/environment_installation_test.go
+++ b/services/core/internal/api/environment_installation_test.go
@@ -40,7 +40,7 @@ func TestSelfHostedCreationReturnsInstallationWithoutWebCredential(t *testing.T)
 	fakes.modelProviders.resolve = fixtureDeploymentProvider
 	fakes.environments.authorizeEnvironmentInstallation, fakes.environments.validateEnvironmentInstallation = f.AuthorizeEnvironmentInstallation, f.ValidateEnvironmentInstallation
 	deps.Execution = fakes.execution()
-	deps.Execution.NativeInstaller = &NativeInstaller{Version: "build", Catalog: &nativeinstaller.Catalog{Version: "build"}}
+	deps.Execution.NativeInstaller = &NativeInstaller{Version: "build", Base: "https://core.example/api/v1/agent-daemon/install/", Catalog: &nativeinstaller.Catalog{Version: "build"}}
 	handler := newTestHandler(t, deps)
 	body := `{"agent":{"model":"model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"},"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"https://model.example/v1","api_key":"fixture-model"}}}`
 	r := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(body))
diff --git a/services/core/internal/api/project_api_key_configuration.go b/services/core/internal/api/project_api_key_configuration.go
index 19b88da7c..1467610ec 100644
--- a/services/core/internal/api/project_api_key_configuration.go
+++ b/services/core/internal/api/project_api_key_configuration.go
@@ -14,9 +14,6 @@ type projectKeyDigests interface {
 
 // ValidateCredentialSeparation rejects Core key collisions with persisted API keys.
 func ValidateCredentialSeparation(ctx context.Context, admin *DeploymentAuthenticator, keys projectKeyDigests) error {
-	if admin == nil {
-		return errors.New("OAC_CORE_KEY_DIGESTS_FILE is required; Core needs the Core key digest")
-	}
 	for digest := range admin.digests {
 		exists, err := keys.APIKeyDigestExists(ctx, digest)
 		if err != nil {
diff --git a/services/core/internal/api/project_api_keys_test.go b/services/core/internal/api/project_api_keys_test.go
index a7e2e42bc..9847d0770 100644
--- a/services/core/internal/api/project_api_keys_test.go
+++ b/services/core/internal/api/project_api_keys_test.go
@@ -96,9 +96,6 @@ func (s *separationFixture) APIKeyDigestExists(_ context.Context, digest [sha256
 }
 func TestAdministratorCredentialSeparation(t *testing.T) {
 	s := &separationFixture{}
-	if err := ValidateCredentialSeparation(t.Context(), nil, s); err == nil {
-		t.Fatal("missing administrator accepted")
-	}
 	admin, _ := NewDeploymentAuthenticator([]string{runtimedevice.HashCredential("admin")})
 	if err := ValidateCredentialSeparation(t.Context(), admin, s); err != nil || len(s.checked) != 1 || s.checked[0] != sha256.Sum256([]byte("admin")) {
 		t.Fatal("administrator digest was not checked against persisted keys", err)
diff --git a/services/core/internal/coremetrics/service.go b/services/core/internal/coremetrics/service.go
index b5433c329..cfb24849d 100644
--- a/services/core/internal/coremetrics/service.go
+++ b/services/core/internal/coremetrics/service.go
@@ -2,10 +2,13 @@ package coremetrics
 
 import (
 	"context"
+	"errors"
 	"regexp"
 	"runtime"
 	"sync"
 	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 )
 
 const SampleInterval = 30 * time.Second
@@ -14,7 +17,6 @@ const retention = 7 * 24 * time.Hour
 // The 7d window ends at a complete 2h bucket, so retain its leading padding too.
 const sampleCapacity = int((retention+2*time.Hour)/SampleInterval) + 2
 
-var jobIDs = []string{"scheduler", "runtime_sampler", "history_cleanup", "audit_cleanup"}
 var revisionPattern = regexp.MustCompile(`^[0-9a-f]{40}$`)
 
 type refusalSlot struct {
@@ -31,19 +33,43 @@ type Service struct {
 	nextSample int
 	refusals   [sampleCapacity]refusalSlot
 	latest     Sample
+	jobIDs     []string
 	jobs       map[string]Job
+	periodic   []Periodic
 	process    processSampler
 }
 
-func New(started time.Time, revision string, source Source) *Service {
-	s := &Service{source: source, started: started.UTC(), now: time.Now, jobs: map[string]Job{}}
+// Periodic is a background job the metrics report. Run makes one bounded pass
+// and returns what it processed, nil when the pass counted nothing, and what
+// failed. The next pass starts Every after a pass ends; a panic fails that pass
+// only. A job without Run is disabled and reports stopped.
+type Periodic struct {
+	ID    string
+	Every time.Duration
+	Run   func(context.Context) (processed *int64, failed int64, err error)
+}
+
+// errPanicked is the error of a pass that panicked.
+var errPanicked = errors.New("periodic job pass panicked")
+
+// New reports the scheduler, which the Source reads live, and then jobs in
+// their order. Run runs the jobs. An enabled job needs a positive Every.
+func New(started time.Time, revision string, source Source, jobs ...Periodic) (*Service, error) {
+	s := &Service{source: source, started: started.UTC(), now: time.Now, jobIDs: []string{"scheduler"}, jobs: map[string]Job{"scheduler": {ID: "scheduler", Status: "unknown"}}, periodic: jobs}
 	if revisionPattern.MatchString(revision) {
 		s.revision = &revision
 	}
-	for _, id := range jobIDs {
-		s.jobs[id] = Job{ID: id, Status: "unknown"}
+	for _, job := range jobs {
+		status := "unknown"
+		if job.Run == nil {
+			status = "stopped"
+		} else if job.Every <= 0 {
+			return nil, errors.New("coremetrics: periodic job " + job.ID + " needs a positive interval")
+		}
+		s.jobIDs = append(s.jobIDs, job.ID)
+		s.jobs[job.ID] = Job{ID: job.ID, Status: status}
 	}
-	return s
+	return s, nil
 }
 func slot(t time.Time) (int64, int) {
 	tick := t.Unix() / int64(SampleInterval/time.Second)
@@ -61,7 +87,7 @@ func (s *Service) RecordUnavailable() {
 	}
 	s.refusals[i].count++
 }
-func (s *Service) ReportJob(id string, at time.Time, processed *int64, failed *int64, err error) {
+func (s *Service) reportJob(id string, at time.Time, processed *int64, failed *int64, err error) {
 	status := "ok"
 	if err != nil || (failed != nil && *failed > 0) {
 		status = "failing"
@@ -73,7 +99,7 @@ func (s *Service) ReportJob(id string, at time.Time, processed *int64, failed *i
 	}
 	s.jobs[id] = Job{ID: id, Status: status, LastRunAt: ptr(at.UTC()), Processed: processed, Failed: failed}
 }
-func (s *Service) StopJob(id string) {
+func (s *Service) stopJob(id string) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	if j, ok := s.jobs[id]; ok {
@@ -81,7 +107,46 @@ func (s *Service) StopJob(id string) {
 		s.jobs[id] = j
 	}
 }
+
+// Run samples Core and runs every enabled job until ctx ends, then waits for
+// them to stop.
 func (s *Service) Run(ctx context.Context) {
+	var jobs sync.WaitGroup
+	for _, job := range s.periodic {
+		if job.Run != nil {
+			jobs.Go(func() { s.runJob(ctx, job) })
+		}
+	}
+	s.sample(ctx)
+	jobs.Wait()
+}
+
+func (s *Service) runJob(ctx context.Context, job Periodic) {
+	defer s.stopJob(job.ID)
+	for {
+		s.pass(ctx, job)
+		select {
+		case <-ctx.Done():
+			return
+		case <-time.After(job.Every):
+		}
+	}
+}
+
+// pass runs and reports one pass of job. A panic is reported as a failed pass.
+func (s *Service) pass(ctx context.Context, job Periodic) {
+	var processed *int64
+	failed, err := int64(1), errPanicked
+	defer func() {
+		if recovered := recover(); recovered != nil {
+			log.Ctx(ctx).Error("Periodic job panicked", "job", job.ID, "panic", recovered)
+		}
+		s.reportJob(job.ID, s.now(), processed, &failed, err)
+	}()
+	processed, failed, err = job.Run(ctx)
+}
+
+func (s *Service) sample(ctx context.Context) {
 	ticker := time.NewTicker(SampleInterval)
 	defer ticker.Stop()
 	for {
@@ -132,7 +197,7 @@ func (s *Service) Read(ctx context.Context, name string) (View, error) {
 	}
 	live := s.source.Live()
 	view := View{Object: "core.metrics", Range: window, Service: ServiceState{Status: "running", Revision: s.revision, StartedAt: ptr(s.started), ExecutionOwner: live.ExecutionOwner},
-		Execution: Execution{SlotsInUse: live.SlotsInUse, SlotsTotal: live.SlotsTotal, ConnectedDaemons: live.ConnectedDaemons}, Database: Database{Pool: live.Pool}, Jobs: make([]Job, 0, len(jobIDs))}
+		Execution: Execution{SlotsInUse: live.SlotsInUse, SlotsTotal: live.SlotsTotal, ConnectedDaemons: live.ConnectedDaemons}, Database: Database{Pool: live.Pool}, Jobs: make([]Job, 0, len(s.jobIDs))}
 	s.mu.Lock()
 	latest := s.latest
 	if latest.At.IsZero() || now.Sub(latest.At) > 2*SampleInterval || !latest.Healthy {
@@ -145,7 +210,7 @@ func (s *Service) Read(ctx context.Context, name string) (View, error) {
 		view.Process = latest.Process
 
 	}
-	for _, id := range jobIDs {
+	for _, id := range s.jobIDs {
 		j := s.jobs[id]
 		if id == "scheduler" && live.Scheduler.ID != "" {
 			j = live.Scheduler
diff --git a/services/core/internal/coremetrics/service_test.go b/services/core/internal/coremetrics/service_test.go
index 44a3ab294..d582a2827 100644
--- a/services/core/internal/coremetrics/service_test.go
+++ b/services/core/internal/coremetrics/service_test.go
@@ -26,7 +26,10 @@ func fixtureService(t *testing.T) (*Service, *fixtureSource, time.Time) {
 	t.Helper()
 	now := time.Date(2026, 9, 25, 12, 0, 20, 0, time.UTC)
 	source := &fixtureSource{history: History{Buckets: map[time.Time]*float64{}}, live: Live{ExecutionOwner: ptr(true), SlotsInUse: ptr(int64(2)), SlotsTotal: ptr(int64(4))}}
-	service := New(now.Add(-2*time.Hour), strings.Repeat("a", 40), source)
+	service, err := New(now.Add(-2*time.Hour), strings.Repeat("a", 40), source, Periodic{ID: "runtime_sampler"}, Periodic{ID: "history_cleanup"}, Periodic{ID: "audit_cleanup"})
+	if err != nil {
+		t.Fatal(err)
+	}
 	service.now = func() time.Time { return now }
 	return service, source, now
 }
@@ -121,17 +124,17 @@ func TestAllRangesAndBoundedRetention(t *testing.T) {
 func TestJobResultsAndConcurrentReads(t *testing.T) {
 	s, _, now := fixtureService(t)
 	s.record(Sample{At: now, Healthy: true})
-	s.ReportJob("audit_cleanup", now, ptr(int64(12)), ptr(int64(0)), nil)
+	s.reportJob("audit_cleanup", now, ptr(int64(12)), ptr(int64(0)), nil)
 	got, _ := s.Read(t.Context(), "1h")
 	if got.Service.Status != "running" || *got.Jobs[3].Processed != 12 {
 		t.Fatal(got.Service, got.Jobs)
 	}
-	s.ReportJob("audit_cleanup", now, ptr(int64(2)), ptr(int64(1)), errors.New("failure"))
+	s.reportJob("audit_cleanup", now, ptr(int64(2)), ptr(int64(1)), errors.New("failure"))
 	got, _ = s.Read(t.Context(), "1h")
 	if got.Service.Status != "degraded" {
 		t.Fatal(got.Service)
 	}
-	s.StopJob("audit_cleanup")
+	s.stopJob("audit_cleanup")
 	got, _ = s.Read(t.Context(), "1h")
 	if got.Jobs[3].Status != "stopped" {
 		t.Fatal(got.Jobs)
@@ -143,7 +146,7 @@ func TestJobResultsAndConcurrentReads(t *testing.T) {
 			defer wg.Done()
 			for range 20 {
 				s.RecordUnavailable()
-				s.ReportJob("history_cleanup", now, ptr(int64(0)), ptr(int64(0)), nil)
+				s.reportJob("history_cleanup", now, ptr(int64(0)), ptr(int64(0)), nil)
 				if _, err := s.Read(context.Background(), "1h"); err != nil {
 					t.Error(err)
 				}
@@ -152,10 +155,48 @@ func TestJobResultsAndConcurrentReads(t *testing.T) {
 	}
 	wg.Wait()
 }
+func TestPeriodicJobsRunUntilStopped(t *testing.T) {
+	ctx, cancel := context.WithCancel(t.Context())
+	run := func(context.Context) (*int64, int64, error) {
+		cancel()
+		return nil, 1, errors.New("failure")
+	}
+	if _, err := New(time.Now(), "", &fixtureSource{}, Periodic{ID: "audit_cleanup", Run: run}); err == nil {
+		t.Fatal("accepted a job without an interval")
+	}
+	s, err := New(time.Now(), "", &fixtureSource{}, Periodic{ID: "runtime_sampler"}, Periodic{ID: "audit_cleanup", Every: time.Hour, Run: run})
+	if err != nil {
+		t.Fatal(err)
+	}
+	s.Run(ctx)
+	if strings.Join(s.jobIDs, ",") != "scheduler,runtime_sampler,audit_cleanup" || s.jobs["runtime_sampler"].Status != "stopped" {
+		t.Fatal(s.jobIDs, s.jobs)
+	}
+	if job := s.jobs["audit_cleanup"]; job.Status != "stopped" || job.LastRunAt == nil || job.Processed != nil || *job.Failed != 1 {
+		t.Fatal(job)
+	}
+}
+func TestPeriodicJobSurvivesAPanic(t *testing.T) {
+	ctx, cancel := context.WithCancel(t.Context())
+	passes := 0
+	s, err := New(time.Now(), "", &fixtureSource{}, Periodic{ID: "audit_cleanup", Every: time.Millisecond, Run: func(context.Context) (*int64, int64, error) {
+		if passes++; passes == 1 {
+			panic("test")
+		}
+		cancel()
+		return ptr(int64(3)), 0, nil
+	}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	s.Run(ctx)
+	if job := s.jobs["audit_cleanup"]; passes != 2 || job.Processed == nil || *job.Processed != 3 || *job.Failed != 0 {
+		t.Fatal(passes, job)
+	}
+}
 func TestRevisionMustBeCommit(t *testing.T) {
 	for _, revision := range []string{"", "unknown", "secret-value"} {
-		s := New(time.Now(), revision, &fixtureSource{})
-		if s.revision != nil {
+		if s, _ := New(time.Now(), revision, &fixtureSource{}); s.revision != nil {
 			t.Fatal("unverified build revision exposed")
 		}
 	}
diff --git a/services/core/internal/deployment/public_url.go b/services/core/internal/deployment/public_url.go
index 999bcd558..1bf556928 100644
--- a/services/core/internal/deployment/public_url.go
+++ b/services/core/internal/deployment/public_url.go
@@ -8,45 +8,66 @@ import (
 	"strings"
 )
 
-// ValidateCoreURL accepts a canonical public origin, never a path or
+// PublicOrigin is OAC_PUBLIC_URL, the one origin applications, nodes,
+// sandboxes and self-hosted executors use. Every Core address they are given
+// is derived from it; none is parsed back into an origin.
+type PublicOrigin struct{ origin string }
+
+// NewPublicOrigin accepts a canonical public origin, never a path or
 // credential. It may be http or https: a reverse proxy in front of Web
 // terminates TLS when the installation uses it.
-// OAC_PUBLIC_URL must pass it.
-func ValidateCoreURL(value string) error {
+func NewPublicOrigin(value string) (PublicOrigin, error) {
 	u, err := url.Parse(value)
 	if err != nil || u.Hostname() == "" || u.User != nil || u.Path != "" || u.RawPath != "" || u.RawQuery != "" || u.ForceQuery || u.Fragment != "" || u.RawFragment != "" || u.Opaque != "" || u.String() != value || u.Host != strings.ToLower(u.Host) {
-		return ErrInvalidInput
+		return PublicOrigin{}, ErrInvalidInput
 	}
 	if strings.ContainsAny(u.Host, "\\% \t\r\n") || strings.HasSuffix(u.Host, ":") {
-		return ErrInvalidInput
+		return PublicOrigin{}, ErrInvalidInput
 	}
 	if port := u.Port(); port != "" {
 		n, err := strconv.Atoi(port)
 		if err != nil || n < 1 || n > 65535 || strconv.Itoa(n) != port {
-			return ErrInvalidInput
+			return PublicOrigin{}, ErrInvalidInput
 		}
 	}
 	if net.ParseIP(u.Hostname()) == nil {
 		if len(u.Hostname()) > 253 || strings.ContainsAny(u.Host, "[]") {
-			return ErrInvalidInput
+			return PublicOrigin{}, ErrInvalidInput
 		}
 		for _, label := range strings.Split(u.Hostname(), ".") {
 			if len(label) == 0 || len(label) > 63 || label[0] == '-' || label[len(label)-1] == '-' {
-				return ErrInvalidInput
+				return PublicOrigin{}, ErrInvalidInput
 			}
 			for _, char := range label {
 				if (char < 'a' || char > 'z') && (char < '0' || char > '9') && char != '-' {
-					return ErrInvalidInput
+					return PublicOrigin{}, ErrInvalidInput
 				}
 			}
 		}
 	}
 	if u.Scheme != "https" && u.Scheme != "http" {
-		return ErrInvalidInput
+		return PublicOrigin{}, ErrInvalidInput
 	}
-	return nil
+	return PublicOrigin{origin: value}, nil
 }
 
+// String is the origin itself.
+func (o PublicOrigin) String() string { return o.origin }
+
+// API is the base URL of the Agents API.
+func (o PublicOrigin) API() string { return o.origin + "/v1" }
+
+// RuntimeAPI is the base URL sandboxes and nodes call.
+func (o PublicOrigin) RuntimeAPI() string { return o.origin + "/api/v1" }
+
+// DaemonWebSocket is the daemon transport: ws on an http origin, wss on https.
+func (o PublicOrigin) DaemonWebSocket() string {
+	return "ws" + strings.TrimPrefix(o.origin, "http") + "/api/v1/agent-daemon/ws"
+}
+
+// InstallerBase is the prefix of the versioned native installer downloads.
+func (o PublicOrigin) InstallerBase() string { return o.origin + "/api/v1/agent-daemon/install/" }
+
 // AddressBindings counts what is bound to an installation address: nodes
 // connect to the address they enrolled with, hosted sandboxes were started with
 // the address current at the time, and self-hosted executors were installed
diff --git a/services/core/internal/deployment/rules_test.go b/services/core/internal/deployment/rules_test.go
index 66fd2af3f..ea2926e65 100644
--- a/services/core/internal/deployment/rules_test.go
+++ b/services/core/internal/deployment/rules_test.go
@@ -13,12 +13,18 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-func TestValidateCoreURL(t *testing.T) {
+func TestPublicOrigin(t *testing.T) {
 	for _, value := range []string{"https://core.example", "https://core.example:8443", "http://localhost:8091", "http://127.0.0.2:8091", "http://[::1]:8091", "https://[2001:db8::1]", "http://core.example", "http://core:8091", "http://10.0.0.5:8080"} {
-		if err := ValidateCoreURL(value); err != nil {
+		if origin, err := NewPublicOrigin(value); err != nil || origin.String() != value {
 			t.Errorf("valid Core URL %q rejected: %v", value, err)
 		}
 	}
+	for value, socket := range map[string]string{"https://core.example": "wss://core.example/api/v1/agent-daemon/ws", "http://[::1]:8091": "ws://[::1]:8091/api/v1/agent-daemon/ws"} {
+		origin, err := NewPublicOrigin(value)
+		if err != nil || origin.DaemonWebSocket() != socket || origin.API() != value+"/v1" || origin.RuntimeAPI() != value+"/api/v1" || origin.InstallerBase() != value+"/api/v1/agent-daemon/install/" {
+			t.Errorf("addresses derived from %q: %+v %v", value, origin, err)
+		}
+	}
 	for _, value := range []string{
 		"", "ftp://core.example", "ws://core.example", "https://core.example/", "https://user:secret@core.example",
 		"https://core.example/path", "https://core.example?", "https://core.example?q=x", "https://core.example#x", "https://core.example#",
@@ -26,7 +32,7 @@ func TestValidateCoreURL(t *testing.T) {
 		"https://core.example\\evil", "https://[not-an-ip]", "https://-core.example", "https://core..example", "https://core_example",
 		"https://core.example.", "https://bücher.example", "https://core.example:0443",
 	} {
-		if err := ValidateCoreURL(value); !errors.Is(err, ErrInvalidInput) {
+		if _, err := NewPublicOrigin(value); !errors.Is(err, ErrInvalidInput) {
 			t.Errorf("invalid Core URL %q accepted: %v", value, err)
 		}
 	}
diff --git a/services/core/internal/environmentconfig/setup_test.go b/services/core/internal/environmentconfig/setup_test.go
index 6b18c71a4..f6040532e 100644
--- a/services/core/internal/environmentconfig/setup_test.go
+++ b/services/core/internal/environmentconfig/setup_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestSetupReservesOpenAgentCoreNames(t *testing.T) {
-	for _, name := range []string{"OAC_ADDR", "OAC_RUNTIME_HOME", "OAC_WEB_ORIGIN", "OAC_LOG_LEVEL", "OAC_DEV_HOME", "OAC_TEST_DATABASE_URL"} {
+	for _, name := range []string{"OAC_ADDR", "OAC_RUNTIME_HOME", "OAC_PUBLIC_URL", "OAC_LOG_LEVEL", "OAC_DEV_HOME", "OAC_TEST_DATABASE_URL"} {
 		if err := (Setup{Env: map[string]string{name: "value"}}).Validate(); !errors.Is(err, ErrInvalid) {
 			t.Fatalf("reserved name %s accepted: %v", name, err)
 		}
diff --git a/services/core/internal/nativeinstaller/bootstrap_interrupt_unix_test.go b/services/core/internal/nativeinstaller/bootstrap_interrupt_unix_test.go
index bb6766c52..6455c6234 100644
--- a/services/core/internal/nativeinstaller/bootstrap_interrupt_unix_test.go
+++ b/services/core/internal/nativeinstaller/bootstrap_interrupt_unix_test.go
@@ -101,7 +101,7 @@ func TestBootstrapCommandDiscardsTimedOutResponse(t *testing.T) {
 		t.Fatal(err)
 	}
 	catalog := Catalog{Version: "test"}
-	command := exec.Command("bash", "-c", catalog.Commands(server.URL, "fixture-grant")["posix"])
+	command := exec.Command("bash", "-c", catalog.Commands(server.URL+"/api/v1/agent-daemon/install/", "fixture-grant")["posix"])
 	command.Env = append(os.Environ(), "PATH="+bin+string(os.PathListSeparator)+os.Getenv("PATH"), "NO_PROXY=127.0.0.1", "no_proxy=127.0.0.1")
 	output, err := command.CombinedOutput()
 	if err != nil || !bytes.Contains(output, []byte("entry-success")) || bytes.Contains(output, []byte("incomplete response")) || requests.Load() != 2 {
diff --git a/services/core/internal/nativeinstaller/catalog.go b/services/core/internal/nativeinstaller/catalog.go
index 2a40dc0a5..8c0049d88 100644
--- a/services/core/internal/nativeinstaller/catalog.go
+++ b/services/core/internal/nativeinstaller/catalog.go
@@ -42,8 +42,12 @@ var platformName = regexp.MustCompile(`^(linux|darwin|windows)-(amd64|arm64)$`)
 
 // Load checks the matched catalog without downloading execution payloads. Local
 // offline archives are verified once; the directory stays immutable while serving.
+// A directory without catalog.json holds no installer and returns nil.
 func Load(directory, version string) (*Catalog, error) {
 	raw, err := os.ReadFile(filepath.Join(directory, "catalog.json"))
+	if errors.Is(err, os.ErrNotExist) {
+		return nil, nil
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -123,8 +127,9 @@ func (c *Catalog) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func shellQuote(s string) string { return "'" + strings.ReplaceAll(s, "'", "'\"'\"'") + "'" }
 func psQuote(s string) string    { return "'" + strings.ReplaceAll(s, "'", "''") + "'" }
 
-func (c *Catalog) Commands(origin, authorization string) map[string]string {
-	base := origin + "/api/v1/agent-daemon/install/" + c.Version
+// Commands installs this catalog's version from the installer base URL.
+func (c *Catalog) Commands(installerBase, authorization string) map[string]string {
+	base := installerBase + c.Version
 	// Hold the small bootstrap in memory so an interrupted fetch leaves no file.
 	// Only execute a complete successful response; preserve interactive stdin.
 	posix := `set -e; script=; for attempt in 1 2 3; do if script=$(curl -fsS --connect-timeout 15 --max-time 60 --max-filesize 1048576 ` + shellQuote(base+"/bootstrap.sh") + `); then break; fi; [ "$attempt" -lt 3 ] || exit 1; sleep "$attempt"; done; bash -c "$script" -- "$@"`
diff --git a/services/core/internal/nativeinstaller/catalog_test.go b/services/core/internal/nativeinstaller/catalog_test.go
index 5f5f9cf45..ce6fd24f3 100644
--- a/services/core/internal/nativeinstaller/catalog_test.go
+++ b/services/core/internal/nativeinstaller/catalog_test.go
@@ -108,3 +108,9 @@ func TestOnlineCatalogRedirectsOnlyDeclaredMatchedArchives(t *testing.T) {
 		t.Fatal("corruption must not fall back to online download")
 	}
 }
+
+func TestMissingCatalogServesNoInstallers(t *testing.T) {
+	if catalog, err := Load(t.TempDir(), "build"); catalog != nil || err != nil {
+		t.Fatal(catalog, err)
+	}
+}
diff --git a/services/core/internal/processconfig/config.go b/services/core/internal/processconfig/config.go
index c7f1805b7..eb5eb0117 100644
--- a/services/core/internal/processconfig/config.go
+++ b/services/core/internal/processconfig/config.go
@@ -1,10 +1,17 @@
-// Package processconfig is the process settings Core loads from its environment.
-// Startup and `oac-core check-config` both call Check. Settings reports the
-// effective values for GET /core/v1/installation. Errors name the variable and
-// never include its value.
+// Package processconfig is the process settings Core loads from its
+// environment. Load reads every variable and every file it names exactly once,
+// applies each default and validates the result; startup and `oac-core
+// check-config` both call it. Errors name the variable and never include its
+// value or the content of a file.
 package processconfig
 
 import (
+	"bytes"
+	"cmp"
+	"encoding/base64"
+	"encoding/json"
+	"io"
+	"net/url"
 	"os"
 	"slices"
 	"strconv"
@@ -12,154 +19,264 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"golang.org/x/net/http/httpguts"
 
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/databaseurl"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/engine"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/oauthrefresh"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-// Check validates every process setting Core loads. An unset or empty
-// variable keeps its default, so Compose can pass every setting through.
-func Check() error {
-	if _, err := PublicURL(); err != nil {
-		return err
+const (
+	defaultAddr                = "127.0.0.1:8091"
+	defaultHarness             = "codex"
+	defaultWriteAuditRetention = 90 * 24 * time.Hour
+	// providerStateRoot is where Compose mounts the data volume's state/.
+	providerStateRoot = "/state"
+)
+
+// Config is Core's process configuration.
+type Config struct {
+	// Addr is OAC_ADDR, the listener address.
+	Addr string
+	// PublicOrigin is OAC_PUBLIC_URL. Nil disables the Runtime gateway and
+	// the execution Worker.
+	PublicOrigin *deployment.PublicOrigin
+	// DatabaseURL is OAC_DATABASE_URL with the password from
+	// OAC_DATABASE_PASSWORD_FILE.
+	DatabaseURL string
+	// InstallationID comes from OAC_INSTALLATION_ID_FILE. Empty leaves the
+	// sandbox deployment and node routes off.
+	InstallationID string
+	// CredentialKey seals stored credentials. Nil when
+	// OAC_CREDENTIAL_KEY_FILE is unset.
+	CredentialKey *credentialcrypto.Cipher
+	// CoreKeys authenticates the Core key from OAC_CORE_KEY_DIGESTS_FILE.
+	CoreKeys             *api.DeploymentAuthenticator
+	ExecutionConcurrency int
+	DefaultHarness       string
+	// Harnesses is the sorted set of enabled Harnesses, the default included.
+	Harnesses           []string
+	WriteAuditRetention time.Duration
+	OAuthTrustedOrigins []string
+	RuntimeHistory      RuntimeHistory
+	// ProviderPaths locate adapter helpers under OAC_PROVIDER_ROOT and their
+	// private state under the Compose state mount.
+	ProviderPaths sandbox.ProcessPaths
+	// NativeInstallers is the native installer catalog directory under
+	// OAC_PROVIDER_ROOT; empty when the root is unset.
+	NativeInstallers string
+	Log              log.Config
+}
+
+// RuntimeHistory is the file named by OAC_HISTORY_SETTINGS_FILE, with its
+// defaults applied. Without the file, history stays in Core's database and
+// nothing is exported.
+type RuntimeHistory struct {
+	// File is the path Core loaded, or empty.
+	File string
+	// Endpoint is an optional OTLP/HTTP metrics URL; Insecure allows http.
+	Endpoint       string
+	Insecure       bool
+	Headers        map[string]string
+	QueueCapacity  int
+	Timeout        time.Duration
+	SampleInterval time.Duration
+}
+
+// runtimeHistoryFile is the file's JSON schema.
+type runtimeHistoryFile struct {
+	Transport             string            `json:"transport,omitempty"`
+	Endpoint              string            `json:"endpoint,omitempty"`
+	Insecure              bool              `json:"insecure,omitempty"`
+	Headers               map[string]string `json:"headers,omitempty"`
+	QueueCapacity         int               `json:"queue_capacity,omitempty"`
+	TimeoutSeconds        int               `json:"timeout_seconds,omitempty"`
+	SampleIntervalSeconds int               `json:"sample_interval_seconds,omitempty"`
+}
+
+// Load reads and validates the process environment. An unset or empty
+// variable selects its default.
+func Load() (Config, error) {
+	var c Config
+	var err error
+	if c.Log, err = log.LoadConfig(); err != nil {
+		return Config{}, err
 	}
-	if _, err := ExecutionConcurrency(); err != nil {
-		return err
+	c.Addr = cmp.Or(os.Getenv("OAC_ADDR"), defaultAddr)
+	if value := os.Getenv("OAC_PUBLIC_URL"); value != "" {
+		origin, err := deployment.NewPublicOrigin(value)
+		if err != nil {
+			return Config{}, configError("OAC_PUBLIC_URL must be a canonical http or https origin without path, credentials, query or fragment, such as https://core.example")
+		}
+		c.PublicOrigin = &origin
 	}
-	if _, err := InstallationID(); err != nil {
-		return err
+	if c.DatabaseURL, err = databaseurl.FromEnvironment(); err != nil {
+		return Config{}, err
 	}
-	engineName, err := DefaultHarness()
-	if err != nil {
-		return err
-	}
-	if _, err := Harnesses(engineName); err != nil {
-		return err
-	}
-	if _, err := writeAuditRetention(); err != nil {
-		return err
-	}
-	if err := oauthOrigins(); err != nil {
-		return err
-	}
-	return logSettings()
-}
-
-// Settings is the effective process configuration. Sensitive file settings
-// report only whether they are configured.
-func Settings() ([]api.InstallationSetting, error) {
-	if err := Check(); err != nil {
-		return nil, err
-	}
-	public, _ := PublicURL()
-	concurrency, _ := ExecutionConcurrency()
-	engineName, _ := DefaultHarness()
-	enabled, _ := Harnesses(engineName)
-	retention := "2160h"
-	if value := os.Getenv("OAC_WRITE_AUDIT_RETENTION"); value != "" {
-		retention = value
-	}
-	level, format, addSource := logValues()
-	history := os.Getenv("OAC_HISTORY_SETTINGS_FILE") != ""
-	origins := []string{}
-	if raw := os.Getenv("OAC_OAUTH_TRUSTED_ORIGINS"); raw != "" {
-		for _, origin := range strings.Split(raw, ",") {
-			if origin = strings.TrimSpace(origin); origin != "" {
-				origins = append(origins, origin)
-			}
-		}
+	if c.DatabaseURL == "" {
+		return Config{}, configError("OAC_DATABASE_URL is required")
+	}
+	if c.InstallationID, err = installationID(); err != nil {
+		return Config{}, err
+	}
+	if c.InstallationID != "" && c.PublicOrigin == nil {
+		return Config{}, configError("OAC_INSTALLATION_ID_FILE requires OAC_PUBLIC_URL, the origin nodes and sandboxes use to reach Core")
+	}
+	if c.CredentialKey, err = credentialKey(); err != nil {
+		return Config{}, err
+	}
+	if c.CoreKeys, err = coreKeys(); err != nil {
+		return Config{}, err
+	}
+	if c.ExecutionConcurrency, err = executionConcurrency(); err != nil {
+		return Config{}, err
+	}
+	c.DefaultHarness = cmp.Or(os.Getenv("OAC_DEFAULT_HARNESS"), defaultHarness)
+	if _, known := (engine.Catalog{}).Lookup(c.DefaultHarness); !known {
+		return Config{}, configError("OAC_DEFAULT_HARNESS is not a known harness")
+	}
+	if c.Harnesses, err = harnesses(c.DefaultHarness); err != nil {
+		return Config{}, err
+	}
+	if c.WriteAuditRetention, err = writeAuditRetention(); err != nil {
+		return Config{}, err
+	}
+	if c.OAuthTrustedOrigins, err = oauthTrustedOrigins(); err != nil {
+		return Config{}, err
 	}
-	var publicValue any
-	if public != "" {
-		publicValue = public
+	if c.RuntimeHistory, err = runtimeHistory(); err != nil {
+		return Config{}, err
+	}
+	c.ProviderPaths = sandbox.ProcessPaths{ArtifactRoot: os.Getenv("OAC_PROVIDER_ROOT"), StateRoot: providerStateRoot}
+	if c.ProviderPaths.ArtifactRoot != "" {
+		c.NativeInstallers = c.ProviderPaths.ArtifactRoot + "/native-installers"
+	}
+	return c, nil
+}
+
+// Settings projects the configuration that GET /core/v1/installation
+// reports. Sensitive file settings report only whether they are configured.
+func (c Config) Settings() []api.InstallationSetting {
+	var public any
+	if c.PublicOrigin != nil {
+		public = c.PublicOrigin.String()
+	}
+	format := c.Log.Format
+	if format == "" {
+		format = "auto"
+	}
+	origins := c.OAuthTrustedOrigins
+	if origins == nil {
+		origins = []string{}
 	}
 	return []api.InstallationSetting{
-		setting("public_url", publicValue, nil, true, []string{"core", "web"}),
-		setting("log.level", level, "info", true, []string{"core", "web"}),
-		setting("log.format", format, "auto", true, []string{"core", "web"}),
-		setting("log.add_source", addSource, false, true, []string{"core", "web"}),
-		setting("core.execution_concurrency", concurrency, execution.DefaultExecutionConcurrency, true, []string{"core"}),
-		setting("core.harnesses", enabled, (engine.Catalog{}).Kinds(), true, []string{"core"}),
-		setting("core.default_harness", engineName, "codex", true, []string{"core"}),
-		setting("core.write_audit_retention", retention, "2160h", true, []string{"core"}),
-		setting("core.oauth_trusted_origins", origins, []string{}, true, []string{"core"}),
-		sensitive("core.runtime_history", history, []string{"core"}),
-	}, nil
+		setting("public_url", public, nil, []string{"core", "web"}),
+		setting("log.level", strings.ToLower(c.Log.Level.String()), "info", []string{"core", "web"}),
+		setting("log.format", format, "auto", []string{"core", "web"}),
+		setting("log.add_source", c.Log.AddSource, false, []string{"core", "web"}),
+		setting("core.execution_concurrency", c.ExecutionConcurrency, execution.DefaultExecutionConcurrency, []string{"core"}),
+		setting("core.harnesses", c.Harnesses, (engine.Catalog{}).Kinds(), []string{"core"}),
+		setting("core.default_harness", c.DefaultHarness, defaultHarness, []string{"core"}),
+		setting("core.write_audit_retention", duration(c.WriteAuditRetention), duration(defaultWriteAuditRetention), []string{"core"}),
+		setting("core.oauth_trusted_origins", origins, []string{}, []string{"core"}),
+		sensitive("core.runtime_history", c.RuntimeHistory.File != "", []string{"core"}),
+	}
 }
 
-func setting(key string, value, fallback any, changeable bool, restarts []string) api.InstallationSetting {
-	return api.InstallationSetting{Key: key, Value: value, Default: fallback, Changeable: changeable, Sensitive: false, Restarts: restarts}
+// duration formats d as OAC_WRITE_AUDIT_RETENTION spells it: 2160h, not
+// 2160h0m0s.
+func duration(d time.Duration) string {
+	s := d.String()
+	if strings.HasSuffix(s, "m0s") {
+		s = s[:len(s)-2]
+	}
+	if strings.HasSuffix(s, "h0m") {
+		s = s[:len(s)-2]
+	}
+	return s
+}
+
+func setting(key string, value, fallback any, restarts []string) api.InstallationSetting {
+	return api.InstallationSetting{Key: key, Value: value, Default: fallback, Changeable: true, Sensitive: false, Restarts: restarts}
 }
 
 func sensitive(key string, configured bool, restarts []string) api.InstallationSetting {
 	return api.InstallationSetting{Key: key, Configured: &configured, Changeable: true, Sensitive: true, Restarts: restarts}
 }
 
-// PublicURL reads OAC_PUBLIC_URL, the one origin applications, nodes,
-// sandboxes and self-hosted executors use. An empty result disables daemon
-// transport, as for a Core without execution.
-func PublicURL() (string, error) {
-	value := os.Getenv("OAC_PUBLIC_URL")
-	if value == "" {
+func installationID() (string, error) {
+	path := os.Getenv("OAC_INSTALLATION_ID_FILE")
+	if path == "" {
 		return "", nil
 	}
-	if deployment.ValidateCoreURL(value) != nil {
-		return "", configErr("OAC_PUBLIC_URL must be a canonical http or https origin without path, credentials, query or fragment, such as https://core.example")
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		return "", configError("OAC_INSTALLATION_ID_FILE must name a readable file")
+	}
+	value := strings.TrimSpace(string(raw))
+	if id, err := uuid.Parse(value); err != nil || id == uuid.Nil || id.String() != value {
+		return "", configError("OAC_INSTALLATION_ID_FILE must contain a canonical UUID")
 	}
 	return value, nil
 }
 
-// InstallationID reads the file named by OAC_INSTALLATION_ID_FILE. The ID
-// enables the sandbox deployment and node routes; unset leaves them off.
-func InstallationID() (string, error) {
-	path := os.Getenv("OAC_INSTALLATION_ID_FILE")
+func credentialKey() (*credentialcrypto.Cipher, error) {
+	path := os.Getenv("OAC_CREDENTIAL_KEY_FILE")
 	if path == "" {
-		return "", nil
+		return nil, nil
+	}
+	content, err := os.ReadFile(path)
+	if err != nil {
+		return nil, configError("cannot read OAC_CREDENTIAL_KEY_FILE")
+	}
+	key, err := base64.StdEncoding.Strict().DecodeString(strings.TrimSpace(string(content)))
+	if err != nil || len(key) != 32 {
+		return nil, configError("OAC_CREDENTIAL_KEY_FILE must contain a base64-encoded random 32-byte key")
+	}
+	return credentialcrypto.New(key)
+}
+
+func coreKeys() (*api.DeploymentAuthenticator, error) {
+	path := os.Getenv("OAC_CORE_KEY_DIGESTS_FILE")
+	if path == "" {
+		return nil, configError("OAC_CORE_KEY_DIGESTS_FILE is required; Core needs the Core key digest")
 	}
 	raw, err := os.ReadFile(path)
 	if err != nil {
-		return "", configErr("OAC_INSTALLATION_ID_FILE must name a readable file")
+		return nil, configError("cannot read OAC_CORE_KEY_DIGESTS_FILE")
 	}
-	value := strings.TrimSpace(string(raw))
-	if id, err := uuid.Parse(value); err != nil || id == uuid.Nil || id.String() != value {
-		return "", configErr("OAC_INSTALLATION_ID_FILE must contain a canonical UUID")
+	var digests []string
+	if json.Unmarshal(raw, &digests) != nil {
+		return nil, configError("OAC_CORE_KEY_DIGESTS_FILE must contain a JSON array of Core key SHA-256 digests")
 	}
-	return value, nil
+	keys, err := api.NewDeploymentAuthenticator(digests)
+	if err != nil {
+		return nil, configError("OAC_CORE_KEY_DIGESTS_FILE must contain a JSON array of Core key SHA-256 digests")
+	}
+	return keys, nil
 }
 
-// ExecutionConcurrency reads OAC_EXECUTION_CONCURRENCY. Unset or empty keeps
-// the default.
-func ExecutionConcurrency() (int, error) {
+func executionConcurrency() (int, error) {
 	value := os.Getenv("OAC_EXECUTION_CONCURRENCY")
 	if value == "" {
 		return execution.DefaultExecutionConcurrency, nil
 	}
 	limit, err := strconv.Atoi(value)
 	if err != nil || limit < 1 || limit > 1024 {
-		return 0, configErr("OAC_EXECUTION_CONCURRENCY must be an integer between 1 and 1024")
+		return 0, configError("OAC_EXECUTION_CONCURRENCY must be an integer between 1 and 1024")
 	}
 	return limit, nil
 }
 
-// DefaultHarness reads OAC_DEFAULT_HARNESS, the Harness used when a request
-// names none.
-func DefaultHarness() (string, error) {
-	value := os.Getenv("OAC_DEFAULT_HARNESS")
-	if value == "" {
-		return "codex", nil
-	}
-	if _, known := (engine.Catalog{}).Lookup(value); !known {
-		return "", configErr("OAC_DEFAULT_HARNESS is not a known harness")
-	}
-	return value, nil
-}
-
-// Harnesses reads OAC_HARNESSES. Unset enables every Harness this build
+// harnesses reads OAC_HARNESSES. Unset enables every Harness this build
 // supports; a list supplements the default Harness.
-func Harnesses(defaultEngine string) ([]string, error) {
+func harnesses(defaultEngine string) ([]string, error) {
 	kinds := []string{defaultEngine}
 	if value := os.Getenv("OAC_HARNESSES"); value != "" {
 		kinds = append(kinds, strings.Split(value, ",")...)
@@ -169,7 +286,7 @@ func Harnesses(defaultEngine string) ([]string, error) {
 	for i, kind := range kinds {
 		kind = strings.TrimSpace(kind)
 		if _, known := (engine.Catalog{}).Lookup(kind); !known {
-			return nil, configErr("OAC_HARNESSES contains an unknown harness")
+			return nil, configError("OAC_HARNESSES contains an unknown harness")
 		}
 		kinds[i] = kind
 	}
@@ -180,55 +297,97 @@ func Harnesses(defaultEngine string) ([]string, error) {
 func writeAuditRetention() (time.Duration, error) {
 	value := os.Getenv("OAC_WRITE_AUDIT_RETENTION")
 	if value == "" {
-		return 90 * 24 * time.Hour, nil
+		return defaultWriteAuditRetention, nil
 	}
-	duration, parseErr := time.ParseDuration(value)
-	if parseErr != nil || duration < time.Hour {
-		return 0, configErr("OAC_WRITE_AUDIT_RETENTION must be a duration of at least 1h")
+	duration, err := time.ParseDuration(value)
+	if err != nil || duration < time.Hour {
+		return 0, configError("OAC_WRITE_AUDIT_RETENTION must be a duration of at least 1h")
 	}
 	return duration, nil
 }
 
-func oauthOrigins() error {
-	var origins []string
-	if raw := os.Getenv("OAC_OAUTH_TRUSTED_ORIGINS"); raw != "" {
-		for _, origin := range strings.Split(raw, ",") {
-			origins = append(origins, strings.TrimSpace(origin))
-		}
+func oauthTrustedOrigins() ([]string, error) {
+	raw := os.Getenv("OAC_OAUTH_TRUSTED_ORIGINS")
+	if raw == "" {
+		return nil, nil
+	}
+	origins := strings.Split(raw, ",")
+	for i, origin := range origins {
+		origins[i] = strings.TrimSpace(origin)
 	}
 	if _, err := oauthrefresh.NewClient(origins); err != nil {
-		return configErr("OAC_OAUTH_TRUSTED_ORIGINS is invalid")
+		return nil, configError("OAC_OAUTH_TRUSTED_ORIGINS is invalid")
 	}
-	return nil
+	return origins, nil
 }
 
-func logSettings() error {
-	if value, ok := os.LookupEnv("OAC_LOG_LEVEL"); ok && value != "" && !slices.Contains([]string{"debug", "info", "warn", "warning", "error", "err"}, strings.ToLower(strings.TrimSpace(value))) {
-		return configErr("OAC_LOG_LEVEL must be debug, info, warn or error")
-	}
-	if value, ok := os.LookupEnv("OAC_LOG_FORMAT"); ok && value != "" && !slices.Contains([]string{"auto", "json", "text"}, strings.ToLower(strings.TrimSpace(value))) {
-		return configErr("OAC_LOG_FORMAT must be auto, json or text")
+func runtimeHistory() (RuntimeHistory, error) {
+	var file runtimeHistoryFile
+	path := os.Getenv("OAC_HISTORY_SETTINGS_FILE")
+	if path != "" {
+		raw, err := os.ReadFile(path)
+		if err != nil {
+			return RuntimeHistory{}, configError("OAC_HISTORY_SETTINGS_FILE: the file cannot be read")
+		}
+		decoder := json.NewDecoder(bytes.NewReader(raw))
+		decoder.DisallowUnknownFields()
+		if decoder.Decode(&file) != nil || decoder.Decode(new(any)) != io.EOF {
+			return RuntimeHistory{}, configError("OAC_HISTORY_SETTINGS_FILE: the file must hold one JSON object with known fields")
+		}
 	}
-	if value, ok := os.LookupEnv("OAC_LOG_ADD_SOURCE"); ok && value != "" && value != "0" && value != "1" {
-		return configErr("OAC_LOG_ADD_SOURCE must be 0 or 1")
+	if err := validateRuntimeHistory(file); err != nil {
+		return RuntimeHistory{}, err
 	}
-	return nil
+	return RuntimeHistory{File: path, Endpoint: file.Endpoint, Insecure: file.Insecure, Headers: file.Headers,
+		QueueCapacity:  cmp.Or(file.QueueCapacity, 256),
+		Timeout:        time.Duration(cmp.Or(file.TimeoutSeconds, 2)) * time.Second,
+		SampleInterval: time.Duration(cmp.Or(file.SampleIntervalSeconds, 30)) * time.Second}, nil
 }
 
-func logValues() (string, string, bool) {
-	level := "info"
-	if value := strings.ToLower(strings.TrimSpace(os.Getenv("OAC_LOG_LEVEL"))); value != "" {
-		level = value
+func validateRuntimeHistory(file runtimeHistoryFile) error {
+	if file.QueueCapacity < 0 || file.QueueCapacity > 4096 {
+		return configError("OAC_HISTORY_SETTINGS_FILE: queue_capacity must be from 0 to 4096")
+	}
+	if file.TimeoutSeconds < 0 || file.TimeoutSeconds > 30 {
+		return configError("OAC_HISTORY_SETTINGS_FILE: timeout_seconds must be from 0 to 30")
 	}
-	format := "auto"
-	if value := strings.ToLower(strings.TrimSpace(os.Getenv("OAC_LOG_FORMAT"))); value != "" {
-		format = value
+	if file.SampleIntervalSeconds != 0 && (file.SampleIntervalSeconds < 5 || file.SampleIntervalSeconds > 300) {
+		return configError("OAC_HISTORY_SETTINGS_FILE: sample_interval_seconds must be from 5 to 300")
+	}
+	if file.Endpoint == "" {
+		if file.Transport != "" || file.Insecure || len(file.Headers) != 0 {
+			return configError("OAC_HISTORY_SETTINGS_FILE: transport, insecure and headers require an endpoint")
+		}
+		return nil
 	}
-	return level, format, os.Getenv("OAC_LOG_ADD_SOURCE") == "1"
+	if file.Transport != "otlp_http" {
+		return configError("OAC_HISTORY_SETTINGS_FILE: transport must be otlp_http")
+	}
+	endpoint, err := url.Parse(file.Endpoint)
+	if err != nil || endpoint.Host == "" || endpoint.User != nil || endpoint.RawQuery != "" || endpoint.Fragment != "" || endpoint.RawPath != "" || endpoint.Path == "" || endpoint.String() != file.Endpoint {
+		return configError("OAC_HISTORY_SETTINGS_FILE: endpoint must be a canonical absolute OTLP metrics URL")
+	}
+	switch endpoint.Scheme {
+	case "https":
+		if file.Insecure {
+			return configError("OAC_HISTORY_SETTINGS_FILE: insecure requires an http endpoint")
+		}
+	case "http":
+		if !file.Insecure {
+			return configError("OAC_HISTORY_SETTINGS_FILE: an http endpoint requires insecure=true")
+		}
+	default:
+		return configError("OAC_HISTORY_SETTINGS_FILE: endpoint scheme must be https or explicit insecure http")
+	}
+	for key, value := range file.Headers {
+		lower := strings.ToLower(key)
+		if !httpguts.ValidHeaderFieldName(key) || !httpguts.ValidHeaderFieldValue(value) || lower == "host" || lower == "content-length" || lower == "content-type" || lower == "content-encoding" {
+			return configError("OAC_HISTORY_SETTINGS_FILE: headers contain an invalid or reserved entry")
+		}
+	}
+	return nil
 }
 
 type configError string
 
 func (e configError) Error() string { return string(e) }
-
-func configErr(message string) error { return configError(message) }
diff --git a/services/core/internal/processconfig/config_test.go b/services/core/internal/processconfig/config_test.go
index 9f8dfa533..d66edb2bc 100644
--- a/services/core/internal/processconfig/config_test.go
+++ b/services/core/internal/processconfig/config_test.go
@@ -1,69 +1,235 @@
 package processconfig
 
 import (
+	"bytes"
+	"encoding/base64"
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 )
 
-func TestCheckRejectsInvalidValuesWithoutEchoingThem(t *testing.T) {
-	secret := "https://user:synthetic-secret@core.example"
-	t.Setenv("OAC_PUBLIC_URL", secret)
-	err := Check()
-	if err == nil || strings.Contains(err.Error(), "synthetic-secret") || !strings.Contains(err.Error(), "OAC_PUBLIC_URL") {
+// required sets the settings Load requires and returns a file writer.
+func required(t *testing.T) func(name, content string) string {
+	t.Helper()
+	dir := t.TempDir()
+	write := func(name, content string) string {
+		path := filepath.Join(dir, name)
+		if err := os.WriteFile(path, []byte(content), 0o600); err != nil {
+			t.Fatal(err)
+		}
+		return path
+	}
+	t.Setenv("OAC_DATABASE_URL", "postgres://core@database/core")
+	t.Setenv("OAC_CORE_KEY_DIGESTS_FILE", write("digests.json", `["`+strings.Repeat("ab", 32)+`"]`))
+	return write
+}
+
+// rejects asserts that Load fails, names variable and does not echo secret.
+func rejects(t *testing.T, variable, secret string) {
+	t.Helper()
+	_, err := Load()
+	if err == nil || !strings.Contains(err.Error(), variable) || (secret != "" && strings.Contains(err.Error(), secret)) {
+		t.Fatalf("%s: %v", variable, err)
+	}
+}
+
+func TestLoadAppliesDefaults(t *testing.T) {
+	required(t)
+	c, err := Load()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if c.Addr != "127.0.0.1:8091" || c.PublicOrigin != nil || c.InstallationID != "" || c.CredentialKey != nil || c.CoreKeys == nil ||
+		c.ExecutionConcurrency != 4 || c.DefaultHarness != "codex" || strings.Join(c.Harnesses, ",") != "claude_sdk,codex,mcode" ||
+		c.WriteAuditRetention != 90*24*time.Hour || c.OAuthTrustedOrigins != nil || c.NativeInstallers != "" || c.ProviderPaths.StateRoot != "/state" {
+		t.Fatalf("%+v", c)
+	}
+	if h := c.RuntimeHistory; h.File != "" || h.Endpoint != "" || h.QueueCapacity != 256 || h.Timeout != 2*time.Second || h.SampleInterval != 30*time.Second {
+		t.Fatalf("%+v", h)
+	}
+	t.Setenv("OAC_PROVIDER_ROOT", "/opt/oac")
+	if c, err = Load(); err != nil || c.ProviderPaths.ArtifactRoot != "/opt/oac" || c.NativeInstallers != "/opt/oac/native-installers" {
+		t.Fatal(c, err)
+	}
+}
+
+func TestLoadRejectsInvalidValuesWithoutEchoingThem(t *testing.T) {
+	write := required(t)
+	t.Setenv("OAC_DATABASE_URL", "")
+	rejects(t, "OAC_DATABASE_URL", "")
+	required(t)
+	t.Setenv("OAC_CORE_KEY_DIGESTS_FILE", "")
+	rejects(t, "OAC_CORE_KEY_DIGESTS_FILE", "")
+	t.Setenv("OAC_CORE_KEY_DIGESTS_FILE", write("bad-digests.json", `["synthetic-secret"]`))
+	rejects(t, "OAC_CORE_KEY_DIGESTS_FILE", "synthetic-secret")
+	required(t)
+	for variable, value := range map[string]string{
+		"OAC_PUBLIC_URL":            "https://user:synthetic-secret@core.example",
+		"OAC_EXECUTION_CONCURRENCY": "synthetic-secret",
+		"OAC_DEFAULT_HARNESS":       "synthetic-secret",
+		"OAC_HARNESSES":             "codex,synthetic-secret",
+		"OAC_WRITE_AUDIT_RETENTION": "synthetic-secret",
+		"OAC_OAUTH_TRUSTED_ORIGINS": "https://synthetic-secret.example/token",
+		"OAC_LOG_LEVEL":             "verbose",
+		"OAC_INSTALLATION_ID_FILE":  write("installation.id", "synthetic-secret"),
+		"OAC_CREDENTIAL_KEY_FILE":   write("credential.key", "synthetic-secret"),
+		"OAC_HISTORY_SETTINGS_FILE": write("history.json", `{"secret":"synthetic-secret"}`),
+	} {
+		t.Run(variable, func(t *testing.T) {
+			t.Setenv(variable, value)
+			rejects(t, variable, "synthetic-secret")
+		})
+	}
+	t.Setenv("OAC_INSTALLATION_ID_FILE", write("valid.id", "8c5f4f5e-2c55-4c43-9a49-7f2f3f2d1d10\n"))
+	rejects(t, "OAC_PUBLIC_URL", "")
+	t.Setenv("OAC_PUBLIC_URL", "https://core.example")
+	if c, err := Load(); err != nil || c.InstallationID != "8c5f4f5e-2c55-4c43-9a49-7f2f3f2d1d10" {
+		t.Fatal(c.InstallationID, err)
+	}
+}
+
+func TestPublicURLMustBeACanonicalOrigin(t *testing.T) {
+	required(t)
+	for _, value := range []string{"https://core.example", "https://core.example:8443", "http://127.0.0.1:8091", "http://core.example"} {
+		t.Setenv("OAC_PUBLIC_URL", value)
+		if c, err := Load(); err != nil || c.PublicOrigin.String() != value {
+			t.Fatal(value, err)
+		}
+	}
+	for _, value := range []string{"https://core.example/", "https://Core.example", "wss://core.example", "https://core.example/v1"} {
+		t.Setenv("OAC_PUBLIC_URL", value)
+		rejects(t, "OAC_PUBLIC_URL", "")
+	}
+}
+
+func TestExecutionConcurrencyAndAuditRetention(t *testing.T) {
+	required(t)
+	for _, value := range []string{"1", "1024"} {
+		t.Setenv("OAC_EXECUTION_CONCURRENCY", value)
+		if _, err := Load(); err != nil {
+			t.Fatal(value, err)
+		}
+	}
+	for _, value := range []string{"0", "-1", "1025", "1.5"} {
+		t.Setenv("OAC_EXECUTION_CONCURRENCY", value)
+		rejects(t, "OAC_EXECUTION_CONCURRENCY", "")
+	}
+	t.Setenv("OAC_EXECUTION_CONCURRENCY", "")
+	t.Setenv("OAC_WRITE_AUDIT_RETENTION", "24h")
+	if c, err := Load(); err != nil || c.WriteAuditRetention != 24*time.Hour {
+		t.Fatal(c.WriteAuditRetention, err)
+	}
+	for _, value := range []string{"0", "30m", "-1h", "90d"} {
+		t.Setenv("OAC_WRITE_AUDIT_RETENTION", value)
+		rejects(t, "OAC_WRITE_AUDIT_RETENTION", "")
+	}
+}
+
+func TestHarnessesDefaultToEveryQualifiedHarness(t *testing.T) {
+	required(t)
+	t.Setenv("OAC_HARNESSES", "mcode")
+	if c, err := Load(); err != nil || strings.Join(c.Harnesses, ",") != "codex,mcode" {
+		t.Fatal(c.Harnesses, err)
+	}
+}
+
+func TestOAuthTrustedOrigins(t *testing.T) {
+	required(t)
+	t.Setenv("OAC_OAUTH_TRUSTED_ORIGINS", "https://issuer.example, https://10.0.0.1:9443")
+	if c, err := Load(); err != nil || strings.Join(c.OAuthTrustedOrigins, ",") != "https://issuer.example,https://10.0.0.1:9443" {
+		t.Fatal(c.OAuthTrustedOrigins, err)
+	}
+	for _, value := range []string{"http://issuer.example", "https://issuer.example/token", "https://issuer.example,", "https://user:secret@issuer.example"} {
+		t.Setenv("OAC_OAUTH_TRUSTED_ORIGINS", value)
+		rejects(t, "OAC_OAUTH_TRUSTED_ORIGINS", "")
+	}
+}
+
+func TestCredentialKey(t *testing.T) {
+	write := required(t)
+	t.Setenv("OAC_CREDENTIAL_KEY_FILE", filepath.Join(t.TempDir(), "missing.key"))
+	rejects(t, "OAC_CREDENTIAL_KEY_FILE", "")
+	for _, content := range []string{"", base64.StdEncoding.EncodeToString(make([]byte, 31))} {
+		t.Setenv("OAC_CREDENTIAL_KEY_FILE", write("short.key", content))
+		rejects(t, "OAC_CREDENTIAL_KEY_FILE", "")
+	}
+	t.Setenv("OAC_CREDENTIAL_KEY_FILE", write("credential.key", base64.StdEncoding.EncodeToString(bytes.Repeat([]byte{0x91}, 32))+"\n"))
+	first, err := Load()
+	if err != nil {
 		t.Fatal(err)
 	}
-	t.Setenv("OAC_PUBLIC_URL", "")
-	t.Setenv("OAC_EXECUTION_CONCURRENCY", "0")
-	if err := Check(); err == nil || !strings.Contains(err.Error(), "OAC_EXECUTION_CONCURRENCY") || strings.Contains(err.Error(), "synthetic") {
+	binding := credentialcrypto.Binding{TenantID: "tenant", VaultID: "vault", CredentialID: "credential", AuthType: "static_bearer", Destination: "https://example.invalid/mcp"}
+	sealed, err := first.CredentialKey.Seal([]byte("opaque storage test"), binding)
+	if err != nil {
 		t.Fatal(err)
 	}
-	t.Setenv("OAC_EXECUTION_CONCURRENCY", "4")
-	t.Setenv("OAC_LOG_LEVEL", "verbose")
-	if err := Check(); err == nil || !strings.Contains(err.Error(), "OAC_LOG_LEVEL") {
+	reopened, err := Load()
+	if err != nil {
 		t.Fatal(err)
 	}
+	if got, err := reopened.CredentialKey.Open(sealed, binding); err != nil || string(got) != "opaque storage test" {
+		t.Fatal("persisted key did not recover ciphertext", err)
+	}
+}
+
+func TestRuntimeHistoryFile(t *testing.T) {
+	write := required(t)
+	t.Setenv("OAC_HISTORY_SETTINGS_FILE", write("history.json", `{"transport":"otlp_http","endpoint":"http://127.0.0.1:4318/v1/metrics","insecure":true,"headers":{"X-Scope-OrgID":"operator-history"},"sample_interval_seconds":60}`))
+	c, err := Load()
+	if err != nil || c.RuntimeHistory.Endpoint != "http://127.0.0.1:4318/v1/metrics" || c.RuntimeHistory.SampleInterval != time.Minute || c.RuntimeHistory.QueueCapacity != 256 {
+		t.Fatal(c.RuntimeHistory, err)
+	}
+	for name, config := range map[string]string{
+		"unknown field":               `{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","secret":"must-not-leak"}`,
+		"implicit insecure":           `{"transport":"otlp_http","endpoint":"http://collector.example.test/v1/metrics"}`,
+		"userinfo":                    `{"transport":"otlp_http","endpoint":"https://user:must-not-leak@collector.example.test/v1/metrics"}`,
+		"header newline":              "{\"transport\":\"otlp_http\",\"endpoint\":\"https://collector.example.test/v1/metrics\",\"headers\":{\"Authorization\":\"Bearer must-not-leak\\n\"}}",
+		"reserved header":             `{"transport":"otlp_http","endpoint":"https://collector.example.test/v1/metrics","headers":{"Host":"must-not-leak"}}`,
+		"oversized queue":             `{"queue_capacity":4097}`,
+		"oversized timeout":           `{"timeout_seconds":31}`,
+		"too frequent sampling":       `{"sample_interval_seconds":4}`,
+		"oversized sampling interval": `{"sample_interval_seconds":301}`,
+		"transport without endpoint":  `{"transport":"otlp_http"}`,
+		"trailing value":              `{} {}`,
+	} {
+		t.Run(name, func(t *testing.T) {
+			t.Setenv("OAC_HISTORY_SETTINGS_FILE", write("invalid.json", config))
+			if _, err := Load(); err == nil || !strings.HasPrefix(err.Error(), "OAC_HISTORY_SETTINGS_FILE: ") || strings.Contains(err.Error(), "must-not-leak") {
+				t.Fatal(err)
+			}
+		})
+	}
 }
 
 func TestSettingsReportEffectiveValuesAndHideHistory(t *testing.T) {
+	write := required(t)
 	t.Setenv("OAC_PUBLIC_URL", "https://core.example")
 	t.Setenv("OAC_EXECUTION_CONCURRENCY", "8")
-	t.Setenv("OAC_HISTORY_SETTINGS_FILE", "/tmp/history.json")
-	settings, err := Settings()
+	t.Setenv("OAC_LOG_LEVEL", "warn")
+	t.Setenv("OAC_WRITE_AUDIT_RETENTION", "1440m")
+	t.Setenv("OAC_HISTORY_SETTINGS_FILE", write("history.json", `{}`))
+	c, err := Load()
 	if err != nil {
 		t.Fatal(err)
 	}
 	found := map[string]any{}
-	for _, setting := range settings {
+	for _, setting := range c.Settings() {
 		if setting.Sensitive && (setting.Value != nil || setting.Configured == nil) {
 			t.Fatalf("sensitive setting %s leaked a value", setting.Key)
 		}
 		found[setting.Key] = setting.Value
+		if setting.Key == "core.write_audit_retention" && setting.Default != "2160h" {
+			t.Fatal(setting.Default)
+		}
 		if setting.Key == "core.runtime_history" && (setting.Configured == nil || !*setting.Configured) {
 			t.Fatal("history file was not reported as configured")
 		}
 	}
-	if found["public_url"] != "https://core.example" || found["core.execution_concurrency"] != 8 {
+	if found["public_url"] != "https://core.example" || found["core.execution_concurrency"] != 8 || found["log.level"] != "warn" || found["log.format"] != "auto" || found["core.write_audit_retention"] != "24h" {
 		t.Fatal(found)
 	}
 }
-
-func TestHarnessesDefaultToEveryQualifiedHarness(t *testing.T) {
-	t.Setenv("OAC_DEFAULT_HARNESS", "")
-	t.Setenv("OAC_HARNESSES", "")
-	engineName, err := DefaultHarness()
-	if err != nil || engineName != "codex" {
-		t.Fatal(engineName, err)
-	}
-	kinds, err := Harnesses(engineName)
-	if err != nil || strings.Join(kinds, ",") != "claude_sdk,codex,mcode" {
-		t.Fatal(kinds, err)
-	}
-	t.Setenv("OAC_HARNESSES", "mcode")
-	if kinds, err = Harnesses("codex"); err != nil || strings.Join(kinds, ",") != "codex,mcode" {
-		t.Fatal(kinds, err)
-	}
-	t.Setenv("OAC_HARNESSES", "unqualified")
-	if _, err = Harnesses("codex"); err == nil {
-		t.Fatal("unqualified harness enabled")
-	}
-}
diff --git a/services/core/internal/runtime/gateway.go b/services/core/internal/runtime/gateway.go
index 56a4a06e1..51c5b1163 100644
--- a/services/core/internal/runtime/gateway.go
+++ b/services/core/internal/runtime/gateway.go
@@ -4,7 +4,6 @@ package runtime
 import (
 	"errors"
 	"net/http"
-	"net/url"
 
 	"github.com/go-chi/chi/v5"
 
@@ -17,9 +16,8 @@ import (
 // receipts through cancellations. Its credentials never grant public Session
 // API access.
 func NewGateway(credentials runtimegateway.RuntimeStore, heartbeat runtimegateway.HeartbeatTouch, cancellations runtimegateway.ArchivedCancellationStore, publicWSURL string) (http.Handler, *runtimegateway.Registry, error) {
-	u, err := url.Parse(publicWSURL)
-	if err != nil || credentials == nil || heartbeat == nil || cancellations == nil || (u.Scheme != "ws" && u.Scheme != "wss") || u.Hostname() == "" || u.User != nil || u.RawQuery != "" || u.Fragment != "" || u.Path != "/api/v1/agent-daemon/ws" {
-		return nil, nil, errors.New("daemon URL must be an absolute ws(s) URL ending in /api/v1/agent-daemon/ws")
+	if credentials == nil || heartbeat == nil || cancellations == nil {
+		return nil, nil, errors.New("daemon gateway dependencies are required")
 	}
 	registry := runtimegateway.NewRegistry()
 	h := runtimegateway.NewHandler(runtimegateway.HandlerConfig{
diff --git a/services/core/internal/runtimeobs/sampler.go b/services/core/internal/runtimeobs/sampler.go
index 2fa81163f..b55e205db 100644
--- a/services/core/internal/runtimeobs/sampler.go
+++ b/services/core/internal/runtimeobs/sampler.go
@@ -38,11 +38,9 @@ type OwnershipChecker interface {
 }
 
 type SamplerOptions struct {
-	Interval      time.Duration
 	PageSize      int
 	Concurrency   int
 	SourceTimeout time.Duration
-	Report        func(SweepResult)
 }
 
 // SweepResult is deliberately low-cardinality. It reports collection coverage
@@ -54,21 +52,17 @@ type SweepResult struct {
 }
 
 type Sampler struct {
-	lister     SessionLister
-	observer   HistoryObserver
-	owner      OwnershipChecker
-	options    SamplerOptions
-	now        func() time.Time
-	afterSweep func(SweepResult)
+	lister   SessionLister
+	observer HistoryObserver
+	owner    OwnershipChecker
+	options  SamplerOptions
+	now      func() time.Time
 }
 
 func NewSampler(lister SessionLister, observer HistoryObserver, owner OwnershipChecker, options SamplerOptions) (*Sampler, error) {
 	if lister == nil || observer == nil || owner == nil {
 		return nil, errors.New("Runtime history sampler dependencies are required")
 	}
-	if options.Interval <= 0 {
-		return nil, errors.New("Runtime history sampler interval must be positive")
-	}
 	if options.PageSize == 0 {
 		options.PageSize = defaultSamplerPageSize
 	}
@@ -87,37 +81,12 @@ func NewSampler(lister SessionLister, observer HistoryObserver, owner OwnershipC
 	if options.SourceTimeout < time.Millisecond || options.SourceTimeout > 30*time.Second {
 		return nil, errors.New("Runtime history sampler source timeout is out of range")
 	}
-	return &Sampler{lister: lister, observer: observer, owner: owner, options: options, now: time.Now, afterSweep: options.Report}, nil
-}
-
-// Run performs one immediate full keyset sweep and then repeats without overlap.
-// A failed sweep is isolated from execution and retried at the next interval.
-func (s *Sampler) Run(ctx context.Context) error {
-	for {
-		result := s.sweep(ctx)
-		s.report(result)
-		if err := ctx.Err(); err != nil {
-			return err
-		}
-		timer := time.NewTimer(s.options.Interval)
-		select {
-		case <-timer.C:
-		case <-ctx.Done():
-			timer.Stop()
-			return ctx.Err()
-		}
-	}
-}
-
-func (s *Sampler) report(result SweepResult) {
-	if s.afterSweep == nil {
-		return
-	}
-	defer func() { _ = recover() }()
-	s.afterSweep(result)
+	return &Sampler{lister: lister, observer: observer, owner: owner, options: options, now: time.Now}, nil
 }
 
-func (s *Sampler) sweep(ctx context.Context) (result SweepResult) {
+// Sweep performs one full keyset sweep. A failed sweep is isolated from
+// execution; the caller repeats sweeps without overlap.
+func (s *Sampler) Sweep(ctx context.Context) (result SweepResult) {
 	result.StartedAt = s.now()
 	defer func() { result.CompletedAt = s.now() }()
 	sweepCtx, cancel := context.WithCancel(ctx)
diff --git a/services/core/internal/runtimeobs/sampler_test.go b/services/core/internal/runtimeobs/sampler_test.go
index 9b62231eb..2f1e119e6 100644
--- a/services/core/internal/runtimeobs/sampler_test.go
+++ b/services/core/internal/runtimeobs/sampler_test.go
@@ -125,13 +125,13 @@ func TestSamplerSweepsEveryPageAndIsolatesSessionFailures(t *testing.T) {
 		"session-b": {Sessions: []SessionIdentity{{TenantID: "tenant-c", SessionID: "session-c"}}},
 	}}
 	observer := &samplerObserver{fail: map[string]bool{"session-b": true}}
-	sampler, err := NewSampler(lister, observer, samplerOwner{}, SamplerOptions{Interval: time.Minute, PageSize: 2, Concurrency: 2})
+	sampler, err := NewSampler(lister, observer, samplerOwner{}, SamplerOptions{PageSize: 2, Concurrency: 2})
 	if err != nil {
 		t.Fatal(err)
 	}
 	now := time.Date(2026, 9, 23, 4, 0, 0, 0, time.UTC)
 	sampler.now = func() time.Time { now = now.Add(time.Second); return now }
-	result := sampler.sweep(t.Context())
+	result := sampler.Sweep(t.Context())
 	if !result.Complete || result.Listed != 3 || result.Observed != 2 || result.Failed != 1 {
 		t.Fatalf("unexpected sweep result: %+v", result)
 	}
@@ -155,11 +155,11 @@ func TestSamplerBoundsConcurrencyAndSourceDeadline(t *testing.T) {
 			{TenantID: "t", SessionID: "1"}, {TenantID: "t", SessionID: "2"}, {TenantID: "t", SessionID: "3"},
 		}},
 	}}
-	sampler, err := NewSampler(lister, service, samplerOwner{}, SamplerOptions{Interval: time.Minute, Concurrency: 2, SourceTimeout: 20 * time.Millisecond})
+	sampler, err := NewSampler(lister, service, samplerOwner{}, SamplerOptions{Concurrency: 2, SourceTimeout: 20 * time.Millisecond})
 	if err != nil {
 		t.Fatal(err)
 	}
-	result := sampler.sweep(t.Context())
+	result := sampler.Sweep(t.Context())
 	// Source deadlines are recorded as sample_timeout observations.
 	if !result.Complete || result.Observed != 3 || result.Failed != 0 || source.max != 2 {
 		t.Fatalf("unexpected bounded result: result=%+v max=%d", result, source.max)
@@ -168,11 +168,11 @@ func TestSamplerBoundsConcurrencyAndSourceDeadline(t *testing.T) {
 
 func TestSamplerStopsBeforeListingWithoutOwnership(t *testing.T) {
 	lister := &samplerLister{pages: map[string]SessionPage{}}
-	sampler, err := NewSampler(lister, &samplerObserver{}, samplerOwner{err: errors.New("lost")}, SamplerOptions{Interval: time.Minute})
+	sampler, err := NewSampler(lister, &samplerObserver{}, samplerOwner{err: errors.New("lost")}, SamplerOptions{})
 	if err != nil {
 		t.Fatal(err)
 	}
-	result := sampler.sweep(t.Context())
+	result := sampler.Sweep(t.Context())
 	if result.Complete || len(lister.cursors) != 0 {
 		t.Fatalf("sampler ran without deployment ownership: %+v %#v", result, lister.cursors)
 	}
@@ -184,83 +184,27 @@ func TestSamplerRejectsInvalidContinuationWithoutLooping(t *testing.T) {
 		NextCursor: "different-session",
 	}}}
 	observer := &samplerObserver{}
-	sampler, err := NewSampler(lister, observer, samplerOwner{}, SamplerOptions{Interval: time.Minute})
+	sampler, err := NewSampler(lister, observer, samplerOwner{}, SamplerOptions{})
 	if err != nil {
 		t.Fatal(err)
 	}
-	result := sampler.sweep(t.Context())
+	result := sampler.Sweep(t.Context())
 	if result.Complete || result.Listed != 0 || len(observer.sessions) != 0 || len(lister.cursors) != 1 {
 		t.Fatalf("invalid continuation was accepted: result=%+v sessions=%#v cursors=%#v", result, observer.sessions, lister.cursors)
 	}
 }
 
-func TestSamplerReportPanicIsIsolated(t *testing.T) {
-	sampler, err := NewSampler(
-		&samplerLister{pages: map[string]SessionPage{}},
-		&samplerObserver{},
-		samplerOwner{},
-		SamplerOptions{Interval: time.Minute, Report: func(SweepResult) { panic("test") }},
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sampler.report(SweepResult{Complete: true})
-}
-
-func TestSamplerRunDoesNotOverlapSweepsAndStops(t *testing.T) {
-	started := make(chan struct{}, 1)
-	release := make(chan struct{})
-	observer := &samplerObserver{wait: release}
-	lister := &samplerLister{pages: map[string]SessionPage{"": {Sessions: []SessionIdentity{{TenantID: "t", SessionID: "s"}}}}}
-	sampler, err := NewSampler(lister, observer, samplerOwner{}, SamplerOptions{Interval: time.Millisecond, SourceTimeout: time.Second})
-	if err != nil {
-		t.Fatal(err)
-	}
-	sampler.afterSweep = func(SweepResult) { started <- struct{}{} }
-	ctx, cancel := context.WithCancel(t.Context())
-	done := make(chan error, 1)
-	go func() { done <- sampler.Run(ctx) }()
-	deadline := time.After(time.Second)
-	for {
-		observer.mu.Lock()
-		active := observer.active
-		max := observer.max
-		observer.mu.Unlock()
-		if active == 1 {
-			if max != 1 {
-				t.Fatalf("overlapping sweep observed: max=%d", max)
-			}
-			break
-		}
-		select {
-		case <-deadline:
-			t.Fatal("sampler did not start")
-		default:
-			time.Sleep(time.Millisecond)
-		}
-	}
-	cancel()
-	select {
-	case err := <-done:
-		if !errors.Is(err, context.Canceled) {
-			t.Fatalf("unexpected sampler exit: %v", err)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("sampler did not stop")
-	}
-}
-
 func TestSamplerCancelsProviderReadWhenOwnershipIsLost(t *testing.T) {
 	release := make(chan struct{})
 	observer := &samplerObserver{wait: release}
 	owner := &sequenceOwner{}
 	lister := &samplerLister{pages: map[string]SessionPage{"": {Sessions: []SessionIdentity{{TenantID: "t", SessionID: "s"}}}}}
-	sampler, err := NewSampler(lister, observer, owner, SamplerOptions{Interval: time.Minute, SourceTimeout: time.Second})
+	sampler, err := NewSampler(lister, observer, owner, SamplerOptions{SourceTimeout: time.Second})
 	if err != nil {
 		t.Fatal(err)
 	}
 	done := make(chan SweepResult, 1)
-	go func() { done <- sampler.sweep(t.Context()) }()
+	go func() { done <- sampler.Sweep(t.Context()) }()
 	deadline := time.After(time.Second)
 	for {
 		observer.mu.Lock()
@@ -310,12 +254,12 @@ func TestSamplerPreservesProviderTimeoutAndFinalFenceAfterSlowResolution(t *test
 	}
 	owner := &sequenceOwner{}
 	sampler, err := NewSampler(resolver, service, owner, SamplerOptions{
-		Interval: time.Minute, SourceTimeout: 10 * time.Millisecond,
+		SourceTimeout: 10 * time.Millisecond,
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
-	result := sampler.sweep(t.Context())
+	result := sampler.Sweep(t.Context())
 	if !result.Complete || result.Observed != 1 || result.Failed != 0 {
 		t.Fatalf("slow-resolution sweep lost the timeout observation: %+v", result)
 	}
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
index cea7c0df0..ec2e587fd 100644
--- a/services/web/Dockerfile
+++ b/services/web/Dockerfile
@@ -3,7 +3,6 @@ FROM gcr.io/distroless/static-debian13:nonroot@sha256:e2e927ec666bae08560abb3c55
 
 COPY --chmod=0555 oac-web /usr/local/bin/oac-web
 COPY dist /www
-ENV OAC_WEB_ADDR=:8080 OAC_WEB_DIST=/www
 EXPOSE 8080
 USER 65532:65532
 CMD ["/usr/local/bin/oac-web"]
diff --git a/services/web/config.go b/services/web/config.go
index cd2f2413f..9d64eff35 100644
--- a/services/web/config.go
+++ b/services/web/config.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"cmp"
 	"errors"
 	"io"
 	"net/url"
@@ -9,32 +10,41 @@ import (
 	"strings"
 	"unicode"
 	"unicode/utf8"
+
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 )
 
 type config struct {
 	addr, origin, dist      string
 	coreKey, nodePayloadDir string
 	upstream                *url.URL
+	log                     log.Config
 }
 
+// loadConfig reads Web's settings. An unset or empty variable selects its
+// default; OAC_PUBLIC_URL and OAC_WEB_CORE_KEY_FILE have none.
 func loadConfig() (config, error) {
 	c := config{
-		addr:   envDefault("OAC_WEB_ADDR", ":8080"),
-		origin: envDefault("OAC_WEB_ORIGIN", "http://127.0.0.1:8080"),
-		dist:   envDefault("OAC_WEB_DIST", "/www"),
+		addr:   cmp.Or(os.Getenv("OAC_WEB_ADDR"), ":8080"),
+		origin: os.Getenv("OAC_PUBLIC_URL"),
+		dist:   cmp.Or(os.Getenv("OAC_WEB_DIST"), "/www"),
+	}
+	var err error
+	if c.log, err = log.LoadConfig(); err != nil {
+		return config{}, err
 	}
 	origin, err := serverURL(c.origin)
 	if err != nil || origin.Path != "" {
-		return config{}, errors.New("OAC_WEB_ORIGIN must be an HTTP(S) origin without a path")
+		return config{}, errors.New("OAC_PUBLIC_URL must be an HTTP(S) origin without a path")
 	}
-	c.upstream, err = serverURL(envDefault("OAC_WEB_UPSTREAM", "http://core:8091"))
+	c.upstream, err = serverURL(cmp.Or(os.Getenv("OAC_WEB_UPSTREAM"), "http://core:8091"))
 	if err != nil {
 		return config{}, errors.New("OAC_WEB_UPSTREAM must be an HTTP(S) server URL without credentials, query or path")
 	}
 	if !filepath.IsAbs(c.dist) {
 		return config{}, errors.New("OAC_WEB_DIST must be absolute")
 	}
-	c.coreKey, err = readSecret(envDefault("OAC_WEB_CORE_KEY_FILE", "/admin/core.key"))
+	c.coreKey, err = readSecret(os.Getenv("OAC_WEB_CORE_KEY_FILE"))
 	if err != nil {
 		return config{}, errors.New("OAC_WEB_CORE_KEY_FILE must name a private regular file containing the Core key")
 	}
@@ -48,13 +58,6 @@ func loadConfig() (config, error) {
 	return c, nil
 }
 
-func envDefault(key, fallback string) string {
-	if value, exists := os.LookupEnv(key); exists {
-		return value
-	}
-	return fallback
-}
-
 func serverURL(value string) (*url.URL, error) {
 	u, err := url.Parse(value)
 	if err != nil || u.Host == "" || (u.Scheme != "http" && u.Scheme != "https") ||
diff --git a/services/web/config_test.go b/services/web/config_test.go
index ae1e3ccac..978efebe0 100644
--- a/services/web/config_test.go
+++ b/services/web/config_test.go
@@ -15,14 +15,14 @@ func TestConfigRejectsUnsafeURLsAndSecretFiles(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Setenv("OAC_WEB_CORE_KEY_FILE", key)
-	t.Setenv("OAC_WEB_ORIGIN", testOrigin)
+	t.Setenv("OAC_PUBLIC_URL", testOrigin)
 	t.Setenv("OAC_WEB_UPSTREAM", "http://core:8091")
 	t.Setenv("OAC_WEB_DIST", directory)
 	c, err := loadConfig()
 	if err != nil || c.coreKey != valid {
 		t.Fatalf("valid configuration failed: %v", err)
 	}
-	for _, value := range []string{"http://user:secret@core:8091", "http://core:8091/v1", "http://core:8091?token=secret", "http://core:8091#", "file:///config/caller.key", ""} {
+	for _, value := range []string{"http://user:secret@core:8091", "http://core:8091/v1", "http://core:8091?token=secret", "http://core:8091#", "file:///config/caller.key"} {
 		t.Run(value, func(t *testing.T) {
 			t.Setenv("OAC_WEB_UPSTREAM", value)
 			_, err := loadConfig()
@@ -31,6 +31,15 @@ func TestConfigRejectsUnsafeURLsAndSecretFiles(t *testing.T) {
 			}
 		})
 	}
+	t.Setenv("OAC_WEB_UPSTREAM", "")
+	if c, err := loadConfig(); err != nil || c.upstream.String() != "http://core:8091" {
+		t.Fatal("an empty upstream did not select the default", err)
+	}
+	t.Setenv("OAC_PUBLIC_URL", "")
+	if _, err := loadConfig(); err == nil || !strings.Contains(err.Error(), "OAC_PUBLIC_URL") {
+		t.Fatal("console configured without OAC_PUBLIC_URL", err)
+	}
+	t.Setenv("OAC_PUBLIC_URL", testOrigin)
 	for _, value := range []string{"", "token with spaces", strings.Repeat("x", 4097), "token\x00", strings.Repeat("s", 31)} {
 		if err := os.WriteFile(key, []byte(value), 0o600); err != nil {
 			t.Fatal(err)
@@ -58,7 +67,7 @@ func TestBootstrapFollowsManagedHTTPOrigin(t *testing.T) {
 	}
 	t.Setenv("OAC_WEB_CORE_KEY_FILE", key)
 	t.Setenv("OAC_WEB_DIST", directory)
-	t.Setenv("OAC_WEB_ORIGIN", "http://localhost:8080")
+	t.Setenv("OAC_PUBLIC_URL", "http://localhost:8080")
 	if _, err := loadConfig(); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/web/main.go b/services/web/main.go
index a2459d7a4..3bc10bee6 100644
--- a/services/web/main.go
+++ b/services/web/main.go
@@ -5,7 +5,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"os/signal"
 	"syscall"
@@ -38,22 +40,33 @@ func main() {
 // printCoreKey writes the sign-in key for `docker compose exec web oac-web
 // core-key`. Exec output never enters the container log.
 func printCoreKey() error {
-	key, err := readSecret(envDefault("OAC_WEB_CORE_KEY_FILE", "/admin/core.key"))
+	c, err := loadConfig()
 	if err != nil {
-		return errors.New("cannot read the Core key from OAC_WEB_CORE_KEY_FILE")
+		return err
 	}
-	fmt.Println(key)
+	fmt.Println(c.coreKey)
 	return nil
 }
 
 // healthcheck reports the installation healthy once Core and Web's own listener
 // answer. Compose runs it inside the web container.
 func healthcheck() error {
+	c, err := loadConfig()
+	if err != nil {
+		return err
+	}
+	host, port, err := net.SplitHostPort(c.addr)
+	if err != nil {
+		return errors.New("OAC_WEB_ADDR must be a host:port listen address")
+	}
+	if ip := net.ParseIP(host); host == "" || (ip != nil && ip.IsUnspecified()) {
+		host = "127.0.0.1"
+	}
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	client := &http.Client{Timeout: 3 * time.Second, Transport: &http.Transport{Proxy: nil}}
-	for _, host := range []string{"core:8091", "127.0.0.1:8080"} {
-		request, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://"+host+"/healthz", nil)
+	for _, server := range []*url.URL{c.upstream, {Scheme: "http", Host: net.JoinHostPort(host, port)}} {
+		request, err := http.NewRequestWithContext(ctx, http.MethodGet, server.JoinPath("healthz").String(), nil)
 		if err != nil {
 			return err
 		}
@@ -63,18 +76,18 @@ func healthcheck() error {
 		}
 		response.Body.Close()
 		if response.StatusCode != http.StatusOK {
-			return fmt.Errorf("%s returned HTTP %d", host, response.StatusCode)
+			return fmt.Errorf("%s returned HTTP %d", server.Host, response.StatusCode)
 		}
 	}
 	return nil
 }
 
 func run() error {
-	log.Init(log.ConfigFromEnv())
 	c, err := loadConfig()
 	if err != nil {
 		return err
 	}
+	log.Init(c.log)
 	handler, err := newConsole(c)
 	if err != nil {
 		return err

From 7320d4cc091576ddbc752c47432ab2825a8e98ed Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 02:35:01 +0800
Subject: [PATCH 41/60] Delete the process deployment path (#517)

---
 .../web/src/features/sandbox/NodeList.test.ts |   2 -
 apps/web/src/features/sandbox/NodeList.tsx    |   5 +-
 apps/web/src/lib/locale-strings.ts            |   2 -
 contracts/agents-api/core.openapi.yaml        |   2 +-
 docs/web/console-api-usage.md                 |   2 +-
 docs/zh/web/console-api-usage.md              |   4 +-
 services/core/cmd/server/managed_setup.go     |   4 +-
 .../core/cmd/server/managed_setup_test.go     |   4 +-
 .../internal/api/core_error_catalog_test.go   |   2 -
 .../core/internal/api/errors_deployment.go    |   2 -
 services/core/internal/api/errors_test.go     |   1 -
 .../internal/api/placement_errors_test.go     |   2 +-
 .../internal/api/sandbox_deployment_setup.go  |   2 +-
 .../core/internal/api/sandbox_manager_test.go |   9 -
 .../db/queries/runtime_deployment.sql         |   4 -
 .../db/queries/runtime_lifecycle_nodes.sql    |   2 +-
 .../internal/db/queries/runtime_nodes.sql     |   3 -
 .../db/queries/runtime_suspension.sql         |   8 -
 .../db/queries/sandbox_deployment_setup.sql   |   2 +-
 .../internal/db/queries/sandbox_reset.sql     |   6 +-
 services/core/internal/db/sqlc/models.go      |   3 -
 .../db/sqlc/runtime_deployment.sql.go         |  23 +-
 .../db/sqlc/runtime_lifecycle_nodes.sql.go    |   2 +-
 .../internal/db/sqlc/runtime_nodes.sql.go     |  19 +-
 .../db/sqlc/runtime_suspension.sql.go         |  24 --
 .../db/sqlc/sandbox_deployment_setup.sql.go   |   2 +-
 .../internal/db/sqlc/sandbox_reset.sql.go     |  13 +-
 .../internal/deployment/allocations_test.go   |  10 +-
 services/core/internal/deployment/errors.go   |   1 -
 .../core/internal/deployment/execution.go     | 121 +-------
 .../core/internal/deployment/fakes_test.go    |  98 ++-----
 services/core/internal/deployment/nodes.go    |  10 +-
 .../deployment/placement/placement.go         |  30 +-
 .../deployment/placement/placement_test.go    |  12 +-
 services/core/internal/deployment/rules.go    |   2 +-
 .../core/internal/deployment/rules_test.go    |   8 +-
 services/core/internal/deployment/service.go  |   4 +-
 .../core/internal/deployment/service_test.go  |  16 +-
 .../internal/deployment/session_archive.go    |   4 +-
 .../deployment/session_archive_test.go        |   9 +-
 services/core/internal/deployment/setup.go    |  16 +-
 services/core/internal/deployment/storage.go  |  18 +-
 .../execution/deployment_fixture_test.go      |  67 ++---
 .../core/internal/execution/owner_test.go     |   4 +-
 .../internal/execution/runtime_compute.go     |  34 +--
 .../internal/execution/runtime_lifecycle.go   |  79 ++---
 .../internal/execution/runtime_manager.go     |  14 +-
 .../execution/runtime_manager_test.go         |   3 +-
 .../internal/execution/runtime_pending.go     |   3 -
 .../runtime_retirement_failure_test.go        |   8 +-
 .../sandbox_deployment_drain_test.go          |   4 +-
 .../execution/sandbox_deployment_setup.go     |  25 +-
 .../sandbox_deployment_setup_test.go          |  14 +-
 .../execution/sandbox_deployment_switch.go    |   4 +-
 .../sandbox_deployment_switch_test.go         |   6 +-
 .../sandbox_provider_contract_test.go         |   2 +-
 .../core/internal/execution/sandbox_reset.go  |   3 -
 .../internal/execution/sandbox_reset_test.go  |  10 +-
 .../execution/sandbox_snapshot_budget_test.go |   2 +-
 services/core/internal/execution/worker.go    |  10 +-
 .../postgres/deploymentpg/allocations.go      |  16 -
 .../postgres/deploymentpg/records.go          |   4 +-
 .../postgres/deploymentpg/reset_test.go       |   6 +-
 .../postgres/deploymentpg/setup_test.go       |  74 +----
 .../deploymentpg/specification_test.go        |   9 +-
 .../persistence/postgres/deploymentpg/tx.go   |  19 --
 .../postgres/placementpg/placementpg.go       |   3 +-
 .../postgres/sessionpg/creation_test.go       |  13 +-
 .../internal/sandbox/providers/registry.go    |   9 -
 .../sandbox/providers/registry_test.go        |  13 +-
 .../core/internal/sessions/creation_test.go   |   2 +-
 .../migrations/000093_web_deployment_only.sql |  78 +++++
 .../admin_session_archive_race_test.go        |   8 -
 .../admin_session_archive_worker_http_test.go |   2 +-
 .../credential_matrix_http_test.go            |   4 +-
 .../device_bootstrap_binding_test.go          |   2 +-
 ...sted_initialization_failure_public_test.go |  25 +-
 .../integration/runtime_adoption_test.go      |  73 -----
 .../runtime_capabilities_pending_test.go      |   4 +-
 .../runtime_compute_lifecycle_test.go         |  71 +----
 .../runtime_configuration_cleanup_test.go     |   2 +-
 .../integration/runtime_connection_test.go    |   7 +-
 .../runtime_creation_settlement_test.go       |   6 +-
 .../integration/runtime_deployment_test.go    | 275 +++---------------
 .../runtime_deployment_worker_test.go         |  32 +-
 .../runtime_initialization_test.go            |  11 +-
 .../runtime_input_admission_test.go           |  15 +-
 .../runtime_lifecycle_nodes_test.go           |  25 +-
 .../integration/runtime_lifecycle_test.go     |  42 +--
 .../runtime_node_lifecycle_fixture_test.go    |  15 +-
 .../tests/integration/runtime_nodes_test.go   |  71 ++---
 .../integration/runtime_observation_test.go   |   2 +-
 .../tests/integration/runtime_pending_test.go |   7 +-
 .../tests/integration/runtime_scan_test.go    |   6 +-
 .../integration/runtime_suspension_test.go    |  43 +--
 .../runtime_wake_hint_integration_test.go     |  10 +-
 .../sandbox_deployment_switch_test.go         |   2 +-
 .../sandbox_deployment_switch_worker_test.go  |   4 +-
 .../sandbox_deployment_worker_test.go         |   4 +-
 .../sandbox_node_auth_order_http_test.go      |   2 +-
 .../tests/integration/sandbox_reset_test.go   |  19 +-
 .../sandbox_specification_lifecycle_test.go   |   8 +-
 .../integration/session_deletion_test.go      |   2 +-
 .../web_deployment_only_migration_test.go     |  39 +++
 .../tests/integration/worker_fixture_test.go  |  79 +++++
 105 files changed, 587 insertions(+), 1381 deletions(-)
 create mode 100644 services/core/migrations/000093_web_deployment_only.sql
 delete mode 100644 services/core/tests/integration/runtime_adoption_test.go
 create mode 100644 services/core/tests/integration/web_deployment_only_migration_test.go

diff --git a/apps/web/src/features/sandbox/NodeList.test.ts b/apps/web/src/features/sandbox/NodeList.test.ts
index d32fab58e..d90258500 100644
--- a/apps/web/src/features/sandbox/NodeList.test.ts
+++ b/apps/web/src/features/sandbox/NodeList.test.ts
@@ -21,8 +21,6 @@ describe("node state", () => {
     expect(nodeState(node("a", { online: false }), [], true, core)).toBe("unconfirmed");
     expect(nodeState(node("a", { core_url: "https://core-old.example" }), [], false, core)).toBe("old_address");
     expect(nodeState(node("a", { online: false, core_url: "https://core-old.example" }), [], false, core)).toBe("old_address");
-    // A node Core did not enroll, such as a file-managed local one, reports no address: unknown, not old.
-    expect(nodeState(node("a", { core_url: "" }), [], false, core)).toBe("available");
     expect(nodeState(node("a", { online: false, cleanup_pending: 2 }), [], false, core)).toBe("offline");
     expect(nodeState(node("a", { provider_ready: false }), [], false, core)).toBe("degraded");
   });
diff --git a/apps/web/src/features/sandbox/NodeList.tsx b/apps/web/src/features/sandbox/NodeList.tsx
index aa8bb7d50..b5c4fd979 100644
--- a/apps/web/src/features/sandbox/NodeList.tsx
+++ b/apps/web/src/features/sandbox/NodeList.tsx
@@ -15,11 +15,10 @@ export type NodeState = "unconfirmed" | "old_address" | "offline" | "degraded" |
 
 /**
  * Whether a node enrolled with another Core address than the deployment's
- * `coreUrl`. An empty address is unknown, not old: a node Core did not enroll,
- * such as a file-managed local one, reports none.
+ * `coreUrl`. While the deployment is unknown, no node is on an old address.
  */
 export function onOldAddress(node: SandboxNode, coreUrl: string): boolean {
-  return Boolean(node.core_url && coreUrl && node.core_url !== coreUrl);
+  return coreUrl !== "" && node.core_url !== coreUrl;
 }
 
 /**
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index 880588c9c..e6080a26d 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -203,7 +203,6 @@ export const chinese = {
   "Couldn't confirm the sandbox change": "沙箱更改未能确认",
   "Sandbox state couldn't be read": "无法读取沙箱状态",
   "Nodes": "节点",
-  "Local nodes run on the Core server. Capacity and counts are reported by Core.": "本地节点运行在 Core 服务器上。容量和资源数量由 Core 上报。",
   "Sandbox nodes": "沙箱节点",
   "Node": "节点",
   "Health": "健康状态",
@@ -244,7 +243,6 @@ export const chinese = {
   "Automatic placement": "自动分配",
   "available": "可用",
   "unavailable": "不可用",
-  "Optional. Local nodes run on the Core server. A selected node must be available; Core will not fall back to another node.": "可选。本地节点运行在 Core 服务器上。所选节点必须可用；Core 不会自动改用其他节点。",
   "Loading nodes…": "正在加载节点…",
   "Retry directory": "重新加载节点目录",
   "No nodes are registered.": "尚未注册节点。",
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index c04c1097c..27637917c 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -6222,7 +6222,7 @@ paths:
     post:
       consumes:
         - application/json
-      description: Selects a provider, enforced resource limits and pinned Runtime release. Core derives the deployment's core_url from the installation public URL and rejects a core_url member with 400. E2B returns 409 sandbox_configuration_error while the public URL is loopback. E2B credentials are write-only. E2B may omit resources to adopt the validated template build's CPU and memory, returned in specification.resources. Requires explicit expected_generation, including zero at first setup. Stale retries reject before provider validation. An identical selection at the current generation is a no-op; differing selections and file-managed deployments reject. This does not create compute or execute work.
+      description: Selects a provider, enforced resource limits and pinned Runtime release. Core derives the deployment's core_url from the installation public URL and rejects a core_url member with 400. E2B returns 409 sandbox_configuration_error while the public URL is loopback. E2B credentials are write-only. E2B may omit resources to adopt the validated template build's CPU and memory, returned in specification.resources. Requires explicit expected_generation, including zero at first setup. Stale retries reject before provider validation. An identical selection at the current generation is a no-op; a differing selection rejects. This does not create compute or execute work.
       parameters:
         - description: Deployment selection
           in: body
diff --git a/docs/web/console-api-usage.md b/docs/web/console-api-usage.md
index b81088cf4..09df51a49 100644
--- a/docs/web/console-api-usage.md
+++ b/docs/web/console-api-usage.md
@@ -98,7 +98,7 @@ The list carries each harness's configuration, so the console does not read `GET
 | Deployment | `GET`, `POST`, `PUT /core/v1/sandbox/deployment` | Read the provider, the read-only `core_url` (`OAC_PUBLIC_URL`, shown in the setup review and never sent), reset state, installation ID and specification; a 409 `sandbox_configuration_error` (E2B with a loopback `public_url`) shows the shared client's fixed safe address-configuration message in the setup wizard, with Managed in System leading to System, and leaves nothing to confirm; initialize the deployment with `resources` and the Docker or microsandbox `runtime` release, or with the E2B account and no `resources` (Core adopts the template build's CPU and memory); change its settings with the expected generation. E2B's `metadata.template_build` (status, CPU, memory, disk) shows on System, the Sandbox configuration summary and Sandbox metrics, and sizes each sandbox when `specification.resources` is missing; microsandbox's `suspension` (idle and retention seconds) shows on System and the Nodes summary |
 | E2B discovery | `POST /core/v1/sandbox/providers/e2b/discovery` | The setup wizard lists the templates the entered E2B key can see, then the selected template's ready builds. The key travels only in these request bodies and the deployment write |
 | Reset | `POST`, `DELETE /core/v1/sandbox/deployment/reset` | Explicitly clear hosted resources, or cancel the remaining clear at the observed generation; show Core's remaining and offline projection |
-| Nodes | `GET /core/v1/sandbox/nodes` | Nodes page; fleet on Overview; node capacity on Sandbox metrics. An online node's `diagnostic` (`docker_unavailable`, `docker_limits_unsupported`, `runtime_image_unavailable`, `kvm_unavailable`, `microsandbox_artifacts_unavailable`, `capacity_insufficient`, `provider_unavailable`; any other value reads as `provider_unavailable`) marks it degraded and names the reason and fix in the help tip beside its status on each of these and on the node's page. A node whose `core_url` (the address it enrolled with) differs from the deployment's `core_url` is named on the Nodes page as bound to an old address, to be removed and added again, and its status there and on its page reads Old address instead of its health; an empty `core_url` (a node Core did not enroll) is unknown, not old. **Add node** follows only the node whose `enrollment_id` equals its command's |
+| Nodes | `GET /core/v1/sandbox/nodes` | Nodes page; fleet on Overview; node capacity on Sandbox metrics. An online node's `diagnostic` (`docker_unavailable`, `docker_limits_unsupported`, `runtime_image_unavailable`, `kvm_unavailable`, `microsandbox_artifacts_unavailable`, `capacity_insufficient`, `provider_unavailable`; any other value reads as `provider_unavailable`) marks it degraded and names the reason and fix in the help tip beside its status on each of these and on the node's page. A node whose `core_url` (the address it enrolled with) differs from the deployment's `core_url` is named on the Nodes page as bound to an old address, to be removed and added again, and its status there and on its page reads Old address instead of its health. **Add node** follows only the node whose `enrollment_id` equals its command's |
 | Node detail | `GET /core/v1/sandbox/nodes/{node_id}?range=1h\|6h\|24h` | Sandbox metrics node dialog: the host's CPU busy share and memory from its last heartbeat, and their history over the page's range. **Edit node** reads `host.effective_cpu_cores` and `host.total_memory_bytes` to show the host beside each sandbox's size and at most how many of those fit |
 | Allocations | `GET /core/v1/sandbox/nodes/{node_id}/allocations` | Nodes page; Sandbox metrics. Under microsandbox, a node's page shows from `compute_phase_changed_at` how long each allocation has been in its compute phase and, while suspended, about when Core reclaims it (that time plus the deployment's `suspension.retention_seconds`); a null time shows a dash |
 | Enrollment | `POST /core/v1/sandbox/enrollment-tokens` | **Add node**: the administrator sets the node's sandbox limits (`max_active`; `max_retained` only for microsandbox, equal to `max_active` for Docker) before Core issues a single-use token inside a command that verifies the installer checksum, with the command's `enrollment_id`, which the node it registers reports. The command runs the installer with sudo (a system service) and passes the token on standard input; root runs it directly. No ordinary-user installation or removal entry is exposed, and the log hint always names the system service. The command downloads the installer from the installation's `public_url`. No token is requested until the installation is read, when it cannot be read, when it is `local_only` (or its `public_url` is not an HTTPS origin), or when `/console/config` lists `node_artifacts` without the deployment's provider. The dialog reads both again on opening and when the window regains focus |
diff --git a/docs/zh/web/console-api-usage.md b/docs/zh/web/console-api-usage.md
index a6037092a..1b4890fd5 100644
--- a/docs/zh/web/console-api-usage.md
+++ b/docs/zh/web/console-api-usage.md
@@ -1,7 +1,7 @@
 ---
 title: "控制台 API 使用"
 source: docs/web/console-api-usage.md
-source_hash: 50edc63c79976e9aad9590604a0e361aae178144bc8a6009989b2da5d031408d
+source_hash: 7318d1d082d19cc1681a2bd91556c4dc7e16b211ae7cd3936b99d63c26949900
 ---
 
 本页列出各控制台页面读取和写入的 Core 路由，以及控制台如何限定读取范围。[administrator API contract](../../../contracts/agents-api/zh/admin-api.md) 定义了路由、响应结构、分页和审计记录；[API namespaces and credentials](../api/index.md) 定义了本文使用的术语。
@@ -100,7 +100,7 @@ source_hash: 50edc63c79976e9aad9590604a0e361aae178144bc8a6009989b2da5d031408d
 | 部署 | `GET`、`POST`、`PUT /core/v1/sandbox/deployment` | 读取提供商、只读 `core_url`（即 `OAC_PUBLIC_URL`，会显示在设置审核中且绝不发送）、重置状态、安装 ID 和规范；409 `sandbox_configuration_error`（E2B 搭配回环地址形式的 `public_url`）会在设置向导中显示共享客户端固定的安全地址配置消息，并通过 Managed in System 前往 System，且无需确认；使用 `resources` 以及 Docker 或 microsandbox 的 `runtime` release 初始化部署，或者使用 E2B 账户且不提供 `resources`（Core 采用模板构建的 CPU 和内存）；使用预期的 generation 更改设置。E2B 的 `metadata.template_build`（状态、CPU、内存、磁盘）会显示在 System、Sandbox 配置摘要和 Sandbox metrics 中；当缺少 `specification.resources` 时，它还会确定每个 Sandbox 的大小；microsandbox 的 `suspension`（空闲和保留秒数）会显示在 System 和 Nodes 摘要中 |
 | E2B 发现 | `POST /core/v1/sandbox/providers/e2b/discovery` | 设置向导先列出输入的 E2B 密钥可见的模板，再列出所选模板的可用构建。该密钥只会通过这些请求体和部署写入请求传输 |
 | 重置 | `POST`、`DELETE /core/v1/sandbox/deployment/reset` | 显式清除托管资源，或在观测到的 generation 处取消剩余清除；显示 Core 的剩余资源和离线预测 |
-| Nodes | `GET /core/v1/sandbox/nodes` | Nodes 页面；Overview 上的机群；Sandbox metrics 中的节点容量。在线节点的 `diagnostic`（`docker_unavailable`、`docker_limits_unsupported`、`runtime_image_unavailable`、`kvm_unavailable`、`microsandbox_artifacts_unavailable`、`capacity_insufficient`、`provider_unavailable`；任何其他值均读取为 `provider_unavailable`）会将其标记为降级，并在上述每个页面及节点页面中，紧邻状态的帮助提示里说明原因和修复方法。如果节点的 `core_url`（其注册时使用的地址）与部署的 `core_url` 不同，Nodes 页面会将其标记为绑定到旧地址，需要移除后重新添加；此时它在该页面和节点页面中的状态会显示 Old address，而不是健康状态；如果 `core_url` 为空（Core 未注册该节点），则状态为未知，而不是旧地址。**Add node** 仅跟踪 `enrollment_id` 与其命令所含 `enrollment_id` 相等的节点 |
+| Nodes | `GET /core/v1/sandbox/nodes` | Nodes 页面；Overview 上的机群；Sandbox metrics 中的节点容量。在线节点的 `diagnostic`（`docker_unavailable`、`docker_limits_unsupported`、`runtime_image_unavailable`、`kvm_unavailable`、`microsandbox_artifacts_unavailable`、`capacity_insufficient`、`provider_unavailable`；任何其他值均读取为 `provider_unavailable`）会将其标记为降级，并在上述每个页面及节点页面中，紧邻状态的帮助提示里说明原因和修复方法。如果节点的 `core_url`（其注册时使用的地址）与部署的 `core_url` 不同，Nodes 页面会将其标记为绑定到旧地址，需要移除后重新添加；此时它在该页面和节点页面中的状态会显示 Old address，而不是健康状态。**Add node** 仅跟踪 `enrollment_id` 与其命令所含 `enrollment_id` 相等的节点 |
 | 节点详情 | `GET /core/v1/sandbox/nodes/{node_id}?range=1h\|6h\|24h` | Sandbox metrics 节点对话框：主机自最近一次心跳以来的 CPU 忙碌占比和内存使用量，以及页面所选范围内二者的历史记录。**Edit node** 读取 `host.effective_cpu_cores` 和 `host.total_memory_bytes`，用于在每个 Sandbox 大小旁显示主机容量，以及最多可容纳多少个该大小的 Sandbox |
 | 分配 | `GET /core/v1/sandbox/nodes/{node_id}/allocations` | Nodes 页面；Sandbox metrics。在 microsandbox 下，节点页面根据 `compute_phase_changed_at` 显示每个分配处于计算阶段的时间，并在分配暂停时估算 Core 回收它的时间（该时间加上部署的 `suspension.retention_seconds`）；时间为 null 时显示短横线 |
 | 注册 | `POST /core/v1/sandbox/enrollment-tokens` | **Add node**：管理员先设置节点的 Sandbox 限制（`max_active`；`max_retained` 仅适用于 microsandbox，在 Docker 下等于 `max_active`），然后 Core 才会把一次性令牌放入命令中；该命令会验证安装程序校验和，并包含命令的 `enrollment_id`，节点注册时会报告此 ID。命令使用 sudo 运行安装程序（作为系统服务），并通过标准输入传递令牌；以 root 运行时则直接执行。界面不提供普通用户安装或移除入口，日志提示始终指明系统服务。命令从安装的 `public_url` 下载安装程序。只有成功读取安装信息后才会请求令牌；如果安装信息无法读取、安装为 `local_only`（或其 `public_url` 不是 HTTPS 来源），或者 `/console/config` 列出的 `node_artifacts` 不包含部署的提供商，则不会请求令牌。对话框在打开时和窗口重新获得焦点时，会再次读取这两项信息 |
diff --git a/services/core/cmd/server/managed_setup.go b/services/core/cmd/server/managed_setup.go
index 0ca908728..8606525d7 100644
--- a/services/core/cmd/server/managed_setup.go
+++ b/services/core/cmd/server/managed_setup.go
@@ -145,11 +145,11 @@ func (s *managedSetup) configuration(setup deployment.Setup) (execution.Prepared
 	if err != nil {
 		return execution.PreparedRuntimeDeployment{}, fmt.Errorf("%w: %v", execution.ErrExecutionUnavailable, err)
 	}
-	selected := &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused,
+	selected := &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode,
 		CoreURL: s.runtimeAPI, BackendFingerprint: setup.BackendFingerprint, Provider: provider}
 	if setup.Suspension != nil {
 		selected.Suspension = &execution.RuntimeSuspensionPolicy{IdleTimeout: time.Duration(setup.Suspension.IdleSeconds) * time.Second,
-			Retention: time.Duration(setup.Suspension.RetentionSeconds) * time.Second, MaxActive: 4, MaxRetained: 16}
+			Retention: time.Duration(setup.Suspension.RetentionSeconds) * time.Second}
 	}
 	return execution.PreparedRuntimeDeployment{Config: selected, Publish: s.publish}, nil
 }
diff --git a/services/core/cmd/server/managed_setup_test.go b/services/core/cmd/server/managed_setup_test.go
index d6d2ff663..54e21dc1a 100644
--- a/services/core/cmd/server/managed_setup_test.go
+++ b/services/core/cmd/server/managed_setup_test.go
@@ -177,9 +177,9 @@ func TestManagedSetupPreparesWithoutPublishing(t *testing.T) {
 		t.Fatal("preparation published or lost candidate configuration")
 	}
 	committed := *candidate.Config
-	committed.Generation, committed.AdmissionPaused = 2, true
+	committed.Generation = 2
 	candidate.Publish(&committed)
-	if got := s.selected.Load(); got.Generation != 2 || got.Config.ProviderKind != "microsandbox" || !got.Config.AdmissionPaused {
+	if got := s.selected.Load(); got.Generation != 2 || got.Config.ProviderKind != "microsandbox" {
 		t.Fatal("commit did not publish the validated selection")
 	}
 }
diff --git a/services/core/internal/api/core_error_catalog_test.go b/services/core/internal/api/core_error_catalog_test.go
index 2d81518ab..42d36dee5 100644
--- a/services/core/internal/api/core_error_catalog_test.go
+++ b/services/core/internal/api/core_error_catalog_test.go
@@ -24,8 +24,6 @@ var nonAdministrationCodes = []string{
 	"environment_input_cancelled", "environment_input_expired", "model_provider_required", "sandbox_nodes_preparing", "turn_conflict",
 	// Machine routes for nodes and native installers.
 	"installation_authorization_invalid", "installation_unavailable", "invalid_node_credential", "sandbox_node_address_mismatch",
-	// Removal of the file-managed local node, which the process deployment path owns.
-	"runtime_local_node_configured",
 }
 
 // The shared catalog lists every code an administration caller (/core/v1 or
diff --git a/services/core/internal/api/errors_deployment.go b/services/core/internal/api/errors_deployment.go
index 70435254a..0da81d951 100644
--- a/services/core/internal/api/errors_deployment.go
+++ b/services/core/internal/api/errors_deployment.go
@@ -102,8 +102,6 @@ func writeSandboxError(w http.ResponseWriter, err error) bool {
 		writeError(w, http.StatusUnauthorized, "invalid_node_credential", "A valid sandbox node enrollment or node credential is required.")
 	case errors.Is(err, deployment.ErrNodeInUse):
 		writeError(w, http.StatusConflict, "runtime_node_in_use", "The sandbox node retains allocations, snapshots, reservations or pending cleanup.")
-	case errors.Is(err, deployment.ErrLocalNodeConfigured):
-		writeError(w, http.StatusConflict, "runtime_local_node_configured", "The local sandbox node is enabled in deployment configuration. Drain it with the previous release and remove its file-managed configuration before replacing it.")
 	case errors.Is(err, placement.ErrNodesPreparing):
 		writeError(w, http.StatusServiceUnavailable, "sandbox_nodes_preparing", "Sandbox nodes are preparing the requested Runtime.")
 	case errors.Is(err, placement.ErrNodeUnavailable):
diff --git a/services/core/internal/api/errors_test.go b/services/core/internal/api/errors_test.go
index 9f139d003..25cc78eb9 100644
--- a/services/core/internal/api/errors_test.go
+++ b/services/core/internal/api/errors_test.go
@@ -138,7 +138,6 @@ func TestConflictErrorsUseConflictType(t *testing.T) {
 	for err, code := range map[error]string{
 		deployment.ErrConflict:                 "sandbox_deployment_conflict",
 		deployment.ErrNodeInUse:                "runtime_node_in_use",
-		deployment.ErrLocalNodeConfigured:      "runtime_local_node_configured",
 		deployment.ErrNodeAddressMismatch:      "sandbox_node_address_mismatch",
 		sessions.ErrEnvironmentUnavailable:     "environment_unavailable",
 		execution.ErrEnvironmentInputExpired:   "environment_input_expired",
diff --git a/services/core/internal/api/placement_errors_test.go b/services/core/internal/api/placement_errors_test.go
index 90a8fb360..8aefad2be 100644
--- a/services/core/internal/api/placement_errors_test.go
+++ b/services/core/internal/api/placement_errors_test.go
@@ -19,7 +19,7 @@ func TestPlacementErrorsKeepTheirResponses(t *testing.T) {
 		code, message string
 	}{
 		{placement.ErrResetAdmission, http.StatusServiceUnavailable, "sandbox_reset_in_progress", "A sandbox reset is in progress."},
-		{fmt.Errorf("%w: sandbox creation is paused for provider maintenance", placement.ErrAdmissionClosed), http.StatusConflict, "environment_unavailable", "The environment is no longer available for new input."},
+		{fmt.Errorf("%w: sandbox installation does not match deployment", placement.ErrAdmissionClosed), http.StatusConflict, "environment_unavailable", "The environment is no longer available for new input."},
 		{placement.ErrPublicURLUnreachable, http.StatusConflict, "sandbox_configuration_error", placement.ErrPublicURLUnreachable.Error()},
 		{placement.ErrNodesPreparing, http.StatusServiceUnavailable, "sandbox_nodes_preparing", "Sandbox nodes are preparing the requested Runtime."},
 		{placement.ErrNodeUnavailable, http.StatusServiceUnavailable, "runtime_node_unavailable", "The selected sandbox node is unavailable or has no capacity."},
diff --git a/services/core/internal/api/sandbox_deployment_setup.go b/services/core/internal/api/sandbox_deployment_setup.go
index b58295306..5a26510b8 100644
--- a/services/core/internal/api/sandbox_deployment_setup.go
+++ b/services/core/internal/api/sandbox_deployment_setup.go
@@ -51,7 +51,7 @@ type DeploymentReset interface {
 }
 
 // @Summary Initialize the deployment sandbox provider
-// @Description Selects a provider, enforced resource limits and pinned Runtime release. Core derives the deployment's core_url from the installation public URL and rejects a core_url member with 400. E2B returns 409 sandbox_configuration_error while the public URL is loopback. E2B credentials are write-only. E2B may omit resources to adopt the validated template build's CPU and memory, returned in specification.resources. Requires explicit expected_generation, including zero at first setup. Stale retries reject before provider validation. An identical selection at the current generation is a no-op; differing selections and file-managed deployments reject. This does not create compute or execute work.
+// @Description Selects a provider, enforced resource limits and pinned Runtime release. Core derives the deployment's core_url from the installation public URL and rejects a core_url member with 400. E2B returns 409 sandbox_configuration_error while the public URL is loopback. E2B credentials are write-only. E2B may omit resources to adopt the validated template build's CPU and memory, returned in specification.resources. Requires explicit expected_generation, including zero at first setup. Stale retries reject before provider validation. An identical selection at the current generation is a no-op; a differing selection rejects. This does not create compute or execute work.
 // @Tags Sandbox Manager
 // @Produce json
 // @Security DeploymentAdminAuth
diff --git a/services/core/internal/api/sandbox_manager_test.go b/services/core/internal/api/sandbox_manager_test.go
index 7de004b17..6e7959622 100644
--- a/services/core/internal/api/sandbox_manager_test.go
+++ b/services/core/internal/api/sandbox_manager_test.go
@@ -69,15 +69,6 @@ func TestSandboxEnrollmentDoesNotAcceptProjectAsAdmin(t *testing.T) {
 	}
 }
 
-func TestSandboxLocalNodeRemovalExplainsDeploymentBinding(t *testing.T) {
-	request := httptest.NewRequest(http.MethodDelete, "/core/v1/sandbox/nodes/local", nil)
-	response := httptest.NewRecorder()
-	writeDeploymentError(response, request, deployment.ErrLocalNodeConfigured)
-	if response.Code != http.StatusConflict || !strings.Contains(response.Body.String(), "runtime_local_node_configured") || !strings.Contains(response.Body.String(), "previous release") {
-		t.Fatal(response.Code, response.Body.String())
-	}
-}
-
 // nodeCapacity rejects max_active outside the deployment's node capacity
 // bounds.
 func nodeCapacity(active int) error {
diff --git a/services/core/internal/db/queries/runtime_deployment.sql b/services/core/internal/db/queries/runtime_deployment.sql
index 36f23dc1c..382d55726 100644
--- a/services/core/internal/db/queries/runtime_deployment.sql
+++ b/services/core/internal/db/queries/runtime_deployment.sql
@@ -1,10 +1,6 @@
 -- name: LockRuntimeDeployment :one
 SELECT * FROM runtime_deployment WHERE singleton = true FOR UPDATE;
 
--- name: SetRuntimeDeployment :exec
-UPDATE runtime_deployment SET installation_id = $1, backend_fingerprint = $2,
-admission_paused = $3, updated_at = clock_timestamp() WHERE singleton = true;
-
 -- name: CountRuntimeDeploymentResources :one
 SELECT
 (SELECT count(*) FROM runtime_allocations WHERE state <> 'released')::bigint AS allocations,
diff --git a/services/core/internal/db/queries/runtime_lifecycle_nodes.sql b/services/core/internal/db/queries/runtime_lifecycle_nodes.sql
index 403741dce..334617404 100644
--- a/services/core/internal/db/queries/runtime_lifecycle_nodes.sql
+++ b/services/core/internal/db/queries/runtime_lifecycle_nodes.sql
@@ -20,7 +20,7 @@ FROM environments e JOIN sessions s ON s.id=e.session_id
 LEFT JOIN runtime_placements p ON p.environment_id=e.id
 WHERE p.node_id IS NOT DISTINCT FROM sqlc.narg(node_id)::uuid
   AND p.released_at IS NULL
-  AND NOT (SELECT admission_paused FROM runtime_deployment)
+  AND (SELECT reset_clear IS NULL FROM runtime_deployment)
   AND e.id > sqlc.arg(after_id)::uuid AND s.deleted_at IS NULL AND e.status='pending'
   AND s.configuration->'environment'->>'type'='openai_hosted'
   AND NOT EXISTS (SELECT 1 FROM runtime_allocations a WHERE a.environment_id=e.id)
diff --git a/services/core/internal/db/queries/runtime_nodes.sql b/services/core/internal/db/queries/runtime_nodes.sql
index 604a338e0..b6c45b2ce 100644
--- a/services/core/internal/db/queries/runtime_nodes.sql
+++ b/services/core/internal/db/queries/runtime_nodes.sql
@@ -1,6 +1,3 @@
--- name: SetRuntimeManagerDeployment :exec
-UPDATE runtime_deployment SET provider_kind=$1, local_node_id=$2, mode='nodes', generation=GREATEST(generation,1), owner_epoch=owner_epoch+1 WHERE singleton=true;
-
 -- name: GetRuntimeDeployment :one
 SELECT * FROM runtime_deployment WHERE singleton=true;
 
diff --git a/services/core/internal/db/queries/runtime_suspension.sql b/services/core/internal/db/queries/runtime_suspension.sql
index d4b6a6e21..6a1ccbeef 100644
--- a/services/core/internal/db/queries/runtime_suspension.sql
+++ b/services/core/internal/db/queries/runtime_suspension.sql
@@ -39,14 +39,6 @@ SELECT clock_timestamp()::timestamptz AS observed_at,
 FROM runtime_allocations a JOIN environments e ON e.id = a.environment_id
 WHERE a.id = $1;
 
--- name: CountRuntimeComputeReservations :one
-SELECT count(*) FROM runtime_allocations
-WHERE provider_key = $1 AND state <> 'released' AND compute_phase <> 'suspended';
-
--- name: CountRuntimeRetainedAllocations :one
-SELECT count(*) FROM runtime_allocations
-WHERE provider_key = $1 AND state <> 'released';
-
 -- name: RuntimeComputeBlocksAdmission :one
 SELECT EXISTS (
     SELECT 1 FROM runtime_allocations a JOIN environments e ON e.id = a.environment_id
diff --git a/services/core/internal/db/queries/sandbox_deployment_setup.sql b/services/core/internal/db/queries/sandbox_deployment_setup.sql
index 142f0720f..09bd91540 100644
--- a/services/core/internal/db/queries/sandbox_deployment_setup.sql
+++ b/services/core/internal/db/queries/sandbox_deployment_setup.sql
@@ -1,5 +1,5 @@
 -- name: ClaimWebSandboxDeployment :exec
-UPDATE runtime_deployment SET installation_id=$1, web_managed=true,
+UPDATE runtime_deployment SET installation_id=$1,
 owner_epoch=owner_epoch+1, updated_at=clock_timestamp() WHERE singleton=true;
 
 -- name: InitializeSandboxDeployment :exec
diff --git a/services/core/internal/db/queries/sandbox_reset.sql b/services/core/internal/db/queries/sandbox_reset.sql
index 3fad61493..0c2938bb1 100644
--- a/services/core/internal/db/queries/sandbox_reset.sql
+++ b/services/core/internal/db/queries/sandbox_reset.sql
@@ -1,6 +1,6 @@
 -- name: StartSandboxReset :exec
 WITH clock AS MATERIALIZED (SELECT clock_timestamp() AS at)
-UPDATE runtime_deployment SET admission_paused = true, reset_clear = sqlc.arg(clear),
+UPDATE runtime_deployment SET reset_clear = sqlc.arg(clear),
     reset_requested_at = clock.at,
     reset_deadline_at = CASE WHEN sqlc.arg(clear)::text = 'auto'
         THEN clock.at + make_interval(secs => sqlc.arg(deadline_seconds)::int) END,
@@ -14,7 +14,7 @@ UPDATE runtime_deployment SET reset_clear = 'force', reset_forced_at = clock.at,
 FROM clock WHERE singleton = true AND reset_clear = 'auto';
 
 -- name: CancelSandboxReset :exec
-UPDATE runtime_deployment SET admission_paused = false, reset_clear = NULL,
+UPDATE runtime_deployment SET reset_clear = NULL,
     reset_requested_at = NULL, reset_deadline_at = NULL, reset_forced_at = NULL,
     reset_audit = NULL, updated_at = clock_timestamp()
 WHERE singleton = true;
@@ -24,7 +24,7 @@ UPDATE runtime_deployment SET provider_kind = '', backend_fingerprint = '', mode
     specification = '{}', idle_seconds = 0, retention_seconds = 0,
     provider_config = '{}'::jsonb, provider_metadata = '{}'::jsonb, provider_credential = NULL,
     generation = generation + 1, owner_epoch = owner_epoch + 1,
-    admission_paused = false, reset_clear = NULL, reset_requested_at = NULL,
+    reset_clear = NULL, reset_requested_at = NULL,
     reset_deadline_at = NULL, reset_forced_at = NULL, reset_audit = NULL,
     updated_at = clock_timestamp()
 WHERE singleton = true;
diff --git a/services/core/internal/db/sqlc/models.go b/services/core/internal/db/sqlc/models.go
index 134170554..048878096 100644
--- a/services/core/internal/db/sqlc/models.go
+++ b/services/core/internal/db/sqlc/models.go
@@ -239,12 +239,9 @@ type RuntimeDeployment struct {
 	Singleton          bool               `json:"singleton"`
 	InstallationID     pgtype.UUID        `json:"installation_id"`
 	BackendFingerprint string             `json:"backend_fingerprint"`
-	AdmissionPaused    bool               `json:"admission_paused"`
 	UpdatedAt          pgtype.Timestamptz `json:"updated_at"`
 	ProviderKind       string             `json:"provider_kind"`
-	LocalNodeID        pgtype.UUID        `json:"local_node_id"`
 	OwnerEpoch         int64              `json:"owner_epoch"`
-	WebManaged         bool               `json:"web_managed"`
 	IdleSeconds        int64              `json:"idle_seconds"`
 	RetentionSeconds   int64              `json:"retention_seconds"`
 	Generation         int64              `json:"generation"`
diff --git a/services/core/internal/db/sqlc/runtime_deployment.sql.go b/services/core/internal/db/sqlc/runtime_deployment.sql.go
index e8f076e8b..15d71eef4 100644
--- a/services/core/internal/db/sqlc/runtime_deployment.sql.go
+++ b/services/core/internal/db/sqlc/runtime_deployment.sql.go
@@ -7,8 +7,6 @@ package sqlc
 
 import (
 	"context"
-
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 const countAddressBindings = `-- name: CountAddressBindings :one
@@ -55,7 +53,7 @@ func (q *Queries) CountRuntimeDeploymentResources(ctx context.Context) (CountRun
 }
 
 const lockRuntimeDeployment = `-- name: LockRuntimeDeployment :one
-SELECT singleton, installation_id, backend_fingerprint, admission_paused, updated_at, provider_kind, local_node_id, owner_epoch, web_managed, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton = true FOR UPDATE
+SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton = true FOR UPDATE
 `
 
 func (q *Queries) LockRuntimeDeployment(ctx context.Context) (RuntimeDeployment, error) {
@@ -65,12 +63,9 @@ func (q *Queries) LockRuntimeDeployment(ctx context.Context) (RuntimeDeployment,
 		&i.Singleton,
 		&i.InstallationID,
 		&i.BackendFingerprint,
-		&i.AdmissionPaused,
 		&i.UpdatedAt,
 		&i.ProviderKind,
-		&i.LocalNodeID,
 		&i.OwnerEpoch,
-		&i.WebManaged,
 		&i.IdleSeconds,
 		&i.RetentionSeconds,
 		&i.Generation,
@@ -87,19 +82,3 @@ func (q *Queries) LockRuntimeDeployment(ctx context.Context) (RuntimeDeployment,
 	)
 	return i, err
 }
-
-const setRuntimeDeployment = `-- name: SetRuntimeDeployment :exec
-UPDATE runtime_deployment SET installation_id = $1, backend_fingerprint = $2,
-admission_paused = $3, updated_at = clock_timestamp() WHERE singleton = true
-`
-
-type SetRuntimeDeploymentParams struct {
-	InstallationID     pgtype.UUID `json:"installation_id"`
-	BackendFingerprint string      `json:"backend_fingerprint"`
-	AdmissionPaused    bool        `json:"admission_paused"`
-}
-
-func (q *Queries) SetRuntimeDeployment(ctx context.Context, arg SetRuntimeDeploymentParams) error {
-	_, err := q.db.Exec(ctx, setRuntimeDeployment, arg.InstallationID, arg.BackendFingerprint, arg.AdmissionPaused)
-	return err
-}
diff --git a/services/core/internal/db/sqlc/runtime_lifecycle_nodes.sql.go b/services/core/internal/db/sqlc/runtime_lifecycle_nodes.sql.go
index 6036aa233..e4bc7dae0 100644
--- a/services/core/internal/db/sqlc/runtime_lifecycle_nodes.sql.go
+++ b/services/core/internal/db/sqlc/runtime_lifecycle_nodes.sql.go
@@ -150,7 +150,7 @@ FROM environments e JOIN sessions s ON s.id=e.session_id
 LEFT JOIN runtime_placements p ON p.environment_id=e.id
 WHERE p.node_id IS NOT DISTINCT FROM $1::uuid
   AND p.released_at IS NULL
-  AND NOT (SELECT admission_paused FROM runtime_deployment)
+  AND (SELECT reset_clear IS NULL FROM runtime_deployment)
   AND e.id > $2::uuid AND s.deleted_at IS NULL AND e.status='pending'
   AND s.configuration->'environment'->>'type'='openai_hosted'
   AND NOT EXISTS (SELECT 1 FROM runtime_allocations a WHERE a.environment_id=e.id)
diff --git a/services/core/internal/db/sqlc/runtime_nodes.sql.go b/services/core/internal/db/sqlc/runtime_nodes.sql.go
index dc5d98088..e8ee97976 100644
--- a/services/core/internal/db/sqlc/runtime_nodes.sql.go
+++ b/services/core/internal/db/sqlc/runtime_nodes.sql.go
@@ -119,7 +119,7 @@ func (q *Queries) DisconnectRuntimeNode(ctx context.Context, arg DisconnectRunti
 }
 
 const getRuntimeDeployment = `-- name: GetRuntimeDeployment :one
-SELECT singleton, installation_id, backend_fingerprint, admission_paused, updated_at, provider_kind, local_node_id, owner_epoch, web_managed, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton=true
+SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton=true
 `
 
 func (q *Queries) GetRuntimeDeployment(ctx context.Context) (RuntimeDeployment, error) {
@@ -129,12 +129,9 @@ func (q *Queries) GetRuntimeDeployment(ctx context.Context) (RuntimeDeployment,
 		&i.Singleton,
 		&i.InstallationID,
 		&i.BackendFingerprint,
-		&i.AdmissionPaused,
 		&i.UpdatedAt,
 		&i.ProviderKind,
-		&i.LocalNodeID,
 		&i.OwnerEpoch,
-		&i.WebManaged,
 		&i.IdleSeconds,
 		&i.RetentionSeconds,
 		&i.Generation,
@@ -526,20 +523,6 @@ func (q *Queries) RemoveRuntimeNode(ctx context.Context, id pgtype.UUID) error {
 	return err
 }
 
-const setRuntimeManagerDeployment = `-- name: SetRuntimeManagerDeployment :exec
-UPDATE runtime_deployment SET provider_kind=$1, local_node_id=$2, mode='nodes', generation=GREATEST(generation,1), owner_epoch=owner_epoch+1 WHERE singleton=true
-`
-
-type SetRuntimeManagerDeploymentParams struct {
-	ProviderKind string      `json:"provider_kind"`
-	LocalNodeID  pgtype.UUID `json:"local_node_id"`
-}
-
-func (q *Queries) SetRuntimeManagerDeployment(ctx context.Context, arg SetRuntimeManagerDeploymentParams) error {
-	_, err := q.db.Exec(ctx, setRuntimeManagerDeployment, arg.ProviderKind, arg.LocalNodeID)
-	return err
-}
-
 const setRuntimeObservation = `-- name: SetRuntimeObservation :exec
 UPDATE runtime_allocations SET observation_error=$4 WHERE id=$1 AND compute_revision=$2 AND state=$3 AND state<>'released'
 `
diff --git a/services/core/internal/db/sqlc/runtime_suspension.sql.go b/services/core/internal/db/sqlc/runtime_suspension.sql.go
index 5c4867839..ed6b5bb50 100644
--- a/services/core/internal/db/sqlc/runtime_suspension.sql.go
+++ b/services/core/internal/db/sqlc/runtime_suspension.sql.go
@@ -27,30 +27,6 @@ func (q *Queries) ClearRuntimeWake(ctx context.Context, arg ClearRuntimeWakePara
 	return err
 }
 
-const countRuntimeComputeReservations = `-- name: CountRuntimeComputeReservations :one
-SELECT count(*) FROM runtime_allocations
-WHERE provider_key = $1 AND state <> 'released' AND compute_phase <> 'suspended'
-`
-
-func (q *Queries) CountRuntimeComputeReservations(ctx context.Context, providerKey pgtype.UUID) (int64, error) {
-	row := q.db.QueryRow(ctx, countRuntimeComputeReservations, providerKey)
-	var count int64
-	err := row.Scan(&count)
-	return count, err
-}
-
-const countRuntimeRetainedAllocations = `-- name: CountRuntimeRetainedAllocations :one
-SELECT count(*) FROM runtime_allocations
-WHERE provider_key = $1 AND state <> 'released'
-`
-
-func (q *Queries) CountRuntimeRetainedAllocations(ctx context.Context, providerKey pgtype.UUID) (int64, error) {
-	row := q.db.QueryRow(ctx, countRuntimeRetainedAllocations, providerKey)
-	var count int64
-	err := row.Scan(&count)
-	return count, err
-}
-
 const getRuntimeActivity = `-- name: GetRuntimeActivity :one
 SELECT clock_timestamp()::timestamptz AS observed_at,
     GREATEST(a.compute_activity_at,
diff --git a/services/core/internal/db/sqlc/sandbox_deployment_setup.sql.go b/services/core/internal/db/sqlc/sandbox_deployment_setup.sql.go
index 48cb02cc5..de2ee8d6f 100644
--- a/services/core/internal/db/sqlc/sandbox_deployment_setup.sql.go
+++ b/services/core/internal/db/sqlc/sandbox_deployment_setup.sql.go
@@ -21,7 +21,7 @@ func (q *Queries) AdvanceSandboxOwnerEpoch(ctx context.Context) error {
 }
 
 const claimWebSandboxDeployment = `-- name: ClaimWebSandboxDeployment :exec
-UPDATE runtime_deployment SET installation_id=$1, web_managed=true,
+UPDATE runtime_deployment SET installation_id=$1,
 owner_epoch=owner_epoch+1, updated_at=clock_timestamp() WHERE singleton=true
 `
 
diff --git a/services/core/internal/db/sqlc/sandbox_reset.sql.go b/services/core/internal/db/sqlc/sandbox_reset.sql.go
index 49512c3f6..3791f0e5d 100644
--- a/services/core/internal/db/sqlc/sandbox_reset.sql.go
+++ b/services/core/internal/db/sqlc/sandbox_reset.sql.go
@@ -12,7 +12,7 @@ import (
 )
 
 const cancelSandboxReset = `-- name: CancelSandboxReset :exec
-UPDATE runtime_deployment SET admission_paused = false, reset_clear = NULL,
+UPDATE runtime_deployment SET reset_clear = NULL,
     reset_requested_at = NULL, reset_deadline_at = NULL, reset_forced_at = NULL,
     reset_audit = NULL, updated_at = clock_timestamp()
 WHERE singleton = true
@@ -28,7 +28,7 @@ UPDATE runtime_deployment SET provider_kind = '', backend_fingerprint = '', mode
     specification = '{}', idle_seconds = 0, retention_seconds = 0,
     provider_config = '{}'::jsonb, provider_metadata = '{}'::jsonb, provider_credential = NULL,
     generation = generation + 1, owner_epoch = owner_epoch + 1,
-    admission_paused = false, reset_clear = NULL, reset_requested_at = NULL,
+    reset_clear = NULL, reset_requested_at = NULL,
     reset_deadline_at = NULL, reset_forced_at = NULL, reset_audit = NULL,
     updated_at = clock_timestamp()
 WHERE singleton = true
@@ -51,7 +51,7 @@ func (q *Queries) ForceSandboxReset(ctx context.Context) error {
 }
 
 const getSandboxDeploymentSnapshot = `-- name: GetSandboxDeploymentSnapshot :one
-WITH deployment AS MATERIALIZED (SELECT singleton, installation_id, backend_fingerprint, admission_paused, updated_at, provider_kind, local_node_id, owner_epoch, web_managed, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton = true LIMIT 1),
+WITH deployment AS MATERIALIZED (SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton = true LIMIT 1),
 observed AS MATERIALIZED (SELECT clock_timestamp() AS as_of),
 held AS (
     SELECT a.deployment_generation, a.node_id, s.id AS session_id, e.id AS environment_id, false AS pending,
@@ -89,7 +89,7 @@ held AS (
 ), offline AS (
     SELECT node_id, name, count(*)::bigint AS resources FROM classified WHERE offline GROUP BY node_id, name
 )
-SELECT d.singleton, d.installation_id, d.backend_fingerprint, d.admission_paused, d.updated_at, d.provider_kind, d.local_node_id, d.owner_epoch, d.web_managed, d.idle_seconds, d.retention_seconds, d.generation, d.mode, d.provider_credential, d.specification, d.reset_clear, d.reset_requested_at, d.reset_deadline_at, d.reset_forced_at, d.reset_audit, d.provider_config, d.provider_metadata,
+SELECT d.singleton, d.installation_id, d.backend_fingerprint, d.updated_at, d.provider_kind, d.owner_epoch, d.idle_seconds, d.retention_seconds, d.generation, d.mode, d.provider_credential, d.specification, d.reset_clear, d.reset_requested_at, d.reset_deadline_at, d.reset_forced_at, d.reset_audit, d.provider_config, d.provider_metadata,
     (SELECT count(*) FROM classified WHERE NOT pending)::bigint AS allocations,
     (SELECT count(*) FROM classified WHERE pending)::bigint AS pending,
     jsonb_build_object(
@@ -128,12 +128,9 @@ func (q *Queries) GetSandboxDeploymentSnapshot(ctx context.Context) (GetSandboxD
 		&i.RuntimeDeployment.Singleton,
 		&i.RuntimeDeployment.InstallationID,
 		&i.RuntimeDeployment.BackendFingerprint,
-		&i.RuntimeDeployment.AdmissionPaused,
 		&i.RuntimeDeployment.UpdatedAt,
 		&i.RuntimeDeployment.ProviderKind,
-		&i.RuntimeDeployment.LocalNodeID,
 		&i.RuntimeDeployment.OwnerEpoch,
-		&i.RuntimeDeployment.WebManaged,
 		&i.RuntimeDeployment.IdleSeconds,
 		&i.RuntimeDeployment.RetentionSeconds,
 		&i.RuntimeDeployment.Generation,
@@ -230,7 +227,7 @@ func (q *Queries) SessionBlocksAutoReset(ctx context.Context, sessionID pgtype.U
 
 const startSandboxReset = `-- name: StartSandboxReset :exec
 WITH clock AS MATERIALIZED (SELECT clock_timestamp() AS at)
-UPDATE runtime_deployment SET admission_paused = true, reset_clear = $1,
+UPDATE runtime_deployment SET reset_clear = $1,
     reset_requested_at = clock.at,
     reset_deadline_at = CASE WHEN $1::text = 'auto'
         THEN clock.at + make_interval(secs => $2::int) END,
diff --git a/services/core/internal/deployment/allocations_test.go b/services/core/internal/deployment/allocations_test.go
index cdb44204d..14be17800 100644
--- a/services/core/internal/deployment/allocations_test.go
+++ b/services/core/internal/deployment/allocations_test.go
@@ -322,14 +322,14 @@ func TestReserveAllocationAdmitsAndTakesTheReservedNode(t *testing.T) {
 			findAllocation: func() (Allocation, bool, error) { return Allocation{}, false, nil },
 			lockDeployment: func() (placement.Deployment, error) { return deployment, nil }}
 	}
-	paused := fresh()
-	paused.lockDeployment = func() (placement.Deployment, error) {
+	resetting := fresh()
+	resetting.lockDeployment = func() (placement.Deployment, error) {
 		d := deployment
-		d.AdmissionPaused = true
+		d.Resetting = true
 		return d, nil
 	}
-	if _, err := allocationOperations(t, paused, sessions.LockedSession{}, nil).ReserveAllocation(t.Context(), key, installation, testCredentialHash()); !errors.Is(err, placement.ErrAdmissionClosed) {
-		t.Fatal("paused admission reserved an allocation", err)
+	if _, err := allocationOperations(t, resetting, sessions.LockedSession{}, nil).ReserveAllocation(t.Context(), key, installation, testCredentialHash()); !errors.Is(err, placement.ErrResetAdmission) {
+		t.Fatal("a resetting deployment reserved an allocation", err)
 	}
 	released := fresh()
 	released.loadReserved = func() (placement.Reserved, error) {
diff --git a/services/core/internal/deployment/errors.go b/services/core/internal/deployment/errors.go
index 1875e9716..ff90ef7b4 100644
--- a/services/core/internal/deployment/errors.go
+++ b/services/core/internal/deployment/errors.go
@@ -20,7 +20,6 @@ var (
 	ErrNotConfigured         = errors.New("the sandbox deployment is not configured")
 	ErrNodeInUse             = errors.New("sandbox node retains resources")
 	ErrNodeCredential        = errors.New("invalid sandbox node credential")
-	ErrLocalNodeConfigured   = errors.New("local sandbox node is enabled in deployment configuration")
 	// ErrAllocationConflict rejects an allocation change whose owner no longer
 	// matches the stored allocation, device binding, state or compute revision,
 	// or a replay for another installation.
diff --git a/services/core/internal/deployment/execution.go b/services/core/internal/deployment/execution.go
index 1b69cee68..0c1ef29fa 100644
--- a/services/core/internal/deployment/execution.go
+++ b/services/core/internal/deployment/execution.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"math"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
@@ -41,7 +40,7 @@ func (e *ExecutionOperations) Claim(ctx context.Context, installationID string)
 			return err
 		}
 		if d.InstallationID != "" {
-			if !d.WebManaged || d.InstallationID != id {
+			if d.InstallationID != id {
 				return ErrConflict
 			}
 		} else {
@@ -62,125 +61,19 @@ func (e *ExecutionOperations) Claim(ctx context.Context, installationID string)
 	})
 }
 
-// ConfigureProcess records the deployment process configuration selects,
-// before the Worker starts. AdmissionPaused must be committed for the old
-// installation before any switch. A nil selection never forgets the previous
-// identity or unresolved resources.
-func (e *ExecutionOperations) ConfigureProcess(ctx context.Context, selected *ProcessDeployment) error {
-	var installation string
-	if selected != nil {
-		copy := *selected
-		selected = &copy
-		id, err := parseID(selected.InstallationID)
-		if err != nil {
-			return err
-		}
-		installation = id
-		if !validDigest(selected.BackendFingerprint) {
-			return fmt.Errorf("%w: invalid backend identity fingerprint", ErrInvalidInput)
-		}
-	}
+// RequireUnclaimed lets an execution owner without sandbox runtimes start
+// only on a deployment no installation has claimed.
+func (e *ExecutionOperations) RequireUnclaimed(ctx context.Context) error {
 	return e.storage.WithDeployment(ctx, func(tx DeploymentTx) error {
-		previous, err := tx.LoadDeployment()
+		d, err := tx.LoadDeployment()
 		if err != nil {
 			return err
 		}
-		if previous.WebManaged {
+		if d.InstallationID != "" {
 			return ErrConflict
 		}
-		if selected != nil && previous.InstallationID == installation && previous.BackendFingerprint == selected.BackendFingerprint && (previous.Provider == "" || selected.ProviderKind == previous.Provider) {
-			if err := tx.SetProcessDeployment(installation, selected.BackendFingerprint, selected.AdmissionPaused); err != nil {
-				return err
-			}
-			return e.configureManager(tx, previous, selected, installation)
-		}
-		resources, err := tx.CountResources()
-		if err != nil {
-			return err
-		}
-		if selected == nil {
-			if previous.InstallationID != "" && (resources.Allocations != 0 || resources.Pending != 0) {
-				return fmt.Errorf("cannot disable managed sandbox provider: %d unreleased allocations (instances, retained snapshots, uncertain operations or pending cleanup) and %d pending hosted environments remain", resources.Allocations, resources.Pending)
-			}
-			return nil
-		}
-		if previous.InstallationID == "" {
-			if resources.Allocations != 0 {
-				return fmt.Errorf("cannot adopt sandbox installation: %d existing unreleased allocations (including retained snapshots and pending cleanup) have no verified backend identity", resources.Allocations)
-			}
-		} else {
-			if !previous.AdmissionPaused || !selected.AdmissionPaused {
-				return fmt.Errorf("cannot switch sandbox installation: persist maintenance on the previous installation and keep the new installation in maintenance")
-			}
-			if resources.Allocations != 0 || resources.Pending != 0 {
-				return fmt.Errorf("cannot switch sandbox installation: %d unreleased allocations (instances, retained snapshots, uncertain operations or pending cleanup) and %d pending hosted environments remain", resources.Allocations, resources.Pending)
-			}
-		}
-		if err := tx.SetProcessDeployment(installation, selected.BackendFingerprint, selected.AdmissionPaused); err != nil {
-			return err
-		}
-		return e.configureManager(tx, previous, selected, installation)
-	})
-}
-
-// configureManager records the node provider and the local node process
-// configuration selects.
-func (e *ExecutionOperations) configureManager(tx DeploymentTx, previous Record, selected *ProcessDeployment, installation string) error {
-	if selected.ProviderKind == "" {
 		return nil
-	}
-	isNode, err := e.service.registry.IsNode(selected.ProviderKind)
-	if err != nil {
-		return err
-	}
-	if !isNode {
-		return ErrInvalidInput
-	}
-	if previous.Provider == "" {
-		resources, err := tx.CountResources()
-		if err != nil {
-			return err
-		}
-		if resources.Allocations != 0 || resources.Pending != 0 {
-			return fmt.Errorf("cannot adopt historical sandbox resources: keep the original Core responsible for retained resources and install this release separately")
-		}
-	}
-	var localNode string
-	if selected.LocalNodeID != "" {
-		id, err := parseID(selected.LocalNodeID)
-		if err != nil {
-			return err
-		}
-		localNode = id
-		if previous.LocalNodeID != "" && previous.LocalNodeID != id {
-			resources, err := tx.CountResources()
-			if err != nil {
-				return err
-			}
-			if resources.Allocations != 0 || resources.Pending != 0 || !previous.AdmissionPaused || !selected.AdmissionPaused {
-				return fmt.Errorf("local sandbox node identity changed: restore its original state directory; replacement requires maintenance and no retained resources")
-			}
-		}
-		if !validDigest(selected.LocalCredentialSHA256) {
-			return ErrInvalidInput
-		}
-		if err := validateNode("Local", selected.LocalMaxActive, selected.LocalMaxRetained); err != nil {
-			return err
-		}
-		n, err := tx.LoadNode(id)
-		if errors.Is(err, ErrNotFound) {
-			_, err = tx.InsertNode(NewNode{ID: id, InstallationID: installation, Name: "Local", BackendFingerprint: selected.BackendFingerprint, CredentialDigest: selected.LocalCredentialSHA256, MaxActive: selected.LocalMaxActive, MaxRetained: selected.LocalMaxRetained})
-		} else if err == nil {
-			if n.InstallationID != installation || n.BackendFingerprint != selected.BackendFingerprint || n.CredentialDigest != selected.LocalCredentialSHA256 {
-				return fmt.Errorf("local sandbox node identity does not match the retained backend")
-			}
-			err = tx.UpdateNode(id, NodeLimits{Name: n.Name, MaxActive: selected.LocalMaxActive, MaxRetained: selected.LocalMaxRetained})
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return tx.SetManagerDeployment(selected.ProviderKind, localNode)
+	})
 }
 
 // CheckSetup rejects a stale or reset deployment before provider preparation.
diff --git a/services/core/internal/deployment/fakes_test.go b/services/core/internal/deployment/fakes_test.go
index 526945814..3ccdb1d13 100644
--- a/services/core/internal/deployment/fakes_test.go
+++ b/services/core/internal/deployment/fakes_test.go
@@ -76,29 +76,27 @@ func (f *fakeExecutionStorage) WithDeployment(ctx context.Context, apply func(De
 }
 
 type fakeReader struct {
-	t                        testing.TB
-	deployment               func(context.Context) (Record, error)
-	snapshot                 func(context.Context) (Snapshot, error)
-	ownerEpoch               func(context.Context) (uint64, error)
-	allocation               func(context.Context, sandbox.Reference) (AllocationRecord, error)
-	generations              func(context.Context, int64) ([]GenerationRecord, error)
-	nodes                    func(context.Context) ([]NodeRecord, error)
-	nodeHistory              func(context.Context, string, coremetrics.Range) (NodeRecord, []HostHistoryPoint, error)
-	readNodes                func(context.Context, func(NodeReads) error) error
-	resetSessions            func(context.Context, string, bool) ([]ResetSession, error)
-	addressBindings          func(context.Context, string) (AddressBindings, error)
-	environmentAllocation    func(context.Context, AllocationKey) (Allocation, error)
-	credentialAllocations    func(context.Context, string) ([]Allocation, error)
-	observationSessions      func(context.Context, string, int) (ObservationSessionPage, error)
-	nodeAllocations          func(context.Context, string) ([]NodeAllocation, error)
-	nodeOnline               func(context.Context, string) (bool, error)
-	lifecycleNodes           func(context.Context) ([]string, error)
-	lifecycleAllocations     func(context.Context, string, string) ([]Allocation, error)
-	unallocatedEnvironments  func(context.Context, string, string) ([]UnallocatedEnvironment, error)
-	lifecyclePlacement       func(context.Context, AllocationKey) (LifecyclePlacement, error)
-	activity                 func(context.Context, string) (Activity, error)
-	countComputeReservations func(context.Context, string) (int64, error)
-	countRetainedAllocations func(context.Context, string) (int64, error)
+	t                       testing.TB
+	deployment              func(context.Context) (Record, error)
+	snapshot                func(context.Context) (Snapshot, error)
+	ownerEpoch              func(context.Context) (uint64, error)
+	allocation              func(context.Context, sandbox.Reference) (AllocationRecord, error)
+	generations             func(context.Context, int64) ([]GenerationRecord, error)
+	nodes                   func(context.Context) ([]NodeRecord, error)
+	nodeHistory             func(context.Context, string, coremetrics.Range) (NodeRecord, []HostHistoryPoint, error)
+	readNodes               func(context.Context, func(NodeReads) error) error
+	resetSessions           func(context.Context, string, bool) ([]ResetSession, error)
+	addressBindings         func(context.Context, string) (AddressBindings, error)
+	environmentAllocation   func(context.Context, AllocationKey) (Allocation, error)
+	credentialAllocations   func(context.Context, string) ([]Allocation, error)
+	observationSessions     func(context.Context, string, int) (ObservationSessionPage, error)
+	nodeAllocations         func(context.Context, string) ([]NodeAllocation, error)
+	nodeOnline              func(context.Context, string) (bool, error)
+	lifecycleNodes          func(context.Context) ([]string, error)
+	lifecycleAllocations    func(context.Context, string, string) ([]Allocation, error)
+	unallocatedEnvironments func(context.Context, string, string) ([]UnallocatedEnvironment, error)
+	lifecyclePlacement      func(context.Context, AllocationKey) (LifecyclePlacement, error)
+	activity                func(context.Context, string) (Activity, error)
 }
 
 func (f *fakeReader) Deployment(ctx context.Context) (Record, error) {
@@ -353,11 +351,6 @@ type fakeDeploymentTx struct {
 	loadSnapshot                func() (Snapshot, error)
 	countResources              func() (Resources, error)
 	claimInstallation           func(string) error
-	setProcessDeployment        func(string, string, bool) error
-	setManagerDeployment        func(string, string) error
-	loadNode                    func(string) (StoredNode, error)
-	insertNode                  func(NewNode) (StoredNode, error)
-	updateNode                  func(string, NodeLimits) error
 	saveSelection               func(SelectionRecord) error
 	recordConfigurationMetadata func(json.RawMessage) error
 	retainGeneration            func() error
@@ -399,41 +392,6 @@ func (f *fakeDeploymentTx) ClaimInstallation(installationID string) error {
 	return f.claimInstallation(installationID)
 }
 
-func (f *fakeDeploymentTx) SetProcessDeployment(installationID, backendFingerprint string, admissionPaused bool) error {
-	if f.setProcessDeployment == nil {
-		unexpected(f.t, "SetProcessDeployment")
-	}
-	return f.setProcessDeployment(installationID, backendFingerprint, admissionPaused)
-}
-
-func (f *fakeDeploymentTx) SetManagerDeployment(provider, localNodeID string) error {
-	if f.setManagerDeployment == nil {
-		unexpected(f.t, "SetManagerDeployment")
-	}
-	return f.setManagerDeployment(provider, localNodeID)
-}
-
-func (f *fakeDeploymentTx) LoadNode(id string) (StoredNode, error) {
-	if f.loadNode == nil {
-		unexpected(f.t, "LoadNode")
-	}
-	return f.loadNode(id)
-}
-
-func (f *fakeDeploymentTx) InsertNode(node NewNode) (StoredNode, error) {
-	if f.insertNode == nil {
-		unexpected(f.t, "InsertNode")
-	}
-	return f.insertNode(node)
-}
-
-func (f *fakeDeploymentTx) UpdateNode(id string, limits NodeLimits) error {
-	if f.updateNode == nil {
-		unexpected(f.t, "UpdateNode")
-	}
-	return f.updateNode(id, limits)
-}
-
 func (f *fakeDeploymentTx) SaveSelection(selection SelectionRecord) error {
 	if f.saveSelection == nil {
 		unexpected(f.t, "SaveSelection")
@@ -623,20 +581,6 @@ func (f *fakeReader) Activity(ctx context.Context, allocationID string) (Activit
 	return f.activity(ctx, allocationID)
 }
 
-func (f *fakeReader) CountComputeReservations(ctx context.Context, installationID string) (int64, error) {
-	if f.countComputeReservations == nil {
-		unexpected(f.t, "CountComputeReservations")
-	}
-	return f.countComputeReservations(ctx, installationID)
-}
-
-func (f *fakeReader) CountRetainedAllocations(ctx context.Context, installationID string) (int64, error) {
-	if f.countRetainedAllocations == nil {
-		unexpected(f.t, "CountRetainedAllocations")
-	}
-	return f.countRetainedAllocations(ctx, installationID)
-}
-
 // fakeSessionReader serves the Session reads the observation resolver makes;
 // every other read fails the test.
 type fakeSessionReader struct {
diff --git a/services/core/internal/deployment/nodes.go b/services/core/internal/deployment/nodes.go
index 3f2ab3764..91867c15f 100644
--- a/services/core/internal/deployment/nodes.go
+++ b/services/core/internal/deployment/nodes.go
@@ -133,9 +133,6 @@ func (s *Service) RemoveNode(ctx context.Context, id string) error {
 			if n.Retained != 0 || n.CleanupPending != 0 {
 				return ErrNodeInUse
 			}
-			if d.LocalNodeID == nodeID {
-				return ErrLocalNodeConfigured
-			}
 			return tx.RemoveNode(nodeID)
 		}
 		return ErrNotFound
@@ -165,7 +162,7 @@ func (s *Service) CreateEnrollment(ctx context.Context, capacity Capacity) (Enro
 		if d.Reset != nil {
 			return ErrResetInProgress
 		}
-		if d.Mode != "nodes" || d.AdmissionPaused {
+		if d.Mode != "nodes" {
 			return ErrConflict
 		}
 		if _, err := s.specification(d); err != nil {
@@ -214,7 +211,7 @@ func (s *Service) Enroll(ctx context.Context, token string, input Enrollment) (N
 		if d.Reset != nil {
 			return ErrResetInProgress
 		}
-		if d.Mode != "nodes" || d.AdmissionPaused || input.Provider != d.Provider {
+		if d.Mode != "nodes" || input.Provider != d.Provider {
 			return ErrInvalidInput
 		}
 		spec, err := s.specification(d)
@@ -426,9 +423,6 @@ func (s *Service) NodeConfiguration(ctx context.Context, nodeID, token string, g
 		if err != nil {
 			return err
 		}
-		if node == nil && d.AdmissionPaused {
-			return ErrConflict
-		}
 		limit, err := s.registry.RetainedLimit(d.Provider, active, retained)
 		if err != nil {
 			return err
diff --git a/services/core/internal/deployment/placement/placement.go b/services/core/internal/deployment/placement/placement.go
index 433e6f6b8..9b0c4277a 100644
--- a/services/core/internal/deployment/placement/placement.go
+++ b/services/core/internal/deployment/placement/placement.go
@@ -20,8 +20,7 @@ var (
 	// admission.
 	ErrResetAdmission = errors.New("hosted admission is paused for a sandbox reset")
 	// ErrAdmissionClosed rejects new hosted work that the deployment cannot
-	// admit: paused for maintenance, without a valid specification, or for
-	// another installation.
+	// admit: without a valid specification, or for another installation.
 	ErrAdmissionClosed = errors.New("environment is no longer available")
 	// ErrPublicURLUnreachable rejects selection and admission when the provider
 	// requires a reachable public origin and the installation is loopback.
@@ -67,12 +66,10 @@ func (r *Rules) PublicURL() string { return r.publicURL }
 // Deployment is the deployment as placement reads it, loaded under the
 // deployment lock.
 type Deployment struct {
-	// InstallationID is empty until an installation is claimed or configured.
-	InstallationID  string
-	Provider, Mode  string
-	Generation      uint64
-	WebManaged      bool
-	AdmissionPaused bool
+	// InstallationID is empty until Web setup claims an installation.
+	InstallationID string
+	Provider, Mode string
+	Generation     uint64
 	// Resetting reports a sandbox reset in progress.
 	Resetting     bool
 	Specification json.RawMessage
@@ -139,9 +136,6 @@ func (r *Rules) CheckAdmission(d Deployment, installation string) error {
 	if d.Resetting {
 		return ErrResetAdmission
 	}
-	if d.AdmissionPaused {
-		return fmt.Errorf("%w: sandbox creation is paused for provider maintenance", ErrAdmissionClosed)
-	}
 	if d.Provider != "" {
 		var spec sandbox.DeploymentSpec
 		if json.Unmarshal(d.Specification, &spec) != nil || r.declarations.ValidateSpecification(d.Provider, spec) != nil {
@@ -157,8 +151,8 @@ func (r *Rules) CheckAdmission(d Deployment, installation string) error {
 // DecidePlacement chooses the node a new Session's hosted Environment
 // reserves, or nil when the deployment places no node: in direct mode and
 // without a provider. It prefers the highest ready generation, then the
-// fewest active sandboxes. A Web-managed installation places only on nodes
-// enrolled with its public URL; restores still reach the others.
+// fewest active sandboxes. It places only on nodes enrolled with the public
+// URL; restores still reach the others.
 func (r *Rules) DecidePlacement(d Deployment, nodes []Node) (*Placement, error) {
 	if d.Resetting {
 		return nil, ErrResetAdmission
@@ -171,26 +165,20 @@ func (r *Rules) DecidePlacement(d Deployment, nodes []Node) (*Placement, error)
 		}
 	}
 	if d.Mode == "direct" {
-		if d.AdmissionPaused {
-			return nil, ErrNodeUnavailable
-		}
 		return nil, nil
 	}
 	if d.Provider == "" {
-		if d.WebManaged {
+		if d.InstallationID != "" {
 			return nil, ErrNodeUnavailable
 		}
 		return nil, nil
 	}
-	if d.AdmissionPaused {
-		return nil, ErrNodeUnavailable
-	}
 	var chosen *Node
 	preparing := false
 	for i := range nodes {
 		n := &nodes[i]
 		free := n.Active < int64(n.MaxActive) && n.Retained < int64(n.MaxRetained)
-		reachable := !d.WebManaged || n.CoreURL == r.publicURL
+		reachable := n.CoreURL == r.publicURL
 		if n.Online && n.TargetState == "preparing" && free && reachable {
 			preparing = true
 		}
diff --git a/services/core/internal/deployment/placement/placement_test.go b/services/core/internal/deployment/placement/placement_test.go
index ff7212cde..e60242f4d 100644
--- a/services/core/internal/deployment/placement/placement_test.go
+++ b/services/core/internal/deployment/placement/placement_test.go
@@ -93,11 +93,10 @@ func TestCheckAdmission(t *testing.T) {
 		want         error
 		message      string
 	}{
-		"unclaimed admits everything": {Deployment{Resetting: true, AdmissionPaused: true}, installation, nil, ""},
+		"unclaimed admits everything": {Deployment{Resetting: true}, installation, nil, ""},
 		"admitted":                    {valid, installation, nil, ""},
 		"new Session":                 {valid, "", nil, ""},
-		"reset":                       {with(func(d *Deployment) { d.Resetting, d.AdmissionPaused = true, true }), installation, ErrResetAdmission, "hosted admission is paused for a sandbox reset"},
-		"paused":                      {with(func(d *Deployment) { d.AdmissionPaused = true }), installation, ErrAdmissionClosed, "environment is no longer available: sandbox creation is paused for provider maintenance"},
+		"reset":                       {with(func(d *Deployment) { d.Resetting = true }), installation, ErrResetAdmission, "hosted admission is paused for a sandbox reset"},
 		"malformed specification":     {with(func(d *Deployment) { d.Specification = json.RawMessage(`[`) }), installation, ErrAdmissionClosed, "environment is no longer available: sandbox creation requires a deployment specification"},
 		"rejected specification":      {with(func(d *Deployment) { d.Specification = json.RawMessage(`{"resources":{"cpus":3}}`) }), installation, ErrAdmissionClosed, "environment is no longer available: sandbox creation requires a deployment specification"},
 		"no provider":                 {with(func(d *Deployment) { d.Provider, d.Specification = "", json.RawMessage(`[`) }), installation, nil, ""},
@@ -117,7 +116,7 @@ func TestDecidePlacement(t *testing.T) {
 	ready := func(id string, g uint64, active int64) Node {
 		return Node{ID: id, Online: true, ServingReady: true, ReadyGeneration: generation(g), Active: active, MaxActive: 4, Retained: active, MaxRetained: 4, CoreURL: publicURL}
 	}
-	nodes := Deployment{Provider: "docker", Mode: "nodes", WebManaged: true}
+	nodes := Deployment{InstallationID: "installation", Provider: "docker", Mode: "nodes"}
 	with := func(change func(*Deployment)) Deployment {
 		d := nodes
 		change(&d)
@@ -140,16 +139,13 @@ func TestDecidePlacement(t *testing.T) {
 		"reset":                       {origin(false), publicURL, with(func(d *Deployment) { d.Resetting = true }), nil, nil, ErrResetAdmission},
 		"loopback public origin":      {origin(true), "http://localhost:8091", nodes, []Node{ready("a", 1, 0)}, nil, ErrPublicURLUnreachable},
 		"direct":                      {origin(false), publicURL, with(func(d *Deployment) { d.Mode = "direct" }), nil, nil, nil},
-		"direct paused":               {origin(false), publicURL, with(func(d *Deployment) { d.Mode, d.AdmissionPaused = "direct", true }), nil, nil, ErrNodeUnavailable},
 		"no provider":                 {&fakeDeclarations{t: t}, publicURL, Deployment{}, nil, nil, nil},
-		"no provider on Web":          {&fakeDeclarations{t: t}, publicURL, Deployment{WebManaged: true}, nil, nil, ErrNodeUnavailable},
-		"paused":                      {origin(false), publicURL, with(func(d *Deployment) { d.AdmissionPaused = true }), []Node{ready("a", 1, 0)}, nil, ErrNodeUnavailable},
+		"no provider on Web":          {&fakeDeclarations{t: t}, publicURL, Deployment{InstallationID: "installation"}, nil, nil, ErrNodeUnavailable},
 		"no nodes":                    {origin(false), publicURL, nodes, nil, nil, ErrNodeUnavailable},
 		"only ineligible nodes":       {origin(false), publicURL, nodes, []Node{offline, unready, full, retainedFull, elsewhere, {ID: "never", Online: true, ServingReady: true, MaxActive: 1, MaxRetained: 1, CoreURL: publicURL}}, nil, ErrNodeUnavailable},
 		"preparing":                   {origin(false), publicURL, nodes, []Node{offline, preparing}, nil, ErrNodesPreparing},
 		"highest generation":          {origin(false), publicURL, nodes, []Node{ready("old", 1, 0), ready("new", 2, 3), preparing}, &Placement{NodeID: "new", Generation: 2}, nil},
 		"fewest active":               {origin(false), publicURL, nodes, []Node{ready("busy", 2, 3), ready("idle", 2, 1)}, &Placement{NodeID: "idle", Generation: 2}, nil},
-		"other address off Web":       {origin(false), publicURL, with(func(d *Deployment) { d.WebManaged = false }), []Node{elsewhere}, &Placement{NodeID: "elsewhere", Generation: 9}, nil},
 		"public origin on public URL": {origin(true), publicURL, nodes, []Node{ready("a", 1, 0)}, &Placement{NodeID: "a", Generation: 1}, nil},
 	} {
 		got, err := rules(t, test.declarations, test.url).DecidePlacement(test.d, test.nodes)
diff --git a/services/core/internal/deployment/rules.go b/services/core/internal/deployment/rules.go
index 91717deb0..d4ab12b35 100644
--- a/services/core/internal/deployment/rules.go
+++ b/services/core/internal/deployment/rules.go
@@ -70,7 +70,7 @@ func checkGeneration(d Record, installation string, generation uint64) error {
 	if d.Generation != generation {
 		return &GenerationStaleError{CurrentGeneration: d.Generation}
 	}
-	if !d.WebManaged || d.InstallationID != installation {
+	if d.InstallationID == "" || d.InstallationID != installation {
 		return ErrConflict
 	}
 	return nil
diff --git a/services/core/internal/deployment/rules_test.go b/services/core/internal/deployment/rules_test.go
index ea2926e65..1c4819293 100644
--- a/services/core/internal/deployment/rules_test.go
+++ b/services/core/internal/deployment/rules_test.go
@@ -121,7 +121,7 @@ func TestValidateNode(t *testing.T) {
 
 func TestCheckGeneration(t *testing.T) {
 	installation := uuid.NewString()
-	current := Record{InstallationID: installation, WebManaged: true, Generation: 3}
+	current := Record{InstallationID: installation, Generation: 3}
 	if err := checkGeneration(current, installation, 3); err != nil {
 		t.Fatal(err)
 	}
@@ -129,12 +129,12 @@ func TestCheckGeneration(t *testing.T) {
 	if err := checkGeneration(current, installation, 2); !errors.As(err, &stale) || stale.CurrentGeneration != 3 || !errors.Is(err, ErrConflict) {
 		t.Fatalf("stale generation: %v", err)
 	}
-	process := current
-	process.WebManaged = false
+	unclaimed := current
+	unclaimed.InstallationID = ""
 	for _, c := range []struct {
 		d            Record
 		installation string
-	}{{process, installation}, {current, uuid.NewString()}} {
+	}{{unclaimed, installation}, {current, uuid.NewString()}} {
 		if err := checkGeneration(c.d, c.installation, 3); !errors.Is(err, ErrConflict) || errors.As(err, &stale) {
 			t.Errorf("checkGeneration(%+v, %s) = %v, want a plain conflict", c.d, c.installation, err)
 		}
diff --git a/services/core/internal/deployment/service.go b/services/core/internal/deployment/service.go
index 673a41dac..575f0d79f 100644
--- a/services/core/internal/deployment/service.go
+++ b/services/core/internal/deployment/service.go
@@ -88,10 +88,10 @@ func (s *Service) Setup(ctx context.Context) (Setup, error) {
 }
 
 func (s *Service) setup(d Record) (Setup, error) {
-	if !d.WebManaged {
+	if d.InstallationID == "" {
 		return Setup{}, ErrConflict
 	}
-	result := Setup{InstallationID: d.InstallationID, Provider: d.Provider, BackendFingerprint: d.BackendFingerprint, Generation: d.Generation, Mode: d.Mode, AdmissionPaused: d.AdmissionPaused}
+	result := Setup{InstallationID: d.InstallationID, Provider: d.Provider, BackendFingerprint: d.BackendFingerprint, Generation: d.Generation, Mode: d.Mode}
 	if err := json.Unmarshal(d.Specification, &result.Specification); err != nil {
 		return Setup{}, err
 	}
diff --git a/services/core/internal/deployment/service_test.go b/services/core/internal/deployment/service_test.go
index 9fc5964aa..e3554720f 100644
--- a/services/core/internal/deployment/service_test.go
+++ b/services/core/internal/deployment/service_test.go
@@ -71,7 +71,7 @@ func webDeployment(t *testing.T, installation, provider string, generation uint6
 	if err != nil {
 		t.Fatal(err)
 	}
-	return Record{InstallationID: installation, WebManaged: true, Provider: provider, Generation: generation, Mode: "nodes", Specification: specification,
+	return Record{InstallationID: installation, Provider: provider, Generation: generation, Mode: "nodes", Specification: specification,
 		Configuration: sandbox.ConfigurationRecord{Public: json.RawMessage(`{}`), Metadata: json.RawMessage(`{}`)}}
 }
 
@@ -178,15 +178,6 @@ func TestRegistryLookupFailuresPropagate(t *testing.T) {
 	if _, err := service.ListNodes(t.Context()); !errors.Is(err, providers.ErrUnknownProvider) {
 		t.Errorf("ListNodes = %v", err)
 	}
-	tx := &fakeDeploymentTx{t: t,
-		loadDeployment:       func() (Record, error) { return Record{}, nil },
-		countResources:       func() (Resources, error) { return Resources{}, nil },
-		setProcessDeployment: func(string, string, bool) error { return nil },
-	}
-	process := &ProcessDeployment{ProviderKind: "retired", InstallationID: uuid.NewString(), BackendFingerprint: strings.Repeat("b", 64)}
-	if err := operations(t, testPublicURL, tx).ConfigureProcess(t.Context(), process); !errors.Is(err, providers.ErrUnknownProvider) {
-		t.Errorf("ConfigureProcess = %v", err)
-	}
 }
 
 // Setup carries the mode and operations the provider declares. A stored
@@ -280,8 +271,6 @@ func TestEnrollChecksTheTokenBeforeTheDeployment(t *testing.T) {
 	receipt := EnrollmentRecord{ID: uuid.NewString(), InstallationID: installation, ExpiresAt: time.Now().Add(10 * time.Minute), MaxActive: 1, MaxRetained: 1}
 	resetting := current
 	resetting.Reset = &ResetState{Clear: "sandboxes", RequestedAt: time.Now()}
-	paused := current
-	paused.AdmissionPaused = true
 	unselected := current
 	unselected.Provider = ""
 	consumed, expired, foreign := receipt, receipt, receipt
@@ -303,12 +292,11 @@ func TestEnrollChecksTheTokenBeforeTheDeployment(t *testing.T) {
 	}{
 		{"unknown token while resetting", resetting, EnrollmentRecord{}, ErrNotFound, valid, ErrNodeCredential},
 		{"consumed token before setup", Record{}, consumed, nil, valid, ErrNodeCredential},
-		{"expired token while paused", paused, expired, nil, valid, ErrNodeCredential},
+		{"expired token while resetting", resetting, expired, nil, valid, ErrNodeCredential},
 		{"token of another installation while resetting", resetting, foreign, nil, valid, ErrNodeCredential},
 		{"token store failure", current, EnrollmentRecord{}, errors.New("database down"), valid, placement.ErrNodeUnavailable},
 		{"no provider selected", unselected, receipt, nil, valid, placement.ErrNodeUnavailable},
 		{"reset in progress", resetting, receipt, nil, valid, ErrResetInProgress},
-		{"admission paused", paused, receipt, nil, valid, ErrInvalidInput},
 		{"stale generation", current, receipt, nil, stale, ErrSpecificationMismatch},
 		// The token stays unused: the fake allows no insert or consumption.
 		{"another Core address", current, receipt, nil, elsewhere, ErrNodeAddressMismatch},
diff --git a/services/core/internal/deployment/session_archive.go b/services/core/internal/deployment/session_archive.go
index d2b2578fd..eb33b012d 100644
--- a/services/core/internal/deployment/session_archive.go
+++ b/services/core/internal/deployment/session_archive.go
@@ -119,13 +119,13 @@ func (e *ExecutionOperations) archiveSession(ctx context.Context, tenantID, sess
 }
 
 // checkArchiveDeployment rejects an archive against a deployment whose
-// generation is not the expected one, that Web does not manage or that has no
+// generation is not the expected one, that has no installation or that has no
 // provider.
 func checkArchiveDeployment(d Record, expectedGeneration uint64) error {
 	if d.Generation != expectedGeneration {
 		return &GenerationStaleError{CurrentGeneration: d.Generation}
 	}
-	if !d.WebManaged || d.InstallationID == "" {
+	if d.InstallationID == "" {
 		return ErrConflict
 	}
 	if d.Provider == "" {
diff --git a/services/core/internal/deployment/session_archive_test.go b/services/core/internal/deployment/session_archive_test.go
index 3ebbd7cdb..2db8c361c 100644
--- a/services/core/internal/deployment/session_archive_test.go
+++ b/services/core/internal/deployment/session_archive_test.go
@@ -14,14 +14,13 @@ import (
 )
 
 func TestCheckArchiveDeployment(t *testing.T) {
-	managed := Record{InstallationID: "installation", WebManaged: true, Provider: "docker", Generation: 4}
+	managed := Record{InstallationID: "installation", Provider: "docker", Generation: 4}
 	for name, test := range map[string]struct {
 		change func(*Record)
 		want   error
 	}{
 		"current":          {func(*Record) {}, nil},
-		"stale generation": {func(d *Record) { d.Generation = 5; d.WebManaged = false }, &GenerationStaleError{CurrentGeneration: 5}},
-		"process managed":  {func(d *Record) { d.WebManaged = false; d.Provider = "" }, ErrConflict},
+		"stale generation": {func(d *Record) { d.Generation = 5; d.InstallationID = "" }, &GenerationStaleError{CurrentGeneration: 5}},
 		"no installation":  {func(d *Record) { d.InstallationID = "" }, ErrConflict},
 		"no provider":      {func(d *Record) { d.Provider = "" }, ErrNotConfigured},
 	} {
@@ -225,7 +224,7 @@ func archiveOperations(t *testing.T, tx *fakeArchiveTx, locked sessions.LockedSe
 }
 
 func TestArchiveSession(t *testing.T) {
-	managed := Record{InstallationID: "installation", WebManaged: true, Provider: "docker", Generation: 1}
+	managed := Record{InstallationID: "installation", Provider: "docker", Generation: 1}
 	hosted := &sessions.Environment{ID: "environment", Status: "connected", Configuration: json.RawMessage(`{"type":"openai_hosted"}`)}
 	expired := &sessions.Environment{ID: "environment", Status: "expired", Configuration: hosted.Configuration}
 	live := &Allocation{ID: "allocation", DeviceID: "device", ProviderKey: "installation", State: "running"}
@@ -281,7 +280,7 @@ func TestArchiveSession(t *testing.T) {
 func TestArchiveResetSession(t *testing.T) {
 	requested := time.Unix(100, 0)
 	resetting := func(clear string) Record {
-		return Record{InstallationID: "installation", WebManaged: true, Provider: "docker", Generation: 1, Reset: &ResetState{Clear: clear, RequestedAt: requested}}
+		return Record{InstallationID: "installation", Provider: "docker", Generation: 1, Reset: &ResetState{Clear: clear, RequestedAt: requested}}
 	}
 	hosted := &sessions.Environment{ID: "environment", Status: "connected", Configuration: json.RawMessage(`{"type":"openai_hosted"}`)}
 	failed := &sessions.Environment{ID: "environment", Status: "failed", Configuration: hosted.Configuration}
diff --git a/services/core/internal/deployment/setup.go b/services/core/internal/deployment/setup.go
index e40852e6c..2f17624b0 100644
--- a/services/core/internal/deployment/setup.go
+++ b/services/core/internal/deployment/setup.go
@@ -16,8 +16,7 @@ type Setup struct {
 	Generation                                   uint64
 	// Mode is where the provider runs: "nodes" for enrolled sandbox nodes and
 	// "direct" for a provider Core calls itself.
-	Mode            string
-	AdmissionPaused bool
+	Mode string
 	// Operations is the provider's declared operation support, which the node
 	// transport proxies.
 	Operations    providercontract.Operations
@@ -35,19 +34,6 @@ func (s Setup) selection() sandbox.Selection {
 	return sandbox.Selection{Provider: s.Provider, DeploymentSpec: s.Specification, Configuration: s.Configuration}
 }
 
-// ProcessDeployment is a deployment selected by process configuration instead of
-// Web setup. Its fingerprint describes the backend namespace, never credentials
-// or image contents.
-type ProcessDeployment struct {
-	ProviderKind                     string
-	LocalNodeID                      string
-	LocalCredentialSHA256            string
-	LocalMaxActive, LocalMaxRetained int
-	InstallationID                   string
-	BackendFingerprint               string
-	AdmissionPaused                  bool
-}
-
 // configurationJSON reports an absent configuration object as {}.
 func configurationJSON(raw json.RawMessage) json.RawMessage {
 	if len(raw) == 0 {
diff --git a/services/core/internal/deployment/storage.go b/services/core/internal/deployment/storage.go
index 20cff0768..e3b9dc761 100644
--- a/services/core/internal/deployment/storage.go
+++ b/services/core/internal/deployment/storage.go
@@ -249,12 +249,6 @@ type Reader interface {
 	// Activity returns the allocation's activity; a missing allocation is
 	// ErrNotFound.
 	Activity(ctx context.Context, allocationID string) (Activity, error)
-	// CountComputeReservations counts the installation's allocations that
-	// reserve active compute.
-	CountComputeReservations(ctx context.Context, installationID string) (int64, error)
-	// CountRetainedAllocations counts the installation's allocations that
-	// retain resources.
-	CountRetainedAllocations(ctx context.Context, installationID string) (int64, error)
 }
 
 // NodeReads loads node authentication facts.
@@ -306,13 +300,6 @@ type DeploymentTx interface {
 	// ClaimInstallation reserves the installation for Web setup and fences the
 	// previous owner epoch's node presence.
 	ClaimInstallation(installationID string) error
-	SetProcessDeployment(installationID, backendFingerprint string, admissionPaused bool) error
-	// SetManagerDeployment records the node provider and the local node, which
-	// is empty when there is none.
-	SetManagerDeployment(provider, localNodeID string) error
-	LoadNode(id string) (StoredNode, error)
-	InsertNode(node NewNode) (StoredNode, error)
-	UpdateNode(id string, limits NodeLimits) error
 	// SaveSelection stores the next generation. It seals a secret bound to the
 	// installation and generation; without a key it returns
 	// credentialcrypto.ErrUnavailable.
@@ -348,16 +335,13 @@ type DeploymentTx interface {
 
 // Record is the stored deployment.
 type Record struct {
-	// InstallationID is empty until an installation is claimed or configured.
+	// InstallationID is empty until Web setup claims an installation.
 	InstallationID     string
-	WebManaged         bool
 	Provider           string
 	BackendFingerprint string
 	Generation         uint64
 	OwnerEpoch         uint64
 	Mode               string
-	AdmissionPaused    bool
-	LocalNodeID        string
 	IdleSeconds        int64
 	RetentionSeconds   int64
 	// Specification is the stored specification document.
diff --git a/services/core/internal/execution/deployment_fixture_test.go b/services/core/internal/execution/deployment_fixture_test.go
index 94bacf49e..6562e189a 100644
--- a/services/core/internal/execution/deployment_fixture_test.go
+++ b/services/core/internal/execution/deployment_fixture_test.go
@@ -52,6 +52,15 @@ func unitDeploymentService(t *testing.T) *deployment.Service {
 	return service
 }
 
+// unusedPreparation is the preparer of a test that submits no sandbox
+// selection; preparing one fails the test.
+func unusedPreparation(t *testing.T) RuntimeDeploymentPreparer {
+	return func(context.Context, deployment.Setup) (PreparedRuntimeDeployment, error) {
+		t.Error("the test prepared a sandbox selection it did not submit")
+		return PreparedRuntimeDeployment{}, errors.New("unexpected sandbox selection preparation")
+	}
+}
+
 // deploymentOperations builds the deployment service on storage and reader and
 // the execution operations on execution.
 func deploymentOperations(t *testing.T, storage deployment.Storage, reader deployment.Reader, execution deployment.ExecutionStorage) (*deployment.Service, *deployment.ExecutionOperations) {
@@ -132,29 +141,27 @@ func (s *strictExecutionStorage) WithDeployment(ctx context.Context, apply func(
 
 // strictDeploymentReader runs each set func; any other call fails the test.
 type strictDeploymentReader struct {
-	t                        *testing.T
-	deployment               func(context.Context) (deployment.Record, error)
-	snapshot                 func(context.Context) (deployment.Snapshot, error)
-	ownerEpoch               func(context.Context) (uint64, error)
-	allocation               func(context.Context, sandbox.Reference) (deployment.AllocationRecord, error)
-	generations              func(context.Context, int64) ([]deployment.GenerationRecord, error)
-	nodes                    func(context.Context) ([]deployment.NodeRecord, error)
-	nodeHistory              func(context.Context, string, coremetrics.Range) (deployment.NodeRecord, []deployment.HostHistoryPoint, error)
-	readNodes                func(context.Context, func(deployment.NodeReads) error) error
-	resetSessions            func(context.Context, string, bool) ([]deployment.ResetSession, error)
-	addressBindings          func(context.Context, string) (deployment.AddressBindings, error)
-	environmentAllocation    func(context.Context, deployment.AllocationKey) (deployment.Allocation, error)
-	credentialAllocations    func(context.Context, string) ([]deployment.Allocation, error)
-	observationSessions      func(context.Context, string, int) (deployment.ObservationSessionPage, error)
-	nodeAllocations          func(context.Context, string) ([]deployment.NodeAllocation, error)
-	nodeOnline               func(context.Context, string) (bool, error)
-	lifecycleNodes           func(context.Context) ([]string, error)
-	lifecycleAllocations     func(context.Context, string, string) ([]deployment.Allocation, error)
-	unallocatedEnvironments  func(context.Context, string, string) ([]deployment.UnallocatedEnvironment, error)
-	lifecyclePlacement       func(context.Context, deployment.AllocationKey) (deployment.LifecyclePlacement, error)
-	activity                 func(context.Context, string) (deployment.Activity, error)
-	countComputeReservations func(context.Context, string) (int64, error)
-	countRetainedAllocations func(context.Context, string) (int64, error)
+	t                       *testing.T
+	deployment              func(context.Context) (deployment.Record, error)
+	snapshot                func(context.Context) (deployment.Snapshot, error)
+	ownerEpoch              func(context.Context) (uint64, error)
+	allocation              func(context.Context, sandbox.Reference) (deployment.AllocationRecord, error)
+	generations             func(context.Context, int64) ([]deployment.GenerationRecord, error)
+	nodes                   func(context.Context) ([]deployment.NodeRecord, error)
+	nodeHistory             func(context.Context, string, coremetrics.Range) (deployment.NodeRecord, []deployment.HostHistoryPoint, error)
+	readNodes               func(context.Context, func(deployment.NodeReads) error) error
+	resetSessions           func(context.Context, string, bool) ([]deployment.ResetSession, error)
+	addressBindings         func(context.Context, string) (deployment.AddressBindings, error)
+	environmentAllocation   func(context.Context, deployment.AllocationKey) (deployment.Allocation, error)
+	credentialAllocations   func(context.Context, string) ([]deployment.Allocation, error)
+	observationSessions     func(context.Context, string, int) (deployment.ObservationSessionPage, error)
+	nodeAllocations         func(context.Context, string) ([]deployment.NodeAllocation, error)
+	nodeOnline              func(context.Context, string) (bool, error)
+	lifecycleNodes          func(context.Context) ([]string, error)
+	lifecycleAllocations    func(context.Context, string, string) ([]deployment.Allocation, error)
+	unallocatedEnvironments func(context.Context, string, string) ([]deployment.UnallocatedEnvironment, error)
+	lifecyclePlacement      func(context.Context, deployment.AllocationKey) (deployment.LifecyclePlacement, error)
+	activity                func(context.Context, string) (deployment.Activity, error)
 }
 
 func (r *strictDeploymentReader) Deployment(ctx context.Context) (deployment.Record, error) {
@@ -335,17 +342,3 @@ func (r *strictDeploymentReader) Activity(ctx context.Context, allocationID stri
 	}
 	return r.activity(ctx, allocationID)
 }
-
-func (r *strictDeploymentReader) CountComputeReservations(ctx context.Context, installationID string) (int64, error) {
-	if r.countComputeReservations == nil {
-		return 0, unexpectedDeploymentCall(r.t, "CountComputeReservations")
-	}
-	return r.countComputeReservations(ctx, installationID)
-}
-
-func (r *strictDeploymentReader) CountRetainedAllocations(ctx context.Context, installationID string) (int64, error) {
-	if r.countRetainedAllocations == nil {
-		return 0, unexpectedDeploymentCall(r.t, "CountRetainedAllocations")
-	}
-	return r.countRetainedAllocations(ctx, installationID)
-}
diff --git a/services/core/internal/execution/owner_test.go b/services/core/internal/execution/owner_test.go
index 57d676ee9..9da8bdb4b 100644
--- a/services/core/internal/execution/owner_test.go
+++ b/services/core/internal/execution/owner_test.go
@@ -134,7 +134,7 @@ func TestStartWorkerFailureClosesLeaseOnce(t *testing.T) {
 			lease.inner = owner.Lease
 			id := uuid.NewString()
 			service, reader := unusedSessions(t)
-			dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil })}
+			dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t))}
 			_, err := StartWorker(canceled, dispatcher, Owner{Lease: lease, Deployment: owner.Deployment, Sessions: owner.Sessions})
 			if ping := owner.Lease.CheckOwnership(t.Context()); !errors.Is(ping, pgunit.ErrLeaseClosed) {
 				t.Error("failed start kept the database lease", ping)
@@ -193,7 +193,7 @@ func TestWorkerRunClosesLeaseAfterDrain(t *testing.T) {
 	id := uuid.NewString()
 	// The Worker's first reconciliation scans the Session work.
 	reader, service := testSessions(t, pool, nil)
-	dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil })}
+	dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t))}
 	worker, err := StartWorker(t.Context(), dispatcher, Owner{Lease: lease, Deployment: owner.Deployment, Sessions: owner.Sessions})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/execution/runtime_compute.go b/services/core/internal/execution/runtime_compute.go
index 7d08a1b33..b093ab975 100644
--- a/services/core/internal/execution/runtime_compute.go
+++ b/services/core/internal/execution/runtime_compute.go
@@ -12,13 +12,11 @@ import (
 	"github.com/google/uuid"
 )
 
-// RuntimeSuspensionPolicy applies only to an explicitly qualified single-host
-// provider. Fixed guest sizing plus MaxActive bounds reserved CPU and memory.
+// RuntimeSuspensionPolicy is the idle suspension policy of a provider that
+// suspends sandboxes.
 type RuntimeSuspensionPolicy struct {
 	IdleTimeout time.Duration
 	Retention   time.Duration
-	MaxActive   int
-	MaxRetained int
 }
 
 type runtimeCompute struct {
@@ -30,23 +28,6 @@ type runtimeCompute struct {
 	Rollback  bool                      `json:"rollback,omitempty"`
 }
 
-func (r *runtimeLifecycle) computeCapacity(ctx context.Context, key string) error {
-	policy := r.config.Suspension
-	if key != r.config.InstallationID {
-		return sandbox.ErrOwnership
-	}
-	if policy == nil {
-		return nil
-	}
-	count, err := r.reader.CountComputeReservations(ctx, key)
-	if err != nil {
-		return err
-	}
-	if count >= int64(policy.MaxActive) {
-		return ErrExecutionUnavailable
-	}
-	return nil
-}
 func (r *runtimeLifecycle) saveCompute(ctx context.Context, owner deployment.Allocation, phase string, state runtimeCompute, until *time.Time) (deployment.Allocation, error) {
 	raw, err := json.Marshal(state)
 	if err != nil {
@@ -230,9 +211,6 @@ func (r *runtimeLifecycle) restoreIdleCompute(ctx context.Context, p sandbox.Che
 	if !activity.Busy && !activity.WakeRequested {
 		return nil
 	}
-	if err := r.computeCapacityForAllocation(ctx, owner); err != nil {
-		return err
-	}
 	if state.Snapshot == nil || state.Target != nil {
 		return sandbox.ErrOwnership
 	}
@@ -274,11 +252,3 @@ func ignoreComputeAbsent(err error) error {
 	}
 	return err
 }
-
-// Node-backed restores reserve capacity atomically in SetCompute.
-func (r *runtimeLifecycle) computeCapacityForAllocation(ctx context.Context, owner deployment.Allocation) error {
-	if owner.NodeID != "" {
-		return nil
-	}
-	return r.computeCapacity(ctx, owner.ProviderKey)
-}
diff --git a/services/core/internal/execution/runtime_lifecycle.go b/services/core/internal/execution/runtime_lifecycle.go
index d6ca1b27c..5e275b09e 100644
--- a/services/core/internal/execution/runtime_lifecycle.go
+++ b/services/core/internal/execution/runtime_lifecycle.go
@@ -23,21 +23,17 @@ import (
 // BackendFingerprint identifies its namespace independently of mutable sizing.
 type RuntimeProvider struct {
 	// PublishUnconfigured updates the shared observation cache after reset commit.
-	PublishUnconfigured              func(uint64)
-	Generation                       uint64
-	Mode                             string
-	loadDeployment                   func(context.Context) (*RuntimeProvider, error)
-	prepareDeployment                RuntimeDeploymentPreparer
-	ProviderKind                     string
-	LocalNodeID                      string
-	LocalCredentialSHA256            string
-	LocalMaxActive, LocalMaxRetained int
-	CoreURL                          string
-	InstallationID                   string
-	BackendFingerprint               string
-	Provider                         sandbox.SandboxProvider
-	AdmissionPaused                  bool
-	Suspension                       *RuntimeSuspensionPolicy
+	PublishUnconfigured func(uint64)
+	Generation          uint64
+	Mode                string
+	loadDeployment      func(context.Context) (*RuntimeProvider, error)
+	prepareDeployment   RuntimeDeploymentPreparer
+	ProviderKind        string
+	CoreURL             string
+	InstallationID      string
+	BackendFingerprint  string
+	Provider            sandbox.SandboxProvider
+	Suspension          *RuntimeSuspensionPolicy
 }
 
 type runtimeLifecycle struct {
@@ -67,21 +63,12 @@ func newRuntimeManager(owner Owner, deployments *deployment.Service, deploymentR
 	if config == nil {
 		return nil, nil
 	}
-	var copied RuntimeProvider
-	if config.loadDeployment != nil {
-		id, err := uuid.Parse(config.InstallationID)
-		if err != nil || id == uuid.Nil || id.String() != config.InstallationID || registry == nil {
-			return nil, sandbox.ErrInvalid
-		}
-	} else {
-		var err error
-		copied, err = validatedRuntimeProvider(config, registry)
-		if err != nil {
-			return nil, err
-		}
+	id, err := uuid.Parse(config.InstallationID)
+	if err != nil || id == uuid.Nil || id.String() != config.InstallationID || config.loadDeployment == nil || config.prepareDeployment == nil || registry == nil {
+		return nil, sandbox.ErrInvalid
 	}
 	ctx, stop := context.WithCancel(context.Background())
-	return &runtimeManager{sessions: sessionReader, sessionExecution: owner.Sessions, deployment: owner.Deployment, deploymentService: deployments, deploymentReader: deploymentReader, lease: owner.Lease, registry: registry, config: copied, setupInstallationID: config.InstallationID, loadDeployment: config.loadDeployment, prepareDeployment: config.prepareDeployment, publishUnconfigured: config.PublishUnconfigured, setupGate: make(chan struct{}, 1), mutationGate: make(chan struct{}, 1), ctx: ctx, cancel: stop, nodes: make(map[string]*runtimeNode), failed: make(chan error, 1), inventory: make(chan struct{}, 1)}, nil
+	return &runtimeManager{sessions: sessionReader, sessionExecution: owner.Sessions, deployment: owner.Deployment, deploymentService: deployments, deploymentReader: deploymentReader, lease: owner.Lease, registry: registry, setupInstallationID: config.InstallationID, loadDeployment: config.loadDeployment, prepareDeployment: config.prepareDeployment, publishUnconfigured: config.PublishUnconfigured, setupGate: make(chan struct{}, 1), mutationGate: make(chan struct{}, 1), ctx: ctx, cancel: stop, nodes: make(map[string]*runtimeNode), failed: make(chan error, 1), inventory: make(chan struct{}, 1)}, nil
 }
 
 func validatedRuntimeProvider(config *RuntimeProvider, registry *runtimegateway.Registry) (RuntimeProvider, error) {
@@ -98,18 +85,15 @@ func validatedRuntimeProvider(config *RuntimeProvider, registry *runtimegateway.
 		return RuntimeProvider{}, err
 	}
 	copied := *config
-	if copied.Mode == "" && copied.ProviderKind != "" {
-		copied.Mode = "nodes"
-	}
-	if copied.Mode != "" && copied.Mode != "nodes" && copied.Mode != "direct" {
+	if copied.ProviderKind == "" || (copied.Mode != "nodes" && copied.Mode != "direct") {
 		return RuntimeProvider{}, sandbox.ErrInvalid
 	}
-	if copied.Mode == "direct" && (copied.ProviderKind == "" || copied.LocalNodeID != "" || copied.Suspension != nil) {
+	if copied.Mode == "direct" && copied.Suspension != nil {
 		return RuntimeProvider{}, sandbox.ErrInvalid
 	}
 	if config.Suspension != nil {
 		policy := *config.Suspension
-		if !sandbox.SupportsCheckpoint(config.Provider) || policy.IdleTimeout < time.Second || policy.Retention < time.Second || policy.MaxActive < 1 || policy.MaxRetained < policy.MaxActive {
+		if !sandbox.SupportsCheckpoint(config.Provider) || policy.IdleTimeout < time.Second || policy.Retention < time.Second {
 			return RuntimeProvider{}, sandbox.ErrInvalid
 		}
 		copied.Suspension = &policy
@@ -187,25 +171,6 @@ func (r *runtimeLifecycle) provision(ctx context.Context, tenant, environment, p
 		return deployment.Allocation{}, sandbox.ErrInvalid
 	}
 	key := deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment}
-	if _, err := r.reader.EnvironmentAllocation(ctx, key); errors.Is(err, deployment.ErrNotFound) {
-		if r.config.AdmissionPaused && r.config.Generation == 0 {
-			return deployment.Allocation{}, ErrExecutionUnavailable
-		}
-		if err := r.computeFreshCapacity(ctx, providerKey); err != nil {
-			return deployment.Allocation{}, err
-		}
-		if policy := r.config.Suspension; policy != nil && r.config.ProviderKind == "" {
-			count, err := r.reader.CountRetainedAllocations(ctx, providerKey)
-			if err != nil {
-				return deployment.Allocation{}, err
-			}
-			if count >= int64(policy.MaxRetained) {
-				return deployment.Allocation{}, ErrExecutionUnavailable
-			}
-		}
-	} else if err != nil {
-		return deployment.Allocation{}, err
-	}
 	secret := make([]byte, 32)
 	if _, err := rand.Read(secret); err != nil {
 		return deployment.Allocation{}, err
@@ -435,11 +400,3 @@ func runtimeReference(owner deployment.Allocation) sandbox.Reference {
 func (w *Worker) runManagedRuntimes(ctx context.Context) error {
 	return w.runtimes.run(ctx)
 }
-
-// Manager deployments reserve capacity with Session placement before provisioning.
-func (r *runtimeLifecycle) computeFreshCapacity(ctx context.Context, key string) error {
-	if r.config.ProviderKind != "" {
-		return nil
-	}
-	return r.computeCapacity(ctx, key)
-}
diff --git a/services/core/internal/execution/runtime_manager.go b/services/core/internal/execution/runtime_manager.go
index 24f0ec8cb..d7d1af2b2 100644
--- a/services/core/internal/execution/runtime_manager.go
+++ b/services/core/internal/execution/runtime_manager.go
@@ -79,7 +79,7 @@ func (m *runtimeManager) node(id string) (*runtimeNode, error) {
 		m.mu.Unlock()
 		return nil, errRuntimeTransition
 	}
-	if m.closed || (m.loadDeployment != nil && m.config.Provider == nil) || (id == "") != (m.config.ProviderKind == "" || m.config.Mode == "direct") {
+	if m.closed || m.config.Provider == nil || (id == "") != (m.config.Mode == "direct") {
 		m.mu.Unlock()
 		return nil, ErrExecutionUnavailable
 	}
@@ -241,10 +241,8 @@ func (m *runtimeManager) run(ctx context.Context) error {
 	}
 	m.running = true
 	m.mu.Unlock()
-	if m.loadDeployment != nil {
-		if err := m.deployment.CollectGenerations(ctx); err != nil {
-			return err
-		}
+	if err := m.deployment.CollectGenerations(ctx); err != nil {
+		return err
 	}
 	if err := m.resetStep(ctx); err != nil {
 		return err
@@ -263,10 +261,8 @@ func (m *runtimeManager) run(ctx context.Context) error {
 		case err := <-m.failed:
 			return err
 		case <-ticker.C:
-			if m.loadDeployment != nil {
-				if err := m.deployment.CollectGenerations(ctx); err != nil {
-					return err
-				}
+			if err := m.deployment.CollectGenerations(ctx); err != nil {
+				return err
 			}
 			if err := m.resetStep(ctx); err != nil {
 				return err
diff --git a/services/core/internal/execution/runtime_manager_test.go b/services/core/internal/execution/runtime_manager_test.go
index bce4dc075..a01528e43 100644
--- a/services/core/internal/execution/runtime_manager_test.go
+++ b/services/core/internal/execution/runtime_manager_test.go
@@ -19,10 +19,11 @@ func (heldLease) CancelOperations(_ context.Context, cancel context.CancelFunc)
 }
 func (heldLease) Close(context.Context) error { return nil }
 
+// testRuntimeManager models an already loaded node deployment.
 func testRuntimeManager(t *testing.T) *runtimeManager {
 	t.Helper()
 	ctx, cancel := context.WithCancel(t.Context())
-	m := &runtimeManager{lease: heldLease{}, config: RuntimeProvider{ProviderKind: "docker"}, ctx: ctx, cancel: cancel, nodes: make(map[string]*runtimeNode), failed: make(chan error, 1), inventory: make(chan struct{}, 1)}
+	m := &runtimeManager{lease: heldLease{}, config: RuntimeProvider{ProviderKind: "docker", Mode: "nodes", Provider: &drainFixtureProvider{}}, loadDeployment: func(context.Context) (*RuntimeProvider, error) { return nil, nil }, ctx: ctx, cancel: cancel, nodes: make(map[string]*runtimeNode), failed: make(chan error, 1), inventory: make(chan struct{}, 1)}
 	t.Cleanup(func() { m.stop(); m.drain() })
 	return m
 }
diff --git a/services/core/internal/execution/runtime_pending.go b/services/core/internal/execution/runtime_pending.go
index 254b33877..cee0c94a3 100644
--- a/services/core/internal/execution/runtime_pending.go
+++ b/services/core/internal/execution/runtime_pending.go
@@ -10,9 +10,6 @@ import (
 // provisionPending shares the existing lifecycle owner and serial gate. This
 // also recovers idle Session creation interrupted after its database commit.
 func (r *runtimeLifecycle) provisionPending(ctx context.Context) error {
-	if r.config.AdmissionPaused && r.config.Generation == 0 {
-		return nil
-	}
 	rows, err := r.reader.UnallocatedEnvironments(ctx, r.nodeID, r.pendingCursor)
 	if err != nil {
 		return err
diff --git a/services/core/internal/execution/runtime_retirement_failure_test.go b/services/core/internal/execution/runtime_retirement_failure_test.go
index f5e8e69b0..ed2b63489 100644
--- a/services/core/internal/execution/runtime_retirement_failure_test.go
+++ b/services/core/internal/execution/runtime_retirement_failure_test.go
@@ -32,11 +32,7 @@ func TestFailedInventoryRetirementClosesAdmissionAndRetainsGate(t *testing.T) {
 			owner, _, _, pool := delayedReadWriter(t, &armed, reading, releaseRead)
 			m := testRuntimeManager(t)
 			m.lease = owner.Lease
-			m.loadDeployment = func(context.Context) (*RuntimeProvider, error) { return nil, nil }
 			m.mutationGate = make(chan struct{}, 1)
-			// This fixture models an already loaded node deployment; its provider is
-			// needed only for node admission, not for external sandbox operations.
-			m.config.Provider = &drainFixtureProvider{}
 			original, err := m.node("retiring")
 			if err != nil {
 				t.Fatal(err)
@@ -160,7 +156,8 @@ func TestFailedInventoryRetirementClosesAdmissionAndRetainsGate(t *testing.T) {
 	}
 }
 
-// No provider method is called by the retirement ownership fixture.
+// No provider method is called by the runtime manager fixtures; the provider is
+// needed only for node admission.
 type drainFixtureProvider struct{ sandbox.SandboxProvider }
 
 // Done is evaluated only after lockMutation's initial admission check, letting
@@ -178,7 +175,6 @@ func (c *mutationWaitContext) Done() <-chan struct{} {
 
 func TestFailedManagerRejectsAlreadyWaitingMutation(t *testing.T) {
 	m := testRuntimeManager(t)
-	m.loadDeployment = func(context.Context) (*RuntimeProvider, error) { return nil, nil }
 	m.mutationGate = make(chan struct{}, 1)
 	m.mutationGate <- struct{}{}
 	ctx, cancel := context.WithCancel(t.Context())
diff --git a/services/core/internal/execution/sandbox_deployment_drain_test.go b/services/core/internal/execution/sandbox_deployment_drain_test.go
index 3104220af..d80fbefa0 100644
--- a/services/core/internal/execution/sandbox_deployment_drain_test.go
+++ b/services/core/internal/execution/sandbox_deployment_drain_test.go
@@ -93,7 +93,7 @@ func testLifecycleCancellationPreservesLease(t *testing.T, mode string) {
 	defer hub.Close()
 	id := uuid.NewString()
 	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
-	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return configuration, nil }))
+	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return configuration, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -231,7 +231,7 @@ func TestSandboxDeploymentDrainFailureCannotReactivate(t *testing.T) {
 	defer hub.Close()
 	id := uuid.NewString()
 	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
-	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return configuration, nil }))
+	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return configuration, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/execution/sandbox_deployment_setup.go b/services/core/internal/execution/sandbox_deployment_setup.go
index 7bff16c58..165198028 100644
--- a/services/core/internal/execution/sandbox_deployment_setup.go
+++ b/services/core/internal/execution/sandbox_deployment_setup.go
@@ -22,14 +22,11 @@ type PreparedRuntimeDeployment struct {
 type RuntimeDeploymentPreparer func(context.Context, deployment.Setup) (PreparedRuntimeDeployment, error)
 
 // NewDeferredRuntimeProvider enables Web setup for one fixed installation. The
-// loader returns nil until selection, then the committed immutable generation.
-// Replacement is serialized by the deployment mutation gate and drain flow.
-func NewDeferredRuntimeProvider(installationID string, load func(context.Context) (*RuntimeProvider, error), prepare ...RuntimeDeploymentPreparer) *RuntimeProvider {
-	config := &RuntimeProvider{InstallationID: installationID, loadDeployment: load}
-	if len(prepare) == 1 {
-		config.prepareDeployment = prepare[0]
-	}
-	return config
+// loader returns nil until selection, then the committed immutable generation;
+// prepare validates each new selection before it is stored. Replacement is
+// serialized by the deployment mutation gate and drain flow.
+func NewDeferredRuntimeProvider(installationID string, load func(context.Context) (*RuntimeProvider, error), prepare RuntimeDeploymentPreparer) *RuntimeProvider {
+	return &RuntimeProvider{InstallationID: installationID, loadDeployment: load, prepareDeployment: prepare}
 }
 
 func (w *Worker) InitializeSandboxDeployment(ctx context.Context, input sandbox.Selection) (deployment.View, error) {
@@ -67,9 +64,6 @@ func (w *Worker) InitializeSandboxDeployment(ctx context.Context, input sandbox.
 // ensureDeployment serializes the first configuration read without holding the
 // node map lock across database access. All node workers copy this same snapshot.
 func (m *runtimeManager) ensureDeployment(parent context.Context) (bool, error) {
-	if m.loadDeployment == nil {
-		return true, nil
-	}
 	ctx, finish, err := m.enter(parent)
 	if err != nil {
 		return false, err
@@ -97,7 +91,7 @@ func (m *runtimeManager) ensureDeployment(parent context.Context) (bool, error)
 	if err != nil || config == nil {
 		return false, err
 	}
-	if config.InstallationID != m.setupInstallationID || config.LocalNodeID != "" || config.loadDeployment != nil || config.ProviderKind == "" {
+	if config.InstallationID != m.setupInstallationID || config.loadDeployment != nil {
 		return false, sandbox.ErrInvalid
 	}
 	copied, err := validatedRuntimeProvider(config, m.registry)
@@ -119,9 +113,6 @@ func (m *runtimeManager) ensureDeployment(parent context.Context) (bool, error)
 // Preparation is outside the manager mutex and all database transactions. A
 // rejected candidate cannot retire the current generation or its node lanes.
 func (m *runtimeManager) prepareCandidate(ctx context.Context, input sandbox.Selection) (PreparedRuntimeDeployment, error) {
-	if m.prepareDeployment == nil {
-		return PreparedRuntimeDeployment{}, ErrExecutionUnavailable
-	}
 	setup, err := m.deploymentService.SetupForSelection(m.setupInstallationID, input)
 	if err != nil {
 		return PreparedRuntimeDeployment{}, err
@@ -131,7 +122,7 @@ func (m *runtimeManager) prepareCandidate(ctx context.Context, input sandbox.Sel
 		return PreparedRuntimeDeployment{}, err
 	}
 	config := candidate.Config
-	if config == nil || config.InstallationID != setup.InstallationID || config.ProviderKind != setup.Provider || config.Mode != setup.Mode || config.CoreURL == "" || config.BackendFingerprint != setup.BackendFingerprint || config.LocalNodeID != "" || config.loadDeployment != nil || config.prepareDeployment != nil {
+	if config == nil || config.InstallationID != setup.InstallationID || config.ProviderKind != setup.Provider || config.Mode != setup.Mode || config.CoreURL == "" || config.BackendFingerprint != setup.BackendFingerprint || config.loadDeployment != nil || config.prepareDeployment != nil {
 		return PreparedRuntimeDeployment{}, sandbox.ErrInvalid
 	}
 	copied, err := validatedRuntimeProvider(config, m.registry)
@@ -164,7 +155,7 @@ func (m *runtimeManager) publishDeployment(candidate PreparedRuntimeDeployment,
 	m.mu.Lock()
 	defer m.mu.Unlock()
 	config := *candidate.Config
-	config.Generation, config.AdmissionPaused = committed.Generation, committed.Reset != nil
+	config.Generation = committed.Generation
 	if m.switching {
 		m.nodes = make(map[string]*runtimeNode)
 	}
diff --git a/services/core/internal/execution/sandbox_deployment_setup_test.go b/services/core/internal/execution/sandbox_deployment_setup_test.go
index 35271c554..549f233d3 100644
--- a/services/core/internal/execution/sandbox_deployment_setup_test.go
+++ b/services/core/internal/execution/sandbox_deployment_setup_test.go
@@ -24,14 +24,14 @@ func TestDeferredSandboxDeploymentLoadsOnceBeforeNodeCreation(t *testing.T) {
 	id := uuid.NewString()
 	var selected atomic.Bool
 	var loads atomic.Int32
-	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
 	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) {
 		loads.Add(1)
 		if !selected.Load() {
 			return nil, nil
 		}
 		return configuration, nil
-	}))
+	}, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -74,7 +74,7 @@ func TestDeferredSandboxDeploymentShutdownCancelsLoad(t *testing.T) {
 		close(entered)
 		<-ctx.Done()
 		return nil, ctx.Err()
-	}))
+	}, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -94,13 +94,13 @@ func TestDeferredSandboxProviderFailureKeepsRecoveryAvailable(t *testing.T) {
 	id := uuid.NewString()
 	available := false
 	loadErr := ErrExecutionUnavailable
-	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
 	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) {
 		if !available {
 			return nil, loadErr
 		}
 		return configuration, nil
-	}))
+	}, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -192,7 +192,7 @@ func TestCommittedSandboxCandidatePublishesAfterShutdown(t *testing.T) {
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
 	id := uuid.NewString()
-	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }))
+	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -205,7 +205,7 @@ func TestCommittedSandboxCandidatePublishesAfterShutdown(t *testing.T) {
 	m.stop()
 	m.publishDeployment(candidate, deployment.View{InstallationID: id, Generation: 2, Mode: "direct", Provider: "e2b", Reset: &deployment.Reset{}})
 	m.drain()
-	if m.config.Generation != 2 || !m.config.AdmissionPaused || published == nil || published.Generation != 2 || !published.AdmissionPaused || m.switching {
+	if m.config.Generation != 2 || published == nil || published.Generation != 2 || m.switching {
 		t.Fatal("committed candidate was lost during shutdown")
 	}
 	if _, _, err := m.enter(t.Context()); !errors.Is(err, ErrExecutionUnavailable) {
diff --git a/services/core/internal/execution/sandbox_deployment_switch.go b/services/core/internal/execution/sandbox_deployment_switch.go
index 6e18883cf..0dddd2923 100644
--- a/services/core/internal/execution/sandbox_deployment_switch.go
+++ b/services/core/internal/execution/sandbox_deployment_switch.go
@@ -9,7 +9,7 @@ import (
 )
 
 func (m *runtimeManager) lockMutation(ctx context.Context) (func(), error) {
-	if m == nil || m.loadDeployment == nil {
+	if m == nil {
 		return nil, deployment.ErrConflict
 	}
 	m.mu.Lock()
@@ -115,7 +115,7 @@ func (m *runtimeManager) activateDeployment(ctx context.Context, expected deploy
 		m.publishEmptyDeployment(expected.InstallationID, expected.Generation)
 		return nil
 	}
-	if config == nil || config.InstallationID != expected.InstallationID || config.Generation != expected.Generation || config.Mode != expected.Mode || config.ProviderKind != expected.Provider || config.loadDeployment != nil || config.LocalNodeID != "" {
+	if config == nil || config.InstallationID != expected.InstallationID || config.Generation != expected.Generation || config.Mode != expected.Mode || config.ProviderKind != expected.Provider || config.loadDeployment != nil {
 		return sandbox.ErrInvalid
 	}
 	copied, err := validatedRuntimeProvider(config, m.registry)
diff --git a/services/core/internal/execution/sandbox_deployment_switch_test.go b/services/core/internal/execution/sandbox_deployment_switch_test.go
index 2d31d3d32..551d1ec78 100644
--- a/services/core/internal/execution/sandbox_deployment_switch_test.go
+++ b/services/core/internal/execution/sandbox_deployment_switch_test.go
@@ -19,7 +19,7 @@ func TestSandboxManagerSwitchDrainsBeforeDirectActivation(t *testing.T) {
 	defer hub.Close()
 	id := uuid.NewString()
 	config := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
-	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil }))
+	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -80,7 +80,7 @@ func TestSandboxManagerSwitchDrainsBeforeDirectActivation(t *testing.T) {
 
 func TestSandboxManagerFailedActivationStaysPaused(t *testing.T) {
 	id := uuid.NewString()
-	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, errors.New("provider unavailable") }))
+	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, errors.New("provider unavailable") }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -101,7 +101,7 @@ func TestSandboxManagerCancelledSwitchCannotResumeBeforeDrain(t *testing.T) {
 	defer hub.Close()
 	id := uuid.NewString()
 	config := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
-	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil }))
+	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/execution/sandbox_provider_contract_test.go b/services/core/internal/execution/sandbox_provider_contract_test.go
index 531b3fbbc..83d0cdef2 100644
--- a/services/core/internal/execution/sandbox_provider_contract_test.go
+++ b/services/core/internal/execution/sandbox_provider_contract_test.go
@@ -18,7 +18,7 @@ func TestSandboxProviderRegistrationDoesNotRequireAnExecutionVendorBranch(t *tes
 			id := uuid.NewString()
 			config := &RuntimeProvider{InstallationID: id, ProviderKind: "contract-fixture", Mode: mode,
 				CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: &lifecycleOnlySandbox{}}
-			m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil }))
+			m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil }, unusedPreparation(t)))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/execution/sandbox_reset.go b/services/core/internal/execution/sandbox_reset.go
index f841d4ee8..241d452b0 100644
--- a/services/core/internal/execution/sandbox_reset.go
+++ b/services/core/internal/execution/sandbox_reset.go
@@ -64,9 +64,6 @@ func (m *runtimeManager) committedView(ctx context.Context) (deployment.View, er
 // enter m.active, hold a Session/deployment transaction, or call a provider while
 // waiting for a deployment drain. Each page has both a row and time bound.
 func (m *runtimeManager) resetStep(parent context.Context) error {
-	if m.loadDeployment == nil {
-		return nil
-	}
 	ctx, cancel := context.WithTimeout(parent, 5*time.Second)
 	defer cancel()
 	return m.resetPage(parent, ctx)
diff --git a/services/core/internal/execution/sandbox_reset_test.go b/services/core/internal/execution/sandbox_reset_test.go
index 9ec0bb050..16bd12cc9 100644
--- a/services/core/internal/execution/sandbox_reset_test.go
+++ b/services/core/internal/execution/sandbox_reset_test.go
@@ -101,7 +101,7 @@ func TestSandboxResetPageTimeoutRecoversCommittedOwner(t *testing.T) {
 			return nil, err
 		}
 		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Mode: setup.Mode, Generation: setup.Generation, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}, nil
-	})
+	}, unusedPreparation(t))
 	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), config)
 	if err != nil {
 		t.Fatal(err)
@@ -215,7 +215,7 @@ func TestSandboxResetPublishesCommittedGenerationWithoutReading(t *testing.T) {
 			return nil, err
 		}
 		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Mode: setup.Mode, Generation: setup.Generation, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}, nil
-	})
+	}, unusedPreparation(t))
 	var published []uint64
 	config.PublishUnconfigured = func(generation uint64) {
 		if committedReads != 0 {
@@ -255,10 +255,10 @@ func TestSandboxResetPublishesCommittedGenerationWithoutReading(t *testing.T) {
 func TestCommittedResetViewStopsOwnerWithoutLease(t *testing.T) {
 	id := uuid.NewString()
 	reader := &strictDeploymentReader{t: t, snapshot: func(context.Context) (deployment.Snapshot, error) {
-		return deployment.Snapshot{Record: deployment.Record{InstallationID: id, WebManaged: true, Generation: 1}}, nil
+		return deployment.Snapshot{Record: deployment.Record{InstallationID: id, Generation: 1}}, nil
 	}}
 	deployments, operations := deploymentOperations(t, &strictDeploymentStorage{t: t}, reader, &strictExecutionStorage{t: t})
-	m, err := newRuntimeManager(Owner{Lease: lostLease{}, Deployment: operations}, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }))
+	m, err := newRuntimeManager(Owner{Lease: lostLease{}, Deployment: operations}, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -280,7 +280,7 @@ func TestCommittedResetViewStopsOwnerWithoutLease(t *testing.T) {
 func TestSandboxResetChangesReturnViewReadAfterCommit(t *testing.T) {
 	owner, deployments, reader := resetManager(t)
 	id := initializeE2BDeployment(t, owner)
-	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }))
+	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/execution/sandbox_snapshot_budget_test.go b/services/core/internal/execution/sandbox_snapshot_budget_test.go
index 467596e9a..60a0e1067 100644
--- a/services/core/internal/execution/sandbox_snapshot_budget_test.go
+++ b/services/core/internal/execution/sandbox_snapshot_budget_test.go
@@ -73,7 +73,7 @@ func TestSandboxResetSnapshotFitsPageBudget(t *testing.T) {
 			return nil, err
 		}
 		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}, nil
-	})
+	}, unusedPreparation(t))
 	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), configuration)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/execution/worker.go b/services/core/internal/execution/worker.go
index 137dd1a82..839009390 100644
--- a/services/core/internal/execution/worker.go
+++ b/services/core/internal/execution/worker.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
@@ -85,19 +84,12 @@ func StartWorker(ctx context.Context, dispatcher *Dispatcher, owner Owner) (_ *W
 				worker.runtimes.stop()
 			}
 		}()
-	}
-	var process *deployment.ProcessDeployment
-	if worker.runtimes != nil && worker.runtimes.loadDeployment == nil {
-		config := worker.runtimes.config
-		process = &deployment.ProcessDeployment{ProviderKind: config.ProviderKind, LocalNodeID: config.LocalNodeID, LocalCredentialSHA256: config.LocalCredentialSHA256, LocalMaxActive: config.LocalMaxActive, LocalMaxRetained: config.LocalMaxRetained, InstallationID: config.InstallationID, BackendFingerprint: config.BackendFingerprint, AdmissionPaused: config.AdmissionPaused}
-	}
-	if worker.runtimes != nil && worker.runtimes.loadDeployment != nil {
 		err = owner.Deployment.Claim(ctx, worker.runtimes.setupInstallationID)
 		if err == nil {
 			_, err = worker.runtimes.ensureDeployment(ctx)
 		}
 	} else {
-		err = owner.Deployment.ConfigureProcess(ctx, process)
+		err = owner.Deployment.RequireUnclaimed(ctx)
 	}
 	if err != nil {
 		return nil, err
diff --git a/services/core/internal/persistence/postgres/deploymentpg/allocations.go b/services/core/internal/persistence/postgres/deploymentpg/allocations.go
index 08e2569cb..a6ae895e1 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/allocations.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/allocations.go
@@ -540,19 +540,3 @@ func (s *Store) Activity(ctx context.Context, allocationID string) (deployment.A
 	}
 	return loadActivity(ctx, s.pool.Queries(), id)
 }
-
-func (s *Store) CountComputeReservations(ctx context.Context, installationID string) (int64, error) {
-	id, err := parseID(installationID)
-	if err != nil {
-		return 0, err
-	}
-	return s.pool.Queries().CountRuntimeComputeReservations(ctx, id)
-}
-
-func (s *Store) CountRetainedAllocations(ctx context.Context, installationID string) (int64, error) {
-	id, err := parseID(installationID)
-	if err != nil {
-		return 0, err
-	}
-	return s.pool.Queries().CountRuntimeRetainedAllocations(ctx, id)
-}
diff --git a/services/core/internal/persistence/postgres/deploymentpg/records.go b/services/core/internal/persistence/postgres/deploymentpg/records.go
index b310e6688..84eed9174 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/records.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/records.go
@@ -59,8 +59,8 @@ func translate(err error) error {
 // credentialcrypto.ErrUnavailable; a credential the key cannot open or
 // authenticate is an internal decryption error.
 func record(d sqlc.RuntimeDeployment, cipher *credentialcrypto.Cipher, open bool) deployment.Record {
-	r := deployment.Record{InstallationID: uuidString(d.InstallationID), WebManaged: d.WebManaged, Provider: d.ProviderKind, BackendFingerprint: d.BackendFingerprint,
-		Generation: uint64(d.Generation), OwnerEpoch: uint64(d.OwnerEpoch), Mode: d.Mode, AdmissionPaused: d.AdmissionPaused, LocalNodeID: uuidString(d.LocalNodeID),
+	r := deployment.Record{InstallationID: uuidString(d.InstallationID), Provider: d.ProviderKind, BackendFingerprint: d.BackendFingerprint,
+		Generation: uint64(d.Generation), OwnerEpoch: uint64(d.OwnerEpoch), Mode: d.Mode,
 		IdleSeconds: d.IdleSeconds, RetentionSeconds: d.RetentionSeconds, Specification: d.Specification,
 		Configuration: sandbox.ConfigurationRecord{Public: d.ProviderConfig, Metadata: d.ProviderMetadata}, CredentialStored: len(d.ProviderCredential) > 0}
 	if r.CredentialStored && open {
diff --git a/services/core/internal/persistence/postgres/deploymentpg/reset_test.go b/services/core/internal/persistence/postgres/deploymentpg/reset_test.go
index 9c46bb524..5e242387a 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/reset_test.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/reset_test.go
@@ -125,8 +125,8 @@ func TestResetDeadlineAndCancel(t *testing.T) {
 	if err := changes.CancelReset(admin(t), installation, view.Generation); err != nil {
 		t.Fatal(err)
 	}
-	if paused := resetCount(t, f, "SELECT count(*) FROM runtime_deployment WHERE admission_paused OR reset_clear IS NOT NULL OR reset_audit IS NOT NULL"); paused != 0 {
-		t.Fatal("cancellation left the reset or paused admission")
+	if paused := resetCount(t, f, "SELECT count(*) FROM runtime_deployment WHERE reset_clear IS NOT NULL OR reset_audit IS NOT NULL"); paused != 0 {
+		t.Fatal("cancellation left the reset")
 	}
 	if got, want := resetAudit(t, f), []string{"reset_start fixture-admin", "reset_deadline fixture-admin", "reset_cancel fixture-admin"}; !slices.Equal(got, want) {
 		t.Fatalf("audit = %q, want %q", got, want)
@@ -146,7 +146,7 @@ func TestResetWritesNothingWithoutAuditOrLease(t *testing.T) {
 	if err := closed.StartReset(admin(t), installation, request); !errors.Is(err, pgunit.ErrLeaseClosed) {
 		t.Fatalf("StartReset on a closed lease = %v", err)
 	}
-	if paused := resetCount(t, f, "SELECT count(*) FROM runtime_deployment WHERE admission_paused OR reset_clear IS NOT NULL"); paused != 0 {
+	if paused := resetCount(t, f, "SELECT count(*) FROM runtime_deployment WHERE reset_clear IS NOT NULL"); paused != 0 {
 		t.Fatal("a rejected reset paused admission")
 	}
 }
diff --git a/services/core/internal/persistence/postgres/deploymentpg/setup_test.go b/services/core/internal/persistence/postgres/deploymentpg/setup_test.go
index f9ac218b8..6fee76efc 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/setup_test.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/setup_test.go
@@ -6,7 +6,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"strings"
 	"sync"
 	"testing"
 
@@ -112,32 +111,20 @@ func TestSandboxDeploymentSetupConcurrentSelection(t *testing.T) {
 	}
 }
 
-func TestSandboxDeploymentSetupRejectsFileManagedAndUnleasedWrites(t *testing.T) {
+func TestSandboxDeploymentSetupRejectsUnleasedWrites(t *testing.T) {
 	f := newFixture(t)
-	input := sandbox.Selection{DeploymentSpec: testSpecification("docker"), Provider: "docker"}
-	process := deployment.ProcessDeployment{InstallationID: uuid.NewString(), BackendFingerprint: strings.Repeat("a", 64), ProviderKind: "docker",
-		LocalNodeID: uuid.NewString(), LocalCredentialSHA256: setupDigest("local-node-credential"), LocalMaxActive: 4, LocalMaxRetained: 16}
+	id := uuid.NewString()
 	// Deployment changes run only on the execution lease; a closed one writes nothing.
 	closed := setupClosedExecution(t, f)
-	if err := closed.ConfigureProcess(t.Context(), &process); !errors.Is(err, pgunit.ErrLeaseClosed) {
-		t.Fatal("unleased process configuration accepted", err)
+	if err := closed.Claim(t.Context(), id); !errors.Is(err, pgunit.ErrLeaseClosed) {
+		t.Fatal("unleased claim accepted", err)
 	}
-	if _, err := closed.Initialize(t.Context(), process.InstallationID, input); !errors.Is(err, pgunit.ErrLeaseClosed) {
+	if _, err := closed.Initialize(t.Context(), id, sandbox.Selection{DeploymentSpec: testSpecification("docker"), Provider: "docker"}); !errors.Is(err, pgunit.ErrLeaseClosed) {
 		t.Fatal("unleased setup accepted", err)
 	}
 	if view, err := f.service.View(t.Context()); err != nil || view.InstallationID != "" || view.Provider != "" {
 		t.Fatal("unleased writes changed the deployment", view, err)
 	}
-	changes, _ := f.execution(t)
-	if err := changes.ConfigureProcess(t.Context(), &process); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := changes.Initialize(t.Context(), process.InstallationID, input); !errors.Is(err, deployment.ErrConflict) {
-		t.Fatal("file-managed deployment changed", err)
-	}
-	if err := changes.Claim(t.Context(), process.InstallationID); !errors.Is(err, deployment.ErrConflict) {
-		t.Fatal("file-managed deployment adopted", err)
-	}
 }
 
 func TestSandboxSelectionRejectsWhitespaceInE2BCredential(t *testing.T) {
@@ -183,54 +170,3 @@ func TestSandboxE2BEndpointPersistenceAndOnlineSwitch(t *testing.T) {
 		t.Fatal("online endpoint switch failed", changed, err)
 	}
 }
-
-func TestRuntimeDeploymentRequiresMaintenanceBeforeIdentityChange(t *testing.T) {
-	f := newFixture(t)
-	old := deployment.ProcessDeployment{InstallationID: uuid.NewString(), BackendFingerprint: strings.Repeat("a", 64)}
-	if err := setupClosedExecution(t, f).ConfigureProcess(t.Context(), &old); !errors.Is(err, pgunit.ErrLeaseClosed) {
-		t.Fatal("unleased configuration accepted", err)
-	}
-	changes, _ := f.execution(t)
-	configure := func(selected *deployment.ProcessDeployment) {
-		t.Helper()
-		if err := changes.ConfigureProcess(t.Context(), selected); err != nil {
-			t.Fatal(err)
-		}
-	}
-	configure(&old)
-	for _, changeID := range []bool{false, true} {
-		next := old
-		if changeID {
-			next.InstallationID = uuid.NewString()
-		} else {
-			next.BackendFingerprint = strings.Repeat("b", 64)
-		}
-		next.AdmissionPaused = true
-		if err := changes.ConfigureProcess(t.Context(), &next); err == nil || !strings.Contains(err.Error(), "maintenance") {
-			t.Fatal("identity changed before prior maintenance", err)
-		}
-	}
-	old.AdmissionPaused = true
-	configure(&old)
-	next := old
-	next.BackendFingerprint = strings.Repeat("b", 64)
-	next.AdmissionPaused = false
-	if err := changes.ConfigureProcess(t.Context(), &next); err == nil {
-		t.Fatal("switch reopened creation in same operation")
-	}
-	next.AdmissionPaused = true
-	configure(&next)
-	var id, fingerprint string
-	var maintenance bool
-	if err := f.pool.QueryRow(t.Context(), "SELECT installation_id::text,backend_fingerprint,admission_paused FROM runtime_deployment").Scan(&id, &fingerprint, &maintenance); err != nil || id != next.InstallationID || fingerprint != next.BackendFingerprint || !maintenance {
-		t.Fatal("switch identity not durable", id, fingerprint, maintenance, err)
-	}
-	configure(nil)
-	// Disabling the configured adapter must not forget the old maintenance state.
-	next.AdmissionPaused = false
-	configure(&next)
-	another := deployment.ProcessDeployment{InstallationID: uuid.NewString(), BackendFingerprint: strings.Repeat("a", 64), AdmissionPaused: true}
-	if err := changes.ConfigureProcess(t.Context(), &another); err == nil {
-		t.Fatal("nil selection erased the maintenance prerequisite")
-	}
-}
diff --git a/services/core/internal/persistence/postgres/deploymentpg/specification_test.go b/services/core/internal/persistence/postgres/deploymentpg/specification_test.go
index f739faaec..304b9121c 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/specification_test.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/specification_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
 )
 
-func TestSandboxSpecificationRoundTripAndFileConfigurationCannotOverride(t *testing.T) {
+func TestSandboxSpecificationRoundTripAndClaimStays(t *testing.T) {
 	for _, provider := range []string{"docker", "microsandbox", "e2b"} {
 		t.Run(provider, func(t *testing.T) {
 			f := newFixture(t)
@@ -44,11 +44,8 @@ func TestSandboxSpecificationRoundTripAndFileConfigurationCannotOverride(t *test
 			if _, err := changes.Initialize(t.Context(), view.InstallationID, changed); !errors.Is(err, deployment.ErrConflict) {
 				t.Fatal("initial setup silently resized a configured deployment", err)
 			}
-			file := deployment.ProcessDeployment{InstallationID: view.InstallationID, BackendFingerprint: setup.BackendFingerprint, ProviderKind: provider, AdmissionPaused: true}
-			for _, candidate := range []*deployment.ProcessDeployment{nil, &file} {
-				if err := changes.ConfigureProcess(t.Context(), candidate); !errors.Is(err, deployment.ErrConflict) {
-					t.Fatal("file configuration replaced database ownership", err)
-				}
+			if err := changes.RequireUnclaimed(t.Context()); !errors.Is(err, deployment.ErrConflict) {
+				t.Fatal("an owner without sandbox runtimes started on a claimed deployment", err)
 			}
 			after, err := f.service.View(t.Context())
 			if err != nil || !reflect.DeepEqual(after, view) {
diff --git a/services/core/internal/persistence/postgres/deploymentpg/tx.go b/services/core/internal/persistence/postgres/deploymentpg/tx.go
index 6145dd13b..e0952eb19 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/tx.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/tx.go
@@ -297,25 +297,6 @@ func (t *deploymentTx) ClaimInstallation(installationID string) error {
 	return t.q.ClaimWebSandboxDeployment(t.ctx, id)
 }
 
-func (t *deploymentTx) SetProcessDeployment(installationID, backendFingerprint string, admissionPaused bool) error {
-	id, err := parseID(installationID)
-	if err != nil {
-		return err
-	}
-	return t.q.SetRuntimeDeployment(t.ctx, sqlc.SetRuntimeDeploymentParams{InstallationID: id, BackendFingerprint: backendFingerprint, AdmissionPaused: admissionPaused})
-}
-
-func (t *deploymentTx) SetManagerDeployment(provider, localNodeID string) error {
-	var local pgtype.UUID
-	if localNodeID != "" {
-		var err error
-		if local, err = parseID(localNodeID); err != nil {
-			return err
-		}
-	}
-	return t.q.SetRuntimeManagerDeployment(t.ctx, sqlc.SetRuntimeManagerDeploymentParams{ProviderKind: provider, LocalNodeID: local})
-}
-
 func (t *deploymentTx) SaveSelection(selection deployment.SelectionRecord) error {
 	if selection.Generation > math.MaxInt64 {
 		return deployment.ErrInvalidInput
diff --git a/services/core/internal/persistence/postgres/placementpg/placementpg.go b/services/core/internal/persistence/postgres/placementpg/placementpg.go
index f67cbf294..73fc46b35 100644
--- a/services/core/internal/persistence/postgres/placementpg/placementpg.go
+++ b/services/core/internal/persistence/postgres/placementpg/placementpg.go
@@ -25,8 +25,7 @@ func LockDeployment(ctx context.Context, q *sqlc.Queries) (placement.Deployment,
 	}
 	return placement.Deployment{
 		InstallationID: uuidString(d.InstallationID), Provider: d.ProviderKind, Mode: d.Mode,
-		Generation: uint64(d.Generation), WebManaged: d.WebManaged, AdmissionPaused: d.AdmissionPaused,
-		Resetting: d.ResetClear.Valid, Specification: d.Specification,
+		Generation: uint64(d.Generation), Resetting: d.ResetClear.Valid, Specification: d.Specification,
 	}, nil
 }
 
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation_test.go b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
index 65ca06140..1552275b8 100644
--- a/services/core/internal/persistence/postgres/sessionpg/creation_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
@@ -473,8 +473,8 @@ func TestEnvironmentCreationReservesItsInitialInput(t *testing.T) {
 	}
 }
 
-// Hosted creation checks admission on the locked deployment, so it sees
-// maintenance committed while it waited, and places after creating the
+// Hosted creation checks admission on the locked deployment, so it sees a
+// reset committed while it waited, and places after creating the
 // Environment, rolling both back when no node is available. A retry admits
 // nothing and still returns its Session.
 func TestHostedCreationAdmitsAndPlacesUnderTheDeploymentLock(t *testing.T) {
@@ -505,19 +505,20 @@ func TestHostedCreationAdmitsAndPlacesUnderTheDeploymentLock(t *testing.T) {
 		done <- err
 	}()
 	awaitBlocked(ctx, t, pool, holder)
-	if _, err := tx.Exec(ctx, "UPDATE runtime_deployment SET installation_id=$1, backend_fingerprint=$2, admission_paused=true", uuid.New(), strings.Repeat("a", 64)); err != nil {
+	if _, err := tx.Exec(ctx, `UPDATE runtime_deployment SET installation_id=$1, backend_fingerprint=$2, provider_kind='docker', mode='nodes', generation=1,
+		reset_clear='force', reset_requested_at=now(), reset_forced_at=now(), reset_audit='{}'`, uuid.New(), strings.Repeat("a", 64)); err != nil {
 		t.Fatal(err)
 	}
 	if err := tx.Commit(ctx); err != nil {
 		t.Fatal(err)
 	}
-	if err := <-done; !errors.Is(err, placement.ErrAdmissionClosed) {
-		t.Fatal("creation bypassed committed maintenance", err)
+	if err := <-done; !errors.Is(err, placement.ErrResetAdmission) {
+		t.Fatal("creation bypassed the committed reset", err)
 	}
 	if retry, err := service.CreateSession(ctx, tenant, hosted("existing")); err != nil || retry.Created || retry.Session.ID != existing.Session.ID {
 		t.Fatal("retry ran admission", retry, err)
 	}
-	exec(t, pool, "UPDATE runtime_deployment SET admission_paused=false, web_managed=true")
+	exec(t, pool, "UPDATE runtime_deployment SET reset_clear=NULL, reset_requested_at=NULL, reset_forced_at=NULL, reset_audit=NULL, provider_kind='', mode=''")
 	if _, err := service.CreateSession(ctx, tenant, hosted("unplaced")); !errors.Is(err, placement.ErrNodeUnavailable) {
 		t.Fatal("placement without a node", err)
 	}
diff --git a/services/core/internal/sandbox/providers/registry.go b/services/core/internal/sandbox/providers/registry.go
index 5d60ab7fc..ab92077b5 100644
--- a/services/core/internal/sandbox/providers/registry.go
+++ b/services/core/internal/sandbox/providers/registry.go
@@ -75,15 +75,6 @@ func (r *Registry) Lookup(kind string) (Adapter, error) {
 	return a, nil
 }
 
-// IsNode reports whether the provider runs on enrolled sandbox nodes.
-func (r *Registry) IsNode(kind string) (bool, error) {
-	a, err := r.Lookup(kind)
-	if err != nil {
-		return false, err
-	}
-	return a.Mode == "nodes", nil
-}
-
 // SupportsCheckpoint reports whether the provider declares checkpoint suspension.
 func (r *Registry) SupportsCheckpoint(kind string) (bool, error) {
 	a, err := r.Lookup(kind)
diff --git a/services/core/internal/sandbox/providers/registry_test.go b/services/core/internal/sandbox/providers/registry_test.go
index 97c1539df..6b3078902 100644
--- a/services/core/internal/sandbox/providers/registry_test.go
+++ b/services/core/internal/sandbox/providers/registry_test.go
@@ -28,9 +28,8 @@ func TestRegistrationOwnsDeploymentPolicy(t *testing.T) {
 			}
 			a, err := registry.Lookup(tc.kind)
 			checkpoint, checkpointErr := registry.SupportsCheckpoint(tc.kind)
-			isNode, nodeErr := registry.IsNode(tc.kind)
-			if err != nil || checkpointErr != nil || nodeErr != nil || checkpoint != tc.checkpoint || isNode != (tc.mode == "nodes") || (a.BuildLocal != nil) != (tc.mode == "nodes") || (a.BuildDirect != nil) != (tc.mode == "direct") {
-				t.Fatal("inconsistent construction/capability registration", err, checkpointErr, nodeErr)
+			if err != nil || checkpointErr != nil || checkpoint != tc.checkpoint || (a.BuildLocal != nil) != (tc.mode == "nodes") || (a.BuildDirect != nil) != (tc.mode == "direct") {
+				t.Fatal("inconsistent construction/capability registration", err, checkpointErr)
 			}
 		})
 	}
@@ -71,10 +70,9 @@ func TestNewRegistrationDoesNotNeedCoreDispatchChanges(t *testing.T) {
 	// Registration is test-local: production registrations are fixed, never plugins.
 	registry.adapters[kind] = registry.adapters["docker"]
 	s, err := registry.Normalize(sandbox.Selection{Provider: kind, DeploymentSpec: validRegistrationSpec()})
-	isNode, nodeErr := registry.IsNode(kind)
 	checkpoint, checkpointErr := registry.SupportsCheckpoint(kind)
-	if err != nil || nodeErr != nil || checkpointErr != nil || s.Provider != kind || !isNode || checkpoint {
-		t.Fatal("new entry did not follow shared boundary", err, nodeErr, checkpointErr)
+	if err != nil || checkpointErr != nil || s.Provider != kind || checkpoint {
+		t.Fatal("new entry did not follow shared boundary", err, checkpointErr)
 	}
 	d, err := registry.Describe(kind, uuid.NewString())
 	if err != nil || d.Mode != "nodes" || d.IdleSeconds != 0 {
@@ -113,9 +111,6 @@ func TestCapabilityLookupsReportFailures(t *testing.T) {
 	invalid.Operations = nil
 	registry.adapters["invalid-registration"] = invalid
 	for kind, want := range map[string]error{"unregistered": ErrUnknownProvider, "invalid-registration": providercontract.ErrContract} {
-		if _, err := registry.IsNode(kind); !errors.Is(err, want) {
-			t.Fatal(kind, "IsNode", err)
-		}
 		if _, err := registry.SupportsCheckpoint(kind); !errors.Is(err, want) {
 			t.Fatal(kind, "SupportsCheckpoint", err)
 		}
diff --git a/services/core/internal/sessions/creation_test.go b/services/core/internal/sessions/creation_test.go
index 865fee9e1..7fe34ff68 100644
--- a/services/core/internal/sessions/creation_test.go
+++ b/services/core/internal/sessions/creation_test.go
@@ -449,7 +449,7 @@ func TestCreateSession(t *testing.T) {
 		tx := newCreationTx(t, hostedSession, true)
 		tx.lockDeployment = returns(placement.Deployment{InstallationID: "installation", Provider: "docker", Specification: json.RawMessage(`{}`)})
 		tx.createEnvironment = returns("environment")
-		tx.loadNodes = returns([]placement.Node{{ID: "node", Online: true, ServingReady: true, ReadyGeneration: &ready, MaxActive: 1, MaxRetained: 1}})
+		tx.loadNodes = returns([]placement.Node{{ID: "node", Online: true, ServingReady: true, ReadyGeneration: &ready, MaxActive: 1, MaxRetained: 1, CoreURL: rules.PublicURL()}})
 		tx.reservePlacement = done
 		_, err, calls := runCreation(t, rules, tx, creationInput("openai_hosted"))
 		want := []string{"UpsertSession create", "LockDeployment", "CreateEnvironment", "LoadNodes", "ReservePlacement node 5", "AuditCreation session:session environment:environment:session", "LoadSession"}
diff --git a/services/core/migrations/000093_web_deployment_only.sql b/services/core/migrations/000093_web_deployment_only.sql
new file mode 100644
index 000000000..54886e099
--- /dev/null
+++ b/services/core/migrations/000093_web_deployment_only.sql
@@ -0,0 +1,78 @@
+-- +goose Up
+-- Web setup is the only writer of the installation, so a recorded installation
+-- is Web-managed, no deployment names a process-configured local node, every
+-- node has the Core address it enrolled with, and only a sandbox reset pauses
+-- admission.
+-- +goose StatementBegin
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM runtime_deployment WHERE local_node_id IS NOT NULL OR (installation_id IS NOT NULL AND NOT web_managed)
+        OR admission_paused <> (reset_clear IS NOT NULL))
+        OR EXISTS (SELECT 1 FROM runtime_nodes WHERE removed_at IS NULL AND core_url = '') THEN
+        RAISE EXCEPTION 'Cannot upgrade: the sandbox deployment was configured outside Web setup, or a live node has no Core address. Reset the sandbox in Web, then upgrade';
+    END IF;
+END $$;
+-- +goose StatementEnd
+ALTER TABLE runtime_deployment
+    DROP CONSTRAINT runtime_deployment_identity_check,
+    DROP CONSTRAINT runtime_deployment_setup_check,
+    DROP CONSTRAINT runtime_deployment_reset_check,
+    DROP CONSTRAINT runtime_deployment_reset_admission_check,
+    DROP COLUMN web_managed,
+    DROP COLUMN local_node_id,
+    DROP COLUMN admission_paused,
+    ADD CONSTRAINT runtime_deployment_identity_check CHECK (
+        (installation_id IS NULL AND backend_fingerprint = '') OR
+        (installation_id IS NOT NULL AND backend_fingerprint ~ '^[0-9a-f]{64}$') OR
+        (installation_id IS NOT NULL AND provider_kind = '' AND backend_fingerprint = '')
+    ),
+    ADD CONSTRAINT runtime_deployment_setup_check CHECK (
+        installation_id IS NULL OR
+        (provider_kind = '' AND mode = '' AND generation >= 0 AND idle_seconds = 0 AND retention_seconds = 0) OR
+        (provider_kind <> '' AND mode IN ('nodes','direct') AND generation > 0 AND
+            ((idle_seconds = 0 AND retention_seconds = 0) OR (idle_seconds > 0 AND retention_seconds > 0)))
+    ),
+    ADD CONSTRAINT runtime_deployment_reset_check CHECK (
+        (reset_clear IS NULL AND reset_requested_at IS NULL AND reset_deadline_at IS NULL
+            AND reset_forced_at IS NULL AND reset_audit IS NULL)
+        OR (reset_clear IS NOT NULL AND installation_id IS NOT NULL AND provider_kind <> ''
+            AND reset_requested_at IS NOT NULL AND reset_audit IS NOT NULL
+            AND jsonb_typeof(reset_audit) = 'object'
+            AND ((reset_clear = 'auto' AND reset_deadline_at IS NOT NULL AND reset_forced_at IS NULL)
+                OR (reset_clear = 'force' AND reset_forced_at IS NOT NULL)))
+    );
+
+-- +goose Down
+ALTER TABLE runtime_deployment
+    DROP CONSTRAINT runtime_deployment_identity_check,
+    DROP CONSTRAINT runtime_deployment_setup_check,
+    DROP CONSTRAINT runtime_deployment_reset_check,
+    ADD COLUMN web_managed boolean NOT NULL DEFAULT false,
+    ADD COLUMN local_node_id uuid,
+    ADD COLUMN admission_paused boolean NOT NULL DEFAULT false;
+UPDATE runtime_deployment SET web_managed = installation_id IS NOT NULL, admission_paused = reset_clear IS NOT NULL;
+ALTER TABLE runtime_deployment
+    ADD CONSTRAINT runtime_deployment_identity_check CHECK (
+        (installation_id IS NULL AND backend_fingerprint = '') OR
+        (installation_id IS NOT NULL AND backend_fingerprint ~ '^[0-9a-f]{64}$') OR
+        (web_managed AND installation_id IS NOT NULL AND provider_kind = '' AND backend_fingerprint = '')
+    ),
+    ADD CONSTRAINT runtime_deployment_setup_check CHECK (
+        NOT web_managed OR (local_node_id IS NULL AND (
+            (provider_kind = '' AND mode = '' AND generation >= 0 AND idle_seconds = 0 AND retention_seconds = 0) OR
+            (provider_kind <> '' AND mode IN ('nodes','direct') AND generation > 0 AND
+                ((idle_seconds = 0 AND retention_seconds = 0) OR (idle_seconds > 0 AND retention_seconds > 0)))
+        ))
+    ),
+    ADD CONSTRAINT runtime_deployment_reset_check CHECK (
+        (reset_clear IS NULL AND reset_requested_at IS NULL AND reset_deadline_at IS NULL
+            AND reset_forced_at IS NULL AND reset_audit IS NULL)
+        OR (reset_clear IS NOT NULL AND web_managed AND provider_kind <> ''
+            AND reset_requested_at IS NOT NULL AND reset_audit IS NOT NULL
+            AND jsonb_typeof(reset_audit) = 'object'
+            AND ((reset_clear = 'auto' AND reset_deadline_at IS NOT NULL AND reset_forced_at IS NULL)
+                OR (reset_clear = 'force' AND reset_forced_at IS NOT NULL)))
+    ),
+    ADD CONSTRAINT runtime_deployment_reset_admission_check CHECK (
+        NOT web_managed OR admission_paused = (reset_clear IS NOT NULL)
+    );
diff --git a/services/core/tests/integration/admin_session_archive_race_test.go b/services/core/tests/integration/admin_session_archive_race_test.go
index e973a7c72..177dc8ecb 100644
--- a/services/core/tests/integration/admin_session_archive_race_test.go
+++ b/services/core/tests/integration/admin_session_archive_race_test.go
@@ -82,11 +82,3 @@ func TestManagedSessionArchiveOrdersConcurrentInput(t *testing.T) {
 		}
 	}
 }
-
-func TestManagedSessionArchiveRejectsFileManagedDeployment(t *testing.T) {
-	s, w, _ := managerFixture(t, 1, 1)
-	tenant, session := managedArchiveSession(t, s, managerSessionInput(uuid.NewString()))
-	if _, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, uuid.NewString()), tenant, session.ID, 0); !errors.Is(err, deployment.ErrConflict) {
-		t.Fatal("archive accepted file-managed deployment", err)
-	}
-}
diff --git a/services/core/tests/integration/admin_session_archive_worker_http_test.go b/services/core/tests/integration/admin_session_archive_worker_http_test.go
index 00f830760..8e42cf4e7 100644
--- a/services/core/tests/integration/admin_session_archive_worker_http_test.go
+++ b/services/core/tests/integration/admin_session_archive_worker_http_test.go
@@ -41,7 +41,7 @@ func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
 	provider := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	deployments := deploymentService(t, s)
 	providerConfig := func(setup deployment.Setup) *execution.RuntimeProvider {
-		return &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: provider}
+		return &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: provider}
 	}
 	configuration := execution.NewDeferredRuntimeProvider(installation, func(ctx context.Context) (*execution.RuntimeProvider, error) {
 		setup, err := deployments.Setup(ctx)
diff --git a/services/core/tests/integration/credential_matrix_http_test.go b/services/core/tests/integration/credential_matrix_http_test.go
index d424fc7d4..068423282 100644
--- a/services/core/tests/integration/credential_matrix_http_test.go
+++ b/services/core/tests/integration/credential_matrix_http_test.go
@@ -95,9 +95,9 @@ func TestCredentialNamespaceMatrix(t *testing.T) {
 		if err != nil || setup.Provider == "" {
 			return nil, err
 		}
-		return &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, BackendFingerprint: setup.BackendFingerprint, CoreURL: "https://core.example/api/v1", Provider: provider}, nil
+		return &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, BackendFingerprint: setup.BackendFingerprint, CoreURL: "https://core.example/api/v1", Provider: provider}, nil
 	}, func(_ context.Context, setup deployment.Setup) (execution.PreparedRuntimeDeployment, error) {
-		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: provider}}, nil
+		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: provider}}, nil
 	})
 	worker := startWorker(t, ctx, s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: runtimes})
 	var stop sync.Once
diff --git a/services/core/tests/integration/device_bootstrap_binding_test.go b/services/core/tests/integration/device_bootstrap_binding_test.go
index 597001774..bf28d963d 100644
--- a/services/core/tests/integration/device_bootstrap_binding_test.go
+++ b/services/core/tests/integration/device_bootstrap_binding_test.go
@@ -25,7 +25,7 @@ func TestDeviceCredentialCarriesPersistedAllocationNode(t *testing.T) {
 		t.Fatal(err)
 	}
 	onlineManagerNode(t, s, remote)
-	for _, nodeID := range []string{d.LocalNodeID, remote} {
+	for _, nodeID := range []string{d.NodeID, remote} {
 		t.Run(nodeID, func(t *testing.T) {
 			tenant, bearer := uuid.NewString(), uuid.NewString()
 			session, err := createSessionOnNode(t, s, tenant, managerSessionInput(uuid.NewString()), nodeID)
diff --git a/services/core/tests/integration/hosted_initialization_failure_public_test.go b/services/core/tests/integration/hosted_initialization_failure_public_test.go
index 543f11500..4364a0e8b 100644
--- a/services/core/tests/integration/hosted_initialization_failure_public_test.go
+++ b/services/core/tests/integration/hosted_initialization_failure_public_test.go
@@ -98,14 +98,17 @@ func (p *hostedFailureProvider) prepare(request proto.RuntimePreparePayload, _ [
 	return completedInitialization(request, nil)
 }
 
-func hostedFailureStore(t *testing.T) *Store {
+// hostedFailureStore returns a store whose Web deployment is claimed by the
+// returned installation.
+func hostedFailureStore(t *testing.T) (*Store, string) {
 	t.Helper()
 	_, pool := newManagedTestStore(t)
 	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
-	return NewWithCredentialCipher(pool, cipher)
+	s := NewWithCredentialCipher(pool, cipher)
+	return s, webDeployment(t, s, "e2b")
 }
 
 func hostedFailureSession(t *testing.T, s *Store, tenant string, input sessions.CreateSession) (sessions.Session, sessions.Environment) {
@@ -126,10 +129,9 @@ func hostedFailureSession(t *testing.T, s *Store, tenant string, input sessions.
 	return session, environment
 }
 
-func failHostedInitialization(t *testing.T, s *Store, tenant string, environment sessions.Environment, p *hostedFailureProvider) {
+func failHostedInitialization(t *testing.T, s *Store, key, tenant string, environment sessions.Environment, p *hostedFailureProvider) {
 	t.Helper()
-	key := uuid.NewString()
-	w, _ := managedWorkerMode(t, s, key, p, false, true)
+	w, _ := managedWorkerMode(t, s, key, p, true)
 	if _, err := w.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err != nil {
 		t.Fatal(err)
 	}
@@ -180,12 +182,12 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 			"Failed to provision environment: Skill installation failed", []string{"configure", "skill"}},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			s := hostedFailureStore(t)
+			s, key := hostedFailureStore(t)
 			tenant := uuid.NewString()
 			session, environment := hostedFailureSession(t, s, tenant, test.input)
 			p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}},
 				fail: test.p.fail, skip: test.p.skip, result: test.p.result, err: test.p.err}
-			failHostedInitialization(t, s, tenant, environment, p)
+			failHostedInitialization(t, s, key, tenant, environment, p)
 			if !reflect.DeepEqual(p.steps, test.steps) || p.kills != 0 || p.commandCalls.Load() != 0 {
 				t.Fatal("failed initialization continued or reclaimed compute", p.steps, p.kills)
 			}
@@ -245,7 +247,7 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 // A pending initial input settles exactly as before; the one failed snapshot
 // carries both that settlement and the provisioning failure.
 func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
-	s := hostedFailureStore(t)
+	s, key := hostedFailureStore(t)
 	tenant := uuid.NewString()
 	session, environment := hostedFailureSession(t, s, tenant, sessions.CreateSession{
 		Initialization: environmentconfig.Setup{Commands: []environmentconfig.SetupCommand{{Command: "exit 3"}}},
@@ -253,7 +255,7 @@ func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
 	})
 	p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, fail: "setup",
 		result: failedInitialization(3)}
-	failHostedInitialization(t, s, tenant, environment, p)
+	failHostedInitialization(t, s, key, tenant, environment, p)
 	read, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
 	if err != nil || read.PendingInput || read.EnvironmentInputActivity == nil || read.EnvironmentInputActivity.Status != "failed" ||
 		read.EnvironmentInputActivity.Failure != "environment_unavailable" || read.EnvironmentFailure == nil {
@@ -279,20 +281,19 @@ func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
 // stream ends after agent.session.failed; later input gets the observed 409;
 // delete succeeds; tenant B sees nothing; the canary never appears.
 func TestHostedInitializationFailurePublicHTTP(t *testing.T) {
-	s := hostedFailureStore(t)
+	s, key := hostedFailureStore(t)
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	session, environment := hostedFailureSession(t, s, tenant, sessions.CreateSession{
 		Initialization: environmentconfig.Setup{Commands: []environmentconfig.SetupCommand{{Command: "echo " + hostedFailureCanary + "; exit 3"}}},
 		Metadata:       map[string]string{"case": "setup-exit3"},
 	})
-	key := uuid.NewString()
 	// A failed typed Runtime receipt exposes only a safe status.
 	p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, fail: "setup", result: failedInitialization(3)}
 	logs := &lockedBuffer{}
 	previous := slog.Default()
 	slog.SetDefault(slog.New(slog.NewTextHandler(logs, &slog.HandlerOptions{Level: slog.LevelDebug})))
 	t.Cleanup(func() { slog.SetDefault(previous) })
-	w, _ := managedWorkerMode(t, s, key, p, false, true)
+	w, _ := managedWorkerMode(t, s, key, p, true)
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "tenant-b", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
diff --git a/services/core/tests/integration/runtime_adoption_test.go b/services/core/tests/integration/runtime_adoption_test.go
deleted file mode 100644
index 76ae44516..000000000
--- a/services/core/tests/integration/runtime_adoption_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package integration
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
-	"github.com/google/uuid"
-)
-
-func nodelessAllocationFixture(t *testing.T) (*Store, *Store, deployment.ProcessDeployment, deployment.Allocation) {
-	t.Helper()
-	s, _ := newManagedTestStore(t)
-	w := executionWriter(t, s)
-	d := deploymentSelection()
-	deploymentConfigure(t, w, &d)
-	tenant := uuid.NewString()
-	_, e := localEnvironment(t, s, tenant)
-	a, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: e.ID}, d.InstallationID, runtimedevice.HashCredential("runtime"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	d.ProviderKind = "docker"
-	d.LocalNodeID = uuid.NewString()
-	d.LocalCredentialSHA256 = runtimedevice.HashCredential("node")
-	d.LocalMaxActive, d.LocalMaxRetained = 4, 16
-	return s, w, d, a
-}
-func requireNoNodeBinding(t *testing.T, s *Store) {
-	t.Helper()
-	var nodes, placements, bound int
-	var kind string
-	if err := s.pool.QueryRow(t.Context(), `SELECT provider_kind,(SELECT count(*) FROM runtime_nodes),(SELECT count(*) FROM runtime_placements),(SELECT count(*) FROM runtime_allocations WHERE node_id IS NOT NULL) FROM runtime_deployment`).Scan(&kind, &nodes, &placements, &bound); err != nil {
-		t.Fatal(err)
-	}
-	if kind != "" || nodes != 0 || placements != 0 || bound != 0 {
-		t.Fatal("partial adoption", kind, nodes, placements, bound)
-	}
-}
-func TestHistoricalRuntimeResourcesCannotBeAdopted(t *testing.T) {
-	for _, state := range []string{"creating", "running", "cleanup_pending", "released"} {
-		for _, pending := range []bool{false, true} {
-			t.Run(fmt.Sprintf("%s/pending=%t", state, pending), func(t *testing.T) {
-				s, w, d, a := nodelessAllocationFixture(t)
-				runtimeSuspensionSQL(t, s.pool, `UPDATE runtime_allocations SET state=$2,create_settled=($2='released'),released_at=CASE WHEN $2='released' THEN clock_timestamp() ELSE NULL END WHERE id=$1`, a.ID, state)
-				if pending {
-					_, _ = localEnvironment(t, s, a.TenantID)
-				}
-				before, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: a.TenantID, EnvironmentID: a.EnvironmentID})
-				if err != nil {
-					t.Fatal(err)
-				}
-				err = deploymentExecution(t, w).ConfigureProcess(t.Context(), &d)
-				if state == "released" && !pending {
-					if err != nil {
-						t.Fatal("released history blocked fresh configuration", err)
-					}
-				} else {
-					if err == nil {
-						t.Fatal("historical resources adopted")
-					}
-					requireNoNodeBinding(t, s)
-				}
-				after, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: a.TenantID, EnvironmentID: a.EnvironmentID})
-				if err != nil || !reflect.DeepEqual(before, after) {
-					t.Fatal("retained receipt changed", err)
-				}
-			})
-		}
-	}
-}
diff --git a/services/core/tests/integration/runtime_capabilities_pending_test.go b/services/core/tests/integration/runtime_capabilities_pending_test.go
index 5bbe67cf6..3e3c01d2d 100644
--- a/services/core/tests/integration/runtime_capabilities_pending_test.go
+++ b/services/core/tests/integration/runtime_capabilities_pending_test.go
@@ -21,6 +21,7 @@ func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
 		t.Fatal(err)
 	}
 	s := NewWithCredentialCipher(pool, cipher)
+	key := webDeployment(t, s, "e2b")
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{
 		Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
@@ -35,8 +36,7 @@ func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
 		t.Fatal(err)
 	}
 	provider := &initializingProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, initializationPeer: initializationPeer{deferred: true}}
-	key := uuid.NewString()
-	worker, _ := managedWorkerMode(t, s, key, provider, false, true)
+	worker, _ := managedWorkerMode(t, s, key, provider, true)
 	owner, err := worker.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
 	if err != nil || initializationState(t, s, owner.TenantID, owner.EnvironmentID) != "pending" {
 		t.Fatal(owner, err)
diff --git a/services/core/tests/integration/runtime_compute_lifecycle_test.go b/services/core/tests/integration/runtime_compute_lifecycle_test.go
index c6949a6de..73f5e29d6 100644
--- a/services/core/tests/integration/runtime_compute_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_compute_lifecycle_test.go
@@ -17,7 +17,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -261,6 +260,7 @@ type computeLifecycleFixture struct {
 	worker   *execution.Worker
 	stop     func()
 	key      string
+	node     string
 	policy   execution.RuntimeSuspensionPolicy
 }
 
@@ -280,28 +280,21 @@ func newComputeLifecycleFixture(t *testing.T, maxActive, maxRetained int) *compu
 		}
 		server.Close()
 	})
-	f := &computeLifecycleFixture{t: t, store: s, provider: p, key: uuid.NewString(), policy: execution.RuntimeSuspensionPolicy{IdleTimeout: time.Second, Retention: time.Hour, MaxActive: maxActive, MaxRetained: maxRetained}}
+	f := &computeLifecycleFixture{t: t, store: s, provider: p, key: webDeployment(t, s, "microsandbox"), policy: execution.RuntimeSuspensionPolicy{IdleTimeout: time.Second, Retention: time.Hour}}
+	view, err := deploymentService(t, s).View(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+	f.node = enrollNode(t, s, view, deployment.Capacity{MaxActive: maxActive, MaxRetained: maxRetained}).NodeID
 	f.start()
 	return f
 }
 func (f *computeLifecycleFixture) start() {
 	t := f.t
 	t.Helper()
-	dispatcher := &execution.Dispatcher{Registry: f.provider.registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: f.provider, Suspension: &f.policy}}
-	// Closing the previous Worker's connection can return before PostgreSQL drops its advisory lock.
-	deadline := time.Now().Add(2 * time.Second)
-	var w *execution.Worker
-	var err error
-	for {
-		w, err = startWorkerErr(t.Context(), f.store, dispatcher)
-		if err == nil || !errors.Is(err, pgunit.ErrLeaseHeld) || !time.Now().Before(deadline) {
-			break
-		}
-		time.Sleep(20 * time.Millisecond)
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
+	w := startWebWorker(t, f.store, f.provider.registry, f.key, f.provider, &f.policy)
+	// The Worker's claim starts a new owner epoch, in which the node reconnects.
+	onlineManagerNode(t, f.store, f.node)
 	var once sync.Once
 	stop := func() {
 		once.Do(func() { ctx, cancel := context.WithCancel(context.Background()); cancel(); _ = w.Run(ctx) })
@@ -521,47 +514,3 @@ func TestRuntimeComputeLifecycleSuspendedDeletionAndExpiryCleanup(t *testing.T)
 		})
 	}
 }
-
-func TestRuntimeComputeLifecycleCapacityBoundsActiveAndRetained(t *testing.T) {
-	f := newComputeLifecycleFixture(t, 1, 2)
-	tenant, _, env, owner := f.create()
-	tenant2, _, env2 := managedSession(t, f.store)
-	if _, err := f.worker.ProvisionEnvironment(t.Context(), tenant2, env2.ID, f.key); !errors.Is(err, execution.ErrExecutionUnavailable) {
-		t.Fatalf("active capacity ignored: %v", err)
-	}
-	if f.provider.creates != 1 {
-		t.Fatal("capacity rejection allocated compute")
-	}
-	f.complete(owner)
-	f.phase(tenant, env.ID, "suspended")
-	second, err := f.worker.ProvisionEnvironment(t.Context(), tenant2, env2.ID, f.key)
-	if err != nil {
-		t.Fatal(err)
-	}
-	pending := f.queued(owner)
-	for range 4 {
-		f.worker.ReconcileManagedRuntimes(t.Context())
-	}
-	first, err := deploymentStore(f.store).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
-	if err != nil || first.ComputePhase != "suspended" || f.provider.restores != 0 {
-		t.Fatal("wake exceeded active capacity", err)
-	}
-	f.sql(`UPDATE turns SET status='cancelled',completed_at=clock_timestamp() WHERE id=$1`, pending)
-	f.provider.mu.Lock()
-	b := f.provider.bootstraps[second.ID]
-	f.provider.mu.Unlock()
-	if err := f.provider.connect(t.Context(), b); err != nil {
-		t.Fatal(err)
-	}
-	second = f.phase(tenant2, env2.ID, "running")
-	f.complete(second)
-	f.phase(tenant2, env2.ID, "suspended")
-	// Both retained allocations count even when their source VMs are gone.
-	tenant3, _, env3 := managedSession(t, f.store)
-	if _, err := f.worker.ProvisionEnvironment(t.Context(), tenant3, env3.ID, f.key); !errors.Is(err, execution.ErrExecutionUnavailable) {
-		t.Fatalf("retained capacity ignored: %v", err)
-	}
-	if f.provider.creates != 2 {
-		t.Fatal("retained limit created a third allocation")
-	}
-}
diff --git a/services/core/tests/integration/runtime_configuration_cleanup_test.go b/services/core/tests/integration/runtime_configuration_cleanup_test.go
index 2196f7674..c08993908 100644
--- a/services/core/tests/integration/runtime_configuration_cleanup_test.go
+++ b/services/core/tests/integration/runtime_configuration_cleanup_test.go
@@ -84,7 +84,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			s, _ := newManagedTestStore(t)
-			key := uuid.NewString()
+			key := webDeployment(t, s, "e2b")
 			p := &configurationCleanupProvider{
 				lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: test.loseCreate},
 				rejectCreate:      test.rejectCreate, settleCreate: test.settleCreate,
diff --git a/services/core/tests/integration/runtime_connection_test.go b/services/core/tests/integration/runtime_connection_test.go
index 19947a340..7bc66fb03 100644
--- a/services/core/tests/integration/runtime_connection_test.go
+++ b/services/core/tests/integration/runtime_connection_test.go
@@ -22,6 +22,7 @@ import (
 
 func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	s, _ := newManagedTestStore(t)
+	key := webDeployment(t, s, "e2b")
 	tenant, session, environment := managedSession(t, s)
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
@@ -33,11 +34,7 @@ func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
 	server.Start()
 	t.Cleanup(func() { server.Close(); runtime.CloseConnections(registry) })
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	key := uuid.NewString()
-	start := func() *execution.Worker {
-		w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: server.URL + "/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
-		return w
-	}
+	start := func() *execution.Worker { return startWebWorker(t, s, registry, key, p, nil) }
 	stop := func(w *execution.Worker) {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/tests/integration/runtime_creation_settlement_test.go b/services/core/tests/integration/runtime_creation_settlement_test.go
index b827e9c49..54390356d 100644
--- a/services/core/tests/integration/runtime_creation_settlement_test.go
+++ b/services/core/tests/integration/runtime_creation_settlement_test.go
@@ -42,7 +42,7 @@ func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 	for _, cancelled := range []bool{false, true} {
 		t.Run(map[bool]string{false: "live caller", true: "cancelled caller"}[cancelled], func(t *testing.T) {
 			s, _ := newManagedTestStore(t)
-			key := uuid.NewString()
+			key := webDeployment(t, s, "e2b")
 			p := &absentCreationProvider{}
 			w, _ := managedWorker(t, s, key, p)
 			tenant, session, environment := managedSession(t, s)
@@ -80,7 +80,7 @@ func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 }
 func TestManagedRuntimeForeignAbsenceCannotReleaseCreation(t *testing.T) {
 	s, _ := newManagedTestStore(t)
-	key := uuid.NewString()
+	key := webDeployment(t, s, "e2b")
 	p := &absentCreationProvider{foreign: true}
 	w, _ := managedWorker(t, s, key, p)
 	tenant, _, environment := managedSession(t, s)
@@ -94,7 +94,7 @@ func TestManagedRuntimeForeignAbsenceCannotReleaseCreation(t *testing.T) {
 }
 func TestManagedRuntimeObservedSettlementAllowsOwnedCleanup(t *testing.T) {
 	s, _ := newManagedTestStore(t)
-	key := uuid.NewString()
+	key := webDeployment(t, s, "e2b")
 	p := &absentCreationProvider{observeSettled: true}
 	w, _ := managedWorker(t, s, key, p)
 	tenant, session, environment := managedSession(t, s)
diff --git a/services/core/tests/integration/runtime_deployment_test.go b/services/core/tests/integration/runtime_deployment_test.go
index 28d6bb24c..49cd6e6ac 100644
--- a/services/core/tests/integration/runtime_deployment_test.go
+++ b/services/core/tests/integration/runtime_deployment_test.go
@@ -1,12 +1,9 @@
 package integration
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
-	"strings"
 	"testing"
-	"time"
 
 	"github.com/google/uuid"
 
@@ -16,290 +13,94 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-func deploymentSelection() deployment.ProcessDeployment {
-	return deployment.ProcessDeployment{InstallationID: uuid.NewString(), BackendFingerprint: strings.Repeat("a", 64)}
-}
-
-func deploymentConfigure(t *testing.T, w *Store, config *deployment.ProcessDeployment) {
-	t.Helper()
-	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), config); err != nil {
-		t.Fatal(err)
-	}
-	if config != nil && config.ProviderKind != "" {
-		legacyRuntimeSpecification(t, w, config.ProviderKind)
-	}
-}
-
-// Lower-level legacy fixtures supply verified metadata without replaying the
-// configuration transition being tested. Web setup owns this write in production.
-func legacyRuntimeSpecification(t *testing.T, w *Store, provider string) {
-	t.Helper()
-	spec := SandboxDeploymentTestSpec(provider)
-	raw, _ := json.Marshal(spec)
-	if _, err := w.pool.Exec(t.Context(), "UPDATE runtime_deployment SET specification=$1", raw); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := w.pool.Exec(t.Context(), "UPDATE runtime_nodes SET deployment_generation=1,ready_generation=1,specification_digest=$1", spec.Digest(provider)); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestRuntimeDeploymentPendingSessionsCannotMigrate(t *testing.T) {
+// An installation never adopts hosted work admitted before it claimed the
+// deployment: a pending Session or an unreleased allocation refuses the claim.
+func TestRuntimeDeploymentClaimAdoptsNoUnclaimedWork(t *testing.T) {
 	s, _ := newManagedTestStore(t)
-	w := executionWriter(t, s)
-	tenant := uuid.NewString()
-	session, _ := localEnvironment(t, s, tenant)
-	old := deploymentSelection()
-	// First selection is allowed for work that has never had an installation.
-	deploymentConfigure(t, w, &old)
-	old.AdmissionPaused = true
-	deploymentConfigure(t, w, &old)
-	next := deploymentSelection()
-	next.AdmissionPaused = true
-	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), &next); err == nil || !strings.Contains(err.Error(), "1 pending hosted") {
-		t.Fatal("pending Session migrated", err)
+	changes := deploymentExecution(t, executionWriter(t, s))
+	installation, tenant := uuid.NewString(), uuid.NewString()
+	pending, _ := localEnvironment(t, s, tenant)
+	if err := changes.Claim(t.Context(), installation); !errors.Is(err, deployment.ErrConflict) {
+		t.Fatal("pending Session adopted", err)
 	}
-	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), nil); err == nil {
-		t.Fatal("pending Session orphaned by removing provider")
-	}
-	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
+	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: pending.ID}); err != nil {
 		t.Fatal(err)
 	}
-	deploymentConfigure(t, w, &next)
-}
-
-func TestRuntimeDeploymentUnknownAllocationsBlockAdoptionAndSwitch(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	w := executionWriter(t, s)
-	old := deploymentSelection()
-	tenant := uuid.NewString()
 	session, environment := localEnvironment(t, s, tenant)
-	owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, old.InstallationID, runtimedevice.HashCredential(uuid.NewString()))
+	owner, err := changes.ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), &old); err == nil || !strings.Contains(err.Error(), "no verified backend identity") {
-		t.Fatal("legacy allocation silently adopted", err)
+	if err := changes.Claim(t.Context(), installation); !errors.Is(err, deployment.ErrConflict) {
+		t.Fatal("unclaimed allocation adopted", err)
 	}
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := deploymentExecution(t, w).RequestCleanup(t.Context(), owner); err != nil {
+	if _, err := changes.RequestCleanup(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := deploymentExecution(t, w).ReleaseAllocation(t.Context(), owner); !errors.Is(err, deployment.ErrAllocationConflict) {
+	if _, err := changes.ReleaseAllocation(t.Context(), owner); !errors.Is(err, deployment.ErrAllocationConflict) {
 		t.Fatal("unknown creation lost cleanup ownership", err)
 	}
-	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), &old); err == nil {
-		t.Fatal("deleted unknown allocation did not block adoption")
+	if err := changes.Claim(t.Context(), installation); !errors.Is(err, deployment.ErrConflict) {
+		t.Fatal("deleted unknown allocation did not block adoption", err)
 	}
-	if _, err := deploymentExecution(t, w).SettleCreation(t.Context(), owner); err != nil {
+	if _, err := changes.SettleCreation(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := deploymentExecution(t, w).ReleaseAllocation(t.Context(), owner); err != nil {
+	if _, err := changes.ReleaseAllocation(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
-	deploymentConfigure(t, w, &old)
-	_, environment = localEnvironment(t, s, tenant)
-	owner, err = deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, old.InstallationID, runtimedevice.HashCredential(uuid.NewString()))
-	if err != nil {
+	if err := changes.Claim(t.Context(), installation); err != nil {
 		t.Fatal(err)
 	}
-	old.AdmissionPaused = true
-	deploymentConfigure(t, w, &old)
-	next := deploymentSelection()
-	next.AdmissionPaused = true
-	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), &next); err == nil || !strings.Contains(err.Error(), "1 unreleased allocations") {
-		t.Fatal("unknown creation did not block switch", err)
-	}
-	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), nil); err == nil {
-		t.Fatal("removing adapter orphaned unknown creation")
-	}
-	replay, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, old.InstallationID, runtimedevice.HashCredential(uuid.NewString()))
-	if err != nil || !replay.Replayed || replay.ID != owner.ID {
-		t.Fatal("maintenance blocked receipt replay", replay, err)
-	}
-	if _, err := deploymentExecution(t, w).RequestCleanup(t.Context(), owner); err != nil {
-		t.Fatal("maintenance blocked cleanup", err)
+	if err := changes.RequireUnclaimed(t.Context()); !errors.Is(err, deployment.ErrConflict) {
+		t.Fatal("owner without runtimes accepted a claimed deployment", err)
 	}
 }
 
-func TestRuntimeDeploymentMaintenancePreservesCreationRetriesAndOtherPlacements(t *testing.T) {
-	s, pool := newManagedTestStore(t)
-	w := executionWriter(t, s)
-	old := deploymentSelection()
-	deploymentConfigure(t, w, &old)
+func TestRuntimeDeploymentResetPreservesCreationRetriesAndOtherPlacements(t *testing.T) {
+	s, w, installation := managedArchiveFixture(t)
 	tenant := uuid.NewString()
 	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted"}}`)}
 	existing, err := s.CreateSession(t.Context(), tenant, input)
 	if err != nil {
 		t.Fatal(err)
 	}
-	old.AdmissionPaused = true
-	deploymentConfigure(t, w, &old)
+	ctx := SandboxResetTestContext(t.Context())
+	if _, err := startReset(t, ctx, w, installation, deployment.ResetRequest{Clear: "auto", ExpectedGeneration: 1}); err != nil {
+		t.Fatal(err)
+	}
 	replay, err := s.CreateSession(t.Context(), tenant, input)
 	if err != nil || replay.ID != existing.ID {
 		t.Fatal("creation retry lost identity", err)
 	}
 	input.IdempotencyKey = uuid.NewString()
-	if _, err := s.CreateSession(t.Context(), tenant, input); !errors.Is(err, placement.ErrAdmissionClosed) {
-		t.Fatal("maintenance created hosted Session", err)
+	if _, err := s.CreateSession(t.Context(), tenant, input); !errors.Is(err, placement.ErrResetAdmission) {
+		t.Fatal("reset created hosted Session", err)
 	}
 	var count int
-	if err := pool.QueryRow(t.Context(), "SELECT count(*) FROM sessions WHERE tenant_id=$1", tenant).Scan(&count); err != nil || count != 1 {
+	if err := s.pool.QueryRow(t.Context(), "SELECT count(*) FROM sessions WHERE tenant_id=$1", tenant).Scan(&count); err != nil || count != 1 {
 		t.Fatal("rejection left partial Session", count, err)
 	}
-	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: existing.Environment.ID}, old.InstallationID, runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, placement.ErrAdmissionClosed) {
-		t.Fatal("maintenance reserved new allocation", err)
+	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: existing.Environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, placement.ErrResetAdmission) {
+		t.Fatal("reset reserved new allocation", err)
 	}
 	for _, kind := range []string{"none", "self_hosted"} {
 		input.IdempotencyKey = uuid.NewString()
 		input.Configuration = json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"` + kind + `"}}`)
 		if _, err := s.CreateSession(t.Context(), tenant, input); err != nil {
-			t.Fatal("maintenance blocked unrelated placement", kind, err)
+			t.Fatal("reset blocked unrelated placement", kind, err)
 		}
 	}
-	old.AdmissionPaused = false
-	deploymentConfigure(t, w, &old)
-	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: existing.Environment.ID}, uuid.NewString(), runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, placement.ErrAdmissionClosed) {
-		t.Fatal("wrong installation reserved resource", err)
-	}
-	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: existing.Environment.ID}, old.InstallationID, runtimedevice.HashCredential(uuid.NewString())); err != nil {
-		t.Fatal("resume did not reopen allocation", err)
-	}
-}
-
-func TestRuntimeDeploymentMaintenanceSerializesHostedCreation(t *testing.T) {
-	s, pool := newManagedTestStore(t)
-	w := executionWriter(t, s)
-	config := deploymentSelection()
-	deploymentConfigure(t, w, &config)
-	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
-	defer cancel()
-	tx, err := pool.Begin(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer tx.Rollback(context.Background())
-	var blocker int32
-	if err := tx.QueryRow(ctx, "SELECT pg_backend_pid() FROM runtime_deployment FOR UPDATE").Scan(&blocker); err != nil {
-		t.Fatal(err)
-	}
-	done := make(chan error, 1)
-	tenant := uuid.NewString()
-	go func() {
-		_, err := s.CreateSession(ctx, tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`)})
-		done <- err
-	}()
-	runtimeSuspensionWaitBlocked(t, ctx, pool, blocker, done)
-	if _, err := tx.Exec(ctx, "UPDATE runtime_deployment SET admission_paused=true"); err != nil {
-		t.Fatal(err)
-	}
-	if err := tx.Commit(ctx); err != nil {
-		t.Fatal(err)
-	}
-	if err := <-done; !errors.Is(err, placement.ErrAdmissionClosed) {
-		t.Fatal("creation bypassed committed maintenance", err)
-	}
-	var count int
-	if err := pool.QueryRow(ctx, "SELECT count(*) FROM sessions WHERE tenant_id=$1", tenant).Scan(&count); err != nil || count != 0 {
-		t.Fatal("racing creation left partial work", count, err)
-	}
-}
-
-func TestRuntimeDeploymentRetainedResourcesBlockSwitchWithoutMutation(t *testing.T) {
-	for _, state := range []string{"running", "suspended", "cleanup_pending"} {
-		t.Run(state, func(t *testing.T) {
-			s, pool := newManagedTestStore(t)
-			w := executionWriter(t, s)
-			old := deploymentSelection()
-			deploymentConfigure(t, w, &old)
-			tenant := uuid.NewString()
-			_, environment := localEnvironment(t, s, tenant)
-			owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, old.InstallationID, runtimedevice.HashCredential(uuid.NewString()))
-			if err != nil {
-				t.Fatal(err)
-			}
-			if state == "suspended" {
-				_, err = pool.Exec(t.Context(), `UPDATE runtime_allocations SET state='running',create_settled=true,compute_phase='suspended',compute_state='{"snapshot":{"id":"retained-test-snapshot"}}' WHERE id=$1`, owner.ID)
-			} else {
-				_, err = pool.Exec(t.Context(), "UPDATE runtime_allocations SET state=$2,create_settled=true WHERE id=$1", owner.ID, state)
-			}
-			if err != nil {
-				t.Fatal(err)
-			}
-			old.AdmissionPaused = true
-			deploymentConfigure(t, w, &old)
-			var before, after, oldIdentity, newIdentity string
-			if err := pool.QueryRow(t.Context(), "SELECT to_jsonb(a)::text FROM runtime_allocations a WHERE id=$1", owner.ID).Scan(&before); err != nil {
-				t.Fatal(err)
-			}
-			if err := pool.QueryRow(t.Context(), "SELECT to_jsonb(d)::text FROM runtime_deployment d").Scan(&oldIdentity); err != nil {
-				t.Fatal(err)
-			}
-			next := deploymentSelection()
-			next.AdmissionPaused = true
-			if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), &next); err == nil || !strings.Contains(err.Error(), "1 unreleased allocations") {
-				t.Fatal("retained resource allowed switch", state, err)
-			}
-			if err := pool.QueryRow(t.Context(), "SELECT to_jsonb(a)::text FROM runtime_allocations a WHERE id=$1", owner.ID).Scan(&after); err != nil {
-				t.Fatal(err)
-			}
-			if err := pool.QueryRow(t.Context(), "SELECT to_jsonb(d)::text FROM runtime_deployment d").Scan(&newIdentity); err != nil {
-				t.Fatal(err)
-			}
-			if before != after || oldIdentity != newIdentity {
-				t.Fatal("refused switch changed existing ownership")
-			}
-		})
-	}
-}
-
-func TestRuntimeDeploymentAllocationBeforeMaintenanceRetainsOwnership(t *testing.T) {
-	s, pool := newManagedTestStore(t)
-	w := executionWriter(t, s)
-	config := deploymentSelection()
-	deploymentConfigure(t, w, &config)
-	tenant := uuid.NewString()
-	_, environment := localEnvironment(t, s, tenant)
-	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
-	defer cancel()
-	tx, err := pool.Begin(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer tx.Rollback(context.Background())
-	var blocker int32
-	if err := tx.QueryRow(ctx, "SELECT pg_backend_pid() FROM runtime_deployment FOR UPDATE").Scan(&blocker); err != nil {
+	if err := deploymentExecution(t, w).CancelReset(ctx, installation, 1); err != nil {
 		t.Fatal(err)
 	}
-	allocated := make(chan error, 1)
-	go func() {
-		_, err := deploymentExecution(t, w).ReserveAllocation(ctx, deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, config.InstallationID, runtimedevice.HashCredential(uuid.NewString()))
-		allocated <- err
-	}()
-	runtimeSuspensionWaitBlocked(t, ctx, pool, blocker, allocated)
-	maintaining := make(chan error, 1)
-	maintenance := config
-	maintenance.AdmissionPaused = true
-	changes := deploymentExecution(t, w)
-	go func() { maintaining <- changes.ConfigureProcess(ctx, &maintenance) }()
-	if err := tx.Commit(ctx); err != nil {
-		t.Fatal(err)
-	}
-	if err := <-allocated; err != nil {
-		t.Fatal("earlier allocation lost ownership", err)
-	}
-	if err := <-maintaining; err != nil {
-		t.Fatal(err)
-	}
-	owner, err := deploymentStore(w).EnvironmentAllocation(ctx, deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID})
-	if err != nil || owner.State != "creating" || owner.CreateSettled {
-		t.Fatal("maintenance changed uncertain receipt", owner, err)
+	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: existing.Environment.ID}, uuid.NewString(), runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, placement.ErrAdmissionClosed) {
+		t.Fatal("wrong installation reserved resource", err)
 	}
-	next := deploymentSelection()
-	next.AdmissionPaused = true
-	if err := deploymentExecution(t, w).ConfigureProcess(ctx, &next); err == nil || !strings.Contains(err.Error(), "1 unreleased allocations") {
-		t.Fatal("earlier in-flight allocation omitted from switch guard", err)
+	if _, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: existing.Environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString())); err != nil {
+		t.Fatal("cancelled reset did not reopen allocation", err)
 	}
 }
diff --git a/services/core/tests/integration/runtime_deployment_worker_test.go b/services/core/tests/integration/runtime_deployment_worker_test.go
index 42ce2fae8..6e852099f 100644
--- a/services/core/tests/integration/runtime_deployment_worker_test.go
+++ b/services/core/tests/integration/runtime_deployment_worker_test.go
@@ -1,7 +1,7 @@
 package integration
 
 import (
-	"strings"
+	"errors"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
@@ -13,7 +13,7 @@ import (
 
 func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T) {
 	s, _ := newManagedTestStore(t)
-	key := uuid.NewString()
+	key := webDeployment(t, s, "e2b")
 	old := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	worker, stop := managedWorker(t, s, key, old)
 	tenant, _, environment := managedSession(t, s)
@@ -23,25 +23,15 @@ func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T)
 	}
 	stop()
 	replacement := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	config := &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: uuid.NewString(), BackendFingerprint: strings.Repeat("b", 64), Provider: replacement, AdmissionPaused: true}
-	start := func(config *execution.RuntimeProvider) error {
-		_, err := startWorkerErr(t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: config})
+	start := func(runtimes *execution.RuntimeProvider) error {
+		_, err := startNextWorker(t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: runtimes})
 		return err
 	}
-	if err := start(config); err == nil || !strings.Contains(err.Error(), "maintenance") {
-		t.Fatal("startup switched active deployment", err)
+	if err := start(webRuntimes(t, s, uuid.NewString(), replacement, nil)); !errors.Is(err, deployment.ErrConflict) {
+		t.Fatal("startup switched the claimed installation", err)
 	}
-	worker, stop = managedWorkerMode(t, s, key, old, true)
-	replay, err := worker.ProvisionEnvironment(t.Context(), tenant, environment.ID, key)
-	if err != nil || !replay.Replayed || replay.ID != owner.ID {
-		t.Fatal("maintenance interrupted existing allocation", replay, err)
-	}
-	stop()
-	if err := start(config); err == nil || !strings.Contains(err.Error(), "unreleased allocations") {
-		t.Fatal("startup abandoned retained allocation", err)
-	}
-	if err := start(nil); err == nil || !strings.Contains(err.Error(), "unreleased allocations") {
-		t.Fatal("omitted configuration abandoned deployment", err)
+	if err := start(nil); !errors.Is(err, deployment.ErrConflict) {
+		t.Fatal("startup without runtimes abandoned the claimed deployment", err)
 	}
 	if replacement.creates != 0 || replacement.kills != 0 {
 		t.Fatal("rejected startup touched new backend")
@@ -51,6 +41,10 @@ func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T)
 		t.Fatal("rejected startup rewrote resource owner", got, err)
 	}
 	// Failed startup relinquishes its lease, so the original backend can resume.
-	_, stop = managedWorker(t, s, key, old)
+	worker, stop = managedWorker(t, s, key, old)
+	replay, err := worker.ProvisionEnvironment(t.Context(), tenant, environment.ID, key)
+	if err != nil || !replay.Replayed || replay.ID != owner.ID {
+		t.Fatal("rejected startup interrupted the existing allocation", replay, err)
+	}
 	stop()
 }
diff --git a/services/core/tests/integration/runtime_initialization_test.go b/services/core/tests/integration/runtime_initialization_test.go
index 57a4bf5cc..8acc75925 100644
--- a/services/core/tests/integration/runtime_initialization_test.go
+++ b/services/core/tests/integration/runtime_initialization_test.go
@@ -52,6 +52,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 				t.Fatal(err)
 			}
 			s := NewWithCredentialCipher(pool, cipher)
+			key := webDeployment(t, s, "e2b")
 			tenant := uuid.NewString()
 			input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), InitialFiles: []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a", Data: []byte("first")}, {Type: "inline", Path: "/workspace/b", Data: []byte("second")}}}
 			if setupOnly {
@@ -85,8 +86,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 				}
 				return completedInitialization(proto.RuntimePreparePayload{}, nil)
 			}
-			key := uuid.NewString()
-			w, stop := managedWorkerMode(t, s, key, p, false, true)
+			w, stop := managedWorkerMode(t, s, key, p, true)
 			if mode == "restart" {
 				awaitInitialization(t, s, tenant, env.ID, "failed")
 				if p.writes.Load() != 0 {
@@ -122,7 +122,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 					t.Fatal("completed preparation blocked", err)
 				}
 				stop()
-				_, _ = managedWorkerMode(t, s, key, p, false, true)
+				_, _ = managedWorkerMode(t, s, key, p, true)
 				time.Sleep(350 * time.Millisecond)
 				if int(p.writes.Load()) != expectedSteps {
 					t.Fatal("completed preparation replayed")
@@ -141,7 +141,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 }
 
 func TestManagedRuntimePreparationAllOperationsUsePeer(t *testing.T) {
-	s := hostedFailureStore(t)
+	s, key := hostedFailureStore(t)
 	var archive bytes.Buffer
 	writer := zip.NewWriter(&archive)
 	for path, body := range map[string]string{"proof/.codex-plugin/plugin.json": `{"name":"plugin","description":"A plugin.","skills":"./skills"}`, "proof/skills/example/SKILL.md": "---\nname: plugin-proof\ndescription: A plugin Skill.\n---\nProof."} {
@@ -181,8 +181,7 @@ func TestManagedRuntimePreparationAllOperationsUsePeer(t *testing.T) {
 		actionsMu.Unlock()
 		return completedInitialization(request, data)
 	}
-	key := uuid.NewString()
-	worker, _ := managedWorkerMode(t, s, key, provider, false, true)
+	worker, _ := managedWorkerMode(t, s, key, provider, true)
 	if _, err := worker.ProvisionEnvironment(t.Context(), tenant, environment.ID, key); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/runtime_input_admission_test.go b/services/core/tests/integration/runtime_input_admission_test.go
index 8c45dac30..725bb0567 100644
--- a/services/core/tests/integration/runtime_input_admission_test.go
+++ b/services/core/tests/integration/runtime_input_admission_test.go
@@ -7,13 +7,15 @@ import (
 
 	"github.com/google/uuid"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-func TestManagedRuntimeMaintenancePreservesCancelAndRetry(t *testing.T) {
+func TestManagedRuntimeResetPreservesCancelAndRetry(t *testing.T) {
 	s, _ := newManagedTestStore(t)
+	key := webDeployment(t, s, "e2b")
 	tenant, session, _ := managedSession(t, s)
 	inputs := []sessions.Input{messageInput("accepted work")}
 	accepted, err := submitInputs(t.Context(), s, tenant, session.ID, "work", inputs)
@@ -21,10 +23,13 @@ func TestManagedRuntimeMaintenancePreservesCancelAndRetry(t *testing.T) {
 		t.Fatal(err)
 	}
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	w, stop := managedWorkerMode(t, s, uuid.NewString(), p, true)
+	w, stop := managedWorker(t, s, key, p)
 	defer stop()
-	if _, err := w.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: session.Configuration}); !errors.Is(err, placement.ErrAdmissionClosed) {
-		t.Fatal("maintenance accepted new hosted Session", err)
+	if _, err := w.StartSandboxReset(SandboxResetTestContext(t.Context()), deployment.ResetRequest{Clear: "auto", ExpectedGeneration: 1}); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := w.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: session.Configuration}); !errors.Is(err, placement.ErrResetAdmission) {
+		t.Fatal("reset accepted new hosted Session", err)
 	}
 	cancel := []sessions.Input{{Kind: "cancel", Payload: json.RawMessage(`{}`)}}
 	first, err := w.SubmitInputs(t.Context(), tenant, session.ID, "cancel", cancel)
@@ -40,7 +45,7 @@ func TestManagedRuntimeMaintenancePreservesCancelAndRetry(t *testing.T) {
 		t.Fatal("matching input retry lost its accepted outcome", retry, err)
 	}
 	if _, err := w.SubmitInputs(t.Context(), uuid.NewString(), session.ID, "cancel", cancel); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("maintenance weakened tenant isolation", err)
+		t.Fatal("reset weakened tenant isolation", err)
 	}
 	if p.creates != 0 {
 		t.Fatal("existing controls provisioned a new Runtime")
diff --git a/services/core/tests/integration/runtime_lifecycle_nodes_test.go b/services/core/tests/integration/runtime_lifecycle_nodes_test.go
index a02c00452..72f26498a 100644
--- a/services/core/tests/integration/runtime_lifecycle_nodes_test.go
+++ b/services/core/tests/integration/runtime_lifecycle_nodes_test.go
@@ -37,7 +37,7 @@ func lifecycleTestSession(t *testing.T, s *Store, node string) (string, sessions
 	}
 	return tenant, session
 }
-func lifecycleTestAllocation(t *testing.T, s, w *Store, d deployment.ProcessDeployment, node string) deployment.Allocation {
+func lifecycleTestAllocation(t *testing.T, s, w *Store, d managerNode, node string) deployment.Allocation {
 	t.Helper()
 	tenant, session := lifecycleTestSession(t, s, node)
 	allocation, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, d.InstallationID, runtimedevice.HashCredential(uuid.NewString()))
@@ -52,20 +52,20 @@ func TestRuntimeLifecycleNodePagesAreIndependent(t *testing.T) {
 	other := lifecycleTestNode(t, s)
 	var allocated, pending []string
 	for range 34 {
-		allocated = append(allocated, lifecycleTestAllocation(t, s, w, d, d.LocalNodeID).ID)
-		_, session := lifecycleTestSession(t, s, d.LocalNodeID)
+		allocated = append(allocated, lifecycleTestAllocation(t, s, w, d, d.NodeID).ID)
+		_, session := lifecycleTestSession(t, s, d.NodeID)
 		pending = append(pending, session.Environment.ID)
 	}
 	second := lifecycleTestAllocation(t, s, w, d, other)
 	_, secondPending := lifecycleTestSession(t, s, other)
 	// Offline and unresolved cleanup remain discoverable without changing placement.
-	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.LocalNodeID); err != nil {
+	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.NodeID); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET state='cleanup_pending' WHERE node_id=$1", d.LocalNodeID); err != nil {
+	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET state='cleanup_pending' WHERE node_id=$1", d.NodeID); err != nil {
 		t.Fatal(err)
 	}
-	for _, node := range []string{d.LocalNodeID, other} {
+	for _, node := range []string{d.NodeID, other} {
 		var gotAlloc, gotPending []string
 		cursor := ""
 		for range 4 {
@@ -181,7 +181,7 @@ func TestRuntimeLifecycleNodeInventoryAndRouting(t *testing.T) {
 		t.Fatal(err)
 	}
 	nodes, err = deploymentStore(w).LifecycleNodes(t.Context())
-	if err != nil || len(nodes) != 1 || nodes[0] != d.LocalNodeID {
+	if err != nil || len(nodes) != 1 || nodes[0] != d.NodeID {
 		t.Fatal("removed node discovered", nodes, err)
 	}
 }
@@ -190,14 +190,14 @@ func TestRuntimeLifecycleNodeRejectsMissingOrReleasedPlacement(t *testing.T) {
 	for _, mutation := range []string{"DELETE FROM runtime_placements WHERE environment_id=$1", "UPDATE runtime_placements SET released_at=clock_timestamp() WHERE environment_id=$1"} {
 		t.Run(mutation[:6], func(t *testing.T) {
 			s, w, d := managerFixture(t, 4, 4)
-			tenant, session := lifecycleTestSession(t, s, d.LocalNodeID)
+			tenant, session := lifecycleTestSession(t, s, d.NodeID)
 			if _, err := s.pool.Exec(t.Context(), mutation, session.Environment.ID); err != nil {
 				t.Fatal(err)
 			}
 			if _, err := deploymentService(t, w).LifecycleNode(t.Context(), tenant, session.Environment.ID); !errors.Is(err, placement.ErrNodeUnavailable) {
 				t.Fatal("invalid placement routed", err)
 			}
-			rows, err := deploymentStore(w).UnallocatedEnvironments(t.Context(), d.LocalNodeID, "")
+			rows, err := deploymentStore(w).UnallocatedEnvironments(t.Context(), d.NodeID, "")
 			if err != nil || len(rows) != 0 {
 				t.Fatal("invalid placement provisioned", rows, err)
 			}
@@ -206,7 +206,12 @@ func TestRuntimeLifecycleNodeRejectsMissingOrReleasedPlacement(t *testing.T) {
 }
 
 func TestRuntimeLifecycleNodelessLane(t *testing.T) {
-	s, w, _, a := nodelessAllocationFixture(t)
+	s, w, installation := managedArchiveFixture(t)
+	_, reserved := localEnvironment(t, s, uuid.NewString())
+	a, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: reserved.TenantID, EnvironmentID: reserved.ID}, installation, runtimedevice.HashCredential("runtime"))
+	if err != nil {
+		t.Fatal(err)
+	}
 	nodes, err := deploymentStore(w).LifecycleNodes(t.Context())
 	if err != nil || !slices.Equal(nodes, []string{""}) {
 		t.Fatal(nodes, err)
diff --git a/services/core/tests/integration/runtime_lifecycle_test.go b/services/core/tests/integration/runtime_lifecycle_test.go
index f03f85e0a..8da737e4a 100644
--- a/services/core/tests/integration/runtime_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_lifecycle_test.go
@@ -72,12 +72,15 @@ func (p *lifecycleProvider) RunCommand(context.Context, sandbox.Reference, sandb
 	return sandbox.CommandResult{}, errors.New("not used")
 }
 
+// managedWorker starts a Worker that runs the Web setup webDeployment
+// committed for installation key on p.
 func managedWorker(t *testing.T, s *Store, key string, p sandbox.SandboxProvider) (*execution.Worker, func()) {
 	t.Helper()
 	return managedWorkerMode(t, s, key, p, false)
 }
 
-func managedWorkerMode(t *testing.T, s *Store, key string, p sandbox.SandboxProvider, maintenance bool, run ...bool) (*execution.Worker, func()) {
+// managedWorkerMode is managedWorker that also runs the Worker when run is set.
+func managedWorkerMode(t *testing.T, s *Store, key string, p sandbox.SandboxProvider, run bool) (*execution.Worker, func()) {
 	t.Helper()
 	registry := runtimegateway.NewRegistry()
 	if peer, ok := p.(interface {
@@ -88,8 +91,8 @@ func managedWorkerMode(t *testing.T, s *Store, key string, p sandbox.SandboxProv
 		t.Cleanup(server.Close)
 		peer.setRuntimeGateway(t, "ws"+strings.TrimPrefix(server.URL, "http"), registry)
 	}
-	w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p, AdmissionPaused: maintenance}})
-	if len(run) > 0 && run[0] {
+	w := startWebWorker(t, s, registry, key, p, nil)
+	if run {
 		ctx, cancel := context.WithCancel(t.Context())
 		done := make(chan error, 1)
 		go func() { done <- w.Run(ctx) }()
@@ -146,8 +149,8 @@ func reconcileManagedState(t *testing.T, w *execution.Worker, s *Store, tenant,
 
 func TestManagedRuntimeLostCreateRestartAndDeletion(t *testing.T) {
 	s, _ := newManagedTestStore(t)
+	key := webDeployment(t, s, "e2b")
 	tenant, session, env := managedSession(t, s)
-	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: true}
 	w, stop := managedWorker(t, s, key, p)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
@@ -185,8 +188,8 @@ func TestManagedRuntimeLostCreateRestartAndDeletion(t *testing.T) {
 
 func TestManagedRuntimeUnknownCreationRetainsCleanup(t *testing.T) {
 	s, _ := newManagedTestStore(t)
+	key := webDeployment(t, s, "e2b")
 	tenant, session, env := managedSession(t, s)
-	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: true, absent: true}
 	w, _ := managedWorker(t, s, key, p)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
@@ -213,37 +216,10 @@ func TestManagedRuntimeUnknownCreationRetainsCleanup(t *testing.T) {
 	}
 }
 
-func TestManagedRuntimeExpiryRevokesWhenProviderUnavailable(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	tenant, _, env := managedSession(t, s)
-	key := uuid.NewString()
-	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	w, _ := managedWorker(t, s, key, p)
-	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '61 minutes' WHERE id=$1", owner.ID); err != nil {
-		t.Fatal(err)
-	}
-	p.unavailable = true
-	reconcileManagedState(t, w, s, tenant, env.ID, "cleanup_pending")
-	got, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID})
-	if err != nil || got.State != "cleanup_pending" {
-		t.Fatalf("expiry lost on provider failure: %+v %v", got, err)
-	}
-	if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
-		t.Fatal("expired credential still authenticates")
-	}
-	if p.kills != 0 {
-		t.Fatal("unavailable provider misreported cleanup")
-	}
-}
-
 func TestManagedRuntimeStoppedComputeDoesNotRequestCleanup(t *testing.T) {
 	s, _ := newManagedTestStore(t)
+	key := webDeployment(t, s, "e2b")
 	tenant, _, env := managedSession(t, s)
-	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	w, _ := managedWorker(t, s, key, p)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
diff --git a/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go b/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
index d581b19f6..771c4c99f 100644
--- a/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
+++ b/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
@@ -18,7 +18,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -124,21 +123,13 @@ func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 		cp.mu.Unlock()
 		server.Close()
 	})
-	f := &nodeIsolationFixture{initializationCancel: cancelPreparation, t: t, store: s, nodes: deploymentService(t, s), pool: pool, provider: p, key: uuid.NewString(), nodeA: uuid.NewString(), nodeB: uuid.NewString()}
+	f := &nodeIsolationFixture{initializationCancel: cancelPreparation, t: t, store: s, nodes: deploymentService(t, s), pool: pool, provider: p, key: webDeployment(t, s, "microsandbox"), nodeA: uuid.NewString(), nodeB: uuid.NewString()}
 	// Keep restored compute awake throughout the isolation assertions.
 	// The suspension setup explicitly dates its activity two minutes in the past.
-	policy := &execution.RuntimeSuspensionPolicy{IdleTimeout: time.Minute, Retention: time.Hour, MaxActive: 100, MaxRetained: 100}
-	f.worker = startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: f.key, BackendFingerprint: strings.Repeat("a", 64), Provider: p, ProviderKind: "microsandbox", LocalNodeID: f.nodeA, LocalCredentialSHA256: runtimedevice.HashCredential("local-credential"), LocalMaxActive: 100, LocalMaxRetained: 100, Suspension: policy}})
-	spec := SandboxDeploymentTestSpec("microsandbox")
-	raw, _ := json.Marshal(spec)
-	if _, err := pool.Exec(t.Context(), "UPDATE runtime_deployment SET specification=$1", raw); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := pool.Exec(t.Context(), "UPDATE runtime_nodes SET specification_digest=$1,deployment_generation=1", spec.Digest("microsandbox")); err != nil {
-		t.Fatal(err)
-	}
+	f.worker = startWebWorker(t, s, registry, f.key, p, &execution.RuntimeSuspensionPolicy{IdleTimeout: time.Minute, Retention: time.Hour})
 	t.Cleanup(f.stop)
 	f.epoch = fixtureOwnerEpoch(t, s)
+	f.enroll(f.nodeA)
 	f.enroll(f.nodeB)
 	f.online(f.nodeA)
 	f.online(f.nodeB)
diff --git a/services/core/tests/integration/runtime_nodes_test.go b/services/core/tests/integration/runtime_nodes_test.go
index cf11c0a42..c00d88ceb 100644
--- a/services/core/tests/integration/runtime_nodes_test.go
+++ b/services/core/tests/integration/runtime_nodes_test.go
@@ -17,19 +17,15 @@ import (
 	"github.com/jackc/pgx/v5"
 )
 
-func managerFixture(t *testing.T, active, retained int) (*Store, *Store, deployment.ProcessDeployment) {
+// managerNode is the deployment managerFixture sets up: installation
+// InstallationID runs Docker on the one online node NodeID.
+type managerNode struct{ InstallationID, NodeID string }
+
+func managerFixture(t *testing.T, active, retained int) (*Store, *Store, managerNode) {
 	t.Helper()
-	s, _ := newManagedTestStore(t)
-	w := executionWriter(t, s)
-	d := deploymentSelection()
-	d.ProviderKind = "docker"
-	d.LocalNodeID = uuid.NewString()
-	d.LocalCredentialSHA256 = runtimedevice.HashCredential("local-node-credential")
-	d.LocalMaxActive = active
-	d.LocalMaxRetained = retained
-	deploymentConfigure(t, w, &d)
-	onlineManagerNode(t, s, d.LocalNodeID)
-	return s, w, d
+	s, w, view, _ := webSpecificationFixture(t, "docker")
+	node := enrollNode(t, s, view, deployment.Capacity{MaxActive: active, MaxRetained: retained})
+	return s, w, managerNode{InstallationID: view.InstallationID, NodeID: node.NodeID}
 }
 func onlineManagerNode(t *testing.T, s *Store, id string) string {
 	t.Helper()
@@ -158,7 +154,7 @@ func TestRuntimeNodesAtomicPlacementAndRetry(t *testing.T) {
 	if err != nil || len(nodes) != 1 || nodes[0].Active != 1 || nodes[0].Retained != 1 || nodes[0].Reserved != 1 {
 		t.Fatal(nodes, err)
 	}
-	if err := service.RemoveNode(t.Context(), d.LocalNodeID); !errors.Is(err, deployment.ErrNodeInUse) {
+	if err := service.RemoveNode(t.Context(), d.NodeID); !errors.Is(err, deployment.ErrNodeInUse) {
 		t.Fatal("removed pending placement", err)
 	}
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: retained.ID}); err != nil {
@@ -169,7 +165,7 @@ func TestRuntimeNodesAtomicPlacementAndRetry(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.LocalNodeID); err != nil {
+	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.NodeID); err != nil {
 		t.Fatal(err)
 	}
 	replay, err := s.CreateSession(t.Context(), tenant, input)
@@ -180,7 +176,7 @@ func TestRuntimeNodesAtomicPlacementAndRetry(t *testing.T) {
 		t.Fatal("foreign placement leaked", err)
 	}
 	placement, err := sessionRuntimePlacement(t.Context(), s, tenant, first.ID)
-	if err != nil || placement.NodeID != d.LocalNodeID || placement.Available {
+	if err != nil || placement.NodeID != d.NodeID || placement.Available {
 		t.Fatal(placement, err)
 	}
 }
@@ -220,7 +216,9 @@ func TestRuntimeNodesEnrollmentAndEpoch(t *testing.T) {
 		}
 	}
 	epoch := managerEpoch(t, s)
-	deploymentConfigure(t, w, &d)
+	if err := deploymentExecution(t, w).Claim(t.Context(), d.InstallationID); err != nil {
+		t.Fatal(err)
+	}
 	if next := managerEpoch(t, s); next != epoch+1 {
 		t.Fatal(next)
 	}
@@ -230,7 +228,7 @@ func TestRuntimeNodesEnrollmentAndEpoch(t *testing.T) {
 	if _, err := s.CreateSession(t.Context(), uuid.NewString(), managerSessionInput("stale")); !errors.Is(err, placement.ErrNodeUnavailable) {
 		t.Fatal("stale node admitted", err)
 	}
-	onlineManagerNode(t, s, d.LocalNodeID)
+	onlineManagerNode(t, s, d.NodeID)
 	if err := nodes.RemoveNode(t.Context(), input.NodeID); err != nil {
 		t.Fatal(err)
 	}
@@ -254,7 +252,7 @@ func TestRuntimeNodesRetention(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := nodes.RemoveNode(t.Context(), next.LocalNodeID); !errors.Is(err, deployment.ErrNodeInUse) {
+	if err := nodes.RemoveNode(t.Context(), next.NodeID); !errors.Is(err, deployment.ErrNodeInUse) {
 		t.Fatal(err)
 	}
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: pending.ID}); err != nil {
@@ -267,7 +265,7 @@ func TestRuntimeNodesRetention(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if err := nodes.RemoveNode(t.Context(), next.LocalNodeID); !errors.Is(err, deployment.ErrNodeInUse) {
+	if err := nodes.RemoveNode(t.Context(), next.NodeID); !errors.Is(err, deployment.ErrNodeInUse) {
 		t.Fatal("unknown cleanup released node", err)
 	}
 	retained, err = deploymentExecution(t, w).SettleCreation(t.Context(), retained)
@@ -277,22 +275,8 @@ func TestRuntimeNodesRetention(t *testing.T) {
 	if _, err := deploymentExecution(t, w).ReleaseAllocation(t.Context(), retained); err != nil {
 		t.Fatal(err)
 	}
-	if err := nodes.RemoveNode(t.Context(), next.LocalNodeID); !errors.Is(err, deployment.ErrLocalNodeConfigured) {
-		t.Fatal("configured local node was removed", err)
-	}
-	if _, err := nodes.AuthenticateNode(t.Context(), next.LocalNodeID, "local-node-credential"); err != nil {
-		t.Fatal("rejected removal changed local credentials", err)
-	}
-	next.AdmissionPaused = true
-	deploymentConfigure(t, w, &next)
-	detached := next
-	detached.LocalNodeID = ""
-	detached.LocalCredentialSHA256 = ""
-	detached.LocalMaxActive, detached.LocalMaxRetained = 0, 0
-	detached.BackendFingerprint = strings.Repeat("b", 64)
-	deploymentConfigure(t, w, &detached)
-	if err := nodes.RemoveNode(t.Context(), next.LocalNodeID); err != nil {
-		t.Fatal("detached resolved node cannot be removed", err)
+	if err := nodes.RemoveNode(t.Context(), next.NodeID); err != nil {
+		t.Fatal("released node cannot be removed", err)
 	}
 }
 func TestRuntimeNodesRestoreAndCreationShareCapacity(t *testing.T) {
@@ -371,22 +355,17 @@ func TestRuntimeNodesLongOfflineRetainsExactAllocation(t *testing.T) {
 	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '2 days' WHERE id=$1", owner.ID); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.LocalNodeID); err != nil {
+	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.NodeID); err != nil {
 		t.Fatal(err)
 	}
 	offline, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID})
 	if err != nil || offline.Expired || offline.State != "running" {
 		t.Fatal("offline treated as destructive expiry", offline, err)
 	}
-	if err := deploymentService(t, s).RemoveNode(t.Context(), d.LocalNodeID); !errors.Is(err, deployment.ErrNodeInUse) {
+	if err := deploymentService(t, s).RemoveNode(t.Context(), d.NodeID); !errors.Is(err, deployment.ErrNodeInUse) {
 		t.Fatal("offline ownership discarded", err)
 	}
-	changed := d
-	changed.LocalNodeID = uuid.NewString()
-	if err := deploymentExecution(t, w).ConfigureProcess(t.Context(), &changed); err == nil {
-		t.Fatal("lost local state created replacement identity")
-	}
-	onlineManagerNode(t, s, d.LocalNodeID)
+	onlineManagerNode(t, s, d.NodeID)
 	resumed, err := deploymentExecution(t, w).ObserveRunning(t.Context(), offline)
 	if err != nil || resumed.ID != owner.ID || resumed.DeviceID != owner.DeviceID || resumed.NodeID != owner.NodeID {
 		t.Fatal("reconnect changed instance", resumed, err)
@@ -397,20 +376,20 @@ func TestRuntimeNodesLongOfflineRetainsExactAllocation(t *testing.T) {
 	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET compute_phase='suspended',compute_state=$2::jsonb,compute_retained_until=clock_timestamp()+interval '1 day' WHERE id=$1", owner.ID, json.RawMessage(`{"snapshot":{"id":"same-snapshot"}}`)); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.LocalNodeID); err != nil {
+	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.NodeID); err != nil {
 		t.Fatal(err)
 	}
 	retained, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID})
 	if err != nil || retained.Expired || string(retained.ComputeState) != `{"snapshot": {"id": "same-snapshot"}}` {
 		t.Fatal(retained, err)
 	}
-	onlineManagerNode(t, s, d.LocalNodeID)
+	onlineManagerNode(t, s, d.NodeID)
 	same, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID})
 	if err != nil || same.ID != owner.ID || string(same.ComputeState) != string(retained.ComputeState) {
 		t.Fatal("snapshot changed across reconnect", same, err)
 	}
 	placement, err := sessionRuntimePlacement(t.Context(), s, tenant, session.ID)
-	if err != nil || placement.NodeID != d.LocalNodeID {
+	if err != nil || placement.NodeID != d.NodeID {
 		t.Fatal(placement, err)
 	}
 	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET compute_retained_until=clock_timestamp()-interval '1 second' WHERE id=$1", owner.ID); err != nil {
diff --git a/services/core/tests/integration/runtime_observation_test.go b/services/core/tests/integration/runtime_observation_test.go
index 0c178075c..5ad2acf2b 100644
--- a/services/core/tests/integration/runtime_observation_test.go
+++ b/services/core/tests/integration/runtime_observation_test.go
@@ -31,7 +31,7 @@ func TestRuntimeNodeObservationRetainsResourcesAndFencesStaleResults(t *testing.
 	if err != nil || retained.State != "running" || retained.ID != owner.ID || retained.ObservationError != "node_unavailable" {
 		t.Fatal(retained, err)
 	}
-	if err := deploymentService(t, s).RemoveNode(t.Context(), d.LocalNodeID); !errors.Is(err, deployment.ErrNodeInUse) {
+	if err := deploymentService(t, s).RemoveNode(t.Context(), d.NodeID); !errors.Is(err, deployment.ErrNodeInUse) {
 		t.Fatal("diagnostic released resource", err)
 	}
 	// A new lifecycle observation must not be erased by an earlier result.
diff --git a/services/core/tests/integration/runtime_pending_test.go b/services/core/tests/integration/runtime_pending_test.go
index 8245750f5..06af06ef7 100644
--- a/services/core/tests/integration/runtime_pending_test.go
+++ b/services/core/tests/integration/runtime_pending_test.go
@@ -15,6 +15,7 @@ import (
 
 func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T) {
 	s, _ := newManagedTestStore(t)
+	key := webDeployment(t, s, "e2b")
 	tenant, idle, idleEnvironment := managedSession(t, s)
 	initial, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted"}}`), InitialInputs: []sessions.Input{messageInput("hello")}})
 	if err != nil {
@@ -24,12 +25,8 @@ func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T)
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: deleted.TenantID, SessionID: deleted.ID}); err != nil {
 		t.Fatal(err)
 	}
-	key := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	start := func() *execution.Worker {
-		w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: &execution.RuntimeProvider{CoreURL: "http://core.invalid/api/v1", InstallationID: key, BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", Provider: p}})
-		return w
-	}
+	start := func() *execution.Worker { return startWebWorker(t, s, runtimegateway.NewRegistry(), key, p, nil) }
 	stop := func(w *execution.Worker) {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/tests/integration/runtime_scan_test.go b/services/core/tests/integration/runtime_scan_test.go
index c5221dbc1..5f88de644 100644
--- a/services/core/tests/integration/runtime_scan_test.go
+++ b/services/core/tests/integration/runtime_scan_test.go
@@ -8,8 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -30,7 +28,7 @@ func TestManagedRuntimeScanWrapServicesNextPage(t *testing.T) {
 		t.Run(fmt.Sprint(count), func(t *testing.T) {
 			s, _ := newManagedTestStore(t)
 			p := &scanProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}}
-			key := uuid.NewString()
+			key := webDeployment(t, s, "e2b")
 			w, _ := managedWorker(t, s, key, p)
 			var ids []string
 			for range count {
@@ -69,7 +67,7 @@ func TestManagedRuntimeScanWrapServicesNextPage(t *testing.T) {
 func TestManagedRuntimeScanEmptyAfterCleanupAndCanceledCall(t *testing.T) {
 	s, _ := newManagedTestStore(t)
 	p := &scanProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}}
-	key := uuid.NewString()
+	key := webDeployment(t, s, "e2b")
 	w, _ := managedWorker(t, s, key, p)
 	tenant, session, env := managedSession(t, s)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
diff --git a/services/core/tests/integration/runtime_suspension_test.go b/services/core/tests/integration/runtime_suspension_test.go
index 402338582..6ca4cd340 100644
--- a/services/core/tests/integration/runtime_suspension_test.go
+++ b/services/core/tests/integration/runtime_suspension_test.go
@@ -261,47 +261,6 @@ func TestRuntimeSuspensionRetentionAndDeletedSession(t *testing.T) {
 	}
 }
 
-func TestRuntimeSuspensionCountsUncertainCapacityUntilReleased(t *testing.T) {
-	s, pool := testStore(t)
-	w := executionWriter(t, s)
-	provider := uuid.NewString()
-	cases := []struct {
-		state, phase string
-		count        bool
-	}{
-		{"creating", "disabled", true}, {"running", "running", true}, {"running", "quiescing", true}, {"running", "suspending", true}, {"running", "suspended", false}, {"running", "restoring", true}, {"running", "waking", true}, {"cleanup_pending", "restoring", true}, {"released", "running", false},
-	}
-	want := int64(0)
-	wantRetained := int64(0)
-	for _, item := range cases {
-		tenant := uuid.NewString()
-		_, env := localEnvironment(t, s, tenant)
-		owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: env.ID}, provider, runtimedevice.HashCredential(uuid.NewString()))
-		if err != nil {
-			t.Fatal(err)
-		}
-		runtimeSuspensionSQL(t, pool, `UPDATE runtime_allocations SET state=$2,compute_phase=$3,create_settled=($2<>'creating'),released_at=CASE WHEN $2='released' THEN clock_timestamp() END WHERE id=$1`, owner.ID, item.state, item.phase)
-		if item.count {
-			want++
-		}
-		if item.state != "released" {
-			wantRetained++
-		}
-		retained, err := deploymentStore(w).CountRetainedAllocations(t.Context(), provider)
-		if err != nil || retained != wantRetained {
-			t.Fatalf("retained capacity state=%s phase=%s got=%d want=%d err=%v", item.state, item.phase, retained, wantRetained, err)
-		}
-		got, err := deploymentStore(w).CountComputeReservations(t.Context(), provider)
-		if err != nil || got != want {
-			t.Fatalf("capacity state=%s phase=%s got=%d want=%d err=%v", item.state, item.phase, got, want, err)
-		}
-	}
-	got, err := deploymentStore(w).CountComputeReservations(t.Context(), uuid.NewString())
-	if err != nil || got != 0 {
-		t.Fatal("capacity crossed installation boundary", got, err)
-	}
-}
-
 func TestRuntimeSuspensionIdleStartsAfterLastCompletion(t *testing.T) {
 	_, w, pool, owner := runtimeSuspensionFixture(t)
 	turn := runtimeSuspensionCompleted(t, pool, owner)
@@ -457,7 +416,7 @@ func TestRuntimeComputePhaseChangedAtInNodeAllocations(t *testing.T) {
 	}
 	listed := func() deployment.NodeAllocation {
 		t.Helper()
-		items, err := deploymentStore(s).NodeAllocations(t.Context(), d.LocalNodeID)
+		items, err := deploymentStore(s).NodeAllocations(t.Context(), d.NodeID)
 		if err != nil || len(items) != 1 || items[0].ID != allocation.ID {
 			t.Fatal(items, err)
 		}
diff --git a/services/core/tests/integration/runtime_wake_hint_integration_test.go b/services/core/tests/integration/runtime_wake_hint_integration_test.go
index 0d29a6720..aedeca68c 100644
--- a/services/core/tests/integration/runtime_wake_hint_integration_test.go
+++ b/services/core/tests/integration/runtime_wake_hint_integration_test.go
@@ -73,14 +73,8 @@ func newWakeHintIntegration(t *testing.T) *wakeHintIntegration {
 		fakeCheckpointProvider: f.provider, sentinel: sentinel.owner.ID,
 		release: make(chan struct{}), scans: make(chan int, 16),
 	}
-	worker := startWorker(t, t.Context(), f.store, &execution.Dispatcher{
-		Registry: f.provider.registry,
-		ManagedRuntimes: &execution.RuntimeProvider{
-			CoreURL: "http://core.invalid/api/v1", InstallationID: f.key,
-			BackendFingerprint: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-			Provider:           provider, Suspension: &f.policy,
-		},
-	})
+	worker := startWebWorker(t, f.store, f.provider.registry, f.key, provider, &f.policy)
+	onlineManagerNode(t, f.store, f.node)
 	ctx, cancel := context.WithCancel(t.Context())
 	done := make(chan error, 1)
 	var once sync.Once
diff --git a/services/core/tests/integration/sandbox_deployment_switch_test.go b/services/core/tests/integration/sandbox_deployment_switch_test.go
index 7c88d88c0..37b73464b 100644
--- a/services/core/tests/integration/sandbox_deployment_switch_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_test.go
@@ -190,7 +190,7 @@ func TestSandboxSwitchRetiresNodesAndEnrollment(t *testing.T) {
 	if err := deploymentExecution(t, w).StartReset(SandboxResetTestContext(t.Context()), id, deployment.ResetRequest{Clear: "auto", ExpectedGeneration: 1}); err != nil {
 		t.Fatal(err)
 	}
-	// AdmissionPaused rejects a valid enrollment without consuming it. Authentication
+	// A reset rejects a valid enrollment without consuming it. Authentication
 	// still precedes deployment details for invalid or retired credentials.
 	spareNode := node
 	spareNode.NodeID = uuid.NewString()
diff --git a/services/core/tests/integration/sandbox_deployment_switch_worker_test.go b/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
index e43dd7ae3..af2c98e9f 100644
--- a/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
@@ -35,13 +35,13 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 		if err != nil || setup.Provider == "" {
 			return nil, err
 		}
-		return &execution.RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p}, nil
+		return &execution.RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p}, nil
 	}, func(ctx context.Context, setup deployment.Setup) (execution.PreparedRuntimeDeployment, error) {
 		preparations.Add(1)
 		if fail.Load() {
 			return execution.PreparedRuntimeDeployment{}, errors.New("fixture provider unavailable")
 		}
-		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p}}, nil
+		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p}}, nil
 	})
 	w := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: configuration})
 	ctx, cancel := context.WithCancel(t.Context())
diff --git a/services/core/tests/integration/sandbox_deployment_worker_test.go b/services/core/tests/integration/sandbox_deployment_worker_test.go
index 95538e64a..dcae13238 100644
--- a/services/core/tests/integration/sandbox_deployment_worker_test.go
+++ b/services/core/tests/integration/sandbox_deployment_worker_test.go
@@ -27,10 +27,10 @@ func TestSandboxDeploymentWorkerActivatesWithoutRestart(t *testing.T) {
 		if err != nil || setup.Provider == "" {
 			return nil, err
 		}
-		return &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, BackendFingerprint: setup.BackendFingerprint, CoreURL: "https://core.example/api/v1", Provider: p}, nil
+		return &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, BackendFingerprint: setup.BackendFingerprint, CoreURL: "https://core.example/api/v1", Provider: p}, nil
 	}, func(ctx context.Context, setup deployment.Setup) (execution.PreparedRuntimeDeployment, error) {
 
-		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, AdmissionPaused: setup.AdmissionPaused, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p}}, nil
+		return execution.PreparedRuntimeDeployment{Config: &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p}}, nil
 	})
 	start := func() (*execution.Worker, func()) {
 		t.Helper()
diff --git a/services/core/tests/integration/sandbox_node_auth_order_http_test.go b/services/core/tests/integration/sandbox_node_auth_order_http_test.go
index 67f9d9615..4e152b8a3 100644
--- a/services/core/tests/integration/sandbox_node_auth_order_http_test.go
+++ b/services/core/tests/integration/sandbox_node_auth_order_http_test.go
@@ -75,7 +75,7 @@ func TestSandboxNodeRoutesAuthenticateBeforeDeploymentState(t *testing.T) {
 
 	// Once Web claims an installation, still before initialization, another
 	// installation's token gets the same 401 it gets after initialization.
-	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_deployment SET installation_id=$1, web_managed=true WHERE singleton=true", claimed); err != nil {
+	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_deployment SET installation_id=$1 WHERE singleton=true", claimed); err != nil {
 		t.Fatal(err)
 	}
 	run([]check{
diff --git a/services/core/tests/integration/sandbox_reset_test.go b/services/core/tests/integration/sandbox_reset_test.go
index 43316c0e0..cc37abdc4 100644
--- a/services/core/tests/integration/sandbox_reset_test.go
+++ b/services/core/tests/integration/sandbox_reset_test.go
@@ -251,20 +251,17 @@ func TestSandboxResetAuditFailureRollsBackPauseAndCompletion(t *testing.T) {
 }
 
 func TestSandboxResetSnapshotCountsOfflineOwnershipOnce(t *testing.T) {
-	s, w, process := managerFixture(t, 10, 10)
-	// Reuse the real placement fixture, then adopt its selection as Web-managed.
-	runtimeSuspensionSQL(t, s.pool, `UPDATE runtime_deployment SET web_managed=true,local_node_id=NULL`)
-	runtimeSuspensionSQL(t, s.pool, `UPDATE runtime_nodes SET deployment_generation=1,specification_digest=$1`, SandboxDeploymentTestSpec("docker").Digest("docker"))
+	s, w, d := managerFixture(t, 10, 10)
 	_, pending := managedArchiveSession(t, s, managerSessionInput(uuid.NewString()))
 	tenant, suspended := managedArchiveSession(t, s, managerSessionInput(uuid.NewString()))
-	allocation := archiveAllocation(t, w, tenant, suspended, process.InstallationID)
+	allocation := archiveAllocation(t, w, tenant, suspended, d.InstallationID)
 	runtimeSuspensionSQL(t, s.pool, `UPDATE runtime_allocations SET compute_phase='suspended',compute_retained_until=clock_timestamp()+interval '1 hour' WHERE id=$1`, allocation.ID)
 	tenant, deleted := managedArchiveSession(t, s, managerSessionInput(uuid.NewString()))
-	archiveAllocation(t, w, tenant, deleted, process.InstallationID)
+	archiveAllocation(t, w, tenant, deleted, d.InstallationID)
 	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: deleted.ID}); err != nil {
 		t.Fatal(err)
 	}
-	reset, err := startReset(t, SandboxResetTestContext(t.Context()), w, process.InstallationID, deployment.ResetRequest{ExpectedGeneration: 1, Clear: "auto"})
+	reset, err := startReset(t, SandboxResetTestContext(t.Context()), w, d.InstallationID, deployment.ResetRequest{ExpectedGeneration: 1, Clear: "auto"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -274,7 +271,7 @@ func TestSandboxResetSnapshotCountsOfflineOwnershipOnce(t *testing.T) {
 	}
 	for _, state := range []string{"preparing", "stale", "epoch", "disconnected"} {
 		runtimeSuspensionSQL(t, s.pool, `UPDATE runtime_nodes SET connected_epoch=(SELECT owner_epoch FROM runtime_deployment)`)
-		onlineManagerNode(t, s, process.LocalNodeID)
+		onlineManagerNode(t, s, d.NodeID)
 		switch state {
 		case "preparing":
 			runtimeSuspensionSQL(t, s.pool, `UPDATE runtime_nodes SET provider_ready=false`)
@@ -298,14 +295,14 @@ func TestSandboxResetSnapshotCountsOfflineOwnershipOnce(t *testing.T) {
 		if view.Reset.Remaining.OnOfflineNodes != want {
 			t.Fatalf("%s presence: %+v", state, view.Reset.Remaining)
 		}
-		if want > 0 && (len(view.Reset.Remaining.OfflineNodes) != 1 || view.Reset.Remaining.OfflineNodes[0].NodeID != process.LocalNodeID || view.Reset.Remaining.OfflineNodes[0].Resources != 3) {
+		if want > 0 && (len(view.Reset.Remaining.OfflineNodes) != 1 || view.Reset.Remaining.OfflineNodes[0].NodeID != d.NodeID || view.Reset.Remaining.OfflineNodes[0].Resources != 3) {
 			t.Fatal("offline ownership projection", view.Reset.Remaining)
 		}
 	}
-	if _, err := deploymentExecution(t, w).CompleteReset(t.Context(), process.InstallationID, 1, reset.Reset.RequestedAt); err == nil {
+	if _, err := deploymentExecution(t, w).CompleteReset(t.Context(), d.InstallationID, 1, reset.Reset.RequestedAt); err == nil {
 		t.Fatal("offline resources were treated as cleaned")
 	}
-	if err := deploymentService(t, s).RemoveNode(t.Context(), process.LocalNodeID); !errors.Is(err, deployment.ErrNodeInUse) {
+	if err := deploymentService(t, s).RemoveNode(t.Context(), d.NodeID); !errors.Is(err, deployment.ErrNodeInUse) {
 		t.Fatal("removed node with reset resources", err)
 	}
 	if row, err := sessionAdapter(s).GetEnvironment(t.Context(), pending.TenantID, pending.Environment.ID); err == nil && row.Status == "expired" {
diff --git a/services/core/tests/integration/sandbox_specification_lifecycle_test.go b/services/core/tests/integration/sandbox_specification_lifecycle_test.go
index 19e9e2513..314e90758 100644
--- a/services/core/tests/integration/sandbox_specification_lifecycle_test.go
+++ b/services/core/tests/integration/sandbox_specification_lifecycle_test.go
@@ -43,9 +43,15 @@ func webSpecificationFixture(t *testing.T, provider string) (*Store, *Store, dep
 }
 
 func specificationNode(t *testing.T, s *Store, view deployment.View) deployment.Enrollment {
+	t.Helper()
+	return enrollNode(t, s, view, deployment.Capacity{MaxActive: 4, MaxRetained: 16})
+}
+
+// enrollNode enrolls an online node with capacity on the committed setup view.
+func enrollNode(t *testing.T, s *Store, view deployment.View, capacity deployment.Capacity) deployment.Enrollment {
 	t.Helper()
 	nodes := deploymentService(t, s)
-	token, err := EnrollmentTestToken(nodes.CreateEnrollment(t.Context(), deployment.Capacity{MaxActive: 4, MaxRetained: 16}))
+	token, err := EnrollmentTestToken(nodes.CreateEnrollment(t.Context(), capacity))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_deletion_test.go b/services/core/tests/integration/session_deletion_test.go
index b62dc8629..724ad4555 100644
--- a/services/core/tests/integration/session_deletion_test.go
+++ b/services/core/tests/integration/session_deletion_test.go
@@ -396,7 +396,7 @@ func TestSessionDeletionKeepsProvisioningInputPlacementUntilSettled(t *testing.T
 		var current state
 		if err := s.pool.QueryRow(ctx, `SELECT s.deleted_at, p.released_at FROM sessions s
 			JOIN environments e ON e.session_id=s.id JOIN runtime_placements p ON p.environment_id=e.id
-			WHERE s.id=$1 AND p.node_id=$2`, session.ID, d.LocalNodeID).Scan(&current.deleted, &current.released); err != nil {
+			WHERE s.id=$1 AND p.node_id=$2`, session.ID, d.NodeID).Scan(&current.deleted, &current.released); err != nil {
 			t.Fatal("missing placement", err)
 		}
 		nodes, err := deploymentService(t, s).ListNodes(ctx)
diff --git a/services/core/tests/integration/web_deployment_only_migration_test.go b/services/core/tests/integration/web_deployment_only_migration_test.go
new file mode 100644
index 000000000..1bbec6ad9
--- /dev/null
+++ b/services/core/tests/integration/web_deployment_only_migration_test.go
@@ -0,0 +1,39 @@
+package integration
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/google/uuid"
+)
+
+// A process-configured deployment refuses the upgrade; a Web-managed one
+// keeps its installation and reset in both directions.
+func TestWebDeploymentOnlyMigrationRefusesProcessDeployment(t *testing.T) {
+	db, provider := runtimeNamesMigrationSchema(t)
+	ctx := t.Context()
+	if _, err := provider.UpTo(ctx, 92); err != nil {
+		t.Fatal(err)
+	}
+	installation := uuid.NewString()
+	if _, err := db.ExecContext(ctx, `UPDATE runtime_deployment SET installation_id=$1, backend_fingerprint=$2`, installation, strings.Repeat("a", 64)); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := provider.UpTo(ctx, 93); err == nil || !strings.Contains(err.Error(), "configured outside Web setup") {
+		t.Fatal("process deployment upgraded", err)
+	}
+	if _, err := db.ExecContext(ctx, `UPDATE runtime_deployment SET web_managed=true, provider_kind='docker', mode='nodes', generation=1,
+		admission_paused=true, reset_clear='force', reset_requested_at=now(), reset_forced_at=now(), reset_audit='{}'`); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := provider.UpTo(ctx, 93); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := provider.DownTo(ctx, 92); err != nil {
+		t.Fatal(err)
+	}
+	var restored bool
+	if err := db.QueryRowContext(ctx, `SELECT web_managed AND local_node_id IS NULL AND admission_paused AND installation_id=$1 FROM runtime_deployment`, installation).Scan(&restored); err != nil || !restored {
+		t.Fatal("downgrade lost the Web installation", err)
+	}
+}
diff --git a/services/core/tests/integration/worker_fixture_test.go b/services/core/tests/integration/worker_fixture_test.go
index 872c77345..790749499 100644
--- a/services/core/tests/integration/worker_fixture_test.go
+++ b/services/core/tests/integration/worker_fixture_test.go
@@ -4,11 +4,17 @@ import (
 	"context"
 	"errors"
 	"testing"
+	"time"
 
+	"github.com/google/uuid"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
@@ -110,3 +116,76 @@ func fixtureOwner(s *Store, lease *pgunit.Lease) (execution.Owner, error) {
 		Sessions:   sessionExecution,
 	}, nil
 }
+
+// webDeployment claims s's deployment for a new installation and selects
+// provider on it as Web setup does, then closes its execution lease so a
+// Worker can start. It returns the installation.
+func webDeployment(t *testing.T, s *Store, provider string) string {
+	t.Helper()
+	lease, err := pgunit.AcquireLease(t.Context(), s.pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer lease.Close(context.Background())
+	owner, err := fixtureOwner(s, lease)
+	if err != nil {
+		t.Fatal(err)
+	}
+	installation := uuid.NewString()
+	input := sandbox.Selection{Provider: provider, DeploymentSpec: SandboxDeploymentTestSpec(provider)}
+	if provider == "e2b" {
+		input = e2bSelection()
+	}
+	if err := owner.Deployment.Claim(t.Context(), installation); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := owner.Deployment.Initialize(t.Context(), installation, input); err != nil {
+		t.Fatal(err)
+	}
+	return installation
+}
+
+// webRuntimes is the Worker's sandbox runtimes as cmd/server builds them for
+// installation: a deferred provider that runs s's committed Web setup on p.
+func webRuntimes(t testing.TB, s *Store, installation string, p sandbox.SandboxProvider, suspension *execution.RuntimeSuspensionPolicy) *execution.RuntimeProvider {
+	deployments := deploymentService(t, s)
+	return execution.NewDeferredRuntimeProvider(installation, func(ctx context.Context) (*execution.RuntimeProvider, error) {
+		setup, err := deployments.Setup(ctx)
+		if err != nil || setup.Provider == "" {
+			return nil, err
+		}
+		return &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, Generation: setup.Generation,
+			CoreURL: "http://core.invalid/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: p, Suspension: suspension}, nil
+	}, unusedPreparation(t))
+}
+
+// unusedPreparation is the preparer of a test that submits no sandbox
+// selection through the Worker; preparing one fails the test.
+func unusedPreparation(t testing.TB) execution.RuntimeDeploymentPreparer {
+	return func(context.Context, deployment.Setup) (execution.PreparedRuntimeDeployment, error) {
+		t.Error("the test prepared a sandbox selection it did not submit")
+		return execution.PreparedRuntimeDeployment{}, errors.New("unexpected sandbox selection preparation")
+	}
+}
+
+// startWebWorker starts the Worker on webRuntimes.
+func startWebWorker(t *testing.T, s *Store, registry *runtimegateway.Registry, installation string, p sandbox.SandboxProvider, suspension *execution.RuntimeSuspensionPolicy) *execution.Worker {
+	t.Helper()
+	w, err := startNextWorker(t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: webRuntimes(t, s, installation, p, suspension)})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return w
+}
+
+// startNextWorker is startWorkerErr after another owner closed its lease. A
+// closed lease stays held until PostgreSQL ends its backend, so startup
+// retries ErrLeaseHeld briefly.
+func startNextWorker(ctx context.Context, s *Store, dispatcher *execution.Dispatcher) (*execution.Worker, error) {
+	for deadline := time.Now().Add(2 * time.Second); ; time.Sleep(20 * time.Millisecond) {
+		w, err := startWorkerErr(ctx, s, dispatcher)
+		if !errors.Is(err, pgunit.ErrLeaseHeld) || time.Now().After(deadline) {
+			return w, err
+		}
+	}
+}

From a2b16b51ccf7b0e2c9d8367d211c0c7a1f0f327e Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 02:55:47 +0800
Subject: [PATCH 42/60] Define the Sandbox Provider protocol in one file (#521)

---
 AGENTS.md                                     |   2 +-
 contracts/agents-api/core.openapi.yaml        |   2 +-
 .../agents-api/runtime-observability-api.md   |   2 +-
 contracts/agents-api/runtime-observability.md |  16 +-
 .../zh/runtime-observability-api.md           |   4 +-
 .../agents-api/zh/runtime-observability.md    |  18 +-
 docs/sandbox-provider.md                      |  41 ++-
 docs/zh/sandbox-provider.md                   |  43 ++-
 services/core/cmd/sandbox-node/generations.go |   2 +-
 services/core/cmd/server/main.go              |   6 +-
 .../server/managed_generation_operations.go   |  60 +---
 .../core/cmd/server/managed_generations.go    |  49 +---
 services/core/cmd/server/managed_setup.go     |  45 ++-
 .../core/cmd/server/managed_setup_test.go     |  36 +--
 .../deploy/e2b/helper_contract_generated.py   |   3 +-
 services/core/internal/api/admin_runtime.go   |   2 +-
 .../archive_cancellation_cleanup_test.go      |   2 +-
 .../provider_operations_fixture_test.go       |  49 +---
 .../internal/execution/runtime_compute.go     |  21 +-
 .../execution/runtime_compute_wake.go         |   4 +-
 .../sandbox_deployment_drain_test.go          |   4 +-
 .../sandbox_deployment_setup_test.go          |   8 +-
 .../sandbox_deployment_switch_test.go         |  10 +-
 .../execution/sandbox_generations_test.go     |   2 +-
 .../internal/execution/sandbox_reset_test.go  |   4 +-
 .../execution/sandbox_snapshot_budget_test.go |   2 +-
 .../internal/providercontract/operations.go   |  30 --
 .../runtimeobs/exporter_independence_test.go  |   2 +-
 .../runtimeobs/operations_fixture_test.go     |  46 +--
 .../internal/runtimeobs/operations_test.go    |  57 +---
 services/core/internal/runtimeobs/sampler.go  |   3 +-
 .../core/internal/runtimeobs/sampler_test.go  |   4 +-
 services/core/internal/runtimeobs/service.go  | 169 +++--------
 .../core/internal/runtimeobs/service_test.go  | 136 ++-------
 services/core/internal/runtimeobs/source.go   |  49 +---
 .../core/internal/runtimeobs/source_test.go   |  93 ++----
 .../core/internal/sandbox/configuration.go    |  63 ----
 .../internal/sandbox/configuration_errors.go  |  24 --
 .../internal/sandbox/docker/operations.go     |  50 +---
 .../core/internal/sandbox/docker/resources.go |   8 -
 .../internal/sandbox/e2b/configuration.go     |   3 +-
 .../core/internal/sandbox/e2b/credential.go   |   8 +-
 .../core/internal/sandbox/e2b/deployment.go   |  16 +-
 .../internal/sandbox/e2b/helper_contract.go   |  17 +-
 .../sandbox/e2b/internal/contractgen/main.go  |  43 ++-
 .../core/internal/sandbox/e2b/observations.go | 100 ++-----
 .../internal/sandbox/e2b/observations_test.go |  64 ++---
 .../core/internal/sandbox/e2b/operations.go   |  41 +--
 .../core/internal/sandbox/e2b/provider.go     |  31 +-
 .../sandbox/microsandbox/operations.go        |  56 ++--
 .../internal/sandbox/microsandbox/provider.go |   7 -
 .../sandbox/microsandbox/resources.go         |   8 -
 .../internal/sandbox/node/connection_test.go  |   2 +-
 .../sandbox/node/creation_settlement_test.go  |   2 +-
 .../internal/sandbox/node/docker_live_test.go |   2 +-
 .../node/generation_connection_test.go        |   2 +-
 .../core/internal/sandbox/node/generations.go |  13 +-
 .../internal/sandbox/node/generations_test.go |   9 +-
 .../sandbox/node/hub_lifetime_test.go         |   4 +-
 .../core/internal/sandbox/node/node_test.go   |   4 +-
 .../internal/sandbox/node/observations.go     |  20 --
 .../sandbox/node/observations_test.go         |   7 +-
 .../internal/sandbox/node/operations_test.go  |   5 +-
 .../node/provider_operations_fixture_test.go  |  89 ++----
 services/core/internal/sandbox/node/proxy.go  |  28 +-
 .../internal/sandbox/node/recovery_test.go    |   8 +-
 .../internal/sandbox/node/timeout_test.go     |   2 +-
 services/core/internal/sandbox/node/wire.go   |  25 +-
 services/core/internal/sandbox/operations.go  |  88 ------
 .../core/internal/sandbox/operations_test.go  |  44 +--
 .../core/internal/sandbox/providers/config.go |   2 +
 .../sandbox/providers/configuration.go        |  58 +++-
 .../providers/configuration_flow_test.go      |   9 +-
 .../sandbox/providers/configuration_test.go   |   6 +-
 .../core/internal/sandbox/providers/e2b.go    |  56 ----
 .../sandbox/providers/generation_test.go      |   3 +
 .../sandbox/providers/microsandbox.go         |   1 +
 .../providers/registration_configuration.go   |  25 +-
 .../registration_configuration_test.go        | 110 ++++---
 .../sandbox/providers/registration_test.go    |   9 +-
 .../internal/sandbox/providers/registry.go    |  23 +-
 .../core/internal/sandbox/sandbox_provider.go | 268 ++++++++++++++++--
 .../internal/sandbox/sandbox_provider_test.go |  24 ++
 services/core/internal/sandbox/selection.go   |  31 --
 services/core/internal/sandbox/suspension.go  |  57 ----
 .../provider_operations_fixture_test.go       |  89 ++----
 services/core/tools/e2b-provider/README.md    |   6 +-
 .../tools/e2b-provider/deployment_test.py     |   2 +-
 .../e2b-provider/helper_contract_generated.py |   3 +-
 .../tools/e2b-provider/observation_test.py    |  45 ++-
 services/core/tools/e2b-provider/provider.py  | 104 +++----
 services/core/tools/e2b-provider/sdk.py       |  12 +-
 .../tools/e2b-provider/testdata/contract.json |   9 +-
 .../tools/microsandbox-provider/README.md     |   2 +-
 94 files changed, 1030 insertions(+), 1843 deletions(-)
 delete mode 100644 services/core/internal/sandbox/configuration_errors.go
 delete mode 100644 services/core/internal/sandbox/operations.go
 delete mode 100644 services/core/internal/sandbox/providers/e2b.go
 create mode 100644 services/core/internal/sandbox/sandbox_provider_test.go
 delete mode 100644 services/core/internal/sandbox/selection.go
 delete mode 100644 services/core/internal/sandbox/suspension.go

diff --git a/AGENTS.md b/AGENTS.md
index 364d6fb72..5772e4aab 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -39,7 +39,7 @@ Do not multiply entities without necessity. The long-term goal is minimal code,
 
 - A new Sandbox Provider, Harness, model provider or vendor feature changes only its adapter. It adds no Core execution path, store table or column, migration, deployment or configuration field, API field or Web UI specific to one vendor or Harness. The [Sandbox Provider guide](docs/sandbox-provider.md) and [Harness onboarding](contracts/agents-api/harness-onboarding.md) describe how to add an adapter.
 - When the protocol cannot express what an adapter needs, change the protocol. Never add an optional side interface for one implementation.
-- Implementing the declared `CheckpointProvider` lifecycle in one vendor's Provider is an adapter change. A vendor-only pause interface, a Core path for that vendor, vendor receipts in the store or a vendor idle setting in the deployment is not.
+- Implementing the declared checkpoint lifecycle in one vendor's Provider is an adapter change. A vendor-only pause interface, a Core path for that vendor, vendor receipts in the store or a vendor idle setting in the deployment is not.
 - Fix shared lifecycle, admission, cancellation, reuse and performance problems in the common flow, never in a branch selected by Harness, Runtime or vendor name. Core preparation and execution never branch on operating system or Environment source; platform support requires native CI builds and automated tests.
 - Each Harness runs its own model and tool loop through a maintained upstream SDK or native protocol, in the Environment's declared workspace directory. Its native history or configuration directory is never the workspace. Never build a second executor, a hand-written model/tool loop or a compatibility framework to fabricate parity. The public API and persistence never depend on one engine's native item types.
 
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index 27637917c..e26119271 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -6714,7 +6714,7 @@ paths:
         - Sandbox Manager
   /core/v1/sandbox/runtime-observations:
     get:
-      description: Core key only. Each observation is labelled with its owning Project ID. Uses the existing read-only Runtime sampler, with bounded concurrency and no execution or provisioning. A provider with a batch metrics read, such as E2B, samples the page's running sandboxes in one bounded request.
+      description: Core key only. Each observation is labelled with its owning Project ID. Uses the existing read-only Runtime sampler, with bounded concurrency and no execution or provisioning.
       parameters:
         - description: Last Session ID from the preceding page
           in: query
diff --git a/contracts/agents-api/runtime-observability-api.md b/contracts/agents-api/runtime-observability-api.md
index 96ee57d21..2e1db7019 100644
--- a/contracts/agents-api/runtime-observability-api.md
+++ b/contracts/agents-api/runtime-observability-api.md
@@ -145,7 +145,7 @@ Only list rows carry `disk`: null, or `{usage_bytes, limit_bytes}` with the rule
 | `unsupported` | `runtime_mode_not_observable` | `none` and `self_hosted` Sessions. |
 | `unavailable` | `allocation_pending` | The managed allocation does not exist yet or is being created. |
 | `unavailable` | `runtime_not_running` | The allocation is being cleaned up or is released, or the provider reports the Runtime absent, stopped or suspended. |
-| `unavailable` | `source_not_configured` | No observation source serves the allocation's provider. |
+| `unavailable` | `source_not_configured` | This Core has no managed installation identity. |
 | `unavailable` | `sample_timeout` | The provider read exceeded its deadline. |
 | `unavailable` | `sample_unavailable` | The provider could not produce a current sample. |
 
diff --git a/contracts/agents-api/runtime-observability.md b/contracts/agents-api/runtime-observability.md
index 31fe8e4ff..a30353900 100644
--- a/contracts/agents-api/runtime-observability.md
+++ b/contracts/agents-api/runtime-observability.md
@@ -20,13 +20,11 @@ The resolver (`services/core/internal/deployment/observation.go`) reads the Sess
 
 Managed Docker, microsandbox and E2B allocations are observed. `none` and `self_hosted` Sessions are `unsupported`; Core never attributes shared host statistics to an `environment:none` Session.
 
-The allocation's persisted `provider_key` selects exactly one configured source, which verifies the allocation's labels or equivalent ownership data before it returns values. Before any provider read, the allocation state decides some rows: `creating` or no allocation yet gives `allocation_pending`, `cleanup_pending` or `released` gives `runtime_not_running`, and a provider key without a source gives `source_not_configured`. A provider read that exceeds its deadline gives `sample_timeout`, a not-running result `runtime_not_running`, and an unavailable result `sample_unavailable`. Any other error, an ownership mismatch or an invalid sample fails the read.
+Every managed allocation is read through the deployment's selected Sandbox Provider, which verifies the allocation's installation (`provider_key`) and labels or equivalent ownership data before it returns values. Before any provider read, the allocation state decides some rows: `creating` or no allocation yet gives `allocation_pending`, `cleanup_pending` or `released` gives `runtime_not_running`, and a Core without an installation identity gives `source_not_configured`. A provider read that exceeds its deadline gives `sample_timeout`, a not-running result `runtime_not_running`, and an unavailable result `sample_unavailable`. Any other error, an ownership mismatch or an invalid sample fails the read.
 
-The observation boundary is declared in `services/core/internal/runtimeobs/source.go`. Each registered `SourceResolver` declares supported `ResolveObservationSource`; registration validates this declaration without loading configuration or reading the database. Core resolves each provider key once per page, then validates the returned `Source` and uses that same immutable source for every read of the key on that page. An unconfigured resolver returns typed `ErrUnavailable`, which produces `sample_unavailable` without a provider type. Other resolution errors follow the provider-read error rules above.
+`Observe` belongs to the [Sandbox Provider protocol](../../docs/sandbox-provider.md); `services/core/internal/runtimeobs/source.go` owns the observation types and the `Source` view of a Provider. Core loads the selected Provider and its registered kind once per page and uses that same immutable Provider for every read on that page, reading each running target with `Observe`. Without a selection the load returns typed `ErrUnavailable`, which produces `sample_unavailable` without a provider type. Other load errors follow the provider-read error rules above.
 
-A source declares supported `ObservationProviderType`, which returns its immutable telemetry identity: a lowercase letter followed by at most 31 lowercase letters, digits or underscores. Empty identities are invalid. Provider registration and every resolved binding validate the identity and operation declarations before any sample or export. Reconfiguration affects later source resolutions; it cannot change the identity or provider selected for an in-flight page. Generation routers continue to resolve each allocation through its recorded deployment generation.
-
-A source implements `Observe` and declares `ObserveBatch` in its provider operations. When `ObserveBatch` is declared supported, one call reads up to 100 targets of that provider; when it is declared unsupported, Core reads each target with `Observe`. A failed batch read is never retried target by target. The [Sandbox Provider guide](../../docs/sandbox-provider.md) describes the operation declarations.
+An observation's provider type is that registered kind: `docker`, `microsandbox` or `e2b`. Reconfiguration affects later pages; it cannot change the provider type or Provider selected for an in-flight page. Generation routers continue to resolve each allocation through its recorded deployment generation.
 
 ## Sample semantics
 
@@ -56,7 +54,7 @@ Cumulative vCPU time, guest memory usage and the effective memory limit come fro
 
 ### E2B
 
-One helper `observe` request reads a page of at most 100 allocations: E2B's batch metrics for the sandboxes named in the private receipts, and a labelled listing of the installation's running sandboxes that confirms each one. The [E2B helper](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/tools/e2b-provider/README.md) owns that request. It never connects to, renews or changes a sandbox and writes no receipts.
+Core reads each allocation with one helper `observe` request: E2B's metrics for the sandbox named in its private receipt, and a listing of running sandboxes with the allocation's labels that confirms it. The [E2B helper](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/tools/e2b-provider/README.md) owns that request. It never connects to, renews or changes a sandbox and writes no receipts.
 
 | E2B value | Sample field |
 | --- | --- |
@@ -65,11 +63,11 @@ One helper `observe` request reads a page of at most 100 allocations: E2B's batc
 | `memUsed`, `memTotal` | Memory usage and limit |
 | `diskUsed`, `diskTotal` | Disk usage and capacity, kept only when both are present and the total is nonzero |
 
-E2B reports no cumulative CPU time, so CPU seconds stay null. `observed_at` is E2B's point time; a point up to 30 seconds ahead of Core's clock is recorded at Core's time, and a larger lead is `sample_unavailable`. A sandbox missing from the running listing is `runtime_not_running`. A missing or malformed point, an ambiguous listing and an E2B API failure, a rejected key included, are `sample_unavailable`; a malformed point affects only its own row.
+E2B reports no cumulative CPU time, so CPU seconds stay null. `observed_at` is E2B's point time; a point up to 30 seconds ahead of Core's clock is recorded at Core's time, and a larger lead is `sample_unavailable`. A sandbox missing from the running listing is `runtime_not_running`. A missing or malformed point, an ambiguous listing and an E2B API failure, a rejected key included, are `sample_unavailable`.
 
 ## Read budgets
 
-A current list read handles one page of up to 100 Sessions (default 20) with at most eight concurrent provider reads. Each provider read has two seconds, a batch read at least five, and the whole list request ten; beyond that the list returns 503. A single-Session read has two seconds. No provider call is retried within a request, and Core keeps no observation cache.
+A current list read handles one page of up to 100 Sessions (default 20) with at most eight concurrent provider reads. Each provider read has two seconds and the whole list request ten; beyond that the list returns 503. A single-Session read has two seconds. No provider call is retried within a request, and Core keeps no observation cache.
 
 ## Durations
 
@@ -123,7 +121,7 @@ With an OTLP endpoint configured, Core exports every record, both `on_read` and
 | `agents.session.tokens.input` | Gauge, tokens | Measured Session input tokens |
 | `agents.session.tokens.output` | Gauge, tokens | Measured Session output tokens |
 | `agents.runtime.sample` | Monotonic delta sum | One per validated result, unavailable and unsupported included |
-| `agents.runtime.sample.duration` | Delta histogram, seconds | Provider read duration; a batch read counts once |
+| `agents.runtime.sample.duration` | Delta histogram, seconds | Provider read duration |
 
 CPU and memory points are exported only when the sample has `started_at`; a missing measurement produces no point. Attributes are `agents.tenant.id`, `agents.session.id`, `agents.environment.id`, `agents.runtime.allocation.id`, `agents.runtime.mode`, `agents.runtime.provider.type`, `agents.runtime.status`, `agents.runtime.reason`, `agents.runtime.collection.source` and nanosecond `agents.runtime.resolved_at_unix_nano`, `agents.runtime.observed_at_unix_nano` and `agents.runtime.compute.started_at_unix_nano`. The nanosecond times keep records joinable when a backend stores event time at lower precision. Provider keys, receipts, native identifiers, raw errors, paths and credentials are never attributes.
 
diff --git a/contracts/agents-api/zh/runtime-observability-api.md b/contracts/agents-api/zh/runtime-observability-api.md
index d81203db3..984c5ab7e 100644
--- a/contracts/agents-api/zh/runtime-observability-api.md
+++ b/contracts/agents-api/zh/runtime-observability-api.md
@@ -1,7 +1,7 @@
 ---
 title: "Runtime 遥测 API"
 source: contracts/agents-api/runtime-observability-api.md
-source_hash: d6111447def530b07c392d457cce0cd553f92dafb2e7cc7f481da47f816fcab2
+source_hash: 6eca80ffefcaf8e26901659e5251518f84d2c6c93349085b378d46f9ac49149d
 ---
 
 Core 通过 `/core/v1` 下的只读管理员路由报告托管 Runtime 和沙箱节点所使用的信息：当前 Runtime 观测值、单个 Session 的已存储 Runtime 历史记录，以及沙箱节点的主机观测值和历史记录。读取操作绝不创建、唤醒、续期或更改计算资源，也绝不向历史记录添加样本。[Runtime observability](runtime-observability.md) 定义了 Core 如何采集和保留这些值；[Console API usage](../../../docs/zh/web/console-api-usage.md) 列出了读取这些值的 Web 页面。
@@ -147,7 +147,7 @@ Authorization: Bearer <Core key>
 | `unsupported` | `runtime_mode_not_observable` | `none` 和 `self_hosted` Session。 |
 | `unavailable` | `allocation_pending` | 托管分配尚不存在或正在创建。 |
 | `unavailable` | `runtime_not_running` | 分配正在清理或已释放，或者提供方报告 Runtime 不存在、已停止或已暂停。 |
-| `unavailable` | `source_not_configured` | 该分配的提供方未配置任何观测源。 |
+| `unavailable` | `source_not_configured` | 此 Core 没有托管 installation 标识。 |
 | `unavailable` | `sample_timeout` | 提供方读取超过其截止时间。 |
 | `unavailable` | `sample_unavailable` | 提供方无法生成当前样本。 |
 
diff --git a/contracts/agents-api/zh/runtime-observability.md b/contracts/agents-api/zh/runtime-observability.md
index ddd10ea91..b4ef0f415 100644
--- a/contracts/agents-api/zh/runtime-observability.md
+++ b/contracts/agents-api/zh/runtime-observability.md
@@ -1,7 +1,7 @@
 ---
 title: "运行时可观测性"
 source: contracts/agents-api/runtime-observability.md
-source_hash: 103575f3971e77d5ba149cacb27e972e429a46713b2bda7da36cae43bbf313fa
+source_hash: d18a476b06248dedfa5630ccf0f8a29dff59677a1e161d1847cc7d05e0c48de8
 ---
 
 这是面向贡献者的契约，规定 Core 如何观测 Runtime 并保留其历史。路由和响应字段见 [Runtime telemetry API](runtime-observability-api.md)。代码位于 `services/core/internal/runtimeobs`（解析、源、采样器和导出）、`internal/runtimehistory`（历史查询和 PostgreSQL 存储）以及 `internal/runtimeobs/otlpexporter`。
@@ -22,13 +22,11 @@ none:        tenant_id -> session_id (no Session-owned Runtime instance)
 
 托管 Docker、microsandbox 和 E2B 分配均会被观测。`none` 和 `self_hosted` Session 为 `unsupported`；Core 绝不会将共享主机统计信息归属于 `environment:none` Session。
 
-分配中持久化的 `provider_key` 会选择且仅选择一个已配置源；该源在返回数值前会验证分配标签或等效所有权数据。在读取任何 provider 之前，部分行的结果由分配状态决定：处于 `creating` 状态或尚无分配时得到 `allocation_pending`，处于 `cleanup_pending` 或 `released` 状态时得到 `runtime_not_running`，provider key 没有对应源时得到 `source_not_configured`。provider 读取超出截止时间时得到 `sample_timeout`，返回未运行结果时得到 `runtime_not_running`，返回不可用结果时得到 `sample_unavailable`。任何其他错误、所有权不匹配或无效采样都会使读取失败。
+每个托管分配都通过部署所选的 Sandbox Provider 读取；该 Provider 在返回数值前会验证分配的 installation（`provider_key`）以及分配标签或等效所有权数据。在读取任何 provider 之前，部分行的结果由分配状态决定：处于 `creating` 状态或尚无分配时得到 `allocation_pending`，处于 `cleanup_pending` 或 `released` 状态时得到 `runtime_not_running`，Core 没有 installation 标识时得到 `source_not_configured`。provider 读取超出截止时间时得到 `sample_timeout`，返回未运行结果时得到 `runtime_not_running`，返回不可用结果时得到 `sample_unavailable`。任何其他错误、所有权不匹配或无效采样都会使读取失败。
 
-观测边界在 `services/core/internal/runtimeobs/source.go` 中声明。每个注册的 `SourceResolver` 都声明支持 `ResolveObservationSource`；注册过程会验证此声明，但不会加载配置或读取数据库。Core 每页只解析每个 provider key 一次，随后验证返回的 `Source`，并在该页上针对此 key 的每次读取中使用同一不可变源。未配置的解析器返回类型化的 `ErrUnavailable`，从而生成不含 provider 类型的 `sample_unavailable`。其他解析错误遵循上述 provider 读取错误规则。
+`Observe` 属于 [Sandbox Provider 协议](../../../docs/zh/sandbox-provider.md)；`services/core/internal/runtimeobs/source.go` 负责观测类型以及 Provider 的 `Source` 视图。Core 每页只加载一次所选 Provider 及其注册 kind，并在该页的每次读取中使用同一不可变 Provider，用 `Observe` 读取每个运行中的目标。没有选择时，加载返回类型化的 `ErrUnavailable`，从而生成不含 provider 类型的 `sample_unavailable`。其他加载错误遵循上述 provider 读取错误规则。
 
-源会声明支持的 `ObservationProviderType`，该类型返回其不可变遥测标识：一个小写字母，后跟最多 31 个小写字母、数字或下划线。空标识无效。在任何采样或导出之前，provider 注册和每个解析后的绑定都会验证标识及操作声明。重新配置会影响后续的源解析，但无法更改正在处理页面所选定的标识或 provider。Generation 路由器仍会通过每个分配记录的部署代次解析该分配。
-
-源实现 `Observe`，并在 provider 操作中声明 `ObserveBatch`。声明支持 `ObserveBatch` 时，一次调用可读取该 provider 的最多 100 个目标；声明不支持时，Core 使用 `Observe` 读取每个目标。批量读取失败后绝不会逐个重试目标。[Sandbox Provider guide](../../../docs/zh/sandbox-provider.md) 说明了这些操作声明。
+观测的 provider 类型即该注册 kind：`docker`、`microsandbox` 或 `e2b`。重新配置会影响后续页面，但无法更改正在处理页面所选定的 provider 类型或 Provider。Generation 路由器仍会通过每个分配记录的部署代次解析该分配。
 
 ## 采样语义 {#sample-semantics}
 
@@ -58,7 +56,7 @@ none:        tenant_id -> session_id (no Session-owned Runtime instance)
 
 ### E2B {#e2b}
 
-一次 helper `observe` 请求会读取一页最多 100 个分配：读取私有回执中指定 sandbox 的 E2B 批量指标，并获取该 installation 中运行中 sandbox 的带标签列表，以确认每一个 sandbox。[E2B helper](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/tools/e2b-provider/README.md) 负责此请求。它绝不会连接、续期或更改 sandbox，也不会写入任何回执。
+Core 用一次 helper `observe` 请求读取一个分配：读取私有回执中指定 sandbox 的 E2B 指标，并按该分配的标签列出运行中的 sandbox，以确认该 sandbox。[E2B helper](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/tools/e2b-provider/README.md) 负责此请求。它绝不会连接、续期或更改 sandbox，也不会写入任何回执。
 
 | E2B 值 | 采样字段 |
 | --- | --- |
@@ -67,11 +65,11 @@ none:        tenant_id -> session_id (no Session-owned Runtime instance)
 | `memUsed`、`memTotal` | 内存使用量和限制 |
 | `diskUsed`、`diskTotal` | 磁盘使用量和容量；仅当两者都存在且总量非零时保留 |
 
-E2B 不报告累计 CPU 时间，因此 CPU 秒数保持为 null。`observed_at` 为 E2B 的时间点；比 Core 时钟最多领先 30 秒的时间点按 Core 时间记录，领先幅度更大时则为 `sample_unavailable`。未出现在运行列表中的 sandbox 为 `runtime_not_running`。时间点缺失或格式错误、列表存在歧义以及 E2B API 失败（包括 key 被拒绝）均为 `sample_unavailable`；格式错误的时间点只影响其所在行。
+E2B 不报告累计 CPU 时间，因此 CPU 秒数保持为 null。`observed_at` 为 E2B 的时间点；比 Core 时钟最多领先 30 秒的时间点按 Core 时间记录，领先幅度更大时则为 `sample_unavailable`。未出现在运行列表中的 sandbox 为 `runtime_not_running`。时间点缺失或格式错误、列表存在歧义以及 E2B API 失败（包括 key 被拒绝）均为 `sample_unavailable`。
 
 ## 读取预算 {#read-budgets}
 
-当前列表读取处理一页最多 100 个 Session（默认 20 个），provider 读取并发数最多为 8。每次 provider 读取的时限为 2 秒，批量读取至少为 5 秒，整个列表请求为 10 秒；超过这些时限时，列表返回 503。单 Session 读取的时限为 2 秒。一次请求内不会重试任何 provider 调用，Core 也不保留观测缓存。
+当前列表读取处理一页最多 100 个 Session（默认 20 个），provider 读取并发数最多为 8。每次 provider 读取的时限为 2 秒，整个列表请求为 10 秒；超过这些时限时，列表返回 503。单 Session 读取的时限为 2 秒。一次请求内不会重试任何 provider 调用，Core 也不保留观测缓存。
 
 ## 时长 {#durations}
 
@@ -125,7 +123,7 @@ PostgreSQL 存储仅保留周期性的 `openai_hosted` 记录，因此 API 读
 | `agents.session.tokens.input` | Gauge，令牌 | 实测 Session 输入令牌 |
 | `agents.session.tokens.output` | Gauge，令牌 | 实测 Session 输出令牌 |
 | `agents.runtime.sample` | 单调差值和 | 每个经验证的结果一条，包括 unavailable 和 unsupported |
-| `agents.runtime.sample.duration` | Delta 直方图，秒 | Provider 读取时长；批量读取仅计一次 |
+| `agents.runtime.sample.duration` | Delta 直方图，秒 | Provider 读取时长 |
 
 仅当采样包含 `started_at` 时才导出 CPU 和内存数据点；缺少测量值不会产生数据点。属性包括 `agents.tenant.id`、`agents.session.id`、`agents.environment.id`、`agents.runtime.allocation.id`、`agents.runtime.mode`、`agents.runtime.provider.type`、`agents.runtime.status`、`agents.runtime.reason`、`agents.runtime.collection.source`，以及以纳秒为单位的 `agents.runtime.resolved_at_unix_nano`、`agents.runtime.observed_at_unix_nano` 和 `agents.runtime.compute.started_at_unix_nano`。这些纳秒时间使记录在后端以较低精度存储事件时间时仍可关联。Provider key、回执、原生标识符、原始错误、路径和凭据绝不会作为属性。
 
diff --git a/docs/sandbox-provider.md b/docs/sandbox-provider.md
index 7b4774a29..08ea0f988 100644
--- a/docs/sandbox-provider.md
+++ b/docs/sandbox-provider.md
@@ -15,7 +15,7 @@ Core owns durable Environment, allocation, placement and cleanup state; the Prov
 
 ## Steps
 
-1. **Read the contract.** Implement the five required operations and give an explicit decision for every extension interface in [Implement the interface](#implement-the-interface).
+1. **Read the contract.** Implement every method, support the required operations and declare a decision for each of the others in [Implement the interface](#implement-the-interface).
 2. **Write the adapter package** under `services/core/internal/sandbox/<kind>`: native SDK calls, ownership checks, identity translation and private configuration. Assert `var _ sandbox.SandboxProvider = (*YourAdapter)(nil)`. An out-of-process helper lives in `services/core/tools/<kind>-provider`.
 3. **Register the kind** once, following [Register the provider kind](#register-the-provider-kind). Registration is explicit construction, not an init-time plugin registry.
 4. **Label owned resources** with the provider ownership labels in the [Runtime names](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#openagentcore-runtime-names) table, and never accept older label names as a fallback.
@@ -25,7 +25,7 @@ Core owns durable Environment, allocation, placement and cleanup state; the Prov
 
 ## Implement the interface
 
-`SandboxProvider` has five required operations:
+`sandbox_provider.go` holds the Core–Sandbox Provider protocol: the `SandboxProvider` interface for allocation, checkpoint and observation, its request and result types, and the setup-time `ConfigurationAdapter` with its typed errors. Value types that Core also uses beyond this boundary, such as `DeploymentSpec` and `CallFence`, live in their own files of the same package. Every method is required at compile time, and `ProviderOperations()` declares which ones the Provider supports. Five operations are always supported:
 
 | Operation | Purpose |
 | --- | --- |
@@ -39,26 +39,23 @@ A backend without a native renewable lease, such as Docker, still keeps Core's h
 
 ### Explicit operation contracts
 
-Every provider implements the methods of each interface below and returns a complete `ProviderOperations()` declaration. The interface methods are the operation inventory; `sandbox.ValidateOperations` checks the declaration against it without a second hand-kept list.
+Every provider returns a complete `ProviderOperations()` declaration with one entry for each `SandboxProvider` method except `ProviderOperations` itself. The interface's method set is the operation inventory, and `sandbox.ValidateOperations` checks the declaration against it. The groups in the table below are lists in the protocol file, and a test keeps them equal to that method set, so a new method must join one of them.
 
-| Contract | Requirement | Responsibility |
+| Operations | Requirement | Responsibility |
 | --- | --- | --- |
-| `sandbox.SandboxProvider` | All five operations supported | Allocation lifecycle and bounded commands |
-| `sandbox.CheckpointProvider` | Explicit decision for every method, the same for all of them | Exact compute incarnations, capture and restore, retained-source resume and cleanup |
-| `runtimeobs.Source` | Explicit decision | Ownership-checked read-only observations |
-| `runtimeobs.BatchSource` | Explicit decision; requires `Source` | Bounded observations in input order, with per-target errors |
-| `sandbox.SelectionDiscoverer` | Explicit decision | Read-only native configuration discovery before commit |
-| `sandbox.CredentialVerifier` | Explicit decision | Verify access to owned resources without mutation |
+| `Create`, `GetInfo`, `Renew`, `Kill`, `RunCommand` | Supported | Allocation lifecycle and bounded commands |
+| `Observe` | Explicit decision | Ownership-checked read-only observation of one allocation |
+| `Initial`, `NewCompute`, `GetCompute`, `Suspend`, `Resume`, `ResumeCompute`, `KillCompute`, `DeleteSnapshot`, `RunCommandCompute` | The same decision for every checkpoint method; supported only by a `nodes` registration | Exact compute incarnations, capture and restore, retained-source resume and cleanup |
 
-`CheckpointProvider` adds `Initial` and `NewCompute` (construct compute references without allocating), `GetCompute`, `Suspend`, `Resume`, `ResumeCompute` (thaw only the same resident instance after an aborted pause), `KillCompute`, `DeleteSnapshot` and `RunCommandCompute`, which runs a bounded command in one exact compute incarnation. Core uses `RunCommandCompute` to wake a parked daemon after a restore ([`runtime_compute_wake.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/execution/runtime_compute_wake.go)).
+`Initial` and `NewCompute` construct compute references without allocating, `ResumeCompute` thaws only the same resident instance after an aborted pause, and `RunCommandCompute` runs a bounded command in one exact compute incarnation. Core uses `RunCommandCompute` to wake a parked daemon after a restore ([`runtime_compute_wake.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/execution/runtime_compute_wake.go)).
 
-Each declaration entry is `state: supported` with no reason, or `state: unsupported` with an authored reason code. Missing, zero, unknown or unsafe entries and missing methods fail validation. Adding a method to an interface requires an explicit decision and implementation in every adapter; never supply a base type or generate blanket unsupported implementations.
+Each declaration entry is `state: supported` with no reason, or `state: unsupported` with an authored reason code. Missing, zero, unknown or unsafe entries fail validation. Adding a method to `SandboxProvider` requires an explicit decision and implementation in every adapter; never supply a base type or generate blanket unsupported implementations.
 
 An unsupported method returns `providercontract.UnsupportedError` before any native I/O. The error names the exact operation and a safe code, never a native message, resource identity, endpoint or credential. An empty result, a nil error, `Unavailable` or an unknown mutation outcome never stands in for unsupported, and the five required methods can never return it.
 
-Each adapter owns one `Operations()` function, shared by its instance and its registration. `providers.ValidateBinding` checks both against the interfaces and each other, and Runtime admission and node generation loading also reject incomplete providers. An interface assertion establishes only method shape; callers use the declaration to decide support.
+Each adapter owns one `Operations()` function, shared by its instance and its registration. `providers.ValidateBinding` checks both against the interface and each other, and Runtime admission and node generation loading also reject incomplete providers. Callers check the declaration with `providercontract.Require` before they call an operation, never a type assertion.
 
-`ObserveBatch` returns an error, not an ambiguous boolean. Only a typed `UnsupportedError` for `ObserveBatch` permits per-target `Observe` calls; an unavailable service, timeout or other failure never does. Observation never renews, starts, prepares or stops compute; see the [observation contract](../contracts/agents-api/runtime-observability.md).
+`Observe` reads one allocation and never renews, starts, prepares or stops compute; see the [observation contract](../contracts/agents-api/runtime-observability.md).
 
 Contract tests call every method declared unsupported with no native client configured, require its matching error and zero result, and reject incomplete or contradictory declarations. Supported behavior still needs native and lifecycle tests.
 
@@ -110,9 +107,9 @@ Hosted and self-hosted Environments use the same Runtime preparation; a provider
 A new provider takes these steps:
 
 1. Implement the operation contracts in the adapter package, with native contract tests.
-2. Add its specification and resource validators and, for native resource discovery before commit, an optional read-only `SelectionDiscoverer`. Put native credential verification behind `CredentialVerifier`.
-3. Implement `sandbox.ConfigurationAdapter` over a typed native configuration. `DecodeInput` strictly parses the separate public `configuration` and write-only `credential` objects of a request. `Encode` produces whitelisted public selectors, read-only observations and separate secret bytes, and never passes request JSON through. `Decode` restores stored selectors, and keeps access to owned resources, without remote admission or new template validation. `Normalize` copies its input before changing it. `ResolveChange`, `Equal` and `WithCredential` own inheritance, identity and credential composition. `Requirements` declares whether a credential and a public Core origin are required and whether configuration discovery is supported. Also implement `ConfigurationDiscoverer`, even when discovery is unsupported: it validates the query and returns a safe catalog, never a mutation or an admission decision, while Core keeps authorization, input limits and deadlines. A node provider accepts only an empty public object, rejects credentials and returns Unsupported for discovery and credential replacement.
-4. Register its constructor, policies, configuration adapter, operation declaration and defaults in `providers/registry.go`. Node proxy identity and checkpoint support read this entry. The installer's projection combines the registered policies with the shared field bounds in `sandbox/deployment_contract.go`; regenerate it with `go run ./services/core/cmd/specification-contract -write`.
+2. Add its specification and resource validators.
+3. Implement `sandbox.ConfigurationAdapter` over a typed native configuration. `DecodeInput` strictly parses the separate public `configuration` and write-only `credential` objects of a request. `Encode` produces whitelisted public selectors, read-only observations and separate secret bytes, and never passes request JSON through. `Decode` restores stored selectors, and keeps access to owned resources, without remote admission or new template validation. `Normalize` copies its input before changing it. `ResolveChange`, `Equal` and `WithCredential` own inheritance, identity and credential composition. `Requirements` declares whether a credential and a public Core origin are required, and which setup operations are supported: `Discovery` for `DiscoverConfiguration`, `SelectionDiscovery` for `DiscoverSelection` and `CredentialVerification` for `VerifyCredential`. `DiscoverConfiguration` validates the query and returns a safe catalog, never a mutation or an admission decision, while Core keeps authorization, input limits and deadlines. `DiscoverSelection` resolves a candidate's omitted native values before commit, and `VerifyCredential` verifies a credential's access to owned resources without mutation. Both receive the candidate's `sandbox.DirectConfig` and build any native client for that call only. A node provider accepts only an empty public object, rejects credentials and returns Unsupported for every setup operation and for credential replacement.
+4. Register its constructor, policies, configuration adapter, operation declaration and defaults in `providers/registry.go`. Its key is the provider kind, which also labels the Provider's observations, and checkpoint support reads this entry. The installer's projection combines the registered policies with the shared field bounds in `sandbox/deployment_contract.go`; regenerate it with `go run ./services/core/cmd/specification-contract -write`.
 5. Supply the distribution artifacts for the adapter and its helper, and offer the provider to operators through the registered configuration contract.
 
 **Known design gap:** Web's setup views carry provider-specific options, such as E2B's views. Exposing another provider through that surface currently requires a shared Web edit. This coupling does not meet [Complexity stays in the adapter](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter); new integrations must express their configuration through the protocol and keep vendor-specific behavior in the adapter. Never add a Session or Turn scheduling path, a vendor column or API field, or a vendor switch in the store.
@@ -126,17 +123,17 @@ A new provider takes these steps:
 - A `nodes` registration has only `BuildLocal`, and a `direct` registration only `BuildDirect`; missing, mixed or unknown modes are rejected.
 - The specification and resource validators, the configuration adapter and a complete operation declaration are mandatory, so an incomplete registration cannot publish a partial installer projection.
 - The Runtime input policy either accepts the pinned Runtime or gives the adapter's fixed reason for rejecting it, never both.
-- Checkpoint support requires node mode and positive idle and retention defaults that fit Runtime durations; a provider without checkpoint support configures no suspension defaults.
+- Checkpoint is admitted only for a `nodes` registration, because the common lifecycle suspends only node allocations; registration rejects a `direct` Provider that declares it. Checkpoint support also requires positive idle and retention defaults that fit Runtime durations, and a provider without checkpoint support configures no suspension defaults.
 
-The configuration adapter must be non-nil, including its concrete value. Every `ConfigurationRequirements` field needs an explicit valid decision: `Credential` and `PublicOrigin` are `Required` or `NotRequired`, and `Discovery` uses the shared supported or unsupported declaration with a safe reason. A new requirement field or discovery method needs an explicit validation update and never inherits an existing decision. Configuration discovery is distinct from resource selection discovery, and requiring a credential does not promise the `VerifyCredential` operation. These checks establish complete registration, not correct native SDK behavior; constructor and adapter contract tests still apply.
+The configuration adapter must be non-nil, including its concrete value. Every `ConfigurationRequirements` field needs an explicit valid decision: `Credential` and `PublicOrigin` are `Required` or `NotRequired`, and `Discovery`, `SelectionDiscovery` and `CredentialVerification` use the shared supported or unsupported declaration with a safe reason. A new requirement field needs an explicit validation update and never inherits an existing decision. Requiring a credential does not promise the `VerifyCredential` operation. These checks establish complete registration, not correct native SDK behavior; constructor and adapter contract tests still apply.
 
 ### Configuration storage and construction
 
-Preview and persistence use `providers.Normalize` and `providers.Describe`. `SelectionDiscoverer` resolves omitted native values before commit, and the complete specification is validated again at persistence. `providers.ResolveChange` owns configuration inheritance, and comparisons use normalized selectors, so preview, retry and commit share the same defaults. The store owns transactions, credential encryption, generation fencing, resource ownership and generic object storage: only the adapter interprets `provider_config` and `provider_metadata`, and `provider_credential` holds ciphertext bound to the installation and generation. Retained generations keep their original public configuration and metadata and compose the current credential through the adapter, so a credential replacement never rewrites a retained selector. Database constraints check object structure, not the registration list.
+Preview and persistence use `providers.Normalize` and `providers.Describe`. `providers.DiscoverSelection` resolves omitted native values before commit, and the complete specification is validated again at persistence. `providers.ResolveChange` owns configuration inheritance, and comparisons use normalized selectors, so preview, retry and commit share the same defaults. The store owns transactions, credential encryption, generation fencing, resource ownership and generic object storage: only the adapter interprets `provider_config` and `provider_metadata`, and `provider_credential` holds ciphertext bound to the installation and generation. Retained generations keep their original public configuration and metadata and compose the current credential through the adapter, so a credential replacement never rewrites a retained selector. Database constraints check object structure, not the registration list.
 
 A direct adapter with a credential verifies all retained generations and allocation references before a key is replaced. The common `sandbox.CallFence` excludes native calls and waits for helper completion, including calls whose callers timed out; execution invokes the prepared verification and fencing callbacks without branching on a vendor.
 
-Vendor deployment validation and SDK setup stay at the construction boundary, and construction never creates an Environment. For node-local adapters `providers.Built` returns the provider, probe, installation identity, backend fingerprint and specification digest, and the factory also returns its close function. `execution.RuntimeProvider` binds the adapter to its kind, installation ID, backend fingerprint, generation, mode and node ownership; the database owns the selection, and the in-memory copy is never another authority. Docker and microsandbox run on nodes, and E2B is constructed directly. The node proxy exposes checkpoint operations only for a backend whose registered declaration supports them, and common lifecycle code admits suspension through `CheckpointProvider`, never through a provider name.
+Vendor deployment validation and SDK setup stay at the construction boundary, and construction never creates an Environment. For node-local adapters `providers.Built` returns the provider, probe, installation identity, backend fingerprint and specification digest, and a `Quiescent` check when a helper can outlive its caller; generation collection waits for it. The factory also returns its close function. `execution.RuntimeProvider` binds the adapter to its kind, installation ID, backend fingerprint, generation, mode and node ownership; the database owns the selection, and the in-memory copy is never another authority. Docker and microsandbox run on nodes, and E2B is constructed directly. The node proxy exposes checkpoint operations only for a backend whose registered declaration supports them, and common lifecycle code admits suspension through the checkpoint declaration, never through a provider name.
 
 The backend fingerprint identifies a native resource namespace, not capacity. Core keeps deployment generations so that owned allocations keep resolving to their original backend; never repoint retained allocations at a replacement backend.
 
@@ -144,7 +141,7 @@ The backend fingerprint identifies a native resource namespace, not capacity. Co
 
 Each node adapter's registration owns its typed `NodeArtifacts` declaration: logical distribution path, release filename suffix and installation role (`node`, `runtime`, `policy` or `image`). Registration rejects missing declarations, unsafe paths and unknown roles. `go run ./services/core/cmd/provider-artifacts -write` generates the shared Web catalog and Python projection. Run the command without `-write` to check freshness. Distribution packaging, Web availability and node installation read this projection; adding a provider's payload does not add a provider-name branch to those consumers.
 
-The launcher supplies `sandbox.ProcessPaths` from the [derived process environment](./configuration.md). Core reads these paths once and passes them to direct construction and configuration discovery. They are fixed distribution properties, not deployment settings or user-selectable helper paths. Each adapter resolves its own relative helper and state locations; E2B uses `e2b/oac-e2b-provider` and `e2b/`. Missing or nonabsolute roots fail before helper execution. Provider construction and discovery never read process environment variables.
+The launcher supplies `sandbox.ProcessPaths` from the [derived process environment](./configuration.md). Core reads these paths once and passes them to direct construction and setup operations. They are fixed distribution properties, not deployment settings or user-selectable helper paths. Each adapter resolves its own relative helper and state locations; E2B uses `e2b/oac-e2b-provider` and `e2b/`. Missing or nonabsolute roots fail before helper execution. Provider construction and discovery never read process environment variables.
 
 ## Managed lifecycle
 
diff --git a/docs/zh/sandbox-provider.md b/docs/zh/sandbox-provider.md
index 539343160..91dc2f563 100644
--- a/docs/zh/sandbox-provider.md
+++ b/docs/zh/sandbox-provider.md
@@ -1,7 +1,7 @@
 ---
 title: "添加 Sandbox Provider"
 source: docs/sandbox-provider.md
-source_hash: 36ed532c778ec8c1c4c596a011a37613ed2aa0e6ffdf20854ea30ef9a8e0c953
+source_hash: 952ffc561734637ecbae9ad46782575feefaccdfe1c41ed8c6ae1a82c2ff170b
 ---
 
 **Sandbox Provider** 为 Core 管理的 Environment 提供 Runtime daemon 运行所需的外层计算资源，以及启动 daemon 的有界引导流程。本指南说明如何添加 Provider，并作为 Core 驱动 Provider 的参考。接口为 [`SandboxProvider`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/sandbox/sandbox_provider.go)。
@@ -17,7 +17,7 @@ Core 拥有持久 Environment、allocation、placement 和 cleanup 状态；Prov
 
 ## 步骤 {#steps}
 
-1. **阅读契约。** 实现五项必需操作，并对[实现接口](#implement-the-interface)中的每个扩展接口作出明确决定。
+1. **阅读契约。** 实现每个方法，支持必需操作，并按[实现接口](#implement-the-interface)对其余每项操作声明决定。
 2. **编写 adapter 包**，放在 `services/core/internal/sandbox/<kind>`：包括原生 SDK 调用、所有权检查、身份转换和私有配置。声明 `var _ sandbox.SandboxProvider = (*YourAdapter)(nil)`。进程外 helper 放在 `services/core/tools/<kind>-provider`。
 3. **注册 kind** 一次，遵循[注册 provider kind](#register-the-provider-kind)。注册是明确构造，不是 init 时 plugin registry。
 4. **标记所属资源**，使用 [Runtime 名称](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#openagentcore-runtime-names)表中的 provider ownership label，不接受旧 label 名称作为回退。
@@ -27,7 +27,7 @@ Core 拥有持久 Environment、allocation、placement 和 cleanup 状态；Prov
 
 ## 实现接口 {#implement-the-interface}
 
-`SandboxProvider` 有五项必需操作：
+`sandbox_provider.go` 包含 Core–Sandbox Provider 协议：负责 allocation、checkpoint 和观测的 `SandboxProvider` 接口及其请求与结果类型，以及 setup 阶段的 `ConfigurationAdapter` 及其类型化错误。Core 在此边界之外也使用的值类型，例如 `DeploymentSpec` 和 `CallFence`，位于同一 package 的独立文件中。每个方法在编译期都必须实现，`ProviderOperations()` 声明 Provider 支持哪些方法。以下五项操作始终支持：
 
 | 操作 | 用途 |
 | --- | --- |
@@ -41,26 +41,23 @@ Docker 等没有原生可续期租约的 backend 仍遵守 Core 的 hosted expir
 
 ### 明确的操作契约 {#explicit-operation-contracts}
 
-每个 provider 实现以下各接口的方法，并返回完整的 `ProviderOperations()` 声明。接口方法就是操作清单；`sandbox.ValidateOperations` 根据接口检查声明，无需第二份手动维护的清单。
+每个 provider 返回完整的 `ProviderOperations()` 声明，`SandboxProvider` 中除 `ProviderOperations` 本身外的每个方法各占一项。接口的方法集就是操作清单，`sandbox.ValidateOperations` 根据它检查声明。下表中的分组是协议文件中的列表，由测试保证它们与该方法集一致，因此新增方法必须加入其中一组。
 
-| 契约 | 要求 | 职责 |
+| 操作 | 要求 | 职责 |
 | --- | --- | --- |
-| `sandbox.SandboxProvider` | 支持全部五项操作 | Allocation 生命周期与有界命令 |
-| `sandbox.CheckpointProvider` | 对每个方法明确决定，所有方法一致 | 精确计算实例、捕获与恢复、保留源恢复和清理 |
-| `runtimeobs.Source` | 明确决定 | 检查所有权的只读观测 |
-| `runtimeobs.BatchSource` | 明确决定；要求 `Source` | 按输入顺序提供有界观测，包含每目标错误 |
-| `sandbox.SelectionDiscoverer` | 明确决定 | 提交前只读原生配置发现 |
-| `sandbox.CredentialVerifier` | 明确决定 | 验证对所属资源的访问，不修改资源 |
+| `Create`、`GetInfo`、`Renew`、`Kill`、`RunCommand` | 支持 | Allocation 生命周期与有界命令 |
+| `Observe` | 明确决定 | 检查所有权、只读地观测一个 allocation |
+| `Initial`、`NewCompute`、`GetCompute`、`Suspend`、`Resume`、`ResumeCompute`、`KillCompute`、`DeleteSnapshot`、`RunCommandCompute` | 所有 checkpoint 方法决定一致；仅 `nodes` 注册可以支持 | 精确计算实例、捕获与恢复、保留源恢复和清理 |
 
-`CheckpointProvider` 增加 `Initial` 和 `NewCompute`（构造 compute reference，不分配资源）、`GetCompute`、`Suspend`、`Resume`、`ResumeCompute`（暂停中止后仅解冻同一驻留实例）、`KillCompute`、`DeleteSnapshot` 和 `RunCommandCompute`，后者在一个精确 compute incarnation 中运行有界命令。Core 使用 `RunCommandCompute` 在恢复后唤醒 parked daemon（[`runtime_compute_wake.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/execution/runtime_compute_wake.go)）。
+`Initial` 和 `NewCompute` 构造 compute reference，不分配资源；`ResumeCompute` 在暂停中止后仅解冻同一驻留实例；`RunCommandCompute` 在一个精确 compute incarnation 中运行有界命令。Core 使用 `RunCommandCompute` 在恢复后唤醒 parked daemon（[`runtime_compute_wake.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/execution/runtime_compute_wake.go)）。
 
-每个声明项为不带 reason 的 `state: supported`，或带 authored reason code 的 `state: unsupported`。缺失、零值、未知或不安全项以及缺失方法都会验证失败。给接口添加方法时，必须在每个 adapter 中明确决定并实现；不提供 base type，也不生成笼统的不支持实现。
+每个声明项为不带 reason 的 `state: supported`，或带 authored reason code 的 `state: unsupported`。缺失、零值、未知或不安全项都会验证失败。给 `SandboxProvider` 添加方法时，必须在每个 adapter 中明确决定并实现；不提供 base type，也不生成笼统的不支持实现。
 
 不支持的方法在任何原生 I/O 前返回 `providercontract.UnsupportedError`。错误指明精确操作和安全 code，不包含原生消息、资源身份、endpoint 或凭据。空结果、nil error、`Unavailable` 或未知 mutation 结果都不能代替 unsupported，五项必需方法不能返回 unsupported。
 
-每个 adapter 拥有一个 `Operations()` 函数，由实例和注册共享。`providers.ValidateBinding` 根据接口并相互对照检查两者，Runtime admission 与 node generation 加载也拒绝不完整 provider。interface assertion 仅证明方法形态；调用方使用声明决定支持情况。
+每个 adapter 拥有一个 `Operations()` 函数，由实例和注册共享。`providers.ValidateBinding` 根据接口并相互对照检查两者，Runtime admission 与 node generation 加载也拒绝不完整 provider。调用方在调用操作前用 `providercontract.Require` 检查声明，从不使用 type assertion。
 
-`ObserveBatch` 返回 error，不返回有歧义的 boolean。仅 `ObserveBatch` 的类型化 `UnsupportedError` 允许逐目标调用 `Observe`；服务不可用、超时或其他失败都不允许。观测不续期、启动、准备或停止计算资源；参见[观测契约](../../contracts/agents-api/zh/runtime-observability.md)。
+`Observe` 读取一个 allocation，不续期、启动、准备或停止计算资源；参见[观测契约](../../contracts/agents-api/zh/runtime-observability.md)。
 
 契约测试在未配置原生 client 时调用每个声明不支持的方法，要求匹配错误和零值结果，并拒绝不完整或矛盾的声明。支持的行为仍需要原生和生命周期测试。
 
@@ -112,9 +109,9 @@ Checkpoint 支持增加 `Compute` generation、name、ID 和 `SnapshotIdentity`
 新 provider 执行以下步骤：
 
 1. 在 adapter 包中实现 operation 契约，并编写原生契约测试。
-2. 添加 specification 和 resource validator；提交前需要原生资源发现时，添加可选只读 `SelectionDiscoverer`。原生凭据验证放在 `CredentialVerifier` 后。
-3. 基于类型化原生配置实现 `sandbox.ConfigurationAdapter`。`DecodeInput` 严格解析请求中独立的公开 `configuration` 与只写 `credential` 对象。`Encode` 生成白名单公开 selector、只读观测和独立 secret bytes，不透传请求 JSON。`Decode` 恢复已存储 selector 并保留对所属资源的访问，不做远程 admission 或新模板验证。`Normalize` 修改前复制输入。`ResolveChange`、`Equal` 和 `WithCredential` 负责继承、身份与凭据组合。`Requirements` 声明是否需要凭据和公开 Core origin，以及是否支持配置发现。即使不支持 discovery，也实现 `ConfigurationDiscoverer`：验证 query 并返回安全 catalog，不做 mutation 或 admission decision；Core 保留授权、输入限制与 deadline。node provider 仅接受空公开对象，拒绝凭据，对 discovery 和 credential replacement 返回 Unsupported。
-4. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter、operation 声明和默认值。Node proxy identity 和 checkpoint 支持读取此项。installer 投影组合已注册 policy 与 `sandbox/deployment_contract.go` 中的共享 field bound；通过 `go run ./services/core/cmd/specification-contract -write` 重新生成。
+2. 添加 specification 和 resource validator。
+3. 基于类型化原生配置实现 `sandbox.ConfigurationAdapter`。`DecodeInput` 严格解析请求中独立的公开 `configuration` 与只写 `credential` 对象。`Encode` 生成白名单公开 selector、只读观测和独立 secret bytes，不透传请求 JSON。`Decode` 恢复已存储 selector 并保留对所属资源的访问，不做远程 admission 或新模板验证。`Normalize` 修改前复制输入。`ResolveChange`、`Equal` 和 `WithCredential` 负责继承、身份与凭据组合。`Requirements` 声明是否需要凭据和公开 Core origin，以及支持哪些 setup 操作：`Discovery` 对应 `DiscoverConfiguration`，`SelectionDiscovery` 对应 `DiscoverSelection`，`CredentialVerification` 对应 `VerifyCredential`。`DiscoverConfiguration` 验证 query 并返回安全 catalog，不做 mutation 或 admission decision；Core 保留授权、输入限制与 deadline。`DiscoverSelection` 在提交前解析候选项省略的原生值，`VerifyCredential` 验证凭据对所属资源的访问，不修改资源。两者都接收候选项的 `sandbox.DirectConfig`，原生 client 只为该次调用构造。node provider 仅接受空公开对象，拒绝凭据，对每项 setup 操作和 credential replacement 返回 Unsupported。
+4. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter、operation 声明和默认值。其键即 provider kind，也用于标记该 Provider 的观测；checkpoint 支持读取此项。installer 投影组合已注册 policy 与 `sandbox/deployment_contract.go` 中的共享 field bound；通过 `go run ./services/core/cmd/specification-contract -write` 重新生成。
 5. 提供 adapter 和 helper 的发行产物，通过已注册 configuration 契约向运维人员提供 provider。
 
 **已知设计缺口：** Web 的 setup view 携带 provider 专有选项，如 E2B 的 view。通过该界面提供另一 provider 目前需要修改共享的 Web。此耦合不符合[复杂性留在 adapter 内](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter)；新集成必须通过协议表达配置，把厂商专有行为留在 adapter。不得添加 Session 或 Turn 调度路径、厂商专有 column 或 API field，或 store 中的厂商 switch。
@@ -128,17 +125,17 @@ Checkpoint 支持增加 `Compute` generation、name、ID 和 `SnapshotIdentity`
 - `nodes` 注册仅有 `BuildLocal`，`direct` 注册仅有 `BuildDirect`；缺失、混合或未知 mode 被拒绝。
 - specification 和 resource validator、configuration adapter 与完整 operation 声明都是必需项，因此不完整注册不能发布部分 installer projection。
 - Runtime input policy 要么接受固定 Runtime，要么给出 adapter 拒绝它的固定原因，不能两者兼有。
-- Checkpoint 支持要求 node mode 和适合 Runtime duration 的正 idle、retention 默认值；不支持 checkpoint 的 provider 不配置 suspension 默认值。
+- Checkpoint 仅准入 `nodes` 注册，因为公共 lifecycle 只暂停 node allocation；声明 checkpoint 的 `direct` Provider 会被注册拒绝。Checkpoint 支持还要求适合 Runtime duration 的正 idle、retention 默认值，不支持 checkpoint 的 provider 不配置 suspension 默认值。
 
-configuration adapter 必须非 nil，包括其具体值。每个 `ConfigurationRequirements` 字段都需要明确有效的决定：`Credential` 和 `PublicOrigin` 为 `Required` 或 `NotRequired`，`Discovery` 使用共享 supported 或 unsupported 声明并携带安全 reason。新增 requirement field 或 discovery method 需要明确更新验证，不继承已有决定。configuration discovery 与 resource selection discovery 不同，要求凭据也不承诺支持 `VerifyCredential` 操作。这些检查证明注册完整，不证明原生 SDK 行为正确；constructor 和 adapter 契约测试仍然适用。
+configuration adapter 必须非 nil，包括其具体值。每个 `ConfigurationRequirements` 字段都需要明确有效的决定：`Credential` 和 `PublicOrigin` 为 `Required` 或 `NotRequired`，`Discovery`、`SelectionDiscovery` 和 `CredentialVerification` 使用共享 supported 或 unsupported 声明并携带安全 reason。新增 requirement field 需要明确更新验证，不继承已有决定。要求凭据不承诺支持 `VerifyCredential` 操作。这些检查证明注册完整，不证明原生 SDK 行为正确；constructor 和 adapter 契约测试仍然适用。
 
 ### 配置存储与构造 {#configuration-storage-and-construction}
 
-预览和持久化使用 `providers.Normalize` 与 `providers.Describe`。`SelectionDiscoverer` 在提交前解析省略的原生值，持久化时再次验证完整 specification。`providers.ResolveChange` 负责配置继承，比较使用 normalized selector，使预览、重试和提交共享默认值。store 负责事务、凭据加密、generation fencing、资源所有权和通用对象存储：仅 adapter 解释 `provider_config` 与 `provider_metadata`，`provider_credential` 保存绑定到安装实例与 generation 的密文。保留 generation 保持原公开配置和 metadata，通过 adapter 组合当前凭据，因此替换凭据不重写保留 selector。数据库约束检查对象结构，不检查注册列表。
+预览和持久化使用 `providers.Normalize` 与 `providers.Describe`。`providers.DiscoverSelection` 在提交前解析省略的原生值，持久化时再次验证完整 specification。`providers.ResolveChange` 负责配置继承，比较使用 normalized selector，使预览、重试和提交共享默认值。store 负责事务、凭据加密、generation fencing、资源所有权和通用对象存储：仅 adapter 解释 `provider_config` 与 `provider_metadata`，`provider_credential` 保存绑定到安装实例与 generation 的密文。保留 generation 保持原公开配置和 metadata，通过 adapter 组合当前凭据，因此替换凭据不重写保留 selector。数据库约束检查对象结构，不检查注册列表。
 
 具有凭据的 direct adapter 在替换 key 前验证全部保留 generation 与 allocation reference。公共 `sandbox.CallFence` 排除原生调用并等待 helper 完成，包括调用方已超时的调用；execution 调用已准备的 verification 和 fencing callback，不按厂商分支。
 
-厂商部署验证和 SDK setup 留在构造边界，构造不创建 Environment。node-local adapter 的 `providers.Built` 返回 provider、probe、installation identity、backend fingerprint 和 specification digest，factory 还返回 close 函数。`execution.RuntimeProvider` 将 adapter 绑定到 kind、installation ID、backend fingerprint、generation、mode 和 node ownership；选择由数据库负责，内存副本不构成另一权限来源。Docker 与 microsandbox 在 node 上运行，E2B 直接构造。node proxy 仅对注册声明支持 checkpoint 的 backend 暴露 checkpoint 操作，公共 lifecycle 通过 `CheckpointProvider` 准入 suspension，不通过 provider name。
+厂商部署验证和 SDK setup 留在构造边界，构造不创建 Environment。node-local adapter 的 `providers.Built` 返回 provider、probe、installation identity、backend fingerprint 和 specification digest；helper 可能比调用方存活更久时，还返回 `Quiescent` 检查，generation 回收会等待它。factory 还返回 close 函数。`execution.RuntimeProvider` 将 adapter 绑定到 kind、installation ID、backend fingerprint、generation、mode 和 node ownership；选择由数据库负责，内存副本不构成另一权限来源。Docker 与 microsandbox 在 node 上运行，E2B 直接构造。node proxy 仅对注册声明支持 checkpoint 的 backend 暴露 checkpoint 操作，公共 lifecycle 通过 checkpoint 声明准入 suspension，不通过 provider name。
 
 backend fingerprint 标识原生资源命名空间，不表示容量。Core 保留部署 generation，使所属 allocation 继续解析到原 backend；不要将保留 allocation 重新指向替代 backend。
 
@@ -146,7 +143,7 @@ backend fingerprint 标识原生资源命名空间，不表示容量。Core 保
 
 每个 node adapter 注册负责其类型化 `NodeArtifacts` 声明：逻辑发行路径、release filename suffix 和安装角色（`node`、`runtime`、`policy` 或 `image`）。注册拒绝缺失声明、不安全路径和未知角色。`go run ./services/core/cmd/provider-artifacts -write` 生成共享 Web catalog 和 Python projection。不带 `-write` 运行可检查是否最新。发行打包、Web availability 和 node 安装读取此投影；添加 provider payload 不在这些消费者中增加 provider-name 分支。
 
-launcher 从[派生进程环境](configuration.md)提供 `sandbox.ProcessPaths`。Core 读取这些路径一次，并传给 direct construction 和 configuration discovery。它们是固定发行属性，不是部署设置或用户可选 helper 路径。每个 adapter 解析自己的相对 helper 和 state 位置；E2B 使用 `e2b/oac-e2b-provider` 和 `e2b/`。root 缺失或不是绝对路径时，在执行 helper 前失败。Provider 构造与发现不读取进程环境变量。
+launcher 从[派生进程环境](configuration.md)提供 `sandbox.ProcessPaths`。Core 读取这些路径一次，并传给 direct construction 和 setup 操作。它们是固定发行属性，不是部署设置或用户可选 helper 路径。每个 adapter 解析自己的相对 helper 和 state 位置；E2B 使用 `e2b/oac-e2b-provider` 和 `e2b/`。root 缺失或不是绝对路径时，在执行 helper 前失败。Provider 构造与发现不读取进程环境变量。
 
 ## 托管生命周期 {#managed-lifecycle}
 
diff --git a/services/core/cmd/sandbox-node/generations.go b/services/core/cmd/sandbox-node/generations.go
index 3cd17d93f..78f41af37 100644
--- a/services/core/cmd/sandbox-node/generations.go
+++ b/services/core/cmd/sandbox-node/generations.go
@@ -171,7 +171,7 @@ func buildGeneration(registry *providerconfig.Registry, config providerconfig.Co
 	if err != nil {
 		return node.GenerationProvider{}, err
 	}
-	return node.GenerationProvider{Generation: config.Generation, SpecificationDigest: built.SpecificationDigest, Provider: built.Provider, Probe: built.Probe, Close: closeProvider}, nil
+	return node.GenerationProvider{Generation: config.Generation, SpecificationDigest: built.SpecificationDigest, Provider: built.Provider, Probe: built.Probe, Quiescent: built.Quiescent, Close: closeProvider}, nil
 }
 
 type generationJournal struct {
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index a297e4e58..f45a3a2f9 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -180,10 +180,10 @@ func run(config processconfig.Config) error {
 	})
 	defer managedNodes.close()
 	var managed *execution.RuntimeProvider
-	observationSources := map[string]runtimeobs.SourceResolver{}
+	var observationSource func(context.Context) (runtimeobs.Source, string, error)
 	if managedNodes != nil {
 		managed = managedNodes.runtime
-		observationSources[managed.InstallationID] = managedNodes.setup
+		observationSource = managedNodes.setup.observationSource
 	}
 	observationResolver, err := deployment.NewObservationResolver(sessionStore, deploymentStore)
 	if err != nil {
@@ -193,7 +193,7 @@ func run(config processconfig.Config) error {
 	if err != nil {
 		return err
 	}
-	observationService, err := runtimeobs.NewService(observationResolver, observationSources, history.Options...)
+	observationService, err := runtimeobs.NewService(observationResolver, observationSource, history.Options...)
 	if err != nil {
 		if history.Exporter != nil {
 			closeCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
diff --git a/services/core/cmd/server/managed_generation_operations.go b/services/core/cmd/server/managed_generation_operations.go
index 8c39850fa..2f7c99b65 100644
--- a/services/core/cmd/server/managed_generation_operations.go
+++ b/services/core/cmd/server/managed_generation_operations.go
@@ -15,11 +15,7 @@ func (p *generationRouter) Initial(ctx context.Context, r sandbox.Reference) (sa
 		return sandbox.Compute{}, err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return sandbox.Compute{}, err
-	}
-	return cp.Initial(ctx, r)
+	return v.Initial(ctx, r)
 }
 func (p *generationRouter) NewCompute(ctx context.Context, r sandbox.Reference, g uint64, snapshot *sandbox.SnapshotIdentity) (sandbox.Compute, error) {
 	if err := providercontract.Require(p, "NewCompute"); err != nil {
@@ -30,11 +26,7 @@ func (p *generationRouter) NewCompute(ctx context.Context, r sandbox.Reference,
 		return sandbox.Compute{}, err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return sandbox.Compute{}, err
-	}
-	return cp.NewCompute(ctx, r, g, snapshot)
+	return v.NewCompute(ctx, r, g, snapshot)
 }
 func (p *generationRouter) GetCompute(ctx context.Context, r sandbox.Reference, c sandbox.Compute) (sandbox.ComputeState, error) {
 	if err := providercontract.Require(p, "GetCompute"); err != nil {
@@ -45,11 +37,7 @@ func (p *generationRouter) GetCompute(ctx context.Context, r sandbox.Reference,
 		return sandbox.ComputeState{}, err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return sandbox.ComputeState{}, err
-	}
-	return cp.GetCompute(ctx, r, c)
+	return v.GetCompute(ctx, r, c)
 }
 func (p *generationRouter) Suspend(ctx context.Context, q sandbox.SuspendRequest) (sandbox.ComputeState, error) {
 	if err := providercontract.Require(p, "Suspend"); err != nil {
@@ -60,11 +48,7 @@ func (p *generationRouter) Suspend(ctx context.Context, q sandbox.SuspendRequest
 		return sandbox.ComputeState{}, err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return sandbox.ComputeState{}, err
-	}
-	return cp.Suspend(ctx, q)
+	return v.Suspend(ctx, q)
 }
 func (p *generationRouter) Resume(ctx context.Context, q sandbox.ResumeRequest) (sandbox.ComputeState, error) {
 	if err := providercontract.Require(p, "Resume"); err != nil {
@@ -75,11 +59,7 @@ func (p *generationRouter) Resume(ctx context.Context, q sandbox.ResumeRequest)
 		return sandbox.ComputeState{}, err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return sandbox.ComputeState{}, err
-	}
-	return cp.Resume(ctx, q)
+	return v.Resume(ctx, q)
 }
 func (p *generationRouter) KillCompute(ctx context.Context, r sandbox.Reference, c sandbox.Compute) error {
 	if err := providercontract.Require(p, "KillCompute"); err != nil {
@@ -90,11 +70,7 @@ func (p *generationRouter) KillCompute(ctx context.Context, r sandbox.Reference,
 		return err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return err
-	}
-	return cp.KillCompute(ctx, r, c)
+	return v.KillCompute(ctx, r, c)
 }
 func (p *generationRouter) DeleteSnapshot(ctx context.Context, r sandbox.Reference, snapshot sandbox.SnapshotIdentity) error {
 	if err := providercontract.Require(p, "DeleteSnapshot"); err != nil {
@@ -105,11 +81,7 @@ func (p *generationRouter) DeleteSnapshot(ctx context.Context, r sandbox.Referen
 		return err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return err
-	}
-	return cp.DeleteSnapshot(ctx, r, snapshot)
+	return v.DeleteSnapshot(ctx, r, snapshot)
 }
 func (p *generationRouter) RunCommandCompute(ctx context.Context, r sandbox.Reference, c sandbox.Compute, command sandbox.Command) (sandbox.CommandResult, error) {
 	if err := providercontract.Require(p, "RunCommandCompute"); err != nil {
@@ -120,11 +92,7 @@ func (p *generationRouter) RunCommandCompute(ctx context.Context, r sandbox.Refe
 		return sandbox.CommandResult{}, err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return sandbox.CommandResult{}, err
-	}
-	return cp.RunCommandCompute(ctx, r, c, command)
+	return v.RunCommandCompute(ctx, r, c, command)
 }
 func (p *generationRouter) ResumeCompute(ctx context.Context, r sandbox.Reference, c sandbox.Compute) (sandbox.ComputeState, error) {
 	if err := providercontract.Require(p, "ResumeCompute"); err != nil {
@@ -135,15 +103,5 @@ func (p *generationRouter) ResumeCompute(ctx context.Context, r sandbox.Referenc
 		return sandbox.ComputeState{}, err
 	}
 	defer done()
-	cp, err := sandbox.Checkpoint(v)
-	if err != nil {
-		return sandbox.ComputeState{}, err
-	}
-	return cp.ResumeCompute(ctx, r, c)
-}
-func (*generationRouter) DiscoverSelection(context.Context, sandbox.Selection) (sandbox.Selection, error) {
-	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: "generation_router_does_not_discover_configuration"}
-}
-func (*generationRouter) VerifyCredential(context.Context, []sandbox.Reference) error {
-	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: "generation_router_does_not_verify_configuration"}
+	return v.ResumeCompute(ctx, r, c)
 }
diff --git a/services/core/cmd/server/managed_generations.go b/services/core/cmd/server/managed_generations.go
index 3a349f6ed..e509ec494 100644
--- a/services/core/cmd/server/managed_generations.go
+++ b/services/core/cmd/server/managed_generations.go
@@ -18,9 +18,8 @@ import (
 // immutable specification and current credential. There is no mutable provider
 // map to unload and no current-generation fallback for a missing historical row.
 type generationRouter struct {
-	setup        *managedSetup
-	operations   providercontract.Operations
-	providerType string
+	setup      *managedSetup
+	operations providercontract.Operations
 }
 
 func (p *generationRouter) route(ctx context.Context, r sandbox.Reference) (sandbox.SandboxProvider, func(), error) {
@@ -81,18 +80,10 @@ func (p *generationRouter) RunCommand(ctx context.Context, r sandbox.Reference,
 	return v.RunCommand(ctx, r, c)
 }
 
-type observedGenerationRouter struct{ *generationRouter }
-
-func (p *observedGenerationRouter) ObservationProviderType() string { return p.providerType }
-func (p *observedGenerationRouter) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
-
 func (p *generationRouter) ProviderOperations() providercontract.Operations {
 	return maps.Clone(p.operations)
 }
-
-func (p *observedGenerationRouter) Observe(ctx context.Context, t runtimeobs.Target) (runtimeobs.Sample, error) {
+func (p *generationRouter) Observe(ctx context.Context, t runtimeobs.Target) (runtimeobs.Sample, error) {
 	v, done, err := p.route(ctx, sandbox.Reference{TenantID: t.TenantID, EnvironmentID: t.EnvironmentID, AllocationID: t.Instance.AllocationID})
 	if err != nil {
 		return runtimeobs.Sample{}, err
@@ -101,14 +92,7 @@ func (p *observedGenerationRouter) Observe(ctx context.Context, t runtimeobs.Tar
 	if err := providercontract.Require(v, "Observe"); err != nil {
 		return runtimeobs.Sample{}, err
 	}
-	source, ok := v.(runtimeobs.Source)
-	if !ok {
-		return runtimeobs.Sample{}, providercontract.ErrContract
-	}
-	if source.ObservationProviderType() != p.providerType {
-		return runtimeobs.Sample{}, providercontract.ErrContract
-	}
-	return source.Observe(ctx, t)
+	return v.Observe(ctx, t)
 }
 
 // routeGenerations routes a direct provider's allocations through their own
@@ -117,11 +101,7 @@ func (s *managedSetup) routeGenerations(candidate execution.PreparedRuntimeDeplo
 	if setup.Mode == "nodes" {
 		return candidate, nil
 	}
-	router := &generationRouter{setup: s, providerType: candidate.Config.Provider.(runtimeobs.Source).ObservationProviderType(), operations: candidate.Config.Provider.ProviderOperations()}
-	router.operations["ObserveBatch"] = providercontract.Support{State: providercontract.Unsupported, Reason: "allocations_require_individual_generation_routing"}
-	router.operations["DiscoverSelection"] = providercontract.Support{State: providercontract.Unsupported, Reason: "generation_router_does_not_discover_configuration"}
-	router.operations["VerifyCredential"] = providercontract.Support{State: providercontract.Unsupported, Reason: "generation_router_does_not_verify_configuration"}
-	candidate.Config.Provider = &observedGenerationRouter{router}
+	candidate.Config.Provider = &generationRouter{setup: s, operations: candidate.Config.Provider.ProviderOperations()}
 	if err := sandbox.ValidateProvider(candidate.Config.Provider); err != nil {
 		return execution.PreparedRuntimeDeployment{}, err
 	}
@@ -142,18 +122,7 @@ func (s *managedSetup) routeGenerations(candidate execution.PreparedRuntimeDeplo
 		// Public template readability cannot establish which team owns a deployment.
 		verify := func(value deployment.Setup, refs []sandbox.Reference) error {
 			value.InstallationID = setup.InstallationID
-			provider, err := s.provider(value)
-			if err != nil {
-				return err
-			}
-			if err := providercontract.Require(provider, "VerifyCredential"); err != nil {
-				return err
-			}
-			verifier, ok := provider.(sandbox.CredentialVerifier)
-			if !ok {
-				return sandbox.ErrInvalid
-			}
-			return verifier.VerifyCredential(ctx, refs)
+			return s.registry.VerifyCredential(ctx, s.direct(value), refs)
 		}
 		current, err := s.deployment.Setup(ctx)
 		if err != nil {
@@ -227,9 +196,3 @@ func (s *managedSetup) routeGenerations(candidate execution.PreparedRuntimeDeplo
 	}
 	return candidate, nil
 }
-
-// A batch can contain allocations from different endpoint generations. Let the
-// observation worker route each allocation through its immutable generation.
-func (p *observedGenerationRouter) ObserveBatch(_ context.Context, _ []runtimeobs.Target) ([]runtimeobs.BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "allocations_require_individual_generation_routing"}
-}
diff --git a/services/core/cmd/server/managed_setup.go b/services/core/cmd/server/managed_setup.go
index 8606525d7..e1328ba2b 100644
--- a/services/core/cmd/server/managed_setup.go
+++ b/services/core/cmd/server/managed_setup.go
@@ -116,20 +116,20 @@ func (s *managedSetup) prepare(ctx context.Context, setup deployment.Setup) (exe
 	if err != nil {
 		return execution.PreparedRuntimeDeployment{}, err
 	}
-	selection := sandbox.Selection{Provider: setup.Provider, DeploymentSpec: setup.Specification, Configuration: setup.Configuration}
-	if err := providercontract.Require(candidate.Config.Provider, "DiscoverSelection"); err == nil {
-		discoverer := candidate.Config.Provider.(sandbox.SelectionDiscoverer)
-		selection, err = discoverer.DiscoverSelection(ctx, selection)
-		if err != nil {
+	adapter, err := s.registry.Lookup(setup.Provider)
+	if err != nil {
+		return execution.PreparedRuntimeDeployment{}, err
+	}
+	direct := s.direct(setup)
+	selection := direct.Selection
+	if adapter.Configuration.Requirements().SelectionDiscovery.State == providercontract.Supported {
+		if selection, err = s.registry.DiscoverSelection(ctx, direct); err != nil {
 			return execution.PreparedRuntimeDeployment{}, err
 		}
 		setup.Specification, setup.Configuration = selection.DeploymentSpec, selection.Configuration
-		candidate, err = s.configuration(setup)
-		if err != nil {
+		if candidate, err = s.configuration(setup); err != nil {
 			return execution.PreparedRuntimeDeployment{}, err
 		}
-	} else if !errors.Is(err, providercontract.ErrUnsupported) {
-		return execution.PreparedRuntimeDeployment{}, err
 	}
 	candidate.Selection = &selection
 	return s.routeGenerations(candidate, setup)
@@ -154,23 +154,17 @@ func (s *managedSetup) configuration(setup deployment.Setup) (execution.Prepared
 	return execution.PreparedRuntimeDeployment{Config: selected, Publish: s.publish}, nil
 }
 
-func (*managedSetup) ProviderOperations() providercontract.Operations {
-	return providercontract.Operations{"ResolveObservationSource": {State: providercontract.Supported}}
-}
-
-func (s *managedSetup) ResolveObservationSource(ctx context.Context) (runtimeobs.Source, error) {
+// observationSource returns the selected Provider and its registered kind for
+// Runtime observation.
+func (s *managedSetup) observationSource(ctx context.Context) (runtimeobs.Source, string, error) {
 	selected, err := s.load(ctx)
 	if err != nil {
-		return nil, err
+		return nil, "", err
 	}
 	if selected == nil {
-		return nil, runtimeobs.ErrUnavailable
-	}
-	source, ok := selected.Provider.(runtimeobs.Source)
-	if !ok {
-		return nil, providercontract.ErrContract
+		return nil, "", runtimeobs.ErrUnavailable
 	}
-	return source, nil
+	return selected.Provider, selected.ProviderKind, nil
 }
 
 // provider builds the setup's provider. The setup carries the mode and
@@ -180,7 +174,12 @@ func (s *managedSetup) provider(setup deployment.Setup) (sandbox.SandboxProvider
 		if s.hub == nil {
 			return nil, errors.New("sandbox node transport is unavailable")
 		}
-		return s.hub.GenerationProvider(setup.Provider, setup.Operations, s.deployment.AllocationGeneration), nil
+		return s.hub.GenerationProvider(setup.Operations, s.deployment.AllocationGeneration), nil
 	}
-	return s.registry.BuildDirect(providers.DirectConfig{ProcessPaths: s.processPaths, InstallationID: setup.InstallationID, Selection: sandbox.Selection{Provider: setup.Provider, DeploymentSpec: setup.Specification, Configuration: setup.Configuration}, Fence: &s.providerCalls})
+	return s.registry.BuildDirect(s.direct(setup))
+}
+
+// direct is the setup's input to direct-mode construction and setup operations.
+func (s *managedSetup) direct(setup deployment.Setup) sandbox.DirectConfig {
+	return sandbox.DirectConfig{ProcessPaths: s.processPaths, InstallationID: setup.InstallationID, Selection: sandbox.Selection{Provider: setup.Provider, DeploymentSpec: setup.Specification, Configuration: setup.Configuration}, Fence: &s.providerCalls}
 }
diff --git a/services/core/cmd/server/managed_setup_test.go b/services/core/cmd/server/managed_setup_test.go
index 54e21dc1a..259ed35cb 100644
--- a/services/core/cmd/server/managed_setup_test.go
+++ b/services/core/cmd/server/managed_setup_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/processconfig"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/docker"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
@@ -261,38 +260,21 @@ func testProviderPaths(t *testing.T, helper, state string) sandbox.ProcessPaths
 func TestManagedObservationSourceKeepsSelectionAcrossReconfiguration(t *testing.T) {
 	value := deployment.Setup{InstallationID: "installation", Generation: 1}
 	setup := &managedSetup{registry: providers.Builtin(), deployment: &fakeDeploymentSetups{t: t, setup: committedSetup(&value)}, installationID: "installation"}
-	if source, err := setup.ResolveObservationSource(t.Context()); source != nil || !errors.Is(err, runtimeobs.ErrUnavailable) {
+	if source, kind, err := setup.observationSource(t.Context()); source != nil || kind != "" || !errors.Is(err, runtimeobs.ErrUnavailable) {
 		t.Fatal("unconfigured setup did not return typed unavailability", source, err)
 	}
 	first := &docker.Provider{}
 	value.Provider, value.Mode, value.Generation = "docker", "nodes", 2
-	setup.publish(&execution.RuntimeProvider{Generation: 2, Provider: first})
-	source, err := setup.ResolveObservationSource(t.Context())
-	if err != nil || source != first {
-		t.Fatal(source, err)
+	setup.publish(&execution.RuntimeProvider{Generation: 2, ProviderKind: "docker", Provider: first})
+	source, kind, err := setup.observationSource(t.Context())
+	if err != nil || source != first || kind != "docker" {
+		t.Fatal(source, kind, err)
 	}
 	next := &microsandbox.Provider{}
 	value.Provider, value.Mode, value.Generation = "microsandbox", "nodes", 3
-	setup.publish(&execution.RuntimeProvider{Generation: 3, Provider: next})
-	if source.ObservationProviderType() != "docker" {
-		t.Fatal("in-flight identity changed")
-	}
-	selected, err := setup.ResolveObservationSource(t.Context())
-	if err != nil || selected != next || selected.ObservationProviderType() != "microsandbox" {
-		t.Fatal(selected, err)
-	}
-}
-
-func TestObservationGenerationIdentityMustMatchRoutedAllocation(t *testing.T) {
-	hub := node.NewHub(node.HubOptions{})
-	defer hub.Close()
-	routed := func(context.Context, sandbox.Reference) (deployment.Setup, error) {
-		return deployment.Setup{Provider: "docker", Mode: "nodes"}, nil
-	}
-	setup := &managedSetup{registry: providers.Builtin(), hub: hub, deployment: &fakeDeploymentSetups{t: t, allocationSetup: routed}, allocations: &fakeGenerationAllocations{t: t}}
-	source := &observedGenerationRouter{&generationRouter{setup: setup, providerType: "e2b"}}
-	_, err := source.Observe(t.Context(), runtimeobs.Target{TenantID: "tenant", EnvironmentID: "environment", Instance: runtimeobs.Instance{AllocationID: "allocation"}})
-	if !errors.Is(err, providercontract.ErrContract) {
-		t.Fatal("routed allocation was attributed to another provider", err)
+	setup.publish(&execution.RuntimeProvider{Generation: 3, ProviderKind: "microsandbox", Provider: next})
+	selected, kind, err := setup.observationSource(t.Context())
+	if err != nil || selected != next || kind != "microsandbox" {
+		t.Fatal(selected, kind, err)
 	}
 }
diff --git a/services/core/deploy/e2b/helper_contract_generated.py b/services/core/deploy/e2b/helper_contract_generated.py
index ebd7fadf2..04d6c13b3 100644
--- a/services/core/deploy/e2b/helper_contract_generated.py
+++ b/services/core/deploy/e2b/helper_contract_generated.py
@@ -5,7 +5,6 @@
 MANAGED_IDENTITY_FIELDS = ["TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","InstallationID"]
 MAX_COMMAND_INPUT = 52428832
 MAX_CREDENTIAL_REFERENCES = 32
-MAX_OBSERVATION_REFERENCES = 100
 MAX_OUTPUT = 1048576
 MAX_REQUEST = 75497472
 MAX_RESPONSE = 16777216
@@ -14,5 +13,5 @@
 PROTOCOL_VERSION = 1
 REFERENCE_FIELDS = ["TenantID","EnvironmentID","AllocationID"]
 REQUEST_FIELDS = ["Version","Operation","Config","Reference","References","Bootstrap","RuntimeBootstrap","Command","Deadline"]
-RESPONSE_FIELDS = ["Version","Info","Command","ErrorCode","DeploymentValid","TemplateBuild","Templates","Builds","Observations"]
+RESPONSE_FIELDS = ["Version","Info","Command","ErrorCode","DeploymentValid","TemplateBuild","Templates","Builds","Observation"]
 SDK_VERSION = "2.51.0"
diff --git a/services/core/internal/api/admin_runtime.go b/services/core/internal/api/admin_runtime.go
index f6b1df723..c11dae6aa 100644
--- a/services/core/internal/api/admin_runtime.go
+++ b/services/core/internal/api/admin_runtime.go
@@ -37,7 +37,7 @@ type AdminRuntimeObservationList struct {
 }
 
 // @Summary List Runtime observations across managed Projects
-// @Description Core key only. Each observation is labelled with its owning Project ID. Uses the existing read-only Runtime sampler, with bounded concurrency and no execution or provisioning. A provider with a batch metrics read, such as E2B, samples the page's running sandboxes in one bounded request.
+// @Description Core key only. Each observation is labelled with its owning Project ID. Uses the existing read-only Runtime sampler, with bounded concurrency and no execution or provisioning.
 // @Tags Core Administration
 // @Produce json
 // @Security DeploymentAdminAuth
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index 95353a660..f6e658f96 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -49,7 +49,7 @@ func (waitingCleanupCheckpoint) ProviderOperations() providercontract.Operations
 }
 
 type waitingCleanupCheckpoint struct {
-	sandbox.CheckpointProvider
+	sandbox.SandboxProvider
 	beforeKill func()
 }
 
diff --git a/services/core/internal/execution/provider_operations_fixture_test.go b/services/core/internal/execution/provider_operations_fixture_test.go
index c8fc32805..98e951c04 100644
--- a/services/core/internal/execution/provider_operations_fixture_test.go
+++ b/services/core/internal/execution/provider_operations_fixture_test.go
@@ -10,26 +10,21 @@ import (
 
 func (*lifecycleOnlySandbox) ProviderOperations() providercontract.Operations {
 	return providercontract.Operations{
-		"Create":                   {State: providercontract.Supported},
-		"GetInfo":                  {State: providercontract.Supported},
-		"Renew":                    {State: providercontract.Supported},
-		"Kill":                     {State: providercontract.Supported},
-		"RunCommand":               {State: providercontract.Supported},
-		"Initial":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"NewCompute":               {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"GetCompute":               {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"Suspend":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"Resume":                   {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"KillCompute":              {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DeleteSnapshot":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"RunCommandCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ResumeCompute":            {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ObservationProviderType":  {State: providercontract.Supported},
-		"ResolveObservationSource": {State: providercontract.Supported},
-		"Observe":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ObserveBatch":             {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DiscoverSelection":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"VerifyCredential":         {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Create":            {State: providercontract.Supported},
+		"GetInfo":           {State: providercontract.Supported},
+		"Renew":             {State: providercontract.Supported},
+		"Kill":              {State: providercontract.Supported},
+		"RunCommand":        {State: providercontract.Supported},
+		"Initial":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"NewCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"GetCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Suspend":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Resume":            {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"KillCompute":       {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"DeleteSnapshot":    {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"RunCommandCompute": {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"ResumeCompute":     {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Observe":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
 	}
 }
 func (*lifecycleOnlySandbox) Initial(context.Context, sandbox.Reference) (sandbox.Compute, error) {
@@ -62,17 +57,3 @@ func (*lifecycleOnlySandbox) ResumeCompute(context.Context, sandbox.Reference, s
 func (*lifecycleOnlySandbox) Observe(context.Context, runtimeobs.Target) (runtimeobs.Sample, error) {
 	return runtimeobs.Sample{}, &providercontract.UnsupportedError{Operation: "Observe", Reason: "fixture_operation_not_supported"}
 }
-func (*lifecycleOnlySandbox) ObserveBatch(context.Context, []runtimeobs.Target) ([]runtimeobs.BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "fixture_operation_not_supported"}
-}
-func (*lifecycleOnlySandbox) DiscoverSelection(context.Context, sandbox.Selection) (sandbox.Selection, error) {
-	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: "fixture_operation_not_supported"}
-}
-func (*lifecycleOnlySandbox) VerifyCredential(context.Context, []sandbox.Reference) error {
-	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: "fixture_operation_not_supported"}
-}
-
-func (*lifecycleOnlySandbox) ObservationProviderType() string { return "fixture" }
-func (p *lifecycleOnlySandbox) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
diff --git a/services/core/internal/execution/runtime_compute.go b/services/core/internal/execution/runtime_compute.go
index b093ab975..c1aeab3c6 100644
--- a/services/core/internal/execution/runtime_compute.go
+++ b/services/core/internal/execution/runtime_compute.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/google/uuid"
 )
@@ -44,9 +45,9 @@ func (r *runtimeLifecycle) saveCompute(ctx context.Context, owner deployment.All
 	return r.deployment.SetCompute(ctx, owner, phase, raw, until, idleTimeout)
 }
 func (r *runtimeLifecycle) enableCompute(ctx context.Context, owner deployment.Allocation) error {
-	p, capabilityErr := sandbox.Checkpoint(r.config.Provider)
-	if capabilityErr != nil {
-		return capabilityErr
+	p := r.config.Provider
+	if err := providercontract.Require(p, "Initial"); err != nil {
+		return err
 	}
 	initial, err := p.Initial(ctx, runtimeReference(owner))
 	if err != nil {
@@ -64,9 +65,9 @@ func (r *runtimeLifecycle) enableCompute(ctx context.Context, owner deployment.A
 }
 
 func (r *runtimeLifecycle) observeCompute(ctx context.Context, owner deployment.Allocation) error {
-	p, capabilityErr := sandbox.Checkpoint(r.config.Provider)
-	if capabilityErr != nil {
-		return capabilityErr
+	p := r.config.Provider
+	if err := providercontract.Require(p, "Initial"); err != nil {
+		return err
 	}
 	var state runtimeCompute
 	if json.Unmarshal(owner.ComputeState, &state) != nil || state.Current.ID == "" {
@@ -103,7 +104,7 @@ func (r *runtimeLifecycle) observeCompute(ctx context.Context, owner deployment.
 	}
 }
 
-func (r *runtimeLifecycle) idleCompute(ctx context.Context, p sandbox.CheckpointProvider, owner deployment.Allocation, state runtimeCompute) error {
+func (r *runtimeLifecycle) idleCompute(ctx context.Context, p sandbox.SandboxProvider, owner deployment.Allocation, state runtimeCompute) error {
 	compute, err := p.GetCompute(ctx, runtimeReference(owner), state.Current)
 	if err != nil {
 		return err
@@ -170,7 +171,7 @@ func (r *runtimeLifecycle) idleCompute(ctx context.Context, p sandbox.Checkpoint
 	return r.captureCompute(ctx, p, suspending, state, false)
 }
 
-func (r *runtimeLifecycle) captureCompute(ctx context.Context, p sandbox.CheckpointProvider, owner deployment.Allocation, state runtimeCompute, observeOnly bool) error {
+func (r *runtimeLifecycle) captureCompute(ctx context.Context, p sandbox.SandboxProvider, owner deployment.Allocation, state runtimeCompute, observeOnly bool) error {
 	result, err := p.Suspend(ctx, sandbox.SuspendRequest{Reference: runtimeReference(owner), OperationID: state.SuspendID, Source: state.Current, Snapshot: state.Snapshot, ObserveOnly: observeOnly})
 	if err != nil {
 		return err
@@ -203,7 +204,7 @@ func (r *runtimeLifecycle) captureCompute(ctx context.Context, p sandbox.Checkpo
 	return err
 }
 
-func (r *runtimeLifecycle) restoreIdleCompute(ctx context.Context, p sandbox.CheckpointProvider, owner deployment.Allocation, state runtimeCompute) error {
+func (r *runtimeLifecycle) restoreIdleCompute(ctx context.Context, p sandbox.SandboxProvider, owner deployment.Allocation, state runtimeCompute) error {
 	activity, err := r.reader.Activity(ctx, owner.ID)
 	if err != nil {
 		return err
@@ -225,7 +226,7 @@ func (r *runtimeLifecycle) restoreIdleCompute(ctx context.Context, p sandbox.Che
 	}
 	return r.restoreCompute(ctx, p, next, state, false)
 }
-func (r *runtimeLifecycle) restoreCompute(ctx context.Context, p sandbox.CheckpointProvider, owner deployment.Allocation, state runtimeCompute, observeOnly bool) error {
+func (r *runtimeLifecycle) restoreCompute(ctx context.Context, p sandbox.SandboxProvider, owner deployment.Allocation, state runtimeCompute, observeOnly bool) error {
 	if state.Target == nil || state.Snapshot == nil || state.Rollback {
 		return sandbox.ErrOwnership
 	}
diff --git a/services/core/internal/execution/runtime_compute_wake.go b/services/core/internal/execution/runtime_compute_wake.go
index 552ede1ed..ed4223d90 100644
--- a/services/core/internal/execution/runtime_compute_wake.go
+++ b/services/core/internal/execution/runtime_compute_wake.go
@@ -12,7 +12,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-func (r *runtimeLifecycle) wakeCompute(ctx context.Context, p sandbox.CheckpointProvider, owner deployment.Allocation, state runtimeCompute) error {
+func (r *runtimeLifecycle) wakeCompute(ctx context.Context, p sandbox.SandboxProvider, owner deployment.Allocation, state runtimeCompute) error {
 	if state.Rollback {
 		if _, err := p.ResumeCompute(ctx, runtimeReference(owner), state.Current); err != nil {
 			return err
@@ -70,7 +70,7 @@ func (r *runtimeLifecycle) wakeCompute(ctx context.Context, p sandbox.Checkpoint
 	return r.observeConnection(ctx, next)
 }
 
-func (r *runtimeLifecycle) cleanupCompute(ctx context.Context, p sandbox.CheckpointProvider, owner deployment.Allocation, state runtimeCompute) error {
+func (r *runtimeLifecycle) cleanupCompute(ctx context.Context, p sandbox.SandboxProvider, owner deployment.Allocation, state runtimeCompute) error {
 	if err := r.lease.CheckOwnership(ctx); err != nil {
 		return err
 	}
diff --git a/services/core/internal/execution/sandbox_deployment_drain_test.go b/services/core/internal/execution/sandbox_deployment_drain_test.go
index d80fbefa0..4ace349be 100644
--- a/services/core/internal/execution/sandbox_deployment_drain_test.go
+++ b/services/core/internal/execution/sandbox_deployment_drain_test.go
@@ -92,7 +92,7 @@ func testLifecycleCancellationPreservesLease(t *testing.T, mode string) {
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
 	id := uuid.NewString()
-	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return configuration, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
@@ -230,7 +230,7 @@ func TestSandboxDeploymentDrainFailureCannotReactivate(t *testing.T) {
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
 	id := uuid.NewString()
-	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return configuration, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/execution/sandbox_deployment_setup_test.go b/services/core/internal/execution/sandbox_deployment_setup_test.go
index 549f233d3..0337c3199 100644
--- a/services/core/internal/execution/sandbox_deployment_setup_test.go
+++ b/services/core/internal/execution/sandbox_deployment_setup_test.go
@@ -24,7 +24,7 @@ func TestDeferredSandboxDeploymentLoadsOnceBeforeNodeCreation(t *testing.T) {
 	id := uuid.NewString()
 	var selected atomic.Bool
 	var loads atomic.Int32
-	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) {
 		loads.Add(1)
 		if !selected.Load() {
@@ -94,7 +94,7 @@ func TestDeferredSandboxProviderFailureKeepsRecoveryAvailable(t *testing.T) {
 	id := uuid.NewString()
 	available := false
 	loadErr := ErrExecutionUnavailable
-	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	configuration := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) {
 		if !available {
 			return nil, loadErr
@@ -125,7 +125,7 @@ func TestRejectedSandboxCandidatePreservesActiveGeneration(t *testing.T) {
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
 	id := uuid.NewString()
-	config := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	config := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	rejected := errors.New("candidate provider unavailable")
 	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, unitDeploymentService(t), nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil },
 		func(context.Context, deployment.Setup) (PreparedRuntimeDeployment, error) {
@@ -199,7 +199,7 @@ func TestCommittedSandboxCandidatePublishesAfterShutdown(t *testing.T) {
 	if err := m.pauseDeployment(t.Context()); err != nil {
 		t.Fatal(err)
 	}
-	config := &RuntimeProvider{InstallationID: id, ProviderKind: "e2b", Mode: "direct", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("b", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	config := &RuntimeProvider{InstallationID: id, ProviderKind: "e2b", Mode: "direct", CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("b", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	var published *RuntimeProvider
 	candidate := PreparedRuntimeDeployment{Config: config, Publish: func(value *RuntimeProvider) { published = value }}
 	m.stop()
diff --git a/services/core/internal/execution/sandbox_deployment_switch_test.go b/services/core/internal/execution/sandbox_deployment_switch_test.go
index 551d1ec78..6f9a1d14d 100644
--- a/services/core/internal/execution/sandbox_deployment_switch_test.go
+++ b/services/core/internal/execution/sandbox_deployment_switch_test.go
@@ -18,7 +18,7 @@ func TestSandboxManagerSwitchDrainsBeforeDirectActivation(t *testing.T) {
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
 	id := uuid.NewString()
-	config := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	config := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
@@ -62,7 +62,7 @@ func TestSandboxManagerSwitchDrainsBeforeDirectActivation(t *testing.T) {
 	case <-time.After(time.Second):
 		t.Fatal("switch drain blocked")
 	}
-	config = &RuntimeProvider{InstallationID: id, ProviderKind: "e2b", Mode: "direct", Generation: 2, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("b", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	config = &RuntimeProvider{InstallationID: id, ProviderKind: "e2b", Mode: "direct", Generation: 2, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("b", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	if err := m.activateDeployment(t.Context(), deployment.View{InstallationID: id, Generation: 2, Mode: "direct", Provider: "e2b"}); err != nil {
 		t.Fatal(err)
 	}
@@ -100,7 +100,7 @@ func TestSandboxManagerCancelledSwitchCannotResumeBeforeDrain(t *testing.T) {
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
 	id := uuid.NewString()
-	config := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	config := &RuntimeProvider{InstallationID: id, ProviderKind: "docker", Mode: "nodes", Generation: 1, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("a", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return config, nil }, unusedPreparation(t)))
 	if err != nil {
 		t.Fatal(err)
@@ -129,7 +129,7 @@ func TestSandboxManagerCancelledSwitchCannotResumeBeforeDrain(t *testing.T) {
 	m.mu.Lock()
 	originalDrain := m.switchDrained
 	m.mu.Unlock()
-	config = &RuntimeProvider{InstallationID: id, ProviderKind: "e2b", Mode: "direct", Generation: 2, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("b", 64), Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}
+	config = &RuntimeProvider{InstallationID: id, ProviderKind: "e2b", Mode: "direct", Generation: 2, CoreURL: "https://core.example/api/v1", BackendFingerprint: strings.Repeat("b", 64), Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}
 	expected := deployment.View{InstallationID: id, Generation: 2, Mode: "direct", Provider: "e2b"}
 	ctx, cancel = context.WithTimeout(t.Context(), 10*time.Millisecond)
 	if err := m.activateDeployment(ctx, expected); !errors.Is(err, context.DeadlineExceeded) {
@@ -158,7 +158,7 @@ func TestSandboxActivationCannotBypassOutstandingDrain(t *testing.T) {
 	m, err := newRuntimeManager(Owner{Lease: heldLease{}}, nil, nil, nil, runtimegateway.NewRegistry(), NewDeferredRuntimeProvider(id,
 		func(context.Context) (*RuntimeProvider, error) { return nil, nil },
 		func(_ context.Context, setup deployment.Setup) (PreparedRuntimeDeployment, error) {
-			return PreparedRuntimeDeployment{Config: &RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}}, nil
+			return PreparedRuntimeDeployment{Config: &RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}}, nil
 		}))
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/execution/sandbox_generations_test.go b/services/core/internal/execution/sandbox_generations_test.go
index 32fc48961..733d28f82 100644
--- a/services/core/internal/execution/sandbox_generations_test.go
+++ b/services/core/internal/execution/sandbox_generations_test.go
@@ -29,7 +29,7 @@ func TestE2BReplacementVerifiesTwiceAndNeverPublishesFailedCommit(t *testing.T)
 	}
 	hub := node.NewHub(node.HubOptions{})
 	defer hub.Close()
-	provider := hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)
+	provider := hub.Proxy(uuid.NewString(), docker.Operations(), 1)
 	verifyCalls, published, fenced, released := 0, 0, 0, 0
 	var rejectAt int
 	var rejection error = sandbox.ErrCredentialOwnership
diff --git a/services/core/internal/execution/sandbox_reset_test.go b/services/core/internal/execution/sandbox_reset_test.go
index 16bd12cc9..439b16dcb 100644
--- a/services/core/internal/execution/sandbox_reset_test.go
+++ b/services/core/internal/execution/sandbox_reset_test.go
@@ -100,7 +100,7 @@ func TestSandboxResetPageTimeoutRecoversCommittedOwner(t *testing.T) {
 		if err != nil || setup.Provider == "" {
 			return nil, err
 		}
-		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Mode: setup.Mode, Generation: setup.Generation, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}, nil
+		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Mode: setup.Mode, Generation: setup.Generation, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}, nil
 	}, unusedPreparation(t))
 	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), config)
 	if err != nil {
@@ -214,7 +214,7 @@ func TestSandboxResetPublishesCommittedGenerationWithoutReading(t *testing.T) {
 		if err != nil || setup.Provider == "" {
 			return nil, err
 		}
-		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Mode: setup.Mode, Generation: setup.Generation, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}, nil
+		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Mode: setup.Mode, Generation: setup.Generation, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}, nil
 	}, unusedPreparation(t))
 	var published []uint64
 	config.PublishUnconfigured = func(generation uint64) {
diff --git a/services/core/internal/execution/sandbox_snapshot_budget_test.go b/services/core/internal/execution/sandbox_snapshot_budget_test.go
index 60a0e1067..eba65917a 100644
--- a/services/core/internal/execution/sandbox_snapshot_budget_test.go
+++ b/services/core/internal/execution/sandbox_snapshot_budget_test.go
@@ -72,7 +72,7 @@ func TestSandboxResetSnapshotFitsPageBudget(t *testing.T) {
 		if err != nil || setup.Provider == "" {
 			return nil, err
 		}
-		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)}, nil
+		return &RuntimeProvider{InstallationID: id, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode, CoreURL: "https://core.example/api/v1", BackendFingerprint: setup.BackendFingerprint, Provider: hub.Proxy(uuid.NewString(), docker.Operations(), 1)}, nil
 	}, unusedPreparation(t))
 	m, err := newRuntimeManager(owner, deployments, reader, nil, runtimegateway.NewRegistry(), configuration)
 	if err != nil {
diff --git a/services/core/internal/providercontract/operations.go b/services/core/internal/providercontract/operations.go
index ab1aa7a32..cb24ac2f5 100644
--- a/services/core/internal/providercontract/operations.go
+++ b/services/core/internal/providercontract/operations.go
@@ -5,7 +5,6 @@ package providercontract
 import (
 	"errors"
 	"fmt"
-	"reflect"
 	"regexp"
 )
 
@@ -64,32 +63,3 @@ func Require(p Declared, operation string) error {
 	}
 	return p.ProviderOperations()[operation].Check(operation)
 }
-
-// Validate checks the existing small interfaces, including methods declared
-// unsupported. Every adapter must explicitly implement those rejections.
-// A new method cannot be silently covered by an old declaration or stub.
-func Validate(p Declared, contracts ...reflect.Type) error {
-	if p == nil {
-		return ErrContract
-	}
-	value := reflect.ValueOf(p)
-	if value.Kind() == reflect.Pointer && value.IsNil() {
-		return ErrContract
-	}
-	operations := p.ProviderOperations()
-	for _, contract := range contracts {
-		if !value.Type().Implements(contract) {
-			return fmt.Errorf("%w: missing %s implementation", ErrContract, contract.Name())
-		}
-		for i := 0; i < contract.NumMethod(); i++ {
-			name := contract.Method(i).Name
-			if name == "ProviderOperations" {
-				continue
-			}
-			if err := operations[name].Check(name); err != nil && !errors.Is(err, ErrUnsupported) {
-				return err
-			}
-		}
-	}
-	return nil
-}
diff --git a/services/core/internal/runtimeobs/exporter_independence_test.go b/services/core/internal/runtimeobs/exporter_independence_test.go
index 2c3b92078..3a24a74ec 100644
--- a/services/core/internal/runtimeobs/exporter_independence_test.go
+++ b/services/core/internal/runtimeobs/exporter_independence_test.go
@@ -10,7 +10,7 @@ func TestExporterOutageDoesNotDelayOtherDestinations(t *testing.T) {
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
 	blocked := &gatedExporter{started: make(chan struct{}, 1), release: make(chan struct{})}
 	records := make(chan ExportRecord, 1)
-	service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": &fixedSource{sample: Sample{ObservedAt: now}}},
+	service, err := NewService(fixedResolver{target: target}, sourceOf(&fixedSource{sample: Sample{ObservedAt: now}}),
 		WithExporter(blocked, ExportOptions{QueueCapacity: 1, Timeout: time.Second}),
 		WithExporter(channelExporter{records: records}, ExportOptions{QueueCapacity: 1, Timeout: time.Second}))
 	if err != nil {
diff --git a/services/core/internal/runtimeobs/operations_fixture_test.go b/services/core/internal/runtimeobs/operations_fixture_test.go
index d55ebe8c4..8364c7ad0 100644
--- a/services/core/internal/runtimeobs/operations_fixture_test.go
+++ b/services/core/internal/runtimeobs/operations_fixture_test.go
@@ -2,46 +2,18 @@ package runtimeobs
 
 import (
 	"context"
+
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 )
 
-func (*fixedSource) ProviderOperations() providercontract.Operations {
-	return providercontract.Operations{"ResolveObservationSource": {State: providercontract.Supported}, "ObservationProviderType": {State: providercontract.Supported}, "Observe": {State: providercontract.Supported}, "ObserveBatch": {State: providercontract.Unsupported, Reason: "fixture_has_no_batch_observation"}}
-}
-func (*fixedSource) ObserveBatch(context.Context, []Target) ([]BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "fixture_has_no_batch_observation"}
-}
-func (blockingSource) ProviderOperations() providercontract.Operations {
-	return providercontract.Operations{"ResolveObservationSource": {State: providercontract.Supported}, "ObservationProviderType": {State: providercontract.Supported}, "Observe": {State: providercontract.Supported}, "ObserveBatch": {State: providercontract.Unsupported, Reason: "fixture_has_no_batch_observation"}}
-}
-func (blockingSource) ObserveBatch(context.Context, []Target) ([]BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "fixture_has_no_batch_observation"}
-}
-func (*countingSource) ProviderOperations() providercontract.Operations {
-	return providercontract.Operations{"ResolveObservationSource": {State: providercontract.Supported}, "ObservationProviderType": {State: providercontract.Supported}, "Observe": {State: providercontract.Supported}, "ObserveBatch": {State: providercontract.Unsupported, Reason: "fixture_has_no_batch_observation"}}
-}
-func (*countingSource) ObserveBatch(context.Context, []Target) ([]BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "fixture_has_no_batch_observation"}
-}
-func (*batchSource) ProviderOperations() providercontract.Operations {
-	return providercontract.Operations{"ResolveObservationSource": {State: providercontract.Supported}, "ObservationProviderType": {State: providercontract.Supported}, "Observe": {State: providercontract.Supported}, "ObserveBatch": {State: providercontract.Supported}}
+func observedOperations() providercontract.Operations {
+	return providercontract.Operations{"Observe": {State: providercontract.Supported}}
 }
+func (*fixedSource) ProviderOperations() providercontract.Operations    { return observedOperations() }
+func (blockingSource) ProviderOperations() providercontract.Operations  { return observedOperations() }
+func (*countingSource) ProviderOperations() providercontract.Operations { return observedOperations() }
 
-func (s *fixedSource) ResolveObservationSource(context.Context) (Source, error) { return s, nil }
-func (*fixedSource) ObservationProviderType() string                            { return "fixture" }
-
-func (s blockingSource) ResolveObservationSource(context.Context) (Source, error) { return s, nil }
-
-func (s *countingSource) ResolveObservationSource(context.Context) (Source, error) { return s, nil }
-func (*countingSource) ObservationProviderType() string                            { return "fixture" }
-
-func (s *batchSource) ResolveObservationSource(context.Context) (Source, error) { return s, nil }
-func (*batchSource) ObservationProviderType() string                            { return "fixture" }
-
-func (s typedSource) ResolveObservationSource(context.Context) (Source, error) { return s, nil }
-
-func (s *failingBatchSource) ResolveObservationSource(context.Context) (Source, error) { return s, nil }
-
-func (s *unsupportedObservation) ResolveObservationSource(context.Context) (Source, error) {
-	return s, nil
+// sourceOf selects one fixed docker source for every page.
+func sourceOf(source Source) func(context.Context) (Source, string, error) {
+	return func(context.Context) (Source, string, error) { return source, "docker", nil }
 }
diff --git a/services/core/internal/runtimeobs/operations_test.go b/services/core/internal/runtimeobs/operations_test.go
index 3e66de33c..fc9e242d0 100644
--- a/services/core/internal/runtimeobs/operations_test.go
+++ b/services/core/internal/runtimeobs/operations_test.go
@@ -1,69 +1,20 @@
 package runtimeobs
 
 import (
-	"context"
-	"errors"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"testing"
-	"time"
-)
 
-type failingBatchSource struct {
-	*fixedSource
-	batchErr error
-	batches  int
-}
-
-func (*failingBatchSource) ProviderOperations() providercontract.Operations {
-	return providercontract.Operations{"ResolveObservationSource": {State: providercontract.Supported}, "ObservationProviderType": {State: providercontract.Supported}, "Observe": {State: providercontract.Supported}, "ObserveBatch": {State: providercontract.Supported}}
-}
-func (s *failingBatchSource) ObserveBatch(context.Context, []Target) ([]BatchResult, error) {
-	s.batches++
-	return nil, s.batchErr
-}
-func TestBatchFallbackRequiresExplicitSafeUnsupported(t *testing.T) {
-	for _, test := range []struct {
-		name     string
-		err      error
-		fallback bool
-	}{
-		{"unsupported", &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "native_batch_not_supported"}, true},
-		{"unavailable", ErrUnavailable, false},
-		{"timeout", context.DeadlineExceeded, false},
-		{"failure", errors.New("provider failed"), false},
-		{"bare unsupported", providercontract.ErrUnsupported, false},
-		{"unsafe unsupported", &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "private endpoint / key"}, false},
-		{"wrong operation", &providercontract.UnsupportedError{Operation: "Observe", Reason: "not_supported"}, false},
-	} {
-		t.Run(test.name, func(t *testing.T) {
-			now := time.Now()
-			ratio := 0.5
-			source := &failingBatchSource{fixedSource: &fixedSource{sample: Sample{ObservedAt: now, CPUUtilizationRatio: &ratio}}, batchErr: test.err}
-			target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
-			service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source})
-			if err != nil {
-				t.Fatal(err)
-			}
-			observations, errs := service.ObserveSessions(t.Context(), []SessionIdentity{{TenantID: "tenant", SessionID: "session"}}, PageOptions{})
-			if source.batches != 1 || (source.calls == 1) != test.fallback {
-				t.Fatalf("batch=%d single=%d", source.batches, source.calls)
-			}
-			if test.fallback && (errs[0] != nil || observations[0].Status != StatusObserved) {
-				t.Fatal(observations, errs)
-			}
-		})
-	}
-}
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
+)
 
 type unsupportedObservation struct{ *fixedSource }
 
 func (*unsupportedObservation) ProviderOperations() providercontract.Operations {
-	return providercontract.Operations{"ResolveObservationSource": {State: providercontract.Supported}, "ObservationProviderType": {State: providercontract.Supported}, "Observe": {State: providercontract.Unsupported, Reason: "native_metrics_not_supported"}, "ObserveBatch": {State: providercontract.Unsupported, Reason: "native_metrics_not_supported"}}
+	return providercontract.Operations{"Observe": {State: providercontract.Unsupported, Reason: "native_metrics_not_supported"}}
 }
 func TestUnsupportedObservationIsNotUnavailable(t *testing.T) {
 	source := &unsupportedObservation{&fixedSource{}}
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
-	service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source})
+	service, err := NewService(fixedResolver{target: target}, sourceOf(source))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/runtimeobs/sampler.go b/services/core/internal/runtimeobs/sampler.go
index b55e205db..a89384344 100644
--- a/services/core/internal/runtimeobs/sampler.go
+++ b/services/core/internal/runtimeobs/sampler.go
@@ -27,8 +27,7 @@ type SessionLister interface {
 	ListRuntimeObservationSessions(context.Context, string, int) (SessionPage, error)
 }
 
-// HistoryObserver reads one listed page, so providers with a batch read can
-// sample the whole page in one bounded request.
+// HistoryObserver reads one listed page with bounded concurrency.
 type HistoryObserver interface {
 	ObserveSessionsForHistory(context.Context, []SessionIdentity, OwnershipChecker, PageOptions) ([]Observation, []error)
 }
diff --git a/services/core/internal/runtimeobs/sampler_test.go b/services/core/internal/runtimeobs/sampler_test.go
index 2f1e119e6..da14b77b4 100644
--- a/services/core/internal/runtimeobs/sampler_test.go
+++ b/services/core/internal/runtimeobs/sampler_test.go
@@ -146,7 +146,7 @@ func TestSamplerSweepsEveryPageAndIsolatesSessionFailures(t *testing.T) {
 func TestSamplerBoundsConcurrencyAndSourceDeadline(t *testing.T) {
 	source := &countingSource{}
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
-	service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source})
+	service, err := NewService(fixedResolver{target: target}, sourceOf(source))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -246,7 +246,7 @@ func TestSamplerPreservesProviderTimeoutAndFinalFenceAfterSlowResolution(t *test
 	records := make(chan ExportRecord, 1)
 	service, err := NewService(
 		resolver,
-		map[string]SourceResolver{"provider": blockingSource{}},
+		sourceOf(blockingSource{}),
 		WithExporter(channelExporter{records: records}, ExportOptions{}),
 	)
 	if err != nil {
diff --git a/services/core/internal/runtimeobs/service.go b/services/core/internal/runtimeobs/service.go
index 101c6fe9f..c38db7359 100644
--- a/services/core/internal/runtimeobs/service.go
+++ b/services/core/internal/runtimeobs/service.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"reflect"
 	"sync"
 	"time"
 
@@ -30,12 +29,16 @@ const (
 
 type Service struct {
 	resolver TargetResolver
-	sources  map[string]SourceResolver
+	source   func(context.Context) (Source, string, error)
 	now      func() time.Time
 	exports  []*exportDispatcher
 }
 
-func NewService(resolver TargetResolver, sources map[string]SourceResolver, options ...ServiceOption) (*Service, error) {
+// NewService reads managed Runtimes through source, which returns the Sandbox
+// Provider of the deployment's current selection and its registered kind, or
+// ErrUnavailable while none is selected. A nil source means this Core has no
+// managed deployment.
+func NewService(resolver TargetResolver, source func(context.Context) (Source, string, error), options ...ServiceOption) (*Service, error) {
 	if resolver == nil {
 		return nil, errors.New("Runtime observation resolver is required")
 	}
@@ -48,20 +51,7 @@ func NewService(resolver TargetResolver, sources map[string]SourceResolver, opti
 			return nil, err
 		}
 	}
-	copySources := make(map[string]SourceResolver, len(sources))
-	for key, source := range sources {
-		if key == "" || source == nil {
-			return nil, errors.New("invalid Runtime observation source")
-		}
-		if err := providercontract.Validate(source, reflect.TypeFor[SourceResolver]()); err != nil {
-			return nil, err
-		}
-		if err := providercontract.Require(source, "ResolveObservationSource"); err != nil {
-			return nil, fmt.Errorf("%w: observation source resolution must be supported", providercontract.ErrContract)
-		}
-		copySources[key] = source
-	}
-	service := &Service{resolver: resolver, sources: copySources, now: time.Now}
+	service := &Service{resolver: resolver, source: source, now: time.Now}
 	for _, export := range config.exporters {
 		service.exports = append(service.exports, newExportDispatcher(export.exporter, export.exportOptions))
 	}
@@ -109,14 +99,12 @@ func (s *Service) ObserveSessionForHistory(ctx context.Context, tenantID, sessio
 type PageOptions struct {
 	// Concurrency bounds identity resolution and per-target provider reads.
 	Concurrency int
-	// SourceTimeout bounds each provider read, including one batch read.
+	// SourceTimeout bounds each provider read.
 	SourceTimeout time.Duration
 }
 
-// ObserveSessions observes one page of Sessions. Running targets of a source
-// that explicitly supports BatchSource share one provider read per MaxBatchTargets;
-// other sources are read per target, exactly as ObserveSession reads them.
-// Results and errors are aligned with sessions.
+// ObserveSessions observes one page of Sessions, reading each running target
+// exactly as ObserveSession reads it. Results and errors are aligned with sessions.
 func (s *Service) ObserveSessions(ctx context.Context, sessions []SessionIdentity, options PageOptions) ([]Observation, []error) {
 	return s.observeSessions(ctx, sessions, CollectionSourceOnRead, nil, options)
 }
@@ -141,8 +129,6 @@ func (s *Service) observeSession(ctx context.Context, tenantID, sessionID string
 // sourceRead is a resolved running managed target awaiting its provider sample.
 type sourceRead struct {
 	index        int
-	key          string
-	source       Source
 	target       Target
 	providerType string
 }
@@ -162,117 +148,39 @@ func (s *Service) observeSessions(ctx context.Context, sessions []SessionIdentit
 		}
 		observations[index], errs[index] = observation, err
 	})
-	// A provider key selects one source; keep page order within each group.
-	var keys []string
-	groups := map[string][]*sourceRead{}
+	var pending []*sourceRead
 	for _, read := range reads {
-		if read == nil {
-			continue
-		}
-		if _, ok := groups[read.key]; !ok {
-			keys = append(keys, read.key)
-		}
-		groups[read.key] = append(groups[read.key], read)
-	}
-	for _, key := range keys {
-		group := groups[key]
-		sourceCtx, stop := sourceContext(ctx, options.SourceTimeout)
-		source, err := s.sources[key].ResolveObservationSource(sourceCtx)
-		stop()
-		if err == nil {
-			err = ValidateSource(source)
-		}
-		if err != nil {
-			for _, read := range group {
-				observations[read.index], errs[read.index] = s.complete(ctx, read, Sample{}, err, 0, collectionSource, owner)
-			}
-			continue
-		}
-		providerType := source.ObservationProviderType()
-		for _, read := range group {
-			read.source, read.providerType = source, providerType
-		}
-		for start := 0; start < len(group); start += MaxBatchTargets {
-			chunk := group[start:min(start+MaxBatchTargets, len(group))]
-			if s.readBatch(ctx, chunk, observations, errs, collectionSource, owner, options.SourceTimeout) {
-				continue
-			}
-			parallel(len(chunk), options.Concurrency, func(index int) {
-				read := chunk[index]
-				sourceCtx, stop := sourceContext(ctx, options.SourceTimeout)
-				started := time.Now()
-				var sample Sample
-				err := providercontract.Require(read.source, "Observe")
-				if err == nil {
-					sample, err = read.source.Observe(sourceCtx, read.target)
-				}
-				stop()
-				observations[read.index], errs[read.index] = s.complete(ctx, read, sample, err, time.Since(started), collectionSource, owner)
-			})
-		}
-	}
-	return observations, errs
-}
-
-// readBatch reports false, without results, when the source has no batch read
-// for its current provider.
-func (s *Service) readBatch(ctx context.Context, chunk []*sourceRead, observations []Observation, errs []error, collectionSource CollectionSource, owner OwnershipChecker, sourceTimeout time.Duration) bool {
-	batch, ok := chunk[0].source.(BatchSource)
-	if !ok { // NewService rejects this; never treat malformed registration as unsupported.
-		for _, read := range chunk {
-			errs[read.index] = providercontract.ErrContract
-		}
-		return true
-	}
-	if err := providercontract.Require(chunk[0].source, "ObserveBatch"); err != nil {
-		if errors.Is(err, providercontract.ErrUnsupported) {
-			return false
-		}
-		for _, read := range chunk {
-			errs[read.index] = err
+		if read != nil {
+			pending = append(pending, read)
 		}
-		return true
 	}
-	targets := make([]Target, len(chunk))
-	for index, read := range chunk {
-		targets[index] = read.target
+	if len(pending) == 0 {
+		return observations, errs
 	}
-	// One batch read replaces up to MaxBatchTargets single reads, so it may take
-	// longer than one of them without exceeding the page's overall cost.
-	if sourceTimeout > 0 {
-		sourceTimeout = max(sourceTimeout, minBatchSourceTimeout)
-	}
-	sourceCtx, stop := sourceContext(ctx, sourceTimeout)
-	started := time.Now()
-	results, batchErr := batch.ObserveBatch(sourceCtx, targets)
+	// One source serves the whole page.
+	sourceCtx, stop := sourceContext(ctx, options.SourceTimeout)
+	source, providerType, err := s.source(sourceCtx)
 	stop()
-	if _, unsupported := providercontract.UnsupportedReason(batchErr, "ObserveBatch"); unsupported {
-		return false
-	}
-	if errors.Is(batchErr, providercontract.ErrUnsupported) {
-		batchErr = providercontract.ErrContract
-	}
-	if batchErr != nil {
-		for _, read := range chunk {
-			observations[read.index], errs[read.index] = s.complete(ctx, read, Sample{}, batchErr, 0, collectionSource, owner)
+	if err != nil {
+		for _, read := range pending {
+			observations[read.index], errs[read.index] = s.complete(ctx, read, Sample{}, err, 0, collectionSource, owner)
 		}
-		return true
+		return observations, errs
 	}
-	duration := time.Since(started)
-	for index, read := range chunk {
-		if len(results) != len(chunk) {
-			errs[read.index] = errors.New("Runtime observation batch returned mismatched results")
-			continue
-		}
-		// The rows share one provider read; only the first carries its duration,
-		// so sample-duration telemetry counts each read once.
-		rowDuration := time.Duration(0)
-		if index == 0 {
-			rowDuration = duration
+	parallel(len(pending), options.Concurrency, func(index int) {
+		read := pending[index]
+		read.providerType = providerType
+		sourceCtx, stop := sourceContext(ctx, options.SourceTimeout)
+		started := time.Now()
+		var sample Sample
+		err := providercontract.Require(source, "Observe")
+		if err == nil {
+			sample, err = source.Observe(sourceCtx, read.target)
 		}
-		observations[read.index], errs[read.index] = s.complete(ctx, read, results[index].Sample, results[index].Err, rowDuration, collectionSource, owner)
-	}
-	return true
+		stop()
+		observations[read.index], errs[read.index] = s.complete(ctx, read, sample, err, time.Since(started), collectionSource, owner)
+	})
+	return observations, errs
 }
 
 // resolve returns either a finished observation or a pending provider read.
@@ -317,11 +225,10 @@ func (s *Service) resolve(ctx context.Context, tenantID, sessionID string, owner
 	default:
 		return Observation{}, nil, errors.New("invalid managed Runtime allocation state")
 	}
-	_, ok := s.sources[target.Instance.ProviderKey]
-	if !ok {
+	if s.source == nil {
 		return Observation{Target: target, Status: StatusUnavailable, Reason: "source_not_configured", ResolvedAt: resolvedAt}, nil, nil
 	}
-	return Observation{}, &sourceRead{key: target.Instance.ProviderKey, target: target}, nil
+	return Observation{}, &sourceRead{target: target}, nil
 }
 
 // complete classifies one provider result and hands it to history export.
@@ -352,8 +259,6 @@ func (s *Service) complete(ctx context.Context, read *sourceRead, sample Sample,
 	return s.finish(ctx, observation, collectionSource, owner)
 }
 
-const minBatchSourceTimeout = 5 * time.Second
-
 func sourceContext(ctx context.Context, timeout time.Duration) (context.Context, context.CancelFunc) {
 	if timeout > 0 {
 		return context.WithTimeout(ctx, timeout)
diff --git a/services/core/internal/runtimeobs/service_test.go b/services/core/internal/runtimeobs/service_test.go
index ca3d9dbc2..763b4363d 100644
--- a/services/core/internal/runtimeobs/service_test.go
+++ b/services/core/internal/runtimeobs/service_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"math"
 	"sync"
 	"testing"
@@ -38,13 +37,6 @@ func (s *fixedSource) Observe(context.Context, Target) (Sample, error) {
 	return s.sample, s.err
 }
 
-type typedSource struct {
-	*fixedSource
-	providerType string
-}
-
-func (s typedSource) ObservationProviderType() string { return s.providerType }
-
 type blockingSource struct{}
 
 func (blockingSource) Observe(ctx context.Context, _ Target) (Sample, error) {
@@ -52,8 +44,6 @@ func (blockingSource) Observe(ctx context.Context, _ Target) (Sample, error) {
 	return Sample{}, ctx.Err()
 }
 
-func (blockingSource) ObservationProviderType() string { return "docker" }
-
 type channelExporter struct {
 	records chan ExportRecord
 	err     error
@@ -125,7 +115,7 @@ func TestServiceDoesNotCallSourcesForUnsupportedModes(t *testing.T) {
 		if mode == ModeSelfHosted {
 			target.EnvironmentID = "environment"
 		}
-		service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source})
+		service, err := NewService(fixedResolver{target: target}, sourceOf(source))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -151,7 +141,7 @@ func TestServicePreservesUnavailableAndObservedZero(t *testing.T) {
 	zeroMemory := uint64(0)
 	now := time.Date(2026, 9, 22, 1, 0, 0, 0, time.UTC)
 	source := &fixedSource{sample: Sample{ObservedAt: now, CPUUsageSecondsTotal: &zeroCPU, MemoryUsageBytes: &zeroMemory}}
-	service, err = NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source})
+	service, err = NewService(fixedResolver{target: target}, sourceOf(source))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -176,13 +166,13 @@ func TestServiceExportsOnlySanitizedValidatedRecords(t *testing.T) {
 			ProviderState: json.RawMessage(`{"native_id":"must-not-export"}`),
 		},
 	}
-	source := typedSource{fixedSource: &fixedSource{sample: Sample{
+	source := &fixedSource{sample: Sample{
 		ObservedAt: now, StartedAt: &startedAt,
 		CPUUsageSecondsTotal: &cpuSeconds, CPUCapacityCores: &cpuCapacity,
 		MemoryUsageBytes: &memoryUsage, MemoryLimitBytes: &memoryLimit,
-	}}, providerType: "docker"}
+	}}
 	records := make(chan ExportRecord, 1)
-	service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source}, WithExporter(channelExporter{records: records}, ExportOptions{QueueCapacity: 1, Timeout: time.Second}))
+	service, err := NewService(fixedResolver{target: target}, sourceOf(source), WithExporter(channelExporter{records: records}, ExportOptions{QueueCapacity: 1, Timeout: time.Second}))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -224,7 +214,7 @@ func TestServiceMarksPeriodicHistoryCollection(t *testing.T) {
 	records := make(chan ExportRecord, 1)
 	service, err := NewService(
 		fixedResolver{target: target},
-		map[string]SourceResolver{"provider": &fixedSource{sample: Sample{ObservedAt: now, StartedAt: &startedAt}}},
+		sourceOf(&fixedSource{sample: Sample{ObservedAt: now, StartedAt: &startedAt}}),
 		WithExporter(channelExporter{records: records}, ExportOptions{}),
 	)
 	if err != nil {
@@ -257,7 +247,7 @@ func TestServiceDoesNotExportPeriodicSampleAfterOwnershipLoss(t *testing.T) {
 	records := make(chan ExportRecord, 1)
 	service, err := NewService(
 		fixedResolver{target: target},
-		map[string]SourceResolver{"provider": &fixedSource{sample: Sample{ObservedAt: now, StartedAt: &startedAt}}},
+		sourceOf(&fixedSource{sample: Sample{ObservedAt: now, StartedAt: &startedAt}}),
 		WithExporter(channelExporter{records: records}, ExportOptions{}),
 	)
 	if err != nil {
@@ -278,40 +268,13 @@ func TestServiceDoesNotExportPeriodicSampleAfterOwnershipLoss(t *testing.T) {
 	}
 }
 
-func TestServiceRejectsUnsafeProviderTypeBeforeSamplingOrExport(t *testing.T) {
-	now := time.Date(2026, 9, 22, 1, 0, 0, 0, time.UTC)
-	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
-	source := typedSource{fixedSource: &fixedSource{sample: Sample{ObservedAt: now}}, providerType: "docker native_id=secret"}
-	records := make(chan ExportRecord, 1)
-	service, err := NewService(
-		fixedResolver{target: target},
-		map[string]SourceResolver{"provider": source},
-		WithExporter(channelExporter{records: records}, ExportOptions{}),
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	service.now = func() time.Time { return now }
-	if _, err := service.ObserveSession(t.Context(), "tenant", "session"); err == nil || source.calls != 0 {
-		t.Fatalf("unsafe provider type reached sampling: err=%v calls=%d", err, source.calls)
-	}
-	if err := service.Close(t.Context()); err != nil {
-		t.Fatal(err)
-	}
-	select {
-	case record := <-records:
-		t.Fatalf("unsafe provider type reached exporter: %+v", record)
-	default:
-	}
-}
-
 func TestServiceExportQueueNeverBlocksOrChangesObservation(t *testing.T) {
 	now := time.Date(2026, 9, 22, 1, 0, 0, 0, time.UTC)
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
 	exporter := &gatedExporter{started: make(chan struct{}, 1), release: make(chan struct{})}
 	service, err := NewService(
 		fixedResolver{target: target},
-		map[string]SourceResolver{"provider": &fixedSource{sample: Sample{ObservedAt: now}}},
+		sourceOf(&fixedSource{sample: Sample{ObservedAt: now}}),
 		WithExporter(exporter, ExportOptions{QueueCapacity: 1, Timeout: time.Second}),
 	)
 	if err != nil {
@@ -370,7 +333,7 @@ func TestServiceIgnoresExporterFailureAndValidatesOptions(t *testing.T) {
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
 	service, err := NewService(
 		fixedResolver{target: target},
-		map[string]SourceResolver{"provider": &fixedSource{sample: Sample{ObservedAt: now}}},
+		sourceOf(&fixedSource{sample: Sample{ObservedAt: now}}),
 		WithExporter(channelExporter{records: records, err: errors.New("backend unavailable")}, ExportOptions{}),
 	)
 	if err != nil {
@@ -392,7 +355,7 @@ func TestServiceCloseHonorsItsDeadlineWhenExporterDoesNot(t *testing.T) {
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
 	service, err := NewService(
 		fixedResolver{target: target},
-		map[string]SourceResolver{"provider": &fixedSource{sample: Sample{ObservedAt: now}}},
+		sourceOf(&fixedSource{sample: Sample{ObservedAt: now}}),
 		WithExporter(exporter, ExportOptions{QueueCapacity: 1, Timeout: time.Millisecond}),
 	)
 	if err != nil {
@@ -422,7 +385,7 @@ func TestServiceIsolatesExporterPanics(t *testing.T) {
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
 	service, err := NewService(
 		fixedResolver{target: target},
-		map[string]SourceResolver{"provider": &fixedSource{sample: Sample{ObservedAt: now}}},
+		sourceOf(&fixedSource{sample: Sample{ObservedAt: now}}),
 		WithExporter(exporter, ExportOptions{}),
 	)
 	if err != nil {
@@ -455,9 +418,7 @@ func TestServiceMapsOnlyDeclaredUnavailability(t *testing.T) {
 		{err: context.DeadlineExceeded, wantReason: "sample_timeout"},
 		{err: errors.New("Docker permission denied"), wantError: true},
 	} {
-		service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{
-			"provider": typedSource{fixedSource: &fixedSource{err: tc.err}, providerType: "docker"},
-		})
+		service, err := NewService(fixedResolver{target: target}, sourceOf(&fixedSource{err: tc.err}))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -476,7 +437,7 @@ func TestServiceMapsAnActualSourceDeadlineWithoutLeakingIt(t *testing.T) {
 		EnvironmentID: "environment", Mode: ModeManaged,
 		Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"},
 	}
-	service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": blockingSource{}})
+	service, err := NewService(fixedResolver{target: target}, sourceOf(blockingSource{}))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -496,7 +457,7 @@ func TestServiceExportsPeriodicSourceTimeoutAfterFinalOwnershipFence(t *testing.
 	records := make(chan ExportRecord, 1)
 	service, err := NewService(
 		fixedResolver{target: target},
-		map[string]SourceResolver{"provider": blockingSource{}},
+		sourceOf(blockingSource{}),
 		WithExporter(channelExporter{records: records}, ExportOptions{}),
 	)
 	if err != nil {
@@ -537,7 +498,7 @@ func TestServiceClassifiesResolverAndTerminalAllocationUnavailability(t *testing
 
 	source := &fixedSource{}
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "creating"}}
-	service, err = NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source})
+	service, err = NewService(fixedResolver{target: target}, sourceOf(source))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -547,7 +508,7 @@ func TestServiceClassifiesResolverAndTerminalAllocationUnavailability(t *testing
 	}
 
 	target = Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "released"}}
-	service, err = NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": &fixedSource{}})
+	service, err = NewService(fixedResolver{target: target}, sourceOf(&fixedSource{}))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -560,7 +521,7 @@ func TestServiceClassifiesResolverAndTerminalAllocationUnavailability(t *testing
 	target = Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{
 		AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running", AllocationCreatedAt: time.Now().Add(time.Hour),
 	}}
-	service, err = NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source})
+	service, err = NewService(fixedResolver{target: target}, sourceOf(source))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -584,7 +545,7 @@ func TestServiceRejectsUnsafeProviderSamples(t *testing.T) {
 		{ObservedAt: now, MemoryUsageBytes: &tooLarge},
 		{ObservedAt: now, MemoryLimitBytes: &tooLarge},
 	} {
-		service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": &fixedSource{sample: sample}})
+		service, err := NewService(fixedResolver{target: target}, sourceOf(&fixedSource{sample: sample}))
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -614,67 +575,6 @@ func TestServiceRejectsMismatchedResolvedOwnership(t *testing.T) {
 
 func float64Pointer(value float64) *float64 { return &value }
 
-type batchSource struct {
-	mu      sync.Mutex
-	batches []int
-	sample  Sample
-}
-
-func (s *batchSource) Observe(context.Context, Target) (Sample, error) {
-	return Sample{}, errors.New("per-target read used for a batch source")
-}
-
-func (s *batchSource) ObserveBatch(ctx context.Context, targets []Target) ([]BatchResult, error) {
-	time.Sleep(time.Millisecond)
-	s.mu.Lock()
-	s.batches = append(s.batches, len(targets))
-	s.mu.Unlock()
-	results := make([]BatchResult, len(targets))
-	for index, target := range targets {
-		results[index].Sample = s.sample
-		if target.SessionID == "stopped" {
-			results[index].Err = ErrNotRunning
-		}
-	}
-	return results, nil
-}
-
-func TestServiceBatchesPageReadsWithinProviderLimit(t *testing.T) {
-	now := time.Date(2026, 9, 25, 1, 0, 0, 0, time.UTC)
-	ratio := 0.25
-	source := &batchSource{sample: Sample{ObservedAt: now, CPUUtilizationRatio: &ratio}}
-	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
-	service, err := NewService(fixedResolver{target: target}, map[string]SourceResolver{"provider": source})
-	if err != nil {
-		t.Fatal(err)
-	}
-	service.now = func() time.Time { return now }
-	sessions := make([]SessionIdentity, 150)
-	for index := range sessions {
-		sessions[index] = SessionIdentity{TenantID: "tenant", SessionID: fmt.Sprint(index)}
-	}
-	sessions[120].SessionID = "stopped"
-	observations, errs := service.ObserveSessions(t.Context(), sessions, PageOptions{Concurrency: 8, SourceTimeout: time.Second})
-	if len(source.batches) != 2 || source.batches[0] != MaxBatchTargets || source.batches[1] != 50 {
-		t.Fatalf("page was not read in provider-sized batches: %v", source.batches)
-	}
-	for index, observation := range observations {
-		if errs[index] != nil || observation.Target.SessionID != sessions[index].SessionID {
-			t.Fatalf("batch result %d was not aligned: %+v %v", index, observation, errs[index])
-		}
-	}
-	if observations[120].Status != StatusUnavailable || observations[120].Reason != "runtime_not_running" ||
-		observations[0].Status != StatusObserved || *observations[0].Sample.CPUUtilizationRatio != .25 {
-		t.Fatalf("batch results were not classified: %+v %+v", observations[0], observations[120])
-	}
-	// Each provider read reports its duration once, on the first row of its batch.
-	for index, observation := range observations {
-		if (observation.SourceDuration > 0) != (index == 0 || index == MaxBatchTargets) {
-			t.Fatalf("row %d source duration = %v", index, observation.SourceDuration)
-		}
-	}
-}
-
 func TestSampleWithoutNewerFieldsKeepsItsNodeWireForm(t *testing.T) {
 	observedAt := time.Date(2026, 9, 25, 1, 0, 0, 0, time.UTC)
 	cpu, memory := 1.5, uint64(1024)
diff --git a/services/core/internal/runtimeobs/source.go b/services/core/internal/runtimeobs/source.go
index 8886a42b1..d29e446bd 100644
--- a/services/core/internal/runtimeobs/source.go
+++ b/services/core/internal/runtimeobs/source.go
@@ -3,9 +3,6 @@ package runtimeobs
 import (
 	"context"
 	"errors"
-	"fmt"
-	"reflect"
-	"regexp"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 )
@@ -15,55 +12,13 @@ var (
 	ErrNotRunning  = errors.New("Runtime is not running")
 )
 
-// SourceResolver selects one immutable source for a page of provider reads.
-// An unconfigured resolver returns ErrUnavailable. Registration never resolves
-// a source; callers validate each selected source before reading it.
-type SourceResolver interface {
-	providercontract.Declared
-	ResolveObservationSource(context.Context) (Source, error)
-}
-
-// Source reads one provider-owned Runtime instance. Implementations must verify
-// ownership before returning data and must not renew, restart, or stop compute.
+// Source is the observation half of a Sandbox Provider, which
+// services/core/internal/sandbox/sandbox_provider.go defines.
 type Source interface {
 	providercontract.Declared
-	// ObservationProviderType is a nonempty, immutable telemetry identity.
-	ObservationProviderType() string
 	Observe(context.Context, Target) (Sample, error)
 }
 
-// MaxBatchTargets bounds the targets of one BatchSource read.
-const MaxBatchTargets = 100
-
-// BatchSource reads multiple instances under the same ownership rules as Observe.
-// Unsupported returns a typed providercontract.UnsupportedError before reading;
-// only that result permits per-target observation. Unavailable or failed reads
-// must not silently retry through Observe. Successful results preserve target order.
-type BatchSource interface {
-	ObserveBatch(context.Context, []Target) (results []BatchResult, err error)
-}
-
-type BatchResult struct {
-	Sample Sample
-	Err    error
-}
-
 type TargetResolver interface {
 	Resolve(context.Context, string, string) (Target, error)
 }
-
-var providerTypePattern = regexp.MustCompile(`^[a-z][a-z0-9_]{0,31}$`)
-
-// ValidateSource checks every read operation and its immutable provider identity.
-func ValidateSource(source Source) error {
-	if err := providercontract.Validate(source, reflect.TypeFor[Source](), reflect.TypeFor[BatchSource]()); err != nil {
-		return err
-	}
-	if err := providercontract.Require(source, "ObservationProviderType"); err != nil {
-		return fmt.Errorf("%w: observation identity must be supported", providercontract.ErrContract)
-	}
-	if !providerTypePattern.MatchString(source.ObservationProviderType()) {
-		return fmt.Errorf("%w: invalid Runtime observation provider type", providercontract.ErrContract)
-	}
-	return nil
-}
diff --git a/services/core/internal/runtimeobs/source_test.go b/services/core/internal/runtimeobs/source_test.go
index e65753320..655d5a64e 100644
--- a/services/core/internal/runtimeobs/source_test.go
+++ b/services/core/internal/runtimeobs/source_test.go
@@ -10,78 +10,24 @@ import (
 )
 
 type selectingSource struct {
-	source  Source
-	err     error
-	calls   int
-	support providercontract.Support
+	source       Source
+	providerType string
+	err          error
+	calls        int
 }
 
-func (s *selectingSource) ProviderOperations() providercontract.Operations {
-	return providercontract.Operations{"ResolveObservationSource": s.support}
-}
-func (s *selectingSource) ResolveObservationSource(context.Context) (Source, error) {
+func (s *selectingSource) load(context.Context) (Source, string, error) {
 	s.calls++
-	return s.source, s.err
-}
-
-type identityDeclaration struct {
-	typedSource
-	support providercontract.Support
-}
-
-func (s identityDeclaration) ProviderOperations() providercontract.Operations {
-	operations := s.typedSource.ProviderOperations()
-	operations["ObservationProviderType"] = s.support
-	return operations
-}
-
-func TestSourceBindingRejectsInvalidIdentityBeforeReadOrExport(t *testing.T) {
-	for _, test := range []struct {
-		name, identity string
-		support        providercontract.Support
-	}{
-		{"empty", "", providercontract.Support{State: providercontract.Supported}},
-		{"unsafe", "secret:provider", providercontract.Support{State: providercontract.Supported}},
-		{"undeclared", "docker", providercontract.Support{}},
-		{"unsupported", "docker", providercontract.Support{State: providercontract.Unsupported, Reason: "missing_identity"}},
-	} {
-		t.Run(test.name, func(t *testing.T) {
-			source := identityDeclaration{typedSource: typedSource{fixedSource: &fixedSource{}, providerType: test.identity}, support: test.support}
-			resolver := &selectingSource{source: source, support: providercontract.Support{State: providercontract.Supported}}
-			records := make(chan ExportRecord, 1)
-			service, err := NewService(observableTarget(), map[string]SourceResolver{"provider": resolver}, WithExporter(channelExporter{records: records}, ExportOptions{}))
-			if err != nil {
-				t.Fatal(err)
-			}
-			if _, err := service.ObserveSession(t.Context(), "tenant", "session"); !errors.Is(err, providercontract.ErrContract) {
-				t.Fatalf("invalid identity accepted: %v", err)
-			}
-			if source.calls != 0 {
-				t.Fatal("invalid identity reached provider read")
-			}
-			if err := service.Close(t.Context()); err != nil {
-				t.Fatal(err)
-			}
-			if len(records) != 0 {
-				t.Fatal("invalid identity reached export")
-			}
-		})
-	}
+	return s.source, s.providerType, s.err
 }
 
 func observableTarget() fixedResolver {
 	return fixedResolver{target: Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}}
 }
 
-func TestSourceResolverRegistrationAndUnavailableSelection(t *testing.T) {
-	for _, support := range []providercontract.Support{{}, {State: providercontract.Unsupported, Reason: "no_source"}} {
-		resolver := &selectingSource{support: support}
-		if _, err := NewService(observableTarget(), map[string]SourceResolver{"provider": resolver}); !errors.Is(err, providercontract.ErrContract) || resolver.calls != 0 {
-			t.Fatal("invalid resolver registration accepted or performed I/O", err)
-		}
-	}
-	resolver := &selectingSource{err: ErrUnavailable, support: providercontract.Support{State: providercontract.Supported}}
-	service, err := NewService(observableTarget(), map[string]SourceResolver{"provider": resolver})
+func TestUnavailableAndNilSourceSelection(t *testing.T) {
+	resolver := &selectingSource{err: ErrUnavailable}
+	service, err := NewService(observableTarget(), resolver.load)
 	if err != nil || resolver.calls != 0 {
 		t.Fatal("registration resolved unconfigured provider", err)
 	}
@@ -89,35 +35,34 @@ func TestSourceResolverRegistrationAndUnavailableSelection(t *testing.T) {
 	if err != nil || observation.Status != StatusUnavailable || observation.Reason != "sample_unavailable" || observation.ProviderType != "" {
 		t.Fatal(observation, err)
 	}
-	var nilSource *fixedSource
-	resolver.err, resolver.source = nil, nilSource
+	resolver.err = nil
 	if _, err := service.ObserveSession(t.Context(), "tenant", "session"); !errors.Is(err, providercontract.ErrContract) {
-		t.Fatal("typed nil source accepted", err)
+		t.Fatal("nil source accepted", err)
 	}
 }
 
 type reconfiguringSource struct {
-	typedSource
+	*fixedSource
 	resolver *selectingSource
 	next     Source
 }
 
 func (s *reconfiguringSource) Observe(ctx context.Context, target Target) (Sample, error) {
-	s.resolver.source = s.next
-	return s.typedSource.Observe(ctx, target)
+	s.resolver.source, s.resolver.providerType = s.next, "next"
+	return s.fixedSource.Observe(ctx, target)
 }
 
 func TestSourceSelectionStaysBoundForWholePage(t *testing.T) {
 	now := time.Now()
-	next := typedSource{fixedSource: &fixedSource{sample: Sample{ObservedAt: now}}, providerType: "next"}
-	resolver := &selectingSource{support: providercontract.Support{State: providercontract.Supported}}
-	previous := &reconfiguringSource{typedSource: typedSource{fixedSource: &fixedSource{sample: Sample{ObservedAt: now}}, providerType: "previous"}, resolver: resolver, next: next}
+	next := &fixedSource{sample: Sample{ObservedAt: now}}
+	resolver := &selectingSource{providerType: "previous"}
+	previous := &reconfiguringSource{fixedSource: &fixedSource{sample: Sample{ObservedAt: now}}, resolver: resolver, next: next}
 	resolver.source = previous
-	service, err := NewService(observableTarget(), map[string]SourceResolver{"provider": resolver})
+	service, err := NewService(observableTarget(), resolver.load)
 	if err != nil {
 		t.Fatal(err)
 	}
-	sessions := make([]SessionIdentity, MaxBatchTargets+1)
+	sessions := make([]SessionIdentity, 3)
 	for index := range sessions {
 		sessions[index] = SessionIdentity{TenantID: "tenant", SessionID: "session"}
 	}
diff --git a/services/core/internal/sandbox/configuration.go b/services/core/internal/sandbox/configuration.go
index e0fbc5cc6..36ace5baa 100644
--- a/services/core/internal/sandbox/configuration.go
+++ b/services/core/internal/sandbox/configuration.go
@@ -2,74 +2,11 @@ package sandbox
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"io"
 	"slices"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-)
-
-// Requirement has no implicit default: registration must choose either value.
-type Requirement string
-
-const (
-	Required    Requirement = "required"
-	NotRequired Requirement = "not_required"
 )
 
-type ConfigurationRequirements struct {
-	Credential   Requirement
-	PublicOrigin Requirement
-	Discovery    providercontract.Support
-}
-
-// Configuration is an adapter-owned typed value, never a request or response DTO.
-// Implementations must exclude secrets from JSON and safe diagnostic output.
-type Configuration interface {
-	HasCredential() bool
-	ReplacesCredential() bool
-}
-
-// ConfigurationRecord separates public selectors, read-only observations and
-// secret bytes. Store encrypts Secret with the installation and generation.
-// Only adapter codecs may produce Public and Metadata; neither is input passthrough.
-type ConfigurationRecord struct {
-	Public   json.RawMessage
-	Metadata json.RawMessage
-	Secret   []byte `json:"-"`
-}
-
-// ConfigurationAdapter owns all interpretation of provider configuration.
-// Decode loads retained ownership without remote discovery or new-build admission.
-// Normalize validates a candidate; ResolveChange first applies omitted-field
-// inheritance, then normalizes. Equal compares normalized identity, excluding
-// discovery metadata and explicit credential-submission intent.
-type ConfigurationAdapter interface {
-	Requirements() ConfigurationRequirements
-	DecodeInput(public, credential json.RawMessage) (Configuration, error)
-	Encode(Configuration) (ConfigurationRecord, error)
-	Decode(ConfigurationRecord) (Configuration, error)
-	Normalize(Selection) (Selection, error)
-	ResolveChange(next, previous Selection) (Selection, error)
-	WithCredential(owner, candidate Configuration) (Configuration, error)
-	Equal(a, b Configuration) (bool, error)
-}
-
-// ConfigurationDiscoveryInput is a transient read-only request. Query is typed
-// and validated by the adapter; it cannot select a compute mutation.
-type ConfigurationDiscoveryInput struct {
-	Configuration json.RawMessage `json:"configuration" swaggertype:"object"`
-	Credential    json.RawMessage `json:"credential" swaggertype:"object"`
-	Query         json.RawMessage `json:"query" swaggertype:"object"`
-}
-
-// ConfigurationDiscoverer is separate from compute and candidate admission.
-// Support must also be explicitly declared in ConfigurationRequirements.
-type ConfigurationDiscoverer interface {
-	DiscoverConfiguration(context.Context, ConfigurationDiscoveryInput, ProcessPaths) (json.RawMessage, error)
-}
-
 // DecodeConfigurationObject rejects unknown fields, null, nonobjects and trailing
 // input without exposing submitted content in its error. Missing objects are empty.
 func DecodeConfigurationObject(raw json.RawMessage, target any, allowed ...string) error {
diff --git a/services/core/internal/sandbox/configuration_errors.go b/services/core/internal/sandbox/configuration_errors.go
deleted file mode 100644
index 7c02d9728..000000000
--- a/services/core/internal/sandbox/configuration_errors.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package sandbox
-
-// ConfigurationError is a fixed safe diagnostic, never SDK text or submitted data.
-// Class describes the request outcome; it does not authorize replay.
-type ConfigurationError struct {
-	Class                ConfigurationErrorClass
-	Code, Param, Message string
-}
-type ConfigurationErrorClass string
-
-const (
-	ConfigurationInvalid     ConfigurationErrorClass = "invalid"
-	ConfigurationConflict    ConfigurationErrorClass = "conflict"
-	ConfigurationUnconfirmed ConfigurationErrorClass = "unconfirmed"
-)
-
-func (e *ConfigurationError) Error() string { return e.Message }
-
-var (
-	ErrCredentialRejected       = &ConfigurationError{ConfigurationInvalid, "sandbox_credential_invalid", "credential", "The sandbox provider credential was rejected."}
-	ErrCredentialOwnership      = &ConfigurationError{ConfigurationConflict, "sandbox_credential_ownership", "credential", "The credential cannot manage the retained deployment. Reset before changing accounts."}
-	ErrConfigurationUnconfirmed = &ConfigurationError{ConfigurationUnconfirmed, "sandbox_verification_unconfirmed", "", "Sandbox provider verification could not be confirmed."}
-	ErrConfigurationSelection   = &ConfigurationError{ConfigurationInvalid, "sandbox_configuration_invalid", "configuration", "Select a ready immutable provider configuration with matching resources."}
-)
diff --git a/services/core/internal/sandbox/docker/operations.go b/services/core/internal/sandbox/docker/operations.go
index c2758008d..2722da0dd 100644
--- a/services/core/internal/sandbox/docker/operations.go
+++ b/services/core/internal/sandbox/docker/operations.go
@@ -3,38 +3,27 @@ package docker
 import (
 	"context"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-var _ sandbox.CheckpointProvider = (*Provider)(nil)
-var _ sandbox.SelectionDiscoverer = (*Provider)(nil)
-var _ sandbox.CredentialVerifier = (*Provider)(nil)
-var _ runtimeobs.BatchSource = (*Provider)(nil)
-
 // Operations is this adapter's complete authored resource contract.
 func Operations() providercontract.Operations {
 	return providercontract.Operations{
-		"Create":                   {State: providercontract.Supported},
-		"GetInfo":                  {State: providercontract.Supported},
-		"Renew":                    {State: providercontract.Supported},
-		"Kill":                     {State: providercontract.Supported},
-		"RunCommand":               {State: providercontract.Supported},
-		"Initial":                  {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"NewCompute":               {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"GetCompute":               {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"Suspend":                  {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"Resume":                   {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"KillCompute":              {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"DeleteSnapshot":           {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"RunCommandCompute":        {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"ResumeCompute":            {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
-		"ObservationProviderType":  {State: providercontract.Supported},
-		"ResolveObservationSource": {State: providercontract.Supported},
-		"Observe":                  {State: providercontract.Supported},
-		"ObserveBatch":             {State: providercontract.Unsupported, Reason: "docker_does_not_support_batch_observation"},
-		"DiscoverSelection":        {State: providercontract.Unsupported, Reason: "docker_does_not_support_selection_discovery"},
-		"VerifyCredential":         {State: providercontract.Unsupported, Reason: "docker_does_not_support_credential_verification"},
+		"Create":            {State: providercontract.Supported},
+		"GetInfo":           {State: providercontract.Supported},
+		"Renew":             {State: providercontract.Supported},
+		"Kill":              {State: providercontract.Supported},
+		"RunCommand":        {State: providercontract.Supported},
+		"Initial":           {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"NewCompute":        {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"GetCompute":        {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"Suspend":           {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"Resume":            {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"KillCompute":       {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"DeleteSnapshot":    {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"RunCommandCompute": {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"ResumeCompute":     {State: providercontract.Unsupported, Reason: "docker_does_not_support_checkpoints"},
+		"Observe":           {State: providercontract.Supported},
 	}
 }
 func (*Provider) ProviderOperations() providercontract.Operations { return Operations() }
@@ -65,12 +54,3 @@ func (p *Provider) RunCommandCompute(context.Context, sandbox.Reference, sandbox
 func (p *Provider) ResumeCompute(context.Context, sandbox.Reference, sandbox.Compute) (sandbox.ComputeState, error) {
 	return sandbox.ComputeState{}, &providercontract.UnsupportedError{Operation: "ResumeCompute", Reason: Operations()["ResumeCompute"].Reason}
 }
-func (p *Provider) ObserveBatch(context.Context, []runtimeobs.Target) ([]runtimeobs.BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: Operations()["ObserveBatch"].Reason}
-}
-func (p *Provider) DiscoverSelection(context.Context, sandbox.Selection) (sandbox.Selection, error) {
-	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: Operations()["DiscoverSelection"].Reason}
-}
-func (p *Provider) VerifyCredential(context.Context, []sandbox.Reference) error {
-	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: Operations()["VerifyCredential"].Reason}
-}
diff --git a/services/core/internal/sandbox/docker/resources.go b/services/core/internal/sandbox/docker/resources.go
index d48dfcb17..863af750a 100644
--- a/services/core/internal/sandbox/docker/resources.go
+++ b/services/core/internal/sandbox/docker/resources.go
@@ -13,10 +13,6 @@ import (
 	"github.com/moby/moby/client"
 )
 
-var _ runtimeobs.Source = (*Provider)(nil)
-
-func (*Provider) ObservationProviderType() string { return "docker" }
-
 // Observe is read-only. Inspect verifies allocation ownership before Docker
 // statistics are requested; it never renews or changes the container.
 func (p *Provider) Observe(ctx context.Context, target runtimeobs.Target) (runtimeobs.Sample, error) {
@@ -91,7 +87,3 @@ func sampleFromDocker(inspected container.InspectResponse, stats dockerStatsResp
 	}
 	return sample, nil
 }
-
-func (p *Provider) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
diff --git a/services/core/internal/sandbox/e2b/configuration.go b/services/core/internal/sandbox/e2b/configuration.go
index 752fd60c7..5a00ed53e 100644
--- a/services/core/internal/sandbox/e2b/configuration.go
+++ b/services/core/internal/sandbox/e2b/configuration.go
@@ -32,7 +32,8 @@ func configuration(s sandbox.Selection) *DeploymentConfiguration {
 	return c
 }
 func (ConfigurationAdapter) Requirements() sandbox.ConfigurationRequirements {
-	return sandbox.ConfigurationRequirements{Credential: sandbox.Required, PublicOrigin: sandbox.Required, Discovery: providercontract.Support{State: providercontract.Supported}}
+	return sandbox.ConfigurationRequirements{Credential: sandbox.Required, PublicOrigin: sandbox.Required, Discovery: providercontract.Support{State: providercontract.Supported},
+		SelectionDiscovery: providercontract.Support{State: providercontract.Supported}, CredentialVerification: providercontract.Support{State: providercontract.Supported}}
 }
 func (ConfigurationAdapter) DecodeInput(public, secret json.RawMessage) (sandbox.Configuration, error) {
 	var p publicConfiguration
diff --git a/services/core/internal/sandbox/e2b/credential.go b/services/core/internal/sandbox/e2b/credential.go
index 88df2e1b7..42452ff62 100644
--- a/services/core/internal/sandbox/e2b/credential.go
+++ b/services/core/internal/sandbox/e2b/credential.go
@@ -9,7 +9,11 @@ import (
 
 // VerifyCredential is read-only and bounded. A public readable template alone
 // does not prove team ownership. References are one bounded Core-owned page.
-func (p *Provider) VerifyCredential(ctx context.Context, refs []sandbox.Reference) error {
+func (ConfigurationAdapter) VerifyCredential(ctx context.Context, c sandbox.DirectConfig, refs []sandbox.Reference) error {
+	p, err := newDirect(c)
+	if err != nil {
+		return err
+	}
 	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 	defer cancel()
 	if len(refs) > MaxCredentialReferences {
@@ -31,7 +35,7 @@ func (p *Provider) VerifyCredential(ctx context.Context, refs []sandbox.Referenc
 	case "team_mismatch", "invalid":
 		return sandbox.ErrCredentialOwnership
 	case "":
-		if out.DeploymentValid && out.Info == nil && out.Command == nil && out.Observations == nil && out.TemplateBuild == nil {
+		if out.DeploymentValid && out.Info == nil && out.Command == nil && out.Observation == nil && out.TemplateBuild == nil {
 			return nil
 		}
 	}
diff --git a/services/core/internal/sandbox/e2b/deployment.go b/services/core/internal/sandbox/e2b/deployment.go
index cc28e153f..3391d3f3e 100644
--- a/services/core/internal/sandbox/e2b/deployment.go
+++ b/services/core/internal/sandbox/e2b/deployment.go
@@ -70,25 +70,29 @@ func WithTemplateBuild(input sandbox.Selection, build *DeploymentBuild) sandbox.
 }
 
 // DiscoverSelection checks the immutable native build without allocating compute.
-func (p *Provider) DiscoverSelection(ctx context.Context, s sandbox.Selection) (sandbox.Selection, error) {
+func (ConfigurationAdapter) DiscoverSelection(ctx context.Context, c sandbox.DirectConfig) (sandbox.Selection, error) {
+	p, err := newDirect(c)
+	if err != nil {
+		return sandbox.Selection{}, err
+	}
 	build, err := p.ValidateDeployment(ctx)
 	if err != nil {
 		if errors.Is(err, sandbox.ErrCredentialRejected) || errors.Is(err, sandbox.ErrCredentialOwnership) {
-			return s, err
+			return sandbox.Selection{}, err
 		}
 		if errors.Is(err, sandbox.ErrInvalid) {
-			return s, sandbox.ErrConfigurationSelection
+			return sandbox.Selection{}, sandbox.ErrConfigurationSelection
 		}
-		return s, sandbox.ErrConfigurationUnconfirmed
+		return sandbox.Selection{}, sandbox.ErrConfigurationUnconfirmed
 	}
 	recorded := &DeploymentBuild{Status: build.Status, CPUs: int32(build.CPUs), MemoryMiB: int32(build.MemoryMiB)}
 	if build.RootDiskMiB != nil && *build.RootDiskMiB <= math.MaxInt32 {
 		disk := int32(*build.RootDiskMiB)
 		recorded.RootDiskMiB = &disk
 	}
-	s = WithTemplateBuild(s, recorded)
+	s := WithTemplateBuild(c.Selection, recorded)
 	if err := ValidateSpecification(s.DeploymentSpec); err != nil {
-		return s, &sandbox.ValidationError{Param: "resources", Message: "E2B template build resources are outside the supported sandbox limits; select another build"}
+		return sandbox.Selection{}, &sandbox.ValidationError{Param: "resources", Message: "E2B template build resources are outside the supported sandbox limits; select another build"}
 	}
 	return s, nil
 }
diff --git a/services/core/internal/sandbox/e2b/helper_contract.go b/services/core/internal/sandbox/e2b/helper_contract.go
index 7e9a96f25..7d701cf51 100644
--- a/services/core/internal/sandbox/e2b/helper_contract.go
+++ b/services/core/internal/sandbox/e2b/helper_contract.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/runtimebootstrap"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
@@ -17,7 +16,6 @@ const MaxOutputBytes = 1024 * 1024
 const MaxRequestBytes = 72 * 1024 * 1024
 const MaxResponseBytes = 16 * 1024 * 1024
 const MaxCredentialReferences = 32
-const MaxObservationReferences = runtimeobs.MaxBatchTargets
 const MaxCommandInputBytes = sandbox.MaxCommandInputBytes
 
 // HelperOperations declares the complete set of one-shot helper operations.
@@ -40,17 +38,6 @@ func (q Request) Validate() error {
 		return sandbox.ErrInvalid
 	}
 	switch q.Operation {
-	case "observe":
-		if len(q.References) < 1 || len(q.References) > MaxObservationReferences {
-			return sandbox.ErrInvalid
-		}
-		seen := map[sandbox.Reference]bool{}
-		for _, r := range q.References {
-			if !validReference(r) || seen[r] {
-				return sandbox.ErrInvalid
-			}
-			seen[r] = true
-		}
 	case "verify_credential":
 		if len(q.References) > MaxCredentialReferences {
 			return sandbox.ErrInvalid
@@ -74,7 +61,7 @@ type Request struct {
 	Operation string
 	Config    Config
 	Reference sandbox.Reference
-	// References lists the allocations of one read-only observe request.
+	// References lists the allocations of one verify_credential request.
 	References       []sandbox.Reference          `json:",omitempty"`
 	Bootstrap        *sandbox.Bootstrap           `json:",omitempty"`
 	RuntimeBootstrap *runtimebootstrap.Connection `json:",omitempty"`
@@ -90,7 +77,7 @@ type Response struct {
 	TemplateBuild   *TemplateBuild    `json:",omitempty"`
 	Templates       []TemplateSummary `json:",omitempty"`
 	Builds          []ReadyBuild      `json:",omitempty"`
-	Observations    []Observation     `json:",omitempty"`
+	Observation     *Observation      `json:",omitempty"`
 }
 
 func (r Response) Validate() error {
diff --git a/services/core/internal/sandbox/e2b/internal/contractgen/main.go b/services/core/internal/sandbox/e2b/internal/contractgen/main.go
index 6d79d9544..023dc781e 100644
--- a/services/core/internal/sandbox/e2b/internal/contractgen/main.go
+++ b/services/core/internal/sandbox/e2b/internal/contractgen/main.go
@@ -83,8 +83,7 @@ func main() {
 	values := map[string]any{
 		"PROTOCOL_VERSION": e2b.ProtocolVersion, "SDK_VERSION": sdk,
 		"MAX_REQUEST": e2b.MaxRequestBytes, "MAX_RESPONSE": e2b.MaxResponseBytes,
-		"MAX_OUTPUT": e2b.MaxOutputBytes, "MAX_COMMAND_INPUT": e2b.MaxCommandInputBytes,
-		"MAX_OBSERVATION_REFERENCES": e2b.MaxObservationReferences, "MAX_CREDENTIAL_REFERENCES": e2b.MaxCredentialReferences,
+		"MAX_OUTPUT": e2b.MaxOutputBytes, "MAX_COMMAND_INPUT": e2b.MaxCommandInputBytes, "MAX_CREDENTIAL_REFERENCES": e2b.MaxCredentialReferences,
 		"OPERATIONS": e2b.HelperOperations(), "ERROR_CODES": e2b.HelperErrors(),
 		"REQUEST_FIELDS": fields(reflect.TypeFor[e2b.Request]()), "RESPONSE_FIELDS": fields(reflect.TypeFor[e2b.Response]()),
 		"REFERENCE_FIELDS":         fields(reflect.TypeFor[sandbox.Reference]()),
@@ -131,7 +130,7 @@ func fixtures() []byte {
 	for _, operation := range e2b.HelperOperations() {
 		copy := q
 		copy.Operation = operation
-		if operation == "observe" || operation == "verify_credential" {
+		if operation == "verify_credential" {
 			copy.References = []sandbox.Reference{r}
 		}
 		add("request", operation, true, copy)
@@ -148,32 +147,22 @@ func fixtures() []byte {
 		value[item.field] = item.value
 		add("request", item.name, false, value)
 	}
-	for _, operation := range []string{"observe", "verify_credential"} {
-		limit := e2b.MaxObservationReferences
-		if operation == "verify_credential" {
-			limit = e2b.MaxCredentialReferences
-		}
-		for _, count := range []int{0, limit, limit + 1} {
-			copy := q
-			copy.Operation = operation
-			copy.References = make([]sandbox.Reference, count)
-			for index := range copy.References {
-				copy.References[index] = r
-				copy.References[index].AllocationID = fmt.Sprintf("%08x-3333-4333-8333-333333333333", index+1)
-			}
-			add("request", fmt.Sprintf("%s-count-%d", operation, count), count <= limit && (operation != "observe" || count > 0), copy)
-		}
-		for _, refs := range []any{map[string]any{}, "invalid", []any{nil}} {
-			value := object(q)
-			value["Operation"] = operation
-			value["References"] = refs
-			add("request", operation+"-references-type", false, value)
+	for _, count := range []int{0, e2b.MaxCredentialReferences, e2b.MaxCredentialReferences + 1} {
+		copy := q
+		copy.Operation = "verify_credential"
+		copy.References = make([]sandbox.Reference, count)
+		for index := range copy.References {
+			copy.References[index] = r
+			copy.References[index].AllocationID = fmt.Sprintf("%08x-3333-4333-8333-333333333333", index+1)
 		}
+		add("request", fmt.Sprintf("verify_credential-count-%d", count), count <= e2b.MaxCredentialReferences, copy)
+	}
+	for _, refs := range []any{map[string]any{}, "invalid", []any{nil}} {
+		value := object(q)
+		value["Operation"] = "verify_credential"
+		value["References"] = refs
+		add("request", "verify_credential-references-type", false, value)
 	}
-	duplicate := q
-	duplicate.Operation = "observe"
-	duplicate.References = []sandbox.Reference{r, r}
-	add("request", "duplicate-observation", false, duplicate)
 	for _, code := range e2b.HelperErrors() {
 		add("response", "error-"+code, true, e2b.Response{Version: e2b.ProtocolVersion, ErrorCode: code})
 	}
diff --git a/services/core/internal/sandbox/e2b/observations.go b/services/core/internal/sandbox/e2b/observations.go
index e931805ad..063ba1307 100644
--- a/services/core/internal/sandbox/e2b/observations.go
+++ b/services/core/internal/sandbox/e2b/observations.go
@@ -9,21 +9,16 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-var (
-	_ runtimeobs.Source      = (*Provider)(nil)
-	_ runtimeobs.BatchSource = (*Provider)(nil)
-)
-
 // maxClockLead tolerates an E2B metrics timestamp slightly ahead of Core's
 // clock. A larger lead is treated as an unavailable sample, never as fresh data.
 const maxClockLead = 30 * time.Second
 
-// Observation is one allocation's latest E2B metrics point. Status is
-// observed, not_running, unavailable or ownership; only observed carries
-// values. A malformed E2B point is unavailable for its row only. Values keep E2B's units: CPUUsedPct is a percentage of all
-// CPUCount cores, and memory and disk are in bytes.
+// Observation is the requested allocation's latest E2B metrics point. Status
+// is observed, not_running, unavailable or ownership; only observed carries
+// values. A malformed E2B point is unavailable. Values keep E2B's units:
+// CPUUsedPct is a percentage of all CPUCount cores, and memory and disk are in
+// bytes.
 type Observation struct {
-	sandbox.Reference
 	Status                string
 	ObservedAt, StartedAt *time.Time `json:",omitempty"`
 	CPUCount, CPUUsedPct  *float64   `json:",omitempty"`
@@ -31,83 +26,46 @@ type Observation struct {
 	DiskUsed, DiskTotal   *uint64    `json:",omitempty"`
 }
 
-func (*Provider) ObservationProviderType() string { return "e2b" }
-
-// Observe reads one allocation through the same helper request as ObserveBatch.
+// Observe reads one allocation with one helper request. The helper takes the
+// sandbox ID from its private receipt, confirms the running sandbox by its
+// allocation labels and reads E2B's metrics. It never connects to, renews or
+// changes a sandbox.
 func (p *Provider) Observe(ctx context.Context, target runtimeobs.Target) (runtimeobs.Sample, error) {
-	results, _ := p.ObserveBatch(ctx, []runtimeobs.Target{target})
-	return results[0].Sample, results[0].Err
-}
-
-// ObserveBatch reads up to runtimeobs.MaxBatchTargets allocations with one
-// helper request. The helper takes sandbox IDs from its private receipts,
-// confirms each running sandbox by its allocation labels and reads E2B's batch
-// metrics once. It never connects to, renews or changes a sandbox.
-func (p *Provider) ObserveBatch(ctx context.Context, targets []runtimeobs.Target) ([]runtimeobs.BatchResult, error) {
-	results := make([]runtimeobs.BatchResult, len(targets))
-	references := make([]sandbox.Reference, 0, len(targets))
-	positions := make([]int, 0, len(targets))
-	for index, target := range targets {
-		reference := sandbox.Reference{TenantID: target.TenantID, EnvironmentID: target.EnvironmentID, AllocationID: target.Instance.AllocationID}
-		switch {
-		case target.Mode != runtimeobs.ModeManaged || !validReference(reference) || len(targets) > runtimeobs.MaxBatchTargets:
-			results[index].Err = sandbox.ErrInvalid
-		case target.Instance.ProviderKey != p.config.InstallationID:
-			results[index].Err = sandbox.ErrOwnership
-		default:
-			references = append(references, reference)
-			positions = append(positions, index)
-		}
-	}
-	if len(references) == 0 {
-		return results, nil
+	reference := sandbox.Reference{TenantID: target.TenantID, EnvironmentID: target.EnvironmentID, AllocationID: target.Instance.AllocationID}
+	if target.Mode != runtimeobs.ModeManaged || !validReference(reference) {
+		return runtimeobs.Sample{}, sandbox.ErrInvalid
 	}
-	observations, err := p.observe(ctx, references)
-	now := p.now()
-	for offset, index := range positions {
-		if err != nil {
-			results[index].Err = err
-			continue
-		}
-		results[index].Sample, results[index].Err = sampleFromObservation(observations[offset], now)
+	if target.Instance.ProviderKey != p.config.InstallationID {
+		return runtimeobs.Sample{}, sandbox.ErrOwnership
 	}
-	return results, nil
-}
-
-func (p *Provider) observe(ctx context.Context, references []sandbox.Reference) ([]Observation, error) {
 	deadline, ok := ctx.Deadline()
 	if !ok {
-		return nil, sandbox.ErrInvalid
+		return runtimeobs.Sample{}, sandbox.ErrInvalid
 	}
 	if err := ctx.Err(); err != nil {
-		return nil, err
+		return runtimeobs.Sample{}, err
 	}
-	out, err := p.caller.Call(ctx, Request{Version: ProtocolVersion, Operation: "observe", Config: p.config, References: references, Deadline: deadline})
+	out, err := p.caller.Call(ctx, Request{Version: ProtocolVersion, Operation: "observe", Config: p.config, Reference: reference, Deadline: deadline})
 	if ctxErr := ctx.Err(); ctxErr != nil {
-		return nil, ctxErr
+		return runtimeobs.Sample{}, ctxErr
 	}
 	if err != nil || out.Version != ProtocolVersion || out.Info != nil || out.Command != nil || out.DeploymentValid || out.TemplateBuild != nil {
-		return nil, runtimeobs.ErrUnavailable
+		return runtimeobs.Sample{}, runtimeobs.ErrUnavailable
 	}
 	switch out.ErrorCode {
 	case "":
 	case "invalid":
-		return nil, sandbox.ErrInvalid
+		return runtimeobs.Sample{}, sandbox.ErrInvalid
 	case "ownership":
-		return nil, sandbox.ErrOwnership
+		return runtimeobs.Sample{}, sandbox.ErrOwnership
 	default:
-		// E2B API failures, including a rejected credential, leave rows unavailable.
-		return nil, runtimeobs.ErrUnavailable
-	}
-	if len(out.Observations) != len(references) {
-		return nil, sandbox.ErrInvalid
+		// E2B API failures, including a rejected credential, are unavailable.
+		return runtimeobs.Sample{}, runtimeobs.ErrUnavailable
 	}
-	for index, observation := range out.Observations {
-		if observation.Reference != references[index] {
-			return nil, sandbox.ErrOwnership
-		}
+	if out.Observation == nil {
+		return runtimeobs.Sample{}, sandbox.ErrInvalid
 	}
-	return out.Observations, nil
+	return sampleFromObservation(*out.Observation, p.now())
 }
 
 // sampleFromObservation maps E2B's latest point to the provider-neutral
@@ -125,7 +83,7 @@ func sampleFromObservation(observation Observation, now time.Time) (runtimeobs.S
 		// An unknown status breaks Core's own helper protocol.
 		return runtimeobs.Sample{}, sandbox.ErrInvalid
 	}
-	// Malformed provider data leaves this row unavailable, not the whole page.
+	// Malformed provider data leaves this sample unavailable.
 	if observation.ObservedAt == nil || observation.StartedAt == nil || observation.CPUCount == nil || observation.CPUUsedPct == nil ||
 		observation.MemUsed == nil || observation.MemTotal == nil || !finite(*observation.CPUCount) || *observation.CPUCount <= 0 ||
 		!finite(*observation.CPUUsedPct) || *observation.CPUUsedPct < 0 || *observation.MemTotal == 0 {
@@ -160,7 +118,3 @@ func sampleFromObservation(observation Observation, now time.Time) (runtimeobs.S
 }
 
 func finite(value float64) bool { return !math.IsNaN(value) && !math.IsInf(value, 0) }
-
-func (p *Provider) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
diff --git a/services/core/internal/sandbox/e2b/observations_test.go b/services/core/internal/sandbox/e2b/observations_test.go
index c736e862c..04acefd4d 100644
--- a/services/core/internal/sandbox/e2b/observations_test.go
+++ b/services/core/internal/sandbox/e2b/observations_test.go
@@ -6,56 +6,48 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-	"github.com/google/uuid"
 )
 
-func TestObserveBatchMapsMetricsAndKeepsUnmeasuredValuesNull(t *testing.T) {
+func TestObserveMapsMetricsAndKeepsUnmeasuredValuesNull(t *testing.T) {
 	p, caller, running := fixture(t)
-	stopped := sandbox.Reference{TenantID: uuid.NewString(), EnvironmentID: uuid.NewString(), AllocationID: uuid.NewString()}
 	now := time.Date(2026, 9, 25, 10, 31, 37, 0, time.UTC)
 	p.now = func() time.Time { return now }
 	started, observed := now.Add(-3*time.Second), now.Add(time.Second) // E2B's clock leads by one second.
 	count, percent, memoryUsed, memoryTotal, diskUsed, diskTotal := 2.0, 19.55, uint64(183836672), uint64(2079141888), uint64(1593188352), uint64(23511863296)
-	caller.response.Observations = []Observation{
-		{Reference: running, Status: "observed", ObservedAt: &observed, StartedAt: &started, CPUCount: &count, CPUUsedPct: &percent,
-			MemUsed: &memoryUsed, MemTotal: &memoryTotal, DiskUsed: &diskUsed, DiskTotal: &diskTotal},
-		{Reference: stopped, Status: "not_running"},
-	}
-	targets := []runtimeobs.Target{}
-	for _, reference := range []sandbox.Reference{running, stopped} {
-		targets = append(targets, runtimeobs.Target{TenantID: reference.TenantID, EnvironmentID: reference.EnvironmentID, Mode: runtimeobs.ModeManaged,
-			Instance: runtimeobs.Instance{AllocationID: reference.AllocationID, ProviderKey: p.config.InstallationID}})
-	}
-	results, err := p.ObserveBatch(bounded(t), targets)
-	if err != nil || len(caller.requests) != 1 || caller.requests[0].Operation != "observe" || len(caller.requests[0].References) != 2 ||
-		caller.requests[0].References[1] != stopped || caller.requests[0].Deadline.IsZero() {
-		t.Fatalf("batch was not one bounded helper request: err=%v %+v", err, caller.requests)
-	}
-	sample := results[0].Sample
-	if results[0].Err != nil || !sample.ObservedAt.Equal(now) || !sample.StartedAt.Equal(started) ||
+	caller.response.Observation = &Observation{Status: "observed", ObservedAt: &observed, StartedAt: &started, CPUCount: &count, CPUUsedPct: &percent,
+		MemUsed: &memoryUsed, MemTotal: &memoryTotal, DiskUsed: &diskUsed, DiskTotal: &diskTotal}
+	target := runtimeobs.Target{TenantID: running.TenantID, EnvironmentID: running.EnvironmentID, Mode: runtimeobs.ModeManaged,
+		Instance: runtimeobs.Instance{AllocationID: running.AllocationID, ProviderKey: p.config.InstallationID}}
+	sample, err := p.Observe(bounded(t), target)
+	if err != nil || len(caller.requests) != 1 || caller.requests[0].Operation != "observe" ||
+		caller.requests[0].Reference != running || caller.requests[0].Deadline.IsZero() {
+		t.Fatalf("observation was not one bounded helper request: err=%v %+v", err, caller.requests)
+	}
+	if !sample.ObservedAt.Equal(now) || !sample.StartedAt.Equal(started) ||
 		*sample.CPUUtilizationRatio != .1955 || *sample.CPUCapacityCores != 2 || sample.CPUUsageSecondsTotal != nil ||
 		*sample.MemoryUsageBytes != memoryUsed || *sample.MemoryLimitBytes != memoryTotal ||
 		*sample.DiskUsageBytes != diskUsed || *sample.DiskLimitBytes != diskTotal {
-		t.Fatalf("metrics were not mapped: %+v %v", sample, results[0].Err)
-	}
-	if !errors.Is(results[1].Err, runtimeobs.ErrNotRunning) {
-		t.Fatalf("absent sandbox = %v", results[1].Err)
+		t.Fatalf("metrics were not mapped: %+v", sample)
 	}
 
-	caller.response.Observations[0].DiskTotal = nil
-	results, _ = p.ObserveBatch(bounded(t), targets)
-	if results[0].Err != nil || results[0].Sample.DiskUsageBytes != nil || results[0].Sample.DiskLimitBytes != nil {
-		t.Fatalf("unreported disk was not null: %+v %v", results[0].Sample, results[0].Err)
+	caller.response.Observation.DiskTotal = nil
+	if sample, err = p.Observe(bounded(t), target); err != nil || sample.DiskUsageBytes != nil || sample.DiskLimitBytes != nil {
+		t.Fatalf("unreported disk was not null: %+v %v", sample, err)
+	}
+	caller.response.Observation.MemTotal = nil
+	if _, err = p.Observe(bounded(t), target); !errors.Is(err, runtimeobs.ErrUnavailable) {
+		t.Fatalf("malformed point = %v", err)
+	}
+	caller.response.Observation = &Observation{Status: "not_running"}
+	if _, err = p.Observe(bounded(t), target); !errors.Is(err, runtimeobs.ErrNotRunning) {
+		t.Fatalf("absent sandbox = %v", err)
 	}
-	caller.response.Observations[0].MemTotal = nil
-	results, _ = p.ObserveBatch(bounded(t), targets)
-	if !errors.Is(results[0].Err, runtimeobs.ErrUnavailable) || !errors.Is(results[1].Err, runtimeobs.ErrNotRunning) {
-		t.Fatalf("a malformed point affected more than its row: %+v", results)
+	caller.response.Observation = nil
+	if _, err = p.Observe(bounded(t), target); err == nil {
+		t.Fatal("a success without an observation was accepted")
 	}
 	caller.response.ErrorCode = "unconfirmed"
-	results, _ = p.ObserveBatch(bounded(t), targets)
-	if !errors.Is(results[0].Err, runtimeobs.ErrUnavailable) || !errors.Is(results[1].Err, runtimeobs.ErrUnavailable) {
-		t.Fatalf("E2B failure was not unavailable: %+v", results)
+	if _, err = p.Observe(bounded(t), target); !errors.Is(err, runtimeobs.ErrUnavailable) {
+		t.Fatalf("E2B failure was not unavailable: %v", err)
 	}
 }
diff --git a/services/core/internal/sandbox/e2b/operations.go b/services/core/internal/sandbox/e2b/operations.go
index 14530ebf9..a3da4688e 100644
--- a/services/core/internal/sandbox/e2b/operations.go
+++ b/services/core/internal/sandbox/e2b/operations.go
@@ -3,38 +3,27 @@ package e2b
 import (
 	"context"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-var _ sandbox.CheckpointProvider = (*Provider)(nil)
-var _ sandbox.SelectionDiscoverer = (*Provider)(nil)
-var _ sandbox.CredentialVerifier = (*Provider)(nil)
-var _ runtimeobs.BatchSource = (*Provider)(nil)
-
 // Operations is this adapter's complete authored resource contract.
 func Operations() providercontract.Operations {
 	return providercontract.Operations{
-		"Create":                   {State: providercontract.Supported},
-		"GetInfo":                  {State: providercontract.Supported},
-		"Renew":                    {State: providercontract.Supported},
-		"Kill":                     {State: providercontract.Supported},
-		"RunCommand":               {State: providercontract.Supported},
-		"Initial":                  {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"NewCompute":               {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"GetCompute":               {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"Suspend":                  {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"Resume":                   {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"KillCompute":              {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"DeleteSnapshot":           {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"RunCommandCompute":        {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"ResumeCompute":            {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
-		"ObservationProviderType":  {State: providercontract.Supported},
-		"ResolveObservationSource": {State: providercontract.Supported},
-		"Observe":                  {State: providercontract.Supported},
-		"ObserveBatch":             {State: providercontract.Supported},
-		"DiscoverSelection":        {State: providercontract.Supported},
-		"VerifyCredential":         {State: providercontract.Supported},
+		"Create":            {State: providercontract.Supported},
+		"GetInfo":           {State: providercontract.Supported},
+		"Renew":             {State: providercontract.Supported},
+		"Kill":              {State: providercontract.Supported},
+		"RunCommand":        {State: providercontract.Supported},
+		"Initial":           {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"NewCompute":        {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"GetCompute":        {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"Suspend":           {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"Resume":            {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"KillCompute":       {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"DeleteSnapshot":    {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"RunCommandCompute": {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"ResumeCompute":     {State: providercontract.Unsupported, Reason: "e2b_does_not_support_checkpoints"},
+		"Observe":           {State: providercontract.Supported},
 	}
 }
 func (*Provider) ProviderOperations() providercontract.Operations { return Operations() }
diff --git a/services/core/internal/sandbox/e2b/provider.go b/services/core/internal/sandbox/e2b/provider.go
index 3328eb0db..c07924250 100644
--- a/services/core/internal/sandbox/e2b/provider.go
+++ b/services/core/internal/sandbox/e2b/provider.go
@@ -56,7 +56,7 @@ func Discover(ctx context.Context, caller Caller, binary, apiKey, apiURL, domain
 	if out.ErrorCode == "invalid" {
 		return Response{}, sandbox.ErrInvalid
 	}
-	if out.ErrorCode != "" || out.Info != nil || out.Command != nil || out.TemplateBuild != nil || out.Observations != nil {
+	if out.ErrorCode != "" || out.Info != nil || out.Command != nil || out.TemplateBuild != nil || out.Observation != nil {
 		return Response{}, sandbox.ErrComputeUnconfirmed
 	}
 	if operation == "list_templates" {
@@ -151,6 +151,33 @@ func NewWithCaller(c Config, caller Caller) (*Provider, error) {
 	}
 	return &Provider{config: c, caller: caller, now: time.Now}, nil
 }
+
+// BuildDirect builds the Provider for one direct-mode selection.
+func BuildDirect(c sandbox.DirectConfig) (sandbox.SandboxProvider, error) { return newDirect(c) }
+
+func newDirect(c sandbox.DirectConfig) (*Provider, error) {
+	deployment := configuration(c.Selection)
+	if deployment == nil {
+		return nil, errors.New("E2B deployment configuration is unavailable")
+	}
+	binary, state, err := InstalledPaths(c.ProcessPaths)
+	if err != nil {
+		return nil, err
+	}
+	// Only a candidate that omitted its resources has none; its validation
+	// reads them from the template build before the candidate is rebuilt.
+	var resources *sandbox.Resources
+	if c.Selection.DeploymentSpec.Resources != (sandbox.Resources{}) {
+		resources = &c.Selection.DeploymentSpec.Resources
+	}
+	provider, err := NewWithCaller(Config{Binary: binary, StateDir: state,
+		Resources: resources, InstallationID: c.InstallationID, APIKey: deployment.APIKey, Template: deployment.Template,
+		APIURL: deployment.APIURL, Domain: deployment.Domain, TimeoutSeconds: 3600}, &ProcessCaller{Fence: c.Fence})
+	if err != nil {
+		return nil, errors.New("E2B provider cannot load; check the installed helper and private state directory")
+	}
+	return provider, nil
+}
 func (p *Provider) call(ctx context.Context, operation string, r sandbox.Reference, b *sandbox.Bootstrap, command *sandbox.Command) (Response, error) {
 	deadline, ok := ctx.Deadline()
 	if !ok || (operation != "validate_deployment" && !validReference(r)) {
@@ -216,7 +243,7 @@ func (p *Provider) ValidateDeployment(ctx context.Context) (TemplateBuild, error
 		return TemplateBuild{}, err
 	}
 	build := out.TemplateBuild
-	if !out.DeploymentValid || out.Info != nil || out.Command != nil || out.Observations != nil || build == nil || build.Status != "ready" ||
+	if !out.DeploymentValid || out.Info != nil || out.Command != nil || out.Observation != nil || build == nil || build.Status != "ready" ||
 		build.CPUs == 0 || build.MemoryMiB == 0 || build.RootDiskMiB != nil && *build.RootDiskMiB == 0 ||
 		p.config.Resources != nil && (build.CPUs != p.config.Resources.CPUs || build.MemoryMiB != p.config.Resources.MemoryMiB) {
 		return TemplateBuild{}, sandbox.ErrComputeUnconfirmed
diff --git a/services/core/internal/sandbox/microsandbox/operations.go b/services/core/internal/sandbox/microsandbox/operations.go
index f59c9ed02..13e81ff96 100644
--- a/services/core/internal/sandbox/microsandbox/operations.go
+++ b/services/core/internal/sandbox/microsandbox/operations.go
@@ -1,49 +1,25 @@
 package microsandbox
 
-import (
-	"context"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-)
-
-var _ sandbox.CheckpointProvider = (*Provider)(nil)
-var _ sandbox.SelectionDiscoverer = (*Provider)(nil)
-var _ sandbox.CredentialVerifier = (*Provider)(nil)
-var _ runtimeobs.BatchSource = (*Provider)(nil)
+import "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 
 // Operations is this adapter's complete authored resource contract.
 func Operations() providercontract.Operations {
 	return providercontract.Operations{
-		"Create":                   {State: providercontract.Supported},
-		"GetInfo":                  {State: providercontract.Supported},
-		"Renew":                    {State: providercontract.Supported},
-		"Kill":                     {State: providercontract.Supported},
-		"RunCommand":               {State: providercontract.Supported},
-		"Initial":                  {State: providercontract.Supported},
-		"NewCompute":               {State: providercontract.Supported},
-		"GetCompute":               {State: providercontract.Supported},
-		"Suspend":                  {State: providercontract.Supported},
-		"Resume":                   {State: providercontract.Supported},
-		"KillCompute":              {State: providercontract.Supported},
-		"DeleteSnapshot":           {State: providercontract.Supported},
-		"RunCommandCompute":        {State: providercontract.Supported},
-		"ResumeCompute":            {State: providercontract.Supported},
-		"ObservationProviderType":  {State: providercontract.Supported},
-		"ResolveObservationSource": {State: providercontract.Supported},
-		"Observe":                  {State: providercontract.Supported},
-		"ObserveBatch":             {State: providercontract.Unsupported, Reason: "microsandbox_does_not_support_batch_observation"},
-		"DiscoverSelection":        {State: providercontract.Unsupported, Reason: "microsandbox_does_not_support_selection_discovery"},
-		"VerifyCredential":         {State: providercontract.Unsupported, Reason: "microsandbox_does_not_support_credential_verification"},
+		"Create":            {State: providercontract.Supported},
+		"GetInfo":           {State: providercontract.Supported},
+		"Renew":             {State: providercontract.Supported},
+		"Kill":              {State: providercontract.Supported},
+		"RunCommand":        {State: providercontract.Supported},
+		"Initial":           {State: providercontract.Supported},
+		"NewCompute":        {State: providercontract.Supported},
+		"GetCompute":        {State: providercontract.Supported},
+		"Suspend":           {State: providercontract.Supported},
+		"Resume":            {State: providercontract.Supported},
+		"KillCompute":       {State: providercontract.Supported},
+		"DeleteSnapshot":    {State: providercontract.Supported},
+		"RunCommandCompute": {State: providercontract.Supported},
+		"ResumeCompute":     {State: providercontract.Supported},
+		"Observe":           {State: providercontract.Supported},
 	}
 }
 func (*Provider) ProviderOperations() providercontract.Operations { return Operations() }
-func (p *Provider) ObserveBatch(context.Context, []runtimeobs.Target) ([]runtimeobs.BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: Operations()["ObserveBatch"].Reason}
-}
-func (p *Provider) DiscoverSelection(context.Context, sandbox.Selection) (sandbox.Selection, error) {
-	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: Operations()["DiscoverSelection"].Reason}
-}
-func (p *Provider) VerifyCredential(context.Context, []sandbox.Reference) error {
-	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: Operations()["VerifyCredential"].Reason}
-}
diff --git a/services/core/internal/sandbox/microsandbox/provider.go b/services/core/internal/sandbox/microsandbox/provider.go
index 6ba4eeafc..d876702be 100644
--- a/services/core/internal/sandbox/microsandbox/provider.go
+++ b/services/core/internal/sandbox/microsandbox/provider.go
@@ -16,7 +16,6 @@ type Provider struct {
 }
 
 var _ sandbox.SandboxProvider = (*Provider)(nil)
-var _ sandbox.CheckpointProvider = (*Provider)(nil)
 
 func NewWithCaller(c Config, caller Caller) (*Provider, error) {
 	if c.Validate() != nil || caller == nil {
@@ -213,9 +212,3 @@ func (p *Provider) NewCompute(ctx context.Context, r sandbox.Reference, generati
 	}
 	return c, nil
 }
-
-// Quiescent includes a helper that outlived the caller's canceled context.
-func (p *Provider) Quiescent() bool {
-	v, ok := p.caller.(interface{ Quiescent() bool })
-	return ok && v.Quiescent()
-}
diff --git a/services/core/internal/sandbox/microsandbox/resources.go b/services/core/internal/sandbox/microsandbox/resources.go
index 6b4619147..ce586b389 100644
--- a/services/core/internal/sandbox/microsandbox/resources.go
+++ b/services/core/internal/sandbox/microsandbox/resources.go
@@ -10,10 +10,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-var _ runtimeobs.Source = (*Provider)(nil)
-
-func (*Provider) ObservationProviderType() string { return "microsandbox" }
-
 // Observe reads one point-in-time native metrics snapshot through the existing
 // one-shot helper. The persisted compute receipt selects the exact generation;
 // browser input and provider display names never select a sandbox.
@@ -74,7 +70,3 @@ func sampleFromMetrics(config Config, metrics Metrics) (runtimeobs.Sample, error
 		MemoryUsageBytes: &memoryUsage, MemoryLimitBytes: &memoryLimit,
 	}, nil
 }
-
-func (p *Provider) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
diff --git a/services/core/internal/sandbox/node/connection_test.go b/services/core/internal/sandbox/node/connection_test.go
index 30f88ecd8..abee501b3 100644
--- a/services/core/internal/sandbox/node/connection_test.go
+++ b/services/core/internal/sandbox/node/connection_test.go
@@ -176,7 +176,7 @@ func TestCopiedIdentityCannotReplaceNodeWithInflightCreate(t *testing.T) {
 	hub.mu.Unlock()
 	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
 	defer cancel()
-	proxy := hub.Proxy(id.NodeID, "docker", docker.Operations(), 1)
+	proxy := hub.Proxy(id.NodeID, docker.Operations(), 1)
 	r := reference()
 	created := make(chan error, 1)
 	go func() { _, err := proxy.Create(ctx, sandbox.Bootstrap{Reference: r}); created <- err }()
diff --git a/services/core/internal/sandbox/node/creation_settlement_test.go b/services/core/internal/sandbox/node/creation_settlement_test.go
index 02ef95248..09d8daec5 100644
--- a/services/core/internal/sandbox/node/creation_settlement_test.go
+++ b/services/core/internal/sandbox/node/creation_settlement_test.go
@@ -73,7 +73,7 @@ func TestNodeCarriesCreationSettlementWithoutConvertingFailureToSuccess(t *testi
 				}
 			}()
 			wait(t, func() bool { return hub.Online(id.NodeID) })
-			proxy := hub.Proxy(id.NodeID, "docker", docker.Operations(), 1)
+			proxy := hub.Proxy(id.NodeID, docker.Operations(), 1)
 			for _, operation := range []func(context.Context) (sandbox.Info, error){
 				func(ctx context.Context) (sandbox.Info, error) {
 					return proxy.Create(ctx, sandbox.Bootstrap{Reference: ref})
diff --git a/services/core/internal/sandbox/node/docker_live_test.go b/services/core/internal/sandbox/node/docker_live_test.go
index 13ab16b51..48695bfff 100644
--- a/services/core/internal/sandbox/node/docker_live_test.go
+++ b/services/core/internal/sandbox/node/docker_live_test.go
@@ -76,7 +76,7 @@ func TestDockerNodeTransportLifecycle(t *testing.T) {
 		}
 	}()
 	wait(t, func() bool { return hub.Online(id.NodeID) })
-	proxy := hub.Proxy(id.NodeID, "docker", docker.Operations(), 1)
+	proxy := hub.Proxy(id.NodeID, docker.Operations(), 1)
 	r := reference()
 	defer func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
diff --git a/services/core/internal/sandbox/node/generation_connection_test.go b/services/core/internal/sandbox/node/generation_connection_test.go
index d39b68459..1c3e59d6c 100644
--- a/services/core/internal/sandbox/node/generation_connection_test.go
+++ b/services/core/internal/sandbox/node/generation_connection_test.go
@@ -63,7 +63,7 @@ func TestGenerationWireRoutesOldOwnershipAndCurrentTargetSeparately(t *testing.T
 	}()
 	wait(t, func() bool { return hub.Online(id.NodeID) })
 	for _, generation := range []uint64{1, 17, 9} {
-		proxy := hub.GenerationProvider("docker", docker.Operations(), func(context.Context, sandbox.Reference) (string, uint64, error) { return id.NodeID, generation, nil })
+		proxy := hub.GenerationProvider(docker.Operations(), func(context.Context, sandbox.Reference) (string, uint64, error) { return id.NodeID, generation, nil })
 		ref := reference()
 		if _, err := proxy.GetInfo(ctx, ref); err != nil {
 			t.Fatal("retained generation info failed", generation, err)
diff --git a/services/core/internal/sandbox/node/generations.go b/services/core/internal/sandbox/node/generations.go
index 95613b674..047bbe4e1 100644
--- a/services/core/internal/sandbox/node/generations.go
+++ b/services/core/internal/sandbox/node/generations.go
@@ -15,7 +15,10 @@ type GenerationProvider struct {
 	SpecificationDigest string
 	Provider            sandbox.SandboxProvider
 	Probe               func(context.Context) error
-	Close               func()
+	// Quiescent reports that no helper outlived its canceled caller; nil
+	// means always quiescent.
+	Quiescent func() bool
+	Close     func()
 }
 
 type GenerationManagerOptions struct {
@@ -217,11 +220,7 @@ func (m *GenerationManager) Drop(ctx context.Context, grant sandbox.GenerationRe
 		m.mu.Unlock()
 		return sandbox.ErrOwnership
 	}
-	quiet := true
-	if provider, ok := g.value.Provider.(interface{ Quiescent() bool }); ok {
-		quiet = provider.Quiescent()
-	}
-	if !quiet || g.refs != 0 || g.removing || m.target.Generation == grant.Generation || m.target.ServingGeneration != nil && *m.target.ServingGeneration == grant.Generation {
+	if g.value.Quiescent != nil && !g.value.Quiescent() || g.refs != 0 || g.removing || m.target.Generation == grant.Generation || m.target.ServingGeneration != nil && *m.target.ServingGeneration == grant.Generation {
 		m.mu.Unlock()
 		return ErrUnavailable
 	}
@@ -265,7 +264,7 @@ func (m *GenerationManager) prepareLoop() {
 				if candidate == nil || candidate.removing || candidate.collecting || candidate.preparing || candidate.refs != 0 || candidate.value.Provider != nil && !candidate.repairing || time.Now().Before(candidate.retryAt) {
 					continue
 				}
-				if provider, ok := candidate.value.Provider.(interface{ Quiescent() bool }); ok && !provider.Quiescent() {
+				if candidate.value.Quiescent != nil && !candidate.value.Quiescent() {
 					continue
 				}
 				g = candidate
diff --git a/services/core/internal/sandbox/node/generations_test.go b/services/core/internal/sandbox/node/generations_test.go
index 9292bbbb2..8831d5321 100644
--- a/services/core/internal/sandbox/node/generations_test.go
+++ b/services/core/internal/sandbox/node/generations_test.go
@@ -116,13 +116,6 @@ func TestRetentionReplyMustMatchWholePendingExchange(t *testing.T) {
 	}
 }
 
-type helperOwnedProvider struct {
-	*fakeProvider
-	caller *microsandbox.ProcessCaller
-}
-
-func (p *helperOwnedProvider) Quiescent() bool { return p.caller.Quiescent() }
-
 func TestGrantedDropWaitsForReferencesAndActualHelperExit(t *testing.T) {
 	root := t.TempDir()
 	helper := filepath.Join(root, "helper")
@@ -142,7 +135,7 @@ func TestGrantedDropWaitsForReferencesAndActualHelperExit(t *testing.T) {
 	defer func() { _ = os.WriteFile(release, nil, 0600); wait(t, caller.Quiescent) }()
 	m := generationFixture(3)
 	m.target.ServingGeneration = nil
-	m.values[1].value.Provider = &helperOwnedProvider{fakeProvider: &fakeProvider{}, caller: caller}
+	m.values[1].value.Provider, m.values[1].value.Quiescent = &fakeProvider{}, caller.Quiescent
 	m.options.Remove = func(context.Context, GenerationProvider) error { return os.Remove(artifact) }
 	_, _, unref, err := m.Acquire(1)
 	if err != nil {
diff --git a/services/core/internal/sandbox/node/hub_lifetime_test.go b/services/core/internal/sandbox/node/hub_lifetime_test.go
index ed5d0d379..37b07c74b 100644
--- a/services/core/internal/sandbox/node/hub_lifetime_test.go
+++ b/services/core/internal/sandbox/node/hub_lifetime_test.go
@@ -46,7 +46,7 @@ func assertInfoResponsive(t *testing.T, hub *Hub, id Identity) {
 	t.Helper()
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
-	info, err := hub.Proxy(id.NodeID, id.Provider, docker.Operations(), 1).GetInfo(ctx, reference())
+	info, err := hub.Proxy(id.NodeID, docker.Operations(), 1).GetInfo(ctx, reference())
 	if err != nil || info.ProviderID != "retained" {
 		t.Fatalf("unrelated node RPC blocked: info=%+v err=%v", info, err)
 	}
@@ -287,7 +287,7 @@ func TestHubSendQueueRespectsCallerCancellation(t *testing.T) {
 	defer cancel()
 	done := make(chan error, 1)
 	go func() {
-		_, err := hub.Proxy(id.NodeID, id.Provider, docker.Operations(), 1).GetInfo(ctx, reference())
+		_, err := hub.Proxy(id.NodeID, docker.Operations(), 1).GetInfo(ctx, reference())
 		done <- err
 	}()
 	select {
diff --git a/services/core/internal/sandbox/node/node_test.go b/services/core/internal/sandbox/node/node_test.go
index aab23036f..9aca8cd5a 100644
--- a/services/core/internal/sandbox/node/node_test.go
+++ b/services/core/internal/sandbox/node/node_test.go
@@ -125,7 +125,7 @@ func TestLostCreateResponseDoesNotReplayAndReconnectSerializesCleanup(t *testing
 		t.Fatal("running node did not retain lifetime identity lock")
 	}
 	r := reference()
-	proxy := hub.Proxy(id.NodeID, "docker", docker.Operations(), 1)
+	proxy := hub.Proxy(id.NodeID, docker.Operations(), 1)
 	createCtx, stopCreate := context.WithTimeout(ctx, 150*time.Millisecond)
 	defer stopCreate()
 	createDone := make(chan error, 1)
@@ -168,7 +168,7 @@ func TestLostCreateResponseDoesNotReplayAndReconnectSerializesCleanup(t *testing
 
 func TestOfflineIsUnknownAndDockerDoesNotAdvertiseCheckpoint(t *testing.T) {
 	h := NewHub(HubOptions{OwnerEpoch: func(context.Context) (uint64, error) { return 1, nil }})
-	p := h.Proxy(uuid.NewString(), "docker", docker.Operations(), 1)
+	p := h.Proxy(uuid.NewString(), docker.Operations(), 1)
 	if sandbox.SupportsCheckpoint(p) {
 		t.Fatal("docker advertised checkpoint")
 	}
diff --git a/services/core/internal/sandbox/node/observations.go b/services/core/internal/sandbox/node/observations.go
index 515606640..7129d2f33 100644
--- a/services/core/internal/sandbox/node/observations.go
+++ b/services/core/internal/sandbox/node/observations.go
@@ -3,16 +3,11 @@ package node
 import (
 	"context"
 	"errors"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-var _ runtimeobs.Source = (*provider)(nil)
-
-func (p *provider) ObservationProviderType() string { return p.kind }
-
 func observationReference(target runtimeobs.Target) sandbox.Reference {
 	return sandbox.Reference{TenantID: target.TenantID, EnvironmentID: target.EnvironmentID, AllocationID: target.Instance.AllocationID}
 }
@@ -39,18 +34,3 @@ func (p *provider) Observe(ctx context.Context, target runtimeobs.Target) (runti
 	}
 	return *out.Sample, nil
 }
-
-func observeProvider(ctx context.Context, provider sandbox.SandboxProvider, target runtimeobs.Target) (runtimeobs.Sample, error) {
-	if err := providercontract.Require(provider, "Observe"); err != nil {
-		return runtimeobs.Sample{}, err
-	}
-	source, ok := provider.(runtimeobs.Source)
-	if !ok {
-		return runtimeobs.Sample{}, providercontract.ErrContract
-	}
-	return source.Observe(ctx, target)
-}
-
-func (p *provider) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
diff --git a/services/core/internal/sandbox/node/observations_test.go b/services/core/internal/sandbox/node/observations_test.go
index f9b7e1656..23a5cbfdb 100644
--- a/services/core/internal/sandbox/node/observations_test.go
+++ b/services/core/internal/sandbox/node/observations_test.go
@@ -89,15 +89,12 @@ func TestObservationsRouteThroughAssignedNodeWithoutLifecycleCalls(t *testing.T)
 	stopSecond := runObservationNode(t, hub, server.URL, second, b)
 	ra, rb := reference(), reference()
 	assignments := map[sandbox.Reference]string{ra: first.NodeID, rb: second.NodeID}
-	source := hub.GenerationProvider("docker", docker.Operations(), func(_ context.Context, r sandbox.Reference) (string, uint64, error) {
+	source := hub.GenerationProvider(docker.Operations(), func(_ context.Context, r sandbox.Reference) (string, uint64, error) {
 		if id, ok := assignments[r]; ok {
 			return id, 1, nil
 		}
 		return "", 0, sandbox.ErrOwnership
-	}).(runtimeobs.Source)
-	if typed := source.ObservationProviderType(); typed != "docker" {
-		t.Fatal("provider type lost", typed)
-	}
+	})
 	for _, test := range []struct {
 		ref      sandbox.Reference
 		provider *observationProvider
diff --git a/services/core/internal/sandbox/node/operations_test.go b/services/core/internal/sandbox/node/operations_test.go
index 2cd469fda..e508988b5 100644
--- a/services/core/internal/sandbox/node/operations_test.go
+++ b/services/core/internal/sandbox/node/operations_test.go
@@ -37,7 +37,7 @@ func TestUnsupportedWireIsExplicitAndDoesNotInvokeProvider(t *testing.T) {
 	}
 }
 func TestUnsupportedProxyRejectsBeforeNodeResolution(t *testing.T) {
-	p := (&Hub{}).GenerationProvider("docker", docker.Operations(), func(context.Context, sandbox.Reference) (string, uint64, error) {
+	p := (&Hub{}).GenerationProvider(docker.Operations(), func(context.Context, sandbox.Reference) (string, uint64, error) {
 		t.Fatal("unsupported call resolved a node")
 		return "", 0, nil
 	}).(*provider)
@@ -47,9 +47,6 @@ func TestUnsupportedProxyRejectsBeforeNodeResolution(t *testing.T) {
 	if _, err := p.Initial(t.Context(), reference()); !errors.Is(err, providercontract.ErrUnsupported) {
 		t.Fatal(err)
 	}
-	if _, err := p.ObserveBatch(t.Context(), nil); !errors.Is(err, providercontract.ErrUnsupported) {
-		t.Fatal(err)
-	}
 }
 func TestNodeOperationMappingCoversForwardedMethods(t *testing.T) {
 	for _, method := range []string{"Create", "GetInfo", "Renew", "Kill", "RunCommand", "Initial", "NewCompute", "GetCompute", "Suspend", "Resume", "KillCompute", "DeleteSnapshot", "RunCommandCompute", "ResumeCompute", "Observe"} {
diff --git a/services/core/internal/sandbox/node/provider_operations_fixture_test.go b/services/core/internal/sandbox/node/provider_operations_fixture_test.go
index 2569a6632..3f892e9bb 100644
--- a/services/core/internal/sandbox/node/provider_operations_fixture_test.go
+++ b/services/core/internal/sandbox/node/provider_operations_fixture_test.go
@@ -10,26 +10,21 @@ import (
 
 func (*fakeProvider) ProviderOperations() providercontract.Operations {
 	return providercontract.Operations{
-		"Create":                   {State: providercontract.Supported},
-		"GetInfo":                  {State: providercontract.Supported},
-		"Renew":                    {State: providercontract.Supported},
-		"Kill":                     {State: providercontract.Supported},
-		"RunCommand":               {State: providercontract.Supported},
-		"Initial":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"NewCompute":               {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"GetCompute":               {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"Suspend":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"Resume":                   {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"KillCompute":              {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DeleteSnapshot":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"RunCommandCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ResumeCompute":            {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ObservationProviderType":  {State: providercontract.Supported},
-		"ResolveObservationSource": {State: providercontract.Supported},
-		"Observe":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ObserveBatch":             {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DiscoverSelection":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"VerifyCredential":         {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Create":            {State: providercontract.Supported},
+		"GetInfo":           {State: providercontract.Supported},
+		"Renew":             {State: providercontract.Supported},
+		"Kill":              {State: providercontract.Supported},
+		"RunCommand":        {State: providercontract.Supported},
+		"Initial":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"NewCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"GetCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Suspend":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Resume":            {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"KillCompute":       {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"DeleteSnapshot":    {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"RunCommandCompute": {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"ResumeCompute":     {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Observe":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
 	}
 }
 func (*fakeProvider) Initial(context.Context, sandbox.Reference) (sandbox.Compute, error) {
@@ -62,46 +57,22 @@ func (*fakeProvider) ResumeCompute(context.Context, sandbox.Reference, sandbox.C
 func (*fakeProvider) Observe(context.Context, runtimeobs.Target) (runtimeobs.Sample, error) {
 	return runtimeobs.Sample{}, &providercontract.UnsupportedError{Operation: "Observe", Reason: "fixture_operation_not_supported"}
 }
-func (*fakeProvider) ObserveBatch(context.Context, []runtimeobs.Target) ([]runtimeobs.BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "fixture_operation_not_supported"}
-}
-func (*fakeProvider) DiscoverSelection(context.Context, sandbox.Selection) (sandbox.Selection, error) {
-	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: "fixture_operation_not_supported"}
-}
-func (*fakeProvider) VerifyCredential(context.Context, []sandbox.Reference) error {
-	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: "fixture_operation_not_supported"}
-}
 func (*observationProvider) ProviderOperations() providercontract.Operations {
 	return providercontract.Operations{
-		"Create":                   {State: providercontract.Supported},
-		"GetInfo":                  {State: providercontract.Supported},
-		"Renew":                    {State: providercontract.Supported},
-		"Kill":                     {State: providercontract.Supported},
-		"RunCommand":               {State: providercontract.Supported},
-		"Initial":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"NewCompute":               {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"GetCompute":               {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"Suspend":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"Resume":                   {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"KillCompute":              {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DeleteSnapshot":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"RunCommandCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ResumeCompute":            {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ObservationProviderType":  {State: providercontract.Supported},
-		"ResolveObservationSource": {State: providercontract.Supported},
-		"Observe":                  {State: providercontract.Supported},
-		"ObserveBatch":             {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DiscoverSelection":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"VerifyCredential":         {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Create":            {State: providercontract.Supported},
+		"GetInfo":           {State: providercontract.Supported},
+		"Renew":             {State: providercontract.Supported},
+		"Kill":              {State: providercontract.Supported},
+		"RunCommand":        {State: providercontract.Supported},
+		"Initial":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"NewCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"GetCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Suspend":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Resume":            {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"KillCompute":       {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"DeleteSnapshot":    {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"RunCommandCompute": {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"ResumeCompute":     {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Observe":           {State: providercontract.Supported},
 	}
 }
-
-func (*fakeProvider) ObservationProviderType() string { return "fixture" }
-func (p *fakeProvider) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
-
-func (*observationProvider) ObservationProviderType() string { return "fixture" }
-func (p *observationProvider) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
diff --git a/services/core/internal/sandbox/node/proxy.go b/services/core/internal/sandbox/node/proxy.go
index 01daa2aa1..fc126ebe8 100644
--- a/services/core/internal/sandbox/node/proxy.go
+++ b/services/core/internal/sandbox/node/proxy.go
@@ -6,23 +6,20 @@ import (
 	"maps"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
 type provider struct {
 	hub               *Hub
 	resolveGeneration func(context.Context, sandbox.Reference) (string, uint64, error)
-	kind              string
 	operations        providercontract.Operations
 }
 
 var _ sandbox.SandboxProvider = (*provider)(nil)
-var _ sandbox.CheckpointProvider = (*provider)(nil)
 
 // Proxy binds a fixed node and deployment generation explicitly.
-func (h *Hub) Proxy(id, kind string, declared providercontract.Operations, generation uint64) sandbox.SandboxProvider {
-	return h.GenerationProvider(kind, declared, func(context.Context, sandbox.Reference) (string, uint64, error) { return id, generation, nil })
+func (h *Hub) Proxy(id string, declared providercontract.Operations, generation uint64) sandbox.SandboxProvider {
+	return h.GenerationProvider(declared, func(context.Context, sandbox.Reference) (string, uint64, error) { return id, generation, nil })
 }
 func (p *provider) call(ctx context.Context, q request) (response, error) {
 	if err := providercontract.Require(p, operationMethod(q.Operation)); err != nil {
@@ -72,15 +69,6 @@ func creationSettled(info *sandbox.Info, ref sandbox.Reference) bool {
 func (p *provider) ProviderOperations() providercontract.Operations {
 	return maps.Clone(p.operations)
 }
-func (*provider) ObserveBatch(context.Context, []runtimeobs.Target) ([]runtimeobs.BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "node_transport_has_no_batch_observation"}
-}
-func (p *provider) DiscoverSelection(context.Context, sandbox.Selection) (sandbox.Selection, error) {
-	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: "node_configuration_is_core_owned"}
-}
-func (p *provider) VerifyCredential(context.Context, []sandbox.Reference) error {
-	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: "node_credentials_are_transport_owned"}
-}
 func (p *provider) Create(ctx context.Context, b sandbox.Bootstrap) (sandbox.Info, error) {
 	return p.info(ctx, request{Operation: "create", Reference: b.Reference, Bootstrap: &b})
 }
@@ -163,13 +151,7 @@ func (p *provider) ResumeCompute(ctx context.Context, r sandbox.Reference, c san
 
 // GenerationProvider routes every operation with allocation-owned generation,
 // distinct from the request's compute generation. declared is the kind's
-// registered operations; the transport replaces the ones it owns.
-func (h *Hub) GenerationProvider(kind string, declared providercontract.Operations, resolve func(context.Context, sandbox.Reference) (string, uint64, error)) sandbox.SandboxProvider {
-	operations := maps.Clone(declared)
-	if operations != nil {
-		operations["DiscoverSelection"] = providercontract.Support{State: providercontract.Unsupported, Reason: "node_configuration_is_core_owned"}
-		operations["VerifyCredential"] = providercontract.Support{State: providercontract.Unsupported, Reason: "node_credentials_are_transport_owned"}
-		operations["ObserveBatch"] = providercontract.Support{State: providercontract.Unsupported, Reason: "node_transport_has_no_batch_observation"}
-	}
-	return &provider{hub: h, kind: kind, operations: operations, resolveGeneration: resolve}
+// registered operations.
+func (h *Hub) GenerationProvider(declared providercontract.Operations, resolve func(context.Context, sandbox.Reference) (string, uint64, error)) sandbox.SandboxProvider {
+	return &provider{hub: h, operations: maps.Clone(declared), resolveGeneration: resolve}
 }
diff --git a/services/core/internal/sandbox/node/recovery_test.go b/services/core/internal/sandbox/node/recovery_test.go
index d150b6422..78d106da3 100644
--- a/services/core/internal/sandbox/node/recovery_test.go
+++ b/services/core/internal/sandbox/node/recovery_test.go
@@ -57,10 +57,10 @@ func TestCoreRestartFencesOldConnectionAndNodeRestartKeepsIdentity(t *testing.T)
 	if first.Online(id.NodeID) {
 		t.Fatal("old owner remained online")
 	}
-	if _, err = first.Proxy(id.NodeID, "docker", docker.Operations(), 1).GetInfo(context.Background(), reference()); !errors.Is(err, sandbox.ErrComputeUnconfirmed) {
+	if _, err = first.Proxy(id.NodeID, docker.Operations(), 1).GetInfo(context.Background(), reference()); !errors.Is(err, sandbox.ErrComputeUnconfirmed) {
 		t.Fatalf("old owner request = %v", err)
 	}
-	if _, err = second.Proxy(id.NodeID, "docker", docker.Operations(), 1).GetInfo(context.Background(), reference()); err != nil {
+	if _, err = second.Proxy(id.NodeID, docker.Operations(), 1).GetInfo(context.Background(), reference()); err != nil {
 		t.Fatal(err)
 	}
 	stop()
@@ -156,7 +156,7 @@ func TestHeartbeatAcknowledgementKeepsIdleConnectionAlive(t *testing.T) {
 	if !hub.Online(id.NodeID) {
 		t.Fatal("idle node disconnected")
 	}
-	if _, err = hub.Proxy(id.NodeID, "docker", docker.Operations(), 1).GetInfo(ctx, reference()); err != nil {
+	if _, err = hub.Proxy(id.NodeID, docker.Operations(), 1).GetInfo(ctx, reference()); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -234,7 +234,7 @@ func TestDegradedNodeRetainsObservationAndCleanup(t *testing.T) {
 	case <-time.After(time.Second):
 		t.Fatal("missing health")
 	}
-	proxy := hub.Proxy(id.NodeID, "docker", docker.Operations(), 1)
+	proxy := hub.Proxy(id.NodeID, docker.Operations(), 1)
 	r := reference()
 	if _, err = proxy.Create(ctx, sandbox.Bootstrap{Reference: r}); !errors.Is(err, sandbox.ErrComputeUnconfirmed) {
 		t.Fatalf("create = %v", err)
diff --git a/services/core/internal/sandbox/node/timeout_test.go b/services/core/internal/sandbox/node/timeout_test.go
index c849b853d..15f8da3c5 100644
--- a/services/core/internal/sandbox/node/timeout_test.go
+++ b/services/core/internal/sandbox/node/timeout_test.go
@@ -103,7 +103,7 @@ func TestQueuedMutationExpiresWithoutExecution(t *testing.T) {
 		}
 	}()
 	wait(t, func() bool { return hub.Online(id.NodeID) })
-	proxy := hub.Proxy(id.NodeID, "docker", docker.Operations(), 1)
+	proxy := hub.Proxy(id.NodeID, docker.Operations(), 1)
 	r := reference()
 	createCtx, stopCreate := context.WithTimeout(ctx, 3*time.Second)
 	defer stopCreate()
diff --git a/services/core/internal/sandbox/node/wire.go b/services/core/internal/sandbox/node/wire.go
index 0194e3c82..03a412951 100644
--- a/services/core/internal/sandbox/node/wire.go
+++ b/services/core/internal/sandbox/node/wire.go
@@ -307,7 +307,7 @@ func execute(ctx context.Context, p sandbox.SandboxProvider, q request) response
 	switch q.Operation {
 	case "observe":
 		var sample runtimeobs.Sample
-		sample, err = observeProvider(ctx, p, *q.Observation)
+		sample, err = p.Observe(ctx, *q.Observation)
 		out.Sample = &sample
 	case "create":
 		info, err = p.Create(ctx, *q.Bootstrap)
@@ -324,38 +324,33 @@ func execute(ctx context.Context, p sandbox.SandboxProvider, q request) response
 		command, err = p.RunCommand(ctx, q.Reference, *q.Command)
 		out.Command = &command
 	default:
-		cp, checkpointErr := sandbox.Checkpoint(p)
-		if checkpointErr != nil {
-			err = checkpointErr
-			break
-		}
 		var state sandbox.ComputeState
 		var compute sandbox.Compute
 		switch q.Operation {
 		case "initial":
-			compute, err = cp.Initial(ctx, q.Reference)
+			compute, err = p.Initial(ctx, q.Reference)
 			out.Compute = &compute
 		case "new_compute":
-			compute, err = cp.NewCompute(ctx, q.Reference, q.Generation, q.Snapshot)
+			compute, err = p.NewCompute(ctx, q.Reference, q.Generation, q.Snapshot)
 			out.Compute = &compute
 		case "compute":
-			state, err = cp.GetCompute(ctx, q.Reference, *q.Compute)
+			state, err = p.GetCompute(ctx, q.Reference, *q.Compute)
 			out.State = &state
 		case "suspend":
-			state, err = cp.Suspend(ctx, *q.Suspend)
+			state, err = p.Suspend(ctx, *q.Suspend)
 			out.State = &state
 		case "resume":
-			state, err = cp.Resume(ctx, *q.Resume)
+			state, err = p.Resume(ctx, *q.Resume)
 			out.State = &state
 		case "kill_compute":
-			err = cp.KillCompute(ctx, q.Reference, *q.Compute)
+			err = p.KillCompute(ctx, q.Reference, *q.Compute)
 		case "delete_snapshot":
-			err = cp.DeleteSnapshot(ctx, q.Reference, *q.Snapshot)
+			err = p.DeleteSnapshot(ctx, q.Reference, *q.Snapshot)
 		case "resume_compute":
-			state, err = cp.ResumeCompute(ctx, q.Reference, *q.Compute)
+			state, err = p.ResumeCompute(ctx, q.Reference, *q.Compute)
 			out.State = &state
 		case "command_compute":
-			command, err = cp.RunCommandCompute(ctx, q.Reference, *q.Compute, *q.Command)
+			command, err = p.RunCommandCompute(ctx, q.Reference, *q.Compute, *q.Command)
 			out.Command = &command
 		default:
 			err = sandbox.ErrInvalid
diff --git a/services/core/internal/sandbox/operations.go b/services/core/internal/sandbox/operations.go
deleted file mode 100644
index 3faf4454b..000000000
--- a/services/core/internal/sandbox/operations.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package sandbox
-
-import (
-	"errors"
-	"fmt"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
-	"reflect"
-)
-
-// These existing interfaces are the canonical operation inventory. Declarations
-// must cover every method, including explicit unsupported implementations.
-var providerInterfaces = []reflect.Type{
-	reflect.TypeFor[SandboxProvider](), reflect.TypeFor[CheckpointProvider](),
-	reflect.TypeFor[SelectionDiscoverer](), reflect.TypeFor[CredentialVerifier](),
-	reflect.TypeFor[runtimeobs.SourceResolver](), reflect.TypeFor[runtimeobs.Source](), reflect.TypeFor[runtimeobs.BatchSource](),
-}
-
-func ValidateProvider(p SandboxProvider) error {
-	if err := providercontract.Validate(p, providerInterfaces...); err != nil {
-		return err
-	}
-	if err := runtimeobs.ValidateSource(p.(runtimeobs.Source)); err != nil {
-		return err
-	}
-	return ValidateOperations(p.ProviderOperations())
-}
-
-// ValidateOperations rejects omitted, unknown and contradictory declarations.
-func ValidateOperations(operations providercontract.Operations) error {
-	known := map[string]bool{}
-	for _, contract := range providerInterfaces {
-		for i := 0; i < contract.NumMethod(); i++ {
-			name := contract.Method(i).Name
-			if name != "ProviderOperations" {
-				known[name] = true
-				if err := operations[name].Check(name); err != nil && !errors.Is(err, providercontract.ErrUnsupported) {
-					return err
-				}
-			}
-		}
-	}
-	for name := range operations {
-		if !known[name] {
-			return fmt.Errorf("%w: unknown operation %s", providercontract.ErrContract, name)
-		}
-	}
-	required := reflect.TypeFor[SandboxProvider]()
-	for i := 0; i < required.NumMethod(); i++ {
-		name := required.Method(i).Name
-		if name != "ProviderOperations" && operations[name].State != providercontract.Supported {
-			return fmt.Errorf("%w: required operation %s", providercontract.ErrContract, name)
-		}
-	}
-	for _, name := range []string{"ObservationProviderType", "ResolveObservationSource"} {
-		if operations[name].State != providercontract.Supported {
-			return fmt.Errorf("%w: required operation %s", providercontract.ErrContract, name)
-		}
-	}
-	// The checkpoint lifecycle is indivisible: partial cleanup or restore support
-	// cannot safely own a compute incarnation.
-	checkpoint := reflect.TypeFor[CheckpointProvider]()
-	for i := 0; i < checkpoint.NumMethod(); i++ {
-		name := checkpoint.Method(i).Name
-		if _, required := reflect.TypeFor[SandboxProvider]().MethodByName(name); !required && operations[name].State != operations["Initial"].State {
-			return fmt.Errorf("%w: incomplete checkpoint lifecycle", providercontract.ErrContract)
-		}
-	}
-	if operations["ObserveBatch"].State == providercontract.Supported && operations["Observe"].State != providercontract.Supported {
-		return fmt.Errorf("%w: batch observation requires observation", providercontract.ErrContract)
-	}
-	return nil
-}
-
-func SupportsCheckpoint(p SandboxProvider) bool {
-	return providercontract.Require(p, "Initial") == nil
-}
-
-func Checkpoint(p SandboxProvider) (CheckpointProvider, error) {
-	if err := providercontract.Require(p, "Initial"); err != nil {
-		return nil, err
-	}
-	cp, ok := p.(CheckpointProvider)
-	if !ok {
-		return nil, providercontract.ErrContract
-	}
-	return cp, nil
-}
diff --git a/services/core/internal/sandbox/operations_test.go b/services/core/internal/sandbox/operations_test.go
index f1cc091d1..62d2c5b3f 100644
--- a/services/core/internal/sandbox/operations_test.go
+++ b/services/core/internal/sandbox/operations_test.go
@@ -19,23 +19,13 @@ type changedDeclaration struct {
 
 func (p *changedDeclaration) ProviderOperations() providercontract.Operations { return p.operations }
 
-type onlyRequired struct{ sandbox.SandboxProvider }
-
-func (*onlyRequired) ProviderOperations() providercontract.Operations { return docker.Operations() }
-
 func TestDeclarationsRejectMissingUnknownAndContradictoryOperations(t *testing.T) {
 	for _, mutate := range []struct {
 		name   string
 		change func(providercontract.Operations)
 	}{
-		{"identity unsupported", func(o providercontract.Operations) {
-			o["ObservationProviderType"] = providercontract.Support{State: providercontract.Unsupported, Reason: "no_identity"}
-		}},
-		{"resolver unsupported", func(o providercontract.Operations) {
-			o["ResolveObservationSource"] = providercontract.Support{State: providercontract.Unsupported, Reason: "no_resolver"}
-		}},
 		{"omitted", func(o providercontract.Operations) { delete(o, "DeleteSnapshot") }},
-		{"zero", func(o providercontract.Operations) { o["ObserveBatch"] = providercontract.Support{} }},
+		{"zero", func(o providercontract.Operations) { o["Observe"] = providercontract.Support{} }},
 		{"unknown", func(o providercontract.Operations) {
 			o["FutureOperation"] = providercontract.Support{State: providercontract.Supported}
 		}},
@@ -46,10 +36,10 @@ func TestDeclarationsRejectMissingUnknownAndContradictoryOperations(t *testing.T
 			o["Initial"] = providercontract.Support{State: providercontract.Supported}
 		}},
 		{"unsafe reason", func(o providercontract.Operations) {
-			o["ObserveBatch"] = providercontract.Support{State: providercontract.Unsupported, Reason: "https://private:key@host"}
+			o["Observe"] = providercontract.Support{State: providercontract.Unsupported, Reason: "https://private:key@host"}
 		}},
 		{"unknown state", func(o providercontract.Operations) {
-			o["ObserveBatch"] = providercontract.Support{State: "unavailable"}
+			o["Observe"] = providercontract.Support{State: "unavailable"}
 		}},
 	} {
 		t.Run(mutate.name, func(t *testing.T) {
@@ -60,9 +50,6 @@ func TestDeclarationsRejectMissingUnknownAndContradictoryOperations(t *testing.T
 			}
 		})
 	}
-	if err := sandbox.ValidateProvider(&onlyRequired{}); !errors.Is(err, providercontract.ErrContract) {
-		t.Fatal("missing extension implementations accepted", err)
-	}
 	var nilProvider *docker.Provider
 	if err := sandbox.ValidateProvider(nilProvider); !errors.Is(err, providercontract.ErrContract) {
 		t.Fatal("typed nil accepted", err)
@@ -100,28 +87,3 @@ func TestEveryUnsupportedNativeOperationRejectsWithoutSideEffects(t *testing.T)
 		}
 	}
 }
-
-// An extended interface cannot inherit success through the existing declaration.
-type nextContract interface {
-	sandbox.SandboxProvider
-	NextOperation(context.Context) error
-}
-type futureProvider struct{ *docker.Provider }
-
-func (*futureProvider) NextOperation(context.Context) error { return nil }
-func TestNewContractRequiresAnAuthoredDecision(t *testing.T) {
-	for _, p := range []providercontract.Declared{&docker.Provider{}, &futureProvider{&docker.Provider{}}} {
-		if err := providercontract.Validate(p, reflect.TypeFor[nextContract]()); !errors.Is(err, providercontract.ErrContract) {
-			t.Fatal("new operation inherited a default", err)
-		}
-	}
-}
-
-type invalidObservationIdentity struct{ *docker.Provider }
-
-func (*invalidObservationIdentity) ObservationProviderType() string { return "" }
-func TestProviderRegistrationRequiresObservationIdentity(t *testing.T) {
-	if err := sandbox.ValidateProvider(&invalidObservationIdentity{&docker.Provider{}}); !errors.Is(err, providercontract.ErrContract) {
-		t.Fatal("provider registration accepted empty observation identity", err)
-	}
-}
diff --git a/services/core/internal/sandbox/providers/config.go b/services/core/internal/sandbox/providers/config.go
index 22e789f49..32a3b1f33 100644
--- a/services/core/internal/sandbox/providers/config.go
+++ b/services/core/internal/sandbox/providers/config.go
@@ -64,6 +64,8 @@ type Built struct {
 	Provider                           sandbox.SandboxProvider
 	InstallationID, BackendFingerprint string
 	Probe                              func(context.Context) error
+	// Quiescent is nil when no helper can outlive its caller.
+	Quiescent func() bool
 }
 
 // LocalOptions supplies process-local context without changing persisted configuration.
diff --git a/services/core/internal/sandbox/providers/configuration.go b/services/core/internal/sandbox/providers/configuration.go
index 910a0cb4c..7658c0668 100644
--- a/services/core/internal/sandbox/providers/configuration.go
+++ b/services/core/internal/sandbox/providers/configuration.go
@@ -3,6 +3,8 @@ package providers
 import (
 	"context"
 	"encoding/json"
+	"errors"
+	"fmt"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
@@ -106,11 +108,48 @@ func (r *Registry) DiscoverConfiguration(ctx context.Context, kind string, input
 	if err := a.Configuration.Requirements().Discovery.Check("DiscoverConfiguration"); err != nil {
 		return nil, err
 	}
-	discovery, ok := a.Configuration.(sandbox.ConfigurationDiscoverer)
-	if !ok {
-		return nil, providercontract.ErrContract
+	result, err := a.Configuration.DiscoverConfiguration(ctx, input, paths)
+	if err != nil {
+		return nil, declaredResult("DiscoverConfiguration", err)
+	}
+	return result, nil
+}
+
+// DiscoverSelection resolves a direct candidate's omitted native values.
+func (r *Registry) DiscoverSelection(ctx context.Context, c sandbox.DirectConfig) (sandbox.Selection, error) {
+	a, err := r.Lookup(c.Selection.Provider)
+	if err != nil {
+		return sandbox.Selection{}, err
+	}
+	if err := a.Configuration.Requirements().SelectionDiscovery.Check("DiscoverSelection"); err != nil {
+		return sandbox.Selection{}, err
+	}
+	s, err := a.Configuration.DiscoverSelection(ctx, c)
+	if err != nil {
+		return sandbox.Selection{}, declaredResult("DiscoverSelection", err)
+	}
+	return s, nil
+}
+
+// VerifyCredential checks a candidate credential against owned resources.
+func (r *Registry) VerifyCredential(ctx context.Context, c sandbox.DirectConfig, refs []sandbox.Reference) error {
+	a, err := r.Lookup(c.Selection.Provider)
+	if err != nil {
+		return err
 	}
-	return discovery.DiscoverConfiguration(ctx, input, paths)
+	if err := a.Configuration.Requirements().CredentialVerification.Check("VerifyCredential"); err != nil {
+		return err
+	}
+	return declaredResult("VerifyCredential", a.Configuration.VerifyCredential(ctx, c, refs))
+}
+
+// declaredResult keeps a supported declaration binding: an operation declared
+// Supported that reports Unsupported breaks the contract.
+func declaredResult(operation string, err error) error {
+	if errors.Is(err, providercontract.ErrUnsupported) {
+		return fmt.Errorf("%w: %s is declared supported", providercontract.ErrContract, operation)
+	}
+	return err
 }
 
 type nodeConfiguration struct{}
@@ -123,7 +162,10 @@ type nodeConfigurationAdapter struct {
 }
 
 func (nodeConfigurationAdapter) Requirements() sandbox.ConfigurationRequirements {
-	return sandbox.ConfigurationRequirements{Credential: sandbox.NotRequired, PublicOrigin: sandbox.NotRequired, Discovery: providercontract.Support{State: providercontract.Unsupported, Reason: "node_configuration_has_no_catalog"}}
+	return sandbox.ConfigurationRequirements{Credential: sandbox.NotRequired, PublicOrigin: sandbox.NotRequired,
+		Discovery:              providercontract.Support{State: providercontract.Unsupported, Reason: "node_configuration_has_no_catalog"},
+		SelectionDiscovery:     providercontract.Support{State: providercontract.Unsupported, Reason: "node_configuration_has_no_catalog"},
+		CredentialVerification: providercontract.Support{State: providercontract.Unsupported, Reason: "credentials_not_required"}}
 }
 func (nodeConfigurationAdapter) DecodeInput(public, secret json.RawMessage) (sandbox.Configuration, error) {
 	if len(secret) > 0 || sandbox.DecodeConfigurationObject(public, &struct{}{}) != nil {
@@ -170,3 +212,9 @@ func (a nodeConfigurationAdapter) Equal(x, y sandbox.Configuration) (bool, error
 func (nodeConfigurationAdapter) DiscoverConfiguration(context.Context, sandbox.ConfigurationDiscoveryInput, sandbox.ProcessPaths) (json.RawMessage, error) {
 	return nil, &providercontract.UnsupportedError{Operation: "DiscoverConfiguration", Reason: "node_configuration_has_no_catalog"}
 }
+func (nodeConfigurationAdapter) DiscoverSelection(context.Context, sandbox.DirectConfig) (sandbox.Selection, error) {
+	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: "node_configuration_has_no_catalog"}
+}
+func (nodeConfigurationAdapter) VerifyCredential(context.Context, sandbox.DirectConfig, []sandbox.Reference) error {
+	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: "credentials_not_required"}
+}
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index b61b73c5a..12b338067 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -31,7 +31,8 @@ func (regionalConfiguration) ReplacesCredential() bool { return false }
 type regionalCodec struct{}
 
 func (regionalCodec) Requirements() sandbox.ConfigurationRequirements {
-	return sandbox.ConfigurationRequirements{Credential: sandbox.NotRequired, PublicOrigin: sandbox.NotRequired, Discovery: providercontract.Support{State: providercontract.Unsupported, Reason: "node_configuration_has_no_catalog"}}
+	unsupported := providercontract.Support{State: providercontract.Unsupported, Reason: "node_configuration_has_no_catalog"}
+	return sandbox.ConfigurationRequirements{Credential: sandbox.NotRequired, PublicOrigin: sandbox.NotRequired, Discovery: unsupported, SelectionDiscovery: unsupported, CredentialVerification: unsupported}
 }
 func (regionalCodec) WithCredential(sandbox.Configuration, sandbox.Configuration) (sandbox.Configuration, error) {
 	return nil, &providercontract.UnsupportedError{Operation: "WithCredential", Reason: "credentials_not_required"}
@@ -75,6 +76,12 @@ func (a regionalCodec) Equal(x, y sandbox.Configuration) (bool, error) {
 func (regionalCodec) DiscoverConfiguration(context.Context, sandbox.ConfigurationDiscoveryInput, sandbox.ProcessPaths) (json.RawMessage, error) {
 	return nil, &providercontract.UnsupportedError{Operation: "DiscoverConfiguration", Reason: "node_configuration_has_no_catalog"}
 }
+func (regionalCodec) DiscoverSelection(context.Context, sandbox.DirectConfig) (sandbox.Selection, error) {
+	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: "node_configuration_has_no_catalog"}
+}
+func (regionalCodec) VerifyCredential(context.Context, sandbox.DirectConfig, []sandbox.Reference) error {
+	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: "node_configuration_has_no_catalog"}
+}
 
 // A registered native configuration reaches the ordinary API and Store without
 // adding its fields or kind to either Core package.
diff --git a/services/core/internal/sandbox/providers/configuration_test.go b/services/core/internal/sandbox/providers/configuration_test.go
index 43588e61a..cfabbadeb 100644
--- a/services/core/internal/sandbox/providers/configuration_test.go
+++ b/services/core/internal/sandbox/providers/configuration_test.go
@@ -25,11 +25,7 @@ func TestNodeConfigurationExplicitUnsupportedAndStrictEmptyInput(t *testing.T) {
 				t.Fatal(kind, "accepted credential", err)
 			}
 		}
-		discover, ok := a.Configuration.(sandbox.ConfigurationDiscoverer)
-		if !ok {
-			t.Fatal("missing explicit discovery implementation")
-		}
-		if _, err := discover.DiscoverConfiguration(t.Context(), sandbox.ConfigurationDiscoveryInput{}, sandbox.ProcessPaths{}); !errors.Is(err, providercontract.ErrUnsupported) {
+		if _, err := a.Configuration.DiscoverConfiguration(t.Context(), sandbox.ConfigurationDiscoveryInput{}, sandbox.ProcessPaths{}); !errors.Is(err, providercontract.ErrUnsupported) {
 			t.Fatal("discovery did not reject", err)
 		}
 		if _, err := a.Configuration.WithCredential(nil, nil); !errors.Is(err, providercontract.ErrUnsupported) {
diff --git a/services/core/internal/sandbox/providers/e2b.go b/services/core/internal/sandbox/providers/e2b.go
deleted file mode 100644
index bb3861f7f..000000000
--- a/services/core/internal/sandbox/providers/e2b.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package providers
-
-import (
-	"errors"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
-)
-
-type DirectConfig struct {
-	ProcessPaths   sandbox.ProcessPaths
-	InstallationID string
-	Selection      sandbox.Selection
-	Fence          *sandbox.CallFence
-}
-
-func (r *Registry) BuildDirect(c DirectConfig) (sandbox.SandboxProvider, error) {
-	a, e := r.Lookup(c.Selection.Provider)
-	if e != nil {
-		return nil, e
-	}
-	if a.BuildDirect == nil {
-		return nil, sandbox.ErrInvalid
-	}
-	p, err := a.BuildDirect(c)
-	if err != nil {
-		return nil, err
-	}
-	if err := ValidateBinding(a, p); err != nil {
-		return nil, err
-	}
-	return p, nil
-}
-func buildE2B(c DirectConfig) (sandbox.SandboxProvider, error) {
-	configuration, ok := c.Selection.Configuration.(*e2b.DeploymentConfiguration)
-	if !ok || configuration == nil {
-		return nil, errors.New("E2B deployment configuration is unavailable")
-	}
-	binary, state, err := e2b.InstalledPaths(c.ProcessPaths)
-	if err != nil {
-		return nil, err
-	}
-	// Only a candidate that omitted its resources has none; its validation
-	// reads them from the template build before the candidate is rebuilt.
-	var resources *sandbox.Resources
-	if c.Selection.DeploymentSpec.Resources != (sandbox.Resources{}) {
-		resources = &c.Selection.DeploymentSpec.Resources
-	}
-	provider, err := e2b.NewWithCaller(e2b.Config{Binary: binary, StateDir: state,
-		Resources: resources, InstallationID: c.InstallationID, APIKey: configuration.APIKey, Template: configuration.Template,
-		APIURL: configuration.APIURL, Domain: configuration.Domain, TimeoutSeconds: 3600}, &e2b.ProcessCaller{Fence: c.Fence})
-	if err != nil {
-		return nil, errors.New("E2B provider cannot load; check the installed helper and private state directory")
-	}
-	return provider, nil
-}
diff --git a/services/core/internal/sandbox/providers/generation_test.go b/services/core/internal/sandbox/providers/generation_test.go
index 58f961693..e9b1c957c 100644
--- a/services/core/internal/sandbox/providers/generation_test.go
+++ b/services/core/internal/sandbox/providers/generation_test.go
@@ -81,6 +81,9 @@ func TestMicrosandboxGenerationBindsLeaseIdentity(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer closeProvider()
+	if built.Quiescent == nil || !built.Quiescent() {
+		t.Fatal("generation does not report helper quiescence")
+	}
 	response, err := json.Marshal(sandboxmicro.Response{Version: sandboxmicro.ProtocolVersion})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/sandbox/providers/microsandbox.go b/services/core/internal/sandbox/providers/microsandbox.go
index 06dc7c3a4..58fbcb8cf 100644
--- a/services/core/internal/sandbox/providers/microsandbox.go
+++ b/services/core/internal/sandbox/providers/microsandbox.go
@@ -59,6 +59,7 @@ func configureMicrosandbox(entry Microsandbox, resources sandbox.Resources, call
 	}
 	result.Provider = provider
 	result.Probe = microsandboxProbe(entry, resources)
+	result.Quiescent = caller.Quiescent
 	result.BackendFingerprint = BackendFingerprint("microsandbox", entry.RuntimeHome)
 	return nil
 }
diff --git a/services/core/internal/sandbox/providers/registration_configuration.go b/services/core/internal/sandbox/providers/registration_configuration.go
index 3d8a5dd54..07ba5d285 100644
--- a/services/core/internal/sandbox/providers/registration_configuration.go
+++ b/services/core/internal/sandbox/providers/registration_configuration.go
@@ -24,32 +24,13 @@ func validateConfigurationAdapter(configuration sandbox.ConfigurationAdapter) er
 			return configurationRegistrationError()
 		}
 	}
-	discovery := reflect.TypeFor[sandbox.ConfigurationDiscoverer]()
-	if !value.Type().Implements(discovery) {
-		return configurationRegistrationError()
-	}
-	if err := validateConfigurationDiscoveryInterface(discovery); err != nil {
-		return err
-	}
 	return validateConfigurationRequirements(reflect.ValueOf(configuration.Requirements()))
 }
 
-// Every discovery method needs its own authored requirement. A future method
-// cannot inherit the existing Discovery decision merely by being implemented.
-func validateConfigurationDiscoveryInterface(discovery reflect.Type) error {
-	if discovery.NumMethod() != 1 {
-		return configurationRegistrationError()
-	}
-	if _, exists := discovery.MethodByName("DiscoverConfiguration"); !exists {
-		return configurationRegistrationError()
-	}
-	return nil
-}
-
 // Check field names as well as values so new requirements cannot bypass the
 // gate. This owns only configuration requirements, not resource operations.
 func validateConfigurationRequirements(value reflect.Value) error {
-	if value.Kind() != reflect.Struct || value.NumField() != 3 {
+	if value.Kind() != reflect.Struct || value.NumField() != 5 {
 		return configurationRegistrationError()
 	}
 	for i := 0; i < value.NumField(); i++ {
@@ -59,12 +40,12 @@ func validateConfigurationRequirements(value reflect.Value) error {
 			if !ok || (requirement != sandbox.Required && requirement != sandbox.NotRequired) {
 				return configurationRegistrationError()
 			}
-		case "Discovery":
+		case "Discovery", "SelectionDiscovery", "CredentialVerification":
 			support, ok := value.Field(i).Interface().(providercontract.Support)
 			if !ok {
 				return configurationRegistrationError()
 			}
-			if err := support.Check("DiscoverConfiguration"); err != nil && !errors.Is(err, providercontract.ErrUnsupported) {
+			if err := support.Check(value.Type().Field(i).Name); err != nil && !errors.Is(err, providercontract.ErrUnsupported) {
 				return configurationRegistrationError()
 			}
 		default:
diff --git a/services/core/internal/sandbox/providers/registration_configuration_test.go b/services/core/internal/sandbox/providers/registration_configuration_test.go
index 7fdcda590..4a456d31e 100644
--- a/services/core/internal/sandbox/providers/registration_configuration_test.go
+++ b/services/core/internal/sandbox/providers/registration_configuration_test.go
@@ -2,6 +2,7 @@ package providers
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"reflect"
 	"testing"
@@ -14,7 +15,6 @@ import (
 // call through the nil embedded interfaces fails the test immediately.
 type registrationConfiguration struct {
 	sandbox.ConfigurationAdapter
-	sandbox.ConfigurationDiscoverer
 	requirements sandbox.ConfigurationRequirements
 }
 
@@ -22,17 +22,11 @@ func (a registrationConfiguration) Requirements() sandbox.ConfigurationRequireme
 	return a.requirements
 }
 
-// A declaration of Unsupported still requires an explicit rejection method.
-type missingConfigurationDiscovery struct{ sandbox.ConfigurationAdapter }
-
-func TestConfigurationRegistrationRejectsNilAndMissingDiscovery(t *testing.T) {
+func TestConfigurationRegistrationRejectsNil(t *testing.T) {
 	registry := Builtin()
 	a := registry.adapters["docker"]
 	var typedNil *registrationConfiguration
-	for _, configuration := range []sandbox.ConfigurationAdapter{
-		nil, typedNil, missingConfigurationDiscovery{a.Configuration},
-		missingConfigurationDiscovery{registry.adapters["e2b"].Configuration},
-	} {
+	for _, configuration := range []sandbox.ConfigurationAdapter{nil, typedNil} {
 		a.Configuration = configuration
 		if err := ValidateRegistration(a); !errors.Is(err, providercontract.ErrContract) {
 			t.Fatalf("%T: %v", configuration, err)
@@ -104,12 +98,7 @@ func TestConfigurationRequirementsDoNotInventDependencies(t *testing.T) {
 	}
 }
 
-type futureConfigurationDiscovery interface {
-	sandbox.ConfigurationDiscoverer
-	NextDiscovery(context.Context) error
-}
-
-func TestFutureConfigurationRequirementAndMethodNeedExplicitHandling(t *testing.T) {
+func TestFutureConfigurationRequirementNeedsExplicitHandling(t *testing.T) {
 	registry := Builtin()
 	original := registry.adapters["docker"].Configuration.Requirements()
 	fields := make([]reflect.StructField, 0, 4)
@@ -126,32 +115,85 @@ func TestFutureConfigurationRequirementAndMethodNeedExplicitHandling(t *testing.
 	if err := validateConfigurationRequirements(value); !errors.Is(err, providercontract.ErrContract) {
 		t.Fatal("new requirement silently inherited policy", err)
 	}
-	if err := validateConfigurationDiscoveryInterface(reflect.TypeFor[futureConfigurationDiscovery]()); !errors.Is(err, providercontract.ErrContract) {
-		t.Fatal("new discovery method inherited support", err)
-	}
 }
 
-func TestUnsupportedConfigurationDiscoveryMatchesAuthoredReason(t *testing.T) {
+func TestUnsupportedSetupOperationsMatchAuthoredReasons(t *testing.T) {
 	registry := Builtin()
 	for kind, a := range registry.adapters {
-		support := a.Configuration.Requirements().Discovery
-		if support.State != providercontract.Unsupported {
-			continue
+		requirements := a.Configuration.Requirements()
+		direct := sandbox.DirectConfig{Selection: sandbox.Selection{Provider: kind}}
+		discover := func(read func() (json.RawMessage, error)) func() error {
+			return func() error {
+				if result, err := read(); result != nil {
+					return errors.New("fabricated catalog")
+				} else {
+					return err
+				}
+			}
 		}
-		native := a.Configuration.(sandbox.ConfigurationDiscoverer)
-		for _, read := range []func() ([]byte, error){
-			func() ([]byte, error) {
-				return native.DiscoverConfiguration(t.Context(), sandbox.ConfigurationDiscoveryInput{}, sandbox.ProcessPaths{})
-			},
-			func() ([]byte, error) {
-				return registry.DiscoverConfiguration(t.Context(), kind, sandbox.ConfigurationDiscoveryInput{}, sandbox.ProcessPaths{})
-			},
+		for _, operation := range []struct {
+			name    string
+			support providercontract.Support
+			calls   []func() error
+		}{
+			{"DiscoverConfiguration", requirements.Discovery, []func() error{
+				discover(func() (json.RawMessage, error) {
+					return a.Configuration.DiscoverConfiguration(t.Context(), sandbox.ConfigurationDiscoveryInput{}, sandbox.ProcessPaths{})
+				}),
+				discover(func() (json.RawMessage, error) {
+					return registry.DiscoverConfiguration(t.Context(), kind, sandbox.ConfigurationDiscoveryInput{}, sandbox.ProcessPaths{})
+				}),
+			}},
+			{"DiscoverSelection", requirements.SelectionDiscovery, []func() error{
+				func() error { _, err := a.Configuration.DiscoverSelection(t.Context(), direct); return err },
+				func() error { _, err := registry.DiscoverSelection(t.Context(), direct); return err },
+			}},
+			{"VerifyCredential", requirements.CredentialVerification, []func() error{
+				func() error { return a.Configuration.VerifyCredential(t.Context(), direct, nil) },
+				func() error { return registry.VerifyCredential(t.Context(), direct, nil) },
+			}},
 		} {
-			result, err := read()
-			reason, valid := providercontract.UnsupportedReason(err, "DiscoverConfiguration")
-			if result != nil || !valid || reason != support.Reason {
-				t.Fatalf("%s: result=%v reason=%s err=%v", kind, result, reason, err)
+			if operation.support.State != providercontract.Unsupported {
+				continue
+			}
+			for _, call := range operation.calls {
+				err := call()
+				if reason, valid := providercontract.UnsupportedReason(err, operation.name); !valid || reason != operation.support.Reason {
+					t.Fatalf("%s %s: reason=%s err=%v", kind, operation.name, reason, err)
+				}
 			}
 		}
 	}
 }
+
+// contradictingConfiguration declares every setup operation Supported and then
+// reports each as Unsupported.
+type contradictingConfiguration struct{ registrationConfiguration }
+
+func (contradictingConfiguration) DiscoverConfiguration(context.Context, sandbox.ConfigurationDiscoveryInput, sandbox.ProcessPaths) (json.RawMessage, error) {
+	return nil, &providercontract.UnsupportedError{Operation: "DiscoverConfiguration", Reason: "not_ready"}
+}
+func (contradictingConfiguration) DiscoverSelection(context.Context, sandbox.DirectConfig) (sandbox.Selection, error) {
+	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: "not_ready"}
+}
+func (contradictingConfiguration) VerifyCredential(context.Context, sandbox.DirectConfig, []sandbox.Reference) error {
+	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: "not_ready"}
+}
+
+func TestSupportedSetupOperationsCannotReportUnsupported(t *testing.T) {
+	registry := Builtin()
+	a := registry.adapters["docker"]
+	requirements := a.Configuration.Requirements()
+	supported := providercontract.Support{State: providercontract.Supported}
+	requirements.Discovery, requirements.SelectionDiscovery, requirements.CredentialVerification = supported, supported, supported
+	a.Configuration = contradictingConfiguration{registrationConfiguration{requirements: requirements}}
+	registry.adapters["docker"] = a
+	direct := sandbox.DirectConfig{Selection: sandbox.Selection{Provider: "docker"}}
+	_, discoverErr := registry.DiscoverConfiguration(t.Context(), "docker", sandbox.ConfigurationDiscoveryInput{}, sandbox.ProcessPaths{})
+	_, selectionErr := registry.DiscoverSelection(t.Context(), direct)
+	for _, err := range []error{discoverErr, selectionErr, registry.VerifyCredential(t.Context(), direct, nil)} {
+		if !errors.Is(err, providercontract.ErrContract) || errors.Is(err, providercontract.ErrUnsupported) {
+			t.Fatal(err)
+		}
+	}
+}
diff --git a/services/core/internal/sandbox/providers/registration_test.go b/services/core/internal/sandbox/providers/registration_test.go
index 93eb5304b..f30c39072 100644
--- a/services/core/internal/sandbox/providers/registration_test.go
+++ b/services/core/internal/sandbox/providers/registration_test.go
@@ -38,7 +38,7 @@ func TestRegistrationRejectsBeforeCallbacksOrConstruction(t *testing.T) {
 		{"wrong local constructor", func(a *Adapter) { a.Mode = "direct" }},
 		{"missing direct constructor", func(a *Adapter) { a.Mode = "direct"; a.BuildLocal = nil }},
 		{"both constructors", func(a *Adapter) {
-			a.BuildDirect = func(DirectConfig) (sandbox.SandboxProvider, error) {
+			a.BuildDirect = func(sandbox.DirectConfig) (sandbox.SandboxProvider, error) {
 				t.Fatal("called direct constructor")
 				return nil, nil
 			}
@@ -47,7 +47,6 @@ func TestRegistrationRejectsBeforeCallbacksOrConstruction(t *testing.T) {
 		{"missing resource validator", func(a *Adapter) { a.ValidateResources = nil }},
 		{"missing configuration", func(a *Adapter) { a.Configuration = nil }},
 		{"typed nil configuration", func(a *Adapter) { var c *registrationConfiguration; a.Configuration = c }},
-		{"missing discovery implementation", func(a *Adapter) { a.Configuration = missingConfigurationDiscovery{a.Configuration} }},
 		{"missing configuration requirement", func(a *Adapter) { a.Configuration = registrationConfiguration{} }},
 		{"invalid credential requirement", func(a *Adapter) {
 			r := a.Configuration.Requirements()
@@ -100,7 +99,7 @@ func TestRegistrationRejectsBeforeCallbacksOrConstruction(t *testing.T) {
 					_, _, err := registry.Build(Config{Provider: kind, Generation: 1, InstallationID: uuid.NewString(), Specification: selection.DeploymentSpec}, LocalOptions{Standalone: true})
 					return err
 				}},
-				{"direct build", func() error { _, err := registry.BuildDirect(DirectConfig{Selection: selection}); return err }},
+				{"direct build", func() error { _, err := registry.BuildDirect(sandbox.DirectConfig{Selection: selection}); return err }},
 				{"binding", func() error { return ValidateBinding(a, &docker.Provider{}) }},
 				{"projection", func() error {
 					text, err := registry.PythonDeploymentContract()
@@ -152,12 +151,12 @@ func TestCompleteRegistrationsPreserveConstruction(t *testing.T) {
 	// Direct providers may legitimately need no remote credential or extra
 	// selection state; registration must not require irrelevant callback stubs.
 	a.Mode, a.BuildLocal, a.NodeArtifacts = "direct", nil, nil
-	a.BuildDirect = func(DirectConfig) (sandbox.SandboxProvider, error) {
+	a.BuildDirect = func(sandbox.DirectConfig) (sandbox.SandboxProvider, error) {
 		calls++
 		return &docker.Provider{}, nil
 	}
 	registry.adapters[kind] = a
-	p, err := registry.BuildDirect(DirectConfig{Selection: sandbox.Selection{Provider: kind}})
+	p, err := registry.BuildDirect(sandbox.DirectConfig{Selection: sandbox.Selection{Provider: kind}})
 	if err != nil || p == nil || calls != 2 {
 		t.Fatalf("credential-free direct build: %v calls=%d", err, calls)
 	}
diff --git a/services/core/internal/sandbox/providers/registry.go b/services/core/internal/sandbox/providers/registry.go
index ab92077b5..29bb86b4f 100644
--- a/services/core/internal/sandbox/providers/registry.go
+++ b/services/core/internal/sandbox/providers/registry.go
@@ -21,7 +21,7 @@ type Adapter struct {
 	Policy                        sandbox.DeploymentPolicy
 	Configuration                 sandbox.ConfigurationAdapter
 	BuildLocal                    func(Config, LocalOptions, *Built) (func(), error)
-	BuildDirect                   func(DirectConfig) (sandbox.SandboxProvider, error)
+	BuildDirect                   func(sandbox.DirectConfig) (sandbox.SandboxProvider, error)
 	Mode                          string
 	Operations                    func() providercontract.Operations
 	IdleSeconds, RetentionSeconds int64
@@ -56,7 +56,7 @@ func Builtin() *Registry {
 			Configuration: nodeConfigurationAdapter{microsandbox.ValidateSpecification},
 		},
 		"e2b": {
-			Policy: e2b.Policy(), Operations: e2b.Operations, Mode: "direct", BuildDirect: buildE2B,
+			Policy: e2b.Policy(), Operations: e2b.Operations, Mode: "direct", BuildDirect: e2b.BuildDirect,
 			Configuration:         e2b.ConfigurationAdapter{},
 			ValidateSpecification: e2b.ValidateSpecification, ValidateResources: e2b.ValidateResources,
 		},
@@ -75,6 +75,25 @@ func (r *Registry) Lookup(kind string) (Adapter, error) {
 	return a, nil
 }
 
+// BuildDirect builds a direct-mode Provider and validates its binding.
+func (r *Registry) BuildDirect(c sandbox.DirectConfig) (sandbox.SandboxProvider, error) {
+	a, e := r.Lookup(c.Selection.Provider)
+	if e != nil {
+		return nil, e
+	}
+	if a.BuildDirect == nil {
+		return nil, sandbox.ErrInvalid
+	}
+	p, err := a.BuildDirect(c)
+	if err != nil {
+		return nil, err
+	}
+	if err := ValidateBinding(a, p); err != nil {
+		return nil, err
+	}
+	return p, nil
+}
+
 // SupportsCheckpoint reports whether the provider declares checkpoint suspension.
 func (r *Registry) SupportsCheckpoint(kind string) (bool, error) {
 	a, err := r.Lookup(kind)
diff --git a/services/core/internal/sandbox/sandbox_provider.go b/services/core/internal/sandbox/sandbox_provider.go
index 663526b8e..aac367557 100644
--- a/services/core/internal/sandbox/sandbox_provider.go
+++ b/services/core/internal/sandbox/sandbox_provider.go
@@ -1,27 +1,36 @@
 // Package sandbox defines the Sandbox Provider contract for authorized compute.
-// Start at sandbox_provider.go and docs/sandbox-provider.md when adding an adapter.
+// This file is the Core–Sandbox Provider protocol; docs/sandbox-provider.md
+// describes it. Start here when adding an adapter. Value types that Core also
+// uses beyond this boundary, such as DeploymentSpec and CallFence, live in their
+// own files of this package.
 // Core owns durable Environment/allocation state and lifecycle serialization;
 // SandboxProvider owns compute and bootstrap, Runtime owns capability preparation,
 // and Harness adapters own native execution. Compute running is not execution ready.
 //
-// Required operations are on SandboxProvider. CheckpointProvider and runtimeobs
-// observation remain separate small interfaces. Every registered adapter explicitly
-// declares and implements each operation, including safe Unsupported rejections.
-// Method-set presence never means an extension is supported. ValidateProvider and
-// the common contract tests check declaration completeness and implementation.
+// The protocol has two interfaces. SandboxProvider is the allocation-time half
+// and ConfigurationAdapter the setup-time half. Every adapter implements every
+// method of both and declares which operations it supports: SandboxProvider
+// through ProviderOperations, ConfigurationAdapter through Requirements. An
+// unsupported method returns a typed providercontract.UnsupportedError; method-set
+// presence never means support.
 //
-// Registration is explicit construction, not a global init-time registry. Node-local
-// adapters register in sandbox/providers; Core's managed setup
-// constructs direct adapters or node proxies. execution.RuntimeProvider binds the
-// selected adapter to installation, backend, deployment generation and node identity.
-// Keep vendor configuration at those construction boundaries; common lifecycle code
-// selects behavior through these contracts, never through a vendor name.
+// Registration is explicit construction, not a global init-time registry. Adapters
+// register in sandbox/providers; Core's managed setup constructs direct adapters
+// or node proxies. execution.RuntimeProvider binds the selected adapter to
+// installation, backend, deployment generation and node identity. Keep vendor
+// configuration at those construction boundaries; common lifecycle code selects
+// behavior through these contracts, never through a vendor name.
 package sandbox
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
+	"fmt"
+	"reflect"
+
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 )
 
 var (
@@ -30,6 +39,9 @@ var (
 	ErrExists             = errors.New("sandbox allocation already exists")
 	ErrNotFound           = errors.New("sandbox allocation not found")
 	ErrCommandUnconfirmed = errors.New("initialization command outcome unconfirmed; reclaim allocation before reuse")
+	// ErrComputeUnconfirmed requires observation of the retained operation identity;
+	// it does not authorize another Create, capture, restore, or cold start.
+	ErrComputeUnconfirmed = errors.New("sandbox lifecycle outcome unconfirmed")
 )
 
 // Reference must be persisted by the caller before Create. AllocationID is a fresh
@@ -90,12 +102,9 @@ type SandboxProvider interface {
 	// idempotent, but nil alone cannot settle an outstanding Create.
 	Kill(context.Context, Reference) error
 	RunCommand(context.Context, Reference, Command) (CommandResult, error)
-}
 
-// CheckpointProvider is an explicitly declared extension. It supplies
-// exact-incarnation operations; Worker and Store remain the lifecycle owner.
-type CheckpointProvider interface {
-	SandboxProvider
+	// The checkpoint lifecycle supplies exact-incarnation operations; Worker and
+	// Store remain the lifecycle owner. Its operations share one declaration.
 	Initial(context.Context, Reference) (Compute, error)
 	NewCompute(context.Context, Reference, uint64, *SnapshotIdentity) (Compute, error)
 	GetCompute(context.Context, Reference, Compute) (ComputeState, error)
@@ -106,6 +115,111 @@ type CheckpointProvider interface {
 	RunCommandCompute(context.Context, Reference, Compute, Command) (CommandResult, error)
 	// ResumeCompute thaws only the same resident instance after an aborted pause.
 	ResumeCompute(context.Context, Reference, Compute) (ComputeState, error)
+
+	// Observe reads one owned Runtime instance after verifying its ownership. It
+	// never renews, restarts or stops compute.
+	Observe(context.Context, runtimeobs.Target) (runtimeobs.Sample, error)
+}
+
+// requiredOperations are supported by every Provider.
+var requiredOperations = []string{"Create", "GetInfo", "Renew", "Kill", "RunCommand"}
+
+// checkpointOperations are all supported or all unsupported: partial cleanup or
+// restore support cannot safely own a compute incarnation.
+var checkpointOperations = []string{"Initial", "NewCompute", "GetCompute", "Suspend", "Resume", "KillCompute", "DeleteSnapshot", "RunCommandCompute", "ResumeCompute"}
+
+// Compute identifies one incarnation of an allocation. Name is provider-derived.
+// ID is empty only until the original create or restore result is observed.
+type Compute struct {
+	Generation   uint64
+	Name         string
+	ID           string
+	RestoredFrom *SnapshotIdentity
+}
+
+// SnapshotIdentity is provider evidence from a verified full snapshot. Core
+// persists it unchanged and records consumption separately; it never invents
+// paths, checksums, native checkpoint fields, or source identity.
+type SnapshotIdentity struct {
+	Reference        string
+	ID               string
+	Digest           string
+	CheckpointID     string
+	CheckpointRoot   string
+	OperationID      string
+	SourceGeneration uint64
+	SourceName       string
+	SourceID         string
+}
+
+type ComputeState struct {
+	Compute           Compute
+	Status            string
+	BootstrapComplete bool
+	Snapshot          *SnapshotIdentity
+	SourceStopped     bool
+}
+type SuspendRequest struct {
+	Reference   Reference
+	OperationID string
+	Source      Compute
+	Snapshot    *SnapshotIdentity
+	// Recovery observes the previous attempt and never starts a new capture.
+	ObserveOnly bool
+}
+type ResumeRequest struct {
+	Reference   Reference
+	OperationID string
+	Snapshot    SnapshotIdentity
+	Target      Compute
+	// Recovery observes the previous target and never starts a new restore.
+	ObserveOnly bool
+}
+
+// ValidateProvider checks a constructed Provider's declaration.
+func ValidateProvider(p SandboxProvider) error {
+	if p == nil {
+		return providercontract.ErrContract
+	}
+	if value := reflect.ValueOf(p); value.Kind() == reflect.Pointer && value.IsNil() {
+		return providercontract.ErrContract
+	}
+	return ValidateOperations(p.ProviderOperations())
+}
+
+// ValidateOperations rejects omitted, unknown and contradictory declarations.
+// SandboxProvider's method set is the operation inventory.
+func ValidateOperations(operations providercontract.Operations) error {
+	contract := reflect.TypeFor[SandboxProvider]()
+	for i := range contract.NumMethod() {
+		name := contract.Method(i).Name
+		if name == "ProviderOperations" {
+			continue
+		}
+		if err := operations[name].Check(name); err != nil && !errors.Is(err, providercontract.ErrUnsupported) {
+			return err
+		}
+	}
+	for name := range operations {
+		if _, known := contract.MethodByName(name); !known || name == "ProviderOperations" {
+			return fmt.Errorf("%w: unknown operation %s", providercontract.ErrContract, name)
+		}
+	}
+	for _, name := range requiredOperations {
+		if operations[name].State != providercontract.Supported {
+			return fmt.Errorf("%w: required operation %s", providercontract.ErrContract, name)
+		}
+	}
+	for _, name := range checkpointOperations {
+		if operations[name].State != operations["Initial"].State {
+			return fmt.Errorf("%w: incomplete checkpoint lifecycle", providercontract.ErrContract)
+		}
+	}
+	return nil
+}
+
+func SupportsCheckpoint(p SandboxProvider) bool {
+	return providercontract.Require(p, "Initial") == nil
 }
 
 // ProcessPaths locates installed adapter helpers and their private state. The
@@ -114,3 +228,123 @@ type ProcessPaths struct {
 	ArtifactRoot string
 	StateRoot    string
 }
+
+// Requirement has no implicit default: registration must choose either value.
+type Requirement string
+
+const (
+	Required    Requirement = "required"
+	NotRequired Requirement = "not_required"
+)
+
+// ConfigurationRequirements is the setup-time declaration. Discovery,
+// SelectionDiscovery and CredentialVerification declare DiscoverConfiguration,
+// DiscoverSelection and VerifyCredential; requiring a credential does not
+// promise VerifyCredential.
+type ConfigurationRequirements struct {
+	Credential             Requirement
+	PublicOrigin           Requirement
+	Discovery              providercontract.Support
+	SelectionDiscovery     providercontract.Support
+	CredentialVerification providercontract.Support
+}
+
+// Configuration is an adapter-owned typed value, never a request or response DTO.
+// Implementations must exclude secrets from JSON and safe diagnostic output.
+type Configuration interface {
+	HasCredential() bool
+	ReplacesCredential() bool
+}
+
+// ConfigurationRecord separates public selectors, read-only observations and
+// secret bytes. Store encrypts Secret with the installation and generation.
+// Only adapter codecs may produce Public and Metadata; neither is input passthrough.
+type ConfigurationRecord struct {
+	Public   json.RawMessage
+	Metadata json.RawMessage
+	Secret   []byte `json:"-"`
+}
+
+// Selection is the typed deployment configuration shared by preview and commit.
+type Selection struct {
+	DeploymentSpec
+	ExpectedGeneration uint64        `json:"expected_generation"`
+	Provider           string        `json:"provider"`
+	Configuration      Configuration `json:"-"`
+}
+
+func (s Selection) HasCredential() bool {
+	return s.Configuration != nil && s.Configuration.HasCredential()
+}
+
+func (s Selection) ReplacesCredential() bool {
+	return s.Configuration != nil && s.Configuration.ReplacesCredential()
+}
+
+// DirectConfig constructs a direct adapter for one selection. Fence counts the
+// adapter's helper processes so that a credential commit waits for them.
+type DirectConfig struct {
+	ProcessPaths   ProcessPaths
+	InstallationID string
+	Selection      Selection
+	Fence          *CallFence
+}
+
+// ConfigurationDiscoveryInput is a transient read-only request. Query is typed
+// and validated by the adapter; it cannot select a compute mutation.
+type ConfigurationDiscoveryInput struct {
+	Configuration json.RawMessage `json:"configuration" swaggertype:"object"`
+	Credential    json.RawMessage `json:"credential" swaggertype:"object"`
+	Query         json.RawMessage `json:"query" swaggertype:"object"`
+}
+
+// ConfigurationAdapter owns all interpretation of provider configuration.
+// Decode loads retained ownership without remote discovery or new-build admission.
+// Normalize validates a candidate; ResolveChange first applies omitted-field
+// inheritance, then normalizes. Equal compares normalized identity, excluding
+// discovery metadata and explicit credential-submission intent.
+//
+// The three setup operations are read-only native calls, separate from compute
+// and candidate admission. Each builds its own native client from its input.
+type ConfigurationAdapter interface {
+	Requirements() ConfigurationRequirements
+	DecodeInput(public, credential json.RawMessage) (Configuration, error)
+	Encode(Configuration) (ConfigurationRecord, error)
+	Decode(ConfigurationRecord) (Configuration, error)
+	Normalize(Selection) (Selection, error)
+	ResolveChange(next, previous Selection) (Selection, error)
+	WithCredential(owner, candidate Configuration) (Configuration, error)
+	Equal(a, b Configuration) (bool, error)
+	// DiscoverConfiguration lists the native catalog a credential can use,
+	// without a saved deployment.
+	DiscoverConfiguration(context.Context, ConfigurationDiscoveryInput, ProcessPaths) (json.RawMessage, error)
+	// DiscoverSelection resolves a candidate's omitted native values before
+	// commit. Loading retained ownership never calls it.
+	DiscoverSelection(context.Context, DirectConfig) (Selection, error)
+	// VerifyCredential verifies access to already owned resources without
+	// mutation. Replacing a credential requires it and a shared CallFence.
+	VerifyCredential(context.Context, DirectConfig, []Reference) error
+}
+
+// ConfigurationError is a fixed safe diagnostic, never SDK text or submitted data.
+// Class describes the request outcome; it does not authorize replay.
+type ConfigurationError struct {
+	Class                ConfigurationErrorClass
+	Code, Param, Message string
+}
+type ConfigurationErrorClass string
+
+const (
+	ConfigurationInvalid     ConfigurationErrorClass = "invalid"
+	ConfigurationConflict    ConfigurationErrorClass = "conflict"
+	ConfigurationUnconfirmed ConfigurationErrorClass = "unconfirmed"
+)
+
+func (e *ConfigurationError) Error() string { return e.Message }
+
+var (
+	ErrCredentialRejected       = &ConfigurationError{ConfigurationInvalid, "sandbox_credential_invalid", "credential", "The sandbox provider credential was rejected."}
+	ErrCredentialOwnership      = &ConfigurationError{ConfigurationConflict, "sandbox_credential_ownership", "credential", "The credential cannot manage the retained deployment. Reset before changing accounts."}
+	ErrConfigurationUnconfirmed = &ConfigurationError{ConfigurationUnconfirmed, "sandbox_verification_unconfirmed", "", "Sandbox provider verification could not be confirmed."}
+	ErrConfigurationSelection   = &ConfigurationError{ConfigurationInvalid, "sandbox_configuration_invalid", "configuration", "Select a ready immutable provider configuration with matching resources."}
+)
diff --git a/services/core/internal/sandbox/sandbox_provider_test.go b/services/core/internal/sandbox/sandbox_provider_test.go
new file mode 100644
index 000000000..56c23b330
--- /dev/null
+++ b/services/core/internal/sandbox/sandbox_provider_test.go
@@ -0,0 +1,24 @@
+package sandbox
+
+import (
+	"reflect"
+	"slices"
+	"testing"
+)
+
+// The operation groups partition SandboxProvider's operations, so a new method
+// cannot escape the required or all-or-nothing checkpoint checks.
+func TestOperationGroupsPartitionTheInterface(t *testing.T) {
+	contract := reflect.TypeFor[SandboxProvider]()
+	var methods []string
+	for i := range contract.NumMethod() {
+		if name := contract.Method(i).Name; name != "ProviderOperations" {
+			methods = append(methods, name)
+		}
+	}
+	groups := slices.Concat(requiredOperations, checkpointOperations, []string{"Observe"})
+	slices.Sort(groups)
+	if !slices.Equal(methods, groups) {
+		t.Fatalf("SandboxProvider operations %v, groups %v", methods, groups)
+	}
+}
diff --git a/services/core/internal/sandbox/selection.go b/services/core/internal/sandbox/selection.go
deleted file mode 100644
index 65fede7d2..000000000
--- a/services/core/internal/sandbox/selection.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package sandbox
-
-import "context"
-
-// Selection is the typed deployment configuration shared by preview and commit.
-type Selection struct {
-	DeploymentSpec
-	ExpectedGeneration uint64        `json:"expected_generation"`
-	Provider           string        `json:"provider"`
-	Configuration      Configuration `json:"-"`
-}
-
-func (s Selection) HasCredential() bool {
-	return s.Configuration != nil && s.Configuration.HasCredential()
-}
-
-func (s Selection) ReplacesCredential() bool {
-	return s.Configuration != nil && s.Configuration.ReplacesCredential()
-}
-
-// SelectionDiscoverer is an optional read-only native configuration capability.
-// It resolves candidate configuration; loading retained ownership never calls it.
-type SelectionDiscoverer interface {
-	DiscoverSelection(context.Context, Selection) (Selection, error)
-}
-
-// CredentialVerifier verifies access to already owned resources without mutation.
-// Replacing credentials requires this capability and a shared CallFence.
-type CredentialVerifier interface {
-	VerifyCredential(context.Context, []Reference) error
-}
diff --git a/services/core/internal/sandbox/suspension.go b/services/core/internal/sandbox/suspension.go
deleted file mode 100644
index 5a600a877..000000000
--- a/services/core/internal/sandbox/suspension.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package sandbox
-
-import (
-	"errors"
-)
-
-// ErrComputeUnconfirmed requires observation of the retained operation identity;
-// it does not authorize another Create, capture, restore, or cold start.
-var ErrComputeUnconfirmed = errors.New("sandbox lifecycle outcome unconfirmed")
-
-// Compute identifies one incarnation of an allocation. Name is provider-derived.
-// ID is empty only until the original create or restore result is observed.
-type Compute struct {
-	Generation   uint64
-	Name         string
-	ID           string
-	RestoredFrom *SnapshotIdentity
-}
-
-// SnapshotIdentity is provider evidence from a verified full snapshot. Core
-// persists it unchanged and records consumption separately; it never invents
-// paths, checksums, native checkpoint fields, or source identity.
-type SnapshotIdentity struct {
-	Reference        string
-	ID               string
-	Digest           string
-	CheckpointID     string
-	CheckpointRoot   string
-	OperationID      string
-	SourceGeneration uint64
-	SourceName       string
-	SourceID         string
-}
-
-type ComputeState struct {
-	Compute           Compute
-	Status            string
-	BootstrapComplete bool
-	Snapshot          *SnapshotIdentity
-	SourceStopped     bool
-}
-type SuspendRequest struct {
-	Reference   Reference
-	OperationID string
-	Source      Compute
-	Snapshot    *SnapshotIdentity
-	// Recovery observes the previous attempt and never starts a new capture.
-	ObserveOnly bool
-}
-type ResumeRequest struct {
-	Reference   Reference
-	OperationID string
-	Snapshot    SnapshotIdentity
-	Target      Compute
-	// Recovery observes the previous target and never starts a new restore.
-	ObserveOnly bool
-}
diff --git a/services/core/tests/integration/provider_operations_fixture_test.go b/services/core/tests/integration/provider_operations_fixture_test.go
index 383fde08d..f528d5ae0 100644
--- a/services/core/tests/integration/provider_operations_fixture_test.go
+++ b/services/core/tests/integration/provider_operations_fixture_test.go
@@ -10,26 +10,21 @@ import (
 
 func (*lifecycleProvider) ProviderOperations() providercontract.Operations {
 	return providercontract.Operations{
-		"Create":                   {State: providercontract.Supported},
-		"GetInfo":                  {State: providercontract.Supported},
-		"Renew":                    {State: providercontract.Supported},
-		"Kill":                     {State: providercontract.Supported},
-		"RunCommand":               {State: providercontract.Supported},
-		"Initial":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"NewCompute":               {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"GetCompute":               {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"Suspend":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"Resume":                   {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"KillCompute":              {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DeleteSnapshot":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"RunCommandCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ResumeCompute":            {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ObservationProviderType":  {State: providercontract.Supported},
-		"ResolveObservationSource": {State: providercontract.Supported},
-		"Observe":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ObserveBatch":             {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DiscoverSelection":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"VerifyCredential":         {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Create":            {State: providercontract.Supported},
+		"GetInfo":           {State: providercontract.Supported},
+		"Renew":             {State: providercontract.Supported},
+		"Kill":              {State: providercontract.Supported},
+		"RunCommand":        {State: providercontract.Supported},
+		"Initial":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"NewCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"GetCompute":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Suspend":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Resume":            {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"KillCompute":       {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"DeleteSnapshot":    {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"RunCommandCompute": {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"ResumeCompute":     {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Observe":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
 	}
 }
 func (*lifecycleProvider) Initial(context.Context, sandbox.Reference) (sandbox.Compute, error) {
@@ -62,46 +57,22 @@ func (*lifecycleProvider) ResumeCompute(context.Context, sandbox.Reference, sand
 func (*lifecycleProvider) Observe(context.Context, runtimeobs.Target) (runtimeobs.Sample, error) {
 	return runtimeobs.Sample{}, &providercontract.UnsupportedError{Operation: "Observe", Reason: "fixture_operation_not_supported"}
 }
-func (*lifecycleProvider) ObserveBatch(context.Context, []runtimeobs.Target) ([]runtimeobs.BatchResult, error) {
-	return nil, &providercontract.UnsupportedError{Operation: "ObserveBatch", Reason: "fixture_operation_not_supported"}
-}
-func (*lifecycleProvider) DiscoverSelection(context.Context, sandbox.Selection) (sandbox.Selection, error) {
-	return sandbox.Selection{}, &providercontract.UnsupportedError{Operation: "DiscoverSelection", Reason: "fixture_operation_not_supported"}
-}
-func (*lifecycleProvider) VerifyCredential(context.Context, []sandbox.Reference) error {
-	return &providercontract.UnsupportedError{Operation: "VerifyCredential", Reason: "fixture_operation_not_supported"}
-}
 func (*fakeCheckpointProvider) ProviderOperations() providercontract.Operations {
 	return providercontract.Operations{
-		"Create":                   {State: providercontract.Supported},
-		"GetInfo":                  {State: providercontract.Supported},
-		"Renew":                    {State: providercontract.Supported},
-		"Kill":                     {State: providercontract.Supported},
-		"RunCommand":               {State: providercontract.Supported},
-		"Initial":                  {State: providercontract.Supported},
-		"NewCompute":               {State: providercontract.Supported},
-		"GetCompute":               {State: providercontract.Supported},
-		"Suspend":                  {State: providercontract.Supported},
-		"Resume":                   {State: providercontract.Supported},
-		"KillCompute":              {State: providercontract.Supported},
-		"DeleteSnapshot":           {State: providercontract.Supported},
-		"RunCommandCompute":        {State: providercontract.Supported},
-		"ResumeCompute":            {State: providercontract.Supported},
-		"ObservationProviderType":  {State: providercontract.Supported},
-		"ResolveObservationSource": {State: providercontract.Supported},
-		"Observe":                  {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"ObserveBatch":             {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"DiscoverSelection":        {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
-		"VerifyCredential":         {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
+		"Create":            {State: providercontract.Supported},
+		"GetInfo":           {State: providercontract.Supported},
+		"Renew":             {State: providercontract.Supported},
+		"Kill":              {State: providercontract.Supported},
+		"RunCommand":        {State: providercontract.Supported},
+		"Initial":           {State: providercontract.Supported},
+		"NewCompute":        {State: providercontract.Supported},
+		"GetCompute":        {State: providercontract.Supported},
+		"Suspend":           {State: providercontract.Supported},
+		"Resume":            {State: providercontract.Supported},
+		"KillCompute":       {State: providercontract.Supported},
+		"DeleteSnapshot":    {State: providercontract.Supported},
+		"RunCommandCompute": {State: providercontract.Supported},
+		"ResumeCompute":     {State: providercontract.Supported},
+		"Observe":           {State: providercontract.Unsupported, Reason: "fixture_operation_not_supported"},
 	}
 }
-
-func (*lifecycleProvider) ObservationProviderType() string { return "fixture" }
-func (p *lifecycleProvider) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
-
-func (*fakeCheckpointProvider) ObservationProviderType() string { return "fixture" }
-func (p *fakeCheckpointProvider) ResolveObservationSource(context.Context) (runtimeobs.Source, error) {
-	return p, nil
-}
diff --git a/services/core/tools/e2b-provider/README.md b/services/core/tools/e2b-provider/README.md
index 34bb368cb..1e7588c76 100644
--- a/services/core/tools/e2b-provider/README.md
+++ b/services/core/tools/e2b-provider/README.md
@@ -19,14 +19,14 @@ The account key is stored encrypted in Core's database and is write-only. It rea
 | `command` | `RunCommand` | Runs one bounded command as the Runtime user on a running sandbox whose bootstrap completed; output is limited to 1 MiB per stream |
 | `validate_deployment` | Deployment setup | Reads the template's builds and requires the exact build to be ready with the configured CPU and memory. Without configured resources the selection adopts the build's CPU and memory. Returns the build's status, CPU, memory and reported disk for Core to record; bounded to 30 seconds |
 | `list_templates`, `list_builds` | [Configuration discovery](../../../../contracts/agents-api/sandbox-deployment.md#configuration-discovery) | Pages the key's visible templates (`GET /v2/templates`) or one template's ready builds, with a transient key. Results are capped at 200 and write no receipt |
-| `observe` | Runtime observations | Up to 100 allocations; see [Observations](#observations) |
+| `observe` | Runtime observations | One allocation; see [Observations](#observations) |
 | `verify_credential` | E2B key replacement | Up to 32 allocation references; see [Credential verification](#credential-verification) |
 
 Compatible endpoints must return the SDK 2.51.0 template-list and template-build response models; the helper does not adapt other catalog shapes. E2B has no independently configurable disk limit, and sandbox inspection does not expose a build ID: build provenance comes from the validated create selector.
 
 ## Private JSON boundary
 
-[`helper_contract.go`](../../internal/sandbox/e2b/helper_contract.go) owns the adapter-private wire types, version, operation and error vocabulary, and bounds. Its generator projects Python declarations into the helper and template sources, deriving managed-bootstrap fields from the Sandbox Provider types, network access values from `agentnetwork.Policy.Validate`, and the SDK version from the hashed dependency lock. The command-input and observation limits come from their shared Go contracts. The generated modules have no SDK or repository dependency and ship with the frozen helper and protected template startup scripts.
+[`helper_contract.go`](../../internal/sandbox/e2b/helper_contract.go) owns the adapter-private wire types, version, operation and error vocabulary, and bounds. Its generator projects Python declarations into the helper and template sources, deriving managed-bootstrap fields from the Sandbox Provider types, network access values from `agentnetwork.Policy.Validate`, and the SDK version from the hashed dependency lock. The command-input limit comes from its shared Go contract. The generated modules have no SDK or repository dependency and ship with the frozen helper and protected template startup scripts.
 
 Run `go generate ./services/core/internal/sandbox/e2b` from the repository root after changing these declarations. `make check-e2b-provider` and the Go adapter tests reject stale projections; both languages consume generated valid and invalid exchanges covering wire types, extra fields, operation/reference bounds and managed-bootstrap fields. The helper build copies those fixtures with its source before running the pinned-SDK suite.
 
@@ -56,7 +56,7 @@ Inspection uses SDK metadata and ID reads only. SDK `connect` is never used beca
 
 ## Observations
 
-`observe` reads each allocation's sandbox ID from its receipt without taking the allocation lock. It then runs one `GET /sandboxes/metrics` request and one labelled listing of the installation's running sandboxes concurrently, within the caller's deadline; the listing stops once every requested sandbox has appeared. Only a sandbox that the listing confirms for exactly that allocation is reported, with the listing's start time. A malformed metrics point makes only its row unavailable. Observation never connects to, renews or changes a sandbox and writes no receipt. [Runtime observability](../../../../contracts/agents-api/runtime-observability.md) owns the field mapping.
+`observe` reads the allocation's sandbox ID from its receipt without taking the allocation lock. It then runs one `GET /sandboxes/metrics` request for that sandbox and one listing of running sandboxes with the allocation's labels concurrently, within the caller's deadline; the listing stops once the sandbox has appeared. Only a sandbox that the listing confirms for exactly that allocation is reported, with the listing's start time. A malformed metrics point is unavailable. Observation never connects to, renews or changes a sandbox and writes no receipt. [Runtime observability](../../../../contracts/agents-api/runtime-observability.md) owns the field mapping.
 
 ## Credential verification
 
diff --git a/services/core/tools/e2b-provider/deployment_test.py b/services/core/tools/e2b-provider/deployment_test.py
index 4008a4616..27601bbf8 100644
--- a/services/core/tools/e2b-provider/deployment_test.py
+++ b/services/core/tools/e2b-provider/deployment_test.py
@@ -66,7 +66,7 @@ def test_custom_endpoint_reaches_metrics_client(self, metrics, client):
         self.config.update(APIURL='https://sandbox-test.sandbase.ai', Domain='sandbox-test.sandbase.ai')
         metrics.return_value = SimpleNamespace(status_code=503, parsed=None)
         with self.assertRaises(Failure):
-            read_metrics(self.config, ['owned-id'], lambda: 5)
+            read_metrics(self.config, 'owned-id', lambda: 5)
         configuration = client.call_args.args[0]
         self.assertEqual((configuration.api_url, configuration.domain),
                          (self.config['APIURL'], self.config['Domain']))
diff --git a/services/core/tools/e2b-provider/helper_contract_generated.py b/services/core/tools/e2b-provider/helper_contract_generated.py
index ebd7fadf2..04d6c13b3 100644
--- a/services/core/tools/e2b-provider/helper_contract_generated.py
+++ b/services/core/tools/e2b-provider/helper_contract_generated.py
@@ -5,7 +5,6 @@
 MANAGED_IDENTITY_FIELDS = ["TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","InstallationID"]
 MAX_COMMAND_INPUT = 52428832
 MAX_CREDENTIAL_REFERENCES = 32
-MAX_OBSERVATION_REFERENCES = 100
 MAX_OUTPUT = 1048576
 MAX_REQUEST = 75497472
 MAX_RESPONSE = 16777216
@@ -14,5 +13,5 @@
 PROTOCOL_VERSION = 1
 REFERENCE_FIELDS = ["TenantID","EnvironmentID","AllocationID"]
 REQUEST_FIELDS = ["Version","Operation","Config","Reference","References","Bootstrap","RuntimeBootstrap","Command","Deadline"]
-RESPONSE_FIELDS = ["Version","Info","Command","ErrorCode","DeploymentValid","TemplateBuild","Templates","Builds","Observations"]
+RESPONSE_FIELDS = ["Version","Info","Command","ErrorCode","DeploymentValid","TemplateBuild","Templates","Builds","Observation"]
 SDK_VERSION = "2.51.0"
diff --git a/services/core/tools/e2b-provider/observation_test.py b/services/core/tools/e2b-provider/observation_test.py
index eb9c09a89..ef204d6d7 100644
--- a/services/core/tools/e2b-provider/observation_test.py
+++ b/services/core/tools/e2b-provider/observation_test.py
@@ -1,4 +1,4 @@
-"""Read-only batch observation; live metrics qualification remains separate."""
+"""Read-only observation; live metrics qualification remains separate."""
 from datetime import datetime, timezone
 from types import SimpleNamespace
 from unittest.mock import patch
@@ -10,9 +10,8 @@
 
 
 class ObservationTest(ProviderTest):
-    def observe(self, references):
-        request = dict(self.request, Operation='observe', References=references,
-                       Reference={key: '' for key in self.reference})
+    def observe(self, reference=None):
+        request = dict(self.request, Operation='observe', Reference=reference or self.reference)
         try:
             return Provider(request).execute()
         except Failure as error:
@@ -30,51 +29,47 @@ def next_items(**options):
         self.api.list.return_value = paginator
         return paginator
 
-    def test_one_metrics_request_maps_owned_running_sandboxes(self):
+    def test_one_metrics_request_maps_the_owned_running_sandbox(self):
         self.assertEqual(self.call('create')['ErrorCode'], '')
         self.cloud.started_at = datetime(2026, 9, 25, 10, 31, 34, tzinfo=timezone.utc)
         other = SimpleNamespace(sandbox_id='other-id', metadata={'oac_installationid': self.config['InstallationID']})
         paginator = self.listing([other, self.cloud], [other])
-        stopped = {key: str(uuid4()) for key in self.reference}
         point = {'cpuCount': 2, 'cpuUsedPct': 19.55, 'memUsed': 183836672, 'memTotal': 2079141888,
                  'memCache': 1, 'diskUsed': 1593188352, 'diskTotal': 23511863296,
                  'timestamp': '2026-09-25T10:31:36.667115804Z', 'timestampUnix': 1790332296}
-        with patch('provider.read_metrics', return_value={'owned-id': point}) as metrics, \
+        with patch('provider.read_metrics', return_value=point) as metrics, \
                 patch('provider.Receipt') as receipt:
-            result = self.observe([self.reference, stopped])
+            result = self.observe()
         self.assertEqual(result['ErrorCode'], '')
         metrics.assert_called_once()
-        self.assertEqual(metrics.call_args.args[1], ['owned-id'])
+        self.assertEqual(metrics.call_args.args[1], 'owned-id')
         receipt.assert_not_called()
         self.api.connect.assert_not_called()
         self.api.set_timeout.assert_not_called()
-        self.assertEqual(self.api.list.call_args.kwargs['query'].metadata,
-                         {'oac_installationid': self.config['InstallationID']})
-        owned, missing = result['Observations']
-        self.assertEqual(owned, dict(self.reference, Status='observed',
+        self.assertEqual(self.api.list.call_args.kwargs['query'].metadata, self.cloud.metadata)
+        self.assertEqual(result['Observation'], dict(Status='observed',
                                      ObservedAt='2026-09-25T10:31:36.667115+00:00',
                                      StartedAt='2026-09-25T10:31:34+00:00', CPUCount=2, CPUUsedPct=19.55,
                                      MemUsed=183836672, MemTotal=2079141888,
                                      DiskUsed=1593188352, DiskTotal=23511863296))
-        self.assertEqual(missing, dict(stopped, Status='unavailable'))
-        self.assertEqual(paginator.reads, 1, 'listing continued after every receipt sandbox was found')
+        self.assertEqual(paginator.reads, 1, 'listing continued after the receipt sandbox was found')
+        stopped = {key: str(uuid4()) for key in self.reference}
+        self.assertEqual(self.observe(stopped)['Observation'], {'Status': 'unavailable'})
 
         del point['diskUsed']
         point['memTotal'] = -1
-        with patch('provider.read_metrics', return_value={'owned-id': point}):
+        with patch('provider.read_metrics', return_value=point):
             self.listing([self.cloud])
-            self.assertEqual(self.observe([self.reference])['Observations'], [dict(self.reference, Status='unavailable')])
+            self.assertEqual(self.observe()['Observation'], {'Status': 'unavailable'})
         point['memTotal'] = 2079141888
-        with patch('provider.read_metrics', return_value={'owned-id': point}):
+        with patch('provider.read_metrics', return_value=point):
             self.listing([self.cloud])
-            row = self.observe([self.reference])['Observations'][0]
+            row = self.observe()['Observation']
         self.assertEqual((row['Status'], row['DiskUsed'], row['DiskTotal']), ('observed', None, None))
 
-    def test_absent_listing_is_not_running_and_rejects_oversized_batches(self):
+    def test_absent_listing_is_not_running(self):
         self.assertEqual(self.call('create')['ErrorCode'], '')
         self.listing([])
-        with patch('provider.read_metrics', return_value={}):
-            result = self.observe([self.reference])
-        self.assertEqual(result['Observations'], [dict(self.reference, Status='not_running')])
-        references = [{key: str(uuid4()) for key in self.reference} for _ in range(101)]
-        self.assertEqual(self.observe(references)['ErrorCode'], 'invalid')
+        with patch('provider.read_metrics', return_value=None):
+            result = self.observe()
+        self.assertEqual(result['Observation'], {'Status': 'not_running'})
diff --git a/services/core/tools/e2b-provider/provider.py b/services/core/tools/e2b-provider/provider.py
index dbf3111f0..9b2fcafe7 100644
--- a/services/core/tools/e2b-provider/provider.py
+++ b/services/core/tools/e2b-provider/provider.py
@@ -1,5 +1,5 @@
 """Five bounded SDK operations for an already authorized Core allocation, plus
-read-only deployment validation and batch observation."""
+read-only deployment validation and observation."""
 from concurrent.futures import ThreadPoolExecutor
 import json
 import math
@@ -14,7 +14,7 @@
 from sdk import connection_material, definitely_rejected, list_builds, list_templates, read_metrics, restore, run, sdk_options, validate_deployment, verify_team_template
 from state import Failure, Receipt, private_root, read_receipt
 from helper_contract_generated import (PROTOCOL_VERSION, OPERATIONS, REQUEST_FIELDS, REFERENCE_FIELDS,
-    MAX_OBSERVATION_REFERENCES, MAX_CREDENTIAL_REFERENCES, MANAGED_BOOTSTRAP_FIELDS)
+    MAX_CREDENTIAL_REFERENCES, MANAGED_BOOTSTRAP_FIELDS)
 
 PREFIX = 'oac_'
 FIELDS = ('InstallationID', *REFERENCE_FIELDS)
@@ -38,9 +38,9 @@ def utc(value):
     return value.astimezone(timezone.utc).isoformat()
 
 
-def observed(reference, cloud, point):
-    """Map one metrics point without changing E2B units. A malformed point makes
-    only its own row unavailable.
+def observed(cloud, point):
+    """Map one metrics point without changing E2B units. A malformed point is
+    unavailable.
 
     Disk metrics need a newer envd; unless E2B reports both integer values and a
     positive total, disk stays unknown rather than an observed zero."""
@@ -56,11 +56,11 @@ def observed(reference, cloud, point):
                 not math.isfinite(cpu_pct) or cpu_pct < 0 or
                 any(type(v) is not int or v < 0 for v in values) or metric.mem_total < 1):
             raise ValueError('malformed metrics point')
-        return dict(reference, Status='observed', ObservedAt=utc(metric.timestamp), StartedAt=utc(cloud.started_at),
+        return dict(Status='observed', ObservedAt=utc(metric.timestamp), StartedAt=utc(cloud.started_at),
                     CPUCount=cpu_count, CPUUsedPct=cpu_pct, MemUsed=metric.mem_used, MemTotal=metric.mem_total,
                     DiskUsed=metric.disk_used if disk_known else None, DiskTotal=metric.disk_total if disk_known else None)
     except Exception:
-        return dict(reference, Status='unavailable')
+        return {'Status': 'unavailable'}
 
 
 class Provider:
@@ -80,12 +80,8 @@ def __init__(self, request):
         if (type(request['Version']) is not int or request['Version'] != PROTOCOL_VERSION or
                 not isinstance(request['Operation'], str) or request['Operation'] not in OPERATIONS or
                 set(request) - set(REQUEST_FIELDS) or
-                (request['Operation'] not in ('validate_deployment', 'observe', 'list_templates', 'list_builds', 'verify_credential') and
+                (request['Operation'] not in ('validate_deployment', 'list_templates', 'list_builds', 'verify_credential') and
                  not valid_reference(self.reference)) or
-                (request['Operation'] == 'observe' and
-                 (not 1 <= len(self.references) <= MAX_OBSERVATION_REFERENCES or
-                  not all(valid_reference(r) for r in self.references) or
-                  len({tuple(sorted(r.items())) for r in self.references}) != len(self.references))) or
                 (request['Operation'] == 'verify_credential' and
                  (len(self.references) > MAX_CREDENTIAL_REFERENCES or
                   not all(valid_reference(r) for r in self.references))) or
@@ -279,66 +275,38 @@ def kill(self):
         self.receipt.save(status='killed', settled=True, bootstrap_complete=False, connection=None)
 
     def observe(self):
-        """Latest metrics of owned running sandboxes, without locks, writes or connect.
+        """Latest metrics of the owned running sandbox, without locks, writes or connect.
 
-        Receipts name each allocation's sandbox so that the one batch metrics
-        request runs alongside the labelled listing that confirms it is running."""
-        root = private_root(self.config)
-        statuses, candidates = [], {}
-        for index, reference in enumerate(self.references):
-            try:
-                record = read_receipt(self.config, root, reference) or {}
-            except Failure as error:
-                statuses.append(error.code)
-                continue
-            except Exception:
-                statuses.append('unavailable')
-                continue
-            ids = record.get('ids', [])
-            if record.get('status') in ('killed', 'rejected'):
-                statuses.append('not_running')
-            elif len(ids) == 1 and isinstance(ids[0], str):
-                statuses.append('unavailable')
-                candidates[index] = ids[0]
-            else:
-                statuses.append('unavailable')
-        if not candidates:
-            return [dict(r, Status=status) for r, status in zip(self.references, statuses)]
-        installation = self.config['InstallationID']
-        # One allocation filters by all its labels; a page lists the installation.
-        metadata = {PREFIX + 'installationid': installation}
-        if len(self.references) == 1:
-            metadata = self.metadata_for(self.references[0])
-        wanted, seen = set(candidates.values()), set()
+        The receipt names the allocation's sandbox so that the metrics request
+        runs alongside the labelled listing that confirms it is running."""
+        try:
+            record = read_receipt(self.config, private_root(self.config), self.reference) or {}
+        except Failure as error:
+            return {'Status': error.code}
+        except Exception:
+            return {'Status': 'unavailable'}
+        ids = record.get('ids', [])
+        if record.get('status') in ('killed', 'rejected'):
+            return {'Status': 'not_running'}
+        if len(ids) != 1 or not isinstance(ids[0], str):
+            return {'Status': 'unavailable'}
+        found = []
         with ThreadPoolExecutor(max_workers=1) as pool:
-            metrics = pool.submit(read_metrics, self.config, sorted(wanted), self.remaining)
-            running = {}
-            paginator = Sandbox.list(query=SandboxQuery(metadata=metadata, state=[SandboxState.RUNNING]),
+            metrics = pool.submit(read_metrics, self.config, ids[0], self.remaining)
+            paginator = Sandbox.list(query=SandboxQuery(metadata=self.metadata, state=[SandboxState.RUNNING]),
                                      limit=100, **self.options())
-            # Stop once every receipt's sandbox has been listed. Detection of a
+            # Stop once the receipt's sandbox has been listed. Detection of a
             # second sandbox with the same allocation labels then covers only
             # the pages read; lifecycle discovery remains exhaustive.
-            while paginator.has_next and not wanted <= seen:
-                for cloud in paginator.next_items(**self.options()):
-                    labels = cloud.metadata or {}
-                    if labels.get(PREFIX + 'installationid') == installation:
-                        key = tuple(labels.get(PREFIX + field.lower()) for field in FIELDS[1:])
-                        running.setdefault(key, []).append(cloud)
-                        seen.add(cloud.sandbox_id)
-            points = metrics.result()
-        result = []
-        for index, reference in enumerate(self.references):
-            if index not in candidates:
-                result.append(dict(reference, Status=statuses[index]))
-                continue
-            found = running.get(tuple(reference[field] for field in FIELDS[1:]), [])
-            if not found:
-                result.append(dict(reference, Status='not_running'))
-            elif len(found) != 1 or found[0].sandbox_id != candidates[index] or not isinstance(points.get(candidates[index]), dict):
-                result.append(dict(reference, Status='unavailable'))
-            else:
-                result.append(observed(reference, found[0], points[candidates[index]]))
-        return result
+            while paginator.has_next and not any(cloud.sandbox_id == ids[0] for cloud in found):
+                found += [cloud for cloud in paginator.next_items(**self.options())
+                          if all((cloud.metadata or {}).get(k) == v for k, v in self.metadata.items())]
+            point = metrics.result()
+        if not found:
+            return {'Status': 'not_running'}
+        if len(found) != 1 or found[0].sandbox_id != ids[0] or not isinstance(point, dict):
+            return {'Status': 'unavailable'}
+        return observed(found[0], point)
 
     def metadata_for(self, reference):
         return {PREFIX + field.lower(): value for field, value in
@@ -397,7 +365,7 @@ def execute(self):
                     self.verify_credential()
                     return {'Version': PROTOCOL_VERSION, 'DeploymentValid': True, 'ErrorCode': ''}
                 if self.q['Operation'] == 'observe':
-                    return {'Version': PROTOCOL_VERSION, 'Observations': self.observe(), 'ErrorCode': ''}
+                    return {'Version': PROTOCOL_VERSION, 'Observation': self.observe(), 'ErrorCode': ''}
                 verify_team_template(self.config, self.remaining)
                 build = validate_deployment(self.config, self.remaining)
                 return {'Version': PROTOCOL_VERSION, 'DeploymentValid': True, 'TemplateBuild': build, 'ErrorCode': ''}
diff --git a/services/core/tools/e2b-provider/sdk.py b/services/core/tools/e2b-provider/sdk.py
index c58236a2a..4b2d3afb7 100644
--- a/services/core/tools/e2b-provider/sdk.py
+++ b/services/core/tools/e2b-provider/sdk.py
@@ -18,7 +18,7 @@
 
 from state import Failure
 
-from helper_contract_generated import SDK_VERSION, MAX_OUTPUT, MAX_COMMAND_INPUT, MAX_OBSERVATION_REFERENCES
+from helper_contract_generated import SDK_VERSION, MAX_OUTPUT, MAX_COMMAND_INPUT
 
 
 def list_templates(config, remaining):
@@ -120,16 +120,14 @@ def validate_deployment(config, remaining):
     raise Failure('unconfirmed')
 
 
-def read_metrics(config, sandbox_ids, remaining):
-    """Latest metrics point per sandbox from one batch request of at most 100 IDs."""
-    if not 1 <= len(sandbox_ids) <= MAX_OBSERVATION_REFERENCES:
-        raise Failure('invalid')
+def read_metrics(config, sandbox_id, remaining):
+    """Latest metrics point of one sandbox, or None when E2B reports none."""
     client = get_api_client(ConnectionConfig(**sdk_options(config, remaining)))
-    response = get_sandboxes_metrics.sync_detailed(client=client, sandbox_ids=sandbox_ids)
+    response = get_sandboxes_metrics.sync_detailed(client=client, sandbox_ids=[sandbox_id])
     if (response.status_code != 200 or not isinstance(response.parsed, SandboxesWithMetrics) or
             not isinstance(response.parsed.sandboxes, dict)):
         raise Failure('unconfirmed')
-    return response.parsed.sandboxes
+    return response.parsed.sandboxes.get(sandbox_id)
 
 
 def connection_material(sandbox):
diff --git a/services/core/tools/e2b-provider/testdata/contract.json b/services/core/tools/e2b-provider/testdata/contract.json
index aa79da367..0e2c8e8c6 100644
--- a/services/core/tools/e2b-provider/testdata/contract.json
+++ b/services/core/tools/e2b-provider/testdata/contract.json
@@ -22,19 +22,12 @@
 {"kind":"request","name":"command","payload":{"Version":1,"Operation":"command","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
 {"kind":"request","name":"config-null","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":null,"Deadline":"2099-01-01T00:00:00Z","Operation":"create","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
 {"kind":"request","name":"create","payload":{"Version":1,"Operation":"create","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
-{"kind":"request","name":"duplicate-observation","payload":{"Version":1,"Operation":"observe","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"References":[{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"}],"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":false},
 {"kind":"request","name":"extra","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Extra":true,"Operation":"create","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
 {"kind":"request","name":"inspect","payload":{"Version":1,"Operation":"inspect","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
 {"kind":"request","name":"kill","payload":{"Version":1,"Operation":"kill","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
 {"kind":"request","name":"list_builds","payload":{"Version":1,"Operation":"list_builds","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
 {"kind":"request","name":"list_templates","payload":{"Version":1,"Operation":"list_templates","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
-{"kind":"request","name":"observe","payload":{"Version":1,"Operation":"observe","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"References":[{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"}],"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
-{"kind":"request","name":"observe-count-0","payload":{"Version":1,"Operation":"observe","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":false},
-{"kind":"request","name":"observe-count-100","payload":{"Version":1,"Operation":"observe","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"References":[{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000001-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000002-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000003-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000004-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000005-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000006-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000007-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000008-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000009-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000010-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000011-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000012-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000013-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000014-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000015-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000016-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000017-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000018-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000019-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000020-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000021-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000022-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000023-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000024-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000025-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000026-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000027-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000028-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000029-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000030-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000031-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000032-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000033-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000034-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000035-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000036-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000037-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000038-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000039-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000040-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000041-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000042-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000043-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000044-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000045-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000046-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000047-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000048-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000049-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000050-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000051-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000052-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000053-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000054-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000055-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000056-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000057-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000058-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000059-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000060-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000061-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000062-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000063-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000064-3333-4333-8333-333333333333"}],"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
-{"kind":"request","name":"observe-count-101","payload":{"Version":1,"Operation":"observe","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"References":[{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000001-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000002-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000003-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000004-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000005-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000006-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000007-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000008-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000009-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000000f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000010-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000011-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000012-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000013-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000014-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000015-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000016-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000017-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000018-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000019-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000001f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000020-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000021-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000022-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000023-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000024-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000025-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000026-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000027-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000028-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000029-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000002f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000030-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000031-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000032-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000033-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000034-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000035-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000036-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000037-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000038-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000039-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000003f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000040-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000041-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000042-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000043-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000044-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000045-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000046-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000047-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000048-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000049-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000004f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000050-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000051-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000052-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000053-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000054-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000055-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000056-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000057-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000058-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000059-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005a-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005b-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005c-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005d-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005e-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"0000005f-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000060-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000061-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000062-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000063-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000064-3333-4333-8333-333333333333"},{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"00000065-3333-4333-8333-333333333333"}],"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":false},
-{"kind":"request","name":"observe-references-type","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"observe","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"References":{},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
-{"kind":"request","name":"observe-references-type","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"observe","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"References":"invalid","RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
-{"kind":"request","name":"observe-references-type","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"observe","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"References":[null],"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
+{"kind":"request","name":"observe","payload":{"Version":1,"Operation":"observe","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
 {"kind":"request","name":"operation-null","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":null,"Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
 {"kind":"request","name":"operation-unknown","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"unsupported","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
 {"kind":"request","name":"reference-null","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"create","Reference":null,"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
diff --git a/services/core/tools/microsandbox-provider/README.md b/services/core/tools/microsandbox-provider/README.md
index 554b4fad8..7235c8274 100644
--- a/services/core/tools/microsandbox-provider/README.md
+++ b/services/core/tools/microsandbox-provider/README.md
@@ -1,6 +1,6 @@
 # microsandbox Sandbox Provider helper
 
-microsandbox runs each hosted Session in its own microVM on a Linux amd64 node with KVM, and it is the Sandbox Provider that supports idle suspension. Core forwards provider operations to the node over the [node protocol](../../../../contracts/agents-api/node-generation-protocol.md); the node's adapter ([`sandbox/microsandbox`](../../internal/sandbox/microsandbox)) runs this helper once per operation. The helper links the microsandbox Go SDK v0.7.2 with its FFI library, so Core and the node program stay CGO-free Go binaries. It implements the provider-neutral `sandbox.CheckpointProvider` with full snapshots. It has no daemon, lifecycle database, scheduler or network control plane.
+microsandbox runs each hosted Session in its own microVM on a Linux amd64 node with KVM, and it is the Sandbox Provider that supports idle suspension. Core forwards provider operations to the node over the [node protocol](../../../../contracts/agents-api/node-generation-protocol.md); the node's adapter ([`sandbox/microsandbox`](../../internal/sandbox/microsandbox)) runs this helper once per operation. The helper links the microsandbox Go SDK v0.7.2 with its FFI library, so Core and the node program stay CGO-free Go binaries. It implements the checkpoint operations of the provider-neutral `sandbox.SandboxProvider` with full snapshots. It has no daemon, lifecycle database, scheduler or network control plane.
 
 [Add a Sandbox Provider](../../../../docs/sandbox-provider.md) owns the provider contract. [Sandbox deployment](../../../../contracts/agents-api/sandbox-deployment.md) owns the resources, Runtime release and suspension policy; the [nodes guide](../../../../docs/getting-started/nodes.md) owns node installation, host requirements, the node's directories and its network policy.
 

From 14892075491f23042193db0700d0ee2522bb7c1e Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 03:03:51 +0800
Subject: [PATCH 43/60] Generate Agent request shapes from the pinned schema
 (#523)

---
 contracts/agents-api/execution-tools.md       |   2 +-
 contracts/agents-api/go-bindings.json         |  16 +-
 contracts/agents-api/index.md                 |   5 +-
 contracts/agents-api/v1/official.gen.go       |  22 +-
 contracts/agents-api/wire-semantics.md        |   4 +-
 contracts/agents-api/zh/execution-tools.md    |   4 +-
 contracts/agents-api/zh/index.md              |   7 +-
 contracts/agents-api/zh/wire-semantics.md     |   6 +-
 scripts/generate-public-api.py                |  66 ++++++
 scripts/generate-public-api.test.py           |  19 ++
 services/core/internal/api/agents.go          |   9 +-
 services/core/internal/api/agents_update.go   |  20 +-
 .../internal/api/configuration_validation.go  | 102 ++-------
 .../api/configuration_validation_test.go      |  11 +
 services/core/internal/api/disabled_tools.go  |  66 ++----
 services/core/internal/api/errors.go          |  22 ++
 services/core/internal/api/errors_agents.go   |   2 +-
 .../internal/api/function_configuration.go    |  46 +---
 services/core/internal/api/handler.go         |   4 +-
 .../core/internal/api/mcp_configuration.go    |  93 +++-----
 .../internal/api/mcp_configuration_test.go    |  17 +-
 .../core/internal/api/official_shapes.gen.go  | 210 ++++++++++++++++++
 .../core/internal/api/saved_configuration.go  |  58 +----
 services/core/internal/api/saved_tools.go     |  18 +-
 services/core/internal/api/session_agent.go   |   5 +-
 .../api/session_model_configuration.go        |   2 +-
 .../internal/api/session_model_defaults.go    |   9 +-
 services/core/internal/api/session_request.go |   3 -
 services/core/internal/api/session_tools.go   |  30 ++-
 .../internal/api/validation_errors_test.go    |   9 +-
 services/core/tests/official_mcp.py           |  17 +-
 31 files changed, 518 insertions(+), 386 deletions(-)
 create mode 100644 services/core/internal/api/official_shapes.gen.go

diff --git a/contracts/agents-api/execution-tools.md b/contracts/agents-api/execution-tools.md
index 1b52e7a65..36ace1a5c 100644
--- a/contracts/agents-api/execution-tools.md
+++ b/contracts/agents-api/execution-tools.md
@@ -83,7 +83,7 @@ Execution admits only `mode: "disabled"` and `enabled: false`. Enabled or omitte
 }
 ```
 
-- `server_label` is nonempty and unique within the Session. Only the `http` transport is accepted; `server_url` is an absolute HTTP or HTTPS URL without credentials, query or fragment. Nonempty `headers` and `request_metadata` are rejected.
+- `server_label` is nonempty and unique within the Session. Only the `http` transport is accepted; `server_url` is an absolute HTTP or HTTPS URL without credentials, query or fragment. Nonempty `headers` and `request_metadata` and an inline `authorization` are rejected.
 - [Public MCP connection origin](./environments.md#public-mcp-connection-origin) owns origin defaults, placement and credential authority; [Harness capabilities](./harness-capabilities.md#tools) owns per-Harness support.
 - Omitted or null `allowed_tools` permits every server tool; `[]` permits none.
 - `required: true` makes native thread creation and cold resume wait for the server to initialize; a failure stops execution without replacing retained history. It needs the Runtime's `mcp_http_required` capability. Public work can be accepted or queued during the wait.
diff --git a/contracts/agents-api/go-bindings.json b/contracts/agents-api/go-bindings.json
index 5b5d9253e..3e2178e08 100644
--- a/contracts/agents-api/go-bindings.json
+++ b/contracts/agents-api/go-bindings.json
@@ -159,10 +159,7 @@
   "FunctionToolInput": {
     "sources": ["#/components/schemas/AgentToolConfigParamFunction"],
     "fields": {
-      "name": {"type": "*string"},
-      "description": {"type": "*string"},
-      "parameters": {"type": "json.RawMessage"},
-      "defer_loading": {"type": "json.RawMessage"}
+      "parameters": {"type": "json.RawMessage"}
     }
   },
   "InlineAgent": {
@@ -233,16 +230,7 @@
     "order": ["type", "server_label", "transport", "allowed_tools", "connection_origin", "credential_id", "request_metadata", "required"]
   },
   "MCPToolInput": {
-    "sources": ["#/components/schemas/AgentToolConfigParamMcp"],
-    "fields": {
-      "server_label": {"type": "*string"},
-      "allowed_tools": {"type": "json.RawMessage", "omit": false},
-      "connection_origin": {"omit": false},
-      "credential_id": {"omit": false},
-      "request_metadata": {"type": "json.RawMessage", "omit": false},
-      "required": {"type": "json.RawMessage", "omit": false}
-    },
-    "order": ["type", "server_label", "transport", "allowed_tools", "connection_origin", "credential_id", "request_metadata", "required"]
+    "sources": ["#/components/schemas/AgentToolConfigParamMcp"]
   },
   "MultiAgentConfig": {
     "sources": ["#/components/schemas/MultiAgentConfigResource"],
diff --git a/contracts/agents-api/index.md b/contracts/agents-api/index.md
index 5b2f933fc..d0d27dc8d 100644
--- a/contracts/agents-api/index.md
+++ b/contracts/agents-api/index.md
@@ -14,9 +14,9 @@ Core targets the complete OpenAI Agents API as pinned below ([public API rule](h
 | [openapi.yaml](./openapi.yaml) | The official public contract with Core's `x_agents_core` extension on Agent and Session request/response objects |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go names, field representations, encoding order and stored projections; it does not define official field membership, enums or constraints |
 
-Run `make openapi` to regenerate the public Go types, route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The internal `/core/v1` and `/api/v1` documents come from handler annotations. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
+Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The internal `/core/v1` and `/api/v1` documents come from handler annotations. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
 
-The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` lists types consumed by Core and overrides only the Go representation or field order that existing storage or custom JSON encoding requires. Unspecified fields follow the official schema; shared shapes use one Go type. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, request admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
+The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` lists types consumed by Core and overrides only the Go representation or field order that existing storage or custom JSON encoding requires. Unspecified fields follow the official schema; shared shapes use one Go type. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, Core's local limits, execution admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
 
 The official source and existing service have these recorded differences: Agents authentication errors can return a null `code`; empty Files pages return null `first_id` and `last_id`; File resources can return null `expires_at` and `status_details`. The source declares those fields non-null. The official-client response validator allows null only for these named fields and otherwise validates OpenAPI 3.1 response schemas. Files and Skills operations omit error responses in the source, so those error bodies use the upstream shared `ErrorResponse` schema. [Wire semantics](./wire-semantics.md) and raw HTTP tests qualify service behavior; the published schema retains the official definitions.
 
@@ -111,6 +111,7 @@ Each item is Core's deliberate or native behavior where the official service beh
 - Explicit reasoning effort or summary, service tiers other than `auto`, enabled `web_search` and enabled programmatic tool calling are saved but rejected at Session admission.
 - Harness support for tools, structured output, deferred discovery, subagents and MCP differs by Harness and placement; see the [Harness capabilities](./harness-capabilities.md). MiniMax Code has no public functions, no service-origin MCP and no image input.
 - Model-derived reasoning defaults are not resolved.
+- MCP tools support the `http` transport only; `stdio` is rejected, and so is an inline `authorization` on a Session MCP transport ([HTTP MCP](./execution-tools.md#http-mcp)).
 
 **Execution and history**
 
diff --git a/contracts/agents-api/v1/official.gen.go b/contracts/agents-api/v1/official.gen.go
index 1cc7b4653..d74771d9c 100644
--- a/contracts/agents-api/v1/official.gen.go
+++ b/contracts/agents-api/v1/official.gen.go
@@ -273,10 +273,10 @@ type FunctionCallAction struct {
 // FunctionToolInput projects AgentToolConfigParamFunction.
 type FunctionToolInput struct {
 	Type         string          `json:"type" binding:"required" enums:"function"`
-	Name         *string         `json:"name" binding:"required"`
-	Description  *string         `json:"description" binding:"required"`
+	Name         string          `json:"name" binding:"required"`
+	Description  string          `json:"description" binding:"required"`
 	Parameters   json.RawMessage `json:"parameters" binding:"required" swaggertype:"object"`
-	DeferLoading json.RawMessage `json:"defer_loading,omitempty" swaggertype:"object"`
+	DeferLoading *bool           `json:"defer_loading,omitempty"`
 }
 
 // InlineAgent projects SessionAgentConfigParam.
@@ -377,14 +377,14 @@ type MCPTool struct {
 
 // MCPToolInput projects AgentToolConfigParamMcp.
 type MCPToolInput struct {
-	Type             string          `json:"type" binding:"required" enums:"mcp"`
-	ServerLabel      *string         `json:"server_label" binding:"required"`
-	Transport        json.RawMessage `json:"transport" binding:"required" swaggertype:"object"`
-	AllowedTools     json.RawMessage `json:"allowed_tools" extensions:"x-nullable" swaggertype:"object"`
-	ConnectionOrigin *string         `json:"connection_origin" extensions:"x-nullable" enums:"service,environment"`
-	CredentialID     *string         `json:"credential_id" extensions:"x-nullable"`
-	RequestMetadata  json.RawMessage `json:"request_metadata" extensions:"x-nullable" swaggertype:"object"`
-	Required         json.RawMessage `json:"required" swaggertype:"object"`
+	Type             string                     `json:"type" binding:"required" enums:"mcp"`
+	ServerLabel      string                     `json:"server_label" binding:"required"`
+	CredentialID     *string                    `json:"credential_id,omitempty" extensions:"x-nullable"`
+	Transport        json.RawMessage            `json:"transport" binding:"required" swaggertype:"object"`
+	RequestMetadata  map[string]json.RawMessage `json:"request_metadata,omitempty" extensions:"x-nullable" swaggertype:"object"`
+	AllowedTools     []string                   `json:"allowed_tools,omitempty" extensions:"x-nullable"`
+	Required         *bool                      `json:"required,omitempty"`
+	ConnectionOrigin *string                    `json:"connection_origin,omitempty" extensions:"x-nullable" enums:"service,environment"`
 }
 
 // MultiAgentConfig projects MultiAgentConfigResource.
diff --git a/contracts/agents-api/wire-semantics.md b/contracts/agents-api/wire-semantics.md
index 75d9136f2..2a62ed66b 100644
--- a/contracts/agents-api/wire-semantics.md
+++ b/contracts/agents-api/wire-semantics.md
@@ -162,7 +162,7 @@ Saving a value does not make it executable. Session creation admits a smaller se
 
 ### Configuration validation
 
-Agent create and update bodies and the inline `agent` of Session create are checked against the pinned shapes of `tools`, `text`, `reasoning`, `service_tier`, `multi_agent`, `model`, `name` and `instructions`, before their parsers and before Harness admission. Failures return 400 with type and code `invalid_request_error`:
+Agent create and update bodies and the inline `agent` of Session create are checked against the pinned shapes of `tools`, `text`, `reasoning`, `service_tier`, `multi_agent`, `model`, `name`, `instructions` and `metadata`, before their parsers and before Harness admission. Failures return 400 with type and code `invalid_request_error`:
 
 | Case | Param | Message |
 | --- | --- | --- |
@@ -175,7 +175,7 @@ Agent create and update bodies and the inline `agent` of Session create are chec
 | Function `parameters` with a string root `type` other than `object` | null | `Invalid schema for function '<name>': schema must be a JSON Schema of 'type: "object"', got 'type: "<type>"'.` |
 | `text.format` JSON schema with a string root `type` other than `object` | null | `agent.text.format.schema must have top-level type "object"; got "<type>"`, also on Agent requests |
 
-Within one object Core reports a union's `type` first, then unknown members, then member values in document order, then missing members; tools before `text`, and the whole object before the duplicate and schema-root checks. Schemas without a string root `type` are not checked. Function and output schemas, MCP `transport`, `request_metadata`, `metadata` and `x_agents_core` keep their own parsers. Update bodies and the inline Session agent are validated before the Agent lookup, so owned, foreign, missing and malformed Agent IDs give the same response.
+Within one object Core reports a union's `type` first, then unknown members, then member values in document order, then missing members in the pinned schema's order; tools before `text`, and the whole object before the duplicate and schema-root checks. Schemas without a string root `type` are not checked. Function and output schemas, `request_metadata` and `x_agents_core` keep their own parsers. Update bodies and the inline Session agent are validated before the Agent lookup, so owned, foreign, missing and malformed Agent IDs give the same response.
 
 Core saves values the pinned shapes allow even when it cannot run them: function names of any length, enabled programmatic tool calling, reasoning effort `max` and service tier `flex`.
 
diff --git a/contracts/agents-api/zh/execution-tools.md b/contracts/agents-api/zh/execution-tools.md
index aaab6a7c9..022a42ed5 100644
--- a/contracts/agents-api/zh/execution-tools.md
+++ b/contracts/agents-api/zh/execution-tools.md
@@ -1,7 +1,7 @@
 ---
 title: "执行工具"
 source: contracts/agents-api/execution-tools.md
-source_hash: 5e0b9ab1938ccd0ee7b22b1482a365bd54285c8c09fc4cb1ca172e34ab122ce2
+source_hash: eacb0d566f9d787f393c1d462351023a1ca6fe97ffb32773c8f23139833f5762
 ---
 
 Agent 在 `tools` 中声明应用函数、控制项和 MCP 服务器，并可在 `text.format` 中声明输出 schema。本契约说明 Core 如何验证声明、哪些内容跨越 Runtime 边界，以及调用方如何恢复待执行操作。[Harness 能力](harness-capabilities.md)列出各 Harness 在不同部署位置支持的操作。原生工作区工具和 Environment Plugin MCP 属于 [Environment](environments.md#skills-plugins-and-environment-mcp)。
@@ -85,7 +85,7 @@ Core 发送 `PromptRequestPayload.ToolSearch` 和每个 `FunctionTool.DeferLoadi
 }
 ```
 
-- `server_label` 非空且在 Session 中唯一。仅接受 `http` 传输；`server_url` 为不带凭据、查询或片段的绝对 HTTP 或 HTTPS URL。非空 `headers` 和 `request_metadata` 被拒绝。
+- `server_label` 非空且在 Session 中唯一。仅接受 `http` 传输；`server_url` 为不带凭据、查询或片段的绝对 HTTP 或 HTTPS URL。非空 `headers`、`request_metadata` 和内联 `authorization` 被拒绝。
 - [公开 MCP 连接来源](environments.md#public-mcp-connection-origin)定义来源默认值、部署位置和凭据权限；[Harness 能力](harness-capabilities.md#tools)定义各 Harness 支持范围。
 - 省略或 null 的 `allowed_tools` 允许所有服务器工具；`[]` 不允许任何工具。
 - `required: true` 使原生线程创建和冷恢复等待服务器初始化；失败会停止执行，不替换保留历史。它要求 Runtime 的 `mcp_http_required` 能力。等待期间公开工作可被接受或排队。
diff --git a/contracts/agents-api/zh/index.md b/contracts/agents-api/zh/index.md
index f84d692b7..fda6127ab 100644
--- a/contracts/agents-api/zh/index.md
+++ b/contracts/agents-api/zh/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Agents API 覆盖台账"
 source: contracts/agents-api/index.md
-source_hash: 61cd594bb0bd475b019c916e099b6e8de935b4e5cb1cde7a39f620818097900b
+source_hash: c155876a94aeda51fb97ec292629505142cfb6f76785dfaf2a783acab87226ae
 ---
 
 Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[public API rule](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#public-api)）。本台账记录 Core 对各项资源实现了哪些内容、哪些契约保存其详细信息，并列出相对于 OpenAI 服务的所有已知差异和所有未解决缺口。[API namespaces and credentials](../../../docs/zh/api/index.md) 说明谁调用哪些 API；[Agents API guide](../../../docs/zh/api/public-agent-api.md) 介绍使用方法。
@@ -16,9 +16,9 @@ Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[publi
 | [openapi.yaml](../openapi.yaml) | 官方公共契约，并在 Agent 和 Session 请求及响应对象上加入 Core 的 `x_agents_core` 扩展 |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go 名称、字段表示、编码顺序和存储投影；不定义官方字段集合、枚举或约束 |
 
-运行 `make openapi` 重新生成公共 Go 类型、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
+运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
 
-公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；`go-bindings.json` 只列出 Core 使用的类型，仅在已有存储或自定义 JSON 编码需要时覆盖 Go 表示或字段顺序。未覆盖的字段遵循官方 schema，相同结构复用同一个 Go 类型。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、请求准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
+公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；`go-bindings.json` 只列出 Core 使用的类型，仅在已有存储或自定义 JSON 编码需要时覆盖 Go 表示或字段顺序。未覆盖的字段遵循官方 schema，相同结构复用同一个 Go 类型。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、Core 的本地限制、执行准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
 
 官方源文件与已有服务存在以下已记录的差异：Agents 鉴权错误的 `code` 可以为 null；Files 空页的 `first_id` 和 `last_id` 为 null；File 资源的 `expires_at` 和 `status_details` 可以为 null。源文件将这些字段声明为非空。官方客户端响应验证器只对这些指定字段允许 null，其余部分按 OpenAPI 3.1 响应 schema 验证。源文件中的 Files 和 Skills 操作未声明错误响应，因此这些错误体使用上游共享的 `ErrorResponse` schema。[传输语义](wire-semantics.md)和原始 HTTP 测试验证服务行为；发布的 schema 保留官方定义。
 
@@ -114,6 +114,7 @@ Core 自身字段位于 `x_agents_core` 中（[Core extensions](../../../docs/zh
 - 显式指定推理强度或摘要、使用 `auto` 之外的服务层级、启用 `web_search` 或启用程序化工具调用，这些设置都会被保存，但在 Session 准入时会被拒绝。
 - Harness 对工具、结构化输出、延迟发现、subagents 和 MCP 的支持因 Harness 和部署位置而异；请参阅 [Harness capabilities](harness-capabilities.md)。MiniMax Code 不提供公共 functions、没有服务源 MCP，也不支持图像输入。
 - 由模型推导出的推理默认值不会被解析确定。
+- MCP 工具仅支持 `http` 传输，`stdio` 会被拒绝，Session MCP 传输中的内联 `authorization` 也会被拒绝（[HTTP MCP](execution-tools.md#http-mcp)）。
 
 **执行和历史**
 
diff --git a/contracts/agents-api/zh/wire-semantics.md b/contracts/agents-api/zh/wire-semantics.md
index 840c3a8f7..d688f9444 100644
--- a/contracts/agents-api/zh/wire-semantics.md
+++ b/contracts/agents-api/zh/wire-semantics.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 协议行为"
 source: contracts/agents-api/wire-semantics.md
-source_hash: 5524db9b90aaf51026746316d6305da396033f50e88ed50792a8f52cf5aac9db
+source_hash: bed64f05b6e52ab5774063f649173b4a42c0a2da4038bc273f595f81c5dbd128
 ---
 
 已锁定版本的 OpenAI Python SDK（[upstream.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream.json)）定义了 `/v1` 路由、字段和类型。本页面说明这些类型未作规定之处 Core 的行为，例如状态码、错误字段、默认值和列表边界，以及 Core 与官方服务存在差异的地方。[coverage ledger](index.md) 列出了这些差异和尚存缺口；[Sessions, events and history](sessions-events.md)、[message content](message-content.md)、[Vaults](vaults.md)、[source Files and Skills](source-files.md) 和 [Environment files and Artifacts](environment-files.md) 分别负责各自资源的规则。
@@ -164,7 +164,7 @@ Agent 创建要求提供 `model`。对于省略的字段，Core 会保存并返
 
 ### 配置验证 {#configuration-validation}
 
-Agent 创建和更新正文以及 Session 创建中的内联 `agent`，会在其解析器和 Harness 准入之前，根据已锁定的 `tools`、`text`、`reasoning`、`service_tier`、`multi_agent`、`model`、`name` 和 `instructions` 形状进行检查。失败时返回 400，`type` 和 `code` 均为 `invalid_request_error`：
+Agent 创建和更新正文以及 Session 创建中的内联 `agent`，会在其解析器和 Harness 准入之前，根据已锁定的 `tools`、`text`、`reasoning`、`service_tier`、`multi_agent`、`model`、`name`、`instructions` 和 `metadata` 形状进行检查。失败时返回 400，`type` 和 `code` 均为 `invalid_request_error`：
 
 | 情况 | Param | 消息 |
 | --- | --- | --- |
@@ -177,7 +177,7 @@ Agent 创建和更新正文以及 Session 创建中的内联 `agent`，会在其
 | Function `parameters` 的字符串根 `type` 不是 `object` | null | `Invalid schema for function '<name>': schema must be a JSON Schema of 'type: "object"', got 'type: "<type>"'.` |
 | `text.format` JSON schema 的字符串根 `type` 不是 `object` | null | `agent.text.format.schema must have top-level type "object"; got "<type>"`，Agent 请求上也会返回此消息 |
 
-在同一个对象内，Core 会先报告联合类型的 `type`，然后报告未知成员，再按文档顺序报告成员值，最后报告缺失成员；先检查 tools，再检查 `text`，并在重复项和 schema 根检查之前检查整个对象。没有字符串根 `type` 的 schema 不会被检查。Function 和 output schema、MCP `transport`、`request_metadata`、`metadata` 和 `x_agents_core` 使用各自的解析器。更新正文和 Session 内联 Agent 会在查找 Agent 之前进行验证，因此属于当前租户、属于外部租户、缺失和格式错误的 Agent ID 会得到相同的响应。
+在同一个对象内，Core 会先报告联合类型的 `type`，然后报告未知成员，再按文档顺序报告成员值，最后按固定 schema 的顺序报告缺失成员；先检查 tools，再检查 `text`，并在重复项和 schema 根检查之前检查整个对象。没有字符串根 `type` 的 schema 不会被检查。Function 和 output schema、`request_metadata` 和 `x_agents_core` 使用各自的解析器。更新正文和 Session 内联 Agent 会在查找 Agent 之前进行验证，因此属于当前租户、属于外部租户、缺失和格式错误的 Agent ID 会得到相同的响应。
 
 即使无法执行，Core 也会保存已锁定形状允许的值：任意长度的函数名称、已启用的 programmatic tool calling、reasoning effort `max` 和 service tier `flex`。
 
diff --git a/scripts/generate-public-api.py b/scripts/generate-public-api.py
index 69081f3e8..f469e0f9b 100644
--- a/scripts/generate-public-api.py
+++ b/scripts/generate-public-api.py
@@ -10,6 +10,9 @@
 
 ROOT = Path(__file__).resolve().parents[1]
 CONTRACT = ROOT / 'contracts/agents-api'
+SHAPES = ROOT / 'services/core/internal/api/official_shapes.gen.go'
+# Agent configuration request bodies checked by Core's shape walker.
+REQUEST_SHAPES = ('CreateAgentParams', 'UpdateAgentParams', 'SessionAgentConfigParam')
 HTTP_METHODS = {'get', 'post', 'put', 'patch', 'delete', 'head', 'options'}
 
 
@@ -173,9 +176,71 @@ def go_types(document, bindings):
         lines.append('}\n')
         if binding.get('marshal_union'):
             lines.extend(union_marshaler(document, name, binding, field_types))
+    return gofmt(lines)
+
+
+def gofmt(lines):
     return subprocess.run(['gofmt'], input='\n'.join(lines).encode(), stdout=subprocess.PIPE, check=True).stdout
 
 
+def go_shape(document, schema, required=False):
+    """Project one request value onto a shape of services/core/internal/api/configuration_validation.go."""
+    value, = [v for v in dereference(document, schema).get('anyOf', [schema]) if v.get('type') != 'null']
+    value = dereference(document, value)
+    kind = value.get('type')
+    if isinstance(kind, list):
+        kind, = set(kind) - {'null'}
+    if 'oneOf' in value:
+        if value['discriminator']['propertyName'] != 'type':
+            raise ValueError(f'Unsupported union discriminator: {value["discriminator"]}')
+        variants = {}
+        for option in value['oneOf']:
+            option = dereference(document, option)
+            tag, = option['properties']['type']['enum']
+            variants[tag] = go_members(document, option, 'type')
+        fields = ['kind: unionValue', 'values: []string{' + ', '.join(json.dumps(tag) for tag in variants) + '}',
+                  'variants: map[string][]member{\n' + ''.join(f'{json.dumps(tag)}: {members.removeprefix("[]member")},\n' for tag, members in variants.items()) + '}']
+    elif 'enum' in value:
+        fields = ['kind: enumValue', 'values: []string{' + ', '.join(json.dumps(v) for v in value['enum']) + '}']
+    elif kind == 'object' and 'properties' in value:
+        fields = ['kind: objectValue', 'members: ' + go_members(document, value)]
+    elif kind == 'object':
+        values = value['additionalProperties']
+        if values and values.get('type') != 'string':
+            raise ValueError(f'Unsupported map values: {values}')
+        fields = ['kind: mapValue'] + (['items: &shape{kind: stringValue}'] if values else [])
+    elif kind == 'array':
+        fields = ['kind: arrayValue', 'items: &' + go_shape(document, value['items'])]
+    elif kind == 'integer':
+        fields = ['kind: integerValue', f'minimum: {value["minimum"]}']
+    else:
+        fields = [{'string': 'kind: stringValue', 'boolean': 'kind: booleanValue'}[kind]]
+    if required:
+        fields.append('required: true')
+    if nullable(document, schema):
+        fields.append('nullable: true')
+    return 'shape{' + ', '.join(fields) + '}'
+
+
+def go_members(document, schema, skip=None):
+    # The walker rejects unknown members, so only closed objects project.
+    if schema.get('additionalProperties') is not False:
+        raise ValueError(f'Unsupported open object: {sorted(schema["properties"])}')
+    required = schema.get('required', [])
+    return '[]member{\n' + ''.join(f'{{{json.dumps(name)}, {go_shape(document, value, name in required)}}},\n' for name, value in schema['properties'].items() if name != skip) + '}'
+
+
+def request_shapes(document, owners):
+    lines = ['// Code generated by scripts/generate-public-api.py; DO NOT EDIT.', 'package api', '',
+             '// Pinned request shapes; x_agents_core is checked by its own parser.', 'var (']
+    for name in REQUEST_SHAPES:
+        members = go_members(document, resolve(document, '#/components/schemas/' + name))
+        if name in owners:
+            members = members[:-1] + '{"x_agents_core", shape{}},\n}'
+        lines.append(f'{name[0].lower() + name[1:]} = shape{{kind: objectValue, members: {members}}}')
+    return gofmt(lines + [')'])
+
+
 def prune_components(document):
     needed = set()
     def walk(value):
@@ -263,6 +328,7 @@ def main():
     owners = extension_owners(bindings)
     if args.swag_roots:
         write(CONTRACT / 'v1/official.gen.go', go_types(source, bindings), args.check)
+        write(SHAPES, request_shapes(source, owners), args.check)
         roots = 'package extensions\n\n' + '\n'.join(f'// @Success 200 {{object}} v1.{name}' for name in sorted(set(owners.values()))) + '\nfunc extensions() {}\n'
         args.swag_roots.write_text(roots)
     else:
diff --git a/scripts/generate-public-api.test.py b/scripts/generate-public-api.test.py
index 531d205f8..ad47f433f 100644
--- a/scripts/generate-public-api.test.py
+++ b/scripts/generate-public-api.test.py
@@ -51,6 +51,25 @@ def test_new_official_fields_reach_go_without_a_second_field_list(self):
         self.assertIn('FutureField *string', generated)
         self.assertIn('json:"future_field,omitempty"', generated)
 
+    def test_generated_request_shapes_are_current(self):
+        owners = generator.extension_owners(self.bindings)
+        self.assertEqual(generator.request_shapes(self.source, owners), generator.SHAPES.read_bytes())
+
+    def test_new_official_members_and_values_reach_request_shapes(self):
+        source = copy.deepcopy(self.source)
+        schemas = source['components']['schemas']
+        schemas['McpTransportConfigParamStdio']['properties']['future_field'] = {'type': 'string'}
+        schemas['ServiceTierParam']['enum'].append('future_tier')
+        generated = generator.request_shapes(source, generator.extension_owners(self.bindings)).decode()
+        self.assertIn('{"future_field", shape{kind: stringValue}}', generated)
+        self.assertEqual(generated.count('"future_tier"'), 3)
+
+    def test_open_request_objects_are_rejected(self):
+        source = copy.deepcopy(self.source)
+        del source['components']['schemas']['McpTransportConfigParamStdio']['additionalProperties']
+        with self.assertRaisesRegex(ValueError, 'Unsupported open object'):
+            generator.request_shapes(source, generator.extension_owners(self.bindings))
+
     def test_stale_binding_cannot_add_a_public_field(self):
         bindings = copy.deepcopy(self.bindings)
         bindings['Vault']['fields'] = {'private_data': {'type': 'string'}}
diff --git a/services/core/internal/api/agents.go b/services/core/internal/api/agents.go
index 0aa2a0607..0e652877f 100644
--- a/services/core/internal/api/agents.go
+++ b/services/core/internal/api/agents.go
@@ -30,7 +30,7 @@ func (h *Handler) createAgent(w http.ResponseWriter, r *http.Request) {
 	if !ok {
 		return
 	}
-	if writeFieldError(w, metadataTypeError(raw)) || writeFieldError(w, validateSavedAgentBody(raw, savedAgentCreate)) {
+	if writeFieldError(w, validateSavedAgentBody(raw, createAgentParams)) {
 		return
 	}
 	if err := validateSavedCoreInput(raw); err != nil {
@@ -38,13 +38,14 @@ func (h *Handler) createAgent(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var request v1.CreateAgentRequest
-	if decodeInputObject(raw, &request, "model", "name", "instructions", "metadata", "multi_agent", "reasoning", "service_tier", "text", "tools", "x_agents_core") != nil {
+	// The walks bound members and types, not integer ranges.
+	if json.Unmarshal(raw, &request) != nil {
 		writeError(w, http.StatusBadRequest, "invalid_request", "Request must be a JSON object containing supported fields.")
 		return
 	}
 	command, err := resolveSavedAgent(request)
 	if err != nil {
-		if !writeFieldError(w, err) {
+		if !writeStoredDataError(w, r, err) && !writeFieldError(w, err) {
 			writeError(w, http.StatusBadRequest, "unsupported_or_invalid_configuration", err.Error())
 		}
 		return
@@ -83,7 +84,7 @@ func (h *Handler) respondAgentStatus(w http.ResponseWriter, r *http.Request, age
 func agentResponse(agent agents.Agent) (v1.SavedAgent, error) {
 	var response v1.SavedAgent
 	if err := json.Unmarshal(agent.Configuration, &response.SavedAgentConfiguration); err != nil {
-		return response, err
+		return response, &storedDataError{err}
 	}
 	response.ID, response.Object = agent.ID, "agent"
 	response.Metadata = agent.Metadata
diff --git a/services/core/internal/api/agents_update.go b/services/core/internal/api/agents_update.go
index ab7f9d268..b72a4424e 100644
--- a/services/core/internal/api/agents_update.go
+++ b/services/core/internal/api/agents_update.go
@@ -17,7 +17,7 @@ func (h *Handler) updateAgent(w http.ResponseWriter, r *http.Request) {
 	}
 	command, err := resolveAgentUpdate(raw)
 	if err != nil {
-		if !writeFieldError(w, err) {
+		if !writeStoredDataError(w, r, err) && !writeFieldError(w, err) {
 			writeError(w, http.StatusBadRequest, "unsupported_or_invalid_configuration", err.Error())
 		}
 		return
@@ -33,33 +33,25 @@ func (h *Handler) updateAgent(w http.ResponseWriter, r *http.Request) {
 
 // resolveAgentUpdate returns the command without its tenant and Agent.
 func resolveAgentUpdate(raw []byte) (agents.UpdateCommand, error) {
-	if err := metadataTypeError(raw); err != nil {
-		return agents.UpdateCommand{}, err
-	}
-	if err := validateSavedAgentBody(raw, savedAgentUpdate); err != nil {
+	if err := validateSavedAgentBody(raw, updateAgentParams); err != nil {
 		return agents.UpdateCommand{}, err
 	}
 	if err := validateSavedCoreInput(raw); err != nil {
 		return agents.UpdateCommand{}, err
 	}
 	var request v1.UpdateAgentRequest
-	if decodeInputObject(raw, &request, "model", "name", "instructions", "metadata", "multi_agent", "reasoning", "service_tier", "text", "tools", "x_agents_core") != nil {
+	// The walks bound members and types, not integer ranges.
+	if json.Unmarshal(raw, &request) != nil {
 		return agents.UpdateCommand{}, errors.New("Request must be a JSON object containing supported fields.")
 	}
-	var fields map[string]json.RawMessage
-	if err := json.Unmarshal(raw, &fields); err != nil {
-		return agents.UpdateCommand{}, err
-	}
-	if _, supplied := fields["model"]; supplied && request.Model == nil {
-		return agents.UpdateCommand{}, errors.New("model must be a string when supplied.")
-	}
+	_, fields := orderedMembers(raw)
 	normalized, err := resolveSavedFields(v1.CreateAgentRequest(request))
 	if err != nil {
 		return agents.UpdateCommand{}, err
 	}
 	var patch map[string]json.RawMessage
 	if err := json.Unmarshal(normalized.Configuration, &patch); err != nil {
-		return agents.UpdateCommand{}, err
+		return agents.UpdateCommand{}, &storedDataError{err}
 	}
 	if _, supplied := fields["x_agents_core"]; supplied && request.XAgentsCore == nil {
 		patch["x_agents_core"] = json.RawMessage(`null`)
diff --git a/services/core/internal/api/configuration_validation.go b/services/core/internal/api/configuration_validation.go
index 2c768821e..577621a26 100644
--- a/services/core/internal/api/configuration_validation.go
+++ b/services/core/internal/api/configuration_validation.go
@@ -11,24 +11,22 @@ import (
 // Agent configuration protocol validation is owned by Core. It covers saved
 // Agent create and update bodies and the inline Session agent, and runs before
 // the configuration parsers (which keep Core's local limits and codes) and
-// before harness admission. It walks the raw JSON along the pinned SDK shapes
-// (PersistedAgentToolParam/AgentToolParam, AgentTextParam, AgentReasoningParam,
-// MultiAgentConfigParam and the service_tier literal) and reports the first
-// violation as a fieldError with the JSON path as param and the official
-// message forms. Values the pinned types leave open, such as JSON Schemas,
-// request metadata, MCP transport members, metadata and x_agents_core, are
-// left to their existing parsers.
+// before harness admission. It walks the raw JSON along the request shapes that
+// scripts/generate-public-api.py projects from the pinned schema
+// (official_shapes.gen.go) and reports the first violation as a fieldError with
+// the JSON path as param and the official message forms. x_agents_core keeps
+// its own parser.
 
 type valueKind uint8
 
 const (
-	anyValue     valueKind = iota // validated by the existing parsers
+	anyValue     valueKind = iota // validated by its own parser
 	stringValue                   // str
 	booleanValue                  // bool
 	integerValue                  // int with an inclusive minimum
 	enumValue                     // Literal[...] of strings
 	arrayValue                    // Iterable/SequenceNotStr of items
-	mapValue                      // Dict[str, object]
+	mapValue                      // Dict[str, object], or Dict[str, str] with items
 	openObject                    // an object whose members are validated elsewhere
 	objectValue                   // TypedDict members
 	unionValue                    // TypedDicts selected by their "type" member
@@ -42,7 +40,7 @@ type shape struct {
 	values   []string            // enum values, or union types in the pinned order
 	members  []member            // objectValue members
 	variants map[string][]member // unionValue members other than "type"
-	items    *shape              // arrayValue items
+	items    *shape              // arrayValue items, or mapValue string values
 }
 
 type member struct {
@@ -50,73 +48,7 @@ type member struct {
 	shape
 }
 
-var (
-	requiredString = shape{kind: stringValue, required: true}
-	nullableString = shape{kind: stringValue, nullable: true}
-	stringList     = shape{kind: arrayValue, nullable: true, items: &shape{kind: stringValue}}
-
-	agentTools = shape{kind: arrayValue, nullable: true, items: &shape{kind: unionValue,
-		values: []string{"function", "tool_search", "programmatic_tool_calling", "mcp", "web_search"},
-		variants: map[string][]member{
-			"function": {
-				{"description", requiredString}, {"name", requiredString},
-				{"parameters", shape{kind: mapValue, required: true}}, {"defer_loading", shape{kind: booleanValue}},
-			},
-			"tool_search":               nil,
-			"programmatic_tool_calling": {{"enabled", shape{kind: booleanValue}}},
-			"mcp": {
-				{"server_label", requiredString}, {"transport", shape{kind: openObject, required: true}},
-				{"allowed_tools", stringList},
-				{"connection_origin", shape{kind: enumValue, nullable: true, values: []string{"service", "environment"}}},
-				{"credential_id", nullableString}, {"request_metadata", shape{kind: mapValue, nullable: true}},
-				{"required", shape{kind: booleanValue}},
-			},
-			"web_search": {
-				{"allowed_domains", stringList},
-				{"context_size", shape{kind: enumValue, nullable: true, values: []string{"low", "medium", "high"}}},
-				{"location", shape{kind: objectValue, nullable: true, members: []member{
-					{"city", nullableString}, {"country", nullableString}, {"region", nullableString}, {"timezone", nullableString},
-				}}},
-				{"mode", shape{kind: enumValue, nullable: true, values: []string{"disabled", "cached", "live"}}},
-			},
-		}}}
-	agentText = shape{kind: objectValue, nullable: true, members: []member{
-		{"format", shape{kind: unionValue, nullable: true, values: []string{"text", "json_schema"},
-			variants: map[string][]member{"text": nil, "json_schema": {{"schema", shape{kind: mapValue, required: true}}}}}},
-		{"verbosity", shape{kind: enumValue, nullable: true, values: []string{"low", "medium", "high"}}},
-	}}
-	agentReasoning = shape{kind: objectValue, nullable: true, members: []member{
-		{"effort", shape{kind: enumValue, nullable: true, values: []string{"none", "minimal", "low", "medium", "high", "xhigh", "max"}}},
-		{"summary", shape{kind: enumValue, nullable: true, values: []string{"concise", "detailed", "auto"}}},
-	}}
-	agentMultiAgent = shape{kind: objectValue, nullable: true, members: []member{
-		{"enabled", shape{kind: booleanValue, required: true}},
-		{"max_concurrent_subagents", shape{kind: integerValue, minimum: 1}},
-	}}
-
-	savedAgentCreate = agentShape(true, true)
-	savedAgentUpdate = agentShape(true, false)
-	sessionAgent     = agentShape(false, false)
-)
-
-// agentShape returns AgentCreateParams, AgentUpdateParams or the Session Agent.
-// Saved Agents additionally carry name and metadata; only creation requires a model.
-func agentShape(saved, create bool) shape {
-	members := []member{
-		{"model", shape{kind: stringValue, required: create}},
-		{"instructions", nullableString},
-		{"multi_agent", agentMultiAgent},
-		{"reasoning", agentReasoning},
-		{"service_tier", shape{kind: enumValue, nullable: true, values: []string{"auto", "default", "flex", "priority", "fast"}}},
-		{"text", agentText},
-		{"tools", agentTools},
-		{"x_agents_core", shape{}},
-	}
-	if saved {
-		members = append(members, member{"name", nullableString}, member{"metadata", shape{}})
-	}
-	return shape{kind: objectValue, members: members}
-}
+var requiredString = shape{kind: stringValue, required: true}
 
 // validateSavedAgentBody checks a saved Agent create or update body. Malformed
 // and non-object bodies keep the existing whole-body error.
@@ -129,7 +61,7 @@ func validateSavedAgentBody(raw []byte, root shape) error {
 
 // validateSessionAgent checks the inline Session agent, whose paths start with agent.
 func validateSessionAgent(raw json.RawMessage) error {
-	return validateAgentConfiguration("agent", raw, sessionAgent)
+	return validateAgentConfiguration("agent", raw, sessionAgentConfigParam)
 }
 
 func validateAgentConfiguration(path string, raw json.RawMessage, root shape) error {
@@ -196,7 +128,19 @@ func checkValue(path string, raw json.RawMessage, s shape) error {
 		}
 	case mapValue:
 		if got != "an object" {
-			return invalidType(path, "an object with string keys and unknown value values", got)
+			values := "unknown value"
+			if s.items != nil {
+				values = "string"
+			}
+			return invalidType(path, "an object with string keys and "+values+" values", got)
+		}
+		if s.items != nil {
+			keys, fields := orderedMembers(raw)
+			for _, key := range keys {
+				if err := checkValue(joinPath(path, key), fields[key], *s.items); err != nil {
+					return err
+				}
+			}
 		}
 	case openObject:
 		if got != "an object" {
diff --git a/services/core/internal/api/configuration_validation_test.go b/services/core/internal/api/configuration_validation_test.go
index 2297b7b32..ed4f7fa6c 100644
--- a/services/core/internal/api/configuration_validation_test.go
+++ b/services/core/internal/api/configuration_validation_test.go
@@ -83,6 +83,7 @@ func TestAgentConfigurationProtocolErrorsUseOfficialFields(t *testing.T) {
 		{"F03", `"tools":[{"type":"function","name":"lookup","description":"Look up a value."}]`, "{p}tools[0].parameters", "Missing required parameter: '{p}tools[0].parameters'."},
 		{"F04", `"tools":[` + lookupTool("lookup", `,"strict":true`) + `]`, "{p}tools[0].strict", "Unknown parameter: '{p}tools[0].strict'."},
 		{"F05", `"tools":[{"type":"function","name":"lookup","parameters":{"type":"object"}}]`, "{p}tools[0].description", "Missing required parameter: '{p}tools[0].description'."},
+		{"function order", `"tools":[{"type":"function","parameters":{"type":"object"}}]`, "{p}tools[0].name", "Missing required parameter: '{p}tools[0].name'."},
 		{"U01", `"tools":[{"type":"code_interpreter"}]`, "{p}tools[0].type", "Invalid value: 'code_interpreter'. Supported values are: 'function'" + tools},
 		{"U02", `"tools":[{"type":"bogus_tool"}]`, "{p}tools[0].type", "Invalid value: 'bogus_tool'. Supported values are: 'function'" + tools},
 		{"W03", `"tools":[{"type":"web_search","mode":"bogus"}]`, "{p}tools[0].mode", "Invalid value: 'bogus'. Supported values are: 'disabled', 'cached', and 'live'."},
@@ -110,6 +111,10 @@ func TestAgentConfigurationProtocolErrorsUseOfficialFields(t *testing.T) {
 		{"null enabled", `"tools":[{"type":"programmatic_tool_calling","enabled":null}]`, "{p}tools[0].enabled", "Invalid type for '{p}tools[0].enabled': expected a boolean, but got null instead."},
 		{"mcp origin", `"tools":[{"type":"mcp","server_label":"x","transport":{"type":"http","server_url":"https://example.invalid"},"connection_origin":"bogus"}]`, "{p}tools[0].connection_origin", "Invalid value: 'bogus'. Supported values are: 'service' and 'environment'."},
 		{"mcp transport", `"tools":[{"type":"mcp","server_label":"x"}]`, "{p}tools[0].transport", "Missing required parameter: '{p}tools[0].transport'."},
+		{"stdio cwd", `"tools":[{"type":"mcp","server_label":"x","transport":{"type":"stdio","command":"run"}}]`, "{p}tools[0].transport.cwd", "Missing required parameter: '{p}tools[0].transport.cwd'."},
+		{"http url", `"tools":[{"type":"mcp","server_label":"x","transport":{"type":"http"}}]`, "{p}tools[0].transport.server_url", "Missing required parameter: '{p}tools[0].transport.server_url'."},
+		{"transport type", `"tools":[{"type":"mcp","server_label":"x","transport":{"type":"ws"}}]`, "{p}tools[0].transport.type", "Invalid value: 'ws'. Supported values are: 'http' and 'stdio'."},
+		{"header value", `"tools":[{"type":"mcp","server_label":"x","transport":{"type":"http","server_url":"https://example.invalid","headers":{"h":1}}}]`, "{p}tools[0].transport.headers.h", "Invalid type for '{p}tools[0].transport.headers.h': expected a string, but got an integer instead."},
 		{"verbosity", `"text":{"verbosity":"verbose"}`, "{p}text.verbosity", "Invalid value: 'verbose'. Supported values are: 'low', 'medium', and 'high'."},
 		{"text member", `"text":{"unknown":true}`, "{p}text.unknown", "Unknown parameter: '{p}text.unknown'."},
 		{"format type", `"text":{"format":{}}`, "{p}text.format.type", "Missing required parameter: '{p}text.format.type'."},
@@ -193,6 +198,9 @@ func TestSessionAgentProtocolErrors(t *testing.T) {
 	}
 	for _, path := range []string{"/v1/agents", "/v1/agents/" + uuid.NewString()} {
 		assertConfigurationError(t, credentialRequest(h, http.MethodPost, path, `{"model":4}`), "invalid_request_error", param("model"), "Invalid type for 'model': expected a string, but got an integer instead.")
+		assertConfigurationError(t, credentialRequest(h, http.MethodPost, path, `{"model":"m","metadata":5}`), "invalid_request_error", param("metadata"), "Invalid type for 'metadata': expected an object with string keys and string values, but got an integer instead.")
+		// Inline authorization is a Session-only transport member.
+		assertConfigurationError(t, credentialRequest(h, http.MethodPost, path, `{"model":"m","tools":[{"type":"mcp","server_label":"x","transport":{"type":"http","server_url":"https://example.invalid","authorization":"x"}}]}`), "invalid_request_error", param("tools[0].transport.authorization"), "Unknown parameter: 'tools[0].transport.authorization'.")
 		assertConfigurationError(t, credentialRequest(h, http.MethodPost, path, `{"model":"m","model":"n"}`), "invalid_request_error", nil, "Invalid body: duplicate JSON key 'model' at 'model'. Duplicate JSON keys are not supported.")
 	}
 	// Saved Agent creation requires a model; updates and Session overrides do not.
@@ -267,6 +275,9 @@ func TestAgentConfigurationLocalLimitsKeepCodes(t *testing.T) {
 	for _, op := range configurationOperations()[:2] {
 		assertConfigurationError(t, credentialRequest(h, http.MethodPost, op.path, op.body(`"multi_agent":{"enabled":true,"max_concurrent_subagents":4294967296}`)), "unsupported_or_invalid_configuration", nil, "max_concurrent_subagents must be an integer from 1 to 4294967295.")
 	}
+	for _, op := range configurationOperations()[:3] {
+		assertConfigurationError(t, credentialRequest(h, http.MethodPost, op.path, op.body(`"tools":[{"type":"mcp","server_label":"x","transport":{"type":"stdio","command":"run","cwd":"/"}}]`)), "unsupported_or_invalid_configuration", nil, "MCP currently supports HTTP transport only.")
+	}
 	if s.writes != 0 {
 		t.Fatal("rejected configuration reached storage")
 	}
diff --git a/services/core/internal/api/disabled_tools.go b/services/core/internal/api/disabled_tools.go
index b52f3d9a3..884f8092d 100644
--- a/services/core/internal/api/disabled_tools.go
+++ b/services/core/internal/api/disabled_tools.go
@@ -5,31 +5,28 @@ import (
 	"errors"
 )
 
-func resolveProgrammaticTool(raw json.RawMessage) (json.RawMessage, error) {
-	var input struct {
-		Type    string          `json:"type"`
-		Enabled json.RawMessage `json:"enabled"`
-	}
-	if decodeInputObject(raw, &input, "type", "enabled") != nil {
-		return nil, errors.New("Invalid programmatic_tool_calling fields.")
-	}
-	enabled, err := optionalBoolean(input.Enabled, true)
-	if err != nil {
-		return nil, errors.New("programmatic_tool_calling.enabled must be a boolean.")
-	}
-	return json.Marshal(struct {
+// Tool resolvers read tools whose pinned shape was checked at the /v1 boundary:
+// request tools, or a saved Agent's tools that resolveSavedTools stored. A
+// decode failure is Core's own fault and is reported as a service error.
+func resolveProgrammaticTool(raw json.RawMessage) (json.RawMessage, bool, error) {
+	input := struct {
 		Type    string `json:"type"`
 		Enabled bool   `json:"enabled"`
-	}{input.Type, enabled})
+	}{Enabled: true}
+	if err := json.Unmarshal(raw, &input); err != nil {
+		return nil, false, &storedDataError{err}
+	}
+	value, err := json.Marshal(input)
+	return value, input.Enabled, err
 }
 
 // webSearchTool is the resolved web_search projection. A present location
 // projects all four keys; null and empty allowed_domains stay distinct.
 type webSearchTool struct {
-	Type           string    `json:"type"`
-	Mode           *string   `json:"mode"`
-	ContextSize    *string   `json:"context_size"`
-	AllowedDomains []*string `json:"allowed_domains"`
+	Type           string   `json:"type"`
+	Mode           *string  `json:"mode"`
+	ContextSize    *string  `json:"context_size"`
+	AllowedDomains []string `json:"allowed_domains"`
 	Location       *struct {
 		City     *string `json:"city"`
 		Country  *string `json:"country"`
@@ -38,27 +35,12 @@ type webSearchTool struct {
 	} `json:"location"`
 }
 
-func decodeWebSearch(raw json.RawMessage) (webSearchTool, bool) {
-	var tool webSearchTool
-	return tool, decodeInputObject(raw, &tool, "type", "mode", "context_size", "allowed_domains", "location") == nil
-}
-
 // Optional settings are resource data in every mode; they never enable execution.
 func (tool webSearchTool) resolveSettings() (json.RawMessage, error) {
 	if tool.ContextSize == nil {
 		value := "medium"
 		tool.ContextSize = &value
 	}
-	for _, domain := range tool.AllowedDomains {
-		if domain == nil {
-			return nil, errors.New("web_search.allowed_domains must contain strings.")
-		}
-	}
-	switch *tool.ContextSize {
-	case "low", "medium", "high":
-	default:
-		return nil, errors.New("Invalid web_search.context_size.")
-	}
 	return json.Marshal(tool)
 }
 
@@ -66,26 +48,24 @@ func (tool webSearchTool) resolveSettings() (json.RawMessage, error) {
 // or null mode is saved as live. Session admission still qualifies only disabled
 // search (resolveDisabledWebSearch), so saving never enables execution.
 func resolveSavedWebSearch(raw json.RawMessage) (json.RawMessage, error) {
-	tool, ok := decodeWebSearch(raw)
-	if !ok {
-		return nil, errors.New("Invalid web_search fields.")
+	var tool webSearchTool
+	if err := json.Unmarshal(raw, &tool); err != nil {
+		return nil, &storedDataError{err}
 	}
 	if tool.Mode == nil {
 		value := "live"
 		tool.Mode = &value
 	}
-	switch *tool.Mode {
-	case "disabled", "cached", "live":
-	default:
-		return nil, errors.New("web_search.mode must be disabled, cached or live.")
-	}
 	return tool.resolveSettings()
 }
 
 // Only disabled search is qualified for execution.
 func resolveDisabledWebSearch(raw json.RawMessage) (json.RawMessage, error) {
-	tool, ok := decodeWebSearch(raw)
-	if !ok || tool.Mode == nil || *tool.Mode != "disabled" {
+	var tool webSearchTool
+	if err := json.Unmarshal(raw, &tool); err != nil {
+		return nil, &storedDataError{err}
+	}
+	if tool.Mode == nil || *tool.Mode != "disabled" {
 		return nil, errors.New("Only disabled web_search is qualified for execution.")
 	}
 	return tool.resolveSettings()
diff --git a/services/core/internal/api/errors.go b/services/core/internal/api/errors.go
index 676d51ee0..2e92da06d 100644
--- a/services/core/internal/api/errors.go
+++ b/services/core/internal/api/errors.go
@@ -105,6 +105,28 @@ func writeInternalError(w http.ResponseWriter, r *http.Request) {
 	writeError(w, http.StatusInternalServerError, "internal_error", "The operation could not be completed.")
 }
 
+// storedDataError carries a failure of Core's own stored or resolved
+// configuration on the Agent and Session paths: a saved configuration or tool
+// that Core resolved or stored and that does not decode, or a storage or
+// decryption failure while reading the deployment default model provider. It
+// is never the client's input, so it is never echoed in a response.
+type storedDataError struct{ err error }
+
+func (e *storedDataError) Error() string { return e.err.Error() }
+func (e *storedDataError) Unwrap() error { return e.err }
+
+// writeStoredDataError reports a storedDataError as a service error and returns
+// false for any other error. The underlying failure is logged for diagnosis.
+func writeStoredDataError(w http.ResponseWriter, r *http.Request, err error) bool {
+	var stored *storedDataError
+	if !errors.As(err, &stored) {
+		return false
+	}
+	log.Ctx(r.Context()).Error("oac-core stored data failed", "error", stored.err)
+	writeModelConfigurationError(w, r, stored.err)
+	return true
+}
+
 // writeTextValueError reports request text that PostgreSQL cannot store and
 // returns false for any other error. It is a documented local limit: text and
 // jsonb cannot store U+0000, and text parameters, including query filters,
diff --git a/services/core/internal/api/errors_agents.go b/services/core/internal/api/errors_agents.go
index 1e891cdc3..3fc3a8df4 100644
--- a/services/core/internal/api/errors_agents.go
+++ b/services/core/internal/api/errors_agents.go
@@ -10,7 +10,7 @@ import (
 
 // writeAgentsError reports an error of the Agent operations.
 func writeAgentsError(w http.ResponseWriter, r *http.Request, err error) {
-	if writeTextValueError(w, r, err) || writeAuditSourceError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+	if writeStoredDataError(w, r, err) || writeTextValueError(w, r, err) || writeAuditSourceError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
 		return
 	}
 	switch {
diff --git a/services/core/internal/api/function_configuration.go b/services/core/internal/api/function_configuration.go
index 6d013317c..0674a43f5 100644
--- a/services/core/internal/api/function_configuration.go
+++ b/services/core/internal/api/function_configuration.go
@@ -1,7 +1,6 @@
 package api
 
 import (
-	"bytes"
 	"encoding/json"
 	"errors"
 	"strings"
@@ -16,51 +15,28 @@ func resolveFunctions(input []v1.FunctionToolInput) ([]json.RawMessage, error) {
 	}
 	names := make(map[string]bool, len(input))
 	for _, tool := range input {
-		value, _, err := resolveFunction(tool)
+		if strings.TrimSpace(tool.Name) == "" || len(tool.Name) > 512 || names[tool.Name] {
+			return nil, errors.New("Function names must be nonempty, unique and at most 512 bytes.")
+		}
+		value, err := resolveFunction(tool)
 		if err != nil {
 			return nil, err
 		}
-		if strings.TrimSpace(*tool.Name) == "" || len(*tool.Name) > 512 || names[*tool.Name] {
-			return nil, errors.New("Function names must be nonempty, unique and at most 512 bytes.")
-		}
-
-		names[*tool.Name] = true
+		names[tool.Name] = true
 		tools = append(tools, value)
 	}
 	return tools, nil
 }
 
-// resolveFunction validates the persisted wire shape. Execution admission may
-// impose additional restrictions, without narrowing the reusable resource.
-func resolveFunction(tool v1.FunctionToolInput) (json.RawMessage, bool, error) {
-	if tool.Type != "function" || tool.Name == nil || tool.Description == nil {
-		return nil, false, errors.New("Function tools require type=function, name and description.")
-	}
-	var schema map[string]json.RawMessage
-	if json.Unmarshal(tool.Parameters, &schema) != nil || schema == nil {
-		return nil, false, errors.New("Function parameters must be a JSON Schema object.")
-	}
-	deferred, err := optionalBoolean(tool.DeferLoading, false)
-	if err != nil {
-		return nil, false, errors.New("defer_loading must be a boolean when supplied.")
-	}
-	value, err := json.Marshal(struct {
+// resolveFunction canonicalizes a function whose pinned shape was checked at
+// the /v1 boundary. Execution admission may impose additional restrictions,
+// without narrowing the reusable resource.
+func resolveFunction(tool v1.FunctionToolInput) (json.RawMessage, error) {
+	return json.Marshal(struct {
 		Type         string          `json:"type"`
 		Name         string          `json:"name"`
 		Description  string          `json:"description"`
 		Parameters   json.RawMessage `json:"parameters"`
 		DeferLoading bool            `json:"defer_loading"`
-	}{"function", *tool.Name, *tool.Description, tool.Parameters, deferred})
-	return value, deferred, err
-}
-
-func optionalBoolean(raw json.RawMessage, fallback bool) (bool, error) {
-	if len(raw) == 0 {
-		return fallback, nil
-	}
-	var value bool
-	if bytes.Equal(bytes.TrimSpace(raw), []byte("null")) || json.Unmarshal(raw, &value) != nil {
-		return false, errors.New("Expected a boolean.")
-	}
-	return value, nil
+	}{"function", tool.Name, tool.Description, tool.Parameters, tool.DeferLoading != nil && *tool.DeferLoading})
 }
diff --git a/services/core/internal/api/handler.go b/services/core/internal/api/handler.go
index 2e358785e..33d76be58 100644
--- a/services/core/internal/api/handler.go
+++ b/services/core/internal/api/handler.go
@@ -232,12 +232,10 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		var required *modelProviderRequiredError
-		var defaults *modelProviderDefaultsError
 		switch {
 		case errors.As(err, &required):
 			writeError(w, http.StatusBadRequest, "model_provider_required", required.message, "x_agents_core.model_provider")
-		case errors.As(err, &defaults):
-			writeModelConfigurationError(w, r, defaults.err)
+		case writeStoredDataError(w, r, err):
 		case !writeFieldError(w, err):
 			writeError(w, http.StatusBadRequest, "unsupported_or_invalid_configuration", err.Error())
 		}
diff --git a/services/core/internal/api/mcp_configuration.go b/services/core/internal/api/mcp_configuration.go
index e856bdb55..6af603b52 100644
--- a/services/core/internal/api/mcp_configuration.go
+++ b/services/core/internal/api/mcp_configuration.go
@@ -11,92 +11,63 @@ import (
 
 const mcpHTTPOnly = "MCP currently supports HTTP transport only."
 
+// resolveMCPTool canonicalizes a declaration whose pinned shape was checked at
+// decode. Core executes HTTP servers only and keeps its local limits.
 func resolveMCPTool(raw json.RawMessage, saved bool) (json.RawMessage, error) {
 	var input v1.MCPToolInput
-	if decodeInputObject(raw, &input, "type", "server_label", "transport", "allowed_tools", "connection_origin", "credential_id", "request_metadata", "required") != nil {
-		return nil, errors.New("Invalid MCP tool fields.")
+	var transport struct {
+		Type          string            `json:"type"`
+		ServerURL     string            `json:"server_url"`
+		Authorization *string           `json:"authorization"`
+		Headers       map[string]string `json:"headers"`
+	}
+	if err := errors.Join(json.Unmarshal(raw, &input), json.Unmarshal(input.Transport, &transport)); err != nil {
+		return nil, &storedDataError{err}
 	}
-	if input.Type != "mcp" || input.ServerLabel == nil || strings.TrimSpace(*input.ServerLabel) == "" {
+	if strings.TrimSpace(input.ServerLabel) == "" {
 		return nil, errors.New("MCP tools require type=mcp and a nonempty server_label.")
 	}
+	if transport.Type != "http" {
+		return nil, errors.New(mcpHTTPOnly)
+	}
 	// The official service saves an omitted or null origin on an HTTP server as
 	// "service" (MV-01). Defaulting it here makes the stored and frozen
-	// configuration identical to an explicit declaration. Other transports are
-	// unsupported with any origin.
-	if input.ConnectionOrigin == nil {
-		if !mcpHTTPTransport(input.Transport) {
-			return nil, errors.New(mcpHTTPOnly)
-		}
-		service := "service"
-		input.ConnectionOrigin = &service
-	}
-	if *input.ConnectionOrigin != "service" && *input.ConnectionOrigin != "environment" {
-		return nil, errors.New("MCP connection_origin must be service or environment.")
+	// configuration identical to an explicit declaration.
+	origin := "service"
+	if input.ConnectionOrigin != nil {
+		origin = *input.ConnectionOrigin
 	}
 	if input.CredentialID != nil && *input.CredentialID == "" {
 		return nil, errors.New("MCP credential_id must be null or a nonempty string.")
 	}
-	required, err := optionalBoolean(input.Required, false)
-	if err != nil {
-		return nil, errors.New("MCP required must be a boolean.")
-	}
-	if !emptyMCPObject(input.RequestMetadata) {
+	if len(input.RequestMetadata) != 0 {
 		return nil, errors.New("Nonempty MCP request_metadata is not supported yet.")
 	}
-	var transport struct {
-		Type      string          `json:"type"`
-		ServerURL *string         `json:"server_url"`
-		Headers   json.RawMessage `json:"headers"`
-	}
-	if decodeInputObject(input.Transport, &transport, "type", "server_url", "headers") != nil || transport.Type != "http" || transport.ServerURL == nil {
-		return nil, errors.New(mcpHTTPOnly)
-	}
-	u, err := url.Parse(*transport.ServerURL)
+	u, err := url.Parse(transport.ServerURL)
 	if err != nil || u.Hostname() == "" || (u.Scheme != "http" && u.Scheme != "https") || u.User != nil || u.Fragment != "" || u.RawQuery != "" || u.ForceQuery {
 		return nil, errors.New("MCP server_url must be an absolute HTTP(S) URL without credentials, query or fragment.")
 	}
-	if !emptyMCPObject(transport.Headers) {
+	if transport.Authorization != nil {
+		return nil, errors.New("Inline MCP authorization is not supported yet.")
+	}
+	if len(transport.Headers) != 0 {
 		return nil, errors.New("Nonempty MCP headers are not supported yet.")
 	}
 	var allowed *[]string
-	if len(input.AllowedTools) != 0 {
-		var values *[]*string
-		if json.Unmarshal(input.AllowedTools, &values) != nil {
-			return nil, errors.New("MCP allowed_tools must be null or an array of tool names.")
-		}
-		if values != nil {
-			names := make([]string, 0, len(*values))
-			for _, name := range *values {
-				if name == nil || *name == "" {
-					return nil, errors.New("MCP allowed_tools requires nonempty string names.")
-				}
-				names = append(names, *name)
+	if input.AllowedTools != nil {
+		for _, name := range input.AllowedTools {
+			if name == "" {
+				return nil, errors.New("MCP allowed_tools requires nonempty string names.")
 			}
-			allowed = &names
 		}
+		allowed = &input.AllowedTools
 	}
-	tool := v1.MCPTool{Type: "mcp", ServerLabel: *input.ServerLabel,
-		Transport:    v1.MCPHTTPTransport{Type: "http", ServerURL: *transport.ServerURL},
-		AllowedTools: allowed, Required: required, ConnectionOrigin: *input.ConnectionOrigin, CredentialID: input.CredentialID, RequestMetadata: map[string]json.RawMessage{}}
+	tool := v1.MCPTool{Type: "mcp", ServerLabel: input.ServerLabel,
+		Transport:    v1.MCPHTTPTransport{Type: "http", ServerURL: transport.ServerURL},
+		AllowedTools: allowed, Required: input.Required != nil && *input.Required, ConnectionOrigin: origin, CredentialID: input.CredentialID, RequestMetadata: map[string]json.RawMessage{}}
 	if saved {
 		headers := map[string]string{}
 		tool.Transport.Headers = &headers
 	}
 	return json.Marshal(tool)
 }
-
-// mcpHTTPTransport reports a transport object whose exact "type" member is
-// "http". The complete transport is validated afterwards.
-func mcpHTTPTransport(raw json.RawMessage) bool {
-	var fields map[string]json.RawMessage
-	var kind string
-	return json.Unmarshal(raw, &fields) == nil && json.Unmarshal(fields["type"], &kind) == nil && kind == "http"
-}
-
-func emptyMCPObject(raw json.RawMessage) bool {
-	if len(raw) == 0 {
-		return true
-	}
-	var value map[string]json.RawMessage
-	return json.Unmarshal(raw, &value) == nil && len(value) == 0
-}
diff --git a/services/core/internal/api/mcp_configuration_test.go b/services/core/internal/api/mcp_configuration_test.go
index 49ecc87e7..f0013cafb 100644
--- a/services/core/internal/api/mcp_configuration_test.go
+++ b/services/core/internal/api/mcp_configuration_test.go
@@ -70,7 +70,7 @@ func TestMCPOmittedOriginIsService(t *testing.T) {
 	}
 	// Other transports report the transport restriction with any origin.
 	for _, origin := range []string{"", `,"connection_origin":null`, `,"connection_origin":"service"`} {
-		input := `{"type":"mcp","server_label":"records"` + origin + `,"transport":{"type":"stdio","command":"run"}}`
+		input := `{"type":"mcp","server_label":"records"` + origin + `,"transport":{"type":"stdio","command":"run","cwd":"/"}}`
 		if _, err := resolveMCPTool(json.RawMessage(input), true); err == nil || err.Error() != "MCP currently supports HTTP transport only." {
 			t.Fatalf("stdio origin %q: %v", origin, err)
 		}
@@ -85,6 +85,7 @@ func TestMCPAllowedToolsAndOptionalFields(t *testing.T) {
 		}
 		input["allowed_tools"] = json.RawMessage(allowed)
 		input["credential_id"], input["request_metadata"], input["required"] = json.RawMessage("null"), json.RawMessage("null"), json.RawMessage("false")
+		input["transport"] = json.RawMessage(`{"type":"http","server_url":"https://mcp.example.test/tools","authorization":null,"headers":null}`)
 		encoded, _ := json.Marshal(input)
 		resolved, err := resolveMCPTool(encoded, false)
 		if err != nil {
@@ -97,24 +98,18 @@ func TestMCPAllowedToolsAndOptionalFields(t *testing.T) {
 	}
 }
 
+// The pinned shape is checked at decode; these inputs match it.
 func TestMCPUnsupportedInputsAreSecretSafe(t *testing.T) {
 	for name, replacement := range map[string]map[string]json.RawMessage{
-		"unknown origin":       {"connection_origin": json.RawMessage(`"unknown"`)},
-		"stdio origin missing": {"connection_origin": nil, "transport": json.RawMessage(`{"type":"stdio","command":"private-marker"}`)},
-		"stdio origin null":    {"connection_origin": json.RawMessage("null"), "transport": json.RawMessage(`{"type":"stdio","command":"private-marker"}`)},
-		"origin missing, case": {"connection_origin": nil, "transport": json.RawMessage(`{"Type":"http","server_url":"https://mcp.example.test"}`)},
-		"required type":        {"required": json.RawMessage(`"true"`)},
-		"required null":        {"required": json.RawMessage("null")},
+		"stdio origin missing": {"connection_origin": nil, "transport": json.RawMessage(`{"type":"stdio","command":"private-marker","cwd":"/"}`)},
+		"stdio origin null":    {"connection_origin": json.RawMessage("null"), "transport": json.RawMessage(`{"type":"stdio","command":"private-marker","cwd":"/"}`)},
 		"empty credential":     {"credential_id": json.RawMessage(`""`)},
-		"credential type":      {"credential_id": json.RawMessage(`3`)},
 		"metadata":             {"request_metadata": json.RawMessage(`{"private-marker":"value"}`)},
-		"null tool name":       {"allowed_tools": json.RawMessage(`[null]`)},
-		"wrong allow-list":     {"allowed_tools": json.RawMessage(`"lookup"`)},
 		"inline authorization": {"transport": json.RawMessage(`{"type":"http","server_url":"https://mcp.example.test","authorization":"private-marker"}`)},
 		"headers":              {"transport": json.RawMessage(`{"type":"http","server_url":"https://mcp.example.test","headers":{"Authorization":"private-marker"}}`)},
 		"URL credentials":      {"transport": json.RawMessage(`{"type":"http","server_url":"https://private-marker@mcp.example.test"}`)},
 		"URL query":            {"transport": json.RawMessage(`{"type":"http","server_url":"https://mcp.example.test/?token=private-marker"}`)},
-		"stdio":                {"transport": json.RawMessage(`{"type":"stdio","command":"private-marker"}`)},
+		"stdio":                {"transport": json.RawMessage(`{"type":"stdio","command":"private-marker","cwd":"/"}`)},
 	} {
 		t.Run(name, func(t *testing.T) {
 			var input map[string]json.RawMessage
diff --git a/services/core/internal/api/official_shapes.gen.go b/services/core/internal/api/official_shapes.gen.go
new file mode 100644
index 000000000..b4ba45f34
--- /dev/null
+++ b/services/core/internal/api/official_shapes.gen.go
@@ -0,0 +1,210 @@
+// Code generated by scripts/generate-public-api.py; DO NOT EDIT.
+package api
+
+// Pinned request shapes; x_agents_core is checked by its own parser.
+var (
+	createAgentParams = shape{kind: objectValue, members: []member{
+		{"metadata", shape{kind: mapValue, items: &shape{kind: stringValue}, nullable: true}},
+		{"name", shape{kind: stringValue, nullable: true}},
+		{"model", shape{kind: stringValue, required: true}},
+		{"reasoning", shape{kind: objectValue, members: []member{
+			{"effort", shape{kind: enumValue, values: []string{"none", "minimal", "low", "medium", "high", "xhigh", "max"}, nullable: true}},
+			{"summary", shape{kind: enumValue, values: []string{"concise", "detailed", "auto"}, nullable: true}},
+		}, nullable: true}},
+		{"text", shape{kind: objectValue, members: []member{
+			{"format", shape{kind: unionValue, values: []string{"text", "json_schema"}, variants: map[string][]member{
+				"text": {},
+				"json_schema": {
+					{"schema", shape{kind: mapValue, required: true}},
+				},
+			}, nullable: true}},
+			{"verbosity", shape{kind: enumValue, values: []string{"low", "medium", "high"}, nullable: true}},
+		}, nullable: true}},
+		{"service_tier", shape{kind: enumValue, values: []string{"auto", "default", "flex", "priority", "fast"}, nullable: true}},
+		{"instructions", shape{kind: stringValue, nullable: true}},
+		{"tools", shape{kind: arrayValue, items: &shape{kind: unionValue, values: []string{"function", "tool_search", "programmatic_tool_calling", "mcp", "web_search"}, variants: map[string][]member{
+			"function": {
+				{"name", shape{kind: stringValue, required: true}},
+				{"description", shape{kind: stringValue, required: true}},
+				{"parameters", shape{kind: mapValue, required: true}},
+				{"defer_loading", shape{kind: booleanValue}},
+			},
+			"tool_search": {},
+			"programmatic_tool_calling": {
+				{"enabled", shape{kind: booleanValue}},
+			},
+			"mcp": {
+				{"server_label", shape{kind: stringValue, required: true}},
+				{"credential_id", shape{kind: stringValue, nullable: true}},
+				{"transport", shape{kind: unionValue, values: []string{"http", "stdio"}, variants: map[string][]member{
+					"http": {
+						{"server_url", shape{kind: stringValue, required: true}},
+						{"headers", shape{kind: mapValue, items: &shape{kind: stringValue}, nullable: true}},
+					},
+					"stdio": {
+						{"command", shape{kind: stringValue, required: true}},
+						{"args", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+						{"cwd", shape{kind: stringValue, required: true}},
+						{"env_vars", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+					},
+				}, required: true}},
+				{"request_metadata", shape{kind: mapValue, nullable: true}},
+				{"allowed_tools", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+				{"required", shape{kind: booleanValue}},
+				{"connection_origin", shape{kind: enumValue, values: []string{"service", "environment"}, nullable: true}},
+			},
+			"web_search": {
+				{"mode", shape{kind: enumValue, values: []string{"disabled", "cached", "live"}, nullable: true}},
+				{"context_size", shape{kind: enumValue, values: []string{"low", "medium", "high"}, nullable: true}},
+				{"allowed_domains", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+				{"location", shape{kind: objectValue, members: []member{
+					{"country", shape{kind: stringValue, nullable: true}},
+					{"region", shape{kind: stringValue, nullable: true}},
+					{"city", shape{kind: stringValue, nullable: true}},
+					{"timezone", shape{kind: stringValue, nullable: true}},
+				}, nullable: true}},
+			},
+		}}, nullable: true}},
+		{"multi_agent", shape{kind: objectValue, members: []member{
+			{"enabled", shape{kind: booleanValue, required: true}},
+			{"max_concurrent_subagents", shape{kind: integerValue, minimum: 1}},
+		}, nullable: true}},
+		{"x_agents_core", shape{}},
+	}}
+	updateAgentParams = shape{kind: objectValue, members: []member{
+		{"model", shape{kind: stringValue}},
+		{"reasoning", shape{kind: objectValue, members: []member{
+			{"effort", shape{kind: enumValue, values: []string{"none", "minimal", "low", "medium", "high", "xhigh", "max"}, nullable: true}},
+			{"summary", shape{kind: enumValue, values: []string{"concise", "detailed", "auto"}, nullable: true}},
+		}, nullable: true}},
+		{"text", shape{kind: objectValue, members: []member{
+			{"format", shape{kind: unionValue, values: []string{"text", "json_schema"}, variants: map[string][]member{
+				"text": {},
+				"json_schema": {
+					{"schema", shape{kind: mapValue, required: true}},
+				},
+			}, nullable: true}},
+			{"verbosity", shape{kind: enumValue, values: []string{"low", "medium", "high"}, nullable: true}},
+		}, nullable: true}},
+		{"service_tier", shape{kind: enumValue, values: []string{"auto", "default", "flex", "priority", "fast"}, nullable: true}},
+		{"instructions", shape{kind: stringValue, nullable: true}},
+		{"multi_agent", shape{kind: objectValue, members: []member{
+			{"enabled", shape{kind: booleanValue, required: true}},
+			{"max_concurrent_subagents", shape{kind: integerValue, minimum: 1}},
+		}, nullable: true}},
+		{"metadata", shape{kind: mapValue, items: &shape{kind: stringValue}, nullable: true}},
+		{"name", shape{kind: stringValue, nullable: true}},
+		{"tools", shape{kind: arrayValue, items: &shape{kind: unionValue, values: []string{"function", "tool_search", "programmatic_tool_calling", "mcp", "web_search"}, variants: map[string][]member{
+			"function": {
+				{"name", shape{kind: stringValue, required: true}},
+				{"description", shape{kind: stringValue, required: true}},
+				{"parameters", shape{kind: mapValue, required: true}},
+				{"defer_loading", shape{kind: booleanValue}},
+			},
+			"tool_search": {},
+			"programmatic_tool_calling": {
+				{"enabled", shape{kind: booleanValue}},
+			},
+			"mcp": {
+				{"server_label", shape{kind: stringValue, required: true}},
+				{"credential_id", shape{kind: stringValue, nullable: true}},
+				{"transport", shape{kind: unionValue, values: []string{"http", "stdio"}, variants: map[string][]member{
+					"http": {
+						{"server_url", shape{kind: stringValue, required: true}},
+						{"headers", shape{kind: mapValue, items: &shape{kind: stringValue}, nullable: true}},
+					},
+					"stdio": {
+						{"command", shape{kind: stringValue, required: true}},
+						{"args", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+						{"cwd", shape{kind: stringValue, required: true}},
+						{"env_vars", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+					},
+				}, required: true}},
+				{"request_metadata", shape{kind: mapValue, nullable: true}},
+				{"allowed_tools", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+				{"required", shape{kind: booleanValue}},
+				{"connection_origin", shape{kind: enumValue, values: []string{"service", "environment"}, nullable: true}},
+			},
+			"web_search": {
+				{"mode", shape{kind: enumValue, values: []string{"disabled", "cached", "live"}, nullable: true}},
+				{"context_size", shape{kind: enumValue, values: []string{"low", "medium", "high"}, nullable: true}},
+				{"allowed_domains", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+				{"location", shape{kind: objectValue, members: []member{
+					{"country", shape{kind: stringValue, nullable: true}},
+					{"region", shape{kind: stringValue, nullable: true}},
+					{"city", shape{kind: stringValue, nullable: true}},
+					{"timezone", shape{kind: stringValue, nullable: true}},
+				}, nullable: true}},
+			},
+		}}, nullable: true}},
+		{"x_agents_core", shape{}},
+	}}
+	sessionAgentConfigParam = shape{kind: objectValue, members: []member{
+		{"model", shape{kind: stringValue}},
+		{"reasoning", shape{kind: objectValue, members: []member{
+			{"effort", shape{kind: enumValue, values: []string{"none", "minimal", "low", "medium", "high", "xhigh", "max"}, nullable: true}},
+			{"summary", shape{kind: enumValue, values: []string{"concise", "detailed", "auto"}, nullable: true}},
+		}, nullable: true}},
+		{"text", shape{kind: objectValue, members: []member{
+			{"format", shape{kind: unionValue, values: []string{"text", "json_schema"}, variants: map[string][]member{
+				"text": {},
+				"json_schema": {
+					{"schema", shape{kind: mapValue, required: true}},
+				},
+			}, nullable: true}},
+			{"verbosity", shape{kind: enumValue, values: []string{"low", "medium", "high"}, nullable: true}},
+		}, nullable: true}},
+		{"service_tier", shape{kind: enumValue, values: []string{"auto", "default", "flex", "priority", "fast"}, nullable: true}},
+		{"instructions", shape{kind: stringValue, nullable: true}},
+		{"multi_agent", shape{kind: objectValue, members: []member{
+			{"enabled", shape{kind: booleanValue, required: true}},
+			{"max_concurrent_subagents", shape{kind: integerValue, minimum: 1}},
+		}, nullable: true}},
+		{"tools", shape{kind: arrayValue, items: &shape{kind: unionValue, values: []string{"function", "tool_search", "programmatic_tool_calling", "mcp", "web_search"}, variants: map[string][]member{
+			"function": {
+				{"name", shape{kind: stringValue, required: true}},
+				{"description", shape{kind: stringValue, required: true}},
+				{"parameters", shape{kind: mapValue, required: true}},
+				{"defer_loading", shape{kind: booleanValue}},
+			},
+			"tool_search": {},
+			"programmatic_tool_calling": {
+				{"enabled", shape{kind: booleanValue}},
+			},
+			"mcp": {
+				{"server_label", shape{kind: stringValue, required: true}},
+				{"credential_id", shape{kind: stringValue, nullable: true}},
+				{"transport", shape{kind: unionValue, values: []string{"http", "stdio"}, variants: map[string][]member{
+					"http": {
+						{"server_url", shape{kind: stringValue, required: true}},
+						{"authorization", shape{kind: stringValue, nullable: true}},
+						{"headers", shape{kind: mapValue, items: &shape{kind: stringValue}, nullable: true}},
+					},
+					"stdio": {
+						{"command", shape{kind: stringValue, required: true}},
+						{"args", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+						{"cwd", shape{kind: stringValue, required: true}},
+						{"env", shape{kind: mapValue, items: &shape{kind: stringValue}, nullable: true}},
+						{"env_vars", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+					},
+				}, required: true}},
+				{"request_metadata", shape{kind: mapValue, nullable: true}},
+				{"allowed_tools", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+				{"required", shape{kind: booleanValue}},
+				{"connection_origin", shape{kind: enumValue, values: []string{"service", "environment"}, nullable: true}},
+			},
+			"web_search": {
+				{"mode", shape{kind: enumValue, values: []string{"disabled", "cached", "live"}, nullable: true}},
+				{"context_size", shape{kind: enumValue, values: []string{"low", "medium", "high"}, nullable: true}},
+				{"allowed_domains", shape{kind: arrayValue, items: &shape{kind: stringValue}, nullable: true}},
+				{"location", shape{kind: objectValue, members: []member{
+					{"country", shape{kind: stringValue, nullable: true}},
+					{"region", shape{kind: stringValue, nullable: true}},
+					{"city", shape{kind: stringValue, nullable: true}},
+					{"timezone", shape{kind: stringValue, nullable: true}},
+				}, nullable: true}},
+			},
+		}}, nullable: true}},
+		{"x_agents_core", shape{}},
+	}}
+)
diff --git a/services/core/internal/api/saved_configuration.go b/services/core/internal/api/saved_configuration.go
index 37463d1bc..167e04753 100644
--- a/services/core/internal/api/saved_configuration.go
+++ b/services/core/internal/api/saved_configuration.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"slices"
 	"unicode/utf8"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
@@ -47,19 +46,10 @@ func resolveSavedFields(input v1.CreateAgentRequest) (agents.CreateCommand, erro
 		return agents.CreateCommand{}, err
 	}
 	if input.ServiceTier != nil {
-		if !slices.Contains([]string{"auto", "default", "flex", "priority", "fast"}, *input.ServiceTier) {
-			return agents.CreateCommand{}, errors.New("service_tier must be auto, default, flex, priority or fast.")
-		}
 		cfg.ServiceTier = *input.ServiceTier
 	}
 	if input.Reasoning != nil {
 		cfg.Reasoning = *input.Reasoning
-		if cfg.Reasoning.Effort != nil && !slices.Contains([]string{"none", "minimal", "low", "medium", "high", "xhigh", "max"}, *cfg.Reasoning.Effort) {
-			return agents.CreateCommand{}, errors.New("reasoning.effort is not a supported protocol value.")
-		}
-		if cfg.Reasoning.Summary != nil && !slices.Contains([]string{"concise", "detailed", "auto"}, *cfg.Reasoning.Summary) {
-			return agents.CreateCommand{}, errors.New("reasoning.summary must be concise, detailed or auto.")
-		}
 	}
 	// Model-derived effort resolution is a recorded gap. Do not manufacture a
 	// default from the operator's execution engine or another model's catalog.
@@ -79,25 +69,23 @@ func resolveSavedFields(input v1.CreateAgentRequest) (agents.CreateCommand, erro
 	return result, err
 }
 
+// resolveSavedMultiAgent and resolveText read values whose pinned shape was
+// checked at decode; only the uint32 bound of max_concurrent_subagents remains.
 func resolveSavedMultiAgent(raw json.RawMessage) (v1.MultiAgentConfig, error) {
 	result := v1.MultiAgentConfig{}
 	if len(raw) == 0 || bytes.Equal(bytes.TrimSpace(raw), []byte("null")) {
 		return result, nil
 	}
-	var input struct {
-		Enabled *bool           `json:"enabled"`
-		Max     json.RawMessage `json:"max_concurrent_subagents"`
-	}
-	if decodeInputObject(raw, &input, "enabled", "max_concurrent_subagents") != nil || input.Enabled == nil {
-		return result, errors.New("multi_agent requires enabled as a boolean.")
-	}
-	maximum := uint32(6)
-	if len(input.Max) > 0 && (bytes.Equal(bytes.TrimSpace(input.Max), []byte("null")) || json.Unmarshal(input.Max, &maximum) != nil || maximum == 0) {
+	input := struct {
+		Enabled bool   `json:"enabled"`
+		Max     uint32 `json:"max_concurrent_subagents"`
+	}{Max: 6}
+	if json.Unmarshal(raw, &input) != nil {
 		return result, errors.New("max_concurrent_subagents must be an integer from 1 to 4294967295.")
 	}
-	result.Enabled = *input.Enabled
+	result.Enabled = input.Enabled
 	if result.Enabled {
-		value := int(maximum)
+		value := int(input.Max)
 		result.MaxConcurrentSubagents = &value
 	}
 	return result, nil
@@ -109,37 +97,13 @@ func resolveText(input *v1.TextConfigInput) (v1.TextConfig, error) {
 		return result, nil
 	}
 	if input.Verbosity != nil {
-		if err := validateTextVerbosity(*input.Verbosity); err != nil {
-			return result, err
-		}
 		result.Verbosity = *input.Verbosity
 	}
 	if len(input.Format) == 0 || bytes.Equal(bytes.TrimSpace(input.Format), []byte("null")) {
 		return result, nil
 	}
-	result.Format = v1.TextFormat{}
-	if decodeInputObject(input.Format, &result.Format, "type", "schema") != nil {
-		return result, errors.New("text.format must be a supported format object.")
-	}
-	switch result.Format.Type {
-	case "text":
-		if len(result.Format.Schema) > 0 {
-			return result, errors.New("text format does not accept schema.")
-		}
-	case "json_schema":
-		var schema map[string]json.RawMessage
-		if json.Unmarshal(result.Format.Schema, &schema) != nil || schema == nil {
-			return result, errors.New("json_schema format requires a schema object.")
-		}
-	default:
-		return result, errors.New("text.format.type must be text or json_schema.")
+	if err := json.Unmarshal(input.Format, &result.Format); err != nil {
+		return result, &storedDataError{err}
 	}
 	return result, nil
 }
-
-func validateTextVerbosity(value string) error {
-	if !slices.Contains([]string{"low", "medium", "high"}, value) {
-		return errors.New("text.verbosity must be low, medium or high.")
-	}
-	return nil
-}
diff --git a/services/core/internal/api/saved_tools.go b/services/core/internal/api/saved_tools.go
index 707e23253..e15a41c7e 100644
--- a/services/core/internal/api/saved_tools.go
+++ b/services/core/internal/api/saved_tools.go
@@ -7,34 +7,34 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 )
 
+// resolveSavedTools canonicalizes tools whose pinned shape was checked at the
+// /v1 boundary. The default case guards a pinned tool type that Core does not
+// resolve yet.
 func resolveSavedTools(input []json.RawMessage) ([]json.RawMessage, error) {
 	tools := make([]json.RawMessage, 0, len(input))
 	for _, raw := range input {
 		var kind struct {
 			Type string `json:"type"`
 		}
-		if json.Unmarshal(raw, &kind) != nil {
-			return nil, errors.New("tools must contain tool objects.")
+		if err := json.Unmarshal(raw, &kind); err != nil {
+			return nil, &storedDataError{err}
 		}
 		var value json.RawMessage
 		switch kind.Type {
 		case "function":
 			var function v1.FunctionToolInput
-			if decodeInputObject(raw, &function, "type", "name", "description", "parameters", "defer_loading") != nil {
-				return nil, errors.New("Invalid function tool fields.")
+			if err := json.Unmarshal(raw, &function); err != nil {
+				return nil, &storedDataError{err}
 			}
-			resolved, _, err := resolveFunction(function)
+			resolved, err := resolveFunction(function)
 			if err != nil {
 				return nil, err
 			}
 			value = resolved
 		case "tool_search":
-			if decodeInputObject(raw, &kind, "type") != nil {
-				return nil, errors.New("tool_search only accepts type.")
-			}
 			value, _ = json.Marshal(kind)
 		case "programmatic_tool_calling":
-			resolved, err := resolveProgrammaticTool(raw)
+			resolved, _, err := resolveProgrammaticTool(raw)
 			if err != nil {
 				return nil, err
 			}
diff --git a/services/core/internal/api/session_agent.go b/services/core/internal/api/session_agent.go
index bd95dfa65..279a25894 100644
--- a/services/core/internal/api/session_agent.go
+++ b/services/core/internal/api/session_agent.go
@@ -36,7 +36,7 @@ func resolveSessionAgent(input sessionRequest, saved *v1.SavedAgent) (v1.Agent,
 	}
 	var override v1.SavedAgentConfiguration
 	if err := json.Unmarshal(resolved.Configuration, &override); err != nil {
-		return v1.Agent{}, err
+		return v1.Agent{}, &storedDataError{err}
 	}
 	cfg := override
 	if saved != nil {
@@ -84,9 +84,6 @@ func admitSessionAgent(cfg v1.SavedAgentConfiguration) (v1.Agent, error) {
 	if cfg.ServiceTier != "auto" {
 		return v1.Agent{}, errors.New("Execution currently supports service_tier=auto only.")
 	}
-	if err := validateTextVerbosity(cfg.Text.Verbosity); err != nil {
-		return v1.Agent{}, err
-	}
 	tools, err := resolveSessionTools(cfg.Tools)
 	if err != nil {
 		return v1.Agent{}, err
diff --git a/services/core/internal/api/session_model_configuration.go b/services/core/internal/api/session_model_configuration.go
index 4cde53a67..5134a4528 100644
--- a/services/core/internal/api/session_model_configuration.go
+++ b/services/core/internal/api/session_model_configuration.go
@@ -41,7 +41,7 @@ func (h *Handler) prepareSessionModelConfiguration(ctx context.Context, input *s
 			if errors.As(err, &configurationError) {
 				return configurationError
 			}
-			return &modelProviderDefaultsError{err}
+			return &storedDataError{err}
 		}
 	}
 	input.modelSource = "session"
diff --git a/services/core/internal/api/session_model_defaults.go b/services/core/internal/api/session_model_defaults.go
index 93bdffd7d..20409c8e1 100644
--- a/services/core/internal/api/session_model_defaults.go
+++ b/services/core/internal/api/session_model_defaults.go
@@ -30,7 +30,7 @@ func (h *Handler) sessionAgentDefaults(ctx context.Context, tenant string, input
 	}
 	saved := &v1.SavedAgent{ID: resource.ID}
 	if err := json.Unmarshal(resource.Configuration, &saved.SavedAgentConfiguration); err != nil {
-		return nil, nil, err
+		return nil, nil, &storedDataError{err}
 	}
 	if inherit && saved.XAgentsCore != nil && saved.XAgentsCore.ModelProvider != nil && provider == nil {
 		return nil, nil, errors.New("saved agent model provider bundle is missing")
@@ -44,13 +44,6 @@ type modelProviderRequiredError struct{ message string }
 
 func (e *modelProviderRequiredError) Error() string { return e.message }
 
-// modelProviderDefaultsError carries a storage or decryption failure while
-// reading the deployment default; it is reported as a service error.
-type modelProviderDefaultsError struct{ err error }
-
-func (e *modelProviderDefaultsError) Error() string { return e.err.Error() }
-func (e *modelProviderDefaultsError) Unwrap() error { return e.err }
-
 func modelProviderRequired(environment, engine string) error {
 	if environment == "self_hosted" {
 		return &modelProviderRequiredError{"self_hosted Sessions need a model provider for harness " + engine + ": pass x_agents_core.model_provider or use an Agent that has one saved. Deployment default model providers apply to openai_hosted and none Sessions, never to self_hosted."}
diff --git a/services/core/internal/api/session_request.go b/services/core/internal/api/session_request.go
index d84edd4dc..d8971677d 100644
--- a/services/core/internal/api/session_request.go
+++ b/services/core/internal/api/session_request.go
@@ -93,9 +93,6 @@ func (request decodedSessionRequest) validated() (sessionRequest, error) {
 		if err := json.Unmarshal(request.Agent, &input.agentFields); err != nil {
 			return input, sessions.ErrInvalidInput
 		}
-		if _, supplied := input.agentFields["model"]; supplied && input.Agent.Model == nil {
-			return input, sessions.ErrInvalidInput
-		}
 	}
 	if len(request.AgentID) > 0 {
 		var id string
diff --git a/services/core/internal/api/session_tools.go b/services/core/internal/api/session_tools.go
index 16e9f0b49..c66888e99 100644
--- a/services/core/internal/api/session_tools.go
+++ b/services/core/internal/api/session_tools.go
@@ -18,8 +18,8 @@ func resolveSessionTools(input []json.RawMessage) ([]json.RawMessage, error) {
 		var kind struct {
 			Type string `json:"type"`
 		}
-		if json.Unmarshal(raw, &kind) != nil {
-			return nil, errors.New("Invalid execution tool configuration.")
+		if err := json.Unmarshal(raw, &kind); err != nil {
+			return nil, &storedDataError{err}
 		}
 		switch kind.Type {
 		case "programmatic_tool_calling", "web_search":
@@ -32,15 +32,10 @@ func resolveSessionTools(input []json.RawMessage) ([]json.RawMessage, error) {
 			if kind.Type == "web_search" {
 				resolved, err = resolveDisabledWebSearch(raw)
 			} else {
-				resolved, err = resolveProgrammaticTool(raw)
-				var value struct {
-					Enabled bool `json:"enabled"`
-				}
-				if err == nil {
-					_ = json.Unmarshal(resolved, &value)
-					if value.Enabled {
-						err = errors.New("Programmatic tool calling is not qualified for execution.")
-					}
+				var enabled bool
+				resolved, enabled, err = resolveProgrammaticTool(raw)
+				if err == nil && enabled {
+					err = errors.New("Programmatic tool calling is not qualified for execution.")
 				}
 			}
 			if err != nil {
@@ -48,8 +43,8 @@ func resolveSessionTools(input []json.RawMessage) ([]json.RawMessage, error) {
 			}
 			tools[i] = resolved
 		case "tool_search":
-			if search || decodeInputObject(raw, &kind, "type") != nil {
-				return nil, errors.New("Execution requires one type-only tool_search declaration.")
+			if search {
+				return nil, errors.New("Execution requires one tool_search declaration.")
 			}
 			search = true
 			tools[i], _ = json.Marshal(kind)
@@ -59,15 +54,18 @@ func resolveSessionTools(input []json.RawMessage) ([]json.RawMessage, error) {
 				return nil, err
 			}
 			var tool v1.MCPTool
-			if json.Unmarshal(resolved, &tool) != nil || servers[tool.ServerLabel] {
+			if err := json.Unmarshal(resolved, &tool); err != nil {
+				return nil, &storedDataError{err}
+			}
+			if servers[tool.ServerLabel] {
 				return nil, errors.New("Execution requires distinct MCP server labels.")
 			}
 			servers[tool.ServerLabel] = true
 			tools[i] = resolved
 		case "function":
 			var function v1.FunctionToolInput
-			if decodeInputObject(raw, &function, "type", "name", "description", "parameters", "defer_loading") != nil {
-				return nil, errors.New("Invalid execution function fields.")
+			if err := json.Unmarshal(raw, &function); err != nil {
+				return nil, &storedDataError{err}
 			}
 			functions = append(functions, function)
 			positions = append(positions, i)
diff --git a/services/core/internal/api/validation_errors_test.go b/services/core/internal/api/validation_errors_test.go
index fc9b45aac..e0ec582f7 100644
--- a/services/core/internal/api/validation_errors_test.go
+++ b/services/core/internal/api/validation_errors_test.go
@@ -167,10 +167,15 @@ func TestMetadataValidationUsesOfficialFields(t *testing.T) {
 			if want := map[bool]int{true: 0, false: 3}[op.limited]; s.writes != want {
 				t.Fatalf("rejected metadata reached storage: %d writes", s.writes)
 			}
-			// Type errors precede the generic whole-body error.
+			// Type errors precede the generic whole-body error. Agent bodies follow
+			// the pinned shape walk, which reports unknown members first.
 			body := strings.Replace(fmt.Sprintf(op.body, `{"k":1}`), "{", `{"unsupported_field":true,`, 1)
+			want := "metadata.k"
+			if strings.HasPrefix(op.name, "agent") {
+				want = "unsupported_field"
+			}
 			w := credentialRequest(h, op.method, op.path, body)
-			if code, param, _ := errorFields(t, w); w.Code != http.StatusBadRequest || code != "invalid_request_error" || param == nil || *param != "metadata.k" {
+			if code, param, _ := errorFields(t, w); w.Code != http.StatusBadRequest || code != "invalid_request_error" || param == nil || *param != want {
 				t.Fatalf("metadata type did not precede generic error: %d %s", w.Code, w.Body)
 			}
 			for _, tc := range accepted {
diff --git a/services/core/tests/official_mcp.py b/services/core/tests/official_mcp.py
index 716073371..b41d95ffb 100644
--- a/services/core/tests/official_mcp.py
+++ b/services/core/tests/official_mcp.py
@@ -74,19 +74,22 @@ def verify_mcp_configuration(client, other, expect_error):
                     {"authorization": "synthetic-private"},
                     {"server_url": "https://mcp.example.invalid/mcp?token=synthetic-private"}):
         invalid.append({**tool, "transport": {**transport, **changes}})
-    # Transports other than HTTP stay unsupported with or without an origin.
-    stdio = {"type": "stdio", "command": "synthetic-private"}
-    invalid += [{**minimal, "transport": stdio}, {**tool, "transport": stdio}]
+    # A pinned stdio transport stays unsupported with or without an origin; a
+    # malformed one gets the official field error first.
+    stdio, malformed = {"type": "stdio", "command": "synthetic-private", "cwd": "/"}, {"type": "stdio", "command": "synthetic-private"}
+    invalid += [{**minimal, "transport": stdio}, {**tool, "transport": stdio}, {**tool, "transport": malformed}]
     for declaration in invalid:
-        for operation in (
-            lambda: agents.create(model="requested-model", tools=[declaration]),
-            lambda: sessions.create(agent={"model": "requested-model", "tools": [declaration]},
-                                    input="Verify mcp fixture admission.", environment={"type": "none"}),
+        for prefix, operation in (
+            ("", lambda: agents.create(model="requested-model", tools=[declaration])),
+            ("agent.", lambda: sessions.create(agent={"model": "requested-model", "tools": [declaration]},
+                                               input="Verify mcp fixture admission.", environment={"type": "none"})),
         ):
             error = expect_error(BadRequestError, operation)
             assert "synthetic-private" not in str(error.body)
             if declaration["transport"] is stdio:
                 assert error.body["message"] == "MCP currently supports HTTP transport only."
+            if declaration["transport"] is malformed:
+                assert error.body["message"] == f"Missing required parameter: '{prefix}tools[0].transport.cwd'."
     assert {item.id for item in sessions.list()} == before
     assert {item.id for item in agents.list()} == saved_before
     print("HTTP MCP: pinned saved/Session projections, omitted/null origins, null/empty allowlists, immutable snapshots and rejected writes passed; no native execution claimed.")

From b0f8eb36f335cf4674f821b0796d7457d6717909 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 10:28:10 +0800
Subject: [PATCH 44/60] Align the setting categories in AGENTS.md (#514)

---
 AGENTS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AGENTS.md b/AGENTS.md
index 5772e4aab..def0e37b4 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -53,7 +53,7 @@ Do not multiply entities without necessity. The long-term goal is minimal code,
 
 Each setting and each piece of data is written in one place and read from that place: no second copy, no environment-variable or file fallback and no alias. A new setting joins its category and lives beside its peers.
 
-The categories are [process settings](docs/configuration.md#process-settings), [derived files](docs/configuration.md#how-oac-apply-works), [secrets](docs/configuration.md#installation-directory), and Core's database for [runtime settings](docs/configuration.md#runtime-settings-web) and execution data. [Configuration](docs/configuration.md) owns the installation layout and the settings themselves.
+The categories are [process settings](docs/configuration.md#process-settings), [secrets](docs/configuration.md#compose-installations), and Core's database for [runtime settings](docs/configuration.md#runtime-settings-web) and execution data. [Configuration](docs/configuration.md) owns the installation layout and the settings themselves.
 
 ### Pre-release: no compatibility layers
 

From 77ab1916a8620bfe326a83fe96a91eaf920f9ddb Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 10:28:50 +0800
Subject: [PATCH 45/60] Derive idle suspension from the checkpoint declaration
 (#538)

Core owns one idle suspension policy (300 seconds idle, 86400 seconds
retention) and reports it for every Provider that declares checkpoint
support. The microsandbox registry constant, its copy in the provider
description and the idle_seconds/retention_seconds deployment columns are
deleted; migration 000094 drops the columns and rewrites
runtime_deployment_setup_check without them.

Registration keeps only the declared rule that checkpoint support needs a
nodes registration. The API suspension shape is unchanged; its description
names the declaration rule instead of a vendor.
---
 contracts/agents-api/core.openapi.yaml        |  2 +-
 contracts/agents-api/sandbox-deployment.md    |  2 +-
 contracts/agents-api/zh/sandbox-deployment.md |  4 +--
 docs/sandbox-provider.md                      |  8 ++---
 docs/zh/sandbox-provider.md                   | 10 +++---
 .../db/queries/sandbox_deployment_setup.sql   |  2 +-
 .../internal/db/queries/sandbox_reset.sql     |  3 +-
 services/core/internal/db/sqlc/models.go      |  2 --
 .../db/sqlc/runtime_deployment.sql.go         |  4 +--
 .../internal/db/sqlc/runtime_nodes.sql.go     |  4 +--
 .../db/sqlc/sandbox_deployment_setup.sql.go   |  8 ++---
 .../internal/db/sqlc/sandbox_reset.sql.go     |  9 ++---
 .../core/internal/deployment/execution.go     |  2 +-
 services/core/internal/deployment/service.go  | 28 ++++++++-------
 services/core/internal/deployment/setup.go    |  4 +--
 services/core/internal/deployment/storage.go  |  3 --
 services/core/internal/deployment/view.go     |  6 ++--
 .../postgres/deploymentpg/records.go          |  3 +-
 .../persistence/postgres/deploymentpg/tx.go   |  2 +-
 services/core/internal/sandbox/deployment.go  |  5 ++-
 .../sandbox/providers/registration.go         | 15 +++-----
 .../sandbox/providers/registration_test.go    | 35 ++++---------------
 .../internal/sandbox/providers/registry.go    | 22 ++++++------
 .../sandbox/providers/registry_test.go        | 13 ++++---
 .../000094_suspension_from_declaration.sql    | 26 ++++++++++++++
 25 files changed, 99 insertions(+), 123 deletions(-)
 create mode 100644 services/core/migrations/000094_suspension_from_declaration.sql

diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index e26119271..957cba8d8 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -1272,7 +1272,7 @@ definitions:
       suspension:
         allOf:
           - $ref: '#/definitions/deployment.Suspension'
-        description: Idle suspension policy; microsandbox only, otherwise null.
+        description: Idle suspension policy; null unless the selected Provider declares checkpoint support.
         x-nullable: true
     type: object
   projects.APIKey:
diff --git a/contracts/agents-api/sandbox-deployment.md b/contracts/agents-api/sandbox-deployment.md
index 94e62f090..ba0db8e65 100644
--- a/contracts/agents-api/sandbox-deployment.md
+++ b/contracts/agents-api/sandbox-deployment.md
@@ -86,7 +86,7 @@ For E2B, post `{"configuration": {"api_url": "…", "domain": "…"}, "credentia
 GET and successful writes return `installation_id`, `provider`, `core_url` (read-only: the installation public URL, present even before configuration), `mode`, `generation`, `owner_epoch`, `reset`, `rollout`, `suspension`, `resources` and `credential_configured`. A configured deployment also returns `specification`, `specification_digest`, `configuration` and `metadata`: the adapter's public projection of its selectors and of the observations it recorded, never raw stored values or secrets. E2B returns `configuration.template`, `configuration.api_url`, `configuration.domain` and, once recorded, `metadata.template_build`. Docker and microsandbox return empty `configuration` and `metadata` objects and `credential_configured: false`; an unconfigured deployment has neither object.
 
 - `metadata.template_build` is `{status, resources: {cpus, memory_mib, root_disk_mib}}`: the build as Core read it through the pinned SDK when the selection was saved. GET never calls E2B, so it stays cheap during an E2B outage. Validation admits only a `ready` build whose CPU count and memory equal the selected values; `root_disk_mib` is the build's native disk size, which Core does not enforce. Unknown values are null, `metadata: {}` means no observation was recorded, and an identical PUT without a credential does not refresh it.
-- `suspension` is `{idle_seconds, retention_seconds}` for microsandbox, the only provider Core suspends (currently 300 and 86400); Docker, E2B and unconfigured deployments return null.
+- `suspension` is `{idle_seconds, retention_seconds}`, Core's [suspension policy](../../docs/sandbox-provider.md#suspension), when the selected Provider declares checkpoint support; any other deployment, including an unconfigured one, returns null.
 - Request `resources` and response `specification.resources` are per-sandbox limits. Response `resources.allocations` and `resources.pending` count unreleased allocations and pending hosted Environments without an allocation.
 - An unconfigured deployment has an empty provider and no specification. Docker and microsandbox use `mode: nodes`; E2B uses `mode: direct`, without a synthetic node.
 - `generation` identifies the saved selection. `owner_epoch` fences the execution owner and node connections; it does not replace `expected_generation`.
diff --git a/contracts/agents-api/zh/sandbox-deployment.md b/contracts/agents-api/zh/sandbox-deployment.md
index cf026eb4b..ae1d9a97b 100644
--- a/contracts/agents-api/zh/sandbox-deployment.md
+++ b/contracts/agents-api/zh/sandbox-deployment.md
@@ -1,7 +1,7 @@
 ---
 title: "沙箱部署"
 source: contracts/agents-api/sandbox-deployment.md
-source_hash: 6f765be45518f23ace6384938616eb12aba7554e7f8fbfadb89738f26c692dd5
+source_hash: 7a1bc927bb14e9599e800833f10a5fd123621e3f95bfcbdffa75e7a63654ffe3
 ---
 
 沙箱部署为 Core 管理的 `openai_hosted` 执行选择 Sandbox Provider、每个沙箱的资源以及不可变的 Runtime 发行版。PostgreSQL 为每个安装维护一个当前有效选择；Web 和 Core API 写入同一配置。节点文件保存其已安装副本和特定于主机的路径，且不能覆盖其资源或 Runtime。该选择独立于 Harness；部署可以保持未配置状态，既无节点，也不接受托管准入。
@@ -88,7 +88,7 @@ E2B 使用 `template-id:build-uuid` 形式的 `configuration.template`；构建
 GET 和成功的写入操作会返回 `installation_id`、`provider`、`core_url`（只读：安装公开 URL，即使配置前也存在）、`mode`、`generation`、`owner_epoch`、`reset`、`rollout`、`suspension`、`resources` 和 `credential_configured`。已配置的部署还会返回 `specification`、`specification_digest`、`configuration` 和 `metadata`：这是适配器对其选择器及其记录的观测结果所作的公开投影，绝不会包含原始存储值或机密。E2B 返回 `configuration.template`、`configuration.api_url`、`configuration.domain`，并在记录后返回 `metadata.template_build`。Docker 和 microsandbox 返回空的 `configuration` 和 `metadata` 对象以及 `credential_configured: false`；未配置的部署则不含这两个对象。
 
 - `metadata.template_build` 为 `{status, resources: {cpus, memory_mib, root_disk_mib}}`：这是保存选择时 Core 通过固定版本 SDK 读取的构建。GET 绝不会调用 E2B，因此 E2B 中断期间该操作仍保持低成本。验证仅接受 CPU 数量和内存与所选值一致的 `ready` 构建；`root_disk_mib` 是构建的原生磁盘大小，Core 不会强制执行该值。未知值为 null，`metadata: {}` 表示未记录任何观测，在不提供凭据的情况下提交完全相同的 PUT 也不会刷新它。
-- `suspension` 对 microsandbox 而言为 `{idle_seconds, retention_seconds}`，microsandbox 是 Core 唯一会暂停的提供商（当前为 300 和 86400）；Docker、E2B 和未配置的部署返回 null。
+- 所选 Provider 声明 checkpoint 支持时，`suspension` 为 `{idle_seconds, retention_seconds}`，即 Core 的 [suspension policy](../../../docs/zh/sandbox-provider.md#suspension)；其他部署（包括未配置的部署）返回 null。
 - 请求中的 `resources` 和响应中的 `specification.resources` 是每个沙箱的限制。响应中的 `resources.allocations` 和 `resources.pending` 分别计算尚未释放的分配，以及尚未分配沙箱的待处理托管 Environment。
 - 未配置的部署具有空的 provider 且没有 specification。Docker 和 microsandbox 使用 `mode: nodes`；E2B 使用 `mode: direct`，且没有合成节点。
 - `generation` 标识已保存的选择。`owner_epoch` 用于对执行所有者和节点连接进行栅栏隔离；它不能替代 `expected_generation`。
diff --git a/docs/sandbox-provider.md b/docs/sandbox-provider.md
index 08ea0f988..4cfb26d3a 100644
--- a/docs/sandbox-provider.md
+++ b/docs/sandbox-provider.md
@@ -102,14 +102,14 @@ Hosted and self-hosted Environments use the same Runtime preparation; a provider
 
 ## Register the provider kind
 
-`sandbox/providers/registry.go` is the only registration table. Each entry binds the adapter's specification and resource validators, its `sandbox.ConfigurationAdapter`, the deployment mode (`nodes` or `direct`), suspension defaults, the operation declaration and a node-local (`BuildLocal`) or direct (`BuildDirect`) constructor. `providers.Build` and `providers.BuildDirect` construct adapters without allocating compute. There is no init-time registration or plugin loading.
+`sandbox/providers/registry.go` is the only registration table. Each entry binds the adapter's specification and resource validators, its `sandbox.ConfigurationAdapter`, the deployment mode (`nodes` or `direct`), the operation declaration and a node-local (`BuildLocal`) or direct (`BuildDirect`) constructor. `providers.Build` and `providers.BuildDirect` construct adapters without allocating compute. There is no init-time registration or plugin loading.
 
 A new provider takes these steps:
 
 1. Implement the operation contracts in the adapter package, with native contract tests.
 2. Add its specification and resource validators.
 3. Implement `sandbox.ConfigurationAdapter` over a typed native configuration. `DecodeInput` strictly parses the separate public `configuration` and write-only `credential` objects of a request. `Encode` produces whitelisted public selectors, read-only observations and separate secret bytes, and never passes request JSON through. `Decode` restores stored selectors, and keeps access to owned resources, without remote admission or new template validation. `Normalize` copies its input before changing it. `ResolveChange`, `Equal` and `WithCredential` own inheritance, identity and credential composition. `Requirements` declares whether a credential and a public Core origin are required, and which setup operations are supported: `Discovery` for `DiscoverConfiguration`, `SelectionDiscovery` for `DiscoverSelection` and `CredentialVerification` for `VerifyCredential`. `DiscoverConfiguration` validates the query and returns a safe catalog, never a mutation or an admission decision, while Core keeps authorization, input limits and deadlines. `DiscoverSelection` resolves a candidate's omitted native values before commit, and `VerifyCredential` verifies a credential's access to owned resources without mutation. Both receive the candidate's `sandbox.DirectConfig` and build any native client for that call only. A node provider accepts only an empty public object, rejects credentials and returns Unsupported for every setup operation and for credential replacement.
-4. Register its constructor, policies, configuration adapter, operation declaration and defaults in `providers/registry.go`. Its key is the provider kind, which also labels the Provider's observations, and checkpoint support reads this entry. The installer's projection combines the registered policies with the shared field bounds in `sandbox/deployment_contract.go`; regenerate it with `go run ./services/core/cmd/specification-contract -write`.
+4. Register its constructor, policies, configuration adapter and operation declaration in `providers/registry.go`. Its key is the provider kind, which also labels the Provider's observations, and checkpoint support reads this entry. The installer's projection combines the registered policies with the shared field bounds in `sandbox/deployment_contract.go`; regenerate it with `go run ./services/core/cmd/specification-contract -write`.
 5. Supply the distribution artifacts for the adapter and its helper, and offer the provider to operators through the registered configuration contract.
 
 **Known design gap:** Web's setup views carry provider-specific options, such as E2B's views. Exposing another provider through that surface currently requires a shared Web edit. This coupling does not meet [Complexity stays in the adapter](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter); new integrations must express their configuration through the protocol and keep vendor-specific behavior in the adapter. Never add a Session or Turn scheduling path, a vendor column or API field, or a vendor switch in the store.
@@ -123,7 +123,7 @@ A new provider takes these steps:
 - A `nodes` registration has only `BuildLocal`, and a `direct` registration only `BuildDirect`; missing, mixed or unknown modes are rejected.
 - The specification and resource validators, the configuration adapter and a complete operation declaration are mandatory, so an incomplete registration cannot publish a partial installer projection.
 - The Runtime input policy either accepts the pinned Runtime or gives the adapter's fixed reason for rejecting it, never both.
-- Checkpoint is admitted only for a `nodes` registration, because the common lifecycle suspends only node allocations; registration rejects a `direct` Provider that declares it. Checkpoint support also requires positive idle and retention defaults that fit Runtime durations, and a provider without checkpoint support configures no suspension defaults.
+- Checkpoint is admitted only for a `nodes` registration, because the common lifecycle suspends only node allocations; registration rejects a `direct` Provider that declares it. A registration carries no suspension values: Core applies its one [suspension policy](#suspension) to every Provider that declares checkpoint support.
 
 The configuration adapter must be non-nil, including its concrete value. Every `ConfigurationRequirements` field needs an explicit valid decision: `Credential` and `PublicOrigin` are `Required` or `NotRequired`, and `Discovery`, `SelectionDiscovery` and `CredentialVerification` use the shared supported or unsupported declaration with a safe reason. A new requirement field needs an explicit validation update and never inherits an existing decision. Requiring a credential does not promise the `VerifyCredential` operation. These checks establish complete registration, not correct native SDK behavior; constructor and adapter contract tests still apply.
 
@@ -181,7 +181,7 @@ The deployment's CPU, memory and disk settings, `max_active`, `max_retained` and
 
 ### Suspension
 
-A provider with checkpoint support can suspend idle work; the deployment's [`suspension`](../contracts/agents-api/sandbox-deployment.md#safe-response) policy sets the idle time and snapshot retention. Core suspends only after at least one Turn is terminal, when no root or Subagent Turn is queued, in progress or waiting, no input, file operation or initialization is pending, and real activity has been idle for the configured interval. For node allocations Core records the first root or child terminal transition with the database clock in the same transaction. Candidate filtering and the Session-locked recheck compare elapsed database time with the idle duration, and the initial snapshot retention deadline is anchored to the same database observation, so Core and database host clocks need not agree. Native completion timestamps stay unchanged in public history but never drive idle admission, and heartbeats never reset activity. Before acknowledging a planned suspension, the daemon closes admission and drains native cleanup, output receipts and file work.
+Core suspends the idle work of every provider that declares checkpoint support, with one fixed policy: it suspends work idle for 5 minutes (300 seconds) and keeps the snapshot for 24 hours (86400 seconds). The deployment's [`suspension`](../contracts/agents-api/sandbox-deployment.md#safe-response) reports these values. Core suspends only after at least one Turn is terminal, when no root or Subagent Turn is queued, in progress or waiting, no input, file operation or initialization is pending, and real activity has been idle for that time. For node allocations Core records the first root or child terminal transition with the database clock in the same transaction. Candidate filtering and the Session-locked recheck compare elapsed database time with the idle duration, and the initial snapshot retention deadline is anchored to the same database observation, so Core and database host clocks need not agree. Native completion timestamps stay unchanged in public history but never drive idle admission, and heartbeats never reset activity. Before acknowledging a planned suspension, the daemon closes admission and drains native cleanup, output receipts and file work.
 
 The Worker lease, the Session lock and the per-node gates own suspension for every provider. New Turn claims, file-write intents and capture admission serialize under the Session lock and share one compute-phase check; new pending work cancels a capture and wakes the same source. Normal preparation waits for the compute phase to be running, after the authenticated resume handshake, and pending input stays pending when its promotion conflicts with a lifecycle transition. Compute phases and revision-checked receipts live on the allocation. Core persists quiesce, capture and restore intent before the effect, only a fresh receipt performs a capture or restore, and recovery observes the exact attempt without retrying an unknown creation, capture or restore. A consumed snapshot never rolls a running generation back. Deletion, revocation and retention expiry win over wake, up to the final database compare-and-swap, and unknown cleanup identities are kept until owned resources are confirmed absent. Consumed artifacts and old compute are deleted, so suspension cycles never build a chain of writable disks.
 
diff --git a/docs/zh/sandbox-provider.md b/docs/zh/sandbox-provider.md
index 91dc2f563..2b0bd3a3f 100644
--- a/docs/zh/sandbox-provider.md
+++ b/docs/zh/sandbox-provider.md
@@ -1,7 +1,7 @@
 ---
 title: "添加 Sandbox Provider"
 source: docs/sandbox-provider.md
-source_hash: 952ffc561734637ecbae9ad46782575feefaccdfe1c41ed8c6ae1a82c2ff170b
+source_hash: 159c2a7366edd784386ca7bd5748752451fd0a3ea543d813cefd29921014d294
 ---
 
 **Sandbox Provider** 为 Core 管理的 Environment 提供 Runtime daemon 运行所需的外层计算资源，以及启动 daemon 的有界引导流程。本指南说明如何添加 Provider，并作为 Core 驱动 Provider 的参考。接口为 [`SandboxProvider`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/sandbox/sandbox_provider.go)。
@@ -104,14 +104,14 @@ Checkpoint 支持增加 `Compute` generation、name、ID 和 `SnapshotIdentity`
 
 ## 注册 provider kind {#register-the-provider-kind}
 
-`sandbox/providers/registry.go` 是唯一注册表。每项绑定 adapter 的 specification 与 resource validator、`sandbox.ConfigurationAdapter`、部署模式（`nodes` 或 `direct`）、suspension 默认值、operation 声明，以及 node-local（`BuildLocal`）或 direct（`BuildDirect`）constructor。`providers.Build` 和 `providers.BuildDirect` 构造 adapter，不分配计算资源。没有 init 时注册或 plugin 加载。
+`sandbox/providers/registry.go` 是唯一注册表。每项绑定 adapter 的 specification 与 resource validator、`sandbox.ConfigurationAdapter`、部署模式（`nodes` 或 `direct`）、operation 声明，以及 node-local（`BuildLocal`）或 direct（`BuildDirect`）constructor。`providers.Build` 和 `providers.BuildDirect` 构造 adapter，不分配计算资源。没有 init 时注册或 plugin 加载。
 
 新 provider 执行以下步骤：
 
 1. 在 adapter 包中实现 operation 契约，并编写原生契约测试。
 2. 添加 specification 和 resource validator。
 3. 基于类型化原生配置实现 `sandbox.ConfigurationAdapter`。`DecodeInput` 严格解析请求中独立的公开 `configuration` 与只写 `credential` 对象。`Encode` 生成白名单公开 selector、只读观测和独立 secret bytes，不透传请求 JSON。`Decode` 恢复已存储 selector 并保留对所属资源的访问，不做远程 admission 或新模板验证。`Normalize` 修改前复制输入。`ResolveChange`、`Equal` 和 `WithCredential` 负责继承、身份与凭据组合。`Requirements` 声明是否需要凭据和公开 Core origin，以及支持哪些 setup 操作：`Discovery` 对应 `DiscoverConfiguration`，`SelectionDiscovery` 对应 `DiscoverSelection`，`CredentialVerification` 对应 `VerifyCredential`。`DiscoverConfiguration` 验证 query 并返回安全 catalog，不做 mutation 或 admission decision；Core 保留授权、输入限制与 deadline。`DiscoverSelection` 在提交前解析候选项省略的原生值，`VerifyCredential` 验证凭据对所属资源的访问，不修改资源。两者都接收候选项的 `sandbox.DirectConfig`，原生 client 只为该次调用构造。node provider 仅接受空公开对象，拒绝凭据，对每项 setup 操作和 credential replacement 返回 Unsupported。
-4. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter、operation 声明和默认值。其键即 provider kind，也用于标记该 Provider 的观测；checkpoint 支持读取此项。installer 投影组合已注册 policy 与 `sandbox/deployment_contract.go` 中的共享 field bound；通过 `go run ./services/core/cmd/specification-contract -write` 重新生成。
+4. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter 和 operation 声明。其键即 provider kind，也用于标记该 Provider 的观测；checkpoint 支持读取此项。installer 投影组合已注册 policy 与 `sandbox/deployment_contract.go` 中的共享 field bound；通过 `go run ./services/core/cmd/specification-contract -write` 重新生成。
 5. 提供 adapter 和 helper 的发行产物，通过已注册 configuration 契约向运维人员提供 provider。
 
 **已知设计缺口：** Web 的 setup view 携带 provider 专有选项，如 E2B 的 view。通过该界面提供另一 provider 目前需要修改共享的 Web。此耦合不符合[复杂性留在 adapter 内](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter)；新集成必须通过协议表达配置，把厂商专有行为留在 adapter。不得添加 Session 或 Turn 调度路径、厂商专有 column 或 API field，或 store 中的厂商 switch。
@@ -125,7 +125,7 @@ Checkpoint 支持增加 `Compute` generation、name、ID 和 `SnapshotIdentity`
 - `nodes` 注册仅有 `BuildLocal`，`direct` 注册仅有 `BuildDirect`；缺失、混合或未知 mode 被拒绝。
 - specification 和 resource validator、configuration adapter 与完整 operation 声明都是必需项，因此不完整注册不能发布部分 installer projection。
 - Runtime input policy 要么接受固定 Runtime，要么给出 adapter 拒绝它的固定原因，不能两者兼有。
-- Checkpoint 仅准入 `nodes` 注册，因为公共 lifecycle 只暂停 node allocation；声明 checkpoint 的 `direct` Provider 会被注册拒绝。Checkpoint 支持还要求适合 Runtime duration 的正 idle、retention 默认值，不支持 checkpoint 的 provider 不配置 suspension 默认值。
+- Checkpoint 仅准入 `nodes` 注册，因为公共 lifecycle 只暂停 node allocation；声明 checkpoint 的 `direct` Provider 会被注册拒绝。注册不携带 suspension 数值：Core 对每个声明 checkpoint 支持的 Provider 应用同一个 [suspension policy](#suspension)。
 
 configuration adapter 必须非 nil，包括其具体值。每个 `ConfigurationRequirements` 字段都需要明确有效的决定：`Credential` 和 `PublicOrigin` 为 `Required` 或 `NotRequired`，`Discovery`、`SelectionDiscovery` 和 `CredentialVerification` 使用共享 supported 或 unsupported 声明并携带安全 reason。新增 requirement field 需要明确更新验证，不继承已有决定。要求凭据不承诺支持 `VerifyCredential` 操作。这些检查证明注册完整，不证明原生 SDK 行为正确；constructor 和 adapter 契约测试仍然适用。
 
@@ -183,7 +183,7 @@ placement 自动完成：environment-to-node placement 与 Session 创建及其
 
 ### 暂停 {#suspension}
 
-支持 checkpoint 的 provider 可以暂停空闲工作；部署 [`suspension`](../../contracts/agents-api/zh/sandbox-deployment.md#safe-response) policy 设置 idle time 和 snapshot retention。Core 仅在至少一个 Turn 已终结、没有 root 或 Subagent Turn 排队、进行中或等待、没有 pending input、file operation 或 initialization，且真实 activity 已空闲达到配置间隔后暂停。对于 node allocation，Core 在同一事务中用数据库时钟记录首个 root 或 child terminal transition。candidate filter 和 Session-locked recheck 比较数据库已过时间与 idle duration，初始 snapshot retention deadline 也锚定同一数据库观测，因此 Core 与数据库主机时钟无需一致。原生 completion timestamp 在公开历史中保持不变，但不驱动 idle admission，heartbeat 不重置 activity。确认计划暂停前，daemon 关闭 admission 并排空 native cleanup、output receipt 和 file work。
+Core 用同一个固定 policy 暂停每个声明 checkpoint 支持的 provider 的空闲工作：工作空闲 5 分钟（300 秒）后暂停，snapshot 保留 24 小时（86400 秒）。部署的 [`suspension`](../../contracts/agents-api/zh/sandbox-deployment.md#safe-response) 报告这两个值。Core 仅在至少一个 Turn 已终结、没有 root 或 Subagent Turn 排队、进行中或等待、没有 pending input、file operation 或 initialization，且真实 activity 已空闲达到该时间后暂停。对于 node allocation，Core 在同一事务中用数据库时钟记录首个 root 或 child terminal transition。candidate filter 和 Session-locked recheck 比较数据库已过时间与 idle duration，初始 snapshot retention deadline 也锚定同一数据库观测，因此 Core 与数据库主机时钟无需一致。原生 completion timestamp 在公开历史中保持不变，但不驱动 idle admission，heartbeat 不重置 activity。确认计划暂停前，daemon 关闭 admission 并排空 native cleanup、output receipt 和 file work。
 
 Worker lease、Session lock 与 per-node gate 对每个 provider 负责 suspension。新 Turn claim、file-write intent 和 capture admission 在 Session lock 下串行化，共享一个 compute-phase 检查；新 pending work 取消 capture 并唤醒同一 source。正常 preparation 在经过认证的 resume handshake 后等待 compute phase 为 running；pending input 的 promotion 与 lifecycle transition 冲突时保持 pending。compute phase 和 revision-checked receipt 位于 allocation。Core 在 effect 前持久化 quiesce、capture 和 restore intent，仅新 receipt 执行 capture 或 restore，恢复观察精确 attempt，不重试未知 creation、capture 或 restore。已消费 snapshot 不让 running generation 回滚。删除、撤销和 retention expiry 优先于 wake，一直持续到最终数据库 compare-and-swap；未知 cleanup identity 保留，直到确认所属资源不存在。已消费 artifact 和旧 compute 被删除，因此暂停循环不累积可写磁盘链。
 
diff --git a/services/core/internal/db/queries/sandbox_deployment_setup.sql b/services/core/internal/db/queries/sandbox_deployment_setup.sql
index 09bd91540..6365c7e0f 100644
--- a/services/core/internal/db/queries/sandbox_deployment_setup.sql
+++ b/services/core/internal/db/queries/sandbox_deployment_setup.sql
@@ -4,7 +4,7 @@ owner_epoch=owner_epoch+1, updated_at=clock_timestamp() WHERE singleton=true;
 
 -- name: InitializeSandboxDeployment :exec
 UPDATE runtime_deployment SET provider_kind=$1, backend_fingerprint=$2,
-idle_seconds=$3, retention_seconds=$4, generation=$5, mode=$6,
+generation=$3, mode=$4,
 provider_config=sqlc.arg(provider_config),provider_metadata=sqlc.arg(provider_metadata),provider_credential=sqlc.arg(provider_credential),specification=sqlc.arg(specification),
 updated_at=clock_timestamp() WHERE singleton=true;
 
diff --git a/services/core/internal/db/queries/sandbox_reset.sql b/services/core/internal/db/queries/sandbox_reset.sql
index 0c2938bb1..5b53b06e5 100644
--- a/services/core/internal/db/queries/sandbox_reset.sql
+++ b/services/core/internal/db/queries/sandbox_reset.sql
@@ -21,8 +21,7 @@ WHERE singleton = true;
 
 -- name: CompleteSandboxReset :exec
 UPDATE runtime_deployment SET provider_kind = '', backend_fingerprint = '', mode = '',
-    specification = '{}', idle_seconds = 0, retention_seconds = 0,
-    provider_config = '{}'::jsonb, provider_metadata = '{}'::jsonb, provider_credential = NULL,
+    specification = '{}', provider_config = '{}'::jsonb, provider_metadata = '{}'::jsonb, provider_credential = NULL,
     generation = generation + 1, owner_epoch = owner_epoch + 1,
     reset_clear = NULL, reset_requested_at = NULL,
     reset_deadline_at = NULL, reset_forced_at = NULL, reset_audit = NULL,
diff --git a/services/core/internal/db/sqlc/models.go b/services/core/internal/db/sqlc/models.go
index 048878096..b5936f30b 100644
--- a/services/core/internal/db/sqlc/models.go
+++ b/services/core/internal/db/sqlc/models.go
@@ -242,8 +242,6 @@ type RuntimeDeployment struct {
 	UpdatedAt          pgtype.Timestamptz `json:"updated_at"`
 	ProviderKind       string             `json:"provider_kind"`
 	OwnerEpoch         int64              `json:"owner_epoch"`
-	IdleSeconds        int64              `json:"idle_seconds"`
-	RetentionSeconds   int64              `json:"retention_seconds"`
 	Generation         int64              `json:"generation"`
 	Mode               string             `json:"mode"`
 	ProviderCredential []byte             `json:"provider_credential"`
diff --git a/services/core/internal/db/sqlc/runtime_deployment.sql.go b/services/core/internal/db/sqlc/runtime_deployment.sql.go
index 15d71eef4..56e51e53a 100644
--- a/services/core/internal/db/sqlc/runtime_deployment.sql.go
+++ b/services/core/internal/db/sqlc/runtime_deployment.sql.go
@@ -53,7 +53,7 @@ func (q *Queries) CountRuntimeDeploymentResources(ctx context.Context) (CountRun
 }
 
 const lockRuntimeDeployment = `-- name: LockRuntimeDeployment :one
-SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton = true FOR UPDATE
+SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton = true FOR UPDATE
 `
 
 func (q *Queries) LockRuntimeDeployment(ctx context.Context) (RuntimeDeployment, error) {
@@ -66,8 +66,6 @@ func (q *Queries) LockRuntimeDeployment(ctx context.Context) (RuntimeDeployment,
 		&i.UpdatedAt,
 		&i.ProviderKind,
 		&i.OwnerEpoch,
-		&i.IdleSeconds,
-		&i.RetentionSeconds,
 		&i.Generation,
 		&i.Mode,
 		&i.ProviderCredential,
diff --git a/services/core/internal/db/sqlc/runtime_nodes.sql.go b/services/core/internal/db/sqlc/runtime_nodes.sql.go
index e8ee97976..f6bc5b7d7 100644
--- a/services/core/internal/db/sqlc/runtime_nodes.sql.go
+++ b/services/core/internal/db/sqlc/runtime_nodes.sql.go
@@ -119,7 +119,7 @@ func (q *Queries) DisconnectRuntimeNode(ctx context.Context, arg DisconnectRunti
 }
 
 const getRuntimeDeployment = `-- name: GetRuntimeDeployment :one
-SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton=true
+SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton=true
 `
 
 func (q *Queries) GetRuntimeDeployment(ctx context.Context) (RuntimeDeployment, error) {
@@ -132,8 +132,6 @@ func (q *Queries) GetRuntimeDeployment(ctx context.Context) (RuntimeDeployment,
 		&i.UpdatedAt,
 		&i.ProviderKind,
 		&i.OwnerEpoch,
-		&i.IdleSeconds,
-		&i.RetentionSeconds,
 		&i.Generation,
 		&i.Mode,
 		&i.ProviderCredential,
diff --git a/services/core/internal/db/sqlc/sandbox_deployment_setup.sql.go b/services/core/internal/db/sqlc/sandbox_deployment_setup.sql.go
index de2ee8d6f..9b169c9bf 100644
--- a/services/core/internal/db/sqlc/sandbox_deployment_setup.sql.go
+++ b/services/core/internal/db/sqlc/sandbox_deployment_setup.sql.go
@@ -32,16 +32,14 @@ func (q *Queries) ClaimWebSandboxDeployment(ctx context.Context, installationID
 
 const initializeSandboxDeployment = `-- name: InitializeSandboxDeployment :exec
 UPDATE runtime_deployment SET provider_kind=$1, backend_fingerprint=$2,
-idle_seconds=$3, retention_seconds=$4, generation=$5, mode=$6,
-provider_config=$7,provider_metadata=$8,provider_credential=$9,specification=$10,
+generation=$3, mode=$4,
+provider_config=$5,provider_metadata=$6,provider_credential=$7,specification=$8,
 updated_at=clock_timestamp() WHERE singleton=true
 `
 
 type InitializeSandboxDeploymentParams struct {
 	ProviderKind       string `json:"provider_kind"`
 	BackendFingerprint string `json:"backend_fingerprint"`
-	IdleSeconds        int64  `json:"idle_seconds"`
-	RetentionSeconds   int64  `json:"retention_seconds"`
 	Generation         int64  `json:"generation"`
 	Mode               string `json:"mode"`
 	ProviderConfig     []byte `json:"provider_config"`
@@ -54,8 +52,6 @@ func (q *Queries) InitializeSandboxDeployment(ctx context.Context, arg Initializ
 	_, err := q.db.Exec(ctx, initializeSandboxDeployment,
 		arg.ProviderKind,
 		arg.BackendFingerprint,
-		arg.IdleSeconds,
-		arg.RetentionSeconds,
 		arg.Generation,
 		arg.Mode,
 		arg.ProviderConfig,
diff --git a/services/core/internal/db/sqlc/sandbox_reset.sql.go b/services/core/internal/db/sqlc/sandbox_reset.sql.go
index 3791f0e5d..8929d242b 100644
--- a/services/core/internal/db/sqlc/sandbox_reset.sql.go
+++ b/services/core/internal/db/sqlc/sandbox_reset.sql.go
@@ -25,8 +25,7 @@ func (q *Queries) CancelSandboxReset(ctx context.Context) error {
 
 const completeSandboxReset = `-- name: CompleteSandboxReset :exec
 UPDATE runtime_deployment SET provider_kind = '', backend_fingerprint = '', mode = '',
-    specification = '{}', idle_seconds = 0, retention_seconds = 0,
-    provider_config = '{}'::jsonb, provider_metadata = '{}'::jsonb, provider_credential = NULL,
+    specification = '{}', provider_config = '{}'::jsonb, provider_metadata = '{}'::jsonb, provider_credential = NULL,
     generation = generation + 1, owner_epoch = owner_epoch + 1,
     reset_clear = NULL, reset_requested_at = NULL,
     reset_deadline_at = NULL, reset_forced_at = NULL, reset_audit = NULL,
@@ -51,7 +50,7 @@ func (q *Queries) ForceSandboxReset(ctx context.Context) error {
 }
 
 const getSandboxDeploymentSnapshot = `-- name: GetSandboxDeploymentSnapshot :one
-WITH deployment AS MATERIALIZED (SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, idle_seconds, retention_seconds, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton = true LIMIT 1),
+WITH deployment AS MATERIALIZED (SELECT singleton, installation_id, backend_fingerprint, updated_at, provider_kind, owner_epoch, generation, mode, provider_credential, specification, reset_clear, reset_requested_at, reset_deadline_at, reset_forced_at, reset_audit, provider_config, provider_metadata FROM runtime_deployment WHERE singleton = true LIMIT 1),
 observed AS MATERIALIZED (SELECT clock_timestamp() AS as_of),
 held AS (
     SELECT a.deployment_generation, a.node_id, s.id AS session_id, e.id AS environment_id, false AS pending,
@@ -89,7 +88,7 @@ held AS (
 ), offline AS (
     SELECT node_id, name, count(*)::bigint AS resources FROM classified WHERE offline GROUP BY node_id, name
 )
-SELECT d.singleton, d.installation_id, d.backend_fingerprint, d.updated_at, d.provider_kind, d.owner_epoch, d.idle_seconds, d.retention_seconds, d.generation, d.mode, d.provider_credential, d.specification, d.reset_clear, d.reset_requested_at, d.reset_deadline_at, d.reset_forced_at, d.reset_audit, d.provider_config, d.provider_metadata,
+SELECT d.singleton, d.installation_id, d.backend_fingerprint, d.updated_at, d.provider_kind, d.owner_epoch, d.generation, d.mode, d.provider_credential, d.specification, d.reset_clear, d.reset_requested_at, d.reset_deadline_at, d.reset_forced_at, d.reset_audit, d.provider_config, d.provider_metadata,
     (SELECT count(*) FROM classified WHERE NOT pending)::bigint AS allocations,
     (SELECT count(*) FROM classified WHERE pending)::bigint AS pending,
     jsonb_build_object(
@@ -131,8 +130,6 @@ func (q *Queries) GetSandboxDeploymentSnapshot(ctx context.Context) (GetSandboxD
 		&i.RuntimeDeployment.UpdatedAt,
 		&i.RuntimeDeployment.ProviderKind,
 		&i.RuntimeDeployment.OwnerEpoch,
-		&i.RuntimeDeployment.IdleSeconds,
-		&i.RuntimeDeployment.RetentionSeconds,
 		&i.RuntimeDeployment.Generation,
 		&i.RuntimeDeployment.Mode,
 		&i.RuntimeDeployment.ProviderCredential,
diff --git a/services/core/internal/deployment/execution.go b/services/core/internal/deployment/execution.go
index 0c1ef29fa..b91abceb3 100644
--- a/services/core/internal/deployment/execution.go
+++ b/services/core/internal/deployment/execution.go
@@ -298,7 +298,7 @@ func (e *ExecutionOperations) saveSelection(tx DeploymentTx, d Record, input san
 		return err
 	}
 	return tx.SaveSelection(SelectionRecord{InstallationID: d.InstallationID, Provider: input.Provider, BackendFingerprint: description.BackendFingerprint, Mode: description.Mode,
-		Generation: d.Generation + 1, IdleSeconds: description.IdleSeconds, RetentionSeconds: description.RetentionSeconds, Specification: specification,
+		Generation: d.Generation + 1, Specification: specification,
 		Configuration: sandbox.ConfigurationRecord{Public: configurationJSON(record.Public), Metadata: configurationJSON(record.Metadata), Secret: record.Secret}})
 }
 
diff --git a/services/core/internal/deployment/service.go b/services/core/internal/deployment/service.go
index 575f0d79f..c9e06fd89 100644
--- a/services/core/internal/deployment/service.go
+++ b/services/core/internal/deployment/service.go
@@ -64,13 +64,9 @@ func (s *Service) view(snapshot Snapshot) (View, error) {
 		result.Configuration = configurationJSON(record.Public)
 		result.Metadata = configurationJSON(record.Metadata)
 		result.CredentialConfigured = d.CredentialStored
-		checkpoint, err := s.registry.SupportsCheckpoint(d.Provider)
-		if err != nil {
+		if result.Suspension, err = s.suspension(d.Provider); err != nil {
 			return View{}, err
 		}
-		if checkpoint {
-			result.Suspension = &Suspension{IdleSeconds: d.IdleSeconds, RetentionSeconds: d.RetentionSeconds}
-		}
 	}
 	if d.Reset != nil {
 		result.Reset = &Reset{Clear: d.Reset.Clear, RequestedAt: d.Reset.RequestedAt, DeadlineAt: d.Reset.DeadlineAt, ForcedAt: d.Reset.ForcedAt, Remaining: snapshot.Remaining}
@@ -111,24 +107,20 @@ func (s *Service) setup(d Record) (Setup, error) {
 	if err != nil {
 		return Setup{}, ErrConflict
 	}
-	return s.describe(result, d.IdleSeconds, d.RetentionSeconds)
+	return s.describe(result)
 }
 
 // describe adds the provider's declared operations, suspension policy and
 // credential use.
-func (s *Service) describe(setup Setup, idleSeconds, retentionSeconds int64) (Setup, error) {
+func (s *Service) describe(setup Setup) (Setup, error) {
 	adapter, err := s.registry.Lookup(setup.Provider)
 	if err != nil {
 		return Setup{}, err
 	}
 	setup.Operations = adapter.Operations()
-	checkpoint, err := s.registry.SupportsCheckpoint(setup.Provider)
-	if err != nil {
+	if setup.Suspension, err = s.suspension(setup.Provider); err != nil {
 		return Setup{}, err
 	}
-	if checkpoint {
-		setup.Suspension = &Suspension{IdleSeconds: idleSeconds, RetentionSeconds: retentionSeconds}
-	}
 	setup.UsesCredential, err = s.registry.UsesCredential(setup.Provider)
 	if err != nil {
 		return Setup{}, err
@@ -254,7 +246,17 @@ func (s *Service) SetupForSelection(installationID string, input sandbox.Selecti
 		return Setup{}, err
 	}
 	result := Setup{InstallationID: installationID, Provider: input.Provider, Mode: description.Mode, Specification: normalized.DeploymentSpec, Configuration: normalized.Configuration, BackendFingerprint: description.BackendFingerprint}
-	return s.describe(result, description.IdleSeconds, description.RetentionSeconds)
+	return s.describe(result)
+}
+
+// suspension returns Core's idle suspension policy for a provider that
+// declares checkpoint support, and nil for any other provider.
+func (s *Service) suspension(provider string) (*Suspension, error) {
+	checkpoint, err := s.registry.SupportsCheckpoint(provider)
+	if err != nil || !checkpoint {
+		return nil, err
+	}
+	return &Suspension{IdleSeconds: 5 * 60, RetentionSeconds: 24 * 60 * 60}, nil
 }
 
 // validateSelection rejects a selection its provider cannot normalize.
diff --git a/services/core/internal/deployment/setup.go b/services/core/internal/deployment/setup.go
index 2f17624b0..dae24b6c7 100644
--- a/services/core/internal/deployment/setup.go
+++ b/services/core/internal/deployment/setup.go
@@ -21,8 +21,8 @@ type Setup struct {
 	// transport proxies.
 	Operations    providercontract.Operations
 	Configuration sandbox.Configuration `json:"-"`
-	// Suspension is the idle suspension policy of a provider that suspends
-	// sandboxes, and nil otherwise.
+	// Suspension is the idle suspension policy of a provider that declares
+	// checkpoint support, and nil otherwise.
 	Suspension *Suspension
 	// UsesCredential reports whether the provider's configuration carries a
 	// credential.
diff --git a/services/core/internal/deployment/storage.go b/services/core/internal/deployment/storage.go
index e3b9dc761..662f7e926 100644
--- a/services/core/internal/deployment/storage.go
+++ b/services/core/internal/deployment/storage.go
@@ -342,8 +342,6 @@ type Record struct {
 	Generation         uint64
 	OwnerEpoch         uint64
 	Mode               string
-	IdleSeconds        int64
-	RetentionSeconds   int64
 	// Specification is the stored specification document.
 	Specification json.RawMessage
 	// Configuration holds the public configuration and metadata and, when a
@@ -378,7 +376,6 @@ type Snapshot struct {
 type SelectionRecord struct {
 	InstallationID, Provider, BackendFingerprint, Mode string
 	Generation                                         uint64
-	IdleSeconds, RetentionSeconds                      int64
 	Specification                                      json.RawMessage
 	// Configuration carries the secret in plaintext; the adapter seals it.
 	Configuration sandbox.ConfigurationRecord
diff --git a/services/core/internal/deployment/view.go b/services/core/internal/deployment/view.go
index 806a138fd..228fc8e7e 100644
--- a/services/core/internal/deployment/view.go
+++ b/services/core/internal/deployment/view.go
@@ -18,7 +18,7 @@ type View struct {
 	Configuration        json.RawMessage         `json:"configuration,omitempty" swaggertype:"object"`
 	Metadata             json.RawMessage         `json:"metadata,omitempty" swaggertype:"object"`
 	CredentialConfigured bool                    `json:"credential_configured"`
-	// Idle suspension policy; microsandbox only, otherwise null.
+	// Idle suspension policy; null unless the selected Provider declares checkpoint support.
 	Suspension     *Suspension `json:"suspension" extensions:"x-nullable"`
 	InstallationID string      `json:"installation_id"`
 	Provider       string      `json:"provider"`
@@ -34,8 +34,8 @@ type Resources struct {
 	Pending     int64 `json:"pending"`
 }
 
-// Suspension is the idle suspension policy. Only microsandbox suspends
-// sandboxes; Docker and E2B deployments return null.
+// Suspension is Core's idle suspension policy, which applies to every Provider
+// that declares checkpoint support.
 type Suspension struct {
 	IdleSeconds      int64 `json:"idle_seconds"`
 	RetentionSeconds int64 `json:"retention_seconds"`
diff --git a/services/core/internal/persistence/postgres/deploymentpg/records.go b/services/core/internal/persistence/postgres/deploymentpg/records.go
index 84eed9174..c1e2cb3c5 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/records.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/records.go
@@ -60,8 +60,7 @@ func translate(err error) error {
 // authenticate is an internal decryption error.
 func record(d sqlc.RuntimeDeployment, cipher *credentialcrypto.Cipher, open bool) deployment.Record {
 	r := deployment.Record{InstallationID: uuidString(d.InstallationID), Provider: d.ProviderKind, BackendFingerprint: d.BackendFingerprint,
-		Generation: uint64(d.Generation), OwnerEpoch: uint64(d.OwnerEpoch), Mode: d.Mode,
-		IdleSeconds: d.IdleSeconds, RetentionSeconds: d.RetentionSeconds, Specification: d.Specification,
+		Generation: uint64(d.Generation), OwnerEpoch: uint64(d.OwnerEpoch), Mode: d.Mode, Specification: d.Specification,
 		Configuration: sandbox.ConfigurationRecord{Public: d.ProviderConfig, Metadata: d.ProviderMetadata}, CredentialStored: len(d.ProviderCredential) > 0}
 	if r.CredentialStored && open {
 		if cipher == nil {
diff --git a/services/core/internal/persistence/postgres/deploymentpg/tx.go b/services/core/internal/persistence/postgres/deploymentpg/tx.go
index e0952eb19..f48a83cbf 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/tx.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/tx.go
@@ -301,7 +301,7 @@ func (t *deploymentTx) SaveSelection(selection deployment.SelectionRecord) error
 	if selection.Generation > math.MaxInt64 {
 		return deployment.ErrInvalidInput
 	}
-	params := sqlc.InitializeSandboxDeploymentParams{ProviderKind: selection.Provider, BackendFingerprint: selection.BackendFingerprint, Generation: int64(selection.Generation), Mode: selection.Mode, IdleSeconds: selection.IdleSeconds, RetentionSeconds: selection.RetentionSeconds, ProviderConfig: selection.Configuration.Public, ProviderMetadata: selection.Configuration.Metadata, Specification: selection.Specification}
+	params := sqlc.InitializeSandboxDeploymentParams{ProviderKind: selection.Provider, BackendFingerprint: selection.BackendFingerprint, Generation: int64(selection.Generation), Mode: selection.Mode, ProviderConfig: selection.Configuration.Public, ProviderMetadata: selection.Configuration.Metadata, Specification: selection.Specification}
 	if len(selection.Configuration.Secret) > 0 {
 		if t.cipher == nil {
 			return credentialcrypto.ErrUnavailable
diff --git a/services/core/internal/sandbox/deployment.go b/services/core/internal/sandbox/deployment.go
index 712d9e27b..af749281f 100644
--- a/services/core/internal/sandbox/deployment.go
+++ b/services/core/internal/sandbox/deployment.go
@@ -109,8 +109,7 @@ func (s DeploymentSpec) Digest(provider string) string {
 }
 
 // Description is what a provider registration says about a deployment of it:
-// its mode, its backend namespace fingerprint and its checkpoint timing.
+// its mode and its backend namespace fingerprint.
 type Description struct {
-	Mode, BackendFingerprint      string
-	IdleSeconds, RetentionSeconds int64
+	Mode, BackendFingerprint string
 }
diff --git a/services/core/internal/sandbox/providers/registration.go b/services/core/internal/sandbox/providers/registration.go
index 712283e55..3962f0f6e 100644
--- a/services/core/internal/sandbox/providers/registration.go
+++ b/services/core/internal/sandbox/providers/registration.go
@@ -2,7 +2,6 @@ package providers
 
 import (
 	"fmt"
-	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
@@ -51,16 +50,10 @@ func ValidateRegistration(a Adapter) error {
 	if err := sandbox.ValidateOperations(operations); err != nil {
 		return err
 	}
-	// The current common lifecycle admits checkpoint suspension only on nodes,
-	// and creates its policy whenever checkpoint support is declared.
-	if operations["Initial"].State == providercontract.Supported {
-		const maximumSeconds = int64((1<<63 - 1) / time.Second)
-		if a.Mode != "nodes" || a.IdleSeconds < 1 || a.RetentionSeconds < 1 ||
-			a.IdleSeconds > maximumSeconds || a.RetentionSeconds > maximumSeconds {
-			return invalid("checkpoint policy")
-		}
-	} else if a.IdleSeconds != 0 || a.RetentionSeconds != 0 {
-		return invalid("non-checkpoint policy")
+	// The common lifecycle suspends only node allocations, so only a nodes
+	// registration may declare checkpoint support.
+	if operations["Initial"].State == providercontract.Supported && a.Mode != "nodes" {
+		return invalid("checkpoint support outside nodes mode")
 	}
 	return nil
 }
diff --git a/services/core/internal/sandbox/providers/registration_test.go b/services/core/internal/sandbox/providers/registration_test.go
index f30c39072..b8121f38d 100644
--- a/services/core/internal/sandbox/providers/registration_test.go
+++ b/services/core/internal/sandbox/providers/registration_test.go
@@ -165,35 +165,12 @@ func TestCompleteRegistrationsPreserveConstruction(t *testing.T) {
 	}
 }
 
-// Idle time is measured before suspension, retention after suspension. Neither
-// duration needs to be greater than the other.
-func TestRegistrationCheckpointPolicy(t *testing.T) {
+// Only a nodes registration may declare checkpoint support.
+func TestRegistrationCheckpointRequiresNodes(t *testing.T) {
 	registry := Builtin()
-	for _, tc := range []struct {
-		name            string
-		kind            string
-		idle, retention int64
-		direct, valid   bool
-	}{
-		{"negative idle", "microsandbox", -1, 20, false, false},
-		{"missing idle", "microsandbox", 0, 20, false, false},
-		{"missing retention", "microsandbox", 20, 0, false, false},
-		{"overflow", "microsandbox", 1<<63 - 1, 20, false, false},
-		{"direct suspension", "microsandbox", 20, 20, true, false},
-		{"unsupported suspension", "docker", 20, 20, false, false},
-		{"independent durations", "microsandbox", 300, 30, false, true},
-		{"no suspension", "docker", 0, 0, false, true},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			a := registry.adapters[tc.kind]
-			a.IdleSeconds, a.RetentionSeconds = tc.idle, tc.retention
-			if tc.direct {
-				a.Mode, a.BuildLocal, a.BuildDirect = "direct", nil, registry.adapters["e2b"].BuildDirect
-			}
-			err := ValidateRegistration(a)
-			if (err == nil) != tc.valid || err != nil && !errors.Is(err, providercontract.ErrContract) {
-				t.Fatal(err)
-			}
-		})
+	a := registry.adapters["microsandbox"]
+	a.Mode, a.BuildLocal, a.NodeArtifacts, a.BuildDirect = "direct", nil, nil, registry.adapters["e2b"].BuildDirect
+	if err := ValidateRegistration(a); !errors.Is(err, providercontract.ErrContract) || !strings.Contains(err.Error(), "checkpoint") {
+		t.Fatal("direct checkpoint registration accepted", err)
 	}
 }
diff --git a/services/core/internal/sandbox/providers/registry.go b/services/core/internal/sandbox/providers/registry.go
index 29bb86b4f..d7bf67337 100644
--- a/services/core/internal/sandbox/providers/registry.go
+++ b/services/core/internal/sandbox/providers/registry.go
@@ -17,16 +17,15 @@ import (
 // Adapter describes configuration and transport independently of compute operations.
 // Native operation support comes from the adapter-owned complete declaration.
 type Adapter struct {
-	NodeArtifacts                 []providerassets.Artifact
-	Policy                        sandbox.DeploymentPolicy
-	Configuration                 sandbox.ConfigurationAdapter
-	BuildLocal                    func(Config, LocalOptions, *Built) (func(), error)
-	BuildDirect                   func(sandbox.DirectConfig) (sandbox.SandboxProvider, error)
-	Mode                          string
-	Operations                    func() providercontract.Operations
-	IdleSeconds, RetentionSeconds int64
-	ValidateSpecification         func(sandbox.DeploymentSpec) error
-	ValidateResources             func(sandbox.Resources) error
+	NodeArtifacts         []providerassets.Artifact
+	Policy                sandbox.DeploymentPolicy
+	Configuration         sandbox.ConfigurationAdapter
+	BuildLocal            func(Config, LocalOptions, *Built) (func(), error)
+	BuildDirect           func(sandbox.DirectConfig) (sandbox.SandboxProvider, error)
+	Mode                  string
+	Operations            func() providercontract.Operations
+	ValidateSpecification func(sandbox.DeploymentSpec) error
+	ValidateResources     func(sandbox.Resources) error
 }
 
 // Registry holds the registered adapters. Core and the node program each build
@@ -51,7 +50,6 @@ func Builtin() *Registry {
 				{Path: "native/microsandbox/msb", Suffix: "msb", Role: "runtime"},
 				{Path: "native/microsandbox/libkrunfw.so.5.6.1", Suffix: "libkrunfw.so.5.6.1", Role: "runtime"}},
 			Policy: microsandbox.Policy(), Operations: microsandbox.Operations, Mode: "nodes", BuildLocal: buildMicrosandbox,
-			IdleSeconds: 300, RetentionSeconds: 86400,
 			ValidateSpecification: microsandbox.ValidateSpecification, ValidateResources: microsandbox.ValidateResources,
 			Configuration: nodeConfigurationAdapter{microsandbox.ValidateSpecification},
 		},
@@ -141,7 +139,7 @@ func (r *Registry) Describe(kind, installation string) (sandbox.Description, err
 	if a.Mode == "direct" {
 		namespace = kind
 	}
-	return sandbox.Description{Mode: a.Mode, BackendFingerprint: BackendFingerprint(kind, namespace+":"+installation), IdleSeconds: a.IdleSeconds, RetentionSeconds: a.RetentionSeconds}, nil
+	return sandbox.Description{Mode: a.Mode, BackendFingerprint: BackendFingerprint(kind, namespace+":"+installation)}, nil
 }
 
 // PythonDeploymentContract projects the same registered adapter policies into
diff --git a/services/core/internal/sandbox/providers/registry_test.go b/services/core/internal/sandbox/providers/registry_test.go
index 6b3078902..bd008e63e 100644
--- a/services/core/internal/sandbox/providers/registry_test.go
+++ b/services/core/internal/sandbox/providers/registry_test.go
@@ -14,17 +14,16 @@ func TestRegistrationOwnsDeploymentPolicy(t *testing.T) {
 	installation := uuid.NewString()
 	for _, tc := range []struct {
 		kind, mode, namespace string
-		idle, retention       int64
 		checkpoint            bool
 	}{
-		{"docker", "nodes", "nodes", 0, 0, false},
-		{"microsandbox", "nodes", "nodes", 300, 86400, true},
-		{"e2b", "direct", "e2b", 0, 0, false},
+		{"docker", "nodes", "nodes", false},
+		{"microsandbox", "nodes", "nodes", true},
+		{"e2b", "direct", "e2b", false},
 	} {
 		t.Run(tc.kind, func(t *testing.T) {
 			d, err := registry.Describe(tc.kind, installation)
-			if err != nil || d.Mode != tc.mode || d.IdleSeconds != tc.idle || d.RetentionSeconds != tc.retention || d.BackendFingerprint != BackendFingerprint(tc.kind, tc.namespace+":"+installation) {
-				t.Fatalf("wrong namespace or defaults: %+v %v", d, err)
+			if err != nil || d.Mode != tc.mode || d.BackendFingerprint != BackendFingerprint(tc.kind, tc.namespace+":"+installation) {
+				t.Fatalf("wrong mode or namespace: %+v %v", d, err)
 			}
 			a, err := registry.Lookup(tc.kind)
 			checkpoint, checkpointErr := registry.SupportsCheckpoint(tc.kind)
@@ -75,7 +74,7 @@ func TestNewRegistrationDoesNotNeedCoreDispatchChanges(t *testing.T) {
 		t.Fatal("new entry did not follow shared boundary", err, checkpointErr)
 	}
 	d, err := registry.Describe(kind, uuid.NewString())
-	if err != nil || d.Mode != "nodes" || d.IdleSeconds != 0 {
+	if err != nil || d.Mode != "nodes" {
 		t.Fatal(d, err)
 	}
 	if _, err := registry.Normalize(sandbox.Selection{Provider: kind, Configuration: &e2b.DeploymentConfiguration{APIKey: "wrong-provider"}}); !errors.Is(err, sandbox.ErrInvalid) {
diff --git a/services/core/migrations/000094_suspension_from_declaration.sql b/services/core/migrations/000094_suspension_from_declaration.sql
new file mode 100644
index 000000000..67bd968aa
--- /dev/null
+++ b/services/core/migrations/000094_suspension_from_declaration.sql
@@ -0,0 +1,26 @@
+-- +goose Up
+-- Core derives the idle suspension policy from the Provider's checkpoint
+-- declaration, so the deployment no longer stores it.
+ALTER TABLE runtime_deployment
+    DROP CONSTRAINT runtime_deployment_setup_check,
+    DROP COLUMN idle_seconds,
+    DROP COLUMN retention_seconds,
+    ADD CONSTRAINT runtime_deployment_setup_check CHECK (
+        installation_id IS NULL OR
+        (provider_kind = '' AND mode = '' AND generation >= 0) OR
+        (provider_kind <> '' AND mode IN ('nodes','direct') AND generation > 0)
+    );
+
+-- +goose Down
+ALTER TABLE runtime_deployment
+    DROP CONSTRAINT runtime_deployment_setup_check,
+    ADD COLUMN idle_seconds bigint NOT NULL DEFAULT 0 CHECK (idle_seconds >= 0),
+    ADD COLUMN retention_seconds bigint NOT NULL DEFAULT 0 CHECK (retention_seconds >= 0);
+UPDATE runtime_deployment SET idle_seconds = 300, retention_seconds = 86400 WHERE provider_kind = 'microsandbox';
+ALTER TABLE runtime_deployment
+    ADD CONSTRAINT runtime_deployment_setup_check CHECK (
+        installation_id IS NULL OR
+        (provider_kind = '' AND mode = '' AND generation >= 0 AND idle_seconds = 0 AND retention_seconds = 0) OR
+        (provider_kind <> '' AND mode IN ('nodes','direct') AND generation > 0 AND
+            ((idle_seconds = 0 AND retention_seconds = 0) OR (idle_seconds > 0 AND retention_seconds > 0)))
+    );

From 716dd0a2300f2a7a94911dda5fc7bcf8ca6d6897 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 10:34:18 +0800
Subject: [PATCH 46/60] Read Provider declarations in Web (#539)

---
 apps/web/e2e/nodes.spec.ts                    |  6 +-
 apps/web/src/features/fleet/fleet-model.ts    |  5 +-
 .../features/metrics/SandboxMetricsPage.tsx   | 21 ++++---
 .../overview/FleetOverview.render.test.tsx    |  1 +
 .../src/features/overview/FleetOverview.tsx   | 12 ++--
 .../src/features/overview/OverviewPage.tsx    |  5 +-
 .../features/overview/getting-started.test.ts |  2 +-
 .../src/features/overview/getting-started.ts  | 12 ++--
 .../features/sandbox/NodeCleanupDialog.tsx    |  6 +-
 apps/web/src/features/sandbox/NodeDetail.tsx  |  8 +--
 .../src/features/sandbox/NodeEditDialog.tsx   |  9 +--
 .../src/features/sandbox/NodeEnrollment.tsx   | 19 ++++---
 .../sandbox/SandboxDeploymentPage.tsx         |  6 +-
 .../sandbox/SandboxDeploymentSettings.tsx     |  2 +-
 .../features/sandbox/SandboxManagerView.tsx   | 11 ++--
 .../features/sandbox/SandboxSetupWizard.tsx   | 57 +++++++++++--------
 .../src/features/sandbox/console-config.ts    |  9 +--
 .../sandbox/deployment-specification.test.ts  | 21 +++----
 .../sandbox/deployment-specification.ts       | 11 ++--
 .../features/sandbox/enrollment-command.ts    |  4 +-
 .../src/features/sandbox/node-commands.tsx    |  6 +-
 .../src/features/sandbox/node-enrollment.ts   | 17 ++----
 .../sandbox/sandbox-page-ownership.test.tsx   |  2 +-
 .../features/sandbox/sandbox-queries.test.ts  |  2 +-
 .../src/features/sandbox/sandbox-queries.ts   |  2 +-
 .../src/features/sandbox/standard-sizes.json  | 12 ----
 .../src/features/sandbox/standard-sizes.md    | 23 --------
 apps/web/src/lib/locale-strings.ts            |  5 +-
 contracts/agents-api/sandbox-deployment.md    |  2 +-
 contracts/agents-api/zh/sandbox-deployment.md |  4 +-
 deploy/node/node_spec.py                      |  2 +-
 docs/configuration.md                         |  2 +-
 docs/getting-started/install-options.md       |  2 +-
 docs/sandbox-provider.md                      | 10 ++--
 docs/zh/configuration.md                      |  4 +-
 docs/zh/getting-started/install-options.md    |  4 +-
 docs/zh/sandbox-provider.md                   | 12 ++--
 .../agents-client/src/deployment-contract.ts  |  2 +-
 packages/agents-client/src/sandbox-client.ts  |  8 +--
 .../core/cmd/specification-contract/main.go   |  4 +-
 .../internal/sandbox/deployment_contract.go   | 48 ++++++----------
 .../core/internal/sandbox/docker/selection.go |  4 +-
 .../sandbox/microsandbox/deployment.go        |  5 +-
 .../providers/deployment_contract_test.go     |  4 +-
 .../sandbox/providers/registration.go         |  6 +-
 .../sandbox/providers/registration_test.go    | 14 ++++-
 .../internal/sandbox/providers/registry.go    | 16 +++---
 .../core/internal/sandbox/sandbox_provider.go | 11 ++++
 48 files changed, 220 insertions(+), 240 deletions(-)
 delete mode 100644 apps/web/src/features/sandbox/standard-sizes.json
 delete mode 100644 apps/web/src/features/sandbox/standard-sizes.md

diff --git a/apps/web/e2e/nodes.spec.ts b/apps/web/e2e/nodes.spec.ts
index f404a5de6..5f32831da 100644
--- a/apps/web/e2e/nodes.spec.ts
+++ b/apps/web/e2e/nodes.spec.ts
@@ -15,14 +15,12 @@ test("adds a node: host requirements, a root/sudo command, a countdown, the same
   await openConsole(page, request, "nodes");
   await page.getByRole("button", { name: "Add node" }).click();
   const add = page.getByRole("dialog", { name: "Add node" });
-  // What a Docker host needs for the default command, which installs the node with sudo.
-  await expect(add.getByText("Rootful Docker Engine running, its socket owned by the docker group with mode 0660, enforcing CPU and memory limits (cgroup v2)")).toBeVisible();
+  // What a host needs for the default command, which installs the node with sudo.
+  await expect(add.getByText("What the sandbox backend needs on the host; the installer checks it and names anything missing")).toBeVisible();
   await expect(add.getByText("SELinux is not enforcing")).toBeVisible();
   await expect(add.getByText("In sudo mode, one Core per host: a host already running a sudo-mode node for another Core is refused.")).toBeVisible();
   await expect(add.getByText("CPUs and memory for at least one sandbox: 2 CPU · 4 GiB; about 2 GB of disk for the Runtime image")).toBeVisible();
   await expect(add.getByText("Reaches https://core.example.com, as do its sandboxes")).toBeVisible();
-  await expect(add.getByText("oac-node joins the docker group, which is equivalent to root on this host.")).toBeVisible();
-  await expect(add.getByText(/\/dev\/kvm/)).toHaveCount(0);
   // Node installation only offers a system service; there is no user-mode alternative.
   await expect(add.getByText("No sudo on this host?")).toHaveCount(0);
   await expect(add.getByLabel("One-time enrollment command without sudo", { exact: true })).toHaveCount(0);
diff --git a/apps/web/src/features/fleet/fleet-model.ts b/apps/web/src/features/fleet/fleet-model.ts
index 08abf927c..c35e58747 100644
--- a/apps/web/src/features/fleet/fleet-model.ts
+++ b/apps/web/src/features/fleet/fleet-model.ts
@@ -29,14 +29,15 @@ export interface CapacitySummary {
   maxRetained: number;
   reserved: number;
   cleanupPending: number;
-  /** Sandboxes held suspended (microsandbox only): placed, but not counted as active. */
+  /** Sandboxes held suspended (where the Provider declares checkpoint support): placed, but not counted as active. */
   suspended: number;
 }
 
 /**
  * Sandboxes a node holds suspended: Core counts every unreleased placement as
  * retained and only the ones not suspended as active, so the difference is
- * what sleeps as a snapshot. Only microsandbox suspends; elsewhere it is 0.
+ * what sleeps as a snapshot. Only a Provider that declares checkpoint support
+ * suspends; elsewhere it is 0.
  */
 export function suspendedSandboxes(node: SandboxNode): number {
   return Math.max(0, node.retained - node.active);
diff --git a/apps/web/src/features/metrics/SandboxMetricsPage.tsx b/apps/web/src/features/metrics/SandboxMetricsPage.tsx
index e3b70c6a8..66d59f109 100644
--- a/apps/web/src/features/metrics/SandboxMetricsPage.tsx
+++ b/apps/web/src/features/metrics/SandboxMetricsPage.tsx
@@ -108,10 +108,10 @@ export function SandboxMetricsPage() {
   const [openNode, setOpenNode] = useState<string | null>(null);
   const [openRuntime, setOpenRuntime] = useState<string | null>(null);
   const rows = useMemo(() => (runtimeState.load ? hostedRuntimeRows(runtimeState.load, "", fleet) : []), [fleet, runtimeState.load]);
-  // E2B runs sandboxes in its cloud: no machines, so no node table, node column or node dialog.
-  const cloud = fleet?.deployment.provider === "e2b";
-  // Only microsandbox suspends sandboxes into snapshots; its nodes also show how many sleep.
-  const suspends = fleet?.deployment.provider === "microsandbox";
+  // A direct Provider runs sandboxes in its cloud: no machines, so no node table, node column or node dialog.
+  const cloud = fleet?.deployment.mode === "direct";
+  // Only a Provider that declares checkpoint support suspends sandboxes; its nodes also show how many sleep.
+  const suspends = Boolean(fleet?.deployment.suspension);
 
   return (
     <section className="page-section console-page metrics-page" aria-labelledby="sandbox-metrics-heading">
@@ -205,6 +205,7 @@ export function SandboxMetricsPage() {
         stale={fleetObservationStale(fleetState)}
         load={runtimeState.load}
         range={range}
+        suspends={suspends}
         onClose={() => setOpenNode(null)}
       />
       <RuntimeDialog row={rows.find((row) => row.observation.session_id === openRuntime) ?? null} showNode={!cloud} onClose={() => setOpenRuntime(null)} />
@@ -310,7 +311,7 @@ function HostedRuntimeSection({ state, stale, fleet, range, onOpen }: { state: R
         {durable ? <RuntimeCharts samples={durable.samples} resolutionSeconds={durable.resolutionSeconds} />
           : history.isError ? <p className="page-status" role="alert">{t("sandbox.charts.historyFailed", { reason: history.error instanceof Error ? history.error.message : "" })}</p>
             : history.isFetched ? <p className="page-status">{t("sandbox.charts.historyUnavailable")}</p> : null}
-        <RuntimeTable rows={hostedRuntimeRows(load, "", fleet)} showProject showNode={fleet?.deployment.provider !== "e2b"} onOpen={onOpen} />
+        <RuntimeTable rows={hostedRuntimeRows(load, "", fleet)} showProject showNode={fleet?.deployment.mode !== "direct"} onOpen={onOpen} />
       </>
     );
   }
@@ -322,7 +323,7 @@ function HostedRuntimeSection({ state, stale, fleet, range, onOpen }: { state: R
         {t("sandbox.runtimeSection")}
         {usage?.hosted ? (
           <span className="section-meta">
-            {t(fleet?.deployment.provider === "microsandbox" ? "sandbox.runtimeMetaSuspended" : "sandbox.runtimeMeta", {
+            {t(fleet?.deployment.suspension ? "sandbox.runtimeMetaSuspended" : "sandbox.runtimeMeta", {
               n: formatInteger(usage.hosted, locale),
               sleeping: formatInteger(usage.sleeping, locale),
               cpu: usage.cpuUsageCores === null ? MISSING : t("sandbox.cores", { value: formatCores(usage.cpuUsageCores, locale) }),
@@ -448,8 +449,10 @@ function useLast<T>(value: T | null): T | null {
  * A node in a dialog: the host figures it reports with each heartbeat, and
  * CPU and memory of the hosted sandboxes placed on it over the page's range.
  */
-function NodeDialog({ node, rows, load, range, stale, onClose }: {
+function NodeDialog({ node, rows, load, range, stale, suspends, onClose }: {
   stale: boolean;
+  /** Whether the deployment's Provider suspends sandboxes, which its suspension policy declares. */
+  suspends: boolean;
   node: SandboxNode | null;
   rows: readonly HostedRuntimeRow[];
   load: HostedRuntimeLoad | null;
@@ -503,8 +506,8 @@ function NodeDialog({ node, rows, load, range, stale, onClose }: {
             <div><dt>{t("sandbox.targetPreparation")}</dt><dd><NodeRolloutStatus node={shown} stale={stale} /></dd></div>
             <div><dt>{t("sandbox.servingGeneration")}</dt><dd><span className="status-with-help">{shown.rollout.ready_generation ?? MISSING}<HelpTip>{t("sandbox.servingGenerationHelp")}</HelpTip></span></dd></div>
             <div><dt>{t("sandbox.slots")}</dt><dd>{formatInteger(shown.active, locale)} / {formatInteger(shown.max_active, locale)}</dd></div>
-            {shown.provider === "microsandbox" ? <div><dt>{t("sandbox.suspended")}</dt><dd>{formatInteger(suspendedSandboxes(shown), locale)}</dd></div> : null}
-            {shown.provider === "microsandbox" ? <div><dt>{t("sandbox.nodeDialog.retainedSlots")}</dt><dd>{formatInteger(shown.retained, locale)} / {formatInteger(shown.max_retained, locale)}</dd></div> : null}
+            {suspends ? <div><dt>{t("sandbox.suspended")}</dt><dd>{formatInteger(suspendedSandboxes(shown), locale)}</dd></div> : null}
+            {suspends ? <div><dt>{t("sandbox.nodeDialog.retainedSlots")}</dt><dd>{formatInteger(shown.retained, locale)} / {formatInteger(shown.max_retained, locale)}</dd></div> : null}
             <div><dt>{t("sandbox.cpus")}</dt><dd>{cpu}</dd></div>
             <div><dt>{t("sandbox.memory")}</dt><dd>{memory}</dd></div>
             <div><dt>{t("sandbox.freeDiskColumn")}</dt><dd>{online ? formatBytes(shown.available_disk_bytes) : MISSING}</dd></div>
diff --git a/apps/web/src/features/overview/FleetOverview.render.test.tsx b/apps/web/src/features/overview/FleetOverview.render.test.tsx
index 2b363ee88..7604690bc 100644
--- a/apps/web/src/features/overview/FleetOverview.render.test.tsx
+++ b/apps/web/src/features/overview/FleetOverview.render.test.tsx
@@ -10,6 +10,7 @@ describe("fleet overview popovers", () => {
     const html = renderToStaticMarkup(
       <FleetOverview
         nodes={[node("a", { name: "worker-a" }), node("b", { online: false })]}
+        suspends={false}
         coreLabel="Running"
         coreTone="ok"
         stale={false}
diff --git a/apps/web/src/features/overview/FleetOverview.tsx b/apps/web/src/features/overview/FleetOverview.tsx
index c4d0d47cf..99f36d0f2 100644
--- a/apps/web/src/features/overview/FleetOverview.tsx
+++ b/apps/web/src/features/overview/FleetOverview.tsx
@@ -38,10 +38,12 @@ export interface CloudHost {
 }
 
 /** A compact fleet inventory with on-demand operational details. */
-export function FleetOverview({ nodes, cloud, coreLabel, coreTone, stale, onOpenNode, onOpenBackend, onOpenSandboxMetrics, onOpenCoreMetrics }: {
+export function FleetOverview({ nodes, cloud, suspends, coreLabel, coreTone, stale, onOpenNode, onOpenBackend, onOpenSandboxMetrics, onOpenCoreMetrics }: {
   nodes: readonly SandboxNode[];
-  /** An E2B deployment: Core links to E2B's cloud instead of to machines. */
+  /** A direct deployment: Core links to the Provider's cloud instead of to machines. */
   cloud?: CloudHost | null;
+  /** Whether the deployment's Provider suspends sandboxes, which its suspension policy declares. */
+  suspends: boolean;
   onOpenBackend?: () => void;
   coreLabel: string;
   coreTone: Tone;
@@ -124,7 +126,7 @@ export function FleetOverview({ nodes, cloud, coreLabel, coreTone, stale, onOpen
               <button className="text-action" type="button" onClick={() => onOpenNode(node)}>{t("fleet.openNode")}</button>
             </>}
           >
-            <NodeGlance node={node} health={health} stale={stale} />
+            <NodeGlance node={node} health={health} stale={stale} suspends={suspends} />
           </ConsolePopover>
         );
       })}
@@ -141,7 +143,7 @@ function Fact({ label, children }: { label: string; children: ReactNode }) {
 }
 
 /** A node at a glance: reachability (with the reason a degraded provider is not ready), sandbox slots and what the node has left. */
-function NodeGlance({ node, health, stale }: { node: SandboxNode; health: NodeHealth; stale: boolean }) {
+function NodeGlance({ node, health, stale, suspends }: { node: SandboxNode; health: NodeHealth; stale: boolean; suspends: boolean }) {
   const { t, i18n } = useTranslation("overview");
   const locale = i18n.resolvedLanguage;
   const now = Math.floor(Date.now() / 1000);
@@ -160,7 +162,7 @@ function NodeGlance({ node, health, stale }: { node: SandboxNode; health: NodeHe
       <Fact label={t("fleet.servingGeneration")}><span className="status-with-help">{node.rollout.ready_generation ?? MISSING}<HelpTip>{t("fleet.servingGenerationHelp")}</HelpTip></span></Fact>
       <Fact label={t("fleet.facts.lastSeen")}><span title={seen === null ? undefined : formatDateTime(seen, locale)}>{seen === null ? t("fleet.facts.never") : formatRelative(seen, now, locale)}</span></Fact>
       <Fact label={t("fleet.facts.active")}>{count(node.active)}<span className="kpi-unit">/ {count(node.max_active)}</span></Fact>
-      {node.provider === "microsandbox" ? <Fact label={t("fleet.facts.suspended")}>{count(suspendedSandboxes(node))}</Fact> : null}
+      {suspends ? <Fact label={t("fleet.facts.suspended")}>{count(suspendedSandboxes(node))}</Fact> : null}
       <Fact label={t("fleet.facts.cpu")}>{node.cpu_count === null ? MISSING : t("fleet.facts.cores", { count: node.cpu_count })}</Fact>
       <Fact label={t("fleet.facts.memory")}>{formatBytes(node.available_memory_bytes)}</Fact>
       <Fact label={t("fleet.facts.disk")}>{formatBytes(node.available_disk_bytes)}</Fact>
diff --git a/apps/web/src/features/overview/OverviewPage.tsx b/apps/web/src/features/overview/OverviewPage.tsx
index e0e366b71..0b8975260 100644
--- a/apps/web/src/features/overview/OverviewPage.tsx
+++ b/apps/web/src/features/overview/OverviewPage.tsx
@@ -206,7 +206,7 @@ export function OverviewPage() {
               help={t("kpi.slotsHelp")}
               value={capacity ? <><LiveNumber value={capacity.active} /><span className="kpi-unit">/ {formatInteger(capacity.maxActive, locale)}</span></> : MISSING}
               sub={capacity
-                ? fleet?.deployment.provider === "microsandbox"
+                ? fleet?.deployment.suspension
                   ? t("tiles.nodesOnlineSuspended", { online: capacity.online, total: capacity.nodes, suspended: capacity.suspended })
                   : t("tiles.nodesOnline", { online: capacity.online, total: capacity.nodes })
                 : fleetDetail(fleetState, t)}
@@ -313,7 +313,7 @@ function fleetDetail(state: FleetState, t: TFunction<"overview">): string {
 }
 
 function cloudHost(fleet: FleetSnapshot | null): CloudHost | null {
-  if (fleet?.deployment.provider !== "e2b") return null;
+  if (fleet?.deployment.mode !== "direct") return null;
   return { running: fleet.deployment.resources.allocations, pending: fleet.deployment.resources.pending, template: fleet.deployment.configuration?.template || null };
 }
 
@@ -345,6 +345,7 @@ function FleetCard({ fleetState, core, localOnly }: { fleetState: FleetState; co
         <FleetOverview
           nodes={hosts}
           cloud={cloud}
+          suspends={Boolean(fleet?.deployment.suspension)}
           onOpenBackend={() => navigate("system", { id: "sandbox" })}
           coreLabel={t(`coreStatus.${core}`)}
           coreTone={coreTone[core]}
diff --git a/apps/web/src/features/overview/getting-started.test.ts b/apps/web/src/features/overview/getting-started.test.ts
index 56a9990a7..0194079ae 100644
--- a/apps/web/src/features/overview/getting-started.test.ts
+++ b/apps/web/src/features/overview/getting-started.test.ts
@@ -54,7 +54,7 @@ describe("Getting started steps", () => {
   });
   it("keeps local-only installations to do even with a ready node or cloud deployment", () => {
     for (const provider of ["docker", "e2b"] as const) {
-      const steps = gettingStartedSteps({ sandboxReset: false, fleet: fleet(deployment({ provider })), projects: [], sessions: 1, harnesses: [], localOnly: true });
+      const steps = gettingStartedSteps({ sandboxReset: false, fleet: fleet(deployment({ provider, mode: provider === "e2b" ? "direct" : "nodes" })), projects: [], sessions: 1, harnesses: [], localOnly: true });
       expect(steps.sandboxes).toMatchObject({ state: "todo", action: "nodes", cloud: provider === "e2b" });
     }
   });
diff --git a/apps/web/src/features/overview/getting-started.ts b/apps/web/src/features/overview/getting-started.ts
index 8a781e398..915595455 100644
--- a/apps/web/src/features/overview/getting-started.ts
+++ b/apps/web/src/features/overview/getting-started.ts
@@ -41,10 +41,10 @@ export function gettingStartedSteps(input: {
   const { sessions } = input;
   return {
     sandboxes: input.sandboxReset !== false
-      ? { state: input.sandboxReset === "failed" ? "unknown" : input.sandboxReset ? "todo" : null, action: "nodes", cloud: input.fleet.status === "ready" && input.fleet.snapshot.deployment.provider === "e2b" }
+      ? { state: input.sandboxReset === "failed" ? "unknown" : input.sandboxReset ? "todo" : null, action: "nodes", cloud: input.fleet.status === "ready" && input.fleet.snapshot.deployment.mode === "direct" }
       : input.localOnly === undefined || input.localOnly === "failed"
       ? { state: input.localOnly === "failed" ? "unknown" : null, action: "nodes", cloud: false }
-      : input.localOnly ? { state: "todo", action: "nodes", cloud: input.fleet.status === "ready" && input.fleet.snapshot.deployment.provider === "e2b" } : sandboxStep(input.fleet),
+      : input.localOnly ? { state: "todo", action: "nodes", cloud: input.fleet.status === "ready" && input.fleet.snapshot.deployment.mode === "direct" } : sandboxStep(input.fleet),
     model: modelStep(input.harnesses),
     key: keyStep(input.projects),
     session: {
@@ -56,8 +56,8 @@ export function gettingStartedSteps(input: {
 
 /**
  * Own machines are ready once the deployment is saved and a node is online
- * with its provider ready; E2B once the deployment is saved, since Core admits
- * only a ready template build. Only a build Core reports as not ready leaves
+ * with its provider ready; a direct Provider (E2B) once the deployment is
+ * saved, since Core admits only a ready template build. Only a build Core reports as not ready leaves
  * the step to do; a selection saved before Core recorded its build has no
  * status and counts as done.
  */
@@ -65,10 +65,10 @@ function sandboxStep(fleet: FleetState): GettingStartedSteps["sandboxes"] {
   if (fleet.status !== "ready") {
     return { state: fleet.status === "failed" ? "unknown" : null, action: "nodes", cloud: false };
   }
-  if (fleet.error) return { state: "unknown", action: "nodes", cloud: fleet.snapshot.deployment.provider === "e2b" };
+  if (fleet.error) return { state: "unknown", action: "nodes", cloud: fleet.snapshot.deployment.mode === "direct" };
   const { deployment, nodes } = fleet.snapshot;
   if (!deployment.provider) return { state: "todo", action: "setup", cloud: false };
-  if (deployment.provider === "e2b") {
+  if (deployment.mode === "direct") {
     return { state: templateBuildStatus(deployment.metadata?.template_build) === "notReady" ? "todo" : "done", action: "nodes", cloud: true };
   }
   if (nodes.some(nodeServingReady)) return { state: "done", action: "nodes", cloud: false };
diff --git a/apps/web/src/features/sandbox/NodeCleanupDialog.tsx b/apps/web/src/features/sandbox/NodeCleanupDialog.tsx
index fcd1bbf38..a4de4b299 100644
--- a/apps/web/src/features/sandbox/NodeCleanupDialog.tsx
+++ b/apps/web/src/features/sandbox/NodeCleanupDialog.tsx
@@ -12,7 +12,6 @@ export interface NodeCleanup {
   name: string;
   installationId: string;
   scriptDigest: string;
-  provider: string;
   /** The Core address the node enrolled with, when it is no longer the deployment's; else null. */
   oldAddress: string | null;
 }
@@ -23,7 +22,7 @@ export interface NodeCleanup {
  * The installer first confirms with Core, at the node's own address, that the
  * node is removed, which holds from the removal on. The command uses sudo unless the shell is already root. A node enrolled with an earlier address may find it gone; then
  * `--force` skips only that confirmation. Nothing deletes sandboxes, volumes or
- * images. Like Add node's, the command downloads from the installation's public
+ * images; the uninstaller prints what it kept. Like Add node's, the command downloads from the installation's public
  * URL, which the dialog reads (again, if it is not at hand): until it is read, if
  * the read fails (with Try again), or while other machines can't use it, the
  * dialog says so in place of the command. It never opens empty.
@@ -49,8 +48,7 @@ export function NodeCleanupDialog({ cleanup, open, onClose }: { cleanup: NodeCle
     </div> : cleanup ? <div className="sandbox-add-node form-stack">
       <p>{t("{{name}} is removed from Core. To remove its service and files from the host, run:", { name: cleanup.name })}</p>
       <CommandBlock key={command()} value={command()} label={t("Uninstall command")} autoFocus />
-      <p className="sandbox-cleanup-note">{join(t("It never deletes sandboxes, volumes or images."),
-        ...(cleanup.provider === "microsandbox" ? [t("It keeps microsandbox's image store and sandbox data, and prints how to remove them by hand.")] : []))}</p>
+      <p className="sandbox-cleanup-note">{t("It never deletes sandboxes, volumes or images.")}</p>
       {cleanup.oldAddress !== null ? <details className="sandbox-host-requirements">
         <summary>{t("Old Core address gone?")}</summary>
         <div className="sandbox-cleanup-details">
diff --git a/apps/web/src/features/sandbox/NodeDetail.tsx b/apps/web/src/features/sandbox/NodeDetail.tsx
index c5bad4f34..9483c0879 100644
--- a/apps/web/src/features/sandbox/NodeDetail.tsx
+++ b/apps/web/src/features/sandbox/NodeDetail.tsx
@@ -44,7 +44,7 @@ export function NodeDetail({ node, allocations, coreUrl, targetGeneration, stale
   coreUrl: string;
   targetGeneration?: number;
   stale: boolean;
-  /** The deployment's idle suspension policy; only microsandbox has one. */
+  /** The deployment's idle suspension policy; null unless its Provider declares checkpoint support. */
   suspension: SandboxDeployment["suspension"];
 }) {
   const { t, i18n } = useTranslation("sandbox");
@@ -53,8 +53,8 @@ export function NodeDetail({ node, allocations, coreUrl, targetGeneration, stale
   const now = Math.floor(Date.now() / 1000);
   const own = allocations.filter((allocation) => allocation.node_id === node.id);
   const reporting = !stale && node.online;
-  // Only microsandbox suspends sandboxes into snapshots; Docker retains nothing.
-  const suspends = node.provider === "microsandbox";
+  // Only a Provider that declares checkpoint support suspends sandboxes; the node shares the deployment's.
+  const suspends = suspension !== null;
   const state = nodeState(node, own, stale, coreUrl);
   // As in the list, an old address is the status to act on; the node's health would only distract.
   const diagnostic = stale || state === "old_address" ? "" : nodeDiagnostic(node);
@@ -108,7 +108,7 @@ export function NodeDetail({ node, allocations, coreUrl, targetGeneration, stale
                   <th scope="col">{t("Configuration generation")}</th>
                   <th scope="col">{t("Recorded state")}</th>
                   <th scope="col">{t("Recorded compute")}</th>
-                  {/* Only microsandbox changes compute phase; under Docker it is always disabled. */}
+                  {/* Only a Provider with a suspension policy changes compute phase; elsewhere it is always disabled. */}
                   {suspension ? <th scope="col"><span className="column-help">{t("In this state")}<HelpTip>{t("How long the sandbox has been in its compute state. For a suspended one, the reclaim time is estimated from when it was suspended and the deployment's retention; Core reclaims it around then. Older allocations show a dash until their state next changes.")}</HelpTip></span></th> : null}
                   <th scope="col">{t("Issue")}</th>
                   <th scope="col">{t("Created")}</th>
diff --git a/apps/web/src/features/sandbox/NodeEditDialog.tsx b/apps/web/src/features/sandbox/NodeEditDialog.tsx
index 3e562e68e..0cfe46ec8 100644
--- a/apps/web/src/features/sandbox/NodeEditDialog.tsx
+++ b/apps/web/src/features/sandbox/NodeEditDialog.tsx
@@ -13,17 +13,19 @@ import { sandboxesThatFit } from "./deployment-specification";
 
 /**
  * A node's name and sandbox limits (`PATCH /core/v1/sandbox/nodes/{id}`). Core
- * takes all three together. Only microsandbox suspends sandboxes, so only it
- * shows the retained limit; for Docker the saved one is kept, raised to at least
+ * takes all three together. Only a deployment whose Provider suspends sandboxes
+ * shows the retained limit; otherwise the saved one is kept, raised to at least
  * the active limit because Core requires it. Under the limit, the host's CPUs
  * and memory from the node's last heartbeat, each sandbox's size and how many
  * of those the host holds.
  */
-export function NodeEditDialog({ client, node, size, onClose, onSaved }: {
+export function NodeEditDialog({ client, node, size, suspends, onClose, onSaved }: {
   client: SandboxAdminClient;
   node: SandboxNode | null;
   /** Each sandbox's CPUs and memory, from the deployment. */
   size: SandboxResources | null;
+  /** Whether the deployment's Provider suspends sandboxes, which its suspension policy declares. */
+  suspends: boolean;
   onClose: () => void;
   onSaved: () => void;
 }) {
@@ -36,7 +38,6 @@ export function NodeEditDialog({ client, node, size, onClose, onSaved }: {
   const [retained, setRetained] = useState(String(node?.max_retained ?? 8));
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState<unknown>(null);
-  const suspends = node?.provider === "microsandbox";
   const whole = (value: string) => (/^\d+$/.test(value.trim()) ? Number(value.trim()) : null);
   const activeLimit = whole(active);
   const retainedLimit = suspends ? whole(retained) : Math.max(node?.max_retained ?? 0, activeLimit ?? 0);
diff --git a/apps/web/src/features/sandbox/NodeEnrollment.tsx b/apps/web/src/features/sandbox/NodeEnrollment.tsx
index 8bcc30e87..9a1ef808a 100644
--- a/apps/web/src/features/sandbox/NodeEnrollment.tsx
+++ b/apps/web/src/features/sandbox/NodeEnrollment.tsx
@@ -10,7 +10,7 @@ import { formatBytes } from "../../lib/format";
 import { useConsoleNavigation } from "../../lib/console-navigation";
 import { installationQuery } from "../../lib/installation";
 import { sandboxDiagnosticMessage } from "../../lib/sandbox-diagnostic";
-import { sandboxRequestError } from "../../lib/sandbox-labels";
+import { sandboxProviderLabel, sandboxRequestError } from "../../lib/sandbox-labels";
 import { checklistOpenFor, modelStep, nextStepAfterNode } from "../overview/getting-started";
 import { harnessesQuery } from "../system/harness-queries";
 import { nodeSourceUrl } from "./core-origin";
@@ -36,10 +36,11 @@ const DEFAULT_RETAINED = "8";
 /**
  * Add node: the administrator sets the node's sandbox limits, then Core issues a
  * one-time enrollment command that approves them
- * (`POST /core/v1/sandbox/enrollment-tokens`). Only microsandbox suspends
- * sandboxes, so only it asks for a retained limit; Docker retains exactly the
- * sandboxes it runs at once. The command downloads the installer from the
- * installation's public URL, never the browser's address, and runs it with
+ * (`POST /core/v1/sandbox/enrollment-tokens`). Only a deployment with a
+ * suspension policy, which its Provider's checkpoint support declares, asks for
+ * a retained limit; otherwise a node retains exactly the sandboxes it runs at
+ * once. The command downloads the installer from the installation's public
+ * URL, never the browser's address, and runs it with
  * sudo (or directly as root), which installs the node as a system service.
  * The log hint names that system service. No command is issued until the installation
  * is read: one whose public URL other machines can't use (loopback, as
@@ -91,8 +92,8 @@ export function NodeEnrollment({ client, consoleConfig, deployment, nodes, open,
   // The deployment's core_url is the same address, but the installation is read again on each opening, so a fix shows at once.
   const publicUrl = installation.data ? nodeSourceUrl(installation.data) : null;
   const available = consoleConfig.node_installer;
-  const provider = deployment.provider === "docker" || deployment.provider === "microsandbox" ? deployment.provider : null;
-  const backend = provider === "microsandbox" ? "microsandbox" : "Docker";
+  const provider = deployment.mode === "nodes" && deployment.provider ? deployment.provider : null;
+  const backend = sandboxProviderLabel(deployment.provider, locale);
   // Nodes and their sandboxes reach Core at its public URL, so a loopback one serves no other machine;
   // and without the provider's node files the installer would fail on the host. Either way no command
   // is issued, nor before the installation is read: a failed read (an older Core, say) proves nothing.
@@ -108,7 +109,7 @@ export function NodeEnrollment({ client, consoleConfig, deployment, nodes, open,
         ? { text: t("This console has no node files for {{provider}}. Install Core from the offline bundle, or add the release artifacts and rerun ./install.sh.", { provider: backend }) }
         : null;
   // Core takes whole numbers from 1 to a million, with the retained limit at least the active one.
-  const suspends = deployment.provider === "microsandbox";
+  const suspends = deployment.suspension !== null;
   const whole = (value: string) => (/^\d+$/.test(value.trim()) ? Number(value.trim()) : null);
   const inRange = (limit: number | null): limit is number => limit !== null && limit >= 1 && limit <= 1_000_000;
   const activeLimit = whole(active);
@@ -236,7 +237,7 @@ export function NodeEnrollment({ client, consoleConfig, deployment, nodes, open,
     size: size ? t("{{cpus}} CPU · {{memory}}", { cpus: size.cpus, memory: formatBytes(size.memory_mib * 2 ** 20) }) : "",
   };
   const requirements = provider ? <>
-    <HostRequirements provider={provider} sized={Boolean(size)} values={values} open={requirementsOpen} onToggle={setRequirementsOpen} />
+    <HostRequirements sized={Boolean(size)} values={values} open={requirementsOpen} onToggle={setRequirementsOpen} />
   </> : null;
   const limitsForm = `${id}-limits`;
   const footer = !available || (!enrollment && blocker) ? undefined
diff --git a/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx b/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
index 64c4d616a..6b071309a 100644
--- a/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
+++ b/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState, type ReactNode } from "react";
-import type { InitializeSandboxDeployment, UpdateSandboxDeployment, SandboxDeployment, StartSandboxReset } from "@oac/agents-client";
+import { deploymentContract, type InitializeSandboxDeployment, type UpdateSandboxDeployment, type SandboxDeployment, type StartSandboxReset } from "@oac/agents-client";
 import { useQueryClient } from "@tanstack/react-query";
 import { ArrowLeft } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -80,7 +80,7 @@ function DeploymentConfiguration() {
     return false;
   }
   async function initialize(input: InitializeSandboxDeployment) {
-    if (await changeDeployment((signal) => sandboxAdmin.initializeDeployment(input, { signal }), true) && input.provider !== "e2b" && !installation.data?.local_only) navigate("nodes", {}, "add-node");
+    if (await changeDeployment((signal) => sandboxAdmin.initializeDeployment(input, { signal }), true) && deploymentContract.providers[input.provider].mode === "nodes" && !installation.data?.local_only) navigate("nodes", {}, "add-node");
   }
   async function update(input: UpdateSandboxDeployment) {
     return changeDeployment((signal) => sandboxAdmin.updateDeployment({ ...input, expected_generation: snapshot!.deployment.generation }, { signal }), true, true);
@@ -94,7 +94,7 @@ function DeploymentConfiguration() {
 
   return <>
     <DeploymentHeader actions={<>
-      {snapshot?.deployment.provider && snapshot.deployment.provider !== "e2b" ? <button type="button" className="button outline" onClick={() => navigate("nodes")}>{tNavigation("nodes")}</button> : null}
+      {snapshot?.deployment.mode === "nodes" ? <button type="button" className="button outline" onClick={() => navigate("nodes")}>{tNavigation("nodes")}</button> : null}
       <RefreshButton onClick={refreshByUser} refreshing={loading} disabled={busy} label={t("Refresh sandbox state")} />
     </>} />
     <div className="console-page-body sandbox-content">
diff --git a/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx b/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
index 692432f6a..94e585299 100644
--- a/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
+++ b/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
@@ -43,7 +43,7 @@ export function SandboxDeploymentSettings({ deployment, disabled, fresh, onReset
       <h2 id="sandbox-provider-heading">{t("Deployment provider")}</h2>
       <HelpTip label={tNavigation("details")}>
         {t("One provider serves this deployment. Reset it before choosing a different backend.")}
-        {deployment.provider === "e2b" ? ` ${t("Core creates E2B sandboxes directly. No node enrollment is needed.")} ${t("Saved configuration does not confirm execution readiness. Session and Environment state report actual execution.")}` : ""}
+        {deployment.mode === "direct" ? ` ${t("Core creates E2B sandboxes directly. No node enrollment is needed.")} ${t("Saved configuration does not confirm execution readiness. Session and Environment state report actual execution.")}` : ""}
         <dl className="sandbox-summary">
       {spec?.runtime ? <div><dt>{t("Runtime")}</dt><dd><code title={spec.runtime.source_commit}>{spec.runtime.source_commit.slice(0, 12)}</code></dd></div> : null}
       {deployment.suspension ? <div><dt>{t("Idle suspension")}</dt><dd>{t("After {{idle}} · kept {{retention}}", { idle: formatPeriod(deployment.suspension.idle_seconds, i18n.resolvedLanguage), retention: formatPeriod(deployment.suspension.retention_seconds, i18n.resolvedLanguage) })}</dd></div> : null}
diff --git a/apps/web/src/features/sandbox/SandboxManagerView.tsx b/apps/web/src/features/sandbox/SandboxManagerView.tsx
index 00feda0eb..ace738101 100644
--- a/apps/web/src/features/sandbox/SandboxManagerView.tsx
+++ b/apps/web/src/features/sandbox/SandboxManagerView.tsx
@@ -111,7 +111,7 @@ function SandboxManager({ consoleConfig }: { consoleConfig: SandboxConsoleConfig
           const { deployment } = snapshot;
           setCleanup({ node: {
             name: target.name || target.id, installationId: deployment.installation_id, scriptDigest: consoleConfig.node_installer_sha256,
-            provider: deployment.provider, oldAddress: onOldAddress(target, deployment.core_url) ? target.core_url : null,
+            oldAddress: onOldAddress(target, deployment.core_url) ? target.core_url : null,
           }, open: true });
         }
       }
@@ -124,7 +124,9 @@ function SandboxManager({ consoleConfig }: { consoleConfig: SandboxConsoleConfig
   const nodesConfirmed = confirmed && compatible && !inventoryOlder && !query.isError && !snapshot?.nodesError;
   const nodes = snapshot?.nodes ?? [];
   const allocations = snapshot?.allocations ?? [];
-  const hostedNodes = Boolean(snapshot?.deployment.provider && snapshot.deployment.provider !== "e2b");
+  const hostedNodes = snapshot?.deployment.mode === "nodes";
+  // Nodes share the deployment's Provider, which declares whether sandboxes suspend.
+  const suspends = Boolean(snapshot?.deployment.suspension);
   // Getting started asks for Add node on arrival. A request the first settled read cannot
   // serve (no own-machines deployment, active reset, a failed read) is dropped, so the
   // dialog never opens later on its own.
@@ -198,6 +200,7 @@ function SandboxManager({ consoleConfig }: { consoleConfig: SandboxConsoleConfig
         client={client}
         node={editTarget}
         size={snapshot ? sandboxSize(snapshot.deployment) : null}
+        suspends={suspends}
         onClose={() => setEditTarget(null)}
         onSaved={() => {
           const saved = editTarget;
@@ -223,7 +226,7 @@ function SandboxManager({ consoleConfig }: { consoleConfig: SandboxConsoleConfig
     <NodesPageHeader headingRef={heading} count={hostedNodes && nodesConfirmed ? nodes.length : undefined} actions={actions} />
     <div className="console-page-body sandbox-content">
       {status}
-      {snapshot && !hostedNodes ? <EmptyState icon={Server} title={tSandboxNav(snapshot.deployment.provider === "e2b" ? "cloud" : "unconfigured")} action={<button className="button outline" type="button" onClick={() => navigate("system", { id: "sandbox" })}>{tSandboxNav("open")}</button>} /> : null}
+      {snapshot && !hostedNodes ? <EmptyState icon={Server} title={tSandboxNav(snapshot.deployment.mode === "direct" ? "cloud" : "unconfigured")} action={<button className="button outline" type="button" onClick={() => navigate("system", { id: "sandbox" })}>{tSandboxNav("open")}</button>} /> : null}
       {snapshot?.deployment.reset && hostedNodes ? <p role="status">{tSandboxNav("reset")}</p> : null}
       {snapshot?.deployment.provider ? <>
         {staleNodes.length ? <p className="sandbox-notice sandbox-address-warning" role="status">{staleNodes.length === 1
@@ -231,7 +234,7 @@ function SandboxManager({ consoleConfig }: { consoleConfig: SandboxConsoleConfig
           : t("{{count}} nodes are still bound to an old Core address: {{names}}. Remove them and add them again.", { count: staleNodes.length, names: new Intl.ListFormat(i18n.resolvedLanguage, { type: "conjunction" }).format(staleNodes) })}</p> : null}
         {hostedNodes ? <section aria-label={t("Sandbox nodes")}>
           {nodes.length
-            ? <NodeList nodes={nodes} allocations={allocations} coreUrl={snapshot.deployment.core_url} stale={!nodesConfirmed} disabled={busy || loading || removing || !nodesConfirmed} suspends={snapshot.deployment.provider === "microsandbox"} onOpen={(node) => navigate("nodes", { id: node.id })} onRemove={askRemove} />
+            ? <NodeList nodes={nodes} allocations={allocations} coreUrl={snapshot.deployment.core_url} stale={!nodesConfirmed} disabled={busy || loading || removing || !nodesConfirmed} suspends={suspends} onOpen={(node) => navigate("nodes", { id: node.id })} onRemove={askRemove} />
             : nodesConfirmed ? <EmptyState icon={Server} title={t("Add your first node")} hint={t("No nodes registered. Add a node to provide hosted capacity.")} /> : null}
         </section> : null}
       </> : null}
diff --git a/apps/web/src/features/sandbox/SandboxSetupWizard.tsx b/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
index 79a29f2d7..c05c26921 100644
--- a/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
+++ b/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
@@ -14,7 +14,7 @@ import { coreFieldError } from "../../lib/core-error";
 import { formatBytes } from "../../lib/format";
 import { installationQuery } from "../../lib/installation";
 import type { MessageKey } from "../../lib/locale-strings";
-import { sandboxConfigurationRejection } from "../../lib/sandbox-labels";
+import { sandboxConfigurationRejection, sandboxProviderLabel } from "../../lib/sandbox-labels";
 import { defaultSandboxResources, distributionRuntime, isRuntimeRelease, isRuntimeReleaseField, RUNTIME_RELEASE_FIELDS, savedSpecification, validSandboxResources } from "./deployment-specification";
 import { e2bKeyReady, e2bUpdateSelection } from "./sandbox-update";
 import { sandboxAdmin } from "./sandbox-queries";
@@ -66,11 +66,13 @@ export function validEndpoint(apiURL: string, domain: string): boolean {
 }
 
 /**
- * Per-sandbox presets around the deployment default: half and double of it.
- * Disks apply to microsandbox only, the one provider that enforces them.
+ * Per-sandbox presets around the Provider's declared default size: half and
+ * double of it, disks included where the default declares them. A Provider
+ * whose configuration selects the size declares none and has no presets.
  */
-function presets(provider: SandboxProvider): Record<Preset, SandboxResources> {
+function presets(provider: SandboxProvider): Record<Preset, SandboxResources> | null {
   const standard = defaultSandboxResources(provider);
+  if (!standard) return null;
   const scale = (factor: number): SandboxResources => ({
     cpus: Math.max(1, standard.cpus * factor),
     memory_mib: standard.memory_mib * factor,
@@ -92,15 +94,17 @@ function presetOf(provider: SandboxProvider, resources: SandboxResources): Prese
   const same = (a: SandboxResources, b: SandboxResources) => a.cpus === b.cpus && a.memory_mib === b.memory_mib
     && (a.root_disk_mib ?? 0) === (b.root_disk_mib ?? 0) && (a.environment_disk_mib ?? 0) === (b.environment_disk_mib ?? 0);
   const all = presets(provider);
-  return (Object.keys(all) as Preset[]).find((key) => same(all[key], resources)) ?? null;
+  return all ? (Object.keys(all) as Preset[]).find((key) => same(all[key], resources)) ?? null : null;
 }
 
 /**
  * Hosted sandbox setup as pages, one decision each: where sandboxes run,
  * which backend (own machines, microsandbox preselected) or the E2B account,
- * how big each sandbox is (own machines only: E2B sandboxes take the template
- * build's size), then a review. Advanced settings hold the complete form. The Runtime
- * release comes from this console's distribution manifest when it serves one.
+ * how big each sandbox is (only for a Provider that declares a default size:
+ * E2B sandboxes take the template build's size), then a review. The Provider's
+ * declarations decide the size, disk and Runtime inputs. Advanced settings
+ * hold the complete form. The Runtime release comes from this console's
+ * distribution manifest when it serves one.
  * `current` pre-selects the saved choices when a deployment changes. Keeping
  * the backend keeps its saved size and Runtime; another backend starts from its
  * defaults and this console's Runtime. E2B updates can retain the saved key.
@@ -121,11 +125,15 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
   const { t, i18n } = useTranslation("sandbox");
   const { t: tCommon } = useTranslation("common");
   const id = useId();
-  const [step, setStep] = useState<Step>(editing ? current?.provider === "e2b" ? "e2b" : "size" : "where");
-  const [where, setWhere] = useState<Where | null>(current ? (current.provider === "e2b" ? "direct" : "nodes") : null);
+  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const currentMode: Where | null = current ? deploymentContract.providers[current.provider].mode : null;
+  const [step, setStep] = useState<Step>(editing ? currentMode === "direct" ? "e2b" : "size" : "where");
+  const [where, setWhere] = useState<Where | null>(currentMode);
   const [provider, setProvider] = useState<SandboxProvider | null>(current?.provider ?? null);
+  const policy = provider ? deploymentContract.providers[provider] : null;
   const saved = provider && current ? savedSpecification(provider, current.provider, current.specification) : null;
-  const [resources, setResources] = useState<SandboxResources>(current?.specification?.resources ?? defaultSandboxResources("docker"));
+  // Choosing a Provider that declares a default size replaces this placeholder.
+  const [resources, setResources] = useState<SandboxResources>(current?.specification?.resources ?? { cpus: 0, memory_mib: 0 });
   const [size, setSize] = useState<Size>(current?.specification ? presetOf(current.provider, current.specification.resources) ?? "current" : "standard");
   const [apiKey, setApiKey] = useState("");
   const [replacementRequested, setReplacementRequested] = useState(false);
@@ -190,14 +198,14 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
   const matched = useQuery({ queryKey: ["sandbox-runtime-release"], queryFn: ({ signal }) => distributionRuntime(signal).catch(() => null), staleTime: Infinity, retry: false });
   const release: Partial<SandboxRuntimeRelease> = Object.keys(runtime).length ? runtime : saved?.runtime ?? matched.data ?? {};
 
-  const needsRuntime = provider === "docker" || provider === "microsandbox";
+  const needsRuntime = policy?.runtime ?? false;
   const runtimeReady = !needsRuntime || isRuntimeRelease(release);
   // Initial setup requires a key; an update may retain the committed key.
   const keyReady = e2bKeyReady(Boolean(editing), replacementRequested, apiKey);
   const connectionChanged = Boolean(editing && (apiURL.trim() !== (current?.e2bAPIURL || E2B_PRESETS.official.apiURL) || domain.trim() !== (current?.e2bDomain || E2B_PRESETS.official.domain)));
   const e2bReady = provider !== "e2b" || (keyReady && validTemplate(template.trim()) && validEndpoint(apiURL.trim(), domain.trim()) && (!editing || !connectionChanged || apiKey.trim().length > 0));
-  // Core sizes E2B sandboxes from the template build, so E2B sends no resources.
-  const sized = provider !== null && provider !== "e2b";
+  // A Provider without a declared default size takes it from its configuration, so the selection sends no resources.
+  const sized = Boolean(policy?.default_resources);
   const sizeReady = provider !== null && (!sized || validSandboxResources(provider, resources));
   const ready = provider !== null && runtimeReady && e2bReady && sizeReady && !disabled && !busy;
 
@@ -205,12 +213,13 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
   const index = Math.max(0, order.indexOf(step === "advanced" ? "review" : step));
   const back = () => setStep(step === "advanced" ? "review" : order[Math.max(0, index - 1)]!);
 
-  // The saved backend keeps its size and Runtime; another starts from its standard size and this console's Runtime.
+  // The saved backend keeps its size and Runtime; another starts from its declared default size and this console's Runtime.
   function choose(next: SandboxProvider) {
     if (next !== provider) {
       setRejection(null);
       const kept = current ? savedSpecification(next, current.provider, current.specification) : null;
-      setResources(kept?.resources ?? presets(next).standard);
+      const proposed = kept?.resources ?? defaultSandboxResources(next);
+      if (proposed) setResources(proposed);
       setSize(kept ? presetOf(next, kept.resources) ?? "current" : "standard");
       setRuntime({});
     }
@@ -238,7 +247,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
       else await onSubmit({ ...selection, ...(provider === "e2b" ? { credential: { api_key: apiKey.trim() }, configuration: { template: template.trim(), api_url: apiURL.trim(), domain: domain.trim() } } : {}) });
     } catch (error) {
       // A configuration Core rejected is explained here; the page reports every other failure.
-      const reason = sandboxConfigurationRejection(error, i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en");
+      const reason = sandboxConfigurationRejection(error, locale);
       if (reason === null) throw error;
       setRejection(reason);
       setFieldRejection(error);
@@ -263,7 +272,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
       <Question title={t("Where should sandboxes run?")} help={t("E2B runs sandboxes in its cloud: no machines to manage, billed by E2B. Own machines run them on hosts you add, with microsandbox (recommended) or Docker.")}>
         <div className="wizard-choices">
           <Choice icon={Cloud} title={t("E2B cloud")} selected={where === "direct"} onClick={() => { setWhere("direct"); choose("e2b"); setStep("e2b"); }} />
-          <Choice icon={Server} title={t("Own machines")} selected={where === "nodes"} onClick={() => { setWhere("nodes"); setApiKey(""); if (provider === null || provider === "e2b") choose("microsandbox"); setStep("backend"); }} />
+          <Choice icon={Server} title={t("Own machines")} selected={where === "nodes"} onClick={() => { setWhere("nodes"); setApiKey(""); if (policy?.mode !== "nodes") choose("microsandbox"); setStep("backend"); }} />
         </div>
       </Question>
     );
@@ -333,15 +342,15 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
       </Question>
     );
   } else if (step === "size") {
-    const options = presets(provider ?? "docker");
+    const options = provider ? presets(provider) : null;
     // A saved size outside the presets stays on offer as the current one.
     const kept = saved && provider && presetOf(provider, saved.resources) === null ? saved.resources : null;
-    const disks = (value: SandboxResources) => (provider === "microsandbox" ? diskLabel(value) : undefined);
+    const disks = (value: SandboxResources) => (policy?.disk ? diskLabel(value) : undefined);
     page = (
       <Question title={t("How big is each sandbox?")} help={t("These limits apply to the selected configuration generation. Existing sandboxes keep their limits. Concurrency is set per node.")}>
         <div className={kept ? "wizard-choices wizard-choices-4" : "wizard-choices wizard-choices-3"}>
           {kept ? <Choice title={t("Current")} value={sizeLabel(kept)} detail={disks(kept)} selected={size === "current"} onClick={() => { setSize("current"); setResources(kept); setStep("review"); }} /> : null}
-          {(Object.keys(options) as Preset[]).map((key) => (
+          {options && (Object.keys(options) as Preset[]).map((key) => (
             <Choice
               key={key}
               title={t(key === "small" ? "Small" : key === "standard" ? "Standard" : "Large")}
@@ -362,8 +371,8 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
     page = (
       <Question title={t("Review and save")}>
         <dl className="wizard-review">
-          <div><dt>{t("Sandboxes run on")}</dt><dd>{where === "direct" ? t("E2B cloud") : `${t("Own machines")} · ${provider === "docker" ? "Docker" : "microsandbox"}`}</dd></div>
-          <div><dt>{t("Each sandbox")}</dt><dd>{sized ? sizeLabel(resources) : t("From the template build")}{provider === "microsandbox" ? <span className="wizard-review-sub">{diskLabel(resources)}</span> : null}</dd></div>
+          <div><dt>{t("Sandboxes run on")}</dt><dd>{where === "direct" ? t("E2B cloud") : `${t("Own machines")} · ${sandboxProviderLabel(provider ?? "", locale)}`}</dd></div>
+          <div><dt>{t("Each sandbox")}</dt><dd>{sized ? sizeLabel(resources) : t("From the template build")}{policy?.disk ? <span className="wizard-review-sub">{diskLabel(resources)}</span> : null}</dd></div>
           {provider === "e2b" ? <div><dt>{t("Template build")}</dt><dd><code>{template || "—"}</code></dd></div> : null}
           {provider === "e2b" ? <div><dt>{t("Sandbox API URL")}</dt><dd><code>{apiURL || "https://api.e2b.app"}</code></dd></div> : null}
           {provider === "e2b" ? <div><dt>{t("Sandbox data-plane domain")}</dt><dd><code>{domain || "e2b.app"}</code></dd></div> : null}
@@ -418,7 +427,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
             <div className="wizard-grid">
               <NumberField error={fieldError("resources.cpus")} id={`${id}-cpus`} label={t("CPUs")} value={resources.cpus} onChange={(cpus) => { setSize("custom"); setResources({ ...resources, cpus }); setFieldRejection(null); }} />
               <NumberField error={fieldError("resources.memory_mib")} id={`${id}-memory`} label={t("Memory (MiB)")} value={resources.memory_mib} onChange={(memory_mib) => { setSize("custom"); setResources({ ...resources, memory_mib }); setFieldRejection(null); }} />
-              {provider === "microsandbox" ? <>
+              {policy?.disk ? <>
                 <NumberField error={fieldError("resources.root_disk_mib")} id={`${id}-root`} label={t("Root disk (MiB)")} value={resources.root_disk_mib ?? 0} onChange={(root_disk_mib) => { setResources({ ...resources, root_disk_mib }); setFieldRejection(null); }} />
                 <NumberField error={fieldError("resources.environment_disk_mib")} id={`${id}-data`} label={t("Data disk at /environment (MiB)")} value={resources.environment_disk_mib ?? 0} onChange={(environment_disk_mib) => { setResources({ ...resources, environment_disk_mib }); setFieldRejection(null); }} />
               </> : null}
diff --git a/apps/web/src/features/sandbox/console-config.ts b/apps/web/src/features/sandbox/console-config.ts
index cf9188f5f..eb36c2d8e 100644
--- a/apps/web/src/features/sandbox/console-config.ts
+++ b/apps/web/src/features/sandbox/console-config.ts
@@ -1,11 +1,8 @@
-/** A provider whose nodes install from files this console serves. */
-export type NodeArtifactProvider = "docker" | "microsandbox";
-
 export interface SandboxConsoleConfig {
   node_installer: boolean;
   node_installer_sha256: string;
   /** The providers whose node files this console serves; a null or malformed value reads as none. */
-  node_artifacts: NodeArtifactProvider[];
+  node_artifacts: string[];
 }
 
 const SHA256 = /^[a-f0-9]{64}$/;
@@ -27,8 +24,8 @@ export async function sandboxConsoleConfig(signal: AbortSignal): Promise<Sandbox
 }
 
 /** A reported list keeps the providers it names; null or any other value means none. */
-function nodeArtifacts(value: unknown): NodeArtifactProvider[] {
-  return Array.isArray(value) ? value.filter((entry): entry is NodeArtifactProvider => entry === "docker" || entry === "microsandbox") : [];
+function nodeArtifacts(value: unknown): string[] {
+  return Array.isArray(value) ? value.filter((entry): entry is string => typeof entry === "string") : [];
 }
 
 /** Whether a node of this provider can install from the console's files. */
diff --git a/apps/web/src/features/sandbox/deployment-specification.test.ts b/apps/web/src/features/sandbox/deployment-specification.test.ts
index eac961bff..89f333bc8 100644
--- a/apps/web/src/features/sandbox/deployment-specification.test.ts
+++ b/apps/web/src/features/sandbox/deployment-specification.test.ts
@@ -1,7 +1,6 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { defaultSandboxResources, distributionRuntime, isRuntimeReleaseField, sandboxesThatFit, savedSpecification, validSandboxResources } from "./deployment-specification";
-import standardSizes from "./standard-sizes.json";
-import type { SandboxSpecification } from "@oac/agents-client";
+import { deploymentContract, type SandboxProvider, type SandboxSpecification } from "@oac/agents-client";
 
 const manifest = { platform: "linux/amd64", source_commit: "0".repeat(40), images: { runtime: `sha256:${"a".repeat(64)}` },
   image_manifest_digests: { runtime: `sha256:${"b".repeat(64)}` }, runtime_ref: `oac-runtime@sha256:${"b".repeat(64)}`,
@@ -27,20 +26,18 @@ describe("deployment resources and Runtime", () => {
     expect(savedSpecification("e2b", "docker", current)).toBeNull();
     expect(savedSpecification("e2b", "e2b", { resources: current.resources })).toEqual({ resources: current.resources });
   });
-  it("keeps the installer's Standard sizes structure", () => {
-    expect(Object.keys(standardSizes).sort()).toEqual(["docker", "microsandbox"]);
-    expect(Object.keys(standardSizes.docker).sort()).toEqual(["cpus", "memory_mib"]);
-    expect(Object.keys(standardSizes.microsandbox).sort()).toEqual(["cpus", "environment_disk_mib", "memory_mib", "root_disk_mib"]);
-    for (const provider of ["docker", "microsandbox"] as const) {
-      for (const value of Object.values(standardSizes[provider])) expect(Number.isInteger(value) && value > 0).toBe(true);
+  it("proposes a copy of each declared default size, which the declared bounds accept", () => {
+    for (const provider of Object.keys(deploymentContract.providers) as SandboxProvider[]) {
+      const declared = deploymentContract.providers[provider].default_resources;
       const resources = defaultSandboxResources(provider);
-      expect(resources).toEqual(standardSizes[provider]);
-      expect(resources).not.toBe(standardSizes[provider]);
-      expect(validSandboxResources(provider, resources)).toBe(true);
+      expect(resources).toEqual(declared);
+      if (resources) {
+        expect(resources).not.toBe(declared);
+        expect(validSandboxResources(provider, resources)).toBe(true);
+      }
     }
   });
   it("respects CPU, memory and supported disk bounds", () => {
-    for (const provider of ["docker", "microsandbox", "e2b"] as const) expect(validSandboxResources(provider, defaultSandboxResources(provider))).toBe(true);
     expect(validSandboxResources("docker", { cpus: 0, memory_mib: 2048 })).toBe(false);
     expect(validSandboxResources("e2b", { cpus: 256, memory_mib: 2048 })).toBe(false);
     expect(validSandboxResources("docker", { cpus: 2, memory_mib: 511 })).toBe(false);
diff --git a/apps/web/src/features/sandbox/deployment-specification.ts b/apps/web/src/features/sandbox/deployment-specification.ts
index 8859539f3..af0d3393c 100644
--- a/apps/web/src/features/sandbox/deployment-specification.ts
+++ b/apps/web/src/features/sandbox/deployment-specification.ts
@@ -1,5 +1,4 @@
 import { deploymentContract, type SandboxDeployment, type SandboxE2BTemplateBuild, type SandboxProvider, type SandboxResources, type SandboxRuntimeRelease, type SandboxSpecification } from "@oac/agents-client";
-import standardSizes from "./standard-sizes.json";
 
 interface Manifest {
   platform?: string;
@@ -10,14 +9,16 @@ interface Manifest {
   microsandbox?: { runtime_sha256?: string; firmware_sha256?: string };
 }
 
-export function defaultSandboxResources(provider: SandboxProvider): SandboxResources {
-  return { ...(provider === "microsandbox" ? standardSizes.microsandbox : standardSizes.docker) };
+/** The size the Provider declares for setup to propose; null when its configuration selects the size. */
+export function defaultSandboxResources(provider: SandboxProvider): SandboxResources | null {
+  const size: SandboxResources | null = deploymentContract.providers[provider].default_resources;
+  return size && { ...size };
 }
 
-/** Core's resource rule: optional disk fields stay zero unless the provider supports disk limits. */
+/** Core's resource rule: optional disk fields stay zero unless the Provider declares disk limits. */
 export function validSandboxResources(provider: SandboxProvider, resources: SandboxResources): boolean {
   return deploymentContract.resources.every((rule) => {
-    const [min, max] = !rule.omit_zero ? [rule.min, rule.max] : provider === "microsandbox" ? [deploymentContract.minimum_disk, rule.max] : [0, 0];
+    const [min, max] = !rule.omit_zero ? [rule.min, rule.max] : deploymentContract.providers[provider].disk ? [deploymentContract.minimum_disk, rule.max] : [0, 0];
     const value = resources[rule.name] ?? 0;
     return Number.isInteger(value) && value >= min && value <= max;
   });
diff --git a/apps/web/src/features/sandbox/enrollment-command.ts b/apps/web/src/features/sandbox/enrollment-command.ts
index 2663c1792..a81e7046b 100644
--- a/apps/web/src/features/sandbox/enrollment-command.ts
+++ b/apps/web/src/features/sandbox/enrollment-command.ts
@@ -1,3 +1,5 @@
+import type { SandboxProvider } from "@oac/agents-client";
+
 const quote = (value: string) => `'${value.replaceAll("'", "'\\''")}'`;
 
 /**
@@ -43,7 +45,7 @@ const runInstaller = `$s \${s:+--preserve-env=http_proxy,https_proxy,no_proxy,HT
  * environment or sudo's command line.
  */
 export function nodeInstallCommand({ token, coreUrl, sourceUrl, provider, installationId, scriptDigest }: {
-  token: string; coreUrl: string; sourceUrl: string; provider: "docker" | "microsandbox"; installationId: string; scriptDigest: string;
+  token: string; coreUrl: string; sourceUrl: string; provider: SandboxProvider; installationId: string; scriptDigest: string;
 }): string {
   return `${nodeInstaller(sourceUrl, scriptDigest)}printf '%s\\n' ${quote(token)} | ${runInstaller} --enrollment-token-stdin --source-url ${quote(sourceUrl)} --core-url ${quote(coreUrl)} --provider ${quote(provider)} --installation-id ${quote(installationId)})`;
 }
diff --git a/apps/web/src/features/sandbox/node-commands.tsx b/apps/web/src/features/sandbox/node-commands.tsx
index 8d0763c64..9841556ae 100644
--- a/apps/web/src/features/sandbox/node-commands.tsx
+++ b/apps/web/src/features/sandbox/node-commands.tsx
@@ -67,8 +67,7 @@ function PrerequisiteList({ items, values }: { items: HostPrerequisite[]; values
 }
 
 /** What the host needs for the default command, which installs the node as a system service. */
-export function HostRequirements({ provider, sized, values, open, onToggle }: {
-  provider: "docker" | "microsandbox";
+export function HostRequirements({ sized, values, open, onToggle }: {
   sized: boolean;
   values: RequirementValues;
   open: boolean;
@@ -77,10 +76,9 @@ export function HostRequirements({ provider, sized, values, open, onToggle }: {
   const { t } = useTranslation("sandbox");
   return <details className="sandbox-host-requirements" open={open} onToggle={(event) => onToggle(event.currentTarget.open)}>
     <summary>{t("Host requirements")}</summary>
-    <PrerequisiteList items={hostRequirements(provider, sized)} values={values} />
+    <PrerequisiteList items={hostRequirements(sized)} values={values} />
     <div className="sandbox-host-requirements-note">
       <p>{t("The command creates the oac-node service user and a system service. It installs no software; if something is missing it stops and says what to install.")}</p>
-      {provider === "docker" ? <p>{t("oac-node joins the docker group, which is equivalent to root on this host.")}</p> : null}
     </div>
   </details>;
 }
diff --git a/apps/web/src/features/sandbox/node-enrollment.ts b/apps/web/src/features/sandbox/node-enrollment.ts
index 7e2f6678a..33b2e3ff5 100644
--- a/apps/web/src/features/sandbox/node-enrollment.ts
+++ b/apps/web/src/features/sandbox/node-enrollment.ts
@@ -23,14 +23,9 @@ export interface HostPrerequisite {
  *   systemd as the init system, and SELinux not enforcing; `other_node` refuses a
  *   host that already runs a sudo-mode node for another installation, since
  *   sudo-mode nodes share the oac-node account;
- * - Docker: `provider_group` needs rootful Docker Engine running, its socket
- *   group-accessible (0660) and, through `device_group`, owned by the docker
- *   group, which the service user joins; and CPU and memory limits enforced (the
- *   node is ready only then: services/core/internal/sandbox/providers/probe.go).
- *   It installs nothing;
- * - microsandbox: `provider_group` needs /dev/kvm, readable and writable by all or
- *   group-accessible in the kvm group, and `prepare_runtime` the libraries its
- *   binaries link (the ldd check);
+ * - the sandbox backend: `provider_group`, `device_group` and `prepare_runtime`
+ *   check what the deployment's Provider needs on the host, name what is missing
+ *   and install nothing;
  * - `host_capacity`: the host's CPUs and memory hold one sandbox of the
  *   deployment's size (else the node reports capacity_insufficient); the Runtime
  *   image needs about 2 GB of disk;
@@ -40,14 +35,12 @@ export interface HostPrerequisite {
  *   (`provider_config`).
  * `sized` says whether the deployment's sandbox size is known for the capacity item.
  */
-export function hostRequirements(provider: "docker" | "microsandbox", sized: boolean): HostPrerequisite[] {
+export function hostRequirements(sized: boolean): HostPrerequisite[] {
   return [
     { label: "Linux amd64 with systemd; Python 3.9+, curl, sha256sum and flock; root or sudo" },
     { label: "SELinux is not enforcing" },
     { label: "In sudo mode, one Core per host: a host already running a sudo-mode node for another Core is refused." },
-    provider === "docker"
-      ? { label: "Rootful Docker Engine running, its socket owned by the docker group with mode 0660, enforcing CPU and memory limits (cgroup v2)" }
-      : { label: "/dev/kvm in the kvm group (hardware or nested virtualization) and the libraries microsandbox links (glibc)" },
+    { label: "What the sandbox backend needs on the host; the installer checks it and names anything missing" },
     { label: sized ? "CPUs and memory for at least one sandbox: {{size}}; about 2 GB of disk for the Runtime image" : "CPUs and memory for at least one sandbox; about 2 GB of disk for the Runtime image" },
     { label: "Reaches {{core}}, as do its sandboxes" },
   ];
diff --git a/apps/web/src/features/sandbox/sandbox-page-ownership.test.tsx b/apps/web/src/features/sandbox/sandbox-page-ownership.test.tsx
index db2fc3937..4931b8c91 100644
--- a/apps/web/src/features/sandbox/sandbox-page-ownership.test.tsx
+++ b/apps/web/src/features/sandbox/sandbox-page-ownership.test.tsx
@@ -18,7 +18,7 @@ function cache(provider: SandboxDeployment["provider"]) {
   const client = new QueryClient({ defaultOptions: { queries: { enabled: false, retry: false, gcTime: Infinity } } });
   const deployment: SandboxDeployment = { credential_configured: false, configuration: {}, metadata: {},
     installation_id: "install", owner_epoch: 1, generation: 2, provider, core_url: "https://core.example",
-    mode: provider === "e2b" ? "direct" : "nodes", reset: null, resources: { allocations: 0, pending: 0 }, suspension: null,
+    mode: provider === "" ? "" : provider === "e2b" ? "direct" : "nodes", reset: null, resources: { allocations: 0, pending: 0 }, suspension: null,
     rollout: { state: "settled", previous_generation_sandboxes: 0, nodes: null },
   };
   const config: SandboxConsoleConfig = { node_installer: false, node_installer_sha256: "", node_artifacts: [] };
diff --git a/apps/web/src/features/sandbox/sandbox-queries.test.ts b/apps/web/src/features/sandbox/sandbox-queries.test.ts
index 3c14e9dc9..643c2fab4 100644
--- a/apps/web/src/features/sandbox/sandbox-queries.test.ts
+++ b/apps/web/src/features/sandbox/sandbox-queries.test.ts
@@ -83,7 +83,7 @@ describe("sandbox reset reads", () => {
     const nodes = vi.spyOn(sandboxAdmin, "listNodes");
     const client = cache();
     for (const generation of [0, 3]) {
-      read.mockResolvedValueOnce(deployment({ provider: "", reset: null, generation }));
+      read.mockResolvedValueOnce(deployment({ provider: "", mode: "", reset: null, generation }));
       expect((await client.fetchQuery(sandboxSnapshotQuery)).deployment.generation).toBe(generation);
     }
     expect(nodes).not.toHaveBeenCalled();
diff --git a/apps/web/src/features/sandbox/sandbox-queries.ts b/apps/web/src/features/sandbox/sandbox-queries.ts
index 00266196a..81029f64e 100644
--- a/apps/web/src/features/sandbox/sandbox-queries.ts
+++ b/apps/web/src/features/sandbox/sandbox-queries.ts
@@ -73,7 +73,7 @@ export const sandboxSnapshotQuery = queryOptions<SandboxSnapshot>({
     signal.throwIfAborted();
     let nodes: SandboxNode[] = [];
     try {
-      if (deployment.provider && deployment.provider !== "e2b") nodes = (await sandboxAdmin.listNodes({ signal })).data;
+      if (deployment.mode === "nodes") nodes = (await sandboxAdmin.listNodes({ signal })).data;
       const allocations = await Promise.all(nodes.map((node) => sandboxAdmin.listAllocations(node.id, { signal })));
       signal.throwIfAborted();
       return { deployment, nodes, allocations: allocations.flatMap((page) => page.data), nodesError: null, readAt };
diff --git a/apps/web/src/features/sandbox/standard-sizes.json b/apps/web/src/features/sandbox/standard-sizes.json
deleted file mode 100644
index 4461dbf50..000000000
--- a/apps/web/src/features/sandbox/standard-sizes.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "docker": {
-    "cpus": 2,
-    "memory_mib": 2048
-  },
-  "microsandbox": {
-    "cpus": 2,
-    "memory_mib": 4096,
-    "root_disk_mib": 8192,
-    "environment_disk_mib": 8192
-  }
-}
diff --git a/apps/web/src/features/sandbox/standard-sizes.md b/apps/web/src/features/sandbox/standard-sizes.md
deleted file mode 100644
index 8c39ef49b..000000000
--- a/apps/web/src/features/sandbox/standard-sizes.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Standard sandbox sizes
-
-`standard-sizes.json` is the single source of truth for the default Standard size of each sandbox on a self-hosted backend. The console setup wizard offers it as Standard and derives Small (half) and Large (double) from it.
-
-## Structure and units
-
-```json
-{
-  "docker": { "cpus": 2, "memory_mib": 2048 },
-  "microsandbox": { "cpus": 2, "memory_mib": 4096, "root_disk_mib": 8192, "environment_disk_mib": 8192 }
-}
-```
-
-- `cpus`: whole CPUs, a positive integer.
-- `memory_mib`, `root_disk_mib`, `environment_disk_mib`: MiB, positive integers.
-- `docker` has exactly `cpus` and `memory_mib`; it has no disk fields.
-- `microsandbox` has exactly all four fields.
-
-The values must stay within the bounds that Core and `validSandboxResources` accept.
-
-## Readers
-
-The Web setup wizard is the only reader, through `defaultSandboxResources` in `deployment-specification.ts`. `deployment-specification.test.ts` pins the structure so that an accidental change fails.
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index e6080a26d..fd23a23c3 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -147,13 +147,11 @@ export const chinese = {
   "SELinux is not enforcing": "SELinux 不是 enforcing 模式",
   "In sudo mode, one Core per host: a host already running a sudo-mode node for another Core is refused.": "sudo 模式下，每台主机只能接入一个 Core：已为其他 Core 运行 sudo 模式节点的主机会被拒绝。",
   "If the command is interrupted or the download stalls, run it again: unfinished downloads restart, and verified files are reused.": "如果命令被中断或下载卡住，重新运行即可：未完成的下载会从头开始，已校验的完整文件会复用。",
-  "Rootful Docker Engine running, its socket owned by the docker group with mode 0660, enforcing CPU and memory limits (cgroup v2)": "Docker Engine 以 rootful 模式运行，套接字属于 docker 组、权限 0660，且能限制 CPU 和内存（cgroup v2）",
-  "/dev/kvm in the kvm group (hardware or nested virtualization) and the libraries microsandbox links (glibc)": "属于 kvm 组的 /dev/kvm（硬件或嵌套虚拟化），以及 microsandbox 链接的库（glibc）",
+  "What the sandbox backend needs on the host; the installer checks it and names anything missing": "沙箱后端在主机上所需的条件；安装程序会检查并指出缺少的项",
   "Copy command with --force": "复制命令（--force）",
   "Checking this installation's public URL…": "正在检查这个安装的公网地址…",
   "The installation couldn't be read, so no command can be issued.": "无法读取安装信息，暂时不能生成命令。",
   "It never deletes sandboxes, volumes or images.": "它不会删除任何沙箱、卷或镜像。",
-  "It keeps microsandbox's image store and sandbox data, and prints how to remove them by hand.": "它会保留 microsandbox 的镜像存储和沙箱数据，并打印手动删除的方法。",
   "Old Core address gone?": "旧 Core 地址已失效？",
   "{{name}} still points at the old Core address {{address}}.": "{{name}} 仍指向旧的 Core 地址 {{address}}。",
   "If this node's old Core address no longer responds, first remove it on the Nodes page, then add --force to the uninstall command.": "如果这个节点的旧 Core 地址已无法访问，请先在“节点”页移除它，再在卸载命令后加上 --force。",
@@ -162,7 +160,6 @@ export const chinese = {
   "CPUs and memory for at least one sandbox; about 2 GB of disk for the Runtime image": "CPU 和内存至少够一个沙箱；Runtime 镜像约需 2 GB 磁盘",
   "Reaches {{core}}, as do its sandboxes": "能访问 {{core}}，它的沙箱也要能访问",
   "The command creates the oac-node service user and a system service. It installs no software; if something is missing it stops and says what to install.": "命令会创建 oac-node 服务用户和一个系统服务。它不安装任何软件；缺少什么时会停下并说明要装什么。",
-  "oac-node joins the docker group, which is equivalent to root on this host.": "oac-node 会加入 docker 组，这在这台主机上等同于 root 权限。",
   "Set a public address other machines can reach before adding nodes.": "添加节点前，请先设置其他机器能访问的公开地址。",
   "Clean up the host": "清理主机",
   "{{name}} is removed from Core. To remove its service and files from the host, run:": "{{name}} 已从 Core 移除。要删除它在主机上的服务和文件，请运行：",
diff --git a/contracts/agents-api/sandbox-deployment.md b/contracts/agents-api/sandbox-deployment.md
index ba0db8e65..bd1ff3424 100644
--- a/contracts/agents-api/sandbox-deployment.md
+++ b/contracts/agents-api/sandbox-deployment.md
@@ -224,6 +224,6 @@ Storage and credential failures stay errors: an empty or failed read never prove
 
 ## Canonical node specification
 
-`sandbox/deployment_contract.go` owns the resource bounds, provider requirements, release patterns and canonical field order; `sandbox/deployment.go` applies them in Core. The installer consumes the generated declaration in `deploy/node/node_spec.py`, and the TypeScript client and Web the generated bounds and patterns in `packages/agents-client/src/deployment-contract.ts`, so there is no second set of limits or patterns. Regenerate both from the repository root with `go run ./services/core/cmd/specification-contract -write`; the sandbox Go tests, part of `make check`, reject a stale projection.
+`sandbox/deployment_contract.go` owns the resource bounds, release patterns and canonical field order, and each registered Provider's `sandbox.DeploymentPolicy` declares its requirements; `sandbox/deployment.go` applies them in Core. The installer consumes the generated declaration in `deploy/node/node_spec.py`, and the TypeScript client and Web the generated bounds, patterns and Provider declarations in `packages/agents-client/src/deployment-contract.ts`, so there is no second set of limits, patterns or providers. Regenerate both from the repository root with `go run ./services/core/cmd/specification-contract -write`; the sandbox Go tests, part of `make check`, reject a stale projection.
 
 The specification digest is the SHA-256 of compact UTF-8 JSON with `provider` first, then `resources`, then `runtime` when the provider requires it. Resource and Runtime fields follow the contract's declaration order; zero optional disk fields are omitted and required fields stay present. Release identities are lowercase ASCII, and the digest never depends on the incoming field order or whitespace. `services/core/internal/sandbox/testdata/deployment-contract.json` holds shared acceptance cases, exact canonical bytes and digests that both the Go and Python tests consume.
diff --git a/contracts/agents-api/zh/sandbox-deployment.md b/contracts/agents-api/zh/sandbox-deployment.md
index ae1d9a97b..3bc42898a 100644
--- a/contracts/agents-api/zh/sandbox-deployment.md
+++ b/contracts/agents-api/zh/sandbox-deployment.md
@@ -1,7 +1,7 @@
 ---
 title: "沙箱部署"
 source: contracts/agents-api/sandbox-deployment.md
-source_hash: 7a1bc927bb14e9599e800833f10a5fd123621e3f95bfcbdffa75e7a63654ffe3
+source_hash: 68aabafdb8983280a3bb29e7398042f9e843310d1784acd4a9a94e9647fd3919
 ---
 
 沙箱部署为 Core 管理的 `openai_hosted` 执行选择 Sandbox Provider、每个沙箱的资源以及不可变的 Runtime 发行版。PostgreSQL 为每个安装维护一个当前有效选择；Web 和 Core API 写入同一配置。节点文件保存其已安装副本和特定于主机的路径，且不能覆盖其资源或 Runtime。该选择独立于 Harness；部署可以保持未配置状态，既无节点，也不接受托管准入。
@@ -226,6 +226,6 @@ POST 会在持久保存候选配置之前对其进行验证，并且不会创建
 
 ## 规范的节点规格 {#canonical-node-specification}
 
-`sandbox/deployment_contract.go`负责资源边界、提供商要求、发行版模式和规范字段顺序；`sandbox/deployment.go`在 Core 中应用这些规则。安装程序会使用 `deploy/node/node_spec.py` 中生成的声明，TypeScript 客户端和 Web 使用 `packages/agents-client/src/deployment-contract.ts` 中生成的边界和模式，因此不存在第二套限制或模式。请在仓库根目录运行 `go run ./services/core/cmd/specification-contract -write` 重新生成两者；作为 `make check` 一部分的沙箱 Go 测试会拒绝过时的投影。
+`sandbox/deployment_contract.go`负责资源边界、发行版模式和规范字段顺序，每个已注册 Provider 的 `sandbox.DeploymentPolicy` 声明其要求；`sandbox/deployment.go`在 Core 中应用这些规则。安装程序会使用 `deploy/node/node_spec.py` 中生成的声明，TypeScript 客户端和 Web 使用 `packages/agents-client/src/deployment-contract.ts` 中生成的边界、模式和 Provider 声明，因此不存在第二套限制、模式或提供商列表。请在仓库根目录运行 `go run ./services/core/cmd/specification-contract -write` 重新生成两者；作为 `make check` 一部分的沙箱 Go 测试会拒绝过时的投影。
 
 规范摘要是紧凑 UTF-8 JSON 的 SHA-256，其中 `provider` 位于首位，其次是 `resources`，然后在提供商需要时放置 `runtime`。资源和 Runtime 字段遵循契约的声明顺序；值为零的可选磁盘字段会被省略，必填字段则保持存在。发行版标识采用小写 ASCII，摘要绝不会受传入字段顺序或空白字符影响。`services/core/internal/sandbox/testdata/deployment-contract.json`保存共享验收用例、精确的规范字节和摘要，Go 与 Python 测试都会使用这些内容。
diff --git a/deploy/node/node_spec.py b/deploy/node/node_spec.py
index a74b79cfe..9d59d41cb 100644
--- a/deploy/node/node_spec.py
+++ b/deploy/node/node_spec.py
@@ -27,7 +27,7 @@ def release(manifest):
 
 # BEGIN GENERATED DEPLOYMENT CONTRACT
 # Generated from sandbox/deployment_contract.go; do not edit.
-_CONTRACT = json.loads("{\"resources\":[{\"name\":\"cpus\",\"min\":1,\"max\":255,\"omit_zero\":false},{\"name\":\"memory_mib\",\"min\":512,\"max\":1048576,\"omit_zero\":false},{\"name\":\"root_disk_mib\",\"min\":0,\"max\":4294967295,\"omit_zero\":true},{\"name\":\"environment_disk_mib\",\"min\":0,\"max\":4294967295,\"omit_zero\":true}],\"runtime\":[{\"name\":\"source_commit\",\"pattern\":\"[0-9a-f]{40}\"},{\"name\":\"image_id\",\"pattern\":\"sha256:[0-9a-f]{64}\"},{\"name\":\"image_manifest_digest\",\"pattern\":\"sha256:[0-9a-f]{64}\"},{\"name\":\"microsandbox_ref\",\"pattern\":\"oac-runtime@sha256:[0-9a-f]{64}\"},{\"name\":\"runtime_sha256\",\"pattern\":\"[0-9a-f]{64}\"},{\"name\":\"firmware_sha256\",\"pattern\":\"[0-9a-f]{64}\"}],\"providers\":{\"docker\":{\"disk\":false,\"runtime\":true},\"e2b\":{\"disk\":false,\"runtime\":false},\"microsandbox\":{\"disk\":true,\"runtime\":true}},\"minimum_disk\":1024}")
+_CONTRACT = json.loads("{\"resources\":[{\"name\":\"cpus\",\"min\":1,\"max\":255,\"omit_zero\":false},{\"name\":\"memory_mib\",\"min\":512,\"max\":1048576,\"omit_zero\":false},{\"name\":\"root_disk_mib\",\"min\":0,\"max\":4294967295,\"omit_zero\":true},{\"name\":\"environment_disk_mib\",\"min\":0,\"max\":4294967295,\"omit_zero\":true}],\"runtime\":[{\"name\":\"source_commit\",\"pattern\":\"[0-9a-f]{40}\"},{\"name\":\"image_id\",\"pattern\":\"sha256:[0-9a-f]{64}\"},{\"name\":\"image_manifest_digest\",\"pattern\":\"sha256:[0-9a-f]{64}\"},{\"name\":\"microsandbox_ref\",\"pattern\":\"oac-runtime@sha256:[0-9a-f]{64}\"},{\"name\":\"runtime_sha256\",\"pattern\":\"[0-9a-f]{64}\"},{\"name\":\"firmware_sha256\",\"pattern\":\"[0-9a-f]{64}\"}],\"providers\":{\"docker\":{\"mode\":\"nodes\",\"disk\":false,\"runtime\":true,\"default_resources\":{\"cpus\":2,\"memory_mib\":2048}},\"e2b\":{\"mode\":\"direct\",\"disk\":false,\"runtime\":false,\"default_resources\":null},\"microsandbox\":{\"mode\":\"nodes\",\"disk\":true,\"runtime\":true,\"default_resources\":{\"cpus\":2,\"memory_mib\":4096,\"root_disk_mib\":8192,\"environment_disk_mib\":8192}}},\"minimum_disk\":1024}")
 # END GENERATED DEPLOYMENT CONTRACT
 
 
diff --git a/docs/configuration.md b/docs/configuration.md
index 5ff249aff..1a248b7e3 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -79,7 +79,7 @@ Runtime settings live in Core's database. Change them in Web; scripts use the sa
 | Setting | Where in Web | Core API | Notes |
 | --- | --- | --- | --- |
 | Sandbox backend: Docker, microsandbox or E2B | **System** → **Manage sandbox configuration**: the setup wizard, ending with **Save configuration** | `/core/v1/sandbox/deployment` | One backend per installation, chosen after the first sign-in. Another backend needs **Reset deployment** first; see [change the sandbox configuration](./getting-started/nodes.md#change-the-sandbox-configuration) |
-| Sandbox size, Runtime release, E2B key and template build | **System** → **Manage sandbox configuration** → **Change resources** | `/core/v1/sandbox/deployment` | Web proposes the sizes in [`standard-sizes.json`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/web/src/features/sandbox/standard-sizes.json). Existing sandboxes keep their size and release. The E2B key is write-only and encrypted |
+| Sandbox size, Runtime release, E2B key and template build | **System** → **Manage sandbox configuration** → **Change resources** | `/core/v1/sandbox/deployment` | Web proposes the [default size the Provider declares](./sandbox-provider.md#register-the-provider-kind). Existing sandboxes keep their size and release. The E2B key is write-only and encrypted |
 | Nodes and their capacity | **Nodes**: **Add node**; **Edit node** and **Remove node** on a node's page | `/core/v1/sandbox/enrollment-tokens`, `/core/v1/sandbox/nodes` | See [Node capacity](#node-capacity) and the [nodes guide](./getting-started/nodes.md) |
 | Projects and API keys | **Projects and keys**: **Create project**, **Rename**, **Issue key**, **Revoke**, **Archive** | `/core/v1/projects` | Keys are shown once; Core stores digests |
 | Default model per harness | **System** → **Default model configuration**: **Set** | `/core/v1/harnesses/{harness}/model-configuration` | See [Default models](#default-models) |
diff --git a/docs/getting-started/install-options.md b/docs/getting-started/install-options.md
index 3a626ae1f..074c37754 100644
--- a/docs/getting-started/install-options.md
+++ b/docs/getting-started/install-options.md
@@ -66,7 +66,7 @@ Several installations can share a machine when they use distinct installation di
 
 ## Sandbox backend
 
-The installer saves no sandbox backend. After signing in, open **System** → **Manage sandbox configuration** and choose Docker, microsandbox or E2B; Web proposes the Standard size in [`standard-sizes.json`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/web/src/features/sandbox/standard-sizes.json). The choice is stored in Core's database. To change it later, [reset the deployment](./nodes.md#change-the-sandbox-configuration). Docker shares each node's kernel with its sandboxes, and its node service account is [root-equivalent](./nodes.md#what-the-installer-sets-up). E2B needs a public HTTPS URL that is not loopback, because E2B's sandboxes call Core from E2B's cloud. Prepare an E2B template with the [E2B guide](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/deploy/e2b/README.md).
+The installer saves no sandbox backend. After signing in, open **System** → **Manage sandbox configuration** and choose Docker, microsandbox or E2B; Web proposes the [default size the Provider declares](../sandbox-provider.md#register-the-provider-kind) as Standard. The choice is stored in Core's database. To change it later, [reset the deployment](./nodes.md#change-the-sandbox-configuration). Docker shares each node's kernel with its sandboxes, and its node service account is [root-equivalent](./nodes.md#what-the-installer-sets-up). E2B needs a public HTTPS URL that is not loopback, because E2B's sandboxes call Core from E2B's cloud. Prepare an E2B template with the [E2B guide](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/deploy/e2b/README.md).
 
 ## Listeners and access
 
diff --git a/docs/sandbox-provider.md b/docs/sandbox-provider.md
index 4cfb26d3a..904f2d349 100644
--- a/docs/sandbox-provider.md
+++ b/docs/sandbox-provider.md
@@ -102,26 +102,26 @@ Hosted and self-hosted Environments use the same Runtime preparation; a provider
 
 ## Register the provider kind
 
-`sandbox/providers/registry.go` is the only registration table. Each entry binds the adapter's specification and resource validators, its `sandbox.ConfigurationAdapter`, the deployment mode (`nodes` or `direct`), the operation declaration and a node-local (`BuildLocal`) or direct (`BuildDirect`) constructor. `providers.Build` and `providers.BuildDirect` construct adapters without allocating compute. There is no init-time registration or plugin loading.
+`sandbox/providers/registry.go` is the only registration table. Each entry binds the adapter's specification and resource validators, its `sandbox.ConfigurationAdapter`, the deployment mode (`nodes` or `direct`), its `sandbox.DeploymentPolicy` (disk limits, the Runtime input and the default size setup proposes), the operation declaration and a node-local (`BuildLocal`) or direct (`BuildDirect`) constructor. `providers.Build` and `providers.BuildDirect` construct adapters without allocating compute. There is no init-time registration or plugin loading.
 
 A new provider takes these steps:
 
 1. Implement the operation contracts in the adapter package, with native contract tests.
 2. Add its specification and resource validators.
 3. Implement `sandbox.ConfigurationAdapter` over a typed native configuration. `DecodeInput` strictly parses the separate public `configuration` and write-only `credential` objects of a request. `Encode` produces whitelisted public selectors, read-only observations and separate secret bytes, and never passes request JSON through. `Decode` restores stored selectors, and keeps access to owned resources, without remote admission or new template validation. `Normalize` copies its input before changing it. `ResolveChange`, `Equal` and `WithCredential` own inheritance, identity and credential composition. `Requirements` declares whether a credential and a public Core origin are required, and which setup operations are supported: `Discovery` for `DiscoverConfiguration`, `SelectionDiscovery` for `DiscoverSelection` and `CredentialVerification` for `VerifyCredential`. `DiscoverConfiguration` validates the query and returns a safe catalog, never a mutation or an admission decision, while Core keeps authorization, input limits and deadlines. `DiscoverSelection` resolves a candidate's omitted native values before commit, and `VerifyCredential` verifies a credential's access to owned resources without mutation. Both receive the candidate's `sandbox.DirectConfig` and build any native client for that call only. A node provider accepts only an empty public object, rejects credentials and returns Unsupported for every setup operation and for credential replacement.
-4. Register its constructor, policies, configuration adapter and operation declaration in `providers/registry.go`. Its key is the provider kind, which also labels the Provider's observations, and checkpoint support reads this entry. The installer's projection combines the registered policies with the shared field bounds in `sandbox/deployment_contract.go`; regenerate it with `go run ./services/core/cmd/specification-contract -write`.
+4. Register its constructor, policies, configuration adapter and operation declaration in `providers/registry.go`. Its key is the provider kind, which also labels the Provider's observations, and checkpoint support reads this entry. The generated projections combine each registered mode and deployment policy with the shared field bounds in `sandbox/deployment_contract.go`: the installer reads them from `deploy/node/node_spec.py`, and the TypeScript client and Web from `packages/agents-client/src/deployment-contract.ts`, so Web reads these declarations instead of comparing provider kinds. Regenerate both with `go run ./services/core/cmd/specification-contract -write`.
 5. Supply the distribution artifacts for the adapter and its helper, and offer the provider to operators through the registered configuration contract.
 
-**Known design gap:** Web's setup views carry provider-specific options, such as E2B's views. Exposing another provider through that surface currently requires a shared Web edit. This coupling does not meet [Complexity stays in the adapter](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter); new integrations must express their configuration through the protocol and keep vendor-specific behavior in the adapter. Never add a Session or Turn scheduling path, a vendor column or API field, or a vendor switch in the store.
+**Known design gap:** Web's setup wizard still names providers in its backend choice, the E2B configuration step (service presets and fields) and the Docker confirmation, because the protocol declares no configuration fields yet. Exposing another provider through that surface currently requires a shared Web edit. This coupling does not meet [Complexity stays in the adapter](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter); new integrations must express their configuration through the protocol and keep vendor-specific behavior in the adapter. Never add a Session or Turn scheduling path, a vendor column or API field, or a vendor switch in the store.
 
 `providers.Build` passes persisted node configuration and ephemeral `LocalOptions` to `BuildLocal`. The caller explicitly selects standalone registration or single-provider execution with `Standalone`, or generation-owned execution with a canonical absolute node state directory in `GenerationStateDirectory`. Missing or mixed contexts are rejected. The adapter owns generation-specific native preparation and readiness checks. Microsandbox binds helper leases to the installation, generation and specification digest, then checks the pinned image after platform, capacity and artifact readiness.
 
 ### Registration validation
 
-`providers.ValidateRegistration` is the single wiring check. Lookup, constructor binding and the installer projection run it before any configuration callback or constructor. An unknown provider name stays invalid input; a malformed registration returns a safe `providercontract.ErrContract` that includes no submitted configuration or native diagnostics.
+`providers.ValidateRegistration` is the single wiring check. Lookup, constructor binding and the generated projections run it before any configuration callback or constructor. An unknown provider name stays invalid input; a malformed registration returns a safe `providercontract.ErrContract` that includes no submitted configuration or native diagnostics.
 
 - A `nodes` registration has only `BuildLocal`, and a `direct` registration only `BuildDirect`; missing, mixed or unknown modes are rejected.
-- The specification and resource validators, the configuration adapter and a complete operation declaration are mandatory, so an incomplete registration cannot publish a partial installer projection.
+- The specification and resource validators, the configuration adapter and a complete operation declaration are mandatory, so an incomplete registration cannot publish a partial projection. A declared default size must pass the adapter's resource validator.
 - The Runtime input policy either accepts the pinned Runtime or gives the adapter's fixed reason for rejecting it, never both.
 - Checkpoint is admitted only for a `nodes` registration, because the common lifecycle suspends only node allocations; registration rejects a `direct` Provider that declares it. A registration carries no suspension values: Core applies its one [suspension policy](#suspension) to every Provider that declares checkpoint support.
 
diff --git a/docs/zh/configuration.md b/docs/zh/configuration.md
index a8c1afe1c..fcde3f949 100644
--- a/docs/zh/configuration.md
+++ b/docs/zh/configuration.md
@@ -1,7 +1,7 @@
 ---
 title: "配置参考"
 source: docs/configuration.md
-source_hash: b0946948a110778123f52e065f24da9cfa7cfb8a1aeb6321526fb5064537a9a8
+source_hash: 95519fc0cac3ac31f2cd08cdfadf20be92a03d998093a651411240c95d29176d
 ---
 
 Core 安装的每项设置都恰好只有一个归属位置，分属以下三类：
@@ -83,7 +83,7 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 | 设置 | Web 中的位置 | Core API | 注意事项 |
 | --- | --- | --- | --- |
 | 沙箱后端：Docker、microsandbox 或 E2B | **System** → **Manage sandbox configuration**：设置向导，最后点击 **Save configuration** | `/core/v1/sandbox/deployment` | 每个安装只能使用一个后端，在首次登录后选择。要改用其他后端，必须先执行 **Reset deployment**；请参阅[更改沙箱配置](getting-started/nodes.md#change-the-sandbox-configuration) |
-| 沙箱大小、Runtime 发行版、E2B 密钥和模板构建 | **System** → **Manage sandbox configuration** → **Change resources** | `/core/v1/sandbox/deployment` | Web 会在 [`standard-sizes.json`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/web/src/features/sandbox/standard-sizes.json) 中推荐可用大小。现有沙箱会保留其大小和发行版。E2B 密钥仅可写入，并且已加密 |
+| 沙箱大小、Runtime 发行版、E2B 密钥和模板构建 | **System** → **Manage sandbox configuration** → **Change resources** | `/core/v1/sandbox/deployment` | Web 会推荐 [Provider 声明的默认大小](sandbox-provider.md#register-the-provider-kind)。现有沙箱会保留其大小和发行版。E2B 密钥仅可写入，并且已加密 |
 | 节点及其容量 | **Nodes**：**Add node**；在节点页面上使用 **Edit node** 和 **Remove node** | `/core/v1/sandbox/enrollment-tokens`、`/core/v1/sandbox/nodes` | 请参阅[节点容量](#node-capacity)和[节点指南](getting-started/nodes.md) |
 | 项目和 API 密钥 | **Projects and keys**：**Create project**、**Rename**、**Issue key**、**Revoke**、**Archive** | `/core/v1/projects` | 密钥只显示一次；Core 存储其摘要 |
 | 每个 Harness 的默认模型 | **System** → **Default model configuration**：**Set** | `/core/v1/harnesses/{harness}/model-configuration` | 请参阅[默认模型](#default-models) |
diff --git a/docs/zh/getting-started/install-options.md b/docs/zh/getting-started/install-options.md
index bd5cd674c..a4254a418 100644
--- a/docs/zh/getting-started/install-options.md
+++ b/docs/zh/getting-started/install-options.md
@@ -1,7 +1,7 @@
 ---
 title: "安装选项"
 source: docs/getting-started/install-options.md
-source_hash: 6acbb4205e95aa5ad2f36fbfb3656a785b8d420c2ff754b81ae9cc7e07f10482
+source_hash: 698909d30bf0ebdff2656deb6a6cb00c18181e835e2c1a7972de0d1e7ca47733
 ---
 
 [默认安装](install.md)无需任何选项。本页介绍安装选项、Compose 部署和反向代理配置。
@@ -68,7 +68,7 @@ docker compose exec web oac-web core-key
 
 ## 沙箱后端 {#sandbox-backend}
 
-安装程序不保存沙箱后端。登录后，打开 **System** → **Manage sandbox configuration**，选择 Docker、microsandbox 或 E2B；Web 会按 [`standard-sizes.json`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/apps/web/src/features/sandbox/standard-sizes.json) 推荐 Standard 尺寸。该选择保存在 Core 的数据库中。以后要更改，请[重置部署](nodes.md#change-the-sandbox-configuration)。Docker 沙箱与每个节点共用该节点的内核，其节点服务账户[等效于 root](nodes.md#what-the-installer-sets-up)。E2B 需要一个非回环的公共 HTTPS URL，因为 E2B 沙箱会从 E2B 云端调用 Core。按照 [E2B 指南](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/deploy/e2b/README.md)准备模板。
+安装程序不保存沙箱后端。登录后，打开 **System** → **Manage sandbox configuration**，选择 Docker、microsandbox 或 E2B；Web 会把 [Provider 声明的默认大小](../sandbox-provider.md#register-the-provider-kind)推荐为 Standard 尺寸。该选择保存在 Core 的数据库中。以后要更改，请[重置部署](nodes.md#change-the-sandbox-configuration)。Docker 沙箱与每个节点共用该节点的内核，其节点服务账户[等效于 root](nodes.md#what-the-installer-sets-up)。E2B 需要一个非回环的公共 HTTPS URL，因为 E2B 沙箱会从 E2B 云端调用 Core。按照 [E2B 指南](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/deploy/e2b/README.md)准备模板。
 
 ## 监听器与访问 {#listeners-and-access}
 
diff --git a/docs/zh/sandbox-provider.md b/docs/zh/sandbox-provider.md
index 2b0bd3a3f..c4019b6b1 100644
--- a/docs/zh/sandbox-provider.md
+++ b/docs/zh/sandbox-provider.md
@@ -1,7 +1,7 @@
 ---
 title: "添加 Sandbox Provider"
 source: docs/sandbox-provider.md
-source_hash: 159c2a7366edd784386ca7bd5748752451fd0a3ea543d813cefd29921014d294
+source_hash: c4d127115021894c676b53b678919ef6c3d584afbcf6783a33e55e0494959e51
 ---
 
 **Sandbox Provider** 为 Core 管理的 Environment 提供 Runtime daemon 运行所需的外层计算资源，以及启动 daemon 的有界引导流程。本指南说明如何添加 Provider，并作为 Core 驱动 Provider 的参考。接口为 [`SandboxProvider`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/sandbox/sandbox_provider.go)。
@@ -104,26 +104,26 @@ Checkpoint 支持增加 `Compute` generation、name、ID 和 `SnapshotIdentity`
 
 ## 注册 provider kind {#register-the-provider-kind}
 
-`sandbox/providers/registry.go` 是唯一注册表。每项绑定 adapter 的 specification 与 resource validator、`sandbox.ConfigurationAdapter`、部署模式（`nodes` 或 `direct`）、operation 声明，以及 node-local（`BuildLocal`）或 direct（`BuildDirect`）constructor。`providers.Build` 和 `providers.BuildDirect` 构造 adapter，不分配计算资源。没有 init 时注册或 plugin 加载。
+`sandbox/providers/registry.go` 是唯一注册表。每项绑定 adapter 的 specification 与 resource validator、`sandbox.ConfigurationAdapter`、部署模式（`nodes` 或 `direct`）、`sandbox.DeploymentPolicy`（磁盘限制、Runtime 输入，以及 setup 推荐的默认大小）、operation 声明，以及 node-local（`BuildLocal`）或 direct（`BuildDirect`）constructor。`providers.Build` 和 `providers.BuildDirect` 构造 adapter，不分配计算资源。没有 init 时注册或 plugin 加载。
 
 新 provider 执行以下步骤：
 
 1. 在 adapter 包中实现 operation 契约，并编写原生契约测试。
 2. 添加 specification 和 resource validator。
 3. 基于类型化原生配置实现 `sandbox.ConfigurationAdapter`。`DecodeInput` 严格解析请求中独立的公开 `configuration` 与只写 `credential` 对象。`Encode` 生成白名单公开 selector、只读观测和独立 secret bytes，不透传请求 JSON。`Decode` 恢复已存储 selector 并保留对所属资源的访问，不做远程 admission 或新模板验证。`Normalize` 修改前复制输入。`ResolveChange`、`Equal` 和 `WithCredential` 负责继承、身份与凭据组合。`Requirements` 声明是否需要凭据和公开 Core origin，以及支持哪些 setup 操作：`Discovery` 对应 `DiscoverConfiguration`，`SelectionDiscovery` 对应 `DiscoverSelection`，`CredentialVerification` 对应 `VerifyCredential`。`DiscoverConfiguration` 验证 query 并返回安全 catalog，不做 mutation 或 admission decision；Core 保留授权、输入限制与 deadline。`DiscoverSelection` 在提交前解析候选项省略的原生值，`VerifyCredential` 验证凭据对所属资源的访问，不修改资源。两者都接收候选项的 `sandbox.DirectConfig`，原生 client 只为该次调用构造。node provider 仅接受空公开对象，拒绝凭据，对每项 setup 操作和 credential replacement 返回 Unsupported。
-4. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter 和 operation 声明。其键即 provider kind，也用于标记该 Provider 的观测；checkpoint 支持读取此项。installer 投影组合已注册 policy 与 `sandbox/deployment_contract.go` 中的共享 field bound；通过 `go run ./services/core/cmd/specification-contract -write` 重新生成。
+4. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter 和 operation 声明。其键即 provider kind，也用于标记该 Provider 的观测；checkpoint 支持读取此项。生成的投影组合每个已注册的部署模式和 deployment policy 与 `sandbox/deployment_contract.go` 中的共享 field bound：installer 从 `deploy/node/node_spec.py` 读取，TypeScript 客户端和 Web 从 `packages/agents-client/src/deployment-contract.ts` 读取，因此 Web 读取这些声明，而不比较 provider kind。通过 `go run ./services/core/cmd/specification-contract -write` 重新生成两者。
 5. 提供 adapter 和 helper 的发行产物，通过已注册 configuration 契约向运维人员提供 provider。
 
-**已知设计缺口：** Web 的 setup view 携带 provider 专有选项，如 E2B 的 view。通过该界面提供另一 provider 目前需要修改共享的 Web。此耦合不符合[复杂性留在 adapter 内](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter)；新集成必须通过协议表达配置，把厂商专有行为留在 adapter。不得添加 Session 或 Turn 调度路径、厂商专有 column 或 API field，或 store 中的厂商 switch。
+**已知设计缺口：** Web 的 setup 向导仍在后端选择、E2B 配置步骤（服务预设与字段）和 Docker 确认中指名 provider，因为协议尚未声明配置字段。通过该界面提供另一 provider 目前需要修改共享的 Web。此耦合不符合[复杂性留在 adapter 内](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter)；新集成必须通过协议表达配置，把厂商专有行为留在 adapter。不得添加 Session 或 Turn 调度路径、厂商专有 column 或 API field，或 store 中的厂商 switch。
 
 `providers.Build` 将持久化 node 配置与临时 `LocalOptions` 传给 `BuildLocal`。调用方通过 `Standalone` 明确选择独立注册或单 provider 执行，或通过 `GenerationStateDirectory` 中的规范绝对 node state directory 选择 generation 拥有的执行。context 缺失或混合时拒绝。adapter 负责 generation 特有的原生 preparation 和 readiness 检查。Microsandbox 将 helper lease 绑定到安装实例、generation 和 specification digest，然后在平台、容量和 artifact readiness 后检查固定 image。
 
 ### 注册验证 {#registration-validation}
 
-`providers.ValidateRegistration` 是唯一 wiring 检查。lookup、constructor binding 和 installer projection 在任何 configuration callback 或 constructor 前运行它。未知 provider name 保持为无效输入；格式错误的注册返回安全 `providercontract.ErrContract`，不包含提交的配置或原生诊断。
+`providers.ValidateRegistration` 是唯一 wiring 检查。lookup、constructor binding 和生成的投影在任何 configuration callback 或 constructor 前运行它。未知 provider name 保持为无效输入；格式错误的注册返回安全 `providercontract.ErrContract`，不包含提交的配置或原生诊断。
 
 - `nodes` 注册仅有 `BuildLocal`，`direct` 注册仅有 `BuildDirect`；缺失、混合或未知 mode 被拒绝。
-- specification 和 resource validator、configuration adapter 与完整 operation 声明都是必需项，因此不完整注册不能发布部分 installer projection。
+- specification 和 resource validator、configuration adapter 与完整 operation 声明都是必需项，因此不完整注册不能发布部分投影。声明的默认大小必须通过 adapter 的 resource validator。
 - Runtime input policy 要么接受固定 Runtime，要么给出 adapter 拒绝它的固定原因，不能两者兼有。
 - Checkpoint 仅准入 `nodes` 注册，因为公共 lifecycle 只暂停 node allocation；声明 checkpoint 的 `direct` Provider 会被注册拒绝。注册不携带 suspension 数值：Core 对每个声明 checkpoint 支持的 Provider 应用同一个 [suspension policy](#suspension)。
 
diff --git a/packages/agents-client/src/deployment-contract.ts b/packages/agents-client/src/deployment-contract.ts
index 77ccf9d18..1106413a9 100644
--- a/packages/agents-client/src/deployment-contract.ts
+++ b/packages/agents-client/src/deployment-contract.ts
@@ -1,3 +1,3 @@
 // Code generated by services/core/cmd/specification-contract from sandbox/deployment_contract.go; DO NOT EDIT.
 
-export const deploymentContract = {"resources":[{"name":"cpus","min":1,"max":255,"omit_zero":false},{"name":"memory_mib","min":512,"max":1048576,"omit_zero":false},{"name":"root_disk_mib","min":0,"max":4294967295,"omit_zero":true},{"name":"environment_disk_mib","min":0,"max":4294967295,"omit_zero":true}],"runtime":[{"name":"source_commit","pattern":"[0-9a-f]{40}"},{"name":"image_id","pattern":"sha256:[0-9a-f]{64}"},{"name":"image_manifest_digest","pattern":"sha256:[0-9a-f]{64}"},{"name":"microsandbox_ref","pattern":"oac-runtime@sha256:[0-9a-f]{64}"},{"name":"runtime_sha256","pattern":"[0-9a-f]{64}"},{"name":"firmware_sha256","pattern":"[0-9a-f]{64}"}],"minimum_disk":1024} as const;
+export const deploymentContract = {"resources":[{"name":"cpus","min":1,"max":255,"omit_zero":false},{"name":"memory_mib","min":512,"max":1048576,"omit_zero":false},{"name":"root_disk_mib","min":0,"max":4294967295,"omit_zero":true},{"name":"environment_disk_mib","min":0,"max":4294967295,"omit_zero":true}],"runtime":[{"name":"source_commit","pattern":"[0-9a-f]{40}"},{"name":"image_id","pattern":"sha256:[0-9a-f]{64}"},{"name":"image_manifest_digest","pattern":"sha256:[0-9a-f]{64}"},{"name":"microsandbox_ref","pattern":"oac-runtime@sha256:[0-9a-f]{64}"},{"name":"runtime_sha256","pattern":"[0-9a-f]{64}"},{"name":"firmware_sha256","pattern":"[0-9a-f]{64}"}],"providers":{"docker":{"mode":"nodes","disk":false,"runtime":true,"default_resources":{"cpus":2,"memory_mib":2048}},"e2b":{"mode":"direct","disk":false,"runtime":false,"default_resources":null},"microsandbox":{"mode":"nodes","disk":true,"runtime":true,"default_resources":{"cpus":2,"memory_mib":4096,"root_disk_mib":8192,"environment_disk_mib":8192}}},"minimum_disk":1024} as const;
diff --git a/packages/agents-client/src/sandbox-client.ts b/packages/agents-client/src/sandbox-client.ts
index 256ee7001..81735f221 100644
--- a/packages/agents-client/src/sandbox-client.ts
+++ b/packages/agents-client/src/sandbox-client.ts
@@ -25,7 +25,8 @@ export function normalizeSandboxNodeDiagnostic(value: string): Exclude<SandboxNo
   return nodeDiagnostics.has(value) ? value as Exclude<SandboxNodeDiagnostic, ""> : "provider_unavailable";
 }
 
-export type SandboxProvider = "docker" | "microsandbox" | "e2b";
+/** A registered Provider kind; deploymentContract.providers holds each one's declaration. */
+export type SandboxProvider = keyof typeof deploymentContract.providers;
 /** Client-generated, never a Core code: a deployment write whose rejection could echo the key and is withheld. */
 export const sandboxConfigurationUnconfirmed = "sandbox_configuration_unconfirmed";
 const sandboxConfigurationParams = new Set<unknown>(["runtime", ...deploymentContract.resources.map(({ name }) => `resources.${name}`)]);
@@ -88,7 +89,7 @@ export interface SandboxDeployment {
   configuration?: { template?: string; api_url?: string; domain?: string };
   metadata?: { template_build?: SandboxE2BTemplateBuild };
   credential_configured: boolean;
-  /** Idle suspension policy; microsandbox only, otherwise null. */
+  /** Idle suspension policy; null unless the Provider declares checkpoint support. */
   suspension: { idle_seconds: number; retention_seconds: number } | null;
 }
 /** The fixed E2B build as Core read it when the selection was saved; unknown values are null. */
@@ -198,7 +199,6 @@ const measure = (value: unknown) => typeof value === "number" && Number.isFinite
 const nullable = (test: (value: unknown) => boolean) => (value: unknown) => value === null || test(value);
 const strings = (value: Record<string, unknown>, fields: readonly string[]) => fields.every((field) => typeof value[field] === "string");
 
-const providers = new Set(["", "docker", "microsandbox", "e2b"]);
 const modes = new Set(["", "nodes", "direct"]);
 const releaseFields = ["source_commit", "image_id", "image_manifest_digest", "microsandbox_ref", "runtime_sha256", "firmware_sha256"];
 function projectSpecification(value: unknown): SandboxSpecification {
@@ -264,7 +264,7 @@ function projectDeployment(value: unknown): SandboxDeployment {
   const resources = members(deployment.resources, ["allocations", "pending"]);
   const suspension = deployment.suspension === null ? null : members(deployment.suspension, ["idle_seconds", "retention_seconds"]);
   const configured = hasOwn(deployment, "specification");
-  valid(strings(deployment, ["installation_id", "core_url"]) && providers.has(deployment.provider as string) && modes.has(deployment.mode as string) &&
+  valid(strings(deployment, ["installation_id", "core_url"]) && (deployment.provider === "" || (typeof deployment.provider === "string" && hasOwn(deploymentContract.providers, deployment.provider))) && modes.has(deployment.mode as string) &&
     [deployment.owner_epoch, deployment.generation, resources.allocations, resources.pending].every(isNonnegativeInteger) &&
     (suspension === null || [suspension.idle_seconds, suspension.retention_seconds].every(isNonnegativeInteger)) &&
     configured === hasOwn(deployment, "specification_digest") && (!configured || (typeof deployment.specification_digest === "string" && deployment.specification_digest !== "")));
diff --git a/services/core/cmd/specification-contract/main.go b/services/core/cmd/specification-contract/main.go
index c79213dda..5e5956190 100644
--- a/services/core/cmd/specification-contract/main.go
+++ b/services/core/cmd/specification-contract/main.go
@@ -5,7 +5,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 	"os"
 	"strings"
@@ -14,12 +13,11 @@ import (
 func main() {
 	write := flag.Bool("write", false, "update deploy/node/node_spec.py and packages/agents-client/src/deployment-contract.ts from the repository root")
 	flag.Parse()
-	projection, err := providers.Builtin().PythonDeploymentContract()
+	projection, typescript, err := providers.Builtin().DeploymentContract()
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
-	typescript := sandbox.TypeScriptDeploymentContract()
 	if !*write {
 		fmt.Println(projection)
 		fmt.Print(typescript)
diff --git a/services/core/internal/sandbox/deployment_contract.go b/services/core/internal/sandbox/deployment_contract.go
index e79ea2f40..da40c7ca3 100644
--- a/services/core/internal/sandbox/deployment_contract.go
+++ b/services/core/internal/sandbox/deployment_contract.go
@@ -24,13 +24,6 @@ type runtimeRule struct {
 	Pattern string `json:"pattern"`
 }
 
-// DeploymentPolicy is declared by an adapter and projected to the installer.
-type DeploymentPolicy struct {
-	RuntimeError string `json:"-"`
-	Disk         bool   `json:"disk"`
-	Runtime      bool   `json:"runtime"`
-}
-
 var resourceContract = []resourceRule{
 	{"cpus", 1, 255, false, "cpus must be 1..255 and memory_mib must be 512..1048576"},
 	{"memory_mib", 512, 1048576, false, "cpus must be 1..255 and memory_mib must be 512..1048576"},
@@ -46,31 +39,16 @@ var runtimeContract = []runtimeRule{
 	{"firmware_sha256", "[0-9a-f]{64}"},
 }
 
-// PythonDeploymentContract generates the installer projection.
-func PythonDeploymentContract(policies map[string]DeploymentPolicy) string {
-	raw := projectDeploymentContract(struct {
-		Resources   []resourceRule              `json:"resources"`
-		Runtime     []runtimeRule               `json:"runtime"`
-		Providers   map[string]DeploymentPolicy `json:"providers"`
-		MinimumDisk uint32                      `json:"minimum_disk"`
-	}{resourceContract, runtimeContract, policies, minimumDiskMiB})
-	return "# BEGIN GENERATED DEPLOYMENT CONTRACT\n# Generated from sandbox/deployment_contract.go; do not edit.\n_CONTRACT = json.loads(" + fmt.Sprintf("%q", string(raw)) + ")\n# END GENERATED DEPLOYMENT CONTRACT"
-}
-
-// TypeScriptDeploymentContract generates the client projection of the bounds
-// and patterns; provider policies are not part of it.
-func TypeScriptDeploymentContract() string {
-	raw := projectDeploymentContract(struct {
-		Resources   []resourceRule `json:"resources"`
-		Runtime     []runtimeRule  `json:"runtime"`
-		MinimumDisk uint32         `json:"minimum_disk"`
-	}{resourceContract, runtimeContract, minimumDiskMiB})
-	return "// Code generated by services/core/cmd/specification-contract from sandbox/deployment_contract.go; DO NOT EDIT.\n\nexport const deploymentContract = " + string(raw) + " as const;\n"
+// ProviderProjection is one registered Provider in the generated projections.
+type ProviderProjection struct {
+	Mode string `json:"mode"`
+	DeploymentPolicy
 }
 
-// projectDeploymentContract encodes a projection. Struct order is checked
-// first because it also defines Go's canonical JSON bytes.
-func projectDeploymentContract(projection any) []byte {
+// DeploymentContract generates the installer and TypeScript client projections
+// of one contract. Struct order is checked first because it also defines Go's
+// canonical JSON bytes.
+func DeploymentContract(providers map[string]ProviderProjection) (python, typescript string) {
 	for _, item := range []struct {
 		value any
 		names []string
@@ -87,8 +65,14 @@ func projectDeploymentContract(projection any) []byte {
 			}
 		}
 	}
-	raw, _ := json.Marshal(projection)
-	return raw
+	raw, _ := json.Marshal(struct {
+		Resources   []resourceRule                `json:"resources"`
+		Runtime     []runtimeRule                 `json:"runtime"`
+		Providers   map[string]ProviderProjection `json:"providers"`
+		MinimumDisk uint32                        `json:"minimum_disk"`
+	}{resourceContract, runtimeContract, providers, minimumDiskMiB})
+	return "# BEGIN GENERATED DEPLOYMENT CONTRACT\n# Generated from sandbox/deployment_contract.go; do not edit.\n_CONTRACT = json.loads(" + fmt.Sprintf("%q", string(raw)) + ")\n# END GENERATED DEPLOYMENT CONTRACT",
+		"// Code generated by services/core/cmd/specification-contract from sandbox/deployment_contract.go; DO NOT EDIT.\n\nexport const deploymentContract = " + string(raw) + " as const;\n"
 }
 func resourceNames() []string {
 	var names []string
diff --git a/services/core/internal/sandbox/docker/selection.go b/services/core/internal/sandbox/docker/selection.go
index 426cf6005..3a7ec247a 100644
--- a/services/core/internal/sandbox/docker/selection.go
+++ b/services/core/internal/sandbox/docker/selection.go
@@ -4,7 +4,9 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-func Policy() sandbox.DeploymentPolicy { return sandbox.DeploymentPolicy{Runtime: true} }
+func Policy() sandbox.DeploymentPolicy {
+	return sandbox.DeploymentPolicy{Runtime: true, DefaultResources: &sandbox.Resources{CPUs: 2, MemoryMiB: 2048}}
+}
 
 func ValidateResources(r sandbox.Resources) error { return r.ValidatePolicy("docker", Policy()) }
 func ValidateSpecification(s sandbox.DeploymentSpec) error {
diff --git a/services/core/internal/sandbox/microsandbox/deployment.go b/services/core/internal/sandbox/microsandbox/deployment.go
index a5063e214..a97091d9d 100644
--- a/services/core/internal/sandbox/microsandbox/deployment.go
+++ b/services/core/internal/sandbox/microsandbox/deployment.go
@@ -4,7 +4,10 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-func Policy() sandbox.DeploymentPolicy { return sandbox.DeploymentPolicy{Disk: true, Runtime: true} }
+func Policy() sandbox.DeploymentPolicy {
+	return sandbox.DeploymentPolicy{Disk: true, Runtime: true,
+		DefaultResources: &sandbox.Resources{CPUs: 2, MemoryMiB: 4096, RootDiskMiB: 8192, EnvironmentDiskMiB: 8192}}
+}
 
 func ValidateResources(r sandbox.Resources) error { return r.ValidatePolicy("microsandbox", Policy()) }
 func ValidateSpecification(s sandbox.DeploymentSpec) error {
diff --git a/services/core/internal/sandbox/providers/deployment_contract_test.go b/services/core/internal/sandbox/providers/deployment_contract_test.go
index ea6477748..2f9d9798e 100644
--- a/services/core/internal/sandbox/providers/deployment_contract_test.go
+++ b/services/core/internal/sandbox/providers/deployment_contract_test.go
@@ -19,11 +19,11 @@ func TestDeploymentContractProjectionsAreCurrent(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	expected, err := registry.PythonDeploymentContract()
+	expectedPython, expectedTypeScript, err := registry.DeploymentContract()
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !strings.Contains(string(python), expected) || string(typescript) != sandbox.TypeScriptDeploymentContract() {
+	if !strings.Contains(string(python), expectedPython) || string(typescript) != expectedTypeScript {
 		t.Fatal("deployment contract projection is stale; regenerate with go run ./services/core/cmd/specification-contract -write")
 	}
 }
diff --git a/services/core/internal/sandbox/providers/registration.go b/services/core/internal/sandbox/providers/registration.go
index 3962f0f6e..2cf638f56 100644
--- a/services/core/internal/sandbox/providers/registration.go
+++ b/services/core/internal/sandbox/providers/registration.go
@@ -8,7 +8,8 @@ import (
 )
 
 // ValidateRegistration checks wiring before configuration parsing or construction.
-// Only configuration requirements and operation declarations are read.
+// Only configuration requirements and operation declarations are read, and the
+// resource validator only for a declared default size, after every other check.
 func ValidateRegistration(a Adapter) error {
 	invalid := func(field string) error {
 		return fmt.Errorf("%w: invalid registration %s", providercontract.ErrContract, field)
@@ -55,5 +56,8 @@ func ValidateRegistration(a Adapter) error {
 	if operations["Initial"].State == providercontract.Supported && a.Mode != "nodes" {
 		return invalid("checkpoint support outside nodes mode")
 	}
+	if a.Policy.DefaultResources != nil && a.ValidateResources(*a.Policy.DefaultResources) != nil {
+		return invalid("default resources")
+	}
 	return nil
 }
diff --git a/services/core/internal/sandbox/providers/registration_test.go b/services/core/internal/sandbox/providers/registration_test.go
index b8121f38d..f2b595a45 100644
--- a/services/core/internal/sandbox/providers/registration_test.go
+++ b/services/core/internal/sandbox/providers/registration_test.go
@@ -102,8 +102,8 @@ func TestRegistrationRejectsBeforeCallbacksOrConstruction(t *testing.T) {
 				{"direct build", func() error { _, err := registry.BuildDirect(sandbox.DirectConfig{Selection: selection}); return err }},
 				{"binding", func() error { return ValidateBinding(a, &docker.Provider{}) }},
 				{"projection", func() error {
-					text, err := registry.PythonDeploymentContract()
-					if text != "" {
+					python, typescript, err := registry.DeploymentContract()
+					if python != "" || typescript != "" {
 						t.Fatal("partial invalid projection")
 					}
 					return err
@@ -160,7 +160,15 @@ func TestCompleteRegistrationsPreserveConstruction(t *testing.T) {
 	if err != nil || p == nil || calls != 2 {
 		t.Fatalf("credential-free direct build: %v calls=%d", err, calls)
 	}
-	if _, err := registry.PythonDeploymentContract(); err != nil {
+	if _, _, err := registry.DeploymentContract(); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestRegistrationRejectsInvalidDefaultResources(t *testing.T) {
+	a := Builtin().adapters["docker"]
+	a.Policy.DefaultResources = &sandbox.Resources{CPUs: 2, MemoryMiB: 2048, RootDiskMiB: 1024}
+	if err := ValidateRegistration(a); !errors.Is(err, providercontract.ErrContract) {
 		t.Fatal(err)
 	}
 }
diff --git a/services/core/internal/sandbox/providers/registry.go b/services/core/internal/sandbox/providers/registry.go
index d7bf67337..51eb5aaaf 100644
--- a/services/core/internal/sandbox/providers/registry.go
+++ b/services/core/internal/sandbox/providers/registry.go
@@ -142,16 +142,18 @@ func (r *Registry) Describe(kind, installation string) (sandbox.Description, err
 	return sandbox.Description{Mode: a.Mode, BackendFingerprint: BackendFingerprint(kind, namespace+":"+installation)}, nil
 }
 
-// PythonDeploymentContract projects the same registered adapter policies into
-// the node installer; no second provider list exists in another language.
-func (r *Registry) PythonDeploymentContract() (string, error) {
-	policies := make(map[string]sandbox.DeploymentPolicy, len(r.adapters))
+// DeploymentContract projects the registered modes and policies into the node
+// installer and the TypeScript client; no second provider list exists in
+// another language.
+func (r *Registry) DeploymentContract() (python, typescript string, err error) {
+	providers := make(map[string]sandbox.ProviderProjection, len(r.adapters))
 	for kind := range r.adapters {
 		a, err := r.Lookup(kind)
 		if err != nil {
-			return "", err
+			return "", "", err
 		}
-		policies[kind] = a.Policy
+		providers[kind] = sandbox.ProviderProjection{Mode: a.Mode, DeploymentPolicy: a.Policy}
 	}
-	return sandbox.PythonDeploymentContract(policies), nil
+	python, typescript = sandbox.DeploymentContract(providers)
+	return python, typescript, nil
 }
diff --git a/services/core/internal/sandbox/sandbox_provider.go b/services/core/internal/sandbox/sandbox_provider.go
index aac367557..fd5600501 100644
--- a/services/core/internal/sandbox/sandbox_provider.go
+++ b/services/core/internal/sandbox/sandbox_provider.go
@@ -249,6 +249,17 @@ type ConfigurationRequirements struct {
 	CredentialVerification providercontract.Support
 }
 
+// DeploymentPolicy is the deployment declaration. Disk declares independent
+// disk limits; Runtime requires a pinned Runtime release, and RuntimeError is
+// the fixed reason for rejecting one otherwise. DefaultResources is the size
+// setup proposes, or nil when the Provider's configuration selects it.
+type DeploymentPolicy struct {
+	RuntimeError     string     `json:"-"`
+	Disk             bool       `json:"disk"`
+	Runtime          bool       `json:"runtime"`
+	DefaultResources *Resources `json:"default_resources"`
+}
+
 // Configuration is an adapter-owned typed value, never a request or response DTO.
 // Implementations must exclude secrets from JSON and safe diagnostic output.
 type Configuration interface {

From 1d00be0df69d079f801f520db1f6bb2078a3a946 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 10:39:37 +0800
Subject: [PATCH 47/60] Classify node readiness without vendor codes (#540)

---
 apps/web/PRODUCT.md                           |  2 +-
 apps/web/e2e/data/routes.mjs                  |  2 +-
 apps/web/e2e/monitoring.spec.ts               |  2 +-
 apps/web/e2e/nodes.spec.ts                    |  6 +--
 .../features/sandbox/node-enrollment.test.ts  |  2 +-
 apps/web/src/lib/locale-strings.ts            | 14 +++---
 apps/web/src/lib/locale.test.ts               |  4 +-
 apps/web/src/lib/sandbox-diagnostic.test.ts   |  4 +-
 apps/web/src/lib/sandbox-diagnostic.ts        | 24 ++++------
 contracts/agents-api/core.openapi.yaml        | 18 +++-----
 .../agents-api/node-generation-protocol.md    |  4 +-
 contracts/agents-api/sandbox-deployment.md    |  3 +-
 .../agents-api/zh/node-generation-protocol.md |  6 +--
 contracts/agents-api/zh/sandbox-deployment.md |  5 +--
 docs/getting-started/nodes.md                 | 12 +++--
 docs/web/console-api-usage.md                 |  2 +-
 docs/zh/getting-started/nodes.md              | 14 +++---
 docs/zh/web/console-api-usage.md              |  4 +-
 .../agents-client/src/sandbox-client.test.ts  |  6 +--
 packages/agents-client/src/sandbox-client.ts  |  6 +--
 services/core/internal/deployment/node.go     |  2 +-
 .../core/internal/deployment/rules_test.go    |  2 +-
 services/core/internal/deployment/view.go     |  2 +-
 .../postgres/deploymentpg/nodes_test.go       | 42 ++++++++++++++++++
 .../postgres/deploymentpg/presence_test.go    |  4 +-
 .../core/internal/sandbox/node/generations.go |  2 +-
 .../internal/sandbox/node/generations_test.go |  2 +-
 .../core/internal/sandbox/node/node_test.go   |  2 +-
 .../core/internal/sandbox/node_diagnostic.go  | 44 ++++++++++---------
 .../internal/sandbox/node_diagnostic_test.go  |  2 +-
 .../providers/generation_probe_test.go        |  2 +-
 .../core/internal/sandbox/providers/probe.go  | 29 ++++++------
 .../internal/sandbox/providers/probe_test.go  | 14 +++---
 .../sandbox/testdata/node-diagnostics.json    |  6 +--
 .../000095_node_readiness_classes.sql         | 19 ++++++++
 35 files changed, 176 insertions(+), 138 deletions(-)
 create mode 100644 services/core/migrations/000095_node_readiness_classes.sql

diff --git a/apps/web/PRODUCT.md b/apps/web/PRODUCT.md
index 5a8afa95e..f2022d3a8 100644
--- a/apps/web/PRODUCT.md
+++ b/apps/web/PRODUCT.md
@@ -32,7 +32,7 @@ The console runs beside the administrator's own Core, with execution, files and
 - **Monitor**: Overview (service status, running Sessions, sandbox slots, Sessions needing attention, 24-hour Session activity, a compact inventory of Core and up to four nodes, prioritizing offline and degraded nodes when the list is full, with a popover glance at each, the attention table, usage by project), Core metrics (the Core process's CPU and memory, execution slots and the Turn queue, connected daemons, the database and background jobs), Agent metrics (requests, errors, duration, tokens, models, tools, Agents and API keys for 1 h / 6 h / 24 h / 7 d), Sandbox metrics (node capacity and hosted Runtimes across projects; a node or a sandbox opens in a dialog with its figures and CPU and memory charts), Session log (every Session, read-only, with a failed Session's reason under its status, opening one Session's history, which jumps to its failed Turns; a self-hosted Session's page also has its environment's executor credentials). Agent metrics' By Agent table opens an Agent's page and, from its failed Turns, its Sessions in the Session log.
 - **Resources**: Agents, Environment templates, Skills, Files, Vaults. Each list shows one project or all projects, with a Project column when all are shown and a Creator column naming the creating key. Detail pages show the resource's facts and offer Delete.
 - **Platform**: Projects and keys (projects, their assets and usage, named keys, write history), Nodes (the node list, capacity, host figures, allocations and individual node operations). Add node asks for limits before issuing its one-time command; installers use Core's public URL and require supported node artifacts. Removal offers the host's uninstall command. System owns installation facts, the Domain and HTTPS secondary page, each harness's default model configuration, startup settings, and a link to the Sandbox configuration secondary page. That page owns setup, resource edits, rollout details and reset. Setup selects a backend, size and Runtime, then asks for a deliberate save; own-machine setup continues to Add node.
-- A node whose provider is not ready names the reason (Docker unreachable, no Docker limits, missing Runtime image, no KVM, missing microsandbox components, a host too small) and its fix in the help tip beside its status, wherever that status shows.
+- A node whose provider is not ready names the reason as one Provider-neutral readiness class (provider unavailable, host unsupported, provider files or Runtime image missing, Runtime download failed, a host too small) and its fix in the help tip beside its status, wherever that status shows.
 - A node enrolled with an earlier Core address gets no new sandboxes, so on the Nodes list and its page its status is Old address, with "Remove and add again", never Available.
 - **Sandbox reset** is an explicit administrator operation in System → Sandbox configuration. Auto clear is the default, with a one-hour deadline (5 minutes–24 hours); Force clear requires destructive confirmation. Reset stops new hosted Session admission, clears idle, suspended and pending hosted work, and waits for busy Turns and file writes until Core forces the remaining work. It does not affect self-hosted execution. Histories and persisted Files/Artifacts remain; archived Sessions cannot resume, and unpersisted workspace contents may be lost. Cancel stops further clearing without undoing archives. Core alone reports progress and completion, including resources blocked on named offline nodes; force does not bypass their cleanup. Completion clears the backend configuration and retires old nodes/enrollment credentials. A new configuration is then a separate deliberate save.
 - **Online sandbox configuration** changes the same backend's resources, Runtime or E2B template without retiring existing nodes or changing existing Sessions' resource ownership. New placement follows Core's qualified capacity; saving a target does not promise immediate placement on it. Configuration rollout shows Core's target preparation and retained previous-generation sandbox count. A settled rollout can still have failed, update-required or unknown nodes and old resources. An offline node stays offline even when it has a recorded serving generation. Node and allocation detail distinguish the serving pin, target preparation and each resource's configuration generation.
diff --git a/apps/web/e2e/data/routes.mjs b/apps/web/e2e/data/routes.mjs
index dd7572437..b0a7601ac 100644
--- a/apps/web/e2e/data/routes.mjs
+++ b/apps/web/e2e/data/routes.mjs
@@ -85,7 +85,7 @@ export function buildDemo(now = Math.floor(Date.now() / 1000), publicUrl = "http
   sessions.sort((a, b) => b.created_at - a.created_at);
   const nodes = [
     { rollout: { state: "ready", ready_generation: 1 }, id: "node-local", name: "core-01", provider: "docker", online: true, provider_ready: true, cpu_count: 16, available_memory_bytes: 38 * 2 ** 30, available_disk_bytes: 410 * 2 ** 30, running: 5, snapshots: 2, last_seen_at: new Date((now - 8) * 1000).toISOString(), max_active: 8, max_retained: 16, active: 5, reserved: 1, retained: 2, cleanup_pending: 0, created_at: new Date((now - 86400 * 30) * 1000).toISOString() },
-    { rollout: { state: "failed", ready_generation: null, diagnostic: "docker_limits_unsupported" }, id: "node-gpu", name: "gpu-worker-02", provider: "docker", online: true, provider_ready: false, diagnostic: "docker_limits_unsupported", cpu_count: 32, available_memory_bytes: 12 * 2 ** 30, available_disk_bytes: 96 * 2 ** 30, running: 7, snapshots: 5, last_seen_at: new Date((now - 12) * 1000).toISOString(), max_active: 8, max_retained: 16, active: 7, reserved: 0, retained: 5, cleanup_pending: 1, created_at: new Date((now - 86400 * 12) * 1000).toISOString() },
+    { rollout: { state: "failed", ready_generation: null, diagnostic: "host_unsupported" }, id: "node-gpu", name: "gpu-worker-02", provider: "docker", online: true, provider_ready: false, diagnostic: "host_unsupported", cpu_count: 32, available_memory_bytes: 12 * 2 ** 30, available_disk_bytes: 96 * 2 ** 30, running: 7, snapshots: 5, last_seen_at: new Date((now - 12) * 1000).toISOString(), max_active: 8, max_retained: 16, active: 7, reserved: 0, retained: 5, cleanup_pending: 1, created_at: new Date((now - 86400 * 12) * 1000).toISOString() },
     { rollout: { state: "unknown", ready_generation: 1 }, id: "node-edge", name: "edge-03", provider: "docker", online: false, provider_ready: false, cpu_count: 8, available_memory_bytes: null, available_disk_bytes: null, running: 0, snapshots: 0, last_seen_at: new Date((now - 5400) * 1000).toISOString(), max_active: 4, max_retained: 8, active: 0, reserved: 0, retained: 0, cleanup_pending: 0, created_at: new Date((now - 86400 * 3) * 1000).toISOString() },
   ];
   const hosted = sessions.filter((session) => session.environment.type === "openai_hosted");
diff --git a/apps/web/e2e/monitoring.spec.ts b/apps/web/e2e/monitoring.spec.ts
index c48b1beea..be9449e51 100644
--- a/apps/web/e2e/monitoring.spec.ts
+++ b/apps/web/e2e/monitoring.spec.ts
@@ -24,7 +24,7 @@ test("shows the deployment's health on Overview and each monitor page", async ({
   await page.getByRole("button", { name: "Sandbox metrics" }).click();
   await expect(page.getByRole("table").first()).toContainText("core-01");
   // A degraded node names why its provider is not ready.
-  await expect(page.locator(".status-with-help").filter({ hasText: /^Provider not ready/ }).getByRole("button", { name: "Docker limits unsupported", exact: true })).toBeVisible();
+  await expect(page.locator(".status-with-help").filter({ hasText: /^Provider not ready/ }).getByRole("button", { name: "Host unsupported", exact: true })).toBeVisible();
 });
 
 test("opens a Session's conversation from the Session log, read-only", async ({ page, request }) => {
diff --git a/apps/web/e2e/nodes.spec.ts b/apps/web/e2e/nodes.spec.ts
index 5f32831da..6c9bb2c4d 100644
--- a/apps/web/e2e/nodes.spec.ts
+++ b/apps/web/e2e/nodes.spec.ts
@@ -91,9 +91,9 @@ test("adds a node: host requirements, a root/sudo command, a countdown, the same
   await expect(problem).toContainText("Not connected yet");
   await expect(problem).toContainText("sudo journalctl -u oac-node-7f3c2a90-5b1e-4c2d-9e3f-0a1b2c3d4e5f.service");
   await expect(add.getByText("No sudo on this host?")).toHaveCount(0);
-  // Connected, it reports why Docker isn't ready; once ready, the node is connected.
-  await setNode(request, { id: "node-new", online: true, diagnostic: "docker_limits_unsupported" });
-  await expect(problem).toContainText("Docker limits unsupported");
+  // Connected, it reports why its provider isn't ready; once ready, the node is connected.
+  await setNode(request, { id: "node-new", online: true, diagnostic: "host_unsupported" });
+  await expect(problem).toContainText("Host unsupported");
   await expect(progress).toContainText("Waiting for Docker");
   await setNode(request, { id: "node-new", provider_ready: true, diagnostic: "" });
   await expect(progress).toHaveText("edge-04 · Connected");
diff --git a/apps/web/src/features/sandbox/node-enrollment.test.ts b/apps/web/src/features/sandbox/node-enrollment.test.ts
index 683c925df..74025f841 100644
--- a/apps/web/src/features/sandbox/node-enrollment.test.ts
+++ b/apps/web/src/features/sandbox/node-enrollment.test.ts
@@ -31,7 +31,7 @@ describe("node enrollment", () => {
     const connected = { ...fresh, online: true };
     expect(enrollmentProgress(connected, 0, 1_000)).toEqual({ stage: "connected", problem: "" });
     expect(enrollmentProgress(connected, 0, NODE_READY_WAIT_MS)).toEqual({ stage: "connected", problem: "provider_unavailable" });
-    expect(enrollmentProgress({ ...connected, diagnostic: "kvm_unavailable" }, 0, 1_000)).toEqual({ stage: "connected", problem: "kvm_unavailable" });
+    expect(enrollmentProgress({ ...connected, diagnostic: "host_unsupported" }, 0, 1_000)).toEqual({ stage: "connected", problem: "host_unsupported" });
     expect(enrollmentProgress({ ...connected, provider_ready: true }, 0, NODE_READY_WAIT_MS * 2)).toEqual({ stage: "ready", problem: "" });
   });
 
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index fd23a23c3..cd7648aff 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -285,21 +285,17 @@ export const chinese = {
   "Sandbox ownership mismatch": "沙箱归属不一致",
   "Reconcile the assigned resource and its ownership record before resuming execution.": "请核对已分配资源及其归属记录，再恢复执行。",
   "Sandbox provider unavailable": "沙箱后端不可用",
-  "Restore the provider on the assigned node, then refresh. A connected node alone does not confirm that its sandbox provider is ready.": "请恢复已分配节点上的运行后端，然后刷新。节点在线并不代表其沙箱后端已就绪。",
+  "Restore the provider on the assigned node, then refresh. Running the install command again on the host checks its requirements and names the fix.": "请恢复已分配节点上的运行后端，然后刷新。在该主机上重新运行安装命令，会检查主机要求并指出修复方法。",
   "Sandbox state needs attention": "沙箱状态需要检查",
   "Inspect the assigned node and resource, then refresh.": "请检查已分配节点和资源，然后刷新。",
-  "Docker unavailable": "Docker 不可用",
-  "The node can't reach the Docker daemon. Check that Docker is running and the node can use its socket.": "节点连不上 Docker 守护进程。请确认 Docker 正在运行，且节点能访问它的 socket。",
-  "Docker limits unsupported": "Docker 无法限制资源",
-  "Docker on this host doesn't enforce CPU and memory limits. Enable cgroup limits.": "这台主机上的 Docker 不能限制 CPU 和内存。请启用 cgroup 限制。",
+  "Host unsupported": "主机不满足要求",
+  "The host lacks a capability its sandbox provider requires. Running the install command again on the host checks its requirements and names the fix.": "主机缺少沙箱后端所需的能力。在该主机上重新运行安装命令，会检查主机要求并指出修复方法。",
+  "Provider files missing": "后端文件缺失",
+  "Pinned provider files are missing or fail their checksum. Run the install command again.": "指定版本的后端文件缺失或校验不通过。请重新运行安装命令。",
   "Runtime download failed": "Runtime 下载失败",
   "Runtime files could not be downloaded or verified. Check the node's network access and the configured Runtime release.": "Runtime 文件下载或验证失败。请检查节点网络连接及配置的 Runtime 发布版本。",
   "Runtime image missing": "缺少 Runtime 镜像",
   "The pinned Runtime image isn't on the host. Run the install command again.": "主机上没有指定版本的 Runtime 镜像。请重新运行安装命令。",
-  "KVM unavailable": "KVM 不可用",
-  "/dev/kvm isn't available to the node. Enable virtualization or use a KVM-capable host.": "节点无法使用 /dev/kvm。请开启虚拟化，或换一台支持 KVM 的主机。",
-  "microsandbox components missing": "microsandbox 组件缺失",
-  "microsandbox components are missing or fail their checksum. Run the install command again.": "microsandbox 组件缺失或校验不通过。请重新运行安装命令。",
   "Host too small": "主机资源不足",
   "The host has less CPU or memory than one sandbox needs. Use a bigger host or a smaller sandbox size.": "主机的 CPU 或内存不够运行一个沙箱。请换一台更大的主机，或调小沙箱规格。",
   "Connecting to this console's Core…": "正在连接此控制台的 Core…",
diff --git a/apps/web/src/lib/locale.test.ts b/apps/web/src/lib/locale.test.ts
index 439cefe4b..1d61ce7e1 100644
--- a/apps/web/src/lib/locale.test.ts
+++ b/apps/web/src/lib/locale.test.ts
@@ -12,8 +12,8 @@ describe("sandbox localization", () => {
     expect(sandboxStateLabel("internal-value", "zh")).toBe("未知状态");
   });
   it("localizes all diagnostic labels and advice", () => {
-    for (const code of ["node_unavailable", "resource_missing", "compute_unconfirmed", "ownership_mismatch", "provider_unavailable", "docker_unavailable",
-      "docker_limits_unsupported", "runtime_download_failed", "runtime_image_unavailable", "kvm_unavailable", "microsandbox_artifacts_unavailable", "capacity_insufficient", "unknown"]) {
+    for (const code of ["node_unavailable", "resource_missing", "compute_unconfirmed", "ownership_mismatch", "provider_unavailable", "host_unsupported",
+      "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient", "unknown"]) {
       const message = sandboxDiagnosticMessage(code, "zh");
       expect(message?.label).toMatch(/[\u4e00-\u9fff]/);
       expect(message?.advice).toMatch(/[\u4e00-\u9fff]/);
diff --git a/apps/web/src/lib/sandbox-diagnostic.test.ts b/apps/web/src/lib/sandbox-diagnostic.test.ts
index 6c26cfb9f..4ead7d8fb 100644
--- a/apps/web/src/lib/sandbox-diagnostic.test.ts
+++ b/apps/web/src/lib/sandbox-diagnostic.test.ts
@@ -17,11 +17,11 @@ describe("sandbox diagnostics", () => {
     expect(sandboxDiagnosticMessage("provider_unavailable")?.label).toBe("Sandbox provider unavailable");
   });
   it("names why a node's provider is not ready, reading an unknown code as provider_unavailable", () => {
-    expect(sandboxDiagnosticMessage(nodeProviderDiagnostic({ online: true, provider_ready: false, diagnostic: "kvm_unavailable" }))?.label).toBe("KVM unavailable");
+    expect(sandboxDiagnosticMessage(nodeProviderDiagnostic({ online: true, provider_ready: false, diagnostic: "host_unsupported" }))?.label).toBe("Host unsupported");
     expect(nodeProviderDiagnostic({ online: true, provider_ready: false, diagnostic: "future_code" as SandboxNodeDiagnostic })).toBe("provider_unavailable");
     expect(nodeProviderDiagnostic({ online: true, provider_ready: true, diagnostic: "" })).toBe("");
     // An offline node's last code may no longer apply.
-    expect(nodeProviderDiagnostic({ online: false, provider_ready: false, diagnostic: "docker_unavailable" })).toBe("");
+    expect(nodeProviderDiagnostic({ online: false, provider_ready: false, diagnostic: "host_unsupported" })).toBe("");
   });
   it("does not expose an unknown raw error or turn it into a healthy state", () => {
     const message = sandboxDiagnosticMessage("private-provider-error-with-secret");
diff --git a/apps/web/src/lib/sandbox-diagnostic.ts b/apps/web/src/lib/sandbox-diagnostic.ts
index 20caf6db5..67820d9d9 100644
--- a/apps/web/src/lib/sandbox-diagnostic.ts
+++ b/apps/web/src/lib/sandbox-diagnostic.ts
@@ -22,16 +22,16 @@ const diagnostics: Record<string, { label: MessageKey; advice: MessageKey }> = {
   },
   provider_unavailable: {
     label: "Sandbox provider unavailable",
-    advice: "Restore the provider on the assigned node, then refresh. A connected node alone does not confirm that its sandbox provider is ready.",
+    advice: "Restore the provider on the assigned node, then refresh. Running the install command again on the host checks its requirements and names the fix.",
   },
-  // Fixed Runtime preparation and provider readiness diagnostics; Core sends only the code.
-  docker_unavailable: {
-    label: "Docker unavailable",
-    advice: "The node can't reach the Docker daemon. Check that Docker is running and the node can use its socket.",
+  // Provider-neutral readiness classes; Core sends only the code, and the node keeps the local detail.
+  host_unsupported: {
+    label: "Host unsupported",
+    advice: "The host lacks a capability its sandbox provider requires. Running the install command again on the host checks its requirements and names the fix.",
   },
-  docker_limits_unsupported: {
-    label: "Docker limits unsupported",
-    advice: "Docker on this host doesn't enforce CPU and memory limits. Enable cgroup limits.",
+  artifacts_unavailable: {
+    label: "Provider files missing",
+    advice: "Pinned provider files are missing or fail their checksum. Run the install command again.",
   },
   runtime_download_failed: {
     label: "Runtime download failed",
@@ -41,14 +41,6 @@ const diagnostics: Record<string, { label: MessageKey; advice: MessageKey }> = {
     label: "Runtime image missing",
     advice: "The pinned Runtime image isn't on the host. Run the install command again.",
   },
-  kvm_unavailable: {
-    label: "KVM unavailable",
-    advice: "/dev/kvm isn't available to the node. Enable virtualization or use a KVM-capable host.",
-  },
-  microsandbox_artifacts_unavailable: {
-    label: "microsandbox components missing",
-    advice: "microsandbox components are missing or fail their checksum. Run the install command again.",
-  },
   capacity_insufficient: {
     label: "Host too small",
     advice: "The host has less CPU or memory than one sandbox needs. Use a bigger host or a smaller sandbox size.",
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index 957cba8d8..9a1ef6ea1 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -946,12 +946,10 @@ definitions:
         description: Fixed reason for the last reported unreadiness; absent while the provider is ready. Clients treat an unknown value as provider_unavailable.
         enum:
           - provider_unavailable
-          - docker_unavailable
-          - docker_limits_unsupported
+          - host_unsupported
+          - artifacts_unavailable
           - runtime_download_failed
           - runtime_image_unavailable
-          - kvm_unavailable
-          - microsandbox_artifacts_unavailable
           - capacity_insufficient
         type: string
       enrollment_id:
@@ -1037,12 +1035,10 @@ definitions:
         description: Fixed reason for the last reported unreadiness; absent while the provider is ready. Clients treat an unknown value as provider_unavailable.
         enum:
           - provider_unavailable
-          - docker_unavailable
-          - docker_limits_unsupported
+          - host_unsupported
+          - artifacts_unavailable
           - runtime_download_failed
           - runtime_image_unavailable
-          - kvm_unavailable
-          - microsandbox_artifacts_unavailable
           - capacity_insufficient
         type: string
       enrollment_id:
@@ -1106,12 +1102,10 @@ definitions:
       diagnostic:
         enum:
           - provider_unavailable
-          - docker_unavailable
-          - docker_limits_unsupported
+          - host_unsupported
+          - artifacts_unavailable
           - runtime_download_failed
           - runtime_image_unavailable
-          - kvm_unavailable
-          - microsandbox_artifacts_unavailable
           - capacity_insufficient
         type: string
       ready_generation:
diff --git a/contracts/agents-api/node-generation-protocol.md b/contracts/agents-api/node-generation-protocol.md
index a7b293f41..14dc79870 100644
--- a/contracts/agents-api/node-generation-protocol.md
+++ b/contracts/agents-api/node-generation-protocol.md
@@ -17,7 +17,7 @@ Every frame is one JSON text message whose `version` equals `node.ProtocolVersio
 
 Core counts a node as online while it is connected under the current owner epoch and its last heartbeat is less than 45 seconds old. A heartbeat establishes provider readiness and the last host measurements, never Session activity.
 
-Health carries `provider_ready`, an optional fixed `diagnostic`, `observed_at`, `active_operations` (at most 32) and the host measurements that the [Runtime telemetry API](./runtime-observability-api.md#node-host-observations-and-history) reports. A node without generation management probes its provider for every report; an unready provider reports one fixed diagnostic code, classified from typed probe errors, and the probe text and host paths stay on the node. Core stores an unknown code as `provider_unavailable`. The [nodes guide](../../docs/getting-started/nodes.md#readiness-codes) lists the codes and their causes. A generation-managing node reports readiness per generation instead, as described below.
+Health carries `provider_ready`, an optional fixed `diagnostic`, `observed_at`, `active_operations` (at most 32) and the host measurements that the [Runtime telemetry API](./runtime-observability-api.md#node-host-observations-and-history) reports. A node without generation management probes its provider for every report; an unready provider reports the Provider-neutral readiness class of its first failed check, from the class error the probe wraps, and the probe text, vendor detail and host paths stay on the node. A `diagnostic` in node or generation health that is not a declared class makes the frame invalid. The [nodes guide](../../docs/getting-started/nodes.md#readiness-codes) lists the classes and their causes. A generation-managing node reports readiness per generation instead, as described below.
 
 ## Provider requests
 
@@ -119,6 +119,6 @@ A fresh installation also records the verified checksums of its Runtime files se
 
 An interrupted download repairs only missing bytes at the original paths. When collection comes before any import attempt, the preparation journal proves that the generation has no imported native image. A generation whose native executable is missing and whose import may have started stays retained: missing files never prove native absence, and an empty native inventory never erases receipt or store history.
 
-The diagnostic codes are authored in `services/core/internal/sandbox/node_diagnostic.go`. The shared `services/core/internal/sandbox/testdata/node-diagnostics.json` fixture checks the Go mapping, OpenAPI source annotations and generated enums, and the TypeScript client declaration. Web uses the client normalizer and checks localized messages for every declared code. Update these projections with a code change; unknown codes normalize to `provider_unavailable`.
+The readiness classes, one exported error and one code each, are authored in `services/core/internal/sandbox/node_diagnostic.go`. The shared `services/core/internal/sandbox/testdata/node-diagnostics.json` fixture checks the Go mapping, OpenAPI source annotations and generated enums, and the TypeScript client declaration. Web uses the client normalizer and checks localized messages for every declared code. Update these projections with a code change; clients read an unknown code as `provider_unavailable`.
 
 Preparation diagnostics keep fixed typed causes. Only artifact transfer, checksum or release-provenance failures report `runtime_download_failed`; the private preparer signals that class through its exit category, without Core or the node parsing stderr. Provider, ownership, cancellation and unclassified failures keep their typed code or `provider_unavailable`. No raw provider text crosses the protocol.
diff --git a/contracts/agents-api/sandbox-deployment.md b/contracts/agents-api/sandbox-deployment.md
index bd1ff3424..c13eeba34 100644
--- a/contracts/agents-api/sandbox-deployment.md
+++ b/contracts/agents-api/sandbox-deployment.md
@@ -177,7 +177,7 @@ Node capacity is approved by the administrator, separately from the deployment s
 
 `GET /core/v1/sandbox/nodes` returns `{data: [...]}` with, for each node: `id`, `name`, `provider`, `online`, `last_seen_at`, `created_at`, `max_active`, `max_retained`, the counts `active`, `reserved`, `running`, `retained`, `snapshots` and `cleanup_pending`, `provider_ready`, `diagnostic`, the host measurements `cpu_count`, `available_memory_bytes` and `available_disk_bytes`, `rollout`, `enrollment_id` and `core_url`. `enrollment_id` is the handle of the command that registered the node, or null when Core has none. `core_url` is the installation public URL at enrollment; a node whose `core_url` differs from the current public URL receives no new placements. Work already placed on it finishes there, including a placed Environment that has no allocation yet, and its retained sandboxes can still resume while the old address reaches Core. Remove it and add it again.
 
-A node without generation management reports its provider's readiness itself: `provider_ready`, and when it is unready one fixed `diagnostic` code. A node added with Web's command manages generations, so its readiness follows its serving generation and its fixed code for the target generation appears in `rollout.diagnostic`. The node classifies the first failed readiness check and sends only the code; Core stores any other value as `provider_unavailable` and never stores or returns probe text or host paths. The codes are `docker_unavailable`, `docker_limits_unsupported`, `runtime_download_failed`, `runtime_image_unavailable`, `kvm_unavailable`, `microsandbox_artifacts_unavailable`, `capacity_insufficient` and `provider_unavailable`. `runtime_download_failed` means the exact Runtime artifacts could not be transferred or verified; it never contains artifact URLs, credentials or transport output. [Readiness codes](../../docs/getting-started/nodes.md#readiness-codes) gives causes and operator actions. Core and nodes must come from the same distribution.
+A node without generation management reports its provider's readiness itself: `provider_ready`, and when it is unready one fixed `diagnostic` code. A node added with Web's command manages generations, so its readiness follows its serving generation and its fixed code for the target generation appears in `rollout.diagnostic`. The node classifies the first failed readiness check and sends only its code; a frame with any other value is invalid, and Core never stores or returns probe text or host paths. The codes are Provider-neutral classes: `provider_unavailable`, `host_unsupported`, `artifacts_unavailable`, `runtime_download_failed`, `runtime_image_unavailable` and `capacity_insufficient`. `runtime_download_failed` means the exact Runtime artifacts could not be transferred or verified; it never contains artifact URLs, credentials or transport output. [Readiness codes](../../docs/getting-started/nodes.md#readiness-codes) gives causes and operator actions. Core and nodes must come from the same distribution.
 
 `PATCH /core/v1/sandbox/nodes/{node_id}` takes `{name, max_active, max_retained}`; lowering a limit stops no running sandbox. `DELETE /core/v1/sandbox/nodes/{node_id}` refuses with 409 `runtime_node_in_use` while the node holds allocations, snapshots, reservations or pending cleanup, including while it is offline. Removal deletes no compute and retires the node's identity; the host can come back only as a new node. There is no node drain.
 
@@ -197,7 +197,6 @@ Some fields keep one name across providers but differ in meaning, or do not appl
 | Enrollment-token `max_active`, `max_retained` | 409 `sandbox_deployment_conflict`, after the 400 capacity checks; E2B has no nodes | `max_retained` always equals `max_active` | Both limits apply |
 | Node list and detail | Empty list; detail returns 404 | Enrolled nodes | Enrolled nodes |
 | Node `retained`, `snapshots`, `max_retained` | Not applicable | Docker never suspends: `retained` equals `active`, `snapshots` is 0 and `max_retained` equals `max_active` | Suspended sandboxes are `retained` minus `active` |
-| Node `diagnostic` codes | Not applicable | `docker_unavailable`, `docker_limits_unsupported`, `runtime_download_failed`, `runtime_image_unavailable`, `capacity_insufficient` or `provider_unavailable` | `kvm_unavailable`, `microsandbox_artifacts_unavailable`, `runtime_download_failed`, `capacity_insufficient` or `provider_unavailable` |
 | Node `host.available_disk_bytes` | Not applicable | Free space on the filesystem of the node state directory, not a container's disk | Free space on the filesystem of the node state directory; sandbox disks have their own quotas |
 | Allocation `compute_phase`, `compute_phase_changed_at` | Not applicable: no node allocations | Always `disabled`, counted as running until release; the time is the allocation's creation | Includes `suspended`; its time plus `suspension.retention_seconds` tells roughly when Core reclaims the snapshot |
 | Runtime observation `cpu`, `memory` | From E2B metrics: `cpu.utilization_ratio` and `capacity_cores`, memory usage and limit; no cumulative CPU time | From Docker stats: `cpu.usage_seconds_total`, CPU and memory limits, memory usage | From the VM: `cpu.usage_seconds_total`, CPU and memory limits, memory usage |
diff --git a/contracts/agents-api/zh/node-generation-protocol.md b/contracts/agents-api/zh/node-generation-protocol.md
index e6e5de8fc..a5c9a658a 100644
--- a/contracts/agents-api/zh/node-generation-protocol.md
+++ b/contracts/agents-api/zh/node-generation-protocol.md
@@ -1,7 +1,7 @@
 ---
 title: "沙箱节点协议"
 source: contracts/agents-api/node-generation-protocol.md
-source_hash: 1ee43dfcdd0eec0806ea3bc8a4c1227e10bd8ac5e69486505cb113a98e3f548a
+source_hash: b7f9a3a2835f65b477b53fcc62b474250eb77c3111f5e4692b561911c0ff067b
 ---
 
 沙箱节点在其主机上运行 Docker 或 microsandbox Provider，并通过一个 WebSocket 与 Core 相连。Core 通过该连接发送 Provider 操作；节点针对本地 Provider 执行这些操作，并报告就绪状态、主机测量值及其持有的部署代次。Core 始终是唯一的生命周期所有者：节点绝不重试变更操作或调度工作。帧和校验器位于 [`services/core/internal/sandbox/node`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/services/core/internal/sandbox/node)（`wire.go`、`generation_wire.go`）；节点用于注册和读取配置的 HTTP 路由位于[机器连接 API](machine-api.md#node-routes)。
@@ -19,7 +19,7 @@ source_hash: 1ee43dfcdd0eec0806ea3bc8a4c1227e10bd8ac5e69486505cb113a98e3f548a
 
 只要节点在当前所有者 epoch 下保持连接，并且最近一次心跳距今不足 45 秒，Core 就会将该节点计为在线。心跳会确立 Provider 的就绪状态和最近的主机测量值，但绝不表示 Session 活动。
 
-健康报告包含 `provider_ready`、可选的固定 `diagnostic`、`observed_at`、最多为 32 的 `active_operations`，以及 [Runtime 遥测 API](runtime-observability-api.md#node-host-observations-and-history) 报告的主机测量值。未启用代次管理的节点每次报告时都会探测其 Provider；未就绪的 Provider 会报告一个固定诊断代码，该代码根据类型化探测错误进行分类；探测文本和主机路径保留在节点上。Core 会将未知代码存储为 `provider_unavailable`。[节点指南](../../../docs/zh/getting-started/nodes.md#readiness-codes) 列出了这些代码及其原因。支持代次管理的节点则按下文所述按代次报告就绪状态。
+健康报告包含 `provider_ready`、可选的固定 `diagnostic`、`observed_at`、最多为 32 的 `active_operations`，以及 [Runtime 遥测 API](runtime-observability-api.md#node-host-observations-and-history) 报告的主机测量值。未启用代次管理的节点每次报告时都会探测其 Provider；未就绪的 Provider 会报告其首个失败检查所属的、与 Provider 无关的就绪类别，该类别取自探测所包装的类别错误；探测文本、厂商细节和主机路径保留在节点上。节点或代次健康状态中的 `diagnostic` 若不是已声明的类别，该帧即无效。[节点指南](../../../docs/zh/getting-started/nodes.md#readiness-codes) 列出了这些类别及其原因。支持代次管理的节点则按下文所述按代次报告就绪状态。
 
 ## Provider 请求 {#provider-requests}
 
@@ -121,6 +121,6 @@ Runtime 字节缺失时，绝不将固定的放置实例迁移到当前 Runtime
 
 下载中断后，只会修复原始路径中缺失的字节。如果在任何导入尝试之前执行回收，准备日志会证明该代次没有已导入的原生镜像。如果某代次的原生可执行文件缺失，且导入可能已经开始，该代次仍会保留：文件缺失永远不能证明原生制品不存在，而空的原生清单也永远不能抹除回执或存储历史。
 
-诊断代码编写于 `services/core/internal/sandbox/node_diagnostic.go`。共享的 `services/core/internal/sandbox/testdata/node-diagnostics.json` 测试夹具检查 Go 映射、OpenAPI 源注释和生成的枚举，以及 TypeScript 客户端声明。Web 使用客户端规范化器，并检查每个已声明代码的本地化消息。代码变更时要同步更新这些投影；未知代码会规范化为 `provider_unavailable`。
+就绪类别编写于 `services/core/internal/sandbox/node_diagnostic.go`，每个类别对应一个导出错误和一个代码。共享的 `services/core/internal/sandbox/testdata/node-diagnostics.json` 测试夹具检查 Go 映射、OpenAPI 源注释和生成的枚举，以及 TypeScript 客户端声明。Web 使用客户端规范化器，并检查每个已声明代码的本地化消息。代码变更时要同步更新这些投影；客户端将未知代码读作 `provider_unavailable`。
 
 准备诊断使用固定的类型化原因。只有制品传输、校验和或版本来源验证失败才会报告 `runtime_download_failed`；私有准备器通过退出类别指示这一类失败，Core 和节点都不解析 stderr。Provider 故障、所有权故障、取消和未分类故障保留其类型化代码，或使用 `provider_unavailable`。协议中不会传输任何 Provider 原始文本。
diff --git a/contracts/agents-api/zh/sandbox-deployment.md b/contracts/agents-api/zh/sandbox-deployment.md
index 3bc42898a..9e09f084b 100644
--- a/contracts/agents-api/zh/sandbox-deployment.md
+++ b/contracts/agents-api/zh/sandbox-deployment.md
@@ -1,7 +1,7 @@
 ---
 title: "沙箱部署"
 source: contracts/agents-api/sandbox-deployment.md
-source_hash: 68aabafdb8983280a3bb29e7398042f9e843310d1784acd4a9a94e9647fd3919
+source_hash: 2a6b114b7b4f324b2a68ee1f5bde5e9f229a2d44c06aa7c0dd4560bb4ed60166
 ---
 
 沙箱部署为 Core 管理的 `openai_hosted` 执行选择 Sandbox Provider、每个沙箱的资源以及不可变的 Runtime 发行版。PostgreSQL 为每个安装维护一个当前有效选择；Web 和 Core API 写入同一配置。节点文件保存其已安装副本和特定于主机的路径，且不能覆盖其资源或 Runtime。该选择独立于 Harness；部署可以保持未配置状态，既无节点，也不接受托管准入。
@@ -179,7 +179,7 @@ POST 会在持久保存候选配置之前对其进行验证，并且不会创建
 
 `GET /core/v1/sandbox/nodes` 返回 `{data: [...]}`，其中每个节点包含 `id`、`name`、`provider`、`online`、`last_seen_at`、`created_at`、`max_active`、`max_retained`，计数项 `active`、`reserved`、`running`、`retained`、`snapshots` 和 `cleanup_pending`，以及 `provider_ready`、`diagnostic`、主机测量值 `cpu_count`、`available_memory_bytes` 和 `available_disk_bytes`、`rollout`、`enrollment_id` 和 `core_url`。`enrollment_id` 是注册该节点的命令的句柄；如果 Core 没有该句柄，则为 null。`core_url` 是注册时的安装公开 URL；`core_url` 与当前公开 URL 不同的节点不会收到新放置。已放置到该节点的工作会继续在那里完成，包括已放置但尚未获得分配的 Environment；只要旧地址仍能访问 Core，其保留沙箱仍可恢复。请移除该节点并重新添加。
 
-不具备代次管理的节点会自行报告其提供商的就绪状态：`provider_ready`，未就绪时则报告一个固定的 `diagnostic` 代码。通过 Web 的命令添加的节点会管理代次，因此其就绪状态取决于服务代次，而目标代次的固定代码会出现在 `rollout.diagnostic` 中。节点会对首次失败的就绪检查进行分类，并且只发送代码；Core 会将任何其他值存储为 `provider_unavailable`，且绝不存储或返回探测文本或主机路径。代码包括 `docker_unavailable`、`docker_limits_unsupported`、`runtime_download_failed`、`runtime_image_unavailable`、`kvm_unavailable`、`microsandbox_artifacts_unavailable`、`capacity_insufficient` 和 `provider_unavailable`。`runtime_download_failed` 表示无法传输或验证精确的 Runtime 制品；它绝不会包含制品 URL、凭据或传输输出。[就绪代码](../../../docs/zh/getting-started/nodes.md#readiness-codes)给出了原因和操作员应采取的措施。Core 和节点必须来自同一发行包。
+不具备代次管理的节点会自行报告其提供商的就绪状态：`provider_ready`，未就绪时则报告一个固定的 `diagnostic` 代码。通过 Web 的命令添加的节点会管理代次，因此其就绪状态取决于服务代次，而目标代次的固定代码会出现在 `rollout.diagnostic` 中。节点会对首次失败的就绪检查进行分类，并且只发送代码；携带任何其他值的帧均无效，且 Core 绝不存储或返回探测文本或主机路径。这些代码是与 Provider 无关的类别：`provider_unavailable`、`host_unsupported`、`artifacts_unavailable`、`runtime_download_failed`、`runtime_image_unavailable` 和 `capacity_insufficient`。`runtime_download_failed` 表示无法传输或验证精确的 Runtime 制品；它绝不会包含制品 URL、凭据或传输输出。[就绪代码](../../../docs/zh/getting-started/nodes.md#readiness-codes)给出了原因和操作员应采取的措施。Core 和节点必须来自同一发行包。
 
 `PATCH /core/v1/sandbox/nodes/{node_id}` 接受 `{name, max_active, max_retained}`；降低限制不会停止任何正在运行的沙箱。当节点仍持有分配、快照、预留或待处理清理时，包括节点离线期间，`DELETE /core/v1/sandbox/nodes/{node_id}` 会拒绝操作并返回 409 `runtime_node_in_use`。移除操作不会删除任何计算资源，并且会停用该节点的身份；该主机只能作为新节点重新加入。不存在节点排空过程。
 
@@ -199,7 +199,6 @@ POST 会在持久保存候选配置之前对其进行验证，并且不会创建
 | 注册令牌 `max_active`、`max_retained` | 先执行 400 容量检查，然后返回 409 `sandbox_deployment_conflict`；E2B 没有节点 | `max_retained` 始终等于 `max_active` | 两个限制均适用 |
 | 节点列表和详情 | 空列表；详情返回 404 | 已注册节点 | 已注册节点 |
 | 节点 `retained`、`snapshots`、`max_retained` | 不适用 | Docker 绝不暂停：`retained` 等于 `active`，`snapshots` 为 0，`max_retained` 等于 `max_active` | 已暂停沙箱数为 `retained` 减去 `active` |
-| 节点 `diagnostic` 代码 | 不适用 | `docker_unavailable`、`docker_limits_unsupported`、`runtime_download_failed`、`runtime_image_unavailable`、`capacity_insufficient` 或 `provider_unavailable` | `kvm_unavailable`、`microsandbox_artifacts_unavailable`、`runtime_download_failed`、`capacity_insufficient` 或 `provider_unavailable` |
 | 节点 `host.available_disk_bytes` | 不适用 | 节点状态目录所在文件系统的可用空间，而不是容器的磁盘 | 节点状态目录所在文件系统的可用空间；沙箱磁盘有自己的配额 |
 | 分配 `compute_phase`、`compute_phase_changed_at` | 不适用：没有节点分配 | 始终为 `disabled`，在释放前计为运行中；该时间为分配创建时间 | 包含 `suspended`；该时间加上 `suspension.retention_seconds` 可大致确定 Core 回收快照的时间 |
 | Runtime 观测 `cpu`、`memory` | 来自 E2B 指标：`cpu.utilization_ratio` 和 `capacity_cores`、内存使用量和限制；无累计 CPU 时间 | 来自 Docker stats：`cpu.usage_seconds_total`、CPU 和内存限制、内存使用量 | 来自 VM：`cpu.usage_seconds_total`、CPU 和内存限制、内存使用量 |
diff --git a/docs/getting-started/nodes.md b/docs/getting-started/nodes.md
index fd99451cd..6410138f6 100644
--- a/docs/getting-started/nodes.md
+++ b/docs/getting-started/nodes.md
@@ -157,20 +157,18 @@ When a node is online but its sandbox provider is not ready, **Nodes** and **Ove
 - **Nodes added with Web's command** report a failed check of the current sandbox configuration as **Preparation failed** in the node's target status, with the reason in a help tip (`rollout.diagnostic` in `GET /core/v1/sandbox/nodes`). The tip beside **Provider not ready** only says *Sandbox provider unavailable*.
 - **Manually registered nodes** show the reason in the help tip beside **Provider not ready** (`diagnostic`).
 
-The node's log has the local error behind the code.
+Each code is a Provider-neutral class; the local error behind it stays on the node. A manually registered node logs it. For a node added with Web's command, rerun the command on the host: the installer checks the host requirements first and names what to fix ([Installer messages](#installer-messages)).
 
 A node reports only its first failed check, in this order: the Docker daemon or KVM, Docker's limit support, host capacity, then the installed Runtime files. An unreachable Docker daemon therefore hides a missing image. The next heartbeat, about ten seconds after a fix, clears or replaces the code. An offline node keeps its last code, which Web hides until the node reconnects.
 
 | Code | Help tip | Cause | Fix |
 | --- | --- | --- | --- |
-| `docker_unavailable` | Docker unavailable | The Docker socket is unreachable or not accessible, or Docker fails its info or image request | Start Docker and give the node's user access to `/var/run/docker.sock` |
-| `docker_limits_unsupported` | Docker limits unsupported | Docker reports no CPU quota or memory limit support | Use a host whose cgroups enforce CPU and memory limits (cgroup v2) |
+| `provider_unavailable` | Sandbox provider unavailable | The provider's service is unreachable or fails a request, such as a stopped Docker daemon, or a failure without a class | Rerun the node's command, or read a manually registered node's log |
+| `host_unsupported` | Host unsupported | The host lacks a capability the provider requires, such as Docker CPU and memory limits (cgroup v2) or read-write access to `/dev/kvm` | Rerun the node's command, or read a manually registered node's log |
 | `capacity_insufficient` | Host too small | The host has fewer CPUs or less memory than one sandbox | Use a larger host, or change the sandbox size |
-| `runtime_image_unavailable` | Runtime image missing | Docker does not have the pinned Runtime image | A node added with Web's command downloads it again by itself; otherwise load the image from the matching release |
-| `kvm_unavailable` | KVM unavailable | The node can't open `/dev/kvm` for reading and writing | Enable hardware virtualization and give the node's user KVM access, through the `kvm` group |
-| `microsandbox_artifacts_unavailable` | microsandbox components missing | The Runtime or firmware is missing or fails its SHA-256 check, or the helper is missing | A node added with Web's command downloads the missing files by itself; otherwise restore them from the matching release |
+| `runtime_image_unavailable` | Runtime image missing | The provider does not have the pinned Runtime image | A node added with Web's command downloads it again by itself; otherwise load the image from the matching release |
+| `artifacts_unavailable` | Provider files missing | A pinned provider file, such as the microsandbox Runtime, firmware or helper, is missing or fails its SHA-256 check | A node added with Web's command downloads the missing files by itself; otherwise restore them from the matching release |
 | `runtime_download_failed` | Runtime download failed | While preparing a new configuration, the node could not download or verify the Runtime files | Check the node's HTTPS access to the console and the release. The node retries with growing delays, up to 30 minutes apart |
-| `provider_unavailable` | Sandbox provider unavailable | Any other failure | Read the node's log |
 
 A new group membership applies only to a new process. Restart the node service: `sudo systemctl restart oac-node-<installation-id>.service`. A node that is registered but never connects usually can't reach Core at the public URL, or its `/api/v1` WebSocket doesn't pass the reverse proxy.
 
diff --git a/docs/web/console-api-usage.md b/docs/web/console-api-usage.md
index 09df51a49..60c2b623f 100644
--- a/docs/web/console-api-usage.md
+++ b/docs/web/console-api-usage.md
@@ -98,7 +98,7 @@ The list carries each harness's configuration, so the console does not read `GET
 | Deployment | `GET`, `POST`, `PUT /core/v1/sandbox/deployment` | Read the provider, the read-only `core_url` (`OAC_PUBLIC_URL`, shown in the setup review and never sent), reset state, installation ID and specification; a 409 `sandbox_configuration_error` (E2B with a loopback `public_url`) shows the shared client's fixed safe address-configuration message in the setup wizard, with Managed in System leading to System, and leaves nothing to confirm; initialize the deployment with `resources` and the Docker or microsandbox `runtime` release, or with the E2B account and no `resources` (Core adopts the template build's CPU and memory); change its settings with the expected generation. E2B's `metadata.template_build` (status, CPU, memory, disk) shows on System, the Sandbox configuration summary and Sandbox metrics, and sizes each sandbox when `specification.resources` is missing; microsandbox's `suspension` (idle and retention seconds) shows on System and the Nodes summary |
 | E2B discovery | `POST /core/v1/sandbox/providers/e2b/discovery` | The setup wizard lists the templates the entered E2B key can see, then the selected template's ready builds. The key travels only in these request bodies and the deployment write |
 | Reset | `POST`, `DELETE /core/v1/sandbox/deployment/reset` | Explicitly clear hosted resources, or cancel the remaining clear at the observed generation; show Core's remaining and offline projection |
-| Nodes | `GET /core/v1/sandbox/nodes` | Nodes page; fleet on Overview; node capacity on Sandbox metrics. An online node's `diagnostic` (`docker_unavailable`, `docker_limits_unsupported`, `runtime_image_unavailable`, `kvm_unavailable`, `microsandbox_artifacts_unavailable`, `capacity_insufficient`, `provider_unavailable`; any other value reads as `provider_unavailable`) marks it degraded and names the reason and fix in the help tip beside its status on each of these and on the node's page. A node whose `core_url` (the address it enrolled with) differs from the deployment's `core_url` is named on the Nodes page as bound to an old address, to be removed and added again, and its status there and on its page reads Old address instead of its health. **Add node** follows only the node whose `enrollment_id` equals its command's |
+| Nodes | `GET /core/v1/sandbox/nodes` | Nodes page; fleet on Overview; node capacity on Sandbox metrics. An online node's `diagnostic` (a [readiness code](../getting-started/nodes.md#readiness-codes); any other value reads as `provider_unavailable`) marks it degraded and names the reason and fix in the help tip beside its status on each of these and on the node's page. A node whose `core_url` (the address it enrolled with) differs from the deployment's `core_url` is named on the Nodes page as bound to an old address, to be removed and added again, and its status there and on its page reads Old address instead of its health. **Add node** follows only the node whose `enrollment_id` equals its command's |
 | Node detail | `GET /core/v1/sandbox/nodes/{node_id}?range=1h\|6h\|24h` | Sandbox metrics node dialog: the host's CPU busy share and memory from its last heartbeat, and their history over the page's range. **Edit node** reads `host.effective_cpu_cores` and `host.total_memory_bytes` to show the host beside each sandbox's size and at most how many of those fit |
 | Allocations | `GET /core/v1/sandbox/nodes/{node_id}/allocations` | Nodes page; Sandbox metrics. Under microsandbox, a node's page shows from `compute_phase_changed_at` how long each allocation has been in its compute phase and, while suspended, about when Core reclaims it (that time plus the deployment's `suspension.retention_seconds`); a null time shows a dash |
 | Enrollment | `POST /core/v1/sandbox/enrollment-tokens` | **Add node**: the administrator sets the node's sandbox limits (`max_active`; `max_retained` only for microsandbox, equal to `max_active` for Docker) before Core issues a single-use token inside a command that verifies the installer checksum, with the command's `enrollment_id`, which the node it registers reports. The command runs the installer with sudo (a system service) and passes the token on standard input; root runs it directly. No ordinary-user installation or removal entry is exposed, and the log hint always names the system service. The command downloads the installer from the installation's `public_url`. No token is requested until the installation is read, when it cannot be read, when it is `local_only` (or its `public_url` is not an HTTPS origin), or when `/console/config` lists `node_artifacts` without the deployment's provider. The dialog reads both again on opening and when the window regains focus |
diff --git a/docs/zh/getting-started/nodes.md b/docs/zh/getting-started/nodes.md
index ec1e69d0b..871fed81b 100644
--- a/docs/zh/getting-started/nodes.md
+++ b/docs/zh/getting-started/nodes.md
@@ -1,7 +1,7 @@
 ---
 title: "添加和管理节点"
 source: docs/getting-started/nodes.md
-source_hash: f5bec50bf81ebf1d08faaa54432da6a9c6e3ddbf88d93e33244276546c74aaab
+source_hash: 24b505c131f398dc8340d4f32616152a7964a783cd4fc06cfdeb3ccd422448db
 ---
 
 节点是一台 Linux 主机，在沙箱后端为 Docker 或 microsandbox 时，为 Core 托管 Session 运行沙箱。Core 将新 Session 分配给有空余容量的节点；节点创建沙箱，沙箱回连 Core。E2B 不需要节点。应用为自己的 Session 连接的机器是[自托管执行器](self-hosted.md)，而不是节点。
@@ -159,20 +159,18 @@ root 只准备账号、组和服务单元；其他操作（包括 Docker 网络
 - **使用 Web 命令添加的节点**：当前沙箱配置检查失败时，在目标状态显示 **Preparation failed**，帮助提示中给出原因（`GET /core/v1/sandbox/nodes` 的 `rollout.diagnostic`）。**Provider not ready** 旁的提示仅显示 *Sandbox provider unavailable*。
 - **手动注册的节点**：在 **Provider not ready** 旁的帮助提示展示原因（`diagnostic`）。
 
-节点日志包含状态码背后的本地错误。
+每个状态码都是与 Provider 无关的类别；其背后的本地错误留在节点上。手动注册的节点会把它写入日志。对于使用 Web 命令添加的节点，请在主机上重新运行该命令：安装程序会先检查主机要求，并指出需要修复的问题（[安装程序消息](#installer-messages)）。
 
 节点按如下顺序仅报告首个失败检查：Docker 守护进程或 KVM、Docker 限制支持、主机容量、已安装的 Runtime 文件。因此无法访问 Docker 守护进程时，会隐藏镜像缺失问题。修复后约十秒的下一次心跳会清除或替换状态码。离线节点保留最后状态码，Web 在节点重连前隐藏它。
 
 | 状态码 | 帮助提示 | 原因 | 解决方法 |
 | --- | --- | --- | --- |
-| `docker_unavailable` | Docker unavailable | Docker 套接字不可达、无权访问，或 Docker info/镜像请求失败 | 启动 Docker 并赋予节点用户访问 `/var/run/docker.sock` 的权限 |
-| `docker_limits_unsupported` | Docker limits unsupported | Docker 报告不支持 CPU 配额或内存限制 | 使用 cgroups 强制执行 CPU 与内存限制的主机（cgroup v2） |
+| `provider_unavailable` | Sandbox provider unavailable | 提供商的服务不可达或请求失败（例如 Docker 守护进程已停止），或失败没有类别 | 重新运行节点的命令，或阅读手动注册节点的日志 |
+| `host_unsupported` | Host unsupported | 主机缺少提供商所需的能力，例如 Docker 的 CPU 与内存限制（cgroup v2）或对 `/dev/kvm` 的读写权限 | 重新运行节点的命令，或阅读手动注册节点的日志 |
 | `capacity_insufficient` | Host too small | 主机 CPU 或内存不足以运行一个沙箱 | 使用更大主机或修改沙箱规格 |
-| `runtime_image_unavailable` | Runtime image missing | Docker 中没有固定版本的 Runtime 镜像 | Web 命令添加的节点自动重新下载；其他节点加载匹配发行版镜像 |
-| `kvm_unavailable` | KVM unavailable | 节点无法读写 `/dev/kvm` | 启用硬件虚拟化，通过 `kvm` 组赋予节点用户 KVM 访问权限 |
-| `microsandbox_artifacts_unavailable` | microsandbox components missing | Runtime 或固件缺失、SHA-256 检查失败，或辅助程序缺失 | Web 命令添加的节点自动下载缺失文件；其他节点从匹配发行版恢复 |
+| `runtime_image_unavailable` | Runtime image missing | 提供商中没有固定版本的 Runtime 镜像 | Web 命令添加的节点自动重新下载；其他节点加载匹配发行版镜像 |
+| `artifacts_unavailable` | Provider files missing | 固定版本的提供商文件（例如 microsandbox 的 Runtime、固件或辅助程序）缺失或 SHA-256 检查失败 | Web 命令添加的节点自动下载缺失文件；其他节点从匹配发行版恢复 |
 | `runtime_download_failed` | Runtime download failed | 准备新配置时无法下载或验证 Runtime 文件 | 检查节点到控制台和发行下载地址的 HTTPS 访问。节点以递增间隔重试，最长间隔 30 分钟 |
-| `provider_unavailable` | Sandbox provider unavailable | 其他失败 | 阅读节点日志 |
 
 新用户组成员关系仅对新进程生效。重启节点服务：`sudo systemctl restart oac-node-<installation-id>.service`。已注册但从未连接的节点通常无法通过公开 URL 访问 Core，或 `/api/v1` WebSocket 无法通过反向代理。
 
diff --git a/docs/zh/web/console-api-usage.md b/docs/zh/web/console-api-usage.md
index 1b4890fd5..02d8896f6 100644
--- a/docs/zh/web/console-api-usage.md
+++ b/docs/zh/web/console-api-usage.md
@@ -1,7 +1,7 @@
 ---
 title: "控制台 API 使用"
 source: docs/web/console-api-usage.md
-source_hash: 7318d1d082d19cc1681a2bd91556c4dc7e16b211ae7cd3936b99d63c26949900
+source_hash: 071c5b80262cdc89ed3517cf6a63d1c657ee8d0f98133630bad0850595003a2c
 ---
 
 本页列出各控制台页面读取和写入的 Core 路由，以及控制台如何限定读取范围。[administrator API contract](../../../contracts/agents-api/zh/admin-api.md) 定义了路由、响应结构、分页和审计记录；[API namespaces and credentials](../api/index.md) 定义了本文使用的术语。
@@ -100,7 +100,7 @@ source_hash: 7318d1d082d19cc1681a2bd91556c4dc7e16b211ae7cd3936b99d63c26949900
 | 部署 | `GET`、`POST`、`PUT /core/v1/sandbox/deployment` | 读取提供商、只读 `core_url`（即 `OAC_PUBLIC_URL`，会显示在设置审核中且绝不发送）、重置状态、安装 ID 和规范；409 `sandbox_configuration_error`（E2B 搭配回环地址形式的 `public_url`）会在设置向导中显示共享客户端固定的安全地址配置消息，并通过 Managed in System 前往 System，且无需确认；使用 `resources` 以及 Docker 或 microsandbox 的 `runtime` release 初始化部署，或者使用 E2B 账户且不提供 `resources`（Core 采用模板构建的 CPU 和内存）；使用预期的 generation 更改设置。E2B 的 `metadata.template_build`（状态、CPU、内存、磁盘）会显示在 System、Sandbox 配置摘要和 Sandbox metrics 中；当缺少 `specification.resources` 时，它还会确定每个 Sandbox 的大小；microsandbox 的 `suspension`（空闲和保留秒数）会显示在 System 和 Nodes 摘要中 |
 | E2B 发现 | `POST /core/v1/sandbox/providers/e2b/discovery` | 设置向导先列出输入的 E2B 密钥可见的模板，再列出所选模板的可用构建。该密钥只会通过这些请求体和部署写入请求传输 |
 | 重置 | `POST`、`DELETE /core/v1/sandbox/deployment/reset` | 显式清除托管资源，或在观测到的 generation 处取消剩余清除；显示 Core 的剩余资源和离线预测 |
-| Nodes | `GET /core/v1/sandbox/nodes` | Nodes 页面；Overview 上的机群；Sandbox metrics 中的节点容量。在线节点的 `diagnostic`（`docker_unavailable`、`docker_limits_unsupported`、`runtime_image_unavailable`、`kvm_unavailable`、`microsandbox_artifacts_unavailable`、`capacity_insufficient`、`provider_unavailable`；任何其他值均读取为 `provider_unavailable`）会将其标记为降级，并在上述每个页面及节点页面中，紧邻状态的帮助提示里说明原因和修复方法。如果节点的 `core_url`（其注册时使用的地址）与部署的 `core_url` 不同，Nodes 页面会将其标记为绑定到旧地址，需要移除后重新添加；此时它在该页面和节点页面中的状态会显示 Old address，而不是健康状态。**Add node** 仅跟踪 `enrollment_id` 与其命令所含 `enrollment_id` 相等的节点 |
+| Nodes | `GET /core/v1/sandbox/nodes` | Nodes 页面；Overview 上的机群；Sandbox metrics 中的节点容量。在线节点的 `diagnostic`（一个[就绪状态码](../getting-started/nodes.md#readiness-codes)；任何其他值均读取为 `provider_unavailable`）会将其标记为降级，并在上述每个页面及节点页面中，紧邻状态的帮助提示里说明原因和修复方法。如果节点的 `core_url`（其注册时使用的地址）与部署的 `core_url` 不同，Nodes 页面会将其标记为绑定到旧地址，需要移除后重新添加；此时它在该页面和节点页面中的状态会显示 Old address，而不是健康状态。**Add node** 仅跟踪 `enrollment_id` 与其命令所含 `enrollment_id` 相等的节点 |
 | 节点详情 | `GET /core/v1/sandbox/nodes/{node_id}?range=1h\|6h\|24h` | Sandbox metrics 节点对话框：主机自最近一次心跳以来的 CPU 忙碌占比和内存使用量，以及页面所选范围内二者的历史记录。**Edit node** 读取 `host.effective_cpu_cores` 和 `host.total_memory_bytes`，用于在每个 Sandbox 大小旁显示主机容量，以及最多可容纳多少个该大小的 Sandbox |
 | 分配 | `GET /core/v1/sandbox/nodes/{node_id}/allocations` | Nodes 页面；Sandbox metrics。在 microsandbox 下，节点页面根据 `compute_phase_changed_at` 显示每个分配处于计算阶段的时间，并在分配暂停时估算 Core 回收它的时间（该时间加上部署的 `suspension.retention_seconds`）；时间为 null 时显示短横线 |
 | 注册 | `POST /core/v1/sandbox/enrollment-tokens` | **Add node**：管理员先设置节点的 Sandbox 限制（`max_active`；`max_retained` 仅适用于 microsandbox，在 Docker 下等于 `max_active`），然后 Core 才会把一次性令牌放入命令中；该命令会验证安装程序校验和，并包含命令的 `enrollment_id`，节点注册时会报告此 ID。命令使用 sudo 运行安装程序（作为系统服务），并通过标准输入传递令牌；以 root 运行时则直接执行。界面不提供普通用户安装或移除入口，日志提示始终指明系统服务。命令从安装的 `public_url` 下载安装程序。只有成功读取安装信息后才会请求令牌；如果安装信息无法读取、安装为 `local_only`（或其 `public_url` 不是 HTTPS 来源），或者 `/console/config` 列出的 `node_artifacts` 不包含部署的提供商，则不会请求令牌。对话框在打开时和窗口重新获得焦点时，会再次读取这两项信息 |
diff --git a/packages/agents-client/src/sandbox-client.test.ts b/packages/agents-client/src/sandbox-client.test.ts
index 7567263b4..9bea39776 100644
--- a/packages/agents-client/src/sandbox-client.test.ts
+++ b/packages/agents-client/src/sandbox-client.test.ts
@@ -18,7 +18,7 @@ const node = {
 };
 /** Never heard from, enrolled before Core recorded enrollment IDs, with a fixed readiness code. */
 const unready = {
-  ...node, rollout: { state: "unknown", ready_generation: 1 }, id: "7f6e5d4c-3b2a-4190-8f7e-6d5c4b3a2918", online: false, provider_ready: false, diagnostic: "kvm_unavailable",
+  ...node, rollout: { state: "unknown", ready_generation: 1 }, id: "7f6e5d4c-3b2a-4190-8f7e-6d5c4b3a2918", online: false, provider_ready: false, diagnostic: "host_unsupported",
   cpu_count: null, available_memory_bytes: null, available_disk_bytes: null, running: 0, last_seen_at: null, active: 0, retained: 0, enrollment_id: null,
 };
 const detail = {
@@ -156,8 +156,8 @@ describe("Core sandbox credential boundaries", () => {
   it("returns the node's fixed readiness diagnostic unchanged and reads an unknown code as provider_unavailable", async () => {
     const fetch = vi.fn<typeof globalThis.fetch>().mockResolvedValue(response({ data: [unready, { ...unready, diagnostic: "future_code" }, node] }));
     const { data } = await new SandboxAdminClient({ baseUrl: "/core/v1/sandbox", fetch }).listNodes();
-    expect(data.map((entry) => entry.diagnostic)).toEqual(["kvm_unavailable", "provider_unavailable", undefined]);
-    expectTypeOf<SandboxNode["diagnostic"]>().toEqualTypeOf<undefined | "" | "provider_unavailable" | "docker_unavailable" | "docker_limits_unsupported" | "runtime_download_failed" | "runtime_image_unavailable" | "kvm_unavailable" | "microsandbox_artifacts_unavailable" | "capacity_insufficient">();
+    expect(data.map((entry) => entry.diagnostic)).toEqual(["host_unsupported", "provider_unavailable", undefined]);
+    expectTypeOf<SandboxNode["diagnostic"]>().toEqualTypeOf<undefined | "" | "provider_unavailable" | "host_unsupported" | "artifacts_unavailable" | "runtime_download_failed" | "runtime_image_unavailable" | "capacity_insufficient">();
   });
   it("requires each node's enrollment ID: a string, or null for nodes enrolled before Core recorded it", async () => {
     const fetch = vi.fn<typeof globalThis.fetch>().mockResolvedValue(response({ data: [node, unready] }));
diff --git a/packages/agents-client/src/sandbox-client.ts b/packages/agents-client/src/sandbox-client.ts
index 81735f221..ef1cafcb8 100644
--- a/packages/agents-client/src/sandbox-client.ts
+++ b/packages/agents-client/src/sandbox-client.ts
@@ -8,12 +8,10 @@ export type SandboxDiagnostic = "" | "node_unavailable" | "resource_missing" | "
 /** Checked against Core's shared node-diagnostics.json fixture. */
 export const sandboxNodeDiagnostics = [
   "provider_unavailable",
-  "docker_unavailable",
-  "docker_limits_unsupported",
+  "host_unsupported",
+  "artifacts_unavailable",
   "runtime_download_failed",
   "runtime_image_unavailable",
-  "kvm_unavailable",
-  "microsandbox_artifacts_unavailable",
   "capacity_insufficient",
 ] as const;
 /** 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. */
diff --git a/services/core/internal/deployment/node.go b/services/core/internal/deployment/node.go
index 2509363da..485d464e8 100644
--- a/services/core/internal/deployment/node.go
+++ b/services/core/internal/deployment/node.go
@@ -46,7 +46,7 @@ type Enrollment struct {
 type NodeHealth struct {
 	Host *NodeHost `json:"-"`
 	// Fixed reason for the last reported unreadiness; absent while the provider is ready. Clients treat an unknown value as provider_unavailable.
-	Diagnostic           string `json:"diagnostic,omitempty" enums:"provider_unavailable,docker_unavailable,docker_limits_unsupported,runtime_download_failed,runtime_image_unavailable,kvm_unavailable,microsandbox_artifacts_unavailable,capacity_insufficient"`
+	Diagnostic           string `json:"diagnostic,omitempty" enums:"provider_unavailable,host_unsupported,artifacts_unavailable,runtime_download_failed,runtime_image_unavailable,capacity_insufficient"`
 	ProviderReady        bool   `json:"provider_ready"`
 	CPUCount             *int64 `json:"cpu_count"`
 	AvailableMemoryBytes *int64 `json:"available_memory_bytes"`
diff --git a/services/core/internal/deployment/rules_test.go b/services/core/internal/deployment/rules_test.go
index 1c4819293..84be8e066 100644
--- a/services/core/internal/deployment/rules_test.go
+++ b/services/core/internal/deployment/rules_test.go
@@ -263,7 +263,7 @@ func TestNodeRollout(t *testing.T) {
 		{"failed without diagnostic", NodeRecord{Online: true, ProtocolVersion: 2, TargetState: "failed", ReadyGeneration: &ready}, "failed", ""},
 		{"ready ignores a diagnostic", NodeRecord{Online: true, ProtocolVersion: 2, TargetState: "ready", TargetDiagnostic: "boom", ReadyGeneration: &ready}, "ready", ""},
 		{"unknown target state", NodeRecord{Online: true, ProtocolVersion: 2, TargetState: "other", ReadyGeneration: &ready}, "unknown", ""},
-		{"protocol 1 failed on the target", NodeRecord{Online: true, ProtocolVersion: 1, DeploymentGeneration: 2, TargetGeneration: 2, TargetState: "failed", TargetDiagnostic: "kvm_unavailable", ReadyGeneration: &ready}, "failed", "kvm_unavailable"},
+		{"protocol 1 failed on the target", NodeRecord{Online: true, ProtocolVersion: 1, DeploymentGeneration: 2, TargetGeneration: 2, TargetState: "failed", TargetDiagnostic: "host_unsupported", ReadyGeneration: &ready}, "failed", "host_unsupported"},
 		{"protocol 1 without a target state", NodeRecord{Online: true, ProtocolVersion: 1, DeploymentGeneration: 2, TargetGeneration: 2, ReadyGeneration: &ready}, "unknown", ""},
 	} {
 		got := nodeRollout(c.n)
diff --git a/services/core/internal/deployment/view.go b/services/core/internal/deployment/view.go
index 228fc8e7e..4c6beb6bc 100644
--- a/services/core/internal/deployment/view.go
+++ b/services/core/internal/deployment/view.go
@@ -46,7 +46,7 @@ type NodeRollout struct {
 	State string `json:"state" enums:"ready,preparing,failed,update_required,unknown"`
 	// Durable serving-generation pin; online and provider_ready still gate placement.
 	ReadyGeneration *uint64 `json:"ready_generation" extensions:"x-nullable"`
-	Diagnostic      string  `json:"diagnostic,omitempty" enums:"provider_unavailable,docker_unavailable,docker_limits_unsupported,runtime_download_failed,runtime_image_unavailable,kvm_unavailable,microsandbox_artifacts_unavailable,capacity_insufficient"`
+	Diagnostic      string  `json:"diagnostic,omitempty" enums:"provider_unavailable,host_unsupported,artifacts_unavailable,runtime_download_failed,runtime_image_unavailable,capacity_insufficient"`
 }
 
 type RolloutNodes struct {
diff --git a/services/core/internal/persistence/postgres/deploymentpg/nodes_test.go b/services/core/internal/persistence/postgres/deploymentpg/nodes_test.go
index a06cb97f0..a3c75e268 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/nodes_test.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/nodes_test.go
@@ -419,3 +419,45 @@ func TestNodeGenerationDowngradePreservesServingProtocol(t *testing.T) {
 		})
 	}
 }
+
+// Stored vendor codes from before the readiness classes, including an offline
+// node's last report, are rewritten to their class.
+func TestNodeReadinessClassMigrationRewritesStoredCodes(t *testing.T) {
+	f := newFixture(t)
+	changes, _ := f.execution(t)
+	_, view := f.initialize(t, changes, sandbox.Selection{Provider: "docker", DeploymentSpec: testSpecification("docker")})
+	node := f.enroll(t, view, deployment.Capacity{MaxActive: 1, MaxRetained: 1})
+	connection := f.connect(t, node.NodeID)
+	failed := []sandbox.GenerationStatus{{Generation: view.Generation, SpecificationDigest: view.SpecificationDigest, State: "failed", Diagnostic: "provider_unavailable"}}
+	if err := f.service.HeartbeatGenerations(t.Context(), node.NodeID, connection, view.OwnerEpoch, deployment.NodeHealth{Diagnostic: "provider_unavailable"}, failed); err != nil {
+		t.Fatal(err)
+	}
+	db := sql.OpenDB(stdlib.GetConnector(*f.pool.Config().ConnConfig))
+	defer db.Close()
+	migration, err := goose.NewProvider(goose.DialectPostgres, db, os.DirFS("../../../../migrations"), goose.WithTableName("agents_api_schema_version"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	var version int64
+	for _, source := range migration.ListSources() {
+		if strings.HasSuffix(source.Path, "_node_readiness_classes.sql") {
+			version = source.Version
+		}
+	}
+	if _, err := migration.DownTo(t.Context(), version-1); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := f.pool.Exec(t.Context(), `UPDATE runtime_nodes SET health=jsonb_set(health,'{diagnostic}','"kvm_unavailable"') WHERE id=$1`, node.NodeID); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := f.pool.Exec(t.Context(), "UPDATE runtime_node_generation_status SET diagnostic='microsandbox_artifacts_unavailable' WHERE node_id=$1", node.NodeID); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := migration.Up(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	detail, err := f.service.NodeDetail(t.Context(), node.NodeID, "1h")
+	if err != nil || detail.Diagnostic != "host_unsupported" || detail.Rollout.State != "failed" || detail.Rollout.Diagnostic != "artifacts_unavailable" {
+		t.Fatal(detail.Diagnostic, detail.Rollout, err)
+	}
+}
diff --git a/services/core/internal/persistence/postgres/deploymentpg/presence_test.go b/services/core/internal/persistence/postgres/deploymentpg/presence_test.go
index 7787174dd..7c8fd3905 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/presence_test.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/presence_test.go
@@ -270,13 +270,13 @@ func TestNodeDiagnosticReachesListAndDetail(t *testing.T) {
 		reported, want string
 		ready          bool
 	}{
-		{reported: "docker_unavailable", want: "docker_unavailable"},
+		{reported: "host_unsupported", want: "host_unsupported"},
 		{reported: "capacity_insufficient", want: "capacity_insufficient"},
 		// Older nodes send provider_unavailable or nothing; unknown text is never stored.
 		{reported: "provider_unavailable", want: "provider_unavailable"},
 		{reported: "", want: ""},
 		{reported: "dial unix /var/run/docker.sock: permission denied", want: "provider_unavailable"},
-		{reported: "kvm_unavailable", want: "", ready: true},
+		{reported: "artifacts_unavailable", want: "", ready: true},
 	} {
 		if err := f.service.Heartbeat(t.Context(), node.NodeID, connection, epoch, deployment.NodeHealth{ProviderReady: tc.ready, Diagnostic: tc.reported}); err != nil {
 			t.Fatal(tc.reported, err)
diff --git a/services/core/internal/sandbox/node/generations.go b/services/core/internal/sandbox/node/generations.go
index 047bbe4e1..42bd03f8c 100644
--- a/services/core/internal/sandbox/node/generations.go
+++ b/services/core/internal/sandbox/node/generations.go
@@ -369,7 +369,7 @@ func (m *GenerationManager) probeLoop() {
 			if err != nil {
 				g.state = "failed"
 				g.diagnostic = sandbox.NodeDiagnostic(err)
-				if errors.Is(err, sandbox.ErrRuntimeImageUnavailable) || errors.Is(err, sandbox.ErrMicrosandboxArtifactsUnavailable) {
+				if errors.Is(err, sandbox.ErrRuntimeImageUnavailable) || errors.Is(err, sandbox.ErrArtifactsUnavailable) {
 					g.repairing = true
 				}
 			}
diff --git a/services/core/internal/sandbox/node/generations_test.go b/services/core/internal/sandbox/node/generations_test.go
index 8831d5321..bce4d88cd 100644
--- a/services/core/internal/sandbox/node/generations_test.go
+++ b/services/core/internal/sandbox/node/generations_test.go
@@ -364,7 +364,7 @@ func TestInterruptedCollectionNeverPreparesOrServesAfterRestart(t *testing.T) {
 }
 
 func TestPreparationDiagnosticPreservesTypedCause(t *testing.T) {
-	for _, cause := range []error{sandbox.ErrRuntimeDownloadFailed, sandbox.ErrDockerUnavailable, sandbox.ErrKVMUnavailable, sandbox.ErrOwnership, context.Canceled, errors.New("raw secret provider text")} {
+	for _, cause := range []error{sandbox.ErrRuntimeDownloadFailed, sandbox.ErrProviderUnavailable, sandbox.ErrHostUnsupported, sandbox.ErrOwnership, context.Canceled, errors.New("raw secret provider text")} {
 		t.Run(sandbox.NodeDiagnostic(cause)+cause.Error(), func(t *testing.T) {
 			m, err := NewGenerationManager(t.Context(), GenerationManagerOptions{
 				Prepare: func(context.Context, uint64, string) (GenerationProvider, error) { return GenerationProvider{}, cause },
diff --git a/services/core/internal/sandbox/node/node_test.go b/services/core/internal/sandbox/node/node_test.go
index 9aca8cd5a..946470389 100644
--- a/services/core/internal/sandbox/node/node_test.go
+++ b/services/core/internal/sandbox/node/node_test.go
@@ -302,7 +302,7 @@ func TestHealthSendsOnlyFixedDiagnosticCode(t *testing.T) {
 		err  error
 		want string
 	}{
-		{fmt.Errorf("%w: dial unix /home/operator/private/docker.sock", sandbox.ErrDockerUnavailable), "docker_unavailable"},
+		{fmt.Errorf("%w: open /home/operator/private/kvm", sandbox.ErrHostUnsupported), "host_unsupported"},
 		{errors.New("open /home/operator/private/runtime: permission denied"), "provider_unavailable"},
 		{nil, ""},
 	} {
diff --git a/services/core/internal/sandbox/node_diagnostic.go b/services/core/internal/sandbox/node_diagnostic.go
index 00b1ed898..b13fbe34b 100644
--- a/services/core/internal/sandbox/node_diagnostic.go
+++ b/services/core/internal/sandbox/node_diagnostic.go
@@ -2,38 +2,42 @@ package sandbox
 
 import "errors"
 
-// Node readiness failures. A node probe returns or wraps the one matching its
-// first failed check. Only the fixed code crosses the node transport; the error
-// text and any wrapped detail, such as host paths or daemon messages, stay local.
+// Node readiness classes. A node probe returns or wraps the class of its first
+// failed check and keeps the Provider's detail, such as host paths or daemon
+// messages, in the local error text. Only the class code crosses the node
+// transport.
 var (
-	ErrRuntimeDownloadFailed            = errors.New("Runtime preparation failed")
-	ErrDockerUnavailable                = errors.New("Docker daemon is unavailable")
-	ErrDockerLimitsUnsupported          = errors.New("Docker host does not enforce CPU and memory limits")
-	ErrRuntimeImageUnavailable          = errors.New("pinned Runtime image is unavailable")
-	ErrKVMUnavailable                   = errors.New("KVM is unavailable to sandbox node")
-	ErrMicrosandboxArtifactsUnavailable = errors.New("pinned microsandbox artifacts are unavailable")
-	ErrCapacityInsufficient             = errors.New("node cannot provide one sandbox of the deployment specification")
+	// The Provider's native service is unreachable or does not answer.
+	ErrProviderUnavailable = errors.New("sandbox provider unavailable")
+	// The host lacks a capability the Provider requires.
+	ErrHostUnsupported = errors.New("host lacks a capability the sandbox provider requires")
+	// A pinned native artifact is missing or fails its integrity check.
+	ErrArtifactsUnavailable = errors.New("pinned provider artifacts are unavailable")
+	// The exact Runtime artifacts could not be transferred or verified.
+	ErrRuntimeDownloadFailed = errors.New("Runtime preparation failed")
+	// The pinned Runtime image is not available to the Provider.
+	ErrRuntimeImageUnavailable = errors.New("pinned Runtime image is unavailable")
+	// The host cannot hold one sandbox of the deployment specification.
+	ErrCapacityInsufficient = errors.New("node cannot provide one sandbox of the deployment specification")
 )
 
-// NodeProviderUnavailable reports every readiness failure without a fixed cause.
+// NodeProviderUnavailable also reports every readiness failure without a class.
 const NodeProviderUnavailable = "provider_unavailable"
-const NodeRuntimeDownloadFailed = "runtime_download_failed"
 
 var nodeDiagnostics = []struct {
 	err  error
 	code string
 }{
-	{ErrRuntimeDownloadFailed, NodeRuntimeDownloadFailed},
-	{ErrDockerUnavailable, "docker_unavailable"},
-	{ErrDockerLimitsUnsupported, "docker_limits_unsupported"},
+	{ErrProviderUnavailable, NodeProviderUnavailable},
+	{ErrHostUnsupported, "host_unsupported"},
+	{ErrArtifactsUnavailable, "artifacts_unavailable"},
+	{ErrRuntimeDownloadFailed, "runtime_download_failed"},
 	{ErrRuntimeImageUnavailable, "runtime_image_unavailable"},
-	{ErrKVMUnavailable, "kvm_unavailable"},
-	{ErrMicrosandboxArtifactsUnavailable, "microsandbox_artifacts_unavailable"},
 	{ErrCapacityInsufficient, "capacity_insufficient"},
 }
 
-// NodeDiagnostic maps a readiness probe result to its fixed code: empty when
-// ready and provider_unavailable when no classified cause is wrapped.
+// NodeDiagnostic maps a readiness probe result to its class code: empty when
+// ready and provider_unavailable when no class is wrapped.
 func NodeDiagnostic(err error) string {
 	if err == nil {
 		return ""
@@ -49,7 +53,7 @@ func NodeDiagnostic(err error) string {
 // NormalizeNodeDiagnostic keeps an empty or known code. Any other reported value
 // becomes provider_unavailable, so Core never stores node-supplied text.
 func NormalizeNodeDiagnostic(code string) string {
-	if code == "" || code == NodeProviderUnavailable {
+	if code == "" {
 		return code
 	}
 	for _, d := range nodeDiagnostics {
diff --git a/services/core/internal/sandbox/node_diagnostic_test.go b/services/core/internal/sandbox/node_diagnostic_test.go
index e7a9602eb..84b199cd6 100644
--- a/services/core/internal/sandbox/node_diagnostic_test.go
+++ b/services/core/internal/sandbox/node_diagnostic_test.go
@@ -18,7 +18,7 @@ func TestNodeDiagnosticContract(t *testing.T) {
 	if err := json.Unmarshal(raw, &fixture); err != nil {
 		t.Fatal(err)
 	}
-	codes := []string{NodeProviderUnavailable}
+	var codes []string
 	for _, diagnostic := range nodeDiagnostics {
 		codes = append(codes, diagnostic.code)
 		if got := NodeDiagnostic(fmt.Errorf("private probe detail: %w", diagnostic.err)); got != diagnostic.code {
diff --git a/services/core/internal/sandbox/providers/generation_probe_test.go b/services/core/internal/sandbox/providers/generation_probe_test.go
index 83e9dfe28..0c0004e09 100644
--- a/services/core/internal/sandbox/providers/generation_probe_test.go
+++ b/services/core/internal/sandbox/providers/generation_probe_test.go
@@ -73,7 +73,7 @@ cat "$MSB_HOME/output"
 }
 
 func TestMicrosandboxGenerationProbeRetainsEarlierFailures(t *testing.T) {
-	for _, failure := range []error{context.Canceled, sandbox.ErrKVMUnavailable, sandbox.ErrCapacityInsufficient, sandbox.ErrMicrosandboxArtifactsUnavailable, errors.New("microsandbox state directory is unavailable")} {
+	for _, failure := range []error{context.Canceled, sandbox.ErrHostUnsupported, sandbox.ErrCapacityInsufficient, sandbox.ErrArtifactsUnavailable, errors.New("microsandbox state directory is unavailable")} {
 		probe := microsandboxGenerationProbe(Microsandbox{RuntimePath: "/missing"}, func(context.Context) error { return failure })
 		if got := probe(t.Context()); got != failure {
 			t.Fatalf("earlier failure changed: got %v, want %v", got, failure)
diff --git a/services/core/internal/sandbox/providers/probe.go b/services/core/internal/sandbox/providers/probe.go
index 4ead40c4b..c7e34316a 100644
--- a/services/core/internal/sandbox/providers/probe.go
+++ b/services/core/internal/sandbox/providers/probe.go
@@ -19,11 +19,12 @@ import (
 	"github.com/moby/moby/client"
 )
 
-// Probes report the first failed check. Precedence runs from the provider
-// platform (Docker daemon or KVM), through Docker limit support and host
-// capacity for one sandbox of the deployment specification, to the installed
-// Runtime content (image or microsandbox artifacts). Unclassified failures stay
-// provider_unavailable. The returned text is local; only its code is reported.
+// Probes report the first failed check as its readiness class. Precedence runs
+// from the provider platform (Docker daemon or KVM), through Docker limit
+// support and host capacity for one sandbox of the deployment specification, to
+// the installed Runtime content (image or microsandbox artifacts). Unclassified
+// failures stay provider_unavailable. The returned text is local; only its class
+// is reported.
 
 // kvmDevice is replaceable only by tests.
 var kvmDevice = "/dev/kvm"
@@ -31,14 +32,14 @@ var kvmDevice = "/dev/kvm"
 func dockerProbe(c *client.Client, image string, resources sandbox.Resources) func(context.Context) error {
 	return func(ctx context.Context) error {
 		if _, err := c.Ping(ctx, client.PingOptions{}); err != nil {
-			return sandbox.ErrDockerUnavailable
+			return fmt.Errorf("%w: Docker daemon is unreachable", sandbox.ErrProviderUnavailable)
 		}
 		host, err := c.Info(ctx, client.InfoOptions{})
 		if err != nil {
-			return fmt.Errorf("%w: cannot inspect Docker host resource support", sandbox.ErrDockerUnavailable)
+			return fmt.Errorf("%w: cannot inspect Docker host resource support", sandbox.ErrProviderUnavailable)
 		}
 		if !host.Info.MemoryLimit || !host.Info.CPUCfsQuota {
-			return sandbox.ErrDockerLimitsUnsupported
+			return fmt.Errorf("%w: Docker does not enforce CPU and memory limits", sandbox.ErrHostUnsupported)
 		}
 		if host.Info.MemTotal <= 0 {
 			return errors.New("Docker host memory capacity is unavailable")
@@ -50,7 +51,7 @@ func dockerProbe(c *client.Client, image string, resources sandbox.Resources) fu
 			return sandbox.ErrRuntimeImageUnavailable
 		} else if err != nil {
 			// The daemon did not answer; the image may still be present.
-			return fmt.Errorf("%w: cannot inspect the pinned Runtime image", sandbox.ErrDockerUnavailable)
+			return fmt.Errorf("%w: cannot inspect the pinned Runtime image", sandbox.ErrProviderUnavailable)
 		}
 		return nil
 	}
@@ -68,11 +69,11 @@ func microsandboxProbe(entry Microsandbox, resources sandbox.Resources) func(con
 			return err
 		}
 		if runtime.GOOS != "linux" {
-			return fmt.Errorf("%w: microsandbox requires a Linux KVM node", sandbox.ErrKVMUnavailable)
+			return fmt.Errorf("%w: microsandbox requires a Linux KVM node", sandbox.ErrHostUnsupported)
 		}
 		kvm, err := os.OpenFile(kvmDevice, os.O_RDWR, 0)
 		if err != nil {
-			return sandbox.ErrKVMUnavailable
+			return fmt.Errorf("%w: KVM is unavailable to sandbox node", sandbox.ErrHostUnsupported)
 		}
 		_ = kvm.Close()
 		if err := hostCapacity(resources); err != nil {
@@ -89,7 +90,7 @@ func microsandboxProbe(entry Microsandbox, resources sandbox.Resources) func(con
 		integrity.Unlock()
 		helper, err := os.Stat(entry.HelperPath)
 		if err != nil || !helper.Mode().IsRegular() || helper.Mode().Perm()&0111 == 0 {
-			return fmt.Errorf("%w: microsandbox helper is unavailable", sandbox.ErrMicrosandboxArtifactsUnavailable)
+			return fmt.Errorf("%w: microsandbox helper is unavailable", sandbox.ErrArtifactsUnavailable)
 		}
 		home, err := os.Lstat(entry.RuntimeHome)
 		if err != nil || !home.IsDir() || home.Mode().Perm() != 0700 {
@@ -103,13 +104,13 @@ func verifyMicrosandboxArtifacts(entry Microsandbox) error {
 	for _, artifact := range []struct{ path, hash string }{{entry.RuntimePath, entry.RuntimeSHA256}, {entry.FirmwarePath, entry.FirmwareSHA256}} {
 		f, err := os.Open(artifact.path)
 		if err != nil {
-			return sandbox.ErrMicrosandboxArtifactsUnavailable
+			return fmt.Errorf("%w: microsandbox Runtime or firmware is missing", sandbox.ErrArtifactsUnavailable)
 		}
 		h := sha256.New()
 		_, err = io.Copy(h, f)
 		_ = f.Close()
 		if err != nil || hex.EncodeToString(h.Sum(nil)) != artifact.hash {
-			return fmt.Errorf("%w: artifact integrity check failed", sandbox.ErrMicrosandboxArtifactsUnavailable)
+			return fmt.Errorf("%w: microsandbox artifact integrity check failed", sandbox.ErrArtifactsUnavailable)
 		}
 	}
 	return nil
diff --git a/services/core/internal/sandbox/providers/probe_test.go b/services/core/internal/sandbox/providers/probe_test.go
index e8c25f02e..b258aaf39 100644
--- a/services/core/internal/sandbox/providers/probe_test.go
+++ b/services/core/internal/sandbox/providers/probe_test.go
@@ -120,9 +120,9 @@ func TestMicrosandboxProbeDiagnostics(t *testing.T) {
 		want      string
 	}{
 		// KVM is reported before capacity and missing artifacts.
-		{name: "kvm", resources: sandbox.Resources{CPUs: 255, MemoryMiB: 1048576}, want: "kvm_unavailable"},
+		{name: "kvm", resources: sandbox.Resources{CPUs: 255, MemoryMiB: 1048576}, want: "host_unsupported"},
 		{name: "capacity", kvm: true, resources: sandbox.Resources{CPUs: 255, MemoryMiB: 1048576}, want: "capacity_insufficient"},
-		{name: "artifacts", kvm: true, resources: smallSandbox, want: "microsandbox_artifacts_unavailable"},
+		{name: "artifacts", kvm: true, resources: smallSandbox, want: "artifacts_unavailable"},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			useKVM(t, tc.kvm)
@@ -143,13 +143,13 @@ func TestDockerProbeDiagnostics(t *testing.T) {
 		want                   string
 		unreachable, infoFails bool
 	}{
-		{name: "unreachable", unreachable: true, want: "docker_unavailable"},
-		{name: "info", infoFails: true, want: "docker_unavailable"},
+		{name: "unreachable", unreachable: true, want: "provider_unavailable"},
+		{name: "info", infoFails: true, want: "provider_unavailable"},
 		// The pinned image is also missing below; earlier checks take precedence.
-		{name: "limits", cpus: 8, imageStatus: 404, want: "docker_limits_unsupported"},
+		{name: "limits", cpus: 8, imageStatus: 404, want: "host_unsupported"},
 		{name: "capacity", limits: true, cpus: 1, imageStatus: 404, want: "capacity_insufficient"},
 		{name: "image", limits: true, cpus: 8, imageStatus: 404, want: "runtime_image_unavailable"},
-		{name: "image_inspect_fails", limits: true, cpus: 8, imageStatus: 500, want: "docker_unavailable"},
+		{name: "image_inspect_fails", limits: true, cpus: 8, imageStatus: 500, want: "provider_unavailable"},
 		{name: "ready", limits: true, cpus: 8, imageStatus: 200},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
@@ -201,7 +201,7 @@ func TestMicrosandboxProbeRecoversRepairedArtifacts(t *testing.T) {
 		t.Fatal(err)
 	}
 	probe := microsandboxProbe(Microsandbox{HelperPath: artifact, RuntimePath: artifact, FirmwarePath: artifact, RuntimeSHA256: hex.EncodeToString(digest[:]), FirmwareSHA256: hex.EncodeToString(digest[:]), RuntimeHome: home}, smallSandbox)
-	if got := sandbox.NodeDiagnostic(probe(t.Context())); got != "microsandbox_artifacts_unavailable" {
+	if got := sandbox.NodeDiagnostic(probe(t.Context())); got != "artifacts_unavailable" {
 		t.Fatalf("missing artifact diagnostic = %q", got)
 	}
 	if err := os.WriteFile(artifact, content, 0700); err != nil {
diff --git a/services/core/internal/sandbox/testdata/node-diagnostics.json b/services/core/internal/sandbox/testdata/node-diagnostics.json
index 109529c5f..4c885eec2 100644
--- a/services/core/internal/sandbox/testdata/node-diagnostics.json
+++ b/services/core/internal/sandbox/testdata/node-diagnostics.json
@@ -1,10 +1,8 @@
 [
   "provider_unavailable",
-  "docker_unavailable",
-  "docker_limits_unsupported",
+  "host_unsupported",
+  "artifacts_unavailable",
   "runtime_download_failed",
   "runtime_image_unavailable",
-  "kvm_unavailable",
-  "microsandbox_artifacts_unavailable",
   "capacity_insufficient"
 ]
diff --git a/services/core/migrations/000095_node_readiness_classes.sql b/services/core/migrations/000095_node_readiness_classes.sql
new file mode 100644
index 000000000..36cc27afb
--- /dev/null
+++ b/services/core/migrations/000095_node_readiness_classes.sql
@@ -0,0 +1,19 @@
+-- +goose Up
+-- Node readiness diagnostics are Provider-neutral classes. An offline node keeps
+-- its last report, so rewrite every stored vendor code to its class.
+UPDATE runtime_nodes SET health = jsonb_set(health, '{diagnostic}', to_jsonb(CASE health->>'diagnostic'
+        WHEN 'docker_unavailable' THEN 'provider_unavailable'
+        WHEN 'microsandbox_artifacts_unavailable' THEN 'artifacts_unavailable'
+        ELSE 'host_unsupported' END::text))
+WHERE health->>'diagnostic' IN ('docker_unavailable', 'docker_limits_unsupported', 'kvm_unavailable', 'microsandbox_artifacts_unavailable');
+UPDATE runtime_node_generation_status SET diagnostic = CASE diagnostic
+        WHEN 'docker_unavailable' THEN 'provider_unavailable'
+        WHEN 'microsandbox_artifacts_unavailable' THEN 'artifacts_unavailable'
+        ELSE 'host_unsupported' END
+WHERE diagnostic IN ('docker_unavailable', 'docker_limits_unsupported', 'kvm_unavailable', 'microsandbox_artifacts_unavailable');
+
+-- +goose Down
+UPDATE runtime_nodes SET health = jsonb_set(health, '{diagnostic}', '"provider_unavailable"')
+WHERE health->>'diagnostic' IN ('host_unsupported', 'artifacts_unavailable');
+UPDATE runtime_node_generation_status SET diagnostic = 'provider_unavailable'
+WHERE diagnostic IN ('host_unsupported', 'artifacts_unavailable');

From 91238fc975530443160f093cbb776825b9e3138a Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 10:56:55 +0800
Subject: [PATCH 48/60] Align Web design notes with Provider declarations
 (#542)

---
 apps/web/DESIGN.md                     | 4 ++--
 apps/web/src/lib/locale-strings.ts     | 4 ++--
 apps/web/src/lib/sandbox-diagnostic.ts | 4 ++--
 docs/sandbox-provider.md               | 2 +-
 docs/zh/sandbox-provider.md            | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/web/DESIGN.md b/apps/web/DESIGN.md
index 94ad4fd43..3addd7584 100644
--- a/apps/web/DESIGN.md
+++ b/apps/web/DESIGN.md
@@ -367,8 +367,8 @@ Dialogs are 448px Paper cards (960px when wide) with 8px corners, a 52px header
 - **ConfirmDialog**: the one grammar for destructive actions. The body states what will be deleted and its consequences; the footer holds Cancel (outline) and the confirm button (danger), whose label changes while busy. Core's reason for a rejection, or an uncertain-outcome warning, appears in red inside the dialog. The Skill page's delete dialogs follow the same grammar; deleting a whole Skill also requires typing its name. Archiving a project says in bold that it can't be undone, then how many active keys it revokes (the project read's count, or more when its loaded key list shows more) and that assets and accepted work stay; with active keys it too requires typing the project's name, shown in mono with its inner spaces kept (surrounding spaces are forgiven, Unicode compared in NFC). While the project list is read again Archive waits; if that read failed, a red line says the count may be out of date and Archive stays disabled.
 - **Key dialogs**: name fields carry their rules in a help tip and their problem in red underneath. The issued key appears in a read-only field with a copy button, under a notice that it is shown once; only "I've saved this key" dismisses it. Closing the dialog moves the key into a pending notice card on the page.
 - **Executor credential dialog** (640px): the shown-once notice, then a prompt to save the JSON privately before Done. Download credential file is primary; Copy credential is secondary. Installation commands are not repeated here. Done forgets the credential; closing preserves it in the pending card. The native installer reads the unchanged JSON file: its absolute path is entered during interactive installation or passed with `--credential-file`; tokens never enter command arguments.
-- **Add node**: the sandbox limits first, then the one-time command in a Terminal block (expiry countdown and Copy command in its header), the three progress steps, and, once the installer's minute passes, an amber card with the reason and a copyable system-service log command. Below, the Host requirements Hairline disclosure is open until this browser has shown it once. Installation requires root or sudo, creates the `oac-node` system service, and serves one Core per host because nodes share the service account. For Docker, explain that membership in the docker group is root-equivalent. Do not expose an ordinary-user installation command or user-service prerequisites. The command downloads from the installation's public URL, never the browser's address, so it works as shown on any host. Until the installation is read, a line says it is being checked; a failed read, a public URL other machines can't use (loopback or not HTTPS), or a console without the provider's node files replaces the limits with one line saying why (the failed read with Try again), and the footer offers nothing to generate. Once the node is ready, while Getting started is open, one line under the green status names the next step (set a default model provider, or finish Getting started) with a text action to System or the Overview.
-- **Clean up the host**: after a node is removed, a dialog gives the host's uninstall command in the same Terminal block, a Graphite line that it deletes no sandboxes, volumes or images (and, for microsandbox, keeps its image store and data). The command requires root or sudo; there is no user-service alternative. A node enrolled with an earlier Core address adds an "Old Core address gone?" disclosure with the `--force` form. The command, too, downloads from the public URL, which the dialog reads again if it is not at hand: until then one line says it is being checked, a failed read says so with Try again, and a public URL other machines can't use (loopback, or none) gets a line saying the service stays on the host and no command can be given. Done dismisses it and focus returns to the page heading.
+- **Add node**: the sandbox limits first, then the one-time command in a Terminal block (expiry countdown and Copy command in its header), the three progress steps, and, once the installer's minute passes, an amber card with the reason and a copyable system-service log command. Below, the Host requirements Hairline disclosure is open until this browser has shown it once. Installation requires root or sudo, creates the `oac-node` system service, and serves one Core per host because nodes share the service account. The docker group's root-equivalent access is stated once, in **Use Docker instead of microsandbox?**. Do not expose an ordinary-user installation command or user-service prerequisites. The command downloads from the installation's public URL, never the browser's address, so it works as shown on any host. Until the installation is read, a line says it is being checked; a failed read, a public URL other machines can't use (loopback or not HTTPS), or a console without the provider's node files replaces the limits with one line saying why (the failed read with Try again), and the footer offers nothing to generate. Once the node is ready, while Getting started is open, one line under the green status names the next step (set a default model provider, or finish Getting started) with a text action to System or the Overview.
+- **Clean up the host**: after a node is removed, a dialog gives the host's uninstall command in the same Terminal block, a Graphite line that it deletes no sandboxes, volumes or images; the uninstaller prints what it keeps. The command requires root or sudo; there is no user-service alternative. A node enrolled with an earlier Core address adds an "Old Core address gone?" disclosure with the `--force` form. The command, too, downloads from the public URL, which the dialog reads again if it is not at hand: until then one line says it is being checked, a failed read says so with Try again, and a public URL other machines can't use (loopback, or none) gets a line saying the service stays on the host and no command can be given. Done dismisses it and focus returns to the page heading.
 - **Use Docker instead of microsandbox?**: choosing Docker in sandbox setup lists what it gives up, each point a 600 Ink lead over a Graphite line: weaker isolation (containers share the host kernel; microsandbox gives each sandbox its own microVM), root-equivalent access (the node's account joins the docker group) and limited use (trusted workloads, or hosts without KVM). The footer holds Use Docker (outline) and Keep microsandbox (primary), which takes focus; closing or Escape keeps microsandbox too.
 - **Edit node**: the name, then the sandbox limit with one 12px Graphite line under it once the node's heartbeat has the host's CPUs and memory: the host, each sandbox's size and at most how many fit. The Nodes list and a node's Capacity show "Active / limit" for Docker and microsandbox alike, so a saved limit shows where it was set.
 - **How to call**: wherever a new key is shown, a card under it gives three copyable samples, each a Margin Gray block with a Hairline and its label and copy button in a header row: a Shell block exporting `OPENAI_BASE_URL` (the installation's API base URL) and `OPENAI_API_KEY` (the new key) together, then curl and Python (with the pinned SDK), each listing the project's Agents and creating a Session with a first message (`environment`, an inline `agent` with `model: "<model>"`, and `input`). A copy the clipboard refuses selects the sample and says so in red underneath. One Graphite line says to put a model the model provider serves in place of `<model>`, and that running an Agent needs a model provider: in each request, saved on the Agent, or the deployment default. An active project's page shows the same samples as a section without any key: the Shell block exports a quoted placeholder, and a Graphite line above the samples says to use a key issued for this project, shown only once at issuance. When the public address is loopback, a note above the samples says the API is reachable only on the Core machine; without a public address only a note to set one shows. Before the installation is read, a skeleton holds the first sample's place.
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index cd7648aff..109fcd4ae 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -285,11 +285,11 @@ export const chinese = {
   "Sandbox ownership mismatch": "沙箱归属不一致",
   "Reconcile the assigned resource and its ownership record before resuming execution.": "请核对已分配资源及其归属记录，再恢复执行。",
   "Sandbox provider unavailable": "沙箱后端不可用",
-  "Restore the provider on the assigned node, then refresh. Running the install command again on the host checks its requirements and names the fix.": "请恢复已分配节点上的运行后端，然后刷新。在该主机上重新运行安装命令，会检查主机要求并指出修复方法。",
+  "Restore the provider on the assigned node, then refresh. Running the install command again on the host checks its requirements and names the fix; a manually registered node logs the local error.": "请恢复已分配节点上的运行后端，然后刷新。在该主机上重新运行安装命令，会检查主机要求并指出修复方法；手动注册的节点会在日志中记录本地错误。",
   "Sandbox state needs attention": "沙箱状态需要检查",
   "Inspect the assigned node and resource, then refresh.": "请检查已分配节点和资源，然后刷新。",
   "Host unsupported": "主机不满足要求",
-  "The host lacks a capability its sandbox provider requires. Running the install command again on the host checks its requirements and names the fix.": "主机缺少沙箱后端所需的能力。在该主机上重新运行安装命令，会检查主机要求并指出修复方法。",
+  "The host lacks a capability its sandbox provider requires. Running the install command again on the host checks its requirements and names the fix; a manually registered node logs the local error.": "主机缺少沙箱后端所需的能力。在该主机上重新运行安装命令，会检查主机要求并指出修复方法；手动注册的节点会在日志中记录本地错误。",
   "Provider files missing": "后端文件缺失",
   "Pinned provider files are missing or fail their checksum. Run the install command again.": "指定版本的后端文件缺失或校验不通过。请重新运行安装命令。",
   "Runtime download failed": "Runtime 下载失败",
diff --git a/apps/web/src/lib/sandbox-diagnostic.ts b/apps/web/src/lib/sandbox-diagnostic.ts
index 67820d9d9..37d350819 100644
--- a/apps/web/src/lib/sandbox-diagnostic.ts
+++ b/apps/web/src/lib/sandbox-diagnostic.ts
@@ -22,12 +22,12 @@ const diagnostics: Record<string, { label: MessageKey; advice: MessageKey }> = {
   },
   provider_unavailable: {
     label: "Sandbox provider unavailable",
-    advice: "Restore the provider on the assigned node, then refresh. Running the install command again on the host checks its requirements and names the fix.",
+    advice: "Restore the provider on the assigned node, then refresh. Running the install command again on the host checks its requirements and names the fix; a manually registered node logs the local error.",
   },
   // Provider-neutral readiness classes; Core sends only the code, and the node keeps the local detail.
   host_unsupported: {
     label: "Host unsupported",
-    advice: "The host lacks a capability its sandbox provider requires. Running the install command again on the host checks its requirements and names the fix.",
+    advice: "The host lacks a capability its sandbox provider requires. Running the install command again on the host checks its requirements and names the fix; a manually registered node logs the local error.",
   },
   artifacts_unavailable: {
     label: "Provider files missing",
diff --git a/docs/sandbox-provider.md b/docs/sandbox-provider.md
index 904f2d349..52536e9e5 100644
--- a/docs/sandbox-provider.md
+++ b/docs/sandbox-provider.md
@@ -112,7 +112,7 @@ A new provider takes these steps:
 4. Register its constructor, policies, configuration adapter and operation declaration in `providers/registry.go`. Its key is the provider kind, which also labels the Provider's observations, and checkpoint support reads this entry. The generated projections combine each registered mode and deployment policy with the shared field bounds in `sandbox/deployment_contract.go`: the installer reads them from `deploy/node/node_spec.py`, and the TypeScript client and Web from `packages/agents-client/src/deployment-contract.ts`, so Web reads these declarations instead of comparing provider kinds. Regenerate both with `go run ./services/core/cmd/specification-contract -write`.
 5. Supply the distribution artifacts for the adapter and its helper, and offer the provider to operators through the registered configuration contract.
 
-**Known design gap:** Web's setup wizard still names providers in its backend choice, the E2B configuration step (service presets and fields) and the Docker confirmation, because the protocol declares no configuration fields yet. Exposing another provider through that surface currently requires a shared Web edit. This coupling does not meet [Complexity stays in the adapter](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter); new integrations must express their configuration through the protocol and keep vendor-specific behavior in the adapter. Never add a Session or Turn scheduling path, a vendor column or API field, or a vendor switch in the store.
+**Known design gap:** Web still names providers in the setup wizard's backend choice, the Docker confirmation and E2B's configuration fields wherever Web shows or parses them (the setup step with its service presets, the deployment summary and the client's deployment projection), because the protocol declares no configuration fields yet. Exposing another provider through that surface currently requires a shared Web edit. This coupling does not meet [Complexity stays in the adapter](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter); new integrations must express their configuration through the protocol and keep vendor-specific behavior in the adapter. Never add a Session or Turn scheduling path, a vendor column or API field, or a vendor switch in the store.
 
 `providers.Build` passes persisted node configuration and ephemeral `LocalOptions` to `BuildLocal`. The caller explicitly selects standalone registration or single-provider execution with `Standalone`, or generation-owned execution with a canonical absolute node state directory in `GenerationStateDirectory`. Missing or mixed contexts are rejected. The adapter owns generation-specific native preparation and readiness checks. Microsandbox binds helper leases to the installation, generation and specification digest, then checks the pinned image after platform, capacity and artifact readiness.
 
diff --git a/docs/zh/sandbox-provider.md b/docs/zh/sandbox-provider.md
index c4019b6b1..0c2606f11 100644
--- a/docs/zh/sandbox-provider.md
+++ b/docs/zh/sandbox-provider.md
@@ -1,7 +1,7 @@
 ---
 title: "添加 Sandbox Provider"
 source: docs/sandbox-provider.md
-source_hash: c4d127115021894c676b53b678919ef6c3d584afbcf6783a33e55e0494959e51
+source_hash: 5218bf81d54117718753e28fc77a4014fe4a173d567ac9ab13bca65b511a7643
 ---
 
 **Sandbox Provider** 为 Core 管理的 Environment 提供 Runtime daemon 运行所需的外层计算资源，以及启动 daemon 的有界引导流程。本指南说明如何添加 Provider，并作为 Core 驱动 Provider 的参考。接口为 [`SandboxProvider`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/sandbox/sandbox_provider.go)。
@@ -114,7 +114,7 @@ Checkpoint 支持增加 `Compute` generation、name、ID 和 `SnapshotIdentity`
 4. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter 和 operation 声明。其键即 provider kind，也用于标记该 Provider 的观测；checkpoint 支持读取此项。生成的投影组合每个已注册的部署模式和 deployment policy 与 `sandbox/deployment_contract.go` 中的共享 field bound：installer 从 `deploy/node/node_spec.py` 读取，TypeScript 客户端和 Web 从 `packages/agents-client/src/deployment-contract.ts` 读取，因此 Web 读取这些声明，而不比较 provider kind。通过 `go run ./services/core/cmd/specification-contract -write` 重新生成两者。
 5. 提供 adapter 和 helper 的发行产物，通过已注册 configuration 契约向运维人员提供 provider。
 
-**已知设计缺口：** Web 的 setup 向导仍在后端选择、E2B 配置步骤（服务预设与字段）和 Docker 确认中指名 provider，因为协议尚未声明配置字段。通过该界面提供另一 provider 目前需要修改共享的 Web。此耦合不符合[复杂性留在 adapter 内](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter)；新集成必须通过协议表达配置，把厂商专有行为留在 adapter。不得添加 Session 或 Turn 调度路径、厂商专有 column 或 API field，或 store 中的厂商 switch。
+**已知设计缺口：** Web 仍在 setup 向导的后端选择、Docker 确认，以及所有显示或解析 E2B 配置字段的地方（带服务预设的 setup 步骤、部署摘要和客户端的部署投影）中指名 provider，因为协议尚未声明配置字段。通过该界面提供另一 provider 目前需要修改共享的 Web。此耦合不符合[复杂性留在 adapter 内](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter)；新集成必须通过协议表达配置，把厂商专有行为留在 adapter。不得添加 Session 或 Turn 调度路径、厂商专有 column 或 API field，或 store 中的厂商 switch。
 
 `providers.Build` 将持久化 node 配置与临时 `LocalOptions` 传给 `BuildLocal`。调用方通过 `Standalone` 明确选择独立注册或单 provider 执行，或通过 `GenerationStateDirectory` 中的规范绝对 node state directory 选择 generation 拥有的执行。context 缺失或混合时拒绝。adapter 负责 generation 特有的原生 preparation 和 readiness 检查。Microsandbox 将 helper lease 绑定到安装实例、generation 和 specification digest，然后在平台、容量和 artifact readiness 后检查固定 image。
 

From 6ce0e51457e933c2316a6bf64d76285074b8ff09 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 11:01:40 +0800
Subject: [PATCH 49/60] Require the installation ID and credential key (#541)

---
 .github/workflows/api-acceptance.yml          |   3 +-
 apps/web/e2e/console.ts                       |   8 +-
 apps/web/e2e/fixture-console.mjs              |   8 +-
 apps/web/e2e/system.spec.ts                   |  19 --
 .../components/InstallationNotice.test.tsx    |   2 +-
 apps/web/src/features/api-keys/HowToCall.tsx  |   7 +-
 .../features/sandbox/NodeCleanupDialog.tsx    |   6 +-
 .../src/features/sandbox/core-origin.test.ts  |   1 -
 apps/web/src/features/sandbox/core-origin.ts  |   2 +-
 .../features/system/ModelProviderDialog.tsx   |   3 -
 apps/web/src/features/system/SystemPage.tsx   |   6 +-
 apps/web/src/i18n/locales/en/core-errors.ts   |   3 +-
 apps/web/src/i18n/locales/en/keys.ts          |   1 -
 apps/web/src/i18n/locales/en/system.ts        |   2 -
 apps/web/src/i18n/locales/en/vaults.ts        |   1 -
 .../web/src/i18n/locales/zh-CN/core-errors.ts |   3 +-
 apps/web/src/i18n/locales/zh-CN/keys.ts       |   1 -
 apps/web/src/i18n/locales/zh-CN/system.ts     |   2 -
 apps/web/src/i18n/locales/zh-CN/vaults.ts     |   2 +-
 apps/web/src/lib/locale-strings.ts            |   1 -
 contracts/agents-api/admin-api.md             |   6 +-
 contracts/agents-api/core-errors.md           |   5 +-
 contracts/agents-api/core.openapi.yaml        |   9 +-
 .../environment-executor-credentials.md       |   2 +-
 contracts/agents-api/model-execution.md       |   4 +-
 contracts/agents-api/runtime-observability.md |   2 +-
 contracts/agents-api/sandbox-deployment.md    |   1 -
 contracts/agents-api/sessions-events.md       |   2 +-
 contracts/agents-api/vaults.md                |   4 +-
 contracts/agents-api/zh/admin-api.md          |   8 +-
 contracts/agents-api/zh/core-errors.md        |   7 +-
 .../zh/environment-executor-credentials.md    |   4 +-
 contracts/agents-api/zh/model-execution.md    |   6 +-
 .../agents-api/zh/runtime-observability.md    |   4 +-
 contracts/agents-api/zh/sandbox-deployment.md |   3 +-
 contracts/agents-api/zh/sessions-events.md    |   4 +-
 contracts/agents-api/zh/vaults.md             |   6 +-
 docs/configuration.md                         |   8 +-
 docs/web/console-api-usage.md                 |   2 +-
 docs/zh/configuration.md                      |  10 +-
 docs/zh/web/console-api-usage.md              |   4 +-
 .../agents-client/src/admin-client.test.ts    |   4 +-
 .../agents-client/src/admin-projection.ts     |   4 +-
 packages/agents-client/src/admin-types.ts     |   8 +-
 services/core/IMPLEMENTATION.md               |  10 +-
 services/core/README.md                       |   8 +-
 services/core/cmd/server/core_metrics.go      |  26 +--
 .../core/cmd/server/executor_connections.go   |   1 -
 services/core/cmd/server/http_routes.go       |   7 +-
 services/core/cmd/server/http_routes_test.go  |   4 +-
 services/core/cmd/server/installation.go      |  11 +-
 services/core/cmd/server/main.go              | 193 ++++++++----------
 services/core/cmd/server/managed_nodes.go     |  13 +-
 services/core/cmd/server/managed_setup.go     |   5 +
 .../core/cmd/server/managed_setup_test.go     |  18 +-
 services/core/cmd/server/runtime_history.go   |   9 +-
 .../core/cmd/server/runtime_history_test.go   |  33 ++-
 services/core/internal/agents/storage.go      |   8 +-
 .../internal/api/admin_session_archive.go     |   4 -
 .../api/admin_session_archive_test.go         |   1 -
 services/core/internal/api/admin_summary.go   |   2 +-
 .../core/internal/api/contract_routes_test.go |   5 +-
 .../api/core_store_validation_test.go         |   3 +-
 .../internal/api/credentials_oauth_test.go    |   3 +-
 .../core/internal/api/credentials_test.go     |   3 +-
 .../internal/api/credentials_update_test.go   |   3 +-
 services/core/internal/api/dependencies.go    |  62 ++----
 .../core/internal/api/dependencies_test.go    |  73 ++-----
 .../internal/api/environment_creation_test.go |  42 +---
 .../core/internal/api/environment_files.go    |   2 +-
 .../environment_files_completeness_test.go    |   6 +-
 .../internal/api/environment_files_create.go  |   2 +-
 .../api/environment_files_create_test.go      |   1 -
 .../api/environment_files_deadline_test.go    |   2 +-
 .../internal/api/environment_files_test.go    |  37 ++--
 .../api/environment_files_wire_test.go        |  12 +-
 .../internal/api/environment_installation.go  |  17 +-
 .../api/environment_installation_test.go      |   1 -
 .../api/environment_templates_test.go         |   2 -
 services/core/internal/api/errors.go          |  12 --
 services/core/internal/api/errors_agents.go   |   2 +-
 .../core/internal/api/errors_deployment.go    |   2 +-
 .../api/errors_environmenttemplates.go        |   2 +-
 services/core/internal/api/errors_files.go    |   2 +-
 .../internal/api/errors_modelconfiguration.go |   2 +-
 services/core/internal/api/errors_projects.go |   2 +-
 services/core/internal/api/errors_sessions.go |   2 +-
 services/core/internal/api/errors_skills.go   |   2 +-
 .../core/internal/api/errors_skills_test.go   |   3 -
 services/core/internal/api/errors_test.go     |   2 -
 services/core/internal/api/errors_vaults.go   |   2 +-
 services/core/internal/api/handler.go         |  16 +-
 services/core/internal/api/handler_test.go    |   8 +-
 services/core/internal/api/harness_test.go    |   7 +-
 .../internal/api/hosted_environment_test.go   |   1 -
 services/core/internal/api/inputs.go          |   4 -
 services/core/internal/api/inputs_test.go     |   3 +-
 services/core/internal/api/installation.go    |  12 +-
 .../core/internal/api/installation_test.go    |   2 +-
 .../api/model_provider_fixture_test.go        |   3 -
 .../native_classification_integration_test.go |   5 +-
 services/core/internal/api/routing_test.go    |   1 -
 services/core/internal/api/sandbox_manager.go |   6 -
 .../core/internal/api/sandbox_manager_test.go |   1 -
 .../internal/api/sandbox_selector_test.go     |   1 -
 .../internal/api/session_admission_test.go    |   2 +-
 .../internal/api/session_creation_stream.go   |   4 +-
 .../api/session_creation_stream_test.go       |   1 -
 .../core/internal/api/session_diagnostics.go  |   2 +-
 .../session_diagnostics_public_compat_test.go |  11 +-
 .../internal/api/session_diagnostics_test.go  |   2 +-
 .../api/session_environment_http_test.go      |   3 +-
 .../api/session_initial_input_test.go         |   3 +-
 services/core/internal/api/stream.go          |   4 +-
 .../internal/api/testdata/core-errors.json    |   1 -
 .../internal/api/validation_errors_test.go    |   1 -
 .../core/internal/credentialcrypto/cipher.go  |   4 -
 services/core/internal/deployment/errors.go   |   3 +
 .../deployment/placement/placement.go         |   2 +-
 services/core/internal/deployment/storage.go  |   8 +-
 .../internal/environmenttemplates/template.go |   2 +-
 .../archive_cancellation_cleanup_test.go      |   7 +-
 .../execution/deployment_fixture_test.go      |   1 -
 .../deployment_provider_observations_test.go  |   7 +-
 .../core/internal/execution/owner_test.go     |   3 +-
 .../sandbox_deployment_drain_test.go          |   2 +-
 .../internal/execution/sandbox_reset_test.go  |  16 +-
 .../internal/modelconfiguration/errors.go     |   3 +-
 .../internal/modelconfiguration/service.go    |   3 +-
 .../modelconfiguration/service_test.go        |  14 +-
 .../internal/modelconfiguration/storage.go    |   3 +-
 .../persistence/postgres/agentpg/store.go     |  11 +-
 .../postgres/agentpg/store_test.go            |  37 +---
 .../postgres/deploymentpg/records.go          |  11 +-
 .../postgres/deploymentpg/seal_test.go        |  22 +-
 .../postgres/deploymentpg/store.go            |   4 +-
 .../persistence/postgres/deploymentpg/tx.go   |   3 -
 .../modelconfigurationpg/seal_test.go         |  23 +--
 .../postgres/modelconfigurationpg/store.go    |  12 +-
 .../persistence/postgres/pgtest/pgtest.go     |  13 ++
 .../postgres/sessionpg/admin_test.go          |   4 +-
 .../postgres/sessionpg/artifacts_test.go      |   2 +-
 .../postgres/sessionpg/creation.go            |  12 --
 .../postgres/sessionpg/creation_test.go       |  43 ++--
 .../sessionpg/execution_turns_test.go         |   4 +-
 .../sessionpg/executor_credentials.go         |   6 +-
 .../sessionpg/executor_credentials_test.go    |  12 +-
 .../persistence/postgres/sessionpg/frozen.go  |   6 -
 .../postgres/sessionpg/frozen_test.go         |  26 +--
 .../postgres/sessionpg/model_execution.go     |   4 -
 .../persistence/postgres/skillpg/skillpg.go   |  12 +-
 .../postgres/skillpg/skillpg_test.go          |  32 ++-
 .../postgres/templatepg/audit_test.go         |   4 +-
 .../persistence/postgres/templatepg/seal.go   |  12 +-
 .../persistence/postgres/templatepg/store.go  |   8 +-
 .../postgres/templatepg/store_test.go         |  49 +++--
 .../postgres/vaultpg/credentials_test.go      |  24 +--
 .../postgres/vaultpg/fixture_test.go          |   7 +-
 .../postgres/vaultpg/oauth_test.go            |  11 +-
 .../persistence/postgres/vaultpg/seal.go      |  12 --
 .../persistence/postgres/vaultpg/seal_test.go |  28 +--
 .../postgres/vaultpg/selection_test.go        |  20 +-
 .../persistence/postgres/vaultpg/vaultpg.go   |   4 +-
 .../postgres/vaultpg/vaults_test.go           |  17 +-
 .../core/internal/processconfig/config.go     |  39 ++--
 .../internal/processconfig/config_test.go     |  42 ++--
 .../internal/runtimeenrollment/connection.go  |   3 -
 .../runtimeenrollment/connection_test.go      |   4 +-
 .../providers/configuration_flow_test.go      |   8 +-
 services/core/internal/sessions/creation.go   |   8 -
 .../core/internal/sessions/creation_test.go   |  21 +-
 .../core/internal/sessions/environment.go     |   8 +-
 .../internal/sessions/executor_credentials.go |   6 +-
 .../core/internal/sessions/model_execution.go |   3 +-
 services/core/internal/vaults/service.go      |   3 +-
 services/core/internal/vaults/service_test.go |  20 +-
 services/core/internal/vaults/storage.go      |  14 +-
 services/core/tests/container_server.py       |  14 +-
 .../agent_execution_defaults_http_test.go     |   2 +-
 .../integration/agents_delete_public_test.go  |   6 +-
 .../integration/agents_update_public_test.go  |   6 +-
 .../tests/integration/command_output_test.go  |   2 +-
 .../configuration_validation_public_test.go   |   2 +-
 .../creation_stream_settlement_public_test.go |   4 +-
 .../credential_matrix_http_test.go            |   2 +-
 .../deployment_model_providers_http_test.go   |  12 +-
 .../core/tests/integration/dispatch_test.go   |   4 +-
 .../environment_file_writes_test.go           |   2 +-
 .../environment_initial_public_test.go        |   2 +-
 .../environment_retrieve_public_test.go       |   6 +-
 .../executor_principals_migration_test.go     |   2 +-
 .../core/tests/integration/fixtures_test.go   |  11 -
 .../function_inputs_public_test.go            |   2 +-
 .../integration/initial_files_http_test.go    |   2 +-
 .../input_conflicts_public_test.go            |   2 +-
 .../integration/item_order_migration_test.go  |   4 +-
 .../integration/list_cursor_public_test.go    |   2 +-
 .../local_environment_devices_test.go         |   8 +-
 .../tests/integration/managed_fixture_test.go |   3 +-
 .../mcp_credential_selection_public_test.go   |   2 +-
 .../path_id_semantics_public_test.go          |  24 +--
 .../public_handler_fixture_test.go            |  48 +----
 .../remote_mcp_credentials_test.go            |   2 +-
 .../core/tests/integration/remote_mcp_test.go |   2 +-
 .../integration/request_body_public_test.go   |   4 +-
 .../tests/integration/root_fixture_test.go    |  18 +-
 .../sandbox_node_auth_order_http_test.go      |   2 +-
 .../saved_web_search_public_test.go           |   2 +-
 .../self_hosted_cancel_public_test.go         |   4 +-
 .../self_hosted_initial_public_test.go        |   6 +-
 .../session_agent_filter_public_test.go       |   6 +-
 .../integration/session_artifacts_test.go     |   2 +-
 .../session_deletion_lifecycle_public_test.go |   2 +-
 .../session_deletion_public_test.go           |   4 +-
 .../integration/session_deletion_test.go      |   6 +-
 .../tests/integration/session_events_test.go  |   2 +-
 .../session_execution_configuration_test.go   |   2 +-
 .../session_model_execution_http_test.go      |   2 +-
 .../integration/session_reads_fixture_test.go |   5 +-
 .../session_reference_retry_public_test.go    |   2 +-
 .../core/tests/integration/sessions_test.go   |   2 +-
 .../integration/stream_authority_http_test.go |   2 +-
 .../integration/subagent_resources_test.go    |   2 +-
 .../subagent_visibility_public_test.go        |   2 +-
 .../template_composition_public_test.go       |   2 +-
 .../template_null_selection_public_test.go    |   2 +-
 .../token_usage_integration_test.go           |   2 +-
 .../unified_model_configuration_http_test.go  |   2 +-
 .../unstorable_text_public_test.go            |   2 +-
 .../tests/integration/vaults_fixture_test.go  |   1 -
 .../whitespace_input_public_test.go           |   2 +-
 .../integration/worker_input_race_test.go     |   2 +-
 .../tests/integration/worker_wakeup_test.go   |   2 +-
 services/core/tests/official_client.py        |  37 ++--
 .../core/tests/official_credential_delete.py  |   6 +-
 services/core/tests/official_credentials.py   |  37 ++--
 services/core/tests/official_vault_delete.py  |  16 +-
 237 files changed, 753 insertions(+), 1333 deletions(-)

diff --git a/.github/workflows/api-acceptance.yml b/.github/workflows/api-acceptance.yml
index ee010ed18..0111a8d4f 100644
--- a/.github/workflows/api-acceptance.yml
+++ b/.github/workflows/api-acceptance.yml
@@ -63,8 +63,9 @@ jobs:
           OAC_TEST_OFFICIAL_SDK_PYTHON: python
         run: |
           python services/core/tests/official_schema_test.py
-          python services/core/tests/official_client.py
+          # The Go Workers need an unclaimed deployment; Core claims it for its installation ID.
           go test ./services/core/tests/integration -run '^(TestFunctionStateOfficialClientReadsAndLiveEvents|TestSavedReferenceRetryOfficialClient|TestAgentUpdateOfficialClient|TestAgentDeletionOfficialClient|TestSessionAgentFilterOfficialClient|TestSessionDeletionOfficialClient|TestEnvironmentInitialFailureOfficialClient|TestSelfHostedInitialCreationOfficialClient|TestSelfHostedCancellationOfficialClient)$' -count=1
+          python services/core/tests/official_client.py
       - uses: ./.github/actions/e2b-provider
         if: inputs.container
       - name: Verify the distribution's Core image
diff --git a/apps/web/e2e/console.ts b/apps/web/e2e/console.ts
index 1e50de4db..2735ebc8c 100644
--- a/apps/web/e2e/console.ts
+++ b/apps/web/e2e/console.ts
@@ -12,17 +12,15 @@ export const FIXTURE_CORE_KEY = "fixture-core-key-3f9a2c71";
  * `sandbox` the sandbox deployment, `nodes: "none"` a deployment no node has joined, and
  * `installation` how config.json's public_url is set: "public" (HTTPS, the default), "local"
  * (loopback: only the Core machine reaches the API, and E2B is rejected) or "stale" (public,
- * with a node enrolled with an earlier address), `credentials: "none"` a Core without a
- * credential encryption key, which cannot store a model provider's key, and
- * `installers: "none"` a console without its node installation payload, so it serves neither
+ * with a node enrolled with an earlier address), and `installers: "none"` a console without its node installation payload, so it serves neither
  * the node nor the self-hosted installer. `nodeArtifacts` lists the providers the console has
  * node files for, both by default; as in the console, microsandbox needs Docker's files too.
  */
-export interface FixtureOptions { fresh?: boolean; sandbox?: "configured" | "none" | "e2b"; nodes?: "none"; installation?: "public" | "local" | "stale"; credentials?: "none"; installers?: "none"; nodeArtifacts?: ("docker" | "microsandbox")[] }
+export interface FixtureOptions { fresh?: boolean; sandbox?: "configured" | "none" | "e2b"; nodes?: "none"; installation?: "public" | "local" | "stale"; installers?: "none"; nodeArtifacts?: ("docker" | "microsandbox")[] }
 
 /** Fresh fixture state: signed out ("login") or already signed in ("authenticated"). */
 export async function resetFixture(request: APIRequestContext, auth: "login" | "authenticated" = "authenticated", options: FixtureOptions = {}) {
-  await request.post(`${fixture}/__fixture/reset?auth=${auth}${options.fresh ? "&projects=none" : ""}&sandbox=${options.sandbox ?? "configured"}${options.nodes ? `&nodes=${options.nodes}` : ""}&installation=${options.installation ?? "public"}${options.credentials ? `&credentials=${options.credentials}` : ""}${options.installers ? `&installers=${options.installers}` : ""}${options.nodeArtifacts ? `&artifacts=${options.nodeArtifacts.join(",")}` : ""}`);
+  await request.post(`${fixture}/__fixture/reset?auth=${auth}${options.fresh ? "&projects=none" : ""}&sandbox=${options.sandbox ?? "configured"}${options.nodes ? `&nodes=${options.nodes}` : ""}&installation=${options.installation ?? "public"}${options.installers ? `&installers=${options.installers}` : ""}${options.nodeArtifacts ? `&artifacts=${options.nodeArtifacts.join(",")}` : ""}`);
 }
 
 const v1Requests: string[] = [];
diff --git a/apps/web/e2e/fixture-console.mjs b/apps/web/e2e/fixture-console.mjs
index 1145cd52d..69c03a8f5 100644
--- a/apps/web/e2e/fixture-console.mjs
+++ b/apps/web/e2e/fixture-console.mjs
@@ -92,7 +92,7 @@ function e2bDeployment() {
   return { ...configuredDeployment(), provider: "e2b", mode: "direct", rollout: noNodeRollout(), resources: { allocations: 3, pending: 1 }, specification: { resources: { cpus: 2, memory_mib: 2048 } }, configuration: { template: "oac-runtime:0f1e2d3c-4b5a-6978-8a9b-0c1d2e3f4a5b", api_url: "https://api.e2b.app", domain: "e2b.app" } , credential_configured: true, metadata: { template_build: templateBuild } };
 }
 
-function reset(mode = "login", fresh = false, sandbox = "configured", nodes = "demo", address = "public", credentials = "configured", installers = true, artifacts = "docker,microsandbox") {
+function reset(mode = "login", fresh = false, sandbox = "configured", nodes = "demo", address = "public", installers = true, artifacts = "docker,microsandbox") {
   // Self-hosted Sessions get their remote_url from public_url, as in Core.
   const screenshots = process.env.OAC_WEB_SCREENSHOT_DEMO === "1";
   const now = Math.floor(Date.now() / 1000);
@@ -112,8 +112,6 @@ function reset(mode = "login", fresh = false, sandbox = "configured", nodes = "d
     executorCredentials: new Map(),
     // How config.json's public_url is set: "public", "local" or "stale".
     installation: address,
-    // "none": Core has no credential encryption key, so it cannot store a provider's key.
-    credentialKey: credentials !== "none",
     // Startup state and deployment default model provider per harness; API keys are never kept.
     // The demo deployment's default harness has a default model; a fresh install has none.
     harnesses: {
@@ -574,8 +572,6 @@ async function harnessRoute(request, response, path) {
   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 ?? {});
   if (problem) return error(response, 400, problem, "invalid_request_error");
-  // As Core's error mapping: sealing the key needs the credential encryption key.
-  if (!state.credentialKey) return error(response, 503, "Credential encryption is not configured on this service.", "credential_storage_unavailable");
   entry.provider = {
     object: "core.model_configuration", harness, model: input.model, harness_config: input.harness_config ?? {},
     model_provider: { protocol: input.model_provider.protocol, base_url: input.model_provider.base_url, api_key_configured: true,
@@ -596,7 +592,7 @@ async function fixtureRoute(request, response, url) {
   }
   if (url.pathname === "/__fixture/health") return send(response, 200, { ok: true });
   if (url.pathname === "/__fixture/reset" && request.method === "POST") {
-    reset(url.searchParams.get("auth") ?? "login", url.searchParams.get("projects") === "none", url.searchParams.get("sandbox") ?? "configured", url.searchParams.get("nodes") ?? "demo", url.searchParams.get("installation") ?? "public", url.searchParams.get("credentials") ?? "configured", url.searchParams.get("installers") !== "none", url.searchParams.get("artifacts") ?? undefined);
+    reset(url.searchParams.get("auth") ?? "login", url.searchParams.get("projects") === "none", url.searchParams.get("sandbox") ?? "configured", url.searchParams.get("nodes") ?? "demo", url.searchParams.get("installation") ?? "public", url.searchParams.get("installers") !== "none", url.searchParams.get("artifacts") ?? undefined);
     return send(response, 200, { ok: true });
   }
   if (url.pathname === "/__fixture/deployment" && request.method === "POST") {
diff --git a/apps/web/e2e/system.spec.ts b/apps/web/e2e/system.spec.ts
index a731ed974..50a77be5e 100644
--- a/apps/web/e2e/system.spec.ts
+++ b/apps/web/e2e/system.spec.ts
@@ -129,25 +129,6 @@ test("sets, replaces and clears a harness's default model configuration, and kee
   expect(browserState).not.toContain(KEY);
 });
 
-test("reports a Core without a credential key as a configuration error, without rereading", async ({ page, request }) => {
-  await openConsole(page, request, "system", { fresh: true, credentials: "none" });
-  const codex = page.getByRole("region", { name: "Default model configuration" }).getByRole("article", { name: "Codex" });
-  await codex.getByRole("button", { name: "Set the default model configuration for Codex" }).click();
-  const set = page.getByRole("dialog", { name: "Set default model configuration for Codex" });
-  await set.getByLabel("Base URL").fill("https://model.example/v1");
-  await set.getByLabel("API key").fill(KEY);
-  await set.getByLabel("Default model ID").fill("fixture-model");
-  const reads: string[] = [];
-  page.on("request", (sent) => { if (sent.method() === "GET" && new URL(sent.url()).pathname === "/core/v1/harnesses") reads.push(sent.url()); });
-  await set.getByRole("button", { name: "Save" }).click();
-  await expect(set.getByRole("alert")).toHaveText("Core has no credential encryption key configured, so it can't store keys. Installer-based installs configure this automatically; for manual deployments, set OAC_CREDENTIAL_KEY_FILE for Core.");
-  await expect(set.getByRole("button", { name: "Save" })).toBeEnabled();
-  expect(reads).toEqual([]);
-  expect(await writes(request)).toEqual(["PUT /core/v1/harnesses/codex/model-configuration"]);
-  await set.getByRole("button", { name: "Cancel" }).click();
-  await expect(codex).toContainText("Not set");
-});
-
 test("reports an unconfirmed save, reads the default model configurations again once and never repeats the write", async ({ page, request }) => {
   await openConsole(page, request, "system", { fresh: true });
   const codex = page.getByRole("region", { name: "Default model configuration" }).getByRole("article", { name: "Codex" });
diff --git a/apps/web/src/components/InstallationNotice.test.tsx b/apps/web/src/components/InstallationNotice.test.tsx
index 81a8ab535..5545cd40b 100644
--- a/apps/web/src/components/InstallationNotice.test.tsx
+++ b/apps/web/src/components/InstallationNotice.test.tsx
@@ -4,7 +4,7 @@ import { describe, expect, it } from "vitest";
 import { InstallationNotice } from "./InstallationNotice";
 
 const installation: CoreInstallation = {
-  object: "core.installation", installation_id: null, public_url: "http://127.0.0.1:8091", api_base_url: "http://127.0.0.1:8091/v1",
+  object: "core.installation", installation_id: "94be54a1-138c-4f30-bc87-b13686272dbe", public_url: "http://127.0.0.1:8091", api_base_url: "http://127.0.0.1:8091/v1",
   source_commit: null, local_only: true, configuration: { settings: [] },
   address_bindings: { nodes: 0, nodes_on_other_address: 0, hosted_sandboxes: 0, self_hosted_executors: 0 },
 };
diff --git a/apps/web/src/features/api-keys/HowToCall.tsx b/apps/web/src/features/api-keys/HowToCall.tsx
index a7c14739e..8c49e2bca 100644
--- a/apps/web/src/features/api-keys/HowToCall.tsx
+++ b/apps/web/src/features/api-keys/HowToCall.tsx
@@ -64,14 +64,12 @@ export function callSamples(apiBaseUrl: string, apiKey: string | null, keyPlaceh
 
 /**
  * The samples, or why there are none. The console never sends these requests.
- * When Core is reachable only on its own machine it says so, and without a
- * public address it says to set one instead of guessing.
+ * When Core is reachable only on its own machine it says so.
  */
 function HowToCallBody({ apiKey }: { apiKey: string | null }) {
   const { t } = useTranslation("keys");
   const { t: tCommon } = useTranslation("common");
   const installation = useQuery(installationQuery);
-  const base = installation.data?.api_base_url ?? null;
 
   if (installation.data === undefined) {
     return installation.isError && !installation.isFetching
@@ -79,8 +77,7 @@ function HowToCallBody({ apiKey }: { apiKey: string | null }) {
       // The first sample's place, as the console's other first reads hold theirs.
       : <div className="how-to-call-sample how-to-call-skeleton" role="status" aria-label={t("howToCall.loading")} aria-busy="true"><span className="skeleton-bar" /><span className="skeleton-bar" /></div>;
   }
-  if (base === null) return <p className="how-to-call-note" role="note">{t("howToCall.noAddress")}</p>;
-  const samples = callSamples(base, apiKey, t("howToCall.keyPlaceholder"));
+  const samples = callSamples(installation.data.api_base_url, apiKey, t("howToCall.keyPlaceholder"));
   return (
     <>
       {installation.data.local_only ? <p className="how-to-call-note" role="note">{t("howToCall.localOnly")}</p> : null}
diff --git a/apps/web/src/features/sandbox/NodeCleanupDialog.tsx b/apps/web/src/features/sandbox/NodeCleanupDialog.tsx
index a4de4b299..cc8a41c0f 100644
--- a/apps/web/src/features/sandbox/NodeCleanupDialog.tsx
+++ b/apps/web/src/features/sandbox/NodeCleanupDialog.tsx
@@ -41,10 +41,8 @@ export function NodeCleanupDialog({ cleanup, open, onClose }: { cleanup: NodeCle
       {installation.isError
         ? <p role="alert">{join(stays, t("The installation couldn't be read, so no command can be issued."))} <button className="text-action" type="button" disabled={installation.isFetching} onClick={() => void installation.refetch()}>{t("Try again")}</button></p>
         : <p role="status">{t("Checking this installation's public URL…")}</p>}
-    </div> : cleanup && !sourceUrl ? <div className="sandbox-add-node form-stack">
-      <p>{join(stays, installation.data?.local_only && installation.data.public_url
-        ? t("Other machines can't reach this installation's public URL, {{url}}, so no uninstall command can be given.", { url: installation.data.public_url })
-        : t("An uninstall command needs a public URL that other machines can reach, and this installation has none."))}</p>
+    </div> : cleanup && installation.data && !sourceUrl ? <div className="sandbox-add-node form-stack">
+      <p>{join(stays, t("Other machines can't reach this installation's public URL, {{url}}, so no uninstall command can be given.", { url: installation.data.public_url }))}</p>
     </div> : cleanup ? <div className="sandbox-add-node form-stack">
       <p>{t("{{name}} is removed from Core. To remove its service and files from the host, run:", { name: cleanup.name })}</p>
       <CommandBlock key={command()} value={command()} label={t("Uninstall command")} autoFocus />
diff --git a/apps/web/src/features/sandbox/core-origin.test.ts b/apps/web/src/features/sandbox/core-origin.test.ts
index 36232bab9..ef555ea5d 100644
--- a/apps/web/src/features/sandbox/core-origin.test.ts
+++ b/apps/web/src/features/sandbox/core-origin.test.ts
@@ -6,6 +6,5 @@ describe("node command source", () => {
     expect(nodeSourceUrl({ public_url: "https://core.example.com:8443", local_only: false })).toBe("https://core.example.com:8443");
     expect(nodeSourceUrl({ public_url: "http://10.0.0.5:8080", local_only: false })).toBe("http://10.0.0.5:8080");
     expect(nodeSourceUrl({ public_url: "http://localhost:8080", local_only: true })).toBeNull();
-    expect(nodeSourceUrl({ public_url: null, local_only: false })).toBeNull();
   });
 });
diff --git a/apps/web/src/features/sandbox/core-origin.ts b/apps/web/src/features/sandbox/core-origin.ts
index dea953213..6d4de7982 100644
--- a/apps/web/src/features/sandbox/core-origin.ts
+++ b/apps/web/src/features/sandbox/core-origin.ts
@@ -5,7 +5,7 @@ import type { CoreInstallation } from "@oac/agents-client";
  * pass it: the installation's public URL, whose reverse proxy sends
  * `/node-install/*` to this console. Unlike the browser's address, it is the
  * same from every machine. Core accepts only origins nodes may use, so it is
- * null only when other machines can't reach it (`local_only`) or it is missing.
+ * null only when other machines can't reach it (`local_only`).
  */
 export function nodeSourceUrl(installation: Pick<CoreInstallation, "public_url" | "local_only">): string | null {
   if (installation.local_only) return null;
diff --git a/apps/web/src/features/system/ModelProviderDialog.tsx b/apps/web/src/features/system/ModelProviderDialog.tsx
index 3e555058e..9a145278f 100644
--- a/apps/web/src/features/system/ModelProviderDialog.tsx
+++ b/apps/web/src/features/system/ModelProviderDialog.tsx
@@ -116,9 +116,6 @@ export function ModelProviderDialog({ harness, onClose, onSaved, onReread }: {
         setRejection(caught);
         if (caught.param === "harness_config" || ["context_window", "max_output_tokens", "model_provider.context_window", "model_provider.max_output_tokens"].includes(caught.param ?? "")) setAdvancedOpen(true);
         setError(coreError(caught, tCommon));
-      } else if (caught instanceof AgentCoreError && caught.code === "credential_storage_unavailable") {
-        // A deployment without a credential key stores nothing: a configuration error, not an unknown outcome.
-        setError(t("models.form.noCredentialKey"));
       } else {
         setError(t("models.form.uncertain"));
         onReread();
diff --git a/apps/web/src/features/system/SystemPage.tsx b/apps/web/src/features/system/SystemPage.tsx
index 0fc42d3cd..2213ae7bb 100644
--- a/apps/web/src/features/system/SystemPage.tsx
+++ b/apps/web/src/features/system/SystemPage.tsx
@@ -42,11 +42,11 @@ export function SystemPage() {
   const facts = about ? (
     <Section headingId="system-installation-heading" title={t("installation.title")}>
       <dl className="system-facts">
-        <Fact label={t("installation.publicUrl")} help={t("installation.publicUrlHelp")}>{about.public_url ? <code className="system-code">{about.public_url}</code> : <span className="system-muted">{t("installation.notSet")}</span>}</Fact>
+        <Fact label={t("installation.publicUrl")} help={t("installation.publicUrlHelp")}><code className="system-code">{about.public_url}</code></Fact>
         <Fact label={t("installation.apiBaseUrl")} help={t("installation.apiBaseUrlHelp")}>
-          {about.api_base_url ? <CopyableId id={about.api_base_url} label={t("installation.copyApiBaseUrl")} /> : <span className="system-muted">{t("installation.notSet")}</span>}
+          <CopyableId id={about.api_base_url} label={t("installation.copyApiBaseUrl")} />
         </Fact>
-        <Fact label={t("installation.id")}>{about.installation_id ? <CopyableId id={about.installation_id} /> : <span className="system-muted">{t("installation.unknown")}</span>}</Fact>
+        <Fact label={t("installation.id")}><CopyableId id={about.installation_id} /></Fact>
         <Fact label={t("installation.sourceCommit")}>{about.source_commit ? <code className="system-code" title={about.source_commit}>{about.source_commit.slice(0, 12)}</code> : <span className="system-muted">{t("installation.unknown")}</span>}</Fact>
       </dl>
     </Section>
diff --git a/apps/web/src/i18n/locales/en/core-errors.ts b/apps/web/src/i18n/locales/en/core-errors.ts
index d263d3e24..77b2cd7f2 100644
--- a/apps/web/src/i18n/locales/en/core-errors.ts
+++ b/apps/web/src/i18n/locales/en/core-errors.ts
@@ -19,7 +19,6 @@ export const coreErrors = {
   "project_exists": "A Project with this name already exists.",
   "project_api_key_exists": "An active API key with this name already exists.",
   "executor_credential_exists": "An executor credential with this name already exists.",
-  "credential_storage_unavailable": "Core credential storage is unavailable. Check its credential encryption configuration.",
   "internal_error": "Core could not complete the request.",
   "sandbox_generation_stale": "Core has a newer sandbox configuration. Refresh and review it before submitting again.",
   "sandbox_reset_required": "Reset the sandbox deployment before changing this configuration.",
@@ -37,7 +36,7 @@ export const coreErrors = {
   "sandbox_specification_mismatch": "The saved sandbox specification does not match the deployment. Refresh to check the configuration.",
   "sandbox_operation_unsupported": "The selected sandbox provider does not support this operation.",
   "environment_unavailable": "The Session's environment is no longer available.",
-  "execution_unavailable": "Execution is not available on this Core.",
+  "execution_unavailable": "Execution is temporarily unavailable. Try again later.",
   "runtime_history_unavailable": "Runtime history is unavailable on this Core.",
   "runtime_history_unsupported": "Runtime history is not supported for this Session.",
   "core_metrics_unavailable": "Core metrics could not be read. Try again later.",
diff --git a/apps/web/src/i18n/locales/en/keys.ts b/apps/web/src/i18n/locales/en/keys.ts
index 7a7faf8d1..5f15a8187 100644
--- a/apps/web/src/i18n/locales/en/keys.ts
+++ b/apps/web/src/i18n/locales/en/keys.ts
@@ -108,7 +108,6 @@ export const keys = {
     loading: "Reading the API address",
     failed: "The API address couldn't be read.",
     localOnly: "For access from other machines, set OAC_PUBLIC_URL to an address they can reach.",
-    noAddress: "Core has no public API address yet. Set OAC_PUBLIC_URL.",
     model: "Replace {{model}} with a model name your model provider serves, or remove the model field to use this deployment's default model configuration. Running an Agent needs a model provider: pass one in each request, save one on the Agent, or rely on the deployment default. Self-hosted Sessions never use the deployment default.",
     keyPlaceholder: "<project API key>",
     projectKey: "Set OPENAI_API_KEY to an API key issued for this project. A key is shown only once, when it is issued; if it's lost, issue a new one.",
diff --git a/apps/web/src/i18n/locales/en/system.ts b/apps/web/src/i18n/locales/en/system.ts
index dda2183a5..cacaa5427 100644
--- a/apps/web/src/i18n/locales/en/system.ts
+++ b/apps/web/src/i18n/locales/en/system.ts
@@ -11,7 +11,6 @@ export const system = {
     apiBaseUrlHelp: "Applications use it as OPENAI_BASE_URL, with a Project API key as OPENAI_API_KEY.",
     copyApiBaseUrl: "Copy API base URL",
     localOnly: "Only reachable on the Core machine",
-    notSet: "Not set",
     id: "Installation ID",
     sourceCommit: "Source commit",
     unknown: "Unknown",
@@ -87,7 +86,6 @@ export const system = {
       save: "Save",
       saving: "Saving…",
       uncertain: "Core did not confirm the change. The default model configurations were read again; check them before trying again.",
-      noCredentialKey: "Core has no credential encryption key configured, so it can't store keys. Installer-based installs configure this automatically; for manual deployments, set OAC_CREDENTIAL_KEY_FILE for Core.",
     },
     clearDialog: {
       title: "Clear default model configuration",
diff --git a/apps/web/src/i18n/locales/en/vaults.ts b/apps/web/src/i18n/locales/en/vaults.ts
index 4160c743c..3155078da 100644
--- a/apps/web/src/i18n/locales/en/vaults.ts
+++ b/apps/web/src/i18n/locales/en/vaults.ts
@@ -30,7 +30,6 @@ export const vaults = {
     newToken: "New bearer token", token: "Bearer token", tokenHelp: "Write only. It is sent once, immediately cleared, and never stored in browser state, metadata, previews, or logs.",
   },
   errors: {
-    storageUnavailable: "Credential encryption is not configured on this Core. Configure OAC_CREDENTIAL_KEY_FILE and restart Core before creating or replacing a token.",
     auth: "Core authentication failed. The Credential was not confirmed.", missing: "The Vault or Credential is no longer available. Refresh before trying again.",
     tooLarge: "The Credential request exceeded Core's accepted size.", invalidFields: "Core rejected the Credential fields. Check the name, exact HTTPS URL, and token format.",
     credentialUncertain: "The Credential write outcome was not confirmed. The catalog was refreshed; review it before explicitly trying again.",
diff --git a/apps/web/src/i18n/locales/zh-CN/core-errors.ts b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
index 705b712d4..bc0350a15 100644
--- a/apps/web/src/i18n/locales/zh-CN/core-errors.ts
+++ b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
@@ -18,7 +18,6 @@ export const coreErrors = {
   "project_exists": "此项目名称已被使用。",
   "project_api_key_exists": "此名称已被使用中的 API Key 占用。",
   "executor_credential_exists": "此名称的执行器凭证已存在。",
-  "credential_storage_unavailable": "Core 凭证存储不可用，请检查凭证加密配置。",
   "internal_error": "Core 未能完成请求。",
   "sandbox_generation_stale": "Core 的沙箱配置已更新。请刷新并检查后再提交。",
   "sandbox_reset_required": "请先重置沙箱部署，再更改此配置。",
@@ -36,7 +35,7 @@ export const coreErrors = {
   "sandbox_specification_mismatch": "已保存的沙箱规格与部署不一致。请刷新检查配置。",
   "sandbox_operation_unsupported": "所选沙箱提供商不支持此操作。",
   "environment_unavailable": "此 Session 的环境已不可用。",
-  "execution_unavailable": "此 Core 不提供执行功能。",
+  "execution_unavailable": "执行暂时不可用，请稍后重试。",
   "runtime_history_unavailable": "此 Core 上的 Runtime 历史不可用。",
   "runtime_history_unsupported": "此 Session 不支持 Runtime 历史。",
   "core_metrics_unavailable": "无法读取 Core 指标，请稍后重试。",
diff --git a/apps/web/src/i18n/locales/zh-CN/keys.ts b/apps/web/src/i18n/locales/zh-CN/keys.ts
index 1a458c22b..b5340bd6a 100644
--- a/apps/web/src/i18n/locales/zh-CN/keys.ts
+++ b/apps/web/src/i18n/locales/zh-CN/keys.ts
@@ -110,7 +110,6 @@ export const keys: TranslationShape<typeof english> = {
     loading: "正在读取 API 地址",
     failed: "无法读取 API 地址。",
     localOnly: "从其他机器调用前，请先把 OAC_PUBLIC_URL 设为它们能访问的地址。",
-    noAddress: "Core 尚未配置公开 API 地址，请设置 OAC_PUBLIC_URL。",
     model: "把 {{model}} 换成模型服务提供的模型名；也可以删掉 model 字段，使用本部署的默认模型配置。运行 Agent 需要模型服务：在每个请求里传入、保存在 Agent 上，或使用部署默认值。自托管 Session 不使用部署默认值。",
     keyPlaceholder: "<项目 API key>",
     projectKey: "把 OPENAI_API_KEY 设为这个项目签发的 API key。key 只在签发时显示一次；丢失后请签发新 key。",
diff --git a/apps/web/src/i18n/locales/zh-CN/system.ts b/apps/web/src/i18n/locales/zh-CN/system.ts
index 770c992ce..5bb291887 100644
--- a/apps/web/src/i18n/locales/zh-CN/system.ts
+++ b/apps/web/src/i18n/locales/zh-CN/system.ts
@@ -13,7 +13,6 @@ export const system: TranslationShape<typeof english> = {
     apiBaseUrlHelp: "应用把它设为 OPENAI_BASE_URL，并把项目 API key 设为 OPENAI_API_KEY。",
     copyApiBaseUrl: "复制 API 基础地址",
     localOnly: "只能在 Core 所在的机器上访问",
-    notSet: "未设置",
     id: "安装 ID",
     sourceCommit: "源码提交",
     unknown: "未知",
@@ -89,7 +88,6 @@ export const system: TranslationShape<typeof english> = {
       save: "保存",
       saving: "正在保存…",
       uncertain: "Core 没有确认这次修改。已重新读取默认模型配置，请先核对再重试。",
-      noCredentialKey: "Core 没有配置凭据加密密钥，因此无法保存 key。用安装器安装的会自动配置；手动部署时，请为 Core 设置 OAC_CREDENTIAL_KEY_FILE。",
     },
     clearDialog: {
       title: "清除默认模型配置",
diff --git a/apps/web/src/i18n/locales/zh-CN/vaults.ts b/apps/web/src/i18n/locales/zh-CN/vaults.ts
index 52a7ef2ef..ca25fd7c0 100644
--- a/apps/web/src/i18n/locales/zh-CN/vaults.ts
+++ b/apps/web/src/i18n/locales/zh-CN/vaults.ts
@@ -8,5 +8,5 @@ export const vaults: TranslationShape<typeof english> = {
   detail: { back: "返回", facts: "Vault 详情", id: "ID", created: "创建时间", metadata: "元数据", credentials: "Credential", credentialsHelp: "静态 bearer 令牌只可写入：Core 不会返回令牌，所以这里只显示元数据。替换令牌不会在 provider 侧撤销旧令牌。", name: "名称", url: "MCP 服务 URL", auth: "认证方式", updated: "更新时间", addCredential: "添加 Credential", deleteVault: "删除 Vault", staticBearer: "静态 bearer", oauth: "OAuth", tokenHidden: "令牌已隐藏" },
   createForm: { name: "名称", namePlaceholder: "运行时 Credential", nameHelp: "必填。去除首尾空格后的名称最多 256 个 UTF-8 字节。", metadata: "元数据", optional: "可选", metadataHelp: "输入值为字符串的 JSON 对象。留空会转为 {{emptyObject}}；编码后的元数据最大为 64 KiB。", metadataWarning: "Vault 元数据是公开的。切勿在此填写密钥、令牌、密码、凭据或私有连接信息。", creating: "创建中…", create: "创建 Vault" },
   credentialDialog: { replaceTitle: "替换令牌 · {{name}}", addTitle: "添加静态 bearer Credential", saving: "保存中…", create: "创建 Credential", notConfirmed: "Credential 未确认", name: "名称", namePlaceholder: "内部 MCP", exactUrl: "精确 MCP 服务 URL", urlHelp: "此 URL 必须与 Agent MCP 定义完全一致。创建此资源不会发起网络请求。", replaceWarning: "旧令牌不会被读取或显示。正在运行的工作可能已经持有它；替换操作不会撤销 provider 侧令牌。", newToken: "新 bearer 令牌", token: "Bearer 令牌", tokenHelp: "只可写入。令牌只发送一次，随后立即清除，且绝不会保存到浏览器状态、元数据、预览或日志中。" },
-  errors: { storageUnavailable: "此 Core 未配置 Credential 加密。请配置 OAC_CREDENTIAL_KEY_FILE 并重启 Core，再创建或替换令牌。", auth: "Core 认证失败，Credential 未确认。", missing: "Vault 或 Credential 已不存在。请刷新后重试。", tooLarge: "Credential 请求超过 Core 接受的大小。", invalidFields: "Core 拒绝了 Credential 字段。请检查名称、精确 HTTPS URL 和令牌格式。", credentialUncertain: "未能确认 Credential 写入结果。目录已刷新；再次明确重试前请先检查。", bearer: "请输入非空的 RFC 6750 bearer 令牌。空白或其他仅能保存的不透明值无法在当前运行时执行。", credentialName: "Credential 名称必须为 1 至 256 个 UTF-8 字节。", exactUrl: "请输入不含凭据、查询参数、片段、空白或反斜杠的精确 HTTPS MCP URL。", createUncertain: "未能确认 Vault 创建结果。草稿保持不变；再次明确重试前请检查当前 Core 状态。", vaultName: "名称必须为 1 至 256 个 UTF-8 字节。", metadataUnknown: "无法验证元数据。", metadataJson: "元数据必须是有效 JSON。", metadataShape: "元数据必须是值为字符串的 JSON 对象。", metadataStrings: "元数据值必须全部为字符串；不支持嵌套值、数组、数字、布尔值和 null。", metadataLarge: "元数据经 UTF-8 JSON 编码后最大为 64 KiB。", mismatchedMetadata: "OpenAgentCore 返回的 Vault 元数据不匹配。", uniqueAttachments: "附加的 Vault 不能重复。", catalogIncomplete: "尚未从此 Core 完整加载 Credential 元数据。", vaultMissing: "所选 Vault 已不在当前目录中。", credentialMismatch: "MCP 服务 {{server}} 引用了不可用或 URL 不匹配的 Credential。", credentialVaultMissing: "MCP 服务 {{server}} 引用的 Credential 所属 Vault 不可用。", multipleCredentials: "匿名 MCP 服务 {{server}} 在所选 Vault 中匹配到多个 Credential。请选择唯一匹配的 Vault，或明确配置一个 Credential。", matchedVaultMissing: "MCP 服务 {{server}} 匹配到的 Credential 所属 Vault 不可用。" },
+  errors: { auth: "Core 认证失败，Credential 未确认。", missing: "Vault 或 Credential 已不存在。请刷新后重试。", tooLarge: "Credential 请求超过 Core 接受的大小。", invalidFields: "Core 拒绝了 Credential 字段。请检查名称、精确 HTTPS URL 和令牌格式。", credentialUncertain: "未能确认 Credential 写入结果。目录已刷新；再次明确重试前请先检查。", bearer: "请输入非空的 RFC 6750 bearer 令牌。空白或其他仅能保存的不透明值无法在当前运行时执行。", credentialName: "Credential 名称必须为 1 至 256 个 UTF-8 字节。", exactUrl: "请输入不含凭据、查询参数、片段、空白或反斜杠的精确 HTTPS MCP URL。", createUncertain: "未能确认 Vault 创建结果。草稿保持不变；再次明确重试前请检查当前 Core 状态。", vaultName: "名称必须为 1 至 256 个 UTF-8 字节。", metadataUnknown: "无法验证元数据。", metadataJson: "元数据必须是有效 JSON。", metadataShape: "元数据必须是值为字符串的 JSON 对象。", metadataStrings: "元数据值必须全部为字符串；不支持嵌套值、数组、数字、布尔值和 null。", metadataLarge: "元数据经 UTF-8 JSON 编码后最大为 64 KiB。", mismatchedMetadata: "OpenAgentCore 返回的 Vault 元数据不匹配。", uniqueAttachments: "附加的 Vault 不能重复。", catalogIncomplete: "尚未从此 Core 完整加载 Credential 元数据。", vaultMissing: "所选 Vault 已不在当前目录中。", credentialMismatch: "MCP 服务 {{server}} 引用了不可用或 URL 不匹配的 Credential。", credentialVaultMissing: "MCP 服务 {{server}} 引用的 Credential 所属 Vault 不可用。", multipleCredentials: "匿名 MCP 服务 {{server}} 在所选 Vault 中匹配到多个 Credential。请选择唯一匹配的 Vault，或明确配置一个 Credential。", matchedVaultMissing: "MCP 服务 {{server}} 匹配到的 Credential 所属 Vault 不可用。" },
 };
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/lib/locale-strings.ts
index 109fcd4ae..6d2141165 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/lib/locale-strings.ts
@@ -164,7 +164,6 @@ export const chinese = {
   "Clean up the host": "清理主机",
   "{{name}} is removed from Core. To remove its service and files from the host, run:": "{{name}} 已从 Core 移除。要删除它在主机上的服务和文件，请运行：",
   "{{name}} is removed from Core, but its service and files stay on the host.": "{{name}} 已从 Core 移除，但它的服务和文件仍留在主机上。",
-  "An uninstall command needs a public URL that other machines can reach, and this installation has none.": "卸载命令需要其他机器能访问的公开地址，而当前安装没有。",
   "Other machines can't reach this installation's public URL, {{url}}, so no uninstall command can be given.": "其他机器无法访问本安装的公开地址 {{url}}，因此无法生成卸载命令。",
   "Uninstall command": "卸载命令",
   "Copy {{command}}": "复制 {{command}}",
diff --git a/contracts/agents-api/admin-api.md b/contracts/agents-api/admin-api.md
index ca0356b5c..16ca46a78 100644
--- a/contracts/agents-api/admin-api.md
+++ b/contracts/agents-api/admin-api.md
@@ -132,9 +132,9 @@ Core writes this record in the same transaction that creates the Session. Later
 | Field | Meaning |
 | --- | --- |
 | `object` | `core.installation` |
-| `installation_id` | The installation ID from `OAC_INSTALLATION_ID_FILE` ([Compose installations](../../docs/configuration.md#compose-installations)); null when Core runs without the sandbox manager |
-| `public_url` | The [`public_url`](../../docs/configuration.md#settings) setting: the origin applications, nodes, sandboxes and self-hosted executors use. Null when unset |
-| `api_base_url` | `public_url` followed by `/v1`, the `OPENAI_BASE_URL` for Project API keys. Null when `public_url` is null |
+| `installation_id` | The installation ID from `OAC_INSTALLATION_ID_FILE` ([Compose installations](../../docs/configuration.md#compose-installations)) |
+| `public_url` | The [`public_url`](../../docs/configuration.md#settings) setting: the origin applications, nodes, sandboxes and self-hosted executors use |
+| `api_base_url` | `public_url` followed by `/v1`, the `OPENAI_BASE_URL` for Project API keys |
 | `local_only` | True when `public_url` names a loopback host, which only the Core host reaches |
 | `source_commit` | The full source commit Core was built from; null for development builds |
 | `configuration` | The process settings Core loaded from its environment, under `settings` |
diff --git a/contracts/agents-api/core-errors.md b/contracts/agents-api/core-errors.md
index 3873dcdf5..33ee247ae 100644
--- a/contracts/agents-api/core-errors.md
+++ b/contracts/agents-api/core-errors.md
@@ -90,12 +90,11 @@ These codes have null `param` and no `details`. [Sandbox deployment](./sandbox-d
 | 409 | `sandbox_deployment_conflict` | The sandbox deployment cannot change in its current state |
 | 409 | `sandbox_specification_mismatch` | The saved deployment specification is no longer valid for its provider |
 | 409 | `runtime_node_in_use` | The node still holds allocations, snapshots, reservations or pending cleanup |
-| 409 | `environment_unavailable` | The Session's environment is no longer available, such as an archive on a Core without execution |
+| 409 | `environment_unavailable` | The Session's environment is no longer available, such as a hosted environment that failed to provision |
 | 409 | `runtime_history_unsupported` | Runtime history is not supported for the Session |
 | 500 | `internal_error` | Core could not complete the operation |
 | 503 | `runtime_node_unavailable` | No sandbox node is available or has capacity |
-| 503 | `credential_storage_unavailable` | Core has no credential encryption key |
-| 503 | `execution_unavailable` | Execution is not available on this Core |
+| 503 | `execution_unavailable` | Execution is not available, such as while Core shuts down |
 | 503 | `runtime_history_unavailable` | Durable Runtime history is not configured or temporarily unavailable |
 | 503 | `core_metrics_unavailable` | Core metrics could not be read |
 | 503 | `file_transfer_unavailable` | Bounded content transfer is unavailable |
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index 9a1ef6ea1..90fbd2970 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -427,17 +427,15 @@ definitions:
       address_bindings:
         $ref: '#/definitions/deployment.AddressBindings'
       api_base_url:
-        description: public_url followed by /v1; null when public_url is null.
+        description: public_url followed by /v1.
         type: string
-        x-nullable: true
       configuration:
         allOf:
           - $ref: '#/definitions/api.InstallationConfiguration'
         description: The process settings Core loaded.
       installation_id:
-        description: The ID in OAC_INSTALLATION_ID_FILE; null when Core runs without the sandbox manager.
+        description: The ID in OAC_INSTALLATION_ID_FILE.
         type: string
-        x-nullable: true
       local_only:
         description: True when public_url names a loopback host, reachable only from the Core host.
         type: boolean
@@ -446,9 +444,8 @@ definitions:
           - core.installation
         type: string
       public_url:
-        description: 'OAC_PUBLIC_URL: the origin applications, nodes, sandboxes and self-hosted executors use. Null when unset.'
+        description: 'OAC_PUBLIC_URL: the origin applications, nodes, sandboxes and self-hosted executors use.'
         type: string
-        x-nullable: true
       source_commit:
         description: Full source commit Core was built from; null for development builds.
         type: string
diff --git a/contracts/agents-api/environment-executor-credentials.md b/contracts/agents-api/environment-executor-credentials.md
index bd58ce767..90e7d518f 100644
--- a/contracts/agents-api/environment-executor-credentials.md
+++ b/contracts/agents-api/environment-executor-credentials.md
@@ -35,7 +35,7 @@ The installer calls these machine routes on Core:
 | `POST /api/v1/agent-daemon/installation` | Grant | The frozen binding: `version`, `protocol_version`, `environment_id`, `remote_url`, `workspace_directory`, `harness` |
 | `POST /api/v1/agent-daemon/installation/claim` | Grant | `{"executor_token":"SECRET"}`; 204 |
 
-An invalid or expired grant returns 401 `installation_authorization_invalid`. Without matching installers the grant routes return 503 `installation_unavailable`. Core signs each grant with the installation's [`secrets/core/credential.key`](../../docs/configuration.md#compose-installations); without a configured key, the Session responses and Core-key read above and the grant routes return 503 `credential_storage_unavailable`. A malformed secret returns 400. Artifact routes carry no credential, and the grant is sent only to Core, never to an artifact host.
+An invalid or expired grant returns 401 `installation_authorization_invalid`. Without matching installers the grant routes return 503 `installation_unavailable`. Core signs each grant with the installation's [`secrets/core/credential.key`](../../docs/configuration.md#compose-installations). A malformed secret returns 400. Artifact routes carry no credential, and the grant is sent only to Core, never to an artifact host.
 
 ## Core-key routes
 
diff --git a/contracts/agents-api/model-execution.md b/contracts/agents-api/model-execution.md
index 8d8751577..f843c7ecc 100644
--- a/contracts/agents-api/model-execution.md
+++ b/contracts/agents-api/model-execution.md
@@ -57,7 +57,7 @@ The deployment default holds the operator's key, so it stays on operator compute
 
 An empty Session execution extension is invalid. An explicit null provider requests inheritance; an empty or partial provider object is invalid. Unknown, duplicate or output-only saved-provider fields are rejected. A saved Agent without a Harness may save a valid bundle; its Harness compatibility is checked at Session admission. A provider-only Agent update keeps the saved Harness and validates the merged combination under the row lock. The Session's inline `agent.x_agents_core` accepts `harness` and `harness_config`; the provider override belongs at the request's top level.
 
-Core reads the Agent configuration and encrypted bundle from one database snapshot; an explicit complete Session override needs no decryption of the saved bundle. The Session's own encrypted snapshot is written atomically with the Session and its Environment. Existing Sessions never consult the Agent again: edits, key replacement, deletion, suspension and restarts cannot change their model, Harness or provider. A missing or wrong encryption key fails closed; keep the same [credential key](../../docs/configuration.md#compose-installations) across restarts. There is no Turn-level override.
+Core reads the Agent configuration and encrypted bundle from one database snapshot; an explicit complete Session override needs no decryption of the saved bundle. The Session's own encrypted snapshot is written atomically with the Session and its Environment. Existing Sessions never consult the Agent again: edits, key replacement, deletion, suspension and restarts cannot change their model, Harness or provider. A wrong encryption key fails closed; keep the same [credential key](../../docs/configuration.md#compose-installations) across restarts. There is no Turn-level override.
 
 New hosted requests, and requests that omit the inline model, record caller intent before resolving mutable defaults. Other inline requests, such as `none`, keep the resolved-request retry rule; that hash leaves out the deployment default, so changing the default does not change their retry identity. A matching creation retry recovers the committed Session before resolving the Agent or provider again and enqueues no further input. Streaming is outside the retry identity. The [TypeScript client](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/packages/agents-client/README.md#saved-agent-and-deployment-defaults) shows saved Agents and deployment defaults.
 
@@ -119,7 +119,7 @@ The deployment default is a runtime setting stored in Core: one complete model c
 | `PUT /core/v1/harnesses/{harness}/model-configuration` | Replace `{model_provider, model, harness_config}` using the shared provider and native-parameter validators |
 | `DELETE /core/v1/harnesses/{harness}/model-configuration` | Remove it; idempotent, 204 |
 
-PUT requires `model` and a complete `model_provider`; `harness_config` defaults to `{}`. Reads return `model`, `harness_config`, the safe `model_provider` view (`protocol`, `base_url`, optional token limits and `api_key_configured`), observations and `updated_at`, never the key. The bundle is encrypted with its own purpose and bound to the Harness. Each write records an administrator audit entry (`resource_type: deployment_model_provider`, the Harness as `resource_id`, action `set` or `delete`, `project_id` null) without the key. A missing or wrong encryption key fails closed: writes, and Session creation that needs the default, return 503 `credential_storage_unavailable`.
+PUT requires `model` and a complete `model_provider`; `harness_config` defaults to `{}`. Reads return `model`, `harness_config`, the safe `model_provider` view (`protocol`, `base_url`, optional token limits and `api_key_configured`), observations and `updated_at`, never the key. The bundle is encrypted with its own purpose and bound to the Harness. Each write records an administrator audit entry (`resource_type: deployment_model_provider`, the Harness as `resource_id`, action `set` or `delete`, `project_id` null) without the key. A default sealed under another encryption key fails closed: reading it, and Session creation that needs it, return 500 `internal_error` until the default is set again.
 
 Session creation decrypts the default of the resolved Harness and freezes it in the Session's encrypted snapshot like any other bundle, so changing or removing the default never reaches existing Sessions. The execution-configuration read shows the frozen safe view with source `deployment`. A missing or invalid provider snapshot fails closed, with no fallback to another model or provider.
 
diff --git a/contracts/agents-api/runtime-observability.md b/contracts/agents-api/runtime-observability.md
index a30353900..c91351dac 100644
--- a/contracts/agents-api/runtime-observability.md
+++ b/contracts/agents-api/runtime-observability.md
@@ -83,7 +83,7 @@ CPU quietness, heartbeat age, connection state and keepalive time are not idle t
 
 ### Periodic sampling
 
-Periodic collection runs only with the execution worker (Core started with `OAC_PUBLIC_URL`; see the [Core environment](../../docs/configuration.md#appendix-core-environment-without-the-installer)) and under the worker's database lease. A Core without it stores no history and answers every history read with 503; current reads work on either.
+Periodic collection runs in the execution Worker, under its database lease.
 
 The sampler sweeps once at startup and again each sampling interval after the previous sweep ends. A sweep is a keyset scan, in Session ID order, of the Sessions that are not deleted, are `openai_hosted` and have no released allocation. It reads pages of 32 Sessions through the same resolver and sources as current reads, with eight concurrent reads and two seconds per source. The sampler checks the lease before each page and every 100 ms during a sweep, cancels in-flight reads when ownership is lost, and checks it again before handing each record to export. A failed row does not stop the sweep, and an incomplete sweep is repeated at the next interval.
 
diff --git a/contracts/agents-api/sandbox-deployment.md b/contracts/agents-api/sandbox-deployment.md
index c13eeba34..3e813ad98 100644
--- a/contracts/agents-api/sandbox-deployment.md
+++ b/contracts/agents-api/sandbox-deployment.md
@@ -217,7 +217,6 @@ Some fields keep one name across providers but differ in meaning, or do not appl
 | 409 | `sandbox_deployment_conflict` | Another state the change cannot apply to |
 | 409 | `runtime_node_in_use` | Node removal while it holds resources |
 | 503 | `execution_unavailable` | Provider preparation is unavailable |
-| 503 | `credential_storage_unavailable` | Core has no credential encryption key |
 
 Storage and credential failures stay errors: an empty or failed read never proves cleanup. The [machine connection API](./machine-api.md#node-route-errors) lists the errors of the node routes.
 
diff --git a/contracts/agents-api/sessions-events.md b/contracts/agents-api/sessions-events.md
index 7615b7384..de744cf36 100644
--- a/contracts/agents-api/sessions-events.md
+++ b/contracts/agents-api/sessions-events.md
@@ -39,7 +39,7 @@ A Session stays usable after a Turn fails: new input starts a new Turn. Later re
 - **Cancellation.** A queued Turn is cancelled without a live Runtime. A running Turn is cancelled when the Runtime confirms it; completion can win that race. The Turn has stopped when it reads `cancelled`, not when the request returns. A cancellation on an idle Session with no pending input is accepted and has no effect; while an input reservation is pending, it returns 409.
 - **Function results.** `turn_id`, `call_id` and `success` are required; `output` and `error` are optional and nullable ([content rules](./message-content.md#function-results)). An identical repeated result returns 202 without another application or event. The result Item appears when the harness applies the result; a result that cancellation prevents from being applied stays stored but produces no Item.
 - **Queueing.** A queued Turn starts when a Runtime that supports the Session's harness and configuration is connected and one of Core's [`core.execution_concurrency`](../../docs/configuration.md#settings) work slots is free. A Session stays bound to the Runtime that first ran it.
-- **Execution availability.** A service without execution returns 503 `execution_unavailable`, and a Worker that loses execution ownership returns 503.
+- **Execution availability.** While Core shuts down, or after its Worker loses execution ownership, requests return 503 `execution_unavailable`.
 
 ### Sessions with an Environment
 
diff --git a/contracts/agents-api/vaults.md b/contracts/agents-api/vaults.md
index a05e76511..aaa3a9bac 100644
--- a/contracts/agents-api/vaults.md
+++ b/contracts/agents-api/vaults.md
@@ -139,10 +139,10 @@ Token endpoints must be HTTPS. Core resolves the host, rejects loopback, private
 
 Core seals every token, refresh token and client secret with AES-256-GCM under the installation's [`secrets/core/credential.key`](../../docs/configuration.md#compose-installations), bound to the Project, Vault, Credential, auth type and `mcp_server_url`. A wrong key, a modified row or a row moved to another binding fails to decrypt. Names are metadata outside the binding. The key and plaintext tokens exist in trusted service memory; encryption protects stored secrets and does not protect against a compromised service host.
 
-Without a configured key, Credential creation and replacement return 503 `credential_storage_unavailable` before writing; reads, lists, deletion and Vault operations still work. An unreadable or malformed key file stops Core at startup. Losing or replacing the key makes every stored secret unusable; Core supports one key, with no rotation or re-encryption.
+An unreadable or malformed key file stops Core at startup. Losing or replacing the key makes every stored secret unusable. Reads, lists, deletion, Vault operations, new Credentials and `static_bearer` token replacements still work; an `mcp_oauth` update returns 500 `internal_error`, and a dispatch that needs an old secret fails. A saved E2B key is lost too, so hosted Sessions return 503 `execution_unavailable` until you open **System** → **Manage sandbox configuration**, choose **Reset deployment** (with **Force — cancel remaining work now** if needed) and set up the backend again; sandboxes left behind expire under their E2B timeout. Core supports one key, with no rotation or re-encryption.
 
 ## Deletion
 
-Deleting a Credential, or its Vault, removes the credential rows. It does not erase secrets from PostgreSQL pages, write-ahead logs, backups or native history. Afterwards its reads, updates and repeated deletion return 404, lists omit it, new Sessions cannot select it and new Credentials cannot be created in a deleted Vault (a missing storage key still answers 503 first).
+Deleting a Credential, or its Vault, removes the credential rows. It does not erase secrets from PostgreSQL pages, write-ahead logs, backups or native history. Afterwards its reads, updates and repeated deletion return 404, lists omit it, new Sessions cannot select it and new Credentials cannot be created in a deleted Vault.
 
 Existing Sessions keep their frozen attachments and selections, and their history stays readable. The next dispatch that needs a deleted Credential fails; Core neither selects another Credential nor connects anonymously. Deletion does not cancel running work, withdraw a token already sent to a Runtime or revoke the grant at its provider: cancel the Session and revoke the grant yourself when needed. Revoked or invalid OAuth grants likewise fail until replaced.
diff --git a/contracts/agents-api/zh/admin-api.md b/contracts/agents-api/zh/admin-api.md
index 8ce891d43..886d98255 100644
--- a/contracts/agents-api/zh/admin-api.md
+++ b/contracts/agents-api/zh/admin-api.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理 API"
 source: contracts/agents-api/admin-api.md
-source_hash: 7eb295db6402db8dae91fcdd97f90a5900f740925caaee9d0172b9886544f6ec
+source_hash: 8a781b20f0a359de77594ca570c4e1723332ac16a60d9a9be405ca5e2422e87d
 ---
 
 Core 管理 API（`/core/v1`）用于管理安装实例：Project 及其 API 密钥、Project 资源的读取和删除、执行器凭据、部署默认模型、沙箱部署及其节点、监控和审计。Web 的[控制台服务器](../../../docs/zh/web/console-server.md#forwarding-to-core)会为已登录的管理员调用它；运维人员则从 Core 主机上的脚本调用它（[编写 Core API 脚本](../../../docs/zh/getting-started/operations.md#script-the-core-api)）。生成的架构是 [core.openapi.yaml](../core.openapi.yaml)，所有错误都使用 [Core 错误封装](core-errors.md)。
@@ -134,9 +134,9 @@ Core 会在创建 Session 的同一事务中写入此记录。之后的 Agent 
 | 字段 | 含义 |
 | --- | --- |
 | `object` | `core.installation` |
-| `installation_id` | `OAC_INSTALLATION_ID_FILE` 中的安装 ID（[Compose 安装](../../../docs/zh/configuration.md#compose-installations)）；Core 在不使用沙箱管理器运行时为 null |
-| `public_url` | `public_url` 设置（[设置](../../../docs/zh/configuration.md#settings)）：应用程序、节点、沙箱和自托管执行器使用的源地址。未设置时为 null |
-| `api_base_url` | 在 `public_url` 后附加 `/v1`，即 Project API 密钥使用的 `OPENAI_BASE_URL`。当 `public_url` 为 null 时为 null |
+| `installation_id` | `OAC_INSTALLATION_ID_FILE` 中的安装 ID（[Compose 安装](../../../docs/zh/configuration.md#compose-installations)） |
+| `public_url` | `public_url` 设置（[设置](../../../docs/zh/configuration.md#settings)）：应用程序、节点、沙箱和自托管执行器使用的源地址 |
+| `api_base_url` | 在 `public_url` 后附加 `/v1`，即 Project API 密钥使用的 `OPENAI_BASE_URL` |
 | `local_only` | 当 `public_url` 指向回环主机时为 True，该主机只能由 Core 主机访问 |
 | `source_commit` | Core 构建所依据的完整源代码提交；开发构建为 null |
 | `configuration` | Core 从环境加载的进程设置，位于 `settings` 中 |
diff --git a/contracts/agents-api/zh/core-errors.md b/contracts/agents-api/zh/core-errors.md
index a0d533547..b7ba9abb3 100644
--- a/contracts/agents-api/zh/core-errors.md
+++ b/contracts/agents-api/zh/core-errors.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理错误"
 source: contracts/agents-api/core-errors.md
-source_hash: 78fcbde855beafae4d1f5eb38b87596eeca25c99c025c6c54978db988d2a534a
+source_hash: 46b6e7eb76739b9473576113aad3eee64fff3fddd429c3232ede67f671d60ed7
 ---
 
 `/core/v1` 上的错误使用此封装结构。`message` 是安全的英文文本；`code` 和 `param` 可以为 null。客户端依据稳定的 `code` 和可选的 `param` 进行处理，对未知代码显示 `message`，绝不解析消息，也绝不自动重试被拒绝的写操作。
@@ -92,12 +92,11 @@ Web 的控制台服务器在 `/core` 路径上发生自身故障时使用此封
 | 409 | `sandbox_deployment_conflict` | 沙箱部署在当前状态下无法更改 |
 | 409 | `sandbox_specification_mismatch` | 已保存的部署规格对其提供商不再有效 |
 | 409 | `runtime_node_in_use` | 节点仍有资源分配、快照、预留资源或待清理项 |
-| 409 | `environment_unavailable` | Session 的环境已不可用，例如在不提供执行的 Core 上归档 |
+| 409 | `environment_unavailable` | Session 的环境已不可用，例如托管环境创建失败 |
 | 409 | `runtime_history_unsupported` | 该 Session 不支持 Runtime 历史 |
 | 500 | `internal_error` | Core 未能完成操作 |
 | 503 | `runtime_node_unavailable` | 没有可用或有剩余容量的沙箱节点 |
-| 503 | `credential_storage_unavailable` | Core 没有凭证加密密钥 |
-| 503 | `execution_unavailable` | 此 Core 不提供执行功能 |
+| 503 | `execution_unavailable` | 执行不可用，例如 Core 正在关闭 |
 | 503 | `runtime_history_unavailable` | 持久 Runtime 历史未配置或暂时不可用 |
 | 503 | `core_metrics_unavailable` | 无法读取 Core 指标 |
 | 503 | `file_transfer_unavailable` | 有界内容传输不可用 |
diff --git a/contracts/agents-api/zh/environment-executor-credentials.md b/contracts/agents-api/zh/environment-executor-credentials.md
index 3d1fea6bf..59ea8d22c 100644
--- a/contracts/agents-api/zh/environment-executor-credentials.md
+++ b/contracts/agents-api/zh/environment-executor-credentials.md
@@ -1,7 +1,7 @@
 ---
 title: "Environment 执行器凭证"
 source: contracts/agents-api/environment-executor-credentials.md
-source_hash: 725257a92518431a4b942ea35187e37bb171f890d7797e843a9f4eb62f47ad4b
+source_hash: c929752dc1113b777308855ab416bc12aef07ae2d26df71c2e691cbef2832b8b
 ---
 
 执行器凭证允许 `oac-daemon` 为一个 `self_hosted` Environment 注册并连接。它只授权该 Environment 的私有 daemon 传输（`/api/v1/agent-daemon/*`），不授权 `/v1`、`/core/v1`、sandbox node 注册或 Project 资源。Project 的 principal 是其执行 principal。Core 只保存密钥摘要。
@@ -37,7 +37,7 @@ grant 绑定 Environment、Session 创建者的 principal 和 Core 构建版本
 | `POST /api/v1/agent-daemon/installation` | Grant | 固定绑定：`version`、`protocol_version`、`environment_id`、`remote_url`、`workspace_directory`、`harness` |
 | `POST /api/v1/agent-daemon/installation/claim` | Grant | `{"executor_token":"SECRET"}`；204 |
 
-无效或过期的 grant 返回 401 `installation_authorization_invalid`。没有匹配安装器时，grant 路由返回 503 `installation_unavailable`。Core 用安装的 [`secrets/core/credential.key`](../../../docs/zh/configuration.md#compose-installations) 签名每个 grant；未配置 key 时，上述 Session 响应、Core-key 查询和 grant 路由返回 503 `credential_storage_unavailable`。格式错误的密钥返回 400。产物路由不携带凭证，grant 只发送给 Core，不发送给产物主机。
+无效或过期的 grant 返回 401 `installation_authorization_invalid`。没有匹配安装器时，grant 路由返回 503 `installation_unavailable`。Core 用安装的 [`secrets/core/credential.key`](../../../docs/zh/configuration.md#compose-installations) 签名每个 grant。格式错误的密钥返回 400。产物路由不携带凭证，grant 只发送给 Core，不发送给产物主机。
 
 ## Core-key 路由 {#core-key-routes}
 
diff --git a/contracts/agents-api/zh/model-execution.md b/contracts/agents-api/zh/model-execution.md
index ca4231c01..7072ecff6 100644
--- a/contracts/agents-api/zh/model-execution.md
+++ b/contracts/agents-api/zh/model-execution.md
@@ -1,7 +1,7 @@
 ---
 title: "模型执行"
 source: contracts/agents-api/model-execution.md
-source_hash: ee651cc7bb506eab33a819aa40a97095270574a793dea95784104f19692fa4ec
+source_hash: 92f743c0ada60d86a2a107eb6528a9c6d89e7db2e664f522a99ad3711a53f9e8
 ---
 
 每个 Session 都运行一个 Harness，并使用一个模型提供商。Core 通过三个固定版本上游协议未定义的 Core 扩展来选择它们：`x_agents_core.harness` 选择 Harness，`x_agents_core.model_provider` 提供端点和密钥，`x_agents_core.harness_config` 携带原生模型参数。Core 没有提供商目录、模型别名解析或产品权限模型；除 Session 和已保存 Agent 配置包外，唯一存储的配置包是每个 Harness 的一个 [deployment default](#deployment-defaults)。本文档定义 Harness—模型提供商协议：[`internal/modelprovider/config.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/modelprovider/config.go) 负责验证冻结的提供商连接，每个 Harness 则通过 [`internal/harnessconfig/harness.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/internal/harnessconfig/harness.go) 声明其协议和原生参数。
@@ -59,7 +59,7 @@ MiniMax Code 要求上下文限制和输出限制均为正数。Core 会在写
 
 空的 Session 执行扩展无效。显式 null 提供商会请求继承；空的或不完整的提供商对象无效。已保存提供商配置中的未知字段、重复字段或只读输出字段均会被拒绝。没有 Harness 的已保存 Agent 可以保存有效配置包；其 Harness 兼容性会在 Session 准入时检查。仅更新提供商的 Agent 更新会保留已保存的 Harness，并在行锁保护下验证合并后的组合。Session 内联的 `agent.x_agents_core` 接受 `harness` 和 `harness_config`；提供商覆盖值必须放在请求顶层。
 
-Core 从同一个数据库快照读取 Agent 配置和加密配置包；显式提供完整 Session 覆盖值时，无需解密已保存的配置包。Session 自身的加密快照会与 Session 及其 Environment 原子写入。现有 Session 绝不会再次查询 Agent：Agent 编辑、密钥替换、删除、暂停和重启均无法改变其模型、Harness 或提供商。加密密钥缺失或错误时会安全失败；重启前后应保持相同的 [credential key](../../../docs/zh/configuration.md#compose-installations)。不存在 Turn 级覆盖。
+Core 从同一个数据库快照读取 Agent 配置和加密配置包；显式提供完整 Session 覆盖值时，无需解密已保存的配置包。Session 自身的加密快照会与 Session 及其 Environment 原子写入。现有 Session 绝不会再次查询 Agent：Agent 编辑、密钥替换、删除、暂停和重启均无法改变其模型、Harness 或提供商。加密密钥错误时会安全失败；重启前后应保持相同的 [credential key](../../../docs/zh/configuration.md#compose-installations)。不存在 Turn 级覆盖。
 
 新的托管请求以及省略内联模型的请求，会在解析可变默认值之前记录调用方意图。其他内联请求，例如 `none`，继续遵循已解析请求的重试规则；该哈希不包含部署默认值，因此更改默认值不会改变其重试标识。匹配的创建重试会在再次解析 Agent 或提供商之前恢复已提交的 Session，并且不会进一步加入输入。流式传输不参与重试标识的计算。[TypeScript client](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/packages/agents-client/README.md#saved-agent-and-deployment-defaults) 展示了已保存 Agent 和部署默认值。
 
@@ -121,7 +121,7 @@ Core 会在写入 Session 前验证解析后的配置，并将其冻结在 Sessi
 | `PUT /core/v1/harnesses/{harness}/model-configuration` | 使用共享的提供商和原生参数校验器替换 `{model_provider, model, harness_config}` |
 | `DELETE /core/v1/harnesses/{harness}/model-configuration` | 移除配置；幂等，返回 204 |
 
-PUT 要求提供 `model` 和完整的 `model_provider`；`harness_config` 默认为 `{}`。读取操作返回 `model`、`harness_config`、安全的 `model_provider` 视图（`protocol`、`base_url`、可选的 token 限制和 `api_key_configured`）、observations 和 `updated_at`，绝不返回密钥。该配置包使用自己的加密用途加密并绑定到 Harness。每次写入都会记录一条管理员审计条目（`resource_type: deployment_model_provider`，Harness 作为 `resource_id`，操作为 `set` 或 `delete`，`project_id` 为 null），且不包含密钥。加密密钥缺失或错误时会安全失败：写操作以及需要使用默认值的 Session 创建都会返回 503 `credential_storage_unavailable`。
+PUT 要求提供 `model` 和完整的 `model_provider`；`harness_config` 默认为 `{}`。读取操作返回 `model`、`harness_config`、安全的 `model_provider` 视图（`protocol`、`base_url`、可选的 token 限制和 `api_key_configured`）、observations 和 `updated_at`，绝不返回密钥。该配置包使用自己的加密用途加密并绑定到 Harness。每次写入都会记录一条管理员审计条目（`resource_type: deployment_model_provider`，Harness 作为 `resource_id`，操作为 `set` 或 `delete`，`project_id` 为 null），且不包含密钥。在其他加密密钥下密封的默认值会安全失败：读取该默认值以及需要它的 Session 创建都会返回 500 `internal_error`，直到重新设置默认值。
 
 创建 Session 时，Core 会解密解析后 Harness 的默认值，并像处理其他配置包一样将其冻结在 Session 的加密快照中，因此更改或移除默认值绝不会影响现有 Session。execution-configuration 读取结果会显示冻结的安全视图，其来源为 `deployment`。提供商快照缺失或无效时会安全失败，并且不会回退到其他模型或提供商。
 
diff --git a/contracts/agents-api/zh/runtime-observability.md b/contracts/agents-api/zh/runtime-observability.md
index b4ef0f415..223c463c9 100644
--- a/contracts/agents-api/zh/runtime-observability.md
+++ b/contracts/agents-api/zh/runtime-observability.md
@@ -1,7 +1,7 @@
 ---
 title: "运行时可观测性"
 source: contracts/agents-api/runtime-observability.md
-source_hash: d18a476b06248dedfa5630ccf0f8a29dff59677a1e161d1847cc7d05e0c48de8
+source_hash: 31fa597224d654f347c7f438bea78d8e548e7588849d4346c599aac8a8f8054c
 ---
 
 这是面向贡献者的契约，规定 Core 如何观测 Runtime 并保留其历史。路由和响应字段见 [Runtime telemetry API](runtime-observability-api.md)。代码位于 `services/core/internal/runtimeobs`（解析、源、采样器和导出）、`internal/runtimehistory`（历史查询和 PostgreSQL 存储）以及 `internal/runtimeobs/otlpexporter`。
@@ -85,7 +85,7 @@ CPU 静默状态、心跳时龄、连接状态和保活时间都不是空闲时
 
 ### 周期采样 {#periodic-sampling}
 
-周期采集仅随执行工作器运行而执行（Core 需使用 `OAC_PUBLIC_URL` 启动；见 [Core environment](../../../docs/zh/configuration.md#appendix-core-environment-without-the-installer)），并受该工作器的数据库租约保护。未运行该工作器的 Core 不存储历史记录，所有历史读取都返回 503；当前读取在两种情况下均可正常工作。
+周期采集在执行工作器中运行，并受其数据库租约保护。
 
 采样器在启动时扫描一次，此后每次扫描结束后再经过一个采样间隔再次扫描。一次扫描按 Session ID 顺序，对未删除、状态为 `openai_hosted` 且没有已释放分配的 Session 执行 keyset 扫描。它通过与当前读取相同的解析器和源，以 32 个 Session 为一页进行读取，并发数为 8，每个源时限为 2 秒。采样器在每页之前以及扫描期间每 100 ms 检查租约；失去所有权时取消进行中的读取；将每条记录交给导出之前再次检查租约。失败的行不会停止扫描；未完成的扫描会在下一个间隔重复。
 
diff --git a/contracts/agents-api/zh/sandbox-deployment.md b/contracts/agents-api/zh/sandbox-deployment.md
index 9e09f084b..f14dc75eb 100644
--- a/contracts/agents-api/zh/sandbox-deployment.md
+++ b/contracts/agents-api/zh/sandbox-deployment.md
@@ -1,7 +1,7 @@
 ---
 title: "沙箱部署"
 source: contracts/agents-api/sandbox-deployment.md
-source_hash: 2a6b114b7b4f324b2a68ee1f5bde5e9f229a2d44c06aa7c0dd4560bb4ed60166
+source_hash: f4ecc42b24dd85d2bfe3e054358aa2087331aa3110ba031bbc824cece58a54c3
 ---
 
 沙箱部署为 Core 管理的 `openai_hosted` 执行选择 Sandbox Provider、每个沙箱的资源以及不可变的 Runtime 发行版。PostgreSQL 为每个安装维护一个当前有效选择；Web 和 Core API 写入同一配置。节点文件保存其已安装副本和特定于主机的路径，且不能覆盖其资源或 Runtime。该选择独立于 Harness；部署可以保持未配置状态，既无节点，也不接受托管准入。
@@ -219,7 +219,6 @@ POST 会在持久保存候选配置之前对其进行验证，并且不会创建
 | 409 | `sandbox_deployment_conflict` | 更改无法应用于另一种状态 |
 | 409 | `runtime_node_in_use` | 节点仍持有资源时移除节点 |
 | 503 | `execution_unavailable` | 无法准备提供商 |
-| 503 | `credential_storage_unavailable` | Core 没有凭据加密密钥 |
 
 存储和凭据故障始终作为错误处理：读取为空或读取失败绝不能证明清理完成。[机器连接 API](machine-api.md#node-route-errors)列出了节点路由的错误。
 
diff --git a/contracts/agents-api/zh/sessions-events.md b/contracts/agents-api/zh/sessions-events.md
index cb7230f99..99688def4 100644
--- a/contracts/agents-api/zh/sessions-events.md
+++ b/contracts/agents-api/zh/sessions-events.md
@@ -1,7 +1,7 @@
 ---
 title: "会话、事件和历史"
 source: contracts/agents-api/sessions-events.md
-source_hash: c6141811b426fb0dfb95105b27cc381af5f22e3a7923a171f113f228ae0a5b33
+source_hash: 93ace7d112cbc671039624ec9c999addce715bb08036a50246442a9e14549021
 ---
 
 本契约涵盖会话（Session）内部发生的事情：发送输入、实时事件流，以及读取轮次（Turn）、条目（Item）和使用量的持久化历史。会话资源本身（创建配置、重试标识、更新、列出和删除）见 [Core 线协议行为](wire-semantics.md)。消息和函数结果内容见[消息内容](message-content.md)。[Agents API 指南](../../../docs/zh/api/public-agent-api.md)展示了使用 SDK 和 HTTP 的调用方式。
@@ -41,7 +41,7 @@ Turn 失败后会话仍可使用：新输入会启动一个新 Turn。后来预
 - **取消。** 排队的 Turn 无需活动 Runtime 即可取消。正在运行的 Turn 只有在 Runtime 确认后才会取消；完成操作可能赢得该竞争。读取到 `cancelled` 时才表示该 Turn 已停止，而不是请求返回时。在没有待处理输入的情况下，对空闲会话执行的取消会被接受且不产生任何效果；而在输入预留待处理期间，取消会返回 409。
 - **函数结果。** `turn_id`、`call_id` 和 `success` 为必填项；`output` 和 `error` 为可选项且可为空（[内容规则](message-content.md#function-results)）。重复提交完全相同的结果会返回 202，不会再次应用或发出事件。harness 应用结果时才会出现结果 Item；如果取消操作导致结果无法应用，结果仍会存储，但不会产生 Item。
 - **排队。** 当一个已连接且支持该会话 harness 和配置的 Runtime 接入，并且 Core 的 [`core.execution_concurrency`](../../../docs/zh/configuration.md#settings) 工作槽位有一个空闲时，排队的 Turn 才会启动。会话始终绑定到首次运行它的 Runtime。
-- **执行可用性。** 不具备执行能力的服务会返回 503 `execution_unavailable`，失去执行所有权的 Worker 会返回 503。
+- **执行可用性。** Core 关闭期间，或其 Worker 失去执行所有权后，请求返回 503 `execution_unavailable`。
 
 ### 包含 Environment 的会话 {#sessions-with-an-environment}
 
diff --git a/contracts/agents-api/zh/vaults.md b/contracts/agents-api/zh/vaults.md
index 81434de67..fb5e55ee9 100644
--- a/contracts/agents-api/zh/vaults.md
+++ b/contracts/agents-api/zh/vaults.md
@@ -1,7 +1,7 @@
 ---
 title: "Vault 与 Credential"
 source: contracts/agents-api/vaults.md
-source_hash: 95626340ee36faee3418dd1155a0e50c378ead09c09c91e86f30e09bd8f409e0
+source_hash: fe706a5c3fd5f03ccfe25d0b075de3ad9360b8e0512b3303220fc9a707852181
 ---
 
 Vault 是 Project 所有的 Credential 容器。Credential 保存一个 HTTPS MCP server 的秘密：`static_bearer` token 或 `mcp_oauth` grant。Session 在 `vault_ids` 中关联 Vault；Core 在创建 Session 时为每个 HTTP MCP server 选择一个 Credential，只在分派工作时将解密 token 交给 Runtime。秘密只能写入：任何读取都不返回 token、refresh token、client secret 或密文。
@@ -141,10 +141,10 @@ Token endpoint 必须为 HTTPS。Core 解析主机，拒绝回环、私有、链
 
 Core 使用安装的 [`secrets/core/credential.key`](../../../docs/zh/configuration.md#compose-installations)，以 AES-256-GCM 加密每个 token、refresh token 和 client secret，绑定 Project、Vault、Credential、auth type 和 `mcp_server_url`。错误密钥、修改的行或移动到其他绑定的行均无法解密。名称是不参与绑定的元数据。key 和明文 token 存在于可信服务内存中；加密保护存储的秘密，不保护已被攻破的服务主机。
 
-未配置 key 时，Credential 创建和替换在写入前返回 503 `credential_storage_unavailable`；读取、列表、删除和 Vault 操作仍可用。key 文件不可读或格式错误会使 Core 启动失败。丢失或替换 key 使全部已存储秘密无法使用；Core 只支持一个 key，不支持轮换或重新加密。
+key 文件不可读或格式错误会使 Core 启动失败。丢失或替换 key 使全部已存储秘密无法使用。读取、列表、删除、Vault 操作、新建 Credential 和替换 `static_bearer` token 仍可用；`mcp_oauth` 更新返回 500 `internal_error`，需要旧秘密的派发会失败。已保存的 E2B 密钥同样失效：托管 Session 返回 503 `execution_unavailable`，直到你打开 **System** → **Manage sandbox configuration**，选择 **Reset deployment**（必要时选择 **Force — cancel remaining work now**）并重新配置后端；遗留的沙箱按其 E2B 超时过期。Core 只支持一个 key，不支持轮换或重新加密。
 
 ## 删除 {#deletion}
 
-删除 Credential 或其 Vault 会移除凭证行，但不会擦除 PostgreSQL 页面、WAL、备份或原生历史中的秘密。此后查询、更新和重复删除返回 404；列表不再包含它；新 Session 不能选择它；不能在已删除 Vault 中创建新 Credential（缺失 storage key 时仍先返回 503）。
+删除 Credential 或其 Vault 会移除凭证行，但不会擦除 PostgreSQL 页面、WAL、备份或原生历史中的秘密。此后查询、更新和重复删除返回 404；列表不再包含它；新 Session 不能选择它；不能在已删除 Vault 中创建新 Credential。
 
 现有 Session 保留固定的关联和选择，历史仍可读。下一次需要已删除 Credential 的分派失败；Core 不选择其他 Credential，也不匿名连接。删除不取消运行中的工作、不收回已发送 Runtime 的 token，也不在服务方撤销 grant；需要时自行取消 Session 并撤销 grant。已撤销或无效 OAuth grant 同样失败，直到被替换。
diff --git a/docs/configuration.md b/docs/configuration.md
index 1a248b7e3..50378039e 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -43,7 +43,7 @@ Model providers are not process settings; see [Default models](#default-models).
 
 | Variable | Default | Meaning |
 | --- | --- | --- |
-| `OAC_PUBLIC_URL` | `http://localhost:8080`, set by `compose.yaml`. Core started without it runs no Runtime gateway and executes no Sessions | Origin applications, nodes, sandboxes and self-hosted executors use. See [changing the public URL](#changing-the-public-url) |
+| `OAC_PUBLIC_URL` | Required; `compose.yaml` sets `http://localhost:8080` | Origin applications, nodes, sandboxes and self-hosted executors use. See [changing the public URL](#changing-the-public-url) |
 | `OAC_HOST` | `127.0.0.1` | Web bind address published by `compose.yaml`. The installer sets `0.0.0.0` |
 | `OAC_WEB_PORT` | `8080` | Host port of Web |
 | `OAC_LOG_LEVEL` | `info` | `debug`, `info`, `warn` or `error` |
@@ -150,13 +150,13 @@ Core reads its process environment. Compose interpolates `.env` into it and moun
 
 | Variable | Set from |
 | --- | --- |
-| `OAC_PUBLIC_URL` | The [public URL](#settings). Core validates it once and derives the Agents API base, the daemon WebSocket URL, the self-hosted `remote_url`, the installer downloads, the hosted sandbox address and the deployment's read-only `core_url` from it, never from request headers |
+| `OAC_PUBLIC_URL` | Required. The [public URL](#settings). Core validates it once and derives the Agents API base, the daemon WebSocket URL, the self-hosted `remote_url`, the installer downloads, the hosted sandbox address and the deployment's read-only `core_url` from it, never from request headers |
 | `OAC_ADDR` | The image sets `:8091`. Independently started Core defaults to `127.0.0.1:8091` when unset or empty |
 | `OAC_DATABASE_URL` | Required. PostgreSQL without a password |
 | `OAC_DATABASE_PASSWORD_FILE` | `/run/database/password`. The URL must then carry no password |
-| `OAC_CREDENTIAL_KEY_FILE` | `/run/oac/credential.key` |
+| `OAC_CREDENTIAL_KEY_FILE` | Required. `/run/oac/credential.key`: a base64-encoded random 32-byte key. Core seals stored credentials with it |
 | `OAC_CORE_KEY_DIGESTS_FILE` | Required. `/run/oac/core-key-digests.json`: a JSON array with the SHA-256 of the Core key |
-| `OAC_INSTALLATION_ID_FILE` | `/run/oac/installation.id`: the installation ID, a canonical UUID. It enables the sandbox deployment and node routes and requires `OAC_PUBLIC_URL`. Core refuses an ID other than the one its database recorded |
+| `OAC_INSTALLATION_ID_FILE` | Required. `/run/oac/installation.id`: the installation ID, a canonical UUID. Core refuses an ID other than the one its database recorded |
 | `OAC_EXECUTION_CONCURRENCY`, `OAC_DEFAULT_HARNESS`, `OAC_HARNESSES`, `OAC_WRITE_AUDIT_RETENTION`, `OAC_OAUTH_TRUSTED_ORIGINS`, `OAC_HISTORY_SETTINGS_FILE`, `OAC_LOG_LEVEL`, `OAC_LOG_FORMAT`, `OAC_LOG_ADD_SOURCE` | The matching [process settings](#settings). Web reads the three log settings too |
 | `OAC_PROVIDER_ROOT` | Absolute adapter artifact root. The Core image sets `/opt/oac`. Each adapter owns its helper paths beneath this root. Core serves self-hosted daemon installers from its `native-installers/` directory when that holds a `catalog.json`, after checking the catalog against its own release. Adapter state lives at `/state`, the data volume's [`state/`](#compose-installations) |
 
diff --git a/docs/web/console-api-usage.md b/docs/web/console-api-usage.md
index 60c2b623f..84eb6fb27 100644
--- a/docs/web/console-api-usage.md
+++ b/docs/web/console-api-usage.md
@@ -86,7 +86,7 @@ Summary figures are cumulative per Session and are not billing records. Sessions
 | Operation | Route | Console use |
 | --- | --- | --- |
 | List harnesses | `GET /core/v1/harnesses` | System's Default model cards: each harness's read-only `enabled` and `default`, its model configuration without the key, and Usage details from the configuration's `last_used_at`, `last_error_code` and `last_error_at`; the Overview's Getting started (a default model on the default harness, or on any enabled harness when none is default) |
-| Set or replace | `PUT /core/v1/harnesses/{harness}/model-configuration` | **Set** or **Replace**: the complete model configuration with its write-only provider key, never prefilled and never retried; a 400 shows Core's message in the form, and a 503 `credential_storage_unavailable` says Core has no credential encryption key; then the list is read again |
+| Set or replace | `PUT /core/v1/harnesses/{harness}/model-configuration` | **Set** or **Replace**: the complete model configuration with its write-only provider key, never prefilled and never retried; a 400 shows Core's message in the form; then the list is read again |
 | Clear | `DELETE /core/v1/harnesses/{harness}/model-configuration` | **Clear**, confirmed, then the list is read again |
 
 The list carries each harness's configuration, so the console does not read `GET /core/v1/harnesses/{harness}/model-configuration`.
diff --git a/docs/zh/configuration.md b/docs/zh/configuration.md
index fcde3f949..1c1bbea6e 100644
--- a/docs/zh/configuration.md
+++ b/docs/zh/configuration.md
@@ -1,7 +1,7 @@
 ---
 title: "配置参考"
 source: docs/configuration.md
-source_hash: 95519fc0cac3ac31f2cd08cdfadf20be92a03d998093a651411240c95d29176d
+source_hash: d4c7fc0fddf79b32ee628cc641df148d873380ecf62c59bb6b6a323750d0a41b
 ---
 
 Core 安装的每项设置都恰好只有一个归属位置，分属以下三类：
@@ -47,7 +47,7 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 | Variable | Default | Meaning |
 | --- | --- | --- |
-| `OAC_PUBLIC_URL` | `http://localhost:8080`，由 `compose.yaml` 设置。未设置时启动的 Core 不运行 Runtime 网关，也不执行任何 Session | 应用、节点、沙箱和自托管执行器使用的源地址。参阅[更改公共 URL](#changing-the-public-url) |
+| `OAC_PUBLIC_URL` | 必填；`compose.yaml` 设为 `http://localhost:8080` | 应用、节点、沙箱和自托管执行器使用的源地址。参阅[更改公共 URL](#changing-the-public-url) |
 | `OAC_HOST` | `127.0.0.1` | `compose.yaml` 发布的 Web 绑定地址。安装器设置为 `0.0.0.0` |
 | `OAC_WEB_PORT` | `8080` | Host port of Web |
 | `OAC_LOG_LEVEL` | `info` | `debug`, `info`, `warn` or `error` |
@@ -154,13 +154,13 @@ Core 读取进程环境。Compose 将 `.env` 插值到环境中，并把机密
 
 | 变量 | 设置来源 |
 | --- | --- |
-| `OAC_PUBLIC_URL` | [公共 URL](#settings)。Core 只校验一次，并从中派生 Agents API 基地址、守护进程 WebSocket URL、自托管 `remote_url`、安装程序下载地址、托管沙箱地址和部署的只读 `core_url`，绝不从请求标头派生 |
+| `OAC_PUBLIC_URL` | 必填。[公共 URL](#settings)。Core 只校验一次，并从中派生 Agents API 基地址、守护进程 WebSocket URL、自托管 `remote_url`、安装程序下载地址、托管沙箱地址和部署的只读 `core_url`，绝不从请求标头派生 |
 | `OAC_ADDR` | 安装程序在容器中设置为 `:8091`。独立启动的 Core 在未设置或为空时，默认使用 `127.0.0.1:8091` |
 | `OAC_DATABASE_URL` | 必填。不含密码的 PostgreSQL URL |
 | `OAC_DATABASE_PASSWORD_FILE` | `/run/database/password`。此时 URL 不得包含密码 |
-| `OAC_CREDENTIAL_KEY_FILE` | `/run/oac/credential.key` |
+| `OAC_CREDENTIAL_KEY_FILE` | 必填。`/run/oac/credential.key`：Base64 编码的 32 字节随机密钥。Core 用它加密存储的凭据 |
 | `OAC_CORE_KEY_DIGESTS_FILE` | 必填。`/run/oac/core-key-digests.json`：一个包含 Core 密钥 SHA-256 的 JSON 数组 |
-| `OAC_INSTALLATION_ID_FILE` | `/run/oac/installation.id`：安装 ID，采用规范 UUID 格式。它会启用沙箱部署和节点路由，并要求设置 `OAC_PUBLIC_URL`。如果 ID 与数据库记录的 ID 不一致，Core 会拒绝它 |
+| `OAC_INSTALLATION_ID_FILE` | 必填。`/run/oac/installation.id`：安装 ID，采用规范 UUID 格式。如果 ID 与数据库记录的 ID 不一致，Core 会拒绝它 |
 | `OAC_EXECUTION_CONCURRENCY`、`OAC_DEFAULT_HARNESS`、`OAC_HARNESSES`、`OAC_WRITE_AUDIT_RETENTION`、`OAC_OAUTH_TRUSTED_ORIGINS`、`OAC_HISTORY_SETTINGS_FILE`、`OAC_LOG_LEVEL`、`OAC_LOG_FORMAT`、`OAC_LOG_ADD_SOURCE` | 对应的[进程设置](#settings)。Web 也读取三个日志设置 |
 | `OAC_PROVIDER_ROOT` | 适配器构件的绝对根目录。Core 镜像设置为 `/opt/oac`。每个适配器都拥有此根目录下的辅助路径。当其中的 `native-installers/` 目录包含 `catalog.json` 时，Core 在核对该目录清单与自身发行版后提供自托管守护进程安装程序。适配器状态位于 `/state`，即数据卷的 [`state/`](#compose-installations) |
 
diff --git a/docs/zh/web/console-api-usage.md b/docs/zh/web/console-api-usage.md
index 02d8896f6..b0031fb65 100644
--- a/docs/zh/web/console-api-usage.md
+++ b/docs/zh/web/console-api-usage.md
@@ -1,7 +1,7 @@
 ---
 title: "控制台 API 使用"
 source: docs/web/console-api-usage.md
-source_hash: 071c5b80262cdc89ed3517cf6a63d1c657ee8d0f98133630bad0850595003a2c
+source_hash: 3f233005176090ef87c13442f439296001950bb835262969a0b48970b51af7f4
 ---
 
 本页列出各控制台页面读取和写入的 Core 路由，以及控制台如何限定读取范围。[administrator API contract](../../../contracts/agents-api/zh/admin-api.md) 定义了路由、响应结构、分页和审计记录；[API namespaces and credentials](../api/index.md) 定义了本文使用的术语。
@@ -88,7 +88,7 @@ source_hash: 071c5b80262cdc89ed3517cf6a63d1c657ee8d0f98133630bad0850595003a2c
 | 操作 | 路由 | 控制台用途 |
 | --- | --- | --- |
 | 列出 Harnesses | `GET /core/v1/harnesses` | System 的 Default model 卡片：每个 Harness 的只读 `enabled` 和 `default`、不含密钥的模型配置，以及来自配置中 `last_used_at`、`last_error_code` 和 `last_error_at` 的 Usage details；Overview 的 Getting started（默认 Harness 上的默认模型；如果没有默认模型，则为任意已启用 Harness 上的默认模型） |
-| 设置或替换 | `PUT /core/v1/harnesses/{harness}/model-configuration` | **Set** 或 **Replace**：提交包含只写提供商密钥的完整模型配置；该密钥绝不预填，写入也绝不重试；400 会在表单中显示 Core 的消息，503 `credential_storage_unavailable` 表示 Core 没有凭据加密密钥；随后再次读取列表 |
+| 设置或替换 | `PUT /core/v1/harnesses/{harness}/model-configuration` | **Set** 或 **Replace**：提交包含只写提供商密钥的完整模型配置；该密钥绝不预填，写入也绝不重试；400 会在表单中显示 Core 的消息；随后再次读取列表 |
 | 清除 | `DELETE /core/v1/harnesses/{harness}/model-configuration` | **Clear**，需确认，随后再次读取列表 |
 
 列表会返回每个 Harness 的配置，因此控制台不会读取 `GET /core/v1/harnesses/{harness}/model-configuration`。
diff --git a/packages/agents-client/src/admin-client.test.ts b/packages/agents-client/src/admin-client.test.ts
index 9b0d05466..8884b4328 100644
--- a/packages/agents-client/src/admin-client.test.ts
+++ b/packages/agents-client/src/admin-client.test.ts
@@ -331,7 +331,7 @@ describe("AdminClient installation", () => {
   };
   it("reads installation facts before any deployment and rejects inconsistent snapshots", async () => {
     expect(await clientWith(installation).client.retrieveInstallation()).toEqual(installation);
-    expect(await clientWith({ ...installation, installation_id: null, public_url: null, api_base_url: null, source_commit: null }).client.retrieveInstallation()).toMatchObject({ public_url: null });
+    expect(await clientWith({ ...installation, source_commit: null }).client.retrieveInstallation()).toMatchObject({ source_commit: null });
     const configuration = (settings: unknown[]) => ({ ...installation, configuration: { settings } });
     for (const invalid of [
       configuration([port, { ...headers, value: { authorization: "leak" } }]),
@@ -340,6 +340,8 @@ describe("AdminClient installation", () => {
       { ...installation, address_bindings: { ...installation.address_bindings, nodes_on_other_address: 3 } },
       { ...installation, token: "leak" },
       { ...installation, configuration: null },
+      { ...installation, installation_id: null },
+      { ...installation, public_url: null, api_base_url: null },
       configuration([{ ...port, configured: true }]),
     ]) {
       await expect(clientWith(invalid).client.retrieveInstallation()).rejects.toMatchObject({ code: "invalid_admin_response" });
diff --git a/packages/agents-client/src/admin-projection.ts b/packages/agents-client/src/admin-projection.ts
index 206502a28..28051cae1 100644
--- a/packages/agents-client/src/admin-projection.ts
+++ b/packages/agents-client/src/admin-projection.ts
@@ -269,8 +269,8 @@ function projectInstallationSetting(value: unknown): CoreInstallationSetting {
 export function projectInstallation(value: unknown): CoreInstallation {
   const installation = record(value, ["object", "installation_id", "public_url", "api_base_url", "local_only", "source_commit", "configuration", "address_bindings"]);
   const origin = installation.public_url;
-  if (installation.object !== "core.installation" || (installation.installation_id !== null && canonicalUuid(installation.installation_id) === null) ||
-    (origin !== null && typeof origin !== "string") || installation.api_base_url !== (typeof origin === "string" ? `${origin}/v1` : null) ||
+  if (installation.object !== "core.installation" || canonicalUuid(installation.installation_id) === null ||
+    typeof origin !== "string" || installation.api_base_url !== `${origin}/v1` ||
     typeof installation.local_only !== "boolean" ||
     (installation.source_commit !== null && (typeof installation.source_commit !== "string" || !/^[0-9a-f]{40}$/.test(installation.source_commit)))) return invalidAdminResponse();
   const bindings = record(installation.address_bindings, ["nodes", "nodes_on_other_address", "hosted_sandboxes", "self_hosted_executors"]);
diff --git a/packages/agents-client/src/admin-types.ts b/packages/agents-client/src/admin-types.ts
index 6949f9c4c..815592d83 100644
--- a/packages/agents-client/src/admin-types.ts
+++ b/packages/agents-client/src/admin-types.ts
@@ -194,11 +194,11 @@ export interface CoreInstallationConfiguration {
 /** `GET /core/v1/installation`: available before any sandbox deployment exists. */
 export interface CoreInstallation {
   object: "core.installation";
-  installation_id: string | null;
-  /** The origin applications, nodes, sandboxes and self-hosted executors use; null when Core runs without one. */
-  public_url: string | null;
+  installation_id: string;
+  /** The origin applications, nodes, sandboxes and self-hosted executors use. */
+  public_url: string;
   /** `public_url` followed by `/v1`; the base URL for application API keys. */
-  api_base_url: string | null;
+  api_base_url: string;
   /** True when `public_url` is a loopback origin that only the Core host reaches. */
   local_only: boolean;
   /** Full source commit Core was built from; null for development builds. */
diff --git a/services/core/IMPLEMENTATION.md b/services/core/IMPLEMENTATION.md
index e609040ff..86892c4c7 100644
--- a/services/core/IMPLEMENTATION.md
+++ b/services/core/IMPLEMENTATION.md
@@ -6,15 +6,15 @@ These are the code-level rules of `services/core` that no contract states. Contr
 
 The domain packages own their vocabulary, pure rules and use cases: the domain owners listed below, `items`, `adminaudit`, `writeaudit`, and the shared vocabulary packages `environmentconfig`, `metadata` and `jsonobject`. No `internal` package except `persistence` and `db` imports an `internal/persistence`, `internal/db` or pgx package: they reach storage only through interfaces that the PostgreSQL adapters under `internal/persistence/postgres` implement and the commands under `cmd/` wire in. `TestLayering` in `cmd/server` checks these imports.
 
-`api.NewHandler` takes one `api.Dependencies` value, built only in `cmd/server`. Each application area is one field typed as an interface declared in `api` beside its handlers, listing exactly the methods they call. Every field is required and `NewHandler` rejects a missing one, except the optional groups whose comments say what nil means: `Execution` is nil without an execution Worker, `Sandboxes` is nil without a managed sandbox installation and requires `Execution`, and `Execution.NativeInstaller` is nil for a build without a source revision. Handlers never discover a capability by type assertion or fall back to another implementation. API tests use one strict fake per area, `fake<Area>`, which fails the test on any call the test did not set.
+`api.NewHandler` takes one `api.Dependencies` value, built only in `cmd/server`. Each application area is one field typed as an interface declared in `api` beside its handlers, listing exactly the methods they call. Every field is required and `NewHandler` rejects a missing one, except `Execution.NativeInstaller`, which is nil for a build without a source revision. Handlers never discover a capability by type assertion or fall back to another implementation. API tests use one strict fake per area, `fake<Area>`, which fails the test on any call the test did not set.
 
 `internal/persistence/postgres/pgunit` owns the PostgreSQL mechanics that adapters share: pooled read-write and snapshot transactions; pool-bound queries, used only for a single-statement read that needs no transaction, such as the per-request key lookup; the execution lease (its dedicated connection and gate, the ownership check, the cancellation fence, close, and the execution deadline); identifier parsing (`ParseID`, `PathID`, `LookupCursor`); and detection of text PostgreSQL cannot store (`IsUnstorableText`). Persistence code runs every transaction through it. Outside `persistence`, only the commands under `cmd/`, which build the adapters' pool, and test fixtures import it; `cmd/server` also acquires the lease. `internal/persistence/postgres/pgtest` is test support: it opens the dedicated test database under the `oac_*_tests` guard, applies the migrations, and creates isolated databases for database-wide state such as the execution lease. Only test files import it.
 
 `internal/persistence/postgres/auditpg` is the one adapter that other adapters call directly. Audit rows are written inside the business transaction, so each adapter calls `RecordWriteAudit`, `RecordAdminMutation` or `RecordDeploymentMutation` with its own transaction's queries; the audit provenance travels in the context. `writeaudit` and `adminaudit` own the sources, their validation, `ErrInvalidSource` and the read models, and `auditpg.Store` serves the audit reads.
 
-The adapter that stores a secret seals and opens it with the credential key `cmd/server` builds it with: domain storage interfaces carry plaintext, domain service constructors never take the key, a missing key is `credentialcrypto.ErrUnavailable`, and a ciphertext that fails to open or authenticate is an internal error, never a missing key, value or row.
+The adapter that stores a secret seals and opens it with the credential key `cmd/server` builds it with: domain storage interfaces carry plaintext, domain service constructors never take the key, and a ciphertext that fails to open or authenticate is an internal error, never a missing key, value or row.
 
-Two errors are shared across domains, each with one `api` helper: `textvalue.ErrUnstorable` (400, `writeTextValueError`) for text PostgreSQL cannot store, and `credentialcrypto.ErrUnavailable` (503, `writeCredentialUnavailableError`) for a missing credential key. The audit `ErrInvalidSource` errors pass through adapters unchanged, and `writeAuditSourceError` maps both to 400. Each handler maps its operation's errors through that domain's mapper; Session operations that also meet the sandbox deployment, namely creation, input admission, archive and Runtime observation, map through `writeOperationError`, which tries `writeSandboxError` and then `writeSessionsError`.
+One error is shared across domains, with one `api` helper: `textvalue.ErrUnstorable` (400, `writeTextValueError`) for text PostgreSQL cannot store. The audit `ErrInvalidSource` errors pass through adapters unchanged, and `writeAuditSourceError` maps both to 400. Each handler maps its operation's errors through that domain's mapper; Session operations that also meet the sandbox deployment, namely creation, input admission, archive and Runtime observation, map through `writeOperationError`, which tries `writeSandboxError` and then `writeSessionsError`.
 
 Shared vocabulary has one owner each, and domains use it rather than copy it. `internal/environmentconfig` owns Environment setup, Skills, Plugins and initial files with their validation and public metadata; `Setup.Validate` checks requested configuration, where a Skill may be an unresolved reference, and `Setup.ValidateInstalled` checks frozen, installable configuration. `internal/skills` owns `ParseVersion`, the canonical positive decimal Skill version. `internal/metadata` owns the metadata rules: `Validate` for the pair, key and value limits and U+0000, `ValidateStorable` for U+0000 alone, and `Encode` with its 64 KiB bound. `internal/jsonobject` owns `Normalize`, the stable encoding of stored JSON objects that snapshots and retry identities compare.
 
@@ -131,7 +131,7 @@ Provider input validation uses the adapter rules in `internal/harnessconfig`: on
 [Vaults and credentials](../../contracts/agents-api/vaults.md) describes the resources, selection rules, refresh and deletion. `vaults` implements them, with `vaultpg` as its storage, under these rules:
 
 - Credentials are children of tenant-owned Vaults. Creation admits the owner in the same SQL statement as the insert; retrieval joins the owning Vault; listing enforces Project and Vault ownership on the parent, cursor and row query. Metadata queries never select ciphertext and need no encryption key.
-- `vaultpg` seals secret values before they reach SQL, with Core's separately configured random 32-byte key and the standard library's random-nonce AES-GCM. The versioned authenticated binding covers tenant, Vault, Credential, authentication purpose and exact destination. Never reuse daemon transport encryption for this storage. A missing key disables credential writes with `credentialcrypto.ErrUnavailable`; a malformed configured key fails startup.
+- `vaultpg` seals secret values before they reach SQL, with Core's separately configured random 32-byte key and the standard library's random-nonce AES-GCM. The versioned authenticated binding covers tenant, Vault, Credential, authentication purpose and exact destination. Never reuse daemon transport encryption for this storage. A missing, unreadable or malformed key fails startup.
 - A static replacement is one SQL mutation scoped by tenant, Vault, Credential, auth type and destination, reusing the safe metadata for the immutable binding; it never decrypts the previous token, and a failed write keeps the old row.
 - OAuth refresh and replacement serialize on the Credential row lock, authenticate the stored grant metadata against its encrypted copy before using an endpoint, and persist the refreshed grant before returning an access token, so a stale refresh cannot undo a deletion or Vault cascade.
 - Credential deletion is one mutation checked by tenant, Vault and ID; Vault deletion removes the parent and its Credentials through the foreign-key cascade in one SQL statement, without decrypting, needing the key or calling providers.
@@ -181,7 +181,7 @@ Item merging never mutates the incoming observation or the previous snapshot: pu
 
 ## Worker ownership
 
-Enabling the daemon gateway with `OAC_PUBLIC_URL` also starts the execution Worker. One Worker owns an execution database through a `pgunit.Lease`: the PostgreSQL advisory lock held by one dedicated connection. A second Core on the same database cannot acquire the lease and starts no Worker. The Worker's execution writer runs every Session transaction on that connection: binding, claim and reconciliation, journal, Items and usage, function callbacks and receipts, and terminal state. The lease gate serializes these short transactions and the ownership pings, and `pgunit.ExecutionTimeout` (five seconds) bounds each one, including its gate and Session-lock waits. Cancelling an in-flight pgx operation can close the connection that owns the lock, so coordinator-owned work is cancelled only through the lease's cancellation fence, between leased operations. Never hold a transaction across daemon or model work, reconnect the writer or fall back to the pool after losing the lease. Public admission and device maintenance use pooled connections, and pooled reads grant no write authority. Transactions state their isolation: read committed for writes, read-only repeatable read for snapshots.
+Core always starts the execution Worker. One Worker owns an execution database through a `pgunit.Lease`: the PostgreSQL advisory lock held by one dedicated connection. A second Core on the same database cannot acquire the lease and fails to start with `pgunit.ErrLeaseHeld`. The Worker's execution writer runs every Session transaction on that connection: binding, claim and reconciliation, journal, Items and usage, function callbacks and receipts, and terminal state. The lease gate serializes these short transactions and the ownership pings, and `pgunit.ExecutionTimeout` (five seconds) bounds each one, including its gate and Session-lock waits. Cancelling an in-flight pgx operation can close the connection that owns the lock, so coordinator-owned work is cancelled only through the lease's cancellation fence, between leased operations. Never hold a transaction across daemon or model work, reconnect the writer or fall back to the pool after losing the lease. Public admission and device maintenance use pooled connections, and pooled reads grant no write authority. Transactions state their isolation: read committed for writes, read-only repeatable read for snapshots.
 
 Sandbox reset snapshots bind the deployment relation explicitly to its single row before joining resources, so that even on a fresh database without statistics an inflated join estimate cannot trigger JIT compilation inside the lease deadline.
 
diff --git a/services/core/README.md b/services/core/README.md
index 3ca7b19ec..d8b3d8623 100644
--- a/services/core/README.md
+++ b/services/core/README.md
@@ -22,19 +22,23 @@ Core uses its own PostgreSQL database and account and shares no tables with an a
 
 1. Create a development database. Core applies the migrations when it starts.
 
-2. Create a Core key of at least 32 characters and a digest file holding its SHA-256, which Core uses to authenticate `/core/v1`:
+2. Create a Core key of at least 32 characters and a digest file holding its SHA-256, which Core uses to authenticate `/core/v1`, the credential key that seals stored credentials, and the installation ID. Keep the credential key and the ID with the database:
 
    ```sh
    umask 077; mkdir -p ~/.oac/dev
    openssl rand -hex 32 > ~/.oac/dev/core.key
    printf '["%s"]\n' "$(tr -d '\n' < ~/.oac/dev/core.key | sha256sum | cut -d' ' -f1)" > ~/.oac/dev/core-key-digests.json
+   openssl rand -base64 32 > ~/.oac/dev/credential.key
+   uuidgen | tr '[:upper:]' '[:lower:]' > ~/.oac/dev/installation.id
    ```
 
-3. Start Core. `OAC_PUBLIC_URL` enables the Runtime gateway and the Worker; without it Core executes nothing. The [Core environment table](../../docs/configuration.md#appendix-core-environment-without-the-installer) lists every variable.
+3. Start Core. The [Core environment table](../../docs/configuration.md#appendix-core-environment-without-the-installer) lists every variable.
 
    ```sh
    OAC_DATABASE_URL='postgres://oac:…@127.0.0.1:5432/oac_dev' \
    OAC_CORE_KEY_DIGESTS_FILE="$HOME/.oac/dev/core-key-digests.json" \
+   OAC_CREDENTIAL_KEY_FILE="$HOME/.oac/dev/credential.key" \
+   OAC_INSTALLATION_ID_FILE="$HOME/.oac/dev/installation.id" \
    OAC_PUBLIC_URL=http://127.0.0.1:8091 \
    go run ./services/core/cmd/server
    ```
diff --git a/services/core/cmd/server/core_metrics.go b/services/core/cmd/server/core_metrics.go
index 52f81462a..74b92a0cb 100644
--- a/services/core/cmd/server/core_metrics.go
+++ b/services/core/cmd/server/core_metrics.go
@@ -26,16 +26,11 @@ type coreMetricsSource struct {
 func metricPtr[T any](value T) *T { return &value }
 func (s *coreMetricsSource) Live() coremetrics.Live {
 	stat := s.pool.Stat()
-	live := coremetrics.Live{Pool: coremetrics.Pool{InUse: metricPtr(int64(stat.AcquiredConns())), Idle: metricPtr(int64(stat.IdleConns())), Max: metricPtr(int64(stat.MaxConns()))}, Scheduler: coremetrics.Job{ID: "scheduler", Status: "stopped"}, ExecutionOwner: metricPtr(false), SlotsTotal: metricPtr(int64(0)), SlotsInUse: metricPtr(int64(0))}
-	if s.registry != nil {
-		live.ConnectedDaemons = metricPtr(int64(len(s.registry.Devices())))
-	}
-	if s.worker != nil {
-		w := s.worker.MetricsSnapshot()
-		live.SlotsInUse, live.SlotsTotal, live.ExecutionOwner = w.SlotsInUse, w.SlotsTotal, w.ExecutionOwner
-		live.Scheduler = coremetrics.Job{ID: "scheduler", Status: w.Scheduler.Status, LastRunAt: w.Scheduler.LastRunAt, Processed: w.Scheduler.Processed, Failed: w.Scheduler.Failed}
-	}
-	return live
+	w := s.worker.MetricsSnapshot()
+	return coremetrics.Live{Pool: coremetrics.Pool{InUse: metricPtr(int64(stat.AcquiredConns())), Idle: metricPtr(int64(stat.IdleConns())), Max: metricPtr(int64(stat.MaxConns()))},
+		Scheduler:      coremetrics.Job{ID: "scheduler", Status: w.Scheduler.Status, LastRunAt: w.Scheduler.LastRunAt, Processed: w.Scheduler.Processed, Failed: w.Scheduler.Failed},
+		ExecutionOwner: w.ExecutionOwner, SlotsTotal: w.SlotsTotal, SlotsInUse: w.SlotsInUse,
+		ConnectedDaemons: metricPtr(int64(len(s.registry.Devices())))}
 }
 func (s *coreMetricsSource) Sample(ctx context.Context) coremetrics.Sample {
 	sample := coremetrics.Sample{Healthy: true, PoolInUse: metricPtr(int64(s.pool.Stat().AcquiredConns()))}
@@ -48,19 +43,12 @@ func (s *coreMetricsSource) Sample(ctx context.Context) coremetrics.Sample {
 	} else {
 		sample.Healthy = false
 	}
-	devices := []string{}
-	if s.registry != nil {
-		devices = s.registry.Devices()
-	}
-	counts, err := s.store.ReadExecutionSnapshot(ctx, time.Now(), devices)
+	counts, err := s.store.ReadExecutionSnapshot(ctx, time.Now(), s.registry.Devices())
 	if err != nil {
 		sample.Healthy = false
 	} else {
 		sample.Queued, sample.InProgress = metricPtr(counts.QueuedTurns), metricPtr(counts.InProgressTurns)
-		sample.OldestQueuedSeconds = counts.OldestQueuedSeconds
-		if s.registry != nil {
-			sample.WaitingForDaemon = metricPtr(counts.WaitingForDaemon)
-		}
+		sample.OldestQueuedSeconds, sample.WaitingForDaemon = counts.OldestQueuedSeconds, metricPtr(counts.WaitingForDaemon)
 	}
 	size, err := s.store.ReadDatabaseSize(ctx)
 	if err != nil {
diff --git a/services/core/cmd/server/executor_connections.go b/services/core/cmd/server/executor_connections.go
index bd38a0dcc..45e480e7d 100644
--- a/services/core/cmd/server/executor_connections.go
+++ b/services/core/cmd/server/executor_connections.go
@@ -9,7 +9,6 @@ import (
 )
 
 // executorConnections observes enrolled executors through the Runtime gateway.
-// registry is nil when this Core has no gateway; no executor is then connected.
 type executorConnections struct {
 	sessions sessions.Reader
 	registry *runtimegateway.Registry
diff --git a/services/core/cmd/server/http_routes.go b/services/core/cmd/server/http_routes.go
index 536bdd549..3154facff 100644
--- a/services/core/cmd/server/http_routes.go
+++ b/services/core/cmd/server/http_routes.go
@@ -19,9 +19,6 @@ type daemonRoutes struct {
 // the exact daemon prefix /api/v1/agent-daemon to /api/v1/agent-daemon/. The API
 // handler canonicalizes again when served alone; the operation is idempotent.
 func serverHandler(apiHandler http.Handler, daemon *daemonRoutes) http.Handler {
-	if daemon == nil {
-		return apiHandler
-	}
 	mux := http.NewServeMux()
 	mux.Handle("/api/v1/agent-daemon/", daemon.gateway)
 	mux.Handle("/api/v1/agent-daemon/enroll", daemon.enrollment)
@@ -29,9 +26,7 @@ func serverHandler(apiHandler http.Handler, daemon *daemonRoutes) http.Handler {
 	mux.Handle("/api/v1/agent-daemon/install/", apiHandler)
 	mux.Handle("/api/v1/agent-daemon/installation", apiHandler)
 	mux.Handle("/api/v1/agent-daemon/installation/", apiHandler)
-	if daemon.nodeConnect != nil {
-		mux.Handle("/api/v1/sandbox-node/connect", daemon.nodeConnect)
-	}
+	mux.Handle("/api/v1/sandbox-node/connect", daemon.nodeConnect)
 	mux.Handle("/", apiHandler)
 	return api.CanonicalPaths(mux)
 }
diff --git a/services/core/cmd/server/http_routes_test.go b/services/core/cmd/server/http_routes_test.go
index f31600030..7458a372a 100644
--- a/services/core/cmd/server/http_routes_test.go
+++ b/services/core/cmd/server/http_routes_test.go
@@ -108,14 +108,14 @@ func daemonComposition(t testing.TB) http.Handler {
 		SessionAdmin:    struct{ api.SessionAdmin }{}, Environments: struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, ExecutorConnections: struct{ api.ExecutorConnections }{},
 		Admin: struct{ api.Admin }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{}, Metrics: struct{ api.Metrics }{},
 		RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
-		Execution: &api.Execution{
+		Execution: api.Execution{
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
 			SessionAdmission: struct{ api.SessionAdmission }{},
 			InputAdmission:   struct{ api.InputAdmission }{},
 			SessionArchive:   struct{ api.SessionArchive }{},
 			Workspaces:       struct{ api.EnvironmentWorkspaces }{},
 		},
-		Sandboxes: &api.Sandboxes{Deployment: struct{ api.Deployment }{}, NodeAllocations: unusedNodeAllocations{}, DeploymentChanges: struct{ api.DeploymentChanges }{},
+		Sandboxes: api.Sandboxes{Deployment: struct{ api.Deployment }{}, NodeAllocations: unusedNodeAllocations{}, DeploymentChanges: struct{ api.DeploymentChanges }{},
 			DeploymentReset: struct{ api.DeploymentReset }{}, ConfigurationDiscovery: struct{ api.ConfigurationDiscovery }{}},
 	})
 	if err != nil {
diff --git a/services/core/cmd/server/installation.go b/services/core/cmd/server/installation.go
index 11097db7f..1bab2cae5 100644
--- a/services/core/cmd/server/installation.go
+++ b/services/core/cmd/server/installation.go
@@ -13,14 +13,9 @@ var sourceCommit = regexp.MustCompile(`^[0-9a-f]{40}$`)
 // installationFacts reports what GET /core/v1/installation serves: Core's own
 // environment and build, plus the process settings it loaded.
 func installationFacts(config processconfig.Config) api.Installation {
-	facts := api.Installation{Configuration: api.InstallationConfiguration{Settings: config.Settings()}}
-	if config.InstallationID != "" {
-		facts.InstallationID = &config.InstallationID
-	}
-	if origin := config.PublicOrigin; origin != nil {
-		public, base := origin.String(), origin.API()
-		facts.PublicURL, facts.APIBaseURL, facts.LocalOnly = &public, &base, placement.LoopbackOrigin(public)
-	}
+	public := config.PublicOrigin.String()
+	facts := api.Installation{InstallationID: config.InstallationID, PublicURL: public, APIBaseURL: config.PublicOrigin.API(), LocalOnly: placement.LoopbackOrigin(public),
+		Configuration: api.InstallationConfiguration{Settings: config.Settings()}}
 	if sourceCommit.MatchString(buildRevision) {
 		revision := buildRevision
 		facts.SourceCommit = &revision
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index f45a3a2f9..a14ba9891 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -59,7 +59,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtime"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeenrollment"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimehistory"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
@@ -150,13 +149,9 @@ func run(config processconfig.Config) error {
 		return err
 	}
 	sandboxProviders := providers.Builtin()
-	var public string
-	if config.PublicOrigin != nil {
-		public = config.PublicOrigin.String()
-	}
 	// The placement rules are built once: the provider declarations and the
 	// public URL never change while Core runs.
-	placementRules, err := placement.NewRules(sandboxProviders, public)
+	placementRules, err := placement.NewRules(sandboxProviders, config.PublicOrigin.String())
 	if err != nil {
 		return err
 	}
@@ -170,26 +165,18 @@ func run(config processconfig.Config) error {
 	if err != nil {
 		return err
 	}
-	var workerDone chan error
+	// Node callbacks run only once the HTTP server serves, after the Worker starts.
 	var worker *execution.Worker
 	managedNodes := configureManagedNodes(deploymentService, deploymentStore, sandboxProviders, config, func(ctx context.Context) error {
-		if worker == nil {
-			return errors.New("sandbox execution owner is unavailable")
-		}
 		return worker.CheckOwnership(ctx)
 	})
-	defer managedNodes.close()
-	var managed *execution.RuntimeProvider
-	var observationSource func(context.Context) (runtimeobs.Source, string, error)
-	if managedNodes != nil {
-		managed = managedNodes.runtime
-		observationSource = managedNodes.setup.observationSource
-	}
+	defer managedNodes.hub.Close()
+	observationSource := managedNodes.setup.observationSource
 	observationResolver, err := deployment.NewObservationResolver(sessionStore, deploymentStore)
 	if err != nil {
 		return err
 	}
-	history, err := runtimeHistory(ctx, units, config.RuntimeHistory, config.PublicOrigin != nil)
+	history, err := runtimeHistory(ctx, units, config.RuntimeHistory)
 	if err != nil {
 		return err
 	}
@@ -217,90 +204,79 @@ func run(config processconfig.Config) error {
 	if err != nil {
 		return err
 	}
-	var daemonHandler http.Handler
-	var registry *runtimegateway.Registry
-	var executorURL string
-	var nativeInstaller *api.NativeInstaller
-	if origin := config.PublicOrigin; origin != nil {
-		executorURL = origin.DaemonWebSocket()
-		daemonHandler, registry, err = runtime.NewGateway(sessionStore, sessionService, sessionStore, executorURL)
-		if err != nil {
-			return err
-		}
-		defer runtime.CloseConnections(registry)
-		var catalog *nativeinstaller.Catalog
-		if config.NativeInstallers != "" {
-			catalog, err = nativeinstaller.Load(config.NativeInstallers, buildRevision)
-			if err != nil {
-				return err
-			}
-		}
-		if buildRevision != "" {
-			nativeInstaller = &api.NativeInstaller{Version: buildRevision, Base: origin.InstallerBase(), Catalog: catalog}
-		}
+	executorURL := config.PublicOrigin.DaemonWebSocket()
+	daemonHandler, registry, err := runtime.NewGateway(sessionStore, sessionService, sessionStore, executorURL)
+	if err != nil {
+		return err
 	}
-	var deploymentExecution *deployment.ExecutionOperations
-	if registry != nil {
-		dispatcher := &execution.Dispatcher{Registry: registry,
-			Credentials: vaultService, Observer: modelConfigurationStore, Deployment: deploymentService, DeploymentReader: deploymentStore,
-			Sessions:        sessionService,
-			SessionsReader:  sessionStore,
-			ManagedRuntimes: managed, MaxConcurrentExecutions: config.ExecutionConcurrency}
-		lease, err := pgunit.AcquireLease(ctx, pool)
+	defer runtime.CloseConnections(registry)
+	var catalog *nativeinstaller.Catalog
+	if config.NativeInstallers != "" {
+		catalog, err = nativeinstaller.Load(config.NativeInstallers, buildRevision)
 		if err != nil {
 			return err
 		}
-		deploymentExecution, err = deployment.NewExecutionOperations(deploymentService, deploymentpg.NewExecution(lease, credentialKey))
-		if err != nil {
-			return errors.Join(err, lease.Close(ctx))
-		}
-		sessionExecution, err := sessions.NewExecutionOperations(sessionpg.NewExecution(lease))
-		if err != nil {
-			return errors.Join(err, lease.Close(ctx))
-		}
-		// From this call on the Worker closes the lease, even when it fails to start.
-		worker, err = execution.StartWorker(ctx, dispatcher, execution.Owner{
-			Lease:      lease,
-			Deployment: deploymentExecution,
-			Sessions:   sessionExecution,
-		})
-		if err != nil {
-			return err
+	}
+	var nativeInstaller *api.NativeInstaller
+	if buildRevision != "" {
+		nativeInstaller = &api.NativeInstaller{Version: buildRevision, Base: config.PublicOrigin.InstallerBase(), Catalog: catalog}
+	}
+	dispatcher := &execution.Dispatcher{Registry: registry,
+		Credentials: vaultService, Observer: modelConfigurationStore, Deployment: deploymentService, DeploymentReader: deploymentStore,
+		Sessions:        sessionService,
+		SessionsReader:  sessionStore,
+		ManagedRuntimes: managedNodes.runtime, MaxConcurrentExecutions: config.ExecutionConcurrency}
+	lease, err := pgunit.AcquireLease(ctx, pool)
+	if err != nil {
+		return err
+	}
+	deploymentExecution, err := deployment.NewExecutionOperations(deploymentService, deploymentpg.NewExecution(lease, credentialKey))
+	if err != nil {
+		return errors.Join(err, lease.Close(ctx))
+	}
+	sessionExecution, err := sessions.NewExecutionOperations(sessionpg.NewExecution(lease))
+	if err != nil {
+		return errors.Join(err, lease.Close(ctx))
+	}
+	// From this call on the Worker closes the lease, even when it fails to start.
+	worker, err = execution.StartWorker(ctx, dispatcher, execution.Owner{
+		Lease:      lease,
+		Deployment: deploymentExecution,
+		Sessions:   sessionExecution,
+	})
+	if err != nil {
+		return err
+	}
+	workerDone := make(chan error, 1)
+	go func() { workerDone <- worker.Run(ctx) }()
+	defer func() {
+		stop()
+		if workerDone != nil {
+			<-workerDone
 		}
-		workerDone = make(chan error, 1)
-		go func() { workerDone <- worker.Run(ctx) }()
-		defer func() {
-			stop()
-			if workerDone != nil {
-				<-workerDone
-			}
-		}()
-	}
-	// Sampling runs only with the Worker, which owns every sweep.
-	sampling := coremetrics.Periodic{ID: "runtime_sampler", Every: history.SampleInterval}
-	if worker != nil {
-		sampler, err := runtimeobs.NewSampler(observationResolver, observationService, worker, runtimeobs.SamplerOptions{})
-		if err != nil {
-			return err
+	}()
+	// The Worker owns every sampling sweep.
+	sampler, err := runtimeobs.NewSampler(observationResolver, observationService, worker, runtimeobs.SamplerOptions{})
+	if err != nil {
+		return err
+	}
+	sampling := coremetrics.Periodic{ID: "runtime_sampler", Every: history.SampleInterval, Run: func(ctx context.Context) (*int64, int64, error) {
+		result := sampler.Sweep(ctx)
+		sampleCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
+		err := worker.CheckOwnership(sampleCtx)
+		if err == nil {
+			_, err = deploymentStore.SampleHostHistory(sampleCtx)
 		}
-		sampling.Run = func(ctx context.Context) (*int64, int64, error) {
-			result := sampler.Sweep(ctx)
-			sampleCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
-			err := worker.CheckOwnership(sampleCtx)
-			if err == nil {
-				_, err = deploymentStore.SampleHostHistory(sampleCtx)
-			}
-			cancel()
-			fields := []any{"listed", result.Listed, "observed", result.Observed, "failed", result.Failed, "complete", result.Complete}
-			if !result.Complete {
-				log.Bg().Warn("Runtime history sampling sweep incomplete", fields...)
-				err = errors.New("incomplete Runtime sampling sweep")
-			} else {
-				log.Bg().Debug("Runtime history sampling sweep complete", fields...)
-			}
-			return metricPtr(int64(result.Observed)), int64(result.Failed), err
+		cancel()
+		fields := []any{"listed", result.Listed, "observed", result.Observed, "failed", result.Failed, "complete", result.Complete}
+		if !result.Complete {
+			log.Bg().Warn("Runtime history sampling sweep incomplete", fields...)
+			err = errors.New("incomplete Runtime sampling sweep")
+		} else {
+			log.Bg().Debug("Runtime history sampling sweep complete", fields...)
 		}
-	}
+		return metricPtr(int64(result.Observed)), int64(result.Failed), err
+	}}
 	metricsSource := &coreMetricsSource{store: coremetricspg.New(units), pool: pool, worker: worker, registry: registry}
 	metrics, err := coremetrics.New(processStartedAt, buildRevision, metricsSource, sampling,
 		prune("history_cleanup", 2*time.Second, history.Prune),
@@ -342,39 +318,30 @@ func run(config processconfig.Config) error {
 		Environments:    sessionService, EnvironmentsReader: sessionStore, ExecutorConnections: executorConnections{sessions: sessionStore, registry: registry},
 		Admin: sessionStore, AdminAudit: auditStore, WriteAudit: auditStore, Metrics: metrics,
 		RuntimeObservations: observationService, RuntimeHistory: historyService,
-	}
-	if worker != nil {
-		deps.Execution = &api.Execution{
+		Execution: api.Execution{
 			ExecutorURL:      executorURL,
 			SessionAdmission: worker,
 			InputAdmission:   worker,
 			SessionArchive:   deploymentExecution,
 			Workspaces:       worker,
 			NativeInstaller:  nativeInstaller,
-		}
-	}
-	if managedNodes != nil {
-		deps.Sandboxes = &api.Sandboxes{
+		},
+		Sandboxes: api.Sandboxes{
 			Deployment:             deploymentService,
 			NodeAllocations:        deploymentStore,
 			DeploymentChanges:      worker,
 			DeploymentReset:        worker,
 			ConfigurationDiscovery: managedNodes.setup,
-		}
+		},
 	}
-	handler, err := api.NewHandler(deps)
+	apiHandler, err := api.NewHandler(deps)
 	if err != nil {
 		return err
 	}
-	if daemonHandler != nil {
-		routes := daemonRoutes{gateway: daemonHandler,
-			enrollment: runtimeenrollment.EnrollmentHandler(sessionService),
-			connection: runtimeenrollment.ConnectionHandler(sessionStore, registry)}
-		if managedNodes != nil {
-			routes.nodeConnect = managedNodes.hub
-		}
-		handler = serverHandler(handler, &routes)
-	}
+	handler := serverHandler(apiHandler, &daemonRoutes{gateway: daemonHandler,
+		enrollment:  runtimeenrollment.EnrollmentHandler(sessionService),
+		connection:  runtimeenrollment.ConnectionHandler(sessionStore, registry),
+		nodeConnect: managedNodes.hub})
 	server := &http.Server{Addr: config.Addr, Handler: handler, ReadHeaderTimeout: 10 * time.Second, ReadTimeout: 30 * time.Second, WriteTimeout: 30 * time.Second, IdleTimeout: 60 * time.Second}
 	done := make(chan error, 1)
 	go func() { done <- server.ListenAndServe() }()
diff --git a/services/core/cmd/server/managed_nodes.go b/services/core/cmd/server/managed_nodes.go
index a6d8f434b..518dcd37b 100644
--- a/services/core/cmd/server/managed_nodes.go
+++ b/services/core/cmd/server/managed_nodes.go
@@ -22,12 +22,8 @@ type managedNodes struct {
 // configureManagedNodes serves the nodes of the Web-managed deployment. Node
 // presence and health and the generation of each allocation go through the
 // deployment service; the owner epoch that fences connections and the
-// allocations each generation retains are read from the deployment reader. It
-// returns nil without an installation ID.
+// allocations each generation retains are read from the deployment reader.
 func configureManagedNodes(nodes *deployment.Service, reader deployment.Reader, registry *providers.Registry, config processconfig.Config, owner func(context.Context) error) *managedNodes {
-	if config.InstallationID == "" {
-		return nil
-	}
 	result := &managedNodes{}
 	result.hub = node.NewHub(node.HubOptions{
 		Generations: func(ctx context.Context, n node.Identity, connection string, epoch uint64, health node.Health) error {
@@ -74,19 +70,12 @@ func configureManagedNodes(nodes *deployment.Service, reader deployment.Reader,
 			return nodes.Heartbeat(ctx, n.NodeID, connection, epoch, nodeHealthRecord(health))
 		},
 	})
-	// Load requires OAC_PUBLIC_URL with an installation ID.
 	result.setup = &managedSetup{processPaths: config.ProviderPaths, registry: registry, deployment: nodes, allocations: reader, hub: result.hub, installationID: config.InstallationID, runtimeAPI: config.PublicOrigin.RuntimeAPI()}
 	result.runtime = execution.NewDeferredRuntimeProvider(config.InstallationID, result.setup.load, result.setup.prepare)
 	result.runtime.PublishUnconfigured = result.setup.publishUnconfigured
 	return result
 }
 
-func (m *managedNodes) close() {
-	if m != nil {
-		m.hub.Close()
-	}
-}
-
 func nodeHealthRecord(health node.Health) deployment.NodeHealth {
 	return deployment.NodeHealth{Host: &deployment.NodeHost{EffectiveCPUCores: health.EffectiveCPUCores, CPUUtilization: health.CPUUtilization, TotalMemoryBytes: health.TotalMemoryBytes, AvailableMemoryBytes: health.AvailableMemoryBytes, AvailableDiskBytes: health.AvailableDiskBytes, ObservedAt: &health.ObservedAt}, ProviderReady: health.ProviderReady, Diagnostic: health.Diagnostic, CPUCount: health.CPUCount, AvailableMemoryBytes: health.AvailableMemoryBytes, AvailableDiskBytes: health.AvailableDiskBytes}
 }
diff --git a/services/core/cmd/server/managed_setup.go b/services/core/cmd/server/managed_setup.go
index e1328ba2b..81a9ffdef 100644
--- a/services/core/cmd/server/managed_setup.go
+++ b/services/core/cmd/server/managed_setup.go
@@ -86,6 +86,11 @@ func (s *managedSetup) publishUnconfigured(generation uint64) { s.publishSelecti
 
 func (s *managedSetup) load(ctx context.Context) (*execution.RuntimeProvider, error) {
 	setup, err := s.deployment.Setup(ctx)
+	if errors.Is(err, deployment.ErrCredentialUnreadable) {
+		// A replaced credential key blocks hosted execution, not Core.
+		log.Warn(ctx, "Hosted provider credential is unreadable; administrator recovery remains available", "error", err)
+		return nil, fmt.Errorf("%w: %w", execution.ErrExecutionUnavailable, err)
+	}
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/core/cmd/server/managed_setup_test.go b/services/core/cmd/server/managed_setup_test.go
index 259ed35cb..f4a022aa8 100644
--- a/services/core/cmd/server/managed_setup_test.go
+++ b/services/core/cmd/server/managed_setup_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/processconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/docker"
@@ -24,15 +25,12 @@ import (
 )
 
 func TestWebSetupCreatesManagerWithoutLocalProvider(t *testing.T) {
-	if configureManagedNodes(nil, nil, providers.Builtin(), processconfig.Config{}, nil) != nil {
-		t.Fatal("sandbox manager started without an installation ID")
-	}
 	origin, err := deployment.NewPublicOrigin("https://core.example")
 	if err != nil {
 		t.Fatal(err)
 	}
-	m := configureManagedNodes(nil, nil, providers.Builtin(), processconfig.Config{InstallationID: uuid.NewString(), PublicOrigin: &origin}, func(context.Context) error { return nil })
-	defer m.close()
+	m := configureManagedNodes(nil, nil, providers.Builtin(), processconfig.Config{InstallationID: uuid.NewString(), PublicOrigin: origin}, func(context.Context) error { return nil })
+	defer m.hub.Close()
 	if m.setup == nil || m.hub == nil || m.runtime == nil || m.runtime.Provider != nil || m.setup.runtimeAPI != "https://core.example/api/v1" {
 		t.Fatal("zero-node setup unexpectedly instantiated local compute or omitted management")
 	}
@@ -113,7 +111,7 @@ func credentialService(t *testing.T) func(owner, candidate deployment.Setup) (de
 	if err != nil {
 		t.Fatal(err)
 	}
-	service, err := deployment.NewService(deploymentpg.New(nil, nil), deploymentpg.New(nil, nil), providers.Builtin(), rules)
+	service, err := deployment.NewService(deploymentpg.New(nil, pgtest.CredentialKey(t)), deploymentpg.New(nil, pgtest.CredentialKey(t)), providers.Builtin(), rules)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -131,8 +129,12 @@ func TestManagedSetupNeverReusesAnotherGenerationOrUnverifiedState(t *testing.T)
 		t.Fatal("matching immutable selection was not reused")
 	}
 	loadErr = errors.New("database unavailable")
-	if _, err := s.load(t.Context()); err == nil {
-		t.Fatal("stale cached selection hid storage failure")
+	if _, err := s.load(t.Context()); err == nil || errors.Is(err, execution.ErrExecutionUnavailable) {
+		t.Fatal("stale cached selection hid storage failure", err)
+	}
+	loadErr = deployment.ErrCredentialUnreadable
+	if _, err := s.load(t.Context()); !errors.Is(err, execution.ErrExecutionUnavailable) || !errors.Is(err, deployment.ErrCredentialUnreadable) {
+		t.Fatal("an unreadable credential must block execution without stopping Core", err)
 	}
 	loadErr = nil
 	value.Generation = 2
diff --git a/services/core/cmd/server/runtime_history.go b/services/core/cmd/server/runtime_history.go
index 7d333c097..792d04769 100644
--- a/services/core/cmd/server/runtime_history.go
+++ b/services/core/cmd/server/runtime_history.go
@@ -25,15 +25,10 @@ type runtimeHistoryExporter interface {
 	Close(context.Context) error
 }
 
-func runtimeHistory(ctx context.Context, units *pgunit.Pool, config processconfig.RuntimeHistory, executionEnabled bool) (runtimeHistorySetup, error) {
+func runtimeHistory(ctx context.Context, units *pgunit.Pool, config processconfig.RuntimeHistory) (runtimeHistorySetup, error) {
 	interval := config.SampleInterval
-	mode := runtimehistory.CollectionPeriodic
-	if !executionEnabled {
-		interval = 0
-		mode = runtimehistory.CollectionOnRead
-	}
 	capabilities := runtimehistory.Capabilities{
-		CollectionMode: mode, SampleInterval: interval, Retention: 7 * 24 * time.Hour,
+		CollectionMode: runtimehistory.CollectionPeriodic, SampleInterval: interval, Retention: 7 * 24 * time.Hour,
 		MinimumStep: max(30*time.Second, interval), MaximumRange: 24 * time.Hour,
 		MaximumPoints: 1000, MaximumSeries: 64, MaximumTotalPoints: 10000,
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory, runtimehistory.MetricTokens},
diff --git a/services/core/cmd/server/runtime_history_test.go b/services/core/cmd/server/runtime_history_test.go
index 17c748cb5..c81e5b3e4 100644
--- a/services/core/cmd/server/runtime_history_test.go
+++ b/services/core/cmd/server/runtime_history_test.go
@@ -18,31 +18,26 @@ func (panicHistoryExporter) Close(context.Context) error
 var defaultHistory = processconfig.RuntimeHistory{QueueCapacity: 256, Timeout: 2 * time.Second, SampleInterval: 30 * time.Second}
 
 func TestRuntimeHistoryUsesCoreDatabaseByDefault(t *testing.T) {
-	for _, enabled := range []bool{true, false} {
-		setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), defaultHistory, enabled)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(setup.Options) != 1 || setup.Exporter != nil || setup.Reader == nil || setup.Prune == nil {
-			t.Fatal("default history requires extra deployment")
-		}
-		capabilities := setup.Reader.Capabilities()
-		if capabilities.Durable() != enabled || capabilities.Retention != 7*24*time.Hour {
-			t.Fatalf("incorrect default capabilities: %+v", capabilities)
-		}
-		if enabled && setup.SampleInterval != 30*time.Second {
-			t.Fatal("default cadence missing")
-		}
-		if !enabled && setup.SampleInterval != 0 {
-			t.Fatal("sampler requires an execution owner")
-		}
+	setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), defaultHistory)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(setup.Options) != 1 || setup.Exporter != nil || setup.Reader == nil || setup.Prune == nil {
+		t.Fatal("default history requires extra deployment")
+	}
+	capabilities := setup.Reader.Capabilities()
+	if !capabilities.Durable() || capabilities.Retention != 7*24*time.Hour {
+		t.Fatalf("incorrect default capabilities: %+v", capabilities)
+	}
+	if setup.SampleInterval != 30*time.Second {
+		t.Fatal("default cadence missing")
 	}
 }
 
 func TestRuntimeHistoryOptionalExportAndSamplingConfiguration(t *testing.T) {
 	config := defaultHistory
 	config.Endpoint, config.Headers, config.SampleInterval = "https://collector.example.test/v1/metrics", map[string]string{"Authorization": "Bearer private"}, time.Minute
-	setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), config, true)
+	setup, err := runtimeHistory(t.Context(), pgunit.NewPool(nil), config)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/agents/storage.go b/services/core/internal/agents/storage.go
index 7203ea761..ad88085a9 100644
--- a/services/core/internal/agents/storage.go
+++ b/services/core/internal/agents/storage.go
@@ -12,8 +12,7 @@ import (
 // Agent.
 type Storage interface {
 	// CreateAgent assigns the Agent's ID and saves it with its sealed model
-	// provider bundle. Sealing without a credential key is
-	// credentialcrypto.ErrUnavailable.
+	// provider bundle.
 	CreateAgent(context.Context, NewAgent) (Agent, error)
 	// WithAgentUpdate locks the tenant's Agent and runs update; the revision
 	// it applies commits only when update returns nil.
@@ -56,8 +55,7 @@ type Reader interface {
 	GetAgent(ctx context.Context, tenantID, agentID string) (Agent, error)
 	ListAgents(context.Context, ListQuery) (Page, error)
 	// GetAgentWithModelProvider reads the Agent and its opened model provider
-	// bundle from one snapshot. The bundle is nil when the Agent has none.
-	// Opening one without a credential key is credentialcrypto.ErrUnavailable;
-	// a bundle that fails to open is an internal error.
+	// bundle from one snapshot. The bundle is nil when the Agent has none; a
+	// bundle that fails to open is an internal error.
 	GetAgentWithModelProvider(ctx context.Context, tenantID, agentID string) (Agent, *v1.ModelProviderInput, error)
 }
diff --git a/services/core/internal/api/admin_session_archive.go b/services/core/internal/api/admin_session_archive.go
index fcf8ae8f8..2a7b0e46e 100644
--- a/services/core/internal/api/admin_session_archive.go
+++ b/services/core/internal/api/admin_session_archive.go
@@ -40,10 +40,6 @@ func (h *Handler) adminArchiveSession(w http.ResponseWriter, r *http.Request) {
 		writeOperationError(w, r, sessions.ErrInvalidInput)
 		return
 	}
-	if h.Execution == nil {
-		writeOperationError(w, r, sessions.ErrEnvironmentUnavailable)
-		return
-	}
 	result, err := h.Execution.SessionArchive.ArchiveSession(r.Context(), tenantID(r), chi.URLParam(r, "session_id"), input.ExpectedGeneration)
 	if err != nil {
 		writeOperationError(w, r, err)
diff --git a/services/core/internal/api/admin_session_archive_test.go b/services/core/internal/api/admin_session_archive_test.go
index 4d12f04a4..d3a45ac4f 100644
--- a/services/core/internal/api/admin_session_archive_test.go
+++ b/services/core/internal/api/admin_session_archive_test.go
@@ -38,7 +38,6 @@ func TestAdminSessionArchiveAuthorityAndValidation(t *testing.T) {
 	key := callerBinding()
 	deps, fakes := managementFakes(t, key)
 	fixture := &archiveManagementFixture{}
-	deps.Execution = fakes.execution()
 	fakes.sessionArchive.archiveSession = fixture.ArchiveSession
 	fakes.sessionAdmin.getManagedSessionArchive = fixture.GetManagedSessionArchive
 	h := newTestHandler(t, deps)
diff --git a/services/core/internal/api/admin_summary.go b/services/core/internal/api/admin_summary.go
index d24efa7c0..83c1a8188 100644
--- a/services/core/internal/api/admin_summary.go
+++ b/services/core/internal/api/admin_summary.go
@@ -125,7 +125,7 @@ func (h *Handler) adminSummary(w http.ResponseWriter, r *http.Request) {
 			groups[""] = &AdminSummaryRow{ProjectID: project.ID}
 		}
 		counts, err := h.Admin.ReadAdminSummary(ctx, project.TenantID, sessions.AdminSummaryFilter{CreatedAfter: after, CreatedBefore: before}, func(session sessions.Session, creationKeyID *string) error {
-			projected, err := sessionResponse(session, h.executorURL())
+			projected, err := sessionResponse(session, h.Execution.ExecutorURL)
 			if err != nil {
 				return err
 			}
diff --git a/services/core/internal/api/contract_routes_test.go b/services/core/internal/api/contract_routes_test.go
index 6b589bceb..65b557b1c 100644
--- a/services/core/internal/api/contract_routes_test.go
+++ b/services/core/internal/api/contract_routes_test.go
@@ -66,9 +66,8 @@ func contractOperations(t *testing.T, file, prefix string) map[string]bool {
 // The pinned upstream /v1 set is checked by TestEveryRouteAuthenticatesItsCanonicalPath
 // and the contract tests.
 func TestContractsPublishExactlyTheRegisteredCoreAndMachineRoutes(t *testing.T) {
-	// Every optional group that gates a route registration, as the server enables them.
-	deps, fakes := testDependencies(t)
-	deps.Execution, deps.Sandboxes = fakes.execution(), fakes.sandboxes()
+	// The native installer gates its routes, as a release build enables them.
+	deps, _ := testDependencies(t)
 	deps.Execution.NativeInstaller = &NativeInstaller{Version: "contract-test", Base: "https://core.example/api/v1/agent-daemon/install/", Catalog: &nativeinstaller.Catalog{}}
 	h := &Handler{Dependencies: deps}
 	contracts := map[string]string{"/v1": "openapi.yaml", "/core/v1": "core.openapi.yaml", "/api/v1": "runtime.openapi.yaml"}
diff --git a/services/core/internal/api/core_store_validation_test.go b/services/core/internal/api/core_store_validation_test.go
index 326967bb7..91cb319d0 100644
--- a/services/core/internal/api/core_store_validation_test.go
+++ b/services/core/internal/api/core_store_validation_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
@@ -25,7 +26,7 @@ func TestCoreStoreValidationFieldsAndPublicFallback(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	nodes, err := deployment.NewService(deploymentpg.New(nil, nil), deploymentpg.New(nil, nil), providers.Builtin(), rules)
+	nodes, err := deployment.NewService(deploymentpg.New(nil, pgtest.CredentialKey(t)), deploymentpg.New(nil, pgtest.CredentialKey(t)), providers.Builtin(), rules)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/api/credentials_oauth_test.go b/services/core/internal/api/credentials_oauth_test.go
index 779bbfc2a..ae3170806 100644
--- a/services/core/internal/api/credentials_oauth_test.go
+++ b/services/core/internal/api/credentials_oauth_test.go
@@ -8,7 +8,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
@@ -149,7 +148,7 @@ func TestOAuthCredentialStoreFailuresUseSafeExistingErrors(t *testing.T) {
 	for _, tc := range []struct {
 		err  error
 		code int
-	}{{vaults.ErrNotFound, 404}, {vaults.ErrInvalidInput, 400}, {credentialcrypto.ErrUnavailable, 503}, {errors.New("access-canary"), 500}} {
+	}{{vaults.ErrNotFound, 404}, {vaults.ErrInvalidInput, 400}, {errors.New("access-canary"), 500}} {
 		for _, update := range []bool{false, true} {
 			h, f, _ := credentialHandler(t)
 			f.err = tc.err
diff --git a/services/core/internal/api/credentials_test.go b/services/core/internal/api/credentials_test.go
index 0c2ace584..fcc60c811 100644
--- a/services/core/internal/api/credentials_test.go
+++ b/services/core/internal/api/credentials_test.go
@@ -11,7 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/google/uuid"
 )
@@ -113,7 +112,7 @@ func TestCredentialStorageErrorsStaySafe(t *testing.T) {
 	for _, test := range []struct {
 		err    error
 		status int
-	}{{vaults.ErrNotFound, 404}, {credentialcrypto.ErrUnavailable, 503}, {errors.New("credential-canary"), 500}} {
+	}{{vaults.ErrNotFound, 404}, {errors.New("credential-canary"), 500}} {
 		h, f, _ := credentialHandler(t)
 		f.err = test.err
 		w := credentialRequest(h, "POST", "/v1/vaults/"+f.credential.VaultID+"/credentials", `{"name":"n","auth":{"type":"static_bearer","mcp_server_url":"https://example.invalid","token":"credential-canary"}}`)
diff --git a/services/core/internal/api/credentials_update_test.go b/services/core/internal/api/credentials_update_test.go
index 2cd883056..cd7f65050 100644
--- a/services/core/internal/api/credentials_update_test.go
+++ b/services/core/internal/api/credentials_update_test.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/google/uuid"
 )
@@ -107,7 +106,7 @@ func TestCredentialUpdateUsesExistingBoundariesAndSafeErrors(t *testing.T) {
 	for _, tc := range []struct {
 		err    error
 		status int
-	}{{vaults.ErrNotFound, 404}, {credentialcrypto.ErrUnavailable, 503}, {errors.New("credential-canary"), 500}} {
+	}{{vaults.ErrNotFound, 404}, {errors.New("credential-canary"), 500}} {
 		h, f, _ := credentialHandler(t)
 		f.err = tc.err
 		w := credentialRequest(h, "POST", "/v1/vaults/"+f.credential.VaultID+"/credentials/"+f.credential.ID, body)
diff --git a/services/core/internal/api/dependencies.go b/services/core/internal/api/dependencies.go
index 5dcb4f981..ba2cac514 100644
--- a/services/core/internal/api/dependencies.go
+++ b/services/core/internal/api/dependencies.go
@@ -64,14 +64,8 @@ type Dependencies struct {
 
 	EnvironmentTemplatesReader EnvironmentTemplatesReader
 
-	// Execution is nil when this Core runs without a Runtime gateway, and so
-	// without an execution Worker. Work that needs one then answers 503
-	// execution_unavailable.
-	Execution *Execution
-	// Sandboxes is nil when this Core has no managed sandbox installation. The
-	// sandbox node and manager routes are then absent, and openai_hosted
-	// Sessions answer 503 execution_unavailable. It requires Execution.
-	Sandboxes *Sandboxes
+	Execution Execution
+	Sandboxes Sandboxes
 }
 
 // Execution is the execution Worker's surface. Every field is required unless
@@ -147,35 +141,24 @@ func (d Dependencies) validate() error {
 	); err != nil {
 		return err
 	}
-	if e := d.Execution; e != nil {
-		if e.ExecutorURL == "" {
-			return errors.New("api: Execution.ExecutorURL is required")
-		}
-		if e.NativeInstaller != nil && (e.NativeInstaller.Version == "" || e.NativeInstaller.Base == "") {
-			return errors.New("api: Execution.NativeInstaller.Version and Base are required")
-		}
-		if err := required(
-			field{"Execution.SessionAdmission", e.SessionAdmission},
-			field{"Execution.InputAdmission", e.InputAdmission},
-			field{"Execution.SessionArchive", e.SessionArchive},
-			field{"Execution.Workspaces", e.Workspaces},
-		); err != nil {
-			return err
-		}
+	e, s := d.Execution, d.Sandboxes
+	if e.ExecutorURL == "" {
+		return errors.New("api: Execution.ExecutorURL is required")
 	}
-	if s := d.Sandboxes; s != nil {
-		if d.Execution == nil {
-			return errors.New("api: Sandboxes requires Execution")
-		}
-		return required(
-			field{"Sandboxes.Deployment", s.Deployment},
-			field{"Sandboxes.NodeAllocations", s.NodeAllocations},
-			field{"Sandboxes.DeploymentChanges", s.DeploymentChanges},
-			field{"Sandboxes.DeploymentReset", s.DeploymentReset},
-			field{"Sandboxes.ConfigurationDiscovery", s.ConfigurationDiscovery},
-		)
+	if e.NativeInstaller != nil && (e.NativeInstaller.Version == "" || e.NativeInstaller.Base == "") {
+		return errors.New("api: Execution.NativeInstaller.Version and Base are required")
 	}
-	return nil
+	return required(
+		field{"Execution.SessionAdmission", e.SessionAdmission},
+		field{"Execution.InputAdmission", e.InputAdmission},
+		field{"Execution.SessionArchive", e.SessionArchive},
+		field{"Execution.Workspaces", e.Workspaces},
+		field{"Sandboxes.Deployment", s.Deployment},
+		field{"Sandboxes.NodeAllocations", s.NodeAllocations},
+		field{"Sandboxes.DeploymentChanges", s.DeploymentChanges},
+		field{"Sandboxes.DeploymentReset", s.DeploymentReset},
+		field{"Sandboxes.ConfigurationDiscovery", s.ConfigurationDiscovery},
+	)
 }
 
 type field struct {
@@ -191,12 +174,3 @@ func required(fields ...field) error {
 	}
 	return nil
 }
-
-// executorURL is the daemon URL self-hosted Sessions report, or empty when
-// this Core cannot execute.
-func (h *Handler) executorURL() string {
-	if h.Execution == nil {
-		return ""
-	}
-	return h.Execution.ExecutorURL
-}
diff --git a/services/core/internal/api/dependencies_test.go b/services/core/internal/api/dependencies_test.go
index a044d4988..e3d585561 100644
--- a/services/core/internal/api/dependencies_test.go
+++ b/services/core/internal/api/dependencies_test.go
@@ -63,9 +63,8 @@ type testFakes struct {
 
 // testDependencies returns Dependencies in which every area is a strict fake.
 // A test sets the funcs it expects on the returned fakes; any other call fails
-// it. Engine is "codex", CoreKeys accepts "Bearer admin", and Execution and
-// Sandboxes are disabled until the test sets fakes.execution() or
-// fakes.sandboxes().
+// it. Engine is "codex", CoreKeys accepts "Bearer admin", and Execution reports
+// testExecutorURL without a native installer.
 func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 	t.Helper()
 	f := &testFakes{
@@ -116,33 +115,23 @@ func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 		SessionAdmin:    f.sessionAdmin,
 		Environments:    f.environments, EnvironmentsReader: f.environmentsReader, ExecutorConnections: f.executorConnections, Admin: f.admin, AdminAudit: f.adminAudit, WriteAudit: f.writeAudit,
 		Metrics: f.metrics, RuntimeObservations: f.runtimeObservations, RuntimeHistory: f.runtimeHistory,
+		Execution: Execution{
+			ExecutorURL:      testExecutorURL,
+			SessionAdmission: f.sessionAdmission,
+			InputAdmission:   f.inputAdmission,
+			SessionArchive:   f.sessionArchive,
+			Workspaces:       f.workspaces,
+		},
+		Sandboxes: Sandboxes{
+			Deployment:             f.deployment,
+			NodeAllocations:        f.nodeAllocations,
+			DeploymentChanges:      f.deploymentChanges,
+			DeploymentReset:        f.deploymentReset,
+			ConfigurationDiscovery: f.configurationDiscovery,
+		},
 	}, f
 }
 
-// execution is an Execution group backed by f's strict fakes, reporting
-// testExecutorURL and without a native installer.
-func (f *testFakes) execution() *Execution {
-	return &Execution{
-		ExecutorURL:      testExecutorURL,
-		SessionAdmission: f.sessionAdmission,
-		InputAdmission:   f.inputAdmission,
-		SessionArchive:   f.sessionArchive,
-		Workspaces:       f.workspaces,
-	}
-}
-
-// sandboxes is a Sandboxes group backed by f's strict fakes. It requires
-// Execution.
-func (f *testFakes) sandboxes() *Sandboxes {
-	return &Sandboxes{
-		Deployment:             f.deployment,
-		NodeAllocations:        f.nodeAllocations,
-		DeploymentChanges:      f.deploymentChanges,
-		DeploymentReset:        f.deploymentReset,
-		ConfigurationDiscovery: f.configurationDiscovery,
-	}
-}
-
 // coreKeys accepts each token as a Core key.
 func coreKeys(t testing.TB, tokens ...string) *DeploymentAuthenticator {
 	t.Helper()
@@ -174,13 +163,11 @@ func noDeploymentModelProvider(context.Context, string) (*modelconfiguration.Sna
 }
 
 func TestNewHandlerAcceptsCompleteDependencies(t *testing.T) {
-	deps, f := testDependencies(t)
+	deps, _ := testDependencies(t)
 	if _, err := NewHandler(deps); err != nil {
 		t.Fatal(err)
 	}
-	deps.Execution = f.execution()
 	deps.Execution.NativeInstaller = &NativeInstaller{Version: "build", Base: "https://core.example/api/v1/agent-daemon/install/"}
-	deps.Sandboxes = f.sandboxes()
 	if _, err := NewHandler(deps); err != nil {
 		t.Fatal(err)
 	}
@@ -200,27 +187,11 @@ func TestNewHandlerRejectsIncompleteDependencies(t *testing.T) {
 		{"Turns", func(d *Dependencies, _ *testFakes) { d.Turns = nil }},
 		{"Items", func(d *Dependencies, _ *testFakes) { d.Items = nil }},
 		{"RuntimeHistory", func(d *Dependencies, _ *testFakes) { d.RuntimeHistory = nil }},
-		{"Execution.ExecutorURL", func(d *Dependencies, f *testFakes) {
-			d.Execution = f.execution()
-			d.Execution.ExecutorURL = ""
-		}},
-		{"Execution.SessionAdmission", func(d *Dependencies, f *testFakes) {
-			d.Execution = f.execution()
-			d.Execution.SessionAdmission = nil
-		}},
-		{"Execution.InputAdmission", func(d *Dependencies, f *testFakes) {
-			d.Execution = f.execution()
-			d.Execution.InputAdmission = nil
-		}},
-		{"Execution.NativeInstaller.Version", func(d *Dependencies, f *testFakes) {
-			d.Execution = f.execution()
-			d.Execution.NativeInstaller = &NativeInstaller{}
-		}},
-		{"Sandboxes requires Execution", func(d *Dependencies, f *testFakes) { d.Sandboxes = f.sandboxes() }},
-		{"Sandboxes.ConfigurationDiscovery", func(d *Dependencies, f *testFakes) {
-			d.Execution, d.Sandboxes = f.execution(), f.sandboxes()
-			d.Sandboxes.ConfigurationDiscovery = nil
-		}},
+		{"Execution.ExecutorURL", func(d *Dependencies, _ *testFakes) { d.Execution.ExecutorURL = "" }},
+		{"Execution.SessionAdmission", func(d *Dependencies, _ *testFakes) { d.Execution.SessionAdmission = nil }},
+		{"Execution.InputAdmission", func(d *Dependencies, _ *testFakes) { d.Execution.InputAdmission = nil }},
+		{"Execution.NativeInstaller.Version", func(d *Dependencies, _ *testFakes) { d.Execution.NativeInstaller = &NativeInstaller{} }},
+		{"Sandboxes.ConfigurationDiscovery", func(d *Dependencies, _ *testFakes) { d.Sandboxes.ConfigurationDiscovery = nil }},
 	} {
 		t.Run(test.missing, func(t *testing.T) {
 			deps, f := testDependencies(t)
diff --git a/services/core/internal/api/environment_creation_test.go b/services/core/internal/api/environment_creation_test.go
index 7feca96c7..e9f03cd95 100644
--- a/services/core/internal/api/environment_creation_test.go
+++ b/services/core/internal/api/environment_creation_test.go
@@ -66,10 +66,8 @@ func environmentCreationHandler(t *testing.T, engine string, configure ...func(*
 	return newTestHandler(t, deps), fixture
 }
 
-// selfHostedExecution enables Execution reporting environmentOrigin to
-// self-hosted Sessions.
+// selfHostedExecution reports environmentOrigin to self-hosted Sessions.
 func selfHostedExecution(d *Dependencies, f *testFakes) {
-	d.Execution = f.execution()
 	d.Execution.ExecutorURL = environmentOrigin
 }
 
@@ -202,41 +200,3 @@ func TestSelfHostedCreationRejectsBeforePersistence(t *testing.T) {
 		}
 	}
 }
-
-// Execution, which carries the executor URL, is required; a URL without
-// Execution cannot be configured (TestNewHandlerRejectsIncompleteDependencies).
-func TestSelfHostedCreationRequiresOperatorExecution(t *testing.T) {
-	for _, stream := range []bool{false, true} {
-		unavailable := 0
-		handler, fixture := environmentCreationHandler(t, "codex", func(_ *Dependencies, f *testFakes) { f.metrics.recordUnavailable = func() { unavailable++ } })
-		body := fmt.Sprintf(`{"agent":{"model":"MiniMax-M3"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"},"stream":%t,%s}`, stream, fixtureSessionProvider)
-		request := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(body))
-		request.Header.Set("Authorization", "Bearer key")
-		request.Header.Set("OpenAI-Beta", "agents=v1")
-		request.Header.Set("Content-Type", "application/json")
-		response := httptest.NewRecorder()
-		handler.ServeHTTP(response, request)
-		var failure v1.ErrorResponse
-		if response.Code != http.StatusServiceUnavailable || json.Unmarshal(response.Body.Bytes(), &failure) != nil || failure.Error.Code == nil || *failure.Error.Code != "execution_unavailable" || fixture.input.Engine != "" || unavailable != 1 {
-			t.Fatal("operator prerequisites did not fail before persistence", response.Code, response.Body.String(), fixture.input)
-		}
-	}
-}
-
-func TestHostedCreationRequiresOperatorExecution(t *testing.T) {
-	for _, stream := range []bool{false, true} {
-		unavailable := 0
-		handler, fixture := environmentCreationHandler(t, "codex", selfHostedExecution, func(_ *Dependencies, f *testFakes) { f.metrics.recordUnavailable = func() { unavailable++ } })
-		body := fmt.Sprintf(`{"agent":{"model":"model"},"environment":{"type":"openai_hosted"},"stream":%t,"input":"Initialize the hosted execution."}`, stream)
-		request := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(body))
-		request.Header.Set("Authorization", "Bearer key")
-		request.Header.Set("OpenAI-Beta", "agents=v1")
-		request.Header.Set("Content-Type", "application/json")
-		response := httptest.NewRecorder()
-		handler.ServeHTTP(response, request)
-		var failure v1.ErrorResponse
-		if response.Code != http.StatusServiceUnavailable || json.Unmarshal(response.Body.Bytes(), &failure) != nil || failure.Error.Code == nil || *failure.Error.Code != "execution_unavailable" || fixture.input.Engine != "" || unavailable != 1 {
-			t.Fatal("hosted configuration bypassed operator prerequisites", response.Code, response.Body.String())
-		}
-	}
-}
diff --git a/services/core/internal/api/environment_files.go b/services/core/internal/api/environment_files.go
index d829775e0..e507f348c 100644
--- a/services/core/internal/api/environment_files.go
+++ b/services/core/internal/api/environment_files.go
@@ -33,7 +33,7 @@ func (h *Handler) listEnvironmentFiles(w http.ResponseWriter, r *http.Request) {
 	if !ok || !environmentFilesAccessible(w, environment) {
 		return
 	}
-	if h.Execution == nil || !execution.LocalWorkspaceConfiguration(environment.Configuration) {
+	if !execution.LocalWorkspaceConfiguration(environment.Configuration) {
 		writeSessionsError(w, r, execution.ErrExecutionUnavailable)
 		return
 	}
diff --git a/services/core/internal/api/environment_files_completeness_test.go b/services/core/internal/api/environment_files_completeness_test.go
index df17a8793..c63854d2f 100644
--- a/services/core/internal/api/environment_files_completeness_test.go
+++ b/services/core/internal/api/environment_files_completeness_test.go
@@ -23,7 +23,7 @@ func TestEnvironmentFilesRejectsIncompleteOrMalformedDirectories(t *testing.T) {
 	} {
 		t.Run(name, func(t *testing.T) {
 			unavailable := 0
-			h, f := environmentFilesHandler(t, true, countEnvironmentFilesUnavailable(&unavailable))
+			h, f := environmentFilesHandler(t, countEnvironmentFilesUnavailable(&unavailable))
 			f.result = result
 			w := requestEnvironmentFiles(h, f.environment.ID, "?limit=1", "files-key")
 			if w.Code != 503 || unavailable != 1 || strings.Contains(w.Body.String(), `"data"`) || strings.Contains(w.Body.String(), `"next"`) || strings.Contains(w.Body.String(), "secret") {
@@ -36,7 +36,7 @@ func TestEnvironmentFilesRejectsIncompleteOrMalformedDirectories(t *testing.T) {
 func TestEnvironmentFilesCursorRejectsChangesAndAcceptsNativeReordering(t *testing.T) {
 	for _, change := range []string{"limit", "order", "path", "environment", "size", "name", "removed", "added", "native order"} {
 		t.Run(change, func(t *testing.T) {
-			h, f := environmentFilesHandler(t, true)
+			h, f := environmentFilesHandler(t)
 			f.result.Entries = []proto.WorkspaceDirectoryEntry{environmentFileEntry("A", 1), environmentFileEntry("B", 2)}
 			page := decodeEnvironmentFiles(t, requestEnvironmentFiles(h, f.environment.ID, "?limit=1", "files-key"))
 			q := url.Values{"limit": {"1"}, "page": {*page.Next}}
@@ -73,7 +73,7 @@ func TestEnvironmentFilesCursorRejectsChangesAndAcceptsNativeReordering(t *testi
 func TestEnvironmentFilesMalformedCursorBounds(t *testing.T) {
 	for _, change := range []string{"version", "binding", "fingerprint", "negative", "overflow", "unknown", "trailing", "non-page offset"} {
 		t.Run(change, func(t *testing.T) {
-			h, f := environmentFilesHandler(t, true)
+			h, f := environmentFilesHandler(t)
 			f.result.Entries = []proto.WorkspaceDirectoryEntry{environmentFileEntry("A", 1), environmentFileEntry("B", 2), environmentFileEntry("C", 3)}
 			page := decodeEnvironmentFiles(t, requestEnvironmentFiles(h, f.environment.ID, "?limit=2", "files-key"))
 			raw, _ := base64.RawURLEncoding.DecodeString(*page.Next)
diff --git a/services/core/internal/api/environment_files_create.go b/services/core/internal/api/environment_files_create.go
index 0cec14045..9a2608ddc 100644
--- a/services/core/internal/api/environment_files_create.go
+++ b/services/core/internal/api/environment_files_create.go
@@ -105,7 +105,7 @@ func (h *Handler) createEnvironmentFile(w http.ResponseWriter, r *http.Request)
 			return
 		}
 	}
-	if h.Execution == nil || !execution.LocalWorkspaceConfiguration(environment.Configuration) {
+	if !execution.LocalWorkspaceConfiguration(environment.Configuration) {
 		writeSessionsError(w, r, execution.ErrExecutionUnavailable)
 		return
 	}
diff --git a/services/core/internal/api/environment_files_create_test.go b/services/core/internal/api/environment_files_create_test.go
index ebeebd16a..1e8a6a737 100644
--- a/services/core/internal/api/environment_files_create_test.go
+++ b/services/core/internal/api/environment_files_create_test.go
@@ -48,7 +48,6 @@ func environmentFileCreateHandler(t *testing.T, configure ...func(*Dependencies,
 		APIKey{OrganizationID: "org", ProjectID: "other", SubjectKind: "user", SubjectID: "other", TokenSHA256: runtimedevice.HashCredential("other-key"), TenantID: uuid.NewString()},
 	).ResolveAPIKey
 	fakes.environmentsReader.getEnvironment = f.GetEnvironment
-	deps.Execution = fakes.execution()
 	fakes.workspaces.readEnvironmentDirectory, fakes.workspaces.writeEnvironmentFile = f.ReadEnvironmentDirectory, f.WriteEnvironmentFile
 	for _, c := range configure {
 		c(&deps, fakes)
diff --git a/services/core/internal/api/environment_files_deadline_test.go b/services/core/internal/api/environment_files_deadline_test.go
index 6f1f2cd3b..a868b27d0 100644
--- a/services/core/internal/api/environment_files_deadline_test.go
+++ b/services/core/internal/api/environment_files_deadline_test.go
@@ -13,7 +13,7 @@ import (
 func TestEnvironmentFilesReadOutlivesDefaultHTTPWriteDeadline(t *testing.T) {
 	for _, status := range []int{http.StatusOK, http.StatusServiceUnavailable} {
 		t.Run(http.StatusText(status), func(t *testing.T) {
-			handler, fixture := environmentFilesHandler(t, true, func(_ *Dependencies, f *testFakes) { f.metrics.recordUnavailable = func() {} })
+			handler, fixture := environmentFilesHandler(t, func(_ *Dependencies, f *testFakes) { f.metrics.recordUnavailable = func() {} })
 			fixture.readDelay = 100 * time.Millisecond
 			if status == http.StatusServiceUnavailable {
 				fixture.readError = execution.ErrExecutionUnavailable
diff --git a/services/core/internal/api/environment_files_test.go b/services/core/internal/api/environment_files_test.go
index 4ba1ebad1..eab54eb9f 100644
--- a/services/core/internal/api/environment_files_test.go
+++ b/services/core/internal/api/environment_files_test.go
@@ -62,9 +62,8 @@ func newEnvironmentFilesFixture() *environmentFilesFixture {
 	}
 }
 
-// environmentFilesHandler serves f's Environment. Without enabled, Core has no
-// execution Worker.
-func environmentFilesHandler(t *testing.T, enabled bool, configure ...func(*Dependencies, *testFakes)) (http.Handler, *environmentFilesFixture) {
+// environmentFilesHandler serves f's Environment.
+func environmentFilesHandler(t *testing.T, configure ...func(*Dependencies, *testFakes)) (http.Handler, *environmentFilesFixture) {
 	t.Helper()
 	f := newEnvironmentFilesFixture()
 	keys := []APIKey{}
@@ -80,10 +79,7 @@ func environmentFilesHandler(t *testing.T, enabled bool, configure ...func(*Depe
 	deps.Engine = "fake_alpha"
 	fakes.projectsReader.resolveAPIKey = projectKeys(t, keys...).ResolveAPIKey
 	fakes.environmentsReader.getEnvironment = f.GetEnvironment
-	if enabled {
-		deps.Execution = fakes.execution()
-		fakes.workspaces.readEnvironmentDirectory = f.ReadEnvironmentDirectory
-	}
+	fakes.workspaces.readEnvironmentDirectory = f.ReadEnvironmentDirectory
 	for _, c := range configure {
 		c(&deps, fakes)
 	}
@@ -131,7 +127,7 @@ func decodeEnvironmentFiles(t *testing.T, w *httptest.ResponseRecorder) v1.Envir
 func TestEnvironmentFilesOrderingPaginationAndProjection(t *testing.T) {
 	for _, order := range []string{"", "asc", "desc"} {
 		t.Run("order="+order, func(t *testing.T) {
-			h, f := environmentFilesHandler(t, true)
+			h, f := environmentFilesHandler(t)
 			f.result.Entries = []proto.WorkspaceDirectoryEntry{
 				environmentFileEntry("a.txt", 14), environmentFileEntry("z.txt", 5), environmentFileEntry("A.txt", 0), environmentFileEntry("a-b.txt", 6),
 				{Name: "directory", Kind: "directory"}, {Name: "symlink", Kind: "symlink"}, {Name: "socket", Kind: "other"},
@@ -173,7 +169,7 @@ func TestEnvironmentFilesOrderingPaginationAndProjection(t *testing.T) {
 }
 
 func TestEnvironmentFilesEmptyRootDefaultsAndSharedAccess(t *testing.T) {
-	h, f := environmentFilesHandler(t, true)
+	h, f := environmentFilesHandler(t)
 	page := decodeEnvironmentFiles(t, requestEnvironmentFiles(h, f.environment.ID, "", "shared-key"))
 	if len(page.Data) != 0 || page.Next != nil || f.directory != "" {
 		t.Fatal("invalid empty root", page, f.directory)
@@ -193,16 +189,14 @@ func TestEnvironmentFilesEmptyRootDefaultsAndSharedAccess(t *testing.T) {
 }
 
 func TestEnvironmentFilesAuthorizationPrecedesInspection(t *testing.T) {
-	for _, enabled := range []bool{false, true} {
-		for _, query := range []string{"", "?path=/foreign-secret/../&page=invalid&limit=999", "?bad=%GG"} {
-			h, f := environmentFilesHandler(t, enabled)
-			w := requestEnvironmentFiles(h, f.environment.ID, query, "other-key")
-			if w.Code != 404 || f.lookups != 1 || f.reads != 0 || strings.Contains(w.Body.String(), "foreign-secret") || strings.Contains(w.Body.String(), f.environment.ID) {
-				t.Fatal("foreign resource inspected", w.Code, w.Body, f)
-			}
+	for _, query := range []string{"", "?path=/foreign-secret/../&page=invalid&limit=999", "?bad=%GG"} {
+		h, f := environmentFilesHandler(t)
+		w := requestEnvironmentFiles(h, f.environment.ID, query, "other-key")
+		if w.Code != 404 || f.lookups != 1 || f.reads != 0 || strings.Contains(w.Body.String(), "foreign-secret") || strings.Contains(w.Body.String(), f.environment.ID) {
+			t.Fatal("foreign resource inspected", w.Code, w.Body, f)
 		}
 	}
-	h, f := environmentFilesHandler(t, true)
+	h, f := environmentFilesHandler(t)
 	w := requestEnvironmentFiles(h, f.environment.ID, "", "invalid")
 	if w.Code != 401 || f.lookups != 0 || f.reads != 0 {
 		t.Fatal("unauthenticated read", w.Code, f)
@@ -214,7 +208,7 @@ func TestEnvironmentFilesRejectsInvalidRequestsBeforeRead(t *testing.T) {
 		"limit=0", "limit=101", "limit=no", "limit=", "limit=1&limit=2", "order=ASC", "order=", "path=", "path=relative", "path=/workspace-sibling", "path=/workspace/../workspace", "path=/workspace/a/../../workspace", "path=/workspace/%00", "path=/workspace/%5C", "path=/workspace/%0A", "path=/workspace/%FF", "path=x&path=y", "path=" + strings.Repeat("a", 4097), "page=", "page=not-json", "page=" + strings.Repeat("a", 1025), "bad=%GG", "foo=1;bar=2",
 	} {
 		t.Run(query[:min(len(query), 70)], func(t *testing.T) {
-			h, f := environmentFilesHandler(t, true)
+			h, f := environmentFilesHandler(t)
 			w := requestEnvironmentFiles(h, f.environment.ID, "?"+query, "files-key")
 			if w.Code != 400 || f.lookups != 1 || f.reads != 0 {
 				t.Fatal("invalid query reached runtime", w.Code, w.Body, f)
@@ -235,7 +229,7 @@ func TestEnvironmentFilesSafeStoreAndReaderFailures(t *testing.T) {
 			{sessions.ErrNotFound, 404}, {sessions.ErrInvalidInput, 400}, {execution.ErrExecutionUnavailable, 503}, {errors.New("private-native-secret"), 500},
 		} {
 			unavailable := 0
-			h, f := environmentFilesHandler(t, true, countEnvironmentFilesUnavailable(&unavailable))
+			h, f := environmentFilesHandler(t, countEnvironmentFilesUnavailable(&unavailable))
 			if target == "store" {
 				f.storeError = test.err
 			} else {
@@ -250,9 +244,4 @@ func TestEnvironmentFilesSafeStoreAndReaderFailures(t *testing.T) {
 			}
 		}
 	}
-	unavailable := 0
-	h, f := environmentFilesHandler(t, false, countEnvironmentFilesUnavailable(&unavailable))
-	if w := requestEnvironmentFiles(h, f.environment.ID, "", "files-key"); w.Code != 503 || f.reads != 0 || unavailable != 1 {
-		t.Fatal("missing reader accepted", w.Code, f)
-	}
 }
diff --git a/services/core/internal/api/environment_files_wire_test.go b/services/core/internal/api/environment_files_wire_test.go
index b47a0dc49..84426cdca 100644
--- a/services/core/internal/api/environment_files_wire_test.go
+++ b/services/core/internal/api/environment_files_wire_test.go
@@ -14,7 +14,7 @@ import (
 // Official Environment Files wire rows F1–F9 of the environment-files-wire batch.
 
 func TestEnvironmentFilesPageEnvelope(t *testing.T) {
-	h, f := environmentFilesHandler(t, true)
+	h, f := environmentFilesHandler(t)
 	w := requestEnvironmentFiles(h, f.environment.ID, "", "files-key")
 	if w.Code != 200 || strings.TrimSpace(w.Body.String()) != `{"object":"page","data":[],"next":null,"has_more":false}` {
 		t.Fatalf("empty page: %d %s", w.Code, w.Body)
@@ -33,7 +33,7 @@ func TestEnvironmentFilesPageEnvelope(t *testing.T) {
 }
 
 func TestEnvironmentFilesIgnoresUnknownQueryKeys(t *testing.T) {
-	h, f := environmentFilesHandler(t, true)
+	h, f := environmentFilesHandler(t)
 	f.result.Entries = []proto.WorkspaceDirectoryEntry{environmentFileEntry("a", 1)}
 	want := requestEnvironmentFiles(h, f.environment.ID, "", "files-key").Body.String()
 	for _, query := range []string{"?foo=bar", "?after=x&after=y", "?tenant_id=" + uuid.NewString(), "?include=all&foo", "?Path=/workspace/secret"} {
@@ -52,7 +52,7 @@ func TestEnvironmentFilesIgnoresUnknownQueryKeys(t *testing.T) {
 func TestEnvironmentFilesRejectsRepeatedQueryKeys(t *testing.T) {
 	for _, key := range []string{"path", "limit", "order", "page"} {
 		t.Run(key, func(t *testing.T) {
-			h, f := environmentFilesHandler(t, true)
+			h, f := environmentFilesHandler(t)
 			query := "?" + key + "=1&" + key + "=2"
 			w := requestEnvironmentFiles(h, f.environment.ID, query, "files-key")
 			assertListQueryError(t, w, "invalid_request_error", nil, "Failed to deserialize query string: duplicate field `"+key+"`")
@@ -92,7 +92,7 @@ func TestEnvironmentFilesPathErrors(t *testing.T) {
 		"/":                             directory,
 	} {
 		t.Run(path[:min(len(path), 40)], func(t *testing.T) {
-			h, f := environmentFilesHandler(t, true)
+			h, f := environmentFilesHandler(t)
 			w := requestEnvironmentFiles(h, f.environment.ID, "?"+url.Values{"path": {path}}.Encode(), "files-key")
 			assertListQueryError(t, w, "invalid_request_error", nil, message)
 			if f.reads != 0 {
@@ -101,7 +101,7 @@ func TestEnvironmentFilesPathErrors(t *testing.T) {
 		})
 	}
 	for path, relative := range map[string]string{"/workspace": "", "/workspace/a": "a", "/workspace/a/b c": "a/b c"} {
-		h, f := environmentFilesHandler(t, true)
+		h, f := environmentFilesHandler(t)
 		decodeEnvironmentFiles(t, requestEnvironmentFiles(h, f.environment.ID, "?"+url.Values{"path": {path}}.Encode(), "files-key"))
 		if f.directory != relative {
 			t.Fatal("canonical path changed", path, f.directory)
@@ -110,7 +110,7 @@ func TestEnvironmentFilesPathErrors(t *testing.T) {
 }
 
 func TestEnvironmentFilesPageTokenErrors(t *testing.T) {
-	h, f := environmentFilesHandler(t, true)
+	h, f := environmentFilesHandler(t)
 	f.result.Entries = []proto.WorkspaceDirectoryEntry{environmentFileEntry("a", 1), environmentFileEntry("b", 2)}
 	page := decodeEnvironmentFiles(t, requestEnvironmentFiles(h, f.environment.ID, "?limit=1", "files-key"))
 	for name, query := range map[string]url.Values{
diff --git a/services/core/internal/api/environment_installation.go b/services/core/internal/api/environment_installation.go
index caa666ef7..3899bbf4d 100644
--- a/services/core/internal/api/environment_installation.go
+++ b/services/core/internal/api/environment_installation.go
@@ -25,17 +25,8 @@ type NativeInstaller struct {
 	Catalog *nativeinstaller.Catalog
 }
 
-// nativeInstaller returns this Core's native installer, or nil when it serves
-// none.
-func (h *Handler) nativeInstaller() *NativeInstaller {
-	if h.Execution == nil {
-		return nil
-	}
-	return h.Execution.NativeInstaller
-}
-
 func (h *Handler) installationFor(ctx context.Context, principal identity.Principal, environment string) (*v1.EnvironmentInstallation, error) {
-	installer := h.nativeInstaller()
+	installer := h.Execution.NativeInstaller
 	result := &v1.EnvironmentInstallation{Status: "unavailable", Message: "This Core has no matching native installation distribution. Ask its operator to install the qualified release artifacts."}
 	if installer == nil {
 		return result, nil
@@ -52,7 +43,7 @@ func (h *Handler) installationFor(ctx context.Context, principal identity.Princi
 }
 
 func (h *Handler) addSessionInstallation(w http.ResponseWriter, r *http.Request, response *v1.Session) error {
-	if response.Environment.Type != "self_hosted" || h.nativeInstaller() == nil {
+	if response.Environment.Type != "self_hosted" || h.Execution.NativeInstaller == nil {
 		return nil
 	}
 	principal, ok := r.Context().Value(principalContextKey{}).(identity.Principal)
@@ -69,7 +60,7 @@ func (h *Handler) addSessionInstallation(w http.ResponseWriter, r *http.Request,
 }
 
 func (h *Handler) registerNativeInstallationRoutes(r chi.Router) {
-	installer := h.nativeInstaller()
+	installer := h.Execution.NativeInstaller
 	if installer == nil {
 		return
 	}
@@ -123,7 +114,7 @@ func (h *Handler) prepareNativeInstallation(w http.ResponseWriter, r *http.Reque
 		writeSessionsError(w, r, err)
 		return
 	}
-	response, err := sessionResponse(session, h.executorURL())
+	response, err := sessionResponse(session, h.Execution.ExecutorURL)
 	if err != nil {
 		writeSessionsError(w, r, err)
 		return
diff --git a/services/core/internal/api/environment_installation_test.go b/services/core/internal/api/environment_installation_test.go
index 4cf35ef2d..453bcd263 100644
--- a/services/core/internal/api/environment_installation_test.go
+++ b/services/core/internal/api/environment_installation_test.go
@@ -39,7 +39,6 @@ func TestSelfHostedCreationReturnsInstallationWithoutWebCredential(t *testing.T)
 	fakes.sessionCreation.findSessionCreation, fakes.sessionCreation.createSession = f.FindSessionCreation, f.CreateSession
 	fakes.modelProviders.resolve = fixtureDeploymentProvider
 	fakes.environments.authorizeEnvironmentInstallation, fakes.environments.validateEnvironmentInstallation = f.AuthorizeEnvironmentInstallation, f.ValidateEnvironmentInstallation
-	deps.Execution = fakes.execution()
 	deps.Execution.NativeInstaller = &NativeInstaller{Version: "build", Base: "https://core.example/api/v1/agent-daemon/install/", Catalog: &nativeinstaller.Catalog{Version: "build"}}
 	handler := newTestHandler(t, deps)
 	body := `{"agent":{"model":"model"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"},"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"https://model.example/v1","api_key":"fixture-model"}}}`
diff --git a/services/core/internal/api/environment_templates_test.go b/services/core/internal/api/environment_templates_test.go
index 90f5d08dc..077694c45 100644
--- a/services/core/internal/api/environment_templates_test.go
+++ b/services/core/internal/api/environment_templates_test.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmenttemplates"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/textvalue"
@@ -26,7 +25,6 @@ func TestEnvironmentTemplatesErrors(t *testing.T) {
 		{environmenttemplates.ErrNotFound, 404, "not_found_error"},
 		{fmt.Errorf("create: %w", environmenttemplates.ErrInvalidInput), 400, invalidInputMessage},
 		{textvalue.ErrUnstorable, 400, unstorableTextMessage},
-		{credentialcrypto.ErrUnavailable, 503, "credential_storage_unavailable"},
 		{errors.New("template-canary"), 500, "internal_error"},
 	} {
 		response := httptest.NewRecorder()
diff --git a/services/core/internal/api/errors.go b/services/core/internal/api/errors.go
index 2e92da06d..ff91dce09 100644
--- a/services/core/internal/api/errors.go
+++ b/services/core/internal/api/errors.go
@@ -8,7 +8,6 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/textvalue"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 )
@@ -139,17 +138,6 @@ func writeTextValueError(w http.ResponseWriter, r *http.Request, err error) bool
 	return true
 }
 
-// writeCredentialUnavailableError reports a request that needs credential
-// encryption on a service without a credential key, and returns false for any
-// other error.
-func writeCredentialUnavailableError(w http.ResponseWriter, r *http.Request, err error) bool {
-	if !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		return false
-	}
-	writeError(w, http.StatusServiceUnavailable, "credential_storage_unavailable", "Credential encryption is not configured on this service.")
-	return true
-}
-
 // writeAuditSourceError reports write or administrator provenance that cannot
 // be recorded, so the write failed closed, and returns false for any other
 // error.
diff --git a/services/core/internal/api/errors_agents.go b/services/core/internal/api/errors_agents.go
index 3fc3a8df4..f8577c622 100644
--- a/services/core/internal/api/errors_agents.go
+++ b/services/core/internal/api/errors_agents.go
@@ -10,7 +10,7 @@ import (
 
 // writeAgentsError reports an error of the Agent operations.
 func writeAgentsError(w http.ResponseWriter, r *http.Request, err error) {
-	if writeStoredDataError(w, r, err) || writeTextValueError(w, r, err) || writeAuditSourceError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+	if writeStoredDataError(w, r, err) || writeTextValueError(w, r, err) || writeAuditSourceError(w, r, err) {
 		return
 	}
 	switch {
diff --git a/services/core/internal/api/errors_deployment.go b/services/core/internal/api/errors_deployment.go
index 0da81d951..76646108d 100644
--- a/services/core/internal/api/errors_deployment.go
+++ b/services/core/internal/api/errors_deployment.go
@@ -23,7 +23,7 @@ func writeDeploymentError(w http.ResponseWriter, r *http.Request, err error) {
 	case errors.Is(err, deployment.ErrNotFound):
 		writeError(w, http.StatusNotFound, "not_found_error", "Resource not found.")
 	default:
-		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) {
 			return
 		}
 		writeInternalError(w, r)
diff --git a/services/core/internal/api/errors_environmenttemplates.go b/services/core/internal/api/errors_environmenttemplates.go
index f48c1abb0..2d935592e 100644
--- a/services/core/internal/api/errors_environmenttemplates.go
+++ b/services/core/internal/api/errors_environmenttemplates.go
@@ -16,7 +16,7 @@ func writeEnvironmentTemplatesError(w http.ResponseWriter, r *http.Request, err
 	case errors.Is(err, environmenttemplates.ErrInvalidInput):
 		writeError(w, http.StatusBadRequest, "invalid_request", invalidInputMessage)
 	default:
-		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) {
 			return
 		}
 		writeInternalError(w, r)
diff --git a/services/core/internal/api/errors_files.go b/services/core/internal/api/errors_files.go
index ed21fc37c..0b8d1ab9b 100644
--- a/services/core/internal/api/errors_files.go
+++ b/services/core/internal/api/errors_files.go
@@ -12,7 +12,7 @@ import (
 // writeFilesError maps a files error to its public response. notFoundParam
 // names the parameter a missing File came from.
 func writeFilesError(w http.ResponseWriter, r *http.Request, err error, notFoundParam ...string) {
-	if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+	if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) {
 		return
 	}
 	switch {
diff --git a/services/core/internal/api/errors_modelconfiguration.go b/services/core/internal/api/errors_modelconfiguration.go
index 88af07ce3..cb6fc7707 100644
--- a/services/core/internal/api/errors_modelconfiguration.go
+++ b/services/core/internal/api/errors_modelconfiguration.go
@@ -19,7 +19,7 @@ func writeModelConfigurationError(w http.ResponseWriter, r *http.Request, err er
 		}
 		return
 	}
-	if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+	if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) {
 		return
 	}
 	writeInternalError(w, r)
diff --git a/services/core/internal/api/errors_projects.go b/services/core/internal/api/errors_projects.go
index 9882c604a..58aa882ff 100644
--- a/services/core/internal/api/errors_projects.go
+++ b/services/core/internal/api/errors_projects.go
@@ -31,7 +31,7 @@ func writeProjectsError(w http.ResponseWriter, r *http.Request, err error) {
 	case errors.Is(err, projects.ErrAPIKeyExists):
 		writeError(w, http.StatusConflict, "project_api_key_exists", "This API key ID already exists. List its metadata and revoke it explicitly if the secret was not saved.")
 	default:
-		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) {
 			return
 		}
 		writeInternalError(w, r)
diff --git a/services/core/internal/api/errors_sessions.go b/services/core/internal/api/errors_sessions.go
index 64ed5b977..32a2328a2 100644
--- a/services/core/internal/api/errors_sessions.go
+++ b/services/core/internal/api/errors_sessions.go
@@ -72,7 +72,7 @@ func writeSessionsError(w http.ResponseWriter, r *http.Request, err error) {
 	case errors.Is(err, sessions.ErrInvalidInput), errors.Is(err, environmentconfig.ErrInvalid):
 		writeError(w, http.StatusBadRequest, "invalid_request", invalidInputMessage)
 	default:
-		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+		if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) {
 			return
 		}
 		writeInternalError(w, r)
diff --git a/services/core/internal/api/errors_skills.go b/services/core/internal/api/errors_skills.go
index 7877587a3..89109e2af 100644
--- a/services/core/internal/api/errors_skills.go
+++ b/services/core/internal/api/errors_skills.go
@@ -31,7 +31,7 @@ func writeSkillsError(w http.ResponseWriter, r *http.Request, err error) {
 		writeError(w, http.StatusNotFound, code, "Resource not found.")
 	case errors.Is(err, skills.ErrInvalidInput):
 		writeError(w, http.StatusBadRequest, "invalid_request", invalidInputMessage)
-	case writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err):
+	case writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err):
 	default:
 		writeInternalError(w, r)
 	}
diff --git a/services/core/internal/api/errors_skills_test.go b/services/core/internal/api/errors_skills_test.go
index 7ff09785b..f08aaa25d 100644
--- a/services/core/internal/api/errors_skills_test.go
+++ b/services/core/internal/api/errors_skills_test.go
@@ -7,7 +7,6 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/textvalue"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
@@ -41,8 +40,6 @@ func TestWriteSkillsError(t *testing.T) {
 			`{"error":{"message":"` + unstorableTextMessage + `","type":"invalid_request_error","code":"invalid_request_error","param":null}}`},
 		{"audit source", "/v1/skills", fmt.Errorf("record: %w", writeaudit.ErrInvalidSource), http.StatusBadRequest,
 			`{"error":{"message":"` + invalidInputMessage + `","type":"invalid_request_error","code":"invalid_request","param":null}}`},
-		{"credential key missing", "/v1/skills", credentialcrypto.ErrUnavailable, http.StatusServiceUnavailable,
-			`{"error":{"message":"Credential encryption is not configured on this service.","type":"server_error","code":"credential_storage_unavailable","param":null}}`},
 		{"unknown", "/v1/skills", errors.New("connection reset"), http.StatusInternalServerError,
 			`{"error":{"message":"The operation could not be completed.","type":"server_error","code":"internal_error","param":null}}`},
 	} {
diff --git a/services/core/internal/api/errors_test.go b/services/core/internal/api/errors_test.go
index 25cc78eb9..9ade94cb3 100644
--- a/services/core/internal/api/errors_test.go
+++ b/services/core/internal/api/errors_test.go
@@ -11,7 +11,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
@@ -188,7 +187,6 @@ func TestSharedPersistenceErrors(t *testing.T) {
 		{writeSessionsError, fmt.Errorf("write: %w", textvalue.ErrUnstorable), 400, unstorableTextMessage},
 		{writeAuditError, textvalue.ErrUnstorable, 400, unstorableTextMessage},
 		{writeDeploymentError, deployment.ErrInvalidInput, 400, invalid},
-		{writeSessionsError, credentialcrypto.ErrUnavailable, 503, "credential_storage_unavailable"},
 		{writeAuditError, errors.New("canary"), 500, "internal_error"},
 	} {
 		response := respond(test.write, test.err)
diff --git a/services/core/internal/api/errors_vaults.go b/services/core/internal/api/errors_vaults.go
index 430e2272d..c98cd10fc 100644
--- a/services/core/internal/api/errors_vaults.go
+++ b/services/core/internal/api/errors_vaults.go
@@ -10,7 +10,7 @@ import (
 // writeVaultsError maps a Vault, Credential or Session credential selection
 // error to its public error response.
 func writeVaultsError(w http.ResponseWriter, r *http.Request, err error) {
-	if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) || writeCredentialUnavailableError(w, r, err) {
+	if writeAuditSourceError(w, r, err) || writeTextValueError(w, r, err) {
 		return
 	}
 	var selection *vaults.MCPCredentialSelectionError
diff --git a/services/core/internal/api/handler.go b/services/core/internal/api/handler.go
index 33d76be58..7d848e47e 100644
--- a/services/core/internal/api/handler.go
+++ b/services/core/internal/api/handler.go
@@ -241,14 +241,6 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 		}
 		return
 	}
-	if input.Environment.Type == "self_hosted" && h.Execution == nil {
-		writeError(w, http.StatusServiceUnavailable, "execution_unavailable", "Self-hosted execution is not configured on this service.")
-		return
-	}
-	if input.Environment.Type == "openai_hosted" && h.Sandboxes == nil {
-		writeError(w, http.StatusServiceUnavailable, "execution_unavailable", "Hosted execution is not configured on this service.")
-		return
-	}
 	executionConfiguration := sessionExecutionProjection(input, saved, inheritedProvider, provider, selectedEngine, configuration)
 	createInput := sessions.CreateSession{
 		ExecutionConfiguration:     &executionConfiguration,
@@ -260,10 +252,6 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 	}
 	create := h.SessionCreation.CreateSession
 	if len(initialInputs) > 0 || input.Environment.Type == "openai_hosted" {
-		if h.Execution == nil {
-			writeError(w, http.StatusServiceUnavailable, "execution_unavailable", "Execution input is not enabled on this service.")
-			return
-		}
 		create = h.Execution.SessionAdmission.CreateSession
 	}
 	result, err := create(r.Context(), tenantID(r), createInput)
@@ -292,7 +280,7 @@ func (h *Handler) respondSession(w http.ResponseWriter, r *http.Request, session
 }
 
 func (h *Handler) respondSessionStatus(w http.ResponseWriter, r *http.Request, session sessions.Session, status int) {
-	response, err := sessionResponse(session, h.executorURL())
+	response, err := sessionResponse(session, h.Execution.ExecutorURL)
 	if err != nil {
 		writeSessionsError(w, r, err)
 		return
@@ -320,7 +308,7 @@ func (h *Handler) listSessions(w http.ResponseWriter, r *http.Request) {
 	}
 	response := v1.SessionList{Data: make([]v1.Session, 0, len(page.Sessions)), HasMore: page.NextCursor != ""}
 	for _, session := range page.Sessions {
-		item, err := sessionResponse(session, h.executorURL())
+		item, err := sessionResponse(session, h.Execution.ExecutorURL)
 		if err != nil {
 			writeSessionsError(w, r, err)
 			return
diff --git a/services/core/internal/api/handler_test.go b/services/core/internal/api/handler_test.go
index 04b28b3f6..a8909dc2c 100644
--- a/services/core/internal/api/handler_test.go
+++ b/services/core/internal/api/handler_test.go
@@ -75,10 +75,9 @@ func testHandler(t *testing.T, configure ...func(*Dependencies, *testFakes)) (ht
 	return newTestHandler(t, deps), s, tenant
 }
 
-// admitSessions enables Execution whose Worker admits Session creation, as it
-// does for a Session with initial input, into the recording store.
+// admitSessions makes the Worker admit Session creation, as it does for a
+// Session with initial input, into the recording store.
 func admitSessions(d *Dependencies, f *testFakes) {
-	d.Execution = f.execution()
 	f.sessionAdmission.createSession = f.sessionCreation.createSession
 }
 
@@ -144,10 +143,7 @@ func TestHTTPRejectsUntrustedOrUnsupportedRequests(t *testing.T) {
 		{"invalid auth", "Bearer wrong", "agents=v1", "/v1/agents/sessions", valid, 401},
 		{"missing beta", "Bearer test-api-key", "", "/v1/agents/sessions", valid, 400},
 		{"tenant body", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"agent":`, `"tenant_id":"other","agent":`, 1), 400},
-		{"hosted environment without managed deployment", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(strings.Replace(valid, `"none"`, `"openai_hosted"`, 1), `"input":`, fixtureSessionProvider+`,"input":`, 1), 503},
 		{"self-hosted environment", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"none"`, `"self_hosted"`, 1), 400},
-		{"initial input", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", valid, 503},
-		{"stream unavailable", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"agent":`, `"stream":true,"agent":`, 1), 503},
 		{"unknown saved agent", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"agent":`, `"agent_id":"saved","agent":`, 1), 404},
 		{"saved agent without its model provider bundle", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"agent":`, `"agent_id":"saved","agent":`, 1), 500},
 		{"unknown agent option", "Bearer test-api-key", "agents=v1", "/v1/agents/sessions", strings.Replace(valid, `"model":`, `"tools":[{}],"model":`, 1), 400},
diff --git a/services/core/internal/api/harness_test.go b/services/core/internal/api/harness_test.go
index 57828de4f..38c7715ca 100644
--- a/services/core/internal/api/harness_test.go
+++ b/services/core/internal/api/harness_test.go
@@ -26,18 +26,13 @@ func TestSessionHarnessAdmission(t *testing.T) {
 		{"empty", `,"x_agents_core":{}`, "", `{"type":"none"}`, "", true, 400},
 		{"unknown nested", `,"x_agents_core":{"harness":"codex","model":"wrong"}`, "", `{"type":"none"}`, "", true, 400},
 		{"claude verbosity", `,"x_agents_core":{"harness":"claude_sdk"}`, `,"text":{"verbosity":"high"}`, `{"type":"none"}`, "", true, 400},
-		{"mcode self-hosted requires executor configuration", `,"x_agents_core":{"harness":"mcode"}`, "", `{"type":"self_hosted","workspace_directory":"/workspace"},` + fixtureAnthropicSessionProvider, "", true, 503},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			h, s, _ := testHandler(t, func(d *Dependencies, f *testFakes) {
 				if tc.enabled {
 					d.Harnesses = []string{"claude_sdk", "mcode"}
 				}
-				// Self-hosted execution needs an executor, which this Core lacks.
-				if !strings.Contains(tc.environment, "self_hosted") {
-					admitSessions(d, f)
-				}
-				f.metrics.recordUnavailable = func() {}
+				admitSessions(d, f)
 			})
 			r := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(`{"agent":{"model":"fixture"`+tc.extension+tc.extra+`},"environment":`+tc.environment+`,"input":"Run on the selected harness."}`))
 			r.Header.Set("Authorization", "Bearer test-api-key")
diff --git a/services/core/internal/api/hosted_environment_test.go b/services/core/internal/api/hosted_environment_test.go
index bcc69d9fa..322223cca 100644
--- a/services/core/internal/api/hosted_environment_test.go
+++ b/services/core/internal/api/hosted_environment_test.go
@@ -89,7 +89,6 @@ func TestHostedCreationUsesExecutionAdmission(t *testing.T) {
 	for _, stream := range []bool{false, true} {
 		recorder := &hostedCreationRecorder{}
 		handler, fixture := environmentCreationHandler(t, "codex", func(d *Dependencies, f *testFakes) {
-			d.Execution, d.Sandboxes = f.execution(), f.sandboxes()
 			f.sessionAdmission.createSession = recorder.CreateSession
 		})
 		input := ""
diff --git a/services/core/internal/api/inputs.go b/services/core/internal/api/inputs.go
index 84a7a0adf..5bc15f86e 100644
--- a/services/core/internal/api/inputs.go
+++ b/services/core/internal/api/inputs.go
@@ -57,10 +57,6 @@ func (h *Handler) createEvents(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusAccepted)
 		return
 	}
-	if h.Execution == nil {
-		writeError(w, http.StatusServiceUnavailable, "execution_unavailable", "Execution is not enabled on this service.")
-		return
-	}
 	inputs, err := executionInputs(request.Events)
 	if err != nil {
 		writeSessionsError(w, r, err)
diff --git a/services/core/internal/api/inputs_test.go b/services/core/internal/api/inputs_test.go
index 4af2099d2..f6cb61e63 100644
--- a/services/core/internal/api/inputs_test.go
+++ b/services/core/internal/api/inputs_test.go
@@ -25,9 +25,8 @@ func (s *inputRecorder) SubmitInputs(_ context.Context, tenant, session, key str
 	return nil, s.err
 }
 
-// admit enables Execution whose Worker records submitted inputs in s.
+// admit makes the Worker record submitted inputs in s.
 func (s *inputRecorder) admit(d *Dependencies, f *testFakes) {
-	d.Execution = f.execution()
 	f.inputAdmission.submitInputs = s.SubmitInputs
 }
 
diff --git a/services/core/internal/api/installation.go b/services/core/internal/api/installation.go
index ec1ba9f55..8d18088ac 100644
--- a/services/core/internal/api/installation.go
+++ b/services/core/internal/api/installation.go
@@ -11,12 +11,12 @@ import (
 // environment and build; configuration is the process settings it loaded.
 type Installation struct {
 	Object string `json:"object" enums:"core.installation"`
-	// The ID in OAC_INSTALLATION_ID_FILE; null when Core runs without the sandbox manager.
-	InstallationID *string `json:"installation_id" extensions:"x-nullable"`
-	// OAC_PUBLIC_URL: the origin applications, nodes, sandboxes and self-hosted executors use. Null when unset.
-	PublicURL *string `json:"public_url" extensions:"x-nullable"`
-	// public_url followed by /v1; null when public_url is null.
-	APIBaseURL *string `json:"api_base_url" extensions:"x-nullable"`
+	// The ID in OAC_INSTALLATION_ID_FILE.
+	InstallationID string `json:"installation_id"`
+	// OAC_PUBLIC_URL: the origin applications, nodes, sandboxes and self-hosted executors use.
+	PublicURL string `json:"public_url"`
+	// public_url followed by /v1.
+	APIBaseURL string `json:"api_base_url"`
 	// True when public_url names a loopback host, reachable only from the Core host.
 	LocalOnly bool `json:"local_only"`
 	// Full source commit Core was built from; null for development builds.
diff --git a/services/core/internal/api/installation_test.go b/services/core/internal/api/installation_test.go
index c8c047e89..8f65dcce9 100644
--- a/services/core/internal/api/installation_test.go
+++ b/services/core/internal/api/installation_test.go
@@ -24,7 +24,7 @@ func TestInstallationReadNeedsOnlyTheCoreKey(t *testing.T) {
 		return deployment.AddressBindings{Nodes: 2, NodesOnOtherAddress: 1}, nil
 	}
 	// No sandbox deployment: the read is available before any deployment exists.
-	deps.Installation = Installation{InstallationID: &id, PublicURL: &public, Configuration: settings}
+	deps.Installation = Installation{InstallationID: id, PublicURL: public, APIBaseURL: public + "/v1", Configuration: settings}
 	h := newTestHandler(t, deps)
 	get := func(token string) *httptest.ResponseRecorder {
 		request := httptest.NewRequest(http.MethodGet, "/core/v1/installation", nil)
diff --git a/services/core/internal/api/model_provider_fixture_test.go b/services/core/internal/api/model_provider_fixture_test.go
index 845218400..6402ba177 100644
--- a/services/core/internal/api/model_provider_fixture_test.go
+++ b/services/core/internal/api/model_provider_fixture_test.go
@@ -27,6 +27,3 @@ func fixtureDeploymentProvider(_ context.Context, harness string) (*modelconfigu
 
 // fixtureSessionProvider is a top-level Session request member for Codex.
 const fixtureSessionProvider = `"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"https://model.fixture.example/v1","api_key":"fixture-model-key"}}`
-
-// fixtureAnthropicSessionProvider is the Claude Code and MiniMax Code equivalent.
-const fixtureAnthropicSessionProvider = `"x_agents_core":{"model_provider":{"protocol":"anthropic","base_url":"https://model.fixture.example/anthropic","api_key":"fixture-model-key","context_window":200000,"max_output_tokens":8000}}`
diff --git a/services/core/internal/api/native_classification_integration_test.go b/services/core/internal/api/native_classification_integration_test.go
index 0a13c9e78..197922fd5 100644
--- a/services/core/internal/api/native_classification_integration_test.go
+++ b/services/core/internal/api/native_classification_integration_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -17,8 +18,8 @@ import (
 
 func TestNativeClassificationPostgresRoundTripAndPublicPrivacy(t *testing.T) {
 	s, pool := diagnosticDatabase(t)
-	h, _, tenant := adminTestHandler(t, databaseSessionReads(pool))
-	reader := sessionpg.New(pgunit.NewPool(pool), nil)
+	h, _, tenant := adminTestHandler(t, databaseSessionReads(t, pool))
+	reader := sessionpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	for _, code := range []string{"authentication_error", "connection_failed", "secret-canary"} {
 		t.Run(code, func(t *testing.T) {
 			created, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "native-classification"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
diff --git a/services/core/internal/api/routing_test.go b/services/core/internal/api/routing_test.go
index c17942692..910246b45 100644
--- a/services/core/internal/api/routing_test.go
+++ b/services/core/internal/api/routing_test.go
@@ -97,7 +97,6 @@ func routingFixture(t *testing.T) (http.Handler, *chi.Mux, *routingStore) {
 		return files.File{}, files.ErrNotFound
 	}
 	deps.CoreKeys = coreKeys(t, routingAdminKey)
-	deps.Execution, deps.Sandboxes = fakes.execution(), fakes.sandboxes()
 	return newTestHandler(t, deps), (&Handler{Dependencies: deps}).routes(), s
 }
 
diff --git a/services/core/internal/api/sandbox_manager.go b/services/core/internal/api/sandbox_manager.go
index 99c814d47..aa1143b3c 100644
--- a/services/core/internal/api/sandbox_manager.go
+++ b/services/core/internal/api/sandbox_manager.go
@@ -59,9 +59,6 @@ type NodeAllocations interface {
 // registerSandboxNodeRoutes serves node machine connections. They authenticate
 // with an enrollment token or node credential, never the Core key.
 func (h *Handler) registerSandboxNodeRoutes(r chi.Router) {
-	if h.Sandboxes == nil {
-		return
-	}
 	r.Post("/api/v1/sandbox-node/enroll", h.enrollSandboxNode)
 	r.Get("/api/v1/sandbox-node/identity", h.sandboxNodeIdentity)
 	r.Get("/api/v1/sandbox-node/configuration", h.sandboxNodeConfiguration)
@@ -70,9 +67,6 @@ func (h *Handler) registerSandboxNodeRoutes(r chi.Router) {
 // registerSandboxManagerRoutes adds sandbox deployment and node administration
 // to the Core-key-authenticated /core/v1 router.
 func (h *Handler) registerSandboxManagerRoutes(r chi.Router) {
-	if h.Sandboxes == nil {
-		return
-	}
 	r.Get("/sandbox/deployment", h.sandboxDeployment)
 	r.Post("/sandbox/providers/{provider}/discovery", h.discoverSandboxConfiguration)
 	r.Post("/sandbox/deployment", h.initializeSandboxDeployment)
diff --git a/services/core/internal/api/sandbox_manager_test.go b/services/core/internal/api/sandbox_manager_test.go
index 6e7959622..aff6e084b 100644
--- a/services/core/internal/api/sandbox_manager_test.go
+++ b/services/core/internal/api/sandbox_manager_test.go
@@ -18,7 +18,6 @@ func sandboxFakes(t testing.TB) (Dependencies, *testFakes) {
 	deps, fakes := testDependencies(t)
 	fakes.projectsReader.resolveAPIKey = projectKeys(t, callerBinding()).ResolveAPIKey
 	deps.CoreKeys = coreKeys(t, "administrator")
-	deps.Execution, deps.Sandboxes = fakes.execution(), fakes.sandboxes()
 	return deps, fakes
 }
 
diff --git a/services/core/internal/api/sandbox_selector_test.go b/services/core/internal/api/sandbox_selector_test.go
index f70dc9dd9..00bf02154 100644
--- a/services/core/internal/api/sandbox_selector_test.go
+++ b/services/core/internal/api/sandbox_selector_test.go
@@ -33,7 +33,6 @@ func TestSessionCreationRejectsSandboxNodeSelector(t *testing.T) {
 	} {
 		recorder := &sandboxCreationRecorder{}
 		handler, _ := environmentCreationHandler(t, "codex", func(d *Dependencies, f *testFakes) {
-			d.Execution, d.Sandboxes = f.execution(), f.sandboxes()
 			f.sessionAdmission.createSession = recorder.CreateSession
 		})
 		request := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(body))
diff --git a/services/core/internal/api/session_admission_test.go b/services/core/internal/api/session_admission_test.go
index aedd04a7b..66e6ce827 100644
--- a/services/core/internal/api/session_admission_test.go
+++ b/services/core/internal/api/session_admission_test.go
@@ -28,7 +28,7 @@ func TestSessionAdmissionRejectsBeforeResourceOrExecutionAccess(t *testing.T) {
 				}
 				t.Run(fmt.Sprintf("%s/%s/stream=%t", environment, input, stream), func(t *testing.T) {
 					// Any resource access, including creation retry lookup, fails the test.
-					handler, _, _ := testHandler(t, forbidSessionAccess, func(d *Dependencies, f *testFakes) { d.Execution = f.execution() })
+					handler, _, _ := testHandler(t, forbidSessionAccess)
 					body := fmt.Sprintf(`{"agent":{"model":"example"},"environment":{"type":%q},"stream":%t%s}`, environment, stream, input)
 					for _, token := range []string{"test-api-key", "invalid"} {
 						request := httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", strings.NewReader(body))
diff --git a/services/core/internal/api/session_creation_stream.go b/services/core/internal/api/session_creation_stream.go
index 7ee530d23..73039138e 100644
--- a/services/core/internal/api/session_creation_stream.go
+++ b/services/core/internal/api/session_creation_stream.go
@@ -22,7 +22,7 @@ func (h *Handler) respondSessionCreationStream(w http.ResponseWriter, r *http.Re
 		openEventStream(w, http.StatusCreated)
 		return
 	}
-	response, err := sessionResponse(result.Session, h.executorURL())
+	response, err := sessionResponse(result.Session, h.Execution.ExecutorURL)
 	if err != nil {
 		writeSessionsError(w, r, err)
 		return
@@ -45,7 +45,7 @@ func (h *Handler) respondSessionCreationStream(w http.ResponseWriter, r *http.Re
 		if err != nil {
 			return false, 0, err
 		}
-		response, err := sessionResponse(session, h.executorURL())
+		response, err := sessionResponse(session, h.Execution.ExecutorURL)
 		return err == nil && sessionSettled(session, response), cursor, err
 	}
 	h.serveSessionEvents(w, r, result.Session, result.Cursor, &created, http.StatusCreated, settlement)
diff --git a/services/core/internal/api/session_creation_stream_test.go b/services/core/internal/api/session_creation_stream_test.go
index ada43b580..8ecd6cd2f 100644
--- a/services/core/internal/api/session_creation_stream_test.go
+++ b/services/core/internal/api/session_creation_stream_test.go
@@ -149,7 +149,6 @@ func newCreationStreamHarness(t *testing.T) *creationStreamHarness {
 	fakes.sessionCreation.findSessionCreation = fixture.FindSessionCreation
 	fakes.sessionEvents.sessionEventCursor, fakes.sessionEvents.sessionStreamSnapshot, fakes.sessionEvents.listSessionEvents = fixture.SessionEventCursor, fixture.SessionStreamSnapshot, fixture.ListSessionEvents
 	fakes.modelProviders.resolve = noDeploymentModelProvider
-	deps.Execution = fakes.execution()
 	fakes.sessionAdmission.createSession = fixture.CreateSession
 	handler := newTestHandler(t, deps)
 	h := &creationStreamHarness{t: t, fixture: fixture}
diff --git a/services/core/internal/api/session_diagnostics.go b/services/core/internal/api/session_diagnostics.go
index 8eef13aac..9e14f19b5 100644
--- a/services/core/internal/api/session_diagnostics.go
+++ b/services/core/internal/api/session_diagnostics.go
@@ -72,7 +72,7 @@ func (h *Handler) getSessionDiagnostics(w http.ResponseWriter, r *http.Request)
 		writeSessionsError(w, r, err)
 		return
 	}
-	public, err := sessionResponse(session, h.executorURL())
+	public, err := sessionResponse(session, h.Execution.ExecutorURL)
 	if err != nil {
 		writeSessionsError(w, r, err)
 		return
diff --git a/services/core/internal/api/session_diagnostics_public_compat_test.go b/services/core/internal/api/session_diagnostics_public_compat_test.go
index 4394dd0b2..78715c1ea 100644
--- a/services/core/internal/api/session_diagnostics_public_compat_test.go
+++ b/services/core/internal/api/session_diagnostics_public_compat_test.go
@@ -12,6 +12,7 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -27,7 +28,7 @@ func TestDiagnosticPublicCompatibility(t *testing.T) {
 	key := callerBinding()
 	deps, fakes := testDependencies(t)
 	fakes.projectsReader.resolveAPIKey = projectKeys(t, key).ResolveAPIKey
-	databaseSessionReads(pool)(&deps, fakes)
+	databaseSessionReads(t, pool)(&deps, fakes)
 	h := newTestHandler(t, deps)
 	created, err := s.CreateSession(t.Context(), key.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "compat-test"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
 	if err != nil {
@@ -67,9 +68,9 @@ func diagnosticRequest(handler http.Handler, path, token string) *httptest.Respo
 
 // databaseSessionReads serves Session, Turn, diagnostic and Item reads from
 // the Session adapter on pool.
-func databaseSessionReads(pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
+func databaseSessionReads(t *testing.T, pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
 	return func(d *Dependencies, _ *testFakes) {
-		reader := sessionpg.New(pgunit.NewPool(pool), nil)
+		reader := sessionpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 		d.SessionsReader, d.SessionAdmin, d.Items, d.Turns = reader, reader, reader, reader
 	}
 }
@@ -78,7 +79,7 @@ func databaseSessionReads(pool *pgxpool.Pool) func(*Dependencies, *testFakes) {
 // pool.
 func submitMessage(t *testing.T, pool *pgxpool.Pool, tenant, session, key, text string) sessions.InputReceipt {
 	t.Helper()
-	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil), nil)
+	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t)), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -138,7 +139,7 @@ func diagnosticDatabase(t *testing.T) (*sessions.Service, *pgxpool.Pool) {
 	if err = migrations.Apply(t.Context(), dsn); err != nil {
 		t.Fatal(err)
 	}
-	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), nil), nil)
+	service, err := sessions.NewService(sessionpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t)), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/api/session_diagnostics_test.go b/services/core/internal/api/session_diagnostics_test.go
index 21ad01899..3265feb8a 100644
--- a/services/core/internal/api/session_diagnostics_test.go
+++ b/services/core/internal/api/session_diagnostics_test.go
@@ -14,7 +14,7 @@ import (
 
 func TestDiagnosticsCoreHandlerDatabaseBoundary(t *testing.T) {
 	s, pool := diagnosticDatabase(t)
-	h, _, tenant := adminTestHandler(t, databaseSessionReads(pool))
+	h, _, tenant := adminTestHandler(t, databaseSessionReads(t, pool))
 	created, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "diagnostic-test"}, Engine: "codex", IdempotencyKey: "diagnostics", Configuration: json.RawMessage(`{"agent":{"id":"agent_root","model":"test"},"environment":{"type":"none"}}`)})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/api/session_environment_http_test.go b/services/core/internal/api/session_environment_http_test.go
index d607345c2..ab7d088a1 100644
--- a/services/core/internal/api/session_environment_http_test.go
+++ b/services/core/internal/api/session_environment_http_test.go
@@ -49,8 +49,7 @@ func TestSelfHostedSessionHTTPReadListMetadataAndLiveStream(t *testing.T) {
 	}).ResolveAPIKey
 	fixture.serve(fakes)
 	fakes.sessionsReader.listSessions, fakes.sessions.updateSessionMetadata = fixture.ListSessions, fixture.UpdateSessionMetadata
-	// Self-hosted Sessions report the executor URL of the enabled Execution.
-	deps.Execution = fakes.execution()
+	// Self-hosted Sessions report the executor URL.
 	deps.Execution.ExecutorURL = environmentOrigin
 	handler := newTestHandler(t, deps)
 	want, err := sessionResponse(session, environmentOrigin)
diff --git a/services/core/internal/api/session_initial_input_test.go b/services/core/internal/api/session_initial_input_test.go
index 58f716c3a..b778c836f 100644
--- a/services/core/internal/api/session_initial_input_test.go
+++ b/services/core/internal/api/session_initial_input_test.go
@@ -8,12 +8,11 @@ import (
 	"testing"
 )
 
-// admitInto enables Execution whose Worker admits Session creation into s,
+// admitInto makes the Worker admit Session creation into s,
 // apart from the store that creates Sessions without execution work. Input
 // submission stays unexpected.
 func admitInto(s *recordingStore) func(*Dependencies, *testFakes) {
 	return func(d *Dependencies, f *testFakes) {
-		d.Execution = f.execution()
 		f.sessionAdmission.createSession = s.CreateSession
 	}
 }
diff --git a/services/core/internal/api/stream.go b/services/core/internal/api/stream.go
index cfda35b6f..983472b0d 100644
--- a/services/core/internal/api/stream.go
+++ b/services/core/internal/api/stream.go
@@ -31,7 +31,7 @@ func (h *Handler) streamEvents(w http.ResponseWriter, r *http.Request) {
 		writeSessionsError(w, r, err)
 		return
 	}
-	if _, err = sessionResponse(session, h.executorURL()); err != nil {
+	if _, err = sessionResponse(session, h.Execution.ExecutorURL); err != nil {
 		writeSessionsError(w, r, err)
 		return
 	}
@@ -113,7 +113,7 @@ func (h *Handler) serveSessionEvents(w http.ResponseWriter, r *http.Request, ses
 			if limit >= 0 && change.Sequence > limit {
 				return
 			}
-			event, err := streamResponse(session, change, h.executorURL())
+			event, err := streamResponse(session, change, h.Execution.ExecutorURL)
 			if err != nil {
 				writeStreamFailure(write, id)
 				return
diff --git a/services/core/internal/api/testdata/core-errors.json b/services/core/internal/api/testdata/core-errors.json
index 256654003..74e75ca84 100644
--- a/services/core/internal/api/testdata/core-errors.json
+++ b/services/core/internal/api/testdata/core-errors.json
@@ -4,7 +4,6 @@
   "console_sign_in_required",
   "core_metrics_unavailable",
   "core_unreachable",
-  "credential_storage_unavailable",
   "environment_unavailable",
   "execution_unavailable",
   "executor_credential_exists",
diff --git a/services/core/internal/api/validation_errors_test.go b/services/core/internal/api/validation_errors_test.go
index e0ec582f7..0c84bda60 100644
--- a/services/core/internal/api/validation_errors_test.go
+++ b/services/core/internal/api/validation_errors_test.go
@@ -61,7 +61,6 @@ func (s *validationStore) UpdateEnvironmentTemplate(_ context.Context, command e
 // serve takes every write from the handler, and the Worker admits Sessions
 // with initial input into s. Session reads are unexpected.
 func (s *validationStore) serve(d *Dependencies, f *testFakes) {
-	d.Execution = f.execution()
 	f.sessionAdmission.createSession = s.CreateSession
 	f.agents.create, f.agents.update = s.CreateAgent, s.UpdateAgent
 	f.vaults.createVault = s.CreateVault
diff --git a/services/core/internal/credentialcrypto/cipher.go b/services/core/internal/credentialcrypto/cipher.go
index 552bfb7fb..8a9136545 100644
--- a/services/core/internal/credentialcrypto/cipher.go
+++ b/services/core/internal/credentialcrypto/cipher.go
@@ -18,10 +18,6 @@ const (
 	bindingDomain      = "parsar.agents-api.credential"
 )
 
-// ErrUnavailable reports that this service has no credential encryption key,
-// so it can neither store nor read credential secrets.
-var ErrUnavailable = errors.New("credential encryption is not configured")
-
 var (
 	errInvalidKey        = errors.New("credentialcrypto: invalid encryption key")
 	errUnavailable       = errors.New("credentialcrypto: cipher unavailable")
diff --git a/services/core/internal/deployment/errors.go b/services/core/internal/deployment/errors.go
index ff90ef7b4..e9001c419 100644
--- a/services/core/internal/deployment/errors.go
+++ b/services/core/internal/deployment/errors.go
@@ -20,6 +20,9 @@ var (
 	ErrNotConfigured         = errors.New("the sandbox deployment is not configured")
 	ErrNodeInUse             = errors.New("sandbox node retains resources")
 	ErrNodeCredential        = errors.New("invalid sandbox node credential")
+	// ErrCredentialUnreadable reports a stored credential the credential key
+	// cannot open or authenticate, such as after the key was replaced.
+	ErrCredentialUnreadable = errors.New("sandbox deployment credential decryption failed")
 	// ErrAllocationConflict rejects an allocation change whose owner no longer
 	// matches the stored allocation, device binding, state or compute revision,
 	// or a replay for another installation.
diff --git a/services/core/internal/deployment/placement/placement.go b/services/core/internal/deployment/placement/placement.go
index 9b0c4277a..2a8b0ad55 100644
--- a/services/core/internal/deployment/placement/placement.go
+++ b/services/core/internal/deployment/placement/placement.go
@@ -51,7 +51,7 @@ type Rules struct {
 }
 
 // NewRules returns the rules for the provider declarations and the
-// installation public URL, which is empty when the installation has none.
+// installation public URL.
 func NewRules(declarations Declarations, publicURL string) (*Rules, error) {
 	if declarations == nil {
 		return nil, errors.New("placement rules require provider declarations")
diff --git a/services/core/internal/deployment/storage.go b/services/core/internal/deployment/storage.go
index 662f7e926..c1f17785a 100644
--- a/services/core/internal/deployment/storage.go
+++ b/services/core/internal/deployment/storage.go
@@ -301,8 +301,7 @@ type DeploymentTx interface {
 	// previous owner epoch's node presence.
 	ClaimInstallation(installationID string) error
 	// SaveSelection stores the next generation. It seals a secret bound to the
-	// installation and generation; without a key it returns
-	// credentialcrypto.ErrUnavailable.
+	// installation and generation.
 	SaveSelection(selection SelectionRecord) error
 	RecordConfigurationMetadata(metadata json.RawMessage) error
 	// RetainGeneration keeps the current generation for the allocations that
@@ -348,9 +347,8 @@ type Record struct {
 	// credential is stored and could be opened, its secret.
 	Configuration    sandbox.ConfigurationRecord
 	CredentialStored bool
-	// CredentialError is why the stored credential could not be opened: no key
-	// (credentialcrypto.ErrUnavailable) or a ciphertext the key cannot open or
-	// authenticate (an internal error).
+	// CredentialError is why the stored credential could not be opened: a
+	// ciphertext the key cannot open or authenticate (an internal error).
 	CredentialError error
 	// Reset is nil unless a reset is in progress.
 	Reset *ResetState
diff --git a/services/core/internal/environmenttemplates/template.go b/services/core/internal/environmenttemplates/template.go
index dfb868cc0..7c6209ced 100644
--- a/services/core/internal/environmenttemplates/template.go
+++ b/services/core/internal/environmenttemplates/template.go
@@ -11,7 +11,7 @@ import (
 )
 
 // Template is a saved Template's safe metadata: it holds no confidential
-// setup, file contents or archives, so reading it needs no credential key.
+// setup, file contents or archives.
 type Template struct {
 	ID                    string
 	Name                  *string
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index f6e658f96..a8b899ae7 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/projectpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
@@ -77,7 +78,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			_, service := testSessions(t, pool, testCredentialCipher(t))
+			_, service := testSessions(t, pool, pgtest.CredentialKey(t))
 			created, err := service.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "fixture"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`), ModelProvider: &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://model.fixture.example/v1", APIKey: "fixture-key"}, ModelProviderSource: v1.ModelProviderSourceSession})
 			if err != nil {
 				t.Fatal(err)
@@ -117,7 +118,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if scenario.delivery {
 				server := httptest.NewUnstartedServer(nil)
 				wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
-				credentials, heartbeat := testSessions(t, pool, testCredentialCipher(t))
+				credentials, heartbeat := testSessions(t, pool, pgtest.CredentialKey(t))
 				handler, liveRegistry, err := runtime.NewGateway(credentials, heartbeat, credentials, wsURL)
 				if err != nil {
 					t.Fatal(err)
@@ -157,7 +158,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			sessionReader, _ := testSessions(t, pool, testCredentialCipher(t))
+			sessionReader, _ := testSessions(t, pool, pgtest.CredentialKey(t))
 			kills := 0
 			expectedStatus := sessions.TurnWaiting
 			provider := waitingCleanupProvider{beforeKill: func() {
diff --git a/services/core/internal/execution/deployment_fixture_test.go b/services/core/internal/execution/deployment_fixture_test.go
index 6562e189a..1cb8c27b5 100644
--- a/services/core/internal/execution/deployment_fixture_test.go
+++ b/services/core/internal/execution/deployment_fixture_test.go
@@ -35,7 +35,6 @@ func fixtureRules(t *testing.T) *placement.Rules {
 
 // testDeployment builds the pooled deployment service and reader and the
 // deployment execution operations on lease, as cmd/server does for the Worker.
-// cipher is nil when the owner has no credential key.
 func testDeployment(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher, lease *pgunit.Lease) (*deployment.Service, deployment.Reader, *deployment.ExecutionOperations) {
 	t.Helper()
 	adapter := deploymentpg.New(pgunit.NewPool(pool), cipher)
diff --git a/services/core/internal/execution/deployment_provider_observations_test.go b/services/core/internal/execution/deployment_provider_observations_test.go
index d2b3c7539..440da13b2 100644
--- a/services/core/internal/execution/deployment_provider_observations_test.go
+++ b/services/core/internal/execution/deployment_provider_observations_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -81,7 +82,7 @@ func newFinishObservationFixture(t *testing.T, maxConnections int32) finishObser
 }
 func (f finishObservationFixture) start(t *testing.T) sessions.InputReceipt {
 	t.Helper()
-	_, service := testSessions(t, f.pool, nil)
+	_, service := testSessions(t, f.pool, pgtest.CredentialKey(t))
 	receipts, err := service.SubmitInputs(t.Context(), f.tenant, f.session.ID, uuid.NewString(), []sessions.Input{{Kind: "message", Payload: json.RawMessage(`{"input":[{"role":"user","content":[{"type":"input_text","text":"fixture"}]}]}`)}})
 	if err != nil {
 		t.Fatal(err)
@@ -200,7 +201,7 @@ func TestFinishRunObservationLockTimeoutAndFailureKeepLease(t *testing.T) {
 				if err != nil {
 					t.Fatal(err)
 				}
-				d := Dispatcher{Observer: modelconfigurationpg.New(pgunit.NewPool(pool), nil)}
+				d := Dispatcher{Observer: modelconfigurationpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t))}
 				started := time.Now()
 				d.observeDeploymentProvider(f.tenant, f.session.ID, turn)
 				if elapsed := time.Since(started); elapsed < 900*time.Millisecond || elapsed > 2*time.Second {
@@ -226,7 +227,7 @@ func TestFinishRunObservationLockTimeoutAndFailureKeepLease(t *testing.T) {
 			if cleanup != nil {
 				cleanup()
 			}
-			persisted, err := sessionpg.New(pgunit.NewPool(f.pool), nil).GetTurn(t.Context(), f.tenant, f.session.ID, receipt.TurnID)
+			persisted, err := sessionpg.New(pgunit.NewPool(f.pool), pgtest.CredentialKey(t)).GetTurn(t.Context(), f.tenant, f.session.ID, receipt.TurnID)
 			if err != nil || persisted.Status != sessions.TurnCompleted {
 				t.Fatal("terminal outcome lost", err)
 			}
diff --git a/services/core/internal/execution/owner_test.go b/services/core/internal/execution/owner_test.go
index 9da8bdb4b..e7e577f9e 100644
--- a/services/core/internal/execution/owner_test.go
+++ b/services/core/internal/execution/owner_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -192,7 +193,7 @@ func TestWorkerRunClosesLeaseAfterDrain(t *testing.T) {
 	lease := &closeCountingLease{t: t, inner: owner.Lease}
 	id := uuid.NewString()
 	// The Worker's first reconciliation scans the Session work.
-	reader, service := testSessions(t, pool, nil)
+	reader, service := testSessions(t, pool, pgtest.CredentialKey(t))
 	dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t))}
 	worker, err := StartWorker(t.Context(), dispatcher, Owner{Lease: lease, Deployment: owner.Deployment, Sessions: owner.Sessions})
 	if err != nil {
diff --git a/services/core/internal/execution/sandbox_deployment_drain_test.go b/services/core/internal/execution/sandbox_deployment_drain_test.go
index 4ace349be..4c7ff3d7d 100644
--- a/services/core/internal/execution/sandbox_deployment_drain_test.go
+++ b/services/core/internal/execution/sandbox_deployment_drain_test.go
@@ -70,7 +70,7 @@ func delayedReadWriter(t *testing.T, armed *atomic.Bool, reading chan struct{},
 			t.Error(err)
 		}
 	})
-	deployments, reader, operations := testDeployment(t, pool, nil, lease)
+	deployments, reader, operations := testDeployment(t, pool, pgtest.CredentialKey(t), lease)
 	return Owner{Lease: lease, Deployment: operations, Sessions: sessionExecution(t, lease)}, deployments, reader, pool
 }
 
diff --git a/services/core/internal/execution/sandbox_reset_test.go b/services/core/internal/execution/sandbox_reset_test.go
index 439b16dcb..0af1e93a7 100644
--- a/services/core/internal/execution/sandbox_reset_test.go
+++ b/services/core/internal/execution/sandbox_reset_test.go
@@ -1,7 +1,6 @@
 package execution
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"reflect"
@@ -45,21 +44,10 @@ func resetManagerConfig(t *testing.T, configure func(*pgxpool.Config)) (Owner, *
 func resetManagerDB(t *testing.T, configure func(*pgxpool.Config)) (Owner, *deployment.Service, deployment.Reader, *pgxpool.Pool) {
 	t.Helper()
 	pool := pgtest.OpenIsolated(t, configure)
-	owner, deployments, reader := testOwner(t, pool, testCredentialCipher(t))
+	owner, deployments, reader := testOwner(t, pool, pgtest.CredentialKey(t))
 	return owner, deployments, reader, pool
 }
 
-// testCredentialCipher is the credential key of the adapters these tests
-// build on one database.
-func testCredentialCipher(t *testing.T) *credentialcrypto.Cipher {
-	t.Helper()
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{8}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	return cipher
-}
-
 // testOwner acquires the execution lease on pool and builds the deployment and
 // Session execution operations on it, and the pooled deployment service and
 // reader, as cmd/server does. The lease closes when the test ends.
@@ -195,7 +183,7 @@ func TestSandboxResetPublishesCommittedGenerationWithoutReading(t *testing.T) {
 	id := initializeE2BDeployment(t, owner)
 	// The manager reads the deployment through a reader that fails every read
 	// of the committed reset, so publication cannot depend on one.
-	adapter := deploymentpg.New(pgunit.NewPool(pool), nil)
+	adapter := deploymentpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	errCommittedRead := errors.New("committed deployment read failed")
 	committedReads := 0
 	reader := &strictDeploymentReader{t: t, snapshot: func(ctx context.Context) (deployment.Snapshot, error) {
diff --git a/services/core/internal/modelconfiguration/errors.go b/services/core/internal/modelconfiguration/errors.go
index 1c4719fc9..b118885fc 100644
--- a/services/core/internal/modelconfiguration/errors.go
+++ b/services/core/internal/modelconfiguration/errors.go
@@ -3,8 +3,7 @@ package modelconfiguration
 import "errors"
 
 // Replace and Resolve report a configuration the Harness declaration rejects
-// with the contract's *v1.ModelProviderError, which names the field, and a
-// missing credential key with credentialcrypto.ErrUnavailable. A bundle that
+// with the contract's *v1.ModelProviderError, which names the field. A bundle that
 // fails to open is an internal error. Storage passes textvalue.ErrUnstorable
 // and adminaudit.ErrInvalidSource through unchanged.
 var (
diff --git a/services/core/internal/modelconfiguration/service.go b/services/core/internal/modelconfiguration/service.go
index fa79b9b61..7b52a5148 100644
--- a/services/core/internal/modelconfiguration/service.go
+++ b/services/core/internal/modelconfiguration/service.go
@@ -40,8 +40,7 @@ func (s *Service) Delete(ctx context.Context, harness string) error {
 }
 
 // Resolve opens the Harness's default for Session creation. It returns nil
-// when the Harness has none, and credentialcrypto.ErrUnavailable without a
-// credential key.
+// when the Harness has none.
 func (s *Service) Resolve(ctx context.Context, harness string) (*Snapshot, error) {
 	bundle, err := s.storage.LoadBundle(ctx, harness)
 	if errors.Is(err, ErrNotFound) {
diff --git a/services/core/internal/modelconfiguration/service_test.go b/services/core/internal/modelconfiguration/service_test.go
index 3f23c5ad1..909df0ed6 100644
--- a/services/core/internal/modelconfiguration/service_test.go
+++ b/services/core/internal/modelconfiguration/service_test.go
@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/google/uuid"
 )
 
@@ -77,12 +76,6 @@ func TestReplacePassesTheCompleteBundleWithItsSafeColumns(t *testing.T) {
 	if !reflect.DeepEqual(record.Configuration, validConfiguration()) {
 		t.Fatalf("bundle: %+v", record.Configuration)
 	}
-	storage.replace = func(context.Context, Record) (Configuration, error) {
-		return Configuration{}, credentialcrypto.ErrUnavailable
-	}
-	if _, err := newService(t, storage).Replace(t.Context(), Replacement{Harness: "codex", Configuration: validConfiguration()}); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("missing credential key", err)
-	}
 }
 
 func TestReplaceRejectsBeforeStorage(t *testing.T) {
@@ -124,10 +117,9 @@ func TestResolveValidatesTheOpenedBundle(t *testing.T) {
 	if snapshot, err := newService(t, loaded(v1.ModelConfigurationInput{}, ErrNotFound)).Resolve(t.Context(), "codex"); snapshot != nil || err != nil {
 		t.Fatal("missing default", snapshot, err)
 	}
-	for _, failure := range []error{errors.New("storage failed"), credentialcrypto.ErrUnavailable} {
-		if _, err := newService(t, loaded(v1.ModelConfigurationInput{}, failure)).Resolve(t.Context(), "codex"); !errors.Is(err, failure) {
-			t.Fatal("storage failure", err)
-		}
+	failure := errors.New("storage failed")
+	if _, err := newService(t, loaded(v1.ModelConfigurationInput{}, failure)).Resolve(t.Context(), "codex"); !errors.Is(err, failure) {
+		t.Fatal("storage failure", err)
 	}
 	invalid := validConfiguration()
 	invalid.Model = ""
diff --git a/services/core/internal/modelconfiguration/storage.go b/services/core/internal/modelconfiguration/storage.go
index b132e80cc..49622417f 100644
--- a/services/core/internal/modelconfiguration/storage.go
+++ b/services/core/internal/modelconfiguration/storage.go
@@ -3,8 +3,7 @@ package modelconfiguration
 import "context"
 
 // Storage keeps one deployment default per Harness and seals and opens its
-// bundle; without a credential key, Replace and LoadBundle return
-// credentialcrypto.ErrUnavailable. Replace and Delete record the administrator
+// bundle. Replace and Delete record the administrator
 // mutation in the same transaction, from the provenance the context carries;
 // an audit failure aborts the change.
 type Storage interface {
diff --git a/services/core/internal/persistence/postgres/agentpg/store.go b/services/core/internal/persistence/postgres/agentpg/store.go
index a52b917af..a2f519a27 100644
--- a/services/core/internal/persistence/postgres/agentpg/store.go
+++ b/services/core/internal/persistence/postgres/agentpg/store.go
@@ -27,10 +27,8 @@ type Store struct {
 	cipher *credentialcrypto.Cipher
 }
 
-// New returns the Agent store. cipher is nil when Core has no credential key;
-// saving or opening a model provider bundle then fails with
-// credentialcrypto.ErrUnavailable. A bundle the key cannot open is an internal
-// error.
+// New returns the Agent store, which seals model provider bundles with cipher.
+// A bundle the key cannot open is an internal error.
 func New(pool *pgunit.Pool, cipher *credentialcrypto.Cipher) *Store {
 	return &Store{pool: pool, cipher: cipher}
 }
@@ -247,9 +245,6 @@ func (s *Store) GetAgentWithModelProvider(ctx context.Context, tenantID, agentID
 	if row.EncryptedConfig == nil {
 		return agent, nil, nil
 	}
-	if s.cipher == nil {
-		return agents.Agent{}, nil, credentialcrypto.ErrUnavailable
-	}
 	raw, err := s.cipher.OpenAgentModelExecution(row.EncryptedConfig, agent.TenantID, agent.ID)
 	if err != nil {
 		return agents.Agent{}, nil, errors.New("agent model provider decryption failed")
@@ -268,7 +263,7 @@ func (s *Store) saveModelProvider(ctx context.Context, q *sqlc.Queries, tenant,
 	}
 	sealed, err := s.cipher.SealAgentModelExecution(raw, uuid.UUID(tenant.Bytes).String(), uuid.UUID(agent.Bytes).String())
 	if err != nil {
-		return credentialcrypto.ErrUnavailable
+		return errors.New("agent model provider encryption failed")
 	}
 	return q.SaveAgentModelExecution(ctx, sqlc.SaveAgentModelExecutionParams{AgentID: agent, EncryptedConfig: sealed})
 }
diff --git a/services/core/internal/persistence/postgres/agentpg/store_test.go b/services/core/internal/persistence/postgres/agentpg/store_test.go
index 2d30e5b2e..97e765d32 100644
--- a/services/core/internal/persistence/postgres/agentpg/store_test.go
+++ b/services/core/internal/persistence/postgres/agentpg/store_test.go
@@ -70,7 +70,7 @@ func count(t *testing.T, pool *pgxpool.Pool, query string, args ...any) int {
 
 func TestAgentsPersistIndependentlyAndStayTenantScoped(t *testing.T) {
 	pool := pgtest.Open(t)
-	store, service := open(t, pool, nil)
+	store, service := open(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenantA, tenantB := uuid.NewString(), uuid.NewString()
 	// Configuration is preserved without applying one harness's capabilities.
@@ -116,7 +116,7 @@ func TestAgentsPersistIndependentlyAndStayTenantScoped(t *testing.T) {
 
 func TestAgentsRejectInvalidTenantsAndEmptyMetadataIsAMap(t *testing.T) {
 	pool := pgtest.Open(t)
-	store, service := open(t, pool, nil)
+	store, service := open(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	valid := agents.CreateCommand{Configuration: []byte(`{"model":"x"}`)}
@@ -144,7 +144,7 @@ func TestAgentsRejectInvalidTenantsAndEmptyMetadataIsAMap(t *testing.T) {
 
 func TestAgentListPaginationIsolationAndReconnect(t *testing.T) {
 	pool := pgtest.Open(t)
-	store, service := open(t, pool, nil)
+	store, service := open(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant, other := uuid.NewString(), uuid.NewString()
 	empty, err := store.ListAgents(ctx, agents.ListQuery{TenantID: tenant, Limit: 2})
@@ -230,7 +230,7 @@ func TestAgentListPaginationIsolationAndReconnect(t *testing.T) {
 
 func TestAgentUpdateRollbackAndCompleteSizeBound(t *testing.T) {
 	pool := pgtest.Open(t)
-	store, service := open(t, pool, nil)
+	store, service := open(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	configuration, err := json.Marshal(map[string]any{"model": "original", "instructions": strings.Repeat("x", 400*1024), "number": json.Number("9007199254740993")})
@@ -286,7 +286,7 @@ func TestAgentUpdateRollbackAndCompleteSizeBound(t *testing.T) {
 
 func TestAgentDeleteIsTenantScoped(t *testing.T) {
 	pool := pgtest.Open(t)
-	store, service := open(t, pool, nil)
+	store, service := open(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	agent, err := service.Create(ctx, agents.CreateCommand{TenantID: tenant, Configuration: []byte(`{"model":"x"}`)})
@@ -347,23 +347,12 @@ func TestAgentModelExecutionAtomicEncryptedSnapshot(t *testing.T) {
 	if _, inherited := snapshot(store); inherited == nil || *inherited != *provider {
 		t.Fatal("provider snapshot mismatch")
 	}
-	// Omitted provider updates and plain reads do not require the encryption key.
-	keylessStore, keyless := open(t, pool, nil)
-	if _, err := keyless.Update(ctx, agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: []byte(`{"model":"new-model"}`)}); err != nil {
+	if _, err := service.Update(ctx, agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: []byte(`{"model":"new-model"}`)}); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := keylessStore.GetAgent(ctx, tenant, agent.ID); err != nil {
-		t.Fatal("plain read required Agent decryption", err)
-	}
-	if _, _, err := keylessStore.GetAgentWithModelProvider(ctx, tenant, agent.ID); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("missing key opened the bundle", err)
-	}
 	if _, _, err := agentpg.New(pgunit.NewPool(pool), testCipher(t, 99)).GetAgentWithModelProvider(ctx, tenant, agent.ID); err == nil || err.Error() != "agent model provider decryption failed" {
 		t.Fatal("wrong key was not a decryption failure", err)
 	}
-	if _, err := keyless.Create(ctx, create); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("unencrypted Agent create accepted", err)
-	}
 	replacement := providerFixture(1)
 	replace := func(tenant string) agents.UpdateCommand {
 		return agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: providerConfiguration(t, replacement, "codex"), ModelProvider: &agents.ModelProviderChange{Provider: replacement}}
@@ -371,9 +360,6 @@ func TestAgentModelExecutionAtomicEncryptedSnapshot(t *testing.T) {
 	if _, err := service.Update(ctx, replace(uuid.NewString())); !errors.Is(err, agents.ErrNotFound) {
 		t.Fatal("foreign tenant replacement accepted", err)
 	}
-	if _, err := keyless.Update(ctx, replace(tenant)); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("unencrypted replacement accepted", err)
-	}
 	if current, inherited := snapshot(store); inherited == nil || *inherited != *provider || !bytes.Contains(current.Configuration, []byte("new-model")) {
 		t.Fatal("failed replacement changed snapshot")
 	}
@@ -385,9 +371,6 @@ func TestAgentModelExecutionAtomicEncryptedSnapshot(t *testing.T) {
 	if current, inherited := snapshot(store); inherited == nil || *inherited != *provider || !bytes.Contains(current.Configuration, []byte("new-model")) {
 		t.Fatal("database rejection left a partial replacement")
 	}
-	if n := count(t, pool, "SELECT count(*) FROM agents WHERE tenant_id=$1", tenant); n != 1 {
-		t.Fatal("failed create persisted partial Agent", n)
-	}
 	if _, err := service.Update(ctx, agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: []byte(`{"x_agents_core":{"harness":"claude_sdk"}}`)}); !errors.Is(err, agents.ErrInvalidInput) {
 		t.Fatal("incompatible Harness-only update accepted", err)
 	}
@@ -399,13 +382,13 @@ func TestAgentModelExecutionAtomicEncryptedSnapshot(t *testing.T) {
 	if current, inherited := snapshot(store); inherited == nil || *inherited != *replacement || !bytes.Contains(current.Configuration, []byte(`"harness": "codex"`)) {
 		t.Fatal("provider-only replacement failed")
 	}
-	if _, err := keyless.Update(ctx, agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: []byte(`{"x_agents_core":{"harness":"codex"}}`)}); err != nil {
+	if _, err := service.Update(ctx, agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: []byte(`{"x_agents_core":{"harness":"codex"}}`)}); err != nil {
 		t.Fatal(err)
 	}
 	if _, inherited := snapshot(store); inherited == nil || *inherited != *replacement {
 		t.Fatal("harness-only update lost provider")
 	}
-	if _, err := keyless.Update(ctx, agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: []byte(`{"x_agents_core":{"model_provider":null}}`), ModelProvider: &agents.ModelProviderChange{}}); err != nil {
+	if _, err := service.Update(ctx, agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: []byte(`{"x_agents_core":{"model_provider":null}}`), ModelProvider: &agents.ModelProviderChange{}}); err != nil {
 		t.Fatal(err)
 	}
 	if current, inherited := snapshot(store); inherited != nil || !bytes.Contains(current.Configuration, []byte(`"harness": "codex"`)) {
@@ -645,7 +628,7 @@ func TestAgentWritesAuditInTheirTransaction(t *testing.T) {
 // after another key updates and deletes the Agent.
 func TestAgentAuditReadsFailuresAndStableOwnership(t *testing.T) {
 	pool := pgtest.Open(t)
-	store, service := open(t, pool, nil)
+	store, service := open(t, pool, pgtest.CredentialKey(t))
 	tenant := uuid.NewString()
 	first, err := service.Create(auditContext(t.Context(), tenant, uuid.NewString(), "a"), agents.CreateCommand{TenantID: tenant, Configuration: []byte(`{"model":"fixture"}`)})
 	if err != nil {
@@ -686,7 +669,7 @@ func TestAgentAuditReadsFailuresAndStableOwnership(t *testing.T) {
 // Malformed supplied provenance fails the write closed.
 func TestAgentWriteRejectsInvalidAuditSource(t *testing.T) {
 	pool := pgtest.Open(t)
-	_, service := open(t, pool, nil)
+	_, service := open(t, pool, pgtest.CredentialKey(t))
 	tenant := uuid.NewString()
 	ctx := writeaudit.WithSource(t.Context(), writeaudit.Source{KeyID: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", Prefix: "pc_aaaaaaaa", Kind: "issued", TenantID: tenant, RequestID: uuid.NewString()})
 	if _, err := service.Create(ctx, agents.CreateCommand{TenantID: tenant, Configuration: []byte(`{"model":"x"}`)}); !errors.Is(err, writeaudit.ErrInvalidSource) {
diff --git a/services/core/internal/persistence/postgres/deploymentpg/records.go b/services/core/internal/persistence/postgres/deploymentpg/records.go
index c1e2cb3c5..0fc164c42 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/records.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/records.go
@@ -55,18 +55,15 @@ func translate(err error) error {
 }
 
 // record converts the stored deployment. open opens a stored credential; a
-// view never needs it. Without a key the credential error is
-// credentialcrypto.ErrUnavailable; a credential the key cannot open or
-// authenticate is an internal decryption error.
+// view never needs it. A credential the key cannot open or authenticate is an
+// internal decryption error.
 func record(d sqlc.RuntimeDeployment, cipher *credentialcrypto.Cipher, open bool) deployment.Record {
 	r := deployment.Record{InstallationID: uuidString(d.InstallationID), Provider: d.ProviderKind, BackendFingerprint: d.BackendFingerprint,
 		Generation: uint64(d.Generation), OwnerEpoch: uint64(d.OwnerEpoch), Mode: d.Mode, Specification: d.Specification,
 		Configuration: sandbox.ConfigurationRecord{Public: d.ProviderConfig, Metadata: d.ProviderMetadata}, CredentialStored: len(d.ProviderCredential) > 0}
 	if r.CredentialStored && open {
-		if cipher == nil {
-			r.CredentialError = credentialcrypto.ErrUnavailable
-		} else if secret, err := cipher.OpenSandboxDeployment(d.ProviderCredential, r.InstallationID, r.Generation); err != nil {
-			r.CredentialError = errors.New("sandbox deployment credential decryption failed")
+		if secret, err := cipher.OpenSandboxDeployment(d.ProviderCredential, r.InstallationID, r.Generation); err != nil {
+			r.CredentialError = deployment.ErrCredentialUnreadable
 		} else {
 			r.Configuration.Secret = secret
 		}
diff --git a/services/core/internal/persistence/postgres/deploymentpg/seal_test.go b/services/core/internal/persistence/postgres/deploymentpg/seal_test.go
index f52e389ca..0fed62306 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/seal_test.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/seal_test.go
@@ -4,23 +4,23 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 )
 
-// A missing key is credentialcrypto.ErrUnavailable, and a credential sealed
-// with another binding is a decryption failure, never a missing key. Node
-// transactions and snapshots never open the credential, so they need no key.
+// A credential sealed with another key or binding is a decryption failure.
+// Node transactions and snapshots never open the credential, so they keep
+// working under a replaced key.
 func TestStoredCredentialNeedsTheKeyAndItsBinding(t *testing.T) {
 	f := newFixture(t)
 	changes, _ := f.execution(t)
 	id, view := f.initialize(t, changes, setupE2BSelection())
-	keyless := deploymentpg.New(pgunit.NewPool(f.pool), nil)
-	service := newService(t, keyless, fixturePublicURL)
-	if _, err := service.Setup(t.Context()); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("a keyless Store opened the credential", err)
+	replaced := deploymentpg.New(pgunit.NewPool(f.pool), pgtest.CredentialKey(t))
+	service := newService(t, replaced, fixturePublicURL)
+	if _, err := service.Setup(t.Context()); !errors.Is(err, deployment.ErrCredentialUnreadable) {
+		t.Fatal("a replaced key opened the credential", err)
 	}
 	withoutCredential := func(reads deployment.NodeReads) error {
 		d, err := reads.LoadDeployment()
@@ -29,10 +29,10 @@ func TestStoredCredentialNeedsTheKeyAndItsBinding(t *testing.T) {
 		}
 		return err
 	}
-	if err := keyless.WithNodes(t.Context(), func(tx deployment.NodeTx) error { return withoutCredential(tx) }); err != nil {
+	if err := replaced.WithNodes(t.Context(), func(tx deployment.NodeTx) error { return withoutCredential(tx) }); err != nil {
 		t.Fatal(err)
 	}
-	if err := keyless.ReadNodes(t.Context(), withoutCredential); err != nil {
+	if err := replaced.ReadNodes(t.Context(), withoutCredential); err != nil {
 		t.Fatal(err)
 	}
 	sealed, err := f.cipher.SealSandboxDeployment([]byte("fixture-private-api-key"), id, view.Generation+1)
@@ -42,7 +42,7 @@ func TestStoredCredentialNeedsTheKeyAndItsBinding(t *testing.T) {
 	if _, err := f.pool.Exec(t.Context(), "UPDATE runtime_deployment SET provider_credential=$1", sealed); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := f.service.Setup(t.Context()); err == nil || err.Error() != "sandbox deployment credential decryption failed" || errors.Is(err, credentialcrypto.ErrUnavailable) {
+	if _, err := f.service.Setup(t.Context()); !errors.Is(err, deployment.ErrCredentialUnreadable) {
 		t.Fatal("a wrong binding was not a decryption failure", err)
 	}
 }
diff --git a/services/core/internal/persistence/postgres/deploymentpg/store.go b/services/core/internal/persistence/postgres/deploymentpg/store.go
index decc3aaa9..612af96bc 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/store.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/store.go
@@ -25,8 +25,8 @@ type Store struct {
 	cipher *credentialcrypto.Cipher
 }
 
-// New returns the deployment store. cipher is nil when Core has no credential
-// key; a stored credential then reads as credentialcrypto.ErrUnavailable.
+// New returns the deployment store, which seals the provider credential with
+// cipher.
 func New(pool *pgunit.Pool, cipher *credentialcrypto.Cipher) *Store {
 	return &Store{pool: pool, cipher: cipher}
 }
diff --git a/services/core/internal/persistence/postgres/deploymentpg/tx.go b/services/core/internal/persistence/postgres/deploymentpg/tx.go
index f48a83cbf..28f35e1c5 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/tx.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/tx.go
@@ -303,9 +303,6 @@ func (t *deploymentTx) SaveSelection(selection deployment.SelectionRecord) error
 	}
 	params := sqlc.InitializeSandboxDeploymentParams{ProviderKind: selection.Provider, BackendFingerprint: selection.BackendFingerprint, Generation: int64(selection.Generation), Mode: selection.Mode, ProviderConfig: selection.Configuration.Public, ProviderMetadata: selection.Configuration.Metadata, Specification: selection.Specification}
 	if len(selection.Configuration.Secret) > 0 {
-		if t.cipher == nil {
-			return credentialcrypto.ErrUnavailable
-		}
 		sealed, err := t.cipher.SealSandboxDeployment(selection.Configuration.Secret, selection.InstallationID, selection.Generation)
 		if err != nil {
 			return errors.New("sandbox deployment credential encryption failed")
diff --git a/services/core/internal/persistence/postgres/modelconfigurationpg/seal_test.go b/services/core/internal/persistence/postgres/modelconfigurationpg/seal_test.go
index b482438dc..181e8a5f8 100644
--- a/services/core/internal/persistence/postgres/modelconfigurationpg/seal_test.go
+++ b/services/core/internal/persistence/postgres/modelconfigurationpg/seal_test.go
@@ -8,30 +8,23 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 )
 
 // The Store seals the bundle to its Harness as Core always has, so a bundle
-// sealed before the Store owned the key still opens. A missing key is
-// credentialcrypto.ErrUnavailable, and a wrong binding is a decryption
-// failure, never a missing key or default.
+// sealed before the Store owned the key still opens. A bundle sealed under
+// another key or binding is a decryption failure, never a missing default.
 func TestBundlesKeepTheirSealedFormat(t *testing.T) {
 	f := newFixture(t)
-	keyless := modelconfigurationpg.New(pgunit.NewPool(f.pool), nil)
+	replaced := modelconfigurationpg.New(pgunit.NewPool(f.pool), pgtest.CredentialKey(t))
 	configuration := v1.ModelConfigurationInput{ModelProvider: fixtureProvider, Model: "fixture"}
-	if _, err := keyless.LoadBundle(t.Context(), "codex"); !errors.Is(err, modelconfiguration.ErrNotFound) {
-		t.Fatal("a missing default was not reported before the key", err)
+	if _, err := replaced.LoadBundle(t.Context(), "codex"); !errors.Is(err, modelconfiguration.ErrNotFound) {
+		t.Fatal("a missing default was not reported before decryption", err)
 	}
 	record := modelconfiguration.Record{Harness: "codex", Provider: *fixtureProvider.SafeView(), Model: "fixture", HarnessConfig: json.RawMessage(`{}`), Configuration: configuration}
-	if _, err := keyless.Replace(admin(t), record); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("a keyless Store sealed a bundle", err)
-	}
-	if listed := f.list(t); len(listed) != 0 {
-		t.Fatal("a keyless replacement was stored", listed)
-	}
 	if _, err := f.adapter.Replace(admin(t), record); err != nil {
 		t.Fatal(err)
 	}
@@ -39,8 +32,8 @@ func TestBundlesKeepTheirSealedFormat(t *testing.T) {
 	if err != nil || !reflect.DeepEqual(loaded.Configuration, configuration) {
 		t.Fatal("the bundle did not round-trip", err)
 	}
-	if _, err := keyless.LoadBundle(t.Context(), "codex"); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("a keyless Store opened a bundle", err)
+	if _, err := replaced.LoadBundle(t.Context(), "codex"); err == nil || err.Error() != "deployment model configuration decryption failed" {
+		t.Fatal("a replaced key opened a bundle", err)
 	}
 	// write stores a bundle sealed the way Core sealed it before this Store
 	// owned the key.
diff --git a/services/core/internal/persistence/postgres/modelconfigurationpg/store.go b/services/core/internal/persistence/postgres/modelconfigurationpg/store.go
index 1b6db598f..02a0a7d0d 100644
--- a/services/core/internal/persistence/postgres/modelconfigurationpg/store.go
+++ b/services/core/internal/persistence/postgres/modelconfigurationpg/store.go
@@ -43,9 +43,7 @@ var (
 	_ modelconfiguration.Observer = (*Store)(nil)
 )
 
-// New returns a Store. Without a credential key (cipher nil), Replace and
-// LoadBundle fail with credentialcrypto.ErrUnavailable; List, Delete and
-// observations keep working.
+// New returns a Store that seals and opens bundles with cipher.
 func New(pool *pgunit.Pool, cipher *credentialcrypto.Cipher) *Store {
 	return &Store{pool: pool, cipher: cipher}
 }
@@ -67,16 +65,13 @@ func (s *Store) List(ctx context.Context) ([]modelconfiguration.Configuration, e
 // new revision, which clears the replaced revision's observations, and audits
 // the write in the same transaction.
 func (s *Store) Replace(ctx context.Context, record modelconfiguration.Record) (modelconfiguration.Configuration, error) {
-	if s.cipher == nil {
-		return modelconfiguration.Configuration{}, credentialcrypto.ErrUnavailable
-	}
 	raw, err := json.Marshal(record.Configuration)
 	if err != nil {
 		return modelconfiguration.Configuration{}, err
 	}
 	sealed, err := s.cipher.SealDeploymentModelProvider(raw, record.Harness)
 	if err != nil {
-		return modelconfiguration.Configuration{}, credentialcrypto.ErrUnavailable
+		return modelconfiguration.Configuration{}, errors.New("model provider encryption failed")
 	}
 	var result modelconfiguration.Configuration
 	err = s.pool.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
@@ -121,9 +116,6 @@ func (s *Store) LoadBundle(ctx context.Context, harness string) (modelconfigurat
 	if err != nil {
 		return modelconfiguration.Bundle{}, translate(err)
 	}
-	if s.cipher == nil {
-		return modelconfiguration.Bundle{}, credentialcrypto.ErrUnavailable
-	}
 	raw, err := s.cipher.OpenDeploymentModelProvider(row.EncryptedConfig, harness)
 	if err != nil {
 		return modelconfiguration.Bundle{}, errors.New("deployment model configuration decryption failed")
diff --git a/services/core/internal/persistence/postgres/pgtest/pgtest.go b/services/core/internal/persistence/postgres/pgtest/pgtest.go
index 8a9fcdcb3..da2094abe 100644
--- a/services/core/internal/persistence/postgres/pgtest/pgtest.go
+++ b/services/core/internal/persistence/postgres/pgtest/pgtest.go
@@ -3,6 +3,7 @@
 package pgtest
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"os"
@@ -15,9 +16,21 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/jackc/pgx/v5/stdlib"
 
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/migrations"
 )
 
+// CredentialKey returns a cipher under a fixed test credential key, for tests
+// that need a key but not a particular one.
+func CredentialKey(t testing.TB) *credentialcrypto.Cipher {
+	t.Helper()
+	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{0x7e}, 32))
+	if err != nil {
+		t.Fatal(err)
+	}
+	return cipher
+}
+
 // Open returns a pool on the dedicated test database named by
 // OAC_TEST_DATABASE_URL, with Core's migrations applied, and skips the test when
 // the variable is unset. Tests on this shared database isolate their data with
diff --git a/services/core/internal/persistence/postgres/sessionpg/admin_test.go b/services/core/internal/persistence/postgres/sessionpg/admin_test.go
index 43d37f264..f6a1c6ba8 100644
--- a/services/core/internal/persistence/postgres/sessionpg/admin_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/admin_test.go
@@ -15,7 +15,7 @@ import (
 
 func TestListAdminRuntimeTargetsPagesLiveSessionsOfTenants(t *testing.T) {
 	pool := pgtest.Open(t)
-	store := New(pgunit.NewPool(pool), nil)
+	store := New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	first, second, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	created := time.Now().UTC().Add(-time.Hour)
 	session := func(tenant string, offset time.Duration, deleted bool) sessions.AdminRuntimeTarget {
@@ -64,7 +64,7 @@ func TestListAdminRuntimeTargetsPagesLiveSessionsOfTenants(t *testing.T) {
 
 func TestReadAdminSummaryVisitsTheSelectedSessions(t *testing.T) {
 	pool := pgtest.Open(t)
-	store := New(pgunit.NewPool(pool), nil)
+	store := New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	tenant, created := uuid.NewString(), time.Now().UTC().Truncate(time.Second).Add(-time.Hour)
 	session := func(offset time.Duration, deleted bool) string {
 		id := uuid.NewString()
diff --git a/services/core/internal/persistence/postgres/sessionpg/artifacts_test.go b/services/core/internal/persistence/postgres/sessionpg/artifacts_test.go
index 30a299d63..4e17c6e55 100644
--- a/services/core/internal/persistence/postgres/sessionpg/artifacts_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/artifacts_test.go
@@ -67,7 +67,7 @@ func stagedRows(t *testing.T, pool *pgxpool.Pool, turn string) int {
 
 func stagingService(t *testing.T, pool *pgxpool.Pool) (*Store, *sessions.Service) {
 	t.Helper()
-	store := New(pgunit.NewPool(pool), nil)
+	store := New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	service, err := sessions.NewService(store, nil)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation.go b/services/core/internal/persistence/postgres/sessionpg/creation.go
index 5c3a93c57..be18c68d7 100644
--- a/services/core/internal/persistence/postgres/sessionpg/creation.go
+++ b/services/core/internal/persistence/postgres/sessionpg/creation.go
@@ -33,9 +33,6 @@ const modelProviderKeyPurpose = "parsar.agents-api.model-provider-api-key.v1"
 var _ sessions.CreationTx = (*creationTx)(nil)
 
 func (s *Store) FingerprintProviderKey(secret string) (string, error) {
-	if s.cipher == nil {
-		return "", credentialcrypto.ErrUnavailable
-	}
 	return s.cipher.Fingerprint(modelProviderKeyPurpose, secret)
 }
 
@@ -133,9 +130,6 @@ func skillError(err error) error {
 }
 
 func (t *creationTx) SaveModelExecution(ctx context.Context, provider v1.ModelProviderInput) error {
-	if t.cipher == nil {
-		return credentialcrypto.ErrUnavailable
-	}
 	raw, err := json.Marshal(provider)
 	if err != nil {
 		return err
@@ -160,9 +154,6 @@ func (t *creationTx) SaveExecutionConfiguration(ctx context.Context, projection
 }
 
 func (t *creationTx) SaveInitialFiles(ctx context.Context, initial []environmentconfig.InitialFile) error {
-	if t.cipher == nil {
-		return credentialcrypto.ErrUnavailable
-	}
 	metadata := environmentconfig.InitialFilesMetadata(initial)
 	for i, f := range initial {
 		body := f.Data
@@ -200,9 +191,6 @@ func (t *creationTx) SaveInitialFiles(ctx context.Context, initial []environment
 }
 
 func (t *creationTx) SaveSetup(ctx context.Context, setup environmentconfig.Setup) error {
-	if t.cipher == nil {
-		return credentialcrypto.ErrUnavailable
-	}
 	plaintext, err := json.Marshal(setup)
 	if err != nil {
 		return err
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation_test.go b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
index 1552275b8..58174a25a 100644
--- a/services/core/internal/persistence/postgres/sessionpg/creation_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
@@ -39,13 +39,13 @@ var hostedConfiguration = json.RawMessage(`{"agent":{"model":"m"},"environment":
 
 // creationService returns the Session store and service over pool with the
 // built-in placement rules.
-func creationService(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) (*Store, *sessions.Service) {
+func creationService(t *testing.T, pool *pgxpool.Pool) (*Store, *sessions.Service) {
 	t.Helper()
 	rules, err := placement.NewRules(providers.Builtin(), "")
 	if err != nil {
 		t.Fatal(err)
 	}
-	store := New(pgunit.NewPool(pool), cipher)
+	store := New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	service, err := sessions.NewService(store, rules)
 	if err != nil {
 		t.Fatal(err)
@@ -53,9 +53,9 @@ func creationService(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.
 	return store, service
 }
 
-func skillService(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) *skills.Service {
+func skillService(t *testing.T, pool *pgxpool.Pool) *skills.Service {
 	t.Helper()
-	store := skillpg.New(pgunit.NewPool(pool), cipher)
+	store := skillpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	service, err := skills.NewService(store, store)
 	if err != nil {
 		t.Fatal(err)
@@ -133,8 +133,8 @@ func awaitWaiters(t *testing.T, pool *pgxpool.Pool, holder int32, count int) {
 // submitting the input again.
 func TestCreationRetriesNeverReplayInitialInput(t *testing.T) {
 	pool := pgtest.Open(t)
-	store, service := creationService(t, pool, nil)
-	_, other := creationService(t, pgtest.Open(t), nil)
+	store, service := creationService(t, pool)
+	_, other := creationService(t, pgtest.Open(t))
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "initial", CreationRequest: json.RawMessage(`{"agent_id":"source"}`), InitialInputs: []sessions.Input{messageInput("first"), messageInput("second")}}
@@ -232,7 +232,7 @@ func TestCreationRetriesNeverReplayInitialInput(t *testing.T) {
 // one creates.
 func TestCreationIdentity(t *testing.T) {
 	pool := pgtest.Open(t)
-	_, service := creationService(t, pool, nil)
+	_, service := creationService(t, pool)
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	request := json.RawMessage(`{"agent_id":"source","agent":{"tools":[{"parameters":{"const":9007199254740993}}]}}`)
@@ -326,7 +326,7 @@ func TestCreationIdentity(t *testing.T) {
 }
 
 // The provider-key fingerprint in retry identities depends on the credential
-// key and needs one.
+// key.
 func TestProviderKeyFingerprintIsKeyed(t *testing.T) {
 	fingerprint := func(seed byte) string {
 		cipher, err := credentialcrypto.New(bytes.Repeat([]byte{seed}, 32))
@@ -342,9 +342,6 @@ func TestProviderKeyFingerprintIsKeyed(t *testing.T) {
 	if fingerprint(71) == fingerprint(72) {
 		t.Fatal("fingerprint ignores the credential key")
 	}
-	if _, err := New(nil, nil).FingerprintProviderKey("provider-key"); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal(err)
-	}
 }
 
 // A new Session freezes its provider, Skills and initial files sealed under
@@ -352,9 +349,8 @@ func TestProviderKeyFingerprintIsKeyed(t *testing.T) {
 // bytes conflict, and a foreign source is missing.
 func TestCreationFreezesResourcesOnce(t *testing.T) {
 	pool := pgtest.Open(t)
-	cipher := frozenCipher(t)
-	store, service := creationService(t, pool, cipher)
-	skillsService := skillService(t, pool, cipher)
+	store, service := creationService(t, pool)
+	skillsService := skillService(t, pool)
 	filesService, err := files.NewService(filepg.New(pgunit.NewPool(pool)))
 	if err != nil {
 		t.Fatal(err)
@@ -444,21 +440,13 @@ func TestCreationFreezesResourcesOnce(t *testing.T) {
 	if _, err := service.CreateSession(ctx, tenant, changed); !errors.Is(err, sessions.ErrIdempotencyConflict) {
 		t.Fatal("changed bytes accepted", err)
 	}
-	_, keyless := creationService(t, pool, nil)
-	sealedInput := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "keyless", Configuration: hostedConfiguration, InitialFiles: changed.InitialFiles[:1]}
-	if _, err := keyless.CreateSession(ctx, tenant, sealedInput); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("sealed without a credential key", err)
-	}
-	if countRows(t, pool, "SELECT count(*) FROM sessions WHERE tenant_id=$1 AND idempotency_key='keyless'", tenant) != 0 {
-		t.Fatal("a failed creation left a Session")
-	}
 }
 
 // An Environment Session reserves its initial input, tracking its activity,
 // instead of admitting a Turn.
 func TestEnvironmentCreationReservesItsInitialInput(t *testing.T) {
 	pool := pgtest.Open(t)
-	_, service := creationService(t, pool, nil)
+	_, service := creationService(t, pool)
 	input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "environment", InitialInputs: []sessions.Input{messageInput("first")},
 		Configuration: json.RawMessage(`{"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)}
 	created, err := service.CreateSession(t.Context(), uuid.NewString(), input)
@@ -479,7 +467,7 @@ func TestEnvironmentCreationReservesItsInitialInput(t *testing.T) {
 // nothing and still returns its Session.
 func TestHostedCreationAdmitsAndPlacesUnderTheDeploymentLock(t *testing.T) {
 	pool := pgtest.OpenIsolated(t, nil)
-	_, service := creationService(t, pool, nil)
+	_, service := creationService(t, pool)
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
 	defer cancel()
 	tenant := uuid.NewString()
@@ -531,9 +519,8 @@ func TestHostedCreationAdmitsAndPlacesUnderTheDeploymentLock(t *testing.T) {
 // whichever goes first decides, and no Session refers to a missing version.
 func TestSkillFreezeSerializesWithVersionDeletion(t *testing.T) {
 	pool := pgtest.Open(t)
-	cipher := frozenCipher(t)
-	store, service := creationService(t, pool, cipher)
-	skillsService := skillService(t, pool, cipher)
+	store, service := creationService(t, pool)
+	skillsService := skillService(t, pool)
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	for _, freezeFirst := range []bool{true, false} {
@@ -605,7 +592,7 @@ func TestSkillFreezeSerializesWithVersionDeletion(t *testing.T) {
 // creation closed and rolls it back.
 func TestCreationAudit(t *testing.T) {
 	pool := pgtest.Open(t)
-	_, service := creationService(t, pool, nil)
+	_, service := creationService(t, pool)
 	tenant := uuid.NewString()
 	source := writeaudit.Source{KeyID: uuid.NewString(), Prefix: "pc_aaaaaaaa", Name: "test key", Kind: "issued", TenantID: uuid.NewString(), RequestID: uuid.NewString(), TraceID: uuid.NewString()}
 	input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: "audited", InitialInputs: []sessions.Input{messageInput("first")},
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_turns_test.go b/services/core/internal/persistence/postgres/sessionpg/execution_turns_test.go
index 6e06a2780..5b2270441 100644
--- a/services/core/internal/persistence/postgres/sessionpg/execution_turns_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/execution_turns_test.go
@@ -72,7 +72,7 @@ func TestConcurrentTerminalTransitionsKeepOneOutcome(t *testing.T) {
 	if _, err := transition(t.Context(), pool, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnInProgress, Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"late":true}`)}); !errors.Is(err, sessions.ErrTurnConflict) {
 		t.Fatalf("late terminal callback accepted: %v", err)
 	}
-	got, err := New(pgunit.NewPool(pgtest.Open(t)), nil).GetTurn(t.Context(), text(tenant), text(session), turn)
+	got, err := New(pgunit.NewPool(pgtest.Open(t)), pgtest.CredentialKey(t)).GetTurn(t.Context(), text(tenant), text(session), turn)
 	if err != nil || !reflect.DeepEqual(got, winner) {
 		t.Fatalf("terminal outcome changed: %+v, %v", got, err)
 	}
@@ -154,7 +154,7 @@ func TestCompleteExecutionSettlesTheTurnOnTheLease(t *testing.T) {
 // and a cursor or Session outside the tenant's Session is missing.
 func TestTurnPagesKeepScopeAndOrder(t *testing.T) {
 	pool := pgtest.Open(t)
-	store := New(pgunit.NewPool(pool), nil)
+	store := New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenantID, sessionID, first := newTurn(t, pool, sessions.TurnCancelled)
 	tenant, session := text(tenantID), text(sessionID)
diff --git a/services/core/internal/persistence/postgres/sessionpg/executor_credentials.go b/services/core/internal/persistence/postgres/sessionpg/executor_credentials.go
index b47335ecd..6d77d7a8b 100644
--- a/services/core/internal/persistence/postgres/sessionpg/executor_credentials.go
+++ b/services/core/internal/persistence/postgres/sessionpg/executor_credentials.go
@@ -12,7 +12,6 @@ import (
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgtype"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
@@ -176,11 +175,8 @@ func (s *Store) VerifyInstallation(_ context.Context, payload, signature string)
 }
 
 // installationSignature is the keyed digest of an installation authorization
-// payload. A service without the credential key cannot sign or verify one.
+// payload.
 func (s *Store) installationSignature(payload string) (string, error) {
-	if s.cipher == nil {
-		return "", credentialcrypto.ErrUnavailable
-	}
 	return s.cipher.Fingerprint(installationPurpose, payload)
 }
 
diff --git a/services/core/internal/persistence/postgres/sessionpg/executor_credentials_test.go b/services/core/internal/persistence/postgres/sessionpg/executor_credentials_test.go
index fc5f3ade4..ec8d0c810 100644
--- a/services/core/internal/persistence/postgres/sessionpg/executor_credentials_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/executor_credentials_test.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
@@ -17,7 +16,7 @@ import (
 )
 
 func TestInstallationSignaturesUseTheCredentialKey(t *testing.T) {
-	keyed := New(nil, frozenCipher(t))
+	keyed := New(nil, pgtest.CredentialKey(t))
 	signature, err := keyed.SignInstallation(t.Context(), "payload")
 	if err != nil {
 		t.Fatal(err)
@@ -28,18 +27,11 @@ func TestInstallationSignaturesUseTheCredentialKey(t *testing.T) {
 	if err := keyed.VerifyInstallation(t.Context(), "other", signature); !errors.Is(err, sessions.ErrInstallationAuthorization) {
 		t.Fatalf("another payload: %v", err)
 	}
-	keyless := New(nil, nil)
-	if _, err := keyless.SignInstallation(t.Context(), "payload"); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatalf("keyless signature: %v", err)
-	}
-	if err := keyless.VerifyInstallation(t.Context(), "payload", signature); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatalf("keyless verification: %v", err)
-	}
 }
 
 func TestExecutorCredentialTxTranslatesOutcomes(t *testing.T) {
 	pool := pgtest.Open(t)
-	store := New(pgunit.NewPool(pool), nil)
+	store := New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 	tenantID, sessionID, environmentID := newEnvironment(t, pool, "self_hosted", "pending")
 	tenant, environment := uuidText(tenantID), uuidText(environmentID)
 	exec(t, pool, `INSERT INTO execution_project_scopes(tenant_id, organization_id, project_id) VALUES ($1, 'org', $2)`, tenantID, tenant)
diff --git a/services/core/internal/persistence/postgres/sessionpg/frozen.go b/services/core/internal/persistence/postgres/sessionpg/frozen.go
index d7a638f78..ad2217270 100644
--- a/services/core/internal/persistence/postgres/sessionpg/frozen.go
+++ b/services/core/internal/persistence/postgres/sessionpg/frozen.go
@@ -34,9 +34,6 @@ func (s *Store) ReadEnvironmentSetup(ctx context.Context, tenant, session string
 	if len(encrypted) == 0 {
 		return setup, nil
 	}
-	if s.cipher == nil {
-		return environmentconfig.Setup{}, credentialcrypto.ErrUnavailable
-	}
 	plaintext, err := s.cipher.OpenEnvironmentSetup(encrypted, setupBinding(lookup.TenantID, lookup.ID))
 	if err != nil {
 		return environmentconfig.Setup{}, fmt.Errorf("open frozen environment setup: %w", err)
@@ -62,9 +59,6 @@ func (s *Store) ReadInitialEnvironmentFile(ctx context.Context, tenant, session
 	if err != nil {
 		return environmentconfig.InitialFileMetadata{}, nil, err
 	}
-	if s.cipher == nil {
-		return environmentconfig.InitialFileMetadata{}, nil, credentialcrypto.ErrUnavailable
-	}
 	id := uuid.UUID(row.ID.Bytes).String()
 	body, err := s.cipher.OpenEnvironmentFile(row.Contents, fileBinding(lookup.TenantID, lookup.ID, id))
 	if err != nil {
diff --git a/services/core/internal/persistence/postgres/sessionpg/frozen_test.go b/services/core/internal/persistence/postgres/sessionpg/frozen_test.go
index da87dc7c9..99cdb5d04 100644
--- a/services/core/internal/persistence/postgres/sessionpg/frozen_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/frozen_test.go
@@ -1,7 +1,6 @@
 package sessionpg
 
 import (
-	"bytes"
 	"errors"
 	"reflect"
 	"testing"
@@ -15,25 +14,16 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-func frozenCipher(t *testing.T) *credentialcrypto.Cipher {
-	t.Helper()
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{5}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	return cipher
-}
-
 // corruptFrozenData reports whether err classifies frozen data as corrupt
-// stored data: an internal error, never the caller's input, a missing record
-// or a missing key.
+// stored data: an internal error, never the caller's input or a missing
+// record.
 func corruptFrozenData(err error) bool {
-	return err != nil && !errors.Is(err, sessions.ErrInvalidInput) && !errors.Is(err, sessions.ErrNotFound) && !errors.Is(err, credentialcrypto.ErrUnavailable)
+	return err != nil && !errors.Is(err, sessions.ErrInvalidInput) && !errors.Is(err, sessions.ErrNotFound)
 }
 
 func TestReadEnvironmentSetupClassifiesFrozenData(t *testing.T) {
 	pool := pgtest.Open(t)
-	cipher := frozenCipher(t)
+	cipher := pgtest.CredentialKey(t)
 	adapter := New(pgunit.NewPool(pool), cipher)
 	tenantID, sessionID, _ := newEnvironment(t, pool, "self_hosted", "pending")
 	tenant, session := uuidText(tenantID), uuidText(sessionID)
@@ -61,9 +51,6 @@ func TestReadEnvironmentSetupClassifiesFrozenData(t *testing.T) {
 	if err != nil || setup.Env["GREETING"] != "hello" || !reflect.DeepEqual(setup.Packages.NPM, []string{"left-pad"}) {
 		t.Fatalf("frozen setup %+v, %v", setup, err)
 	}
-	if _, err := New(pgunit.NewPool(pool), nil).ReadEnvironmentSetup(t.Context(), tenant, session); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatalf("without a credential key: %v", err)
-	}
 
 	otherSession := binding
 	otherSession.OwnerID = uuid.NewString()
@@ -91,7 +78,7 @@ func TestReadEnvironmentSetupClassifiesFrozenData(t *testing.T) {
 
 func TestReadInitialEnvironmentFileClassifiesFrozenData(t *testing.T) {
 	pool := pgtest.Open(t)
-	cipher := frozenCipher(t)
+	cipher := pgtest.CredentialKey(t)
 	adapter := New(pgunit.NewPool(pool), cipher)
 	tenantID, sessionID, _ := newEnvironment(t, pool, "self_hosted", "pending")
 	tenant, session := uuidText(tenantID), uuidText(sessionID)
@@ -117,9 +104,6 @@ func TestReadInitialEnvironmentFileClassifiesFrozenData(t *testing.T) {
 	if _, _, err := adapter.ReadInitialEnvironmentFile(t.Context(), uuid.NewString(), session, 0); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatalf("other tenant: %v", err)
 	}
-	if _, _, err := New(pgunit.NewPool(pool), nil).ReadInitialEnvironmentFile(t.Context(), tenant, session, 0); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatalf("without a credential key: %v", err)
-	}
 
 	otherFile := binding
 	otherFile.FileID = uuid.NewString()
diff --git a/services/core/internal/persistence/postgres/sessionpg/model_execution.go b/services/core/internal/persistence/postgres/sessionpg/model_execution.go
index 8f5cfbfbb..68e91a3a7 100644
--- a/services/core/internal/persistence/postgres/sessionpg/model_execution.go
+++ b/services/core/internal/persistence/postgres/sessionpg/model_execution.go
@@ -11,7 +11,6 @@ import (
 	"github.com/jackc/pgx/v5"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
@@ -34,9 +33,6 @@ func (s *Store) SessionModelExecution(ctx context.Context, tenant, session strin
 	if err != nil {
 		return nil, err
 	}
-	if s.cipher == nil {
-		return nil, credentialcrypto.ErrUnavailable
-	}
 	raw, err := s.cipher.OpenModelExecution(ciphertext, tenant, session)
 	if err != nil {
 		return nil, fmt.Errorf("open session model execution: %w", err)
diff --git a/services/core/internal/persistence/postgres/skillpg/skillpg.go b/services/core/internal/persistence/postgres/skillpg/skillpg.go
index 8453bbb55..b65dfd8eb 100644
--- a/services/core/internal/persistence/postgres/skillpg/skillpg.go
+++ b/services/core/internal/persistence/postgres/skillpg/skillpg.go
@@ -33,8 +33,7 @@ var (
 	_ skills.Reader  = (*Store)(nil)
 )
 
-// New builds the Skill store. Without a cipher, uploads and content reads
-// fail with credentialcrypto.ErrUnavailable and metadata reads still work.
+// New builds the Skill store, which seals archives with cipher.
 func New(pool *pgunit.Pool, cipher *credentialcrypto.Cipher) *Store {
 	return &Store{pool: pool, cipher: cipher}
 }
@@ -301,9 +300,6 @@ func (s *Store) DefaultVersionContent(ctx context.Context, tenantID string, skil
 
 // insertVersion seals the archive under a new version ID and stores it.
 func (s *Store) insertVersion(ctx context.Context, q *sqlc.Queries, tenant, skill pgtype.UUID, version int64, name, description string, archive []byte) (skills.Version, error) {
-	if s.cipher == nil {
-		return skills.Version{}, credentialcrypto.ErrUnavailable
-	}
 	id := newID()
 	body, err := s.cipher.SealSkill(archive, credentialcrypto.NewSkillBinding(tenant.Bytes, skill.Bytes, id.Bytes, version))
 	if err != nil {
@@ -338,8 +334,7 @@ func LockSkills(ctx context.Context, q *sqlc.Queries, tenant pgtype.UUID, ids []
 
 // ReadVersionForFreeze reads, on q, a version of the tenant's Skill, opens
 // it with cipher and verifies it is still the archive the version records. A
-// missing version is skills.ErrNotFound and a missing cipher
-// credentialcrypto.ErrUnavailable; one that does not open or verify is
+// missing version is skills.ErrNotFound; one that does not open or verify is
 // corrupt stored data, an internal error.
 func ReadVersionForFreeze(ctx context.Context, q *sqlc.Queries, cipher *credentialcrypto.Cipher, tenant pgtype.UUID, skillID string, version int64) (skills.Content, error) {
 	key, err := skills.ParseID(skillID)
@@ -361,9 +356,6 @@ func ReadVersionForFreeze(ctx context.Context, q *sqlc.Queries, cipher *credenti
 }
 
 func open(cipher *credentialcrypto.Cipher, row sqlc.SkillVersion) (skills.Content, error) {
-	if cipher == nil {
-		return skills.Content{}, credentialcrypto.ErrUnavailable
-	}
 	archive, err := cipher.OpenSkill(row.Contents, credentialcrypto.NewSkillBinding(row.TenantID.Bytes, row.SkillID.Bytes, row.ID.Bytes, row.Version))
 	if err != nil {
 		return skills.Content{}, err
diff --git a/services/core/internal/persistence/postgres/skillpg/skillpg_test.go b/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
index f4fee68ef..8824d4534 100644
--- a/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
+++ b/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
@@ -106,9 +106,9 @@ func TestOwnershipEncryptionAndVersions(t *testing.T) {
 	if created.DefaultVersion != 1 || created.LatestVersion != 1 {
 		t.Fatal("initial pointers", created)
 	}
-	metadata, err := skillpg.New(pgunit.NewPool(f.pool), nil).Skill(ctx, tenant, id)
+	metadata, err := skillpg.New(pgunit.NewPool(f.pool), pgtest.CredentialKey(t)).Skill(ctx, tenant, id)
 	if err != nil || metadata.Name != "proof" {
-		t.Fatal("metadata requires no content key", err)
+		t.Fatal("metadata required the content key", err)
 	}
 	var contents []byte
 	if err = f.pool.QueryRow(ctx, "SELECT contents FROM skill_versions WHERE tenant_id=$1", tenant).Scan(&contents); err != nil {
@@ -288,8 +288,8 @@ func TestListsAcceptLimitZero(t *testing.T) {
 func TestMetadataTracksDefaultVersion(t *testing.T) {
 	pool := pgtest.Open(t)
 	f := newFixture(t, pool, testCipher(t, 74))
-	// Metadata reads and default changes need no content key.
-	metadataOnly := newFixture(t, pool, nil)
+	// Metadata reads and default changes work under a replaced key.
+	replaced := newFixture(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	names := []string{"first-proof", "second-proof", "third-proof"}
@@ -308,12 +308,12 @@ func TestMetadataTracksDefaultVersion(t *testing.T) {
 	}
 	assertStored := func(version, latest int64) {
 		t.Helper()
-		value, err := metadataOnly.store.Skill(ctx, tenant, id)
+		value, err := replaced.store.Skill(ctx, tenant, id)
 		if err != nil {
 			t.Fatal("metadata read without content key", err)
 		}
 		assertMetadata(value, version, latest)
-		page, err := metadataOnly.service.ListSkills(ctx, skills.ListSkills{TenantID: tenant, Limit: 10, Ascending: true})
+		page, err := replaced.service.ListSkills(ctx, skills.ListSkills{TenantID: tenant, Limit: 10, Ascending: true})
 		if err != nil || len(page.Skills) != 1 {
 			t.Fatal("metadata list without content key", page, err)
 		}
@@ -329,28 +329,23 @@ func TestMetadataTracksDefaultVersion(t *testing.T) {
 	}
 	assertStored(1, 2)
 	for _, version := range []string{"2", "1"} {
-		updated, err := metadataOnly.service.SetDefaultVersion(ctx, skills.SetDefaultVersion{TenantID: tenant, SkillID: id, Version: version})
+		updated, err := replaced.service.SetDefaultVersion(ctx, skills.SetDefaultVersion{TenantID: tenant, SkillID: id, Version: version})
 		if err != nil {
 			t.Fatal("default update without content key", err)
 		}
 		assertMetadata(updated, updated.DefaultVersion, 2)
 		assertStored(updated.DefaultVersion, 2)
 	}
-	if _, err := metadataOnly.service.SetDefaultVersion(ctx, skills.SetDefaultVersion{TenantID: foreign, SkillID: id, Version: "2"}); !errors.Is(err, skills.ErrNotFound) {
+	if _, err := replaced.service.SetDefaultVersion(ctx, skills.SetDefaultVersion{TenantID: foreign, SkillID: id, Version: "2"}); !errors.Is(err, skills.ErrNotFound) {
 		t.Fatal("foreign default update", err)
 	}
-	if _, err := metadataOnly.service.SetDefaultVersion(ctx, skills.SetDefaultVersion{TenantID: tenant, SkillID: id, Version: "999"}); !errors.Is(err, skills.ErrNotFound) {
+	if _, err := replaced.service.SetDefaultVersion(ctx, skills.SetDefaultVersion{TenantID: tenant, SkillID: id, Version: "999"}); !errors.Is(err, skills.ErrNotFound) {
 		t.Fatal("missing default update", err)
 	}
 	assertStored(1, 2)
-	// Uploads and content reads need the key; the failed upload stores nothing.
-	if _, err := metadataOnly.service.CreateVersion(ctx, skills.CreateVersion{TenantID: tenant, SkillID: id, Archive: archives[2]}); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("upload without content key", err)
+	if _, err := replaced.service.ReadDefaultVersion(ctx, skills.ReadDefaultVersion{TenantID: tenant, SkillID: id}); err == nil || errors.Is(err, skills.ErrNotFound) {
+		t.Fatal("a replaced key opened content", err)
 	}
-	if _, err := metadataOnly.service.ReadDefaultVersion(ctx, skills.ReadDefaultVersion{TenantID: tenant, SkillID: id}); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("content read without content key", err)
-	}
-	assertStored(1, 2)
 	if _, err := f.service.CreateVersion(ctx, skills.CreateVersion{TenantID: tenant, SkillID: id, Archive: archives[2], MakeDefault: true}); err != nil {
 		t.Fatal(err)
 	}
@@ -502,10 +497,7 @@ func TestFreezeReads(t *testing.T) {
 	if _, err := skillpg.ReadVersionForFreeze(ctx, q, cipher, tenantID, first.ID, 2); !errors.Is(err, skills.ErrNotFound) {
 		t.Fatal("missing version", err)
 	}
-	if _, err := skillpg.ReadVersionForFreeze(ctx, q, nil, tenantID, first.ID, 1); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("read without a key", err)
-	}
-	if _, err := skillpg.ReadVersionForFreeze(ctx, q, testCipher(t, 49), tenantID, first.ID, 1); err == nil || errors.Is(err, skills.ErrNotFound) || errors.Is(err, credentialcrypto.ErrUnavailable) {
+	if _, err := skillpg.ReadVersionForFreeze(ctx, q, testCipher(t, 49), tenantID, first.ID, 1); err == nil || errors.Is(err, skills.ErrNotFound) {
 		t.Fatal("another key opened the version", err)
 	}
 }
diff --git a/services/core/internal/persistence/postgres/templatepg/audit_test.go b/services/core/internal/persistence/postgres/templatepg/audit_test.go
index b4611b238..2dc1e8de4 100644
--- a/services/core/internal/persistence/postgres/templatepg/audit_test.go
+++ b/services/core/internal/persistence/postgres/templatepg/audit_test.go
@@ -114,7 +114,7 @@ func TestInvalidWriteAuditSourcePassesThrough(t *testing.T) {
 	if !errors.Is(err, writeaudit.ErrInvalidSource) {
 		t.Fatal("mismatched source tenant", err)
 	}
-	if page, err := f.keyless.List(t.Context(), tenant, environmenttemplates.ListQuery{Limit: 1}); err != nil || len(page.Templates) != 0 {
+	if page, err := f.replaced.List(t.Context(), tenant, environmenttemplates.ListQuery{Limit: 1}); err != nil || len(page.Templates) != 0 {
 		t.Fatal("rejected source left a Template", err)
 	}
 }
@@ -168,7 +168,7 @@ func TestAdminDeleteAuditCommitsWithTheDeletion(t *testing.T) {
 	if err := f.pool.QueryRow(t.Context(), `SELECT (SELECT count(*) FROM write_audit_operations WHERE tenant_id=$1 AND action='delete'),(SELECT count(*) FROM write_audit_owners WHERE tenant_id=$1 AND resource_type='environment_template' AND resource_id=$2)`, tenant, id).Scan(&operations, &owners); err != nil || operations != 0 || owners != 0 {
 		t.Fatal("administrator impersonated public-key provenance", err)
 	}
-	if _, err := f.keyless.Get(t.Context(), tenant, id); !errors.Is(err, environmenttemplates.ErrNotFound) {
+	if _, err := f.replaced.Get(t.Context(), tenant, id); !errors.Is(err, environmenttemplates.ErrNotFound) {
 		t.Fatal("deleted Template is visible", err)
 	}
 }
diff --git a/services/core/internal/persistence/postgres/templatepg/seal.go b/services/core/internal/persistence/postgres/templatepg/seal.go
index 06b2f0749..c9e45ac9e 100644
--- a/services/core/internal/persistence/postgres/templatepg/seal.go
+++ b/services/core/internal/persistence/postgres/templatepg/seal.go
@@ -12,8 +12,7 @@ import (
 )
 
 // sealed is an Input's column values. Empty confidential fields are stored as
-// NULL without using the key, so Templates without them need none; any other
-// confidential field without a key fails with credentialcrypto.ErrUnavailable.
+// NULL without using the key.
 type sealed struct {
 	files, fileContents     []byte
 	packages, env, commands []byte
@@ -28,9 +27,6 @@ func (s *Store) seal(tenant, id pgtype.UUID, in environmenttemplates.Input) (sea
 		return out, err
 	}
 	if len(in.Files) > 0 {
-		if s.cipher == nil {
-			return out, credentialcrypto.ErrUnavailable
-		}
 		plaintext, err := json.Marshal(in.Files)
 		if err != nil {
 			return out, err
@@ -62,9 +58,6 @@ func (s *Store) seal(tenant, id pgtype.UUID, in environmenttemplates.Input) (sea
 		if field.empty {
 			continue
 		}
-		if s.cipher == nil {
-			return out, credentialcrypto.ErrUnavailable
-		}
 		plaintext, err := json.Marshal(field.value)
 		if err != nil {
 			return out, err
@@ -80,9 +73,6 @@ func (s *Store) openSetup(tenant, id pgtype.UUID, field string, ciphertext []byt
 	if len(ciphertext) == 0 {
 		return nil
 	}
-	if s.cipher == nil {
-		return credentialcrypto.ErrUnavailable
-	}
 	plaintext, err := s.cipher.OpenEnvironmentSetup(ciphertext, setupBinding(tenant, id, field))
 	if err != nil {
 		return err
diff --git a/services/core/internal/persistence/postgres/templatepg/store.go b/services/core/internal/persistence/postgres/templatepg/store.go
index cb3d1d502..b4afbb0dc 100644
--- a/services/core/internal/persistence/postgres/templatepg/store.go
+++ b/services/core/internal/persistence/postgres/templatepg/store.go
@@ -36,9 +36,8 @@ var (
 	_ environmenttemplates.Reader  = (*Store)(nil)
 )
 
-// New returns a Store. Without a credential key (cipher nil), writes and
-// resolutions that seal or open confidential configuration fail with
-// credentialcrypto.ErrUnavailable; safe metadata stays readable.
+// New returns a Store that seals and opens confidential configuration with
+// cipher.
 func New(pool *pgunit.Pool, cipher *credentialcrypto.Cipher) *Store {
 	return &Store{pool: pool, cipher: cipher}
 }
@@ -217,9 +216,6 @@ func (s *Store) Resolve(ctx context.Context, tenantID, templateID string) (envir
 		}
 		return resolved, nil
 	}
-	if s.cipher == nil {
-		return environmenttemplates.Resolved{}, credentialcrypto.ErrUnavailable
-	}
 	plaintext, err := s.cipher.OpenEnvironmentFile(row.FileContents, fileBinding(tenant, id))
 	if err != nil {
 		return environmenttemplates.Resolved{}, err
diff --git a/services/core/internal/persistence/postgres/templatepg/store_test.go b/services/core/internal/persistence/postgres/templatepg/store_test.go
index 7710eb447..589462c3f 100644
--- a/services/core/internal/persistence/postgres/templatepg/store_test.go
+++ b/services/core/internal/persistence/postgres/templatepg/store_test.go
@@ -22,13 +22,13 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-// fixture is a Template adapter with the credential key and one without it,
-// on the same database, plus the service that validates writes.
+// fixture is a Template adapter under the credential key and one under a
+// replaced key, on the same database, plus the service that validates writes.
 type fixture struct {
-	pool    *pgxpool.Pool
-	keyed   *templatepg.Store
-	keyless *templatepg.Store
-	service *environmenttemplates.Service
+	pool     *pgxpool.Pool
+	keyed    *templatepg.Store
+	replaced *templatepg.Store
+	service  *environmenttemplates.Service
 }
 
 func newFixture(t *testing.T, pool *pgxpool.Pool) fixture {
@@ -42,7 +42,7 @@ func newFixture(t *testing.T, pool *pgxpool.Pool) fixture {
 	if err != nil {
 		t.Fatal(err)
 	}
-	return fixture{pool: pool, keyed: keyed, keyless: templatepg.New(pgunit.NewPool(pool), nil), service: service}
+	return fixture{pool: pool, keyed: keyed, replaced: templatepg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t)), service: service}
 }
 
 func (f fixture) create(t *testing.T, tenant string, in environmenttemplates.Input) environmenttemplates.Template {
@@ -172,12 +172,12 @@ func TestEmptyUpdateTouchesTimeWithoutKeyOrContents(t *testing.T) {
 		return contents
 	}
 	before := row()
-	if _, err := f.keyless.Update(t.Context(), uuid.NewString(), original.ID, environmenttemplates.Input{}); !errors.Is(err, environmenttemplates.ErrNotFound) {
+	if _, err := f.replaced.Update(t.Context(), uuid.NewString(), original.ID, environmenttemplates.Input{}); !errors.Is(err, environmenttemplates.ErrNotFound) {
 		t.Fatal("foreign empty update was admitted", err)
 	}
-	updated, err := f.keyless.Update(t.Context(), tenant, original.ID, environmenttemplates.Input{})
+	updated, err := f.replaced.Update(t.Context(), tenant, original.ID, environmenttemplates.Input{})
 	if err != nil || !updated.UpdatedAt.After(original.UpdatedAt) {
-		t.Fatal("empty update did not advance the timestamp without a key", err)
+		t.Fatal("empty update did not advance the timestamp under a replaced key", err)
 	}
 	original.UpdatedAt = updated.UpdatedAt
 	if !reflect.DeepEqual(updated, original) || !bytes.Equal(before, row()) {
@@ -201,9 +201,9 @@ func TestNetworkPolicyRoundTripAndReplacement(t *testing.T) {
 	}
 	created := f.create(t, tenant, environmenttemplates.Input{SetNetwork: true, NetworkAccess: "restricted", AllowedDomains: domains})
 	check(created, nil)
-	check(f.keyless.Get(ctx, tenant, created.ID))
+	check(f.replaced.Get(ctx, tenant, created.ID))
 	check(f.resolve(t, tenant, created.ID).Template, nil)
-	page, err := f.keyless.List(ctx, tenant, environmenttemplates.ListQuery{Limit: 1, Ascending: true})
+	page, err := f.replaced.List(ctx, tenant, environmenttemplates.ListQuery{Limit: 1, Ascending: true})
 	if err != nil || len(page.Templates) != 1 {
 		t.Fatal(page, err)
 	}
@@ -220,7 +220,7 @@ func TestNetworkPolicyRoundTripAndReplacement(t *testing.T) {
 		if _, err := f.service.Update(ctx, environmenttemplates.UpdateCommand{TenantID: tenant, TemplateID: created.ID, Input: in}); !errors.Is(err, environmenttemplates.ErrInvalidInput) {
 			t.Fatal("invalid policy replacement", err)
 		}
-		check(f.keyless.Get(ctx, tenant, created.ID))
+		check(f.replaced.Get(ctx, tenant, created.ID))
 	}
 	domains = []string{"other.example.com"}
 	check(f.update(t, tenant, created.ID, environmenttemplates.Input{SetNetwork: true, NetworkAccess: "restricted", AllowedDomains: domains}), nil)
@@ -237,7 +237,7 @@ func TestSetupSealedAndReplacedPerField(t *testing.T) {
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	setup := environmentconfig.Setup{Env: map[string]string{"SECRET": "template-env-canary"}, Commands: []environmentconfig.SetupCommand{{Command: "printf template-command-canary > result"}}, Packages: v1.EnvironmentPackages{NPM: []string{"is-number@7.0.0"}}}
 	template := f.create(t, tenant, environmenttemplates.Input{Setup: setup, SetEnv: true, SetCommands: true, SetPackages: true})
-	public, err := f.keyless.Get(t.Context(), tenant, template.ID)
+	public, err := f.replaced.Get(t.Context(), tenant, template.ID)
 	if err != nil || !reflect.DeepEqual(public.Packages.NPM, setup.Packages.NPM) {
 		t.Fatal("public metadata requires plaintext or key", err)
 	}
@@ -266,7 +266,7 @@ func TestInitialFilesSealedWithNoncanonicalIDs(t *testing.T) {
 	canary := []byte("private-initial-file-canary\x00\xff")
 	files := []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a/data", Data: canary}, {Type: "file_id", Path: "/workspace/b", FileID: "file-" + uuid.NewString()}}
 	template := f.create(t, tenant, environmenttemplates.Input{SetFiles: true, Files: files})
-	public, err := f.keyless.Get(t.Context(), tenant, template.ID)
+	public, err := f.replaced.Get(t.Context(), tenant, template.ID)
 	if err != nil || len(public.Files) != 2 || *public.Files[0].SizeBytes != int64(len(canary)) {
 		t.Fatal("public read depends on the key", err)
 	}
@@ -294,11 +294,11 @@ func TestSkillsAndPluginsSealedAndPreserved(t *testing.T) {
 	}
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	template := f.create(t, tenant, environmenttemplates.Input{SetSkills: true, SetPlugins: true, SetDirectories: true, Setup: setup})
-	public, err := f.keyless.Get(ctx, tenant, template.ID)
+	public, err := f.replaced.Get(ctx, tenant, template.ID)
 	if err != nil || len(public.Skills) != 1 || len(public.Plugins) != 1 || !reflect.DeepEqual(public.CapabilityDirectories, setup.CapabilityDirectories) {
 		t.Fatal("safe metadata without the key", err)
 	}
-	if page, err := f.keyless.List(ctx, tenant, environmenttemplates.ListQuery{Limit: 20}); err != nil || len(page.Templates) != 1 || len(page.Templates[0].Plugins) != 1 {
+	if page, err := f.replaced.List(ctx, tenant, environmenttemplates.ListQuery{Limit: 20}); err != nil || len(page.Templates) != 1 || len(page.Templates[0].Plugins) != 1 {
 		t.Fatal("list", err)
 	}
 	f.requireSealed(t, template.ID, "skill_contents", "skill-private-canary")
@@ -354,18 +354,15 @@ func TestUnstorableTextIsRejected(t *testing.T) {
 	}
 }
 
-func TestMissingKeyIsUnavailable(t *testing.T) {
+func TestReplacedKeyCannotResolve(t *testing.T) {
 	f := newFixture(t, pgtest.Open(t))
 	tenant := uuid.NewString()
 	setup := environmenttemplates.Input{Setup: environmentconfig.Setup{Env: map[string]string{"PRIVATE_SETUP": "env-canary"}}}
 	files := environmenttemplates.Input{SetFiles: true, Files: []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/input.txt", Data: []byte("file-canary")}}}
 	for _, in := range []environmenttemplates.Input{setup, files} {
-		if _, err := f.keyless.Create(t.Context(), tenant, in); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-			t.Fatal("confidential create without a key", err)
-		}
 		template := f.create(t, tenant, in)
-		if _, err := f.keyless.Resolve(t.Context(), tenant, template.ID); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-			t.Fatal("confidential resolve without a key", err)
+		if _, err := f.replaced.Resolve(t.Context(), tenant, template.ID); err == nil || errors.Is(err, environmenttemplates.ErrNotFound) || strings.Contains(err.Error(), "canary") {
+			t.Fatal("confidential resolve under a replaced key", err)
 		}
 	}
 }
@@ -387,10 +384,10 @@ func TestStoredPackagesRejected(t *testing.T) {
 	internal := func(err error) bool { return err != nil && !errors.Is(err, environmenttemplates.ErrInvalidInput) }
 	for _, value := range []string{`null`, `[]`, `["jq"]`} {
 		store(`{"npm":[],"python":[],"system":` + value + `}`)
-		if _, err := f.keyless.Get(ctx, tenant, template.ID); !internal(err) {
+		if _, err := f.replaced.Get(ctx, tenant, template.ID); !internal(err) {
 			t.Fatal("get did not fail internally on removed system packages", value, err)
 		}
-		if _, err := f.keyless.List(ctx, tenant, environmenttemplates.ListQuery{Limit: 1}); !internal(err) {
+		if _, err := f.replaced.List(ctx, tenant, environmenttemplates.ListQuery{Limit: 1}); !internal(err) {
 			t.Fatal("list did not fail internally on removed system packages", value, err)
 		}
 		if _, err := f.keyed.Resolve(ctx, tenant, template.ID); !internal(err) {
@@ -402,7 +399,7 @@ func TestStoredPackagesRejected(t *testing.T) {
 		t.Fatal("resolve accepted packages that fail validation", err)
 	}
 	store(`{"npm":["semver"],"python":["packaging"]}`)
-	if got, err := f.keyless.Get(ctx, tenant, template.ID); err != nil || !reflect.DeepEqual(got.Packages, v1.EnvironmentPackages{NPM: []string{"semver"}, Python: []string{"packaging"}}) {
+	if got, err := f.replaced.Get(ctx, tenant, template.ID); err != nil || !reflect.DeepEqual(got.Packages, v1.EnvironmentPackages{NPM: []string{"semver"}, Python: []string{"packaging"}}) {
 		t.Fatal("supported stored package managers rejected", got.Packages, err)
 	}
 }
diff --git a/services/core/internal/persistence/postgres/vaultpg/credentials_test.go b/services/core/internal/persistence/postgres/vaultpg/credentials_test.go
index a299087b4..a6516b503 100644
--- a/services/core/internal/persistence/postgres/vaultpg/credentials_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/credentials_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
@@ -23,10 +24,10 @@ func TestStaticCredentialsPersistEncryptedAndRemainScoped(t *testing.T) {
 	store, pool := openStore(t)
 	ctx := t.Context()
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
-	keyless := newService(t, pool, nil, nil)
+	replaced := newService(t, pool, pgtest.CredentialKey(t), nil)
 	var owned []vaults.Vault
 	for _, owner := range []string{tenant, tenant, foreignTenant} {
-		owned = append(owned, createVault(t, keyless, owner))
+		owned = append(owned, createVault(t, replaced, owner))
 	}
 	key, randomToken := make([]byte, 32), make([]byte, 32)
 	if _, err := rand.Read(key); err != nil {
@@ -60,9 +61,6 @@ func TestStaticCredentialsPersistEncryptedAndRemainScoped(t *testing.T) {
 		t.Fatal("separate creates reused a credential identity")
 	}
 	valid := vaults.CreateStaticCredential{TenantID: tenant, VaultID: owned[0].ID, Name: "Rejected", MCPServerURL: "https://mcp.example/tools", Token: opaque}
-	if _, err := keyless.CreateStaticCredential(ctx, valid); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("missing encryption key did not fail writes closed")
-	}
 	for _, target := range []struct{ tenant, vault string }{{tenant, owned[2].ID}, {foreignTenant, owned[0].ID}, {tenant, uuid.NewString()}, {tenant, "invalid"}} {
 		command := valid
 		command.TenantID, command.VaultID = target.tenant, target.vault
@@ -137,7 +135,7 @@ func TestStaticCredentialsPersistEncryptedAndRemainScoped(t *testing.T) {
 	}
 }
 
-func TestCredentialListFilteringOwnershipAndKeylessReconnect(t *testing.T) {
+func TestCredentialListFilteringOwnershipAndReplacedKeyReconnect(t *testing.T) {
 	store, pool := openStore(t)
 	ctx := t.Context()
 	tenant, foreign := uuid.NewString(), uuid.NewString()
@@ -255,7 +253,7 @@ func TestCredentialListFilteringOwnershipAndKeylessReconnect(t *testing.T) {
 	pool.Close()
 	reopened, pool := openStore(t)
 	if got := read(reopened, true, nil, 20); !reflect.DeepEqual(got, all) || snapshot() != before {
-		t.Fatal("keyless reads/restart changed metadata, classification or ciphertext")
+		t.Fatal("reads or a restart under a replaced key changed metadata, classification or ciphertext")
 	}
 }
 
@@ -400,7 +398,7 @@ func TestCredentialDeletionScopeBindingAndRestart(t *testing.T) {
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	key := bytes.Repeat([]byte{41}, 32)
 	service := newService(t, pool, newCipher(t, key), nil)
-	keyless := newService(t, pool, nil, nil)
+	replaced := newService(t, pool, pgtest.CredentialKey(t), nil)
 	vault, wrong := createVault(t, service, tenant), createVault(t, service, tenant)
 	original := createStatic(t, service, tenant, vault.ID, "original", "https://mcp.example/tools", "original-secret")
 	attached := []string{vault.ID}
@@ -417,12 +415,12 @@ func TestCredentialDeletionScopeBindingAndRestart(t *testing.T) {
 		{foreign, vault.ID, original.ID}, {tenant, wrong.ID, original.ID},
 		{tenant, vault.ID, uuid.NewString()}, {tenant, "invalid", original.ID}, {tenant, vault.ID, "invalid"},
 	} {
-		if _, err := remove(keyless, scope.tenant, scope.vault, scope.id); !errors.Is(err, vaults.ErrNotFound) {
+		if _, err := remove(replaced, scope.tenant, scope.vault, scope.id); !errors.Is(err, vaults.ErrNotFound) {
 			t.Fatal("foreign or invalid delete was accepted", err)
 		}
 	}
 	// An actual database write failure must leave the resource and token intact.
-	_, deletionErr := remove(newService(t, readOnlyPool(t, pool), nil, nil), tenant, vault.ID, original.ID)
+	_, deletionErr := remove(newService(t, readOnlyPool(t, pool), pgtest.CredentialKey(t), nil), tenant, vault.ID, original.ID)
 	if !isReadOnlyFailure(deletionErr) {
 		t.Fatal("failed mutation was accepted or translated", deletionErr)
 	}
@@ -432,12 +430,12 @@ func TestCredentialDeletionScopeBindingAndRestart(t *testing.T) {
 	if token, err := bearerToken(t.Context(), service, tenant, attached, selected[0]); err != nil || token != retained {
 		t.Fatal("rejected deletion changed the stored token")
 	}
-	// Delete without a key, even if the stored payload is damaged.
+	// Delete under a replaced key, even if the stored payload is damaged.
 	if _, err := pool.Exec(t.Context(), "UPDATE vault_credentials SET token_ciphertext=decode('00','hex') WHERE id=$1", original.ID); err != nil {
 		t.Fatal(err)
 	}
-	if id, err := remove(keyless, tenant, vault.ID, original.ID); err != nil || id != original.ID {
-		t.Fatal("keyless deletion failed", err)
+	if id, err := remove(replaced, tenant, vault.ID, original.ID); err != nil || id != original.ID {
+		t.Fatal("deletion under a replaced key failed", err)
 	}
 	var count int
 	if err := pool.QueryRow(t.Context(), "SELECT count(*) FROM vault_credentials WHERE id=$1", original.ID).Scan(&count); err != nil || count != 0 {
diff --git a/services/core/internal/persistence/postgres/vaultpg/fixture_test.go b/services/core/internal/persistence/postgres/vaultpg/fixture_test.go
index 6d23ff73e..853529a4d 100644
--- a/services/core/internal/persistence/postgres/vaultpg/fixture_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/fixture_test.go
@@ -18,11 +18,11 @@ import (
 )
 
 // openStore opens the shared test database, as a restarted Core would. The
-// Store has no credential key, which reads never need.
+// Store has the shared test key, which reads never need.
 func openStore(t *testing.T) (*vaultpg.Store, *pgxpool.Pool) {
 	t.Helper()
 	pool := pgtest.Open(t)
-	return vaultpg.New(pgunit.NewPool(pool), nil), pool
+	return vaultpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t)), pool
 }
 
 // readOnlyPool fails every write with a real PostgreSQL error.
@@ -54,8 +54,7 @@ func newCipher(t *testing.T, key []byte) *credentialcrypto.Cipher {
 	return cipher
 }
 
-// keyedStore is a new Store on pool; a nil cipher is a Core without a
-// credential key.
+// keyedStore is a new Store on pool under cipher.
 func keyedStore(pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) *vaultpg.Store {
 	return vaultpg.New(pgunit.NewPool(pool), cipher)
 }
diff --git a/services/core/internal/persistence/postgres/vaultpg/oauth_test.go b/services/core/internal/persistence/postgres/vaultpg/oauth_test.go
index 5b4c47efe..18ed72bc5 100644
--- a/services/core/internal/persistence/postgres/vaultpg/oauth_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/oauth_test.go
@@ -97,11 +97,11 @@ func TestOAuthCredentialMetadataEncryptionAndScope(t *testing.T) {
 	credential := f.create(t, input)
 	got, err := f.store.GetCredential(t.Context(), f.tenant, f.vault.ID, credential.ID)
 	if err != nil || !reflect.DeepEqual(got, credential) {
-		t.Fatal("keyless safe metadata changed", err)
+		t.Fatal("safe metadata changed", err)
 	}
 	page, err := f.store.ListCredentials(t.Context(), f.tenant, f.vault.ID, vaults.PageQuery{Limit: 20, Ascending: true})
 	if err != nil || len(page.Credentials) != 1 || !reflect.DeepEqual(page.Credentials[0], credential) {
-		t.Fatal("keyless listing failed", err)
+		t.Fatal("listing failed", err)
 	}
 	encoded, _ := json.Marshal(page)
 	var ciphertext []byte
@@ -137,13 +137,6 @@ func TestOAuthCredentialMetadataEncryptionAndScope(t *testing.T) {
 	if _, err := f.service.CreateOAuthCredential(t.Context(), foreign); !errors.Is(err, vaults.ErrNotFound) {
 		t.Fatal("foreign creation admitted")
 	}
-	keyless := f.otherService(t, nil, counting)
-	if _, err := keyless.CreateOAuthCredential(t.Context(), input); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("keyless creation admitted")
-	}
-	if token, err := f.token(t.Context(), keyless, credential); !errors.Is(err, credentialcrypto.ErrUnavailable) || token != "" {
-		t.Fatal("keyless execution admitted")
-	}
 	wrong := f.otherService(t, newCipher(t, bytes.Repeat([]byte{18}, 32)), counting)
 	if token, err := f.token(t.Context(), wrong, credential); err == nil || token != "" {
 		t.Fatal("wrong key executed")
diff --git a/services/core/internal/persistence/postgres/vaultpg/seal.go b/services/core/internal/persistence/postgres/vaultpg/seal.go
index 58e73e2d0..0ea527470 100644
--- a/services/core/internal/persistence/postgres/vaultpg/seal.go
+++ b/services/core/internal/persistence/postgres/vaultpg/seal.go
@@ -32,9 +32,6 @@ type oauthPayload struct {
 
 // sealStatic seals a static_bearer token.
 func (s *Store) sealStatic(scope credentialcrypto.Binding, token string) ([]byte, error) {
-	if s.cipher == nil {
-		return nil, credentialcrypto.ErrUnavailable
-	}
 	ciphertext, err := s.cipher.Seal([]byte(token), scope)
 	if err != nil {
 		return nil, errors.New("credential encryption failed")
@@ -44,9 +41,6 @@ func (s *Store) sealStatic(scope credentialcrypto.Binding, token string) ([]byte
 
 // openStatic opens a static_bearer token.
 func (s *Store) openStatic(scope credentialcrypto.Binding, ciphertext []byte) (string, error) {
-	if s.cipher == nil {
-		return "", credentialcrypto.ErrUnavailable
-	}
 	plaintext, err := s.cipher.Open(ciphertext, scope)
 	if err != nil {
 		return "", errors.New("MCP credential decryption failed")
@@ -57,9 +51,6 @@ func (s *Store) openStatic(scope credentialcrypto.Binding, ciphertext []byte) (s
 // sealOAuth encodes the grant's metadata for its column and seals the whole
 // grant.
 func (s *Store) sealOAuth(scope credentialcrypto.Binding, grant vaults.OAuthGrant) (metadata, ciphertext []byte, err error) {
-	if s.cipher == nil {
-		return nil, nil, credentialcrypto.ErrUnavailable
-	}
 	metadata, err = json.Marshal(grant.Metadata)
 	if err != nil {
 		return nil, nil, errors.New("credential encoding failed")
@@ -79,9 +70,6 @@ func (s *Store) sealOAuth(scope credentialcrypto.Binding, grant vaults.OAuthGran
 // openOAuth opens a grant and authenticates the stored metadata against the
 // sealed copy.
 func (s *Store) openOAuth(scope credentialcrypto.Binding, stored *vaults.OAuthMetadata, ciphertext []byte) (vaults.OAuthGrant, error) {
-	if s.cipher == nil {
-		return vaults.OAuthGrant{}, credentialcrypto.ErrUnavailable
-	}
 	plaintext, err := s.cipher.Open(ciphertext, scope)
 	if err != nil {
 		return vaults.OAuthGrant{}, errors.New("OAuth credential decryption failed")
diff --git a/services/core/internal/persistence/postgres/vaultpg/seal_test.go b/services/core/internal/persistence/postgres/vaultpg/seal_test.go
index e04ff428c..d77172ab8 100644
--- a/services/core/internal/persistence/postgres/vaultpg/seal_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/seal_test.go
@@ -11,17 +11,17 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
 // The Store seals to the canonical binding Core has always used, so secrets
-// sealed before the Store owned the key still open. A missing key is
-// credentialcrypto.ErrUnavailable, and a wrong binding is a decryption
-// failure, never a missing key, row or token.
+// sealed before the Store owned the key still open. A replaced key or a wrong
+// binding is a decryption failure, never a missing row or token.
 func TestCredentialSecretsKeepTheirSealedFormat(t *testing.T) {
 	_, pool := openStore(t)
 	cipher := newCipher(t, bytes.Repeat([]byte{61}, 32))
-	service, keyless := newService(t, pool, cipher, nil), newService(t, pool, nil, nil)
+	service, replaced := newService(t, pool, cipher, nil), newService(t, pool, pgtest.CredentialKey(t), nil)
 	tenant, url := uuid.NewString(), "https://mcp.example/tools"
 	vault := createVault(t, service, tenant)
 	expiry := time.Now().Add(time.Hour).UTC().Format(time.RFC3339Nano)
@@ -77,14 +77,14 @@ func TestCredentialSecretsKeepTheirSealedFormat(t *testing.T) {
 	write(static, []byte("old-static"), scope(static))
 	write(oauth, legacy, scope(oauth))
 	for _, tc := range []struct {
-		credential vaults.Credential
-		want       string
-	}{{static, "old-static"}, {oauth, "old-access"}} {
+		credential  vaults.Credential
+		want, fails string
+	}{{static, "old-static", "MCP credential decryption failed"}, {oauth, "old-access", "OAuth credential decryption failed"}} {
 		if got, err := token(service, tc.credential); err != nil || got != tc.want {
 			t.Fatal("a secret sealed before the move did not open", err)
 		}
-		if got, err := token(keyless, tc.credential); !errors.Is(err, credentialcrypto.ErrUnavailable) || got != "" {
-			t.Fatal("a keyless Store opened a secret", err)
+		if got, err := token(replaced, tc.credential); err == nil || err.Error() != tc.fails || got != "" {
+			t.Fatal("a replaced key opened a secret", err)
 		}
 	}
 	if _, err := service.UpdateOAuthCredential(t.Context(), vaults.UpdateOAuthCredential{TenantID: tenant, VaultID: vault.ID, CredentialID: oauth.ID, AccessToken: ptr("patched-access")}); err != nil {
@@ -93,21 +93,11 @@ func TestCredentialSecretsKeepTheirSealedFormat(t *testing.T) {
 	if grant := readGrant(t, pool, cipher, tenant, oauth); grant.AccessToken != "patched-access" || grant.RefreshToken != "refresh" {
 		t.Fatal("the replaced grant lost its material")
 	}
-	// Without a key, every write that seals fails first, before a malformed Vault.
 	for _, create := range []func(*vaults.Service, string) (vaults.Credential, error){createToken, createOAuth} {
-		if _, err := create(keyless, "not-a-vault"); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-			t.Fatal("a keyless creation did not fail closed", err)
-		}
 		if _, err := create(service, "not-a-vault"); !errors.Is(err, vaults.ErrNotFound) {
 			t.Fatal("a malformed Vault named one", err)
 		}
 	}
-	if _, err := keyless.UpdateStaticCredential(t.Context(), vaults.UpdateStaticCredential{TenantID: tenant, VaultID: vault.ID, CredentialID: static.ID, Token: "rejected"}); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("a keyless replacement did not fail closed", err)
-	}
-	if _, err := keyless.UpdateOAuthCredential(t.Context(), vaults.UpdateOAuthCredential{TenantID: tenant, VaultID: vault.ID, CredentialID: oauth.ID, AccessToken: ptr("rejected")}); !errors.Is(err, credentialcrypto.ErrUnavailable) {
-		t.Fatal("a keyless OAuth replacement did not fail closed", err)
-	}
 	// A secret sealed to another Credential or destination does not open.
 	wrongID, wrongDestination := scope(static), scope(oauth)
 	wrongID.CredentialID = oauth.ID
diff --git a/services/core/internal/persistence/postgres/vaultpg/selection_test.go b/services/core/internal/persistence/postgres/vaultpg/selection_test.go
index 81f0a658e..449057c61 100644
--- a/services/core/internal/persistence/postgres/vaultpg/selection_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/selection_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
@@ -22,7 +22,7 @@ func TestMCPCredentialSelectionAndScopedDecryption(t *testing.T) {
 		t.Fatal(err)
 	}
 	service := newService(t, pool, newCipher(t, key), nil)
-	keyless := newService(t, pool, nil, nil)
+	replaced := newService(t, pool, pgtest.CredentialKey(t), nil)
 	var owned []vaults.Vault
 	for _, owner := range []string{tenant, tenant, foreign} {
 		owned = append(owned, createVault(t, service, owner))
@@ -39,8 +39,8 @@ func TestMCPCredentialSelectionAndScopedDecryption(t *testing.T) {
 	selectFor := func(service *vaults.Service, tenant string, attached []string, requests []vaults.MCPCredentialRequest) ([]vaults.MCPCredentialBinding, error) {
 		return service.ResolveMCPCredentials(t.Context(), vaults.ResolveMCPCredentials{TenantID: tenant, VaultIDs: attached, Requests: requests})
 	}
-	// Selection reads metadata only, so a keyless Core can select.
-	bindings, err := selectFor(keyless, tenant, attached, requests)
+	// Selection reads metadata only, so it works under a replaced key.
+	bindings, err := selectFor(replaced, tenant, attached, requests)
 	if err != nil || len(bindings) != 2 || bindings[0].CredentialID != first.ID || bindings[0].AuthType != vaults.AuthStaticBearer || bindings[1].CredentialID != "" {
 		t.Fatal("metadata selection or frozen anonymous decision differs", err)
 	}
@@ -49,11 +49,11 @@ func TestMCPCredentialSelectionAndScopedDecryption(t *testing.T) {
 		t.Fatal("private binding contains secret material")
 	}
 	second := create(owned[1])
-	if _, err := selectFor(keyless, tenant, attached, requests); !isSelectionError(err, true, "multiple attached vault credentials match MCP server_url "+destination+"; specify credential_id") {
+	if _, err := selectFor(replaced, tenant, attached, requests); !isSelectionError(err, true, "multiple attached vault credentials match MCP server_url "+destination+"; specify credential_id") {
 		t.Fatal("ambiguous selection was admitted", err)
 	}
 	requests[0].CredentialID = &second.ID
-	explicit, err := selectFor(keyless, tenant, attached, requests)
+	explicit, err := selectFor(replaced, tenant, attached, requests)
 	if err != nil || explicit[0].CredentialID != second.ID || requests[1].CredentialID != nil {
 		t.Fatal("explicit selection did not disambiguate", err)
 	}
@@ -72,25 +72,21 @@ func TestMCPCredentialSelectionAndScopedDecryption(t *testing.T) {
 		{tenant, []string{owned[0].ID, owned[2].ID}, first.ID, destination, ""},
 		{tenant, []string{uuid.NewString()}, first.ID, destination, ""},
 	} {
-		_, err := selectFor(keyless, tc.owner, tc.vaults, []vaults.MCPCredentialRequest{{ServerLabel: "tools", ServerURL: tc.url, CredentialID: &tc.id}})
+		_, err := selectFor(replaced, tc.owner, tc.vaults, []vaults.MCPCredentialRequest{{ServerLabel: "tools", ServerURL: tc.url, CredentialID: &tc.id}})
 		if tc.message == "" && !errors.Is(err, vaults.ErrNotFound) || tc.message != "" && !isSelectionError(err, false, tc.message) {
 			t.Fatal("unowned, unattached or wrong-destination selection was admitted", err)
 		}
 	}
-	if _, err := selectFor(keyless, tenant, nil, []vaults.MCPCredentialRequest{{ServerLabel: "tools", ServerURL: destination, CredentialID: &first.ID}}); !isSelectionError(err, false, "MCP credential_id requires an attached vault") {
+	if _, err := selectFor(replaced, tenant, nil, []vaults.MCPCredentialRequest{{ServerLabel: "tools", ServerURL: destination, CredentialID: &first.ID}}); !isSelectionError(err, false, "MCP credential_id requires an attached vault") {
 		t.Fatal("a reference without attachments was admitted", err)
 	}
 	pool.Close()
 	store, pool = openStore(t)
 	service = newService(t, pool, newCipher(t, bytes.Clone(key)), nil)
-	keyless = newService(t, pool, nil, nil)
 	got, err := bearerToken(t.Context(), service, tenant, attached, bindings[0])
 	if err != nil || got != token {
 		t.Fatal("frozen selection or opaque bytes changed across restart", err)
 	}
-	if got, err := bearerToken(t.Context(), keyless, tenant, attached, bindings[0]); !errors.Is(err, credentialcrypto.ErrUnavailable) || got != "" {
-		t.Fatal("missing key did not fail execution closed")
-	}
 	key[0] ^= 1
 	if got, err := bearerToken(t.Context(), newService(t, pool, newCipher(t, key), nil), tenant, attached, bindings[0]); err == nil || got != "" || strings.Contains(err.Error(), token) {
 		t.Fatal("wrong key leaked or decrypted a credential")
diff --git a/services/core/internal/persistence/postgres/vaultpg/vaultpg.go b/services/core/internal/persistence/postgres/vaultpg/vaultpg.go
index f8863309e..1adb7e834 100644
--- a/services/core/internal/persistence/postgres/vaultpg/vaultpg.go
+++ b/services/core/internal/persistence/postgres/vaultpg/vaultpg.go
@@ -30,9 +30,7 @@ type Store struct {
 
 var _ vaults.Storage = (*Store)(nil)
 
-// New returns a Store. Without a credential key (cipher nil), operations that
-// seal or open a secret fail with credentialcrypto.ErrUnavailable; Vaults,
-// Credential metadata, selection and deletion keep working.
+// New returns a Store that seals and opens secrets with cipher.
 func New(pool *pgunit.Pool, cipher *credentialcrypto.Cipher) *Store {
 	return &Store{pool: pool, cipher: cipher}
 }
diff --git a/services/core/internal/persistence/postgres/vaultpg/vaults_test.go b/services/core/internal/persistence/postgres/vaultpg/vaults_test.go
index f95282651..6a7ce4da8 100644
--- a/services/core/internal/persistence/postgres/vaultpg/vaults_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/vaults_test.go
@@ -13,13 +13,14 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 )
 
 func TestVaultsPersistAndStayTenantScoped(t *testing.T) {
 	store, pool := openStore(t)
-	service := newService(t, pool, nil, nil)
+	service := newService(t, pool, pgtest.CredentialKey(t), nil)
 	ctx := t.Context()
 	tenantA, tenantB := uuid.NewString(), uuid.NewString()
 	before := time.Now().Add(-time.Second)
@@ -67,7 +68,7 @@ func TestVaultsPersistAndStayTenantScoped(t *testing.T) {
 
 func TestVaultsRejectInvalidInputWithoutWrites(t *testing.T) {
 	store, pool := openStore(t)
-	service := newService(t, pool, nil, nil)
+	service := newService(t, pool, pgtest.CredentialKey(t), nil)
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	for _, name := range []string{"", strings.Repeat("x", 257), strings.Repeat("é", 129), string([]byte{0xff})} {
@@ -97,7 +98,7 @@ func TestVaultsRejectInvalidInputWithoutWrites(t *testing.T) {
 
 func TestVaultListFilteringPaginationAndReconnect(t *testing.T) {
 	store, pool := openStore(t)
-	service := newService(t, pool, nil, nil)
+	service := newService(t, pool, pgtest.CredentialKey(t), nil)
 	ctx := t.Context()
 	tenant, other := uuid.NewString(), uuid.NewString()
 	empty, err := store.ListVaults(ctx, tenant, vaults.PageQuery{Limit: 20})
@@ -206,7 +207,7 @@ func TestVaultDeletionCascadeBindingAndRestart(t *testing.T) {
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	key := bytes.Repeat([]byte{43}, 32)
 	service := newService(t, pool, newCipher(t, key), nil)
-	keyless := newService(t, pool, nil, nil)
+	replaced := newService(t, pool, pgtest.CredentialKey(t), nil)
 	vault, retained, empty := createVault(t, service, tenant), createVault(t, service, tenant), createVault(t, service, tenant)
 	original := createStatic(t, service, tenant, vault.ID, "original", "https://mcp.example/tools", "original-secret")
 	attached := []string{vault.ID, retained.ID}
@@ -220,11 +221,11 @@ func TestVaultDeletionCascadeBindingAndRestart(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, scope := range []struct{ tenant, id string }{{foreign, vault.ID}, {tenant, uuid.NewString()}, {tenant, "invalid"}, {"invalid", vault.ID}} {
-		if _, err := keyless.DeleteVault(t.Context(), vaults.DeleteVault{TenantID: scope.tenant, VaultID: scope.id}); !errors.Is(err, vaults.ErrNotFound) {
+		if _, err := replaced.DeleteVault(t.Context(), vaults.DeleteVault{TenantID: scope.tenant, VaultID: scope.id}); !errors.Is(err, vaults.ErrNotFound) {
 			t.Fatal("foreign or invalid deletion was accepted", err)
 		}
 	}
-	_, deletionErr := newService(t, readOnlyPool(t, pool), nil, nil).DeleteVault(t.Context(), vaults.DeleteVault{TenantID: tenant, VaultID: vault.ID})
+	_, deletionErr := newService(t, readOnlyPool(t, pool), pgtest.CredentialKey(t), nil).DeleteVault(t.Context(), vaults.DeleteVault{TenantID: tenant, VaultID: vault.ID})
 	if !isReadOnlyFailure(deletionErr) {
 		t.Fatal("failed mutation was accepted or translated", deletionErr)
 	}
@@ -259,8 +260,8 @@ func TestVaultDeletionCascadeBindingAndRestart(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, target := range []vaults.Vault{empty, vault} {
-		if id, err := keyless.DeleteVault(t.Context(), vaults.DeleteVault{TenantID: tenant, VaultID: target.ID}); err != nil || id != target.ID {
-			t.Fatal("keyless deletion failed", err)
+		if id, err := replaced.DeleteVault(t.Context(), vaults.DeleteVault{TenantID: tenant, VaultID: target.ID}); err != nil || id != target.ID {
+			t.Fatal("deletion under a replaced key failed", err)
 		}
 	}
 	if err := pool.QueryRow(t.Context(), "SELECT (SELECT count(*) FROM vaults WHERE id=$1)+(SELECT count(*) FROM vault_credentials WHERE vault_id=$1)", vault.ID).Scan(&count); err != nil || count != 0 {
diff --git a/services/core/internal/processconfig/config.go b/services/core/internal/processconfig/config.go
index eb5eb0117..23ab40c92 100644
--- a/services/core/internal/processconfig/config.go
+++ b/services/core/internal/processconfig/config.go
@@ -44,17 +44,15 @@ const (
 type Config struct {
 	// Addr is OAC_ADDR, the listener address.
 	Addr string
-	// PublicOrigin is OAC_PUBLIC_URL. Nil disables the Runtime gateway and
-	// the execution Worker.
-	PublicOrigin *deployment.PublicOrigin
+	// PublicOrigin is OAC_PUBLIC_URL.
+	PublicOrigin deployment.PublicOrigin
 	// DatabaseURL is OAC_DATABASE_URL with the password from
 	// OAC_DATABASE_PASSWORD_FILE.
 	DatabaseURL string
-	// InstallationID comes from OAC_INSTALLATION_ID_FILE. Empty leaves the
-	// sandbox deployment and node routes off.
+	// InstallationID comes from OAC_INSTALLATION_ID_FILE.
 	InstallationID string
-	// CredentialKey seals stored credentials. Nil when
-	// OAC_CREDENTIAL_KEY_FILE is unset.
+	// CredentialKey seals stored credentials; it comes from
+	// OAC_CREDENTIAL_KEY_FILE.
 	CredentialKey *credentialcrypto.Cipher
 	// CoreKeys authenticates the Core key from OAC_CORE_KEY_DIGESTS_FILE.
 	CoreKeys             *api.DeploymentAuthenticator
@@ -101,7 +99,7 @@ type runtimeHistoryFile struct {
 }
 
 // Load reads and validates the process environment. An unset or empty
-// variable selects its default.
+// optional variable selects its default.
 func Load() (Config, error) {
 	var c Config
 	var err error
@@ -109,12 +107,12 @@ func Load() (Config, error) {
 		return Config{}, err
 	}
 	c.Addr = cmp.Or(os.Getenv("OAC_ADDR"), defaultAddr)
-	if value := os.Getenv("OAC_PUBLIC_URL"); value != "" {
-		origin, err := deployment.NewPublicOrigin(value)
-		if err != nil {
-			return Config{}, configError("OAC_PUBLIC_URL must be a canonical http or https origin without path, credentials, query or fragment, such as https://core.example")
-		}
-		c.PublicOrigin = &origin
+	value := os.Getenv("OAC_PUBLIC_URL")
+	if value == "" {
+		return Config{}, configError("OAC_PUBLIC_URL is required; applications, nodes and sandboxes reach Core at this origin")
+	}
+	if c.PublicOrigin, err = deployment.NewPublicOrigin(value); err != nil {
+		return Config{}, configError("OAC_PUBLIC_URL must be a canonical http or https origin without path, credentials, query or fragment, such as https://core.example")
 	}
 	if c.DatabaseURL, err = databaseurl.FromEnvironment(); err != nil {
 		return Config{}, err
@@ -125,9 +123,6 @@ func Load() (Config, error) {
 	if c.InstallationID, err = installationID(); err != nil {
 		return Config{}, err
 	}
-	if c.InstallationID != "" && c.PublicOrigin == nil {
-		return Config{}, configError("OAC_INSTALLATION_ID_FILE requires OAC_PUBLIC_URL, the origin nodes and sandboxes use to reach Core")
-	}
 	if c.CredentialKey, err = credentialKey(); err != nil {
 		return Config{}, err
 	}
@@ -163,10 +158,6 @@ func Load() (Config, error) {
 // Settings projects the configuration that GET /core/v1/installation
 // reports. Sensitive file settings report only whether they are configured.
 func (c Config) Settings() []api.InstallationSetting {
-	var public any
-	if c.PublicOrigin != nil {
-		public = c.PublicOrigin.String()
-	}
 	format := c.Log.Format
 	if format == "" {
 		format = "auto"
@@ -176,7 +167,7 @@ func (c Config) Settings() []api.InstallationSetting {
 		origins = []string{}
 	}
 	return []api.InstallationSetting{
-		setting("public_url", public, nil, []string{"core", "web"}),
+		setting("public_url", c.PublicOrigin.String(), nil, []string{"core", "web"}),
 		setting("log.level", strings.ToLower(c.Log.Level.String()), "info", []string{"core", "web"}),
 		setting("log.format", format, "auto", []string{"core", "web"}),
 		setting("log.add_source", c.Log.AddSource, false, []string{"core", "web"}),
@@ -213,7 +204,7 @@ func sensitive(key string, configured bool, restarts []string) api.InstallationS
 func installationID() (string, error) {
 	path := os.Getenv("OAC_INSTALLATION_ID_FILE")
 	if path == "" {
-		return "", nil
+		return "", configError("OAC_INSTALLATION_ID_FILE is required; it names the file that holds this installation's ID")
 	}
 	raw, err := os.ReadFile(path)
 	if err != nil {
@@ -229,7 +220,7 @@ func installationID() (string, error) {
 func credentialKey() (*credentialcrypto.Cipher, error) {
 	path := os.Getenv("OAC_CREDENTIAL_KEY_FILE")
 	if path == "" {
-		return nil, nil
+		return nil, configError("OAC_CREDENTIAL_KEY_FILE is required; Core seals stored credentials with this key")
 	}
 	content, err := os.ReadFile(path)
 	if err != nil {
diff --git a/services/core/internal/processconfig/config_test.go b/services/core/internal/processconfig/config_test.go
index d66edb2bc..0c535ab9b 100644
--- a/services/core/internal/processconfig/config_test.go
+++ b/services/core/internal/processconfig/config_test.go
@@ -23,11 +23,16 @@ func required(t *testing.T) func(name, content string) string {
 		}
 		return path
 	}
+	t.Setenv("OAC_PUBLIC_URL", "https://core.example")
 	t.Setenv("OAC_DATABASE_URL", "postgres://core@database/core")
+	t.Setenv("OAC_INSTALLATION_ID_FILE", write("installation.id", testInstallationID+"\n"))
+	t.Setenv("OAC_CREDENTIAL_KEY_FILE", write("credential.key", base64.StdEncoding.EncodeToString(bytes.Repeat([]byte{0x91}, 32))+"\n"))
 	t.Setenv("OAC_CORE_KEY_DIGESTS_FILE", write("digests.json", `["`+strings.Repeat("ab", 32)+`"]`))
 	return write
 }
 
+const testInstallationID = "8c5f4f5e-2c55-4c43-9a49-7f2f3f2d1d10"
+
 // rejects asserts that Load fails, names variable and does not echo secret.
 func rejects(t *testing.T, variable, secret string) {
 	t.Helper()
@@ -43,7 +48,7 @@ func TestLoadAppliesDefaults(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if c.Addr != "127.0.0.1:8091" || c.PublicOrigin != nil || c.InstallationID != "" || c.CredentialKey != nil || c.CoreKeys == nil ||
+	if c.Addr != "127.0.0.1:8091" || c.PublicOrigin.String() != "https://core.example" || c.InstallationID != testInstallationID || c.CredentialKey == nil || c.CoreKeys == nil ||
 		c.ExecutionConcurrency != 4 || c.DefaultHarness != "codex" || strings.Join(c.Harnesses, ",") != "claude_sdk,codex,mcode" ||
 		c.WriteAuditRetention != 90*24*time.Hour || c.OAuthTrustedOrigins != nil || c.NativeInstallers != "" || c.ProviderPaths.StateRoot != "/state" {
 		t.Fatalf("%+v", c)
@@ -59,11 +64,12 @@ func TestLoadAppliesDefaults(t *testing.T) {
 
 func TestLoadRejectsInvalidValuesWithoutEchoingThem(t *testing.T) {
 	write := required(t)
-	t.Setenv("OAC_DATABASE_URL", "")
-	rejects(t, "OAC_DATABASE_URL", "")
-	required(t)
-	t.Setenv("OAC_CORE_KEY_DIGESTS_FILE", "")
-	rejects(t, "OAC_CORE_KEY_DIGESTS_FILE", "")
+	for _, variable := range []string{"OAC_PUBLIC_URL", "OAC_DATABASE_URL", "OAC_INSTALLATION_ID_FILE", "OAC_CREDENTIAL_KEY_FILE", "OAC_CORE_KEY_DIGESTS_FILE"} {
+		t.Run(variable+" missing", func(t *testing.T) {
+			t.Setenv(variable, "")
+			rejects(t, variable, "")
+		})
+	}
 	t.Setenv("OAC_CORE_KEY_DIGESTS_FILE", write("bad-digests.json", `["synthetic-secret"]`))
 	rejects(t, "OAC_CORE_KEY_DIGESTS_FILE", "synthetic-secret")
 	required(t)
@@ -75,8 +81,8 @@ func TestLoadRejectsInvalidValuesWithoutEchoingThem(t *testing.T) {
 		"OAC_WRITE_AUDIT_RETENTION": "synthetic-secret",
 		"OAC_OAUTH_TRUSTED_ORIGINS": "https://synthetic-secret.example/token",
 		"OAC_LOG_LEVEL":             "verbose",
-		"OAC_INSTALLATION_ID_FILE":  write("installation.id", "synthetic-secret"),
-		"OAC_CREDENTIAL_KEY_FILE":   write("credential.key", "synthetic-secret"),
+		"OAC_INSTALLATION_ID_FILE":  write("bad.id", "synthetic-secret"),
+		"OAC_CREDENTIAL_KEY_FILE":   write("bad.key", "synthetic-secret"),
 		"OAC_HISTORY_SETTINGS_FILE": write("history.json", `{"secret":"synthetic-secret"}`),
 	} {
 		t.Run(variable, func(t *testing.T) {
@@ -84,12 +90,6 @@ func TestLoadRejectsInvalidValuesWithoutEchoingThem(t *testing.T) {
 			rejects(t, variable, "synthetic-secret")
 		})
 	}
-	t.Setenv("OAC_INSTALLATION_ID_FILE", write("valid.id", "8c5f4f5e-2c55-4c43-9a49-7f2f3f2d1d10\n"))
-	rejects(t, "OAC_PUBLIC_URL", "")
-	t.Setenv("OAC_PUBLIC_URL", "https://core.example")
-	if c, err := Load(); err != nil || c.InstallationID != "8c5f4f5e-2c55-4c43-9a49-7f2f3f2d1d10" {
-		t.Fatal(c.InstallationID, err)
-	}
 }
 
 func TestPublicURLMustBeACanonicalOrigin(t *testing.T) {
@@ -151,13 +151,6 @@ func TestOAuthTrustedOrigins(t *testing.T) {
 
 func TestCredentialKey(t *testing.T) {
 	write := required(t)
-	t.Setenv("OAC_CREDENTIAL_KEY_FILE", filepath.Join(t.TempDir(), "missing.key"))
-	rejects(t, "OAC_CREDENTIAL_KEY_FILE", "")
-	for _, content := range []string{"", base64.StdEncoding.EncodeToString(make([]byte, 31))} {
-		t.Setenv("OAC_CREDENTIAL_KEY_FILE", write("short.key", content))
-		rejects(t, "OAC_CREDENTIAL_KEY_FILE", "")
-	}
-	t.Setenv("OAC_CREDENTIAL_KEY_FILE", write("credential.key", base64.StdEncoding.EncodeToString(bytes.Repeat([]byte{0x91}, 32))+"\n"))
 	first, err := Load()
 	if err != nil {
 		t.Fatal(err)
@@ -174,6 +167,12 @@ func TestCredentialKey(t *testing.T) {
 	if got, err := reopened.CredentialKey.Open(sealed, binding); err != nil || string(got) != "opaque storage test" {
 		t.Fatal("persisted key did not recover ciphertext", err)
 	}
+	t.Setenv("OAC_CREDENTIAL_KEY_FILE", filepath.Join(t.TempDir(), "missing.key"))
+	rejects(t, "OAC_CREDENTIAL_KEY_FILE", "")
+	for _, content := range []string{"", base64.StdEncoding.EncodeToString(make([]byte, 31))} {
+		t.Setenv("OAC_CREDENTIAL_KEY_FILE", write("short.key", content))
+		rejects(t, "OAC_CREDENTIAL_KEY_FILE", "")
+	}
 }
 
 func TestRuntimeHistoryFile(t *testing.T) {
@@ -207,7 +206,6 @@ func TestRuntimeHistoryFile(t *testing.T) {
 
 func TestSettingsReportEffectiveValuesAndHideHistory(t *testing.T) {
 	write := required(t)
-	t.Setenv("OAC_PUBLIC_URL", "https://core.example")
 	t.Setenv("OAC_EXECUTION_CONCURRENCY", "8")
 	t.Setenv("OAC_LOG_LEVEL", "warn")
 	t.Setenv("OAC_WRITE_AUDIT_RETENTION", "1440m")
diff --git a/services/core/internal/runtimeenrollment/connection.go b/services/core/internal/runtimeenrollment/connection.go
index 8cbb2b0f6..7bebb425f 100644
--- a/services/core/internal/runtimeenrollment/connection.go
+++ b/services/core/internal/runtimeenrollment/connection.go
@@ -102,9 +102,6 @@ func RuntimeConnected(ctx context.Context, s ConnectionStore, registry *runtimeg
 	if credential.CredentialHash != digest {
 		return false, sessions.ErrDeviceBindingConflict
 	}
-	if registry == nil {
-		return false, nil
-	}
 	peer, err := registry.LookupDevice(bound.ID)
 	if errors.Is(err, runtimegateway.ErrDeviceNotRegistered) {
 		return false, nil
diff --git a/services/core/internal/runtimeenrollment/connection_test.go b/services/core/internal/runtimeenrollment/connection_test.go
index e10519f92..4db7b557e 100644
--- a/services/core/internal/runtimeenrollment/connection_test.go
+++ b/services/core/internal/runtimeenrollment/connection_test.go
@@ -111,7 +111,7 @@ func (s *liveConnectionStore) GetDeviceCredential(context.Context, string) (runt
 	return runtimedevice.Credential{ID: "device", WorkspaceID: "tenant", Type: runtimedevice.RuntimeTypeAgentDaemon, CredentialHash: s.digest}, true, nil
 }
 func TestRuntimeConnectedCurrentAuthorityAfterPeer(t *testing.T) {
-	for _, name := range []string{"connected", "rotated before read", "revoked after peer", "device revoked after peer", "retired after peer", "store error after peer", "device store error after peer", "closed", "no registry"} {
+	for _, name := range []string{"connected", "rotated before read", "revoked after peer", "device revoked after peer", "retired after peer", "store error after peer", "device store error after peer", "closed"} {
 		t.Run(name, func(t *testing.T) {
 			digest := runtimedevice.HashCredential("fixture-key")
 			s := &liveConnectionStore{digest: digest}
@@ -153,8 +153,6 @@ func TestRuntimeConnectedCurrentAuthorityAfterPeer(t *testing.T) {
 				wantErr = s.credentialRecheckError
 			case "closed":
 				peer.Close("closed before observation")
-			case "no registry":
-				registry = nil
 			}
 			connected, err := RuntimeConnected(t.Context(), s, registry, "environment", digest)
 			if connected != want || !errors.Is(err, wantErr) {
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index 12b338067..68624d30c 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -98,7 +98,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 	// The deployment reaches the registered configuration only through the
 	// registry it is built with.
 	deployments := func() *deployment.Service {
-		storage := deploymentpg.New(pgunit.NewPool(pool), nil)
+		storage := deploymentpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
 		rules, err := placement.NewRules(registry, "")
 		if err != nil {
 			t.Fatal(err)
@@ -115,7 +115,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer lease.Close(context.Background())
-	changes, err := deployment.NewExecutionOperations(service, deploymentpg.NewExecution(lease, nil))
+	changes, err := deployment.NewExecutionOperations(service, deploymentpg.NewExecution(lease, pgtest.CredentialKey(t)))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -151,14 +151,14 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		Environments:    struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, Admin: struct{ api.Admin }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{},
 		ExecutorConnections: struct{ api.ExecutorConnections }{},
 		Metrics:             struct{ api.Metrics }{}, RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
-		Execution: &api.Execution{
+		Execution: api.Execution{
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
 			SessionAdmission: struct{ api.SessionAdmission }{},
 			InputAdmission:   struct{ api.InputAdmission }{},
 			SessionArchive:   struct{ api.SessionArchive }{},
 			Workspaces:       struct{ api.EnvironmentWorkspaces }{},
 		},
-		Sandboxes: &api.Sandboxes{Deployment: service, NodeAllocations: deploymentpg.New(pgunit.NewPool(pool), nil), DeploymentChanges: leaseSetup{t: t, changes: changes, installation: installation},
+		Sandboxes: api.Sandboxes{Deployment: service, NodeAllocations: deploymentpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t)), DeploymentChanges: leaseSetup{t: t, changes: changes, installation: installation},
 			DeploymentReset: leaseSetup{t: t, changes: changes, installation: installation}, ConfigurationDiscovery: struct{ api.ConfigurationDiscovery }{}},
 	})
 	if err != nil {
diff --git a/services/core/internal/sessions/creation.go b/services/core/internal/sessions/creation.go
index a970db327..f53c6fca9 100644
--- a/services/core/internal/sessions/creation.go
+++ b/services/core/internal/sessions/creation.go
@@ -15,7 +15,6 @@ import (
 	"github.com/google/uuid"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
@@ -29,7 +28,6 @@ import (
 type CreationStorage interface {
 	// FingerprintProviderKey returns the keyed fingerprint of a model
 	// provider key, so retry identities tell keys apart without hashing a key.
-	// Without a credential key it is credentialcrypto.ErrUnavailable.
 	FingerprintProviderKey(secret string) (string, error)
 	// WithCreation runs apply in one pooled transaction and commits only when
 	// apply returns nil. A malformed tenant is ErrInvalidInput.
@@ -534,12 +532,6 @@ func (s *Service) FindSessionCreation(ctx context.Context, tenant, key string, r
 		return Creation{}, ErrInvalidInput
 	}
 	hash, err := intentHash(request, s.storage.FingerprintProviderKey)
-	if errors.Is(err, credentialcrypto.ErrUnavailable) {
-		// Without the credential key no Session with a provider bundle can
-		// have been committed or can be created; creation reports the missing
-		// key after request validation.
-		return Creation{}, ErrNotFound
-	}
 	if err != nil {
 		return Creation{}, err
 	}
diff --git a/services/core/internal/sessions/creation_test.go b/services/core/internal/sessions/creation_test.go
index 7fe34ff68..5bb22c0fc 100644
--- a/services/core/internal/sessions/creation_test.go
+++ b/services/core/internal/sessions/creation_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/google/uuid"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
@@ -141,7 +140,10 @@ func (s *fakeStorage) FindCreation(_ context.Context, tenant, key string) (Creat
 // fingerprints is a fake FingerprintProviderKey that keeps keys apart.
 func fingerprints(secret string) (string, error) { return "fp-" + secret, nil }
 
-func unavailable(string) (string, error) { return "", credentialcrypto.ErrUnavailable }
+var errFingerprint = errors.New("fingerprint failed")
+
+// failing is a fake FingerprintProviderKey that fails.
+func failing(string) (string, error) { return "", errFingerprint }
 
 // declarations accept every provider and specification.
 type declarations struct{}
@@ -202,8 +204,8 @@ func TestPrepareCreation(t *testing.T) {
 	if prepare(t, withProvider("self_hosted", "one", "session"), fingerprints).RequestHash == prepare(t, withProvider("self_hosted", "two", "session"), fingerprints).RequestHash {
 		t.Fatal("caller keys share an identity")
 	}
-	deployed := prepare(t, withProvider("none", "deployment-key", v1.ModelProviderSourceDeployment), unavailable)
-	plain := prepare(t, func(input *CreateSession) { input.Configuration = creationInput("none").Configuration }, unavailable)
+	deployed := prepare(t, withProvider("none", "deployment-key", v1.ModelProviderSourceDeployment), failing)
+	plain := prepare(t, func(input *CreateSession) { input.Configuration = creationInput("none").Configuration }, failing)
 	if !strings.Contains(string(deployed.Configuration), `"model_provider_configured":true`) || deployed.RequestHash != plain.RequestHash {
 		t.Fatalf("the deployment default joined the identity: %s", deployed.Configuration)
 	}
@@ -226,7 +228,7 @@ func TestPrepareCreation(t *testing.T) {
 		"configuration array":    {func(input *CreateSession) { input.Configuration = json.RawMessage(`[]`) }, fingerprints, ErrInvalidInput},
 		"cancel initial input":   {func(input *CreateSession) { input.InitialInputs = []Input{cancelInput} }, fingerprints, ErrInvalidInput},
 		"deployment self_hosted": {withProvider("self_hosted", "key", v1.ModelProviderSourceDeployment), fingerprints, ErrInvalidInput},
-		"no credential key":      {withProvider("self_hosted", "key", "session"), unavailable, credentialcrypto.ErrUnavailable},
+		"fingerprint failure":    {withProvider("self_hosted", "key", "session"), failing, errFingerprint},
 		"unreadable intent":      {func(input *CreateSession) { input.CreationRequest = json.RawMessage(`[]`) }, fingerprints, ErrInvalidInput},
 	} {
 		t.Run(name, func(t *testing.T) {
@@ -264,10 +266,10 @@ func TestIntentHash(t *testing.T) {
 		"over 16 MiB":          {`"` + strings.Repeat("x", 16<<20) + `"`, fingerprints, ErrInvalidInput},
 		"extension not object": {`{"x_agents_core":[]}`, fingerprints, ErrInvalidInput},
 		"provider unreadable":  {`{"x_agents_core":{"model_provider":[]}}`, fingerprints, ErrInvalidInput},
-		"provider no key":      {`{"x_agents_core":{"model_provider":{"api_key":"k"}}}`, unavailable, credentialcrypto.ErrUnavailable},
-		"null extension":       {`{"x_agents_core":null}`, unavailable, nil},
-		"null provider":        {`{"x_agents_core":{"model_provider":null}}`, unavailable, nil},
-		"intent without key":   {`{"agent_id":"a"}`, unavailable, nil},
+		"provider fingerprint": {`{"x_agents_core":{"model_provider":{"api_key":"k"}}}`, failing, errFingerprint},
+		"null extension":       {`{"x_agents_core":null}`, failing, nil},
+		"null provider":        {`{"x_agents_core":{"model_provider":null}}`, failing, nil},
+		"intent without key":   {`{"agent_id":"a"}`, failing, nil},
 	} {
 		if _, err := hash(test.raw, test.fingerprint); test.want == nil && err != nil || test.want != nil && !errors.Is(err, test.want) {
 			t.Errorf("%s: got %v, want %v", name, err, test.want)
@@ -538,7 +540,6 @@ func TestFindSessionCreation(t *testing.T) {
 		{"recorded intent", "create", request, creator, fingerprints, found, nil, []string{"FindCreation tenant create"}},
 		{"missing creation", "create", request, creator, fingerprints, func() (CreationRecord, error) { return CreationRecord{}, ErrNotFound }, ErrNotFound, []string{"FindCreation tenant create"}},
 		{"another creator", "create", request, identity.Subject{Kind: "user", ID: "stranger"}, fingerprints, found, ErrIdempotencyConflict, []string{"FindCreation tenant create"}},
-		{"no credential key", "create", json.RawMessage(`{"x_agents_core":{"model_provider":{"api_key":"k"}}}`), creator, unavailable, nil, ErrNotFound, []string{"FingerprintProviderKey"}},
 		{"no intent", "create", nil, creator, nil, nil, ErrInvalidInput, nil},
 		{"invalid key", " ", request, creator, nil, nil, ErrInvalidInput, nil},
 		{"invalid creator", "create", request, identity.Subject{}, nil, nil, ErrInvalidInput, nil},
diff --git a/services/core/internal/sessions/environment.go b/services/core/internal/sessions/environment.go
index 3ec6c03fe..2a11a64b8 100644
--- a/services/core/internal/sessions/environment.go
+++ b/services/core/internal/sessions/environment.go
@@ -26,14 +26,12 @@ type EnvironmentReader interface {
 	// pending or running.
 	ListEnvironmentInitializations(ctx context.Context, after string) ([]EnvironmentInitialization, error)
 	// ReadEnvironmentSetup opens the setup frozen for the Session's
-	// Environment. A missing Session is ErrNotFound and a missing credential
-	// key credentialcrypto.ErrUnavailable; frozen data that does not open or
-	// validate is an internal error.
+	// Environment. A missing Session is ErrNotFound; frozen data that does not
+	// open or validate is an internal error.
 	ReadEnvironmentSetup(ctx context.Context, tenant, session string) (environmentconfig.Setup, error)
 	// ReadInitialEnvironmentFile opens the initial file frozen at position for
 	// the Session's Environment, so an installation holds one file at a time.
-	// A missing file is ErrNotFound and a missing credential key
-	// credentialcrypto.ErrUnavailable; a file that does not open or match its
+	// A missing file is ErrNotFound; a file that does not open or match its
 	// recorded size is an internal error.
 	ReadInitialEnvironmentFile(ctx context.Context, tenant, session string, position int) (environmentconfig.InitialFileMetadata, []byte, error)
 }
diff --git a/services/core/internal/sessions/executor_credentials.go b/services/core/internal/sessions/executor_credentials.go
index dcde3026d..9fb1ea412 100644
--- a/services/core/internal/sessions/executor_credentials.go
+++ b/services/core/internal/sessions/executor_credentials.go
@@ -88,13 +88,11 @@ type ExecutorCredentialStorage interface {
 	// principal or Project, or an unknown one, is ErrNotFound.
 	LoadExecutorCredentialRestriction(ctx context.Context, principal identity.Principal, key string) (string, error)
 	// SignInstallation returns the signature of an installation authorization
-	// payload under the credential key. Without that key it is
-	// credentialcrypto.ErrUnavailable.
+	// payload under the credential key.
 	SignInstallation(ctx context.Context, payload string) (string, error)
 	// VerifyInstallation checks the signature of an installation
 	// authorization payload: another signature is
-	// ErrInstallationAuthorization, and a service without the credential key
-	// credentialcrypto.ErrUnavailable.
+	// ErrInstallationAuthorization.
 	VerifyInstallation(ctx context.Context, payload, signature string) error
 	// WithExecutorCredentials runs apply in a transaction of the tenant.
 	WithExecutorCredentials(ctx context.Context, tenant string, apply func(context.Context, ExecutorCredentialTx) error) error
diff --git a/services/core/internal/sessions/model_execution.go b/services/core/internal/sessions/model_execution.go
index 632ac47bb..9cf88a726 100644
--- a/services/core/internal/sessions/model_execution.go
+++ b/services/core/internal/sessions/model_execution.go
@@ -9,8 +9,7 @@ import (
 // ModelExecutionReader reads the model execution a Session froze at creation.
 type ModelExecutionReader interface {
 	// SessionModelExecution opens the model provider the tenant's Session
-	// froze at creation. A Session without one is ErrNotFound, and a service
-	// without the credential key credentialcrypto.ErrUnavailable; a frozen
+	// froze at creation. A Session without one is ErrNotFound; a frozen
 	// provider that does not open, decode or validate is an internal error.
 	SessionModelExecution(ctx context.Context, tenant, session string) (*v1.ModelProviderInput, error)
 }
diff --git a/services/core/internal/vaults/service.go b/services/core/internal/vaults/service.go
index d314066f4..6143432ea 100644
--- a/services/core/internal/vaults/service.go
+++ b/services/core/internal/vaults/service.go
@@ -18,8 +18,7 @@ import (
 const oauthRefreshTimeout = 20 * time.Second
 
 // Service runs the Vault and Credential operations. Storage seals and opens
-// the secrets; without a credential key, operations that need a secret return
-// credentialcrypto.ErrUnavailable and the others keep working.
+// the secrets.
 type Service struct {
 	storage   Storage
 	refresher oauthrefresh.Refresher
diff --git a/services/core/internal/vaults/service_test.go b/services/core/internal/vaults/service_test.go
index 4b0e49d97..28f5d952f 100644
--- a/services/core/internal/vaults/service_test.go
+++ b/services/core/internal/vaults/service_test.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/google/uuid"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/oauthrefresh"
 )
 
@@ -163,6 +162,9 @@ func (f refreshFunc) Refresh(ctx context.Context, request oauthrefresh.Request)
 	return f(ctx, request)
 }
 
+// errStorage is a storage failure the Service returns unchanged.
+var errStorage = errors.New("storage failed")
+
 func unexpectedRefresh(t testing.TB) refreshFunc {
 	return func(context.Context, oauthrefresh.Request) (oauthrefresh.Token, error) {
 		t.Fatal("unexpected call to Refresh")
@@ -236,9 +238,9 @@ func TestCredentialCreationValidationOrder(t *testing.T) {
 			if credential.VaultID != "not-a-vault" {
 				t.Fatalf("%s creation changed the Vault ID %q", kind, credential.VaultID)
 			}
-			return Credential{}, credentialcrypto.ErrUnavailable
+			return Credential{}, errStorage
 		}}, unexpectedRefresh(t))
-		if err := run(service, "valid", "not-a-vault"); !errors.Is(err, credentialcrypto.ErrUnavailable) {
+		if err := run(service, "valid", "not-a-vault"); !errors.Is(err, errStorage) {
 			t.Fatalf("%s creation: got %v", kind, err)
 		}
 	}
@@ -295,9 +297,9 @@ func TestUpdateStaticCredential(t *testing.T) {
 		if replacement != (StaticTokenReplacement{CredentialKey: CredentialKey{tenant, vault, id}, MCPServerURL: url, Token: "replacement"}) {
 			t.Fatalf("unexpected replacement %+v", replacement)
 		}
-		return Credential{}, credentialcrypto.ErrUnavailable
+		return Credential{}, errStorage
 	}}, unexpectedRefresh(t))
-	if _, err := service.UpdateStaticCredential(t.Context(), command); !errors.Is(err, credentialcrypto.ErrUnavailable) {
+	if _, err := service.UpdateStaticCredential(t.Context(), command); !errors.Is(err, errStorage) {
 		t.Fatal("the storage result was not returned", err)
 	}
 }
@@ -348,8 +350,8 @@ func TestStaticBearerToken(t *testing.T) {
 	if token, err := testService(t, &fakeStorage{staticToken: lookup("private-token", nil)}, unexpectedRefresh(t)).MCPBearerToken(t.Context(), command); err != nil || token != "private-token" {
 		t.Fatal("static token was not returned", err)
 	}
-	if token, err := testService(t, &fakeStorage{staticToken: lookup("", credentialcrypto.ErrUnavailable)}, unexpectedRefresh(t)).MCPBearerToken(t.Context(), command); !errors.Is(err, credentialcrypto.ErrUnavailable) || token != "" {
-		t.Fatal("a keyless lookup returned a token", err)
+	if token, err := testService(t, &fakeStorage{staticToken: lookup("", errStorage)}, unexpectedRefresh(t)).MCPBearerToken(t.Context(), command); !errors.Is(err, errStorage) || token != "" {
+		t.Fatal("a failed lookup returned a token", err)
 	}
 	unscoped := command
 	unscoped.Binding.CredentialID = "not-a-credential"
@@ -468,10 +470,10 @@ func TestOAuthBearerTokenFailuresReturnNoToken(t *testing.T) {
 		storage := scenario.service.storage.(*fakeStorage)
 		storage.withOAuthCredential = func(ctx context.Context, _ CredentialKey, apply func(OAuthTx) error) error {
 			return apply(&fakeOAuthTx{t: t, load: func(context.Context, string) (OAuthGrant, error) {
-				return OAuthGrant{}, credentialcrypto.ErrUnavailable
+				return OAuthGrant{}, errStorage
 			}})
 		}
-		if token, err := scenario.service.MCPBearerToken(t.Context(), scenario.command); !errors.Is(err, credentialcrypto.ErrUnavailable) || token != "" {
+		if token, err := scenario.service.MCPBearerToken(t.Context(), scenario.command); !errors.Is(err, errStorage) || token != "" {
 			t.Fatal("a failed load was not returned unchanged", err)
 		}
 	})
diff --git a/services/core/internal/vaults/storage.go b/services/core/internal/vaults/storage.go
index 1598bd12e..af97af86c 100644
--- a/services/core/internal/vaults/storage.go
+++ b/services/core/internal/vaults/storage.go
@@ -28,12 +28,10 @@ type Storage interface {
 	// DeleteVault deletes a Vault with all of its Credentials and returns its ID.
 	DeleteVault(ctx context.Context, tenantID, vaultID string) (string, error)
 	// CreateCredential seals the Credential's secret and stores it in a Vault
-	// of the tenant. A missing credential key is
-	// credentialcrypto.ErrUnavailable, checked after the new Credential ID and
-	// before the Vault.
+	// of the tenant.
 	CreateCredential(ctx context.Context, credential NewCredential) (Credential, error)
 	// ReplaceStaticToken seals and replaces a static_bearer Credential's
-	// token. Without a credential key it is credentialcrypto.ErrUnavailable.
+	// token.
 	ReplaceStaticToken(ctx context.Context, replacement StaticTokenReplacement) (Credential, error)
 	// DeleteCredential deletes a Credential and its sealed secret and returns its ID.
 	DeleteCredential(ctx context.Context, key CredentialKey) (string, error)
@@ -48,8 +46,7 @@ type Storage interface {
 	// Vaults that the query selects, ordered by ID.
 	FindMCPCredentials(ctx context.Context, query MCPCredentialQuery) ([]MCPCredentialMatch, error)
 	// StaticToken opens a static_bearer Credential's token when the complete
-	// frozen scope still names it. A scope that names none is ErrNotFound,
-	// then a missing credential key is credentialcrypto.ErrUnavailable.
+	// frozen scope still names it. A scope that names none is ErrNotFound.
 	StaticToken(ctx context.Context, query StaticTokenQuery) (string, error)
 }
 
@@ -59,9 +56,8 @@ type OAuthTx interface {
 	// LoadOAuthGrant locks the Credential until the transaction ends, so
 	// competing refreshes, replacements and deletions, including the parent
 	// Vault's, wait. A non-empty destination must match the stored one, or
-	// the Credential is ErrNotFound. Only then is the grant opened: a missing
-	// credential key is credentialcrypto.ErrUnavailable, and stored metadata
-	// that differs from the sealed copy fails authentication.
+	// the Credential is ErrNotFound. Only then is the grant opened: stored
+	// metadata that differs from the sealed copy fails authentication.
 	LoadOAuthGrant(ctx context.Context, destination string) (OAuthGrant, error)
 	// ApplyOAuthRefresh seals and stores a refreshed grant for the loaded
 	// Credential. Execution refreshes are not caller writes and record no
diff --git a/services/core/tests/container_server.py b/services/core/tests/container_server.py
index 072a6a557..292bf72b4 100755
--- a/services/core/tests/container_server.py
+++ b/services/core/tests/container_server.py
@@ -3,22 +3,20 @@
 
 import os
 
-# Match ownership of the suite's private Core key digest file without granting root access.
+# Match ownership of the suite's private installation files without granting root access.
 # The image's default UID is separately exercised by deployment acceptance.
 assert os.getuid() != 0, "Run container acceptance as an unprivileged host user"
-core_key_digests = os.environ["OAC_CORE_KEY_DIGESTS_FILE"]
 args = [
     "docker", "run", "--rm", "--read-only", "--network=host",
     "--cap-drop=ALL", "--security-opt=no-new-privileges",
     "--user", f"{os.getuid()}:{os.getgid()}",
-    "--mount", f"type=bind,source={core_key_digests},target=/run/core-key-digests.json,readonly",
-    "--env", "OAC_CORE_KEY_DIGESTS_FILE=/run/core-key-digests.json",
 ]
-credential_key = os.environ.get("OAC_CREDENTIAL_KEY_FILE")
-if credential_key:
+for name, target in (("OAC_CORE_KEY_DIGESTS_FILE", "/run/core-key-digests.json"),
+                     ("OAC_CREDENTIAL_KEY_FILE", "/run/credential.key"),
+                     ("OAC_INSTALLATION_ID_FILE", "/run/installation.id")):
     args.extend([
-        "--mount", f"type=bind,source={credential_key},target=/run/credential.key,readonly",
-        "--env", "OAC_CREDENTIAL_KEY_FILE=/run/credential.key",
+        "--mount", f"type=bind,source={os.environ[name]},target={target},readonly",
+        "--env", f"{name}={target}",
     ])
 for name in ("OAC_DATABASE_URL", "OAC_ADDR", "OAC_DEFAULT_HARNESS", "OAC_PUBLIC_URL"):
     args.extend(["--env", name])
diff --git a/services/core/tests/integration/agent_execution_defaults_http_test.go b/services/core/tests/integration/agent_execution_defaults_http_test.go
index 28f587c6c..fe4fa7db8 100644
--- a/services/core/tests/integration/agent_execution_defaults_http_test.go
+++ b/services/core/tests/integration/agent_execution_defaults_http_test.go
@@ -23,7 +23,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "defaults-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	deployment := &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://deployment.example/v1", APIKey: "deployment-canary"}
 	defaultsCalls := 0
-	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), managedSandboxes(t, st), withHarnesses([]string{"codex", "claude_sdk", "mcode"}), modelProviderDefaults(func(context.Context, string) (*modelconfiguration.Snapshot, error) {
+	handler, err := publicHandler(t, st, auth, "codex", withHarnesses([]string{"codex", "claude_sdk", "mcode"}), modelProviderDefaults(func(context.Context, string) (*modelconfiguration.Snapshot, error) {
 		defaultsCalls++
 		copy := *deployment
 		return &modelconfiguration.Snapshot{Model: "fixture", Provider: &copy, Revision: uuid.New()}, nil
diff --git a/services/core/tests/integration/agents_delete_public_test.go b/services/core/tests/integration/agents_delete_public_test.go
index 0f37041d4..187c2f139 100644
--- a/services/core/tests/integration/agents_delete_public_test.go
+++ b/services/core/tests/integration/agents_delete_public_test.go
@@ -23,14 +23,14 @@ func TestAgentDeletionOfficialClient(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore := New(s.pool)
-	h, err = publicHandler(t, recoveredStore, auth, "codex", storeExecution(t, recoveredStore))
+	recoveredStore := New(t, s.pool)
+	h, err = publicHandler(t, recoveredStore, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/agents_update_public_test.go b/services/core/tests/integration/agents_update_public_test.go
index 651a044b1..74ed7a6fc 100644
--- a/services/core/tests/integration/agents_update_public_test.go
+++ b/services/core/tests/integration/agents_update_public_test.go
@@ -23,14 +23,14 @@ func TestAgentUpdateOfficialClient(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore := New(s.pool)
-	h, err = publicHandler(t, recoveredStore, auth, "codex", storeExecution(t, recoveredStore))
+	recoveredStore := New(t, s.pool)
+	h, err = publicHandler(t, recoveredStore, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/command_output_test.go b/services/core/tests/integration/command_output_test.go
index 647d05650..df69ac1fe 100644
--- a/services/core/tests/integration/command_output_test.go
+++ b/services/core/tests/integration/command_output_test.go
@@ -73,7 +73,7 @@ func TestCommandOutputCommitsFragmentsSnapshotsAndRecovery(t *testing.T) {
 		t.Fatal(err)
 	}
 	// Reopening the Store recovers committed Items without creating events.
-	reopened := New(pool)
+	reopened := New(t, pool)
 	before, _ = sessionAdapter(s).SessionEventCursor(ctx, tenant, session.ID)
 	page, err = sessionAdapter(s).ListItems(ctx, tenant, session.ID, "", 100, true)
 	if err != nil || len(page.Items) != 3 {
diff --git a/services/core/tests/integration/configuration_validation_public_test.go b/services/core/tests/integration/configuration_validation_public_test.go
index e1bbe8f26..a04885f0d 100644
--- a/services/core/tests/integration/configuration_validation_public_test.go
+++ b/services/core/tests/integration/configuration_validation_public_test.go
@@ -30,7 +30,7 @@ func TestAgentConfigurationValidationRejectsWithoutWritesPostgres(t *testing.T)
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "config-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "config-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/creation_stream_settlement_public_test.go b/services/core/tests/integration/creation_stream_settlement_public_test.go
index 954300f88..bfa7d7f30 100644
--- a/services/core/tests/integration/creation_stream_settlement_public_test.go
+++ b/services/core/tests/integration/creation_stream_settlement_public_test.go
@@ -113,10 +113,10 @@ func (s sseLines) open(t *testing.T) {
 // creation stream whose initial reservation is cancelled without a Session event
 // ends through the committed projection, while GET stays open.
 func TestCreationStreamPublicLifetimes(t *testing.T) {
-	s, _ := NewModelTestStore(t)
+	s, _ := testStore(t)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
-	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://offline-executor.example"))
+	handler, err := publicHandler(t, s, auth, "codex", executorURL("https://offline-executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/credential_matrix_http_test.go b/services/core/tests/integration/credential_matrix_http_test.go
index 068423282..96e630f29 100644
--- a/services/core/tests/integration/credential_matrix_http_test.go
+++ b/services/core/tests/integration/credential_matrix_http_test.go
@@ -36,7 +36,7 @@ func TestCredentialNamespaceMatrix(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, s, nil, "codex", storeKeys(s), storeExecution(t, s), managedSandboxes(t, s), withCoreKeys(admin))
+	handler, err := publicHandler(t, s, nil, "codex", storeKeys(s), withCoreKeys(admin))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/deployment_model_providers_http_test.go b/services/core/tests/integration/deployment_model_providers_http_test.go
index 8dc8687af..be9c35db1 100644
--- a/services/core/tests/integration/deployment_model_providers_http_test.go
+++ b/services/core/tests/integration/deployment_model_providers_http_test.go
@@ -36,7 +36,7 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), managedSandboxes(t, st), withCoreKeys(admin), withHarnesses([]string{"codex", "mcode"}))
+	handler, err := publicHandler(t, st, auth, "codex", withCoreKeys(admin), withHarnesses([]string{"codex", "mcode"}))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -170,8 +170,8 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 		t.Fatal(err)
 	}
 	incompatible := call("POST", "/v1/agents/sessions", projectKey, hosted, 400)
-	if !strings.Contains(string(incompatible["error"]), "does not support this model provider protocol") || strings.Contains(string(incompatible["error"]), "credential_storage_unavailable") {
-		t.Fatal("unsupported stored protocol was reported as a credential failure")
+	if !strings.Contains(string(incompatible["error"]), "does not support this model provider protocol") {
+		t.Fatal("unsupported stored protocol was not reported as such")
 	}
 	if text(providerView(call("GET", path, coreKey, "", 200))["protocol"]) != "anthropic" {
 		t.Fatal("unsupported default was rewritten")
@@ -229,13 +229,13 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 // recorded first: a same-key retry returns the committed Session after the
 // default was replaced or removed.
 func TestNoneSessionRetryAfterDeploymentDefaultChanges(t *testing.T) {
-	st, _ := NewModelTestStore(t)
+	st, _ := testStore(t)
 	if _, err := st.pool.Exec(t.Context(), "DELETE FROM deployment_model_providers"); err != nil {
 		t.Fatal(err)
 	}
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "none-retry", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
-	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st))
+	handler, err := publicHandler(t, st, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -321,7 +321,7 @@ func TestDeploymentProviderResolutionPairsRevisionDuringReplacement(t *testing.T
 		_, err = defaults.Replace(admin, modelconfiguration.Replacement{Harness: harness, Configuration: v1.ModelConfigurationInput{ModelProvider: replacement, Model: "fixture"}})
 		return snapshot, err
 	}
-	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), modelProviderDefaults(resolver))
+	handler, err := publicHandler(t, st, auth, "codex", modelProviderDefaults(resolver))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/dispatch_test.go b/services/core/tests/integration/dispatch_test.go
index 7e733aad4..2f9ab27f3 100644
--- a/services/core/tests/integration/dispatch_test.go
+++ b/services/core/tests/integration/dispatch_test.go
@@ -50,7 +50,7 @@ func newDispatchHarness(t *testing.T) *dispatchHarness {
 
 func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool) *dispatchHarness {
 	t.Helper()
-	s, _ := NewModelTestStore(t)
+	s, _ := testStore(t)
 	h := &dispatchHarness{t: t, s: s, tenant: uuid.NewString(), environments: map[string]*dispatchHarness{}}
 	ctx := context.Background()
 	var err error
@@ -74,7 +74,7 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 		if getErr != nil {
 			t.Fatal(getErr)
 		}
-		h.device, err = FixtureEnvironmentDevice(ctx, s.pool, h.tenant, environment.ID, "local runtime", runtimedevice.HashCredential(secret))
+		h.device, err = FixtureEnvironmentDevice(t, ctx, s.pool, h.tenant, environment.ID, "local runtime", runtimedevice.HashCredential(secret))
 	} else {
 		h.device, err = sessionService(t, s).CreateDevice(ctx, h.tenant, "isolated executor", runtimedevice.HashCredential(secret))
 	}
diff --git a/services/core/tests/integration/environment_file_writes_test.go b/services/core/tests/integration/environment_file_writes_test.go
index 2c4f598d3..276e346ad 100644
--- a/services/core/tests/integration/environment_file_writes_test.go
+++ b/services/core/tests/integration/environment_file_writes_test.go
@@ -28,7 +28,7 @@ func newFileWriteFixture(t *testing.T) fileWriteFixture {
 	lease := executionWriter(t, s).lease
 	tenant := uuid.NewString()
 	session, env := localEnvironment(t, s, tenant)
-	host, err := FixtureEnvironmentDevice(t.Context(), pool, tenant, env.ID, "file owner", runtimedevice.HashCredential(uuid.NewString()))
+	host, err := FixtureEnvironmentDevice(t, t.Context(), pool, tenant, env.ID, "file owner", runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/environment_initial_public_test.go b/services/core/tests/integration/environment_initial_public_test.go
index 30559672c..a034328e6 100644
--- a/services/core/tests/integration/environment_initial_public_test.go
+++ b/services/core/tests/integration/environment_initial_public_test.go
@@ -44,7 +44,7 @@ func TestEnvironmentInitialFailureOfficialClient(t *testing.T) {
 			t.Error(err)
 		}
 	})
-	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
+	handler, err := publicHandler(t, s, auth, "codex", executorURL("https://executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/environment_retrieve_public_test.go b/services/core/tests/integration/environment_retrieve_public_test.go
index 2169efcef..79e87ba7a 100644
--- a/services/core/tests/integration/environment_retrieve_public_test.go
+++ b/services/core/tests/integration/environment_retrieve_public_test.go
@@ -21,7 +21,7 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, _ := NewModelTestStore(t)
+	s, _ := testStore(t)
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	principal := FixtureExecutorPrincipal(t, s, tenant)
 	token, peer, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
@@ -47,7 +47,7 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 			}
 		}
 	}()
-	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://private-registry.example"))
+	handler, err := publicHandler(t, s, auth, "codex", executorURL("https://private-registry.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -85,7 +85,7 @@ func TestEnvironmentRetrievalOfficialClient(t *testing.T) {
 	revoked = true
 	server.Close()
 	s.pool.Close()
-	reopened, _ := NewModelTestStore(t)
+	reopened, _ := testStore(t)
 	handler, err = publicHandler(t, reopened, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/executor_principals_migration_test.go b/services/core/tests/integration/executor_principals_migration_test.go
index 808e69a2a..4157d1422 100644
--- a/services/core/tests/integration/executor_principals_migration_test.go
+++ b/services/core/tests/integration/executor_principals_migration_test.go
@@ -103,7 +103,7 @@ func TestExecutorPrincipalMigrationRetiresUnknownAuthority(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Cleanup(migrated.Close)
-	s := New(migrated)
+	s := New(t, migrated)
 	p := FixtureExecutorPrincipal(t, s, tenant)
 	credentials := sessionService(t, s)
 	if _, err := sessionAdapter(s).AuthenticateEnvironmentExecutor(ctx, environment, digest); !errors.Is(err, sessions.ErrNotFound) {
diff --git a/services/core/tests/integration/fixtures_test.go b/services/core/tests/integration/fixtures_test.go
index 6fecfab2c..bf530806d 100644
--- a/services/core/tests/integration/fixtures_test.go
+++ b/services/core/tests/integration/fixtures_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -9,7 +8,6 @@ import (
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
@@ -20,15 +18,6 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-var fixtureCipher, _ = credentialcrypto.New(bytes.Repeat([]byte{61}, 32))
-
-// NewModelTestStore is testStore with a fixture credential key, so Sessions
-// can freeze a model provider.
-func NewModelTestStore(t *testing.T) (*Store, *pgxpool.Pool) {
-	_, pool := testStore(t)
-	return NewWithCredentialCipher(pool, fixtureCipher), pool
-}
-
 // FixtureModelProvider is a valid bundle for the harness. Hosted and self-hosted
 // Sessions cannot run without one, so fixtures supply it instead of relaxing
 // that check.
diff --git a/services/core/tests/integration/function_inputs_public_test.go b/services/core/tests/integration/function_inputs_public_test.go
index 5b512cffe..842e27263 100644
--- a/services/core/tests/integration/function_inputs_public_test.go
+++ b/services/core/tests/integration/function_inputs_public_test.go
@@ -47,7 +47,7 @@ func TestFunctionInputsOfficialClientAtomicAdmission(t *testing.T) {
 		}
 	}
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
-	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	handler, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/initial_files_http_test.go b/services/core/tests/integration/initial_files_http_test.go
index 9fee427b4..25d67b80a 100644
--- a/services/core/tests/integration/initial_files_http_test.go
+++ b/services/core/tests/integration/initial_files_http_test.go
@@ -23,7 +23,7 @@ func TestInitialFilesHTTPInlineLimitsAndRetry(t *testing.T) {
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	// Exercise HTTP parsing and durable storage without starting a Runtime.
-	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), managedSandboxes(t, s), fixtureDeploymentProvider())
+	handler, err := publicHandler(t, s, auth, "codex", fixtureDeploymentProvider())
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/input_conflicts_public_test.go b/services/core/tests/integration/input_conflicts_public_test.go
index f390b0419..7ec79a89b 100644
--- a/services/core/tests/integration/input_conflicts_public_test.go
+++ b/services/core/tests/integration/input_conflicts_public_test.go
@@ -44,7 +44,7 @@ func TestSessionInputConflictsAndResultTargetsPostgres(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "conflict-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "conflict-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
+	h, err := publicHandler(t, s, auth, "codex", executorURL("https://executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/item_order_migration_test.go b/services/core/tests/integration/item_order_migration_test.go
index 31b3abf22..f47deb1d8 100644
--- a/services/core/tests/integration/item_order_migration_test.go
+++ b/services/core/tests/integration/item_order_migration_test.go
@@ -148,11 +148,11 @@ func TestItemOrderMigrationPreservesIndexedHistory(t *testing.T) {
 		t.Fatal(err)
 	}
 	t.Cleanup(migratedPool.Close)
-	s := New(migratedPool)
+	s := New(t, migratedPool)
 	if _, err = transitionTurn(ctx, s, tenant, session, turn, sessions.TurnTransition{ExpectedStatus: sessions.TurnQueued, Status: sessions.TurnInProgress}); err != nil {
 		t.Fatal(err)
 	}
-	if err = executionOwner(t, New(migratedPool)).Sessions.AppendTurnEvents(ctx, tenant, session, turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"after-upgrade","delta":"continued"}`)}}); err != nil {
+	if err = executionOwner(t, New(t, migratedPool)).Sessions.AppendTurnEvents(ctx, tenant, session, turn, 1, []sessions.ExecutionEvent{{Kind: "delta", Payload: json.RawMessage(`{"item_id":"after-upgrade","delta":"continued"}`)}}); err != nil {
 		t.Fatal(err)
 	}
 	addedID := items.Identity(turn, "message:after-upgrade")
diff --git a/services/core/tests/integration/list_cursor_public_test.go b/services/core/tests/integration/list_cursor_public_test.go
index 9cf08ae1a..9dadd476f 100644
--- a/services/core/tests/integration/list_cursor_public_test.go
+++ b/services/core/tests/integration/list_cursor_public_test.go
@@ -233,7 +233,7 @@ func TestListCursorErrorsPostgres(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "cursor-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "cursor-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: foreignTenant},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/local_environment_devices_test.go b/services/core/tests/integration/local_environment_devices_test.go
index 88a04c240..24f24c486 100644
--- a/services/core/tests/integration/local_environment_devices_test.go
+++ b/services/core/tests/integration/local_environment_devices_test.go
@@ -34,10 +34,10 @@ func TestEnvironmentDeviceAuthorityAndLifecycle(t *testing.T) {
 	sibling, _ := localEnvironment(t, s, tenant)
 	foreign, _ := localEnvironment(t, s, foreignTenant)
 	digest := runtimedevice.HashCredential(uuid.NewString())
-	if _, err := FixtureEnvironmentDevice(t.Context(), pool, foreignTenant, environment.ID, "foreign", digest); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := FixtureEnvironmentDevice(t, t.Context(), pool, foreignTenant, environment.ID, "foreign", digest); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatalf("foreign provisioning: %v", err)
 	}
-	bound, err := FixtureEnvironmentDevice(t.Context(), pool, tenant, environment.ID, "dedicated", digest)
+	bound, err := FixtureEnvironmentDevice(t, t.Context(), pool, tenant, environment.ID, "dedicated", digest)
 	if err != nil || bound.EnvironmentID != environment.ID {
 		t.Fatalf("provision: %+v %v", bound, err)
 	}
@@ -81,7 +81,7 @@ func TestEnvironmentDeviceProvisioningHasOneWinner(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			_, err := FixtureEnvironmentDevice(t.Context(), pool, tenant, environment.ID, "runtime", runtimedevice.HashCredential(uuid.NewString()))
+			_, err := FixtureEnvironmentDevice(t, t.Context(), pool, tenant, environment.ID, "runtime", runtimedevice.HashCredential(uuid.NewString()))
 			results <- err
 		}()
 	}
@@ -105,7 +105,7 @@ func TestEnvironmentDeviceProvisioningHasOneWinner(t *testing.T) {
 	if err := sessionService(t, s).RevokeDevice(t.Context(), tenant, bound.ID); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := FixtureEnvironmentDevice(t.Context(), pool, tenant, environment.ID, "replacement", runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, sessions.ErrDeviceBindingConflict) {
+	if _, err := FixtureEnvironmentDevice(t, t.Context(), pool, tenant, environment.ID, "replacement", runtimedevice.HashCredential(uuid.NewString())); !errors.Is(err, sessions.ErrDeviceBindingConflict) {
 		t.Fatalf("silent placement replacement: %v", err)
 	}
 }
diff --git a/services/core/tests/integration/managed_fixture_test.go b/services/core/tests/integration/managed_fixture_test.go
index 27cac8f77..9248f7d2b 100644
--- a/services/core/tests/integration/managed_fixture_test.go
+++ b/services/core/tests/integration/managed_fixture_test.go
@@ -13,6 +13,5 @@ import (
 func newManagedTestStore(t *testing.T) (*Store, *pgxpool.Pool) {
 	t.Helper()
 	pool := pgtest.OpenIsolated(t, nil)
-	// Hosted Sessions freeze a model provider, which needs a credential key.
-	return NewWithCredentialCipher(pool, fixtureCipher), pool
+	return New(t, pool), pool
 }
diff --git a/services/core/tests/integration/mcp_credential_selection_public_test.go b/services/core/tests/integration/mcp_credential_selection_public_test.go
index b047c7608..407bbcafb 100644
--- a/services/core/tests/integration/mcp_credential_selection_public_test.go
+++ b/services/core/tests/integration/mcp_credential_selection_public_test.go
@@ -36,7 +36,7 @@ func TestMCPCredentialSelectionPublicPostgres(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-a", TokenSHA256: runtimedevice.HashCredential(tokenA), TenantID: tenantA},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-b", TokenSHA256: runtimedevice.HashCredential(tokenB), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/path_id_semantics_public_test.go b/services/core/tests/integration/path_id_semantics_public_test.go
index ebb0b24df..288df95a7 100644
--- a/services/core/tests/integration/path_id_semantics_public_test.go
+++ b/services/core/tests/integration/path_id_semantics_public_test.go
@@ -98,7 +98,7 @@ func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "path-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "path-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -359,28 +359,6 @@ func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 		t.Fatalf("route matrix checked only %d cases", checked)
 	}
 
-	// Storage availability checks also run before the lookup of a missing identifier.
-	h, err = publicHandler(t, New(pool), auth, "codex")
-	if err != nil {
-		t.Fatal(err)
-	}
-	unconfigured := httptest.NewServer(h)
-	defer unconfigured.Close()
-	keyless := pathIDClient{t: t, server: unconfigured}
-	for _, r := range []route{
-		{method: "POST", body: `{"name":"path","auth":{"type":"static_bearer","mcp_server_url":"https://mcp.example/mcp","token":"t"}}`, segments: []string{"/v1/vaults/", vault, "/credentials"}},
-		{method: "POST", body: `{"auth":{"type":"static_bearer","token":"t"}}`, segments: []string{"/v1/vaults/", vault, "/credentials/", credential}},
-		{method: "POST", body: `{"env":{"PATH_ID":"value"}}`, segments: []string{"/v1/agents/environments/templates/", template}},
-	} {
-		for index := 1; index < len(r.segments); index += 2 {
-			wantStatus, wantBody := keyless.do(owner, r.method, path(r.segments, index, uuid.NewString()), "application/json", []byte(r.body))
-			status, body := keyless.do(owner, r.method, path(r.segments, index, "not-a-uuid"), "application/json", []byte(r.body))
-			if status != wantStatus || body != wantBody {
-				t.Errorf("keyless %s %s: malformed %d %s; missing %d %s", r.method, path(r.segments, index, "{id}"), status, body, wantStatus, wantBody)
-			}
-		}
-	}
-
 	// A malformed list cursor answers like any other unresolved cursor of that
 	// list: 404 on lookup-family lists and the family's 400 elsewhere (see
 	// list_cursor_public_test.go). A malformed parent still answers first.
diff --git a/services/core/tests/integration/public_handler_fixture_test.go b/services/core/tests/integration/public_handler_fixture_test.go
index 382dfec57..008544e7b 100644
--- a/services/core/tests/integration/public_handler_fixture_test.go
+++ b/services/core/tests/integration/public_handler_fixture_test.go
@@ -36,9 +36,11 @@ const testExecutorURL = "wss://core.example/api/v1/agent-daemon/ws"
 
 // publicHandler serves s through api.NewHandler, with every area built on s's
 // database, credential key and placement rules as cmd/server builds it. keys
-// authenticate as Project keys and "admin" as the Core key. Metrics, Runtime
-// observation and history, and executor connections are strict stand-ins.
-// Execution and Sandboxes stay disabled unless configure sets them.
+// authenticate as Project keys and "admin" as the Core key. Execution admits
+// Sessions and inputs through the Session service without a Worker, so nothing
+// runs them. Metrics, Runtime observation and history, executor connections,
+// Session archive, workspaces, and deployment changes, reset and discovery
+// are strict stand-ins. configure replaces any of them.
 func publicHandler(t testing.TB, s *Store, keys fixtureKeyResolver, engine string, configure ...func(*api.Dependencies)) (http.Handler, error) {
 	t.Helper()
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential("admin")})
@@ -74,8 +76,9 @@ func publicHandler(t testing.TB, s *Store, keys fixtureKeyResolver, engine strin
 	if err != nil {
 		return nil, err
 	}
+	deployments := deploymentService(t, s)
 	deps := api.Dependencies{
-		Engine: engine, CoreKeys: admin, InstallationBindings: deploymentService(t, s),
+		Engine: engine, CoreKeys: admin, InstallationBindings: deployments,
 		Projects: projectService, ProjectsReader: fixtureProjectsReader{Reader: projectStore, keys: keys},
 		ModelProviders: modelConfigurationService, ModelProvidersReader: modelConfigurationStore,
 		Vaults: vaultService, VaultsReader: vaultStore,
@@ -94,6 +97,8 @@ func publicHandler(t testing.TB, s *Store, keys fixtureKeyResolver, engine strin
 		ArtifactsReader: sessionStore,
 		SessionAdmin:    sessionStore, Environments: service, EnvironmentsReader: sessionStore, Admin: sessionStore, AdminAudit: audit, WriteAudit: audit,
 		ExecutorConnections: strict, Metrics: strict, RuntimeObservations: strict, RuntimeHistory: strict,
+		Execution: api.Execution{ExecutorURL: testExecutorURL, SessionAdmission: service, InputAdmission: service, SessionArchive: strict, Workspaces: strict},
+		Sandboxes: api.Sandboxes{Deployment: deployments, NodeAllocations: deploymentStore(s), DeploymentChanges: strict, DeploymentReset: strict, ConfigurationDiscovery: strict},
 	}
 	for _, c := range configure {
 		c(&deps)
@@ -143,26 +148,11 @@ func withPolicy(policy execution.Policy) func(*api.Dependencies) {
 	return func(d *api.Dependencies) { d.Policy = policy }
 }
 
-// storeExecution admits Sessions and inputs through the Session service on s
-// without a Worker, so nothing runs them.
-func storeExecution(t testing.TB, s *Store) func(*api.Dependencies) {
-	return func(d *api.Dependencies) {
-		service := sessionService(t, s)
-		d.Execution = &api.Execution{
-			ExecutorURL:      testExecutorURL,
-			SessionAdmission: service,
-			InputAdmission:   service,
-			SessionArchive:   strictStandIn{t},
-			Workspaces:       strictStandIn{t},
-		}
-	}
-}
-
 // workerExecution runs Sessions through worker. It wires no archive; an
 // archive request fails the test.
 func workerExecution(t testing.TB, worker *execution.Worker) func(*api.Dependencies) {
 	return func(d *api.Dependencies) {
-		d.Execution = &api.Execution{
+		d.Execution = api.Execution{
 			ExecutorURL:      testExecutorURL,
 			SessionAdmission: worker,
 			InputAdmission:   worker,
@@ -173,27 +163,11 @@ func workerExecution(t testing.TB, worker *execution.Worker) func(*api.Dependenc
 }
 
 // executorURL replaces the daemon URL self-hosted Sessions report. It follows
-// the option that enables Execution.
+// any option that replaces Execution.
 func executorURL(url string) func(*api.Dependencies) {
 	return func(d *api.Dependencies) { d.Execution.ExecutorURL = url }
 }
 
-// managedSandboxes enables the managed sandbox deployment on s: its
-// administration and node routes and openai_hosted Environments. Deployment
-// changes, reset and discovery need the Worker and are strict stand-ins. It
-// follows the option that enables Execution.
-func managedSandboxes(t testing.TB, s *Store) func(*api.Dependencies) {
-	return func(d *api.Dependencies) {
-		d.Sandboxes = &api.Sandboxes{
-			Deployment:             deploymentService(t, s),
-			NodeAllocations:        deploymentStore(s),
-			DeploymentChanges:      strictStandIn{t},
-			DeploymentReset:        strictStandIn{t},
-			ConfigurationDiscovery: strictStandIn{t},
-		}
-	}
-}
-
 // modelProviderDefaults resolves deployment model provider defaults with
 // resolve instead of the stored deployment configuration.
 func modelProviderDefaults(resolve func(context.Context, string) (*modelconfiguration.Snapshot, error)) func(*api.Dependencies) {
diff --git a/services/core/tests/integration/remote_mcp_credentials_test.go b/services/core/tests/integration/remote_mcp_credentials_test.go
index 393e50c9b..73c136cc5 100644
--- a/services/core/tests/integration/remote_mcp_credentials_test.go
+++ b/services/core/tests/integration/remote_mcp_credentials_test.go
@@ -16,7 +16,7 @@ func TestSelfHostedServiceMCPRejectionDoesNotRequireCredentialDecryption(t *test
 			s, tenant, vault, credential := selfHostedMCPAdmissionFixture(t)
 			switch mode {
 			case "missing key":
-				s = New(s.pool)
+				s = New(t, s.pool)
 			case "deleted":
 				_, service, err := fixtureVaults(s)
 				if err != nil {
diff --git a/services/core/tests/integration/remote_mcp_test.go b/services/core/tests/integration/remote_mcp_test.go
index 0344b0c0a..1bd8d3b94 100644
--- a/services/core/tests/integration/remote_mcp_test.go
+++ b/services/core/tests/integration/remote_mcp_test.go
@@ -99,7 +99,7 @@ func selfHostedMCPAdmissionFixture(t *testing.T) (*Store, string, vaults.Vault,
 func selfHostedMCPAdmissionHandler(t *testing.T, s *Store, tenant string) http.Handler {
 	t.Helper()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test", TenantID: tenant, TokenSHA256: runtimedevice.HashCredential("test-token")}})
-	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
+	handler, err := publicHandler(t, s, auth, "codex", executorURL("https://executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/request_body_public_test.go b/services/core/tests/integration/request_body_public_test.go
index f075d4ce3..2b6a72fe4 100644
--- a/services/core/tests/integration/request_body_public_test.go
+++ b/services/core/tests/integration/request_body_public_test.go
@@ -37,7 +37,7 @@ func TestRequestBodyGateRejectsWithoutWritesPostgres(t *testing.T) {
 	})
 	// No Runtime is connected, so a file write that passes the gate is unavailable.
 	unavailable := func(d *api.Dependencies) { d.Execution.Workspaces = unavailableWorkspaces{strictStandIn{t}} }
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), unavailable, acceptUnavailable(t))
+	h, err := publicHandler(t, s, auth, "codex", unavailable, acceptUnavailable(t))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -173,7 +173,7 @@ func TestRequestBodyGateExcludedRoutesPostgres(t *testing.T) {
 	s := NewWithCredentialCipher(pool, cipher)
 	token, tenant := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "excluded-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/root_fixture_test.go b/services/core/tests/integration/root_fixture_test.go
index 2fde53550..e1ad7512b 100644
--- a/services/core/tests/integration/root_fixture_test.go
+++ b/services/core/tests/integration/root_fixture_test.go
@@ -3,6 +3,7 @@ package integration
 import (
 	"context"
 	"fmt"
+	"testing"
 
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -10,6 +11,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/sessionpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
@@ -34,18 +36,16 @@ type Store struct {
 // providers and an unset public URL.
 var defaultPlacement, _ = placement.NewRules(providers.Builtin(), "")
 
-// New is the fixture on pool without a credential key, under defaultPlacement.
-func New(pool *pgxpool.Pool) *Store {
-	pooled := pgunit.NewPool(pool)
-	return &Store{queries: sqlc.New(pool), pool: pool, pooled: pooled, writer: pooled, placement: defaultPlacement}
+// New is the fixture on pool under the shared test credential key and
+// defaultPlacement.
+func New(t testing.TB, pool *pgxpool.Pool) *Store {
+	return NewWithCredentialCipher(pool, pgtest.CredentialKey(t))
 }
 
-// NewWithCredentialCipher is New with a credential key, so Sessions can freeze
-// sealed resources.
+// NewWithCredentialCipher is New under another credential key.
 func NewWithCredentialCipher(pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) *Store {
-	s := New(pool)
-	s.credentialCipher = cipher
-	return s
+	pooled := pgunit.NewPool(pool)
+	return &Store{queries: sqlc.New(pool), pool: pool, pooled: pooled, writer: pooled, credentialCipher: cipher, placement: defaultPlacement}
 }
 
 // NewExecution is s with its Session transactions on lease.
diff --git a/services/core/tests/integration/sandbox_node_auth_order_http_test.go b/services/core/tests/integration/sandbox_node_auth_order_http_test.go
index 4e152b8a3..338390099 100644
--- a/services/core/tests/integration/sandbox_node_auth_order_http_test.go
+++ b/services/core/tests/integration/sandbox_node_auth_order_http_test.go
@@ -22,7 +22,7 @@ func TestSandboxNodeRoutesAuthenticateBeforeDeploymentState(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, s, nil, "codex", storeKeys(s), storeExecution(t, s), managedSandboxes(t, s), withCoreKeys(admin))
+	handler, err := publicHandler(t, s, nil, "codex", storeKeys(s), withCoreKeys(admin))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/saved_web_search_public_test.go b/services/core/tests/integration/saved_web_search_public_test.go
index dd31102ac..a509660f3 100644
--- a/services/core/tests/integration/saved_web_search_public_test.go
+++ b/services/core/tests/integration/saved_web_search_public_test.go
@@ -25,7 +25,7 @@ func TestSavedWebSearchPostgres(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "search-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "search-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/self_hosted_cancel_public_test.go b/services/core/tests/integration/self_hosted_cancel_public_test.go
index bf9551100..d8fb260a2 100644
--- a/services/core/tests/integration/self_hosted_cancel_public_test.go
+++ b/services/core/tests/integration/self_hosted_cancel_public_test.go
@@ -23,7 +23,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, _ := NewModelTestStore(t)
+	s, _ := testStore(t)
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
@@ -178,7 +178,7 @@ func TestSelfHostedCancellationOfficialClient(t *testing.T) {
 			awaitRelease()
 			server.Close()
 			s.pool.Close()
-			s, _ = NewModelTestStore(t)
+			s, _ = testStore(t)
 			server, stop = serve()
 			settings["base"] = server.URL
 		}
diff --git a/services/core/tests/integration/self_hosted_initial_public_test.go b/services/core/tests/integration/self_hosted_initial_public_test.go
index be5360247..329d15a6a 100644
--- a/services/core/tests/integration/self_hosted_initial_public_test.go
+++ b/services/core/tests/integration/self_hosted_initial_public_test.go
@@ -30,7 +30,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, _ := NewModelTestStore(t)
+	s, _ := testStore(t)
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	token, peer, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
@@ -47,7 +47,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 		} else {
 			// Without a Worker, Core keeps its executor URL but admits nothing.
 			enabled = append(enabled, func(d *api.Dependencies) {
-				d.Execution = &api.Execution{
+				d.Execution = api.Execution{
 					ExecutorURL:      origin,
 					SessionAdmission: unavailableAdmission{},
 					InputAdmission:   unavailableAdmission{},
@@ -155,7 +155,7 @@ func TestSelfHostedInitialCreationOfficialClient(t *testing.T) {
 	awaitRelease()
 	server.Close()
 	s.pool.Close()
-	reopened, _ := NewModelTestStore(t)
+	reopened, _ := testStore(t)
 	worker, stop = publicInitialWorker(t, reopened)
 	server = serve(reopened, worker)
 	settings["base"], settings["accepted"] = server.URL, accepted
diff --git a/services/core/tests/integration/session_agent_filter_public_test.go b/services/core/tests/integration/session_agent_filter_public_test.go
index e6239c311..6911adec0 100644
--- a/services/core/tests/integration/session_agent_filter_public_test.go
+++ b/services/core/tests/integration/session_agent_filter_public_test.go
@@ -23,14 +23,14 @@ func TestSessionAgentFilterOfficialClient(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore := New(s.pool)
-	h, err = publicHandler(t, recoveredStore, auth, "codex", storeExecution(t, recoveredStore))
+	recoveredStore := New(t, s.pool)
+	h, err = publicHandler(t, recoveredStore, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_artifacts_test.go b/services/core/tests/integration/session_artifacts_test.go
index 6db473180..a998c8da7 100644
--- a/services/core/tests/integration/session_artifacts_test.go
+++ b/services/core/tests/integration/session_artifacts_test.go
@@ -156,7 +156,7 @@ func testSessionArtifactsPublishVersionScopeAndLifetime(t *testing.T, kind strin
 		t.Fatal(err)
 	}
 	for _, a := range page.Artifacts {
-		if err := sessionAdapter(New(pool)).ReadSessionArtifact(t.Context(), tenant, session, a.ID, func(meta sessions.Artifact, r io.Reader) error {
+		if err := sessionAdapter(New(t, pool)).ReadSessionArtifact(t.Context(), tenant, session, a.ID, func(meta sessions.Artifact, r io.Reader) error {
 			if err := sessionAdapter(s).DeleteSessionArtifact(t.Context(), tenant, session, a.ID); err != nil {
 				return err
 			}
diff --git a/services/core/tests/integration/session_deletion_lifecycle_public_test.go b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
index 440acbe68..112f33ff9 100644
--- a/services/core/tests/integration/session_deletion_lifecycle_public_test.go
+++ b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
@@ -31,7 +31,7 @@ func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "deletion-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "deletion-foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s), executorURL("https://executor.example"))
+	h, err := publicHandler(t, s, auth, "codex", executorURL("https://executor.example"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_deletion_public_test.go b/services/core/tests/integration/session_deletion_public_test.go
index 65fae5e91..e8abb5bed 100644
--- a/services/core/tests/integration/session_deletion_public_test.go
+++ b/services/core/tests/integration/session_deletion_public_test.go
@@ -23,13 +23,13 @@ func TestSessionDeletionOfficialClient(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	h, err = publicHandler(t, New(s.pool), auth, "codex", storeExecution(t, New(s.pool)))
+	h, err = publicHandler(t, New(t, s.pool), auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_deletion_test.go b/services/core/tests/integration/session_deletion_test.go
index 724ad4555..f23b20593 100644
--- a/services/core/tests/integration/session_deletion_test.go
+++ b/services/core/tests/integration/session_deletion_test.go
@@ -116,7 +116,7 @@ func TestSessionDeletionWaitsForSettledTurnAndRejectsAdmission(t *testing.T) {
 				t.Fatal(err)
 			}
 			marker := sessionDeletedAt(t, pool, session.ID)
-			fresh := New(pool)
+			fresh := New(t, pool)
 			// The owner's repeated deletion confirms again without another write.
 			for _, repeat := range []*Store{s, fresh} {
 				if err := sessionService(t, repeat).DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
@@ -282,7 +282,7 @@ func TestSessionDeletionRacesAdmissionUnderSessionLock(t *testing.T) {
 			t.Fatal(err)
 		}
 		t.Cleanup(instrumented.Close)
-		return New(instrumented)
+		return New(t, instrumented)
 	}
 	for _, kind := range admissions {
 		t.Run(kind.name+"/admission-first", func(t *testing.T) {
@@ -339,7 +339,7 @@ func TestSessionDeletionRacesAdmissionUnderSessionLock(t *testing.T) {
 		t.Run(kind.name+"/concurrent", func(t *testing.T) {
 			for range 8 {
 				tenant, session := kind.setup(t, plain)
-				other := New(pool)
+				other := New(t, pool)
 				start := make(chan struct{})
 				results := make(chan error, 2)
 				go func() {
diff --git a/services/core/tests/integration/session_events_test.go b/services/core/tests/integration/session_events_test.go
index 210b755ab..5a14b6aa1 100644
--- a/services/core/tests/integration/session_events_test.go
+++ b/services/core/tests/integration/session_events_test.go
@@ -102,7 +102,7 @@ func TestSessionEventsCommitSnapshotsRetriesAndIsolation(t *testing.T) {
 	var all []sessions.SessionChange
 	cursor := int64(0)
 	for {
-		page, err := sessionAdapter(New(pool)).ListSessionEvents(ctx, tenant, session.ID, cursor)
+		page, err := sessionAdapter(New(t, pool)).ListSessionEvents(ctx, tenant, session.ID, cursor)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/session_execution_configuration_test.go b/services/core/tests/integration/session_execution_configuration_test.go
index 3f6f5f45a..0043ac053 100644
--- a/services/core/tests/integration/session_execution_configuration_test.go
+++ b/services/core/tests/integration/session_execution_configuration_test.go
@@ -60,7 +60,7 @@ func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testi
 					t.Fatal(err)
 				}
 				// A reader without the encryption key can use the safe snapshot after restart.
-				reader := New(pool)
+				reader := New(t, pool)
 				frozen, err := sessionAdapter(reader).GetSessionExecutionConfiguration(t.Context(), tenant, session.ID)
 				if err != nil {
 					t.Fatal(err)
diff --git a/services/core/tests/integration/session_model_execution_http_test.go b/services/core/tests/integration/session_model_execution_http_test.go
index 9a1e6c2f1..3300e84a7 100644
--- a/services/core/tests/integration/session_model_execution_http_test.go
+++ b/services/core/tests/integration/session_model_execution_http_test.go
@@ -18,7 +18,7 @@ func TestModelExecutionHTTPWriteOnlyAndStrictAdmission(t *testing.T) {
 	st := NewWithCredentialCipher(pool, cipher)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "catalog-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
-	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), managedSandboxes(t, st))
+	handler, err := publicHandler(t, st, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_reads_fixture_test.go b/services/core/tests/integration/session_reads_fixture_test.go
index 6dbc04a1b..3aa8e060e 100644
--- a/services/core/tests/integration/session_reads_fixture_test.go
+++ b/services/core/tests/integration/session_reads_fixture_test.go
@@ -2,6 +2,7 @@ package integration
 
 import (
 	"context"
+	"testing"
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -14,8 +15,8 @@ import (
 // FixtureEnvironmentDevice provisions the dedicated Runtime device of the
 // tenant's hosted Environment on pool through the procedure the managed
 // Runtime allocation runs, without the allocation.
-func FixtureEnvironmentDevice(ctx context.Context, pool *pgxpool.Pool, tenant, environment, name, credentialHash string) (sessions.ExecutionDevice, error) {
-	s := New(pool)
+func FixtureEnvironmentDevice(t testing.TB, ctx context.Context, pool *pgxpool.Pool, tenant, environment, name, credentialHash string) (sessions.ExecutionDevice, error) {
+	s := New(t, pool)
 	current, err := sessionAdapter(s).GetEnvironment(ctx, tenant, environment)
 	if err != nil {
 		return sessions.ExecutionDevice{}, err
diff --git a/services/core/tests/integration/session_reference_retry_public_test.go b/services/core/tests/integration/session_reference_retry_public_test.go
index 5ee70df0a..e3b066edf 100644
--- a/services/core/tests/integration/session_reference_retry_public_test.go
+++ b/services/core/tests/integration/session_reference_retry_public_test.go
@@ -37,7 +37,7 @@ func TestSavedReferenceRetryOfficialClient(t *testing.T) {
 	}
 	server := httptest.NewServer(handler)
 	defer server.Close()
-	recovered, err := publicHandler(t, New(s.pool), auth, "codex")
+	recovered, err := publicHandler(t, New(t, s.pool), auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/sessions_test.go b/services/core/tests/integration/sessions_test.go
index 9e945672c..d222712f4 100644
--- a/services/core/tests/integration/sessions_test.go
+++ b/services/core/tests/integration/sessions_test.go
@@ -19,7 +19,7 @@ import (
 func testStore(t *testing.T) (*Store, *pgxpool.Pool) {
 	t.Helper()
 	pool := pgtest.Open(t)
-	return New(pool), pool
+	return New(t, pool), pool
 }
 
 // sessionAdapter is the Session adapter on s's database with s's credential
diff --git a/services/core/tests/integration/stream_authority_http_test.go b/services/core/tests/integration/stream_authority_http_test.go
index 3ca7984c7..6c7ebde70 100644
--- a/services/core/tests/integration/stream_authority_http_test.go
+++ b/services/core/tests/integration/stream_authority_http_test.go
@@ -42,7 +42,7 @@ func TestLiveStreamClosesAfterKeyRevocationOrProjectArchive(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			h, err := publicHandler(t, s, nil, "codex", storeKeys(s), storeExecution(t, s))
+			h, err := publicHandler(t, s, nil, "codex", storeKeys(s))
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/tests/integration/subagent_resources_test.go b/services/core/tests/integration/subagent_resources_test.go
index 474f4cb6e..1cfbf33c8 100644
--- a/services/core/tests/integration/subagent_resources_test.go
+++ b/services/core/tests/integration/subagent_resources_test.go
@@ -146,7 +146,7 @@ func TestSubagentResourcesNativeOwnershipLifecycleAndRecovery(t *testing.T) {
 		t.Fatal(value, err)
 	}
 	appendFacts(subagentFact(proto.TypeSubagentLifecycle, resumed), subagentFact(proto.TypeSubagentLifecycle, resumed))
-	reopened := sessionAdapter(New(pool))
+	reopened := sessionAdapter(New(t, pool))
 	value, err = reopened.GetSubagent(ctx, tenant, session.ID, child.ID)
 	if err != nil || value.Status != "active" || value.ClosedAt != nil || value.OpenedAt != 100 {
 		t.Fatal(value, err)
diff --git a/services/core/tests/integration/subagent_visibility_public_test.go b/services/core/tests/integration/subagent_visibility_public_test.go
index b6b7ec69e..e8140f88f 100644
--- a/services/core/tests/integration/subagent_visibility_public_test.go
+++ b/services/core/tests/integration/subagent_visibility_public_test.go
@@ -76,7 +76,7 @@ func TestSubagentVisibilityPublic(t *testing.T) {
 		{OrganizationID: "test-org", ProjectID: tenant, SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "foreign", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()},
 	})
-	handler, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	handler, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/template_composition_public_test.go b/services/core/tests/integration/template_composition_public_test.go
index a958e47ac..1a483d6fb 100644
--- a/services/core/tests/integration/template_composition_public_test.go
+++ b/services/core/tests/integration/template_composition_public_test.go
@@ -39,7 +39,7 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 	serve := func(current *Store) *httptest.Server {
 		t.Helper()
 		// Hosted admission and freezing use the real Store; no Runtime or model runs.
-		h, err := publicHandler(t, current, auth, "codex", storeExecution(t, current), managedSandboxes(t, current), fixtureDeploymentProvider())
+		h, err := publicHandler(t, current, auth, "codex", fixtureDeploymentProvider())
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/template_null_selection_public_test.go b/services/core/tests/integration/template_null_selection_public_test.go
index 368e7f5e5..f35cfecfd 100644
--- a/services/core/tests/integration/template_null_selection_public_test.go
+++ b/services/core/tests/integration/template_null_selection_public_test.go
@@ -40,7 +40,7 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 	})
 	serve := func(current *Store) *httptest.Server {
 		t.Helper()
-		h, err := publicHandler(t, current, auth, "codex", storeExecution(t, current), managedSandboxes(t, current), fixtureDeploymentProvider())
+		h, err := publicHandler(t, current, auth, "codex", fixtureDeploymentProvider())
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/tests/integration/token_usage_integration_test.go b/services/core/tests/integration/token_usage_integration_test.go
index 434b4f869..a43ad2dfa 100644
--- a/services/core/tests/integration/token_usage_integration_test.go
+++ b/services/core/tests/integration/token_usage_integration_test.go
@@ -83,7 +83,7 @@ func TestTokenUsageDurableSnapshotsAndSessionTotals(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer restored.Close()
-	fresh := New(restored)
+	fresh := New(t, restored)
 	got, err := sessionAdapter(fresh).GetSession(ctx, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/unified_model_configuration_http_test.go b/services/core/tests/integration/unified_model_configuration_http_test.go
index bfcea9301..acc25954d 100644
--- a/services/core/tests/integration/unified_model_configuration_http_test.go
+++ b/services/core/tests/integration/unified_model_configuration_http_test.go
@@ -21,7 +21,7 @@ func TestUnifiedModelConfigurationHTTP(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	handler, err := publicHandler(t, st, auth, "codex", storeExecution(t, st), managedSandboxes(t, st), withCoreKeys(admin), withHarnesses([]string{"codex", "claude_sdk"}))
+	handler, err := publicHandler(t, st, auth, "codex", withCoreKeys(admin), withHarnesses([]string{"codex", "claude_sdk"}))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/unstorable_text_public_test.go b/services/core/tests/integration/unstorable_text_public_test.go
index 01f1f9804..e98651f8a 100644
--- a/services/core/tests/integration/unstorable_text_public_test.go
+++ b/services/core/tests/integration/unstorable_text_public_test.go
@@ -27,7 +27,7 @@ func TestUnstorableTextRejectsWithoutWritesPostgres(t *testing.T) {
 	s := NewWithCredentialCipher(pool, cipher)
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "nul-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/vaults_fixture_test.go b/services/core/tests/integration/vaults_fixture_test.go
index 5249ca3ea..f547fea5a 100644
--- a/services/core/tests/integration/vaults_fixture_test.go
+++ b/services/core/tests/integration/vaults_fixture_test.go
@@ -8,7 +8,6 @@ import (
 )
 
 // fixtureVaults builds the Vault adapter and service on s, as cmd/server does.
-// A keyless s leaves the operations that need no credential key available.
 func fixtureVaults(s *Store) (*vaultpg.Store, *vaults.Service, error) {
 	refresher, err := oauthrefresh.NewClient(nil)
 	if err != nil {
diff --git a/services/core/tests/integration/whitespace_input_public_test.go b/services/core/tests/integration/whitespace_input_public_test.go
index 3954c0b49..8229359e7 100644
--- a/services/core/tests/integration/whitespace_input_public_test.go
+++ b/services/core/tests/integration/whitespace_input_public_test.go
@@ -22,7 +22,7 @@ func TestWhitespaceInputStoredVerbatimPostgres(t *testing.T) {
 	s, _ := newManagedTestStore(t)
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "whitespace-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}})
-	h, err := publicHandler(t, s, auth, "codex", storeExecution(t, s))
+	h, err := publicHandler(t, s, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/worker_input_race_test.go b/services/core/tests/integration/worker_input_race_test.go
index 76030a770..f828ce90f 100644
--- a/services/core/tests/integration/worker_input_race_test.go
+++ b/services/core/tests/integration/worker_input_race_test.go
@@ -59,7 +59,7 @@ func TestWorkerInputReadSkipsConcurrentlyCancelledCandidate(t *testing.T) {
 			defer instrumented.Close()
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
-			worker := startWorker(t, ctx, New(instrumented), h.d)
+			worker := startWorker(t, ctx, New(t, instrumented), h.d)
 			done := make(chan error, 1)
 			go func() { done <- worker.Run(ctx) }()
 			defer func() {
diff --git a/services/core/tests/integration/worker_wakeup_test.go b/services/core/tests/integration/worker_wakeup_test.go
index 3f4543fb6..5ab16df8d 100644
--- a/services/core/tests/integration/worker_wakeup_test.go
+++ b/services/core/tests/integration/worker_wakeup_test.go
@@ -45,7 +45,7 @@ func TestWorkerSchedulerCommittedAdmissionWakesBeforeMaintenance(t *testing.T) {
 			defer instrumented.Close()
 			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
-			worker := startWorker(t, ctx, NewWithCredentialCipher(instrumented, fixtureCipher), h.d)
+			worker := startWorker(t, ctx, New(t, instrumented), h.d)
 			done := make(chan error, 1)
 			started := false
 			defer func() {
diff --git a/services/core/tests/official_client.py b/services/core/tests/official_client.py
index b47c1fe15..2b9bfe0a4 100644
--- a/services/core/tests/official_client.py
+++ b/services/core/tests/official_client.py
@@ -23,12 +23,12 @@
 from official_agents import verify_agents
 from official_vaults import verify_vaults, verify_vault_recovery
 from official_vault_list import verify_vault_list, verify_vault_list_recovery
-from official_credentials import verify_credentials, verify_credential_recovery, verify_credential_storage_disabled
+from official_credentials import verify_credentials, verify_credential_recovery, create_old_key_credential, verify_old_key_credential
 from official_credential_list import verify_credential_list, verify_credential_list_recovery
 from official_mcp_credentials import verify_mcp_credentials, verify_mcp_credential_recovery
 from official_credential_rotation import verify_credential_rotation, verify_rotation_recovery
-from official_credential_delete import verify_credential_deletion, verify_credential_deletion_recovery, verify_keyless_credential_deletion
-from official_vault_delete import verify_vault_deletion, verify_vault_deletion_recovery, verify_keyless_vault_deletion
+from official_credential_delete import verify_credential_deletion, verify_credential_deletion_recovery, verify_key_lost_credential_deletion
+from official_vault_delete import verify_vault_deletion, verify_vault_deletion_recovery, verify_key_lost_vault_deletion
 from official_agent_list import verify_agent_list
 from official_http_routing import verify_http_routing
 from official_agent_references import verify_agent_references
@@ -80,12 +80,16 @@ def project_bindings(directory):
         core_key_digests.write_text(json.dumps([hashlib.sha256(admin_token.encode()).hexdigest()]))
         credential_key = Path(directory) / "credential-key.txt"
         credential_key.touch(mode=0o600)
-        credential_key_value = base64.b64encode(secrets.token_bytes(32)).decode()
-        credential_key.write_text(credential_key_value + "\n")
+        credential_key_values = [base64.b64encode(secrets.token_bytes(32)).decode()]
+        credential_key.write_text(credential_key_values[0] + "\n")
+        # The database records the first installation ID it sees, so every run uses this one.
+        installation_id = Path(directory) / "installation.id"
+        installation_id.touch(mode=0o600)
+        installation_id.write_text("3f8e2c71-5b0d-4e6a-9c47-1d2a8b6f0e53\n")
         env = dict(os.environ, OAC_DATABASE_URL=dsn, OAC_CORE_KEY_DIGESTS_FILE=str(core_key_digests), OAC_ADDR=f"127.0.0.1:{port}", OAC_DEFAULT_HARNESS="codex")
         env["OAC_CREDENTIAL_KEY_FILE"] = str(credential_key)
-        # Enable the real Worker/gateway admission path without connecting a daemon.
-        # Synthetic fixture inputs remain queued; this is not live model acceptance.
+        env["OAC_INSTALLATION_ID_FILE"] = str(installation_id)
+        # No daemon connects: synthetic fixture inputs remain queued; this is not live model acceptance.
         env["OAC_PUBLIC_URL"] = f"http://127.0.0.1:{port}"
         with (Path(directory) / "server.log").open("w+") as log:
             def start():
@@ -326,24 +330,27 @@ def issue_key(project_id, name):
                 process = start()
                 with client(tokens[0]) as a:
                     verify_mcp_credential_recovery(a, claude_credentials)
+                    old_key_credential = create_old_key_credential(a, credential_canary)
                 process.terminate()
                 process.wait(timeout=15)
                 env["OAC_DEFAULT_HARNESS"] = "codex"
-                env.pop("OAC_CREDENTIAL_KEY_FILE")
+                # The operator lost the key: Core restarts under a new one.
+                credential_key_values.append(base64.b64encode(secrets.token_bytes(32)).decode())
+                credential_key.write_text(credential_key_values[-1] + "\n")
                 process = start()
-                with client(tokens[0]) as without_key, client(tokens[1]) as other, client(peer_key) as peer:
-                    verify_credential_storage_disabled(without_key, saved_credentials[0][0], credential_canary, expect_error)
-                    verify_keyless_credential_deletion(without_key, credential_deletion, expect_error)
-                    verify_keyless_vault_deletion(without_key, vault_deletion, expect_error)
-                    verify_credential_list_recovery(without_key, other, peer, listed_credentials,
-                                                    credential_canary, phase="restart without the storage key")
+                with client(tokens[0]) as a, client(tokens[1]) as other, client(peer_key) as peer:
+                    verify_old_key_credential(a, old_key_credential, credential_canary, expect_error)
+                    verify_key_lost_credential_deletion(a, credential_deletion, expect_error)
+                    verify_key_lost_vault_deletion(a, vault_deletion, expect_error)
+                    verify_credential_list_recovery(a, other, peer, listed_credentials,
+                                                    credential_canary, phase="restart under a replaced credential key")
                 print("Caller principal: SDK/raw HTTP scope checks, shared Project access and persistent scope recovery passed.")
                 print("Official Turn client: lifecycle, Agent identity, safe errors, restart recovery, pagination and tenant/Session isolation passed.")
                 print("Official Go client: creation/retries, retrieval, bidirectional pagination and tenant isolation passed.")
                 print("Official client: upstream and generated response schemas, persistence/restart, retries, pagination, tenant isolation and explicit unsupported options passed.")
             finally:
                 finish_server(process, log, [admin_token, *tokens, credential_canary,
-                                            credential_key_value], sys.exc_info()[1])
+                                            *credential_key_values], sys.exc_info()[1])
 
 
 if __name__ == "__main__":
diff --git a/services/core/tests/official_credential_delete.py b/services/core/tests/official_credential_delete.py
index aef43b2d5..2d7a01b4d 100644
--- a/services/core/tests/official_credential_delete.py
+++ b/services/core/tests/official_credential_delete.py
@@ -12,7 +12,7 @@ def verify_credential_deletion(client, other, invalid, peer, canary, expect_erro
     credentials = client.beta.agents.vaults.credentials
     auth = {"type": "static_bearer", "mcp_server_url": "https://example.invalid/delete", "token": canary}
     values = [credentials.create(vault.id, name=name, auth=auth)
-              for name in ["SDK target", "HTTP target", "Keyless target", "Retained sibling"]]
+              for name in ["SDK target", "HTTP target", "Key-lost target", "Retained sibling"]]
     foreign = other.beta.agents.vaults.credentials.create(foreign_vault.id, name="Foreign", auth=auth)
     headers = {"Authorization": f"Bearer {client.api_key}", "OpenAI-Beta": "agents=v1"}
     endpoint = str(client.base_url).rstrip("/") + "/vaults/" + vault.id + "/credentials"
@@ -69,7 +69,7 @@ def verify_credential_deletion_recovery(client, other, saved, expect_error):
     print("Credential deletion: absent resources and unaffected siblings survived API restart.")
 
 
-def verify_keyless_credential_deletion(client, saved, expect_error):
+def verify_key_lost_credential_deletion(client, saved, expect_error):
     values, _ = saved
     target, sibling = values[2:]
     credentials = client.beta.agents.vaults.credentials
@@ -78,4 +78,4 @@ def verify_keyless_credential_deletion(client, saved, expect_error):
     expect_error(NotFoundError, lambda: credentials.retrieve(target.id, vault_id=target.vault_id))
     assert credentials.retrieve(sibling.id, vault_id=sibling.vault_id) == sibling
     assert list(credentials.list(target.vault_id)) == [sibling]
-    print("Credential deletion: no storage key required; safe sibling metadata remains available.")
+    print("Credential deletion: works under a replaced key; safe sibling metadata remains available.")
diff --git a/services/core/tests/official_credentials.py b/services/core/tests/official_credentials.py
index a3f1efc47..7fadff761 100644
--- a/services/core/tests/official_credentials.py
+++ b/services/core/tests/official_credentials.py
@@ -147,27 +147,22 @@ def verify_credential_recovery(client, other, peer, saved):
     print("Static credentials: exact SDK/raw metadata and shared-project reads survived the service restart.")
 
 
-def verify_credential_storage_disabled(client, value, canary, expect_error):
+def create_old_key_credential(client, canary):
+    vault = client.beta.agents.vaults.create(name="Sealed under the old key")
+    return client.beta.agents.vaults.credentials.create(vault.id, name="Old key", auth={
+        "type": "mcp_oauth", "mcp_server_url": "https://example.invalid/old-key", "access_token": canary})
+
+
+def verify_old_key_credential(client, value, canary, expect_error):
     credentials = client.beta.agents.vaults.credentials
     assert credentials.retrieve(value.id, vault_id=value.vault_id) == value
-    request = {"name": "Disabled storage", "auth": {**value.auth.to_dict(), "token": canary}}
-    error = expect_error(InternalServerError, lambda: credentials.create(value.vault_id, **request))
-    assert error.status_code == 503 and error.body["code"] == "credential_storage_unavailable"
+    error = expect_error(InternalServerError, lambda: credentials.update(
+        value.id, vault_id=value.vault_id, auth={"type": "mcp_oauth", "access_token": canary + "replacement"}))
+    assert error.status_code == 500 and error.body["code"] == "internal_error"
     assert canary not in error.response.text
-    with httpx2.Client(trust_env=False, timeout=10) as raw:
-        response = raw.post(str(client.base_url).rstrip("/") + "/vaults/" + value.vault_id + "/credentials",
-                            headers={"Authorization": f"Bearer {client.api_key}", "OpenAI-Beta": "agents=v1"},
-                            json=request)
-        assert response.status_code == 503 and canary not in response.text
-        replacement = {"auth": {"type": "static_bearer", "token": canary + "replacement"}}
-        error = expect_error(InternalServerError, lambda: credentials.update(value.id, vault_id=value.vault_id, **replacement))
-        assert error.status_code == 503 and error.body["code"] == "credential_storage_unavailable"
-        assert canary not in error.response.text
-        response = raw.post(str(client.base_url).rstrip("/") + "/vaults/" + value.vault_id + "/credentials/" + value.id,
-                            headers={"Authorization": f"Bearer {client.api_key}", "OpenAI-Beta": "agents=v1"},
-                            json=replacement)
-        assert response.status_code == 503 and canary not in response.text
-        assert credentials.retrieve(value.id, vault_id=value.vault_id) == value
-    vault = client.beta.agents.vaults.create(name="Non-secret resource without credential key")
-    assert client.beta.agents.vaults.retrieve(vault.id) == vault
-    print("Static credentials: absent key rejects SDK/raw writes while safe reads and Vault creation remain available.")
+    assert credentials.retrieve(value.id, vault_id=value.vault_id) == value
+    created = credentials.create(value.vault_id, name="New key", auth={
+        "type": "static_bearer", "mcp_server_url": "https://example.invalid/new-key", "token": canary})
+    assert canary not in created.model_dump_json()
+    assert credentials.delete(created.id, vault_id=created.vault_id).deleted
+    print("Credential key replacement: an old secret fails closed without leaking while new secrets are stored.")
diff --git a/services/core/tests/official_vault_delete.py b/services/core/tests/official_vault_delete.py
index b69154cfe..301a7d478 100644
--- a/services/core/tests/official_vault_delete.py
+++ b/services/core/tests/official_vault_delete.py
@@ -1,4 +1,4 @@
-"""Pinned Vault deletion, child removal, scoped retries and keyless recovery."""
+"""Pinned Vault deletion, child removal, scoped retries and deletion under a replaced key."""
 
 import uuid
 
@@ -8,11 +8,11 @@
 
 def verify_vault_deletion(client, other, invalid, peer, canary, expect_error):
     vaults = client.beta.agents.vaults
-    values = [vaults.create(name=name) for name in ["Cascade target", "Empty HTTP target", "Keyless target", "Retained Vault"]]
+    values = [vaults.create(name=name) for name in ["Cascade target", "Empty HTTP target", "Key-lost target", "Retained Vault"]]
     foreign = other.beta.agents.vaults.create(name="Foreign Vault deletion")
     auth = {"type": "static_bearer", "mcp_server_url": "https://example.invalid/vault-delete", "token": canary}
     children = [vaults.credentials.create(values[0].id, name=str(i), auth=auth) for i in range(3)]
-    keyless = vaults.credentials.create(values[2].id, name="Keyless child", auth=auth)
+    key_lost = vaults.credentials.create(values[2].id, name="Key-lost child", auth=auth)
     retained = vaults.credentials.create(values[3].id, name="Retained child", auth=auth)
     foreign_child = other.beta.agents.vaults.credentials.create(foreign.id, name="Foreign child", auth=auth)
     spec = {"input": "Verify vault delete fixture admission.", "agent": {"model": "requested-model"}, "environment": {"type": "none"}, "vault_ids": [values[0].id, values[3].id]}
@@ -73,11 +73,11 @@ def verify_vault_deletion(client, other, invalid, peer, canary, expect_error):
     assert other.beta.agents.vaults.retrieve(foreign.id) == foreign
     assert other.beta.agents.vaults.credentials.retrieve(foreign_child.id, vault_id=foreign.id) == foreign_child
     print("Vault deletion: SDK/raw confirmation, cascade visibility, scope and retained Session identity passed.")
-    return values, keyless, retained, foreign, foreign_child, spec, headers, session
+    return values, key_lost, retained, foreign, foreign_child, spec, headers, session
 
 
 def verify_vault_deletion_recovery(client, other, saved, expect_error):
-    values, keyless, retained, foreign, foreign_child, spec, headers, session = saved
+    values, key_lost, retained, foreign, foreign_child, spec, headers, session = saved
     vaults = client.beta.agents.vaults
     for target in values[:2]:
         expect_error(NotFoundError, lambda: vaults.retrieve(target.id))
@@ -85,7 +85,7 @@ def verify_vault_deletion_recovery(client, other, saved, expect_error):
         expect_error(NotFoundError, lambda: vaults.credentials.list(target.id))
     for value in values[2:]:
         assert vaults.retrieve(value.id) == value
-    for child in [keyless, retained]:
+    for child in [key_lost, retained]:
         assert vaults.credentials.retrieve(child.id, vault_id=child.vault_id) == child
     assert other.beta.agents.vaults.retrieve(foreign.id) == foreign
     assert other.beta.agents.vaults.credentials.retrieve(foreign_child.id, vault_id=foreign.id) == foreign_child
@@ -95,7 +95,7 @@ def verify_vault_deletion_recovery(client, other, saved, expect_error):
     print("Vault deletion: absent parents/children, unaffected resources and Session retry survived API restart.")
 
 
-def verify_keyless_vault_deletion(client, saved, expect_error):
+def verify_key_lost_vault_deletion(client, saved, expect_error):
     values, child, retained, *_ = saved
     vaults, target = client.beta.agents.vaults, values[2]
     assert vaults.delete(target.id).to_dict() == {"id": target.id, "deleted": True, "object": "vault.deleted"}
@@ -104,4 +104,4 @@ def verify_keyless_vault_deletion(client, saved, expect_error):
     expect_error(NotFoundError, lambda: vaults.credentials.list(target.id))
     assert vaults.retrieve(values[3].id) == values[3]
     assert vaults.credentials.retrieve(retained.id, vault_id=retained.vault_id) == retained
-    print("Vault deletion: keyless cascade removed stored children while another Vault remained usable.")
+    print("Vault deletion: the cascade under a replaced key removed stored children while another Vault remained usable.")

From f6656de9e79e59f97161e30ac49a62625d26e181 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 11:32:42 +0800
Subject: [PATCH 50/60] Keep vendor node settings in the adapter (#543)

---
 deploy/node/node_generations.py               |  66 ++++++-----
 deploy/node/node_install.py                   |  14 +--
 deploy/node/node_spec.py                      |  13 +--
 .../test_generation_review_regressions.py     |   6 +-
 deploy/node/test_node_generations.py          |  12 +-
 deploy/node/test_node_install.py              |  39 ++-----
 docs/configuration.md                         |   3 +-
 docs/getting-started/nodes.md                 |   6 +-
 docs/sandbox-provider.md                      |  13 ++-
 docs/zh/configuration.md                      |   5 +-
 docs/zh/getting-started/nodes.md              |   8 +-
 docs/zh/sandbox-provider.md                   |  15 +--
 services/core/cmd/sandbox-node/generations.go |  38 +++---
 .../core/cmd/sandbox-node/generations_test.go |  24 +++-
 services/core/cmd/sandbox-node/main.go        |   2 +-
 services/core/internal/sandbox/deployment.go  |   5 +
 services/core/internal/sandbox/docker/node.go | 108 ++++++++++++++++++
 .../core/internal/sandbox/docker/node_test.go |  85 ++++++++++++++
 .../capacity_linux.go                         |   4 +-
 .../capacity_other.go                         |   2 +-
 .../generation_probe_test.go                  |   6 +-
 .../internal/sandbox/microsandbox/node.go     | 100 ++++++++++++++++
 .../sandbox/microsandbox/node_test.go         |  53 +++++++++
 .../{providers => microsandbox}/probe.go      |  48 ++------
 .../{providers => microsandbox}/probe_test.go |  66 +----------
 .../core/internal/sandbox/node/generations.go |   9 ++
 .../core/internal/sandbox/node_diagnostic.go  |  13 ++-
 .../internal/sandbox/providers/capacity.go    |  14 ---
 .../core/internal/sandbox/providers/config.go |  86 ++++----------
 .../internal/sandbox/providers/config_test.go |  46 ++------
 .../core/internal/sandbox/providers/docker.go |  46 --------
 .../sandbox/providers/generation_test.go      |  72 +++---------
 .../sandbox/providers/microsandbox.go         |  92 ---------------
 .../sandbox/providers/registration_test.go    |  10 +-
 .../internal/sandbox/providers/registry.go    |  13 +--
 .../sandbox/providers/registry_test.go        |   2 +-
 .../sandbox/providers/specification.go        |  42 -------
 .../core/internal/sandbox/sandbox_provider.go |  34 ++++++
 38 files changed, 607 insertions(+), 613 deletions(-)
 create mode 100644 services/core/internal/sandbox/docker/node.go
 create mode 100644 services/core/internal/sandbox/docker/node_test.go
 rename services/core/internal/sandbox/{providers => microsandbox}/capacity_linux.go (73%)
 rename services/core/internal/sandbox/{providers => microsandbox}/capacity_other.go (90%)
 rename services/core/internal/sandbox/{providers => microsandbox}/generation_probe_test.go (90%)
 create mode 100644 services/core/internal/sandbox/microsandbox/node.go
 create mode 100644 services/core/internal/sandbox/microsandbox/node_test.go
 rename services/core/internal/sandbox/{providers => microsandbox}/probe.go (63%)
 rename services/core/internal/sandbox/{providers => microsandbox}/probe_test.go (57%)
 delete mode 100644 services/core/internal/sandbox/providers/capacity.go
 delete mode 100644 services/core/internal/sandbox/providers/docker.go
 delete mode 100644 services/core/internal/sandbox/providers/microsandbox.go
 delete mode 100644 services/core/internal/sandbox/providers/specification.go

diff --git a/deploy/node/node_generations.py b/deploy/node/node_generations.py
index 158eaf827..70e61fe0d 100644
--- a/deploy/node/node_generations.py
+++ b/deploy/node/node_generations.py
@@ -136,8 +136,8 @@ def root_runtime_files(root, value, others, installer):
     """Return only verified original Runtime files that no retained config uses."""
     def paths(configuration):
         if configuration["provider"] == "docker":
-            return [Path(configuration["docker"]["seccomp_file"])]
-        return [Path(configuration["microsandbox"][key]) for key in ("helper_path", "runtime_path", "firmware_path")]
+            return [Path(configuration["native"]["seccomp_file"])]
+        return [Path(configuration["native"][key]) for key in ("helper_path", "runtime_path", "firmware_path")]
     names = ["runtime/seccomp.json", "images/runtime.tar.gz", "images/runtime.tar"]
     if value["provider"] == "microsandbox":
         names.extend(installer.MICRO)
@@ -227,14 +227,14 @@ def validate_preparation_plan(root, plan, base, installer):
     if not re.fullmatch(r"[a-f0-9]{40}", source):
         raise installer.InstallError("Preparation release identity differs")
     if plan["provider"] == "docker":
-        policy = Path(plan["docker"]["seccomp_file"])
+        policy = Path(plan["native"]["seccomp_file"])
         if policy not in (root / "runtime/seccomp.json", root / "releases" / source / "runtime/seccomp.json"):
             raise installer.InstallError("Preparation policy is outside its immutable release")
-        if plan["docker"]["image"] not in (runtime["image_id"], runtime["image_manifest_digest"]):
+        if plan["native"]["image"] not in (runtime["image_id"], runtime["image_manifest_digest"]):
             raise installer.InstallError("Preparation image differs from the specification")
         installer.no_links(policy)
     else:
-        micro = plan["microsandbox"]
+        micro = plan["native"]
         paths = [Path(micro[key]) for key in ("helper_path", "runtime_path", "firmware_path")]
         if not any(paths == [release / name for name in installer.MICRO] for release in (root, root / "releases" / source)):
             raise installer.InstallError("Preparation artifacts are outside their immutable release")
@@ -244,17 +244,17 @@ def validate_preparation_plan(root, plan, base, installer):
         for path in paths + [expected_home]:
             installer.no_links(path)
     configuration = dict(plan, core_url=plan["core_url"].removesuffix("/api/v1"))
-    installer.node_spec.verify_provider(plan, configuration, plan.get("docker", {}).get("image"))
+    installer.node_spec.verify_provider(plan, configuration, plan.get("native", {}).get("image"))
 
 
 def verify_plan_final(plan, final, installer):
     expected = copy.deepcopy(plan)
     if plan["provider"] == "docker":
-        image = final.get("docker", {}).get("image")
+        image = final.get("native", {}).get("image")
         runtime = plan["specification"]["runtime"]
         if image not in (runtime["image_id"], runtime["image_manifest_digest"]):
             raise installer.InstallError("Final Docker image differs from the preparation specification")
-        expected["docker"]["image"] = image
+        expected["native"]["image"] = image
     if expected != final:
         raise installer.InstallError("Final generation differs from its immutable preparation plan")
 
@@ -274,9 +274,9 @@ def owned_root(args, installer):
 
 def generation_home(root, configuration, base, installer):
     runtime = configuration["specification"]["runtime"]
-    previous = base["microsandbox"]
+    previous = base["specification"]["runtime"]
     if (runtime["runtime_sha256"], runtime["firmware_sha256"]) == (previous["runtime_sha256"], previous["firmware_sha256"]):
-        return Path(previous["runtime_home"])
+        return Path(base["native"]["runtime_home"])
     material = ":".join((configuration["installation_id"], runtime["runtime_sha256"], runtime["firmware_sha256"]))
     home = Path.home() / ".oac/m" / hashlib.sha256(material.encode()).hexdigest()[:12]
     if len(os.fsencode(home)) > 48:
@@ -287,21 +287,21 @@ def generation_home(root, configuration, base, installer):
 def image_available(value, installer):
     try:
         if value["provider"] == "docker":
-            seccomp = Path(value["docker"]["seccomp_file"])
+            seccomp = Path(value["native"]["seccomp_file"])
             installer.existing_file(seccomp)
             json.loads(seccomp.read_text())
-            raw = installer.checked(list(installer.DOCKER) + ["image", "inspect", value["docker"]["image"], "--format", "{{.Id}} {{.Os}}/{{.Architecture}}"], "Cannot inspect pinned image")
-            return raw.strip() == value["docker"]["image"] + " linux/amd64"
-        micro = value["microsandbox"]
+            raw = installer.checked(list(installer.DOCKER) + ["image", "inspect", value["native"]["image"], "--format", "{{.Id}} {{.Os}}/{{.Architecture}}"], "Cannot inspect pinned image")
+            return raw.strip() == value["native"]["image"] + " linux/amd64"
+        micro, runtime = value["native"], value["specification"]["runtime"]
         for key in ("helper_path", "runtime_path", "firmware_path"):
             if not installer.existing_file(Path(micro[key])):
                 return False
-        if (installer.file_digest(Path(micro["runtime_path"])) != micro["runtime_sha256"]
-                or installer.file_digest(Path(micro["firmware_path"])) != micro["firmware_sha256"]):
+        if (installer.file_digest(Path(micro["runtime_path"])) != runtime["runtime_sha256"]
+                or installer.file_digest(Path(micro["firmware_path"])) != runtime["firmware_sha256"]):
             return False
         env = dict(os.environ, MSB_BACKEND="local", MSB_HOME=micro["runtime_home"], MSB_PATH=micro["runtime_path"], MSB_LIBKRUNFW_PATH=micro["firmware_path"])
-        image = json.loads(installer.checked([micro["runtime_path"], "image", "inspect", micro["image"], "--format", "json"], "Cannot inspect pinned image", env=env))
-        return image.get("digest") == micro["image"].split("@", 1)[1] and image.get("architecture") == "amd64" and image.get("os") == "linux"
+        image = json.loads(installer.checked([micro["runtime_path"], "image", "inspect", runtime["microsandbox_ref"], "--format", "json"], "Cannot inspect pinned image", env=env))
+        return image.get("digest") == runtime["microsandbox_ref"].split("@", 1)[1] and image.get("architecture") == "amd64" and image.get("os") == "linux"
     except (installer.InstallError, OSError, ValueError):
         return False
 
@@ -312,13 +312,13 @@ def runtime_files(root, value, args, manifest, sums, installer):
     release = root / "releases" / source
     if value is not None:
         if args.provider == "microsandbox":
-            release = Path(value["microsandbox"]["helper_path"]).parents[2]
-            if any(Path(value["microsandbox"][key]) != release / name for key, name in zip(
+            release = Path(value["native"]["helper_path"]).parents[2]
+            if any(Path(value["native"][key]) != release / name for key, name in zip(
                     ("helper_path", "runtime_path", "firmware_path"), installer.MICRO)):
                 raise installer.InstallError("Retained Runtime artifact paths differ")
         else:
-            release = Path(value["docker"]["seccomp_file"]).parents[1]
-            if Path(value["docker"]["seccomp_file"]) != release / "runtime/seccomp.json":
+            release = Path(value["native"]["seccomp_file"]).parents[1]
+            if Path(value["native"]["seccomp_file"]) != release / "runtime/seccomp.json":
                 raise installer.InstallError("Retained Runtime seccomp path differs")
         if release not in (root, root / "releases" / source):
             raise installer.InstallError("Retained Runtime artifacts are outside this installation")
@@ -377,7 +377,7 @@ def prepare(args, installer):
         value = configurations.get(args.generation)
         finalized = target.exists() or base["generation"] == args.generation
         if value is not None:
-            installer.node_spec.verify_provider(value, args.configuration, value.get("docker", {}).get("image"))
+            installer.node_spec.verify_provider(value, args.configuration, value.get("native", {}).get("image"))
         else:
             for candidate in configurations.values():
                 # Unpublished plans must never be used as ready reuse candidates.
@@ -387,8 +387,6 @@ def prepare(args, installer):
                     value = copy.deepcopy(candidate)
                     value["generation"] = args.generation
                     value["specification"] = args.configuration["specification"]
-                    if args.provider == "microsandbox":
-                        value["microsandbox"].update(value["specification"]["resources"])
                     break
         if not finalized or value is None or not image_available(value, installer):
             settings = installer.private_json(root / "preparation.json")
@@ -400,9 +398,9 @@ def prepare(args, installer):
             except installer.node_spec.SpecificationError as error:
                 raise installer.RuntimeDownloadError("Runtime release provenance differs") from error
             if args.provider == "microsandbox":
-                args.runtime_home = Path(value["microsandbox"]["runtime_home"]) if value else generation_home(root, args.configuration, base, installer)
+                args.runtime_home = Path(value["native"]["runtime_home"]) if value else generation_home(root, args.configuration, base, installer)
             if value is None:
-                value = installer.provider_config(root / "releases" / runtime["source_commit"], args, manifest, runtime["image_id"])
+                value = installer.provider_config(root / "releases" / runtime["source_commit"], args, runtime["image_id"])
             if preparation is None:
                 preparation = dict(marker_identity(args), import_started=False, configuration=copy.deepcopy(value))
                 atomic_json(directory / (str(args.generation) + ".preparing"), preparation)
@@ -422,7 +420,7 @@ def prepare(args, installer):
                 if runtime_image not in (runtime["image_id"], runtime["image_manifest_digest"]):
                     raise installer.InstallError("Resolved Docker image is outside the authorized specification")
                 value = copy.deepcopy(value)
-                value["docker"]["image"] = runtime_image
+                value["native"]["image"] = runtime_image
         if preparation and preparation.get("configuration"):
             verify_plan_final(preparation["configuration"], value, installer)
         if installer.existing_file(target):
@@ -560,26 +558,26 @@ def collect(args, installer):
 
 def collect_image(args, value, others, installer):
     if value["provider"] == "microsandbox":
-        micro = value["microsandbox"]
-        shared = [item for item in others if item["microsandbox"]["runtime_home"] == micro["runtime_home"]]
+        micro, image = value["native"], value["specification"]["runtime"]["microsandbox_ref"]
+        shared = [item for item in others if item["native"]["runtime_home"] == micro["runtime_home"]]
         home = Path(micro["runtime_home"])
         installer.no_links(home)
         if not home.is_dir() or installer.private_json(home / "oac-installation.json") != {"installation_id": args.installation_id}:
             raise installer.InstallError("Microsandbox store ownership differs")
         runtime_path = Path(micro["runtime_path"])
         installer.no_links(runtime_path)
-        if not installer.existing_file(runtime_path) or installer.file_digest(runtime_path) != micro["runtime_sha256"]:
+        if not installer.existing_file(runtime_path) or installer.file_digest(runtime_path) != value["specification"]["runtime"]["runtime_sha256"]:
             raise installer.InstallError("Cannot verify retained microsandbox executable")
         env = dict(os.environ, MSB_BACKEND="local", MSB_HOME=micro["runtime_home"], MSB_PATH=micro["runtime_path"], MSB_LIBKRUNFW_PATH=micro["firmware_path"])
-        if not any(item["microsandbox"]["image"] == micro["image"] for item in shared):
+        if not any(item["specification"]["runtime"]["microsandbox_ref"] == image for item in shared):
             # A failed inspect/remove is not proof of absence. A successful full
             # inventory must contain only understood immutable references.
             raw = installer.checked([micro["runtime_path"], "image", "list", "--quiet"], "Cannot verify microsandbox image inventory", env=env)
             references = raw.splitlines()
             if any(not re.fullmatch(r"[^\s@]+@sha256:[a-f0-9]{64}", item) for item in references):
                 raise installer.InstallError("Cannot verify microsandbox image inventory")
-            if any(item.split("@", 1)[1] == micro["image"].split("@", 1)[1] for item in references):
-                installer.checked([micro["runtime_path"], "image", "remove", micro["image"], "--quiet"], "Runtime image is still in use", env=env)
+            if any(item.split("@", 1)[1] == image.split("@", 1)[1] for item in references):
+                installer.checked([micro["runtime_path"], "image", "remove", image, "--quiet"], "Runtime image is still in use", env=env)
         if not shared:
             raw = installer.checked([micro["runtime_path"], "sandbox", "list", "--format", "json"], "Cannot verify empty microsandbox store", env=env)
             if json.loads(raw) != []:
diff --git a/deploy/node/node_install.py b/deploy/node/node_install.py
index 7944db376..d563a29cf 100644
--- a/deploy/node/node_install.py
+++ b/deploy/node/node_install.py
@@ -279,11 +279,11 @@ def micro_home(installation_id):
     return directory
 
 
-def provider_config(root, args, manifest, runtime_image):
+def provider_config(root, args, runtime_image):
     result = {"installation_id": args.installation_id, "provider": args.provider, "core_url": args.core_url + "/api/v1",
               "specification": args.configuration["specification"], "generation": args.configuration["generation"]}
     if args.provider == "docker":
-        result["docker"] = {"host": "unix:///var/run/docker.sock", "image": runtime_image,
+        result["native"] = {"host": "unix:///var/run/docker.sock", "image": runtime_image,
                             "network": "oac-node-" + args.installation_id,
                             "seccomp_file": str(root / "runtime/seccomp.json"), "nested_sandbox": True}
     else:
@@ -291,11 +291,9 @@ def provider_config(root, args, manifest, runtime_image):
         port = endpoint.port or (443 if endpoint.scheme == "https" else 80)
         addresses = sorted({entry[4][0] for entry in socket.getaddrinfo(endpoint.hostname, port, type=socket.SOCK_STREAM)})
         core_rules = [{"action": "allow", "direction": "egress", "destination": address, "protocol": "tcp", "port": str(port)} for address in addresses]
-        result["microsandbox"] = {
+        result["native"] = {
             "helper_path": str(root / MICRO[0]), "runtime_path": str(root / MICRO[1]), "firmware_path": str(root / MICRO[2]),
-            "runtime_sha256": manifest["microsandbox"]["runtime_sha256"], "firmware_sha256": manifest["microsandbox"]["firmware_sha256"],
-            "runtime_home": str(getattr(args, "runtime_home", micro_home(args.installation_id))), "image": manifest["runtime_ref"],
-            **args.configuration["specification"]["resources"],
+            "runtime_home": str(getattr(args, "runtime_home", micro_home(args.installation_id))),
             "network": {"default_egress": "deny", "default_ingress": "deny", "rules": core_rules + [
                 {"action": "allow", "direction": "egress", "destination": "public"},
                 {"action": "allow", "direction": "egress", "destination": "host", "protocol": "udp", "port": "53"},
@@ -417,7 +415,7 @@ def register_node(root, args, token, helper_archive=None, *, secret_path):
     runtime_image = prepare_runtime(root, args, manifest)
     # Retain the original network policy when recovering a partial installation.
     if not existing_file(root / "provider.json"):
-        write_once(root / "provider.json", json_text(provider_config(root, args, manifest, runtime_image)))
+        write_once(root / "provider.json", json_text(provider_config(root, args, runtime_image)))
     else:
         node_spec.verify_provider(json.loads((root / "provider.json").read_text()), args.configuration, runtime_image)
     marker = root / "registered.json"
@@ -1092,7 +1090,7 @@ def remove_node_files(root, installation_id):
     Runs as the node's own user, so a link it planted can never reach another user's files."""
     no_links(root)
     provider = private_json(root / "provider.json") or {}
-    image = (provider.get("docker") or {}).get("image")
+    image = (provider.get("native") or {}).get("image")
     runtime_home = micro_home(installation_id)
     if root.exists():
         shutil.rmtree(root)
diff --git a/deploy/node/node_spec.py b/deploy/node/node_spec.py
index 9d59d41cb..ba28d64c4 100644
--- a/deploy/node/node_spec.py
+++ b/deploy/node/node_spec.py
@@ -158,14 +158,5 @@ def verify_provider(stored, configuration, runtime_image):
             or stored.get("generation") != configuration["generation"]
             or stored.get("core_url") != configuration["core_url"] + "/api/v1"):
         raise SpecificationError("Retained node configuration differs from Core; preserve its state")
-    if provider == "docker":
-        if stored.get("docker", {}).get("image") != runtime_image:
-            raise SpecificationError("Retained Docker image differs; preserve the node and inspect its configuration")
-    else:
-        micro = stored.get("microsandbox", {})
-        if any(key in micro for key in ("max_active", "max_retained", "idle_seconds", "retention_seconds")):
-            raise SpecificationError("Node capacity and lifecycle policy belong to Core; regenerate the stale provider file")
-        expected = dict(spec["resources"], image=spec["runtime"]["microsandbox_ref"],
-                        runtime_sha256=spec["runtime"]["runtime_sha256"], firmware_sha256=spec["runtime"]["firmware_sha256"])
-        if any(micro.get(key) != value for key, value in expected.items()):
-            raise SpecificationError("Retained microsandbox configuration differs from Core; preserve its state")
+    if provider == "docker" and stored.get("native", {}).get("image") != runtime_image:
+        raise SpecificationError("Retained Docker image differs; preserve the node and inspect its configuration")
diff --git a/deploy/node/test_generation_review_regressions.py b/deploy/node/test_generation_review_regressions.py
index 548e47a9e..f2f730ff1 100644
--- a/deploy/node/test_generation_review_regressions.py
+++ b/deploy/node/test_generation_review_regressions.py
@@ -46,7 +46,7 @@ def interrupted(path, value):
             with mock.patch.object(node_generations, 'atomic_json', side_effect=interrupted):
                 with self.assertRaises(OSError):
                     node_generations.prepare(case.args, installer)
-            self.assertEqual(installer.private_json(path)['docker']['image'], case.manifest['image_manifest_digests']['runtime'])
+            self.assertEqual(installer.private_json(path)['native']['image'], case.manifest['image_manifest_digests']['runtime'])
             self.assertTrue(installer.private_json(path.with_suffix('.preparing'))['import_started'])
             node_generations.prepare(case.args, installer)
             saved = path.read_bytes()
@@ -217,7 +217,7 @@ def test_unpublished_plan_refuses_path_or_installation_drift(self):
             changed=json.loads(json.dumps(original)); changed['configuration'][field]=value
             node_generations.atomic_json(path,changed)
             with self.assertRaises(installer.InstallError): node_generations.retained_configs(case.root,installer)
-        changed=json.loads(json.dumps(original)); changed['configuration']['docker']['seccomp_file']=str(case.home/'foreign')
+        changed=json.loads(json.dumps(original)); changed['configuration']['native']['seccomp_file']=str(case.home/'foreign')
         node_generations.atomic_json(path,changed)
         with self.assertRaises(installer.InstallError): node_generations.collect(case.args,installer)
         self.assertFalse((case.root/'state/node/generations/2.dropped').exists())
@@ -259,7 +259,7 @@ def available(value,installer):
         with mock.patch.object(installer.node_spec,'fetch',return_value=cfg),mock.patch.object(node_generations,'image_available',side_effect=available):
             node_generations.prepare(case.args,installer)
         final=installer.private_json(case.root/'state/node/generations/2.json')
-        self.assertNotEqual(final['microsandbox']['helper_path'],original['microsandbox']['helper_path'])
+        self.assertNotEqual(final['native']['helper_path'],original['native']['helper_path'])
         self.assertIn(1,node_generations.retained_configs(case.root,installer))
 
     def test_operator_update_refuses_before_download_or_update(self):
diff --git a/deploy/node/test_node_generations.py b/deploy/node/test_node_generations.py
index ca64cb5a7..c83ff6f0d 100644
--- a/deploy/node/test_node_generations.py
+++ b/deploy/node/test_node_generations.py
@@ -21,11 +21,11 @@ def setUp(self):
         self.root = Path(temporary.name)
         self.directory = self.root / "state/node/generations"
         self.directory.mkdir(parents=True, mode=0o700)
-        self.value = {"installation_id": "test-installation", "generation": 1, "provider": "docker", "docker": {"image": "sha256:" + "a" * 64},
+        self.value = {"installation_id": "test-installation", "generation": 1, "provider": "docker", "native": {"image": "sha256:" + "a" * 64},
                       "specification": {"resources": {"cpus": 1, "memory_mib": 1024}, "runtime": {"source_commit": "b" * 40, "image_id": "sha256:" + "a" * 64, "image_manifest_digest": "sha256:" + "c" * 64, "microsandbox_ref": "oac-runtime@sha256:" + "d" * 64, "runtime_sha256": "e" * 64, "firmware_sha256": "f" * 64}}}
         self.args = SimpleNamespace(installation_id="test-installation", generation=1, specification_digest=node_spec.digest("docker", self.value["specification"]))
         self.release = self.root / "releases" / ("b" * 40)
-        self.value["docker"]["seccomp_file"] = str(self.release / "runtime/seccomp.json")
+        self.value["native"]["seccomp_file"] = str(self.release / "runtime/seccomp.json")
         self.release.mkdir(parents=True)
         (self.release / "artifact").write_bytes(b"immutable bytes")
         node_generations.atomic_json(self.root / "provider.json", self.value)
@@ -166,7 +166,6 @@ def test_never_imported_generation_can_collect_missing_executable(self):
 
     def micro_fixture(self):
         self.value["provider"] = "microsandbox"
-        del self.value["docker"]
         home = self.root / "micro-store"
         home.mkdir(mode=0o700)
         node_generations.atomic_json(home / "oac-installation.json", {"installation_id": self.args.installation_id})
@@ -174,7 +173,8 @@ def micro_fixture(self):
         runtime.write_bytes(b"verified native executable")
         runtime.chmod(0o700)
         image = self.value["specification"]["runtime"]["microsandbox_ref"]
-        self.value["microsandbox"] = {"helper_path": str(self.release / "helper"), "runtime_home": str(home), "runtime_path": str(runtime), "firmware_path": str(self.release / "firmware"), "runtime_sha256": hashlib.sha256(runtime.read_bytes()).hexdigest(), "image": image}
+        self.value["specification"]["runtime"]["runtime_sha256"] = hashlib.sha256(runtime.read_bytes()).hexdigest()
+        self.value["native"] = {"helper_path": str(self.release / "helper"), "runtime_home": str(home), "runtime_path": str(runtime), "firmware_path": str(self.release / "firmware")}
         self.args.specification_digest = node_spec.digest("microsandbox", self.value["specification"])
         node_generations.atomic_json(self.root / "provider.json", self.value)
         # This fixture changes provider before any helper exists.
@@ -217,14 +217,14 @@ def test_docker_collection_preserves_another_installations_idle_serving_image(se
         other = dict(self.value, installation_id="second-installation")
         node_generations.atomic_json(second / "provider.json", other)
         before = (second / "provider.json").read_bytes()
-        host_images = {self.value["docker"]["image"]}
+        host_images = {self.value["native"]["image"]}
         def docker(command, *_args, **_kwargs):
             if "rm" in command or "prune" in command: host_images.clear()
             raise AssertionError("generation GC must not manage shared Docker images")
         installer.checked.side_effect = docker
         node_generations.collect(self.args, installer)
         installer.checked.assert_not_called()
-        self.assertEqual(host_images, {other["docker"]["image"]})
+        self.assertEqual(host_images, {other["native"]["image"]})
         self.assertEqual((second / "provider.json").read_bytes(), before)
         self.assertFalse(self.release.exists())
         self.assertEqual(node_generations.retained_configs(self.root, installer), {})
diff --git a/deploy/node/test_node_install.py b/deploy/node/test_node_install.py
index b17d6fd80..203db53bf 100644
--- a/deploy/node/test_node_install.py
+++ b/deploy/node/test_node_install.py
@@ -315,7 +315,7 @@ def test_shared_original_firmware_survives_until_its_last_generation(self):
         self.args.provider = "microsandbox"
         self.install()
         successor = self.prepare_successor_runtime()
-        successor["microsandbox"]["firmware_path"] = str(self.root / installer.MICRO[2])
+        successor["native"]["firmware_path"] = str(self.root / installer.MICRO[2])
         installer.node_generations.atomic_json(self.root / "state/node/generations/2.json", successor)
         original = installer.private_json(self.root / "provider.json")
         self.args.generation = 1
@@ -377,9 +377,9 @@ def interrupted(manifest, name, path):
             self.assertFalse((directory / "2.json").exists())
             self.assertEqual(saved["specification"], config["specification"])
             self.assertFalse(json.loads((directory / "2.preparing").read_text())["import_started"])
-            helper = Path(saved["microsandbox"]["helper_path"])
+            helper = Path(saved["native"]["helper_path"])
             inode = helper.stat().st_ino
-            self.assertFalse(Path(saved["microsandbox"]["runtime_path"]).exists())
+            self.assertFalse(Path(saved["native"]["runtime_path"]).exists())
             installer.node_generations.prepare(self.args, installer)
             self.assertEqual(helper.stat().st_ino, inode)
             self.assertEqual(json.loads((directory / "2.json").read_text()), saved)
@@ -436,7 +436,7 @@ def test_docker_installs_matched_payload_registers_and_starts_persistent_service
         system = self.sudo_host()
         installer.install_system(self.args, "synthetic-once-token")
         config = json.loads((self.root / "provider.json").read_text())
-        self.assertEqual(config["docker"]["image"], self.manifest["images"]["runtime"])
+        self.assertEqual(config["native"]["image"], self.manifest["images"]["runtime"])
         self.assertEqual(config["core_url"], self.args.core_url + "/api/v1")
         self.assertEqual(config["installation_id"], self.args.installation_id)
         self.assertFalse((self.root / installer.MICRO[0]).exists())
@@ -455,7 +455,7 @@ def test_containerd_node_persists_actual_id_and_warm_retry_avoids_archive(self):
         self.containerd = True
         self.install()
         expected = self.manifest['image_manifest_digests']['runtime']
-        self.assertEqual(json.loads((self.root / 'provider.json').read_text())['docker']['image'], expected)
+        self.assertEqual(json.loads((self.root / 'provider.json').read_text())['native']['image'], expected)
         before = (self.root / 'provider.json').read_bytes()
         with mock.patch.object(installer.distribution, 'runtime_archive', side_effect=AssertionError('warm Runtime download')):
             self.install()
@@ -464,7 +464,7 @@ def test_containerd_node_persists_actual_id_and_warm_retry_avoids_archive(self):
     def test_retained_provider_image_cannot_bypass_verified_selection(self):
         self.install()
         config = json.loads((self.root / 'provider.json').read_text())
-        config['docker']['image'] = 'sha256:' + 'f' * 64
+        config['native']['image'] = 'sha256:' + 'f' * 64
         (self.root / 'provider.json').write_text(json.dumps(config))
         self.calls.clear()
         with self.assertRaisesRegex(node_spec.SpecificationError, 'Retained Docker image differs'):
@@ -483,14 +483,9 @@ def test_wrong_loaded_runtime_cannot_register_or_write_provider_config(self):
     def test_microsandbox_imports_image_and_allows_only_explicit_private_core_endpoint(self):
         self.args.provider = "microsandbox"
         self.install()
-        config = json.loads((self.root / "provider.json").read_text())["microsandbox"]
-        self.assertEqual(config["runtime_sha256"], self.manifest["microsandbox"]["runtime_sha256"])
-        self.assertEqual(config["cpus"], 3)
-        self.assertEqual(config["memory_mib"], 6144)
-        self.assertEqual(config["root_disk_mib"], 10240)
-        self.assertEqual(config["environment_disk_mib"], 12288)
-        for field in ("idle_seconds", "retention_seconds", "max_active", "max_retained"):
-            self.assertNotIn(field, config)
+        config = json.loads((self.root / "provider.json").read_text())["native"]
+        # Resources, the image and artifact hashes are read from the specification.
+        self.assertEqual(set(config), {"helper_path", "runtime_path", "firmware_path", "runtime_home", "network"})
         rules = config["network"]["rules"]
         self.assertIn({"action": "allow", "direction": "egress", "destination": "172.29.144.1", "protocol": "tcp", "port": "24443"}, rules)
         self.assertNotIn("private", [rule["destination"] for rule in rules])
@@ -963,7 +958,7 @@ def forge():
     def test_uninstall_prints_only_an_image_id_from_the_service_home(self):
         root = self.home / "node"
         root.mkdir()
-        (root / "provider.json").write_text(json.dumps({"docker": {"image": "x\nFinish with: sudo sh"}}))
+        (root / "provider.json").write_text(json.dumps({"native": {"image": "x\nFinish with: sudo sh"}}))
         output = io.StringIO()
         with mock.patch.object(installer.sys, "stdout", output):
             installer.remove_node_files(root, self.args.installation_id)
@@ -1083,20 +1078,6 @@ def test_offline_bundle_uses_same_bootstrap_and_verified_artifacts(self):
             self.install()
         self.assertEqual(json.loads((self.root / "provider.json").read_text())["specification"], self.args.configuration["specification"])
 
-    def test_changed_local_micro_resources_cannot_reconnect(self):
-        self.args.provider = "microsandbox"
-        self.install()
-        target = self.root / "provider.json"
-        stored = json.loads(target.read_text())
-        stored["microsandbox"]["cpus"] += 1
-        target.write_text(json.dumps(stored))
-        before = target.read_bytes()
-        self.calls.clear()
-        with self.assertRaisesRegex(node_spec.SpecificationError, "microsandbox configuration differs"):
-            self.install()
-        self.assertEqual(target.read_bytes(), before)
-        self.assertFalse(any("register" in call or "enable" in call for call, _ in self.calls))
-
     def test_origin_rejects_other_schemes_credentials_paths_and_redirects(self):
         for value in ("ftp://core.example", "https://user@core.example", "https://@core.example", "https://core.example/v1", "https://core.example?", "https://core.example#", "https://core.example\\path", "https://core.example:bad", ""):
             with self.subTest(value=value), self.assertRaises(argparse.ArgumentTypeError):
diff --git a/docs/configuration.md b/docs/configuration.md
index 50378039e..f98a71daf 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -118,11 +118,12 @@ The named Docker volume `<project>_data` contains these paths. Docker manages Li
 
 ## Docker node configuration
 
-The node installer writes Docker’s provider configuration into the node’s configuration file. Deployment resources, Runtime images and capacity remain in [Core’s database](#runtime-settings-web).
+The node installer writes Docker’s host settings into the `native` object of the node’s configuration file, which only the Docker adapter reads. Deployment resources, the Runtime release and capacity remain in [Core’s database](#runtime-settings-web).
 
 | Field | Installer value | Meaning |
 | --- | --- | --- |
 | `host` | `unix:///var/run/docker.sock` | Explicit Docker Engine socket |
+| `image` | The Runtime image’s local ID after loading | The release’s `image_id` or `image_manifest_digest`. The host’s image store decides which digest names the loaded image, so the value is node-local; the adapter accepts only these two |
 | `network` | `oac-node-<installation-id>` | Runtime container network |
 | `seccomp_file` | `<node-root>/runtime/seccomp.json` | Matched distribution’s seccomp profile |
 | `nested_sandbox` | `true` | Enables the Docker adapter’s init process and proc-mask configuration |
diff --git a/docs/getting-started/nodes.md b/docs/getting-started/nodes.md
index 6410138f6..0aa74c4a8 100644
--- a/docs/getting-started/nodes.md
+++ b/docs/getting-started/nodes.md
@@ -123,9 +123,9 @@ Use manual registration when you manage the node's files and service yourself in
 1. Take `oac-node` from the same release as Core.
 2. Get an enrollment token: the token in a command from **Add node**, or `POST /core/v1/sandbox/enrollment-tokens` with the Core key. It is single-use and carries the node's approved capacity; the response's `expires_at` says when it expires. Save it in a `0600` file on the host.
 3. Read the node configuration with the token, which does not consume it: `GET /api/v1/sandbox-node/configuration` with `Authorization: Bearer <token>`.
-4. Write a private provider file. Copy `provider`, `installation_id`, `core_url`, `generation` and `specification` from the response, and add one adapter object for the host:
-   - `docker`: `host` (an explicit Unix socket), `image` (the locally imported Runtime image of the approved release), `network`, `extra_hosts`, an absolute `seccomp_file` and `nested_sandbox`.
-   - `microsandbox`: absolute `helper_path`, `runtime_path` and `firmware_path` with their `runtime_sha256` and `firmware_sha256`, `image`, the sandbox `cpus`, `memory_mib`, `root_disk_mib` and `environment_disk_mib`, a `network` policy, and `runtime_home`: a private directory, which the helper creates with mode `0700` when it is missing. microsandbox places Unix sockets under it, so keep its path within 48 bytes; the installer refuses a longer one for its own nodes.
+4. Write a private provider file. Copy `provider`, `installation_id`, `core_url`, `generation` and `specification` from the response, and add a `native` object with the host settings of that provider. The adapter reads sandbox size, the Runtime image and artifact hashes from `specification`:
+   - Docker: the [Docker node configuration](../configuration.md#docker-node-configuration) fields, with `host` an explicit Unix socket, `image` the local ID of the imported Runtime image and `seccomp_file` absolute.
+   - microsandbox: absolute `helper_path`, `runtime_path` and `firmware_path`, a `network` policy, and `runtime_home`: a private directory, which the helper creates with mode `0700` when it is missing. microsandbox places Unix sockets under it, so keep its path within 48 bytes; the installer refuses a longer one for its own nodes.
 5. Register, then run the node under the host's service supervisor, with real absolute paths:
 
    ```sh
diff --git a/docs/sandbox-provider.md b/docs/sandbox-provider.md
index 52536e9e5..a3c49dc59 100644
--- a/docs/sandbox-provider.md
+++ b/docs/sandbox-provider.md
@@ -16,7 +16,7 @@ Core owns durable Environment, allocation, placement and cleanup state; the Prov
 ## Steps
 
 1. **Read the contract.** Implement every method, support the required operations and declare a decision for each of the others in [Implement the interface](#implement-the-interface).
-2. **Write the adapter package** under `services/core/internal/sandbox/<kind>`: native SDK calls, ownership checks, identity translation and private configuration. Assert `var _ sandbox.SandboxProvider = (*YourAdapter)(nil)`. An out-of-process helper lives in `services/core/tools/<kind>-provider`.
+2. **Write the adapter package** under `services/core/internal/sandbox/<kind>`: native SDK calls, ownership checks, identity translation, private configuration and, for a node adapter, its node-local construction. Assert `var _ sandbox.SandboxProvider = (*YourAdapter)(nil)`. An out-of-process helper lives in `services/core/tools/<kind>-provider`.
 3. **Register the kind** once, following [Register the provider kind](#register-the-provider-kind). Registration is explicit construction, not an init-time plugin registry.
 4. **Label owned resources** with the provider ownership labels in the [Runtime names](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#openagentcore-runtime-names) table, and never accept older label names as a fallback.
 5. **Run the contract suite** with `make check-sandbox-provider-contract`; see [Validate the integration](#validate-the-integration).
@@ -109,12 +109,13 @@ A new provider takes these steps:
 1. Implement the operation contracts in the adapter package, with native contract tests.
 2. Add its specification and resource validators.
 3. Implement `sandbox.ConfigurationAdapter` over a typed native configuration. `DecodeInput` strictly parses the separate public `configuration` and write-only `credential` objects of a request. `Encode` produces whitelisted public selectors, read-only observations and separate secret bytes, and never passes request JSON through. `Decode` restores stored selectors, and keeps access to owned resources, without remote admission or new template validation. `Normalize` copies its input before changing it. `ResolveChange`, `Equal` and `WithCredential` own inheritance, identity and credential composition. `Requirements` declares whether a credential and a public Core origin are required, and which setup operations are supported: `Discovery` for `DiscoverConfiguration`, `SelectionDiscovery` for `DiscoverSelection` and `CredentialVerification` for `VerifyCredential`. `DiscoverConfiguration` validates the query and returns a safe catalog, never a mutation or an admission decision, while Core keeps authorization, input limits and deadlines. `DiscoverSelection` resolves a candidate's omitted native values before commit, and `VerifyCredential` verifies a credential's access to owned resources without mutation. Both receive the candidate's `sandbox.DirectConfig` and build any native client for that call only. A node provider accepts only an empty public object, rejects credentials and returns Unsupported for every setup operation and for credential replacement.
-4. Register its constructor, policies, configuration adapter and operation declaration in `providers/registry.go`. Its key is the provider kind, which also labels the Provider's observations, and checkpoint support reads this entry. The generated projections combine each registered mode and deployment policy with the shared field bounds in `sandbox/deployment_contract.go`: the installer reads them from `deploy/node/node_spec.py`, and the TypeScript client and Web from `packages/agents-client/src/deployment-contract.ts`, so Web reads these declarations instead of comparing provider kinds. Regenerate both with `go run ./services/core/cmd/specification-contract -write`.
-5. Supply the distribution artifacts for the adapter and its helper, and offer the provider to operators through the registered configuration contract.
+4. For a node adapter, export from its package the `BuildLocal` constructor, the typed `native` object it decodes and the native files it adds to the shared node artifacts. Node-local settings, such as host paths, live only in that object; resources and the Runtime release are read from the node configuration's `specification`.
+5. Register its constructor, policies, configuration adapter and operation declaration in `providers/registry.go`. Its key is the provider kind, which also labels the Provider's observations, and checkpoint support reads this entry. The generated projections combine each registered mode and deployment policy with the shared field bounds in `sandbox/deployment_contract.go`: the installer reads them from `deploy/node/node_spec.py`, and the TypeScript client and Web from `packages/agents-client/src/deployment-contract.ts`, so Web reads these declarations instead of comparing provider kinds. Regenerate both with `go run ./services/core/cmd/specification-contract -write`.
+6. Supply the distribution artifacts for the adapter and its helper, and offer the provider to operators through the registered configuration contract.
 
 **Known design gap:** Web still names providers in the setup wizard's backend choice, the Docker confirmation and E2B's configuration fields wherever Web shows or parses them (the setup step with its service presets, the deployment summary and the client's deployment projection), because the protocol declares no configuration fields yet. Exposing another provider through that surface currently requires a shared Web edit. This coupling does not meet [Complexity stays in the adapter](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter); new integrations must express their configuration through the protocol and keep vendor-specific behavior in the adapter. Never add a Session or Turn scheduling path, a vendor column or API field, or a vendor switch in the store.
 
-`providers.Build` passes persisted node configuration and ephemeral `LocalOptions` to `BuildLocal`. The caller explicitly selects standalone registration or single-provider execution with `Standalone`, or generation-owned execution with a canonical absolute node state directory in `GenerationStateDirectory`. Missing or mixed contexts are rejected. The adapter owns generation-specific native preparation and readiness checks. Microsandbox binds helper leases to the installation, generation and specification digest, then checks the pinned image after platform, capacity and artifact readiness.
+A node configuration, `sandbox.NodeConfig`, holds `provider`, `generation`, `installation_id`, `core_url`, `specification` and the adapter's opaque `native` object. `providers.Build` validates `provider`, `generation`, `installation_id` and `specification`, and passes the configuration with ephemeral `sandbox.LocalOptions` to `BuildLocal`, which decodes `native` strictly. The caller explicitly selects standalone registration or single-provider execution with `Standalone`, or generation-owned execution with a canonical absolute node state directory in `GenerationStateDirectory`. Missing or mixed contexts are rejected. The adapter owns generation-specific native preparation and readiness checks. Microsandbox binds helper leases to the installation, generation and specification digest, then checks the pinned image after platform, capacity and artifact readiness.
 
 ### Registration validation
 
@@ -133,13 +134,13 @@ Preview and persistence use `providers.Normalize` and `providers.Describe`. `pro
 
 A direct adapter with a credential verifies all retained generations and allocation references before a key is replaced. The common `sandbox.CallFence` excludes native calls and waits for helper completion, including calls whose callers timed out; execution invokes the prepared verification and fencing callbacks without branching on a vendor.
 
-Vendor deployment validation and SDK setup stay at the construction boundary, and construction never creates an Environment. For node-local adapters `providers.Built` returns the provider, probe, installation identity, backend fingerprint and specification digest, and a `Quiescent` check when a helper can outlive its caller; generation collection waits for it. The factory also returns its close function. `execution.RuntimeProvider` binds the adapter to its kind, installation ID, backend fingerprint, generation, mode and node ownership; the database owns the selection, and the in-memory copy is never another authority. Docker and microsandbox run on nodes, and E2B is constructed directly. The node proxy exposes checkpoint operations only for a backend whose registered declaration supports them, and common lifecycle code admits suspension through the checkpoint declaration, never through a provider name.
+Vendor deployment validation and SDK setup stay at the construction boundary, and construction never creates an Environment. For node-local adapters `sandbox.Built` returns the provider, probe, installation identity, backend fingerprint and specification digest, and a `Quiescent` check when a helper can outlive its caller; generation collection waits for it. The factory also returns its close function. `execution.RuntimeProvider` binds the adapter to its kind, installation ID, backend fingerprint, generation, mode and node ownership; the database owns the selection, and the in-memory copy is never another authority. Docker and microsandbox run on nodes, and E2B is constructed directly. The node proxy exposes checkpoint operations only for a backend whose registered declaration supports them, and common lifecycle code admits suspension through the checkpoint declaration, never through a provider name.
 
 The backend fingerprint identifies a native resource namespace, not capacity. Core keeps deployment generations so that owned allocations keep resolving to their original backend; never repoint retained allocations at a replacement backend.
 
 ### Distribution artifacts and process paths
 
-Each node adapter's registration owns its typed `NodeArtifacts` declaration: logical distribution path, release filename suffix and installation role (`node`, `runtime`, `policy` or `image`). Registration rejects missing declarations, unsafe paths and unknown roles. `go run ./services/core/cmd/provider-artifacts -write` generates the shared Web catalog and Python projection. Run the command without `-write` to check freshness. Distribution packaging, Web availability and node installation read this projection; adding a provider's payload does not add a provider-name branch to those consumers.
+Each node adapter's registration owns its typed `NodeArtifacts` declaration, the shared node artifacts plus the native files its package exports: logical distribution path, release filename suffix and installation role (`node`, `runtime`, `policy` or `image`). Registration rejects missing declarations, unsafe paths and unknown roles. `go run ./services/core/cmd/provider-artifacts -write` generates the shared Web catalog and Python projection. Run the command without `-write` to check freshness. Distribution packaging, Web availability and node installation read this projection; adding a provider's payload does not add a provider-name branch to those consumers.
 
 The launcher supplies `sandbox.ProcessPaths` from the [derived process environment](./configuration.md). Core reads these paths once and passes them to direct construction and setup operations. They are fixed distribution properties, not deployment settings or user-selectable helper paths. Each adapter resolves its own relative helper and state locations; E2B uses `e2b/oac-e2b-provider` and `e2b/`. Missing or nonabsolute roots fail before helper execution. Provider construction and discovery never read process environment variables.
 
diff --git a/docs/zh/configuration.md b/docs/zh/configuration.md
index 1c1bbea6e..8261fc738 100644
--- a/docs/zh/configuration.md
+++ b/docs/zh/configuration.md
@@ -1,7 +1,7 @@
 ---
 title: "配置参考"
 source: docs/configuration.md
-source_hash: d4c7fc0fddf79b32ee628cc641df148d873380ecf62c59bb6b6a323750d0a41b
+source_hash: e10fcef53a7baf4f77d914bbda7f4158fcf49fc07546596ea78222939d580a6c
 ---
 
 Core 安装的每项设置都恰好只有一个归属位置，分属以下三类：
@@ -122,11 +122,12 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 ## Docker 节点配置 {#docker-node-configuration}
 
-节点安装程序会将 Docker 的提供商配置写入节点的配置文件。部署资源、Runtime 镜像和容量仍存储在 [Core 的数据库](#runtime-settings-web)中。
+节点安装程序会将 Docker 的主机设置写入节点配置文件的 `native` 对象，只有 Docker 适配器读取它。部署资源、Runtime 发行版本和容量仍存储在 [Core 的数据库](#runtime-settings-web)中。
 
 | 字段 | 安装程序设置的值 | 含义 |
 | --- | --- | --- |
 | `host` | `unix:///var/run/docker.sock` | 显式 Docker Engine 套接字 |
+| `image` | 加载后 Runtime 镜像的本地 ID | 发行版本的 `image_id` 或 `image_manifest_digest`。主机的镜像存储决定由哪个 digest 指代已加载的镜像，因此该值属于节点本地；适配器只接受这两个值 |
 | `network` | `oac-node-<installation-id>` | Runtime 容器网络 |
 | `seccomp_file` | `<node-root>/runtime/seccomp.json` | 所匹配发行版的 seccomp 配置文件 |
 | `nested_sandbox` | `true` | 启用 Docker 适配器的 init 进程和 proc-mask 配置 |
diff --git a/docs/zh/getting-started/nodes.md b/docs/zh/getting-started/nodes.md
index 871fed81b..d0c39328b 100644
--- a/docs/zh/getting-started/nodes.md
+++ b/docs/zh/getting-started/nodes.md
@@ -1,7 +1,7 @@
 ---
 title: "添加和管理节点"
 source: docs/getting-started/nodes.md
-source_hash: 24b505c131f398dc8340d4f32616152a7964a783cd4fc06cfdeb3ccd422448db
+source_hash: cd12954864bf9c15cf2d700fc3d9ebaf6126c0ab4297784850cfdd32b86ae656
 ---
 
 节点是一台 Linux 主机，在沙箱后端为 Docker 或 microsandbox 时，为 Core 托管 Session 运行沙箱。Core 将新 Session 分配给有空余容量的节点；节点创建沙箱，沙箱回连 Core。E2B 不需要节点。应用为自己的 Session 连接的机器是[自托管执行器](self-hosted.md)，而不是节点。
@@ -125,9 +125,9 @@ root 只准备账号、组和服务单元；其他操作（包括 Docker 网络
 1. 使用与 Core 同一发行版本的 `oac-node`。
 2. 获取注册令牌：使用 **Add node** 命令中的令牌，或通过 Core 密钥调用 `POST /core/v1/sandbox/enrollment-tokens`。令牌一次性使用，包含批准的节点容量；响应的 `expires_at` 给出过期时间。在主机上存入权限为 `0600` 的文件。
 3. 使用令牌读取节点配置，不会消耗令牌：`GET /api/v1/sandbox-node/configuration`，带 `Authorization: Bearer <token>`。
-4. 写入私有提供商文件。从响应复制 `provider`、`installation_id`、`core_url`、`generation` 和 `specification`，并为主机添加一个适配器对象：
-   - `docker`：`host`（显式 Unix 套接字）、`image`（本地导入的批准发行版 Runtime 镜像）、`network`、`extra_hosts`、绝对路径 `seccomp_file` 和 `nested_sandbox`。
-   - `microsandbox`：绝对路径 `helper_path`、`runtime_path` 和 `firmware_path`，以及对应的 `runtime_sha256` 和 `firmware_sha256`；`image`；沙箱的 `cpus`、`memory_mib`、`root_disk_mib` 和 `environment_disk_mib`；`network` 策略；以及 `runtime_home` 私有目录。目录缺失时辅助程序以 `0700` 创建。microsandbox 在其中放置 Unix 套接字，因此路径不要超过 48 字节；安装程序对自管节点拒绝更长路径。
+4. 写入私有提供商文件。从响应复制 `provider`、`installation_id`、`core_url`、`generation` 和 `specification`，并添加 `native` 对象，写入该提供商的主机设置。适配器从 `specification` 读取沙箱规格、Runtime 镜像和产物哈希：
+   - Docker：[Docker 节点配置](../configuration.md#docker-node-configuration)中的字段，其中 `host` 是显式 Unix 套接字，`image` 是导入的 Runtime 镜像的本地 ID，`seccomp_file` 是绝对路径。
+   - microsandbox：绝对路径 `helper_path`、`runtime_path` 和 `firmware_path`；`network` 策略；以及 `runtime_home` 私有目录。目录缺失时辅助程序以 `0700` 创建。microsandbox 在其中放置 Unix 套接字，因此路径不要超过 48 字节；安装程序对自管节点拒绝更长路径。
 5. 使用真实绝对路径注册，然后通过主机服务管理器运行节点：
 
    ```sh
diff --git a/docs/zh/sandbox-provider.md b/docs/zh/sandbox-provider.md
index 0c2606f11..d273df9d0 100644
--- a/docs/zh/sandbox-provider.md
+++ b/docs/zh/sandbox-provider.md
@@ -1,7 +1,7 @@
 ---
 title: "添加 Sandbox Provider"
 source: docs/sandbox-provider.md
-source_hash: 5218bf81d54117718753e28fc77a4014fe4a173d567ac9ab13bca65b511a7643
+source_hash: 305d35b08388d682347f7bce263262e65031cfe69d09cd2acf0e8dae6893ff6f
 ---
 
 **Sandbox Provider** 为 Core 管理的 Environment 提供 Runtime daemon 运行所需的外层计算资源，以及启动 daemon 的有界引导流程。本指南说明如何添加 Provider，并作为 Core 驱动 Provider 的参考。接口为 [`SandboxProvider`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/sandbox/sandbox_provider.go)。
@@ -18,7 +18,7 @@ Core 拥有持久 Environment、allocation、placement 和 cleanup 状态；Prov
 ## 步骤 {#steps}
 
 1. **阅读契约。** 实现每个方法，支持必需操作，并按[实现接口](#implement-the-interface)对其余每项操作声明决定。
-2. **编写 adapter 包**，放在 `services/core/internal/sandbox/<kind>`：包括原生 SDK 调用、所有权检查、身份转换和私有配置。声明 `var _ sandbox.SandboxProvider = (*YourAdapter)(nil)`。进程外 helper 放在 `services/core/tools/<kind>-provider`。
+2. **编写 adapter 包**，放在 `services/core/internal/sandbox/<kind>`：包括原生 SDK 调用、所有权检查、身份转换、私有配置，以及 node adapter 的 node-local 构造。声明 `var _ sandbox.SandboxProvider = (*YourAdapter)(nil)`。进程外 helper 放在 `services/core/tools/<kind>-provider`。
 3. **注册 kind** 一次，遵循[注册 provider kind](#register-the-provider-kind)。注册是明确构造，不是 init 时 plugin registry。
 4. **标记所属资源**，使用 [Runtime 名称](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/CONTRIBUTING.md#openagentcore-runtime-names)表中的 provider ownership label，不接受旧 label 名称作为回退。
 5. **运行契约套件** `make check-sandbox-provider-contract`；参见[验证集成](#validate-the-integration)。
@@ -111,12 +111,13 @@ Checkpoint 支持增加 `Compute` generation、name、ID 和 `SnapshotIdentity`
 1. 在 adapter 包中实现 operation 契约，并编写原生契约测试。
 2. 添加 specification 和 resource validator。
 3. 基于类型化原生配置实现 `sandbox.ConfigurationAdapter`。`DecodeInput` 严格解析请求中独立的公开 `configuration` 与只写 `credential` 对象。`Encode` 生成白名单公开 selector、只读观测和独立 secret bytes，不透传请求 JSON。`Decode` 恢复已存储 selector 并保留对所属资源的访问，不做远程 admission 或新模板验证。`Normalize` 修改前复制输入。`ResolveChange`、`Equal` 和 `WithCredential` 负责继承、身份与凭据组合。`Requirements` 声明是否需要凭据和公开 Core origin，以及支持哪些 setup 操作：`Discovery` 对应 `DiscoverConfiguration`，`SelectionDiscovery` 对应 `DiscoverSelection`，`CredentialVerification` 对应 `VerifyCredential`。`DiscoverConfiguration` 验证 query 并返回安全 catalog，不做 mutation 或 admission decision；Core 保留授权、输入限制与 deadline。`DiscoverSelection` 在提交前解析候选项省略的原生值，`VerifyCredential` 验证凭据对所属资源的访问，不修改资源。两者都接收候选项的 `sandbox.DirectConfig`，原生 client 只为该次调用构造。node provider 仅接受空公开对象，拒绝凭据，对每项 setup 操作和 credential replacement 返回 Unsupported。
-4. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter 和 operation 声明。其键即 provider kind，也用于标记该 Provider 的观测；checkpoint 支持读取此项。生成的投影组合每个已注册的部署模式和 deployment policy 与 `sandbox/deployment_contract.go` 中的共享 field bound：installer 从 `deploy/node/node_spec.py` 读取，TypeScript 客户端和 Web 从 `packages/agents-client/src/deployment-contract.ts` 读取，因此 Web 读取这些声明，而不比较 provider kind。通过 `go run ./services/core/cmd/specification-contract -write` 重新生成两者。
-5. 提供 adapter 和 helper 的发行产物，通过已注册 configuration 契约向运维人员提供 provider。
+4. node adapter 从自己的包中导出 `BuildLocal` constructor、它解码的类型化 `native` 对象，以及它在共享 node artifact 之外添加的原生文件。node-local 设置（如主机路径）只存放在该对象中；resources 和 Runtime release 从 node 配置的 `specification` 读取。
+5. 在 `providers/registry.go` 中注册 constructor、policy、configuration adapter 和 operation 声明。其键即 provider kind，也用于标记该 Provider 的观测；checkpoint 支持读取此项。生成的投影组合每个已注册的部署模式和 deployment policy 与 `sandbox/deployment_contract.go` 中的共享 field bound：installer 从 `deploy/node/node_spec.py` 读取，TypeScript 客户端和 Web 从 `packages/agents-client/src/deployment-contract.ts` 读取，因此 Web 读取这些声明，而不比较 provider kind。通过 `go run ./services/core/cmd/specification-contract -write` 重新生成两者。
+6. 提供 adapter 和 helper 的发行产物，通过已注册 configuration 契约向运维人员提供 provider。
 
 **已知设计缺口：** Web 仍在 setup 向导的后端选择、Docker 确认，以及所有显示或解析 E2B 配置字段的地方（带服务预设的 setup 步骤、部署摘要和客户端的部署投影）中指名 provider，因为协议尚未声明配置字段。通过该界面提供另一 provider 目前需要修改共享的 Web。此耦合不符合[复杂性留在 adapter 内](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#complexity-stays-in-the-adapter)；新集成必须通过协议表达配置，把厂商专有行为留在 adapter。不得添加 Session 或 Turn 调度路径、厂商专有 column 或 API field，或 store 中的厂商 switch。
 
-`providers.Build` 将持久化 node 配置与临时 `LocalOptions` 传给 `BuildLocal`。调用方通过 `Standalone` 明确选择独立注册或单 provider 执行，或通过 `GenerationStateDirectory` 中的规范绝对 node state directory 选择 generation 拥有的执行。context 缺失或混合时拒绝。adapter 负责 generation 特有的原生 preparation 和 readiness 检查。Microsandbox 将 helper lease 绑定到安装实例、generation 和 specification digest，然后在平台、容量和 artifact readiness 后检查固定 image。
+node 配置 `sandbox.NodeConfig` 包含 `provider`、`generation`、`installation_id`、`core_url`、`specification`，以及 adapter 的不透明 `native` 对象。`providers.Build` 验证 `provider`、`generation`、`installation_id` 和 `specification`，并将配置与临时 `sandbox.LocalOptions` 传给 `BuildLocal`，由它严格解码 `native`。调用方通过 `Standalone` 明确选择独立注册或单 provider 执行，或通过 `GenerationStateDirectory` 中的规范绝对 node state directory 选择 generation 拥有的执行。context 缺失或混合时拒绝。adapter 负责 generation 特有的原生 preparation 和 readiness 检查。Microsandbox 将 helper lease 绑定到安装实例、generation 和 specification digest，然后在平台、容量和 artifact readiness 后检查固定 image。
 
 ### 注册验证 {#registration-validation}
 
@@ -135,13 +136,13 @@ configuration adapter 必须非 nil，包括其具体值。每个 `Configuration
 
 具有凭据的 direct adapter 在替换 key 前验证全部保留 generation 与 allocation reference。公共 `sandbox.CallFence` 排除原生调用并等待 helper 完成，包括调用方已超时的调用；execution 调用已准备的 verification 和 fencing callback，不按厂商分支。
 
-厂商部署验证和 SDK setup 留在构造边界，构造不创建 Environment。node-local adapter 的 `providers.Built` 返回 provider、probe、installation identity、backend fingerprint 和 specification digest；helper 可能比调用方存活更久时，还返回 `Quiescent` 检查，generation 回收会等待它。factory 还返回 close 函数。`execution.RuntimeProvider` 将 adapter 绑定到 kind、installation ID、backend fingerprint、generation、mode 和 node ownership；选择由数据库负责，内存副本不构成另一权限来源。Docker 与 microsandbox 在 node 上运行，E2B 直接构造。node proxy 仅对注册声明支持 checkpoint 的 backend 暴露 checkpoint 操作，公共 lifecycle 通过 checkpoint 声明准入 suspension，不通过 provider name。
+厂商部署验证和 SDK setup 留在构造边界，构造不创建 Environment。node-local adapter 的 `sandbox.Built` 返回 provider、probe、installation identity、backend fingerprint 和 specification digest；helper 可能比调用方存活更久时，还返回 `Quiescent` 检查，generation 回收会等待它。factory 还返回 close 函数。`execution.RuntimeProvider` 将 adapter 绑定到 kind、installation ID、backend fingerprint、generation、mode 和 node ownership；选择由数据库负责，内存副本不构成另一权限来源。Docker 与 microsandbox 在 node 上运行，E2B 直接构造。node proxy 仅对注册声明支持 checkpoint 的 backend 暴露 checkpoint 操作，公共 lifecycle 通过 checkpoint 声明准入 suspension，不通过 provider name。
 
 backend fingerprint 标识原生资源命名空间，不表示容量。Core 保留部署 generation，使所属 allocation 继续解析到原 backend；不要将保留 allocation 重新指向替代 backend。
 
 ### 发行产物与进程路径 {#distribution-artifacts-and-process-paths}
 
-每个 node adapter 注册负责其类型化 `NodeArtifacts` 声明：逻辑发行路径、release filename suffix 和安装角色（`node`、`runtime`、`policy` 或 `image`）。注册拒绝缺失声明、不安全路径和未知角色。`go run ./services/core/cmd/provider-artifacts -write` 生成共享 Web catalog 和 Python projection。不带 `-write` 运行可检查是否最新。发行打包、Web availability 和 node 安装读取此投影；添加 provider payload 不在这些消费者中增加 provider-name 分支。
+每个 node adapter 注册负责其类型化 `NodeArtifacts` 声明，即共享 node artifact 加上其包导出的原生文件：逻辑发行路径、release filename suffix 和安装角色（`node`、`runtime`、`policy` 或 `image`）。注册拒绝缺失声明、不安全路径和未知角色。`go run ./services/core/cmd/provider-artifacts -write` 生成共享 Web catalog 和 Python projection。不带 `-write` 运行可检查是否最新。发行打包、Web availability 和 node 安装读取此投影；添加 provider payload 不在这些消费者中增加 provider-name 分支。
 
 launcher 从[派生进程环境](configuration.md)提供 `sandbox.ProcessPaths`。Core 读取这些路径一次，并传给 direct construction 和 setup 操作。它们是固定发行属性，不是部署设置或用户可选 helper 路径。每个 adapter 解析自己的相对 helper 和 state 位置；E2B 使用 `e2b/oac-e2b-provider` 和 `e2b/`。root 缺失或不是绝对路径时，在执行 helper 前失败。Provider 构造与发现不读取进程环境变量。
 
diff --git a/services/core/cmd/sandbox-node/generations.go b/services/core/cmd/sandbox-node/generations.go
index 78f41af37..e6b88a62c 100644
--- a/services/core/cmd/sandbox-node/generations.go
+++ b/services/core/cmd/sandbox-node/generations.go
@@ -47,7 +47,7 @@ func runGenerations(ctx context.Context, registry *providerconfig.Registry, conf
 	values := map[uint64]node.GenerationProvider{}
 	recovery := []sandbox.GenerationReference{}
 	collection := []sandbox.GenerationReference{}
-	seen := map[uint64]providerconfig.Config{}
+	seen := map[uint64]sandbox.NodeConfig{}
 	closeValues := func() {
 		for _, v := range values {
 			if v.Close != nil {
@@ -56,7 +56,7 @@ func runGenerations(ctx context.Context, registry *providerconfig.Registry, conf
 		}
 	}
 	for _, path := range paths {
-		var config providerconfig.Config
+		var config sandbox.NodeConfig
 		if strings.HasSuffix(path, ".preparing") {
 			journal, readErr := readGenerationJournal(path)
 			err = readErr
@@ -166,8 +166,8 @@ func runGenerations(ctx context.Context, registry *providerconfig.Registry, conf
 	return node.Run(ctx, node.AgentConfig{CoreURL: stored.CoreURL, StateDirectory: stateDir, Identity: stored.Identity, Credential: stored.Credential, Generations: manager})
 }
 
-func buildGeneration(registry *providerconfig.Registry, config providerconfig.Config, stateDir string) (node.GenerationProvider, error) {
-	built, closeProvider, err := registry.Build(config, providerconfig.LocalOptions{GenerationStateDirectory: stateDir})
+func buildGeneration(registry *providerconfig.Registry, config sandbox.NodeConfig, stateDir string) (node.GenerationProvider, error) {
+	built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{GenerationStateDirectory: stateDir})
 	if err != nil {
 		return node.GenerationProvider{}, err
 	}
@@ -175,12 +175,12 @@ func buildGeneration(registry *providerconfig.Registry, config providerconfig.Co
 }
 
 type generationJournal struct {
-	InstallationID      string                 `json:"installation_id"`
-	Generation          uint64                 `json:"generation"`
-	SpecificationDigest string                 `json:"specification_digest"`
-	NativeComplete      json.RawMessage        `json:"native_complete,omitempty"`
-	ImportStarted       json.RawMessage        `json:"import_started,omitempty"`
-	Configuration       *providerconfig.Config `json:"configuration,omitempty"`
+	InstallationID      string              `json:"installation_id"`
+	Generation          uint64              `json:"generation"`
+	SpecificationDigest string              `json:"specification_digest"`
+	NativeComplete      json.RawMessage     `json:"native_complete,omitempty"`
+	ImportStarted       json.RawMessage     `json:"import_started,omitempty"`
+	Configuration       *sandbox.NodeConfig `json:"configuration,omitempty"`
 }
 
 func readGenerationJournal(path string) (generationJournal, error) {
@@ -211,23 +211,17 @@ func readGenerationJournal(path string) (generationJournal, error) {
 }
 
 // The preparation configuration is an immutable plan, never a usable provider.
-// Only Docker's two specification-proven local IDs can differ at publication.
-func sameGenerationPlan(final, plan providerconfig.Config) bool {
-	if plan.Docker != nil && final.Docker != nil {
-		runtime := plan.Specification.Runtime
-		if final.Docker.Image != runtime.ImageID && final.Docker.Image != runtime.ImageManifestDigest {
-			return false
-		}
-		copyDocker := *plan.Docker
-		copyDocker.Image = final.Docker.Image
-		plan.Docker = &copyDocker
-	}
+// A generation's Core-visible envelope is fixed; native is the adapter's
+// node-local state, which preparation may resolve and the adapter validates
+// when it builds.
+func sameGenerationPlan(final, plan sandbox.NodeConfig) bool {
+	final.Native, plan.Native = nil, nil
 	return reflect.DeepEqual(final, plan)
 }
 
 // Pending-only entries stay recovery/collection-only. No journal is readiness
 // or authority to collect without a fresh current-connection Core grant.
-func generationLocalState(config providerconfig.Config, stateDir string) (string, error) {
+func generationLocalState(config sandbox.NodeConfig, stateDir string) (string, error) {
 	directory := filepath.Join(stateDir, "generations")
 	info, err := os.Lstat(directory)
 	if os.IsNotExist(err) {
diff --git a/services/core/cmd/sandbox-node/generations_test.go b/services/core/cmd/sandbox-node/generations_test.go
index 56a015270..ae08f7ad0 100644
--- a/services/core/cmd/sandbox-node/generations_test.go
+++ b/services/core/cmd/sandbox-node/generations_test.go
@@ -7,15 +7,15 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"syscall"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-	providerconfig "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 )
 
 func TestGenerationJournalRestartIdentity(t *testing.T) {
-	config := providerconfig.Config{InstallationID: "installation", Generation: 9, Provider: "docker"}
+	config := sandbox.NodeConfig{InstallationID: "installation", Generation: 9, Provider: "docker"}
 	stateDir := t.TempDir()
 	directory := filepath.Join(stateDir, "generations")
 	if err := os.Mkdir(directory, 0700); err != nil {
@@ -118,7 +118,7 @@ func TestGenerationHelperUsesOnlyTypedExit(t *testing.T) {
 }
 
 func TestUnresolvedPreparationRemainsRecoveryOnly(t *testing.T) {
-	config := providerconfig.Config{InstallationID: "installation", Generation: 2, Provider: "docker"}
+	config := sandbox.NodeConfig{InstallationID: "installation", Generation: 2, Provider: "docker"}
 	stateDir := t.TempDir()
 	directory := filepath.Join(stateDir, "generations")
 	if err := os.Mkdir(directory, 0700); err != nil {
@@ -144,6 +144,22 @@ func TestUnresolvedPreparationRemainsRecoveryOnly(t *testing.T) {
 	}
 }
 
+// Preparation may resolve native state, such as the digest a containerd image
+// store names the loaded Runtime image by; the envelope stays fixed.
+func TestGenerationPlanFixesOnlyTheEnvelope(t *testing.T) {
+	release := sandbox.RuntimeRelease{ImageID: "sha256:" + strings.Repeat("b", 64), ImageManifestDigest: "sha256:" + strings.Repeat("c", 64)}
+	plan := sandbox.NodeConfig{InstallationID: "installation", Generation: 2, Provider: "docker", Specification: sandbox.DeploymentSpec{Resources: sandbox.Resources{CPUs: 2, MemoryMiB: 2048}, Runtime: &release}, Native: json.RawMessage(`{"image":"` + release.ImageID + `"}`)}
+	final := plan
+	final.Native = json.RawMessage(`{"image":"` + release.ImageManifestDigest + `"}`)
+	if !sameGenerationPlan(final, plan) {
+		t.Fatal("refused a resolved native image")
+	}
+	final.Specification.Resources.CPUs = 4
+	if sameGenerationPlan(final, plan) {
+		t.Fatal("accepted a different specification")
+	}
+}
+
 func TestGenerationStateDirectoryOwnership(t *testing.T) {
 	for _, mode := range []string{"private", "public", "symlink", "symlink_parent"} {
 		t.Run(mode, func(t *testing.T) {
@@ -170,7 +186,7 @@ func TestGenerationStateDirectoryOwnership(t *testing.T) {
 				}
 				stateDir = link
 			}
-			_, err := generationLocalState(providerconfig.Config{Generation: 1}, stateDir)
+			_, err := generationLocalState(sandbox.NodeConfig{Generation: 1}, stateDir)
 			if mode == "private" && err != nil || mode != "private" && !errors.Is(err, sandbox.ErrOwnership) {
 				t.Fatalf("directory ownership: %v", err)
 			}
diff --git a/services/core/cmd/sandbox-node/main.go b/services/core/cmd/sandbox-node/main.go
index 11657f156..1cef71944 100644
--- a/services/core/cmd/sandbox-node/main.go
+++ b/services/core/cmd/sandbox-node/main.go
@@ -81,7 +81,7 @@ func run(ctx context.Context, args []string) error {
 	if err != nil {
 		return err
 	}
-	built, closeProvider, err := registry.Build(config, providerconfig.LocalOptions{Standalone: true})
+	built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{Standalone: true})
 	if err != nil {
 		return err
 	}
diff --git a/services/core/internal/sandbox/deployment.go b/services/core/internal/sandbox/deployment.go
index af749281f..dbfda8746 100644
--- a/services/core/internal/sandbox/deployment.go
+++ b/services/core/internal/sandbox/deployment.go
@@ -113,3 +113,8 @@ func (s DeploymentSpec) Digest(provider string) string {
 type Description struct {
 	Mode, BackendFingerprint string
 }
+
+func BackendFingerprint(kind, namespace string) string {
+	digest := sha256.Sum256([]byte(kind + "\x00" + namespace))
+	return hex.EncodeToString(digest[:])
+}
diff --git a/services/core/internal/sandbox/docker/node.go b/services/core/internal/sandbox/docker/node.go
new file mode 100644
index 000000000..63a2570fe
--- /dev/null
+++ b/services/core/internal/sandbox/docker/node.go
@@ -0,0 +1,108 @@
+package docker
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/url"
+	"os"
+	"path/filepath"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/containerd/errdefs"
+	"github.com/moby/moby/client"
+)
+
+// Native is the node configuration's native object for Docker. Image is the
+// local ID of the release's Runtime image: the host's image store decides
+// whether the config digest (image_id) or the manifest digest
+// (image_manifest_digest) names the loaded image, so the installer records the
+// one this host resolves.
+type Native struct {
+	Host          string   `json:"host"`
+	Image         string   `json:"image"`
+	Network       string   `json:"network"`
+	SeccompFile   string   `json:"seccomp_file"`
+	ExtraHosts    []string `json:"extra_hosts"`
+	NestedSandbox bool     `json:"nested_sandbox"`
+}
+
+func decodeNative(config sandbox.NodeConfig) (Native, error) {
+	var entry Native
+	if sandbox.DecodeConfigurationObject(config.Native, &entry, "host", "image", "network", "seccomp_file", "extra_hosts", "nested_sandbox") != nil {
+		return entry, errors.New("invalid managed Docker node configuration")
+	}
+	release := config.Specification.Runtime
+	if entry.Image != release.ImageID && entry.Image != release.ImageManifestDigest {
+		return entry, errors.New("Docker Runtime image differs from the deployment release")
+	}
+	return entry, nil
+}
+
+// BuildNode constructs the node-local Docker adapter from a validated node configuration.
+func BuildNode(config sandbox.NodeConfig, _ sandbox.LocalOptions, result *sandbox.Built) (func(), error) {
+	closeProvider := func() {}
+	entry, err := decodeNative(config)
+	if err != nil {
+		return closeProvider, err
+	}
+	host, err := url.Parse(entry.Host)
+	if err != nil || host.Scheme != "unix" || host.Host != "" || host.User != nil || host.RawQuery != "" || host.Fragment != "" || host.RawPath != "" || host.Path == "/" || !filepath.IsAbs(host.Path) || filepath.Clean(host.Path) != host.Path || entry.Host != "unix://"+host.Path {
+		return closeProvider, errors.New("managed Docker host must be an explicit canonical unix socket")
+	}
+	seccomp, err := os.ReadFile(entry.SeccompFile)
+	if err != nil {
+		return closeProvider, fmt.Errorf("cannot read managed Docker seccomp JSON: %w", err)
+	}
+	if !json.Valid(seccomp) {
+		return closeProvider, errors.New("invalid managed Docker seccomp JSON")
+	}
+	c, err := client.New(client.WithHost(entry.Host))
+	if err != nil {
+		return closeProvider, errors.New("invalid managed Docker endpoint")
+	}
+	closeProvider = func() { _ = c.Close() }
+	provider, err := New(c, Config{InstallationID: config.InstallationID, Image: entry.Image, Network: entry.Network, Seccomp: string(seccomp), ExtraHosts: entry.ExtraHosts, NestedSandbox: entry.NestedSandbox, Resources: &config.Specification.Resources})
+	if err != nil {
+		closeProvider()
+		return func() {}, errors.New("invalid managed Docker provider configuration")
+	}
+	result.Provider = provider
+	result.Probe = dockerProbe(c, entry.Image, config.Specification.Resources)
+	result.BackendFingerprint = sandbox.BackendFingerprint(config.Provider, entry.Host)
+	return closeProvider, nil
+}
+
+// The probe reports its first failed check as its readiness class: the Docker
+// daemon, then limit support, then host capacity for one sandbox of the
+// deployment specification, then the pinned Runtime image. Unclassified
+// failures stay provider_unavailable. The returned text is local; only its
+// class is reported.
+func dockerProbe(c *client.Client, image string, resources sandbox.Resources) func(context.Context) error {
+	return func(ctx context.Context) error {
+		if _, err := c.Ping(ctx, client.PingOptions{}); err != nil {
+			return fmt.Errorf("%w: Docker daemon is unreachable", sandbox.ErrProviderUnavailable)
+		}
+		host, err := c.Info(ctx, client.InfoOptions{})
+		if err != nil {
+			return fmt.Errorf("%w: cannot inspect Docker host resource support", sandbox.ErrProviderUnavailable)
+		}
+		if !host.Info.MemoryLimit || !host.Info.CPUCfsQuota {
+			return fmt.Errorf("%w: Docker does not enforce CPU and memory limits", sandbox.ErrHostUnsupported)
+		}
+		if host.Info.MemTotal <= 0 {
+			return errors.New("Docker host memory capacity is unavailable")
+		}
+		if err := sandbox.CheckCapacity(resources, host.Info.NCPU, uint64(host.Info.MemTotal)); err != nil {
+			return err
+		}
+		if _, err = c.ImageInspect(ctx, image); errdefs.IsNotFound(err) {
+			return sandbox.ErrRuntimeImageUnavailable
+		} else if err != nil {
+			// The daemon did not answer; the image may still be present.
+			return fmt.Errorf("%w: cannot inspect the pinned Runtime image", sandbox.ErrProviderUnavailable)
+		}
+		return nil
+	}
+}
diff --git a/services/core/internal/sandbox/docker/node_test.go b/services/core/internal/sandbox/docker/node_test.go
new file mode 100644
index 000000000..0d5f576c2
--- /dev/null
+++ b/services/core/internal/sandbox/docker/node_test.go
@@ -0,0 +1,85 @@
+package docker
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/moby/moby/client"
+)
+
+// The host's image store decides which release digest names the loaded image.
+func TestNativeImageIsAReleaseIdentity(t *testing.T) {
+	release := sandbox.RuntimeRelease{ImageID: "sha256:" + strings.Repeat("b", 64), ImageManifestDigest: "sha256:" + strings.Repeat("c", 64)}
+	config := sandbox.NodeConfig{Specification: sandbox.DeploymentSpec{Runtime: &release}}
+	for _, image := range []string{release.ImageID, release.ImageManifestDigest} {
+		config.Native = json.RawMessage(`{"image":"` + image + `"}`)
+		if entry, err := decodeNative(config); err != nil || entry.Image != image {
+			t.Fatalf("rejected release image %s: %v", image, err)
+		}
+	}
+	for _, native := range []string{`{"image":"sha256:` + strings.Repeat("a", 64) + `"}`, `{"image":"` + release.ImageID + `","cpus":2}`, `{"image":null}`} {
+		config.Native = json.RawMessage(native)
+		if _, err := decodeNative(config); err == nil {
+			t.Fatalf("accepted native %s", native)
+		}
+	}
+}
+
+func TestDockerProbeDiagnostics(t *testing.T) {
+	image := "sha256:" + strings.Repeat("c", 64)
+	for _, tc := range []struct {
+		name                   string
+		limits                 bool
+		cpus                   int
+		imageStatus            int
+		want                   string
+		unreachable, infoFails bool
+	}{
+		{name: "unreachable", unreachable: true, want: "provider_unavailable"},
+		{name: "info", infoFails: true, want: "provider_unavailable"},
+		// The pinned image is also missing below; earlier checks take precedence.
+		{name: "limits", cpus: 8, imageStatus: 404, want: "host_unsupported"},
+		{name: "capacity", limits: true, cpus: 1, imageStatus: 404, want: "capacity_insufficient"},
+		{name: "image", limits: true, cpus: 8, imageStatus: 404, want: "runtime_image_unavailable"},
+		{name: "image_inspect_fails", limits: true, cpus: 8, imageStatus: 500, want: "provider_unavailable"},
+		{name: "ready", limits: true, cpus: 8, imageStatus: 200},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.Header().Set("Content-Type", "application/json")
+				switch path := strings.TrimPrefix(r.URL.Path, "/v1.52"); {
+				case path == "/_ping":
+					_, _ = w.Write([]byte("OK"))
+				case path == "/info" && !tc.infoFails:
+					_ = json.NewEncoder(w).Encode(map[string]any{"MemoryLimit": tc.limits, "CpuCfsQuota": tc.limits, "NCPU": tc.cpus, "MemTotal": int64(64) << 30})
+				case path == "/images/"+image+"/json" && tc.imageStatus == 200:
+					_ = json.NewEncoder(w).Encode(map[string]string{"Id": image})
+				case path == "/images/"+image+"/json":
+					w.WriteHeader(tc.imageStatus)
+					_, _ = w.Write([]byte(`{"message":"private daemon detail"}`))
+				default:
+					w.WriteHeader(500)
+					_, _ = w.Write([]byte(`{"message":"private daemon detail"}`))
+				}
+			}))
+			defer server.Close()
+			host := server.URL
+			if tc.unreachable {
+				host = "unix://" + filepath.Join(t.TempDir(), "missing.sock")
+			}
+			c, err := client.New(client.WithHost(host), client.WithAPIVersion("1.52"))
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer c.Close()
+			if got := sandbox.NodeDiagnostic(dockerProbe(c, image, sandbox.Resources{CPUs: 2, MemoryMiB: 1024})(t.Context())); got != tc.want {
+				t.Fatalf("diagnostic = %q, want %q", got, tc.want)
+			}
+		})
+	}
+}
diff --git a/services/core/internal/sandbox/providers/capacity_linux.go b/services/core/internal/sandbox/microsandbox/capacity_linux.go
similarity index 73%
rename from services/core/internal/sandbox/providers/capacity_linux.go
rename to services/core/internal/sandbox/microsandbox/capacity_linux.go
index fbadd8abb..3edc4b4a4 100644
--- a/services/core/internal/sandbox/providers/capacity_linux.go
+++ b/services/core/internal/sandbox/microsandbox/capacity_linux.go
@@ -1,6 +1,6 @@
 //go:build linux
 
-package providers
+package microsandbox
 
 import (
 	"fmt"
@@ -15,5 +15,5 @@ func hostCapacity(r sandbox.Resources) error {
 	if err := syscall.Sysinfo(&info); err != nil {
 		return fmt.Errorf("cannot verify node memory capacity")
 	}
-	return checkCapacity(r, runtime.NumCPU(), uint64(info.Totalram)*uint64(info.Unit))
+	return sandbox.CheckCapacity(r, runtime.NumCPU(), uint64(info.Totalram)*uint64(info.Unit))
 }
diff --git a/services/core/internal/sandbox/providers/capacity_other.go b/services/core/internal/sandbox/microsandbox/capacity_other.go
similarity index 90%
rename from services/core/internal/sandbox/providers/capacity_other.go
rename to services/core/internal/sandbox/microsandbox/capacity_other.go
index 6fe10fc56..68f15f265 100644
--- a/services/core/internal/sandbox/providers/capacity_other.go
+++ b/services/core/internal/sandbox/microsandbox/capacity_other.go
@@ -1,6 +1,6 @@
 //go:build !linux
 
-package providers
+package microsandbox
 
 import (
 	"errors"
diff --git a/services/core/internal/sandbox/providers/generation_probe_test.go b/services/core/internal/sandbox/microsandbox/generation_probe_test.go
similarity index 90%
rename from services/core/internal/sandbox/providers/generation_probe_test.go
rename to services/core/internal/sandbox/microsandbox/generation_probe_test.go
index 0c0004e09..951cfd85a 100644
--- a/services/core/internal/sandbox/providers/generation_probe_test.go
+++ b/services/core/internal/sandbox/microsandbox/generation_probe_test.go
@@ -1,4 +1,4 @@
-package providers
+package microsandbox
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 func TestMicrosandboxGenerationImageProbe(t *testing.T) {
 	dir := t.TempDir()
 	imageDigest := "sha256:" + strings.Repeat("d", 64)
-	entry := Microsandbox{RuntimePath: filepath.Join(dir, "msb"), RuntimeHome: dir, FirmwarePath: filepath.Join(dir, "firmware"), Image: "oac-runtime@" + imageDigest}
+	entry := Config{RuntimePath: filepath.Join(dir, "msb"), RuntimeHome: dir, FirmwarePath: filepath.Join(dir, "firmware"), Image: "oac-runtime@" + imageDigest}
 	// Check the native argument/environment boundary, including ambient isolation.
 	script := `#!/bin/sh
 [ "$#" = 5 ] && [ "$1" = image ] && [ "$2" = inspect ] && [ "$3" = 'oac-runtime@` + imageDigest + `' ] && [ "$4" = --format ] && [ "$5" = json ] || exit 1
@@ -74,7 +74,7 @@ cat "$MSB_HOME/output"
 
 func TestMicrosandboxGenerationProbeRetainsEarlierFailures(t *testing.T) {
 	for _, failure := range []error{context.Canceled, sandbox.ErrHostUnsupported, sandbox.ErrCapacityInsufficient, sandbox.ErrArtifactsUnavailable, errors.New("microsandbox state directory is unavailable")} {
-		probe := microsandboxGenerationProbe(Microsandbox{RuntimePath: "/missing"}, func(context.Context) error { return failure })
+		probe := microsandboxGenerationProbe(Config{RuntimePath: "/missing"}, func(context.Context) error { return failure })
 		if got := probe(t.Context()); got != failure {
 			t.Fatalf("earlier failure changed: got %v, want %v", got, failure)
 		}
diff --git a/services/core/internal/sandbox/microsandbox/node.go b/services/core/internal/sandbox/microsandbox/node.go
new file mode 100644
index 000000000..69b331df2
--- /dev/null
+++ b/services/core/internal/sandbox/microsandbox/node.go
@@ -0,0 +1,100 @@
+package microsandbox
+
+import (
+	"errors"
+	"os"
+	"path/filepath"
+	"strconv"
+
+	"github.com/MiniMax-AI/OpenAgentCore/internal/providerassets"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+)
+
+// NodeArtifacts are the native files a microsandbox node installs beside the
+// shared node payload.
+var NodeArtifacts = []providerassets.Artifact{
+	{Path: "native/bin/oac-microsandbox-provider", Suffix: "microsandbox-provider", Role: "runtime"},
+	{Path: "native/microsandbox/msb", Suffix: "msb", Role: "runtime"},
+	{Path: "native/microsandbox/libkrunfw.so.5.6.1", Suffix: "libkrunfw.so.5.6.1", Role: "runtime"},
+}
+
+// Native is the node configuration's native object for microsandbox: the
+// helper, Runtime and firmware paths, the private store and the network policy.
+// The helper owns local paths; no ambient backend is selected. Resources, the
+// image and the artifact hashes come from the deployment specification.
+type Native struct {
+	HelperPath   string  `json:"helper_path"`
+	RuntimeHome  string  `json:"runtime_home"`
+	RuntimePath  string  `json:"runtime_path"`
+	FirmwarePath string  `json:"firmware_path"`
+	Network      Network `json:"network"`
+}
+
+type Network struct {
+	DefaultEgress  string `json:"default_egress"`
+	DefaultIngress string `json:"default_ingress"`
+	Rules          []Rule `json:"rules"`
+}
+
+type Rule struct {
+	Action      string `json:"action"`
+	Direction   string `json:"direction"`
+	Destination string `json:"destination"`
+	Protocol    string `json:"protocol"`
+	Port        string `json:"port"`
+}
+
+func configureMicrosandbox(entry Native, spec sandbox.DeploymentSpec, caller *ProcessCaller, result *sandbox.Built) (Config, error) {
+	if !filepath.IsAbs(entry.RuntimeHome) || filepath.Clean(entry.RuntimeHome) != entry.RuntimeHome {
+		return Config{}, errors.New("managed microsandbox runtime_home must be a canonical absolute path")
+	}
+	network := NetworkPolicy{DefaultEgress: entry.Network.DefaultEgress, DefaultIngress: entry.Network.DefaultIngress}
+	for _, rule := range entry.Network.Rules {
+		network.Rules = append(network.Rules, NetworkRule{Action: rule.Action, Direction: rule.Direction, Destination: rule.Destination, Protocol: rule.Protocol, Port: rule.Port})
+	}
+	release, resources := spec.Runtime, spec.Resources
+	config := Config{
+		InstallationID: result.InstallationID, HelperPath: entry.HelperPath, RuntimeHome: entry.RuntimeHome, RuntimePath: entry.RuntimePath, FirmwarePath: entry.FirmwarePath,
+		RuntimeSHA256: release.RuntimeSHA256, FirmwareSHA256: release.FirmwareSHA256, Image: release.MicrosandboxRef,
+		MemoryMiB: resources.MemoryMiB, CPUs: uint8(resources.CPUs), RootDiskMiB: resources.RootDiskMiB, EnvironmentDiskMiB: resources.EnvironmentDiskMiB, Network: network,
+	}
+	provider, err := NewWithCaller(config, caller)
+	if err != nil {
+		return Config{}, errors.New("invalid managed microsandbox provider configuration")
+	}
+	result.Provider = provider
+	result.Probe = microsandboxProbe(config, resources)
+	result.Quiescent = caller.Quiescent
+	result.BackendFingerprint = sandbox.BackendFingerprint("microsandbox", entry.RuntimeHome)
+	return config, nil
+}
+
+// BuildNode constructs the node-local microsandbox adapter from a validated node configuration.
+func BuildNode(c sandbox.NodeConfig, options sandbox.LocalOptions, result *sandbox.Built) (func(), error) {
+	closeProvider := func() {}
+	var entry Native
+	if sandbox.DecodeConfigurationObject(c.Native, &entry, "helper_path", "runtime_home", "runtime_path", "firmware_path", "network") != nil {
+		return closeProvider, errors.New("invalid managed microsandbox node configuration")
+	}
+	caller := &ProcessCaller{}
+	if options.GenerationStateDirectory != "" {
+		directory := filepath.Join(options.GenerationStateDirectory, "generations")
+		if err := os.MkdirAll(directory, 0700); err != nil {
+			return closeProvider, err
+		}
+		info, err := os.Lstat(directory)
+		if err != nil || !info.IsDir() || info.Mode().Perm() != 0700 {
+			return closeProvider, sandbox.ErrOwnership
+		}
+		caller.LeasePath = filepath.Join(directory, strconv.FormatUint(c.Generation, 10)+".lease")
+		caller.LeaseIdentity = LeaseIdentity{InstallationID: result.InstallationID, Generation: c.Generation, SpecificationDigest: result.SpecificationDigest}
+	}
+	config, err := configureMicrosandbox(entry, c.Specification, caller, result)
+	if err != nil {
+		return closeProvider, err
+	}
+	if options.GenerationStateDirectory != "" {
+		result.Probe = microsandboxGenerationProbe(config, result.Probe)
+	}
+	return closeProvider, nil
+}
diff --git a/services/core/internal/sandbox/microsandbox/node_test.go b/services/core/internal/sandbox/microsandbox/node_test.go
new file mode 100644
index 000000000..082bfd5a7
--- /dev/null
+++ b/services/core/internal/sandbox/microsandbox/node_test.go
@@ -0,0 +1,53 @@
+package microsandbox
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/google/uuid"
+)
+
+func TestMicrosandboxConstructionSelectsGenerationReadiness(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skip("microsandbox requires Linux")
+	}
+	useKVM(t, true)
+	dir := t.TempDir()
+	native := Native{HelperPath: filepath.Join(dir, "helper"), RuntimeHome: dir, RuntimePath: filepath.Join(dir, "msb"), FirmwarePath: filepath.Join(dir, "firmware"), Network: Network{DefaultEgress: "allow", DefaultIngress: "deny"}}
+	raw, err := json.Marshal(native)
+	if err != nil {
+		t.Fatal(err)
+	}
+	script := []byte("#!/bin/sh\nprintf '%s' '{}'\n")
+	digest := sha256.Sum256(script)
+	release := sandbox.RuntimeRelease{MicrosandboxRef: "oac-runtime@sha256:" + strings.Repeat("d", 64), RuntimeSHA256: hex.EncodeToString(digest[:]), FirmwareSHA256: hex.EncodeToString(digest[:])}
+	config := sandbox.NodeConfig{Provider: "microsandbox", Generation: 9, Specification: sandbox.DeploymentSpec{Resources: sandbox.Resources{CPUs: 2, MemoryMiB: 2048, RootDiskMiB: 8192, EnvironmentDiskMiB: 8192}, Runtime: &release}, Native: raw}
+	for _, path := range []string{native.RuntimePath, native.FirmwarePath, native.HelperPath} {
+		if err := os.WriteFile(path, script, 0700); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if err := os.Chmod(native.RuntimeHome, 0700); err != nil {
+		t.Fatal(err)
+	}
+	for _, options := range []sandbox.LocalOptions{{Standalone: true}, {GenerationStateDirectory: t.TempDir()}} {
+		built := &sandbox.Built{InstallationID: uuid.NewString(), SpecificationDigest: config.Specification.Digest(config.Provider)}
+		closeProvider, err := BuildNode(config, options, built)
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = built.Probe(t.Context())
+		closeProvider()
+		if options.Standalone && err != nil || !options.Standalone && !errors.Is(err, sandbox.ErrRuntimeImageUnavailable) {
+			t.Fatalf("readiness for %+v: %v", options, err)
+		}
+	}
+}
diff --git a/services/core/internal/sandbox/providers/probe.go b/services/core/internal/sandbox/microsandbox/probe.go
similarity index 63%
rename from services/core/internal/sandbox/providers/probe.go
rename to services/core/internal/sandbox/microsandbox/probe.go
index c7e34316a..4e7c5772f 100644
--- a/services/core/internal/sandbox/providers/probe.go
+++ b/services/core/internal/sandbox/microsandbox/probe.go
@@ -1,4 +1,4 @@
-package providers
+package microsandbox
 
 import (
 	"context"
@@ -15,53 +15,21 @@ import (
 	"sync"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-	"github.com/containerd/errdefs"
-	"github.com/moby/moby/client"
 )
 
-// Probes report the first failed check as its readiness class. Precedence runs
-// from the provider platform (Docker daemon or KVM), through Docker limit
-// support and host capacity for one sandbox of the deployment specification, to
-// the installed Runtime content (image or microsandbox artifacts). Unclassified
-// failures stay provider_unavailable. The returned text is local; only its class
-// is reported.
+// The probe reports its first failed check as its readiness class: KVM, then
+// host capacity for one sandbox of the deployment specification, then the
+// installed Runtime artifacts. Unclassified failures stay provider_unavailable.
+// The returned text is local; only its class is reported.
 
 // kvmDevice is replaceable only by tests.
 var kvmDevice = "/dev/kvm"
 
-func dockerProbe(c *client.Client, image string, resources sandbox.Resources) func(context.Context) error {
-	return func(ctx context.Context) error {
-		if _, err := c.Ping(ctx, client.PingOptions{}); err != nil {
-			return fmt.Errorf("%w: Docker daemon is unreachable", sandbox.ErrProviderUnavailable)
-		}
-		host, err := c.Info(ctx, client.InfoOptions{})
-		if err != nil {
-			return fmt.Errorf("%w: cannot inspect Docker host resource support", sandbox.ErrProviderUnavailable)
-		}
-		if !host.Info.MemoryLimit || !host.Info.CPUCfsQuota {
-			return fmt.Errorf("%w: Docker does not enforce CPU and memory limits", sandbox.ErrHostUnsupported)
-		}
-		if host.Info.MemTotal <= 0 {
-			return errors.New("Docker host memory capacity is unavailable")
-		}
-		if err := checkCapacity(resources, host.Info.NCPU, uint64(host.Info.MemTotal)); err != nil {
-			return err
-		}
-		if _, err = c.ImageInspect(ctx, image); errdefs.IsNotFound(err) {
-			return sandbox.ErrRuntimeImageUnavailable
-		} else if err != nil {
-			// The daemon did not answer; the image may still be present.
-			return fmt.Errorf("%w: cannot inspect the pinned Runtime image", sandbox.ErrProviderUnavailable)
-		}
-		return nil
-	}
-}
-
 // A successful Runtime integrity check is cached for this immutable
 // configuration. A failure is checked again on the next heartbeat, so repaired
 // artifacts recover without a restart. Lifecycle calls still verify the exact
 // artifact themselves.
-func microsandboxProbe(entry Microsandbox, resources sandbox.Resources) func(context.Context) error {
+func microsandboxProbe(entry Config, resources sandbox.Resources) func(context.Context) error {
 	var integrity sync.Mutex
 	verified := false
 	return func(ctx context.Context) error {
@@ -100,7 +68,7 @@ func microsandboxProbe(entry Microsandbox, resources sandbox.Resources) func(con
 	}
 }
 
-func verifyMicrosandboxArtifacts(entry Microsandbox) error {
+func verifyMicrosandboxArtifacts(entry Config) error {
 	for _, artifact := range []struct{ path, hash string }{{entry.RuntimePath, entry.RuntimeSHA256}, {entry.FirmwarePath, entry.FirmwareSHA256}} {
 		f, err := os.Open(artifact.path)
 		if err != nil {
@@ -118,7 +86,7 @@ func verifyMicrosandboxArtifacts(entry Microsandbox) error {
 
 // Image availability is checked on every retained-generation probe, after the
 // platform, capacity and local artifact checks.
-func microsandboxGenerationProbe(entry Microsandbox, probe func(context.Context) error) func(context.Context) error {
+func microsandboxGenerationProbe(entry Config, probe func(context.Context) error) func(context.Context) error {
 	return func(ctx context.Context) error {
 		if err := probe(ctx); err != nil {
 			return err
diff --git a/services/core/internal/sandbox/providers/probe_test.go b/services/core/internal/sandbox/microsandbox/probe_test.go
similarity index 57%
rename from services/core/internal/sandbox/providers/probe_test.go
rename to services/core/internal/sandbox/microsandbox/probe_test.go
index b258aaf39..53b767e42 100644
--- a/services/core/internal/sandbox/providers/probe_test.go
+++ b/services/core/internal/sandbox/microsandbox/probe_test.go
@@ -1,11 +1,8 @@
-package providers
+package microsandbox
 
 import (
 	"crypto/sha256"
 	"encoding/hex"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -13,7 +10,6 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-	"github.com/moby/moby/client"
 )
 
 var smallSandbox = sandbox.Resources{CPUs: 1, MemoryMiB: 512}
@@ -72,7 +68,7 @@ func TestMicrosandboxProbeRequiresPrivateRuntimeDirectory(t *testing.T) {
 				}
 				home = link
 			}
-			probe := microsandboxProbe(Microsandbox{HelperPath: artifact, RuntimePath: artifact, FirmwarePath: artifact, RuntimeSHA256: hex.EncodeToString(digest[:]), FirmwareSHA256: hex.EncodeToString(digest[:]), RuntimeHome: home}, smallSandbox)
+			probe := microsandboxProbe(Config{HelperPath: artifact, RuntimePath: artifact, FirmwarePath: artifact, RuntimeSHA256: hex.EncodeToString(digest[:]), FirmwareSHA256: hex.EncodeToString(digest[:]), RuntimeHome: home}, smallSandbox)
 			err := probe(t.Context())
 			if tc.rejected {
 				// An unclassified cause keeps the generic readiness code.
@@ -112,7 +108,7 @@ func TestMicrosandboxProbeDiagnostics(t *testing.T) {
 		t.Skip("microsandbox requires Linux")
 	}
 	dir := t.TempDir()
-	missing := Microsandbox{HelperPath: filepath.Join(dir, "helper"), RuntimePath: filepath.Join(dir, "runtime"), FirmwarePath: filepath.Join(dir, "firmware"), RuntimeSHA256: strings.Repeat("a", 64), FirmwareSHA256: strings.Repeat("b", 64), RuntimeHome: dir}
+	missing := Config{HelperPath: filepath.Join(dir, "helper"), RuntimePath: filepath.Join(dir, "runtime"), FirmwarePath: filepath.Join(dir, "firmware"), RuntimeSHA256: strings.Repeat("a", 64), FirmwareSHA256: strings.Repeat("b", 64), RuntimeHome: dir}
 	for _, tc := range []struct {
 		name      string
 		kvm       bool
@@ -133,60 +129,6 @@ func TestMicrosandboxProbeDiagnostics(t *testing.T) {
 	}
 }
 
-func TestDockerProbeDiagnostics(t *testing.T) {
-	image := "sha256:" + strings.Repeat("c", 64)
-	for _, tc := range []struct {
-		name                   string
-		limits                 bool
-		cpus                   int
-		imageStatus            int
-		want                   string
-		unreachable, infoFails bool
-	}{
-		{name: "unreachable", unreachable: true, want: "provider_unavailable"},
-		{name: "info", infoFails: true, want: "provider_unavailable"},
-		// The pinned image is also missing below; earlier checks take precedence.
-		{name: "limits", cpus: 8, imageStatus: 404, want: "host_unsupported"},
-		{name: "capacity", limits: true, cpus: 1, imageStatus: 404, want: "capacity_insufficient"},
-		{name: "image", limits: true, cpus: 8, imageStatus: 404, want: "runtime_image_unavailable"},
-		{name: "image_inspect_fails", limits: true, cpus: 8, imageStatus: 500, want: "provider_unavailable"},
-		{name: "ready", limits: true, cpus: 8, imageStatus: 200},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.Header().Set("Content-Type", "application/json")
-				switch path := strings.TrimPrefix(r.URL.Path, "/v1.52"); {
-				case path == "/_ping":
-					_, _ = w.Write([]byte("OK"))
-				case path == "/info" && !tc.infoFails:
-					_ = json.NewEncoder(w).Encode(map[string]any{"MemoryLimit": tc.limits, "CpuCfsQuota": tc.limits, "NCPU": tc.cpus, "MemTotal": int64(64) << 30})
-				case path == "/images/"+image+"/json" && tc.imageStatus == 200:
-					_ = json.NewEncoder(w).Encode(map[string]string{"Id": image})
-				case path == "/images/"+image+"/json":
-					w.WriteHeader(tc.imageStatus)
-					_, _ = w.Write([]byte(`{"message":"private daemon detail"}`))
-				default:
-					w.WriteHeader(500)
-					_, _ = w.Write([]byte(`{"message":"private daemon detail"}`))
-				}
-			}))
-			defer server.Close()
-			host := server.URL
-			if tc.unreachable {
-				host = "unix://" + filepath.Join(t.TempDir(), "missing.sock")
-			}
-			c, err := client.New(client.WithHost(host), client.WithAPIVersion("1.52"))
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer c.Close()
-			if got := sandbox.NodeDiagnostic(dockerProbe(c, image, sandbox.Resources{CPUs: 2, MemoryMiB: 1024})(t.Context())); got != tc.want {
-				t.Fatalf("diagnostic = %q, want %q", got, tc.want)
-			}
-		})
-	}
-}
-
 // A failed integrity check is repeated, so repaired artifacts recover without a restart.
 func TestMicrosandboxProbeRecoversRepairedArtifacts(t *testing.T) {
 	if runtime.GOOS != "linux" {
@@ -200,7 +142,7 @@ func TestMicrosandboxProbeRecoversRepairedArtifacts(t *testing.T) {
 	if err := os.Mkdir(home, 0700); err != nil {
 		t.Fatal(err)
 	}
-	probe := microsandboxProbe(Microsandbox{HelperPath: artifact, RuntimePath: artifact, FirmwarePath: artifact, RuntimeSHA256: hex.EncodeToString(digest[:]), FirmwareSHA256: hex.EncodeToString(digest[:]), RuntimeHome: home}, smallSandbox)
+	probe := microsandboxProbe(Config{HelperPath: artifact, RuntimePath: artifact, FirmwarePath: artifact, RuntimeSHA256: hex.EncodeToString(digest[:]), FirmwareSHA256: hex.EncodeToString(digest[:]), RuntimeHome: home}, smallSandbox)
 	if got := sandbox.NodeDiagnostic(probe(t.Context())); got != "artifacts_unavailable" {
 		t.Fatalf("missing artifact diagnostic = %q", got)
 	}
diff --git a/services/core/internal/sandbox/node/generations.go b/services/core/internal/sandbox/node/generations.go
index 42bd03f8c..f538f0643 100644
--- a/services/core/internal/sandbox/node/generations.go
+++ b/services/core/internal/sandbox/node/generations.go
@@ -7,6 +7,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
@@ -363,7 +364,9 @@ func (m *GenerationManager) probeLoop() {
 		cancel()
 		m.mu.Lock()
 		g.refs--
+		changed := false
 		if !errors.Is(err, context.Canceled) {
+			state, diagnostic := g.state, g.diagnostic
 			g.state = "ready"
 			g.diagnostic = ""
 			if err != nil {
@@ -373,8 +376,14 @@ func (m *GenerationManager) probeLoop() {
 					g.repairing = true
 				}
 			}
+			changed = g.state != state || g.diagnostic != diagnostic
 		}
+		generation, diagnostic := g.value.Generation, g.diagnostic
 		m.mu.Unlock()
+		if err != nil && changed {
+			// The local error stays in this host's journal; it may name host paths.
+			log.Ctx(m.ctx).Warn("sandbox node generation provider unavailable; check local runtime configuration and permissions", "generation", generation, "diagnostic", diagnostic, "error", err)
+		}
 	}
 }
 
diff --git a/services/core/internal/sandbox/node_diagnostic.go b/services/core/internal/sandbox/node_diagnostic.go
index b13fbe34b..efcdedc58 100644
--- a/services/core/internal/sandbox/node_diagnostic.go
+++ b/services/core/internal/sandbox/node_diagnostic.go
@@ -1,6 +1,9 @@
 package sandbox
 
-import "errors"
+import (
+	"errors"
+	"fmt"
+)
 
 // Node readiness classes. A node probe returns or wraps the class of its first
 // failed check and keeps the Provider's detail, such as host paths or daemon
@@ -21,6 +24,14 @@ var (
 	ErrCapacityInsufficient = errors.New("node cannot provide one sandbox of the deployment specification")
 )
 
+// CheckCapacity reports whether a host can hold one sandbox of the given resources.
+func CheckCapacity(r Resources, cpus int, memory uint64) error {
+	if cpus < int(r.CPUs) || memory < uint64(r.MemoryMiB)*1024*1024 {
+		return fmt.Errorf("%w: one sandbox requires %d CPUs and %d MiB memory; available host capacity is %d CPUs and %d MiB", ErrCapacityInsufficient, r.CPUs, r.MemoryMiB, cpus, memory/1024/1024)
+	}
+	return nil
+}
+
 // NodeProviderUnavailable also reports every readiness failure without a class.
 const NodeProviderUnavailable = "provider_unavailable"
 
diff --git a/services/core/internal/sandbox/providers/capacity.go b/services/core/internal/sandbox/providers/capacity.go
deleted file mode 100644
index 1b569c132..000000000
--- a/services/core/internal/sandbox/providers/capacity.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package providers
-
-import (
-	"fmt"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-)
-
-func checkCapacity(r sandbox.Resources, cpus int, memory uint64) error {
-	if cpus < int(r.CPUs) || memory < uint64(r.MemoryMiB)*1024*1024 {
-		return fmt.Errorf("%w: one sandbox requires %d CPUs and %d MiB memory; available host capacity is %d CPUs and %d MiB", sandbox.ErrCapacityInsufficient, r.CPUs, r.MemoryMiB, cpus, memory/1024/1024)
-	}
-	return nil
-}
diff --git a/services/core/internal/sandbox/providers/config.go b/services/core/internal/sandbox/providers/config.go
index 32a3b1f33..07b0359b1 100644
--- a/services/core/internal/sandbox/providers/config.go
+++ b/services/core/internal/sandbox/providers/config.go
@@ -3,11 +3,9 @@ package providers
 
 import (
 	"bytes"
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -16,28 +14,9 @@ import (
 	"github.com/google/uuid"
 )
 
-type Config struct {
-	Specification  sandbox.DeploymentSpec `json:"specification"`
-	Generation     uint64                 `json:"generation"`
-	CoreURL        string                 `json:"core_url"`
-	Provider       string                 `json:"provider"`
-	InstallationID string                 `json:"installation_id"`
-	Docker         *Docker                `json:"docker,omitempty"`
-	Microsandbox   *Microsandbox          `json:"microsandbox,omitempty"`
-}
-
-type Docker struct {
-	Host          string   `json:"host"`
-	Image         string   `json:"image"`
-	Network       string   `json:"network"`
-	SeccompFile   string   `json:"seccomp_file"`
-	ExtraHosts    []string `json:"extra_hosts"`
-	NestedSandbox bool     `json:"nested_sandbox"`
-}
-
-// Load rejects unknown fields, mixed adapters and explicit null configuration.
-func Load(file string) (Config, error) {
-	var config Config
+// Load rejects unknown fields. The selected adapter decodes native at Build.
+func Load(file string) (sandbox.NodeConfig, error) {
+	var config sandbox.NodeConfig
 	raw, err := os.ReadFile(file)
 	if err != nil {
 		return config, errors.New("cannot read sandbox configuration")
@@ -47,50 +26,32 @@ func Load(file string) (Config, error) {
 	if decoder.Decode(&config) != nil || decoder.Decode(new(any)) != io.EOF {
 		return config, errors.New("invalid sandbox configuration")
 	}
-	var fields map[string]json.RawMessage
-	if json.Unmarshal(raw, &fields) != nil {
-		return config, errors.New("invalid sandbox configuration")
-	}
-	_, docker := fields["docker"]
-	_, micro := fields["microsandbox"]
-	if docker && micro {
-		return config, errors.New("only one sandbox provider can be configured")
-	}
 	return config, nil
 }
 
-type Built struct {
-	SpecificationDigest                string
-	Provider                           sandbox.SandboxProvider
-	InstallationID, BackendFingerprint string
-	Probe                              func(context.Context) error
-	// Quiescent is nil when no helper can outlive its caller.
-	Quiescent func() bool
-}
-
-// LocalOptions supplies process-local context without changing persisted configuration.
-type LocalOptions struct {
-	// Standalone selects registration or execution without a generation manager.
-	Standalone bool
-	// GenerationStateDirectory is the node state directory when constructing a
-	// retained generation. It must be canonical and absolute, and Standalone
-	// must be false.
-	GenerationStateDirectory string
-}
-
-func (r *Registry) Build(config Config, options LocalOptions) (*Built, func(), error) {
+// Build validates the Core-owned part of a node configuration and passes it to
+// the registered adapter. Local paths belong to the node; Core owns reservation
+// capacity, execution resources and the immutable deployment release it
+// enrolled with.
+func (r *Registry) Build(config sandbox.NodeConfig, options sandbox.LocalOptions) (*sandbox.Built, func(), error) {
 	closeProvider := func() {}
-	if err := r.validateSpecification(config); err != nil {
+	adapter, err := r.Lookup(config.Provider)
+	if err != nil {
+		return nil, closeProvider, err
+	}
+	if adapter.Mode != "nodes" {
+		return nil, closeProvider, fmt.Errorf("%w: selected provider does not support node hosting", sandbox.ErrInvalid)
+	}
+	if config.Generation == 0 {
+		return nil, closeProvider, errors.New("node requires a deployment generation; obtain configuration from Core")
+	}
+	if err := adapter.ValidateSpecification(config.Specification); err != nil {
 		return nil, closeProvider, err
 	}
 	id, err := uuid.Parse(config.InstallationID)
 	if err != nil || id == uuid.Nil || id.String() != config.InstallationID {
 		return nil, closeProvider, errors.New("sandbox requires a canonical installation_id UUID")
 	}
-	adapter, err := r.Lookup(config.Provider)
-	if err != nil || adapter.BuildLocal == nil {
-		return nil, closeProvider, errors.New("sandbox provider is not node-local")
-	}
 	if options.Standalone {
 		if options.GenerationStateDirectory != "" {
 			return nil, closeProvider, sandbox.ErrInvalid
@@ -98,7 +59,7 @@ func (r *Registry) Build(config Config, options LocalOptions) (*Built, func(), e
 	} else if !filepath.IsAbs(options.GenerationStateDirectory) || filepath.Clean(options.GenerationStateDirectory) != options.GenerationStateDirectory {
 		return nil, closeProvider, sandbox.ErrInvalid
 	}
-	result := &Built{InstallationID: config.InstallationID, SpecificationDigest: config.Specification.Digest(config.Provider)}
+	result := &sandbox.Built{InstallationID: config.InstallationID, SpecificationDigest: config.Specification.Digest(config.Provider)}
 	closeProvider, err = adapter.BuildLocal(config, options, result)
 	if err != nil {
 		return nil, closeProvider, err
@@ -109,8 +70,3 @@ func (r *Registry) Build(config Config, options LocalOptions) (*Built, func(), e
 	}
 	return result, closeProvider, nil
 }
-
-func BackendFingerprint(kind, namespace string) string {
-	digest := sha256.Sum256([]byte(kind + "\x00" + namespace))
-	return hex.EncodeToString(digest[:])
-}
diff --git a/services/core/internal/sandbox/providers/config_test.go b/services/core/internal/sandbox/providers/config_test.go
index 0753377ef..33695ac33 100644
--- a/services/core/internal/sandbox/providers/config_test.go
+++ b/services/core/internal/sandbox/providers/config_test.go
@@ -3,62 +3,34 @@ package providers
 import (
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/google/uuid"
 )
 
 func TestNodeRejectsCoreConfigurationAndUnknownProvider(t *testing.T) {
-	for _, field := range []string{`"nodes":{"local":false}`, `"maintenance":true`} {
+	for _, field := range []string{`"nodes":{"local":false}`, `"maintenance":true`, `"docker":{}`} {
 		path := filepath.Join(t.TempDir(), "config.json")
 		if err := os.WriteFile(path, []byte(`{"provider":"docker",`+field+`}`), 0600); err != nil {
 			t.Fatal(err)
 		}
 		if _, err := Load(path); err == nil {
-			t.Fatal("accepted retired Core configuration")
+			t.Fatal("accepted a field outside the node configuration")
 		}
 	}
-	if BackendFingerprint("docker", "socket") == BackendFingerprint("microsandbox", "socket") {
+	if sandbox.BackendFingerprint("docker", "socket") == sandbox.BackendFingerprint("microsandbox", "socket") {
 		t.Fatal("provider namespaces collide")
 	}
 }
-func TestNodeSpecificationCannotBeOverridden(t *testing.T) {
+
+func TestNodeBuildRequiresNodeProviderAndGeneration(t *testing.T) {
 	registry := Builtin()
-	if err := registry.validateSpecification(Config{Generation: 1, Provider: "e2b", Specification: sandbox.DeploymentSpec{Resources: sandbox.Resources{CPUs: 2, MemoryMiB: 2048}}, Docker: &Docker{}}); err == nil {
+	options := sandbox.LocalOptions{Standalone: true}
+	if _, _, err := registry.Build(sandbox.NodeConfig{Generation: 1, Provider: "e2b", InstallationID: uuid.NewString(), Specification: sandbox.DeploymentSpec{Resources: sandbox.Resources{CPUs: 2, MemoryMiB: 2048}}}, options); err == nil {
 		t.Fatal("accepted a cloud provider on a node")
 	}
-	release := sandbox.RuntimeRelease{SourceCommit: strings.Repeat("a", 40), ImageID: "sha256:" + strings.Repeat("b", 64), ImageManifestDigest: "sha256:" + strings.Repeat("c", 64), MicrosandboxRef: "oac-runtime@sha256:" + strings.Repeat("d", 64), RuntimeSHA256: strings.Repeat("e", 64), FirmwareSHA256: strings.Repeat("f", 64)}
-	c := Config{Generation: 1, Provider: "docker", Specification: sandbox.DeploymentSpec{Resources: sandbox.Resources{CPUs: 2, MemoryMiB: 2048}, Runtime: &release}, Docker: &Docker{Image: release.ImageID}}
-	for _, image := range []string{release.ImageID, release.ImageManifestDigest} {
-		c.Docker.Image = image
-		if err := registry.validateSpecification(c); err != nil {
-			t.Fatal(err)
-		}
-	}
-	c.Docker.Image = "sha256:" + strings.Repeat("a", 64)
-	if err := registry.validateSpecification(c); err == nil {
-		t.Fatal("accepted different Runtime")
-	}
-	c.Provider = "microsandbox"
-	c.Docker = nil
-	c.Specification.Resources.RootDiskMiB = 8192
-	c.Specification.Resources.EnvironmentDiskMiB = 8192
-	c.Microsandbox = &Microsandbox{CPUs: 2, MemoryMiB: 2048, RootDiskMiB: 8192, EnvironmentDiskMiB: 8192, Image: release.MicrosandboxRef, RuntimeSHA256: release.RuntimeSHA256, FirmwareSHA256: release.FirmwareSHA256}
-	if err := registry.validateSpecification(c); err != nil {
-		t.Fatal(err)
-	}
-	for _, change := range []func(*Microsandbox){func(m *Microsandbox) { m.CPUs = 1 }, func(m *Microsandbox) { m.MemoryMiB = 1024 }, func(m *Microsandbox) { m.EnvironmentDiskMiB = 4096 }, func(m *Microsandbox) { m.RootDiskMiB = 4096 }, func(m *Microsandbox) { m.FirmwareSHA256 = strings.Repeat("a", 64) }} {
-		copy := *c.Microsandbox
-		change(&copy)
-		other := c
-		other.Microsandbox = &copy
-		if err := registry.validateSpecification(other); err == nil {
-			t.Fatal("accepted local specification override")
-		}
-	}
-	c.Generation = 0
-	if err := registry.validateSpecification(c); err == nil {
+	if _, _, err := registry.Build(sandbox.NodeConfig{Provider: "docker", InstallationID: uuid.NewString(), Specification: validRegistrationSpec()}, options); err == nil {
 		t.Fatal("accepted unbound node")
 	}
 }
diff --git a/services/core/internal/sandbox/providers/docker.go b/services/core/internal/sandbox/providers/docker.go
deleted file mode 100644
index c0f186c00..000000000
--- a/services/core/internal/sandbox/providers/docker.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package providers
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/url"
-	"os"
-	"path/filepath"
-
-	sandboxdocker "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/docker"
-	"github.com/moby/moby/client"
-)
-
-func buildDocker(config Config, _ LocalOptions, result *Built) (func(), error) {
-	closeProvider := func() {}
-	if config.Docker == nil || config.Microsandbox != nil {
-		return closeProvider, errors.New("managed Docker requires only the docker configuration object")
-	}
-	entry := config.Docker
-	host, err := url.Parse(entry.Host)
-	if err != nil || host.Scheme != "unix" || host.Host != "" || host.User != nil || host.RawQuery != "" || host.Fragment != "" || host.RawPath != "" || host.Path == "/" || !filepath.IsAbs(host.Path) || filepath.Clean(host.Path) != host.Path || entry.Host != "unix://"+host.Path {
-		return closeProvider, errors.New("managed Docker host must be an explicit canonical unix socket")
-	}
-	seccomp, err := os.ReadFile(entry.SeccompFile)
-	if err != nil {
-		return closeProvider, fmt.Errorf("cannot read managed Docker seccomp JSON: %w", err)
-	}
-	if !json.Valid(seccomp) {
-		return closeProvider, errors.New("invalid managed Docker seccomp JSON")
-	}
-	c, err := client.New(client.WithHost(entry.Host))
-	if err != nil {
-		return closeProvider, errors.New("invalid managed Docker endpoint")
-	}
-	closeProvider = func() { _ = c.Close() }
-	provider, err := sandboxdocker.New(c, sandboxdocker.Config{InstallationID: config.InstallationID, Image: entry.Image, Network: entry.Network, Seccomp: string(seccomp), ExtraHosts: entry.ExtraHosts, NestedSandbox: entry.NestedSandbox, Resources: &config.Specification.Resources})
-	if err != nil {
-		closeProvider()
-		return func() {}, errors.New("invalid managed Docker provider configuration")
-	}
-	result.Provider = provider
-	result.Probe = dockerProbe(c, entry.Image, config.Specification.Resources)
-	result.BackendFingerprint = BackendFingerprint(config.Provider, entry.Host)
-	return closeProvider, nil
-}
diff --git a/services/core/internal/sandbox/providers/generation_test.go b/services/core/internal/sandbox/providers/generation_test.go
index e9b1c957c..0bacbe40d 100644
--- a/services/core/internal/sandbox/providers/generation_test.go
+++ b/services/core/internal/sandbox/providers/generation_test.go
@@ -2,13 +2,10 @@ package providers
 
 import (
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"syscall"
 	"testing"
@@ -19,16 +16,18 @@ import (
 	"github.com/google/uuid"
 )
 
-func generationConfig(t *testing.T) Config {
+func generationConfig(t *testing.T) (sandbox.NodeConfig, sandboxmicro.Native) {
 	t.Helper()
 	dir := t.TempDir()
 	spec := validRegistrationSpec()
 	spec.Resources.RootDiskMiB, spec.Resources.EnvironmentDiskMiB = 8192, 8192
-	return Config{Provider: "microsandbox", InstallationID: uuid.NewString(), Generation: 9, Specification: spec,
-		Microsandbox: &Microsandbox{HelperPath: filepath.Join(dir, "helper"), RuntimeHome: dir, RuntimePath: filepath.Join(dir, "msb"), FirmwarePath: filepath.Join(dir, "firmware"),
-			RuntimeSHA256: spec.Runtime.RuntimeSHA256, FirmwareSHA256: spec.Runtime.FirmwareSHA256, Image: spec.Runtime.MicrosandboxRef,
-			CPUs: uint8(spec.Resources.CPUs), MemoryMiB: spec.Resources.MemoryMiB, RootDiskMiB: spec.Resources.RootDiskMiB, EnvironmentDiskMiB: spec.Resources.EnvironmentDiskMiB,
-			Network: Network{DefaultEgress: "allow", DefaultIngress: "deny"}}}
+	native := sandboxmicro.Native{HelperPath: filepath.Join(dir, "helper"), RuntimeHome: dir, RuntimePath: filepath.Join(dir, "msb"), FirmwarePath: filepath.Join(dir, "firmware"),
+		Network: sandboxmicro.Network{DefaultEgress: "allow", DefaultIngress: "deny"}}
+	raw, err := json.Marshal(native)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return sandbox.NodeConfig{Provider: "microsandbox", InstallationID: uuid.NewString(), Generation: 9, Specification: spec, Native: raw}, native
 }
 
 func TestMicrosandboxGenerationDirectoryOwnership(t *testing.T) {
@@ -54,7 +53,8 @@ func TestMicrosandboxGenerationDirectoryOwnership(t *testing.T) {
 					t.Fatal(err)
 				}
 			}
-			built, closeProvider, err := registry.Build(generationConfig(t), LocalOptions{GenerationStateDirectory: state})
+			config, _ := generationConfig(t)
+			built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{GenerationStateDirectory: state})
 			closeProvider()
 			if mode == "private" {
 				info, statErr := os.Lstat(directory)
@@ -74,9 +74,9 @@ func TestMicrosandboxGenerationDirectoryOwnership(t *testing.T) {
 // lease to this generation, installation and specification before any helper runs.
 func TestMicrosandboxGenerationBindsLeaseIdentity(t *testing.T) {
 	registry := Builtin()
-	config := generationConfig(t)
+	config, native := generationConfig(t)
 	state := t.TempDir()
-	built, closeProvider, err := registry.Build(config, LocalOptions{GenerationStateDirectory: state})
+	built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{GenerationStateDirectory: state})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -89,7 +89,7 @@ func TestMicrosandboxGenerationBindsLeaseIdentity(t *testing.T) {
 		t.Fatal(err)
 	}
 	script := "#!/bin/sh\n[ \"$OAC_NODE_GENERATION_LEASE_FD\" = 3 ] || exit 1\ncat >/dev/null\nprintf '%s' '" + string(response) + "'\n"
-	if err := os.WriteFile(config.Microsandbox.HelperPath, []byte(script), 0700); err != nil {
+	if err := os.WriteFile(native.HelperPath, []byte(script), 0700); err != nil {
 		t.Fatal(err)
 	}
 	base := filepath.Join(state, "generations", strconv.FormatUint(config.Generation, 10))
@@ -152,10 +152,9 @@ func TestMicrosandboxGenerationRejectsUnpinnedImage(t *testing.T) {
 	registry := Builtin()
 	for _, image := range []string{"latest", "oac-runtime@sha256:bad", "oac-runtime@sha256:"} {
 		t.Run(image, func(t *testing.T) {
-			config := generationConfig(t)
-			config.Microsandbox.Image = image
+			config, _ := generationConfig(t)
 			config.Specification.Runtime.MicrosandboxRef = image
-			built, closeProvider, err := registry.Build(config, LocalOptions{GenerationStateDirectory: t.TempDir()})
+			built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{GenerationStateDirectory: t.TempDir()})
 			closeProvider()
 			if err == nil || built != nil {
 				t.Fatalf("accepted image %q", image)
@@ -167,55 +166,22 @@ func TestMicrosandboxGenerationRejectsUnpinnedImage(t *testing.T) {
 func TestLocalConstructionRequiresExplicitContext(t *testing.T) {
 	registry := Builtin()
 	state := t.TempDir()
-	for _, options := range []LocalOptions{
+	config, _ := generationConfig(t)
+	for _, options := range []sandbox.LocalOptions{
 		{},
 		{Standalone: true, GenerationStateDirectory: state},
 		{GenerationStateDirectory: "relative"},
 		{GenerationStateDirectory: state + "/../node"},
 	} {
-		built, closeProvider, err := registry.Build(generationConfig(t), options)
+		built, closeProvider, err := registry.Build(config, options)
 		closeProvider()
 		if !errors.Is(err, sandbox.ErrInvalid) || built != nil {
 			t.Fatalf("accepted construction context %+v: %v", options, err)
 		}
 	}
-	built, closeProvider, err := registry.Build(generationConfig(t), LocalOptions{Standalone: true})
+	built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{Standalone: true})
 	closeProvider()
 	if err != nil || built == nil {
 		t.Fatalf("standalone construction: %v", err)
 	}
 }
-
-func TestMicrosandboxConstructionSelectsGenerationReadiness(t *testing.T) {
-	registry := Builtin()
-	if runtime.GOOS != "linux" {
-		t.Skip("microsandbox requires Linux")
-	}
-	useKVM(t, true)
-	config := generationConfig(t)
-	script := []byte("#!/bin/sh\nprintf '%s' '{}'\n")
-	digest := sha256.Sum256(script)
-	config.Microsandbox.RuntimeSHA256 = hex.EncodeToString(digest[:])
-	config.Microsandbox.FirmwareSHA256 = hex.EncodeToString(digest[:])
-	config.Specification.Runtime.RuntimeSHA256 = config.Microsandbox.RuntimeSHA256
-	config.Specification.Runtime.FirmwareSHA256 = config.Microsandbox.FirmwareSHA256
-	for _, path := range []string{config.Microsandbox.RuntimePath, config.Microsandbox.FirmwarePath, config.Microsandbox.HelperPath} {
-		if err := os.WriteFile(path, script, 0700); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if err := os.Chmod(config.Microsandbox.RuntimeHome, 0700); err != nil {
-		t.Fatal(err)
-	}
-	for _, options := range []LocalOptions{{Standalone: true}, {GenerationStateDirectory: t.TempDir()}} {
-		built, closeProvider, err := registry.Build(config, options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = built.Probe(t.Context())
-		closeProvider()
-		if options.Standalone && err != nil || !options.Standalone && !errors.Is(err, sandbox.ErrRuntimeImageUnavailable) {
-			t.Fatalf("readiness for %+v: %v", options, err)
-		}
-	}
-}
diff --git a/services/core/internal/sandbox/providers/microsandbox.go b/services/core/internal/sandbox/providers/microsandbox.go
deleted file mode 100644
index 58fbcb8cf..000000000
--- a/services/core/internal/sandbox/providers/microsandbox.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package providers
-
-import (
-	"errors"
-	"os"
-	"path/filepath"
-	"strconv"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-	sandboxmicro "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/microsandbox"
-)
-
-// Single-host providers pin the helper, runtime, firmware, image and resource
-// limits explicitly. The helper owns local paths; no ambient backend is selected.
-type Microsandbox struct {
-	HelperPath         string  `json:"helper_path"`
-	RuntimeHome        string  `json:"runtime_home"`
-	RuntimePath        string  `json:"runtime_path"`
-	FirmwarePath       string  `json:"firmware_path"`
-	RuntimeSHA256      string  `json:"runtime_sha256"`
-	FirmwareSHA256     string  `json:"firmware_sha256"`
-	Image              string  `json:"image"`
-	MemoryMiB          uint32  `json:"memory_mib"`
-	CPUs               uint8   `json:"cpus"`
-	RootDiskMiB        uint32  `json:"root_disk_mib"`
-	EnvironmentDiskMiB uint32  `json:"environment_disk_mib"`
-	Network            Network `json:"network"`
-}
-
-type Network struct {
-	DefaultEgress  string `json:"default_egress"`
-	DefaultIngress string `json:"default_ingress"`
-	Rules          []Rule `json:"rules"`
-}
-
-type Rule struct {
-	Action      string `json:"action"`
-	Direction   string `json:"direction"`
-	Destination string `json:"destination"`
-	Protocol    string `json:"protocol"`
-	Port        string `json:"port"`
-}
-
-func configureMicrosandbox(entry Microsandbox, resources sandbox.Resources, caller *sandboxmicro.ProcessCaller, result *Built) error {
-	if !filepath.IsAbs(entry.RuntimeHome) || filepath.Clean(entry.RuntimeHome) != entry.RuntimeHome {
-		return errors.New("managed microsandbox runtime_home must be a canonical absolute path")
-	}
-	network := sandboxmicro.NetworkPolicy{DefaultEgress: entry.Network.DefaultEgress, DefaultIngress: entry.Network.DefaultIngress}
-	for _, rule := range entry.Network.Rules {
-		network.Rules = append(network.Rules, sandboxmicro.NetworkRule{Action: rule.Action, Direction: rule.Direction, Destination: rule.Destination, Protocol: rule.Protocol, Port: rule.Port})
-	}
-	provider, err := sandboxmicro.NewWithCaller(sandboxmicro.Config{
-		InstallationID: result.InstallationID, HelperPath: entry.HelperPath, RuntimeHome: entry.RuntimeHome, RuntimePath: entry.RuntimePath, FirmwarePath: entry.FirmwarePath,
-		RuntimeSHA256: entry.RuntimeSHA256, FirmwareSHA256: entry.FirmwareSHA256, Image: entry.Image,
-		MemoryMiB: entry.MemoryMiB, CPUs: entry.CPUs, RootDiskMiB: entry.RootDiskMiB, EnvironmentDiskMiB: entry.EnvironmentDiskMiB, Network: network,
-	}, caller)
-	if err != nil {
-		return errors.New("invalid managed microsandbox provider configuration")
-	}
-	result.Provider = provider
-	result.Probe = microsandboxProbe(entry, resources)
-	result.Quiescent = caller.Quiescent
-	result.BackendFingerprint = BackendFingerprint("microsandbox", entry.RuntimeHome)
-	return nil
-}
-
-func buildMicrosandbox(c Config, options LocalOptions, result *Built) (func(), error) {
-	closeProvider := func() {}
-	if c.Microsandbox == nil || c.Docker != nil {
-		return closeProvider, errors.New("managed microsandbox requires only the microsandbox configuration object")
-	}
-	caller := &sandboxmicro.ProcessCaller{}
-	if options.GenerationStateDirectory != "" {
-		directory := filepath.Join(options.GenerationStateDirectory, "generations")
-		if err := os.MkdirAll(directory, 0700); err != nil {
-			return closeProvider, err
-		}
-		info, err := os.Lstat(directory)
-		if err != nil || !info.IsDir() || info.Mode().Perm() != 0700 {
-			return closeProvider, sandbox.ErrOwnership
-		}
-		caller.LeasePath = filepath.Join(directory, strconv.FormatUint(c.Generation, 10)+".lease")
-		caller.LeaseIdentity = sandboxmicro.LeaseIdentity{InstallationID: result.InstallationID, Generation: c.Generation, SpecificationDigest: result.SpecificationDigest}
-	}
-	if err := configureMicrosandbox(*c.Microsandbox, c.Specification.Resources, caller, result); err != nil {
-		return closeProvider, err
-	}
-	if options.GenerationStateDirectory != "" {
-		result.Probe = microsandboxGenerationProbe(*c.Microsandbox, result.Probe)
-	}
-	return closeProvider, nil
-}
diff --git a/services/core/internal/sandbox/providers/registration_test.go b/services/core/internal/sandbox/providers/registration_test.go
index f2b595a45..592bdf313 100644
--- a/services/core/internal/sandbox/providers/registration_test.go
+++ b/services/core/internal/sandbox/providers/registration_test.go
@@ -64,7 +64,7 @@ func TestRegistrationRejectsBeforeCallbacksOrConstruction(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			a := registry.adapters["docker"]
-			a.BuildLocal = func(Config, LocalOptions, *Built) (func(), error) {
+			a.BuildLocal = func(sandbox.NodeConfig, sandbox.LocalOptions, *sandbox.Built) (func(), error) {
 				t.Fatal("called local constructor")
 				return nil, nil
 			}
@@ -96,7 +96,7 @@ func TestRegistrationRejectsBeforeCallbacksOrConstruction(t *testing.T) {
 				{"resolve change", func() error { _, err := registry.ResolveChange(selection, selection); return err }},
 				{"credential", func() error { _, err := registry.WithCredential(selection, selection); return err }},
 				{"local build", func() error {
-					_, _, err := registry.Build(Config{Provider: kind, Generation: 1, InstallationID: uuid.NewString(), Specification: selection.DeploymentSpec}, LocalOptions{Standalone: true})
+					_, _, err := registry.Build(sandbox.NodeConfig{Provider: kind, Generation: 1, InstallationID: uuid.NewString(), Specification: selection.DeploymentSpec}, sandbox.LocalOptions{Standalone: true})
 					return err
 				}},
 				{"direct build", func() error { _, err := registry.BuildDirect(sandbox.DirectConfig{Selection: selection}); return err }},
@@ -129,9 +129,9 @@ func TestCompleteRegistrationsPreserveConstruction(t *testing.T) {
 	}
 	const kind = "new-test-provider"
 	calls, closes := 0, 0
-	options := LocalOptions{GenerationStateDirectory: t.TempDir()}
+	options := sandbox.LocalOptions{GenerationStateDirectory: t.TempDir()}
 	a := registry.adapters["docker"]
-	a.BuildLocal = func(_ Config, got LocalOptions, built *Built) (func(), error) {
+	a.BuildLocal = func(_ sandbox.NodeConfig, got sandbox.LocalOptions, built *sandbox.Built) (func(), error) {
 		calls++
 		if got != options {
 			t.Fatalf("construction options = %+v, want %+v", got, options)
@@ -140,7 +140,7 @@ func TestCompleteRegistrationsPreserveConstruction(t *testing.T) {
 		return func() { closes++ }, nil
 	}
 	registry.adapters[kind] = a
-	built, closeProvider, err := registry.Build(Config{Provider: kind, Generation: 1, InstallationID: uuid.NewString(), Specification: validRegistrationSpec()}, options)
+	built, closeProvider, err := registry.Build(sandbox.NodeConfig{Provider: kind, Generation: 1, InstallationID: uuid.NewString(), Specification: validRegistrationSpec()}, options)
 	if err != nil || built.Provider == nil || calls != 1 {
 		t.Fatalf("node build: %v calls=%d", err, calls)
 	}
diff --git a/services/core/internal/sandbox/providers/registry.go b/services/core/internal/sandbox/providers/registry.go
index 51eb5aaaf..fe936c38a 100644
--- a/services/core/internal/sandbox/providers/registry.go
+++ b/services/core/internal/sandbox/providers/registry.go
@@ -20,7 +20,7 @@ type Adapter struct {
 	NodeArtifacts         []providerassets.Artifact
 	Policy                sandbox.DeploymentPolicy
 	Configuration         sandbox.ConfigurationAdapter
-	BuildLocal            func(Config, LocalOptions, *Built) (func(), error)
+	BuildLocal            func(sandbox.NodeConfig, sandbox.LocalOptions, *sandbox.Built) (func(), error)
 	BuildDirect           func(sandbox.DirectConfig) (sandbox.SandboxProvider, error)
 	Mode                  string
 	Operations            func() providercontract.Operations
@@ -40,16 +40,13 @@ func Builtin() *Registry {
 	return &Registry{adapters: map[string]Adapter{
 		"docker": {
 			NodeArtifacts: []providerassets.Artifact{nodeProgram, runtimeImage, runtimePolicy},
-			Policy:        docker.Policy(), Operations: docker.Operations, Mode: "nodes", BuildLocal: buildDocker,
+			Policy:        docker.Policy(), Operations: docker.Operations, Mode: "nodes", BuildLocal: docker.BuildNode,
 			ValidateSpecification: docker.ValidateSpecification, ValidateResources: docker.ValidateResources,
 			Configuration: nodeConfigurationAdapter{docker.ValidateSpecification},
 		},
 		"microsandbox": {
-			NodeArtifacts: []providerassets.Artifact{nodeProgram, runtimeImage, runtimePolicy,
-				{Path: "native/bin/oac-microsandbox-provider", Suffix: "microsandbox-provider", Role: "runtime"},
-				{Path: "native/microsandbox/msb", Suffix: "msb", Role: "runtime"},
-				{Path: "native/microsandbox/libkrunfw.so.5.6.1", Suffix: "libkrunfw.so.5.6.1", Role: "runtime"}},
-			Policy: microsandbox.Policy(), Operations: microsandbox.Operations, Mode: "nodes", BuildLocal: buildMicrosandbox,
+			NodeArtifacts: append([]providerassets.Artifact{nodeProgram, runtimeImage, runtimePolicy}, microsandbox.NodeArtifacts...),
+			Policy:        microsandbox.Policy(), Operations: microsandbox.Operations, Mode: "nodes", BuildLocal: microsandbox.BuildNode,
 			ValidateSpecification: microsandbox.ValidateSpecification, ValidateResources: microsandbox.ValidateResources,
 			Configuration: nodeConfigurationAdapter{microsandbox.ValidateSpecification},
 		},
@@ -139,7 +136,7 @@ func (r *Registry) Describe(kind, installation string) (sandbox.Description, err
 	if a.Mode == "direct" {
 		namespace = kind
 	}
-	return sandbox.Description{Mode: a.Mode, BackendFingerprint: BackendFingerprint(kind, namespace+":"+installation)}, nil
+	return sandbox.Description{Mode: a.Mode, BackendFingerprint: sandbox.BackendFingerprint(kind, namespace+":"+installation)}, nil
 }
 
 // DeploymentContract projects the registered modes and policies into the node
diff --git a/services/core/internal/sandbox/providers/registry_test.go b/services/core/internal/sandbox/providers/registry_test.go
index bd008e63e..bd6d1ac4f 100644
--- a/services/core/internal/sandbox/providers/registry_test.go
+++ b/services/core/internal/sandbox/providers/registry_test.go
@@ -22,7 +22,7 @@ func TestRegistrationOwnsDeploymentPolicy(t *testing.T) {
 	} {
 		t.Run(tc.kind, func(t *testing.T) {
 			d, err := registry.Describe(tc.kind, installation)
-			if err != nil || d.Mode != tc.mode || d.BackendFingerprint != BackendFingerprint(tc.kind, tc.namespace+":"+installation) {
+			if err != nil || d.Mode != tc.mode || d.BackendFingerprint != sandbox.BackendFingerprint(tc.kind, tc.namespace+":"+installation) {
 				t.Fatalf("wrong mode or namespace: %+v %v", d, err)
 			}
 			a, err := registry.Lookup(tc.kind)
diff --git a/services/core/internal/sandbox/providers/specification.go b/services/core/internal/sandbox/providers/specification.go
deleted file mode 100644
index 72b1540b2..000000000
--- a/services/core/internal/sandbox/providers/specification.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package providers
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-)
-
-// Local paths belong to the node. Core owns reservation capacity, execution
-// resources and the immutable deployment release it enrolled with.
-func (r *Registry) validateSpecification(c Config) error {
-	adapter, err := r.Lookup(c.Provider)
-	if err != nil {
-		return err
-	}
-	if adapter.Mode != "nodes" {
-		return fmt.Errorf("%w: selected provider does not support node hosting", sandbox.ErrInvalid)
-	}
-	if c.Generation == 0 {
-		return errors.New("node requires a deployment generation; obtain configuration from Core")
-	}
-	if err := r.ValidateSpecification(c.Provider, c.Specification); err != nil {
-		return err
-	}
-	release := c.Specification.Runtime
-	if d := c.Docker; d != nil {
-		if d.Image != release.ImageID && d.Image != release.ImageManifestDigest {
-			return errors.New("Docker Runtime image differs from the deployment release")
-		}
-	}
-	if m := c.Microsandbox; m != nil {
-		s := c.Specification.Resources
-		if uint32(m.CPUs) != s.CPUs || m.MemoryMiB != s.MemoryMiB || m.RootDiskMiB != s.RootDiskMiB || m.EnvironmentDiskMiB != s.EnvironmentDiskMiB {
-			return errors.New("microsandbox CPU, memory or disk limits differ from the deployment specification")
-		}
-		if m.Image != release.MicrosandboxRef || m.RuntimeSHA256 != release.RuntimeSHA256 || m.FirmwareSHA256 != release.FirmwareSHA256 {
-			return errors.New("microsandbox Runtime or firmware differs from the deployment release")
-		}
-	}
-	return nil
-}
diff --git a/services/core/internal/sandbox/sandbox_provider.go b/services/core/internal/sandbox/sandbox_provider.go
index fd5600501..624f7e126 100644
--- a/services/core/internal/sandbox/sandbox_provider.go
+++ b/services/core/internal/sandbox/sandbox_provider.go
@@ -301,6 +301,40 @@ type DirectConfig struct {
 	Fence          *CallFence
 }
 
+// NodeConfig is a node's configuration for one deployment generation. Native
+// holds only the selected adapter's node-local settings, such as host paths;
+// that adapter alone decodes it, strictly. Resources and the Runtime release
+// are read from Specification, never copied into Native.
+type NodeConfig struct {
+	Specification  DeploymentSpec  `json:"specification"`
+	Generation     uint64          `json:"generation"`
+	CoreURL        string          `json:"core_url"`
+	Provider       string          `json:"provider"`
+	InstallationID string          `json:"installation_id"`
+	Native         json.RawMessage `json:"native"`
+}
+
+// LocalOptions supplies process-local context without changing persisted configuration.
+type LocalOptions struct {
+	// Standalone selects registration or execution without a generation manager.
+	Standalone bool
+	// GenerationStateDirectory is the node state directory when constructing a
+	// retained generation. It must be canonical and absolute, and Standalone
+	// must be false.
+	GenerationStateDirectory string
+}
+
+// Built is a constructed node adapter. Construction fills InstallationID and
+// SpecificationDigest; the adapter fills the rest.
+type Built struct {
+	SpecificationDigest                string
+	Provider                           SandboxProvider
+	InstallationID, BackendFingerprint string
+	Probe                              func(context.Context) error
+	// Quiescent is nil when no helper can outlive its caller.
+	Quiescent func() bool
+}
+
 // ConfigurationDiscoveryInput is a transient read-only request. Query is typed
 // and validated by the adapter; it cannot select a compute mutation.
 type ConfigurationDiscoveryInput struct {

From d3f7b76e2258e6b15bae3de3dd0bef70c5cbcf38 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 13:43:44 +0800
Subject: [PATCH 51/60] Admit hosted work only on a configured deployment
 (#546)

---
 .github/workflows/api-acceptance.yml          |  3 +-
 CONTRIBUTING.md                               |  2 +-
 .../src/features/metrics/CoreMetricsPage.tsx  |  4 +-
 .../src/features/overview/FleetOverview.tsx   |  2 +-
 apps/web/src/i18n/locales/en/metrics.ts       |  1 -
 apps/web/src/i18n/locales/en/sessions.ts      |  1 -
 apps/web/src/i18n/locales/zh-CN/metrics.ts    |  1 -
 apps/web/src/i18n/locales/zh-CN/sessions.ts   |  1 -
 contracts/agents-api/core-errors.md           |  2 +-
 contracts/agents-api/core-metrics.md          | 10 ++--
 contracts/agents-api/core.openapi.yaml        |  5 --
 .../agents-api/runtime-observability-api.md   |  3 +-
 contracts/agents-api/runtime-observability.md |  6 +-
 contracts/agents-api/sandbox-deployment.md    |  2 +-
 .../agents-api/v1/runtime_observations.go     |  2 +-
 contracts/agents-api/zh/core-errors.md        |  4 +-
 contracts/agents-api/zh/core-metrics.md       | 12 ++--
 .../zh/runtime-observability-api.md           |  5 +-
 .../agents-api/zh/runtime-observability.md    |  8 +--
 contracts/agents-api/zh/sandbox-deployment.md |  4 +-
 docs/sandbox-provider.md                      |  4 +-
 docs/zh/sandbox-provider.md                   |  6 +-
 packages/agents-client/src/client.ts          |  2 +-
 .../agents-client/src/core-metrics.test.ts    | 11 ++--
 packages/agents-client/src/core-metrics.ts    | 20 ++++---
 packages/agents-client/src/types.ts           |  1 -
 services/core/cmd/server/core_metrics.go      |  2 +-
 .../core/cmd/server/managed_setup_test.go     |  2 +-
 services/core/cmd/server/runtime_history.go   |  7 +--
 .../core/cmd/server/runtime_history_test.go   |  2 +-
 .../api/core_store_validation_test.go         |  2 +-
 services/core/internal/api/runtime_history.go | 11 +---
 .../core/internal/api/runtime_history_test.go | 39 +++----------
 services/core/internal/coremetrics/service.go |  2 +-
 .../core/internal/coremetrics/service_test.go |  2 +-
 services/core/internal/coremetrics/types.go   |  8 +--
 .../db/queries/runtime_allocations.sql        | 11 +---
 .../db/queries/runtime_lifecycle_nodes.sql    |  4 +-
 .../db/queries/runtime_suspension.sql         |  6 +-
 .../internal/db/queries/sandbox_reset.sql     |  7 +--
 services/core/internal/db/sqlc/models.go      |  1 -
 .../db/sqlc/runtime_allocations.sql.go        | 56 +++----------------
 .../db/sqlc/runtime_lifecycle_nodes.sql.go    |  5 +-
 .../db/sqlc/runtime_suspension.sql.go         |  9 +--
 .../internal/db/sqlc/sandbox_reset.sql.go     |  7 +--
 .../core/internal/deployment/allocation.go    |  8 +--
 .../core/internal/deployment/allocations.go   | 15 +++--
 .../internal/deployment/allocations_test.go   | 35 +++++++-----
 .../core/internal/deployment/execution.go     | 29 +---------
 .../deployment/placement/placement.go         | 46 ++++++++-------
 .../deployment/placement/placement_test.go    | 25 +++++----
 services/core/internal/deployment/storage.go  |  2 -
 .../deployment_provider_observations_test.go  |  7 +--
 .../core/internal/execution/dispatcher.go     |  3 +-
 .../execution/environment_admission.go        |  3 -
 .../execution/environment_directory.go        |  3 -
 .../core/internal/execution/owner_test.go     | 28 +++++++---
 .../internal/execution/runtime_compute.go     |  2 +-
 .../execution/runtime_compute_wake.go         |  3 -
 .../internal/execution/runtime_lifecycle.go   | 10 +---
 services/core/internal/execution/worker.go    | 44 ++++++---------
 .../execution/worker_concurrency_test.go      |  2 +-
 .../core/internal/execution/worker_metrics.go | 18 +++---
 .../internal/execution/worker_metrics_test.go | 15 +++--
 .../postgres/agentpg/store_test.go            | 15 ++---
 .../postgres/deploymentpg/allocations.go      |  6 +-
 .../deploymentpg/specification_test.go        |  3 -
 .../modelconfigurationpg/fixture_test.go      |  2 +-
 .../modelconfigurationpg/observation_test.go  |  2 +-
 .../persistence/postgres/pgtest/pgtest.go     | 52 ++++++++++++++---
 .../postgres/runtimehistorypg/reader_test.go  |  2 +-
 .../postgres/runtimehistorypg/samples_test.go |  2 +-
 .../postgres/sessionpg/creation_test.go       | 32 +++++++----
 .../postgres/skillpg/audit_test.go            |  4 +-
 .../postgres/skillpg/skillpg_test.go          | 24 ++++----
 .../postgres/vaultpg/audit_test.go            |  3 +-
 .../postgres/vaultpg/vaults_test.go           |  4 +-
 .../internal/runtimehistory/service_test.go   |  5 +-
 .../core/internal/runtimehistory/types.go     | 25 +--------
 services/core/internal/runtimeobs/service.go  | 10 +---
 .../core/internal/runtimeobs/service_test.go  | 28 ++++------
 .../providers/configuration_flow_test.go      |  2 +-
 .../core/internal/sessions/creation_test.go   |  2 +-
 .../000096_configured_admission.sql           | 20 +++++++
 .../integration/admin_delete_audit_test.go    |  8 +--
 .../integration/admin_session_archive_test.go |  8 +--
 .../admin_session_archive_worker_http_test.go |  9 +--
 .../agent_execution_defaults_http_test.go     |  8 +--
 .../configuration_validation_public_test.go   |  9 +--
 .../deployment_model_providers_http_test.go   | 11 +---
 .../device_bootstrap_binding_test.go          |  4 +-
 .../core/tests/integration/dispatch_test.go   | 15 +++--
 .../environment_executor_management_test.go   |  3 +-
 ...onment_file_write_semantics_public_test.go |  2 +-
 .../environment_file_writes_test.go           |  5 +-
 .../environment_initial_input_test.go         | 11 ++--
 .../environment_initialization_test.go        |  8 +--
 .../environment_installation_test.go          | 11 +---
 .../integration/environment_plugins_test.go   | 10 +---
 .../integration/environment_setup_test.go     |  8 +--
 .../tests/integration/environments_test.go    | 12 ++--
 .../file_resource_semantics_public_test.go    |  7 +--
 .../tests/integration/function_worker_test.go |  8 +--
 ...sted_initialization_failure_public_test.go | 20 +------
 .../integration/initial_files_http_test.go    |  8 +--
 .../integration/list_cursor_public_test.go    |  8 +--
 .../integration/list_query_public_test.go     | 12 +---
 .../local_environment_devices_test.go         |  9 +--
 .../local_environment_worker_test.go          |  3 +-
 .../tests/integration/managed_fixture_test.go | 21 +++++++
 .../mcp_credential_selection_public_test.go   |  8 +--
 .../integration/model_protocol_native_test.go |  2 +-
 .../path_id_semantics_public_test.go          | 10 +---
 .../integration/public_execution_test.go      |  4 +-
 .../core/tests/integration/remote_mcp_test.go |  8 +--
 .../integration/request_body_public_test.go   | 15 +----
 .../tests/integration/root_fixture_test.go    | 11 +---
 .../integration/runtime_allocations_test.go   | 33 +++++------
 .../runtime_capabilities_pending_test.go      | 10 +---
 .../runtime_configuration_cleanup_test.go     |  3 +-
 .../integration/runtime_connection_test.go    |  3 +-
 .../runtime_creation_settlement_test.go       |  9 +--
 .../integration/runtime_deployment_test.go    | 47 ----------------
 .../runtime_deployment_worker_test.go         | 13 +----
 .../runtime_environment_terminal_test.go      | 12 ++--
 .../runtime_initialization_test.go            | 12 +---
 .../runtime_input_admission_test.go           |  3 +-
 .../integration/runtime_lifecycle_test.go     |  9 +--
 .../runtime_node_lifecycle_fixture_test.go    | 11 +---
 .../tests/integration/runtime_nodes_test.go   |  7 +--
 .../runtime_observation_scan_test.go          |  2 +-
 .../tests/integration/runtime_pending_test.go |  3 +-
 .../tests/integration/runtime_scan_test.go    |  6 +-
 .../integration/runtime_suspension_test.go    | 17 ++----
 .../runtime_worker_recovery_test.go           | 16 +++---
 .../sandbox_deployment_resources_test.go      |  9 +--
 .../sandbox_deployment_switch_test.go         | 42 +++-----------
 .../sandbox_deployment_switch_worker_test.go  |  8 +--
 .../sandbox_deployment_view_test.go           |  8 +--
 .../sandbox_deployment_worker_test.go         |  2 +-
 .../sandbox_specification_lifecycle_test.go   | 10 +---
 .../session_artifacts_public_test.go          |  4 +-
 .../integration/session_artifacts_test.go     | 17 ++++--
 .../session_creation_identity_test.go         |  8 +--
 .../session_deletion_lifecycle_public_test.go |  2 +-
 .../integration/session_diagnostics_test.go   |  5 +-
 .../session_execution_configuration_test.go   | 24 +++-----
 .../session_initial_public_test.go            |  3 +-
 .../session_model_execution_http_test.go      |  6 +-
 .../integration/session_model_options_test.go | 14 ++---
 .../session_reference_retry_public_test.go    |  3 +-
 .../skill_selectors_public_test.go            | 10 +---
 .../skill_version_deletion_public_test.go     | 11 +---
 .../skill_version_deletion_test.go            | 11 +---
 .../tests/integration/skills_public_test.go   | 10 +---
 .../template_composition_public_test.go       | 10 +---
 .../template_null_selection_public_test.go    | 10 +---
 .../unified_model_configuration_http_test.go  |  2 +-
 .../unstorable_text_public_test.go            |  8 +--
 .../tests/integration/worker_fixture_test.go  | 52 ++++++++++++++---
 services/core/tests/official_client.py        |  6 +-
 services/core/tests/testdata/installation.id  |  1 +
 162 files changed, 647 insertions(+), 1007 deletions(-)
 create mode 100644 services/core/migrations/000096_configured_admission.sql
 create mode 100644 services/core/tests/testdata/installation.id

diff --git a/.github/workflows/api-acceptance.yml b/.github/workflows/api-acceptance.yml
index 0111a8d4f..ee010ed18 100644
--- a/.github/workflows/api-acceptance.yml
+++ b/.github/workflows/api-acceptance.yml
@@ -63,9 +63,8 @@ jobs:
           OAC_TEST_OFFICIAL_SDK_PYTHON: python
         run: |
           python services/core/tests/official_schema_test.py
-          # The Go Workers need an unclaimed deployment; Core claims it for its installation ID.
-          go test ./services/core/tests/integration -run '^(TestFunctionStateOfficialClientReadsAndLiveEvents|TestSavedReferenceRetryOfficialClient|TestAgentUpdateOfficialClient|TestAgentDeletionOfficialClient|TestSessionAgentFilterOfficialClient|TestSessionDeletionOfficialClient|TestEnvironmentInitialFailureOfficialClient|TestSelfHostedInitialCreationOfficialClient|TestSelfHostedCancellationOfficialClient)$' -count=1
           python services/core/tests/official_client.py
+          go test ./services/core/tests/integration -run '^(TestFunctionStateOfficialClientReadsAndLiveEvents|TestSavedReferenceRetryOfficialClient|TestAgentUpdateOfficialClient|TestAgentDeletionOfficialClient|TestSessionAgentFilterOfficialClient|TestSessionDeletionOfficialClient|TestEnvironmentInitialFailureOfficialClient|TestSelfHostedInitialCreationOfficialClient|TestSelfHostedCancellationOfficialClient)$' -count=1
       - uses: ./.github/actions/e2b-provider
         if: inputs.container
       - name: Verify the distribution's Core image
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e5dee072e..e7c364c91 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -111,7 +111,7 @@ The [CI selection policy](docs/maintainers.md#continuous-integration) names affe
 | `OAC_TEST_DATABASE_URL` | A dedicated test database. The full gate fails when it is missing. |
 | `OAC_TEST_OFFICIAL_SDK_PYTHON` | The pinned official SDK interpreter |
 
-The role needs `CREATE DATABASE`: tests of database-wide state, such as the execution lease and the provider identity, create and drop isolated `oac_*_tests` databases. Tests must not bypass the production provider-switch guard.
+The role needs `CREATE DATABASE`: tests of database-wide state, such as the execution lease and the provider identity, create and drop isolated `oac_*_tests` databases. They copy them from a migrated template, the test database's name with `_template` before `_tests`, which stays beside it. Tests must not bypass the production provider-switch guard.
 
 ### Contract and schema rules
 
diff --git a/apps/web/src/features/metrics/CoreMetricsPage.tsx b/apps/web/src/features/metrics/CoreMetricsPage.tsx
index f6c5f64af..0d7fe6239 100644
--- a/apps/web/src/features/metrics/CoreMetricsPage.tsx
+++ b/apps/web/src/features/metrics/CoreMetricsPage.tsx
@@ -122,7 +122,7 @@ function CoreMetricsBody({ metrics }: { metrics: CoreMetrics }) {
   const databaseBuckets = useMemo(() => database.series.map((entry) => seconds(entry.start) ?? 0), [database.series]);
   const count = (value: number | null) => (value === null ? MISSING : formatInteger(value, locale));
   const integer = (value: number) => formatInteger(value, locale);
-  const slotsFull = execution.slots_in_use !== null && execution.slots_total !== null && execution.slots_in_use >= execution.slots_total;
+  const slotsFull = execution.slots_in_use >= execution.slots_total;
   // Sandbox nodes hold their own connection to Core, as daemons do; E2B deployments have none.
   const { state: fleetState, refresh: refreshFleet } = useSandboxFleet({ poll: true });
   const fleet = fleetSnapshot(fleetState);
@@ -136,7 +136,7 @@ function CoreMetricsBody({ metrics }: { metrics: CoreMetrics }) {
         <Kpi
           label={t("core.slots")}
           help={t("core.slotsHelp")}
-          value={execution.slots_in_use === null ? MISSING : <Figure value={<LiveNumber value={execution.slots_in_use} />} unit={execution.slots_total === null ? undefined : `/ ${integer(execution.slots_total)}`} />}
+          value={<Figure value={<LiveNumber value={execution.slots_in_use} />} unit={`/ ${integer(execution.slots_total)}`} />}
           tone={slotsFull ? "warning" : undefined}
         />
         <Kpi
diff --git a/apps/web/src/features/overview/FleetOverview.tsx b/apps/web/src/features/overview/FleetOverview.tsx
index 99f36d0f2..238d67d49 100644
--- a/apps/web/src/features/overview/FleetOverview.tsx
+++ b/apps/web/src/features/overview/FleetOverview.tsx
@@ -189,7 +189,7 @@ function CoreGlance({ label, tone }: { label: string; tone: Tone }) {
         <Fact label={t("fleet.facts.uptime")}>{started === null ? MISSING : formatDuration(Math.max(0, now - started))}</Fact>
         <Fact label={t("fleet.facts.slots")}>
           {count(metrics.execution.slots_in_use)}
-          {metrics.execution.slots_total === null ? null : <span className="kpi-unit">/ {count(metrics.execution.slots_total)}</span>}
+          <span className="kpi-unit">/ {count(metrics.execution.slots_total)}</span>
         </Fact>
         <Fact label={t("fleet.facts.queued")}>{count(metrics.execution.queued_turns)}</Fact>
         <Fact label={t("fleet.facts.daemons")}>{count(metrics.execution.connected_daemons)}</Fact>
diff --git a/apps/web/src/i18n/locales/en/metrics.ts b/apps/web/src/i18n/locales/en/metrics.ts
index 427b768f2..2505030b6 100644
--- a/apps/web/src/i18n/locales/en/metrics.ts
+++ b/apps/web/src/i18n/locales/en/metrics.ts
@@ -310,7 +310,6 @@ export const metrics = {
     reason: {
       allocation_pending: "Allocation pending",
       runtime_not_running: "Not running",
-      source_not_configured: "Source unavailable",
       sample_timeout: "Sample timed out",
       sample_unavailable: "Sample unavailable",
     },
diff --git a/apps/web/src/i18n/locales/en/sessions.ts b/apps/web/src/i18n/locales/en/sessions.ts
index fdf8078f3..389572f7a 100644
--- a/apps/web/src/i18n/locales/en/sessions.ts
+++ b/apps/web/src/i18n/locales/en/sessions.ts
@@ -138,7 +138,6 @@ export const sessions = {
       runtime_mode_not_observable: "Not observable",
       allocation_pending: "Allocation pending",
       runtime_not_running: "Not running",
-      source_not_configured: "Metrics source not configured",
       sample_timeout: "Sample timed out",
       sample_unavailable: "Sample unavailable",
     },
diff --git a/apps/web/src/i18n/locales/zh-CN/metrics.ts b/apps/web/src/i18n/locales/zh-CN/metrics.ts
index 638f67afb..62463abf0 100644
--- a/apps/web/src/i18n/locales/zh-CN/metrics.ts
+++ b/apps/web/src/i18n/locales/zh-CN/metrics.ts
@@ -310,7 +310,6 @@ export const metrics = {
     reason: {
       allocation_pending: "等待分配",
       runtime_not_running: "未运行",
-      source_not_configured: "数据源不可用",
       sample_timeout: "采样超时",
       sample_unavailable: "采样不可用",
     },
diff --git a/apps/web/src/i18n/locales/zh-CN/sessions.ts b/apps/web/src/i18n/locales/zh-CN/sessions.ts
index 82569748e..b6e1455da 100644
--- a/apps/web/src/i18n/locales/zh-CN/sessions.ts
+++ b/apps/web/src/i18n/locales/zh-CN/sessions.ts
@@ -135,7 +135,6 @@ export const sessions = {
       runtime_mode_not_observable: "无法观测",
       allocation_pending: "等待分配",
       runtime_not_running: "未运行",
-      source_not_configured: "未配置指标来源",
       sample_timeout: "采样超时",
       sample_unavailable: "采样不可用",
     },
diff --git a/contracts/agents-api/core-errors.md b/contracts/agents-api/core-errors.md
index 33ee247ae..f9a73f846 100644
--- a/contracts/agents-api/core-errors.md
+++ b/contracts/agents-api/core-errors.md
@@ -95,7 +95,7 @@ These codes have null `param` and no `details`. [Sandbox deployment](./sandbox-d
 | 500 | `internal_error` | Core could not complete the operation |
 | 503 | `runtime_node_unavailable` | No sandbox node is available or has capacity |
 | 503 | `execution_unavailable` | Execution is not available, such as while Core shuts down |
-| 503 | `runtime_history_unavailable` | Durable Runtime history is not configured or temporarily unavailable |
+| 503 | `runtime_history_unavailable` | Durable Runtime history is temporarily unavailable |
 | 503 | `core_metrics_unavailable` | Core metrics could not be read |
 | 503 | `file_transfer_unavailable` | Bounded content transfer is unavailable |
 
diff --git a/contracts/agents-api/core-metrics.md b/contracts/agents-api/core-metrics.md
index def541329..5ad43d4b8 100644
--- a/contracts/agents-api/core-metrics.md
+++ b/contracts/agents-api/core-metrics.md
@@ -25,19 +25,19 @@ title: "Core operational metrics"
 
 ## Fields
 
-The response has `object: "core.metrics"`, `range`, `service`, `execution`, `database`, `jobs` and `process`. Every numeric value and `service.execution_owner` is nullable; each `series` always lists every complete bucket of the range.
+The response has `object: "core.metrics"`, `range`, `service`, `execution`, `database`, `jobs` and `process`. Every numeric value except `execution.slots_in_use`, `execution.slots_total` and `execution.connected_daemons` is nullable, as is `service.execution_owner`; each `series` always lists every complete bucket of the range.
 
 | Field | Meaning |
 | --- | --- |
-| `service.status` | `running`, or `degraded` when a measurement or job fails, the latest sample is missing or stale, or execution ownership is unknown or Core has execution slots but does not hold the execution lease. A sandbox reset is reported by the [deployment](./sandbox-deployment.md), not here |
+| `service.status` | `running`, or `degraded` when a measurement or job fails, the latest sample is missing or stale, or execution ownership is unknown or Core does not hold the execution lease. A sandbox reset is reported by the [deployment](./sandbox-deployment.md), not here |
 | `service.revision` | The full source commit injected at build time; null for builds without one |
 | `service.started_at` | When the process initialized |
 | `service.execution_owner` | Whether this process holds the execution worker's database lease |
-| `execution.slots_in_use`, `execution.slots_total` | Active Session reservations of the execution worker, and its capacity: [`core.execution_concurrency`](../../docs/configuration.md#settings), 4 by default. Environment input, Turns and file work share the slots; native Harness subprocesses are not counted. Without a worker both are 0 |
+| `execution.slots_in_use`, `execution.slots_total` | Active Session reservations of the execution worker, and its capacity: [`core.execution_concurrency`](../../docs/configuration.md#settings), 4 by default. Environment input, Turns and file work share the slots; native Harness subprocesses are not counted |
 | `execution.queued_turns`, `execution.in_progress_turns` | Root Turns in those states, including Turns of deleted Sessions. Subagent Turns and input reserved for a preparing Environment are not counted |
-| `execution.waiting_for_daemon` | Queued Turns whose Session's device is not connected; null without a gateway |
+| `execution.waiting_for_daemon` | Queued Turns whose Session's device is not connected |
 | `execution.oldest_queued_seconds` | Age of the oldest queued Turn, from its `created_at` |
-| `execution.connected_daemons` | Runtime daemons connected to Core's gateway; null without a gateway |
+| `execution.connected_daemons` | Runtime daemons connected to Core's gateway |
 | `execution.queue_wait_ms` | p50 and p95 of `started_at - created_at` for Turns started in the interval, by PostgreSQL `percentile_cont` |
 | `execution.interrupted` | Failed Turns with error code `execution_interrupted`, by `completed_at` in the interval |
 | `execution.unavailable` | HTTP responses sent with error code `execution_unavailable`, counted once each. Other 503 codes and errors after a stream started are not counted |
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index 90fbd2970..af9ea99b5 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -103,7 +103,6 @@ definitions:
           - runtime_mode_not_observable
           - allocation_pending
           - runtime_not_running
-          - source_not_configured
           - sample_timeout
           - sample_unavailable
         type: string
@@ -725,7 +724,6 @@ definitions:
     properties:
       connected_daemons:
         type: integer
-        x-nullable: true
       in_progress_turns:
         type: integer
         x-nullable: true
@@ -746,10 +744,8 @@ definitions:
         type: array
       slots_in_use:
         type: integer
-        x-nullable: true
       slots_total:
         type: integer
-        x-nullable: true
       unavailable:
         type: integer
         x-nullable: true
@@ -2489,7 +2485,6 @@ definitions:
           - runtime_mode_not_observable
           - allocation_pending
           - runtime_not_running
-          - source_not_configured
           - sample_timeout
           - sample_unavailable
         type: string
diff --git a/contracts/agents-api/runtime-observability-api.md b/contracts/agents-api/runtime-observability-api.md
index 2e1db7019..b4bc701d1 100644
--- a/contracts/agents-api/runtime-observability-api.md
+++ b/contracts/agents-api/runtime-observability-api.md
@@ -145,7 +145,6 @@ Only list rows carry `disk`: null, or `{usage_bytes, limit_bytes}` with the rule
 | `unsupported` | `runtime_mode_not_observable` | `none` and `self_hosted` Sessions. |
 | `unavailable` | `allocation_pending` | The managed allocation does not exist yet or is being created. |
 | `unavailable` | `runtime_not_running` | The allocation is being cleaned up or is released, or the provider reports the Runtime absent, stopped or suspended. |
-| `unavailable` | `source_not_configured` | This Core has no managed installation identity. |
 | `unavailable` | `sample_timeout` | The provider read exceeded its deadline. |
 | `unavailable` | `sample_unavailable` | The provider could not produce a current sample. |
 
@@ -233,7 +232,7 @@ Disk is not kept in history.
 | 404 | `not_found_error` | A missing Project, or a Session missing from it. |
 | 409 | `runtime_history_unsupported` | The Session is not `openai_hosted`. |
 | 500 | `internal_error` | Inconsistent stored identity. |
-| 503 | `runtime_history_unavailable` | Core collects no periodic history (it runs without the execution worker), or the read failed, timed out or produced a result outside the bounds. |
+| 503 | `runtime_history_unavailable` | The read failed, timed out or produced a result outside the bounds. |
 
 A response holds at most `max_points` buckets per array, 64 series and 10,000 coverage and series points in total. Storage error text is neither returned nor logged.
 
diff --git a/contracts/agents-api/runtime-observability.md b/contracts/agents-api/runtime-observability.md
index c91351dac..36860bb48 100644
--- a/contracts/agents-api/runtime-observability.md
+++ b/contracts/agents-api/runtime-observability.md
@@ -20,7 +20,7 @@ The resolver (`services/core/internal/deployment/observation.go`) reads the Sess
 
 Managed Docker, microsandbox and E2B allocations are observed. `none` and `self_hosted` Sessions are `unsupported`; Core never attributes shared host statistics to an `environment:none` Session.
 
-Every managed allocation is read through the deployment's selected Sandbox Provider, which verifies the allocation's installation (`provider_key`) and labels or equivalent ownership data before it returns values. Before any provider read, the allocation state decides some rows: `creating` or no allocation yet gives `allocation_pending`, `cleanup_pending` or `released` gives `runtime_not_running`, and a Core without an installation identity gives `source_not_configured`. A provider read that exceeds its deadline gives `sample_timeout`, a not-running result `runtime_not_running`, and an unavailable result `sample_unavailable`. Any other error, an ownership mismatch or an invalid sample fails the read.
+Every managed allocation is read through the deployment's selected Sandbox Provider, which verifies the allocation's installation (`provider_key`) and labels or equivalent ownership data before it returns values. Before any provider read, the allocation state decides some rows: `creating` or no allocation yet gives `allocation_pending`, and `cleanup_pending` or `released` gives `runtime_not_running`. A provider read that exceeds its deadline gives `sample_timeout`, a not-running result `runtime_not_running`, and an unavailable result `sample_unavailable`. Any other error, an ownership mismatch or an invalid sample fails the read.
 
 `Observe` belongs to the [Sandbox Provider protocol](../../docs/sandbox-provider.md); `services/core/internal/runtimeobs/source.go` owns the observation types and the `Source` view of a Provider. Core loads the selected Provider and its registered kind once per page and uses that same immutable Provider for every read on that page, reading each running target with `Observe`. Without a selection the load returns typed `ErrUnavailable`, which produces `sample_unavailable` without a provider type. Other load errors follow the provider-read error rules above.
 
@@ -77,7 +77,7 @@ These durations answer different questions and stay separate:
 - compute uptime: the sample's `started_at` to `observed_at`;
 - busy Turn duration: `turns.started_at` to `completed_at`, or now.
 
-CPU quietness, heartbeat age, connection state and keepalive time are not idle time.
+CPU quietness, heartbeat age and connection state are not idle time.
 
 ## Retained history and optional export
 
@@ -95,7 +95,7 @@ The PostgreSQL store keeps only periodic `openai_hosted` records, so API reads c
 
 The history service resolves the Project, Session and Environment before it queries; the query always carries that scope and bounded times, never provider identity. The store keeps seven days. A read covers at most 24 hours, reads at most 20,000 raw samples, starts two sampling intervals before the range to find CPU baselines, and returns at most 1,000 buckets per array, 64 series and 10,000 points in total. Results outside the requested scope, range or limits fail the read. The API's [Series](./runtime-observability-api.md#series) section describes the aggregation.
 
-`runtimehistory.Capabilities` states the collection mode, interval, seven-day retention, minimum bucket width (30 seconds or the interval, whichever is longer), 24-hour range and point limits; the history route answers 503 unless they are valid and periodic.
+`runtimehistory.Capabilities` states the sampling interval, seven-day retention, minimum bucket width (30 seconds or the interval, whichever is longer), 24-hour range and point limits; Core does not start unless they are valid.
 
 A cleanup loop runs every minute, even without active Runtimes. Each pass has at most two seconds and deletes expired Runtime and node host rows in batches of 256 per table, at most 16 batches. Reads never return rows older than the retention.
 
diff --git a/contracts/agents-api/sandbox-deployment.md b/contracts/agents-api/sandbox-deployment.md
index 3e813ad98..e473a7b7e 100644
--- a/contracts/agents-api/sandbox-deployment.md
+++ b/contracts/agents-api/sandbox-deployment.md
@@ -2,7 +2,7 @@
 title: "Sandbox deployment"
 ---
 
-The sandbox deployment selects the Sandbox Provider, the per-sandbox resources and the immutable Runtime release for Core-managed `openai_hosted` execution. PostgreSQL holds one active selection per installation; Web and the Core API write the same configuration. A node's files hold an installed copy of it plus host-specific paths and cannot override its resources or Runtime. The selection is independent of the Harness, and a deployment can stay unconfigured, with no nodes and no hosted admission.
+The sandbox deployment selects the Sandbox Provider, the per-sandbox resources and the immutable Runtime release for Core-managed `openai_hosted` execution. PostgreSQL holds one active selection per installation; Web and the Core API write the same configuration. A node's files hold an installed copy of it plus host-specific paths and cannot override its resources or Runtime. The selection is independent of the Harness. A deployment can stay unconfigured, with no nodes; it then refuses hosted admission.
 
 This contract owns the Core API routes below and their semantics. The [nodes guide](../../docs/getting-started/nodes.md) owns the operator workflow, the [machine connection API](./machine-api.md#node-routes) the routes nodes call, and the [sandbox node protocol](./node-generation-protocol.md) the node connection.
 
diff --git a/contracts/agents-api/v1/runtime_observations.go b/contracts/agents-api/v1/runtime_observations.go
index 7b47d8720..8e9fef69e 100644
--- a/contracts/agents-api/v1/runtime_observations.go
+++ b/contracts/agents-api/v1/runtime_observations.go
@@ -10,7 +10,7 @@ type RuntimeObservation struct {
 	Instance            RuntimeInstance           `json:"instance" binding:"required"`
 	LifecycleState      *string                   `json:"lifecycle_state" extensions:"x-nullable" binding:"required" enums:"active,sleeping,transitioning,pending,stopped"`
 	Status              string                    `json:"status" enums:"observed,unsupported,unavailable" binding:"required"`
-	Reason              *string                   `json:"reason" extensions:"x-nullable" binding:"required" enums:"runtime_mode_not_observable,allocation_pending,runtime_not_running,source_not_configured,sample_timeout,sample_unavailable"`
+	Reason              *string                   `json:"reason" extensions:"x-nullable" binding:"required" enums:"runtime_mode_not_observable,allocation_pending,runtime_not_running,sample_timeout,sample_unavailable"`
 	AllocationCreatedAt *int64                    `json:"allocation_created_at" extensions:"x-nullable" binding:"required" minimum:"0"`
 	ResolvedAt          int64                     `json:"resolved_at" binding:"required" minimum:"0"`
 	ObservedAt          *int64                    `json:"observed_at" extensions:"x-nullable" binding:"required" minimum:"0"`
diff --git a/contracts/agents-api/zh/core-errors.md b/contracts/agents-api/zh/core-errors.md
index b7ba9abb3..aa2c19203 100644
--- a/contracts/agents-api/zh/core-errors.md
+++ b/contracts/agents-api/zh/core-errors.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理错误"
 source: contracts/agents-api/core-errors.md
-source_hash: 46b6e7eb76739b9473576113aad3eee64fff3fddd429c3232ede67f671d60ed7
+source_hash: 6e917cd9928dfdeb0f5f4742b3e61d3197da5d599ba9f2b8934dd85ef23454d3
 ---
 
 `/core/v1` 上的错误使用此封装结构。`message` 是安全的英文文本；`code` 和 `param` 可以为 null。客户端依据稳定的 `code` 和可选的 `param` 进行处理，对未知代码显示 `message`，绝不解析消息，也绝不自动重试被拒绝的写操作。
@@ -97,7 +97,7 @@ Web 的控制台服务器在 `/core` 路径上发生自身故障时使用此封
 | 500 | `internal_error` | Core 未能完成操作 |
 | 503 | `runtime_node_unavailable` | 没有可用或有剩余容量的沙箱节点 |
 | 503 | `execution_unavailable` | 执行不可用，例如 Core 正在关闭 |
-| 503 | `runtime_history_unavailable` | 持久 Runtime 历史未配置或暂时不可用 |
+| 503 | `runtime_history_unavailable` | 持久 Runtime 历史暂时不可用 |
 | 503 | `core_metrics_unavailable` | 无法读取 Core 指标 |
 | 503 | `file_transfer_unavailable` | 有界内容传输不可用 |
 
diff --git a/contracts/agents-api/zh/core-metrics.md b/contracts/agents-api/zh/core-metrics.md
index 7503b8611..540750d78 100644
--- a/contracts/agents-api/zh/core-metrics.md
+++ b/contracts/agents-api/zh/core-metrics.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 运行指标"
 source: contracts/agents-api/core-metrics.md
-source_hash: 08ac6802f0da2eb5138dc7706a995754a69e7c864e034cf412f75dcc4950c679
+source_hash: f94805c348f60947ac0a61de898539d982e529226c7f07bc73d2a36a3a641821
 ---
 
 `GET /core/v1/metrics?range=1h|6h|24h|7d` 报告 Core 自身的健康状况：进程、执行队列与槽位、PostgreSQL 和后台任务。它要求 Core 密钥（[Core 管理 API](admin-api.md)）。
@@ -27,19 +27,19 @@ source_hash: 08ac6802f0da2eb5138dc7706a995754a69e7c864e034cf412f75dcc4950c679
 
 ## 字段 {#fields}
 
-响应包含 `object: "core.metrics"`、`range`、`service`、`execution`、`database`、`jobs` 和 `process`。所有数值和 `service.execution_owner` 均可为 null；每个 `series` 始终列出范围内的所有完整桶。
+响应包含 `object: "core.metrics"`、`range`、`service`、`execution`、`database`、`jobs` 和 `process`。除 `execution.slots_in_use`、`execution.slots_total` 和 `execution.connected_daemons` 外，所有数值以及 `service.execution_owner` 均可为 null；每个 `series` 始终列出范围内的所有完整桶。
 
 | 字段 | 含义 |
 | --- | --- |
-| `service.status` | 通常为 `running`；测量或任务失败、最新样本缺失或过期、执行所有权未知，或 Core 有执行槽位却未持有执行租约时为 `degraded`。沙箱重置由[部署](sandbox-deployment.md)报告，不在此处报告 |
+| `service.status` | 通常为 `running`；测量或任务失败、最新样本缺失或过期、执行所有权未知，或 Core 未持有执行租约时为 `degraded`。沙箱重置由[部署](sandbox-deployment.md)报告，不在此处报告 |
 | `service.revision` | 构建时注入的完整源代码提交；未注入时为 null |
 | `service.started_at` | 进程初始化时间 |
 | `service.execution_owner` | 此进程是否持有执行 worker 的数据库租约 |
-| `execution.slots_in_use`, `execution.slots_total` | 执行 worker 的活动 Session 预留数量及容量：[`core.execution_concurrency`](../../../docs/zh/configuration.md#settings)，默认为 4。Environment 输入、Turn 和文件工作共享槽位；不统计原生 Harness 子进程。没有 worker 时两者均为 0 |
+| `execution.slots_in_use`, `execution.slots_total` | 执行 worker 的活动 Session 预留数量及容量：[`core.execution_concurrency`](../../../docs/zh/configuration.md#settings)，默认为 4。Environment 输入、Turn 和文件工作共享槽位；不统计原生 Harness 子进程 |
 | `execution.queued_turns`, `execution.in_progress_turns` | 处于相应状态的根 Turn，包括已删除 Session 的 Turn。不统计 Subagent Turn 和为准备中 Environment 预留的输入 |
-| `execution.waiting_for_daemon` | Session 设备未连接的排队 Turn；无网关时为 null |
+| `execution.waiting_for_daemon` | Session 设备未连接的排队 Turn |
 | `execution.oldest_queued_seconds` | 最早排队 Turn 自 `created_at` 起的年龄 |
-| `execution.connected_daemons` | 连接到 Core 网关的 Runtime daemon 数量；无网关时为 null |
+| `execution.connected_daemons` | 连接到 Core 网关的 Runtime daemon 数量 |
 | `execution.queue_wait_ms` | 区间内开始的 Turn 的 `started_at - created_at` 的 p50 和 p95，使用 PostgreSQL `percentile_cont` |
 | `execution.interrupted` | 错误代码为 `execution_interrupted` 且 `completed_at` 在区间内的失败 Turn |
 | `execution.unavailable` | 使用错误代码 `execution_unavailable` 发送的 HTTP 响应，每个计一次。不统计其他 503 代码或流开始后的错误 |
diff --git a/contracts/agents-api/zh/runtime-observability-api.md b/contracts/agents-api/zh/runtime-observability-api.md
index 984c5ab7e..660c4a7d9 100644
--- a/contracts/agents-api/zh/runtime-observability-api.md
+++ b/contracts/agents-api/zh/runtime-observability-api.md
@@ -1,7 +1,7 @@
 ---
 title: "Runtime 遥测 API"
 source: contracts/agents-api/runtime-observability-api.md
-source_hash: 6eca80ffefcaf8e26901659e5251518f84d2c6c93349085b378d46f9ac49149d
+source_hash: 05ee25e01c2a8e9ce0f85c325a4a0e0e2f11eb76861e54740efa8975d9c5a999
 ---
 
 Core 通过 `/core/v1` 下的只读管理员路由报告托管 Runtime 和沙箱节点所使用的信息：当前 Runtime 观测值、单个 Session 的已存储 Runtime 历史记录，以及沙箱节点的主机观测值和历史记录。读取操作绝不创建、唤醒、续期或更改计算资源，也绝不向历史记录添加样本。[Runtime observability](runtime-observability.md) 定义了 Core 如何采集和保留这些值；[Console API usage](../../../docs/zh/web/console-api-usage.md) 列出了读取这些值的 Web 页面。
@@ -147,7 +147,6 @@ Authorization: Bearer <Core key>
 | `unsupported` | `runtime_mode_not_observable` | `none` 和 `self_hosted` Session。 |
 | `unavailable` | `allocation_pending` | 托管分配尚不存在或正在创建。 |
 | `unavailable` | `runtime_not_running` | 分配正在清理或已释放，或者提供方报告 Runtime 不存在、已停止或已暂停。 |
-| `unavailable` | `source_not_configured` | 此 Core 没有托管 installation 标识。 |
 | `unavailable` | `sample_timeout` | 提供方读取超过其截止时间。 |
 | `unavailable` | `sample_unavailable` | 提供方无法生成当前样本。 |
 
@@ -235,7 +234,7 @@ Core 先解析 Project，然后解析 Session 及其 Environment，之后才读
 | 404 | `not_found_error` | Project 不存在，或 Session 不属于该 Project。 |
 | 409 | `runtime_history_unsupported` | Session 不是 `openai_hosted`。 |
 | 500 | `internal_error` | 已存储的标识不一致。 |
-| 503 | `runtime_history_unavailable` | Core 未收集周期性历史（即在不使用 execution worker 的情况下运行），或读取失败、超时或产生了超出界限的结果。 |
+| 503 | `runtime_history_unavailable` | 读取失败、超时或产生了超出界限的结果。 |
 
 每个数组最多包含 `max_points` 个桶，响应最多包含 64 条 series，并且 coverage 和 series 中的点总计最多为 10,000 个。存储错误文本既不会返回，也不会记录到日志中。
 
diff --git a/contracts/agents-api/zh/runtime-observability.md b/contracts/agents-api/zh/runtime-observability.md
index 223c463c9..0832cecf6 100644
--- a/contracts/agents-api/zh/runtime-observability.md
+++ b/contracts/agents-api/zh/runtime-observability.md
@@ -1,7 +1,7 @@
 ---
 title: "运行时可观测性"
 source: contracts/agents-api/runtime-observability.md
-source_hash: 31fa597224d654f347c7f438bea78d8e548e7588849d4346c599aac8a8f8054c
+source_hash: de7eefac37eb9cc5935c28e2425efc323f1555771e48758ce9412455e891b52c
 ---
 
 这是面向贡献者的契约，规定 Core 如何观测 Runtime 并保留其历史。路由和响应字段见 [Runtime telemetry API](runtime-observability-api.md)。代码位于 `services/core/internal/runtimeobs`（解析、源、采样器和导出）、`internal/runtimehistory`（历史查询和 PostgreSQL 存储）以及 `internal/runtimeobs/otlpexporter`。
@@ -22,7 +22,7 @@ none:        tenant_id -> session_id (no Session-owned Runtime instance)
 
 托管 Docker、microsandbox 和 E2B 分配均会被观测。`none` 和 `self_hosted` Session 为 `unsupported`；Core 绝不会将共享主机统计信息归属于 `environment:none` Session。
 
-每个托管分配都通过部署所选的 Sandbox Provider 读取；该 Provider 在返回数值前会验证分配的 installation（`provider_key`）以及分配标签或等效所有权数据。在读取任何 provider 之前，部分行的结果由分配状态决定：处于 `creating` 状态或尚无分配时得到 `allocation_pending`，处于 `cleanup_pending` 或 `released` 状态时得到 `runtime_not_running`，Core 没有 installation 标识时得到 `source_not_configured`。provider 读取超出截止时间时得到 `sample_timeout`，返回未运行结果时得到 `runtime_not_running`，返回不可用结果时得到 `sample_unavailable`。任何其他错误、所有权不匹配或无效采样都会使读取失败。
+每个托管分配都通过部署所选的 Sandbox Provider 读取；该 Provider 在返回数值前会验证分配的 installation（`provider_key`）以及分配标签或等效所有权数据。在读取任何 provider 之前，部分行的结果由分配状态决定：处于 `creating` 状态或尚无分配时得到 `allocation_pending`，处于 `cleanup_pending` 或 `released` 状态时得到 `runtime_not_running`。provider 读取超出截止时间时得到 `sample_timeout`，返回未运行结果时得到 `runtime_not_running`，返回不可用结果时得到 `sample_unavailable`。任何其他错误、所有权不匹配或无效采样都会使读取失败。
 
 `Observe` 属于 [Sandbox Provider 协议](../../../docs/zh/sandbox-provider.md)；`services/core/internal/runtimeobs/source.go` 负责观测类型以及 Provider 的 `Source` 视图。Core 每页只加载一次所选 Provider 及其注册 kind，并在该页的每次读取中使用同一不可变 Provider，用 `Observe` 读取每个运行中的目标。没有选择时，加载返回类型化的 `ErrUnavailable`，从而生成不含 provider 类型的 `sample_unavailable`。其他加载错误遵循上述 provider 读取错误规则。
 
@@ -79,7 +79,7 @@ E2B 不报告累计 CPU 时间，因此 CPU 秒数保持为 null。`observed_at`
 - 计算运行时长：采样的 `started_at` 到 `observed_at`；
 - 忙碌 Turn 时长：`turns.started_at` 到 `completed_at`，或到当前时间。
 
-CPU 静默状态、心跳时龄、连接状态和保活时间都不是空闲时间。
+CPU 静默状态、心跳时龄和连接状态都不是空闲时间。
 
 ## 保留的历史记录与可选导出 {#retained-history-and-optional-export}
 
@@ -97,7 +97,7 @@ PostgreSQL 存储仅保留周期性的 `openai_hosted` 记录，因此 API 读
 
 历史服务在查询前解析 Project、Session 和 Environment；查询始终携带该作用域和有界时间范围，但绝不携带 provider 身份。存储保留 7 天。单次读取最多覆盖 24 小时，最多读取 20,000 条原始采样，并从范围起点之前两个采样间隔处开始读取，以查找 CPU 基线；每个数组最多返回 1,000 个桶，最多返回 64 个序列，总点数最多 10,000 个。结果超出请求的作用域、时间范围或限制时，读取失败。API 的 [Series](runtime-observability-api.md#series) 部分说明了聚合方式。
 
-`runtimehistory.Capabilities` 声明采集模式、间隔、7 天保留期、最小桶宽度（30 秒或采样间隔，取较长者）、24 小时范围和点数限制；历史路由仅在所有这些值有效且采集模式为 `periodic` 时响应，否则返回 503。
+`runtimehistory.Capabilities` 声明采样间隔、7 天保留期、最小桶宽度（30 秒或采样间隔，取较长者）、24 小时范围和点数限制；这些值无效时 Core 不会启动。
 
 清理循环每分钟运行一次，即使没有活跃 Runtime 也会运行。每轮最多耗时 2 秒，按每表 256 行的批次删除过期 Runtime 行和节点主机行，每张表最多 16 批。读取绝不会返回超过保留期的行。
 
diff --git a/contracts/agents-api/zh/sandbox-deployment.md b/contracts/agents-api/zh/sandbox-deployment.md
index f14dc75eb..275cf079a 100644
--- a/contracts/agents-api/zh/sandbox-deployment.md
+++ b/contracts/agents-api/zh/sandbox-deployment.md
@@ -1,10 +1,10 @@
 ---
 title: "沙箱部署"
 source: contracts/agents-api/sandbox-deployment.md
-source_hash: f4ecc42b24dd85d2bfe3e054358aa2087331aa3110ba031bbc824cece58a54c3
+source_hash: b40a45b42e42de5e64fa3ccae4666650e6c5d8b7d53a438d61a2e6665af2168e
 ---
 
-沙箱部署为 Core 管理的 `openai_hosted` 执行选择 Sandbox Provider、每个沙箱的资源以及不可变的 Runtime 发行版。PostgreSQL 为每个安装维护一个当前有效选择；Web 和 Core API 写入同一配置。节点文件保存其已安装副本和特定于主机的路径，且不能覆盖其资源或 Runtime。该选择独立于 Harness；部署可以保持未配置状态，既无节点，也不接受托管准入。
+沙箱部署为 Core 管理的 `openai_hosted` 执行选择 Sandbox Provider、每个沙箱的资源以及不可变的 Runtime 发行版。PostgreSQL 为每个安装维护一个当前有效选择；Web 和 Core API 写入同一配置。节点文件保存其已安装副本和特定于主机的路径，且不能覆盖其资源或 Runtime。该选择独立于 Harness。部署可以保持未配置状态，没有节点；此时它拒绝托管准入。
 
 本契约负责下列 Core API 路由及其语义。[节点指南](../../../docs/zh/getting-started/nodes.md)负责操作员工作流，[机器连接 API](machine-api.md#node-routes)负责节点调用的路由，[沙箱节点协议](node-generation-protocol.md)负责节点连接。
 
diff --git a/docs/sandbox-provider.md b/docs/sandbox-provider.md
index a3c49dc59..463f5e142 100644
--- a/docs/sandbox-provider.md
+++ b/docs/sandbox-provider.md
@@ -152,7 +152,7 @@ This is what Core does around every provider. Adapters implement none of it, but
 
 At startup Core claims the stable installation identity and a new owner epoch before it selects a provider. The runtime manager keeps generation-aware provider facades. Initial setup and replacement prepare and validate candidates before any database write, and a rejected candidate leaves the active configuration and workers unchanged. A backend replacement uses the deployment mutation gate: it pauses manager admission, drains old calls and loops, then repeats the resource and generation guards in the commit transaction, where the new selection, its generation and the retirement of old nodes and unused enrollment tokens commit together. After commit, Core publishes the prevalidated configuration and the shared observation and bootstrap cache under the manager mutex, with no further external work or fallible step, so a request cancelled after commit cannot discard it. An interrupted drain stays a barrier for retries. Provider I/O and draining never hold a database transaction or the manager's map mutex.
 
-A locally unavailable provider dependency keeps hosted admission closed while the existing scan waits for repair; administrator recovery stays available, also after a restart. Database and ownership errors stay failures, and unconfigured hosted admission creates no Session state. Core derives the Runtime bootstrap and daemon WebSocket addresses from the installation public URL, never from request headers, and reads the current selection from the database, never from a startup file.
+A locally unavailable provider dependency keeps hosted admission closed while the existing scan waits for repair; administrator recovery stays available, also after a restart. Database and ownership errors stay failures. An unconfigured deployment refuses hosted admission with 503 `execution_unavailable` and creates no Session state. Core derives the Runtime bootstrap and daemon WebSocket addresses from the installation public URL, never from request headers, and reads the current selection from the database, never from a startup file.
 
 Node readiness binds to the exact generation, the current connection and the owner epoch. A durable serving pin is promoted only for readiness of the then-current target, under deployment serialization, so a late report for a superseded target never acquires a pin.
 
@@ -162,7 +162,7 @@ The allocation, its dedicated daemon credential digest and the exact Session bin
 
 With a configured provider, the Worker scans committed pending hosted Environments that have no allocation, which covers idle Session creation and recovery after an interruption between commit and bootstrap; an existing allocation never re-enters that path. The scan is bounded and serialized by the lifecycle owner and needs no caller action. An initial reservation without a Turn leaves its Session idle, and a daemon connection is never treated as native readiness. The same scan publishes authenticated connection observations with durable generations, after verifying the exact Session and device binding and a settled bootstrap.
 
-Connected, observed compute receives service keepalives between Turns. Keepalives never revive a lapse of one hour or a cleanup request. A node allocation never expires only because its keepalive is an hour old; explicit deletion and the snapshot retention still authorize its cleanup. A stopped or missing container never authorizes discarding retained workspace or history. Disabling the provider stops new hosted admission and bootstrap but never blocks cancellation, function results or input retry outcomes of existing Sessions.
+Between Turns, Core checks that connected, observed compute is still its Session's running allocation; the check changes nothing and never revives a cleanup request. Running compute never expires: explicit deletion and the snapshot retention authorize its cleanup. A stopped or missing container never authorizes discarding retained workspace or history. Disabling the provider stops new hosted admission and bootstrap but never blocks cancellation, function results or input retry outcomes of existing Sessions.
 
 Terminal cleanup atomically revokes the device's authority, records the Environment's failure or expiry, settles pending input and requests cancellation, and only then calls `Kill`; original input deadlines and retry outcomes are kept. Temporary provider outages, unknown Create results and stopped compute never prove a permanent failure. After public Session deletion Core keeps the allocation and marks it released only after owned compute and volume cleanup and proof that the original Create settled; an unknown creation keeps cleanup ownership even after an absence observation, and bounded scans continue to catch late resources without another `Create`.
 
diff --git a/docs/zh/sandbox-provider.md b/docs/zh/sandbox-provider.md
index d273df9d0..51ed3427e 100644
--- a/docs/zh/sandbox-provider.md
+++ b/docs/zh/sandbox-provider.md
@@ -1,7 +1,7 @@
 ---
 title: "添加 Sandbox Provider"
 source: docs/sandbox-provider.md
-source_hash: 305d35b08388d682347f7bce263262e65031cfe69d09cd2acf0e8dae6893ff6f
+source_hash: e14ff6b3d8166a04b629723aa4bd0fa6496b74307d0b6c60ebd454247c1ca3fd
 ---
 
 **Sandbox Provider** 为 Core 管理的 Environment 提供 Runtime daemon 运行所需的外层计算资源，以及启动 daemon 的有界引导流程。本指南说明如何添加 Provider，并作为 Core 驱动 Provider 的参考。接口为 [`SandboxProvider`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/sandbox/sandbox_provider.go)。
@@ -154,7 +154,7 @@ launcher 从[派生进程环境](configuration.md)提供 `sandbox.ProcessPaths`
 
 启动时 Core 在选择 provider 前领取稳定 installation identity 和新的 owner epoch。runtime manager 保留了解 generation 的 provider facade。初始 setup 与 replacement 在任何数据库写入前准备并验证 candidate；candidate 被拒绝时不改变活动配置或 worker。backend replacement 使用 deployment mutation gate：暂停 manager admission，排空旧调用与循环，再在 commit transaction 中重复 resource 与 generation guard；新选择、其 generation、旧 node 和未使用 enrollment token 的退役一起提交。提交后，Core 在 manager mutex 下发布预验证配置和共享 observation、bootstrap cache，没有进一步外部工作或可失败步骤，因此提交后取消的请求不能丢弃配置。中断的 drain 保留为重试 barrier。Provider I/O 和 drain 不持有数据库事务或 manager map mutex。
 
-本地 provider 依赖不可用时，现有 scan 等待修复，hosted admission 保持关闭；管理员恢复仍可使用，重启后也如此。数据库和所有权错误仍是失败，未配置 hosted admission 不创建 Session 状态。Core 从 installation public URL 派生 Runtime bootstrap 和 daemon WebSocket 地址，不使用请求 header；从数据库读取当前选择，不使用 startup file。
+本地 provider 依赖不可用时，现有 scan 等待修复，hosted admission 保持关闭；管理员恢复仍可使用，重启后也如此。数据库和所有权错误仍是失败。未配置的部署以 503 `execution_unavailable` 拒绝 hosted admission，且不创建 Session 状态。Core 从 installation public URL 派生 Runtime bootstrap 和 daemon WebSocket 地址，不使用请求 header；从数据库读取当前选择，不使用 startup file。
 
 Node readiness 绑定到精确 generation、当前连接和 owner epoch。持久 serving pin 仅在部署串行化下为当时目标的 readiness 提升，因此已被替代目标的延迟报告不获得 pin。
 
@@ -164,7 +164,7 @@ allocation、专用 daemon credential digest 和精确 Session binding 在 `Crea
 
 配置 provider 后，Worker 扫描已提交且没有 allocation 的 pending hosted Environment，涵盖空闲 Session 创建以及 commit 与 bootstrap 之间中断后的恢复；已有 allocation 不重新进入此路径。scan 有界，由 lifecycle owner 串行化，不需要调用方操作。没有 Turn 的初始预约让 Session 保持空闲，daemon 连接不被当作原生 readiness。同一 scan 在验证精确 Session、device binding 和已结算 bootstrap 后，发布带持久 generation 的认证连接观测。
 
-已连接且已观察的计算资源在 Turn 之间接收 service keepalive。keepalive 不复活一小时的中断或 cleanup 请求。node allocation 不仅因 keepalive 已过一小时而到期；显式删除和 snapshot retention 仍授权其清理。停止或缺失 container 不授权丢弃保留工作区或历史。禁用 provider 停止新 hosted admission 与 bootstrap，但不阻止现有 Session 的取消、function result 或 input retry outcome。
+Core 在 Turn 之间检查已连接且已观察的计算资源仍是其 Session 正在运行的 allocation；该检查不做任何修改，也不复活 cleanup 请求。正在运行的计算资源不会到期：显式删除和 snapshot retention 授权其清理。停止或缺失 container 不授权丢弃保留工作区或历史。禁用 provider 停止新 hosted admission 与 bootstrap，但不阻止现有 Session 的取消、function result 或 input retry outcome。
 
 终结清理原子撤销 device authority、记录 Environment 失败或到期、结算 pending input 并请求取消，然后才调用 `Kill`；原 input deadline 与 retry outcome 保留。临时 provider outage、未知 Create result 和停止的计算资源不证明永久失败。公开 Session 删除后 Core 保留 allocation，仅在所属 compute 与 volume 清理完成且原 Create 已结算的证明成立后标记 released；未知创建即使观察到不存在也保留 cleanup ownership，有界 scan 继续捕捉延迟资源，不再调用 `Create`。
 
diff --git a/packages/agents-client/src/client.ts b/packages/agents-client/src/client.ts
index 2e4e8e13b..3a61a8c7d 100644
--- a/packages/agents-client/src/client.ts
+++ b/packages/agents-client/src/client.ts
@@ -315,7 +315,7 @@ const runtimeCPUFields = new Set(["usage_seconds_total", "capacity_cores", "usag
 const runtimeMemoryFields = new Set(["usage_bytes", "limit_bytes"]);
 const runtimeObservationReasons = new Set([
   "runtime_mode_not_observable", "allocation_pending", "runtime_not_running",
-  "source_not_configured", "sample_timeout", "sample_unavailable",
+  "sample_timeout", "sample_unavailable",
 ]);
 const runtimeProviderTypePattern = /^[a-z][a-z0-9_]{0,31}$/;
 const runtimeLifecycleStates = new Set(["active", "sleeping", "transitioning", "pending", "stopped"]);
diff --git a/packages/agents-client/src/core-metrics.test.ts b/packages/agents-client/src/core-metrics.test.ts
index 9599b6365..b160cf6c8 100644
--- a/packages/agents-client/src/core-metrics.test.ts
+++ b/packages/agents-client/src/core-metrics.test.ts
@@ -5,7 +5,7 @@ import { CoreMetricsClient, projectCoreMetrics } from "./core-metrics";
 
 describe("Core metrics client", () => {
   it("reads /core/v1/metrics without the Beta header, with a bearer only when given", async () => {
-    const body = { object: "core.metrics", range: { start: "2026-09-24T00:00:00Z", end: "2026-09-24T01:00:00Z", resolution_seconds: 60 }, service: { status: "running" } };
+    const body = { object: "core.metrics", range: { start: "2026-09-24T00:00:00Z", end: "2026-09-24T01:00:00Z", resolution_seconds: 60 }, service: { status: "running" }, execution: { slots_in_use: 0, slots_total: 4, connected_daemons: 0 } };
     const fetch = vi.fn<typeof globalThis.fetch>().mockImplementation(async () => new Response(JSON.stringify(body)));
     const client = new CoreMetricsClient({ fetch });
     expect(client).not.toBeInstanceOf(OpenAIAgentsClient);
@@ -28,11 +28,11 @@ describe("Core metrics projection", () => {
       object: "core.metrics",
       range: { start: "2026-09-24T00:00:00Z", end: "2026-09-24T01:00:00Z", resolution_seconds: 60 },
       service: { status: "running", revision: "b134a1b5", execution_owner: true },
-      execution: { slots_in_use: 3, slots_total: 4, queue_wait_ms: { p95: 2600 }, series: [{ start: "2026-09-24T00:00:00Z", queued: 1 }] },
+      execution: { slots_in_use: 3, slots_total: 4, connected_daemons: 2, queue_wait_ms: { p95: 2600 }, series: [{ start: "2026-09-24T00:00:00Z", queued: 1 }] },
       jobs: [{ id: "runtime_sampler", status: "weird", processed: 12 }],
     });
     expect(metrics.service).toMatchObject({ revision: "b134a1b5", execution_owner: true, started_at: null });
-    expect(metrics.execution).toMatchObject({ slots_in_use: 3, queued_turns: null, connected_daemons: null });
+    expect(metrics.execution).toMatchObject({ slots_in_use: 3, queued_turns: null, connected_daemons: 2 });
     expect(metrics.execution.queue_wait_ms).toEqual({ p50: null, p95: 2600 });
     expect(metrics.execution.series[0]).toMatchObject({ queued: 1, in_progress: null });
     expect(metrics.database).toMatchObject({ size_bytes: null, pool: { in_use: null, idle: null, max: null }, series: [] });
@@ -46,12 +46,15 @@ describe("Core metrics projection", () => {
       object: "core.metrics",
       range: { start: "2026-09-24T00:00:00Z", end: "2026-09-24T01:00:00Z", resolution_seconds: 60 },
       service: { status: "draining" },
+      execution: { slots_in_use: 0, slots_total: 4, connected_daemons: 0 },
     });
     expect(metrics.service.status).toBe("unknown");
   });
 
-  it("rejects a response that is not Core metrics or has no resolution", () => {
+  it("rejects a response that is not Core metrics or lacks its resolution or execution counts", () => {
     expect(() => projectCoreMetrics({ object: "list" })).toThrow();
     expect(() => projectCoreMetrics({ object: "core.metrics", range: { start: "", end: "" }, service: { status: "running" } })).toThrow();
+    const range = { start: "2026-09-24T00:00:00Z", end: "2026-09-24T01:00:00Z", resolution_seconds: 60 };
+    expect(() => projectCoreMetrics({ object: "core.metrics", range, service: { status: "running" }, execution: { slots_in_use: 0, slots_total: 4 } })).toThrow();
   });
 });
diff --git a/packages/agents-client/src/core-metrics.ts b/packages/agents-client/src/core-metrics.ts
index 9a3bf5fca..d1b14ceeb 100644
--- a/packages/agents-client/src/core-metrics.ts
+++ b/packages/agents-client/src/core-metrics.ts
@@ -68,14 +68,14 @@ export interface CoreMetrics {
     execution_owner: boolean | null;
   };
   execution: {
-    slots_in_use: number | null;
-    slots_total: number | null;
+    slots_in_use: number;
+    slots_total: number;
     queued_turns: number | null;
     /** Queued Turns whose Session has no connected daemon (part of queued_turns). */
     waiting_for_daemon: number | null;
     in_progress_turns: number | null;
     oldest_queued_seconds: number | null;
-    connected_daemons: number | null;
+    connected_daemons: number;
     /** Turns failed with execution_interrupted in the range. */
     interrupted: number | null;
     /** Requests refused with execution_unavailable in the range. */
@@ -122,6 +122,12 @@ function number(value: unknown): number | null {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
 
+function count(value: unknown, path: string): number {
+  const result = number(value);
+  if (result === null) throw new AgentCoreError(`Core metrics: ${path} is missing.`, 0, "invalid_response");
+  return result;
+}
+
 function text(value: unknown): string | null {
   return typeof value === "string" && value ? value : null;
 }
@@ -145,7 +151,7 @@ export function projectCoreMetrics(value: unknown): CoreMetrics {
   if (body.object !== "core.metrics") throw new AgentCoreError("Core metrics: unexpected object type.", 0, "invalid_response");
   const range = record(body.range, "range");
   const service = record(body.service, "service");
-  const execution = optional(body.execution);
+  const execution = record(body.execution, "execution");
   const database = optional(body.database);
   const pool = optional(database.pool);
   const process = optional(body.process);
@@ -162,13 +168,13 @@ export function projectCoreMetrics(value: unknown): CoreMetrics {
       execution_owner: typeof service.execution_owner === "boolean" ? service.execution_owner : null,
     },
     execution: {
-      slots_in_use: number(execution.slots_in_use),
-      slots_total: number(execution.slots_total),
+      slots_in_use: count(execution.slots_in_use, "execution.slots_in_use"),
+      slots_total: count(execution.slots_total, "execution.slots_total"),
       queued_turns: number(execution.queued_turns),
       waiting_for_daemon: number(execution.waiting_for_daemon),
       in_progress_turns: number(execution.in_progress_turns),
       oldest_queued_seconds: number(execution.oldest_queued_seconds),
-      connected_daemons: number(execution.connected_daemons),
+      connected_daemons: count(execution.connected_daemons, "execution.connected_daemons"),
       interrupted: number(execution.interrupted),
       unavailable: number(execution.unavailable),
       queue_wait_ms: latency(execution.queue_wait_ms),
diff --git a/packages/agents-client/src/types.ts b/packages/agents-client/src/types.ts
index ceac7b2c9..9594d5b11 100644
--- a/packages/agents-client/src/types.ts
+++ b/packages/agents-client/src/types.ts
@@ -995,7 +995,6 @@ export type RuntimeObservationReason =
   | "runtime_mode_not_observable"
   | "allocation_pending"
   | "runtime_not_running"
-  | "source_not_configured"
   | "sample_timeout"
   | "sample_unavailable";
 
diff --git a/services/core/cmd/server/core_metrics.go b/services/core/cmd/server/core_metrics.go
index 74b92a0cb..f8c839f0a 100644
--- a/services/core/cmd/server/core_metrics.go
+++ b/services/core/cmd/server/core_metrics.go
@@ -30,7 +30,7 @@ func (s *coreMetricsSource) Live() coremetrics.Live {
 	return coremetrics.Live{Pool: coremetrics.Pool{InUse: metricPtr(int64(stat.AcquiredConns())), Idle: metricPtr(int64(stat.IdleConns())), Max: metricPtr(int64(stat.MaxConns()))},
 		Scheduler:      coremetrics.Job{ID: "scheduler", Status: w.Scheduler.Status, LastRunAt: w.Scheduler.LastRunAt, Processed: w.Scheduler.Processed, Failed: w.Scheduler.Failed},
 		ExecutionOwner: w.ExecutionOwner, SlotsTotal: w.SlotsTotal, SlotsInUse: w.SlotsInUse,
-		ConnectedDaemons: metricPtr(int64(len(s.registry.Devices())))}
+		ConnectedDaemons: int64(len(s.registry.Devices()))}
 }
 func (s *coreMetricsSource) Sample(ctx context.Context) coremetrics.Sample {
 	sample := coremetrics.Sample{Healthy: true, PoolInUse: metricPtr(int64(s.pool.Stat().AcquiredConns()))}
diff --git a/services/core/cmd/server/managed_setup_test.go b/services/core/cmd/server/managed_setup_test.go
index f4a022aa8..aaaf9cd02 100644
--- a/services/core/cmd/server/managed_setup_test.go
+++ b/services/core/cmd/server/managed_setup_test.go
@@ -107,7 +107,7 @@ func committedSetup(value *deployment.Setup) func(context.Context) (deployment.S
 // deployment service does. That needs no storage.
 func credentialService(t *testing.T) func(owner, candidate deployment.Setup) (deployment.Setup, error) {
 	t.Helper()
-	rules, err := placement.NewRules(providers.Builtin(), "")
+	rules, err := placement.NewRules(providers.Builtin(), "https://core.example")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/cmd/server/runtime_history.go b/services/core/cmd/server/runtime_history.go
index 792d04769..da05b8481 100644
--- a/services/core/cmd/server/runtime_history.go
+++ b/services/core/cmd/server/runtime_history.go
@@ -26,10 +26,9 @@ type runtimeHistoryExporter interface {
 }
 
 func runtimeHistory(ctx context.Context, units *pgunit.Pool, config processconfig.RuntimeHistory) (runtimeHistorySetup, error) {
-	interval := config.SampleInterval
 	capabilities := runtimehistory.Capabilities{
-		CollectionMode: runtimehistory.CollectionPeriodic, SampleInterval: interval, Retention: 7 * 24 * time.Hour,
-		MinimumStep: max(30*time.Second, interval), MaximumRange: 24 * time.Hour,
+		SampleInterval: config.SampleInterval, Retention: 7 * 24 * time.Hour,
+		MinimumStep: max(30*time.Second, config.SampleInterval), MaximumRange: 24 * time.Hour,
 		MaximumPoints: 1000, MaximumSeries: 64, MaximumTotalPoints: 10000,
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory, runtimehistory.MetricTokens},
 	}
@@ -38,7 +37,7 @@ func runtimeHistory(ctx context.Context, units *pgunit.Pool, config processconfi
 		return runtimeHistorySetup{}, err
 	}
 	options := runtimeobs.ExportOptions{QueueCapacity: config.QueueCapacity, Timeout: config.Timeout}
-	setup := runtimeHistorySetup{Options: []runtimeobs.ServiceOption{runtimeobs.WithExporter(backend, options)}, Reader: backend, SampleInterval: interval, Prune: backend.Prune}
+	setup := runtimeHistorySetup{Options: []runtimeobs.ServiceOption{runtimeobs.WithExporter(backend, options)}, Reader: backend, SampleInterval: config.SampleInterval, Prune: backend.Prune}
 	if config.Endpoint != "" {
 		exporter, err := otlpexporter.New(ctx, otlpexporter.Config{Endpoint: config.Endpoint, Headers: config.Headers, Insecure: config.Insecure, RequestTimeout: config.Timeout})
 		if err != nil {
diff --git a/services/core/cmd/server/runtime_history_test.go b/services/core/cmd/server/runtime_history_test.go
index c81e5b3e4..2b47b75bc 100644
--- a/services/core/cmd/server/runtime_history_test.go
+++ b/services/core/cmd/server/runtime_history_test.go
@@ -26,7 +26,7 @@ func TestRuntimeHistoryUsesCoreDatabaseByDefault(t *testing.T) {
 		t.Fatal("default history requires extra deployment")
 	}
 	capabilities := setup.Reader.Capabilities()
-	if !capabilities.Durable() || capabilities.Retention != 7*24*time.Hour {
+	if capabilities.Validate() != nil || capabilities.Retention != 7*24*time.Hour {
 		t.Fatalf("incorrect default capabilities: %+v", capabilities)
 	}
 	if setup.SampleInterval != 30*time.Second {
diff --git a/services/core/internal/api/core_store_validation_test.go b/services/core/internal/api/core_store_validation_test.go
index 91cb319d0..bd950b480 100644
--- a/services/core/internal/api/core_store_validation_test.go
+++ b/services/core/internal/api/core_store_validation_test.go
@@ -22,7 +22,7 @@ import (
 func TestCoreStoreValidationFieldsAndPublicFallback(t *testing.T) {
 	// The deployment validates these inputs before it reaches storage, so
 	// storage without a database is enough.
-	rules, err := placement.NewRules(providers.Builtin(), "")
+	rules, err := placement.NewRules(providers.Builtin(), "https://core.example")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/api/runtime_history.go b/services/core/internal/api/runtime_history.go
index 5d4d0c3fe..0e39a934d 100644
--- a/services/core/internal/api/runtime_history.go
+++ b/services/core/internal/api/runtime_history.go
@@ -18,9 +18,8 @@ const (
 	runtimeHistoryRequestBudget = 15 * time.Second
 )
 
-// RuntimeHistory queries durable Runtime history. Its capabilities declare
-// whether this Core collects any; one that does not answers 503
-// runtime_history_unavailable.
+// RuntimeHistory queries the durable Runtime history Core samples
+// periodically.
 type RuntimeHistory interface {
 	Capabilities() runtimehistory.Capabilities
 	QuerySession(context.Context, string, string, runtimehistory.Range) (runtimehistory.Response, error)
@@ -29,10 +28,6 @@ type RuntimeHistory interface {
 // getRuntimeHistory serves the administrator per-Session history read.
 func (h *Handler) getRuntimeHistory(w http.ResponseWriter, r *http.Request) {
 	capabilities := h.RuntimeHistory.Capabilities()
-	if capabilities.Validate() != nil || !capabilities.Durable() {
-		writeError(w, http.StatusServiceUnavailable, "runtime_history_unavailable", "Durable Runtime history is not configured on this service.")
-		return
-	}
 	requested, ok := readRuntimeHistoryRange(w, r, capabilities, time.Now().UTC())
 	if !ok {
 		return
@@ -95,7 +90,7 @@ func readRuntimeHistoryRange(w http.ResponseWriter, r *http.Request, capabilitie
 }
 
 func runtimeHistoryResponse(value runtimehistory.Response, expectedTenantID, expectedSessionID string, expectedRange runtimehistory.Range) (v1.RuntimeHistory, error) {
-	if err := value.Validate(time.Now().UTC()); err != nil || !value.Durable() ||
+	if err := value.Validate(time.Now().UTC()); err != nil ||
 		value.TenantID != expectedTenantID || value.SessionID != expectedSessionID ||
 		!value.Requested.Start.Equal(expectedRange.Start) || !value.Requested.End.Equal(expectedRange.End) || value.Requested.MaxPoints != expectedRange.MaxPoints {
 		return v1.RuntimeHistory{}, runtimehistory.ErrInvalidResult
diff --git a/services/core/internal/api/runtime_history_test.go b/services/core/internal/api/runtime_history_test.go
index 9e526b61e..ac5b3d5c0 100644
--- a/services/core/internal/api/runtime_history_test.go
+++ b/services/core/internal/api/runtime_history_test.go
@@ -39,35 +39,12 @@ func historyWith(service *runtimeHistoryFixture) func(*Dependencies, *testFakes)
 	}
 }
 
-func historyCapabilities(mode runtimehistory.CollectionMode) runtimehistory.Capabilities {
-	value := runtimehistory.Capabilities{
-		CollectionMode: mode, Retention: 7 * 24 * time.Hour, MinimumStep: 30 * time.Second,
+func historyCapabilities() runtimehistory.Capabilities {
+	return runtimehistory.Capabilities{
+		SampleInterval: 30 * time.Second, Retention: 7 * 24 * time.Hour, MinimumStep: 30 * time.Second,
 		MaximumRange: 24 * time.Hour, MaximumPoints: 1_000, MaximumSeries: 64, MaximumTotalPoints: 10_000,
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory, runtimehistory.MetricTokens},
 	}
-	if mode == runtimehistory.CollectionPeriodic {
-		value.SampleInterval = 30 * time.Second
-	}
-	return value
-}
-
-func TestRuntimeHistoryRequiresQualifiedPeriodicCollection(t *testing.T) {
-	service := &runtimeHistoryFixture{capabilities: historyCapabilities(runtimehistory.CollectionOnRead)}
-	handler, _, _ := adminTestHandler(t, historyWith(service))
-	response := runtimeObservationRequest(handler, adminSessionsPath+uuid.NewString()+"/runtime-history?start=1&end=2")
-	if response.Code != http.StatusServiceUnavailable || service.calls != 0 {
-		t.Fatalf("on-read history reached query service: %d calls=%d body=%s", response.Code, service.calls, response.Body)
-	}
-}
-
-func TestRuntimeHistoryFailsClosedForMalformedCapabilities(t *testing.T) {
-	service := &runtimeHistoryFixture{capabilities: historyCapabilities(runtimehistory.CollectionPeriodic)}
-	service.capabilities.Retention = 0
-	handler, _, _ := adminTestHandler(t, historyWith(service))
-	response := runtimeObservationRequest(handler, adminSessionsPath+uuid.NewString()+"/runtime-history?start=1&end=2")
-	if response.Code != http.StatusServiceUnavailable || service.calls != 0 {
-		t.Fatalf("malformed capabilities reached query service: %d calls=%d body=%s", response.Code, service.calls, response.Body)
-	}
 }
 
 func TestRuntimeHistoryRouteBindsAuthenticatedSessionAndPreservesCoverage(t *testing.T) {
@@ -88,7 +65,7 @@ func TestRuntimeHistoryRouteBindsAuthenticatedSessionAndPreservesCoverage(t *tes
 		ObservationCount: 1, ObservedCount: 1, CPUContributorCount: 1, MemoryContributorCount: 1,
 		CPUUtilizationRatio: &zeroRatio, CPUCapacityCores: &capacity, MemoryUsageBytes: &zeroMemory, MemoryLimitBytes: &limit,
 	}
-	service := &runtimeHistoryFixture{capabilities: historyCapabilities(runtimehistory.CollectionPeriodic)}
+	service := &runtimeHistoryFixture{capabilities: historyCapabilities()}
 	handler, _, tenant := adminTestHandler(t, historyWith(service))
 	scope.TenantID = tenant
 	service.response = runtimehistory.Response{
@@ -116,7 +93,7 @@ func TestRuntimeHistoryRouteBindsAuthenticatedSessionAndPreservesCoverage(t *tes
 }
 
 func TestRuntimeHistoryRejectsUnsafeQueriesAndFailures(t *testing.T) {
-	service := &runtimeHistoryFixture{capabilities: historyCapabilities(runtimehistory.CollectionPeriodic)}
+	service := &runtimeHistoryFixture{capabilities: historyCapabilities()}
 	handler, _, _ := adminTestHandler(t, historyWith(service))
 	sessionID := uuid.NewString()
 	for _, query := range []string{
@@ -161,7 +138,7 @@ func TestRuntimeHistoryRejectsMismatchedServiceResponses(t *testing.T) {
 	now := time.Now().UTC().Truncate(time.Second)
 	start := now.Add(-time.Hour)
 	sessionID := uuid.NewString()
-	service := &runtimeHistoryFixture{capabilities: historyCapabilities(runtimehistory.CollectionPeriodic)}
+	service := &runtimeHistoryFixture{capabilities: historyCapabilities()}
 	handler, _, tenant := adminTestHandler(t, historyWith(service))
 	base := runtimehistory.Response{
 		Capabilities: service.capabilities,
@@ -192,7 +169,7 @@ func TestRuntimeHistoryRejectsMismatchedServiceResponses(t *testing.T) {
 }
 
 func TestRuntimeHistoryDefaultPointBudgetRespectsCapabilities(t *testing.T) {
-	capabilities := historyCapabilities(runtimehistory.CollectionPeriodic)
+	capabilities := historyCapabilities()
 	capabilities.MaximumPoints = 60
 	service := &runtimeHistoryFixture{capabilities: capabilities, err: runtimehistory.ErrUnavailable}
 	handler, _, _ := adminTestHandler(t, historyWith(service))
@@ -207,7 +184,7 @@ func TestRuntimeHistoryExpectedCoverageUsesOverflowSafeCeiling(t *testing.T) {
 	now := time.Now().UTC().Truncate(time.Second)
 	start := now.Add(-time.Hour)
 	huge := (time.Duration(1<<63-1) / time.Second) * time.Second
-	capabilities := historyCapabilities(runtimehistory.CollectionPeriodic)
+	capabilities := historyCapabilities()
 	capabilities.SampleInterval = huge
 	capabilities.Retention = huge
 	capabilities.MaximumRange = time.Hour
diff --git a/services/core/internal/coremetrics/service.go b/services/core/internal/coremetrics/service.go
index cfb24849d..84dfc5f91 100644
--- a/services/core/internal/coremetrics/service.go
+++ b/services/core/internal/coremetrics/service.go
@@ -231,7 +231,7 @@ func (s *Service) Read(ctx context.Context, name string) (View, error) {
 			view.Execution.Series[i].QueueWaitP95MS = history.Buckets[view.Execution.Series[i].Start]
 		}
 	}
-	if live.ExecutionOwner == nil || (live.SlotsTotal != nil && *live.SlotsTotal > 0 && !*live.ExecutionOwner) {
+	if live.ExecutionOwner == nil || !*live.ExecutionOwner {
 		view.Service.Status = "degraded"
 	}
 	for _, job := range view.Jobs {
diff --git a/services/core/internal/coremetrics/service_test.go b/services/core/internal/coremetrics/service_test.go
index d582a2827..f901a8c62 100644
--- a/services/core/internal/coremetrics/service_test.go
+++ b/services/core/internal/coremetrics/service_test.go
@@ -25,7 +25,7 @@ func (f *fixtureSource) Live() Live { return f.live }
 func fixtureService(t *testing.T) (*Service, *fixtureSource, time.Time) {
 	t.Helper()
 	now := time.Date(2026, 9, 25, 12, 0, 20, 0, time.UTC)
-	source := &fixtureSource{history: History{Buckets: map[time.Time]*float64{}}, live: Live{ExecutionOwner: ptr(true), SlotsInUse: ptr(int64(2)), SlotsTotal: ptr(int64(4))}}
+	source := &fixtureSource{history: History{Buckets: map[time.Time]*float64{}}, live: Live{ExecutionOwner: ptr(true), SlotsInUse: 2, SlotsTotal: 4}}
 	service, err := New(now.Add(-2*time.Hour), strings.Repeat("a", 40), source, Periodic{ID: "runtime_sampler"}, Periodic{ID: "history_cleanup"}, Periodic{ID: "audit_cleanup"})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/coremetrics/types.go b/services/core/internal/coremetrics/types.go
index f4c132e5c..9aafca860 100644
--- a/services/core/internal/coremetrics/types.go
+++ b/services/core/internal/coremetrics/types.go
@@ -44,13 +44,13 @@ type Pool struct {
 	Max   *int64 `json:"max" extensions:"x-nullable"`
 }
 type Execution struct {
-	SlotsInUse          *int64            `json:"slots_in_use" extensions:"x-nullable"`
-	SlotsTotal          *int64            `json:"slots_total" extensions:"x-nullable"`
+	SlotsInUse          int64             `json:"slots_in_use"`
+	SlotsTotal          int64             `json:"slots_total"`
 	QueuedTurns         *int64            `json:"queued_turns" extensions:"x-nullable"`
 	WaitingForDaemon    *int64            `json:"waiting_for_daemon" extensions:"x-nullable"`
 	InProgressTurns     *int64            `json:"in_progress_turns" extensions:"x-nullable"`
 	OldestQueuedSeconds *float64          `json:"oldest_queued_seconds" extensions:"x-nullable"`
-	ConnectedDaemons    *int64            `json:"connected_daemons" extensions:"x-nullable"`
+	ConnectedDaemons    int64             `json:"connected_daemons"`
 	Interrupted         *int64            `json:"interrupted" extensions:"x-nullable"`
 	Unavailable         *int64            `json:"unavailable" extensions:"x-nullable"`
 	QueueWaitMS         Latency           `json:"queue_wait_ms"`
@@ -104,7 +104,7 @@ type Sample struct {
 	Process                              Process
 }
 type Live struct {
-	SlotsInUse, SlotsTotal, ConnectedDaemons *int64
+	SlotsInUse, SlotsTotal, ConnectedDaemons int64
 	ExecutionOwner                           *bool
 	Pool                                     Pool
 	Scheduler                                Job
diff --git a/services/core/internal/db/queries/runtime_allocations.sql b/services/core/internal/db/queries/runtime_allocations.sql
index fc62d9deb..6902e54ab 100644
--- a/services/core/internal/db/queries/runtime_allocations.sql
+++ b/services/core/internal/db/queries/runtime_allocations.sql
@@ -3,14 +3,14 @@ INSERT INTO runtime_allocations (id, environment_id, device_id, provider_key, no
 VALUES ($1, $2, $3, $4, $5, $6) RETURNING *;
 
 -- name: GetRuntimeAllocation :one
-SELECT sqlc.embed(a), e.session_id, s.tenant_id, s.deleted_at, (CASE WHEN a.compute_phase NOT IN ('disabled', 'running') THEN a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp() ELSE a.node_id IS NULL AND (SELECT mode FROM runtime_deployment) <> 'direct' AND a.kept_at <= clock_timestamp() - interval '1 hour' END)::boolean AS expired
+SELECT sqlc.embed(a), e.session_id, s.tenant_id, s.deleted_at, (a.compute_phase NOT IN ('disabled', 'running') AND a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp())::boolean AS expired
 FROM runtime_allocations a
 JOIN environments e ON e.id = a.environment_id
 JOIN sessions s ON s.id = e.session_id
 WHERE s.tenant_id = $1 AND a.environment_id = $2;
 
 -- name: ListRuntimeAllocations :many
-SELECT sqlc.embed(a), e.session_id, s.tenant_id, s.deleted_at, (CASE WHEN a.compute_phase NOT IN ('disabled', 'running') THEN a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp() ELSE a.node_id IS NULL AND (SELECT mode FROM runtime_deployment) <> 'direct' AND a.kept_at <= clock_timestamp() - interval '1 hour' END)::boolean AS expired
+SELECT sqlc.embed(a), e.session_id, s.tenant_id, s.deleted_at, (a.compute_phase NOT IN ('disabled', 'running') AND a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp())::boolean AS expired
 FROM runtime_allocations a
 JOIN environments e ON e.id = a.environment_id
 JOIN sessions s ON s.id = e.session_id
@@ -32,13 +32,6 @@ LIMIT $2;
 -- name: ObserveRuntimeRunning :one
 UPDATE runtime_allocations SET state = 'running', create_settled = true
 WHERE id = $1 AND state IN ('creating', 'running')
-AND (node_id IS NOT NULL OR (SELECT mode FROM runtime_deployment) = 'direct' OR kept_at > clock_timestamp() - interval '1 hour')
-RETURNING *;
-
--- name: KeepRuntimeAllocation :one
-UPDATE runtime_allocations SET kept_at = clock_timestamp()
-WHERE id = $1 AND state = 'running'
-AND (node_id IS NOT NULL OR (SELECT mode FROM runtime_deployment) = 'direct' OR kept_at > clock_timestamp() - interval '1 hour')
 RETURNING *;
 
 -- name: RequestRuntimeCleanup :one
diff --git a/services/core/internal/db/queries/runtime_lifecycle_nodes.sql b/services/core/internal/db/queries/runtime_lifecycle_nodes.sql
index 334617404..a30354cbd 100644
--- a/services/core/internal/db/queries/runtime_lifecycle_nodes.sql
+++ b/services/core/internal/db/queries/runtime_lifecycle_nodes.sql
@@ -2,11 +2,11 @@
 SELECT n.id FROM runtime_nodes n CROSS JOIN runtime_deployment d
 WHERE n.removed_at IS NULL AND n.installation_id=d.installation_id AND d.mode='nodes'
 UNION ALL
-SELECT NULL::uuid AS id FROM runtime_deployment WHERE mode IN ('','direct')
+SELECT NULL::uuid AS id FROM runtime_deployment WHERE mode = 'direct'
 ORDER BY id;
 
 -- name: ListRuntimeAllocationsForNode :many
-SELECT sqlc.embed(a), e.session_id, s.tenant_id, s.deleted_at, (CASE WHEN a.compute_phase NOT IN ('disabled', 'running') THEN a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp() ELSE a.node_id IS NULL AND (SELECT mode FROM runtime_deployment) <> 'direct' AND a.kept_at <= clock_timestamp() - interval '1 hour' END)::boolean AS expired
+SELECT sqlc.embed(a), e.session_id, s.tenant_id, s.deleted_at, (a.compute_phase NOT IN ('disabled', 'running') AND a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp())::boolean AS expired
 FROM runtime_allocations a
 JOIN environments e ON e.id=a.environment_id
 JOIN sessions s ON s.id=e.session_id
diff --git a/services/core/internal/db/queries/runtime_suspension.sql b/services/core/internal/db/queries/runtime_suspension.sql
index 6a1ccbeef..83b5a38ca 100644
--- a/services/core/internal/db/queries/runtime_suspension.sql
+++ b/services/core/internal/db/queries/runtime_suspension.sql
@@ -3,12 +3,10 @@ UPDATE runtime_allocations
 SET compute_phase_changed_at = CASE WHEN compute_phase = sqlc.arg(phase)::text THEN compute_phase_changed_at ELSE clock_timestamp() END,
     compute_phase = sqlc.arg(phase), compute_state = sqlc.arg(state)::jsonb,
     compute_revision = compute_revision + 1,
-    compute_retained_until = sqlc.narg(retained_until),
-    kept_at = CASE WHEN sqlc.arg(phase)::text = 'running' THEN clock_timestamp() ELSE kept_at END
+    compute_retained_until = sqlc.narg(retained_until)
 WHERE runtime_allocations.id = sqlc.arg(id) AND compute_revision = sqlc.arg(revision)
     AND state = 'running' AND EXISTS (SELECT 1 FROM environments e WHERE e.id = runtime_allocations.environment_id AND e.initialization = 'complete')
-    AND ((compute_phase IN ('disabled','running') AND (node_id IS NOT NULL OR (SELECT mode FROM runtime_deployment) = 'direct' OR kept_at > clock_timestamp() - interval '1 hour'))
-      OR (compute_phase NOT IN ('disabled','running') AND compute_retained_until > clock_timestamp()))
+    AND (compute_phase IN ('disabled','running') OR compute_retained_until > clock_timestamp())
 RETURNING *;
 
 -- name: TouchRuntimeActivity :exec
diff --git a/services/core/internal/db/queries/sandbox_reset.sql b/services/core/internal/db/queries/sandbox_reset.sql
index 5b53b06e5..536219525 100644
--- a/services/core/internal/db/queries/sandbox_reset.sql
+++ b/services/core/internal/db/queries/sandbox_reset.sql
@@ -60,11 +60,10 @@ observed AS MATERIALIZED (SELECT clock_timestamp() AS as_of),
 held AS (
     SELECT a.deployment_generation, a.node_id, s.id AS session_id, e.id AS environment_id, false AS pending,
         (a.state = 'cleanup_pending' OR s.deleted_at IS NOT NULL OR e.status IN ('failed', 'expired')
-         OR CASE WHEN a.compute_phase NOT IN ('disabled', 'running')
-            THEN a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= observed.as_of
-            ELSE a.node_id IS NULL AND d.mode <> 'direct' AND a.kept_at <= observed.as_of - interval '1 hour' END) AS cleanup
+         OR (a.compute_phase NOT IN ('disabled', 'running') AND a.compute_retained_until IS NOT NULL
+            AND a.compute_retained_until <= observed.as_of)) AS cleanup
     FROM runtime_allocations a JOIN environments e ON e.id = a.environment_id
-    JOIN sessions s ON s.id = e.session_id CROSS JOIN deployment d CROSS JOIN observed
+    JOIN sessions s ON s.id = e.session_id CROSS JOIN observed
     WHERE a.state <> 'released'
     UNION ALL
     SELECT p.deployment_generation, p.node_id, s.id, e.id, true, false
diff --git a/services/core/internal/db/sqlc/models.go b/services/core/internal/db/sqlc/models.go
index b5936f30b..d315804dd 100644
--- a/services/core/internal/db/sqlc/models.go
+++ b/services/core/internal/db/sqlc/models.go
@@ -221,7 +221,6 @@ type RuntimeAllocation struct {
 	State                 string             `json:"state"`
 	CreateSettled         bool               `json:"create_settled"`
 	CreatedAt             pgtype.Timestamptz `json:"created_at"`
-	KeptAt                pgtype.Timestamptz `json:"kept_at"`
 	ReleasedAt            pgtype.Timestamptz `json:"released_at"`
 	ComputePhase          string             `json:"compute_phase"`
 	ComputeRevision       int64              `json:"compute_revision"`
diff --git a/services/core/internal/db/sqlc/runtime_allocations.sql.go b/services/core/internal/db/sqlc/runtime_allocations.sql.go
index 0caae4420..4725ab1a1 100644
--- a/services/core/internal/db/sqlc/runtime_allocations.sql.go
+++ b/services/core/internal/db/sqlc/runtime_allocations.sql.go
@@ -13,7 +13,7 @@ import (
 
 const createRuntimeAllocation = `-- name: CreateRuntimeAllocation :one
 INSERT INTO runtime_allocations (id, environment_id, device_id, provider_key, node_id, deployment_generation)
-VALUES ($1, $2, $3, $4, $5, $6) RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, kept_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
+VALUES ($1, $2, $3, $4, $5, $6) RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
 `
 
 type CreateRuntimeAllocationParams struct {
@@ -43,7 +43,6 @@ func (q *Queries) CreateRuntimeAllocation(ctx context.Context, arg CreateRuntime
 		&i.State,
 		&i.CreateSettled,
 		&i.CreatedAt,
-		&i.KeptAt,
 		&i.ReleasedAt,
 		&i.ComputePhase,
 		&i.ComputeRevision,
@@ -60,7 +59,7 @@ func (q *Queries) CreateRuntimeAllocation(ctx context.Context, arg CreateRuntime
 }
 
 const getRuntimeAllocation = `-- name: GetRuntimeAllocation :one
-SELECT a.id, a.environment_id, a.device_id, a.provider_key, a.state, a.create_settled, a.created_at, a.kept_at, a.released_at, a.compute_phase, a.compute_revision, a.compute_state, a.compute_activity_at, a.compute_wake_requested, a.compute_retained_until, a.node_id, a.observation_error, a.compute_phase_changed_at, a.deployment_generation, e.session_id, s.tenant_id, s.deleted_at, (CASE WHEN a.compute_phase NOT IN ('disabled', 'running') THEN a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp() ELSE a.node_id IS NULL AND (SELECT mode FROM runtime_deployment) <> 'direct' AND a.kept_at <= clock_timestamp() - interval '1 hour' END)::boolean AS expired
+SELECT a.id, a.environment_id, a.device_id, a.provider_key, a.state, a.create_settled, a.created_at, a.released_at, a.compute_phase, a.compute_revision, a.compute_state, a.compute_activity_at, a.compute_wake_requested, a.compute_retained_until, a.node_id, a.observation_error, a.compute_phase_changed_at, a.deployment_generation, e.session_id, s.tenant_id, s.deleted_at, (a.compute_phase NOT IN ('disabled', 'running') AND a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp())::boolean AS expired
 FROM runtime_allocations a
 JOIN environments e ON e.id = a.environment_id
 JOIN sessions s ON s.id = e.session_id
@@ -91,7 +90,6 @@ func (q *Queries) GetRuntimeAllocation(ctx context.Context, arg GetRuntimeAlloca
 		&i.RuntimeAllocation.State,
 		&i.RuntimeAllocation.CreateSettled,
 		&i.RuntimeAllocation.CreatedAt,
-		&i.RuntimeAllocation.KeptAt,
 		&i.RuntimeAllocation.ReleasedAt,
 		&i.RuntimeAllocation.ComputePhase,
 		&i.RuntimeAllocation.ComputeRevision,
@@ -111,42 +109,8 @@ func (q *Queries) GetRuntimeAllocation(ctx context.Context, arg GetRuntimeAlloca
 	return i, err
 }
 
-const keepRuntimeAllocation = `-- name: KeepRuntimeAllocation :one
-UPDATE runtime_allocations SET kept_at = clock_timestamp()
-WHERE id = $1 AND state = 'running'
-AND (node_id IS NOT NULL OR (SELECT mode FROM runtime_deployment) = 'direct' OR kept_at > clock_timestamp() - interval '1 hour')
-RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, kept_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
-`
-
-func (q *Queries) KeepRuntimeAllocation(ctx context.Context, id pgtype.UUID) (RuntimeAllocation, error) {
-	row := q.db.QueryRow(ctx, keepRuntimeAllocation, id)
-	var i RuntimeAllocation
-	err := row.Scan(
-		&i.ID,
-		&i.EnvironmentID,
-		&i.DeviceID,
-		&i.ProviderKey,
-		&i.State,
-		&i.CreateSettled,
-		&i.CreatedAt,
-		&i.KeptAt,
-		&i.ReleasedAt,
-		&i.ComputePhase,
-		&i.ComputeRevision,
-		&i.ComputeState,
-		&i.ComputeActivityAt,
-		&i.ComputeWakeRequested,
-		&i.ComputeRetainedUntil,
-		&i.NodeID,
-		&i.ObservationError,
-		&i.ComputePhaseChangedAt,
-		&i.DeploymentGeneration,
-	)
-	return i, err
-}
-
 const listRuntimeAllocations = `-- name: ListRuntimeAllocations :many
-SELECT a.id, a.environment_id, a.device_id, a.provider_key, a.state, a.create_settled, a.created_at, a.kept_at, a.released_at, a.compute_phase, a.compute_revision, a.compute_state, a.compute_activity_at, a.compute_wake_requested, a.compute_retained_until, a.node_id, a.observation_error, a.compute_phase_changed_at, a.deployment_generation, e.session_id, s.tenant_id, s.deleted_at, (CASE WHEN a.compute_phase NOT IN ('disabled', 'running') THEN a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp() ELSE a.node_id IS NULL AND (SELECT mode FROM runtime_deployment) <> 'direct' AND a.kept_at <= clock_timestamp() - interval '1 hour' END)::boolean AS expired
+SELECT a.id, a.environment_id, a.device_id, a.provider_key, a.state, a.create_settled, a.created_at, a.released_at, a.compute_phase, a.compute_revision, a.compute_state, a.compute_activity_at, a.compute_wake_requested, a.compute_retained_until, a.node_id, a.observation_error, a.compute_phase_changed_at, a.deployment_generation, e.session_id, s.tenant_id, s.deleted_at, (a.compute_phase NOT IN ('disabled', 'running') AND a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp())::boolean AS expired
 FROM runtime_allocations a
 JOIN environments e ON e.id = a.environment_id
 JOIN sessions s ON s.id = e.session_id
@@ -179,7 +143,6 @@ func (q *Queries) ListRuntimeAllocations(ctx context.Context, id pgtype.UUID) ([
 			&i.RuntimeAllocation.State,
 			&i.RuntimeAllocation.CreateSettled,
 			&i.RuntimeAllocation.CreatedAt,
-			&i.RuntimeAllocation.KeptAt,
 			&i.RuntimeAllocation.ReleasedAt,
 			&i.RuntimeAllocation.ComputePhase,
 			&i.RuntimeAllocation.ComputeRevision,
@@ -252,8 +215,7 @@ func (q *Queries) ListRuntimeObservationSessions(ctx context.Context, arg ListRu
 const observeRuntimeRunning = `-- name: ObserveRuntimeRunning :one
 UPDATE runtime_allocations SET state = 'running', create_settled = true
 WHERE id = $1 AND state IN ('creating', 'running')
-AND (node_id IS NOT NULL OR (SELECT mode FROM runtime_deployment) = 'direct' OR kept_at > clock_timestamp() - interval '1 hour')
-RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, kept_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
+RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
 `
 
 func (q *Queries) ObserveRuntimeRunning(ctx context.Context, id pgtype.UUID) (RuntimeAllocation, error) {
@@ -267,7 +229,6 @@ func (q *Queries) ObserveRuntimeRunning(ctx context.Context, id pgtype.UUID) (Ru
 		&i.State,
 		&i.CreateSettled,
 		&i.CreatedAt,
-		&i.KeptAt,
 		&i.ReleasedAt,
 		&i.ComputePhase,
 		&i.ComputeRevision,
@@ -285,7 +246,7 @@ func (q *Queries) ObserveRuntimeRunning(ctx context.Context, id pgtype.UUID) (Ru
 
 const releaseRuntimeAllocation = `-- name: ReleaseRuntimeAllocation :one
 UPDATE runtime_allocations SET state = 'released', released_at = clock_timestamp()
-WHERE id = $1 AND state = 'cleanup_pending' AND create_settled RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, kept_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
+WHERE id = $1 AND state = 'cleanup_pending' AND create_settled RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
 `
 
 func (q *Queries) ReleaseRuntimeAllocation(ctx context.Context, id pgtype.UUID) (RuntimeAllocation, error) {
@@ -299,7 +260,6 @@ func (q *Queries) ReleaseRuntimeAllocation(ctx context.Context, id pgtype.UUID)
 		&i.State,
 		&i.CreateSettled,
 		&i.CreatedAt,
-		&i.KeptAt,
 		&i.ReleasedAt,
 		&i.ComputePhase,
 		&i.ComputeRevision,
@@ -317,7 +277,7 @@ func (q *Queries) ReleaseRuntimeAllocation(ctx context.Context, id pgtype.UUID)
 
 const requestRuntimeCleanup = `-- name: RequestRuntimeCleanup :one
 UPDATE runtime_allocations SET state = 'cleanup_pending'
-WHERE id = $1 AND state <> 'released' RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, kept_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
+WHERE id = $1 AND state <> 'released' RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
 `
 
 func (q *Queries) RequestRuntimeCleanup(ctx context.Context, id pgtype.UUID) (RuntimeAllocation, error) {
@@ -331,7 +291,6 @@ func (q *Queries) RequestRuntimeCleanup(ctx context.Context, id pgtype.UUID) (Ru
 		&i.State,
 		&i.CreateSettled,
 		&i.CreatedAt,
-		&i.KeptAt,
 		&i.ReleasedAt,
 		&i.ComputePhase,
 		&i.ComputeRevision,
@@ -349,7 +308,7 @@ func (q *Queries) RequestRuntimeCleanup(ctx context.Context, id pgtype.UUID) (Ru
 
 const settleRuntimeCreation = `-- name: SettleRuntimeCreation :one
 UPDATE runtime_allocations SET create_settled = true
-WHERE id = $1 AND state <> 'released' RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, kept_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
+WHERE id = $1 AND state <> 'released' RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
 `
 
 func (q *Queries) SettleRuntimeCreation(ctx context.Context, id pgtype.UUID) (RuntimeAllocation, error) {
@@ -363,7 +322,6 @@ func (q *Queries) SettleRuntimeCreation(ctx context.Context, id pgtype.UUID) (Ru
 		&i.State,
 		&i.CreateSettled,
 		&i.CreatedAt,
-		&i.KeptAt,
 		&i.ReleasedAt,
 		&i.ComputePhase,
 		&i.ComputeRevision,
diff --git a/services/core/internal/db/sqlc/runtime_lifecycle_nodes.sql.go b/services/core/internal/db/sqlc/runtime_lifecycle_nodes.sql.go
index e4bc7dae0..c1f443347 100644
--- a/services/core/internal/db/sqlc/runtime_lifecycle_nodes.sql.go
+++ b/services/core/internal/db/sqlc/runtime_lifecycle_nodes.sql.go
@@ -50,7 +50,7 @@ func (q *Queries) GetRuntimeLifecyclePlacement(ctx context.Context, arg GetRunti
 }
 
 const listRuntimeAllocationsForNode = `-- name: ListRuntimeAllocationsForNode :many
-SELECT a.id, a.environment_id, a.device_id, a.provider_key, a.state, a.create_settled, a.created_at, a.kept_at, a.released_at, a.compute_phase, a.compute_revision, a.compute_state, a.compute_activity_at, a.compute_wake_requested, a.compute_retained_until, a.node_id, a.observation_error, a.compute_phase_changed_at, a.deployment_generation, e.session_id, s.tenant_id, s.deleted_at, (CASE WHEN a.compute_phase NOT IN ('disabled', 'running') THEN a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp() ELSE a.node_id IS NULL AND (SELECT mode FROM runtime_deployment) <> 'direct' AND a.kept_at <= clock_timestamp() - interval '1 hour' END)::boolean AS expired
+SELECT a.id, a.environment_id, a.device_id, a.provider_key, a.state, a.create_settled, a.created_at, a.released_at, a.compute_phase, a.compute_revision, a.compute_state, a.compute_activity_at, a.compute_wake_requested, a.compute_retained_until, a.node_id, a.observation_error, a.compute_phase_changed_at, a.deployment_generation, e.session_id, s.tenant_id, s.deleted_at, (a.compute_phase NOT IN ('disabled', 'running') AND a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= clock_timestamp())::boolean AS expired
 FROM runtime_allocations a
 JOIN environments e ON e.id=a.environment_id
 JOIN sessions s ON s.id=e.session_id
@@ -89,7 +89,6 @@ func (q *Queries) ListRuntimeAllocationsForNode(ctx context.Context, arg ListRun
 			&i.RuntimeAllocation.State,
 			&i.RuntimeAllocation.CreateSettled,
 			&i.RuntimeAllocation.CreatedAt,
-			&i.RuntimeAllocation.KeptAt,
 			&i.RuntimeAllocation.ReleasedAt,
 			&i.RuntimeAllocation.ComputePhase,
 			&i.RuntimeAllocation.ComputeRevision,
@@ -120,7 +119,7 @@ const listRuntimeLifecycleNodes = `-- name: ListRuntimeLifecycleNodes :many
 SELECT n.id FROM runtime_nodes n CROSS JOIN runtime_deployment d
 WHERE n.removed_at IS NULL AND n.installation_id=d.installation_id AND d.mode='nodes'
 UNION ALL
-SELECT NULL::uuid AS id FROM runtime_deployment WHERE mode IN ('','direct')
+SELECT NULL::uuid AS id FROM runtime_deployment WHERE mode = 'direct'
 ORDER BY id
 `
 
diff --git a/services/core/internal/db/sqlc/runtime_suspension.sql.go b/services/core/internal/db/sqlc/runtime_suspension.sql.go
index ed6b5bb50..8b01bf155 100644
--- a/services/core/internal/db/sqlc/runtime_suspension.sql.go
+++ b/services/core/internal/db/sqlc/runtime_suspension.sql.go
@@ -109,13 +109,11 @@ UPDATE runtime_allocations
 SET compute_phase_changed_at = CASE WHEN compute_phase = $1::text THEN compute_phase_changed_at ELSE clock_timestamp() END,
     compute_phase = $1, compute_state = $2::jsonb,
     compute_revision = compute_revision + 1,
-    compute_retained_until = $3,
-    kept_at = CASE WHEN $1::text = 'running' THEN clock_timestamp() ELSE kept_at END
+    compute_retained_until = $3
 WHERE runtime_allocations.id = $4 AND compute_revision = $5
     AND state = 'running' AND EXISTS (SELECT 1 FROM environments e WHERE e.id = runtime_allocations.environment_id AND e.initialization = 'complete')
-    AND ((compute_phase IN ('disabled','running') AND (node_id IS NOT NULL OR (SELECT mode FROM runtime_deployment) = 'direct' OR kept_at > clock_timestamp() - interval '1 hour'))
-      OR (compute_phase NOT IN ('disabled','running') AND compute_retained_until > clock_timestamp()))
-RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, kept_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
+    AND (compute_phase IN ('disabled','running') OR compute_retained_until > clock_timestamp())
+RETURNING id, environment_id, device_id, provider_key, state, create_settled, created_at, released_at, compute_phase, compute_revision, compute_state, compute_activity_at, compute_wake_requested, compute_retained_until, node_id, observation_error, compute_phase_changed_at, deployment_generation
 `
 
 type SetRuntimeComputeParams struct {
@@ -143,7 +141,6 @@ func (q *Queries) SetRuntimeCompute(ctx context.Context, arg SetRuntimeComputePa
 		&i.State,
 		&i.CreateSettled,
 		&i.CreatedAt,
-		&i.KeptAt,
 		&i.ReleasedAt,
 		&i.ComputePhase,
 		&i.ComputeRevision,
diff --git a/services/core/internal/db/sqlc/sandbox_reset.sql.go b/services/core/internal/db/sqlc/sandbox_reset.sql.go
index 8929d242b..8b1d18f72 100644
--- a/services/core/internal/db/sqlc/sandbox_reset.sql.go
+++ b/services/core/internal/db/sqlc/sandbox_reset.sql.go
@@ -55,11 +55,10 @@ observed AS MATERIALIZED (SELECT clock_timestamp() AS as_of),
 held AS (
     SELECT a.deployment_generation, a.node_id, s.id AS session_id, e.id AS environment_id, false AS pending,
         (a.state = 'cleanup_pending' OR s.deleted_at IS NOT NULL OR e.status IN ('failed', 'expired')
-         OR CASE WHEN a.compute_phase NOT IN ('disabled', 'running')
-            THEN a.compute_retained_until IS NOT NULL AND a.compute_retained_until <= observed.as_of
-            ELSE a.node_id IS NULL AND d.mode <> 'direct' AND a.kept_at <= observed.as_of - interval '1 hour' END) AS cleanup
+         OR (a.compute_phase NOT IN ('disabled', 'running') AND a.compute_retained_until IS NOT NULL
+            AND a.compute_retained_until <= observed.as_of)) AS cleanup
     FROM runtime_allocations a JOIN environments e ON e.id = a.environment_id
-    JOIN sessions s ON s.id = e.session_id CROSS JOIN deployment d CROSS JOIN observed
+    JOIN sessions s ON s.id = e.session_id CROSS JOIN observed
     WHERE a.state <> 'released'
     UNION ALL
     SELECT p.deployment_generation, p.node_id, s.id, e.id, true, false
diff --git a/services/core/internal/deployment/allocation.go b/services/core/internal/deployment/allocation.go
index c825dda4f..02324ff49 100644
--- a/services/core/internal/deployment/allocation.go
+++ b/services/core/internal/deployment/allocation.go
@@ -33,10 +33,10 @@ type Allocation struct {
 	// Replayed reports that ReserveAllocation returned an existing allocation,
 	// which never authorizes another Create.
 	Replayed bool
-	// Expired reports, by the database clock, that the allocation's lease or
-	// retention has passed.
-	Expired           bool
-	CreatedAt, KeptAt time.Time
+	// Expired reports, by the database clock, that the retention of the
+	// allocation's suspended compute has passed.
+	Expired   bool
+	CreatedAt time.Time
 }
 
 // Key names the allocation's Environment.
diff --git a/services/core/internal/deployment/allocations.go b/services/core/internal/deployment/allocations.go
index 2d10c6c1d..916e2e364 100644
--- a/services/core/internal/deployment/allocations.go
+++ b/services/core/internal/deployment/allocations.go
@@ -99,11 +99,16 @@ func (e *ExecutionOperations) ObserveRunning(ctx context.Context, owner Allocati
 	})
 }
 
-// KeepAllocation follows an authenticated connection and a successful
-// provider observation. A keepalive never revives cleanup or an expired lease.
-func (e *ExecutionOperations) KeepAllocation(ctx context.Context, owner Allocation) (Allocation, error) {
-	return e.change(ctx, owner, true, func(tx AllocationTx, current Allocation) (Allocation, error) {
-		return tx.Keep(current)
+// CheckRunning returns the stored allocation while it is still the owner's
+// running compute: its Session undeleted and bound to the allocation's
+// device. It follows an authenticated connection and a successful provider
+// observation and changes nothing.
+func (e *ExecutionOperations) CheckRunning(ctx context.Context, owner Allocation) (Allocation, error) {
+	return e.change(ctx, owner, true, func(_ AllocationTx, current Allocation) (Allocation, error) {
+		if current.State != "running" {
+			return Allocation{}, ErrAllocationConflict
+		}
+		return current, nil
 	})
 }
 
diff --git a/services/core/internal/deployment/allocations_test.go b/services/core/internal/deployment/allocations_test.go
index 14be17800..dcbfa2a4e 100644
--- a/services/core/internal/deployment/allocations_test.go
+++ b/services/core/internal/deployment/allocations_test.go
@@ -81,7 +81,6 @@ type fakeAllocationTx struct {
 	loadAllocation    func() (Allocation, error)
 	loadSessionDevice func() (SessionDevice, bool, error)
 	settleCreation    func(Allocation) (Allocation, error)
-	keep              func(Allocation) (Allocation, error)
 	release           func(Allocation) (Allocation, error)
 }
 
@@ -114,13 +113,6 @@ func (f *fakeAllocationTx) ObserveRunning(Allocation) (Allocation, error) {
 	return Allocation{}, nil
 }
 
-func (f *fakeAllocationTx) Keep(current Allocation) (Allocation, error) {
-	if f.keep == nil {
-		unexpected(f.t, "Keep")
-	}
-	return f.keep(current)
-}
-
 func (f *fakeAllocationTx) SettleCreation(current Allocation) (Allocation, error) {
 	if f.settleCreation == nil {
 		unexpected(f.t, "SettleCreation")
@@ -316,7 +308,11 @@ func TestReserveAllocationReplaysBeforeAdmission(t *testing.T) {
 func TestReserveAllocationAdmitsAndTakesTheReservedNode(t *testing.T) {
 	key := AllocationKey{TenantID: uuid.NewString(), EnvironmentID: uuid.NewString()}
 	installation, node := uuid.NewString(), uuid.NewString()
-	deployment := placement.Deployment{InstallationID: installation, Mode: "nodes", Generation: 7}
+	specification, err := json.Marshal(testSpecification("docker"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	deployment := placement.Deployment{InstallationID: installation, Provider: "docker", Mode: "nodes", Generation: 7, Specification: specification}
 	fresh := func() *fakeReservationTx {
 		return &fakeReservationTx{t: t, loadEnvironment: hostedEnvironment(key.EnvironmentID),
 			findAllocation: func() (Allocation, bool, error) { return Allocation{}, false, nil },
@@ -363,10 +359,10 @@ func TestReserveAllocationAdmitsAndTakesTheReservedNode(t *testing.T) {
 }
 
 // A live change needs the Session undeleted and bound to the allocation's
-// device; settlement continues for a deleted Session. Any other owner is a
-// conflict.
+// device; settlement continues for a deleted Session. Any other owner, or
+// compute that no longer runs, is a conflict.
 func TestAllocationChangesCheckTheOwner(t *testing.T) {
-	owner := Allocation{ID: uuid.NewString(), DeviceID: uuid.NewString(), EnvironmentID: uuid.NewString(), TenantID: uuid.NewString(), ProviderKey: uuid.NewString()}
+	owner := Allocation{ID: uuid.NewString(), DeviceID: uuid.NewString(), EnvironmentID: uuid.NewString(), TenantID: uuid.NewString(), ProviderKey: uuid.NewString(), State: "running"}
 	stored := func(current Allocation) func() (Allocation, error) {
 		return func() (Allocation, error) { return current, nil }
 	}
@@ -377,7 +373,7 @@ func TestAllocationChangesCheckTheOwner(t *testing.T) {
 	}
 	deleted := owner
 	deleted.SessionDeleted = true
-	if _, err := allocationOperations(t, nil, sessions.LockedSession{}, &fakeAllocationTx{t: t, loadAllocation: stored(deleted)}).KeepAllocation(t.Context(), owner); !errors.Is(err, sessions.ErrNotFound) {
+	if _, err := allocationOperations(t, nil, sessions.LockedSession{}, &fakeAllocationTx{t: t, loadAllocation: stored(deleted)}).CheckRunning(t.Context(), owner); !errors.Is(err, sessions.ErrNotFound) {
 		t.Fatal("a deleted Session kept its allocation", err)
 	}
 	settled := &fakeAllocationTx{t: t, loadAllocation: stored(deleted), settleCreation: func(current Allocation) (Allocation, error) {
@@ -390,9 +386,20 @@ func TestAllocationChangesCheckTheOwner(t *testing.T) {
 	unbound := &fakeAllocationTx{t: t, loadAllocation: stored(owner), loadSessionDevice: func() (SessionDevice, bool, error) {
 		return SessionDevice{ID: uuid.NewString(), EnvironmentID: owner.EnvironmentID}, true, nil
 	}}
-	if _, err := allocationOperations(t, nil, sessions.LockedSession{}, unbound).KeepAllocation(t.Context(), owner); !errors.Is(err, ErrAllocationConflict) {
+	if _, err := allocationOperations(t, nil, sessions.LockedSession{}, unbound).CheckRunning(t.Context(), owner); !errors.Is(err, ErrAllocationConflict) {
 		t.Fatal("a Session bound to another device kept the allocation", err)
 	}
+	bound := func() (SessionDevice, bool, error) {
+		return SessionDevice{ID: owner.DeviceID, EnvironmentID: owner.EnvironmentID}, true, nil
+	}
+	cleanup := owner
+	cleanup.State = "cleanup_pending"
+	if _, err := allocationOperations(t, nil, sessions.LockedSession{}, &fakeAllocationTx{t: t, loadAllocation: stored(cleanup), loadSessionDevice: bound}).CheckRunning(t.Context(), owner); !errors.Is(err, ErrAllocationConflict) {
+		t.Fatal("cleanup kept the allocation running", err)
+	}
+	if current, err := allocationOperations(t, nil, sessions.LockedSession{}, &fakeAllocationTx{t: t, loadAllocation: stored(owner), loadSessionDevice: bound}).CheckRunning(t.Context(), owner); err != nil || current.ID != owner.ID {
+		t.Fatal("the owner's running allocation", current, err)
+	}
 }
 
 // SetCompute rejects an invalid phase change before it reaches storage.
diff --git a/services/core/internal/deployment/execution.go b/services/core/internal/deployment/execution.go
index b91abceb3..ee57e97be 100644
--- a/services/core/internal/deployment/execution.go
+++ b/services/core/internal/deployment/execution.go
@@ -39,18 +39,8 @@ func (e *ExecutionOperations) Claim(ctx context.Context, installationID string)
 		if err != nil {
 			return err
 		}
-		if d.InstallationID != "" {
-			if d.InstallationID != id {
-				return ErrConflict
-			}
-		} else {
-			resources, err := tx.CountResources()
-			if err != nil {
-				return err
-			}
-			if resources.Allocations != 0 || resources.Pending != 0 {
-				return ErrConflict
-			}
+		if d.InstallationID != "" && d.InstallationID != id {
+			return ErrConflict
 		}
 		if d.Provider != "" {
 			if _, err := e.service.specification(d); err != nil {
@@ -61,21 +51,6 @@ func (e *ExecutionOperations) Claim(ctx context.Context, installationID string)
 	})
 }
 
-// RequireUnclaimed lets an execution owner without sandbox runtimes start
-// only on a deployment no installation has claimed.
-func (e *ExecutionOperations) RequireUnclaimed(ctx context.Context) error {
-	return e.storage.WithDeployment(ctx, func(tx DeploymentTx) error {
-		d, err := tx.LoadDeployment()
-		if err != nil {
-			return err
-		}
-		if d.InstallationID != "" {
-			return ErrConflict
-		}
-		return nil
-	})
-}
-
 // CheckSetup rejects a stale or reset deployment before provider preparation.
 // Initialize repeats the check in its committing transaction.
 func (e *ExecutionOperations) CheckSetup(ctx context.Context, installation string, input sandbox.Selection) error {
diff --git a/services/core/internal/deployment/placement/placement.go b/services/core/internal/deployment/placement/placement.go
index 2a8b0ad55..28371a52e 100644
--- a/services/core/internal/deployment/placement/placement.go
+++ b/services/core/internal/deployment/placement/placement.go
@@ -29,8 +29,10 @@ var (
 	// generation and at least one is preparing it.
 	ErrNodesPreparing = errors.New("sandbox nodes are preparing the target generation")
 	// ErrNodeUnavailable reports a sandbox node that is offline, unready or
-	// full, or no node at all.
+	// full, no node at all, or a deployment without a provider.
 	ErrNodeUnavailable = errors.New("sandbox node unavailable")
+	// ErrPublicURLRequired rejects rules without the installation public URL.
+	ErrPublicURLRequired = errors.New("placement rules require the installation public URL")
 )
 
 // Declarations are the provider declarations placement reads.
@@ -56,6 +58,9 @@ func NewRules(declarations Declarations, publicURL string) (*Rules, error) {
 	if declarations == nil {
 		return nil, errors.New("placement rules require provider declarations")
 	}
+	if publicURL == "" {
+		return nil, ErrPublicURLRequired
+	}
 	return &Rules{declarations: declarations, publicURL: publicURL}, nil
 }
 
@@ -66,7 +71,8 @@ func (r *Rules) PublicURL() string { return r.publicURL }
 // Deployment is the deployment as placement reads it, loaded under the
 // deployment lock.
 type Deployment struct {
-	// InstallationID is empty until Web setup claims an installation.
+	// InstallationID is empty until the execution owner claims the
+	// installation at startup.
 	InstallationID string
 	Provider, Mode string
 	Generation     uint64
@@ -128,19 +134,17 @@ func (r *Rules) CheckPublicOrigin(provider string) error {
 
 // CheckAdmission admits new hosted work on the deployment. installation is
 // the canonical installation the work was provisioned for, or empty for a new
-// Session. An unclaimed deployment admits everything.
+// Session. Only a claimed deployment with a provider admits hosted work.
 func (r *Rules) CheckAdmission(d Deployment, installation string) error {
-	if d.InstallationID == "" {
-		return nil
+	if d.InstallationID == "" || d.Provider == "" {
+		return ErrNodeUnavailable
 	}
 	if d.Resetting {
 		return ErrResetAdmission
 	}
-	if d.Provider != "" {
-		var spec sandbox.DeploymentSpec
-		if json.Unmarshal(d.Specification, &spec) != nil || r.declarations.ValidateSpecification(d.Provider, spec) != nil {
-			return fmt.Errorf("%w: sandbox creation requires a deployment specification", ErrAdmissionClosed)
-		}
+	var spec sandbox.DeploymentSpec
+	if json.Unmarshal(d.Specification, &spec) != nil || r.declarations.ValidateSpecification(d.Provider, spec) != nil {
+		return fmt.Errorf("%w: sandbox creation requires a deployment specification", ErrAdmissionClosed)
 	}
 	if installation != "" && installation != d.InstallationID {
 		return fmt.Errorf("%w: sandbox installation does not match deployment", ErrAdmissionClosed)
@@ -149,30 +153,24 @@ func (r *Rules) CheckAdmission(d Deployment, installation string) error {
 }
 
 // DecidePlacement chooses the node a new Session's hosted Environment
-// reserves, or nil when the deployment places no node: in direct mode and
-// without a provider. It prefers the highest ready generation, then the
-// fewest active sandboxes. It places only on nodes enrolled with the public
-// URL; restores still reach the others.
+// reserves, or nil in direct mode, which places no node. It prefers the
+// highest ready generation, then the fewest active sandboxes. It places only
+// on nodes enrolled with the public URL; restores still reach the others.
 func (r *Rules) DecidePlacement(d Deployment, nodes []Node) (*Placement, error) {
 	if d.Resetting {
 		return nil, ErrResetAdmission
 	}
+	if d.Provider == "" {
+		return nil, ErrNodeUnavailable
+	}
 	// A changed installation address cannot admit guests that require a
 	// public origin. Existing owned resources remain available for cleanup.
-	if d.Provider != "" {
-		if err := r.CheckPublicOrigin(d.Provider); err != nil {
-			return nil, err
-		}
+	if err := r.CheckPublicOrigin(d.Provider); err != nil {
+		return nil, err
 	}
 	if d.Mode == "direct" {
 		return nil, nil
 	}
-	if d.Provider == "" {
-		if d.InstallationID != "" {
-			return nil, ErrNodeUnavailable
-		}
-		return nil, nil
-	}
 	var chosen *Node
 	preparing := false
 	for i := range nodes {
diff --git a/services/core/internal/deployment/placement/placement_test.go b/services/core/internal/deployment/placement/placement_test.go
index e60242f4d..473c343bb 100644
--- a/services/core/internal/deployment/placement/placement_test.go
+++ b/services/core/internal/deployment/placement/placement_test.go
@@ -46,10 +46,13 @@ func rules(t *testing.T, declarations Declarations, url string) *Rules {
 
 func generation(value uint64) *uint64 { return &value }
 
-func TestNewRulesRequiresDeclarations(t *testing.T) {
+func TestNewRulesRequiresDeclarationsAndPublicURL(t *testing.T) {
 	if _, err := NewRules(nil, publicURL); err == nil {
 		t.Fatal("NewRules accepted nil declarations")
 	}
+	if _, err := NewRules(&fakeDeclarations{t: t}, ""); !errors.Is(err, ErrPublicURLRequired) {
+		t.Fatalf("NewRules without a public URL = %v", err)
+	}
 	if got := rules(t, &fakeDeclarations{t: t}, publicURL).PublicURL(); got != publicURL {
 		t.Fatalf("PublicURL = %q", got)
 	}
@@ -93,14 +96,14 @@ func TestCheckAdmission(t *testing.T) {
 		want         error
 		message      string
 	}{
-		"unclaimed admits everything": {Deployment{Resetting: true}, installation, nil, ""},
-		"admitted":                    {valid, installation, nil, ""},
-		"new Session":                 {valid, "", nil, ""},
-		"reset":                       {with(func(d *Deployment) { d.Resetting = true }), installation, ErrResetAdmission, "hosted admission is paused for a sandbox reset"},
-		"malformed specification":     {with(func(d *Deployment) { d.Specification = json.RawMessage(`[`) }), installation, ErrAdmissionClosed, "environment is no longer available: sandbox creation requires a deployment specification"},
-		"rejected specification":      {with(func(d *Deployment) { d.Specification = json.RawMessage(`{"resources":{"cpus":3}}`) }), installation, ErrAdmissionClosed, "environment is no longer available: sandbox creation requires a deployment specification"},
-		"no provider":                 {with(func(d *Deployment) { d.Provider, d.Specification = "", json.RawMessage(`[`) }), installation, nil, ""},
-		"other installation":          {valid, uuid.NewString(), ErrAdmissionClosed, "environment is no longer available: sandbox installation does not match deployment"},
+		"unclaimed":               {with(func(d *Deployment) { d.InstallationID = "" }), "", ErrNodeUnavailable, "sandbox node unavailable"},
+		"no provider":             {with(func(d *Deployment) { d.Provider, d.Specification = "", json.RawMessage(`[`) }), "", ErrNodeUnavailable, "sandbox node unavailable"},
+		"admitted":                {valid, installation, nil, ""},
+		"new Session":             {valid, "", nil, ""},
+		"reset":                   {with(func(d *Deployment) { d.Resetting = true }), installation, ErrResetAdmission, "hosted admission is paused for a sandbox reset"},
+		"malformed specification": {with(func(d *Deployment) { d.Specification = json.RawMessage(`[`) }), installation, ErrAdmissionClosed, "environment is no longer available: sandbox creation requires a deployment specification"},
+		"rejected specification":  {with(func(d *Deployment) { d.Specification = json.RawMessage(`{"resources":{"cpus":3}}`) }), installation, ErrAdmissionClosed, "environment is no longer available: sandbox creation requires a deployment specification"},
+		"other installation":      {valid, uuid.NewString(), ErrAdmissionClosed, "environment is no longer available: sandbox installation does not match deployment"},
 	} {
 		err := rules(t, declarations, publicURL).CheckAdmission(test.d, test.installation)
 		if !errors.Is(err, test.want) || (test.want == nil) != (err == nil) || (err != nil && err.Error() != test.message) {
@@ -139,8 +142,8 @@ func TestDecidePlacement(t *testing.T) {
 		"reset":                       {origin(false), publicURL, with(func(d *Deployment) { d.Resetting = true }), nil, nil, ErrResetAdmission},
 		"loopback public origin":      {origin(true), "http://localhost:8091", nodes, []Node{ready("a", 1, 0)}, nil, ErrPublicURLUnreachable},
 		"direct":                      {origin(false), publicURL, with(func(d *Deployment) { d.Mode = "direct" }), nil, nil, nil},
-		"no provider":                 {&fakeDeclarations{t: t}, publicURL, Deployment{}, nil, nil, nil},
-		"no provider on Web":          {&fakeDeclarations{t: t}, publicURL, Deployment{InstallationID: "installation"}, nil, nil, ErrNodeUnavailable},
+		"unclaimed":                   {&fakeDeclarations{t: t}, publicURL, Deployment{}, nil, nil, ErrNodeUnavailable},
+		"no provider":                 {&fakeDeclarations{t: t}, publicURL, Deployment{InstallationID: "installation"}, nil, nil, ErrNodeUnavailable},
 		"no nodes":                    {origin(false), publicURL, nodes, nil, nil, ErrNodeUnavailable},
 		"only ineligible nodes":       {origin(false), publicURL, nodes, []Node{offline, unready, full, retainedFull, elsewhere, {ID: "never", Online: true, ServingReady: true, MaxActive: 1, MaxRetained: 1, CoreURL: publicURL}}, nil, ErrNodeUnavailable},
 		"preparing":                   {origin(false), publicURL, nodes, []Node{offline, preparing}, nil, ErrNodesPreparing},
diff --git a/services/core/internal/deployment/storage.go b/services/core/internal/deployment/storage.go
index c1f17785a..2eb526b14 100644
--- a/services/core/internal/deployment/storage.go
+++ b/services/core/internal/deployment/storage.go
@@ -114,8 +114,6 @@ type AllocationTx interface {
 	LoadRestore(current Allocation) (placement.Restore, error)
 	// ObserveRunning records the allocation running with its creation settled.
 	ObserveRunning(current Allocation) (Allocation, error)
-	// Keep renews the allocation's lease.
-	Keep(current Allocation) (Allocation, error)
 	// SettleCreation records that the original Create can no longer change
 	// resources.
 	SettleCreation(current Allocation) (Allocation, error)
diff --git a/services/core/internal/execution/deployment_provider_observations_test.go b/services/core/internal/execution/deployment_provider_observations_test.go
index 440da13b2..9d769cf31 100644
--- a/services/core/internal/execution/deployment_provider_observations_test.go
+++ b/services/core/internal/execution/deployment_provider_observations_test.go
@@ -1,7 +1,6 @@
 package execution
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -11,7 +10,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
@@ -47,10 +45,7 @@ func newFinishObservationFixture(t *testing.T, maxConnections int32) finishObser
 		t.Fatal(err)
 	}
 	t.Cleanup(pool.Close)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{8}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
+	cipher := pgtest.CredentialKey(t)
 	defaults := modelconfigurationpg.New(pgunit.NewPool(pool), cipher)
 	service, err := modelconfiguration.NewService(defaults)
 	if err != nil {
diff --git a/services/core/internal/execution/dispatcher.go b/services/core/internal/execution/dispatcher.go
index 909fb9702..6364a9ae9 100644
--- a/services/core/internal/execution/dispatcher.go
+++ b/services/core/internal/execution/dispatcher.go
@@ -49,7 +49,8 @@ type Dispatcher struct {
 	Sessions *sessions.Service
 	// SessionsReader serves the plain Session reads. It is required.
 	SessionsReader sessions.Reader
-	// ManagedRuntimes is optional internal provisioning; it does not admit hosted API requests.
+	// ManagedRuntimes provisions hosted Environments on the sandbox deployment.
+	// It is required.
 	ManagedRuntimes *RuntimeProvider
 	// MaxConcurrentExecutions bounds work admitted by this Core execution owner.
 	// Zero uses DefaultExecutionConcurrency. It is independent of sandbox capacity.
diff --git a/services/core/internal/execution/environment_admission.go b/services/core/internal/execution/environment_admission.go
index 52d1c3b05..474e0fb70 100644
--- a/services/core/internal/execution/environment_admission.go
+++ b/services/core/internal/execution/environment_admission.go
@@ -33,9 +33,6 @@ func (w *Worker) validateEnvironmentAdmission(ctx context.Context, engine string
 			return sessions.ErrInvalidInput
 		}
 	case "openai_hosted":
-		if w.runtimes == nil {
-			return ErrExecutionUnavailable
-		}
 		ready, err := w.runtimes.ensureDeployment(ctx)
 		if err != nil {
 			return err
diff --git a/services/core/internal/execution/environment_directory.go b/services/core/internal/execution/environment_directory.go
index 5d1286efb..34a533197 100644
--- a/services/core/internal/execution/environment_directory.go
+++ b/services/core/internal/execution/environment_directory.go
@@ -58,9 +58,6 @@ func (w *Worker) ReadEnvironmentDirectory(ctx context.Context, environment sessi
 func (w *Worker) runDirectoryRead(owner context.Context, request directoryReadRequest, reserved bool) (result directoryReadResult) {
 	result.err = ErrExecutionUnavailable
 	defer func() {
-		if w.runtimes == nil {
-			return
-		}
 		touch, stop := context.WithTimeout(context.WithoutCancel(owner), 5*time.Second)
 		defer stop()
 		if err := w.dispatcher.Deployment.TouchActivity(touch, request.environment.TenantID, request.environment.ID); err != nil {
diff --git a/services/core/internal/execution/owner_test.go b/services/core/internal/execution/owner_test.go
index e7e577f9e..4f7fccfa9 100644
--- a/services/core/internal/execution/owner_test.go
+++ b/services/core/internal/execution/owner_test.go
@@ -65,6 +65,12 @@ func unusedSessions(t *testing.T) (*sessions.Service, sessions.Reader) {
 	return service, struct{ sessions.Reader }{}
 }
 
+// unusedRuntimes is a runtime provider for a new installation whose
+// deployment no operator has configured.
+func unusedRuntimes(t *testing.T) *RuntimeProvider {
+	return NewDeferredRuntimeProvider(uuid.NewString(), func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t))
+}
+
 // unusedObserver fails the test on any observation. The Workers it serves run
 // no Turn.
 type unusedObserver struct{ t *testing.T }
@@ -118,24 +124,29 @@ func TestStartWorkerFailureClosesLeaseOnce(t *testing.T) {
 			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service}, Owner{Lease: lease})
 			return err
 		},
-		"missing Session operations": func(t *testing.T, lease *closeCountingLease) error {
+		"missing runtime provider": func(t *testing.T, lease *closeCountingLease) error {
 			_, deployments, deploymentReader := resetManager(t)
 			service, reader := unusedSessions(t)
 			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Lease: lease})
 			return err
 		},
+		"missing Session operations": func(t *testing.T, lease *closeCountingLease) error {
+			_, deployments, deploymentReader := resetManager(t)
+			service, reader := unusedSessions(t)
+			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: unusedRuntimes(t)}, Owner{Lease: lease})
+			return err
+		},
 		"missing deployment": func(t *testing.T, lease *closeCountingLease) error {
 			owner, deployments, deploymentReader := resetManager(t)
 			service, reader := unusedSessions(t)
-			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{Lease: lease, Sessions: owner.Sessions})
+			_, err := StartWorker(canceled, &Dispatcher{Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: unusedRuntimes(t)}, Owner{Lease: lease, Sessions: owner.Sessions})
 			return err
 		},
 		"deployment claim": func(t *testing.T, lease *closeCountingLease) error {
 			owner, deployments, deploymentReader := resetManager(t)
 			lease.inner = owner.Lease
-			id := uuid.NewString()
 			service, reader := unusedSessions(t)
-			dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t))}
+			dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: unusedRuntimes(t)}
 			_, err := StartWorker(canceled, dispatcher, Owner{Lease: lease, Deployment: owner.Deployment, Sessions: owner.Sessions})
 			if ping := owner.Lease.CheckOwnership(t.Context()); !errors.Is(ping, pgunit.ErrLeaseClosed) {
 				t.Error("failed start kept the database lease", ping)
@@ -160,6 +171,7 @@ func TestStartWorkerChecksDeploymentAfterItsDependencies(t *testing.T) {
 	owner, deployments, deploymentReader := resetManager(t)
 	credentials, observer := &recordingCredentials{}, unusedObserver{t}
 	service, reader := unusedSessions(t)
+	runtimes := unusedRuntimes(t)
 	bound := Owner{Sessions: owner.Sessions}
 	for _, test := range []struct {
 		name       string
@@ -173,8 +185,9 @@ func TestStartWorkerChecksDeploymentAfterItsDependencies(t *testing.T) {
 		{"missing deployment reader", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments}, bound, "execution worker requires the deployment reader"},
 		{"missing Session service", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader}, bound, "execution worker requires the Session service"},
 		{"missing Session reader", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service}, bound, "execution worker requires the Session reader"},
-		{"missing Session operations", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, Owner{}, "execution requires the Session execution operations"},
-		{"missing deployment", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, bound, "execution worker requires the deployment execution operations"},
+		{"missing runtime provider", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader}, bound, "execution worker requires the sandbox runtime provider"},
+		{"missing Session operations", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: runtimes}, Owner{}, "execution requires the Session execution operations"},
+		{"missing deployment", Dispatcher{Credentials: credentials, Observer: observer, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: runtimes}, bound, "execution worker requires the deployment execution operations"},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			lease := &closeCountingLease{t: t}
@@ -191,10 +204,9 @@ func TestStartWorkerChecksDeploymentAfterItsDependencies(t *testing.T) {
 func TestWorkerRunClosesLeaseAfterDrain(t *testing.T) {
 	owner, deployments, deploymentReader, pool := resetManagerDB(t, nil)
 	lease := &closeCountingLease{t: t, inner: owner.Lease}
-	id := uuid.NewString()
 	// The Worker's first reconciliation scans the Session work.
 	reader, service := testSessions(t, pool, pgtest.CredentialKey(t))
-	dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: NewDeferredRuntimeProvider(id, func(context.Context) (*RuntimeProvider, error) { return nil, nil }, unusedPreparation(t))}
+	dispatcher := &Dispatcher{Registry: runtimegateway.NewRegistry(), Credentials: &recordingCredentials{}, Observer: unusedObserver{t}, Deployment: deployments, DeploymentReader: deploymentReader, Sessions: service, SessionsReader: reader, ManagedRuntimes: unusedRuntimes(t)}
 	worker, err := StartWorker(t.Context(), dispatcher, Owner{Lease: lease, Deployment: owner.Deployment, Sessions: owner.Sessions})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/internal/execution/runtime_compute.go b/services/core/internal/execution/runtime_compute.go
index c1aeab3c6..54c54e841 100644
--- a/services/core/internal/execution/runtime_compute.go
+++ b/services/core/internal/execution/runtime_compute.go
@@ -116,7 +116,7 @@ func (r *runtimeLifecycle) idleCompute(ctx context.Context, p sandbox.SandboxPro
 	if err != nil {
 		return err
 	}
-	if _, err := r.deployment.KeepAllocation(ctx, owner); err != nil {
+	if _, err := r.deployment.CheckRunning(ctx, owner); err != nil {
 		return err
 	}
 	activity, err := r.reader.Activity(ctx, owner.ID)
diff --git a/services/core/internal/execution/runtime_compute_wake.go b/services/core/internal/execution/runtime_compute_wake.go
index ed4223d90..0dd7f915d 100644
--- a/services/core/internal/execution/runtime_compute_wake.go
+++ b/services/core/internal/execution/runtime_compute_wake.go
@@ -105,9 +105,6 @@ func (r *runtimeLifecycle) cleanupCompute(ctx context.Context, p sandbox.Sandbox
 // waitRuntimeAwake is called only for live Environment file operations, before
 // entering the Worker's work queues. Persisted history/artifact reads bypass it.
 func (w *Worker) waitRuntimeAwake(ctx context.Context, environment sessions.Environment) error {
-	if w.runtimes == nil {
-		return nil
-	}
 	key := deployment.AllocationKey{TenantID: environment.TenantID, EnvironmentID: environment.ID}
 	owner, err := w.dispatcher.DeploymentReader.EnvironmentAllocation(ctx, key)
 	if errors.Is(err, deployment.ErrNotFound) {
diff --git a/services/core/internal/execution/runtime_lifecycle.go b/services/core/internal/execution/runtime_lifecycle.go
index 5e275b09e..b2f072098 100644
--- a/services/core/internal/execution/runtime_lifecycle.go
+++ b/services/core/internal/execution/runtime_lifecycle.go
@@ -61,7 +61,7 @@ type runtimeLifecycle struct {
 
 func newRuntimeManager(owner Owner, deployments *deployment.Service, deploymentReader deployment.Reader, sessionReader sessions.Reader, registry *runtimegateway.Registry, config *RuntimeProvider) (*runtimeManager, error) {
 	if config == nil {
-		return nil, nil
+		return nil, sandbox.ErrInvalid
 	}
 	id, err := uuid.Parse(config.InstallationID)
 	if err != nil || id == uuid.Nil || id.String() != config.InstallationID || config.loadDeployment == nil || config.prepareDeployment == nil || registry == nil {
@@ -123,9 +123,6 @@ func (r *runtimeLifecycle) lock(ctx context.Context) error {
 // ProvisionEnvironment is an internal bootstrap operation for an already
 // authorized hosted Environment. It does not enable public hosted admission.
 func (w *Worker) ProvisionEnvironment(ctx context.Context, tenant, environment, providerKey string) (deployment.Allocation, error) {
-	if w.runtimes == nil {
-		return deployment.Allocation{}, ErrExecutionUnavailable
-	}
 	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 	defer cancel()
 	ctx, finish, err := w.runtimes.enter(ctx)
@@ -233,9 +230,6 @@ func (r *runtimeLifecycle) provision(ctx context.Context, tenant, environment, p
 // observes existing allocations and bootstraps committed resources without an
 // allocation. It never retries an existing Create or native work.
 func (w *Worker) ReconcileManagedRuntimes(ctx context.Context) error {
-	if w.runtimes == nil {
-		return nil
-	}
 	return w.runtimes.reconcile(ctx)
 }
 
@@ -384,7 +378,7 @@ func (r *runtimeLifecycle) observe(ctx context.Context, owner deployment.Allocat
 	if renewed.Reference != runtimeReference(owner) || renewed.State != "running" || !renewed.BootstrapComplete {
 		return sandbox.ErrOwnership
 	}
-	_, err = r.deployment.KeepAllocation(ctx, owner)
+	_, err = r.deployment.CheckRunning(ctx, owner)
 	return err
 }
 
diff --git a/services/core/internal/execution/worker.go b/services/core/internal/execution/worker.go
index 839009390..92fabc153 100644
--- a/services/core/internal/execution/worker.go
+++ b/services/core/internal/execution/worker.go
@@ -65,6 +65,9 @@ func StartWorker(ctx context.Context, dispatcher *Dispatcher, owner Owner) (_ *W
 	if dispatcher.SessionsReader == nil {
 		return nil, errors.New("execution worker requires the Session reader")
 	}
+	if dispatcher.ManagedRuntimes == nil {
+		return nil, errors.New("execution worker requires the sandbox runtime provider")
+	}
 	owned, err := dispatcher.Bind(owner)
 	if err != nil {
 		return nil, err
@@ -78,20 +81,15 @@ func StartWorker(ctx context.Context, dispatcher *Dispatcher, owner Owner) (_ *W
 	if err != nil {
 		return nil, err
 	}
-	if worker.runtimes != nil {
-		defer func() {
-			if err != nil {
-				worker.runtimes.stop()
-			}
-		}()
-		err = owner.Deployment.Claim(ctx, worker.runtimes.setupInstallationID)
-		if err == nil {
-			_, err = worker.runtimes.ensureDeployment(ctx)
+	defer func() {
+		if err != nil {
+			worker.runtimes.stop()
 		}
-	} else {
-		err = owner.Deployment.RequireUnclaimed(ctx)
+	}()
+	if err = owner.Deployment.Claim(ctx, worker.runtimes.setupInstallationID); err != nil {
+		return nil, err
 	}
-	if err != nil {
+	if _, err = worker.runtimes.ensureDeployment(ctx); err != nil {
 		return nil, err
 	}
 	if err = owned.sessionExecution.ReconcileEnvironmentConnections(ctx); err != nil {
@@ -150,14 +148,10 @@ func (w *Worker) Run(ctx context.Context) (runErr error) {
 	defer func() {
 		w.observeWorkerStop(runErr, ctx.Err())
 		cancel()
-		if w.runtimes != nil {
-			w.runtimes.stop()
-		}
+		w.runtimes.stop()
 		running.Wait()
-		if w.runtimes != nil {
-			// Drain an external provisioning caller before releasing the writer lease.
-			w.runtimes.drain()
-		}
+		// Drain an external provisioning caller before releasing the writer lease.
+		w.runtimes.drain()
 		w.observeWorkerClosed(closeLease(ctx, w.lease))
 	}()
 	active := make(map[string]bool)
@@ -171,13 +165,11 @@ func (w *Worker) Run(ctx context.Context) (runErr error) {
 	running.Add(1)
 	go func() { defer running.Done(); preparationDone <- w.runEnvironmentInitializations(ctx) }()
 	lifecycleDone := make(chan error, 1)
-	if w.runtimes != nil {
-		running.Add(1)
-		go func() {
-			defer running.Done()
-			lifecycleDone <- w.runManagedRuntimes(ctx)
-		}()
-	}
+	running.Add(1)
+	go func() {
+		defer running.Done()
+		lifecycleDone <- w.runManagedRuntimes(ctx)
+	}()
 	type readCompletion struct {
 		id      string
 		request directoryReadRequest
diff --git a/services/core/internal/execution/worker_concurrency_test.go b/services/core/internal/execution/worker_concurrency_test.go
index 6307f095a..d400ebdfe 100644
--- a/services/core/internal/execution/worker_concurrency_test.go
+++ b/services/core/internal/execution/worker_concurrency_test.go
@@ -7,7 +7,7 @@ func TestWorkerConfiguredConcurrencyReportsActualCapacity(t *testing.T) {
 		worker := &Worker{concurrency: limit}
 		worker.observeSlots(limit)
 		snapshot := worker.MetricsSnapshot()
-		if *snapshot.SlotsTotal != int64(limit) || *snapshot.SlotsInUse != int64(limit) {
+		if snapshot.SlotsTotal != int64(limit) || snapshot.SlotsInUse != int64(limit) {
 			t.Fatal("metrics do not reflect execution concurrency", snapshot)
 		}
 	}
diff --git a/services/core/internal/execution/worker_metrics.go b/services/core/internal/execution/worker_metrics.go
index c549452ca..c5833dfa1 100644
--- a/services/core/internal/execution/worker_metrics.go
+++ b/services/core/internal/execution/worker_metrics.go
@@ -6,11 +6,11 @@ import (
 	"time"
 )
 
-// WorkerMetrics contains only observations from this worker's existing operations.
-// Missing pointers mean the corresponding operation has not established a value.
+// WorkerMetrics contains only observations from this worker's existing
+// operations. A nil ExecutionOwner means the last ownership check failed.
 type WorkerMetrics struct {
-	SlotsInUse     *int64
-	SlotsTotal     *int64
+	SlotsInUse     int64
+	SlotsTotal     int64
 	ExecutionOwner *bool
 	Scheduler      WorkerJobMetrics
 }
@@ -35,8 +35,7 @@ func (w *Worker) MetricsSnapshot() WorkerMetrics {
 	w.metrics.mu.Lock()
 	defer w.metrics.mu.Unlock()
 	value := w.metrics.value
-	value.SlotsInUse = copyMetric(value.SlotsInUse)
-	value.SlotsTotal = copyMetric(value.SlotsTotal)
+	value.SlotsTotal = int64(w.executionConcurrency())
 	value.ExecutionOwner = copyMetric(value.ExecutionOwner)
 	value.Scheduler.LastRunAt = copyMetric(value.Scheduler.LastRunAt)
 	value.Scheduler.Processed = copyMetric(value.Scheduler.Processed)
@@ -56,11 +55,9 @@ func copyMetric[T any](source *T) *T {
 }
 
 func (w *Worker) observeSlots(active int) {
-	used, total := int64(active), int64(w.executionConcurrency())
 	w.metrics.mu.Lock()
 	defer w.metrics.mu.Unlock()
-	w.metrics.value.SlotsInUse = &used
-	w.metrics.value.SlotsTotal = &total
+	w.metrics.value.SlotsInUse = int64(active)
 }
 
 func (w *Worker) observeOwnership(err error) {
@@ -106,6 +103,5 @@ func (w *Worker) observeWorkerClosed(err error) {
 		owned := false
 		w.metrics.value.ExecutionOwner = &owned
 	}
-	used := int64(0)
-	w.metrics.value.SlotsInUse = &used
+	w.metrics.value.SlotsInUse = 0
 }
diff --git a/services/core/internal/execution/worker_metrics_test.go b/services/core/internal/execution/worker_metrics_test.go
index c8dcb374f..2243862d7 100644
--- a/services/core/internal/execution/worker_metrics_test.go
+++ b/services/core/internal/execution/worker_metrics_test.go
@@ -14,27 +14,27 @@ import (
 func TestWorkerMetricsUnknownAndDetached(t *testing.T) {
 	worker := &Worker{}
 	initial := worker.MetricsSnapshot()
-	if initial.SlotsInUse != nil || initial.SlotsTotal != nil || initial.ExecutionOwner != nil || initial.Scheduler.Status != "unknown" || initial.Scheduler.LastRunAt != nil || initial.Scheduler.Processed != nil || initial.Scheduler.Failed != nil {
+	if initial.SlotsInUse != 0 || initial.SlotsTotal != 4 || initial.ExecutionOwner != nil || initial.Scheduler.Status != "unknown" || initial.Scheduler.LastRunAt != nil || initial.Scheduler.Processed != nil || initial.Scheduler.Failed != nil {
 		t.Fatalf("unobserved worker reported values: %+v", initial)
 	}
 	worker.observeSlots(3)
 	worker.observeOwnership(nil)
 	worker.observeSchedulerPoll(2, nil)
 	first := worker.MetricsSnapshot()
-	if *first.SlotsInUse != 3 || *first.SlotsTotal != 4 || !*first.ExecutionOwner || *first.Scheduler.Processed != 2 || *first.Scheduler.Failed != 0 || first.Scheduler.Status != "ok" {
+	if first.SlotsInUse != 3 || first.SlotsTotal != 4 || !*first.ExecutionOwner || *first.Scheduler.Processed != 2 || *first.Scheduler.Failed != 0 || first.Scheduler.Status != "ok" {
 		t.Fatalf("unexpected observation: %+v", first)
 	}
 	observedAt := *first.Scheduler.LastRunAt
-	*first.SlotsInUse, *first.SlotsTotal, *first.ExecutionOwner = 100, 100, false
+	*first.ExecutionOwner = false
 	*first.Scheduler.Processed, *first.Scheduler.Failed = 100, 100
 	*first.Scheduler.LastRunAt = time.Time{}
 	second := worker.MetricsSnapshot()
-	if *second.SlotsInUse != 3 || *second.SlotsTotal != 4 || !*second.ExecutionOwner || *second.Scheduler.Processed != 2 || *second.Scheduler.Failed != 0 || !second.Scheduler.LastRunAt.Equal(observedAt) {
+	if second.SlotsInUse != 3 || second.SlotsTotal != 4 || !*second.ExecutionOwner || *second.Scheduler.Processed != 2 || *second.Scheduler.Failed != 0 || !second.Scheduler.LastRunAt.Equal(observedAt) {
 		t.Fatal("caller mutation altered the worker's observations")
 	}
 	worker.observeSlots(1)
 	worker.observeSchedulerPoll(0, nil)
-	if *second.SlotsInUse != 3 || *second.Scheduler.Processed != 2 {
+	if second.SlotsInUse != 3 || *second.Scheduler.Processed != 2 {
 		t.Fatal("new observations altered a retained snapshot")
 	}
 }
@@ -74,7 +74,7 @@ func TestWorkerMetricsFailuresAndClosure(t *testing.T) {
 	worker.observeWorkerClosed(nil)
 	worker.observeOwnership(nil)
 	closed := worker.MetricsSnapshot()
-	if closed.ExecutionOwner == nil || *closed.ExecutionOwner || *closed.SlotsInUse != 0 {
+	if closed.ExecutionOwner == nil || *closed.ExecutionOwner || closed.SlotsInUse != 0 {
 		t.Fatal("late ownership observation revived a closed worker")
 	}
 	uncertain := &Worker{}
@@ -96,10 +96,9 @@ func TestWorkerMetricsConcurrentSnapshots(t *testing.T) {
 				worker.observeOwnership(nil)
 				worker.observeSchedulerPoll(j%5, nil)
 				value := worker.MetricsSnapshot()
-				if *value.SlotsInUse < 0 || *value.SlotsInUse > *value.SlotsTotal || *value.SlotsTotal != 4 {
+				if value.SlotsInUse < 0 || value.SlotsInUse > value.SlotsTotal || value.SlotsTotal != 4 {
 					t.Errorf("inconsistent slot snapshot: %+v", value)
 				}
-				*value.SlotsInUse = -1
 				*value.ExecutionOwner = false
 				*value.Scheduler.Processed = -1
 			}
diff --git a/services/core/internal/persistence/postgres/agentpg/store_test.go b/services/core/internal/persistence/postgres/agentpg/store_test.go
index 97e765d32..98d3c9572 100644
--- a/services/core/internal/persistence/postgres/agentpg/store_test.go
+++ b/services/core/internal/persistence/postgres/agentpg/store_test.go
@@ -37,9 +37,10 @@ func open(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) (*a
 	return store, service
 }
 
-func testCipher(t *testing.T, seed byte) *credentialcrypto.Cipher {
+// otherKey is a credential key other than pgtest.CredentialKey.
+func otherKey(t *testing.T) *credentialcrypto.Cipher {
 	t.Helper()
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{seed}, 32))
+	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{0x5a}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -311,7 +312,7 @@ func TestAgentDeleteIsTenantScoped(t *testing.T) {
 
 func TestAgentModelExecutionAtomicEncryptedSnapshot(t *testing.T) {
 	pool := pgtest.Open(t)
-	c := testCipher(t, 31)
+	c := pgtest.CredentialKey(t)
 	store, service := open(t, pool, c)
 	ctx, tenant := t.Context(), uuid.NewString()
 	provider := providerFixture(0)
@@ -350,7 +351,7 @@ func TestAgentModelExecutionAtomicEncryptedSnapshot(t *testing.T) {
 	if _, err := service.Update(ctx, agents.UpdateCommand{TenantID: tenant, AgentID: agent.ID, Configuration: []byte(`{"model":"new-model"}`)}); err != nil {
 		t.Fatal(err)
 	}
-	if _, _, err := agentpg.New(pgunit.NewPool(pool), testCipher(t, 99)).GetAgentWithModelProvider(ctx, tenant, agent.ID); err == nil || err.Error() != "agent model provider decryption failed" {
+	if _, _, err := agentpg.New(pgunit.NewPool(pool), otherKey(t)).GetAgentWithModelProvider(ctx, tenant, agent.ID); err == nil || err.Error() != "agent model provider decryption failed" {
 		t.Fatal("wrong key was not a decryption failure", err)
 	}
 	replacement := providerFixture(1)
@@ -418,7 +419,7 @@ func TestAgentModelExecutionAtomicEncryptedSnapshot(t *testing.T) {
 // key or a missing bundle.
 func TestAgentBundleSealedToAnotherAgentDoesNotOpen(t *testing.T) {
 	pool := pgtest.Open(t)
-	c := testCipher(t, 32)
+	c := pgtest.CredentialKey(t)
 	store, service := open(t, pool, c)
 	ctx, tenant := t.Context(), uuid.NewString()
 	provider := providerFixture(0)
@@ -444,7 +445,7 @@ func TestAgentBundleSealedToAnotherAgentDoesNotOpen(t *testing.T) {
 
 func TestAgentModelExecutionConcurrentSnapshots(t *testing.T) {
 	pool := pgtest.Open(t)
-	store, service := open(t, pool, testCipher(t, 32))
+	store, service := open(t, pool, pgtest.CredentialKey(t))
 	ctx, tenant := t.Context(), uuid.NewString()
 	p := providerFixture(0)
 	agent, err := service.Create(ctx, agents.CreateCommand{TenantID: tenant, Configuration: providerConfiguration(t, p, "codex"), ModelProvider: p})
@@ -504,7 +505,7 @@ func auditContext(ctx context.Context, tenant, request, key string) context.Cont
 // together. An administrator delete records administrator audit only.
 func TestAgentWritesAuditInTheirTransaction(t *testing.T) {
 	pool := pgtest.OpenIsolated(t, nil)
-	_, service := open(t, pool, testCipher(t, 91))
+	_, service := open(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	if _, err := pool.Exec(ctx, `CREATE FUNCTION reject_agent_audit_fixture() RETURNS trigger LANGUAGE plpgsql AS $$
 	BEGIN IF NEW.request_id = 'reject-agent-audit' THEN RAISE EXCEPTION 'forced audit insertion failure'; END IF; RETURN NEW; END $$;
diff --git a/services/core/internal/persistence/postgres/deploymentpg/allocations.go b/services/core/internal/persistence/postgres/deploymentpg/allocations.go
index a6ae895e1..ee99f8f4d 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/allocations.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/allocations.go
@@ -25,7 +25,7 @@ func allocation(row sqlc.RuntimeAllocation, session, tenant pgtype.UUID, deleted
 		ComputeActivityAt: row.ComputeActivityAt.Time, ComputeWakeRequested: row.ComputeWakeRequested, ComputeRetainedUntil: timestamp(row.ComputeRetainedUntil),
 		ID: uuidString(row.ID), EnvironmentID: uuidString(row.EnvironmentID), SessionID: uuidString(session), TenantID: uuidString(tenant),
 		DeviceID: uuidString(row.DeviceID), ProviderKey: uuidString(row.ProviderKey), State: row.State, CreateSettled: row.CreateSettled,
-		SessionDeleted: deleted.Valid, Expired: expired, CreatedAt: row.CreatedAt.Time, KeptAt: row.KeptAt.Time,
+		SessionDeleted: deleted.Valid, Expired: expired, CreatedAt: row.CreatedAt.Time,
 	}
 }
 
@@ -271,10 +271,6 @@ func (t *allocationTx) ObserveRunning(current deployment.Allocation) (deployment
 	return t.change(current, t.q.ObserveRuntimeRunning)
 }
 
-func (t *allocationTx) Keep(current deployment.Allocation) (deployment.Allocation, error) {
-	return t.change(current, t.q.KeepRuntimeAllocation)
-}
-
 func (t *allocationTx) SettleCreation(current deployment.Allocation) (deployment.Allocation, error) {
 	return t.change(current, t.q.SettleRuntimeCreation)
 }
diff --git a/services/core/internal/persistence/postgres/deploymentpg/specification_test.go b/services/core/internal/persistence/postgres/deploymentpg/specification_test.go
index 304b9121c..30531a86d 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/specification_test.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/specification_test.go
@@ -44,9 +44,6 @@ func TestSandboxSpecificationRoundTripAndClaimStays(t *testing.T) {
 			if _, err := changes.Initialize(t.Context(), view.InstallationID, changed); !errors.Is(err, deployment.ErrConflict) {
 				t.Fatal("initial setup silently resized a configured deployment", err)
 			}
-			if err := changes.RequireUnclaimed(t.Context()); !errors.Is(err, deployment.ErrConflict) {
-				t.Fatal("an owner without sandbox runtimes started on a claimed deployment", err)
-			}
 			after, err := f.service.View(t.Context())
 			if err != nil || !reflect.DeepEqual(after, view) {
 				t.Fatal("rejected writes changed the committed specification", err)
diff --git a/services/core/internal/persistence/postgres/modelconfigurationpg/fixture_test.go b/services/core/internal/persistence/postgres/modelconfigurationpg/fixture_test.go
index 5e30ce5a2..32152bb75 100644
--- a/services/core/internal/persistence/postgres/modelconfigurationpg/fixture_test.go
+++ b/services/core/internal/persistence/postgres/modelconfigurationpg/fixture_test.go
@@ -107,7 +107,7 @@ func newObserved(t *testing.T) observed {
 		},
 	}
 	// Hosted creation needs placement rules, as cmd/server gives them.
-	rules, err := placement.NewRules(providers.Builtin(), "")
+	rules, err := placement.NewRules(providers.Builtin(), "https://core.example")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go b/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
index d46af31c2..8e788926f 100644
--- a/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
+++ b/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
@@ -84,7 +84,7 @@ func TestObservationExcludesOtherSourcesAndHistoricalSessions(t *testing.T) {
 		if source == "deployment" {
 			input.DeploymentProviderRevision = uuid.Nil
 		} else {
-			input.Configuration = json.RawMessage(`{"agent":{"model":"frozen-model"},"environment":{"type":"openai_hosted"}}`)
+			input.Configuration = json.RawMessage(`{"agent":{"model":"frozen-model"},"environment":{"type":"self_hosted"}}`)
 			if source == "unknown" {
 				input.ModelProviderSource = "session"
 			}
diff --git a/services/core/internal/persistence/postgres/pgtest/pgtest.go b/services/core/internal/persistence/postgres/pgtest/pgtest.go
index da2094abe..4da822865 100644
--- a/services/core/internal/persistence/postgres/pgtest/pgtest.go
+++ b/services/core/internal/persistence/postgres/pgtest/pgtest.go
@@ -8,11 +8,13 @@ import (
 	"errors"
 	"os"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/jackc/pgx/v5/stdlib"
 
@@ -71,7 +73,7 @@ func OpenIsolated(t testing.TB, configure func(*pgxpool.Config)) *pgxpool.Pool {
 	admin := Open(t)
 	name := "oac_isolated_" + strings.ReplaceAll(uuid.NewString(), "-", "")[:12] + "_tests"
 	quoted := pgx.Identifier{name}.Sanitize()
-	if _, err := admin.Exec(t.Context(), "CREATE DATABASE "+quoted); err != nil {
+	if err := copyTemplate(t.Context(), admin, quoted); err != nil {
 		t.Fatal(err)
 	}
 	t.Cleanup(func() {
@@ -83,12 +85,6 @@ func OpenIsolated(t testing.TB, configure func(*pgxpool.Config)) *pgxpool.Pool {
 	})
 	cfg := admin.Config().Copy()
 	cfg.ConnConfig.Database = name
-	connection := stdlib.RegisterConnConfig(cfg.ConnConfig)
-	err := migrations.Apply(t.Context(), connection)
-	stdlib.UnregisterConnConfig(connection)
-	if err != nil {
-		t.Fatal(err)
-	}
 	if configure != nil {
 		configure(cfg)
 	}
@@ -100,6 +96,48 @@ func OpenIsolated(t testing.TB, configure func(*pgxpool.Config)) *pgxpool.Pool {
 	return pool
 }
 
+// template is the database OpenIsolated copies: oac_*_template_tests beside
+// the shared test database. It persists across runs, and each test process
+// migrates it once, as Open migrates the shared database.
+var template struct {
+	once sync.Once
+	name string
+	err  error
+}
+
+// copyTemplate creates the quoted database from the migrated template.
+// Postgres refuses to copy a template while another session is connected to
+// it, so migrating and copying hold one advisory lock across test processes.
+func copyTemplate(ctx context.Context, admin *pgxpool.Pool, quoted string) error {
+	conn, err := admin.Acquire(ctx)
+	if err != nil {
+		return err
+	}
+	defer conn.Release()
+	if _, err = conn.Exec(ctx, "SELECT pg_advisory_lock(hashtext('oac_test_template'))"); err != nil {
+		return err
+	}
+	defer conn.Exec(context.Background(), "SELECT pg_advisory_unlock(hashtext('oac_test_template'))")
+	template.once.Do(func() {
+		cfg := admin.Config().Copy()
+		cfg.ConnConfig.Database = strings.TrimSuffix(cfg.ConnConfig.Database, "_tests") + "_template_tests"
+		_, err := conn.Exec(context.Background(), "CREATE DATABASE "+pgx.Identifier{cfg.ConnConfig.Database}.Sanitize())
+		var exists *pgconn.PgError
+		if err != nil && (!errors.As(err, &exists) || exists.Code != "42P04") {
+			template.err = err
+			return
+		}
+		connection := stdlib.RegisterConnConfig(cfg.ConnConfig)
+		defer stdlib.UnregisterConnConfig(connection)
+		template.name, template.err = cfg.ConnConfig.Database, migrations.Apply(context.Background(), connection)
+	})
+	if template.err != nil {
+		return template.err
+	}
+	_, err = conn.Exec(ctx, "CREATE DATABASE "+quoted+" TEMPLATE "+pgx.Identifier{template.name}.Sanitize())
+	return err
+}
+
 // databaseConfig validates the driver's effective database, so query
 // parameters and key/value DSNs cannot redirect tests to another database.
 func databaseConfig(dsn string) (*pgxpool.Config, error) {
diff --git a/services/core/internal/persistence/postgres/runtimehistorypg/reader_test.go b/services/core/internal/persistence/postgres/runtimehistorypg/reader_test.go
index aca72a965..85bc4c916 100644
--- a/services/core/internal/persistence/postgres/runtimehistorypg/reader_test.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/reader_test.go
@@ -20,7 +20,7 @@ const (
 
 func testCapabilities() runtimehistory.Capabilities {
 	return runtimehistory.Capabilities{
-		CollectionMode: runtimehistory.CollectionPeriodic, SampleInterval: 30 * time.Second,
+		SampleInterval: 30 * time.Second,
 		Retention: 7 * 24 * time.Hour, MinimumStep: 30 * time.Second, MaximumRange: 24 * time.Hour,
 		MaximumPoints: 1_000, MaximumSeries: 64, MaximumTotalPoints: 10_000,
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory},
diff --git a/services/core/internal/persistence/postgres/runtimehistorypg/samples_test.go b/services/core/internal/persistence/postgres/runtimehistorypg/samples_test.go
index f6375b460..aae9979be 100644
--- a/services/core/internal/persistence/postgres/runtimehistorypg/samples_test.go
+++ b/services/core/internal/persistence/postgres/runtimehistorypg/samples_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func historyCapabilities() runtimehistory.Capabilities {
-	return runtimehistory.Capabilities{CollectionMode: runtimehistory.CollectionPeriodic, SampleInterval: 30 * time.Second,
+	return runtimehistory.Capabilities{SampleInterval: 30 * time.Second,
 		Retention: 7 * 24 * time.Hour, MinimumStep: 30 * time.Second, MaximumRange: 24 * time.Hour, MaximumPoints: 1000, MaximumSeries: 64, MaximumTotalPoints: 10000,
 		Metrics: []runtimehistory.Metric{runtimehistory.MetricCPU, runtimehistory.MetricMemory, runtimehistory.MetricTokens}}
 }
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation_test.go b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
index 58174a25a..fac2cb753 100644
--- a/services/core/internal/persistence/postgres/sessionpg/creation_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
@@ -27,6 +27,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/skillpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
@@ -35,13 +36,15 @@ import (
 
 var creator = identity.Subject{Kind: "service_account", ID: "test-runner"}
 
-var hostedConfiguration = json.RawMessage(`{"agent":{"model":"m"},"environment":{"type":"openai_hosted"}}`)
+// environmentConfiguration configures a self_hosted Environment Session,
+// which needs no sandbox deployment.
+var environmentConfiguration = json.RawMessage(`{"agent":{"model":"m"},"environment":{"type":"self_hosted","workspace_directory":"/workspace"}}`)
 
 // creationService returns the Session store and service over pool with the
 // built-in placement rules.
 func creationService(t *testing.T, pool *pgxpool.Pool) (*Store, *sessions.Service) {
 	t.Helper()
-	rules, err := placement.NewRules(providers.Builtin(), "")
+	rules, err := placement.NewRules(providers.Builtin(), "https://core.example")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -377,7 +380,7 @@ func TestCreationFreezesResourcesOnce(t *testing.T) {
 	reference := environmentconfig.Skill{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: skill.ID, Version: "latest"}}
 	fileID := environmentconfig.InitialFile{Type: "file_id", Path: "/workspace/b", FileID: source.ID}
 	input := sessions.CreateSession{
-		Creator: creator, Engine: "codex", IdempotencyKey: "frozen", Configuration: hostedConfiguration,
+		Creator: creator, Engine: "codex", IdempotencyKey: "frozen", Configuration: environmentConfiguration,
 		ModelProvider:       &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://example.com/v1", APIKey: canary},
 		ModelProviderSource: v1.ModelProviderSourceSession,
 		Initialization:      environmentconfig.Setup{Skills: []environmentconfig.Skill{inline, reference}},
@@ -415,8 +418,8 @@ func TestCreationFreezesResourcesOnce(t *testing.T) {
 	}
 	assertFrozen()
 	for _, reference := range []sessions.CreateSession{
-		{Creator: creator, Engine: "codex", IdempotencyKey: "foreign-skill", Configuration: hostedConfiguration, Initialization: environmentconfig.Setup{Skills: []environmentconfig.Skill{reference}}},
-		{Creator: creator, Engine: "codex", IdempotencyKey: "foreign-file", Configuration: hostedConfiguration, InitialFiles: []environmentconfig.InitialFile{fileID}},
+		{Creator: creator, Engine: "codex", IdempotencyKey: "foreign-skill", Configuration: environmentConfiguration, Initialization: environmentconfig.Setup{Skills: []environmentconfig.Skill{reference}}},
+		{Creator: creator, Engine: "codex", IdempotencyKey: "foreign-file", Configuration: environmentConfiguration, InitialFiles: []environmentconfig.InitialFile{fileID}},
 	} {
 		if _, err := service.CreateSession(ctx, foreign, reference); !errors.Is(err, sessions.ErrNotFound) {
 			t.Fatal(reference.IdempotencyKey, err)
@@ -471,8 +474,17 @@ func TestHostedCreationAdmitsAndPlacesUnderTheDeploymentLock(t *testing.T) {
 	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
 	defer cancel()
 	tenant := uuid.NewString()
+	nodes, err := json.Marshal(sandbox.DeploymentSpec{Resources: sandbox.Resources{CPUs: 2, MemoryMiB: 2048}, Runtime: &sandbox.RuntimeRelease{SourceCommit: strings.Repeat("a", 40),
+		ImageID: "sha256:" + strings.Repeat("b", 64), ImageManifestDigest: "sha256:" + strings.Repeat("c", 64), MicrosandboxRef: "oac-runtime@sha256:" + strings.Repeat("d", 64),
+		RuntimeSHA256: strings.Repeat("e", 64), FirmwareSHA256: strings.Repeat("f", 64)}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	// A direct deployment admits hosted work without placing it on a node.
+	exec(t, pool, `UPDATE runtime_deployment SET installation_id=$1, backend_fingerprint=$2, provider_kind='e2b', mode='direct', generation=1,
+		specification='{"resources":{"cpus":2,"memory_mib":2048}}'`, uuid.New(), strings.Repeat("a", 64))
 	hosted := func(key string) sessions.CreateSession {
-		return sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: key, Configuration: hostedConfiguration}
+		return sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: key, Configuration: json.RawMessage(`{"agent":{"model":"m"},"environment":{"type":"openai_hosted"}}`)}
 	}
 	existing, err := service.CreateSession(ctx, tenant, hosted("existing"))
 	if err != nil {
@@ -493,8 +505,8 @@ func TestHostedCreationAdmitsAndPlacesUnderTheDeploymentLock(t *testing.T) {
 		done <- err
 	}()
 	awaitBlocked(ctx, t, pool, holder)
-	if _, err := tx.Exec(ctx, `UPDATE runtime_deployment SET installation_id=$1, backend_fingerprint=$2, provider_kind='docker', mode='nodes', generation=1,
-		reset_clear='force', reset_requested_at=now(), reset_forced_at=now(), reset_audit='{}'`, uuid.New(), strings.Repeat("a", 64)); err != nil {
+	if _, err := tx.Exec(ctx, `UPDATE runtime_deployment SET provider_kind='docker', mode='nodes', generation=2, specification=$1,
+		reset_clear='force', reset_requested_at=now(), reset_forced_at=now(), reset_audit='{}'`, string(nodes)); err != nil {
 		t.Fatal(err)
 	}
 	if err := tx.Commit(ctx); err != nil {
@@ -506,7 +518,7 @@ func TestHostedCreationAdmitsAndPlacesUnderTheDeploymentLock(t *testing.T) {
 	if retry, err := service.CreateSession(ctx, tenant, hosted("existing")); err != nil || retry.Created || retry.Session.ID != existing.Session.ID {
 		t.Fatal("retry ran admission", retry, err)
 	}
-	exec(t, pool, "UPDATE runtime_deployment SET reset_clear=NULL, reset_requested_at=NULL, reset_forced_at=NULL, reset_audit=NULL, provider_kind='', mode=''")
+	exec(t, pool, "UPDATE runtime_deployment SET reset_clear=NULL, reset_requested_at=NULL, reset_forced_at=NULL, reset_audit=NULL")
 	if _, err := service.CreateSession(ctx, tenant, hosted("unplaced")); !errors.Is(err, placement.ErrNodeUnavailable) {
 		t.Fatal("placement without a node", err)
 	}
@@ -541,7 +553,7 @@ func TestSkillFreezeSerializesWithVersionDeletion(t *testing.T) {
 		if err := holder.QueryRow(ctx, "SELECT pg_backend_pid() FROM skills WHERE id=$1 FOR UPDATE", key).Scan(&holderPID); err != nil {
 			t.Fatal(err)
 		}
-		input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: hostedConfiguration,
+		input := sessions.CreateSession{Creator: creator, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: environmentConfiguration,
 			Initialization: environmentconfig.Setup{Skills: []environmentconfig.Skill{{Metadata: environmentconfig.SkillMetadata{Type: "skill_reference", SkillID: skill.ID, Version: "2"}}}}}
 		type outcome struct {
 			creation sessions.Creation
diff --git a/services/core/internal/persistence/postgres/skillpg/audit_test.go b/services/core/internal/persistence/postgres/skillpg/audit_test.go
index de62c39d4..a9684b4f5 100644
--- a/services/core/internal/persistence/postgres/skillpg/audit_test.go
+++ b/services/core/internal/persistence/postgres/skillpg/audit_test.go
@@ -100,7 +100,7 @@ func snapshot(t *testing.T, pool *pgxpool.Pool, tenant string, tables ...string)
 // write. Comparing complete tenant rows proves the write rolled back.
 func TestWriteAuditTransactions(t *testing.T) {
 	pool := pgtest.OpenIsolated(t, nil)
-	f := newFixture(t, pool, testCipher(t, 91))
+	f := newFixture(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	if _, err := pool.Exec(ctx, `CREATE FUNCTION reject_resource_audit_fixture() RETURNS trigger LANGUAGE plpgsql AS $$
 	BEGIN IF NEW.request_id = 'reject-resource-audit' THEN RAISE EXCEPTION 'forced audit insertion failure'; END IF; RETURN NEW; END $$;
@@ -158,7 +158,7 @@ const rejectedAdminRequest = "reject-admin-mutation-fixture"
 // operation, and a failed administrator audit rolls the deletion back.
 func TestAdminDeleteAuditTransactions(t *testing.T) {
 	pool := pgtest.OpenIsolated(t, nil)
-	f := newFixture(t, pool, testCipher(t, 94))
+	f := newFixture(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
 	if _, err := pool.Exec(ctx, `CREATE FUNCTION reject_admin_mutation_fixture() RETURNS trigger LANGUAGE plpgsql AS $$
  BEGIN IF NEW.request_id = 'reject-admin-mutation-fixture' THEN RAISE EXCEPTION 'forced administrator audit failure'; END IF; RETURN NEW; END $$;
diff --git a/services/core/internal/persistence/postgres/skillpg/skillpg_test.go b/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
index 8824d4534..d843546e5 100644
--- a/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
+++ b/services/core/internal/persistence/postgres/skillpg/skillpg_test.go
@@ -39,9 +39,11 @@ func newFixture(t *testing.T, pool *pgxpool.Pool, cipher *credentialcrypto.Ciphe
 	return fixture{pool: pool, store: store, service: service}
 }
 
-func testCipher(t *testing.T, seed byte) *credentialcrypto.Cipher {
+// otherKey is a credential key other than pgtest.CredentialKey, for a test that
+// a replaced key cannot open content.
+func otherKey(t *testing.T) *credentialcrypto.Cipher {
 	t.Helper()
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{seed}, 32))
+	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{0x5a}, 32))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -97,7 +99,7 @@ func (f fixture) rowCounts(t *testing.T, skill uuid.UUID) (skillRows, versionRow
 }
 
 func TestOwnershipEncryptionAndVersions(t *testing.T) {
-	f := newFixture(t, pgtest.Open(t), testCipher(t, 41))
+	f := newFixture(t, pgtest.Open(t), pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	bundle := proofArchive(t, "confidential-skill-canary")
@@ -229,7 +231,7 @@ func TestOwnershipEncryptionAndVersions(t *testing.T) {
 
 // A zero page is empty; HasMore reports whether a resource follows the cursor.
 func TestListsAcceptLimitZero(t *testing.T) {
-	f := newFixture(t, pgtest.Open(t), testCipher(t, 43))
+	f := newFixture(t, pgtest.Open(t), pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	bundle := proofArchive(t, "limit-zero")
@@ -287,7 +289,7 @@ func TestListsAcceptLimitZero(t *testing.T) {
 
 func TestMetadataTracksDefaultVersion(t *testing.T) {
 	pool := pgtest.Open(t)
-	f := newFixture(t, pool, testCipher(t, 74))
+	f := newFixture(t, pool, otherKey(t))
 	// Metadata reads and default changes work under a replaced key.
 	replaced := newFixture(t, pool, pgtest.CredentialKey(t))
 	ctx := t.Context()
@@ -360,7 +362,7 @@ func TestMetadataTracksDefaultVersion(t *testing.T) {
 
 // Deleting the sole version deletes the Skill and all its rows in one commit.
 func TestSoleVersionDeletionRemovesSkill(t *testing.T) {
-	f := newFixture(t, pgtest.Open(t), testCipher(t, 63))
+	f := newFixture(t, pgtest.Open(t), pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	skill := f.create(t, tenant, proofArchive(t, "sole-version"))
@@ -410,7 +412,7 @@ func TestSoleVersionDeletionRemovesSkill(t *testing.T) {
 // commits first makes the default undeletable, and a deletion that commits
 // first makes the later upload miss the Skill. Neither loses acknowledged data.
 func TestSoleVersionDeletionSerializesWithUpload(t *testing.T) {
-	f := newFixture(t, pgtest.Open(t), testCipher(t, 63))
+	f := newFixture(t, pgtest.Open(t), pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	for _, uploadFirst := range []bool{true, false} {
@@ -469,7 +471,7 @@ func TestSoleVersionDeletionSerializesWithUpload(t *testing.T) {
 // LockSkills locks each named Skill of the tenant once, and
 // ReadVersionForFreeze opens a version only with the key that sealed it.
 func TestFreezeReads(t *testing.T) {
-	cipher := testCipher(t, 48)
+	cipher := pgtest.CredentialKey(t)
 	f := newFixture(t, pgtest.Open(t), cipher)
 	ctx := t.Context()
 	tenant := uuid.NewString()
@@ -497,7 +499,7 @@ func TestFreezeReads(t *testing.T) {
 	if _, err := skillpg.ReadVersionForFreeze(ctx, q, cipher, tenantID, first.ID, 2); !errors.Is(err, skills.ErrNotFound) {
 		t.Fatal("missing version", err)
 	}
-	if _, err := skillpg.ReadVersionForFreeze(ctx, q, testCipher(t, 49), tenantID, first.ID, 1); err == nil || errors.Is(err, skills.ErrNotFound) {
+	if _, err := skillpg.ReadVersionForFreeze(ctx, q, otherKey(t), tenantID, first.ID, 1); err == nil || errors.Is(err, skills.ErrNotFound) {
 		t.Fatal("another key opened the version", err)
 	}
 }
@@ -527,7 +529,7 @@ func waitForLockWaiters(t *testing.T, pool *pgxpool.Pool, holder int32, count in
 // Text PostgreSQL cannot store, here a YAML-escaped U+0000 in the manifest
 // description, is the shared unstorable-text error and stores nothing.
 func TestUnstorableTextStoresNothing(t *testing.T) {
-	f := newFixture(t, pgtest.Open(t), testCipher(t, 45))
+	f := newFixture(t, pgtest.Open(t), pgtest.CredentialKey(t))
 	ctx := t.Context()
 	tenant := uuid.NewString()
 	bad := archive(t, "proof", `"before\0after"`, "unstorable")
@@ -549,7 +551,7 @@ func TestUnstorableTextStoresNothing(t *testing.T) {
 
 // A malformed tenant is invalid input, not a database error.
 func TestMalformedTenantIsInvalidInput(t *testing.T) {
-	f := newFixture(t, pgtest.Open(t), testCipher(t, 46))
+	f := newFixture(t, pgtest.Open(t), pgtest.CredentialKey(t))
 	if _, err := f.service.CreateSkill(t.Context(), skills.CreateSkill{TenantID: "not-a-tenant", Archive: proofArchive(t, "tenant")}); !errors.Is(err, skills.ErrInvalidInput) {
 		t.Fatal("create", err)
 	}
diff --git a/services/core/internal/persistence/postgres/vaultpg/audit_test.go b/services/core/internal/persistence/postgres/vaultpg/audit_test.go
index 2c88daa5f..9a894bd5e 100644
--- a/services/core/internal/persistence/postgres/vaultpg/audit_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/audit_test.go
@@ -1,7 +1,6 @@
 package vaultpg_test
 
 import (
-	"bytes"
 	"context"
 	"reflect"
 	"strings"
@@ -141,7 +140,7 @@ func prepareAuditMutation(t *testing.T, service *vaults.Service, tenant, name st
 // table snapshots prove the rollback of ciphertext, timestamps and cascades.
 func TestVaultMutationsRollBackWithTheirAudit(t *testing.T) {
 	pool := pgtest.OpenIsolated(t, nil)
-	service := newService(t, pool, newCipher(t, bytes.Repeat([]byte{91}, 32)), nil)
+	service := newService(t, pool, pgtest.CredentialKey(t), nil)
 	rejectAudits(t, pool)
 	secrets := []string{"audit-private-token", "audit-private-replacement"}
 	for _, provenance := range []string{"public", "admin"} {
diff --git a/services/core/internal/persistence/postgres/vaultpg/vaults_test.go b/services/core/internal/persistence/postgres/vaultpg/vaults_test.go
index 6a7ce4da8..f0ccac81f 100644
--- a/services/core/internal/persistence/postgres/vaultpg/vaults_test.go
+++ b/services/core/internal/persistence/postgres/vaultpg/vaults_test.go
@@ -306,10 +306,10 @@ func TestVaultDeletionCascadeBindingAndRestart(t *testing.T) {
 func TestVaultDeletionConcurrentChildMutations(t *testing.T) {
 	_, pool := openStore(t)
 	tenant := uuid.NewString()
-	service := newService(t, pool, newCipher(t, bytes.Repeat([]byte{44}, 32)), nil)
+	service := newService(t, pool, pgtest.CredentialKey(t), nil)
 	// Each operation runs on its own Store, so only PostgreSQL orders them.
 	other := func() *vaults.Service {
-		return newService(t, pool, newCipher(t, bytes.Repeat([]byte{44}, 32)), nil)
+		return newService(t, pool, pgtest.CredentialKey(t), nil)
 	}
 	for range 8 {
 		vault := createVault(t, service, tenant)
diff --git a/services/core/internal/runtimehistory/service_test.go b/services/core/internal/runtimehistory/service_test.go
index d56955aa7..cf0047ae6 100644
--- a/services/core/internal/runtimehistory/service_test.go
+++ b/services/core/internal/runtimehistory/service_test.go
@@ -77,7 +77,6 @@ func (r *fakeReader) Query(_ context.Context, query Query) (Result, error) {
 
 func capabilities() Capabilities {
 	return Capabilities{
-		CollectionMode:     CollectionPeriodic,
 		SampleInterval:     30 * time.Second,
 		Retention:          7 * 24 * time.Hour,
 		MinimumStep:        30 * time.Second,
@@ -116,7 +115,7 @@ func TestServiceAuthorizesAndBoundsBackendQuery(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(reader.queries) != 1 || reader.queries[0].Scope != scope || reader.queries[0].Step != time.Minute || response.Resolution != time.Minute || !response.Durable() {
+	if len(reader.queries) != 1 || reader.queries[0].Scope != scope || reader.queries[0].Step != time.Minute || response.Resolution != time.Minute {
 		t.Fatalf("unexpected bounded history query: query=%+v response=%+v", reader.queries, response)
 	}
 	ratio = .9
@@ -329,7 +328,7 @@ func TestServiceRejectsMalformedBackendResults(t *testing.T) {
 func TestServiceRejectsUnsafeCapabilities(t *testing.T) {
 	base := capabilities()
 	for _, mutate := range []func(*Capabilities){
-		func(value *Capabilities) { value.CollectionMode = CollectionOnRead },
+		func(value *Capabilities) { value.SampleInterval = 0 },
 		func(value *Capabilities) { value.MaximumRange = value.Retention + time.Second },
 		func(value *Capabilities) { value.Metrics = []Metric{MetricCPU, MetricCPU} },
 	} {
diff --git a/services/core/internal/runtimehistory/types.go b/services/core/internal/runtimehistory/types.go
index 29485ad16..f7a0a48d3 100644
--- a/services/core/internal/runtimehistory/types.go
+++ b/services/core/internal/runtimehistory/types.go
@@ -10,13 +10,6 @@ import (
 	"github.com/google/uuid"
 )
 
-type CollectionMode string
-
-const (
-	CollectionOnRead   CollectionMode = "on_read"
-	CollectionPeriodic CollectionMode = "periodic"
-)
-
 type Metric string
 
 const (
@@ -54,7 +47,6 @@ func validCount(value int) bool {
 // future public capability response. Backend names, endpoints, credentials and
 // tenant identity are deliberately absent.
 type Capabilities struct {
-	CollectionMode     CollectionMode
 	SampleInterval     time.Duration
 	Retention          time.Duration
 	MinimumStep        time.Duration
@@ -65,22 +57,9 @@ type Capabilities struct {
 	Metrics            []Metric
 }
 
-func (c Capabilities) Durable() bool {
-	return c.CollectionMode == CollectionPeriodic && c.SampleInterval > 0
-}
-
 func (c Capabilities) Validate() error {
-	switch c.CollectionMode {
-	case CollectionOnRead:
-		if c.SampleInterval != 0 {
-			return errors.New("on-read Runtime history cannot declare a sampling interval")
-		}
-	case CollectionPeriodic:
-		if c.SampleInterval <= 0 {
-			return errors.New("periodic Runtime history requires a sampling interval")
-		}
-	default:
-		return errors.New("invalid Runtime history collection mode")
+	if c.SampleInterval <= 0 {
+		return errors.New("Runtime history requires a sampling interval")
 	}
 	if c.Retention <= 0 || c.MinimumStep <= 0 || c.MaximumRange <= 0 || c.MaximumRange > c.Retention {
 		return errors.New("invalid Runtime history time bounds")
diff --git a/services/core/internal/runtimeobs/service.go b/services/core/internal/runtimeobs/service.go
index c38db7359..26e6c15a2 100644
--- a/services/core/internal/runtimeobs/service.go
+++ b/services/core/internal/runtimeobs/service.go
@@ -36,11 +36,10 @@ type Service struct {
 
 // NewService reads managed Runtimes through source, which returns the Sandbox
 // Provider of the deployment's current selection and its registered kind, or
-// ErrUnavailable while none is selected. A nil source means this Core has no
-// managed deployment.
+// ErrUnavailable while none is selected.
 func NewService(resolver TargetResolver, source func(context.Context) (Source, string, error), options ...ServiceOption) (*Service, error) {
-	if resolver == nil {
-		return nil, errors.New("Runtime observation resolver is required")
+	if resolver == nil || source == nil {
+		return nil, errors.New("Runtime observation resolver and source are required")
 	}
 	config := serviceOptions{}
 	for _, option := range options {
@@ -225,9 +224,6 @@ func (s *Service) resolve(ctx context.Context, tenantID, sessionID string, owner
 	default:
 		return Observation{}, nil, errors.New("invalid managed Runtime allocation state")
 	}
-	if s.source == nil {
-		return Observation{Target: target, Status: StatusUnavailable, Reason: "source_not_configured", ResolvedAt: resolvedAt}, nil, nil
-	}
 	return Observation{}, &sourceRead{target: target}, nil
 }
 
diff --git a/services/core/internal/runtimeobs/service_test.go b/services/core/internal/runtimeobs/service_test.go
index 763b4363d..40f15551b 100644
--- a/services/core/internal/runtimeobs/service_test.go
+++ b/services/core/internal/runtimeobs/service_test.go
@@ -126,27 +126,18 @@ func TestServiceDoesNotCallSourcesForUnsupportedModes(t *testing.T) {
 	}
 }
 
-func TestServicePreservesUnavailableAndObservedZero(t *testing.T) {
+func TestServicePreservesObservedZero(t *testing.T) {
 	target := Target{EnvironmentID: "environment", Mode: ModeManaged, Instance: Instance{AllocationID: "allocation", ProviderKey: "provider", AllocationState: "running"}}
-	service, err := NewService(fixedResolver{target: target}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	observation, err := service.ObserveSession(t.Context(), "tenant", "session")
-	if err != nil || observation.Status != StatusUnavailable || observation.Reason != "source_not_configured" || observation.Sample != nil {
-		t.Fatalf("missing source was not unavailable: %+v %v", observation, err)
-	}
-
 	zeroCPU := float64(0)
 	zeroMemory := uint64(0)
 	now := time.Date(2026, 9, 22, 1, 0, 0, 0, time.UTC)
 	source := &fixedSource{sample: Sample{ObservedAt: now, CPUUsageSecondsTotal: &zeroCPU, MemoryUsageBytes: &zeroMemory}}
-	service, err = NewService(fixedResolver{target: target}, sourceOf(source))
+	service, err := NewService(fixedResolver{target: target}, sourceOf(source))
 	if err != nil {
 		t.Fatal(err)
 	}
 	service.now = func() time.Time { return now }
-	observation, err = service.ObserveSession(t.Context(), "tenant", "session")
+	observation, err := service.ObserveSession(t.Context(), "tenant", "session")
 	if err != nil || observation.Status != StatusObserved || observation.Sample == nil || observation.Sample.CPUUsageSecondsTotal == nil || observation.Sample.MemoryUsageBytes == nil {
 		t.Fatalf("observed zero was lost: %+v %v", observation, err)
 	}
@@ -318,13 +309,16 @@ func TestServiceExportQueueNeverBlocksOrChangesObservation(t *testing.T) {
 }
 
 func TestServiceIgnoresExporterFailureAndValidatesOptions(t *testing.T) {
-	if _, err := NewService(fixedResolver{}, nil, WithExporter(nil, ExportOptions{})); err == nil {
+	if _, err := NewService(fixedResolver{}, nil); err == nil {
+		t.Fatal("missing source was accepted")
+	}
+	if _, err := NewService(fixedResolver{}, sourceOf(&fixedSource{}), WithExporter(nil, ExportOptions{})); err == nil {
 		t.Fatal("nil exporter was accepted")
 	}
-	if _, err := NewService(fixedResolver{}, nil, WithExporter(channelExporter{}, ExportOptions{QueueCapacity: -1})); err == nil {
+	if _, err := NewService(fixedResolver{}, sourceOf(&fixedSource{}), WithExporter(channelExporter{}, ExportOptions{QueueCapacity: -1})); err == nil {
 		t.Fatal("negative export queue capacity was accepted")
 	}
-	if _, err := NewService(fixedResolver{}, nil, WithExporter(channelExporter{}, ExportOptions{Timeout: -time.Second})); err == nil {
+	if _, err := NewService(fixedResolver{}, sourceOf(&fixedSource{}), WithExporter(channelExporter{}, ExportOptions{Timeout: -time.Second})); err == nil {
 		t.Fatal("negative export timeout was accepted")
 	}
 
@@ -486,7 +480,7 @@ func TestServiceExportsPeriodicSourceTimeoutAfterFinalOwnershipFence(t *testing.
 
 func TestServiceClassifiesResolverAndTerminalAllocationUnavailability(t *testing.T) {
 	now := time.Date(2026, 9, 22, 1, 0, 0, 0, time.UTC)
-	service, err := NewService(fixedResolver{target: Target{SessionID: "session", EnvironmentID: "environment", Mode: ModeManaged}, err: ErrUnavailable}, nil)
+	service, err := NewService(fixedResolver{target: Target{SessionID: "session", EnvironmentID: "environment", Mode: ModeManaged}, err: ErrUnavailable}, sourceOf(&fixedSource{}))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -563,7 +557,7 @@ func TestServiceRejectsMismatchedResolvedOwnership(t *testing.T) {
 		{TenantID: "tenant", SessionID: "session", EnvironmentID: "unexpected", Mode: ModeNone},
 		{TenantID: "tenant", SessionID: "session", Mode: ModeSelfHosted},
 	} {
-		service, err := NewService(fixedResolver{target: target}, nil)
+		service, err := NewService(fixedResolver{target: target}, sourceOf(&fixedSource{}))
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index 68624d30c..303d07e56 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -99,7 +99,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 	// registry it is built with.
 	deployments := func() *deployment.Service {
 		storage := deploymentpg.New(pgunit.NewPool(pool), pgtest.CredentialKey(t))
-		rules, err := placement.NewRules(registry, "")
+		rules, err := placement.NewRules(registry, "https://core.example")
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/services/core/internal/sessions/creation_test.go b/services/core/internal/sessions/creation_test.go
index 5bb22c0fc..7d9cc4524 100644
--- a/services/core/internal/sessions/creation_test.go
+++ b/services/core/internal/sessions/creation_test.go
@@ -468,7 +468,7 @@ func TestCreateSession(t *testing.T) {
 		calls []string
 	}{
 		{"a reset closes hosted admission", rules, func(tx *fakeCreationTx) {
-			tx.lockDeployment = returns(placement.Deployment{InstallationID: "installation", Resetting: true})
+			tx.lockDeployment = returns(placement.Deployment{InstallationID: "installation", Provider: "docker", Resetting: true})
 		}, placement.ErrResetAdmission, []string{"UpsertSession create", "LockDeployment"}},
 		{"no node places the Environment", rules, func(tx *fakeCreationTx) {
 			tx.lockDeployment = returns(placement.Deployment{InstallationID: "installation", Provider: "docker", Specification: json.RawMessage(`{}`)})
diff --git a/services/core/migrations/000096_configured_admission.sql b/services/core/migrations/000096_configured_admission.sql
new file mode 100644
index 000000000..0d2c98c4c
--- /dev/null
+++ b/services/core/migrations/000096_configured_admission.sql
@@ -0,0 +1,20 @@
+-- +goose Up
+-- Only a claimed deployment with a provider admits hosted work, so every
+-- allocation runs on a node or belongs to a direct deployment, and none needs
+-- a keepalive lease.
+-- +goose StatementBegin
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM runtime_allocations a CROSS JOIN runtime_deployment d
+            WHERE a.state <> 'released' AND a.node_id IS NULL AND d.mode <> 'direct')
+        OR EXISTS (SELECT 1 FROM environments e JOIN sessions s ON s.id = e.session_id CROSS JOIN runtime_deployment d
+            WHERE d.installation_id IS NULL AND s.deleted_at IS NULL AND e.status = 'pending'
+            AND s.configuration->'environment'->>'type' = 'openai_hosted') THEN
+        RAISE EXCEPTION 'Cannot upgrade: hosted Sessions hold sandbox work that no configured sandbox deployment admitted. Delete those Sessions and release their runtime allocations, then upgrade';
+    END IF;
+END $$;
+-- +goose StatementEnd
+ALTER TABLE runtime_allocations DROP COLUMN kept_at;
+
+-- +goose Down
+ALTER TABLE runtime_allocations ADD COLUMN kept_at timestamptz NOT NULL DEFAULT clock_timestamp();
diff --git a/services/core/tests/integration/admin_delete_audit_test.go b/services/core/tests/integration/admin_delete_audit_test.go
index bceb94c40..c6543cd35 100644
--- a/services/core/tests/integration/admin_delete_audit_test.go
+++ b/services/core/tests/integration/admin_delete_audit_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 	"github.com/google/uuid"
@@ -106,12 +105,7 @@ func assertAdminMutationAudit(t *testing.T, s *Store, tenant, request, action, k
 }
 
 func TestAdminDeleteResourceAuditTransactions(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{94}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	rejectAdminAuditInsert(t, s)
 	tables := []string{"agents", "agent_model_execution", "sessions", "turns", "environments", "session_artifacts", "admin_audit_log", "write_audit_operations", "write_audit_owners", "pg_largeobject_metadata", "pg_largeobject"}
 	for _, name := range []string{"session_delete", "artifact_delete"} {
diff --git a/services/core/tests/integration/admin_session_archive_test.go b/services/core/tests/integration/admin_session_archive_test.go
index 846c69b12..a36c7290c 100644
--- a/services/core/tests/integration/admin_session_archive_test.go
+++ b/services/core/tests/integration/admin_session_archive_test.go
@@ -8,7 +8,6 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/filepg"
@@ -39,12 +38,7 @@ func uploadSource(data []byte) func(io.Writer) (files.Upload, error) {
 
 func managedArchiveFixture(t *testing.T) (*Store, *Store, string) {
 	t.Helper()
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{37}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	installation := uuid.NewString()
 	changes := deploymentExecution(t, w)
diff --git a/services/core/tests/integration/admin_session_archive_worker_http_test.go b/services/core/tests/integration/admin_session_archive_worker_http_test.go
index 8e42cf4e7..fb536b9e3 100644
--- a/services/core/tests/integration/admin_session_archive_worker_http_test.go
+++ b/services/core/tests/integration/admin_session_archive_worker_http_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -17,7 +16,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
@@ -31,12 +29,7 @@ import (
 // the deployment execution operations on the Worker's lease, as server startup
 // does.
 func TestAdminSessionArchiveWorkerHTTPPostgres(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{83}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	installation := uuid.NewString()
 	provider := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	deployments := deploymentService(t, s)
diff --git a/services/core/tests/integration/agent_execution_defaults_http_test.go b/services/core/tests/integration/agent_execution_defaults_http_test.go
index fe4fa7db8..f243f40f1 100644
--- a/services/core/tests/integration/agent_execution_defaults_http_test.go
+++ b/services/core/tests/integration/agent_execution_defaults_http_test.go
@@ -9,16 +9,14 @@ import (
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
 
 func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{19}, 32))
-	st := NewWithCredentialCipher(pool, cipher)
+	st, _ := configuredStore(t)
+	pool := st.pool
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "defaults-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	deployment := &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://deployment.example/v1", APIKey: "deployment-canary"}
@@ -131,7 +129,7 @@ func TestAgentExecutionDefaultsPublicSnapshotAndPrecedence(t *testing.T) {
 		t.Fatal("retry created another Session")
 	}
 	call("POST", "/v1/agents/sessions", body, uuid.NewString(), 404)
-	st = NewWithCredentialCipher(pool, cipher)
+	st = New(t, pool)
 	assertSnapshot(sessionID, "model-original", "https://saved.example/v1", "saved-canary")
 	assertSnapshot(fresh, "model-new", "https://override.example/v1", "override-canary")
 	inline := `{"agent":{"model":"inline-model"},"environment":{"type":"openai_hosted"}}`
diff --git a/services/core/tests/integration/configuration_validation_public_test.go b/services/core/tests/integration/configuration_validation_public_test.go
index a04885f0d..8e29098dc 100644
--- a/services/core/tests/integration/configuration_validation_public_test.go
+++ b/services/core/tests/integration/configuration_validation_public_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -9,7 +8,6 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/agents"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
@@ -19,12 +17,7 @@ import (
 // resource ownership.
 func TestAgentConfigurationValidationRejectsWithoutWritesPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{63}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "config-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
diff --git a/services/core/tests/integration/deployment_model_providers_http_test.go b/services/core/tests/integration/deployment_model_providers_http_test.go
index be9c35db1..64344aa6d 100644
--- a/services/core/tests/integration/deployment_model_providers_http_test.go
+++ b/services/core/tests/integration/deployment_model_providers_http_test.go
@@ -11,7 +11,6 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
@@ -24,12 +23,8 @@ import (
 // frozen only into hosted Sessions; self-hosted Sessions bring their own
 // provider, and a Session with no provider is rejected before any write.
 func TestDeploymentModelProvidersHTTP(t *testing.T) {
-	_, pool := testStore(t)
-	if _, err := pool.Exec(t.Context(), "DELETE FROM deployment_model_providers"); err != nil {
-		t.Fatal(err)
-	}
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{53}, 32))
-	st := NewWithCredentialCipher(pool, cipher)
+	st, _ := configuredStore(t)
+	pool := st.pool
 	tenant, projectKey, coreKey := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "defaults-http", TokenSHA256: runtimedevice.HashCredential(projectKey), TenantID: tenant}})
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential(coreKey)})
@@ -162,7 +157,7 @@ func TestDeploymentModelProvidersHTTP(t *testing.T) {
 	// Simulate a default persisted when cross-protocol execution was supported.
 	// It must remain readable, but cannot create new Sessions or be rewritten.
 	historical := strings.Replace(codexDefault, `"protocol":"responses"`, `"protocol":"anthropic"`, 1)
-	encrypted, err := cipher.SealDeploymentModelProvider([]byte(historical), "codex")
+	encrypted, err := st.credentialCipher.SealDeploymentModelProvider([]byte(historical), "codex")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/device_bootstrap_binding_test.go b/services/core/tests/integration/device_bootstrap_binding_test.go
index bf28d963d..4d85bc1c9 100644
--- a/services/core/tests/integration/device_bootstrap_binding_test.go
+++ b/services/core/tests/integration/device_bootstrap_binding_test.go
@@ -59,14 +59,14 @@ func TestDeviceCredentialCarriesPersistedAllocationNode(t *testing.T) {
 }
 
 func TestDeviceCredentialWithoutManagedNodeRetainsPublicRouteIdentity(t *testing.T) {
-	s, _ := testStore(t)
+	s, installation := configuredStore(t)
 	tenant := uuid.NewString()
 	ordinary, err := sessionService(t, s).CreateDevice(t.Context(), tenant, "ordinary", runtimedevice.HashCredential("ordinary-token"))
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, environment := localEnvironment(t, s, tenant)
-	allocation, err := deploymentExecution(t, executionWriter(t, s)).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, uuid.NewString(), runtimedevice.HashCredential("allocation-token"))
+	allocation, err := deploymentExecution(t, executionWriter(t, s)).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, installation, runtimedevice.HashCredential("allocation-token"))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/dispatch_test.go b/services/core/tests/integration/dispatch_test.go
index 2f9ab27f3..8bbd3612b 100644
--- a/services/core/tests/integration/dispatch_test.go
+++ b/services/core/tests/integration/dispatch_test.go
@@ -50,7 +50,16 @@ func newDispatchHarness(t *testing.T) *dispatchHarness {
 
 func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool) *dispatchHarness {
 	t.Helper()
+	var snapshot struct {
+		Environment struct {
+			Type string `json:"type"`
+		} `json:"environment"`
+	}
+	_ = json.Unmarshal(configuration, &snapshot)
 	s, _ := testStore(t)
+	if snapshot.Environment.Type == "openai_hosted" {
+		s, _ = configuredStore(t)
+	}
 	h := &dispatchHarness{t: t, s: s, tenant: uuid.NewString(), environments: map[string]*dispatchHarness{}}
 	ctx := context.Background()
 	var err error
@@ -60,12 +69,6 @@ func newDispatchHarnessForSession(t *testing.T, configuration []byte, local bool
 	}
 	secret := uuid.NewString()
 	h.credential = secret
-	var snapshot struct {
-		Environment struct {
-			Type string `json:"type"`
-		} `json:"environment"`
-	}
-	_ = json.Unmarshal(configuration, &snapshot)
 	if snapshot.Environment.Type == "self_hosted" {
 		h.device, h.credential = enrollFixtureSession(t, s, h.tenant, h.session)
 		secret = h.credential
diff --git a/services/core/tests/integration/environment_executor_management_test.go b/services/core/tests/integration/environment_executor_management_test.go
index a2f5a0d84..a753ee1cd 100644
--- a/services/core/tests/integration/environment_executor_management_test.go
+++ b/services/core/tests/integration/environment_executor_management_test.go
@@ -22,7 +22,8 @@ func projectCredentials(ctx context.Context, s *Store, project identity.Principa
 }
 
 func TestProjectEnvironmentExecutorManagement(t *testing.T) {
-	s, pool := testStore(t)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	ctx := t.Context()
 	binding := createTestProject(t, pool)
 	project, p := binding.Project, binding.Principal
diff --git a/services/core/tests/integration/environment_file_write_semantics_public_test.go b/services/core/tests/integration/environment_file_write_semantics_public_test.go
index 03398dc75..eef998402 100644
--- a/services/core/tests/integration/environment_file_write_semantics_public_test.go
+++ b/services/core/tests/integration/environment_file_write_semantics_public_test.go
@@ -50,7 +50,7 @@ func serveFileWrite(h *dispatchHarness, final proto.WorkspaceWriteResultPayload)
 
 func TestEnvironmentFileCreateRejectionsLeaveNoReceiptOrConsumption(t *testing.T) {
 	h, w, environment := localWorker(t, true, false)
-	_, pool := testStore(t)
+	pool := h.s.pool
 	if _, err := pool.Exec(t.Context(), `UPDATE environments SET status='connected' WHERE id=$1`, environment.ID); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/environment_file_writes_test.go b/services/core/tests/integration/environment_file_writes_test.go
index 276e346ad..214739949 100644
--- a/services/core/tests/integration/environment_file_writes_test.go
+++ b/services/core/tests/integration/environment_file_writes_test.go
@@ -24,7 +24,8 @@ type fileWriteFixture struct {
 
 func newFileWriteFixture(t *testing.T) fileWriteFixture {
 	t.Helper()
-	s, pool := testStore(t)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	lease := executionWriter(t, s).lease
 	tenant := uuid.NewString()
 	session, env := localEnvironment(t, s, tenant)
@@ -50,7 +51,7 @@ func TestEnvironmentFileWriteRetainsUnknownAcrossLeaseLoss(t *testing.T) {
 	if _, err := f.writer.SettleEnvironmentFileWrite(ctx, f.tenant, f.env.ID, f.key, "committed"); err == nil {
 		t.Fatal("lost writer settled an upload")
 	}
-	reopened, _ := testStore(t)
+	reopened := New(t, f.s.pool)
 	next := sessionExecution(t, executionWriter(t, reopened).lease)
 	got, err := next.ReserveEnvironmentFileWrite(ctx, f.tenant, f.env.ID, f.key)
 	if err != nil || !got.Replayed || got.State != "pending" || !got.CreatedAt.Equal(first.CreatedAt) || got.Identity != f.key {
diff --git a/services/core/tests/integration/environment_initial_input_test.go b/services/core/tests/integration/environment_initial_input_test.go
index da0f37d64..936be6d94 100644
--- a/services/core/tests/integration/environment_initial_input_test.go
+++ b/services/core/tests/integration/environment_initial_input_test.go
@@ -84,7 +84,8 @@ func TestEnvironmentInitialExpiryRollsBackWithFailureEventAndSerializesPromotion
 func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *testing.T) {
 	for _, kind := range []string{"self_hosted", "openai_hosted"} {
 		t.Run(kind, func(t *testing.T) {
-			s, pool := testStore(t)
+			s, _ := configuredStore(t)
+			pool := s.pool
 			tenant := uuid.NewString()
 			input := environmentInput("initial", kind, "/workspace")
 			input.InitialInputs = []sessions.Input{messageInput("first"), messageInput("second")}
@@ -126,7 +127,7 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 			if err != nil || len(events) != expectedEvents || (expectedEvents > 0 && (events[0].Event.Type != "agent.session."+status || events[0].Turn != nil)) {
 				t.Fatal("creation cursor lost initial activity", events, err)
 			}
-			other, _ := testStore(t)
+			other := reopenStore(t, s)
 			retry, err := createSession(t.Context(), other, tenant, input)
 			// A retry returns the current projection; the reservation is unchanged.
 			if err != nil || retry.Created || retry.Cursor != int64(expectedEvents) || retry.Session.ID != session.ID || activityStatus(retry.Session) != activityStatus(session) || retry.Session.LastTurn != nil {
@@ -200,7 +201,8 @@ func TestEnvironmentInitialInputCreationRetainsCursorIdentityAndPromotion(t *tes
 func TestEnvironmentInitialInputExpiryHasNoTurnAndCannotReplay(t *testing.T) {
 	for _, kind := range []string{"self_hosted", "openai_hosted"} {
 		t.Run(kind, func(t *testing.T) {
-			s, pool := testStore(t)
+			s, _ := configuredStore(t)
+			pool := s.pool
 			tenant := uuid.NewString()
 			input := environmentInput("initial-expiry", kind, "/workspace")
 			input.InitialInputs = []sessions.Input{messageInput("private initial text")}
@@ -237,8 +239,9 @@ func TestEnvironmentInitialInputExpiryHasNoTurnAndCannotReplay(t *testing.T) {
 				t.Fatal(err)
 			}
 			awaitRelease()
+			reopened := reopenStore(t, s)
 			pool.Close()
-			reopened, reopenedPool := testStore(t)
+			reopenedPool := reopened.pool
 			writer = executionWriter(t, reopened)
 			if _, err := reopened.CreateSession(t.Context(), tenant, input); err != nil {
 				t.Fatal(err)
diff --git a/services/core/tests/integration/environment_initialization_test.go b/services/core/tests/integration/environment_initialization_test.go
index d21de7390..77c1261d9 100644
--- a/services/core/tests/integration/environment_initialization_test.go
+++ b/services/core/tests/integration/environment_initialization_test.go
@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
@@ -49,12 +48,7 @@ func awaitInitialization(t *testing.T, s *Store, tenant, environment, state stri
 func TestUserManagedPreparationUsesAuthenticatedRuntimeWithoutAllocation(t *testing.T) {
 	for _, outcome := range []string{"completed", "failed", "unknown", "unavailable", "revoked"} {
 		t.Run(outcome, func(t *testing.T) {
-			_, pool := newManagedTestStore(t)
-			cipher, err := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-			if err != nil {
-				t.Fatal(err)
-			}
-			s := NewWithCredentialCipher(pool, cipher)
+			s, _ := newManagedTestStore(t)
 			principal := FixtureExecutorPrincipal(t, s, uuid.NewString())
 			session, err := s.CreateSession(t.Context(), principal.TenantID, sessions.CreateSession{
 				Creator: principal.Subject(), Engine: "codex", IdempotencyKey: uuid.NewString(),
diff --git a/services/core/tests/integration/environment_installation_test.go b/services/core/tests/integration/environment_installation_test.go
index e4282f866..ba25bfe3f 100644
--- a/services/core/tests/integration/environment_installation_test.go
+++ b/services/core/tests/integration/environment_installation_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -10,18 +9,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 )
 
 func TestEnvironmentInstallationClaimLifetimeAndRetries(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{37}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := testStore(t)
 	installations := sessionService(t, s)
 	ctx := t.Context()
 	p := createTestProject(t, pool).Principal
@@ -51,7 +44,7 @@ func TestEnvironmentInstallationClaimLifetimeAndRetries(t *testing.T) {
 	expired.ExpiresAt = time.Now().Add(-time.Second).Unix()
 	raw, _ = json.Marshal(expired)
 	payload = base64.RawURLEncoding.EncodeToString(raw)
-	signature, _ := cipher.Fingerprint("environment-installation", payload)
+	signature, _ := s.credentialCipher.Fingerprint("environment-installation", payload)
 	if _, err := installations.ValidateEnvironmentInstallation(ctx, payload+"."+signature, "build"); !errors.Is(err, sessions.ErrInstallationAuthorization) {
 		t.Fatal("accepted expired grant", err)
 	}
diff --git a/services/core/tests/integration/environment_plugins_test.go b/services/core/tests/integration/environment_plugins_test.go
index 21d207470..f3a5fb5ce 100644
--- a/services/core/tests/integration/environment_plugins_test.go
+++ b/services/core/tests/integration/environment_plugins_test.go
@@ -9,19 +9,13 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentplugin"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 )
 
 func TestPluginsFrozenInSession(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{23}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := configuredStore(t)
 	var archive bytes.Buffer
 	writer := zip.NewWriter(&archive)
 	for path, body := range map[string]string{
@@ -37,7 +31,7 @@ func TestPluginsFrozenInSession(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
-	if err = writer.Close(); err != nil {
+	if err := writer.Close(); err != nil {
 		t.Fatal(err)
 	}
 	setup := environmentconfig.Setup{Plugins: []environmentconfig.Plugin{{Metadata: agentplugin.Metadata{Type: "inline", Name: "plugin-proof", Description: "A proof."}, Archive: archive.Bytes()}}, CapabilityDirectories: []string{"/workspace/generated"}}
diff --git a/services/core/tests/integration/environment_setup_test.go b/services/core/tests/integration/environment_setup_test.go
index 039131e0e..23bfe6f0a 100644
--- a/services/core/tests/integration/environment_setup_test.go
+++ b/services/core/tests/integration/environment_setup_test.go
@@ -8,19 +8,13 @@ import (
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 )
 
 func TestEnvironmentSetupEncryptedSnapshotAndIsolation(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{5}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := configuredStore(t)
 	tenant, foreign := uuid.NewString(), uuid.NewString()
 	setup := environmentconfig.Setup{Env: map[string]string{"SECRET": "session-env-canary"}, Commands: []environmentconfig.SetupCommand{{Command: "printf session-command-canary > result"}}, Packages: v1.EnvironmentPackages{NPM: []string{"is-number@7.0.0"}}}
 	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), Initialization: setup}
diff --git a/services/core/tests/integration/environments_test.go b/services/core/tests/integration/environments_test.go
index 430b829a1..7dce3a10e 100644
--- a/services/core/tests/integration/environments_test.go
+++ b/services/core/tests/integration/environments_test.go
@@ -26,7 +26,8 @@ func environmentInput(key, kind, directory string) sessions.CreateSession {
 func TestEnvironmentOwnershipPersistsAndStaysScoped(t *testing.T) {
 	for _, kind := range []string{"self_hosted", "openai_hosted"} {
 		t.Run(kind, func(t *testing.T) {
-			s, pool := testStore(t)
+			s, _ := configuredStore(t)
+			pool := s.pool
 			ctx := context.Background()
 			tenant, foreign := uuid.NewString(), uuid.NewString()
 			input := environmentInput("environment", kind, "/workspace")
@@ -65,8 +66,8 @@ func TestEnvironmentOwnershipPersistsAndStaysScoped(t *testing.T) {
 			if _, err := sessionService(t, s).UpdateSessionMetadata(ctx, sessions.UpdateSessionMetadataCommand{TenantID: tenant, SessionID: session.ID, Metadata: map[string]string{"updated": "yes"}}); err != nil {
 				t.Fatal(err)
 			}
+			restarted := reopenStore(t, s)
 			pool.Close()
-			restarted, _ := testStore(t)
 			retry, err := restarted.CreateSession(ctx, tenant, input)
 			if err != nil || retry.ID != session.ID || retry.Metadata["updated"] != "yes" {
 				t.Fatal(retry, err)
@@ -80,8 +81,9 @@ func TestEnvironmentOwnershipPersistsAndStaysScoped(t *testing.T) {
 }
 
 func TestEnvironmentCreationWinnerOwnsSnapshotAndIdentity(t *testing.T) {
-	s, pool := testStore(t)
-	other, _ := testStore(t)
+	s, _ := configuredStore(t)
+	pool := s.pool
+	other := reopenStore(t, s)
 	ctx := context.Background()
 	tenant := uuid.NewString()
 	intent := json.RawMessage(`{"request":"resolved-template"}`)
@@ -157,8 +159,8 @@ func TestEnvironmentCreationWinnerOwnsSnapshotAndIdentity(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	restarted := reopenStore(t, s)
 	pool.Close()
-	restarted, _ := testStore(t)
 	retryInput := environmentInput("winner", "openai_hosted", "/changed-resolution")
 	retryInput.CreationRequest = intent
 	retryInput.InitialInputs = []sessions.Input{messageInput("initial")}
diff --git a/services/core/tests/integration/file_resource_semantics_public_test.go b/services/core/tests/integration/file_resource_semantics_public_test.go
index 83854d136..e297d0065 100644
--- a/services/core/tests/integration/file_resource_semantics_public_test.go
+++ b/services/core/tests/integration/file_resource_semantics_public_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
@@ -21,10 +20,6 @@ func TestFileResourceSemanticsOfficialClientPostgres(t *testing.T) {
 		t.Skip("pinned official Python SDK required")
 	}
 	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{53}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "resources-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
@@ -32,7 +27,7 @@ func TestFileResourceSemanticsOfficialClientPostgres(t *testing.T) {
 	})
 	newServer := func() *httptest.Server {
 		t.Helper()
-		s := NewWithCredentialCipher(pool, cipher)
+		s := New(t, pool)
 		h, err := publicHandler(t, s, auth, "codex")
 		if err != nil {
 			t.Fatal(err)
diff --git a/services/core/tests/integration/function_worker_test.go b/services/core/tests/integration/function_worker_test.go
index 916f4f113..d15c24f79 100644
--- a/services/core/tests/integration/function_worker_test.go
+++ b/services/core/tests/integration/function_worker_test.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto/prototest"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
@@ -120,12 +119,7 @@ const mcpWorkerConfiguration = `{"agent":{"model":"gpt-5.5","tools":[{"type":"mc
 
 func mcpBearerWorkerConfiguration(t *testing.T, h *dispatchHarness) (string, string) {
 	t.Helper()
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New([]byte(strings.Repeat("k", 32)))
-	if err != nil {
-		t.Fatal(err)
-	}
-	h.s = NewWithCredentialCipher(pool, cipher)
+	h.s, _ = testStore(t)
 	_, service, err := fixtureVaults(h.s)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/hosted_initialization_failure_public_test.go b/services/core/tests/integration/hosted_initialization_failure_public_test.go
index 4364a0e8b..c5805c4ed 100644
--- a/services/core/tests/integration/hosted_initialization_failure_public_test.go
+++ b/services/core/tests/integration/hosted_initialization_failure_public_test.go
@@ -18,7 +18,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
@@ -98,19 +97,6 @@ func (p *hostedFailureProvider) prepare(request proto.RuntimePreparePayload, _ [
 	return completedInitialization(request, nil)
 }
 
-// hostedFailureStore returns a store whose Web deployment is claimed by the
-// returned installation.
-func hostedFailureStore(t *testing.T) (*Store, string) {
-	t.Helper()
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
-	return s, webDeployment(t, s, "e2b")
-}
-
 func hostedFailureSession(t *testing.T, s *Store, tenant string, input sessions.CreateSession) (sessions.Session, sessions.Environment) {
 	t.Helper()
 	input.Creator, input.Engine, input.IdempotencyKey = FixtureCreator(), "codex", uuid.NewString()
@@ -182,7 +168,7 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 			"Failed to provision environment: Skill installation failed", []string{"configure", "skill"}},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			s, key := hostedFailureStore(t)
+			s, key := configuredStore(t)
 			tenant := uuid.NewString()
 			session, environment := hostedFailureSession(t, s, tenant, test.input)
 			p := &hostedFailureProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}},
@@ -247,7 +233,7 @@ func TestHostedInitializationFailureRecordsSafeSessionFailure(t *testing.T) {
 // A pending initial input settles exactly as before; the one failed snapshot
 // carries both that settlement and the provisioning failure.
 func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
-	s, key := hostedFailureStore(t)
+	s, key := configuredStore(t)
 	tenant := uuid.NewString()
 	session, environment := hostedFailureSession(t, s, tenant, sessions.CreateSession{
 		Initialization: environmentconfig.Setup{Commands: []environmentconfig.SetupCommand{{Command: "exit 3"}}},
@@ -281,7 +267,7 @@ func TestHostedInitializationFailureSettlesPendingInitialInput(t *testing.T) {
 // stream ends after agent.session.failed; later input gets the observed 409;
 // delete succeeds; tenant B sees nothing; the canary never appears.
 func TestHostedInitializationFailurePublicHTTP(t *testing.T) {
-	s, key := hostedFailureStore(t)
+	s, key := configuredStore(t)
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	session, environment := hostedFailureSession(t, s, tenant, sessions.CreateSession{
 		Initialization: environmentconfig.Setup{Commands: []environmentconfig.SetupCommand{{Command: "echo " + hostedFailureCanary + "; exit 3"}}},
diff --git a/services/core/tests/integration/initial_files_http_test.go b/services/core/tests/integration/initial_files_http_test.go
index 25d67b80a..1ca13914a 100644
--- a/services/core/tests/integration/initial_files_http_test.go
+++ b/services/core/tests/integration/initial_files_http_test.go
@@ -8,18 +8,12 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
 
 func TestInitialFilesHTTPInlineLimitsAndRetry(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{9}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := configuredStore(t)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	// Exercise HTTP parsing and durable storage without starting a Runtime.
diff --git a/services/core/tests/integration/list_cursor_public_test.go b/services/core/tests/integration/list_cursor_public_test.go
index 9dadd476f..2009af3e3 100644
--- a/services/core/tests/integration/list_cursor_public_test.go
+++ b/services/core/tests/integration/list_cursor_public_test.go
@@ -13,7 +13,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
@@ -221,12 +220,7 @@ func wireError(kind string, code, param *string, message string) string {
 // lookups keep their behavior (K1–K3). A foreign cursor is always byte-identical
 // to a missing one, and a foreign or missing parent is 404 before any cursor.
 func TestListCursorErrorsPostgres(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{67}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := configuredStore(t)
 	owner, foreign := uuid.NewString(), uuid.NewString()
 	ownerTenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
diff --git a/services/core/tests/integration/list_query_public_test.go b/services/core/tests/integration/list_query_public_test.go
index 8a67221f8..bb15d690d 100644
--- a/services/core/tests/integration/list_query_public_test.go
+++ b/services/core/tests/integration/list_query_public_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"context"
 	"net/http/httptest"
 	"os"
@@ -9,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/google/uuid"
 )
 
@@ -20,12 +19,7 @@ func TestListQueryOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{72}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "query-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
@@ -33,7 +27,7 @@ func TestListQueryOfficialClientPostgres(t *testing.T) {
 	})
 	// Use real admission while leaving dispatch paused. Public cancellation retains
 	// the queued history; this fixture does not perform native or model execution.
-	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{})
+	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 	t.Cleanup(func() {
 		stopped, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/tests/integration/local_environment_devices_test.go b/services/core/tests/integration/local_environment_devices_test.go
index 24f24c486..9a146faad 100644
--- a/services/core/tests/integration/local_environment_devices_test.go
+++ b/services/core/tests/integration/local_environment_devices_test.go
@@ -28,7 +28,8 @@ func localEnvironment(t *testing.T, s *Store, tenant string) (sessions.Session,
 }
 
 func TestEnvironmentDeviceAuthorityAndLifecycle(t *testing.T) {
-	s, pool := testStore(t)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	tenant, foreignTenant := uuid.NewString(), uuid.NewString()
 	session, environment := localEnvironment(t, s, tenant)
 	sibling, _ := localEnvironment(t, s, tenant)
@@ -51,8 +52,7 @@ func TestEnvironmentDeviceAuthorityAndLifecycle(t *testing.T) {
 	if err != nil || len(devices) != 0 {
 		t.Fatalf("dedicated device entered general selection: %v %v", devices, err)
 	}
-	reopened, _ := testStore(t)
-	got, err := sessionAdapter(reopened).GetSessionDevice(t.Context(), tenant, session.ID)
+	got, err := sessionAdapter(New(t, pool)).GetSessionDevice(t.Context(), tenant, session.ID)
 	if err != nil || got != bound {
 		t.Fatalf("durable exact binding: %+v %v", got, err)
 	}
@@ -72,7 +72,8 @@ func TestEnvironmentDeviceAuthorityAndLifecycle(t *testing.T) {
 }
 
 func TestEnvironmentDeviceProvisioningHasOneWinner(t *testing.T) {
-	s, pool := testStore(t)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	tenant := uuid.NewString()
 	session, environment := localEnvironment(t, s, tenant)
 	var wg sync.WaitGroup
diff --git a/services/core/tests/integration/local_environment_worker_test.go b/services/core/tests/integration/local_environment_worker_test.go
index 5d9b3214c..a3f7651e9 100644
--- a/services/core/tests/integration/local_environment_worker_test.go
+++ b/services/core/tests/integration/local_environment_worker_test.go
@@ -17,8 +17,7 @@ func localWorker(t *testing.T, scoped, execute bool) (*dispatchHarness, *executi
 	t.Helper()
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`), scoped)
 	if scoped {
-		_, pool := testStore(t)
-		insertWorkerRuntimeAllocation(t, pool, h, "disabled")
+		insertWorkerRuntimeAllocation(t, h.s.pool, h, "disabled")
 	}
 	environment, err := sessionAdapter(h.s).GetSessionEnvironment(t.Context(), h.tenant, h.session.ID)
 	if err != nil {
diff --git a/services/core/tests/integration/managed_fixture_test.go b/services/core/tests/integration/managed_fixture_test.go
index 9248f7d2b..bd7d4aca9 100644
--- a/services/core/tests/integration/managed_fixture_test.go
+++ b/services/core/tests/integration/managed_fixture_test.go
@@ -15,3 +15,24 @@ func newManagedTestStore(t *testing.T) (*Store, *pgxpool.Pool) {
 	pool := pgtest.OpenIsolated(t, nil)
 	return New(t, pool), pool
 }
+
+// configuredStore is newManagedTestStore claimed for a new installation and
+// configured for E2B, as Web setup leaves an installation, so that it admits
+// hosted work. It returns the installation.
+func configuredStore(t *testing.T) (*Store, string) {
+	t.Helper()
+	s, _ := newManagedTestStore(t)
+	return s, webDeployment(t, s, "e2b")
+}
+
+// reopenStore is the fixture on a new pool to s's database, as after a restart.
+// The pool closes when the test ends.
+func reopenStore(t *testing.T, s *Store) *Store {
+	t.Helper()
+	pool, err := pgxpool.NewWithConfig(t.Context(), s.pool.Config())
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(pool.Close)
+	return New(t, pool)
+}
diff --git a/services/core/tests/integration/mcp_credential_selection_public_test.go b/services/core/tests/integration/mcp_credential_selection_public_test.go
index 407bbcafb..8c2c66e04 100644
--- a/services/core/tests/integration/mcp_credential_selection_public_test.go
+++ b/services/core/tests/integration/mcp_credential_selection_public_test.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
@@ -25,12 +24,7 @@ type selectionResponse struct {
 // M1–M8) over real HTTP and PostgreSQL, with tenants A and B.
 func TestMCPCredentialSelectionPublicPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{67}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	tenantA, tokenA, tokenB := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-a", TokenSHA256: runtimedevice.HashCredential(tokenA), TenantID: tenantA},
diff --git a/services/core/tests/integration/model_protocol_native_test.go b/services/core/tests/integration/model_protocol_native_test.go
index 587074d0c..875b75cb0 100644
--- a/services/core/tests/integration/model_protocol_native_test.go
+++ b/services/core/tests/integration/model_protocol_native_test.go
@@ -61,7 +61,7 @@ func TestNativeModelProtocolPublicExecution(t *testing.T) {
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), 15*time.Minute)
 	defer cancel()
-	worker, err := startWorkerErr(ctx, h.s, h.d)
+	worker, err := startWorkerErr(t, ctx, h.s, h.d)
 	if err != nil {
 		t.Fatal("cannot start native execution worker")
 	}
diff --git a/services/core/tests/integration/path_id_semantics_public_test.go b/services/core/tests/integration/path_id_semantics_public_test.go
index 288df95a7..46601348b 100644
--- a/services/core/tests/integration/path_id_semantics_public_test.go
+++ b/services/core/tests/integration/path_id_semantics_public_test.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
@@ -86,12 +85,7 @@ func databaseDigest(t *testing.T, pool *pgxpool.Pool) map[string]string {
 
 func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{61}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	owner, foreign := uuid.NewString(), uuid.NewString()
 	ownerTenant := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
@@ -123,7 +117,7 @@ func TestMalformedPathIDsMatchMissingPostgres(t *testing.T) {
 		t.Fatal("fixture Environment", err)
 	}
 	environment := hosted.Environment.ID
-	skill, err := SkillService(t, pool, cipher).CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: skillArchive(t, "path-skill")})
+	skill, err := SkillService(t, pool, s.credentialCipher).CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: skillArchive(t, "path-skill")})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/public_execution_test.go b/services/core/tests/integration/public_execution_test.go
index b327607b8..e52ee9dc5 100644
--- a/services/core/tests/integration/public_execution_test.go
+++ b/services/core/tests/integration/public_execution_test.go
@@ -38,7 +38,7 @@ func TestExecutionWorkerAdmissionBindingAndRecovery(t *testing.T) {
 			t.Error("worker did not stop")
 		}
 	})
-	if second, err := startWorkerErr(ctx, h.s, h.d); err == nil {
+	if second, err := startWorkerErr(t, ctx, h.s, h.d); err == nil {
 		cancel()
 		go second.Run(ctx)
 		t.Fatal("second service acquired database")
@@ -168,7 +168,7 @@ func TestWorkerRestartReconcilesClaimedButPreservesQueuedWork(t *testing.T) {
 	if err != nil || pending.LastTurn.Status != sessions.TurnCancelled {
 		t.Fatal(pending, err)
 	}
-	restarted, err := startWorkerErr(ctx, h.s, h.d)
+	restarted, err := startWorkerErr(t, ctx, h.s, h.d)
 	if err != nil {
 		t.Fatal("lease not released", err)
 	}
diff --git a/services/core/tests/integration/remote_mcp_test.go b/services/core/tests/integration/remote_mcp_test.go
index 1bd8d3b94..c7d0ad2de 100644
--- a/services/core/tests/integration/remote_mcp_test.go
+++ b/services/core/tests/integration/remote_mcp_test.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/google/uuid"
@@ -74,12 +73,7 @@ func TestSelfHostedServiceMCPRejectedWithoutWrites(t *testing.T) {
 
 func selfHostedMCPAdmissionFixture(t *testing.T) (*Store, string, vaults.Vault, vaults.Credential) {
 	t.Helper()
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New([]byte(strings.Repeat("k", 32)))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := testStore(t)
 	_, service, err := fixtureVaults(s)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/request_body_public_test.go b/services/core/tests/integration/request_body_public_test.go
index 2b6a72fe4..b4a372788 100644
--- a/services/core/tests/integration/request_body_public_test.go
+++ b/services/core/tests/integration/request_body_public_test.go
@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -24,12 +23,7 @@ import (
 // sent as text/plain, change nothing for the owner or another tenant.
 func TestRequestBodyGateRejectsWithoutWritesPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{64}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "body-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
@@ -165,12 +159,7 @@ func TestRequestBodyGateRejectsWithoutWritesPostgres(t *testing.T) {
 // Core extension routes keep their own body handling, without the Content-Type
 // rule or the official body messages.
 func TestRequestBodyGateExcludedRoutesPostgres(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{65}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := testStore(t)
 	token, tenant := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "excluded-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	h, err := publicHandler(t, s, auth, "codex")
diff --git a/services/core/tests/integration/root_fixture_test.go b/services/core/tests/integration/root_fixture_test.go
index e1ad7512b..a29b67530 100644
--- a/services/core/tests/integration/root_fixture_test.go
+++ b/services/core/tests/integration/root_fixture_test.go
@@ -33,19 +33,14 @@ type Store struct {
 }
 
 // defaultPlacement is the placement rules cmd/server builds on the built-in
-// providers and an unset public URL.
-var defaultPlacement, _ = placement.NewRules(providers.Builtin(), "")
+// providers and the public URL https://core.example.
+var defaultPlacement, _ = placement.NewRules(providers.Builtin(), "https://core.example")
 
 // New is the fixture on pool under the shared test credential key and
 // defaultPlacement.
 func New(t testing.TB, pool *pgxpool.Pool) *Store {
-	return NewWithCredentialCipher(pool, pgtest.CredentialKey(t))
-}
-
-// NewWithCredentialCipher is New under another credential key.
-func NewWithCredentialCipher(pool *pgxpool.Pool, cipher *credentialcrypto.Cipher) *Store {
 	pooled := pgunit.NewPool(pool)
-	return &Store{queries: sqlc.New(pool), pool: pool, pooled: pooled, writer: pooled, credentialCipher: cipher, placement: defaultPlacement}
+	return &Store{queries: sqlc.New(pool), pool: pool, pooled: pooled, writer: pooled, credentialCipher: pgtest.CredentialKey(t), placement: defaultPlacement}
 }
 
 // NewExecution is s with its Session transactions on lease.
diff --git a/services/core/tests/integration/runtime_allocations_test.go b/services/core/tests/integration/runtime_allocations_test.go
index 14ffb4994..cd9899680 100644
--- a/services/core/tests/integration/runtime_allocations_test.go
+++ b/services/core/tests/integration/runtime_allocations_test.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"sync"
 	"testing"
-	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
@@ -15,9 +14,10 @@ import (
 )
 
 func TestRuntimeAllocationAtomicOwnershipAndRecovery(t *testing.T) {
-	s, pool := testStore(t)
+	s, provider := configuredStore(t)
+	pool := s.pool
 	w := executionWriter(t, s)
-	tenant, provider := uuid.NewString(), uuid.NewString()
+	tenant := uuid.NewString()
 	session, environment := localEnvironment(t, s, tenant)
 	secret := uuid.NewString()
 	owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, provider, runtimedevice.HashCredential(secret))
@@ -42,8 +42,7 @@ func TestRuntimeAllocationAtomicOwnershipAndRecovery(t *testing.T) {
 	if _, err := deploymentExecution(t, w).ObserveRunning(t.Context(), owner); err == nil {
 		t.Fatal("lost writer changed allocation")
 	}
-	reopened, _ := testStore(t)
-	next := executionWriter(t, reopened)
+	next := executionWriter(t, New(t, pool))
 	retry, err := deploymentExecution(t, next).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, provider, runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil || !retry.Replayed || retry.ID != owner.ID || retry.DeviceID != owner.DeviceID {
 		t.Fatalf("restart replaced unknown allocation: %+v %v", retry, err)
@@ -99,9 +98,10 @@ func TestRuntimeAllocationAtomicOwnershipAndRecovery(t *testing.T) {
 }
 
 func TestRuntimeAllocationOneWinnerAndRollback(t *testing.T) {
-	s, pool := testStore(t)
+	s, provider := configuredStore(t)
+	pool := s.pool
 	w := executionWriter(t, s)
-	tenant, provider := uuid.NewString(), uuid.NewString()
+	tenant := uuid.NewString()
 	_, environment := localEnvironment(t, s, tenant)
 	var wg sync.WaitGroup
 	results := make(chan deployment.Allocation, 8)
@@ -155,12 +155,12 @@ func TestRuntimeAllocationOneWinnerAndRollback(t *testing.T) {
 	}
 }
 
-func TestRuntimeAllocationExpiryAndRevocation(t *testing.T) {
-	s, pool := testStore(t)
+func TestRuntimeAllocationCleanupRevokesAndKeepsIdentity(t *testing.T) {
+	s, installation := configuredStore(t)
 	w := executionWriter(t, s)
 	tenant := uuid.NewString()
 	_, environment := localEnvironment(t, s, tenant)
-	owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, uuid.NewString(), runtimedevice.HashCredential(uuid.NewString()))
+	owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -168,26 +168,23 @@ func TestRuntimeAllocationExpiryAndRevocation(t *testing.T) {
 	if err != nil || !owner.CreateSettled {
 		t.Fatalf("running observation: %+v %v", owner, err)
 	}
-	if _, err := deploymentExecution(t, w).KeepAllocation(t.Context(), owner); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := pool.Exec(t.Context(), "UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '61 minutes' WHERE id=$1", owner.ID); err != nil {
+	if _, err := deploymentExecution(t, w).CheckRunning(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := deploymentExecution(t, w).KeepAllocation(t.Context(), owner); !errors.Is(err, deployment.ErrAllocationConflict) {
-		t.Fatalf("expired allocation renewed: %v", err)
-	}
 	if _, err := deploymentExecution(t, w).RequestCleanup(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
 	if _, ok, err := sessionAdapter(s).GetDeviceCredential(t.Context(), owner.DeviceID); err != nil || ok {
 		t.Fatal("cleanup credential still authenticates")
 	}
+	if _, err := deploymentExecution(t, w).CheckRunning(t.Context(), owner); !errors.Is(err, deployment.ErrAllocationConflict) {
+		t.Fatalf("cleanup kept the allocation running: %v", err)
+	}
 	if _, err := deploymentExecution(t, w).ReleaseAllocation(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
 	got, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, owner.ProviderKey, runtimedevice.HashCredential(uuid.NewString()))
-	if err != nil || !got.Replayed || got.State != "released" || got.KeptAt.After(time.Now()) {
+	if err != nil || !got.Replayed || got.State != "released" {
 		t.Fatalf("cleanup permitted replacement: %+v %v", got, err)
 	}
 }
diff --git a/services/core/tests/integration/runtime_capabilities_pending_test.go b/services/core/tests/integration/runtime_capabilities_pending_test.go
index 3e3c01d2d..6f40db170 100644
--- a/services/core/tests/integration/runtime_capabilities_pending_test.go
+++ b/services/core/tests/integration/runtime_capabilities_pending_test.go
@@ -1,12 +1,10 @@
 package integration
 
 import (
-	"bytes"
 	"encoding/json"
 	"errors"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
@@ -15,13 +13,7 @@ import (
 )
 
 func TestManagedCapabilitiesWaitBeforeInitializationClaim(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{9}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{
 		Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(),
diff --git a/services/core/tests/integration/runtime_configuration_cleanup_test.go b/services/core/tests/integration/runtime_configuration_cleanup_test.go
index c08993908..e72ff26fe 100644
--- a/services/core/tests/integration/runtime_configuration_cleanup_test.go
+++ b/services/core/tests/integration/runtime_configuration_cleanup_test.go
@@ -83,8 +83,7 @@ func TestManagedRuntimeConfigurationCleanup(t *testing.T) {
 		{name: "kill unavailable stays retained", inspectionError: sandbox.ErrInvalid, killError: sandbox.ErrComputeUnconfirmed, wantSettled: true, wantKill: true},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			s, _ := newManagedTestStore(t)
-			key := webDeployment(t, s, "e2b")
+			s, key := configuredStore(t)
 			p := &configurationCleanupProvider{
 				lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: test.loseCreate},
 				rejectCreate:      test.rejectCreate, settleCreate: test.settleCreate,
diff --git a/services/core/tests/integration/runtime_connection_test.go b/services/core/tests/integration/runtime_connection_test.go
index 7bc66fb03..cd0cf6c0d 100644
--- a/services/core/tests/integration/runtime_connection_test.go
+++ b/services/core/tests/integration/runtime_connection_test.go
@@ -21,8 +21,7 @@ import (
 )
 
 func TestManagedRuntimeConnectionTracksAuthenticatedSocket(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	tenant, session, environment := managedSession(t, s)
 	server := httptest.NewUnstartedServer(nil)
 	wsURL := "ws://" + server.Listener.Addr().String() + "/api/v1/agent-daemon/ws"
diff --git a/services/core/tests/integration/runtime_creation_settlement_test.go b/services/core/tests/integration/runtime_creation_settlement_test.go
index 54390356d..211a0d07b 100644
--- a/services/core/tests/integration/runtime_creation_settlement_test.go
+++ b/services/core/tests/integration/runtime_creation_settlement_test.go
@@ -41,8 +41,7 @@ func (p *absentCreationProvider) GetInfo(_ context.Context, r sandbox.Reference)
 func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 	for _, cancelled := range []bool{false, true} {
 		t.Run(map[bool]string{false: "live caller", true: "cancelled caller"}[cancelled], func(t *testing.T) {
-			s, _ := newManagedTestStore(t)
-			key := webDeployment(t, s, "e2b")
+			s, key := configuredStore(t)
 			p := &absentCreationProvider{}
 			w, _ := managedWorker(t, s, key, p)
 			tenant, session, environment := managedSession(t, s)
@@ -79,8 +78,7 @@ func TestManagedRuntimeConfirmedAbsentCreateReleasesAtomically(t *testing.T) {
 	}
 }
 func TestManagedRuntimeForeignAbsenceCannotReleaseCreation(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	p := &absentCreationProvider{foreign: true}
 	w, _ := managedWorker(t, s, key, p)
 	tenant, _, environment := managedSession(t, s)
@@ -93,8 +91,7 @@ func TestManagedRuntimeForeignAbsenceCannotReleaseCreation(t *testing.T) {
 	}
 }
 func TestManagedRuntimeObservedSettlementAllowsOwnedCleanup(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	p := &absentCreationProvider{observeSettled: true}
 	w, _ := managedWorker(t, s, key, p)
 	tenant, session, environment := managedSession(t, s)
diff --git a/services/core/tests/integration/runtime_deployment_test.go b/services/core/tests/integration/runtime_deployment_test.go
index 49cd6e6ac..3133ee445 100644
--- a/services/core/tests/integration/runtime_deployment_test.go
+++ b/services/core/tests/integration/runtime_deployment_test.go
@@ -13,53 +13,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
-// An installation never adopts hosted work admitted before it claimed the
-// deployment: a pending Session or an unreleased allocation refuses the claim.
-func TestRuntimeDeploymentClaimAdoptsNoUnclaimedWork(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	changes := deploymentExecution(t, executionWriter(t, s))
-	installation, tenant := uuid.NewString(), uuid.NewString()
-	pending, _ := localEnvironment(t, s, tenant)
-	if err := changes.Claim(t.Context(), installation); !errors.Is(err, deployment.ErrConflict) {
-		t.Fatal("pending Session adopted", err)
-	}
-	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: pending.ID}); err != nil {
-		t.Fatal(err)
-	}
-	session, environment := localEnvironment(t, s, tenant)
-	owner, err := changes.ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString()))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := changes.Claim(t.Context(), installation); !errors.Is(err, deployment.ErrConflict) {
-		t.Fatal("unclaimed allocation adopted", err)
-	}
-	if err := sessionService(t, s).DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: tenant, SessionID: session.ID}); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := changes.RequestCleanup(t.Context(), owner); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := changes.ReleaseAllocation(t.Context(), owner); !errors.Is(err, deployment.ErrAllocationConflict) {
-		t.Fatal("unknown creation lost cleanup ownership", err)
-	}
-	if err := changes.Claim(t.Context(), installation); !errors.Is(err, deployment.ErrConflict) {
-		t.Fatal("deleted unknown allocation did not block adoption", err)
-	}
-	if _, err := changes.SettleCreation(t.Context(), owner); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := changes.ReleaseAllocation(t.Context(), owner); err != nil {
-		t.Fatal(err)
-	}
-	if err := changes.Claim(t.Context(), installation); err != nil {
-		t.Fatal(err)
-	}
-	if err := changes.RequireUnclaimed(t.Context()); !errors.Is(err, deployment.ErrConflict) {
-		t.Fatal("owner without runtimes accepted a claimed deployment", err)
-	}
-}
-
 func TestRuntimeDeploymentResetPreservesCreationRetriesAndOtherPlacements(t *testing.T) {
 	s, w, installation := managedArchiveFixture(t)
 	tenant := uuid.NewString()
diff --git a/services/core/tests/integration/runtime_deployment_worker_test.go b/services/core/tests/integration/runtime_deployment_worker_test.go
index 6e852099f..7cc5c0e85 100644
--- a/services/core/tests/integration/runtime_deployment_worker_test.go
+++ b/services/core/tests/integration/runtime_deployment_worker_test.go
@@ -12,8 +12,7 @@ import (
 )
 
 func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	old := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	worker, stop := managedWorker(t, s, key, old)
 	tenant, _, environment := managedSession(t, s)
@@ -23,16 +22,10 @@ func TestManagedDeploymentStartupRejectsSwitchBeforeBackendAccess(t *testing.T)
 	}
 	stop()
 	replacement := &lifecycleProvider{resources: map[string]sandbox.Info{}}
-	start := func(runtimes *execution.RuntimeProvider) error {
-		_, err := startNextWorker(t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: runtimes})
-		return err
-	}
-	if err := start(webRuntimes(t, s, uuid.NewString(), replacement, nil)); !errors.Is(err, deployment.ErrConflict) {
+	_, err = startNextWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry(), ManagedRuntimes: webRuntimes(t, s, uuid.NewString(), replacement, nil)})
+	if !errors.Is(err, deployment.ErrConflict) {
 		t.Fatal("startup switched the claimed installation", err)
 	}
-	if err := start(nil); !errors.Is(err, deployment.ErrConflict) {
-		t.Fatal("startup without runtimes abandoned the claimed deployment", err)
-	}
 	if replacement.creates != 0 || replacement.kills != 0 {
 		t.Fatal("rejected startup touched new backend")
 	}
diff --git a/services/core/tests/integration/runtime_environment_terminal_test.go b/services/core/tests/integration/runtime_environment_terminal_test.go
index 2851301a3..0dfd794ad 100644
--- a/services/core/tests/integration/runtime_environment_terminal_test.go
+++ b/services/core/tests/integration/runtime_environment_terminal_test.go
@@ -16,7 +16,8 @@ import (
 func TestManagedEnvironmentTerminationSettlesInputAndPreservesIdentity(t *testing.T) {
 	for _, expired := range []bool{false, true} {
 		t.Run(map[bool]string{false: "failed", true: "expired"}[expired], func(t *testing.T) {
-			s, pool := testStore(t)
+			s, installation := configuredStore(t)
+			pool := s.pool
 			tenant := uuid.NewString()
 			input := environmentInput("initial-terminal", "openai_hosted", "/workspace")
 			input.InitialInputs = []sessions.Input{messageInput("initial")}
@@ -26,12 +27,12 @@ func TestManagedEnvironmentTerminationSettlesInputAndPreservesIdentity(t *testin
 			}
 			reservation := initialEnvironmentReservation(t, s, pool, tenant, session.ID)
 			writer := executionWriter(t, s)
-			owner, err := deploymentExecution(t, writer).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, uuid.NewString(), runtimedevice.HashCredential(uuid.NewString()))
+			owner, err := deploymentExecution(t, writer).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString()))
 			if err != nil {
 				t.Fatal(err)
 			}
 			if expired {
-				if _, err := pool.Exec(t.Context(), "UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '61 minutes' WHERE id=$1", owner.ID); err != nil {
+				if _, err := pool.Exec(t.Context(), "UPDATE runtime_allocations SET compute_phase='suspended',compute_retained_until=clock_timestamp()-interval '1 second' WHERE id=$1", owner.ID); err != nil {
 					t.Fatal(err)
 				}
 			}
@@ -112,7 +113,8 @@ func TestManagedEnvironmentTerminationSettlesInputAndPreservesIdentity(t *testin
 }
 
 func TestManagedEnvironmentFailureRollsBackWithSessionEvent(t *testing.T) {
-	s, pool := testStore(t)
+	s, installation := configuredStore(t)
+	pool := s.pool
 	tenant := uuid.NewString()
 	input := environmentInput("rollback-terminal", "openai_hosted", "/workspace")
 	input.InitialInputs = []sessions.Input{messageInput("initial")}
@@ -121,7 +123,7 @@ func TestManagedEnvironmentFailureRollsBackWithSessionEvent(t *testing.T) {
 		t.Fatal(err)
 	}
 	writer := executionWriter(t, s)
-	owner, err := deploymentExecution(t, writer).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, uuid.NewString(), runtimedevice.HashCredential(uuid.NewString()))
+	owner, err := deploymentExecution(t, writer).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/runtime_initialization_test.go b/services/core/tests/integration/runtime_initialization_test.go
index 8acc75925..636474b84 100644
--- a/services/core/tests/integration/runtime_initialization_test.go
+++ b/services/core/tests/integration/runtime_initialization_test.go
@@ -16,7 +16,6 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
@@ -46,13 +45,8 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 			setupOnly := strings.HasPrefix(mode, "setup-")
 			mode = strings.TrimPrefix(mode, "setup-")
 			expectedSteps := 2
-			_, pool := newManagedTestStore(t)
-			cipher, err := credentialcrypto.New(bytes.Repeat([]byte{9}, 32))
-			if err != nil {
-				t.Fatal(err)
-			}
-			s := NewWithCredentialCipher(pool, cipher)
-			key := webDeployment(t, s, "e2b")
+			s, key := configuredStore(t)
+			pool := s.pool
 			tenant := uuid.NewString()
 			input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"environment":{"type":"openai_hosted"}}`), InitialFiles: []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a", Data: []byte("first")}, {Type: "inline", Path: "/workspace/b", Data: []byte("second")}}}
 			if setupOnly {
@@ -141,7 +135,7 @@ func TestEnvironmentInitializationCompletionUnknownAndRestart(t *testing.T) {
 }
 
 func TestManagedRuntimePreparationAllOperationsUsePeer(t *testing.T) {
-	s, key := hostedFailureStore(t)
+	s, key := configuredStore(t)
 	var archive bytes.Buffer
 	writer := zip.NewWriter(&archive)
 	for path, body := range map[string]string{"proof/.codex-plugin/plugin.json": `{"name":"plugin","description":"A plugin.","skills":"./skills"}`, "proof/skills/example/SKILL.md": "---\nname: plugin-proof\ndescription: A plugin Skill.\n---\nProof."} {
diff --git a/services/core/tests/integration/runtime_input_admission_test.go b/services/core/tests/integration/runtime_input_admission_test.go
index 725bb0567..007522c55 100644
--- a/services/core/tests/integration/runtime_input_admission_test.go
+++ b/services/core/tests/integration/runtime_input_admission_test.go
@@ -14,8 +14,7 @@ import (
 )
 
 func TestManagedRuntimeResetPreservesCancelAndRetry(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	tenant, session, _ := managedSession(t, s)
 	inputs := []sessions.Input{messageInput("accepted work")}
 	accepted, err := submitInputs(t.Context(), s, tenant, session.ID, "work", inputs)
diff --git a/services/core/tests/integration/runtime_lifecycle_test.go b/services/core/tests/integration/runtime_lifecycle_test.go
index 8da737e4a..4f28fc6f0 100644
--- a/services/core/tests/integration/runtime_lifecycle_test.go
+++ b/services/core/tests/integration/runtime_lifecycle_test.go
@@ -148,8 +148,7 @@ func reconcileManagedState(t *testing.T, w *execution.Worker, s *Store, tenant,
 }
 
 func TestManagedRuntimeLostCreateRestartAndDeletion(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	tenant, session, env := managedSession(t, s)
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: true}
 	w, stop := managedWorker(t, s, key, p)
@@ -187,8 +186,7 @@ func TestManagedRuntimeLostCreateRestartAndDeletion(t *testing.T) {
 }
 
 func TestManagedRuntimeUnknownCreationRetainsCleanup(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	tenant, session, env := managedSession(t, s)
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}, loseCreate: true, absent: true}
 	w, _ := managedWorker(t, s, key, p)
@@ -217,8 +215,7 @@ func TestManagedRuntimeUnknownCreationRetainsCleanup(t *testing.T) {
 }
 
 func TestManagedRuntimeStoppedComputeDoesNotRequestCleanup(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	tenant, _, env := managedSession(t, s)
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
 	w, _ := managedWorker(t, s, key, p)
diff --git a/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go b/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
index 771c4c99f..055ac6383 100644
--- a/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
+++ b/services/core/tests/integration/runtime_node_lifecycle_fixture_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -14,7 +13,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
@@ -90,12 +88,7 @@ type nodeIsolationFixture struct {
 
 func newNodeIsolationFixture(t *testing.T, mode string) *nodeIsolationFixture {
 	t.Helper()
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{8}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	registry := runtimegateway.NewRegistry()
 	cp := &fakeCheckpointProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}, computes: map[string]sandbox.ComputeState{}, snapshots: map[string]sandbox.SnapshotIdentity{}, bootstraps: map[string]sandbox.Bootstrap{}, peers: map[string]*websocket.Conn{}, registry: registry}
 	p := &nodeIsolationProvider{fakeCheckpointProvider: cp, blocked: map[string]bool{}, mode: mode, entered: make(chan struct{})}
@@ -141,7 +134,7 @@ func (f *nodeIsolationFixture) enroll(id string) {
 	if err != nil {
 		f.t.Fatal(err)
 	}
-	_, err = f.nodes.Enroll(f.t.Context(), token, deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("microsandbox").Digest("microsandbox"), NodeID: id, Credential: strings.Repeat("x", 64), Name: id, Provider: "microsandbox", BackendFingerprint: strings.Repeat("b", 64)})
+	_, err = f.nodes.Enroll(f.t.Context(), token, deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("microsandbox").Digest("microsandbox"), NodeID: id, Credential: strings.Repeat("x", 64), Name: id, Provider: "microsandbox", BackendFingerprint: strings.Repeat("b", 64), CoreURL: f.store.placement.PublicURL()})
 	if err != nil {
 		f.t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/runtime_nodes_test.go b/services/core/tests/integration/runtime_nodes_test.go
index c00d88ceb..3ab2694c2 100644
--- a/services/core/tests/integration/runtime_nodes_test.go
+++ b/services/core/tests/integration/runtime_nodes_test.go
@@ -352,9 +352,6 @@ func TestRuntimeNodesLongOfflineRetainsExactAllocation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '2 days' WHERE id=$1", owner.ID); err != nil {
-		t.Fatal(err)
-	}
 	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_nodes SET connection_id=NULL WHERE id=$1", d.NodeID); err != nil {
 		t.Fatal(err)
 	}
@@ -370,8 +367,8 @@ func TestRuntimeNodesLongOfflineRetainsExactAllocation(t *testing.T) {
 	if err != nil || resumed.ID != owner.ID || resumed.DeviceID != owner.DeviceID || resumed.NodeID != owner.NodeID {
 		t.Fatal("reconnect changed instance", resumed, err)
 	}
-	if _, err := deploymentExecution(t, w).KeepAllocation(t.Context(), resumed); err != nil {
-		t.Fatal("offline observation lease could not renew", err)
+	if _, err := deploymentExecution(t, w).CheckRunning(t.Context(), resumed); err != nil {
+		t.Fatal("reconnected allocation stopped running", err)
 	}
 	if _, err := s.pool.Exec(t.Context(), "UPDATE runtime_allocations SET compute_phase='suspended',compute_state=$2::jsonb,compute_retained_until=clock_timestamp()+interval '1 day' WHERE id=$1", owner.ID, json.RawMessage(`{"snapshot":{"id":"same-snapshot"}}`)); err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/runtime_observation_scan_test.go b/services/core/tests/integration/runtime_observation_scan_test.go
index b535ccf30..4a3a6be2d 100644
--- a/services/core/tests/integration/runtime_observation_scan_test.go
+++ b/services/core/tests/integration/runtime_observation_scan_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestRuntimeObservationScanIsDeploymentWideBoundedAndExcludesDeleted(t *testing.T) {
-	s, _ := newManagedTestStore(t)
+	s, _ := configuredStore(t)
 	var expected []string
 	for range 5 {
 		_, session, _ := managedSession(t, s)
diff --git a/services/core/tests/integration/runtime_pending_test.go b/services/core/tests/integration/runtime_pending_test.go
index 06af06ef7..3978522ba 100644
--- a/services/core/tests/integration/runtime_pending_test.go
+++ b/services/core/tests/integration/runtime_pending_test.go
@@ -14,8 +14,7 @@ import (
 )
 
 func TestManagedRuntimeAutomaticBootstrapRecoversCommittedSessions(t *testing.T) {
-	s, _ := newManagedTestStore(t)
-	key := webDeployment(t, s, "e2b")
+	s, key := configuredStore(t)
 	tenant, idle, idleEnvironment := managedSession(t, s)
 	initial, err := s.CreateSession(t.Context(), tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test"},"environment":{"type":"openai_hosted"}}`), InitialInputs: []sessions.Input{messageInput("hello")}})
 	if err != nil {
diff --git a/services/core/tests/integration/runtime_scan_test.go b/services/core/tests/integration/runtime_scan_test.go
index 5f88de644..943db3246 100644
--- a/services/core/tests/integration/runtime_scan_test.go
+++ b/services/core/tests/integration/runtime_scan_test.go
@@ -26,9 +26,8 @@ func (p *scanProvider) GetInfo(ctx context.Context, ref sandbox.Reference) (sand
 func TestManagedRuntimeScanWrapServicesNextPage(t *testing.T) {
 	for _, count := range []int{0, 1, 31, 32, 33, 65} {
 		t.Run(fmt.Sprint(count), func(t *testing.T) {
-			s, _ := newManagedTestStore(t)
+			s, key := configuredStore(t)
 			p := &scanProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}}
-			key := webDeployment(t, s, "e2b")
 			w, _ := managedWorker(t, s, key, p)
 			var ids []string
 			for range count {
@@ -65,9 +64,8 @@ func TestManagedRuntimeScanWrapServicesNextPage(t *testing.T) {
 }
 
 func TestManagedRuntimeScanEmptyAfterCleanupAndCanceledCall(t *testing.T) {
-	s, _ := newManagedTestStore(t)
+	s, key := configuredStore(t)
 	p := &scanProvider{lifecycleProvider: lifecycleProvider{resources: map[string]sandbox.Info{}}}
-	key := webDeployment(t, s, "e2b")
 	w, _ := managedWorker(t, s, key, p)
 	tenant, session, env := managedSession(t, s)
 	owner, err := w.ProvisionEnvironment(t.Context(), tenant, env.ID, key)
diff --git a/services/core/tests/integration/runtime_suspension_test.go b/services/core/tests/integration/runtime_suspension_test.go
index 6ca4cd340..1d5eabad8 100644
--- a/services/core/tests/integration/runtime_suspension_test.go
+++ b/services/core/tests/integration/runtime_suspension_test.go
@@ -17,11 +17,12 @@ import (
 
 func runtimeSuspensionFixture(t *testing.T) (*Store, *Store, *pgxpool.Pool, deployment.Allocation) {
 	t.Helper()
-	s, pool := testStore(t)
+	s, installation := configuredStore(t)
+	pool := s.pool
 	w := executionWriter(t, s)
 	tenant := uuid.NewString()
 	_, environment := localEnvironment(t, s, tenant)
-	owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, uuid.NewString(), runtimedevice.HashCredential(uuid.NewString()))
+	owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -178,7 +179,7 @@ func TestRuntimeSuspensionWakeDoesNotLoseNewerWork(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err := deploymentExecution(t, w).KeepAllocation(t.Context(), owner); err != nil {
+	if _, err := deploymentExecution(t, w).CheckRunning(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
 	if _, err := sessionAdapter(s).GetSession(t.Context(), owner.TenantID, owner.SessionID); err != nil {
@@ -232,10 +233,9 @@ func TestRuntimeSuspensionRetentionAndDeletedSession(t *testing.T) {
 	for _, phase := range []string{"quiescing", "suspending", "suspended"} {
 		owner = runtimeSuspensionStep(t, w, owner, phase, &until)
 	}
-	runtimeSuspensionSQL(t, pool, `UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '2 hours' WHERE id=$1`, owner.ID)
 	retained, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: owner.TenantID, EnvironmentID: owner.EnvironmentID})
 	if err != nil || retained.Expired {
-		t.Fatal("suspended snapshot expired by disconnected heartbeat", retained, err)
+		t.Fatal("suspended snapshot expired within its retention", retained, err)
 	}
 	runtimeSuspensionSQL(t, pool, `UPDATE runtime_allocations SET compute_retained_until=clock_timestamp()-interval '1 second' WHERE id=$1`, owner.ID)
 	expired, err := deploymentStore(s).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: owner.TenantID, EnvironmentID: owner.EnvironmentID})
@@ -312,14 +312,9 @@ func TestRuntimeSuspensionWakeRemainsUntilRunning(t *testing.T) {
 	}
 }
 
-func TestRuntimeSuspensionExpiredRunningAndLostWriterAreFenced(t *testing.T) {
+func TestRuntimeSuspensionLostWriterIsFenced(t *testing.T) {
 	_, w, pool, owner := runtimeSuspensionFixture(t)
 	runtimeSuspensionCompleted(t, pool, owner)
-	until := time.Now().Add(time.Hour)
-	runtimeSuspensionSQL(t, pool, `UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '2 hours' WHERE id=$1`, owner.ID)
-	if _, err := deploymentExecution(t, w).SetCompute(t.Context(), owner, "quiescing", json.RawMessage(`{}`), &until, time.Nanosecond); !errors.Is(err, deployment.ErrAllocationConflict) {
-		t.Fatal("expired running allocation entered checkpoint", err)
-	}
 	if err := w.lease.Close(t.Context()); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/runtime_worker_recovery_test.go b/services/core/tests/integration/runtime_worker_recovery_test.go
index 0a8b08e51..7cb9c7f68 100644
--- a/services/core/tests/integration/runtime_worker_recovery_test.go
+++ b/services/core/tests/integration/runtime_worker_recovery_test.go
@@ -26,9 +26,8 @@ func runtimeWorkerHarness(t *testing.T) (*dispatchHarness, *pgxpool.Pool) {
 	t.Helper()
 	h := newDispatchHarnessForSession(t, []byte(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"enabled"}}}`), true)
 	enableWorkerEnvironment(t, h)
-	_, pool := testStore(t)
-	insertWorkerRuntimeAllocation(t, pool, h, "waking")
-	return h, pool
+	insertWorkerRuntimeAllocation(t, h.s.pool, h, "waking")
+	return h, h.s.pool
 }
 
 func TestPreparedDispatchKeepsPendingReservationAfterComputeConflict(t *testing.T) {
@@ -76,9 +75,12 @@ func TestWorkerWaitsForComputeAndSurvivesPromotionConflict(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	// This enters the same binding gate as scheduled input and returns without
-	// a native preparation, despite the socket already advertising capabilities.
-	if _, err := worker.ReadEnvironmentDirectory(t.Context(), environment, ""); !errors.Is(err, execution.ErrExecutionUnavailable) {
+	// The read waits for the compute to wake and gives up at its deadline
+	// without a native preparation, despite the socket already advertising
+	// capabilities.
+	read, stop := context.WithTimeout(t.Context(), 500*time.Millisecond)
+	defer stop()
+	if _, err := worker.ReadEnvironmentDirectory(read, environment, ""); !errors.Is(err, execution.ErrExecutionUnavailable) {
 		t.Fatal("waking connection was treated as work-ready", err)
 	}
 	select {
@@ -143,7 +145,7 @@ func TestWorkerRestartPreservesQueuedTurnWhileComputeWakes(t *testing.T) {
 	if _, err := pool.Exec(t.Context(), `INSERT INTO turns(id,session_id,status) VALUES($1,$2,'queued')`, turn, h.session.ID); err != nil {
 		t.Fatal(err)
 	}
-	worker, err := startWorkerErr(t.Context(), h.s, h.d)
+	worker, err := startWorkerErr(t, t.Context(), h.s, h.d)
 	if err != nil {
 		t.Fatal("queued wake blocked Core startup", err)
 	}
diff --git a/services/core/tests/integration/sandbox_deployment_resources_test.go b/services/core/tests/integration/sandbox_deployment_resources_test.go
index f4588ac29..b22495635 100644
--- a/services/core/tests/integration/sandbox_deployment_resources_test.go
+++ b/services/core/tests/integration/sandbox_deployment_resources_test.go
@@ -1,22 +1,15 @@
 package integration
 
 import (
-	"bytes"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
 
 func TestSandboxDeploymentMutationViewsIncludeActualResources(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{9}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	installation := uuid.NewString()
diff --git a/services/core/tests/integration/sandbox_deployment_switch_test.go b/services/core/tests/integration/sandbox_deployment_switch_test.go
index 37b73464b..e1f96a4e4 100644
--- a/services/core/tests/integration/sandbox_deployment_switch_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -32,12 +31,7 @@ func enrollmentTokenDigest(token string) string {
 }
 
 func TestSandboxResetClearsCustomE2BEndpoint(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	installation := uuid.NewString()
@@ -73,12 +67,7 @@ func TestSandboxResetClearsCustomE2BEndpoint(t *testing.T) {
 }
 
 func TestSandboxDirectDeploymentOwnershipAndCleanSwitch(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{4}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	id := uuid.NewString()
@@ -123,13 +112,6 @@ func TestSandboxDirectDeploymentOwnershipAndCleanSwitch(t *testing.T) {
 	if err != nil || !ok || credential.RuntimeAllocationID != owner.ID || credential.RuntimeNodeID != "" {
 		t.Fatal("direct bootstrap lost managed identity", err)
 	}
-	if _, err := pool.Exec(t.Context(), "UPDATE runtime_allocations SET kept_at=clock_timestamp()-interval '2 hours' WHERE id=$1", owner.ID); err != nil {
-		t.Fatal(err)
-	}
-	observed, err := deploymentStore(w).EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment})
-	if err != nil || observed.Expired {
-		t.Fatal("cloud inherited legacy node-less expiry", err)
-	}
 	if err := deploymentExecution(t, w).StartReset(SandboxResetTestContext(t.Context()), id, deployment.ResetRequest{Clear: "auto", ExpectedGeneration: 1}); err != nil {
 		t.Fatal(err)
 	}
@@ -162,9 +144,7 @@ func TestSandboxDirectDeploymentOwnershipAndCleanSwitch(t *testing.T) {
 }
 
 func TestSandboxSwitchRetiresNodesAndEnrollment(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{5}, 32))
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	nodes := deploymentService(t, s)
@@ -179,7 +159,7 @@ func TestSandboxSwitchRetiresNodesAndEnrollment(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	node := deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("docker").Digest("docker"), NodeID: uuid.NewString(), Name: "Machine", Provider: "docker", Credential: strings.Repeat("c", 64), BackendFingerprint: strings.Repeat("b", 64)}
+	node := deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("docker").Digest("docker"), NodeID: uuid.NewString(), Name: "Machine", Provider: "docker", Credential: strings.Repeat("c", 64), BackendFingerprint: strings.Repeat("b", 64), CoreURL: s.placement.PublicURL()}
 	if _, err := nodes.Enroll(t.Context(), token, node); err != nil {
 		t.Fatal(err)
 	}
@@ -237,9 +217,7 @@ func TestSandboxSwitchRetiresNodesAndEnrollment(t *testing.T) {
 }
 
 func TestSandboxResetSerializesFreshDirectSessions(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{6}, 32))
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	id := uuid.NewString()
@@ -281,9 +259,7 @@ func TestSandboxResetSerializesFreshDirectSessions(t *testing.T) {
 }
 
 func TestSandboxSwitchPreservesReleasedAllocationAndItemHistory(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{8}, 32))
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	installation := uuid.NewString()
@@ -366,9 +342,7 @@ func TestSandboxSwitchPreservesReleasedAllocationAndItemHistory(t *testing.T) {
 // node reconnects to drain resources; fresh admission and node configuration
 // stay closed until an administrator replaces the selection.
 func TestUnspecifiedNodeDeploymentRejectedWithoutMutation(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	nodes := deploymentService(t, s)
@@ -385,7 +359,7 @@ func TestUnspecifiedNodeDeploymentRejectedWithoutMutation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	node := deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: spec.Digest("docker"), NodeID: uuid.NewString(), Name: "Legacy", Provider: "docker", Credential: strings.Repeat("l", 64), BackendFingerprint: strings.Repeat("b", 64)}
+	node := deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: spec.Digest("docker"), NodeID: uuid.NewString(), Name: "Legacy", Provider: "docker", Credential: strings.Repeat("l", 64), BackendFingerprint: strings.Repeat("b", 64), CoreURL: s.placement.PublicURL()}
 	if _, err := nodes.Enroll(t.Context(), token, node); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/sandbox_deployment_switch_worker_test.go b/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
index af2c98e9f..212751f8c 100644
--- a/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
+++ b/services/core/tests/integration/sandbox_deployment_switch_worker_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"reflect"
@@ -13,7 +12,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
@@ -22,9 +20,7 @@ import (
 )
 
 func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{7}, 32))
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	deployments := deploymentService(t, s)
 	id := uuid.NewString()
 	p := &lifecycleProvider{resources: map[string]sandbox.Info{}}
@@ -75,7 +71,7 @@ func TestSandboxWorkerSwitchesAndRecoversFailedActivation(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	node := deployment.Enrollment{NodeID: uuid.NewString(), Name: "retained candidate fixture", Provider: "docker", Credential: strings.Repeat("n", 64), BackendFingerprint: strings.Repeat("b", 64), DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("docker").Digest("docker")}
+	node := deployment.Enrollment{NodeID: uuid.NewString(), Name: "retained candidate fixture", Provider: "docker", Credential: strings.Repeat("n", 64), BackendFingerprint: strings.Repeat("b", 64), DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("docker").Digest("docker"), CoreURL: s.placement.PublicURL()}
 	if _, err := deployments.Enroll(t.Context(), enrollment, node); err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/sandbox_deployment_view_test.go b/services/core/tests/integration/sandbox_deployment_view_test.go
index 0e696c890..ca1ed70b7 100644
--- a/services/core/tests/integration/sandbox_deployment_view_test.go
+++ b/services/core/tests/integration/sandbox_deployment_view_test.go
@@ -8,19 +8,13 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/google/uuid"
 )
 
 func TestSandboxDeploymentViewRecordsTemplateBuildAndSuspension(t *testing.T) {
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{5}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	changes := deploymentExecution(t, w)
 	id := uuid.NewString()
diff --git a/services/core/tests/integration/sandbox_deployment_worker_test.go b/services/core/tests/integration/sandbox_deployment_worker_test.go
index dcae13238..7e76740a7 100644
--- a/services/core/tests/integration/sandbox_deployment_worker_test.go
+++ b/services/core/tests/integration/sandbox_deployment_worker_test.go
@@ -58,7 +58,7 @@ func TestSandboxDeploymentWorkerActivatesWithoutRestart(t *testing.T) {
 		t.Fatal(err)
 	}
 	nodeID := uuid.NewString()
-	if _, err := deployments.Enroll(t.Context(), token, deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("docker").Digest("docker"), NodeID: nodeID, Name: "Remote", Provider: "docker", Credential: strings.Repeat("x", 64), BackendFingerprint: strings.Repeat("b", 64)}); err != nil {
+	if _, err := deployments.Enroll(t.Context(), token, deployment.Enrollment{DeploymentGeneration: 1, SpecificationDigest: SandboxDeploymentTestSpec("docker").Digest("docker"), NodeID: nodeID, Name: "Remote", Provider: "docker", Credential: strings.Repeat("x", 64), BackendFingerprint: strings.Repeat("b", 64), CoreURL: s.placement.PublicURL()}); err != nil {
 		t.Fatal(err)
 	}
 	connect := func() {
diff --git a/services/core/tests/integration/sandbox_specification_lifecycle_test.go b/services/core/tests/integration/sandbox_specification_lifecycle_test.go
index 314e90758..6c27b7e03 100644
--- a/services/core/tests/integration/sandbox_specification_lifecycle_test.go
+++ b/services/core/tests/integration/sandbox_specification_lifecycle_test.go
@@ -11,7 +11,6 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
@@ -19,12 +18,7 @@ import (
 
 func webSpecificationFixture(t *testing.T, provider string) (*Store, *Store, deployment.View, sandbox.Selection) {
 	t.Helper()
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{13}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := newManagedTestStore(t)
 	w := executionWriter(t, s)
 	id := uuid.NewString()
 	changes := deploymentExecution(t, w)
@@ -80,7 +74,7 @@ func TestSandboxSpecificationBootstrapReadDoesNotConsumeEnrollment(t *testing.T)
 	if _, err := nodes.NodeConfiguration(t.Context(), "", "invalid-token", 0); !errors.Is(err, deployment.ErrNodeCredential) {
 		t.Fatal("unauthenticated configuration read", err)
 	}
-	node := deployment.Enrollment{NodeID: uuid.NewString(), Name: "bootstrap", Credential: strings.Repeat("n", 64), Provider: "docker", BackendFingerprint: strings.Repeat("b", 64), DeploymentGeneration: view.Generation, SpecificationDigest: view.SpecificationDigest}
+	node := deployment.Enrollment{NodeID: uuid.NewString(), Name: "bootstrap", Credential: strings.Repeat("n", 64), Provider: "docker", BackendFingerprint: strings.Repeat("b", 64), DeploymentGeneration: view.Generation, SpecificationDigest: view.SpecificationDigest, CoreURL: s.placement.PublicURL()}
 	for _, change := range []func(*deployment.Enrollment){
 		func(n *deployment.Enrollment) { n.DeploymentGeneration++ },
 		func(n *deployment.Enrollment) { n.SpecificationDigest = strings.Repeat("c", 64) },
diff --git a/services/core/tests/integration/session_artifacts_public_test.go b/services/core/tests/integration/session_artifacts_public_test.go
index 4b72e8863..77306864a 100644
--- a/services/core/tests/integration/session_artifacts_public_test.go
+++ b/services/core/tests/integration/session_artifacts_public_test.go
@@ -89,7 +89,7 @@ func artifactHTTPServer(t *testing.T, s *Store) (server *httptest.Server, owner,
 // environment_id filter matches nothing like another Environment's ID (HE-56),
 // without weakening tenant or Session scoping.
 func TestSessionArtifactListEnvelopeAndEnvironmentFilterPostgres(t *testing.T) {
-	s, _ := testStore(t)
+	s, _ := configuredStore(t)
 	sessionService, err := newSessionService(s)
 	if err != nil {
 		t.Fatal(err)
@@ -213,7 +213,7 @@ func TestSessionArtifactsOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	s, _ := testStore(t)
+	s, _ := configuredStore(t)
 	sessionStore := sessionAdapter(s)
 	sessionService, err := newSessionService(s)
 	if err != nil {
diff --git a/services/core/tests/integration/session_artifacts_test.go b/services/core/tests/integration/session_artifacts_test.go
index a998c8da7..9cb471cc6 100644
--- a/services/core/tests/integration/session_artifacts_test.go
+++ b/services/core/tests/integration/session_artifacts_test.go
@@ -71,7 +71,8 @@ func TestSessionArtifactsPublishVersionScopeAndLifetime(t *testing.T) {
 }
 
 func testSessionArtifactsPublishVersionScopeAndLifetime(t *testing.T, kind string) {
-	s, pool := testStore(t)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	tenant, session, environment, turn := artifactTurn(t, s, kind)
 	before := largeObjectCount(t, pool)
 	data := bytes.Repeat([]byte("immutable\x00"), 100000)
@@ -187,7 +188,8 @@ func testSessionArtifactsPublishVersionScopeAndLifetime(t *testing.T, kind strin
 func TestSessionArtifactsDiscardTerminalPrivateCapture(t *testing.T) {
 	for _, status := range []string{sessions.TurnFailed, sessions.TurnCancelled} {
 		t.Run(status, func(t *testing.T) {
-			s, pool := testStore(t)
+			s, _ := configuredStore(t)
+			pool := s.pool
 			tenant, session, environment, turn := artifactTurn(t, s, "openai_hosted")
 			before := largeObjectCount(t, pool)
 			body := artifactArchive(t, map[string][]byte{"outputs/a": []byte("private")})
@@ -211,7 +213,8 @@ func TestSessionArtifactsDiscardTerminalPrivateCapture(t *testing.T) {
 func TestSessionArtifactTransferDoesNotBlockDeletionOrCancellation(t *testing.T) {
 	for _, operation := range []string{"delete", "cancel"} {
 		t.Run(operation, func(t *testing.T) {
-			s, pool := testStore(t)
+			s, _ := configuredStore(t)
+			pool := s.pool
 			tenant, session, environment, turn := artifactTurn(t, s, "openai_hosted")
 			before := largeObjectCount(t, pool)
 			reader, writer := io.Pipe()
@@ -312,7 +315,8 @@ func publishedPaths(published map[string]sessions.Artifact) []string {
 // Later Turns publish a path only when it is new, its bytes differ from the
 // newest remaining Artifact for that path, or no Artifact remains for it (HE-52).
 func TestSessionArtifactsRepublishOnlyNewChangedOrDeletedPaths(t *testing.T) {
-	s, pool := testStore(t)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	tenant, session, environment, first := artifactTurn(t, s, "openai_hosted")
 	before := largeObjectCount(t, pool)
 	turnNumber := 1
@@ -432,7 +436,7 @@ func TestSessionArtifactsRepublishOnlyNewChangedOrDeletedPaths(t *testing.T) {
 // Publication time can come from the Runtime's reported completion and invert
 // the order of Turns; the newest version for a path still follows Turn order.
 func TestSessionArtifactsNewestVersionFollowsTurnOrder(t *testing.T) {
-	s, _ := testStore(t)
+	s, _ := configuredStore(t)
 	tenant := uuid.NewString()
 	created, err := s.CreateSession(t.Context(), tenant, environmentInput("artifact-order", "openai_hosted", "/workspace"))
 	if err != nil {
@@ -476,7 +480,8 @@ func TestSessionArtifactsNewestVersionFollowsTurnOrder(t *testing.T) {
 // A deletion that holds the Session lock while Turn completion waits for it is
 // seen by the completion transaction, which then republishes the path.
 func TestSessionArtifactsCompletionWaitsForConcurrentDeletion(t *testing.T) {
-	s, pool := testStore(t)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	tenant, session, environment, first := artifactTurn(t, s, "openai_hosted")
 	before := largeObjectCount(t, pool)
 	stageArtifactOutputs(t, s, tenant, session, environment, first, map[string]string{"a.txt": "alpha"})
diff --git a/services/core/tests/integration/session_creation_identity_test.go b/services/core/tests/integration/session_creation_identity_test.go
index e919ccf68..159c8e7f9 100644
--- a/services/core/tests/integration/session_creation_identity_test.go
+++ b/services/core/tests/integration/session_creation_identity_test.go
@@ -1,13 +1,11 @@
 package integration
 
 import (
-	"bytes"
 	"encoding/json"
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/modelconfigurationpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
@@ -21,11 +19,7 @@ import (
 // an older revision never updates the current default's observations.
 func TestSessionCreationKeepsItsResolvedDeploymentRevision(t *testing.T) {
 	s, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{73}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defaults := modelconfigurationpg.New(pgunit.NewPool(pool), cipher)
+	defaults := modelconfigurationpg.New(pgunit.NewPool(pool), s.credentialCipher)
 	service, err := modelconfiguration.NewService(defaults)
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/session_deletion_lifecycle_public_test.go b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
index 112f33ff9..6749a89dc 100644
--- a/services/core/tests/integration/session_deletion_lifecycle_public_test.go
+++ b/services/core/tests/integration/session_deletion_lifecycle_public_test.go
@@ -23,7 +23,7 @@ const deletionAgent = `"agent":{"id":"agent_deletion","model":"fixture","tools":
 // missing and malformed identifiers keep one not-found response.
 func TestSessionDeletionLifecyclePostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	s, _ := newManagedTestStore(t)
+	s, _ := configuredStore(t)
 	audit := auditpg.New(pgunit.NewPool(s.pool))
 	ctx := t.Context()
 	tenant, owner, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
diff --git a/services/core/tests/integration/session_diagnostics_test.go b/services/core/tests/integration/session_diagnostics_test.go
index 4c3996829..6a21d8671 100644
--- a/services/core/tests/integration/session_diagnostics_test.go
+++ b/services/core/tests/integration/session_diagnostics_test.go
@@ -198,7 +198,8 @@ func TestDiagnosticTimingBoundOrderAndIsolation(t *testing.T) {
 }
 
 func TestDiagnosticProvisioningDetailAtomicAndPrivate(t *testing.T) {
-	s, pool := testStore(t)
+	s, installation := configuredStore(t)
+	pool := s.pool
 	tenant := uuid.NewString()
 	input := environmentInput("safe-detail", "openai_hosted", "/workspace")
 	input.InitialInputs = []sessions.Input{messageInput("initial")}
@@ -207,7 +208,7 @@ func TestDiagnosticProvisioningDetailAtomicAndPrivate(t *testing.T) {
 		t.Fatal(err)
 	}
 	writer := executionWriter(t, s)
-	owner, err := deploymentExecution(t, writer).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, uuid.NewString(), runtimedevice.HashCredential(uuid.NewString()))
+	owner, err := deploymentExecution(t, writer).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: session.Environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_execution_configuration_test.go b/services/core/tests/integration/session_execution_configuration_test.go
index 0043ac053..4816546f2 100644
--- a/services/core/tests/integration/session_execution_configuration_test.go
+++ b/services/core/tests/integration/session_execution_configuration_test.go
@@ -10,7 +10,6 @@ import (
 	"time"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
@@ -32,12 +31,8 @@ func executionProjectionInput(source string) sessions.CreateSession {
 }
 
 func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{41}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	for _, stream := range []bool{false, true} {
 		for _, source := range []string{"session", "agent", "deployment"} {
 			t.Run(source+map[bool]string{false: "/ordinary", true: "/stream"}[stream], func(t *testing.T) {
@@ -160,12 +155,8 @@ func TestSessionExecutionConfigurationHistoricalProvenance(t *testing.T) {
 }
 
 func TestSessionExecutionConfigurationRollbackAndValidation(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{42}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, _ := configuredStore(t)
+	pool := s.pool
 	tenant := uuid.NewString()
 	for _, kind := range []string{"model", "harness", "source", "provider", "provider_mismatch", "post_projection_failure"} {
 		input := executionProjectionInput("session")
@@ -201,7 +192,7 @@ func TestSessionExecutionConfigurationRollbackAndValidation(t *testing.T) {
 }
 
 func TestSessionExecutionConfigurationConcurrentRetryKeepsWinner(t *testing.T) {
-	s, _ := testStore(t)
+	s, _ := configuredStore(t)
 	tenant := uuid.NewString()
 	input := executionProjectionInput("session")
 	var wg sync.WaitGroup
@@ -246,7 +237,8 @@ func TestSessionExecutionConfigurationConcurrentRetryKeepsWinner(t *testing.T) {
 }
 
 func TestSessionExecutionConfigurationSurvivesSuspendResume(t *testing.T) {
-	s, pool := testStore(t)
+	s, installation := configuredStore(t)
+	pool := s.pool
 	w := executionWriter(t, s)
 	tenant := uuid.NewString()
 	session, err := s.CreateSession(t.Context(), tenant, executionProjectionInput("agent"))
@@ -261,7 +253,7 @@ func TestSessionExecutionConfigurationSurvivesSuspendResume(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, uuid.NewString(), runtimedevice.HashCredential(uuid.NewString()))
+	owner, err := deploymentExecution(t, w).ReserveAllocation(t.Context(), deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment.ID}, installation, runtimedevice.HashCredential(uuid.NewString()))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/session_initial_public_test.go b/services/core/tests/integration/session_initial_public_test.go
index 3b8162891..3d4ab16bb 100644
--- a/services/core/tests/integration/session_initial_public_test.go
+++ b/services/core/tests/integration/session_initial_public_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/google/uuid"
 )
 
@@ -21,7 +22,7 @@ func TestInitialSessionInputOfficialClient(t *testing.T) {
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
 	// Exercise real worker admission with dispatch paused for deterministic reads.
-	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{})
+	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 	t.Cleanup(func() {
 		stopped, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/tests/integration/session_model_execution_http_test.go b/services/core/tests/integration/session_model_execution_http_test.go
index 3300e84a7..14ac1d8b5 100644
--- a/services/core/tests/integration/session_model_execution_http_test.go
+++ b/services/core/tests/integration/session_model_execution_http_test.go
@@ -1,21 +1,17 @@
 package integration
 
 import (
-	"bytes"
 	"encoding/json"
 	"net/http/httptest"
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
 
 func TestModelExecutionHTTPWriteOnlyAndStrictAdmission(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, _ := credentialcrypto.New(bytes.Repeat([]byte{6}, 32))
-	st := NewWithCredentialCipher(pool, cipher)
+	st, _ := configuredStore(t)
 	tenant, token := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "catalog-test", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	handler, err := publicHandler(t, st, auth, "codex")
diff --git a/services/core/tests/integration/session_model_options_test.go b/services/core/tests/integration/session_model_options_test.go
index 553df763c..7ba034b94 100644
--- a/services/core/tests/integration/session_model_options_test.go
+++ b/services/core/tests/integration/session_model_options_test.go
@@ -1,23 +1,17 @@
 package integration
 
 import (
-	"bytes"
 	"encoding/json"
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 )
 
 func TestSessionModelExecutionStoresOnlyProviderBundle(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{33}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	st := NewWithCredentialCipher(pool, cipher)
+	st, _ := configuredStore(t)
+	pool := st.pool
 	ctx, tenant := t.Context(), uuid.NewString()
 	provider := &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://example.com/v1", APIKey: "provider-key-canary"}
 	input := sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: []byte(`{"agent":{"model":"actual-model"},"environment":{"type":"openai_hosted"}}`), ModelProvider: provider}
@@ -40,14 +34,14 @@ func TestSessionModelExecutionStoresOnlyProviderBundle(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	ciphertext, err := cipher.SealModelExecution(historical, tenant, session.ID)
+	ciphertext, err := st.credentialCipher.SealModelExecution(historical, tenant, session.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if _, err := pool.Exec(ctx, "UPDATE session_model_execution SET encrypted_config=$2 WHERE session_id=$1", session.ID, ciphertext); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := sessionAdapter(NewWithCredentialCipher(pool, cipher)).SessionModelExecution(ctx, tenant, session.ID); err == nil {
+	if _, err := sessionAdapter(st).SessionModelExecution(ctx, tenant, session.ID); err == nil {
 		t.Fatal("retired native options accepted in provider bundle")
 	}
 }
diff --git a/services/core/tests/integration/session_reference_retry_public_test.go b/services/core/tests/integration/session_reference_retry_public_test.go
index e3b066edf..6570098f2 100644
--- a/services/core/tests/integration/session_reference_retry_public_test.go
+++ b/services/core/tests/integration/session_reference_retry_public_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/google/uuid"
 )
 
@@ -23,7 +24,7 @@ func TestSavedReferenceRetryOfficialClient(t *testing.T) {
 	s, _ := testStore(t)
 	tenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}, {OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(foreign), TenantID: uuid.NewString()}})
-	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{})
+	worker := startWorker(t, t.Context(), s, &execution.Dispatcher{Registry: runtimegateway.NewRegistry()})
 	t.Cleanup(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel()
diff --git a/services/core/tests/integration/skill_selectors_public_test.go b/services/core/tests/integration/skill_selectors_public_test.go
index 7052c01b2..34122433b 100644
--- a/services/core/tests/integration/skill_selectors_public_test.go
+++ b/services/core/tests/integration/skill_selectors_public_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
@@ -20,12 +19,7 @@ func TestSkillSelectorsOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{63}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
@@ -37,7 +31,7 @@ func TestSkillSelectorsOfficialClientPostgres(t *testing.T) {
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore := NewWithCredentialCipher(pool, cipher)
+	recoveredStore := New(t, pool)
 	h, err = publicHandler(t, recoveredStore, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/skill_version_deletion_public_test.go b/services/core/tests/integration/skill_version_deletion_public_test.go
index 82ea71dce..817547497 100644
--- a/services/core/tests/integration/skill_version_deletion_public_test.go
+++ b/services/core/tests/integration/skill_version_deletion_public_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -9,7 +8,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
 	"github.com/google/uuid"
@@ -20,12 +18,7 @@ import (
 // other versions remain (V2), nondefault latest deletion (V3) and tenant
 // isolation (V4).
 func TestSkillVersionDeletionHTTPPostgres(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{64}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := testStore(t)
 	owner, foreign, ownerTenant := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "skill-owner", TokenSHA256: runtimedevice.HashCredential(owner), TenantID: ownerTenant},
@@ -56,7 +49,7 @@ func TestSkillVersionDeletionHTTPPostgres(t *testing.T) {
 	}
 	missing := expect(owner, http.MethodDelete, "/v1/skills/skill_"+uuid.NewString()+"/versions/1", http.StatusNotFound)
 
-	skillService := SkillService(t, pool, cipher)
+	skillService := SkillService(t, pool, s.credentialCipher)
 	sole, err := skillService.CreateSkill(t.Context(), skills.CreateSkill{TenantID: ownerTenant, Archive: skillArchive(t, "sole-http")})
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/skill_version_deletion_test.go b/services/core/tests/integration/skill_version_deletion_test.go
index 3a9b2e5a2..be27ff14d 100644
--- a/services/core/tests/integration/skill_version_deletion_test.go
+++ b/services/core/tests/integration/skill_version_deletion_test.go
@@ -6,7 +6,6 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
@@ -16,13 +15,9 @@ import (
 // Deleting a Skill's sole version deletes the Skill, but committed Session
 // snapshots and their idempotent retries are unchanged.
 func TestSoleSkillVersionDeletionKeepsFrozenSetup(t *testing.T) {
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{63}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
-	skillService := SkillService(t, pool, cipher)
+	s, _ := configuredStore(t)
+	pool := s.pool
+	skillService := SkillService(t, pool, s.credentialCipher)
 	tenant := uuid.NewString()
 	archive := skillArchive(t, "sole-version-frozen")
 	skill, err := skillService.CreateSkill(t.Context(), skills.CreateSkill{TenantID: tenant, Archive: archive})
diff --git a/services/core/tests/integration/skills_public_test.go b/services/core/tests/integration/skills_public_test.go
index 4aa57368b..63ee989ea 100644
--- a/services/core/tests/integration/skills_public_test.go
+++ b/services/core/tests/integration/skills_public_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
@@ -20,12 +19,7 @@ func TestSkillsOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{51}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := testStore(t)
 	token, foreign := uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "test-runner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()},
@@ -37,7 +31,7 @@ func TestSkillsOfficialClientPostgres(t *testing.T) {
 	}
 	server := httptest.NewServer(h)
 	defer server.Close()
-	recoveredStore := NewWithCredentialCipher(pool, cipher)
+	recoveredStore := New(t, pool)
 	h, err = publicHandler(t, recoveredStore, auth, "codex")
 	if err != nil {
 		t.Fatal(err)
diff --git a/services/core/tests/integration/template_composition_public_test.go b/services/core/tests/integration/template_composition_public_test.go
index 1a483d6fb..775744128 100644
--- a/services/core/tests/integration/template_composition_public_test.go
+++ b/services/core/tests/integration/template_composition_public_test.go
@@ -13,7 +13,6 @@ import (
 	"time"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -25,12 +24,9 @@ func TestTemplateCompositionOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{84}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s, reopenedStore := NewWithCredentialCipher(pool, cipher), NewWithCredentialCipher(pool, cipher)
+	s, _ := configuredStore(t)
+	pool := s.pool
+	reopenedStore := New(t, pool)
 	tenant, foreignTenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "composition-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
diff --git a/services/core/tests/integration/template_null_selection_public_test.go b/services/core/tests/integration/template_null_selection_public_test.go
index f35cfecfd..d0a5b247a 100644
--- a/services/core/tests/integration/template_null_selection_public_test.go
+++ b/services/core/tests/integration/template_null_selection_public_test.go
@@ -15,7 +15,6 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentplugin"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
@@ -27,12 +26,9 @@ func TestTemplateNullSelectionOfficialClientPostgres(t *testing.T) {
 	if python == "" {
 		t.Skip("pinned official Python SDK required")
 	}
-	_, pool := testStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{87}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s, reopenedStore := NewWithCredentialCipher(pool, cipher), NewWithCredentialCipher(pool, cipher)
+	s, _ := configuredStore(t)
+	pool := s.pool
+	reopenedStore := New(t, pool)
 	tenant, foreignTenant, token, foreign := uuid.NewString(), uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{
 		{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "selection-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant},
diff --git a/services/core/tests/integration/unified_model_configuration_http_test.go b/services/core/tests/integration/unified_model_configuration_http_test.go
index acc25954d..70d5dd009 100644
--- a/services/core/tests/integration/unified_model_configuration_http_test.go
+++ b/services/core/tests/integration/unified_model_configuration_http_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestUnifiedModelConfigurationHTTP(t *testing.T) {
-	st, _ := newManagedTestStore(t)
+	st, _ := configuredStore(t)
 	tenant, token, coreKey := uuid.NewString(), uuid.NewString(), uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "model-configuration", TokenSHA256: runtimedevice.HashCredential(token), TenantID: tenant}})
 	admin, err := api.NewDeploymentAuthenticator([]string{runtimedevice.HashCredential(coreKey)})
diff --git a/services/core/tests/integration/unstorable_text_public_test.go b/services/core/tests/integration/unstorable_text_public_test.go
index e98651f8a..debc28c0c 100644
--- a/services/core/tests/integration/unstorable_text_public_test.go
+++ b/services/core/tests/integration/unstorable_text_public_test.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/google/uuid"
 )
@@ -19,12 +18,7 @@ import (
 // containing it must be rejected as a client error before anything is written.
 func TestUnstorableTextRejectsWithoutWritesPostgres(t *testing.T) {
 	// An isolated database keeps the no-write digest independent of other tests.
-	_, pool := newManagedTestStore(t)
-	cipher, err := credentialcrypto.New(bytes.Repeat([]byte{62}, 32))
-	if err != nil {
-		t.Fatal(err)
-	}
-	s := NewWithCredentialCipher(pool, cipher)
+	s, pool := newManagedTestStore(t)
 	token := uuid.NewString()
 	auth := newTestAuthenticator(t, []testAPIKey{{OrganizationID: "test-org", ProjectID: uuid.NewString(), SubjectKind: "service_account", SubjectID: "nul-owner", TokenSHA256: runtimedevice.HashCredential(token), TenantID: uuid.NewString()}})
 	h, err := publicHandler(t, s, auth, "codex")
diff --git a/services/core/tests/integration/worker_fixture_test.go b/services/core/tests/integration/worker_fixture_test.go
index 790749499..590936407 100644
--- a/services/core/tests/integration/worker_fixture_test.go
+++ b/services/core/tests/integration/worker_fixture_test.go
@@ -3,6 +3,8 @@ package integration
 import (
 	"context"
 	"errors"
+	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -24,10 +26,11 @@ import (
 // bearer tokens through the vaults service on s, records model configuration
 // observations through the model configuration adapter on s, runs Session use
 // cases and reads through the Session service and adapter on s, and reads the
-// deployment through the deployment adapter on s.
+// deployment through the deployment adapter on s. Without the dispatcher's
+// sandbox runtimes it runs fixtureRuntimes.
 func startWorker(t testing.TB, ctx context.Context, s *Store, dispatcher *execution.Dispatcher) *execution.Worker {
 	t.Helper()
-	worker, err := startWorkerErr(ctx, s, dispatcher)
+	worker, err := startWorkerErr(t, ctx, s, dispatcher)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -35,7 +38,7 @@ func startWorker(t testing.TB, ctx context.Context, s *Store, dispatcher *execut
 }
 
 // startWorkerErr is startWorker for tests that assert a startup failure.
-func startWorkerErr(ctx context.Context, s *Store, dispatcher *execution.Dispatcher) (*execution.Worker, error) {
+func startWorkerErr(t testing.TB, ctx context.Context, s *Store, dispatcher *execution.Dispatcher) (*execution.Worker, error) {
 	lease, err := pgunit.AcquireLease(ctx, s.pool)
 	if err != nil {
 		return nil, err
@@ -44,7 +47,7 @@ func startWorkerErr(ctx context.Context, s *Store, dispatcher *execution.Dispatc
 	if err != nil {
 		return nil, errors.Join(err, lease.Close(ctx))
 	}
-	return startOwnedWorkerErr(ctx, s, dispatcher, owner)
+	return startOwnedWorkerErr(t, ctx, s, dispatcher, owner)
 }
 
 // startOwnedWorker is startWorker on an Owner the test already holds, for tests
@@ -52,14 +55,14 @@ func startWorkerErr(ctx context.Context, s *Store, dispatcher *execution.Dispatc
 // Run exits.
 func startOwnedWorker(t testing.TB, ctx context.Context, s *Store, dispatcher *execution.Dispatcher, owner execution.Owner) *execution.Worker {
 	t.Helper()
-	worker, err := startOwnedWorkerErr(ctx, s, dispatcher, owner)
+	worker, err := startOwnedWorkerErr(t, ctx, s, dispatcher, owner)
 	if err != nil {
 		t.Fatal(err)
 	}
 	return worker
 }
 
-func startOwnedWorkerErr(ctx context.Context, s *Store, dispatcher *execution.Dispatcher, owner execution.Owner) (*execution.Worker, error) {
+func startOwnedWorkerErr(t testing.TB, ctx context.Context, s *Store, dispatcher *execution.Dispatcher, owner execution.Owner) (*execution.Worker, error) {
 	_, credentials, err := fixtureVaults(s)
 	if err != nil {
 		return nil, errors.Join(err, owner.Lease.Close(ctx))
@@ -79,9 +82,40 @@ func startOwnedWorkerErr(ctx context.Context, s *Store, dispatcher *execution.Di
 	owned.DeploymentReader = deploymentStore(s)
 	owned.Sessions = service
 	owned.SessionsReader = sessionAdapter(s)
+	if owned.ManagedRuntimes == nil {
+		owned.ManagedRuntimes = fixtureRuntimes(t, s)
+	}
 	return execution.StartWorker(ctx, &owned, owner)
 }
 
+// testInstallation is the installation that owns the shared test database.
+// The official-client acceptance runs Core as the same installation on that
+// database, so both read it from tests/testdata/installation.id.
+func testInstallation(t testing.TB) string {
+	t.Helper()
+	value, err := os.ReadFile("../testdata/installation.id")
+	if err != nil {
+		t.Fatal(err)
+	}
+	return strings.TrimSpace(string(value))
+}
+
+// fixtureRuntimes is webRuntimes on a lifecycleProvider for the installation
+// that claimed s's database, or for testInstallation before one did. On an
+// unconfigured deployment it never loads a provider.
+func fixtureRuntimes(t testing.TB, s *Store) *execution.RuntimeProvider {
+	t.Helper()
+	view, err := deploymentService(t, s).View(context.Background())
+	if err != nil {
+		t.Fatal(err)
+	}
+	installation := view.InstallationID
+	if installation == "" {
+		installation = testInstallation(t)
+	}
+	return webRuntimes(t, s, installation, &lifecycleProvider{resources: map[string]sandbox.Info{}}, nil)
+}
+
 // executionOwner acquires the execution lease on s's database and builds the
 // execution operations on it, for tests that run them without a Worker. The
 // lease closes when the test ends.
@@ -171,7 +205,7 @@ func unusedPreparation(t testing.TB) execution.RuntimeDeploymentPreparer {
 // startWebWorker starts the Worker on webRuntimes.
 func startWebWorker(t *testing.T, s *Store, registry *runtimegateway.Registry, installation string, p sandbox.SandboxProvider, suspension *execution.RuntimeSuspensionPolicy) *execution.Worker {
 	t.Helper()
-	w, err := startNextWorker(t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: webRuntimes(t, s, installation, p, suspension)})
+	w, err := startNextWorker(t, t.Context(), s, &execution.Dispatcher{Registry: registry, ManagedRuntimes: webRuntimes(t, s, installation, p, suspension)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -181,9 +215,9 @@ func startWebWorker(t *testing.T, s *Store, registry *runtimegateway.Registry, i
 // startNextWorker is startWorkerErr after another owner closed its lease. A
 // closed lease stays held until PostgreSQL ends its backend, so startup
 // retries ErrLeaseHeld briefly.
-func startNextWorker(ctx context.Context, s *Store, dispatcher *execution.Dispatcher) (*execution.Worker, error) {
+func startNextWorker(t testing.TB, ctx context.Context, s *Store, dispatcher *execution.Dispatcher) (*execution.Worker, error) {
 	for deadline := time.Now().Add(2 * time.Second); ; time.Sleep(20 * time.Millisecond) {
-		w, err := startWorkerErr(ctx, s, dispatcher)
+		w, err := startWorkerErr(t, ctx, s, dispatcher)
 		if !errors.Is(err, pgunit.ErrLeaseHeld) || time.Now().After(deadline) {
 			return w, err
 		}
diff --git a/services/core/tests/official_client.py b/services/core/tests/official_client.py
index 2b9bfe0a4..f066072ee 100644
--- a/services/core/tests/official_client.py
+++ b/services/core/tests/official_client.py
@@ -82,10 +82,8 @@ def project_bindings(directory):
         credential_key.touch(mode=0o600)
         credential_key_values = [base64.b64encode(secrets.token_bytes(32)).decode()]
         credential_key.write_text(credential_key_values[0] + "\n")
-        # The database records the first installation ID it sees, so every run uses this one.
-        installation_id = Path(directory) / "installation.id"
-        installation_id.touch(mode=0o600)
-        installation_id.write_text("3f8e2c71-5b0d-4e6a-9c47-1d2a8b6f0e53\n")
+        # The test database belongs to the test installation, which the Go Worker fixtures also run as.
+        installation_id = Path(__file__).resolve().parent / "testdata/installation.id"
         env = dict(os.environ, OAC_DATABASE_URL=dsn, OAC_CORE_KEY_DIGESTS_FILE=str(core_key_digests), OAC_ADDR=f"127.0.0.1:{port}", OAC_DEFAULT_HARNESS="codex")
         env["OAC_CREDENTIAL_KEY_FILE"] = str(credential_key)
         env["OAC_INSTALLATION_ID_FILE"] = str(installation_id)
diff --git a/services/core/tests/testdata/installation.id b/services/core/tests/testdata/installation.id
new file mode 100644
index 000000000..76b1e9a1d
--- /dev/null
+++ b/services/core/tests/testdata/installation.id
@@ -0,0 +1 @@
+3f8e2c71-5b0d-4e6a-9c47-1d2a8b6f0e53

From bb1485ec15d76e0a451d172974a6cfa69eb5a9b6 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 14:05:40 +0800
Subject: [PATCH 52/60] Settle the node configuration and admission review
 findings (#547)

- The local-environment test no longer races managed-runtime
  maintenance: it asserts the read never binds the general device,
  while maintenance may bind its own.
- Drop Docker's extra_hosts, a node setting nothing produces.
- Web's runtime_history_unavailable text matches the contract: the
  history is temporarily unavailable.
---
 apps/web/src/i18n/locales/en/core-errors.ts       |  2 +-
 apps/web/src/i18n/locales/zh-CN/core-errors.ts    |  2 +-
 docs/configuration.md                             |  1 -
 docs/zh/configuration.md                          |  3 +--
 .../internal/sandbox/docker/container_options.go  |  2 +-
 services/core/internal/sandbox/docker/node.go     | 15 +++++++--------
 services/core/internal/sandbox/docker/provider.go |  1 -
 .../integration/local_environment_worker_test.go  |  5 +++--
 8 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/apps/web/src/i18n/locales/en/core-errors.ts b/apps/web/src/i18n/locales/en/core-errors.ts
index 77b2cd7f2..a667b3b69 100644
--- a/apps/web/src/i18n/locales/en/core-errors.ts
+++ b/apps/web/src/i18n/locales/en/core-errors.ts
@@ -37,7 +37,7 @@ export const coreErrors = {
   "sandbox_operation_unsupported": "The selected sandbox provider does not support this operation.",
   "environment_unavailable": "The Session's environment is no longer available.",
   "execution_unavailable": "Execution is temporarily unavailable. Try again later.",
-  "runtime_history_unavailable": "Runtime history is unavailable on this Core.",
+  "runtime_history_unavailable": "Runtime history is temporarily unavailable. Try again later.",
   "runtime_history_unsupported": "Runtime history is not supported for this Session.",
   "core_metrics_unavailable": "Core metrics could not be read. Try again later.",
   "file_transfer_unavailable": "The file transfer is unavailable. Try again later.",
diff --git a/apps/web/src/i18n/locales/zh-CN/core-errors.ts b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
index bc0350a15..f787daf43 100644
--- a/apps/web/src/i18n/locales/zh-CN/core-errors.ts
+++ b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
@@ -36,7 +36,7 @@ export const coreErrors = {
   "sandbox_operation_unsupported": "所选沙箱提供商不支持此操作。",
   "environment_unavailable": "此 Session 的环境已不可用。",
   "execution_unavailable": "执行暂时不可用，请稍后重试。",
-  "runtime_history_unavailable": "此 Core 上的 Runtime 历史不可用。",
+  "runtime_history_unavailable": "Runtime 历史暂时不可用，请稍后重试。",
   "runtime_history_unsupported": "此 Session 不支持 Runtime 历史。",
   "core_metrics_unavailable": "无法读取 Core 指标，请稍后重试。",
   "file_transfer_unavailable": "文件传输不可用，请稍后重试。",
diff --git a/docs/configuration.md b/docs/configuration.md
index f98a71daf..5eefd448a 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -127,7 +127,6 @@ The node installer writes Docker’s host settings into the `native` object of t
 | `network` | `oac-node-<installation-id>` | Runtime container network |
 | `seccomp_file` | `<node-root>/runtime/seccomp.json` | Matched distribution’s seccomp profile |
 | `nested_sandbox` | `true` | Enables the Docker adapter’s init process and proc-mask configuration |
-| `extra_hosts` | Optional | Additional container host mappings |
 
 The [Docker adapter](./sandbox-provider.md#docker-adapter) owns container isolation, volume layout and lifecycle behavior.
 
diff --git a/docs/zh/configuration.md b/docs/zh/configuration.md
index 8261fc738..b8ad611ba 100644
--- a/docs/zh/configuration.md
+++ b/docs/zh/configuration.md
@@ -1,7 +1,7 @@
 ---
 title: "配置参考"
 source: docs/configuration.md
-source_hash: e10fcef53a7baf4f77d914bbda7f4158fcf49fc07546596ea78222939d580a6c
+source_hash: 3e149cc2ca300bc53e14be2fd98b155c80098fd1e3b308a0b4d72d2ec3071558
 ---
 
 Core 安装的每项设置都恰好只有一个归属位置，分属以下三类：
@@ -131,7 +131,6 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 | `network` | `oac-node-<installation-id>` | Runtime 容器网络 |
 | `seccomp_file` | `<node-root>/runtime/seccomp.json` | 所匹配发行版的 seccomp 配置文件 |
 | `nested_sandbox` | `true` | 启用 Docker 适配器的 init 进程和 proc-mask 配置 |
-| `extra_hosts` | 可选 | 额外的容器主机映射 |
 
 [Docker 适配器](sandbox-provider.md#docker-adapter)负责容器隔离、卷布局和生命周期行为。
 
diff --git a/services/core/internal/sandbox/docker/container_options.go b/services/core/internal/sandbox/docker/container_options.go
index 0a179d855..f8bee5840 100644
--- a/services/core/internal/sandbox/docker/container_options.go
+++ b/services/core/internal/sandbox/docker/container_options.go
@@ -27,7 +27,7 @@ func runtimeContainerOptions(config Config, name string, labels map[string]strin
 	}
 	return client.ContainerCreateOptions{Name: name, Image: config.Image,
 		Config: &container.Config{User: "1000:1000", WorkingDir: "/environment/workspace", Labels: labels, Env: environment},
-		HostConfig: &container.HostConfig{ReadonlyRootfs: true, CapDrop: []string{"ALL"}, SecurityOpt: []string{"no-new-privileges", "seccomp=" + config.Seccomp, "apparmor=unconfined"}, NetworkMode: container.NetworkMode(config.Network), ExtraHosts: config.ExtraHosts,
+		HostConfig: &container.HostConfig{ReadonlyRootfs: true, CapDrop: []string{"ALL"}, SecurityOpt: []string{"no-new-privileges", "seccomp=" + config.Seccomp, "apparmor=unconfined"}, NetworkMode: container.NetworkMode(config.Network),
 			MaskedPaths: masked, ReadonlyPaths: readonly, Init: init,
 			Resources: container.Resources{PidsLimit: &limit, Memory: memory, NanoCPUs: cpus}, Tmpfs: map[string]string{"/tmp": "rw,nosuid,nodev,size=128m"},
 			Mounts: []mount.Mount{
diff --git a/services/core/internal/sandbox/docker/node.go b/services/core/internal/sandbox/docker/node.go
index 63a2570fe..115d6bf0c 100644
--- a/services/core/internal/sandbox/docker/node.go
+++ b/services/core/internal/sandbox/docker/node.go
@@ -20,17 +20,16 @@ import (
 // (image_manifest_digest) names the loaded image, so the installer records the
 // one this host resolves.
 type Native struct {
-	Host          string   `json:"host"`
-	Image         string   `json:"image"`
-	Network       string   `json:"network"`
-	SeccompFile   string   `json:"seccomp_file"`
-	ExtraHosts    []string `json:"extra_hosts"`
-	NestedSandbox bool     `json:"nested_sandbox"`
+	Host          string `json:"host"`
+	Image         string `json:"image"`
+	Network       string `json:"network"`
+	SeccompFile   string `json:"seccomp_file"`
+	NestedSandbox bool   `json:"nested_sandbox"`
 }
 
 func decodeNative(config sandbox.NodeConfig) (Native, error) {
 	var entry Native
-	if sandbox.DecodeConfigurationObject(config.Native, &entry, "host", "image", "network", "seccomp_file", "extra_hosts", "nested_sandbox") != nil {
+	if sandbox.DecodeConfigurationObject(config.Native, &entry, "host", "image", "network", "seccomp_file", "nested_sandbox") != nil {
 		return entry, errors.New("invalid managed Docker node configuration")
 	}
 	release := config.Specification.Runtime
@@ -63,7 +62,7 @@ func BuildNode(config sandbox.NodeConfig, _ sandbox.LocalOptions, result *sandbo
 		return closeProvider, errors.New("invalid managed Docker endpoint")
 	}
 	closeProvider = func() { _ = c.Close() }
-	provider, err := New(c, Config{InstallationID: config.InstallationID, Image: entry.Image, Network: entry.Network, Seccomp: string(seccomp), ExtraHosts: entry.ExtraHosts, NestedSandbox: entry.NestedSandbox, Resources: &config.Specification.Resources})
+	provider, err := New(c, Config{InstallationID: config.InstallationID, Image: entry.Image, Network: entry.Network, Seccomp: string(seccomp), NestedSandbox: entry.NestedSandbox, Resources: &config.Specification.Resources})
 	if err != nil {
 		closeProvider()
 		return func() {}, errors.New("invalid managed Docker provider configuration")
diff --git a/services/core/internal/sandbox/docker/provider.go b/services/core/internal/sandbox/docker/provider.go
index 474c0d59d..c108182a0 100644
--- a/services/core/internal/sandbox/docker/provider.go
+++ b/services/core/internal/sandbox/docker/provider.go
@@ -25,7 +25,6 @@ const labelPrefix = "io.oac."
 // trusted daemon/model connectivity; native tool network policy is in the image.
 type Config struct {
 	InstallationID, Image, Network, Seccomp string
-	ExtraHosts                              []string
 	NestedSandbox                           bool
 	Resources                               *sandbox.Resources
 }
diff --git a/services/core/tests/integration/local_environment_worker_test.go b/services/core/tests/integration/local_environment_worker_test.go
index a3f7651e9..35699205b 100644
--- a/services/core/tests/integration/local_environment_worker_test.go
+++ b/services/core/tests/integration/local_environment_worker_test.go
@@ -100,8 +100,9 @@ func TestLocalEnvironmentWorkerRejectsGeneralDeviceDespiteCapability(t *testing.
 	if _, err := w.ReadEnvironmentDirectory(t.Context(), unassigned, "reports"); !errors.Is(err, execution.ErrExecutionUnavailable) {
 		t.Fatal("unassigned environment selected general device", err)
 	}
-	if _, err := sessionAdapter(h.s).GetSessionDevice(t.Context(), h.tenant, other.ID); !errors.Is(err, sessions.ErrNotFound) {
-		t.Fatal("read persisted an unauthorized placement", err)
+	// Managed-runtime maintenance may bind its own device to the Session; the read must never bind the general one.
+	if device, err := sessionAdapter(h.s).GetSessionDevice(t.Context(), h.tenant, other.ID); err == nil && device.ID == h.device.ID || err != nil && !errors.Is(err, sessions.ErrNotFound) {
+		t.Fatal("read persisted an unauthorized placement", device, err)
 	}
 }
 

From 0ea327baece12653d35bc11c52482c077b676a93 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 15:44:34 +0800
Subject: [PATCH 53/60] Generate the public client types from the schema (#549)

make openapi now projects the public schema onto
packages/agents-client/src/generated/public-api.ts: each schema's
TypeScript type, each enum's values and each object's field names, with
required lists and per-union field maps. make check-openapi rejects a
stale copy. The emitter takes a parsed schema dict and accepts the
Swagger 2.0 forms of the Core document (x-nullable, allOf, any ref
prefix), so the /core/v1 projection can reuse it.

The client aliases the generated types and validates responses with the
generated field sets and enums instead of hand-written copies. Where the
schema and the validators disagreed, the schema wins: snapshot events
carry no session_id, Item events require output_index, terminal Turn
events require usage, list envelopes are complete, input_image is
accepted in user messages, and older-Core allowances are gone. The
client no longer re-checks limits Core enforces.

Core now sends turn_id null on Environment events, null cwd, output,
exit_code and duration_ms on command_execution Items, and param null on
the stream interruption error, as the pinned schema requires.
---
 apps/web/e2e/data/agents.mjs                  |   26 +-
 apps/web/e2e/data/routes.mjs                  |    8 +-
 .../dashboard/runtime-history.test.ts         |    2 +-
 .../features/dashboard/runtime-trends.test.ts |    2 +-
 .../features/metrics/agent-metrics.test.ts    |    3 +-
 .../sessions/SessionTurnsTable.test.tsx       |    2 +-
 .../features/sessions/session-history.test.ts |    2 +-
 .../src/features/sessions/session-log.test.ts |    2 +-
 .../features/sessions/session-queries.test.ts |    2 +-
 .../sessions/trace/TraceView.test.tsx         |    3 +-
 .../sessions/trace/trace-model.test.ts        |    1 +
 .../web/src/lib/collection-pagination.test.ts |   51 +-
 contracts/agents-api/index.md                 |    2 +-
 contracts/agents-api/sessions-events.md       |    6 +-
 contracts/agents-api/v1/events.go             |   19 +-
 contracts/agents-api/v1/events_test.go        |    5 +-
 contracts/agents-api/v1/items_test.go         |    4 +
 contracts/agents-api/v1/subagent_items.go     |   13 +-
 contracts/agents-api/zh/index.md              |    4 +-
 contracts/agents-api/zh/sessions-events.md    |    8 +-
 example/parsar/src/lib/session-timing.ts      |    2 +-
 example/parsar/tests/fixture.mjs              |   18 +-
 packages/agents-client/README.md              |    5 +-
 .../agents-client/src/admin-client.test.ts    |    2 +-
 packages/agents-client/src/admin-client.ts    |    4 +-
 packages/agents-client/src/client.test.ts     |  123 +-
 packages/agents-client/src/client.ts          |  683 ++----
 .../src/environment-template-projection.ts    |   44 +-
 .../src/environment-templates.test.ts         |    4 +-
 .../src/execution-configuration-projection.ts |    4 +-
 .../agents-client/src/generated/public-api.ts | 1970 +++++++++++++++++
 .../agents-client/src/history-projection.ts   |  259 +--
 .../src/history-recovery.test.ts              |   88 +-
 packages/agents-client/src/index.ts           |    2 +-
 .../agents-client/src/protocol-types.test.ts  |    4 +-
 .../agents-client/src/response-projection.ts  |   31 +-
 .../src/session-environment-projection.ts     |   13 +-
 .../agents-client/src/skill-projection.ts     |   48 +-
 packages/agents-client/src/skills.test.ts     |   10 +-
 .../src/source-files-list.test.ts             |   11 +-
 packages/agents-client/src/types.ts           |  482 ++--
 .../agents-client/src/usage-projection.ts     |   13 +-
 .../src/vault-credential-auth.ts              |   28 +-
 scripts/generate-public-api.py                |   76 +-
 scripts/generate-public-api.test.py           |   23 +
 .../core/internal/api/hosted_failure_test.go  |    7 +-
 services/core/internal/api/stream.go          |   13 +-
 .../environment_connections_test.go           |    2 +-
 48 files changed, 2744 insertions(+), 1390 deletions(-)
 create mode 100644 packages/agents-client/src/generated/public-api.ts

diff --git a/apps/web/e2e/data/agents.mjs b/apps/web/e2e/data/agents.mjs
index db6b40bff..26f23e8b4 100644
--- a/apps/web/e2e/data/agents.mjs
+++ b/apps/web/e2e/data/agents.mjs
@@ -10,10 +10,12 @@ const mcp = (label, url, allowed = null, credential = null) => ({
   ...(credential ? { x_agents_core: { credential_id: credential } } : {}),
 });
 const str = (description) => ({ type: "string", description });
+/** Core reports both reasoning members, null when unset. */
+const reasoning = (effort = null, summary = null) => ({ effort, summary });
 
 export const agentDefinitions = [
   {
-    name: "Incident responder", model: "gpt-5.1-codex", harness: "codex", reasoning: { effort: "high", summary: "auto" },
+    name: "Incident responder", model: "gpt-5.1-codex", harness: "codex", reasoning: reasoning("high", "auto"),
     instructions: "You are the on-call assistant for the web platform.\n\nWhen an alert arrives:\n1. Read the alert and the linked dashboard.\n2. Check recent deploys and error logs for the affected service.\n3. Propose the smallest safe mitigation and wait for approval before acting.\n4. Write a short incident note: impact, timeline, cause, next steps.",
     tools: [
       fn("lookup_deploys", "List deploys of a service in a time window.", { service: str("Service name"), since: str("ISO-8601 start") }),
@@ -23,7 +25,7 @@ export const agentDefinitions = [
     metadata: { team: "sre", tier: "production", runbook: "RB-0142" },
   },
   {
-    name: "Support triage", model: "claude-sonnet-5", harness: "claude_sdk", reasoning: {},
+    name: "Support triage", model: "claude-sonnet-5", harness: "claude_sdk", reasoning: reasoning(),
     instructions: "Classify each incoming support ticket by product area and severity.\nAsk one clarifying question when the report lacks steps to reproduce.\nNever promise dates. Link the matching help-center article when one exists.",
     tools: [
       fn("search_help_center", "Search published help-center articles.", { query: str("Search text") }),
@@ -32,13 +34,13 @@ export const agentDefinitions = [
     metadata: { team: "support", queue: "tier-1" },
   },
   {
-    name: "Code reviewer", model: "gpt-5.1-codex", harness: "codex", reasoning: { effort: "medium" },
+    name: "Code reviewer", model: "gpt-5.1-codex", harness: "codex", reasoning: reasoning("medium"),
     instructions: "Review pull requests for correctness first, then clarity.\nComment only on issues that matter; group nits into one comment.\nFlag missing tests for changed behaviour.",
     tools: [mcp("github", "https://mcp.example.com/github", ["get_pull_request", "list_files", "create_review"])],
     metadata: { team: "platform", repo_scope: "monorepo" },
   },
   {
-    name: "Data analyst", model: "MiniMax-M2", harness: "mcode", reasoning: {},
+    name: "Data analyst", model: "MiniMax-M2", harness: "mcode", reasoning: reasoning(),
     instructions: "Answer questions about product metrics using the warehouse.\nShow the SQL you ran and state the time range and filters explicitly.\nIf data is missing, say so instead of estimating.",
     tools: [
       fn("run_sql", "Run a read-only SQL query against the analytics warehouse.", { sql: str("SELECT statement") }),
@@ -47,37 +49,37 @@ export const agentDefinitions = [
     metadata: { team: "data", warehouse: "analytics" },
   },
   {
-    name: "Contract checker", model: "gpt-5.1-mini", harness: "codex", reasoning: {},
+    name: "Contract checker", model: "gpt-5.1-mini", harness: "codex", reasoning: reasoning(),
     instructions: "Compare a supplier contract against the standard template.\nList every deviation with the clause number, the template wording and the contract wording.\nMark liability, termination and data-protection deviations as high priority.",
     tools: [fn("fetch_template", "Fetch the current standard contract template.", { kind: str("Contract type") })],
     metadata: { team: "legal" },
   },
   {
-    name: "Release notes writer", model: "claude-sonnet-5", harness: "claude_sdk", reasoning: {},
+    name: "Release notes writer", model: "claude-sonnet-5", harness: "claude_sdk", reasoning: reasoning(),
     instructions: "Draft release notes from merged pull requests since the last tag.\nGroup by user-visible change; leave out refactors and CI changes.",
     tools: [mcp("github", "https://mcp.example.com/github", ["list_merged_pull_requests", "get_release"])],
     metadata: { team: "platform", channel: "stable" },
   },
   {
-    name: "Onboarding guide", model: "gpt-5.1-mini", harness: "codex", reasoning: {},
+    name: "Onboarding guide", model: "gpt-5.1-mini", harness: "codex", reasoning: reasoning(),
     instructions: "Help new employees find internal documentation and set up their accounts.\nKeep answers short and link the source page.",
     tools: [mcp("docs", "https://mcp.internal.example/docs", null)],
     metadata: { team: "people-ops" },
   },
   {
-    name: "Churn forecaster", model: "MiniMax-M2", harness: "mcode", reasoning: { effort: "high" },
+    name: "Churn forecaster", model: "MiniMax-M2", harness: "mcode", reasoning: reasoning("high"),
     instructions: "Estimate 90-day churn risk per account from usage and support signals.\nExplain the top three drivers for each high-risk account.",
     tools: [fn("run_sql", "Run a read-only SQL query against the analytics warehouse.", { sql: str("SELECT statement") })],
     metadata: { team: "data", model_version: "2026-09" },
   },
   {
-    name: "Log summarizer", model: "gpt-5.1-codex", harness: "codex", reasoning: {},
+    name: "Log summarizer", model: "gpt-5.1-codex", harness: "codex", reasoning: reasoning(),
     instructions: "Summarise error logs for the last hour: top error signatures, first seen, count, affected hosts.",
     tools: [mcp("observability", "https://mcp.internal.example/observability", ["query_logs"])],
     metadata: { team: "sre" },
   },
   {
-    name: "Staging smoke tester", model: "gpt-5.1-mini", harness: "codex", reasoning: {},
+    name: "Staging smoke tester", model: "gpt-5.1-mini", harness: "codex", reasoning: reasoning(),
     instructions: "Run the staging smoke checklist after each deploy and report failures with request IDs.",
     tools: [fn("http_check", "Call an endpoint and return status and latency.", { url: str("Absolute URL") })],
     metadata: { team: "qa", environment: "staging" },
@@ -91,13 +93,13 @@ export const agentDefinitions = [
  */
 export const providerAgentDefinitions = [
   {
-    id: "agent_11c4f2a8", name: "Spec drafter", model: "MiniMax-M2", reasoning: {},
+    id: "agent_11c4f2a8", name: "Spec drafter", model: "MiniMax-M2", reasoning: reasoning(),
     instructions: "Draft a product spec from the linked discussion: problem, users, scope, open questions.",
     tools: [], metadata: { team: "product" },
     x_agents_core: { model_provider: { protocol: "anthropic", base_url: "https://api.minimaxi.com/anthropic", api_key_configured: true, context_window: 204800, max_output_tokens: 65536 } },
   },
   {
-    id: "agent_12d7e3b9", name: "Research assistant", model: "kimi-k2", reasoning: {},
+    id: "agent_12d7e3b9", name: "Research assistant", model: "kimi-k2", reasoning: reasoning(),
     instructions: "Answer research questions with cited sources and a one-paragraph summary.",
     tools: [], metadata: { team: "research" },
     x_agents_core: { harness: "codex", model_provider: { protocol: "responses", base_url: "https://api.moonshot.cn/v1", api_key_configured: true } },
diff --git a/apps/web/e2e/data/routes.mjs b/apps/web/e2e/data/routes.mjs
index b0a7601ac..124a7966c 100644
--- a/apps/web/e2e/data/routes.mjs
+++ b/apps/web/e2e/data/routes.mjs
@@ -48,7 +48,7 @@ export function buildDemo(now = Math.floor(Date.now() / 1000), publicUrl = "http
       const turnOutput = Math.floor(200 + rand() * 4000);
       const turnId = uuid();
       const turn = {
-        id: turnId, agent_id: agent.id, session_id: id, object: "agent.session.turn",
+        id: turnId, agent_id: agent.id, subagent_id: null, session_id: id, object: "agent.session.turn",
         status: running ? "in_progress" : failed ? "failed" : rand() < 0.03 ? "cancelled" : "completed",
         created_at: cursor, started_at: cursor + Math.floor(rand() * 4), completed_at: running ? null : cursor + duration,
         error: failed ? { code: "internal_error", message: "The execution could not complete." } : null,
@@ -57,15 +57,15 @@ export function buildDemo(now = Math.floor(Date.now() / 1000), publicUrl = "http
       if (!running) { input += turnInput; output += turnOutput; cached += Math.floor(turnInput * 0.4); reasoning += Math.floor(turnOutput * 0.3); }
       sessionTurns.push(turn);
       const exchange = (agentConversations[agent.name] ?? [["Investigate", "Done"]])[t % (agentConversations[agent.name]?.length ?? 1)];
-      sessionItems.push({ id: uuid(), turn_id: turnId, type: "message", status: "completed", role: "user", content: [{ type: "input_text", text: exchange[0] }] });
+      sessionItems.push({ id: uuid(), turn_id: turnId, type: "message", status: "completed", role: "user", phase: null, content: [{ type: "input_text", text: exchange[0] }] });
       const calls = Math.floor(rand() * 6);
       for (let c = 0; c < calls; c += 1) {
         const kind = pick(["function", "function", "mcp", "command", "command", "web"]);
         const itemFailed = rand() < 0.06;
         if (kind === "function") sessionItems.push({ id: uuid(), turn_id: turnId, type: "function_call", status: itemFailed ? "failed" : "completed", call_id: uuid(), name: pick(["apply_patch", "read_file", "search_docs"]), arguments: {} });
         if (kind === "mcp") sessionItems.push({ id: uuid(), turn_id: turnId, type: "mcp_call", status: itemFailed ? "failed" : "completed", server_label: pick(["github", "linear"]), name: pick(["search_issues", "get_file"]), arguments: {}, output: null, error: null });
-        if (kind === "command") sessionItems.push({ id: uuid(), turn_id: turnId, type: "command_execution", status: "completed", command: "pytest -q", exit_code: itemFailed ? 1 : 0, duration_ms: 1200 });
-        if (kind === "web") sessionItems.push({ id: uuid(), turn_id: turnId, type: "web_search_call", status: "completed" });
+        if (kind === "command") sessionItems.push({ id: uuid(), turn_id: turnId, type: "command_execution", status: "completed", command: "pytest -q", cwd: "/workspace", output: itemFailed ? "1 failed, 41 passed" : "42 passed", exit_code: itemFailed ? 1 : 0, duration_ms: 1200 });
+        if (kind === "web") sessionItems.push({ id: uuid(), turn_id: turnId, type: "web_search_call", status: "completed", action: null });
       }
       if (!running && !failed) sessionItems.push({ id: uuid(), turn_id: turnId, type: "message", status: "completed", role: "assistant", phase: "final_answer", content: [{ type: "output_text", text: exchange[1] }] });
     }
diff --git a/apps/web/src/features/dashboard/runtime-history.test.ts b/apps/web/src/features/dashboard/runtime-history.test.ts
index 18c935421..a07c4397c 100644
--- a/apps/web/src/features/dashboard/runtime-history.test.ts
+++ b/apps/web/src/features/dashboard/runtime-history.test.ts
@@ -24,7 +24,7 @@ const session = {
     model: "fixture/model",
     instructions: null,
     multi_agent: { enabled: false, max_concurrent_subagents: null },
-    reasoning: {},
+    reasoning: { effort: null, summary: null },
     service_tier: "auto",
     text: { format: { type: "text" }, verbosity: "medium" },
     tools: [],
diff --git a/apps/web/src/features/dashboard/runtime-trends.test.ts b/apps/web/src/features/dashboard/runtime-trends.test.ts
index 5ec812f9f..643703797 100644
--- a/apps/web/src/features/dashboard/runtime-trends.test.ts
+++ b/apps/web/src/features/dashboard/runtime-trends.test.ts
@@ -38,7 +38,7 @@ function snapshot(at: number, options: {
       model: "fixture/model",
       instructions: null,
       multi_agent: { enabled: false, max_concurrent_subagents: null },
-      reasoning: {},
+      reasoning: { effort: null, summary: null },
       service_tier: "auto",
       text: { format: { type: "text" }, verbosity: "medium" },
       tools: [],
diff --git a/apps/web/src/features/metrics/agent-metrics.test.ts b/apps/web/src/features/metrics/agent-metrics.test.ts
index e9d18775e..28ccf2705 100644
--- a/apps/web/src/features/metrics/agent-metrics.test.ts
+++ b/apps/web/src/features/metrics/agent-metrics.test.ts
@@ -40,6 +40,7 @@ function turn(id: string, sessionId: string, overrides: Partial<AgentTurn> = {})
   return {
     id,
     agent_id: "agent",
+    subagent_id: null,
     session_id: sessionId,
     object: "agent.session.turn",
     status: "completed",
@@ -144,7 +145,7 @@ describe("helpers", () => {
 });
 
 function page<T extends { id: string }>(data: T[], hasMore: boolean): ListPage<T> {
-  return { data, has_more: hasMore, last_id: data[data.length - 1]?.id ?? null };
+  return { object: "list", data, first_id: data[0]?.id ?? null, last_id: data[data.length - 1]?.id ?? null, has_more: hasMore };
 }
 
 describe("loadAgentMetricsActivity", () => {
diff --git a/apps/web/src/features/sessions/SessionTurnsTable.test.tsx b/apps/web/src/features/sessions/SessionTurnsTable.test.tsx
index 89ebbff95..fb1e51d2d 100644
--- a/apps/web/src/features/sessions/SessionTurnsTable.test.tsx
+++ b/apps/web/src/features/sessions/SessionTurnsTable.test.tsx
@@ -6,7 +6,7 @@ import type { AgentTurn, SessionItem } from "@oac/agents-client";
 import { SessionTurnsTable } from "./SessionTurnsTable";
 
 function turn(id: string, overrides: Partial<AgentTurn> = {}): AgentTurn {
-  return { id, agent_id: "agent", session_id: "session", object: "agent.session.turn", status: "completed", created_at: 1, started_at: 10, completed_at: 14, error: null, usage: null, ...overrides };
+  return { id, agent_id: "agent", subagent_id: null, session_id: "session", object: "agent.session.turn", status: "completed", created_at: 1, started_at: 10, completed_at: 14, error: null, usage: null, ...overrides };
 }
 
 const item = (id: string, turnId: string) => ({ id, turn_id: turnId, type: "message", status: "completed", role: "user", content: [] }) as SessionItem;
diff --git a/apps/web/src/features/sessions/session-history.test.ts b/apps/web/src/features/sessions/session-history.test.ts
index 1e9757a08..ae931653c 100644
--- a/apps/web/src/features/sessions/session-history.test.ts
+++ b/apps/web/src/features/sessions/session-history.test.ts
@@ -21,7 +21,7 @@ function item(id: string, status: SessionItem["status"], turn = "t1"): SessionIt
 }
 
 function turn(id: string, status: AgentTurn["status"], overrides: Partial<AgentTurn> = {}): AgentTurn {
-  return { id, agent_id: "agent", session_id: "session", object: "agent.session.turn", status, created_at: 1, started_at: null, completed_at: null, error: null, usage: null, ...overrides };
+  return { id, agent_id: "agent", subagent_id: null, session_id: "session", object: "agent.session.turn", status, created_at: 1, started_at: null, completed_at: null, error: null, usage: null, ...overrides };
 }
 
 function list<T extends { id: string }>(data: T[], hasMore = false): ListPage<T> {
diff --git a/apps/web/src/features/sessions/session-log.test.ts b/apps/web/src/features/sessions/session-log.test.ts
index bd2b6abbe..8f12ae19e 100644
--- a/apps/web/src/features/sessions/session-log.test.ts
+++ b/apps/web/src/features/sessions/session-log.test.ts
@@ -34,7 +34,7 @@ function session(id: string, overrides: Partial<AgentSession> & { agentId?: stri
       name: agentName,
       instructions: null,
       multi_agent: { enabled: false, max_concurrent_subagents: null },
-      reasoning: {},
+      reasoning: { effort: null, summary: null },
       service_tier: "auto",
       text: { format: { type: "text" }, verbosity: "medium" },
       tools: [],
diff --git a/apps/web/src/features/sessions/session-queries.test.ts b/apps/web/src/features/sessions/session-queries.test.ts
index a3cc575dc..cb08875e6 100644
--- a/apps/web/src/features/sessions/session-queries.test.ts
+++ b/apps/web/src/features/sessions/session-queries.test.ts
@@ -29,7 +29,7 @@ function item(id: string, status: SessionItem["status"]): SessionItem {
 }
 
 function turn(id: string, status: AgentTurn["status"]): AgentTurn {
-  return { id, agent_id: "agent", session_id: "session", object: "agent.session.turn", status, created_at: 1, started_at: null, completed_at: null, error: null, usage: null };
+  return { id, agent_id: "agent", subagent_id: null, session_id: "session", object: "agent.session.turn", status, created_at: 1, started_at: null, completed_at: null, error: null, usage: null };
 }
 
 function list<T extends { id: string }>(data: T[]): ListPage<T> {
diff --git a/apps/web/src/features/sessions/trace/TraceView.test.tsx b/apps/web/src/features/sessions/trace/TraceView.test.tsx
index e69e13eea..40059279d 100644
--- a/apps/web/src/features/sessions/trace/TraceView.test.tsx
+++ b/apps/web/src/features/sessions/trace/TraceView.test.tsx
@@ -14,7 +14,7 @@ const session: AgentSession = {
     name: "Fixture Agent",
     instructions: "Use durable evidence.",
     multi_agent: { enabled: false, max_concurrent_subagents: null },
-    reasoning: {},
+    reasoning: { effort: null, summary: null },
     service_tier: "auto",
     text: { format: { type: "text" }, verbosity: "medium" },
     tools: [{
@@ -39,6 +39,7 @@ function turn(id: string, overrides: Partial<AgentTurn> = {}): AgentTurn {
   return {
     id,
     agent_id: "agent-1",
+    subagent_id: null,
     session_id: session.id,
     object: "agent.session.turn",
     status: "completed",
diff --git a/apps/web/src/features/sessions/trace/trace-model.test.ts b/apps/web/src/features/sessions/trace/trace-model.test.ts
index 083b340d6..59c31556a 100644
--- a/apps/web/src/features/sessions/trace/trace-model.test.ts
+++ b/apps/web/src/features/sessions/trace/trace-model.test.ts
@@ -8,6 +8,7 @@ function turn(id: string, overrides: Partial<AgentTurn> = {}): AgentTurn {
   return {
     id,
     agent_id: "agent-1",
+    subagent_id: null,
     session_id: "session-1",
     object: "agent.session.turn",
     status: "completed",
diff --git a/apps/web/src/lib/collection-pagination.test.ts b/apps/web/src/lib/collection-pagination.test.ts
index 9d7d4b279..fabdaf89e 100644
--- a/apps/web/src/lib/collection-pagination.test.ts
+++ b/apps/web/src/lib/collection-pagination.test.ts
@@ -1,7 +1,12 @@
+import type { ListPage } from "@oac/agents-client";
 import { describe, expect, it } from "vitest";
 
 import { appendCollectionPage, listAllCollectionPages, listStableCollectionPages } from "./collection-pagination";
 
+function page<T extends { id: string }>(data: T[], hasMore: boolean, lastId: string | null = null): ListPage<T> {
+  return { object: "list", data, first_id: data[0]?.id ?? null, last_id: lastId, has_more: hasMore };
+}
+
 describe("top-level collection pagination", () => {
   it("loads every page in stable descending order and forwards cancellation", async () => {
     const controller = new AbortController();
@@ -9,8 +14,8 @@ describe("top-level collection pagination", () => {
     const result = await listAllCollectionPages(async (options) => {
       calls.push({ after: options.after, signal: options.signal });
       return options.after
-        ? { data: [{ id: "agent-1" }], has_more: false }
-        : { data: [{ id: "agent-3" }, { id: "agent-2" }], has_more: true, last_id: "agent-2" };
+        ? page([{ id: "agent-1" }], false)
+        : page([{ id: "agent-3" }, { id: "agent-2" }], true, "agent-2");
     }, controller.signal);
 
     expect(result.map((value) => value.id)).toEqual(["agent-3", "agent-2", "agent-1"]);
@@ -22,18 +27,14 @@ describe("top-level collection pagination", () => {
 
   it("fails closed for duplicate identities, empty continuation pages, and cyclic cursors", async () => {
     await expect(listAllCollectionPages(async (options) => options.after
-      ? { data: [{ id: "duplicate" }], has_more: false }
-      : { data: [{ id: "duplicate" }], has_more: true, last_id: "next" }))
+      ? page([{ id: "duplicate" }], false)
+      : page([{ id: "duplicate" }], true, "next")))
       .rejects.toThrow("duplicate or invalid collection identities");
 
-    await expect(listAllCollectionPages(async () => ({ data: [], has_more: true })))
+    await expect(listAllCollectionPages(async () => (page([], true))))
       .rejects.toThrow("invalid collection pagination cursor");
 
-    await expect(listAllCollectionPages(async (options) => ({
-      data: [{ id: options.after ? "second" : "first" }],
-      has_more: true,
-      last_id: "same-cursor",
-    }))).rejects.toThrow("invalid collection pagination cursor");
+    await expect(listAllCollectionPages(async (options) => page([{ id: options.after ? "second" : "first" }], true, "same-cursor"))).rejects.toThrow("invalid collection pagination cursor");
   });
 
   it("stops before another page read when cancellation is requested", async () => {
@@ -43,7 +44,7 @@ describe("top-level collection pagination", () => {
     await expect(listAllCollectionPages(async () => {
       calls += 1;
       controller.abort();
-      return { data: [{ id: "first" }], has_more: true, last_id: "first" };
+      return page([{ id: "first" }], true, "first");
     }, controller.signal)).rejects.toMatchObject({ name: "AbortError" });
 
     expect(calls).toBe(1);
@@ -53,11 +54,7 @@ describe("top-level collection pagination", () => {
     let completeCalls = 0;
     const complete = await listAllCollectionPages(async () => {
       completeCalls += 1;
-      return {
-        data: [{ id: `complete-${completeCalls}` }],
-        has_more: completeCalls < 100,
-        last_id: `complete-${completeCalls}`,
-      };
+      return page([{ id: `complete-${completeCalls}` }], completeCalls < 100, `complete-${completeCalls}`);
     });
 
     expect(complete).toHaveLength(100);
@@ -66,11 +63,7 @@ describe("top-level collection pagination", () => {
     let incompleteCalls = 0;
     await expect(listAllCollectionPages(async () => {
       incompleteCalls += 1;
-      return {
-        data: [{ id: `incomplete-${incompleteCalls}` }],
-        has_more: true,
-        last_id: `incomplete-${incompleteCalls}`,
-      };
+      return page([{ id: `incomplete-${incompleteCalls}` }], true, `incomplete-${incompleteCalls}`);
     })).rejects.toThrow("pagination exceeded the Web safety limit");
     expect(incompleteCalls).toBe(100);
   });
@@ -81,7 +74,7 @@ describe("top-level collection pagination", () => {
     const result = await listStableCollectionPages(async () => {
       reads += 1;
       if (reads === 1) revision += 1;
-      return { data: [{ id: `snapshot-${reads}` }], has_more: false };
+      return page([{ id: `snapshot-${reads}` }], false);
     }, () => revision);
 
     expect(result).toEqual([{ id: "snapshot-2" }]);
@@ -94,7 +87,7 @@ describe("top-level collection pagination", () => {
     const result = await listStableCollectionPages(async () => {
       reads += 1;
       revision += 1;
-      return { data: [{ id: `unstable-${reads}` }], has_more: false };
+      return page([{ id: `unstable-${reads}` }], false);
     }, () => revision);
 
     expect(result).toBeNull();
@@ -104,18 +97,18 @@ describe("top-level collection pagination", () => {
 
 describe("load-more collection pages", () => {
   it("appends a page and returns the next cursor until Core reports the end", () => {
-    const first = appendCollectionPage([], { data: [{ id: "skill_3" }, { id: "skill_2" }], has_more: true, last_id: "skill_2" });
+    const first = appendCollectionPage([], page([{ id: "skill_3" }, { id: "skill_2" }], true, "skill_2"));
     expect(first).toEqual({ values: [{ id: "skill_3" }, { id: "skill_2" }], nextAfter: "skill_2" });
-    const second = appendCollectionPage(first.values, { data: [{ id: "skill_1" }], has_more: false }, "skill_2");
+    const second = appendCollectionPage(first.values, page([{ id: "skill_1" }], false), "skill_2");
     expect(second).toEqual({ values: [{ id: "skill_3" }, { id: "skill_2" }, { id: "skill_1" }], nextAfter: null });
   });
 
   it("falls back to the last entry and rejects repeated identities or cursors that do not advance", () => {
-    expect(appendCollectionPage([], { data: [{ id: "a" }], has_more: true }).nextAfter).toBe("a");
-    expect(() => appendCollectionPage([{ id: "a" }], { data: [{ id: "a" }], has_more: false }))
+    expect(appendCollectionPage([], page([{ id: "a" }], true)).nextAfter).toBe("a");
+    expect(() => appendCollectionPage([{ id: "a" }], page([{ id: "a" }], false)))
       .toThrow("duplicate or invalid collection identities");
-    expect(() => appendCollectionPage([], { data: [], has_more: true })).toThrow("invalid collection pagination cursor");
-    expect(() => appendCollectionPage([{ id: "a" }], { data: [{ id: "b" }], has_more: true, last_id: "a" }, "a"))
+    expect(() => appendCollectionPage([], page([], true))).toThrow("invalid collection pagination cursor");
+    expect(() => appendCollectionPage([{ id: "a" }], page([{ id: "b" }], true, "a"), "a"))
       .toThrow("invalid collection pagination cursor");
   });
 });
diff --git a/contracts/agents-api/index.md b/contracts/agents-api/index.md
index d0d27dc8d..286d27a27 100644
--- a/contracts/agents-api/index.md
+++ b/contracts/agents-api/index.md
@@ -14,7 +14,7 @@ Core targets the complete OpenAI Agents API as pinned below ([public API rule](h
 | [openapi.yaml](./openapi.yaml) | The official public contract with Core's `x_agents_core` extension on Agent and Session request/response objects |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go names, field representations, encoding order and stored projections; it does not define official field membership, enums or constraints |
 
-Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The internal `/core/v1` and `/api/v1` documents come from handler annotations. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
+Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The TypeScript client's types, enum values and field names in `packages/agents-client/src/generated/public-api.ts` are generated from the resulting public schema. The internal `/core/v1` and `/api/v1` documents come from handler annotations. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
 
 The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` lists types consumed by Core and overrides only the Go representation or field order that existing storage or custom JSON encoding requires. Unspecified fields follow the official schema; shared shapes use one Go type. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, Core's local limits, execution admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
 
diff --git a/contracts/agents-api/sessions-events.md b/contracts/agents-api/sessions-events.md
index de744cf36..ebee44625 100644
--- a/contracts/agents-api/sessions-events.md
+++ b/contracts/agents-api/sessions-events.md
@@ -99,7 +99,7 @@ A retry with the same `Idempotency-Key` and `stream: true` returns 201 with only
 
 ### Event rules
 
-- Session events carry `event_id`, `type` and the `session` snapshot at that transition. Turn events carry `session_id` and `turn_id`. There is no Turn `waiting` event.
+- Session events carry `event_id`, `type` and the `session` snapshot at that transition. Turn events carry `session_id` and `turn_id`; Environment events carry `session_id` and a null `turn_id`. There is no Turn `waiting` event.
 - A new Turn publishes `agent.session.turn.created`, the user `item.added`, `agent.session.in_progress`, then `agent.session.turn.in_progress`, all from one transaction. When a batch holds several messages, the later messages follow the Session activity.
 - Terminal Turn events (`completed`, `failed`, `cancelled`) carry top-level `usage` copied from the Turn snapshot at that moment, null when unknown. Other events omit it.
 - `item.added` and `item.done` always carry `output_index`, null for input Items. Function results emit `item.added` only; `item.done` is for agent output.
@@ -123,7 +123,7 @@ Turn and Item lists take `after`, `limit` and `order` ([list rules](./wire-seman
 | `mcp_call` | Server and tool identity, arguments, structured result or error |
 | `function_call`, `function_call_output` | A linked call and its result. The result always carries `output` and `error`, null when the submission omitted them; stored results keep the submitted field presence. Native file changes appear as an `apply_patch` function call with the changes as arguments and no invented result |
 | `web_search_call` | The supported action fields (`search`, `open_page`, `find_in_page`, `other`) |
-| `reasoning`, `agent_message` and the Subagent coordination calls | See [Subagents](./subagents.md). `agent_message` has no status; reasoning status can be absent or null |
+| `reasoning`, `agent_message` and the Subagent coordination calls | See [Subagents](./subagents.md). `agent_message` has no status; reasoning status can be null |
 
 A failed tool does not fail its Turn. Tool output is readable by the Session's Project and can contain the tool's own diagnostic text.
 
@@ -150,5 +150,3 @@ When an Environment fails to initialize, whether an `openai_hosted` sandbox or a
 Session reads and lists return the same Session, and input that was waiting for the Environment settles as failed in the same snapshot. The GET stream and the creation stream end after `agent.session.failed`. New input returns 409 ([input errors](#input-errors)); the Session can be deleted.
 
 The [Environment initialization contract](./environments.md#initialization-state-and-failure) defines the fixed failure reasons.
-
-Core's own `stream_interrupted` error event carries `type`, `code` and `message` without `param`; `error` events shaped like the official ones carry `param: null`.
diff --git a/contracts/agents-api/v1/events.go b/contracts/agents-api/v1/events.go
index dc2441bc5..c48a42d93 100644
--- a/contracts/agents-api/v1/events.go
+++ b/contracts/agents-api/v1/events.go
@@ -1,6 +1,9 @@
 package v1
 
-import "encoding/json"
+import (
+	"encoding/json"
+	"strings"
+)
 
 // TerminalTurnEvent reports whether an event type settles a Turn.
 func TerminalTurnEvent(eventType string) bool {
@@ -17,8 +20,8 @@ func itemEvent(eventType string) bool {
 }
 
 // MarshalJSON keeps the nullable top-level usage on terminal Turn events only,
-// a nullable output_index on every Item event (EVT-09) and a nullable error
-// param on error events.
+// a nullable output_index on every Item event (EVT-09), a nullable error param
+// on error events and a nullable turn_id on Environment events.
 func (e SessionEvent) MarshalJSON() ([]byte, error) {
 	type wire SessionEvent
 	switch {
@@ -39,6 +42,16 @@ func (e SessionEvent) MarshalJSON() ([]byte, error) {
 			wire
 			OutputIndex *int32 `json:"output_index"`
 		}{wire(e), e.OutputIndex})
+	case strings.HasPrefix(e.Type, "agent.session.environment."):
+		e.Usage = nil
+		var turn *string
+		if e.TurnID != "" {
+			turn = &e.TurnID
+		}
+		return json.Marshal(struct {
+			wire
+			TurnID *string `json:"turn_id"`
+		}{wire(e), turn})
 	}
 	e.Usage = nil
 	return json.Marshal(wire(e))
diff --git a/contracts/agents-api/v1/events_test.go b/contracts/agents-api/v1/events_test.go
index 05ac64fdb..75374d166 100644
--- a/contracts/agents-api/v1/events_test.go
+++ b/contracts/agents-api/v1/events_test.go
@@ -44,7 +44,8 @@ func TestSessionEventUsageOnlyOnTerminalTurnEvents(t *testing.T) {
 }
 
 // Error events carry the pinned SessionError, whose param is present and null
-// when unset; Environment state errors keep their observed three fields (HI-01/02).
+// when unset; Environment state errors keep their observed three fields (HI-01/02)
+// and Environment events carry a null turn_id.
 func TestSessionErrorEventCarriesNullableParam(t *testing.T) {
 	failure := &StreamError{Type: "environment_error", Code: "sandbox_error", Message: "Failed to provision environment"}
 	param := "input"
@@ -58,7 +59,7 @@ func TestSessionErrorEventCarriesNullableParam(t *testing.T) {
 			`{"type":"error","event_id":"event","session_id":"session","error":{"code":"invalid","type":"invalid_request_error","message":"m","param":"input"}}`},
 		{SessionEvent{Type: "agent.session.environment.failed", EventID: "event", Environment: &SessionEnvironmentState{ID: "environment", Type: "openai_hosted", Status: "failed",
 			Error: &StreamError{Type: "environment_error", Code: "environment_connection_failed", Message: "The environment failed to connect."}}},
-			`{"type":"agent.session.environment.failed","event_id":"event","environment":{"id":"environment","type":"openai_hosted","status":"failed","error":{"code":"environment_connection_failed","type":"environment_error","message":"The environment failed to connect."}}}`},
+			`{"type":"agent.session.environment.failed","event_id":"event","environment":{"id":"environment","type":"openai_hosted","status":"failed","error":{"code":"environment_connection_failed","type":"environment_error","message":"The environment failed to connect."}},"turn_id":null}`},
 	} {
 		raw, err := json.Marshal(test.event)
 		if err != nil || string(raw) != test.want {
diff --git a/contracts/agents-api/v1/items_test.go b/contracts/agents-api/v1/items_test.go
index a507c1319..8eecdb970 100644
--- a/contracts/agents-api/v1/items_test.go
+++ b/contracts/agents-api/v1/items_test.go
@@ -72,6 +72,10 @@ func TestItemWireFieldsAreExplicitlyNull(t *testing.T) {
 	for _, key := range []string{"phase", "error", "output", "content"} {
 		expectField(t, call, key, "")
 	}
+	command := fields(t, Item{ID: "cmd", TurnID: "turn", Type: "command_execution", Status: "in_progress", Command: "ls"})
+	for _, key := range []string{"cwd", "output", "exit_code", "duration_ms"} {
+		expectField(t, command, key, "null")
+	}
 	reasoning := fields(t, Item{ID: "rs", TurnID: "turn", Type: "reasoning"})
 	expectField(t, reasoning, "status", "null")
 	expectField(t, reasoning, "summary", "[]")
diff --git a/contracts/agents-api/v1/subagent_items.go b/contracts/agents-api/v1/subagent_items.go
index 0c21e078b..ce5c6f967 100644
--- a/contracts/agents-api/v1/subagent_items.go
+++ b/contracts/agents-api/v1/subagent_items.go
@@ -7,8 +7,9 @@ import (
 
 // MarshalJSON renders the wire shape, which is also the stored encoding.
 // Messages always carry content and a nullable phase, function results a
-// nullable output and error, and web search a nullable action. Coordination
-// and reasoning variants keep their required fields and nulls.
+// nullable output and error, commands a nullable cwd, output, exit code and
+// duration, and web search a nullable action. Coordination and reasoning
+// variants keep their required fields and nulls.
 func (i Item) MarshalJSON() ([]byte, error) {
 	type wire Item
 	switch i.Type {
@@ -26,6 +27,14 @@ func (i Item) MarshalJSON() ([]byte, error) {
 			Phase   *string       `json:"phase"`
 			Content []ItemContent `json:"content"`
 		}{wire(i), phase, content})
+	case "command_execution":
+		return json.Marshal(struct {
+			wire
+			Cwd        *string `json:"cwd"`
+			Output     any     `json:"output"`
+			ExitCode   *int64  `json:"exit_code"`
+			DurationMS *int64  `json:"duration_ms"`
+		}{wire(i), i.Cwd, i.Output, i.ExitCode, i.DurationMS})
 	case "web_search_call":
 		return json.Marshal(struct {
 			wire
diff --git a/contracts/agents-api/zh/index.md b/contracts/agents-api/zh/index.md
index fda6127ab..3897fefdc 100644
--- a/contracts/agents-api/zh/index.md
+++ b/contracts/agents-api/zh/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Agents API 覆盖台账"
 source: contracts/agents-api/index.md
-source_hash: c155876a94aeda51fb97ec292629505142cfb6f76785dfaf2a783acab87226ae
+source_hash: c3180e51ce893b3752370abbdf3a58255ebe11fdfd7ec1e1620ad85f7ce1b30d
 ---
 
 Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[public API rule](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#public-api)）。本台账记录 Core 对各项资源实现了哪些内容、哪些契约保存其详细信息，并列出相对于 OpenAI 服务的所有已知差异和所有未解决缺口。[API namespaces and credentials](../../../docs/zh/api/index.md) 说明谁调用哪些 API；[Agents API guide](../../../docs/zh/api/public-agent-api.md) 介绍使用方法。
@@ -16,7 +16,7 @@ Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[publi
 | [openapi.yaml](../openapi.yaml) | 官方公共契约，并在 Agent 和 Session 请求及响应对象上加入 Core 的 `x_agents_core` 扩展 |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go 名称、字段表示、编码顺序和存储投影；不定义官方字段集合、枚举或约束 |
 
-运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
+运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。TypeScript 客户端在 `packages/agents-client/src/generated/public-api.ts` 中的类型、枚举值和字段名由生成后的公共 schema 生成。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
 
 公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；`go-bindings.json` 只列出 Core 使用的类型，仅在已有存储或自定义 JSON 编码需要时覆盖 Go 表示或字段顺序。未覆盖的字段遵循官方 schema，相同结构复用同一个 Go 类型。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、Core 的本地限制、执行准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
 
diff --git a/contracts/agents-api/zh/sessions-events.md b/contracts/agents-api/zh/sessions-events.md
index 99688def4..846dc92a0 100644
--- a/contracts/agents-api/zh/sessions-events.md
+++ b/contracts/agents-api/zh/sessions-events.md
@@ -1,7 +1,7 @@
 ---
 title: "会话、事件和历史"
 source: contracts/agents-api/sessions-events.md
-source_hash: 93ace7d112cbc671039624ec9c999addce715bb08036a50246442a9e14549021
+source_hash: f37a947b5ae72b98b0da76da02fb13bb02ef6c346d3bf4b7830848c1196a2675
 ---
 
 本契约涵盖会话（Session）内部发生的事情：发送输入、实时事件流，以及读取轮次（Turn）、条目（Item）和使用量的持久化历史。会话资源本身（创建配置、重试标识、更新、列出和删除）见 [Core 线协议行为](wire-semantics.md)。消息和函数结果内容见[消息内容](message-content.md)。[Agents API 指南](../../../docs/zh/api/public-agent-api.md)展示了使用 SDK 和 HTTP 的调用方式。
@@ -101,7 +101,7 @@ Turn 失败后会话仍可使用：新输入会启动一个新 Turn。后来预
 
 ### 事件规则 {#event-rules}
 
-- 会话事件携带 `event_id`、`type`，以及该次状态转换时的 `session` 快照。Turn 事件携带 `session_id` 和 `turn_id`。不存在 Turn `waiting` 事件。
+- 会话事件携带 `event_id`、`type`，以及该次状态转换时的 `session` 快照。Turn 事件携带 `session_id` 和 `turn_id`；环境（Environment）事件携带 `session_id` 和值为 null 的 `turn_id`。不存在 Turn `waiting` 事件。
 - 新 Turn 会在一个事务中依次发布 `agent.session.turn.created`、用户条目的 `item.added`、`agent.session.in_progress`，然后发布 `agent.session.turn.in_progress`。当一个批次包含多条消息时，后续消息对应的条目事件会排在会话活动之后。
 - Turn 终止事件（`completed`、`failed`、`cancelled`）携带顶层的 `usage`，其值复制自当时的 Turn 快照；未知时为 null。其他事件省略此字段。
 - `item.added` 和 `item.done` 始终携带 `output_index`；输入 Item 的该值为 null。函数结果只发出 `item.added`；`item.done` 用于代理输出。
@@ -125,7 +125,7 @@ Turn 和 Item 列表接受 `after`、`limit` 和 `order`（[列表规则](wire-s
 | `mcp_call` | 服务器和工具标识、参数、结构化结果或错误 |
 | `function_call`、`function_call_output` | 关联的调用及其结果。结果始终携带 `output` 和 `error`；提交时省略这些字段则值为 null。存储的结果会保留提交时字段是否存在的信息。原生文件更改显示为 `apply_patch` 函数调用，更改内容作为参数，不会生成虚构结果 |
 | `web_search_call` | 支持的操作字段（`search`、`open_page`、`find_in_page`、`other`） |
-| `reasoning`、`agent_message` 和 Subagent 协调调用 | 见 [Subagents](subagents.md)。`agent_message` 没有状态；reasoning 状态可以缺失或为 null |
+| `reasoning`、`agent_message` 和 Subagent 协调调用 | 见 [Subagents](subagents.md)。`agent_message` 没有状态；reasoning 状态可以为 null |
 
 工具失败不会导致其 Turn 失败。会话的 Project 可以读取工具输出，其中可能包含该工具自己的诊断文本。
 
@@ -152,5 +152,3 @@ Turn 和会话的 `usage` 使用固定的 `TokenUsage` 字段：输入、缓存
 会话读取和列表操作会返回同一个会话，正在等待 Environment 的输入也会在同一快照中结算为失败。GET 流和创建流会在 `agent.session.failed` 之后结束。新输入会返回 409（[输入错误](#input-errors)）；该会话可以被删除。
 
 [Environment 初始化契约](environments.md#initialization-state-and-failure)定义了固定的失败原因。
-
-Core 自身的 `stream_interrupted` 错误事件携带 `type`、`code` 和 `message`，但不携带 `param`；与官方错误事件结构相同的 `error` 事件会携带 `param: null`。
diff --git a/example/parsar/src/lib/session-timing.ts b/example/parsar/src/lib/session-timing.ts
index 0a1fb4a8d..e5489396d 100644
--- a/example/parsar/src/lib/session-timing.ts
+++ b/example/parsar/src/lib/session-timing.ts
@@ -45,7 +45,7 @@ export function requestReturned(id: string, operation: string) {
   if (value?.operation === operation)
     write(id, { ...value, responseMs: timingNow() - value.startedAt });
 }
-export function firstTextArrived(id: string, turnId?: string) {
+export function firstTextArrived(id: string, turnId?: string | null) {
   const value = read(id);
   if (
     value &&
diff --git a/example/parsar/tests/fixture.mjs b/example/parsar/tests/fixture.mjs
index b483ee29e..1a0db861a 100644
--- a/example/parsar/tests/fixture.mjs
+++ b/example/parsar/tests/fixture.mjs
@@ -21,8 +21,13 @@ const message = (turn, role, text) => ({
 });
 
 const streams = new Map();
+// Snapshot events carry the Session itself instead of its ID.
 const emit = (session, event) => {
-  const data = { event_id: randomUUID(), session_id: session.id, ...event };
+  const data = {
+    event_id: randomUUID(),
+    ...("session" in event ? {} : { session_id: session.id }),
+    ...event,
+  };
   for (const stream of streams.get(session.id) || [])
     stream.write(`data: ${JSON.stringify(data)}\n\n`);
 };
@@ -224,7 +229,7 @@ createServer(async (req, res) => {
     const saved = {
       id: randomUUID(),
       name: null,
-      reasoning: {},
+      reasoning: { effort: null, summary: null },
       service_tier: "auto",
       ...body.agent,
       multi_agent: { enabled: false, max_concurrent_subagents: null },
@@ -374,20 +379,19 @@ createServer(async (req, res) => {
       .push(message(turn, "user", event.input[0].content[0].text));
     if (event.input[0].content[0].text === "Stream reply") {
       const item = { ...message(turn, "assistant", ""), status: "in_progress" };
-      const base = { turn_id: turn.id, item_id: item.id, output_index: 0 };
+      const base = { turn_id: turn.id, output_index: 0 };
+      const text = { ...base, item_id: item.id, content_index: 0 };
       setTimeout(() => {
         emit(session, { ...base, type: "agent.session.turn.item.added", item });
         emit(session, {
-          ...base,
-          content_index: 0,
+          ...text,
           type: "agent.session.turn.output_text.delta",
           delta: "流式第一段",
         });
       }, 250);
       setTimeout(() => {
         emit(session, {
-          ...base,
-          content_index: 0,
+          ...text,
           type: "agent.session.turn.output_text.delta",
           delta: "，第二段完成。",
         });
diff --git a/packages/agents-client/README.md b/packages/agents-client/README.md
index 456f75318..c93f98670 100644
--- a/packages/agents-client/README.md
+++ b/packages/agents-client/README.md
@@ -20,10 +20,11 @@ Every constructor also takes `baseUrl` and `fetch`. A token may be a string or a
 
 Behavior shared by the clients:
 
+- **Generated types.** `make openapi` generates `src/generated/public-api.ts` from the [public schema](../../contracts/agents-api/openapi.yaml): each schema's type, each enum's values and each object's field names. `types.ts` builds on the types and the validators read the value and field lists; `make check-openapi` rejects a stale copy, so change the schema and regenerate instead of editing the file.
 - **Strict responses.** Session, history, event, Environment and Core API responses are checked against their pinned shapes before they are returned. A malformed one throws `AgentCoreError` with status 502 and a code such as `invalid_session_resource` or `invalid_admin_response` (`CoreMetricsClient`: status 0, `invalid_response`) instead of passing on a guessed value. Agent responses are typed but not checked at run time.
-- **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). Invalid caller input throws `TypeError` before any request.
+- **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 a key of at most 128 bytes. `createIdempotencyKey()` makes 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. `createIdempotencyKey()` 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`.
 
 ### Saved Agent and deployment defaults
diff --git a/packages/agents-client/src/admin-client.test.ts b/packages/agents-client/src/admin-client.test.ts
index 8884b4328..94613c92e 100644
--- a/packages/agents-client/src/admin-client.test.ts
+++ b/packages/agents-client/src/admin-client.test.ts
@@ -211,7 +211,7 @@ describe("AdminClient response contracts", () => {
   });
 
   it("reuses Session identity and state validation", async () => {
-    const agent = { id: "a", model: "model", name: null, instructions: null, multi_agent: { enabled: false, max_concurrent_subagents: null }, reasoning: {}, service_tier: "auto", text: { format: { type: "text" }, verbosity: "medium" }, tools: [] };
+    const agent = { id: "a", model: "model", name: null, 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: [] };
     const session = { id: sessionId, object: "agent.session", agent, environment: { type: "none" }, status: "idle", error: null, metadata: {}, required_actions: [], vault_ids: [], usage: null, created_at: 1, last_active_at: 1 };
     expect(await clientWith(session).client.retrieveSession(projectId, sessionId)).toEqual(session);
     await expect(clientWith(session).client.retrieveSession(projectId, resourceId)).rejects.toBeInstanceOf(AgentCoreError);
diff --git a/packages/agents-client/src/admin-client.ts b/packages/agents-client/src/admin-client.ts
index fcf1be088..7d208fc0c 100644
--- a/packages/agents-client/src/admin-client.ts
+++ b/packages/agents-client/src/admin-client.ts
@@ -7,7 +7,7 @@ import {
   projectVaultCredential, projectVaultCredentialList, projectSourceFile, projectSourceFileDeleted,
 } from "./client";
 import { projectExecutionConfiguration } from "./execution-configuration-projection";
-import { projectAgentTurn, projectSessionItem, projectHistoryPage, validateHistoryPageOptions } from "./history-projection";
+import { projectAgentTurn, projectSessionItem, projectHistoryPage } from "./history-projection";
 import { projectRuntimeHistory } from "./runtime-history-projection";
 import { canonicalUuid, isNonnegativeInteger, isRecord } from "./response-projection";
 import { CoreRequester } from "./core-request";
@@ -204,7 +204,6 @@ export class AdminClient {
     return projectAdminSessionArchive(await this.#json(`${scope(projectId)}/sessions/${segment(sessionId)}/archive`, options), sessionId);
   }
   async listTurns(projectId: string, sessionId: string, options?: PageOptions) {
-    validateHistoryPageOptions(options);
     const value = await this.#json(pageQuery(`${scope(projectId)}/sessions/${segment(sessionId)}/turns`, options), options);
     return projectHistoryPage(value, options, (entry) => projectAgentTurn(entry, sessionId, invalidAdminResponse), invalidAdminResponse);
   }
@@ -212,7 +211,6 @@ export class AdminClient {
     return projectAgentTurn(await this.#json(`${scope(projectId)}/sessions/${segment(sessionId)}/turns/${segment(turnId)}`, options), sessionId, invalidAdminResponse, turnId);
   }
   async listItems(projectId: string, sessionId: string, options?: PageOptions) {
-    validateHistoryPageOptions(options);
     const value = await this.#json(pageQuery(`${scope(projectId)}/sessions/${segment(sessionId)}/items`, options), options);
     return projectHistoryPage(value, options, (entry) => projectSessionItem(entry, invalidAdminResponse), invalidAdminResponse);
   }
diff --git a/packages/agents-client/src/client.test.ts b/packages/agents-client/src/client.test.ts
index 125cd53ec..99c737350 100644
--- a/packages/agents-client/src/client.test.ts
+++ b/packages/agents-client/src/client.test.ts
@@ -52,7 +52,7 @@ function agentSnapshot(): Record<string, unknown> {
     name: null,
     instructions: null,
     multi_agent: { enabled: false, max_concurrent_subagents: null },
-    reasoning: {},
+    reasoning: { effort: null, summary: null },
     service_tier: "auto",
     text: { format: { type: "text" }, verbosity: "medium" },
     tools: [],
@@ -80,6 +80,7 @@ function turnResource(overrides: Record<string, unknown> = {}): Record<string, u
   return {
     id: "turn_1",
     agent_id: "agent",
+    subagent_id: null,
     session_id: "session",
     object: "agent.session.turn",
     status: "queued",
@@ -99,6 +100,7 @@ function messageItem(overrides: Record<string, unknown> = {}): Record<string, un
     type: "message",
     status: "in_progress",
     role: "assistant",
+    phase: null,
     content: [{ type: "output_text", text: "" }],
     ...overrides,
   };
@@ -163,7 +165,7 @@ describe("OpenAIAgentsClient", () => {
     const client = new OpenAIAgentsClient({
       baseUrl: "https://core.example/v1/",
       token: () => "tenant-key",
-      fetch: recordingFetch(jsonResponse({ data: [], has_more: false }), calls),
+      fetch: recordingFetch(jsonResponse({ object: "list", data: [], first_id: null, last_id: null, has_more: false }), calls),
     });
 
     await client.listSessions({ after: "sess/one", limit: 10, order: "asc", agentId: "agent one" });
@@ -299,7 +301,7 @@ describe("OpenAIAgentsClient", () => {
     const body = new ReadableStream<Uint8Array>({
       start(controller) {
         controller.enqueue(new TextEncoder().encode(
-          'event: error\ndata: {"type":"error","event_id":"evt_error","session_id":"session","error":{"code":"stream_interrupted","type":"server_error","message":"safe"}}\n\n',
+          'event: error\ndata: {"type":"error","event_id":"evt_error","session_id":"session","error":{"code":"stream_interrupted","type":"server_error","message":"safe","param":null}}\n\n',
         ));
       },
       cancel() {
@@ -325,7 +327,7 @@ describe("OpenAIAgentsClient", () => {
     const failed = { ...sessionResource(), environment, status: "failed", error: reason, last_active_at: 25 };
     const frames = [
       {
-        type: "agent.session.environment.failed", event_id: "evt_environment", session_id: "session",
+        type: "agent.session.environment.failed", event_id: "evt_environment", session_id: "session", turn_id: null,
         environment: {
           id: "environment", type: "openai_hosted", status: "failed",
           error: { type: "environment_error", code: "environment_connection_failed", message: "The environment failed to connect." },
@@ -370,7 +372,6 @@ describe("OpenAIAgentsClient", () => {
     const created = JSON.stringify({
       type: "agent.session.created",
       event_id: "evt_created",
-      session_id: "session/created",
       session,
     });
     const later = JSON.stringify({
@@ -444,7 +445,7 @@ describe("OpenAIAgentsClient", () => {
       { type: "agent.session.created", event_id: "created", session: admitted },
       { type: "agent.session.turn.created", event_id: "turn", session_id: "session", turn_id: "turn_1", turn: turnResource() },
       {
-        type: "agent.session.turn.item.added", event_id: "input", session_id: "session", turn_id: "turn_1",
+        type: "agent.session.turn.item.added", event_id: "input", session_id: "session", turn_id: "turn_1", output_index: null,
         item: messageItem({ status: "completed", role: "user", content: [{ type: "input_text", text: "First" }] }),
       },
       { type: "agent.session.in_progress", event_id: "progress", session: admitted },
@@ -864,7 +865,6 @@ describe("OpenAIAgentsClient", () => {
     const created = {
       type: "agent.session.created",
       event_id: "evt_created",
-      session_id: "session",
       session: sessionResource(),
     };
     const client = new OpenAIAgentsClient({
@@ -887,7 +887,7 @@ describe("OpenAIAgentsClient", () => {
     const onEvent = vi.fn();
     const client = new OpenAIAgentsClient({
       fetch: recordingFetch(streamResponse([
-        'event: error\ndata: {"type":"error","event_id":"evt_error","session_id":"session","error":{"code":"stream_interrupted","type":"server_error","message":"private"}}\n\n',
+        'event: error\ndata: {"type":"error","event_id":"evt_error","session_id":"session","error":{"code":"stream_interrupted","type":"server_error","message":"private","param":null}}\n\n',
       ]), []),
     });
 
@@ -1021,7 +1021,7 @@ describe("OpenAIAgentsClient", () => {
 
   it("projects the dadf64a7 known SSE payload families with exact cross references", async () => {
     const events = [
-      { type: "agent.session.idle", event_id: "session", session_id: "session", session: sessionResource() },
+      { type: "agent.session.idle", event_id: "session", session: sessionResource() },
       {
         type: "agent.session.turn.created",
         event_id: "turn",
@@ -1034,7 +1034,6 @@ describe("OpenAIAgentsClient", () => {
         event_id: "item",
         session_id: "session",
         turn_id: "turn_1",
-        item_id: "item_1",
         output_index: 0,
         item: messageItem(),
       },
@@ -1049,6 +1048,7 @@ describe("OpenAIAgentsClient", () => {
           turn_id: "turn_1",
           type: "web_search_call",
           status: "in_progress",
+          action: null,
         },
       },
       {
@@ -1094,6 +1094,7 @@ describe("OpenAIAgentsClient", () => {
         type: "agent.session.environment.connected",
         event_id: "environment",
         session_id: "session",
+        turn_id: null,
         environment: { id: "environment", type: "self_hosted", status: "connected", error: null },
       },
     ];
@@ -1106,10 +1107,10 @@ describe("OpenAIAgentsClient", () => {
 
     expect(onEvent).toHaveBeenCalledTimes(events.length);
     expect(onEvent.mock.calls.map((call) => call[0]?.type)).toEqual(events.map((event) => event.type));
-    expect(onEvent.mock.calls[2]?.[0]).toMatchObject({ item_id: "item_1", item: { id: "item_1", turn_id: "turn_1" } });
+    expect(onEvent.mock.calls[2]?.[0]).toMatchObject({ output_index: 0, item: { id: "item_1", turn_id: "turn_1" } });
   });
 
-  it("projects explicit wire nulls and accepts older Cores that omit them", async () => {
+  it("projects explicit wire nulls", async () => {
     const user = {
       id: "user_1", turn_id: "turn_1", type: "message", status: "completed", role: "user",
       phase: null, content: [{ type: "input_text", text: "question" }],
@@ -1119,12 +1120,10 @@ describe("OpenAIAgentsClient", () => {
       call_id: "call_1", output: null, error: null,
     };
     const session = { ...sessionResource(), agent: { ...agentSnapshot(), reasoning: { effort: null, summary: null } } };
-    const { phase: _omitted, ...legacyUser } = user;
     const events = [
-      { type: "agent.session.idle", event_id: "idle", session_id: "session", session },
+      { type: "agent.session.idle", event_id: "idle", session },
       { type: "agent.session.turn.item.added", event_id: "user", session_id: "session", turn_id: "turn_1", output_index: null, item: user },
       { type: "agent.session.turn.item.added", event_id: "result", session_id: "session", turn_id: "turn_1", output_index: null, item: result },
-      { type: "agent.session.turn.item.added", event_id: "legacy", session_id: "session", turn_id: "turn_1", item: { ...legacyUser, id: "user_2" } },
       {
         type: "agent.session.turn.item.added", event_id: "answer", session_id: "session", turn_id: "turn_1",
         output_index: 0, item: messageItem({ content: [], phase: "final_answer" }),
@@ -1143,9 +1142,7 @@ describe("OpenAIAgentsClient", () => {
     expect(projected[1]).toMatchObject({ output_index: null, item: { role: "user", phase: null } });
     expect(projected[2]).toMatchObject({ output_index: null, item: { output: null, error: null } });
     expect(Object.prototype.hasOwnProperty.call(projected[2]?.item, "output")).toBe(true);
-    expect(Object.prototype.hasOwnProperty.call(projected[3], "output_index")).toBe(false);
-    expect(Object.prototype.hasOwnProperty.call(projected[3]?.item, "phase")).toBe(false);
-    expect(projected[4]).toMatchObject({ output_index: 0, item: { status: "in_progress", content: [], phase: "final_answer" } });
+    expect(projected[3]).toMatchObject({ output_index: 0, item: { status: "in_progress", content: [], phase: "final_answer" } });
 
     for (const invalid of [{ ...events[1], output_index: "0" }, { ...events[1], output_index: -1 }, { ...events[1], item: { ...user, phase: "draft" } }]) {
       const rejected = new OpenAIAgentsClient({
@@ -1206,18 +1203,6 @@ describe("OpenAIAgentsClient", () => {
     expect(projected.usage).toEqual(usage);
   });
 
-  it("accepts a terminal Turn event without top-level usage", async () => {
-    const onEvent = vi.fn();
-    const client = new OpenAIAgentsClient({
-      fetch: recordingFetch(streamResponse([`data: ${JSON.stringify(terminalTurnEvent("completed"))}\n\n`]), []),
-    });
-
-    await client.streamEvents("session", { onEvent });
-
-    expect(onEvent).toHaveBeenCalledTimes(1);
-    expect(Object.prototype.hasOwnProperty.call(onEvent.mock.calls[0]?.[0], "usage")).toBe(false);
-  });
-
   it.each([
     ["a non-terminal Turn event", {
       type: "agent.session.turn.in_progress", event_id: "event", session_id: "session", turn_id: "turn_1",
@@ -1385,7 +1370,7 @@ describe("OpenAIAgentsClient", () => {
             last_active_at: 1,
           });
         }
-        return jsonResponse({ data: [], has_more: false });
+        return jsonResponse({ object: "list", data: [], first_id: null, last_id: null, has_more: false });
       }) as typeof fetch,
     });
 
@@ -1943,7 +1928,7 @@ describe("OpenAIAgentsClient", () => {
     const client = new OpenAIAgentsClient({ fetch: recordingFetch(jsonResponse({}), calls) });
 
     await expect(client.retrieveSourceFile("notes.txt")).rejects.toThrow("Invalid Source File ID");
-    await expect(client.uploadSourceFile({ file: new Blob(["x"]), filename: "" })).rejects.toThrow("valid filename");
+    await expect(client.uploadSourceFile({ file: new Blob(["x"]), filename: "" })).rejects.toThrow("nonempty filename");
     await expect(client.listEnvironmentFiles("environment", { path: "relative" }))
       .rejects.toThrow("absolute directory without parent traversal");
     await expect(client.listEnvironmentFiles("environment", { path: "/executor/../secret" }))
@@ -1953,11 +1938,6 @@ describe("OpenAIAgentsClient", () => {
       data: "YR==",
       path: "/workspace/file.txt",
     })).rejects.toThrow("strict standard Base64");
-    await expect(client.createEnvironmentFile("environment", {
-      type: "inline",
-      data: btoa("a".repeat(5 * 1024 * 1024 + 1)),
-      path: "/workspace/file.txt",
-    })).rejects.toThrow("at most 5 MiB");
     await expect(client.createEnvironmentFile("environment", {
       type: "file_id",
       file_id: "file-16e1f26e-8cf6-4272-9c31-d470b08d31af",
@@ -2040,7 +2020,7 @@ describe("OpenAIAgentsClient", () => {
     const controller = new AbortController();
     const client = new OpenAIAgentsClient({
       baseUrl: "https://core.example.test/v1/",
-      fetch: recordingFetch(jsonResponse({ data: [], has_more: false }), calls),
+      fetch: recordingFetch(jsonResponse({ object: "list", data: [], first_id: null, last_id: null, has_more: false }), calls),
     });
 
     await client.listTurns("session/one", {
@@ -2115,7 +2095,7 @@ describe("OpenAIAgentsClient", () => {
     const client = new OpenAIAgentsClient({ fetch: recordingFetch(new Response(null, { status: 202 }), calls) });
     const message: SessionInputEvent = {
       type: "agent.session.input.message",
-      input: [{ role: "user", content: [{ type: "input_text", text: "hello" }] }],
+      input: [{ role: "user", content: [{ type: "input_text", text: "hello" }, { type: "input_image", image_url: "https://example.test/a.png" }] }],
     };
     const cancel: SessionInputEvent = { type: "agent.session.input.cancel" };
 
@@ -2173,22 +2153,12 @@ describe("OpenAIAgentsClient", () => {
   it.each([
     { label: "non-array", events: {} },
     { label: "sparse", events: Array(1) },
-    { label: "65 events", events: Array.from({ length: 65 }, () => ({ type: "agent.session.input.cancel" })) },
     { label: "unknown variant", events: [{ type: "agent.session.input.future" }] },
     { label: "extra event field", events: [{ type: "agent.session.input.cancel", input: null }] },
-    { label: "empty message input", events: [{ type: "agent.session.input.message", input: [] }] },
     { label: "non-user message", events: [{
       type: "agent.session.input.message",
       input: [{ role: "assistant", content: [{ type: "input_text", text: "hello" }] }],
     }] },
-    { label: "empty text message", events: [{
-      type: "agent.session.input.message",
-      input: [{ role: "user", content: [{ type: "input_text", text: "" }] }],
-    }] },
-    { label: "all-empty text parts", events: [{
-      type: "agent.session.input.message",
-      input: [{ role: "user", content: [{ type: "input_text", text: "" }, { type: "input_text", text: "" }] }],
-    }] },
     { label: "sparse message content", events: [{
       type: "agent.session.input.message",
       input: [{ role: "user", content: Array(1) }],
@@ -2197,16 +2167,6 @@ describe("OpenAIAgentsClient", () => {
       type: "agent.session.input.message",
       input: [{ role: "user", content: [{ type: "input_text", text: "hello" }], name: "extra" }],
     }] },
-    { label: "message image", events: [{
-      type: "agent.session.input.message",
-      input: [{ role: "user", content: [{ type: "input_image", image_url: "https://example.test/a.png" }] }],
-    }] },
-    { label: "empty call id", events: [{
-      type: "agent.session.input.tool_result", call_id: "", turn_id: "turn", success: true,
-    }] },
-    { label: "empty turn id", events: [{
-      type: "agent.session.input.tool_result", call_id: "call", turn_id: "", success: true,
-    }] },
     { label: "non-boolean success", events: [{
       type: "agent.session.input.tool_result", call_id: "call", turn_id: "turn", success: "true",
     }] },
@@ -2232,33 +2192,6 @@ describe("OpenAIAgentsClient", () => {
     expect(calls).toHaveLength(0);
   });
 
-  it("enforces only Core's 1 MiB HTTP wire limit and leaves canonical internal sizing to Core", async () => {
-    const calls: FetchCall[] = [];
-    const client = new OpenAIAgentsClient({ fetch: recordingFetch(new Response(null, { status: 202 }), calls) });
-    const makeEvent = (text: string): SessionInputEvent => ({
-      type: "agent.session.input.message",
-      input: [{ role: "user", content: [{ type: "input_text", text }] }],
-    });
-    const emptyWireBytes = new TextEncoder().encode(JSON.stringify({ events: [makeEvent("")] })).length;
-    const exact = makeEvent("x".repeat(1024 * 1024 - emptyWireBytes));
-
-    await client.submitEvents("session", [exact], "exact-boundary");
-
-    expect(new TextEncoder().encode(String(calls[0]?.init?.body))).toHaveLength(1024 * 1024);
-    expect(() => client.submitEvents("session", [makeEvent(`${"x".repeat(1024 * 1024 - emptyWireBytes)}x`)], "over"))
-      .toThrow("Session input event request exceeds 1 MiB.");
-
-    const canonicalDifference = makeEvent("<>&/\u2028".repeat(80_000));
-    expect(new TextEncoder().encode(JSON.stringify({ events: [canonicalDifference] })).length).toBeGreaterThan(512 * 1024);
-    await client.submitEvents("session", [canonicalDifference], "core-canonicalizes");
-
-    const unicodeOversize = makeEvent("🙂".repeat(262_150));
-    expect(JSON.stringify({ events: [unicodeOversize] }).length).toBeLessThan(1024 * 1024);
-    expect(() => client.submitEvents("session", [unicodeOversize], "utf8-over"))
-      .toThrow("Session input event request exceeds 1 MiB.");
-    expect(calls).toHaveLength(2);
-  });
-
   it("sends whitespace-only message text verbatim, as Core admits it", async () => {
     const calls: FetchCall[] = [];
     const client = new OpenAIAgentsClient({ fetch: recordingFetch(new Response(null, { status: 202 }), calls) });
@@ -2334,24 +2267,6 @@ describe("OpenAIAgentsClient", () => {
       .toEqual([key, key]);
   });
 
-  it.each([
-    undefined,
-    "",
-    " \u0085 ",
-    "x".repeat(129),
-    "🙂".repeat(33),
-  ])("rejects invalid event-write idempotency key %j before fetch", (key) => {
-    const calls: FetchCall[] = [];
-    const client = new OpenAIAgentsClient({ fetch: recordingFetch(new Response(null, { status: 202 }), calls) });
-
-    expect(() => client.submitEvents(
-      "session",
-      [{ type: "agent.session.input.cancel" }],
-      key as unknown as string,
-    )).toThrow("Idempotency key must be non-blank and at most 128 UTF-8 bytes.");
-    expect(calls).toHaveLength(0);
-  });
-
   it("surfaces function result conflicts and target errors with their official fields", async () => {
     const input = { callId: "call", turnId: "turn", success: true, output: "value" };
     for (const [status, type, code, message] of [
diff --git a/packages/agents-client/src/client.ts b/packages/agents-client/src/client.ts
index 3a61a8c7d..aac1fd365 100644
--- a/packages/agents-client/src/client.ts
+++ b/packages/agents-client/src/client.ts
@@ -1,8 +1,30 @@
 import { coreHarnessKinds } from "./harness-catalog";
 import { projectEnvironmentInstallation } from "./installation-projection";
-import { exactFields, onlyFields, isRecord, hasOwn, canonicalUuid, isNonnegativeInteger, sameResourceId } from "./response-projection";
+import {
+  exactFields, onlyFields, schemaFields, variantFields, isOneOf, isRecord, hasOwn, canonicalUuid, isNonnegativeInteger, sameResourceId,
+  type FieldNames,
+} from "./response-projection";
+import {
+  agentsCoreFields, createVaultCredentialAuthParamStaticBearerFields, createVaultCredentialParamsFields,
+  deletedEnvironmentTemplateResourceFields, environmentParamNoneFields, environmentParamSelfHostedFields,
+  environmentParamSelfHostedRequired, deletedVaultCredentialResourceFields, deletedVaultResourceFields,
+  deleteFileResponseFields, environmentFileListResourceFields, environmentFileResourceFields, environmentResourceNoneFields,
+  environmentResourceSelfHostedFields, environmentStatusResourceValues, hostedEnvironmentFileParamFileIdFields,
+  hostedEnvironmentFileParamInlineFields, inputContentParamFields, inputMessageParamFields, inputMessageParamRequired,
+  listFilesResponseFields, multiAgentConfigResourceFields, openAIFileFields, publicEnvironmentResourceFields,
+  reasoningEffortResourceValues, reasoningResourceFields, rotateVaultCredentialAuthParamStaticBearerFields,
+  rotateVaultCredentialParamsFields, reasoningSummaryResourceValues, savedAgentCoreFields,
+  serviceTierResourceValues, sessionAgentResourceFields, sessionAgentResourceRequired, sessionCoreFields,
+  sessionEnvironmentErrorResourceFields, sessionEnvironmentStateResourceFields, sessionErrorResourceFields,
+  sessionEventAgentSessionCreatedFields, sessionEventErrorFields, sessionEventFields,
+  sessionInputParamAgentSessionInputCancelFields, sessionInputParamAgentSessionInputMessageFields,
+  sessionInputParamAgentSessionInputToolResultFields, sessionInputParamAgentSessionInputToolResultRequired,
+  sessionRequiredActionResourceFields, sessionResourceFields, sessionResourceRequired, sessionStatusResourceValues,
+  textFormatResourceFields, textResourceFields, vaultCredentialResourceFields, vaultListResourceFields, vaultResourceFields,
+  verbosityResourceValues,
+} from "./generated/public-api";
 import { projectTokenUsage } from "./usage-projection";
-import { projectAgentTurn, projectSessionItem, projectItemContent, projectHistoryPage, validateHistoryPageOptions } from "./history-projection";
+import { projectAgentTurn, projectSessionItem, projectItemContent, projectHistoryPage } from "./history-projection";
 import { projectOpenAIHostedSessionEnvironment } from "./session-environment-projection";
 import { safeProvider } from "./execution-configuration-projection";
 import { createSSEDecoder } from "./sse";
@@ -67,7 +89,6 @@ import type {
   SessionEvent,
   SessionListOptions,
   SessionInputEvent,
-  SessionMessageInputEvent,
   SessionToolResultInputEvent,
   SessionItem,
   SourceFile,
@@ -99,7 +120,6 @@ import type {
   VaultDeleted,
   VaultList,
   VaultListOptions,
-  EnvironmentResourceStatus,
 } from "./types";
 
 export interface OpenAIAgentsClientOptions {
@@ -190,16 +210,6 @@ export function createIdempotencyKey(): string {
   return `web-${Date.now()}-${Math.random().toString(16).slice(2)}`;
 }
 
-function requireIdempotencyKey(value: unknown): asserts value is string {
-  if (
-    typeof value !== "string" ||
-    goWhitespaceOnlyPattern.test(value) ||
-    new TextEncoder().encode(value).length > 128
-  ) {
-    throw new TypeError("Idempotency key must be non-blank and at most 128 UTF-8 bytes.");
-  }
-}
-
 function addPageOptions(params: URLSearchParams, options?: PageOptions): void {
   if (options?.after) params.set("after", options.after);
   if (options?.limit !== undefined) params.set("limit", String(options.limit));
@@ -207,21 +217,10 @@ function addPageOptions(params: URLSearchParams, options?: PageOptions): void {
 }
 
 export function addVaultPageOptions(params: URLSearchParams, options?: VaultListOptions): void {
-  if (options?.limit !== undefined && (!Number.isSafeInteger(options.limit) || options.limit < 1 || options.limit > 100)) {
-    throw new TypeError("Vault list limit must be an integer from 1 through 100.");
-  }
-  if (options?.order !== undefined && options.order !== "asc" && options.order !== "desc") {
-    throw new TypeError("Vault list order must be asc or desc.");
-  }
   addPageOptions(params, options);
-  if (options?.status === undefined) return;
-  const statuses = Array.isArray(options.status) ? options.status : [options.status];
-  if (statuses.length === 0 || statuses.some((status) => status !== "active" && status !== "archived")) {
-    throw new TypeError("Vault status must be active, archived, or a non-empty array of those values.");
-  }
-  if (Array.isArray(options.status)) {
-    statuses.forEach((status) => params.append("status[]", status));
-  } else {
+  if (Array.isArray(options?.status)) {
+    options.status.forEach((status) => params.append("status[]", status));
+  } else if (options?.status !== undefined) {
     params.set("status", options.status);
   }
 }
@@ -231,78 +230,13 @@ function withQuery(path: string, params: URLSearchParams): string {
   return query ? `${path}?${query}` : path;
 }
 
-const environmentResourceFields = new Set(["id", "object", "type", "status", "files", "plugins", "skills"]);
-const environmentFileFields = new Set(["environment_id", "object", "path", "size_bytes"]);
-const environmentFileListFields = new Set(["object", "data", "next", "has_more"]);
-const sourceFileFields = new Set([
-  "id", "object", "bytes", "created_at", "filename", "purpose", "status", "expires_at", "status_details",
-]);
-const sourceFileDeletedFields = new Set(["id", "object", "deleted"]);
 const canonicalUuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 const sourceFileIdPattern = /^file-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
+// Bounds the download buffer a Content-Length header can make the client allocate.
 const maxSourceFileBytes = 512 * 1024 * 1024;
-const maxEnvironmentFileBytes = 50 * 1024 * 1024;
-// Core applies the official 5 MiB decoded bound to inline data; file_id copies keep 50 MiB.
-const maxInlineEnvironmentFileBytes = 5 * 1024 * 1024;
-const sourceFileListFields = new Set(["object", "data", "has_more", "first_id", "last_id"]);
-// Core's Files list bound; it defaults to its maximum.
+// Core's default Files page size, which binds a page listed without a limit.
 const maxSourceFileListLimit = 10000;
-const environmentTemplateDeletedFields = new Set(["id", "object", "deleted"]);
-const vaultFields = new Set(["id", "object", "created_at", "name", "metadata"]);
-const vaultListFields = new Set(["object", "data", "has_more", "first_id", "last_id"]);
-const vaultDeletedFields = new Set(["id", "object", "deleted"]);
-const vaultCredentialFields = new Set(["id", "vault_id", "name", "object", "auth", "created_at", "updated_at"]);
-const vaultCredentialDeletedFields = new Set(["id", "object", "deleted"]);
-const sessionFields = new Set([
-  "id", "object", "agent", "environment", "status", "error", "metadata",
-  "required_actions", "vault_ids", "usage", "created_at", "last_active_at",
-]);
-const agentSnapshotFields = new Set([
-  "id", "model", "name", "instructions", "multi_agent", "reasoning",
-  "service_tier", "text", "tools",
-]);
-const agentSnapshotAcceptedFields = new Set([...agentSnapshotFields, "x_agents_core"]);
-const sessionAgentCoreFields = new Set(["harness", "harness_config"]);
-const savedAgentCoreFields = new Set(["harness", "model_provider", "harness_config"]);
-const multiAgentFields = new Set(["enabled", "max_concurrent_subagents"]);
-const reasoningFields = new Set(["effort", "summary"]);
-const textFields = new Set(["format", "verbosity"]);
-const sessionStatuses = new Set(["idle", "in_progress", "requires_action", "failed"]);
-const serviceTiers = new Set(["auto", "default", "flex", "priority", "fast"]);
-const reasoningEfforts = new Set(["none", "minimal", "low", "medium", "high", "xhigh", "max"]);
-const reasoningSummaries = new Set(["concise", "detailed", "auto"]);
-const sessionMessageEventFields = new Set(["type", "input"]);
-const sessionCancelEventFields = new Set(["type"]);
-const sessionToolResultEventFields = new Set(["type", "call_id", "turn_id", "success", "output", "error"]);
-const inputMessageFields = new Set(["type", "role", "content"]);
-const inputTextFields = new Set(["type", "text"]);
-const inputImageFields = new Set(["type", "image_url"]);
-const maxSessionInputEvents = 64;
-const maxSessionInputRequestBytes = 1024 * 1024;
-const goWhitespaceOnlyPattern = /^[\u0009-\u000d\u0020\u0085\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000]*$/u;
-const streamErrorFields = new Set(["code", "type", "message"]);
-// Error events carry the pinned SessionError, whose param is null when unset.
-const sessionErrorFields = new Set([...streamErrorFields, "param"]);
-const environmentStateFields = new Set(["id", "type", "status", "error"]);
-const snapshotEventFields = new Set(["type", "event_id", "session_id", "session"]);
-const turnEventFields = new Set(["type", "event_id", "session_id", "turn_id", "turn"]);
-// Terminal Turn events also carry top-level usage mirroring the Turn snapshot.
-const terminalTurnEventFields = new Set([...turnEventFields, "usage"]);
-const terminalTurnEventTypes = new Set([
-  "agent.session.turn.completed", "agent.session.turn.failed", "agent.session.turn.cancelled",
-]);
-const itemEventFields = new Set(["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "item"]);
-const contentPartEventFields = new Set([
-  "type", "event_id", "session_id", "turn_id", "item_id", "output_index", "content_index", "part",
-]);
-const outputTextEventBaseFields = [
-  "type", "event_id", "session_id", "turn_id", "item_id", "output_index", "content_index",
-] as const;
-const commandDeltaEventFields = new Set([
-  "type", "event_id", "session_id", "turn_id", "item_id", "output_index", "delta",
-]);
-const environmentEventFields = new Set(["type", "event_id", "session_id", "environment"]);
-const errorEventFields = new Set(["type", "event_id", "session_id", "error"]);
+// An unknown event never carries a field whose meaning a projected event defines.
 const unsafeUnknownEventFields = new Set([
   "session", "turn", "turn_id", "item", "item_id", "output_index", "content_index", "part", "delta", "text", "error", "environment",
 ]);
@@ -319,86 +253,45 @@ const runtimeObservationReasons = new Set([
 ]);
 const runtimeProviderTypePattern = /^[a-z][a-z0-9_]{0,31}$/;
 const runtimeLifecycleStates = new Set(["active", "sleeping", "transitioning", "pending", "stopped"]);
-function utf8Length(value: string): number {
-  return new TextEncoder().encode(value).length;
+function invalidSessionInputBatch(): never {
+  throw new TypeError("Invalid Session input event batch.");
 }
 
-function invalidSessionInputBatch(message = "Invalid Session input event batch."): never {
-  throw new TypeError(message);
+function canonicalInputContent(part: unknown): FunctionResultContent {
+  if (!isRecord(part)) return invalidSessionInputBatch();
+  const fields = variantFields(inputContentParamFields, part.type);
+  if (!fields || !exactFields(part, fields)) return invalidSessionInputBatch();
+  if (part.type === "input_text" && typeof part.text === "string") return { type: "input_text", text: part.text };
+  if (part.type === "input_image" && typeof part.image_url === "string") return { type: "input_image", image_url: part.image_url };
+  return invalidSessionInputBatch();
 }
 
 function canonicalInputMessage(value: unknown): InputMessage {
   if (
-    !isRecord(value) || !onlyFields(value, inputMessageFields) ||
-    !hasOwn(value, "role") || !hasOwn(value, "content") ||
-    value.role !== "user" || !Array.isArray(value.content) || value.content.length === 0 ||
-    (hasOwn(value, "type") && value.type !== "message")
+    !isRecord(value) || !schemaFields(value, inputMessageParamFields, inputMessageParamRequired) ||
+    value.role !== "user" || !Array.isArray(value.content) || (hasOwn(value, "type") && value.type !== "message")
   ) {
     return invalidSessionInputBatch();
   }
-  let text = "";
-  const content = Array.from(value.content, (part) => {
-    if (
-      !isRecord(part) || !exactFields(part, inputTextFields) ||
-      part.type !== "input_text" || typeof part.text !== "string"
-    ) {
-      return invalidSessionInputBatch();
-    }
-    text += part.text;
-    return { type: "input_text" as const, text: part.text };
-  });
-  // Core admits whitespace-only text verbatim; only all-empty text rejects.
-  if (text === "") return invalidSessionInputBatch();
-  return hasOwn(value, "type")
-    ? { type: "message", role: "user", content }
-    : { role: "user", content };
-}
-
-function canonicalFunctionOutput(value: unknown): string | FunctionResultContent[] | null {
-  if (value === null || typeof value === "string") return value;
-  if (!Array.isArray(value)) return invalidSessionInputBatch();
-  return Array.from(value, (part) => {
-    if (!isRecord(part)) return invalidSessionInputBatch();
-    if (part.type === "input_text") {
-      if (!exactFields(part, inputTextFields) || typeof part.text !== "string") {
-        return invalidSessionInputBatch();
-      }
-      return { type: "input_text" as const, text: part.text };
-    }
-    if (part.type === "input_image") {
-      if (!exactFields(part, inputImageFields) || typeof part.image_url !== "string") {
-        return invalidSessionInputBatch();
-      }
-      return { type: "input_image" as const, image_url: part.image_url };
-    }
-    return invalidSessionInputBatch();
-  });
+  const content = Array.from(value.content, canonicalInputContent);
+  return hasOwn(value, "type") ? { type: "message", role: "user", content } : { role: "user", content };
 }
 
 function canonicalSessionInputEvent(value: unknown): SessionInputEvent {
-  if (!isRecord(value) || !hasOwn(value, "type") || typeof value.type !== "string") {
-    return invalidSessionInputBatch();
-  }
+  if (!isRecord(value)) return invalidSessionInputBatch();
   switch (value.type) {
-    case "agent.session.input.message": {
-      if (!exactFields(value, sessionMessageEventFields) || !Array.isArray(value.input) || value.input.length === 0) {
+    case "agent.session.input.message":
+      if (!exactFields(value, sessionInputParamAgentSessionInputMessageFields) || !Array.isArray(value.input)) {
         return invalidSessionInputBatch();
       }
-      return {
-        type: "agent.session.input.message",
-        input: Array.from(value.input, canonicalInputMessage),
-      } satisfies SessionMessageInputEvent;
-    }
+      return { type: "agent.session.input.message", input: Array.from(value.input, canonicalInputMessage) };
     case "agent.session.input.cancel":
-      if (!exactFields(value, sessionCancelEventFields)) return invalidSessionInputBatch();
+      if (!exactFields(value, sessionInputParamAgentSessionInputCancelFields)) return invalidSessionInputBatch();
       return { type: "agent.session.input.cancel" };
     case "agent.session.input.tool_result": {
       if (
-        !onlyFields(value, sessionToolResultEventFields) ||
-        !hasOwn(value, "call_id") || !hasOwn(value, "turn_id") || !hasOwn(value, "success") ||
-        typeof value.call_id !== "string" || value.call_id.length === 0 ||
-        typeof value.turn_id !== "string" || value.turn_id.length === 0 ||
-        typeof value.success !== "boolean" ||
+        !schemaFields(value, sessionInputParamAgentSessionInputToolResultFields, sessionInputParamAgentSessionInputToolResultRequired) ||
+        typeof value.call_id !== "string" || typeof value.turn_id !== "string" || typeof value.success !== "boolean" ||
         (hasOwn(value, "error") && value.error !== null && typeof value.error !== "string")
       ) {
         return invalidSessionInputBatch();
@@ -409,7 +302,11 @@ function canonicalSessionInputEvent(value: unknown): SessionInputEvent {
         turn_id: value.turn_id,
         success: value.success,
       };
-      if (hasOwn(value, "output")) event.output = canonicalFunctionOutput(value.output);
+      if (hasOwn(value, "output")) {
+        const output = value.output;
+        if (output !== null && typeof output !== "string" && !Array.isArray(output)) return invalidSessionInputBatch();
+        event.output = Array.isArray(output) ? Array.from(output, canonicalInputContent) : output;
+      }
       if (hasOwn(value, "error")) event.error = value.error as string | null;
       return event;
     }
@@ -419,22 +316,12 @@ function canonicalSessionInputEvent(value: unknown): SessionInputEvent {
 }
 
 function encodeSessionInputBatch(events: readonly SessionInputEvent[]): string {
-  if (!Array.isArray(events) || events.length > maxSessionInputEvents) {
-    return invalidSessionInputBatch("Session input event batch must contain at most 64 events.");
-  }
-  const body = JSON.stringify({ events: Array.from(events, canonicalSessionInputEvent) });
-  // Core's HTTP handler bounds the complete wire request at 1 MiB. Its separate
-  // 512 KiB internal limit is measured after Go decodes, reshapes and canonically
-  // re-encodes individual payloads, so approximating it from browser JSON would
-  // reject valid wire requests (notably around Go's HTML and U+2028 escaping).
-  if (utf8Length(body) > maxSessionInputRequestBytes) {
-    return invalidSessionInputBatch("Session input event request exceeds 1 MiB.");
-  }
-  return body;
+  if (!Array.isArray(events)) return invalidSessionInputBatch();
+  return JSON.stringify({ events: Array.from(events, canonicalSessionInputEvent) });
 }
 
 function isTrimmedName(value: unknown): value is string {
-  return typeof value === "string" && value === value.trim() && utf8Length(value) >= 1 && utf8Length(value) <= 256;
+  return typeof value === "string" && value !== "" && value === value.trim();
 }
 
 function validMetadata(value: unknown): value is Record<string, string> {
@@ -457,7 +344,7 @@ function invalidVaultResponse(code: string, message: string): never {
 }
 
 export function projectVault(value: unknown, expectedId?: string): Vault {
-  if (!isRecord(value) || !exactFields(value, vaultFields)) {
+  if (!isRecord(value) || !exactFields(value, vaultResourceFields)) {
     return invalidVaultResponse("invalid_vault_resource", "OpenAgentCore returned an invalid Vault resource.");
   }
   if (
@@ -484,7 +371,7 @@ export function projectVaultCredential(
   expectedVaultId: string,
   expectedCredentialId?: string,
 ): VaultCredential {
-  if (!isRecord(value) || !exactFields(value, vaultCredentialFields) || !isRecord(value.auth)) {
+  if (!isRecord(value) || !exactFields(value, vaultCredentialResourceFields) || !isRecord(value.auth)) {
     return invalidVaultResponse("invalid_vault_credential", "OpenAgentCore returned invalid Credential metadata.");
   }
   if (
@@ -526,14 +413,11 @@ function projectVaultPage<T extends { id: string; created_at: number }>(
   code: string,
   message: string,
 ): { object: "list"; data: T[]; has_more: boolean; first_id: string | null; last_id: string | null } {
-  if (!isRecord(value) || !exactFields(value, vaultListFields) || value.object !== "list" || !Array.isArray(value.data) || typeof value.has_more !== "boolean") {
+  if (!isRecord(value) || !exactFields(value, vaultListResourceFields) || value.object !== "list" || !Array.isArray(value.data) || typeof value.has_more !== "boolean") {
     return invalidVaultResponse(code, message);
   }
-  const limit = options?.limit ?? 20;
   const order = options?.order ?? "desc";
-  if (!Number.isSafeInteger(limit) || limit < 1 || limit > 100 || (order !== "asc" && order !== "desc") || value.data.length > limit) {
-    return invalidVaultResponse(code, message);
-  }
+  if (value.data.length > (options?.limit ?? 20)) return invalidVaultResponse(code, message);
   const data = value.data.map(project);
   const ids = new Set(data.map((entry) => entry.id));
   const firstId = data[0]?.id ?? null;
@@ -569,7 +453,7 @@ function projectDeletedResource<T extends VaultDeleted | VaultCredentialDeleted>
   value: unknown,
   expectedId: string,
   object: T["object"],
-  fields: Set<string>,
+  fields: FieldNames,
   code: string,
 ): T {
   if (!isRecord(value) || !exactFields(value, fields) || !sameUuid(value.id, expectedId) || value.object !== object || value.deleted !== true) {
@@ -608,7 +492,7 @@ type AgentConfiguration<Core> = Omit<AgentSnapshot, "x_agents_core"> & { x_agent
 /** A Session's effective Agent preserves its explicit native selections. */
 function projectSessionAgentCore(value: unknown): AgentsCoreSelection | null | undefined {
   if (value === undefined || value === null) return value;
-  if (!isRecord(value) || !onlyFields(value, sessionAgentCoreFields) ||
+  if (!isRecord(value) || !onlyFields(value, agentsCoreFields) ||
     (hasOwn(value, "harness") && !isHarnessKind(value.harness)) ||
     (hasOwn(value, "harness_config") && !isRecord(value.harness_config))) {
     return invalidSessionResource();
@@ -652,10 +536,9 @@ function projectAgentConfiguration<Core>(
   value: unknown,
   projectCore: (value: unknown) => Core | null | undefined,
 ): AgentConfiguration<Core> {
-  if (
-    !isRecord(value) || !onlyFields(value, agentSnapshotAcceptedFields) ||
-    [...agentSnapshotFields].some((field) => !hasOwn(value, field))
-  ) return invalidSessionResource();
+  if (!isRecord(value) || !schemaFields(value, sessionAgentResourceFields, sessionAgentResourceRequired)) {
+    return invalidSessionResource();
+  }
   const agentsCore = projectCore(value.x_agents_core);
   const multiAgent = value.multi_agent;
   const reasoning = value.reasoning;
@@ -665,26 +548,23 @@ function projectAgentConfiguration<Core>(
     typeof value.model !== "string" || value.model.trim() === "" ||
     !(value.name === null || typeof value.name === "string") ||
     !(value.instructions === null || typeof value.instructions === "string") ||
-    !isRecord(multiAgent) || !exactFields(multiAgent, multiAgentFields) ||
+    !isRecord(multiAgent) || !exactFields(multiAgent, multiAgentConfigResourceFields) ||
     typeof multiAgent.enabled !== "boolean" ||
     !(multiAgent.max_concurrent_subagents === null ||
       (Number.isSafeInteger(multiAgent.max_concurrent_subagents) && Number(multiAgent.max_concurrent_subagents) > 0)) ||
-    !isRecord(reasoning) || !onlyFields(reasoning, reasoningFields) ||
-    !(reasoning.effort === undefined || reasoning.effort === null || reasoningEfforts.has(String(reasoning.effort))) ||
-    !(reasoning.summary === undefined || reasoning.summary === null || reasoningSummaries.has(String(reasoning.summary))) ||
-    !serviceTiers.has(String(value.service_tier)) ||
-    !isRecord(text) || !exactFields(text, textFields) ||
-    (text.verbosity !== "low" && text.verbosity !== "medium" && text.verbosity !== "high") ||
+    !isRecord(reasoning) || !exactFields(reasoning, reasoningResourceFields) ||
+    !(reasoning.effort === null || isOneOf(reasoningEffortResourceValues, reasoning.effort)) ||
+    !(reasoning.summary === null || isOneOf(reasoningSummaryResourceValues, reasoning.summary)) ||
+    !isOneOf(serviceTierResourceValues, value.service_tier) ||
+    !isRecord(text) || !exactFields(text, textResourceFields) || !isOneOf(verbosityResourceValues, text.verbosity) ||
     !isRecord(text.format) || !Array.isArray(value.tools)
   ) return invalidSessionResource();
 
   const format = text.format;
-  if (
-    (format.type === "text" && !exactFields(format, new Set(["type"]))) ||
-    (format.type === "json_schema" &&
-      (!exactFields(format, new Set(["type", "schema"])) || !isRecord(format.schema))) ||
-    (format.type !== "text" && format.type !== "json_schema")
-  ) return invalidSessionResource();
+  const formatFields = variantFields(textFormatResourceFields, format.type);
+  if (!formatFields || !exactFields(format, formatFields) || (format.type === "json_schema" && !isRecord(format.schema))) {
+    return invalidSessionResource();
+  }
 
   return {
     id: value.id,
@@ -696,8 +576,8 @@ function projectAgentConfiguration<Core>(
       enabled: multiAgent.enabled,
       max_concurrent_subagents: multiAgent.max_concurrent_subagents as number | null,
     },
-    reasoning: { ...reasoning } as AgentSession["agent"]["reasoning"],
-    service_tier: value.service_tier as AgentSession["agent"]["service_tier"],
+    reasoning: { effort: reasoning.effort, summary: reasoning.summary },
+    service_tier: value.service_tier,
     text: {
       format: format.type === "text"
         ? { type: "text" }
@@ -713,12 +593,12 @@ function projectSessionEnvironment(value: unknown): AgentSession["environment"]
     return invalidSessionResource();
   }
   if (value.type === "none") {
-    if (!exactFields(value, new Set(["type"]))) return invalidSessionResource();
+    if (!exactFields(value, environmentResourceNoneFields)) return invalidSessionResource();
     return { type: "none" };
   }
   if (value.type === "self_hosted") {
     if (
-      !exactFields(value, new Set(["type", "id", "remote_url", "workspace_directory", "capability_directories"])) ||
+      !exactFields(value, environmentResourceSelfHostedFields) ||
       typeof value.id !== "string" || value.id.trim() === "" ||
       typeof value.remote_url !== "string" || value.remote_url.trim() === "" ||
       typeof value.workspace_directory !== "string" || value.workspace_directory.trim() === "" ||
@@ -756,15 +636,14 @@ function normalizeCreationEnvironment(value: AgentEnvironmentInput): ExpectedCre
     throw new TypeError("Session creation requires a supported Environment.");
   }
   if (value.type === "none") {
-    if (!exactFields(value, new Set(["type"]))) {
+    if (!exactFields(value, environmentParamNoneFields)) {
       throw new TypeError("The none Environment accepts no additional fields.");
     }
     return { type: "none" };
   }
   if (value.type === "self_hosted") {
     if (
-      !onlyFields(value, new Set(["type", "workspace_directory", "capability_directories"])) ||
-      !hasOwn(value, "workspace_directory") ||
+      !schemaFields(value, environmentParamSelfHostedFields, environmentParamSelfHostedRequired) ||
       typeof value.workspace_directory !== "string" || value.workspace_directory.trim() === "" ||
       !(value.capability_directories === undefined || value.capability_directories === null ||
         (Array.isArray(value.capability_directories) &&
@@ -781,6 +660,7 @@ function normalizeCreationEnvironment(value: AgentEnvironmentInput): ExpectedCre
     };
   }
   if (value.type === "openai_hosted") {
+    // The client supports only the network mode and Template reference of the schema's hosted fields.
     if (
       !onlyFields(value, new Set(["type", "network", "environment_template_id"])) ||
       !(value.network === undefined || value.network === null || (
@@ -871,10 +751,10 @@ function matchesImmutableSession(
 function projectRequiredActions(value: unknown): AgentSession["required_actions"] {
   if (!Array.isArray(value)) return invalidSessionResource();
   return value.map((entry) => {
-    if (!isRecord(entry) || typeof entry.type !== "string") return invalidSessionResource();
+    const fields = isRecord(entry) ? variantFields(sessionRequiredActionResourceFields, entry.type) : undefined;
+    if (!isRecord(entry) || !fields || !exactFields(entry, fields)) return invalidSessionResource();
     if (entry.type === "function_call") {
       if (
-        !exactFields(entry, new Set(["type", "call_id", "turn_id", "name", "arguments"])) ||
         typeof entry.call_id !== "string" || entry.call_id === "" ||
         typeof entry.turn_id !== "string" || entry.turn_id === "" ||
         typeof entry.name !== "string" || entry.name === ""
@@ -887,14 +767,8 @@ function projectRequiredActions(value: unknown): AgentSession["required_actions"
         arguments: entry.arguments,
       };
     }
-    if (entry.type === "environment_connection") {
-      if (
-        !exactFields(entry, new Set(["type", "environment_id"])) ||
-        typeof entry.environment_id !== "string" || entry.environment_id === ""
-      ) return invalidSessionResource();
-      return { type: "environment_connection" as const, environment_id: entry.environment_id };
-    }
-    return invalidSessionResource();
+    if (typeof entry.environment_id !== "string" || entry.environment_id === "") return invalidSessionResource();
+    return { type: "environment_connection" as const, environment_id: entry.environment_id };
   });
 }
 
@@ -905,18 +779,21 @@ export function projectAgentSession(
   expectedEnvironment?: ExpectedCreationEnvironment,
   expectedImmutable?: ImmutableSessionProjection,
 ): AgentSession {
-  if (!isRecord(value) || !exactFields(Object.fromEntries(Object.entries(value).filter(([key]) => key !== "x_agents_core")), sessionFields)) return invalidSessionResource();
+  if (!isRecord(value) || !schemaFields(value, sessionResourceFields, sessionResourceRequired)) return invalidSessionResource();
   let installation;
-  if (value.x_agents_core !== undefined) {
-    if (!isRecord(value.x_agents_core) || !exactFields(value.x_agents_core, new Set(["installation"]))) return invalidSessionResource();
-    installation = projectEnvironmentInstallation(value.x_agents_core.installation);
-    if (!installation) return invalidSessionResource();
+  const core = value.x_agents_core;
+  if (core !== undefined && core !== null) {
+    if (!isRecord(core) || !onlyFields(core, sessionCoreFields)) return invalidSessionResource();
+    if (hasOwn(core, "installation")) {
+      installation = projectEnvironmentInstallation(core.installation);
+      if (!installation) return invalidSessionResource();
+    }
   }
   if (
     typeof value.id !== "string" || value.id.trim() === "" ||
     (expectedSessionId !== undefined && !sameResourceId(value.id, expectedSessionId)) ||
     value.object !== "agent.session" ||
-    !sessionStatuses.has(String(value.status)) ||
+    !isOneOf(sessionStatusResourceValues, value.status) ||
     !(value.error === null || typeof value.error === "string") ||
     !validMetadata(value.metadata) ||
     !isNonnegativeInteger(value.created_at) ||
@@ -1121,18 +998,15 @@ export function projectRuntimeObservation(value: unknown, expectedSessionId?: st
 
 function projectStreamError(value: unknown): StreamError {
   if (
-    !isRecord(value) || !onlyFields(value, sessionErrorFields) ||
-    typeof value.code !== "string" || value.code === "" ||
-    typeof value.type !== "string" || value.type === "" ||
-    typeof value.message !== "string" ||
-    !(value.param === undefined || value.param === null || typeof value.param === "string")
+    !isRecord(value) || !exactFields(value, sessionErrorResourceFields) ||
+    !(value.code === null || nonemptyString(value.code)) || !nonemptyString(value.type) ||
+    typeof value.message !== "string" || !(value.param === null || typeof value.param === "string")
   ) return invalidStreamEvent();
-  return {
-    code: value.code,
-    type: value.type,
-    message: value.message,
-    ...(value.param === undefined ? {} : { param: value.param as string | null }),
-  };
+  return { code: value.code, type: value.type, message: value.message, param: value.param };
+}
+
+function nonemptyString(value: unknown): value is string {
+  return typeof value === "string" && value !== "";
 }
 
 function requiredEventString(event: Record<string, unknown>, field: string, allowEmpty = false): string {
@@ -1141,15 +1015,13 @@ function requiredEventString(event: Record<string, unknown>, field: string, allo
   return value;
 }
 
-function optionalEventIndex(event: Record<string, unknown>, field: string, required = false): number | undefined {
+function eventIndex(event: Record<string, unknown>, field: string): number {
   const value = event[field];
-  if (value === undefined && !required) return undefined;
   if (!isNonnegativeInteger(value)) return invalidStreamEvent();
   return value;
 }
 
-function eventSessionId(event: Record<string, unknown>, expectedSessionId: string, required: boolean): string | undefined {
-  if (event.session_id === undefined && !required) return undefined;
+function eventSessionId(event: Record<string, unknown>, expectedSessionId: string): string {
   if (typeof event.session_id !== "string" || !sameResourceId(event.session_id, expectedSessionId)) {
     return invalidStreamEvent("OpenAgentCore returned an event for a different Session.");
   }
@@ -1157,17 +1029,18 @@ function eventSessionId(event: Record<string, unknown>, expectedSessionId: strin
 }
 
 function projectEnvironmentState(value: unknown, status: string): AgentSessionEnvironmentEvent["environment"] {
+  const error = isRecord(value) ? value.error : undefined;
   if (
-    !isRecord(value) || !onlyFields(value, environmentStateFields) ||
-    typeof value.id !== "string" || value.id === "" ||
-    typeof value.type !== "string" || value.type === "" || value.status !== status ||
-    !(value.error === undefined || value.error === null || isRecord(value.error))
+    !isRecord(value) || !exactFields(value, sessionEnvironmentStateResourceFields) ||
+    !nonemptyString(value.id) || !nonemptyString(value.type) || value.status !== status ||
+    !(error === null || (isRecord(error) && exactFields(error, sessionEnvironmentErrorResourceFields) &&
+      nonemptyString(error.code) && nonemptyString(error.type) && typeof error.message === "string"))
   ) return invalidStreamEvent();
   return {
     id: value.id,
     type: value.type,
     status: value.status as AgentSessionEnvironmentEvent["environment"]["status"],
-    error: value.error === undefined || value.error === null ? null : projectStreamError(value.error),
+    error: error === null ? null : { code: error.code as string, type: error.type as string, message: error.message as string },
   };
 }
 
@@ -1206,165 +1079,107 @@ function projectCreatedSessionEvent(
   expectedEnvironment: ExpectedCreationEnvironment,
 ): { event: SessionEvent; session: AgentSession } {
   const value = event as unknown as Record<string, unknown>;
-  if (event.type !== "agent.session.created" || !onlyFields(value, snapshotEventFields) || event.session === undefined) {
+  if (event.type !== "agent.session.created" || !exactFields(value, sessionEventAgentSessionCreatedFields)) {
     return invalidStreamEvent("OpenAgentCore did not begin Session creation with a created Session snapshot.");
   }
-  const session = projectAgentSession(event.session, expectedVaultIds, undefined, expectedEnvironment);
-  const sessionId = eventSessionId(value, session.id, false);
-  return {
-    event: {
-      type: "agent.session.created",
-      event_id: event.event_id,
-      ...(sessionId === undefined ? {} : { session_id: sessionId }),
-      session,
-    },
-    session,
-  };
+  const session = projectAgentSession(value.session, expectedVaultIds, undefined, expectedEnvironment);
+  return { event: { type: "agent.session.created", event_id: event.event_id, session }, session };
 }
 
+// Subagent and reasoning summary events are not projected yet; they pass through as unknown events.
+const unprojectedEventPattern = /^agent\.session\.(subagent\.|turn\.reasoning_summary_)/;
+
+const sessionStatusesByEvent: Readonly<Record<string, AgentSession["status"]>> = {
+  "agent.session.in_progress": "in_progress",
+  "agent.session.requires_action": "requires_action",
+  "agent.session.idle": "idle",
+  "agent.session.failed": "failed",
+};
+
+const turnStatusByEvent: Readonly<Record<string, AgentTurn["status"]>> = {
+  "agent.session.turn.created": "queued",
+  "agent.session.turn.in_progress": "in_progress",
+  "agent.session.turn.completed": "completed",
+  "agent.session.turn.failed": "failed",
+  "agent.session.turn.cancelled": "cancelled",
+};
+
 function projectStreamEventSession(
   event: SessionEvent,
   expectedSessionId: string,
   immutable?: ImmutableSessionProjection,
 ): SessionEvent {
   const value = event as unknown as Record<string, unknown>;
+  const fields = variantFields(sessionEventFields, event.type);
   const base = { type: event.type, event_id: event.event_id };
-  const sessionStatusesByEvent: Record<string, AgentSession["status"]> = {
-    "agent.session.in_progress": "in_progress",
-    "agent.session.requires_action": "requires_action",
-    "agent.session.idle": "idle",
-    "agent.session.failed": "failed",
-  };
+  if (!fields || unprojectedEventPattern.test(event.type)) return projectUnknownStreamEvent(value, expectedSessionId);
+  if (!exactFields(value, fields)) return invalidStreamEvent();
+
   if (event.type === "agent.session.created" || hasOwn(sessionStatusesByEvent, event.type)) {
-    if (!onlyFields(value, snapshotEventFields) || event.session === undefined) return invalidStreamEvent();
-    const sessionId = eventSessionId(value, expectedSessionId, false);
-    const session = projectAgentSession(event.session, undefined, expectedSessionId, undefined, immutable);
+    const session = projectAgentSession(value.session, undefined, expectedSessionId, undefined, immutable);
     if (event.type !== "agent.session.created" && session.status !== sessionStatusesByEvent[event.type]) {
       return invalidStreamEvent();
     }
-    return { ...base, ...(sessionId === undefined ? {} : { session_id: sessionId }), session } as SessionEvent;
+    return { ...base, session } as SessionEvent;
   }
 
-  const turnStatusByEvent: Record<string, AgentTurn["status"]> = {
-    "agent.session.turn.created": "queued",
-    "agent.session.turn.in_progress": "in_progress",
-    "agent.session.turn.waiting": "waiting",
-    "agent.session.turn.completed": "completed",
-    "agent.session.turn.failed": "failed",
-    "agent.session.turn.cancelled": "cancelled",
-  };
-  if (hasOwn(turnStatusByEvent, event.type)) {
-    // Older Core releases omit terminal usage; no other Turn event may carry it.
-    const withUsage = terminalTurnEventTypes.has(event.type) && hasOwn(value, "usage");
-    if (!exactFields(value, withUsage ? terminalTurnEventFields : turnEventFields) || event.turn === undefined) {
-      return invalidStreamEvent();
-    }
-    const sessionId = eventSessionId(value, expectedSessionId, true)!;
-    const turnId = requiredEventString(value, "turn_id");
-    const turn = projectAgentTurn(event.turn, expectedSessionId, invalidStreamEvent);
-    const usage = withUsage ? { usage: projectTokenUsage(value.usage, invalidStreamEvent) } : {};
+  // Core puts Environment events outside any Turn, so their turn_id is null.
+  if (event.type.startsWith("agent.session.environment.")) {
+    const environment = projectEnvironmentState(value.environment, event.type.slice("agent.session.environment.".length));
     if (
-      !sameResourceId(turn.id, turnId) ||
-      // Core no longer streams child Turns. Earlier releases did, and native child
-      // history could first appear there as a completed created snapshot.
-      (!(event.type === "agent.session.turn.created" && turn.subagent_id != null) && turn.status !== turnStatusByEvent[event.type]) ||
-      (immutable !== undefined && turn.subagent_id == null && !sameResourceId(turn.agent_id, immutable.agent.id))
+      value.turn_id !== null ||
+      (immutable !== undefined &&
+        (immutable.environment.type === "none" ||
+          immutable.environment.type !== environment.type ||
+          !("id" in immutable.environment) ||
+          typeof immutable.environment.id !== "string" ||
+          !sameResourceId(immutable.environment.id, environment.id)))
     ) return invalidStreamEvent();
-    return { ...base, session_id: sessionId, turn_id: turnId, turn, ...usage } as SessionEvent;
-  }
-
-  if (event.type === "agent.session.turn.item.added" || event.type === "agent.session.turn.item.done") {
-    if (!onlyFields(value, itemEventFields) || event.item === undefined) return invalidStreamEvent();
-    const sessionId = eventSessionId(value, expectedSessionId, true)!;
-    const turnId = requiredEventString(value, "turn_id");
-    const item = projectSessionItem(event.item, invalidStreamEvent);
-    if (!sameResourceId(item.turn_id, turnId)) return invalidStreamEvent();
-    const itemId = value.item_id === undefined ? undefined : requiredEventString(value, "item_id");
-    if (itemId !== undefined && !sameResourceId(item.id, itemId)) return invalidStreamEvent();
-    // Input Items carry a null output index; older Cores omit it.
-    const outputIndex = value.output_index === null ? null : optionalEventIndex(value, "output_index");
-    return {
-      ...base,
-      session_id: sessionId,
-      turn_id: turnId,
-      ...(itemId === undefined ? {} : { item_id: itemId }),
-      ...(outputIndex === undefined ? {} : { output_index: outputIndex }),
-      item,
-    } as SessionEvent;
-  }
-
-  if (event.type === "agent.session.turn.content_part.added" || event.type === "agent.session.turn.content_part.done") {
-    if (!exactFields(value, contentPartEventFields)) return invalidStreamEvent();
-    const sessionId = eventSessionId(value, expectedSessionId, true)!;
-    const turnId = requiredEventString(value, "turn_id");
-    const itemId = requiredEventString(value, "item_id");
-    const outputIndex = optionalEventIndex(value, "output_index", true)!;
-    const contentIndex = optionalEventIndex(value, "content_index", true)!;
-    const part = projectItemContent(value.part, invalidStreamEvent);
-    return { ...base, session_id: sessionId, turn_id: turnId, item_id: itemId, output_index: outputIndex, content_index: contentIndex, part } as SessionEvent;
-  }
-
-  if (event.type === "agent.session.turn.output_text.delta" || event.type === "agent.session.turn.output_text.done") {
-    const field = event.type.endsWith(".delta") ? "delta" : "text";
-    if (!exactFields(value, new Set([...outputTextEventBaseFields, field]))) return invalidStreamEvent();
-    const sessionId = eventSessionId(value, expectedSessionId, true)!;
-    const turnId = requiredEventString(value, "turn_id");
-    const itemId = requiredEventString(value, "item_id");
-    const outputIndex = optionalEventIndex(value, "output_index", true)!;
-    const contentIndex = optionalEventIndex(value, "content_index", true)!;
-    const text = requiredEventString(value, field, true);
-    return {
-      ...base,
-      session_id: sessionId,
-      turn_id: turnId,
-      item_id: itemId,
-      output_index: outputIndex,
-      content_index: contentIndex,
-      [field]: text,
-    } as SessionEvent;
-  }
-
-  if (event.type === "agent.output.command_execution_output.delta") {
-    if (!exactFields(value, commandDeltaEventFields)) return invalidStreamEvent();
-    const sessionId = eventSessionId(value, expectedSessionId, true)!;
-    return {
-      ...base,
-      session_id: sessionId,
-      turn_id: requiredEventString(value, "turn_id"),
-      item_id: requiredEventString(value, "item_id"),
-      output_index: optionalEventIndex(value, "output_index", true)!,
-      delta: requiredEventString(value, "delta", true),
-    } as SessionEvent;
+    return { ...base, session_id: eventSessionId(value, expectedSessionId), turn_id: null, environment } as SessionEvent;
   }
 
   // A Session failure, such as a hosted Environment that failed to provision.
   // Core's stream_interrupted error never reaches this projection.
-  if (event.type === "error") {
-    if (!exactFields(value, errorEventFields)) return invalidStreamEvent();
-    const sessionId = eventSessionId(value, expectedSessionId, true)!;
-    return { ...base, session_id: sessionId, error: projectStreamError(value.error) } as SessionEvent;
-  }
+  const sessionId = eventSessionId(value, expectedSessionId);
+  if (event.type === "error") return { ...base, session_id: sessionId, error: projectStreamError(value.error) } as SessionEvent;
 
-  if (event.type.startsWith("agent.session.environment.")) {
-    const status = event.type.slice("agent.session.environment.".length);
-    if (!new Set(["pending", "ready", "connected", "disconnected", "failed"]).has(status)) {
-      return projectUnknownStreamEvent(value, expectedSessionId);
-    }
-    if (!exactFields(value, environmentEventFields)) return invalidStreamEvent();
-    const sessionId = eventSessionId(value, expectedSessionId, true)!;
-    const environment = projectEnvironmentState(value.environment, status);
+  // Every other projected event belongs to a Turn. The schema allows a null turn_id here,
+  // but Core always names the Turn and the client binds it to the Turn or Item it carries.
+  const turnId = requiredEventString(value, "turn_id");
+  if (hasOwn(turnStatusByEvent, event.type)) {
+    const turn = projectAgentTurn(value.turn, expectedSessionId, invalidStreamEvent);
     if (
-      immutable !== undefined &&
-      (immutable.environment.type === "none" ||
-        immutable.environment.type !== environment.type ||
-        !("id" in immutable.environment) ||
-        typeof immutable.environment.id !== "string" ||
-        !sameResourceId(immutable.environment.id, environment.id))
+      !sameResourceId(turn.id, turnId) || turn.status !== turnStatusByEvent[event.type] ||
+      (immutable !== undefined && !sameResourceId(turn.agent_id, immutable.agent.id))
     ) return invalidStreamEvent();
-    return { ...base, session_id: sessionId, environment } as SessionEvent;
+    const usage = hasOwn(value, "usage") ? { usage: projectTokenUsage(value.usage, invalidStreamEvent) } : {};
+    return { ...base, session_id: sessionId, turn_id: turnId, turn, ...usage } as SessionEvent;
   }
 
-  return projectUnknownStreamEvent(value, expectedSessionId);
+  if (event.type.startsWith("agent.session.turn.item.")) {
+    const item = projectSessionItem(value.item, invalidStreamEvent);
+    if (!sameResourceId(item.turn_id, turnId)) return invalidStreamEvent();
+    const outputIndex = value.output_index === null ? null : eventIndex(value, "output_index");
+    return { ...base, session_id: sessionId, turn_id: turnId, output_index: outputIndex, item } as SessionEvent;
+  }
+
+  const projectedFields: Record<string, unknown> = {
+    ...base,
+    session_id: sessionId,
+    turn_id: turnId,
+    item_id: requiredEventString(value, "item_id"),
+    output_index: eventIndex(value, "output_index"),
+  };
+  if (hasOwn(value, "content_index")) projectedFields.content_index = eventIndex(value, "content_index");
+  if (hasOwn(value, "part")) {
+    const part = projectItemContent(value.part, invalidStreamEvent);
+    if (part.type !== "output_text") return invalidStreamEvent();
+    projectedFields.part = part;
+  }
+  for (const field of ["delta", "text"] as const) {
+    if (hasOwn(value, field)) projectedFields[field] = requiredEventString(value, field, true);
+  }
+  return projectedFields as unknown as SessionEvent;
 }
 
 function projectUnknownStreamEvent(
@@ -1375,8 +1190,7 @@ function projectUnknownStreamEvent(
     type: value.type,
     event_id: value.event_id,
   };
-  const sessionId = eventSessionId(value, expectedSessionId, false);
-  if (sessionId !== undefined) projected.session_id = sessionId;
+  if (value.session_id !== undefined) projected.session_id = eventSessionId(value, expectedSessionId);
   for (const [field, fieldValue] of Object.entries(value)) {
     if (
       field === "type" || field === "event_id" || field === "session_id" ||
@@ -1412,7 +1226,7 @@ async function consumeEventStream(
     sawEvent = true;
     if (event.type === "error") {
       const raw = event as unknown as Record<string, unknown>;
-      if (!exactFields(raw, errorEventFields) || event.error === undefined) return invalidStreamEvent();
+      if (!exactFields(raw, sessionEventErrorFields)) return invalidStreamEvent();
       const sessionId = requiredEventString(raw, "session_id");
       const expectedSessionId = options.expectedSessionId?.();
       if (expectedSessionId !== undefined && !sameResourceId(sessionId, expectedSessionId)) {
@@ -1462,10 +1276,6 @@ async function consumeEventStream(
   }
 }
 
-function isEnvironmentResourceStatus(value: unknown): value is EnvironmentResourceStatus {
-  return value === "pending" || value === "connected" || value === "disconnected" || value === "expired" || value === "failed";
-}
-
 function isExpectedEnvironmentId(value: unknown, expectedId: string): value is string {
   if (typeof value !== "string") return false;
   const canonicalExpectedId = expectedId.toLowerCase();
@@ -1478,14 +1288,12 @@ function projectEnvironmentResource(value: unknown, expectedId: string): AgentEn
     throw new AgentCoreError("OpenAgentCore returned an invalid Environment resource.", 502, "invalid_environment_resource");
   }
   const resource = value as Record<string, unknown>;
-  const fields = Object.keys(resource);
   if (
-    fields.length !== environmentResourceFields.size ||
-    fields.some((field) => !environmentResourceFields.has(field)) ||
+    !exactFields(resource, publicEnvironmentResourceFields) ||
     !isExpectedEnvironmentId(resource.id, expectedId) ||
     resource.object !== "agent.environment" ||
     (resource.type !== "self_hosted" && resource.type !== "openai_hosted") ||
-    !isEnvironmentResourceStatus(resource.status) ||
+    !isOneOf(environmentStatusResourceValues, resource.status) ||
     !Array.isArray(resource.files) ||
     !Array.isArray(resource.plugins) ||
     !Array.isArray(resource.skills) ||
@@ -1572,24 +1380,18 @@ function validSourceFileId(value: unknown): value is string {
 export function projectSourceFile(value: unknown, expectedId?: string): SourceFile {
   if (value === null || typeof value !== "object" || Array.isArray(value)) return invalidSourceFile();
   const file = value as Record<string, unknown>;
-  const fields = Object.keys(file);
-  const filenameBytes = typeof file.filename === "string"
-    ? new TextEncoder().encode(file.filename).length
-    : 0;
+  // The pinned File schema types expires_at and status_details as optional integer and string; Core sends null.
   if (
-    fields.length !== sourceFileFields.size ||
-    fields.some((field) => !sourceFileFields.has(field)) ||
+    !exactFields(file, openAIFileFields) ||
     !validSourceFileId(file.id) ||
     (expectedId !== undefined && file.id !== expectedId) ||
     file.object !== "file" ||
     !Number.isSafeInteger(file.bytes) ||
     Number(file.bytes) < 0 ||
-    Number(file.bytes) > maxSourceFileBytes ||
     !Number.isSafeInteger(file.created_at) ||
     Number(file.created_at) < 0 ||
     typeof file.filename !== "string" ||
-    filenameBytes < 1 ||
-    filenameBytes > 1024 ||
+    file.filename === "" ||
     file.filename.includes("\0") ||
     file.purpose !== "user_data" ||
     file.status !== "processed" ||
@@ -1612,10 +1414,8 @@ export function projectSourceFile(value: unknown, expectedId?: string): SourceFi
 export function projectSourceFileDeleted(value: unknown, expectedId: string): SourceFileDeleted {
   if (value === null || typeof value !== "object" || Array.isArray(value)) return invalidSourceFile();
   const deleted = value as Record<string, unknown>;
-  const fields = Object.keys(deleted);
   if (
-    fields.length !== sourceFileDeletedFields.size ||
-    fields.some((field) => !sourceFileDeletedFields.has(field)) ||
+    !exactFields(deleted, deleteFileResponseFields) ||
     deleted.id !== expectedId ||
     deleted.object !== "file" ||
     deleted.deleted !== true
@@ -1644,7 +1444,7 @@ function projectSourceFileListEntry(value: unknown): SourceFileListEntry {
 
 function projectSourceFileList(value: unknown, options?: SourceFileListOptions): SourceFileList {
   if (
-    !isRecord(value) || !exactFields(value, sourceFileListFields) || value.object !== "list" ||
+    !isRecord(value) || !exactFields(value, listFilesResponseFields) || value.object !== "list" ||
     !Array.isArray(value.data) || typeof value.has_more !== "boolean"
   ) return invalidSourceFileList();
   const limit = options?.limit ?? maxSourceFileListLimit;
@@ -1680,17 +1480,14 @@ function projectEnvironmentFile(
     throw new AgentCoreError("OpenAgentCore returned an invalid Environment file.", 502, "invalid_environment_file");
   }
   const file = value as Record<string, unknown>;
-  const fields = Object.keys(file);
   if (
-    fields.length !== environmentFileFields.size ||
-    fields.some((field) => !environmentFileFields.has(field)) ||
+    !exactFields(file, environmentFileResourceFields) ||
     !isExpectedEnvironmentId(file.environment_id, expectedEnvironmentId) ||
     file.object !== "agent.environment.file" ||
     file.path !== expectedPath ||
     !validEnvironmentFilePath(file.path) ||
     !Number.isSafeInteger(file.size_bytes) ||
     Number(file.size_bytes) < 0 ||
-    Number(file.size_bytes) > maxEnvironmentFileBytes ||
     (expectedSize !== undefined && file.size_bytes !== expectedSize)
   ) {
     throw new AgentCoreError("OpenAgentCore returned an invalid Environment file.", 502, "invalid_environment_file");
@@ -1722,7 +1519,6 @@ function canonicalAbsoluteDirectory(value: unknown): string | null {
   if (
     typeof value !== "string" ||
     !value.startsWith("/") ||
-    new TextEncoder().encode(value).length > 4096 ||
     value.includes("\\") ||
     value.includes("\0") ||
     value.includes("\r") ||
@@ -1765,28 +1561,17 @@ function projectEnvironmentFileList(
     return invalidEnvironmentFiles();
   }
   const page = value as Record<string, unknown>;
-  const fields = Object.keys(page);
   const limit = options?.limit ?? 20;
   const order = options?.order ?? "desc";
   const requestedDirectory = canonicalEnvironmentFilesDirectory(options.path ?? "/workspace");
   if (
-    fields.length !== environmentFileListFields.size ||
-    fields.some((field) => !environmentFileListFields.has(field)) ||
+    !exactFields(page, environmentFileListResourceFields) ||
     page.object !== "page" ||
     page.has_more !== (page.next !== null) ||
     !Array.isArray(page.data) ||
-    !Number.isSafeInteger(limit) ||
-    limit < 1 ||
-    limit > 100 ||
     page.data.length > limit ||
-    (order !== "asc" && order !== "desc") ||
     requestedDirectory === null ||
-    !(page.next === null || (
-      typeof page.next === "string" &&
-      page.next.length > 0 &&
-      new TextEncoder().encode(page.next).length <= 1024 &&
-      page.data.length === limit
-    ))
+    !(page.next === null || (typeof page.next === "string" && page.next.length > 0 && page.data.length === limit))
   ) {
     return invalidEnvironmentFiles();
   }
@@ -1798,7 +1583,6 @@ function projectEnvironmentFileList(
       return invalidEnvironmentFiles();
     }
     const file = entry as Record<string, unknown>;
-    const fileFields = Object.keys(file);
     const canonicalPath = canonicalAbsoluteDirectory(file.path);
     const sorted = previousPath === null || (
       order === "asc"
@@ -1806,8 +1590,7 @@ function projectEnvironmentFileList(
         : compareUtf8(previousPath, String(file.path)) > 0
     );
     if (
-      fileFields.length !== environmentFileFields.size ||
-      fileFields.some((field) => !environmentFileFields.has(field)) ||
+      !exactFields(file, environmentFileResourceFields) ||
       !isExpectedEnvironmentId(file.environment_id, expectedId) ||
       file.object !== "agent.environment.file" ||
       canonicalPath === null ||
@@ -1975,7 +1758,7 @@ export class OpenAIAgentsClient implements AgentCore {
 
   async deleteVault(vaultId: string): Promise<VaultDeleted> {
     const value = await this.request<unknown>(`/vaults/${encodeURIComponent(vaultId)}`, { method: "DELETE" }, 200);
-    return projectDeletedResource<VaultDeleted>(value, vaultId, "vault.deleted", vaultDeletedFields, "invalid_vault_deletion");
+    return projectDeletedResource<VaultDeleted>(value, vaultId, "vault.deleted", deletedVaultResourceFields, "invalid_vault_deletion");
   }
 
   async listVaultCredentials(vaultId: string, options?: VaultListOptions): Promise<VaultCredentialList> {
@@ -1990,12 +1773,9 @@ export class OpenAIAgentsClient implements AgentCore {
   }
 
   async createVaultCredential(vaultId: string, input: CreateVaultCredentialInput): Promise<VaultCredential> {
-    const fields = Object.keys(input);
-    const authFields = isRecord(input.auth) ? Object.keys(input.auth) : [];
     if (
-      fields.length !== 2 || fields.some((field) => field !== "name" && field !== "auth") ||
-      !isTrimmedName(input.name) || !isRecord(input.auth) ||
-      authFields.length !== 3 || authFields.some((field) => field !== "type" && field !== "mcp_server_url" && field !== "token") ||
+      !exactFields(input, createVaultCredentialParamsFields) || !isTrimmedName(input.name) ||
+      !isRecord(input.auth) || !exactFields(input.auth, createVaultCredentialAuthParamStaticBearerFields) ||
       input.auth.type !== "static_bearer" || !validCredentialURL(input.auth.mcp_server_url) || typeof input.auth.token !== "string"
     ) {
       throw new TypeError("Credential creation requires a name, an HTTPS MCP URL, and a write-only token.");
@@ -2031,11 +1811,9 @@ export class OpenAIAgentsClient implements AgentCore {
     credentialId: string,
     input: ReplaceVaultCredentialTokenInput,
   ): Promise<VaultCredential> {
-    const fields = Object.keys(input);
-    const authFields = isRecord(input.auth) ? Object.keys(input.auth) : [];
     if (
-      fields.length !== 1 || fields[0] !== "auth" || !isRecord(input.auth) ||
-      authFields.length !== 2 || authFields.some((field) => field !== "type" && field !== "token") ||
+      !exactFields(input, rotateVaultCredentialParamsFields) || !isRecord(input.auth) ||
+      !exactFields(input.auth, rotateVaultCredentialAuthParamStaticBearerFields) ||
       input.auth.type !== "static_bearer" || typeof input.auth.token !== "string"
     ) {
       throw new TypeError("Credential replacement accepts one write-only static bearer token.");
@@ -2072,7 +1850,7 @@ export class OpenAIAgentsClient implements AgentCore {
       value,
       credentialId,
       "vault.credential.deleted",
-      vaultCredentialDeletedFields,
+      deletedVaultCredentialResourceFields,
       "invalid_vault_credential_deletion",
     );
   }
@@ -2172,12 +1950,6 @@ export class OpenAIAgentsClient implements AgentCore {
   }
 
   async listEnvironmentTemplates(options?: PageOptions & ReadOptions): Promise<EnvironmentTemplateList> {
-    if (options?.limit !== undefined && (!Number.isSafeInteger(options.limit) || options.limit < 1 || options.limit > 100)) {
-      throw new TypeError("Environment Template list limit must be an integer from 1 through 100.");
-    }
-    if (options?.order !== undefined && options.order !== "asc" && options.order !== "desc") {
-      throw new TypeError("Environment Template list order must be asc or desc.");
-    }
     const params = new URLSearchParams();
     addPageOptions(params, options);
     const value = await this.request<unknown>(
@@ -2252,7 +2024,7 @@ export class OpenAIAgentsClient implements AgentCore {
       200,
     );
     if (
-      !isRecord(value) || !exactFields(value, environmentTemplateDeletedFields) ||
+      !isRecord(value) || !exactFields(value, deletedEnvironmentTemplateResourceFields) ||
       !sameUuid(value.id, templateId) ||
       value.object !== "agent.environment.template.deleted" || value.deleted !== true
     ) {
@@ -2290,24 +2062,16 @@ export class OpenAIAgentsClient implements AgentCore {
     if (!validEnvironmentFilePath(input.path)) {
       throw new TypeError("Environment file paths must be canonical absolute paths beneath /workspace.");
     }
-    const fields = Object.keys(input);
     let expectedSize: number | undefined;
     if (input.type === "inline") {
-      if (fields.length !== 3 || fields.some((field) => field !== "type" && field !== "data" && field !== "path")) {
+      if (!exactFields(input, hostedEnvironmentFileParamInlineFields)) {
         throw new TypeError("Inline Environment files accept only type, data, and path.");
       }
       const decodedBytes = strictBase64DecodedBytes(input.data);
       if (decodedBytes === null) throw new TypeError("Inline Environment file data must be strict standard Base64.");
-      if (decodedBytes > maxInlineEnvironmentFileBytes) {
-        throw new TypeError("Inline Environment file data must decode to at most 5 MiB.");
-      }
       expectedSize = decodedBytes;
     } else if (input.type === "file_id") {
-      if (
-        fields.length !== 3 ||
-        fields.some((field) => field !== "type" && field !== "file_id" && field !== "path") ||
-        !validSourceFileId(input.file_id)
-      ) {
+      if (!exactFields(input, hostedEnvironmentFileParamFileIdFields) || !validSourceFileId(input.file_id)) {
         throw new TypeError("Referenced Environment files require an exact Source File ID.");
       }
     } else {
@@ -2326,18 +2090,6 @@ export class OpenAIAgentsClient implements AgentCore {
     if (options?.after !== undefined && !validSourceFileId(options.after)) {
       throw new TypeError("A Files list cursor must be a File ID.");
     }
-    if (
-      options?.limit !== undefined &&
-      (!Number.isSafeInteger(options.limit) || options.limit < 1 || options.limit > maxSourceFileListLimit)
-    ) {
-      throw new TypeError("Files list limit must be an integer from 1 through 10000.");
-    }
-    if (options?.order !== undefined && options.order !== "asc" && options.order !== "desc") {
-      throw new TypeError("Files list order must be asc or desc.");
-    }
-    if (options?.purpose !== undefined && options.purpose !== "user_data") {
-      throw new TypeError("Files list purpose must be user_data.");
-    }
     const params = new URLSearchParams();
     addPageOptions(params, options);
     if (options?.purpose !== undefined) params.set("purpose", options.purpose);
@@ -2346,17 +2098,8 @@ export class OpenAIAgentsClient implements AgentCore {
   }
 
   async uploadSourceFile(input: SourceFileUploadInput, options?: ReadOptions): Promise<SourceFile> {
-    const filenameBytes = new TextEncoder().encode(input.filename).length;
-    if (
-      !(input.file instanceof Blob) ||
-      !Number.isSafeInteger(input.file.size) ||
-      input.file.size < 0 ||
-      input.file.size > maxSourceFileBytes ||
-      filenameBytes < 1 ||
-      filenameBytes > 1024 ||
-      input.filename.includes("\0")
-    ) {
-      throw new TypeError("Source Files require a valid filename and at most 512 MiB of content.");
+    if (!(input.file instanceof Blob) || input.filename === "" || input.filename.includes("\0")) {
+      throw new TypeError("Source Files require a Blob and a nonempty filename without NUL characters.");
     }
     const body = new FormData();
     body.append("file", input.file, input.filename);
@@ -2590,7 +2333,6 @@ export class OpenAIAgentsClient implements AgentCore {
   }
 
   async listItems(sessionId: string, options?: PageOptions & ReadOptions): Promise<ListPage<SessionItem>> {
-    validateHistoryPageOptions(options);
     const params = new URLSearchParams();
     addPageOptions(params, options);
     const value = await this.request<unknown>(withQuery(`/agents/sessions/${encodeURIComponent(sessionId)}/items`, params), {
@@ -2600,7 +2342,6 @@ export class OpenAIAgentsClient implements AgentCore {
   }
 
   async listTurns(sessionId: string, options?: PageOptions & ReadOptions): Promise<ListPage<AgentTurn>> {
-    validateHistoryPageOptions(options);
     const params = new URLSearchParams();
     addPageOptions(params, options);
     const value = await this.request<unknown>(withQuery(`/agents/sessions/${encodeURIComponent(sessionId)}/turns`, params), {
@@ -2622,7 +2363,6 @@ export class OpenAIAgentsClient implements AgentCore {
     events: readonly SessionInputEvent[],
     idempotencyKey: string,
   ): Promise<void> {
-    requireIdempotencyKey(idempotencyKey);
     const body = encodeSessionInputBatch(events);
     return this.request<void>(
       `/agents/sessions/${encodeURIComponent(sessionId)}/events`,
@@ -2662,9 +2402,6 @@ export class OpenAIAgentsClient implements AgentCore {
    * such as one after cancellation or one that differs from the saved result,
    * with HTTP 409 `conflict_error`. A call that is unknown or belongs to another
    * Turn of the Session is HTTP 400 `invalid_request_error`; nothing changes.
-   * Cores before these codes used 409 `turn_conflict`/`idempotency_conflict`
-   * and 404 for unknown targets: treat any 409 as a conflict, and 400 (new) or
-   * 404 (older, within an owned Session) as an unknown target.
    */
   submitFunctionResult(sessionId: string, input: FunctionResultInput, idempotencyKey: string): Promise<void> {
     const event: SessionToolResultInputEvent = {
diff --git a/packages/agents-client/src/environment-template-projection.ts b/packages/agents-client/src/environment-template-projection.ts
index 8cfacc0d1..ecd23ac8b 100644
--- a/packages/agents-client/src/environment-template-projection.ts
+++ b/packages/agents-client/src/environment-template-projection.ts
@@ -12,6 +12,11 @@ import type {
   UpdateEnvironmentTemplateInput,
 } from "./types";
 import { canonicalUuid, exactFields, hasOwn, isNonnegativeInteger, isRecord, onlyFields } from "./response-projection";
+import {
+  environmentPackagesResourceFields, environmentTemplateResourceFields, hostedPluginResourceInlineFields,
+  hostedTemplateFileResourceFileIdFields, hostedTemplateFileResourceInlineFields, hostedTemplateSkillResourceInlineFields,
+  hostedTemplateSkillResourceSkillReferenceFields, networkPolicyResourceFields,
+} from "./generated/public-api";
 
 type Invalid = (message?: string) => never;
 
@@ -19,26 +24,15 @@ const identityFields = ["id", "object", "name", "created_at", "updated_at"] as c
 const templateSections: readonly EnvironmentTemplateSection[] = [
   "network", "capability_directories", "packages", "files", "plugins", "skills",
 ];
-const knownTemplateFields = new Set<string>([...identityFields, ...templateSections]);
-const networkFields = new Set(["access", "allowed_domains"]);
-const packagesFields = new Set(["npm", "python", "system"]);
-const inlineFileFields = new Set(["type", "path", "size_bytes"]);
-const referencedFileFields = new Set(["type", "path", "file_id"]);
-const skillReferenceFields = new Set(["type", "skill_id", "version"]);
-const inlineCapabilityFields = new Set(["type", "name", "description"]);
 const canonicalUuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 // Skill IDs are `skill_` plus Core's resource identifier.
 const skillIdPattern = /^skill_[A-Za-z0-9][A-Za-z0-9_-]{0,127}$/;
 const skillVersionPattern = /^[1-9][0-9]{0,18}$/;
 const controlCharacterPattern = /[\u0000-\u001f\u007f]/;
-// Core accepts 1–100 exact hostnames for restricted access.
-const maxAllowedDomains = 100;
 
-/** Core preserves a Template name verbatim within a 1–256 Unicode character bound. */
+/** Core preserves a nonempty Template name verbatim and enforces its length bound. */
 export function isEnvironmentTemplateName(value: unknown): value is string {
-  if (typeof value !== "string") return false;
-  const characters = [...value].length;
-  return characters >= 1 && characters <= 256;
+  return typeof value === "string" && value !== "";
 }
 
 /** True when every configuration section of a Template was recognized. */
@@ -63,20 +57,20 @@ function stringList(value: unknown, valid: (entry: unknown) => entry is string =
 }
 
 function projectNetwork(value: unknown): EnvironmentNetworkPolicy | null {
-  if (!isRecord(value) || !exactFields(value, networkFields)) return null;
+  if (!isRecord(value) || !exactFields(value, networkPolicyResourceFields)) return null;
   const domains = stringList(value.allowed_domains, isText);
   if (domains === null) return null;
   if (value.access === "enabled" || value.access === "disabled") {
     return domains.length === 0 ? { access: value.access, allowed_domains: [] } : null;
   }
   if (value.access === "restricted") {
-    return domains.length >= 1 && domains.length <= maxAllowedDomains ? { access: "restricted", allowed_domains: domains } : null;
+    return domains.length > 0 ? { access: "restricted", allowed_domains: domains } : null;
   }
   return null;
 }
 
 function projectPackages(value: unknown): AgentEnvironmentPackages | null {
-  if (!isRecord(value) || !exactFields(value, packagesFields)) return null;
+  if (!isRecord(value) || !exactFields(value, environmentPackagesResourceFields)) return null;
   const npm = stringList(value.npm, isText);
   const python = stringList(value.python, isText);
   const system = stringList(value.system, isText);
@@ -95,12 +89,12 @@ function projectEntries<T>(value: unknown, project: (entry: Record<string, unkno
 }
 
 function projectFile(entry: Record<string, unknown>): EnvironmentTemplateFile | null {
-  if (entry.type === "inline" && exactFields(entry, inlineFileFields)) {
+  if (entry.type === "inline" && exactFields(entry, hostedTemplateFileResourceInlineFields)) {
     return isWorkspacePath(entry.path) && isNonnegativeInteger(entry.size_bytes)
       ? { type: "inline", path: entry.path, size_bytes: entry.size_bytes }
       : null;
   }
-  if (entry.type === "file_id" && exactFields(entry, referencedFileFields)) {
+  if (entry.type === "file_id" && exactFields(entry, hostedTemplateFileResourceFileIdFields)) {
     return isWorkspacePath(entry.path) && isText(entry.file_id)
       ? { type: "file_id", path: entry.path, file_id: entry.file_id }
       : null;
@@ -109,14 +103,14 @@ function projectFile(entry: Record<string, unknown>): EnvironmentTemplateFile |
 }
 
 function projectSkill(entry: Record<string, unknown>): EnvironmentTemplateSkill | null {
-  if (entry.type === "skill_reference" && exactFields(entry, skillReferenceFields)) {
+  if (entry.type === "skill_reference" && exactFields(entry, hostedTemplateSkillResourceSkillReferenceFields)) {
     const version = entry.version;
     return typeof entry.skill_id === "string" && skillIdPattern.test(entry.skill_id) &&
       (version === null || version === "latest" || (typeof version === "string" && skillVersionPattern.test(version)))
       ? { type: "skill_reference", skill_id: entry.skill_id, version }
       : null;
   }
-  if (entry.type === "inline" && exactFields(entry, inlineCapabilityFields)) {
+  if (entry.type === "inline" && exactFields(entry, hostedTemplateSkillResourceInlineFields)) {
     return typeof entry.name === "string" && entry.name.length > 0 && typeof entry.description === "string" && entry.description.length > 0
       ? { type: "inline", name: entry.name, description: entry.description }
       : null;
@@ -125,7 +119,7 @@ function projectSkill(entry: Record<string, unknown>): EnvironmentTemplateSkill
 }
 
 function projectPlugin(entry: Record<string, unknown>): EnvironmentTemplatePlugin | null {
-  return entry.type === "inline" && exactFields(entry, inlineCapabilityFields) &&
+  return entry.type === "inline" && exactFields(entry, hostedPluginResourceInlineFields) &&
     typeof entry.name === "string" && entry.name.length > 0 &&
     typeof entry.description === "string" && entry.description.length > 0
     ? { type: "inline", name: entry.name, description: entry.description }
@@ -171,7 +165,7 @@ export function projectEnvironmentTemplate(
     else (configuration as Record<string, unknown>)[section] = projected;
   }
   for (const field of Object.keys(value)) {
-    if (!knownTemplateFields.has(field)) unrecognized.push(field);
+    if (!(environmentTemplateResourceFields as readonly string[]).includes(field)) unrecognized.push(field);
   }
   const identity = {
     id: value.id,
@@ -184,7 +178,7 @@ export function projectEnvironmentTemplate(
   return { ...identity, ...configuration, unrecognized };
 }
 
-/** Validates a create or update body: only name and network are ever sent. */
+/** Validates a create or update body: the client supports only the name and network of the schema's Template fields. */
 export function environmentTemplateRequestBody(
   input: CreateEnvironmentTemplateInput | UpdateEnvironmentTemplateInput,
 ): string {
@@ -192,13 +186,13 @@ export function environmentTemplateRequestBody(
     throw new TypeError("Environment Template requests accept only name and network.");
   }
   if (hasOwn(input, "name") && !(input.name === null || isEnvironmentTemplateName(input.name))) {
-    throw new TypeError("An Environment Template name must be null or 1 through 256 characters.");
+    throw new TypeError("An Environment Template name must be null or a nonempty string.");
   }
   if (hasOwn(input, "network") && input.network !== null) {
     const network: unknown = input.network;
     const basic = isRecord(network) && exactFields(network, new Set(["access"])) &&
       (network.access === "enabled" || network.access === "disabled");
-    const restricted = isRecord(network) && exactFields(network, networkFields) && network.access === "restricted" &&
+    const restricted = isRecord(network) && exactFields(network, networkPolicyResourceFields) && network.access === "restricted" &&
       Array.isArray(network.allowed_domains) && network.allowed_domains.every((domain) => typeof domain === "string");
     if (!basic && !restricted) {
       throw new TypeError("An Environment Template network accepts enabled or disabled access, or restricted access with a domain list.");
diff --git a/packages/agents-client/src/environment-templates.test.ts b/packages/agents-client/src/environment-templates.test.ts
index 54d19c3ab..613870bfd 100644
--- a/packages/agents-client/src/environment-templates.test.ts
+++ b/packages/agents-client/src/environment-templates.test.ts
@@ -183,7 +183,7 @@ describe("Session creation with a referenced Template", () => {
         name: null,
         instructions: null,
         multi_agent: { enabled: false, max_concurrent_subagents: null },
-        reasoning: {},
+        reasoning: { effort: null, summary: null },
         service_tier: "auto",
         text: { format: { type: "text" }, verbosity: "medium" },
         tools: [],
@@ -412,7 +412,7 @@ describe("Sessions created from an advanced Template", () => {
       name: null,
       instructions: null,
       multi_agent: { enabled: false, max_concurrent_subagents: null },
-      reasoning: {},
+      reasoning: { effort: null, summary: null },
       service_tier: "auto",
       text: { format: { type: "text" }, verbosity: "medium" },
       tools: [],
diff --git a/packages/agents-client/src/execution-configuration-projection.ts b/packages/agents-client/src/execution-configuration-projection.ts
index 35ff00a33..577a2fd36 100644
--- a/packages/agents-client/src/execution-configuration-projection.ts
+++ b/packages/agents-client/src/execution-configuration-projection.ts
@@ -1,11 +1,11 @@
 import { modelProviderProtocols } from "./harness-catalog";
 import { canonicalUuid, exactFields, isNonnegativeInteger, isRecord, onlyFields, sameResourceId } from "./response-projection";
+import { modelProviderViewFields } from "./generated/public-api";
 import type { ExecutionConfigurationSource, ModelProviderView, SessionExecutionConfiguration } from "./types";
 
 type Invalid = () => never;
 const sources = new Set(["session", "agent", "deployment", "unknown"]);
 const selectionFields = new Set(["value", "source"]);
-const providerFields = new Set(["protocol", "base_url", "api_key_configured", "context_window", "max_output_tokens"]);
 const protocols: ReadonlySet<unknown> = new Set(modelProviderProtocols);
 
 function selection(value: unknown, invalid: Invalid): SessionExecutionConfiguration["model"] {
@@ -33,7 +33,7 @@ function safeBaseURL(value: string): boolean {
 
 /** The safe provider view shared by frozen Session configuration and saved Agent reads. */
 export function safeProvider(value: unknown, invalid: Invalid): ModelProviderView {
-  if (!isRecord(value) || !onlyFields(value, providerFields) ||
+  if (!isRecord(value) || !onlyFields(value, modelProviderViewFields) ||
     !protocols.has(value.protocol) ||
     typeof value.base_url !== "string" || typeof value.api_key_configured !== "boolean" ||
     (value.context_window !== undefined && !isNonnegativeInteger(value.context_window)) ||
diff --git a/packages/agents-client/src/generated/public-api.ts b/packages/agents-client/src/generated/public-api.ts
new file mode 100644
index 000000000..4edc43fd2
--- /dev/null
+++ b/packages/agents-client/src/generated/public-api.ts
@@ -0,0 +1,1970 @@
+// Code generated by scripts/generate-public-api.py from contracts/agents-api/openapi.yaml; DO NOT EDIT.
+
+export type AgentContentResource = OutputTextResource | EncryptedContentResource;
+export interface AgentListResource {
+  object: "list";
+  data: AgentResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const agentListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface AgentMessageItemResource {
+  id: string;
+  turn_id: string;
+  type: "agent_message";
+  sender_agent_id: string;
+  recipient_agent_id: string;
+  content: AgentContentResource[];
+}
+export const agentMessageItemResourceFields = ["id", "turn_id", "type", "sender_agent_id", "recipient_agent_id", "content"] as const;
+export type AgentOutputItemResource = AssistantMessageItemResource | ReasoningItemResource | FunctionCallItemResource | McpCallItemResource | WebSearchCallItemResource | CommandExecutionItemResource | CreateSubagentCallItemResource | SendSubagentInputCallItemResource | ResumeSubagentCallItemResource | WaitForSubagentsCallItemResource | InterruptSubagentCallItemResource | CloseSubagentCallItemResource;
+export interface AgentResource {
+  id: string;
+  object: "agent";
+  created_at: number;
+  updated_at: number;
+  name: string | null;
+  metadata: Record<string, string>;
+  model: string;
+  reasoning: ReasoningResource;
+  text: TextResource;
+  service_tier: ServiceTierResource;
+  instructions: string | null;
+  tools: PersistedAgentToolResource[];
+  multi_agent: MultiAgentConfigResource;
+  x_agents_core?: SavedAgentCore | null;
+}
+export const agentResourceFields = ["id", "object", "created_at", "updated_at", "name", "metadata", "model", "reasoning", "text", "service_tier", "instructions", "tools", "multi_agent", "x_agents_core"] as const;
+export const agentResourceRequired = ["id", "object", "created_at", "updated_at", "name", "metadata", "model", "reasoning", "text", "service_tier", "instructions", "tools", "multi_agent"] as const;
+export type AgentToolConfigParam = AgentToolConfigParamFunction | AgentToolConfigParamToolSearch | AgentToolConfigParamProgrammaticToolCalling | AgentToolConfigParamMcp | AgentToolConfigParamWebSearch;
+export interface AgentToolConfigParamFunction {
+  type: "function";
+  name: string;
+  description: string;
+  parameters: Record<string, unknown>;
+  defer_loading?: boolean;
+}
+export const agentToolConfigParamFunctionFields = ["type", "name", "description", "parameters", "defer_loading"] as const;
+export const agentToolConfigParamFunctionRequired = ["type", "name", "description", "parameters"] as const;
+export interface AgentToolConfigParamMcp {
+  type: "mcp";
+  server_label: string;
+  credential_id?: string | null;
+  transport: McpTransportConfigParam;
+  request_metadata?: Record<string, unknown> | null;
+  allowed_tools?: string[] | null;
+  required?: boolean;
+  connection_origin?: McpConnectionOriginParam | null;
+}
+export const agentToolConfigParamMcpFields = ["type", "server_label", "credential_id", "transport", "request_metadata", "allowed_tools", "required", "connection_origin"] as const;
+export const agentToolConfigParamMcpRequired = ["type", "server_label", "transport"] as const;
+export interface AgentToolConfigParamProgrammaticToolCalling {
+  type: "programmatic_tool_calling";
+  enabled?: boolean;
+}
+export const agentToolConfigParamProgrammaticToolCallingFields = ["type", "enabled"] as const;
+export const agentToolConfigParamProgrammaticToolCallingRequired = ["type"] as const;
+export interface AgentToolConfigParamToolSearch {
+  type: "tool_search";
+}
+export const agentToolConfigParamToolSearchFields = ["type"] as const;
+export interface AgentToolConfigParamWebSearch {
+  type: "web_search";
+  mode?: WebSearchModeParam | null;
+  context_size?: WebSearchContextSizeParam | null;
+  allowed_domains?: string[] | null;
+  location?: WebSearchLocationParam | null;
+}
+export const agentToolConfigParamWebSearchFields = ["type", "mode", "context_size", "allowed_domains", "location"] as const;
+export const agentToolConfigParamWebSearchRequired = ["type"] as const;
+export type AgentToolResource = AgentToolResourceFunction | AgentToolResourceProgrammaticToolCalling | AgentToolResourceMcp | AgentToolResourceWebSearch;
+export interface AgentToolResourceFunction {
+  type: "function";
+  name: string;
+  description: string;
+  parameters: Record<string, unknown>;
+  defer_loading: boolean;
+}
+export const agentToolResourceFunctionFields = ["type", "name", "description", "parameters", "defer_loading"] as const;
+export interface AgentToolResourceMcp {
+  type: "mcp";
+  server_label: string;
+  credential_id: string | null;
+  transport: McpTransportResource;
+  request_metadata: Record<string, unknown>;
+  allowed_tools: string[] | null;
+  required: boolean;
+  connection_origin: McpConnectionOriginResource;
+}
+export const agentToolResourceMcpFields = ["type", "server_label", "credential_id", "transport", "request_metadata", "allowed_tools", "required", "connection_origin"] as const;
+export interface AgentToolResourceProgrammaticToolCalling {
+  type: "programmatic_tool_calling";
+  enabled: boolean;
+}
+export const agentToolResourceProgrammaticToolCallingFields = ["type", "enabled"] as const;
+export interface AgentToolResourceWebSearch {
+  type: "web_search";
+  mode: WebSearchModeResource;
+  context_size: WebSearchContextSizeResource;
+  allowed_domains: string[] | null;
+  location: WebSearchLocationResource | null;
+}
+export const agentToolResourceWebSearchFields = ["type", "mode", "context_size", "allowed_domains", "location"] as const;
+export interface AgentsCore {
+  harness?: "claude_sdk" | "codex" | "mcode";
+  harness_config?: Record<string, unknown>;
+}
+export const agentsCoreFields = ["harness", "harness_config"] as const;
+export const agentsCoreRequired = [] as const;
+export interface AssistantMessageItemResource {
+  type: "message";
+  id: string;
+  turn_id: string;
+  role: "assistant";
+  status: OutputItemStatusResource;
+  content: OutputTextResource[];
+  phase: MessagePhaseResource | null;
+}
+export const assistantMessageItemResourceFields = ["type", "id", "turn_id", "role", "status", "content", "phase"] as const;
+export interface CloseSubagentCallItemResource {
+  type: "close_subagent_call";
+  id: string;
+  turn_id: string;
+  status: FunctionCallStatusResource;
+  sender_agent_id: string;
+  recipient_agent_id: string;
+}
+export const closeSubagentCallItemResourceFields = ["type", "id", "turn_id", "status", "sender_agent_id", "recipient_agent_id"] as const;
+export interface CommandExecutionItemResource {
+  type: "command_execution";
+  id: string;
+  turn_id: string;
+  command: string;
+  cwd: string | null;
+  status: FunctionCallStatusResource;
+  output: string | null;
+  exit_code: number | null;
+  duration_ms: number | null;
+}
+export const commandExecutionItemResourceFields = ["type", "id", "turn_id", "command", "cwd", "status", "output", "exit_code", "duration_ms"] as const;
+export interface CreateAgentParams {
+  metadata?: Record<string, string> | null;
+  name?: string | null;
+  model: string;
+  reasoning?: ReasoningParam | null;
+  text?: TextParam | null;
+  service_tier?: ServiceTierParam | null;
+  instructions?: string | null;
+  tools?: PersistedAgentToolConfigParam[] | null;
+  multi_agent?: MultiAgentConfigCurrentParam | null;
+  x_agents_core?: SavedAgentCoreInput | null;
+}
+export const createAgentParamsFields = ["metadata", "name", "model", "reasoning", "text", "service_tier", "instructions", "tools", "multi_agent", "x_agents_core"] as const;
+export const createAgentParamsRequired = ["model"] as const;
+export interface CreateAgentSessionParams {
+  metadata?: Record<string, string> | null;
+  agent?: SessionAgentConfigParam;
+  agent_id?: string;
+  environment: EnvironmentParam;
+  vault_ids?: string[] | null;
+  input?: CreateSessionInputParam | null;
+  stream?: boolean;
+  x_agents_core?: SessionExecutionInput | null;
+}
+export const createAgentSessionParamsFields = ["metadata", "agent", "agent_id", "environment", "vault_ids", "input", "stream", "x_agents_core"] as const;
+export const createAgentSessionParamsRequired = ["environment"] as const;
+export interface CreateEnvironmentTemplateParams {
+  packages?: EnvironmentPackagesParam | null;
+  setup_commands?: SetupCommandParam[] | null;
+  network?: NetworkPolicyParam | null;
+  env?: Record<string, string> | null;
+  capability_directories?: string[] | null;
+  skills?: HostedSkillParam[] | null;
+  plugins?: HostedPluginParam[] | null;
+  files?: HostedEnvironmentFileParam[] | null;
+  name?: string | null;
+}
+export const createEnvironmentTemplateParamsFields = ["packages", "setup_commands", "network", "env", "capability_directories", "skills", "plugins", "files", "name"] as const;
+export const createEnvironmentTemplateParamsRequired = [] as const;
+export interface CreateFileRequest {
+  file: string;
+  purpose: "assistants" | "batch" | "fine-tune" | "vision" | "user_data" | "evals";
+  expires_after?: FileExpirationAfter;
+}
+export const createFileRequestFields = ["file", "purpose", "expires_after"] as const;
+export const createFileRequestRequired = ["file", "purpose"] as const;
+export interface CreateMcpOauthRefreshParam {
+  token_endpoint: string;
+  client_id: string;
+  resource?: string | null;
+  scope?: string | null;
+  refresh_token: string;
+  token_endpoint_auth: CreateMcpOauthTokenEndpointAuthParam;
+}
+export const createMcpOauthRefreshParamFields = ["token_endpoint", "client_id", "resource", "scope", "refresh_token", "token_endpoint_auth"] as const;
+export const createMcpOauthRefreshParamRequired = ["token_endpoint", "client_id", "refresh_token", "token_endpoint_auth"] as const;
+export type CreateMcpOauthTokenEndpointAuthParam = CreateMcpOauthTokenEndpointAuthParamNone | CreateMcpOauthTokenEndpointAuthParamClientSecretBasic | CreateMcpOauthTokenEndpointAuthParamClientSecretPost;
+export interface CreateMcpOauthTokenEndpointAuthParamClientSecretBasic {
+  type: "client_secret_basic";
+  client_secret: string;
+}
+export const createMcpOauthTokenEndpointAuthParamClientSecretBasicFields = ["type", "client_secret"] as const;
+export interface CreateMcpOauthTokenEndpointAuthParamClientSecretPost {
+  type: "client_secret_post";
+  client_secret: string;
+}
+export const createMcpOauthTokenEndpointAuthParamClientSecretPostFields = ["type", "client_secret"] as const;
+export interface CreateMcpOauthTokenEndpointAuthParamNone {
+  type: "none";
+}
+export const createMcpOauthTokenEndpointAuthParamNoneFields = ["type"] as const;
+export interface CreateSessionEventsParams {
+  events: SessionInputParam[];
+}
+export const createSessionEventsParamsFields = ["events"] as const;
+export type CreateSessionInputParam = string | InputMessageParam[];
+export interface CreateSkillBody {
+  files: string[] | string;
+}
+export const createSkillBodyFields = ["files"] as const;
+export interface CreateSkillVersionBody {
+  files: string[] | string;
+  default?: boolean;
+}
+export const createSkillVersionBodyFields = ["files", "default"] as const;
+export const createSkillVersionBodyRequired = ["files"] as const;
+export interface CreateSubagentCallItemResource {
+  type: "create_subagent_call";
+  id: string;
+  turn_id: string;
+  status: FunctionCallStatusResource;
+  agent_id: string;
+  content: AgentContentResource[];
+  model: string | null;
+  reasoning_effort: string | null;
+}
+export const createSubagentCallItemResourceFields = ["type", "id", "turn_id", "status", "agent_id", "content", "model", "reasoning_effort"] as const;
+export type CreateVaultCredentialAuthParam = CreateVaultCredentialAuthParamMcpOauth | CreateVaultCredentialAuthParamStaticBearer;
+export interface CreateVaultCredentialAuthParamMcpOauth {
+  type: "mcp_oauth";
+  mcp_server_url: string;
+  access_token: string;
+  expires_at?: string | null;
+  refresh?: CreateMcpOauthRefreshParam | null;
+}
+export const createVaultCredentialAuthParamMcpOauthFields = ["type", "mcp_server_url", "access_token", "expires_at", "refresh"] as const;
+export const createVaultCredentialAuthParamMcpOauthRequired = ["type", "mcp_server_url", "access_token"] as const;
+export interface CreateVaultCredentialAuthParamStaticBearer {
+  type: "static_bearer";
+  mcp_server_url: string;
+  token: string;
+}
+export const createVaultCredentialAuthParamStaticBearerFields = ["type", "mcp_server_url", "token"] as const;
+export interface CreateVaultCredentialParams {
+  name: string;
+  auth: CreateVaultCredentialAuthParam;
+}
+export const createVaultCredentialParamsFields = ["name", "auth"] as const;
+export interface CreateVaultParams {
+  name?: string;
+  metadata?: Record<string, string> | null;
+}
+export const createVaultParamsFields = ["name", "metadata"] as const;
+export const createVaultParamsRequired = [] as const;
+export interface DeleteFileResponse {
+  id: string;
+  object: "file";
+  deleted: boolean;
+}
+export const deleteFileResponseFields = ["id", "object", "deleted"] as const;
+export interface DeletedAgentResource {
+  id: string;
+  object: "agent.deleted";
+  deleted: boolean;
+}
+export const deletedAgentResourceFields = ["id", "object", "deleted"] as const;
+export interface DeletedEnvironmentTemplateResource {
+  id: string;
+  object: "agent.environment.template.deleted";
+  deleted: boolean;
+}
+export const deletedEnvironmentTemplateResourceFields = ["id", "object", "deleted"] as const;
+export interface DeletedSessionArtifactResource {
+  id: string;
+  object: "agent.session.artifact.deleted";
+  deleted: boolean;
+}
+export const deletedSessionArtifactResourceFields = ["id", "object", "deleted"] as const;
+export interface DeletedSessionResource {
+  id: string;
+  object: "agent.session.deleted";
+  deleted: boolean;
+}
+export const deletedSessionResourceFields = ["id", "object", "deleted"] as const;
+export interface DeletedSkillResource {
+  object: "skill.deleted";
+  deleted: boolean;
+  id: string;
+}
+export const deletedSkillResourceFields = ["object", "deleted", "id"] as const;
+export interface DeletedSkillVersionResource {
+  object: "skill.version.deleted";
+  deleted: boolean;
+  id: string;
+  version: string;
+}
+export const deletedSkillVersionResourceFields = ["object", "deleted", "id", "version"] as const;
+export interface DeletedVaultCredentialResource {
+  id: string;
+  object: "vault.credential.deleted";
+  deleted: boolean;
+}
+export const deletedVaultCredentialResourceFields = ["id", "object", "deleted"] as const;
+export interface DeletedVaultResource {
+  id: string;
+  object: "vault.deleted";
+  deleted: boolean;
+}
+export const deletedVaultResourceFields = ["id", "object", "deleted"] as const;
+export interface EncryptedContentResource {
+  type: "encrypted_content";
+  encrypted_content: string;
+}
+export const encryptedContentResourceFields = ["type", "encrypted_content"] as const;
+export interface EnvironmentFileListResource {
+  object: EnvironmentFilePageObjectResource;
+  data: EnvironmentFileResource[];
+  next: string | null;
+  has_more: boolean;
+}
+export const environmentFileListResourceFields = ["object", "data", "next", "has_more"] as const;
+export const environmentFilePageObjectResourceValues = ["page"] as const;
+export type EnvironmentFilePageObjectResource = (typeof environmentFilePageObjectResourceValues)[number];
+export interface EnvironmentFileResource {
+  object: "agent.environment.file";
+  environment_id: string;
+  path: string;
+  size_bytes: number;
+}
+export const environmentFileResourceFields = ["object", "environment_id", "path", "size_bytes"] as const;
+export interface EnvironmentInstallation {
+  commands?: Record<string, string>;
+  expires_at?: number;
+  message?: string;
+  status?: "available" | "unavailable";
+  version?: string;
+}
+export const environmentInstallationFields = ["commands", "expires_at", "message", "status", "version"] as const;
+export const environmentInstallationRequired = [] as const;
+export interface EnvironmentPackagesParam {
+  python?: string[] | null;
+  system?: string[] | null;
+  npm?: string[] | null;
+}
+export const environmentPackagesParamFields = ["python", "system", "npm"] as const;
+export const environmentPackagesParamRequired = [] as const;
+export interface EnvironmentPackagesResource {
+  python: string[];
+  system: string[];
+  npm: string[];
+}
+export const environmentPackagesResourceFields = ["python", "system", "npm"] as const;
+export type EnvironmentParam = EnvironmentParamNone | EnvironmentParamOpenaiHosted | EnvironmentParamSelfHosted;
+export interface EnvironmentParamNone {
+  type: "none";
+}
+export const environmentParamNoneFields = ["type"] as const;
+export interface EnvironmentParamOpenaiHosted {
+  type: "openai_hosted";
+  packages?: EnvironmentPackagesParam | null;
+  setup_commands?: SetupCommandParam[] | null;
+  network?: NetworkPolicyParam | null;
+  env?: Record<string, string> | null;
+  capability_directories?: string[] | null;
+  skills?: HostedSkillParam[] | null;
+  plugins?: HostedPluginParam[] | null;
+  files?: HostedEnvironmentFileParam[] | null;
+  environment_template_id?: string;
+}
+export const environmentParamOpenaiHostedFields = ["type", "packages", "setup_commands", "network", "env", "capability_directories", "skills", "plugins", "files", "environment_template_id"] as const;
+export const environmentParamOpenaiHostedRequired = ["type"] as const;
+export interface EnvironmentParamSelfHosted {
+  type: "self_hosted";
+  workspace_directory: string;
+  capability_directories?: string[] | null;
+}
+export const environmentParamSelfHostedFields = ["type", "workspace_directory", "capability_directories"] as const;
+export const environmentParamSelfHostedRequired = ["type", "workspace_directory"] as const;
+export type EnvironmentResource = EnvironmentResourceNone | EnvironmentResourceOpenaiHosted | EnvironmentResourceSelfHosted;
+export interface EnvironmentResourceNone {
+  type: "none";
+}
+export const environmentResourceNoneFields = ["type"] as const;
+export interface EnvironmentResourceOpenaiHosted {
+  type: "openai_hosted";
+  id: string;
+  packages: EnvironmentPackagesResource;
+  network: NetworkPolicyResource;
+  capability_directories: string[];
+  skills: HostedSkillResource[];
+  plugins: HostedPluginResource[];
+  files: HostedEnvironmentFileResource[];
+}
+export const environmentResourceOpenaiHostedFields = ["type", "id", "packages", "network", "capability_directories", "skills", "plugins", "files"] as const;
+export interface EnvironmentResourceSelfHosted {
+  type: "self_hosted";
+  remote_url: string;
+  id: string;
+  workspace_directory: string;
+  capability_directories: string[];
+}
+export const environmentResourceSelfHostedFields = ["type", "remote_url", "id", "workspace_directory", "capability_directories"] as const;
+export const environmentStatusResourceValues = ["pending", "connected", "disconnected", "expired", "failed"] as const;
+export type EnvironmentStatusResource = (typeof environmentStatusResourceValues)[number];
+export interface EnvironmentTemplateListResource {
+  object: "list";
+  data: EnvironmentTemplateResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const environmentTemplateListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface EnvironmentTemplateResource {
+  id: string;
+  name: string | null;
+  object: "agent.environment.template";
+  created_at: number;
+  updated_at: number;
+  packages: EnvironmentPackagesResource;
+  network: NetworkPolicyResource;
+  capability_directories: string[];
+  skills: HostedTemplateSkillResource[];
+  plugins: HostedPluginResource[];
+  files: HostedTemplateFileResource[];
+}
+export const environmentTemplateResourceFields = ["id", "name", "object", "created_at", "updated_at", "packages", "network", "capability_directories", "skills", "plugins", "files"] as const;
+export const environmentTypeResourceValues = ["openai_hosted", "self_hosted"] as const;
+export type EnvironmentTypeResource = (typeof environmentTypeResourceValues)[number];
+export interface Error {
+  code: string | null;
+  message: string;
+  param: string | null;
+  type: string;
+  misalignment?: MisalignmentErrorDetailsResource;
+}
+export const errorFields = ["code", "message", "param", "type", "misalignment"] as const;
+export const errorRequired = ["type", "message", "param", "code"] as const;
+export interface ErrorBodyResource {
+  type: string;
+  code: string;
+  message: string;
+  param: string | null;
+}
+export const errorBodyResourceFields = ["type", "code", "message", "param"] as const;
+export interface ErrorResponse {
+  error: Error;
+}
+export const errorResponseFields = ["error"] as const;
+export interface ErrorResponse2 {
+  error: ErrorBodyResource;
+}
+export const errorResponse2Fields = ["error"] as const;
+export interface FileExpirationAfter {
+  anchor: "created_at";
+  seconds: number;
+}
+export const fileExpirationAfterFields = ["anchor", "seconds"] as const;
+export interface FunctionCallItemResource {
+  type: "function_call";
+  id: string;
+  turn_id: string;
+  call_id: string;
+  name: string;
+  arguments: unknown;
+  status: FunctionCallStatusResource;
+}
+export const functionCallItemResourceFields = ["type", "id", "turn_id", "call_id", "name", "arguments", "status"] as const;
+export interface FunctionCallOutputItemResource {
+  id: string;
+  turn_id: string;
+  type: "function_call_output";
+  call_id: string;
+  status: FunctionCallStatusResource;
+  output: FunctionCallOutputResource | null;
+  error: string | null;
+}
+export const functionCallOutputItemResourceFields = ["id", "turn_id", "type", "call_id", "status", "output", "error"] as const;
+export type FunctionCallOutputParam = string | InputContentParam[];
+export type FunctionCallOutputResource = string | InputContentResource[];
+export const functionCallStatusResourceValues = ["in_progress", "completed", "failed", "incomplete"] as const;
+export type FunctionCallStatusResource = (typeof functionCallStatusResourceValues)[number];
+export type HostedEnvironmentFileParam = HostedEnvironmentFileParamFileId | HostedEnvironmentFileParamInline;
+export interface HostedEnvironmentFileParamFileId {
+  type: "file_id";
+  file_id: string;
+  path: string;
+}
+export const hostedEnvironmentFileParamFileIdFields = ["type", "file_id", "path"] as const;
+export interface HostedEnvironmentFileParamInline {
+  type: "inline";
+  data: string;
+  path: string;
+}
+export const hostedEnvironmentFileParamInlineFields = ["type", "data", "path"] as const;
+export type HostedEnvironmentFileResource = HostedEnvironmentFileResourceFileId | HostedEnvironmentFileResourceInline;
+export interface HostedEnvironmentFileResourceFileId {
+  type: "file_id";
+  id: string;
+  file_id: string;
+  path: string;
+  size_bytes: number;
+}
+export const hostedEnvironmentFileResourceFileIdFields = ["type", "id", "file_id", "path", "size_bytes"] as const;
+export interface HostedEnvironmentFileResourceInline {
+  type: "inline";
+  id: string;
+  path: string;
+  size_bytes: number;
+}
+export const hostedEnvironmentFileResourceInlineFields = ["type", "id", "path", "size_bytes"] as const;
+export type HostedPluginParam = HostedPluginParamInline;
+export interface HostedPluginParamInline {
+  type: "inline";
+  name: string;
+  description: string;
+  source: InlineCapabilitySourceParam;
+}
+export const hostedPluginParamInlineFields = ["type", "name", "description", "source"] as const;
+export type HostedPluginResource = HostedPluginResourceInline;
+export interface HostedPluginResourceInline {
+  type: "inline";
+  name: string;
+  description: string;
+}
+export const hostedPluginResourceInlineFields = ["type", "name", "description"] as const;
+export type HostedSkillParam = HostedSkillParamSkillReference | HostedSkillParamInline;
+export interface HostedSkillParamInline {
+  type: "inline";
+  name: string;
+  description: string;
+  source: InlineCapabilitySourceParam;
+}
+export const hostedSkillParamInlineFields = ["type", "name", "description", "source"] as const;
+export interface HostedSkillParamSkillReference {
+  type: "skill_reference";
+  skill_id: string;
+  version?: string | null;
+}
+export const hostedSkillParamSkillReferenceFields = ["type", "skill_id", "version"] as const;
+export const hostedSkillParamSkillReferenceRequired = ["type", "skill_id"] as const;
+export type HostedSkillResource = HostedSkillResourceSkillReference | HostedSkillResourceInline;
+export interface HostedSkillResourceInline {
+  type: "inline";
+  name: string;
+  description: string;
+}
+export const hostedSkillResourceInlineFields = ["type", "name", "description"] as const;
+export interface HostedSkillResourceSkillReference {
+  type: "skill_reference";
+  skill_id: string;
+  version: string;
+  name: string;
+  description: string;
+}
+export const hostedSkillResourceSkillReferenceFields = ["type", "skill_id", "version", "name", "description"] as const;
+export type HostedTemplateFileResource = HostedTemplateFileResourceFileId | HostedTemplateFileResourceInline;
+export interface HostedTemplateFileResourceFileId {
+  type: "file_id";
+  file_id: string;
+  path: string;
+}
+export const hostedTemplateFileResourceFileIdFields = ["type", "file_id", "path"] as const;
+export interface HostedTemplateFileResourceInline {
+  type: "inline";
+  path: string;
+  size_bytes: number;
+}
+export const hostedTemplateFileResourceInlineFields = ["type", "path", "size_bytes"] as const;
+export type HostedTemplateSkillResource = HostedTemplateSkillResourceSkillReference | HostedTemplateSkillResourceInline;
+export interface HostedTemplateSkillResourceInline {
+  type: "inline";
+  name: string;
+  description: string;
+}
+export const hostedTemplateSkillResourceInlineFields = ["type", "name", "description"] as const;
+export interface HostedTemplateSkillResourceSkillReference {
+  type: "skill_reference";
+  skill_id: string;
+  version: string | null;
+}
+export const hostedTemplateSkillResourceSkillReferenceFields = ["type", "skill_id", "version"] as const;
+export type InlineCapabilitySourceParam = InlineCapabilitySourceParamBase64;
+export interface InlineCapabilitySourceParamBase64 {
+  type: "base64";
+  media_type: "application/zip";
+  data: string;
+}
+export const inlineCapabilitySourceParamBase64Fields = ["type", "media_type", "data"] as const;
+export type InputContentParam = InputContentParamInputText | InputContentParamInputImage;
+export interface InputContentParamInputImage {
+  type: "input_image";
+  image_url: string;
+}
+export const inputContentParamInputImageFields = ["type", "image_url"] as const;
+export interface InputContentParamInputText {
+  type: "input_text";
+  text: string;
+}
+export const inputContentParamInputTextFields = ["type", "text"] as const;
+export type InputContentResource = InputContentResourceInputText | InputContentResourceInputImage;
+export interface InputContentResourceInputImage {
+  type: "input_image";
+  image_url: string;
+}
+export const inputContentResourceInputImageFields = ["type", "image_url"] as const;
+export interface InputContentResourceInputText {
+  type: "input_text";
+  text: string;
+}
+export const inputContentResourceInputTextFields = ["type", "text"] as const;
+export interface InputMessageParam {
+  type?: "message";
+  role: "user";
+  content: InputContentParam[];
+}
+export const inputMessageParamFields = ["type", "role", "content"] as const;
+export const inputMessageParamRequired = ["role", "content"] as const;
+export interface InputTokensDetailsResource {
+  cached_tokens: number;
+}
+export const inputTokensDetailsResourceFields = ["cached_tokens"] as const;
+export interface InterruptSubagentCallItemResource {
+  type: "interrupt_subagent_call";
+  id: string;
+  turn_id: string;
+  status: FunctionCallStatusResource;
+  sender_agent_id: string;
+  recipient_agent_id: string;
+}
+export const interruptSubagentCallItemResourceFields = ["type", "id", "turn_id", "status", "sender_agent_id", "recipient_agent_id"] as const;
+export interface ListFilesResponse {
+  object: string;
+  data: OpenAIFile[];
+  first_id: string;
+  last_id: string;
+  has_more: boolean;
+}
+export const listFilesResponseFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export const listOrderParamValues = ["asc", "desc"] as const;
+export type ListOrderParam = (typeof listOrderParamValues)[number];
+export interface McpCallItemResource {
+  type: "mcp_call";
+  id: string;
+  turn_id: string;
+  server_label: string;
+  name: string;
+  arguments: unknown;
+  status: FunctionCallStatusResource;
+  output: unknown | null;
+  error: unknown | null;
+}
+export const mcpCallItemResourceFields = ["type", "id", "turn_id", "server_label", "name", "arguments", "status", "output", "error"] as const;
+export const mcpConnectionOriginParamValues = ["service", "environment"] as const;
+export type McpConnectionOriginParam = (typeof mcpConnectionOriginParamValues)[number];
+export const mcpConnectionOriginResourceValues = ["service", "environment"] as const;
+export type McpConnectionOriginResource = (typeof mcpConnectionOriginResourceValues)[number];
+export interface McpOauthRefreshResource {
+  token_endpoint: string;
+  client_id: string;
+  resource: string | null;
+  scope: string | null;
+  token_endpoint_auth: McpOauthTokenEndpointAuthResource;
+}
+export const mcpOauthRefreshResourceFields = ["token_endpoint", "client_id", "resource", "scope", "token_endpoint_auth"] as const;
+export type McpOauthTokenEndpointAuthResource = McpOauthTokenEndpointAuthResourceNone | McpOauthTokenEndpointAuthResourceClientSecretBasic | McpOauthTokenEndpointAuthResourceClientSecretPost;
+export interface McpOauthTokenEndpointAuthResourceClientSecretBasic {
+  type: "client_secret_basic";
+}
+export const mcpOauthTokenEndpointAuthResourceClientSecretBasicFields = ["type"] as const;
+export interface McpOauthTokenEndpointAuthResourceClientSecretPost {
+  type: "client_secret_post";
+}
+export const mcpOauthTokenEndpointAuthResourceClientSecretPostFields = ["type"] as const;
+export interface McpOauthTokenEndpointAuthResourceNone {
+  type: "none";
+}
+export const mcpOauthTokenEndpointAuthResourceNoneFields = ["type"] as const;
+export type McpTransportConfigParam = McpTransportConfigParamHttp | McpTransportConfigParamStdio;
+export interface McpTransportConfigParamHttp {
+  type: "http";
+  server_url: string;
+  authorization?: string | null;
+  headers?: Record<string, string> | null;
+}
+export const mcpTransportConfigParamHttpFields = ["type", "server_url", "authorization", "headers"] as const;
+export const mcpTransportConfigParamHttpRequired = ["type", "server_url"] as const;
+export interface McpTransportConfigParamStdio {
+  type: "stdio";
+  command: string;
+  args?: string[] | null;
+  cwd: string;
+  env?: Record<string, string> | null;
+  env_vars?: string[] | null;
+}
+export const mcpTransportConfigParamStdioFields = ["type", "command", "args", "cwd", "env", "env_vars"] as const;
+export const mcpTransportConfigParamStdioRequired = ["type", "command", "cwd"] as const;
+export type McpTransportResource = McpTransportResourceHttp | McpTransportResourceStdio;
+export interface McpTransportResourceHttp {
+  type: "http";
+  server_url: string;
+}
+export const mcpTransportResourceHttpFields = ["type", "server_url"] as const;
+export interface McpTransportResourceStdio {
+  type: "stdio";
+  command: string;
+  args: string[];
+  cwd: string;
+  env_vars: string[];
+}
+export const mcpTransportResourceStdioFields = ["type", "command", "args", "cwd", "env_vars"] as const;
+export type MessageContentResource = MessageContentResourceInputText | MessageContentResourceInputImage | MessageContentResourceOutputText;
+export interface MessageContentResourceInputImage {
+  type: "input_image";
+  image_url: string;
+}
+export const messageContentResourceInputImageFields = ["type", "image_url"] as const;
+export interface MessageContentResourceInputText {
+  type: "input_text";
+  text: string;
+}
+export const messageContentResourceInputTextFields = ["type", "text"] as const;
+export interface MessageContentResourceOutputText {
+  type: "output_text";
+  text: string;
+}
+export const messageContentResourceOutputTextFields = ["type", "text"] as const;
+export interface MessageItemResource {
+  type: "message";
+  id: string | null;
+  turn_id: string;
+  role: SessionMessageRoleResource;
+  content: MessageContentResource[];
+  status: OutputItemStatusResource;
+  phase: MessagePhaseResource | null;
+}
+export const messageItemResourceFields = ["type", "id", "turn_id", "role", "content", "status", "phase"] as const;
+export const messagePhaseResourceValues = ["commentary", "final_answer"] as const;
+export type MessagePhaseResource = (typeof messagePhaseResourceValues)[number];
+export interface MisalignmentErrorDetailsResource {
+  error_type?: _MisalignmentErrorType;
+  detailed_explanation?: string;
+  steer?: _MisalignmentSteer;
+}
+export const misalignmentErrorDetailsResourceFields = ["error_type", "detailed_explanation", "steer"] as const;
+export const misalignmentErrorDetailsResourceRequired = [] as const;
+export interface ModelProviderInput {
+  api_key: string;
+  base_url: string;
+  context_window?: number;
+  max_output_tokens?: number;
+  protocol: "anthropic" | "responses" | "chat_completions";
+}
+export const modelProviderInputFields = ["api_key", "base_url", "context_window", "max_output_tokens", "protocol"] as const;
+export const modelProviderInputRequired = ["api_key", "base_url", "protocol"] as const;
+export interface ModelProviderView {
+  api_key_configured: boolean;
+  base_url: string;
+  context_window?: number;
+  max_output_tokens?: number;
+  protocol: "anthropic" | "responses" | "chat_completions";
+}
+export const modelProviderViewFields = ["api_key_configured", "base_url", "context_window", "max_output_tokens", "protocol"] as const;
+export const modelProviderViewRequired = ["api_key_configured", "base_url", "protocol"] as const;
+export interface MultiAgentConfigCurrentParam {
+  enabled: boolean;
+  max_concurrent_subagents?: number;
+}
+export const multiAgentConfigCurrentParamFields = ["enabled", "max_concurrent_subagents"] as const;
+export const multiAgentConfigCurrentParamRequired = ["enabled"] as const;
+export interface MultiAgentConfigResource {
+  enabled: boolean;
+  max_concurrent_subagents: number | null;
+}
+export const multiAgentConfigResourceFields = ["enabled", "max_concurrent_subagents"] as const;
+export const networkAccessParamValues = ["enabled", "disabled", "restricted"] as const;
+export type NetworkAccessParam = (typeof networkAccessParamValues)[number];
+export const networkAccessResourceValues = ["enabled", "disabled", "restricted"] as const;
+export type NetworkAccessResource = (typeof networkAccessResourceValues)[number];
+export interface NetworkPolicyParam {
+  access: NetworkAccessParam;
+  allowed_domains?: string[] | null;
+}
+export const networkPolicyParamFields = ["access", "allowed_domains"] as const;
+export const networkPolicyParamRequired = ["access"] as const;
+export interface NetworkPolicyResource {
+  access: NetworkAccessResource;
+  allowed_domains: string[];
+}
+export const networkPolicyResourceFields = ["access", "allowed_domains"] as const;
+export interface OpenAIFile {
+  id: string;
+  bytes: number;
+  created_at: number;
+  expires_at?: number;
+  filename: string;
+  object: "file";
+  purpose: "assistants" | "assistants_output" | "batch" | "batch_output" | "fine-tune" | "fine-tune-results" | "vision" | "user_data";
+  status: "uploaded" | "processed" | "error";
+  status_details?: string;
+}
+export const openAIFileFields = ["id", "bytes", "created_at", "expires_at", "filename", "object", "purpose", "status", "status_details"] as const;
+export const openAIFileRequired = ["id", "object", "bytes", "created_at", "filename", "purpose", "status"] as const;
+export const orderEnumValues = ["asc", "desc"] as const;
+export type OrderEnum = (typeof orderEnumValues)[number];
+export const outputItemStatusResourceValues = ["in_progress", "completed", "incomplete"] as const;
+export type OutputItemStatusResource = (typeof outputItemStatusResourceValues)[number];
+export interface OutputTextResource {
+  type: "output_text";
+  text: string;
+}
+export const outputTextResourceFields = ["type", "text"] as const;
+export interface OutputTokensDetailsResource {
+  reasoning_tokens: number;
+}
+export const outputTokensDetailsResourceFields = ["reasoning_tokens"] as const;
+export type PersistedAgentToolConfigParam = PersistedAgentToolConfigParamFunction | PersistedAgentToolConfigParamToolSearch | PersistedAgentToolConfigParamProgrammaticToolCalling | PersistedAgentToolConfigParamMcp | PersistedAgentToolConfigParamWebSearch;
+export interface PersistedAgentToolConfigParamFunction {
+  type: "function";
+  name: string;
+  description: string;
+  parameters: Record<string, unknown>;
+  defer_loading?: boolean;
+}
+export const persistedAgentToolConfigParamFunctionFields = ["type", "name", "description", "parameters", "defer_loading"] as const;
+export const persistedAgentToolConfigParamFunctionRequired = ["type", "name", "description", "parameters"] as const;
+export interface PersistedAgentToolConfigParamMcp {
+  type: "mcp";
+  server_label: string;
+  credential_id?: string | null;
+  transport: PersistedMcpTransportConfigParam;
+  request_metadata?: Record<string, unknown> | null;
+  allowed_tools?: string[] | null;
+  required?: boolean;
+  connection_origin?: McpConnectionOriginParam | null;
+}
+export const persistedAgentToolConfigParamMcpFields = ["type", "server_label", "credential_id", "transport", "request_metadata", "allowed_tools", "required", "connection_origin"] as const;
+export const persistedAgentToolConfigParamMcpRequired = ["type", "server_label", "transport"] as const;
+export interface PersistedAgentToolConfigParamProgrammaticToolCalling {
+  type: "programmatic_tool_calling";
+  enabled?: boolean;
+}
+export const persistedAgentToolConfigParamProgrammaticToolCallingFields = ["type", "enabled"] as const;
+export const persistedAgentToolConfigParamProgrammaticToolCallingRequired = ["type"] as const;
+export interface PersistedAgentToolConfigParamToolSearch {
+  type: "tool_search";
+}
+export const persistedAgentToolConfigParamToolSearchFields = ["type"] as const;
+export interface PersistedAgentToolConfigParamWebSearch {
+  type: "web_search";
+  mode?: WebSearchModeParam | null;
+  context_size?: WebSearchContextSizeParam | null;
+  allowed_domains?: string[] | null;
+  location?: WebSearchLocationParam | null;
+}
+export const persistedAgentToolConfigParamWebSearchFields = ["type", "mode", "context_size", "allowed_domains", "location"] as const;
+export const persistedAgentToolConfigParamWebSearchRequired = ["type"] as const;
+export type PersistedAgentToolResource = PersistedAgentToolResourceFunction | PersistedAgentToolResourceToolSearch | PersistedAgentToolResourceProgrammaticToolCalling | PersistedAgentToolResourceMcp | PersistedAgentToolResourceWebSearch;
+export interface PersistedAgentToolResourceFunction {
+  type: "function";
+  name: string;
+  description: string;
+  parameters: Record<string, unknown>;
+  defer_loading: boolean;
+}
+export const persistedAgentToolResourceFunctionFields = ["type", "name", "description", "parameters", "defer_loading"] as const;
+export interface PersistedAgentToolResourceMcp {
+  type: "mcp";
+  server_label: string;
+  credential_id: string | null;
+  transport: PersistedMcpTransportResource;
+  request_metadata: Record<string, unknown>;
+  allowed_tools: string[] | null;
+  required: boolean;
+  connection_origin: McpConnectionOriginResource;
+}
+export const persistedAgentToolResourceMcpFields = ["type", "server_label", "credential_id", "transport", "request_metadata", "allowed_tools", "required", "connection_origin"] as const;
+export interface PersistedAgentToolResourceProgrammaticToolCalling {
+  type: "programmatic_tool_calling";
+  enabled: boolean;
+}
+export const persistedAgentToolResourceProgrammaticToolCallingFields = ["type", "enabled"] as const;
+export interface PersistedAgentToolResourceToolSearch {
+  type: "tool_search";
+}
+export const persistedAgentToolResourceToolSearchFields = ["type"] as const;
+export interface PersistedAgentToolResourceWebSearch {
+  type: "web_search";
+  mode: WebSearchModeResource;
+  context_size: WebSearchContextSizeResource;
+  allowed_domains: string[] | null;
+  location: WebSearchLocationResource | null;
+}
+export const persistedAgentToolResourceWebSearchFields = ["type", "mode", "context_size", "allowed_domains", "location"] as const;
+export type PersistedMcpTransportConfigParam = PersistedMcpTransportConfigParamHttp | PersistedMcpTransportConfigParamStdio;
+export interface PersistedMcpTransportConfigParamHttp {
+  type: "http";
+  server_url: string;
+  headers?: Record<string, string> | null;
+}
+export const persistedMcpTransportConfigParamHttpFields = ["type", "server_url", "headers"] as const;
+export const persistedMcpTransportConfigParamHttpRequired = ["type", "server_url"] as const;
+export interface PersistedMcpTransportConfigParamStdio {
+  type: "stdio";
+  command: string;
+  args?: string[] | null;
+  cwd: string;
+  env_vars?: string[] | null;
+}
+export const persistedMcpTransportConfigParamStdioFields = ["type", "command", "args", "cwd", "env_vars"] as const;
+export const persistedMcpTransportConfigParamStdioRequired = ["type", "command", "cwd"] as const;
+export type PersistedMcpTransportResource = PersistedMcpTransportResourceHttp | PersistedMcpTransportResourceStdio;
+export interface PersistedMcpTransportResourceHttp {
+  type: "http";
+  server_url: string;
+  headers: Record<string, string>;
+}
+export const persistedMcpTransportResourceHttpFields = ["type", "server_url", "headers"] as const;
+export interface PersistedMcpTransportResourceStdio {
+  type: "stdio";
+  command: string;
+  args: string[];
+  cwd: string;
+  env_vars: string[];
+}
+export const persistedMcpTransportResourceStdioFields = ["type", "command", "args", "cwd", "env_vars"] as const;
+export interface PublicEnvironmentResource {
+  id: string;
+  object: "agent.environment";
+  type: EnvironmentTypeResource;
+  status: EnvironmentStatusResource;
+  files: HostedEnvironmentFileResource[];
+  skills: HostedSkillResource[];
+  plugins: HostedPluginResource[];
+}
+export const publicEnvironmentResourceFields = ["id", "object", "type", "status", "files", "skills", "plugins"] as const;
+export const reasoningEffortParamValues = ["none", "minimal", "low", "medium", "high", "xhigh", "max"] as const;
+export type ReasoningEffortParam = (typeof reasoningEffortParamValues)[number];
+export const reasoningEffortResourceValues = ["none", "minimal", "low", "medium", "high", "xhigh", "max"] as const;
+export type ReasoningEffortResource = (typeof reasoningEffortResourceValues)[number];
+export interface ReasoningItemResource {
+  type: "reasoning";
+  id: string;
+  turn_id: string;
+  summary: SummaryTextResource[];
+  status: OutputItemStatusResource | null;
+}
+export const reasoningItemResourceFields = ["type", "id", "turn_id", "summary", "status"] as const;
+export interface ReasoningParam {
+  effort?: ReasoningEffortParam | null;
+  summary?: ReasoningSummaryParam | null;
+}
+export const reasoningParamFields = ["effort", "summary"] as const;
+export const reasoningParamRequired = [] as const;
+export interface ReasoningResource {
+  effort: ReasoningEffortResource | null;
+  summary: ReasoningSummaryResource | null;
+}
+export const reasoningResourceFields = ["effort", "summary"] as const;
+export const reasoningSummaryParamValues = ["concise", "detailed", "auto"] as const;
+export type ReasoningSummaryParam = (typeof reasoningSummaryParamValues)[number];
+export const reasoningSummaryResourceValues = ["concise", "detailed", "auto"] as const;
+export type ReasoningSummaryResource = (typeof reasoningSummaryResourceValues)[number];
+export interface ResumeSubagentCallItemResource {
+  type: "resume_subagent_call";
+  id: string;
+  turn_id: string;
+  status: FunctionCallStatusResource;
+  sender_agent_id: string;
+  recipient_agent_id: string;
+}
+export const resumeSubagentCallItemResourceFields = ["type", "id", "turn_id", "status", "sender_agent_id", "recipient_agent_id"] as const;
+export interface RotateMcpOauthRefreshParam {
+  refresh_token?: string | null;
+  scope?: string | null;
+  token_endpoint_auth?: RotateMcpOauthTokenEndpointAuthParam | null;
+}
+export const rotateMcpOauthRefreshParamFields = ["refresh_token", "scope", "token_endpoint_auth"] as const;
+export const rotateMcpOauthRefreshParamRequired = [] as const;
+export type RotateMcpOauthTokenEndpointAuthParam = RotateMcpOauthTokenEndpointAuthParamClientSecretBasic | RotateMcpOauthTokenEndpointAuthParamClientSecretPost;
+export interface RotateMcpOauthTokenEndpointAuthParamClientSecretBasic {
+  type: "client_secret_basic";
+  client_secret?: string | null;
+}
+export const rotateMcpOauthTokenEndpointAuthParamClientSecretBasicFields = ["type", "client_secret"] as const;
+export const rotateMcpOauthTokenEndpointAuthParamClientSecretBasicRequired = ["type"] as const;
+export interface RotateMcpOauthTokenEndpointAuthParamClientSecretPost {
+  type: "client_secret_post";
+  client_secret?: string | null;
+}
+export const rotateMcpOauthTokenEndpointAuthParamClientSecretPostFields = ["type", "client_secret"] as const;
+export const rotateMcpOauthTokenEndpointAuthParamClientSecretPostRequired = ["type"] as const;
+export type RotateVaultCredentialAuthParam = RotateVaultCredentialAuthParamMcpOauth | RotateVaultCredentialAuthParamStaticBearer;
+export interface RotateVaultCredentialAuthParamMcpOauth {
+  type: "mcp_oauth";
+  access_token?: string | null;
+  expires_at?: string | null;
+  refresh?: RotateMcpOauthRefreshParam | null;
+}
+export const rotateVaultCredentialAuthParamMcpOauthFields = ["type", "access_token", "expires_at", "refresh"] as const;
+export const rotateVaultCredentialAuthParamMcpOauthRequired = ["type"] as const;
+export interface RotateVaultCredentialAuthParamStaticBearer {
+  type: "static_bearer";
+  token: string;
+}
+export const rotateVaultCredentialAuthParamStaticBearerFields = ["type", "token"] as const;
+export interface RotateVaultCredentialParams {
+  auth: RotateVaultCredentialAuthParam;
+}
+export const rotateVaultCredentialParamsFields = ["auth"] as const;
+export interface SavedAgentCore {
+  harness?: "claude_sdk" | "codex" | "mcode";
+  harness_config?: Record<string, unknown>;
+  model_provider?: ModelProviderView;
+}
+export const savedAgentCoreFields = ["harness", "harness_config", "model_provider"] as const;
+export const savedAgentCoreRequired = [] as const;
+export interface SavedAgentCoreInput {
+  harness?: "claude_sdk" | "codex" | "mcode";
+  harness_config?: Record<string, unknown>;
+  model_provider?: ModelProviderInput | null;
+}
+export const savedAgentCoreInputFields = ["harness", "harness_config", "model_provider"] as const;
+export const savedAgentCoreInputRequired = [] as const;
+export interface SendSubagentInputCallItemResource {
+  type: "send_subagent_input_call";
+  id: string;
+  turn_id: string;
+  status: FunctionCallStatusResource;
+  sender_agent_id: string;
+  recipient_agent_id: string;
+  content: AgentContentResource[];
+}
+export const sendSubagentInputCallItemResourceFields = ["type", "id", "turn_id", "status", "sender_agent_id", "recipient_agent_id", "content"] as const;
+export const serviceTierParamValues = ["auto", "default", "flex", "priority", "fast"] as const;
+export type ServiceTierParam = (typeof serviceTierParamValues)[number];
+export const serviceTierResourceValues = ["auto", "default", "flex", "priority", "fast"] as const;
+export type ServiceTierResource = (typeof serviceTierResourceValues)[number];
+export interface SessionAgentConfigParam {
+  model?: string;
+  reasoning?: ReasoningParam | null;
+  text?: TextParam | null;
+  service_tier?: ServiceTierParam | null;
+  instructions?: string | null;
+  multi_agent?: MultiAgentConfigCurrentParam | null;
+  tools?: AgentToolConfigParam[] | null;
+  x_agents_core?: AgentsCore | null;
+}
+export const sessionAgentConfigParamFields = ["model", "reasoning", "text", "service_tier", "instructions", "multi_agent", "tools", "x_agents_core"] as const;
+export const sessionAgentConfigParamRequired = [] as const;
+export interface SessionAgentResource {
+  id: string;
+  name: string | null;
+  model: string;
+  reasoning: ReasoningResource;
+  text: TextResource;
+  service_tier: ServiceTierResource;
+  instructions: string | null;
+  tools: AgentToolResource[];
+  multi_agent: MultiAgentConfigResource;
+  x_agents_core?: AgentsCore | null;
+}
+export const sessionAgentResourceFields = ["id", "name", "model", "reasoning", "text", "service_tier", "instructions", "tools", "multi_agent", "x_agents_core"] as const;
+export const sessionAgentResourceRequired = ["id", "name", "model", "reasoning", "text", "service_tier", "instructions", "tools", "multi_agent"] as const;
+export interface SessionArtifactListResource {
+  object: "list";
+  data: SessionArtifactResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const sessionArtifactListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface SessionArtifactResource {
+  id: string;
+  object: "agent.session.artifact";
+  session_id: string;
+  environment_id: string;
+  turn_id: string;
+  path: string;
+  size_bytes: number;
+  created_at: number;
+}
+export const sessionArtifactResourceFields = ["id", "object", "session_id", "environment_id", "turn_id", "path", "size_bytes", "created_at"] as const;
+export interface SessionCore {
+  installation?: EnvironmentInstallation;
+}
+export const sessionCoreFields = ["installation"] as const;
+export const sessionCoreRequired = [] as const;
+export interface SessionEnvironmentErrorResource {
+  type: string;
+  code: string;
+  message: string;
+}
+export const sessionEnvironmentErrorResourceFields = ["type", "code", "message"] as const;
+export interface SessionEnvironmentStateResource {
+  id: string;
+  type: string;
+  status: SessionEnvironmentStatusResource;
+  error: SessionEnvironmentErrorResource | null;
+}
+export const sessionEnvironmentStateResourceFields = ["id", "type", "status", "error"] as const;
+export const sessionEnvironmentStatusResourceValues = ["pending", "ready", "connected", "disconnected", "failed"] as const;
+export type SessionEnvironmentStatusResource = (typeof sessionEnvironmentStatusResourceValues)[number];
+export interface SessionErrorResource {
+  type: string;
+  code: string | null;
+  message: string;
+  param: string | null;
+}
+export const sessionErrorResourceFields = ["type", "code", "message", "param"] as const;
+export type SessionEvent = SessionEventError | SessionEventAgentSessionEnvironmentReady | SessionEventAgentOutputCommandExecutionOutputDelta | SessionEventAgentSessionCreated | SessionEventAgentSessionTurnCreated | SessionEventAgentSessionTurnInProgress | SessionEventAgentSessionTurnCompleted | SessionEventAgentSessionTurnFailed | SessionEventAgentSessionTurnCancelled | SessionEventAgentSessionTurnItemAdded | SessionEventAgentSessionIdle | SessionEventAgentSessionInProgress | SessionEventAgentSessionRequiresAction | SessionEventAgentSessionFailed | SessionEventAgentSessionEnvironmentPending | SessionEventAgentSessionEnvironmentConnected | SessionEventAgentSessionEnvironmentDisconnected | SessionEventAgentSessionEnvironmentFailed | SessionEventAgentSessionSubagentCreated | SessionEventAgentSessionSubagentActive | SessionEventAgentSessionSubagentClosed | SessionEventAgentSessionTurnItemDone | SessionEventAgentSessionTurnContentPartAdded | SessionEventAgentSessionTurnContentPartDone | SessionEventAgentSessionTurnOutputTextDelta | SessionEventAgentSessionTurnOutputTextDone | SessionEventAgentSessionTurnReasoningSummaryPartAdded | SessionEventAgentSessionTurnReasoningSummaryPartDone | SessionEventAgentSessionTurnReasoningSummaryTextDelta | SessionEventAgentSessionTurnReasoningSummaryTextDone;
+export interface SessionEventAgentOutputCommandExecutionOutputDelta {
+  type: "agent.output.command_execution_output.delta";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  delta: string;
+}
+export const sessionEventAgentOutputCommandExecutionOutputDeltaFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "delta"] as const;
+export interface SessionEventAgentSessionCreated {
+  type: "agent.session.created";
+  event_id: string;
+  session: SessionResource;
+}
+export const sessionEventAgentSessionCreatedFields = ["type", "event_id", "session"] as const;
+export interface SessionEventAgentSessionEnvironmentConnected {
+  type: "agent.session.environment.connected";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  environment: SessionEnvironmentStateResource;
+}
+export const sessionEventAgentSessionEnvironmentConnectedFields = ["type", "event_id", "session_id", "turn_id", "environment"] as const;
+export interface SessionEventAgentSessionEnvironmentDisconnected {
+  type: "agent.session.environment.disconnected";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  environment: SessionEnvironmentStateResource;
+}
+export const sessionEventAgentSessionEnvironmentDisconnectedFields = ["type", "event_id", "session_id", "turn_id", "environment"] as const;
+export interface SessionEventAgentSessionEnvironmentFailed {
+  type: "agent.session.environment.failed";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  environment: SessionEnvironmentStateResource;
+}
+export const sessionEventAgentSessionEnvironmentFailedFields = ["type", "event_id", "session_id", "turn_id", "environment"] as const;
+export interface SessionEventAgentSessionEnvironmentPending {
+  type: "agent.session.environment.pending";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  environment: SessionEnvironmentStateResource;
+}
+export const sessionEventAgentSessionEnvironmentPendingFields = ["type", "event_id", "session_id", "turn_id", "environment"] as const;
+export interface SessionEventAgentSessionEnvironmentReady {
+  type: "agent.session.environment.ready";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  environment: SessionEnvironmentStateResource;
+}
+export const sessionEventAgentSessionEnvironmentReadyFields = ["type", "event_id", "session_id", "turn_id", "environment"] as const;
+export interface SessionEventAgentSessionFailed {
+  type: "agent.session.failed";
+  event_id: string;
+  session: SessionResource;
+}
+export const sessionEventAgentSessionFailedFields = ["type", "event_id", "session"] as const;
+export interface SessionEventAgentSessionIdle {
+  type: "agent.session.idle";
+  event_id: string;
+  session: SessionResource;
+}
+export const sessionEventAgentSessionIdleFields = ["type", "event_id", "session"] as const;
+export interface SessionEventAgentSessionInProgress {
+  type: "agent.session.in_progress";
+  event_id: string;
+  session: SessionResource;
+}
+export const sessionEventAgentSessionInProgressFields = ["type", "event_id", "session"] as const;
+export interface SessionEventAgentSessionRequiresAction {
+  type: "agent.session.requires_action";
+  event_id: string;
+  session: SessionResource;
+}
+export const sessionEventAgentSessionRequiresActionFields = ["type", "event_id", "session"] as const;
+export interface SessionEventAgentSessionSubagentActive {
+  type: "agent.session.subagent.active";
+  event_id: string;
+  subagent: SubagentResource;
+}
+export const sessionEventAgentSessionSubagentActiveFields = ["type", "event_id", "subagent"] as const;
+export interface SessionEventAgentSessionSubagentClosed {
+  type: "agent.session.subagent.closed";
+  event_id: string;
+  subagent: SubagentResource;
+}
+export const sessionEventAgentSessionSubagentClosedFields = ["type", "event_id", "subagent"] as const;
+export interface SessionEventAgentSessionSubagentCreated {
+  type: "agent.session.subagent.created";
+  event_id: string;
+  subagent: SubagentResource;
+}
+export const sessionEventAgentSessionSubagentCreatedFields = ["type", "event_id", "subagent"] as const;
+export interface SessionEventAgentSessionTurnCancelled {
+  type: "agent.session.turn.cancelled";
+  event_id: string;
+  session_id: string;
+  turn_id: string;
+  turn: TurnResource;
+  usage: TokenUsageResource | null;
+}
+export const sessionEventAgentSessionTurnCancelledFields = ["type", "event_id", "session_id", "turn_id", "turn", "usage"] as const;
+export interface SessionEventAgentSessionTurnCompleted {
+  type: "agent.session.turn.completed";
+  event_id: string;
+  session_id: string;
+  turn_id: string;
+  turn: TurnResource;
+  usage: TokenUsageResource | null;
+}
+export const sessionEventAgentSessionTurnCompletedFields = ["type", "event_id", "session_id", "turn_id", "turn", "usage"] as const;
+export interface SessionEventAgentSessionTurnContentPartAdded {
+  type: "agent.session.turn.content_part.added";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  content_index: number;
+  part: OutputTextResource;
+}
+export const sessionEventAgentSessionTurnContentPartAddedFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "content_index", "part"] as const;
+export interface SessionEventAgentSessionTurnContentPartDone {
+  type: "agent.session.turn.content_part.done";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  content_index: number;
+  part: OutputTextResource;
+}
+export const sessionEventAgentSessionTurnContentPartDoneFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "content_index", "part"] as const;
+export interface SessionEventAgentSessionTurnCreated {
+  type: "agent.session.turn.created";
+  event_id: string;
+  session_id: string;
+  turn_id: string;
+  turn: TurnResource;
+}
+export const sessionEventAgentSessionTurnCreatedFields = ["type", "event_id", "session_id", "turn_id", "turn"] as const;
+export interface SessionEventAgentSessionTurnFailed {
+  type: "agent.session.turn.failed";
+  event_id: string;
+  session_id: string;
+  turn_id: string;
+  turn: TurnResource;
+  usage: TokenUsageResource | null;
+}
+export const sessionEventAgentSessionTurnFailedFields = ["type", "event_id", "session_id", "turn_id", "turn", "usage"] as const;
+export interface SessionEventAgentSessionTurnInProgress {
+  type: "agent.session.turn.in_progress";
+  event_id: string;
+  session_id: string;
+  turn_id: string;
+  turn: TurnResource;
+}
+export const sessionEventAgentSessionTurnInProgressFields = ["type", "event_id", "session_id", "turn_id", "turn"] as const;
+export interface SessionEventAgentSessionTurnItemAdded {
+  type: "agent.session.turn.item.added";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  output_index: number | null;
+  item: SessionTurnItemResource;
+}
+export const sessionEventAgentSessionTurnItemAddedFields = ["type", "event_id", "session_id", "turn_id", "output_index", "item"] as const;
+export interface SessionEventAgentSessionTurnItemDone {
+  type: "agent.session.turn.item.done";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  output_index: number;
+  item: AgentOutputItemResource;
+}
+export const sessionEventAgentSessionTurnItemDoneFields = ["type", "event_id", "session_id", "turn_id", "output_index", "item"] as const;
+export interface SessionEventAgentSessionTurnOutputTextDelta {
+  type: "agent.session.turn.output_text.delta";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  content_index: number;
+  delta: string;
+}
+export const sessionEventAgentSessionTurnOutputTextDeltaFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "content_index", "delta"] as const;
+export interface SessionEventAgentSessionTurnOutputTextDone {
+  type: "agent.session.turn.output_text.done";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  content_index: number;
+  text: string;
+}
+export const sessionEventAgentSessionTurnOutputTextDoneFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "content_index", "text"] as const;
+export interface SessionEventAgentSessionTurnReasoningSummaryPartAdded {
+  type: "agent.session.turn.reasoning_summary_part.added";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  summary_index: number;
+  part: SummaryTextResource;
+}
+export const sessionEventAgentSessionTurnReasoningSummaryPartAddedFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "summary_index", "part"] as const;
+export interface SessionEventAgentSessionTurnReasoningSummaryPartDone {
+  type: "agent.session.turn.reasoning_summary_part.done";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  summary_index: number;
+  part: SummaryTextResource;
+  status: "incomplete" | null;
+}
+export const sessionEventAgentSessionTurnReasoningSummaryPartDoneFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "summary_index", "part", "status"] as const;
+export interface SessionEventAgentSessionTurnReasoningSummaryTextDelta {
+  type: "agent.session.turn.reasoning_summary_text.delta";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  summary_index: number;
+  delta: string;
+}
+export const sessionEventAgentSessionTurnReasoningSummaryTextDeltaFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "summary_index", "delta"] as const;
+export interface SessionEventAgentSessionTurnReasoningSummaryTextDone {
+  type: "agent.session.turn.reasoning_summary_text.done";
+  event_id: string;
+  session_id: string;
+  turn_id: string | null;
+  item_id: string;
+  output_index: number;
+  summary_index: number;
+  text: string;
+}
+export const sessionEventAgentSessionTurnReasoningSummaryTextDoneFields = ["type", "event_id", "session_id", "turn_id", "item_id", "output_index", "summary_index", "text"] as const;
+export interface SessionEventError {
+  type: "error";
+  event_id: string;
+  session_id: string;
+  error: SessionErrorResource;
+}
+export const sessionEventErrorFields = ["type", "event_id", "session_id", "error"] as const;
+export interface SessionExecutionInput {
+  environment?: Record<string, unknown>;
+  harness_config?: Record<string, unknown>;
+  model_provider?: ModelProviderInput;
+}
+export const sessionExecutionInputFields = ["environment", "harness_config", "model_provider"] as const;
+export const sessionExecutionInputRequired = [] as const;
+export type SessionInputParam = SessionInputParamAgentSessionInputMessage | SessionInputParamAgentSessionInputCancel | SessionInputParamAgentSessionInputToolResult;
+export interface SessionInputParamAgentSessionInputCancel {
+  type: "agent.session.input.cancel";
+}
+export const sessionInputParamAgentSessionInputCancelFields = ["type"] as const;
+export interface SessionInputParamAgentSessionInputMessage {
+  type: "agent.session.input.message";
+  input: InputMessageParam[];
+}
+export const sessionInputParamAgentSessionInputMessageFields = ["type", "input"] as const;
+export interface SessionInputParamAgentSessionInputToolResult {
+  type: "agent.session.input.tool_result";
+  turn_id: string;
+  call_id: string;
+  success: boolean;
+  output?: FunctionCallOutputParam | null;
+  error?: string | null;
+}
+export const sessionInputParamAgentSessionInputToolResultFields = ["type", "turn_id", "call_id", "success", "output", "error"] as const;
+export const sessionInputParamAgentSessionInputToolResultRequired = ["type", "turn_id", "call_id", "success"] as const;
+export interface SessionItemListResource {
+  object: "list";
+  data: SessionTurnItemResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const sessionItemListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface SessionListResource {
+  object: "list";
+  data: SessionResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const sessionListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export const sessionMessageRoleResourceValues = ["user", "assistant"] as const;
+export type SessionMessageRoleResource = (typeof sessionMessageRoleResourceValues)[number];
+export type SessionRequiredActionResource = SessionRequiredActionResourceFunctionCall | SessionRequiredActionResourceEnvironmentConnection;
+export interface SessionRequiredActionResourceEnvironmentConnection {
+  type: "environment_connection";
+  environment_id: string;
+}
+export const sessionRequiredActionResourceEnvironmentConnectionFields = ["type", "environment_id"] as const;
+export interface SessionRequiredActionResourceFunctionCall {
+  type: "function_call";
+  turn_id: string;
+  call_id: string;
+  name: string;
+  arguments: unknown;
+}
+export const sessionRequiredActionResourceFunctionCallFields = ["type", "turn_id", "call_id", "name", "arguments"] as const;
+export interface SessionResource {
+  metadata: Record<string, string>;
+  id: string;
+  object: "agent.session";
+  created_at: number;
+  last_active_at: number;
+  status: SessionStatusResource;
+  required_actions: SessionRequiredActionResource[];
+  error: string | null;
+  agent: SessionAgentResource;
+  environment: EnvironmentResource;
+  vault_ids: string[];
+  usage: TokenUsageResource | null;
+  x_agents_core?: SessionCore | null;
+}
+export const sessionResourceFields = ["metadata", "id", "object", "created_at", "last_active_at", "status", "required_actions", "error", "agent", "environment", "vault_ids", "usage", "x_agents_core"] as const;
+export const sessionResourceRequired = ["metadata", "id", "object", "created_at", "last_active_at", "status", "required_actions", "error", "agent", "environment", "vault_ids", "usage"] as const;
+export const sessionStatusResourceValues = ["idle", "in_progress", "requires_action", "failed"] as const;
+export type SessionStatusResource = (typeof sessionStatusResourceValues)[number];
+export const sessionTurnErrorCodeResourceValues = ["context_length_exceeded", "session_budget_exceeded", "usage_limit_exceeded", "rate_limit_exceeded", "server_overloaded", "cyber_policy", "connection_failed", "server_error", "authentication_error", "invalid_request", "resource_not_found", "sandbox_error", "executor_version_incompatible", "active_turn_not_steerable", "request_timeout", "internal_error"] as const;
+export type SessionTurnErrorCodeResource = (typeof sessionTurnErrorCodeResourceValues)[number];
+export interface SessionTurnErrorResource {
+  code: SessionTurnErrorCodeResource;
+  message: string;
+}
+export const sessionTurnErrorResourceFields = ["code", "message"] as const;
+export type SessionTurnItemResource = MessageItemResource | ReasoningItemResource | FunctionCallItemResource | FunctionCallOutputItemResource | AgentMessageItemResource | McpCallItemResource | WebSearchCallItemResource | CommandExecutionItemResource | CreateSubagentCallItemResource | SendSubagentInputCallItemResource | ResumeSubagentCallItemResource | WaitForSubagentsCallItemResource | InterruptSubagentCallItemResource | CloseSubagentCallItemResource;
+export interface SessionTurnListResource {
+  object: "list";
+  data: TurnResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const sessionTurnListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface SetDefaultSkillVersionBody {
+  default_version: string;
+}
+export const setDefaultSkillVersionBodyFields = ["default_version"] as const;
+export interface SetupCommandParam {
+  command: string;
+  cwd?: string | null;
+}
+export const setupCommandParamFields = ["command", "cwd"] as const;
+export const setupCommandParamRequired = ["command"] as const;
+export interface SkillListResource {
+  object: "list";
+  data: SkillResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const skillListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface SkillResource {
+  id: string;
+  object: "skill";
+  name: string;
+  description: string;
+  created_at: number;
+  default_version: string;
+  latest_version: string;
+}
+export const skillResourceFields = ["id", "object", "name", "description", "created_at", "default_version", "latest_version"] as const;
+export interface SkillVersionListResource {
+  object: "list";
+  data: SkillVersionResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const skillVersionListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface SkillVersionResource {
+  object: "skill.version";
+  id: string;
+  skill_id: string;
+  version: string;
+  created_at: number;
+  name: string;
+  description: string;
+}
+export const skillVersionResourceFields = ["object", "id", "skill_id", "version", "created_at", "name", "description"] as const;
+export const subagentObjectResourceValues = ["agent.session.subagent"] as const;
+export type SubagentObjectResource = (typeof subagentObjectResourceValues)[number];
+export interface SubagentResource {
+  id: string;
+  object: SubagentObjectResource;
+  session_id: string;
+  name: string | null;
+  instructions: AgentContentResource[] | null;
+  parent_agent_id: string;
+  status: SubagentStatusResource;
+  opened_at: number;
+  closed_at: number | null;
+}
+export const subagentResourceFields = ["id", "object", "session_id", "name", "instructions", "parent_agent_id", "status", "opened_at", "closed_at"] as const;
+export const subagentStatusResourceValues = ["active", "closed"] as const;
+export type SubagentStatusResource = (typeof subagentStatusResourceValues)[number];
+export interface SummaryTextResource {
+  type: "summary_text";
+  text: string;
+}
+export const summaryTextResourceFields = ["type", "text"] as const;
+export type TextFormatParam = TextFormatParamText | TextFormatParamJsonSchema;
+export interface TextFormatParamJsonSchema {
+  type: "json_schema";
+  schema: Record<string, unknown>;
+}
+export const textFormatParamJsonSchemaFields = ["type", "schema"] as const;
+export interface TextFormatParamText {
+  type: "text";
+}
+export const textFormatParamTextFields = ["type"] as const;
+export type TextFormatResource = TextFormatResourceText | TextFormatResourceJsonSchema;
+export interface TextFormatResourceJsonSchema {
+  type: "json_schema";
+  schema: Record<string, unknown>;
+}
+export const textFormatResourceJsonSchemaFields = ["type", "schema"] as const;
+export interface TextFormatResourceText {
+  type: "text";
+}
+export const textFormatResourceTextFields = ["type"] as const;
+export interface TextParam {
+  format?: TextFormatParam | null;
+  verbosity?: VerbosityParam | null;
+}
+export const textParamFields = ["format", "verbosity"] as const;
+export const textParamRequired = [] as const;
+export interface TextResource {
+  format: TextFormatResource;
+  verbosity: VerbosityResource;
+}
+export const textResourceFields = ["format", "verbosity"] as const;
+export interface TokenUsageResource {
+  input_tokens: number;
+  input_tokens_details: InputTokensDetailsResource;
+  output_tokens: number;
+  output_tokens_details: OutputTokensDetailsResource;
+  total_tokens: number;
+}
+export const tokenUsageResourceFields = ["input_tokens", "input_tokens_details", "output_tokens", "output_tokens_details", "total_tokens"] as const;
+export const turnObjectResourceValues = ["agent.session.turn"] as const;
+export type TurnObjectResource = (typeof turnObjectResourceValues)[number];
+export interface TurnResource {
+  id: string;
+  object: TurnObjectResource;
+  session_id: string;
+  agent_id: string;
+  subagent_id: string | null;
+  status: TurnStatusResource;
+  created_at: number;
+  started_at: number | null;
+  completed_at: number | null;
+  error: SessionTurnErrorResource | null;
+  usage: TokenUsageResource | null;
+}
+export const turnResourceFields = ["id", "object", "session_id", "agent_id", "subagent_id", "status", "created_at", "started_at", "completed_at", "error", "usage"] as const;
+export const turnStatusResourceValues = ["queued", "in_progress", "waiting", "completed", "failed", "cancelled"] as const;
+export type TurnStatusResource = (typeof turnStatusResourceValues)[number];
+export interface UpdateAgentParams {
+  model?: string;
+  reasoning?: ReasoningParam | null;
+  text?: TextParam | null;
+  service_tier?: ServiceTierParam | null;
+  instructions?: string | null;
+  multi_agent?: MultiAgentConfigCurrentParam | null;
+  metadata?: Record<string, string> | null;
+  name?: string | null;
+  tools?: PersistedAgentToolConfigParam[] | null;
+  x_agents_core?: SavedAgentCoreInput | null;
+}
+export const updateAgentParamsFields = ["model", "reasoning", "text", "service_tier", "instructions", "multi_agent", "metadata", "name", "tools", "x_agents_core"] as const;
+export const updateAgentParamsRequired = [] as const;
+export interface UpdateAgentSessionParams {
+  metadata?: Record<string, string> | null;
+}
+export const updateAgentSessionParamsFields = ["metadata"] as const;
+export const updateAgentSessionParamsRequired = [] as const;
+export interface UpdateEnvironmentTemplateParams {
+  name?: string | null;
+  packages?: EnvironmentPackagesParam | null;
+  setup_commands?: SetupCommandParam[] | null;
+  network?: NetworkPolicyParam | null;
+  env?: Record<string, string> | null;
+  capability_directories?: string[] | null;
+  skills?: HostedSkillParam[] | null;
+  plugins?: HostedPluginParam[] | null;
+  files?: HostedEnvironmentFileParam[] | null;
+}
+export const updateEnvironmentTemplateParamsFields = ["name", "packages", "setup_commands", "network", "env", "capability_directories", "skills", "plugins", "files"] as const;
+export const updateEnvironmentTemplateParamsRequired = [] as const;
+export type VaultCredentialAuthResource = VaultCredentialAuthResourceMcpOauth | VaultCredentialAuthResourceStaticBearer;
+export interface VaultCredentialAuthResourceMcpOauth {
+  type: "mcp_oauth";
+  mcp_server_url: string;
+  expires_at: string | null;
+  refresh: McpOauthRefreshResource | null;
+}
+export const vaultCredentialAuthResourceMcpOauthFields = ["type", "mcp_server_url", "expires_at", "refresh"] as const;
+export interface VaultCredentialAuthResourceStaticBearer {
+  type: "static_bearer";
+  mcp_server_url: string;
+}
+export const vaultCredentialAuthResourceStaticBearerFields = ["type", "mcp_server_url"] as const;
+export interface VaultCredentialListResource {
+  object: "list";
+  data: VaultCredentialResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const vaultCredentialListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface VaultCredentialResource {
+  id: string;
+  object: "vault.credential";
+  vault_id: string;
+  name: string;
+  auth: VaultCredentialAuthResource;
+  created_at: number;
+  updated_at: number;
+}
+export const vaultCredentialResourceFields = ["id", "object", "vault_id", "name", "auth", "created_at", "updated_at"] as const;
+export interface VaultListResource {
+  object: "list";
+  data: VaultResource[];
+  first_id: string | null;
+  last_id: string | null;
+  has_more: boolean;
+}
+export const vaultListResourceFields = ["object", "data", "first_id", "last_id", "has_more"] as const;
+export interface VaultResource {
+  id: string;
+  object: "vault";
+  name: string | null;
+  metadata: Record<string, string>;
+  created_at: number;
+}
+export const vaultResourceFields = ["id", "object", "name", "metadata", "created_at"] as const;
+export type VaultStatusFilterParam = VaultStatusParam | VaultStatusParam[];
+export const vaultStatusParamValues = ["active", "archived"] as const;
+export type VaultStatusParam = (typeof vaultStatusParamValues)[number];
+export const verbosityParamValues = ["low", "medium", "high"] as const;
+export type VerbosityParam = (typeof verbosityParamValues)[number];
+export const verbosityResourceValues = ["low", "medium", "high"] as const;
+export type VerbosityResource = (typeof verbosityResourceValues)[number];
+export interface WaitForSubagentsCallItemResource {
+  type: "wait_for_subagents_call";
+  id: string;
+  turn_id: string;
+  status: FunctionCallStatusResource;
+  sender_agent_id: string;
+  recipient_agent_ids: string[];
+}
+export const waitForSubagentsCallItemResourceFields = ["type", "id", "turn_id", "status", "sender_agent_id", "recipient_agent_ids"] as const;
+export type WebSearchActionResource = WebSearchActionResourceSearch | WebSearchActionResourceOpenPage | WebSearchActionResourceFindInPage | WebSearchActionResourceOther;
+export interface WebSearchActionResourceFindInPage {
+  type: "find_in_page";
+  url: string | null;
+  pattern: string | null;
+}
+export const webSearchActionResourceFindInPageFields = ["type", "url", "pattern"] as const;
+export interface WebSearchActionResourceOpenPage {
+  type: "open_page";
+  url: string | null;
+}
+export const webSearchActionResourceOpenPageFields = ["type", "url"] as const;
+export interface WebSearchActionResourceOther {
+  type: "other";
+}
+export const webSearchActionResourceOtherFields = ["type"] as const;
+export interface WebSearchActionResourceSearch {
+  type: "search";
+  query: string | null;
+  queries: string[] | null;
+}
+export const webSearchActionResourceSearchFields = ["type", "query", "queries"] as const;
+export interface WebSearchCallItemResource {
+  type: "web_search_call";
+  id: string;
+  turn_id: string;
+  status: OutputItemStatusResource;
+  action: WebSearchActionResource | null;
+}
+export const webSearchCallItemResourceFields = ["type", "id", "turn_id", "status", "action"] as const;
+export const webSearchContextSizeParamValues = ["low", "medium", "high"] as const;
+export type WebSearchContextSizeParam = (typeof webSearchContextSizeParamValues)[number];
+export const webSearchContextSizeResourceValues = ["low", "medium", "high"] as const;
+export type WebSearchContextSizeResource = (typeof webSearchContextSizeResourceValues)[number];
+export interface WebSearchLocationParam {
+  country?: string | null;
+  region?: string | null;
+  city?: string | null;
+  timezone?: string | null;
+}
+export const webSearchLocationParamFields = ["country", "region", "city", "timezone"] as const;
+export const webSearchLocationParamRequired = [] as const;
+export interface WebSearchLocationResource {
+  country: string | null;
+  region: string | null;
+  city: string | null;
+  timezone: string | null;
+}
+export const webSearchLocationResourceFields = ["country", "region", "city", "timezone"] as const;
+export const webSearchModeParamValues = ["disabled", "cached", "live"] as const;
+export type WebSearchModeParam = (typeof webSearchModeParamValues)[number];
+export const webSearchModeResourceValues = ["disabled", "cached", "live"] as const;
+export type WebSearchModeResource = (typeof webSearchModeResourceValues)[number];
+export type _MisalignmentErrorType = string | "potentially_unintended_data_transfer" | "potentially_unintended_data_access" | "potentially_unintended_destructive_activity" | "other";
+export interface _MisalignmentSteer {
+  message: string;
+}
+export const _MisalignmentSteerFields = ["message"] as const;
+export const agentContentResourceFields = {
+  "output_text": outputTextResourceFields,
+  "encrypted_content": encryptedContentResourceFields,
+} as const;
+export const agentOutputItemResourceFields = {
+  "message": assistantMessageItemResourceFields,
+  "reasoning": reasoningItemResourceFields,
+  "function_call": functionCallItemResourceFields,
+  "mcp_call": mcpCallItemResourceFields,
+  "web_search_call": webSearchCallItemResourceFields,
+  "command_execution": commandExecutionItemResourceFields,
+  "interrupt_subagent_call": interruptSubagentCallItemResourceFields,
+  "create_subagent_call": createSubagentCallItemResourceFields,
+  "send_subagent_input_call": sendSubagentInputCallItemResourceFields,
+  "resume_subagent_call": resumeSubagentCallItemResourceFields,
+  "wait_for_subagents_call": waitForSubagentsCallItemResourceFields,
+  "close_subagent_call": closeSubagentCallItemResourceFields,
+} as const;
+export const agentToolConfigParamFields = {
+  "function": agentToolConfigParamFunctionFields,
+  "tool_search": agentToolConfigParamToolSearchFields,
+  "programmatic_tool_calling": agentToolConfigParamProgrammaticToolCallingFields,
+  "mcp": agentToolConfigParamMcpFields,
+  "web_search": agentToolConfigParamWebSearchFields,
+} as const;
+export const agentToolResourceFields = {
+  "function": agentToolResourceFunctionFields,
+  "programmatic_tool_calling": agentToolResourceProgrammaticToolCallingFields,
+  "mcp": agentToolResourceMcpFields,
+  "web_search": agentToolResourceWebSearchFields,
+} as const;
+export const createMcpOauthTokenEndpointAuthParamFields = {
+  "none": createMcpOauthTokenEndpointAuthParamNoneFields,
+  "client_secret_basic": createMcpOauthTokenEndpointAuthParamClientSecretBasicFields,
+  "client_secret_post": createMcpOauthTokenEndpointAuthParamClientSecretPostFields,
+} as const;
+export const createVaultCredentialAuthParamFields = {
+  "mcp_oauth": createVaultCredentialAuthParamMcpOauthFields,
+  "static_bearer": createVaultCredentialAuthParamStaticBearerFields,
+} as const;
+export const environmentParamFields = {
+  "none": environmentParamNoneFields,
+  "openai_hosted": environmentParamOpenaiHostedFields,
+  "self_hosted": environmentParamSelfHostedFields,
+} as const;
+export const environmentResourceFields = {
+  "none": environmentResourceNoneFields,
+  "openai_hosted": environmentResourceOpenaiHostedFields,
+  "self_hosted": environmentResourceSelfHostedFields,
+} as const;
+export const hostedEnvironmentFileParamFields = {
+  "file_id": hostedEnvironmentFileParamFileIdFields,
+  "inline": hostedEnvironmentFileParamInlineFields,
+} as const;
+export const hostedEnvironmentFileResourceFields = {
+  "file_id": hostedEnvironmentFileResourceFileIdFields,
+  "inline": hostedEnvironmentFileResourceInlineFields,
+} as const;
+export const hostedPluginParamFields = {
+  "inline": hostedPluginParamInlineFields,
+} as const;
+export const hostedPluginResourceFields = {
+  "inline": hostedPluginResourceInlineFields,
+} as const;
+export const hostedSkillParamFields = {
+  "skill_reference": hostedSkillParamSkillReferenceFields,
+  "inline": hostedSkillParamInlineFields,
+} as const;
+export const hostedSkillResourceFields = {
+  "skill_reference": hostedSkillResourceSkillReferenceFields,
+  "inline": hostedSkillResourceInlineFields,
+} as const;
+export const hostedTemplateFileResourceFields = {
+  "file_id": hostedTemplateFileResourceFileIdFields,
+  "inline": hostedTemplateFileResourceInlineFields,
+} as const;
+export const hostedTemplateSkillResourceFields = {
+  "skill_reference": hostedTemplateSkillResourceSkillReferenceFields,
+  "inline": hostedTemplateSkillResourceInlineFields,
+} as const;
+export const inlineCapabilitySourceParamFields = {
+  "base64": inlineCapabilitySourceParamBase64Fields,
+} as const;
+export const inputContentParamFields = {
+  "input_text": inputContentParamInputTextFields,
+  "input_image": inputContentParamInputImageFields,
+} as const;
+export const inputContentResourceFields = {
+  "input_text": inputContentResourceInputTextFields,
+  "input_image": inputContentResourceInputImageFields,
+} as const;
+export const mcpOauthTokenEndpointAuthResourceFields = {
+  "none": mcpOauthTokenEndpointAuthResourceNoneFields,
+  "client_secret_basic": mcpOauthTokenEndpointAuthResourceClientSecretBasicFields,
+  "client_secret_post": mcpOauthTokenEndpointAuthResourceClientSecretPostFields,
+} as const;
+export const mcpTransportConfigParamFields = {
+  "http": mcpTransportConfigParamHttpFields,
+  "stdio": mcpTransportConfigParamStdioFields,
+} as const;
+export const mcpTransportResourceFields = {
+  "http": mcpTransportResourceHttpFields,
+  "stdio": mcpTransportResourceStdioFields,
+} as const;
+export const messageContentResourceFields = {
+  "input_text": messageContentResourceInputTextFields,
+  "input_image": messageContentResourceInputImageFields,
+  "output_text": messageContentResourceOutputTextFields,
+} as const;
+export const persistedAgentToolConfigParamFields = {
+  "function": persistedAgentToolConfigParamFunctionFields,
+  "tool_search": persistedAgentToolConfigParamToolSearchFields,
+  "programmatic_tool_calling": persistedAgentToolConfigParamProgrammaticToolCallingFields,
+  "mcp": persistedAgentToolConfigParamMcpFields,
+  "web_search": persistedAgentToolConfigParamWebSearchFields,
+} as const;
+export const persistedAgentToolResourceFields = {
+  "function": persistedAgentToolResourceFunctionFields,
+  "tool_search": persistedAgentToolResourceToolSearchFields,
+  "programmatic_tool_calling": persistedAgentToolResourceProgrammaticToolCallingFields,
+  "mcp": persistedAgentToolResourceMcpFields,
+  "web_search": persistedAgentToolResourceWebSearchFields,
+} as const;
+export const persistedMcpTransportConfigParamFields = {
+  "http": persistedMcpTransportConfigParamHttpFields,
+  "stdio": persistedMcpTransportConfigParamStdioFields,
+} as const;
+export const persistedMcpTransportResourceFields = {
+  "http": persistedMcpTransportResourceHttpFields,
+  "stdio": persistedMcpTransportResourceStdioFields,
+} as const;
+export const rotateMcpOauthTokenEndpointAuthParamFields = {
+  "client_secret_basic": rotateMcpOauthTokenEndpointAuthParamClientSecretBasicFields,
+  "client_secret_post": rotateMcpOauthTokenEndpointAuthParamClientSecretPostFields,
+} as const;
+export const rotateVaultCredentialAuthParamFields = {
+  "mcp_oauth": rotateVaultCredentialAuthParamMcpOauthFields,
+  "static_bearer": rotateVaultCredentialAuthParamStaticBearerFields,
+} as const;
+export const sessionEventFields = {
+  "error": sessionEventErrorFields,
+  "agent.session.environment.ready": sessionEventAgentSessionEnvironmentReadyFields,
+  "agent.output.command_execution_output.delta": sessionEventAgentOutputCommandExecutionOutputDeltaFields,
+  "agent.session.created": sessionEventAgentSessionCreatedFields,
+  "agent.session.turn.created": sessionEventAgentSessionTurnCreatedFields,
+  "agent.session.turn.in_progress": sessionEventAgentSessionTurnInProgressFields,
+  "agent.session.turn.completed": sessionEventAgentSessionTurnCompletedFields,
+  "agent.session.turn.failed": sessionEventAgentSessionTurnFailedFields,
+  "agent.session.turn.cancelled": sessionEventAgentSessionTurnCancelledFields,
+  "agent.session.turn.item.added": sessionEventAgentSessionTurnItemAddedFields,
+  "agent.session.idle": sessionEventAgentSessionIdleFields,
+  "agent.session.in_progress": sessionEventAgentSessionInProgressFields,
+  "agent.session.requires_action": sessionEventAgentSessionRequiresActionFields,
+  "agent.session.failed": sessionEventAgentSessionFailedFields,
+  "agent.session.environment.pending": sessionEventAgentSessionEnvironmentPendingFields,
+  "agent.session.environment.connected": sessionEventAgentSessionEnvironmentConnectedFields,
+  "agent.session.environment.disconnected": sessionEventAgentSessionEnvironmentDisconnectedFields,
+  "agent.session.environment.failed": sessionEventAgentSessionEnvironmentFailedFields,
+  "agent.session.subagent.created": sessionEventAgentSessionSubagentCreatedFields,
+  "agent.session.subagent.active": sessionEventAgentSessionSubagentActiveFields,
+  "agent.session.subagent.closed": sessionEventAgentSessionSubagentClosedFields,
+  "agent.session.turn.item.done": sessionEventAgentSessionTurnItemDoneFields,
+  "agent.session.turn.content_part.added": sessionEventAgentSessionTurnContentPartAddedFields,
+  "agent.session.turn.content_part.done": sessionEventAgentSessionTurnContentPartDoneFields,
+  "agent.session.turn.output_text.delta": sessionEventAgentSessionTurnOutputTextDeltaFields,
+  "agent.session.turn.output_text.done": sessionEventAgentSessionTurnOutputTextDoneFields,
+  "agent.session.turn.reasoning_summary_part.added": sessionEventAgentSessionTurnReasoningSummaryPartAddedFields,
+  "agent.session.turn.reasoning_summary_part.done": sessionEventAgentSessionTurnReasoningSummaryPartDoneFields,
+  "agent.session.turn.reasoning_summary_text.delta": sessionEventAgentSessionTurnReasoningSummaryTextDeltaFields,
+  "agent.session.turn.reasoning_summary_text.done": sessionEventAgentSessionTurnReasoningSummaryTextDoneFields,
+} as const;
+export const sessionInputParamFields = {
+  "agent.session.input.message": sessionInputParamAgentSessionInputMessageFields,
+  "agent.session.input.cancel": sessionInputParamAgentSessionInputCancelFields,
+  "agent.session.input.tool_result": sessionInputParamAgentSessionInputToolResultFields,
+} as const;
+export const sessionRequiredActionResourceFields = {
+  "function_call": sessionRequiredActionResourceFunctionCallFields,
+  "environment_connection": sessionRequiredActionResourceEnvironmentConnectionFields,
+} as const;
+export const sessionTurnItemResourceFields = {
+  "message": messageItemResourceFields,
+  "reasoning": reasoningItemResourceFields,
+  "function_call": functionCallItemResourceFields,
+  "function_call_output": functionCallOutputItemResourceFields,
+  "agent_message": agentMessageItemResourceFields,
+  "mcp_call": mcpCallItemResourceFields,
+  "web_search_call": webSearchCallItemResourceFields,
+  "command_execution": commandExecutionItemResourceFields,
+  "interrupt_subagent_call": interruptSubagentCallItemResourceFields,
+  "create_subagent_call": createSubagentCallItemResourceFields,
+  "send_subagent_input_call": sendSubagentInputCallItemResourceFields,
+  "resume_subagent_call": resumeSubagentCallItemResourceFields,
+  "wait_for_subagents_call": waitForSubagentsCallItemResourceFields,
+  "close_subagent_call": closeSubagentCallItemResourceFields,
+} as const;
+export const textFormatParamFields = {
+  "text": textFormatParamTextFields,
+  "json_schema": textFormatParamJsonSchemaFields,
+} as const;
+export const textFormatResourceFields = {
+  "text": textFormatResourceTextFields,
+  "json_schema": textFormatResourceJsonSchemaFields,
+} as const;
+export const vaultCredentialAuthResourceFields = {
+  "mcp_oauth": vaultCredentialAuthResourceMcpOauthFields,
+  "static_bearer": vaultCredentialAuthResourceStaticBearerFields,
+} as const;
+export const webSearchActionResourceFields = {
+  "search": webSearchActionResourceSearchFields,
+  "open_page": webSearchActionResourceOpenPageFields,
+  "find_in_page": webSearchActionResourceFindInPageFields,
+  "other": webSearchActionResourceOtherFields,
+} as const;
diff --git a/packages/agents-client/src/history-projection.ts b/packages/agents-client/src/history-projection.ts
index b23ae0a82..aeb75a499 100644
--- a/packages/agents-client/src/history-projection.ts
+++ b/packages/agents-client/src/history-projection.ts
@@ -1,223 +1,133 @@
-import type { AgentTurn, ItemContent, SessionItem, ListPage, PageOptions } from "./types";
-import { exactFields, onlyFields, isRecord, hasOwn, isNonnegativeInteger, sameResourceId } from "./response-projection";
+import type { AgentTurn, ItemContent, SessionItem, ListPage, PageOptions, WebSearchAction } from "./types";
+import { exactFields, isOneOf, isRecord, hasOwn, isNonnegativeInteger, sameResourceId, variantFields } from "./response-projection";
 import { projectTokenUsage } from "./usage-projection";
-
-const turnFields = new Set([
-  "id", "agent_id", "session_id", "object", "status", "created_at", "started_at", "completed_at", "error", "usage", "subagent_id",
-]);
-const turnErrorFields = new Set(["code", "message"]);
-const itemContentTextFields = new Set(["type", "text"]);
-const itemContentImageFields = new Set(["type", "image_url"]);
-const knownItemTypes = new Set([
-  "message", "command_execution", "mcp_call", "function_call", "function_call_output", "web_search_call",
-  "reasoning", "agent_message", "create_subagent_call", "send_subagent_input_call", "resume_subagent_call",
-  "wait_for_subagents_call", "interrupt_subagent_call", "close_subagent_call",
-]);
-const itemStatuses = new Set(["in_progress", "completed", "failed", "incomplete"]);
-const turnStatuses = new Set(["queued", "in_progress", "waiting", "completed", "failed", "cancelled"]);
-
+import {
+  functionCallStatusResourceValues, messageContentResourceFields, messagePhaseResourceValues, outputItemStatusResourceValues,
+  sessionItemListResourceFields, sessionMessageRoleResourceValues, sessionTurnErrorCodeResourceValues, sessionTurnErrorResourceFields,
+  sessionTurnItemResourceFields, summaryTextResourceFields, turnResourceFields, turnStatusResourceValues, webSearchActionResourceFields,
+  encryptedContentResourceFields, type SessionTurnErrorCodeResource,
+} from "./generated/public-api";
 
 export function projectItemContent(value: unknown, invalid: () => never): ItemContent {
-  if (!isRecord(value) || typeof value.type !== "string") return invalid();
-  if (value.type === "input_text" || value.type === "output_text") {
-    if (!exactFields(value, itemContentTextFields) || typeof value.text !== "string") {
-      return invalid();
-    }
-    return { type: value.type, text: value.text };
+  const fields = isRecord(value) ? variantFields(messageContentResourceFields, value.type) : undefined;
+  if (!isRecord(value) || fields === undefined || !exactFields(value, fields)) return invalid();
+  if (value.type === "input_image") {
+    if (typeof value.image_url !== "string") return invalid();
+    return { type: "input_image", image_url: value.image_url };
   }
-  if (
-    value.type !== "input_image" || !exactFields(value, itemContentImageFields) ||
-    typeof value.image_url !== "string"
-  ) return invalid();
-  return { type: "input_image", image_url: value.image_url };
-}
-
-function validOptionalInteger(value: unknown): boolean {
-  return value === undefined || value === null || isNonnegativeInteger(value);
-}
-
-function validOptionalSafeInteger(value: unknown): boolean {
-  return value === undefined || value === null || Number.isSafeInteger(value);
+  if (typeof value.text !== "string") return invalid();
+  return { type: value.type as "input_text" | "output_text", text: value.text };
 }
 
-function projectWebSearchAction(value: unknown, invalid: () => never): SessionItem["action"] {
-  const fields = new Set(["type", "query", "queries", "url", "pattern"]);
+function projectWebSearchAction(value: unknown, invalid: () => never): WebSearchAction {
+  const fields = isRecord(value) ? variantFields(webSearchActionResourceFields, value.type) : undefined;
   if (
-    !isRecord(value) || !onlyFields(value, fields) ||
-    (value.type !== "search" && value.type !== "open_page" && value.type !== "find_in_page" && value.type !== "other") ||
-    !(value.query === undefined || value.query === null || typeof value.query === "string") ||
-    !(value.url === undefined || value.url === null || typeof value.url === "string") ||
-    !(value.pattern === undefined || value.pattern === null || typeof value.pattern === "string") ||
-    !(value.queries === undefined || (Array.isArray(value.queries) && value.queries.every((entry) => typeof entry === "string")))
+    !isRecord(value) || fields === undefined || !exactFields(value, fields) ||
+    ["query", "url", "pattern"].some((field) => hasOwn(value, field) && !nullableString(value[field])) ||
+    !(value.queries === undefined || value.queries === null ||
+      (Array.isArray(value.queries) && value.queries.every((entry) => typeof entry === "string")))
   ) return invalid();
-  return { ...value } as unknown as SessionItem["action"];
+  return { ...value } as unknown as WebSearchAction;
 }
 
-function itemVariantFields(type: string): Set<string> {
-  const common = ["id", "turn_id", "type", "status"];
+// The status enum each Item schema uses; agent_message has no status.
+function validItemStatus(type: unknown, status: unknown): boolean {
   switch (type) {
-    case "message": return new Set([...common, "role", "phase", "content"]);
-    case "command_execution": return new Set([...common, "command", "cwd", "duration_ms", "exit_code", "output"]);
-    case "mcp_call": return new Set([...common, "server_label", "name", "arguments", "output", "error"]);
-    case "function_call": return new Set([...common, "name", "call_id", "arguments"]);
-    case "function_call_output": return new Set([...common, "call_id", "output", "error", "duration_ms"]);
-    case "web_search_call": return new Set([...common, "action"]);
-    case "reasoning": return new Set([...common, "summary"]);
-    case "agent_message": return new Set(["id", "turn_id", "type", "sender_agent_id", "recipient_agent_id", "content"]);
-    case "create_subagent_call": return new Set([...common, "agent_id", "content", "model", "reasoning_effort"]);
-    case "send_subagent_input_call": return new Set([...common, "sender_agent_id", "recipient_agent_id", "content"]);
-    case "wait_for_subagents_call": return new Set([...common, "sender_agent_id", "recipient_agent_ids"]);
-    case "resume_subagent_call":
-    case "interrupt_subagent_call":
-    case "close_subagent_call": return new Set([...common, "sender_agent_id", "recipient_agent_id"]);
-    default: return new Set(common);
+    case "agent_message": return status === undefined;
+    case "reasoning": return status === null || isOneOf(outputItemStatusResourceValues, status);
+    case "message":
+    case "web_search_call": return isOneOf(outputItemStatusResourceValues, status);
+    default: return isOneOf(functionCallStatusResourceValues, status);
   }
 }
 
 export function projectSessionItem(value: unknown, invalid: () => never): SessionItem {
+  const fields = isRecord(value) ? variantFields(sessionTurnItemResourceFields, value.type) : undefined;
   if (
-    !isRecord(value) ||
-    typeof value.id !== "string" || value.id === "" ||
-    typeof value.turn_id !== "string" || value.turn_id === "" ||
-    typeof value.type !== "string" || !knownItemTypes.has(value.type) ||
-    !onlyFields(value, itemVariantFields(value.type))
+    !isRecord(value) || fields === undefined || !exactFields(value, fields) ||
+    !nonemptyString(value.id) || !nonemptyString(value.turn_id) || !validItemStatus(value.type, value.status)
   ) return invalid();
-  if (value.type !== "agent_message" && !(
-    (value.type === "reasoning" && (value.status === undefined || value.status === null)) ||
-    (typeof value.status === "string" && itemStatuses.has(value.status) && !(value.type === "reasoning" && value.status === "failed"))
-  )) return invalid();
 
-  const projected: Record<string, unknown> = {
-    id: value.id,
-    turn_id: value.turn_id,
-    type: value.type,
-    ...(hasOwn(value, "status") ? { status: value.status } : {}),
-  };
+  const item: Record<string, unknown> = { ...value };
   switch (value.type) {
     case "message":
       if (
-        (value.role !== "user" && value.role !== "assistant") || !Array.isArray(value.content) ||
-        !(value.phase === undefined || value.phase === null || value.phase === "commentary" || value.phase === "final_answer")
+        !isOneOf(sessionMessageRoleResourceValues, value.role) || !Array.isArray(value.content) ||
+        !(value.phase === null || isOneOf(messagePhaseResourceValues, value.phase))
       ) return invalid();
-      projected.role = value.role;
-      projected.content = Array.from(value.content, (part) => projectItemContent(part, invalid));
-      // Current Cores send null when there is no phase; older ones omit it.
-      if (value.phase !== undefined) projected.phase = value.phase;
+      item.content = Array.from(value.content, (part) => projectItemContent(part, invalid));
       break;
     case "command_execution":
       if (
-        typeof value.command !== "string" ||
-        !(value.cwd === undefined || value.cwd === null || typeof value.cwd === "string") ||
-        !validOptionalInteger(value.duration_ms) || !validOptionalSafeInteger(value.exit_code)
+        typeof value.command !== "string" || !nullableString(value.cwd) ||
+        !(value.duration_ms === null || isNonnegativeInteger(value.duration_ms)) ||
+        !(value.exit_code === null || Number.isSafeInteger(value.exit_code))
       ) return invalid();
-      projected.command = value.command;
-      for (const field of ["cwd", "duration_ms", "exit_code", "output"] as const) {
-        if (hasOwn(value, field)) projected[field] = value[field];
-      }
       break;
     case "mcp_call":
-      if (
-        typeof value.server_label !== "string" || value.server_label === "" ||
-        typeof value.name !== "string" || value.name === "" ||
-        !hasOwn(value, "arguments") || !hasOwn(value, "output") || !hasOwn(value, "error")
-      ) return invalid();
-      projected.server_label = value.server_label;
-      projected.name = value.name;
-      projected.arguments = value.arguments;
-      projected.output = value.output;
-      projected.error = value.error;
+      if (!nonemptyString(value.server_label) || !nonemptyString(value.name)) return invalid();
       break;
     case "function_call":
-      if (
-        typeof value.call_id !== "string" || value.call_id === "" ||
-        typeof value.name !== "string" || value.name === "" || !hasOwn(value, "arguments")
-      ) return invalid();
-      projected.call_id = value.call_id;
-      projected.name = value.name;
-      projected.arguments = value.arguments;
+      if (!nonemptyString(value.call_id) || !nonemptyString(value.name)) return invalid();
       break;
     case "function_call_output":
-      if (typeof value.call_id !== "string" || value.call_id === "" || !validOptionalInteger(value.duration_ms)) {
-        return invalid();
-      }
-      projected.call_id = value.call_id;
-      for (const field of ["output", "error", "duration_ms"] as const) {
-        if (hasOwn(value, field)) projected[field] = value[field];
-      }
+      if (!nonemptyString(value.call_id)) return invalid();
       break;
     case "web_search_call":
-      // OpenAgentCore omits action when the runtime has not reported one yet.
-      if (hasOwn(value, "action")) projected.action = projectWebSearchAction(value.action, invalid);
+      if (value.action !== null) item.action = projectWebSearchAction(value.action, invalid);
       break;
     case "reasoning":
       if (!Array.isArray(value.summary)) return invalid();
-      projected.summary = value.summary.map((part) => {
-        if (!isRecord(part) || !exactFields(part, new Set(["type", "text"])) || part.type !== "summary_text" || typeof part.text !== "string") return invalid();
+      item.summary = value.summary.map((part) => {
+        if (!isRecord(part) || !exactFields(part, summaryTextResourceFields) || part.type !== "summary_text" || typeof part.text !== "string") return invalid();
         return { type: "summary_text", text: part.text };
       });
       break;
     case "create_subagent_call":
-      if (!nonemptyString(value.agent_id) || !optionalString(value.model) || !optionalString(value.reasoning_effort)) return invalid();
-      projected.agent_id = value.agent_id;
-      projected.content = projectCoordinationContent(value.content, invalid);
-      for (const field of ["model", "reasoning_effort"]) {
-        if (hasOwn(value, field)) projected[field] = value[field];
-      }
-      break;
-    case "agent_message":
-    case "send_subagent_input_call":
-    case "resume_subagent_call":
-    case "interrupt_subagent_call":
-    case "close_subagent_call":
-      if (!nonemptyString(value.sender_agent_id) || !nonemptyString(value.recipient_agent_id)) return invalid();
-      projected.sender_agent_id = value.sender_agent_id;
-      projected.recipient_agent_id = value.recipient_agent_id;
-      if (value.type === "agent_message" || value.type === "send_subagent_input_call") {
-        projected.content = projectCoordinationContent(value.content, invalid);
-      }
+      if (!nonemptyString(value.agent_id) || !nullableString(value.model) || !nullableString(value.reasoning_effort)) return invalid();
+      item.content = projectCoordinationContent(value.content, invalid);
       break;
     case "wait_for_subagents_call":
       if (!nonemptyString(value.sender_agent_id) || !Array.isArray(value.recipient_agent_ids) || !value.recipient_agent_ids.every(nonemptyString)) return invalid();
-      projected.sender_agent_id = value.sender_agent_id;
-      projected.recipient_agent_ids = [...value.recipient_agent_ids];
+      item.recipient_agent_ids = [...value.recipient_agent_ids];
       break;
+    default:
+      // agent_message, send_subagent_input_call and the Subagent control calls.
+      if (!nonemptyString(value.sender_agent_id) || !nonemptyString(value.recipient_agent_id)) return invalid();
+      if (hasOwn(value, "content")) item.content = projectCoordinationContent(value.content, invalid);
   }
-  return projected as unknown as SessionItem;
+  return item as unknown as SessionItem;
 }
 
 export function projectAgentTurn(value: unknown, expectedSessionId: string, invalid: () => never, expectedTurnId?: string): AgentTurn {
   if (
-    !isRecord(value) || !onlyFields(value, turnFields) ||
-    typeof value.id !== "string" || value.id === "" ||
+    !isRecord(value) || !exactFields(value, turnResourceFields) ||
+    !nonemptyString(value.id) ||
     (expectedTurnId !== undefined && !sameResourceId(value.id, expectedTurnId)) ||
-    typeof value.agent_id !== "string" || value.agent_id === "" ||
+    !nonemptyString(value.agent_id) ||
     // A child Turn carries the Session's Agent ID; subagent_id names the child.
-    !(value.subagent_id === undefined || value.subagent_id === null || nonemptyString(value.subagent_id)) ||
+    !(value.subagent_id === null || nonemptyString(value.subagent_id)) ||
     typeof value.session_id !== "string" || !sameResourceId(value.session_id, expectedSessionId) ||
-    value.object !== "agent.session.turn" || typeof value.status !== "string" || !turnStatuses.has(value.status) ||
+    value.object !== "agent.session.turn" || !isOneOf(turnStatusResourceValues, value.status) ||
     !isNonnegativeInteger(value.created_at) ||
     !(value.started_at === null || isNonnegativeInteger(value.started_at)) ||
-    !(value.completed_at === null || isNonnegativeInteger(value.completed_at))
+    !(value.completed_at === null || isNonnegativeInteger(value.completed_at)) ||
+    !(value.error === null || (
+      isRecord(value.error) && exactFields(value.error, sessionTurnErrorResourceFields) &&
+      isOneOf(sessionTurnErrorCodeResourceValues, value.error.code) && typeof value.error.message === "string"
+    ))
   ) return invalid();
-  let error: AgentTurn["error"] = null;
-  if (value.error !== null) {
-    if (
-      !isRecord(value.error) || !exactFields(value.error, turnErrorFields) ||
-      value.error.code !== "internal_error" || typeof value.error.message !== "string"
-    ) return invalid();
-    error = { code: "internal_error", message: value.error.message };
-  }
   return {
     id: value.id,
-    agent_id: value.agent_id,
-    ...(hasOwn(value, "subagent_id") ? { subagent_id: value.subagent_id as string | null } : {}),
-    session_id: value.session_id,
     object: "agent.session.turn",
-    status: value.status as AgentTurn["status"],
+    session_id: value.session_id,
+    agent_id: value.agent_id,
+    subagent_id: value.subagent_id,
+    status: value.status,
     created_at: value.created_at,
     started_at: value.started_at,
     completed_at: value.completed_at,
-    error,
+    error: value.error === null ? null : { code: value.error.code as SessionTurnErrorCodeResource, message: value.error.message as string },
     usage: projectTokenUsage(value.usage, invalid),
   };
 }
@@ -226,8 +136,8 @@ function nonemptyString(value: unknown): value is string {
   return typeof value === "string" && value !== "";
 }
 
-function optionalString(value: unknown): boolean {
-  return value === undefined || value === null || typeof value === "string";
+function nullableString(value: unknown): boolean {
+  return value === null || typeof value === "string";
 }
 
 function projectCoordinationContent(value: unknown, invalid: () => never): ItemContent[] {
@@ -235,33 +145,21 @@ function projectCoordinationContent(value: unknown, invalid: () => never): ItemC
   return value.map((part) => {
     if (!isRecord(part)) return invalid();
     if (part.type === "output_text") return projectItemContent(part, invalid);
-    if (part.type !== "encrypted_content" || !exactFields(part, new Set(["type", "encrypted_content"])) || typeof part.encrypted_content !== "string") return invalid();
+    if (part.type !== "encrypted_content" || !exactFields(part, encryptedContentResourceFields) || typeof part.encrypted_content !== "string") return invalid();
     return { type: "encrypted_content", encrypted_content: part.encrypted_content };
   });
 }
 
-export function validateHistoryPageOptions(options?: PageOptions): void {
-  if (options?.limit !== undefined && (!Number.isSafeInteger(options.limit) || options.limit < 1 || options.limit > 100)) {
-    throw new TypeError("History list limit must be an integer from 1 through 100.");
-  }
-  if (options?.order !== undefined && options.order !== "asc" && options.order !== "desc") {
-    throw new TypeError("History list order must be asc or desc.");
-  }
-  if (options?.after !== undefined && !nonemptyString(options.after)) {
-    throw new TypeError("History list cursor must be a nonempty resource ID.");
-  }
-}
-
 export function projectHistoryPage<T extends { id: string }>(
   value: unknown,
   options: PageOptions | undefined,
   project: (entry: unknown) => T,
   invalid: () => never,
 ): ListPage<T> {
-  if (!isRecord(value) || !onlyFields(value, new Set(["data", "has_more", "object", "first_id", "last_id"])) ||
+  // Item and Turn lists share one list envelope.
+  if (!isRecord(value) || !exactFields(value, sessionItemListResourceFields) || value.object !== "list" ||
     !Array.isArray(value.data) || typeof value.has_more !== "boolean" ||
-    value.data.length > (options?.limit ?? 20) || (value.has_more && value.data.length === 0) ||
-    (hasOwn(value, "object") && value.object !== "list")
+    value.data.length > (options?.limit ?? 20) || (value.has_more && value.data.length === 0)
   ) return invalid();
   const data = value.data.map(project);
   if (data.some((entry, index) =>
@@ -270,11 +168,6 @@ export function projectHistoryPage<T extends { id: string }>(
   )) return invalid();
   const first = data[0]?.id ?? null;
   const last = data[data.length - 1]?.id ?? null;
-  if ((hasOwn(value, "first_id") && value.first_id !== first) || (hasOwn(value, "last_id") && value.last_id !== last)) return invalid();
-  return {
-    data, has_more: value.has_more,
-    ...(hasOwn(value, "object") ? { object: "list" as const } : {}),
-    ...(hasOwn(value, "first_id") ? { first_id: first } : {}),
-    ...(hasOwn(value, "last_id") ? { last_id: last } : {}),
-  };
+  if (value.first_id !== first || value.last_id !== last) return invalid();
+  return { object: "list", data, has_more: value.has_more, first_id: first, last_id: last };
 }
diff --git a/packages/agents-client/src/history-recovery.test.ts b/packages/agents-client/src/history-recovery.test.ts
index c7c95ddf9..a63d5f438 100644
--- a/packages/agents-client/src/history-recovery.test.ts
+++ b/packages/agents-client/src/history-recovery.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from "vitest";
 import { OpenAIAgentsClient } from "./client";
-import type { AgentTurn, PageOptions, SessionEvent } from "./types";
+import type { AgentTurn, SessionEvent } from "./types";
 
 const usage = {
   input_tokens: 7226, output_tokens: 7, total_tokens: 7233,
@@ -22,7 +22,7 @@ function session() {
     environment: { type: "none" },
     agent: {
       id: "root", model: "model", name: null, instructions: null,
-      multi_agent: { enabled: true, max_concurrent_subagents: null }, reasoning: {},
+      multi_agent: { enabled: true, max_concurrent_subagents: null }, reasoning: { effort: null, summary: null },
       service_tier: "auto", text: { format: { type: "text" }, verbosity: "medium" }, tools: [],
     },
   };
@@ -32,6 +32,12 @@ function json(value: unknown) {
   return new Response(JSON.stringify(value), { headers: { "Content-Type": "application/json" } });
 }
 
+function page(data: Record<string, unknown>[], fields: Record<string, unknown> = {}) {
+  return {
+    object: "list", data, first_id: data[0]?.id ?? null, last_id: data[data.length - 1]?.id ?? null, has_more: false, ...fields,
+  };
+}
+
 function sse(events: unknown[]) {
   return new Response(events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join(""), {
     headers: { "Content-Type": "text/event-stream" },
@@ -39,7 +45,8 @@ function sse(events: unknown[]) {
 }
 
 function turnEvent(value = turn(), type = "agent.session.turn.completed") {
-  return { type, event_id: "event", session_id: "session", turn_id: value.id, turn: value };
+  const terminal = /\.(completed|failed|cancelled)$/.test(type) ? { usage: value.usage } : {};
+  return { type, event_id: "event", session_id: "session", turn_id: value.id, turn: value, ...terminal };
 }
 
 function itemEvent(item: Record<string, unknown>) {
@@ -70,7 +77,7 @@ describe("history and live event projections", () => {
     const value = turn({ agent_id: "root", subagent_id: subagentId, usage });
     const client = new OpenAIAgentsClient({ fetch: vi.fn()
       .mockResolvedValueOnce(json(value))
-      .mockResolvedValueOnce(json({ data: [value], has_more: false }))
+      .mockResolvedValueOnce(json(page([value])))
       .mockResolvedValueOnce(sse([turnEvent(value)])) });
     expect(await client.retrieveTurn("session", "turn")).toEqual(value);
     expect((await client.listTurns("session")).data).toEqual([value]);
@@ -79,36 +86,6 @@ describe("history and live event projections", () => {
     expect(received[0]?.turn).toEqual(value);
   });
 
-  it("accepts the pinned optional subagent_id omission without inventing an identity", async () => {
-    const { subagent_id: _omitted, ...value } = turn();
-    const client = new OpenAIAgentsClient({ fetch: async () => json(value) });
-    expect(await client.retrieveTurn("session", "turn")).toEqual(value);
-  });
-
-  it("accepts the official child Turn shape and the earlier child-owned agent_id", async () => {
-    for (const value of [turn({ agent_id: "root", subagent_id: "child" }), turn({ agent_id: "child", subagent_id: "child" })]) {
-      const client = new OpenAIAgentsClient({ fetch: vi.fn()
-        .mockResolvedValueOnce(json(value))
-        .mockResolvedValueOnce(json({ object: "list", data: [value], first_id: "turn", last_id: "turn", has_more: false })) });
-      expect(await client.retrieveTurn("session", "turn")).toEqual(value);
-      expect((await client.listTurns("session")).data).toEqual([value]);
-    }
-  });
-
-  // Earlier Core releases streamed child Turns; current Core streams root work only.
-  it("retains completed child snapshots first observed in an earlier creation stream", async () => {
-    const value = turn({ agent_id: "root", subagent_id: "child" });
-    const created = { type: "agent.session.created", event_id: "created", session: session() };
-    const client = new OpenAIAgentsClient({ fetch: async () => sse([
-      created, turnEvent(value, "agent.session.turn.created"), turnEvent(value),
-    ]) });
-    const received: SessionEvent[] = [];
-    await client.createSessionStream({ environment: { type: "none" } }, "key", {
-      onSession: () => undefined, onEvent: (event) => received.push(event),
-    });
-    expect(received.map((event) => event.turn).filter(Boolean)).toEqual([value, value]);
-  });
-
   it("does not weaken root creation snapshots or immutable root identity", async () => {
     for (const value of [turn(), turn({ status: "queued", agent_id: "other" })]) {
       const client = new OpenAIAgentsClient({ fetch: async () => sse([
@@ -123,7 +100,7 @@ describe("history and live event projections", () => {
 
   it("projects supported coordination/reasoning Items identically through history and SSE", async () => {
     const client = new OpenAIAgentsClient({ fetch: vi.fn()
-      .mockResolvedValueOnce(json({ data: items, has_more: false }))
+      .mockResolvedValueOnce(json(page(items)))
       .mockResolvedValueOnce(sse(items.map(itemEvent))) });
     const saved = (await client.listItems("session")).data;
     const live: SessionEvent[] = [];
@@ -145,7 +122,7 @@ describe("history and live event projections", () => {
   ])("rejects malformed or private Item fields in both paths: $type", async (item) => {
     const onEvent = vi.fn();
     const client = new OpenAIAgentsClient({ fetch: vi.fn()
-      .mockResolvedValueOnce(json({ data: [item], has_more: false }))
+      .mockResolvedValueOnce(json(page([item])))
       .mockResolvedValueOnce(sse([itemEvent(item)])) });
     await expect(client.listItems("session")).rejects.toMatchObject({ code: "invalid_history_resource" });
     await expect(client.streamEvents("session", { onEvent })).rejects.toMatchObject({ code: "invalid_stream_event" });
@@ -156,6 +133,7 @@ describe("history and live event projections", () => {
     turn({ session_id: "foreign" }), turn({ id: "other" }),
     turn({ agent_id: "", subagent_id: "child" }), turn({ subagent_id: "" }), turn({ subagent_id: 1 }),
     turn({ usage: { input_tokens: 1 } }), turn({ native_session_id: "private" }),
+    (({ subagent_id: _omitted, ...value }) => value)(turn()),
   ])("rejects malformed or mismatched Turn retrieval", async (value) => {
     const client = new OpenAIAgentsClient({ fetch: async () => json(value) });
     await expect(client.retrieveTurn("session", "turn")).rejects.toMatchObject({ code: "invalid_history_resource" });
@@ -173,7 +151,7 @@ describe("history and live event projections", () => {
     const completed = turn();
     const measured = turn({ usage });
     const requests: string[] = [];
-    const responses = [sse([turnEvent(completed)]), sse([turnEvent(measured)]), json(measured), json({ data: [measured], has_more: false })];
+    const responses = [sse([turnEvent(completed)]), sse([turnEvent(measured)]), json(measured), json(page([measured]))];
     const client = new OpenAIAgentsClient({ fetch: async (input, init) => {
       requests.push(String(input));
       expect(new Headers(init?.headers).has("Last-Event-ID")).toBe(false);
@@ -197,9 +175,9 @@ describe("history and live event projections", () => {
 describe("history pagination", () => {
   it.each(["asc", "desc"] as const)("recovers every saved Item across %s pages without changing snapshots", async (order) => {
     const snapshots = [
-      { id: "input", turn_id: "turn", type: "message", status: "completed", role: "user", content: [{ type: "input_text", text: "Question" }] },
+      { id: "input", turn_id: "turn", type: "message", status: "completed", role: "user", phase: null, content: [{ type: "input_text", text: "Question" }] },
       { id: "answer", turn_id: "turn", type: "message", status: "incomplete", role: "assistant", phase: "commentary", content: [{ type: "output_text", text: "Retained partial answer" }] },
-      { id: "command", turn_id: "turn", type: "command_execution", status: "incomplete", command: "work", output: "Retained output", exit_code: null },
+      { id: "command", turn_id: "turn", type: "command_execution", status: "incomplete", command: "work", cwd: null, output: "Retained output", exit_code: null, duration_ms: null },
     ];
     const expected = order === "asc" ? snapshots : [...snapshots].reverse();
     const client = new OpenAIAgentsClient({ fetch: async (input) => {
@@ -207,7 +185,7 @@ describe("history pagination", () => {
       expect(query.get("order")).toBe(order);
       const after = query.get("after");
       const index = after === null ? 0 : expected.findIndex((item) => item.id === after) + 1;
-      return json({ data: expected.slice(index, index + 1), has_more: index + 1 < expected.length });
+      return json(page(expected.slice(index, index + 1), { has_more: index + 1 < expected.length }));
     } });
     const recovered = [];
     let after: string | undefined;
@@ -220,7 +198,7 @@ describe("history pagination", () => {
     expect(recovered).toEqual(expected);
   });
 
-  it.each(["asc", "desc"] as const)("keeps the %s cursor and optional page metadata", async (order) => {
+  it.each(["asc", "desc"] as const)("keeps the %s cursor and page metadata", async (order) => {
     const calls: string[] = [];
     const client = new OpenAIAgentsClient({ fetch: async (input) => {
       calls.push(String(input));
@@ -233,13 +211,13 @@ describe("history pagination", () => {
   });
 
   it.each([
-    {}, { data: [], has_more: true }, { data: [], has_more: "false" },
-    { data: [turn(), turn()], has_more: false },
-    { data: [turn()], has_more: false, first_id: "wrong" },
-    { data: [turn()], has_more: false, last_id: null },
-    { data: [], has_more: false, object: "turn.list" },
-    { data: [turn({ session_id: "foreign" })], has_more: false },
-    { data: [turn()], has_more: false, internal_cursor: "private" },
+    {}, page([], { has_more: true }), page([], { has_more: "false" }),
+    page([turn(), turn()]),
+    page([turn()], { first_id: "wrong" }),
+    page([turn()], { last_id: null }),
+    page([], { object: "turn.list" }),
+    page([turn({ session_id: "foreign" })]),
+    page([turn()], { internal_cursor: "private" }),
   ])("rejects malformed Turn pages", async (page) => {
     const client = new OpenAIAgentsClient({ fetch: async () => json(page) });
     await expect(client.listTurns("session")).rejects.toMatchObject({ code: "invalid_history_resource" });
@@ -247,19 +225,11 @@ describe("history pagination", () => {
 
   it("rejects cursor repetition, overfull pages and invalid Item envelopes", async () => {
     const client = new OpenAIAgentsClient({ fetch: vi.fn()
-      .mockResolvedValueOnce(json({ data: [turn()], has_more: true }))
-      .mockResolvedValueOnce(json({ data: [turn(), turn({ id: "turn-2" })], has_more: false }))
-      .mockResolvedValueOnce(json({ data: [items[0]], has_more: false, last_id: "other" })) });
+      .mockResolvedValueOnce(json(page([turn()], { has_more: true })))
+      .mockResolvedValueOnce(json(page([turn(), turn({ id: "turn-2" })])))
+      .mockResolvedValueOnce(json(page([items[0]!], { last_id: "other" }))) });
     await expect(client.listTurns("session", { after: "turn" })).rejects.toMatchObject({ code: "invalid_history_resource" });
     await expect(client.listTurns("session", { limit: 1 })).rejects.toMatchObject({ code: "invalid_history_resource" });
     await expect(client.listItems("session")).rejects.toMatchObject({ code: "invalid_history_resource" });
   });
-
-  it.each([{ limit: 0 }, { limit: 101 }, { limit: 1.5 }, { order: "newest" }, { after: "" }])("rejects invalid options before HTTP", async (options) => {
-    const fetch = vi.fn();
-    const client = new OpenAIAgentsClient({ fetch });
-    await expect(client.listItems("session", options as PageOptions)).rejects.toBeInstanceOf(TypeError);
-    await expect(client.listTurns("session", options as PageOptions)).rejects.toBeInstanceOf(TypeError);
-    expect(fetch).not.toHaveBeenCalled();
-  });
 });
diff --git a/packages/agents-client/src/index.ts b/packages/agents-client/src/index.ts
index 669bdcd4b..18711e960 100644
--- a/packages/agents-client/src/index.ts
+++ b/packages/agents-client/src/index.ts
@@ -10,7 +10,7 @@ export * from "./core-metrics";
 export type { CoreClientOptions } from "./core-request";
 export { isEnvironmentTemplateName, isRecognizedEnvironmentTemplate } from "./environment-template-projection";
 export { isOpenAIHostedSessionEnvironment } from "./session-environment-projection";
-export { compareSkillVersionNumbers, isSkillId, isSkillUploadPath, isSkillVersionId, isSkillVersionNumber, maxSkillUploadFiles } from "./skill-projection";
+export { compareSkillVersionNumbers, isSkillId, isSkillUploadPath, isSkillVersionId, isSkillVersionNumber } from "./skill-projection";
 export { AdminClient } from "./admin-client";
 // Skill and SkillVersion come from ./types; the admin projections use the same shapes.
 export type { AdminClientOptions, AdminProject, CreateAdminProjectInput, RenameAdminProjectInput, AdminAPIKey, AdminIssuedAPIKey, IssueAdminAPIKeyInput, AdminPage, AdminDeleted, SessionArtifact, AdminContent, AdminResourceType, AdminKeyProvenance, AdminResourceOwner, AdminWriteOperation, AdminWriteOperationOptions, AdminWriteOperationPage, AdminSummaryOptions, AdminSummaryEntry, AdminSummary, AdminRuntimeObservation, AdminAuditOptions, AdminAuditEntry, AdminAuditPage, ExecutorCredential, ExecutorConnection, ExecutorCredentialList, IssueExecutorCredentialInput, IssuedExecutorCredential, CoreInstallation, CoreInstallationConfiguration, CoreInstallationSetting, CoreAddressBindings } from "./admin-types";
diff --git a/packages/agents-client/src/protocol-types.test.ts b/packages/agents-client/src/protocol-types.test.ts
index 7756b9ce1..39cc30384 100644
--- a/packages/agents-client/src/protocol-types.test.ts
+++ b/packages/agents-client/src/protocol-types.test.ts
@@ -122,7 +122,7 @@ describe("Parsar dadf64a7 ordered Session input batch", () => {
       "agent.session.input.cancel",
       "agent.session.input.tool_result",
     ]);
-    expect(message.input.map((input) => input.content.map((part) => part.text).join(""))).toEqual([
+    expect(message.input.map((input) => input.content.map((part) => ("text" in part ? part.text : "")).join(""))).toEqual([
       "First message",
       "Second message",
     ]);
@@ -299,7 +299,7 @@ describe("Parsar 182d333d Vault Credentials and Session attachments", () => {
   });
 
   it("pins the owning Vault attachment on the public Session resource", () => {
-    const session = vaultCredentials182d.session as AgentSession;
+    const session = vaultCredentials182d.session as unknown as AgentSession;
     expect(session.vault_ids).toEqual([vaultCredentials182d.vault_list.data[0]?.id]);
     expect(session.environment).toEqual({ type: "none" });
   });
diff --git a/packages/agents-client/src/response-projection.ts b/packages/agents-client/src/response-projection.ts
index 35bd50a32..0a1f6c7fc 100644
--- a/packages/agents-client/src/response-projection.ts
+++ b/packages/agents-client/src/response-projection.ts
@@ -1,20 +1,41 @@
 const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const nilUuid = "00000000-0000-0000-0000-000000000000";
 
-export function exactFields(value: Record<string, unknown>, fields: Set<string>): boolean {
+/** Generated schema field names, or a Set the client defines. */
+export type FieldNames = readonly string[] | ReadonlySet<string>;
+
+function hasField(fields: FieldNames, key: string): boolean {
+  return "has" in fields ? fields.has(key) : fields.includes(key);
+}
+
+export function exactFields(value: object, fields: FieldNames): boolean {
   const keys = Object.keys(value);
-  return keys.length === fields.size && keys.every((key) => fields.has(key));
+  return keys.length === ("size" in fields ? fields.size : fields.length) && keys.every((key) => hasField(fields, key));
+}
+
+export function onlyFields(value: object, fields: FieldNames): boolean {
+  return Object.keys(value).every((key) => hasField(fields, key));
+}
+
+/** Only the schema's fields, with every required one present. */
+export function schemaFields(value: object, fields: FieldNames, required: readonly string[]): boolean {
+  return onlyFields(value, fields) && required.every((field) => hasOwn(value, field));
+}
+
+/** The field names of a generated union variant, or undefined for a tag the schema does not define. */
+export function variantFields(variants: Readonly<Record<string, readonly string[]>>, tag: unknown): readonly string[] | undefined {
+  return typeof tag === "string" && Object.prototype.hasOwnProperty.call(variants, tag) ? variants[tag] : undefined;
 }
 
-export function onlyFields(value: Record<string, unknown>, fields: Set<string>): boolean {
-  return Object.keys(value).every((key) => fields.has(key));
+export function isOneOf<T extends string>(values: readonly T[], value: unknown): value is T {
+  return (values as readonly unknown[]).includes(value);
 }
 
 export function isRecord(value: unknown): value is Record<string, unknown> {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
-export function hasOwn(value: Record<string, unknown>, field: string): boolean {
+export function hasOwn(value: object, field: string): boolean {
   return Object.prototype.hasOwnProperty.call(value, field);
 }
 
diff --git a/packages/agents-client/src/session-environment-projection.ts b/packages/agents-client/src/session-environment-projection.ts
index 33c06bfd2..a1577f81d 100644
--- a/packages/agents-client/src/session-environment-projection.ts
+++ b/packages/agents-client/src/session-environment-projection.ts
@@ -1,12 +1,7 @@
 import { exactFields, isRecord } from "./response-projection";
+import { environmentPackagesResourceFields, environmentResourceOpenaiHostedFields, networkPolicyResourceFields } from "./generated/public-api";
 import type { OpenAIHostedAgentEnvironment } from "./types";
 
-const hostedSessionEnvironmentFields = new Set([
-  "type", "id", "capability_directories", "network", "packages", "files", "plugins", "skills",
-]);
-const environmentNetworkFields = new Set(["access", "allowed_domains"]);
-const environmentPackagesFields = new Set(["npm", "python", "system"]);
-
 function strings(list: unknown): list is string[] {
   return Array.isArray(list) && list.every((entry) => typeof entry === "string");
 }
@@ -27,14 +22,14 @@ export function projectOpenAIHostedSessionEnvironment(value: unknown): OpenAIHos
   const network = value.network;
   const packages = value.packages;
   if (
-    !exactFields(value, hostedSessionEnvironmentFields) ||
+    !exactFields(value, environmentResourceOpenaiHostedFields) ||
     typeof value.id !== "string" || value.id.trim() === "" ||
     !strings(value.capability_directories) ||
-    !isRecord(network) || !exactFields(network, environmentNetworkFields) ||
+    !isRecord(network) || !exactFields(network, networkPolicyResourceFields) ||
     !strings(network.allowed_domains) ||
     !(((network.access === "enabled" || network.access === "disabled") && network.allowed_domains.length === 0) ||
       (network.access === "restricted" && network.allowed_domains.length > 0)) ||
-    !isRecord(packages) || !exactFields(packages, environmentPackagesFields) ||
+    !isRecord(packages) || !exactFields(packages, environmentPackagesResourceFields) ||
     !strings(packages.npm) || !strings(packages.python) || !strings(packages.system) ||
     !records(value.files) || !records(value.plugins) || !records(value.skills)
   ) return null;
diff --git a/packages/agents-client/src/skill-projection.ts b/packages/agents-client/src/skill-projection.ts
index ed44cb0c1..c2e745e0e 100644
--- a/packages/agents-client/src/skill-projection.ts
+++ b/packages/agents-client/src/skill-projection.ts
@@ -9,16 +9,13 @@ import type {
   SkillVersionDeleted,
   SkillVersionList,
 } from "./types";
-import { exactFields, hasOwn, isNonnegativeInteger, isRecord, onlyFields } from "./response-projection";
+import { exactFields, isNonnegativeInteger, isRecord } from "./response-projection";
+import {
+  deletedSkillResourceFields, deletedSkillVersionResourceFields, skillListResourceFields, skillResourceFields, skillVersionResourceFields,
+} from "./generated/public-api";
 
 type Invalid = (message: string) => never;
 
-const skillFields = new Set(["id", "object", "created_at", "name", "description", "default_version", "latest_version"]);
-const skillVersionFields = new Set(["id", "object", "created_at", "skill_id", "version", "name", "description"]);
-const skillListFields = new Set(["object", "data", "has_more", "first_id", "last_id"]);
-const skillDeletedFields = new Set(["id", "object", "deleted"]);
-const skillVersionDeletedFields = new Set(["id", "object", "deleted", "version"]);
-
 const skillIdPattern = /^skill_[A-Za-z0-9][A-Za-z0-9_-]{0,127}$/;
 const skillVersionIdPattern = /^skillver_[A-Za-z0-9][A-Za-z0-9_-]{0,127}$/;
 // Version numbers are positive decimal strings without leading zeros ("1", "2").
@@ -27,17 +24,9 @@ const skillVersionNumberPattern = /^[1-9][0-9]{0,18}$/;
 const controlCharacterPattern = /[\u0000-\u001f\u007f-\u009f]/;
 const loneSurrogatePattern = /[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/;
 
-/** Core accepts at most 500 folder files per upload. */
-export const maxSkillUploadFiles = 500;
-/** A generous bound for one downloaded bundle; Core stores at most 5 MiB per version. */
+/** Bounds the download buffer a Content-Length header can make the client allocate; Core stores at most 5 MiB per version. */
 export const maxSkillContentBytes = 64 * 1024 * 1024;
 const defaultSkillPageLimit = 20;
-const maxUploadFilenameBytes = 1024;
-const maxUploadPathBytes = 4096;
-
-function utf8Length(value: string): number {
-  return new TextEncoder().encode(value).length;
-}
 
 export function isSkillId(value: unknown): value is string {
   return typeof value === "string" && skillIdPattern.test(value);
@@ -64,7 +53,7 @@ export function compareSkillVersionNumbers(left: string, right: string): number
  */
 export function isSkillUploadPath(value: unknown): value is string {
   if (typeof value !== "string" || value.length === 0) return false;
-  if (utf8Length(value) > maxUploadPathBytes || loneSurrogatePattern.test(value)) return false;
+  if (loneSurrogatePattern.test(value)) return false;
   if (value.includes("\\") || controlCharacterPattern.test(value)) return false;
   const segments = value.split("/");
   if (segments.length < 2) return false;
@@ -72,7 +61,7 @@ export function isSkillUploadPath(value: unknown): value is string {
 }
 
 function validZipFilename(value: unknown): value is string {
-  if (typeof value !== "string" || value.length === 0 || utf8Length(value) > maxUploadFilenameBytes) return false;
+  if (typeof value !== "string" || value.length === 0) return false;
   return !loneSurrogatePattern.test(value) && !controlCharacterPattern.test(value) && !/[\\/]/.test(value);
 }
 
@@ -93,12 +82,6 @@ export function validateSkillListOptions(
   if (options?.after !== undefined && !validCursor(options.after)) {
     throw new TypeError(`${label} list cursor is not a valid resource ID.`);
   }
-  if (options?.limit !== undefined && (!Number.isSafeInteger(options.limit) || options.limit < 0 || options.limit > 100)) {
-    throw new TypeError(`${label} list limit must be an integer from 0 through 100.`);
-  }
-  if (options?.order !== undefined && options.order !== "asc" && options.order !== "desc") {
-    throw new TypeError(`${label} list order must be asc or desc.`);
-  }
 }
 
 /**
@@ -116,8 +99,8 @@ export function skillUploadBody(input: SkillUploadInput, setDefault?: boolean):
     }
     body.append("files", input.file, input.filename);
   } else if (isRecord(input) && input.kind === "directory") {
-    if (!Array.isArray(input.files) || input.files.length === 0 || input.files.length > maxSkillUploadFiles) {
-      throw new TypeError(`A Skill folder upload requires 1 through ${maxSkillUploadFiles} files.`);
+    if (!Array.isArray(input.files) || input.files.length === 0) {
+      throw new TypeError("A Skill folder upload requires at least one file.");
     }
     const paths = new Set<string>();
     for (const entry of input.files) {
@@ -137,7 +120,7 @@ export function skillUploadBody(input: SkillUploadInput, setDefault?: boolean):
 
 export function projectSkill(value: unknown, invalid: Invalid, expectedId?: string): Skill {
   const message = "OpenAgentCore returned an invalid Skill.";
-  if (!isRecord(value) || !exactFields(value, skillFields)) return invalid(message);
+  if (!isRecord(value) || !exactFields(value, skillResourceFields)) return invalid(message);
   if (
     !isSkillId(value.id) || (expectedId !== undefined && value.id !== expectedId) ||
     value.object !== "skill" ||
@@ -165,7 +148,7 @@ export function projectSkillVersion(
   expectedVersion?: string,
 ): SkillVersion {
   const message = "OpenAgentCore returned an invalid Skill version.";
-  if (!isRecord(value) || !exactFields(value, skillVersionFields)) return invalid(message);
+  if (!isRecord(value) || !exactFields(value, skillVersionResourceFields)) return invalid(message);
   if (
     !isSkillVersionId(value.id) ||
     value.object !== "skill.version" ||
@@ -195,7 +178,7 @@ function projectSkillPage<T extends { id: string }>(
   message: string,
 ): { object: "list"; data: T[]; has_more: boolean; first_id: string | null; last_id: string | null } {
   if (
-    !isRecord(value) || !onlyFields(value, skillListFields) ||
+    !isRecord(value) || !exactFields(value, skillListResourceFields) ||
     value.object !== "list" || !Array.isArray(value.data) || typeof value.has_more !== "boolean"
   ) return invalid(message);
   const limit = options?.limit ?? defaultSkillPageLimit;
@@ -206,8 +189,7 @@ function projectSkillPage<T extends { id: string }>(
   const lastId = data[data.length - 1]?.id ?? null;
   if (
     new Set(data.map((entry) => entry.id)).size !== data.length ||
-    (hasOwn(value, "first_id") && value.first_id !== firstId) ||
-    (hasOwn(value, "last_id") && value.last_id !== lastId) ||
+    value.first_id !== firstId || value.last_id !== lastId ||
     // Limit 0 returns an empty page whose has_more reports whether entries follow.
     (value.has_more && data.length === 0 && limit !== 0) ||
     data.some((entry, index) => index > 0 && !inOrder(data[index - 1]!, entry, order))
@@ -248,7 +230,7 @@ export function projectSkillVersionList(
 
 export function projectSkillDeleted(value: unknown, invalid: Invalid, skillId: string): SkillDeleted {
   if (
-    !isRecord(value) || !exactFields(value, skillDeletedFields) ||
+    !isRecord(value) || !exactFields(value, deletedSkillResourceFields) ||
     value.id !== skillId || value.object !== "skill.deleted" || value.deleted !== true
   ) return invalid("OpenAgentCore returned an invalid Skill deletion receipt.");
   return { id: skillId, object: "skill.deleted", deleted: true };
@@ -256,7 +238,7 @@ export function projectSkillDeleted(value: unknown, invalid: Invalid, skillId: s
 
 export function projectSkillVersionDeleted(value: unknown, invalid: Invalid, version: string): SkillVersionDeleted {
   if (
-    !isRecord(value) || !exactFields(value, skillVersionDeletedFields) ||
+    !isRecord(value) || !exactFields(value, deletedSkillVersionResourceFields) ||
     !isSkillVersionId(value.id) || value.object !== "skill.version.deleted" ||
     value.deleted !== true || value.version !== version
   ) return invalid("OpenAgentCore returned an invalid Skill version deletion receipt.");
diff --git a/packages/agents-client/src/skills.test.ts b/packages/agents-client/src/skills.test.ts
index 0d70902e9..7fb81620b 100644
--- a/packages/agents-client/src/skills.test.ts
+++ b/packages/agents-client/src/skills.test.ts
@@ -171,13 +171,13 @@ describe("Skill response validation", () => {
       json({ ...list, object: "page" }),
       json({ ...list, next: null }),
       json(list),
-      json({ object: "list", data: [], has_more: true }),
+      json({ object: "list", data: [], first_id: null, last_id: null, has_more: true }),
     );
     for (let index = 0; index < 6; index += 1) {
       await expect(client.listSkillVersions(skillId)).rejects.toMatchObject({ code: "invalid_skill_resource" });
     }
     await expect(client.listSkillVersions(skillId, { limit: 1 })).rejects.toMatchObject({ code: "invalid_skill_resource" });
-    // Limit 0 reports only whether entries follow; first_id/last_id are optional.
+    // Limit 0 reports only whether entries follow.
     await expect(client.listSkillVersions(skillId, { limit: 0 })).resolves.toMatchObject({ data: [], has_more: true, first_id: null });
   });
 
@@ -202,10 +202,6 @@ describe("Skill response validation", () => {
 describe("Skill request validation", () => {
   it("rejects invalid query parameters and identifiers before sending", async () => {
     const { client, calls } = clientFor();
-    await expect(client.listSkills({ limit: 101 })).rejects.toThrow(TypeError);
-    await expect(client.listSkills({ limit: -1 })).rejects.toThrow(TypeError);
-    await expect(client.listSkills({ limit: 1.5 })).rejects.toThrow(TypeError);
-    await expect(client.listSkills({ order: "" as "asc" })).rejects.toThrow("asc or desc");
     await expect(client.listSkills({ after: "skillver_1" })).rejects.toThrow("cursor");
     await expect(client.listSkillVersions(skillId, { after: "2" })).rejects.toThrow("cursor");
     await expect(client.listSkillVersions(skillId, { after: skillId })).rejects.toThrow("cursor");
@@ -242,9 +238,7 @@ describe("Skill request validation", () => {
   it("rejects unsafe folder uploads before sending", async () => {
     const { client, calls } = clientFor();
     const file = new Blob(["x"]);
-    const tooMany = Array.from({ length: 501 }, (_, index) => ({ path: `report/${index}.txt`, file }));
     await expect(client.uploadSkill({ kind: "directory", files: [] })).rejects.toThrow(TypeError);
-    await expect(client.uploadSkill({ kind: "directory", files: tooMany })).rejects.toThrow("500");
     await expect(client.uploadSkill({ kind: "directory", files: [{ path: "report/../x", file }] })).rejects.toThrow(TypeError);
     await expect(client.uploadSkill({ kind: "directory", files: [{ path: "report\\SKILL.md", file }] })).rejects.toThrow(TypeError);
     await expect(client.uploadSkill({
diff --git a/packages/agents-client/src/source-files-list.test.ts b/packages/agents-client/src/source-files-list.test.ts
index 691d0c25f..7c52c57b8 100644
--- a/packages/agents-client/src/source-files-list.test.ts
+++ b/packages/agents-client/src/source-files-list.test.ts
@@ -96,17 +96,10 @@ describe("Files list", () => {
     await expect(client.listSourceFiles({ limit: 2 })).rejects.toBeInstanceOf(AgentCoreError);
   });
 
-  it.each([
-    [{ limit: 0 }],
-    [{ limit: 10001 }],
-    [{ limit: 1.5 }],
-    [{ order: "newest" }],
-    [{ after: "notes.txt" }],
-    [{ purpose: "assistants" }],
-  ])("refuses %j before any request", async (options) => {
+  it("refuses a cursor that is not a File ID before any request", async () => {
     const { client, calls } = recordingClient(responses.list_empty);
 
-    await expect(client.listSourceFiles(options as never)).rejects.toBeInstanceOf(TypeError);
+    await expect(client.listSourceFiles({ after: "notes.txt" })).rejects.toBeInstanceOf(TypeError);
     expect(calls).toHaveLength(0);
   });
 
diff --git a/packages/agents-client/src/types.ts b/packages/agents-client/src/types.ts
index 9594d5b11..56a9b0f89 100644
--- a/packages/agents-client/src/types.ts
+++ b/packages/agents-client/src/types.ts
@@ -1,14 +1,38 @@
 import type { CoreHarnessKind, ModelProviderProtocol } from "./harness-catalog";
-export type PageOrder = "asc" | "desc";
-
+import type {
+  AgentsCore, CreateVaultCredentialAuthParamStaticBearer, CreateVaultCredentialParams, CreateVaultParams,
+  DeletedAgentResource, DeletedEnvironmentTemplateResource, DeletedSessionResource, DeletedSkillResource,
+  DeletedSkillVersionResource, DeletedVaultCredentialResource, DeletedVaultResource, DeleteFileResponse,
+  EnvironmentFileListResource, EnvironmentFileResource, EnvironmentPackagesResource, EnvironmentParamNone,
+  EnvironmentParamSelfHosted, EnvironmentResourceSelfHosted, EnvironmentStatusResource, FunctionCallStatusResource,
+  HostedEnvironmentFileParam, InputContentParam, InputContentParamInputText, InputMessageParam, ListOrderParam,
+  McpOauthRefreshResource, MultiAgentConfigCurrentParam, MultiAgentConfigResource, NetworkAccessResource,
+  NetworkPolicyResource, PersistedAgentToolConfigParamFunction, PersistedAgentToolConfigParamProgrammaticToolCalling,
+  PersistedAgentToolConfigParamToolSearch, PersistedAgentToolConfigParamWebSearch, ReasoningEffortResource,
+  ReasoningParam, ReasoningResource, ReasoningSummaryResource, RotateVaultCredentialAuthParamStaticBearer,
+  RotateVaultCredentialParams, ServiceTierResource, SessionEnvironmentStateResource, SessionEnvironmentStatusResource,
+  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";
+
+// Generated types keep their schema names in ./generated/public-api; these are the client's names for them.
+export type PageOrder = ListOrderParam;
+
+/** The one cursor-list envelope; the schema repeats it for each resource. */
 export interface ListPage<T> {
+  object: "list";
   data: T[];
+  first_id: string | null;
+  last_id: string | null;
   has_more: boolean;
-  object?: "list";
-  first_id?: string | null;
-  last_id?: string | null;
 }
 
+// Call options carry query parameters and a cancellation signal; they are not wire types.
 export interface PageOptions extends ReadOptions {
   after?: string;
   limit?: number;
@@ -19,41 +43,16 @@ export interface ReadOptions {
   signal?: AbortSignal;
 }
 
-export type AgentTextFormat =
-  | { type: "text" }
-  | { type: "json_schema"; schema: Record<string, unknown> };
-
-export interface AgentTextConfig {
-  format: AgentTextFormat;
-  verbosity: "low" | "medium" | "high";
-}
-
-export interface AgentTextInput {
-  format?: AgentTextConfig["format"] | null;
-  verbosity?: AgentTextConfig["verbosity"] | null;
-}
+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;
 
-export type AgentServiceTier = "auto" | "default" | "flex" | "priority" | "fast";
-export type AgentReasoningEffort = "none" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max";
-export type AgentReasoningSummary = "concise" | "detailed" | "auto";
-
-export interface AgentReasoning {
-  effort?: AgentReasoningEffort | null;
-  summary?: AgentReasoningSummary | null;
-}
-
-export interface MultiAgentInput {
-  enabled: boolean;
-  max_concurrent_subagents?: number | null;
-}
-
-export interface FunctionToolInput {
-  type: "function";
-  name: string;
-  description: string;
-  parameters: Record<string, unknown>;
-  defer_loading?: boolean;
-}
+export type FunctionToolInput = PersistedAgentToolConfigParamFunction;
 
 /** The service-origin HTTP MCP profile accepted by current Core. */
 export interface ServiceHttpMcpToolInput {
@@ -77,128 +76,66 @@ export type AnonymousHttpMcpToolInput = Omit<ServiceHttpMcpToolInput, "credentia
   credential_id?: null;
 };
 
-export interface ToolSearchInput {
-  type: "tool_search";
-}
+export type ToolSearchInput = PersistedAgentToolConfigParamToolSearch;
 
-export interface ProgrammaticToolCallingInput {
-  type: "programmatic_tool_calling";
-  enabled?: boolean;
-}
+export type ProgrammaticToolCallingInput = PersistedAgentToolConfigParamProgrammaticToolCalling;
 
-export interface WebSearchLocationInput {
-  city?: string | null;
-  country?: string | null;
-  region?: string | null;
-  timezone?: string | null;
-}
+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
  * `disabled` and rejects the other modes unless the Session replaces its tools.
  */
-export interface WebSearchToolInput {
-  type: "web_search";
-  mode?: "disabled" | "cached" | "live" | null;
-  context_size?: "low" | "medium" | "high" | null;
-  /** null and [] are saved distinctly. */
-  allowed_domains?: string[] | null;
-  /** A saved location includes all four keys, with null for omitted ones. */
-  location?: WebSearchLocationInput | null;
-}
+export type WebSearchToolInput = PersistedAgentToolConfigParamWebSearch;
 
+// The tool profiles Core saves, narrowed from the schema's tool params.
 export type SavedAgentToolInput =
   | FunctionToolInput
   | ServiceHttpMcpToolInput
   | ToolSearchInput
   | ProgrammaticToolCallingInput
   | WebSearchToolInput;
+// Session function tools load eagerly.
 export type SessionFunctionToolInput = Omit<FunctionToolInput, "defer_loading"> & { defer_loading?: false };
 export type ConfigurableAgentToolInput = SessionFunctionToolInput | ServiceHttpMcpToolInput;
 
-export type VaultStatus = "active" | "archived";
+export type VaultStatus = VaultStatusParam;
 
 export interface VaultListOptions extends PageOptions {
   status?: VaultStatus | VaultStatus[];
 }
 
-export interface Vault {
-  id: string;
-  object: "vault";
-  created_at: number;
-  name: string | null;
-  metadata: Record<string, string>;
-}
+export type Vault = VaultResource;
 
-export interface VaultList extends ListPage<Vault> {
-  object: "list";
-  first_id: string | null;
-  last_id: string | null;
-}
+export type VaultList = ListPage<Vault>;
 
-export interface CreateVaultInput {
-  name?: string;
-  metadata?: Record<string, string> | null;
-}
+export type CreateVaultInput = CreateVaultParams;
 
-export interface VaultDeleted {
-  id: string;
-  object: "vault.deleted";
-  deleted: true;
-}
+export type VaultDeleted = DeletedVaultResource;
 
-export interface StaticBearerCredentialAuth {
-  type: "static_bearer";
-  mcp_server_url: string;
-}
+export type StaticBearerCredentialAuth = VaultCredentialAuthResourceStaticBearer;
 
-export interface McpOAuthRefreshMetadata {
-  client_id: string;
-  token_endpoint: string;
-  token_endpoint_auth: { type: "none" | "client_secret_basic" | "client_secret_post" };
-  resource: string | null;
-  scope: string | null;
-}
+export type McpOAuthRefreshMetadata = McpOauthRefreshResource;
 
-export interface McpOAuthCredentialAuth {
-  type: "mcp_oauth";
-  mcp_server_url: string;
-  expires_at: string | null;
-  refresh: McpOAuthRefreshMetadata | null;
-}
+export type McpOAuthCredentialAuth = VaultCredentialAuthResourceMcpOauth;
 
-export interface VaultCredential {
-  id: string;
-  vault_id: string;
-  name: string;
-  object: "vault.credential";
-  auth: StaticBearerCredentialAuth | McpOAuthCredentialAuth;
-  created_at: number;
-  updated_at: number;
-}
+export type VaultCredential = VaultCredentialResource;
 
-export interface VaultCredentialList extends ListPage<VaultCredential> {
-  object: "list";
-  first_id: string | null;
-  last_id: string | null;
-}
+export type VaultCredentialList = ListPage<VaultCredential>;
 
-export interface CreateVaultCredentialInput {
-  name: string;
-  auth: StaticBearerCredentialAuth & { token: string };
-}
+// The client writes static bearer Credentials only; it never writes MCP OAuth Credentials.
+export type CreateVaultCredentialInput = Omit<CreateVaultCredentialParams, "auth"> & {
+  auth: CreateVaultCredentialAuthParamStaticBearer;
+};
 
-export interface ReplaceVaultCredentialTokenInput {
-  auth: { type: "static_bearer"; token: string };
-}
+export type ReplaceVaultCredentialTokenInput = Omit<RotateVaultCredentialParams, "auth"> & {
+  auth: RotateVaultCredentialAuthParamStaticBearer;
+};
 
-export interface VaultCredentialDeleted {
-  id: string;
-  object: "vault.credential.deleted";
-  deleted: true;
-}
+export type VaultCredentialDeleted = DeletedVaultCredentialResource;
 
+/** The Agent resource with the client's SavedAgentCore view; Agent responses are not checked, so tools stay opaque. */
 export interface SavedAgent {
   id: string;
   object: "agent";
@@ -207,11 +144,8 @@ export interface SavedAgent {
   name: string | null;
   instructions: string | null;
   metadata: Record<string, string>;
-  multi_agent: {
-    enabled: boolean;
-    max_concurrent_subagents: number | null;
-  };
-  reasoning: AgentReasoning;
+  multi_agent: MultiAgentConfigResource;
+  reasoning: ReasoningResource;
   service_tier: AgentServiceTier;
   text: AgentTextConfig;
   tools: unknown[];
@@ -219,6 +153,7 @@ export interface SavedAgent {
   updated_at: number;
 }
 
+/** Agent params narrowed to the tool profiles and extension inputs the client sends. */
 export interface CreateAgentInput {
   x_agents_core?: SavedAgentCoreInput | null;
   model: string;
@@ -234,6 +169,7 @@ export interface CreateAgentInput {
 
 export type UpdateAgentInput = Partial<CreateAgentInput>;
 
+/** Session Agent params narrowed to the tools a Session may configure. */
 export interface InlineAgentInput {
   x_agents_core?: AgentsCoreSelection | null;
   model?: string;
@@ -245,6 +181,7 @@ export interface InlineAgentInput {
   multi_agent?: MultiAgentInput | null;
 }
 
+/** The Session's frozen Agent: the saved Agent without its resource metadata. */
 export type AgentSnapshot = Omit<SavedAgent, "object" | "metadata" | "created_at" | "updated_at" | "x_agents_core"> & {
   x_agents_core?: AgentsCoreSelection | null;
 };
@@ -253,18 +190,13 @@ declare const unknownEnvironmentType: unique symbol;
 declare const unknownItemType: unique symbol;
 declare const unknownSessionEventType: unique symbol;
 
-export interface NoneAgentEnvironment {
-  type: "none";
-}
+export type NoneAgentEnvironment = EnvironmentParamNone;
 
-export interface SelfHostedAgentEnvironmentInput {
-  type: "self_hosted";
-  workspace_directory: string;
-  capability_directories?: string[] | null;
-}
+export type SelfHostedAgentEnvironmentInput = EnvironmentParamSelfHosted;
 
 export type OpenAIHostedNetworkAccess = "enabled" | "disabled";
 
+/** Narrowed to the network mode and Template reference of the schema's hosted fields. */
 export interface OpenAIHostedAgentEnvironmentInput {
   type: "openai_hosted";
   /** Omitted or null defaults to enabled in the pinned basic Core profile. */
@@ -283,30 +215,17 @@ export type AgentEnvironmentInput =
   | SelfHostedAgentEnvironmentInput
   | OpenAIHostedAgentEnvironmentInput;
 
-export interface SelfHostedAgentEnvironment {
-  type: "self_hosted";
-  id: string;
-  remote_url: string;
-  workspace_directory: string;
-  capability_directories: string[];
-}
+export type SelfHostedAgentEnvironment = EnvironmentResourceSelfHosted;
 
-export interface AgentEnvironmentPackages {
-  npm: string[];
-  python: string[];
-  system: string[];
-}
+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 = "enabled" | "disabled" | "restricted";
+export type EnvironmentNetworkAccess = NetworkAccessResource;
 
-export interface EnvironmentNetworkPolicy {
-  access: EnvironmentNetworkAccess;
-  allowed_domains: string[];
-}
+export type EnvironmentNetworkPolicy = NetworkPolicyResource;
 
 /**
  * Safe output of a managed Session Environment. A basic profile has only empty
@@ -325,6 +244,7 @@ export interface OpenAIHostedAgentEnvironment {
   skills: Record<string, unknown>[];
 }
 
+// A Session Environment type this client does not know stays readable instead of failing the Session.
 export type UnknownEnvironmentType = string & { readonly [unknownEnvironmentType]: true };
 
 export interface UnknownAgentEnvironment {
@@ -338,8 +258,9 @@ export type AgentEnvironment =
   | OpenAIHostedAgentEnvironment
   | UnknownAgentEnvironment;
 
-export type EnvironmentResourceStatus = "pending" | "connected" | "disconnected" | "expired" | "failed";
+export type EnvironmentResourceStatus = EnvironmentStatusResource;
 
+// The Environment resource split by type; hosted lists are always empty.
 export interface SelfHostedAgentEnvironmentResource {
   id: string;
   object: "agent.environment";
@@ -441,19 +362,9 @@ export interface UnrecognizedEnvironmentTemplate
 
 export type EnvironmentTemplateResource = EnvironmentTemplate | UnrecognizedEnvironmentTemplate;
 
-export interface EnvironmentTemplateList {
-  object: "list";
-  data: EnvironmentTemplateResource[];
-  has_more: boolean;
-  first_id: string | null;
-  last_id: string | null;
-}
+export type EnvironmentTemplateList = ListPage<EnvironmentTemplateResource>;
 
-export interface EnvironmentTemplateDeleted {
-  id: string;
-  object: "agent.environment.template.deleted";
-  deleted: true;
-}
+export type EnvironmentTemplateDeleted = DeletedEnvironmentTemplateResource;
 
 /** A Template network write. Core validates restricted hostnames. */
 export type EnvironmentTemplateNetworkInput =
@@ -473,20 +384,10 @@ export interface CreateEnvironmentTemplateInput {
  */
 export type UpdateEnvironmentTemplateInput = CreateEnvironmentTemplateInput;
 
-export interface EnvironmentFile {
-  environment_id: string;
-  object: "agent.environment.file";
-  path: string;
-  size_bytes: number;
-}
+export type EnvironmentFile = EnvironmentFileResource;
 
 /** Official token page: has_more is true exactly when next carries a token. */
-export interface EnvironmentFileList {
-  object: "page";
-  data: EnvironmentFile[];
-  next: string | null;
-  has_more: boolean;
-}
+export type EnvironmentFileList = EnvironmentFileListResource;
 
 export interface EnvironmentFileListOptions extends ReadOptions {
   limit?: number;
@@ -496,10 +397,9 @@ export interface EnvironmentFileListOptions extends ReadOptions {
   path?: string;
 }
 
-export type EnvironmentFileCreateInput =
-  | { type: "inline"; data: string; path: string }
-  | { type: "file_id"; file_id: string; path: string };
+export type EnvironmentFileCreateInput = HostedEnvironmentFileParam;
 
+/** Narrowed to user_data Files; the pinned File schema types expires_at and status_details as optional, but Core sends null. */
 export interface SourceFile {
   id: string;
   object: "file";
@@ -513,11 +413,7 @@ export interface SourceFile {
   unrecognized?: undefined;
 }
 
-export interface SourceFileDeleted {
-  id: string;
-  object: "file";
-  deleted: true;
-}
+export type SourceFileDeleted = DeleteFileResponse;
 
 /** Files list query. Core accepts limits of 1–10000 (default 10000) and orders newest first by default. */
 export interface SourceFileListOptions extends ReadOptions {
@@ -539,14 +435,9 @@ export interface UnrecognizedSourceFile {
 
 export type SourceFileListEntry = SourceFile | UnrecognizedSourceFile;
 
-export interface SourceFileList {
-  object: "list";
-  data: SourceFileListEntry[];
-  has_more: boolean;
-  first_id: string | null;
-  last_id: string | null;
-}
+export type SourceFileList = ListPage<SourceFileListEntry>;
 
+// Binary and multipart shapes the JSON schema does not describe.
 export interface SourceFileContent {
   data: Uint8Array;
   bytes: number;
@@ -563,56 +454,24 @@ export interface SourceFileUploadInput {
  * A project-owned Skill. Top-level name and description follow the default
  * version; version numbers are positive integer strings that Core never reuses.
  */
-export interface Skill {
-  id: string;
-  object: "skill";
-  created_at: number;
-  name: string;
-  description: string;
-  default_version: string;
-  latest_version: string;
-}
+export type Skill = SkillResource;
 
-export interface SkillList extends ListPage<Skill> {
-  object: "list";
-  first_id: string | null;
-  last_id: string | null;
-}
+export type SkillList = ListPage<Skill>;
 
 /** One immutable uploaded version of a Skill. */
-export interface SkillVersion {
-  id: string;
-  object: "skill.version";
-  skill_id: string;
-  version: string;
-  name: string;
-  description: string;
-  created_at: number;
-}
+export type SkillVersion = SkillVersionResource;
 
-export interface SkillVersionList extends ListPage<SkillVersion> {
-  object: "list";
-  first_id: string | null;
-  last_id: string | null;
-}
+export type SkillVersionList = ListPage<SkillVersion>;
 
-export interface SkillDeleted {
-  id: string;
-  object: "skill.deleted";
-  deleted: true;
-}
+export type SkillDeleted = DeletedSkillResource;
 
 /** Deleting the only remaining version also deletes its Skill. */
-export interface SkillVersionDeleted {
-  id: string;
-  object: "skill.version.deleted";
-  deleted: true;
-  version: string;
-}
+export type SkillVersionDeleted = DeletedSkillVersionResource;
 
 /** Skill lists accept 0 through 100 entries; `after` is a Skill ID, or a version resource ID for version lists. */
 export type SkillListOptions = PageOptions;
 
+// Multipart upload and download shapes the JSON schema does not describe.
 export interface SkillDirectoryFile {
   /** Relative path inside one top-level folder, for example `report/SKILL.md`. */
   path: string;
@@ -637,35 +496,17 @@ export interface SkillContent {
   content_disposition: string;
 }
 
-export type SessionStatus = "idle" | "in_progress" | "requires_action" | "failed";
+export type SessionStatus = SessionStatusResource;
 
-export interface FunctionCallAction {
-  type: "function_call";
-  call_id: string;
-  turn_id: string;
-  name: string;
-  arguments: unknown;
-}
+export type FunctionCallAction = SessionRequiredActionResourceFunctionCall;
 
-export interface EnvironmentConnectionAction {
-  type: "environment_connection";
-  environment_id: string;
-}
+export type EnvironmentConnectionAction = SessionRequiredActionResourceEnvironmentConnection;
 
-export type RequiredAction = FunctionCallAction | EnvironmentConnectionAction;
+export type RequiredAction = SessionRequiredActionResource;
 
-export interface TokenUsage {
-  input_tokens: number;
-  output_tokens: number;
-  total_tokens: number;
-  input_tokens_details: {
-    cached_tokens: number;
-  };
-  output_tokens_details: {
-    reasoning_tokens: number;
-  };
-}
+export type TokenUsage = TokenUsageResource;
 
+/** The installation fields the projection guarantees; the extension schema marks them all optional. */
 export interface EnvironmentInstallation {
   status: "available" | "unavailable";
   version: string;
@@ -674,6 +515,7 @@ export interface EnvironmentInstallation {
   message?: string;
 }
 
+/** The Session resource composed with the client's Agent snapshot, Environment and installation projections. */
 export interface AgentSession {
   x_agents_core?: { installation: EnvironmentInstallation };
   id: string;
@@ -704,6 +546,7 @@ export interface EnvironmentCapabilityArchiveInput {
   source: { type: "base64"; media_type: "application/zip"; data: string };
 }
 
+// The extension schema types environment preparation as an open object.
 export interface EnvironmentPreparationInput {
   environment_template_id?: string;
   env?: Record<string, string> | null;
@@ -715,6 +558,7 @@ export interface EnvironmentPreparationInput {
   capability_directories?: string[] | null;
 }
 
+/** Session params composed with the client's Agent, Environment and extension inputs. */
 export interface CreateSessionInput {
   x_agents_core?: { model_provider?: ModelProviderInput | null; harness_config?: HarnessConfig; environment?: EnvironmentPreparationInput };
   agent_id?: string;
@@ -728,19 +572,13 @@ export interface CreateSessionInput {
   vault_ids?: string[];
 }
 
-export interface InputTextContent {
-  type: "input_text";
-  text: string;
-}
+export type InputTextContent = InputContentParamInputText;
 
-export interface InputMessage {
-  type?: "message";
-  role: "user";
-  content: InputTextContent[];
-}
+export type InputMessage = InputMessageParam;
 
-export type ItemStatus = "in_progress" | "completed" | "failed" | "incomplete";
+export type ItemStatus = FunctionCallStatusResource;
 
+/** Every content part an Item can hold, merged so Web reads one shape. */
 export interface ItemContent {
   type: "input_text" | "output_text" | "input_image" | "encrypted_content";
   text?: string | null;
@@ -766,13 +604,14 @@ export type KnownSessionItemType =
 
 export type UnknownSessionItemType = string & { readonly [unknownItemType]: true };
 
+/** Every Item variant's fields merged into one shape, so Web reads them without narrowing on type. */
 export interface SessionItemBase {
   id: string;
   turn_id: string;
-  /** Inter-agent messages have no status; reasoning may have an unknown status. */
+  /** Inter-agent messages have no status; reasoning may have a null status. */
   status?: ItemStatus | null;
   role?: "user" | "assistant";
-  /** Null on user messages and when the harness reports none; older Cores omit it. */
+  /** Null on user messages and when the harness reports none. */
   phase?: "commentary" | "final_answer" | null;
   content?: ItemContent[];
   command?: string;
@@ -785,7 +624,7 @@ export interface SessionItemBase {
   arguments?: unknown;
   output?: unknown;
   error?: unknown;
-  action?: WebSearchAction;
+  action?: WebSearchAction | null;
   agent_id?: string;
   sender_agent_id?: string;
   recipient_agent_id?: string;
@@ -806,52 +645,26 @@ export interface UnknownSessionItem extends SessionItemBase {
 
 export type SessionItem = KnownSessionItem | UnknownSessionItem;
 
+/** The web search action variants merged into one shape, as on SessionItem. */
 export interface WebSearchAction {
   type: "search" | "open_page" | "find_in_page" | "other";
   query?: string | null;
-  queries?: string[];
+  queries?: string[] | null;
   url?: string | null;
   pattern?: string | null;
 }
 
-export type TurnStatus = "queued" | "in_progress" | "waiting" | "completed" | "failed" | "cancelled";
+export type TurnStatus = TurnStatusResource;
 
-export interface AgentTurn {
-  id: string;
-  /**
-   * The Session's Agent ID, for root and Subagent Turns alike. Older Core
-   * releases sent the Subagent's own ID here for Subagent Turns.
-   */
-  agent_id: string;
-  /** Set on Subagent Turns, which are read through the Subagent routes. */
-  subagent_id?: string | null;
-  session_id: string;
-  object: "agent.session.turn";
-  status: TurnStatus;
-  created_at: number;
-  started_at: number | null;
-  completed_at: number | null;
-  error: { code: "internal_error"; message: string } | null;
-  usage: TokenUsage | null;
-}
+export type AgentTurn = TurnResource;
 
-export interface StreamError {
-  code: string;
-  type: string;
-  message: string;
-  /** Present on Session error events (null when unset); Environment state errors and older or interruption frames omit it. */
-  param?: string | null;
-}
+export type StreamError = SessionErrorResource;
 
-export type SessionEnvironmentStatus = "pending" | "ready" | "connected" | "disconnected" | "failed";
+export type SessionEnvironmentStatus = SessionEnvironmentStatusResource;
 
-export interface SessionEnvironmentState {
-  id: string;
-  type: string;
-  status: SessionEnvironmentStatus;
-  error: StreamError | null;
-}
+export type SessionEnvironmentState = SessionEnvironmentStateResource;
 
+/** Every projected event's fields merged into one shape, as on SessionItem. */
 export interface SessionEventBase {
   event_id: string;
   session_id?: string;
@@ -860,7 +673,7 @@ export interface SessionEventBase {
   turn?: AgentTurn;
   item?: SessionItem;
   item_id?: string;
-  /** Null on Item events for input Items; older Cores omit it. */
+  /** Null on Item events for input Items. */
   output_index?: number | null;
   content_index?: number;
   part?: ItemContent;
@@ -874,9 +687,11 @@ export interface SessionEventBase {
   usage?: TokenUsage | null;
 }
 
+/** Environment events happen outside any Turn, so their turn_id is null. */
 export type AgentSessionEnvironmentEvent = {
-  [Status in SessionEnvironmentStatus]: SessionEventBase & {
+  [Status in SessionEnvironmentStatus]: Omit<SessionEventBase, "turn_id"> & {
     type: `agent.session.environment.${Status}`;
+    turn_id: null;
     environment: SessionEnvironmentState & { status: Status };
   };
 }[SessionEnvironmentStatus];
@@ -889,7 +704,6 @@ export type KnownSessionEventType =
   | "agent.session.failed"
   | "agent.session.turn.created"
   | "agent.session.turn.in_progress"
-  | "agent.session.turn.waiting"
   | "agent.session.turn.completed"
   | "agent.session.turn.failed"
   | "agent.session.turn.cancelled"
@@ -926,18 +740,11 @@ export interface AgentSessionErrorEvent extends SessionEventBase {
 
 export type SessionEvent = AgentSessionEnvironmentEvent | AgentSessionErrorEvent | KnownSessionEvent | UnknownSessionEvent;
 
-export interface AgentDeleted {
-  id: string;
-  object: "agent.deleted";
-  deleted: true;
-}
+export type AgentDeleted = DeletedAgentResource;
 
-export interface SessionDeleted {
-  id: string;
-  object: "agent.session.deleted";
-  deleted: true;
-}
+export type SessionDeleted = DeletedSessionResource;
 
+/** submitFunctionResult's input, which the client encodes as a tool_result event. */
 export interface FunctionResultInput {
   callId: string;
   turnId: string;
@@ -946,37 +753,17 @@ export interface FunctionResultInput {
   error?: string | null;
 }
 
-export type FunctionResultContent =
-  | { type: "input_text"; text: string }
-  | { type: "input_image"; image_url: string };
+export type FunctionResultContent = InputContentParam;
 
-/** Exact public wire shape for an ordered user-message input event. */
-export interface SessionMessageInputEvent {
-  type: "agent.session.input.message";
-  input: InputMessage[];
-}
+export type SessionMessageInputEvent = SessionInputParamAgentSessionInputMessage;
 
-/** Exact public wire shape for a cancellation input event. */
-export interface SessionCancelInputEvent {
-  type: "agent.session.input.cancel";
-}
+export type SessionCancelInputEvent = SessionInputParamAgentSessionInputCancel;
 
-/** Exact public wire shape for a Function result input event. */
-export interface SessionToolResultInputEvent {
-  type: "agent.session.input.tool_result";
-  call_id: string;
-  turn_id: string;
-  success: boolean;
-  output?: string | FunctionResultContent[] | null;
-  error?: string | null;
-}
+export type SessionToolResultInputEvent = SessionInputParamAgentSessionInputToolResult;
 
-/** The three input event variants accepted by the current public Core endpoint. */
-export type SessionInputEvent =
-  | SessionMessageInputEvent
-  | SessionCancelInputEvent
-  | SessionToolResultInputEvent;
+export type SessionInputEvent = SessionInputParam;
 
+// Callbacks for the event stream readers.
 export interface StreamOptions {
   signal?: AbortSignal;
   /** Called once the authenticated streaming response has been accepted. */
@@ -1266,10 +1053,7 @@ export interface SavedAgentCore {
   harness_config?: HarnessConfig;
 }
 
-export interface AgentsCoreSelection {
-  harness?: CoreHarnessKind;
-  harness_config?: HarnessConfig;
-}
+export type AgentsCoreSelection = AgentsCore;
 
 export type ExecutionConfigurationSource = "session" | "agent" | "deployment" | "unknown";
 
diff --git a/packages/agents-client/src/usage-projection.ts b/packages/agents-client/src/usage-projection.ts
index e41985922..3e9dd38e5 100644
--- a/packages/agents-client/src/usage-projection.ts
+++ b/packages/agents-client/src/usage-projection.ts
@@ -1,24 +1,19 @@
 import type { AgentSession } from "./types";
 import { isRecord, exactFields, isNonnegativeInteger } from "./response-projection";
-
-const tokenUsageFields = new Set([
-  "input_tokens", "output_tokens", "total_tokens", "input_tokens_details", "output_tokens_details",
-]);
-const inputTokenDetailsFields = new Set(["cached_tokens"]);
-const outputTokenDetailsFields = new Set(["reasoning_tokens"]);
+import { inputTokensDetailsResourceFields, outputTokensDetailsResourceFields, tokenUsageResourceFields } from "./generated/public-api";
 
 export function projectTokenUsage(value: unknown, invalid: () => never): AgentSession["usage"] {
   if (value === null) return null;
-  if (!isRecord(value) || !exactFields(value, tokenUsageFields)) return invalid();
+  if (!isRecord(value) || !exactFields(value, tokenUsageResourceFields)) return invalid();
   const inputDetails = value.input_tokens_details;
   const outputDetails = value.output_tokens_details;
   if (
     !isNonnegativeInteger(value.input_tokens) ||
     !isNonnegativeInteger(value.output_tokens) ||
     !isNonnegativeInteger(value.total_tokens) ||
-    !isRecord(inputDetails) || !exactFields(inputDetails, inputTokenDetailsFields) ||
+    !isRecord(inputDetails) || !exactFields(inputDetails, inputTokensDetailsResourceFields) ||
     !isNonnegativeInteger(inputDetails.cached_tokens) ||
-    !isRecord(outputDetails) || !exactFields(outputDetails, outputTokenDetailsFields) ||
+    !isRecord(outputDetails) || !exactFields(outputDetails, outputTokensDetailsResourceFields) ||
     !isNonnegativeInteger(outputDetails.reasoning_tokens)
   ) return invalid();
   return {
diff --git a/packages/agents-client/src/vault-credential-auth.ts b/packages/agents-client/src/vault-credential-auth.ts
index 62ec5da3d..76120213a 100644
--- a/packages/agents-client/src/vault-credential-auth.ts
+++ b/packages/agents-client/src/vault-credential-auth.ts
@@ -1,7 +1,9 @@
 import type { McpOAuthRefreshMetadata, VaultCredential } from "./types";
-
-const oauthFields = new Set(["type", "mcp_server_url", "expires_at", "refresh"]);
-const refreshFields = new Set(["client_id", "token_endpoint", "token_endpoint_auth", "resource", "scope"]);
+import { exactFields, isRecord, variantFields } from "./response-projection";
+import {
+  mcpOauthRefreshResourceFields, mcpOauthTokenEndpointAuthResourceFields, vaultCredentialAuthResourceMcpOauthFields,
+  vaultCredentialAuthResourceStaticBearerFields,
+} from "./generated/public-api";
 
 export function validCredentialURL(value: unknown): value is string {
   if (
@@ -19,12 +21,11 @@ export function validCredentialURL(value: unknown): value is string {
 // Each level is projected explicitly; unexpected fields may contain secrets.
 export function projectVaultCredentialAuth(value: Record<string, unknown>): VaultCredential["auth"] | null {
   if (!validCredentialURL(value.mcp_server_url)) return null;
-  const fields = Object.keys(value);
-  if (value.type === "static_bearer" && fields.length === 2) {
+  if (value.type === "static_bearer" && exactFields(value, vaultCredentialAuthResourceStaticBearerFields)) {
     return { type: "static_bearer", mcp_server_url: value.mcp_server_url };
   }
   if (
-    value.type !== "mcp_oauth" || fields.length !== oauthFields.size || !fields.every((field) => oauthFields.has(field)) ||
+    value.type !== "mcp_oauth" || !exactFields(value, vaultCredentialAuthResourceMcpOauthFields) ||
     !(value.expires_at === null || typeof value.expires_at === "string")
   ) return null;
   const refresh = value.refresh === null ? null : projectOAuthRefresh(value.refresh);
@@ -38,25 +39,22 @@ export function projectVaultCredentialAuth(value: Record<string, unknown>): Vaul
 }
 
 function projectOAuthRefresh(value: unknown): McpOAuthRefreshMetadata | null {
-  if (value === null || typeof value !== "object" || Array.isArray(value)) return null;
-  const refresh = value as Record<string, unknown>;
-  const fields = Object.keys(refresh);
+  if (!isRecord(value)) return null;
+  const refresh = value;
   if (
-    fields.length !== refreshFields.size || !fields.every((field) => refreshFields.has(field)) ||
+    !exactFields(refresh, mcpOauthRefreshResourceFields) ||
     typeof refresh.client_id !== "string" || !validCredentialURL(refresh.token_endpoint) ||
     !(refresh.resource === null || typeof refresh.resource === "string") ||
     !(refresh.scope === null || typeof refresh.scope === "string") ||
     refresh.token_endpoint_auth === null || typeof refresh.token_endpoint_auth !== "object" || Array.isArray(refresh.token_endpoint_auth)
   ) return null;
   const auth = refresh.token_endpoint_auth as Record<string, unknown>;
-  if (
-    Object.keys(auth).length !== 1 ||
-    (auth.type !== "none" && auth.type !== "client_secret_basic" && auth.type !== "client_secret_post")
-  ) return null;
+  const authFields = variantFields(mcpOauthTokenEndpointAuthResourceFields, auth.type);
+  if (!authFields || !exactFields(auth, authFields)) return null;
   return {
     client_id: refresh.client_id,
     token_endpoint: refresh.token_endpoint,
-    token_endpoint_auth: { type: auth.type },
+    token_endpoint_auth: { type: auth.type as McpOAuthRefreshMetadata["token_endpoint_auth"]["type"] },
     resource: refresh.resource,
     scope: refresh.scope,
   };
diff --git a/scripts/generate-public-api.py b/scripts/generate-public-api.py
index f469e0f9b..f6b778cab 100644
--- a/scripts/generate-public-api.py
+++ b/scripts/generate-public-api.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Project the pinned OpenAPI into Core's public contract and Go wire types."""
+"""Project the pinned OpenAPI into Core's public contract, Go wire types and TypeScript client types."""
 import argparse
 import copy
 import hashlib
@@ -11,6 +11,7 @@
 ROOT = Path(__file__).resolve().parents[1]
 CONTRACT = ROOT / 'contracts/agents-api'
 SHAPES = ROOT / 'services/core/internal/api/official_shapes.gen.go'
+CLIENT_TYPES = ROOT / 'packages/agents-client/src/generated/public-api.ts'
 # Agent configuration request bodies checked by Core's shape walker.
 REQUEST_SHAPES = ('CreateAgentParams', 'UpdateAgentParams', 'SessionAgentConfigParam')
 HTTP_METHODS = {'get', 'post', 'put', 'patch', 'delete', 'head', 'options'}
@@ -308,6 +309,78 @@ def convert(value):
     return doc
 
 
+def ts_name(name):
+    return re.sub(r'\W', '', name.split('/')[-1].split('.')[-1])
+
+
+def ts_const(name, suffix):
+    name = ts_name(name)
+    return name[0].lower() + name[1:] + suffix
+
+
+def ts_group(typ):
+    return f'({typ})' if ' | ' in typ or ' & ' in typ else typ
+
+
+def ts_type(schema):
+    """Map an OpenAPI 3.1 or Swagger 2.0 schema (x-nullable, any ref prefix) onto a TypeScript type."""
+    if schema.get('x-nullable'):
+        return ts_type({k: v for k, v in schema.items() if k != 'x-nullable'}) + ' | null'
+    if '$ref' in schema:
+        return ts_name(schema['$ref'])
+    for keyword in ('oneOf', 'anyOf'):
+        if keyword in schema:
+            return ' | '.join(dict.fromkeys(ts_type(v) for v in schema[keyword]))
+    if 'allOf' in schema:
+        return ' & '.join(dict.fromkeys(ts_group(ts_type(v)) for v in schema['allOf']))
+    kind = schema.get('type')
+    if 'enum' in schema:
+        values = schema['enum'] + ([None] if isinstance(kind, list) and 'null' in kind and None not in schema['enum'] else [])
+        return ' | '.join(json.dumps(v) for v in values)
+    if isinstance(kind, list):
+        return ' | '.join(ts_type({**schema, 'type': k}) for k in kind)
+    if kind == 'array':
+        return ts_group(ts_type(schema['items'])) + '[]'
+    if 'properties' in schema:
+        required = schema.get('required', [])
+        return '{ ' + ' '.join(f'{k}{"" if k in required else "?"}: {ts_type(v)};' for k, v in schema['properties'].items()) + ' }'
+    if kind == 'object':
+        extra = schema.get('additionalProperties')
+        return f'Record<string, {ts_type(extra) if isinstance(extra, dict) and extra else "unknown"}>'
+    return {'string': 'string', 'integer': 'number', 'number': 'number', 'boolean': 'boolean', 'null': 'null'}.get(kind, 'unknown')
+
+
+def ts_module(schemas, source):
+    """Project parsed schemas (OpenAPI components.schemas or Swagger definitions) onto TypeScript.
+
+    Each enum X gets xValues; each object X gets xFields, plus xRequired when some
+    fields are optional; each discriminated union X maps its tags to the variants'
+    field names in xFields.
+    """
+    if len({ts_name(name) for name in schemas}) != len(schemas):
+        raise ValueError('TypeScript names collide')
+    lines = [f'// Code generated by scripts/generate-public-api.py from {source}; DO NOT EDIT.', '']
+    unions = []
+    for name, schema in sorted(schemas.items(), key=lambda item: ts_name(item[0])):
+        typ = ts_name(name)
+        if 'enum' in schema:
+            values = ts_const(name, 'Values')
+            lines += [f'export const {values} = {json.dumps(schema["enum"])} as const;', f'export type {typ} = (typeof {values})[number];']
+        elif 'properties' in schema:
+            required = schema.get('required', [])
+            lines.append(f'export interface {typ} {{')
+            lines += [f'  {k}{"" if k in required else "?"}: {ts_type(v)};' for k, v in schema['properties'].items()]
+            lines += ['}', f'export const {ts_const(name, "Fields")} = {json.dumps(list(schema["properties"]))} as const;']
+            if set(required) != set(schema['properties']):
+                lines.append(f'export const {ts_const(name, "Required")} = {json.dumps(required)} as const;')
+        else:
+            lines.append(f'export type {typ} = {ts_type(schema)};')
+            if 'discriminator' in schema:
+                mapping = schema['discriminator']['mapping']
+                unions += [f'export const {ts_const(name, "Fields")} = {{'] + [f'  {json.dumps(tag)}: {ts_const(ref, "Fields")},' for tag, ref in mapping.items()] + ['} as const;']
+    return ('\n'.join(lines + unions) + '\n').encode()
+
+
 def write(path, data, check):
     if check:
         if not path.exists() or path.read_bytes() != data:
@@ -335,6 +408,7 @@ def main():
         doc = public_document(source, json.loads(args.extensions.read_text()), owners, pin["beta_header"])
         # JSON is a YAML subset and keeps generation independent of PyYAML.
         write(CONTRACT / 'openapi.yaml', (json.dumps(doc, indent=2, ensure_ascii=False) + '\n').encode(), args.check)
+        write(CLIENT_TYPES, ts_module(doc['components']['schemas'], 'contracts/agents-api/openapi.yaml'), args.check)
         routes = sorted(method.upper() + ' ' + re.sub(r'\{[^}]*\}', '{}', path) for path, item in doc['paths'].items() for method in item if method in HTTP_METHODS)
         write(CONTRACT / 'upstream-routes.json', (json.dumps({'openapi_commit': pin['openapi']['commit'], 'generator': 'scripts/generate-public-api.py', 'routes': routes}, indent=2) + '\n').encode(), args.check)
 
diff --git a/scripts/generate-public-api.test.py b/scripts/generate-public-api.test.py
index ad47f433f..83d346df1 100644
--- a/scripts/generate-public-api.test.py
+++ b/scripts/generate-public-api.test.py
@@ -89,6 +89,29 @@ def test_optional_nullable_and_union_representation(self):
         self.assertEqual(generator.field_type({}, {'type': 'array', 'items': {'type': 'string'}}, True, {}), '[]string')
         self.assertEqual(generator.go_type({}, {'oneOf': [{'type': 'string'}, {'type': 'integer'}]}, {}), 'json.RawMessage')
 
+    def test_generated_client_types_are_current(self):
+        actual = generator.ts_module(self.public['components']['schemas'], 'contracts/agents-api/openapi.yaml')
+        self.assertEqual(actual, generator.CLIENT_TYPES.read_bytes())
+
+    def test_client_types_project_values_fields_and_unions(self):
+        ref = '#/components/schemas/'
+        generated = generator.ts_module({
+            'Color': {'type': 'string', 'enum': ['red', 'blue']},
+            'Paint': {'type': 'object', 'required': ['type', 'color'], 'properties': {
+                'type': {'type': 'string', 'enum': ['paint']}, 'color': {'$ref': ref + 'Color'}, 'note': {'type': ['string', 'null']},
+                'shade': {'allOf': [{'$ref': '#/definitions/Color'}], 'x-nullable': True},
+            }},
+            'Item': {'oneOf': [{'$ref': ref + 'Paint'}], 'discriminator': {'propertyName': 'type', 'mapping': {'paint': ref + 'Paint'}}},
+        }, 'test').decode()
+        for line in (
+            'export const colorValues = ["red", "blue"] as const;', 'export type Color = (typeof colorValues)[number];',
+            '  color: Color;', '  note?: string | null;', '  shade?: Color | null;',
+            'export const paintFields = ["type", "color", "note", "shade"] as const;',
+            'export const paintRequired = ["type", "color"] as const;', 'export type Item = Paint;',
+            'export const itemFields = {\n  "paint": paintFields,\n} as const;',
+        ):
+            self.assertIn(line, generated)
+
     def test_every_public_reference_resolves_and_no_other_apis_leak(self):
         self.assertEqual({p.split('/')[1] for p in self.public['paths']}, {'agents', 'vaults', 'files', 'skills'})
         generator.prune_components(copy.deepcopy(self.public))
diff --git a/services/core/internal/api/hosted_failure_test.go b/services/core/internal/api/hosted_failure_test.go
index db2dd4fa8..a5c8d9112 100644
--- a/services/core/internal/api/hosted_failure_test.go
+++ b/services/core/internal/api/hosted_failure_test.go
@@ -193,9 +193,8 @@ func TestHostedProvisioningFailureInputConflict(t *testing.T) {
 	}
 }
 
-// Core's own interruption frame keeps the three-field error that released
-// clients validate exactly; official error events carry param null.
-func TestStreamInterruptionFrameOmitsParam(t *testing.T) {
+// Core's own interruption frame is a pinned error event with param null.
+func TestStreamInterruptionFrameIsAnErrorEvent(t *testing.T) {
 	var frame []byte
 	writeStreamFailure(func(data []byte) error { frame = data; return nil }, "session")
 	name, data, ok := strings.Cut(strings.TrimSuffix(string(frame), "\n\n"), "\n")
@@ -204,7 +203,7 @@ func TestStreamInterruptionFrameOmitsParam(t *testing.T) {
 		t.Fatalf("frame %q", frame)
 	}
 	want := map[string]any{"type": "error", "event_id": event["event_id"], "session_id": "session", "error": map[string]any{
-		"code": "stream_interrupted", "type": "server_error", "message": "The live stream was interrupted. Reconnect and retrieve the Session and its saved Items to recover."}}
+		"code": "stream_interrupted", "type": "server_error", "message": "The live stream was interrupted. Reconnect and retrieve the Session and its saved Items to recover.", "param": nil}}
 	if id, _ := event["event_id"].(string); id == "" || !reflect.DeepEqual(event, want) {
 		t.Fatalf("interruption frame %s", data)
 	}
diff --git a/services/core/internal/api/stream.go b/services/core/internal/api/stream.go
index 983472b0d..1312c730c 100644
--- a/services/core/internal/api/stream.go
+++ b/services/core/internal/api/stream.go
@@ -252,16 +252,9 @@ func withTurnUsage(event v1.SessionEvent) v1.SessionEvent {
 	return event
 }
 
-// writeStreamFailure sends Core's own interruption frame. Unlike official error
-// events it omits param: released clients validate exactly code, type and message.
+// writeStreamFailure sends Core's own interruption frame, a pinned error event.
 func writeStreamFailure(write func([]byte) error, session string) {
-	event := struct {
-		Type      string         `json:"type"`
-		EventID   string         `json:"event_id"`
-		SessionID string         `json:"session_id"`
-		Error     v1.StreamError `json:"error"`
-	}{"error", uuid.NewString(), session,
-		v1.StreamError{Code: "stream_interrupted", Type: "server_error", Message: "The live stream was interrupted. Reconnect and retrieve the Session and its saved Items to recover."}}
-	payload, _ := json.Marshal(event)
+	payload, _ := json.Marshal(v1.SessionEvent{Type: "error", EventID: uuid.NewString(), SessionID: session,
+		Error: &v1.StreamError{Code: "stream_interrupted", Type: "server_error", Message: "The live stream was interrupted. Reconnect and retrieve the Session and its saved Items to recover."}})
 	_ = write([]byte(fmt.Sprintf("event: error\ndata: %s\n\n", payload)))
 }
diff --git a/services/core/tests/integration/environment_connections_test.go b/services/core/tests/integration/environment_connections_test.go
index 28ab46bb8..dbffb4ce5 100644
--- a/services/core/tests/integration/environment_connections_test.go
+++ b/services/core/tests/integration/environment_connections_test.go
@@ -106,7 +106,7 @@ func TestEnvironmentConnectionOrdersGenerationsAndImmutableEvents(t *testing.T)
 		if err := json.Unmarshal(raw, &wire); err != nil {
 			t.Fatal(err)
 		}
-		if len(wire) != 4 {
+		if len(wire) != 5 || string(wire["turn_id"]) != "null" {
 			t.Fatal("private observation fields escaped", string(raw))
 		}
 		var state map[string]json.RawMessage

From 3844cc42a1dfcaf3376895ab0cdb69e7b4d17adf Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 16:22:16 +0800
Subject: [PATCH 54/60] Generate the Core client types from the schema (#554)

---
 Makefile                                      |   4 +-
 apps/web/src/features/agents/AgentsPage.tsx   |   3 +-
 .../features/api-keys/KeyFlowDialogs.test.tsx |   7 +-
 .../src/features/api-keys/ProjectDetail.tsx   |  29 +-
 .../src/features/api-keys/ProjectStatus.tsx   |   6 +-
 .../src/features/api-keys/ProjectsPage.tsx    |  24 +-
 .../src/features/api-keys/WriteOperations.tsx |  32 +-
 .../src/features/api-keys/key-flows.test.ts   |  18 +-
 apps/web/src/features/api-keys/key-flows.ts   |  25 +-
 .../src/features/api-keys/project-queries.ts  |  11 +-
 .../web/src/features/api-keys/use-key-flow.ts |   7 +-
 .../src/features/metrics/AgentMetricsPage.tsx |  22 +-
 .../src/features/metrics/CoreMetricsPage.tsx  |  18 +-
 .../features/metrics/agent-metrics-loader.ts  |  12 +-
 .../src/features/metrics/key-usage.test.ts    |  15 +-
 apps/web/src/features/metrics/key-usage.ts    |   4 +-
 .../src/features/metrics/metrics-queries.ts   |   8 +-
 .../src/features/metrics/project-sessions.ts  |  13 +-
 .../src/features/overview/FleetOverview.tsx   |   7 +-
 .../src/features/overview/OverviewPage.tsx    |  30 +-
 .../features/overview/getting-started.test.ts |  12 +-
 .../src/features/overview/getting-started.ts  |  21 +-
 .../src/features/overview/overview-loader.ts  |  12 +-
 .../features/overview/overview-model.test.ts  |  27 +-
 .../src/features/overview/overview-model.ts   |  52 +-
 .../src/features/overview/overview-queries.ts |   5 +-
 .../src/features/overview/test-fixtures.ts    |  10 +-
 apps/web/src/features/sandbox/NodeDetail.tsx  |  12 +-
 .../src/features/sandbox/NodeEnrollment.tsx   |   2 +-
 apps/web/src/features/sandbox/NodeList.tsx    |  14 +-
 .../sessions/ExecutorCredentialsSection.tsx   |  12 +-
 .../features/sessions/SessionDeleteDialog.tsx |   5 +-
 .../src/features/sessions/SessionLogPage.tsx  |   5 +-
 .../executor-credential-ownership.test.tsx    |   2 +-
 .../src/features/sessions/session-log.test.ts |   9 +-
 apps/web/src/i18n/locales/en/keys.ts          |   3 +-
 apps/web/src/i18n/locales/zh-CN/keys.ts       |   3 +-
 apps/web/src/lib/admin-view.ts                | 232 +----
 apps/web/src/lib/format.ts                    |   7 +
 apps/web/src/lib/projects.tsx                 |  55 +-
 apps/web/src/lib/sandbox-diagnostic.test.ts   |   2 +-
 contracts/agents-api/core.openapi.yaml        | 469 ++++++++-
 contracts/agents-api/index.md                 |   2 +-
 contracts/agents-api/runtime.openapi.yaml     |  12 +
 contracts/agents-api/zh/index.md              |   4 +-
 packages/agents-client/README.md              |   2 +-
 .../agents-client/src/admin-client.test.ts    |  27 +-
 packages/agents-client/src/admin-client.ts    |  25 +-
 .../agents-client/src/admin-projection.ts     | 146 ++-
 packages/agents-client/src/admin-types.ts     | 228 +----
 packages/agents-client/src/client.ts          |  30 +-
 packages/agents-client/src/core-metrics.ts    | 108 +--
 .../src/execution-configuration-projection.ts |  32 +-
 .../agents-client/src/generated/core-api.ts   | 907 ++++++++++++++++++
 packages/agents-client/src/index.ts           |   7 +-
 .../src/runtime-history-projection.ts         |  57 +-
 .../agents-client/src/sandbox-client.test.ts  |   2 +-
 packages/agents-client/src/sandbox-client.ts  | 280 ++----
 .../agents-client/src/session-diagnostics.ts  |  60 +-
 packages/agents-client/src/types.ts           | 161 +---
 scripts/generate-public-api.py                |  49 +-
 scripts/generate-public-api.test.py           |  22 +
 scripts/openapi-split/main.go                 |  50 +-
 scripts/openapi-split/main_test.go            |  25 +-
 services/core/internal/adminaudit/reader.go   |  26 +-
 services/core/internal/api/admin_runtime.go   |  14 +-
 .../internal/api/admin_session_archive.go     |   2 +-
 services/core/internal/api/admin_summary.go   |  38 +-
 .../api/environment_executor_management.go    |   2 +-
 services/core/internal/api/installation.go    |  30 +-
 .../core/internal/api/project_api_keys.go     |   4 +-
 services/core/internal/api/sandbox_manager.go |  12 +-
 .../core/internal/api/session_diagnostics.go  |  38 +-
 services/core/internal/api/write_audit.go     |   2 +-
 services/core/internal/coremetrics/types.go   | 112 +--
 .../core/internal/deployment/allocation.go    |  24 +-
 services/core/internal/deployment/node.go     |  74 +-
 .../core/internal/deployment/public_url.go    |   8 +-
 services/core/internal/deployment/view.go     |  76 +-
 services/core/internal/projects/api_key.go    |  18 +-
 services/core/internal/projects/project.go    |  14 +-
 services/core/internal/sandbox/deployment.go  |  18 +-
 services/core/internal/sessions/admin.go      |  12 +-
 .../internal/sessions/executor_credentials.go |  10 +-
 services/core/internal/sessions/reads.go      |   6 +-
 services/core/internal/writeaudit/reader.go   |  38 +-
 86 files changed, 2424 insertions(+), 1656 deletions(-)
 create mode 100644 packages/agents-client/src/generated/core-api.ts

diff --git a/Makefile b/Makefile
index f769ed092..f6b4b3836 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ openapi:
 	    --output "$$output" \
 	    --outputTypes yaml --parseInternal; \
 	python3 scripts/patch-agents-openapi.py "$$output/swagger.yaml"; \
-	go run ./scripts/openapi-split $(OPENAPI_FLAGS) "$$output/swagger.yaml" "$$output/extensions.json" contracts/agents-api/core.openapi.yaml contracts/agents-api/runtime.openapi.yaml; \
-	python3 scripts/generate-public-api.py $(OPENAPI_FLAGS) --extensions "$$output/extensions.json"
+	go run ./scripts/openapi-split $(OPENAPI_FLAGS) "$$output/swagger.yaml" "$$output/extensions.json" "$$output/core.json" contracts/agents-api/core.openapi.yaml contracts/agents-api/runtime.openapi.yaml; \
+	python3 scripts/generate-public-api.py $(OPENAPI_FLAGS) --extensions "$$output/extensions.json" --core "$$output/core.json"
 
 check-sqlc:
 	python3 scripts/check-sqlc.py
diff --git a/apps/web/src/features/agents/AgentsPage.tsx b/apps/web/src/features/agents/AgentsPage.tsx
index e3f9fab0e..af7e82846 100644
--- a/apps/web/src/features/agents/AgentsPage.tsx
+++ b/apps/web/src/features/agents/AgentsPage.tsx
@@ -21,8 +21,7 @@ import { useAgentDetail } from "../resources/detail-queries";
 
 
 function coverage(summary: ProjectSummary | undefined, locale?: string): string {
-  if (!summary || summary.coverage.sessions === 0) return MISSING;
-  return formatPercent(summary.coverage.reported / summary.coverage.sessions, locale);
+  return summary ? formatPercent(summary.coverage.ratio, locale) : MISSING;
 }
 
 /**
diff --git a/apps/web/src/features/api-keys/KeyFlowDialogs.test.tsx b/apps/web/src/features/api-keys/KeyFlowDialogs.test.tsx
index df1cedf90..bfe3ab950 100644
--- a/apps/web/src/features/api-keys/KeyFlowDialogs.test.tsx
+++ b/apps/web/src/features/api-keys/KeyFlowDialogs.test.tsx
@@ -3,15 +3,14 @@ import type { ReactElement } from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it } from "vitest";
 
-import { AgentCoreError } from "@oac/agents-client";
+import { type AdminIssuedAPIKey, type AdminProject, AgentCoreError } from "@oac/agents-client";
 import { flowError, keyFlowReducer, type KeyFlow } from "./key-flows";
 import { KeyFlowDialogs, PendingKeyNotice } from "./KeyFlowDialogs";
 import type { KeyFlowControls } from "./use-key-flow";
-import { type AdminIssuedKey, type Project } from "../../lib/admin-view";
 
-const project: Project = { id: "proj_7f3a91c2", name: "Production", status: "active", created_at: 100, archived_at: null, active_key_count: 1 };
+const project: AdminProject = { id: "proj_7f3a91c2", name: "Production", created_at: "1970-01-01T00:01:40Z", archived_at: null, active_key_count: 1 };
 const secret = "pc_live_" + "s".repeat(40);
-const issued: AdminIssuedKey = { id: "9f0e1d2c-3b4a-4c5d-8e6f-7a8b9c0d1e2f", project_id: "proj_7f3a91c2", name: "bob-laptop", prefix: "pc_live_Zq8", created_at: 300, revoked_at: null, key: secret };
+const issued: AdminIssuedAPIKey = { id: "9f0e1d2c-3b4a-4c5d-8e6f-7a8b9c0d1e2f", project_id: "proj_7f3a91c2", name: "bob-laptop", prefix: "pc_live_Zq8", created_at: "1970-01-01T00:05:00Z", revoked_at: null, key: secret };
 const controls = (flow: KeyFlow): KeyFlowControls => ({ flow, dispatch: () => undefined, submit: async () => undefined });
 // The how-to-call card under a new key reads the installation through the query cache.
 const render = (element: ReactElement) => renderToStaticMarkup(<QueryClientProvider client={new QueryClient()}>{element}</QueryClientProvider>);
diff --git a/apps/web/src/features/api-keys/ProjectDetail.tsx b/apps/web/src/features/api-keys/ProjectDetail.tsx
index 435c0d9b2..98ea1cb25 100644
--- a/apps/web/src/features/api-keys/ProjectDetail.tsx
+++ b/apps/web/src/features/api-keys/ProjectDetail.tsx
@@ -1,3 +1,4 @@
+import type { AdminAPIKey, AdminProject } from "@oac/agents-client";
 import { useQuery } from "@tanstack/react-query";
 import { Plus } from "lucide-react";
 import { useTranslation } from "react-i18next";
@@ -5,7 +6,7 @@ import { useTranslation } from "react-i18next";
 
 import { EmptyState, HelpTip, Kpi, KpiStrip, Section, StatusDot } from "../../components/console-ui";
 import { CopyableId, RowActions } from "../../components/list-ui";
-import { formatCompact, formatDateTime, formatInteger, formatRelative } from "../../lib/format";
+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";
@@ -14,11 +15,11 @@ import { prefixLabel } from "./key-flows";
 import { loadedFrom, projectKeysQuery, projectSummaryQuery, type Loaded } from "./project-queries";
 import { ProjectStatus } from "./ProjectStatus";
 import { WriteOperations } from "./WriteOperations";
-import { type AdminKey, type Project, type ProjectSummary } from "../../lib/admin-view";
+import { type ProjectSummary } from "../../lib/admin-view";
 import { TableSkeleton } from "../../components/Skeleton";
 
 /** A project's keys, active first, from the query cache. */
-export function useProjectKeys(projectId: string | null): Loaded<AdminKey[]> & { retry: () => void } {
+export function useProjectKeys(projectId: string | null): Loaded<AdminAPIKey[]> & { retry: () => void } {
   const query = useQuery({ ...projectKeysQuery(projectId ?? ""), enabled: projectId !== null });
   const { refetch } = query;
   return { ...loadedFrom(query), retry: () => { void refetch(); } };
@@ -38,11 +39,11 @@ const assetLinks: ReadonlyArray<{ key: "agents" | "environment_templates" | "ski
  * write-operation history.
  */
 export function ProjectDetail({ project, keys, busy, onIssue, onRevoke }: {
-  project: Project;
+  project: AdminProject;
   keys: ReturnType<typeof useProjectKeys>;
   busy: boolean;
   onIssue: () => void;
-  onRevoke: (key: AdminKey, activeCount: number) => void;
+  onRevoke: (key: AdminAPIKey, activeCount: number) => void;
 }) {
   const { t, i18n } = useTranslation("keys");
   const { t: tCommon } = useTranslation("common");
@@ -73,8 +74,8 @@ export function ProjectDetail({ project, keys, busy, onIssue, onRevoke }: {
       <dl className="resource-facts" aria-label={t("detail.facts")}>
         <div><dt>{t("detail.id")}</dt><dd><CopyableId id={project.id} /></dd></div>
         <div><dt>{t("detail.status")}</dt><dd><ProjectStatus project={project} /></dd></div>
-        <div><dt>{t("detail.created")}</dt><dd>{formatDateTime(project.created_at, locale)}</dd></div>
-        {project.archived_at !== null ? <div><dt>{t("detail.archived")}</dt><dd>{formatDateTime(project.archived_at, locale)}</dd></div> : null}
+        <div><dt>{t("detail.created")}</dt><dd>{formatDateTime(epochSeconds(project.created_at), locale)}</dd></div>
+        {project.archived_at !== null ? <div><dt>{t("detail.archived")}</dt><dd>{formatDateTime(epochSeconds(project.archived_at), locale)}</dd></div> : null}
         <div>
           <dt>{t("detail.lastActive")}</dt>
           <dd title={summary?.last_active_at != null ? formatDateTime(summary.last_active_at, locale) : undefined}>{formatRelative(summary?.last_active_at, now, locale)}</dd>
@@ -117,7 +118,7 @@ export function ProjectDetail({ project, keys, busy, onIssue, onRevoke }: {
           <Kpi
             label={t("detail.usageFigures.coverage")}
             help={t("detail.usageFigures.coverageHelp")}
-            value={summary && !pending ? t("detail.coverageValue", { reported: formatInteger(summary.coverage.reported, locale), total: formatInteger(summary.coverage.sessions, locale) }) : "—"}
+            value={summary && !pending ? t("detail.coverageValue", { reported: formatInteger(summary.coverage.measured_sessions, locale), total: formatInteger(summary.coverage.total_sessions, locale) }) : "—"}
           />
         </KpiStrip>
       </Section>
@@ -132,7 +133,7 @@ export function ProjectDetail({ project, keys, busy, onIssue, onRevoke }: {
           </span>
         ) : null}</>}
         help={t("detail.keysHelp")}
-        actions={project.status === "active" ? (
+        actions={project.archived_at === null ? (
           <button className="button outline" type="button" onClick={onIssue} disabled={busy}>
             <Plus size={14} aria-hidden="true" />{t("actions.issue")}
           </button>
@@ -145,7 +146,7 @@ export function ProjectDetail({ project, keys, busy, onIssue, onRevoke }: {
         ) : !keys.value.length && !unknownUsage ? (
           <EmptyState
             title={t("detail.noKeys")}
-            action={project.status === "active" ? <button className="button outline" type="button" onClick={onIssue} disabled={busy}>{t("actions.issue")}</button> : undefined}
+            action={project.archived_at === null ? <button className="button outline" type="button" onClick={onIssue} disabled={busy}>{t("actions.issue")}</button> : undefined}
           />
         ) : (
           <div className="table-frame">
@@ -177,13 +178,13 @@ export function ProjectDetail({ project, keys, busy, onIssue, onRevoke }: {
                       <td>
                         <span className="key-status">
                           <StatusDot tone={revoked ? "neutral" : "ok"} label={revoked ? t("detail.keyStatus.revoked") : t("detail.keyStatus.active")} />
-                          {revoked ? <span className="key-status-date">{formatDateTime(key.revoked_at, locale)}</span> : null}
+                          {revoked ? <span className="key-status-date">{formatDateTime(epochSeconds(key.revoked_at), locale)}</span> : null}
                         </span>
                       </td>
-                      <td className="key-nowrap">{formatDateTime(key.created_at, locale)}</td>
+                      <td className="key-nowrap">{formatDateTime(epochSeconds(key.created_at), locale)}</td>
                       {keyUsage(byKey?.get(key.id))}
                       <td className="actions-cell">
-                        {!revoked && project.status === "active" ? (
+                        {!revoked && project.archived_at === null ? (
                           <RowActions>
                             <button className="text-action danger" type="button" aria-label={t("actions.revokeLabel", { name: key.name })} disabled={busy} onClick={() => onRevoke(key, activeCount)}>
                               {t("actions.revoke")}
@@ -210,7 +211,7 @@ export function ProjectDetail({ project, keys, busy, onIssue, onRevoke }: {
         )}
       </Section>
 
-      {project.status === "active" ? <ProjectHowToCall /> : null}
+      {project.archived_at === null ? <ProjectHowToCall /> : null}
 
       <WriteOperations projectId={project.id} keys={keys.value} />
     </>
diff --git a/apps/web/src/features/api-keys/ProjectStatus.tsx b/apps/web/src/features/api-keys/ProjectStatus.tsx
index f0a979e42..83ed957f6 100644
--- a/apps/web/src/features/api-keys/ProjectStatus.tsx
+++ b/apps/web/src/features/api-keys/ProjectStatus.tsx
@@ -1,12 +1,12 @@
+import type { AdminProject } from "@oac/agents-client";
 import { useTranslation } from "react-i18next";
 
 
 import { StatusDot } from "../../components/console-ui";
-import { type Project } from "../../lib/admin-view";
 
-export function ProjectStatus({ project }: { project: Project }) {
+export function ProjectStatus({ project }: { project: AdminProject }) {
   const { t } = useTranslation("keys");
-  return project.status === "archived"
+  return project.archived_at !== null
     ? <StatusDot tone="neutral" label={t("status.archived")} />
     : <StatusDot tone="ok" label={t("status.active")} />;
 }
diff --git a/apps/web/src/features/api-keys/ProjectsPage.tsx b/apps/web/src/features/api-keys/ProjectsPage.tsx
index 01cf722cc..cd8f91f8e 100644
--- a/apps/web/src/features/api-keys/ProjectsPage.tsx
+++ b/apps/web/src/features/api-keys/ProjectsPage.tsx
@@ -1,3 +1,4 @@
+import type { AdminAPIKey, AdminProject } from "@oac/agents-client";
 import { useIsFetching, useQuery, useQueryClient } from "@tanstack/react-query";
 import { ArrowLeft, FolderKanban, Plus } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
@@ -10,7 +11,7 @@ import { ListToolbar, listSummary, NameCell, RowActions, SearchField } from "../
 import { Modal } from "../../components/Modal";
 import { useFailureToast } from "../../components/Toast";
 import { useConsoleIntent, useConsoleNavigation } from "../../lib/console-navigation";
-import { formatDateTime, formatInteger, formatRelative } from "../../lib/format";
+import { epochSeconds, formatDateTime, formatInteger, formatRelative } from "../../lib/format";
 import { admin, useProjects } from "../../lib/projects";
 import { activeKeyNames, archiveKeyCount, flowError, isAbort, isArchiveConfirmed, isUsableName, matchesProject, normalizeName, prefixLabel, projectNameProblem, type FlowError } from "./key-flows";
 import { FlowErrorMessage, KeyFlowDialogs, NameField, PendingKeyNotice } from "./KeyFlowDialogs";
@@ -22,18 +23,17 @@ import { projectsQuery } from "../../lib/queries";
 import { ProjectStatus } from "./ProjectStatus";
 import { useKeyFlow } from "./use-key-flow";
 import "./api-keys.css";
-import { type AdminKey, archiveProject, createProject, type Project, renameProject, revokeKey } from "../../lib/admin-view";
 import { TableSkeleton } from "../../components/Skeleton";
 
 type Dialog =
   /** `thenIssue`: Getting started continues from the new project to its first key. */
   | { kind: "create"; name: string; thenIssue?: boolean }
-  | { kind: "rename"; project: Project; name: string }
+  | { kind: "rename"; project: AdminProject; name: string }
   /** `typed`: the project name, required while it has active keys. */
-  | { kind: "archive"; project: Project; typed: string }
-  | { kind: "revoke"; project: Project; key: AdminKey; activeCount: number };
+  | { kind: "archive"; project: AdminProject; typed: string }
+  | { kind: "revoke"; project: AdminProject; key: AdminAPIKey; activeCount: number };
 
-const manageable = (project: Project) => project.status === "active";
+const manageable = (project: AdminProject) => project.archived_at === null;
 
 /**
  * Platform › Projects and keys. A project owns the assets shared by all of
@@ -58,7 +58,7 @@ export function ProjectsPage() {
   useEffect(() => { setSelectedId(params.id ?? null); }, [params]);
 
   // After a key is issued (or its outcome is uncertain), re-read the project and its keys.
-  const keyChanged = useCallback((project: Project) => {
+  const keyChanged = useCallback((project: AdminProject) => {
     void invalidateProjects(queryClient, { projectId: project.id });
   }, [queryClient]);
   const controls = useKeyFlow(keyChanged);
@@ -138,17 +138,17 @@ export function ProjectsPage() {
     setDialogError(null);
     try {
       if (current.kind === "create") {
-        const project = await createProject(normalizeName(current.name));
+        const project = await admin.createProject({ name: normalizeName(current.name) });
         // The project page opens anew and finds the project in the list at once;
         // the re-read below confirms it. The key dialog follows as its intent.
         queryClient.setQueryData(projectsQuery.queryKey, (list) => (list && !list.some((entry) => entry.id === project.id) ? [...list, project] : list ?? [project]));
         navigate("projects", { id: project.id }, current.thenIssue ? "issue-key" : undefined);
       } else if (current.kind === "rename") {
-        await renameProject(current.project.id, normalizeName(current.name));
+        await admin.renameProject(current.project.id, { name: normalizeName(current.name) });
       } else if (current.kind === "archive") {
-        await archiveProject(current.project.id);
+        await admin.archiveProject(current.project.id);
       } else {
-        await revokeKey(current.project.id, current.key.id);
+        await admin.revokeAPIKey(current.project.id, current.key.id);
       }
       setDialog(null);
     } catch (error) {
@@ -260,7 +260,7 @@ export function ProjectsPage() {
                         </th>
                         <td><ProjectStatus project={project} /></td>
                         <td className="numeric">{formatInteger(project.active_key_count, locale)}</td>
-                        <td className="key-nowrap">{formatDateTime(project.created_at, locale)}</td>
+                        <td className="key-nowrap">{formatDateTime(epochSeconds(project.created_at), locale)}</td>
                         <td className="key-nowrap" title={lastActive !== null ? formatDateTime(lastActive, locale) : undefined}>{formatRelative(lastActive, now, locale)}</td>
                         <td className="actions-cell" onClick={(event) => event.stopPropagation()}>
                           {manageable(project) ? (
diff --git a/apps/web/src/features/api-keys/WriteOperations.tsx b/apps/web/src/features/api-keys/WriteOperations.tsx
index 03f41c3a1..378e61c30 100644
--- a/apps/web/src/features/api-keys/WriteOperations.tsx
+++ b/apps/web/src/features/api-keys/WriteOperations.tsx
@@ -1,3 +1,4 @@
+import { type AdminAPIKey, type AdminKeyProvenance, type AdminResourceType, adminResourceTypes } from "@oac/agents-client";
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { History } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
@@ -7,28 +8,22 @@ import { useTranslation } from "react-i18next";
 import { useFailureToast } from "../../components/Toast";
 import { EmptyState, Section } from "../../components/console-ui";
 import { CopyableId, ListToolbar, listSummary } from "../../components/list-ui";
-import { formatDateTime, shortId } from "../../lib/format";
+import { epochSeconds, formatDateTime, shortId } from "../../lib/format";
 import { admin } from "../../lib/projects";
 import { prefixLabel } from "./key-flows";
 import { writeOperationsQuery } from "./project-queries";
-import { type AdminKey, type KeyRef, type OwnerResourceType, ownerResourceTypes } from "../../lib/admin-view";
 import { TableSkeleton } from "../../components/Skeleton";
 import { ConsoleSelect } from "../../components/console-select";
 
-export const operationActions = ["create", "update", "delete", "send_events", "upload_file", "upload_version", "update_default_version"] as const;
-type OperationAction = (typeof operationActions)[number];
+const isType = (value: string): value is AdminResourceType => (adminResourceTypes as readonly string[]).includes(value);
 
-const isType = (value: string): value is OwnerResourceType => (ownerResourceTypes as readonly string[]).includes(value);
-const isAction = (value: string): value is OperationAction => (operationActions as readonly string[]).includes(value);
-
-/** The recorded key of a write: its name, else its prefix; "unknown" when none was recorded. */
-export function OperationKey({ value }: { value: KeyRef | null }) {
+/** The recorded key of a write, by name. */
+export function OperationKey({ value }: { value: AdminKeyProvenance }) {
   const { t } = useTranslation("keys");
-  if (!value) return <span className="table-muted">{t("operations.unknownKey")}</span>;
   const revoked = value.revoked_at !== null;
   return (
-    <span className={revoked ? "operation-key revoked" : "operation-key"} title={[value.prefix ? prefixLabel(value.prefix) : null, revoked ? t("detail.keyStatus.revoked") : null].filter(Boolean).join(" · ") || undefined}>
-      {value.name ?? prefixLabel(value.prefix)}
+    <span className={revoked ? "operation-key revoked" : "operation-key"} title={[prefixLabel(value.prefix), revoked ? t("detail.keyStatus.revoked") : null].filter(Boolean).join(" · ")}>
+      {value.name}
     </span>
   );
 }
@@ -37,11 +32,11 @@ export function OperationKey({ value }: { value: KeyRef | null }) {
  * Every successful write made in one project, newest first, with cursor
  * paging (`next_cursor`). Filters go to Core; nothing is inferred.
  */
-export function WriteOperations({ projectId, keys }: { projectId: string; keys: readonly AdminKey[] | null }) {
+export function WriteOperations({ projectId, keys }: { projectId: string; keys: readonly AdminAPIKey[] | null }) {
   const { t, i18n } = useTranslation("keys");
   const { t: tCommon } = useTranslation("common");
   const locale = i18n.resolvedLanguage;
-  const [type, setType] = useState<OwnerResourceType | "">("");
+  const [type, setType] = useState<AdminResourceType | "">("");
   const [keyId, setKeyId] = useState("");
   const query = useInfiniteQuery(writeOperationsQuery(projectId, { keyId, type }));
   const { data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } = query;
@@ -55,8 +50,7 @@ export function WriteOperations({ projectId, keys }: { projectId: string; keys:
     void fetchNextPage();
   }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
 
-  const actionLabel = (action: string) => (isAction(action) ? t(`operations.actions.${action}`) : action);
-  const typeLabel = (value: string) => (isType(value) ? t(`operations.types.${value}`) : value);
+  const typeLabel = (value: AdminResourceType) => t(`operations.types.${value}`);
 
   useFailureToast(Boolean(entries) && query.isRefetchError && !query.isFetching, t("operations.failed"), "write-operations-refresh");
   useFailureToast(moreFailed, t("operations.moreFailed"), "write-operations-more");
@@ -89,9 +83,9 @@ export function WriteOperations({ projectId, keys }: { projectId: string; keys:
             <tbody>
               {entries.map((entry) => (
                 <tr key={entry.id}>
-                  <td className="operations-time">{formatDateTime(entry.created_at, locale)}</td>
+                  <td className="operations-time">{formatDateTime(epochSeconds(entry.created_at), locale)}</td>
                   <td><OperationKey value={entry.api_key} /></td>
-                  <td>{actionLabel(entry.action)}</td>
+                  <td>{t(`operations.actions.${entry.action}`)}</td>
                   <td>{typeLabel(entry.resource_type)}</td>
                   <td>
                     <span className="operations-resource">
@@ -136,7 +130,7 @@ export function WriteOperations({ projectId, keys }: { projectId: string; keys:
           onChange={(value) => setType(isType(value) ? value : "")}
           options={[
             { value: "", label: t("operations.allTypes") },
-            ...ownerResourceTypes.map((value) => ({ value, label: typeLabel(value) })),
+            ...adminResourceTypes.map((value) => ({ value, label: typeLabel(value) })),
           ]}
         />
       </ListToolbar>
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 1c167af1e..085e63a55 100644
--- a/apps/web/src/features/api-keys/key-flows.test.ts
+++ b/apps/web/src/features/api-keys/key-flows.test.ts
@@ -1,6 +1,5 @@
-import { AgentCoreError } from "@oac/agents-client";
+import { type AdminAPIKey, type AdminIssuedAPIKey, type AdminProject, AgentCoreError } from "@oac/agents-client";
 import { describe, expect, it } from "vitest";
-import { type AdminIssuedKey, type AdminKey, type Project } from "../../lib/admin-view";
 
 import {
   activeKeyNames,
@@ -19,10 +18,11 @@ import {
   type KeyFlowEvent,
 } from "./key-flows";
 
-const project: Project = { id: "proj_7f3a91c2", name: "Production", status: "active", created_at: 100, archived_at: null, active_key_count: 1 };
-const archived: Project = { ...project, id: "proj_0b533e99", name: "Legacy", status: "archived", archived_at: 200, active_key_count: 0 };
+const at = (seconds: number) => new Date(seconds * 1000).toISOString();
+const project: AdminProject = { id: "proj_7f3a91c2", name: "Production", created_at: at(100), archived_at: null, active_key_count: 1 };
+const archived: AdminProject = { ...project, id: "proj_0b533e99", name: "Legacy", archived_at: at(200), active_key_count: 0 };
 const secret = "pc_live_" + "x".repeat(40);
-const issued: AdminIssuedKey = { id: "9f0e1d2c-3b4a-4c5d-8e6f-7a8b9c0d1e2f", project_id: "proj_7f3a91c2", name: "bob-laptop", prefix: "pc_live_Zq8", created_at: 300, revoked_at: null, key: secret };
+const issued: AdminIssuedAPIKey = { id: "9f0e1d2c-3b4a-4c5d-8e6f-7a8b9c0d1e2f", project_id: "proj_7f3a91c2", name: "bob-laptop", prefix: "pc_live_Zq8", created_at: at(300), revoked_at: null, key: secret };
 
 const run = (events: KeyFlowEvent[], from: KeyFlow = idleFlow) => events.reduce(keyFlowReducer, from);
 
@@ -47,7 +47,7 @@ describe("project and key names", () => {
     expect(keyNameProblem("tab\there")).toBe("invalid");
     expect(projectNameProblem(" Production", ["Production", "Data team"])).toBe("taken");
     expect(keyNameProblem("alice", activeKeyNames([
-      { id: "a", project_id: "proj_7f3a91c2", name: "alice", prefix: "pc_a", created_at: 1, revoked_at: 2 },
+      { id: "a", project_id: "proj_7f3a91c2", name: "alice", prefix: "pc_a", created_at: at(1), revoked_at: at(2) },
     ]))).toBeNull();
     expect(isUsableName("Production", projectNameProblem("Production", ["Production"]))).toBe(false);
   });
@@ -109,7 +109,7 @@ describe("issuing a key", () => {
 
 describe("helpers", () => {
   it("lists active keys first, newest first", () => {
-    const key = (id: string, created: number, revoked: number | null = null): AdminKey => ({ id, project_id: "proj_7f3a91c2", name: id, prefix: `pc_${id}`, created_at: created, revoked_at: revoked });
+    const key = (id: string, created: number, revoked: number | null = null): AdminAPIKey => ({ id, project_id: "proj_7f3a91c2", name: id, prefix: `pc_${id}`, created_at: at(created), revoked_at: revoked === null ? null : at(revoked) });
     expect(sortKeys([key("old", 1), key("gone", 5, 6), key("new", 3)]).map((entry) => entry.id)).toEqual(["new", "old", "gone"]);
   });
 
@@ -120,10 +120,10 @@ describe("helpers", () => {
   });
 
   it("counts the keys archiving revokes from the project read, or from its key list when that shows more", () => {
-    const key = (id: string, projectId = project.id, revoked: number | null = null): AdminKey => ({ id, project_id: projectId, name: id, prefix: `pc_${id}`, created_at: 1, revoked_at: revoked });
+    const key = (id: string, projectId = project.id, revoked: string | null = null): AdminAPIKey => ({ id, project_id: projectId, name: id, prefix: `pc_${id}`, created_at: at(1), revoked_at: revoked });
     const stale = { ...project, active_key_count: 0 };
     expect(archiveKeyCount(stale, undefined)).toBe(0);
-    expect(archiveKeyCount(stale, [key("new"), key("old", project.id, 5), key("other", "proj_other")])).toBe(1);
+    expect(archiveKeyCount(stale, [key("new"), key("old", project.id, at(5)), key("other", "proj_other")])).toBe(1);
     expect(archiveKeyCount({ ...project, active_key_count: 3 }, [key("new")])).toBe(3);
   });
 
diff --git a/apps/web/src/features/api-keys/key-flows.ts b/apps/web/src/features/api-keys/key-flows.ts
index b960bad53..318d9c605 100644
--- a/apps/web/src/features/api-keys/key-flows.ts
+++ b/apps/web/src/features/api-keys/key-flows.ts
@@ -1,5 +1,4 @@
-import { AgentCoreError } from "@oac/agents-client";
-import { type AdminIssuedKey, type AdminKey, type Project } from "../../lib/admin-view";
+import { type AdminAPIKey, type AdminIssuedAPIKey, type AdminProject, AgentCoreError } from "@oac/agents-client";
 
 /**
  * Pure state for projects and their named API keys. A project owns the assets
@@ -46,7 +45,7 @@ export function isUsableName(value: string, problem: NameProblem | null): boolea
  * project's loaded key list shows more (it may be newer, for example after a
  * key was issued and the project list could not be read again).
  */
-export function archiveKeyCount(project: Pick<Project, "id" | "active_key_count">, keys: readonly AdminKey[] | null | undefined): number {
+export function archiveKeyCount(project: Pick<AdminProject, "id" | "active_key_count">, keys: readonly AdminAPIKey[] | null | undefined): number {
   const listed = keys ? keys.filter((key) => key.project_id === project.id && key.revoked_at === null).length : 0;
   return Math.max(project.active_key_count, listed);
 }
@@ -87,16 +86,16 @@ export function isAbort(error: unknown): boolean {
 export type KeyFlow =
   | { step: "idle" }
   /** Issue a named key for an active project. */
-  | { step: "issue"; project: Project; name: string; busy: boolean; error: FlowError | null }
+  | { step: "issue"; project: AdminProject; name: string; busy: boolean; error: FlowError | null }
   /** The plaintext is on screen until the operator confirms it was saved. */
-  | { step: "issued"; project: Project; issued: AdminIssuedKey; open: boolean };
+  | { step: "issued"; project: AdminProject; issued: AdminIssuedAPIKey; open: boolean };
 
 export type KeyFlowEvent =
-  | { type: "openIssue"; project: Project }
+  | { type: "openIssue"; project: AdminProject }
   | { type: "setName"; name: string }
   | { type: "started" }
   | { type: "failed"; error: FlowError }
-  | { type: "issued"; projectId: string; key: AdminIssuedKey }
+  | { type: "issued"; projectId: string; key: AdminIssuedAPIKey }
   | { type: "hideIssued" }
   | { type: "saved" }
   | { type: "cancel" };
@@ -107,7 +106,7 @@ export function keyFlowReducer(flow: KeyFlow, event: KeyFlowEvent): KeyFlow {
   switch (event.type) {
     case "openIssue":
       // Never start a second issuance while a plaintext key is waiting to be saved.
-      if (flow.step !== "idle" || event.project.status !== "active") return flow;
+      if (flow.step !== "idle" || event.project.archived_at !== null) return flow;
       return { step: "issue", project: event.project, name: "", busy: false, error: null };
     case "setName":
       return flow.step === "issue" && !flow.busy ? { ...flow, name: event.name, error: null } : flow;
@@ -131,16 +130,16 @@ export function keyFlowReducer(flow: KeyFlow, event: KeyFlowEvent): KeyFlow {
 }
 
 /** The plaintext currently held by a flow, if any. */
-export function pendingPlaintext(flow: KeyFlow): AdminIssuedKey | null {
+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 AdminKey[]): AdminKey[] {
-  return [...keys].sort((a, b) => Number(a.revoked_at !== null) - Number(b.revoked_at !== null) || b.created_at - a.created_at || a.id.localeCompare(b.id));
+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));
 }
 
-export function activeKeyNames(keys: readonly AdminKey[] | null | undefined): string[] {
+export function activeKeyNames(keys: readonly AdminAPIKey[] | null | undefined): string[] {
   return (keys ?? []).filter((key) => key.revoked_at === null).map((key) => key.name);
 }
 
@@ -149,7 +148,7 @@ export function prefixLabel(prefix: string | null | undefined): string {
   return prefix ? `${prefix}…` : "—";
 }
 
-export function matchesProject(project: Project, query: string): boolean {
+export function matchesProject(project: AdminProject, query: string): boolean {
   const needle = query.trim().toLocaleLowerCase();
   if (!needle) return true;
   return [project.name, project.id].some((value) => value.toLocaleLowerCase().includes(needle));
diff --git a/apps/web/src/features/api-keys/project-queries.ts b/apps/web/src/features/api-keys/project-queries.ts
index c74e71c05..a984f73d0 100644
--- a/apps/web/src/features/api-keys/project-queries.ts
+++ b/apps/web/src/features/api-keys/project-queries.ts
@@ -1,6 +1,7 @@
+import type { AdminResourceType } from "@oac/agents-client";
 import { infiniteQueryOptions, queryOptions, type QueryClient } from "@tanstack/react-query";
 
-import { listKeys, listWriteOperations, loadSummary, type OwnerResourceType, type ProjectSummary } from "../../lib/admin-view";
+import { listKeys, listWriteOperations, loadSummary, type ProjectSummary } from "../../lib/admin-view";
 import { projectsQuery } from "../../lib/queries";
 import { sortKeys } from "./key-flows";
 
@@ -26,7 +27,7 @@ export const projectScope = (projectId: string) => ["project", projectId] as con
 /** Last activity per project for the list: the per-project summary rows. */
 export const projectActivityQuery = queryOptions({
   queryKey: ["project-activity"],
-  queryFn: async ({ signal }) => (await loadSummary({ signal })).filter((row) => row.agent_id === null && row.key === null),
+  queryFn: async ({ signal }) => (await loadSummary({ signal })).filter((row) => row.agent_id === null && row.key_id === null),
   select: (rows: ProjectSummary[]): ReadonlyMap<string, ProjectSummary> => new Map(rows.map((row) => [row.project_id, row])),
 });
 
@@ -53,11 +54,11 @@ export function projectSummaryQuery(projectId: string) {
         loadSummary({ project_id: projectId, signal }),
         loadSummary({ project_id: projectId, group_by: "key", signal }).catch(() => null),
       ]);
-      const project = projectRows.find((row) => row.project_id === projectId && row.agent_id === null && row.key === null) ?? null;
+      const project = projectRows.find((row) => row.project_id === projectId && row.agent_id === null && row.key_id === null) ?? null;
       let byKey: ProjectSummaries["byKey"] = null;
       if (keyRows) {
         byKey = new Map();
-        for (const row of keyRows) if (row.project_id === projectId) byKey.set(row.key?.id ?? null, row);
+        for (const row of keyRows) if (row.project_id === projectId) byKey.set(row.key_id, row);
       }
       return { project, byKey };
     },
@@ -68,7 +69,7 @@ export const WRITE_OPERATIONS_PAGE_SIZE = 50;
 
 export interface WriteOperationFilter {
   keyId: string;
-  type: OwnerResourceType | "";
+  type: AdminResourceType | "";
 }
 
 /** One project's write operations for one filter, newest first, paged by `next_cursor`. */
diff --git a/apps/web/src/features/api-keys/use-key-flow.ts b/apps/web/src/features/api-keys/use-key-flow.ts
index 99aae65b2..bcd3712b3 100644
--- a/apps/web/src/features/api-keys/use-key-flow.ts
+++ b/apps/web/src/features/api-keys/use-key-flow.ts
@@ -1,7 +1,8 @@
+import type { AdminProject } from "@oac/agents-client";
 import { useCallback, useEffect, useReducer, useRef } from "react";
 
 import { flowError, idleFlow, isAbort, keyFlowReducer, normalizeName, type KeyFlow, type KeyFlowEvent } from "./key-flows";
-import { issueKey, type Project } from "../../lib/admin-view";
+import { admin } from "../../lib/admin-view";
 
 export interface KeyFlowControls {
   flow: KeyFlow;
@@ -15,7 +16,7 @@ export interface KeyFlowControls {
  * changed a project or its keys. Writes are never retried automatically: an
  * uncertain result is reported for the operator to check.
  */
-export function useKeyFlow(onChanged: (project: Project) => void = () => undefined): KeyFlowControls {
+export function useKeyFlow(onChanged: (project: AdminProject) => void = () => undefined): KeyFlowControls {
   const [flow, dispatch] = useReducer(keyFlowReducer, idleFlow);
   const flowRef = useRef(flow);
   flowRef.current = flow;
@@ -43,7 +44,7 @@ export function useKeyFlow(onChanged: (project: Project) => void = () => undefin
     const project = current.project;
     send({ type: "started" });
     try {
-      const key = await issueKey(project.id, keyName);
+      const key = await admin.issueAPIKey(project.id, { name: keyName });
       send({ type: "issued", projectId: project.id, key });
     } catch (error) {
       if (!isAbort(error)) send({ type: "failed", error: flowError(error) });
diff --git a/apps/web/src/features/metrics/AgentMetricsPage.tsx b/apps/web/src/features/metrics/AgentMetricsPage.tsx
index 833e35435..1bc88bdaa 100644
--- a/apps/web/src/features/metrics/AgentMetricsPage.tsx
+++ b/apps/web/src/features/metrics/AgentMetricsPage.tsx
@@ -1,3 +1,4 @@
+import type { AdminProject } from "@oac/agents-client";
 import { AlertTriangle } from "lucide-react";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
 import { useCallback, useMemo, useState } from "react";
@@ -39,7 +40,7 @@ import { type ProjectReadFailure } from "./project-sessions";
 import { type KeyUsageRow } from "./key-usage";
 import { useStableColors } from "./use-stable-colors";
 import "./MetricsView.css";
-import { type KeyRef, type Project, type ProjectSummary } from "../../lib/admin-view";
+import { type ProjectSummary } from "../../lib/admin-view";
 
 const RANGES: readonly AgentMetricsRange[] = ["1h", "6h", "24h", "7d"];
 
@@ -67,7 +68,7 @@ function bucketLabel(seconds: number, t: TFunction<"metrics">): string {
  * Agent metrics and usage by key through the query cache. A changed project
  * filter or range keeps the last figures on screen until the new ones arrive.
  */
-function useAgentMetricsData(projects: readonly Project[], projectsReady: boolean, filter: ProjectFilterValue, range: AgentMetricsRange) {
+function useAgentMetricsData(projects: readonly AdminProject[], projectsReady: boolean, filter: ProjectFilterValue, range: AgentMetricsRange) {
   const targets = useMemo(() => projects.filter((project) => !filter || project.id === filter), [filter, projects]);
   const metricsQuery = useQuery({ ...agentMetricsQuery(targets, filter, range), enabled: projectsReady, placeholderData: keepPreviousData });
   const keyQuery = useQuery({ ...keyUsageQuery(filter, range), enabled: projectsReady, placeholderData: keepPreviousData });
@@ -172,7 +173,7 @@ function AgentMetricsContent({
   metrics: AgentMetrics;
   listFailures: ProjectReadFailure[];
   showProject: boolean;
-  projectOf: (id: string | null) => Project | undefined;
+  projectOf: (id: string | null) => AdminProject | undefined;
   modelColor: (id: string) => string;
   toolColor: (id: string) => string;
   failure: string | null;
@@ -394,13 +395,8 @@ function AgentMetricsContent({
   );
 }
 
-function keyLabel(key: KeyRef | null, t: TFunction<"metrics">): string {
-  if (!key) return t("keys.unknown");
-  return key.name ?? (key.prefix ? `${key.prefix}…` : t("keys.unknown"));
-}
-
 /** Usage by the API key that created each Session, from Core's summary for the range. */
-function KeyUsageSection({ state, window, showProject, projectOf }: { state: KeyUsageState; window: MetricsWindow; showProject: boolean; projectOf: (id: string) => Project | undefined }) {
+function KeyUsageSection({ state, window, showProject, projectOf }: { state: KeyUsageState; window: MetricsWindow; showProject: boolean; projectOf: (id: string) => AdminProject | undefined }) {
   const { t, i18n } = useTranslation("metrics");
   const { t: tCommon } = useTranslation("common");
   const locale = i18n.resolvedLanguage;
@@ -434,13 +430,13 @@ function KeyUsageSection({ state, window, showProject, projectOf }: { state: Key
   );
 }
 
-function KeyUsageTableRow({ row, showProject, project, now, locale }: { row: ProjectSummary; showProject: boolean; project: Project | undefined; now: number; locale: string | undefined }) {
+function KeyUsageTableRow({ row, showProject, project, now, locale }: { row: ProjectSummary; showProject: boolean; project: AdminProject | undefined; now: number; locale: string | undefined }) {
   const { t } = useTranslation("metrics");
   const key = row.key;
   return (
     <tr>
       <th scope="row">
-        <span className={key ? "table-primary" : "table-primary table-muted"} title={key?.prefix ? `${key.prefix}…` : t("keys.unknownHelp")}>{keyLabel(key, t)}</span>
+        <span className={key ? "table-primary" : "table-primary table-muted"} title={key ? `${key.prefix}…` : t("keys.unknownHelp")}>{key ? key.name : t("keys.unknown")}</span>
         {key?.revoked_at ? <span className="pill">{t("keys.revoked")}</span> : null}
       </th>
       {showProject ? <td><ProjectName project={project} /></td> : null}
@@ -448,8 +444,8 @@ function KeyUsageTableRow({ row, showProject, project, now, locale }: { row: Pro
       <td className="numeric">{formatInteger(row.sessions.in_progress, locale)}</td>
       <td className={row.sessions.failed ? "numeric numeric-danger" : "numeric"}>{formatInteger(row.sessions.failed, locale)}</td>
       <td className="numeric">{row.usage ? formatCompact(row.usage.total_tokens, locale) : MISSING}</td>
-      <td className="numeric" title={row.coverage.sessions ? t("keys.coverageDetail", { reported: row.coverage.reported, total: row.coverage.sessions }) : undefined}>
-        {formatPercent(row.coverage.sessions ? row.coverage.reported / row.coverage.sessions : null, locale)}
+      <td className="numeric" title={row.coverage.total_sessions ? t("keys.coverageDetail", { reported: row.coverage.measured_sessions, total: row.coverage.total_sessions }) : undefined}>
+        {formatPercent(row.coverage.ratio, locale)}
       </td>
       <td className="numeric">{formatRelative(row.last_active_at, now, locale)}</td>
     </tr>
diff --git a/apps/web/src/features/metrics/CoreMetricsPage.tsx b/apps/web/src/features/metrics/CoreMetricsPage.tsx
index 0d7fe6239..887bc7a4e 100644
--- a/apps/web/src/features/metrics/CoreMetricsPage.tsx
+++ b/apps/web/src/features/metrics/CoreMetricsPage.tsx
@@ -9,7 +9,7 @@ import { TimeSeriesChart } from "../../components/charts/TimeSeriesChart";
 import { DashboardSkeleton, TableSkeleton } from "../../components/Skeleton";
 import { useFailureToast } from "../../components/Toast";
 import { EmptyState, Kpi, KpiStrip, PageBody, PageHeader, RefreshButton, Section, SegmentedControl, StatusDot, type Tone } from "../../components/console-ui";
-import { formatBucket, formatBytes, formatClock, formatDuration, formatInteger, formatRelative, MISSING } from "../../lib/format";
+import { epochSeconds, formatBucket, formatBytes, formatClock, formatDuration, formatInteger, formatRelative, MISSING } from "../../lib/format";
 import { FleetReadNotice } from "../fleet/FleetReadNotice";
 import { fleetSnapshot, useSandboxFleet } from "../fleet/use-sandbox-fleet";
 import { coreMetricsQuery } from "./metrics-queries";
@@ -22,12 +22,6 @@ const GIB = 2 ** 30;
 const jobTone: Record<CoreJobStatus, Tone> = { ok: "ok", failing: "danger", stopped: "warning", unknown: "neutral" };
 const statusTone: Record<CoreMetrics["service"]["status"], Tone> = { running: "ok", degraded: "warning", unknown: "neutral" };
 
-function seconds(value: string | null): number | null {
-  if (!value) return null;
-  const parsed = Date.parse(value);
-  return Number.isNaN(parsed) ? null : Math.floor(parsed / 1000);
-}
-
 function milliseconds(value: number | null): string {
   return value === null ? MISSING : formatDuration(value / 1000);
 }
@@ -93,7 +87,7 @@ export function CoreMetricsPage() {
 
 function ServiceMeta({ metrics }: { metrics: CoreMetrics }) {
   const { t } = useTranslation("metrics");
-  const started = seconds(metrics.service.started_at);
+  const started = epochSeconds(metrics.service.started_at);
   const now = Math.floor(Date.now() / 1000);
   const notOwner = metrics.service.execution_owner === false;
   return (
@@ -115,11 +109,11 @@ function CoreMetricsBody({ metrics }: { metrics: CoreMetrics }) {
   const locale = i18n.resolvedLanguage;
   const now = Math.floor(Date.now() / 1000);
   const { execution, database, process } = metrics;
-  const processBuckets = useMemo(() => process.series.map((entry) => seconds(entry.start) ?? 0), [process.series]);
+  const processBuckets = useMemo(() => process.series.map((entry) => epochSeconds(entry.start) ?? 0), [process.series]);
   const bucketSeconds = metrics.range.resolution_seconds;
   const bucket = formatBucket(bucketSeconds, locale);
-  const executionBuckets = useMemo(() => execution.series.map((entry) => seconds(entry.start) ?? 0), [execution.series]);
-  const databaseBuckets = useMemo(() => database.series.map((entry) => seconds(entry.start) ?? 0), [database.series]);
+  const executionBuckets = useMemo(() => execution.series.map((entry) => epochSeconds(entry.start) ?? 0), [execution.series]);
+  const databaseBuckets = useMemo(() => database.series.map((entry) => epochSeconds(entry.start) ?? 0), [database.series]);
   const count = (value: number | null) => (value === null ? MISSING : formatInteger(value, locale));
   const integer = (value: number) => formatInteger(value, locale);
   const slotsFull = execution.slots_in_use >= execution.slots_total;
@@ -313,7 +307,7 @@ function CoreMetricsBody({ metrics }: { metrics: CoreMetrics }) {
                   <tr key={job.id}>
                     <th scope="row"><span className="table-primary">{t(`core.jobs.names.${job.id}`, { defaultValue: job.id })}</span></th>
                     <td><StatusDot tone={jobTone[job.status]} label={t(`core.jobs.health.${job.status}`)} /></td>
-                    <td className="numeric" title={job.last_run_at ?? undefined}>{formatRelative(seconds(job.last_run_at), now, locale)}</td>
+                    <td className="numeric" title={job.last_run_at ?? undefined}>{formatRelative(epochSeconds(job.last_run_at), now, locale)}</td>
                     <td className="numeric">{count(job.processed)}</td>
                     <td className={job.failed ? "numeric numeric-danger" : "numeric"}>{count(job.failed)}</td>
                   </tr>
diff --git a/apps/web/src/features/metrics/agent-metrics-loader.ts b/apps/web/src/features/metrics/agent-metrics-loader.ts
index b7e6ba23a..27cddade7 100644
--- a/apps/web/src/features/metrics/agent-metrics-loader.ts
+++ b/apps/web/src/features/metrics/agent-metrics-loader.ts
@@ -1,9 +1,9 @@
-import type { AgentSession, AgentTurn, ListPage, PageOptions, SessionItem } from "@oac/agents-client";
+import type { AdminProject, AgentSession, AgentTurn, ListPage, PageOptions, SessionItem } from "@oac/agents-client";
 
 import type { ProjectClient } from "../../lib/projects";
 import type { MetricsCoverage, MetricsWindow, SessionActivity } from "./agent-metrics";
 import { readProjectsSessions, type InProject, type ProjectReadFailure, type SessionLister } from "./project-sessions";
-import { type Project, type ProjectSummary } from "../../lib/admin-view";
+import { type ProjectSummary } from "../../lib/admin-view";
 
 export interface AgentMetricsSource {
   listTurns(sessionId: string, options?: PageOptions): Promise<ListPage<AgentTurn>>;
@@ -204,7 +204,7 @@ export const PROJECT_SESSION_LIST_CAP = 2_000;
 type ProjectReader = SessionLister & Pick<ProjectClient, "listTurns" | "listItems">;
 
 /** Routes each Session's Turn and Item reads to the admin scope of its project. */
-export function projectMetricsSource(sessions: readonly InProject<AgentSession>[], clientFor: (project: Project) => AgentMetricsSource): AgentMetricsSource {
+export function projectMetricsSource(sessions: readonly InProject<AgentSession>[], clientFor: (project: AdminProject) => AgentMetricsSource): AgentMetricsSource {
   const owners = new Map(sessions.map((entry) => [entry.value.id, entry.project]));
   const client = (sessionId: string) => {
     const project = owners.get(sessionId);
@@ -229,7 +229,7 @@ export function projectMayHaveActivity(row: ProjectSummary | undefined, window:
 
 export interface ProjectAgentMetricsLoad extends AgentMetricsLoad {
   /** Projects whose Session list was longer than the list cap. */
-  truncatedLists: Project[];
+  truncatedLists: AdminProject[];
   listFailures: ProjectReadFailure[];
 }
 
@@ -239,9 +239,9 @@ export interface ProjectAgentMetricsLoad extends AgentMetricsLoad {
  * history of the most recently active ones through each project's scope.
  */
 export async function loadProjectAgentMetrics(
-  projects: readonly Project[],
+  projects: readonly AdminProject[],
   window: MetricsWindow,
-  deps: { clientFor: (project: Project) => ProjectReader; summary: ProjectSummary[] | null },
+  deps: { clientFor: (project: AdminProject) => ProjectReader; summary: ProjectSummary[] | null },
   signal: AbortSignal,
   options: { includeTools: boolean; limits?: AgentMetricsLoadLimits; listCap?: number },
 ): Promise<ProjectAgentMetricsLoad> {
diff --git a/apps/web/src/features/metrics/key-usage.test.ts b/apps/web/src/features/metrics/key-usage.test.ts
index ce8bfb7d7..422bee7ec 100644
--- a/apps/web/src/features/metrics/key-usage.test.ts
+++ b/apps/web/src/features/metrics/key-usage.test.ts
@@ -1,22 +1,19 @@
 import { describe, expect, it } from "vitest";
 
-
 import { summary } from "../overview/test-fixtures";
 import { keyUsageRows } from "./key-usage";
-import { type KeyRef } from "../../lib/admin-view";
 
-const key = (id: string): KeyRef => ({ id, name: id, prefix: `pc_${id}`, revoked_at: null });
 const sessions = (total: number) => ({ total, idle: total, in_progress: 0, requires_action: 0, failed: 0 });
-const usage = (total: number) => ({ input_tokens: total, output_tokens: 0, total_tokens: total, cached_tokens: 0, reasoning_tokens: 0 });
+const usage = (total: number) => ({ input_tokens: total, input_tokens_details: { cached_tokens: 0 }, output_tokens: 0, output_tokens_details: { reasoning_tokens: 0 }, total_tokens: total });
 
 describe("keyUsageRows", () => {
   it("ranks keys by tokens, keeps unreported usage below reported, lists unknown creators last and drops idle keys", () => {
     const rows = keyUsageRows([
-      summary("p1", { key: null, assets: null, sessions: sessions(9), usage: usage(900) }),
-      summary("p1", { key: key("small"), assets: null, sessions: sessions(2), usage: usage(10) }),
-      summary("p2", { key: key("big"), assets: null, sessions: sessions(1), usage: usage(500) }),
-      summary("p2", { key: key("silent"), assets: null, sessions: sessions(4), usage: null }),
-      summary("p2", { key: key("idle"), assets: null, sessions: sessions(0) }),
+      summary("p1", { key_id: null, assets: null, sessions: sessions(9), usage: usage(900) }),
+      summary("p1", { key_id: "small", assets: null, sessions: sessions(2), usage: usage(10) }),
+      summary("p2", { key_id: "big", assets: null, sessions: sessions(1), usage: usage(500) }),
+      summary("p2", { key_id: "silent", assets: null, sessions: sessions(4), usage: null }),
+      summary("p2", { key_id: "idle", assets: null, sessions: sessions(0) }),
     ]);
     expect(rows.map((row) => row.id)).toEqual(["p2:big", "p1:small", "p2:silent", "p1:unknown"]);
   });
diff --git a/apps/web/src/features/metrics/key-usage.ts b/apps/web/src/features/metrics/key-usage.ts
index fa89d686d..593c847d5 100644
--- a/apps/web/src/features/metrics/key-usage.ts
+++ b/apps/web/src/features/metrics/key-usage.ts
@@ -14,9 +14,9 @@ export interface KeyUsageRow {
 export function keyUsageRows(rows: readonly ProjectSummary[]): KeyUsageRow[] {
   return rows
     .filter((row) => row.agent_id === null && row.sessions.total > 0)
-    .map((summary) => ({ id: summary.key ? `${summary.project_id}:${summary.key.id}` : `${summary.project_id}:unknown`, summary }))
+    .map((summary) => ({ id: `${summary.project_id}:${summary.key_id ?? "unknown"}`, summary }))
     .sort((a, b) => (
-      Number(a.summary.key === null) - Number(b.summary.key === null)
+      Number(a.summary.key_id === null) - Number(b.summary.key_id === null)
       || (b.summary.usage?.total_tokens ?? -1) - (a.summary.usage?.total_tokens ?? -1)
       || b.summary.sessions.total - a.summary.sessions.total
       || a.id.localeCompare(b.id)
diff --git a/apps/web/src/features/metrics/metrics-queries.ts b/apps/web/src/features/metrics/metrics-queries.ts
index d76ce332d..f7ac0a983 100644
--- a/apps/web/src/features/metrics/metrics-queries.ts
+++ b/apps/web/src/features/metrics/metrics-queries.ts
@@ -1,7 +1,7 @@
 import { queryOptions } from "@tanstack/react-query";
-import { CoreMetricsClient, type CoreMetricsRange } from "@oac/agents-client";
+import { type AdminProject, CoreMetricsClient, type CoreMetricsRange } from "@oac/agents-client";
 
-import { listRuntimeObservations, loadSummary, type Project } from "../../lib/admin-view";
+import { listRuntimeObservations, loadSummary } from "../../lib/admin-view";
 import { projectClient } from "../../lib/projects";
 import { aggregateAgentMetrics, metricsWindow, type AgentMetrics, type AgentMetricsRange } from "./agent-metrics";
 import { loadProjectAgentMetrics } from "./agent-metrics-loader";
@@ -20,7 +20,7 @@ export const hostedRuntimesQuery = queryOptions({
 
 export interface LoadedAgentMetrics {
   metrics: AgentMetrics;
-  truncatedLists: Project[];
+  truncatedLists: AdminProject[];
   listFailures: ProjectReadFailure[];
   /** Epoch milliseconds. */
   loadedAt: number;
@@ -31,7 +31,7 @@ export interface LoadedAgentMetrics {
  * read time; the key holds every input: the project filter, the range and the
  * projects read.
  */
-export function agentMetricsQuery(targets: readonly Project[], filter: string, range: AgentMetricsRange) {
+export function agentMetricsQuery(targets: readonly AdminProject[], filter: string, range: AgentMetricsRange) {
   return queryOptions({
     queryKey: ["agent-metrics", { project: filter, range }, targets.map((project) => project.id)],
     queryFn: async ({ signal }): Promise<LoadedAgentMetrics> => {
diff --git a/apps/web/src/features/metrics/project-sessions.ts b/apps/web/src/features/metrics/project-sessions.ts
index c5c38fe89..0df779462 100644
--- a/apps/web/src/features/metrics/project-sessions.ts
+++ b/apps/web/src/features/metrics/project-sessions.ts
@@ -1,7 +1,6 @@
-import type { AgentSession } from "@oac/agents-client";
+import type { AdminProject, AgentSession } from "@oac/agents-client";
 
 import type { Owned, ProjectClient } from "../../lib/projects";
-import { type Project } from "../../lib/admin-view";
 
 /**
  * Bounded reads of each project's Session list through its admin scope. The
@@ -45,19 +44,19 @@ export async function readSessions(client: SessionLister, options: SessionReadOp
 }
 
 export interface ProjectSessionRead extends SessionRead {
-  project: Project;
+  project: AdminProject;
 }
 
 export interface ProjectReadFailure {
-  project: Project;
+  project: AdminProject;
   message: string;
 }
 
 /** Reads several projects in parallel; a failing project is reported by name and the others still count. */
 export async function readProjectsSessions(
-  projects: readonly Project[],
-  clientFor: (project: Project) => SessionLister,
-  options: (project: Project) => SessionReadOptions,
+  projects: readonly AdminProject[],
+  clientFor: (project: AdminProject) => SessionLister,
+  options: (project: AdminProject) => SessionReadOptions,
 ): Promise<{ reads: ProjectSessionRead[]; failures: ProjectReadFailure[] }> {
   const results = await Promise.allSettled(projects.map(async (project) => ({ project, ...(await readSessions(clientFor(project), options(project))) })));
   const reads: ProjectSessionRead[] = [];
diff --git a/apps/web/src/features/overview/FleetOverview.tsx b/apps/web/src/features/overview/FleetOverview.tsx
index 238d67d49..310a8a2cc 100644
--- a/apps/web/src/features/overview/FleetOverview.tsx
+++ b/apps/web/src/features/overview/FleetOverview.tsx
@@ -6,13 +6,12 @@ import { useTranslation } from "react-i18next";
 
 import { ConsolePopover } from "../../components/console-popover";
 import { HelpTip, StatusDot, type Tone } from "../../components/console-ui";
-import { formatBytes, formatDateTime, formatDuration, formatInteger, formatRelative, MISSING } from "../../lib/format";
+import { epochSeconds, formatBytes, formatDateTime, formatDuration, formatInteger, formatRelative, MISSING } from "../../lib/format";
 import { nodeProviderDiagnostic } from "../../lib/sandbox-diagnostic";
 import { DiagnosticTip } from "../fleet/DiagnosticTip";
 import { nodeHealth, suspendedSandboxes, type NodeHealth } from "../fleet/fleet-model";
 import { coreMetricsQuery } from "../metrics/metrics-queries";
 import { NodeRolloutStatus } from "../sandbox/NodeRolloutStatus";
-import { seconds } from "../sandbox/NodeList";
 
 /** Nodes shown in the overview; the rest are counted and listed on the Nodes page. */
 export const FLEET_LIMIT = 4;
@@ -147,7 +146,7 @@ function NodeGlance({ node, health, stale, suspends }: { node: SandboxNode; heal
   const { t, i18n } = useTranslation("overview");
   const locale = i18n.resolvedLanguage;
   const now = Math.floor(Date.now() / 1000);
-  const seen = seconds(node.last_seen_at);
+  const seen = epochSeconds(node.last_seen_at);
   const count = (value: number) => formatInteger(value, locale);
   const diagnostic = health === "degraded" ? nodeProviderDiagnostic(node) : "";
   return (
@@ -180,7 +179,7 @@ function CoreGlance({ label, tone }: { label: string; tone: Tone }) {
   const query = useQuery({ ...coreMetricsQuery("1h"), retry: false });
   const metrics = query.data ?? null;
   const count = (value: number | null) => (value === null ? MISSING : formatInteger(value, locale));
-  const started = seconds(metrics?.service.started_at ?? null);
+  const started = epochSeconds(metrics?.service.started_at ?? null);
   const now = Math.floor(Date.now() / 1000);
   return (
     <Facts>
diff --git a/apps/web/src/features/overview/OverviewPage.tsx b/apps/web/src/features/overview/OverviewPage.tsx
index 0b8975260..0036ee4ef 100644
--- a/apps/web/src/features/overview/OverviewPage.tsx
+++ b/apps/web/src/features/overview/OverviewPage.tsx
@@ -1,4 +1,4 @@
-import type { AgentSession } from "@oac/agents-client";
+import type { AdminProject, AgentSession } from "@oac/agents-client";
 import { useQuery } from "@tanstack/react-query";
 import { useCallback, useMemo, type ReactNode } from "react";
 import { useTranslation } from "react-i18next";
@@ -39,7 +39,6 @@ import { overviewQuery } from "./overview-queries";
 import {
   attentionCount,
   attentionSessions,
-  coverageRatio,
   projectUsageRows,
   recentFailures,
   serviceHealth,
@@ -50,7 +49,7 @@ import {
   type ServiceHealth,
 } from "./overview-model";
 import "./overview.css";
-import { type Project, type ProjectSummary } from "../../lib/admin-view";
+import { type ProjectSummary } from "../../lib/admin-view";
 
 export const OVERVIEW_REFRESH_MS = 30_000;
 const ATTENTION_LIMIT = 8;
@@ -72,7 +71,7 @@ function errorText(error: unknown): string {
  * a refresh retains figures within the same project scope, and the
  * page polls while it is visible.
  */
-function useOverviewData(projects: readonly Project[], projectsReady: boolean) {
+function useOverviewData(projects: readonly AdminProject[], projectsReady: boolean) {
   const query = useQuery({
     ...overviewQuery(projects),
     enabled: projectsReady,
@@ -150,10 +149,10 @@ export function OverviewPage() {
 
   const loading = refreshing || projectsState.state.status === "loading" || (fleetState.status === "ready" && fleetState.refreshing);
   const updatedAt = data?.loadedAt ?? fleet?.loadedAt ?? null;
-  const attentionTotal = totals ? attentionCount(totals.sessions) : null;
+  const attentionTotal = totals ? attentionCount(totals) : null;
   const truncated = data?.sessions.truncated ?? [];
   // Whether any Session exists: Core's summary counts them all; without it, any Session read counts.
-  const sessionCount = totals ? totals.sessions.total
+  const sessionCount = totals ? totals.total
     : sessions?.length ? sessions.length
     : summaryError !== null || sessionReadsFailed ? "failed" : null;
 
@@ -190,8 +189,8 @@ export function OverviewPage() {
           <MetricTile
             label={t("kpi.running")}
             help={t("kpi.runningHelp")}
-            value={totals ? <LiveNumber value={totals.sessions.in_progress} /> : MISSING}
-            sub={totals ? t("tiles.sessionSplit", { idle: formatInteger(totals.sessions.idle, locale), total: formatInteger(totals.sessions.total, locale) }) : t("kpi.summaryUnavailable")}
+            value={totals ? <LiveNumber value={totals.in_progress} /> : MISSING}
+            sub={totals ? t("tiles.sessionSplit", { idle: formatInteger(totals.idle, locale), total: formatInteger(totals.total, locale) }) : t("kpi.summaryUnavailable")}
           />
           {cloud ? (
             <MetricTile
@@ -216,7 +215,7 @@ export function OverviewPage() {
             label={t("kpi.attention")}
             help={t("attention.subtitle")}
             value={<LiveNumber value={attentionTotal} />}
-            sub={totals ? t("tiles.attentionSplit", { failed: totals.sessions.failed, waiting: totals.sessions.requires_action }) : t("kpi.summaryUnavailable")}
+            sub={totals ? t("tiles.attentionSplit", { failed: totals.failed, waiting: totals.requires_action }) : t("kpi.summaryUnavailable")}
           />
         </div>
 
@@ -379,12 +378,12 @@ function usageTitle(summary: ProjectSummary, t: TFunction<"overview">, locale: s
   return t("projects.tokenDetail", {
     input: number(summary.usage.input_tokens),
     output: number(summary.usage.output_tokens),
-    cached: number(summary.usage.cached_tokens),
-    reasoning: number(summary.usage.reasoning_tokens),
+    cached: number(summary.usage.input_tokens_details.cached_tokens),
+    reasoning: number(summary.usage.output_tokens_details.reasoning_tokens),
   });
 }
 
-function ProjectUsageTable({ rows, failed, now, onOpen }: { rows: ProjectUsageRow[] | null; failed: boolean; now: number; onOpen: (project: Project) => void }) {
+function ProjectUsageTable({ rows, failed, now, onOpen }: { rows: ProjectUsageRow[] | null; failed: boolean; now: number; onOpen: (project: AdminProject) => void }) {
   const { t, i18n } = useTranslation("overview");
   const { t: tCommon } = useTranslation("common");
   const locale = i18n.resolvedLanguage;
@@ -409,14 +408,13 @@ function ProjectUsageTable({ rows, failed, now, onOpen }: { rows: ProjectUsageRo
         </thead>
         <tbody>
           {rows.map(({ project, summary }) => {
-            const coverage = summary ? coverageRatio(summary.coverage) : null;
             return (
               <tr key={project.id} className="clickable-row" onClick={() => onOpen(project)}>
                 <th scope="row">
                   <button className="table-link" type="button" onClick={(event) => { event.stopPropagation(); onOpen(project); }} aria-label={t("projects.open", { name: project.name })}>
                     <strong><ProjectName project={project} /></strong>
                   </button>
-                  {project.status === "archived" ? <span className="pill">{t("projects.archived")}</span> : null}
+                  {project.archived_at !== null ? <span className="pill">{t("projects.archived")}</span> : null}
                 </th>
                 <td className="numeric">{count(project.active_key_count)}</td>
                 <td className="numeric">{count(summary?.sessions.total)}</td>
@@ -424,8 +422,8 @@ function ProjectUsageTable({ rows, failed, now, onOpen }: { rows: ProjectUsageRo
                 <td className="numeric">{count(summary?.sessions.requires_action)}</td>
                 <td className={summary?.sessions.failed ? "numeric numeric-danger" : "numeric"}>{count(summary?.sessions.failed)}</td>
                 <td className="numeric" title={summary ? usageTitle(summary, t, locale) : undefined}>{summary?.usage ? formatCompact(summary.usage.total_tokens, locale) : MISSING}</td>
-                <td className="numeric" title={summary && summary.coverage.sessions ? t("projects.coverageDetail", { reported: summary.coverage.reported, total: summary.coverage.sessions }) : undefined}>
-                  {formatPercent(coverage, locale)}
+                <td className="numeric" title={summary && summary.coverage.total_sessions ? t("projects.coverageDetail", { reported: summary.coverage.measured_sessions, total: summary.coverage.total_sessions }) : undefined}>
+                  {formatPercent(summary?.coverage.ratio, locale)}
                 </td>
                 <td className="numeric">{formatRelative(summary?.last_active_at ?? null, now, locale)}</td>
               </tr>
diff --git a/apps/web/src/features/overview/getting-started.test.ts b/apps/web/src/features/overview/getting-started.test.ts
index 0194079ae..97249ca59 100644
--- a/apps/web/src/features/overview/getting-started.test.ts
+++ b/apps/web/src/features/overview/getting-started.test.ts
@@ -75,9 +75,9 @@ describe("Getting started steps", () => {
   it("needs an active project with an active key, and any Session", () => {
     const steps = (projects: Parameters<typeof gettingStartedSteps>[0]["projects"], sessions: number | "failed" | null = 0) => gettingStartedSteps({ sandboxReset: false, fleet: { status: "loading" }, projects, sessions, harnesses: undefined });
     expect(steps([]).key).toEqual({ state: "todo", project: null });
-    const older = project("p1", { active_key_count: 0, created_at: 1 });
-    const newer = project("p2", { active_key_count: 0, created_at: 2 });
-    expect(steps([older, newer, project("p3", { status: "archived", active_key_count: 0, created_at: 3 })]).key).toEqual({ state: "todo", project: newer });
+    const older = project("p1", { active_key_count: 0, created_at: "1970-01-01T00:00:01Z" });
+    const newer = project("p2", { active_key_count: 0, created_at: "1970-01-01T00:00:02Z" });
+    expect(steps([older, newer, project("p3", { archived_at: "1970-01-01T00:00:04Z", active_key_count: 0, created_at: "1970-01-01T00:00:03Z" })]).key).toEqual({ state: "todo", project: newer });
     expect(steps([older, project("p4")]).key.state).toBe("done");
     expect(steps(undefined).key.state).toBeNull();
     expect(steps("failed").key.state).toBe("unknown");
@@ -86,9 +86,9 @@ describe("Getting started steps", () => {
 
   it("opens the call samples of the newest active project with a key, else of the newest active project", () => {
     const call = (projects: Parameters<typeof gettingStartedSteps>[0]["projects"]) => gettingStartedSteps({ sandboxReset: false, fleet: { status: "loading" }, projects, sessions: 0, harnesses: undefined }).session.project;
-    const keyed = project("p1", { created_at: 1 });
-    const newer = project("p2", { active_key_count: 0, created_at: 2 });
-    const archived = project("p3", { status: "archived", active_key_count: 0, created_at: 3 });
+    const keyed = project("p1", { created_at: "1970-01-01T00:00:01Z" });
+    const newer = project("p2", { active_key_count: 0, created_at: "1970-01-01T00:00:02Z" });
+    const archived = project("p3", { archived_at: "1970-01-01T00:00:04Z", active_key_count: 0, created_at: "1970-01-01T00:00:03Z" });
     expect(call([keyed, newer, archived])).toBe(keyed);
     expect(call([newer, archived])).toBe(newer);
     expect([call([archived]), call(undefined), call("failed")]).toEqual([null, null, null]);
diff --git a/apps/web/src/features/overview/getting-started.ts b/apps/web/src/features/overview/getting-started.ts
index 915595455..adc43a39c 100644
--- a/apps/web/src/features/overview/getting-started.ts
+++ b/apps/web/src/features/overview/getting-started.ts
@@ -1,6 +1,5 @@
-import type { CoreHarness } from "@oac/agents-client";
+import type { AdminProject, CoreHarness } from "@oac/agents-client";
 
-import { type Project } from "../../lib/admin-view";
 import { nodeServingReady } from "../fleet/fleet-model";
 import { type FleetState } from "../fleet/use-sandbox-fleet";
 import { templateBuildStatus } from "../sandbox/deployment-specification";
@@ -20,9 +19,9 @@ export interface GettingStartedSteps {
   sandboxes: { state: StepState; action: SandboxAction; cloud: boolean };
   model: StepState;
   /** `project` is the active project a key would be issued for; null means create one first. */
-  key: { state: StepState; project: Project | null };
+  key: { state: StepState; project: AdminProject | null };
   /** `project` is the active project whose call samples the step opens; null leads to the project list. */
-  session: { state: StepState; project: Project | null };
+  session: { state: StepState; project: AdminProject | null };
 }
 
 export function gettingStartedSteps(input: {
@@ -32,7 +31,7 @@ export function gettingStartedSteps(input: {
   /** Undefined while reading; a failed installation read cannot confirm readiness. */
   localOnly?: boolean | "failed";
   /** Undefined until the project list is read. */
-  projects: readonly Project[] | "failed" | undefined;
+  projects: readonly AdminProject[] | "failed" | undefined;
   /** Sessions in every project, by Core's summary; null until it is read. */
   sessions: number | "failed" | null;
   /** Core's harnesses; undefined until they are read. */
@@ -87,13 +86,13 @@ export function modelStep(harnesses: readonly CoreHarness[] | "failed" | undefin
 }
 
 /** The newest of the projects, most likely the one just created. */
-function newestOf(projects: readonly Project[]): Project | null {
-  return projects.reduce<Project | null>((best, project) => (!best || project.created_at > best.created_at ? project : best), null);
+function newestOf(projects: readonly AdminProject[]): AdminProject | null {
+  return projects.reduce<AdminProject | null>((best, project) => (!best || Date.parse(project.created_at) > Date.parse(best.created_at) ? project : best), null);
 }
 
-function keyStep(projects: readonly Project[] | "failed" | undefined): GettingStartedSteps["key"] {
+function keyStep(projects: readonly AdminProject[] | "failed" | undefined): GettingStartedSteps["key"] {
   if (!projects || projects === "failed") return { state: projects ? "unknown" : null, project: null };
-  const active = projects.filter((project) => project.status === "active");
+  const active = projects.filter((project) => project.archived_at === null);
   if (active.some((project) => project.active_key_count > 0)) return { state: "done", project: null };
   return { state: "todo", project: newestOf(active) };
 }
@@ -102,9 +101,9 @@ function keyStep(projects: readonly Project[] | "failed" | undefined): GettingSt
  * Where the first Session's call samples are: the newest active project with
  * an active key, else the newest active project (whose page issues one).
  */
-function callProject(projects: readonly Project[] | "failed" | undefined): Project | null {
+function callProject(projects: readonly AdminProject[] | "failed" | undefined): AdminProject | null {
   if (!projects || projects === "failed") return null;
-  const active = projects.filter((project) => project.status === "active");
+  const active = projects.filter((project) => project.archived_at === null);
   return newestOf(active.filter((project) => project.active_key_count > 0)) ?? newestOf(active);
 }
 
diff --git a/apps/web/src/features/overview/overview-loader.ts b/apps/web/src/features/overview/overview-loader.ts
index eba9be5c2..5c3dffaae 100644
--- a/apps/web/src/features/overview/overview-loader.ts
+++ b/apps/web/src/features/overview/overview-loader.ts
@@ -1,8 +1,8 @@
-import type { AgentSession } from "@oac/agents-client";
+import type { AdminProject, AgentSession } from "@oac/agents-client";
 
 import { readProjectsSessions, type InProject, type ProjectReadFailure, type SessionLister } from "../metrics/project-sessions";
 import { activityStart, attentionCount, overviewReadDone, projectRows } from "./overview-model";
-import { type Project, type ProjectSummary } from "../../lib/admin-view";
+import { type ProjectSummary } from "../../lib/admin-view";
 
 /** Most Sessions read per project for the 24-hour activity and the attention list. */
 export const OVERVIEW_SESSION_CAP = 1_000;
@@ -10,10 +10,10 @@ export const OVERVIEW_SESSION_CAP = 1_000;
 export interface OverviewSessions {
   sessions: InProject<AgentSession>[];
   /** Projects whose read stopped at the cap before covering the window or every Session needing attention. */
-  truncated: Project[];
+  truncated: AdminProject[];
   failures: ProjectReadFailure[];
   /** Failed projects whose previously read Sessions are retained. */
-  stale: Project[];
+  stale: AdminProject[];
 }
 
 export type OverviewSummary =
@@ -31,7 +31,7 @@ export interface OverviewData {
 
 export interface OverviewSource {
   summary: (signal: AbortSignal) => Promise<ProjectSummary[]>;
-  sessions: (project: Project) => SessionLister;
+  sessions: (project: AdminProject) => SessionLister;
 }
 
 /**
@@ -48,7 +48,7 @@ export function needsSessionRead(row: ProjectSummary | undefined, since: number)
 }
 
 export async function loadOverview(
-  projects: readonly Project[],
+  projects: readonly AdminProject[],
   source: OverviewSource,
   nowSeconds: number,
   signal: AbortSignal,
diff --git a/apps/web/src/features/overview/overview-model.test.ts b/apps/web/src/features/overview/overview-model.test.ts
index d431ef8a3..4834d0bf1 100644
--- a/apps/web/src/features/overview/overview-model.test.ts
+++ b/apps/web/src/features/overview/overview-model.test.ts
@@ -8,7 +8,6 @@ import {
   activityStart,
   attentionCount,
   attentionSessions,
-  coverageRatio,
   isGatewayOrNetworkFailure,
   overviewReadDone,
   projectUsageRows,
@@ -19,12 +18,10 @@ import {
   webApiReachable,
 } from "./overview-model";
 
-const usage = (total: number) => ({ input_tokens: total, output_tokens: 0, total_tokens: total, cached_tokens: 0, reasoning_tokens: 0 });
-
 describe("project usage rows", () => {
   it("joins every project with its summary row, active and recent first, missing rows as null", () => {
     const rows = projectUsageRows(
-      [project("old"), project("archived", { status: "archived" }), project("recent"), project("silent")],
+      [project("old"), project("archived", { archived_at: "1970-01-01T00:00:02Z" }), project("recent"), project("silent")],
       [
         summary("old", { last_active_at: 100 }),
         summary("recent", { last_active_at: 500 }),
@@ -37,22 +34,14 @@ describe("project usage rows", () => {
     expect(rows.find((row) => row.project.id === "silent")?.summary).toBeNull();
   });
 
-  it("adds up Session counts and keeps usage unknown when no project reported any", () => {
-    const withUsage = summaryTotals([
-      summary("a", { sessions: { total: 3, idle: 1, in_progress: 1, requires_action: 0, failed: 1 }, usage: usage(10), coverage: { sessions: 3, reported: 2 } }),
-      summary("b", { sessions: { total: 2, idle: 1, in_progress: 0, requires_action: 1, failed: 0 }, coverage: { sessions: 2, reported: 0 } }),
-      summary("a", { agent_id: "agent_a", sessions: { total: 50, idle: 50, in_progress: 0, requires_action: 0, failed: 0 }, usage: usage(99) }),
+  it("adds up the Session counts of project rows", () => {
+    const totals = summaryTotals([
+      summary("a", { sessions: { total: 3, idle: 1, in_progress: 1, requires_action: 0, failed: 1 } }),
+      summary("b", { sessions: { total: 2, idle: 1, in_progress: 0, requires_action: 1, failed: 0 } }),
+      summary("a", { agent_id: "agent_a", sessions: { total: 50, idle: 50, in_progress: 0, requires_action: 0, failed: 0 } }),
     ]);
-    expect(withUsage.sessions).toEqual({ total: 5, idle: 2, in_progress: 1, requires_action: 1, failed: 1 });
-    expect(withUsage.usage?.total_tokens).toBe(10);
-    expect(withUsage.coverage).toEqual({ sessions: 5, reported: 2 });
-    expect(attentionCount(withUsage.sessions)).toBe(2);
-    expect(summaryTotals([summary("b")]).usage).toBeNull();
-  });
-
-  it("reports coverage only when there are Sessions", () => {
-    expect(coverageRatio({ sessions: 4, reported: 3 })).toBe(0.75);
-    expect(coverageRatio({ sessions: 0, reported: 0 })).toBeNull();
+    expect(totals).toEqual({ total: 5, idle: 2, in_progress: 1, requires_action: 1, failed: 1 });
+    expect(attentionCount(totals)).toBe(2);
   });
 });
 
diff --git a/apps/web/src/features/overview/overview-model.ts b/apps/web/src/features/overview/overview-model.ts
index ef13afa7b..338f58a72 100644
--- a/apps/web/src/features/overview/overview-model.ts
+++ b/apps/web/src/features/overview/overview-model.ts
@@ -1,82 +1,50 @@
-import type { AgentSession } from "@oac/agents-client";
+import type { AdminProject, AgentSession } from "@oac/agents-client";
 
 import type { CapacitySummary } from "../fleet/fleet-model";
 import type { InProject } from "../metrics/project-sessions";
-import { type Project, type ProjectSummary } from "../../lib/admin-view";
+import { type ProjectSummary } from "../../lib/admin-view";
 
 /** Pure projections behind the Overview. Missing inputs stay null, never zero. */
 
-export interface SessionCounts {
-  total: number;
-  idle: number;
-  in_progress: number;
-  requires_action: number;
-  failed: number;
-}
-
-export type SummaryUsage = NonNullable<ProjectSummary["usage"]>;
+export type SessionCounts = ProjectSummary["sessions"];
 
 export interface ProjectUsageRow {
-  project: Project;
+  project: AdminProject;
   /** The project's `/summary` row, or null when Core returned none for it. */
   summary: ProjectSummary | null;
 }
 
 /** Project rows of a `/summary` response (Agent and key rows are skipped). */
 export function projectRows(summary: readonly ProjectSummary[]): ProjectSummary[] {
-  return summary.filter((row) => row.agent_id === null && !row.key);
+  return summary.filter((row) => row.agent_id === null && row.key_id === null);
 }
 
 /**
  * One row per project, joined with its `/summary` row. Active projects come
  * first, then the most recently active.
  */
-export function projectUsageRows(projects: readonly Project[], summary: readonly ProjectSummary[]): ProjectUsageRow[] {
+export function projectUsageRows(projects: readonly AdminProject[], summary: readonly ProjectSummary[]): ProjectUsageRow[] {
   const byProject = new Map(projectRows(summary).map((row) => [row.project_id, row]));
   return projects
     .map((project) => ({ project, summary: byProject.get(project.id) ?? null }))
     .sort((a, b) => (
-      Number(a.project.status === "archived") - Number(b.project.status === "archived")
+      Number(a.project.archived_at !== null) - Number(b.project.archived_at !== null)
       || (b.summary?.last_active_at ?? -1) - (a.summary?.last_active_at ?? -1)
       || a.project.name.localeCompare(b.project.name)
     ));
 }
 
-export interface SummaryTotals {
-  sessions: SessionCounts;
-  /** Sum over projects that reported usage; null when none did. */
-  usage: SummaryUsage | null;
-  coverage: { sessions: number; reported: number };
-}
-
-/** Totals over every project row. */
-export function summaryTotals(summary: readonly ProjectSummary[]): SummaryTotals {
+/** Session counts over every project row. */
+export function summaryTotals(summary: readonly ProjectSummary[]): SessionCounts {
   const sessions: SessionCounts = { total: 0, idle: 0, in_progress: 0, requires_action: 0, failed: 0 };
-  const coverage = { sessions: 0, reported: 0 };
-  let usage: SummaryUsage | null = null;
   for (const row of projectRows(summary)) {
     sessions.total += row.sessions.total;
     sessions.idle += row.sessions.idle;
     sessions.in_progress += row.sessions.in_progress;
     sessions.requires_action += row.sessions.requires_action;
     sessions.failed += row.sessions.failed;
-    coverage.sessions += row.coverage.sessions;
-    coverage.reported += row.coverage.reported;
-    if (row.usage) {
-      usage ??= { input_tokens: 0, output_tokens: 0, total_tokens: 0, cached_tokens: 0, reasoning_tokens: 0 };
-      usage.input_tokens += row.usage.input_tokens;
-      usage.output_tokens += row.usage.output_tokens;
-      usage.total_tokens += row.usage.total_tokens;
-      usage.cached_tokens += row.usage.cached_tokens;
-      usage.reasoning_tokens += row.usage.reasoning_tokens;
-    }
   }
-  return { sessions, usage, coverage };
-}
-
-/** Share of Sessions that reported usage; null when there are none. */
-export function coverageRatio(coverage: { sessions: number; reported: number }): number | null {
-  return coverage.sessions > 0 ? coverage.reported / coverage.sessions : null;
+  return sessions;
 }
 
 export function attentionCount(counts: Pick<SessionCounts, "failed" | "requires_action">): number {
diff --git a/apps/web/src/features/overview/overview-queries.ts b/apps/web/src/features/overview/overview-queries.ts
index 6440af462..5b95711b2 100644
--- a/apps/web/src/features/overview/overview-queries.ts
+++ b/apps/web/src/features/overview/overview-queries.ts
@@ -1,11 +1,12 @@
+import type { AdminProject } from "@oac/agents-client";
 import { queryOptions } from "@tanstack/react-query";
 
-import { loadSummary, type Project } from "../../lib/admin-view";
+import { loadSummary } from "../../lib/admin-view";
 import { projectClient } from "../../lib/projects";
 import { loadOverview, type OverviewData } from "./overview-loader";
 
 /** The Overview's summary and Session reads for the listed projects, keyed by their IDs. */
-export function overviewQuery(projects: readonly Project[]) {
+export function overviewQuery(projects: readonly AdminProject[]) {
   const queryKey = ["overview", projects.map((project) => project.id)];
   return queryOptions({
     queryKey,
diff --git a/apps/web/src/features/overview/test-fixtures.ts b/apps/web/src/features/overview/test-fixtures.ts
index 96ed55aac..e11dfcea3 100644
--- a/apps/web/src/features/overview/test-fixtures.ts
+++ b/apps/web/src/features/overview/test-fixtures.ts
@@ -1,10 +1,10 @@
-import type { AgentSession, SandboxNode } from "@oac/agents-client";
-import { type OwnedRuntimeObservation, type Project, type ProjectSummary } from "../../lib/admin-view";
+import type { AdminProject, AgentSession, SandboxNode } from "@oac/agents-client";
+import { type OwnedRuntimeObservation, type ProjectSummary } from "../../lib/admin-view";
 
 /** Fixtures shared by the Monitor page tests. Not part of the application bundle. */
 
-export function project(id: string, overrides: Partial<Project> = {}): Project {
-  return { id, name: id, status: "active", created_at: 1, archived_at: null, active_key_count: 1, ...overrides };
+export function project(id: string, overrides: Partial<AdminProject> = {}): AdminProject {
+  return { id, name: id, created_at: "1970-01-01T00:00:01Z", archived_at: null, active_key_count: 1, ...overrides };
 }
 
 export function summary(projectId: string, overrides: Partial<ProjectSummary> = {}): ProjectSummary {
@@ -16,7 +16,7 @@ export function summary(projectId: string, overrides: Partial<ProjectSummary> =
     assets: { agents: 1, skills: 0, environment_templates: 0, files: 0, vaults: 0, credentials: 0 },
     sessions: { total: 0, idle: 0, in_progress: 0, requires_action: 0, failed: 0 },
     usage: null,
-    coverage: { sessions: 0, reported: 0 },
+    coverage: { total_sessions: 0, measured_sessions: 0, ratio: null },
     last_active_at: null,
     ...overrides,
   };
diff --git a/apps/web/src/features/sandbox/NodeDetail.tsx b/apps/web/src/features/sandbox/NodeDetail.tsx
index 9483c0879..6425e9766 100644
--- a/apps/web/src/features/sandbox/NodeDetail.tsx
+++ b/apps/web/src/features/sandbox/NodeDetail.tsx
@@ -4,13 +4,13 @@ import { useTranslation } from "react-i18next";
 
 import { EmptyState, HelpTip, Kpi, KpiStrip, Section } from "../../components/console-ui";
 import { CopyableId } from "../../components/list-ui";
-import { formatDateTime, formatInteger, formatRelative, formatSpan, MISSING } from "../../lib/format";
+import { epochSeconds, formatDateTime, formatInteger, formatRelative, formatSpan, MISSING } from "../../lib/format";
 import { nodeProviderDiagnostic, sandboxDiagnosticMessage } from "../../lib/sandbox-diagnostic";
 import { sandboxStateLabel } from "../../lib/sandbox-labels";
 import { DiagnosticTip } from "../fleet/DiagnosticTip";
 import { NodeRolloutStatus } from "./NodeRolloutStatus";
 import { phaseTiming } from "./allocation-phase";
-import { nodeState, NodeStatus, OldAddressHint, seconds } from "./NodeList";
+import { nodeState, NodeStatus, OldAddressHint } from "./NodeList";
 
 /** Why a node is not serving: disconnected, or the reason its provider is not ready. */
 function nodeDiagnostic(node: SandboxNode): string {
@@ -73,14 +73,14 @@ export function NodeDetail({ node, allocations, coreUrl, targetGeneration, stale
         </div>
         <div>
           <dt>{t("Last seen")}</dt>
-          <dd title={node.last_seen_at ? formatDateTime(seconds(node.last_seen_at), locale) : undefined}>
-            {node.last_seen_at ? formatRelative(seconds(node.last_seen_at), now, locale) : t("Never")}
+          <dd title={node.last_seen_at ? formatDateTime(epochSeconds(node.last_seen_at), locale) : undefined}>
+            {node.last_seen_at ? formatRelative(epochSeconds(node.last_seen_at), now, locale) : t("Never")}
           </dd>
         </div>
         <div><dt>{t("Target generation")}</dt><dd>{targetGeneration ?? MISSING}</dd></div>
         <div><dt>{t("Target preparation")}</dt><dd><NodeRolloutStatus node={node} stale={stale} /></dd></div>
         <div><dt>{t("Serving generation")}<HelpTip>{t("The saved serving generation is not proof that this node is online, ready or has free capacity.")}</HelpTip></dt><dd>{node.rollout.ready_generation ?? MISSING}</dd></div>
-        <div><dt>{t("Added")}</dt><dd>{formatDateTime(seconds(node.created_at), locale)}</dd></div>
+        <div><dt>{t("Added")}</dt><dd>{formatDateTime(epochSeconds(node.created_at), locale)}</dd></div>
       </dl>
 
       {/* Cleanup and host resources are on Sandbox metrics; the node's limit is here as well, beside Edit node that sets it. */}
@@ -123,7 +123,7 @@ export function NodeDetail({ node, allocations, coreUrl, targetGeneration, stale
                     <td>{allocation.compute_phase ? sandboxStateLabel(allocation.compute_phase, shortLocale) : MISSING}</td>
                     {suspension ? <PhaseTime allocation={allocation} retentionSeconds={suspension.retention_seconds} now={now} /> : null}
                     <td>{allocation.diagnostic ? <Diagnostic value={allocation.diagnostic} /> : MISSING}</td>
-                    <td className="nodes-nowrap">{formatDateTime(seconds(allocation.created_at), locale)}</td>
+                    <td className="nodes-nowrap">{formatDateTime(epochSeconds(allocation.created_at), locale)}</td>
                   </tr>
                 ))}
               </tbody>
diff --git a/apps/web/src/features/sandbox/NodeEnrollment.tsx b/apps/web/src/features/sandbox/NodeEnrollment.tsx
index 9a1ef808a..8247faea1 100644
--- a/apps/web/src/features/sandbox/NodeEnrollment.tsx
+++ b/apps/web/src/features/sandbox/NodeEnrollment.tsx
@@ -96,7 +96,7 @@ export function NodeEnrollment({ client, consoleConfig, deployment, nodes, open,
   const backend = sandboxProviderLabel(deployment.provider, locale);
   // Nodes and their sandboxes reach Core at its public URL, so a loopback one serves no other machine;
   // and without the provider's node files the installer would fail on the host. Either way no command
-  // is issued, nor before the installation is read: a failed read (an older Core, say) proves nothing.
+  // is issued, nor before the installation is read: a failed read proves nothing about the address.
   const blocker: { text: string; failed?: boolean } | null = deployment.reset
     ? { text: t("Node enrollment is paused while reset is in progress.") }
     : !fresh
diff --git a/apps/web/src/features/sandbox/NodeList.tsx b/apps/web/src/features/sandbox/NodeList.tsx
index b5c4fd979..055c9b700 100644
--- a/apps/web/src/features/sandbox/NodeList.tsx
+++ b/apps/web/src/features/sandbox/NodeList.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 
 import { HelpTip, StatusDot, type Tone } from "../../components/console-ui";
 import { NameCell, RowActions } from "../../components/list-ui";
-import { formatDateTime, formatRelative } from "../../lib/format";
+import { epochSeconds, formatDateTime, formatRelative } from "../../lib/format";
 import type { MessageKey } from "../../lib/locale-strings";
 import { nodeProviderDiagnostic } from "../../lib/sandbox-diagnostic";
 import { DiagnosticTip } from "../fleet/DiagnosticTip";
@@ -56,12 +56,6 @@ export function OldAddressHint() {
   return <span className="node-status-hint">{t("Remove and add again")}</span>;
 }
 
-export function seconds(value: string | null): number | null {
-  if (!value) return null;
-  const parsed = Date.parse(value);
-  return Number.isNaN(parsed) ? null : Math.floor(parsed / 1000);
-}
-
 export function NodeList({ nodes, allocations, coreUrl, stale, disabled, suspends = false, onOpen, onRemove }: {
   nodes: readonly SandboxNode[];
   /** The deployment's address; a node enrolled with another one is on an old address. */
@@ -111,10 +105,10 @@ export function NodeList({ nodes, allocations, coreUrl, stale, disabled, suspend
                 </td>
                 <td className="numeric">{node.active} / {node.max_active}</td>
                 {suspends ? <td className="numeric">{suspendedSandboxes(node)}</td> : null}
-                <td className="numeric" title={node.last_seen_at ? formatDateTime(seconds(node.last_seen_at), locale) : undefined}>
-                  {node.last_seen_at ? formatRelative(seconds(node.last_seen_at), now, locale) : t("Never")}
+                <td className="numeric" title={node.last_seen_at ? formatDateTime(epochSeconds(node.last_seen_at), locale) : undefined}>
+                  {node.last_seen_at ? formatRelative(epochSeconds(node.last_seen_at), now, locale) : t("Never")}
                 </td>
-                <td className="nodes-nowrap">{formatDateTime(seconds(node.created_at), locale)}</td>
+                <td className="nodes-nowrap">{formatDateTime(epochSeconds(node.created_at), locale)}</td>
                 <td className="actions-cell">
                   <RowActions>
                     <button className="text-action danger" type="button" disabled={disabled} aria-label={t("Remove {{name}}", { name })} onClick={() => onRemove(node)}>
diff --git a/apps/web/src/features/sessions/ExecutorCredentialsSection.tsx b/apps/web/src/features/sessions/ExecutorCredentialsSection.tsx
index b764877a8..6ce5664a3 100644
--- a/apps/web/src/features/sessions/ExecutorCredentialsSection.tsx
+++ b/apps/web/src/features/sessions/ExecutorCredentialsSection.tsx
@@ -12,7 +12,7 @@ import { Modal } from "../../components/Modal";
 import { TableSkeleton } from "../../components/Skeleton";
 import { failedLast, useFailureToast, useToast } from "../../components/Toast";
 import { useDeleteFlow } from "../../lib/delete-flow";
-import { formatDateTime, shortId } from "../../lib/format";
+import { epochSeconds, formatDateTime, shortId } from "../../lib/format";
 import { admin, useProjects } from "../../lib/projects";
 import { ExecutorInstallPanel, useExecutorInstall } from "./ExecutorInstallPanel";
 import { CredentialFile } from "./executor-credential-file";
@@ -54,10 +54,6 @@ function sameKey(a: string, b: string): boolean {
   return a.toLowerCase() === b.toLowerCase();
 }
 
-function seconds(value: string | null): number | null {
-  return value === null ? null : Math.floor(Date.parse(value) / 1000);
-}
-
 /**
  * Executor credentials of a self-hosted Session's environment: Core issues,
  * rotates and revokes them with the deployment's Core key. An issued
@@ -78,7 +74,7 @@ export function ExecutorCredentialsSection({ projectId, sessionId, environmentId
   const locale = i18n.resolvedLanguage;
   const toast = useToast();
   const { byId, refresh: refreshProjects } = useProjects();
-  const archived = byId.get(projectId)?.status === "archived";
+  const archived = Boolean(byId.get(projectId)?.archived_at);
   const install = useExecutorInstall(projectId, environmentId, archived);
   const query = useQuery(executorConnectionQuery(projectId, sessionId, environmentId));
   const credentials = query.data?.data ?? null;
@@ -253,11 +249,11 @@ export function ExecutorCredentialsSection({ projectId, sessionId, environmentId
                       <HelpTip>{t(revoked ? "executor.connection.restore" : "executor.connection.bound", { id })}</HelpTip>
                     </span> : null}
                   </span></th>
-                  <td className="session-nowrap">{formatDateTime(seconds(credential.created_at), locale)}</td>
+                  <td className="session-nowrap">{formatDateTime(epochSeconds(credential.created_at), locale)}</td>
                   <td>
                     <span className="executor-credential-status">
                       <StatusDot tone={revoked ? "neutral" : "ok"} label={revoked ? t("executor.status.revoked") : t("executor.status.active")} />
-                      {revoked ? <span className="executor-credential-date">{formatDateTime(seconds(credential.revoked_at), locale)}</span> : null}
+                      {revoked ? <span className="executor-credential-date">{formatDateTime(epochSeconds(credential.revoked_at), locale)}</span> : null}
                     </span>
                   </td>
                   <td className="actions-cell">
diff --git a/apps/web/src/features/sessions/SessionDeleteDialog.tsx b/apps/web/src/features/sessions/SessionDeleteDialog.tsx
index 388af654b..52a6ce180 100644
--- a/apps/web/src/features/sessions/SessionDeleteDialog.tsx
+++ b/apps/web/src/features/sessions/SessionDeleteDialog.tsx
@@ -1,4 +1,4 @@
-import { AgentCoreError, isSessionDeletionConflict } from "@oac/agents-client";
+import { type AdminProject, AgentCoreError, isSessionDeletionConflict } from "@oac/agents-client";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -6,10 +6,9 @@ import { ConfirmDialog } from "../../components/ConfirmDialog";
 import { useToast } from "../../components/Toast";
 import { projectClient } from "../../lib/projects";
 import { shortId } from "../../lib/format";
-import { type Project } from "../../lib/admin-view";
 
 export interface SessionDeleteTarget {
-  project: Project;
+  project: AdminProject;
   sessionId: string;
 }
 
diff --git a/apps/web/src/features/sessions/SessionLogPage.tsx b/apps/web/src/features/sessions/SessionLogPage.tsx
index 53cf494e0..f4ecc097e 100644
--- a/apps/web/src/features/sessions/SessionLogPage.tsx
+++ b/apps/web/src/features/sessions/SessionLogPage.tsx
@@ -1,4 +1,4 @@
-import type { AgentSession } from "@oac/agents-client";
+import type { AdminProject, AgentSession } from "@oac/agents-client";
 import { MessageSquareText } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -25,7 +25,6 @@ import {
   type SessionLogFilters,
 } from "./session-log";
 import "./sessions.css";
-import { type Project } from "../../lib/admin-view";
 import { collections, queryClient } from "../../lib/queries";
 import { forgetDeleted } from "../resources/detail-queries";
 import { sessionKey } from "./session-queries";
@@ -238,7 +237,7 @@ function SessionLogRow({
   now: number;
   locale: string | undefined;
   onOpen: (projectId: string, sessionId: string) => void;
-  onDelete: (target: { project: Project; sessionId: string }) => void;
+  onDelete: (target: { project: AdminProject; sessionId: string }) => void;
 }) {
   const { t } = useTranslation("sessions");
   const projectCell = allProjects ? <td><ProjectName project={row.project} /></td> : null;
diff --git a/apps/web/src/features/sessions/executor-credential-ownership.test.tsx b/apps/web/src/features/sessions/executor-credential-ownership.test.tsx
index e10fa04cc..4295269c9 100644
--- a/apps/web/src/features/sessions/executor-credential-ownership.test.tsx
+++ b/apps/web/src/features/sessions/executor-credential-ownership.test.tsx
@@ -9,7 +9,7 @@ import { executorConnectionQuery } from "./executor-connection-query";
 const project = vi.hoisted(() => ({ archived: false }));
 vi.mock("../../lib/projects", async (original) => ({
   ...await original<typeof import("../../lib/projects")>(),
-  useProjects: () => ({ byId: new Map([["project", { status: project.archived ? "archived" : "active" }]]), refresh: () => undefined }),
+  useProjects: () => ({ byId: new Map([["project", { archived_at: project.archived ? "2026-09-28T04:00:00Z" : null }]]), refresh: () => undefined }),
 }));
 vi.mock("./ExecutorInstallPanel", () => ({
   useExecutorInstall: () => ({ kind: "unavailable" }),
diff --git a/apps/web/src/features/sessions/session-log.test.ts b/apps/web/src/features/sessions/session-log.test.ts
index 8f12ae19e..419469c31 100644
--- a/apps/web/src/features/sessions/session-log.test.ts
+++ b/apps/web/src/features/sessions/session-log.test.ts
@@ -1,9 +1,8 @@
 import { describe, expect, it } from "vitest";
 
-import type { AgentSession, ListPage } from "@oac/agents-client";
+import type { AdminProject, AgentSession, ListPage } from "@oac/agents-client";
 
 import type { Owned } from "../../lib/projects";
-import { type Project } from "../../lib/admin-view";
 import {
   agentOptions,
   environmentKind,
@@ -16,8 +15,8 @@ import {
   type SessionLogFilters,
 } from "./session-log";
 
-function project(id: string, name: string): Project {
-  return { id, name, status: "active", created_at: 1, archived_at: null, active_key_count: 1 };
+function project(id: string, name: string): AdminProject {
+  return { id, name, created_at: "1970-01-01T00:00:01Z", archived_at: null, active_key_count: 1 };
 }
 
 const production = project("proj_prod", "Production");
@@ -52,7 +51,7 @@ function session(id: string, overrides: Partial<AgentSession> & { agentId?: stri
   };
 }
 
-function row(owner: Project, value: AgentSession): Owned<AgentSession> {
+function row(owner: AdminProject, value: AgentSession): Owned<AgentSession> {
   return { project: owner, value };
 }
 
diff --git a/apps/web/src/i18n/locales/en/keys.ts b/apps/web/src/i18n/locales/en/keys.ts
index 5f15a8187..d7d438205 100644
--- a/apps/web/src/i18n/locales/en/keys.ts
+++ b/apps/web/src/i18n/locales/en/keys.ts
@@ -172,12 +172,11 @@ export const keys = {
   },
   operations: {
     title: "Write operations",
-    help: "Every successful write in this project, with the key that made it, recorded by Core, newest first. Reads are not recorded; request bodies and secrets are never stored. Unknown: no recorded key.",
+    help: "Every successful write in this project, with the key that made it, recorded by Core, newest first. Reads are not recorded; request bodies and secrets are never stored.",
     filterLabel: "Filter write operations",
     allTypes: "All resources",
     allKeys: "All keys",
     revokedKeyOption: "{{name}} · revoked",
-    unknownKey: "Unknown",
     columns: {
       time: "Time",
       action: "Action",
diff --git a/apps/web/src/i18n/locales/zh-CN/keys.ts b/apps/web/src/i18n/locales/zh-CN/keys.ts
index b5340bd6a..6879216fb 100644
--- a/apps/web/src/i18n/locales/zh-CN/keys.ts
+++ b/apps/web/src/i18n/locales/zh-CN/keys.ts
@@ -174,12 +174,11 @@ export const keys: TranslationShape<typeof english> = {
   },
   operations: {
     title: "写操作记录",
-    help: "这个项目里每一次成功的写操作，以及发起它的 key，由 Core 记录，按时间倒序。读操作不记录，也不保存请求内容和密钥。“未知”表示没有记录 key。",
+    help: "这个项目里每一次成功的写操作，以及发起它的 key，由 Core 记录，按时间倒序。读操作不记录，也不保存请求内容和密钥。",
     filterLabel: "筛选写操作记录",
     allTypes: "全部资源",
     allKeys: "全部 key",
     revokedKeyOption: "{{name}} · 已撤销",
-    unknownKey: "未知",
     columns: {
       time: "时间",
       action: "操作",
diff --git a/apps/web/src/lib/admin-view.ts b/apps/web/src/lib/admin-view.ts
index 86c5a3154..258dae7be 100644
--- a/apps/web/src/lib/admin-view.ts
+++ b/apps/web/src/lib/admin-view.ts
@@ -6,135 +6,37 @@ import {
   type AdminResourceType,
   type AdminRuntimeObservation,
   type AdminSummaryEntry,
-  type AdminWriteOperation,
-  type RuntimeObservation,
+  type AdminWriteOperationOptions,
+  type AdminWriteOperationPage,
 } from "@oac/agents-client";
 
 /**
- * View models over the typed management client (`AdminClient`, `/core/v1`).
- * Pages format Unix seconds and never treat missing data as zero, so this
- * layer converts RFC 3339 timestamps, resolves creating keys by name, walks
- * cursor pages and turns an unmeasured usage sum into `null`.
+ * Reads over the typed management client (`AdminClient`, `/core/v1`): they
+ * walk cursor pages, resolve the creating key of summary key rows and turn an
+ * unmeasured usage sum into `null`, so pages never treat missing data as zero.
  */
 export const admin = new AdminClient();
 
-export type ProjectStatus = "active" | "archived";
-
-export interface Project {
-  id: string;
-  name: string;
-  status: ProjectStatus;
-  /** Unix seconds. */
-  created_at: number;
-  archived_at: number | null;
-  active_key_count: number;
-}
-
-export interface AdminKey {
-  id: string;
-  project_id: string;
-  name: string;
-  prefix: string;
-  created_at: number;
-  revoked_at: number | null;
-}
-
-export interface AdminIssuedKey extends AdminKey {
-  /** Plaintext returned once by issuance; never stored. */
-  key: string;
-}
-
-/** The key recorded for a write or a resource's creation. */
-export interface KeyRef {
-  id: string;
-  name: string | null;
-  prefix: string | null;
-  revoked_at: number | null;
-}
-
-/** Who created a resource: a key, or null when Core has no creation record. */
-export interface Creator {
-  key: KeyRef | null;
-}
-
-export interface SpaceUsage {
-  input_tokens: number;
-  output_tokens: number;
-  total_tokens: number;
-  cached_tokens: number;
-  reasoning_tokens: number;
-}
-
-export interface ProjectSummary {
-  project_id: string;
-  agent_id: string | null;
-  /** Key rows: the creating key's ID; null groups Sessions with unknown provenance. */
-  key_id: string | null;
-  /** Key rows: the creating key resolved by name, or null when unknown. */
-  key: KeyRef | null;
-  assets: { agents: number; skills: number; environment_templates: number; files: number; vaults: number; credentials: number } | null;
-  sessions: { total: number; idle: number; in_progress: number; requires_action: number; failed: number };
+/** A summary row; a key row carries its key when the project's key list holds it. */
+export type ProjectSummary = Omit<AdminSummaryEntry, "usage"> & {
+  key: AdminAPIKey | null;
   /** null when no Session in the group reported usage. */
-  usage: SpaceUsage | null;
-  /** Sessions in range (denominator) and those that reported usage. */
-  coverage: { sessions: number; reported: number };
-  last_active_at: number | null;
-}
+  usage: AdminSummaryEntry["usage"] | null;
+};
 
-export interface WriteOperation {
-  id: string;
-  created_at: number;
-  api_key: KeyRef | null;
-  action: string;
-  resource_type: string;
-  resource_id: string;
-  parent_id: string;
-  request_id: string;
-  trace_id: string;
-}
-
-/** A Runtime observation with its project; the administrator list adds disk (E2B only, null elsewhere). */
-export type OwnedRuntimeObservation = RuntimeObservation & { project_id: string; disk?: AdminRuntimeObservation["observation"]["disk"] };
-export const ownerResourceTypes = ["agent", "session", "environment", "environment_template", "skill", "skill_version", "file", "vault", "credential", "artifact"] as const satisfies readonly AdminResourceType[];
-export type OwnerResourceType = AdminResourceType;
+/** A Runtime observation with its project; disk is E2B-only and null elsewhere. */
+export type OwnedRuntimeObservation = AdminRuntimeObservation["observation"] & { project_id: string };
 
 const PAGE = 100;
 /** Bounded walks: a deployment has a handful of projects and keys. */
 const MAX_PAGES = 100;
 
-function seconds(value: string): number {
-  return Math.floor(Date.parse(value) / 1000);
-}
-function maybeSeconds(value: string | null): number | null {
-  return value === null ? null : seconds(value);
-}
-
-export function projectView(project: AdminProject): Project {
-  return {
-    id: project.id,
-    name: project.name,
-    status: project.archived_at === null ? "active" : "archived",
-    created_at: seconds(project.created_at),
-    archived_at: maybeSeconds(project.archived_at),
-    active_key_count: project.active_key_count,
-  };
-}
-
-function keyView(key: AdminAPIKey): AdminKey {
-  return { ...key, created_at: seconds(key.created_at), revoked_at: maybeSeconds(key.revoked_at) };
-}
-
-function keyRef(key: AdminKeyProvenance | null): KeyRef | null {
-  if (!key) return null;
-  return { id: key.id, name: key.name || null, prefix: key.prefix || null, revoked_at: maybeSeconds(key.revoked_at) };
-}
-
-export async function listAllProjects(signal?: AbortSignal): Promise<Project[]> {
-  const projects: Project[] = [];
+export async function listAllProjects(signal?: AbortSignal): Promise<AdminProject[]> {
+  const projects: AdminProject[] = [];
   let after: string | undefined;
   for (let page = 0; page < MAX_PAGES; page += 1) {
     const result = await admin.listProjects({ after, limit: PAGE, order: "asc", signal });
-    projects.push(...result.data.map(projectView));
+    projects.push(...result.data);
     const last = result.data.at(-1)?.id;
     if (!result.has_more || !last) break;
     after = last;
@@ -142,23 +44,12 @@ export async function listAllProjects(signal?: AbortSignal): Promise<Project[]>
   return projects;
 }
 
-export async function createProject(name: string, signal?: AbortSignal): Promise<Project> {
-  return projectView(await admin.createProject({ name }, { signal }));
-}
-export async function renameProject(projectId: string, name: string, signal?: AbortSignal): Promise<Project> {
-  return projectView(await admin.renameProject(projectId, { name }, { signal }));
-}
-/** Revokes every key of the project; its assets stay viewable. */
-export async function archiveProject(projectId: string, signal?: AbortSignal): Promise<Project> {
-  return projectView(await admin.archiveProject(projectId, { signal }));
-}
-
-export async function listKeys(projectId: string, signal?: AbortSignal): Promise<AdminKey[]> {
-  const keys: AdminKey[] = [];
+export async function listKeys(projectId: string, signal?: AbortSignal): Promise<AdminAPIKey[]> {
+  const keys: AdminAPIKey[] = [];
   let after: string | undefined;
   for (let page = 0; page < MAX_PAGES; page += 1) {
     const result = await admin.listAPIKeys(projectId, { after, limit: PAGE, signal });
-    keys.push(...result.data.map(keyView));
+    keys.push(...result.data);
     const last = result.data.at(-1)?.id;
     if (!result.has_more || !last) break;
     after = last;
@@ -166,40 +57,6 @@ export async function listKeys(projectId: string, signal?: AbortSignal): Promise
   return keys;
 }
 
-/** Issues a named key; the plaintext exists only in this result. */
-export async function issueKey(projectId: string, name: string, signal?: AbortSignal): Promise<AdminIssuedKey> {
-  const issued = await admin.issueAPIKey(projectId, { name }, { signal });
-  return { ...keyView(issued), key: issued.key };
-}
-export async function revokeKey(projectId: string, keyId: string, signal?: AbortSignal): Promise<void> {
-  await admin.revokeAPIKey(projectId, keyId, { signal });
-}
-
-function summaryView(entry: AdminSummaryEntry, keys: ReadonlyMap<string, AdminKey>): ProjectSummary {
-  const measured = entry.coverage.measured_sessions;
-  const key = entry.key_id ? keys.get(entry.key_id) : undefined;
-  return {
-    project_id: entry.project_id,
-    agent_id: entry.agent_id,
-    key_id: entry.key_id,
-    key: entry.key_id
-      ? { id: entry.key_id, name: key?.name ?? null, prefix: key?.prefix ?? null, revoked_at: key?.revoked_at ?? null }
-      : null,
-    assets: entry.assets,
-    sessions: entry.sessions,
-    // Unmeasured Sessions add no tokens; an all-unmeasured group has no usage, not zero.
-    usage: measured === 0 ? null : {
-      input_tokens: entry.usage.input_tokens,
-      output_tokens: entry.usage.output_tokens,
-      total_tokens: entry.usage.total_tokens,
-      cached_tokens: entry.usage.input_tokens_details.cached_tokens,
-      reasoning_tokens: entry.usage.output_tokens_details.reasoning_tokens,
-    },
-    coverage: { sessions: entry.coverage.total_sessions, reported: measured },
-    last_active_at: entry.last_active_at,
-  };
-}
-
 export interface SummaryQuery {
   group_by?: "project" | "agent" | "key";
   project_id?: string;
@@ -210,7 +67,7 @@ export interface SummaryQuery {
   signal?: AbortSignal;
 }
 
-/** Every summary row for the query; key rows carry the creating key's name. */
+/** Every summary row for the query; key rows carry the creating key. */
 export async function loadSummary(query: SummaryQuery = {}): Promise<ProjectSummary[]> {
   const entries: AdminSummaryEntry[] = [];
   let after: string | undefined;
@@ -228,48 +85,35 @@ export async function loadSummary(query: SummaryQuery = {}): Promise<ProjectSumm
     if (!result.has_more || !result.next_cursor) break;
     after = result.next_cursor;
   }
-  const keys = new Map<string, AdminKey>();
+  const keys = new Map<string, AdminAPIKey>();
   if (query.group_by === "key") {
     const projectIds = [...new Set(entries.filter((entry) => entry.key_id).map((entry) => entry.project_id))];
     const lists = await Promise.allSettled(projectIds.map((projectId) => listKeys(projectId, query.signal)));
     for (const list of lists) if (list.status === "fulfilled") for (const key of list.value) keys.set(key.id, key);
   }
-  return entries.map((entry) => summaryView(entry, keys));
+  return entries.map((entry) => ({
+    ...entry,
+    key: entry.key_id === null ? null : keys.get(entry.key_id) ?? null,
+    // Unmeasured Sessions add no tokens; an all-unmeasured group has no usage, not zero.
+    usage: entry.coverage.measured_sessions === 0 ? null : entry.usage,
+  }));
 }
 
-export interface WriteOperationQuery {
-  key_id?: string;
-  resource_type?: AdminResourceType;
-  resource_id?: string;
-  after?: string;
-  limit?: number;
-  signal?: AbortSignal;
-}
+export type WriteOperationQuery = Pick<AdminWriteOperationOptions, "key_id" | "resource_type" | "resource_id" | "after" | "limit" | "signal">;
 
-function operationView(operation: AdminWriteOperation): WriteOperation {
-  return { ...operation, created_at: seconds(operation.created_at), api_key: keyRef(operation.api_key) };
+export async function listWriteOperations(projectId: string, query: WriteOperationQuery = {}): Promise<AdminWriteOperationPage> {
+  const page = await admin.listWriteOperations(projectId, { ...query, limit: query.limit ?? 50 });
+  return { ...page, has_more: page.has_more && page.next_cursor !== "" };
 }
 
-export async function listWriteOperations(projectId: string, query: WriteOperationQuery = {}): Promise<{ data: WriteOperation[]; has_more: boolean; next_cursor: string }> {
-  const page = await admin.listWriteOperations(projectId, {
-    key_id: query.key_id,
-    resource_type: query.resource_type,
-    resource_id: query.resource_id,
-    after: query.after,
-    limit: query.limit ?? 50,
-    signal: query.signal,
-  });
-  return { data: page.data.map(operationView), has_more: page.has_more && page.next_cursor !== "", next_cursor: page.next_cursor };
-}
-
-/** Creators of up to any number of resources of one project, in batches of 100. */
-export async function listCreators(projectId: string, type: OwnerResourceType, ids: readonly string[], signal?: AbortSignal): Promise<Map<string, Creator>> {
+/** Creators of any number of resources of one project, in batches of 100; null when Core has no creation record. */
+export async function listCreators(projectId: string, type: AdminResourceType, ids: readonly string[], signal?: AbortSignal): Promise<Map<string, AdminKeyProvenance | null>> {
   const unique = [...new Set(ids)];
-  const creators = new Map<string, Creator>();
+  const creators = new Map<string, AdminKeyProvenance | null>();
   for (let start = 0; start < unique.length; start += PAGE) {
     const batch = unique.slice(start, start + PAGE);
     const result = await admin.retrieveResourceOwners(projectId, type, batch, { signal });
-    for (const owner of result.data) creators.set(owner.resource_id, { key: keyRef(owner.api_key) });
+    for (const owner of result.data) creators.set(owner.resource_id, owner.api_key);
   }
   return creators;
 }
@@ -286,11 +130,3 @@ export async function listRuntimeObservations(signal?: AbortSignal): Promise<Own
   }
   return observations;
 }
-
-export function isProjectName(value: string): boolean {
-  return value.trim() === value && [...value].length >= 1 && [...value].length <= 128 && !/[\u0000-\u001f\u007f]/.test(value);
-}
-
-export function isKeyName(value: string): boolean {
-  return value.trim() === value && [...value].length >= 1 && [...value].length <= 80 && !/[\u0000-\u001f\u007f]/.test(value);
-}
diff --git a/apps/web/src/lib/format.ts b/apps/web/src/lib/format.ts
index c2b1fb7f2..b9e28984f 100644
--- a/apps/web/src/lib/format.ts
+++ b/apps/web/src/lib/format.ts
@@ -56,6 +56,13 @@ export function formatCores(value: number | null | undefined, locale?: string):
   return value.toLocaleString(locale, { maximumFractionDigits: value < 10 ? 2 : 1 });
 }
 
+/** Unix seconds of an RFC 3339 timestamp, for the formatters below; null when absent or unparseable. */
+export function epochSeconds(value: string | null | undefined): number | null {
+  if (!value) return null;
+  const parsed = Date.parse(value);
+  return Number.isNaN(parsed) ? null : Math.floor(parsed / 1000);
+}
+
 /** Date and time; the year is left out for dates in the current year. */
 export function formatDateTime(epochSeconds: number | null | undefined, locale?: string, now: Date = new Date()): string {
   if (epochSeconds === null || epochSeconds === undefined || !Number.isFinite(epochSeconds)) return MISSING;
diff --git a/apps/web/src/lib/projects.tsx b/apps/web/src/lib/projects.tsx
index b8ac7df0d..c5dc0e10f 100644
--- a/apps/web/src/lib/projects.tsx
+++ b/apps/web/src/lib/projects.tsx
@@ -1,8 +1,8 @@
 import type {
-  AgentDeleted, AgentSession, AgentTurn, EnvironmentTemplateDeleted, EnvironmentTemplateList, EnvironmentTemplateResource, ListPage, PageOptions, ReadOptions,
-  RuntimeHistory, RuntimeHistoryQuery, RuntimeObservation, SavedAgent, SessionDeleted, SessionItem, SessionListOptions, Skill, SkillContent, SkillDeleted, SkillList,
-  SkillListOptions, SkillVersionDeleted, SkillVersionList, SourceFileDeleted, SourceFileList, SourceFileListOptions, Vault, VaultCredentialDeleted,
-  VaultCredentialList, VaultDeleted, VaultList, VaultListOptions,
+  AdminKeyProvenance, AdminProject, AdminResourceType, AgentDeleted, AgentSession, AgentTurn, EnvironmentTemplateDeleted, EnvironmentTemplateList,
+  EnvironmentTemplateResource, ListPage, PageOptions, ReadOptions, RuntimeHistory, RuntimeHistoryQuery, RuntimeObservation, SavedAgent, SessionDeleted,
+  SessionItem, SessionListOptions, Skill, SkillContent, SkillDeleted, SkillList, SkillListOptions, SkillVersionDeleted, SkillVersionList, SourceFileDeleted,
+  SourceFileList, SourceFileListOptions, Vault, VaultCredentialDeleted, VaultCredentialList, VaultDeleted, VaultList, VaultListOptions,
 } from "@oac/agents-client";
 import { QueryClientProvider, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
@@ -11,11 +11,10 @@ import { useTranslation } from "react-i18next";
 import { readError } from "./read-error";
 import { ConsoleSelect } from "../components/console-select";
 import { HelpTip } from "../components/console-ui";
-import { admin, listCreators, type Creator, type OwnerResourceType, type Project } from "./admin-view";
+import { admin, listCreators } from "./admin-view";
 import { collectionQuery, projectsQuery, queryClient, type CollectionSpec } from "./queries";
 
 export { admin };
-export type { Project };
 
 /**
  * The console reaches Core only through the Web API (`/core/v1`). A
@@ -24,14 +23,14 @@ export type { Project };
  */
 
 export type ProjectsState =
-  | { status: "loading"; projects: Project[]; error: null }
-  | { status: "ready"; projects: Project[]; error: null }
-  | { status: "failed"; projects: Project[]; error: string };
+  | { status: "loading"; projects: AdminProject[]; error: null }
+  | { status: "ready"; projects: AdminProject[]; error: null }
+  | { status: "failed"; projects: AdminProject[]; error: string };
 
 interface ProjectsContextValue {
   state: ProjectsState;
   refresh: () => void;
-  byId: ReadonlyMap<string, Project>;
+  byId: ReadonlyMap<string, AdminProject>;
   /** Why the last refresh failed while earlier projects stay on screen. */
   refreshError: string | null;
   /** Original query failure for classification; translated display text is never evidence. */
@@ -84,30 +83,30 @@ export function ProjectFilter({ value, onChange, includeAll = true }: { value: P
     ...(includeAll ? [{ value: "", label: t("project.all") }] : []),
     ...state.projects.map((project) => ({
       value: project.id,
-      label: project.status === "archived" ? t("project.archivedOption", { name: project.name }) : project.name,
+      label: project.archived_at !== null ? t("project.archivedOption", { name: project.name }) : project.name,
     })),
   ], [includeAll, state.projects, t]);
   return <ConsoleSelect value={value} onChange={onChange} options={options} label={t("project.filter")} />;
 }
 
 /** The project a row belongs to when a table shows every project. */
-export function ProjectName({ project }: { project: Project | undefined }) {
+export function ProjectName({ project }: { project: AdminProject | undefined }) {
   const { t } = useTranslation("common");
   if (!project) return <span className="table-muted">—</span>;
   return (
-    <span className={project.status === "archived" ? "space-name space-disabled" : "space-name"} title={project.status === "archived" ? t("project.archived") : undefined}>
+    <span className={project.archived_at !== null ? "space-name space-disabled" : "space-name"} title={project.archived_at !== null ? t("project.archived") : undefined}>
       {project.name}
     </span>
   );
 }
 
 export interface Owned<T> {
-  project: Project;
+  project: AdminProject;
   value: T;
 }
 
 export interface ProjectFailure {
-  project: Project;
+  project: AdminProject;
   message: string;
 }
 
@@ -221,7 +220,7 @@ export function useProjectCollection<T>(spec: CollectionSpec<T>, filter: Project
   });
   // `items` keeps its identity until a project's cached data changes, so pages
   // may depend on it in effects and memos without re-running on every render.
-  const cache = useRef<{ targets: readonly Project[]; sources: readonly (T[] | undefined)[]; items: Owned<T>[] } | null>(null);
+  const cache = useRef<{ targets: readonly AdminProject[]; sources: readonly (T[] | undefined)[]; items: Owned<T>[] } | null>(null);
   const sources = results.map((result) => result.data);
   const previous = cache.current;
   let items: Owned<T>[];
@@ -262,9 +261,9 @@ export async function readAllPages<T extends { id: string }>(
   return values;
 }
 
-/** Creator lookups are cached per project and resource; a refresh forgets them. */
-const creatorCache = new Map<string, Creator>();
-const creatorKey = (type: OwnerResourceType, projectId: string, id: string) => `${type}:${projectId}:${id}`;
+/** Creator lookups are cached per project and resource (null when Core has no creation record); a refresh forgets them. */
+const creatorCache = new Map<string, AdminKeyProvenance | null>();
+const creatorKey = (type: AdminResourceType, projectId: string, id: string) => `${type}:${projectId}:${id}`;
 let creatorGeneration = 0;
 const creatorListeners = new Set<(generation: number) => void>();
 
@@ -277,11 +276,11 @@ export function forgetCreators() {
 
 export interface Creators {
   /** undefined: not loaded yet or the lookup failed. */
-  creatorOf: (projectId: string, id: string) => Creator | undefined;
+  creatorOf: (projectId: string, id: string) => AdminKeyProvenance | null | undefined;
 }
 
 /** The key that created each row (#87 ownership), batched per project. */
-export function useCreators(type: OwnerResourceType, rows: ReadonlyArray<{ projectId: string; id: string }>): Creators {
+export function useCreators(type: AdminResourceType, rows: ReadonlyArray<{ projectId: string; id: string }>): Creators {
   const [, setVersion] = useState(0);
   const [generation, setGeneration] = useState(creatorGeneration);
   useEffect(() => {
@@ -299,7 +298,7 @@ export function useCreators(type: OwnerResourceType, rows: ReadonlyArray<{ proje
     const controller = new AbortController();
     void Promise.allSettled([...byProject].map(async ([projectId, ids]) => {
       const creators = await listCreators(projectId, type, ids, controller.signal);
-      for (const id of ids) creatorCache.set(creatorKey(type, projectId, id), creators.get(id) ?? { key: null });
+      for (const id of ids) creatorCache.set(creatorKey(type, projectId, id), creators.get(id) ?? null);
     })).then(() => { if (!controller.signal.aborted) setVersion((value) => value + 1); });
     return () => controller.abort();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -316,16 +315,14 @@ export function CreatorHeading() {
 }
 
 /** The creating key's name, or "Unknown" when Core has no record. */
-export function CreatorCell({ creator }: { creator: Creator | undefined }) {
+export function CreatorCell({ creator }: { creator: AdminKeyProvenance | null | undefined }) {
   const { t } = useTranslation("common");
   if (creator === undefined) return <span className="owner-missing">—</span>;
-  const key = creator.key;
-  if (!key) return <span className="owner-missing" title={t("creator.unknownHelp")}>{t("creator.unknown")}</span>;
-  const label = key.name ?? (key.prefix ? `${key.prefix}…` : t("creator.unknown"));
+  if (!creator) return <span className="owner-missing" title={t("creator.unknownHelp")}>{t("creator.unknown")}</span>;
   return (
-    <span className={key.revoked_at ? "owner-name owner-revoked" : "owner-name"} title={key.prefix ? `${key.prefix}…` : undefined}>
-      {label}
-      {key.revoked_at ? <span className="pill">{t("creator.revoked")}</span> : null}
+    <span className={creator.revoked_at ? "owner-name owner-revoked" : "owner-name"} title={`${creator.prefix}…`}>
+      {creator.name}
+      {creator.revoked_at ? <span className="pill">{t("creator.revoked")}</span> : null}
     </span>
   );
 }
diff --git a/apps/web/src/lib/sandbox-diagnostic.test.ts b/apps/web/src/lib/sandbox-diagnostic.test.ts
index 4ead7d8fb..5c6c5a0c6 100644
--- a/apps/web/src/lib/sandbox-diagnostic.test.ts
+++ b/apps/web/src/lib/sandbox-diagnostic.test.ts
@@ -19,7 +19,7 @@ describe("sandbox diagnostics", () => {
   it("names why a node's provider is not ready, reading an unknown code as provider_unavailable", () => {
     expect(sandboxDiagnosticMessage(nodeProviderDiagnostic({ online: true, provider_ready: false, diagnostic: "host_unsupported" }))?.label).toBe("Host unsupported");
     expect(nodeProviderDiagnostic({ online: true, provider_ready: false, diagnostic: "future_code" as SandboxNodeDiagnostic })).toBe("provider_unavailable");
-    expect(nodeProviderDiagnostic({ online: true, provider_ready: true, diagnostic: "" })).toBe("");
+    expect(nodeProviderDiagnostic({ online: true, provider_ready: true })).toBe("");
     // An offline node's last code may no longer apply.
     expect(nodeProviderDiagnostic({ online: false, provider_ready: false, diagnostic: "host_unsupported" })).toBe("");
   });
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index af9ea99b5..941308164 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -23,6 +23,17 @@ definitions:
         type: string
       trace_id:
         type: string
+    required:
+      - action
+      - actor_label
+      - admin_credential_id
+      - created_at
+      - id
+      - project_id
+      - request_id
+      - resource_id
+      - resource_type
+      - trace_id
     type: object
   adminaudit.Page:
     properties:
@@ -34,6 +45,10 @@ definitions:
         type: boolean
       next_cursor:
         type: string
+    required:
+      - data
+      - has_more
+      - next_cursor
     type: object
   api.AdminRuntimeObservation:
     properties:
@@ -41,6 +56,9 @@ definitions:
         $ref: '#/definitions/api.AdminRuntimeObservationDetail'
       project_id:
         type: string
+    required:
+      - observation
+      - project_id
     type: object
   api.AdminRuntimeObservationDetail:
     properties:
@@ -150,17 +168,29 @@ definitions:
         type: array
       first_id:
         type: string
+        x-nullable: true
       has_more:
         type: boolean
       last_id:
         type: string
+        x-nullable: true
       object:
+        enum:
+          - list
         type: string
+    required:
+      - data
+      - first_id
+      - has_more
+      - last_id
+      - object
     type: object
   api.AdminSessionArchiveRequest:
     properties:
       expected_generation:
         type: integer
+    required:
+      - expected_generation
     type: object
   api.AdminSessionCounts:
     properties:
@@ -174,6 +204,12 @@ definitions:
         type: integer
       total:
         type: integer
+    required:
+      - failed
+      - idle
+      - in_progress
+      - requires_action
+      - total
     type: object
   api.AdminSummaryResponse:
     properties:
@@ -185,25 +221,43 @@ definitions:
         type: boolean
       next_cursor:
         type: string
+    required:
+      - data
+      - has_more
+      - next_cursor
     type: object
   api.AdminSummaryRow:
     properties:
       agent_id:
         type: string
+        x-nullable: true
       assets:
-        $ref: '#/definitions/sessions.AdminAssetCounts'
+        allOf:
+          - $ref: '#/definitions/sessions.AdminAssetCounts'
+        x-nullable: true
       coverage:
         $ref: '#/definitions/api.AdminUsageCoverage'
       key_id:
         type: string
+        x-nullable: true
       last_active_at:
         type: integer
+        x-nullable: true
       project_id:
         type: string
       sessions:
         $ref: '#/definitions/api.AdminSessionCounts'
       usage:
         $ref: '#/definitions/v1.TokenUsage'
+    required:
+      - agent_id
+      - assets
+      - coverage
+      - key_id
+      - last_active_at
+      - project_id
+      - sessions
+      - usage
     type: object
   api.AdminUsageCoverage:
     properties:
@@ -211,8 +265,13 @@ definitions:
         type: integer
       ratio:
         type: number
+        x-nullable: true
       total_sessions:
         type: integer
+    required:
+      - measured_sessions
+      - ratio
+      - total_sessions
     type: object
   api.CoreAPIError:
     properties:
@@ -322,6 +381,10 @@ definitions:
         x-nullable: true
       params:
         type: object
+    required:
+      - code
+      - failed_at
+      - params
     type: object
   api.EnvironmentExecutorCredentialRequest:
     properties:
@@ -330,6 +393,8 @@ definitions:
         type: string
       rotate:
         type: boolean
+    required:
+      - key_id
     type: object
   api.ExecutorConnection:
     properties:
@@ -449,6 +514,15 @@ definitions:
         description: Full source commit Core was built from; null for development builds.
         type: string
         x-nullable: true
+    required:
+      - address_bindings
+      - api_base_url
+      - configuration
+      - installation_id
+      - local_only
+      - object
+      - public_url
+      - source_commit
     type: object
   api.InstallationConfiguration:
     properties:
@@ -456,6 +530,8 @@ definitions:
         items:
           $ref: '#/definitions/api.InstallationSetting'
         type: array
+    required:
+      - settings
     type: object
   api.InstallationSetting:
     properties:
@@ -473,6 +549,9 @@ definitions:
       restarts:
         description: Services that restart when the setting changes.
         items:
+          enum:
+            - core
+            - web
           type: string
         type: array
       sensitive:
@@ -480,6 +559,13 @@ definitions:
       value:
         description: Applied value; always null for a sensitive setting.
         x-nullable: true
+    required:
+      - changeable
+      - default
+      - key
+      - restarts
+      - sensitive
+      - value
     type: object
   api.ItemDiagnosticTiming:
     properties:
@@ -493,16 +579,25 @@ definitions:
         x-nullable: true
       started_at:
         type: string
+    required:
+      - completed_at
+      - item_id
+      - observed_duration_ms
+      - started_at
     type: object
   api.ProjectAPIKeyRequest:
     properties:
       name:
         type: string
+    required:
+      - name
     type: object
   api.ProjectRequest:
     properties:
       name:
         type: string
+    required:
+      - name
     type: object
   api.ResourceOwnerList:
     properties:
@@ -510,6 +605,8 @@ definitions:
         items:
           $ref: '#/definitions/writeaudit.ResourceOwner'
         type: array
+    required:
+      - data
     type: object
   api.RuntimeDiskObservation:
     properties:
@@ -531,6 +628,8 @@ definitions:
         items:
           $ref: '#/definitions/deployment.NodeAllocation'
         type: array
+    required:
+      - data
     type: object
   api.SandboxDeploymentChangeInput:
     properties:
@@ -583,6 +682,10 @@ definitions:
         type: string
       token:
         type: string
+    required:
+      - enrollment_id
+      - expires_at
+      - token
     type: object
   api.SandboxEnrollmentTokenRequest:
     properties:
@@ -600,6 +703,8 @@ definitions:
         type: string
       updated:
         type: boolean
+    required:
+      - id
     type: object
   api.SandboxNodeList:
     properties:
@@ -607,6 +712,8 @@ definitions:
         items:
           $ref: '#/definitions/deployment.Node'
         type: array
+    required:
+      - data
     type: object
   api.SessionDiagnosticFailure:
     properties:
@@ -651,6 +758,11 @@ definitions:
         type: string
       turn_id:
         type: string
+    required:
+      - code
+      - failed_at
+      - params
+      - source
     type: object
   api.SessionDiagnostics:
     properties:
@@ -671,6 +783,11 @@ definitions:
           - requires_action
           - failed
         type: string
+    required:
+      - failure
+      - object
+      - session_id
+      - status
     type: object
   api.TurnDiagnostics:
     properties:
@@ -694,6 +811,14 @@ definitions:
         type: string
       turn_id:
         type: string
+    required:
+      - failure
+      - items
+      - items_truncated
+      - object
+      - session_id
+      - status
+      - turn_id
     type: object
   coremetrics.Database:
     properties:
@@ -708,6 +833,11 @@ definitions:
       size_bytes:
         type: integer
         x-nullable: true
+    required:
+      - ping_ms
+      - pool
+      - series
+      - size_bytes
     type: object
   coremetrics.DatabaseBucket:
     properties:
@@ -719,6 +849,10 @@ definitions:
         x-nullable: true
       start:
         type: string
+    required:
+      - ping_p95_ms
+      - pool_in_use
+      - start
     type: object
   coremetrics.Execution:
     properties:
@@ -752,6 +886,18 @@ definitions:
       waiting_for_daemon:
         type: integer
         x-nullable: true
+    required:
+      - connected_daemons
+      - in_progress_turns
+      - interrupted
+      - oldest_queued_seconds
+      - queue_wait_ms
+      - queued_turns
+      - series
+      - slots_in_use
+      - slots_total
+      - unavailable
+      - waiting_for_daemon
     type: object
   coremetrics.ExecutionBucket:
     properties:
@@ -766,6 +912,11 @@ definitions:
         x-nullable: true
       start:
         type: string
+    required:
+      - in_progress
+      - queue_wait_p95_ms
+      - queued
+      - start
     type: object
   coremetrics.Job:
     properties:
@@ -781,7 +932,18 @@ definitions:
         type: integer
         x-nullable: true
       status:
+        enum:
+          - ok
+          - failing
+          - stopped
+          - unknown
         type: string
+    required:
+      - failed
+      - id
+      - last_run_at
+      - processed
+      - status
     type: object
   coremetrics.Latency:
     properties:
@@ -791,6 +953,9 @@ definitions:
       p95:
         type: number
         x-nullable: true
+    required:
+      - p50
+      - p95
     type: object
   coremetrics.Pool:
     properties:
@@ -803,6 +968,10 @@ definitions:
       max:
         type: integer
         x-nullable: true
+    required:
+      - idle
+      - in_use
+      - max
     type: object
   coremetrics.Process:
     properties:
@@ -828,6 +997,14 @@ definitions:
         items:
           $ref: '#/definitions/coremetrics.ProcessBucket'
         type: array
+    required:
+      - cpu_cores
+      - cpu_limit_cores
+      - goroutines
+      - memory_bytes
+      - memory_limit_bytes
+      - rss_bytes
+      - series
     type: object
   coremetrics.ProcessBucket:
     properties:
@@ -839,6 +1016,10 @@ definitions:
         x-nullable: true
       start:
         type: string
+    required:
+      - cpu_cores
+      - rss_bytes
+      - start
     type: object
   coremetrics.Range:
     properties:
@@ -848,6 +1029,10 @@ definitions:
         type: integer
       start:
         type: string
+    required:
+      - end
+      - resolution_seconds
+      - start
     type: object
   coremetrics.ServiceState:
     properties:
@@ -861,7 +1046,15 @@ definitions:
         type: string
         x-nullable: true
       status:
+        enum:
+          - running
+          - degraded
         type: string
+    required:
+      - execution_owner
+      - revision
+      - started_at
+      - status
     type: object
   coremetrics.View:
     properties:
@@ -874,6 +1067,8 @@ definitions:
           $ref: '#/definitions/coremetrics.Job'
         type: array
       object:
+        enum:
+          - core.metrics
         type: string
       process:
         $ref: '#/definitions/coremetrics.Process'
@@ -881,6 +1076,14 @@ definitions:
         $ref: '#/definitions/coremetrics.Range'
       service:
         $ref: '#/definitions/coremetrics.ServiceState'
+    required:
+      - database
+      - execution
+      - jobs
+      - object
+      - process
+      - range
+      - service
     type: object
   deployment.AddressBindings:
     properties:
@@ -892,6 +1095,11 @@ definitions:
         type: integer
       self_hosted_executors:
         type: integer
+    required:
+      - hosted_sandboxes
+      - nodes
+      - nodes_on_other_address
+      - self_hosted_executors
     type: object
   deployment.HostHistory:
     properties:
@@ -901,6 +1109,9 @@ definitions:
         type: array
       resolution_seconds:
         type: integer
+    required:
+      - points
+      - resolution_seconds
     type: object
   deployment.HostHistoryPoint:
     properties:
@@ -915,6 +1126,11 @@ definitions:
         x-nullable: true
       start:
         type: string
+    required:
+      - available_disk_bytes_min
+      - cpu_utilization_max
+      - memory_used_bytes_max
+      - start
     type: object
   deployment.Node:
     properties:
@@ -922,8 +1138,10 @@ definitions:
         type: integer
       available_disk_bytes:
         type: integer
+        x-nullable: true
       available_memory_bytes:
         type: integer
+        x-nullable: true
       cleanup_pending:
         type: integer
       core_url:
@@ -933,6 +1151,7 @@ definitions:
         type: string
       cpu_count:
         type: integer
+        x-nullable: true
       created_at:
         type: string
       diagnostic:
@@ -953,6 +1172,7 @@ definitions:
         type: string
       last_seen_at:
         type: string
+        x-nullable: true
       max_active:
         type: integer
       max_retained:
@@ -975,6 +1195,28 @@ definitions:
         type: integer
       snapshots:
         type: integer
+    required:
+      - active
+      - available_disk_bytes
+      - available_memory_bytes
+      - cleanup_pending
+      - core_url
+      - cpu_count
+      - created_at
+      - enrollment_id
+      - id
+      - last_seen_at
+      - max_active
+      - max_retained
+      - name
+      - online
+      - provider
+      - provider_ready
+      - reserved
+      - retained
+      - rollout
+      - running
+      - snapshots
     type: object
   deployment.NodeAllocation:
     properties:
@@ -989,6 +1231,13 @@ definitions:
       deployment_generation:
         type: integer
       diagnostic:
+        enum:
+          - ""
+          - node_unavailable
+          - resource_missing
+          - compute_unconfirmed
+          - ownership_mismatch
+          - provider_unavailable
         type: string
       environment_id:
         type: string
@@ -1004,6 +1253,19 @@ definitions:
         type: string
       tenant_id:
         type: string
+    required:
+      - compute_phase
+      - compute_phase_changed_at
+      - created_at
+      - deployment_generation
+      - diagnostic
+      - environment_id
+      - id
+      - initialization
+      - node_id
+      - session_id
+      - state
+      - tenant_id
     type: object
   deployment.NodeDetail:
     properties:
@@ -1011,8 +1273,10 @@ definitions:
         type: integer
       available_disk_bytes:
         type: integer
+        x-nullable: true
       available_memory_bytes:
         type: integer
+        x-nullable: true
       cleanup_pending:
         type: integer
       core_url:
@@ -1022,6 +1286,7 @@ definitions:
         type: string
       cpu_count:
         type: integer
+        x-nullable: true
       created_at:
         type: string
       diagnostic:
@@ -1046,6 +1311,7 @@ definitions:
         type: string
       last_seen_at:
         type: string
+        x-nullable: true
       max_active:
         type: integer
       max_retained:
@@ -1068,6 +1334,30 @@ definitions:
         type: integer
       snapshots:
         type: integer
+    required:
+      - active
+      - available_disk_bytes
+      - available_memory_bytes
+      - cleanup_pending
+      - core_url
+      - cpu_count
+      - created_at
+      - enrollment_id
+      - history
+      - host
+      - id
+      - last_seen_at
+      - max_active
+      - max_retained
+      - name
+      - online
+      - provider
+      - provider_ready
+      - reserved
+      - retained
+      - rollout
+      - running
+      - snapshots
     type: object
   deployment.NodeHost:
     properties:
@@ -1089,6 +1379,13 @@ definitions:
       total_memory_bytes:
         type: integer
         x-nullable: true
+    required:
+      - available_disk_bytes
+      - available_memory_bytes
+      - cpu_utilization
+      - effective_cpu_cores
+      - observed_at
+      - total_memory_bytes
     type: object
   deployment.NodeRollout:
     properties:
@@ -1114,6 +1411,9 @@ definitions:
           - update_required
           - unknown
         type: string
+    required:
+      - ready_generation
+      - state
     type: object
   deployment.NodeUpdate:
     properties:
@@ -1124,10 +1424,16 @@ definitions:
         type: integer
       name:
         type: string
+    required:
+      - max_active
+      - name
     type: object
   deployment.Reset:
     properties:
       clear:
+        enum:
+          - auto
+          - force
         type: string
       deadline_at:
         type: string
@@ -1139,6 +1445,12 @@ definitions:
         $ref: '#/definitions/deployment.ResetRemaining'
       requested_at:
         type: string
+    required:
+      - clear
+      - deadline_at
+      - forced_at
+      - remaining
+      - requested_at
     type: object
   deployment.ResetOfflineNode:
     properties:
@@ -1148,6 +1460,10 @@ definitions:
         type: string
       resources:
         type: integer
+    required:
+      - name
+      - node_id
+      - resources
     type: object
   deployment.ResetRemaining:
     properties:
@@ -1163,6 +1479,12 @@ definitions:
         type: array
       on_offline_nodes:
         type: integer
+    required:
+      - busy
+      - cleanup
+      - idle
+      - offline_nodes
+      - on_offline_nodes
     type: object
   deployment.ResetRequest:
     properties:
@@ -1188,6 +1510,9 @@ definitions:
         type: integer
       pending:
         type: integer
+    required:
+      - allocations
+      - pending
     type: object
   deployment.Rollout:
     properties:
@@ -1202,6 +1527,10 @@ definitions:
           - settled
           - preparing
         type: string
+    required:
+      - nodes
+      - previous_generation_sandboxes
+      - state
     type: object
   deployment.RolloutNodes:
     properties:
@@ -1215,6 +1544,12 @@ definitions:
         type: integer
       update_required:
         type: integer
+    required:
+      - failed
+      - preparing
+      - ready
+      - unknown
+      - update_required
     type: object
   deployment.Suspension:
     properties:
@@ -1222,6 +1557,9 @@ definitions:
         type: integer
       retention_seconds:
         type: integer
+    required:
+      - idle_seconds
+      - retention_seconds
     type: object
   deployment.View:
     properties:
@@ -1239,6 +1577,10 @@ definitions:
       metadata:
         type: object
       mode:
+        enum:
+          - ""
+          - nodes
+          - direct
         type: string
       owner_epoch:
         type: integer
@@ -1261,6 +1603,18 @@ definitions:
           - $ref: '#/definitions/deployment.Suspension'
         description: Idle suspension policy; null unless the selected Provider declares checkpoint support.
         x-nullable: true
+    required:
+      - core_url
+      - credential_configured
+      - generation
+      - installation_id
+      - mode
+      - owner_epoch
+      - provider
+      - reset
+      - resources
+      - rollout
+      - suspension
     type: object
   projects.APIKey:
     properties:
@@ -1276,6 +1630,14 @@ definitions:
         type: string
       revoked_at:
         type: string
+        x-nullable: true
+    required:
+      - created_at
+      - id
+      - name
+      - prefix
+      - project_id
+      - revoked_at
     type: object
   projects.IssuedAPIKey:
     properties:
@@ -1293,6 +1655,15 @@ definitions:
         type: string
       revoked_at:
         type: string
+        x-nullable: true
+    required:
+      - created_at
+      - id
+      - key
+      - name
+      - prefix
+      - project_id
+      - revoked_at
     type: object
   projects.KeyPage:
     properties:
@@ -1302,6 +1673,9 @@ definitions:
         type: array
       has_more:
         type: boolean
+    required:
+      - data
+      - has_more
     type: object
   projects.Page:
     properties:
@@ -1311,6 +1685,9 @@ definitions:
         type: array
       has_more:
         type: boolean
+    required:
+      - data
+      - has_more
     type: object
   projects.Project:
     properties:
@@ -1318,12 +1695,19 @@ definitions:
         type: integer
       archived_at:
         type: string
+        x-nullable: true
       created_at:
         type: string
       id:
         type: string
       name:
         type: string
+    required:
+      - active_key_count
+      - archived_at
+      - created_at
+      - id
+      - name
     type: object
   sandbox.ConfigurationDiscoveryInput:
     properties:
@@ -1340,6 +1724,8 @@ definitions:
         $ref: '#/definitions/sandbox.Resources'
       runtime:
         $ref: '#/definitions/sandbox.RuntimeRelease'
+    required:
+      - resources
     type: object
   sandbox.Resources:
     properties:
@@ -1351,6 +1737,9 @@ definitions:
         type: integer
       root_disk_mib:
         type: integer
+    required:
+      - cpus
+      - memory_mib
     type: object
   sandbox.RuntimeRelease:
     properties:
@@ -1366,6 +1755,13 @@ definitions:
         type: string
       source_commit:
         type: string
+    required:
+      - firmware_sha256
+      - image_id
+      - image_manifest_digest
+      - microsandbox_ref
+      - runtime_sha256
+      - source_commit
     type: object
   sessions.AdminAssetCounts:
     properties:
@@ -1381,6 +1777,13 @@ definitions:
         type: integer
       vaults:
         type: integer
+    required:
+      - agents
+      - credentials
+      - environment_templates
+      - files
+      - skills
+      - vaults
     type: object
   sessions.ExecutorCredential:
     properties:
@@ -1392,6 +1795,10 @@ definitions:
       revoked_at:
         type: string
         x-nullable: true
+    required:
+      - created_at
+      - key_id
+      - revoked_at
     type: object
   sessions.IssuedExecutorCredential:
     properties:
@@ -1401,6 +1808,9 @@ definitions:
         type: string
       key_id:
         type: string
+    required:
+      - executor_token
+      - key_id
     type: object
   sessions.ManagedArchive:
     properties:
@@ -1409,7 +1819,15 @@ definitions:
       session_id:
         type: string
       state:
+        enum:
+          - active
+          - cleanup_pending
+          - released
         type: string
+    required:
+      - environment_id
+      - session_id
+      - state
     type: object
   v1.Agent:
     properties:
@@ -3333,6 +3751,8 @@ definitions:
       id:
         type: string
       kind:
+        enum:
+          - issued
         type: string
       name:
         type: string
@@ -3340,10 +3760,25 @@ definitions:
         type: string
       revoked_at:
         type: string
+        x-nullable: true
+    required:
+      - id
+      - kind
+      - name
+      - prefix
+      - revoked_at
     type: object
   writeaudit.Operation:
     properties:
       action:
+        enum:
+          - create
+          - update
+          - delete
+          - send_events
+          - upload_file
+          - upload_version
+          - update_default_version
         type: string
       api_key:
         $ref: '#/definitions/writeaudit.APIKey'
@@ -3358,9 +3793,30 @@ definitions:
       resource_id:
         type: string
       resource_type:
+        enum:
+          - agent
+          - session
+          - environment
+          - environment_template
+          - skill
+          - skill_version
+          - file
+          - vault
+          - credential
+          - artifact
         type: string
       trace_id:
         type: string
+    required:
+      - action
+      - api_key
+      - created_at
+      - id
+      - parent_id
+      - request_id
+      - resource_id
+      - resource_type
+      - trace_id
     type: object
   writeaudit.Page:
     properties:
@@ -3372,13 +3828,22 @@ definitions:
         type: boolean
       next_cursor:
         type: string
+    required:
+      - data
+      - has_more
+      - next_cursor
     type: object
   writeaudit.ResourceOwner:
     properties:
       api_key:
-        $ref: '#/definitions/writeaudit.APIKey'
+        allOf:
+          - $ref: '#/definitions/writeaudit.APIKey'
+        x-nullable: true
       resource_id:
         type: string
+    required:
+      - api_key
+      - resource_id
     type: object
 info:
   contact: {}
diff --git a/contracts/agents-api/index.md b/contracts/agents-api/index.md
index 286d27a27..f9ffb2cf9 100644
--- a/contracts/agents-api/index.md
+++ b/contracts/agents-api/index.md
@@ -14,7 +14,7 @@ Core targets the complete OpenAI Agents API as pinned below ([public API rule](h
 | [openapi.yaml](./openapi.yaml) | The official public contract with Core's `x_agents_core` extension on Agent and Session request/response objects |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go names, field representations, encoding order and stored projections; it does not define official field membership, enums or constraints |
 
-Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The TypeScript client's types, enum values and field names in `packages/agents-client/src/generated/public-api.ts` are generated from the resulting public schema. The internal `/core/v1` and `/api/v1` documents come from handler annotations. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
+Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The TypeScript client's types, enum values and field names in `packages/agents-client/src/generated/public-api.ts` are generated from the resulting public schema. The internal `/core/v1` and `/api/v1` documents come from handler annotations; the same generator projects the `/core/v1` document into `packages/agents-client/src/generated/core-api.ts`, which imports the public types it references from `public-api.ts`. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
 
 The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` lists types consumed by Core and overrides only the Go representation or field order that existing storage or custom JSON encoding requires. Unspecified fields follow the official schema; shared shapes use one Go type. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, Core's local limits, execution admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
 
diff --git a/contracts/agents-api/runtime.openapi.yaml b/contracts/agents-api/runtime.openapi.yaml
index 8e1ac37a7..fb434cab2 100644
--- a/contracts/agents-api/runtime.openapi.yaml
+++ b/contracts/agents-api/runtime.openapi.yaml
@@ -117,6 +117,8 @@ definitions:
         $ref: '#/definitions/sandbox.Resources'
       runtime:
         $ref: '#/definitions/sandbox.RuntimeRelease'
+    required:
+      - resources
     type: object
   sandbox.Resources:
     properties:
@@ -128,6 +130,9 @@ definitions:
         type: integer
       root_disk_mib:
         type: integer
+    required:
+      - cpus
+      - memory_mib
     type: object
   sandbox.RuntimeRelease:
     properties:
@@ -143,6 +148,13 @@ definitions:
         type: string
       source_commit:
         type: string
+    required:
+      - firmware_sha256
+      - image_id
+      - image_manifest_digest
+      - microsandbox_ref
+      - runtime_sha256
+      - source_commit
     type: object
   v1.APIError:
     properties:
diff --git a/contracts/agents-api/zh/index.md b/contracts/agents-api/zh/index.md
index 3897fefdc..04c831d54 100644
--- a/contracts/agents-api/zh/index.md
+++ b/contracts/agents-api/zh/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Agents API 覆盖台账"
 source: contracts/agents-api/index.md
-source_hash: c3180e51ce893b3752370abbdf3a58255ebe11fdfd7ec1e1620ad85f7ce1b30d
+source_hash: b2281fe0f7ab7c4f810b029aca847a11a3a292d367dcacd1ac3f716f511e2814
 ---
 
 Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[public API rule](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#public-api)）。本台账记录 Core 对各项资源实现了哪些内容、哪些契约保存其详细信息，并列出相对于 OpenAI 服务的所有已知差异和所有未解决缺口。[API namespaces and credentials](../../../docs/zh/api/index.md) 说明谁调用哪些 API；[Agents API guide](../../../docs/zh/api/public-agent-api.md) 介绍使用方法。
@@ -16,7 +16,7 @@ Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[publi
 | [openapi.yaml](../openapi.yaml) | 官方公共契约，并在 Agent 和 Session 请求及响应对象上加入 Core 的 `x_agents_core` 扩展 |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go 名称、字段表示、编码顺序和存储投影；不定义官方字段集合、枚举或约束 |
 
-运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。TypeScript 客户端在 `packages/agents-client/src/generated/public-api.ts` 中的类型、枚举值和字段名由生成后的公共 schema 生成。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
+运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。TypeScript 客户端在 `packages/agents-client/src/generated/public-api.ts` 中的类型、枚举值和字段名由生成后的公共 schema 生成。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成；同一生成器把 `/core/v1` 文档投影为 `packages/agents-client/src/generated/core-api.ts`，其中引用的公共类型从 `public-api.ts` 导入。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
 
 公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；`go-bindings.json` 只列出 Core 使用的类型，仅在已有存储或自定义 JSON 编码需要时覆盖 Go 表示或字段顺序。未覆盖的字段遵循官方 schema，相同结构复用同一个 Go 类型。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、Core 的本地限制、执行准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
 
diff --git a/packages/agents-client/README.md b/packages/agents-client/README.md
index c93f98670..0e471313f 100644
--- a/packages/agents-client/README.md
+++ b/packages/agents-client/README.md
@@ -20,7 +20,7 @@ Every constructor also takes `baseUrl` and `fetch`. A token may be a string or a
 
 Behavior shared by the clients:
 
-- **Generated types.** `make openapi` generates `src/generated/public-api.ts` from the [public schema](../../contracts/agents-api/openapi.yaml): each schema's type, each enum's values and each object's field names. `types.ts` builds on the types and the validators read the value and field lists; `make check-openapi` rejects a stale copy, so change the schema and regenerate instead of editing the file.
+- **Generated types.** `make openapi` generates `src/generated/public-api.ts` from the [public schema](../../contracts/agents-api/openapi.yaml) and `src/generated/core-api.ts` from the [Core API schema](../../contracts/agents-api/core.openapi.yaml): each schema's type, each enum's values and each object's field names. `types.ts`, `admin-types.ts`, `sandbox-client.ts` and `core-metrics.ts` name and compose the types, and the validators read the value and field lists; `make check-openapi` rejects a stale copy, so change the schema or the Go annotations and regenerate instead of editing the files.
 - **Strict responses.** Session, history, event, Environment and Core API responses are checked against their pinned shapes before they are returned. A malformed one throws `AgentCoreError` with status 502 and a code such as `invalid_session_resource` or `invalid_admin_response` (`CoreMetricsClient`: status 0, `invalid_response`) instead of passing on a guessed value. Agent responses are typed but not checked at run time.
 - **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.
diff --git a/packages/agents-client/src/admin-client.test.ts b/packages/agents-client/src/admin-client.test.ts
index 94613c92e..a19504b87 100644
--- a/packages/agents-client/src/admin-client.test.ts
+++ b/packages/agents-client/src/admin-client.test.ts
@@ -236,10 +236,10 @@ describe("AdminClient response contracts", () => {
     }
   });
 
-  it("reads any provider base URL an earlier Core stored but still rejects unsafe ones", async () => {
+  it("reads any provider base URL Core's write rule allows but still rejects unsafe ones", async () => {
     const saved = { id: resourceId, object: "agent", model: "model", name: null, instructions: null, metadata: {}, multi_agent: { enabled: false, max_concurrent_subagents: null }, reasoning: { effort: null, summary: null }, service_tier: "auto", text: { format: { type: "text" }, verbosity: "medium" }, tools: [], created_at: 1, updated_at: 1 };
     const withURL = (base_url: string, id = resourceId) => ({ ...saved, id, x_agents_core: { model_provider: { protocol: "responses", base_url, api_key_configured: true } } });
-    // Core once accepted hosts and ports that URL parsing rejects; one must not fail the list.
+    // The client is never stricter than Core's write rule: a host or port that URL parsing rejects must not fail the list.
     const stored = ["https://p.test:99999/v1", "https://xn--.test", "https://[::1]:8443/v1", "HTTPS://p.test/v1?"].map((url, index) => withURL(url, `agent-${index}`));
     expect((await clientWith(page(stored)).client.listAgents(projectId)).data).toEqual(stored);
     for (const url of ["http://p.test", "https://user:pw@p.test", "https://p.test/?key=secret", "https://p.test/#secret", "https://:443/v1"]) {
@@ -248,10 +248,12 @@ describe("AdminClient response contracts", () => {
   });
 
   it("binds Skills, versions and Artifacts to requested resources", async () => {
-    const skill = { id: "skill", object: "skill", created_at: 1, name: "helper", description: "help", default_version: "1", latest_version: "2" };
-    expect(await clientWith(skill).client.retrieveSkill(projectId, "skill")).toEqual(skill);
-    const version = { id: "version", object: "skill.version", created_at: 1, skill_id: "skill", version: "2", name: "helper", description: "help" };
-    await expect(clientWith(version).client.retrieveSkillVersion(projectId, "other", "2")).rejects.toBeInstanceOf(AgentCoreError);
+    const skill = { id: "skill_helper", object: "skill", created_at: 1, name: "helper", description: "help", default_version: "1", latest_version: "2" };
+    expect(await clientWith(skill).client.retrieveSkill(projectId, "skill_helper")).toEqual(skill);
+    await expect(clientWith(skill).client.retrieveSkill(projectId, "skill_other")).rejects.toBeInstanceOf(AgentCoreError);
+    const version = { id: "skillver_helper2", object: "skill.version", created_at: 1, skill_id: "skill_helper", version: "2", name: "helper", description: "help" };
+    expect(await clientWith(version).client.retrieveSkillVersion(projectId, "skill_helper", "2")).toEqual(version);
+    await expect(clientWith(version).client.retrieveSkillVersion(projectId, "skill_other", "2")).rejects.toBeInstanceOf(AgentCoreError);
     const artifact = { id: "artifact", object: "agent.session.artifact", created_at: 1, session_id: sessionId, environment_id: resourceId, path: "/result.txt", size_bytes: 2, turn_id: "turn" };
     expect((await clientWith(page([artifact])).client.listArtifacts(projectId, sessionId)).data).toEqual([artifact]);
     await expect(clientWith(artifact).client.retrieveArtifact(projectId, resourceId, "artifact")).rejects.toBeInstanceOf(AgentCoreError);
@@ -302,6 +304,15 @@ describe("AdminClient deployment read models", () => {
     await expect(clientWith({ ...audit, data: [{ ...audit.data[0], request_body: { token: "leak" } }] }).client.listAuditLog()).rejects.toBeInstanceOf(AgentCoreError);
   });
 
+  it("requires each write operation's key and a recorded action and resource type", async () => {
+    const operation = { id: "op", created_at: "2026-09-24T00:00:00Z", api_key: { id: keyId, name: "SDK", prefix: "p", kind: "issued", revoked_at: null }, action: "create", resource_type: "agent", resource_id: "a", parent_id: "", request_id: "request", trace_id: "trace" };
+    const operations = { data: [operation], has_more: false, next_cursor: "" };
+    expect(await clientWith(operations).client.listWriteOperations(projectId)).toEqual(operations);
+    for (const invalid of [{ ...operation, api_key: null }, { ...operation, action: "archive" }, { ...operation, resource_type: "deployment" }]) {
+      await expect(clientWith({ ...operations, data: [invalid] }).client.listWriteOperations(projectId)).rejects.toBeInstanceOf(AgentCoreError);
+    }
+  });
+
   it("passes provenance filters without a binding digest and preserves Vault status arrays", async () => {
     const operations = { data: [], has_more: false, next_cursor: "" };
     const { client, fetch } = clientWith(operations);
@@ -456,8 +467,8 @@ describe("AdminClient project monitoring", () => {
     };
     const value = { object: "list", data: [{ project_id: projectId, observation }], has_more: false, first_id: sessionId, last_id: sessionId };
     expect(await clientWith(value).client.listRuntimeObservations()).toEqual(value);
-    const { disk: _, ...older } = observation;
-    expect((await clientWith({ ...value, data: [{ project_id: projectId, observation: older }] }).client.listRuntimeObservations()).data[0]!.observation.disk).toBeNull();
+    const { disk: _, ...withoutDisk } = observation;
+    await expect(clientWith({ ...value, data: [{ project_id: projectId, observation: withoutDisk }] }).client.listRuntimeObservations()).rejects.toMatchObject({ code: "invalid_admin_response" });
     const invalid = { ...observation, disk: { usage_bytes: 1, limit_bytes: 0 } };
     await expect(clientWith({ ...value, data: [{ project_id: projectId, observation: invalid }] }).client.listRuntimeObservations()).rejects.toMatchObject({ code: "invalid_admin_response" });
   });
diff --git a/packages/agents-client/src/admin-client.ts b/packages/agents-client/src/admin-client.ts
index 7d208fc0c..16e5ae20c 100644
--- a/packages/agents-client/src/admin-client.ts
+++ b/packages/agents-client/src/admin-client.ts
@@ -11,9 +11,11 @@ import { projectAgentTurn, projectSessionItem, projectHistoryPage } from "./hist
 import { projectRuntimeHistory } from "./runtime-history-projection";
 import { canonicalUuid, isNonnegativeInteger, isRecord } from "./response-projection";
 import { CoreRequester } from "./core-request";
+import { projectSkill, projectSkillDeleted, projectSkillVersion, projectSkillVersionDeleted } from "./skill-projection";
+import { keyPageFields, projectsPageFields } from "./generated/core-api";
 import {
   invalidAdminResponse, projectAdminProject, projectAdminKey, projectIssuedAdminKey, projectAdminPage, projectAdminDeleted, projectAdminSessionArchive,
-  projectResourcePage, projectSavedAgent, projectSkill, projectSkillVersion, projectArtifact, projectSummary, projectAdminRuntimePage, projectResourceOwners, projectWriteOperations, projectAdminAudit,
+  projectResourcePage, projectSavedAgent, projectArtifact, projectSummary, projectAdminRuntimePage, projectResourceOwners, projectWriteOperations, projectAdminAudit,
   projectExecutorCredentials, projectIssuedExecutorCredential, projectCoreHarnessList, projectHarnessModelConfiguration, projectInstallation,
 } from "./admin-projection";
 import type {
@@ -78,7 +80,7 @@ export class AdminClient {
     return projectInstallation(await this.#json("/installation", options));
   }
   async listProjects(options?: PageOptions) {
-    return projectAdminPage(await this.#json(pageQuery("/projects", options), options), (value) => projectAdminProject(value));
+    return projectAdminPage(await this.#json(pageQuery("/projects", options), options), projectsPageFields, (value) => projectAdminProject(value));
   }
   async createProject(input: CreateAdminProjectInput, options?: ReadOptions) {
     return projectAdminProject(await this.#json("/projects", options, "POST", { name: input.name }));
@@ -90,7 +92,7 @@ export class AdminClient {
     return projectAdminProject(await this.#json(`${scope(projectId)}/archive`, options, "POST"), projectId);
   }
   async listAPIKeys(projectId: string, options?: PageOptions) {
-    return projectAdminPage(await this.#json(pageQuery(`${scope(projectId)}/keys`, options), options), (value) => projectAdminKey(value, projectId));
+    return projectAdminPage(await this.#json(pageQuery(`${scope(projectId)}/keys`, options), options), keyPageFields, (value) => projectAdminKey(value, projectId));
   }
   async issueAPIKey(projectId: string, input: IssueAdminAPIKeyInput, options?: ReadOptions) {
     return projectIssuedAdminKey(await this.#json(`${scope(projectId)}/keys`, options, "POST", { name: input.name }), projectId);
@@ -121,25 +123,22 @@ export class AdminClient {
     return this.#delete(`${scope(projectId)}/agents/${segment(agentId)}`, agentId, "agent.deleted", options);
   }
   async listSkills(projectId: string, options?: PageOptions): Promise<SkillList> {
-    return projectResourcePage(await this.#json(pageQuery(`${scope(projectId)}/skills`, options), options), (value) => projectSkill(value));
+    return projectResourcePage(await this.#json(pageQuery(`${scope(projectId)}/skills`, options), options), (value) => projectSkill(value, invalidAdminResponse));
   }
   async retrieveSkill(projectId: string, skillId: string, options?: ReadOptions) {
-    return projectSkill(await this.#json(`${scope(projectId)}/skills/${segment(skillId)}`, options), skillId);
+    return projectSkill(await this.#json(`${scope(projectId)}/skills/${segment(skillId)}`, options), invalidAdminResponse, skillId);
   }
-  deleteSkill(projectId: string, skillId: string, options?: ReadOptions) {
-    return this.#delete(`${scope(projectId)}/skills/${segment(skillId)}`, skillId, "skill.deleted", options);
+  async deleteSkill(projectId: string, skillId: string, options?: ReadOptions) {
+    return projectSkillDeleted(await this.#json(`${scope(projectId)}/skills/${segment(skillId)}`, options, "DELETE"), invalidAdminResponse, skillId);
   }
   async listSkillVersions(projectId: string, skillId: string, options?: PageOptions): Promise<SkillVersionList> {
-    return projectResourcePage(await this.#json(pageQuery(`${scope(projectId)}/skills/${segment(skillId)}/versions`, options), options), (value) => projectSkillVersion(value, skillId));
+    return projectResourcePage(await this.#json(pageQuery(`${scope(projectId)}/skills/${segment(skillId)}/versions`, options), options), (value) => projectSkillVersion(value, invalidAdminResponse, skillId));
   }
   async retrieveSkillVersion(projectId: string, skillId: string, version: string, options?: ReadOptions) {
-    return projectSkillVersion(await this.#json(`${scope(projectId)}/skills/${segment(skillId)}/versions/${segment(version)}`, options), skillId, version);
+    return projectSkillVersion(await this.#json(`${scope(projectId)}/skills/${segment(skillId)}/versions/${segment(version)}`, options), invalidAdminResponse, skillId, version);
   }
   async deleteSkillVersion(projectId: string, skillId: string, version: string, options?: ReadOptions): Promise<SkillVersionDeleted> {
-    const value = await this.#json(`${scope(projectId)}/skills/${segment(skillId)}/versions/${segment(version)}`, options, "DELETE");
-    if (!isRecord(value) || value.version !== version || typeof value.id !== "string") return invalidAdminResponse();
-    const { version: _, ...receipt } = value;
-    return { ...projectAdminDeleted(receipt, value.id, "skill.version.deleted"), version };
+    return projectSkillVersionDeleted(await this.#json(`${scope(projectId)}/skills/${segment(skillId)}/versions/${segment(version)}`, options, "DELETE"), invalidAdminResponse, version);
   }
   downloadSkill(projectId: string, skillId: string, options?: ReadOptions) {
     return this.#content(`${scope(projectId)}/skills/${segment(skillId)}/content`, options);
diff --git a/packages/agents-client/src/admin-projection.ts b/packages/agents-client/src/admin-projection.ts
index 28051cae1..de765a7df 100644
--- a/packages/agents-client/src/admin-projection.ts
+++ b/packages/agents-client/src/admin-projection.ts
@@ -2,15 +2,30 @@ import { coreHarnessKinds, modelProviderProtocols } from "./harness-catalog";
 import { AgentCoreError, projectRuntimeObservation, projectSavedAgentConfiguration } from "./client";
 import { projectTokenUsage } from "./usage-projection";
 import { safeProvider } from "./execution-configuration-projection";
-import { canonicalUuid, exactFields, isNonnegativeInteger, isRecord, onlyFields, sameResourceId } from "./response-projection";
-import type { CoreHarness, CoreHarnessKind, HarnessModelConfiguration, ProviderObservationErrorCode, ListPage, SavedAgent } from "./types";
-import type { AdminAPIKey, AdminProject, AdminAuditPage, AdminSummary, AdminRuntimeObservation, RuntimeDiskObservation, AdminKeyProvenance, AdminResourceOwner, AdminWriteOperationPage, AdminDeleted, AdminIssuedAPIKey, AdminPage, AdminSessionArchive, SessionArtifact, Skill, SkillVersion, ExecutorCredentialList, ExecutorConnection, IssuedExecutorCredential, CoreInstallation, CoreInstallationSetting } from "./admin-types";
+import { canonicalUuid, exactFields, type FieldNames, hasOwn, isNonnegativeInteger, isOneOf, isRecord, onlyFields, sameResourceId } from "./response-projection";
+import { sessionArtifactResourceFields } from "./generated/public-api";
+import {
+  addressBindingsFields, adminAssetCountsFields, adminauditOperationFields, adminauditPageFields, adminRuntimeObservationFields,
+  adminRuntimeObservationListFields, adminSessionCountsFields, adminSummaryResponseFields, adminSummaryRowFields, adminUsageCoverageFields,
+  coreHarnessFields, coreHarnessListFields, executorConnectionFields, executorConnectionStatusValues, executorCredentialFields,
+  executorCredentialListFields, harnessModelConfigurationFields, harnessModelConfigurationLastErrorCodeValues, installationConfigurationFields,
+  installationFields, installationSettingFields, installationSettingRequired, installationSettingRestartsValues, issuedExecutorCredentialFields,
+  managedArchiveFields, managedArchiveStateValues, modelConfigurationSupportFields, projectFields, projectsAPIKeyFields, resourceOwnerFields,
+  resourceOwnerListFields, runtimeDiskObservationFields, writeauditAPIKeyFields, writeauditOperationActionValues, writeauditOperationFields,
+  writeauditOperationResourceTypeValues, writeauditPageFields,
+} from "./generated/core-api";
+import type { CoreHarness, CoreHarnessKind, HarnessModelConfiguration, ListPage, SavedAgent, SessionArtifact } from "./types";
+import type {
+  AdminAPIKey, AdminAuditPage, AdminDeleted, AdminIssuedAPIKey, AdminKeyProvenance, AdminPage, AdminProject, AdminResourceOwner,
+  AdminRuntimeObservation, AdminSessionArchive, AdminSummary, AdminWriteOperationPage, CoreInstallation, CoreInstallationSetting,
+  ExecutorConnection, ExecutorCredentialList, IssuedExecutorCredential, RuntimeDiskObservation,
+} from "./admin-types";
 
 export function invalidAdminResponse(): never {
   throw new AgentCoreError("Core returned an invalid administration response.", 502, "invalid_admin_response");
 }
-function record(value: unknown, fields: string[]): Record<string, unknown> {
-  if (!isRecord(value) || !exactFields(value, new Set(fields))) return invalidAdminResponse();
+function record(value: unknown, fields: FieldNames): Record<string, unknown> {
+  if (!isRecord(value) || !exactFields(value, fields)) return invalidAdminResponse();
   return value;
 }
 function strings(value: Record<string, unknown>, fields: string[]): void {
@@ -20,7 +35,7 @@ function date(value: unknown): boolean {
   return value === null || (typeof value === "string" && Number.isFinite(Date.parse(value)));
 }
 export function projectAdminProject(value: unknown, expectedId?: string): AdminProject {
-  const project = record(value, ["id", "name", "created_at", "archived_at", "active_key_count"]);
+  const project = record(value, projectFields);
   strings(project, ["id", "name", "created_at"]);
   if (!date(project.created_at) ||
     !date(project.archived_at) || !isNonnegativeInteger(project.active_key_count) ||
@@ -28,7 +43,7 @@ export function projectAdminProject(value: unknown, expectedId?: string): AdminP
   return { ...project } as unknown as AdminProject;
 }
 export function projectAdminKey(value: unknown, projectId: string): AdminAPIKey {
-  const key = record(value, ["id", "project_id", "name", "prefix", "created_at", "revoked_at"]);
+  const key = record(value, projectsAPIKeyFields);
   strings(key, ["id", "project_id", "name", "prefix", "created_at"]);
   if (!date(key.created_at) || !date(key.revoked_at) ||
     !sameResourceId(key.project_id as string, projectId)) return invalidAdminResponse();
@@ -41,8 +56,8 @@ export function projectIssuedAdminKey(value: unknown, projectId: string): AdminI
   if (projected.revoked_at !== null) return invalidAdminResponse();
   return { ...projected, key };
 }
-export function projectAdminPage<T>(value: unknown, project: (entry: unknown) => T): AdminPage<T> {
-  const page = record(value, ["data", "has_more"]);
+export function projectAdminPage<T>(value: unknown, fields: FieldNames, project: (entry: unknown) => T): AdminPage<T> {
+  const page = record(value, fields);
   if (!Array.isArray(page.data) || typeof page.has_more !== "boolean" || (page.has_more && page.data.length === 0)) return invalidAdminResponse();
   return { data: page.data.map(project), has_more: page.has_more };
 }
@@ -62,10 +77,9 @@ export function projectAdminDeleted<O extends string>(value: unknown, expectedId
   return { id: deleted.id, object, deleted: true };
 }
 export function projectAdminSessionArchive(value: unknown, sessionId: string): AdminSessionArchive {
-  const archive = record(value, ["session_id", "environment_id", "state"]);
+  const archive = record(value, managedArchiveFields);
   if (typeof archive.session_id !== "string" || !sameResourceId(archive.session_id, sessionId) ||
-    canonicalUuid(archive.environment_id) === null ||
-    (archive.state !== "active" && archive.state !== "cleanup_pending" && archive.state !== "released")) return invalidAdminResponse();
+    canonicalUuid(archive.environment_id) === null || !isOneOf(managedArchiveStateValues, archive.state)) return invalidAdminResponse();
   return { session_id: archive.session_id, environment_id: archive.environment_id as string, state: archive.state };
 }
 export function projectSavedAgent(value: unknown, expectedId?: string): SavedAgent {
@@ -77,66 +91,51 @@ export function projectSavedAgent(value: unknown, expectedId?: string): SavedAge
     (expectedId !== undefined && !sameResourceId(agent.id, expectedId))) return invalidAdminResponse();
   return { ...agent, object, metadata: { ...metadata } as Record<string, string>, created_at, updated_at };
 }
-export function projectSkill(value: unknown, expectedId?: string): Skill {
-  const skill = record(value, ["id", "object", "created_at", "name", "description", "default_version", "latest_version"]);
-  strings(skill, ["id", "name", "description", "default_version", "latest_version"]);
-  if (skill.object !== "skill" || !isNonnegativeInteger(skill.created_at) ||
-    (expectedId !== undefined && !sameResourceId(skill.id as string, expectedId))) return invalidAdminResponse();
-  return { ...skill } as unknown as Skill;
-}
-export function projectSkillVersion(value: unknown, skillId: string, version?: string): SkillVersion {
-  const skill = record(value, ["id", "object", "created_at", "skill_id", "version", "name", "description"]);
-  strings(skill, ["id", "skill_id", "version", "name", "description"]);
-  if (skill.object !== "skill.version" || !isNonnegativeInteger(skill.created_at) || !sameResourceId(skill.skill_id as string, skillId) ||
-    (version !== undefined && skill.version !== version)) return invalidAdminResponse();
-  return { ...skill } as unknown as SkillVersion;
-}
 export function projectArtifact(value: unknown, sessionId: string, expectedId?: string): SessionArtifact {
-  const artifact = record(value, ["id", "object", "created_at", "environment_id", "path", "session_id", "size_bytes", "turn_id"]);
+  const artifact = record(value, sessionArtifactResourceFields);
   strings(artifact, ["id", "environment_id", "path", "session_id", "turn_id"]);
   if (artifact.object !== "agent.session.artifact" || !isNonnegativeInteger(artifact.created_at) || !isNonnegativeInteger(artifact.size_bytes) ||
     !sameResourceId(artifact.session_id as string, sessionId) || (expectedId !== undefined && !sameResourceId(artifact.id as string, expectedId))) return invalidAdminResponse();
   return { ...artifact } as unknown as SessionArtifact;
 }
-function projectProvenance(value: unknown): AdminKeyProvenance | null {
-  if (value === null) return null;
-  const key = record(value, ["id", "name", "prefix", "kind", "revoked_at"]);
+function projectProvenance(value: unknown): AdminKeyProvenance {
+  const key = record(value, writeauditAPIKeyFields);
   strings(key, ["id", "name", "prefix"]);
   if (key.kind !== "issued" || !date(key.revoked_at)) return invalidAdminResponse();
   return { ...key } as unknown as AdminKeyProvenance;
 }
 export function projectResourceOwners(value: unknown, ids: string[]): { data: AdminResourceOwner[] } {
-  const page = record(value, ["data"]);
+  const page = record(value, resourceOwnerListFields);
   if (!Array.isArray(page.data) || page.data.length !== ids.length) return invalidAdminResponse();
   return { data: page.data.map((entry, index) => {
-    const owner = record(entry, ["resource_id", "api_key"]);
+    const owner = record(entry, resourceOwnerFields);
     if (owner.resource_id !== ids[index]) return invalidAdminResponse();
-    return { resource_id: owner.resource_id as string, api_key: projectProvenance(owner.api_key) };
+    return { resource_id: owner.resource_id as string, api_key: owner.api_key === null ? null : projectProvenance(owner.api_key) };
   }) };
 }
 export function projectWriteOperations(value: unknown): AdminWriteOperationPage {
-  const page = record(value, ["data", "has_more", "next_cursor"]);
+  const page = record(value, writeauditPageFields);
   if (!Array.isArray(page.data) || typeof page.has_more !== "boolean" || typeof page.next_cursor !== "string") return invalidAdminResponse();
   const data = page.data.map((entry) => {
-    const operation = record(entry, ["id", "created_at", "api_key", "action", "resource_type", "resource_id", "parent_id", "request_id", "trace_id"]);
-    strings(operation, ["id", "created_at", "action", "resource_type", "resource_id", "parent_id", "request_id", "trace_id"]);
-    if (!date(operation.created_at)) return invalidAdminResponse();
+    const operation = record(entry, writeauditOperationFields);
+    strings(operation, ["id", "created_at", "action", "resource_id", "parent_id", "request_id", "trace_id"]);
+    if (!date(operation.created_at) || !isOneOf(writeauditOperationActionValues, operation.action) || !isOneOf(writeauditOperationResourceTypeValues, operation.resource_type)) return invalidAdminResponse();
     return { ...operation, api_key: projectProvenance(operation.api_key) };
   });
   return { data, has_more: page.has_more, next_cursor: page.next_cursor } as AdminWriteOperationPage;
 }
 export function projectSummary(value: unknown): AdminSummary {
-  const page = record(value, ["data", "has_more", "next_cursor"]);
+  const page = record(value, adminSummaryResponseFields);
   if (!Array.isArray(page.data) || typeof page.has_more !== "boolean" || typeof page.next_cursor !== "string") return invalidAdminResponse();
   const data = page.data.map((entry) => {
-    const summary = record(entry, ["project_id", "key_id", "agent_id", "assets", "sessions", "usage", "coverage", "last_active_at"]);
+    const summary = record(entry, adminSummaryRowFields);
     strings(summary, ["project_id"]);
     if (!(summary.key_id === null || typeof summary.key_id === "string") ||
       !(summary.agent_id === null || typeof summary.agent_id === "string") ||
       !(summary.last_active_at === null || isNonnegativeInteger(summary.last_active_at))) return invalidAdminResponse();
-    const assets = summary.assets === null ? null : record(summary.assets, ["agents", "skills", "environment_templates", "files", "vaults", "credentials"]);
-    const sessions = record(summary.sessions, ["total", "idle", "in_progress", "requires_action", "failed"]);
-    const coverage = record(summary.coverage, ["measured_sessions", "total_sessions", "ratio"]);
+    const assets = summary.assets === null ? null : record(summary.assets, adminAssetCountsFields);
+    const sessions = record(summary.sessions, adminSessionCountsFields);
+    const coverage = record(summary.coverage, adminUsageCoverageFields);
     const usage = projectTokenUsage(summary.usage, invalidAdminResponse);
     if (usage === null || (assets !== null && Object.values(assets).some((count) => !isNonnegativeInteger(count))) ||
       Object.values(sessions).some((count) => !isNonnegativeInteger(count)) || !isNonnegativeInteger(coverage.measured_sessions) ||
@@ -144,17 +143,16 @@ export function projectSummary(value: unknown): AdminSummary {
       !(coverage.ratio === null || (typeof coverage.ratio === "number" && Number.isFinite(coverage.ratio) && coverage.ratio >= 0 && coverage.ratio <= 1))) return invalidAdminResponse();
     return { ...summary, assets, sessions, coverage, usage };
   });
-  return { data, has_more: page.has_more, next_cursor: page.next_cursor } as AdminSummary;
+  return { data, has_more: page.has_more, next_cursor: page.next_cursor } as unknown as AdminSummary;
 }
 export function projectAdminRuntimePage(value: unknown): ListPage<AdminRuntimeObservation> {
-  const page = record(value, ["object", "data", "has_more", "first_id", "last_id"]);
+  const page = record(value, adminRuntimeObservationListFields);
   if (page.object !== "list" || !Array.isArray(page.data) || typeof page.has_more !== "boolean") return invalidAdminResponse();
   const data = page.data.map((entry) => {
-    const item = record(entry, ["project_id", "observation"]);
+    const item = record(entry, adminRuntimeObservationFields);
     strings(item, ["project_id"]);
-    if (!isRecord(item.observation)) return invalidAdminResponse();
-    // A Core without disk observations omits the field; disk is then unknown.
-    const { disk = null, ...rest } = item.observation;
+    if (!isRecord(item.observation) || !hasOwn(item.observation, "disk")) return invalidAdminResponse();
+    const { disk, ...rest } = item.observation;
     const observation = projectRuntimeObservation(rest);
     return { project_id: item.project_id as string, observation: { ...observation, disk: projectRuntimeDisk(disk, observation.status === "observed") } };
   });
@@ -165,7 +163,7 @@ export function projectAdminRuntimePage(value: unknown): ListPage<AdminRuntimeOb
 
 function projectRuntimeDisk(value: unknown, observed: boolean): RuntimeDiskObservation | null {
   if (value === null) return null;
-  const disk = record(value, ["usage_bytes", "limit_bytes"]);
+  const disk = record(value, runtimeDiskObservationFields);
   const known = (field: unknown) => field === null || isNonnegativeInteger(field);
   if (!observed || !known(disk.usage_bytes) || !known(disk.limit_bytes) || disk.limit_bytes === 0 ||
     (disk.usage_bytes === null && disk.limit_bytes === null)) return invalidAdminResponse();
@@ -173,10 +171,10 @@ function projectRuntimeDisk(value: unknown, observed: boolean): RuntimeDiskObser
 }
 
 export function projectAdminAudit(value: unknown): AdminAuditPage {
-  const page = record(value, ["data", "has_more", "next_cursor"]);
+  const page = record(value, adminauditPageFields);
   if (!Array.isArray(page.data) || typeof page.has_more !== "boolean" || typeof page.next_cursor !== "string") return invalidAdminResponse();
   const data = page.data.map((entry) => {
-    const audit = record(entry, ["id", "created_at", "admin_credential_id", "actor_label", "action", "project_id", "resource_type", "resource_id", "request_id", "trace_id"]);
+    const audit = record(entry, adminauditOperationFields);
     strings(audit, ["id", "created_at", "admin_credential_id", "actor_label", "action", "resource_type", "resource_id", "request_id", "trace_id"]);
     if (!date(audit.created_at) || !(audit.project_id === null || typeof audit.project_id === "string")) return invalidAdminResponse();
     return audit;
@@ -184,52 +182,49 @@ export function projectAdminAudit(value: unknown): AdminAuditPage {
   return { data, has_more: page.has_more, next_cursor: page.next_cursor } as unknown as AdminAuditPage;
 }
 export function projectExecutorCredentials(value: unknown): ExecutorCredentialList {
-  const page = record(value, ["data", "connection"]);
+  const page = record(value, executorCredentialListFields);
   if (!Array.isArray(page.data)) return invalidAdminResponse();
-  const connection = record(page.connection, ["status", "bound_key_id", "enrolled_at", "last_seen_at"]);
-  if (!["never_enrolled", "connected", "disconnected"].includes(connection.status as string) ||
+  const connection = record(page.connection, executorConnectionFields);
+  if (!isOneOf(executorConnectionStatusValues, connection.status) ||
       !(connection.bound_key_id === null || (typeof connection.bound_key_id === "string" && connection.bound_key_id.length > 0)) ||
       !date(connection.enrolled_at) || !date(connection.last_seen_at)) return invalidAdminResponse();
   if (connection.status === "never_enrolled" && [connection.bound_key_id, connection.enrolled_at, connection.last_seen_at].some(value => value !== null)) return invalidAdminResponse();
   if (connection.status !== "never_enrolled" && connection.enrolled_at === null) return invalidAdminResponse();
   if (connection.status === "connected" && connection.bound_key_id === null) return invalidAdminResponse();
   return { connection: { ...connection } as unknown as ExecutorConnection, data: page.data.map((entry) => {
-    const credential = record(entry, ["key_id", "created_at", "revoked_at"]);
+    const credential = record(entry, executorCredentialFields);
     if (typeof credential.key_id !== "string" || typeof credential.created_at !== "string" || !date(credential.created_at) || !date(credential.revoked_at)) return invalidAdminResponse();
     return { key_id: credential.key_id, created_at: credential.created_at, revoked_at: credential.revoked_at as string | null };
   }) };
 }
 /** The one-time credential must belong to the requested key ID and Environment. */
 export function projectIssuedExecutorCredential(value: unknown, keyId: string, environmentId: string): IssuedExecutorCredential {
-  const issued = record(value, ["key_id", "environment_id", "executor_token"]);
+  const issued = record(value, issuedExecutorCredentialFields);
   if (typeof issued.key_id !== "string" || !sameResourceId(issued.key_id, keyId) ||
     typeof issued.environment_id !== "string" || !sameResourceId(issued.environment_id, environmentId) ||
     typeof issued.executor_token !== "string" || !issued.executor_token) return invalidAdminResponse();
   return { key_id: issued.key_id, environment_id: issued.environment_id, executor_token: issued.executor_token };
 }
 
-const providerObservationErrors = new Set<string>(["authentication_error", "connection_failed", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "resource_not_found", "request_timeout", "invalid_request"]);
-const harnessKinds = new Set<string>(coreHarnessKinds);
 /** A deployment default model provider: exactly the safe view, never `api_key`. */
 export function projectHarnessModelConfiguration(value: unknown, harness?: CoreHarnessKind): HarnessModelConfiguration {
-  if (!isRecord(value) || !onlyFields(value, new Set(["object", "harness", "updated_at", "last_used_at", "last_error_code", "last_error_at", "model_provider", "model", "harness_config"]))) return invalidAdminResponse();
+  if (!isRecord(value) || !onlyFields(value, harnessModelConfigurationFields)) return invalidAdminResponse();
   const { object, harness: kind, updated_at, last_used_at, last_error_code, last_error_at, model_provider, model, harness_config } = value;
   if ((last_used_at !== null && (typeof last_used_at !== "string" || !date(last_used_at))) ||
     (last_error_at !== null && (typeof last_error_at !== "string" || !date(last_error_at))) ||
-    (last_error_code !== null && (typeof last_error_code !== "string" || !providerObservationErrors.has(last_error_code))) ||
+    (last_error_code !== null && !isOneOf(harnessModelConfigurationLastErrorCodeValues, last_error_code)) ||
     ((last_error_code === null) !== (last_error_at === null))) return invalidAdminResponse();
-  if (object !== "core.model_configuration" || typeof kind !== "string" || !harnessKinds.has(kind) || (harness !== undefined && kind !== harness) ||
+  if (object !== "core.model_configuration" || !isOneOf(coreHarnessKinds, kind) || (harness !== undefined && kind !== harness) ||
     typeof updated_at !== "string" || !date(updated_at)) return invalidAdminResponse();
   if (typeof model !== "string" || !model.trim() || !isRecord(harness_config)) return invalidAdminResponse();
   const provider = safeProvider(model_provider, invalidAdminResponse);
   if (!provider.api_key_configured) return invalidAdminResponse();
-  return { object, harness: kind as CoreHarnessKind, model_provider: provider, model, harness_config: { ...harness_config }, updated_at, last_used_at, last_error_at, last_error_code: last_error_code as ProviderObservationErrorCode | null };
+  return { object, harness: kind, model_provider: provider, model, harness_config: { ...harness_config }, updated_at, last_used_at, last_error_at, last_error_code };
 }
 function projectModelConfigurationSupport(value: unknown): CoreHarness["model_configuration_support"] {
-  const support = record(value, ["protocols", "accepts_harness_config", "token_limits_required"]);
-  const known: ReadonlySet<unknown> = new Set(modelProviderProtocols);
+  const support = record(value, modelConfigurationSupportFields);
   const protocols = support.protocols;
-  if (!Array.isArray(protocols) || protocols.length === 0 || protocols.some((protocol) => !known.has(protocol)) ||
+  if (!Array.isArray(protocols) || protocols.length === 0 || !protocols.every((protocol) => isOneOf(modelProviderProtocols, protocol)) ||
     new Set(protocols).size !== protocols.length ||
     typeof support.accepts_harness_config !== "boolean" || typeof support.token_limits_required !== "boolean") return invalidAdminResponse();
   return {
@@ -238,13 +233,13 @@ function projectModelConfigurationSupport(value: unknown): CoreHarness["model_co
   };
 }
 export function projectCoreHarnessList(value: unknown): { object: "list"; data: CoreHarness[] } {
-  const page = record(value, ["object", "data"]);
+  const page = record(value, coreHarnessListFields);
   if (page.object !== "list" || !Array.isArray(page.data)) return invalidAdminResponse();
   const data = page.data.map((entry): CoreHarness => {
-    const harness = record(entry, ["object", "id", "enabled", "default", "model_configuration", "model_configuration_support"]);
-    if (harness.object !== "core.harness" || typeof harness.id !== "string" || !harnessKinds.has(harness.id) ||
+    const harness = record(entry, coreHarnessFields);
+    if (harness.object !== "core.harness" || !isOneOf(coreHarnessKinds, harness.id) ||
       typeof harness.enabled !== "boolean" || typeof harness.default !== "boolean" || (harness.default && !harness.enabled)) return invalidAdminResponse();
-    const id = harness.id as CoreHarnessKind;
+    const id = harness.id;
     return {
       object: "core.harness", id, enabled: harness.enabled, default: harness.default,
       model_configuration_support: projectModelConfigurationSupport(harness.model_configuration_support),
@@ -255,28 +250,27 @@ export function projectCoreHarnessList(value: unknown): { object: "list"; data:
   return { object: "list", data };
 }
 const settingKey = /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)*$/;
-const settingServices = new Set(["core", "web", "database"]);
 function projectInstallationSetting(value: unknown): CoreInstallationSetting {
-  const base = ["key", "value", "default", "changeable", "sensitive", "restarts"];
   if (!isRecord(value) || typeof value.sensitive !== "boolean") return invalidAdminResponse();
-  const setting = record(value, value.sensitive ? [...base, "configured"] : base);
+  // `configured` is present exactly for a sensitive setting.
+  const setting = record(value, value.sensitive ? installationSettingFields : installationSettingRequired);
   if (typeof setting.key !== "string" || !settingKey.test(setting.key) || typeof setting.changeable !== "boolean" ||
-    !Array.isArray(setting.restarts) || !setting.restarts.every((service) => typeof service === "string" && settingServices.has(service)) ||
+    !Array.isArray(setting.restarts) || !setting.restarts.every((service) => isOneOf(installationSettingRestartsValues, service)) ||
     (setting.sensitive && (setting.value !== null || setting.default !== null || typeof setting.configured !== "boolean"))) return invalidAdminResponse();
   return { ...setting } as unknown as CoreInstallationSetting;
 }
 /** Sensitive settings carry no value, keys are unique and binding counts are consistent. */
 export function projectInstallation(value: unknown): CoreInstallation {
-  const installation = record(value, ["object", "installation_id", "public_url", "api_base_url", "local_only", "source_commit", "configuration", "address_bindings"]);
+  const installation = record(value, installationFields);
   const origin = installation.public_url;
   if (installation.object !== "core.installation" || canonicalUuid(installation.installation_id) === null ||
     typeof origin !== "string" || installation.api_base_url !== `${origin}/v1` ||
     typeof installation.local_only !== "boolean" ||
     (installation.source_commit !== null && (typeof installation.source_commit !== "string" || !/^[0-9a-f]{40}$/.test(installation.source_commit)))) return invalidAdminResponse();
-  const bindings = record(installation.address_bindings, ["nodes", "nodes_on_other_address", "hosted_sandboxes", "self_hosted_executors"]);
+  const bindings = record(installation.address_bindings, addressBindingsFields);
   if (![bindings.nodes, bindings.nodes_on_other_address, bindings.hosted_sandboxes, bindings.self_hosted_executors].every(isNonnegativeInteger) ||
     (bindings.nodes_on_other_address as number) > (bindings.nodes as number)) return invalidAdminResponse();
-  const configuration = record(installation.configuration, ["settings"]);
+  const configuration = record(installation.configuration, installationConfigurationFields);
   if (!Array.isArray(configuration.settings)) return invalidAdminResponse();
   const settings = configuration.settings.map(projectInstallationSetting);
   if (new Set(settings.map((setting) => setting.key)).size !== settings.length) return invalidAdminResponse();
diff --git a/packages/agents-client/src/admin-types.ts b/packages/agents-client/src/admin-types.ts
index 815592d83..266296360 100644
--- a/packages/agents-client/src/admin-types.ts
+++ b/packages/agents-client/src/admin-types.ts
@@ -1,5 +1,50 @@
-import type { PageOptions } from "./types";
+import type {
+  AddressBindings, AdminauditOperation, AdminauditPage, AdminRuntimeObservationDetail, AdminSessionArchiveRequest, AdminSummaryResponse,
+  AdminSummaryRow, EnvironmentExecutorCredentialRequest, Installation, InstallationConfiguration, InstallationSetting, IssuedAPIKey,
+  IssuedExecutorCredential as IssuedExecutorCredentialResource, ManagedArchive, Project, ProjectAPIKeyRequest, ProjectRequest, ProjectsAPIKey,
+  ResourceOwner, WriteauditAPIKey, WriteauditOperation, WriteauditOperationResourceType, WriteauditPage,
+} from "./generated/core-api";
+import type { PageOptions, RuntimeObservation } from "./types";
 
+export type { ExecutorConnection, ExecutorCredential, ExecutorCredentialList, RuntimeDiskObservation } from "./generated/core-api";
+export { writeauditOperationResourceTypeValues as adminResourceTypes } from "./generated/core-api";
+
+// Generated types keep their schema names in ./generated/core-api; these are the client's names for them.
+export type AdminProject = Project;
+export type CreateAdminProjectInput = ProjectRequest;
+export type RenameAdminProjectInput = ProjectRequest;
+export type AdminAPIKey = ProjectsAPIKey;
+export type AdminIssuedAPIKey = IssuedAPIKey;
+export type IssueAdminAPIKeyInput = ProjectAPIKeyRequest;
+export type ArchiveAdminSessionInput = AdminSessionArchiveRequest;
+/** Current resource disposition; released does not imply that the active Turn has finalized. */
+export type AdminSessionArchive = ManagedArchive;
+export type AdminResourceType = WriteauditOperationResourceType;
+export type AdminKeyProvenance = WriteauditAPIKey;
+/** `api_key` is null when Core has no creation record. */
+export type AdminResourceOwner = ResourceOwner;
+export type AdminWriteOperation = WriteauditOperation;
+export type AdminWriteOperationPage = WriteauditPage;
+export type AdminSummaryEntry = AdminSummaryRow;
+export type AdminSummary = AdminSummaryResponse;
+export type AdminAuditEntry = AdminauditOperation;
+export type AdminAuditPage = AdminauditPage;
+/** `key_id` is chosen by the caller, so an uncertain issuance can be reissued with the same ID and `rotate: true`. */
+export type IssueExecutorCredentialInput = EnvironmentExecutorCredentialRequest;
+// This route always restricts the credential to its Environment, so environment_id is always present.
+export type IssuedExecutorCredential = Required<IssuedExecutorCredentialResource>;
+export type CoreAddressBindings = AddressBindings;
+export type CoreInstallationSetting = InstallationSetting;
+export type CoreInstallationConfiguration = InstallationConfiguration;
+export type CoreInstallation = Installation;
+
+// The schema's flat observation cannot state each mode's null rules; the client's RuntimeObservation union does.
+export interface AdminRuntimeObservation {
+  project_id: string;
+  observation: RuntimeObservation & Pick<AdminRuntimeObservationDetail, "disk">;
+}
+
+// Call options and receipts the client composes; they are not schema definitions.
 export interface AdminClientOptions {
   /** Prefix that request paths are appended to; defaults to `/core/v1`. */
   baseUrl?: string;
@@ -8,88 +53,12 @@ export interface AdminClientOptions {
   /** Fetch implementation; defaults to the global fetch. */
   fetch?: typeof fetch;
 }
-
-export interface AdminProject {
-  id: string;
-  name: string;
-  created_at: string;
-  archived_at: string | null;
-  active_key_count: number;
-}
-export interface CreateAdminProjectInput { name: string }
-export interface RenameAdminProjectInput { name: string }
-export interface AdminAPIKey {
-  id: string;
-  project_id: string;
-  name: string;
-  prefix: string;
-  created_at: string;
-  revoked_at: string | null;
-}
-export interface AdminIssuedAPIKey extends AdminAPIKey { key: string }
-export interface IssueAdminAPIKeyInput { name: string }
+/** The project and key pages; the schema repeats this envelope for each. */
 export interface AdminPage<T> { data: T[]; has_more: boolean }
+/** Deletion receipts of the `/v1` objects administrators delete; `deleted` is always true. */
 export interface AdminDeleted<O extends string = string> { id: string; object: O; deleted: true }
-export interface ArchiveAdminSessionInput { expected_generation: number }
-/** Current resource disposition; released does not imply that the active Turn has finalized. */
-export interface AdminSessionArchive {
-  session_id: string;
-  environment_id: string;
-  state: "active" | "cleanup_pending" | "released";
-}
-export interface Skill {
-  id: string;
-  object: "skill";
-  created_at: number;
-  name: string;
-  description: string;
-  default_version: string;
-  latest_version: string;
-}
-export interface SkillVersion {
-  id: string;
-  object: "skill.version";
-  created_at: number;
-  skill_id: string;
-  version: string;
-  name: string;
-  description: string;
-}
-export interface SessionArtifact {
-  id: string;
-  object: "agent.session.artifact";
-  created_at: number;
-  environment_id: string;
-  path: string;
-  session_id: string;
-  size_bytes: number;
-  turn_id: string;
-}
+/** A downloaded body; it is not JSON. */
 export interface AdminContent { blob: Blob; contentType: string | null; contentDisposition: string | null }
-export type AdminResourceType = "agent" | "skill" | "environment_template" | "file" | "vault" | "credential" | "session" | "environment" | "skill_version" | "artifact";
-export interface AdminKeyProvenance {
-  id: string;
-  name: string;
-  prefix: string;
-  kind: "issued";
-  revoked_at: string | null;
-}
-/** `api_key` is null when Core has no creation record. */
-export interface AdminResourceOwner {
-  resource_id: string;
-  api_key: AdminKeyProvenance | null;
-}
-export interface AdminWriteOperation {
-  id: string;
-  created_at: string;
-  api_key: AdminKeyProvenance | null;
-  action: string;
-  resource_type: AdminResourceType;
-  resource_id: string;
-  parent_id: string;
-  request_id: string;
-  trace_id: string;
-}
 export interface AdminWriteOperationOptions extends Omit<PageOptions, "order"> {
   key_id?: string;
   resource_type?: AdminResourceType;
@@ -97,113 +66,14 @@ export interface AdminWriteOperationOptions extends Omit<PageOptions, "order"> {
   created_after?: string;
   created_before?: string;
 }
-export interface AdminWriteOperationPage extends AdminPage<AdminWriteOperation> { next_cursor: string }
-
 export interface AdminSummaryOptions extends PageOptions {
   project_id?: string;
   group_by?: "project" | "agent" | "key";
   created_after?: string;
   created_before?: string;
 }
-export interface AdminSummaryEntry {
-  project_id: string;
-  /** Session creation provenance for key grouping; null includes unknown creators. */
-  key_id: string | null;
-  agent_id: string | null;
-  assets: { agents: number; skills: number; environment_templates: number; files: number; vaults: number; credentials: number } | null;
-  sessions: { total: number; idle: number; in_progress: number; requires_action: number; failed: number };
-  usage: import("./types").TokenUsage;
-  coverage: { measured_sessions: number; total_sessions: number; ratio: number | null };
-  last_active_at: number | null;
-}
-export interface AdminSummary extends AdminPage<AdminSummaryEntry> { next_cursor: string }
-/** Current disk usage and capacity; E2B reports them, Docker and microsandbox return null. */
-export interface RuntimeDiskObservation { usage_bytes: number | null; limit_bytes: number | null }
-/** The administrator list adds disk to the project observation shape. */
-export interface AdminRuntimeObservation {
-  project_id: string;
-  observation: import("./types").RuntimeObservation & { disk: RuntimeDiskObservation | null };
-}
-
 export interface AdminAuditOptions extends Omit<AdminWriteOperationOptions, "resource_type" | "key_id"> {
   project_id?: string;
   action?: string;
   resource_type?: string;
 }
-export interface AdminAuditEntry {
-  id: string;
-  created_at: string;
-  admin_credential_id: string;
-  actor_label: string;
-  action: string;
-  /** Null for deployment-wide writes, such as deployment default model providers. */
-  project_id: string | null;
-  resource_type: string;
-  resource_id: string;
-  request_id: string;
-  trace_id: string;
-}
-export interface AdminAuditPage extends AdminPage<AdminAuditEntry> { next_cursor: string }
-
-/** Executor credential metadata for one self_hosted environment; the credential itself is never listed. */
-export interface ExecutorCredential { key_id: string; created_at: string; revoked_at: string | null }
-/** Core authority plus a matching live gateway peer; timestamps alone are not readiness. */
-export interface ExecutorConnection {
-  status: "never_enrolled" | "connected" | "disconnected";
-  bound_key_id: string | null;
-  enrolled_at: string | null;
-  last_seen_at: string | null;
-}
-export interface ExecutorCredentialList { data: ExecutorCredential[]; connection: ExecutorConnection }
-
-/** `key_id` is chosen by the caller, so an uncertain issuance can be reissued with the same ID and `rotate: true`. */
-export interface IssueExecutorCredentialInput { key_id: string; rotate?: boolean }
-/** Returned once, on issuance or rotation. */
-export interface IssuedExecutorCredential { key_id: string; environment_id: string; executor_token: string }
-
-/** What is bound to the installation public URL; a change of that URL affects all of it. */
-export interface CoreAddressBindings {
-  /** Enrolled nodes that are not removed. */
-  nodes: number;
-  /** Nodes enrolled with another address; they receive no new sandboxes until re-added. At most `nodes`. */
-  nodes_on_other_address: number;
-  /** Retained and pending hosted sandboxes, which were started with the address current at the time. */
-  hosted_sandboxes: number;
-  /** Unrevoked self-hosted executor credentials, whose executors were installed with an advertised remote_url. */
-  self_hosted_executors: number;
-}
-/** One process setting from the installation's config.json, as last applied. */
-export interface CoreInstallationSetting {
-  /** Dotted config.json key, such as `ports.core`. Unique within the snapshot. */
-  key: string;
-  /** Applied JSON value; always null for a sensitive setting. */
-  value: unknown;
-  default: unknown;
-  /** Present exactly for a sensitive setting: whether it has a value. */
-  configured?: boolean;
-  /** False for settings fixed at installation. */
-  changeable: boolean;
-  sensitive: boolean;
-  /** Services that restart when the setting changes. */
-  restarts: ("core" | "web" | "database")[];
-}
-/** The process settings Core loaded. */
-export interface CoreInstallationConfiguration {
-  settings: CoreInstallationSetting[];
-}
-/** `GET /core/v1/installation`: available before any sandbox deployment exists. */
-export interface CoreInstallation {
-  object: "core.installation";
-  installation_id: string;
-  /** The origin applications, nodes, sandboxes and self-hosted executors use. */
-  public_url: string;
-  /** `public_url` followed by `/v1`; the base URL for application API keys. */
-  api_base_url: string;
-  /** True when `public_url` is a loopback origin that only the Core host reaches. */
-  local_only: boolean;
-  /** Full source commit Core was built from; null for development builds. */
-  source_commit: string | null;
-  /** The process settings Core loaded. */
-  configuration: CoreInstallationConfiguration;
-  address_bindings: CoreAddressBindings;
-}
diff --git a/packages/agents-client/src/client.ts b/packages/agents-client/src/client.ts
index aac1fd365..5beb09c3a 100644
--- a/packages/agents-client/src/client.ts
+++ b/packages/agents-client/src/client.ts
@@ -23,6 +23,10 @@ import {
   textFormatResourceFields, textResourceFields, vaultCredentialResourceFields, vaultListResourceFields, vaultResourceFields,
   verbosityResourceValues,
 } from "./generated/public-api";
+import {
+  runtimeCPUObservationFields, runtimeInstanceFields, runtimeMemoryObservationFields, runtimeObservationFields,
+  runtimeObservationLifecycleStateValues, runtimeObservationModeValues, runtimeObservationReasonValues, runtimeObservationStatusValues,
+} from "./generated/core-api";
 import { projectTokenUsage } from "./usage-projection";
 import { projectAgentTurn, projectSessionItem, projectItemContent, projectHistoryPage } from "./history-projection";
 import { projectOpenAIHostedSessionEnvironment } from "./session-environment-projection";
@@ -240,19 +244,7 @@ const maxSourceFileListLimit = 10000;
 const unsafeUnknownEventFields = new Set([
   "session", "turn", "turn_id", "item", "item_id", "output_index", "content_index", "part", "delta", "text", "error", "environment",
 ]);
-const runtimeObservationFields = new Set([
-  "id", "object", "session_id", "environment_id", "mode", "provider_type", "instance", "status", "reason",
-  "lifecycle_state", "allocation_created_at", "resolved_at", "observed_at", "started_at", "cpu", "memory",
-]);
-const runtimeInstanceFields = new Set(["kind", "allocation_id", "device_id", "connection_generation"]);
-const runtimeCPUFields = new Set(["usage_seconds_total", "capacity_cores", "usage_cores", "utilization_ratio"]);
-const runtimeMemoryFields = new Set(["usage_bytes", "limit_bytes"]);
-const runtimeObservationReasons = new Set([
-  "runtime_mode_not_observable", "allocation_pending", "runtime_not_running",
-  "sample_timeout", "sample_unavailable",
-]);
 const runtimeProviderTypePattern = /^[a-z][a-z0-9_]{0,31}$/;
-const runtimeLifecycleStates = new Set(["active", "sleeping", "transitioning", "pending", "stopped"]);
 function invalidSessionInputBatch(): never {
   throw new TypeError("Invalid Session input event batch.");
 }
@@ -886,15 +878,13 @@ export function projectRuntimeObservation(value: unknown, expectedSessionId?: st
     id === null || sessionId === null || id !== sessionId ||
     (expectedSessionId !== undefined && !sameUuid(sessionId, expectedSessionId)) ||
     value.object !== "agent.runtime_observation" ||
-    (value.mode !== "none" && value.mode !== "self_hosted" && value.mode !== "openai_hosted") ||
+    !isOneOf(runtimeObservationModeValues, value.mode) ||
     !(value.provider_type === null || (
       typeof value.provider_type === "string" && runtimeProviderTypePattern.test(value.provider_type)
     )) ||
     !isRecord(value.instance) || !exactFields(value.instance, runtimeInstanceFields) ||
-    (value.status !== "observed" && value.status !== "unsupported" && value.status !== "unavailable") ||
-    !(value.reason === null || (
-      typeof value.reason === "string" && runtimeObservationReasons.has(value.reason)
-    )) ||
+    !isOneOf(runtimeObservationStatusValues, value.status) ||
+    !(value.reason === null || isOneOf(runtimeObservationReasonValues, value.reason)) ||
     !isNonnegativeInteger(value.resolved_at)
   ) return invalidRuntimeObservation();
 
@@ -927,7 +917,7 @@ export function projectRuntimeObservation(value: unknown, expectedSessionId?: st
     )) ||
     (isManaged && (
       value.instance.kind !== "managed_allocation" || environmentId === null || connectionGeneration !== null ||
-      !runtimeLifecycleStates.has(String(value.lifecycle_state)) ||
+      !isOneOf(runtimeObservationLifecycleStateValues, value.lifecycle_state) ||
       (allocationId === null && (deviceId !== null || allocationCreatedAt !== null))
     ))
   ) return invalidRuntimeObservation();
@@ -953,7 +943,7 @@ export function projectRuntimeObservation(value: unknown, expectedSessionId?: st
 
   let cpu: RuntimeObservation["cpu"] = null;
   if (value.cpu !== null) {
-    if (!observed || !isRecord(value.cpu) || !exactFields(value.cpu, runtimeCPUFields)) {
+    if (!observed || !isRecord(value.cpu) || !exactFields(value.cpu, runtimeCPUObservationFields)) {
       return invalidRuntimeObservation();
     }
     cpu = {
@@ -970,7 +960,7 @@ export function projectRuntimeObservation(value: unknown, expectedSessionId?: st
 
   let memory: RuntimeObservation["memory"] = null;
   if (value.memory !== null) {
-    if (!observed || !isRecord(value.memory) || !exactFields(value.memory, runtimeMemoryFields)) {
+    if (!observed || !isRecord(value.memory) || !exactFields(value.memory, runtimeMemoryObservationFields)) {
       return invalidRuntimeObservation();
     }
     memory = {
diff --git a/packages/agents-client/src/core-metrics.ts b/packages/agents-client/src/core-metrics.ts
index d1b14ceeb..43cd21e9e 100644
--- a/packages/agents-client/src/core-metrics.ts
+++ b/packages/agents-client/src/core-metrics.ts
@@ -1,111 +1,25 @@
 import { AgentCoreError } from "./client";
 import { CoreRequester, type CoreClientOptions } from "./core-request";
+import { isOneOf } from "./response-projection";
 import type { ReadOptions } from "./types";
+import { jobStatusValues, serviceStateStatusValues, type CoremetricsView, type JobStatus, type Latency, type ServiceState, type ServiceStateStatus } from "./generated/core-api";
 
 function invalidCoreMetrics(): never {
   throw new AgentCoreError("Core metrics: the response is not JSON.", 0, "invalid_response");
 }
 
+export type CoreMetricsRange = "1h" | "6h" | "24h" | "7d";
+export type CoreJobStatus = JobStatus;
 /**
  * Core's own health as the one `oac-core` process sees it: execution slots
  * and the Turn queue (a Postgres table polled by the worker), connected
  * daemons, the PostgreSQL database, background jobs and the process itself.
  * `GET /core/v1/metrics`, defined in
  * contracts/agents-api/core-metrics.md; every figure Core cannot measure is
- * null, never zero.
+ * null, never zero. The client reads a service status it does not recognise
+ * as `unknown`, which is never shown as running.
  */
-export type CoreMetricsRange = "1h" | "6h" | "24h" | "7d";
-export type CoreJobStatus = "ok" | "failing" | "stopped" | "unknown";
-
-export interface CoreLatency {
-  p50: number | null;
-  p95: number | null;
-}
-
-export interface CoreExecutionBucket {
-  start: string;
-  /** Highest queued Turn count seen in the bucket. */
-  queued: number | null;
-  /** Highest in-progress Turn count seen in the bucket. */
-  in_progress: number | null;
-  queue_wait_p95_ms: number | null;
-}
-
-export interface CoreDatabaseBucket {
-  start: string;
-  ping_p95_ms: number | null;
-  pool_in_use: number | null;
-}
-
-export interface CoreProcessBucket {
-  start: string;
-  /** Highest CPU use observed in the bucket, in cores. */
-  cpu_cores: number | null;
-  /** Highest resident memory observed in the bucket. */
-  rss_bytes: number | null;
-}
-
-export interface CoreJob {
-  /** `scheduler`, `runtime_sampler`, `history_cleanup`, `audit_cleanup`, or another bounded name. */
-  id: string;
-  status: CoreJobStatus;
-  last_run_at: string | null;
-  /** Items the last run handled (Turns dispatched, Runtimes sampled, rows removed). */
-  processed: number | null;
-  failed: number | null;
-}
-
-export interface CoreMetrics {
-  object: "core.metrics";
-  range: { start: string; end: string; resolution_seconds: number };
-  service: {
-    /** `unknown` stands for a status this client does not recognise; it is never shown as running. */
-    status: "running" | "degraded" | "unknown";
-    /** Build revision (source commit) of the running Core. */
-    revision: string | null;
-    started_at: string | null;
-    /** Whether this process holds the database's execution lease. */
-    execution_owner: boolean | null;
-  };
-  execution: {
-    slots_in_use: number;
-    slots_total: number;
-    queued_turns: number | null;
-    /** Queued Turns whose Session has no connected daemon (part of queued_turns). */
-    waiting_for_daemon: number | null;
-    in_progress_turns: number | null;
-    oldest_queued_seconds: number | null;
-    connected_daemons: number;
-    /** Turns failed with execution_interrupted in the range. */
-    interrupted: number | null;
-    /** Requests refused with execution_unavailable in the range. */
-    unavailable: number | null;
-    queue_wait_ms: CoreLatency;
-    series: CoreExecutionBucket[];
-  };
-  database: {
-    ping_ms: CoreLatency;
-    pool: { in_use: number | null; idle: number | null; max: number | null };
-    size_bytes: number | null;
-    series: CoreDatabaseBucket[];
-  };
-  jobs: CoreJob[];
-  process: {
-    /** Go heap in use (runtime.MemStats.Alloc), not resident memory. */
-    memory_bytes: number | null;
-    goroutines: number | null;
-    /**
-     * CPU used over the last sample interval, in cores; the CPU available to
-     * the process; resident memory; its memory limit; and a series
-     * (contracts/agents-api/core-metrics.md). Null when Core cannot measure them.
-     */
-    cpu_cores: number | null;
-    cpu_limit_cores: number | null;
-    rss_bytes: number | null;
-    memory_limit_bytes: number | null;
-    series: CoreProcessBucket[];
-  };
-}
+export type CoreMetrics = Omit<CoremetricsView, "service"> & { service: Omit<ServiceState, "status"> & { status: ServiceStateStatus | "unknown" } };
 
 type Json = Record<string, unknown>;
 
@@ -138,13 +52,11 @@ function list<T>(value: unknown, item: (entry: Json, index: number) => T, path:
   return value.map((entry, index) => item(record(entry, `${path}[${index}]`), index));
 }
 
-function latency(value: unknown): CoreLatency {
+function latency(value: unknown): Latency {
   const entry = optional(value);
   return { p50: number(entry.p50), p95: number(entry.p95) };
 }
 
-const jobStatuses = new Set<CoreJobStatus>(["ok", "failing", "stopped", "unknown"]);
-
 /** Validates the envelope and normalises every missing figure to null. */
 export function projectCoreMetrics(value: unknown): CoreMetrics {
   const body = record(value, "response");
@@ -155,7 +67,7 @@ export function projectCoreMetrics(value: unknown): CoreMetrics {
   const database = optional(body.database);
   const pool = optional(database.pool);
   const process = optional(body.process);
-  const status = service.status === "running" || service.status === "degraded" ? service.status : "unknown";
+  const status = isOneOf(serviceStateStatusValues, service.status) ? service.status : "unknown";
   const resolution = number(range.resolution_seconds);
   if (resolution === null || resolution <= 0) throw new AgentCoreError("Core metrics: range.resolution_seconds is missing.", 0, "invalid_response");
   return {
@@ -197,7 +109,7 @@ export function projectCoreMetrics(value: unknown): CoreMetrics {
     },
     jobs: list(body.jobs, (entry, index) => ({
       id: String(entry.id ?? index),
-      status: jobStatuses.has(entry.status as CoreJobStatus) ? entry.status as CoreJobStatus : "unknown",
+      status: isOneOf(jobStatusValues, entry.status) ? entry.status : "unknown",
       last_run_at: text(entry.last_run_at),
       processed: number(entry.processed),
       failed: number(entry.failed),
diff --git a/packages/agents-client/src/execution-configuration-projection.ts b/packages/agents-client/src/execution-configuration-projection.ts
index 577a2fd36..efaca3016 100644
--- a/packages/agents-client/src/execution-configuration-projection.ts
+++ b/packages/agents-client/src/execution-configuration-projection.ts
@@ -1,27 +1,29 @@
 import { modelProviderProtocols } from "./harness-catalog";
-import { canonicalUuid, exactFields, isNonnegativeInteger, isRecord, onlyFields, sameResourceId } from "./response-projection";
 import { modelProviderViewFields } from "./generated/public-api";
-import type { ExecutionConfigurationSource, ModelProviderView, SessionExecutionConfiguration } from "./types";
+import {
+  executionHarnessConfigSelectionFields, executionProviderSelectionFields, executionSelectionFields, executionSelectionSourceValues,
+  sessionExecutionConfigurationFields, type ExecutionSelectionSource,
+} from "./generated/core-api";
+import { canonicalUuid, exactFields, isNonnegativeInteger, isOneOf, isRecord, onlyFields, sameResourceId } from "./response-projection";
+import type { ModelProviderView, SessionExecutionConfiguration } from "./types";
 
 type Invalid = () => never;
-const sources = new Set(["session", "agent", "deployment", "unknown"]);
-const selectionFields = new Set(["value", "source"]);
 const protocols: ReadonlySet<unknown> = new Set(modelProviderProtocols);
 
 function selection(value: unknown, invalid: Invalid): SessionExecutionConfiguration["model"] {
-  if (!isRecord(value) || !exactFields(value, selectionFields) || !sources.has(String(value.source)) ||
+  if (!isRecord(value) || !exactFields(value, executionSelectionFields) || !isOneOf(executionSelectionSourceValues, value.source) ||
     (value.value !== null && (typeof value.value !== "string" || value.value.length === 0)) ||
     (value.value === null && value.source !== "unknown")) return invalid();
-  return { value: value.value as string | null, source: value.source as ExecutionConfigurationSource };
+  return { value: value.value as string | null, source: value.source as ExecutionSelectionSource };
 }
 
 // Splits an absolute URL as RFC 3986 appendix B does, without parsing its host.
 const baseURLPattern = /^https:\/\/([^/?#]*)[^?#]*(?:\?([^#]*))?(?:#([\s\S]*))?$/iu;
 
 /**
- * Checks a stored base URL no more strictly than Core's write rule: HTTPS with a
- * host and no credentials, query or fragment. Host syntax is Core's to enforce;
- * a value an earlier Core accepted must not fail a whole list.
+ * Checks a stored base URL as Core's write rule does, never more strictly:
+ * HTTPS with a host and no credentials, query or fragment. Host syntax is
+ * Core's to enforce, so one stored value never fails a whole list.
  */
 function safeBaseURL(value: string): boolean {
   const match = baseURLPattern.exec(value);
@@ -48,13 +50,13 @@ export function safeProvider(value: unknown, invalid: Invalid): ModelProviderVie
 }
 
 export function projectExecutionConfiguration(value: unknown, sessionId: string, invalid: Invalid): SessionExecutionConfiguration {
-  if (!isRecord(value) || !exactFields(value, new Set(["object", "schema_version", "session_id", "model", "harness", "model_provider", "harness_config"])) ||
+  if (!isRecord(value) || !exactFields(value, sessionExecutionConfigurationFields) ||
     value.object !== "agent.session.execution_configuration" || value.schema_version !== 1 ||
     typeof value.session_id !== "string" || !canonicalUuid(value.session_id) || !sameResourceId(value.session_id, sessionId) ||
-    !isRecord(value.model_provider) || !exactFields(value.model_provider, new Set(["source", "status", "configuration"]))) return invalid();
+    !isRecord(value.model_provider) || !exactFields(value.model_provider, executionProviderSelectionFields)) return invalid();
   const native = value.harness_config;
-  if (!isRecord(native) || !exactFields(native, selectionFields) || !isRecord(native.value) ||
-    !sources.has(String(native.source)) || (native.source === "unknown" && Object.keys(native.value).length !== 0)) return invalid();
+  if (!isRecord(native) || !exactFields(native, executionHarnessConfigSelectionFields) || !isRecord(native.value) ||
+    !isOneOf(executionSelectionSourceValues, native.source) || (native.source === "unknown" && Object.keys(native.value).length !== 0)) return invalid();
   const provider = value.model_provider;
   let configuration: ModelProviderView | null = null;
   if (provider.status === "available" && (provider.source === "session" || provider.source === "agent" || provider.source === "deployment")) {
@@ -64,7 +66,7 @@ export function projectExecutionConfiguration(value: unknown, sessionId: string,
   return {
     object: "agent.session.execution_configuration", schema_version: 1, session_id: value.session_id,
     model: selection(value.model, invalid), harness: selection(value.harness, invalid),
-    harness_config: { value: { ...native.value }, source: native.source as ExecutionConfigurationSource },
-    model_provider: { source: provider.source as ExecutionConfigurationSource, status: provider.status as SessionExecutionConfiguration["model_provider"]["status"], configuration },
+    harness_config: { value: { ...native.value }, source: native.source as ExecutionSelectionSource },
+    model_provider: { source: provider.source as ExecutionSelectionSource, status: provider.status as SessionExecutionConfiguration["model_provider"]["status"], configuration },
   };
 }
diff --git a/packages/agents-client/src/generated/core-api.ts b/packages/agents-client/src/generated/core-api.ts
new file mode 100644
index 000000000..b930cfad5
--- /dev/null
+++ b/packages/agents-client/src/generated/core-api.ts
@@ -0,0 +1,907 @@
+// Code generated by scripts/generate-public-api.py from contracts/agents-api/core.openapi.yaml; DO NOT EDIT.
+import type { ModelProviderInput, ModelProviderView, TokenUsageResource } from "./public-api";
+
+export interface AddressBindings {
+  hosted_sandboxes: number;
+  nodes: number;
+  nodes_on_other_address: number;
+  self_hosted_executors: number;
+}
+export const addressBindingsFields = ["hosted_sandboxes", "nodes", "nodes_on_other_address", "self_hosted_executors"] as const;
+export interface AdminAssetCounts {
+  agents: number;
+  credentials: number;
+  environment_templates: number;
+  files: number;
+  skills: number;
+  vaults: number;
+}
+export const adminAssetCountsFields = ["agents", "credentials", "environment_templates", "files", "skills", "vaults"] as const;
+export interface AdminRuntimeObservation {
+  observation: AdminRuntimeObservationDetail;
+  project_id: string;
+}
+export const adminRuntimeObservationFields = ["observation", "project_id"] as const;
+export interface AdminRuntimeObservationDetail {
+  allocation_created_at: number | null;
+  cpu: RuntimeCPUObservation | null;
+  disk: RuntimeDiskObservation | null;
+  environment_id: string | null;
+  id: string;
+  instance: RuntimeInstance;
+  lifecycle_state: AdminRuntimeObservationDetailLifecycleState | null;
+  memory: RuntimeMemoryObservation | null;
+  mode: AdminRuntimeObservationDetailMode;
+  object: "agent.runtime_observation";
+  observed_at: number | null;
+  provider_type: string | null;
+  reason: AdminRuntimeObservationDetailReason | null;
+  resolved_at: number;
+  session_id: string;
+  started_at: number | null;
+  status: AdminRuntimeObservationDetailStatus;
+}
+export const adminRuntimeObservationDetailFields = ["allocation_created_at", "cpu", "disk", "environment_id", "id", "instance", "lifecycle_state", "memory", "mode", "object", "observed_at", "provider_type", "reason", "resolved_at", "session_id", "started_at", "status"] as const;
+export const adminRuntimeObservationDetailLifecycleStateValues = ["active", "sleeping", "transitioning", "pending", "stopped"] as const;
+export type AdminRuntimeObservationDetailLifecycleState = (typeof adminRuntimeObservationDetailLifecycleStateValues)[number];
+export const adminRuntimeObservationDetailModeValues = ["none", "self_hosted", "openai_hosted"] as const;
+export type AdminRuntimeObservationDetailMode = (typeof adminRuntimeObservationDetailModeValues)[number];
+export const adminRuntimeObservationDetailReasonValues = ["runtime_mode_not_observable", "allocation_pending", "runtime_not_running", "sample_timeout", "sample_unavailable"] as const;
+export type AdminRuntimeObservationDetailReason = (typeof adminRuntimeObservationDetailReasonValues)[number];
+export const adminRuntimeObservationDetailStatusValues = ["observed", "unsupported", "unavailable"] as const;
+export type AdminRuntimeObservationDetailStatus = (typeof adminRuntimeObservationDetailStatusValues)[number];
+export interface AdminRuntimeObservationList {
+  data: AdminRuntimeObservation[];
+  first_id: string | null;
+  has_more: boolean;
+  last_id: string | null;
+  object: "list";
+}
+export const adminRuntimeObservationListFields = ["data", "first_id", "has_more", "last_id", "object"] as const;
+export interface AdminSessionArchiveRequest {
+  expected_generation: number;
+}
+export const adminSessionArchiveRequestFields = ["expected_generation"] as const;
+export interface AdminSessionCounts {
+  failed: number;
+  idle: number;
+  in_progress: number;
+  requires_action: number;
+  total: number;
+}
+export const adminSessionCountsFields = ["failed", "idle", "in_progress", "requires_action", "total"] as const;
+export interface AdminSummaryResponse {
+  data: AdminSummaryRow[];
+  has_more: boolean;
+  next_cursor: string;
+}
+export const adminSummaryResponseFields = ["data", "has_more", "next_cursor"] as const;
+export interface AdminSummaryRow {
+  agent_id: string | null;
+  assets: AdminAssetCounts | null;
+  coverage: AdminUsageCoverage;
+  key_id: string | null;
+  last_active_at: number | null;
+  project_id: string;
+  sessions: AdminSessionCounts;
+  usage: TokenUsageResource;
+}
+export const adminSummaryRowFields = ["agent_id", "assets", "coverage", "key_id", "last_active_at", "project_id", "sessions", "usage"] as const;
+export interface AdminUsageCoverage {
+  measured_sessions: number;
+  ratio: number | null;
+  total_sessions: number;
+}
+export const adminUsageCoverageFields = ["measured_sessions", "ratio", "total_sessions"] as const;
+export interface AdminauditOperation {
+  action: string;
+  actor_label: string;
+  admin_credential_id: string;
+  created_at: string;
+  id: string;
+  project_id: string | null;
+  request_id: string;
+  resource_id: string;
+  resource_type: string;
+  trace_id: string;
+}
+export const adminauditOperationFields = ["action", "actor_label", "admin_credential_id", "created_at", "id", "project_id", "request_id", "resource_id", "resource_type", "trace_id"] as const;
+export interface AdminauditPage {
+  data: AdminauditOperation[];
+  has_more: boolean;
+  next_cursor: string;
+}
+export const adminauditPageFields = ["data", "has_more", "next_cursor"] as const;
+export interface ConfigurationDiscoveryInput {
+  configuration?: Record<string, unknown>;
+  credential?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+}
+export const configurationDiscoveryInputFields = ["configuration", "credential", "query"] as const;
+export const configurationDiscoveryInputRequired = [] as const;
+export interface CoreAPIError {
+  code?: string | null;
+  details?: Record<string, unknown>;
+  message: string;
+  param?: string | null;
+  type: string;
+}
+export const coreAPIErrorFields = ["code", "details", "message", "param", "type"] as const;
+export const coreAPIErrorRequired = ["message", "type"] as const;
+export interface CoreErrorResponse {
+  error: CoreAPIError;
+}
+export const coreErrorResponseFields = ["error"] as const;
+export interface CoreHarness {
+  default: boolean;
+  enabled: boolean;
+  id: CoreHarnessId;
+  model_configuration: HarnessModelConfiguration | null;
+  model_configuration_support: ModelConfigurationSupport;
+  object: "core.harness";
+}
+export const coreHarnessFields = ["default", "enabled", "id", "model_configuration", "model_configuration_support", "object"] as const;
+export const coreHarnessIdValues = ["claude_sdk", "codex", "mcode"] as const;
+export type CoreHarnessId = (typeof coreHarnessIdValues)[number];
+export interface CoreHarnessList {
+  data: CoreHarness[];
+  object: "list";
+}
+export const coreHarnessListFields = ["data", "object"] as const;
+export interface CoremetricsView {
+  database: Database;
+  execution: Execution;
+  jobs: Job[];
+  object: "core.metrics";
+  process: Process;
+  range: Range;
+  service: ServiceState;
+}
+export const coremetricsViewFields = ["database", "execution", "jobs", "object", "process", "range", "service"] as const;
+export interface Database {
+  ping_ms: Latency;
+  pool: Pool;
+  series: DatabaseBucket[];
+  size_bytes: number | null;
+}
+export const databaseFields = ["ping_ms", "pool", "series", "size_bytes"] as const;
+export interface DatabaseBucket {
+  ping_p95_ms: number | null;
+  pool_in_use: number | null;
+  start: string;
+}
+export const databaseBucketFields = ["ping_p95_ms", "pool_in_use", "start"] as const;
+export interface DeploymentResources {
+  allocations: number;
+  pending: number;
+}
+export const deploymentResourcesFields = ["allocations", "pending"] as const;
+export interface DeploymentSpec {
+  resources: SandboxResources;
+  runtime?: RuntimeRelease;
+}
+export const deploymentSpecFields = ["resources", "runtime"] as const;
+export const deploymentSpecRequired = ["resources"] as const;
+export interface DeploymentView {
+  configuration?: Record<string, unknown>;
+  core_url: string;
+  credential_configured: boolean;
+  generation: number;
+  installation_id: string;
+  metadata?: Record<string, unknown>;
+  mode: DeploymentViewMode;
+  owner_epoch: number;
+  provider: string;
+  reset: Reset | null;
+  resources: DeploymentResources;
+  rollout: Rollout;
+  specification?: DeploymentSpec;
+  specification_digest?: string;
+  suspension: Suspension | null;
+}
+export const deploymentViewFields = ["configuration", "core_url", "credential_configured", "generation", "installation_id", "metadata", "mode", "owner_epoch", "provider", "reset", "resources", "rollout", "specification", "specification_digest", "suspension"] as const;
+export const deploymentViewRequired = ["core_url", "credential_configured", "generation", "installation_id", "mode", "owner_epoch", "provider", "reset", "resources", "rollout", "suspension"] as const;
+export const deploymentViewModeValues = ["", "nodes", "direct"] as const;
+export type DeploymentViewMode = (typeof deploymentViewModeValues)[number];
+export interface DiagnosticFailure {
+  code: DiagnosticFailureCode;
+  failed_at: string | null;
+  params: Record<string, unknown>;
+}
+export const diagnosticFailureFields = ["code", "failed_at", "params"] as const;
+export const diagnosticFailureCodeValues = ["harness_error", "model_provider_required", "runtime_unavailable", "runtime_disconnected", "runtime_preparation_failed", "execution_interrupted", "delivery_unconfirmed", "input_rejected", "executor_protocol_error", "core_storage_failed", "internal_error", "environment_connection_timeout", "environment_unavailable", "environment_provisioning_failed", "authentication_error", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "invalid_request", "resource_not_found", "request_timeout", "context_length_exceeded", "cyber_policy", "connection_failed"] as const;
+export type DiagnosticFailureCode = (typeof diagnosticFailureCodeValues)[number];
+export interface EnvironmentExecutorCredentialRequest {
+  key_id: string;
+  rotate?: boolean;
+}
+export const environmentExecutorCredentialRequestFields = ["key_id", "rotate"] as const;
+export const environmentExecutorCredentialRequestRequired = ["key_id"] as const;
+export interface Execution {
+  connected_daemons: number;
+  in_progress_turns: number | null;
+  interrupted: number | null;
+  oldest_queued_seconds: number | null;
+  queue_wait_ms: Latency;
+  queued_turns: number | null;
+  series: ExecutionBucket[];
+  slots_in_use: number;
+  slots_total: number;
+  unavailable: number | null;
+  waiting_for_daemon: number | null;
+}
+export const executionFields = ["connected_daemons", "in_progress_turns", "interrupted", "oldest_queued_seconds", "queue_wait_ms", "queued_turns", "series", "slots_in_use", "slots_total", "unavailable", "waiting_for_daemon"] as const;
+export interface ExecutionBucket {
+  in_progress: number | null;
+  queue_wait_p95_ms: number | null;
+  queued: number | null;
+  start: string;
+}
+export const executionBucketFields = ["in_progress", "queue_wait_p95_ms", "queued", "start"] as const;
+export interface ExecutionHarnessConfigSelection {
+  source: ExecutionHarnessConfigSelectionSource;
+  value: Record<string, unknown>;
+}
+export const executionHarnessConfigSelectionFields = ["source", "value"] as const;
+export const executionHarnessConfigSelectionSourceValues = ["session", "agent", "deployment", "unknown"] as const;
+export type ExecutionHarnessConfigSelectionSource = (typeof executionHarnessConfigSelectionSourceValues)[number];
+export interface ExecutionProviderSelection {
+  configuration: ModelProviderView | null;
+  source: ExecutionProviderSelectionSource;
+  status: ExecutionProviderSelectionStatus;
+}
+export const executionProviderSelectionFields = ["configuration", "source", "status"] as const;
+export const executionProviderSelectionSourceValues = ["session", "agent", "deployment", "unknown"] as const;
+export type ExecutionProviderSelectionSource = (typeof executionProviderSelectionSourceValues)[number];
+export const executionProviderSelectionStatusValues = ["available", "redacted", "unavailable"] as const;
+export type ExecutionProviderSelectionStatus = (typeof executionProviderSelectionStatusValues)[number];
+export interface ExecutionSelection {
+  source: ExecutionSelectionSource;
+  value: string | null;
+}
+export const executionSelectionFields = ["source", "value"] as const;
+export const executionSelectionSourceValues = ["session", "agent", "deployment", "unknown"] as const;
+export type ExecutionSelectionSource = (typeof executionSelectionSourceValues)[number];
+export interface ExecutorConnection {
+  bound_key_id: string | null;
+  enrolled_at: string | null;
+  last_seen_at: string | null;
+  status: ExecutorConnectionStatus;
+}
+export const executorConnectionFields = ["bound_key_id", "enrolled_at", "last_seen_at", "status"] as const;
+export const executorConnectionStatusValues = ["never_enrolled", "connected", "disconnected"] as const;
+export type ExecutorConnectionStatus = (typeof executorConnectionStatusValues)[number];
+export interface ExecutorCredential {
+  created_at: string;
+  key_id: string;
+  revoked_at: string | null;
+}
+export const executorCredentialFields = ["created_at", "key_id", "revoked_at"] as const;
+export interface ExecutorCredentialList {
+  connection: ExecutorConnection;
+  data: ExecutorCredential[];
+}
+export const executorCredentialListFields = ["connection", "data"] as const;
+export interface HarnessModelConfiguration {
+  harness: HarnessModelConfigurationHarness;
+  harness_config: Record<string, unknown>;
+  last_error_at: string | null;
+  last_error_code: HarnessModelConfigurationLastErrorCode | null;
+  last_used_at: string | null;
+  model: string;
+  model_provider: ModelProviderView;
+  object: "core.model_configuration";
+  updated_at: string;
+}
+export const harnessModelConfigurationFields = ["harness", "harness_config", "last_error_at", "last_error_code", "last_used_at", "model", "model_provider", "object", "updated_at"] as const;
+export const harnessModelConfigurationHarnessValues = ["claude_sdk", "codex", "mcode"] as const;
+export type HarnessModelConfigurationHarness = (typeof harnessModelConfigurationHarnessValues)[number];
+export const harnessModelConfigurationLastErrorCodeValues = ["authentication_error", "connection_failed", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "resource_not_found", "request_timeout", "invalid_request"] as const;
+export type HarnessModelConfigurationLastErrorCode = (typeof harnessModelConfigurationLastErrorCodeValues)[number];
+export interface HostHistory {
+  points: HostHistoryPoint[];
+  resolution_seconds: number;
+}
+export const hostHistoryFields = ["points", "resolution_seconds"] as const;
+export interface HostHistoryPoint {
+  available_disk_bytes_min: number | null;
+  cpu_utilization_max: number | null;
+  memory_used_bytes_max: number | null;
+  start: string;
+}
+export const hostHistoryPointFields = ["available_disk_bytes_min", "cpu_utilization_max", "memory_used_bytes_max", "start"] as const;
+export interface Installation {
+  address_bindings: AddressBindings;
+  api_base_url: string;
+  configuration: InstallationConfiguration;
+  installation_id: string;
+  local_only: boolean;
+  object: "core.installation";
+  public_url: string;
+  source_commit: string | null;
+}
+export const installationFields = ["address_bindings", "api_base_url", "configuration", "installation_id", "local_only", "object", "public_url", "source_commit"] as const;
+export interface InstallationConfiguration {
+  settings: InstallationSetting[];
+}
+export const installationConfigurationFields = ["settings"] as const;
+export interface InstallationSetting {
+  changeable: boolean;
+  configured?: boolean;
+  default: unknown | null;
+  key: string;
+  restarts: InstallationSettingRestarts[];
+  sensitive: boolean;
+  value: unknown | null;
+}
+export const installationSettingFields = ["changeable", "configured", "default", "key", "restarts", "sensitive", "value"] as const;
+export const installationSettingRequired = ["changeable", "default", "key", "restarts", "sensitive", "value"] as const;
+export const installationSettingRestartsValues = ["core", "web"] as const;
+export type InstallationSettingRestarts = (typeof installationSettingRestartsValues)[number];
+export interface IssuedAPIKey {
+  created_at: string;
+  id: string;
+  key: string;
+  name: string;
+  prefix: string;
+  project_id: string;
+  revoked_at: string | null;
+}
+export const issuedAPIKeyFields = ["created_at", "id", "key", "name", "prefix", "project_id", "revoked_at"] as const;
+export interface IssuedExecutorCredential {
+  environment_id?: string;
+  executor_token: string;
+  key_id: string;
+}
+export const issuedExecutorCredentialFields = ["environment_id", "executor_token", "key_id"] as const;
+export const issuedExecutorCredentialRequired = ["executor_token", "key_id"] as const;
+export interface ItemDiagnosticTiming {
+  completed_at: string | null;
+  item_id: string;
+  observed_duration_ms: number | null;
+  started_at: string;
+}
+export const itemDiagnosticTimingFields = ["completed_at", "item_id", "observed_duration_ms", "started_at"] as const;
+export interface Job {
+  failed: number | null;
+  id: string;
+  last_run_at: string | null;
+  processed: number | null;
+  status: JobStatus;
+}
+export const jobFields = ["failed", "id", "last_run_at", "processed", "status"] as const;
+export const jobStatusValues = ["ok", "failing", "stopped", "unknown"] as const;
+export type JobStatus = (typeof jobStatusValues)[number];
+export interface KeyPage {
+  data: ProjectsAPIKey[];
+  has_more: boolean;
+}
+export const keyPageFields = ["data", "has_more"] as const;
+export interface Latency {
+  p50: number | null;
+  p95: number | null;
+}
+export const latencyFields = ["p50", "p95"] as const;
+export interface ManagedArchive {
+  environment_id: string;
+  session_id: string;
+  state: ManagedArchiveState;
+}
+export const managedArchiveFields = ["environment_id", "session_id", "state"] as const;
+export const managedArchiveStateValues = ["active", "cleanup_pending", "released"] as const;
+export type ManagedArchiveState = (typeof managedArchiveStateValues)[number];
+export interface ModelConfigurationInput {
+  harness_config?: Record<string, unknown>;
+  model: string;
+  model_provider: ModelProviderInput;
+}
+export const modelConfigurationInputFields = ["harness_config", "model", "model_provider"] as const;
+export const modelConfigurationInputRequired = ["model", "model_provider"] as const;
+export interface ModelConfigurationSupport {
+  accepts_harness_config: boolean;
+  protocols: string[];
+  token_limits_required: boolean;
+}
+export const modelConfigurationSupportFields = ["accepts_harness_config", "protocols", "token_limits_required"] as const;
+export interface Node {
+  active: number;
+  available_disk_bytes: number | null;
+  available_memory_bytes: number | null;
+  cleanup_pending: number;
+  core_url: string;
+  cpu_count: number | null;
+  created_at: string;
+  diagnostic?: NodeDiagnostic;
+  enrollment_id: string | null;
+  id: string;
+  last_seen_at: string | null;
+  max_active: number;
+  max_retained: number;
+  name: string;
+  online: boolean;
+  provider: string;
+  provider_ready: boolean;
+  reserved: number;
+  retained: number;
+  rollout: NodeRollout;
+  running: number;
+  snapshots: number;
+}
+export const nodeFields = ["active", "available_disk_bytes", "available_memory_bytes", "cleanup_pending", "core_url", "cpu_count", "created_at", "diagnostic", "enrollment_id", "id", "last_seen_at", "max_active", "max_retained", "name", "online", "provider", "provider_ready", "reserved", "retained", "rollout", "running", "snapshots"] as const;
+export const nodeRequired = ["active", "available_disk_bytes", "available_memory_bytes", "cleanup_pending", "core_url", "cpu_count", "created_at", "enrollment_id", "id", "last_seen_at", "max_active", "max_retained", "name", "online", "provider", "provider_ready", "reserved", "retained", "rollout", "running", "snapshots"] as const;
+export interface NodeAllocation {
+  compute_phase: string;
+  compute_phase_changed_at: string | null;
+  created_at: string;
+  deployment_generation: number;
+  diagnostic: NodeAllocationDiagnostic;
+  environment_id: string;
+  id: string;
+  initialization: string;
+  node_id: string;
+  session_id: string;
+  state: string;
+  tenant_id: string;
+}
+export const nodeAllocationFields = ["compute_phase", "compute_phase_changed_at", "created_at", "deployment_generation", "diagnostic", "environment_id", "id", "initialization", "node_id", "session_id", "state", "tenant_id"] as const;
+export const nodeAllocationDiagnosticValues = ["", "node_unavailable", "resource_missing", "compute_unconfirmed", "ownership_mismatch", "provider_unavailable"] as const;
+export type NodeAllocationDiagnostic = (typeof nodeAllocationDiagnosticValues)[number];
+export interface NodeDetail {
+  active: number;
+  available_disk_bytes: number | null;
+  available_memory_bytes: number | null;
+  cleanup_pending: number;
+  core_url: string;
+  cpu_count: number | null;
+  created_at: string;
+  diagnostic?: NodeDetailDiagnostic;
+  enrollment_id: string | null;
+  history: HostHistory;
+  host: NodeHost;
+  id: string;
+  last_seen_at: string | null;
+  max_active: number;
+  max_retained: number;
+  name: string;
+  online: boolean;
+  provider: string;
+  provider_ready: boolean;
+  reserved: number;
+  retained: number;
+  rollout: NodeRollout;
+  running: number;
+  snapshots: number;
+}
+export const nodeDetailFields = ["active", "available_disk_bytes", "available_memory_bytes", "cleanup_pending", "core_url", "cpu_count", "created_at", "diagnostic", "enrollment_id", "history", "host", "id", "last_seen_at", "max_active", "max_retained", "name", "online", "provider", "provider_ready", "reserved", "retained", "rollout", "running", "snapshots"] as const;
+export const nodeDetailRequired = ["active", "available_disk_bytes", "available_memory_bytes", "cleanup_pending", "core_url", "cpu_count", "created_at", "enrollment_id", "history", "host", "id", "last_seen_at", "max_active", "max_retained", "name", "online", "provider", "provider_ready", "reserved", "retained", "rollout", "running", "snapshots"] as const;
+export const nodeDetailDiagnosticValues = ["provider_unavailable", "host_unsupported", "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient"] as const;
+export type NodeDetailDiagnostic = (typeof nodeDetailDiagnosticValues)[number];
+export const nodeDiagnosticValues = ["provider_unavailable", "host_unsupported", "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient"] as const;
+export type NodeDiagnostic = (typeof nodeDiagnosticValues)[number];
+export interface NodeHost {
+  available_disk_bytes: number | null;
+  available_memory_bytes: number | null;
+  cpu_utilization: number | null;
+  effective_cpu_cores: number | null;
+  observed_at: string | null;
+  total_memory_bytes: number | null;
+}
+export const nodeHostFields = ["available_disk_bytes", "available_memory_bytes", "cpu_utilization", "effective_cpu_cores", "observed_at", "total_memory_bytes"] as const;
+export interface NodeRollout {
+  diagnostic?: NodeRolloutDiagnostic;
+  ready_generation: number | null;
+  state: NodeRolloutState;
+}
+export const nodeRolloutFields = ["diagnostic", "ready_generation", "state"] as const;
+export const nodeRolloutRequired = ["ready_generation", "state"] as const;
+export const nodeRolloutDiagnosticValues = ["provider_unavailable", "host_unsupported", "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient"] as const;
+export type NodeRolloutDiagnostic = (typeof nodeRolloutDiagnosticValues)[number];
+export const nodeRolloutStateValues = ["ready", "preparing", "failed", "update_required", "unknown"] as const;
+export type NodeRolloutState = (typeof nodeRolloutStateValues)[number];
+export interface NodeUpdate {
+  max_active: number;
+  max_retained?: number;
+  name: string;
+}
+export const nodeUpdateFields = ["max_active", "max_retained", "name"] as const;
+export const nodeUpdateRequired = ["max_active", "name"] as const;
+export interface Pool {
+  idle: number | null;
+  in_use: number | null;
+  max: number | null;
+}
+export const poolFields = ["idle", "in_use", "max"] as const;
+export interface Process {
+  cpu_cores: number | null;
+  cpu_limit_cores: number | null;
+  goroutines: number | null;
+  memory_bytes: number | null;
+  memory_limit_bytes: number | null;
+  rss_bytes: number | null;
+  series: ProcessBucket[];
+}
+export const processFields = ["cpu_cores", "cpu_limit_cores", "goroutines", "memory_bytes", "memory_limit_bytes", "rss_bytes", "series"] as const;
+export interface ProcessBucket {
+  cpu_cores: number | null;
+  rss_bytes: number | null;
+  start: string;
+}
+export const processBucketFields = ["cpu_cores", "rss_bytes", "start"] as const;
+export interface Project {
+  active_key_count: number;
+  archived_at: string | null;
+  created_at: string;
+  id: string;
+  name: string;
+}
+export const projectFields = ["active_key_count", "archived_at", "created_at", "id", "name"] as const;
+export interface ProjectAPIKeyRequest {
+  name: string;
+}
+export const projectAPIKeyRequestFields = ["name"] as const;
+export interface ProjectRequest {
+  name: string;
+}
+export const projectRequestFields = ["name"] as const;
+export interface ProjectsAPIKey {
+  created_at: string;
+  id: string;
+  name: string;
+  prefix: string;
+  project_id: string;
+  revoked_at: string | null;
+}
+export const projectsAPIKeyFields = ["created_at", "id", "name", "prefix", "project_id", "revoked_at"] as const;
+export interface ProjectsPage {
+  data: Project[];
+  has_more: boolean;
+}
+export const projectsPageFields = ["data", "has_more"] as const;
+export interface Range {
+  end: string;
+  resolution_seconds: number;
+  start: string;
+}
+export const rangeFields = ["end", "resolution_seconds", "start"] as const;
+export interface Reset {
+  clear: ResetClear;
+  deadline_at: string | null;
+  forced_at: string | null;
+  remaining: ResetRemaining;
+  requested_at: string;
+}
+export const resetFields = ["clear", "deadline_at", "forced_at", "remaining", "requested_at"] as const;
+export const resetClearValues = ["auto", "force"] as const;
+export type ResetClear = (typeof resetClearValues)[number];
+export interface ResetOfflineNode {
+  name: string;
+  node_id: string;
+  resources: number;
+}
+export const resetOfflineNodeFields = ["name", "node_id", "resources"] as const;
+export interface ResetRemaining {
+  busy: number;
+  cleanup: number;
+  idle: number;
+  offline_nodes: ResetOfflineNode[];
+  on_offline_nodes: number;
+}
+export const resetRemainingFields = ["busy", "cleanup", "idle", "offline_nodes", "on_offline_nodes"] as const;
+export interface ResetRequest {
+  clear: ResetRequestClear;
+  deadline_seconds?: number;
+  expected_generation: number;
+}
+export const resetRequestFields = ["clear", "deadline_seconds", "expected_generation"] as const;
+export const resetRequestRequired = ["clear", "expected_generation"] as const;
+export const resetRequestClearValues = ["auto", "force"] as const;
+export type ResetRequestClear = (typeof resetRequestClearValues)[number];
+export interface ResourceOwner {
+  api_key: WriteauditAPIKey | null;
+  resource_id: string;
+}
+export const resourceOwnerFields = ["api_key", "resource_id"] as const;
+export interface ResourceOwnerList {
+  data: ResourceOwner[];
+}
+export const resourceOwnerListFields = ["data"] as const;
+export interface Rollout {
+  nodes: RolloutNodes | null;
+  previous_generation_sandboxes: number;
+  state: RolloutState;
+}
+export const rolloutFields = ["nodes", "previous_generation_sandboxes", "state"] as const;
+export interface RolloutNodes {
+  failed: number;
+  preparing: number;
+  ready: number;
+  unknown: number;
+  update_required: number;
+}
+export const rolloutNodesFields = ["failed", "preparing", "ready", "unknown", "update_required"] as const;
+export const rolloutStateValues = ["settled", "preparing"] as const;
+export type RolloutState = (typeof rolloutStateValues)[number];
+export interface RuntimeCPUObservation {
+  capacity_cores: number | null;
+  usage_cores: number | null;
+  usage_seconds_total: number | null;
+  utilization_ratio: number | null;
+}
+export const runtimeCPUObservationFields = ["capacity_cores", "usage_cores", "usage_seconds_total", "utilization_ratio"] as const;
+export interface RuntimeDiskObservation {
+  limit_bytes: number | null;
+  usage_bytes: number | null;
+}
+export const runtimeDiskObservationFields = ["limit_bytes", "usage_bytes"] as const;
+export interface RuntimeHistory {
+  coverage: RuntimeHistoryCoverage;
+  generated_at: number;
+  object: "agent.runtime_history";
+  requested_range: RuntimeHistoryRange;
+  resolution_seconds: number;
+  series: RuntimeHistorySeries[];
+  session_id: string;
+  source: "durable";
+  token_usage: RuntimeHistoryTokenUsagePoint[];
+}
+export const runtimeHistoryFields = ["coverage", "generated_at", "object", "requested_range", "resolution_seconds", "series", "session_id", "source", "token_usage"] as const;
+export interface RuntimeHistoryCPU {
+  capacity_cores: number | null;
+  contributor_count: number;
+  utilization_ratio: number | null;
+}
+export const runtimeHistoryCPUFields = ["capacity_cores", "contributor_count", "utilization_ratio"] as const;
+export interface RuntimeHistoryCoverage {
+  buckets: RuntimeHistoryCoveragePoint[];
+  expected_sample_count: number;
+  first_sample_at: number | null;
+  last_sample_at: number | null;
+  retained_start: number;
+  sample_count: number;
+}
+export const runtimeHistoryCoverageFields = ["buckets", "expected_sample_count", "first_sample_at", "last_sample_at", "retained_start", "sample_count"] as const;
+export interface RuntimeHistoryCoveragePoint {
+  end: number;
+  first_observed_at: number | null;
+  last_observed_at: number | null;
+  observation_count: number;
+  observed_count: number;
+  start: number;
+  unavailable_count: number;
+}
+export const runtimeHistoryCoveragePointFields = ["end", "first_observed_at", "last_observed_at", "observation_count", "observed_count", "start", "unavailable_count"] as const;
+export interface RuntimeHistoryMemory {
+  contributor_count: number;
+  limit_bytes: number | null;
+  usage_bytes: number | null;
+}
+export const runtimeHistoryMemoryFields = ["contributor_count", "limit_bytes", "usage_bytes"] as const;
+export interface RuntimeHistoryPoint {
+  cpu: RuntimeHistoryCPU | null;
+  end: number;
+  first_observed_at: number | null;
+  last_observed_at: number | null;
+  memory: RuntimeHistoryMemory | null;
+  observation_count: number;
+  observed_count: number;
+  start: number;
+  unavailable_count: number;
+}
+export const runtimeHistoryPointFields = ["cpu", "end", "first_observed_at", "last_observed_at", "memory", "observation_count", "observed_count", "start", "unavailable_count"] as const;
+export interface RuntimeHistoryRange {
+  end: number;
+  start: number;
+}
+export const runtimeHistoryRangeFields = ["end", "start"] as const;
+export interface RuntimeHistorySeries {
+  allocation_id: string;
+  environment_id: string;
+  points: RuntimeHistoryPoint[];
+  provider_type: string;
+  started_at: RuntimeHistoryTime;
+}
+export const runtimeHistorySeriesFields = ["allocation_id", "environment_id", "points", "provider_type", "started_at"] as const;
+export interface RuntimeHistoryTime {
+  nanoseconds: number;
+  seconds: number;
+}
+export const runtimeHistoryTimeFields = ["nanoseconds", "seconds"] as const;
+export interface RuntimeHistoryTokenUsagePoint {
+  end: number;
+  input_tokens: number;
+  output_tokens: number;
+  sampled_at: number;
+  start: number;
+}
+export const runtimeHistoryTokenUsagePointFields = ["end", "input_tokens", "output_tokens", "sampled_at", "start"] as const;
+export interface RuntimeInstance {
+  allocation_id: string | null;
+  connection_generation: string | null;
+  device_id: string | null;
+  kind: RuntimeInstanceKind;
+}
+export const runtimeInstanceFields = ["allocation_id", "connection_generation", "device_id", "kind"] as const;
+export const runtimeInstanceKindValues = ["managed_allocation", "self_hosted_connection", "none"] as const;
+export type RuntimeInstanceKind = (typeof runtimeInstanceKindValues)[number];
+export interface RuntimeMemoryObservation {
+  limit_bytes: number | null;
+  usage_bytes: number | null;
+}
+export const runtimeMemoryObservationFields = ["limit_bytes", "usage_bytes"] as const;
+export interface RuntimeObservation {
+  allocation_created_at: number | null;
+  cpu: RuntimeCPUObservation | null;
+  environment_id: string | null;
+  id: string;
+  instance: RuntimeInstance;
+  lifecycle_state: RuntimeObservationLifecycleState | null;
+  memory: RuntimeMemoryObservation | null;
+  mode: RuntimeObservationMode;
+  object: "agent.runtime_observation";
+  observed_at: number | null;
+  provider_type: string | null;
+  reason: RuntimeObservationReason | null;
+  resolved_at: number;
+  session_id: string;
+  started_at: number | null;
+  status: RuntimeObservationStatus;
+}
+export const runtimeObservationFields = ["allocation_created_at", "cpu", "environment_id", "id", "instance", "lifecycle_state", "memory", "mode", "object", "observed_at", "provider_type", "reason", "resolved_at", "session_id", "started_at", "status"] as const;
+export const runtimeObservationLifecycleStateValues = ["active", "sleeping", "transitioning", "pending", "stopped"] as const;
+export type RuntimeObservationLifecycleState = (typeof runtimeObservationLifecycleStateValues)[number];
+export const runtimeObservationModeValues = ["none", "self_hosted", "openai_hosted"] as const;
+export type RuntimeObservationMode = (typeof runtimeObservationModeValues)[number];
+export const runtimeObservationReasonValues = ["runtime_mode_not_observable", "allocation_pending", "runtime_not_running", "sample_timeout", "sample_unavailable"] as const;
+export type RuntimeObservationReason = (typeof runtimeObservationReasonValues)[number];
+export const runtimeObservationStatusValues = ["observed", "unsupported", "unavailable"] as const;
+export type RuntimeObservationStatus = (typeof runtimeObservationStatusValues)[number];
+export interface RuntimeRelease {
+  firmware_sha256: string;
+  image_id: string;
+  image_manifest_digest: string;
+  microsandbox_ref: string;
+  runtime_sha256: string;
+  source_commit: string;
+}
+export const runtimeReleaseFields = ["firmware_sha256", "image_id", "image_manifest_digest", "microsandbox_ref", "runtime_sha256", "source_commit"] as const;
+export interface SandboxAllocationList {
+  data: NodeAllocation[];
+}
+export const sandboxAllocationListFields = ["data"] as const;
+export interface SandboxDeploymentChangeInput {
+  configuration?: Record<string, unknown>;
+  credential?: Record<string, unknown>;
+  expected_generation: number;
+  provider?: string;
+  resources?: SandboxResources;
+  runtime?: RuntimeRelease;
+}
+export const sandboxDeploymentChangeInputFields = ["configuration", "credential", "expected_generation", "provider", "resources", "runtime"] as const;
+export const sandboxDeploymentChangeInputRequired = ["expected_generation"] as const;
+export interface SandboxDeploymentInput {
+  configuration?: Record<string, unknown>;
+  credential?: Record<string, unknown>;
+  expected_generation: number;
+  provider?: string;
+  resources?: SandboxResources;
+  runtime?: RuntimeRelease;
+}
+export const sandboxDeploymentInputFields = ["configuration", "credential", "expected_generation", "provider", "resources", "runtime"] as const;
+export const sandboxDeploymentInputRequired = ["expected_generation"] as const;
+export interface SandboxEnrollmentToken {
+  enrollment_id: string;
+  expires_at: string;
+  token: string;
+}
+export const sandboxEnrollmentTokenFields = ["enrollment_id", "expires_at", "token"] as const;
+export interface SandboxEnrollmentTokenRequest {
+  max_active?: number;
+  max_retained?: number;
+}
+export const sandboxEnrollmentTokenRequestFields = ["max_active", "max_retained"] as const;
+export const sandboxEnrollmentTokenRequestRequired = [] as const;
+export interface SandboxMutationResponse {
+  deleted?: boolean;
+  id: string;
+  updated?: boolean;
+}
+export const sandboxMutationResponseFields = ["deleted", "id", "updated"] as const;
+export const sandboxMutationResponseRequired = ["id"] as const;
+export interface SandboxNodeList {
+  data: Node[];
+}
+export const sandboxNodeListFields = ["data"] as const;
+export interface SandboxResources {
+  cpus: number;
+  environment_disk_mib?: number;
+  memory_mib: number;
+  root_disk_mib?: number;
+}
+export const sandboxResourcesFields = ["cpus", "environment_disk_mib", "memory_mib", "root_disk_mib"] as const;
+export const sandboxResourcesRequired = ["cpus", "memory_mib"] as const;
+export interface ServiceState {
+  execution_owner: boolean | null;
+  revision: string | null;
+  started_at: string | null;
+  status: ServiceStateStatus;
+}
+export const serviceStateFields = ["execution_owner", "revision", "started_at", "status"] as const;
+export const serviceStateStatusValues = ["running", "degraded"] as const;
+export type ServiceStateStatus = (typeof serviceStateStatusValues)[number];
+export interface SessionDiagnosticFailure {
+  code: SessionDiagnosticFailureCode;
+  failed_at: string | null;
+  params: Record<string, unknown>;
+  source: SessionDiagnosticFailureSource;
+  turn_id?: string;
+}
+export const sessionDiagnosticFailureFields = ["code", "failed_at", "params", "source", "turn_id"] as const;
+export const sessionDiagnosticFailureRequired = ["code", "failed_at", "params", "source"] as const;
+export const sessionDiagnosticFailureCodeValues = ["harness_error", "model_provider_required", "runtime_unavailable", "runtime_disconnected", "runtime_preparation_failed", "execution_interrupted", "delivery_unconfirmed", "input_rejected", "executor_protocol_error", "core_storage_failed", "internal_error", "environment_connection_timeout", "environment_unavailable", "environment_provisioning_failed", "authentication_error", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "invalid_request", "resource_not_found", "request_timeout", "context_length_exceeded", "cyber_policy", "connection_failed"] as const;
+export type SessionDiagnosticFailureCode = (typeof sessionDiagnosticFailureCodeValues)[number];
+export const sessionDiagnosticFailureSourceValues = ["turn", "environment", "environment_input"] as const;
+export type SessionDiagnosticFailureSource = (typeof sessionDiagnosticFailureSourceValues)[number];
+export interface SessionDiagnostics {
+  failure: SessionDiagnosticFailure | null;
+  object: "core.session_diagnostics";
+  session_id: string;
+  status: SessionDiagnosticsStatus;
+}
+export const sessionDiagnosticsFields = ["failure", "object", "session_id", "status"] as const;
+export const sessionDiagnosticsStatusValues = ["idle", "in_progress", "requires_action", "failed"] as const;
+export type SessionDiagnosticsStatus = (typeof sessionDiagnosticsStatusValues)[number];
+export interface SessionExecutionConfiguration {
+  harness: ExecutionSelection;
+  harness_config: ExecutionHarnessConfigSelection;
+  model: ExecutionSelection;
+  model_provider: ExecutionProviderSelection;
+  object: "agent.session.execution_configuration";
+  schema_version: 1;
+  session_id: string;
+}
+export const sessionExecutionConfigurationFields = ["harness", "harness_config", "model", "model_provider", "object", "schema_version", "session_id"] as const;
+export interface Suspension {
+  idle_seconds: number;
+  retention_seconds: number;
+}
+export const suspensionFields = ["idle_seconds", "retention_seconds"] as const;
+export interface TurnDiagnostics {
+  failure: DiagnosticFailure | null;
+  items: ItemDiagnosticTiming[];
+  items_truncated: boolean;
+  object: "core.turn_diagnostics";
+  session_id: string;
+  status: string;
+  turn_id: string;
+}
+export const turnDiagnosticsFields = ["failure", "items", "items_truncated", "object", "session_id", "status", "turn_id"] as const;
+export interface WriteauditAPIKey {
+  id: string;
+  kind: "issued";
+  name: string;
+  prefix: string;
+  revoked_at: string | null;
+}
+export const writeauditAPIKeyFields = ["id", "kind", "name", "prefix", "revoked_at"] as const;
+export interface WriteauditOperation {
+  action: WriteauditOperationAction;
+  api_key: WriteauditAPIKey;
+  created_at: string;
+  id: string;
+  parent_id: string;
+  request_id: string;
+  resource_id: string;
+  resource_type: WriteauditOperationResourceType;
+  trace_id: string;
+}
+export const writeauditOperationFields = ["action", "api_key", "created_at", "id", "parent_id", "request_id", "resource_id", "resource_type", "trace_id"] as const;
+export const writeauditOperationActionValues = ["create", "update", "delete", "send_events", "upload_file", "upload_version", "update_default_version"] as const;
+export type WriteauditOperationAction = (typeof writeauditOperationActionValues)[number];
+export const writeauditOperationResourceTypeValues = ["agent", "session", "environment", "environment_template", "skill", "skill_version", "file", "vault", "credential", "artifact"] as const;
+export type WriteauditOperationResourceType = (typeof writeauditOperationResourceTypeValues)[number];
+export interface WriteauditPage {
+  data: WriteauditOperation[];
+  has_more: boolean;
+  next_cursor: string;
+}
+export const writeauditPageFields = ["data", "has_more", "next_cursor"] as const;
diff --git a/packages/agents-client/src/index.ts b/packages/agents-client/src/index.ts
index 18711e960..c902b2b43 100644
--- a/packages/agents-client/src/index.ts
+++ b/packages/agents-client/src/index.ts
@@ -12,7 +12,8 @@ export { isEnvironmentTemplateName, isRecognizedEnvironmentTemplate } from "./en
 export { isOpenAIHostedSessionEnvironment } from "./session-environment-projection";
 export { compareSkillVersionNumbers, isSkillId, isSkillUploadPath, isSkillVersionId, isSkillVersionNumber } from "./skill-projection";
 export { AdminClient } from "./admin-client";
-// Skill and SkillVersion come from ./types; the admin projections use the same shapes.
-export type { AdminClientOptions, AdminProject, CreateAdminProjectInput, RenameAdminProjectInput, AdminAPIKey, AdminIssuedAPIKey, IssueAdminAPIKeyInput, AdminPage, AdminDeleted, SessionArtifact, AdminContent, AdminResourceType, AdminKeyProvenance, AdminResourceOwner, AdminWriteOperation, AdminWriteOperationOptions, AdminWriteOperationPage, AdminSummaryOptions, AdminSummaryEntry, AdminSummary, AdminRuntimeObservation, AdminAuditOptions, AdminAuditEntry, AdminAuditPage, ExecutorCredential, ExecutorConnection, ExecutorCredentialList, IssueExecutorCredentialInput, IssuedExecutorCredential, CoreInstallation, CoreInstallationConfiguration, CoreInstallationSetting, CoreAddressBindings } from "./admin-types";
+// Skill, SkillVersion and SessionArtifact come from ./types; the admin projections use the same shapes.
+export { adminResourceTypes } from "./admin-types";
+export type { AdminClientOptions, AdminProject, CreateAdminProjectInput, RenameAdminProjectInput, AdminAPIKey, AdminIssuedAPIKey, IssueAdminAPIKeyInput, AdminPage, AdminDeleted, AdminContent, AdminResourceType, AdminKeyProvenance, AdminResourceOwner, AdminWriteOperation, AdminWriteOperationOptions, AdminWriteOperationPage, AdminSummaryOptions, AdminSummaryEntry, AdminSummary, AdminRuntimeObservation, AdminAuditOptions, AdminAuditEntry, AdminAuditPage, ExecutorCredential, ExecutorConnection, ExecutorCredentialList, IssueExecutorCredentialInput, IssuedExecutorCredential, CoreInstallation, CoreInstallationConfiguration, CoreInstallationSetting, CoreAddressBindings } from "./admin-types";
 
-export type { DiagnosticFailureCode, NativeFailureCode, ConnectionFailureParams, ProvisioningFailureParams, DiagnosticFailure, SessionDiagnosticFailure, SessionDiagnostics, ItemDiagnosticTiming, TurnDiagnostics } from "./session-diagnostics";
+export type { DiagnosticFailureCode, ConnectionFailureParams, ProvisioningFailureParams, DiagnosticFailure, SessionDiagnosticFailure, SessionDiagnostics, ItemDiagnosticTiming, TurnDiagnostics } from "./session-diagnostics";
diff --git a/packages/agents-client/src/runtime-history-projection.ts b/packages/agents-client/src/runtime-history-projection.ts
index 82dfea325..6cc2040ec 100644
--- a/packages/agents-client/src/runtime-history-projection.ts
+++ b/packages/agents-client/src/runtime-history-projection.ts
@@ -1,33 +1,14 @@
-import { canonicalUuid, exactFields, isNonnegativeInteger, isRecord, sameResourceId } from "./response-projection";
-import type {
-  RuntimeHistory,
-  RuntimeHistoryCPU,
-  RuntimeHistoryCoveragePoint,
-  RuntimeHistoryMemory,
-  RuntimeHistoryPoint,
-  RuntimeHistoryQuery,
-  RuntimeHistorySeries,
-  RuntimeHistoryTokenUsagePoint,
-} from "./types";
+import {
+  runtimeHistoryCPUFields, runtimeHistoryCoverageFields, runtimeHistoryCoveragePointFields, runtimeHistoryFields, runtimeHistoryMemoryFields,
+  runtimeHistoryPointFields, runtimeHistoryRangeFields, runtimeHistorySeriesFields, runtimeHistoryTimeFields, runtimeHistoryTokenUsagePointFields,
+  type RuntimeHistoryCPU, type RuntimeHistoryCoveragePoint, type RuntimeHistoryMemory, type RuntimeHistoryPoint, type RuntimeHistorySeries,
+  type RuntimeHistoryTokenUsagePoint,
+} from "./generated/core-api";
+import { canonicalUuid, exactFields, isNonnegativeInteger, isRecord, sameResourceId, type FieldNames } from "./response-projection";
+import type { RuntimeHistory, RuntimeHistoryQuery } from "./types";
 
 type InvalidRuntimeHistory = (message?: string) => never;
 
-const historyFields = new Set([
-  "object", "source", "session_id", "requested_range", "resolution_seconds", "generated_at", "coverage", "series", "token_usage",
-]);
-const rangeFields = new Set(["start", "end"]);
-const coverageFields = new Set([
-  "retained_start", "first_sample_at", "last_sample_at", "sample_count", "expected_sample_count", "buckets",
-]);
-const coveragePointFields = new Set([
-  "start", "end", "first_observed_at", "last_observed_at", "observation_count", "observed_count", "unavailable_count",
-]);
-const seriesFields = new Set(["environment_id", "allocation_id", "started_at", "provider_type", "points"]);
-const timeFields = new Set(["seconds", "nanoseconds"]);
-const pointFields = new Set([...coveragePointFields, "cpu", "memory"]);
-const cpuFields = new Set(["contributor_count", "utilization_ratio", "capacity_cores"]);
-const memoryFields = new Set(["contributor_count", "usage_bytes", "limit_bytes"]);
-const tokenUsageFields = new Set(["start", "end", "sampled_at", "input_tokens", "output_tokens"]);
 const providerTypePattern = /^[a-z][a-z0-9_]{0,31}$/;
 const maximumSeries = 1_000;
 const maximumTotalPoints = 100_000;
@@ -62,7 +43,7 @@ function nullablePositiveNumber(value: unknown, invalid: InvalidRuntimeHistory):
 
 function projectCoveragePoint(
   value: unknown,
-  fields: Set<string>,
+  fields: FieldNames,
   requestedStart: number,
   requestedEnd: number,
   resolution: number,
@@ -96,7 +77,7 @@ function projectCoveragePoint(
 
 function projectCPU(value: unknown, observedCount: number, invalid: InvalidRuntimeHistory): RuntimeHistoryCPU | null {
   if (value === null) return null;
-  if (!isRecord(value) || !exactFields(value, cpuFields) || !positiveInteger(value.contributor_count) || value.contributor_count > observedCount) return invalid();
+  if (!isRecord(value) || !exactFields(value, runtimeHistoryCPUFields) || !positiveInteger(value.contributor_count) || value.contributor_count > observedCount) return invalid();
   const utilization = nullableNonnegativeNumber(value.utilization_ratio, invalid);
   const capacity = nullablePositiveNumber(value.capacity_cores, invalid);
   if (utilization === null && capacity === null) return invalid();
@@ -105,7 +86,7 @@ function projectCPU(value: unknown, observedCount: number, invalid: InvalidRunti
 
 function projectMemory(value: unknown, observedCount: number, invalid: InvalidRuntimeHistory): RuntimeHistoryMemory | null {
   if (value === null) return null;
-  if (!isRecord(value) || !exactFields(value, memoryFields) || !positiveInteger(value.contributor_count) || value.contributor_count > observedCount) return invalid();
+  if (!isRecord(value) || !exactFields(value, runtimeHistoryMemoryFields) || !positiveInteger(value.contributor_count) || value.contributor_count > observedCount) return invalid();
   const usage = nullableNonnegativeInteger(value.usage_bytes, invalid);
   const limit = nullablePositiveInteger(value.limit_bytes, invalid);
   if (usage === null && limit === null) return invalid();
@@ -120,7 +101,7 @@ function projectPoint(
   startedAt: number,
   invalid: InvalidRuntimeHistory,
 ): RuntimeHistoryPoint {
-  const coverage = projectCoveragePoint(value, pointFields, requestedStart, requestedEnd, resolution, invalid);
+  const coverage = projectCoveragePoint(value, runtimeHistoryPointFields, requestedStart, requestedEnd, resolution, invalid);
   if (!isRecord(value) || coverage.end <= startedAt || (coverage.first_observed_at !== null && coverage.first_observed_at < startedAt)) return invalid();
   const cpu = projectCPU(value.cpu, coverage.observed_count, invalid);
   const memory = projectMemory(value.memory, coverage.observed_count, invalid);
@@ -141,7 +122,7 @@ function projectTokenUsagePoint(
   invalid: InvalidRuntimeHistory,
 ): RuntimeHistoryTokenUsagePoint {
   if (
-    !isRecord(value) || !exactFields(value, tokenUsageFields) ||
+    !isRecord(value) || !exactFields(value, runtimeHistoryTokenUsagePointFields) ||
     !isNonnegativeInteger(value.start) || !positiveInteger(value.end) ||
     value.start < requestedStart || value.end <= value.start || value.end > requestedEnd || value.end - value.start > resolution ||
     !isNonnegativeInteger(value.sampled_at) || value.sampled_at < value.start || value.sampled_at >= value.end || value.sampled_at > generatedAt ||
@@ -165,10 +146,10 @@ function projectSeries(
   maximumPoints: number,
   invalid: InvalidRuntimeHistory,
 ): RuntimeHistorySeries {
-  if (!isRecord(value) || !exactFields(value, seriesFields) || !Array.isArray(value.points)) return invalid();
+  if (!isRecord(value) || !exactFields(value, runtimeHistorySeriesFields) || !Array.isArray(value.points)) return invalid();
   const environmentId = canonicalUuid(value.environment_id);
   const allocationId = canonicalUuid(value.allocation_id);
-  if (!isRecord(value.started_at) || !exactFields(value.started_at, timeFields)) return invalid();
+  if (!isRecord(value.started_at) || !exactFields(value.started_at, runtimeHistoryTimeFields)) return invalid();
   const startedAtSeconds = value.started_at.seconds;
   const startedAtNanoseconds = value.started_at.nanoseconds;
   if (
@@ -197,12 +178,12 @@ export function projectRuntimeHistory(
   invalid: InvalidRuntimeHistory,
 ): RuntimeHistory {
   if (
-    !isRecord(value) || !exactFields(value, historyFields) || value.object !== "agent.runtime_history" || value.source !== "durable" ||
+    !isRecord(value) || !exactFields(value, runtimeHistoryFields) || value.object !== "agent.runtime_history" || value.source !== "durable" ||
     typeof value.session_id !== "string" || !sameResourceId(value.session_id, expectedSessionId) ||
-    !isRecord(value.requested_range) || !exactFields(value.requested_range, rangeFields) ||
+    !isRecord(value.requested_range) || !exactFields(value.requested_range, runtimeHistoryRangeFields) ||
     value.requested_range.start !== requested.start || value.requested_range.end !== requested.end ||
     !positiveInteger(value.resolution_seconds) || !isNonnegativeInteger(value.generated_at) ||
-    !isRecord(value.coverage) || !exactFields(value.coverage, coverageFields) || !Array.isArray(value.coverage.buckets) ||
+    !isRecord(value.coverage) || !exactFields(value.coverage, runtimeHistoryCoverageFields) || !Array.isArray(value.coverage.buckets) ||
     !Array.isArray(value.series) || !Array.isArray(value.token_usage)
   ) return invalid();
   const sessionId = canonicalUuid(value.session_id);
@@ -221,7 +202,7 @@ export function projectRuntimeHistory(
     (firstSample !== null && (firstSample < retainedStart || lastSample! < firstSample || lastSample! >= requested.end || lastSample! > generatedAt))
   ) return invalid();
   const buckets = value.coverage.buckets.map((point) => projectCoveragePoint(
-    point, coveragePointFields, requested.start, requested.end, value.resolution_seconds as number, invalid,
+    point, runtimeHistoryCoveragePointFields, requested.start, requested.end, value.resolution_seconds as number, invalid,
   ));
   if (!ordered(buckets)) return invalid();
   const sampleCount = buckets.reduce((sum, point) => sum + point.observation_count, 0);
diff --git a/packages/agents-client/src/sandbox-client.test.ts b/packages/agents-client/src/sandbox-client.test.ts
index 9bea39776..1f32f2173 100644
--- a/packages/agents-client/src/sandbox-client.test.ts
+++ b/packages/agents-client/src/sandbox-client.test.ts
@@ -157,7 +157,7 @@ describe("Core sandbox credential boundaries", () => {
     const fetch = vi.fn<typeof globalThis.fetch>().mockResolvedValue(response({ data: [unready, { ...unready, diagnostic: "future_code" }, node] }));
     const { data } = await new SandboxAdminClient({ baseUrl: "/core/v1/sandbox", fetch }).listNodes();
     expect(data.map((entry) => entry.diagnostic)).toEqual(["host_unsupported", "provider_unavailable", undefined]);
-    expectTypeOf<SandboxNode["diagnostic"]>().toEqualTypeOf<undefined | "" | "provider_unavailable" | "host_unsupported" | "artifacts_unavailable" | "runtime_download_failed" | "runtime_image_unavailable" | "capacity_insufficient">();
+    expectTypeOf<SandboxNode["diagnostic"]>().toEqualTypeOf<undefined | "provider_unavailable" | "host_unsupported" | "artifacts_unavailable" | "runtime_download_failed" | "runtime_image_unavailable" | "capacity_insufficient">();
   });
   it("requires each node's enrollment ID: a string, or null for nodes enrolled before Core recorded it", async () => {
     const fetch = vi.fn<typeof globalThis.fetch>().mockResolvedValue(response({ data: [node, unready] }));
diff --git a/packages/agents-client/src/sandbox-client.ts b/packages/agents-client/src/sandbox-client.ts
index ef1cafcb8..1cdc84d2d 100644
--- a/packages/agents-client/src/sandbox-client.ts
+++ b/packages/agents-client/src/sandbox-client.ts
@@ -1,26 +1,27 @@
 import { AgentCoreError } from "./client";
 import { CoreRequester, type CoreClientOptions } from "./core-request";
 import { deploymentContract } from "./deployment-contract";
-import { hasOwn, isNonnegativeInteger, isRecord, onlyFields, sameResourceId } from "./response-projection";
+import { hasOwn, isNonnegativeInteger, isOneOf, isRecord, onlyFields, sameResourceId, schemaFields } from "./response-projection";
+import {
+  deploymentResourcesFields, deploymentSpecFields, deploymentSpecRequired, deploymentViewFields, deploymentViewModeValues, deploymentViewRequired,
+  hostHistoryFields, hostHistoryPointFields, nodeAllocationDiagnosticValues, nodeAllocationFields, nodeDetailFields, nodeDetailRequired,
+  nodeDiagnosticValues, nodeFields, nodeHostFields, nodeRequired, nodeRolloutFields, nodeRolloutRequired, nodeRolloutStateValues, resetClearValues,
+  resetFields, resetOfflineNodeFields, resetRemainingFields, rolloutFields, rolloutNodesFields, rolloutStateValues, runtimeReleaseFields,
+  sandboxAllocationListFields, sandboxNodeListFields, sandboxResourcesFields, sandboxResourcesRequired, suspensionFields,
+  type DeploymentSpec, type DeploymentView, type HostHistoryPoint, type Node, type NodeAllocation, type NodeDetail, type NodeDiagnostic,
+  type NodeHost, type NodeRollout, type NodeUpdate, type Reset, type ResetOfflineNode, type ResetRequest, type Rollout, type RuntimeRelease,
+  type SandboxDeploymentInput, type SandboxEnrollmentToken, type SandboxResources as SandboxResourcesResource,
+} from "./generated/core-api";
 import type { ReadOptions } from "./types";
 
-export type SandboxDiagnostic = "" | "node_unavailable" | "resource_missing" | "compute_unconfirmed" | "ownership_mismatch" | "provider_unavailable";
 /** Checked against Core's shared node-diagnostics.json fixture. */
-export const sandboxNodeDiagnostics = [
-  "provider_unavailable",
-  "host_unsupported",
-  "artifacts_unavailable",
-  "runtime_download_failed",
-  "runtime_image_unavailable",
-  "capacity_insufficient",
-] as const;
+export const sandboxNodeDiagnostics = nodeDiagnosticValues;
 /** 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 = "" | typeof sandboxNodeDiagnostics[number];
-const nodeDiagnostics: ReadonlySet<string> = new Set(sandboxNodeDiagnostics);
+export type SandboxNodeDiagnostic = NodeDiagnostic;
 
 /** Keep a known readiness cause; never expose unclassified node-supplied text. */
-export function normalizeSandboxNodeDiagnostic(value: string): Exclude<SandboxNodeDiagnostic, ""> {
-  return nodeDiagnostics.has(value) ? value as Exclude<SandboxNodeDiagnostic, ""> : "provider_unavailable";
+export function normalizeSandboxNodeDiagnostic(value: string): SandboxNodeDiagnostic {
+  return isOneOf(nodeDiagnosticValues, value) ? value : "provider_unavailable";
 }
 
 /** A registered Provider kind; deploymentContract.providers holds each one's declaration. */
@@ -28,68 +29,46 @@ export type SandboxProvider = keyof typeof deploymentContract.providers;
 /** Client-generated, never a Core code: a deployment write whose rejection could echo the key and is withheld. */
 export const sandboxConfigurationUnconfirmed = "sandbox_configuration_unconfirmed";
 const sandboxConfigurationParams = new Set<unknown>(["runtime", ...deploymentContract.resources.map(({ name }) => `resources.${name}`)]);
+
+// Generated types keep their schema names in ./generated/core-api; these are the client's names for them.
 /** CPU and MiB limits for each sandbox, not node concurrency. */
-export interface SandboxResources { cpus: number; memory_mib: number; root_disk_mib?: number; environment_disk_mib?: number }
-export interface SandboxRuntimeRelease { source_commit: string; image_id: string; image_manifest_digest: string; microsandbox_ref: string; runtime_sha256: string; firmware_sha256: string }
-export interface SandboxSpecification { resources: SandboxResources; runtime?: SandboxRuntimeRelease }
-/** Core derives the deployment's address from the installation public URL; a `core_url` member is rejected. */
-export interface InitializeSandboxDeployment {
+export type SandboxResources = SandboxResourcesResource;
+export type SandboxRuntimeRelease = RuntimeRelease;
+export type SandboxSpecification = DeploymentSpec;
+export type SandboxRollout = Rollout;
+/** `state` is target preparation, which never invalidates a qualified older serving pin; `ready_generation` is that durable pin and alone does not imply connection readiness. */
+export type SandboxNodeRollout = NodeRollout;
+export type StartSandboxReset = ResetRequest;
+export type SandboxReset = Reset;
+/** `provider_ready` is the last provider report, so combine it with `online`; `diagnostic` is absent while the provider is ready. A `core_url` other than the installation public URL means the node receives no new sandboxes and must be re-added. */
+export type SandboxNode = Node;
+/** A one-time node enrollment command; `enrollment_id` is its public handle, never a credential. */
+export type SandboxEnrollment = SandboxEnrollmentToken;
+/** One node with its host observation and complete UTC buckets of host history. */
+export type SandboxNodeDetail = NodeDetail;
+/** A node's name and sandbox limits, with a retained limit of at least the active one. Under Docker, Core sets the retained limit to the active one. */
+export type SandboxNodeUpdate = NodeUpdate;
+export type SandboxAllocation = NodeAllocation;
+
+// The schema types each Provider's configuration, credential and metadata as free-form objects; the client names E2B's.
+/**
+ * Core derives the deployment's address from the installation public URL; a `core_url` member is rejected.
+ * `expected_generation` is required, zero for first setup. Docker and microsandbox require `resources` and `runtime`;
+ * E2B may omit `resources` to adopt its template build's CPU and memory, and always runs that build.
+ */
+export type InitializeSandboxDeployment = Omit<SandboxDeploymentInput, "provider" | "configuration" | "credential"> & {
   provider: SandboxProvider;
-  /** Required, including zero for first setup; read it from GET before submitting once. */
-  expected_generation: number;
-  /** Required for Docker/microsandbox. E2B may omit it to adopt its validated template build's CPU and memory. */
-  resources?: SandboxResources;
-  /** Required for Docker/microsandbox; E2B uses its fixed template build. */
-  runtime?: SandboxRuntimeRelease;
-  configuration?: { template?: string; api_url?: string; domain?: string };
+  configuration?: SandboxE2BConfiguration;
   /** Write-only. Omission on update preserves the current credential. */
   credential?: { api_key: string };
-}
-export interface UpdateSandboxDeployment extends InitializeSandboxDeployment {}
-export interface SandboxRollout {
-  /** Poll at high frequency only while preparing, independently of old Session retention. */
-  state: "settled" | "preparing";
-  previous_generation_sandboxes: number;
-  nodes: { ready: number; preparing: number; failed: number; update_required: number; unknown: number } | null;
-}
-export interface SandboxNodeRollout {
-  /** Target preparation; unknown/failed/preparing does not invalidate a qualified old serving pin. */
-  state: "ready" | "preparing" | "failed" | "update_required" | "unknown";
-  /** Durable serving pin; this alone does not imply current connection readiness. */
-  ready_generation: number | null;
-  diagnostic?: SandboxNodeDiagnostic;
-}
-export interface StartSandboxReset { expected_generation: number; clear: "auto" | "force"; deadline_seconds?: number }
-export interface SandboxReset {
-  clear: "auto" | "force";
-  requested_at: string;
-  deadline_at: string | null;
-  forced_at: string | null;
-  remaining: {
-    busy: number; idle: number; cleanup: number; on_offline_nodes: number;
-    offline_nodes: Array<{ node_id: string; name: string; resources: number }>;
-  };
-}
-
-export interface SandboxDeployment {
-  rollout: SandboxRollout;
-  specification?: SandboxSpecification;
-  specification_digest?: string;
-  installation_id: string;
+};
+export type UpdateSandboxDeployment = InitializeSandboxDeployment;
+export type SandboxDeployment = Omit<DeploymentView, "provider" | "configuration" | "metadata"> & {
   provider: SandboxProvider | "";
-  /** Read-only: the installation public URL, which nodes and sandboxes use to reach Core. Present before configuration. */
-  readonly core_url: string;
-  reset: SandboxReset | null;
-  owner_epoch: number;
-  generation: number;
-  mode: "nodes" | "direct" | "";
-  resources: { allocations: number; pending: number };
-  configuration?: { template?: string; api_url?: string; domain?: string };
+  configuration?: SandboxE2BConfiguration;
   metadata?: { template_build?: SandboxE2BTemplateBuild };
-  credential_configured: boolean;
-  /** Idle suspension policy; null unless the Provider declares checkpoint support. */
-  suspension: { idle_seconds: number; retention_seconds: number } | null;
-}
+};
+export interface SandboxE2BConfiguration { template?: string; api_url?: string; domain?: string }
 /** The fixed E2B build as Core read it when the selection was saved; unknown values are null. */
 export interface SandboxE2BTemplateBuild {
   status: string | null;
@@ -98,95 +77,15 @@ export interface SandboxE2BTemplateBuild {
 export interface SandboxE2BDiscoveryInput { api_key: string; api_url?: string; domain?: string }
 export interface SandboxE2BTemplate { id: string; names: string[] }
 export interface SandboxE2BReadyBuild { id: string; cpus: number; memory_mib: number }
-export interface SandboxNode {
-  rollout: SandboxNodeRollout;
-  id: string;
-  name: string;
-  provider: string;
-  online: boolean;
-  /** Last provider report; combine with online. Target rollout state is independent of serving readiness. */
-  provider_ready: boolean;
-  /** Absent while the provider is ready. */
-  diagnostic?: SandboxNodeDiagnostic;
-  cpu_count: number | null;
-  available_memory_bytes: number | null;
-  available_disk_bytes: number | null;
-  running: number;
-  snapshots: number;
-  last_seen_at: string | null;
-  max_active: number;
-  max_retained: number;
-  active: number;
-  reserved: number;
-  retained: number;
-  cleanup_pending: number;
-  created_at: string;
-  /** Read-only: the Core address this node enrolled with. When it differs from the installation public URL, the node receives no new sandboxes and must be re-added. */
-  readonly core_url: string;
-  /** Read-only: the `enrollment_id` of the command that registered this node; null for nodes enrolled before Core recorded it. Core always sends the member. */
-  readonly enrollment_id: string | null;
-}
-/** A one-time node enrollment command issued by Core. */
-export interface SandboxEnrollment {
-  /** The one-use secret the node registers with. */
-  token: string;
-  expires_at: string;
-  /** Public, non-secret handle of this command; never a credential. The node it registers reports the same `enrollment_id`. */
-  enrollment_id: string;
-}
-/** The node machine's last heartbeat observation; unavailable measurements are null. */
-export interface SandboxNodeHost {
-  effective_cpu_cores: number | null;
-  /** Busy share of the whole host's CPU between heartbeats, 0–1. */
-  cpu_utilization: number | null;
-  total_memory_bytes: number | null;
-  available_memory_bytes: number | null;
-  available_disk_bytes: number | null;
-  observed_at: string | null;
-}
-export interface SandboxNodeHostPoint {
-  start: string;
-  cpu_utilization_max: number | null;
-  memory_used_bytes_max: number | null;
-  available_disk_bytes_min: number | null;
-}
 export type SandboxNodeHistoryRange = "1h" | "6h" | "24h";
-/** One node with its host observation and complete UTC buckets of host history. */
-export interface SandboxNodeDetail extends SandboxNode {
-  host: SandboxNodeHost;
-  history: { resolution_seconds: number; points: SandboxNodeHostPoint[] };
-}
-/** A node's name and sandbox limits; Core takes all three, with a retained limit of at least the active one. Under Docker, Core sets the retained limit to the active one. */
-export interface SandboxNodeUpdate {
-  name: string;
-  max_active: number;
-  max_retained: number;
-}
-export interface SandboxAllocation {
-  deployment_generation: number;
-  id: string;
-  node_id: string;
-  tenant_id: string;
-  session_id: string;
-  environment_id: string;
-  state: string;
-  compute_phase: string;
-  /** When the allocation entered its current compute_phase, or null when unknown; an allocation that existed before Core recorded it reports null until its next phase change. */
-  compute_phase_changed_at: string | null;
-  diagnostic: SandboxDiagnostic;
-  initialization: string;
-  created_at: string;
-}
+
 function invalidSandboxResponse(): never {
   throw new AgentCoreError("Core returned an invalid sandbox administration response.", 502, "invalid_admin_response");
 }
 
-/**
- * The object has every required member, optional ones only where listed, and nothing else. The projections below
- * follow Core's deployment.View, deployment.Node, deployment.NodeDetail and deployment.NodeAllocation serialization.
- */
-function members(value: unknown, required: readonly string[], optional: readonly string[] = []): Record<string, unknown> {
-  if (!isRecord(value) || !required.every((field) => hasOwn(value, field)) || !onlyFields(value, new Set([...required, ...optional]))) return invalidSandboxResponse();
+/** The object has every required field, optional ones only where the schema lists them, and nothing else. */
+function members(value: unknown, fields: readonly string[], required: readonly string[] = fields): Record<string, unknown> {
+  if (!isRecord(value) || !schemaFields(value, fields, required)) return invalidSandboxResponse();
   return value;
 }
 function valid(condition: boolean): void {
@@ -197,22 +96,20 @@ const measure = (value: unknown) => typeof value === "number" && Number.isFinite
 const nullable = (test: (value: unknown) => boolean) => (value: unknown) => value === null || test(value);
 const strings = (value: Record<string, unknown>, fields: readonly string[]) => fields.every((field) => typeof value[field] === "string");
 
-const modes = new Set(["", "nodes", "direct"]);
-const releaseFields = ["source_commit", "image_id", "image_manifest_digest", "microsandbox_ref", "runtime_sha256", "firmware_sha256"];
 function projectSpecification(value: unknown): SandboxSpecification {
-  const specification = members(value, ["resources"], ["runtime"]);
-  const resources = members(specification.resources, ["cpus", "memory_mib"], ["root_disk_mib", "environment_disk_mib"]);
+  const specification = members(value, deploymentSpecFields, deploymentSpecRequired);
+  const resources = members(specification.resources, sandboxResourcesFields, sandboxResourcesRequired);
   valid(Object.values(resources).every(isNonnegativeInteger));
   if (!hasOwn(specification, "runtime")) return { resources: { ...resources } as unknown as SandboxResources };
-  const runtime = members(specification.runtime, releaseFields);
-  valid(strings(runtime, releaseFields));
+  const runtime = members(specification.runtime, runtimeReleaseFields);
+  valid(strings(runtime, runtimeReleaseFields));
   return { resources: { ...resources } as unknown as SandboxResources, runtime: { ...runtime } as unknown as SandboxRuntimeRelease };
 }
 /** The adapter's public projection has no credential member. */
 function projectE2B(configuration: unknown, metadata: unknown): Pick<SandboxDeployment, "configuration" | "metadata"> {
   const config = members(configuration, ["template", "api_url", "domain"]);
   valid(strings(config, ["template", "api_url", "domain"]));
-  const facts = members(metadata, [], ["template_build"]);
+  const facts = members(metadata, ["template_build"], []);
   if (!hasOwn(facts, "template_build")) return { configuration: { ...config }, metadata: {} };
   const build = members(facts.template_build, ["status", "resources"]);
   const resources = members(build.resources, ["cpus", "memory_mib", "root_disk_mib"]);
@@ -222,16 +119,16 @@ function projectE2B(configuration: unknown, metadata: unknown): Pick<SandboxDepl
 /** Counts and blocker identities are one Core snapshot, never reconstructed from node lists. */
 function projectReset(value: unknown, held: number): SandboxReset | null {
   if (value === null) return null;
-  const reset = members(value, ["clear", "requested_at", "deadline_at", "forced_at", "remaining"]);
-  const remaining = members(reset.remaining, ["busy", "idle", "cleanup", "on_offline_nodes", "offline_nodes"]);
-  valid((reset.clear === "auto" || reset.clear === "force") && timestamp(reset.requested_at) &&
+  const reset = members(value, resetFields);
+  const remaining = members(reset.remaining, resetRemainingFields);
+  valid(isOneOf(resetClearValues, reset.clear) && timestamp(reset.requested_at) &&
     nullable(timestamp)(reset.deadline_at) && nullable(timestamp)(reset.forced_at) &&
     (reset.clear === "auto" ? reset.deadline_at !== null && reset.forced_at === null : reset.forced_at !== null) &&
     [remaining.busy, remaining.idle, remaining.cleanup, remaining.on_offline_nodes].every(isNonnegativeInteger) && Array.isArray(remaining.offline_nodes));
   const nodes = (remaining.offline_nodes as unknown[]).map(value => {
-    const node = members(value, ["node_id", "name", "resources"]);
+    const node = members(value, resetOfflineNodeFields);
     valid(strings(node, ["node_id", "name"]) && node.node_id !== "" && isNonnegativeInteger(node.resources) && Number(node.resources) > 0);
-    return { ...node } as SandboxReset["remaining"]["offline_nodes"][number];
+    return { ...node } as unknown as ResetOfflineNode;
   });
   valid(Number(remaining.busy) + Number(remaining.idle) + Number(remaining.cleanup) === held &&
     Number(remaining.on_offline_nodes) <= held && nodes.reduce((sum, node) => sum + node.resources, 0) === remaining.on_offline_nodes &&
@@ -239,15 +136,15 @@ function projectReset(value: unknown, held: number): SandboxReset | null {
   return { ...reset, remaining: { ...remaining, offline_nodes: nodes } } as unknown as SandboxReset;
 }
 function projectRollout(value: unknown, mode: unknown, held: number): SandboxRollout {
-  const rollout = members(value, ["state", "previous_generation_sandboxes", "nodes"]);
-  valid((rollout.state === "settled" || rollout.state === "preparing") && isNonnegativeInteger(rollout.previous_generation_sandboxes) && Number(rollout.previous_generation_sandboxes) <= held);
-  const nodes = rollout.nodes === null ? null : members(rollout.nodes, ["ready", "preparing", "failed", "update_required", "unknown"]);
+  const rollout = members(value, rolloutFields);
+  valid(isOneOf(rolloutStateValues, rollout.state) && isNonnegativeInteger(rollout.previous_generation_sandboxes) && Number(rollout.previous_generation_sandboxes) <= held);
+  const nodes = rollout.nodes === null ? null : members(rollout.nodes, rolloutNodesFields);
   valid((nodes !== null) === (mode === "nodes") && (nodes === null || Object.values(nodes).every(isNonnegativeInteger)) && (rollout.state === "preparing") === (nodes !== null && Number(nodes.preparing) > 0));
   return { ...rollout, nodes: nodes && { ...nodes } } as unknown as SandboxRollout;
 }
 function projectNodeRollout(value: unknown, online: unknown): SandboxNodeRollout {
-  const rollout = members(value, ["state", "ready_generation"], ["diagnostic"]);
-  valid(["ready", "preparing", "failed", "update_required", "unknown"].includes(rollout.state as string) && nullable(isNonnegativeInteger)(rollout.ready_generation) &&
+  const rollout = members(value, nodeRolloutFields, nodeRolloutRequired);
+  valid(isOneOf(nodeRolloutStateValues, rollout.state) && nullable(isNonnegativeInteger)(rollout.ready_generation) &&
     (online !== false || rollout.state === "unknown") && (rollout.state !== "ready" || rollout.ready_generation !== null) &&
     (rollout.diagnostic === undefined || (typeof rollout.diagnostic === "string" && rollout.diagnostic !== "" && rollout.state === "failed")));
   return { ...rollout, ...(rollout.diagnostic !== undefined ? { diagnostic: normalizeSandboxNodeDiagnostic(rollout.diagnostic as string) } : {}) } as unknown as SandboxNodeRollout;
@@ -255,26 +152,26 @@ function projectNodeRollout(value: unknown, online: unknown): SandboxNodeRollout
 /** Configured deployments carry a validated public configuration and observation object. */
 function projectDeployment(value: unknown): SandboxDeployment {
   const e2b = isRecord(value) && value.provider === "e2b";
-  const fields = ["installation_id", "provider", "core_url", "reset", "rollout", "owner_epoch", "generation", "mode", "resources", "suspension", "credential_configured"];
-  const deployment = members(value, isRecord(value) && value.provider !== "" ? [...fields, "configuration", "metadata"] : fields, ["specification", "specification_digest"]);
+  // A selected Provider always has its configuration and metadata; no Provider has neither.
+  const selected = isRecord(value) && value.provider !== "";
+  const deployment = members(value, deploymentViewFields, selected ? [...deploymentViewRequired, "configuration", "metadata"] : deploymentViewRequired);
+  valid(selected || (!hasOwn(deployment, "configuration") && !hasOwn(deployment, "metadata")));
   valid(typeof deployment.credential_configured === "boolean");
   if (!e2b && deployment.provider !== "") { members(deployment.configuration, []); members(deployment.metadata, []); valid(deployment.credential_configured === false); }
-  const resources = members(deployment.resources, ["allocations", "pending"]);
-  const suspension = deployment.suspension === null ? null : members(deployment.suspension, ["idle_seconds", "retention_seconds"]);
+  const resources = members(deployment.resources, deploymentResourcesFields);
+  const suspension = deployment.suspension === null ? null : members(deployment.suspension, suspensionFields);
   const configured = hasOwn(deployment, "specification");
-  valid(strings(deployment, ["installation_id", "core_url"]) && (deployment.provider === "" || (typeof deployment.provider === "string" && hasOwn(deploymentContract.providers, deployment.provider))) && modes.has(deployment.mode as string) &&
+  valid(strings(deployment, ["installation_id", "core_url"]) && (deployment.provider === "" || (typeof deployment.provider === "string" && hasOwn(deploymentContract.providers, deployment.provider))) && isOneOf(deploymentViewModeValues, deployment.mode) &&
     [deployment.owner_epoch, deployment.generation, resources.allocations, resources.pending].every(isNonnegativeInteger) &&
     (suspension === null || [suspension.idle_seconds, suspension.retention_seconds].every(isNonnegativeInteger)) &&
     configured === hasOwn(deployment, "specification_digest") && (!configured || (typeof deployment.specification_digest === "string" && deployment.specification_digest !== "")));
   return {
-    ...deployment, rollout: projectRollout(deployment.rollout, deployment.mode, Number(resources.allocations) + Number(resources.pending)), reset: projectReset(deployment.reset, Number(resources.allocations) + Number(resources.pending)), resources: { ...resources } as SandboxDeployment["resources"], suspension: suspension && { ...suspension } as SandboxDeployment["suspension"],
+    ...deployment, rollout: projectRollout(deployment.rollout, deployment.mode, Number(resources.allocations) + Number(resources.pending)), reset: projectReset(deployment.reset, Number(resources.allocations) + Number(resources.pending)), resources: { ...resources } as unknown as SandboxDeployment["resources"], suspension: suspension && { ...suspension } as unknown as SandboxDeployment["suspension"],
     ...(configured ? { specification: projectSpecification(deployment.specification) } : {}),
     ...(e2b ? projectE2B(deployment.configuration, deployment.metadata) : {}),
   } as unknown as SandboxDeployment;
 }
 
-const nodeFields = ["rollout", "id", "name", "provider", "online", "provider_ready", "cpu_count", "available_memory_bytes", "available_disk_bytes", "running", "snapshots",
-  "last_seen_at", "max_active", "max_retained", "active", "reserved", "retained", "cleanup_pending", "created_at", "core_url", "enrollment_id"];
 /** Core omits an empty `diagnostic`, so a present one is a code; an unknown code reads as provider_unavailable. */
 function projectNode(node: Record<string, unknown>): SandboxNode {
   const { diagnostic, rollout, ...rest } = node;
@@ -288,35 +185,34 @@ function projectNode(node: Record<string, unknown>): SandboxNode {
   return { ...fields, diagnostic: normalizeSandboxNodeDiagnostic(diagnostic as string) } as unknown as SandboxNode;
 }
 function projectNodeList(value: unknown): { data: SandboxNode[] } {
-  const list = members(value, ["data"]);
+  const list = members(value, sandboxNodeListFields);
   valid(Array.isArray(list.data));
-  return { data: (list.data as unknown[]).map((entry) => projectNode(members(entry, nodeFields, ["diagnostic"]))) };
+  return { data: (list.data as unknown[]).map((entry) => projectNode(members(entry, nodeFields, nodeRequired))) };
 }
 /** A never-observed host is all null; the history lists every bucket of the range. */
 function projectNodeDetail(value: unknown, nodeId: string): SandboxNodeDetail {
-  const { host, history, ...fields } = members(value, [...nodeFields, "host", "history"], ["diagnostic"]);
+  const { host, history, ...fields } = members(value, nodeDetailFields, nodeDetailRequired);
   const node = projectNode(fields);
-  const observed = members(host, ["effective_cpu_cores", "cpu_utilization", "total_memory_bytes", "available_memory_bytes", "available_disk_bytes", "observed_at"]);
-  const buckets = members(history, ["resolution_seconds", "points"]);
+  const observed = members(host, nodeHostFields);
+  const buckets = members(history, hostHistoryFields);
   valid(sameResourceId(node.id, nodeId) && [observed.effective_cpu_cores, observed.cpu_utilization].every(nullable(measure)) &&
     [observed.total_memory_bytes, observed.available_memory_bytes, observed.available_disk_bytes].every(nullable(isNonnegativeInteger)) &&
     nullable(timestamp)(observed.observed_at) && isNonnegativeInteger(buckets.resolution_seconds) && buckets.resolution_seconds > 0 && Array.isArray(buckets.points));
   const points = (buckets.points as unknown[]).map((entry) => {
-    const point = members(entry, ["start", "cpu_utilization_max", "memory_used_bytes_max", "available_disk_bytes_min"]);
+    const point = members(entry, hostHistoryPointFields);
     valid(timestamp(point.start) && nullable(measure)(point.cpu_utilization_max) && [point.memory_used_bytes_max, point.available_disk_bytes_min].every(nullable(isNonnegativeInteger)));
-    return { ...point } as unknown as SandboxNodeHostPoint;
+    return { ...point } as unknown as HostHistoryPoint;
   });
-  return { ...node, host: { ...observed } as unknown as SandboxNodeHost, history: { resolution_seconds: buckets.resolution_seconds as number, points } };
+  return { ...node, host: { ...observed } as unknown as NodeHost, history: { resolution_seconds: buckets.resolution_seconds as number, points } };
 }
 
-const allocationFields = ["id", "node_id", "tenant_id", "session_id", "environment_id", "state", "compute_phase", "initialization", "diagnostic"];
-const allocationDiagnostics = new Set(["", "node_unavailable", "resource_missing", "compute_unconfirmed", "ownership_mismatch", "provider_unavailable"]);
+const allocationStrings = ["id", "node_id", "tenant_id", "session_id", "environment_id", "state", "compute_phase", "initialization", "diagnostic"];
 function projectAllocations(value: unknown, nodeId: string): { data: SandboxAllocation[] } {
-  const list = members(value, ["data"]);
+  const list = members(value, sandboxAllocationListFields);
   valid(Array.isArray(list.data));
   return { data: (list.data as unknown[]).map((entry) => {
-    const allocation = members(entry, [...allocationFields, "deployment_generation", "compute_phase_changed_at", "created_at"]);
-    valid(isNonnegativeInteger(allocation.deployment_generation) && strings(allocation, allocationFields) && sameResourceId(allocation.node_id as string, nodeId) && allocationDiagnostics.has(allocation.diagnostic as string) &&
+    const allocation = members(entry, nodeAllocationFields);
+    valid(isNonnegativeInteger(allocation.deployment_generation) && strings(allocation, allocationStrings) && sameResourceId(allocation.node_id as string, nodeId) && isOneOf(nodeAllocationDiagnosticValues, allocation.diagnostic) &&
       nullable(timestamp)(allocation.compute_phase_changed_at) && timestamp(allocation.created_at));
     return { ...allocation } as unknown as SandboxAllocation;
   }) };
diff --git a/packages/agents-client/src/session-diagnostics.ts b/packages/agents-client/src/session-diagnostics.ts
index c8af4468e..f2793ca82 100644
--- a/packages/agents-client/src/session-diagnostics.ts
+++ b/packages/agents-client/src/session-diagnostics.ts
@@ -1,27 +1,35 @@
-import { canonicalUuid, exactFields, isRecord, sameResourceId } from "./response-projection";
+import { canonicalUuid, exactFields, isOneOf, isRecord, sameResourceId } from "./response-projection";
 import { invalidAdminResponse } from "./admin-projection";
+import { turnStatusResourceValues } from "./generated/public-api";
+import {
+  diagnosticFailureFields, itemDiagnosticTimingFields, sessionDiagnosticFailureFields, sessionDiagnosticFailureRequired,
+  sessionDiagnosticFailureSourceValues, sessionDiagnosticsFields, sessionDiagnosticsStatusValues, turnDiagnosticsFields,
+  type DiagnosticFailure as DiagnosticFailureResource, type DiagnosticFailureCode, type ItemDiagnosticTiming,
+  type SessionDiagnosticFailure as SessionDiagnosticFailureResource, type SessionDiagnostics as SessionDiagnosticsResource,
+  type TurnDiagnostics as TurnDiagnosticsResource,
+} from "./generated/core-api";
 
-export type NativeFailureCode = "authentication_error" | "rate_limit_exceeded" | "usage_limit_exceeded" | "server_overloaded" | "server_error" | "invalid_request" | "resource_not_found" | "request_timeout" | "context_length_exceeded" | "cyber_policy" | "connection_failed";
-export type DiagnosticFailureCode = NativeFailureCode | "harness_error" | "model_provider_required" | "runtime_unavailable" | "runtime_disconnected" | "runtime_preparation_failed" | "execution_interrupted" | "delivery_unconfirmed" | "input_rejected" | "executor_protocol_error" | "core_storage_failed" | "internal_error" | "environment_connection_timeout" | "environment_unavailable" | "environment_provisioning_failed";
+// ItemDiagnosticTiming holds Core receipt intervals, distinct from the public tool-reported duration_ms.
+export type { DiagnosticFailureCode, ItemDiagnosticTiming };
+// The schema types params as a free-form object; each code that carries params has one of these shapes.
 export type ProvisioningFailureParams = { step: "setup" | "python" | "npm" | "system" | "file" | "skill" | null; index: number | null; exit_code: number | null };
 export type ConnectionFailureParams = { http_status: number | null };
-export type DiagnosticFailure = { code: DiagnosticFailureCode; params: Record<string, never> | ProvisioningFailureParams | ConnectionFailureParams; failed_at: string | null };
-export type SessionDiagnosticFailure = DiagnosticFailure & { source: "turn" | "environment" | "environment_input"; turn_id?: string };
-export type SessionDiagnostics = { object: "core.session_diagnostics"; session_id: string; status: "idle" | "in_progress" | "requires_action" | "failed"; failure: SessionDiagnosticFailure | null };
-/** Core receipt intervals, distinct from the public tool-reported duration_ms. */
-export type ItemDiagnosticTiming = { item_id: string; started_at: string; completed_at: string | null; observed_duration_ms: number | null };
-export type TurnDiagnostics = { object: "core.turn_diagnostics"; session_id: string; turn_id: string; status: string; failure: DiagnosticFailure | null; items: ItemDiagnosticTiming[]; items_truncated: boolean };
+export type DiagnosticFailure = Omit<DiagnosticFailureResource, "params"> & { params: Record<string, never> | ProvisioningFailureParams | ConnectionFailureParams };
+export type SessionDiagnosticFailure = DiagnosticFailure & Pick<SessionDiagnosticFailureResource, "source" | "turn_id">;
+export type SessionDiagnostics = Omit<SessionDiagnosticsResource, "failure"> & { failure: SessionDiagnosticFailure | null };
+export type TurnDiagnostics = Omit<TurnDiagnosticsResource, "failure"> & { failure: DiagnosticFailure | null };
 
-const turnCodes = new Set(["authentication_error", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "invalid_request", "resource_not_found", "request_timeout", "context_length_exceeded", "cyber_policy", "connection_failed", "harness_error", "model_provider_required", "runtime_unavailable", "runtime_disconnected", "runtime_preparation_failed", "execution_interrupted", "delivery_unconfirmed", "input_rejected", "executor_protocol_error", "core_storage_failed", "internal_error"]);
-const inputCodes = new Set(["environment_connection_timeout", "environment_unavailable", "model_provider_required", "internal_error"]);
-const turnStatuses = new Set(["queued", "in_progress", "waiting", "completed", "failed", "cancelled"]);
+// The schema's one code enum covers every failure source; each source produces only its subset.
+const turnCodes: readonly DiagnosticFailureCode[] = ["authentication_error", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "invalid_request", "resource_not_found", "request_timeout", "context_length_exceeded", "cyber_policy", "connection_failed", "harness_error", "model_provider_required", "runtime_unavailable", "runtime_disconnected", "runtime_preparation_failed", "execution_interrupted", "delivery_unconfirmed", "input_rejected", "executor_protocol_error", "core_storage_failed", "internal_error"];
+const inputCodes: readonly DiagnosticFailureCode[] = ["environment_connection_timeout", "environment_unavailable", "model_provider_required", "internal_error"];
+const environmentCodes: readonly DiagnosticFailureCode[] = ["environment_provisioning_failed"];
 const fields = (...values: string[]) => new Set(values);
 function timestamp(value: unknown): value is string {
   return typeof value === "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,9})?(?:Z|[+-]\d{2}:\d{2})$/u.test(value) && Number.isFinite(Date.parse(value));
 }
-function failure(value: unknown, codes: Set<string>, session = false): DiagnosticFailure {
-  if (!isRecord(value) || !exactFields(value, fields("code", "params", "failed_at", ...(session ? ["source", ...(value.source === "turn" ? ["turn_id"] : [])] : []))) ||
-      typeof value.code !== "string" || !codes.has(value.code) || !isRecord(value.params) || (value.failed_at !== null && !timestamp(value.failed_at))) return invalidAdminResponse();
+function failure(value: unknown, codes: readonly DiagnosticFailureCode[], session = false): DiagnosticFailure {
+  if (!isRecord(value) || !exactFields(value, !session ? diagnosticFailureFields : value.source === "turn" ? sessionDiagnosticFailureFields : sessionDiagnosticFailureRequired) ||
+      !isOneOf(codes, value.code) || !isRecord(value.params) || (value.failed_at !== null && !timestamp(value.failed_at))) return invalidAdminResponse();
   let params: DiagnosticFailure["params"] = {};
   if (value.code === "environment_provisioning_failed") {
     const p = value.params;
@@ -34,40 +42,40 @@ function failure(value: unknown, codes: Set<string>, session = false): Diagnosti
     if (!exactFields(p, fields("http_status")) || (p.http_status !== null && (!Number.isSafeInteger(p.http_status) || (p.http_status as number) < 100 || (p.http_status as number) > 599))) return invalidAdminResponse();
     params = { http_status: p.http_status as number | null };
   } else if (Object.keys(value.params).length !== 0) return invalidAdminResponse();
-  return { code: value.code as DiagnosticFailureCode, params, failed_at: value.failed_at as string | null };
+  return { code: value.code, params, failed_at: value.failed_at as string | null };
 }
 
 export function projectSessionDiagnostics(value: unknown, sessionId: string): SessionDiagnostics {
-  if (!isRecord(value) || !exactFields(value, fields("object", "session_id", "status", "failure")) || value.object !== "core.session_diagnostics" ||
-      canonicalUuid(value.session_id) === null || !sameResourceId(value.session_id as string, sessionId) || typeof value.status !== "string" || !["idle", "in_progress", "requires_action", "failed"].includes(value.status)) return invalidAdminResponse();
+  if (!isRecord(value) || !exactFields(value, sessionDiagnosticsFields) || value.object !== "core.session_diagnostics" ||
+      canonicalUuid(value.session_id) === null || !sameResourceId(value.session_id as string, sessionId) || !isOneOf(sessionDiagnosticsStatusValues, value.status)) return invalidAdminResponse();
   let projected: SessionDiagnosticFailure | null = null;
   if (value.status === "failed") {
-    if (!isRecord(value.failure) || typeof value.failure.source !== "string" || !["turn", "environment", "environment_input"].includes(value.failure.source)) return invalidAdminResponse();
+    if (!isRecord(value.failure) || !isOneOf(sessionDiagnosticFailureSourceValues, value.failure.source)) return invalidAdminResponse();
     const f = value.failure;
-    const source = f.source as SessionDiagnosticFailure["source"];
-    projected = { ...failure(f, source === "turn" ? turnCodes : source === "environment_input" ? inputCodes : new Set(["environment_provisioning_failed"]), true), source };
+    const source = value.failure.source;
+    projected = { ...failure(f, source === "turn" ? turnCodes : source === "environment_input" ? inputCodes : environmentCodes, true), source };
     if (source === "turn") {
       if (canonicalUuid(f.turn_id) === null) return invalidAdminResponse();
       projected.turn_id = f.turn_id as string;
     }
   } else if (value.failure !== null) return invalidAdminResponse();
-  return { object: "core.session_diagnostics", session_id: value.session_id as string, status: value.status as SessionDiagnostics["status"], failure: projected };
+  return { object: "core.session_diagnostics", session_id: value.session_id as string, status: value.status, failure: projected };
 }
 
 export function projectTurnDiagnostics(value: unknown, sessionId: string, turnId: string): TurnDiagnostics {
-  if (!isRecord(value) || !exactFields(value, fields("object", "session_id", "turn_id", "status", "failure", "items", "items_truncated")) || value.object !== "core.turn_diagnostics" ||
+  if (!isRecord(value) || !exactFields(value, turnDiagnosticsFields) || value.object !== "core.turn_diagnostics" ||
       canonicalUuid(value.session_id) === null || !sameResourceId(value.session_id as string, sessionId) || canonicalUuid(value.turn_id) === null || !sameResourceId(value.turn_id as string, turnId) ||
-      typeof value.status !== "string" || !turnStatuses.has(value.status) || !Array.isArray(value.items) || value.items.length > 1000 || typeof value.items_truncated !== "boolean" || (value.items_truncated && value.items.length !== 1000)) return invalidAdminResponse();
+      !isOneOf(turnStatusResourceValues, value.status) || !Array.isArray(value.items) || value.items.length > 1000 || typeof value.items_truncated !== "boolean" || (value.items_truncated && value.items.length !== 1000)) return invalidAdminResponse();
   const projected = value.status === "failed" ? failure(value.failure, turnCodes) : null;
   if (value.status !== "failed" && value.failure !== null) return invalidAdminResponse();
   const seen = new Set<string>();
   const items: ItemDiagnosticTiming[] = value.items.map((item: unknown) => {
-    if (!isRecord(item) || !exactFields(item, fields("item_id", "started_at", "completed_at", "observed_duration_ms")) || canonicalUuid(item.item_id) === null || !timestamp(item.started_at) ||
+    if (!isRecord(item) || !exactFields(item, itemDiagnosticTimingFields) || canonicalUuid(item.item_id) === null || !timestamp(item.started_at) ||
         (item.completed_at !== null && !timestamp(item.completed_at)) || (item.completed_at === null ? item.observed_duration_ms !== null : !Number.isSafeInteger(item.observed_duration_ms))) return invalidAdminResponse();
     const id = canonicalUuid(item.item_id)!;
     if (seen.has(id)) return invalidAdminResponse();
     seen.add(id);
     return { item_id: item.item_id as string, started_at: item.started_at, completed_at: item.completed_at as string | null, observed_duration_ms: item.observed_duration_ms as number | null };
   });
-  return { object: "core.turn_diagnostics", session_id: value.session_id as string, turn_id: value.turn_id as string, status: value.status as string, failure: projected, items, items_truncated: value.items_truncated };
+  return { object: "core.turn_diagnostics", session_id: value.session_id as string, turn_id: value.turn_id as string, status: value.status, failure: projected, items, items_truncated: value.items_truncated };
 }
diff --git a/packages/agents-client/src/types.ts b/packages/agents-client/src/types.ts
index 56a9b0f89..c9e056007 100644
--- a/packages/agents-client/src/types.ts
+++ b/packages/agents-client/src/types.ts
@@ -11,7 +11,7 @@ import type {
   PersistedAgentToolConfigParamToolSearch, PersistedAgentToolConfigParamWebSearch, ReasoningEffortResource,
   ReasoningParam, ReasoningResource, ReasoningSummaryResource, RotateVaultCredentialAuthParamStaticBearer,
   RotateVaultCredentialParams, ServiceTierResource, SessionEnvironmentStateResource, SessionEnvironmentStatusResource,
-  SessionErrorResource, SessionInputParam, SessionInputParamAgentSessionInputCancel,
+  SessionArtifactResource, SessionErrorResource, SessionInputParam, SessionInputParamAgentSessionInputCancel,
   SessionInputParamAgentSessionInputMessage, SessionInputParamAgentSessionInputToolResult,
   SessionRequiredActionResource, SessionRequiredActionResourceEnvironmentConnection,
   SessionRequiredActionResourceFunctionCall, SessionStatusResource, SkillResource, SkillVersionResource,
@@ -19,6 +19,10 @@ import type {
   VaultCredentialAuthResourceMcpOauth, VaultCredentialAuthResourceStaticBearer, VaultCredentialResource,
   VaultResource, VaultStatusParam, WebSearchLocationParam,
 } from "./generated/public-api";
+import type {
+  CoreHarness as CoreHarnessResource, ModelConfigurationSupport as ModelConfigurationSupportResource, RuntimeCPUObservation,
+  RuntimeMemoryObservation, RuntimeObservationLifecycleState, RuntimeObservationReason,
+} from "./generated/core-api";
 
 // Generated types keep their schema names in ./generated/public-api; these are the client's names for them.
 export type PageOrder = ListOrderParam;
@@ -468,6 +472,8 @@ export type SkillDeleted = DeletedSkillResource;
 /** Deleting the only remaining version also deletes its Skill. */
 export type SkillVersionDeleted = DeletedSkillVersionResource;
 
+export type SessionArtifact = SessionArtifactResource;
+
 /** Skill lists accept 0 through 100 entries; `after` is a Skill ID, or a version resource ID for version lists. */
 export type SkillListOptions = PageOptions;
 
@@ -776,29 +782,14 @@ export interface CreateSessionStreamOptions extends StreamOptions {
   onSession: (session: AgentSession) => void;
 }
 
-export type RuntimeObservationStatus = "observed" | "unsupported" | "unavailable";
-export type RuntimeLifecycleState = "active" | "sleeping" | "transitioning" | "pending" | "stopped";
-export type RuntimeObservationReason =
-  | "runtime_mode_not_observable"
-  | "allocation_pending"
-  | "runtime_not_running"
-  | "sample_timeout"
-  | "sample_unavailable";
+// Generated /core/v1 types keep their schema names in ./generated/core-api.
+export type {
+  HarnessModelConfiguration, RuntimeCPUObservation, RuntimeHistory, RuntimeMemoryObservation, RuntimeObservationReason, SessionExecutionConfiguration,
+} from "./generated/core-api";
 
 export type RuntimeUnavailableReason = Exclude<RuntimeObservationReason, "runtime_mode_not_observable">;
 
-export interface RuntimeCPUObservation {
-  usage_seconds_total: number | null;
-  capacity_cores: number | null;
-  usage_cores: number | null;
-  utilization_ratio: number | null;
-}
-
-export interface RuntimeMemoryObservation {
-  usage_bytes: number | null;
-  limit_bytes: number | null;
-}
-
+// The schema's flat observation cannot state each mode's null rules; this union does, and the client validates them.
 interface RuntimeObservationBase {
   id: string;
   object: "agent.runtime_observation";
@@ -816,7 +807,7 @@ export interface RuntimeObservedObservation extends RuntimeObservationBase {
     device_id: string | null;
     connection_generation: null;
   };
-  lifecycle_state: RuntimeLifecycleState;
+  lifecycle_state: RuntimeObservationLifecycleState;
   status: "observed";
   reason: null;
   allocation_created_at: number | null;
@@ -836,7 +827,7 @@ export interface RuntimeUnavailableObservation extends RuntimeObservationBase {
     device_id: string | null;
     connection_generation: null;
   };
-  lifecycle_state: RuntimeLifecycleState;
+  lifecycle_state: RuntimeObservationLifecycleState;
   status: "unavailable";
   reason: RuntimeUnavailableReason;
   allocation_created_at: number | null;
@@ -896,83 +887,9 @@ export interface RuntimeHistoryQuery extends ReadOptions {
   maxPoints?: number;
 }
 
-export interface RuntimeHistoryRange {
-  start: number;
-  end: number;
-}
-
-export interface RuntimeHistoryCoveragePoint {
-  start: number;
-  end: number;
-  first_observed_at: number | null;
-  last_observed_at: number | null;
-  observation_count: number;
-  observed_count: number;
-  unavailable_count: number;
-}
-
-export interface RuntimeHistoryCPU {
-  contributor_count: number;
-  utilization_ratio: number | null;
-  capacity_cores: number | null;
-}
-
-export interface RuntimeHistoryMemory {
-  contributor_count: number;
-  usage_bytes: number | null;
-  limit_bytes: number | null;
-}
-
-export interface RuntimeHistoryPoint extends RuntimeHistoryCoveragePoint {
-  cpu: RuntimeHistoryCPU | null;
-  memory: RuntimeHistoryMemory | null;
-}
-
-export interface RuntimeHistorySeries {
-  environment_id: string;
-  allocation_id: string;
-  /** Earliest retained provider start estimate for compatible uptime display. */
-  started_at: RuntimeHistoryTime;
-  provider_type: string;
-  points: RuntimeHistoryPoint[];
-}
-
-export interface RuntimeHistoryTime {
-  seconds: number;
-  nanoseconds: number;
-}
-
-export interface RuntimeHistoryCoverage {
-  retained_start: number;
-  first_sample_at: number | null;
-  last_sample_at: number | null;
-  sample_count: number;
-  expected_sample_count: number;
-  buckets: RuntimeHistoryCoveragePoint[];
-}
-
-export interface RuntimeHistoryTokenUsagePoint {
-  start: number;
-  end: number;
-  sampled_at: number;
-  input_tokens: number;
-  output_tokens: number;
-}
-
-export interface RuntimeHistory {
-  object: "agent.runtime_history";
-  source: "durable";
-  session_id: string;
-  requested_range: RuntimeHistoryRange;
-  resolution_seconds: number;
-  generated_at: number;
-  coverage: RuntimeHistoryCoverage;
-  series: RuntimeHistorySeries[];
-  token_usage: RuntimeHistoryTokenUsagePoint[];
-}
-
 export type { CoreHarnessKind, ModelProviderProtocol } from "./harness-catalog";
 
+// The model provider shapes keep `never` guards so an input and a view can never be mistaken for each other.
 /** A complete replacement bundle. API keys are write-only. */
 export interface ModelProviderInput {
   protocol: ModelProviderProtocol;
@@ -992,9 +909,6 @@ export interface ModelProviderView {
   api_key?: never;
 }
 
-/** A harness's deployment default model provider in Core. The key is never returned. */
-export type ProviderObservationErrorCode = "authentication_error" | "connection_failed" | "rate_limit_exceeded" | "usage_limit_exceeded" | "server_overloaded" | "server_error" | "resource_not_found" | "request_timeout" | "invalid_request";
-
 /** Native model parameters validated by the selected harness. An empty object clears them. */
 export type HarnessConfig = Record<string, unknown>;
 
@@ -1010,35 +924,15 @@ export interface ModelConfigurationView {
   harness_config: HarnessConfig;
 }
 
-export interface HarnessModelConfiguration extends ModelConfigurationView {
-  last_used_at: string | null;
-  last_error_code: ProviderObservationErrorCode | null;
-  last_error_at: string | null;
-  object: "core.model_configuration";
-  harness: CoreHarnessKind;
-  updated_at: string;
-}
-
-/** Adapter build support, independent of runtime readiness or model availability. */
-export interface ModelConfigurationSupport {
-  /** Ordered supported native protocols; the first is the default. */
-  protocols: ModelProviderInput["protocol"][];
-  accepts_harness_config: boolean;
-  token_limits_required: boolean;
-}
+// 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[] };
 
 /**
  * A harness this Core build supports. `enabled` and `default` are read-only views of
  * the process configuration; `model_configuration` is the deployment default, or null.
  */
-export interface CoreHarness {
-  object: "core.harness";
-  id: CoreHarnessKind;
-  enabled: boolean;
-  default: boolean;
-  model_configuration: HarnessModelConfiguration | null;
-  model_configuration_support: ModelConfigurationSupport;
-}
+export type CoreHarness = Omit<CoreHarnessResource, "model_configuration_support"> & { model_configuration_support: ModelConfigurationSupport };
 
 /** Native parameter inheritance follows the extension contract; null provider clears it. */
 export interface SavedAgentCoreInput {
@@ -1055,23 +949,6 @@ export interface SavedAgentCore {
 
 export type AgentsCoreSelection = AgentsCore;
 
-export type ExecutionConfigurationSource = "session" | "agent" | "deployment" | "unknown";
-
-/** Immutable committed selections, not live execution health. */
-export interface SessionExecutionConfiguration {
-  object: "agent.session.execution_configuration";
-  schema_version: 1;
-  session_id: string;
-  model: { value: string | null; source: ExecutionConfigurationSource };
-  harness: { value: string | null; source: ExecutionConfigurationSource };
-  harness_config: { value: HarnessConfig; source: ExecutionConfigurationSource };
-  model_provider: {
-    source: ExecutionConfigurationSource;
-    status: "available" | "redacted" | "unavailable";
-    configuration: ModelProviderView | null;
-  };
-}
-
 export interface AgentCore {
   listAgents(options?: PageOptions): Promise<ListPage<SavedAgent>>;
   createAgent(input: CreateAgentInput): Promise<SavedAgent>;
diff --git a/scripts/generate-public-api.py b/scripts/generate-public-api.py
index f6b778cab..8b92496ff 100644
--- a/scripts/generate-public-api.py
+++ b/scripts/generate-public-api.py
@@ -12,6 +12,7 @@
 CONTRACT = ROOT / 'contracts/agents-api'
 SHAPES = ROOT / 'services/core/internal/api/official_shapes.gen.go'
 CLIENT_TYPES = ROOT / 'packages/agents-client/src/generated/public-api.ts'
+CORE_CLIENT_TYPES = ROOT / 'packages/agents-client/src/generated/core-api.ts'
 # Agent configuration request bodies checked by Core's shape walker.
 REQUEST_SHAPES = ('CreateAgentParams', 'UpdateAgentParams', 'SessionAgentConfigParam')
 HTTP_METHODS = {'get', 'post', 'put', 'patch', 'delete', 'head', 'options'}
@@ -350,16 +351,16 @@ def ts_type(schema):
     return {'string': 'string', 'integer': 'number', 'number': 'number', 'boolean': 'boolean', 'null': 'null'}.get(kind, 'unknown')
 
 
-def ts_module(schemas, source):
+def ts_module(schemas, source, header=()):
     """Project parsed schemas (OpenAPI components.schemas or Swagger definitions) onto TypeScript.
 
     Each enum X gets xValues; each object X gets xFields, plus xRequired when some
     fields are optional; each discriminated union X maps its tags to the variants'
-    field names in xFields.
+    field names in xFields. Header lines follow the generated-file notice.
     """
     if len({ts_name(name) for name in schemas}) != len(schemas):
         raise ValueError('TypeScript names collide')
-    lines = [f'// Code generated by scripts/generate-public-api.py from {source}; DO NOT EDIT.', '']
+    lines = [f'// Code generated by scripts/generate-public-api.py from {source}; DO NOT EDIT.', *header, '']
     unions = []
     for name, schema in sorted(schemas.items(), key=lambda item: ts_name(item[0])):
         typ = ts_name(name)
@@ -381,6 +382,44 @@ def ts_module(schemas, source):
     return ('\n'.join(lines + unions) + '\n').encode()
 
 
+def core_module(document, public, bindings):
+    """Project the Swagger definitions the Core document's paths reach onto TypeScript beside the public types.
+
+    The v1 types the public schema owns are imported under their public names. A
+    name that collides once ts_name strips the Go package keeps the package as a
+    prefix, and each inline enum becomes a definition named after its owner and
+    field, so that it gets its values.
+    """
+    definitions, names, refs = document['definitions'], {}, re.compile(r'"#/definitions/([^"]+)"')
+    for name in definitions:
+        sources = bindings.get(name.removeprefix('v1.'), {}).get('sources', [])
+        if name in public:
+            names[name] = ts_name(name)
+        elif name.startswith('v1.') and len(sources) == 1 and sources[0].split('/')[-1] in public:
+            names[name] = ts_name(sources[0])
+    imported, local, pending = set(names.values()), [], [document['paths']]
+    while pending:
+        for ref in refs.findall(json.dumps(pending.pop())):
+            if ref not in names and ref not in local:
+                local.append(ref)
+                pending.append(definitions[ref])
+    taken = [ts_name(name) for name in local] + list(imported)
+    for name in local:
+        names[name] = ts_name(name) if taken.count(ts_name(name)) == 1 else name.split('.')[0].capitalize() + ts_name(name)
+    schemas = {}
+    for name in local:
+        schema = schemas[names[name]] = json.loads(refs.sub(lambda ref: f'"#/definitions/{names[ref[1]]}"', json.dumps(definitions[name])))
+        for field, member in schema.get('properties', {}).items():
+            target = member.get('items', member)
+            if len(target.get('enum', [])) > 1:
+                enum = names[name] + ''.join(part.capitalize() for part in field.split('_'))
+                schemas[enum] = {'type': target.pop('type'), 'enum': target.pop('enum')}
+                target['$ref'] = '#/definitions/' + enum
+    used = sorted(imported.intersection(refs.findall(json.dumps(schemas))))
+    header = ['import type { ' + ', '.join(used) + ' } from "./public-api";'] if used else []
+    return ts_module(schemas, 'contracts/agents-api/core.openapi.yaml', header)
+
+
 def write(path, data, check):
     if check:
         if not path.exists() or path.read_bytes() != data:
@@ -395,7 +434,10 @@ def main():
     stage = parser.add_mutually_exclusive_group(required=True)
     stage.add_argument('--swag-roots', type=Path, help='Temporary entry points for Go-owned extension types')
     stage.add_argument('--extensions', type=Path, help='JSON definitions projected from Core extension types')
+    parser.add_argument('--core', type=Path, help='The /core/v1 document as JSON, required with --extensions')
     args = parser.parse_args()
+    if args.extensions and not args.core:
+        parser.error('--extensions requires --core')
     source, pin = read_source()
     bindings = json.loads((CONTRACT / 'go-bindings.json').read_text())
     owners = extension_owners(bindings)
@@ -409,6 +451,7 @@ def main():
         # JSON is a YAML subset and keeps generation independent of PyYAML.
         write(CONTRACT / 'openapi.yaml', (json.dumps(doc, indent=2, ensure_ascii=False) + '\n').encode(), args.check)
         write(CLIENT_TYPES, ts_module(doc['components']['schemas'], 'contracts/agents-api/openapi.yaml'), args.check)
+        write(CORE_CLIENT_TYPES, core_module(json.loads(args.core.read_text()), doc['components']['schemas'], bindings), args.check)
         routes = sorted(method.upper() + ' ' + re.sub(r'\{[^}]*\}', '{}', path) for path, item in doc['paths'].items() for method in item if method in HTTP_METHODS)
         write(CONTRACT / 'upstream-routes.json', (json.dumps({'openapi_commit': pin['openapi']['commit'], 'generator': 'scripts/generate-public-api.py', 'routes': routes}, indent=2) + '\n').encode(), args.check)
 
diff --git a/scripts/generate-public-api.test.py b/scripts/generate-public-api.test.py
index 83d346df1..ca05c253b 100644
--- a/scripts/generate-public-api.test.py
+++ b/scripts/generate-public-api.test.py
@@ -112,6 +112,28 @@ def test_client_types_project_values_fields_and_unions(self):
         ):
             self.assertIn(line, generated)
 
+    def test_core_types_import_public_names_and_hoist_inline_enums(self):
+        ref = '#/definitions/'
+        document = {'paths': {'/things': {'get': {'responses': {'200': {'schema': {'$ref': ref + 'api.Thing'}}}}}}, 'definitions': {
+            'api.Thing': {'type': 'object', 'required': ['color'], 'properties': {
+                'color': {'type': 'string', 'enum': ['red', 'blue']}, 'tags': {'type': 'array', 'items': {'type': 'string', 'enum': ['a', 'b']}},
+                'shared': {'$ref': ref + 'v1.Shared'}, 'first': {'$ref': ref + 'one.Page'}, 'second': {'$ref': ref + 'two.Page'},
+            }},
+            'one.Page': {'type': 'object', 'properties': {'id': {'type': 'string'}}},
+            'two.Page': {'type': 'object', 'properties': {'id': {'type': 'string'}}},
+            'v1.Shared': {'type': 'object'},
+            'api.Unused': {'type': 'object'},
+        }}
+        bindings = {'Shared': {'sources': ['#/components/schemas/SharedResource']}}
+        generated = generator.core_module(document, {'SharedResource': {}}, bindings).decode()
+        for line in (
+            'import type { SharedResource } from "./public-api";', '  color: ThingColor;', '  tags?: ThingTags[];',
+            'export const thingColorValues = ["red", "blue"] as const;', '  shared?: SharedResource;',
+            '  first?: OnePage;', '  second?: TwoPage;',
+        ):
+            self.assertIn(line, generated)
+        self.assertNotIn('Unused', generated)
+
     def test_every_public_reference_resolves_and_no_other_apis_leak(self):
         self.assertEqual({p.split('/')[1] for p in self.public['paths']}, {'agents', 'vaults', 'files', 'skills'})
         generator.prune_components(copy.deepcopy(self.public))
diff --git a/scripts/openapi-split/main.go b/scripts/openapi-split/main.go
index 66d4f7438..64cf47796 100644
--- a/scripts/openapi-split/main.go
+++ b/scripts/openapi-split/main.go
@@ -1,5 +1,5 @@
 // Command openapi-split emits internal contracts and exports Go definitions
-// for the public contract extension overlay.
+// for the public contract extension overlay and the Core client types.
 package main
 
 import (
@@ -22,19 +22,20 @@ const (
 func main() {
 	check := flag.Bool("check", false, "check generated internal contracts without changing them")
 	flag.Parse()
-	if flag.NArg() != 4 {
-		fmt.Fprintln(os.Stderr, "usage: openapi-split [--check] INPUT EXTENSIONS_OUTPUT CORE_OUTPUT RUNTIME_OUTPUT")
+	if flag.NArg() != 5 {
+		fmt.Fprintln(os.Stderr, "usage: openapi-split [--check] INPUT EXTENSIONS_OUTPUT CORE_JSON_OUTPUT CORE_OUTPUT RUNTIME_OUTPUT")
 		os.Exit(1)
 	}
-	if err := run(flag.Arg(0), flag.Arg(1), flag.Arg(2), flag.Arg(3), *check); err != nil {
+	if err := run(flag.Arg(0), flag.Arg(1), flag.Arg(2), flag.Arg(3), flag.Arg(4), *check); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 }
 
-// run exports Go-owned definitions for the public extension overlay and emits
-// the two internal contracts. Public operations come only from official OpenAPI.
-func run(input, extensionOutput, coreOutput, runtimeOutput string, check bool) error {
+// run exports Go-owned definitions for the public extension overlay and the
+// Core client types, and emits the two internal contracts. Public operations
+// come only from official OpenAPI.
+func run(input, extensionOutput, coreJSONOutput, coreOutput, runtimeOutput string, check bool) error {
 	raw, err := os.ReadFile(input)
 	if err != nil {
 		return err
@@ -43,23 +44,17 @@ func run(input, extensionOutput, coreOutput, runtimeOutput string, check bool) e
 	if err := yaml.Unmarshal(raw, &source); err != nil {
 		return err
 	}
-	var definitions map[string]any
-	if err := field(source.Content[0], "definitions").Decode(&definitions); err != nil {
-		return err
-	}
-	extensionJSON, err := json.Marshal(definitions)
-	if err != nil {
-		return err
-	}
-	if err := os.WriteFile(extensionOutput, extensionJSON, 0644); err != nil {
+	if err := writeJSON(field(source.Content[0], "definitions"), extensionOutput); err != nil {
 		return err
 	}
 	for _, output := range []struct {
 		path, title, description string
 		surface                  int
+		// jsonOutput, when set, receives the document as JSON.
+		jsonOutput string
 	}{
-		{coreOutput, "OpenAgentCore Core API", "Deployment and operations routes under /core/v1 for Core Web's server and operator scripts. Every operation requires the Core key; Project API keys and machine credentials are not accepted.", coreSurface},
-		{runtimeOutput, "OpenAgentCore Machine Connections", "Machine connection routes under /api/v1. Sandbox nodes authenticate with a one-use enrollment token or their node credential; Project API keys and the Core key are not accepted. See each operation's security requirements.", runtimeSurface},
+		{coreOutput, "OpenAgentCore Core API", "Deployment and operations routes under /core/v1 for Core Web's server and operator scripts. Every operation requires the Core key; Project API keys and machine credentials are not accepted.", coreSurface, coreJSONOutput},
+		{runtimeOutput, "OpenAgentCore Machine Connections", "Machine connection routes under /api/v1. Sandbox nodes authenticate with a one-use enrollment token or their node credential; Project API keys and the Core key are not accepted. See each operation's security requirements.", runtimeSurface, ""},
 	} {
 		var doc yaml.Node
 		if err := yaml.Unmarshal(raw, &doc); err != nil {
@@ -84,9 +79,28 @@ func run(input, extensionOutput, coreOutput, runtimeOutput string, check bool) e
 		if err := writeGenerated(output.path, buf.Bytes(), check); err != nil {
 			return err
 		}
+		if output.jsonOutput != "" {
+			if err := writeJSON(root, output.jsonOutput); err != nil {
+				return err
+			}
+		}
 	}
 	return nil
 }
+
+// writeJSON writes a YAML node as JSON, which scripts/generate-public-api.py
+// reads without a YAML parser.
+func writeJSON(node *yaml.Node, path string) error {
+	var value map[string]any
+	if err := node.Decode(&value); err != nil {
+		return err
+	}
+	raw, err := json.Marshal(value)
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(path, raw, 0644)
+}
 func field(n *yaml.Node, key string) *yaml.Node {
 	if n != nil {
 		for i := 0; i+1 < len(n.Content); i += 2 {
diff --git a/scripts/openapi-split/main_test.go b/scripts/openapi-split/main_test.go
index fa8b65ea7..542d47ca5 100644
--- a/scripts/openapi-split/main_test.go
+++ b/scripts/openapi-split/main_test.go
@@ -14,6 +14,7 @@ func TestInternalContractsAndExtensionDefinitions(t *testing.T) {
 	d := t.TempDir()
 	input := filepath.Join(d, "combined.yaml")
 	project := filepath.Join(d, "extensions.json")
+	coreJSON := filepath.Join(d, "core.json")
 	core := filepath.Join(d, "core.yaml")
 	machine := filepath.Join(d, "runtime.yaml")
 	raw := `swagger: "2.0"
@@ -72,7 +73,7 @@ securityDefinitions:
 	if err := os.WriteFile(input, []byte(raw), 0600); err != nil {
 		t.Fatal(err)
 	}
-	if err := run(input, project, core, machine, false); err != nil {
+	if err := run(input, project, coreJSON, core, machine, false); err != nil {
 		t.Fatal(err)
 	}
 	for _, check := range []struct{ path, base, own, other, definition, absent string }{
@@ -98,16 +99,20 @@ securityDefinitions:
 			t.Fatal("reference closure was not preserved")
 		}
 	}
-	rawDefinitions, err := os.ReadFile(project)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var definitions map[string]any
-	if err := json.Unmarshal(rawDefinitions, &definitions); err != nil {
-		t.Fatal(err)
+	// Extensions keep every definition; the Core document as JSON only its own.
+	var extensions map[string]any
+	var coreDocument struct{ Definitions map[string]any }
+	for path, value := range map[string]any{project: &extensions, coreJSON: &coreDocument} {
+		raw, err := os.ReadFile(path)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if err := json.Unmarshal(raw, value); err != nil {
+			t.Fatal(err)
+		}
 	}
-	if len(definitions) != 4 {
-		t.Fatalf("missing extension dependencies: %v", definitions)
+	if len(extensions) != 4 || len(coreDocument.Definitions) != 2 || coreDocument.Definitions["Node"] == nil {
+		t.Fatalf("definitions: extensions %v, core %v", extensions, coreDocument.Definitions)
 	}
 	// Every internal document keeps only the schemes its operations use.
 	for path, want := range map[string]string{core: "DeploymentAdminAuth", machine: "NodeAuth"} {
diff --git a/services/core/internal/adminaudit/reader.go b/services/core/internal/adminaudit/reader.go
index 81265e682..921e68e57 100644
--- a/services/core/internal/adminaudit/reader.go
+++ b/services/core/internal/adminaudit/reader.go
@@ -29,22 +29,22 @@ type Filter struct {
 // Operation is one administrator write. ProjectID is null for
 // deployment-wide writes, such as deployment default model providers.
 type Operation struct {
-	ID                string    `json:"id"`
-	CreatedAt         time.Time `json:"created_at"`
-	AdminCredentialID string    `json:"admin_credential_id"`
-	ActorLabel        string    `json:"actor_label"`
-	Action            string    `json:"action"`
-	ProjectID         *string   `json:"project_id" extensions:"x-nullable"`
-	ResourceType      string    `json:"resource_type"`
-	ResourceID        string    `json:"resource_id"`
-	RequestID         string    `json:"request_id"`
-	TraceID           string    `json:"trace_id"`
+	ID                string    `json:"id" binding:"required"`
+	CreatedAt         time.Time `json:"created_at" binding:"required"`
+	AdminCredentialID string    `json:"admin_credential_id" binding:"required"`
+	ActorLabel        string    `json:"actor_label" binding:"required"`
+	Action            string    `json:"action" binding:"required"`
+	ProjectID         *string   `json:"project_id" extensions:"x-nullable" binding:"required"`
+	ResourceType      string    `json:"resource_type" binding:"required"`
+	ResourceID        string    `json:"resource_id" binding:"required"`
+	RequestID         string    `json:"request_id" binding:"required"`
+	TraceID           string    `json:"trace_id" binding:"required"`
 }
 
 type Page struct {
-	Data       []Operation `json:"data"`
-	HasMore    bool        `json:"has_more"`
-	NextCursor string      `json:"next_cursor"`
+	Data       []Operation `json:"data" binding:"required"`
+	HasMore    bool        `json:"has_more" binding:"required"`
+	NextCursor string      `json:"next_cursor" binding:"required"`
 }
 
 // Validate checks f and returns it with the default page size applied. The
diff --git a/services/core/internal/api/admin_runtime.go b/services/core/internal/api/admin_runtime.go
index c11dae6aa..77f96d043 100644
--- a/services/core/internal/api/admin_runtime.go
+++ b/services/core/internal/api/admin_runtime.go
@@ -10,8 +10,8 @@ import (
 )
 
 type AdminRuntimeObservation struct {
-	ProjectID   string                        `json:"project_id"`
-	Observation AdminRuntimeObservationDetail `json:"observation"`
+	ProjectID   string                        `json:"project_id" binding:"required"`
+	Observation AdminRuntimeObservationDetail `json:"observation" binding:"required"`
 }
 
 // AdminRuntimeObservationDetail adds administrator-only measurements to the
@@ -29,11 +29,11 @@ type RuntimeDiskObservation struct {
 	LimitBytes *uint64 `json:"limit_bytes" extensions:"x-nullable" binding:"required" minimum:"1"`
 }
 type AdminRuntimeObservationList struct {
-	Object  string                    `json:"object"`
-	Data    []AdminRuntimeObservation `json:"data"`
-	HasMore bool                      `json:"has_more"`
-	FirstID *string                   `json:"first_id"`
-	LastID  *string                   `json:"last_id"`
+	Object  string                    `json:"object" enums:"list" binding:"required"`
+	Data    []AdminRuntimeObservation `json:"data" binding:"required"`
+	HasMore bool                      `json:"has_more" binding:"required"`
+	FirstID *string                   `json:"first_id" extensions:"x-nullable" binding:"required"`
+	LastID  *string                   `json:"last_id" extensions:"x-nullable" binding:"required"`
 }
 
 // @Summary List Runtime observations across managed Projects
diff --git a/services/core/internal/api/admin_session_archive.go b/services/core/internal/api/admin_session_archive.go
index 2a7b0e46e..e5354358a 100644
--- a/services/core/internal/api/admin_session_archive.go
+++ b/services/core/internal/api/admin_session_archive.go
@@ -15,7 +15,7 @@ type SessionArchive interface {
 }
 
 type AdminSessionArchiveRequest struct {
-	ExpectedGeneration uint64 `json:"expected_generation"`
+	ExpectedGeneration uint64 `json:"expected_generation" binding:"required"`
 }
 
 // @Summary Release a managed Session's execution resources while retaining history
diff --git a/services/core/internal/api/admin_summary.go b/services/core/internal/api/admin_summary.go
index 83c1a8188..2b2b835da 100644
--- a/services/core/internal/api/admin_summary.go
+++ b/services/core/internal/api/admin_summary.go
@@ -12,31 +12,31 @@ import (
 )
 
 type AdminSessionCounts struct {
-	Total          int64 `json:"total"`
-	Idle           int64 `json:"idle"`
-	InProgress     int64 `json:"in_progress"`
-	RequiresAction int64 `json:"requires_action"`
-	Failed         int64 `json:"failed"`
+	Total          int64 `json:"total" binding:"required"`
+	Idle           int64 `json:"idle" binding:"required"`
+	InProgress     int64 `json:"in_progress" binding:"required"`
+	RequiresAction int64 `json:"requires_action" binding:"required"`
+	Failed         int64 `json:"failed" binding:"required"`
 }
 type AdminUsageCoverage struct {
-	MeasuredSessions int64    `json:"measured_sessions"`
-	TotalSessions    int64    `json:"total_sessions"`
-	Ratio            *float64 `json:"ratio"`
+	MeasuredSessions int64    `json:"measured_sessions" binding:"required"`
+	TotalSessions    int64    `json:"total_sessions" binding:"required"`
+	Ratio            *float64 `json:"ratio" extensions:"x-nullable" binding:"required"`
 }
 type AdminSummaryRow struct {
-	ProjectID    string                     `json:"project_id"`
-	KeyID        *string                    `json:"key_id"`
-	AgentID      *string                    `json:"agent_id"`
-	Assets       *sessions.AdminAssetCounts `json:"assets"`
-	Sessions     AdminSessionCounts         `json:"sessions"`
-	Usage        v1.TokenUsage              `json:"usage"`
-	Coverage     AdminUsageCoverage         `json:"coverage"`
-	LastActiveAt *int64                     `json:"last_active_at"`
+	ProjectID    string                     `json:"project_id" binding:"required"`
+	KeyID        *string                    `json:"key_id" extensions:"x-nullable" binding:"required"`
+	AgentID      *string                    `json:"agent_id" extensions:"x-nullable" binding:"required"`
+	Assets       *sessions.AdminAssetCounts `json:"assets" extensions:"x-nullable" binding:"required"`
+	Sessions     AdminSessionCounts         `json:"sessions" binding:"required"`
+	Usage        v1.TokenUsage              `json:"usage" binding:"required"`
+	Coverage     AdminUsageCoverage         `json:"coverage" binding:"required"`
+	LastActiveAt *int64                     `json:"last_active_at" extensions:"x-nullable" binding:"required"`
 }
 type AdminSummaryResponse struct {
-	Data       []AdminSummaryRow `json:"data"`
-	HasMore    bool              `json:"has_more"`
-	NextCursor string            `json:"next_cursor"`
+	Data       []AdminSummaryRow `json:"data" binding:"required"`
+	HasMore    bool              `json:"has_more" binding:"required"`
+	NextCursor string            `json:"next_cursor" binding:"required"`
 }
 
 func adminSummaryTime(r *http.Request, name string) (*time.Time, error) {
diff --git a/services/core/internal/api/environment_executor_management.go b/services/core/internal/api/environment_executor_management.go
index 5bbb1ee57..8e20745e8 100644
--- a/services/core/internal/api/environment_executor_management.go
+++ b/services/core/internal/api/environment_executor_management.go
@@ -22,7 +22,7 @@ type ExecutorConnections interface {
 }
 
 type EnvironmentExecutorCredentialRequest struct {
-	KeyID  string `json:"key_id" format:"uuid"`
+	KeyID  string `json:"key_id" format:"uuid" binding:"required"`
 	Rotate bool   `json:"rotate,omitempty"`
 }
 
diff --git a/services/core/internal/api/installation.go b/services/core/internal/api/installation.go
index 8d18088ac..e99e574ed 100644
--- a/services/core/internal/api/installation.go
+++ b/services/core/internal/api/installation.go
@@ -10,40 +10,40 @@ import (
 // Installation reports Core's installation facts. Core reads them from its
 // environment and build; configuration is the process settings it loaded.
 type Installation struct {
-	Object string `json:"object" enums:"core.installation"`
+	Object string `json:"object" enums:"core.installation" binding:"required"`
 	// The ID in OAC_INSTALLATION_ID_FILE.
-	InstallationID string `json:"installation_id"`
+	InstallationID string `json:"installation_id" binding:"required"`
 	// OAC_PUBLIC_URL: the origin applications, nodes, sandboxes and self-hosted executors use.
-	PublicURL string `json:"public_url"`
+	PublicURL string `json:"public_url" binding:"required"`
 	// public_url followed by /v1.
-	APIBaseURL string `json:"api_base_url"`
+	APIBaseURL string `json:"api_base_url" binding:"required"`
 	// True when public_url names a loopback host, reachable only from the Core host.
-	LocalOnly bool `json:"local_only"`
+	LocalOnly bool `json:"local_only" binding:"required"`
 	// Full source commit Core was built from; null for development builds.
-	SourceCommit *string `json:"source_commit" extensions:"x-nullable"`
+	SourceCommit *string `json:"source_commit" extensions:"x-nullable" binding:"required"`
 	// The process settings Core loaded.
-	Configuration   InstallationConfiguration  `json:"configuration"`
-	AddressBindings deployment.AddressBindings `json:"address_bindings"`
+	Configuration   InstallationConfiguration  `json:"configuration" binding:"required"`
+	AddressBindings deployment.AddressBindings `json:"address_bindings" binding:"required"`
 }
 
 // InstallationConfiguration is the process settings Core loaded.
 type InstallationConfiguration struct {
-	Settings []InstallationSetting `json:"settings"`
+	Settings []InstallationSetting `json:"settings" binding:"required"`
 }
 
 type InstallationSetting struct {
 	// Dotted config.json key, such as ports.core.
-	Key string `json:"key"`
+	Key string `json:"key" binding:"required"`
 	// Applied value; always null for a sensitive setting.
-	Value   any `json:"value" extensions:"x-nullable"`
-	Default any `json:"default" extensions:"x-nullable"`
+	Value   any `json:"value" extensions:"x-nullable" binding:"required"`
+	Default any `json:"default" extensions:"x-nullable" binding:"required"`
 	// Present only for a sensitive setting: whether it has a value.
 	Configured *bool `json:"configured,omitempty"`
 	// False for settings fixed at installation.
-	Changeable bool `json:"changeable"`
-	Sensitive  bool `json:"sensitive"`
+	Changeable bool `json:"changeable" binding:"required"`
+	Sensitive  bool `json:"sensitive" binding:"required"`
 	// Services that restart when the setting changes.
-	Restarts []string `json:"restarts"`
+	Restarts []string `json:"restarts" enums:"core,web" binding:"required"`
 }
 
 // InstallationBindings counts what is bound to the current public URL.
diff --git a/services/core/internal/api/project_api_keys.go b/services/core/internal/api/project_api_keys.go
index bf36c6b4e..bb37ff844 100644
--- a/services/core/internal/api/project_api_keys.go
+++ b/services/core/internal/api/project_api_keys.go
@@ -32,10 +32,10 @@ type ProjectsReader interface {
 	ResolveAPIKey(context.Context, [sha256.Size]byte) (projects.KeyBinding, error)
 }
 type ProjectRequest struct {
-	Name string `json:"name"`
+	Name string `json:"name" binding:"required"`
 }
 type ProjectAPIKeyRequest struct {
-	Name string `json:"name"`
+	Name string `json:"name" binding:"required"`
 }
 
 func (h *Handler) registerProjectAPIKeyRoutes(r chi.Router) {
diff --git a/services/core/internal/api/sandbox_manager.go b/services/core/internal/api/sandbox_manager.go
index aa1143b3c..57713a257 100644
--- a/services/core/internal/api/sandbox_manager.go
+++ b/services/core/internal/api/sandbox_manager.go
@@ -12,19 +12,19 @@ import (
 )
 
 type SandboxNodeList struct {
-	Data []deployment.Node `json:"data"`
+	Data []deployment.Node `json:"data" binding:"required"`
 }
 type SandboxAllocationList struct {
-	Data []deployment.NodeAllocation `json:"data"`
+	Data []deployment.NodeAllocation `json:"data" binding:"required"`
 }
 type SandboxEnrollmentToken struct {
-	Token     string    `json:"token"`
-	ExpiresAt time.Time `json:"expires_at"`
+	Token     string    `json:"token" binding:"required"`
+	ExpiresAt time.Time `json:"expires_at" binding:"required"`
 	// Public, non-secret handle of this command; never a credential. The node it registers reports the same value as enrollment_id.
-	EnrollmentID string `json:"enrollment_id"`
+	EnrollmentID string `json:"enrollment_id" binding:"required"`
 }
 type SandboxMutationResponse struct {
-	ID      string `json:"id"`
+	ID      string `json:"id" binding:"required"`
 	Deleted bool   `json:"deleted,omitempty"`
 	Updated bool   `json:"updated,omitempty"`
 }
diff --git a/services/core/internal/api/session_diagnostics.go b/services/core/internal/api/session_diagnostics.go
index 9e14f19b5..759e6aab4 100644
--- a/services/core/internal/api/session_diagnostics.go
+++ b/services/core/internal/api/session_diagnostics.go
@@ -11,39 +11,39 @@ import (
 )
 
 type DiagnosticFailure struct {
-	Code     string           `json:"code" enums:"harness_error,model_provider_required,runtime_unavailable,runtime_disconnected,runtime_preparation_failed,execution_interrupted,delivery_unconfirmed,input_rejected,executor_protocol_error,core_storage_failed,internal_error,environment_connection_timeout,environment_unavailable,environment_provisioning_failed,authentication_error,rate_limit_exceeded,usage_limit_exceeded,server_overloaded,server_error,invalid_request,resource_not_found,request_timeout,context_length_exceeded,cyber_policy,connection_failed"`
-	Params   CoreErrorDetails `json:"params" swaggertype:"object"`
-	FailedAt *time.Time       `json:"failed_at" extensions:"x-nullable"`
+	Code     string           `json:"code" binding:"required" enums:"harness_error,model_provider_required,runtime_unavailable,runtime_disconnected,runtime_preparation_failed,execution_interrupted,delivery_unconfirmed,input_rejected,executor_protocol_error,core_storage_failed,internal_error,environment_connection_timeout,environment_unavailable,environment_provisioning_failed,authentication_error,rate_limit_exceeded,usage_limit_exceeded,server_overloaded,server_error,invalid_request,resource_not_found,request_timeout,context_length_exceeded,cyber_policy,connection_failed"`
+	Params   CoreErrorDetails `json:"params" swaggertype:"object" binding:"required"`
+	FailedAt *time.Time       `json:"failed_at" extensions:"x-nullable" binding:"required"`
 }
 
 type SessionDiagnosticFailure struct {
 	DiagnosticFailure
-	Source string `json:"source" enums:"turn,environment,environment_input"`
+	Source string `json:"source" binding:"required" enums:"turn,environment,environment_input"`
 	TurnID string `json:"turn_id,omitempty"`
 }
 
 type SessionDiagnostics struct {
-	Object    string                    `json:"object" enums:"core.session_diagnostics"`
-	SessionID string                    `json:"session_id"`
-	Status    string                    `json:"status" enums:"idle,in_progress,requires_action,failed"`
-	Failure   *SessionDiagnosticFailure `json:"failure" extensions:"x-nullable"`
+	Object    string                    `json:"object" enums:"core.session_diagnostics" binding:"required"`
+	SessionID string                    `json:"session_id" binding:"required"`
+	Status    string                    `json:"status" enums:"idle,in_progress,requires_action,failed" binding:"required"`
+	Failure   *SessionDiagnosticFailure `json:"failure" extensions:"x-nullable" binding:"required"`
 }
 
 type ItemDiagnosticTiming struct {
-	ItemID             string     `json:"item_id"`
-	StartedAt          time.Time  `json:"started_at"`
-	CompletedAt        *time.Time `json:"completed_at" extensions:"x-nullable"`
-	ObservedDurationMS *int64     `json:"observed_duration_ms" extensions:"x-nullable"`
+	ItemID             string     `json:"item_id" binding:"required"`
+	StartedAt          time.Time  `json:"started_at" binding:"required"`
+	CompletedAt        *time.Time `json:"completed_at" extensions:"x-nullable" binding:"required"`
+	ObservedDurationMS *int64     `json:"observed_duration_ms" extensions:"x-nullable" binding:"required"`
 }
 
 type TurnDiagnostics struct {
-	Object         string                 `json:"object" enums:"core.turn_diagnostics"`
-	SessionID      string                 `json:"session_id"`
-	TurnID         string                 `json:"turn_id"`
-	Status         string                 `json:"status"`
-	Failure        *DiagnosticFailure     `json:"failure" extensions:"x-nullable"`
-	Items          []ItemDiagnosticTiming `json:"items"`
-	ItemsTruncated bool                   `json:"items_truncated"`
+	Object         string                 `json:"object" enums:"core.turn_diagnostics" binding:"required"`
+	SessionID      string                 `json:"session_id" binding:"required"`
+	TurnID         string                 `json:"turn_id" binding:"required"`
+	Status         string                 `json:"status" binding:"required"`
+	Failure        *DiagnosticFailure     `json:"failure" extensions:"x-nullable" binding:"required"`
+	Items          []ItemDiagnosticTiming `json:"items" binding:"required"`
+	ItemsTruncated bool                   `json:"items_truncated" binding:"required"`
 }
 
 // SessionAdmin serves the administrator's per-Session reads: Turn diagnostics
diff --git a/services/core/internal/api/write_audit.go b/services/core/internal/api/write_audit.go
index 8f4b8e258..fd1ca82de 100644
--- a/services/core/internal/api/write_audit.go
+++ b/services/core/internal/api/write_audit.go
@@ -20,7 +20,7 @@ type WriteAudit interface {
 }
 
 type ResourceOwnerList struct {
-	Data []writeaudit.ResourceOwner `json:"data"`
+	Data []writeaudit.ResourceOwner `json:"data" binding:"required"`
 }
 
 func (h *Handler) writeAuditScope(w http.ResponseWriter, r *http.Request, allowed ...string) (url.Values, string, bool) {
diff --git a/services/core/internal/coremetrics/types.go b/services/core/internal/coremetrics/types.go
index 9aafca860..611efe657 100644
--- a/services/core/internal/coremetrics/types.go
+++ b/services/core/internal/coremetrics/types.go
@@ -13,84 +13,84 @@ import (
 var ErrInvalidRange = errors.New("invalid Core metrics range")
 
 type Latency struct {
-	P50 *float64 `json:"p50" extensions:"x-nullable"`
-	P95 *float64 `json:"p95" extensions:"x-nullable"`
+	P50 *float64 `json:"p50" extensions:"x-nullable" binding:"required"`
+	P95 *float64 `json:"p95" extensions:"x-nullable" binding:"required"`
 }
 type Range struct {
-	Start             time.Time `json:"start"`
-	End               time.Time `json:"end"`
-	ResolutionSeconds int64     `json:"resolution_seconds"`
+	Start             time.Time `json:"start" binding:"required"`
+	End               time.Time `json:"end" binding:"required"`
+	ResolutionSeconds int64     `json:"resolution_seconds" binding:"required"`
 }
 type ServiceState struct {
-	Status         string     `json:"status"`
-	Revision       *string    `json:"revision" extensions:"x-nullable"`
-	StartedAt      *time.Time `json:"started_at" extensions:"x-nullable"`
-	ExecutionOwner *bool      `json:"execution_owner" extensions:"x-nullable"`
+	Status         string     `json:"status" enums:"running,degraded" binding:"required"`
+	Revision       *string    `json:"revision" extensions:"x-nullable" binding:"required"`
+	StartedAt      *time.Time `json:"started_at" extensions:"x-nullable" binding:"required"`
+	ExecutionOwner *bool      `json:"execution_owner" extensions:"x-nullable" binding:"required"`
 }
 type ExecutionBucket struct {
-	Start          time.Time `json:"start"`
-	Queued         *int64    `json:"queued" extensions:"x-nullable"`
-	InProgress     *int64    `json:"in_progress" extensions:"x-nullable"`
-	QueueWaitP95MS *float64  `json:"queue_wait_p95_ms" extensions:"x-nullable"`
+	Start          time.Time `json:"start" binding:"required"`
+	Queued         *int64    `json:"queued" extensions:"x-nullable" binding:"required"`
+	InProgress     *int64    `json:"in_progress" extensions:"x-nullable" binding:"required"`
+	QueueWaitP95MS *float64  `json:"queue_wait_p95_ms" extensions:"x-nullable" binding:"required"`
 }
 type DatabaseBucket struct {
-	Start     time.Time `json:"start"`
-	PingP95MS *float64  `json:"ping_p95_ms" extensions:"x-nullable"`
-	PoolInUse *int64    `json:"pool_in_use" extensions:"x-nullable"`
+	Start     time.Time `json:"start" binding:"required"`
+	PingP95MS *float64  `json:"ping_p95_ms" extensions:"x-nullable" binding:"required"`
+	PoolInUse *int64    `json:"pool_in_use" extensions:"x-nullable" binding:"required"`
 }
 type Pool struct {
-	InUse *int64 `json:"in_use" extensions:"x-nullable"`
-	Idle  *int64 `json:"idle" extensions:"x-nullable"`
-	Max   *int64 `json:"max" extensions:"x-nullable"`
+	InUse *int64 `json:"in_use" extensions:"x-nullable" binding:"required"`
+	Idle  *int64 `json:"idle" extensions:"x-nullable" binding:"required"`
+	Max   *int64 `json:"max" extensions:"x-nullable" binding:"required"`
 }
 type Execution struct {
-	SlotsInUse          int64             `json:"slots_in_use"`
-	SlotsTotal          int64             `json:"slots_total"`
-	QueuedTurns         *int64            `json:"queued_turns" extensions:"x-nullable"`
-	WaitingForDaemon    *int64            `json:"waiting_for_daemon" extensions:"x-nullable"`
-	InProgressTurns     *int64            `json:"in_progress_turns" extensions:"x-nullable"`
-	OldestQueuedSeconds *float64          `json:"oldest_queued_seconds" extensions:"x-nullable"`
-	ConnectedDaemons    int64             `json:"connected_daemons"`
-	Interrupted         *int64            `json:"interrupted" extensions:"x-nullable"`
-	Unavailable         *int64            `json:"unavailable" extensions:"x-nullable"`
-	QueueWaitMS         Latency           `json:"queue_wait_ms"`
-	Series              []ExecutionBucket `json:"series"`
+	SlotsInUse          int64             `json:"slots_in_use" binding:"required"`
+	SlotsTotal          int64             `json:"slots_total" binding:"required"`
+	QueuedTurns         *int64            `json:"queued_turns" extensions:"x-nullable" binding:"required"`
+	WaitingForDaemon    *int64            `json:"waiting_for_daemon" extensions:"x-nullable" binding:"required"`
+	InProgressTurns     *int64            `json:"in_progress_turns" extensions:"x-nullable" binding:"required"`
+	OldestQueuedSeconds *float64          `json:"oldest_queued_seconds" extensions:"x-nullable" binding:"required"`
+	ConnectedDaemons    int64             `json:"connected_daemons" binding:"required"`
+	Interrupted         *int64            `json:"interrupted" extensions:"x-nullable" binding:"required"`
+	Unavailable         *int64            `json:"unavailable" extensions:"x-nullable" binding:"required"`
+	QueueWaitMS         Latency           `json:"queue_wait_ms" binding:"required"`
+	Series              []ExecutionBucket `json:"series" binding:"required"`
 }
 type Database struct {
-	PingMS    Latency          `json:"ping_ms"`
-	Pool      Pool             `json:"pool"`
-	SizeBytes *int64           `json:"size_bytes" extensions:"x-nullable"`
-	Series    []DatabaseBucket `json:"series"`
+	PingMS    Latency          `json:"ping_ms" binding:"required"`
+	Pool      Pool             `json:"pool" binding:"required"`
+	SizeBytes *int64           `json:"size_bytes" extensions:"x-nullable" binding:"required"`
+	Series    []DatabaseBucket `json:"series" binding:"required"`
 }
 type Job struct {
-	ID        string     `json:"id"`
-	Status    string     `json:"status"`
-	LastRunAt *time.Time `json:"last_run_at" extensions:"x-nullable"`
-	Processed *int64     `json:"processed" extensions:"x-nullable"`
-	Failed    *int64     `json:"failed" extensions:"x-nullable"`
+	ID        string     `json:"id" binding:"required"`
+	Status    string     `json:"status" enums:"ok,failing,stopped,unknown" binding:"required"`
+	LastRunAt *time.Time `json:"last_run_at" extensions:"x-nullable" binding:"required"`
+	Processed *int64     `json:"processed" extensions:"x-nullable" binding:"required"`
+	Failed    *int64     `json:"failed" extensions:"x-nullable" binding:"required"`
 }
 type Process struct {
-	MemoryBytes      *uint64         `json:"memory_bytes" extensions:"x-nullable"`
-	Goroutines       *int64          `json:"goroutines" extensions:"x-nullable"`
-	CPUCores         *float64        `json:"cpu_cores" extensions:"x-nullable"`
-	CPULimitCores    *float64        `json:"cpu_limit_cores" extensions:"x-nullable"`
-	RSSBytes         *uint64         `json:"rss_bytes" extensions:"x-nullable"`
-	MemoryLimitBytes *uint64         `json:"memory_limit_bytes" extensions:"x-nullable"`
-	Series           []ProcessBucket `json:"series"`
+	MemoryBytes      *uint64         `json:"memory_bytes" extensions:"x-nullable" binding:"required"`
+	Goroutines       *int64          `json:"goroutines" extensions:"x-nullable" binding:"required"`
+	CPUCores         *float64        `json:"cpu_cores" extensions:"x-nullable" binding:"required"`
+	CPULimitCores    *float64        `json:"cpu_limit_cores" extensions:"x-nullable" binding:"required"`
+	RSSBytes         *uint64         `json:"rss_bytes" extensions:"x-nullable" binding:"required"`
+	MemoryLimitBytes *uint64         `json:"memory_limit_bytes" extensions:"x-nullable" binding:"required"`
+	Series           []ProcessBucket `json:"series" binding:"required"`
 }
 type ProcessBucket struct {
-	Start    time.Time `json:"start"`
-	CPUCores *float64  `json:"cpu_cores" extensions:"x-nullable"`
-	RSSBytes *uint64   `json:"rss_bytes" extensions:"x-nullable"`
+	Start    time.Time `json:"start" binding:"required"`
+	CPUCores *float64  `json:"cpu_cores" extensions:"x-nullable" binding:"required"`
+	RSSBytes *uint64   `json:"rss_bytes" extensions:"x-nullable" binding:"required"`
 }
 type View struct {
-	Object    string       `json:"object"`
-	Range     Range        `json:"range"`
-	Service   ServiceState `json:"service"`
-	Execution Execution    `json:"execution"`
-	Database  Database     `json:"database"`
-	Jobs      []Job        `json:"jobs"`
-	Process   Process      `json:"process"`
+	Object    string       `json:"object" enums:"core.metrics" binding:"required"`
+	Range     Range        `json:"range" binding:"required"`
+	Service   ServiceState `json:"service" binding:"required"`
+	Execution Execution    `json:"execution" binding:"required"`
+	Database  Database     `json:"database" binding:"required"`
+	Jobs      []Job        `json:"jobs" binding:"required"`
+	Process   Process      `json:"process" binding:"required"`
 }
 
 // Sample contains only measurements, never resource identities or error text.
diff --git a/services/core/internal/deployment/allocation.go b/services/core/internal/deployment/allocation.go
index 02324ff49..c51f2527b 100644
--- a/services/core/internal/deployment/allocation.go
+++ b/services/core/internal/deployment/allocation.go
@@ -127,19 +127,19 @@ type LifecyclePlacement struct {
 
 // NodeAllocation is an unreleased allocation a node serves.
 type NodeAllocation struct {
-	DeploymentGeneration uint64 `json:"deployment_generation"`
-	Diagnostic           string `json:"diagnostic"`
-	ID                   string `json:"id"`
-	NodeID               string `json:"node_id"`
-	TenantID             string `json:"tenant_id"`
-	SessionID            string `json:"session_id"`
-	EnvironmentID        string `json:"environment_id"`
-	State                string `json:"state"`
-	ComputePhase         string `json:"compute_phase"`
+	DeploymentGeneration uint64 `json:"deployment_generation" binding:"required"`
+	Diagnostic           string `json:"diagnostic" enums:",node_unavailable,resource_missing,compute_unconfirmed,ownership_mismatch,provider_unavailable" binding:"required"`
+	ID                   string `json:"id" binding:"required"`
+	NodeID               string `json:"node_id" binding:"required"`
+	TenantID             string `json:"tenant_id" binding:"required"`
+	SessionID            string `json:"session_id" binding:"required"`
+	EnvironmentID        string `json:"environment_id" binding:"required"`
+	State                string `json:"state" binding:"required"`
+	ComputePhase         string `json:"compute_phase" binding:"required"`
 	// The time the allocation entered its current compute_phase, or null when unknown; an allocation that existed before Core recorded it reports null until its next phase change. For a suspended microsandbox allocation, this time plus the deployment's snapshot retention tells roughly when Core reclaims it.
-	ComputePhaseChangedAt *time.Time `json:"compute_phase_changed_at" extensions:"x-nullable"`
-	Initialization        string     `json:"initialization"`
-	CreatedAt             time.Time  `json:"created_at"`
+	ComputePhaseChangedAt *time.Time `json:"compute_phase_changed_at" extensions:"x-nullable" binding:"required"`
+	Initialization        string     `json:"initialization" binding:"required"`
+	CreatedAt             time.Time  `json:"created_at" binding:"required"`
 }
 
 // observationDiagnostics are the diagnostics an observation records; empty
diff --git a/services/core/internal/deployment/node.go b/services/core/internal/deployment/node.go
index 485d464e8..164d54234 100644
--- a/services/core/internal/deployment/node.go
+++ b/services/core/internal/deployment/node.go
@@ -47,39 +47,39 @@ type NodeHealth struct {
 	Host *NodeHost `json:"-"`
 	// Fixed reason for the last reported unreadiness; absent while the provider is ready. Clients treat an unknown value as provider_unavailable.
 	Diagnostic           string `json:"diagnostic,omitempty" enums:"provider_unavailable,host_unsupported,artifacts_unavailable,runtime_download_failed,runtime_image_unavailable,capacity_insufficient"`
-	ProviderReady        bool   `json:"provider_ready"`
-	CPUCount             *int64 `json:"cpu_count"`
-	AvailableMemoryBytes *int64 `json:"available_memory_bytes"`
-	AvailableDiskBytes   *int64 `json:"available_disk_bytes"`
+	ProviderReady        bool   `json:"provider_ready" binding:"required"`
+	CPUCount             *int64 `json:"cpu_count" extensions:"x-nullable" binding:"required"`
+	AvailableMemoryBytes *int64 `json:"available_memory_bytes" extensions:"x-nullable" binding:"required"`
+	AvailableDiskBytes   *int64 `json:"available_disk_bytes" extensions:"x-nullable" binding:"required"`
 }
 
 type Node struct {
-	Rollout NodeRollout `json:"rollout"`
+	Rollout NodeRollout `json:"rollout" binding:"required"`
 	NodeHealth
-	Running        int64      `json:"running"`
-	Snapshots      int64      `json:"snapshots"`
-	ID             string     `json:"id"`
-	Name           string     `json:"name"`
-	Provider       string     `json:"provider"`
-	Online         bool       `json:"online"`
-	LastSeenAt     *time.Time `json:"last_seen_at"`
-	MaxActive      int        `json:"max_active"`
-	MaxRetained    int        `json:"max_retained"`
-	Active         int64      `json:"active"`
-	Reserved       int64      `json:"reserved"`
-	Retained       int64      `json:"retained"`
-	CleanupPending int64      `json:"cleanup_pending"`
-	CreatedAt      time.Time  `json:"created_at"`
+	Running        int64      `json:"running" binding:"required"`
+	Snapshots      int64      `json:"snapshots" binding:"required"`
+	ID             string     `json:"id" binding:"required"`
+	Name           string     `json:"name" binding:"required"`
+	Provider       string     `json:"provider" binding:"required"`
+	Online         bool       `json:"online" binding:"required"`
+	LastSeenAt     *time.Time `json:"last_seen_at" extensions:"x-nullable" binding:"required"`
+	MaxActive      int        `json:"max_active" binding:"required"`
+	MaxRetained    int        `json:"max_retained" binding:"required"`
+	Active         int64      `json:"active" binding:"required"`
+	Reserved       int64      `json:"reserved" binding:"required"`
+	Retained       int64      `json:"retained" binding:"required"`
+	CleanupPending int64      `json:"cleanup_pending" binding:"required"`
+	CreatedAt      time.Time  `json:"created_at" binding:"required"`
 	// The Core address this node enrolled with. A node whose address differs
 	// from the installation public URL receives no new sandboxes; re-add it.
-	CoreURL string `json:"core_url"`
+	CoreURL string `json:"core_url" binding:"required"`
 	// The enrollment_id of the command that registered this node (POST /core/v1/sandbox/enrollment-tokens); null for nodes enrolled before Core recorded it.
-	EnrollmentID *string `json:"enrollment_id" extensions:"x-nullable"`
+	EnrollmentID *string `json:"enrollment_id" extensions:"x-nullable" binding:"required"`
 }
 
 type NodeUpdate struct {
-	Name      string `json:"name"`
-	MaxActive int    `json:"max_active"`
+	Name      string `json:"name" binding:"required"`
+	MaxActive int    `json:"max_active" binding:"required"`
 	// Docker never suspends, so Core replaces this with max_active; microsandbox uses both limits.
 	MaxRetained int `json:"max_retained"`
 }
@@ -104,28 +104,28 @@ type NodeConfiguration struct {
 
 // NodeHost is deployment telemetry, not sandbox capacity authority.
 type NodeHost struct {
-	EffectiveCPUCores    *float64   `json:"effective_cpu_cores" extensions:"x-nullable"`
-	CPUUtilization       *float64   `json:"cpu_utilization" extensions:"x-nullable"`
-	TotalMemoryBytes     *int64     `json:"total_memory_bytes" extensions:"x-nullable"`
-	AvailableMemoryBytes *int64     `json:"available_memory_bytes" extensions:"x-nullable"`
-	AvailableDiskBytes   *int64     `json:"available_disk_bytes" extensions:"x-nullable"`
-	ObservedAt           *time.Time `json:"observed_at" extensions:"x-nullable"`
+	EffectiveCPUCores    *float64   `json:"effective_cpu_cores" extensions:"x-nullable" binding:"required"`
+	CPUUtilization       *float64   `json:"cpu_utilization" extensions:"x-nullable" binding:"required"`
+	TotalMemoryBytes     *int64     `json:"total_memory_bytes" extensions:"x-nullable" binding:"required"`
+	AvailableMemoryBytes *int64     `json:"available_memory_bytes" extensions:"x-nullable" binding:"required"`
+	AvailableDiskBytes   *int64     `json:"available_disk_bytes" extensions:"x-nullable" binding:"required"`
+	ObservedAt           *time.Time `json:"observed_at" extensions:"x-nullable" binding:"required"`
 }
 
 type HostHistoryPoint struct {
-	Start                 time.Time `json:"start"`
-	CPUUtilizationMax     *float64  `json:"cpu_utilization_max" extensions:"x-nullable"`
-	MemoryUsedBytesMax    *int64    `json:"memory_used_bytes_max" extensions:"x-nullable"`
-	AvailableDiskBytesMin *int64    `json:"available_disk_bytes_min" extensions:"x-nullable"`
+	Start                 time.Time `json:"start" binding:"required"`
+	CPUUtilizationMax     *float64  `json:"cpu_utilization_max" extensions:"x-nullable" binding:"required"`
+	MemoryUsedBytesMax    *int64    `json:"memory_used_bytes_max" extensions:"x-nullable" binding:"required"`
+	AvailableDiskBytesMin *int64    `json:"available_disk_bytes_min" extensions:"x-nullable" binding:"required"`
 }
 
 type HostHistory struct {
-	ResolutionSeconds int64              `json:"resolution_seconds"`
-	Points            []HostHistoryPoint `json:"points"`
+	ResolutionSeconds int64              `json:"resolution_seconds" binding:"required"`
+	Points            []HostHistoryPoint `json:"points" binding:"required"`
 }
 
 type NodeDetail struct {
 	Node
-	Host    NodeHost    `json:"host"`
-	History HostHistory `json:"history"`
+	Host    NodeHost    `json:"host" binding:"required"`
+	History HostHistory `json:"history" binding:"required"`
 }
diff --git a/services/core/internal/deployment/public_url.go b/services/core/internal/deployment/public_url.go
index 1bf556928..e6d947160 100644
--- a/services/core/internal/deployment/public_url.go
+++ b/services/core/internal/deployment/public_url.go
@@ -73,10 +73,10 @@ func (o PublicOrigin) InstallerBase() string { return o.origin + "/api/v1/agent-
 // the address current at the time, and self-hosted executors were installed
 // with an advertised remote_url.
 type AddressBindings struct {
-	Nodes               int64 `json:"nodes"`
-	NodesOnOtherAddress int64 `json:"nodes_on_other_address"`
-	HostedSandboxes     int64 `json:"hosted_sandboxes"`
-	SelfHostedExecutors int64 `json:"self_hosted_executors"`
+	Nodes               int64 `json:"nodes" binding:"required"`
+	NodesOnOtherAddress int64 `json:"nodes_on_other_address" binding:"required"`
+	HostedSandboxes     int64 `json:"hosted_sandboxes" binding:"required"`
+	SelfHostedExecutors int64 `json:"self_hosted_executors" binding:"required"`
 }
 
 // AddressBindings counts what is bound to the installation public URL.
diff --git a/services/core/internal/deployment/view.go b/services/core/internal/deployment/view.go
index 4c6beb6bc..f45b90afe 100644
--- a/services/core/internal/deployment/view.go
+++ b/services/core/internal/deployment/view.go
@@ -9,79 +9,79 @@ import (
 
 // View is the sandbox deployment as administrators read it.
 type View struct {
-	Rollout              Rollout                 `json:"rollout"`
+	Rollout              Rollout                 `json:"rollout" binding:"required"`
 	Specification        *sandbox.DeploymentSpec `json:"specification,omitempty"`
 	SpecificationDigest  string                  `json:"specification_digest,omitempty"`
-	Generation           uint64                  `json:"generation"`
-	Mode                 string                  `json:"mode"`
-	Resources            Resources               `json:"resources"`
+	Generation           uint64                  `json:"generation" binding:"required"`
+	Mode                 string                  `json:"mode" enums:",nodes,direct" binding:"required"`
+	Resources            Resources               `json:"resources" binding:"required"`
 	Configuration        json.RawMessage         `json:"configuration,omitempty" swaggertype:"object"`
 	Metadata             json.RawMessage         `json:"metadata,omitempty" swaggertype:"object"`
-	CredentialConfigured bool                    `json:"credential_configured"`
+	CredentialConfigured bool                    `json:"credential_configured" binding:"required"`
 	// Idle suspension policy; null unless the selected Provider declares checkpoint support.
-	Suspension     *Suspension `json:"suspension" extensions:"x-nullable"`
-	InstallationID string      `json:"installation_id"`
-	Provider       string      `json:"provider"`
-	Reset          *Reset      `json:"reset" extensions:"x-nullable"`
-	OwnerEpoch     uint64      `json:"owner_epoch"`
+	Suspension     *Suspension `json:"suspension" extensions:"x-nullable" binding:"required"`
+	InstallationID string      `json:"installation_id" binding:"required"`
+	Provider       string      `json:"provider" binding:"required"`
+	Reset          *Reset      `json:"reset" extensions:"x-nullable" binding:"required"`
+	OwnerEpoch     uint64      `json:"owner_epoch" binding:"required"`
 	// Read-only: the installation public URL (OAC_PUBLIC_URL), which nodes and sandboxes use to reach Core. The deployment API does not accept it.
-	CoreURL string `json:"core_url"`
+	CoreURL string `json:"core_url" binding:"required"`
 }
 
 // Resources counts what still belongs to the deployment.
 type Resources struct {
-	Allocations int64 `json:"allocations"`
-	Pending     int64 `json:"pending"`
+	Allocations int64 `json:"allocations" binding:"required"`
+	Pending     int64 `json:"pending" binding:"required"`
 }
 
 // Suspension is Core's idle suspension policy, which applies to every Provider
 // that declares checkpoint support.
 type Suspension struct {
-	IdleSeconds      int64 `json:"idle_seconds"`
-	RetentionSeconds int64 `json:"retention_seconds"`
+	IdleSeconds      int64 `json:"idle_seconds" binding:"required"`
+	RetentionSeconds int64 `json:"retention_seconds" binding:"required"`
 }
 
 type NodeRollout struct {
 	// Target preparation, independent of an old pin's serving readiness.
-	State string `json:"state" enums:"ready,preparing,failed,update_required,unknown"`
+	State string `json:"state" enums:"ready,preparing,failed,update_required,unknown" binding:"required"`
 	// Durable serving-generation pin; online and provider_ready still gate placement.
-	ReadyGeneration *uint64 `json:"ready_generation" extensions:"x-nullable"`
+	ReadyGeneration *uint64 `json:"ready_generation" extensions:"x-nullable" binding:"required"`
 	Diagnostic      string  `json:"diagnostic,omitempty" enums:"provider_unavailable,host_unsupported,artifacts_unavailable,runtime_download_failed,runtime_image_unavailable,capacity_insufficient"`
 }
 
 type RolloutNodes struct {
-	Ready          int64 `json:"ready"`
-	Preparing      int64 `json:"preparing"`
-	Failed         int64 `json:"failed"`
-	UpdateRequired int64 `json:"update_required"`
-	Unknown        int64 `json:"unknown"`
+	Ready          int64 `json:"ready" binding:"required"`
+	Preparing      int64 `json:"preparing" binding:"required"`
+	Failed         int64 `json:"failed" binding:"required"`
+	UpdateRequired int64 `json:"update_required" binding:"required"`
+	Unknown        int64 `json:"unknown" binding:"required"`
 }
 
 type Rollout struct {
-	State                       string        `json:"state" enums:"settled,preparing"`
-	PreviousGenerationSandboxes int64         `json:"previous_generation_sandboxes"`
-	Nodes                       *RolloutNodes `json:"nodes" extensions:"x-nullable"`
+	State                       string        `json:"state" enums:"settled,preparing" binding:"required"`
+	PreviousGenerationSandboxes int64         `json:"previous_generation_sandboxes" binding:"required"`
+	Nodes                       *RolloutNodes `json:"nodes" extensions:"x-nullable" binding:"required"`
 }
 
 // Reset contains only durable state and a single-snapshot resource partition.
 type Reset struct {
-	Clear       string         `json:"clear"`
-	RequestedAt time.Time      `json:"requested_at"`
-	DeadlineAt  *time.Time     `json:"deadline_at" extensions:"x-nullable"`
-	ForcedAt    *time.Time     `json:"forced_at" extensions:"x-nullable"`
-	Remaining   ResetRemaining `json:"remaining"`
+	Clear       string         `json:"clear" enums:"auto,force" binding:"required"`
+	RequestedAt time.Time      `json:"requested_at" binding:"required"`
+	DeadlineAt  *time.Time     `json:"deadline_at" extensions:"x-nullable" binding:"required"`
+	ForcedAt    *time.Time     `json:"forced_at" extensions:"x-nullable" binding:"required"`
+	Remaining   ResetRemaining `json:"remaining" binding:"required"`
 }
 
 type ResetRemaining struct {
-	Busy           int64              `json:"busy"`
-	Idle           int64              `json:"idle"`
-	Cleanup        int64              `json:"cleanup"`
-	OnOfflineNodes int64              `json:"on_offline_nodes"`
-	OfflineNodes   []ResetOfflineNode `json:"offline_nodes"`
+	Busy           int64              `json:"busy" binding:"required"`
+	Idle           int64              `json:"idle" binding:"required"`
+	Cleanup        int64              `json:"cleanup" binding:"required"`
+	OnOfflineNodes int64              `json:"on_offline_nodes" binding:"required"`
+	OfflineNodes   []ResetOfflineNode `json:"offline_nodes" binding:"required"`
 }
 
 type ResetOfflineNode struct {
-	NodeID    string `json:"node_id"`
-	Name      string `json:"name"`
-	Resources int64  `json:"resources"`
+	NodeID    string `json:"node_id" binding:"required"`
+	Name      string `json:"name" binding:"required"`
+	Resources int64  `json:"resources" binding:"required"`
 }
diff --git a/services/core/internal/projects/api_key.go b/services/core/internal/projects/api_key.go
index 05c64dc8b..15df1a460 100644
--- a/services/core/internal/projects/api_key.go
+++ b/services/core/internal/projects/api_key.go
@@ -12,18 +12,18 @@ import (
 // APIKey is the safe metadata of a Project API key. Core stores only the
 // secret's SHA-256 digest and its display prefix.
 type APIKey struct {
-	ID        string     `json:"id"`
-	ProjectID string     `json:"project_id"`
-	Name      string     `json:"name"`
-	Prefix    string     `json:"prefix"`
-	CreatedAt time.Time  `json:"created_at"`
-	RevokedAt *time.Time `json:"revoked_at"`
+	ID        string     `json:"id" binding:"required"`
+	ProjectID string     `json:"project_id" binding:"required"`
+	Name      string     `json:"name" binding:"required"`
+	Prefix    string     `json:"prefix" binding:"required"`
+	CreatedAt time.Time  `json:"created_at" binding:"required"`
+	RevokedAt *time.Time `json:"revoked_at" extensions:"x-nullable" binding:"required"`
 }
 
 // IssuedAPIKey carries the secret once, in the response that issues it.
 type IssuedAPIKey struct {
 	APIKey
-	Key string `json:"key"`
+	Key string `json:"key" binding:"required"`
 }
 
 // KeyBinding is an active key with the principal it authenticates as.
@@ -34,8 +34,8 @@ type KeyBinding struct {
 
 // KeyPage is one page of a Project's keys ordered by ID.
 type KeyPage struct {
-	Data    []APIKey `json:"data"`
-	HasMore bool     `json:"has_more"`
+	Data    []APIKey `json:"data" binding:"required"`
+	HasMore bool     `json:"has_more" binding:"required"`
 }
 
 // keyPrefixLength covers "pc_" and eight secret characters.
diff --git a/services/core/internal/projects/project.go b/services/core/internal/projects/project.go
index 869fc3894..2c2a2d6cc 100644
--- a/services/core/internal/projects/project.go
+++ b/services/core/internal/projects/project.go
@@ -8,11 +8,11 @@ import (
 
 // Project is a Core Project as administrators see it.
 type Project struct {
-	ID             string     `json:"id"`
-	Name           string     `json:"name"`
-	CreatedAt      time.Time  `json:"created_at"`
-	ArchivedAt     *time.Time `json:"archived_at"`
-	ActiveKeyCount int64      `json:"active_key_count"`
+	ID             string     `json:"id" binding:"required"`
+	Name           string     `json:"name" binding:"required"`
+	CreatedAt      time.Time  `json:"created_at" binding:"required"`
+	ArchivedAt     *time.Time `json:"archived_at" extensions:"x-nullable" binding:"required"`
+	ActiveKeyCount int64      `json:"active_key_count" binding:"required"`
 	TenantID       string     `json:"-"`
 }
 
@@ -24,8 +24,8 @@ type Binding struct {
 
 // Page is one page of Projects ordered by ID.
 type Page struct {
-	Data    []Project `json:"data"`
-	HasMore bool      `json:"has_more"`
+	Data    []Project `json:"data" binding:"required"`
+	HasMore bool      `json:"has_more" binding:"required"`
 }
 
 // MaxListLimit bounds one page of Projects or API keys.
diff --git a/services/core/internal/sandbox/deployment.go b/services/core/internal/sandbox/deployment.go
index dbfda8746..4b96acb13 100644
--- a/services/core/internal/sandbox/deployment.go
+++ b/services/core/internal/sandbox/deployment.go
@@ -24,8 +24,8 @@ func validationBound(value uint32) *uint32 { return &value }
 // Resources describes one managed sandbox, independently of node concurrency.
 // Disk bounds are available only where the native provider enforces them.
 type Resources struct {
-	CPUs               uint32 `json:"cpus"`
-	MemoryMiB          uint32 `json:"memory_mib"`
+	CPUs               uint32 `json:"cpus" binding:"required"`
+	MemoryMiB          uint32 `json:"memory_mib" binding:"required"`
 	RootDiskMiB        uint32 `json:"root_disk_mib,omitempty"`
 	EnvironmentDiskMiB uint32 `json:"environment_disk_mib,omitempty"`
 }
@@ -59,12 +59,12 @@ func (r Resources) ValidatePolicy(provider string, rules DeploymentPolicy) error
 // may address the same archive by config ID or OCI manifest digest; microsandbox
 // has its own imported OCI identity. These are not interchangeable hashes.
 type RuntimeRelease struct {
-	SourceCommit        string `json:"source_commit"`
-	ImageID             string `json:"image_id"`
-	ImageManifestDigest string `json:"image_manifest_digest"`
-	MicrosandboxRef     string `json:"microsandbox_ref"`
-	RuntimeSHA256       string `json:"runtime_sha256"`
-	FirmwareSHA256      string `json:"firmware_sha256"`
+	SourceCommit        string `json:"source_commit" binding:"required"`
+	ImageID             string `json:"image_id" binding:"required"`
+	ImageManifestDigest string `json:"image_manifest_digest" binding:"required"`
+	MicrosandboxRef     string `json:"microsandbox_ref" binding:"required"`
+	RuntimeSHA256       string `json:"runtime_sha256" binding:"required"`
+	FirmwareSHA256      string `json:"firmware_sha256" binding:"required"`
 }
 
 func (r RuntimeRelease) Validate() error {
@@ -78,7 +78,7 @@ func (r RuntimeRelease) Validate() error {
 }
 
 type DeploymentSpec struct {
-	Resources Resources       `json:"resources"`
+	Resources Resources       `json:"resources" binding:"required"`
 	Runtime   *RuntimeRelease `json:"runtime,omitempty"`
 }
 
diff --git a/services/core/internal/sessions/admin.go b/services/core/internal/sessions/admin.go
index 3db0ce646..ab9ae4f58 100644
--- a/services/core/internal/sessions/admin.go
+++ b/services/core/internal/sessions/admin.go
@@ -21,12 +21,12 @@ type AdminSummaryFilter struct{ CreatedAfter, CreatedBefore *time.Time }
 
 // AdminAssetCounts counts a tenant's assets.
 type AdminAssetCounts struct {
-	Agents               int64 `json:"agents"`
-	Skills               int64 `json:"skills"`
-	EnvironmentTemplates int64 `json:"environment_templates"`
-	Files                int64 `json:"files"`
-	Vaults               int64 `json:"vaults"`
-	Credentials          int64 `json:"credentials"`
+	Agents               int64 `json:"agents" binding:"required"`
+	Skills               int64 `json:"skills" binding:"required"`
+	EnvironmentTemplates int64 `json:"environment_templates" binding:"required"`
+	Files                int64 `json:"files" binding:"required"`
+	Vaults               int64 `json:"vaults" binding:"required"`
+	Credentials          int64 `json:"credentials" binding:"required"`
 }
 
 // AdminReader reads the administrator's cross-Project Session views.
diff --git a/services/core/internal/sessions/executor_credentials.go b/services/core/internal/sessions/executor_credentials.go
index 9fb1ea412..d7581791f 100644
--- a/services/core/internal/sessions/executor_credentials.go
+++ b/services/core/internal/sessions/executor_credentials.go
@@ -31,17 +31,17 @@ type ExecutorCredentialReader interface {
 }
 
 type IssuedExecutorCredential struct {
-	KeyID         string `json:"key_id"`
+	KeyID         string `json:"key_id" binding:"required"`
 	EnvironmentID string `json:"environment_id,omitempty"`
-	Token         string `json:"executor_token"`
+	Token         string `json:"executor_token" binding:"required"`
 }
 
 // ExecutorCredential is the metadata of one Environment executor credential.
 // Its secret is returned only when issued or rotated.
 type ExecutorCredential struct {
-	KeyID     string     `json:"key_id" format:"uuid"`
-	CreatedAt time.Time  `json:"created_at"`
-	RevokedAt *time.Time `json:"revoked_at" extensions:"x-nullable"`
+	KeyID     string     `json:"key_id" format:"uuid" binding:"required"`
+	CreatedAt time.Time  `json:"created_at" binding:"required"`
+	RevokedAt *time.Time `json:"revoked_at" extensions:"x-nullable" binding:"required"`
 }
 
 // ExecutorConnectionState is an internal durable observation, never a wire payload.
diff --git a/services/core/internal/sessions/reads.go b/services/core/internal/sessions/reads.go
index 883dd24b8..9f4a167bd 100644
--- a/services/core/internal/sessions/reads.go
+++ b/services/core/internal/sessions/reads.go
@@ -67,7 +67,7 @@ type TurnDiagnosticsSnapshot struct {
 // ManagedArchive reports resource disposal, not archive request provenance
 // or Turn settlement. Existing expiry and failed provisioning use the same states.
 type ManagedArchive struct {
-	SessionID     string `json:"session_id"`
-	EnvironmentID string `json:"environment_id"`
-	State         string `json:"state"`
+	SessionID     string `json:"session_id" binding:"required"`
+	EnvironmentID string `json:"environment_id" binding:"required"`
+	State         string `json:"state" enums:"active,cleanup_pending,released" binding:"required"`
 }
diff --git a/services/core/internal/writeaudit/reader.go b/services/core/internal/writeaudit/reader.go
index e1a4be872..367f752df 100644
--- a/services/core/internal/writeaudit/reader.go
+++ b/services/core/internal/writeaudit/reader.go
@@ -20,31 +20,31 @@ type Reader interface {
 // APIKey is the recorded identity of the key that made a write, with its
 // current revocation time.
 type APIKey struct {
-	ID        string     `json:"id"`
-	Name      string     `json:"name"`
-	Prefix    string     `json:"prefix"`
-	Kind      string     `json:"kind"`
-	RevokedAt *time.Time `json:"revoked_at"`
+	ID        string     `json:"id" binding:"required"`
+	Name      string     `json:"name" binding:"required"`
+	Prefix    string     `json:"prefix" binding:"required"`
+	Kind      string     `json:"kind" enums:"issued" binding:"required"`
+	RevokedAt *time.Time `json:"revoked_at" extensions:"x-nullable" binding:"required"`
 }
 
 // ResourceOwner is the recorded creator of one resource. APIKey is null for a
 // resource without recorded creation provenance.
 type ResourceOwner struct {
-	ResourceID string  `json:"resource_id"`
-	APIKey     *APIKey `json:"api_key"`
+	ResourceID string  `json:"resource_id" binding:"required"`
+	APIKey     *APIKey `json:"api_key" extensions:"x-nullable" binding:"required"`
 }
 
 // Operation is one committed write.
 type Operation struct {
-	ID           string    `json:"id"`
-	Action       string    `json:"action"`
-	ResourceType string    `json:"resource_type"`
-	ResourceID   string    `json:"resource_id"`
-	ParentID     string    `json:"parent_id"`
-	RequestID    string    `json:"request_id"`
-	TraceID      string    `json:"trace_id"`
-	APIKey       APIKey    `json:"api_key"`
-	CreatedAt    time.Time `json:"created_at"`
+	ID           string    `json:"id" binding:"required"`
+	Action       string    `json:"action" enums:"create,update,delete,send_events,upload_file,upload_version,update_default_version" binding:"required"`
+	ResourceType string    `json:"resource_type" enums:"agent,session,environment,environment_template,skill,skill_version,file,vault,credential,artifact" binding:"required"`
+	ResourceID   string    `json:"resource_id" binding:"required"`
+	ParentID     string    `json:"parent_id" binding:"required"`
+	RequestID    string    `json:"request_id" binding:"required"`
+	TraceID      string    `json:"trace_id" binding:"required"`
+	APIKey       APIKey    `json:"api_key" binding:"required"`
+	CreatedAt    time.Time `json:"created_at" binding:"required"`
 }
 
 // Filter selects committed writes, newest first. A zero Limit is the default
@@ -56,9 +56,9 @@ type Filter struct {
 }
 
 type Page struct {
-	Data       []Operation `json:"data"`
-	HasMore    bool        `json:"has_more"`
-	NextCursor string      `json:"next_cursor"`
+	Data       []Operation `json:"data" binding:"required"`
+	HasMore    bool        `json:"has_more" binding:"required"`
+	NextCursor string      `json:"next_cursor" binding:"required"`
 }
 
 // Validate checks f and returns it with the default page size applied. The

From d3a58f53560af60674424eaae2e890d0fc8c5134 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 16:43:28 +0800
Subject: [PATCH 55/60] Settle the generated client review findings (#556)

---
 contracts/agents-api/core.openapi.yaml           |  2 ++
 contracts/agents-api/index.md                    |  2 +-
 contracts/agents-api/runtime.openapi.yaml        |  2 ++
 contracts/agents-api/v1/events.go                |  5 ++++-
 contracts/agents-api/v1/events_test.go           |  6 ++++--
 contracts/agents-api/zh/index.md                 |  4 ++--
 packages/agents-client/src/generated/core-api.ts |  6 +++---
 scripts/generate-public-api.py                   |  7 ++++++-
 scripts/generate-public-api.test.py              | 11 +++++++++++
 services/core/internal/api/core_errors.go        |  4 ++--
 10 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index 941308164..3d52d068b 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -292,7 +292,9 @@ definitions:
       type:
         type: string
     required:
+      - code
       - message
+      - param
       - type
     type: object
   api.CoreErrorResponse:
diff --git a/contracts/agents-api/index.md b/contracts/agents-api/index.md
index f9ffb2cf9..280696bbb 100644
--- a/contracts/agents-api/index.md
+++ b/contracts/agents-api/index.md
@@ -14,7 +14,7 @@ Core targets the complete OpenAI Agents API as pinned below ([public API rule](h
 | [openapi.yaml](./openapi.yaml) | The official public contract with Core's `x_agents_core` extension on Agent and Session request/response objects |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go names, field representations, encoding order and stored projections; it does not define official field membership, enums or constraints |
 
-Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The TypeScript client's types, enum values and field names in `packages/agents-client/src/generated/public-api.ts` are generated from the resulting public schema. The internal `/core/v1` and `/api/v1` documents come from handler annotations; the same generator projects the `/core/v1` document into `packages/agents-client/src/generated/core-api.ts`, which imports the public types it references from `public-api.ts`. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
+Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The TypeScript client's types, enum values and field names in `packages/agents-client/src/generated/public-api.ts` are generated from the resulting public schema. The internal `/core/v1` and `/api/v1` documents come from handler annotations; the same generator projects the `/core/v1` document into `packages/agents-client/src/generated/core-api.ts`, which imports the public types it references from `public-api.ts`. In those annotations a response field Core always sends carries `binding:"required"`, a field that can be null carries `extensions:"x-nullable"`, and a closed set carries `enums:`; the tags only shape the documents, and the client rejects a response that breaks them. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
 
 The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` lists types consumed by Core and overrides only the Go representation or field order that existing storage or custom JSON encoding requires. Unspecified fields follow the official schema; shared shapes use one Go type. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, Core's local limits, execution admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
 
diff --git a/contracts/agents-api/runtime.openapi.yaml b/contracts/agents-api/runtime.openapi.yaml
index fb434cab2..64fbc6524 100644
--- a/contracts/agents-api/runtime.openapi.yaml
+++ b/contracts/agents-api/runtime.openapi.yaml
@@ -19,7 +19,9 @@ definitions:
       type:
         type: string
     required:
+      - code
       - message
+      - param
       - type
     type: object
   api.CoreErrorResponse:
diff --git a/contracts/agents-api/v1/events.go b/contracts/agents-api/v1/events.go
index c48a42d93..03205874d 100644
--- a/contracts/agents-api/v1/events.go
+++ b/contracts/agents-api/v1/events.go
@@ -21,7 +21,8 @@ func itemEvent(eventType string) bool {
 
 // MarshalJSON keeps the nullable top-level usage on terminal Turn events only,
 // a nullable output_index on every Item event (EVT-09), a nullable error param
-// on error events and a nullable turn_id on Environment events.
+// on error events and a nullable turn_id on Environment events. Subagent events
+// carry no session_id; their Subagent names the Session.
 func (e SessionEvent) MarshalJSON() ([]byte, error) {
 	type wire SessionEvent
 	switch {
@@ -52,6 +53,8 @@ func (e SessionEvent) MarshalJSON() ([]byte, error) {
 			wire
 			TurnID *string `json:"turn_id"`
 		}{wire(e), turn})
+	case strings.HasPrefix(e.Type, "agent.session.subagent."):
+		e.SessionID = ""
 	}
 	e.Usage = nil
 	return json.Marshal(wire(e))
diff --git a/contracts/agents-api/v1/events_test.go b/contracts/agents-api/v1/events_test.go
index 75374d166..5ede7e496 100644
--- a/contracts/agents-api/v1/events_test.go
+++ b/contracts/agents-api/v1/events_test.go
@@ -45,8 +45,8 @@ func TestSessionEventUsageOnlyOnTerminalTurnEvents(t *testing.T) {
 
 // Error events carry the pinned SessionError, whose param is present and null
 // when unset; Environment state errors keep their observed three fields (HI-01/02)
-// and Environment events carry a null turn_id.
-func TestSessionErrorEventCarriesNullableParam(t *testing.T) {
+// and Environment events carry a null turn_id. Subagent events carry no session_id.
+func TestSessionEventWireFields(t *testing.T) {
 	failure := &StreamError{Type: "environment_error", Code: "sandbox_error", Message: "Failed to provision environment"}
 	param := "input"
 	for _, test := range []struct {
@@ -60,6 +60,8 @@ func TestSessionErrorEventCarriesNullableParam(t *testing.T) {
 		{SessionEvent{Type: "agent.session.environment.failed", EventID: "event", Environment: &SessionEnvironmentState{ID: "environment", Type: "openai_hosted", Status: "failed",
 			Error: &StreamError{Type: "environment_error", Code: "environment_connection_failed", Message: "The environment failed to connect."}}},
 			`{"type":"agent.session.environment.failed","event_id":"event","environment":{"id":"environment","type":"openai_hosted","status":"failed","error":{"code":"environment_connection_failed","type":"environment_error","message":"The environment failed to connect."}},"turn_id":null}`},
+		{SessionEvent{Type: "agent.session.subagent.closed", EventID: "event", SessionID: "session", Subagent: &Subagent{ID: "subagent", Object: "agent.session.subagent", SessionID: "session", ParentAgentID: "root", Status: "closed"}},
+			`{"subagent":{"id":"subagent","object":"agent.session.subagent","session_id":"session","parent_agent_id":"root","opened_at":0,"closed_at":null,"name":null,"instructions":null,"status":"closed"},"type":"agent.session.subagent.closed","event_id":"event"}`},
 	} {
 		raw, err := json.Marshal(test.event)
 		if err != nil || string(raw) != test.want {
diff --git a/contracts/agents-api/zh/index.md b/contracts/agents-api/zh/index.md
index 04c831d54..9f98d96c2 100644
--- a/contracts/agents-api/zh/index.md
+++ b/contracts/agents-api/zh/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Agents API 覆盖台账"
 source: contracts/agents-api/index.md
-source_hash: b2281fe0f7ab7c4f810b029aca847a11a3a292d367dcacd1ac3f716f511e2814
+source_hash: dc1388f616997b89e298113b7626fac569a9650f9a52710500f96a86c2b1af80
 ---
 
 Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[public API rule](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#public-api)）。本台账记录 Core 对各项资源实现了哪些内容、哪些契约保存其详细信息，并列出相对于 OpenAI 服务的所有已知差异和所有未解决缺口。[API namespaces and credentials](../../../docs/zh/api/index.md) 说明谁调用哪些 API；[Agents API guide](../../../docs/zh/api/public-agent-api.md) 介绍使用方法。
@@ -16,7 +16,7 @@ Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[publi
 | [openapi.yaml](../openapi.yaml) | 官方公共契约，并在 Agent 和 Session 请求及响应对象上加入 Core 的 `x_agents_core` 扩展 |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go 名称、字段表示、编码顺序和存储投影；不定义官方字段集合、枚举或约束 |
 
-运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。TypeScript 客户端在 `packages/agents-client/src/generated/public-api.ts` 中的类型、枚举值和字段名由生成后的公共 schema 生成。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成；同一生成器把 `/core/v1` 文档投影为 `packages/agents-client/src/generated/core-api.ts`，其中引用的公共类型从 `public-api.ts` 导入。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
+运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。TypeScript 客户端在 `packages/agents-client/src/generated/public-api.ts` 中的类型、枚举值和字段名由生成后的公共 schema 生成。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成；同一生成器把 `/core/v1` 文档投影为 `packages/agents-client/src/generated/core-api.ts`，其中引用的公共类型从 `public-api.ts` 导入。在这些注解里，Core 总会发送的响应字段带 `binding:"required"`，可以为 null 的字段带 `extensions:"x-nullable"`，封闭集合带 `enums:`；这些标签只影响文档，客户端会拒绝不符合它们的响应。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
 
 公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；`go-bindings.json` 只列出 Core 使用的类型，仅在已有存储或自定义 JSON 编码需要时覆盖 Go 表示或字段顺序。未覆盖的字段遵循官方 schema，相同结构复用同一个 Go 类型。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、Core 的本地限制、执行准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
 
diff --git a/packages/agents-client/src/generated/core-api.ts b/packages/agents-client/src/generated/core-api.ts
index b930cfad5..34497e5bc 100644
--- a/packages/agents-client/src/generated/core-api.ts
+++ b/packages/agents-client/src/generated/core-api.ts
@@ -120,14 +120,14 @@ export interface ConfigurationDiscoveryInput {
 export const configurationDiscoveryInputFields = ["configuration", "credential", "query"] as const;
 export const configurationDiscoveryInputRequired = [] as const;
 export interface CoreAPIError {
-  code?: string | null;
+  code: string | null;
   details?: Record<string, unknown>;
   message: string;
-  param?: string | null;
+  param: string | null;
   type: string;
 }
 export const coreAPIErrorFields = ["code", "details", "message", "param", "type"] as const;
-export const coreAPIErrorRequired = ["message", "type"] as const;
+export const coreAPIErrorRequired = ["code", "message", "param", "type"] as const;
 export interface CoreErrorResponse {
   error: CoreAPIError;
 }
diff --git a/scripts/generate-public-api.py b/scripts/generate-public-api.py
index 8b92496ff..a9621d7f6 100644
--- a/scripts/generate-public-api.py
+++ b/scripts/generate-public-api.py
@@ -406,15 +406,20 @@ def core_module(document, public, bindings):
     taken = [ts_name(name) for name in local] + list(imported)
     for name in local:
         names[name] = ts_name(name) if taken.count(ts_name(name)) == 1 else name.split('.')[0].capitalize() + ts_name(name)
-    schemas = {}
+    schemas, hoisted = {}, []
     for name in local:
         schema = schemas[names[name]] = json.loads(refs.sub(lambda ref: f'"#/definitions/{names[ref[1]]}"', json.dumps(definitions[name])))
         for field, member in schema.get('properties', {}).items():
             target = member.get('items', member)
             if len(target.get('enum', [])) > 1:
                 enum = names[name] + ''.join(part.capitalize() for part in field.split('_'))
+                hoisted.append(enum)
                 schemas[enum] = {'type': target.pop('type'), 'enum': target.pop('enum')}
                 target['$ref'] = '#/definitions/' + enum
+    # A prefixed or hoisted name must not replace another type.
+    emitted = [*imported, *(names[name] for name in local), *hoisted]
+    if len(emitted) != len(set(emitted)):
+        raise ValueError('TypeScript names collide')
     used = sorted(imported.intersection(refs.findall(json.dumps(schemas))))
     header = ['import type { ' + ', '.join(used) + ' } from "./public-api";'] if used else []
     return ts_module(schemas, 'contracts/agents-api/core.openapi.yaml', header)
diff --git a/scripts/generate-public-api.test.py b/scripts/generate-public-api.test.py
index ca05c253b..dd039c572 100644
--- a/scripts/generate-public-api.test.py
+++ b/scripts/generate-public-api.test.py
@@ -134,6 +134,17 @@ def test_core_types_import_public_names_and_hoist_inline_enums(self):
             self.assertIn(line, generated)
         self.assertNotIn('Unused', generated)
 
+    def test_core_names_never_replace_another_type(self):
+        ref = '#/definitions/'
+        for definitions in (
+            {'api.Reset': {'type': 'object', 'properties': {'clear': {'type': 'string', 'enum': ['auto', 'force']}}}, 'api.ResetClear': {'type': 'object'}},
+            {'one.Node': {'type': 'object'}, 'two.Node': {'type': 'object'}, 'api.OneNode': {'type': 'object'}},
+        ):
+            document = {'paths': {'/x': {'get': {'responses': {'200': {'schema': {'type': 'object', 'properties': {
+                name: {'$ref': ref + name} for name in definitions}}}}}}}, 'definitions': definitions}
+            with self.subTest(sorted(definitions)), self.assertRaisesRegex(ValueError, 'collide'):
+                generator.core_module(document, {}, {})
+
     def test_every_public_reference_resolves_and_no_other_apis_leak(self):
         self.assertEqual({p.split('/')[1] for p in self.public['paths']}, {'agents', 'vaults', 'files', 'skills'})
         generator.prune_components(copy.deepcopy(self.public))
diff --git a/services/core/internal/api/core_errors.go b/services/core/internal/api/core_errors.go
index 50f118da4..f438838ad 100644
--- a/services/core/internal/api/core_errors.go
+++ b/services/core/internal/api/core_errors.go
@@ -15,8 +15,8 @@ type CoreErrorResponse struct {
 type CoreAPIError struct {
 	Message string  `json:"message" binding:"required"`
 	Type    string  `json:"type" binding:"required"`
-	Code    *string `json:"code" extensions:"x-nullable"`
-	Param   *string `json:"param" extensions:"x-nullable"`
+	Code    *string `json:"code" binding:"required" extensions:"x-nullable"`
+	Param   *string `json:"param" binding:"required" extensions:"x-nullable"`
 	// Details contains only documented, Core-owned facts: string, finite number,
 	// boolean, null or string array values. Never include request echoes, secrets
 	// or native/provider error text. Empty or invalid details are omitted.

From c56dafece61c47847827f1db05e14d10ba0af897 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 20:00:58 +0800
Subject: [PATCH 56/60] Use i18next for sandbox translations (#559)

---
 apps/web/src/features/fleet/DiagnosticTip.tsx |  2 +-
 apps/web/src/features/sandbox/NodeDetail.tsx  |  4 +--
 .../src/features/sandbox/NodeEditDialog.tsx   |  4 +--
 .../src/features/sandbox/NodeEnrollment.tsx   |  2 +-
 apps/web/src/features/sandbox/NodeList.tsx    |  4 +--
 .../features/sandbox/NodeRolloutStatus.tsx    |  4 +--
 .../sandbox/SandboxDeploymentPage.tsx         |  4 +--
 .../sandbox/SandboxDeploymentSettings.tsx     |  6 ++--
 .../features/sandbox/SandboxManagerView.tsx   |  4 +--
 .../features/sandbox/SandboxSetupWizard.tsx   |  8 ++---
 .../src/features/sandbox/node-enrollment.ts   |  4 +--
 apps/web/src/i18n/README.md                   |  9 ++---
 .../locales/zh-CN/first-run.ts}               |  2 +-
 .../locales/zh-CN/sandbox.ts}                 |  7 ++--
 apps/web/src/i18n/resources.ts                |  8 ++---
 apps/web/src/lib/locale.test.ts               | 22 ++++++-------
 apps/web/src/lib/locale.ts                    |  5 ---
 apps/web/src/lib/sandbox-diagnostic.test.ts   |  6 ++--
 apps/web/src/lib/sandbox-diagnostic.ts        | 11 ++++---
 apps/web/src/lib/sandbox-labels.test.ts       |  8 ++---
 apps/web/src/lib/sandbox-labels.ts            | 33 ++++++++-----------
 21 files changed, 72 insertions(+), 85 deletions(-)
 rename apps/web/src/{lib/console-auth-strings.ts => i18n/locales/zh-CN/first-run.ts} (97%)
 rename apps/web/src/{lib/locale-strings.ts => i18n/locales/zh-CN/sandbox.ts} (99%)
 delete mode 100644 apps/web/src/lib/locale.ts

diff --git a/apps/web/src/features/fleet/DiagnosticTip.tsx b/apps/web/src/features/fleet/DiagnosticTip.tsx
index 6151e8386..cbb6a909e 100644
--- a/apps/web/src/features/fleet/DiagnosticTip.tsx
+++ b/apps/web/src/features/fleet/DiagnosticTip.tsx
@@ -6,7 +6,7 @@ import { sandboxDiagnosticMessage } from "../../lib/sandbox-diagnostic";
 /** The specific reason behind a node's status, in the help tip beside it: what is wrong, then how to fix it. */
 export function DiagnosticTip({ code }: { code: string }) {
   const { i18n } = useTranslation();
-  const message = sandboxDiagnosticMessage(code, i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en");
+  const message = sandboxDiagnosticMessage(code, i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en");
   if (!message) return null;
   return (
     <HelpTip label={message.label}>
diff --git a/apps/web/src/features/sandbox/NodeDetail.tsx b/apps/web/src/features/sandbox/NodeDetail.tsx
index 6425e9766..ee1043cbe 100644
--- a/apps/web/src/features/sandbox/NodeDetail.tsx
+++ b/apps/web/src/features/sandbox/NodeDetail.tsx
@@ -19,7 +19,7 @@ function nodeDiagnostic(node: SandboxNode): string {
 
 function Diagnostic({ value }: { value: string }) {
   const { i18n } = useTranslation("sandbox");
-  const message = sandboxDiagnosticMessage(value, i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en");
+  const message = sandboxDiagnosticMessage(value, i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en");
   if (!message) return <>{MISSING}</>;
   return <span className="node-diagnostic">{message.label}<HelpTip label={message.label}>{message.advice}</HelpTip></span>;
 }
@@ -49,7 +49,7 @@ export function NodeDetail({ node, allocations, coreUrl, targetGeneration, stale
 }) {
   const { t, i18n } = useTranslation("sandbox");
   const locale = i18n.resolvedLanguage;
-  const shortLocale = locale?.startsWith("zh") ? "zh" : "en";
+  const shortLocale = locale?.startsWith("zh") ? "zh-CN" : "en";
   const now = Math.floor(Date.now() / 1000);
   const own = allocations.filter((allocation) => allocation.node_id === node.id);
   const reporting = !stale && node.online;
diff --git a/apps/web/src/features/sandbox/NodeEditDialog.tsx b/apps/web/src/features/sandbox/NodeEditDialog.tsx
index 0cfe46ec8..8740159f6 100644
--- a/apps/web/src/features/sandbox/NodeEditDialog.tsx
+++ b/apps/web/src/features/sandbox/NodeEditDialog.tsx
@@ -30,7 +30,7 @@ export function NodeEditDialog({ client, node, size, suspends, onClose, onSaved
   onSaved: () => void;
 }) {
   const { t, i18n } = useTranslation("sandbox");
-  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en";
   const { t: tCommon } = useTranslation("common");
   const id = useId();
   const [name, setName] = useState(node?.name ?? "");
@@ -61,7 +61,7 @@ export function NodeEditDialog({ client, node, size, suspends, onClose, onSaved
     t("Host: {{host}}.", { host: measure(hostCpus, hostMemory) }),
     ...(size ? [t("Each sandbox: {{size}}.", { size: measure(size.cpus, size.memory_mib * 2 ** 20) })] : []),
     ...(fit !== null && fit > 0 ? [t("Suggested: at most {{count}} at once.", { count: fit })] : []),
-  ].join(locale === "zh" ? "" : " ") : null;
+  ].join(locale === "zh-CN" ? "" : " ") : null;
 
   async function save() {
     if (!ready || !node) return;
diff --git a/apps/web/src/features/sandbox/NodeEnrollment.tsx b/apps/web/src/features/sandbox/NodeEnrollment.tsx
index 8247faea1..86d0dbe2b 100644
--- a/apps/web/src/features/sandbox/NodeEnrollment.tsx
+++ b/apps/web/src/features/sandbox/NodeEnrollment.tsx
@@ -69,7 +69,7 @@ export function NodeEnrollment({ client, consoleConfig, deployment, nodes, open,
   onRefresh: () => Promise<SandboxNode[] | null>;
 }) {
   const { t, i18n } = useTranslation("sandbox");
-  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en";
   const { t: tCommon } = useTranslation("common");
   const id = useId();
   const [active, setActive] = useState(DEFAULT_ACTIVE);
diff --git a/apps/web/src/features/sandbox/NodeList.tsx b/apps/web/src/features/sandbox/NodeList.tsx
index 055c9b700..d24f73383 100644
--- a/apps/web/src/features/sandbox/NodeList.tsx
+++ b/apps/web/src/features/sandbox/NodeList.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { HelpTip, StatusDot, type Tone } from "../../components/console-ui";
 import { NameCell, RowActions } from "../../components/list-ui";
 import { epochSeconds, formatDateTime, formatRelative } from "../../lib/format";
-import type { MessageKey } from "../../lib/locale-strings";
+import type { ParseKeys } from "i18next";
 import { nodeProviderDiagnostic } from "../../lib/sandbox-diagnostic";
 import { DiagnosticTip } from "../fleet/DiagnosticTip";
 import { nodeHealth, suspendedSandboxes } from "../fleet/fleet-model";
@@ -36,7 +36,7 @@ export function nodeState(node: SandboxNode, allocations: readonly SandboxAlloca
 }
 
 const stateTone: Record<NodeState, Tone> = { unconfirmed: "neutral", old_address: "warning", offline: "danger", degraded: "warning", attention: "warning", available: "ok" };
-const stateLabel: Record<NodeState, MessageKey> = {
+const stateLabel: Record<NodeState, ParseKeys<"sandbox">> = {
   unconfirmed: "Status unconfirmed",
   old_address: "Old address",
   offline: "Offline",
diff --git a/apps/web/src/features/sandbox/NodeRolloutStatus.tsx b/apps/web/src/features/sandbox/NodeRolloutStatus.tsx
index f7a074c2a..8a12cf4a6 100644
--- a/apps/web/src/features/sandbox/NodeRolloutStatus.tsx
+++ b/apps/web/src/features/sandbox/NodeRolloutStatus.tsx
@@ -1,10 +1,10 @@
 import type { SandboxNode, SandboxNodeRollout } from "@oac/agents-client";
 import { useTranslation } from "react-i18next";
 import { HelpTip, StatusDot, type Tone } from "../../components/console-ui";
-import type { MessageKey } from "../../lib/locale-strings";
+import type { ParseKeys } from "i18next";
 import { DiagnosticTip } from "../fleet/DiagnosticTip";
 
-const labels: Record<SandboxNodeRollout["state"], MessageKey> = { ready: "Ready for target", preparing: "Preparing target", failed: "Preparation failed", update_required: "Node software incompatible", unknown: "Target readiness unknown" };
+const labels: Record<SandboxNodeRollout["state"], ParseKeys<"sandbox">> = { ready: "Ready for target", preparing: "Preparing target", failed: "Preparation failed", update_required: "Node software incompatible", unknown: "Target readiness unknown" };
 const tones: Record<SandboxNodeRollout["state"], Tone> = { ready: "ok", preparing: "neutral", failed: "warning", update_required: "warning", unknown: "neutral" };
 
 /** A serving pin is historical ownership, not proof of a live connection or capacity. */
diff --git a/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx b/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
index 6b071309a..b92c4b3d5 100644
--- a/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
+++ b/apps/web/src/features/sandbox/SandboxDeploymentPage.tsx
@@ -34,7 +34,7 @@ function DeploymentHeader({ actions }: { actions?: ReactNode }) {
 /** System's secondary page is the sole owner of deployment configuration controls. */
 export function SandboxDeploymentPage() {
   const { i18n } = useTranslation("sandbox");
-  return <section className="page-section console-page sandbox-manager sandbox-manager-page" lang={i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en"}>
+  return <section className="page-section console-page sandbox-manager sandbox-manager-page" lang={i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en"}>
     <DeploymentConfiguration />
   </section>;
 }
@@ -42,7 +42,7 @@ export function SandboxDeploymentPage() {
 function DeploymentConfiguration() {
   const { t, i18n } = useTranslation("sandbox");
   const { t: tNavigation } = useTranslation("sandboxNavigation");
-  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en";
   const { navigate } = useConsoleNavigation();
   const queryClient = useQueryClient();
   const { deploymentQuery, snapshot, installation, loading, busy, setupNeedsRefresh, confirmed, fresh, refresh, configurationKey } = useSandboxPageState();
diff --git a/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx b/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
index 94e585299..4b581ace3 100644
--- a/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
+++ b/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
 import { Modal } from "../../components/Modal";
 import { HelpTip, RefreshButton } from "../../components/console-ui";
 import { formatBytes, formatPeriod, MISSING } from "../../lib/format";
-import type { MessageKey } from "../../lib/locale-strings";
+import type { ParseKeys } from "i18next";
 import { sandboxProviderLabel } from "../../lib/sandbox-labels";
 import { sandboxSize, templateBuildSize, templateBuildStatus } from "./deployment-specification";
 import { SandboxRolloutSummary } from "./SandboxRolloutSummary";
@@ -12,7 +12,7 @@ import { SandboxResetControls } from "./SandboxResetControls";
 import { SandboxSetupWizard } from "./SandboxSetupWizard";
 
 const MIB = 2 ** 20;
-const buildStatusLabel: Record<ReturnType<typeof templateBuildStatus>, MessageKey> = { ready: "Ready", notReady: "Not ready", unknown: "Unknown state" };
+const buildStatusLabel: Record<ReturnType<typeof templateBuildStatus>, ParseKeys<"sandbox">> = { ready: "Ready", notReady: "Not ready", unknown: "Unknown state" };
 
 export function SandboxDeploymentSettings({ deployment, disabled, fresh, onReset, onCancelReset, onUpdate, writeFailure, onRefresh, refreshing, pending }: {
   deployment: SandboxDeployment;
@@ -28,7 +28,7 @@ export function SandboxDeploymentSettings({ deployment, disabled, fresh, onReset
 }) {
   const { t, i18n } = useTranslation("sandbox");
   const { t: tNavigation } = useTranslation("sandboxNavigation");
-  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en";
   const [changing, setChanging] = useState(false);
   const [editKey, setEditKey] = useState(0);
   const spec = deployment.specification;
diff --git a/apps/web/src/features/sandbox/SandboxManagerView.tsx b/apps/web/src/features/sandbox/SandboxManagerView.tsx
index ace738101..82596e9cc 100644
--- a/apps/web/src/features/sandbox/SandboxManagerView.tsx
+++ b/apps/web/src/features/sandbox/SandboxManagerView.tsx
@@ -25,7 +25,7 @@ import "./SandboxManagerView.css";
 /** Nodes owns node enrollment, the list and individual node management. */
 export function SandboxManagerView() {
   const { t, i18n } = useTranslation("sandbox");
-  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en";
   const { data: config, isError, isFetching, refetch } = useQuery(sandboxConsoleConfigQuery);
   return <section className="page-section console-page sandbox-manager sandbox-manager-page" lang={locale}>
     {config ? <SandboxManager consoleConfig={config} /> : <>
@@ -53,7 +53,7 @@ function NodesPageHeader({ title, count, back, actions, headingRef }: { title?:
 
 function SandboxManager({ consoleConfig }: { consoleConfig: SandboxConsoleConfig }) {
   const { t, i18n } = useTranslation("sandbox");
-  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en";
   const { params, navigate, back: goBack } = useConsoleNavigation();
   const client = sandboxAdmin;
   const queryClient = useQueryClient();
diff --git a/apps/web/src/features/sandbox/SandboxSetupWizard.tsx b/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
index c05c26921..1a63bf98d 100644
--- a/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
+++ b/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
@@ -13,7 +13,7 @@ import { useConsoleNavigation } from "../../lib/console-navigation";
 import { coreFieldError } from "../../lib/core-error";
 import { formatBytes } from "../../lib/format";
 import { installationQuery } from "../../lib/installation";
-import type { MessageKey } from "../../lib/locale-strings";
+import type { ParseKeys } from "i18next";
 import { sandboxConfigurationRejection, sandboxProviderLabel } from "../../lib/sandbox-labels";
 import { defaultSandboxResources, distributionRuntime, isRuntimeRelease, isRuntimeReleaseField, RUNTIME_RELEASE_FIELDS, savedSpecification, validSandboxResources } from "./deployment-specification";
 import { e2bKeyReady, e2bUpdateSelection } from "./sandbox-update";
@@ -81,7 +81,7 @@ function presets(provider: SandboxProvider): Record<Preset, SandboxResources> |
   return { small: scale(0.5), standard, large: scale(2) };
 }
 
-const releaseLabels: Record<keyof SandboxRuntimeRelease, MessageKey> = {
+const releaseLabels: Record<keyof SandboxRuntimeRelease, ParseKeys<"sandbox">> = {
   source_commit: "Source commit",
   image_id: "Image ID",
   image_manifest_digest: "Image manifest digest",
@@ -125,7 +125,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
   const { t, i18n } = useTranslation("sandbox");
   const { t: tCommon } = useTranslation("common");
   const id = useId();
-  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh" : "en";
+  const locale = i18n.resolvedLanguage?.startsWith("zh") ? "zh-CN" : "en";
   const currentMode: Where | null = current ? deploymentContract.providers[current.provider].mode : null;
   const [step, setStep] = useState<Step>(editing ? currentMode === "direct" ? "e2b" : "size" : "where");
   const [where, setWhere] = useState<Where | null>(currentMode);
@@ -542,7 +542,7 @@ function NumberField({ id, label, value, onChange, error }: { error?: string | n
   );
 }
 
-function Nav({ onBack, onNext, nextDisabled, t }: { onBack: () => void; onNext?: () => void; nextDisabled?: boolean; t: (key: MessageKey) => string }) {
+function Nav({ onBack, onNext, nextDisabled, t }: { onBack: () => void; onNext?: () => void; nextDisabled?: boolean; t: (key: ParseKeys<"sandbox">) => string }) {
   return (
     <div className="wizard-nav">
       <button className="button ghost" type="button" onClick={onBack}><ArrowLeft size={14} aria-hidden="true" />{t("Back")}</button>
diff --git a/apps/web/src/features/sandbox/node-enrollment.ts b/apps/web/src/features/sandbox/node-enrollment.ts
index 33b2e3ff5..b68c450ae 100644
--- a/apps/web/src/features/sandbox/node-enrollment.ts
+++ b/apps/web/src/features/sandbox/node-enrollment.ts
@@ -1,6 +1,6 @@
 import type { SandboxEnrollment, SandboxNode } from "@oac/agents-client";
 
-import type { MessageKey } from "../../lib/locale-strings";
+import type { ParseKeys } from "i18next";
 import { nodeProviderDiagnostic } from "../../lib/sandbox-diagnostic";
 
 /**
@@ -11,7 +11,7 @@ import { nodeProviderDiagnostic } from "../../lib/sandbox-diagnostic";
 export const NODE_READY_WAIT_MS = 60_000;
 
 export interface HostPrerequisite {
-  label: MessageKey;
+  label: ParseKeys<"sandbox">;
 }
 
 /**
diff --git a/apps/web/src/i18n/README.md b/apps/web/src/i18n/README.md
index 4fba2e457..51cda8d31 100644
--- a/apps/web/src/i18n/README.md
+++ b/apps/web/src/i18n/README.md
@@ -5,7 +5,7 @@ The console uses `i18next` and `react-i18next`. English is the fallback language
 Translations are split by namespace, registered in `resources.ts`:
 
 - `locales/en/*.ts` and `locales/zh-CN/*.ts` hold one file per feature namespace: `common` (reusable actions and labels, with the Core error messages of `core-errors.ts` nested inside it), `navigation` (the shell), `pages`, `agents`, `templates`, `vaults`, `files`, `skills`, `keys`, `sessions`, `diagnostics`, `dashboard`, `overview`, `metrics`, `system`, `sandbox-navigation` (registered as `sandboxNavigation`) and `onboarding`.
-- The `sandbox` and `firstRun` namespaces come from `src/lib/locale-strings.ts` and `src/lib/console-auth-strings.ts`. Their keys are the English text and their values the Chinese translation. Sandbox status and node diagnostic formatting in `src/lib/sandbox-labels.ts` and `src/lib/sandbox-diagnostic.ts` reads the same strings.
+- `sandbox` and `firstRun` use English text as keys in `locales/zh-CN/sandbox.ts` and `locales/zh-CN/first-run.ts`; `resources.ts` projects those keys into the English resources. Keep these keys unchanged when moving copy.
 
 Add a namespace when a feature grows beyond page-level labels; do not grow one application-wide translation object.
 
@@ -13,8 +13,9 @@ When adding or changing copy:
 
 1. Add the English key and the `zh-CN` translation in matching namespace files.
 2. Consume the key with `useTranslation(namespace)` in React components.
-3. Use interpolation for dynamic values instead of concatenating translated text.
-4. Keep API values, identifiers, paths, commands and user-provided content out of translation resources.
-5. Run the Web tests. The resource parity test rejects keys missing from either language.
+3. Outside React, use `i18n.getFixedT(language, namespace)` with `SupportedLanguage` for an explicit language without changing the console language; use i18next’s `ParseKeys` for typed key maps.
+4. Use interpolation for dynamic values instead of concatenating translated text.
+5. Keep API values, identifiers, paths, commands and user-provided content out of translation resources.
+6. Run the Web tests. The resource parity test rejects keys missing from either language.
 
 The initial language follows the browser preference (`zh*` selects `zh-CN`) unless the user has chosen a language in the console menu. The choice is stored in local storage; the console still works when browser storage is unavailable.
diff --git a/apps/web/src/lib/console-auth-strings.ts b/apps/web/src/i18n/locales/zh-CN/first-run.ts
similarity index 97%
rename from apps/web/src/lib/console-auth-strings.ts
rename to apps/web/src/i18n/locales/zh-CN/first-run.ts
index c6490daef..eacaec837 100644
--- a/apps/web/src/lib/console-auth-strings.ts
+++ b/apps/web/src/i18n/locales/zh-CN/first-run.ts
@@ -1,4 +1,4 @@
-export const consoleAuthChinese = {
+export const firstRun = {
   "Try again": "重试",
   "Sign in to OpenAgentCore": "登录 OpenAgentCore",
   "Core key": "Core Key",
diff --git a/apps/web/src/lib/locale-strings.ts b/apps/web/src/i18n/locales/zh-CN/sandbox.ts
similarity index 99%
rename from apps/web/src/lib/locale-strings.ts
rename to apps/web/src/i18n/locales/zh-CN/sandbox.ts
index 6d2141165..cd38572cd 100644
--- a/apps/web/src/lib/locale-strings.ts
+++ b/apps/web/src/i18n/locales/zh-CN/sandbox.ts
@@ -1,5 +1,5 @@
-import { consoleAuthChinese } from "./console-auth-strings";
-export const chinese = {
+import { firstRun } from "./first-run";
+export const sandbox = {
   "E2B provider": "E2B 服务商",
   "Other E2B-compatible provider": "其他兼容 E2B 的服务商",
   "Loading templates…": "正在读取模板…",
@@ -13,7 +13,7 @@ export const chinese = {
   "Select a ready build": "选择 ready 构建",
   "Core validates the exact ready build again when you save.": "保存时 Core 会再次校验所选的 ready 构建。",
   "The selected provider supplies a default. You can edit it for a compatible endpoint.": "服务商已带出默认地址，也可以修改为兼容接口。",
-  ...consoleAuthChinese,
+  ...firstRun,
   "Hosted Sessions will be archived permanently. Deployment configuration and node registrations will be cleared. Unsaved workspace contents may be lost.": "托管 Session 将归档且无法恢复，部署配置与节点注册将清除。未保存的工作区内容可能丢失。",
   "What reset affects": "重置影响范围",
   "How automatic reset works": "自动清理规则",
@@ -421,4 +421,3 @@ export const chinese = {
   "{{name}} is still bound to an old Core address. Remove it and add it again.": "{{name}} 仍绑定在旧的 Core 地址上，需要移除后重新添加。",
   "{{count}} nodes are still bound to an old Core address: {{names}}. Remove them and add them again.": "有 {{count}} 个节点仍绑定在旧的 Core 地址上：{{names}}。需要移除后重新添加。",
 } as const;
-export type MessageKey = keyof typeof chinese;
diff --git a/apps/web/src/i18n/resources.ts b/apps/web/src/i18n/resources.ts
index d4774c8b1..2d970c6e5 100644
--- a/apps/web/src/i18n/resources.ts
+++ b/apps/web/src/i18n/resources.ts
@@ -32,17 +32,13 @@ import { skills as zhCNSkills } from "./locales/zh-CN/skills";
 import { keys as zhCNKeys } from "./locales/zh-CN/keys";
 import { system as zhCNSystem } from "./locales/zh-CN/system";
 import { onboarding as zhCNOnboarding } from "./locales/zh-CN/onboarding";
-import { consoleAuthChinese } from "../lib/console-auth-strings";
-import { chinese as zhCNSandbox } from "../lib/locale-strings";
+import { firstRun as zhCNFirstRun } from "./locales/zh-CN/first-run";
+import { sandbox as zhCNSandbox } from "./locales/zh-CN/sandbox";
 
 const enSandbox = Object.fromEntries(
   Object.keys(zhCNSandbox).map((key) => [key, key]),
 ) as { [K in keyof typeof zhCNSandbox]: K };
 
-const zhCNFirstRun = {
-  ...consoleAuthChinese,
-} as const;
-
 const enFirstRun = Object.fromEntries(
   Object.keys(zhCNFirstRun).map((key) => [key, key]),
 ) as { [K in keyof typeof zhCNFirstRun]: K };
diff --git a/apps/web/src/lib/locale.test.ts b/apps/web/src/lib/locale.test.ts
index 1d61ce7e1..ad570bde6 100644
--- a/apps/web/src/lib/locale.test.ts
+++ b/apps/web/src/lib/locale.test.ts
@@ -6,29 +6,29 @@ import { sandboxDiagnosticMessage } from "./sandbox-diagnostic";
 describe("sandbox localization", () => {
   it("localizes every persisted allocation and compute state without exposing unknown values", () => {
     for (const state of ["creating", "running", "cleanup_pending", "released", "disabled", "quiescing", "suspending", "suspended", "restoring", "waking"]) {
-      expect(sandboxStateLabel(state, "zh")).toMatch(/[\u4e00-\u9fff]/);
-      expect(sandboxStateLabel(state, "zh")).not.toBe("未知状态");
+      expect(sandboxStateLabel(state, "zh-CN")).toMatch(/[\u4e00-\u9fff]/);
+      expect(sandboxStateLabel(state, "zh-CN")).not.toBe("未知状态");
     }
-    expect(sandboxStateLabel("internal-value", "zh")).toBe("未知状态");
+    expect(sandboxStateLabel("internal-value", "zh-CN")).toBe("未知状态");
   });
   it("localizes all diagnostic labels and advice", () => {
     for (const code of ["node_unavailable", "resource_missing", "compute_unconfirmed", "ownership_mismatch", "provider_unavailable", "host_unsupported",
       "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient", "unknown"]) {
-      const message = sandboxDiagnosticMessage(code, "zh");
+      const message = sandboxDiagnosticMessage(code, "zh-CN");
       expect(message?.label).toMatch(/[\u4e00-\u9fff]/);
       expect(message?.advice).toMatch(/[\u4e00-\u9fff]/);
     }
-    expect(sandboxDiagnosticMessage("", "zh")).toBeNull();
+    expect(sandboxDiagnosticMessage("", "zh-CN")).toBeNull();
   });
   it("shows Core's reason for a refusal and keeps other failures to the console's words", () => {
     // A code with one exact meaning keeps the console's localized words.
-    expect(sandboxRequestError(new AgentCoreError("Node node-edge still has allocations.", 409, "runtime_node_in_use"), "zh")).toBe("节点仍有活跃分配或保留资源。请先清理资源分配、快照、预留资源和待清理项，再移除节点。");
+    expect(sandboxRequestError(new AgentCoreError("Node node-edge still has allocations.", 409, "runtime_node_in_use"), "zh-CN")).toBe("节点仍有活跃分配或保留资源。请先清理资源分配、快照、预留资源和待清理项，再移除节点。");
     // A refusal is Core's to explain: one code, such as a 409 conflict, covers several reasons.
-    expect(sandboxRequestError(new AgentCoreError("This console is read-only.", 403), "zh")).toBe("This console is read-only.");
-    expect(sandboxRequestError(new AgentCoreError("The session is busy.", 409, "conflict_error"), "zh")).toBe("The session is busy.");
+    expect(sandboxRequestError(new AgentCoreError("This console is read-only.", 403), "zh-CN")).toBe("This console is read-only.");
+    expect(sandboxRequestError(new AgentCoreError("The session is busy.", 409, "conflict_error"), "zh-CN")).toBe("The session is busy.");
     // A sandbox refusal whose reason the client withheld is named without it.
-    expect(sandboxRequestError(new AgentCoreError("withheld", 400, "sandbox_configuration_unconfirmed"), "zh")).toBe("Core 拒绝了这个沙箱配置。");
-    expect(sandboxRequestError(new AgentCoreError("raw secret", 502), "zh")).not.toContain("raw secret");
-    expect(sandboxRequestError(new Error("raw secret"), "zh")).not.toContain("raw secret");
+    expect(sandboxRequestError(new AgentCoreError("withheld", 400, "sandbox_configuration_unconfirmed"), "zh-CN")).toBe("Core 拒绝了这个沙箱配置。");
+    expect(sandboxRequestError(new AgentCoreError("raw secret", 502), "zh-CN")).not.toContain("raw secret");
+    expect(sandboxRequestError(new Error("raw secret"), "zh-CN")).not.toContain("raw secret");
   });
 });
diff --git a/apps/web/src/lib/locale.ts b/apps/web/src/lib/locale.ts
deleted file mode 100644
index 9f02335c9..000000000
--- a/apps/web/src/lib/locale.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { chinese, type MessageKey } from "./locale-strings";
-export type Locale = "en" | "zh";
-export function translate(locale: Locale, key: MessageKey): string {
-  return locale === "zh" ? chinese[key] : key;
-}
diff --git a/apps/web/src/lib/sandbox-diagnostic.test.ts b/apps/web/src/lib/sandbox-diagnostic.test.ts
index 5c6c5a0c6..65a830b86 100644
--- a/apps/web/src/lib/sandbox-diagnostic.test.ts
+++ b/apps/web/src/lib/sandbox-diagnostic.test.ts
@@ -39,11 +39,11 @@ describe("sandbox diagnostics", () => {
       label: "Runtime download failed",
       advice: "Runtime files could not be downloaded or verified. Check the node's network access and the configured Runtime release.",
     });
-    expect(sandboxDiagnosticMessage(diagnostic, "zh")).toEqual({
+    expect(sandboxDiagnosticMessage(diagnostic, "zh-CN")).toEqual({
       label: "Runtime 下载失败",
       advice: "Runtime 文件下载或验证失败。请检查节点网络连接及配置的 Runtime 发布版本。",
     });
-    for (const locale of ["en", "zh"] as const) {
+    for (const locale of ["en", "zh-CN"] as const) {
       expect(sandboxDiagnosticMessage(diagnostic, locale)).not.toEqual(sandboxDiagnosticMessage("runtime_image_unavailable", locale));
     }
   });
@@ -53,7 +53,7 @@ describe("shared node readiness diagnostics", () => {
   it.each(sandboxNodeDiagnostics)("preserves %s with localized messages", (diagnostic) => {
     expect(nodeProviderDiagnostic({ online: true, provider_ready: false, diagnostic })).toBe(diagnostic);
     const english = sandboxDiagnosticMessage(diagnostic, "en");
-    const chinese = sandboxDiagnosticMessage(diagnostic, "zh");
+    const chinese = sandboxDiagnosticMessage(diagnostic, "zh-CN");
     expect(english?.label).not.toBe("Sandbox state needs attention");
     expect(english?.advice).not.toBe("Inspect the assigned node and resource, then refresh.");
     expect(chinese?.label).not.toBe(english?.label);
diff --git a/apps/web/src/lib/sandbox-diagnostic.ts b/apps/web/src/lib/sandbox-diagnostic.ts
index 37d350819..aaf2ecbd0 100644
--- a/apps/web/src/lib/sandbox-diagnostic.ts
+++ b/apps/web/src/lib/sandbox-diagnostic.ts
@@ -1,9 +1,9 @@
 import { normalizeSandboxNodeDiagnostic, type SandboxNode } from "@oac/agents-client";
-import { translate, type Locale } from "./locale";
-import type { MessageKey } from "./locale-strings";
+import i18n, { type SupportedLanguage } from "../i18n";
+import type { ParseKeys } from "i18next";
 export interface SandboxDiagnosticMessage { label: string; advice: string }
 
-const diagnostics: Record<string, { label: MessageKey; advice: MessageKey }> = {
+const diagnostics: Record<string, { label: ParseKeys<"sandbox">; advice: ParseKeys<"sandbox"> }> = {
   node_unavailable: {
     label: "Node disconnected",
     advice: "Reconnect the assigned node, then refresh. Existing resources stay assigned to this node; Core does not move the Session automatically.",
@@ -57,11 +57,12 @@ export function nodeProviderDiagnostic(node: Pick<SandboxNode, "online" | "provi
   return normalizeSandboxNodeDiagnostic(node.diagnostic ?? "");
 }
 
-export function sandboxDiagnosticMessage(value?: string, locale: Locale = "en"): SandboxDiagnosticMessage | null {
+export function sandboxDiagnosticMessage(value?: string, locale: SupportedLanguage = "en"): SandboxDiagnosticMessage | null {
   if (!value) return null;
   const message = Object.hasOwn(diagnostics, value) ? diagnostics[value]! : {
     label: "Sandbox state needs attention",
     advice: "Inspect the assigned node and resource, then refresh.",
   } as const;
-  return { label: translate(locale, message.label), advice: translate(locale, message.advice) };
+  const t = i18n.getFixedT(locale, "sandbox");
+  return { label: t(message.label), advice: t(message.advice) };
 }
diff --git a/apps/web/src/lib/sandbox-labels.test.ts b/apps/web/src/lib/sandbox-labels.test.ts
index ccbc083ba..095781bdc 100644
--- a/apps/web/src/lib/sandbox-labels.test.ts
+++ b/apps/web/src/lib/sandbox-labels.test.ts
@@ -7,7 +7,7 @@ describe("sandbox write outcome", () => {
   it("uses fixed bilingual E2B errors without reflecting provider text or secrets", () => {
     for (const [code, status] of [["sandbox_credential_ownership", 409], ["sandbox_credential_invalid", 400], ["sandbox_configuration_invalid", 400], ["sandbox_verification_unconfirmed", 503]] as const) {
       const error = new AgentCoreError("secret-provider-response", status, code);
-      for (const locale of ["en", "zh"] as const) {
+      for (const locale of ["en", "zh-CN"] as const) {
         expect(sandboxRequestError(error, locale)).not.toContain("secret-provider-response");
         if (status < 500) expect(sandboxConfigurationRejection(error, locale)).toBe(sandboxRequestError(error, locale));
         else expect(sandboxConfigurationRejection(error, locale)).toBeNull();
@@ -31,16 +31,16 @@ describe("reset conflict recovery", () => {
   it("explains reset-required configuration changes without assuming a different backend or team", () => {
     const error = new AgentCoreError("untrusted-provider-detail", 409, "sandbox_reset_required");
     expect(sandboxConfigurationRejection(error, "en")).toBe("Reset the sandbox deployment before changing this configuration.");
-    expect(sandboxRequestError(error, "zh")).toBe("请先重置沙箱部署，再更改此配置。");
+    expect(sandboxRequestError(error, "zh-CN")).toBe("请先重置沙箱部署，再更改此配置。");
   });
 
   it("gives bilingual safe recovery for known state conflicts without reflecting a server payload", () => {
     for (const code of ["sandbox_generation_stale", "sandbox_reset_required", "sandbox_reset_in_progress", "sandbox_not_configured", "sandbox_in_use"]) {
       const error = new AgentCoreError("untrusted-secret-like-payload", 409, code);
-      for (const locale of ["en", "zh"] as const) expect(sandboxRequestError(error, locale)).not.toContain("untrusted-secret-like-payload");
+      for (const locale of ["en", "zh-CN"] as const) expect(sandboxRequestError(error, locale)).not.toContain("untrusted-secret-like-payload");
       expect(sandboxWriteUncertain(error)).toBe(false);
     }
     expect(sandboxRequestError(new AgentCoreError("stale", 409, "sandbox_generation_stale"), "en")).toContain("Refresh and review");
-    expect(sandboxRequestError(new AgentCoreError("reset", 409, "sandbox_reset_in_progress"), "zh")).toContain("正在重置");
+    expect(sandboxRequestError(new AgentCoreError("reset", 409, "sandbox_reset_in_progress"), "zh-CN")).toContain("正在重置");
   });
 });
diff --git a/apps/web/src/lib/sandbox-labels.ts b/apps/web/src/lib/sandbox-labels.ts
index 0995dd7aa..d537c6106 100644
--- a/apps/web/src/lib/sandbox-labels.ts
+++ b/apps/web/src/lib/sandbox-labels.ts
@@ -1,22 +1,21 @@
-import { AgentCoreError, sandboxConfigurationUnconfirmed, type SandboxNode, type SandboxProvider } from "@oac/agents-client";
-import i18n from "../i18n";
+import { AgentCoreError, sandboxConfigurationUnconfirmed, type SandboxProvider } from "@oac/agents-client";
+import i18n, { type SupportedLanguage } from "../i18n";
 import { knownCoreError } from "./core-error";
-import { translate, type Locale } from "./locale";
-import type { MessageKey } from "./locale-strings";
+import type { ParseKeys } from "i18next";
 
-const states: Record<string, MessageKey> = {
+const states: Record<string, ParseKeys<"sandbox">> = {
   reserved: "Reserved state", creating: "Creating", active: "Active", releasing: "Releasing", released: "Released", failed: "Failed", pending: "Pending",
   cleanup_pending: "Cleanup pending", disabled: "Disabled", waking: "Waking",
   running: "Running", quiescing: "Quiescing", suspending: "Suspending", suspended: "Suspended", restoring: "Restoring", stopped: "Stopped",
 };
-export function sandboxStateLabel(state: string, locale: Locale): string {
-  return translate(locale, Object.hasOwn(states, state) ? states[state]! : "Unknown state");
+export function sandboxStateLabel(state: string, locale: SupportedLanguage): string {
+  return i18n.getFixedT(locale, "sandbox")(Object.hasOwn(states, state) ? states[state]! : "Unknown state");
 }
 /** Localized catalog errors first; unknown refusals retain Core’s message. */
-export function sandboxRequestError(error: unknown, locale: Locale): string {
-  const known = knownCoreError(error, i18n.getFixedT(locale === "zh" ? "zh-CN" : "en", "common"), "bytes");
+export function sandboxRequestError(error: unknown, locale: SupportedLanguage): string {
+  const known = knownCoreError(error, i18n.getFixedT(locale, "common"), "bytes");
   if (known) return known;
-  let key: MessageKey = "The sandbox request failed. Refresh to check the current state before trying again.";
+  let key: ParseKeys<"sandbox"> = "The sandbox request failed. Refresh to check the current state before trying again.";
   if (error instanceof AgentCoreError) {
     const refused = !sandboxWriteUncertain(error);
     if (error.code === sandboxConfigurationUnconfirmed) { if (refused) key = "Core rejected the sandbox configuration."; else if (error.status >= 500) key = "The sandbox service is unavailable. Refresh to check the current state."; }
@@ -25,7 +24,7 @@ export function sandboxRequestError(error: unknown, locale: Locale): string {
       key = "The sandbox request was rejected. Refresh to check the current state.";
     } else if (error.status >= 500) key = "The sandbox service is unavailable. Refresh to check the current state.";
   } else if (error instanceof Error && error.message === "removal_unconfirmed") key = "Core did not confirm node removal. Refresh to check its state.";
-  return translate(locale, key);
+  return i18n.getFixedT(locale, "sandbox")(key);
 }
 
 /**
@@ -45,20 +44,16 @@ export function sandboxWriteUncertain(error: unknown): boolean {
  * such as E2B with a loopback public_url; null for any other failure. Nothing
  * was saved, so the administrator corrects the cause and saves again.
  */
-export function sandboxConfigurationRejection(error: unknown, locale: Locale = "en"): string | null {
+export function sandboxConfigurationRejection(error: unknown, locale: SupportedLanguage = "en"): string | null {
   if (error instanceof AgentCoreError && !sandboxWriteUncertain(error) && error.code) {
-    const known = knownCoreError(error, i18n.getFixedT(locale === "zh" ? "zh-CN" : "en", "common"));
+    const known = knownCoreError(error, i18n.getFixedT(locale, "common"));
     if (known) return known;
   }
   return error instanceof AgentCoreError && error.status === 409 && error.code === "sandbox_configuration_error" && error.message ? error.message : null;
 }
 
-export function sandboxNodeStatus(node: SandboxNode, stale: boolean, locale: Locale): string {
-  return translate(locale, stale ? "Status unconfirmed" : !node.online ? "Offline" : node.provider_ready ? "Available" : "Unavailable");
-}
-
-export function sandboxProviderLabel(provider: SandboxProvider | "", locale: Locale): string {
+export function sandboxProviderLabel(provider: SandboxProvider | "", locale: SupportedLanguage): string {
   if (provider === "docker") return "Docker";
   if (provider === "microsandbox") return "microsandbox";
-  return translate(locale, provider === "e2b" ? "E2B cloud" : "Unknown state");
+  return i18n.getFixedT(locale, "sandbox")(provider === "e2b" ? "E2B cloud" : "Unknown state");
 }

From bf822ba8f16b8a782e438d05665ff0ebddba5397 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 20:11:49 +0800
Subject: [PATCH 57/60] Author closed sets as typed constants (#560)

---
 Makefile                                      |   2 +-
 .../features/sandbox/SandboxResetControls.tsx |   2 +-
 contracts/agents-api/core.openapi.yaml        | 392 +++++++++++-------
 contracts/agents-api/index.md                 |   2 +-
 contracts/agents-api/openapi.yaml             |  44 +-
 contracts/agents-api/v1/installation.go       |  17 +-
 contracts/agents-api/v1/model_execution.go    |  17 +-
 .../agents-api/v1/model_execution_test.go     |  10 +-
 .../agents-api/v1/model_provider_admission.go |  13 +-
 .../agents-api/v1/saved_core_extension.go     |  13 +-
 .../v1/saved_core_extension_test.go           |   6 +-
 .../v1/session_execution_configuration.go     |  29 +-
 .../agents-api/v1/upstream_contract_test.go   |   3 +-
 contracts/agents-api/zh/index.md              |   4 +-
 .../agents-client/src/admin-projection.ts     |  14 +-
 packages/agents-client/src/admin-types.ts     |   6 +-
 packages/agents-client/src/core-metrics.ts    |   6 +-
 .../src/execution-configuration-projection.ts |  14 +-
 .../agents-client/src/generated/core-api.ts   |  86 ++--
 .../agents-client/src/generated/public-api.ts |  10 +-
 packages/agents-client/src/sandbox-client.ts  |  16 +-
 .../agents-client/src/session-diagnostics.ts  |   4 +-
 scripts/generate-public-api.test.py           |   2 +-
 .../core/cmd/server/managed_generations.go    |   5 +-
 services/core/cmd/server/managed_nodes.go     |   2 +-
 services/core/cmd/server/managed_setup.go     |   2 +-
 .../api/environment_executor_management.go    |  22 +-
 .../environment_executor_management_test.go   |   2 +-
 .../internal/api/environment_installation.go  |   4 +-
 services/core/internal/api/handler.go         |   2 +-
 .../internal/api/harness_model_providers.go   |   8 +-
 services/core/internal/api/inputs.go          |   3 +-
 services/core/internal/api/installation.go    |   9 +-
 .../core/internal/api/installation_test.go    |   2 +-
 .../internal/api/sandbox_deployment_setup.go  |   6 +-
 .../core/internal/api/saved_provider_test.go  |   4 +-
 .../internal/api/session_creation_identity.go |   6 +-
 .../core/internal/api/session_diagnostics.go  |  18 +-
 .../internal/api/session_diagnostics_test.go  |  10 +
 .../api/session_execution_configuration.go    |  22 +-
 .../session_execution_configuration_test.go   |   2 +-
 .../api/session_model_configuration.go        |  18 +-
 .../api/session_model_configuration_test.go   |   2 +-
 .../internal/api/session_model_defaults.go    |  10 +-
 services/core/internal/api/session_request.go |   4 +-
 .../api/turn_diagnostic_failure_test.go       |  51 +++
 services/core/internal/coremetrics/service.go |  24 +-
 services/core/internal/coremetrics/types.go   |  26 +-
 .../core/internal/deployment/allocations.go   |   7 +-
 .../core/internal/deployment/execution.go     |   2 +-
 services/core/internal/deployment/health.go   |  16 +-
 services/core/internal/deployment/node.go     |  10 +-
 services/core/internal/deployment/nodes.go    |  12 +-
 .../deployment/placement/placement.go         |   2 +-
 services/core/internal/deployment/reset.go    |  18 +-
 .../core/internal/deployment/reset_test.go    |   7 +-
 .../core/internal/deployment/rules_test.go    |   9 +-
 services/core/internal/deployment/service.go  |   8 +-
 .../internal/deployment/session_archive.go    |   2 +-
 .../deployment/session_archive_test.go        |   8 +-
 services/core/internal/deployment/view.go     |  29 +-
 .../internal/engine/configuration_test.go     |   3 +-
 .../archive_cancellation_cleanup_test.go      |  13 +-
 .../deployment_provider_observations_test.go  |   2 +-
 .../internal/execution/model_execution.go     |   2 +-
 .../execution/model_execution_test.go         |   8 +-
 .../internal/execution/runtime_lifecycle.go   |   7 +-
 .../internal/execution/runtime_manager.go     |   3 +-
 .../execution/sandbox_deployment_switch.go    |   2 +-
 .../core/internal/execution/worker_metrics.go |  14 +-
 .../modelconfiguration/configuration.go       |   2 +-
 .../modelconfiguration/observation.go         |  22 +-
 .../persistence/postgres/agentpg/store.go     |   6 +-
 .../postgres/auditpg/auditpg_test.go          |  11 +-
 .../persistence/postgres/auditpg/record.go    |  15 +-
 .../postgres/auditpg/write_operations.go      |   9 +-
 .../postgres/deploymentpg/presence_test.go    |  15 +-
 .../persistence/postgres/filepg/filepg.go     |  11 +-
 .../modelconfigurationpg/observation_test.go  |   9 +-
 .../postgres/modelconfigurationpg/store.go    |  15 +-
 .../postgres/sessionpg/artifacts.go           |  10 +-
 .../postgres/sessionpg/creation.go            |   9 +-
 .../postgres/sessionpg/creation_test.go       |   7 +-
 .../sessionpg/execution_file_writes.go        |   7 +-
 .../persistence/postgres/sessionpg/inputs.go  |  10 +-
 .../postgres/sessionpg/session_reads.go       |  15 +-
 .../postgres/sessionpg/session_writes.go      |  14 +-
 .../persistence/postgres/skillpg/skillpg.go   |  16 +-
 .../persistence/postgres/templatepg/store.go  |   8 +-
 .../postgres/vaultpg/credentials.go           |  15 +-
 .../persistence/postgres/vaultpg/oauth.go     |   8 +-
 .../persistence/postgres/vaultpg/vaultpg.go   |  11 +-
 .../core/internal/processconfig/config.go     |  29 +-
 services/core/internal/sandbox/deployment.go  |  11 +-
 .../internal/sandbox/deployment_contract.go   |   2 +-
 services/core/internal/sandbox/node/agent.go  |   2 +-
 .../core/internal/sandbox/node/generations.go |   2 +-
 .../core/internal/sandbox/node_diagnostic.go  |  32 +-
 .../internal/sandbox/node_diagnostic_test.go  |  12 +-
 .../internal/sandbox/providers/artifacts.go   |   3 +-
 .../core/internal/sandbox/providers/config.go |   2 +-
 .../sandbox/providers/registration.go         |   6 +-
 .../internal/sandbox/providers/registry.go    |  15 +-
 .../sandbox/providers/registry_test.go        |   5 +-
 services/core/internal/sessions/creation.go   |  29 +-
 .../core/internal/sessions/creation_test.go   |  21 +-
 .../sessions/execution_configuration.go       |   8 +-
 services/core/internal/sessions/reads.go      |  14 +-
 services/core/internal/sessions/session.go    |   8 +-
 services/core/internal/writeaudit/reader.go   |  18 +-
 services/core/internal/writeaudit/record.go   |  42 +-
 .../core/internal/writeaudit/record_test.go   |   2 +-
 .../integration/admin_session_archive_test.go |   8 +-
 .../core/tests/integration/fixtures_test.go   |   3 +-
 .../function_execution_native_test.go         |   2 +-
 .../integration/native_environment_test.go    |   2 +-
 .../node_diagnostic_contract_test.go          |  25 +-
 .../integration/sandbox_generations_test.go   |  10 +-
 .../session_execution_configuration_test.go   |   8 +-
 .../unified_model_configuration_http_test.go  |   2 +-
 120 files changed, 1019 insertions(+), 709 deletions(-)

diff --git a/Makefile b/Makefile
index f6b4b3836..5a93f513b 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ openapi:
 	output=$$(mktemp -d "$$root/core-openapi.XXXXXX"); trap 'rm -rf "$$output"' EXIT; \
 	python3 scripts/generate-public-api.py $(OPENAPI_FLAGS) --swag-roots "$$output/roots.go"; \
 	$(SWAG) init \
-	    -g cmd/server/main.go --dir "./services/core,./contracts/agents-api/v1,$$output" \
+	    -g cmd/server/main.go --dir "./services/core,./contracts/agents-api/v1,./internal/modelprovider,$$output" \
 	    --output "$$output" \
 	    --outputTypes yaml --parseInternal; \
 	python3 scripts/patch-agents-openapi.py "$$output/swagger.yaml"; \
diff --git a/apps/web/src/features/sandbox/SandboxResetControls.tsx b/apps/web/src/features/sandbox/SandboxResetControls.tsx
index d269eff98..c384c9299 100644
--- a/apps/web/src/features/sandbox/SandboxResetControls.tsx
+++ b/apps/web/src/features/sandbox/SandboxResetControls.tsx
@@ -21,7 +21,7 @@ export function SandboxResetControls({ deployment, disabled, stale, onStart, onC
   const id = useId();
   const reset = deployment.reset;
   const [dialog, setDialog] = useState<{ action: Action; generation: number; requestedAt: string | null } | null>(null);
-  const [clear, setClear] = useState<"auto" | "force">("auto");
+  const [clear, setClear] = useState<StartSandboxReset["clear"]>("auto");
   const [deadline, setDeadline] = useState("3600");
   const [submitting, setSubmitting] = useState(false);
   const changed = dialog !== null && (dialog.generation !== deployment.generation || dialog.requestedAt !== (reset?.requested_at ?? null));
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index 3d52d068b..0950ed4e1 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -388,6 +388,16 @@ definitions:
       - failed_at
       - params
     type: object
+  api.DiagnosticSource:
+    enum:
+      - turn
+      - environment
+      - environment_input
+    type: string
+    x-enum-varnames:
+      - DiagnosticTurn
+      - DiagnosticEnvironment
+      - DiagnosticEnvironmentInput
   api.EnvironmentExecutorCredentialRequest:
     properties:
       key_id:
@@ -413,17 +423,23 @@ definitions:
         type: string
         x-nullable: true
       status:
-        enum:
-          - never_enrolled
-          - connected
-          - disconnected
-        type: string
+        $ref: '#/definitions/api.ExecutorConnectionStatus'
     required:
       - bound_key_id
       - enrolled_at
       - last_seen_at
       - status
     type: object
+  api.ExecutorConnectionStatus:
+    enum:
+      - never_enrolled
+      - connected
+      - disconnected
+    type: string
+    x-enum-varnames:
+      - ExecutorNeverEnrolled
+      - ExecutorConnected
+      - ExecutorDisconnected
   api.ExecutorCredentialList:
     properties:
       connection:
@@ -451,17 +467,8 @@ definitions:
         type: string
         x-nullable: true
       last_error_code:
-        enum:
-          - authentication_error
-          - connection_failed
-          - rate_limit_exceeded
-          - usage_limit_exceeded
-          - server_overloaded
-          - server_error
-          - resource_not_found
-          - request_timeout
-          - invalid_request
-        type: string
+        allOf:
+          - $ref: '#/definitions/modelconfiguration.ProviderErrorCode'
         x-nullable: true
       last_used_at:
         format: date-time
@@ -535,6 +542,14 @@ definitions:
     required:
       - settings
     type: object
+  api.InstallationService:
+    enum:
+      - core
+      - web
+    type: string
+    x-enum-varnames:
+      - InstallationCore
+      - InstallationWeb
   api.InstallationSetting:
     properties:
       changeable:
@@ -551,10 +566,7 @@ definitions:
       restarts:
         description: Services that restart when the setting changes.
         items:
-          enum:
-            - core
-            - web
-          type: string
+          $ref: '#/definitions/api.InstallationService'
         type: array
       sensitive:
         type: boolean
@@ -753,11 +765,7 @@ definitions:
       params:
         type: object
       source:
-        enum:
-          - turn
-          - environment
-          - environment_input
-        type: string
+        $ref: '#/definitions/api.DiagnosticSource'
       turn_id:
         type: string
     required:
@@ -934,12 +942,7 @@ definitions:
         type: integer
         x-nullable: true
       status:
-        enum:
-          - ok
-          - failing
-          - stopped
-          - unknown
-        type: string
+        $ref: '#/definitions/coremetrics.JobStatus'
     required:
       - failed
       - id
@@ -947,6 +950,18 @@ definitions:
       - processed
       - status
     type: object
+  coremetrics.JobStatus:
+    enum:
+      - ok
+      - failing
+      - stopped
+      - unknown
+    type: string
+    x-enum-varnames:
+      - JobOk
+      - JobFailing
+      - JobStopped
+      - JobUnknown
   coremetrics.Latency:
     properties:
       p50:
@@ -1048,16 +1063,21 @@ definitions:
         type: string
         x-nullable: true
       status:
-        enum:
-          - running
-          - degraded
-        type: string
+        $ref: '#/definitions/coremetrics.ServiceStatus'
     required:
       - execution_owner
       - revision
       - started_at
       - status
     type: object
+  coremetrics.ServiceStatus:
+    enum:
+      - running
+      - degraded
+    type: string
+    x-enum-varnames:
+      - ServiceRunning
+      - ServiceDegraded
   coremetrics.View:
     properties:
       database:
@@ -1157,15 +1177,9 @@ definitions:
       created_at:
         type: string
       diagnostic:
+        allOf:
+          - $ref: '#/definitions/sandbox.NodeDiagnosticCode'
         description: Fixed reason for the last reported unreadiness; absent while the provider is ready. Clients treat an unknown value as provider_unavailable.
-        enum:
-          - provider_unavailable
-          - host_unsupported
-          - artifacts_unavailable
-          - runtime_download_failed
-          - runtime_image_unavailable
-          - capacity_insufficient
-        type: string
       enrollment_id:
         description: The enrollment_id of the command that registered this node (POST /core/v1/sandbox/enrollment-tokens); null for nodes enrolled before Core recorded it.
         type: string
@@ -1292,15 +1306,9 @@ definitions:
       created_at:
         type: string
       diagnostic:
+        allOf:
+          - $ref: '#/definitions/sandbox.NodeDiagnosticCode'
         description: Fixed reason for the last reported unreadiness; absent while the provider is ready. Clients treat an unknown value as provider_unavailable.
-        enum:
-          - provider_unavailable
-          - host_unsupported
-          - artifacts_unavailable
-          - runtime_download_failed
-          - runtime_image_unavailable
-          - capacity_insufficient
-        type: string
       enrollment_id:
         description: The enrollment_id of the command that registered this node (POST /core/v1/sandbox/enrollment-tokens); null for nodes enrolled before Core recorded it.
         type: string
@@ -1392,31 +1400,33 @@ definitions:
   deployment.NodeRollout:
     properties:
       diagnostic:
-        enum:
-          - provider_unavailable
-          - host_unsupported
-          - artifacts_unavailable
-          - runtime_download_failed
-          - runtime_image_unavailable
-          - capacity_insufficient
-        type: string
+        $ref: '#/definitions/sandbox.NodeDiagnosticCode'
       ready_generation:
         description: Durable serving-generation pin; online and provider_ready still gate placement.
         type: integer
         x-nullable: true
       state:
+        allOf:
+          - $ref: '#/definitions/deployment.NodeRolloutState'
         description: Target preparation, independent of an old pin's serving readiness.
-        enum:
-          - ready
-          - preparing
-          - failed
-          - update_required
-          - unknown
-        type: string
     required:
       - ready_generation
       - state
     type: object
+  deployment.NodeRolloutState:
+    enum:
+      - ready
+      - preparing
+      - failed
+      - update_required
+      - unknown
+    type: string
+    x-enum-varnames:
+      - NodeRolloutReady
+      - NodeRolloutPreparing
+      - NodeRolloutFailed
+      - NodeRolloutUpdateRequired
+      - NodeRolloutUnknown
   deployment.NodeUpdate:
     properties:
       max_active:
@@ -1433,10 +1443,7 @@ definitions:
   deployment.Reset:
     properties:
       clear:
-        enum:
-          - auto
-          - force
-        type: string
+        $ref: '#/definitions/deployment.ResetMode'
       deadline_at:
         type: string
         x-nullable: true
@@ -1454,6 +1461,14 @@ definitions:
       - remaining
       - requested_at
     type: object
+  deployment.ResetMode:
+    enum:
+      - auto
+      - force
+    type: string
+    x-enum-varnames:
+      - ResetAuto
+      - ResetForce
   deployment.ResetOfflineNode:
     properties:
       name:
@@ -1491,10 +1506,7 @@ definitions:
   deployment.ResetRequest:
     properties:
       clear:
-        enum:
-          - auto
-          - force
-        type: string
+        $ref: '#/definitions/deployment.ResetMode'
       deadline_seconds:
         maximum: 86400
         minimum: 300
@@ -1525,10 +1537,7 @@ definitions:
       previous_generation_sandboxes:
         type: integer
       state:
-        enum:
-          - settled
-          - preparing
-        type: string
+        $ref: '#/definitions/deployment.RolloutState'
     required:
       - nodes
       - previous_generation_sandboxes
@@ -1553,6 +1562,14 @@ definitions:
       - unknown
       - update_required
     type: object
+  deployment.RolloutState:
+    enum:
+      - settled
+      - preparing
+    type: string
+    x-enum-varnames:
+      - RolloutSettled
+      - RolloutPreparing
   deployment.Suspension:
     properties:
       idle_seconds:
@@ -1579,11 +1596,7 @@ definitions:
       metadata:
         type: object
       mode:
-        enum:
-          - ""
-          - nodes
-          - direct
-        type: string
+        $ref: '#/definitions/sandbox.DeploymentMode'
       owner_epoch:
         type: integer
       provider:
@@ -1618,6 +1631,38 @@ definitions:
       - rollout
       - suspension
     type: object
+  modelconfiguration.ProviderErrorCode:
+    enum:
+      - authentication_error
+      - connection_failed
+      - rate_limit_exceeded
+      - usage_limit_exceeded
+      - server_overloaded
+      - server_error
+      - resource_not_found
+      - request_timeout
+      - invalid_request
+    type: string
+    x-enum-varnames:
+      - ProviderAuthenticationError
+      - ProviderConnectionFailed
+      - ProviderRateLimitExceeded
+      - ProviderUsageLimitExceeded
+      - ProviderServerOverloaded
+      - ProviderServerError
+      - ProviderResourceNotFound
+      - ProviderRequestTimeout
+      - ProviderInvalidRequest
+  modelprovider.Protocol:
+    enum:
+      - anthropic
+      - responses
+      - chat_completions
+    type: string
+    x-enum-varnames:
+      - Anthropic
+      - Responses
+      - ChatCompletions
   projects.APIKey:
     properties:
       created_at:
@@ -1720,6 +1765,16 @@ definitions:
       query:
         type: object
     type: object
+  sandbox.DeploymentMode:
+    enum:
+      - ""
+      - nodes
+      - direct
+    type: string
+    x-enum-varnames:
+      - DeploymentUnconfigured
+      - DeploymentNodes
+      - DeploymentDirect
   sandbox.DeploymentSpec:
     properties:
       resources:
@@ -1729,6 +1784,22 @@ definitions:
     required:
       - resources
     type: object
+  sandbox.NodeDiagnosticCode:
+    enum:
+      - provider_unavailable
+      - host_unsupported
+      - artifacts_unavailable
+      - runtime_download_failed
+      - runtime_image_unavailable
+      - capacity_insufficient
+    type: string
+    x-enum-varnames:
+      - NodeProviderUnavailable
+      - NodeHostUnsupported
+      - NodeArtifactsUnavailable
+      - NodeRuntimeDownloadFailed
+      - NodeRuntimeImageUnavailable
+      - NodeCapacityInsufficient
   sandbox.Resources:
     properties:
       cpus:
@@ -1821,16 +1892,22 @@ definitions:
       session_id:
         type: string
       state:
-        enum:
-          - active
-          - cleanup_pending
-          - released
-        type: string
+        $ref: '#/definitions/sessions.ManagedArchiveState'
     required:
       - environment_id
       - session_id
       - state
     type: object
+  sessions.ManagedArchiveState:
+    enum:
+      - active
+      - cleanup_pending
+      - released
+    type: string
+    x-enum-varnames:
+      - ManagedArchiveActive
+      - ManagedArchiveCleanupPending
+      - ManagedArchiveReleased
   v1.Agent:
     properties:
       id:
@@ -1998,10 +2075,7 @@ definitions:
       message:
         type: string
       status:
-        enum:
-          - available
-          - unavailable
-        type: string
+        $ref: '#/definitions/v1.InstallationStatus'
       version:
         type: string
     type: object
@@ -2131,12 +2205,7 @@ definitions:
   v1.ExecutionHarnessConfigSelection:
     properties:
       source:
-        enum:
-          - session
-          - agent
-          - deployment
-          - unknown
-        type: string
+        $ref: '#/definitions/v1.ExecutionSource'
       value:
         type: object
     required:
@@ -2150,32 +2219,28 @@ definitions:
           - $ref: '#/definitions/v1.ModelProviderView'
         x-nullable: true
       source:
-        enum:
-          - session
-          - agent
-          - deployment
-          - unknown
-        type: string
+        $ref: '#/definitions/v1.ExecutionSource'
       status:
-        enum:
-          - available
-          - redacted
-          - unavailable
-        type: string
+        $ref: '#/definitions/v1.ExecutionProviderStatus'
     required:
       - configuration
       - source
       - status
     type: object
+  v1.ExecutionProviderStatus:
+    enum:
+      - available
+      - redacted
+      - unavailable
+    type: string
+    x-enum-varnames:
+      - ExecutionProviderAvailable
+      - ExecutionProviderRedacted
+      - ExecutionProviderUnavailable
   v1.ExecutionSelection:
     properties:
       source:
-        enum:
-          - session
-          - agent
-          - deployment
-          - unknown
-        type: string
+        $ref: '#/definitions/v1.ExecutionSource'
       value:
         type: string
         x-nullable: true
@@ -2183,6 +2248,18 @@ definitions:
       - source
       - value
     type: object
+  v1.ExecutionSource:
+    enum:
+      - session
+      - agent
+      - deployment
+      - unknown
+    type: string
+    x-enum-varnames:
+      - ExecutionSourceSession
+      - ExecutionSourceAgent
+      - ExecutionSourceDeployment
+      - ExecutionSourceUnknown
   v1.InputTokenDetails:
     properties:
       cached_tokens:
@@ -2190,6 +2267,14 @@ definitions:
     required:
       - cached_tokens
     type: object
+  v1.InstallationStatus:
+    enum:
+      - available
+      - unavailable
+    type: string
+    x-enum-varnames:
+      - InstallationAvailable
+      - InstallationUnavailable
   v1.Item:
     properties:
       action:
@@ -2369,11 +2454,7 @@ definitions:
       max_output_tokens:
         type: integer
       protocol:
-        enum:
-          - anthropic
-          - responses
-          - chat_completions
-        type: string
+        $ref: '#/definitions/modelprovider.Protocol'
     required:
       - api_key
       - base_url
@@ -2390,11 +2471,7 @@ definitions:
       max_output_tokens:
         type: integer
       protocol:
-        enum:
-          - anthropic
-          - responses
-          - chat_completions
-        type: string
+        $ref: '#/definitions/modelprovider.Protocol'
     required:
       - api_key_configured
       - base_url
@@ -3770,18 +3847,28 @@ definitions:
       - prefix
       - revoked_at
     type: object
+  writeaudit.Action:
+    enum:
+      - create
+      - update
+      - delete
+      - send_events
+      - upload_file
+      - upload_version
+      - update_default_version
+    type: string
+    x-enum-varnames:
+      - ActionCreate
+      - ActionUpdate
+      - ActionDelete
+      - ActionSendEvents
+      - ActionUploadFile
+      - ActionUploadVersion
+      - ActionUpdateDefaultVersion
   writeaudit.Operation:
     properties:
       action:
-        enum:
-          - create
-          - update
-          - delete
-          - send_events
-          - upload_file
-          - upload_version
-          - update_default_version
-        type: string
+        $ref: '#/definitions/writeaudit.Action'
       api_key:
         $ref: '#/definitions/writeaudit.APIKey'
       created_at:
@@ -3795,18 +3882,7 @@ definitions:
       resource_id:
         type: string
       resource_type:
-        enum:
-          - agent
-          - session
-          - environment
-          - environment_template
-          - skill
-          - skill_version
-          - file
-          - vault
-          - credential
-          - artifact
-        type: string
+        $ref: '#/definitions/writeaudit.ResourceType'
       trace_id:
         type: string
     required:
@@ -3847,6 +3923,30 @@ definitions:
       - api_key
       - resource_id
     type: object
+  writeaudit.ResourceType:
+    enum:
+      - agent
+      - session
+      - environment
+      - environment_template
+      - skill
+      - skill_version
+      - file
+      - vault
+      - credential
+      - artifact
+    type: string
+    x-enum-varnames:
+      - ResourceAgent
+      - ResourceSession
+      - ResourceEnvironment
+      - ResourceEnvironmentTemplate
+      - ResourceSkill
+      - ResourceSkillVersion
+      - ResourceFile
+      - ResourceVault
+      - ResourceCredential
+      - ResourceArtifact
 info:
   contact: {}
   description: Deployment and operations routes under /core/v1 for Core Web's server and operator scripts. Every operation requires the Core key; Project API keys and machine credentials are not accepted.
diff --git a/contracts/agents-api/index.md b/contracts/agents-api/index.md
index 280696bbb..9e9f6bb7f 100644
--- a/contracts/agents-api/index.md
+++ b/contracts/agents-api/index.md
@@ -14,7 +14,7 @@ Core targets the complete OpenAI Agents API as pinned below ([public API rule](h
 | [openapi.yaml](./openapi.yaml) | The official public contract with Core's `x_agents_core` extension on Agent and Session request/response objects |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go names, field representations, encoding order and stored projections; it does not define official field membership, enums or constraints |
 
-Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The TypeScript client's types, enum values and field names in `packages/agents-client/src/generated/public-api.ts` are generated from the resulting public schema. The internal `/core/v1` and `/api/v1` documents come from handler annotations; the same generator projects the `/core/v1` document into `packages/agents-client/src/generated/core-api.ts`, which imports the public types it references from `public-api.ts`. In those annotations a response field Core always sends carries `binding:"required"`, a field that can be null carries `extensions:"x-nullable"`, and a closed set carries `enums:`; the tags only shape the documents, and the client rejects a response that breaks them. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
+Run `make openapi` to regenerate the public Go types, the Agent request shapes, the route inventory and all three OpenAPI documents. `scripts/generate-public-api.py` reads the checked-in, checksum-verified official source without network access. It selects Agents, Vaults, Files and Skills and follows their schema references, preserving union types, nullability, required fields and constraints. The request shapes in `services/core/internal/api/official_shapes.gen.go` project `CreateAgentParams`, `UpdateAgentParams` and `SessionAgentConfigParam`; Core checks request bodies against them before it reads an Agent configuration. Core's extension types in `v1/` remain authored in Go and are added to the public schema during generation. The TypeScript client's types, enum values and field names in `packages/agents-client/src/generated/public-api.ts` are generated from the resulting public schema. The internal `/core/v1` and `/api/v1` documents come from handler annotations; the same generator projects the `/core/v1` document into `packages/agents-client/src/generated/core-api.ts`, which imports the public types it references from `public-api.ts`. In those annotations a response field Core always sends carries `binding:"required"`, a field that can be null carries `extensions:"x-nullable"`, and a Core-owned closed set uses a named Go type with typed constants in its producing package. Swag derives one enum definition from that type, shared by every wire field. Single-value discriminators keep `enums:` tags; fields mirroring official or Runtime-owned sets retain tags checked against their owners by contract tests. These annotations only shape the documents, and the client rejects a response that breaks them. `make check-openapi` checks freshness and the generator; it also runs through `make check-go`.
 
 The public contract is the official API plus Core extensions. Standard fields are generated into `v1/official.gen.go`; `go-bindings.json` lists types consumed by Core and overrides only the Go representation or field order that existing storage or custom JSON encoding requires. Unspecified fields follow the official schema; shared shapes use one Go type. Selected discriminated unions also generate JSON serializers to retain required nullable fields for each variant. Other union serializers, Core's local limits, execution admission and state transitions remain implementation code. Contract tests verify that the public schema preserves the official definitions, extensions remain in `x_agents_core`, and all documents match registered routes. Official-client and raw HTTP tests verify behavior. Schema generation does not qualify an unimplemented feature; the gaps below still apply. Upstream upgrades update the OpenAPI and SDK pins together after comparison and compatibility tests.
 
diff --git a/contracts/agents-api/openapi.yaml b/contracts/agents-api/openapi.yaml
index 1885da9ed..43e25a570 100644
--- a/contracts/agents-api/openapi.yaml
+++ b/contracts/agents-api/openapi.yaml
@@ -17663,6 +17663,19 @@
         "additionalProperties": false,
         "description": "Confirmation that a vault credential was deleted."
       },
+      "modelprovider.Protocol": {
+        "enum": [
+          "anthropic",
+          "responses",
+          "chat_completions"
+        ],
+        "type": "string",
+        "x-enum-varnames": [
+          "Anthropic",
+          "Responses",
+          "ChatCompletions"
+        ]
+      },
       "v1.AgentsCore": {
         "properties": {
           "harness": {
@@ -17694,11 +17707,7 @@
             "type": "string"
           },
           "status": {
-            "enum": [
-              "available",
-              "unavailable"
-            ],
-            "type": "string"
+            "$ref": "#/components/schemas/v1.InstallationStatus"
           },
           "version": {
             "type": "string"
@@ -17706,6 +17715,17 @@
         },
         "type": "object"
       },
+      "v1.InstallationStatus": {
+        "enum": [
+          "available",
+          "unavailable"
+        ],
+        "type": "string",
+        "x-enum-varnames": [
+          "InstallationAvailable",
+          "InstallationUnavailable"
+        ]
+      },
       "v1.ModelProviderInput": {
         "properties": {
           "api_key": {
@@ -17721,12 +17741,7 @@
             "type": "integer"
           },
           "protocol": {
-            "enum": [
-              "anthropic",
-              "responses",
-              "chat_completions"
-            ],
-            "type": "string"
+            "$ref": "#/components/schemas/modelprovider.Protocol"
           }
         },
         "required": [
@@ -17751,12 +17766,7 @@
             "type": "integer"
           },
           "protocol": {
-            "enum": [
-              "anthropic",
-              "responses",
-              "chat_completions"
-            ],
-            "type": "string"
+            "$ref": "#/components/schemas/modelprovider.Protocol"
           }
         },
         "required": [
diff --git a/contracts/agents-api/v1/installation.go b/contracts/agents-api/v1/installation.go
index 9ae3a993e..a1f77808a 100644
--- a/contracts/agents-api/v1/installation.go
+++ b/contracts/agents-api/v1/installation.go
@@ -1,5 +1,12 @@
 package v1
 
+type InstallationStatus string
+
+const (
+	InstallationAvailable   InstallationStatus = "available"
+	InstallationUnavailable InstallationStatus = "unavailable"
+)
+
 // SessionCore exposes optional Core additions without changing official fields.
 type SessionCore struct {
 	Installation *EnvironmentInstallation `json:"installation,omitempty"`
@@ -8,11 +15,11 @@ type SessionCore struct {
 // EnvironmentInstallation contains short-lived, Environment-scoped commands.
 // Only authenticated creation and detail responses include this authorization.
 type EnvironmentInstallation struct {
-	Status    string            `json:"status" enums:"available,unavailable"`
-	Version   string            `json:"version"`
-	ExpiresAt int64             `json:"expires_at,omitempty"`
-	Commands  map[string]string `json:"commands,omitempty"`
-	Message   string            `json:"message,omitempty"`
+	Status    InstallationStatus `json:"status"`
+	Version   string             `json:"version"`
+	ExpiresAt int64              `json:"expires_at,omitempty"`
+	Commands  map[string]string  `json:"commands,omitempty"`
+	Message   string             `json:"message,omitempty"`
 }
 
 // NativeInstallationContext is bootstrap metadata, not an execution protocol.
diff --git a/contracts/agents-api/v1/model_execution.go b/contracts/agents-api/v1/model_execution.go
index 903255c44..66b75e64b 100644
--- a/contracts/agents-api/v1/model_execution.go
+++ b/contracts/agents-api/v1/model_execution.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig/builtin"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/modelprovider"
 )
 
 // ModelProviderError preserves the shared validation message while allowing Core
@@ -26,11 +27,11 @@ type SessionExecutionInput struct {
 }
 
 type ModelProviderInput struct {
-	Protocol        string `json:"protocol" enums:"anthropic,responses,chat_completions" binding:"required"`
-	BaseURL         string `json:"base_url" binding:"required"`
-	APIKey          string `json:"api_key" binding:"required"`
-	ContextWindow   int32  `json:"context_window,omitempty"`
-	MaxOutputTokens int32  `json:"max_output_tokens,omitempty"`
+	Protocol        modelprovider.Protocol `json:"protocol" binding:"required"`
+	BaseURL         string                 `json:"base_url" binding:"required"`
+	APIKey          string                 `json:"api_key" binding:"required"`
+	ContextWindow   int32                  `json:"context_window,omitempty"`
+	MaxOutputTokens int32                  `json:"max_output_tokens,omitempty"`
 }
 
 func (p *ModelProviderInput) Validate() error {
@@ -44,7 +45,7 @@ func (p *ModelProviderInput) validate(registry harnessconfig.Registry) error {
 	if !validModelProviderBaseURL(p.BaseURL) {
 		return &ModelProviderError{Code: "model_provider_base_url_invalid", Param: "base_url", message: "model provider requires an HTTPS base_url without credentials, query or fragment"}
 	}
-	if !registry.SupportsProtocol(p.Protocol) {
+	if !registry.SupportsProtocol(string(p.Protocol)) {
 		return &ModelProviderError{Code: "model_provider_protocol_unsupported", Param: "protocol", message: "unsupported model provider protocol"}
 	}
 	if strings.TrimSpace(p.APIKey) == "" || len(p.APIKey) > 16384 || strings.ContainsAny(p.APIKey, "\x00\r\n") {
@@ -71,10 +72,10 @@ func (p *ModelProviderInput) ValidateHarnessWithRegistry(harness string, registr
 		return err
 	}
 	configuration, _ := registry.Lookup(harness)
-	if err := configuration.ValidateProtocol(p.Protocol); err != nil {
+	if err := configuration.ValidateProtocol(string(p.Protocol)); err != nil {
 		return &ModelProviderError{Code: "model_provider_protocol_unsupported", Param: "protocol", message: err.Error()}
 	}
-	if err := configuration.Validate(p.Protocol, p.ContextWindow, p.MaxOutputTokens); err != nil {
+	if err := configuration.Validate(string(p.Protocol), p.ContextWindow, p.MaxOutputTokens); err != nil {
 		param := "max_output_tokens"
 		if p.ContextWindow <= 0 {
 			param = "context_window"
diff --git a/contracts/agents-api/v1/model_execution_test.go b/contracts/agents-api/v1/model_execution_test.go
index 8db6938ea..8e7bce603 100644
--- a/contracts/agents-api/v1/model_execution_test.go
+++ b/contracts/agents-api/v1/model_execution_test.go
@@ -1,12 +1,16 @@
 package v1
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/internal/modelprovider"
+)
 
 func TestModelExecutionValidation(t *testing.T) {
 	for _, harness := range []string{"codex", "claude_sdk", "mcode"} {
 		for _, protocol := range []string{"anthropic", "responses", "chat_completions"} {
 			t.Run(harness+"/"+protocol, func(t *testing.T) {
-				p := ModelProviderInput{Protocol: protocol, BaseURL: "https://example.com/v1", APIKey: "secret", ContextWindow: 200000, MaxOutputTokens: 8000}
+				p := ModelProviderInput{Protocol: modelprovider.Protocol(protocol), BaseURL: "https://example.com/v1", APIKey: "secret", ContextWindow: 200000, MaxOutputTokens: 8000}
 				native := harness == "mcode" || (harness == "codex" && protocol == "responses") || (harness == "claude_sdk" && protocol == "anthropic")
 				if err := p.ValidateHarness(harness); (err == nil) != native {
 					t.Fatalf("wrong native protocol admission: %v", err)
@@ -22,7 +26,7 @@ func TestModelExecutionValidation(t *testing.T) {
 		{"responses", ""}, {"responses", "unknown"}, {"unknown", "codex"},
 		{"openai", "codex"}, {"chat", "claude_sdk"}, {"chat-completions", "mcode"},
 	} {
-		p := ModelProviderInput{Protocol: tc.protocol, BaseURL: "https://example.com/v1", APIKey: "secret", ContextWindow: 200000, MaxOutputTokens: 8000}
+		p := ModelProviderInput{Protocol: modelprovider.Protocol(tc.protocol), BaseURL: "https://example.com/v1", APIKey: "secret", ContextWindow: 200000, MaxOutputTokens: 8000}
 		if p.ValidateHarness(tc.harness) == nil {
 			t.Fatalf("unsupported protocol or harness accepted: %s/%s", tc.protocol, tc.harness)
 		}
diff --git a/contracts/agents-api/v1/model_provider_admission.go b/contracts/agents-api/v1/model_provider_admission.go
index fa91a1cc2..d1b0d3f1e 100644
--- a/contracts/agents-api/v1/model_provider_admission.go
+++ b/contracts/agents-api/v1/model_provider_admission.go
@@ -15,22 +15,15 @@ const providerScheme = "https"
 // hyphen or STD3 restrictions), rejecting invalid labels such as bad punycode.
 var providerHost = idna.New(idna.MapForLookup(), idna.BidiRule(), idna.StrictDomainName(false), idna.CheckHyphens(false))
 
-// Model provider sources, as recorded in a Session's execution configuration.
-const (
-	ModelProviderSourceSession    = "session"
-	ModelProviderSourceAgent      = "agent"
-	ModelProviderSourceDeployment = "deployment"
-)
-
 // ModelProviderAllowed reports whether a provider bundle from source may be
 // frozen into a Session placed in environment. Caller bundles (Session or saved
 // Agent) run on Core-managed or caller-owned compute. The deployment default
 // holds the operator's key, so it stays on operator compute: openai_hosted and
 // operator-registered none devices. An unknown source is allowed only where
 // every source is.
-func ModelProviderAllowed(environment, source string) bool {
-	caller := source == ModelProviderSourceSession || source == ModelProviderSourceAgent
-	deployment := source == ModelProviderSourceDeployment
+func ModelProviderAllowed(environment string, source ExecutionSource) bool {
+	caller := source == ExecutionSourceSession || source == ExecutionSourceAgent
+	deployment := source == ExecutionSourceDeployment
 	switch environment {
 	case "openai_hosted":
 		return true
diff --git a/contracts/agents-api/v1/saved_core_extension.go b/contracts/agents-api/v1/saved_core_extension.go
index 1b1353a3d..6f2fc2733 100644
--- a/contracts/agents-api/v1/saved_core_extension.go
+++ b/contracts/agents-api/v1/saved_core_extension.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig/builtin"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/modelprovider"
 )
 
 // SavedAgentCoreInput carries defaults for future Sessions. The provider bundle
@@ -24,11 +25,11 @@ type SavedAgentCore struct {
 }
 
 type ModelProviderView struct {
-	Protocol         string `json:"protocol" enums:"anthropic,responses,chat_completions" binding:"required"`
-	BaseURL          string `json:"base_url" binding:"required"`
-	ContextWindow    int32  `json:"context_window,omitempty"`
-	MaxOutputTokens  int32  `json:"max_output_tokens,omitempty"`
-	APIKeyConfigured bool   `json:"api_key_configured" binding:"required"`
+	Protocol         modelprovider.Protocol `json:"protocol" binding:"required"`
+	BaseURL          string                 `json:"base_url" binding:"required"`
+	ContextWindow    int32                  `json:"context_window,omitempty"`
+	MaxOutputTokens  int32                  `json:"max_output_tokens,omitempty"`
+	APIKeyConfigured bool                   `json:"api_key_configured" binding:"required"`
 }
 
 func (x *SavedAgentCoreInput) Validate() error {
@@ -78,5 +79,5 @@ func (p *ModelProviderView) ValidateHarnessWithRegistry(harness string, registry
 	if p == nil {
 		return errors.New("model_provider is required")
 	}
-	return registry.Validate(harness, p.Protocol, p.ContextWindow, p.MaxOutputTokens)
+	return registry.Validate(harness, string(p.Protocol), p.ContextWindow, p.MaxOutputTokens)
 }
diff --git a/contracts/agents-api/v1/saved_core_extension_test.go b/contracts/agents-api/v1/saved_core_extension_test.go
index 54a36b611..e253998e1 100644
--- a/contracts/agents-api/v1/saved_core_extension_test.go
+++ b/contracts/agents-api/v1/saved_core_extension_test.go
@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"strings"
 	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/internal/modelprovider"
 )
 
 func TestSavedProviderSafeView(t *testing.T) {
@@ -32,7 +34,7 @@ func TestSavedProviderExplicitHarnessCompatibility(t *testing.T) {
 		for _, protocol := range []string{"anthropic", "responses", "chat_completions"} {
 			t.Run(harness+"/"+protocol, func(t *testing.T) {
 				x := &SavedAgentCoreInput{Harness: harness, ModelProvider: &ModelProviderInput{
-					Protocol: protocol, BaseURL: "https://example.test", APIKey: "fixture", ContextWindow: 100, MaxOutputTokens: 20,
+					Protocol: modelprovider.Protocol(protocol), BaseURL: "https://example.test", APIKey: "fixture", ContextWindow: 100, MaxOutputTokens: 20,
 				}}
 				native := harness == "" || harness == "mcode" || (harness == "codex" && protocol == "responses") || (harness == "claude_sdk" && protocol == "anthropic")
 				if err := x.Validate(); (err == nil) != native {
@@ -49,7 +51,7 @@ func TestSavedProviderExplicitHarnessCompatibility(t *testing.T) {
 	for _, protocol := range []string{"anthropic", "responses", "chat_completions"} {
 		for _, limits := range [][2]int32{{0, 0}, {100, 0}, {0, 20}} {
 			x := &SavedAgentCoreInput{Harness: "mcode", ModelProvider: &ModelProviderInput{
-				Protocol: protocol, BaseURL: "https://example.test", APIKey: "fixture", ContextWindow: limits[0], MaxOutputTokens: limits[1],
+				Protocol: modelprovider.Protocol(protocol), BaseURL: "https://example.test", APIKey: "fixture", ContextWindow: limits[0], MaxOutputTokens: limits[1],
 			}}
 			if x.Validate() == nil || x.SafeView().ModelProvider.ValidateHarness("mcode") == nil {
 				t.Fatal("MiniMax limits must be complete for every upstream protocol")
diff --git a/contracts/agents-api/v1/session_execution_configuration.go b/contracts/agents-api/v1/session_execution_configuration.go
index 1a07b0e6c..a03fa238a 100644
--- a/contracts/agents-api/v1/session_execution_configuration.go
+++ b/contracts/agents-api/v1/session_execution_configuration.go
@@ -2,6 +2,23 @@ package v1
 
 import "encoding/json"
 
+type ExecutionProviderStatus string
+
+const (
+	ExecutionProviderAvailable   ExecutionProviderStatus = "available"
+	ExecutionProviderRedacted    ExecutionProviderStatus = "redacted"
+	ExecutionProviderUnavailable ExecutionProviderStatus = "unavailable"
+)
+
+type ExecutionSource string
+
+const (
+	ExecutionSourceSession    ExecutionSource = "session"
+	ExecutionSourceAgent      ExecutionSource = "agent"
+	ExecutionSourceDeployment ExecutionSource = "deployment"
+	ExecutionSourceUnknown    ExecutionSource = "unknown"
+)
+
 // SessionExecutionConfiguration describes committed configuration, not live
 // execution health. Unknown provenance is never reconstructed from defaults.
 type SessionExecutionConfiguration struct {
@@ -15,20 +32,20 @@ type SessionExecutionConfiguration struct {
 }
 
 type ExecutionSelection struct {
-	Value  *string `json:"value" binding:"required" extensions:"x-nullable"`
-	Source string  `json:"source" binding:"required" enums:"session,agent,deployment,unknown"`
+	Value  *string         `json:"value" binding:"required" extensions:"x-nullable"`
+	Source ExecutionSource `json:"source" binding:"required"`
 }
 
 // Deployment credentials have no public endpoint projection. Unavailable means
 // no trustworthy safe provider snapshot was recorded, not failed readiness.
 type ExecutionProviderSelection struct {
-	Source        string             `json:"source" binding:"required" enums:"session,agent,deployment,unknown"`
-	Status        string             `json:"status" binding:"required" enums:"available,redacted,unavailable"`
-	Configuration *ModelProviderView `json:"configuration" binding:"required" extensions:"x-nullable"`
+	Source        ExecutionSource         `json:"source" binding:"required"`
+	Status        ExecutionProviderStatus `json:"status" binding:"required"`
+	Configuration *ModelProviderView      `json:"configuration" binding:"required" extensions:"x-nullable"`
 }
 
 // ExecutionHarnessConfigSelection records the immutable adapter parameters.
 type ExecutionHarnessConfigSelection struct {
 	Value  json.RawMessage `json:"value" swaggertype:"object" binding:"required"`
-	Source string          `json:"source" binding:"required" enums:"session,agent,deployment,unknown"`
+	Source ExecutionSource `json:"source" binding:"required"`
 }
diff --git a/contracts/agents-api/v1/upstream_contract_test.go b/contracts/agents-api/v1/upstream_contract_test.go
index 9be78a569..140dd2c75 100644
--- a/contracts/agents-api/v1/upstream_contract_test.go
+++ b/contracts/agents-api/v1/upstream_contract_test.go
@@ -44,8 +44,9 @@ func TestPublicSchemaPreservesOfficialDefinitions(t *testing.T) {
 	upstream := source["components"].(map[string]any)["schemas"].(map[string]any)
 	schemas := public["components"].(map[string]any)["schemas"].(map[string]any)
 	owners := map[string]bool{"AgentResource": true, "CreateAgentParams": true, "UpdateAgentParams": true, "SessionAgentConfigParam": true, "SessionAgentResource": true, "CreateAgentSessionParams": true, "SessionResource": true}
+	// Extension dependencies retain their producing Go package names.
 	for name, value := range schemas {
-		if strings.HasPrefix(name, "v1.") {
+		if strings.HasPrefix(name, "v1.") || name == "modelprovider.Protocol" {
 			continue
 		}
 		schema := value.(map[string]any)
diff --git a/contracts/agents-api/zh/index.md b/contracts/agents-api/zh/index.md
index 9f98d96c2..85acfdf9f 100644
--- a/contracts/agents-api/zh/index.md
+++ b/contracts/agents-api/zh/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Agents API 覆盖台账"
 source: contracts/agents-api/index.md
-source_hash: dc1388f616997b89e298113b7626fac569a9650f9a52710500f96a86c2b1af80
+source_hash: f4a4bf113b88eb25ebccea95cc3125a7413e40493066e60bf2215da86471a5c8
 ---
 
 Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[public API rule](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/AGENTS.md#public-api)）。本台账记录 Core 对各项资源实现了哪些内容、哪些契约保存其详细信息，并列出相对于 OpenAI 服务的所有已知差异和所有未解决缺口。[API namespaces and credentials](../../../docs/zh/api/index.md) 说明谁调用哪些 API；[Agents API guide](../../../docs/zh/api/public-agent-api.md) 介绍使用方法。
@@ -16,7 +16,7 @@ Core 旨在以下方固定版本为准支持完整的 OpenAI Agents API（[publi
 | [openapi.yaml](../openapi.yaml) | 官方公共契约，并在 Agent 和 Session 请求及响应对象上加入 Core 的 `x_agents_core` 扩展 |
 | [go-bindings.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/go-bindings.json) | Go 名称、字段表示、编码顺序和存储投影；不定义官方字段集合、枚举或约束 |
 
-运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。TypeScript 客户端在 `packages/agents-client/src/generated/public-api.ts` 中的类型、枚举值和字段名由生成后的公共 schema 生成。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成；同一生成器把 `/core/v1` 文档投影为 `packages/agents-client/src/generated/core-api.ts`，其中引用的公共类型从 `public-api.ts` 导入。在这些注解里，Core 总会发送的响应字段带 `binding:"required"`，可以为 null 的字段带 `extensions:"x-nullable"`，封闭集合带 `enums:`；这些标签只影响文档，客户端会拒绝不符合它们的响应。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
+运行 `make openapi` 重新生成公共 Go 类型、Agent 请求结构、路由清单和三个 OpenAPI 文档。`scripts/generate-public-api.py` 读取仓库内经过校验和验证的官方源文件，无需网络。它选择 Agents、Vaults、Files 和 Skills，并跟随 schema 引用，保留联合类型、可空性、必填字段和约束。`services/core/internal/api/official_shapes.gen.go` 中的请求结构投影 `CreateAgentParams`、`UpdateAgentParams` 和 `SessionAgentConfigParam`；Core 在读取 Agent 配置前先按它们检查请求体。Core 在 `v1/` 中的扩展类型继续由 Go 定义，在生成时加入公共 schema。TypeScript 客户端在 `packages/agents-client/src/generated/public-api.ts` 中的类型、枚举值和字段名由生成后的公共 schema 生成。内部 `/core/v1` 和 `/api/v1` 文档由处理函数注解生成；同一生成器把 `/core/v1` 文档投影为 `packages/agents-client/src/generated/core-api.ts`，其中引用的公共类型从 `public-api.ts` 导入。在这些注解里，Core 总会发送的响应字段带 `binding:"required"`，可以为 null 的字段带 `extensions:"x-nullable"`，Core 拥有的封闭集合使用生产方包中的具名 Go 类型和带类型的常量。Swag 从该类型生成一个枚举定义，供所有线上字段共享。单值判别字段保留 `enums:` 标签；映射官方或 Runtime 所有集合的字段保留标签，并通过契约测试与其所有者核对。这些注解只影响文档，客户端会拒绝不符合它们的响应。`make check-openapi` 检查生成结果是否最新并测试生成器；`make check-go` 也会运行此检查。
 
 公共契约是官方 API 加上 Core 扩展。标准字段生成到 `v1/official.gen.go`；`go-bindings.json` 只列出 Core 使用的类型，仅在已有存储或自定义 JSON 编码需要时覆盖 Go 表示或字段顺序。未覆盖的字段遵循官方 schema，相同结构复用同一个 Go 类型。部分带判别字段的联合类型也从 schema 生成 JSON 序列化代码，保留每个分支必需的可空字段。其他联合类型序列化、Core 的本地限制、执行准入和状态转换仍由实现代码负责。契约测试验证公共 schema 保留官方定义、扩展位于 `x_agents_core` 中，且所有文档与注册路由一致。官方客户端和原始 HTTP 测试验证行为。生成 schema 不代表某个尚未实现的功能已经得到验证；下方缺口仍然适用。升级上游时，在比对和兼容性测试后一起更新 OpenAPI 和 SDK 固定版本。
 
diff --git a/packages/agents-client/src/admin-projection.ts b/packages/agents-client/src/admin-projection.ts
index de765a7df..15877ecc5 100644
--- a/packages/agents-client/src/admin-projection.ts
+++ b/packages/agents-client/src/admin-projection.ts
@@ -8,11 +8,11 @@ import {
   addressBindingsFields, adminAssetCountsFields, adminauditOperationFields, adminauditPageFields, adminRuntimeObservationFields,
   adminRuntimeObservationListFields, adminSessionCountsFields, adminSummaryResponseFields, adminSummaryRowFields, adminUsageCoverageFields,
   coreHarnessFields, coreHarnessListFields, executorConnectionFields, executorConnectionStatusValues, executorCredentialFields,
-  executorCredentialListFields, harnessModelConfigurationFields, harnessModelConfigurationLastErrorCodeValues, installationConfigurationFields,
-  installationFields, installationSettingFields, installationSettingRequired, installationSettingRestartsValues, issuedExecutorCredentialFields,
+  executorCredentialListFields, harnessModelConfigurationFields, providerErrorCodeValues, installationConfigurationFields,
+  installationFields, installationSettingFields, installationSettingRequired, installationServiceValues, issuedExecutorCredentialFields,
   managedArchiveFields, managedArchiveStateValues, modelConfigurationSupportFields, projectFields, projectsAPIKeyFields, resourceOwnerFields,
-  resourceOwnerListFields, runtimeDiskObservationFields, writeauditAPIKeyFields, writeauditOperationActionValues, writeauditOperationFields,
-  writeauditOperationResourceTypeValues, writeauditPageFields,
+  resourceOwnerListFields, runtimeDiskObservationFields, writeauditAPIKeyFields, actionValues, writeauditOperationFields,
+  resourceTypeValues, writeauditPageFields,
 } from "./generated/core-api";
 import type { CoreHarness, CoreHarnessKind, HarnessModelConfiguration, ListPage, SavedAgent, SessionArtifact } from "./types";
 import type {
@@ -119,7 +119,7 @@ export function projectWriteOperations(value: unknown): AdminWriteOperationPage
   const data = page.data.map((entry) => {
     const operation = record(entry, writeauditOperationFields);
     strings(operation, ["id", "created_at", "action", "resource_id", "parent_id", "request_id", "trace_id"]);
-    if (!date(operation.created_at) || !isOneOf(writeauditOperationActionValues, operation.action) || !isOneOf(writeauditOperationResourceTypeValues, operation.resource_type)) return invalidAdminResponse();
+    if (!date(operation.created_at) || !isOneOf(actionValues, operation.action) || !isOneOf(resourceTypeValues, operation.resource_type)) return invalidAdminResponse();
     return { ...operation, api_key: projectProvenance(operation.api_key) };
   });
   return { data, has_more: page.has_more, next_cursor: page.next_cursor } as AdminWriteOperationPage;
@@ -212,7 +212,7 @@ export function projectHarnessModelConfiguration(value: unknown, harness?: CoreH
   const { object, harness: kind, updated_at, last_used_at, last_error_code, last_error_at, model_provider, model, harness_config } = value;
   if ((last_used_at !== null && (typeof last_used_at !== "string" || !date(last_used_at))) ||
     (last_error_at !== null && (typeof last_error_at !== "string" || !date(last_error_at))) ||
-    (last_error_code !== null && !isOneOf(harnessModelConfigurationLastErrorCodeValues, last_error_code)) ||
+    (last_error_code !== null && !isOneOf(providerErrorCodeValues, last_error_code)) ||
     ((last_error_code === null) !== (last_error_at === null))) return invalidAdminResponse();
   if (object !== "core.model_configuration" || !isOneOf(coreHarnessKinds, kind) || (harness !== undefined && kind !== harness) ||
     typeof updated_at !== "string" || !date(updated_at)) return invalidAdminResponse();
@@ -255,7 +255,7 @@ function projectInstallationSetting(value: unknown): CoreInstallationSetting {
   // `configured` is present exactly for a sensitive setting.
   const setting = record(value, value.sensitive ? installationSettingFields : installationSettingRequired);
   if (typeof setting.key !== "string" || !settingKey.test(setting.key) || typeof setting.changeable !== "boolean" ||
-    !Array.isArray(setting.restarts) || !setting.restarts.every((service) => isOneOf(installationSettingRestartsValues, service)) ||
+    !Array.isArray(setting.restarts) || !setting.restarts.every((service) => isOneOf(installationServiceValues, service)) ||
     (setting.sensitive && (setting.value !== null || setting.default !== null || typeof setting.configured !== "boolean"))) return invalidAdminResponse();
   return { ...setting } as unknown as CoreInstallationSetting;
 }
diff --git a/packages/agents-client/src/admin-types.ts b/packages/agents-client/src/admin-types.ts
index 266296360..2b5b5b939 100644
--- a/packages/agents-client/src/admin-types.ts
+++ b/packages/agents-client/src/admin-types.ts
@@ -2,12 +2,12 @@ import type {
   AddressBindings, AdminauditOperation, AdminauditPage, AdminRuntimeObservationDetail, AdminSessionArchiveRequest, AdminSummaryResponse,
   AdminSummaryRow, EnvironmentExecutorCredentialRequest, Installation, InstallationConfiguration, InstallationSetting, IssuedAPIKey,
   IssuedExecutorCredential as IssuedExecutorCredentialResource, ManagedArchive, Project, ProjectAPIKeyRequest, ProjectRequest, ProjectsAPIKey,
-  ResourceOwner, WriteauditAPIKey, WriteauditOperation, WriteauditOperationResourceType, WriteauditPage,
+  ResourceOwner, WriteauditAPIKey, WriteauditOperation, ResourceType, WriteauditPage,
 } from "./generated/core-api";
 import type { PageOptions, RuntimeObservation } from "./types";
 
 export type { ExecutorConnection, ExecutorCredential, ExecutorCredentialList, RuntimeDiskObservation } from "./generated/core-api";
-export { writeauditOperationResourceTypeValues as adminResourceTypes } from "./generated/core-api";
+export { resourceTypeValues as adminResourceTypes } from "./generated/core-api";
 
 // Generated types keep their schema names in ./generated/core-api; these are the client's names for them.
 export type AdminProject = Project;
@@ -19,7 +19,7 @@ export type IssueAdminAPIKeyInput = ProjectAPIKeyRequest;
 export type ArchiveAdminSessionInput = AdminSessionArchiveRequest;
 /** Current resource disposition; released does not imply that the active Turn has finalized. */
 export type AdminSessionArchive = ManagedArchive;
-export type AdminResourceType = WriteauditOperationResourceType;
+export type AdminResourceType = ResourceType;
 export type AdminKeyProvenance = WriteauditAPIKey;
 /** `api_key` is null when Core has no creation record. */
 export type AdminResourceOwner = ResourceOwner;
diff --git a/packages/agents-client/src/core-metrics.ts b/packages/agents-client/src/core-metrics.ts
index 43cd21e9e..f6859cfd1 100644
--- a/packages/agents-client/src/core-metrics.ts
+++ b/packages/agents-client/src/core-metrics.ts
@@ -2,7 +2,7 @@ import { AgentCoreError } from "./client";
 import { CoreRequester, type CoreClientOptions } from "./core-request";
 import { isOneOf } from "./response-projection";
 import type { ReadOptions } from "./types";
-import { jobStatusValues, serviceStateStatusValues, type CoremetricsView, type JobStatus, type Latency, type ServiceState, type ServiceStateStatus } from "./generated/core-api";
+import { jobStatusValues, serviceStatusValues, type CoremetricsView, type JobStatus, type Latency, type ServiceState, type ServiceStatus } from "./generated/core-api";
 
 function invalidCoreMetrics(): never {
   throw new AgentCoreError("Core metrics: the response is not JSON.", 0, "invalid_response");
@@ -19,7 +19,7 @@ export type CoreJobStatus = JobStatus;
  * null, never zero. The client reads a service status it does not recognise
  * as `unknown`, which is never shown as running.
  */
-export type CoreMetrics = Omit<CoremetricsView, "service"> & { service: Omit<ServiceState, "status"> & { status: ServiceStateStatus | "unknown" } };
+export type CoreMetrics = Omit<CoremetricsView, "service"> & { service: Omit<ServiceState, "status"> & { status: ServiceStatus | "unknown" } };
 
 type Json = Record<string, unknown>;
 
@@ -67,7 +67,7 @@ export function projectCoreMetrics(value: unknown): CoreMetrics {
   const database = optional(body.database);
   const pool = optional(database.pool);
   const process = optional(body.process);
-  const status = isOneOf(serviceStateStatusValues, service.status) ? service.status : "unknown";
+  const status = isOneOf(serviceStatusValues, service.status) ? service.status : "unknown";
   const resolution = number(range.resolution_seconds);
   if (resolution === null || resolution <= 0) throw new AgentCoreError("Core metrics: range.resolution_seconds is missing.", 0, "invalid_response");
   return {
diff --git a/packages/agents-client/src/execution-configuration-projection.ts b/packages/agents-client/src/execution-configuration-projection.ts
index efaca3016..e0a1506cc 100644
--- a/packages/agents-client/src/execution-configuration-projection.ts
+++ b/packages/agents-client/src/execution-configuration-projection.ts
@@ -1,8 +1,8 @@
 import { modelProviderProtocols } from "./harness-catalog";
 import { modelProviderViewFields } from "./generated/public-api";
 import {
-  executionHarnessConfigSelectionFields, executionProviderSelectionFields, executionSelectionFields, executionSelectionSourceValues,
-  sessionExecutionConfigurationFields, type ExecutionSelectionSource,
+  executionHarnessConfigSelectionFields, executionProviderSelectionFields, executionSelectionFields, executionSourceValues,
+  sessionExecutionConfigurationFields, type ExecutionSource,
 } from "./generated/core-api";
 import { canonicalUuid, exactFields, isNonnegativeInteger, isOneOf, isRecord, onlyFields, sameResourceId } from "./response-projection";
 import type { ModelProviderView, SessionExecutionConfiguration } from "./types";
@@ -11,10 +11,10 @@ type Invalid = () => never;
 const protocols: ReadonlySet<unknown> = new Set(modelProviderProtocols);
 
 function selection(value: unknown, invalid: Invalid): SessionExecutionConfiguration["model"] {
-  if (!isRecord(value) || !exactFields(value, executionSelectionFields) || !isOneOf(executionSelectionSourceValues, value.source) ||
+  if (!isRecord(value) || !exactFields(value, executionSelectionFields) || !isOneOf(executionSourceValues, value.source) ||
     (value.value !== null && (typeof value.value !== "string" || value.value.length === 0)) ||
     (value.value === null && value.source !== "unknown")) return invalid();
-  return { value: value.value as string | null, source: value.source as ExecutionSelectionSource };
+  return { value: value.value as string | null, source: value.source as ExecutionSource };
 }
 
 // Splits an absolute URL as RFC 3986 appendix B does, without parsing its host.
@@ -56,7 +56,7 @@ export function projectExecutionConfiguration(value: unknown, sessionId: string,
     !isRecord(value.model_provider) || !exactFields(value.model_provider, executionProviderSelectionFields)) return invalid();
   const native = value.harness_config;
   if (!isRecord(native) || !exactFields(native, executionHarnessConfigSelectionFields) || !isRecord(native.value) ||
-    !isOneOf(executionSelectionSourceValues, native.source) || (native.source === "unknown" && Object.keys(native.value).length !== 0)) return invalid();
+    !isOneOf(executionSourceValues, native.source) || (native.source === "unknown" && Object.keys(native.value).length !== 0)) return invalid();
   const provider = value.model_provider;
   let configuration: ModelProviderView | null = null;
   if (provider.status === "available" && (provider.source === "session" || provider.source === "agent" || provider.source === "deployment")) {
@@ -66,7 +66,7 @@ export function projectExecutionConfiguration(value: unknown, sessionId: string,
   return {
     object: "agent.session.execution_configuration", schema_version: 1, session_id: value.session_id,
     model: selection(value.model, invalid), harness: selection(value.harness, invalid),
-    harness_config: { value: { ...native.value }, source: native.source as ExecutionSelectionSource },
-    model_provider: { source: provider.source as ExecutionSelectionSource, status: provider.status as SessionExecutionConfiguration["model_provider"]["status"], configuration },
+    harness_config: { value: { ...native.value }, source: native.source as ExecutionSource },
+    model_provider: { source: provider.source as ExecutionSource, status: provider.status as SessionExecutionConfiguration["model_provider"]["status"], configuration },
   };
 }
diff --git a/packages/agents-client/src/generated/core-api.ts b/packages/agents-client/src/generated/core-api.ts
index 34497e5bc..ef70621b7 100644
--- a/packages/agents-client/src/generated/core-api.ts
+++ b/packages/agents-client/src/generated/core-api.ts
@@ -1,6 +1,8 @@
 // Code generated by scripts/generate-public-api.py from contracts/agents-api/core.openapi.yaml; DO NOT EDIT.
 import type { ModelProviderInput, ModelProviderView, TokenUsageResource } from "./public-api";
 
+export const actionValues = ["create", "update", "delete", "send_events", "upload_file", "upload_version", "update_default_version"] as const;
+export type Action = (typeof actionValues)[number];
 export interface AddressBindings {
   hosted_sandboxes: number;
   nodes: number;
@@ -171,6 +173,8 @@ export interface DatabaseBucket {
   start: string;
 }
 export const databaseBucketFields = ["ping_p95_ms", "pool_in_use", "start"] as const;
+export const deploymentModeValues = ["", "nodes", "direct"] as const;
+export type DeploymentMode = (typeof deploymentModeValues)[number];
 export interface DeploymentResources {
   allocations: number;
   pending: number;
@@ -189,7 +193,7 @@ export interface DeploymentView {
   generation: number;
   installation_id: string;
   metadata?: Record<string, unknown>;
-  mode: DeploymentViewMode;
+  mode: DeploymentMode;
   owner_epoch: number;
   provider: string;
   reset: Reset | null;
@@ -201,8 +205,6 @@ export interface DeploymentView {
 }
 export const deploymentViewFields = ["configuration", "core_url", "credential_configured", "generation", "installation_id", "metadata", "mode", "owner_epoch", "provider", "reset", "resources", "rollout", "specification", "specification_digest", "suspension"] as const;
 export const deploymentViewRequired = ["core_url", "credential_configured", "generation", "installation_id", "mode", "owner_epoch", "provider", "reset", "resources", "rollout", "suspension"] as const;
-export const deploymentViewModeValues = ["", "nodes", "direct"] as const;
-export type DeploymentViewMode = (typeof deploymentViewModeValues)[number];
 export interface DiagnosticFailure {
   code: DiagnosticFailureCode;
   failed_at: string | null;
@@ -211,6 +213,8 @@ export interface DiagnosticFailure {
 export const diagnosticFailureFields = ["code", "failed_at", "params"] as const;
 export const diagnosticFailureCodeValues = ["harness_error", "model_provider_required", "runtime_unavailable", "runtime_disconnected", "runtime_preparation_failed", "execution_interrupted", "delivery_unconfirmed", "input_rejected", "executor_protocol_error", "core_storage_failed", "internal_error", "environment_connection_timeout", "environment_unavailable", "environment_provisioning_failed", "authentication_error", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "invalid_request", "resource_not_found", "request_timeout", "context_length_exceeded", "cyber_policy", "connection_failed"] as const;
 export type DiagnosticFailureCode = (typeof diagnosticFailureCodeValues)[number];
+export const diagnosticSourceValues = ["turn", "environment", "environment_input"] as const;
+export type DiagnosticSource = (typeof diagnosticSourceValues)[number];
 export interface EnvironmentExecutorCredentialRequest {
   key_id: string;
   rotate?: boolean;
@@ -239,29 +243,25 @@ export interface ExecutionBucket {
 }
 export const executionBucketFields = ["in_progress", "queue_wait_p95_ms", "queued", "start"] as const;
 export interface ExecutionHarnessConfigSelection {
-  source: ExecutionHarnessConfigSelectionSource;
+  source: ExecutionSource;
   value: Record<string, unknown>;
 }
 export const executionHarnessConfigSelectionFields = ["source", "value"] as const;
-export const executionHarnessConfigSelectionSourceValues = ["session", "agent", "deployment", "unknown"] as const;
-export type ExecutionHarnessConfigSelectionSource = (typeof executionHarnessConfigSelectionSourceValues)[number];
 export interface ExecutionProviderSelection {
   configuration: ModelProviderView | null;
-  source: ExecutionProviderSelectionSource;
-  status: ExecutionProviderSelectionStatus;
+  source: ExecutionSource;
+  status: ExecutionProviderStatus;
 }
 export const executionProviderSelectionFields = ["configuration", "source", "status"] as const;
-export const executionProviderSelectionSourceValues = ["session", "agent", "deployment", "unknown"] as const;
-export type ExecutionProviderSelectionSource = (typeof executionProviderSelectionSourceValues)[number];
-export const executionProviderSelectionStatusValues = ["available", "redacted", "unavailable"] as const;
-export type ExecutionProviderSelectionStatus = (typeof executionProviderSelectionStatusValues)[number];
+export const executionProviderStatusValues = ["available", "redacted", "unavailable"] as const;
+export type ExecutionProviderStatus = (typeof executionProviderStatusValues)[number];
 export interface ExecutionSelection {
-  source: ExecutionSelectionSource;
+  source: ExecutionSource;
   value: string | null;
 }
 export const executionSelectionFields = ["source", "value"] as const;
-export const executionSelectionSourceValues = ["session", "agent", "deployment", "unknown"] as const;
-export type ExecutionSelectionSource = (typeof executionSelectionSourceValues)[number];
+export const executionSourceValues = ["session", "agent", "deployment", "unknown"] as const;
+export type ExecutionSource = (typeof executionSourceValues)[number];
 export interface ExecutorConnection {
   bound_key_id: string | null;
   enrolled_at: string | null;
@@ -286,7 +286,7 @@ export interface HarnessModelConfiguration {
   harness: HarnessModelConfigurationHarness;
   harness_config: Record<string, unknown>;
   last_error_at: string | null;
-  last_error_code: HarnessModelConfigurationLastErrorCode | null;
+  last_error_code: ProviderErrorCode | null;
   last_used_at: string | null;
   model: string;
   model_provider: ModelProviderView;
@@ -296,8 +296,6 @@ export interface HarnessModelConfiguration {
 export const harnessModelConfigurationFields = ["harness", "harness_config", "last_error_at", "last_error_code", "last_used_at", "model", "model_provider", "object", "updated_at"] as const;
 export const harnessModelConfigurationHarnessValues = ["claude_sdk", "codex", "mcode"] as const;
 export type HarnessModelConfigurationHarness = (typeof harnessModelConfigurationHarnessValues)[number];
-export const harnessModelConfigurationLastErrorCodeValues = ["authentication_error", "connection_failed", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "resource_not_found", "request_timeout", "invalid_request"] as const;
-export type HarnessModelConfigurationLastErrorCode = (typeof harnessModelConfigurationLastErrorCodeValues)[number];
 export interface HostHistory {
   points: HostHistoryPoint[];
   resolution_seconds: number;
@@ -325,19 +323,19 @@ export interface InstallationConfiguration {
   settings: InstallationSetting[];
 }
 export const installationConfigurationFields = ["settings"] as const;
+export const installationServiceValues = ["core", "web"] as const;
+export type InstallationService = (typeof installationServiceValues)[number];
 export interface InstallationSetting {
   changeable: boolean;
   configured?: boolean;
   default: unknown | null;
   key: string;
-  restarts: InstallationSettingRestarts[];
+  restarts: InstallationService[];
   sensitive: boolean;
   value: unknown | null;
 }
 export const installationSettingFields = ["changeable", "configured", "default", "key", "restarts", "sensitive", "value"] as const;
 export const installationSettingRequired = ["changeable", "default", "key", "restarts", "sensitive", "value"] as const;
-export const installationSettingRestartsValues = ["core", "web"] as const;
-export type InstallationSettingRestarts = (typeof installationSettingRestartsValues)[number];
 export interface IssuedAPIKey {
   created_at: string;
   id: string;
@@ -411,7 +409,7 @@ export interface Node {
   core_url: string;
   cpu_count: number | null;
   created_at: string;
-  diagnostic?: NodeDiagnostic;
+  diagnostic?: NodeDiagnosticCode;
   enrollment_id: string | null;
   id: string;
   last_seen_at: string | null;
@@ -454,7 +452,7 @@ export interface NodeDetail {
   core_url: string;
   cpu_count: number | null;
   created_at: string;
-  diagnostic?: NodeDetailDiagnostic;
+  diagnostic?: NodeDiagnosticCode;
   enrollment_id: string | null;
   history: HostHistory;
   host: NodeHost;
@@ -474,10 +472,8 @@ export interface NodeDetail {
 }
 export const nodeDetailFields = ["active", "available_disk_bytes", "available_memory_bytes", "cleanup_pending", "core_url", "cpu_count", "created_at", "diagnostic", "enrollment_id", "history", "host", "id", "last_seen_at", "max_active", "max_retained", "name", "online", "provider", "provider_ready", "reserved", "retained", "rollout", "running", "snapshots"] as const;
 export const nodeDetailRequired = ["active", "available_disk_bytes", "available_memory_bytes", "cleanup_pending", "core_url", "cpu_count", "created_at", "enrollment_id", "history", "host", "id", "last_seen_at", "max_active", "max_retained", "name", "online", "provider", "provider_ready", "reserved", "retained", "rollout", "running", "snapshots"] as const;
-export const nodeDetailDiagnosticValues = ["provider_unavailable", "host_unsupported", "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient"] as const;
-export type NodeDetailDiagnostic = (typeof nodeDetailDiagnosticValues)[number];
-export const nodeDiagnosticValues = ["provider_unavailable", "host_unsupported", "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient"] as const;
-export type NodeDiagnostic = (typeof nodeDiagnosticValues)[number];
+export const nodeDiagnosticCodeValues = ["provider_unavailable", "host_unsupported", "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient"] as const;
+export type NodeDiagnosticCode = (typeof nodeDiagnosticCodeValues)[number];
 export interface NodeHost {
   available_disk_bytes: number | null;
   available_memory_bytes: number | null;
@@ -488,14 +484,12 @@ export interface NodeHost {
 }
 export const nodeHostFields = ["available_disk_bytes", "available_memory_bytes", "cpu_utilization", "effective_cpu_cores", "observed_at", "total_memory_bytes"] as const;
 export interface NodeRollout {
-  diagnostic?: NodeRolloutDiagnostic;
+  diagnostic?: NodeDiagnosticCode;
   ready_generation: number | null;
   state: NodeRolloutState;
 }
 export const nodeRolloutFields = ["diagnostic", "ready_generation", "state"] as const;
 export const nodeRolloutRequired = ["ready_generation", "state"] as const;
-export const nodeRolloutDiagnosticValues = ["provider_unavailable", "host_unsupported", "artifacts_unavailable", "runtime_download_failed", "runtime_image_unavailable", "capacity_insufficient"] as const;
-export type NodeRolloutDiagnostic = (typeof nodeRolloutDiagnosticValues)[number];
 export const nodeRolloutStateValues = ["ready", "preparing", "failed", "update_required", "unknown"] as const;
 export type NodeRolloutState = (typeof nodeRolloutStateValues)[number];
 export interface NodeUpdate {
@@ -557,6 +551,8 @@ export interface ProjectsPage {
   has_more: boolean;
 }
 export const projectsPageFields = ["data", "has_more"] as const;
+export const providerErrorCodeValues = ["authentication_error", "connection_failed", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "resource_not_found", "request_timeout", "invalid_request"] as const;
+export type ProviderErrorCode = (typeof providerErrorCodeValues)[number];
 export interface Range {
   end: string;
   resolution_seconds: number;
@@ -564,15 +560,15 @@ export interface Range {
 }
 export const rangeFields = ["end", "resolution_seconds", "start"] as const;
 export interface Reset {
-  clear: ResetClear;
+  clear: ResetMode;
   deadline_at: string | null;
   forced_at: string | null;
   remaining: ResetRemaining;
   requested_at: string;
 }
 export const resetFields = ["clear", "deadline_at", "forced_at", "remaining", "requested_at"] as const;
-export const resetClearValues = ["auto", "force"] as const;
-export type ResetClear = (typeof resetClearValues)[number];
+export const resetModeValues = ["auto", "force"] as const;
+export type ResetMode = (typeof resetModeValues)[number];
 export interface ResetOfflineNode {
   name: string;
   node_id: string;
@@ -588,14 +584,12 @@ export interface ResetRemaining {
 }
 export const resetRemainingFields = ["busy", "cleanup", "idle", "offline_nodes", "on_offline_nodes"] as const;
 export interface ResetRequest {
-  clear: ResetRequestClear;
+  clear: ResetMode;
   deadline_seconds?: number;
   expected_generation: number;
 }
 export const resetRequestFields = ["clear", "deadline_seconds", "expected_generation"] as const;
 export const resetRequestRequired = ["clear", "expected_generation"] as const;
-export const resetRequestClearValues = ["auto", "force"] as const;
-export type ResetRequestClear = (typeof resetRequestClearValues)[number];
 export interface ResourceOwner {
   api_key: WriteauditAPIKey | null;
   resource_id: string;
@@ -605,6 +599,8 @@ export interface ResourceOwnerList {
   data: ResourceOwner[];
 }
 export const resourceOwnerListFields = ["data"] as const;
+export const resourceTypeValues = ["agent", "session", "environment", "environment_template", "skill", "skill_version", "file", "vault", "credential", "artifact"] as const;
+export type ResourceType = (typeof resourceTypeValues)[number];
 export interface Rollout {
   nodes: RolloutNodes | null;
   previous_generation_sandboxes: number;
@@ -823,24 +819,22 @@ export interface ServiceState {
   execution_owner: boolean | null;
   revision: string | null;
   started_at: string | null;
-  status: ServiceStateStatus;
+  status: ServiceStatus;
 }
 export const serviceStateFields = ["execution_owner", "revision", "started_at", "status"] as const;
-export const serviceStateStatusValues = ["running", "degraded"] as const;
-export type ServiceStateStatus = (typeof serviceStateStatusValues)[number];
+export const serviceStatusValues = ["running", "degraded"] as const;
+export type ServiceStatus = (typeof serviceStatusValues)[number];
 export interface SessionDiagnosticFailure {
   code: SessionDiagnosticFailureCode;
   failed_at: string | null;
   params: Record<string, unknown>;
-  source: SessionDiagnosticFailureSource;
+  source: DiagnosticSource;
   turn_id?: string;
 }
 export const sessionDiagnosticFailureFields = ["code", "failed_at", "params", "source", "turn_id"] as const;
 export const sessionDiagnosticFailureRequired = ["code", "failed_at", "params", "source"] as const;
 export const sessionDiagnosticFailureCodeValues = ["harness_error", "model_provider_required", "runtime_unavailable", "runtime_disconnected", "runtime_preparation_failed", "execution_interrupted", "delivery_unconfirmed", "input_rejected", "executor_protocol_error", "core_storage_failed", "internal_error", "environment_connection_timeout", "environment_unavailable", "environment_provisioning_failed", "authentication_error", "rate_limit_exceeded", "usage_limit_exceeded", "server_overloaded", "server_error", "invalid_request", "resource_not_found", "request_timeout", "context_length_exceeded", "cyber_policy", "connection_failed"] as const;
 export type SessionDiagnosticFailureCode = (typeof sessionDiagnosticFailureCodeValues)[number];
-export const sessionDiagnosticFailureSourceValues = ["turn", "environment", "environment_input"] as const;
-export type SessionDiagnosticFailureSource = (typeof sessionDiagnosticFailureSourceValues)[number];
 export interface SessionDiagnostics {
   failure: SessionDiagnosticFailure | null;
   object: "core.session_diagnostics";
@@ -884,21 +878,17 @@ export interface WriteauditAPIKey {
 }
 export const writeauditAPIKeyFields = ["id", "kind", "name", "prefix", "revoked_at"] as const;
 export interface WriteauditOperation {
-  action: WriteauditOperationAction;
+  action: Action;
   api_key: WriteauditAPIKey;
   created_at: string;
   id: string;
   parent_id: string;
   request_id: string;
   resource_id: string;
-  resource_type: WriteauditOperationResourceType;
+  resource_type: ResourceType;
   trace_id: string;
 }
 export const writeauditOperationFields = ["action", "api_key", "created_at", "id", "parent_id", "request_id", "resource_id", "resource_type", "trace_id"] as const;
-export const writeauditOperationActionValues = ["create", "update", "delete", "send_events", "upload_file", "upload_version", "update_default_version"] as const;
-export type WriteauditOperationAction = (typeof writeauditOperationActionValues)[number];
-export const writeauditOperationResourceTypeValues = ["agent", "session", "environment", "environment_template", "skill", "skill_version", "file", "vault", "credential", "artifact"] as const;
-export type WriteauditOperationResourceType = (typeof writeauditOperationResourceTypeValues)[number];
 export interface WriteauditPage {
   data: WriteauditOperation[];
   has_more: boolean;
diff --git a/packages/agents-client/src/generated/public-api.ts b/packages/agents-client/src/generated/public-api.ts
index 4edc43fd2..80d6fa6c0 100644
--- a/packages/agents-client/src/generated/public-api.ts
+++ b/packages/agents-client/src/generated/public-api.ts
@@ -352,7 +352,7 @@ export interface EnvironmentInstallation {
   commands?: Record<string, string>;
   expires_at?: number;
   message?: string;
-  status?: "available" | "unavailable";
+  status?: InstallationStatus;
   version?: string;
 }
 export const environmentInstallationFields = ["commands", "expires_at", "message", "status", "version"] as const;
@@ -639,6 +639,8 @@ export interface InputTokensDetailsResource {
   cached_tokens: number;
 }
 export const inputTokensDetailsResourceFields = ["cached_tokens"] as const;
+export const installationStatusValues = ["available", "unavailable"] as const;
+export type InstallationStatus = (typeof installationStatusValues)[number];
 export interface InterruptSubagentCallItemResource {
   type: "interrupt_subagent_call";
   id: string;
@@ -768,7 +770,7 @@ export interface ModelProviderInput {
   base_url: string;
   context_window?: number;
   max_output_tokens?: number;
-  protocol: "anthropic" | "responses" | "chat_completions";
+  protocol: Protocol;
 }
 export const modelProviderInputFields = ["api_key", "base_url", "context_window", "max_output_tokens", "protocol"] as const;
 export const modelProviderInputRequired = ["api_key", "base_url", "protocol"] as const;
@@ -777,7 +779,7 @@ export interface ModelProviderView {
   base_url: string;
   context_window?: number;
   max_output_tokens?: number;
-  protocol: "anthropic" | "responses" | "chat_completions";
+  protocol: Protocol;
 }
 export const modelProviderViewFields = ["api_key_configured", "base_url", "context_window", "max_output_tokens", "protocol"] as const;
 export const modelProviderViewRequired = ["api_key_configured", "base_url", "protocol"] as const;
@@ -943,6 +945,8 @@ export interface PersistedMcpTransportResourceStdio {
   env_vars: string[];
 }
 export const persistedMcpTransportResourceStdioFields = ["type", "command", "args", "cwd", "env_vars"] as const;
+export const protocolValues = ["anthropic", "responses", "chat_completions"] as const;
+export type Protocol = (typeof protocolValues)[number];
 export interface PublicEnvironmentResource {
   id: string;
   object: "agent.environment";
diff --git a/packages/agents-client/src/sandbox-client.ts b/packages/agents-client/src/sandbox-client.ts
index 1cdc84d2d..853bc4eeb 100644
--- a/packages/agents-client/src/sandbox-client.ts
+++ b/packages/agents-client/src/sandbox-client.ts
@@ -3,25 +3,25 @@ import { CoreRequester, type CoreClientOptions } from "./core-request";
 import { deploymentContract } from "./deployment-contract";
 import { hasOwn, isNonnegativeInteger, isOneOf, isRecord, onlyFields, sameResourceId, schemaFields } from "./response-projection";
 import {
-  deploymentResourcesFields, deploymentSpecFields, deploymentSpecRequired, deploymentViewFields, deploymentViewModeValues, deploymentViewRequired,
+  deploymentResourcesFields, deploymentSpecFields, deploymentSpecRequired, deploymentViewFields, deploymentModeValues, deploymentViewRequired,
   hostHistoryFields, hostHistoryPointFields, nodeAllocationDiagnosticValues, nodeAllocationFields, nodeDetailFields, nodeDetailRequired,
-  nodeDiagnosticValues, nodeFields, nodeHostFields, nodeRequired, nodeRolloutFields, nodeRolloutRequired, nodeRolloutStateValues, resetClearValues,
+  nodeDiagnosticCodeValues, nodeFields, nodeHostFields, nodeRequired, nodeRolloutFields, nodeRolloutRequired, nodeRolloutStateValues, resetModeValues,
   resetFields, resetOfflineNodeFields, resetRemainingFields, rolloutFields, rolloutNodesFields, rolloutStateValues, runtimeReleaseFields,
   sandboxAllocationListFields, sandboxNodeListFields, sandboxResourcesFields, sandboxResourcesRequired, suspensionFields,
-  type DeploymentSpec, type DeploymentView, type HostHistoryPoint, type Node, type NodeAllocation, type NodeDetail, type NodeDiagnostic,
+  type DeploymentSpec, type DeploymentView, type HostHistoryPoint, type Node, type NodeAllocation, type NodeDetail, type NodeDiagnosticCode,
   type NodeHost, type NodeRollout, type NodeUpdate, type Reset, type ResetOfflineNode, type ResetRequest, type Rollout, type RuntimeRelease,
   type SandboxDeploymentInput, type SandboxEnrollmentToken, type SandboxResources as SandboxResourcesResource,
 } from "./generated/core-api";
 import type { ReadOptions } from "./types";
 
 /** Checked against Core's shared node-diagnostics.json fixture. */
-export const sandboxNodeDiagnostics = nodeDiagnosticValues;
+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 = NodeDiagnostic;
+export type SandboxNodeDiagnostic = NodeDiagnosticCode;
 
 /** Keep a known readiness cause; never expose unclassified node-supplied text. */
 export function normalizeSandboxNodeDiagnostic(value: string): SandboxNodeDiagnostic {
-  return isOneOf(nodeDiagnosticValues, value) ? value : "provider_unavailable";
+  return isOneOf(nodeDiagnosticCodeValues, value) ? value : "provider_unavailable";
 }
 
 /** A registered Provider kind; deploymentContract.providers holds each one's declaration. */
@@ -121,7 +121,7 @@ function projectReset(value: unknown, held: number): SandboxReset | null {
   if (value === null) return null;
   const reset = members(value, resetFields);
   const remaining = members(reset.remaining, resetRemainingFields);
-  valid(isOneOf(resetClearValues, reset.clear) && timestamp(reset.requested_at) &&
+  valid(isOneOf(resetModeValues, reset.clear) && timestamp(reset.requested_at) &&
     nullable(timestamp)(reset.deadline_at) && nullable(timestamp)(reset.forced_at) &&
     (reset.clear === "auto" ? reset.deadline_at !== null && reset.forced_at === null : reset.forced_at !== null) &&
     [remaining.busy, remaining.idle, remaining.cleanup, remaining.on_offline_nodes].every(isNonnegativeInteger) && Array.isArray(remaining.offline_nodes));
@@ -161,7 +161,7 @@ function projectDeployment(value: unknown): SandboxDeployment {
   const resources = members(deployment.resources, deploymentResourcesFields);
   const suspension = deployment.suspension === null ? null : members(deployment.suspension, suspensionFields);
   const configured = hasOwn(deployment, "specification");
-  valid(strings(deployment, ["installation_id", "core_url"]) && (deployment.provider === "" || (typeof deployment.provider === "string" && hasOwn(deploymentContract.providers, deployment.provider))) && isOneOf(deploymentViewModeValues, deployment.mode) &&
+  valid(strings(deployment, ["installation_id", "core_url"]) && (deployment.provider === "" || (typeof deployment.provider === "string" && hasOwn(deploymentContract.providers, deployment.provider))) && isOneOf(deploymentModeValues, deployment.mode) &&
     [deployment.owner_epoch, deployment.generation, resources.allocations, resources.pending].every(isNonnegativeInteger) &&
     (suspension === null || [suspension.idle_seconds, suspension.retention_seconds].every(isNonnegativeInteger)) &&
     configured === hasOwn(deployment, "specification_digest") && (!configured || (typeof deployment.specification_digest === "string" && deployment.specification_digest !== "")));
diff --git a/packages/agents-client/src/session-diagnostics.ts b/packages/agents-client/src/session-diagnostics.ts
index f2793ca82..27ed6925d 100644
--- a/packages/agents-client/src/session-diagnostics.ts
+++ b/packages/agents-client/src/session-diagnostics.ts
@@ -3,7 +3,7 @@ import { invalidAdminResponse } from "./admin-projection";
 import { turnStatusResourceValues } from "./generated/public-api";
 import {
   diagnosticFailureFields, itemDiagnosticTimingFields, sessionDiagnosticFailureFields, sessionDiagnosticFailureRequired,
-  sessionDiagnosticFailureSourceValues, sessionDiagnosticsFields, sessionDiagnosticsStatusValues, turnDiagnosticsFields,
+  diagnosticSourceValues, sessionDiagnosticsFields, sessionDiagnosticsStatusValues, turnDiagnosticsFields,
   type DiagnosticFailure as DiagnosticFailureResource, type DiagnosticFailureCode, type ItemDiagnosticTiming,
   type SessionDiagnosticFailure as SessionDiagnosticFailureResource, type SessionDiagnostics as SessionDiagnosticsResource,
   type TurnDiagnostics as TurnDiagnosticsResource,
@@ -50,7 +50,7 @@ export function projectSessionDiagnostics(value: unknown, sessionId: string): Se
       canonicalUuid(value.session_id) === null || !sameResourceId(value.session_id as string, sessionId) || !isOneOf(sessionDiagnosticsStatusValues, value.status)) return invalidAdminResponse();
   let projected: SessionDiagnosticFailure | null = null;
   if (value.status === "failed") {
-    if (!isRecord(value.failure) || !isOneOf(sessionDiagnosticFailureSourceValues, value.failure.source)) return invalidAdminResponse();
+    if (!isRecord(value.failure) || !isOneOf(diagnosticSourceValues, value.failure.source)) return invalidAdminResponse();
     const f = value.failure;
     const source = value.failure.source;
     projected = { ...failure(f, source === "turn" ? turnCodes : source === "environment_input" ? inputCodes : environmentCodes, true), source };
diff --git a/scripts/generate-public-api.test.py b/scripts/generate-public-api.test.py
index dd039c572..48ebbed83 100644
--- a/scripts/generate-public-api.test.py
+++ b/scripts/generate-public-api.test.py
@@ -23,7 +23,7 @@ def test_generated_types_are_current(self):
 
     def test_public_projection_is_current_and_keeps_source_immutable(self):
         source = copy.deepcopy(self.source)
-        extensions = {k: v for k, v in self.public['components']['schemas'].items() if k.startswith('v1.')}
+        extensions = {k: v for k, v in self.public['components']['schemas'].items() if k not in source['components']['schemas']}
         actual = generator.public_document(source, extensions, generator.extension_owners(self.bindings), self.pin["beta_header"])
         self.assertEqual(actual, self.public)
         self.assertEqual(source, self.source)
diff --git a/services/core/cmd/server/managed_generations.go b/services/core/cmd/server/managed_generations.go
index e509ec494..b2a87357d 100644
--- a/services/core/cmd/server/managed_generations.go
+++ b/services/core/cmd/server/managed_generations.go
@@ -7,9 +7,8 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
@@ -98,7 +97,7 @@ func (p *generationRouter) Observe(ctx context.Context, t runtimeobs.Target) (ru
 // routeGenerations routes a direct provider's allocations through their own
 // generations. Node providers route through the node transport instead.
 func (s *managedSetup) routeGenerations(candidate execution.PreparedRuntimeDeployment, setup deployment.Setup) (execution.PreparedRuntimeDeployment, error) {
-	if setup.Mode == "nodes" {
+	if setup.Mode == string(sandbox.DeploymentNodes) {
 		return candidate, nil
 	}
 	candidate.Config.Provider = &generationRouter{setup: s, operations: candidate.Config.Provider.ProviderOperations()}
diff --git a/services/core/cmd/server/managed_nodes.go b/services/core/cmd/server/managed_nodes.go
index 518dcd37b..b908bbab6 100644
--- a/services/core/cmd/server/managed_nodes.go
+++ b/services/core/cmd/server/managed_nodes.go
@@ -77,5 +77,5 @@ func configureManagedNodes(nodes *deployment.Service, reader deployment.Reader,
 }
 
 func nodeHealthRecord(health node.Health) deployment.NodeHealth {
-	return deployment.NodeHealth{Host: &deployment.NodeHost{EffectiveCPUCores: health.EffectiveCPUCores, CPUUtilization: health.CPUUtilization, TotalMemoryBytes: health.TotalMemoryBytes, AvailableMemoryBytes: health.AvailableMemoryBytes, AvailableDiskBytes: health.AvailableDiskBytes, ObservedAt: &health.ObservedAt}, ProviderReady: health.ProviderReady, Diagnostic: health.Diagnostic, CPUCount: health.CPUCount, AvailableMemoryBytes: health.AvailableMemoryBytes, AvailableDiskBytes: health.AvailableDiskBytes}
+	return deployment.NodeHealth{Host: &deployment.NodeHost{EffectiveCPUCores: health.EffectiveCPUCores, CPUUtilization: health.CPUUtilization, TotalMemoryBytes: health.TotalMemoryBytes, AvailableMemoryBytes: health.AvailableMemoryBytes, AvailableDiskBytes: health.AvailableDiskBytes, ObservedAt: &health.ObservedAt}, ProviderReady: health.ProviderReady, Diagnostic: sandbox.NodeDiagnosticCode(health.Diagnostic), CPUCount: health.CPUCount, AvailableMemoryBytes: health.AvailableMemoryBytes, AvailableDiskBytes: health.AvailableDiskBytes}
 }
diff --git a/services/core/cmd/server/managed_setup.go b/services/core/cmd/server/managed_setup.go
index 81a9ffdef..570717417 100644
--- a/services/core/cmd/server/managed_setup.go
+++ b/services/core/cmd/server/managed_setup.go
@@ -175,7 +175,7 @@ func (s *managedSetup) observationSource(ctx context.Context) (runtimeobs.Source
 // provider builds the setup's provider. The setup carries the mode and
 // declared operations that deployment read from the provider's registration.
 func (s *managedSetup) provider(setup deployment.Setup) (sandbox.SandboxProvider, error) {
-	if setup.Mode == "nodes" {
+	if setup.Mode == string(sandbox.DeploymentNodes) {
 		if s.hub == nil {
 			return nil, errors.New("sandbox node transport is unavailable")
 		}
diff --git a/services/core/internal/api/environment_executor_management.go b/services/core/internal/api/environment_executor_management.go
index 8e20745e8..eb7650945 100644
--- a/services/core/internal/api/environment_executor_management.go
+++ b/services/core/internal/api/environment_executor_management.go
@@ -13,6 +13,14 @@ import (
 	"github.com/google/uuid"
 )
 
+type ExecutorConnectionStatus string
+
+const (
+	ExecutorNeverEnrolled ExecutorConnectionStatus = "never_enrolled"
+	ExecutorConnected     ExecutorConnectionStatus = "connected"
+	ExecutorDisconnected  ExecutorConnectionStatus = "disconnected"
+)
+
 // ExecutorConnections observes current executor authority and its actual
 // gateway peer. The observer runs after the Environments snapshot closes and
 // must recheck authority after inspecting the peer. Without a gateway peer, no
@@ -35,10 +43,10 @@ type ExecutorCredentialList struct {
 // ExecutorConnection reports binding history and current Core-observed connectivity.
 // Heartbeat times are observations, not execution or native readiness.
 type ExecutorConnection struct {
-	Status     string     `json:"status" binding:"required" enums:"never_enrolled,connected,disconnected"`
-	BoundKeyID *string    `json:"bound_key_id" binding:"required" extensions:"x-nullable" format:"uuid"`
-	EnrolledAt *time.Time `json:"enrolled_at" binding:"required" format:"date-time" extensions:"x-nullable"`
-	LastSeenAt *time.Time `json:"last_seen_at" binding:"required" format:"date-time" extensions:"x-nullable"`
+	Status     ExecutorConnectionStatus `json:"status" binding:"required"`
+	BoundKeyID *string                  `json:"bound_key_id" binding:"required" extensions:"x-nullable" format:"uuid"`
+	EnrolledAt *time.Time               `json:"enrolled_at" binding:"required" format:"date-time" extensions:"x-nullable"`
+	LastSeenAt *time.Time               `json:"last_seen_at" binding:"required" format:"date-time" extensions:"x-nullable"`
 }
 
 // registerExecutorCredentialRoutes adds executor credential issuance to the
@@ -71,10 +79,10 @@ func (h *Handler) listExecutorCredentials(w http.ResponseWriter, r *http.Request
 		writeSessionsError(w, r, err)
 		return
 	}
-	connection := ExecutorConnection{Status: "never_enrolled"}
+	connection := ExecutorConnection{Status: ExecutorNeverEnrolled}
 	observed := state.Connection
 	if observed.DeviceID != "" {
-		connection = ExecutorConnection{Status: "disconnected", BoundKeyID: observed.BoundKeyID, EnrolledAt: observed.EnrolledAt, LastSeenAt: observed.LastSeenAt}
+		connection = ExecutorConnection{Status: ExecutorDisconnected, BoundKeyID: observed.BoundKeyID, EnrolledAt: observed.EnrolledAt, LastSeenAt: observed.LastSeenAt}
 		if observed.EnvironmentStatus == "connected" && observed.CredentialHash != "" {
 			connected, err := h.ExecutorConnections.ExecutorConnected(r.Context(), state.EnvironmentID, observed.CredentialHash)
 			if err != nil && !errors.Is(err, sessions.ErrNotFound) && !errors.Is(err, sessions.ErrDeviceBindingConflict) {
@@ -82,7 +90,7 @@ func (h *Handler) listExecutorCredentials(w http.ResponseWriter, r *http.Request
 				return
 			}
 			if err == nil && connected {
-				connection.Status = "connected"
+				connection.Status = ExecutorConnected
 			}
 		}
 	}
diff --git a/services/core/internal/api/environment_executor_management_test.go b/services/core/internal/api/environment_executor_management_test.go
index 252a5bc83..3024a5e30 100644
--- a/services/core/internal/api/environment_executor_management_test.go
+++ b/services/core/internal/api/environment_executor_management_test.go
@@ -172,7 +172,7 @@ func TestExecutorConnectionListObservation(t *testing.T) {
 			}
 			if tc.status == 200 {
 				var got ExecutorCredentialList
-				if err := json.Unmarshal(w.Body.Bytes(), &got); err != nil || got.Connection.Status != tc.want || got.Connection.BoundKeyID == nil || *got.Connection.BoundKeyID != bound {
+				if err := json.Unmarshal(w.Body.Bytes(), &got); err != nil || string(got.Connection.Status) != tc.want || got.Connection.BoundKeyID == nil || *got.Connection.BoundKeyID != bound {
 					t.Fatal("projection", err, w.Body)
 				}
 			}
diff --git a/services/core/internal/api/environment_installation.go b/services/core/internal/api/environment_installation.go
index 3899bbf4d..4cdbab4d6 100644
--- a/services/core/internal/api/environment_installation.go
+++ b/services/core/internal/api/environment_installation.go
@@ -27,7 +27,7 @@ type NativeInstaller struct {
 
 func (h *Handler) installationFor(ctx context.Context, principal identity.Principal, environment string) (*v1.EnvironmentInstallation, error) {
 	installer := h.Execution.NativeInstaller
-	result := &v1.EnvironmentInstallation{Status: "unavailable", Message: "This Core has no matching native installation distribution. Ask its operator to install the qualified release artifacts."}
+	result := &v1.EnvironmentInstallation{Status: v1.InstallationUnavailable, Message: "This Core has no matching native installation distribution. Ask its operator to install the qualified release artifacts."}
 	if installer == nil {
 		return result, nil
 	}
@@ -39,7 +39,7 @@ func (h *Handler) installationFor(ctx context.Context, principal identity.Princi
 	if err != nil {
 		return nil, err
 	}
-	return &v1.EnvironmentInstallation{Status: "available", Version: installer.Version, ExpiresAt: expires, Commands: installer.Catalog.Commands(installer.Base, token)}, nil
+	return &v1.EnvironmentInstallation{Status: v1.InstallationAvailable, Version: installer.Version, ExpiresAt: expires, Commands: installer.Catalog.Commands(installer.Base, token)}, nil
 }
 
 func (h *Handler) addSessionInstallation(w http.ResponseWriter, r *http.Request, response *v1.Session) error {
diff --git a/services/core/internal/api/handler.go b/services/core/internal/api/handler.go
index 7d848e47e..dc4af3f1c 100644
--- a/services/core/internal/api/handler.go
+++ b/services/core/internal/api/handler.go
@@ -214,7 +214,7 @@ func (h *Handler) createSession(w http.ResponseWriter, r *http.Request) {
 	}
 	selectedEngine := h.Engine
 	var provider *v1.ModelProviderInput
-	var providerSource string
+	var providerSource v1.ExecutionSource
 	var deploymentRevision uuid.UUID
 	if err == nil {
 		selectedEngine, provider, providerSource, deploymentRevision, err = h.resolveSessionExecution(r.Context(), input, inheritedProvider, configuration)
diff --git a/services/core/internal/api/harness_model_providers.go b/services/core/internal/api/harness_model_providers.go
index 958d11485..57614a5e7 100644
--- a/services/core/internal/api/harness_model_providers.go
+++ b/services/core/internal/api/harness_model_providers.go
@@ -34,10 +34,10 @@ type HarnessModelConfiguration struct {
 	Object  string `json:"object" enums:"core.model_configuration" binding:"required"`
 	Harness string `json:"harness" binding:"required"`
 	v1.ModelConfigurationView
-	LastUsedAt    *time.Time `json:"last_used_at" format:"date-time" extensions:"x-nullable" binding:"required"`
-	LastErrorCode *string    `json:"last_error_code" extensions:"x-nullable" binding:"required" enums:"authentication_error,connection_failed,rate_limit_exceeded,usage_limit_exceeded,server_overloaded,server_error,resource_not_found,request_timeout,invalid_request"`
-	LastErrorAt   *time.Time `json:"last_error_at" format:"date-time" extensions:"x-nullable" binding:"required"`
-	UpdatedAt     time.Time  `json:"updated_at" binding:"required"`
+	LastUsedAt    *time.Time                            `json:"last_used_at" format:"date-time" extensions:"x-nullable" binding:"required"`
+	LastErrorCode *modelconfiguration.ProviderErrorCode `json:"last_error_code" extensions:"x-nullable" binding:"required"`
+	LastErrorAt   *time.Time                            `json:"last_error_at" format:"date-time" extensions:"x-nullable" binding:"required"`
+	UpdatedAt     time.Time                             `json:"updated_at" binding:"required"`
 }
 
 // CoreHarness describes one harness this build supports. Enabled and default
diff --git a/services/core/internal/api/inputs.go b/services/core/internal/api/inputs.go
index 5bc15f86e..8d300e5ed 100644
--- a/services/core/internal/api/inputs.go
+++ b/services/core/internal/api/inputs.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 )
@@ -50,7 +51,7 @@ func (h *Handler) createEvents(w http.ResponseWriter, r *http.Request) {
 			writeSessionsError(w, r, err)
 			return
 		}
-		if !h.auditSessionOperation(w, r, chi.URLParam(r, "session_id"), "send_events") {
+		if !h.auditSessionOperation(w, r, chi.URLParam(r, "session_id"), string(writeaudit.ActionSendEvents)) {
 			return
 		}
 		w.Header().Set("Cache-Control", "no-store")
diff --git a/services/core/internal/api/installation.go b/services/core/internal/api/installation.go
index e99e574ed..aae2c35d9 100644
--- a/services/core/internal/api/installation.go
+++ b/services/core/internal/api/installation.go
@@ -7,6 +7,13 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 )
 
+type InstallationService string
+
+const (
+	InstallationCore InstallationService = "core"
+	InstallationWeb  InstallationService = "web"
+)
+
 // Installation reports Core's installation facts. Core reads them from its
 // environment and build; configuration is the process settings it loaded.
 type Installation struct {
@@ -43,7 +50,7 @@ type InstallationSetting struct {
 	Changeable bool `json:"changeable" binding:"required"`
 	Sensitive  bool `json:"sensitive" binding:"required"`
 	// Services that restart when the setting changes.
-	Restarts []string `json:"restarts" enums:"core,web" binding:"required"`
+	Restarts []InstallationService `json:"restarts" binding:"required"`
 }
 
 // InstallationBindings counts what is bound to the current public URL.
diff --git a/services/core/internal/api/installation_test.go b/services/core/internal/api/installation_test.go
index 8f65dcce9..b6e35df20 100644
--- a/services/core/internal/api/installation_test.go
+++ b/services/core/internal/api/installation_test.go
@@ -19,7 +19,7 @@ func TestInstallationReadNeedsOnlyTheCoreKey(t *testing.T) {
 	fakes.projectsReader.resolveAPIKey = projectKeys(t, callerBinding()).ResolveAPIKey
 	deps.CoreKeys = coreKeys(t, "administrator")
 	public, id := "https://core.example", "5b7c0f3e-0000-4000-8000-000000000001"
-	settings := InstallationConfiguration{Settings: []InstallationSetting{{Key: "ports.core", Value: 8091, Default: 8091, Changeable: true, Restarts: []string{"core"}}}}
+	settings := InstallationConfiguration{Settings: []InstallationSetting{{Key: "ports.core", Value: 8091, Default: 8091, Changeable: true, Restarts: []InstallationService{"core"}}}}
 	fakes.installationBindings.addressBindings = func(context.Context) (deployment.AddressBindings, error) {
 		return deployment.AddressBindings{Nodes: 2, NodesOnOtherAddress: 1}, nil
 	}
diff --git a/services/core/internal/api/sandbox_deployment_setup.go b/services/core/internal/api/sandbox_deployment_setup.go
index 5a26510b8..e24224db3 100644
--- a/services/core/internal/api/sandbox_deployment_setup.go
+++ b/services/core/internal/api/sandbox_deployment_setup.go
@@ -132,9 +132,9 @@ func (h *Handler) startSandboxReset(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var input struct {
-		ExpectedGeneration *uint64 `json:"expected_generation"`
-		Clear              string  `json:"clear"`
-		DeadlineSeconds    *int32  `json:"deadline_seconds"`
+		ExpectedGeneration *uint64              `json:"expected_generation"`
+		Clear              deployment.ResetMode `json:"clear"`
+		DeadlineSeconds    *int32               `json:"deadline_seconds"`
 	}
 	if decodeInputObject(raw, &input, "expected_generation", "clear", "deadline_seconds") != nil || input.ExpectedGeneration == nil {
 		writeError(w, http.StatusBadRequest, "invalid_request_error", "A current expected_generation is required.", "expected_generation")
diff --git a/services/core/internal/api/saved_provider_test.go b/services/core/internal/api/saved_provider_test.go
index 5624721c0..9c8a9bc0a 100644
--- a/services/core/internal/api/saved_provider_test.go
+++ b/services/core/internal/api/saved_provider_test.go
@@ -172,14 +172,14 @@ func TestSavedProviderProtocolHarnessMatrix(t *testing.T) {
 					if path == "/v1/agents" {
 						want = http.StatusCreated
 					}
-					if response.Code != want || s.provider == nil || s.provider.Protocol != protocol || s.provider.APIKey != "saved-provider-secret" {
+					if response.Code != want || s.provider == nil || string(s.provider.Protocol) != protocol || s.provider.APIKey != "saved-provider-secret" {
 						t.Fatalf("provider bundle rejected or changed: status=%d", response.Code)
 					}
 					assertSavedProviderRedacted(t, response.Body.String())
 					var result struct {
 						Core v1.SavedAgentCore `json:"x_agents_core"`
 					}
-					if json.Unmarshal(response.Body.Bytes(), &result) != nil || result.Core.Harness != harness || result.Core.ModelProvider == nil || result.Core.ModelProvider.Protocol != protocol {
+					if json.Unmarshal(response.Body.Bytes(), &result) != nil || result.Core.Harness != harness || result.Core.ModelProvider == nil || string(result.Core.ModelProvider.Protocol) != protocol {
 						t.Fatal("safe view changed the selected harness or upstream protocol")
 					}
 				}
diff --git a/services/core/internal/api/session_creation_identity.go b/services/core/internal/api/session_creation_identity.go
index 8a3c96385..6225b74e1 100644
--- a/services/core/internal/api/session_creation_identity.go
+++ b/services/core/internal/api/session_creation_identity.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
 )
 
 // sessionCreationRequest records caller intent before mutable sources resolve:
@@ -55,7 +55,7 @@ func (h *Handler) recoverSessionCreation(w http.ResponseWriter, r *http.Request,
 		return true
 	}
 	if stream {
-		if !h.auditSessionOperation(w, r, result.Session.ID, "create") {
+		if !h.auditSessionOperation(w, r, result.Session.ID, string(writeaudit.ActionCreate)) {
 			return true
 		}
 		// Recorded-intent lookup finds an existing creation, which sends no events.
@@ -64,7 +64,7 @@ func (h *Handler) recoverSessionCreation(w http.ResponseWriter, r *http.Request,
 		session, err := h.SessionsReader.GetSession(r.Context(), tenantID(r), result.Session.ID)
 		if err != nil {
 			writeSessionsError(w, r, err)
-		} else if h.auditSessionOperation(w, r, session.ID, "create") {
+		} else if h.auditSessionOperation(w, r, session.ID, string(writeaudit.ActionCreate)) {
 			h.respondSessionStatus(w, r, session, http.StatusCreated)
 		}
 	}
diff --git a/services/core/internal/api/session_diagnostics.go b/services/core/internal/api/session_diagnostics.go
index 759e6aab4..dd5ad70d3 100644
--- a/services/core/internal/api/session_diagnostics.go
+++ b/services/core/internal/api/session_diagnostics.go
@@ -10,6 +10,14 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
+type DiagnosticSource string
+
+const (
+	DiagnosticTurn             DiagnosticSource = "turn"
+	DiagnosticEnvironment      DiagnosticSource = "environment"
+	DiagnosticEnvironmentInput DiagnosticSource = "environment_input"
+)
+
 type DiagnosticFailure struct {
 	Code     string           `json:"code" binding:"required" enums:"harness_error,model_provider_required,runtime_unavailable,runtime_disconnected,runtime_preparation_failed,execution_interrupted,delivery_unconfirmed,input_rejected,executor_protocol_error,core_storage_failed,internal_error,environment_connection_timeout,environment_unavailable,environment_provisioning_failed,authentication_error,rate_limit_exceeded,usage_limit_exceeded,server_overloaded,server_error,invalid_request,resource_not_found,request_timeout,context_length_exceeded,cyber_policy,connection_failed"`
 	Params   CoreErrorDetails `json:"params" swaggertype:"object" binding:"required"`
@@ -18,8 +26,8 @@ type DiagnosticFailure struct {
 
 type SessionDiagnosticFailure struct {
 	DiagnosticFailure
-	Source string `json:"source" binding:"required" enums:"turn,environment,environment_input"`
-	TurnID string `json:"turn_id,omitempty"`
+	Source DiagnosticSource `json:"source" binding:"required"`
+	TurnID string           `json:"turn_id,omitempty"`
 }
 
 type SessionDiagnostics struct {
@@ -82,12 +90,12 @@ func (h *Handler) getSessionDiagnostics(w http.ResponseWriter, r *http.Request)
 		failure := SessionDiagnosticFailure{DiagnosticFailure: DiagnosticFailure{Code: "internal_error", Params: CoreErrorDetails{}}}
 		switch {
 		case session.EnvironmentFailure != nil:
-			failure.Source = "environment"
+			failure.Source = DiagnosticEnvironment
 			failure.Code = "environment_provisioning_failed"
 			failure.FailedAt = diagnosticTime(session.EnvironmentFailure.FailedAt)
 			failure.Params = provisioningFailureParams(session.EnvironmentFailure.Detail)
 		case session.EnvironmentInputActivity != nil:
-			failure.Source = "environment_input"
+			failure.Source = DiagnosticEnvironmentInput
 			failure.FailedAt = diagnosticTime(session.EnvironmentInputActivity.LastActiveAt)
 			switch session.EnvironmentInputActivity.Failure {
 			case "":
@@ -100,7 +108,7 @@ func (h *Handler) getSessionDiagnostics(w http.ResponseWriter, r *http.Request)
 				failure.Code = "model_provider_required"
 			}
 		case session.LastTurn != nil:
-			failure.Source, failure.TurnID = "turn", session.LastTurn.ID
+			failure.Source, failure.TurnID = DiagnosticTurn, session.LastTurn.ID
 			failure.DiagnosticFailure = *turnDiagnosticFailure(*session.LastTurn)
 		}
 		response.Failure = &failure
diff --git a/services/core/internal/api/session_diagnostics_test.go b/services/core/internal/api/session_diagnostics_test.go
index 3265feb8a..becdf229e 100644
--- a/services/core/internal/api/session_diagnostics_test.go
+++ b/services/core/internal/api/session_diagnostics_test.go
@@ -3,10 +3,12 @@ package api
 import (
 	"context"
 	"encoding/json"
+	"reflect"
 	"strings"
 	"testing"
 	"time"
 
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
@@ -122,3 +124,11 @@ func TestDiagnosticsHostedFailureOverridesInputWithoutParsingReason(t *testing.T
 		}
 	}
 }
+
+func TestDiagnosticStatusMatchesOfficialSession(t *testing.T) {
+	official, _ := reflect.TypeFor[v1.Session]().FieldByName("Status")
+	diagnostic, _ := reflect.TypeFor[SessionDiagnostics]().FieldByName("Status")
+	if diagnostic.Type != official.Type || diagnostic.Tag.Get("enums") != official.Tag.Get("enums") {
+		t.Fatal("diagnostics must preserve the pinned official Session status set")
+	}
+}
diff --git a/services/core/internal/api/session_execution_configuration.go b/services/core/internal/api/session_execution_configuration.go
index 9acdc758c..6a14a7950 100644
--- a/services/core/internal/api/session_execution_configuration.go
+++ b/services/core/internal/api/session_execution_configuration.go
@@ -18,32 +18,32 @@ func sessionExecutionProjection(input sessionRequest, saved *v1.SavedAgent, inhe
 		} `json:"agent"`
 	}
 	_ = json.Unmarshal(raw, &configuration) // The resolved configuration was already validated.
-	modelSource := "session"
+	modelSource := v1.ExecutionSourceSession
 	if saved != nil && (input.Agent == nil || input.Agent.Model == nil) {
-		modelSource = "agent"
+		modelSource = v1.ExecutionSourceAgent
 	}
 	if input.modelSource != "" {
 		modelSource = input.modelSource
 	}
-	harnessSource := "deployment"
+	harnessSource := v1.ExecutionSourceDeployment
 	if _, overridden := input.agentFields["x_agents_core"]; overridden {
 		if input.Agent != nil && input.Agent.XAgentsCore != nil && input.Agent.XAgentsCore.Harness != "" {
-			harnessSource = "session"
+			harnessSource = v1.ExecutionSourceSession
 		} else if input.Agent != nil && input.Agent.XAgentsCore != nil && saved != nil && saved.XAgentsCore != nil && saved.XAgentsCore.Harness != "" {
-			harnessSource = "agent"
+			harnessSource = v1.ExecutionSourceAgent
 		}
 	} else if saved != nil && saved.XAgentsCore != nil && saved.XAgentsCore.Harness != "" {
-		harnessSource = "agent"
+		harnessSource = v1.ExecutionSourceAgent
 	}
-	selection := v1.ExecutionProviderSelection{Source: "unknown", Status: "unavailable"}
+	selection := v1.ExecutionProviderSelection{Source: v1.ExecutionSourceUnknown, Status: v1.ExecutionProviderUnavailable}
 	if provider != nil {
 		// Deployment defaults are readable with the same Core key, so new
 		// Sessions record their safe view too; historical rows stay redacted.
-		selection.Source, selection.Status, selection.Configuration = "deployment", "available", provider.SafeView()
+		selection.Source, selection.Status, selection.Configuration = v1.ExecutionSourceDeployment, v1.ExecutionProviderAvailable, provider.SafeView()
 		if input.XAgentsCore != nil && input.XAgentsCore.ModelProvider != nil {
-			selection.Source = "session"
+			selection.Source = v1.ExecutionSourceSession
 		} else if inherited != nil {
-			selection.Source = "agent"
+			selection.Source = v1.ExecutionSourceAgent
 		}
 	}
 	native := json.RawMessage(`{}`)
@@ -52,7 +52,7 @@ func sessionExecutionProjection(input sessionRequest, saved *v1.SavedAgent, inhe
 	}
 	nativeSource := input.harnessConfigSource
 	if nativeSource == "" {
-		nativeSource = "unknown"
+		nativeSource = v1.ExecutionSourceUnknown
 	}
 	return v1.SessionExecutionConfiguration{
 		HarnessConfig: v1.ExecutionHarnessConfigSelection{Value: native, Source: nativeSource},
diff --git a/services/core/internal/api/session_execution_configuration_test.go b/services/core/internal/api/session_execution_configuration_test.go
index 6294695e4..c5cd4bcbd 100644
--- a/services/core/internal/api/session_execution_configuration_test.go
+++ b/services/core/internal/api/session_execution_configuration_test.go
@@ -40,7 +40,7 @@ func TestExecutionConfigurationSources(t *testing.T) {
 				t.Fatal(err)
 			}
 			p := sessionExecutionProjection(input, tc.saved, tc.inherited, tc.provider, "codex", json.RawMessage(`{"agent":{"model":"resolved"}}`))
-			if p.Model.Source != tc.modelSource || p.Harness.Source != tc.harnessSource || p.ModelProvider.Source != tc.providerSource || p.ModelProvider.Status != tc.status {
+			if string(p.Model.Source) != tc.modelSource || string(p.Harness.Source) != tc.harnessSource || string(p.ModelProvider.Source) != tc.providerSource || string(p.ModelProvider.Status) != tc.status {
 				t.Fatalf("wrong sources: %#v", p)
 			}
 			raw, _ := json.Marshal(p)
diff --git a/services/core/internal/api/session_model_configuration.go b/services/core/internal/api/session_model_configuration.go
index 5134a4528..c40c82c18 100644
--- a/services/core/internal/api/session_model_configuration.go
+++ b/services/core/internal/api/session_model_configuration.go
@@ -34,7 +34,7 @@ func (h *Handler) prepareSessionModelConfiguration(ctx context.Context, input *s
 	explicitModel := input.Agent != nil && input.Agent.Model != nil
 	explicitProvider := input.XAgentsCore != nil && input.XAgentsCore.ModelProvider != nil
 	needsModel := !explicitModel && saved == nil
-	if v1.ModelProviderAllowed(input.Environment.Type, v1.ModelProviderSourceDeployment) && ((inherited == nil && !explicitProvider) || needsModel) {
+	if v1.ModelProviderAllowed(input.Environment.Type, v1.ExecutionSourceDeployment) && ((inherited == nil && !explicitProvider) || needsModel) {
 		input.deploymentDefaults, err = h.ModelProviders.Resolve(ctx, engine)
 		if err != nil {
 			var configurationError *v1.ModelProviderError
@@ -44,9 +44,9 @@ func (h *Handler) prepareSessionModelConfiguration(ctx context.Context, input *s
 			return &storedDataError{err}
 		}
 	}
-	input.modelSource = "session"
+	input.modelSource = v1.ExecutionSourceSession
 	if !explicitModel && saved != nil {
-		input.modelSource = "agent"
+		input.modelSource = v1.ExecutionSourceAgent
 	}
 	if needsModel && input.deploymentDefaults != nil {
 		if input.Agent == nil {
@@ -57,10 +57,10 @@ func (h *Handler) prepareSessionModelConfiguration(ctx context.Context, input *s
 		}
 		model := input.deploymentDefaults.Model
 		input.Agent.Model = &model
-		input.modelSource = "deployment"
+		input.modelSource = v1.ExecutionSourceDeployment
 	}
 	raw := json.RawMessage(`{}`)
-	source := "unknown"
+	source := v1.ExecutionSourceUnknown
 	var supplied json.RawMessage
 	if input.Agent != nil && input.Agent.XAgentsCore != nil {
 		supplied = input.Agent.XAgentsCore.HarnessConfig
@@ -69,17 +69,17 @@ func (h *Handler) prepareSessionModelConfiguration(ctx context.Context, input *s
 		supplied = input.XAgentsCore.HarnessConfig
 	}
 	if len(supplied) > 0 {
-		raw, source = supplied, "session"
+		raw, source = supplied, v1.ExecutionSourceSession
 	} else if explicitModel || explicitProvider {
-		source = "session"
+		source = v1.ExecutionSourceSession
 	} else if saved != nil {
-		source = "agent"
+		source = v1.ExecutionSourceAgent
 		// Changing the harness also discards the former adapter's parameters.
 		if _, overridden := input.agentFields["x_agents_core"]; !overridden && saved.XAgentsCore != nil {
 			raw = v1.ResolvedHarnessConfig(saved.XAgentsCore.HarnessConfig)
 		}
 	} else if input.deploymentDefaults != nil {
-		raw, source = v1.ResolvedHarnessConfig(input.deploymentDefaults.HarnessConfig), "deployment"
+		raw, source = v1.ResolvedHarnessConfig(input.deploymentDefaults.HarnessConfig), v1.ExecutionSourceDeployment
 	}
 	model := ""
 	if input.Agent != nil && input.Agent.Model != nil {
diff --git a/services/core/internal/api/session_model_configuration_test.go b/services/core/internal/api/session_model_configuration_test.go
index bda85d060..d3e378cd4 100644
--- a/services/core/internal/api/session_model_configuration_test.go
+++ b/services/core/internal/api/session_model_configuration_test.go
@@ -64,7 +64,7 @@ func TestSessionNativeConfigurationSources(t *testing.T) {
 			if input.Agent != nil && input.Agent.Model != nil {
 				value = *input.Agent.Model
 			}
-			if value != tc.model || string(input.resolvedHarnessConfig) != tc.native || input.harnessConfigSource != tc.source {
+			if value != tc.model || string(input.resolvedHarnessConfig) != tc.native || string(input.harnessConfigSource) != tc.source {
 				t.Fatalf("model=%s native=%s source=%s", value, input.resolvedHarnessConfig, input.harnessConfigSource)
 			}
 		})
diff --git a/services/core/internal/api/session_model_defaults.go b/services/core/internal/api/session_model_defaults.go
index 20409c8e1..9923067ca 100644
--- a/services/core/internal/api/session_model_defaults.go
+++ b/services/core/internal/api/session_model_defaults.go
@@ -54,28 +54,28 @@ func modelProviderRequired(environment, engine string) error {
 // resolveSessionExecution applies provider precedence: the Session bundle, the
 // saved Agent bundle, then the deployment default where the environment allows
 // it. Bundles are never merged.
-func (h *Handler) resolveSessionExecution(ctx context.Context, input sessionRequest, inherited *v1.ModelProviderInput, raw json.RawMessage) (string, *v1.ModelProviderInput, string, uuid.UUID, error) {
+func (h *Handler) resolveSessionExecution(ctx context.Context, input sessionRequest, inherited *v1.ModelProviderInput, raw json.RawMessage) (string, *v1.ModelProviderInput, v1.ExecutionSource, uuid.UUID, error) {
 	engine, err := h.sessionHarness(raw)
 	if err != nil {
 		return "", nil, "", uuid.Nil, err
 	}
 	var revision uuid.UUID
-	provider, source := inherited, v1.ModelProviderSourceAgent
+	provider, source := inherited, v1.ExecutionSourceAgent
 	if extension := input.XAgentsCore; extension != nil {
 		if extension.ModelProvider == nil && !input.modelProviderNull && len(extension.HarnessConfig) == 0 && len(extension.Environment) == 0 {
 			return "", nil, "", uuid.Nil, errors.New("x_agents_core requires an execution option")
 		}
 		if extension.ModelProvider != nil {
-			provider, source = extension.ModelProvider, v1.ModelProviderSourceSession
+			provider, source = extension.ModelProvider, v1.ExecutionSourceSession
 		}
 	}
 	environment := input.Environment.Type
-	if provider == nil && v1.ModelProviderAllowed(environment, v1.ModelProviderSourceDeployment) {
+	if provider == nil && v1.ModelProviderAllowed(environment, v1.ExecutionSourceDeployment) {
 		snapshot := input.deploymentDefaults
 		if snapshot != nil {
 			provider, revision = snapshot.Provider, snapshot.Revision
 		}
-		source = v1.ModelProviderSourceDeployment
+		source = v1.ExecutionSourceDeployment
 	}
 	if provider == nil {
 		if v1.ModelProviderRequired(environment) {
diff --git a/services/core/internal/api/session_request.go b/services/core/internal/api/session_request.go
index d8971677d..b4e091ee8 100644
--- a/services/core/internal/api/session_request.go
+++ b/services/core/internal/api/session_request.go
@@ -30,8 +30,8 @@ type sessionRequest struct {
 	originalEnvironment   json.RawMessage
 	modelProviderNull     bool
 	deploymentDefaults    *modelconfiguration.Snapshot
-	modelSource           string
-	harnessConfigSource   string
+	modelSource           v1.ExecutionSource
+	harnessConfigSource   v1.ExecutionSource
 	resolvedHarnessConfig json.RawMessage
 	v1.CreateSessionRequest
 	Input               json.RawMessage
diff --git a/services/core/internal/api/turn_diagnostic_failure_test.go b/services/core/internal/api/turn_diagnostic_failure_test.go
index 8fe650ca2..d5b3b20a7 100644
--- a/services/core/internal/api/turn_diagnostic_failure_test.go
+++ b/services/core/internal/api/turn_diagnostic_failure_test.go
@@ -3,9 +3,12 @@ package api
 import (
 	"encoding/json"
 	"os"
+	"reflect"
+	"slices"
 	"strings"
 	"testing"
 
+	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
@@ -20,6 +23,7 @@ func TestDiagnosticFailureWhitelist(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	produced := map[string]bool{}
 	for want, inputs := range cases {
 		if !strings.Contains(string(catalog), "`"+want+"`") {
 			t.Fatal("uncatalogued diagnostics code", want)
@@ -27,12 +31,59 @@ func TestDiagnosticFailureWhitelist(t *testing.T) {
 		for _, input := range inputs {
 			raw, _ := json.Marshal(map[string]string{"error_code": input, "error": "raw-secret-canary"})
 			got := turnDiagnosticFailure(sessions.Turn{Status: sessions.TurnFailed, Outcome: raw})
+			produced[got.Code] = true
 			encoded, _ := json.Marshal(got)
 			if got.Code != want || strings.Contains(string(encoded), "canary") {
 				t.Fatal(input, got)
 			}
 		}
 	}
+	// Runtime classifications share the observation fixture; Core mappings above
+	// and Environment failures below exercise the actual diagnostic producers.
+	raw, err := os.ReadFile("../modelconfiguration/testdata/observation_cases.json")
+	if err != nil {
+		t.Fatal(err)
+	}
+	var observations []struct {
+		EngineErrorCode string `json:"engine_error_code"`
+	}
+	if err := json.Unmarshal(raw, &observations); err != nil {
+		t.Fatal(err)
+	}
+	for _, observation := range observations {
+		if code, _ := proto.NormalizeEngineFailure(observation.EngineErrorCode, nil); code != "" {
+			outcome, _ := json.Marshal(map[string]string{"error_code": "engine_failed", "engine_error_code": code})
+			produced[turnDiagnosticFailure(sessions.Turn{Status: sessions.TurnFailed, Outcome: outcome}).Code] = true
+		}
+	}
+	for _, failure := range []string{"", "environment_unavailable", "runtime_preparation_failed", "model_provider_required", "unknown", "provisioning"} {
+		session := hostedFailureSession()
+		if failure != "provisioning" {
+			session.EnvironmentFailure = nil
+			session.EnvironmentInputActivity = &sessions.EnvironmentInputActivity{Status: "failed", Failure: failure}
+		} else {
+			session.EnvironmentFailure = &sessions.EnvironmentFailure{}
+		}
+		h, _, _ := adminTestHandler(t, serveDiagnostics(diagnosticSnapshotStore{session: session}))
+		w := diagnosticRequest(h, adminSessionsPath+session.ID+"/diagnostics", "Bearer admin")
+		var response SessionDiagnostics
+		if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &response) != nil || response.Failure == nil {
+			t.Fatal(w.Code, w.Body)
+		}
+		produced[response.Failure.Code] = true
+	}
+	field, _ := reflect.TypeFor[DiagnosticFailure]().FieldByName("Code")
+	declared := strings.Split(field.Tag.Get("enums"), ",")
+	for code := range produced {
+		if !slices.Contains(declared, code) {
+			t.Errorf("diagnostic code %q missing from schema", code)
+		}
+	}
+	for _, code := range declared {
+		if !produced[code] {
+			t.Errorf("schema diagnostic code %q has no exercised producer", code)
+		}
+	}
 	if got := turnDiagnosticFailure(sessions.Turn{Status: sessions.TurnFailed, Outcome: json.RawMessage(`{"error_code":"engine_failed",`)}); got.Code != "internal_error" {
 		t.Fatal("malformed outcome accepted", got)
 	}
diff --git a/services/core/internal/coremetrics/service.go b/services/core/internal/coremetrics/service.go
index 84dfc5f91..8b2c497e0 100644
--- a/services/core/internal/coremetrics/service.go
+++ b/services/core/internal/coremetrics/service.go
@@ -55,14 +55,14 @@ var errPanicked = errors.New("periodic job pass panicked")
 // New reports the scheduler, which the Source reads live, and then jobs in
 // their order. Run runs the jobs. An enabled job needs a positive Every.
 func New(started time.Time, revision string, source Source, jobs ...Periodic) (*Service, error) {
-	s := &Service{source: source, started: started.UTC(), now: time.Now, jobIDs: []string{"scheduler"}, jobs: map[string]Job{"scheduler": {ID: "scheduler", Status: "unknown"}}, periodic: jobs}
+	s := &Service{source: source, started: started.UTC(), now: time.Now, jobIDs: []string{"scheduler"}, jobs: map[string]Job{"scheduler": {ID: "scheduler", Status: JobUnknown}}, periodic: jobs}
 	if revisionPattern.MatchString(revision) {
 		s.revision = &revision
 	}
 	for _, job := range jobs {
-		status := "unknown"
+		status := JobUnknown
 		if job.Run == nil {
-			status = "stopped"
+			status = JobStopped
 		} else if job.Every <= 0 {
 			return nil, errors.New("coremetrics: periodic job " + job.ID + " needs a positive interval")
 		}
@@ -88,9 +88,9 @@ func (s *Service) RecordUnavailable() {
 	s.refusals[i].count++
 }
 func (s *Service) reportJob(id string, at time.Time, processed *int64, failed *int64, err error) {
-	status := "ok"
+	status := JobOk
 	if err != nil || (failed != nil && *failed > 0) {
-		status = "failing"
+		status = JobFailing
 	}
 	s.mu.Lock()
 	defer s.mu.Unlock()
@@ -103,7 +103,7 @@ func (s *Service) stopJob(id string) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	if j, ok := s.jobs[id]; ok {
-		j.Status = "stopped"
+		j.Status = JobStopped
 		s.jobs[id] = j
 	}
 }
@@ -196,12 +196,12 @@ func (s *Service) Read(ctx context.Context, name string) (View, error) {
 		return View{}, err
 	}
 	live := s.source.Live()
-	view := View{Object: "core.metrics", Range: window, Service: ServiceState{Status: "running", Revision: s.revision, StartedAt: ptr(s.started), ExecutionOwner: live.ExecutionOwner},
+	view := View{Object: "core.metrics", Range: window, Service: ServiceState{Status: ServiceRunning, Revision: s.revision, StartedAt: ptr(s.started), ExecutionOwner: live.ExecutionOwner},
 		Execution: Execution{SlotsInUse: live.SlotsInUse, SlotsTotal: live.SlotsTotal, ConnectedDaemons: live.ConnectedDaemons}, Database: Database{Pool: live.Pool}, Jobs: make([]Job, 0, len(s.jobIDs))}
 	s.mu.Lock()
 	latest := s.latest
 	if latest.At.IsZero() || now.Sub(latest.At) > 2*SampleInterval || !latest.Healthy {
-		view.Service.Status = "degraded"
+		view.Service.Status = ServiceDegraded
 	}
 	if !latest.At.IsZero() && now.Sub(latest.At) <= 2*SampleInterval {
 		view.Execution.QueuedTurns, view.Execution.WaitingForDaemon, view.Execution.InProgressTurns = latest.Queued, latest.WaitingForDaemon, latest.InProgress
@@ -223,7 +223,7 @@ func (s *Service) Read(ctx context.Context, name string) (View, error) {
 	defer cancel()
 	history, err := s.source.History(query, window.Start, window.End, time.Duration(window.ResolutionSeconds)*time.Second)
 	if err != nil {
-		view.Service.Status = "degraded"
+		view.Service.Status = ServiceDegraded
 	} else {
 		view.Execution.Interrupted = ptr(history.Interrupted)
 		view.Execution.QueueWaitMS = history.QueueWaitMS
@@ -232,11 +232,11 @@ func (s *Service) Read(ctx context.Context, name string) (View, error) {
 		}
 	}
 	if live.ExecutionOwner == nil || !*live.ExecutionOwner {
-		view.Service.Status = "degraded"
+		view.Service.Status = ServiceDegraded
 	}
 	for _, job := range view.Jobs {
-		if job.Status == "failing" {
-			view.Service.Status = "degraded"
+		if job.Status == JobFailing {
+			view.Service.Status = ServiceDegraded
 		}
 	}
 	var memory runtime.MemStats
diff --git a/services/core/internal/coremetrics/types.go b/services/core/internal/coremetrics/types.go
index 611efe657..ca97cce30 100644
--- a/services/core/internal/coremetrics/types.go
+++ b/services/core/internal/coremetrics/types.go
@@ -12,6 +12,22 @@ import (
 // resolution.
 var ErrInvalidRange = errors.New("invalid Core metrics range")
 
+type JobStatus string
+
+const (
+	JobOk      JobStatus = "ok"
+	JobFailing JobStatus = "failing"
+	JobStopped JobStatus = "stopped"
+	JobUnknown JobStatus = "unknown"
+)
+
+type ServiceStatus string
+
+const (
+	ServiceRunning  ServiceStatus = "running"
+	ServiceDegraded ServiceStatus = "degraded"
+)
+
 type Latency struct {
 	P50 *float64 `json:"p50" extensions:"x-nullable" binding:"required"`
 	P95 *float64 `json:"p95" extensions:"x-nullable" binding:"required"`
@@ -22,10 +38,10 @@ type Range struct {
 	ResolutionSeconds int64     `json:"resolution_seconds" binding:"required"`
 }
 type ServiceState struct {
-	Status         string     `json:"status" enums:"running,degraded" binding:"required"`
-	Revision       *string    `json:"revision" extensions:"x-nullable" binding:"required"`
-	StartedAt      *time.Time `json:"started_at" extensions:"x-nullable" binding:"required"`
-	ExecutionOwner *bool      `json:"execution_owner" extensions:"x-nullable" binding:"required"`
+	Status         ServiceStatus `json:"status" binding:"required"`
+	Revision       *string       `json:"revision" extensions:"x-nullable" binding:"required"`
+	StartedAt      *time.Time    `json:"started_at" extensions:"x-nullable" binding:"required"`
+	ExecutionOwner *bool         `json:"execution_owner" extensions:"x-nullable" binding:"required"`
 }
 type ExecutionBucket struct {
 	Start          time.Time `json:"start" binding:"required"`
@@ -64,7 +80,7 @@ type Database struct {
 }
 type Job struct {
 	ID        string     `json:"id" binding:"required"`
-	Status    string     `json:"status" enums:"ok,failing,stopped,unknown" binding:"required"`
+	Status    JobStatus  `json:"status" binding:"required"`
 	LastRunAt *time.Time `json:"last_run_at" extensions:"x-nullable" binding:"required"`
 	Processed *int64     `json:"processed" extensions:"x-nullable" binding:"required"`
 	Failed    *int64     `json:"failed" extensions:"x-nullable" binding:"required"`
diff --git a/services/core/internal/deployment/allocations.go b/services/core/internal/deployment/allocations.go
index 916e2e364..5c6630cd8 100644
--- a/services/core/internal/deployment/allocations.go
+++ b/services/core/internal/deployment/allocations.go
@@ -6,11 +6,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/google/uuid"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/google/uuid"
 )
 
 // ReserveAllocation commits the allocation of the tenant's hosted Environment
@@ -68,7 +67,7 @@ func (e *ExecutionOperations) ReserveAllocation(ctx context.Context, key Allocat
 			return ErrInvalidInput
 		}
 		allocation := NewAllocation{ID: uuid.NewString(), EnvironmentID: environment.ID, DeviceID: uuid.NewString(), ProviderKey: installation, Generation: d.Generation}
-		if d.Mode == "nodes" {
+		if d.Mode == string(sandbox.DeploymentNodes) {
 			reserved, err := tx.LoadReserved()
 			if err != nil {
 				return err
@@ -352,7 +351,7 @@ func (s *Service) LifecycleNode(ctx context.Context, tenant, environment string)
 	if err != nil {
 		return "", err
 	}
-	if p.Provider == "" || p.Mode == "direct" {
+	if p.Provider == "" || p.Mode == string(sandbox.DeploymentDirect) {
 		if p.PlacementNodeID != "" || p.AllocationNodeID != "" {
 			return "", placement.ErrNodeUnavailable
 		}
diff --git a/services/core/internal/deployment/execution.go b/services/core/internal/deployment/execution.go
index ee57e97be..6af321418 100644
--- a/services/core/internal/deployment/execution.go
+++ b/services/core/internal/deployment/execution.go
@@ -272,7 +272,7 @@ func (e *ExecutionOperations) saveSelection(tx DeploymentTx, d Record, input san
 	if err != nil {
 		return err
 	}
-	return tx.SaveSelection(SelectionRecord{InstallationID: d.InstallationID, Provider: input.Provider, BackendFingerprint: description.BackendFingerprint, Mode: description.Mode,
+	return tx.SaveSelection(SelectionRecord{InstallationID: d.InstallationID, Provider: input.Provider, BackendFingerprint: description.BackendFingerprint, Mode: string(description.Mode),
 		Generation: d.Generation + 1, Specification: specification,
 		Configuration: sandbox.ConfigurationRecord{Public: configurationJSON(record.Public), Metadata: configurationJSON(record.Metadata), Secret: record.Secret}})
 }
diff --git a/services/core/internal/deployment/health.go b/services/core/internal/deployment/health.go
index e8e37ffca..3b5c9492b 100644
--- a/services/core/internal/deployment/health.go
+++ b/services/core/internal/deployment/health.go
@@ -12,7 +12,7 @@ import (
 // unreadiness only: unknown values, including arbitrary text, become
 // provider_unavailable, a ready provider has none and empty stays empty.
 func normalizeHealth(health NodeHealth) (NodeHealth, error) {
-	health.Diagnostic = sandbox.NormalizeNodeDiagnostic(health.Diagnostic)
+	health.Diagnostic = sandbox.NodeDiagnosticCode(sandbox.NormalizeNodeDiagnostic(string(health.Diagnostic)))
 	if health.ProviderReady {
 		health.Diagnostic = ""
 	}
@@ -75,20 +75,20 @@ func historyPoints(window coremetrics.Range, samples []HostHistoryPoint) []HostH
 
 // nodeRollout reports a node's preparation of the target generation.
 func nodeRollout(n NodeRecord) NodeRollout {
-	out := NodeRollout{State: "unknown", ReadyGeneration: n.ReadyGeneration}
+	out := NodeRollout{State: NodeRolloutUnknown, ReadyGeneration: n.ReadyGeneration}
 	if !n.Online {
 		return out
 	}
 	if n.ProtocolVersion == 1 && n.DeploymentGeneration != n.TargetGeneration {
-		out.State = "update_required"
+		out.State = NodeRolloutUpdateRequired
 		return out
 	}
-	switch n.TargetState {
-	case "ready", "preparing", "failed":
-		out.State = n.TargetState
+	switch NodeRolloutState(n.TargetState) {
+	case NodeRolloutReady, NodeRolloutPreparing, NodeRolloutFailed:
+		out.State = NodeRolloutState(n.TargetState)
 	}
-	if out.State == "failed" && n.TargetDiagnostic != "" {
-		out.Diagnostic = sandbox.NormalizeNodeDiagnostic(n.TargetDiagnostic)
+	if out.State == NodeRolloutFailed && n.TargetDiagnostic != "" {
+		out.Diagnostic = sandbox.NodeDiagnosticCode(sandbox.NormalizeNodeDiagnostic(n.TargetDiagnostic))
 	}
 	return out
 }
diff --git a/services/core/internal/deployment/node.go b/services/core/internal/deployment/node.go
index 164d54234..0bd2e3b31 100644
--- a/services/core/internal/deployment/node.go
+++ b/services/core/internal/deployment/node.go
@@ -46,11 +46,11 @@ type Enrollment struct {
 type NodeHealth struct {
 	Host *NodeHost `json:"-"`
 	// Fixed reason for the last reported unreadiness; absent while the provider is ready. Clients treat an unknown value as provider_unavailable.
-	Diagnostic           string `json:"diagnostic,omitempty" enums:"provider_unavailable,host_unsupported,artifacts_unavailable,runtime_download_failed,runtime_image_unavailable,capacity_insufficient"`
-	ProviderReady        bool   `json:"provider_ready" binding:"required"`
-	CPUCount             *int64 `json:"cpu_count" extensions:"x-nullable" binding:"required"`
-	AvailableMemoryBytes *int64 `json:"available_memory_bytes" extensions:"x-nullable" binding:"required"`
-	AvailableDiskBytes   *int64 `json:"available_disk_bytes" extensions:"x-nullable" binding:"required"`
+	Diagnostic           sandbox.NodeDiagnosticCode `json:"diagnostic,omitempty"`
+	ProviderReady        bool                       `json:"provider_ready" binding:"required"`
+	CPUCount             *int64                     `json:"cpu_count" extensions:"x-nullable" binding:"required"`
+	AvailableMemoryBytes *int64                     `json:"available_memory_bytes" extensions:"x-nullable" binding:"required"`
+	AvailableDiskBytes   *int64                     `json:"available_disk_bytes" extensions:"x-nullable" binding:"required"`
 }
 
 type Node struct {
diff --git a/services/core/internal/deployment/nodes.go b/services/core/internal/deployment/nodes.go
index 91867c15f..f166a12b8 100644
--- a/services/core/internal/deployment/nodes.go
+++ b/services/core/internal/deployment/nodes.go
@@ -162,7 +162,7 @@ func (s *Service) CreateEnrollment(ctx context.Context, capacity Capacity) (Enro
 		if d.Reset != nil {
 			return ErrResetInProgress
 		}
-		if d.Mode != "nodes" {
+		if d.Mode != string(sandbox.DeploymentNodes) {
 			return ErrConflict
 		}
 		if _, err := s.specification(d); err != nil {
@@ -211,7 +211,7 @@ func (s *Service) Enroll(ctx context.Context, token string, input Enrollment) (N
 		if d.Reset != nil {
 			return ErrResetInProgress
 		}
-		if d.Mode != "nodes" || input.Provider != d.Provider {
+		if d.Mode != string(sandbox.DeploymentNodes) || input.Provider != d.Provider {
 			return ErrInvalidInput
 		}
 		spec, err := s.specification(d)
@@ -278,7 +278,7 @@ func (s *Service) AuthenticateNode(ctx context.Context, nodeID, credential strin
 		if err != nil {
 			return placement.ErrNodeUnavailable
 		}
-		if n.InstallationID != d.InstallationID || d.Mode != "nodes" {
+		if n.InstallationID != d.InstallationID || d.Mode != string(sandbox.DeploymentNodes) {
 			return ErrNodeCredential
 		}
 		if err := s.checkEnrollmentIdentity(tx, d, n); err != nil {
@@ -397,7 +397,7 @@ func (s *Service) NodeConfiguration(ctx context.Context, nodeID, token string, g
 		if node == nil && d.Reset != nil {
 			return ErrResetInProgress
 		}
-		if d.Mode != "nodes" {
+		if d.Mode != string(sandbox.DeploymentNodes) {
 			return ErrConflict
 		}
 		if node != nil {
@@ -449,7 +449,7 @@ func (s *Service) connection(tx NodeReads, d Record, nodeID, connectionID string
 	if err != nil {
 		return StoredNode{}, err
 	}
-	if n.ConnectionID != connectionID || n.ConnectedEpoch != epoch || epoch == 0 || epoch > math.MaxInt64 || d.OwnerEpoch != epoch || n.InstallationID != d.InstallationID || d.Mode != "nodes" {
+	if n.ConnectionID != connectionID || n.ConnectedEpoch != epoch || epoch == 0 || epoch > math.MaxInt64 || d.OwnerEpoch != epoch || n.InstallationID != d.InstallationID || d.Mode != string(sandbox.DeploymentNodes) {
 		return StoredNode{}, ErrNodeCredential
 	}
 	return n, nil
@@ -563,7 +563,7 @@ func (s *Service) heartbeat(ctx context.Context, nodeID, connectionID string, ep
 			if health.ProviderReady {
 				state = "ready"
 			}
-			statuses = []sandbox.GenerationStatus{{Generation: n.DeploymentGeneration, SpecificationDigest: n.SpecificationDigest, State: state, Diagnostic: health.Diagnostic}}
+			statuses = []sandbox.GenerationStatus{{Generation: n.DeploymentGeneration, SpecificationDigest: n.SpecificationDigest, State: state, Diagnostic: string(health.Diagnostic)}}
 		}
 		return s.recordGenerations(tx, d, n, statuses, protocol)
 	})
diff --git a/services/core/internal/deployment/placement/placement.go b/services/core/internal/deployment/placement/placement.go
index 28371a52e..d68b8e153 100644
--- a/services/core/internal/deployment/placement/placement.go
+++ b/services/core/internal/deployment/placement/placement.go
@@ -168,7 +168,7 @@ func (r *Rules) DecidePlacement(d Deployment, nodes []Node) (*Placement, error)
 	if err := r.CheckPublicOrigin(d.Provider); err != nil {
 		return nil, err
 	}
-	if d.Mode == "direct" {
+	if d.Mode == string(sandbox.DeploymentDirect) {
 		return nil, nil
 	}
 	var chosen *Node
diff --git a/services/core/internal/deployment/reset.go b/services/core/internal/deployment/reset.go
index a404549b1..90da87734 100644
--- a/services/core/internal/deployment/reset.go
+++ b/services/core/internal/deployment/reset.go
@@ -8,11 +8,13 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 )
 
+type ResetMode string
+
 // ResetRequest starts or escalates a reset of the sandbox deployment.
 type ResetRequest struct {
-	ExpectedGeneration uint64 `json:"expected_generation" binding:"required" minimum:"0"`
-	Clear              string `json:"clear" binding:"required" enums:"auto,force"`
-	DeadlineSeconds    *int32 `json:"deadline_seconds,omitempty" minimum:"300" maximum:"86400"`
+	ExpectedGeneration uint64    `json:"expected_generation" binding:"required" minimum:"0"`
+	Clear              ResetMode `json:"clear" binding:"required"`
+	DeadlineSeconds    *int32    `json:"deadline_seconds,omitempty" minimum:"300" maximum:"86400"`
 }
 
 // ResetSession is a hosted Session a reset still has to archive.
@@ -21,9 +23,9 @@ type ResetSession struct{ SessionID, TenantID string }
 const (
 	// ResetAuto archives idle Sessions and escalates to ResetForce at the
 	// deadline.
-	ResetAuto = "auto"
+	ResetAuto ResetMode = "auto"
 	// ResetForce archives every hosted Session, busy ones included.
-	ResetForce = "force"
+	ResetForce ResetMode = "force"
 
 	defaultResetDeadlineSeconds = 3600
 )
@@ -72,7 +74,7 @@ func (e *ExecutionOperations) StartReset(ctx context.Context, installation strin
 			return ErrNotConfigured
 		}
 		if d.Reset != nil {
-			if d.Reset.Clear == input.Clear {
+			if d.Reset.Clear == string(input.Clear) {
 				return nil
 			}
 			if input.Clear != ResetForce {
@@ -87,7 +89,7 @@ func (e *ExecutionOperations) StartReset(ctx context.Context, installation strin
 		if !ok {
 			return ErrInvalidInput
 		}
-		if err := tx.StartReset(input.Clear, deadline, source); err != nil {
+		if err := tx.StartReset(string(input.Clear), deadline, source); err != nil {
 			return err
 		}
 		return tx.RecordAudit("reset_start", installation)
@@ -126,7 +128,7 @@ func (e *ExecutionOperations) AdvanceResetDeadline(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		if d.Reset == nil || d.Reset.Clear != ResetAuto || d.Reset.DeadlineAt == nil || time.Now().Before(*d.Reset.DeadlineAt) {
+		if d.Reset == nil || d.Reset.Clear != string(ResetAuto) || d.Reset.DeadlineAt == nil || time.Now().Before(*d.Reset.DeadlineAt) {
 			return nil
 		}
 		source, err := tx.LoadResetSource()
diff --git a/services/core/internal/deployment/reset_test.go b/services/core/internal/deployment/reset_test.go
index 1a2c1187a..c7477b00c 100644
--- a/services/core/internal/deployment/reset_test.go
+++ b/services/core/internal/deployment/reset_test.go
@@ -9,9 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
+	"github.com/google/uuid"
 )
 
 // resetTx serves stored and records each reset write, with its arguments.
@@ -37,9 +36,9 @@ func resetTx(t *testing.T, stored Record, resources Resources, source adminaudit
 	}
 }
 
-func resetting(t *testing.T, installation, clear string, requestedAt time.Time, deadline *time.Time) Record {
+func resetting(t *testing.T, installation string, clear ResetMode, requestedAt time.Time, deadline *time.Time) Record {
 	d := webDeployment(t, installation, "docker", 4)
-	d.Reset = &ResetState{Clear: clear, RequestedAt: requestedAt, DeadlineAt: deadline}
+	d.Reset = &ResetState{Clear: string(clear), RequestedAt: requestedAt, DeadlineAt: deadline}
 	return d
 }
 
diff --git a/services/core/internal/deployment/rules_test.go b/services/core/internal/deployment/rules_test.go
index 84be8e066..53c875dcc 100644
--- a/services/core/internal/deployment/rules_test.go
+++ b/services/core/internal/deployment/rules_test.go
@@ -7,10 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/google/uuid"
 )
 
 func TestPublicOrigin(t *testing.T) {
@@ -170,7 +169,7 @@ func TestNormalizeHealth(t *testing.T) {
 	for _, c := range []struct {
 		name       string
 		in         NodeHealth
-		diagnostic string
+		diagnostic sandbox.NodeDiagnosticCode
 		invalid    bool
 	}{
 		{"ready clears the diagnostic", NodeHealth{ProviderReady: true, Diagnostic: sandbox.NodeProviderUnavailable}, "", false},
@@ -252,8 +251,8 @@ func TestNodeRollout(t *testing.T) {
 	for _, c := range []struct {
 		name       string
 		n          NodeRecord
-		state      string
-		diagnostic string
+		state      NodeRolloutState
+		diagnostic sandbox.NodeDiagnosticCode
 	}{
 		{"offline", NodeRecord{TargetState: "ready", ReadyGeneration: &ready}, "unknown", ""},
 		{"protocol 1 on another generation", NodeRecord{Online: true, ProtocolVersion: 1, DeploymentGeneration: 1, TargetGeneration: 2, TargetState: "ready", ReadyGeneration: &ready}, "update_required", ""},
diff --git a/services/core/internal/deployment/service.go b/services/core/internal/deployment/service.go
index c9e06fd89..5a08e0fa6 100644
--- a/services/core/internal/deployment/service.go
+++ b/services/core/internal/deployment/service.go
@@ -44,7 +44,7 @@ func (s *Service) View(ctx context.Context) (View, error) {
 // view reports the public URL as the deployment's read-only core_url.
 func (s *Service) view(snapshot Snapshot) (View, error) {
 	d := snapshot.Record
-	result := View{InstallationID: d.InstallationID, Provider: d.Provider, CoreURL: s.rules.PublicURL(), OwnerEpoch: d.OwnerEpoch, Generation: d.Generation, Mode: d.Mode, Rollout: snapshot.Rollout, Resources: snapshot.Resources}
+	result := View{InstallationID: d.InstallationID, Provider: d.Provider, CoreURL: s.rules.PublicURL(), OwnerEpoch: d.OwnerEpoch, Generation: d.Generation, Mode: sandbox.DeploymentMode(d.Mode), Rollout: snapshot.Rollout, Resources: snapshot.Resources}
 	if len(d.Specification) > 0 && string(d.Specification) != "{}" {
 		var spec sandbox.DeploymentSpec
 		if json.Unmarshal(d.Specification, &spec) == nil {
@@ -69,7 +69,7 @@ func (s *Service) view(snapshot Snapshot) (View, error) {
 		}
 	}
 	if d.Reset != nil {
-		result.Reset = &Reset{Clear: d.Reset.Clear, RequestedAt: d.Reset.RequestedAt, DeadlineAt: d.Reset.DeadlineAt, ForcedAt: d.Reset.ForcedAt, Remaining: snapshot.Remaining}
+		result.Reset = &Reset{Clear: ResetMode(d.Reset.Clear), RequestedAt: d.Reset.RequestedAt, DeadlineAt: d.Reset.DeadlineAt, ForcedAt: d.Reset.ForcedAt, Remaining: snapshot.Remaining}
 	}
 	return result, nil
 }
@@ -204,7 +204,7 @@ func (s *Service) GenerationPage(ctx context.Context, after int64) ([]Setup, err
 		if err != nil {
 			return nil, err
 		}
-		v.Mode, v.Operations = adapter.Mode, adapter.Operations()
+		v.Mode, v.Operations = string(adapter.Mode), adapter.Operations()
 		result = append(result, v)
 	}
 	return result, nil
@@ -245,7 +245,7 @@ func (s *Service) SetupForSelection(installationID string, input sandbox.Selecti
 	if err := s.rules.CheckPublicOrigin(input.Provider); err != nil {
 		return Setup{}, err
 	}
-	result := Setup{InstallationID: installationID, Provider: input.Provider, Mode: description.Mode, Specification: normalized.DeploymentSpec, Configuration: normalized.Configuration, BackendFingerprint: description.BackendFingerprint}
+	result := Setup{InstallationID: installationID, Provider: input.Provider, Mode: string(description.Mode), Specification: normalized.DeploymentSpec, Configuration: normalized.Configuration, BackendFingerprint: description.BackendFingerprint}
 	return s.describe(result)
 }
 
diff --git a/services/core/internal/deployment/session_archive.go b/services/core/internal/deployment/session_archive.go
index eb33b012d..0f6c98ad4 100644
--- a/services/core/internal/deployment/session_archive.go
+++ b/services/core/internal/deployment/session_archive.go
@@ -57,7 +57,7 @@ func (e *ExecutionOperations) archiveSession(ctx context.Context, tenantID, sess
 			if err := checkArchiveReset(d, *resetRequestedAt); err != nil {
 				return err
 			}
-			if d.Reset.Clear == ResetAuto {
+			if d.Reset.Clear == string(ResetAuto) {
 				busy, err := tx.LoadResetBusy()
 				if err != nil {
 					return err
diff --git a/services/core/internal/deployment/session_archive_test.go b/services/core/internal/deployment/session_archive_test.go
index 2db8c361c..d325e6b83 100644
--- a/services/core/internal/deployment/session_archive_test.go
+++ b/services/core/internal/deployment/session_archive_test.go
@@ -51,9 +51,9 @@ func TestCheckArchiveReset(t *testing.T) {
 		reset *ResetState
 		want  error
 	}{
-		"running reset":   {&ResetState{Clear: ResetAuto, RequestedAt: requested}, nil},
+		"running reset":   {&ResetState{Clear: string(ResetAuto), RequestedAt: requested}, nil},
 		"no reset":        {nil, ErrConflict},
-		"another request": {&ResetState{Clear: ResetAuto, RequestedAt: requested.Add(time.Second)}, ErrConflict},
+		"another request": {&ResetState{Clear: string(ResetAuto), RequestedAt: requested.Add(time.Second)}, ErrConflict},
 	} {
 		if err := checkArchiveReset(Record{Reset: test.reset}, requested); !errors.Is(err, test.want) {
 			t.Errorf("%s: got %v, want %v", name, err, test.want)
@@ -279,8 +279,8 @@ func TestArchiveSession(t *testing.T) {
 
 func TestArchiveResetSession(t *testing.T) {
 	requested := time.Unix(100, 0)
-	resetting := func(clear string) Record {
-		return Record{InstallationID: "installation", Provider: "docker", Generation: 1, Reset: &ResetState{Clear: clear, RequestedAt: requested}}
+	resetting := func(clear ResetMode) Record {
+		return Record{InstallationID: "installation", Provider: "docker", Generation: 1, Reset: &ResetState{Clear: string(clear), RequestedAt: requested}}
 	}
 	hosted := &sessions.Environment{ID: "environment", Status: "connected", Configuration: json.RawMessage(`{"type":"openai_hosted"}`)}
 	failed := &sessions.Environment{ID: "environment", Status: "failed", Configuration: hosted.Configuration}
diff --git a/services/core/internal/deployment/view.go b/services/core/internal/deployment/view.go
index f45b90afe..23bef5045 100644
--- a/services/core/internal/deployment/view.go
+++ b/services/core/internal/deployment/view.go
@@ -7,13 +7,30 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
+type NodeRolloutState string
+
+const (
+	NodeRolloutReady          NodeRolloutState = "ready"
+	NodeRolloutPreparing      NodeRolloutState = "preparing"
+	NodeRolloutFailed         NodeRolloutState = "failed"
+	NodeRolloutUpdateRequired NodeRolloutState = "update_required"
+	NodeRolloutUnknown        NodeRolloutState = "unknown"
+)
+
+type RolloutState string
+
+const (
+	RolloutSettled   RolloutState = "settled"
+	RolloutPreparing RolloutState = "preparing"
+)
+
 // View is the sandbox deployment as administrators read it.
 type View struct {
 	Rollout              Rollout                 `json:"rollout" binding:"required"`
 	Specification        *sandbox.DeploymentSpec `json:"specification,omitempty"`
 	SpecificationDigest  string                  `json:"specification_digest,omitempty"`
 	Generation           uint64                  `json:"generation" binding:"required"`
-	Mode                 string                  `json:"mode" enums:",nodes,direct" binding:"required"`
+	Mode                 sandbox.DeploymentMode  `json:"mode" binding:"required"`
 	Resources            Resources               `json:"resources" binding:"required"`
 	Configuration        json.RawMessage         `json:"configuration,omitempty" swaggertype:"object"`
 	Metadata             json.RawMessage         `json:"metadata,omitempty" swaggertype:"object"`
@@ -43,10 +60,10 @@ type Suspension struct {
 
 type NodeRollout struct {
 	// Target preparation, independent of an old pin's serving readiness.
-	State string `json:"state" enums:"ready,preparing,failed,update_required,unknown" binding:"required"`
+	State NodeRolloutState `json:"state" binding:"required"`
 	// Durable serving-generation pin; online and provider_ready still gate placement.
-	ReadyGeneration *uint64 `json:"ready_generation" extensions:"x-nullable" binding:"required"`
-	Diagnostic      string  `json:"diagnostic,omitempty" enums:"provider_unavailable,host_unsupported,artifacts_unavailable,runtime_download_failed,runtime_image_unavailable,capacity_insufficient"`
+	ReadyGeneration *uint64                    `json:"ready_generation" extensions:"x-nullable" binding:"required"`
+	Diagnostic      sandbox.NodeDiagnosticCode `json:"diagnostic,omitempty"`
 }
 
 type RolloutNodes struct {
@@ -58,14 +75,14 @@ type RolloutNodes struct {
 }
 
 type Rollout struct {
-	State                       string        `json:"state" enums:"settled,preparing" binding:"required"`
+	State                       RolloutState  `json:"state" binding:"required"`
 	PreviousGenerationSandboxes int64         `json:"previous_generation_sandboxes" binding:"required"`
 	Nodes                       *RolloutNodes `json:"nodes" extensions:"x-nullable" binding:"required"`
 }
 
 // Reset contains only durable state and a single-snapshot resource partition.
 type Reset struct {
-	Clear       string         `json:"clear" enums:"auto,force" binding:"required"`
+	Clear       ResetMode      `json:"clear" binding:"required"`
 	RequestedAt time.Time      `json:"requested_at" binding:"required"`
 	DeadlineAt  *time.Time     `json:"deadline_at" extensions:"x-nullable" binding:"required"`
 	ForcedAt    *time.Time     `json:"forced_at" extensions:"x-nullable" binding:"required"`
diff --git a/services/core/internal/engine/configuration_test.go b/services/core/internal/engine/configuration_test.go
index 74de79937..23f74d9e4 100644
--- a/services/core/internal/engine/configuration_test.go
+++ b/services/core/internal/engine/configuration_test.go
@@ -5,6 +5,7 @@ import (
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/internal/harnessconfig/builtin"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/modelprovider"
 )
 
 func TestProviderDeclarationsAgreeWithAdmission(t *testing.T) {
@@ -16,7 +17,7 @@ func TestProviderDeclarationsAgreeWithAdmission(t *testing.T) {
 			}
 			for _, protocol := range []string{"responses", "anthropic", "unknown"} {
 				provider, supported := declared.Provider(protocol)
-				input := v1.ModelProviderInput{Protocol: protocol, BaseURL: "https://example.test", APIKey: "private-fixture", ContextWindow: 100, MaxOutputTokens: 20}
+				input := v1.ModelProviderInput{Protocol: modelprovider.Protocol(protocol), BaseURL: "https://example.test", APIKey: "private-fixture", ContextWindow: 100, MaxOutputTokens: 20}
 				if (input.ValidateHarness(kind) == nil) != supported {
 					t.Fatalf("protocol %q disagrees with validation", protocol)
 				}
diff --git a/services/core/internal/execution/archive_cancellation_cleanup_test.go b/services/core/internal/execution/archive_cancellation_cleanup_test.go
index a8b899ae7..3ac684477 100644
--- a/services/core/internal/execution/archive_cancellation_cleanup_test.go
+++ b/services/core/internal/execution/archive_cancellation_cleanup_test.go
@@ -9,22 +9,21 @@ import (
 	"testing"
 	"time"
 
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/projectpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/microsandbox"
-
-	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/MiniMax-AI/OpenAgentCore/internal/agentdaemon/proto"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtime"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/microsandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
@@ -79,7 +78,7 @@ func TestArchiveWaitingCleanupReceiptBarrier(t *testing.T) {
 				t.Fatal(err)
 			}
 			_, service := testSessions(t, pool, pgtest.CredentialKey(t))
-			created, err := service.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "fixture"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`), ModelProvider: &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://model.fixture.example/v1", APIKey: "fixture-key"}, ModelProviderSource: v1.ModelProviderSourceSession})
+			created, err := service.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "fixture"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`), ModelProvider: &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://model.fixture.example/v1", APIKey: "fixture-key"}, ModelProviderSource: v1.ExecutionSourceSession})
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/services/core/internal/execution/deployment_provider_observations_test.go b/services/core/internal/execution/deployment_provider_observations_test.go
index 9d769cf31..b1240173f 100644
--- a/services/core/internal/execution/deployment_provider_observations_test.go
+++ b/services/core/internal/execution/deployment_provider_observations_test.go
@@ -88,7 +88,7 @@ func (f finishObservationFixture) start(t *testing.T) sessions.InputReceipt {
 	}
 	return receipt
 }
-func (f finishObservationFixture) fields(t *testing.T) (*time.Time, *string) {
+func (f finishObservationFixture) fields(t *testing.T) (*time.Time, *modelconfiguration.ProviderErrorCode) {
 	t.Helper()
 	rows, err := f.defaults.List(t.Context())
 	if err != nil || len(rows) != 1 {
diff --git a/services/core/internal/execution/model_execution.go b/services/core/internal/execution/model_execution.go
index 926aac7e5..674d3abcb 100644
--- a/services/core/internal/execution/model_execution.go
+++ b/services/core/internal/execution/model_execution.go
@@ -20,7 +20,7 @@ func resolvedSessionModelOptions(provider *v1.ModelProviderInput, engine string)
 		return nil, err
 	}
 	return map[string]any{"model_provider": map[string]any{
-		"protocol": provider.Protocol, "base_url": provider.BaseURL, "api_key": provider.APIKey,
+		"protocol": string(provider.Protocol), "base_url": provider.BaseURL, "api_key": provider.APIKey,
 		"context_window": provider.ContextWindow, "max_output_tokens": provider.MaxOutputTokens,
 	}}, nil
 }
diff --git a/services/core/internal/execution/model_execution_test.go b/services/core/internal/execution/model_execution_test.go
index d4964e10b..b7da9a67e 100644
--- a/services/core/internal/execution/model_execution_test.go
+++ b/services/core/internal/execution/model_execution_test.go
@@ -6,12 +6,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/uuid"
-
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/internal/modelprovider"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/google/uuid"
 )
 
 func TestSessionModelExecutionNeverFallsBack(t *testing.T) {
@@ -35,7 +35,7 @@ func TestSessionModelOptionsPreserveUpstreamBundleForEveryHarness(t *testing.T)
 	for _, engine := range []string{"codex", "claude_sdk", "mcode"} {
 		for _, protocol := range []string{"anthropic", "responses", "chat_completions"} {
 			t.Run(engine+"/"+protocol, func(t *testing.T) {
-				provider := &v1.ModelProviderInput{Protocol: protocol, BaseURL: "https://example.com/v1", APIKey: "private-key", ContextWindow: 200000, MaxOutputTokens: 8000}
+				provider := &v1.ModelProviderInput{Protocol: modelprovider.Protocol(protocol), BaseURL: "https://example.com/v1", APIKey: "private-key", ContextWindow: 200000, MaxOutputTokens: 8000}
 				got, err := resolvedSessionModelOptions(provider, engine)
 				native := engine == "mcode" || engine == "codex" && protocol == "responses" || engine == "claude_sdk" && protocol == "anthropic"
 				if !native {
@@ -43,7 +43,7 @@ func TestSessionModelOptionsPreserveUpstreamBundleForEveryHarness(t *testing.T)
 					if got != nil || !errors.As(err, &protocolError) || strings.Contains(err.Error(), provider.APIKey) {
 						t.Fatal("non-native provider was not safely rejected")
 					}
-					if provider.Protocol != protocol {
+					if string(provider.Protocol) != protocol {
 						t.Fatal("rejection rewrote the frozen provider protocol")
 					}
 					return
diff --git a/services/core/internal/execution/runtime_lifecycle.go b/services/core/internal/execution/runtime_lifecycle.go
index b2f072098..28cc7510a 100644
--- a/services/core/internal/execution/runtime_lifecycle.go
+++ b/services/core/internal/execution/runtime_lifecycle.go
@@ -9,14 +9,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/uuid"
-
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimedevice"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/google/uuid"
 )
 
 // RuntimeProvider binds one deployment to one sandbox installation.
@@ -85,10 +84,10 @@ func validatedRuntimeProvider(config *RuntimeProvider, registry *runtimegateway.
 		return RuntimeProvider{}, err
 	}
 	copied := *config
-	if copied.ProviderKind == "" || (copied.Mode != "nodes" && copied.Mode != "direct") {
+	if copied.ProviderKind == "" || (copied.Mode != string(sandbox.DeploymentNodes) && copied.Mode != string(sandbox.DeploymentDirect)) {
 		return RuntimeProvider{}, sandbox.ErrInvalid
 	}
-	if copied.Mode == "direct" && copied.Suspension != nil {
+	if copied.Mode == string(sandbox.DeploymentDirect) && copied.Suspension != nil {
 		return RuntimeProvider{}, sandbox.ErrInvalid
 	}
 	if config.Suspension != nil {
diff --git a/services/core/internal/execution/runtime_manager.go b/services/core/internal/execution/runtime_manager.go
index d7d1af2b2..d6ae06a56 100644
--- a/services/core/internal/execution/runtime_manager.go
+++ b/services/core/internal/execution/runtime_manager.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
@@ -79,7 +80,7 @@ func (m *runtimeManager) node(id string) (*runtimeNode, error) {
 		m.mu.Unlock()
 		return nil, errRuntimeTransition
 	}
-	if m.closed || m.config.Provider == nil || (id == "") != (m.config.Mode == "direct") {
+	if m.closed || m.config.Provider == nil || (id == "") != (m.config.Mode == string(sandbox.DeploymentDirect)) {
 		m.mu.Unlock()
 		return nil, ErrExecutionUnavailable
 	}
diff --git a/services/core/internal/execution/sandbox_deployment_switch.go b/services/core/internal/execution/sandbox_deployment_switch.go
index 0dddd2923..e6606e5a0 100644
--- a/services/core/internal/execution/sandbox_deployment_switch.go
+++ b/services/core/internal/execution/sandbox_deployment_switch.go
@@ -115,7 +115,7 @@ func (m *runtimeManager) activateDeployment(ctx context.Context, expected deploy
 		m.publishEmptyDeployment(expected.InstallationID, expected.Generation)
 		return nil
 	}
-	if config == nil || config.InstallationID != expected.InstallationID || config.Generation != expected.Generation || config.Mode != expected.Mode || config.ProviderKind != expected.Provider || config.loadDeployment != nil {
+	if config == nil || config.InstallationID != expected.InstallationID || config.Generation != expected.Generation || config.Mode != string(expected.Mode) || config.ProviderKind != expected.Provider || config.loadDeployment != nil {
 		return sandbox.ErrInvalid
 	}
 	copied, err := validatedRuntimeProvider(config, m.registry)
diff --git a/services/core/internal/execution/worker_metrics.go b/services/core/internal/execution/worker_metrics.go
index c5833dfa1..cd486579c 100644
--- a/services/core/internal/execution/worker_metrics.go
+++ b/services/core/internal/execution/worker_metrics.go
@@ -4,6 +4,8 @@ import (
 	"errors"
 	"sync"
 	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/coremetrics"
 )
 
 // WorkerMetrics contains only observations from this worker's existing
@@ -18,7 +20,7 @@ type WorkerMetrics struct {
 // WorkerJobMetrics describes the last completed scheduling poll. Failed counts
 // failed polls, not failed Turns; Processed is unknown when a poll fails.
 type WorkerJobMetrics struct {
-	Status    string
+	Status    coremetrics.JobStatus
 	LastRunAt *time.Time
 	Processed *int64
 	Failed    *int64
@@ -41,7 +43,7 @@ func (w *Worker) MetricsSnapshot() WorkerMetrics {
 	value.Scheduler.Processed = copyMetric(value.Scheduler.Processed)
 	value.Scheduler.Failed = copyMetric(value.Scheduler.Failed)
 	if value.Scheduler.Status == "" {
-		value.Scheduler.Status = "unknown"
+		value.Scheduler.Status = coremetrics.JobUnknown
 	}
 	return value
 }
@@ -75,10 +77,10 @@ func (w *Worker) observeOwnership(err error) {
 
 func (w *Worker) observeSchedulerPoll(processed int, err error) {
 	now, handled, failed := time.Now().UTC(), int64(processed), int64(0)
-	job := WorkerJobMetrics{Status: "ok", LastRunAt: &now, Processed: &handled, Failed: &failed}
+	job := WorkerJobMetrics{Status: coremetrics.JobOk, LastRunAt: &now, Processed: &handled, Failed: &failed}
 	if err != nil {
 		failed = 1
-		job.Status, job.Processed = "failing", nil
+		job.Status, job.Processed = coremetrics.JobFailing, nil
 	}
 	w.metrics.mu.Lock()
 	defer w.metrics.mu.Unlock()
@@ -88,9 +90,9 @@ func (w *Worker) observeSchedulerPoll(processed int, err error) {
 func (w *Worker) observeWorkerStop(runErr, contextErr error) {
 	w.metrics.mu.Lock()
 	defer w.metrics.mu.Unlock()
-	w.metrics.value.Scheduler.Status = "stopped"
+	w.metrics.value.Scheduler.Status = coremetrics.JobStopped
 	if runErr != nil && (contextErr == nil || !errors.Is(runErr, contextErr)) {
-		w.metrics.value.Scheduler.Status = "failing"
+		w.metrics.value.Scheduler.Status = coremetrics.JobFailing
 	}
 }
 
diff --git a/services/core/internal/modelconfiguration/configuration.go b/services/core/internal/modelconfiguration/configuration.go
index f4b9e776e..f8e03f044 100644
--- a/services/core/internal/modelconfiguration/configuration.go
+++ b/services/core/internal/modelconfiguration/configuration.go
@@ -19,7 +19,7 @@ type Configuration struct {
 	HarnessConfig json.RawMessage
 	UpdatedAt     time.Time
 	LastUsedAt    *time.Time
-	LastErrorCode *string
+	LastErrorCode *ProviderErrorCode
 	LastErrorAt   *time.Time
 }
 
diff --git a/services/core/internal/modelconfiguration/observation.go b/services/core/internal/modelconfiguration/observation.go
index 8d200c38c..fc9e48afc 100644
--- a/services/core/internal/modelconfiguration/observation.go
+++ b/services/core/internal/modelconfiguration/observation.go
@@ -2,6 +2,20 @@ package modelconfiguration
 
 import "slices"
 
+type ProviderErrorCode string
+
+const (
+	ProviderAuthenticationError ProviderErrorCode = "authentication_error"
+	ProviderConnectionFailed    ProviderErrorCode = "connection_failed"
+	ProviderRateLimitExceeded   ProviderErrorCode = "rate_limit_exceeded"
+	ProviderUsageLimitExceeded  ProviderErrorCode = "usage_limit_exceeded"
+	ProviderServerOverloaded    ProviderErrorCode = "server_overloaded"
+	ProviderServerError         ProviderErrorCode = "server_error"
+	ProviderResourceNotFound    ProviderErrorCode = "resource_not_found"
+	ProviderRequestTimeout      ProviderErrorCode = "request_timeout"
+	ProviderInvalidRequest      ProviderErrorCode = "invalid_request"
+)
+
 // Observation names a root Turn whose committed outcome may update the
 // last-use observations of the deployment default its Session froze.
 type Observation struct {
@@ -12,11 +26,7 @@ type Observation struct {
 // itself. Context-length and cyber-policy failures describe the request. The
 // observation statement's fence lists the same codes; testdata holds the cases
 // both are checked against.
-var providerErrorCodes = []string{
-	"authentication_error", "connection_failed", "rate_limit_exceeded",
-	"usage_limit_exceeded", "server_overloaded", "server_error",
-	"resource_not_found", "request_timeout", "invalid_request",
-}
+var providerErrorCodes = []ProviderErrorCode{ProviderAuthenticationError, ProviderConnectionFailed, ProviderRateLimitExceeded, ProviderUsageLimitExceeded, ProviderServerOverloaded, ProviderServerError, ProviderResourceNotFound, ProviderRequestTimeout, ProviderInvalidRequest}
 
 // ShouldObserveProvider reports whether a committed root Turn outcome says
 // something about its model provider: every completed Turn, and a failed Turn
@@ -27,7 +37,7 @@ func ShouldObserveProvider(status, errorCode, engineErrorCode string) bool {
 	case "completed":
 		return true
 	case "failed":
-		return errorCode == "engine_failed" && slices.Contains(providerErrorCodes, engineErrorCode)
+		return errorCode == "engine_failed" && slices.Contains(providerErrorCodes, ProviderErrorCode(engineErrorCode))
 	default:
 		return false
 	}
diff --git a/services/core/internal/persistence/postgres/agentpg/store.go b/services/core/internal/persistence/postgres/agentpg/store.go
index a2f519a27..a0a7dba24 100644
--- a/services/core/internal/persistence/postgres/agentpg/store.go
+++ b/services/core/internal/persistence/postgres/agentpg/store.go
@@ -61,7 +61,7 @@ func (s *Store) CreateAgent(ctx context.Context, input agents.NewAgent) (agents.
 		if created, err = agentFromRow(row); err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, input.TenantID, "create", "agent", created.ID, "", writeaudit.Resource{Type: "agent", ID: created.ID})
+		return auditpg.RecordWriteAudit(ctx, q, input.TenantID, writeaudit.ActionCreate, writeaudit.ResourceAgent, created.ID, "", writeaudit.Resource{Type: writeaudit.ResourceAgent, ID: created.ID})
 	})
 	if err != nil {
 		return agents.Agent{}, translate(err)
@@ -130,7 +130,7 @@ func (t *updateTx) apply(revision agents.Revision) (agents.Agent, error) {
 	if err != nil {
 		return agents.Agent{}, err
 	}
-	return updated, auditpg.RecordWriteAudit(t.ctx, t.q, t.tenantID, "update", "agent", updated.ID, "")
+	return updated, auditpg.RecordWriteAudit(t.ctx, t.q, t.tenantID, writeaudit.ActionUpdate, writeaudit.ResourceAgent, updated.ID, "")
 }
 
 // DeleteAgent treats an agentID that cannot name an Agent as a missing one.
@@ -151,7 +151,7 @@ func (s *Store) DeleteAgent(ctx context.Context, tenantID, agentID string) (stri
 			return err
 		}
 		deleted = uuid.UUID(id.Bytes).String()
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "delete", "agent", deleted, "")
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionDelete, writeaudit.ResourceAgent, deleted, "")
 	})
 	if err != nil {
 		return "", err
diff --git a/services/core/internal/persistence/postgres/auditpg/auditpg_test.go b/services/core/internal/persistence/postgres/auditpg/auditpg_test.go
index 1c4e52a38..a0eb6a801 100644
--- a/services/core/internal/persistence/postgres/auditpg/auditpg_test.go
+++ b/services/core/internal/persistence/postgres/auditpg/auditpg_test.go
@@ -9,16 +9,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 func openAudit(t *testing.T) (*pgunit.Pool, *auditpg.Store) {
@@ -46,7 +45,7 @@ func record(t *testing.T, pool *pgunit.Pool, ctx context.Context, write func(con
 func recordWrite(t *testing.T, pool *pgunit.Pool, source writeaudit.Source, action, kind, id string, created ...writeaudit.Resource) {
 	t.Helper()
 	if err := record(t, pool, writeaudit.WithSource(t.Context(), source), func(ctx context.Context, q *sqlc.Queries) error {
-		return auditpg.RecordWriteAudit(ctx, q, source.TenantID, action, kind, id, "", created...)
+		return auditpg.RecordWriteAudit(ctx, q, source.TenantID, writeaudit.Action(action), writeaudit.ResourceType(kind), id, "", created...)
 	}); err != nil {
 		t.Fatal(err)
 	}
@@ -204,7 +203,7 @@ func TestMalformedProvenanceFailsClosed(t *testing.T) {
 			id = ""
 		}
 		ctx := writeaudit.WithSource(t.Context(), source)
-		if err := auditpg.RecordWriteAudit(ctx, nil, valid.TenantID, action, kind, id, "", created...); !errors.Is(err, writeaudit.ErrInvalidSource) {
+		if err := auditpg.RecordWriteAudit(ctx, nil, valid.TenantID, writeaudit.Action(action), writeaudit.ResourceType(kind), id, "", created...); !errors.Is(err, writeaudit.ErrInvalidSource) {
 			t.Fatalf("%s accepted: %v", field, err)
 		}
 	}
diff --git a/services/core/internal/persistence/postgres/auditpg/record.go b/services/core/internal/persistence/postgres/auditpg/record.go
index 651afe523..5892ceef7 100644
--- a/services/core/internal/persistence/postgres/auditpg/record.go
+++ b/services/core/internal/persistence/postgres/auditpg/record.go
@@ -7,14 +7,13 @@ import (
 	"context"
 	"errors"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 // The recorders run in the caller's business transaction: q must belong to it,
@@ -26,9 +25,9 @@ import (
 // provenance, such as internal lifecycle work, stays unattributed; malformed
 // provenance fails closed with writeaudit.ErrInvalidSource. A request that
 // already recorded its operation records nothing more.
-func RecordWriteAudit(ctx context.Context, q *sqlc.Queries, tenant, action, resourceType, resourceID, parentID string, created ...writeaudit.Resource) error {
+func RecordWriteAudit(ctx context.Context, q *sqlc.Queries, tenant string, action writeaudit.Action, resourceType writeaudit.ResourceType, resourceID, parentID string, created ...writeaudit.Resource) error {
 	if _, ok := adminaudit.FromContext(ctx); ok {
-		return RecordAdminMutation(ctx, q, tenant, action, resourceType, resourceID)
+		return RecordAdminMutation(ctx, q, tenant, string(action), string(resourceType), resourceID)
 	}
 	source, ok := writeaudit.FromContext(ctx)
 	if !ok {
@@ -45,7 +44,7 @@ func RecordWriteAudit(ctx context.Context, q *sqlc.Queries, tenant, action, reso
 	id, err := q.InsertWriteAuditOperation(ctx, sqlc.InsertWriteAuditOperationParams{
 		ID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, TenantID: tenantID,
 		KeyID: source.KeyID, KeyName: source.Name, KeyPrefix: source.Prefix, KeyKind: source.Kind,
-		Action: action, ResourceType: resourceType, ResourceID: resourceID, ParentID: parentID, RequestID: source.RequestID, TraceID: source.TraceID,
+		Action: string(action), ResourceType: string(resourceType), ResourceID: resourceID, ParentID: parentID, RequestID: source.RequestID, TraceID: source.TraceID,
 	})
 	if errors.Is(err, pgx.ErrNoRows) {
 		return nil
@@ -54,7 +53,7 @@ func RecordWriteAudit(ctx context.Context, q *sqlc.Queries, tenant, action, reso
 		return err
 	}
 	for _, resource := range created {
-		if err := q.InsertWriteAuditOwner(ctx, sqlc.InsertWriteAuditOwnerParams{TenantID: tenantID, ResourceType: resource.Type, ResourceID: resource.ID, ParentID: resource.ParentID, OperationID: id}); err != nil {
+		if err := q.InsertWriteAuditOwner(ctx, sqlc.InsertWriteAuditOwnerParams{TenantID: tenantID, ResourceType: string(resource.Type), ResourceID: resource.ID, ParentID: resource.ParentID, OperationID: id}); err != nil {
 			return err
 		}
 	}
diff --git a/services/core/internal/persistence/postgres/auditpg/write_operations.go b/services/core/internal/persistence/postgres/auditpg/write_operations.go
index 30def5fac..37973e396 100644
--- a/services/core/internal/persistence/postgres/auditpg/write_operations.go
+++ b/services/core/internal/persistence/postgres/auditpg/write_operations.go
@@ -6,13 +6,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 func apiKey(id, name, prefix, kind string, revoked pgtype.Timestamptz) writeaudit.APIKey {
@@ -105,7 +104,7 @@ func (s *Store) ListWriteOperations(ctx context.Context, tenantID string, filter
 		rows = rows[:filter.Limit]
 	}
 	for _, row := range rows {
-		page.Data = append(page.Data, writeaudit.Operation{ID: uuid.UUID(row.ID.Bytes).String(), Action: row.Action, ResourceType: row.ResourceType, ResourceID: row.ResourceID, ParentID: row.ParentID, RequestID: row.RequestID, TraceID: row.TraceID, APIKey: apiKey(row.KeyID, row.KeyName, row.KeyPrefix, row.KeyKind, row.RevokedAt), CreatedAt: row.CreatedAt.Time})
+		page.Data = append(page.Data, writeaudit.Operation{ID: uuid.UUID(row.ID.Bytes).String(), Action: writeaudit.Action(row.Action), ResourceType: writeaudit.ResourceType(row.ResourceType), ResourceID: row.ResourceID, ParentID: row.ParentID, RequestID: row.RequestID, TraceID: row.TraceID, APIKey: apiKey(row.KeyID, row.KeyName, row.KeyPrefix, row.KeyKind, row.RevokedAt), CreatedAt: row.CreatedAt.Time})
 	}
 	if page.HasMore {
 		page.NextCursor = encodeCursor(page.Data[len(page.Data)-1].ID, scope)
diff --git a/services/core/internal/persistence/postgres/deploymentpg/presence_test.go b/services/core/internal/persistence/postgres/deploymentpg/presence_test.go
index 7c8fd3905..52b788997 100644
--- a/services/core/internal/persistence/postgres/deploymentpg/presence_test.go
+++ b/services/core/internal/persistence/postgres/deploymentpg/presence_test.go
@@ -8,15 +8,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-	"github.com/jackc/pgx/v5/pgxpool"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/deploymentpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 func presenceContext(t *testing.T) context.Context {
@@ -278,15 +277,15 @@ func TestNodeDiagnosticReachesListAndDetail(t *testing.T) {
 		{reported: "dial unix /var/run/docker.sock: permission denied", want: "provider_unavailable"},
 		{reported: "artifacts_unavailable", want: "", ready: true},
 	} {
-		if err := f.service.Heartbeat(t.Context(), node.NodeID, connection, epoch, deployment.NodeHealth{ProviderReady: tc.ready, Diagnostic: tc.reported}); err != nil {
+		if err := f.service.Heartbeat(t.Context(), node.NodeID, connection, epoch, deployment.NodeHealth{ProviderReady: tc.ready, Diagnostic: sandbox.NodeDiagnosticCode(tc.reported)}); err != nil {
 			t.Fatal(tc.reported, err)
 		}
 		list, err := f.service.ListNodes(t.Context())
-		if err != nil || len(list) != 1 || list[0].Diagnostic != tc.want {
+		if err != nil || len(list) != 1 || string(list[0].Diagnostic) != tc.want {
 			t.Fatal(tc.reported, list, err)
 		}
 		detail, err := f.service.NodeDetail(t.Context(), node.NodeID, "1h")
-		if err != nil || detail.Diagnostic != tc.want {
+		if err != nil || string(detail.Diagnostic) != tc.want {
 			t.Fatal(tc.reported, detail.Diagnostic, err)
 		}
 		var stored string
diff --git a/services/core/internal/persistence/postgres/filepg/filepg.go b/services/core/internal/persistence/postgres/filepg/filepg.go
index 6bac2306c..09a488b87 100644
--- a/services/core/internal/persistence/postgres/filepg/filepg.go
+++ b/services/core/internal/persistence/postgres/filepg/filepg.go
@@ -7,15 +7,14 @@ import (
 	"errors"
 	"io"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/files"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 type Store struct{ pool *pgunit.Pool }
@@ -61,7 +60,7 @@ func (s *Store) Create(ctx context.Context, tenantID string, write func(io.Write
 			return err
 		}
 		created = fileFromRow(row)
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "create", "file", created.ID, "", writeaudit.Resource{Type: "file", ID: created.ID})
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionCreate, writeaudit.ResourceFile, created.ID, "", writeaudit.Resource{Type: writeaudit.ResourceFile, ID: created.ID})
 	})
 	if err != nil {
 		return files.File{}, err
@@ -207,7 +206,7 @@ func (s *Store) Delete(ctx context.Context, tenantID, fileID string) error {
 		if err := objects.Unlink(ctx, oid.Uint32); err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "delete", "file", fileID, "")
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionDelete, writeaudit.ResourceFile, fileID, "")
 	})
 }
 
diff --git a/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go b/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
index 8e788926f..2c59b8c1b 100644
--- a/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
+++ b/services/core/internal/persistence/postgres/modelconfigurationpg/observation_test.go
@@ -12,13 +12,12 @@ import (
 	"time"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/pgconn"
 	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 )
 
 // The statement and ShouldObserveProvider classify the shared cases the same
@@ -79,7 +78,7 @@ func TestObservationExcludesOtherSourcesAndHistoricalSessions(t *testing.T) {
 		input.IdempotencyKey = uuid.NewString()
 		projection := *input.ExecutionConfiguration
 		input.ExecutionConfiguration = &projection
-		input.ModelProviderSource = source
+		input.ModelProviderSource = v1.ExecutionSource(source)
 		// Historical metadata may name deployment but has no frozen private UUID.
 		if source == "deployment" {
 			input.DeploymentProviderRevision = uuid.Nil
@@ -89,7 +88,7 @@ func TestObservationExcludesOtherSourcesAndHistoricalSessions(t *testing.T) {
 				input.ModelProviderSource = "session"
 			}
 		}
-		projection.ModelProvider = v1.ExecutionProviderSelection{Source: source, Status: "available", Configuration: input.ModelProvider.SafeView()}
+		projection.ModelProvider = v1.ExecutionProviderSelection{Source: v1.ExecutionSource(source), Status: "available", Configuration: input.ModelProvider.SafeView()}
 		created, err := o.sessions.CreateSession(t.Context(), o.tenant, input)
 		if err != nil {
 			t.Fatal(source, err)
diff --git a/services/core/internal/persistence/postgres/modelconfigurationpg/store.go b/services/core/internal/persistence/postgres/modelconfigurationpg/store.go
index 02a0a7d0d..fd17b9724 100644
--- a/services/core/internal/persistence/postgres/modelconfigurationpg/store.go
+++ b/services/core/internal/persistence/postgres/modelconfigurationpg/store.go
@@ -10,16 +10,16 @@ import (
 	"time"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
+	"github.com/MiniMax-AI/OpenAgentCore/internal/modelprovider"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/textvalue"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 // auditResource is the administrator audit resource type of a deployment
@@ -77,7 +77,7 @@ func (s *Store) Replace(ctx context.Context, record modelconfiguration.Record) (
 	err = s.pool.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
 		q := sqlc.New(tx)
 		row, err := q.UpsertDeploymentModelProvider(ctx, sqlc.UpsertDeploymentModelProviderParams{
-			Harness: record.Harness, Protocol: record.Provider.Protocol, BaseUrl: record.Provider.BaseURL,
+			Harness: record.Harness, Protocol: string(record.Provider.Protocol), BaseUrl: record.Provider.BaseURL,
 			ContextWindow: record.Provider.ContextWindow, MaxOutputTokens: record.Provider.MaxOutputTokens,
 			Model: record.Model, HarnessConfig: record.HarnessConfig, EncryptedConfig: sealed,
 			Revision: pgtype.UUID{Bytes: uuid.New(), Valid: true},
@@ -180,10 +180,11 @@ func configuration(row sqlc.ListDeploymentModelProvidersRow) modelconfiguration.
 	result := modelconfiguration.Configuration{
 		Harness: row.Harness, Model: row.Model, HarnessConfig: json.RawMessage(row.HarnessConfig), UpdatedAt: row.UpdatedAt.Time,
 		LastUsedAt: timestamp(row.LastUsedAt), LastErrorAt: timestamp(row.LastErrorAt),
-		Provider: v1.ModelProviderView{Protocol: row.Protocol, BaseURL: row.BaseUrl, ContextWindow: row.ContextWindow, MaxOutputTokens: row.MaxOutputTokens, APIKeyConfigured: true},
+		Provider: v1.ModelProviderView{Protocol: modelprovider.Protocol(row.Protocol), BaseURL: row.BaseUrl, ContextWindow: row.ContextWindow, MaxOutputTokens: row.MaxOutputTokens, APIKeyConfigured: true},
 	}
 	if row.LastErrorCode.Valid {
-		result.LastErrorCode = &row.LastErrorCode.String
+		code := modelconfiguration.ProviderErrorCode(row.LastErrorCode.String)
+		result.LastErrorCode = &code
 	}
 	return result
 }
diff --git a/services/core/internal/persistence/postgres/sessionpg/artifacts.go b/services/core/internal/persistence/postgres/sessionpg/artifacts.go
index 371e8a0ab..21401d11d 100644
--- a/services/core/internal/persistence/postgres/sessionpg/artifacts.go
+++ b/services/core/internal/persistence/postgres/sessionpg/artifacts.go
@@ -6,14 +6,14 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 var (
@@ -138,7 +138,7 @@ func (s *Store) DeleteSessionArtifact(ctx context.Context, tenantID, sessionID,
 		if err := objects.Unlink(ctx, oid.Uint32); err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "delete", "artifact", uuid.UUID(lookup.ID.Bytes).String(), uuid.UUID(lookup.SessionID.Bytes).String())
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionDelete, writeaudit.ResourceArtifact, uuid.UUID(lookup.ID.Bytes).String(), uuid.UUID(lookup.SessionID.Bytes).String())
 	})
 }
 
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation.go b/services/core/internal/persistence/postgres/sessionpg/creation.go
index be18c68d7..7861947d8 100644
--- a/services/core/internal/persistence/postgres/sessionpg/creation.go
+++ b/services/core/internal/persistence/postgres/sessionpg/creation.go
@@ -6,10 +6,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
@@ -24,6 +20,9 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 // modelProviderKeyPurpose keys the provider-key fingerprint in creation
@@ -232,7 +231,7 @@ func (t *creationTx) PruneChanges(ctx context.Context) error {
 }
 
 func (t *creationTx) AuditCreation(ctx context.Context, created ...writeaudit.Resource) error {
-	return auditpg.RecordWriteAudit(ctx, t.q, t.tenantID, "create", "session", optionalID(t.session), "", created...)
+	return auditpg.RecordWriteAudit(ctx, t.q, t.tenantID, writeaudit.ActionCreate, writeaudit.ResourceSession, optionalID(t.session), "", created...)
 }
 
 func (t *creationTx) LoadSession(ctx context.Context) (sessions.Session, error) {
diff --git a/services/core/internal/persistence/postgres/sessionpg/creation_test.go b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
index fac2cb753..2165b2c07 100644
--- a/services/core/internal/persistence/postgres/sessionpg/creation_test.go
+++ b/services/core/internal/persistence/postgres/sessionpg/creation_test.go
@@ -14,9 +14,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgxpool"
-
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
@@ -32,6 +29,8 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 var creator = identity.Subject{Kind: "service_account", ID: "test-runner"}
@@ -382,7 +381,7 @@ func TestCreationFreezesResourcesOnce(t *testing.T) {
 	input := sessions.CreateSession{
 		Creator: creator, Engine: "codex", IdempotencyKey: "frozen", Configuration: environmentConfiguration,
 		ModelProvider:       &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://example.com/v1", APIKey: canary},
-		ModelProviderSource: v1.ModelProviderSourceSession,
+		ModelProviderSource: v1.ExecutionSourceSession,
 		Initialization:      environmentconfig.Setup{Skills: []environmentconfig.Skill{inline, reference}},
 		InitialFiles:        []environmentconfig.InitialFile{{Type: "inline", Path: "/workspace/a", Data: []byte(canary)}, fileID},
 	}
diff --git a/services/core/internal/persistence/postgres/sessionpg/execution_file_writes.go b/services/core/internal/persistence/postgres/sessionpg/execution_file_writes.go
index 14cbad562..b6b8a252c 100644
--- a/services/core/internal/persistence/postgres/sessionpg/execution_file_writes.go
+++ b/services/core/internal/persistence/postgres/sessionpg/execution_file_writes.go
@@ -5,13 +5,12 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 // WithFileWriteReservation reads the Environment in the transaction before it
@@ -160,7 +159,7 @@ func (t *fileWriteTx) RecordFileWriteAudit(ctx context.Context, write string) er
 	if err := json.Unmarshal(row.EnvironmentFileWrite.AuditSource, &source); err != nil {
 		return err
 	}
-	return auditpg.RecordWriteAudit(writeaudit.WithSource(ctx, source), t.q, optionalID(t.tenant), "upload_file", "environment", optionalID(t.environment), optionalID(t.session))
+	return auditpg.RecordWriteAudit(writeaudit.WithSource(ctx, source), t.q, optionalID(t.tenant), writeaudit.ActionUploadFile, writeaudit.ResourceEnvironment, optionalID(t.environment), optionalID(t.session))
 }
 
 func fileWriteFromRow(row sqlc.EnvironmentFileWrite, session pgtype.UUID) sessions.EnvironmentFileWrite {
diff --git a/services/core/internal/persistence/postgres/sessionpg/inputs.go b/services/core/internal/persistence/postgres/sessionpg/inputs.go
index a55e41aaa..f1f9e7d6c 100644
--- a/services/core/internal/persistence/postgres/sessionpg/inputs.go
+++ b/services/core/internal/persistence/postgres/sessionpg/inputs.go
@@ -7,14 +7,14 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 var (
@@ -184,7 +184,7 @@ func (t *SessionTx) FailInputReservation(ctx context.Context, reservation, code
 }
 
 func (t *SessionTx) RecordInputAudit(ctx context.Context) error {
-	return auditpg.RecordWriteAudit(ctx, t.q, optionalID(t.tenant), "send_events", "session", optionalID(t.session), "")
+	return auditpg.RecordWriteAudit(ctx, t.q, optionalID(t.tenant), writeaudit.ActionSendEvents, writeaudit.ResourceSession, optionalID(t.session), "")
 }
 
 func (s *Store) ListTurnInputs(ctx context.Context, tenant, session, turn string, after int64, limit int) ([]sessions.TurnInput, error) {
diff --git a/services/core/internal/persistence/postgres/sessionpg/session_reads.go b/services/core/internal/persistence/postgres/sessionpg/session_reads.go
index f22c82e04..c987a5fdd 100644
--- a/services/core/internal/persistence/postgres/sessionpg/session_reads.go
+++ b/services/core/internal/persistence/postgres/sessionpg/session_reads.go
@@ -7,14 +7,13 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 var _ sessions.SessionReader = (*Store)(nil)
@@ -214,9 +213,9 @@ func (s *Store) GetSessionExecutionConfiguration(ctx context.Context, tenantID,
 		if row.Engine != "" {
 			harness = &row.Engine
 		}
-		projection.Model = v1.ExecutionSelection{Value: model, Source: "unknown"}
-		projection.Harness = v1.ExecutionSelection{Value: harness, Source: "unknown"}
-		projection.ModelProvider = v1.ExecutionProviderSelection{Source: "unknown", Status: "unavailable"}
+		projection.Model = v1.ExecutionSelection{Value: model, Source: v1.ExecutionSourceUnknown}
+		projection.Harness = v1.ExecutionSelection{Value: harness, Source: v1.ExecutionSourceUnknown}
+		projection.ModelProvider = v1.ExecutionProviderSelection{Source: v1.ExecutionSourceUnknown, Status: v1.ExecutionProviderUnavailable}
 	} else if err := json.Unmarshal(row.ExecutionConfiguration, &projection); err != nil {
 		return v1.SessionExecutionConfiguration{}, errors.New("invalid stored session execution configuration")
 	}
@@ -261,7 +260,7 @@ func loadManagedArchive(ctx context.Context, q *sqlc.Queries, tenant, session pg
 	if row.EnvironmentType != "openai_hosted" {
 		return sessions.ManagedArchive{}, sessions.ErrInvalidInput
 	}
-	return sessions.ManagedArchive{SessionID: uuid.UUID(row.SessionID.Bytes).String(), EnvironmentID: uuid.UUID(row.EnvironmentID.Bytes).String(), State: row.State}, nil
+	return sessions.ManagedArchive{SessionID: uuid.UUID(row.SessionID.Bytes).String(), EnvironmentID: uuid.UUID(row.EnvironmentID.Bytes).String(), State: sessions.ManagedArchiveState(row.State)}, nil
 }
 
 // loadSession reads, on q, the tenant's visible Session with the projection
diff --git a/services/core/internal/persistence/postgres/sessionpg/session_writes.go b/services/core/internal/persistence/postgres/sessionpg/session_writes.go
index ac1ad07be..c8cfae51f 100644
--- a/services/core/internal/persistence/postgres/sessionpg/session_writes.go
+++ b/services/core/internal/persistence/postgres/sessionpg/session_writes.go
@@ -5,14 +5,14 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 var _ sessions.SessionStorage = (*Store)(nil)
@@ -46,7 +46,7 @@ func (t *deletionTx) ApplyDeletion(ctx context.Context) error {
 }
 
 func (t *deletionTx) RecordDeletionAudit(ctx context.Context) error {
-	return auditpg.RecordWriteAudit(ctx, t.q, t.tenantID, "delete", "session", uuid.UUID(t.session.Bytes).String(), "")
+	return auditpg.RecordWriteAudit(ctx, t.q, t.tenantID, writeaudit.ActionDelete, writeaudit.ResourceSession, uuid.UUID(t.session.Bytes).String(), "")
 }
 
 func (s *Store) UpdateSessionMetadata(ctx context.Context, tenantID, sessionID string, encoded []byte) (sessions.Session, error) {
@@ -61,7 +61,7 @@ func (s *Store) UpdateSessionMetadata(ctx context.Context, tenantID, sessionID s
 		if err != nil {
 			return err
 		}
-		if err := auditpg.RecordWriteAudit(ctx, q, tenantID, "update", "session", uuid.UUID(row.ID.Bytes).String(), ""); err != nil {
+		if err := auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionUpdate, writeaudit.ResourceSession, uuid.UUID(row.ID.Bytes).String(), ""); err != nil {
 			return err
 		}
 		if session, err = sessionFromRow(row); err != nil {
@@ -81,6 +81,6 @@ func (s *Store) UpdateSessionMetadata(ctx context.Context, tenantID, sessionID s
 
 func (s *Store) AuditSessionOperation(ctx context.Context, tenantID, sessionID, action string) error {
 	return s.withPublicSession(ctx, tenantID, sessionID, func(ctx context.Context, q *sqlc.Queries, session pgtype.UUID) error {
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, action, "session", uuid.UUID(session.Bytes).String(), "")
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.Action(action), writeaudit.ResourceSession, uuid.UUID(session.Bytes).String(), "")
 	})
 }
diff --git a/services/core/internal/persistence/postgres/skillpg/skillpg.go b/services/core/internal/persistence/postgres/skillpg/skillpg.go
index b65dfd8eb..cc3089737 100644
--- a/services/core/internal/persistence/postgres/skillpg/skillpg.go
+++ b/services/core/internal/persistence/postgres/skillpg/skillpg.go
@@ -55,9 +55,9 @@ func (s *Store) CreateSkill(ctx context.Context, in skills.NewSkill) (skills.Ski
 			return err
 		}
 		result = skillFromRow(row)
-		return auditpg.RecordWriteAudit(ctx, q, in.TenantID, "create", "skill", result.ID, "",
-			writeaudit.Resource{Type: "skill", ID: result.ID},
-			writeaudit.Resource{Type: "skill_version", ID: initial.ID, ParentID: result.ID})
+		return auditpg.RecordWriteAudit(ctx, q, in.TenantID, writeaudit.ActionCreate, writeaudit.ResourceSkill, result.ID, "",
+			writeaudit.Resource{Type: writeaudit.ResourceSkill, ID: result.ID},
+			writeaudit.Resource{Type: writeaudit.ResourceSkillVersion, ID: initial.ID, ParentID: result.ID})
 	})
 	if err != nil {
 		return skills.Skill{}, translate(err)
@@ -87,8 +87,8 @@ func (s *Store) CreateVersion(ctx context.Context, in skills.NewVersion) (skills
 		if err := q.AdvanceSkillVersion(ctx, sqlc.AdvanceSkillVersionParams{TenantID: owner.TenantID, ID: owner.ID, MakeDefault: in.MakeDefault, Name: in.Name, Description: in.Description}); err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, in.TenantID, "upload_version", "skill_version", result.ID, result.SkillID,
-			writeaudit.Resource{Type: "skill_version", ID: result.ID, ParentID: result.SkillID})
+		return auditpg.RecordWriteAudit(ctx, q, in.TenantID, writeaudit.ActionUploadVersion, writeaudit.ResourceSkillVersion, result.ID, result.SkillID,
+			writeaudit.Resource{Type: writeaudit.ResourceSkillVersion, ID: result.ID, ParentID: result.SkillID})
 	})
 	if err != nil {
 		return skills.Version{}, translate(err)
@@ -116,7 +116,7 @@ func (s *Store) SetDefaultVersion(ctx context.Context, tenantID string, skillID
 			return err
 		}
 		result = skillFromRow(row)
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "update_default_version", "skill", result.ID, "")
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionUpdateDefaultVersion, writeaudit.ResourceSkill, result.ID, "")
 	})
 	if err != nil {
 		return skills.Skill{}, translate(err)
@@ -134,7 +134,7 @@ func (s *Store) DeleteSkill(ctx context.Context, tenantID string, skillID uuid.U
 		if _, err := q.DeleteSkill(ctx, sqlc.DeleteSkillParams{TenantID: tenant, ID: pgID(skillID)}); err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "delete", "skill", skills.FormatID(skillID), "")
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionDelete, writeaudit.ResourceSkill, skills.FormatID(skillID), "")
 	})
 	return translate(err)
 }
@@ -194,7 +194,7 @@ func (d *versionDeletion) ApplyVersionDeletion(decision skills.VersionDeletion)
 			}
 		}
 	}
-	return translate(auditpg.RecordWriteAudit(d.ctx, d.q, d.tenantID, "delete", "skill_version", decision.Target.ID, decision.Target.SkillID))
+	return translate(auditpg.RecordWriteAudit(d.ctx, d.q, d.tenantID, writeaudit.ActionDelete, writeaudit.ResourceSkillVersion, decision.Target.ID, decision.Target.SkillID))
 }
 
 func (s *Store) Skill(ctx context.Context, tenantID string, id uuid.UUID) (skills.Skill, error) {
diff --git a/services/core/internal/persistence/postgres/templatepg/store.go b/services/core/internal/persistence/postgres/templatepg/store.go
index b4afbb0dc..953324da9 100644
--- a/services/core/internal/persistence/postgres/templatepg/store.go
+++ b/services/core/internal/persistence/postgres/templatepg/store.go
@@ -23,7 +23,7 @@ import (
 )
 
 // resource names Templates in credential bindings and audit rows.
-const resource = "environment_template"
+const resource = string(writeaudit.ResourceEnvironmentTemplate)
 
 // Store implements environmenttemplates.Storage and environmenttemplates.Reader.
 type Store struct {
@@ -62,7 +62,7 @@ func (s *Store) Create(ctx context.Context, tenantID string, in environmenttempl
 		if result, err = template(metadataRow(row)); err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "create", resource, result.ID, "", writeaudit.Resource{Type: resource, ID: result.ID})
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionCreate, writeaudit.ResourceEnvironmentTemplate, result.ID, "", writeaudit.Resource{Type: writeaudit.ResourceEnvironmentTemplate, ID: result.ID})
 	})
 	return result, storageError(err)
 }
@@ -90,7 +90,7 @@ func (s *Store) Update(ctx context.Context, tenantID, templateID string, in envi
 		if result, err = template(metadataRow(row)); err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "update", resource, result.ID, "")
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionUpdate, writeaudit.ResourceEnvironmentTemplate, result.ID, "")
 	})
 	return result, storageError(err)
 }
@@ -108,7 +108,7 @@ func (s *Store) Delete(ctx context.Context, tenantID, templateID string) (string
 			return err
 		}
 		deleted = uuid.UUID(id.Bytes).String()
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "delete", resource, deleted, "")
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionDelete, writeaudit.ResourceEnvironmentTemplate, deleted, "")
 	})
 	if err != nil {
 		return "", storageError(err)
diff --git a/services/core/internal/persistence/postgres/vaultpg/credentials.go b/services/core/internal/persistence/postgres/vaultpg/credentials.go
index 478325ddd..852c0448e 100644
--- a/services/core/internal/persistence/postgres/vaultpg/credentials.go
+++ b/services/core/internal/persistence/postgres/vaultpg/credentials.go
@@ -5,16 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5/pgconn"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgconn"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 // CreateCredential admits the owning Vault in the insert itself, so a missing,
@@ -46,8 +45,8 @@ func (s *Store) CreateCredential(ctx context.Context, credential vaults.NewCrede
 		if created, err = credentialFromRow(row); err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, credential.TenantID, "create", "credential", created.ID, created.VaultID,
-			writeaudit.Resource{Type: "credential", ID: created.ID, ParentID: created.VaultID})
+		return auditpg.RecordWriteAudit(ctx, q, credential.TenantID, writeaudit.ActionCreate, writeaudit.ResourceCredential, created.ID, created.VaultID,
+			writeaudit.Resource{Type: writeaudit.ResourceCredential, ID: created.ID, ParentID: created.VaultID})
 	})
 	if err != nil {
 		return vaults.Credential{}, err
@@ -180,7 +179,7 @@ func (s *Store) ReplaceStaticToken(ctx context.Context, replacement vaults.Stati
 		if err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, replacement.TenantID, "update", "credential", updated.ID, updated.VaultID)
+		return auditpg.RecordWriteAudit(ctx, q, replacement.TenantID, writeaudit.ActionUpdate, writeaudit.ResourceCredential, updated.ID, updated.VaultID)
 	})
 	if err != nil {
 		return vaults.Credential{}, err
@@ -198,7 +197,7 @@ func (s *Store) DeleteCredential(ctx context.Context, key vaults.CredentialKey)
 			return err
 		}
 		deleted = uuid.UUID(id.Bytes).String()
-		return auditpg.RecordWriteAudit(ctx, q, key.TenantID, "delete", "credential", deleted, uuid.UUID(vault.Bytes).String())
+		return auditpg.RecordWriteAudit(ctx, q, key.TenantID, writeaudit.ActionDelete, writeaudit.ResourceCredential, deleted, uuid.UUID(vault.Bytes).String())
 	})
 	if err != nil {
 		return "", err
diff --git a/services/core/internal/persistence/postgres/vaultpg/oauth.go b/services/core/internal/persistence/postgres/vaultpg/oauth.go
index 07746fe9d..4131ed111 100644
--- a/services/core/internal/persistence/postgres/vaultpg/oauth.go
+++ b/services/core/internal/persistence/postgres/vaultpg/oauth.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"errors"
 
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 // WithOAuthCredential holds the Credential's row lock, once loaded, until
@@ -64,7 +64,7 @@ func (t *oauthTx) ApplyOAuthReplacement(ctx context.Context, grant vaults.OAuthG
 	if err != nil {
 		return vaults.Credential{}, err
 	}
-	if err := auditpg.RecordWriteAudit(ctx, t.q, t.tenantID, "update", "credential", updated.ID, updated.VaultID); err != nil {
+	if err := auditpg.RecordWriteAudit(ctx, t.q, t.tenantID, writeaudit.ActionUpdate, writeaudit.ResourceCredential, updated.ID, updated.VaultID); err != nil {
 		return vaults.Credential{}, translate(err)
 	}
 	return updated, nil
diff --git a/services/core/internal/persistence/postgres/vaultpg/vaultpg.go b/services/core/internal/persistence/postgres/vaultpg/vaultpg.go
index 1adb7e834..51bf0e2b0 100644
--- a/services/core/internal/persistence/postgres/vaultpg/vaultpg.go
+++ b/services/core/internal/persistence/postgres/vaultpg/vaultpg.go
@@ -6,10 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v5/pgtype"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
@@ -17,6 +13,9 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/textvalue"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
 )
 
 // Store runs on pooled connections and seals and opens the Credential
@@ -81,7 +80,7 @@ func (s *Store) CreateVault(ctx context.Context, vault vaults.NewVault) (vaults.
 		if err != nil {
 			return err
 		}
-		return auditpg.RecordWriteAudit(ctx, q, vault.TenantID, "create", "vault", created.ID, "", writeaudit.Resource{Type: "vault", ID: created.ID})
+		return auditpg.RecordWriteAudit(ctx, q, vault.TenantID, writeaudit.ActionCreate, writeaudit.ResourceVault, created.ID, "", writeaudit.Resource{Type: writeaudit.ResourceVault, ID: created.ID})
 	})
 	if err != nil {
 		return vaults.Vault{}, err
@@ -164,7 +163,7 @@ func (s *Store) DeleteVault(ctx context.Context, tenantID, vaultID string) (stri
 			return err
 		}
 		deleted = uuid.UUID(id.Bytes).String()
-		return auditpg.RecordWriteAudit(ctx, q, tenantID, "delete", "vault", deleted, "")
+		return auditpg.RecordWriteAudit(ctx, q, tenantID, writeaudit.ActionDelete, writeaudit.ResourceVault, deleted, "")
 	})
 	if err != nil {
 		return "", err
diff --git a/services/core/internal/processconfig/config.go b/services/core/internal/processconfig/config.go
index 23ab40c92..6a5b75edf 100644
--- a/services/core/internal/processconfig/config.go
+++ b/services/core/internal/processconfig/config.go
@@ -18,9 +18,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/uuid"
-	"golang.org/x/net/http/httpguts"
-
 	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/api"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/credentialcrypto"
@@ -30,6 +27,8 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/execution"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/oauthrefresh"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/google/uuid"
+	"golang.org/x/net/http/httpguts"
 )
 
 const (
@@ -167,16 +166,16 @@ func (c Config) Settings() []api.InstallationSetting {
 		origins = []string{}
 	}
 	return []api.InstallationSetting{
-		setting("public_url", c.PublicOrigin.String(), nil, []string{"core", "web"}),
-		setting("log.level", strings.ToLower(c.Log.Level.String()), "info", []string{"core", "web"}),
-		setting("log.format", format, "auto", []string{"core", "web"}),
-		setting("log.add_source", c.Log.AddSource, false, []string{"core", "web"}),
-		setting("core.execution_concurrency", c.ExecutionConcurrency, execution.DefaultExecutionConcurrency, []string{"core"}),
-		setting("core.harnesses", c.Harnesses, (engine.Catalog{}).Kinds(), []string{"core"}),
-		setting("core.default_harness", c.DefaultHarness, defaultHarness, []string{"core"}),
-		setting("core.write_audit_retention", duration(c.WriteAuditRetention), duration(defaultWriteAuditRetention), []string{"core"}),
-		setting("core.oauth_trusted_origins", origins, []string{}, []string{"core"}),
-		sensitive("core.runtime_history", c.RuntimeHistory.File != "", []string{"core"}),
+		setting("public_url", c.PublicOrigin.String(), nil, []api.InstallationService{api.InstallationCore, api.InstallationWeb}),
+		setting("log.level", strings.ToLower(c.Log.Level.String()), "info", []api.InstallationService{api.InstallationCore, api.InstallationWeb}),
+		setting("log.format", format, "auto", []api.InstallationService{api.InstallationCore, api.InstallationWeb}),
+		setting("log.add_source", c.Log.AddSource, false, []api.InstallationService{api.InstallationCore, api.InstallationWeb}),
+		setting("core.execution_concurrency", c.ExecutionConcurrency, execution.DefaultExecutionConcurrency, []api.InstallationService{api.InstallationCore}),
+		setting("core.harnesses", c.Harnesses, (engine.Catalog{}).Kinds(), []api.InstallationService{api.InstallationCore}),
+		setting("core.default_harness", c.DefaultHarness, defaultHarness, []api.InstallationService{api.InstallationCore}),
+		setting("core.write_audit_retention", duration(c.WriteAuditRetention), duration(defaultWriteAuditRetention), []api.InstallationService{api.InstallationCore}),
+		setting("core.oauth_trusted_origins", origins, []string{}, []api.InstallationService{api.InstallationCore}),
+		sensitive("core.runtime_history", c.RuntimeHistory.File != "", []api.InstallationService{api.InstallationCore}),
 	}
 }
 
@@ -193,11 +192,11 @@ func duration(d time.Duration) string {
 	return s
 }
 
-func setting(key string, value, fallback any, restarts []string) api.InstallationSetting {
+func setting(key string, value, fallback any, restarts []api.InstallationService) api.InstallationSetting {
 	return api.InstallationSetting{Key: key, Value: value, Default: fallback, Changeable: true, Sensitive: false, Restarts: restarts}
 }
 
-func sensitive(key string, configured bool, restarts []string) api.InstallationSetting {
+func sensitive(key string, configured bool, restarts []api.InstallationService) api.InstallationSetting {
 	return api.InstallationSetting{Key: key, Configured: &configured, Changeable: true, Sensitive: true, Restarts: restarts}
 }
 
diff --git a/services/core/internal/sandbox/deployment.go b/services/core/internal/sandbox/deployment.go
index 4b96acb13..42f9d38ca 100644
--- a/services/core/internal/sandbox/deployment.go
+++ b/services/core/internal/sandbox/deployment.go
@@ -9,6 +9,14 @@ import (
 	"regexp"
 )
 
+type DeploymentMode string
+
+const (
+	DeploymentUnconfigured DeploymentMode = ""
+	DeploymentNodes        DeploymentMode = "nodes"
+	DeploymentDirect       DeploymentMode = "direct"
+)
+
 // ValidationError preserves the sandbox error text and identity while identifying
 // a fixed configuration field and, for numeric limits, fixed inclusive bounds.
 type ValidationError struct {
@@ -111,7 +119,8 @@ func (s DeploymentSpec) Digest(provider string) string {
 // Description is what a provider registration says about a deployment of it:
 // its mode and its backend namespace fingerprint.
 type Description struct {
-	Mode, BackendFingerprint string
+	Mode               DeploymentMode
+	BackendFingerprint string
 }
 
 func BackendFingerprint(kind, namespace string) string {
diff --git a/services/core/internal/sandbox/deployment_contract.go b/services/core/internal/sandbox/deployment_contract.go
index da40c7ca3..ed929f458 100644
--- a/services/core/internal/sandbox/deployment_contract.go
+++ b/services/core/internal/sandbox/deployment_contract.go
@@ -41,7 +41,7 @@ var runtimeContract = []runtimeRule{
 
 // ProviderProjection is one registered Provider in the generated projections.
 type ProviderProjection struct {
-	Mode string `json:"mode"`
+	Mode DeploymentMode `json:"mode"`
 	DeploymentPolicy
 }
 
diff --git a/services/core/internal/sandbox/node/agent.go b/services/core/internal/sandbox/node/agent.go
index cb86b6eac..4a5c4abbf 100644
--- a/services/core/internal/sandbox/node/agent.go
+++ b/services/core/internal/sandbox/node/agent.go
@@ -164,7 +164,7 @@ func (a *agent) health(ctx context.Context, host *hostHealthSampler) (Health, er
 	h.Diagnostic = sandbox.NodeDiagnostic(e)
 	if e != nil && ctx.Err() != nil {
 		// A closing connection cancelled the probe; that says nothing about the provider.
-		h.Diagnostic = sandbox.NodeProviderUnavailable
+		h.Diagnostic = string(sandbox.NodeProviderUnavailable)
 	} else {
 		wasReady := a.ready.Swap(h.ProviderReady)
 		seen := a.healthSeen.Swap(true)
diff --git a/services/core/internal/sandbox/node/generations.go b/services/core/internal/sandbox/node/generations.go
index f538f0643..83354a61a 100644
--- a/services/core/internal/sandbox/node/generations.go
+++ b/services/core/internal/sandbox/node/generations.go
@@ -75,7 +75,7 @@ func NewGenerationManager(ctx context.Context, options GenerationManagerOptions)
 			cancel()
 			return nil, sandbox.ErrInvalid
 		}
-		m.values[ref.Generation] = &localGeneration{value: GenerationProvider{Generation: ref.Generation, SpecificationDigest: ref.SpecificationDigest}, state: "failed", diagnostic: sandbox.NodeProviderUnavailable, repairing: true}
+		m.values[ref.Generation] = &localGeneration{value: GenerationProvider{Generation: ref.Generation, SpecificationDigest: ref.SpecificationDigest}, state: "failed", diagnostic: string(sandbox.NodeProviderUnavailable), repairing: true}
 	}
 	for _, ref := range options.Collect {
 		if !validGeneration(ref.Generation) || !validSpecificationDigest(ref.SpecificationDigest) || m.values[ref.Generation] != nil {
diff --git a/services/core/internal/sandbox/node_diagnostic.go b/services/core/internal/sandbox/node_diagnostic.go
index efcdedc58..15527a4d2 100644
--- a/services/core/internal/sandbox/node_diagnostic.go
+++ b/services/core/internal/sandbox/node_diagnostic.go
@@ -32,19 +32,27 @@ func CheckCapacity(r Resources, cpus int, memory uint64) error {
 	return nil
 }
 
-// NodeProviderUnavailable also reports every readiness failure without a class.
-const NodeProviderUnavailable = "provider_unavailable"
+type NodeDiagnosticCode string
+
+const (
+	NodeProviderUnavailable     NodeDiagnosticCode = "provider_unavailable"
+	NodeHostUnsupported         NodeDiagnosticCode = "host_unsupported"
+	NodeArtifactsUnavailable    NodeDiagnosticCode = "artifacts_unavailable"
+	NodeRuntimeDownloadFailed   NodeDiagnosticCode = "runtime_download_failed"
+	NodeRuntimeImageUnavailable NodeDiagnosticCode = "runtime_image_unavailable"
+	NodeCapacityInsufficient    NodeDiagnosticCode = "capacity_insufficient"
+)
 
 var nodeDiagnostics = []struct {
 	err  error
-	code string
+	code NodeDiagnosticCode
 }{
 	{ErrProviderUnavailable, NodeProviderUnavailable},
-	{ErrHostUnsupported, "host_unsupported"},
-	{ErrArtifactsUnavailable, "artifacts_unavailable"},
-	{ErrRuntimeDownloadFailed, "runtime_download_failed"},
-	{ErrRuntimeImageUnavailable, "runtime_image_unavailable"},
-	{ErrCapacityInsufficient, "capacity_insufficient"},
+	{ErrHostUnsupported, NodeHostUnsupported},
+	{ErrArtifactsUnavailable, NodeArtifactsUnavailable},
+	{ErrRuntimeDownloadFailed, NodeRuntimeDownloadFailed},
+	{ErrRuntimeImageUnavailable, NodeRuntimeImageUnavailable},
+	{ErrCapacityInsufficient, NodeCapacityInsufficient},
 }
 
 // NodeDiagnostic maps a readiness probe result to its class code: empty when
@@ -55,10 +63,10 @@ func NodeDiagnostic(err error) string {
 	}
 	for _, d := range nodeDiagnostics {
 		if errors.Is(err, d.err) {
-			return d.code
+			return string(d.code)
 		}
 	}
-	return NodeProviderUnavailable
+	return string(NodeProviderUnavailable)
 }
 
 // NormalizeNodeDiagnostic keeps an empty or known code. Any other reported value
@@ -68,9 +76,9 @@ func NormalizeNodeDiagnostic(code string) string {
 		return code
 	}
 	for _, d := range nodeDiagnostics {
-		if code == d.code {
+		if code == string(d.code) {
 			return code
 		}
 	}
-	return NodeProviderUnavailable
+	return string(NodeProviderUnavailable)
 }
diff --git a/services/core/internal/sandbox/node_diagnostic_test.go b/services/core/internal/sandbox/node_diagnostic_test.go
index 84b199cd6..5da89625a 100644
--- a/services/core/internal/sandbox/node_diagnostic_test.go
+++ b/services/core/internal/sandbox/node_diagnostic_test.go
@@ -20,12 +20,12 @@ func TestNodeDiagnosticContract(t *testing.T) {
 	}
 	var codes []string
 	for _, diagnostic := range nodeDiagnostics {
-		codes = append(codes, diagnostic.code)
-		if got := NodeDiagnostic(fmt.Errorf("private probe detail: %w", diagnostic.err)); got != diagnostic.code {
-			t.Errorf("wrapped readiness cause = %q, want %q", got, diagnostic.code)
+		codes = append(codes, string(diagnostic.code))
+		if got := NodeDiagnostic(fmt.Errorf("private probe detail: %w", diagnostic.err)); got != string(diagnostic.code) {
+			t.Errorf("wrapped readiness cause = %q, want %q", got, string(diagnostic.code))
 		}
-		if got := NormalizeNodeDiagnostic(diagnostic.code); got != diagnostic.code {
-			t.Errorf("normalized readiness cause = %q, want %q", got, diagnostic.code)
+		if got := NormalizeNodeDiagnostic(string(diagnostic.code)); got != string(diagnostic.code) {
+			t.Errorf("normalized readiness cause = %q, want %q", got, string(diagnostic.code))
 		}
 	}
 	slices.Sort(codes)
@@ -36,7 +36,7 @@ func TestNodeDiagnosticContract(t *testing.T) {
 	if NodeDiagnostic(nil) != "" || NormalizeNodeDiagnostic("") != "" {
 		t.Fatal("ready state must have no diagnostic")
 	}
-	if NodeDiagnostic(errors.New("private probe detail")) != NodeProviderUnavailable || NormalizeNodeDiagnostic("future_code") != NodeProviderUnavailable {
+	if NodeDiagnostic(errors.New("private probe detail")) != string(NodeProviderUnavailable) || NormalizeNodeDiagnostic("future_code") != string(NodeProviderUnavailable) {
 		t.Fatal("unknown causes must remain provider_unavailable")
 	}
 }
diff --git a/services/core/internal/sandbox/providers/artifacts.go b/services/core/internal/sandbox/providers/artifacts.go
index 8db3baa16..d92cc90a0 100644
--- a/services/core/internal/sandbox/providers/artifacts.go
+++ b/services/core/internal/sandbox/providers/artifacts.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/providerassets"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
 var nodeProgram = providerassets.Artifact{Path: "native/bin/oac-node", Suffix: "sandbox-node", Role: "node"}
@@ -23,7 +24,7 @@ func (r *Registry) ArtifactCatalog() (map[string][]providerassets.Artifact, erro
 		if err != nil {
 			return nil, err
 		}
-		if a.Mode == "nodes" {
+		if a.Mode == sandbox.DeploymentNodes {
 			for _, item := range a.NodeArtifacts {
 				previous, exists := paths[item.Path]
 				if exists && previous != item || suffixes[item.Suffix] != "" && suffixes[item.Suffix] != item.Path {
diff --git a/services/core/internal/sandbox/providers/config.go b/services/core/internal/sandbox/providers/config.go
index 07b0359b1..f530a71e1 100644
--- a/services/core/internal/sandbox/providers/config.go
+++ b/services/core/internal/sandbox/providers/config.go
@@ -39,7 +39,7 @@ func (r *Registry) Build(config sandbox.NodeConfig, options sandbox.LocalOptions
 	if err != nil {
 		return nil, closeProvider, err
 	}
-	if adapter.Mode != "nodes" {
+	if adapter.Mode != sandbox.DeploymentNodes {
 		return nil, closeProvider, fmt.Errorf("%w: selected provider does not support node hosting", sandbox.ErrInvalid)
 	}
 	if config.Generation == 0 {
diff --git a/services/core/internal/sandbox/providers/registration.go b/services/core/internal/sandbox/providers/registration.go
index 2cf638f56..a4d68dea2 100644
--- a/services/core/internal/sandbox/providers/registration.go
+++ b/services/core/internal/sandbox/providers/registration.go
@@ -15,14 +15,14 @@ func ValidateRegistration(a Adapter) error {
 		return fmt.Errorf("%w: invalid registration %s", providercontract.ErrContract, field)
 	}
 	switch a.Mode {
-	case "nodes":
+	case sandbox.DeploymentNodes:
 		if err := validateNodeArtifacts(a.NodeArtifacts); err != nil {
 			return err
 		}
 		if a.BuildLocal == nil || a.BuildDirect != nil {
 			return invalid("node constructor")
 		}
-	case "direct":
+	case sandbox.DeploymentDirect:
 		if len(a.NodeArtifacts) != 0 {
 			return invalid("direct node artifacts")
 		}
@@ -53,7 +53,7 @@ func ValidateRegistration(a Adapter) error {
 	}
 	// The common lifecycle suspends only node allocations, so only a nodes
 	// registration may declare checkpoint support.
-	if operations["Initial"].State == providercontract.Supported && a.Mode != "nodes" {
+	if operations["Initial"].State == providercontract.Supported && a.Mode != sandbox.DeploymentNodes {
 		return invalid("checkpoint support outside nodes mode")
 	}
 	if a.Policy.DefaultResources != nil && a.ValidateResources(*a.Policy.DefaultResources) != nil {
diff --git a/services/core/internal/sandbox/providers/registry.go b/services/core/internal/sandbox/providers/registry.go
index fe936c38a..a39c0429f 100644
--- a/services/core/internal/sandbox/providers/registry.go
+++ b/services/core/internal/sandbox/providers/registry.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/providerassets"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/docker"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
@@ -22,7 +21,7 @@ type Adapter struct {
 	Configuration         sandbox.ConfigurationAdapter
 	BuildLocal            func(sandbox.NodeConfig, sandbox.LocalOptions, *sandbox.Built) (func(), error)
 	BuildDirect           func(sandbox.DirectConfig) (sandbox.SandboxProvider, error)
-	Mode                  string
+	Mode                  sandbox.DeploymentMode
 	Operations            func() providercontract.Operations
 	ValidateSpecification func(sandbox.DeploymentSpec) error
 	ValidateResources     func(sandbox.Resources) error
@@ -40,18 +39,18 @@ func Builtin() *Registry {
 	return &Registry{adapters: map[string]Adapter{
 		"docker": {
 			NodeArtifacts: []providerassets.Artifact{nodeProgram, runtimeImage, runtimePolicy},
-			Policy:        docker.Policy(), Operations: docker.Operations, Mode: "nodes", BuildLocal: docker.BuildNode,
+			Policy:        docker.Policy(), Operations: docker.Operations, Mode: sandbox.DeploymentNodes, BuildLocal: docker.BuildNode,
 			ValidateSpecification: docker.ValidateSpecification, ValidateResources: docker.ValidateResources,
 			Configuration: nodeConfigurationAdapter{docker.ValidateSpecification},
 		},
 		"microsandbox": {
 			NodeArtifacts: append([]providerassets.Artifact{nodeProgram, runtimeImage, runtimePolicy}, microsandbox.NodeArtifacts...),
-			Policy:        microsandbox.Policy(), Operations: microsandbox.Operations, Mode: "nodes", BuildLocal: microsandbox.BuildNode,
+			Policy:        microsandbox.Policy(), Operations: microsandbox.Operations, Mode: sandbox.DeploymentNodes, BuildLocal: microsandbox.BuildNode,
 			ValidateSpecification: microsandbox.ValidateSpecification, ValidateResources: microsandbox.ValidateResources,
 			Configuration: nodeConfigurationAdapter{microsandbox.ValidateSpecification},
 		},
 		"e2b": {
-			Policy: e2b.Policy(), Operations: e2b.Operations, Mode: "direct", BuildDirect: e2b.BuildDirect,
+			Policy: e2b.Policy(), Operations: e2b.Operations, Mode: sandbox.DeploymentDirect, BuildDirect: e2b.BuildDirect,
 			Configuration:         e2b.ConfigurationAdapter{},
 			ValidateSpecification: e2b.ValidateSpecification, ValidateResources: e2b.ValidateResources,
 		},
@@ -104,7 +103,7 @@ func (r *Registry) RetainedLimit(kind string, active, retained int) (int, error)
 	if err != nil {
 		return 0, err
 	}
-	if a.Mode == "nodes" && a.Operations()["Initial"].State != providercontract.Supported {
+	if a.Mode == sandbox.DeploymentNodes && a.Operations()["Initial"].State != providercontract.Supported {
 		return active, nil
 	}
 	return retained, nil
@@ -132,8 +131,8 @@ func (r *Registry) Describe(kind, installation string) (sandbox.Description, err
 	if e != nil {
 		return sandbox.Description{}, e
 	}
-	namespace := a.Mode
-	if a.Mode == "direct" {
+	namespace := string(a.Mode)
+	if a.Mode == sandbox.DeploymentDirect {
 		namespace = kind
 	}
 	return sandbox.Description{Mode: a.Mode, BackendFingerprint: sandbox.BackendFingerprint(kind, namespace+":"+installation)}, nil
diff --git a/services/core/internal/sandbox/providers/registry_test.go b/services/core/internal/sandbox/providers/registry_test.go
index bd6d1ac4f..47a0629bb 100644
--- a/services/core/internal/sandbox/providers/registry_test.go
+++ b/services/core/internal/sandbox/providers/registry_test.go
@@ -2,11 +2,12 @@ package providers
 
 import (
 	"errors"
+	"testing"
+
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
 	"github.com/google/uuid"
-	"testing"
 )
 
 func TestRegistrationOwnsDeploymentPolicy(t *testing.T) {
@@ -22,7 +23,7 @@ func TestRegistrationOwnsDeploymentPolicy(t *testing.T) {
 	} {
 		t.Run(tc.kind, func(t *testing.T) {
 			d, err := registry.Describe(tc.kind, installation)
-			if err != nil || d.Mode != tc.mode || d.BackendFingerprint != sandbox.BackendFingerprint(tc.kind, tc.namespace+":"+installation) {
+			if err != nil || string(d.Mode) != tc.mode || d.BackendFingerprint != sandbox.BackendFingerprint(tc.kind, tc.namespace+":"+installation) {
 				t.Fatalf("wrong mode or namespace: %+v %v", d, err)
 			}
 			a, err := registry.Lookup(tc.kind)
diff --git a/services/core/internal/sessions/creation.go b/services/core/internal/sessions/creation.go
index f53c6fca9..effe001a4 100644
--- a/services/core/internal/sessions/creation.go
+++ b/services/core/internal/sessions/creation.go
@@ -12,8 +12,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/uuid"
-
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
@@ -22,6 +20,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/metadata"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
 )
 
 // CreationStorage persists Session creation and finds an earlier one.
@@ -204,7 +203,7 @@ func (s *Service) createResources(ctx context.Context, tx CreationTx, session Se
 			return nil, err
 		}
 	}
-	created := []writeaudit.Resource{{Type: "session", ID: session.ID}}
+	created := []writeaudit.Resource{{Type: writeaudit.ResourceSession, ID: session.ID}}
 	creates, err := createsEnvironment(session.Configuration)
 	if err != nil {
 		return nil, err
@@ -214,7 +213,7 @@ func (s *Service) createResources(ctx context.Context, tx CreationTx, session Se
 		if environment, err = tx.CreateEnvironment(ctx); err != nil {
 			return nil, err
 		}
-		created = append(created, writeaudit.Resource{Type: "environment", ID: environment, ParentID: session.ID})
+		created = append(created, writeaudit.Resource{Type: writeaudit.ResourceEnvironment, ID: environment, ParentID: session.ID})
 	}
 	if hosted {
 		nodes, err := tx.LoadNodes(ctx)
@@ -299,7 +298,7 @@ func freezeSkills(ctx context.Context, tx CreationTx, setup environmentconfig.Se
 // and its provider bundle and completes it as stored. It also returns the
 // deployment provider revision to record, uuid.Nil for none. The projection is
 // creation metadata, never retry identity.
-func freezeProjection(session Session, frozen v1.SessionExecutionConfiguration, provider *v1.ModelProviderInput, providerSource string, revision uuid.UUID) (v1.SessionExecutionConfiguration, uuid.UUID, error) {
+func freezeProjection(session Session, frozen v1.SessionExecutionConfiguration, provider *v1.ModelProviderInput, providerSource v1.ExecutionSource, revision uuid.UUID) (v1.SessionExecutionConfiguration, uuid.UUID, error) {
 	model, err := ExecutionModel(session.Configuration)
 	if err != nil {
 		return v1.SessionExecutionConfiguration{}, uuid.Nil, err
@@ -310,24 +309,24 @@ func freezeProjection(session Session, frozen v1.SessionExecutionConfiguration,
 	}
 	recorded := uuid.Nil
 	switch frozen.ModelProvider.Source {
-	case "deployment":
+	case v1.ExecutionSourceDeployment:
 		if provider == nil {
 			return v1.SessionExecutionConfiguration{}, uuid.Nil, fmt.Errorf("%w: execution projection has no model provider", ErrInvalidInput)
 		}
 		// The deployment default is readable with the same Core key, so the
 		// safe view is recorded from the frozen bundle itself. Native options
 		// are never part of it.
-		frozen.ModelProvider.Status = "available"
+		frozen.ModelProvider.Status = v1.ExecutionProviderAvailable
 		frozen.ModelProvider.Configuration = provider.SafeView()
-		if providerSource == v1.ModelProviderSourceDeployment {
+		if providerSource == v1.ExecutionSourceDeployment {
 			recorded = revision
 		}
-	case "session", "agent":
-		if provider == nil || frozen.ModelProvider.Status != "available" || frozen.ModelProvider.Configuration == nil || *frozen.ModelProvider.Configuration != *provider.SafeView() {
+	case v1.ExecutionSourceSession, v1.ExecutionSourceAgent:
+		if provider == nil || frozen.ModelProvider.Status != v1.ExecutionProviderAvailable || frozen.ModelProvider.Configuration == nil || *frozen.ModelProvider.Configuration != *provider.SafeView() {
 			return v1.SessionExecutionConfiguration{}, uuid.Nil, fmt.Errorf("%w: execution projection does not match model provider", ErrInvalidInput)
 		}
-	case "unknown":
-		frozen.ModelProvider.Status = "unavailable"
+	case v1.ExecutionSourceUnknown:
+		frozen.ModelProvider.Status = v1.ExecutionProviderUnavailable
 		frozen.ModelProvider.Configuration = nil
 	default:
 		return v1.SessionExecutionConfiguration{}, uuid.Nil, fmt.Errorf("%w: invalid execution projection source", ErrInvalidInput)
@@ -340,9 +339,9 @@ func sameExecutionValue(a, b *string) bool {
 	return a == nil && b == nil || a != nil && b != nil && *a == *b
 }
 
-func validExecutionSource(source string) bool {
+func validExecutionSource(source v1.ExecutionSource) bool {
 	switch source {
-	case "session", "agent", "deployment", "unknown":
+	case v1.ExecutionSourceSession, v1.ExecutionSourceAgent, v1.ExecutionSourceDeployment, v1.ExecutionSourceUnknown:
 		return true
 	}
 	return false
@@ -411,7 +410,7 @@ func prepareCreation(input CreateSession, fingerprint func(string) (string, erro
 	// is set, replaced or removed.
 	var fingerprinted *v1.ModelProviderInput
 	hashed := configuration
-	if input.ModelProviderSource == v1.ModelProviderSourceDeployment {
+	if input.ModelProviderSource == v1.ExecutionSourceDeployment {
 		hashed = requested
 	} else if fingerprinted, err = fingerprintedProvider(input.ModelProvider, fingerprint); err != nil {
 		return NewSession{}, nil, nil, err
diff --git a/services/core/internal/sessions/creation_test.go b/services/core/internal/sessions/creation_test.go
index 7d9cc4524..16f7359ba 100644
--- a/services/core/internal/sessions/creation_test.go
+++ b/services/core/internal/sessions/creation_test.go
@@ -11,8 +11,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/uuid"
-
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
@@ -20,6 +18,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
 )
 
 // fakeCreationTx is fakeInputTx with the creation methods, equally strict.
@@ -80,7 +79,7 @@ func (f *fakeCreationTx) SaveModelExecution(_ context.Context, provider v1.Model
 }
 
 func (f *fakeCreationTx) SaveExecutionConfiguration(_ context.Context, projection v1.SessionExecutionConfiguration, revision uuid.UUID) error {
-	f.record("SaveExecutionConfiguration", f.saveExecutionConfiguration != nil, projection.ModelProvider.Status, revision.String())
+	f.record("SaveExecutionConfiguration", f.saveExecutionConfiguration != nil, string(projection.ModelProvider.Status), revision.String())
 	return f.saveExecutionConfiguration()
 }
 
@@ -111,7 +110,7 @@ func (f *fakeCreationTx) PruneChanges(context.Context) error {
 func (f *fakeCreationTx) AuditCreation(_ context.Context, created ...writeaudit.Resource) error {
 	var resources []string
 	for _, resource := range created {
-		resources = append(resources, strings.TrimSuffix(resource.Type+":"+resource.ID+":"+resource.ParentID, ":"))
+		resources = append(resources, strings.TrimSuffix(string(resource.Type)+":"+resource.ID+":"+resource.ParentID, ":"))
 	}
 	f.record("AuditCreation", f.auditCreation != nil, resources...)
 	return f.auditCreation()
@@ -176,7 +175,7 @@ func TestPrepareCreation(t *testing.T) {
 		}
 		return session
 	}
-	withProvider := func(environment, key, source string) func(*CreateSession) {
+	withProvider := func(environment, key string, source v1.ExecutionSource) func(*CreateSession) {
 		return func(input *CreateSession) {
 			copy := *provider
 			copy.APIKey = key
@@ -204,7 +203,7 @@ func TestPrepareCreation(t *testing.T) {
 	if prepare(t, withProvider("self_hosted", "one", "session"), fingerprints).RequestHash == prepare(t, withProvider("self_hosted", "two", "session"), fingerprints).RequestHash {
 		t.Fatal("caller keys share an identity")
 	}
-	deployed := prepare(t, withProvider("none", "deployment-key", v1.ModelProviderSourceDeployment), failing)
+	deployed := prepare(t, withProvider("none", "deployment-key", v1.ExecutionSourceDeployment), failing)
 	plain := prepare(t, func(input *CreateSession) { input.Configuration = creationInput("none").Configuration }, failing)
 	if !strings.Contains(string(deployed.Configuration), `"model_provider_configured":true`) || deployed.RequestHash != plain.RequestHash {
 		t.Fatalf("the deployment default joined the identity: %s", deployed.Configuration)
@@ -227,7 +226,7 @@ func TestPrepareCreation(t *testing.T) {
 		}, fingerprints, ErrInvalidInput},
 		"configuration array":    {func(input *CreateSession) { input.Configuration = json.RawMessage(`[]`) }, fingerprints, ErrInvalidInput},
 		"cancel initial input":   {func(input *CreateSession) { input.InitialInputs = []Input{cancelInput} }, fingerprints, ErrInvalidInput},
-		"deployment self_hosted": {withProvider("self_hosted", "key", v1.ModelProviderSourceDeployment), fingerprints, ErrInvalidInput},
+		"deployment self_hosted": {withProvider("self_hosted", "key", v1.ExecutionSourceDeployment), fingerprints, ErrInvalidInput},
 		"fingerprint failure":    {withProvider("self_hosted", "key", "session"), failing, errFingerprint},
 		"unreadable intent":      {func(input *CreateSession) { input.CreationRequest = json.RawMessage(`[]`) }, fingerprints, ErrInvalidInput},
 	} {
@@ -281,7 +280,7 @@ func TestFreezeProjection(t *testing.T) {
 	model, harness := "gpt", "codex"
 	session := Session{ID: "session", Engine: harness, Configuration: json.RawMessage(`{"agent":{"model":"gpt"}}`)}
 	revision := uuid.New()
-	projection := func(source, status string, view *v1.ModelProviderView) v1.SessionExecutionConfiguration {
+	projection := func(source v1.ExecutionSource, status v1.ExecutionProviderStatus, view *v1.ModelProviderView) v1.SessionExecutionConfiguration {
 		return v1.SessionExecutionConfiguration{
 			Model: v1.ExecutionSelection{Value: &model, Source: "session"}, Harness: v1.ExecutionSelection{Value: &harness, Source: "agent"},
 			ModelProvider: v1.ExecutionProviderSelection{Source: source, Status: status, Configuration: view},
@@ -293,13 +292,13 @@ func TestFreezeProjection(t *testing.T) {
 	for name, test := range map[string]struct {
 		projection   v1.SessionExecutionConfiguration
 		provider     *v1.ModelProviderInput
-		source       string
-		status       string
+		source       v1.ExecutionSource
+		status       v1.ExecutionProviderStatus
 		revision     uuid.UUID
 		want         error
 		hasProjected bool
 	}{
-		"deployment records its revision":  {projection("deployment", "", nil), provider, v1.ModelProviderSourceDeployment, "available", revision, nil, true},
+		"deployment records its revision":  {projection("deployment", "", nil), provider, v1.ExecutionSourceDeployment, "available", revision, nil, true},
 		"deployment from another source":   {projection("deployment", "", nil), provider, "session", "available", uuid.Nil, nil, true},
 		"deployment without a provider":    {projection("deployment", "", nil), nil, "", "", uuid.Nil, ErrInvalidInput, false},
 		"caller provider matches":          {projection("session", "available", provider.SafeView()), provider, "session", "available", uuid.Nil, nil, true},
diff --git a/services/core/internal/sessions/execution_configuration.go b/services/core/internal/sessions/execution_configuration.go
index 6065dbe97..9349ada3a 100644
--- a/services/core/internal/sessions/execution_configuration.go
+++ b/services/core/internal/sessions/execution_configuration.go
@@ -16,15 +16,15 @@ func NormalizeExecutionProjection(projection *v1.SessionExecutionConfiguration,
 	projection.Object = "agent.session.execution_configuration"
 	projection.SchemaVersion = 1
 	if projection.HarnessConfig.Source == "" {
-		projection.HarnessConfig.Source = "unknown"
+		projection.HarnessConfig.Source = v1.ExecutionSourceUnknown
 	}
 	projection.HarnessConfig.Value = v1.ResolvedHarnessConfig(projection.HarnessConfig.Value)
 	projection.SessionID = sessionID
-	if projection.ModelProvider.Source == "deployment" && (projection.ModelProvider.Status != "available" || projection.ModelProvider.Configuration == nil) {
+	if projection.ModelProvider.Source == v1.ExecutionSourceDeployment && (projection.ModelProvider.Status != v1.ExecutionProviderAvailable || projection.ModelProvider.Configuration == nil) {
 		// Sessions created before deployment defaults moved into Core stay redacted.
-		projection.ModelProvider.Status = "redacted"
+		projection.ModelProvider.Status = v1.ExecutionProviderRedacted
 		projection.ModelProvider.Configuration = nil
-	} else if projection.ModelProvider.Status != "available" {
+	} else if projection.ModelProvider.Status != v1.ExecutionProviderAvailable {
 		projection.ModelProvider.Configuration = nil
 	}
 }
diff --git a/services/core/internal/sessions/reads.go b/services/core/internal/sessions/reads.go
index 9f4a167bd..016220a83 100644
--- a/services/core/internal/sessions/reads.go
+++ b/services/core/internal/sessions/reads.go
@@ -8,6 +8,14 @@ import (
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 )
 
+type ManagedArchiveState string
+
+const (
+	ManagedArchiveActive         ManagedArchiveState = "active"
+	ManagedArchiveCleanupPending ManagedArchiveState = "cleanup_pending"
+	ManagedArchiveReleased       ManagedArchiveState = "released"
+)
+
 // SessionReader reads Sessions, their public change journal and their
 // diagnostics.
 type SessionReader interface {
@@ -67,7 +75,7 @@ type TurnDiagnosticsSnapshot struct {
 // ManagedArchive reports resource disposal, not archive request provenance
 // or Turn settlement. Existing expiry and failed provisioning use the same states.
 type ManagedArchive struct {
-	SessionID     string `json:"session_id" binding:"required"`
-	EnvironmentID string `json:"environment_id" binding:"required"`
-	State         string `json:"state" enums:"active,cleanup_pending,released" binding:"required"`
+	SessionID     string              `json:"session_id" binding:"required"`
+	EnvironmentID string              `json:"environment_id" binding:"required"`
+	State         ManagedArchiveState `json:"state" binding:"required"`
 }
diff --git a/services/core/internal/sessions/session.go b/services/core/internal/sessions/session.go
index eb43abedc..9ce349aa4 100644
--- a/services/core/internal/sessions/session.go
+++ b/services/core/internal/sessions/session.go
@@ -7,12 +7,12 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/google/uuid"
-
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/environmentconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/metadata"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/writeaudit"
+	"github.com/google/uuid"
 )
 
 var enginePattern = regexp.MustCompile(`^[a-z][a-z0-9_-]{0,63}$`)
@@ -46,7 +46,7 @@ type CreateSession struct {
 	DeploymentProviderRevision uuid.UUID `json:"-"`
 	ExecutionConfiguration     *v1.SessionExecutionConfiguration
 	ModelProvider              *v1.ModelProviderInput
-	ModelProviderSource        string // session, agent or deployment; empty allows only openai_hosted
+	ModelProviderSource        v1.ExecutionSource // session, agent or deployment; empty allows only openai_hosted
 	Initialization             environmentconfig.Setup
 	InitialFiles               []environmentconfig.InitialFile
 	Creator                    identity.Subject
@@ -185,7 +185,7 @@ type AuditSessionOperationCommand struct {
 // replay on the visible Session. It cannot create ownership or admit execution
 // work. Another action is ErrInvalidInput.
 func (s *Service) AuditSessionOperation(ctx context.Context, command AuditSessionOperationCommand) error {
-	if command.Action != "create" && command.Action != "send_events" {
+	if command.Action != string(writeaudit.ActionCreate) && command.Action != string(writeaudit.ActionSendEvents) {
 		return ErrInvalidInput
 	}
 	return s.storage.AuditSessionOperation(ctx, command.TenantID, command.SessionID, command.Action)
diff --git a/services/core/internal/writeaudit/reader.go b/services/core/internal/writeaudit/reader.go
index 367f752df..0b8629e8b 100644
--- a/services/core/internal/writeaudit/reader.go
+++ b/services/core/internal/writeaudit/reader.go
@@ -36,15 +36,15 @@ type ResourceOwner struct {
 
 // Operation is one committed write.
 type Operation struct {
-	ID           string    `json:"id" binding:"required"`
-	Action       string    `json:"action" enums:"create,update,delete,send_events,upload_file,upload_version,update_default_version" binding:"required"`
-	ResourceType string    `json:"resource_type" enums:"agent,session,environment,environment_template,skill,skill_version,file,vault,credential,artifact" binding:"required"`
-	ResourceID   string    `json:"resource_id" binding:"required"`
-	ParentID     string    `json:"parent_id" binding:"required"`
-	RequestID    string    `json:"request_id" binding:"required"`
-	TraceID      string    `json:"trace_id" binding:"required"`
-	APIKey       APIKey    `json:"api_key" binding:"required"`
-	CreatedAt    time.Time `json:"created_at" binding:"required"`
+	ID           string       `json:"id" binding:"required"`
+	Action       Action       `json:"action" binding:"required"`
+	ResourceType ResourceType `json:"resource_type" binding:"required"`
+	ResourceID   string       `json:"resource_id" binding:"required"`
+	ParentID     string       `json:"parent_id" binding:"required"`
+	RequestID    string       `json:"request_id" binding:"required"`
+	TraceID      string       `json:"trace_id" binding:"required"`
+	APIKey       APIKey       `json:"api_key" binding:"required"`
+	CreatedAt    time.Time    `json:"created_at" binding:"required"`
 }
 
 // Filter selects committed writes, newest first. A zero Limit is the default
diff --git a/services/core/internal/writeaudit/record.go b/services/core/internal/writeaudit/record.go
index e7a256a9e..155d0baf1 100644
--- a/services/core/internal/writeaudit/record.go
+++ b/services/core/internal/writeaudit/record.go
@@ -15,14 +15,44 @@ import (
 // vocabulary. The write it belongs to fails closed.
 var ErrInvalidSource = errors.New("invalid write audit source")
 
+type ResourceType string
+
+const (
+	ResourceAgent               ResourceType = "agent"
+	ResourceSession             ResourceType = "session"
+	ResourceEnvironment         ResourceType = "environment"
+	ResourceEnvironmentTemplate ResourceType = "environment_template"
+	ResourceSkill               ResourceType = "skill"
+	ResourceSkillVersion        ResourceType = "skill_version"
+	ResourceFile                ResourceType = "file"
+	ResourceVault               ResourceType = "vault"
+	ResourceCredential          ResourceType = "credential"
+	ResourceArtifact            ResourceType = "artifact"
+)
+
+type Action string
+
+const (
+	ActionCreate               Action = "create"
+	ActionUpdate               Action = "update"
+	ActionDelete               Action = "delete"
+	ActionSendEvents           Action = "send_events"
+	ActionUploadFile           Action = "upload_file"
+	ActionUploadVersion        Action = "upload_version"
+	ActionUpdateDefaultVersion Action = "update_default_version"
+)
+
 // Resource identifies a resource genuinely created by the current transaction.
-type Resource struct{ Type, ID, ParentID string }
+type Resource struct {
+	Type         ResourceType
+	ID, ParentID string
+}
 
 // ValidResourceType reports whether value is an audited resource type. The list
 // is closed; recording and owner queries share it.
 func ValidResourceType(value string) bool {
-	switch value {
-	case "agent", "session", "environment", "environment_template", "skill", "skill_version", "file", "vault", "credential", "artifact":
+	switch ResourceType(value) {
+	case ResourceAgent, ResourceSession, ResourceEnvironment, ResourceEnvironmentTemplate, ResourceSkill, ResourceSkillVersion, ResourceFile, ResourceVault, ResourceCredential, ResourceArtifact:
 		return true
 	}
 	return false
@@ -46,17 +76,17 @@ func (s Source) Validate(tenant string) error {
 // ValidateRecord checks a write record in tenant: source must be well-formed
 // provenance from tenant, action an audited write action, and every resource
 // an audited resource.
-func ValidateRecord(source Source, tenant, action string, resources []Resource) error {
+func ValidateRecord(source Source, tenant string, action Action, resources []Resource) error {
 	if err := source.Validate(tenant); err != nil {
 		return err
 	}
 	switch action {
-	case "create", "update", "delete", "send_events", "upload_file", "upload_version", "update_default_version":
+	case ActionCreate, ActionUpdate, ActionDelete, ActionSendEvents, ActionUploadFile, ActionUploadVersion, ActionUpdateDefaultVersion:
 	default:
 		return fmt.Errorf("%w: invalid action", ErrInvalidSource)
 	}
 	for _, resource := range resources {
-		if !ValidResourceType(resource.Type) || !ValidText(resource.ID, 256, true) || !ValidText(resource.ParentID, 256, false) {
+		if !ValidResourceType(string(resource.Type)) || !ValidText(resource.ID, 256, true) || !ValidText(resource.ParentID, 256, false) {
 			return fmt.Errorf("%w: invalid resource", ErrInvalidSource)
 		}
 	}
diff --git a/services/core/internal/writeaudit/record_test.go b/services/core/internal/writeaudit/record_test.go
index 12b721844..ce8d4a5c3 100644
--- a/services/core/internal/writeaudit/record_test.go
+++ b/services/core/internal/writeaudit/record_test.go
@@ -41,7 +41,7 @@ func TestValidateRecord(t *testing.T) {
 	} {
 		source, action, resources := issuedSource(tenant), "create", agent
 		change(&source, &action, &resources)
-		if err := ValidateRecord(source, tenant, action, resources); !errors.Is(err, ErrInvalidSource) {
+		if err := ValidateRecord(source, tenant, Action(action), resources); !errors.Is(err, ErrInvalidSource) {
 			t.Errorf("%s accepted: %v", name, err)
 		}
 	}
diff --git a/services/core/tests/integration/admin_session_archive_test.go b/services/core/tests/integration/admin_session_archive_test.go
index a36c7290c..810a5ee48 100644
--- a/services/core/tests/integration/admin_session_archive_test.go
+++ b/services/core/tests/integration/admin_session_archive_test.go
@@ -83,7 +83,7 @@ func TestManagedSessionArchiveUnallocatedAndGuards(t *testing.T) {
 	tenant, session := managedArchiveSession(t, s, input)
 	ctx := adminDeleteContext(t.Context(), tenant, uuid.NewString())
 	active, err := sessionAdapter(s).GetManagedSessionArchive(t.Context(), tenant, session.ID)
-	if err != nil || active.State != "active" || active.SessionID != session.ID || active.EnvironmentID != session.Environment.ID {
+	if err != nil || active.State != sessions.ManagedArchiveActive || active.SessionID != session.ID || active.EnvironmentID != session.Environment.ID {
 		t.Fatal("unallocated Session status", active, err)
 	}
 	for _, generation := range []uint64{0, 2, ^uint64(0)} {
@@ -107,7 +107,7 @@ func TestManagedSessionArchiveUnallocatedAndGuards(t *testing.T) {
 		t.Fatal("foreign status", err)
 	}
 	result, err := deploymentExecution(t, w).ArchiveSession(ctx, tenant, session.ID, 1)
-	if err != nil || result.State != "released" {
+	if err != nil || result.State != sessions.ManagedArchiveReleased {
 		t.Fatal("unallocated archive", result, err)
 	}
 	row, err := sessionAdapter(s).GetSession(t.Context(), tenant, session.ID)
@@ -160,7 +160,7 @@ func TestManagedSessionArchiveRetainsHistoryAndSettledResources(t *testing.T) {
 	history := adminMutationSnapshot(t, s, "sessions", "turns", "session_items", "session_artifacts", "source_files", "pg_largeobject", "pg_largeobject_metadata")
 	request := uuid.NewString()
 	result, err := deploymentExecution(t, w).ArchiveSession(adminDeleteContext(t.Context(), tenant, request), tenant, session.ID, 1)
-	if err != nil || result.State != "cleanup_pending" {
+	if err != nil || result.State != sessions.ManagedArchiveCleanupPending {
 		t.Fatal(result, err)
 	}
 	assertAdminMutationAudit(t, s, tenant, request, "archive", "session", session.ID)
@@ -190,7 +190,7 @@ func TestManagedSessionArchiveRetainsHistoryAndSettledResources(t *testing.T) {
 	if _, err := deploymentExecution(t, w).ReleaseAllocation(t.Context(), owner); err != nil {
 		t.Fatal(err)
 	}
-	if result, err := sessionAdapter(s).GetManagedSessionArchive(t.Context(), tenant, session.ID); err != nil || result.State != "released" {
+	if result, err := sessionAdapter(s).GetManagedSessionArchive(t.Context(), tenant, session.ID); err != nil || result.State != sessions.ManagedArchiveReleased {
 		t.Fatal("release not reflected", result, err)
 	}
 	page, err := sessionAdapter(s).ListSessionArtifacts(t.Context(), tenant, session.ID, "", "", 100, true)
diff --git a/services/core/tests/integration/fixtures_test.go b/services/core/tests/integration/fixtures_test.go
index bf530806d..c3bb5605b 100644
--- a/services/core/tests/integration/fixtures_test.go
+++ b/services/core/tests/integration/fixtures_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
@@ -40,7 +39,7 @@ func WithFixtureModelProvider(input sessions.CreateSession) sessions.CreateSessi
 	if input.ModelProvider != nil || json.Unmarshal(input.Configuration, &configuration) != nil || !v1.ModelProviderRequired(configuration.Environment.Type) {
 		return input
 	}
-	input.ModelProvider, input.ModelProviderSource = FixtureModelProvider(input.Engine), v1.ModelProviderSourceSession
+	input.ModelProvider, input.ModelProviderSource = FixtureModelProvider(input.Engine), v1.ExecutionSourceSession
 	if input.ExecutionConfiguration != nil {
 		projection := *input.ExecutionConfiguration
 		projection.ModelProvider = v1.ExecutionProviderSelection{Source: "session", Status: "available", Configuration: input.ModelProvider.SafeView()}
diff --git a/services/core/tests/integration/function_execution_native_test.go b/services/core/tests/integration/function_execution_native_test.go
index 96844b3d4..529694868 100644
--- a/services/core/tests/integration/function_execution_native_test.go
+++ b/services/core/tests/integration/function_execution_native_test.go
@@ -14,7 +14,7 @@ func TestNativeFunctionExecutionPersistsCallsResultsAndContinuity(t *testing.T)
 	model, output, requests := nativeFunctionModel(t, home)
 	defer model.Close()
 	var err error
-	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "native-functions", Configuration: json.RawMessage(functionConfiguration), ModelProvider: nativeModelProvider(model), ModelProviderSource: v1.ModelProviderSourceDeployment})
+	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "native-functions", Configuration: json.RawMessage(functionConfiguration), ModelProvider: nativeModelProvider(model), ModelProviderSource: v1.ExecutionSourceDeployment})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/native_environment_test.go b/services/core/tests/integration/native_environment_test.go
index dc02c61a2..3b7dd9ac7 100644
--- a/services/core/tests/integration/native_environment_test.go
+++ b/services/core/tests/integration/native_environment_test.go
@@ -98,7 +98,7 @@ func TestNativeNoExecutionEnvironment(t *testing.T) {
 	provider := nativeModelProvider(model)
 	config, _ := json.Marshal(map[string]any{"agent": map[string]string{"model": "gpt-5.5", "instructions": "Keep this instruction."}, "environment": map[string]string{"type": "none"}})
 	var err error
-	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "native-session", Configuration: config, ModelProvider: provider, ModelProviderSource: v1.ModelProviderSourceDeployment})
+	h.session, err = h.s.CreateSession(ctx, h.tenant, sessions.CreateSession{Creator: FixtureCreator(), Engine: "codex", IdempotencyKey: "native-session", Configuration: config, ModelProvider: provider, ModelProviderSource: v1.ExecutionSourceDeployment})
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/services/core/tests/integration/node_diagnostic_contract_test.go b/services/core/tests/integration/node_diagnostic_contract_test.go
index 6d742c8ed..88cb7ce96 100644
--- a/services/core/tests/integration/node_diagnostic_contract_test.go
+++ b/services/core/tests/integration/node_diagnostic_contract_test.go
@@ -5,12 +5,11 @@ import (
 	"os"
 	"reflect"
 	"slices"
-	"strings"
 	"testing"
 
-	"gopkg.in/yaml.v3"
-
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"gopkg.in/yaml.v3"
 )
 
 func TestNodeDiagnosticSchemaContract(t *testing.T) {
@@ -35,7 +34,9 @@ func TestNodeDiagnosticSchemaContract(t *testing.T) {
 		if !ok {
 			t.Fatalf("%s has no Diagnostic field", model.Name())
 		}
-		check(model.Name(), strings.Split(field.Tag.Get("enums"), ","))
+		if field.Type != reflect.TypeFor[sandbox.NodeDiagnosticCode]() {
+			t.Errorf("%s diagnostic must use the canonical code type", model.Name())
+		}
 	}
 	raw, err = os.ReadFile("../../../../contracts/agents-api/core.openapi.yaml")
 	if err != nil {
@@ -43,15 +44,27 @@ func TestNodeDiagnosticSchemaContract(t *testing.T) {
 	}
 	var document struct {
 		Definitions map[string]struct {
+			Enum       []string `yaml:"enum"`
 			Properties map[string]struct {
-				Enum []string `yaml:"enum"`
+				Ref   string `yaml:"$ref"`
+				AllOf []struct {
+					Ref string `yaml:"$ref"`
+				} `yaml:"allOf"`
 			} `yaml:"properties"`
 		} `yaml:"definitions"`
 	}
 	if err := yaml.Unmarshal(raw, &document); err != nil {
 		t.Fatal(err)
 	}
+	check("sandbox.NodeDiagnosticCode", document.Definitions["sandbox.NodeDiagnosticCode"].Enum)
 	for _, name := range []string{"deployment.Node", "deployment.NodeDetail", "deployment.NodeRollout"} {
-		check(name, document.Definitions[name].Properties["diagnostic"].Enum)
+		field := document.Definitions[name].Properties["diagnostic"]
+		ref := field.Ref
+		if len(field.AllOf) == 1 {
+			ref = field.AllOf[0].Ref
+		}
+		if ref != "#/definitions/sandbox.NodeDiagnosticCode" {
+			t.Errorf("%s diagnostic does not reference the canonical enum", name)
+		}
 	}
 }
diff --git a/services/core/tests/integration/sandbox_generations_test.go b/services/core/tests/integration/sandbox_generations_test.go
index af3147a55..580459b2a 100644
--- a/services/core/tests/integration/sandbox_generations_test.go
+++ b/services/core/tests/integration/sandbox_generations_test.go
@@ -6,13 +6,11 @@ import (
 	"testing"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/e2b"
-
+	"github.com/google/uuid"
 	"github.com/jackc/pgx/v5/stdlib"
 	"github.com/pressly/goose/v3"
-
-	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
-	"github.com/google/uuid"
 )
 
 func TestE2BGenerationsRetainOwnershipAndUseCurrentCredential(t *testing.T) {
@@ -291,14 +289,14 @@ func TestSandboxSnapshotRolloutEquivalence(t *testing.T) {
 		t.Run(state, func(t *testing.T) {
 			connection := onlineManagerNode(t, s, node.NodeID)
 			want := deployment.RolloutNodes{}
-			wantState := "settled"
+			wantState := deployment.RolloutSettled
 			switch state {
 			case "ready":
 				want.Ready = 1
 			case "preparing":
 				heartbeat(connection, "preparing")
 				want.Preparing = 1
-				wantState = "preparing"
+				wantState = deployment.RolloutPreparing
 			case "failed":
 				heartbeat(connection, "failed")
 				want.Failed = 1
diff --git a/services/core/tests/integration/session_execution_configuration_test.go b/services/core/tests/integration/session_execution_configuration_test.go
index 4816546f2..54dea62c3 100644
--- a/services/core/tests/integration/session_execution_configuration_test.go
+++ b/services/core/tests/integration/session_execution_configuration_test.go
@@ -23,8 +23,8 @@ func executionProjectionInput(source string) sessions.CreateSession {
 		Creator: FixtureCreator(), Engine: harness, IdempotencyKey: uuid.NewString(),
 		Configuration: []byte(`{"agent":{"model":"frozen-model"},"environment":{"type":"openai_hosted"}}`),
 		ExecutionConfiguration: &v1.SessionExecutionConfiguration{
-			Model:         v1.ExecutionSelection{Value: &model, Source: source},
-			Harness:       v1.ExecutionSelection{Value: &harness, Source: source},
+			Model:         v1.ExecutionSelection{Value: &model, Source: v1.ExecutionSource(source)},
+			Harness:       v1.ExecutionSelection{Value: &harness, Source: v1.ExecutionSource(source)},
 			ModelProvider: v1.ExecutionProviderSelection{Source: "unknown", Status: "unavailable"},
 		},
 	}
@@ -39,7 +39,7 @@ func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testi
 				tenant := uuid.NewString()
 				input := executionProjectionInput(source)
 				input.ModelProvider = &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://private-deployment.example/v1", APIKey: "private-projection-key-canary"}
-				input.ExecutionConfiguration.ModelProvider = v1.ExecutionProviderSelection{Source: source, Status: "available", Configuration: input.ModelProvider.SafeView()}
+				input.ExecutionConfiguration.ModelProvider = v1.ExecutionProviderSelection{Source: v1.ExecutionSource(source), Status: "available", Configuration: input.ModelProvider.SafeView()}
 				input.ExecutionConfiguration.Object = "untrusted-object"
 				input.ExecutionConfiguration.SchemaVersion = 99
 				input.ExecutionConfiguration.SessionID = "untrusted-session"
@@ -60,7 +60,7 @@ func TestSessionExecutionConfigurationFrozenAcrossCreationPathsAndRetry(t *testi
 				if err != nil {
 					t.Fatal(err)
 				}
-				if frozen.Object != "agent.session.execution_configuration" || frozen.SchemaVersion != 1 || frozen.SessionID != session.ID || frozen.Model.Source != source || frozen.Harness.Source != source {
+				if frozen.Object != "agent.session.execution_configuration" || frozen.SchemaVersion != 1 || frozen.SessionID != session.ID || frozen.Model.Source != v1.ExecutionSource(source) || frozen.Harness.Source != v1.ExecutionSource(source) {
 					t.Fatal("incorrect frozen projection identity or provenance")
 				}
 				// Deployment defaults are readable with the same Core key, so every
diff --git a/services/core/tests/integration/unified_model_configuration_http_test.go b/services/core/tests/integration/unified_model_configuration_http_test.go
index 70d5dd009..3fa13586f 100644
--- a/services/core/tests/integration/unified_model_configuration_http_test.go
+++ b/services/core/tests/integration/unified_model_configuration_http_test.go
@@ -109,7 +109,7 @@ func TestUnifiedModelConfigurationHTTP(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		if snapshot.Model.Value == nil || *snapshot.Model.Value != model || snapshot.Model.Source != modelSource || snapshot.HarnessConfig.Source != nativeSource || snapshot.ModelProvider.Source != providerSource {
+		if snapshot.Model.Value == nil || *snapshot.Model.Value != model || snapshot.Model.Source != v1.ExecutionSource(modelSource) || snapshot.HarnessConfig.Source != v1.ExecutionSource(nativeSource) || snapshot.ModelProvider.Source != v1.ExecutionSource(providerSource) {
 			t.Fatalf("wrong frozen selections: %#v", snapshot)
 		}
 		equalJSON(snapshot.HarnessConfig.Value, native)

From 5e6c1e609c761a211f3c8053b157d38768ec2831 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Thu, 8 Oct 2026 20:17:03 +0800
Subject: [PATCH 58/60] Use prepared execution configuration sources (#563)

---
 .../api/session_execution_configuration.go    | 15 +------
 .../session_execution_configuration_test.go   | 39 ++++++++++++-------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/services/core/internal/api/session_execution_configuration.go b/services/core/internal/api/session_execution_configuration.go
index 6a14a7950..5843e3dae 100644
--- a/services/core/internal/api/session_execution_configuration.go
+++ b/services/core/internal/api/session_execution_configuration.go
@@ -18,13 +18,6 @@ func sessionExecutionProjection(input sessionRequest, saved *v1.SavedAgent, inhe
 		} `json:"agent"`
 	}
 	_ = json.Unmarshal(raw, &configuration) // The resolved configuration was already validated.
-	modelSource := v1.ExecutionSourceSession
-	if saved != nil && (input.Agent == nil || input.Agent.Model == nil) {
-		modelSource = v1.ExecutionSourceAgent
-	}
-	if input.modelSource != "" {
-		modelSource = input.modelSource
-	}
 	harnessSource := v1.ExecutionSourceDeployment
 	if _, overridden := input.agentFields["x_agents_core"]; overridden {
 		if input.Agent != nil && input.Agent.XAgentsCore != nil && input.Agent.XAgentsCore.Harness != "" {
@@ -50,14 +43,10 @@ func sessionExecutionProjection(input sessionRequest, saved *v1.SavedAgent, inhe
 	if configuration.Agent.Core != nil {
 		native = v1.ResolvedHarnessConfig(configuration.Agent.Core.HarnessConfig)
 	}
-	nativeSource := input.harnessConfigSource
-	if nativeSource == "" {
-		nativeSource = v1.ExecutionSourceUnknown
-	}
 	return v1.SessionExecutionConfiguration{
-		HarnessConfig: v1.ExecutionHarnessConfigSelection{Value: native, Source: nativeSource},
+		HarnessConfig: v1.ExecutionHarnessConfigSelection{Value: native, Source: input.harnessConfigSource},
 		Object:        "agent.session.execution_configuration", SchemaVersion: 1,
-		Model:   v1.ExecutionSelection{Value: &configuration.Agent.Model, Source: modelSource},
+		Model:   v1.ExecutionSelection{Value: &configuration.Agent.Model, Source: input.modelSource},
 		Harness: v1.ExecutionSelection{Value: &engine, Source: harnessSource}, ModelProvider: selection,
 	}
 }
diff --git a/services/core/internal/api/session_execution_configuration_test.go b/services/core/internal/api/session_execution_configuration_test.go
index c5cd4bcbd..bacf75653 100644
--- a/services/core/internal/api/session_execution_configuration_test.go
+++ b/services/core/internal/api/session_execution_configuration_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/modelconfiguration"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 )
 
@@ -16,19 +17,20 @@ func TestExecutionConfigurationSources(t *testing.T) {
 	provider := &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://saved.example/v1", APIKey: "secret-canary"}
 	saved := &v1.SavedAgent{SavedAgentConfiguration: v1.SavedAgentConfiguration{Model: "saved-model", XAgentsCore: &v1.SavedAgentCore{Harness: "codex", ModelProvider: provider.SafeView()}}}
 	for _, tc := range []struct {
-		name, agent, extension                             string
-		saved                                              *v1.SavedAgent
-		inherited, provider                                *v1.ModelProviderInput
-		modelSource, harnessSource, providerSource, status string
+		name, agent, extension                                           string
+		saved                                                            *v1.SavedAgent
+		inherited, provider                                              *v1.ModelProviderInput
+		modelSource, nativeSource, harnessSource, providerSource, status string
 	}{
-		{"saved", ``, ``, saved, provider, provider, "agent", "agent", "agent", "available"},
-		{"model override", `,"agent":{"model":"override"}`, ``, saved, provider, provider, "session", "agent", "agent", "available"},
-		{"harness override", `,"agent":{"x_agents_core":{"harness":"codex"}}`, ``, saved, provider, provider, "agent", "session", "agent", "available"},
-		{"harness reset", `,"agent":{"x_agents_core":null}`, ``, saved, provider, provider, "agent", "deployment", "agent", "available"},
-		{"explicit bundle", ``, `,"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"https://explicit.example/v1","api_key":"explicit-secret"}}`, saved, nil, provider, "agent", "agent", "session", "available"},
-		{"provider null inherits", ``, `,"x_agents_core":{"model_provider":null}`, saved, provider, provider, "agent", "agent", "agent", "available"},
-		{"inline deployment", `,"agent":{"model":"inline"}`, ``, nil, nil, provider, "session", "deployment", "deployment", "available"},
-		{"inline explicit harness", `,"agent":{"model":"inline","x_agents_core":{"harness":"codex"}}`, ``, nil, nil, nil, "session", "session", "unknown", "unavailable"},
+		{"saved", ``, ``, saved, provider, provider, "agent", "agent", "agent", "agent", "available"},
+		{"model override", `,"agent":{"model":"override"}`, ``, saved, provider, provider, "session", "session", "agent", "agent", "available"},
+		{"harness override", `,"agent":{"x_agents_core":{"harness":"codex"}}`, ``, saved, provider, provider, "agent", "agent", "session", "agent", "available"},
+		{"harness reset", `,"agent":{"x_agents_core":null}`, ``, saved, provider, provider, "agent", "agent", "deployment", "agent", "available"},
+		{"explicit bundle", ``, `,"x_agents_core":{"model_provider":{"protocol":"responses","base_url":"https://explicit.example/v1","api_key":"explicit-secret"}}`, saved, nil, provider, "agent", "session", "agent", "session", "available"},
+		{"provider null inherits", ``, `,"x_agents_core":{"model_provider":null}`, saved, provider, provider, "agent", "agent", "agent", "agent", "available"},
+		{"deployment defaults", ``, ``, nil, nil, provider, "deployment", "deployment", "deployment", "deployment", "available"},
+		{"inline deployment", `,"agent":{"model":"inline"}`, ``, nil, nil, provider, "session", "session", "deployment", "deployment", "available"},
+		{"inline explicit harness", `,"agent":{"model":"inline","x_agents_core":{"harness":"codex"}}`, ``, nil, nil, nil, "session", "session", "session", "unknown", "unavailable"},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			var decoded decodedSessionRequest
@@ -39,8 +41,19 @@ func TestExecutionConfigurationSources(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
+			deps, fakes := testDependencies(t)
+			fakes.modelProviders.resolve = func(context.Context, string) (*modelconfiguration.Snapshot, error) {
+				if tc.provider == nil {
+					return nil, nil
+				}
+				return &modelconfiguration.Snapshot{Provider: tc.provider, Model: "deployment-model"}, nil
+			}
+			h := &Handler{Dependencies: deps}
+			if err := h.prepareSessionModelConfiguration(t.Context(), &input, tc.saved, tc.inherited); err != nil {
+				t.Fatal(err)
+			}
 			p := sessionExecutionProjection(input, tc.saved, tc.inherited, tc.provider, "codex", json.RawMessage(`{"agent":{"model":"resolved"}}`))
-			if string(p.Model.Source) != tc.modelSource || string(p.Harness.Source) != tc.harnessSource || string(p.ModelProvider.Source) != tc.providerSource || string(p.ModelProvider.Status) != tc.status {
+			if string(p.Model.Source) != tc.modelSource || string(p.HarnessConfig.Source) != tc.nativeSource || string(p.Harness.Source) != tc.harnessSource || string(p.ModelProvider.Source) != tc.providerSource || string(p.ModelProvider.Status) != tc.status {
 				t.Fatalf("wrong sources: %#v", p)
 			}
 			raw, _ := json.Marshal(p)

From 6653f94db7fee3e9d3e3d14a603b1f10d43e2221 Mon Sep 17 00:00:00 2001
From: SaladDay <1203511142@qq.com>
Date: Sat, 10 Oct 2026 21:05:53 +0800
Subject: [PATCH 59/60] Separate persistent workspace storage from sandbox
 compute (#638)

* Separate persistent workspace storage from sandbox compute

* Settle workspace refusals before native creation

* Align filesystem observations and optional bootstrap projections

* Settle absent initial compute before workspace cleanup
---
 AGENTS.md                                     |   1 +
 CONTRIBUTING.md                               |   1 +
 .../sandbox/SandboxDeploymentSettings.tsx     |   3 +-
 .../features/sandbox/SandboxSetupWizard.tsx   |  22 +-
 .../sandbox/deployment-specification.test.ts  |  12 +
 .../sandbox/deployment-specification.ts       |  14 +-
 apps/web/src/i18n/locales/en/core-errors.ts   |   5 +
 .../web/src/i18n/locales/zh-CN/core-errors.ts |   5 +
 apps/web/src/i18n/locales/zh-CN/sandbox.ts    |   2 +
 contracts/agents-api/admin-api.md             |   9 +
 contracts/agents-api/core-errors.md           |   5 +
 contracts/agents-api/core.openapi.yaml        | 124 +++++
 .../agents-api/node-generation-protocol.md    |   2 +
 contracts/agents-api/runtime.openapi.yaml     |  24 +
 contracts/agents-api/sandbox-deployment.md    |  10 +-
 contracts/agents-api/zh/admin-api.md          |  11 +-
 contracts/agents-api/zh/core-errors.md        |   7 +-
 .../agents-api/zh/node-generation-protocol.md |   4 +-
 contracts/agents-api/zh/sandbox-deployment.md |  11 +-
 deploy/node/node_spec.py                      |  21 +-
 docs/api/index.md                             |   4 +-
 docs/architecture.md                          |   5 +-
 docs/configuration.md                         |  36 ++
 docs/getting-started/nodes.md                 |   2 +
 docs/sandbox-provider.md                      |  10 +
 docs/workspace-provider.md                    |  60 +++
 docs/zh/api/index.md                          |   6 +-
 docs/zh/architecture.md                       |   7 +-
 docs/zh/configuration.md                      |  38 +-
 docs/zh/getting-started/nodes.md              |   4 +-
 docs/zh/sandbox-provider.md                   |  12 +-
 docs/zh/workspace-provider.md                 |  62 +++
 .../agents-client/src/deployment-contract.ts  |   2 +-
 .../agents-client/src/generated/core-api.ts   |  17 +-
 .../agents-client/src/sandbox-client.test.ts  |  10 +-
 packages/agents-client/src/sandbox-client.ts  |  17 +-
 services/core/cmd/sandbox-node/generations.go |   3 +-
 services/core/cmd/sandbox-node/main.go        |   3 +-
 services/core/cmd/server/http_routes_test.go  |   2 +-
 services/core/cmd/server/main.go              |   7 +
 services/core/cmd/server/managed_setup.go     |   7 +-
 .../deploy/e2b/helper_contract_generated.py   |   3 +-
 services/core/deploy/e2b/managed_init.py      |   4 +-
 services/core/internal/api/core_routes.go     |   2 +
 services/core/internal/api/dependencies.go    |   2 +
 .../core/internal/api/dependencies_test.go    |   8 +-
 services/core/internal/api/errors.go          |   2 +-
 .../internal/api/testdata/core-errors.json    |   7 +-
 .../core/internal/api/workspace_storage.go    |  90 ++++
 .../internal/api/workspace_storage_test.go    | 136 +++++
 .../core/internal/db/queries/workspaces.sql   |  68 +++
 services/core/internal/db/sqlc/models.go      |  15 +
 .../core/internal/db/sqlc/workspaces.sql.go   | 279 +++++++++++
 services/core/internal/deployment/service.go  |  28 ++
 .../workspace_configuration_test.go           |  55 ++
 .../execution/environment_admission.go        |  29 ++
 services/core/internal/execution/owner.go     |   2 +
 .../internal/execution/runtime_compute.go     |  17 +-
 .../internal/execution/runtime_lifecycle.go   |  61 ++-
 .../internal/execution/runtime_manager.go     |  35 +-
 .../internal/execution/runtime_workspace.go   |  33 ++
 .../runtime_workspace_settlement_test.go      | 236 +++++++++
 .../execution/runtime_workspace_test.go       | 179 +++++++
 .../execution/sandbox_deployment_setup.go     |  23 +
 .../execution/sandbox_deployment_switch.go    |   4 +
 .../persistence/postgres/workspacepg/store.go | 273 ++++++++++
 .../postgres/workspacepg/store_test.go        | 410 +++++++++++++++
 services/core/internal/sandbox/deployment.go  |  56 ++-
 .../internal/sandbox/deployment_contract.go   |  17 +-
 .../core/internal/sandbox/docker/provider.go  |   4 +
 .../internal/sandbox/docker/workspace_test.go |  17 +
 .../core/internal/sandbox/e2b/deployment.go   |   3 +
 .../internal/sandbox/e2b/helper_contract.go   |   3 +
 .../sandbox/e2b/helper_contract_test.go       |   6 +
 .../sandbox/e2b/internal/contractgen/main.go  |  29 +-
 .../core/internal/sandbox/e2b/provider.go     |   4 +
 .../internal/sandbox/e2b/workspace_test.go    |  17 +
 .../sandbox/microsandbox/contract_test.go     |   6 +-
 .../microsandbox/creation_settlement_test.go  |  76 ++-
 .../sandbox/microsandbox/deployment.go        |   3 +-
 .../internal/sandbox/microsandbox/identity.go |  19 +-
 .../internal/sandbox/microsandbox/node.go     |   8 +-
 .../internal/sandbox/microsandbox/provider.go |  71 ++-
 .../internal/sandbox/microsandbox/types.go    |  17 +-
 .../sandbox/microsandbox/workspace_test.go    | 100 ++++
 .../internal/sandbox/node/generation_json.go  |   2 +-
 .../sandbox/node/generation_json_test.go      |   2 +-
 services/core/internal/sandbox/node/proxy.go  |   3 +
 services/core/internal/sandbox/node/wire.go   |  28 +-
 .../internal/sandbox/node/workspace_test.go   |  93 ++++
 .../core/internal/sandbox/providers/config.go |   3 +
 .../providers/configuration_flow_test.go      |   2 +-
 .../sandbox/providers/registration.go         |   4 +
 .../sandbox/providers/workspace_test.go       |  47 ++
 .../core/internal/sandbox/sandbox_provider.go |  28 +-
 .../sandbox/testdata/deployment-contract.json | 200 ++++++++
 .../core/internal/sandbox/workspace_test.go   |  27 +
 services/core/internal/workspacefs/nfs/nfs.go | 171 +++++++
 .../internal/workspacefs/nfs/nfs_linux.go     | 469 ++++++++++++++++++
 .../workspacefs/nfs/nfs_linux_test.go         | 157 ++++++
 .../internal/workspacefs/nfs/nfs_other.go     |  19 +
 .../core/internal/workspacefs/nfs/nfs_test.go |  61 +++
 .../workspacefs/providers/registry.go         |  88 ++++
 .../core/internal/workspacefs/workspacefs.go  | 182 +++++++
 .../internal/workspacefs/workspacefs_test.go  | 121 +++++
 .../core/internal/workspaces/execution.go     | 219 ++++++++
 .../internal/workspaces/execution_test.go     | 232 +++++++++
 services/core/internal/workspaces/storage.go  |  32 ++
 services/core/internal/workspaces/types.go    |  33 ++
 .../migrations/000097_workspace_storage.sql   |  56 +++
 .../public_handler_fixture_test.go            |  12 +-
 .../e2b-provider/helper_contract_generated.py |   3 +-
 services/core/tools/e2b-provider/provider.py  |   8 +-
 .../tools/e2b-provider/testdata/contract.json |   4 +
 .../tools/microsandbox-provider/README.md     |  10 +-
 .../tools/microsandbox-provider/backend.go    |   2 +-
 .../tools/microsandbox-provider/bootstrap.go  |  18 +-
 .../creation_settlement_test.go               |   1 +
 .../tools/microsandbox-provider/deployment.go |  49 +-
 .../microsandbox-provider/deployment_test.go  |   4 +-
 .../tools/microsandbox-provider/lock_test.go  | 153 +++++-
 .../core/tools/microsandbox-provider/main.go  |  93 +++-
 .../microsandbox-provider/observed_test.go    |   1 +
 .../restore_completion.go                     |  57 ++-
 .../restore_completion_test.go                |   8 +-
 .../tools/microsandbox-provider/snapshot.go   |  26 +-
 .../snapshot_observation_test.go              |   3 +-
 .../microsandbox-provider/workspace_test.go   |  56 +++
 128 files changed, 5681 insertions(+), 170 deletions(-)
 create mode 100644 docs/workspace-provider.md
 create mode 100644 docs/zh/workspace-provider.md
 create mode 100644 services/core/internal/api/workspace_storage.go
 create mode 100644 services/core/internal/api/workspace_storage_test.go
 create mode 100644 services/core/internal/db/queries/workspaces.sql
 create mode 100644 services/core/internal/db/sqlc/workspaces.sql.go
 create mode 100644 services/core/internal/deployment/workspace_configuration_test.go
 create mode 100644 services/core/internal/execution/runtime_workspace.go
 create mode 100644 services/core/internal/execution/runtime_workspace_settlement_test.go
 create mode 100644 services/core/internal/execution/runtime_workspace_test.go
 create mode 100644 services/core/internal/persistence/postgres/workspacepg/store.go
 create mode 100644 services/core/internal/persistence/postgres/workspacepg/store_test.go
 create mode 100644 services/core/internal/sandbox/docker/workspace_test.go
 create mode 100644 services/core/internal/sandbox/e2b/workspace_test.go
 create mode 100644 services/core/internal/sandbox/microsandbox/workspace_test.go
 create mode 100644 services/core/internal/sandbox/node/workspace_test.go
 create mode 100644 services/core/internal/sandbox/providers/workspace_test.go
 create mode 100644 services/core/internal/sandbox/workspace_test.go
 create mode 100644 services/core/internal/workspacefs/nfs/nfs.go
 create mode 100644 services/core/internal/workspacefs/nfs/nfs_linux.go
 create mode 100644 services/core/internal/workspacefs/nfs/nfs_linux_test.go
 create mode 100644 services/core/internal/workspacefs/nfs/nfs_other.go
 create mode 100644 services/core/internal/workspacefs/nfs/nfs_test.go
 create mode 100644 services/core/internal/workspacefs/providers/registry.go
 create mode 100644 services/core/internal/workspacefs/workspacefs.go
 create mode 100644 services/core/internal/workspacefs/workspacefs_test.go
 create mode 100644 services/core/internal/workspaces/execution.go
 create mode 100644 services/core/internal/workspaces/execution_test.go
 create mode 100644 services/core/internal/workspaces/storage.go
 create mode 100644 services/core/internal/workspaces/types.go
 create mode 100644 services/core/migrations/000097_workspace_storage.sql
 create mode 100644 services/core/tools/microsandbox-provider/workspace_test.go

diff --git a/AGENTS.md b/AGENTS.md
index def0e37b4..f9023c9d1 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -28,6 +28,7 @@ Do not multiply entities without necessity. The long-term goal is minimal code,
 | Application–Core (`/v1`) | Official schema pinned by `contracts/agents-api/upstream.json` plus Go-owned `x_agents_core` extensions; `make openapi` generates public Go types and `contracts/agents-api/openapi.yaml` | [Agents API guide](docs/api/public-agent-api.md) |
 | Web and operators–Core (`/core/v1`) | Route annotations in `services/core/internal/api/`; `make openapi` generates `contracts/agents-api/core.openapi.yaml` | [Core administration API](contracts/agents-api/admin-api.md) |
 | Nodes and daemons–Core (`/api/v1` HTTP routes; the node and daemon wire protocols are separate rows) | Route annotations in `services/core/internal/api/`; `make openapi` generates `contracts/agents-api/runtime.openapi.yaml` | [Machine connection API](contracts/agents-api/machine-api.md) |
+| Core and sandbox nodes–Workspace filesystem | `services/core/internal/workspacefs/workspacefs.go` | [Workspace filesystem providers](docs/workspace-provider.md) |
 | Core–Sandbox Provider | `services/core/internal/sandbox/sandbox_provider.go` | [Sandbox Provider guide](docs/sandbox-provider.md) |
 | Core–sandbox node | `services/core/internal/sandbox/node/wire.go` | [Sandbox node protocol](contracts/agents-api/node-generation-protocol.md) |
 | Provider–Runtime startup | `internal/runtimebootstrap/bootstrap.go` | [Runtime bootstrap](docs/runtime-bootstrap.md) |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e7c364c91..7973a5e9d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,6 +21,7 @@ This guide owns how to work in the repository: documentation ownership, the repo
 | Harness registration, service qualification and acceptance | [Harness onboarding](contracts/agents-api/harness-onboarding.md) |
 | Harness capabilities by placement | [Harness capabilities](contracts/agents-api/harness-capabilities.md) |
 | Harness selection, model providers and native parameters | [Model execution](contracts/agents-api/model-execution.md) |
+| Independent workspace filesystem protocol and adapter behavior | [Workspace filesystem providers](docs/workspace-provider.md) |
 | Provider registration and lifecycle | [Sandbox Provider guide](docs/sandbox-provider.md) |
 | Sandbox deployment, selection and administrative transitions | [Sandbox deployment](contracts/agents-api/sandbox-deployment.md) |
 | Operator node tasks | [Nodes guide](docs/getting-started/nodes.md) |
diff --git a/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx b/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
index 4b581ace3..b5a6491ea 100644
--- a/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
+++ b/apps/web/src/features/sandbox/SandboxDeploymentSettings.tsx
@@ -54,8 +54,9 @@ export function SandboxDeploymentSettings({ deployment, disabled, fresh, onReset
     </div>
     <dl className="sandbox-summary">
       <div><dt>{t("Provider")}</dt><dd>{sandboxProviderLabel(deployment.provider, locale)}</dd></div>
-      <div><dt>{t("Each sandbox")}</dt><dd>{size ? `${sizeLabel(size)}${size.root_disk_mib ? ` · ${t("Root disk {{root}} · data disk {{data}}", { root: formatBytes(size.root_disk_mib * MIB), data: formatBytes((size.environment_disk_mib ?? 0) * MIB) })}` : ""}` : MISSING}</dd></div>
+      <div><dt>{t("Each sandbox")}</dt><dd>{size ? `${sizeLabel(size)}${size.root_disk_mib ? ` · ${spec?.workspace ? t("Root disk {{root}} · external workspace", { root: formatBytes(size.root_disk_mib * MIB) }) : t("Root disk {{root}} · data disk {{data}}", { root: formatBytes(size.root_disk_mib * MIB), data: formatBytes((size.environment_disk_mib ?? 0) * MIB) })}` : ""}` : MISSING}</dd></div>
     </dl>
+    {spec?.workspace && !spec.workspace.capacity_quota ? <p>{t("Workspace storage is configured by the operator; no capacity quota is enforced.")}</p> : null}
     {deployment.provider === "e2b" ? <div className="sandbox-cloud-summary">
       <dl className="sandbox-summary">
         <div><dt>{t("Sandbox API URL")}</dt><dd><code>{deployment.configuration?.api_url}</code></dd></div>
diff --git a/apps/web/src/features/sandbox/SandboxSetupWizard.tsx b/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
index 1a63bf98d..5c1e432eb 100644
--- a/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
+++ b/apps/web/src/features/sandbox/SandboxSetupWizard.tsx
@@ -70,8 +70,8 @@ export function validEndpoint(apiURL: string, domain: string): boolean {
  * double of it, disks included where the default declares them. A Provider
  * whose configuration selects the size declares none and has no presets.
  */
-function presets(provider: SandboxProvider): Record<Preset, SandboxResources> | null {
-  const standard = defaultSandboxResources(provider);
+function presets(provider: SandboxProvider, workspace?: SandboxSpecification["workspace"]): Record<Preset, SandboxResources> | null {
+  const standard = defaultSandboxResources(provider, workspace);
   if (!standard) return null;
   const scale = (factor: number): SandboxResources => ({
     cpus: Math.max(1, standard.cpus * factor),
@@ -90,10 +90,10 @@ const releaseLabels: Record<keyof SandboxRuntimeRelease, ParseKeys<"sandbox">> =
   firmware_sha256: "Firmware SHA-256",
 };
 
-function presetOf(provider: SandboxProvider, resources: SandboxResources): Preset | null {
+function presetOf(provider: SandboxProvider, resources: SandboxResources, workspace?: SandboxSpecification["workspace"]): Preset | null {
   const same = (a: SandboxResources, b: SandboxResources) => a.cpus === b.cpus && a.memory_mib === b.memory_mib
     && (a.root_disk_mib ?? 0) === (b.root_disk_mib ?? 0) && (a.environment_disk_mib ?? 0) === (b.environment_disk_mib ?? 0);
-  const all = presets(provider);
+  const all = presets(provider, workspace);
   return all ? (Object.keys(all) as Preset[]).find((key) => same(all[key], resources)) ?? null : null;
 }
 
@@ -134,7 +134,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
   const saved = provider && current ? savedSpecification(provider, current.provider, current.specification) : null;
   // Choosing a Provider that declares a default size replaces this placeholder.
   const [resources, setResources] = useState<SandboxResources>(current?.specification?.resources ?? { cpus: 0, memory_mib: 0 });
-  const [size, setSize] = useState<Size>(current?.specification ? presetOf(current.provider, current.specification.resources) ?? "current" : "standard");
+  const [size, setSize] = useState<Size>(current?.specification ? presetOf(current.provider, current.specification.resources, current.specification.workspace) ?? "current" : "standard");
   const [apiKey, setApiKey] = useState("");
   const [replacementRequested, setReplacementRequested] = useState(false);
   const [template, setTemplate] = useState(current?.e2bTemplate ?? "");
@@ -206,7 +206,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
   const e2bReady = provider !== "e2b" || (keyReady && validTemplate(template.trim()) && validEndpoint(apiURL.trim(), domain.trim()) && (!editing || !connectionChanged || apiKey.trim().length > 0));
   // A Provider without a declared default size takes it from its configuration, so the selection sends no resources.
   const sized = Boolean(policy?.default_resources);
-  const sizeReady = provider !== null && (!sized || validSandboxResources(provider, resources));
+  const sizeReady = provider !== null && (!sized || validSandboxResources(provider, resources, saved?.workspace));
   const ready = provider !== null && runtimeReady && e2bReady && sizeReady && !disabled && !busy;
 
   const order: Step[] = editing ? where === "direct" ? ["e2b", "review"] : ["size", "review"] : where === "direct" ? ["where", "e2b", "review"] : ["where", "backend", "size", "review"];
@@ -220,7 +220,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
       const kept = current ? savedSpecification(next, current.provider, current.specification) : null;
       const proposed = kept?.resources ?? defaultSandboxResources(next);
       if (proposed) setResources(proposed);
-      setSize(kept ? presetOf(next, kept.resources) ?? "current" : "standard");
+      setSize(kept ? presetOf(next, kept.resources, kept.workspace) ?? "current" : "standard");
       setRuntime({});
     }
     setProvider(next);
@@ -264,7 +264,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
   }
 
   const sizeLabel = (value: SandboxResources) => t("{{cpus}} CPU · {{memory}}", { cpus: value.cpus, memory: formatBytes(value.memory_mib * MIB) });
-  const diskLabel = (value: SandboxResources) => t("Root disk {{root}} · data disk {{data}}", { root: formatBytes((value.root_disk_mib ?? 0) * MIB), data: formatBytes((value.environment_disk_mib ?? 0) * MIB) });
+  const diskLabel = (value: SandboxResources) => saved?.workspace ? t("Root disk {{root}} · external workspace", { root: formatBytes((value.root_disk_mib ?? 0) * MIB) }) : t("Root disk {{root}} · data disk {{data}}", { root: formatBytes((value.root_disk_mib ?? 0) * MIB), data: formatBytes((value.environment_disk_mib ?? 0) * MIB) });
 
   let page: ReactNode;
   if (step === "where") {
@@ -342,9 +342,9 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
       </Question>
     );
   } else if (step === "size") {
-    const options = provider ? presets(provider) : null;
+    const options = provider ? presets(provider, saved?.workspace) : null;
     // A saved size outside the presets stays on offer as the current one.
-    const kept = saved && provider && presetOf(provider, saved.resources) === null ? saved.resources : null;
+    const kept = saved && provider && presetOf(provider, saved.resources, saved.workspace) === null ? saved.resources : null;
     const disks = (value: SandboxResources) => (policy?.disk ? diskLabel(value) : undefined);
     page = (
       <Question title={t("How big is each sandbox?")} help={t("These limits apply to the selected configuration generation. Existing sandboxes keep their limits. Concurrency is set per node.")}>
@@ -429,7 +429,7 @@ export function SandboxSetupWizard({ coreUrl, expectedGeneration, current, disab
               <NumberField error={fieldError("resources.memory_mib")} id={`${id}-memory`} label={t("Memory (MiB)")} value={resources.memory_mib} onChange={(memory_mib) => { setSize("custom"); setResources({ ...resources, memory_mib }); setFieldRejection(null); }} />
               {policy?.disk ? <>
                 <NumberField error={fieldError("resources.root_disk_mib")} id={`${id}-root`} label={t("Root disk (MiB)")} value={resources.root_disk_mib ?? 0} onChange={(root_disk_mib) => { setResources({ ...resources, root_disk_mib }); setFieldRejection(null); }} />
-                <NumberField error={fieldError("resources.environment_disk_mib")} id={`${id}-data`} label={t("Data disk at /environment (MiB)")} value={resources.environment_disk_mib ?? 0} onChange={(environment_disk_mib) => { setResources({ ...resources, environment_disk_mib }); setFieldRejection(null); }} />
+                {saved?.workspace && !saved.workspace.capacity_quota ? <p>{t("Workspace storage is configured by the operator; no capacity quota is enforced.")}</p> : <NumberField error={fieldError("resources.environment_disk_mib")} id={`${id}-data`} label={t("Data disk at /environment (MiB)")} value={resources.environment_disk_mib ?? 0} onChange={(environment_disk_mib) => { setResources({ ...resources, environment_disk_mib }); setFieldRejection(null); }} />}
               </> : null}
             </div>
           </fieldset> : null}
diff --git a/apps/web/src/features/sandbox/deployment-specification.test.ts b/apps/web/src/features/sandbox/deployment-specification.test.ts
index 89f333bc8..a55925899 100644
--- a/apps/web/src/features/sandbox/deployment-specification.test.ts
+++ b/apps/web/src/features/sandbox/deployment-specification.test.ts
@@ -45,6 +45,18 @@ describe("deployment resources and Runtime", () => {
     expect(validSandboxResources("e2b", { cpus: 2, memory_mib: 2048, root_disk_mib: 1024 })).toBe(false);
     expect(validSandboxResources("microsandbox", { cpus: 2, memory_mib: 2048, root_disk_mib: 1023, environment_disk_mib: 8192 })).toBe(false);
   });
+  it("validates external storage without fabricating a disk quota or weakening root disk bounds", () => {
+    const workspace = { ...deploymentContract.providers.microsandbox.workspace, capacity_quota: false };
+    const resources = defaultSandboxResources("microsandbox", workspace)!;
+    expect(resources.environment_disk_mib).toBe(0);
+    expect(validSandboxResources("microsandbox", resources, workspace)).toBe(true);
+    expect(validSandboxResources("microsandbox", resources)).toBe(false);
+    expect(validSandboxResources("microsandbox", { ...resources, root_disk_mib: 0 }, workspace)).toBe(false);
+    expect(validSandboxResources("microsandbox", { ...resources, environment_disk_mib: 8192 }, workspace)).toBe(false);
+    expect(validSandboxResources("microsandbox", resources, { ...workspace, user_xattr: false })).toBe(false);
+    expect(validSandboxResources("docker", { cpus: 2, memory_mib: 2048 }, workspace)).toBe(false);
+    expect(validSandboxResources("microsandbox", { ...resources, environment_disk_mib: 8192 }, { ...workspace, capacity_quota: true })).toBe(true);
+  });
   it("accepts only Core's Runtime image in the Runtime reference", async () => {
     const digest = "b".repeat(64);
     const runtime_ref = `oac-runtime@sha256:${digest}`;
diff --git a/apps/web/src/features/sandbox/deployment-specification.ts b/apps/web/src/features/sandbox/deployment-specification.ts
index af0d3393c..2beb67bb4 100644
--- a/apps/web/src/features/sandbox/deployment-specification.ts
+++ b/apps/web/src/features/sandbox/deployment-specification.ts
@@ -10,15 +10,19 @@ interface Manifest {
 }
 
 /** The size the Provider declares for setup to propose; null when its configuration selects the size. */
-export function defaultSandboxResources(provider: SandboxProvider): SandboxResources | null {
+export function defaultSandboxResources(provider: SandboxProvider, workspace?: SandboxSpecification["workspace"]): SandboxResources | null {
   const size: SandboxResources | null = deploymentContract.providers[provider].default_resources;
-  return size && { ...size };
+  return size && { ...size, ...(workspace ? { environment_disk_mib: 0 } : {}) };
 }
 
-/** Core's resource rule: optional disk fields stay zero unless the Provider declares disk limits. */
-export function validSandboxResources(provider: SandboxProvider, resources: SandboxResources): boolean {
+/** Core keeps owned disk limits; external workspace capacity is optional and requires real quota support. */
+export function validSandboxResources(provider: SandboxProvider, resources: SandboxResources, workspace?: SandboxSpecification["workspace"]): boolean {
+  const policy = deploymentContract.providers[provider];
+  if (workspace) {
+    if (!("workspace" in policy) || workspace.attachment !== policy.workspace.attachment || (policy.workspace.user_xattr && !workspace.user_xattr) || ((resources.environment_disk_mib ?? 0) > 0 && !workspace.capacity_quota)) return false;
+  }
   return deploymentContract.resources.every((rule) => {
-    const [min, max] = !rule.omit_zero ? [rule.min, rule.max] : deploymentContract.providers[provider].disk ? [deploymentContract.minimum_disk, rule.max] : [0, 0];
+    const [min, max] = workspace && rule.name === "environment_disk_mib" && (resources.environment_disk_mib ?? 0) === 0 ? [0, 0] : !rule.omit_zero ? [rule.min, rule.max] : deploymentContract.providers[provider].disk ? [deploymentContract.minimum_disk, rule.max] : [0, 0];
     const value = resources[rule.name] ?? 0;
     return Number.isInteger(value) && value >= min && value <= max;
   });
diff --git a/apps/web/src/i18n/locales/en/core-errors.ts b/apps/web/src/i18n/locales/en/core-errors.ts
index a667b3b69..192959c17 100644
--- a/apps/web/src/i18n/locales/en/core-errors.ts
+++ b/apps/web/src/i18n/locales/en/core-errors.ts
@@ -1,5 +1,10 @@
 /** One message for each code in Core's shared catalog, services/core/internal/api/testdata/core-errors.json. */
 export const coreErrors = {
+  "invalid_workspace_configuration": "Invalid workspace storage configuration.",
+  "workspace_operation_unsupported": "The selected workspace storage does not support the operation or sandbox combination.",
+  "workspace_storage_not_found": "Workspace storage is not configured or the requested object does not exist.",
+  "workspace_storage_conflict": "Workspace storage ownership or configuration conflicts with the current state.",
+  "workspace_storage_unavailable": "Workspace storage is unavailable or an operation remains unconfirmed.",
   "invalid_admin_key": "The console's Core key was rejected. Rotate it on the Core host, then sign in again.",
   "console_sign_in_required": "Sign in to the console again.",
   "console_origin_rejected": "Open the console at its configured address.",
diff --git a/apps/web/src/i18n/locales/zh-CN/core-errors.ts b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
index f787daf43..e3b4199cc 100644
--- a/apps/web/src/i18n/locales/zh-CN/core-errors.ts
+++ b/apps/web/src/i18n/locales/zh-CN/core-errors.ts
@@ -1,4 +1,9 @@
 export const coreErrors = {
+  "invalid_workspace_configuration": "工作区存储配置无效。",
+  "workspace_operation_unsupported": "所选工作区存储不支持该操作或沙箱组合。",
+  "workspace_storage_not_found": "尚未配置工作区存储或请求的对象不存在。",
+  "workspace_storage_conflict": "工作区存储归属或配置与当前状态冲突。",
+  "workspace_storage_unavailable": "工作区存储不可用或操作尚未确认。",
   "invalid_admin_key": "控制台的 Core Key 被拒绝。请在 Core 主机上轮换密钥，然后重新登录。",
   "console_sign_in_required": "请重新登录控制台。",
   "console_origin_rejected": "请通过配置的地址打开控制台。",
diff --git a/apps/web/src/i18n/locales/zh-CN/sandbox.ts b/apps/web/src/i18n/locales/zh-CN/sandbox.ts
index cd38572cd..13c925c56 100644
--- a/apps/web/src/i18n/locales/zh-CN/sandbox.ts
+++ b/apps/web/src/i18n/locales/zh-CN/sandbox.ts
@@ -1,5 +1,7 @@
 import { firstRun } from "./first-run";
 export const sandbox = {
+  "Root disk {{root}} · external workspace": "根磁盘 {{root}} · 外部工作区",
+  "Workspace storage is configured by the operator; no capacity quota is enforced.": "工作区存储由运维人员配置；未实施容量配额。",
   "E2B provider": "E2B 服务商",
   "Other E2B-compatible provider": "其他兼容 E2B 的服务商",
   "Loading templates…": "正在读取模板…",
diff --git a/contracts/agents-api/admin-api.md b/contracts/agents-api/admin-api.md
index 16ca46a78..990c436e7 100644
--- a/contracts/agents-api/admin-api.md
+++ b/contracts/agents-api/admin-api.md
@@ -22,6 +22,7 @@ Paths are relative to `/core/v1`.
 | Routes | Purpose | Contract |
 | --- | --- | --- |
 | `installation` | Public URL, API base URL, source commit, the installer's process settings and what is bound to the public URL | [Installation facts](#installation-facts) |
+| `workspace-storage` | Read or select independent workspace filesystem configuration | [Workspace storage](#workspace-storage) |
 | `projects`, `projects/{project_id}`, `projects/{project_id}/archive`, `projects/{project_id}/keys[/{key_id}]` | Projects and their API keys | [Projects and keys](#projects-and-keys) |
 | `projects/{project_id}/{agents,environment-templates,skills,files,vaults,sessions}/**` | Resource reads and deletion, Session history and Artifacts | [Resource reads and deletion](#resource-reads-and-deletion) |
 | `projects/{project_id}/sessions/{session_id}/archive` | Archive one hosted Session | [Session archive](#session-archive) |
@@ -39,6 +40,14 @@ Paths are relative to `/core/v1`.
 | `metrics` | Core's own process, execution, database and job metrics | [Core metrics](./core-metrics.md) |
 | `audit-log` | Administrator writes | [Audit log](#audit-log) |
 
+## Workspace storage
+
+Operator scripts use `GET /core/v1/workspace-storage` and `PUT /core/v1/workspace-storage` with a Core key. Web has no workspace storage editor. The request and successful response use the canonical filesystem configuration: `{"id":"<canonical UUID>","adapter":"<adapter identifier>","parameters":{...}}`. `parameters` is an adapter-owned JSON object; the selected adapter validates it. Unknown top-level fields are rejected.
+
+GET returns the selected configuration, or 404 `workspace_storage_not_found` when none is configured. PUT validates and selects an immutable configuration and returns it with 200. Reusing an ID requires identical adapter configuration; changing its meaning or conflicting with retained ownership returns 409 `workspace_storage_conflict`. Configuration changes are serialized with workspace ownership changes, and successful mutations carry the same administrator audit provenance as other deployment settings. The [workspace filesystem protocol](../../docs/workspace-provider.md) owns identity, attachment, admission and retention semantics.
+
+Invalid configuration returns 400 `invalid_workspace_configuration`; unsupported adapters or combinations return 400 `workspace_operation_unsupported`. Unavailable storage or an unconfirmed operation returns 503 `workspace_storage_unavailable`. Error messages do not expose native paths or adapter error text. The endpoint configures storage independently of Sandbox Provider selection; it does not create or delete a Session workspace.
+
 ## Projects and keys
 
 A Project owns one execution tenant; its keys share its principal and assets ([Projects own assets](../../docs/concepts.md#projects-own-assets)). Web's **Projects and keys** page uses these routes.
diff --git a/contracts/agents-api/core-errors.md b/contracts/agents-api/core-errors.md
index f9a73f846..eb51930cb 100644
--- a/contracts/agents-api/core-errors.md
+++ b/contracts/agents-api/core-errors.md
@@ -77,6 +77,11 @@ These codes have null `param` and no `details`. [Sandbox deployment](./sandbox-d
 
 | HTTP | Code | Meaning |
 | --- | --- | --- |
+| 400 | `invalid_workspace_configuration` | Invalid workspace storage configuration |
+| 400 | `workspace_operation_unsupported` | The selected workspace storage does not support the operation or sandbox combination |
+| 404 | `workspace_storage_not_found` | Workspace storage is not configured or the requested object does not exist |
+| 409 | `workspace_storage_conflict` | Workspace storage ownership or configuration conflicts with the current state |
+| 503 | `workspace_storage_unavailable` | Workspace storage is unavailable or an operation remains unconfirmed |
 | 400 | `sandbox_operation_unsupported` | The selected sandbox provider does not support the operation |
 | 401 | `invalid_admin_key` | The bearer credential is not a valid Core key |
 | 404 | `not_found` | The operation does not exist, the Harness is unknown, or the Harness has no deployment default model provider |
diff --git a/contracts/agents-api/core.openapi.yaml b/contracts/agents-api/core.openapi.yaml
index 0950ed4e1..29303854d 100644
--- a/contracts/agents-api/core.openapi.yaml
+++ b/contracts/agents-api/core.openapi.yaml
@@ -1781,6 +1781,11 @@ definitions:
         $ref: '#/definitions/sandbox.Resources'
       runtime:
         $ref: '#/definitions/sandbox.RuntimeRelease'
+      workspace:
+        allOf:
+          - $ref: '#/definitions/workspacefs.Declaration'
+        description: Workspace is a derived immutable capability receipt, never filesystem configuration.
+        readOnly: true
     required:
       - resources
     type: object
@@ -3825,6 +3830,39 @@ definitions:
     required:
       - type
     type: object
+  workspacefs.AttachmentKind:
+    enum:
+      - host_directory
+    type: string
+    x-enum-varnames:
+      - AttachmentHostDirectory
+  workspacefs.Configuration:
+    properties:
+      adapter:
+        type: string
+      id:
+        format: uuid
+        type: string
+      parameters:
+        type: object
+    required:
+      - adapter
+      - id
+      - parameters
+    type: object
+  workspacefs.Declaration:
+    properties:
+      attachment:
+        $ref: '#/definitions/workspacefs.AttachmentKind'
+      capacity_quota:
+        type: boolean
+      user_xattr:
+        type: boolean
+    required:
+      - attachment
+      - capacity_quota
+      - user_xattr
+    type: object
   writeaudit.APIKey:
     properties:
       id:
@@ -7392,6 +7430,92 @@ paths:
       summary: Summarize resource counts and Session usage by Project, Agent or creator key
       tags:
         - Core Administration
+  /core/v1/workspace-storage:
+    get:
+      description: Core key only. Returns the immutable selected filesystem configuration. No configuration returns 404.
+      produces:
+        - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/workspacefs.Configuration'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "401":
+          description: Unauthorized
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "409":
+          description: Conflict
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "503":
+          description: Service Unavailable
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+      security:
+        - DeploymentAdminAuth: []
+      summary: Retrieve workspace storage configuration
+      tags:
+        - Workspace Storage
+    put:
+      consumes:
+        - application/json
+      description: Core key only. Selects an immutable filesystem configuration. Reusing an ID requires the same adapter and parameters; conflicting ownership returns 409.
+      parameters:
+        - description: Immutable workspace storage configuration
+          in: body
+          name: body
+          required: true
+          schema:
+            $ref: '#/definitions/workspacefs.Configuration'
+      produces:
+        - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/workspacefs.Configuration'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "401":
+          description: Unauthorized
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "409":
+          description: Conflict
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+        "503":
+          description: Service Unavailable
+          schema:
+            $ref: '#/definitions/api.CoreErrorResponse'
+      security:
+        - DeploymentAdminAuth: []
+      summary: Select workspace storage configuration
+      tags:
+        - Workspace Storage
 schemes:
   - http
   - https
diff --git a/contracts/agents-api/node-generation-protocol.md b/contracts/agents-api/node-generation-protocol.md
index 14dc79870..de65b9069 100644
--- a/contracts/agents-api/node-generation-protocol.md
+++ b/contracts/agents-api/node-generation-protocol.md
@@ -122,3 +122,5 @@ An interrupted download repairs only missing bytes at the original paths. When c
 The readiness classes, one exported error and one code each, are authored in `services/core/internal/sandbox/node_diagnostic.go`. The shared `services/core/internal/sandbox/testdata/node-diagnostics.json` fixture checks the Go mapping, OpenAPI source annotations and generated enums, and the TypeScript client declaration. Web uses the client normalizer and checks localized messages for every declared code. Update these projections with a code change; clients read an unknown code as `provider_unavailable`.
 
 Preparation diagnostics keep fixed typed causes. Only artifact transfer, checksum or release-provenance failures report `runtime_download_failed`; the private preparer signals that class through its exit category, without Core or the node parsing stderr. Provider, ownership, cancellation and unclassified failures keep their typed code or `provider_unavailable`. No raw provider text crosses the protocol.
+
+The current wire version is 5. Create bootstrap and Resume requests may carry an optional workspace filesystem binding. The node validates its tenant and Environment against the allocation reference, its immutable ObjectID, and its attachment configuration ID against the supplied configuration before forwarding it. The filesystem resolver validates adapter-native ownership. A missing binding selects owned storage; a present binding cannot fall back. Error responses may retain a Resume target only when its nonempty native ID, name, generation and snapshot provenance match the requested target; this is cleanup evidence, never successful restore.
diff --git a/contracts/agents-api/runtime.openapi.yaml b/contracts/agents-api/runtime.openapi.yaml
index 64fbc6524..01fe6edeb 100644
--- a/contracts/agents-api/runtime.openapi.yaml
+++ b/contracts/agents-api/runtime.openapi.yaml
@@ -119,6 +119,11 @@ definitions:
         $ref: '#/definitions/sandbox.Resources'
       runtime:
         $ref: '#/definitions/sandbox.RuntimeRelease'
+      workspace:
+        allOf:
+          - $ref: '#/definitions/workspacefs.Declaration'
+        description: Workspace is a derived immutable capability receipt, never filesystem configuration.
+        readOnly: true
     required:
       - resources
     type: object
@@ -200,6 +205,25 @@ definitions:
       workspace_directory:
         type: string
     type: object
+  workspacefs.AttachmentKind:
+    enum:
+      - host_directory
+    type: string
+    x-enum-varnames:
+      - AttachmentHostDirectory
+  workspacefs.Declaration:
+    properties:
+      attachment:
+        $ref: '#/definitions/workspacefs.AttachmentKind'
+      capacity_quota:
+        type: boolean
+      user_xattr:
+        type: boolean
+    required:
+      - attachment
+      - capacity_quota
+      - user_xattr
+    type: object
 info:
   contact: {}
   description: Machine connection routes under /api/v1. Sandbox nodes authenticate with a one-use enrollment token or their node credential; Project API keys and the Core key are not accepted. See each operation's security requirements.
diff --git a/contracts/agents-api/sandbox-deployment.md b/contracts/agents-api/sandbox-deployment.md
index e473a7b7e..855e90d22 100644
--- a/contracts/agents-api/sandbox-deployment.md
+++ b/contracts/agents-api/sandbox-deployment.md
@@ -48,7 +48,7 @@ The request has no Core address. Core derives the deployment's `core_url` from t
 | `cpus` | Integer, 1 through 255 |
 | `memory_mib` | Integer, 512 through 1048576 MiB |
 | `root_disk_mib` | microsandbox: at least 1024 MiB; Docker and E2B: omitted or zero |
-| `environment_disk_mib` | microsandbox: at least 1024 MiB; Docker and E2B: omitted or zero |
+| `environment_disk_mib` | microsandbox owned disk: at least 1024 MiB; external filesystem: zero requests no quota; a positive value must be at least 1024 MiB and requires enforced quotas; Docker and E2B: omitted or zero |
 
 These limits describe each sandbox. A node's `max_active` and `max_retained` are separate reservation limits, and host measurements never permit exceeding either. Native providers may reject values that pass these bounds.
 
@@ -56,6 +56,10 @@ Docker applies the CPU and memory limits and checks the running container's limi
 
 microsandbox configures the CPUs, memory, a managed root disk and a separate owned disk at `/environment`. The [microsandbox helper](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/tools/microsandbox-provider/README.md) describes how restore handles these limits.
 
+The optional response `specification.workspace` is an immutable capability receipt derived from the selected [workspace filesystem](../../docs/workspace-provider.md), not an independently writable setting. It contains only `attachment`, `user_xattr` and `capacity_quota`; filesystem configuration, paths and credentials stay outside the sandbox specification. Core validates the combined declarations before saving, and retained generation validation and node construction use this receipt. Missing `workspace` preserves owned disk mode, including its existing disk bounds. Create and Resume must provide a binding exactly when the frozen generation selects external storage.
+
+To enable external storage for an existing owned deployment, select the filesystem configuration first, then update the sandbox deployment with compatible resources (`environment_disk_mib: 0` for a filesystem without quotas). Selecting the filesystem does not alter existing generations or allocations. The next sandbox update derives the external receipt; old owned allocations keep their owned disks. A filesystem selection must support the provider's declared requirements, and an already external deployment requires an equivalent declaration with compatible quota semantics.
+
 ### Runtime release
 
 Docker and microsandbox use every field of one verified distribution:
@@ -90,7 +94,7 @@ GET and successful writes return `installation_id`, `provider`, `core_url` (read
 - Request `resources` and response `specification.resources` are per-sandbox limits. Response `resources.allocations` and `resources.pending` count unreleased allocations and pending hosted Environments without an allocation.
 - An unconfigured deployment has an empty provider and no specification. Docker and microsandbox use `mode: nodes`; E2B uses `mode: direct`, without a synthetic node.
 - `generation` identifies the saved selection. `owner_epoch` fences the execution owner and node connections; it does not replace `expected_generation`.
-- `specification_digest` is the server's identity of the provider, limits and Runtime release; enrollment echoes it unchanged.
+- `specification_digest` is the server's identity of the provider, limits, Runtime release and derived workspace capability receipt; enrollment echoes it unchanged.
 
 The typed `SandboxAdminClient` in `packages/agents-client` checks the deployment, node list, node detail and allocation responses against exactly these shapes. An unknown or missing member, or a wrong type, rejects the whole response with a 502 `invalid_admin_response` error. A node's `diagnostic` is absent or a code, never empty, and the client reads an unknown code as `provider_unavailable`.
 
@@ -224,4 +228,4 @@ Storage and credential failures stay errors: an empty or failed read never prove
 
 `sandbox/deployment_contract.go` owns the resource bounds, release patterns and canonical field order, and each registered Provider's `sandbox.DeploymentPolicy` declares its requirements; `sandbox/deployment.go` applies them in Core. The installer consumes the generated declaration in `deploy/node/node_spec.py`, and the TypeScript client and Web the generated bounds, patterns and Provider declarations in `packages/agents-client/src/deployment-contract.ts`, so there is no second set of limits, patterns or providers. Regenerate both from the repository root with `go run ./services/core/cmd/specification-contract -write`; the sandbox Go tests, part of `make check`, reject a stale projection.
 
-The specification digest is the SHA-256 of compact UTF-8 JSON with `provider` first, then `resources`, then `runtime` when the provider requires it. Resource and Runtime fields follow the contract's declaration order; zero optional disk fields are omitted and required fields stay present. Release identities are lowercase ASCII, and the digest never depends on the incoming field order or whitespace. `services/core/internal/sandbox/testdata/deployment-contract.json` holds shared acceptance cases, exact canonical bytes and digests that both the Go and Python tests consume.
+The specification digest is the SHA-256 of compact UTF-8 JSON with `provider` first, then `resources`, then `runtime` when the provider requires it, then `workspace` when external storage is selected. Workspace fields follow the filesystem declaration order (`attachment`, `user_xattr`, `capacity_quota`); its Boolean fields remain present. Resource and Runtime fields follow the contract's declaration order; zero optional disk fields are omitted and required fields stay present. Release identities are lowercase ASCII, and the digest never depends on the incoming field order or whitespace. `services/core/internal/sandbox/testdata/deployment-contract.json` holds shared acceptance cases, exact canonical bytes and digests that both the Go and Python tests consume.
diff --git a/contracts/agents-api/zh/admin-api.md b/contracts/agents-api/zh/admin-api.md
index 886d98255..4650b3d46 100644
--- a/contracts/agents-api/zh/admin-api.md
+++ b/contracts/agents-api/zh/admin-api.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理 API"
 source: contracts/agents-api/admin-api.md
-source_hash: 8a781b20f0a359de77594ca570c4e1723332ac16a60d9a9be405ca5e2422e87d
+source_hash: 9687c874ba9e39dbceeb6f2206aff8e5163309a381262955ca247c67aa10455c
 ---
 
 Core 管理 API（`/core/v1`）用于管理安装实例：Project 及其 API 密钥、Project 资源的读取和删除、执行器凭据、部署默认模型、沙箱部署及其节点、监控和审计。Web 的[控制台服务器](../../../docs/zh/web/console-server.md#forwarding-to-core)会为已登录的管理员调用它；运维人员则从 Core 主机上的脚本调用它（[编写 Core API 脚本](../../../docs/zh/getting-started/operations.md#script-the-core-api)）。生成的架构是 [core.openapi.yaml](../core.openapi.yaml)，所有错误都使用 [Core 错误封装](core-errors.md)。
@@ -24,6 +24,7 @@ Core 管理 API（`/core/v1`）用于管理安装实例：Project 及其 API 密
 | 路由 | 用途 | 契约 |
 | --- | --- | --- |
 | `installation` | 公共 URL、API 基础 URL、源代码提交、安装器的进程设置，以及绑定到公共 URL 的内容 | [安装信息](#installation-facts) |
+| `workspace-storage` | 读取或选择独立工作区文件系统配置 | [工作区存储](#workspace-storage) |
 | `projects`、`projects/{project_id}`、`projects/{project_id}/archive`、`projects/{project_id}/keys[/{key_id}]` | Project 及其 API 密钥 | [Project 与密钥](#projects-and-keys) |
 | `projects/{project_id}/{agents,environment-templates,skills,files,vaults,sessions}/**` | 资源读取和删除、Session 历史及 Artifact | [资源读取和删除](#resource-reads-and-deletion) |
 | `projects/{project_id}/sessions/{session_id}/archive` | 归档一个托管 Session | [Session 归档](#session-archive) |
@@ -41,6 +42,14 @@ Core 管理 API（`/core/v1`）用于管理安装实例：Project 及其 API 密
 | `metrics` | Core 自身的进程、执行、数据库和作业指标 | [Core 指标](core-metrics.md) |
 | `audit-log` | 管理员写入 | [审计日志](#audit-log) |
 
+## 工作区存储 {#workspace-storage}
+
+运维脚本使用 Core key 调用 `GET /core/v1/workspace-storage` 和 `PUT /core/v1/workspace-storage`。Web 没有工作区存储编辑器。请求与成功响应使用规范文件系统配置：`{"id":"<canonical UUID>","adapter":"<adapter identifier>","parameters":{...}}`。`parameters` 是适配器定义的 JSON 对象，由所选适配器验证。未知顶层字段会被拒绝。
+
+GET 返回所选配置；尚未配置时返回 404 `workspace_storage_not_found`。PUT 验证并选择不可变配置，以 200 返回该配置。复用 ID 要求适配器配置完全一致；更改其含义或与保留归属冲突会返回 409 `workspace_storage_conflict`。配置更改与工作区归属变更串行执行，成功变更携带与其他部署设置相同的管理员审计来源。[工作区文件系统协议](../../../docs/zh/workspace-provider.md) 规定标识、挂载、准入和保留语义。
+
+无效配置返回 400 `invalid_workspace_configuration`；不支持的适配器或组合返回 400 `workspace_operation_unsupported`。存储不可用或操作尚未确认返回 503 `workspace_storage_unavailable`。错误消息不暴露原生路径或适配器错误文本。此端点独立于 Sandbox Provider 选择配置存储，不创建或删除 Session 工作区。
+
 ## Project 与密钥 {#projects-and-keys}
 
 每个 Project 拥有一个执行租户；其密钥共享该租户的主体和资产（[Project 拥有资产](../../../docs/zh/concepts.md#projects-own-assets)）。Web 的 **Projects and keys** 页面使用这些路由。
diff --git a/contracts/agents-api/zh/core-errors.md b/contracts/agents-api/zh/core-errors.md
index aa2c19203..95262bdba 100644
--- a/contracts/agents-api/zh/core-errors.md
+++ b/contracts/agents-api/zh/core-errors.md
@@ -1,7 +1,7 @@
 ---
 title: "Core 管理错误"
 source: contracts/agents-api/core-errors.md
-source_hash: 6e917cd9928dfdeb0f5f4742b3e61d3197da5d599ba9f2b8934dd85ef23454d3
+source_hash: 71088f9154793bd72bdccb199f1ac6da6da4097da05bed828299011eb5dfe12d
 ---
 
 `/core/v1` 上的错误使用此封装结构。`message` 是安全的英文文本；`code` 和 `param` 可以为 null。客户端依据稳定的 `code` 和可选的 `param` 进行处理，对未知代码显示 `message`，绝不解析消息，也绝不自动重试被拒绝的写操作。
@@ -79,6 +79,11 @@ Web 的控制台服务器在 `/core` 路径上发生自身故障时使用此封
 
 | HTTP | 代码 | 含义 |
 | --- | --- | --- |
+| 400 | `invalid_workspace_configuration` | 工作区存储配置无效 |
+| 400 | `workspace_operation_unsupported` | 所选工作区存储不支持该操作或沙箱组合 |
+| 404 | `workspace_storage_not_found` | 尚未配置工作区存储或请求的对象不存在 |
+| 409 | `workspace_storage_conflict` | 工作区存储归属或配置与当前状态冲突 |
+| 503 | `workspace_storage_unavailable` | 工作区存储不可用或操作尚未确认 |
 | 400 | `sandbox_operation_unsupported` | 所选沙箱提供商不支持该操作 |
 | 401 | `invalid_admin_key` | Bearer 凭据不是有效的 Core Key |
 | 404 | `not_found` | 操作不存在、Harness 未知，或该 Harness 没有部署默认模型服务 |
diff --git a/contracts/agents-api/zh/node-generation-protocol.md b/contracts/agents-api/zh/node-generation-protocol.md
index a5c9a658a..481dbc4af 100644
--- a/contracts/agents-api/zh/node-generation-protocol.md
+++ b/contracts/agents-api/zh/node-generation-protocol.md
@@ -1,7 +1,7 @@
 ---
 title: "沙箱节点协议"
 source: contracts/agents-api/node-generation-protocol.md
-source_hash: b7f9a3a2835f65b477b53fcc62b474250eb77c3111f5e4692b561911c0ff067b
+source_hash: 3fa1d9257acefa2d144f6e76ac5c2d3ff1d074ebb2b21fb48a2f79ef58ad6073
 ---
 
 沙箱节点在其主机上运行 Docker 或 microsandbox Provider，并通过一个 WebSocket 与 Core 相连。Core 通过该连接发送 Provider 操作；节点针对本地 Provider 执行这些操作，并报告就绪状态、主机测量值及其持有的部署代次。Core 始终是唯一的生命周期所有者：节点绝不重试变更操作或调度工作。帧和校验器位于 [`services/core/internal/sandbox/node`](https://github.com/MiniMax-AI/OpenAgentCore/tree/main/services/core/internal/sandbox/node)（`wire.go`、`generation_wire.go`）；节点用于注册和读取配置的 HTTP 路由位于[机器连接 API](machine-api.md#node-routes)。
@@ -124,3 +124,5 @@ Runtime 字节缺失时，绝不将固定的放置实例迁移到当前 Runtime
 就绪类别编写于 `services/core/internal/sandbox/node_diagnostic.go`，每个类别对应一个导出错误和一个代码。共享的 `services/core/internal/sandbox/testdata/node-diagnostics.json` 测试夹具检查 Go 映射、OpenAPI 源注释和生成的枚举，以及 TypeScript 客户端声明。Web 使用客户端规范化器，并检查每个已声明代码的本地化消息。代码变更时要同步更新这些投影；客户端将未知代码读作 `provider_unavailable`。
 
 准备诊断使用固定的类型化原因。只有制品传输、校验和或版本来源验证失败才会报告 `runtime_download_failed`；私有准备器通过退出类别指示这一类失败，Core 和节点都不解析 stderr。Provider 故障、所有权故障、取消和未分类故障保留其类型化代码，或使用 `provider_unavailable`。协议中不会传输任何 Provider 原始文本。
+
+当前线协议版本为 5。Create 引导和 Resume 请求可携带可选的工作区文件系统绑定。节点在转发前校验其租户及 Environment 与分配引用一致、ObjectID 不可变且有效，以及挂载配置 ID 与所传配置一致。文件系统解析器负责适配器原生所有权校验。未提供绑定时选择自有存储；已提供绑定时不得回退。错误响应仅可保留原生 ID 非空且名称、代次、快照来源均匹配请求的 Resume 目标；这仅为清理证据，不代表恢复成功。
diff --git a/contracts/agents-api/zh/sandbox-deployment.md b/contracts/agents-api/zh/sandbox-deployment.md
index 275cf079a..b886dab3e 100644
--- a/contracts/agents-api/zh/sandbox-deployment.md
+++ b/contracts/agents-api/zh/sandbox-deployment.md
@@ -1,7 +1,7 @@
 ---
 title: "沙箱部署"
 source: contracts/agents-api/sandbox-deployment.md
-source_hash: b40a45b42e42de5e64fa3ccae4666650e6c5d8b7d53a438d61a2e6665af2168e
+source_hash: 39ac8d674a737096598c9c31e8459b60a7e3a58dffc3f5b0258714ad5b05801e
 ---
 
 沙箱部署为 Core 管理的 `openai_hosted` 执行选择 Sandbox Provider、每个沙箱的资源以及不可变的 Runtime 发行版。PostgreSQL 为每个安装维护一个当前有效选择；Web 和 Core API 写入同一配置。节点文件保存其已安装副本和特定于主机的路径，且不能覆盖其资源或 Runtime。该选择独立于 Harness。部署可以保持未配置状态，没有节点；此时它拒绝托管准入。
@@ -50,7 +50,7 @@ POST 和 PUT 接受相同的完整选择，并要求提供先前 GET 返回的 `
 | `cpus` | 整数，1 到 255 |
 | `memory_mib` | 整数，512 到 1048576 MiB |
 | `root_disk_mib` | microsandbox：至少 1024 MiB；Docker 和 E2B：省略或为零 |
-| `environment_disk_mib` | microsandbox：至少 1024 MiB；Docker 和 E2B：省略或为零 |
+| `environment_disk_mib` | microsandbox 自有磁盘：至少 1024 MiB；外部文件系统：零表示不请求配额；正值必须至少为 1024 MiB 且要求强制执行配额；Docker 和 E2B：省略或为零 |
 
 这些限制描述每个沙箱。节点的 `max_active` 和 `max_retained` 是独立的预留限制，主机测量值绝不会允许超过其中任何一个。即使数值满足这些边界，原生提供商仍可能拒绝这些值。
 
@@ -58,6 +58,11 @@ Docker 应用 CPU 和内存限制，并检查运行中容器的限制和精确
 
 microsandbox 会配置 CPU、内存、托管根磁盘，以及位于 `/environment` 的独立自有磁盘。[microsandbox 辅助工具](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/tools/microsandbox-provider/README.md)说明了 restore 如何处理这些限制。
 
+
+响应中可选的 `specification.workspace` 是从所选[工作区文件系统](../../../docs/zh/workspace-provider.md)派生的不可变能力回执，不是可独立写入的设置。它仅包含 `attachment`、`user_xattr` 和 `capacity_quota`；文件系统配置、路径和凭据不进入 Sandbox specification。Core 保存前校验组合声明，保留代次校验与节点构造均使用此回执。缺失 `workspace` 时保留自有磁盘模式及现有容量边界。Create 和 Resume 必须且仅当固定代次选择外部存储时提供绑定。
+
+为现有自有磁盘部署启用外部存储时，先选择文件系统配置，再使用兼容资源更新 Sandbox 部署（不支持配额的文件系统使用 `environment_disk_mib: 0`）。选择文件系统不会改变现有代次或 allocation。下一次 Sandbox 更新派生外部能力回执；旧的自有磁盘 allocation 保留原磁盘。文件系统选择必须支持 Provider 声明的要求；已采用外部存储的部署要求等价声明及兼容配额语义。
+
 ### Runtime 发行版 {#runtime-release}
 
 Docker 和 microsandbox 使用一个经过验证发行包中的每个字段：
@@ -227,3 +232,5 @@ POST 会在持久保存候选配置之前对其进行验证，并且不会创建
 `sandbox/deployment_contract.go`负责资源边界、发行版模式和规范字段顺序，每个已注册 Provider 的 `sandbox.DeploymentPolicy` 声明其要求；`sandbox/deployment.go`在 Core 中应用这些规则。安装程序会使用 `deploy/node/node_spec.py` 中生成的声明，TypeScript 客户端和 Web 使用 `packages/agents-client/src/deployment-contract.ts` 中生成的边界、模式和 Provider 声明，因此不存在第二套限制、模式或提供商列表。请在仓库根目录运行 `go run ./services/core/cmd/specification-contract -write` 重新生成两者；作为 `make check` 一部分的沙箱 Go 测试会拒绝过时的投影。
 
 规范摘要是紧凑 UTF-8 JSON 的 SHA-256，其中 `provider` 位于首位，其次是 `resources`，然后在提供商需要时放置 `runtime`。资源和 Runtime 字段遵循契约的声明顺序；值为零的可选磁盘字段会被省略，必填字段则保持存在。发行版标识采用小写 ASCII，摘要绝不会受传入字段顺序或空白字符影响。`services/core/internal/sandbox/testdata/deployment-contract.json`保存共享验收用例、精确的规范字节和摘要，Go 与 Python 测试都会使用这些内容。
+
+规范摘要的 JSON 在 `runtime` 后包含可选的 `workspace`，字段按文件系统声明顺序排列：`attachment`、`user_xattr`、`capacity_quota`，布尔字段始终保留。该回执参与不可变 specification digest。
diff --git a/deploy/node/node_spec.py b/deploy/node/node_spec.py
index ba28d64c4..678f5bc26 100644
--- a/deploy/node/node_spec.py
+++ b/deploy/node/node_spec.py
@@ -27,14 +27,22 @@ def release(manifest):
 
 # BEGIN GENERATED DEPLOYMENT CONTRACT
 # Generated from sandbox/deployment_contract.go; do not edit.
-_CONTRACT = json.loads("{\"resources\":[{\"name\":\"cpus\",\"min\":1,\"max\":255,\"omit_zero\":false},{\"name\":\"memory_mib\",\"min\":512,\"max\":1048576,\"omit_zero\":false},{\"name\":\"root_disk_mib\",\"min\":0,\"max\":4294967295,\"omit_zero\":true},{\"name\":\"environment_disk_mib\",\"min\":0,\"max\":4294967295,\"omit_zero\":true}],\"runtime\":[{\"name\":\"source_commit\",\"pattern\":\"[0-9a-f]{40}\"},{\"name\":\"image_id\",\"pattern\":\"sha256:[0-9a-f]{64}\"},{\"name\":\"image_manifest_digest\",\"pattern\":\"sha256:[0-9a-f]{64}\"},{\"name\":\"microsandbox_ref\",\"pattern\":\"oac-runtime@sha256:[0-9a-f]{64}\"},{\"name\":\"runtime_sha256\",\"pattern\":\"[0-9a-f]{64}\"},{\"name\":\"firmware_sha256\",\"pattern\":\"[0-9a-f]{64}\"}],\"providers\":{\"docker\":{\"mode\":\"nodes\",\"disk\":false,\"runtime\":true,\"default_resources\":{\"cpus\":2,\"memory_mib\":2048}},\"e2b\":{\"mode\":\"direct\",\"disk\":false,\"runtime\":false,\"default_resources\":null},\"microsandbox\":{\"mode\":\"nodes\",\"disk\":true,\"runtime\":true,\"default_resources\":{\"cpus\":2,\"memory_mib\":4096,\"root_disk_mib\":8192,\"environment_disk_mib\":8192}}},\"minimum_disk\":1024}")
+_CONTRACT = json.loads("{\"workspace_fields\":[\"attachment\",\"user_xattr\",\"capacity_quota\"],\"resources\":[{\"name\":\"cpus\",\"min\":1,\"max\":255,\"omit_zero\":false},{\"name\":\"memory_mib\",\"min\":512,\"max\":1048576,\"omit_zero\":false},{\"name\":\"root_disk_mib\",\"min\":0,\"max\":4294967295,\"omit_zero\":true},{\"name\":\"environment_disk_mib\",\"min\":0,\"max\":4294967295,\"omit_zero\":true}],\"runtime\":[{\"name\":\"source_commit\",\"pattern\":\"[0-9a-f]{40}\"},{\"name\":\"image_id\",\"pattern\":\"sha256:[0-9a-f]{64}\"},{\"name\":\"image_manifest_digest\",\"pattern\":\"sha256:[0-9a-f]{64}\"},{\"name\":\"microsandbox_ref\",\"pattern\":\"oac-runtime@sha256:[0-9a-f]{64}\"},{\"name\":\"runtime_sha256\",\"pattern\":\"[0-9a-f]{64}\"},{\"name\":\"firmware_sha256\",\"pattern\":\"[0-9a-f]{64}\"}],\"providers\":{\"docker\":{\"mode\":\"nodes\",\"disk\":false,\"runtime\":true,\"default_resources\":{\"cpus\":2,\"memory_mib\":2048}},\"e2b\":{\"mode\":\"direct\",\"disk\":false,\"runtime\":false,\"default_resources\":null},\"microsandbox\":{\"mode\":\"nodes\",\"workspace\":{\"attachment\":\"host_directory\",\"user_xattr\":true},\"disk\":true,\"runtime\":true,\"default_resources\":{\"cpus\":2,\"memory_mib\":4096,\"root_disk_mib\":8192,\"environment_disk_mib\":8192}}},\"minimum_disk\":1024}")
 # END GENERATED DEPLOYMENT CONTRACT
 
 
 def canonical_spec(provider, specification, validate=True):
     rules = _CONTRACT["providers"][provider]
-    if validate and (not isinstance(specification, dict) or set(specification) != ({"resources", "runtime"} if rules["runtime"] else {"resources"})):
+    if validate and (not isinstance(specification, dict) or set(specification) - {"workspace"} != ({"resources", "runtime"} if rules["runtime"] else {"resources"})):
         raise ValueError("Invalid specification fields")
+    workspace = specification.get("workspace")
+    requirements = rules.get("workspace")
+    if validate and workspace is not None:
+        if (not isinstance(workspace, dict) or set(workspace) - set(_CONTRACT["workspace_fields"])
+                or not requirements or workspace.get("attachment") != requirements["attachment"]
+                or any(workspace.get(field) is not None and type(workspace[field]) is not bool for field in _CONTRACT["workspace_fields"] if field != "attachment")
+                or requirements["user_xattr"] and not workspace.get("user_xattr", False)):
+            raise ValueError("Invalid workspace declaration")
     resources = specification["resources"]
     if validate and (not isinstance(resources, dict) or set(resources) - {rule["name"] for rule in _CONTRACT["resources"]}):
         raise ValueError("Invalid resource fields")
@@ -45,6 +53,11 @@ def canonical_spec(provider, specification, validate=True):
         minimum, maximum = rule["min"], rule["max"]
         if rule["omit_zero"]:
             minimum, maximum = (_CONTRACT["minimum_disk"], maximum) if rules["disk"] else (0, 0)
+        if workspace is not None and name == "environment_disk_mib":
+            if validate and value and not workspace.get("capacity_quota", False):
+                raise ValueError("Workspace does not enforce requested quota")
+            if value == 0:
+                minimum = 0
         if validate and (type(value) is not int or not minimum <= value <= maximum):
             raise ValueError("Invalid resource value")
         if value or not rule["omit_zero"]:
@@ -61,6 +74,8 @@ def canonical_spec(provider, specification, validate=True):
                 raise ValueError("Invalid release identity")
             ordered_runtime[rule["name"]] = value
         result["runtime"] = ordered_runtime
+    if workspace is not None:
+        result["workspace"] = {field: workspace[field] if field == "attachment" else bool(workspace.get(field, False)) for field in _CONTRACT["workspace_fields"]}
     return result
 
 
@@ -77,7 +92,7 @@ def validate(data, args):
         if (provider not in ("docker", "microsandbox") or data["installation_id"] != args.installation_id
                 or data["core_url"] != args.core_url or type(data["generation"]) is not int or data["generation"] < 1
                 or getattr(args, "provider", None) not in (None, provider)
-                or set(spec) != {"resources", "runtime"}
+                or set(spec) - {"workspace"} != {"resources", "runtime"}
                 or type(data["max_active"]) is not int or type(data["max_retained"]) is not int
                 or not 1 <= data["max_active"] <= data["max_retained"] <= 1000000):
             raise ValueError()
diff --git a/docs/api/index.md b/docs/api/index.md
index 5bef473ef..0a6d3cf8c 100644
--- a/docs/api/index.md
+++ b/docs/api/index.md
@@ -7,7 +7,7 @@ Core serves three namespaces. Each has one kind of caller and its own credential
 | Namespace | Caller | Credential | Contents | Owner |
 | --- | --- | --- | --- | --- |
 | `/v1` | Applications: business systems and the official OpenAI SDK | Project API key | Exactly the 58 method and path pairs of the pinned official Agents API, listed in [upstream-routes.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream-routes.json). Core-only fields sit inside `x_agents_core`: `harness`, `model_provider`, `harness_config`, `environment`, and the read-only Session `installation` | [Agents API guide](./public-agent-api.md) |
-| `/core/v1` | Web's console server and operator scripts | [Core key](../getting-started/operations.md#core-key) | Installation facts, Projects and keys, resource reads and deletion, Session archive, executor credentials, default models, metrics, audit, sandbox deployment and nodes | [Core administration API](../../contracts/agents-api/admin-api.md) |
+| `/core/v1` | Web's console server and operator scripts | [Core key](../getting-started/operations.md#core-key) | Installation facts, Projects and keys, resource reads and deletion, Session archive, executor credentials, default models, metrics, audit, sandbox deployment and nodes, independent workspace storage configuration | [Core administration API](../../contracts/agents-api/admin-api.md) |
 | `/api/v1` | Nodes, Runtime daemons, self-hosted executors and their installers | Machine credentials: node enrollment tokens and node credentials, installation grants, executor credentials, and daemon credentials. Each works only on its own routes | Machine bootstrap and connections under `/api/v1/sandbox-node/*` and `/api/v1/agent-daemon/*`, including WebSockets, and the public native installer downloads | [Machine connection API](../../contracts/agents-api/machine-api.md) |
 
 A credential used in another namespace gets 401: a Project API key on `/core/v1` or `/api/v1`, the Core key on `/v1` or `/api/v1`. How Projects and keys behave is in [Projects own assets](../concepts.md#projects-own-assets).
@@ -19,3 +19,5 @@ A credential used in another namespace gets 401: a Project API key on `/core/v1`
 ## Machine connection API
 
 Nodes, Runtime daemons and the self-hosted installer call `/api/v1` with their own credentials. The [machine connection API](../../contracts/agents-api/machine-api.md) lists every route, caller and credential.
+
+Operator scripts configure independent filesystem storage through Core-key-authenticated `GET` and `PUT /core/v1/workspace-storage`; see [Workspace storage](../../contracts/agents-api/admin-api.md#workspace-storage).
diff --git a/docs/architecture.md b/docs/architecture.md
index 172a978d2..4159953a7 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -2,7 +2,7 @@
 title: "Architecture"
 ---
 
-OpenAgentCore separates orchestration, compute and native execution. Core owns the API and durable state. Sandbox Providers manage compute. A Runtime daemon prepares an Environment and runs the selected Harness, whose native SDK or protocol owns the model and tool loop.
+OpenAgentCore separates orchestration, compute and native execution. Core owns the API and durable state. Sandbox Providers manage compute. Independent workspace filesystem adapters manage durable Environment storage through a separate protocol. A Runtime daemon prepares an Environment and runs the selected Harness, whose native SDK or protocol owns the model and tool loop.
 
 ```mermaid
 flowchart TB
@@ -32,6 +32,7 @@ Dashed arrows show provisioning and installation. Solid arrows show component in
 | --- | --- | --- |
 | Core | Authenticate callers, resolve and freeze configuration, schedule Turns, handle cancellation and pending interactions, persist resources and execution facts in PostgreSQL | [Core service](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md) |
 | Sandbox Provider | Create, observe, renew and reclaim compute; supply Runtime startup input | [Sandbox Provider](./sandbox-provider.md), [Runtime bootstrap](./runtime-bootstrap.md) |
+| Workspace filesystem adapter | Create, observe and delete durable Environment storage; validate and resolve its compute attachment | [Workspace filesystem providers](./workspace-provider.md) |
 | Sandbox node | Operate a Docker or microsandbox host and reconcile its assigned generation and allocations | [Sandbox node protocol](../contracts/agents-api/node-generation-protocol.md) |
 | Runtime | Prepare the workspace and capabilities, manage Session Executors, execute Turns and report events and receipts | [Core–Runtime protocol](./runtime-protocol.md) |
 | Harness adapter | Validate native configuration, invoke the upstream SDK or protocol, translate events and confirm native cleanup | [Harness onboarding](../contracts/agents-api/harness-onboarding.md) |
@@ -46,4 +47,4 @@ An application creates a Session through the Agents API. Core resolves its confi
 
 After the daemon connects, Core checks the available Harness and requested capabilities. The Runtime prepares a workspace Environment and its capability snapshot, then prepares or reuses the Session Executor. Each Turn runs through the native Harness. Core persists the output, tool interactions and receipts for application reads and events. Completion or cancellation settles the Turn; a healthy Executor can serve the next Turn in the same Environment.
 
-Execution and compute have separate lifetimes: closing an Executor preserves its allocation and workspace until the Provider reclaims them. Preparation, connection and execution readiness have distinct states. The [Environment contract](../contracts/agents-api/environments.md) owns preparation, and the [Core–Runtime protocol](./runtime-protocol.md) owns ordering, receipts and failure handling.
+Execution, compute and independent workspace storage have separate lifetimes. Closing an Executor does not itself delete storage. The [workspace filesystem contract](./workspace-provider.md#lifetime-and-filesystem-scope) owns persistent storage retention and explicit deletion; compute checkpoint expiry does not authorize its reclamation. Preparation, connection and execution readiness have distinct states. The [Environment contract](../contracts/agents-api/environments.md) owns preparation, and the [Core–Runtime protocol](./runtime-protocol.md) owns ordering, receipts and failure handling.
diff --git a/docs/configuration.md b/docs/configuration.md
index 5eefd448a..02ca6682e 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -87,6 +87,42 @@ Runtime settings live in Core's database. Change them in Web; scripts use the sa
 
 Which harnesses are enabled, and the default one, are process settings (`core.harnesses`, `core.default_harness`); System shows them read-only. The [Core administration API](../contracts/agents-api/admin-api.md) lists every Core API route, and the [deployment contract](../contracts/agents-api/sandbox-deployment.md) defines the sandbox fields, limits and change rules.
 
+### Independent workspace storage
+
+The initial supported independent filesystem combination is microsandbox with the [kernel NFS adapter](./workspace-provider.md#kernel-nfs-adapter). Mount the same NFSv4.2 export on the Linux Core host and every participating node before starting their services, at the same absolute path, for example `/srv/oac-workspaces`. The operator manages the export, mount availability and service startup ordering. Use a trusted-client AUTH_SYS export with `root_squash`; do not enable `no_root_squash` or broaden permissions to make a check pass. Prepare the namespace and service principals according to the adapter's [ownership requirements](./workspace-provider.md#kernel-nfs-adapter).
+
+Core's Compose service already runs as UID 65532. Before adding a node, prepare `oac-node` with the same UID, home `/var/lib/oac-node`, a nologin shell and a nonzero primary group. Its supplementary groups may contain only its primary group, `docker` and `kvm`; an existing home must belong to that account. The installer adopts this account. Without a precreated account it allocates a system UID, which need not match Core. Resolve an existing UID or account conflict as a host administration task before enrollment; changing a running account's UID is not part of storage setup.
+
+For a Compose deployment, add a read-write bind mount to the existing `core` service's `volumes` through the deployment platform's Compose customization. Keep the existing service volumes and user unchanged. The host source must already be the NFS mount; `create_host_path: false` prevents creating a missing source directory but does not establish that NFS is mounted. Mount before creating the container; after a host unmount or remount, recreate it so its mount namespace uses the intended mount.
+
+```yaml
+services:
+  core:
+    volumes:
+      - type: bind
+        source: /srv/oac-workspaces
+        target: /srv/oac-workspaces
+        read_only: false
+        bind:
+          create_host_path: false
+```
+
+Select storage using `PUT /core/v1/workspace-storage` with the Core key as described in the [administration API](../contracts/agents-api/admin-api.md#workspace-storage). Generate separate canonical UUIDs for the immutable configuration `id` and the namespace marker, then submit this shape with your actual values:
+
+```json
+{
+  "id": "11111111-1111-4111-8111-111111111111",
+  "adapter": "nfs",
+  "parameters": {
+    "root": "/srv/oac-workspaces",
+    "namespace_id": "22222222-2222-4222-8222-222222222222",
+    "uid": 65532
+  }
+}
+```
+
+Then create or update the microsandbox deployment through the [sandbox deployment API](../contracts/agents-api/sandbox-deployment.md#routes), setting `resources.environment_disk_mib` to `0` and retaining the required compute resources, Runtime and provider configuration. A positive value requests a quota that this adapter does not enforce and is rejected. Deployment workspace requirements and each Session's attachment are derived from the selected database configuration; do not add a filesystem field to the deployment or a second storage configuration to node files. Web has no workspace storage editor.
+
 ### Node capacity
 
 Core approves a node's capacity when you generate its Add node command: **Sandboxes at once** (`max_active`, default 2) and, for microsandbox only, **Retained sandboxes** (`max_retained`, default 8), with `max_retained >= max_active >= 1`. Docker never suspends sandboxes, so Web doesn't ask for it and Core keeps `max_retained` equal to `max_active`. Change them later with **Edit node**. Reservations and cleanup that is not confirmed count against capacity; lowering a limit stops no running sandbox. A node's own files can't change its capacity, size or Runtime.
diff --git a/docs/getting-started/nodes.md b/docs/getting-started/nodes.md
index 0aa74c4a8..d4890f614 100644
--- a/docs/getting-started/nodes.md
+++ b/docs/getting-started/nodes.md
@@ -12,6 +12,8 @@ You add a node by generating a command in Web and running it on the host. The [s
 - **The sandbox configuration is saved.** Open **System** → **Manage sandbox configuration**, choose **Own machines**, the backend and a sandbox size, and **Save configuration**. To change a saved configuration, choose **Reset deployment** first. Every node of an installation uses that backend.
 - **The console can serve the node files.** Nodes download their Runtime and provider files from the console, which redirects to the release for files it does not hold, and check each file's size and SHA-256 against the release manifest. Node hosts therefore need access to the release. Without the files, Add node says *This console has no node files for …*.
 
+For microsandbox with independent workspace storage, complete the [NFS mount and service-account setup](../configuration.md#independent-workspace-storage) on this host before enrollment. The node receives the selected immutable filesystem configuration with each binding; do not author a separate node storage setting.
+
 The Core host joins like any other host: to run sandboxes on it, add it as a node.
 
 ## Add a node
diff --git a/docs/sandbox-provider.md b/docs/sandbox-provider.md
index 463f5e142..0eaa49ff4 100644
--- a/docs/sandbox-provider.md
+++ b/docs/sandbox-provider.md
@@ -71,6 +71,8 @@ Core serializes lifecycle operations and keeps the allocation after any uncertai
 - `ErrNotFound`, an empty listing, a timeout or a successful `Kill` alone never proves that an in-flight Create cannot appear later.
 - Core can also settle creation from a matching running resource with a completed bootstrap. Until it has such evidence or an explicit receipt it keeps the creation unknown, even when a cleanup attempt sees no resources.
 
+Microsandbox closes initial Create admission before returning a creation-absence receipt; its [helper protocol](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/tools/microsandbox-provider/README.md#create-and-bootstrap) defines the durable allocation-lock barrier. Ordinary `GetCompute` absence does not close admission.
+
 `Kill` owns cleanup of the allocation's compute and retained resources, including partial bootstrap storage, and never removes another tenant's resource on a name collision. Core releases durable ownership only after confirmed cleanup and settled creation. Closing an Executor or cancelling a Harness never deletes an Environment, its workspace or its allocation.
 
 ### Operation outcomes and retries
@@ -231,3 +233,11 @@ The node uses the explicit Unix socket in its [provider configuration](./configu
 ### Seccomp profile
 
 [`seccomp.json`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/deploy/codex/seccomp.json) is the Moby default profile at [revision 65adc7e](https://github.com/moby/profiles/blob/65adc7e022c97f55e45c054ff012988027733b87/seccomp/default.json) (Apache-2.0, see [seccomp.LICENSE](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/deploy/codex/seccomp.LICENSE); upstream file SHA-256 `785b2429264afba4d594320337cb17f144f3c7d51585f9805eef72e28f4f9334`) with one appended rule that allows `clone`, `unshare`, `setns`, `mount`, `umount2` and `pivot_root`. The distribution ships this file to every Docker node as `runtime/seccomp.json`.
+
+## Independent workspace attachment
+
+`Bootstrap.Workspace` and `ResumeRequest.Workspace` optionally carry a [workspace filesystem binding](workspace-provider.md). Absence selects the Provider's owned Environment disk; presence selects the exact external object and never permits a fallback to an owned disk. Providers validate the tenant and Environment against the binding and its configuration receipt before resolving it. `LocalOptions.Workspace` injects the filesystem resolver; Sandbox Providers never interpret filesystem adapter parameters or native receipts.
+
+`DeploymentPolicy.Workspace` declares supported attachment requirements; absence means external storage is unsupported. The derived immutable `DeploymentSpec.Workspace` receipt selects the generation mode and capabilities; its [deployment workflow](../contracts/agents-api/sandbox-deployment.md#resources) never copies filesystem configuration into the generation. Microsandbox requires `host_directory` and `user_xattr`; Docker and E2B reject external attachments. `ValidateWorkspacePolicy` uses the filesystem protocol's combination validator: an external filesystem without an enforced quota rejects a positive `EnvironmentDiskMiB`, while zero requests no quota. Root disk capacity is still required. Without an external declaration, the existing owned disk bounds apply.
+
+Microsandbox resolves each Create and Resume binding, including observation of an interrupted restore, and passes only the local directory and immutable ObjectID to its private helper. The helper binds the whole `/environment`, including workspace, staging, initialization and packages; private HOME and Harness history remain in the VM's checkpointed root. Explicit mode, object and path labels qualify native resources; mount shape alone never selects a mode. Restore verifies the snapshot's object, remaps `/environment` through SDK `Volumes`, requires strict external mount policy and rejects every restore warning. Partial restore errors retain the exact target identity for cleanup and never establish readiness. Unknown outcomes remain observations of the original operation. Native Bind checkpoint and guest-local flock continuity evidence does not establish cross-VM fencing.
diff --git a/docs/workspace-provider.md b/docs/workspace-provider.md
new file mode 100644
index 000000000..de3ccb7e9
--- /dev/null
+++ b/docs/workspace-provider.md
@@ -0,0 +1,60 @@
+---
+title: Workspace filesystem providers
+---
+
+The independent workspace filesystem boundary is defined in [`workspacefs.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/workspacefs/workspacefs.go). This document specifies the required integration contract; it does not establish that every Sandbox Provider or placement implements it. Filesystem adapters own storage objects and native attachment resolution. [Sandbox Providers](sandbox-provider.md) own compute. Core selects and validates their combination before allocating either resource.
+
+## Identity and configuration
+
+`Reference` contains immutable, canonical lowercase, nonzero UUIDs for `TenantID`, `EnvironmentID` and `ObjectID`. Core persists the reference before creation. Object identities are never reused, including after deletion or an unconfirmed mutation. An adapter must verify the entire ownership tuple before exposing or deleting an object.
+
+`Configuration` is an immutable Core database record with its own canonical UUID `ID`, an `Adapter` identifier and adapter-owned JSON object `Parameters`. The database is its only authored home; changing configuration creates a new identity. Core forwards parameters without interpreting native paths. Existing objects remain bound to their original configuration.
+
+`Attachment` binds an adapter-issued JSON object `Native` to the complete reference, configuration ID and attachment kind. It is internal ownership evidence, not an application-provided host path. Shared validation checks the envelope and expected reference/configuration match; the selected adapter must also validate its parameters, receipt and native ownership. Structural validity alone never authorizes filesystem access. Public Session payloads must not supply attachments, configuration parameters or resolved host directories.
+
+`Binding` carries the configuration and attachment transiently to a node resolver. This transfer does not introduce a second persistent node configuration. `Resolver.Resolve` validates the binding and returns `Directory{Path}` for the local compute attachment. Only the adapter resolves native storage into a clean absolute path; Core never constructs one. A structurally valid directory is not itself ownership evidence.
+
+## Operations and outcomes
+
+Every control adapter implements `Declaration`, `Check`, `Create`, `Observe` and `Delete`. Every node attachment adapter implements `Resolve`. There is no optional side interface, implicit adapter substitution or nil implementation fallback.
+
+| Operation | Required meaning |
+| --- | --- |
+| `Declaration()` | Describe the selected configuration's verified attachment, user xattr and quota behavior. |
+| `Check(ctx)` | Validate configuration and availability without creating an object. |
+| `Create(ctx, reference)` | Create the owned object or converge on its existing attachment without overwriting data; retries and concurrent calls use the same immutable reference. |
+| `Observe(ctx, reference)` | Return an existing object's bound attachment without creating, repairing or preparing it. |
+| `Delete(ctx, reference)` | Converge on terminal deletion of the verified owned object after Core has authorized deletion and confirmed compute stop. |
+| `Resolve(ctx, binding)` | Validate native ownership and resolve the attachment for local compute. |
+
+Errors support `errors.Is`: `ErrInvalid` for invalid input, `ErrOwnership` for a reference or configuration mismatch, `ErrUnavailable` for unavailable storage, `ErrUnconfirmed` for an unknown mutation outcome, `ErrNotFound` for a missing object and `ErrUnsupported` for an unsupported combination. Adapters preserve these outcomes when wrapping errors. A missing observation does not prove an earlier mutation settled. A timeout or canceled context ends the caller's wait; it does not prove native stop or rollback. Core retains ownership on unknown outcomes. It may retry `Create` or `Delete` with the same persisted immutable reference and configuration, including after `ErrUnconfirmed`; it must never substitute a new object identity to retry an uncertain operation.
+
+Same-reference retry and concurrent convergence are mandatory adapter guarantees. `Create` preserves any existing object data and returns the attachment for that owned object; it never reinitializes a live object. Repeated and concurrent `Delete` calls converge on the same terminal deletion. Once terminal deletion is recorded, concurrent, delayed or retried `Create` calls must not resurrect the object, and `Resolve` must not expose it. Retained deletion metadata and further cleanup of settled in-flight operations are permitted. These guarantees apply to storage lifecycle operations; they do not establish mutation settlement at timeout or distributed compute fencing.
+
+## Capability validation
+
+`Requirements` declares the compute placement's attachment kind and need for `user_xattr`. `Declaration` reports the filesystem adapter's attachment kind, `UserXAttr` support and `CapacityQuota` enforcement. `ValidateCombination` is the shared pre-allocation admission check. The current attachment kind is `host_directory`; unknown kinds are rejected. A required user xattr capability means the mounted filesystem supports user extended attributes used by Environment preparation.
+
+A zero requested capacity means no quota was requested. A positive capacity in MiB is admitted only when the adapter actually enforces that limit; reporting available space or accepting an unchecked number is insufficient. The adapter's immutable configuration must enforce the admitted bound. Adapters cannot claim quota support based only on the Sandbox Provider's compute disk size.
+
+Workspace access is single-writer. Core must serialize compute ownership and confirm the previous writer stopped before attaching a replacement. There is no cross-VM lock capability in this protocol: a guest `flock` is not proof of a host lock or another guest's exclusion. A placement must not advertise concurrent-safe attachment based on guest-local locking.
+
+## Lifetime and filesystem scope
+
+The object contains the whole `/environment` tree, including the workspace, staging files, initialization state and package content. They remain on the same filesystem so filesystem operations within Environment preparation preserve their semantics. A Harness's private native history/configuration remains checkpoint state; it is not redirected into the workspace object.
+
+Workspace storage is retained with its Session until explicit Session deletion. Archival, expiration, reset and compute checkpoint deletion do not authorize workspace deletion. Core calls `Delete` only after explicit Session deletion and confirmed compute stop; unresolved compute or storage mutations retain ownership. Failed creation does not authorize deleting storage while its Session is retained. Snapshot-expiry recovery is not defined by this contract.
+
+## Kernel NFS adapter
+
+The `nfs` adapter uses an operator-premounted Linux kernel NFS filesystem. The supported setup is NFSv4.2 on trusted AUTH_SYS clients with `root_squash`, using the same export and absolute mount path on Core and nodes. The adapter neither mounts exports nor manages NFS credentials or service accounts. Other operating systems return `ErrUnsupported`. [Configuration](./configuration.md#independent-workspace-storage) owns installation steps and selection.
+
+Parameters contain exactly `root`, `namespace_id` and `uid`. `root` is a clean absolute mount path; `namespace_id` is a canonical nonzero UUID; `uid` is the nonzero effective host UID required on both Core and nodes. The initial deployment uses 65532. The operator prepares the mounted root with mode `0700`, owned by this UID, and a regular `.oac-storage-root` file with mode `0600`, owned by the same UID, containing exactly the namespace UUID followed by one newline. Do this on the export's server-side storage as its administrator; root-squashed clients cannot assume privileged ownership changes. The root marker is an assertion of the selected export's identity, not a credential or distributed lock.
+
+Construction validates and canonicalizes JSON without filesystem I/O. `Check` verifies the opened root is kernel NFS, the effective UID and private ownership/modes match, the namespace marker matches, and real file-descriptor `user.*` xattr set/get/remove operations succeed. Every filesystem operation, including opening the root and checking availability, runs within one process-wide budget of 32 in-flight operations. A timed-out caller receives `ErrUnconfirmed`; its slot remains occupied until the kernel call returns. An exhausted budget returns `ErrUnavailable`. Directory-descriptor-relative operations stay anchored to the opened root. An unavailable mount or a local directory at the configured path fails validation; no local fallback is created.
+
+The declaration is `host_directory`, `user_xattr: true`, `capacity_quota: false`. The native attachment contains only the namespace identity; resolution validates the complete binding against the immutable configuration and filesystem ownership before returning `objects/<ObjectID>/live/data` beneath the root. Only this data directory is exposed to the guest. Neither tenant nor application input supplies a host path.
+
+Each object owns `objects/<ObjectID>/identity`, `staging/`, `live/`, `trash/` and, after deletion begins, `deleted-marker`. The permanent identity binds the tenant, Environment and object UUIDs. Create prepares and syncs a private unique staging envelope before atomically publishing its nonempty directory as `live`; replay cannot overwrite existing live data. Delete first records a durable object-local terminal marker, retires live data to unique object-local trash and removes data before its ownership markers. Concurrent deleters converge. Minimal identity and deletion metadata remain intentionally; deletion does not mean every metadata file disappears. Create and Resolve refuse the retired identity. A late in-flight Create can leave empty controlled metadata requiring a repeated Delete after its syscall settles; it cannot authorize a new writer or reuse the object identity. Cleanup examines only that object's staging and trash, without a namespace-wide sweep or background service.
+
+NFS storage does not supply compute fencing or automatic distributed failover. Guest `flock` is not a cross-VM writer lock. The single-writer and explicit-deletion requirements above remain mandatory. The shared filesystem preserves `/environment`, while a Harness's private native history remains in its compute checkpoint; expiration of a native snapshot can therefore remove private history even while workspace files survive. Workspace retention alone is not a promise of resumable native execution after snapshot TTL expiry.
diff --git a/docs/zh/api/index.md b/docs/zh/api/index.md
index 21b217dcd..8e74b6ee9 100644
--- a/docs/zh/api/index.md
+++ b/docs/zh/api/index.md
@@ -1,7 +1,7 @@
 ---
 title: "API 命名空间和凭据"
 source: docs/api/index.md
-source_hash: 11df05084e85f1bc05650e11c2c744318b92ba7ac90280207956fce712335122
+source_hash: cb8f94a1fc272ce57b319fa375c9a82cc450092526492e2141d08ecca1cf42f2
 ---
 
 Core 提供三个命名空间。每个命名空间都有一种调用方及其独立凭据，凭据只能在其所属命名空间中使用。
@@ -9,7 +9,7 @@ Core 提供三个命名空间。每个命名空间都有一种调用方及其独
 | 命名空间 | 调用方 | 凭据 | 内容 | 所有者 |
 | --- | --- | --- | --- | --- |
 | `/v1` | 应用程序：业务系统和官方 OpenAI SDK | Project API key | 固定版本官方 Agents API 中全部且仅有的 58 个方法和路径对，列于 [upstream-routes.json](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/contracts/agents-api/upstream-routes.json)。仅属于 Core 的字段位于 `x_agents_core` 中：`harness`、`model_provider`、`harness_config`、`environment`，以及只读的 Session `installation` | [Agents API 指南](public-agent-api.md) |
-| `/core/v1` | Web 的控制台服务器和操作员脚本 | [Core key](../getting-started/operations.md#core-key) | 安装信息、Project 和密钥、资源读取和删除、Session 归档、执行器凭据、默认模型、指标、审计、沙箱部署和节点 | [Core 管理 API](../../../contracts/agents-api/zh/admin-api.md) |
+| `/core/v1` | Web 的控制台服务器和操作员脚本 | [Core key](../getting-started/operations.md#core-key) | 安装信息、Project 和密钥、资源读取和删除、Session 归档、执行器凭据、默认模型、指标、审计、沙箱部署和节点、独立工作区存储配置 | [Core 管理 API](../../../contracts/agents-api/zh/admin-api.md) |
 | `/api/v1` | 节点、Runtime 守护进程、自托管执行器及其安装程序 | 机器凭据：节点注册令牌和节点凭据、安装授权、执行器凭据和守护进程凭据。每种凭据只能用于其各自的路由 | `/api/v1/sandbox-node/*` 和 `/api/v1/agent-daemon/*` 下的机器初始化与连接（包括 WebSockets），以及公共原生安装程序下载 | [机器连接 API](../../../contracts/agents-api/zh/machine-api.md) |
 
 在其他命名空间中使用凭据会返回 401：在 `/core/v1` 或 `/api/v1` 上使用 Project API key，或者在 `/v1` 或 `/api/v1` 上使用 Core key。有关 Project 和密钥的行为，请参阅 [Project 自有资产](../concepts.md#projects-own-assets)。
@@ -21,3 +21,5 @@ Core 提供三个命名空间。每个命名空间都有一种调用方及其独
 ## 机器连接 API {#machine-connection-api}
 
 节点、Runtime 守护进程和自托管安装程序使用各自的凭据调用 `/api/v1`。[机器连接 API](../../../contracts/agents-api/zh/machine-api.md) 列出了每个路由、调用方和凭据。
+
+运维脚本通过经 Core key 认证的 `GET` 和 `PUT /core/v1/workspace-storage` 配置独立文件系统存储；参见[工作区存储](../../../contracts/agents-api/zh/admin-api.md#workspace-storage)。
diff --git a/docs/zh/architecture.md b/docs/zh/architecture.md
index 11b3c71fe..4be5d241a 100644
--- a/docs/zh/architecture.md
+++ b/docs/zh/architecture.md
@@ -1,10 +1,10 @@
 ---
 title: "架构"
 source: docs/architecture.md
-source_hash: 630c00591d3980e59b37969d1a149f774da118b3fce13ad5d9f63dfb9a4e216f
+source_hash: 75efb1d2899314719492ca4f2cd8bb5dbcdc14f54afb72ac33060a15da309d31
 ---
 
-OpenAgentCore 将编排、计算资源和原生执行分开。Core 负责 API 和持久状态。Sandbox Provider 管理计算资源。Runtime daemon 准备 Environment 并运行选定的 Harness；Harness 的原生 SDK 或协议负责模型与工具循环。
+OpenAgentCore 将编排、计算资源和原生执行分开。Core 负责 API 和持久状态。Sandbox Provider 管理计算资源。独立工作区文件系统 adapter 通过单独的协议管理 Environment 持久存储。Runtime daemon 准备 Environment 并运行选定的 Harness；Harness 的原生 SDK 或协议负责模型与工具循环。
 
 ```mermaid
 flowchart TB
@@ -34,6 +34,7 @@ flowchart TB
 | --- | --- | --- |
 | Core | 认证调用方，解析并冻结配置，调度 Turn，处理取消和待处理交互，将资源与执行事实持久化到 PostgreSQL | [Core 服务](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/README.md) |
 | Sandbox Provider | 创建、观察、续期和回收计算资源；提供 Runtime 启动输入 | [Sandbox Provider](sandbox-provider.md)、[Runtime 引导](runtime-bootstrap.md) |
+| Workspace filesystem adapter | 创建、观察和删除 Environment 持久存储；验证并解析计算资源所需的挂载 | [工作区文件系统 Provider](workspace-provider.md) |
 | Sandbox node | 运行 Docker 或 microsandbox 主机，协调分配给它的 generation 与 allocation | [Sandbox node 协议](../../contracts/agents-api/zh/node-generation-protocol.md) |
 | Runtime | 准备工作区和能力，管理 Session Executor，执行 Turn 并报告事件与回执 | [Core–Runtime 协议](runtime-protocol.md) |
 | Harness adapter | 验证原生配置，调用上游 SDK 或协议，转换事件并确认原生清理完成 | [Harness 接入](../../contracts/agents-api/zh/harness-onboarding.md) |
@@ -48,4 +49,4 @@ flowchart TB
 
 daemon 连接后，Core 检查可用 Harness 和请求的能力。Runtime 准备工作区 Environment 及其能力快照，然后准备或复用 Session Executor。每个 Turn 通过原生 Harness 运行。Core 持久化输出、工具交互和回执，供应用读取和接收事件。完成或取消使 Turn 结算；健康的 Executor 可以在同一 Environment 中执行下一个 Turn。
 
-执行与计算资源拥有独立生命周期：关闭 Executor 后，其 allocation 和工作区保留到 Provider 回收为止。准备、连接和执行就绪具有不同状态。[Environment 契约](../../contracts/agents-api/zh/environments.md) 负责准备规则，[Core–Runtime 协议](runtime-protocol.md) 负责顺序、回执和故障处理。
+执行、计算资源和独立工作区存储拥有不同的生命周期。关闭 Executor 本身不会删除存储。[工作区文件系统契约](workspace-provider.md#lifetime-and-filesystem-scope) 负责持久存储保留及显式删除规则；计算快照到期不授权回收工作区存储。准备、连接和执行就绪具有不同状态。[Environment 契约](../../contracts/agents-api/zh/environments.md) 负责准备规则，[Core–Runtime 协议](runtime-protocol.md) 负责顺序、回执和故障处理。
diff --git a/docs/zh/configuration.md b/docs/zh/configuration.md
index b8ad611ba..793535d52 100644
--- a/docs/zh/configuration.md
+++ b/docs/zh/configuration.md
@@ -1,7 +1,7 @@
 ---
 title: "配置参考"
 source: docs/configuration.md
-source_hash: 3e149cc2ca300bc53e14be2fd98b155c80098fd1e3b308a0b4d72d2ec3071558
+source_hash: eeb840aefb1eab56b16b5185c9fb6b3fcba5f0e9e666eaa32cf9e02f1e2fe134
 ---
 
 Core 安装的每项设置都恰好只有一个归属位置，分属以下三类：
@@ -91,6 +91,42 @@ Web 的 **System** 页面显示该安装的地址、默认模型和沙箱配置
 
 哪些 Harness 已启用以及默认 Harness 属于进程设置（`core.harnesses`、`core.default_harness`）；System 会以只读方式显示它们。[Core 管理 API](../../contracts/agents-api/zh/admin-api.md) 列出了所有 Core API 路由，[部署契约](../../contracts/agents-api/zh/sandbox-deployment.md) 定义了沙箱字段、限制和更改规则。
 
+### 独立工作区存储 {#independent-workspace-storage}
+
+首个支持的独立文件系统组合是 microsandbox 与[内核 NFS 适配器](./workspace-provider.md#kernel-nfs-adapter)。启动服务前，在 Linux Core 主机和所有参与节点上将同一个 NFSv4.2 导出挂载到相同的绝对路径，例如 `/srv/oac-workspaces`。运维人员负责导出、挂载可用性和服务启动顺序。使用带有 `root_squash` 的受信任客户端 AUTH_SYS 导出；不要启用 `no_root_squash` 或放宽权限来使检查通过。按照适配器的[所有权要求](./workspace-provider.md#kernel-nfs-adapter)准备命名空间和服务身份。
+
+Core 的 Compose 服务已使用 UID 65532 运行。添加节点前，创建同 UID 的 `oac-node`，主目录为 `/var/lib/oac-node`，使用 nologin shell 和非零主组。附加组只能包含其主组、`docker` 和 `kvm`；已有主目录必须属于该账户。安装器会接管此账户。如果没有预创建账户，安装器分配的系统 UID 不一定与 Core 一致。注册前应通过主机管理流程解决已有 UID 或账户冲突；修改运行中账户的 UID 不属于存储配置步骤。
+
+对于 Compose 部署，通过部署平台的 Compose 自定义能力，在现有 `core` 服务的 `volumes` 中添加可读写绑定挂载，保留现有服务卷和用户。主机源目录必须已经是 NFS 挂载；`create_host_path: false` 只防止创建不存在的源目录，并不能证明 NFS 已挂载。先挂载再创建容器；主机卸载或重新挂载后，应重新创建容器，使其挂载命名空间使用预期挂载。
+
+```yaml
+services:
+  core:
+    volumes:
+      - type: bind
+        source: /srv/oac-workspaces
+        target: /srv/oac-workspaces
+        read_only: false
+        bind:
+          create_host_path: false
+```
+
+按[管理 API](../../contracts/agents-api/zh/admin-api.md#workspace-storage)说明，使用 Core key 调用 `PUT /core/v1/workspace-storage` 选择存储。分别为不可变配置 `id` 和命名空间标记生成规范 UUID，然后使用实际值提交以下结构：
+
+```json
+{
+  "id": "11111111-1111-4111-8111-111111111111",
+  "adapter": "nfs",
+  "parameters": {
+    "root": "/srv/oac-workspaces",
+    "namespace_id": "22222222-2222-4222-8222-222222222222",
+    "uid": 65532
+  }
+}
+```
+
+随后通过[沙箱部署 API](../../contracts/agents-api/zh/sandbox-deployment.md#routes)创建或更新 microsandbox 部署，将 `resources.environment_disk_mib` 设为 `0`，并保留所需计算资源、Runtime 和 Provider 配置。正数表示请求配额，本适配器不实施此配额，因此会拒绝。部署的工作区要求和每个 Session 的挂载凭据均从已选数据库配置派生；不要向部署添加文件系统字段，也不要在节点文件中添加第二份存储配置。Web 没有工作区存储编辑器。
+
 ### 节点容量 {#node-capacity}
 
 生成 **Add node** 命令时，Core 会批准节点容量：**Sandboxes at once**（`max_active`，默认值为 2），并且仅对 microsandbox 还会批准 **Retained sandboxes**（`max_retained`，默认值为 8），其中 `max_retained >= max_active >= 1`。Docker 从不暂停沙箱，因此 Web 不会询问此项，并且 Core 会使 `max_retained` 保持等于 `max_active`。之后可使用 **Edit node** 修改这些值。预留和尚未确认的清理操作都会占用容量；调低限制不会停止任何正在运行的沙箱。节点自身的文件无法更改其容量、大小或 Runtime。
diff --git a/docs/zh/getting-started/nodes.md b/docs/zh/getting-started/nodes.md
index d0c39328b..d7c572de2 100644
--- a/docs/zh/getting-started/nodes.md
+++ b/docs/zh/getting-started/nodes.md
@@ -1,7 +1,7 @@
 ---
 title: "添加和管理节点"
 source: docs/getting-started/nodes.md
-source_hash: cd12954864bf9c15cf2d700fc3d9ebaf6126c0ab4297784850cfdd32b86ae656
+source_hash: 9b75587ccab0088003e8bd12afe477af0e72fe6650045f5283700248f9df327e
 ---
 
 节点是一台 Linux 主机，在沙箱后端为 Docker 或 microsandbox 时，为 Core 托管 Session 运行沙箱。Core 将新 Session 分配给有空余容量的节点；节点创建沙箱，沙箱回连 Core。E2B 不需要节点。应用为自己的 Session 连接的机器是[自托管执行器](self-hosted.md)，而不是节点。
@@ -16,6 +16,8 @@ source_hash: cd12954864bf9c15cf2d700fc3d9ebaf6126c0ab4297784850cfdd32b86ae656
 
 Core 主机与其他主机一样加入：要在它上面运行沙箱，将它添加为节点。
 
+对于使用独立工作区存储的 microsandbox，应在注册前完成此主机上的 [NFS 挂载和服务账户配置](../configuration.md#independent-workspace-storage)。节点随每次 binding 接收所选不可变文件系统配置；不要单独编写节点存储设置。
+
 ## 添加节点 {#add-a-node}
 
 1. 在 Web 打开 **Nodes**，选择 **Add node**。
diff --git a/docs/zh/sandbox-provider.md b/docs/zh/sandbox-provider.md
index 51ed3427e..67e1d5f25 100644
--- a/docs/zh/sandbox-provider.md
+++ b/docs/zh/sandbox-provider.md
@@ -1,7 +1,7 @@
 ---
 title: "添加 Sandbox Provider"
 source: docs/sandbox-provider.md
-source_hash: e14ff6b3d8166a04b629723aa4bd0fa6496b74307d0b6c60ebd454247c1ca3fd
+source_hash: ec6c807e262a37d2ecd456101dadf7ae4818f1bd711b4af5f08e27c9d1690d83
 ---
 
 **Sandbox Provider** 为 Core 管理的 Environment 提供 Runtime daemon 运行所需的外层计算资源，以及启动 daemon 的有界引导流程。本指南说明如何添加 Provider，并作为 Core 驱动 Provider 的参考。接口为 [`SandboxProvider`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/sandbox/sandbox_provider.go)。
@@ -73,6 +73,8 @@ Core 串行化生命周期操作，并在任何不确定 mutation 后保留 allo
 - `ErrNotFound`、空列表、超时或单独成功的 `Kill` 都不能证明进行中的 Create 不会稍后出现。
 - Core 也可以依据匹配的 running resource 和已完成 bootstrap 结算创建。取得此类证据或明确回执前，创建保持未知，即使清理尝试看不到资源。
 
+Microsandbox 在返回创建不存在回执前永久关闭初始 Create 准入；其 [helper 协议](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/tools/microsandbox-provider/README.md#create-and-bootstrap)定义持久化 allocation 锁屏障。普通 `GetCompute` 的不存在观察不关闭准入。
+
 `Kill` 负责清理 allocation 的计算资源和保留资源，包括部分 bootstrap storage；名称冲突时不删除其他租户资源。Core 仅在确认清理和创建已结算后释放持久所有权。关闭 Executor 或取消 Harness 不删除 Environment、工作区或 allocation。
 
 ### 操作结果与重试 {#operation-outcomes-and-retries}
@@ -233,3 +235,11 @@ node 使用 [provider 配置](configuration.md#docker-node-configuration)中的
 ### Seccomp profile {#seccomp-profile}
 
 [`seccomp.json`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/deploy/codex/seccomp.json) 是 [revision 65adc7e](https://github.com/moby/profiles/blob/65adc7e022c97f55e45c054ff012988027733b87/seccomp/default.json) 的 Moby default profile（Apache-2.0，参见 [seccomp.LICENSE](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/deploy/codex/seccomp.LICENSE)；上游文件 SHA-256 为 `785b2429264afba4d594320337cb17f144f3c7d51585f9805eef72e28f4f9334`），追加一条允许 `clone`、`unshare`、`setns`、`mount`、`umount2` 和 `pivot_root` 的规则。发行包将此文件作为 `runtime/seccomp.json` 交付每个 Docker node。
+
+## 独立工作区挂载 {#independent-workspace-attachment}
+
+`Bootstrap.Workspace` 和 `ResumeRequest.Workspace` 可携带[工作区文件系统绑定](workspace-provider.md)。未提供时使用 Provider 自有的 Environment 磁盘；提供时选择精确的外部对象，不得回退到自有磁盘。Provider 在解析前校验租户、Environment、绑定及其配置回执。`LocalOptions.Workspace` 注入文件系统解析器；Sandbox Provider 不解释文件系统适配器参数或原生回执。
+
+`DeploymentPolicy.Workspace` 声明挂载要求；未声明表示不支持外部存储。派生的不可变 `DeploymentSpec.Workspace` 回执选择代次的模式和能力；[部署流程](../../contracts/agents-api/zh/sandbox-deployment.md#resources)不会将文件系统配置复制进代次。Microsandbox 要求 `host_directory` 和 `user_xattr`；Docker 和 E2B 拒绝外部挂载。`ValidateWorkspacePolicy` 使用文件系统协议的组合校验器：不强制容量配额的外部文件系统拒绝正值 `EnvironmentDiskMiB`，零表示不请求配额。根磁盘容量仍为必需。未提供外部声明时，继续使用自有磁盘的容量边界。
+
+Microsandbox 在每次 Create 和 Resume（包括观察中断的恢复）时解析绑定，仅向私有 helper 传递本地目录和不可变 ObjectID。Helper 挂载整个 `/environment`，包含 workspace、staging、initialization 和 packages；私有 HOME 及 Harness 历史仍保存在 VM 根磁盘检查点中。原生资源通过明确的模式、对象和路径标签校验，不根据挂载形状推断模式。恢复校验快照对象，通过 SDK `Volumes` 重映射 `/environment`，要求严格外部挂载策略，并拒绝任何恢复警告。恢复部分失败时保留精确目标身份用于清理，不证明就绪。未知结果继续观察原操作。原生 Bind 检查点及 guest 内 flock 连续性证据不证明跨 VM 隔离。
diff --git a/docs/zh/workspace-provider.md b/docs/zh/workspace-provider.md
new file mode 100644
index 000000000..489696153
--- /dev/null
+++ b/docs/zh/workspace-provider.md
@@ -0,0 +1,62 @@
+---
+title: 工作区文件系统 Provider
+source: docs/workspace-provider.md
+source_hash: e9749e1aab1fc2135dcd92a843263243e4adccea393038c495fec67e114dbe83
+---
+
+独立工作区文件系统边界由 [`workspacefs.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/workspacefs/workspacefs.go) 定义。本文规定必需的集成契约，并不表示所有 Sandbox Provider 或执行位置均已实现。文件系统适配器拥有存储对象与原生挂载解析职责；[Sandbox Provider](sandbox-provider.md) 拥有计算资源职责。Core 在分配任一资源前选择并验证二者的组合。
+
+## 标识与配置 {#identity-and-configuration}
+
+`Reference` 包含 `TenantID`、`EnvironmentID` 和 `ObjectID`，均为不可变、规范小写且非零的 UUID。Core 在创建前持久化引用。对象标识永不复用，包括删除后或变更结果尚未确认时。适配器必须在暴露或删除对象前验证完整的归属元组。
+
+`Configuration` 是 Core 数据库中的不可变记录，具有规范 UUID `ID`、`Adapter` 标识和由适配器定义的 JSON 对象 `Parameters`。数据库是其唯一编写来源；更改配置须创建新的标识。Core 转发参数而不解释原生路径。现有对象始终绑定其原始配置。
+
+`Attachment` 将适配器签发的 JSON 对象 `Native` 绑定到完整引用、配置 ID 和挂载类型。它是内部归属凭证，不是应用提供的主机路径。共享验证检查信封结构以及预期引用和配置的匹配；所选适配器还必须验证参数、凭证及原生归属。结构有效本身绝不授权文件系统访问。公开 Session 载荷不得提供挂载凭证、配置参数或解析后的主机目录。
+
+`Binding` 临时携带配置和挂载凭证至节点解析器，不引入第二份持久化节点配置。`Resolver.Resolve` 验证绑定后返回用于本地计算挂载的 `Directory{Path}`。仅适配器负责将原生存储解析为规范绝对路径；Core 不构造路径。结构有效的目录本身不是归属凭证。
+
+## 操作与结果 {#operations-and-outcomes}
+
+每个控制适配器实现 `Declaration`、`Check`、`Create`、`Observe` 和 `Delete`；每个节点挂载适配器实现 `Resolve`。不得使用可选旁路接口、隐式替换适配器或 nil 实现回退。
+
+| 操作 | 必需语义 |
+| --- | --- |
+| `Declaration()` | 描述所选配置已经验证的挂载、用户扩展属性和配额行为。 |
+| `Check(ctx)` | 验证配置和可用性，不创建对象。 |
+| `Create(ctx, reference)` | 创建归属对象或收敛到其现有挂载凭证，不覆盖数据；重试与并发调用使用同一不可变引用。 |
+| `Observe(ctx, reference)` | 返回现有对象的绑定挂载凭证，不创建、修复或准备对象。 |
+| `Delete(ctx, reference)` | Core 授权删除且确认计算资源停止后，收敛到已验证归属对象的终态删除。 |
+| `Resolve(ctx, binding)` | 验证原生归属并为本地计算解析挂载。 |
+
+错误支持 `errors.Is`：`ErrInvalid` 表示无效输入，`ErrOwnership` 表示引用或配置不匹配，`ErrUnavailable` 表示存储不可用，`ErrUnconfirmed` 表示变更结果未知，`ErrNotFound` 表示对象不存在，`ErrUnsupported` 表示不支持的组合。适配器包装错误时保留这些结果。观察到不存在不证明先前变更已结束。超时或上下文取消只结束调用方的等待，不证明原生操作停止或回滚。结果未知时 Core 保留归属。Core 可以使用同一持久化不可变引用和配置重试 `Create` 或 `Delete`，包括收到 `ErrUnconfirmed` 后；绝不能通过替换新对象标识重试结果不确定的操作。
+
+同一引用的重试与并发收敛是适配器必须提供的保证。`Create` 保留现有对象数据并返回该归属对象的挂载凭证，绝不重新初始化存活对象。重复或并发的 `Delete` 调用收敛到同一终态删除。一旦记录终态删除，并发、延迟或重试的 `Create` 均不得使对象复活，`Resolve` 也不得暴露该对象。允许保留删除元数据，并在先前进行中的操作结束后继续清理。这些保证适用于存储生命周期操作，不表示超时时变更已结束，也不提供分布式计算隔离。
+
+## 能力验证 {#capability-validation}
+
+`Requirements` 声明计算位置的挂载类型及 `user_xattr` 需求。`Declaration` 报告文件系统适配器的挂载类型、`UserXAttr` 支持和 `CapacityQuota` 强制执行能力。`ValidateCombination` 是共享的分配前准入检查。当前挂载类型为 `host_directory`；未知类型会被拒绝。用户扩展属性能力表示挂载后的文件系统支持 Environment 准备流程使用的用户扩展属性。
+
+请求容量为零表示未请求配额。以 MiB 为单位的正容量仅在适配器实际强制执行该限制时获准；报告可用空间或接受未经检查的数字均不足够。适配器的不可变配置必须强制执行获准上限。适配器不能仅根据 Sandbox Provider 的计算磁盘大小声明配额支持。
+
+工作区仅允许单写入方访问。Core 必须串行管理计算资源归属，并在挂载替代计算资源前确认先前写入方已停止。本协议没有跨虚拟机锁能力：客户机内的 `flock` 不证明主机锁或对其他客户机的互斥。执行位置不得基于客户机本地锁宣称并发挂载安全。
+
+## 生命周期与文件系统范围 {#lifetime-and-filesystem-scope}
+
+对象包含整个 `/environment` 目录树，包括工作区、暂存文件、初始化状态和包内容。它们位于同一文件系统，以保留 Environment 准备期间文件系统操作的语义。Harness 的私有原生历史和配置仍属于检查点状态，不重定向到工作区对象。
+
+工作区存储随 Session 保留，直至显式删除 Session。归档、过期、重置和删除计算检查点均不授权删除工作区。Core 仅在显式删除 Session 且确认计算资源停止后调用 `Delete`；未解决的计算或存储变更须保留归属。Session 仍被保留时，创建失败不授权删除其存储。本契约不定义快照过期恢复。
+
+## 内核 NFS 适配器 {#kernel-nfs-adapter}
+
+`nfs` 适配器使用由运维人员预挂载的 Linux 内核 NFS 文件系统。支持的配置是受信任 AUTH_SYS 客户端上的 NFSv4.2，启用 `root_squash`，Core 和节点使用相同导出和绝对挂载路径。适配器不挂载导出，也不管理 NFS 凭据或服务账户。其他操作系统返回 `ErrUnsupported`。[配置文档](./configuration.md#independent-workspace-storage)负责安装步骤和选择方式。
+
+参数精确包含 `root`、`namespace_id` 和 `uid`。`root` 是规范的绝对挂载路径；`namespace_id` 是非零规范 UUID；`uid` 是 Core 和节点均须使用的非零有效主机 UID。初始部署使用 65532。运维人员将挂载根目录设置为该 UID 所有、权限 `0700`，并准备同 UID 所有、权限 `0600` 的常规文件 `.oac-storage-root`，内容精确为命名空间 UUID 加一个换行符。应由导出服务端管理员在服务端存储上完成此操作；启用 root squash 的客户端不能假定有权变更所有者。根标记声明所选导出的身份，并非凭据或分布式锁。
+
+构造函数只验证并规范化 JSON，不执行文件系统 I/O。`Check` 验证打开的根目录确实位于内核 NFS，有效 UID 与私有所有权和权限匹配，命名空间标记匹配，并且实际文件描述符上的 `user.*` xattr 设置、读取和删除成功。包括打开根目录和可用性检查在内的所有文件系统操作，共享每进程最多 32 个在途操作的预算。调用者超时后收到 `ErrUnconfirmed`；该操作仍占用名额，直到内核调用返回。预算耗尽返回 `ErrUnavailable`。相对于目录描述符的操作始终锚定已打开的根目录。挂载不可用或配置路径只是本地目录时，验证失败，不创建本地回退。
+
+能力声明为 `host_directory`、`user_xattr: true`、`capacity_quota: false`。原生挂载凭据仅包含命名空间标识；解析时根据不可变配置和文件系统所有权验证完整 binding，随后返回根目录下的 `objects/<ObjectID>/live/data`。仅此数据目录暴露给 guest。租户和应用输入都不提供主机路径。
+
+每个对象拥有 `objects/<ObjectID>/identity`、`staging/`、`live/`、`trash/`，以及删除开始后的 `deleted-marker`。永久标识绑定租户、Environment 和对象 UUID。Create 先准备并同步唯一的私有 staging 封装目录，再原子发布其非空目录为 `live`；重放不会覆盖现有 live 数据。Delete 先持久记录对象本地的终态标记，将 live 数据退役到唯一的对象本地 trash，再先删除数据、后删除其所有权标记。并发删除者收敛。最少量的标识和删除元数据会有意保留；删除不代表所有元数据文件均消失。Create 和 Resolve 拒绝已退役标识。迟到的在途 Create 可能留下空的受控元数据，需要在其系统调用完成后重复 Delete；它不能授权新写入者或复用对象标识。清理只查看该对象的 staging 和 trash，不全量扫描命名空间，也不使用后台服务。
+
+NFS 存储不提供计算 fencing 或自动分布式故障转移。Guest `flock` 不是跨 VM 写入者锁。上述单写入者和显式删除要求仍然必须遵守。共享文件系统保留 `/environment`，Harness 的私有原生历史仍在计算检查点内；因此，即使工作区文件仍然存在，原生快照过期仍可能导致私有历史丢失。保留工作区不代表原生快照 TTL 到期后仍可恢复原生执行。
diff --git a/packages/agents-client/src/deployment-contract.ts b/packages/agents-client/src/deployment-contract.ts
index 1106413a9..66f8bd5db 100644
--- a/packages/agents-client/src/deployment-contract.ts
+++ b/packages/agents-client/src/deployment-contract.ts
@@ -1,3 +1,3 @@
 // Code generated by services/core/cmd/specification-contract from sandbox/deployment_contract.go; DO NOT EDIT.
 
-export const deploymentContract = {"resources":[{"name":"cpus","min":1,"max":255,"omit_zero":false},{"name":"memory_mib","min":512,"max":1048576,"omit_zero":false},{"name":"root_disk_mib","min":0,"max":4294967295,"omit_zero":true},{"name":"environment_disk_mib","min":0,"max":4294967295,"omit_zero":true}],"runtime":[{"name":"source_commit","pattern":"[0-9a-f]{40}"},{"name":"image_id","pattern":"sha256:[0-9a-f]{64}"},{"name":"image_manifest_digest","pattern":"sha256:[0-9a-f]{64}"},{"name":"microsandbox_ref","pattern":"oac-runtime@sha256:[0-9a-f]{64}"},{"name":"runtime_sha256","pattern":"[0-9a-f]{64}"},{"name":"firmware_sha256","pattern":"[0-9a-f]{64}"}],"providers":{"docker":{"mode":"nodes","disk":false,"runtime":true,"default_resources":{"cpus":2,"memory_mib":2048}},"e2b":{"mode":"direct","disk":false,"runtime":false,"default_resources":null},"microsandbox":{"mode":"nodes","disk":true,"runtime":true,"default_resources":{"cpus":2,"memory_mib":4096,"root_disk_mib":8192,"environment_disk_mib":8192}}},"minimum_disk":1024} as const;
+export const deploymentContract = {"workspace_fields":["attachment","user_xattr","capacity_quota"],"resources":[{"name":"cpus","min":1,"max":255,"omit_zero":false},{"name":"memory_mib","min":512,"max":1048576,"omit_zero":false},{"name":"root_disk_mib","min":0,"max":4294967295,"omit_zero":true},{"name":"environment_disk_mib","min":0,"max":4294967295,"omit_zero":true}],"runtime":[{"name":"source_commit","pattern":"[0-9a-f]{40}"},{"name":"image_id","pattern":"sha256:[0-9a-f]{64}"},{"name":"image_manifest_digest","pattern":"sha256:[0-9a-f]{64}"},{"name":"microsandbox_ref","pattern":"oac-runtime@sha256:[0-9a-f]{64}"},{"name":"runtime_sha256","pattern":"[0-9a-f]{64}"},{"name":"firmware_sha256","pattern":"[0-9a-f]{64}"}],"providers":{"docker":{"mode":"nodes","disk":false,"runtime":true,"default_resources":{"cpus":2,"memory_mib":2048}},"e2b":{"mode":"direct","disk":false,"runtime":false,"default_resources":null},"microsandbox":{"mode":"nodes","workspace":{"attachment":"host_directory","user_xattr":true},"disk":true,"runtime":true,"default_resources":{"cpus":2,"memory_mib":4096,"root_disk_mib":8192,"environment_disk_mib":8192}}},"minimum_disk":1024} as const;
diff --git a/packages/agents-client/src/generated/core-api.ts b/packages/agents-client/src/generated/core-api.ts
index ef70621b7..41f6ffd14 100644
--- a/packages/agents-client/src/generated/core-api.ts
+++ b/packages/agents-client/src/generated/core-api.ts
@@ -114,6 +114,14 @@ export interface AdminauditPage {
   next_cursor: string;
 }
 export const adminauditPageFields = ["data", "has_more", "next_cursor"] as const;
+export const attachmentKindValues = ["host_directory"] as const;
+export type AttachmentKind = (typeof attachmentKindValues)[number];
+export interface Configuration {
+  adapter: string;
+  id: string;
+  parameters: Record<string, unknown>;
+}
+export const configurationFields = ["adapter", "id", "parameters"] as const;
 export interface ConfigurationDiscoveryInput {
   configuration?: Record<string, unknown>;
   credential?: Record<string, unknown>;
@@ -173,6 +181,12 @@ export interface DatabaseBucket {
   start: string;
 }
 export const databaseBucketFields = ["ping_p95_ms", "pool_in_use", "start"] as const;
+export interface Declaration {
+  attachment: AttachmentKind;
+  capacity_quota: boolean;
+  user_xattr: boolean;
+}
+export const declarationFields = ["attachment", "capacity_quota", "user_xattr"] as const;
 export const deploymentModeValues = ["", "nodes", "direct"] as const;
 export type DeploymentMode = (typeof deploymentModeValues)[number];
 export interface DeploymentResources {
@@ -183,8 +197,9 @@ export const deploymentResourcesFields = ["allocations", "pending"] as const;
 export interface DeploymentSpec {
   resources: SandboxResources;
   runtime?: RuntimeRelease;
+  workspace?: Declaration;
 }
-export const deploymentSpecFields = ["resources", "runtime"] as const;
+export const deploymentSpecFields = ["resources", "runtime", "workspace"] as const;
 export const deploymentSpecRequired = ["resources"] as const;
 export interface DeploymentView {
   configuration?: Record<string, unknown>;
diff --git a/packages/agents-client/src/sandbox-client.test.ts b/packages/agents-client/src/sandbox-client.test.ts
index 1f32f2173..a50ec0e3b 100644
--- a/packages/agents-client/src/sandbox-client.test.ts
+++ b/packages/agents-client/src/sandbox-client.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, expectTypeOf, it, vi } from "vitest";
 import { AgentCoreError, OpenAIAgentsClient } from "./client";
 import { SandboxAdminClient, normalizeSandboxNodeDiagnostic, sandboxNodeDiagnostics, type SandboxNode } from "./sandbox-client";
 
+import { deploymentContract } from "./deployment-contract";
 import nodeDiagnosticFixture from "../../../services/core/internal/sandbox/testdata/node-diagnostics.json";
 
 function response(value: unknown, status = 200) { return new Response(JSON.stringify(value), { status }); }
@@ -52,6 +53,9 @@ const microsandbox = {
   ...docker, provider: "microsandbox", specification: { resources: { cpus: 2, memory_mib: 2048, root_disk_mib: 8192, environment_disk_mib: 8192 }, runtime },
   suspension: { idle_seconds: 300, retention_seconds: 86400 },
 };
+const externalWorkspace = { ...deploymentContract.providers.microsandbox.workspace, capacity_quota: false };
+const externalDeployment = { ...microsandbox, specification: { ...microsandbox.specification,
+  resources: { ...microsandbox.specification.resources, environment_disk_mib: 0 }, workspace: externalWorkspace } };
 /** An E2B selection saved before Core recorded its template build. */
 const e2bDeployment = {
   ...docker, provider: "e2b", rollout: unconfigured.rollout, mode: "direct", specification: { resources: { cpus: 2, memory_mib: 2048 } },
@@ -73,11 +77,15 @@ const { specification_digest: _digest, ...undigested } = docker;
 const { compute_phase_changed_at: _changed, ...unphased } = allocation;
 
 describe("strict sandbox administration projections", () => {
+  it.each([null, {}, { ...externalWorkspace, capacity_quota: "false" }, { ...externalWorkspace, attachment: "arbitrary_path" }, { ...externalWorkspace, path: "/host" }])("rejects an invalid workspace receipt %j", async (workspace) => {
+    await expect(read("deployment", { ...externalDeployment, specification: { ...externalDeployment.specification, workspace } })).rejects.toMatchObject({ code: "invalid_admin_response" });
+  });
+
   it.each([
     ["nodes", "ready and unready", { data: [node, unready] }], ["nodes", "empty", { data: [] }],
     ["detail", "observed", detail], ["unobserved", "never observed", unobserved],
     ["allocations", "known and unknown phase times", { data: [allocation, { ...allocation, compute_phase: "suspended", compute_phase_changed_at: created, diagnostic: "node_unavailable" }] }],
-    ["deployment", "unconfigured", unconfigured], ["deployment", "Docker", docker], ["deployment", "microsandbox", microsandbox], ["deployment", "E2B", e2bDeployment],
+    ["deployment", "unconfigured", unconfigured], ["deployment", "Docker", docker], ["deployment", "microsandbox", microsandbox], ["deployment", "external workspace", externalDeployment], ["deployment", "E2B", e2bDeployment],
   ])("accepts %s as Core serializes it: %s", async (name, _, body) => {
     expect(await read(name, body)).toEqual(body);
   });
diff --git a/packages/agents-client/src/sandbox-client.ts b/packages/agents-client/src/sandbox-client.ts
index 853bc4eeb..9820d0015 100644
--- a/packages/agents-client/src/sandbox-client.ts
+++ b/packages/agents-client/src/sandbox-client.ts
@@ -3,6 +3,7 @@ import { CoreRequester, type CoreClientOptions } from "./core-request";
 import { deploymentContract } from "./deployment-contract";
 import { hasOwn, isNonnegativeInteger, isOneOf, isRecord, onlyFields, sameResourceId, schemaFields } from "./response-projection";
 import {
+  attachmentKindValues,
   deploymentResourcesFields, deploymentSpecFields, deploymentSpecRequired, deploymentViewFields, deploymentModeValues, deploymentViewRequired,
   hostHistoryFields, hostHistoryPointFields, nodeAllocationDiagnosticValues, nodeAllocationFields, nodeDetailFields, nodeDetailRequired,
   nodeDiagnosticCodeValues, nodeFields, nodeHostFields, nodeRequired, nodeRolloutFields, nodeRolloutRequired, nodeRolloutStateValues, resetModeValues,
@@ -100,10 +101,18 @@ function projectSpecification(value: unknown): SandboxSpecification {
   const specification = members(value, deploymentSpecFields, deploymentSpecRequired);
   const resources = members(specification.resources, sandboxResourcesFields, sandboxResourcesRequired);
   valid(Object.values(resources).every(isNonnegativeInteger));
-  if (!hasOwn(specification, "runtime")) return { resources: { ...resources } as unknown as SandboxResources };
-  const runtime = members(specification.runtime, runtimeReleaseFields);
-  valid(strings(runtime, runtimeReleaseFields));
-  return { resources: { ...resources } as unknown as SandboxResources, runtime: { ...runtime } as unknown as SandboxRuntimeRelease };
+  const result: SandboxSpecification = { resources: { ...resources } as unknown as SandboxResources };
+  if (hasOwn(specification, "workspace")) {
+    const workspace = members(specification.workspace, deploymentContract.workspace_fields);
+    if (!isOneOf(attachmentKindValues, workspace.attachment) || typeof workspace.user_xattr !== "boolean" || typeof workspace.capacity_quota !== "boolean") return invalidSandboxResponse();
+    result.workspace = { attachment: workspace.attachment, user_xattr: workspace.user_xattr, capacity_quota: workspace.capacity_quota };
+  }
+  if (hasOwn(specification, "runtime")) {
+    const runtime = members(specification.runtime, runtimeReleaseFields);
+    valid(strings(runtime, runtimeReleaseFields));
+    result.runtime = { ...runtime } as unknown as SandboxRuntimeRelease;
+  }
+  return result;
 }
 /** The adapter's public projection has no credential member. */
 function projectE2B(configuration: unknown, metadata: unknown): Pick<SandboxDeployment, "configuration" | "metadata"> {
diff --git a/services/core/cmd/sandbox-node/generations.go b/services/core/cmd/sandbox-node/generations.go
index e6b88a62c..136aabac9 100644
--- a/services/core/cmd/sandbox-node/generations.go
+++ b/services/core/cmd/sandbox-node/generations.go
@@ -17,6 +17,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/node"
 	providerconfig "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
+	workspaceproviders "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs/providers"
 )
 
 func runGenerations(ctx context.Context, registry *providerconfig.Registry, configFile, stateDir string) error {
@@ -167,7 +168,7 @@ func runGenerations(ctx context.Context, registry *providerconfig.Registry, conf
 }
 
 func buildGeneration(registry *providerconfig.Registry, config sandbox.NodeConfig, stateDir string) (node.GenerationProvider, error) {
-	built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{GenerationStateDirectory: stateDir})
+	built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{GenerationStateDirectory: stateDir, Workspace: workspaceproviders.New()})
 	if err != nil {
 		return node.GenerationProvider{}, err
 	}
diff --git a/services/core/cmd/sandbox-node/main.go b/services/core/cmd/sandbox-node/main.go
index 1cef71944..2a6d3b032 100644
--- a/services/core/cmd/sandbox-node/main.go
+++ b/services/core/cmd/sandbox-node/main.go
@@ -19,6 +19,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/node"
 	providerconfig "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
+	workspaceproviders "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs/providers"
 )
 
 func main() {
@@ -81,7 +82,7 @@ func run(ctx context.Context, args []string) error {
 	if err != nil {
 		return err
 	}
-	built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{Standalone: true})
+	built, closeProvider, err := registry.Build(config, sandbox.LocalOptions{Standalone: true, Workspace: workspaceproviders.New()})
 	if err != nil {
 		return err
 	}
diff --git a/services/core/cmd/server/http_routes_test.go b/services/core/cmd/server/http_routes_test.go
index 7458a372a..7ac68adbe 100644
--- a/services/core/cmd/server/http_routes_test.go
+++ b/services/core/cmd/server/http_routes_test.go
@@ -107,7 +107,7 @@ func daemonComposition(t testing.TB) http.Handler {
 		ArtifactsReader: struct{ api.ArtifactsReader }{},
 		SessionAdmin:    struct{ api.SessionAdmin }{}, Environments: struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, ExecutorConnections: struct{ api.ExecutorConnections }{},
 		Admin: struct{ api.Admin }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{}, Metrics: struct{ api.Metrics }{},
-		RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
+		RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{}, WorkspaceStorage: struct{ api.WorkspaceStorage }{},
 		Execution: api.Execution{
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
 			SessionAdmission: struct{ api.SessionAdmission }{},
diff --git a/services/core/cmd/server/main.go b/services/core/cmd/server/main.go
index a14ba9891..6c358db24 100644
--- a/services/core/cmd/server/main.go
+++ b/services/core/cmd/server/main.go
@@ -55,6 +55,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/skillpg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/templatepg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/vaultpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/workspacepg"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/processconfig"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtime"
@@ -65,6 +66,8 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/vaults"
+	workspaceproviders "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs/providers"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/migrations"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
@@ -149,6 +152,8 @@ func run(config processconfig.Config) error {
 		return err
 	}
 	sandboxProviders := providers.Builtin()
+	workspaceProviders := workspaceproviders.New()
+	workspaceStore := workspacepg.New(units)
 	// The placement rules are built once: the provider declarations and the
 	// public URL never change while Core runs.
 	placementRules, err := placement.NewRules(sandboxProviders, config.PublicOrigin.String())
@@ -240,6 +245,7 @@ func run(config processconfig.Config) error {
 	}
 	// From this call on the Worker closes the lease, even when it fails to start.
 	worker, err = execution.StartWorker(ctx, dispatcher, execution.Owner{
+		Workspaces: workspaces.NewExecution(workspaceStore, workspacepg.NewExecution(lease), workspaceProviders, lease),
 		Lease:      lease,
 		Deployment: deploymentExecution,
 		Sessions:   sessionExecution,
@@ -318,6 +324,7 @@ func run(config processconfig.Config) error {
 		Environments:    sessionService, EnvironmentsReader: sessionStore, ExecutorConnections: executorConnections{sessions: sessionStore, registry: registry},
 		Admin: sessionStore, AdminAudit: auditStore, WriteAudit: auditStore, Metrics: metrics,
 		RuntimeObservations: observationService, RuntimeHistory: historyService,
+		WorkspaceStorage: worker,
 		Execution: api.Execution{
 			ExecutorURL:      executorURL,
 			SessionAdmission: worker,
diff --git a/services/core/cmd/server/managed_setup.go b/services/core/cmd/server/managed_setup.go
index 570717417..758ff5db0 100644
--- a/services/core/cmd/server/managed_setup.go
+++ b/services/core/cmd/server/managed_setup.go
@@ -150,8 +150,13 @@ func (s *managedSetup) configuration(setup deployment.Setup) (execution.Prepared
 	if err != nil {
 		return execution.PreparedRuntimeDeployment{}, fmt.Errorf("%w: %v", execution.ErrExecutionUnavailable, err)
 	}
+	adapter, err := s.registry.Lookup(setup.Provider)
+	if err != nil {
+		return execution.PreparedRuntimeDeployment{}, err
+	}
 	selected := &execution.RuntimeProvider{InstallationID: setup.InstallationID, ProviderKind: setup.Provider, Generation: setup.Generation, Mode: setup.Mode,
-		CoreURL: s.runtimeAPI, BackendFingerprint: setup.BackendFingerprint, Provider: provider}
+		CoreURL: s.runtimeAPI, BackendFingerprint: setup.BackendFingerprint, Provider: provider,
+		Resources: setup.Specification.Resources, WorkspaceRequirements: adapter.Policy.Workspace, Workspace: setup.Specification.Workspace}
 	if setup.Suspension != nil {
 		selected.Suspension = &execution.RuntimeSuspensionPolicy{IdleTimeout: time.Duration(setup.Suspension.IdleSeconds) * time.Second,
 			Retention: time.Duration(setup.Suspension.RetentionSeconds) * time.Second}
diff --git a/services/core/deploy/e2b/helper_contract_generated.py b/services/core/deploy/e2b/helper_contract_generated.py
index 04d6c13b3..77d1869fd 100644
--- a/services/core/deploy/e2b/helper_contract_generated.py
+++ b/services/core/deploy/e2b/helper_contract_generated.py
@@ -1,7 +1,8 @@
 # Code generated by contractgen; DO NOT EDIT.
 """Adapter-private wire declarations. No SDK or repository dependency."""
 ERROR_CODES = ["","invalid","ownership","exists","not_found","command_unconfirmed","unconfirmed","template_invalid","team_mismatch","unauthorized"]
-MANAGED_BOOTSTRAP_FIELDS = ["TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","NetworkAccess","AllowedDomains","InstallationID","RuntimeBootstrap"]
+MANAGED_BOOTSTRAP_FIELDS = ["Workspace","TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","NetworkAccess","AllowedDomains","InstallationID","RuntimeBootstrap"]
+MANAGED_BOOTSTRAP_REQUIRED_FIELDS = ["TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","NetworkAccess","AllowedDomains","InstallationID","RuntimeBootstrap"]
 MANAGED_IDENTITY_FIELDS = ["TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","InstallationID"]
 MAX_COMMAND_INPUT = 52428832
 MAX_CREDENTIAL_REFERENCES = 32
diff --git a/services/core/deploy/e2b/managed_init.py b/services/core/deploy/e2b/managed_init.py
index a64931f14..588f69d80 100644
--- a/services/core/deploy/e2b/managed_init.py
+++ b/services/core/deploy/e2b/managed_init.py
@@ -20,7 +20,9 @@
 
 def identity(payload):
     fields = contract.MANAGED_IDENTITY_FIELDS
-    if not isinstance(payload, dict) or set(payload) != set(contract.MANAGED_BOOTSTRAP_FIELDS):
+    if (not isinstance(payload, dict) or set(payload) - set(contract.MANAGED_BOOTSTRAP_FIELDS) or
+            not set(contract.MANAGED_BOOTSTRAP_REQUIRED_FIELDS) <= set(payload) or
+            payload.get("Workspace") is not None):
         raise ValueError('Invalid managed bootstrap fields')
     for field in fields:
         value = payload[field]
diff --git a/services/core/internal/api/core_routes.go b/services/core/internal/api/core_routes.go
index f65a0d6d1..08656b28c 100644
--- a/services/core/internal/api/core_routes.go
+++ b/services/core/internal/api/core_routes.go
@@ -17,6 +17,8 @@ func (h *Handler) registerCoreRoutes(router chi.Router) {
 			writeError(w, http.StatusNotFound, "not_found", "This Core operation does not exist.")
 		})
 		r.Get("/installation", h.getInstallation)
+		r.Get("/workspace-storage", h.getWorkspaceStorage)
+		r.Put("/workspace-storage", h.putWorkspaceStorage)
 		h.registerProjectAPIKeyRoutes(r)
 		h.registerAdminResourceRoutes(r)
 		h.registerExecutorCredentialRoutes(r)
diff --git a/services/core/internal/api/dependencies.go b/services/core/internal/api/dependencies.go
index ba2cac514..48c6207d5 100644
--- a/services/core/internal/api/dependencies.go
+++ b/services/core/internal/api/dependencies.go
@@ -28,6 +28,7 @@ type Dependencies struct {
 	// InstallationBindings counts what is bound to the current public URL.
 	Installation         Installation
 	InstallationBindings InstallationBindings
+	WorkspaceStorage     WorkspaceStorage
 
 	Projects             Projects
 	ProjectsReader       ProjectsReader
@@ -120,6 +121,7 @@ func (d Dependencies) validate() error {
 	}
 	if err := required(
 		field{"InstallationBindings", d.InstallationBindings},
+		field{"WorkspaceStorage", d.WorkspaceStorage},
 		field{"Projects", d.Projects}, field{"ProjectsReader", d.ProjectsReader},
 		field{"Vaults", d.Vaults}, field{"VaultsReader", d.VaultsReader},
 		field{"ModelProviders", d.ModelProviders}, field{"ModelProvidersReader", d.ModelProvidersReader},
diff --git a/services/core/internal/api/dependencies_test.go b/services/core/internal/api/dependencies_test.go
index e3d585561..48262d85b 100644
--- a/services/core/internal/api/dependencies_test.go
+++ b/services/core/internal/api/dependencies_test.go
@@ -15,6 +15,7 @@ const testExecutorURL = "wss://core.example/api/v1/agent-daemon/ws"
 
 // testFakes holds one strict fake per Dependencies area.
 type testFakes struct {
+	workspaceStorage       *fakeWorkspaceStorage
 	projects               *fakeProjects
 	projectsReader         *fakeProjectsReader
 	vaults                 *fakeVaults
@@ -68,7 +69,8 @@ type testFakes struct {
 func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 	t.Helper()
 	f := &testFakes{
-		projects: &fakeProjects{t: t}, projectsReader: &fakeProjectsReader{t: t},
+		workspaceStorage: &fakeWorkspaceStorage{t: t},
+		projects:         &fakeProjects{t: t}, projectsReader: &fakeProjectsReader{t: t},
 		modelProviders: &fakeModelProviders{t: t}, modelProvidersReader: &fakeModelProvidersReader{t: t},
 		vaults: &fakeVaults{t: t}, vaultsReader: &fakeVaultsReader{t: t},
 		environmentTemplates: &fakeEnvironmentTemplates{t: t}, environmentTemplatesReader: &fakeEnvironmentTemplatesReader{t: t},
@@ -95,7 +97,8 @@ func testDependencies(t testing.TB) (Dependencies, *testFakes) {
 		configurationDiscovery: &fakeConfigurationDiscovery{t: t},
 	}
 	return Dependencies{
-		Engine: "codex", CoreKeys: coreKeys(t, "admin"), InstallationBindings: f.installationBindings,
+		WorkspaceStorage: f.workspaceStorage,
+		Engine:           "codex", CoreKeys: coreKeys(t, "admin"), InstallationBindings: f.installationBindings,
 		Projects: f.projects, ProjectsReader: f.projectsReader,
 		ModelProviders: f.modelProviders, ModelProvidersReader: f.modelProvidersReader,
 		Vaults: f.vaults, VaultsReader: f.vaultsReader,
@@ -181,6 +184,7 @@ func TestNewHandlerRejectsIncompleteDependencies(t *testing.T) {
 		{"default Harness", func(d *Dependencies, _ *testFakes) { d.Engine = "" }},
 		{"CoreKeys", func(d *Dependencies, _ *testFakes) { d.CoreKeys = nil }},
 		{"InstallationBindings", func(d *Dependencies, _ *testFakes) { d.InstallationBindings = nil }},
+		{"WorkspaceStorage", func(d *Dependencies, _ *testFakes) { d.WorkspaceStorage = nil }},
 		{"Projects", func(d *Dependencies, _ *testFakes) { d.Projects = nil }},
 		{"Sessions", func(d *Dependencies, _ *testFakes) { d.Sessions = nil }},
 		{"SessionCreation", func(d *Dependencies, _ *testFakes) { d.SessionCreation = nil }},
diff --git a/services/core/internal/api/errors.go b/services/core/internal/api/errors.go
index ff91dce09..3b4b6c0b2 100644
--- a/services/core/internal/api/errors.go
+++ b/services/core/internal/api/errors.go
@@ -87,7 +87,7 @@ func writeFieldError(w http.ResponseWriter, err error) bool {
 // meets the sandbox deployment: creation, input admission, archive and Runtime
 // observation.
 func writeOperationError(w http.ResponseWriter, r *http.Request, err error) {
-	if writeSandboxError(w, err) {
+	if writeWorkspaceError(w, err) || writeSandboxError(w, err) {
 		return
 	}
 	writeSessionsError(w, r, err)
diff --git a/services/core/internal/api/testdata/core-errors.json b/services/core/internal/api/testdata/core-errors.json
index 74e75ca84..e349a2882 100644
--- a/services/core/internal/api/testdata/core-errors.json
+++ b/services/core/internal/api/testdata/core-errors.json
@@ -15,6 +15,7 @@
   "invalid_name",
   "invalid_node_capacity",
   "invalid_sandbox_configuration",
+  "invalid_workspace_configuration",
   "model_configuration_model_invalid",
   "model_provider_api_key_invalid",
   "model_provider_base_url_invalid",
@@ -40,5 +41,9 @@
   "sandbox_reset_in_progress",
   "sandbox_reset_required",
   "sandbox_specification_mismatch",
-  "sandbox_verification_unconfirmed"
+  "sandbox_verification_unconfirmed",
+  "workspace_operation_unsupported",
+  "workspace_storage_conflict",
+  "workspace_storage_not_found",
+  "workspace_storage_unavailable"
 ]
diff --git a/services/core/internal/api/workspace_storage.go b/services/core/internal/api/workspace_storage.go
new file mode 100644
index 000000000..7a07df5c8
--- /dev/null
+++ b/services/core/internal/api/workspace_storage.go
@@ -0,0 +1,90 @@
+package api
+
+import (
+	"context"
+	"errors"
+	"net/http"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
+)
+
+// WorkspaceStorage reads and changes the independent filesystem configuration.
+// Configure serializes selection changes and records the admin audit source.
+type WorkspaceStorage interface {
+	Configuration(context.Context) (workspacefs.Configuration, error)
+	Configure(context.Context, workspacefs.Configuration) (workspacefs.Configuration, error)
+}
+
+// @Summary Retrieve workspace storage configuration
+// @Description Core key only. Returns the immutable selected filesystem configuration. No configuration returns 404.
+// @Tags Workspace Storage
+// @Produce json
+// @Security DeploymentAdminAuth
+// @Success 200 {object} workspacefs.Configuration
+// @Failure 400,401,404,409,500,503 {object} CoreErrorResponse
+// @Router /core/v1/workspace-storage [get]
+func (h *Handler) getWorkspaceStorage(w http.ResponseWriter, r *http.Request) {
+	configuration, err := h.WorkspaceStorage.Configuration(r.Context())
+	if err != nil {
+		writeWorkspaceStorageError(w, r, err)
+		return
+	}
+	writeJSON(w, http.StatusOK, configuration)
+}
+
+// @Summary Select workspace storage configuration
+// @Description Core key only. Selects an immutable filesystem configuration. Reusing an ID requires the same adapter and parameters; conflicting ownership returns 409.
+// @Tags Workspace Storage
+// @Accept json
+// @Produce json
+// @Security DeploymentAdminAuth
+// @Param body body workspacefs.Configuration true "Immutable workspace storage configuration"
+// @Success 200 {object} workspacefs.Configuration
+// @Failure 400,401,404,409,500,503 {object} CoreErrorResponse
+// @Router /core/v1/workspace-storage [put]
+func (h *Handler) putWorkspaceStorage(w http.ResponseWriter, r *http.Request) {
+	raw, ok := readJSONBodyLimit(w, r, 16384, "Workspace storage configuration is too large.")
+	if !ok {
+		return
+	}
+	var configuration workspacefs.Configuration
+	if decodeInputObject(raw, &configuration, "id", "adapter", "parameters") != nil || configuration.Validate() != nil {
+		writeWorkspaceStorageError(w, r, workspacefs.ErrInvalid)
+		return
+	}
+	setAdminAuditSource(r, "")
+	configuration, err := h.WorkspaceStorage.Configure(r.Context(), configuration)
+	if err != nil {
+		writeWorkspaceStorageError(w, r, err)
+		return
+	}
+	writeJSON(w, http.StatusOK, configuration)
+}
+
+func writeWorkspaceStorageError(w http.ResponseWriter, r *http.Request, err error) {
+	if writeWorkspaceError(w, err) || writeAuditSourceError(w, r, err) {
+		return
+	}
+	writeInternalError(w, r)
+}
+
+// writeWorkspaceError is shared by operator configuration and public admission.
+// Native adapter errors may contain paths; expose only fixed protocol messages.
+func writeWorkspaceError(w http.ResponseWriter, err error) bool {
+	switch {
+	case errors.Is(err, workspacefs.ErrInvalid):
+		writeError(w, http.StatusBadRequest, "invalid_workspace_configuration", "Invalid workspace storage configuration.")
+	case errors.Is(err, workspacefs.ErrUnsupported):
+		writeError(w, http.StatusBadRequest, "workspace_operation_unsupported", "The selected workspace storage does not support this operation or sandbox combination.")
+	case errors.Is(err, workspacefs.ErrOwnership), errors.Is(err, workspaces.ErrConflict):
+		writeError(w, http.StatusConflict, "workspace_storage_conflict", "Workspace storage ownership or configuration conflicts with the current state.")
+	case errors.Is(err, workspacefs.ErrNotFound), errors.Is(err, workspaces.ErrNotFound), errors.Is(err, workspaces.ErrNotConfigured):
+		writeError(w, http.StatusNotFound, "workspace_storage_not_found", "Workspace storage is not configured or the requested object does not exist.")
+	case errors.Is(err, workspacefs.ErrUnavailable), errors.Is(err, workspacefs.ErrUnconfirmed):
+		writeError(w, http.StatusServiceUnavailable, "workspace_storage_unavailable", "Workspace storage is unavailable or an operation remains unconfirmed.")
+	default:
+		return false
+	}
+	return true
+}
diff --git a/services/core/internal/api/workspace_storage_test.go b/services/core/internal/api/workspace_storage_test.go
new file mode 100644
index 000000000..c15d9d783
--- /dev/null
+++ b/services/core/internal/api/workspace_storage_test.go
@@ -0,0 +1,136 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
+)
+
+type fakeWorkspaceStorage struct {
+	t             testing.TB
+	configuration func(context.Context) (workspacefs.Configuration, error)
+	configure     func(context.Context, workspacefs.Configuration) (workspacefs.Configuration, error)
+}
+
+func (f *fakeWorkspaceStorage) Configuration(ctx context.Context) (workspacefs.Configuration, error) {
+	if f.configuration == nil {
+		f.t.Fatal("unexpected WorkspaceStorage.Configuration")
+	}
+	return f.configuration(ctx)
+}
+func (f *fakeWorkspaceStorage) Configure(ctx context.Context, c workspacefs.Configuration) (workspacefs.Configuration, error) {
+	if f.configure == nil {
+		f.t.Fatal("unexpected WorkspaceStorage.Configure")
+	}
+	return f.configure(ctx, c)
+}
+
+const workspaceConfigurationJSON = `{"id":"11111111-1111-4111-8111-111111111111","adapter":"directory","parameters":{"root":"/workspace-storage"}}`
+
+func workspaceStorageRequest(h http.Handler, method, token, body string) *httptest.ResponseRecorder {
+	request := httptest.NewRequest(method, "/core/v1/workspace-storage", strings.NewReader(body))
+	request.Header.Set("Content-Type", "application/json")
+	if token != "" {
+		request.Header.Set("Authorization", "Bearer "+token)
+	}
+	result := httptest.NewRecorder()
+	h.ServeHTTP(result, request)
+	return result
+}
+
+func TestWorkspaceStorageAuthentication(t *testing.T) {
+	deps, _ := testDependencies(t)
+	h := newTestHandler(t, deps)
+	for _, method := range []string{http.MethodGet, http.MethodPut} {
+		for _, token := range []string{"", "project-key", "node-credential"} {
+			result := workspaceStorageRequest(h, method, token, workspaceConfigurationJSON)
+			if result.Code != http.StatusUnauthorized {
+				t.Fatalf("%s %q: %d %s", method, token, result.Code, result.Body.String())
+			}
+		}
+	}
+}
+
+func TestWorkspaceStorageRoundTrip(t *testing.T) {
+	deps, f := testDependencies(t)
+	var saved workspacefs.Configuration
+	f.workspaceStorage.configure = func(ctx context.Context, c workspacefs.Configuration) (workspacefs.Configuration, error) {
+		source, ok := adminaudit.FromContext(ctx)
+		if !ok || source.CredentialID == "" || source.ProjectID != "" {
+			t.Fatalf("missing deployment audit source: %+v", source)
+		}
+		saved = c
+		return saved, nil
+	}
+	f.workspaceStorage.configuration = func(context.Context) (workspacefs.Configuration, error) { return saved, nil }
+	h := newTestHandler(t, deps)
+	for _, method := range []string{http.MethodPut, http.MethodGet} {
+		result := workspaceStorageRequest(h, method, "admin", workspaceConfigurationJSON)
+		if result.Code != http.StatusOK {
+			t.Fatalf("%s: %d %s", method, result.Code, result.Body.String())
+		}
+		var got workspacefs.Configuration
+		if err := json.Unmarshal(result.Body.Bytes(), &got); err != nil {
+			t.Fatal(err)
+		}
+		if got.ID != saved.ID || got.Adapter != saved.Adapter || string(got.Parameters) != string(saved.Parameters) {
+			t.Fatalf("configuration round trip: %+v", got)
+		}
+	}
+}
+
+func TestWorkspaceStorageRejectsInvalidInput(t *testing.T) {
+	deps, _ := testDependencies(t)
+	h := newTestHandler(t, deps)
+	for _, body := range []string{"null", "{}", `{"id":"not-a-uuid","adapter":"directory","parameters":{}}`, strings.Replace(workspaceConfigurationJSON, `"parameters":{`, `"host_path":"/arbitrary","parameters":{`, 1), strings.Replace(workspaceConfigurationJSON, `"parameters":{"root":"/workspace-storage"}`, `"parameters":null`, 1), strings.Replace(workspaceConfigurationJSON, `"id":`, `"ID":`, 1)} {
+		result := workspaceStorageRequest(h, http.MethodPut, "admin", body)
+		if result.Code != http.StatusBadRequest {
+			t.Fatalf("%s: %d %s", body, result.Code, result.Body.String())
+		}
+	}
+}
+
+func TestWorkspaceStorageSafeErrors(t *testing.T) {
+	for _, tc := range []struct {
+		err    error
+		status int
+	}{
+		{workspaces.ErrNotConfigured, 404}, {workspacefs.ErrNotFound, 404},
+		{workspacefs.ErrInvalid, 400}, {workspacefs.ErrUnsupported, 400},
+		{workspacefs.ErrOwnership, 409}, {workspaces.ErrConflict, 409},
+		{workspacefs.ErrUnavailable, 503}, {workspacefs.ErrUnconfirmed, 503},
+		{fmt.Errorf("unknown /secret/native/path"), 500},
+	} {
+		t.Run(tc.err.Error(), func(t *testing.T) {
+			deps, f := testDependencies(t)
+			err := fmt.Errorf("/secret/native/path: %w", tc.err)
+			f.workspaceStorage.configuration = func(context.Context) (workspacefs.Configuration, error) { return workspacefs.Configuration{}, err }
+			f.workspaceStorage.configure = func(context.Context, workspacefs.Configuration) (workspacefs.Configuration, error) {
+				return workspacefs.Configuration{}, err
+			}
+			h := newTestHandler(t, deps)
+			for _, method := range []string{http.MethodGet, http.MethodPut} {
+				result := workspaceStorageRequest(h, method, "admin", workspaceConfigurationJSON)
+				if result.Code != tc.status || strings.Contains(result.Body.String(), "/secret") {
+					t.Fatalf("%s: %d %s", method, result.Code, result.Body.String())
+				}
+			}
+		})
+	}
+}
+
+func TestWorkspaceUnsupportedPublicAdmissionError(t *testing.T) {
+	result := httptest.NewRecorder()
+	writeOperationError(result, httptest.NewRequest(http.MethodPost, "/v1/agents/sessions", nil), fmt.Errorf("/secret/native/path: %w", workspacefs.ErrUnsupported))
+	if result.Code != http.StatusBadRequest || strings.Contains(result.Body.String(), "/secret") {
+		t.Fatalf("%d %s", result.Code, result.Body.String())
+	}
+}
diff --git a/services/core/internal/db/queries/workspaces.sql b/services/core/internal/db/queries/workspaces.sql
new file mode 100644
index 000000000..1d547f81a
--- /dev/null
+++ b/services/core/internal/db/queries/workspaces.sql
@@ -0,0 +1,68 @@
+-- name: LockWorkspaceConfigurations :exec
+LOCK TABLE workspace_fs_configurations IN SHARE ROW EXCLUSIVE MODE;
+
+-- name: InsertWorkspaceConfiguration :exec
+INSERT INTO workspace_fs_configurations (id, adapter, parameters) VALUES ($1, $2, $3)
+ON CONFLICT (id) DO NOTHING;
+
+-- name: MatchWorkspaceConfiguration :one
+SELECT (adapter = sqlc.arg(adapter) AND parameters = sqlc.arg(parameters)::jsonb)::boolean AS matches
+FROM workspace_fs_configurations WHERE id = sqlc.arg(id);
+
+-- name: ClearActiveWorkspaceConfiguration :exec
+UPDATE workspace_fs_configurations SET active = false WHERE active;
+
+-- name: ActivateWorkspaceConfiguration :exec
+UPDATE workspace_fs_configurations SET active = true WHERE id = $1;
+
+-- name: GetActiveWorkspaceConfiguration :one
+SELECT * FROM workspace_fs_configurations WHERE active;
+
+-- name: LockWorkspaceSession :one
+SELECT s.id FROM sessions s JOIN environments e ON e.session_id = s.id
+WHERE s.tenant_id = $1 AND e.id = $2 FOR UPDATE OF s;
+
+-- name: WorkspaceSessionDeleted :one
+SELECT (deleted_at IS NOT NULL)::boolean AS deleted FROM sessions WHERE id = $1;
+
+-- name: GetEnvironmentWorkspace :one
+SELECT sqlc.embed(w), sqlc.embed(c), s.tenant_id
+FROM environment_workspaces w
+JOIN workspace_fs_configurations c ON c.id = w.configuration_id
+JOIN environments e ON e.id = w.environment_id
+JOIN sessions s ON s.id = e.session_id
+WHERE s.tenant_id = $1 AND e.id = $2;
+
+-- name: InsertEnvironmentWorkspace :exec
+INSERT INTO environment_workspaces (object_id, environment_id, configuration_id)
+VALUES ($1, $2, $3);
+
+-- name: MarkWorkspaceReady :execrows
+UPDATE environment_workspaces SET state = 'ready', attachment = $2
+WHERE object_id = $1 AND state = 'creating';
+
+-- name: WorkspaceComputeReleased :one
+SELECT NOT EXISTS (
+    SELECT 1 FROM runtime_allocations WHERE environment_id = $1 AND state <> 'released'
+) AS released;
+
+-- name: BeginWorkspaceDeletion :execrows
+UPDATE environment_workspaces SET state = 'deleting'
+WHERE object_id = $1 AND state IN ('creating', 'ready');
+
+-- name: MarkWorkspaceDeleted :execrows
+UPDATE environment_workspaces SET state = 'deleted'
+WHERE object_id = $1 AND state = 'deleting';
+
+-- name: ListWorkspaceDeletionCandidates :many
+SELECT sqlc.embed(w), sqlc.embed(c), s.tenant_id
+FROM environment_workspaces w
+JOIN workspace_fs_configurations c ON c.id = w.configuration_id
+JOIN environments e ON e.id = w.environment_id
+JOIN sessions s ON s.id = e.session_id
+WHERE w.object_id > $1 AND w.state <> 'deleted'
+  AND (s.deleted_at IS NOT NULL OR w.state = 'deleting')
+  AND NOT EXISTS (
+      SELECT 1 FROM runtime_allocations a WHERE a.environment_id = e.id AND a.state <> 'released'
+  )
+ORDER BY w.object_id LIMIT 32;
diff --git a/services/core/internal/db/sqlc/models.go b/services/core/internal/db/sqlc/models.go
index d315804dd..70dacf734 100644
--- a/services/core/internal/db/sqlc/models.go
+++ b/services/core/internal/db/sqlc/models.go
@@ -144,6 +144,14 @@ type EnvironmentTemplate struct {
 	CapabilityDirectories []string           `json:"capability_directories"`
 }
 
+type EnvironmentWorkspace struct {
+	ObjectID        pgtype.UUID `json:"object_id"`
+	EnvironmentID   pgtype.UUID `json:"environment_id"`
+	ConfigurationID pgtype.UUID `json:"configuration_id"`
+	State           string      `json:"state"`
+	Attachment      []byte      `json:"attachment"`
+}
+
 type ExecutionProjectScope struct {
 	TenantID       pgtype.UUID `json:"tenant_id"`
 	OrganizationID string      `json:"organization_id"`
@@ -542,6 +550,13 @@ type VaultCredential struct {
 	OauthMetadata   []byte             `json:"oauth_metadata"`
 }
 
+type WorkspaceFsConfiguration struct {
+	ID         pgtype.UUID `json:"id"`
+	Adapter    string      `json:"adapter"`
+	Parameters []byte      `json:"parameters"`
+	Active     bool        `json:"active"`
+}
+
 type WriteAuditOperation struct {
 	ID           pgtype.UUID        `json:"id"`
 	TenantID     pgtype.UUID        `json:"tenant_id"`
diff --git a/services/core/internal/db/sqlc/workspaces.sql.go b/services/core/internal/db/sqlc/workspaces.sql.go
new file mode 100644
index 000000000..e7549529e
--- /dev/null
+++ b/services/core/internal/db/sqlc/workspaces.sql.go
@@ -0,0 +1,279 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.29.0
+// source: workspaces.sql
+
+package sqlc
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+const activateWorkspaceConfiguration = `-- name: ActivateWorkspaceConfiguration :exec
+UPDATE workspace_fs_configurations SET active = true WHERE id = $1
+`
+
+func (q *Queries) ActivateWorkspaceConfiguration(ctx context.Context, id pgtype.UUID) error {
+	_, err := q.db.Exec(ctx, activateWorkspaceConfiguration, id)
+	return err
+}
+
+const beginWorkspaceDeletion = `-- name: BeginWorkspaceDeletion :execrows
+UPDATE environment_workspaces SET state = 'deleting'
+WHERE object_id = $1 AND state IN ('creating', 'ready')
+`
+
+func (q *Queries) BeginWorkspaceDeletion(ctx context.Context, objectID pgtype.UUID) (int64, error) {
+	result, err := q.db.Exec(ctx, beginWorkspaceDeletion, objectID)
+	if err != nil {
+		return 0, err
+	}
+	return result.RowsAffected(), nil
+}
+
+const clearActiveWorkspaceConfiguration = `-- name: ClearActiveWorkspaceConfiguration :exec
+UPDATE workspace_fs_configurations SET active = false WHERE active
+`
+
+func (q *Queries) ClearActiveWorkspaceConfiguration(ctx context.Context) error {
+	_, err := q.db.Exec(ctx, clearActiveWorkspaceConfiguration)
+	return err
+}
+
+const getActiveWorkspaceConfiguration = `-- name: GetActiveWorkspaceConfiguration :one
+SELECT id, adapter, parameters, active FROM workspace_fs_configurations WHERE active
+`
+
+func (q *Queries) GetActiveWorkspaceConfiguration(ctx context.Context) (WorkspaceFsConfiguration, error) {
+	row := q.db.QueryRow(ctx, getActiveWorkspaceConfiguration)
+	var i WorkspaceFsConfiguration
+	err := row.Scan(
+		&i.ID,
+		&i.Adapter,
+		&i.Parameters,
+		&i.Active,
+	)
+	return i, err
+}
+
+const getEnvironmentWorkspace = `-- name: GetEnvironmentWorkspace :one
+SELECT w.object_id, w.environment_id, w.configuration_id, w.state, w.attachment, c.id, c.adapter, c.parameters, c.active, s.tenant_id
+FROM environment_workspaces w
+JOIN workspace_fs_configurations c ON c.id = w.configuration_id
+JOIN environments e ON e.id = w.environment_id
+JOIN sessions s ON s.id = e.session_id
+WHERE s.tenant_id = $1 AND e.id = $2
+`
+
+type GetEnvironmentWorkspaceParams struct {
+	TenantID pgtype.UUID `json:"tenant_id"`
+	ID       pgtype.UUID `json:"id"`
+}
+
+type GetEnvironmentWorkspaceRow struct {
+	EnvironmentWorkspace     EnvironmentWorkspace     `json:"environment_workspace"`
+	WorkspaceFsConfiguration WorkspaceFsConfiguration `json:"workspace_fs_configuration"`
+	TenantID                 pgtype.UUID              `json:"tenant_id"`
+}
+
+func (q *Queries) GetEnvironmentWorkspace(ctx context.Context, arg GetEnvironmentWorkspaceParams) (GetEnvironmentWorkspaceRow, error) {
+	row := q.db.QueryRow(ctx, getEnvironmentWorkspace, arg.TenantID, arg.ID)
+	var i GetEnvironmentWorkspaceRow
+	err := row.Scan(
+		&i.EnvironmentWorkspace.ObjectID,
+		&i.EnvironmentWorkspace.EnvironmentID,
+		&i.EnvironmentWorkspace.ConfigurationID,
+		&i.EnvironmentWorkspace.State,
+		&i.EnvironmentWorkspace.Attachment,
+		&i.WorkspaceFsConfiguration.ID,
+		&i.WorkspaceFsConfiguration.Adapter,
+		&i.WorkspaceFsConfiguration.Parameters,
+		&i.WorkspaceFsConfiguration.Active,
+		&i.TenantID,
+	)
+	return i, err
+}
+
+const insertEnvironmentWorkspace = `-- name: InsertEnvironmentWorkspace :exec
+INSERT INTO environment_workspaces (object_id, environment_id, configuration_id)
+VALUES ($1, $2, $3)
+`
+
+type InsertEnvironmentWorkspaceParams struct {
+	ObjectID        pgtype.UUID `json:"object_id"`
+	EnvironmentID   pgtype.UUID `json:"environment_id"`
+	ConfigurationID pgtype.UUID `json:"configuration_id"`
+}
+
+func (q *Queries) InsertEnvironmentWorkspace(ctx context.Context, arg InsertEnvironmentWorkspaceParams) error {
+	_, err := q.db.Exec(ctx, insertEnvironmentWorkspace, arg.ObjectID, arg.EnvironmentID, arg.ConfigurationID)
+	return err
+}
+
+const insertWorkspaceConfiguration = `-- name: InsertWorkspaceConfiguration :exec
+INSERT INTO workspace_fs_configurations (id, adapter, parameters) VALUES ($1, $2, $3)
+ON CONFLICT (id) DO NOTHING
+`
+
+type InsertWorkspaceConfigurationParams struct {
+	ID         pgtype.UUID `json:"id"`
+	Adapter    string      `json:"adapter"`
+	Parameters []byte      `json:"parameters"`
+}
+
+func (q *Queries) InsertWorkspaceConfiguration(ctx context.Context, arg InsertWorkspaceConfigurationParams) error {
+	_, err := q.db.Exec(ctx, insertWorkspaceConfiguration, arg.ID, arg.Adapter, arg.Parameters)
+	return err
+}
+
+const listWorkspaceDeletionCandidates = `-- name: ListWorkspaceDeletionCandidates :many
+SELECT w.object_id, w.environment_id, w.configuration_id, w.state, w.attachment, c.id, c.adapter, c.parameters, c.active, s.tenant_id
+FROM environment_workspaces w
+JOIN workspace_fs_configurations c ON c.id = w.configuration_id
+JOIN environments e ON e.id = w.environment_id
+JOIN sessions s ON s.id = e.session_id
+WHERE w.object_id > $1 AND w.state <> 'deleted'
+  AND (s.deleted_at IS NOT NULL OR w.state = 'deleting')
+  AND NOT EXISTS (
+      SELECT 1 FROM runtime_allocations a WHERE a.environment_id = e.id AND a.state <> 'released'
+  )
+ORDER BY w.object_id LIMIT 32
+`
+
+type ListWorkspaceDeletionCandidatesRow struct {
+	EnvironmentWorkspace     EnvironmentWorkspace     `json:"environment_workspace"`
+	WorkspaceFsConfiguration WorkspaceFsConfiguration `json:"workspace_fs_configuration"`
+	TenantID                 pgtype.UUID              `json:"tenant_id"`
+}
+
+func (q *Queries) ListWorkspaceDeletionCandidates(ctx context.Context, objectID pgtype.UUID) ([]ListWorkspaceDeletionCandidatesRow, error) {
+	rows, err := q.db.Query(ctx, listWorkspaceDeletionCandidates, objectID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	items := []ListWorkspaceDeletionCandidatesRow{}
+	for rows.Next() {
+		var i ListWorkspaceDeletionCandidatesRow
+		if err := rows.Scan(
+			&i.EnvironmentWorkspace.ObjectID,
+			&i.EnvironmentWorkspace.EnvironmentID,
+			&i.EnvironmentWorkspace.ConfigurationID,
+			&i.EnvironmentWorkspace.State,
+			&i.EnvironmentWorkspace.Attachment,
+			&i.WorkspaceFsConfiguration.ID,
+			&i.WorkspaceFsConfiguration.Adapter,
+			&i.WorkspaceFsConfiguration.Parameters,
+			&i.WorkspaceFsConfiguration.Active,
+			&i.TenantID,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+const lockWorkspaceConfigurations = `-- name: LockWorkspaceConfigurations :exec
+LOCK TABLE workspace_fs_configurations IN SHARE ROW EXCLUSIVE MODE
+`
+
+func (q *Queries) LockWorkspaceConfigurations(ctx context.Context) error {
+	_, err := q.db.Exec(ctx, lockWorkspaceConfigurations)
+	return err
+}
+
+const lockWorkspaceSession = `-- name: LockWorkspaceSession :one
+SELECT s.id FROM sessions s JOIN environments e ON e.session_id = s.id
+WHERE s.tenant_id = $1 AND e.id = $2 FOR UPDATE OF s
+`
+
+type LockWorkspaceSessionParams struct {
+	TenantID pgtype.UUID `json:"tenant_id"`
+	ID       pgtype.UUID `json:"id"`
+}
+
+func (q *Queries) LockWorkspaceSession(ctx context.Context, arg LockWorkspaceSessionParams) (pgtype.UUID, error) {
+	row := q.db.QueryRow(ctx, lockWorkspaceSession, arg.TenantID, arg.ID)
+	var id pgtype.UUID
+	err := row.Scan(&id)
+	return id, err
+}
+
+const markWorkspaceDeleted = `-- name: MarkWorkspaceDeleted :execrows
+UPDATE environment_workspaces SET state = 'deleted'
+WHERE object_id = $1 AND state = 'deleting'
+`
+
+func (q *Queries) MarkWorkspaceDeleted(ctx context.Context, objectID pgtype.UUID) (int64, error) {
+	result, err := q.db.Exec(ctx, markWorkspaceDeleted, objectID)
+	if err != nil {
+		return 0, err
+	}
+	return result.RowsAffected(), nil
+}
+
+const markWorkspaceReady = `-- name: MarkWorkspaceReady :execrows
+UPDATE environment_workspaces SET state = 'ready', attachment = $2
+WHERE object_id = $1 AND state = 'creating'
+`
+
+type MarkWorkspaceReadyParams struct {
+	ObjectID   pgtype.UUID `json:"object_id"`
+	Attachment []byte      `json:"attachment"`
+}
+
+func (q *Queries) MarkWorkspaceReady(ctx context.Context, arg MarkWorkspaceReadyParams) (int64, error) {
+	result, err := q.db.Exec(ctx, markWorkspaceReady, arg.ObjectID, arg.Attachment)
+	if err != nil {
+		return 0, err
+	}
+	return result.RowsAffected(), nil
+}
+
+const matchWorkspaceConfiguration = `-- name: MatchWorkspaceConfiguration :one
+SELECT (adapter = $1 AND parameters = $2::jsonb)::boolean AS matches
+FROM workspace_fs_configurations WHERE id = $3
+`
+
+type MatchWorkspaceConfigurationParams struct {
+	Adapter    string      `json:"adapter"`
+	Parameters []byte      `json:"parameters"`
+	ID         pgtype.UUID `json:"id"`
+}
+
+func (q *Queries) MatchWorkspaceConfiguration(ctx context.Context, arg MatchWorkspaceConfigurationParams) (bool, error) {
+	row := q.db.QueryRow(ctx, matchWorkspaceConfiguration, arg.Adapter, arg.Parameters, arg.ID)
+	var matches bool
+	err := row.Scan(&matches)
+	return matches, err
+}
+
+const workspaceComputeReleased = `-- name: WorkspaceComputeReleased :one
+SELECT NOT EXISTS (
+    SELECT 1 FROM runtime_allocations WHERE environment_id = $1 AND state <> 'released'
+) AS released
+`
+
+func (q *Queries) WorkspaceComputeReleased(ctx context.Context, environmentID pgtype.UUID) (bool, error) {
+	row := q.db.QueryRow(ctx, workspaceComputeReleased, environmentID)
+	var released bool
+	err := row.Scan(&released)
+	return released, err
+}
+
+const workspaceSessionDeleted = `-- name: WorkspaceSessionDeleted :one
+SELECT (deleted_at IS NOT NULL)::boolean AS deleted FROM sessions WHERE id = $1
+`
+
+func (q *Queries) WorkspaceSessionDeleted(ctx context.Context, id pgtype.UUID) (bool, error) {
+	row := q.db.QueryRow(ctx, workspaceSessionDeleted, id)
+	var deleted bool
+	err := row.Scan(&deleted)
+	return deleted, err
+}
diff --git a/services/core/internal/deployment/service.go b/services/core/internal/deployment/service.go
index 5a08e0fa6..022a0d359 100644
--- a/services/core/internal/deployment/service.go
+++ b/services/core/internal/deployment/service.go
@@ -8,6 +8,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment/placement"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/providers"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 )
 
 // Service reads the deployment and manages its nodes. It grants no execution
@@ -286,3 +287,30 @@ func (s *Service) selectionEqual(d Record, input sandbox.Selection) (bool, error
 	}
 	return s.registry.Equal(input.Provider, previous.Configuration, normalized.Configuration)
 }
+
+// ValidateWorkspaceConfiguration qualifies a filesystem selection against the
+// stored generation without constructing a native Sandbox Provider.
+func (s *Service) ValidateWorkspaceConfiguration(ctx context.Context, declaration workspacefs.Declaration) error {
+	setup, err := s.Setup(ctx)
+	if err != nil {
+		return err
+	}
+	if setup.Provider == "" {
+		return nil
+	}
+	adapter, err := s.registry.Lookup(setup.Provider)
+	if err != nil {
+		return err
+	}
+	if adapter.Policy.Workspace == nil {
+		return workspacefs.ErrUnsupported
+	}
+	capacity := uint32(0)
+	if setup.Specification.Workspace != nil {
+		if *setup.Specification.Workspace != declaration {
+			return workspacefs.ErrUnsupported
+		}
+		capacity = setup.Specification.Resources.EnvironmentDiskMiB
+	}
+	return workspacefs.ValidateCombination(*adapter.Policy.Workspace, declaration, capacity)
+}
diff --git a/services/core/internal/deployment/workspace_configuration_test.go b/services/core/internal/deployment/workspace_configuration_test.go
new file mode 100644
index 000000000..594687261
--- /dev/null
+++ b/services/core/internal/deployment/workspace_configuration_test.go
@@ -0,0 +1,55 @@
+package deployment
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/google/uuid"
+)
+
+func TestWorkspaceConfigurationUsesStoredGenerationWithoutNativeProvider(t *testing.T) {
+	declaration := workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}
+	for _, provider := range []string{"", "docker", "microsandbox"} {
+		t.Run(provider, func(t *testing.T) {
+			record := Record{InstallationID: uuid.NewString(), Specification: []byte(`{}`)}
+			if provider != "" {
+				record = webDeployment(t, uuid.NewString(), provider, 1)
+			}
+			service := newService(t, &fakeStorage{t: t}, &fakeReader{t: t, deployment: func(context.Context) (Record, error) { return record, nil }}, testPublicURL)
+			err := service.ValidateWorkspaceConfiguration(t.Context(), declaration)
+			if provider == "docker" {
+				if !errors.Is(err, workspacefs.ErrUnsupported) {
+					t.Fatal("incompatible provider accepted", err)
+				}
+			} else if err != nil {
+				t.Fatal(err)
+			}
+		})
+	}
+}
+
+func TestWorkspaceConfigurationRejectsChangedExternalReceiptAndReadFailure(t *testing.T) {
+	declaration := workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}
+	record := webDeployment(t, uuid.NewString(), "microsandbox", 1)
+	specification := testSpecification("microsandbox")
+	specification.Resources.EnvironmentDiskMiB = 0
+	specification.Workspace = &declaration
+	record.Specification, _ = json.Marshal(specification)
+	var readErr error
+	service := newService(t, &fakeStorage{t: t}, &fakeReader{t: t, deployment: func(context.Context) (Record, error) { return record, readErr }}, testPublicURL)
+	if err := service.ValidateWorkspaceConfiguration(t.Context(), declaration); err != nil {
+		t.Fatal(err)
+	}
+	changed := declaration
+	changed.CapacityQuota = true
+	if err := service.ValidateWorkspaceConfiguration(t.Context(), changed); !errors.Is(err, workspacefs.ErrUnsupported) {
+		t.Fatal("changed receipt accepted", err)
+	}
+	readErr = errors.New("database unavailable")
+	if err := service.ValidateWorkspaceConfiguration(t.Context(), declaration); !errors.Is(err, readErr) {
+		t.Fatal("unreadable setup treated as unconfigured", err)
+	}
+}
diff --git a/services/core/internal/execution/environment_admission.go b/services/core/internal/execution/environment_admission.go
index 474e0fb70..0f34d9f47 100644
--- a/services/core/internal/execution/environment_admission.go
+++ b/services/core/internal/execution/environment_admission.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 )
 
 var (
@@ -58,6 +59,11 @@ func (w *Worker) validateCreation(ctx context.Context, input sessions.CreateSess
 		if err := json.Unmarshal(input.Configuration, &snapshot); err != nil {
 			return sessions.ErrInvalidInput
 		}
+		if snapshot.Environment.Type == "openai_hosted" {
+			if err := w.runtimes.validateWorkspaceAdmission(ctx); err != nil {
+				return err
+			}
+		}
 		if len(input.InitialInputs) == 0 && snapshot.Environment.Type == "self_hosted" {
 			return nil
 		}
@@ -146,3 +152,26 @@ func (w *Worker) checkAdmissionOwnership(ctx context.Context) error {
 	}
 	return nil
 }
+
+func (m *runtimeManager) validateWorkspaceAdmission(ctx context.Context) error {
+	m.mu.Lock()
+	config := m.config
+	m.mu.Unlock()
+	if config.Workspace == nil {
+		return nil
+	}
+	if m.workspaces == nil {
+		return workspacefs.ErrUnavailable
+	}
+	declaration, err := m.workspaces.Declaration(ctx)
+	if err != nil {
+		return err
+	}
+	if declaration == nil {
+		return workspacefs.ErrUnavailable
+	}
+	if config.WorkspaceRequirements == nil {
+		return workspacefs.ErrUnsupported
+	}
+	return workspacefs.ValidateCombination(*config.WorkspaceRequirements, *declaration, config.Resources.EnvironmentDiskMiB)
+}
diff --git a/services/core/internal/execution/owner.go b/services/core/internal/execution/owner.go
index fb886228a..7efb25b08 100644
--- a/services/core/internal/execution/owner.go
+++ b/services/core/internal/execution/owner.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
 )
 
 // Ownership is the execution lease as the Worker uses it. *pgunit.Lease implements it.
@@ -19,6 +20,7 @@ type Ownership interface {
 // Owner is everything bound to one execution lease: one field per domain's
 // execution operations.
 type Owner struct {
+	Workspaces *workspaces.ExecutionOperations
 	Lease      Ownership
 	Deployment *deployment.ExecutionOperations // sandbox deployment changes on the lease-bound deploymentpg storage
 	Sessions   *sessions.ExecutionOperations   // Session execution operations on the lease-bound sessionpg storage
diff --git a/services/core/internal/execution/runtime_compute.go b/services/core/internal/execution/runtime_compute.go
index 54c54e841..20d00602b 100644
--- a/services/core/internal/execution/runtime_compute.go
+++ b/services/core/internal/execution/runtime_compute.go
@@ -10,6 +10,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 	"github.com/google/uuid"
 )
 
@@ -230,7 +231,21 @@ func (r *runtimeLifecycle) restoreCompute(ctx context.Context, p sandbox.Sandbox
 	if state.Target == nil || state.Snapshot == nil || state.Rollback {
 		return sandbox.ErrOwnership
 	}
-	result, err := p.Resume(ctx, sandbox.ResumeRequest{Reference: runtimeReference(owner), OperationID: state.RestoreID, Snapshot: *state.Snapshot, Target: *state.Target, ObserveOnly: observeOnly})
+	var workspace *workspacefs.Binding
+	if r.config.Workspace != nil {
+		if r.workspaces == nil {
+			return workspacefs.ErrUnavailable
+		}
+		var err error
+		workspace, err = r.workspaces.GetReady(ctx, owner.TenantID, owner.EnvironmentID, r.config.WorkspaceRequirements, r.config.Resources.EnvironmentDiskMiB)
+		if err == nil && workspace == nil {
+			err = workspacefs.ErrNotFound
+		}
+		if err != nil {
+			return err
+		}
+	}
+	result, err := p.Resume(ctx, sandbox.ResumeRequest{Workspace: workspace, Reference: runtimeReference(owner), OperationID: state.RestoreID, Snapshot: *state.Snapshot, Target: *state.Target, ObserveOnly: observeOnly})
 	if err != nil {
 		return err
 	}
diff --git a/services/core/internal/execution/runtime_lifecycle.go b/services/core/internal/execution/runtime_lifecycle.go
index 28cc7510a..49e23afd4 100644
--- a/services/core/internal/execution/runtime_lifecycle.go
+++ b/services/core/internal/execution/runtime_lifecycle.go
@@ -15,6 +15,8 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
 	"github.com/google/uuid"
 )
 
@@ -22,20 +24,24 @@ import (
 // BackendFingerprint identifies its namespace independently of mutable sizing.
 type RuntimeProvider struct {
 	// PublishUnconfigured updates the shared observation cache after reset commit.
-	PublishUnconfigured func(uint64)
-	Generation          uint64
-	Mode                string
-	loadDeployment      func(context.Context) (*RuntimeProvider, error)
-	prepareDeployment   RuntimeDeploymentPreparer
-	ProviderKind        string
-	CoreURL             string
-	InstallationID      string
-	BackendFingerprint  string
-	Provider            sandbox.SandboxProvider
-	Suspension          *RuntimeSuspensionPolicy
+	PublishUnconfigured   func(uint64)
+	Generation            uint64
+	Mode                  string
+	loadDeployment        func(context.Context) (*RuntimeProvider, error)
+	prepareDeployment     RuntimeDeploymentPreparer
+	ProviderKind          string
+	CoreURL               string
+	InstallationID        string
+	BackendFingerprint    string
+	Provider              sandbox.SandboxProvider
+	Suspension            *RuntimeSuspensionPolicy
+	Resources             sandbox.Resources
+	WorkspaceRequirements *workspacefs.Requirements
+	Workspace             *workspacefs.Declaration
 }
 
 type runtimeLifecycle struct {
+	workspaces       *workspaces.ExecutionOperations
 	sessions         sessions.Reader
 	sessionExecution *sessions.ExecutionOperations
 	// deployment runs the allocation mutations on the lease; deployments and
@@ -67,7 +73,7 @@ func newRuntimeManager(owner Owner, deployments *deployment.Service, deploymentR
 		return nil, sandbox.ErrInvalid
 	}
 	ctx, stop := context.WithCancel(context.Background())
-	return &runtimeManager{sessions: sessionReader, sessionExecution: owner.Sessions, deployment: owner.Deployment, deploymentService: deployments, deploymentReader: deploymentReader, lease: owner.Lease, registry: registry, setupInstallationID: config.InstallationID, loadDeployment: config.loadDeployment, prepareDeployment: config.prepareDeployment, publishUnconfigured: config.PublishUnconfigured, setupGate: make(chan struct{}, 1), mutationGate: make(chan struct{}, 1), ctx: ctx, cancel: stop, nodes: make(map[string]*runtimeNode), failed: make(chan error, 1), inventory: make(chan struct{}, 1)}, nil
+	return &runtimeManager{workspaces: owner.Workspaces, workspaceGate: make(chan struct{}, 1), sessions: sessionReader, sessionExecution: owner.Sessions, deployment: owner.Deployment, deploymentService: deployments, deploymentReader: deploymentReader, lease: owner.Lease, registry: registry, setupInstallationID: config.InstallationID, loadDeployment: config.loadDeployment, prepareDeployment: config.prepareDeployment, publishUnconfigured: config.PublishUnconfigured, setupGate: make(chan struct{}, 1), mutationGate: make(chan struct{}, 1), ctx: ctx, cancel: stop, nodes: make(map[string]*runtimeNode), failed: make(chan error, 1), inventory: make(chan struct{}, 1)}, nil
 }
 
 func validatedRuntimeProvider(config *RuntimeProvider, registry *runtimegateway.Registry) (RuntimeProvider, error) {
@@ -84,6 +90,14 @@ func validatedRuntimeProvider(config *RuntimeProvider, registry *runtimegateway.
 		return RuntimeProvider{}, err
 	}
 	copied := *config
+	if config.Workspace != nil {
+		workspace := *config.Workspace
+		copied.Workspace = &workspace
+	}
+	if config.WorkspaceRequirements != nil {
+		requirements := *config.WorkspaceRequirements
+		copied.WorkspaceRequirements = &requirements
+	}
 	if copied.ProviderKind == "" || (copied.Mode != string(sandbox.DeploymentNodes) && copied.Mode != string(sandbox.DeploymentDirect)) {
 		return RuntimeProvider{}, sandbox.ErrInvalid
 	}
@@ -166,6 +180,27 @@ func (r *runtimeLifecycle) provision(ctx context.Context, tenant, environment, p
 	if err != nil || placement.Type != "openai_hosted" {
 		return deployment.Allocation{}, sandbox.ErrInvalid
 	}
+	var workspace *workspacefs.Binding
+	if r.config.Workspace != nil {
+		if r.workspaces == nil {
+			return deployment.Allocation{}, workspacefs.ErrUnavailable
+		}
+		existing, lookupErr := r.reader.EnvironmentAllocation(ctx, deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment})
+		if lookupErr != nil && !errors.Is(lookupErr, deployment.ErrNotFound) {
+			return deployment.Allocation{}, lookupErr
+		}
+		if errors.Is(lookupErr, deployment.ErrNotFound) {
+			workspace, err = r.workspaces.Ensure(ctx, tenant, environment, r.config.WorkspaceRequirements, r.config.Resources.EnvironmentDiskMiB)
+			if err == nil && workspace == nil {
+				err = workspacefs.ErrUnavailable
+			}
+			if err != nil {
+				return deployment.Allocation{}, err
+			}
+		} else if existing.NodeID != r.nodeID {
+			return existing, sandbox.ErrOwnership
+		}
+	}
 	key := deployment.AllocationKey{TenantID: tenant, EnvironmentID: environment}
 	secret := make([]byte, 32)
 	if _, err := rand.Read(secret); err != nil {
@@ -187,7 +222,7 @@ func (r *runtimeLifecycle) provision(ctx context.Context, tenant, environment, p
 	}
 	info, err := provider.Create(ctx, sandbox.Bootstrap{
 		Reference: runtimeReference(owner), SessionID: owner.SessionID, DeviceID: owner.DeviceID,
-		CoreURL: r.config.CoreURL, Credential: token, NetworkAccess: placement.NetworkAccess, AllowedDomains: placement.AllowedDomains,
+		Workspace: workspace, CoreURL: r.config.CoreURL, Credential: token, NetworkAccess: placement.NetworkAccess, AllowedDomains: placement.AllowedDomains,
 	})
 	if info.Reference == runtimeReference(owner) && info.CreateSettled && info.State == "absent" {
 		record, cancel := context.WithTimeout(context.WithoutCancel(ctx), 5*time.Second)
diff --git a/services/core/internal/execution/runtime_manager.go b/services/core/internal/execution/runtime_manager.go
index d6ae06a56..9eea4150f 100644
--- a/services/core/internal/execution/runtime_manager.go
+++ b/services/core/internal/execution/runtime_manager.go
@@ -11,6 +11,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
 )
 
 // runtimeManager owns node membership, not provider operations. Each registered
@@ -18,6 +19,9 @@ import (
 var errRuntimeTransition = fmt.Errorf("%w: sandbox configuration is changing", ErrExecutionUnavailable)
 
 type runtimeManager struct {
+	workspaces          *workspaces.ExecutionOperations
+	workspaceCursor     string
+	workspaceGate       chan struct{}
 	sessions            sessions.Reader
 	sessionExecution    *sessions.ExecutionOperations
 	deployment          *deployment.ExecutionOperations
@@ -88,7 +92,7 @@ func (m *runtimeManager) node(id string) (*runtimeNode, error) {
 	if n == nil {
 		ctx, stop := context.WithCancel(m.ctx)
 		n = &runtimeNode{lifecycle: &runtimeLifecycle{
-			sessions: m.sessions, sessionExecution: m.sessionExecution,
+			workspaces: m.workspaces, sessions: m.sessions, sessionExecution: m.sessionExecution,
 			deployment: m.deployment, deployments: m.deploymentService, reader: m.deploymentReader,
 			lease: m.lease, registry: m.registry, config: m.config, nodeID: id,
 			gate: make(chan struct{}, 1), ctx: ctx, stop: stop,
@@ -245,6 +249,9 @@ func (m *runtimeManager) run(ctx context.Context) error {
 	if err := m.deployment.CollectGenerations(ctx); err != nil {
 		return err
 	}
+	if err := m.deleteWorkspaces(ctx); err != nil {
+		return err
+	}
 	if err := m.resetStep(ctx); err != nil {
 		return err
 	}
@@ -265,6 +272,9 @@ func (m *runtimeManager) run(ctx context.Context) error {
 			if err := m.deployment.CollectGenerations(ctx); err != nil {
 				return err
 			}
+			if err := m.deleteWorkspaces(ctx); err != nil {
+				return err
+			}
 			if err := m.resetStep(ctx); err != nil {
 				return err
 			}
@@ -283,6 +293,9 @@ func (m *runtimeManager) reconcile(parent context.Context) error {
 		return err
 	}
 	defer finish()
+	if err := m.deleteWorkspaces(ctx); err != nil {
+		return err
+	}
 	nodes, err := m.syncNodes(ctx)
 	if err != nil {
 		return err
@@ -316,3 +329,23 @@ func (m *runtimeManager) stop() {
 // stop must precede drain. Both background loops and external provisioning or
 // manual reconciliation finish before Worker releases its unique writer lease.
 func (m *runtimeManager) drain() { m.active.Wait() }
+
+func (m *runtimeManager) deleteWorkspaces(ctx context.Context) error {
+	if m.workspaces == nil {
+		return nil
+	}
+	select {
+	case m.workspaceGate <- struct{}{}:
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+	defer func() { <-m.workspaceGate }()
+	operation, cancel := context.WithTimeout(ctx, 30*time.Second)
+	defer cancel()
+	cursor, err := m.workspaces.DeleteBatch(operation, m.workspaceCursor)
+	m.workspaceCursor = cursor
+	if err != nil && operation.Err() != nil && ctx.Err() == nil {
+		return m.lease.CheckOwnership(ctx)
+	}
+	return err
+}
diff --git a/services/core/internal/execution/runtime_workspace.go b/services/core/internal/execution/runtime_workspace.go
new file mode 100644
index 000000000..3f4e617e2
--- /dev/null
+++ b/services/core/internal/execution/runtime_workspace.go
@@ -0,0 +1,33 @@
+package execution
+
+import (
+	"context"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
+)
+
+func (w *Worker) Configuration(ctx context.Context) (workspacefs.Configuration, error) {
+	if w.runtimes.workspaces == nil {
+		return workspacefs.Configuration{}, workspaces.ErrNotConfigured
+	}
+	return w.runtimes.workspaces.Configuration(ctx)
+}
+
+func (w *Worker) Configure(ctx context.Context, configuration workspacefs.Configuration) (workspacefs.Configuration, error) {
+	m := w.runtimes
+	if m.workspaces == nil {
+		return workspacefs.Configuration{}, workspaces.ErrNotConfigured
+	}
+	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+	defer cancel()
+	unlock, err := m.lockMutation(ctx)
+	if err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	defer unlock()
+	return m.workspaces.Configure(ctx, configuration, func(declaration workspacefs.Declaration) error {
+		return m.deploymentService.ValidateWorkspaceConfiguration(ctx, declaration)
+	})
+}
diff --git a/services/core/internal/execution/runtime_workspace_settlement_test.go b/services/core/internal/execution/runtime_workspace_settlement_test.go
new file mode 100644
index 000000000..101e76529
--- /dev/null
+++ b/services/core/internal/execution/runtime_workspace_settlement_test.go
@@ -0,0 +1,236 @@
+package execution
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"testing"
+
+	v1 "github.com/MiniMax-AI/OpenAgentCore/contracts/agents-api/v1"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/identity"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/projectpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/workspacepg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/projects"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
+	"github.com/google/uuid"
+)
+
+// settledWorkspaceRefusal models the provider's pre-native filesystem rejection:
+// an absent settled receipt proves that no compute mutation needs observation.
+type settledWorkspaceRefusal struct {
+	sandbox.SandboxProvider
+	creates int
+}
+
+func (p *settledWorkspaceRefusal) Create(_ context.Context, q sandbox.Bootstrap) (sandbox.Info, error) {
+	p.creates++
+	return sandbox.Info{Reference: q.Reference, State: "absent", CreateSettled: true}, workspacefs.ErrUnavailable
+}
+
+type settlementWorkspaceControl struct {
+	workspacefs.Control
+	configuration workspacefs.Configuration
+	deletes       int
+}
+
+func (c *settlementWorkspaceControl) Declaration() workspacefs.Declaration {
+	return workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory}
+}
+func (c *settlementWorkspaceControl) Create(_ context.Context, ref workspacefs.Reference) (workspacefs.Attachment, error) {
+	return workspacefs.Attachment{Reference: ref, ConfigurationID: c.configuration.ID, Kind: workspacefs.AttachmentHostDirectory, Native: []byte(`{}`)}, nil
+}
+func (c *settlementWorkspaceControl) Delete(context.Context, workspacefs.Reference) error {
+	c.deletes++
+	return nil
+}
+
+type settlementWorkspaceControls struct{ control *settlementWorkspaceControl }
+
+func (c settlementWorkspaceControls) Control(workspacefs.Configuration) (workspacefs.Control, error) {
+	return c.control, nil
+}
+func (c settlementWorkspaceControls) Normalize(config workspacefs.Configuration) (workspacefs.Configuration, error) {
+	return config, nil
+}
+
+type workspaceSettlementFixture struct {
+	lifecycle *runtimeLifecycle
+	sessions  *sessions.Service
+	storage   *workspacepg.Store
+	control   *settlementWorkspaceControl
+	session   sessions.Session
+}
+
+func newWorkspaceSettlementFixture(t *testing.T, provider sandbox.SandboxProvider) workspaceSettlementFixture {
+	t.Helper()
+
+	pool := pgtest.OpenIsolated(t, nil)
+	lease, err := pgunit.AcquireLease(t.Context(), pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { _ = lease.Close(context.Background()) })
+	deployments, reader, operations := testDeployment(t, pool, pgtest.CredentialKey(t), lease)
+	owner := Owner{Lease: lease, Deployment: operations, Sessions: sessionExecution(t, lease)}
+	installation := initializeE2BDeployment(t, owner)
+	projectID := uuid.NewString()
+	audit := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "fixture-admin", ProjectID: projectID, RequestID: uuid.NewString(), TraceID: uuid.NewString()})
+	management, err := projects.NewService(projectpg.New(pgunit.NewPool(pool)))
+	if err != nil {
+		t.Fatal(err)
+	}
+	project, err := management.CreateProject(audit, projects.CreateProject{ID: projectID, Name: "Workspace settlement"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	sessionReader, service := testSessions(t, pool, pgtest.CredentialKey(t))
+	created, err := service.CreateSession(t.Context(), project.TenantID, sessions.CreateSession{Creator: identity.Subject{Kind: "service_account", ID: "fixture"}, Engine: "codex", IdempotencyKey: uuid.NewString(), Configuration: json.RawMessage(`{"agent":{"model":"test-model"},"environment":{"type":"openai_hosted","network":{"access":"disabled"}}}`), ModelProvider: &v1.ModelProviderInput{Protocol: "responses", BaseURL: "https://model.fixture.example/v1", APIKey: "fixture-key"}, ModelProviderSource: v1.ExecutionSourceSession})
+	if err != nil {
+		t.Fatal(err)
+	}
+	session := created.Session
+	configuration := workspacefs.Configuration{ID: uuid.NewString(), Adapter: "fixture", Parameters: []byte(`{}`)}
+	storage := workspacepg.New(pgunit.NewPool(pool))
+	writer := workspacepg.NewExecution(lease)
+	workspaceAudit := adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "fixture-admin", RequestID: uuid.NewString(), TraceID: uuid.NewString()})
+	if err = writer.SelectConfiguration(workspaceAudit, configuration); err != nil {
+		t.Fatal(err)
+	}
+	control := &settlementWorkspaceControl{configuration: configuration}
+	filesystems := workspaces.NewExecution(storage, writer, settlementWorkspaceControls{control}, lease)
+	declaration := control.Declaration()
+	lifecycle := &runtimeLifecycle{registry: runtimegateway.NewRegistry(), sessions: sessionReader, sessionExecution: owner.Sessions, deployment: operations, deployments: deployments, reader: reader, lease: lease, workspaces: filesystems, config: RuntimeProvider{InstallationID: installation, Provider: provider, Workspace: &declaration, WorkspaceRequirements: &workspacefs.Requirements{Attachment: workspacefs.AttachmentHostDirectory}}}
+	return workspaceSettlementFixture{lifecycle: lifecycle, sessions: service, storage: storage, control: control, session: session}
+}
+
+func TestSettledWorkspaceRefusalRetainsReceiptUntilExplicitSessionDeletion(t *testing.T) {
+	provider := &settledWorkspaceRefusal{}
+	fixture := newWorkspaceSettlementFixture(t, provider)
+	lifecycle, service, storage, control, session := fixture.lifecycle, fixture.sessions, fixture.storage, fixture.control, fixture.session
+	installation, filesystems, reader, sessionReader := lifecycle.config.InstallationID, lifecycle.workspaces, lifecycle.reader, lifecycle.sessions
+
+	allocation, err := lifecycle.provision(t.Context(), session.TenantID, session.Environment.ID, installation)
+	if !errors.Is(err, workspacefs.ErrUnavailable) || allocation.State != "released" || !allocation.CreateSettled {
+		t.Fatalf("settled refusal did not persist release: %+v, %v", allocation, err)
+	}
+	environment, err := sessionReader.GetEnvironment(t.Context(), session.TenantID, session.Environment.ID)
+	if err != nil || environment.Status != "failed" {
+		t.Fatal("missing durable failure", environment.Status, err)
+	}
+	replay, err := lifecycle.provision(t.Context(), session.TenantID, session.Environment.ID, installation)
+	if err != nil || !replay.Replayed || replay.ID != allocation.ID || provider.creates != 1 {
+		t.Fatal("settled failed creation retried compute", replay, err)
+	}
+	if _, err = filesystems.DeleteBatch(t.Context(), ""); err != nil || control.deletes != 0 {
+		t.Fatal("failure implicitly deleted retained filesystem", err)
+	}
+	if err = service.DeleteSession(t.Context(), sessions.DeleteSessionCommand{TenantID: session.TenantID, SessionID: session.ID}); err != nil {
+		t.Fatal(err)
+	}
+	if _, err = filesystems.DeleteBatch(t.Context(), ""); err != nil {
+		t.Fatal(err)
+	}
+	retained, err := storage.Get(t.Context(), session.TenantID, session.Environment.ID)
+	if err != nil || retained.State != workspaces.Deleted || retained.Attachment == nil || control.deletes != 1 {
+		t.Fatal("explicit Session deletion did not settle filesystem cleanup", retained, err)
+	}
+	persisted, err := reader.EnvironmentAllocation(t.Context(), deployment.AllocationKey{TenantID: session.TenantID, EnvironmentID: session.Environment.ID})
+	if err != nil || persisted.ID != allocation.ID || persisted.State != "released" || !persisted.CreateSettled {
+		t.Fatal("cleanup lost immutable compute receipt", persisted, err)
+	}
+}
+
+// unknownWorkspaceCreation models a one-shot dispatch with an unknown native
+// result. Absence alone cannot upgrade it to the provider's settlement receipt.
+type unknownWorkspaceCreation struct {
+	sandbox.SandboxProvider
+	creates, kills int
+	observation    string
+}
+
+func (p *unknownWorkspaceCreation) Create(_ context.Context, q sandbox.Bootstrap) (sandbox.Info, error) {
+	p.creates++
+	return sandbox.Info{Reference: q.Reference}, sandbox.ErrComputeUnconfirmed
+}
+func (p *unknownWorkspaceCreation) GetInfo(_ context.Context, ref sandbox.Reference) (sandbox.Info, error) {
+	switch p.observation {
+	case "absent":
+		return sandbox.Info{Reference: ref, State: "absent"}, sandbox.ErrNotFound
+	case "foreign":
+		ref.AllocationID = uuid.NewString()
+		return sandbox.Info{Reference: ref, State: "absent", CreateSettled: true}, nil
+	case "settled":
+		return sandbox.Info{Reference: ref, State: "absent", CreateSettled: true}, nil
+	default:
+		return sandbox.Info{Reference: ref}, sandbox.ErrComputeUnconfirmed
+	}
+}
+func (p *unknownWorkspaceCreation) Kill(context.Context, sandbox.Reference) error {
+	p.kills++
+	return nil
+}
+
+func TestDeletedUnknownWorkspaceCreationRequiresOwnedSettlementReceipt(t *testing.T) {
+	provider := &unknownWorkspaceCreation{}
+	fixture := newWorkspaceSettlementFixture(t, provider)
+	lifecycle, session := fixture.lifecycle, fixture.session
+	ctx := t.Context()
+	allocation, err := lifecycle.provision(ctx, session.TenantID, session.Environment.ID, lifecycle.config.InstallationID)
+	if !errors.Is(err, sandbox.ErrComputeUnconfirmed) || allocation.CreateSettled || allocation.State == "released" {
+		t.Fatal("unknown creation was settled", allocation, err)
+	}
+	replay, err := lifecycle.provision(ctx, session.TenantID, session.Environment.ID, lifecycle.config.InstallationID)
+	if err != nil || !replay.Replayed || replay.ID != allocation.ID || provider.creates != 1 {
+		t.Fatal("unknown creation retried compute", replay, err)
+	}
+	if err = fixture.sessions.DeleteSession(ctx, sessions.DeleteSessionCommand{TenantID: session.TenantID, SessionID: session.ID}); err != nil {
+		t.Fatal(err)
+	}
+	key := deployment.AllocationKey{TenantID: session.TenantID, EnvironmentID: session.Environment.ID}
+	for _, observation := range []string{"unknown", "absent", "foreign", "settled"} {
+		provider.observation = observation
+		allocation, err = lifecycle.reader.EnvironmentAllocation(ctx, key)
+		if err != nil {
+			t.Fatal(err)
+		}
+		observeErr := lifecycle.observe(ctx, allocation)
+		if observation == "unknown" && !errors.Is(observeErr, sandbox.ErrComputeUnconfirmed) {
+			t.Fatal("unknown observation changed semantics", observeErr)
+		}
+		if observation == "foreign" && !errors.Is(observeErr, sandbox.ErrOwnership) {
+			t.Fatal("foreign settlement accepted", observeErr)
+		}
+		if (observation == "absent" || observation == "settled") && observeErr != nil {
+			t.Fatal(observeErr)
+		}
+		if _, err = lifecycle.workspaces.DeleteBatch(ctx, ""); err != nil {
+			t.Fatal(err)
+		}
+		allocation, err = lifecycle.reader.EnvironmentAllocation(ctx, key)
+		if err != nil {
+			t.Fatal(err)
+		}
+		retained, err := fixture.storage.Get(ctx, session.TenantID, session.Environment.ID)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if observation != "settled" {
+			if allocation.State != "cleanup_pending" || allocation.CreateSettled || retained.State != workspaces.Ready || fixture.control.deletes != 0 {
+				t.Fatal("absence or unowned evidence settled unknown creation", observation, allocation, retained)
+			}
+		} else if allocation.State != "released" || !allocation.CreateSettled || retained.State != workspaces.Deleted || fixture.control.deletes != 1 {
+			t.Fatal("owned settlement did not converge explicit deletion", allocation, retained)
+		}
+	}
+	if provider.creates != 1 {
+		t.Fatal("cleanup retried native creation")
+	}
+}
diff --git a/services/core/internal/execution/runtime_workspace_test.go b/services/core/internal/execution/runtime_workspace_test.go
new file mode 100644
index 000000000..54ca2141c
--- /dev/null
+++ b/services/core/internal/execution/runtime_workspace_test.go
@@ -0,0 +1,179 @@
+package execution
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/deployment"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimegateway"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
+	"github.com/google/uuid"
+)
+
+type workspaceEnvironmentReader struct{ sessions.Reader }
+
+func (workspaceEnvironmentReader) GetEnvironment(context.Context, string, string) (sessions.Environment, error) {
+	return sessions.Environment{Configuration: []byte(`{"type":"openai_hosted"}`)}, nil
+}
+
+type executionWorkspaceFixture struct {
+	workspaces.Storage
+	workspaces.ExecutionStorage
+	workspacefs.Control
+	record                  workspaces.Record
+	creates, deletes, binds int
+	failure                 error
+}
+
+func (f *executionWorkspaceFixture) Bind(context.Context, string, string) (workspaces.Record, error) {
+	f.binds++
+	return f.record, nil
+}
+func (f *executionWorkspaceFixture) ControlForConfiguration(workspacefs.Configuration) (workspacefs.Control, error) {
+	return f, nil
+}
+func (f *executionWorkspaceFixture) Declaration() workspacefs.Declaration {
+	return workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory}
+}
+func (f *executionWorkspaceFixture) Create(context.Context, workspacefs.Reference) (workspacefs.Attachment, error) {
+	f.creates++
+	return workspacefs.Attachment{Reference: f.record.Reference, ConfigurationID: f.record.Configuration.ID, Kind: workspacefs.AttachmentHostDirectory, Native: []byte(`{}`)}, f.failure
+}
+func (f *executionWorkspaceFixture) MarkReady(_ context.Context, _ workspacefs.Reference, a workspacefs.Attachment) error {
+	f.record.State = workspaces.Ready
+	f.record.Attachment = &a
+	return nil
+}
+func (f *executionWorkspaceFixture) DeletionCandidates(context.Context, string) ([]workspaces.Record, error) {
+	return []workspaces.Record{f.record}, nil
+}
+func (f *executionWorkspaceFixture) BeginDelete(context.Context, workspacefs.Reference) error {
+	f.record.State = workspaces.Deleting
+	return nil
+}
+func (f *executionWorkspaceFixture) Delete(context.Context, workspacefs.Reference) error {
+	f.deletes++
+	return nil
+}
+func (f *executionWorkspaceFixture) MarkDeleted(context.Context, workspacefs.Reference) error {
+	f.record.State = workspaces.Deleted
+	return nil
+}
+
+type workspaceControls struct{ fixture *executionWorkspaceFixture }
+
+func (c workspaceControls) Normalize(configuration workspacefs.Configuration) (workspacefs.Configuration, error) {
+	return configuration, nil
+}
+
+func (c workspaceControls) Control(config workspacefs.Configuration) (workspacefs.Control, error) {
+	return c.fixture.ControlForConfiguration(config)
+}
+func newExecutionWorkspaceFixture() *executionWorkspaceFixture {
+	return &executionWorkspaceFixture{record: workspaces.Record{Reference: workspacefs.Reference{TenantID: uuid.NewString(), EnvironmentID: uuid.NewString(), ObjectID: uuid.NewString()}, Configuration: workspacefs.Configuration{ID: uuid.NewString(), Adapter: "fixture", Parameters: []byte(`{}`)}, State: workspaces.Creating}}
+}
+
+func TestRuntimeWorkspaceConvergesBeforeComputeReservation(t *testing.T) {
+	for _, fail := range []bool{false, true} {
+		t.Run(map[bool]string{false: "ready", true: "unavailable"}[fail], func(t *testing.T) {
+			f := newExecutionWorkspaceFixture()
+			if fail {
+				f.failure = workspacefs.ErrUnavailable
+			}
+			reserved := false
+			stop := errors.New("reservation reached")
+			_, operations := deploymentOperations(t, &strictDeploymentStorage{t: t}, &strictDeploymentReader{t: t}, &strictExecutionStorage{t: t, withReservation: func(context.Context, deployment.AllocationKey, func(sessions.LockedSession, deployment.ReservationTx) error) error {
+				reserved = true
+				if f.record.State != workspaces.Ready || f.creates != 1 {
+					t.Fatal("compute reserved before filesystem converged")
+				}
+				return stop
+			}})
+			r := &runtimeLifecycle{sessions: workspaceEnvironmentReader{}, deployment: operations, reader: &strictDeploymentReader{t: t, environmentAllocation: func(context.Context, deployment.AllocationKey) (deployment.Allocation, error) {
+				return deployment.Allocation{}, deployment.ErrNotFound
+			}}, workspaces: workspaces.NewExecution(f, f, workspaceControls{f}, heldLease{}), config: RuntimeProvider{InstallationID: uuid.NewString(), Workspace: &workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory}, WorkspaceRequirements: &workspacefs.Requirements{Attachment: workspacefs.AttachmentHostDirectory}}}
+			_, err := r.provision(t.Context(), f.record.Reference.TenantID, f.record.Reference.EnvironmentID, r.config.InstallationID)
+			if fail {
+				if !errors.Is(err, workspacefs.ErrUnavailable) || reserved {
+					t.Fatal("unavailable storage admitted compute", err)
+				}
+			} else if !errors.Is(err, stop) || !reserved {
+				t.Fatal(err)
+			}
+		})
+	}
+}
+
+func TestRuntimeWorkspaceScanRunsWithoutSandboxOrNodes(t *testing.T) {
+	f := newExecutionWorkspaceFixture()
+	m, err := newRuntimeManager(Owner{Lease: heldLease{}, Workspaces: workspaces.NewExecution(f, f, workspaceControls{f}, heldLease{})}, nil, nil, nil, runtimegateway.NewRegistry(), unusedRuntimes(t))
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer m.stop()
+	if err = m.reconcile(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	if f.deletes != 1 || f.record.State != workspaces.Deleted {
+		t.Fatal("unconfigured Sandbox prevented workspace deletion")
+	}
+}
+
+func (f *executionWorkspaceFixture) ActiveConfiguration(context.Context) (workspacefs.Configuration, error) {
+	return f.record.Configuration, nil
+}
+func (f *executionWorkspaceFixture) SelectConfiguration(_ context.Context, c workspacefs.Configuration) error {
+	f.record.Configuration = c
+	return nil
+}
+func (f *executionWorkspaceFixture) Check(context.Context) error { return f.failure }
+
+func TestWorkspaceSelectionDerivesBeforeDeploymentValidation(t *testing.T) {
+	f := newExecutionWorkspaceFixture()
+	m := &runtimeManager{workspaces: workspaces.NewExecution(f, f, workspaceControls{f}, heldLease{})}
+	selection, err := m.workspaceSelection(t.Context(), sandbox.Selection{})
+	if err != nil || selection.Workspace == nil || selection.Workspace.Attachment != workspacefs.AttachmentHostDirectory {
+		t.Fatal("missing derived generation declaration", err)
+	}
+	selection.Workspace.UserXAttr = true
+	if _, err = m.workspaceSelection(t.Context(), selection); !errors.Is(err, sandbox.ErrInvalid) {
+		t.Fatal("caller could forge declaration", err)
+	}
+}
+
+func TestOwnedGenerationDoesNotAdoptLaterFilesystemSelection(t *testing.T) {
+	f := newExecutionWorkspaceFixture()
+	stop := errors.New("reservation reached")
+	_, operations := deploymentOperations(t, &strictDeploymentStorage{t: t}, &strictDeploymentReader{t: t}, &strictExecutionStorage{t: t, withReservation: func(context.Context, deployment.AllocationKey, func(sessions.LockedSession, deployment.ReservationTx) error) error {
+		return stop
+	}})
+	r := &runtimeLifecycle{sessions: workspaceEnvironmentReader{}, deployment: operations, workspaces: workspaces.NewExecution(f, f, workspaceControls{f}, heldLease{}), config: RuntimeProvider{InstallationID: uuid.NewString()}}
+	_, err := r.provision(t.Context(), f.record.Reference.TenantID, f.record.Reference.EnvironmentID, r.config.InstallationID)
+	if !errors.Is(err, stop) || f.binds != 0 || f.creates != 0 {
+		t.Fatal("owned generation retroactively attached filesystem", err)
+	}
+}
+
+func TestConfigureWorkspaceBeforeSandboxSetup(t *testing.T) {
+	f := newExecutionWorkspaceFixture()
+	reader := &strictDeploymentReader{t: t, deployment: func(context.Context) (deployment.Record, error) {
+		return deployment.Record{InstallationID: uuid.NewString(), Specification: []byte(`{}`)}, nil
+	}}
+	service, _ := deploymentOperations(t, &strictDeploymentStorage{t: t}, reader, &strictExecutionStorage{t: t})
+	m, err := newRuntimeManager(Owner{Lease: heldLease{}, Workspaces: workspaces.NewExecution(f, f, workspaceControls{f}, heldLease{})}, service, reader, nil, runtimegateway.NewRegistry(), unusedRuntimes(t))
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer m.stop()
+	worker := &Worker{runtimes: m}
+	next := f.record.Configuration
+	next.ID = uuid.NewString()
+	got, err := worker.Configure(t.Context(), next)
+	if err != nil || got.ID != next.ID {
+		t.Fatal("filesystem selection requires sandbox setup", err)
+	}
+}
diff --git a/services/core/internal/execution/sandbox_deployment_setup.go b/services/core/internal/execution/sandbox_deployment_setup.go
index 165198028..44ab1a86b 100644
--- a/services/core/internal/execution/sandbox_deployment_setup.go
+++ b/services/core/internal/execution/sandbox_deployment_setup.go
@@ -36,6 +36,10 @@ func (w *Worker) InitializeSandboxDeployment(ctx context.Context, input sandbox.
 	}
 	defer unlock()
 	m := w.runtimes
+	input, err = m.workspaceSelection(ctx, input)
+	if err != nil {
+		return deployment.View{}, err
+	}
 	if err := m.deployment.CheckSetup(ctx, m.setupInstallationID, input); err != nil {
 		return deployment.View{}, err
 	}
@@ -113,6 +117,7 @@ func (m *runtimeManager) ensureDeployment(parent context.Context) (bool, error)
 // Preparation is outside the manager mutex and all database transactions. A
 // rejected candidate cannot retire the current generation or its node lanes.
 func (m *runtimeManager) prepareCandidate(ctx context.Context, input sandbox.Selection) (PreparedRuntimeDeployment, error) {
+
 	setup, err := m.deploymentService.SetupForSelection(m.setupInstallationID, input)
 	if err != nil {
 		return PreparedRuntimeDeployment{}, err
@@ -166,3 +171,21 @@ func (m *runtimeManager) publishDeployment(candidate PreparedRuntimeDeployment,
 	m.switching = false
 	m.switchDrained = nil
 }
+
+// workspaceSelection derives the external declaration before generation preflight
+// and equality checks; callers hold the deployment mutation gate.
+func (m *runtimeManager) workspaceSelection(ctx context.Context, input sandbox.Selection) (sandbox.Selection, error) {
+	if m.workspaces != nil {
+		declaration, err := m.workspaces.Declaration(ctx)
+		if err != nil {
+			return sandbox.Selection{}, err
+		}
+		if input.Workspace != nil && (declaration == nil || *input.Workspace != *declaration) {
+			return sandbox.Selection{}, sandbox.ErrInvalid
+		}
+		input.Workspace = declaration
+	} else if input.Workspace != nil {
+		return sandbox.Selection{}, sandbox.ErrInvalid
+	}
+	return input, nil
+}
diff --git a/services/core/internal/execution/sandbox_deployment_switch.go b/services/core/internal/execution/sandbox_deployment_switch.go
index e6606e5a0..5932054ad 100644
--- a/services/core/internal/execution/sandbox_deployment_switch.go
+++ b/services/core/internal/execution/sandbox_deployment_switch.go
@@ -144,6 +144,10 @@ func (w *Worker) UpdateSandboxDeployment(ctx context.Context, input sandbox.Sele
 	}
 	defer unlock()
 	m := w.runtimes
+	input, err = m.workspaceSelection(ctx, input)
+	if err != nil {
+		return deployment.View{}, err
+	}
 	input, unchanged, err := m.deployment.ClassifyChange(ctx, m.setupInstallationID, input)
 	if err != nil {
 		return deployment.View{}, err
diff --git a/services/core/internal/persistence/postgres/workspacepg/store.go b/services/core/internal/persistence/postgres/workspacepg/store.go
new file mode 100644
index 000000000..4109d2e2e
--- /dev/null
+++ b/services/core/internal/persistence/postgres/workspacepg/store.go
@@ -0,0 +1,273 @@
+// Package workspacepg stores independent workspace configurations and durable
+// Environment filesystem ownership. Execution writes use Core's existing lease.
+package workspacepg
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/db/sqlc"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/auditpg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
+)
+
+type Store struct{ pool *pgunit.Pool }
+
+func New(pool *pgunit.Pool) *Store { return &Store{pool: pool} }
+
+var _ workspaces.Storage = (*Store)(nil)
+
+func (s *Store) ActiveConfiguration(ctx context.Context) (workspacefs.Configuration, error) {
+	row, err := s.pool.Queries().GetActiveWorkspaceConfiguration(ctx)
+	if errors.Is(err, pgx.ErrNoRows) {
+		return workspacefs.Configuration{}, workspaces.ErrNotConfigured
+	}
+	if err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	return configuration(row), nil
+}
+
+// SelectConfiguration atomically changes the selection without changing any
+// configuration's definition or any existing Environment's binding.
+func (e *Execution) SelectConfiguration(ctx context.Context, config workspacefs.Configuration) error {
+	if err := config.Validate(); err != nil {
+		return err
+	}
+	id := pgunit.PathID(config.ID)
+	return e.lease.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		if err := q.LockWorkspaceConfigurations(ctx); err != nil {
+			return err
+		}
+		if err := q.InsertWorkspaceConfiguration(ctx, sqlc.InsertWorkspaceConfigurationParams{ID: id, Adapter: config.Adapter, Parameters: config.Parameters}); err != nil {
+			return err
+		}
+		matches, err := q.MatchWorkspaceConfiguration(ctx, sqlc.MatchWorkspaceConfigurationParams{ID: id, Adapter: config.Adapter, Parameters: config.Parameters})
+		if err != nil {
+			return err
+		}
+		if !matches {
+			return workspaces.ErrConflict
+		}
+		if err := q.ClearActiveWorkspaceConfiguration(ctx); err != nil {
+			return err
+		}
+		if err := q.ActivateWorkspaceConfiguration(ctx, id); err != nil {
+			return err
+		}
+		return auditpg.RecordDeploymentMutation(ctx, q, "change", "workspace_storage", config.ID)
+	})
+}
+
+func (s *Store) Get(ctx context.Context, tenant, environment string) (workspaces.Record, error) {
+	return get(ctx, s.pool.Queries(), tenant, environment)
+}
+
+func (s *Store) DeletionCandidates(ctx context.Context, after string) ([]workspaces.Record, error) {
+	cursor := pgtype.UUID{Valid: true}
+	if after != "" {
+		var err error
+		cursor, err = pgunit.ParseID(after)
+		if err != nil {
+			return nil, err
+		}
+	}
+	rows, err := s.pool.Queries().ListWorkspaceDeletionCandidates(ctx, cursor)
+	if err != nil {
+		return nil, err
+	}
+	result := make([]workspaces.Record, 0, len(rows))
+	for _, row := range rows {
+		record, err := record(row.EnvironmentWorkspace, row.WorkspaceFsConfiguration, row.TenantID)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, record)
+	}
+	return result, nil
+}
+
+type Execution struct{ lease *pgunit.Lease }
+
+func NewExecution(lease *pgunit.Lease) *Execution { return &Execution{lease: lease} }
+
+var _ workspaces.ExecutionStorage = (*Execution)(nil)
+
+func (e *Execution) Bind(ctx context.Context, tenant, environment string) (workspaces.Record, error) {
+	var result workspaces.Record
+	err := e.lease.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		deleted, err := lockSession(ctx, q, tenant, environment)
+		if err != nil {
+			return err
+		}
+		if deleted {
+			return workspaces.ErrConflict
+		}
+		result, err = get(ctx, q, tenant, environment)
+		if err == nil {
+			if result.State == workspaces.Deleting || result.State == workspaces.Deleted {
+				return workspaces.ErrConflict
+			}
+			return nil
+		}
+		if !errors.Is(err, workspaces.ErrNotFound) {
+			return err
+		}
+		config, err := q.GetActiveWorkspaceConfiguration(ctx)
+		if errors.Is(err, pgx.ErrNoRows) {
+			return workspaces.ErrNotConfigured
+		}
+		if err != nil {
+			return err
+		}
+		if err := q.InsertEnvironmentWorkspace(ctx, sqlc.InsertEnvironmentWorkspaceParams{
+			ObjectID: pgtype.UUID{Bytes: uuid.New(), Valid: true}, EnvironmentID: pgunit.PathID(environment), ConfigurationID: config.ID,
+		}); err != nil {
+			return err
+		}
+		result, err = get(ctx, q, tenant, environment)
+		return err
+	})
+	if err != nil {
+		return workspaces.Record{}, err
+	}
+	return result, nil
+}
+
+func (e *Execution) MarkReady(ctx context.Context, ref workspacefs.Reference, attachment workspacefs.Attachment) error {
+	return e.change(ctx, ref, func(ctx context.Context, q *sqlc.Queries, current workspaces.Record, deleted bool) error {
+		if deleted || current.State != workspaces.Creating {
+			return workspaces.ErrConflict
+		}
+		if err := workspacefs.ValidateAttachment(ref, current.Configuration, attachment); err != nil {
+			return err
+		}
+		raw, err := json.Marshal(attachment)
+		if err != nil {
+			return err
+		}
+		changed, err := q.MarkWorkspaceReady(ctx, sqlc.MarkWorkspaceReadyParams{ObjectID: pgunit.PathID(ref.ObjectID), Attachment: raw})
+		return changedOne(changed, err)
+	})
+}
+
+func (e *Execution) BeginDelete(ctx context.Context, ref workspacefs.Reference) error {
+	return e.change(ctx, ref, func(ctx context.Context, q *sqlc.Queries, current workspaces.Record, deleted bool) error {
+		if !deleted {
+			return workspaces.ErrConflict
+		}
+		if current.State == workspaces.Deleted {
+			return nil
+		}
+		// runtime_allocations owns both compute and retained snapshots in
+		// compute_state. Its released receipt follows cleanup of both. A missing
+		// allocation also covers deletion before compute admission ever occurred.
+		released, err := q.WorkspaceComputeReleased(ctx, pgunit.PathID(ref.EnvironmentID))
+		if err != nil {
+			return err
+		}
+		if !released {
+			return workspaces.ErrConflict
+		}
+		if current.State == workspaces.Deleting {
+			return nil
+		}
+		changed, err := q.BeginWorkspaceDeletion(ctx, pgunit.PathID(ref.ObjectID))
+		return changedOne(changed, err)
+	})
+}
+
+func (e *Execution) MarkDeleted(ctx context.Context, ref workspacefs.Reference) error {
+	return e.change(ctx, ref, func(ctx context.Context, q *sqlc.Queries, current workspaces.Record, _ bool) error {
+		if current.State == workspaces.Deleted {
+			return nil
+		}
+		changed, err := q.MarkWorkspaceDeleted(ctx, pgunit.PathID(ref.ObjectID))
+		return changedOne(changed, err)
+	})
+}
+
+func (e *Execution) change(ctx context.Context, ref workspacefs.Reference, apply func(context.Context, *sqlc.Queries, workspaces.Record, bool) error) error {
+	if err := ref.Validate(); err != nil {
+		return err
+	}
+	return e.lease.Transaction(ctx, func(ctx context.Context, tx pgx.Tx) error {
+		q := sqlc.New(tx)
+		deleted, err := lockSession(ctx, q, ref.TenantID, ref.EnvironmentID)
+		if err != nil {
+			return err
+		}
+		current, err := get(ctx, q, ref.TenantID, ref.EnvironmentID)
+		if err != nil {
+			return err
+		}
+		if current.Reference != ref {
+			return workspaces.ErrConflict
+		}
+		return apply(ctx, q, current, deleted)
+	})
+}
+
+func lockSession(ctx context.Context, q *sqlc.Queries, tenant, environment string) (bool, error) {
+	id, err := q.LockWorkspaceSession(ctx, sqlc.LockWorkspaceSessionParams{TenantID: pgunit.PathID(tenant), ID: pgunit.PathID(environment)})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return false, workspaces.ErrNotFound
+	}
+	if err != nil {
+		return false, err
+	}
+	// Read after acquiring the Session lock with a fresh statement snapshot.
+	return q.WorkspaceSessionDeleted(ctx, id)
+}
+
+func get(ctx context.Context, q *sqlc.Queries, tenant, environment string) (workspaces.Record, error) {
+	row, err := q.GetEnvironmentWorkspace(ctx, sqlc.GetEnvironmentWorkspaceParams{TenantID: pgunit.PathID(tenant), ID: pgunit.PathID(environment)})
+	if errors.Is(err, pgx.ErrNoRows) {
+		return workspaces.Record{}, workspaces.ErrNotFound
+	}
+	if err != nil {
+		return workspaces.Record{}, err
+	}
+	return record(row.EnvironmentWorkspace, row.WorkspaceFsConfiguration, row.TenantID)
+}
+
+func configuration(row sqlc.WorkspaceFsConfiguration) workspacefs.Configuration {
+	return workspacefs.Configuration{ID: uuid.UUID(row.ID.Bytes).String(), Adapter: row.Adapter, Parameters: row.Parameters}
+}
+
+func record(row sqlc.EnvironmentWorkspace, config sqlc.WorkspaceFsConfiguration, tenant pgtype.UUID) (workspaces.Record, error) {
+	result := workspaces.Record{
+		Reference:     workspacefs.Reference{TenantID: uuid.UUID(tenant.Bytes).String(), EnvironmentID: uuid.UUID(row.EnvironmentID.Bytes).String(), ObjectID: uuid.UUID(row.ObjectID.Bytes).String()},
+		Configuration: configuration(config), State: workspaces.State(row.State),
+	}
+	if row.Attachment != nil {
+		var attachment workspacefs.Attachment
+		if err := json.Unmarshal(row.Attachment, &attachment); err != nil {
+			return workspaces.Record{}, err
+		}
+		if err := workspacefs.ValidateAttachment(result.Reference, result.Configuration, attachment); err != nil {
+			return workspaces.Record{}, err
+		}
+		result.Attachment = &attachment
+	}
+	return result, nil
+}
+
+func changedOne(changed int64, err error) error {
+	if err != nil {
+		return err
+	}
+	if changed != 1 {
+		return workspaces.ErrConflict
+	}
+	return nil
+}
diff --git a/services/core/internal/persistence/postgres/workspacepg/store_test.go b/services/core/internal/persistence/postgres/workspacepg/store_test.go
new file mode 100644
index 000000000..8d9d93532
--- /dev/null
+++ b/services/core/internal/persistence/postgres/workspacepg/store_test.go
@@ -0,0 +1,410 @@
+package workspacepg_test
+
+import (
+	"context"
+	"errors"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgxpool"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/adminaudit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgtest"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/pgunit"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/persistence/postgres/workspacepg"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspaces"
+)
+
+type fixture struct {
+	pool      *pgxpool.Pool
+	store     *workspacepg.Store
+	execution *workspacepg.Execution
+	lease     *pgunit.Lease
+}
+
+func newFixture(t *testing.T) fixture {
+	t.Helper()
+	pool := pgtest.OpenIsolated(t, nil)
+	lease, err := pgunit.AcquireLease(t.Context(), pool)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { _ = lease.Close(context.Background()) })
+	f := fixture{pool: pool, store: workspacepg.New(pgunit.NewPool(pool)), execution: workspacepg.NewExecution(lease), lease: lease}
+	if err := f.execution.SelectConfiguration(admin(t), newConfiguration()); err != nil {
+		t.Fatal(err)
+	}
+	return f
+}
+
+func newConfiguration() workspacefs.Configuration {
+	return workspacefs.Configuration{ID: uuid.NewString(), Adapter: "fixture", Parameters: []byte(`{"storage":"test"}`)}
+}
+
+func admin(t *testing.T) context.Context {
+	t.Helper()
+	return adminaudit.WithSource(t.Context(), adminaudit.Source{CredentialID: "fixture-admin", ActorLabel: "operator", RequestID: uuid.NewString(), TraceID: uuid.NewString()})
+}
+
+func TestConfigurationSelectionRequiresAtomicAudit(t *testing.T) {
+	f := newFixture(t)
+	before, err := f.store.ActiveConfiguration(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+	next := newConfiguration()
+	next.Parameters = []byte(`{"secret":"private-configuration-value"}`)
+	if err := f.execution.SelectConfiguration(t.Context(), next); !errors.Is(err, adminaudit.ErrInvalidSource) {
+		t.Fatal("selection without audit source", err)
+	}
+	active, err := f.store.ActiveConfiguration(t.Context())
+	if err != nil || active.ID != before.ID {
+		t.Fatal("missing audit changed selection", active, err)
+	}
+	var definitions, operations int
+	if err := f.pool.QueryRow(t.Context(), `SELECT (SELECT count(*) FROM workspace_fs_configurations), (SELECT count(*) FROM admin_audit_log)`).Scan(&definitions, &operations); err != nil {
+		t.Fatal(err)
+	}
+	if definitions != 1 || operations != 1 {
+		t.Fatal("missing audit did not roll back entire mutation", definitions, operations)
+	}
+	ctx := admin(t)
+	for range 2 {
+		if err := f.execution.SelectConfiguration(ctx, next); err != nil {
+			t.Fatal("immutable selection retry", err)
+		}
+	}
+	var credential, actor, request, trace, action, resource, id, raw string
+	var deploymentWide bool
+	if err := f.pool.QueryRow(t.Context(), `SELECT admin_credential_id, actor_label, request_id, trace_id, action, resource_type, resource_id,
+		tenant_id IS NULL AND project_id IS NULL, row_to_json(a)::text FROM admin_audit_log a WHERE resource_id=$1 LIMIT 1`, next.ID).
+		Scan(&credential, &actor, &request, &trace, &action, &resource, &id, &deploymentWide, &raw); err != nil {
+		t.Fatal(err)
+	}
+	source, _ := adminaudit.FromContext(ctx)
+	if credential != source.CredentialID || actor != source.ActorLabel || request != source.RequestID || trace != source.TraceID || action != "change" || resource != "workspace_storage" || id != next.ID || !deploymentWide {
+		t.Fatal("configuration audit lost administrator provenance")
+	}
+	if strings.Contains(raw, "private-configuration-value") {
+		t.Fatal("configuration secret leaked into audit")
+	}
+	if err := f.pool.QueryRow(t.Context(), `SELECT count(*) FROM workspace_fs_configurations`).Scan(&definitions); err != nil {
+		t.Fatal(err)
+	}
+	if definitions != 2 {
+		t.Fatal("immutable retry created another definition", definitions)
+	}
+}
+
+func (f fixture) environment(t *testing.T) (string, string, string) {
+	t.Helper()
+	tenant, session, environment := uuid.NewString(), uuid.NewString(), uuid.NewString()
+	if _, err := f.pool.Exec(t.Context(), `INSERT INTO sessions(id, tenant_id, engine, idempotency_key, request_hash, configuration)
+		VALUES ($1, $2, 'codex', 'key', 'hash', '{"environment":{"type":"openai_hosted"}}')`, session, tenant); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := f.pool.Exec(t.Context(), `INSERT INTO environments(id, session_id) VALUES ($1, $2)`, environment, session); err != nil {
+		t.Fatal(err)
+	}
+	return tenant, session, environment
+}
+
+func (f fixture) bind(t *testing.T) (workspaces.Record, string) {
+	t.Helper()
+	tenant, session, environment := f.environment(t)
+	record, err := f.execution.Bind(t.Context(), tenant, environment)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return record, session
+}
+
+func attachment(record workspaces.Record) workspacefs.Attachment {
+	return workspacefs.Attachment{Reference: record.Reference, ConfigurationID: record.Configuration.ID,
+		Kind: workspacefs.AttachmentHostDirectory, Native: []byte(`{"receipt":"fixture"}`)}
+}
+
+func (f fixture) deleteSession(t *testing.T, session string) {
+	t.Helper()
+	if _, err := f.pool.Exec(t.Context(), `UPDATE sessions SET deleted_at=clock_timestamp() WHERE id=$1`, session); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestConfigurationSwitchPreservesBinding(t *testing.T) {
+	f := newFixture(t)
+	first, _ := f.bind(t)
+	second := newConfiguration()
+	if err := f.execution.SelectConfiguration(admin(t), second); err != nil {
+		t.Fatal(err)
+	}
+	replayed, err := f.execution.Bind(t.Context(), first.Reference.TenantID, first.Reference.EnvironmentID)
+	if err != nil || replayed.Reference != first.Reference || replayed.Configuration.ID != first.Configuration.ID {
+		t.Fatal("configuration switch changed existing creation", replayed, err)
+	}
+	fresh, _ := f.bind(t)
+	if fresh.Configuration.ID != second.ID || fresh.Reference.ObjectID == first.Reference.ObjectID {
+		t.Fatal("new binding did not select fresh configuration", fresh)
+	}
+	changed := first.Configuration
+	changed.Parameters = []byte(`{"storage":"other"}`)
+	if err := f.execution.SelectConfiguration(admin(t), changed); !errors.Is(err, workspaces.ErrConflict) {
+		t.Fatal("mutated configuration", err)
+	}
+	active, err := f.store.ActiveConfiguration(t.Context())
+	if err != nil || active.ID != second.ID {
+		t.Fatal("rejected selection changed active configuration", active, err)
+	}
+	if err := f.execution.SelectConfiguration(admin(t), first.Configuration); err != nil {
+		t.Fatal("could not reselect retained configuration", err)
+	}
+	if _, err := f.pool.Exec(t.Context(), `UPDATE workspace_fs_configurations SET adapter='other' WHERE id=$1`, first.Configuration.ID); err == nil {
+		t.Fatal("database permitted configuration mutation")
+	}
+	if _, err := f.pool.Exec(t.Context(), `UPDATE environment_workspaces SET configuration_id=$1 WHERE object_id=$2`, second.ID, first.Reference.ObjectID); err == nil {
+		t.Fatal("database permitted rebinding")
+	}
+}
+
+func TestConcurrentSelectionHasOneActiveConfiguration(t *testing.T) {
+	f := newFixture(t)
+	var wg sync.WaitGroup
+	errors := make(chan error, 8)
+	for range 8 {
+		wg.Go(func() { errors <- f.execution.SelectConfiguration(admin(t), newConfiguration()) })
+	}
+	wg.Wait()
+	close(errors)
+	for err := range errors {
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+	var active, retained int
+	if err := f.pool.QueryRow(t.Context(), `SELECT count(*) FILTER (WHERE active), count(*) FROM workspace_fs_configurations`).Scan(&active, &retained); err != nil {
+		t.Fatal(err)
+	}
+	if active != 1 || retained != 9 {
+		t.Fatal("configuration selection lost retained definitions", active, retained)
+	}
+}
+
+func TestDeletedSessionRejectsLateReadyAndQueuesWithoutAllocation(t *testing.T) {
+	f := newFixture(t)
+	record, session := f.bind(t)
+	tx, err := f.pool.Begin(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer tx.Rollback(context.Background())
+	if _, err := tx.Exec(t.Context(), `UPDATE sessions SET deleted_at=clock_timestamp() WHERE id=$1`, session); err != nil {
+		t.Fatal(err)
+	}
+	ready := make(chan error, 1)
+	go func() { ready <- f.execution.MarkReady(t.Context(), record.Reference, attachment(record)) }()
+	waitCtx, cancel := context.WithTimeout(t.Context(), 2*time.Second)
+	defer cancel()
+	ticker := time.NewTicker(5 * time.Millisecond)
+	defer ticker.Stop()
+	for {
+		var blocked bool
+		if err := f.pool.QueryRow(waitCtx, `SELECT EXISTS(SELECT 1 FROM pg_stat_activity WHERE $1=ANY(pg_blocking_pids(pid)))`, tx.Conn().PgConn().PID()).Scan(&blocked); err != nil {
+			t.Fatal(err)
+		}
+		if blocked {
+			break
+		}
+		select {
+		case err := <-ready:
+			t.Fatal("ready publication did not wait for Session deletion", err)
+		case <-waitCtx.Done():
+			t.Fatal("ready publication did not lock Session", waitCtx.Err())
+		case <-ticker.C:
+		}
+	}
+	if err := tx.Commit(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	if err := <-ready; !errors.Is(err, workspaces.ErrConflict) {
+		t.Fatal("late ready accepted deleted Session", err)
+	}
+	candidates, err := f.store.DeletionCandidates(t.Context(), "")
+	if err != nil || len(candidates) != 1 || candidates[0].Reference != record.Reference {
+		t.Fatal("unallocated workspace missing from cleanup", candidates, err)
+	}
+	if err := f.execution.BeginDelete(t.Context(), record.Reference); err != nil {
+		t.Fatal(err)
+	}
+	if err := f.execution.MarkReady(t.Context(), record.Reference, attachment(record)); !errors.Is(err, workspaces.ErrConflict) {
+		t.Fatal("deleting workspace became ready", err)
+	}
+	if err := f.execution.MarkDeleted(t.Context(), record.Reference); err != nil {
+		t.Fatal(err)
+	}
+	retained, err := f.store.Get(t.Context(), record.Reference.TenantID, record.Reference.EnvironmentID)
+	if err != nil || retained.State != workspaces.Deleted || retained.Reference != record.Reference {
+		t.Fatal("deleted identity not retained", retained, err)
+	}
+	if _, err := f.execution.Bind(t.Context(), record.Reference.TenantID, record.Reference.EnvironmentID); !errors.Is(err, workspaces.ErrConflict) {
+		t.Fatal("deleted identity reused", err)
+	}
+	if err := f.execution.MarkReady(t.Context(), record.Reference, attachment(record)); !errors.Is(err, workspaces.ErrConflict) {
+		t.Fatal("terminal workspace became ready", err)
+	}
+	candidates, err = f.store.DeletionCandidates(t.Context(), "")
+	if err != nil || len(candidates) != 0 {
+		t.Fatal("terminal workspace still queued", candidates, err)
+	}
+}
+
+func TestExpiryArchiveAndFailureDoNotAuthorizeDeletion(t *testing.T) {
+	f := newFixture(t)
+	for _, status := range []string{"expired", "failed", "disconnected"} {
+		record, _ := f.bind(t)
+		if err := f.execution.MarkReady(t.Context(), record.Reference, attachment(record)); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := f.pool.Exec(t.Context(), `UPDATE environments SET status=$2 WHERE id=$1`, record.Reference.EnvironmentID, status); err != nil {
+			t.Fatal(err)
+		}
+		// Managed archive is the released allocation receipt. It is deliberately
+		// not Session deletion, regardless of Environment terminal status.
+		f.allocation(t, record, true)
+		if err := f.execution.BeginDelete(t.Context(), record.Reference); !errors.Is(err, workspaces.ErrConflict) {
+			t.Fatal(status, "authorized deletion", err)
+		}
+	}
+	candidates, err := f.store.DeletionCandidates(t.Context(), "")
+	if err != nil || len(candidates) != 0 {
+		t.Fatal("nondeleted Sessions queued", candidates, err)
+	}
+}
+
+func TestDeletionWaitsForComputeAndSnapshotRelease(t *testing.T) {
+	f := newFixture(t)
+	record, session := f.bind(t)
+	f.allocation(t, record, false)
+	f.deleteSession(t, session)
+	candidates, err := f.store.DeletionCandidates(t.Context(), "")
+	if err != nil || len(candidates) != 0 {
+		t.Fatal("unreleased snapshot queued filesystem deletion", candidates, err)
+	}
+	if err := f.execution.BeginDelete(t.Context(), record.Reference); !errors.Is(err, workspaces.ErrConflict) {
+		t.Fatal("deleted filesystem before releasing compute", err)
+	}
+	if _, err := f.pool.Exec(t.Context(), `UPDATE runtime_allocations SET state='released', released_at=clock_timestamp(), create_settled=true WHERE environment_id=$1`, record.Reference.EnvironmentID); err != nil {
+		t.Fatal(err)
+	}
+	candidates, err = f.store.DeletionCandidates(t.Context(), "")
+	if err != nil || len(candidates) != 1 {
+		t.Fatal("released ownership did not enable deletion", candidates, err)
+	}
+	if err := f.execution.BeginDelete(t.Context(), record.Reference); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func (f fixture) allocation(t *testing.T, record workspaces.Record, released bool) {
+	t.Helper()
+	device := uuid.NewString()
+	if _, err := f.pool.Exec(t.Context(), `INSERT INTO devices(id,tenant_id,name,credential_hash) VALUES($1,$2,'fixture',$3)`, device, record.Reference.TenantID, strings.Repeat("a", 64)); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := f.pool.Exec(t.Context(), `INSERT INTO runtime_allocations(id,environment_id,device_id,provider_key,deployment_generation,state,create_settled,released_at,compute_phase,compute_state)
+		VALUES($1,$2,$3,$4,0,CASE WHEN $5::boolean THEN 'released' ELSE 'cleanup_pending' END,$5,CASE WHEN $5 THEN clock_timestamp() ELSE NULL END,'suspended','{"snapshot":{"receipt":"owned"}}')`,
+		uuid.NewString(), record.Reference.EnvironmentID, device, uuid.NewString(), released); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestFailedCreationRetainedUntilExplicitSessionDeletion(t *testing.T) {
+	f := newFixture(t)
+	record, session := f.bind(t)
+	if _, err := f.pool.Exec(t.Context(), `UPDATE environments SET status='failed' WHERE id=$1`, record.Reference.EnvironmentID); err != nil {
+		t.Fatal(err)
+	}
+	candidates, err := f.store.DeletionCandidates(t.Context(), "")
+	if err != nil || len(candidates) != 0 {
+		t.Fatal("failure alone authorized cleanup", candidates, err)
+	}
+	if err := f.execution.BeginDelete(t.Context(), record.Reference); !errors.Is(err, workspaces.ErrConflict) {
+		t.Fatal("failed creation allowed deletion without Session deletion", err)
+	}
+	f.deleteSession(t, session)
+	if err := f.execution.BeginDelete(t.Context(), record.Reference); err != nil {
+		t.Fatal(err)
+	}
+	candidates, err = f.store.DeletionCandidates(t.Context(), "")
+	if err != nil || len(candidates) != 1 {
+		t.Fatal("explicit Session deletion not queued", candidates, err)
+	}
+	if err := f.execution.MarkDeleted(t.Context(), record.Reference); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := f.execution.Bind(t.Context(), record.Reference.TenantID, record.Reference.EnvironmentID); !errors.Is(err, workspaces.ErrConflict) {
+		t.Fatal("deleted identity reused", err)
+	}
+}
+
+func TestTenantAndAttachmentOwnership(t *testing.T) {
+	f := newFixture(t)
+	record, _ := f.bind(t)
+	foreign := record.Reference
+	foreign.TenantID = uuid.NewString()
+	if _, err := f.store.Get(t.Context(), foreign.TenantID, foreign.EnvironmentID); !errors.Is(err, workspaces.ErrNotFound) {
+		t.Fatal("foreign tenant read workspace", err)
+	}
+	if _, err := f.execution.Bind(t.Context(), foreign.TenantID, foreign.EnvironmentID); !errors.Is(err, workspaces.ErrNotFound) {
+		t.Fatal("foreign tenant rebound workspace", err)
+	}
+	if err := f.execution.MarkReady(t.Context(), foreign, attachment(record)); !errors.Is(err, workspaces.ErrNotFound) {
+		t.Fatal("foreign tenant wrote workspace", err)
+	}
+	if err := f.execution.BeginDelete(t.Context(), foreign); !errors.Is(err, workspaces.ErrNotFound) {
+		t.Fatal("foreign tenant deleted workspace", err)
+	}
+	for _, wrong := range []string{"configuration", "object"} {
+		a := attachment(record)
+		if wrong == "configuration" {
+			a.ConfigurationID = uuid.NewString()
+		} else {
+			a.Reference.ObjectID = uuid.NewString()
+		}
+		if err := f.execution.MarkReady(t.Context(), record.Reference, a); !errors.Is(err, workspacefs.ErrOwnership) {
+			t.Fatal("accepted wrong attachment", wrong, err)
+		}
+	}
+	if err := f.execution.MarkReady(t.Context(), record.Reference, attachment(record)); err != nil {
+		t.Fatal(err)
+	}
+	stored, err := f.store.Get(t.Context(), record.Reference.TenantID, record.Reference.EnvironmentID)
+	if err != nil || stored.State != workspaces.Ready || stored.Attachment == nil {
+		t.Fatal("valid attachment not stored", stored, err)
+	}
+}
+
+func TestWorkspaceWritesRequireExecutionLease(t *testing.T) {
+	f := newFixture(t)
+	record, _ := f.bind(t)
+	if err := f.lease.Close(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	for name, write := range map[string]func() error{
+		"configuration": func() error { return f.execution.SelectConfiguration(admin(t), newConfiguration()) },
+		"bind": func() error {
+			_, err := f.execution.Bind(t.Context(), record.Reference.TenantID, record.Reference.EnvironmentID)
+			return err
+		},
+		"ready":   func() error { return f.execution.MarkReady(t.Context(), record.Reference, attachment(record)) },
+		"delete":  func() error { return f.execution.BeginDelete(t.Context(), record.Reference) },
+		"deleted": func() error { return f.execution.MarkDeleted(t.Context(), record.Reference) },
+	} {
+		if err := write(); !errors.Is(err, pgunit.ErrLeaseClosed) {
+			t.Fatal(name, "wrote without lease", err)
+		}
+	}
+}
diff --git a/services/core/internal/sandbox/deployment.go b/services/core/internal/sandbox/deployment.go
index 42f9d38ca..2e44bbd74 100644
--- a/services/core/internal/sandbox/deployment.go
+++ b/services/core/internal/sandbox/deployment.go
@@ -7,6 +7,8 @@ import (
 	"fmt"
 	"reflect"
 	"regexp"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 )
 
 type DeploymentMode string
@@ -39,6 +41,10 @@ type Resources struct {
 }
 
 func (r Resources) ValidatePolicy(provider string, rules DeploymentPolicy) error {
+	return r.ValidateWorkspacePolicy(provider, rules, nil)
+}
+
+func (r Resources) validatePolicy(provider string, rules DeploymentPolicy) error {
 	values := reflect.ValueOf(r)
 	for i, rule := range resourceContract {
 		min, max := rule.Min, rule.Max
@@ -88,23 +94,13 @@ func (r RuntimeRelease) Validate() error {
 type DeploymentSpec struct {
 	Resources Resources       `json:"resources" binding:"required"`
 	Runtime   *RuntimeRelease `json:"runtime,omitempty"`
+	// Workspace is a derived immutable capability receipt, never filesystem configuration.
+	Workspace *workspacefs.Declaration `json:"workspace,omitempty" readonly:"true"`
 }
 
 // ValidatePolicy applies a registered adapter's rules without knowing its kind.
 func (s DeploymentSpec) ValidatePolicy(provider string, policy DeploymentPolicy) error {
-	if err := s.Resources.ValidatePolicy(provider, policy); err != nil {
-		return err
-	}
-	if !policy.Runtime {
-		if s.Runtime != nil {
-			return &ValidationError{Param: "runtime", Message: fmt.Sprintf("%s: %s", ErrInvalid, policy.RuntimeError)}
-		}
-		return nil
-	}
-	if s.Runtime == nil {
-		return &ValidationError{Param: "runtime", Message: fmt.Sprintf("%s: managed nodes require a pinned Runtime release", ErrInvalid)}
-	}
-	return s.Runtime.Validate()
+	return s.ValidateWorkspacePolicy(provider, policy, s.Workspace)
 }
 
 func (s DeploymentSpec) Digest(provider string) string {
@@ -127,3 +123,37 @@ func BackendFingerprint(kind, namespace string) string {
 	digest := sha256.Sum256([]byte(kind + "\x00" + namespace))
 	return hex.EncodeToString(digest[:])
 }
+
+// ValidateWorkspacePolicy validates explicit external storage without weakening root disk limits.
+func (r Resources) ValidateWorkspacePolicy(provider string, rules DeploymentPolicy, declaration *workspacefs.Declaration) error {
+	if declaration == nil {
+		return r.validatePolicy(provider, rules)
+	}
+	if rules.Workspace == nil {
+		return workspacefs.ErrUnsupported
+	}
+	if err := workspacefs.ValidateCombination(*rules.Workspace, *declaration, r.EnvironmentDiskMiB); err != nil {
+		return err
+	}
+	checked := r
+	if checked.EnvironmentDiskMiB == 0 && rules.Disk {
+		checked.EnvironmentDiskMiB = minimumDiskMiB
+	}
+	return checked.validatePolicy(provider, rules)
+}
+func (s DeploymentSpec) ValidateWorkspacePolicy(provider string, policy DeploymentPolicy, declaration *workspacefs.Declaration) error {
+	if err := s.Resources.ValidateWorkspacePolicy(provider, policy, declaration); err != nil {
+		return err
+	}
+
+	if !policy.Runtime {
+		if s.Runtime != nil {
+			return &ValidationError{Param: "runtime", Message: fmt.Sprintf("%s: %s", ErrInvalid, policy.RuntimeError)}
+		}
+		return nil
+	}
+	if s.Runtime == nil {
+		return &ValidationError{Param: "runtime", Message: fmt.Sprintf("%s: managed nodes require a pinned Runtime release", ErrInvalid)}
+	}
+	return s.Runtime.Validate()
+}
diff --git a/services/core/internal/sandbox/deployment_contract.go b/services/core/internal/sandbox/deployment_contract.go
index ed929f458..d1bfaf248 100644
--- a/services/core/internal/sandbox/deployment_contract.go
+++ b/services/core/internal/sandbox/deployment_contract.go
@@ -3,6 +3,7 @@ package sandbox
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 	"reflect"
 	"strings"
 )
@@ -65,12 +66,18 @@ func DeploymentContract(providers map[string]ProviderProjection) (python, typesc
 			}
 		}
 	}
+	workspaceFields := []string{}
+	workspaceType := reflect.TypeFor[workspacefs.Declaration]()
+	for field := range workspaceType.NumField() {
+		workspaceFields = append(workspaceFields, strings.Split(workspaceType.Field(field).Tag.Get("json"), ",")[0])
+	}
 	raw, _ := json.Marshal(struct {
-		Resources   []resourceRule                `json:"resources"`
-		Runtime     []runtimeRule                 `json:"runtime"`
-		Providers   map[string]ProviderProjection `json:"providers"`
-		MinimumDisk uint32                        `json:"minimum_disk"`
-	}{resourceContract, runtimeContract, providers, minimumDiskMiB})
+		WorkspaceFields []string                      `json:"workspace_fields"`
+		Resources       []resourceRule                `json:"resources"`
+		Runtime         []runtimeRule                 `json:"runtime"`
+		Providers       map[string]ProviderProjection `json:"providers"`
+		MinimumDisk     uint32                        `json:"minimum_disk"`
+	}{workspaceFields, resourceContract, runtimeContract, providers, minimumDiskMiB})
 	return "# BEGIN GENERATED DEPLOYMENT CONTRACT\n# Generated from sandbox/deployment_contract.go; do not edit.\n_CONTRACT = json.loads(" + fmt.Sprintf("%q", string(raw)) + ")\n# END GENERATED DEPLOYMENT CONTRACT",
 		"// Code generated by services/core/cmd/specification-contract from sandbox/deployment_contract.go; DO NOT EDIT.\n\nexport const deploymentContract = " + string(raw) + " as const;\n"
 }
diff --git a/services/core/internal/sandbox/docker/provider.go b/services/core/internal/sandbox/docker/provider.go
index c108182a0..f65a45a9d 100644
--- a/services/core/internal/sandbox/docker/provider.go
+++ b/services/core/internal/sandbox/docker/provider.go
@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"strings"
 
 	"github.com/MiniMax-AI/OpenAgentCore/internal/agentnetwork"
@@ -110,6 +111,9 @@ func (p *Provider) Renew(ctx context.Context, r sandbox.Reference) (sandbox.Info
 }
 
 func (p *Provider) Create(ctx context.Context, b sandbox.Bootstrap) (sandbox.Info, error) {
+	if b.Workspace != nil {
+		return sandbox.Info{Reference: b.Reference}, &providercontract.UnsupportedError{Operation: "Create", Reason: "external_workspace_unsupported"}
+	}
 	info := sandbox.Info{Reference: b.Reference}
 	policy := agentnetwork.Policy{Access: b.NetworkAccess, AllowedDomains: b.AllowedDomains}
 	if policy.Validate() != nil || !validReference(b.Reference) || !validID(b.SessionID) || !validID(b.DeviceID) || b.RuntimeConnection().Validate() != nil {
diff --git a/services/core/internal/sandbox/docker/workspace_test.go b/services/core/internal/sandbox/docker/workspace_test.go
new file mode 100644
index 000000000..14772bec7
--- /dev/null
+++ b/services/core/internal/sandbox/docker/workspace_test.go
@@ -0,0 +1,17 @@
+package docker
+
+import (
+	"context"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"testing"
+)
+
+func TestCreateExplicitlyRejectsExternalWorkspace(t *testing.T) {
+	provider := new(Provider)
+	_, err := provider.Create(context.Background(), sandbox.Bootstrap{Workspace: &workspacefs.Binding{}})
+	if reason, ok := providercontract.UnsupportedReason(err, "Create"); !ok || reason != "external_workspace_unsupported" {
+		t.Fatal("external workspace not rejected before native access", err)
+	}
+}
diff --git a/services/core/internal/sandbox/e2b/deployment.go b/services/core/internal/sandbox/e2b/deployment.go
index 3391d3f3e..83c0cdc6c 100644
--- a/services/core/internal/sandbox/e2b/deployment.go
+++ b/services/core/internal/sandbox/e2b/deployment.go
@@ -41,6 +41,9 @@ func ValidateConfiguration(c *DeploymentConfiguration) error {
 // NormalizeSelection accepts omitted candidate resources only until live build
 // discovery. Persistence requires ValidateSpecification after preparation.
 func NormalizeSelection(s sandbox.Selection) (sandbox.Selection, error) {
+	if s.Workspace != nil {
+		return s, sandbox.ErrInvalid
+	}
 	if s.Resources == (sandbox.Resources{}) {
 		if s.Runtime != nil {
 			return s, &sandbox.ValidationError{Param: "runtime", Message: sandbox.ErrInvalid.Error() + ": " + Policy().RuntimeError}
diff --git a/services/core/internal/sandbox/e2b/helper_contract.go b/services/core/internal/sandbox/e2b/helper_contract.go
index 7d701cf51..f4cf30ffb 100644
--- a/services/core/internal/sandbox/e2b/helper_contract.go
+++ b/services/core/internal/sandbox/e2b/helper_contract.go
@@ -37,6 +37,9 @@ func (q Request) Validate() error {
 	if q.Operation != "list_templates" && q.Operation != "list_builds" && !validID(q.Config.InstallationID) {
 		return sandbox.ErrInvalid
 	}
+	if q.Bootstrap != nil && q.Bootstrap.Workspace != nil {
+		return sandbox.ErrInvalid
+	}
 	switch q.Operation {
 	case "verify_credential":
 		if len(q.References) > MaxCredentialReferences {
diff --git a/services/core/internal/sandbox/e2b/helper_contract_test.go b/services/core/internal/sandbox/e2b/helper_contract_test.go
index 0e13b0119..686321cb1 100644
--- a/services/core/internal/sandbox/e2b/helper_contract_test.go
+++ b/services/core/internal/sandbox/e2b/helper_contract_test.go
@@ -69,6 +69,12 @@ func validManagedExchange(data []byte) bool {
 	delete(expected, "Credential")
 	expected["InstallationID"] = nil
 	expected["RuntimeBootstrap"] = nil
+	if workspace, present := fields["Workspace"]; present {
+		if string(workspace) != "null" {
+			return false
+		}
+		delete(fields, "Workspace")
+	}
 	if len(fields) != len(expected) {
 		return false
 	}
diff --git a/services/core/internal/sandbox/e2b/internal/contractgen/main.go b/services/core/internal/sandbox/e2b/internal/contractgen/main.go
index 023dc781e..118fe1c3f 100644
--- a/services/core/internal/sandbox/e2b/internal/contractgen/main.go
+++ b/services/core/internal/sandbox/e2b/internal/contractgen/main.go
@@ -70,6 +70,9 @@ func main() {
 	must(err)
 	write("services/core/internal/sandbox/e2b/helper_sdk_generated.go", goCode)
 	bootstrap := fields(reflect.TypeFor[sandbox.Bootstrap]())
+	requiredBootstrap := fieldNames(reflect.TypeFor[sandbox.Bootstrap](), true)
+	requiredBootstrap = slices.DeleteFunc(requiredBootstrap, func(s string) bool { return s == "CoreURL" || s == "Credential" })
+	requiredBootstrap = append(requiredBootstrap, "InstallationID", "RuntimeBootstrap")
 	bootstrap = slices.DeleteFunc(bootstrap, func(s string) bool { return s == "CoreURL" || s == "Credential" })
 	bootstrap = append(bootstrap, "InstallationID", "RuntimeBootstrap")
 	identity := fields(reflect.TypeFor[sandbox.Reference]())
@@ -87,7 +90,7 @@ func main() {
 		"OPERATIONS": e2b.HelperOperations(), "ERROR_CODES": e2b.HelperErrors(),
 		"REQUEST_FIELDS": fields(reflect.TypeFor[e2b.Request]()), "RESPONSE_FIELDS": fields(reflect.TypeFor[e2b.Response]()),
 		"REFERENCE_FIELDS":         fields(reflect.TypeFor[sandbox.Reference]()),
-		"MANAGED_BOOTSTRAP_FIELDS": bootstrap, "MANAGED_IDENTITY_FIELDS": identity,
+		"MANAGED_BOOTSTRAP_FIELDS": bootstrap, "MANAGED_BOOTSTRAP_REQUIRED_FIELDS": requiredBootstrap, "MANAGED_IDENTITY_FIELDS": identity,
 		"NETWORK_ACCESS": networkValues(filepath.Join(root, "internal/agentnetwork/policy.go")),
 	}
 	var python bytes.Buffer
@@ -147,6 +150,13 @@ func fixtures() []byte {
 		value[item.field] = item.value
 		add("request", item.name, false, value)
 	}
+	for _, workspace := range []any{nil, map[string]any{}} {
+		value := object(q)
+		bootstrapValue := object(b)
+		bootstrapValue["Workspace"] = workspace
+		value["Bootstrap"] = bootstrapValue
+		add("request", fmt.Sprintf("workspace-%v", workspace), workspace == nil, value)
+	}
 	for _, count := range []int{0, e2b.MaxCredentialReferences, e2b.MaxCredentialReferences + 1} {
 		copy := q
 		copy.Operation = "verify_credential"
@@ -193,6 +203,11 @@ func fixtures() []byte {
 		value[item.field] = item.value
 		add("managed", "invalid-"+item.field, false, value)
 	}
+	for _, workspace := range []any{nil, map[string]any{}} {
+		value := object(managed)
+		value["Workspace"] = workspace
+		add("managed", fmt.Sprintf("workspace-%v", workspace), workspace == nil, value)
+	}
 	for key := range managed {
 		value := object(managed)
 		delete(value, key)
@@ -217,15 +232,21 @@ func fixtures() []byte {
 	return result.Bytes()
 }
 
-func fields(t reflect.Type) []string {
+func fields(t reflect.Type) []string { return fieldNames(t, false) }
+
+func fieldNames(t reflect.Type, required bool) []string {
 	var result []string
 	for i := 0; i < t.NumField(); i++ {
 		f := t.Field(i)
 		if f.Anonymous {
-			result = append(result, fields(f.Type)...)
+			result = append(result, fieldNames(f.Type, required)...)
+			continue
+		}
+		tag := strings.Split(f.Tag.Get("json"), ",")
+		if required && slices.Contains(tag[1:], "omitempty") {
 			continue
 		}
-		name := strings.Split(f.Tag.Get("json"), ",")[0]
+		name := tag[0]
 		if name == "-" {
 			continue
 		}
diff --git a/services/core/internal/sandbox/e2b/provider.go b/services/core/internal/sandbox/e2b/provider.go
index c07924250..81e74cdba 100644
--- a/services/core/internal/sandbox/e2b/provider.go
+++ b/services/core/internal/sandbox/e2b/provider.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"os"
 	"path/filepath"
 	"strings"
@@ -261,6 +262,9 @@ func (p *Provider) info(ctx context.Context, operation string, r sandbox.Referen
 	return sandbox.Info{Reference: r}, err
 }
 func (p *Provider) Create(ctx context.Context, b sandbox.Bootstrap) (sandbox.Info, error) {
+	if b.Workspace != nil {
+		return sandbox.Info{Reference: b.Reference}, &providercontract.UnsupportedError{Operation: "Create", Reason: "external_workspace_unsupported"}
+	}
 	policy := agentnetwork.Policy{Access: b.NetworkAccess, AllowedDomains: b.AllowedDomains}
 	if !validReference(b.Reference) || !validID(b.SessionID) || !validID(b.DeviceID) || policy.Validate() != nil || b.RuntimeConnection().Validate() != nil {
 		info := sandbox.Info{Reference: b.Reference}
diff --git a/services/core/internal/sandbox/e2b/workspace_test.go b/services/core/internal/sandbox/e2b/workspace_test.go
new file mode 100644
index 000000000..0f6ed46d2
--- /dev/null
+++ b/services/core/internal/sandbox/e2b/workspace_test.go
@@ -0,0 +1,17 @@
+package e2b
+
+import (
+	"context"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"testing"
+)
+
+func TestCreateExplicitlyRejectsExternalWorkspace(t *testing.T) {
+	provider := new(Provider)
+	_, err := provider.Create(context.Background(), sandbox.Bootstrap{Workspace: &workspacefs.Binding{}})
+	if reason, ok := providercontract.UnsupportedReason(err, "Create"); !ok || reason != "external_workspace_unsupported" {
+		t.Fatal("external workspace not rejected before native access", err)
+	}
+}
diff --git a/services/core/internal/sandbox/microsandbox/contract_test.go b/services/core/internal/sandbox/microsandbox/contract_test.go
index e4b11b963..0733824a9 100644
--- a/services/core/internal/sandbox/microsandbox/contract_test.go
+++ b/services/core/internal/sandbox/microsandbox/contract_test.go
@@ -40,8 +40,8 @@ func TestProviderContract(t *testing.T) {
 			t.Fatal(err)
 		}
 		nativeOperation := s.Operation
-		if nativeOperation == "renew" {
-			nativeOperation = "inspect"
+		if nativeOperation == "renew" || nativeOperation == "inspect" {
+			nativeOperation = "initial_info"
 		}
 		return contracttest.Fixture{Provider: p, Bootstrap: b, Calls: func() []string { return calls }, WantCalls: []string{nativeOperation}}
 	})
@@ -50,7 +50,7 @@ func TestProviderContract(t *testing.T) {
 func TestProviderContractObservation(t *testing.T) {
 	c, r := testConfig(), testRef()
 	p, err := NewWithCaller(c, callerFunc(func(_ context.Context, q Request) (Response, error) {
-		if q.Operation != "inspect" && q.Operation != "create" {
+		if q.Operation != "initial_info" && q.Operation != "create" {
 			t.Fatal("observation mutated compute")
 		}
 		status := "stopped"
diff --git a/services/core/internal/sandbox/microsandbox/creation_settlement_test.go b/services/core/internal/sandbox/microsandbox/creation_settlement_test.go
index 0ac26e6f9..db52bcfae 100644
--- a/services/core/internal/sandbox/microsandbox/creation_settlement_test.go
+++ b/services/core/internal/sandbox/microsandbox/creation_settlement_test.go
@@ -61,7 +61,7 @@ func TestCreateConfigurationRejectionSettlement(t *testing.T) {
 	}
 }
 
-func TestNonCreateResponseCannotSettleCreation(t *testing.T) {
+func TestExistingComputeObservationCannotSettleCreation(t *testing.T) {
 	for _, code := range []string{"", "invalid", "ownership", "unconfirmed"} {
 		t.Run(code, func(t *testing.T) {
 			config, ref := testConfig(), testRef()
@@ -81,3 +81,77 @@ func TestNonCreateResponseCannotSettleCreation(t *testing.T) {
 		})
 	}
 }
+
+func TestInitialInfoAcceptsOnlyExactSettledAbsence(t *testing.T) {
+	for _, name := range []string{"exact", "bare not found", "no proof", "no state", "wrong version", "native ID", "foreign name", "generation", "restore", "bootstrap", "snapshot", "stopped source", "transport error", "unknown"} {
+		t.Run(name, func(t *testing.T) {
+			config, ref := testConfig(), testRef()
+			out := Response{Version: ProtocolVersion, CreateSettled: true, State: &State{Compute: Compute{Name: Name(config, ref, 0)}, Status: "absent"}}
+			var transportErr error
+			switch name {
+			case "bare not found":
+				out.ErrorCode = "not_found"
+			case "no proof":
+				out.CreateSettled = false
+			case "no state":
+				out.State = nil
+			case "wrong version":
+				out.Version--
+			case "native ID":
+				out.State.Compute.ID = "native:id"
+			case "foreign name":
+				out.State.Compute.Name = "foreign"
+			case "generation":
+				out.State.Compute.Generation = 1
+			case "restore":
+				out.State.Compute.RestoredFrom = &SnapshotIdentity{}
+			case "bootstrap":
+				out.State.BootstrapComplete = true
+			case "snapshot":
+				out.State.Snapshot = &SnapshotIdentity{}
+			case "stopped source":
+				out.State.SourceStopped = true
+			case "transport error":
+				transportErr = context.DeadlineExceeded
+			case "unknown":
+				out.ErrorCode = "unconfirmed"
+			}
+			provider, err := NewWithCaller(config, callerFunc(func(_ context.Context, q Request) (Response, error) {
+				if q.Operation != "initial_info" || q.Compute != (Compute{Name: Name(config, ref, 0)}) {
+					t.Fatal("ambiguous initial observation", q.Operation, q.Compute)
+				}
+				return out, transportErr
+			}))
+			if err != nil {
+				t.Fatal(err)
+			}
+			for _, read := range []func(context.Context, sandbox.Reference) (sandbox.Info, error){provider.GetInfo, provider.Renew} {
+				info, err := read(deadline(t), ref)
+				if name == "exact" {
+					if err != nil || info != (sandbox.Info{Reference: ref, State: "absent", CreateSettled: true}) {
+						t.Fatal("lost absence receipt", info, err)
+					}
+				} else if info.CreateSettled {
+					t.Fatal("invalid absence settled", info, err)
+				}
+			}
+		})
+	}
+}
+
+func TestOrdinaryComputeInspectionDoesNotRequestInitialSettlement(t *testing.T) {
+	config, ref := testConfig(), testRef()
+	provider, err := NewWithCaller(config, callerFunc(func(_ context.Context, q Request) (Response, error) {
+		if q.Operation != "inspect" {
+			t.Fatal("ordinary compute changed admission", q.Operation)
+		}
+		return Response{Version: ProtocolVersion, ErrorCode: "not_found"}, nil
+	}))
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = provider.GetCompute(deadline(t), ref, Compute{Name: Name(config, ref, 0)})
+	if !errors.Is(err, sandbox.ErrNotFound) {
+		t.Fatal(err)
+	}
+}
diff --git a/services/core/internal/sandbox/microsandbox/deployment.go b/services/core/internal/sandbox/microsandbox/deployment.go
index a97091d9d..c69d53c4d 100644
--- a/services/core/internal/sandbox/microsandbox/deployment.go
+++ b/services/core/internal/sandbox/microsandbox/deployment.go
@@ -2,10 +2,11 @@ package microsandbox
 
 import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 )
 
 func Policy() sandbox.DeploymentPolicy {
-	return sandbox.DeploymentPolicy{Disk: true, Runtime: true,
+	return sandbox.DeploymentPolicy{Workspace: &workspacefs.Requirements{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}, Disk: true, Runtime: true,
 		DefaultResources: &sandbox.Resources{CPUs: 2, MemoryMiB: 4096, RootDiskMiB: 8192, EnvironmentDiskMiB: 8192}}
 }
 
diff --git a/services/core/internal/sandbox/microsandbox/identity.go b/services/core/internal/sandbox/microsandbox/identity.go
index 2b95e1628..b831c016d 100644
--- a/services/core/internal/sandbox/microsandbox/identity.go
+++ b/services/core/internal/sandbox/microsandbox/identity.go
@@ -24,7 +24,7 @@ func validHash(s string) bool {
 	return e == nil && len(b) == 32 && strings.ToLower(s) == s
 }
 func (c Config) Validate() error {
-	if !validID(c.InstallationID) || !filepath.IsAbs(c.HelperPath) || !filepath.IsAbs(c.RuntimeHome) || !filepath.IsAbs(c.RuntimePath) || !filepath.IsAbs(c.FirmwarePath) || !validHash(c.RuntimeSHA256) || !validHash(c.FirmwareSHA256) || c.MemoryMiB == 0 || c.CPUs == 0 || c.RootDiskMiB == 0 || c.EnvironmentDiskMiB == 0 {
+	if !validID(c.InstallationID) || !filepath.IsAbs(c.HelperPath) || !filepath.IsAbs(c.RuntimeHome) || !filepath.IsAbs(c.RuntimePath) || !filepath.IsAbs(c.FirmwarePath) || !validHash(c.RuntimeSHA256) || !validHash(c.FirmwareSHA256) || c.MemoryMiB == 0 || c.CPUs == 0 || c.RootDiskMiB == 0 || (!c.ExternalWorkspace && c.EnvironmentDiskMiB == 0) {
 		return sandbox.ErrInvalid
 	}
 	imageName, digest, pinned := strings.Cut(c.Image, "@sha256:")
@@ -96,9 +96,19 @@ func ValidateRequest(q Request) error {
 	if q.Version != ProtocolVersion || q.Config.Validate() != nil || !ValidReference(q.Reference) || q.Deadline.IsZero() {
 		return sandbox.ErrInvalid
 	}
+	if q.Workspace != nil && ((q.Operation != "create" && q.Operation != "resume") || !validID(q.Workspace.ObjectID) || !filepath.IsAbs(q.Workspace.Path) || filepath.Clean(q.Workspace.Path) != q.Workspace.Path || strings.ContainsRune(q.Workspace.Path, 0)) {
+		return sandbox.ErrInvalid
+	}
 	switch q.Operation {
 	case "create":
-		if q.Bootstrap == nil || q.Bootstrap.Reference != q.Reference || ValidateBootstrap(*q.Bootstrap) != nil {
+		if q.Config.ExternalWorkspace != (q.Workspace != nil) {
+			return sandbox.ErrInvalid
+		}
+		if (q.Workspace == nil && q.Config.EnvironmentDiskMiB == 0) || (q.Bootstrap != nil && q.Bootstrap.Workspace != nil) || q.Bootstrap == nil || q.Bootstrap.Reference != q.Reference || ValidateBootstrap(*q.Bootstrap) != nil {
+			return sandbox.ErrInvalid
+		}
+	case "initial_info":
+		if q.Compute != (Compute{Name: Name(q.Config, q.Reference, 0)}) {
 			return sandbox.ErrInvalid
 		}
 	case "inspect", "kill", "resume_compute", "metrics":
@@ -120,8 +130,11 @@ func ValidateRequest(q Request) error {
 			return sandbox.ErrInvalid
 		}
 	case "resume":
+		if q.Config.ExternalWorkspace != (q.Workspace != nil) {
+			return sandbox.ErrInvalid
+		}
 		v := q.Resume
-		if v == nil || v.Reference != q.Reference || !validID(v.OperationID) || ValidateSnapshot(q.Config, q.Reference, v.Snapshot) != nil || ValidateCompute(q.Config, q.Reference, v.Target) != nil || v.Target.RestoredFrom == nil || *v.Target.RestoredFrom != v.Snapshot {
+		if (q.Workspace == nil && q.Config.EnvironmentDiskMiB == 0) || (v != nil && v.Workspace != nil) || v == nil || v.Reference != q.Reference || !validID(v.OperationID) || ValidateSnapshot(q.Config, q.Reference, v.Snapshot) != nil || ValidateCompute(q.Config, q.Reference, v.Target) != nil || v.Target.RestoredFrom == nil || *v.Target.RestoredFrom != v.Snapshot {
 			return sandbox.ErrInvalid
 		}
 	case "delete_snapshot":
diff --git a/services/core/internal/sandbox/microsandbox/node.go b/services/core/internal/sandbox/microsandbox/node.go
index 69b331df2..8f2789053 100644
--- a/services/core/internal/sandbox/microsandbox/node.go
+++ b/services/core/internal/sandbox/microsandbox/node.go
@@ -44,7 +44,7 @@ type Rule struct {
 	Port        string `json:"port"`
 }
 
-func configureMicrosandbox(entry Native, spec sandbox.DeploymentSpec, caller *ProcessCaller, result *sandbox.Built) (Config, error) {
+func configureMicrosandbox(entry Native, spec sandbox.DeploymentSpec, caller *ProcessCaller, result *sandbox.Built, options sandbox.LocalOptions) (Config, error) {
 	if !filepath.IsAbs(entry.RuntimeHome) || filepath.Clean(entry.RuntimeHome) != entry.RuntimeHome {
 		return Config{}, errors.New("managed microsandbox runtime_home must be a canonical absolute path")
 	}
@@ -54,7 +54,8 @@ func configureMicrosandbox(entry Native, spec sandbox.DeploymentSpec, caller *Pr
 	}
 	release, resources := spec.Runtime, spec.Resources
 	config := Config{
-		InstallationID: result.InstallationID, HelperPath: entry.HelperPath, RuntimeHome: entry.RuntimeHome, RuntimePath: entry.RuntimePath, FirmwarePath: entry.FirmwarePath,
+		ExternalWorkspace: spec.Workspace != nil,
+		InstallationID:    result.InstallationID, HelperPath: entry.HelperPath, RuntimeHome: entry.RuntimeHome, RuntimePath: entry.RuntimePath, FirmwarePath: entry.FirmwarePath,
 		RuntimeSHA256: release.RuntimeSHA256, FirmwareSHA256: release.FirmwareSHA256, Image: release.MicrosandboxRef,
 		MemoryMiB: resources.MemoryMiB, CPUs: uint8(resources.CPUs), RootDiskMiB: resources.RootDiskMiB, EnvironmentDiskMiB: resources.EnvironmentDiskMiB, Network: network,
 	}
@@ -62,6 +63,7 @@ func configureMicrosandbox(entry Native, spec sandbox.DeploymentSpec, caller *Pr
 	if err != nil {
 		return Config{}, errors.New("invalid managed microsandbox provider configuration")
 	}
+	provider.workspace = options.Workspace
 	result.Provider = provider
 	result.Probe = microsandboxProbe(config, resources)
 	result.Quiescent = caller.Quiescent
@@ -89,7 +91,7 @@ func BuildNode(c sandbox.NodeConfig, options sandbox.LocalOptions, result *sandb
 		caller.LeasePath = filepath.Join(directory, strconv.FormatUint(c.Generation, 10)+".lease")
 		caller.LeaseIdentity = LeaseIdentity{InstallationID: result.InstallationID, Generation: c.Generation, SpecificationDigest: result.SpecificationDigest}
 	}
-	config, err := configureMicrosandbox(entry, c.Specification, caller, result)
+	config, err := configureMicrosandbox(entry, c.Specification, caller, result, options)
 	if err != nil {
 		return closeProvider, err
 	}
diff --git a/services/core/internal/sandbox/microsandbox/provider.go b/services/core/internal/sandbox/microsandbox/provider.go
index d876702be..0b9f62800 100644
--- a/services/core/internal/sandbox/microsandbox/provider.go
+++ b/services/core/internal/sandbox/microsandbox/provider.go
@@ -6,13 +6,15 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 )
 
 var ErrUnconfirmed = sandbox.ErrComputeUnconfirmed
 
 type Provider struct {
-	config Config
-	caller Caller
+	workspace workspacefs.Resolver
+	config    Config
+	caller    Caller
 }
 
 var _ sandbox.SandboxProvider = (*Provider)(nil)
@@ -74,6 +76,11 @@ func (p *Provider) call(ctx context.Context, q Request) (Response, error) {
 func (p *Provider) state(ctx context.Context, q Request) (State, error) {
 	out, e := p.call(ctx, q)
 	if e != nil {
+		if q.Operation == "resume" {
+			if partial, valid := p.responseState(ctx, q, out); valid == nil {
+				return partial, e
+			}
+		}
 		return State{}, e
 	}
 	return p.responseState(ctx, q, out)
@@ -119,7 +126,26 @@ func info(r sandbox.Reference, s State) sandbox.Info {
 	return sandbox.Info{Reference: r, ProviderID: s.Compute.ID, State: s.Status, BootstrapComplete: s.BootstrapComplete}
 }
 func (p *Provider) Create(ctx context.Context, b sandbox.Bootstrap) (sandbox.Info, error) {
-	q := Request{Operation: "create", Reference: b.Reference, Bootstrap: &b}
+	// Before dispatch, this one-shot attempt cannot have created native compute.
+	absent := sandbox.Info{Reference: b.Reference, State: "absent", CreateSettled: true}
+	if err := ctx.Err(); err != nil {
+		return absent, err
+	}
+	if _, bounded := ctx.Deadline(); !bounded {
+		return absent, sandbox.ErrInvalid
+	}
+	if err := ValidateBootstrap(b); err != nil {
+		return absent, err
+	}
+	if p.config.ExternalWorkspace != (b.Workspace != nil) {
+		return absent, sandbox.ErrInvalid
+	}
+	workspace, err := p.resolveWorkspace(ctx, b.Reference, b.Workspace)
+	if err != nil {
+		return absent, err
+	}
+	b.Workspace = nil
+	q := Request{Operation: "create", Reference: b.Reference, Bootstrap: &b, Workspace: workspace}
 	out, err := p.call(ctx, q)
 	settledRejection := errors.Is(err, sandbox.ErrInvalid) && !errors.Is(err, ErrUnconfirmed) && out.CreateSettled
 	if err != nil && !settledRejection {
@@ -144,8 +170,16 @@ func (p *Provider) GetInfo(ctx context.Context, r sandbox.Reference) (sandbox.In
 	if e != nil {
 		return sandbox.Info{}, e
 	}
-	s, e := p.GetCompute(ctx, r, c)
-	return info(r, s), e
+	q := Request{Operation: "initial_info", Reference: r, Compute: c}
+	out, err := p.call(ctx, q)
+	if err != nil {
+		return sandbox.Info{Reference: r}, err
+	}
+	if out.CreateSettled && out.State != nil && *out.State == (State{Compute: c, Status: "absent"}) {
+		return sandbox.Info{Reference: r, State: "absent", CreateSettled: true}, nil
+	}
+	s, err := p.responseState(ctx, q, out)
+	return info(r, s), err
 }
 func (p *Provider) Renew(ctx context.Context, r sandbox.Reference) (sandbox.Info, error) {
 	return p.GetInfo(ctx, r)
@@ -179,7 +213,12 @@ func (p *Provider) Suspend(ctx context.Context, q SuspendRequest) (State, error)
 	return p.state(ctx, Request{Operation: "suspend", Reference: q.Reference, Suspend: &q})
 }
 func (p *Provider) Resume(ctx context.Context, q ResumeRequest) (State, error) {
-	return p.state(ctx, Request{Operation: "resume", Reference: q.Reference, Resume: &q})
+	workspace, err := p.resolveWorkspace(ctx, q.Reference, q.Workspace)
+	if err != nil {
+		return State{}, err
+	}
+	q.Workspace = nil
+	return p.state(ctx, Request{Operation: "resume", Reference: q.Reference, Resume: &q, Workspace: workspace})
 }
 func (p *Provider) RunCommandCompute(ctx context.Context, r sandbox.Reference, c Compute, command sandbox.Command) (sandbox.CommandResult, error) {
 	out, e := p.call(ctx, Request{Operation: "command", Reference: r, Compute: c, Command: &command})
@@ -212,3 +251,23 @@ func (p *Provider) NewCompute(ctx context.Context, r sandbox.Reference, generati
 	}
 	return c, nil
 }
+
+func (p *Provider) resolveWorkspace(ctx context.Context, reference sandbox.Reference, binding *workspacefs.Binding) (*WorkspaceDirectory, error) {
+	if binding == nil {
+		return nil, nil
+	}
+	if err := sandbox.ValidateWorkspaceBinding(reference, binding); err != nil {
+		return nil, err
+	}
+	if p.workspace == nil {
+		return nil, workspacefs.ErrUnsupported
+	}
+	directory, err := p.workspace.Resolve(ctx, *binding)
+	if err != nil {
+		return nil, err
+	}
+	if err := directory.Validate(); err != nil {
+		return nil, err
+	}
+	return &WorkspaceDirectory{Path: directory.Path, ObjectID: binding.Attachment.Reference.ObjectID}, nil
+}
diff --git a/services/core/internal/sandbox/microsandbox/types.go b/services/core/internal/sandbox/microsandbox/types.go
index 12ddc1f69..bb8d9246d 100644
--- a/services/core/internal/sandbox/microsandbox/types.go
+++ b/services/core/internal/sandbox/microsandbox/types.go
@@ -1,5 +1,5 @@
 // Package microsandbox is the pure-Go client for the colocated SDK helper.
-// Core owns all durable state; the helper owns no database or background service.
+// Core owns lifecycle intent; the helper owns no database or background service.
 package microsandbox
 
 import (
@@ -9,7 +9,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 )
 
-const ProtocolVersion = 2
+const ProtocolVersion = 4
 const SDKVersion = "v0.7.2"
 const MaxOutputBytes = 1024 * 1024
 const MaxRequestBytes = 72 * 1024 * 1024
@@ -18,6 +18,8 @@ const MaxResponseBytes = 16 * 1024 * 1024
 // Config is trusted deployment configuration. Paths and hashes refer to one
 // immutable, qualified installation. Network is explicitly used on create and restore.
 type Config struct {
+	// ExternalWorkspace is derived from the immutable deployment specification.
+	ExternalWorkspace  bool
 	InstallationID     string
 	HelperPath         string
 	RuntimeHome        string
@@ -49,7 +51,14 @@ type ResumeRequest = sandbox.ResumeRequest
 
 // Request and Response are the finite, private helper boundary. Confidential
 // Bootstrap and Command bytes travel only through stdin and are never logged.
+// WorkspaceDirectory is the resolved private helper input, without filesystem adapter configuration.
+type WorkspaceDirectory struct {
+	Path     string
+	ObjectID string
+}
+
 type Request struct {
+	Workspace *WorkspaceDirectory `json:",omitempty"`
 	Version   int
 	Operation string
 	Config    Config
@@ -63,8 +72,8 @@ type Request struct {
 	Deadline  time.Time
 }
 type Response struct {
-	// CreateSettled accompanies a configuration rejection after native Create
-	// completed and before bootstrap began. State binds the exact created compute.
+	// CreateSettled binds State to a completed Create rejection or an initial_info
+	// absence whose allocation lock permanently prevents a later initial Create.
 	CreateSettled bool `json:",omitempty"`
 	Version       int
 	State         *State
diff --git a/services/core/internal/sandbox/microsandbox/workspace_test.go b/services/core/internal/sandbox/microsandbox/workspace_test.go
new file mode 100644
index 000000000..64ba57717
--- /dev/null
+++ b/services/core/internal/sandbox/microsandbox/workspace_test.go
@@ -0,0 +1,100 @@
+package microsandbox
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+)
+
+type workspaceResolverFunc func(context.Context, workspacefs.Binding) (workspacefs.Directory, error)
+
+func (f workspaceResolverFunc) Resolve(ctx context.Context, b workspacefs.Binding) (workspacefs.Directory, error) {
+	return f(ctx, b)
+}
+func workspaceBinding() *workspacefs.Binding {
+	r := testRef()
+	c := workspacefs.Configuration{ID: "77777777-7777-4777-8777-777777777777", Adapter: "test", Parameters: json.RawMessage(`{}`)}
+	return &workspacefs.Binding{Configuration: c, Attachment: workspacefs.Attachment{Reference: workspacefs.Reference{TenantID: r.TenantID, EnvironmentID: r.EnvironmentID, ObjectID: "88888888-8888-4888-8888-888888888888"}, ConfigurationID: c.ID, Kind: workspacefs.AttachmentHostDirectory, Native: json.RawMessage(`{}`)}}
+}
+func TestWorkspaceResolveBeforeRestoreAndRetainPartialTarget(t *testing.T) {
+	c, r, s := testConfig(), testRef(), testSnapshot()
+	c.EnvironmentDiskMiB = 0
+	c.ExternalWorkspace = true
+	resolves, calls := 0, 0
+	p, err := NewWithCaller(c, callerFunc(func(_ context.Context, q Request) (Response, error) {
+		calls++
+		if q.Workspace == nil || q.Workspace.Path != "/resolved/environment" || q.Workspace.ObjectID != workspaceBinding().Attachment.Reference.ObjectID || q.Resume.Workspace != nil {
+			t.Fatal("helper received unresolved binding", q)
+		}
+		target := q.Resume.Target
+		target.ID = "local:partial"
+		return Response{Version: ProtocolVersion, State: &State{Compute: target}, ErrorCode: "unconfirmed"}, nil
+	}))
+	if err != nil {
+		t.Fatal(err)
+	}
+	p.workspace = workspaceResolverFunc(func(_ context.Context, b workspacefs.Binding) (workspacefs.Directory, error) {
+		resolves++
+		return workspacefs.Directory{Path: "/resolved/environment"}, nil
+	})
+	q := ResumeRequest{Reference: r, OperationID: "66666666-6666-4666-8666-666666666666", Snapshot: s, Target: Compute{Generation: 1, Name: Name(c, r, 1), RestoredFrom: &s}, Workspace: workspaceBinding()}
+	state, err := p.Resume(deadline(t), q)
+	if !errors.Is(err, ErrUnconfirmed) || state.Compute.ID != "local:partial" || resolves != 1 || calls != 1 {
+		t.Fatal(state, err, resolves, calls)
+	}
+	q.ObserveOnly = true
+	_, _ = p.Resume(deadline(t), q)
+	if resolves != 2 {
+		t.Fatal("restore observation did not resolve original binding")
+	}
+	q.Workspace.Attachment.Reference.EnvironmentID = r.TenantID
+	_, err = p.Resume(deadline(t), q)
+	if !errors.Is(err, workspacefs.ErrOwnership) || calls != 2 {
+		t.Fatal("foreign binding reached helper", err, calls)
+	}
+}
+func TestWorkspaceDoesNotFallbackWithoutResolver(t *testing.T) {
+	calls := 0
+	config := testConfig()
+	config.ExternalWorkspace = true
+	p, _ := NewWithCaller(config, callerFunc(func(context.Context, Request) (Response, error) { calls++; return Response{}, nil }))
+	_, err := p.Create(deadline(t), sandbox.Bootstrap{Reference: testRef(), SessionID: testRef().TenantID, DeviceID: testRef().EnvironmentID, CoreURL: "https://core.example/api/v1", Credential: "fixture", NetworkAccess: "disabled", Workspace: workspaceBinding()})
+	if !errors.Is(err, workspacefs.ErrUnsupported) || calls != 0 {
+		t.Fatal(err, calls)
+	}
+}
+
+func TestPreNativeWorkspaceFailureSettlesAbsentCreation(t *testing.T) {
+	for _, failure := range []string{"resolve", "mode", "bootstrap", "unbounded"} {
+		t.Run(failure, func(t *testing.T) {
+			config, ref := testConfig(), testRef()
+			config.ExternalWorkspace = true
+			calls := 0
+			provider, err := NewWithCaller(config, callerFunc(func(context.Context, Request) (Response, error) { calls++; return Response{}, nil }))
+			if err != nil {
+				t.Fatal(err)
+			}
+			provider.workspace = workspaceResolverFunc(func(context.Context, workspacefs.Binding) (workspacefs.Directory, error) {
+				return workspacefs.Directory{}, workspacefs.ErrUnavailable
+			})
+			bootstrap := sandbox.Bootstrap{Reference: ref, SessionID: ref.TenantID, DeviceID: ref.EnvironmentID, CoreURL: "https://core.example/api/v1", Credential: "fixture", NetworkAccess: "disabled", Workspace: workspaceBinding()}
+			ctx := deadline(t)
+			switch failure {
+			case "mode":
+				bootstrap.Workspace = nil
+			case "bootstrap":
+				bootstrap.DeviceID = "invalid"
+			case "unbounded":
+				ctx = context.Background()
+			}
+			info, err := provider.Create(ctx, bootstrap)
+			if err == nil || calls != 0 || info.Reference != ref || !info.CreateSettled || info.State != "absent" || info.ProviderID != "" || info.BootstrapComplete {
+				t.Fatal("pre-native failure lost absence proof", info, err, calls)
+			}
+		})
+	}
+}
diff --git a/services/core/internal/sandbox/node/generation_json.go b/services/core/internal/sandbox/node/generation_json.go
index c57e0ae07..5336a320f 100644
--- a/services/core/internal/sandbox/node/generation_json.go
+++ b/services/core/internal/sandbox/node/generation_json.go
@@ -135,7 +135,7 @@ func validateGenerationJSON(raw []byte, kind string) error {
 		}
 	}
 	if value := values["response"]; value != nil {
-		if _, err := generationObject(value, "id connection_id", "error_code info compute state command sample", ""); err != nil {
+		if _, err := generationObject(value, "id connection_id", "error_code unsupported info compute state command sample", ""); err != nil {
 			return err
 		}
 	}
diff --git a/services/core/internal/sandbox/node/generation_json_test.go b/services/core/internal/sandbox/node/generation_json_test.go
index 08620c8ee..b6fef3a10 100644
--- a/services/core/internal/sandbox/node/generation_json_test.go
+++ b/services/core/internal/sandbox/node/generation_json_test.go
@@ -63,7 +63,7 @@ func TestGenerationHealthRejectsUnboundedOrAmbiguousNumbers(t *testing.T) {
 }
 
 func TestNodeProtocolRejectsHistoricalVersions(t *testing.T) {
-	for _, version := range []int{1, 2} {
+	for _, version := range []int{1, 2, 3, 4} {
 		raw, _ := json.Marshal(frame{Version: version, Type: "hello", Identity: new(Identity), Health: &Health{ObservedAt: time.Now().UTC()}})
 		if _, err := decodeFrame(raw); err == nil {
 			t.Fatalf("accepted historical protocol %d", version)
diff --git a/services/core/internal/sandbox/node/proxy.go b/services/core/internal/sandbox/node/proxy.go
index fc126ebe8..e064f5b38 100644
--- a/services/core/internal/sandbox/node/proxy.go
+++ b/services/core/internal/sandbox/node/proxy.go
@@ -118,6 +118,9 @@ func (p *provider) NewCompute(ctx context.Context, r sandbox.Reference, g uint64
 func (p *provider) state(ctx context.Context, q request) (sandbox.ComputeState, error) {
 	r, e := p.call(ctx, q)
 	if e != nil {
+		if resumePartial(q, r.State) {
+			return *r.State, e
+		}
 		return sandbox.ComputeState{}, e
 	}
 	if r.State == nil || r.State.Compute.ID == "" {
diff --git a/services/core/internal/sandbox/node/wire.go b/services/core/internal/sandbox/node/wire.go
index 03a412951..d4ab402ab 100644
--- a/services/core/internal/sandbox/node/wire.go
+++ b/services/core/internal/sandbox/node/wire.go
@@ -13,11 +13,12 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 )
 
-const ProtocolVersion = 4
+const ProtocolVersion = 5
 const MaxControlFrameBytes = 32 * 1024
 const MaxFrameBytes = 72 * 1024 * 1024
 const maxPending = 32
@@ -179,9 +180,11 @@ func errorCode(err error) string {
 		return "observation_unavailable"
 	case errors.Is(err, runtimeobs.ErrNotRunning):
 		return "runtime_not_running"
-	case errors.Is(err, sandbox.ErrInvalid):
+	case errors.Is(err, workspacefs.ErrUnsupported):
+		return "workspace_unsupported"
+	case errors.Is(err, sandbox.ErrInvalid), errors.Is(err, workspacefs.ErrInvalid):
 		return "invalid"
-	case errors.Is(err, sandbox.ErrOwnership):
+	case errors.Is(err, sandbox.ErrOwnership), errors.Is(err, workspacefs.ErrOwnership):
 		return "ownership"
 	case errors.Is(err, sandbox.ErrExists):
 		return "exists"
@@ -209,6 +212,8 @@ func responseError(out response) error {
 	switch out.ErrorCode {
 	case "":
 		return nil
+	case "workspace_unsupported":
+		return workspacefs.ErrUnsupported
 	case "observation_unavailable":
 		return runtimeobs.ErrUnavailable
 	case "runtime_not_running":
@@ -249,7 +254,7 @@ func (q request) validate() error {
 			return nil
 		}
 	case "create":
-		if count == 1 && q.Bootstrap != nil && q.Bootstrap.Reference == q.Reference {
+		if count == 1 && q.Bootstrap != nil && q.Bootstrap.Reference == q.Reference && sandbox.ValidateWorkspaceBinding(q.Reference, q.Bootstrap.Workspace) == nil {
 			return nil
 		}
 	case "info", "renew", "kill", "initial":
@@ -277,7 +282,7 @@ func (q request) validate() error {
 			return nil
 		}
 	case "resume":
-		if count == 1 && q.Resume != nil && q.Resume.Reference == q.Reference {
+		if count == 1 && q.Resume != nil && q.Resume.Reference == q.Reference && sandbox.ValidateWorkspaceBinding(q.Reference, q.Resume.Workspace) == nil {
 			return nil
 		}
 	case "delete_snapshot":
@@ -366,7 +371,9 @@ func execute(ctx context.Context, p sandbox.SandboxProvider, q request) response
 		if !creationSettled(out.Info, q.Reference) {
 			out.Info = nil
 		}
-		out.State = nil
+		if !resumePartial(q, out.State) {
+			out.State = nil
+		}
 		out.Command = nil
 		out.Compute = nil
 	}
@@ -398,3 +405,12 @@ func (q *request) receive(now time.Time) error {
 	q.deadline = now.Add(time.Duration(q.TimeoutMillis) * time.Millisecond)
 	return nil
 }
+
+// Partial restore evidence carries cleanup ownership, never success or readiness.
+func resumePartial(q request, state *sandbox.ComputeState) bool {
+	if q.Operation != "resume" || q.Resume == nil || state == nil {
+		return false
+	}
+	got, want := state.Compute, q.Resume.Target
+	return got.ID != "" && got.Name == want.Name && got.Generation == want.Generation && (want.ID == "" || want.ID == got.ID) && got.RestoredFrom != nil && want.RestoredFrom != nil && *got.RestoredFrom == *want.RestoredFrom
+}
diff --git a/services/core/internal/sandbox/node/workspace_test.go b/services/core/internal/sandbox/node/workspace_test.go
new file mode 100644
index 000000000..35ab50569
--- /dev/null
+++ b/services/core/internal/sandbox/node/workspace_test.go
@@ -0,0 +1,93 @@
+package node
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/microsandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestWorkspaceWireBindsConfigurationAndEnvironment(t *testing.T) {
+	ref := sandbox.Reference{TenantID: "11111111-1111-4111-8111-111111111111", EnvironmentID: "22222222-2222-4222-8222-222222222222", AllocationID: "33333333-3333-4333-8333-333333333333"}
+	config := workspacefs.Configuration{ID: "44444444-4444-4444-8444-444444444444", Adapter: "test", Parameters: json.RawMessage(`{}`)}
+	binding := workspacefs.Binding{Configuration: config, Attachment: workspacefs.Attachment{Reference: workspacefs.Reference{TenantID: ref.TenantID, EnvironmentID: ref.EnvironmentID, ObjectID: "55555555-5555-4555-8555-555555555555"}, ConfigurationID: config.ID, Kind: workspacefs.AttachmentHostDirectory, Native: json.RawMessage(`{}`)}}
+	for _, fault := range []string{"match", "environment", "tenant", "configuration", "object"} {
+		t.Run(fault, func(t *testing.T) {
+			b := binding
+			switch fault {
+			case "environment":
+				b.Attachment.Reference.EnvironmentID = ref.TenantID
+			case "tenant":
+				b.Attachment.Reference.TenantID = ref.EnvironmentID
+			case "configuration":
+				b.Attachment.ConfigurationID = ref.AllocationID
+			case "object":
+				b.Attachment.Reference.ObjectID = "invalid"
+			}
+			q := request{ID: ref.AllocationID, Reference: ref, Operation: "create", TimeoutMillis: 1000, Bootstrap: &sandbox.Bootstrap{Reference: ref, Workspace: &b}}
+			if (q.validate() == nil) != (fault == "match") {
+				t.Fatal("invalid create binding forwarding", fault)
+			}
+			q.Operation = "resume"
+			q.Bootstrap = nil
+			q.Resume = &sandbox.ResumeRequest{Reference: ref, Workspace: &b}
+			if (q.validate() == nil) != (fault == "match") {
+				t.Fatal("invalid restore binding forwarding", fault)
+			}
+		})
+	}
+}
+
+func TestWorkspaceUnsupportedResponseSurvivesStrictFrame(t *testing.T) {
+	out := response{ID: "11111111-1111-4111-8111-111111111111", ConnectionID: "22222222-2222-4222-8222-222222222222", ErrorCode: "unsupported", Unsupported: &providercontract.UnsupportedError{Operation: "Create", Reason: "external_workspace_unsupported"}}
+	raw, err := json.Marshal(frame{Version: ProtocolVersion, Type: "response", Response: &out})
+	if err != nil {
+		t.Fatal(err)
+	}
+	decoded, err := decodeFrame(raw)
+	if err != nil {
+		t.Fatal("explicit workspace rejection broke transport", err)
+	}
+	if reason, ok := providercontract.UnsupportedReason(responseError(*decoded.Response), "Create"); !ok || reason != "external_workspace_unsupported" {
+		t.Fatal("lost typed rejection")
+	}
+}
+
+type workspaceRefusalCaller struct{ calls int }
+
+func (c *workspaceRefusalCaller) Call(context.Context, microsandbox.Request) (microsandbox.Response, error) {
+	c.calls++
+	return microsandbox.Response{}, nil
+}
+func TestActualWorkspaceRefusalKeepsSettledAbsenceOnWire(t *testing.T) {
+	ref := reference()
+	caller := new(workspaceRefusalCaller)
+	config := microsandbox.Config{ExternalWorkspace: true, InstallationID: "11111111-1111-4111-8111-111111111111", HelperPath: "/helper", RuntimeHome: "/runtime", RuntimePath: "/runtime/msb", FirmwarePath: "/runtime/firmware", RuntimeSHA256: strings.Repeat("a", 64), FirmwareSHA256: strings.Repeat("b", 64), Image: "image@sha256:" + strings.Repeat("c", 64), CPUs: 2, MemoryMiB: 2048, RootDiskMiB: 4096, Network: microsandbox.NetworkPolicy{DefaultEgress: "deny", DefaultIngress: "deny"}}
+	provider, err := microsandbox.NewWithCaller(config, caller)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fsConfig := workspacefs.Configuration{ID: "44444444-4444-4444-8444-444444444444", Adapter: "fixture", Parameters: json.RawMessage(`{}`)}
+	binding := &workspacefs.Binding{Configuration: fsConfig, Attachment: workspacefs.Attachment{Reference: workspacefs.Reference{TenantID: ref.TenantID, EnvironmentID: ref.EnvironmentID, ObjectID: "55555555-5555-4555-8555-555555555555"}, ConfigurationID: fsConfig.ID, Kind: workspacefs.AttachmentHostDirectory, Native: json.RawMessage(`{}`)}}
+	bootstrap := sandbox.Bootstrap{Reference: ref, SessionID: ref.TenantID, DeviceID: ref.EnvironmentID, CoreURL: "https://core.example/api/v1", Credential: "fixture", NetworkAccess: "disabled", Workspace: binding}
+	ctx, cancel := context.WithTimeout(t.Context(), time.Second)
+	defer cancel()
+	out := execute(ctx, provider, request{ID: ref.AllocationID, ConnectionID: ref.TenantID, Reference: ref, Operation: "create", TimeoutMillis: 1000, Bootstrap: &bootstrap})
+	raw, err := json.Marshal(frame{Version: ProtocolVersion, Type: "response", Response: &out})
+	if err != nil {
+		t.Fatal(err)
+	}
+	decoded, err := decodeFrame(raw)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !errors.Is(responseError(*decoded.Response), workspacefs.ErrUnsupported) || !creationSettled(decoded.Response.Info, ref) || decoded.Response.Info.State != "absent" || caller.calls != 0 {
+		t.Fatal("pre-helper refusal lost settlement", decoded.Response, caller.calls)
+	}
+}
diff --git a/services/core/internal/sandbox/providers/config.go b/services/core/internal/sandbox/providers/config.go
index f530a71e1..20f4a9edf 100644
--- a/services/core/internal/sandbox/providers/config.go
+++ b/services/core/internal/sandbox/providers/config.go
@@ -45,6 +45,9 @@ func (r *Registry) Build(config sandbox.NodeConfig, options sandbox.LocalOptions
 	if config.Generation == 0 {
 		return nil, closeProvider, errors.New("node requires a deployment generation; obtain configuration from Core")
 	}
+	if config.Specification.Workspace != nil && options.Workspace == nil {
+		return nil, closeProvider, sandbox.ErrInvalid
+	}
 	if err := adapter.ValidateSpecification(config.Specification); err != nil {
 		return nil, closeProvider, err
 	}
diff --git a/services/core/internal/sandbox/providers/configuration_flow_test.go b/services/core/internal/sandbox/providers/configuration_flow_test.go
index 303d07e56..abc454120 100644
--- a/services/core/internal/sandbox/providers/configuration_flow_test.go
+++ b/services/core/internal/sandbox/providers/configuration_flow_test.go
@@ -150,7 +150,7 @@ func TestAdditionalConfigurationProviderUsesCommonAPIAndStore(t *testing.T) {
 		SessionAdmin:    struct{ api.SessionAdmin }{},
 		Environments:    struct{ api.Environments }{}, EnvironmentsReader: struct{ api.EnvironmentsReader }{}, Admin: struct{ api.Admin }{}, AdminAudit: struct{ api.AdminAudit }{}, WriteAudit: struct{ api.WriteAudit }{},
 		ExecutorConnections: struct{ api.ExecutorConnections }{},
-		Metrics:             struct{ api.Metrics }{}, RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{},
+		Metrics:             struct{ api.Metrics }{}, RuntimeObservations: struct{ api.RuntimeObservations }{}, RuntimeHistory: struct{ api.RuntimeHistory }{}, WorkspaceStorage: struct{ api.WorkspaceStorage }{},
 		Execution: api.Execution{
 			ExecutorURL:      "wss://core.example/api/v1/agent-daemon/ws",
 			SessionAdmission: struct{ api.SessionAdmission }{},
diff --git a/services/core/internal/sandbox/providers/registration.go b/services/core/internal/sandbox/providers/registration.go
index a4d68dea2..5a5668d35 100644
--- a/services/core/internal/sandbox/providers/registration.go
+++ b/services/core/internal/sandbox/providers/registration.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 )
 
 // ValidateRegistration checks wiring before configuration parsing or construction.
@@ -41,6 +42,9 @@ func ValidateRegistration(a Adapter) error {
 	if err := validateConfigurationAdapter(a.Configuration); err != nil {
 		return err
 	}
+	if a.Policy.Workspace != nil && a.Policy.Workspace.Attachment != workspacefs.AttachmentHostDirectory {
+		return invalid("workspace attachment requirements")
+	}
 	if a.Policy.Runtime == (a.Policy.RuntimeError != "") {
 		return invalid("Runtime input policy")
 	}
diff --git a/services/core/internal/sandbox/providers/workspace_test.go b/services/core/internal/sandbox/providers/workspace_test.go
new file mode 100644
index 000000000..b1f2c505e
--- /dev/null
+++ b/services/core/internal/sandbox/providers/workspace_test.go
@@ -0,0 +1,47 @@
+package providers
+
+import (
+	"context"
+	"errors"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"testing"
+)
+
+func TestWorkspaceReceiptValidatesNormalizationAndGenerationBuild(t *testing.T) {
+	registry := Builtin()
+	spec := validRegistrationSpec()
+	spec.Resources.RootDiskMiB = 4096
+	spec.Resources.EnvironmentDiskMiB = 0
+	spec.Workspace = &workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}
+	if err := registry.ValidateSpecification("microsandbox", spec); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := registry.Normalize(sandbox.Selection{Provider: "microsandbox", DeploymentSpec: spec}); err != nil {
+		t.Fatal(err)
+	}
+	reached := errors.New("validated generation reached native construction")
+	adapter := registry.adapters["microsandbox"]
+	adapter.BuildLocal = func(c sandbox.NodeConfig, o sandbox.LocalOptions, b *sandbox.Built) (func(), error) {
+		return func() {}, reached
+	}
+	registry.adapters["microsandbox"] = adapter
+	config := sandbox.NodeConfig{Provider: "microsandbox", InstallationID: "11111111-1111-4111-8111-111111111111", Generation: 1, Specification: spec}
+	_, _, err := registry.Build(config, sandbox.LocalOptions{Standalone: true, Workspace: unreachableWorkspaceResolver{}})
+	if !errors.Is(err, reached) {
+		t.Fatal("external retained generation could not build", err)
+	}
+	if _, _, err = registry.Build(config, sandbox.LocalOptions{Standalone: true}); err == nil || errors.Is(err, reached) {
+		t.Fatal("external generation built without resolver", err)
+	}
+	config.Specification.Workspace = nil
+	if _, _, err = registry.Build(config, sandbox.LocalOptions{Standalone: true}); err == nil || errors.Is(err, reached) {
+		t.Fatal("owned zero disk bypassed validation", err)
+	}
+}
+
+type unreachableWorkspaceResolver struct{}
+
+func (unreachableWorkspaceResolver) Resolve(context.Context, workspacefs.Binding) (workspacefs.Directory, error) {
+	panic("build must not resolve workspace")
+}
diff --git a/services/core/internal/sandbox/sandbox_provider.go b/services/core/internal/sandbox/sandbox_provider.go
index 624f7e126..8d311697f 100644
--- a/services/core/internal/sandbox/sandbox_provider.go
+++ b/services/core/internal/sandbox/sandbox_provider.go
@@ -31,6 +31,7 @@ import (
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/providercontract"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/runtimeobs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 )
 
 var (
@@ -50,6 +51,7 @@ var (
 type Reference struct{ TenantID, EnvironmentID, AllocationID string }
 
 type Bootstrap struct {
+	Workspace *workspacefs.Binding `json:",omitempty"`
 	Reference
 	SessionID, DeviceID, CoreURL, Credential string
 	NetworkAccess                            string
@@ -168,6 +170,7 @@ type SuspendRequest struct {
 	ObserveOnly bool
 }
 type ResumeRequest struct {
+	Workspace   *workspacefs.Binding `json:",omitempty"`
 	Reference   Reference
 	OperationID string
 	Snapshot    SnapshotIdentity
@@ -254,10 +257,11 @@ type ConfigurationRequirements struct {
 // the fixed reason for rejecting one otherwise. DefaultResources is the size
 // setup proposes, or nil when the Provider's configuration selects it.
 type DeploymentPolicy struct {
-	RuntimeError     string     `json:"-"`
-	Disk             bool       `json:"disk"`
-	Runtime          bool       `json:"runtime"`
-	DefaultResources *Resources `json:"default_resources"`
+	Workspace        *workspacefs.Requirements `json:"workspace,omitempty"`
+	RuntimeError     string                    `json:"-"`
+	Disk             bool                      `json:"disk"`
+	Runtime          bool                      `json:"runtime"`
+	DefaultResources *Resources                `json:"default_resources"`
 }
 
 // Configuration is an adapter-owned typed value, never a request or response DTO.
@@ -316,6 +320,7 @@ type NodeConfig struct {
 
 // LocalOptions supplies process-local context without changing persisted configuration.
 type LocalOptions struct {
+	Workspace workspacefs.Resolver
 	// Standalone selects registration or execution without a generation manager.
 	Standalone bool
 	// GenerationStateDirectory is the node state directory when constructing a
@@ -393,3 +398,18 @@ var (
 	ErrConfigurationUnconfirmed = &ConfigurationError{ConfigurationUnconfirmed, "sandbox_verification_unconfirmed", "", "Sandbox provider verification could not be confirmed."}
 	ErrConfigurationSelection   = &ConfigurationError{ConfigurationInvalid, "sandbox_configuration_invalid", "configuration", "Select a ready immutable provider configuration with matching resources."}
 )
+
+// ValidateWorkspaceBinding checks the shared ownership envelope before forwarding.
+// Adapter-native receipts are validated only by the selected filesystem resolver.
+func ValidateWorkspaceBinding(r Reference, binding *workspacefs.Binding) error {
+	if binding == nil {
+		return nil
+	}
+	if err := binding.Validate(); err != nil {
+		return err
+	}
+	if binding.Attachment.Reference.TenantID != r.TenantID || binding.Attachment.Reference.EnvironmentID != r.EnvironmentID {
+		return workspacefs.ErrOwnership
+	}
+	return nil
+}
diff --git a/services/core/internal/sandbox/testdata/deployment-contract.json b/services/core/internal/sandbox/testdata/deployment-contract.json
index afec83248..bd4a68738 100644
--- a/services/core/internal/sandbox/testdata/deployment-contract.json
+++ b/services/core/internal/sandbox/testdata/deployment-contract.json
@@ -234,5 +234,205 @@
       }
     },
     "valid": false
+  },
+  {
+    "name": "microsandbox-external",
+    "provider": "microsandbox",
+    "specification": {
+      "resources": {
+        "cpus": 255,
+        "memory_mib": 1048576,
+        "root_disk_mib": 1024
+      },
+      "runtime": {
+        "source_commit": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "image_id": "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+        "image_manifest_digest": "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+        "microsandbox_ref": "oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+        "runtime_sha256": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "firmware_sha256": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "workspace": {
+        "attachment": "host_directory",
+        "user_xattr": true,
+        "capacity_quota": false
+      }
+    },
+    "valid": true,
+    "canonical": "{\"provider\":\"microsandbox\",\"resources\":{\"cpus\":255,\"memory_mib\":1048576,\"root_disk_mib\":1024},\"runtime\":{\"source_commit\":\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\"image_id\":\"sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\",\"image_manifest_digest\":\"sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc\",\"microsandbox_ref\":\"oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd\",\"runtime_sha256\":\"eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\",\"firmware_sha256\":\"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\"},\"workspace\":{\"attachment\":\"host_directory\",\"user_xattr\":true,\"capacity_quota\":false}}",
+    "digest": "ea1aa3cb9bd74682f5fb1a727dc43c63df193f71c7946c395da30451ee5ee3b0"
+  },
+  {
+    "name": "microsandbox-external-requires-root",
+    "provider": "microsandbox",
+    "specification": {
+      "resources": {
+        "cpus": 255,
+        "memory_mib": 1048576,
+        "root_disk_mib": 0
+      },
+      "runtime": {
+        "source_commit": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "image_id": "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+        "image_manifest_digest": "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+        "microsandbox_ref": "oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+        "runtime_sha256": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "firmware_sha256": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "workspace": {
+        "attachment": "host_directory",
+        "user_xattr": true,
+        "capacity_quota": false
+      }
+    },
+    "valid": false
+  },
+  {
+    "name": "microsandbox-external-no-false-quota",
+    "provider": "microsandbox",
+    "specification": {
+      "resources": {
+        "cpus": 255,
+        "memory_mib": 1048576,
+        "root_disk_mib": 1024,
+        "environment_disk_mib": 4096
+      },
+      "runtime": {
+        "source_commit": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "image_id": "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+        "image_manifest_digest": "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+        "microsandbox_ref": "oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+        "runtime_sha256": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "firmware_sha256": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "workspace": {
+        "attachment": "host_directory",
+        "user_xattr": true,
+        "capacity_quota": false
+      }
+    },
+    "valid": false
+  },
+  {
+    "name": "microsandbox-external-xattr-required",
+    "provider": "microsandbox",
+    "specification": {
+      "resources": {
+        "cpus": 255,
+        "memory_mib": 1048576,
+        "root_disk_mib": 1024
+      },
+      "runtime": {
+        "source_commit": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "image_id": "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+        "image_manifest_digest": "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+        "microsandbox_ref": "oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+        "runtime_sha256": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "firmware_sha256": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "workspace": {
+        "attachment": "host_directory",
+        "user_xattr": false,
+        "capacity_quota": false
+      }
+    },
+    "valid": false
+  },
+  {
+    "name": "microsandbox-owned-zero-environment-rejected",
+    "provider": "microsandbox",
+    "specification": {
+      "resources": {
+        "cpus": 255,
+        "memory_mib": 1048576,
+        "root_disk_mib": 1024
+      },
+      "runtime": {
+        "source_commit": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "image_id": "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+        "image_manifest_digest": "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+        "microsandbox_ref": "oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+        "runtime_sha256": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "firmware_sha256": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      }
+    },
+    "valid": false
+  },
+  {
+    "name": "docker-external-rejected",
+    "provider": "docker",
+    "specification": {
+      "resources": {
+        "cpus": 255,
+        "memory_mib": 1048576
+      },
+      "runtime": {
+        "source_commit": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "image_id": "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+        "image_manifest_digest": "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+        "microsandbox_ref": "oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+        "runtime_sha256": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "firmware_sha256": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "workspace": {
+        "attachment": "host_directory",
+        "user_xattr": true,
+        "capacity_quota": false
+      }
+    },
+    "valid": false
+  },
+  {
+    "name": "microsandbox-external-omitted-false-quota",
+    "provider": "microsandbox",
+    "specification": {
+      "resources": {
+        "cpus": 255,
+        "memory_mib": 1048576,
+        "root_disk_mib": 1024
+      },
+      "runtime": {
+        "source_commit": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "image_id": "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+        "image_manifest_digest": "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+        "microsandbox_ref": "oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+        "runtime_sha256": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "firmware_sha256": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "workspace": {
+        "attachment": "host_directory",
+        "user_xattr": true
+      }
+    },
+    "valid": true,
+    "canonical": "{\"provider\":\"microsandbox\",\"resources\":{\"cpus\":255,\"memory_mib\":1048576,\"root_disk_mib\":1024},\"runtime\":{\"source_commit\":\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\"image_id\":\"sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\",\"image_manifest_digest\":\"sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc\",\"microsandbox_ref\":\"oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd\",\"runtime_sha256\":\"eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\",\"firmware_sha256\":\"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\"},\"workspace\":{\"attachment\":\"host_directory\",\"user_xattr\":true,\"capacity_quota\":false}}",
+    "digest": "ea1aa3cb9bd74682f5fb1a727dc43c63df193f71c7946c395da30451ee5ee3b0"
+  },
+  {
+    "name": "microsandbox-external-null-false-quota",
+    "provider": "microsandbox",
+    "specification": {
+      "resources": {
+        "cpus": 255,
+        "memory_mib": 1048576,
+        "root_disk_mib": 1024
+      },
+      "runtime": {
+        "source_commit": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "image_id": "sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+        "image_manifest_digest": "sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc",
+        "microsandbox_ref": "oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
+        "runtime_sha256": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+        "firmware_sha256": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "workspace": {
+        "attachment": "host_directory",
+        "user_xattr": true,
+        "capacity_quota": null
+      }
+    },
+    "valid": true,
+    "canonical": "{\"provider\":\"microsandbox\",\"resources\":{\"cpus\":255,\"memory_mib\":1048576,\"root_disk_mib\":1024},\"runtime\":{\"source_commit\":\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\"image_id\":\"sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\",\"image_manifest_digest\":\"sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc\",\"microsandbox_ref\":\"oac-runtime@sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd\",\"runtime_sha256\":\"eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\",\"firmware_sha256\":\"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\"},\"workspace\":{\"attachment\":\"host_directory\",\"user_xattr\":true,\"capacity_quota\":false}}",
+    "digest": "ea1aa3cb9bd74682f5fb1a727dc43c63df193f71c7946c395da30451ee5ee3b0"
   }
 ]
diff --git a/services/core/internal/sandbox/workspace_test.go b/services/core/internal/sandbox/workspace_test.go
new file mode 100644
index 000000000..d8a0aee70
--- /dev/null
+++ b/services/core/internal/sandbox/workspace_test.go
@@ -0,0 +1,27 @@
+package sandbox
+
+import (
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"testing"
+)
+
+func TestWorkspaceQuotaDoesNotWeakenRootCapacity(t *testing.T) {
+	policy := DeploymentPolicy{Disk: true, Workspace: &workspacefs.Requirements{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}}
+	declaration := workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}
+	resources := Resources{CPUs: 2, MemoryMiB: 2048, RootDiskMiB: 4096}
+	if err := resources.ValidateWorkspacePolicy("test", policy, &declaration); err != nil {
+		t.Fatal(err)
+	}
+	if err := resources.ValidatePolicy("test", policy); err == nil {
+		t.Fatal("owned disk accepted zero")
+	}
+	resources.EnvironmentDiskMiB = 4096
+	if err := resources.ValidateWorkspacePolicy("test", policy, &declaration); err == nil {
+		t.Fatal("unenforced external quota accepted")
+	}
+	resources.EnvironmentDiskMiB = 0
+	resources.RootDiskMiB = 0
+	if err := resources.ValidateWorkspacePolicy("test", policy, &declaration); err == nil {
+		t.Fatal("root quota omitted")
+	}
+}
diff --git a/services/core/internal/workspacefs/nfs/nfs.go b/services/core/internal/workspacefs/nfs/nfs.go
new file mode 100644
index 000000000..c01453ffe
--- /dev/null
+++ b/services/core/internal/workspacefs/nfs/nfs.go
@@ -0,0 +1,171 @@
+// Package nfs implements workspace storage on an operator-mounted kernel NFS filesystem.
+package nfs
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"path/filepath"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/google/uuid"
+)
+
+const Name = "nfs"
+
+type parameters struct {
+	Root        string `json:"root"`
+	NamespaceID string `json:"namespace_id"`
+	UID         uint32 `json:"uid"`
+}
+
+// CanonicalParameters rejects unknown, duplicate, missing and malformed settings.
+func CanonicalParameters(raw json.RawMessage) (json.RawMessage, error) {
+	var p parameters
+	if err := strict(raw, &p); err != nil {
+		return nil, fmt.Errorf("%w: parameters: %v", workspacefs.ErrInvalid, err)
+	}
+	id, err := uuid.Parse(p.NamespaceID)
+	if err != nil || id == uuid.Nil || id.String() != p.NamespaceID || p.UID == 0 || p.UID > 2147483647 || !filepath.IsAbs(p.Root) || filepath.Clean(p.Root) != p.Root || bytes.IndexByte([]byte(p.Root), 0) >= 0 {
+		return nil, fmt.Errorf("%w: root, namespace_id or uid", workspacefs.ErrInvalid)
+	}
+	return json.Marshal(p)
+}
+
+func strict(raw []byte, dst any) error {
+	dec := json.NewDecoder(bytes.NewReader(raw))
+	token, err := dec.Token()
+	if err != nil || token != json.Delim('{') {
+		return errors.New("expected object")
+	}
+	seen := map[string]bool{}
+	for dec.More() {
+		key, err := dec.Token()
+		if err != nil {
+			return err
+		}
+		k, ok := key.(string)
+		if !ok || seen[k] {
+			return errors.New("duplicate key")
+		}
+		seen[k] = true
+		var value json.RawMessage
+		if err := dec.Decode(&value); err != nil {
+			return err
+		}
+		if bytes.Equal(bytes.TrimSpace(value), []byte("null")) {
+			return errors.New("null field")
+		}
+	}
+	if _, err := dec.Token(); err != nil {
+		return err
+	}
+	if _, err := dec.Token(); err != io.EOF {
+		return errors.New("trailing JSON")
+	}
+	dec = json.NewDecoder(bytes.NewReader(raw))
+	dec.DisallowUnknownFields()
+	if err := dec.Decode(dst); err != nil {
+		return err
+	}
+	canonical, err := json.Marshal(dst)
+	if err != nil {
+		return err
+	}
+	var fields map[string]json.RawMessage
+	if err = json.Unmarshal(canonical, &fields); err != nil {
+		return err
+	}
+	if len(fields) != len(seen) {
+		return errors.New("missing field")
+	}
+	for field := range seen {
+		if _, ok := fields[field]; !ok {
+			return errors.New("unknown field")
+		}
+	}
+	return nil
+}
+
+// Adapter holds immutable configuration only; construction performs no filesystem I/O.
+type Adapter struct {
+	configuration workspacefs.Configuration
+	parameters    parameters
+}
+
+func New(configuration workspacefs.Configuration) (*Adapter, error) {
+	if err := configuration.Validate(); err != nil {
+		return nil, err
+	}
+	if configuration.Adapter != Name {
+		return nil, workspacefs.ErrUnsupported
+	}
+	raw, err := CanonicalParameters(configuration.Parameters)
+	if err != nil {
+		return nil, err
+	}
+	configuration.Parameters = raw
+	a := &Adapter{configuration: configuration}
+	_ = json.Unmarshal(raw, &a.parameters)
+	return a, nil
+}
+func (*Adapter) Declaration() workspacefs.Declaration {
+	return workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}
+}
+
+// Slots remain occupied until the kernel operation actually returns, even after timeout.
+var operations = make(chan struct{}, 32)
+
+func run[T any](ctx context.Context, operation func() (T, error)) (T, error) {
+	var zero T
+	if err := ctx.Err(); err != nil {
+		return zero, fmt.Errorf("%w: %v", workspacefs.ErrUnconfirmed, err)
+	}
+	select {
+	case operations <- struct{}{}:
+	default:
+		return zero, fmt.Errorf("%w: filesystem operation budget exhausted", workspacefs.ErrUnavailable)
+	}
+	type result struct {
+		value T
+		err   error
+	}
+	done := make(chan result, 1)
+	go func() { defer func() { <-operations }(); value, err := operation(); done <- result{value, err} }()
+	select {
+	case r := <-done:
+		return r.value, r.err
+	case <-ctx.Done():
+		return zero, fmt.Errorf("%w: %v", workspacefs.ErrUnconfirmed, ctx.Err())
+	}
+}
+
+type receipt struct {
+	NamespaceID string `json:"namespace_id"`
+}
+
+func (a *Adapter) attachment(ref workspacefs.Reference) workspacefs.Attachment {
+	raw, _ := json.Marshal(receipt{a.parameters.NamespaceID})
+	return workspacefs.Attachment{Reference: ref, ConfigurationID: a.configuration.ID, Kind: workspacefs.AttachmentHostDirectory, Native: raw}
+}
+func (a *Adapter) Resolve(ctx context.Context, b workspacefs.Binding) (workspacefs.Directory, error) {
+	if err := b.Validate(); err != nil {
+		return workspacefs.Directory{}, err
+	}
+	raw, err := CanonicalParameters(b.Configuration.Parameters)
+	if err != nil {
+		return workspacefs.Directory{}, err
+	}
+	var native receipt
+	if b.Configuration.ID != a.configuration.ID || b.Configuration.Adapter != Name || !bytes.Equal(raw, a.configuration.Parameters) || strict(b.Attachment.Native, &native) != nil || native.NamespaceID != a.parameters.NamespaceID {
+		return workspacefs.Directory{}, workspacefs.ErrOwnership
+	}
+	_, err = a.Observe(ctx, b.Attachment.Reference)
+	if err != nil {
+		return workspacefs.Directory{}, err
+	}
+	return workspacefs.Directory{Path: filepath.Join(a.parameters.Root, "objects", b.Attachment.Reference.ObjectID, "live", "data")}, nil
+}
diff --git a/services/core/internal/workspacefs/nfs/nfs_linux.go b/services/core/internal/workspacefs/nfs/nfs_linux.go
new file mode 100644
index 000000000..0af18aedc
--- /dev/null
+++ b/services/core/internal/workspacefs/nfs/nfs_linux.go
@@ -0,0 +1,469 @@
+//go:build linux
+
+package nfs
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/fs"
+	"os"
+	"path"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/google/uuid"
+	"golang.org/x/sys/unix"
+)
+
+const rootMarker = ".oac-storage-root"
+
+func unavailable(err error) error { return fmt.Errorf("%w: %w", workspacefs.ErrUnavailable, err) }
+func unconfirmed(err error) error { return fmt.Errorf("%w: %w", workspacefs.ErrUnconfirmed, err) }
+
+// open validates the pinned directory descriptor before any namespace mutation.
+// It runs inside the process budget, including OpenRoot and every stat/read.
+func (a *Adapter) open() (*os.Root, error) {
+	r, err := os.OpenRoot(a.parameters.Root)
+	if err != nil {
+		return nil, unavailable(err)
+	}
+	fail := func(err error) (*os.Root, error) { r.Close(); return nil, unavailable(err) }
+	f, err := r.Open(".")
+	if err != nil {
+		return fail(err)
+	}
+	var stat unix.Statfs_t
+	err = unix.Fstatfs(int(f.Fd()), &stat)
+	f.Close()
+	if err != nil {
+		return fail(err)
+	}
+	if stat.Type != unix.NFS_SUPER_MAGIC {
+		return fail(errors.New("root is not kernel NFS"))
+	}
+	if os.Geteuid() != int(a.parameters.UID) {
+		return fail(errors.New("effective UID differs from configured nonroot principal"))
+	}
+	if err = private(r, ".", true, a.parameters.UID); err != nil {
+		return fail(err)
+	}
+	if err = private(r, rootMarker, false, a.parameters.UID); err != nil {
+		return fail(err)
+	}
+	raw, err := r.ReadFile(rootMarker)
+	if err != nil {
+		return fail(err)
+	}
+	if !bytes.Equal(raw, []byte(a.parameters.NamespaceID+"\n")) {
+		return fail(errors.New("namespace marker mismatch"))
+	}
+	if err = private(r, "objects", true, a.parameters.UID); err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return fail(err)
+	}
+	return r, nil
+}
+func private(r *os.Root, name string, dir bool, uid uint32) error {
+	info, err := r.Lstat(name)
+	if err != nil {
+		return err
+	}
+	// FileInfo uses syscall.Stat_t; descriptor fstat avoids platform representation assertions.
+	if info.Mode()&os.ModeSymlink != 0 || info.IsDir() != dir || (!dir && !info.Mode().IsRegular()) {
+		return workspacefs.ErrOwnership
+	}
+	f, err := r.Open(name)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	var st unix.Stat_t
+	if err = unix.Fstat(int(f.Fd()), &st); err != nil {
+		return err
+	}
+	expected := uint32(0600)
+	if dir {
+		expected = 0700
+	}
+	if st.Uid != uid || st.Mode&0777 != expected {
+		return fmt.Errorf("%w: private owner or mode on %s", workspacefs.ErrOwnership, name)
+	}
+	return nil
+}
+func mkdir(r *os.Root, name string, uid uint32) error {
+	if err := r.Mkdir(name, 0700); err != nil && !errors.Is(err, fs.ErrExist) {
+		return err
+	}
+	return private(r, name, true, uid)
+}
+func syncDir(r *os.Root, name string) error {
+	f, err := r.Open(name)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	return f.Sync()
+}
+func write(r *os.Root, name string, raw []byte) error {
+	f, err := r.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+	if err != nil {
+		return err
+	}
+	_, err = f.Write(raw)
+	if err == nil {
+		err = f.Sync()
+	}
+	closeErr := f.Close()
+	if err != nil {
+		return err
+	}
+	return closeErr
+}
+func (a *Adapter) Check(ctx context.Context) error {
+	_, err := run(ctx, func() (struct{}, error) {
+		r, err := a.open()
+		if err != nil {
+			return struct{}{}, err
+		}
+		defer r.Close()
+		name := ".probe-" + uuid.NewString()
+		f, err := r.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
+		if err != nil {
+			return struct{}{}, unavailable(err)
+		}
+		defer r.Remove(name)
+		defer f.Close()
+		fd := int(f.Fd())
+		key := "user.oac_workspace_check"
+		value := []byte("workspace")
+		if err = unix.Fsetxattr(fd, key, value, 0); err != nil {
+			return struct{}{}, unavailable(err)
+		}
+		buf := make([]byte, 64)
+		n, err := unix.Fgetxattr(fd, key, buf)
+		if err != nil {
+			return struct{}{}, unavailable(err)
+		}
+		if !bytes.Equal(buf[:n], value) {
+			return struct{}{}, unavailable(errors.New("xattr mismatch"))
+		}
+		if err = unix.Fremovexattr(fd, key); err != nil {
+			return struct{}{}, unavailable(err)
+		}
+		return struct{}{}, nil
+	})
+	return err
+}
+
+func object(ref workspacefs.Reference) string { return path.Join("objects", ref.ObjectID) }
+func identity(r *os.Root, name string, ref workspacefs.Reference) error {
+	raw, err := r.ReadFile(name)
+	if err != nil {
+		return err
+	}
+	var got workspacefs.Reference
+	if strict(raw, &got) != nil || got != ref {
+		return workspacefs.ErrOwnership
+	}
+	return nil
+}
+
+// claim publishes an immutable synced identity with a no-replace hard link.
+func (a *Adapter) claim(r *os.Root, ref workspacefs.Reference) error {
+	if err := mkdir(r, "objects", a.parameters.UID); err != nil {
+		return err
+	}
+	if err := syncDir(r, "."); err != nil {
+		return err
+	}
+	obj := object(ref)
+	if err := mkdir(r, obj, a.parameters.UID); err != nil {
+		return err
+	}
+	name := path.Join(obj, "identity")
+	if err := identity(r, name, ref); err == nil {
+		if err := syncDir(r, obj); err != nil {
+			return err
+		}
+		return syncDir(r, "objects")
+	} else if !errors.Is(err, fs.ErrNotExist) {
+		return err
+	}
+	tmp := path.Join(obj, ".identity-"+uuid.NewString())
+	raw, _ := json.Marshal(ref)
+	if err := write(r, tmp, raw); err != nil {
+		return err
+	}
+	defer r.Remove(tmp)
+	if err := r.Link(tmp, name); err != nil && !errors.Is(err, fs.ErrExist) {
+		return err
+	}
+	if err := identity(r, name, ref); err != nil {
+		return err
+	}
+	if err := syncDir(r, obj); err != nil {
+		return err
+	}
+	return syncDir(r, "objects")
+}
+func retired(r *os.Root, obj string) (bool, error) {
+	info, err := r.Lstat(path.Join(obj, "deleted-marker"))
+	if errors.Is(err, fs.ErrNotExist) {
+		return false, nil
+	}
+	if err != nil {
+		return false, err
+	}
+	if !info.Mode().IsRegular() {
+		return false, workspacefs.ErrOwnership
+	}
+	return true, nil
+}
+func live(r *os.Root, ref workspacefs.Reference) error {
+	obj := object(ref)
+	if err := identity(r, path.Join(obj, "identity"), ref); err != nil {
+		return err
+	}
+	dead, err := retired(r, obj)
+	if err != nil {
+		return err
+	}
+	if dead {
+		return workspacefs.ErrNotFound
+	}
+	dir := path.Join(obj, "live")
+	info, err := r.Lstat(dir)
+	if err != nil {
+		return err
+	}
+	if !info.IsDir() {
+		return workspacefs.ErrOwnership
+	}
+	if err := identity(r, path.Join(dir, "identity"), ref); err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			return workspacefs.ErrOwnership
+		}
+		return err
+	}
+	return nil
+}
+func (a *Adapter) Observe(ctx context.Context, ref workspacefs.Reference) (workspacefs.Attachment, error) {
+	if err := ref.Validate(); err != nil {
+		return workspacefs.Attachment{}, err
+	}
+	return run(ctx, func() (workspacefs.Attachment, error) {
+		r, err := a.open()
+		if err != nil {
+			return workspacefs.Attachment{}, err
+		}
+		defer r.Close()
+		return a.observe(r, ref)
+	})
+}
+func (a *Adapter) observe(r *os.Root, ref workspacefs.Reference) (workspacefs.Attachment, error) {
+	if err := live(r, ref); err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			err = workspacefs.ErrNotFound
+		}
+		if !errors.Is(err, workspacefs.ErrNotFound) && !errors.Is(err, workspacefs.ErrOwnership) {
+			err = unavailable(err)
+		}
+		return workspacefs.Attachment{}, err
+	}
+	if err := private(r, path.Join(object(ref), "live", "data"), true, a.parameters.UID); err != nil {
+		return workspacefs.Attachment{}, unavailable(err)
+	}
+	return a.attachment(ref), nil
+}
+
+func (a *Adapter) Create(ctx context.Context, ref workspacefs.Reference) (workspacefs.Attachment, error) {
+	if err := ref.Validate(); err != nil {
+		return workspacefs.Attachment{}, err
+	}
+	return run(ctx, func() (workspacefs.Attachment, error) {
+		r, err := a.open()
+		if err != nil {
+			return workspacefs.Attachment{}, err
+		}
+		defer r.Close()
+		if err = a.create(r, ref); err != nil {
+			return workspacefs.Attachment{}, err
+		}
+		return a.attachment(ref), nil
+	})
+}
+func (a *Adapter) create(r *os.Root, ref workspacefs.Reference) error {
+	if err := a.claim(r, ref); err != nil {
+		return unconfirmed(err)
+	}
+	obj := object(ref)
+	dead, err := retired(r, obj)
+	if err != nil {
+		return unconfirmed(err)
+	}
+	if dead {
+		return workspacefs.ErrNotFound
+	}
+	if err = live(r, ref); err == nil {
+		return nil
+	} else if !errors.Is(err, fs.ErrNotExist) {
+		return err
+	}
+	for _, dir := range []string{"staging", "trash"} {
+		if err = mkdir(r, path.Join(obj, dir), a.parameters.UID); err != nil {
+			return unconfirmed(err)
+		}
+	}
+	stage := path.Join(obj, "staging", uuid.NewString())
+	if err = r.Mkdir(stage, 0700); err != nil {
+		return unconfirmed(err)
+	}
+	if err = r.Mkdir(path.Join(stage, "data"), 0700); err != nil {
+		return unconfirmed(err)
+	}
+	raw, _ := json.Marshal(ref)
+	if err = write(r, path.Join(stage, "identity"), raw); err != nil {
+		return unconfirmed(err)
+	}
+	if err = syncDir(r, path.Join(stage, "data")); err != nil {
+		return unconfirmed(err)
+	}
+	if err = syncDir(r, stage); err != nil {
+		return unconfirmed(err)
+	}
+	dead, err = retired(r, obj)
+	if err != nil {
+		return unconfirmed(err)
+	}
+	if dead {
+		_ = removeEnvelope(r, stage, ref, false)
+		return workspacefs.ErrNotFound
+	}
+	if err = r.Rename(stage, path.Join(obj, "live")); err != nil {
+		if check := live(r, ref); check != nil {
+			return unconfirmed(err)
+		}
+		if err = removeEnvelope(r, stage, ref, false); err != nil {
+			return unconfirmed(err)
+		}
+	} else if err = syncDir(r, obj); err != nil {
+		return unconfirmed(err)
+	}
+	dead, err = retired(r, obj)
+	if err != nil {
+		return unconfirmed(err)
+	}
+	if dead {
+		// The terminal marker prevents admission. Only remove an empty result;
+		// any unexpected user data is retained for a subsequent Delete.
+		if err := removeEnvelope(r, path.Join(obj, "live"), ref, false); err != nil {
+			return unconfirmed(err)
+		}
+		return workspacefs.ErrNotFound
+	}
+	return nil
+}
+
+// removeEnvelope removes data before identity. Missing markers permit removal
+// of empty shells only, including when another deleter has already finished.
+func removeEnvelope(r *os.Root, dir string, ref workspacefs.Reference, recursive bool) error {
+	err := identity(r, path.Join(dir, "identity"), ref)
+	if err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return err
+	}
+	data := path.Join(dir, "data")
+	if err == nil && recursive {
+		if err = r.RemoveAll(data); err != nil {
+			return err
+		}
+	} else {
+		if err = r.Remove(data); err != nil && !errors.Is(err, fs.ErrNotExist) {
+			return err
+		}
+	}
+	if err = r.Remove(path.Join(dir, "identity")); err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return err
+	}
+	if err = r.Remove(dir); err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return err
+	}
+	return nil
+}
+func (a *Adapter) Delete(ctx context.Context, ref workspacefs.Reference) error {
+	if err := ref.Validate(); err != nil {
+		return err
+	}
+	_, err := run(ctx, func() (struct{}, error) {
+		r, err := a.open()
+		if err != nil {
+			return struct{}{}, err
+		}
+		defer r.Close()
+		err = a.delete(r, ref)
+		return struct{}{}, err
+	})
+	return err
+}
+func (a *Adapter) delete(r *os.Root, ref workspacefs.Reference) error {
+	if err := a.claim(r, ref); err != nil {
+		return unconfirmed(err)
+	}
+	obj := object(ref)
+	marker := path.Join(obj, "deleted-marker")
+	if err := write(r, marker, []byte("deleted\n")); err != nil && !errors.Is(err, fs.ErrExist) {
+		return unconfirmed(err)
+	}
+	if err := syncDir(r, marker); err != nil {
+		return unconfirmed(err)
+	}
+	if err := syncDir(r, obj); err != nil {
+		return unconfirmed(err)
+	}
+	for _, dir := range []string{"staging", "trash"} {
+		if err := mkdir(r, path.Join(obj, dir), a.parameters.UID); err != nil {
+			return unconfirmed(err)
+		}
+	}
+	liveDir := path.Join(obj, "live")
+	if err := identity(r, path.Join(liveDir, "identity"), ref); err == nil {
+		if err = r.Rename(liveDir, path.Join(obj, "trash", uuid.NewString())); err != nil && !errors.Is(err, fs.ErrNotExist) {
+			return unconfirmed(err)
+		}
+	} else if !errors.Is(err, fs.ErrNotExist) {
+		return err
+	}
+	if err := syncDir(r, obj); err != nil {
+		return unconfirmed(err)
+	}
+	if err := syncDir(r, path.Join(obj, "trash")); err != nil {
+		return unconfirmed(err)
+	}
+	for _, parent := range []string{"trash", "staging"} {
+		dir, err := r.Open(path.Join(obj, parent))
+		if err != nil {
+			return unconfirmed(err)
+		}
+		entries, err := dir.ReadDir(-1)
+		dir.Close()
+		if err != nil {
+			return unconfirmed(err)
+		}
+		for _, entry := range entries {
+			if err = removeEnvelope(r, path.Join(obj, parent, entry.Name()), ref, parent == "trash"); err != nil {
+				return unconfirmed(err)
+			}
+		}
+		if err = syncDir(r, path.Join(obj, parent)); err != nil {
+			return unconfirmed(err)
+		}
+	}
+	// A late in-flight Create cannot be admitted after the durable marker. Its
+	// empty envelope can require a repeated Delete after that syscall settles.
+	if _, err := r.Lstat(liveDir); err == nil {
+		return unconfirmed(errors.New("late live publication"))
+	} else if !errors.Is(err, fs.ErrNotExist) {
+		return unconfirmed(err)
+	}
+	return nil
+}
diff --git a/services/core/internal/workspacefs/nfs/nfs_linux_test.go b/services/core/internal/workspacefs/nfs/nfs_linux_test.go
new file mode 100644
index 000000000..4d485e380
--- /dev/null
+++ b/services/core/internal/workspacefs/nfs/nfs_linux_test.go
@@ -0,0 +1,157 @@
+//go:build linux
+
+package nfs
+
+import (
+	"context"
+	"errors"
+	"os"
+	"path"
+	"sync"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/google/uuid"
+)
+
+func local(t *testing.T) (*Adapter, *os.Root, workspacefs.Reference) {
+	t.Helper()
+	dir := t.TempDir()
+	r, err := os.OpenRoot(dir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { r.Close() })
+	if err = r.Mkdir("objects", 0700); err != nil {
+		t.Fatal(err)
+	}
+	return &Adapter{parameters: parameters{UID: uint32(os.Geteuid())}}, r, workspacefs.Reference{TenantID: uuid.NewString(), EnvironmentID: uuid.NewString(), ObjectID: uuid.NewString()}
+}
+func TestLifecycleConcurrentReplay(t *testing.T) {
+	a, r, ref := local(t)
+	var wg sync.WaitGroup
+	errs := make(chan error, 16)
+	for range 16 {
+		wg.Go(func() { errs <- a.create(r, ref) })
+	}
+	wg.Wait()
+	close(errs)
+	for err := range errs {
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+	data := path.Join(object(ref), "live", "data", "valuable")
+	if err := write(r, data, []byte("retain")); err != nil {
+		t.Fatal(err)
+	}
+	if err := a.create(r, ref); err != nil {
+		t.Fatal(err)
+	}
+	if raw, err := r.ReadFile(data); err != nil || string(raw) != "retain" {
+		t.Fatalf("data overwritten %s %v", raw, err)
+	}
+	errs = make(chan error, 16)
+	for range 16 {
+		wg.Go(func() { errs <- a.delete(r, ref) })
+	}
+	wg.Wait()
+	close(errs)
+	for err := range errs {
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+	if err := a.create(r, ref); !errors.Is(err, workspacefs.ErrNotFound) {
+		t.Fatalf("retired create: %v", err)
+	}
+	if err := live(r, ref); !errors.Is(err, workspacefs.ErrNotFound) {
+		t.Fatalf("retired observe: %v", err)
+	}
+	if _, err := r.Stat(path.Join(object(ref), "identity")); err != nil {
+		t.Fatal(err)
+	}
+}
+func TestForeignIdentityNeverDeletes(t *testing.T) {
+	a, r, ref := local(t)
+	if err := a.create(r, ref); err != nil {
+		t.Fatal(err)
+	}
+	other := ref
+	other.TenantID = uuid.NewString()
+	if err := a.delete(r, other); !errors.Is(err, workspacefs.ErrOwnership) {
+		t.Fatal(err)
+	}
+	if err := live(r, ref); err != nil {
+		t.Fatal(err)
+	}
+}
+func TestMissingMarkerDoesNotDeleteData(t *testing.T) {
+	a, r, ref := local(t)
+	if err := a.create(r, ref); err != nil {
+		t.Fatal(err)
+	}
+	dir := path.Join(object(ref), "live")
+	if err := write(r, path.Join(dir, "data", "valuable"), []byte("keep")); err != nil {
+		t.Fatal(err)
+	}
+	if err := r.Remove(path.Join(dir, "identity")); err != nil {
+		t.Fatal(err)
+	}
+	if err := removeEnvelope(r, dir, ref, true); err == nil {
+		t.Fatal("removed data without identity")
+	}
+	if _, err := r.Stat(path.Join(dir, "data", "valuable")); err != nil {
+		t.Fatal(err)
+	}
+}
+func TestCheckRejectsLocalFilesystem(t *testing.T) {
+	a := &Adapter{parameters: parameters{Root: t.TempDir(), UID: 65532}}
+	if err := a.Check(context.Background()); !errors.Is(err, workspacefs.ErrUnavailable) {
+		t.Fatalf("local path accepted: %v", err)
+	}
+}
+
+func TestCreateDoesNotReplaceUnownedLive(t *testing.T) {
+	a, r, ref := local(t)
+	if err := a.claim(r, ref); err != nil {
+		t.Fatal(err)
+	}
+	if err := r.Mkdir(path.Join(object(ref), "live"), 0700); err != nil {
+		t.Fatal(err)
+	}
+	if err := a.create(r, ref); !errors.Is(err, workspacefs.ErrOwnership) {
+		t.Fatalf("unowned live: %v", err)
+	}
+}
+
+func TestObserveAbsentObjectsDoesNotPrepareNamespace(t *testing.T) {
+	a, r, ref := local(t)
+	if err := r.Remove("objects"); err != nil {
+		t.Fatal(err)
+	}
+	for range 2 {
+		if _, err := a.observe(r, ref); !errors.Is(err, workspacefs.ErrNotFound) {
+			t.Fatalf("absent object: %v", err)
+		}
+		dir, err := r.Open(".")
+		if err != nil {
+			t.Fatal(err)
+		}
+		entries, err := dir.ReadDir(-1)
+		dir.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+		if len(entries) != 0 {
+			t.Fatalf("Observe created namespace entries: %v", entries)
+		}
+	}
+	// Delete of a never-created reference still persists terminal ownership.
+	if err := a.delete(r, ref); err != nil {
+		t.Fatal(err)
+	}
+	if err := a.create(r, ref); !errors.Is(err, workspacefs.ErrNotFound) {
+		t.Fatalf("deleted identity reused: %v", err)
+	}
+}
diff --git a/services/core/internal/workspacefs/nfs/nfs_other.go b/services/core/internal/workspacefs/nfs/nfs_other.go
new file mode 100644
index 000000000..fc865b7c0
--- /dev/null
+++ b/services/core/internal/workspacefs/nfs/nfs_other.go
@@ -0,0 +1,19 @@
+//go:build !linux
+
+package nfs
+
+import (
+	"context"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+)
+
+func (*Adapter) Check(context.Context) error { return workspacefs.ErrUnsupported }
+func (*Adapter) Create(context.Context, workspacefs.Reference) (workspacefs.Attachment, error) {
+	return workspacefs.Attachment{}, workspacefs.ErrUnsupported
+}
+func (*Adapter) Observe(context.Context, workspacefs.Reference) (workspacefs.Attachment, error) {
+	return workspacefs.Attachment{}, workspacefs.ErrUnsupported
+}
+func (*Adapter) Delete(context.Context, workspacefs.Reference) error {
+	return workspacefs.ErrUnsupported
+}
diff --git a/services/core/internal/workspacefs/nfs/nfs_test.go b/services/core/internal/workspacefs/nfs/nfs_test.go
new file mode 100644
index 000000000..951355381
--- /dev/null
+++ b/services/core/internal/workspacefs/nfs/nfs_test.go
@@ -0,0 +1,61 @@
+package nfs
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+)
+
+func TestCanonicalParameters(t *testing.T) {
+	good := `{"root":"/nfs/workspaces","namespace_id":"aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa","uid":65532}`
+	for _, raw := range []string{strings.Replace(good, `"uid":65532`, `"uid":0`, 1), strings.Replace(good, `"uid":65532`, `"uid":null`, 1), strings.Replace(good, `"uid":65532`, `"uid":65532,"uid":65532`, 1), strings.Replace(good, `"root"`, `"Root"`, 1), strings.Replace(good, `"uid":65532`, `"uid":65532,"extra":true`, 1), strings.Replace(good, `/nfs/workspaces`, `/nfs/../workspaces`, 1), good + ` {}`} {
+		if _, err := CanonicalParameters(json.RawMessage(raw)); !errors.Is(err, workspacefs.ErrInvalid) {
+			t.Fatalf("accepted %s: %v", raw, err)
+		}
+	}
+	if got, err := CanonicalParameters(json.RawMessage(good)); err != nil || string(got) != good {
+		t.Fatalf("canonical: %s %v", got, err)
+	}
+}
+func TestBudgetRetainedAfterTimeout(t *testing.T) {
+	release := make(chan struct{})
+	defer close(release)
+	entered := make(chan struct{}, cap(operations))
+	for range cap(operations) {
+		ctx, cancel := context.WithCancel(context.Background())
+		done := make(chan error, 1)
+		go func() {
+			_, err := run(ctx, func() (int, error) { entered <- struct{}{}; <-release; return 9, nil })
+			done <- err
+		}()
+		<-entered
+		cancel()
+		if err := <-done; !errors.Is(err, workspacefs.ErrUnconfirmed) {
+			t.Fatal(err)
+		}
+	}
+	if _, err := run(context.Background(), func() (int, error) { t.Error("exhausted operation executed"); return 0, nil }); !errors.Is(err, workspacefs.ErrUnavailable) {
+		t.Fatal(err)
+	}
+}
+func TestLateResultDoesNotEscape(t *testing.T) {
+	// The preceding test's kernel stand-ins may be completing asynchronously.
+	deadline := time.Now().Add(time.Second)
+	for len(operations) > 0 && time.Now().Before(deadline) {
+		time.Sleep(time.Millisecond)
+	}
+	release := make(chan struct{})
+	ctx, cancel := context.WithCancel(context.Background())
+	entered := make(chan struct{})
+	go func() { <-entered; cancel() }()
+	got, err := run(ctx, func() (int, error) { close(entered); <-release; return 42, nil })
+	if got != 0 || !errors.Is(err, workspacefs.ErrUnconfirmed) {
+		t.Fatalf("%d %v", got, err)
+	}
+	close(release)
+}
diff --git a/services/core/internal/workspacefs/providers/registry.go b/services/core/internal/workspacefs/providers/registry.go
new file mode 100644
index 000000000..7d19c785a
--- /dev/null
+++ b/services/core/internal/workspacefs/providers/registry.go
@@ -0,0 +1,88 @@
+// Package providers composes workspace filesystem adapters at process startup.
+package providers
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs/nfs"
+)
+
+type adapter interface {
+	workspacefs.Control
+	workspacefs.Resolver
+}
+
+type registration struct {
+	normalize func(json.RawMessage) (json.RawMessage, error)
+	open      func(workspacefs.Configuration) (adapter, error)
+}
+
+// Registry uses the same registrations for control and node resolution. A
+// registration supplies both protocol roles, never an optional side interface.
+type Registry struct{ entries map[string]registration }
+
+func New() *Registry {
+	return &Registry{entries: map[string]registration{
+		nfs.Name: {
+			normalize: nfs.CanonicalParameters,
+			open: func(c workspacefs.Configuration) (adapter, error) {
+				return nfs.New(c)
+			},
+		},
+	}}
+}
+
+func (r *Registry) lookup(name string) (registration, error) {
+	if r != nil {
+		if value, ok := r.entries[name]; ok {
+			return value, nil
+		}
+	}
+	return registration{}, fmt.Errorf("%w: filesystem adapter is not registered", workspacefs.ErrUnsupported)
+}
+
+func (r *Registry) Normalize(c workspacefs.Configuration) (workspacefs.Configuration, error) {
+	if err := c.Validate(); err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	a, err := r.lookup(c.Adapter)
+	if err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	c.Parameters, err = a.normalize(c.Parameters)
+	if err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	return c, nil
+}
+
+// Control constructs an adapter from its canonical retained configuration.
+// Construction performs no filesystem operation; Check owns live qualification.
+func (r *Registry) Control(c workspacefs.Configuration) (workspacefs.Control, error) {
+	if err := c.Validate(); err != nil {
+		return nil, err
+	}
+	a, err := r.lookup(c.Adapter)
+	if err != nil {
+		return nil, err
+	}
+	return a.open(c)
+}
+
+func (r *Registry) Resolve(ctx context.Context, binding workspacefs.Binding) (workspacefs.Directory, error) {
+	if err := binding.Validate(); err != nil {
+		return workspacefs.Directory{}, err
+	}
+	a, err := r.lookup(binding.Configuration.Adapter)
+	if err != nil {
+		return workspacefs.Directory{}, err
+	}
+	instance, err := a.open(binding.Configuration)
+	if err != nil {
+		return workspacefs.Directory{}, err
+	}
+	return instance.Resolve(ctx, binding)
+}
diff --git a/services/core/internal/workspacefs/workspacefs.go b/services/core/internal/workspacefs/workspacefs.go
new file mode 100644
index 000000000..fd2343b36
--- /dev/null
+++ b/services/core/internal/workspacefs/workspacefs.go
@@ -0,0 +1,182 @@
+// Package workspacefs defines the independent workspace filesystem boundary.
+// Its owning document is docs/workspace-provider.md. Core owns identities and
+// lifecycle; adapters own filesystem configuration, receipts and path resolution.
+package workspacefs
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"github.com/google/uuid"
+)
+
+var (
+	ErrInvalid     = errors.New("invalid workspace filesystem request")
+	ErrOwnership   = errors.New("workspace filesystem ownership mismatch")
+	ErrUnavailable = errors.New("workspace filesystem unavailable")
+	ErrUnconfirmed = errors.New("workspace filesystem mutation outcome unconfirmed")
+	ErrNotFound    = errors.New("workspace filesystem object not found")
+	ErrUnsupported = errors.New("unsupported workspace filesystem combination")
+)
+
+// Reference is persisted before Create. Its canonical UUIDs are immutable and
+// ObjectID is never reused, including after deletion or an unconfirmed mutation.
+type Reference struct {
+	TenantID      string `json:"tenant_id"`
+	EnvironmentID string `json:"environment_id"`
+	ObjectID      string `json:"object_id"`
+}
+
+// Configuration is an immutable Core database record. Parameters belong to its
+// adapter; neither Core nor the public Session API interprets native paths.
+type Configuration struct {
+	ID         string          `json:"id" format:"uuid" binding:"required"`
+	Adapter    string          `json:"adapter" binding:"required"`
+	Parameters json.RawMessage `json:"parameters" swaggertype:"object" binding:"required"`
+}
+
+type AttachmentKind string
+
+const AttachmentHostDirectory AttachmentKind = "host_directory"
+
+// Attachment is adapter-issued ownership evidence, not a public host path.
+// The selected adapter must validate Native before using it.
+type Attachment struct {
+	Reference       Reference       `json:"reference"`
+	ConfigurationID string          `json:"configuration_id"`
+	Kind            AttachmentKind  `json:"kind"`
+	Native          json.RawMessage `json:"native"`
+}
+
+// Binding transports the database-owned configuration transiently to a resolver;
+// it must not become an independently authored node setting.
+type Binding struct {
+	Configuration Configuration `json:"configuration"`
+	Attachment    Attachment    `json:"attachment"`
+}
+
+type Directory struct {
+	Path string `json:"path"`
+}
+
+// Declaration describes verified behavior. CapacityQuota means the adapter
+// enforces the requested capacity, not merely that it can report free space.
+type Declaration struct {
+	Attachment    AttachmentKind `json:"attachment" binding:"required"`
+	UserXAttr     bool           `json:"user_xattr" binding:"required"`
+	CapacityQuota bool           `json:"capacity_quota" binding:"required"`
+}
+
+type Requirements struct {
+	Attachment AttachmentKind `json:"attachment"`
+	UserXAttr  bool           `json:"user_xattr"`
+}
+
+// Control is bound to one immutable Configuration. All operations are mandatory.
+// Errors retain ownership; context cancellation does not prove mutation settlement.
+// Delete requires explicit Session deletion and confirmed compute stop by Core.
+type Control interface {
+	Declaration() Declaration
+	Check(context.Context) error
+	// Create retries and concurrent calls for the same immutable Reference converge
+	// on one object without overwriting its data, including after ErrUnconfirmed.
+	// A terminally deleted Reference must never be recreated.
+	Create(context.Context, Reference) (Attachment, error)
+	// Observe returns ErrNotFound for absence, which does not settle a mutation.
+	Observe(context.Context, Reference) (Attachment, error)
+	// Delete retries and concurrent calls for the same Reference converge on
+	// terminal deletion. Concurrent or late Create cannot resurrect the object.
+	Delete(context.Context, Reference) error
+}
+
+// Resolver validates ownership and adapter-native data before exposing a local
+// directory to compute. Core forwards bindings without constructing paths.
+type Resolver interface {
+	Resolve(context.Context, Binding) (Directory, error)
+}
+
+func canonicalUUID(value string) bool {
+	id, err := uuid.Parse(value)
+	return err == nil && id != uuid.Nil && id.String() == value
+}
+
+func (r Reference) Validate() error {
+	if !canonicalUUID(r.TenantID) || !canonicalUUID(r.EnvironmentID) || !canonicalUUID(r.ObjectID) {
+		return fmt.Errorf("%w: reference requires canonical nonzero UUIDs", ErrInvalid)
+	}
+	return nil
+}
+
+func (c Configuration) Validate() error {
+	if !canonicalUUID(c.ID) || c.Adapter == "" || strings.TrimSpace(c.Adapter) != c.Adapter || strings.ContainsAny(c.Adapter, "/\\\x00\r\n\t") {
+		return fmt.Errorf("%w: configuration identity or adapter", ErrInvalid)
+	}
+	if !jsonObject(c.Parameters) {
+		return fmt.Errorf("%w: configuration parameters must be a JSON object", ErrInvalid)
+	}
+	return nil
+}
+
+func (a Attachment) Validate() error {
+	if err := a.Reference.Validate(); err != nil {
+		return err
+	}
+	if !canonicalUUID(a.ConfigurationID) || a.Kind != AttachmentHostDirectory || !jsonObject(a.Native) {
+		return fmt.Errorf("%w: attachment envelope", ErrInvalid)
+	}
+	return nil
+}
+
+// ValidateAttachment checks the shared envelope only. It cannot establish native
+// ownership: the adapter must validate its parameters, receipt and owned resource.
+func ValidateAttachment(reference Reference, configuration Configuration, attachment Attachment) error {
+	if err := reference.Validate(); err != nil {
+		return err
+	}
+	if err := configuration.Validate(); err != nil {
+		return err
+	}
+	if err := attachment.Validate(); err != nil {
+		return err
+	}
+	if attachment.Reference != reference || attachment.ConfigurationID != configuration.ID {
+		return fmt.Errorf("%w: attachment reference or configuration", ErrOwnership)
+	}
+	return nil
+}
+
+func (b Binding) Validate() error {
+	return ValidateAttachment(b.Attachment.Reference, b.Configuration, b.Attachment)
+}
+
+func (d Directory) Validate() error {
+	if !filepath.IsAbs(d.Path) || strings.ContainsRune(d.Path, '\x00') || filepath.Clean(d.Path) != d.Path {
+		return fmt.Errorf("%w: resolved directory must be a clean absolute path", ErrInvalid)
+	}
+	return nil
+}
+
+// ValidateCombination runs before any allocation. Zero capacity requests no quota;
+// a positive request requires actual quota enforcement by the selected adapter.
+func ValidateCombination(requirements Requirements, declaration Declaration, requestedCapacityMiB uint32) error {
+	if requirements.Attachment != AttachmentHostDirectory || declaration.Attachment != AttachmentHostDirectory || requirements.Attachment != declaration.Attachment {
+		return fmt.Errorf("%w: attachment kind", ErrUnsupported)
+	}
+	if requirements.UserXAttr && !declaration.UserXAttr {
+		return fmt.Errorf("%w: user_xattr", ErrUnsupported)
+	}
+	if requestedCapacityMiB > 0 && !declaration.CapacityQuota {
+		return fmt.Errorf("%w: capacity quota is not enforced", ErrUnsupported)
+	}
+	return nil
+}
+
+func jsonObject(raw json.RawMessage) bool {
+	raw = bytes.TrimSpace(raw)
+	return len(raw) > 0 && raw[0] == '{' && json.Valid(raw)
+}
diff --git a/services/core/internal/workspacefs/workspacefs_test.go b/services/core/internal/workspacefs/workspacefs_test.go
new file mode 100644
index 000000000..0f107725a
--- /dev/null
+++ b/services/core/internal/workspacefs/workspacefs_test.go
@@ -0,0 +1,121 @@
+package workspacefs
+
+import (
+	"encoding/json"
+	"errors"
+	"strings"
+	"testing"
+)
+
+func testBinding() Binding {
+	reference := Reference{"11111111-1111-4111-8111-111111111111", "22222222-2222-4222-8222-222222222222", "33333333-3333-4333-8333-333333333333"}
+	configuration := Configuration{"44444444-4444-4444-8444-444444444444", "directory", json.RawMessage(`{"root":"/owned"}`)}
+	return Binding{configuration, Attachment{reference, configuration.ID, AttachmentHostDirectory, json.RawMessage(`{"object":"receipt"}`)}}
+}
+
+func TestBindingOwnership(t *testing.T) {
+	binding := testBinding()
+	if err := binding.Validate(); err != nil {
+		t.Fatal(err)
+	}
+	expected := binding.Attachment.Reference
+	other := "55555555-5555-4555-8555-555555555555"
+	for _, field := range []string{"tenant", "environment", "object", "configuration"} {
+		t.Run(field, func(t *testing.T) {
+			changed := binding
+			switch field {
+			case "tenant":
+				changed.Attachment.Reference.TenantID = other
+			case "environment":
+				changed.Attachment.Reference.EnvironmentID = other
+			case "object":
+				changed.Attachment.Reference.ObjectID = other
+			case "configuration":
+				changed.Attachment.ConfigurationID = other
+			}
+			if err := ValidateAttachment(expected, binding.Configuration, changed.Attachment); !errors.Is(err, ErrOwnership) {
+				t.Fatalf("expected ownership error, got %v", err)
+			}
+		})
+	}
+}
+
+func TestRejectInvalidEnvelopes(t *testing.T) {
+	for _, value := range []string{"", "00000000-0000-0000-0000-000000000000", "11111111111141118111111111111111", "../workspace", "AAAAAAAA-AAAA-4AAA-8AAA-AAAAAAAAAAAA"} {
+		binding := testBinding()
+		binding.Attachment.Reference.ObjectID = value
+		if err := binding.Validate(); !errors.Is(err, ErrInvalid) {
+			t.Fatalf("accepted object ID %q: %v", value, err)
+		}
+	}
+	for _, raw := range []string{"", "null", "[]", `"/host/path"`, `{"root":`, "{} {}"} {
+		t.Run(raw, func(t *testing.T) {
+			binding := testBinding()
+			binding.Configuration.Parameters = json.RawMessage(raw)
+			if err := binding.Validate(); !errors.Is(err, ErrInvalid) {
+				t.Fatalf("accepted parameters: %v", err)
+			}
+			binding = testBinding()
+			binding.Attachment.Native = json.RawMessage(raw)
+			if err := binding.Validate(); !errors.Is(err, ErrInvalid) {
+				t.Fatalf("accepted receipt: %v", err)
+			}
+		})
+	}
+	binding := testBinding()
+	binding.Configuration.Adapter = "directory/../../other"
+	if !errors.Is(binding.Validate(), ErrInvalid) {
+		t.Fatal("accepted adapter path")
+	}
+	binding = testBinding()
+	binding.Attachment.Kind = "public_host_path"
+	if !errors.Is(binding.Validate(), ErrInvalid) {
+		t.Fatal("accepted unknown attachment kind")
+	}
+}
+
+func TestValidateCombination(t *testing.T) {
+	required := Requirements{AttachmentHostDirectory, true}
+	supported := Declaration{AttachmentHostDirectory, true, true}
+	for _, tc := range []struct {
+		name        string
+		declaration Declaration
+		capacity    uint32
+		want        error
+	}{
+		{"supported", supported, 512, nil},
+		{"no quota requested", Declaration{AttachmentHostDirectory, true, false}, 0, nil},
+		{"unenforced quota", Declaration{AttachmentHostDirectory, true, false}, 512, ErrUnsupported},
+		{"missing xattrs", Declaration{AttachmentHostDirectory, false, true}, 0, ErrUnsupported},
+		{"missing attachment", Declaration{}, 0, ErrUnsupported},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			if err := ValidateCombination(required, tc.declaration, tc.capacity); !errors.Is(err, tc.want) {
+				t.Fatalf("got %v, want %v", err, tc.want)
+			}
+		})
+	}
+	if err := ValidateCombination(Requirements{Attachment: AttachmentHostDirectory}, Declaration{Attachment: AttachmentHostDirectory}, 0); err != nil {
+		t.Fatal(err)
+	}
+	if err := ValidateCombination(Requirements{Attachment: "unknown"}, supported, 0); !errors.Is(err, ErrUnsupported) {
+		t.Fatalf("unknown requirement: %v", err)
+	}
+}
+
+func TestDirectoryValidation(t *testing.T) {
+	for _, path := range []string{"", "relative", "/owned/../other", "/owned\x00/path"} {
+		if !errors.Is((Directory{path}).Validate(), ErrInvalid) {
+			t.Fatalf("accepted path %q", path)
+		}
+	}
+	if err := (Directory{"/owned/workspace"}).Validate(); err != nil {
+		t.Fatal(err)
+	}
+	// Noncanonical UUID encodings must not create alternate ownership keys.
+	binding := testBinding()
+	binding.Configuration.ID = strings.ReplaceAll(binding.Configuration.ID, "-", "")
+	if !errors.Is(binding.Validate(), ErrInvalid) {
+		t.Fatal("accepted compact configuration ID")
+	}
+}
diff --git a/services/core/internal/workspaces/execution.go b/services/core/internal/workspaces/execution.go
new file mode 100644
index 000000000..8c1634aed
--- /dev/null
+++ b/services/core/internal/workspaces/execution.go
@@ -0,0 +1,219 @@
+package workspaces
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	"github.com/MiniMax-AI/OpenAgentCore/internal/obs/log"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+)
+
+// Controls constructs the registered adapter for a retained configuration.
+type Controls interface {
+	Control(workspacefs.Configuration) (workspacefs.Control, error)
+	Normalize(workspacefs.Configuration) (workspacefs.Configuration, error)
+}
+type Ownership interface{ CheckOwnership(context.Context) error }
+
+// ExecutionOperations coordinates filesystem mutations under the execution lease.
+type ExecutionOperations struct {
+	storage   Storage
+	execution ExecutionStorage
+	controls  Controls
+	ownership Ownership
+}
+
+func NewExecution(storage Storage, execution ExecutionStorage, controls Controls, ownership Ownership) *ExecutionOperations {
+	return &ExecutionOperations{storage: storage, execution: execution, controls: controls, ownership: ownership}
+}
+
+func (e *ExecutionOperations) Declaration(ctx context.Context) (*workspacefs.Declaration, error) {
+	c, err := e.storage.ActiveConfiguration(ctx)
+	if errors.Is(err, ErrNotConfigured) {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	control, err := e.controls.Control(c)
+	if err != nil {
+		return nil, err
+	}
+	d := control.Declaration()
+	return &d, nil
+}
+
+func validate(record Record, tenant, environment string, requirements *workspacefs.Requirements, capacity uint32, control workspacefs.Control) error {
+	if record.Reference.TenantID != tenant || record.Reference.EnvironmentID != environment {
+		return workspacefs.ErrOwnership
+	}
+	if err := record.Reference.Validate(); err != nil {
+		return err
+	}
+	if requirements == nil {
+		return workspacefs.ErrUnsupported
+	}
+	return workspacefs.ValidateCombination(*requirements, control.Declaration(), capacity)
+}
+
+// Ensure persists the binding before creation and retries only filesystem Create,
+// whose protocol requires convergence. Compute reservation follows this operation.
+func (e *ExecutionOperations) Ensure(ctx context.Context, tenant, environment string, requirements *workspacefs.Requirements, capacity uint32) (*workspacefs.Binding, error) {
+	record, err := e.execution.Bind(ctx, tenant, environment)
+	if errors.Is(err, ErrNotConfigured) {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	control, err := e.controls.Control(record.Configuration)
+	if err != nil {
+		return nil, err
+	}
+	if err = validate(record, tenant, environment, requirements, capacity, control); err != nil {
+		return nil, err
+	}
+	if record.State == Ready {
+		return readyBinding(record)
+	}
+	if record.State != Creating {
+		return nil, ErrConflict
+	}
+	if err = e.ownership.CheckOwnership(ctx); err != nil {
+		return nil, err
+	}
+	attachment, err := control.Create(ctx, record.Reference)
+	if err != nil {
+		return nil, err
+	}
+	if err = workspacefs.ValidateAttachment(record.Reference, record.Configuration, attachment); err != nil {
+		return nil, err
+	}
+	if err = e.execution.MarkReady(ctx, record.Reference, attachment); err != nil {
+		return nil, err
+	}
+	record.Attachment = &attachment
+	return readyBinding(record)
+}
+
+func readyBinding(record Record) (*workspacefs.Binding, error) {
+	if record.Attachment == nil {
+		return nil, workspacefs.ErrOwnership
+	}
+	if err := workspacefs.ValidateAttachment(record.Reference, record.Configuration, *record.Attachment); err != nil {
+		return nil, err
+	}
+	return &workspacefs.Binding{Configuration: record.Configuration, Attachment: *record.Attachment}, nil
+}
+
+// GetReady never creates a filesystem or substitutes today's selected adapter.
+func (e *ExecutionOperations) GetReady(ctx context.Context, tenant, environment string, requirements *workspacefs.Requirements, capacity uint32) (*workspacefs.Binding, error) {
+	record, err := e.storage.Get(ctx, tenant, environment)
+	if errors.Is(err, ErrNotFound) {
+		// Existing compute without a retained binding owns its original workspace,
+		// even when the operator subsequently selects external storage.
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	if record.State != Ready {
+		return nil, ErrConflict
+	}
+	control, err := e.controls.Control(record.Configuration)
+	if err != nil {
+		return nil, err
+	}
+	if err = validate(record, tenant, environment, requirements, capacity, control); err != nil {
+		return nil, err
+	}
+	return readyBinding(record)
+}
+
+// DeleteBatch scans explicit deletion intent independently of compute inventory.
+// The store excludes every unreleased allocation and retains terminal identities.
+func (e *ExecutionOperations) DeleteBatch(ctx context.Context, cursor string) (string, error) {
+	if err := e.ownership.CheckOwnership(ctx); err != nil {
+		return cursor, err
+	}
+	rows, err := e.storage.DeletionCandidates(ctx, cursor)
+	if err != nil {
+		return cursor, err
+	}
+	if len(rows) == 0 {
+		return "", nil
+	}
+	for _, record := range rows {
+		if ctx.Err() != nil {
+			return cursor, ctx.Err()
+		}
+		operation, cancel := context.WithTimeout(ctx, 5*time.Second)
+		err = e.delete(operation, record)
+		cancel()
+		if err != nil {
+			if ownership := e.ownership.CheckOwnership(ctx); ownership != nil {
+				return cursor, ownership
+			}
+			log.Ctx(ctx).Warn("workspace deletion incomplete", "environment_id", record.Reference.EnvironmentID)
+		}
+		cursor = record.Reference.ObjectID
+	}
+	return cursor, nil
+}
+
+func (e *ExecutionOperations) delete(ctx context.Context, record Record) error {
+	if record.State == Deleted {
+		return nil
+	}
+	if record.State != Deleting {
+		if err := e.execution.BeginDelete(ctx, record.Reference); err != nil {
+			return err
+		}
+	}
+	control, err := e.controls.Control(record.Configuration)
+	if err != nil {
+		return err
+	}
+	if err = e.ownership.CheckOwnership(ctx); err != nil {
+		return err
+	}
+	if err = control.Delete(ctx, record.Reference); err != nil {
+		return err
+	}
+	return e.execution.MarkDeleted(ctx, record.Reference)
+}
+
+// Configuration reads the single operator-owned selection.
+func (e *ExecutionOperations) Configuration(ctx context.Context) (workspacefs.Configuration, error) {
+	return e.storage.ActiveConfiguration(ctx)
+}
+
+// Configure qualifies and publishes selection while the caller holds the shared
+// deployment mutation gate. Existing bindings keep their immutable configuration.
+func (e *ExecutionOperations) Configure(ctx context.Context, configuration workspacefs.Configuration, validate func(workspacefs.Declaration) error) (workspacefs.Configuration, error) {
+	canonical, err := e.controls.Normalize(configuration)
+	if err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	control, err := e.controls.Control(canonical)
+	if err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	if err = validate(control.Declaration()); err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	if err = e.ownership.CheckOwnership(ctx); err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	if err = control.Check(ctx); err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	if err = e.ownership.CheckOwnership(ctx); err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	if err = e.execution.SelectConfiguration(ctx, canonical); err != nil {
+		return workspacefs.Configuration{}, err
+	}
+	return canonical, nil
+}
diff --git a/services/core/internal/workspaces/execution_test.go b/services/core/internal/workspaces/execution_test.go
new file mode 100644
index 000000000..7a367f017
--- /dev/null
+++ b/services/core/internal/workspaces/execution_test.go
@@ -0,0 +1,232 @@
+package workspaces
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+	"github.com/google/uuid"
+)
+
+type memoryWorkspace struct {
+	active         workspacefs.Configuration
+	record         *Record
+	deletedSession bool
+	allocation     bool
+	expired        bool
+}
+
+func (s *memoryWorkspace) ActiveConfiguration(context.Context) (workspacefs.Configuration, error) {
+	if s.active.ID == "" {
+		return s.active, ErrNotConfigured
+	}
+	return s.active, nil
+}
+func (s *memoryWorkspace) SelectConfiguration(_ context.Context, c workspacefs.Configuration) error {
+	s.active = c
+	return nil
+}
+func (s *memoryWorkspace) Get(context.Context, string, string) (Record, error) {
+	if s.record == nil {
+		return Record{}, ErrNotFound
+	}
+	return *s.record, nil
+}
+func (s *memoryWorkspace) Bind(_ context.Context, tenant, environment string) (Record, error) {
+	if s.record != nil {
+		return *s.record, nil
+	}
+	if s.active.ID == "" {
+		return Record{}, ErrNotConfigured
+	}
+	s.record = &Record{Reference: workspacefs.Reference{TenantID: tenant, EnvironmentID: environment, ObjectID: uuid.NewString()}, Configuration: s.active, State: Creating}
+	return *s.record, nil
+}
+func (s *memoryWorkspace) MarkReady(_ context.Context, r workspacefs.Reference, a workspacefs.Attachment) error {
+	if s.deletedSession {
+		return ErrConflict
+	}
+	s.record.State = Ready
+	s.record.Attachment = &a
+	return nil
+}
+func (s *memoryWorkspace) BeginDelete(context.Context, workspacefs.Reference) error {
+	if !s.deletedSession || s.allocation {
+		return ErrConflict
+	}
+	s.record.State = Deleting
+	return nil
+}
+func (s *memoryWorkspace) MarkDeleted(context.Context, workspacefs.Reference) error {
+	s.record.State = Deleted
+	return nil
+}
+func (s *memoryWorkspace) DeletionCandidates(_ context.Context, cursor string) ([]Record, error) {
+	if s.record != nil && s.record.State != Deleted && (s.deletedSession || s.record.State == Deleting) && !s.allocation && s.record.Reference.ObjectID > cursor {
+		return []Record{*s.record}, nil
+	}
+	return nil, nil
+}
+
+type workspaceControl struct {
+	store                *memoryWorkspace
+	createErr, deleteErr error
+	creates, deletes     int
+	checks               int
+	checkErr             error
+}
+
+func (c *workspaceControl) Control(config workspacefs.Configuration) (workspacefs.Control, error) {
+	if c.store.record != nil && config.ID != c.store.record.Configuration.ID {
+		return nil, workspacefs.ErrOwnership
+	}
+	return c, nil
+}
+func (c *workspaceControl) Normalize(cn workspacefs.Configuration) (workspacefs.Configuration, error) {
+	return cn, nil
+}
+func (c *workspaceControl) Check(context.Context) error { c.checks++; return c.checkErr }
+func (c *workspaceControl) Declaration() workspacefs.Declaration {
+	return workspacefs.Declaration{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}
+}
+func (c *workspaceControl) Create(_ context.Context, r workspacefs.Reference) (workspacefs.Attachment, error) {
+	c.creates++
+	if c.store.record == nil || c.store.record.Reference != r {
+		panic("create before durable bind")
+	}
+	return workspacefs.Attachment{Reference: r, ConfigurationID: c.store.record.Configuration.ID, Kind: workspacefs.AttachmentHostDirectory, Native: []byte(`{}`)}, c.createErr
+}
+func (c *workspaceControl) Observe(ctx context.Context, r workspacefs.Reference) (workspacefs.Attachment, error) {
+	return c.Create(ctx, r)
+}
+func (c *workspaceControl) Delete(context.Context, workspacefs.Reference) error {
+	c.deletes++
+	return c.deleteErr
+}
+
+type workspaceLease struct{ err error }
+
+func (l *workspaceLease) CheckOwnership(context.Context) error { return l.err }
+func fixtureWorkspace() (*ExecutionOperations, *memoryWorkspace, *workspaceControl, *workspaceLease) {
+	s := &memoryWorkspace{active: workspacefs.Configuration{ID: uuid.NewString(), Adapter: "fixture", Parameters: []byte(`{}`)}}
+	c := &workspaceControl{store: s}
+	l := &workspaceLease{}
+	return NewExecution(s, s, c, l), s, c, l
+}
+
+var requiredWorkspace = workspacefs.Requirements{Attachment: workspacefs.AttachmentHostDirectory, UserXAttr: true}
+
+func TestEnsureConvergesOriginalBindingAcrossSelectionChange(t *testing.T) {
+	e, s, c, _ := fixtureWorkspace()
+	tenant, environment := uuid.NewString(), uuid.NewString()
+	c.createErr = workspacefs.ErrUnconfirmed
+	if _, err := e.Ensure(t.Context(), tenant, environment, &requiredWorkspace, 0); !errors.Is(err, workspacefs.ErrUnconfirmed) {
+		t.Fatal(err)
+	}
+	original := *s.record
+	s.active.ID = uuid.NewString()
+	c.createErr = nil
+	binding, err := e.Ensure(t.Context(), tenant, environment, &requiredWorkspace, 0)
+	if err != nil || binding.Configuration.ID != original.Configuration.ID || binding.Attachment.Reference != original.Reference || c.creates != 2 {
+		t.Fatalf("binding=%+v creates=%d err=%v", binding, c.creates, err)
+	}
+	if _, err = e.Ensure(t.Context(), tenant, environment, &requiredWorkspace, 0); err != nil || c.creates != 2 {
+		t.Fatal("ready binding recreated", err)
+	}
+}
+func TestWorkspaceDeletionRequiresExplicitIntentAndReleasedCompute(t *testing.T) {
+	e, s, c, _ := fixtureWorkspace()
+	_, err := e.Ensure(t.Context(), uuid.NewString(), uuid.NewString(), &requiredWorkspace, 0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	s.expired = true
+	if _, err = e.DeleteBatch(t.Context(), ""); err != nil || c.deletes != 0 {
+		t.Fatal("expiry deleted filesystem", err)
+	}
+	s.deletedSession = true
+	s.allocation = true
+	if _, err = e.DeleteBatch(t.Context(), ""); err != nil || c.deletes != 0 {
+		t.Fatal("live compute deleted filesystem", err)
+	}
+	s.allocation = false
+	c.deleteErr = workspacefs.ErrUnconfirmed
+	cursor, err := e.DeleteBatch(t.Context(), "")
+	if err != nil || s.record.State != Deleting || cursor != s.record.Reference.ObjectID {
+		t.Fatal("unknown deletion settled", err)
+	}
+	c.deleteErr = nil
+	if _, err = e.DeleteBatch(t.Context(), ""); err != nil || s.record.State != Deleted || s.record.Attachment == nil {
+		t.Fatal("terminal metadata missing", err)
+	}
+}
+func TestWorkspaceDeletionAfterUnconfirmedCreationWithoutAllocation(t *testing.T) {
+	e, s, c, _ := fixtureWorkspace()
+	c.createErr = workspacefs.ErrUnconfirmed
+	_, _ = e.Ensure(t.Context(), uuid.NewString(), uuid.NewString(), &requiredWorkspace, 0)
+	s.deletedSession = true
+	if _, err := e.DeleteBatch(t.Context(), ""); err != nil || s.record.State != Deleted {
+		t.Fatal("deleted Session creation did not converge", err)
+	}
+}
+func TestWorkspaceLeaseLossAndResumeNeverCreate(t *testing.T) {
+	e, s, c, l := fixtureWorkspace()
+	tenant, environment := uuid.NewString(), uuid.NewString()
+	if _, err := e.GetReady(t.Context(), tenant, environment, &requiredWorkspace, 0); err != nil || c.creates != 0 {
+		t.Fatal("resume created workspace", err)
+	}
+	l.err = errors.New("lease lost")
+	if _, err := e.Ensure(t.Context(), tenant, environment, &requiredWorkspace, 0); !errors.Is(err, l.err) || c.creates != 0 {
+		t.Fatal("unfenced create", err)
+	}
+	l.err = nil
+	s.record.State = Deleted
+	if _, err := e.Ensure(t.Context(), tenant, environment, &requiredWorkspace, 0); !errors.Is(err, ErrConflict) || c.creates != 0 {
+		t.Fatal("recreated deleted identity", err)
+	}
+}
+
+func TestGetReadyRetainsOriginalSelectionAndValidatesCapacity(t *testing.T) {
+	e, s, c, _ := fixtureWorkspace()
+	tenant, environment := uuid.NewString(), uuid.NewString()
+	if _, err := e.Ensure(t.Context(), tenant, environment, &requiredWorkspace, 1024); !errors.Is(err, workspacefs.ErrUnsupported) || c.creates != 0 {
+		t.Fatal("unsupported quota created filesystem", err)
+	}
+	binding, err := e.Ensure(t.Context(), tenant, environment, &requiredWorkspace, 0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	s.active.ID = uuid.NewString()
+	resumed, err := e.GetReady(t.Context(), tenant, environment, &requiredWorkspace, 0)
+	if err != nil || resumed.Configuration.ID != binding.Configuration.ID || resumed.Attachment.Reference != binding.Attachment.Reference || c.creates != 1 {
+		t.Fatal("resume changed binding", err)
+	}
+	if _, err = e.GetReady(t.Context(), uuid.NewString(), environment, &requiredWorkspace, 0); !errors.Is(err, workspacefs.ErrOwnership) {
+		t.Fatal("foreign binding accepted", err)
+	}
+}
+
+func TestConfigureChecksBeforeLeaseFencedSelection(t *testing.T) {
+	e, s, c, l := fixtureWorkspace()
+	previous := s.active.ID
+	next := s.active
+	next.ID = uuid.NewString()
+	if _, err := e.Configure(t.Context(), next, func(workspacefs.Declaration) error { return workspacefs.ErrUnsupported }); !errors.Is(err, workspacefs.ErrUnsupported) || s.active.ID != previous || c.checks != 0 {
+		t.Fatal("unsupported selection reached native check", err)
+	}
+	c.checkErr = workspacefs.ErrUnavailable
+	if _, err := e.Configure(t.Context(), next, func(workspacefs.Declaration) error { return nil }); !errors.Is(err, workspacefs.ErrUnavailable) || s.active.ID != previous {
+		t.Fatal("failed native check published selection", err)
+	}
+	c.checkErr = nil
+	l.err = errors.New("lease lost")
+	if _, err := e.Configure(t.Context(), next, func(workspacefs.Declaration) error { return nil }); !errors.Is(err, l.err) || s.active.ID != previous {
+		t.Fatal("lost lease published selection", err)
+	}
+	l.err = nil
+	got, err := e.Configure(t.Context(), next, func(workspacefs.Declaration) error { return nil })
+	if err != nil || got.ID != next.ID || s.active.ID != next.ID {
+		t.Fatal("unconfigured Sandbox blocked filesystem selection", err)
+	}
+}
diff --git a/services/core/internal/workspaces/storage.go b/services/core/internal/workspaces/storage.go
new file mode 100644
index 000000000..bfe877b1d
--- /dev/null
+++ b/services/core/internal/workspaces/storage.go
@@ -0,0 +1,32 @@
+package workspaces
+
+import (
+	"context"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+)
+
+// Storage reads configurations and ownership; it grants no execution authority.
+type Storage interface {
+	ActiveConfiguration(context.Context) (workspacefs.Configuration, error)
+	Get(context.Context, string, string) (Record, error)
+	// DeletionCandidates includes explicitly deleted Sessions even when no
+	// compute allocation was ever made, and resumes committed deletion intent.
+	// Unreleased compute ownership excludes a workspace from this list.
+	DeletionCandidates(context.Context, string) ([]Record, error)
+}
+
+// ExecutionStorage writes only through the existing execution lease. Session
+// locking serializes admission and ready publication against public deletion.
+type ExecutionStorage interface {
+	// SelectConfiguration commits the selection with administrator audit on
+	// the execution lease, retaining immutable previous configurations.
+	SelectConfiguration(context.Context, workspacefs.Configuration) error
+	// Bind commits an identity and the selected configuration before external
+	// creation. Retries return that same binding across configuration changes.
+	Bind(context.Context, string, string) (Record, error)
+	MarkReady(context.Context, workspacefs.Reference, workspacefs.Attachment) error
+	// BeginDelete requires an explicitly deleted Session and released compute.
+	BeginDelete(context.Context, workspacefs.Reference) error
+	MarkDeleted(context.Context, workspacefs.Reference) error
+}
diff --git a/services/core/internal/workspaces/types.go b/services/core/internal/workspaces/types.go
new file mode 100644
index 000000000..d952e7e59
--- /dev/null
+++ b/services/core/internal/workspaces/types.go
@@ -0,0 +1,33 @@
+// Package workspaces owns durable Environment filesystem identities. The
+// workspacefs protocol owns adapter configuration and attachment validation.
+package workspaces
+
+import (
+	"errors"
+
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
+)
+
+var (
+	ErrNotFound      = errors.New("workspace not found")
+	ErrConflict      = errors.New("workspace ownership or lifecycle conflict")
+	ErrNotConfigured = errors.New("workspace filesystem is not configured")
+)
+
+type State string
+
+const (
+	Creating State = "creating"
+	Ready    State = "ready"
+	Deleting State = "deleting"
+	Deleted  State = "deleted"
+)
+
+// Record retains its reference and immutable configuration after deletion so
+// late creation receipts cannot reintroduce a deleted workspace.
+type Record struct {
+	Reference     workspacefs.Reference
+	Configuration workspacefs.Configuration
+	State         State
+	Attachment    *workspacefs.Attachment
+}
diff --git a/services/core/migrations/000097_workspace_storage.sql b/services/core/migrations/000097_workspace_storage.sql
new file mode 100644
index 000000000..99cc822a1
--- /dev/null
+++ b/services/core/migrations/000097_workspace_storage.sql
@@ -0,0 +1,56 @@
+-- +goose Up
+CREATE TABLE workspace_fs_configurations (
+    id uuid PRIMARY KEY,
+    adapter text NOT NULL CHECK (adapter <> ''),
+    parameters jsonb NOT NULL CHECK (jsonb_typeof(parameters) = 'object'),
+    active boolean NOT NULL DEFAULT false
+);
+CREATE UNIQUE INDEX workspace_fs_active_idx ON workspace_fs_configurations (active) WHERE active;
+
+-- +goose StatementBegin
+CREATE FUNCTION immutable_workspace_configuration() RETURNS trigger LANGUAGE plpgsql AS $$
+BEGIN
+    IF (NEW.id, NEW.adapter, NEW.parameters) IS DISTINCT FROM (OLD.id, OLD.adapter, OLD.parameters) THEN
+        RAISE EXCEPTION 'Workspace filesystem configuration is immutable';
+    END IF;
+    RETURN NEW;
+END $$;
+-- +goose StatementEnd
+CREATE TRIGGER immutable_workspace_configuration BEFORE UPDATE ON workspace_fs_configurations
+FOR EACH ROW EXECUTE FUNCTION immutable_workspace_configuration();
+
+CREATE TABLE environment_workspaces (
+    object_id uuid PRIMARY KEY,
+    environment_id uuid NOT NULL UNIQUE REFERENCES environments(id),
+    configuration_id uuid NOT NULL REFERENCES workspace_fs_configurations(id),
+    state text NOT NULL DEFAULT 'creating' CHECK (state IN ('creating', 'ready', 'deleting', 'deleted')),
+    attachment jsonb CHECK (attachment IS NULL OR jsonb_typeof(attachment) = 'object'),
+    CHECK (state <> 'ready' OR attachment IS NOT NULL)
+);
+
+-- +goose StatementBegin
+CREATE FUNCTION immutable_workspace_identity() RETURNS trigger LANGUAGE plpgsql AS $$
+BEGIN
+    IF (NEW.object_id, NEW.environment_id, NEW.configuration_id) IS DISTINCT FROM (OLD.object_id, OLD.environment_id, OLD.configuration_id) THEN
+        RAISE EXCEPTION 'Environment workspace identity is immutable';
+    END IF;
+    RETURN NEW;
+END $$;
+-- +goose StatementEnd
+CREATE TRIGGER immutable_workspace_identity BEFORE UPDATE ON environment_workspaces
+FOR EACH ROW EXECUTE FUNCTION immutable_workspace_identity();
+
+-- +goose Down
+LOCK TABLE environment_workspaces, workspace_fs_configurations IN ACCESS EXCLUSIVE MODE;
+-- +goose StatementBegin
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM environment_workspaces) THEN
+        RAISE EXCEPTION 'Cannot discard durable workspace ownership, including deleted identities';
+    END IF;
+END $$;
+-- +goose StatementEnd
+DROP TABLE environment_workspaces;
+DROP TABLE workspace_fs_configurations;
+DROP FUNCTION immutable_workspace_identity();
+DROP FUNCTION immutable_workspace_configuration();
diff --git a/services/core/tests/integration/public_handler_fixture_test.go b/services/core/tests/integration/public_handler_fixture_test.go
index 008544e7b..78104622a 100644
--- a/services/core/tests/integration/public_handler_fixture_test.go
+++ b/services/core/tests/integration/public_handler_fixture_test.go
@@ -28,6 +28,7 @@ import (
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sessions"
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/skills"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/workspacefs"
 )
 
 // testExecutorURL is the daemon URL self-hosted Sessions report unless a test
@@ -96,7 +97,7 @@ func publicHandler(t testing.TB, s *Store, keys fixtureKeyResolver, engine strin
 		Artifacts:       service,
 		ArtifactsReader: sessionStore,
 		SessionAdmin:    sessionStore, Environments: service, EnvironmentsReader: sessionStore, Admin: sessionStore, AdminAudit: audit, WriteAudit: audit,
-		ExecutorConnections: strict, Metrics: strict, RuntimeObservations: strict, RuntimeHistory: strict,
+		ExecutorConnections: strict, Metrics: strict, RuntimeObservations: strict, RuntimeHistory: strict, WorkspaceStorage: strict,
 		Execution: api.Execution{ExecutorURL: testExecutorURL, SessionAdmission: service, InputAdmission: service, SessionArchive: strict, Workspaces: strict},
 		Sandboxes: api.Sandboxes{Deployment: deployments, NodeAllocations: deploymentStore(s), DeploymentChanges: strict, DeploymentReset: strict, ConfigurationDiscovery: strict},
 	}
@@ -275,3 +276,12 @@ func (s strictStandIn) CancelSandboxReset(context.Context, uint64) (deployment.V
 	s.unexpected("CancelSandboxReset")
 	return deployment.View{}, nil
 }
+
+func (s strictStandIn) Configuration(context.Context) (workspacefs.Configuration, error) {
+	s.unexpected("WorkspaceStorage.Configuration")
+	return workspacefs.Configuration{}, nil
+}
+func (s strictStandIn) Configure(context.Context, workspacefs.Configuration) (workspacefs.Configuration, error) {
+	s.unexpected("WorkspaceStorage.Configure")
+	return workspacefs.Configuration{}, nil
+}
diff --git a/services/core/tools/e2b-provider/helper_contract_generated.py b/services/core/tools/e2b-provider/helper_contract_generated.py
index 04d6c13b3..77d1869fd 100644
--- a/services/core/tools/e2b-provider/helper_contract_generated.py
+++ b/services/core/tools/e2b-provider/helper_contract_generated.py
@@ -1,7 +1,8 @@
 # Code generated by contractgen; DO NOT EDIT.
 """Adapter-private wire declarations. No SDK or repository dependency."""
 ERROR_CODES = ["","invalid","ownership","exists","not_found","command_unconfirmed","unconfirmed","template_invalid","team_mismatch","unauthorized"]
-MANAGED_BOOTSTRAP_FIELDS = ["TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","NetworkAccess","AllowedDomains","InstallationID","RuntimeBootstrap"]
+MANAGED_BOOTSTRAP_FIELDS = ["Workspace","TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","NetworkAccess","AllowedDomains","InstallationID","RuntimeBootstrap"]
+MANAGED_BOOTSTRAP_REQUIRED_FIELDS = ["TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","NetworkAccess","AllowedDomains","InstallationID","RuntimeBootstrap"]
 MANAGED_IDENTITY_FIELDS = ["TenantID","EnvironmentID","AllocationID","SessionID","DeviceID","InstallationID"]
 MAX_COMMAND_INPUT = 52428832
 MAX_CREDENTIAL_REFERENCES = 32
diff --git a/services/core/tools/e2b-provider/provider.py b/services/core/tools/e2b-provider/provider.py
index 9b2fcafe7..76557b500 100644
--- a/services/core/tools/e2b-provider/provider.py
+++ b/services/core/tools/e2b-provider/provider.py
@@ -14,7 +14,7 @@
 from sdk import connection_material, definitely_rejected, list_builds, list_templates, read_metrics, restore, run, sdk_options, validate_deployment, verify_team_template
 from state import Failure, Receipt, private_root, read_receipt
 from helper_contract_generated import (PROTOCOL_VERSION, OPERATIONS, REQUEST_FIELDS, REFERENCE_FIELDS,
-    MAX_CREDENTIAL_REFERENCES, MANAGED_BOOTSTRAP_FIELDS)
+    MAX_CREDENTIAL_REFERENCES, MANAGED_BOOTSTRAP_FIELDS, MANAGED_BOOTSTRAP_REQUIRED_FIELDS)
 
 PREFIX = 'oac_'
 FIELDS = ('InstallationID', *REFERENCE_FIELDS)
@@ -88,6 +88,9 @@ def __init__(self, request):
                 (request['Operation'] not in ('list_templates', 'list_builds') and
                  not valid_id(self.config.get('InstallationID')))):
             raise Failure('invalid')
+        bootstrap = request.get('Bootstrap')
+        if bootstrap is not None and (not isinstance(bootstrap, dict) or bootstrap.get('Workspace') is not None):
+            raise Failure('invalid')
         deadline = datetime.fromisoformat(request['Deadline'].replace('Z', '+00:00'))
         self.deadline = time.monotonic() + (deadline - datetime.now(timezone.utc)).total_seconds()
         self.metadata = {PREFIX + field.lower(): value for field, value in
@@ -239,7 +242,8 @@ def create(self):
         payload = dict(bootstrap, InstallationID=self.config['InstallationID'],
                        RuntimeBootstrap=self.q['RuntimeBootstrap'])
         del payload['CoreURL'], payload['Credential']
-        if set(payload) != set(MANAGED_BOOTSTRAP_FIELDS):
+        if (set(payload) - set(MANAGED_BOOTSTRAP_FIELDS) or
+                not set(MANAGED_BOOTSTRAP_REQUIRED_FIELDS) <= set(payload)):
             raise Failure('invalid')
         cloud.files.write('/root/.oac/e2b/managed-bootstrap.json', json.dumps(payload),
                           user='root', request_timeout=self.remaining())
diff --git a/services/core/tools/e2b-provider/testdata/contract.json b/services/core/tools/e2b-provider/testdata/contract.json
index 0e2c8e8c6..80d09bf84 100644
--- a/services/core/tools/e2b-provider/testdata/contract.json
+++ b/services/core/tools/e2b-provider/testdata/contract.json
@@ -19,6 +19,8 @@
 {"kind":"managed","name":"missing-SessionID","payload":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","InstallationID":"66666666-6666-4666-8666-666666666666","NetworkAccess":"enabled","RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"TenantID":"11111111-1111-4111-8111-111111111111"},"valid":false},
 {"kind":"managed","name":"missing-TenantID","payload":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","InstallationID":"66666666-6666-4666-8666-666666666666","NetworkAccess":"enabled","RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"SessionID":"44444444-4444-4444-8444-444444444444"},"valid":false},
 {"kind":"managed","name":"restricted","payload":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":["example.com"],"DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","InstallationID":"66666666-6666-4666-8666-666666666666","NetworkAccess":"restricted","RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"valid":true},
+{"kind":"managed","name":"workspace-\u003cnil\u003e","payload":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","InstallationID":"66666666-6666-4666-8666-666666666666","NetworkAccess":"enabled","RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111","Workspace":null},"valid":true},
+{"kind":"managed","name":"workspace-map[]","payload":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","InstallationID":"66666666-6666-4666-8666-666666666666","NetworkAccess":"enabled","RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111","Workspace":{}},"valid":false},
 {"kind":"request","name":"command","payload":{"Version":1,"Operation":"command","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
 {"kind":"request","name":"config-null","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":null,"Deadline":"2099-01-01T00:00:00Z","Operation":"create","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
 {"kind":"request","name":"create","payload":{"Version":1,"Operation":"create","Config":{"Binary":"","StateDir":"","InstallationID":"66666666-6666-4666-8666-666666666666","APIKey":"","Template":"","APIURL":"","Domain":"","TimeoutSeconds":0,"Resources":null},"Reference":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333"},"Bootstrap":{"TenantID":"11111111-1111-4111-8111-111111111111","EnvironmentID":"22222222-2222-4222-8222-222222222222","AllocationID":"33333333-3333-4333-8333-333333333333","SessionID":"44444444-4444-4444-8444-444444444444","DeviceID":"55555555-5555-4555-8555-555555555555","CoreURL":"https://core.example/api/v1","Credential":"fixture-only","NetworkAccess":"enabled","AllowedDomains":null},"RuntimeBootstrap":{"version":1,"core_url":"https://core.example/api/v1","device_id":"55555555-5555-4555-8555-555555555555","credential":"fixture-only"},"Deadline":"2099-01-01T00:00:00Z"},"valid":true},
@@ -45,6 +47,8 @@
 {"kind":"request","name":"version-null","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"create","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":null},"valid":false},
 {"kind":"request","name":"version-string","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"create","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":"1"},"valid":false},
 {"kind":"request","name":"version-unknown","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111"},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"create","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":2},"valid":false},
+{"kind":"request","name":"workspace-\u003cnil\u003e","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111","Workspace":null},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"create","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":true},
+{"kind":"request","name":"workspace-map[]","payload":{"Bootstrap":{"AllocationID":"33333333-3333-4333-8333-333333333333","AllowedDomains":null,"CoreURL":"https://core.example/api/v1","Credential":"fixture-only","DeviceID":"55555555-5555-4555-8555-555555555555","EnvironmentID":"22222222-2222-4222-8222-222222222222","NetworkAccess":"enabled","SessionID":"44444444-4444-4444-8444-444444444444","TenantID":"11111111-1111-4111-8111-111111111111","Workspace":{}},"Config":{"APIKey":"","APIURL":"","Binary":"","Domain":"","InstallationID":"66666666-6666-4666-8666-666666666666","Resources":null,"StateDir":"","Template":"","TimeoutSeconds":0},"Deadline":"2099-01-01T00:00:00Z","Operation":"create","Reference":{"AllocationID":"33333333-3333-4333-8333-333333333333","EnvironmentID":"22222222-2222-4222-8222-222222222222","TenantID":"11111111-1111-4111-8111-111111111111"},"RuntimeBootstrap":{"core_url":"https://core.example/api/v1","credential":"fixture-only","device_id":"55555555-5555-4555-8555-555555555555","version":1},"Version":1},"valid":false},
 {"kind":"response","name":"error-","payload":{"Version":1,"ErrorCode":""},"valid":true},
 {"kind":"response","name":"error-command_unconfirmed","payload":{"Version":1,"ErrorCode":"command_unconfirmed"},"valid":true},
 {"kind":"response","name":"error-exists","payload":{"Version":1,"ErrorCode":"exists"},"valid":true},
diff --git a/services/core/tools/microsandbox-provider/README.md b/services/core/tools/microsandbox-provider/README.md
index 7235c8274..ac7e22c2c 100644
--- a/services/core/tools/microsandbox-provider/README.md
+++ b/services/core/tools/microsandbox-provider/README.md
@@ -1,6 +1,6 @@
 # microsandbox Sandbox Provider helper
 
-microsandbox runs each hosted Session in its own microVM on a Linux amd64 node with KVM, and it is the Sandbox Provider that supports idle suspension. Core forwards provider operations to the node over the [node protocol](../../../../contracts/agents-api/node-generation-protocol.md); the node's adapter ([`sandbox/microsandbox`](../../internal/sandbox/microsandbox)) runs this helper once per operation. The helper links the microsandbox Go SDK v0.7.2 with its FFI library, so Core and the node program stay CGO-free Go binaries. It implements the checkpoint operations of the provider-neutral `sandbox.SandboxProvider` with full snapshots. It has no daemon, lifecycle database, scheduler or network control plane.
+microsandbox runs each hosted Session in its own microVM on a Linux amd64 node with KVM, and it is the Sandbox Provider that supports idle suspension. Core forwards provider operations to the node over the [node protocol](../../../../contracts/agents-api/node-generation-protocol.md); the node's adapter ([`sandbox/microsandbox`](../../internal/sandbox/microsandbox)) runs this helper once per operation. The private helper wire version is 4; mismatches are rejected. The helper links the microsandbox Go SDK v0.7.2 with its FFI library, so Core and the node program stay CGO-free Go binaries. It implements the checkpoint operations of the provider-neutral `sandbox.SandboxProvider` with full snapshots. It has no daemon, lifecycle database, scheduler or network control plane.
 
 [Add a Sandbox Provider](../../../../docs/sandbox-provider.md) owns the provider contract. [Sandbox deployment](../../../../contracts/agents-api/sandbox-deployment.md) owns the resources, Runtime release and suspension policy; the [nodes guide](../../../../docs/getting-started/nodes.md) owns node installation, host requirements, the node's directories and its network policy.
 
@@ -16,13 +16,13 @@ The Runtime image is an immutable `repository@sha256:<64 lowercase hex>` referen
 
 ## Create and bootstrap
 
-Create names the VM from a hash of the installation and allocation reference plus the compute generation; a name never serves another incarnation. It creates the VM with the saved CPUs and memory as both initial and maximum, a managed root disk of `root_disk_mib`, an owned ext4 disk of `environment_disk_mib` mounted at `/environment`, user 1000:1000, working directory `/` and the node's network policy ([`bootstrap.go`](bootstrap.go)). The resource checks run before bootstrap.
+Create names the VM from a hash of the installation and allocation reference plus the compute generation; a name never serves another incarnation. It creates the VM with the saved CPUs and memory as both initial and maximum, a managed root disk of `root_disk_mib`, an owned ext4 disk of `environment_disk_mib` or the explicitly resolved external directory mounted at `/environment`, user 1000:1000, working directory `/` and the node's network policy ([`bootstrap.go`](bootstrap.go)). The resource checks run before bootstrap.
 
-Workspace, staging and outputs share the `/environment` filesystem, which keeps the Runtime's cross-device and link checks intact; the layered root filesystem can report different device IDs for a directory and its upper-layer files, so it holds no workspace data. Full snapshots and sandbox removal capture, restore and reclaim this disk; there is no host path, external mount or separate storage lifecycle.
+Workspace, staging and outputs share the `/environment` filesystem, which keeps the Runtime's cross-device and link checks intact; the layered root filesystem can report different device IDs for a directory and its upper-layer files, so it holds no workspace data. In owned mode, full snapshots and sandbox removal capture, restore and reclaim this disk. In external mode, the filesystem provider owns the directory; sandbox removal never deletes it. The binding and resource rules belong to [Independent workspace attachment](../../../../docs/sandbox-provider.md#independent-workspace-attachment). Private HOME and history remain in the checkpointed root.
 
 VM creation does not run the image's entry point. The bootstrap runs as root through confidential standard input, with a two-minute limit. It creates the Runtime directories and the private control directory `/run/oac` (mode 0700, owned by UID 1000), writes the [Runtime bootstrap](../../../../docs/runtime-bootstrap.md) file to `/home/runtime/runtime-bootstrap.json`, bind-mounts `/environment/workspace` at `/workspace` and starts `oac-daemon connect --bootstrap-file` in the background as UID/GID 1000. `OAC_RUNTIME_DAEMON_SUSPEND_PID_FILE=/run/oac/daemon-suspend.json` enables the daemon's park and wake control. The `io.oac.bootstrap` label then changes from `pending` to `complete` through the SDK's next-start modification policy, because v0.7.2 cannot update the labels of a running VM. That label confirms only these writes and the launch, not authentication or native readiness.
 
-A helper response carries `CreateSettled` with a configuration rejection only after native Create has completed, the first inspection has verified the exact compute ID and ownership, and the resource check has rejected the VM before bootstrap started. The adapter keeps the original error and validates the compute identity before passing the proof to Core. Ordinary inspection, uncertain Create outcomes, timeouts and ownership failures never produce it, and missing compute alone never proves that Create settled.
+A helper response carries `CreateSettled` with a configuration rejection only after native Create has completed, the first inspection has verified the exact compute ID and ownership, and the resource check has rejected the VM before bootstrap started. The adapter keeps the original error and validates the compute identity before passing the proof to Core. The private `initial_info` operation used by `GetInfo` and `Renew` can also return an exact initial `State` with `Status="absent"`, no native ID and `CreateSettled=true`, after typed native absence and durable closure of initial Create admission under the allocation lock. It accepts only generation zero without restored ancestry or a native ID. The adapter validates the complete receipt and returns absence without an error. Ordinary `inspect` used by `GetCompute`, uncertain Create outcomes, timeouts and ownership failures never produce this receipt; missing compute alone is not settlement.
 
 ## Checkpoint lifecycle
 
@@ -44,6 +44,8 @@ GetCompute, commands, cleanup and the next suspension verify restored provenance
 
 A helper holds a per-allocation lock, under `oac-locks/` in the runtime home, until its SDK call actually settles. Core's response deadline neither kills the helper nor cancels its FFI wait, because cancelling the wait does not prove that the native mutation stopped. On a timeout Core keeps an unknown operation and observes it; a later helper cannot pass the surviving lock holder. A stuck owner needs operator investigation, not lock deletion or another Create.
 
+The same lock file fences a Create helper that has not yet acquired its lock, including across a node restart. An empty file permits initial Create admission; `closed\n` permanently forbids it, and any other nonempty content fails closed. Only `initial_info` observing typed native absence writes this marker while holding the lock, then synchronizes the file and its directories before returning the receipt. Every Create checks the marker under the same lock before invoking the SDK. Read, write or synchronization errors never establish settlement. The marker is never removed, and neither missing compute nor this receipt permits retrying Create.
+
 `RunCommand` and `RunCommandCompute` pass standard input on an anonymous pipe, run as UID 1000 with a deadline and a 1 MiB limit per output stream, and return a result only after the input is fully written and the guest reports its exit. Timeouts, output overflow and missing receipts return `ErrCommandUnconfirmed`; closing an SDK exec handle does not prove that the guest process exited ([`command.go`](command.go)). Core uses `RunCommandCompute` only to run the exact wake command it authorizes:
 
 ```sh
diff --git a/services/core/tools/microsandbox-provider/backend.go b/services/core/tools/microsandbox-provider/backend.go
index 00b078d2a..a9e6d9d55 100644
--- a/services/core/tools/microsandbox-provider/backend.go
+++ b/services/core/tools/microsandbox-provider/backend.go
@@ -19,7 +19,7 @@ func (b backend) run(ctx context.Context) (wire.Response, error) {
 	switch b.q.Operation {
 	case "create":
 		return b.create(ctx)
-	case "inspect":
+	case "inspect", "initial_info":
 		_, s, e := b.inspect(ctx, b.q.Compute)
 		return wire.Response{State: &s}, e
 	case "metrics":
diff --git a/services/core/tools/microsandbox-provider/bootstrap.go b/services/core/tools/microsandbox-provider/bootstrap.go
index ad1af890a..d1753e4f4 100644
--- a/services/core/tools/microsandbox-provider/bootstrap.go
+++ b/services/core/tools/microsandbox-provider/bootstrap.go
@@ -50,14 +50,21 @@ func (b backend) create(ctx context.Context) (wire.Response, error) {
 	domains, _ := json.Marshal(policy.Hosts())
 	labels := wire.Labels(b.q.Config, b.q.Reference)
 	labels[bootstrapLabel] = "pending"
+	for key, value := range workspaceLabels(b.q.Workspace) {
+		labels[key] = value
+	}
+	mount := sdk.Mount.Owned(sdk.OwnedVolumeOptions{Kind: sdk.VolumeKindDisk, SizeMiB: b.q.Config.EnvironmentDiskMiB})
+	if b.q.Workspace != nil {
+		mount = sdk.Mount.Bind(b.q.Workspace.Path, sdk.MountOptions{})
+	}
 	live, e := sdk.CreateSandbox(ctx, c.Name,
 		sdk.WithImage(b.q.Config.Image), sdk.WithMemory(b.q.Config.MemoryMiB), sdk.WithCPUs(b.q.Config.CPUs),
 		sdk.WithMaxMemory(b.q.Config.MemoryMiB), sdk.WithMaxCPUs(b.q.Config.CPUs),
 		sdk.WithRootDisk(sdk.RootDisk.Managed(b.q.Config.RootDiskMiB)), sdk.WithUser("1000:1000"),
-		// A native owned disk keeps workspace and staging on one filesystem.
+		// The selected Environment mount keeps workspace and staging on one filesystem.
 		// Bootstrap creates their directories before starting the daemon.
 		sdk.WithWorkdir("/"), sdk.WithMounts(map[string]sdk.MountConfig{
-			"/environment": sdk.Mount.Owned(sdk.OwnedVolumeOptions{Kind: sdk.VolumeKindDisk, SizeMiB: b.q.Config.EnvironmentDiskMiB}),
+			"/environment": mount,
 		}),
 		sdk.WithLabels(labels), sdk.WithDetached(), sdk.WithQuietLogs(), sdk.WithNetwork(b.network()),
 		sdk.WithEnv(map[string]string{
@@ -79,6 +86,13 @@ func (b backend) create(ctx context.Context) (wire.Response, error) {
 	if e != nil {
 		return qualified, e
 	}
+	var actual struct {
+		Labels map[string]string `json:"labels"`
+	}
+	if json.Unmarshal([]byte(h.ConfigJSON()), &actual) != nil || qualifyWorkspace(actual.Labels, b.q.Workspace) != nil || (b.q.Workspace != nil && actual.Labels[workspacePathLabel] != b.q.Workspace.Path) {
+		qualified.CreateSettled = true
+		return qualified, sandbox.ErrInvalid
+	}
 	data, e := bootstrap.RuntimeConnection().Marshal()
 	if e != nil {
 		return wire.Response{}, e
diff --git a/services/core/tools/microsandbox-provider/creation_settlement_test.go b/services/core/tools/microsandbox-provider/creation_settlement_test.go
index 492daf304..6242bbab6 100644
--- a/services/core/tools/microsandbox-provider/creation_settlement_test.go
+++ b/services/core/tools/microsandbox-provider/creation_settlement_test.go
@@ -18,6 +18,7 @@ func TestCreatedConfigurationRejectionRequiresExactOwnedCompute(t *testing.T) {
 			ref := sandbox.Reference{TenantID: "tenant", EnvironmentID: "environment", AllocationID: "allocation"}
 			created := wire.Compute{Name: wire.Name(config, ref, 0), ID: "local:created"}
 			labels := wire.Labels(config, ref)
+			labels[workspaceModeLabel] = "owned"
 			labels[bootstrapLabel] = "pending"
 			actual["labels"] = labels
 			actualID, status := created.ID, "running"
diff --git a/services/core/tools/microsandbox-provider/deployment.go b/services/core/tools/microsandbox-provider/deployment.go
index 4149539b1..c950588aa 100644
--- a/services/core/tools/microsandbox-provider/deployment.go
+++ b/services/core/tools/microsandbox-provider/deployment.go
@@ -6,26 +6,33 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
+	"github.com/google/uuid"
+	"path/filepath"
 
 	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	wire "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/microsandbox"
 	sdk "github.com/superradcompany/microsandbox/sdk/go"
 )
 
+const workspaceModeLabel = "io.oac.workspace-mode"
+const workspaceObjectLabel = "io.oac.workspace-object"
+const workspacePathLabel = "io.oac.workspace-path"
+
 const resourceProofLabel = "io.oac.resource-proof"
 
 func resourceProof(config wire.Config) string {
 	raw, _ := json.Marshal(struct {
-		Image     string
-		Resources sandbox.Resources
-	}{config.Image, sandbox.Resources{CPUs: uint32(config.CPUs), MemoryMiB: config.MemoryMiB,
+		ExternalWorkspace bool
+		Image             string
+		Resources         sandbox.Resources
+	}{config.ExternalWorkspace, config.Image, sandbox.Resources{CPUs: uint32(config.CPUs), MemoryMiB: config.MemoryMiB,
 		RootDiskMiB: config.RootDiskMiB, EnvironmentDiskMiB: config.EnvironmentDiskMiB}})
 	digest := sha256.Sum256(raw)
 	return hex.EncodeToString(digest[:])
 }
 
 // The SDK decodes native CPU/memory/rootfs configuration. Its v0.7.2 projection
-// omits mounts, so only the owned disk inventory is projected separately here.
+// omits mounts, so the explicitly owned or external inventory is projected here.
 // Restored roots have no configured size: a verified full snapshot supplies that
 // proof, retained as a label only after inspecting the restored target.
 func qualifyConfiguration(config wire.Config, compute wire.Compute, raw string, inheritedRoot bool) error {
@@ -45,6 +52,7 @@ func qualifyConfiguration(config wire.Config, compute wire.Compute, raw string,
 	var inventory struct {
 		Mounts []struct {
 			Type    string `json:"type"`
+			Host    string `json:"host"`
 			Guest   string `json:"guest"`
 			Storage struct {
 				Kind        string `json:"kind"`
@@ -56,6 +64,24 @@ func qualifyConfiguration(config wire.Config, compute wire.Compute, raw string,
 		return sandbox.ErrInvalid
 	}
 	mount := inventory.Mounts[0]
+	if config.ExternalWorkspace != (actual.Labels[workspaceModeLabel] == "external") {
+		return sandbox.ErrInvalid
+	}
+	switch actual.Labels[workspaceModeLabel] {
+	case "external":
+		id, err := uuid.Parse(actual.Labels[workspaceObjectLabel])
+		path := actual.Labels[workspacePathLabel]
+		if err != nil || id == uuid.Nil || id.String() != actual.Labels[workspaceObjectLabel] || !filepath.IsAbs(path) || filepath.Clean(path) != path || mount.Type != "Bind" || mount.Guest != "/environment" || mount.Host != path {
+			return sandbox.ErrInvalid
+		}
+		return nil
+	case "owned":
+		if actual.Labels[workspaceObjectLabel] != "" || actual.Labels[workspacePathLabel] != "" || config.EnvironmentDiskMiB == 0 {
+			return sandbox.ErrInvalid
+		}
+	default:
+		return sandbox.ErrInvalid
+	}
 	if mount.Type != "Owned" || mount.Guest != "/environment" || mount.Storage.Kind != "disk" || mount.Storage.CapacityMiB != config.EnvironmentDiskMiB {
 		return sandbox.ErrInvalid
 	}
@@ -68,3 +94,18 @@ func qualifySnapshotResources(config wire.Config, labels map[string]string) erro
 	}
 	return nil
 }
+
+func workspaceLabels(workspace *wire.WorkspaceDirectory) map[string]string {
+	if workspace == nil {
+		return map[string]string{workspaceModeLabel: "owned"}
+	}
+	return map[string]string{workspaceModeLabel: "external", workspaceObjectLabel: workspace.ObjectID, workspacePathLabel: workspace.Path}
+}
+func qualifyWorkspace(labels map[string]string, workspace *wire.WorkspaceDirectory) error {
+	for _, key := range []string{workspaceModeLabel, workspaceObjectLabel} {
+		if labels[key] != workspaceLabels(workspace)[key] {
+			return sandbox.ErrOwnership
+		}
+	}
+	return nil
+}
diff --git a/services/core/tools/microsandbox-provider/deployment_test.go b/services/core/tools/microsandbox-provider/deployment_test.go
index ecd2f0b9f..ed68e8678 100644
--- a/services/core/tools/microsandbox-provider/deployment_test.go
+++ b/services/core/tools/microsandbox-provider/deployment_test.go
@@ -15,6 +15,7 @@ import (
 func deploymentFixture() (wire.Config, map[string]any) {
 	config := wire.Config{Image: "runtime@sha256:" + strings.Repeat("a", 64), CPUs: 2, MemoryMiB: 2048, RootDiskMiB: 8192, EnvironmentDiskMiB: 4096}
 	actual := map[string]any{
+		"labels":    map[string]string{workspaceModeLabel: "owned"},
 		"image":     map[string]any{"Oci": map[string]any{"reference": config.Image, "root_disk": map[string]any{"kind": "managed", "size_mib": 8192}}},
 		"resources": map[string]any{"cpus": 2, "max_cpus": 2, "memory_mib": 2048, "max_memory_mib": 2048},
 		"mounts":    []any{map[string]any{"type": "Owned", "guest": "/environment", "storage": map[string]any{"kind": "disk", "capacity_mib": 4096}}},
@@ -54,7 +55,7 @@ func TestRestoredRootRequiresVerifiedInheritedProof(t *testing.T) {
 	actual["image"].(map[string]any)["Oci"].(map[string]any)["root_disk"].(map[string]any)["size_mib"] = nil
 	compute := wire.Compute{RestoredFrom: &wire.SnapshotIdentity{ID: "verified-parent"}}
 	for _, proof := range []string{"", "foreign", resourceProof(config)} {
-		actual["labels"] = map[string]string{resourceProofLabel: proof}
+		actual["labels"] = map[string]string{workspaceModeLabel: "owned", resourceProofLabel: proof}
 		raw, _ := json.Marshal(actual)
 		err := qualifyConfiguration(config, compute, string(raw), false)
 		if (proof == resourceProof(config)) != (err == nil) {
@@ -73,6 +74,7 @@ func TestSnapshotProofBindsResourcesWithoutChangingCleanupOwnership(t *testing.T
 	config, actual := deploymentFixture()
 	ref := sandbox.Reference{TenantID: "tenant", EnvironmentID: "environment", AllocationID: "allocation"}
 	labels := wire.Labels(config, ref)
+	labels[workspaceModeLabel] = "owned"
 	labels[resourceProofLabel] = resourceProof(config)
 	if err := qualifySnapshotResources(config, labels); err != nil {
 		t.Fatal(err)
diff --git a/services/core/tools/microsandbox-provider/lock_test.go b/services/core/tools/microsandbox-provider/lock_test.go
index 7102a5bdf..46c93595f 100644
--- a/services/core/tools/microsandbox-provider/lock_test.go
+++ b/services/core/tools/microsandbox-provider/lock_test.go
@@ -5,9 +5,12 @@ package main
 import (
 	"context"
 	"errors"
+	"github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox"
 	wire "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/microsandbox"
+	sdk "github.com/superradcompany/microsandbox/sdk/go"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 	"time"
 )
@@ -23,17 +26,17 @@ func TestAllocationLockSurvivesCallerDeadlineUntilExplicitSettlement(t *testing.
 	waiting.Deadline = time.Now().Add(40 * time.Millisecond)
 	if next, e := allocationLock(waiting); !errors.Is(e, context.DeadlineExceeded) {
 		if next != nil {
-			next()
+			next.Close()
 		}
 		t.Fatalf("second lifecycle entered: %v", e)
 	}
-	release()
+	release.Close()
 	q.Deadline = time.Now().Add(time.Second)
 	release, e = allocationLock(q)
 	if e != nil {
 		t.Fatal(e)
 	}
-	release()
+	release.Close()
 }
 func TestLockDirectoryCannotRedirectIntoAnotherHome(t *testing.T) {
 	home := t.TempDir()
@@ -46,3 +49,147 @@ func TestLockDirectoryCannotRedirectIntoAnotherHome(t *testing.T) {
 		t.Fatal("symlink lock directory accepted")
 	}
 }
+
+func initialInfoRequest(t *testing.T) wire.Request {
+	t.Helper()
+	config, _ := deploymentFixture()
+	config.InstallationID = "11111111-1111-4111-8111-111111111111"
+	config.HelperPath, config.RuntimePath, config.FirmwarePath = "/helper", "/runtime", "/firmware"
+	config.RuntimeHome = t.TempDir()
+	config.RuntimeSHA256, config.FirmwareSHA256 = strings.Repeat("a", 64), strings.Repeat("b", 64)
+	config.Network = wire.NetworkPolicy{DefaultEgress: "deny", DefaultIngress: "deny"}
+	ref := sandbox.Reference{TenantID: "22222222-2222-4222-8222-222222222222", EnvironmentID: "33333333-3333-4333-8333-333333333333", AllocationID: "44444444-4444-4444-8444-444444444444"}
+	return wire.Request{Version: wire.ProtocolVersion, Operation: "initial_info", Config: config, Reference: ref,
+		Compute: wire.Compute{Name: wire.Name(config, ref, 0)}, Deadline: time.Now().Add(5 * time.Second)}
+}
+
+func TestInitialAbsencePreventsLateCreateAndSurvivesReopen(t *testing.T) {
+	q := initialInfoRequest(t)
+	guard, err := allocationLock(q)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := guard.admitCreate(); err != nil {
+		t.Fatal("new allocation refused", err)
+	}
+	// A detached Create helper can still be alive before acquiring the lock,
+	// including across node restart and before its original deadline expires.
+	late := make(chan error, 1)
+	started := make(chan struct{})
+	go func() {
+		close(started)
+		create, err := allocationLock(q)
+		if err == nil {
+			err = create.admitCreate()
+			create.Close()
+		}
+		late <- err
+	}()
+	<-started
+	out, err := guard.settleInitialAbsence(q, &sdk.Error{Kind: sdk.ErrSandboxNotFound})
+	if err != nil || !out.CreateSettled || out.State == nil || *out.State != (wire.State{Compute: q.Compute, Status: "absent"}) {
+		t.Fatal("no exact absence receipt", out, err)
+	}
+	guard.Close()
+	if err := <-late; !errors.Is(err, sandbox.ErrInvalid) {
+		t.Fatal("late Create admitted", err)
+	}
+	// A fresh descriptor has no in-memory knowledge of the observing process.
+	reopened, err := allocationLock(q)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer reopened.Close()
+	if err := reopened.admitCreate(); !errors.Is(err, sandbox.ErrInvalid) {
+		t.Fatal("restart lost admission closure", err)
+	}
+}
+
+func TestOnlyExactInitialNativeAbsenceClosesAdmission(t *testing.T) {
+	for _, name := range []string{"ordinary inspect", "foreign name", "known ID", "restored", "later generation", "bare not found", "unknown"} {
+		t.Run(name, func(t *testing.T) {
+			q := initialInfoRequest(t)
+			guard, err := allocationLock(q)
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer guard.Close()
+			nativeErr := error(&sdk.Error{Kind: sdk.ErrSandboxNotFound})
+			switch name {
+			case "ordinary inspect":
+				q.Operation = "inspect"
+			case "foreign name":
+				q.Compute.Name = "foreign"
+			case "known ID":
+				q.Compute.ID = "native:id"
+			case "restored":
+				q.Compute.RestoredFrom = &wire.SnapshotIdentity{}
+			case "later generation":
+				q.Compute.Generation = 1
+			case "bare not found":
+				nativeErr = sandbox.ErrNotFound
+			case "unknown":
+				nativeErr = wire.ErrUnconfirmed
+			}
+			out, err := guard.settleInitialAbsence(q, nativeErr)
+			if err == nil || out.CreateSettled {
+				t.Fatal("unproven absence settled", out, err)
+			}
+			if err := guard.admitCreate(); err != nil {
+				t.Fatal("observation closed admission", err)
+			}
+		})
+	}
+}
+
+func TestInvalidOrUnwritableAdmissionStateFailsClosed(t *testing.T) {
+	for _, content := range []string{"c", "closed", "closed\nextra", "unknown"} {
+		t.Run(content, func(t *testing.T) {
+			q := initialInfoRequest(t)
+			guard, err := allocationLock(q)
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer guard.Close()
+			if _, err := guard.file.WriteAt([]byte(content), 0); err != nil {
+				t.Fatal(err)
+			}
+			if err := guard.admitCreate(); err == nil {
+				t.Fatal("invalid marker admitted Create")
+			}
+			out, err := guard.settleInitialAbsence(q, &sdk.Error{Kind: sdk.ErrSandboxNotFound})
+			if err == nil || out.CreateSettled {
+				t.Fatal("invalid marker settled", out, err)
+			}
+		})
+	}
+	t.Run("sync error", func(t *testing.T) {
+		q := initialInfoRequest(t)
+		file, err := os.OpenFile("/dev/null", os.O_RDWR, 0)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer file.Close()
+		out, err := (&allocationGuard{file: file}).settleInitialAbsence(q, &sdk.Error{Kind: sdk.ErrSandboxNotFound})
+		if err == nil || out.CreateSettled {
+			t.Fatal("failed marker sync settled", out, err)
+		}
+	})
+	t.Run("write error", func(t *testing.T) {
+		q := initialInfoRequest(t)
+		guard, err := allocationLock(q)
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer guard.Close()
+		readonly, err := os.Open(guard.file.Name())
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer readonly.Close()
+		out, err := (&allocationGuard{file: readonly}).settleInitialAbsence(q, &sdk.Error{Kind: sdk.ErrSandboxNotFound})
+		if err == nil || out.CreateSettled {
+			t.Fatal("failed marker write settled", out, err)
+		}
+	})
+}
diff --git a/services/core/tools/microsandbox-provider/main.go b/services/core/tools/microsandbox-provider/main.go
index 8d9adb29a..c16a7d8da 100644
--- a/services/core/tools/microsandbox-provider/main.go
+++ b/services/core/tools/microsandbox-provider/main.go
@@ -54,16 +54,25 @@ func serve(input io.Reader) wire.Response {
 		out.ErrorCode = "unconfirmed"
 		return out
 	}
-	release, err := allocationLock(q)
+	lock, err := allocationLock(q)
 	if err != nil {
 		out.ErrorCode = "unconfirmed"
 		return out
 	}
-	defer release()
+	defer lock.Close()
 	// Lifecycle calls deliberately retain the flock until the SDK has settled.
 	// Cancelling an FFI wait does not prove the underlying operation stopped.
 	b := backend{q: q}
+	if q.Operation == "create" {
+		if err := lock.admitCreate(); err != nil {
+			out.ErrorCode = code(err)
+			return out
+		}
+	}
 	out, err = b.run(context.Background())
+	if q.Operation == "initial_info" && sdk.IsKind(err, sdk.ErrSandboxNotFound) {
+		out, err = lock.settleInitialAbsence(q, err)
+	}
 	out.Version = wire.ProtocolVersion
 	if err != nil {
 		out.ErrorCode = code(err)
@@ -88,7 +97,78 @@ func code(err error) string {
 		return "unconfirmed"
 	}
 }
-func allocationLock(q wire.Request) (func(), error) {
+
+type allocationGuard struct{ file *os.File }
+
+func (g *allocationGuard) Close() {
+	_ = syscall.Flock(int(g.file.Fd()), syscall.LOCK_UN)
+	_ = g.file.Close()
+}
+
+// Empty admits the initial Create. The terminal marker is never removed;
+// any other nonempty content also prevents creation after an incomplete write.
+func (g *allocationGuard) admissionClosed() (bool, error) {
+	if _, err := g.file.Seek(0, io.SeekStart); err != nil {
+		return false, err
+	}
+	data, err := io.ReadAll(io.LimitReader(g.file, 8))
+	if err != nil {
+		return false, err
+	}
+	switch string(data) {
+	case "":
+		return false, nil
+	case "closed\n":
+		return true, nil
+	default:
+		return false, sandbox.ErrOwnership
+	}
+}
+
+func (g *allocationGuard) admitCreate() error {
+	closed, err := g.admissionClosed()
+	if err != nil {
+		return err
+	}
+	if closed {
+		return sandbox.ErrInvalid
+	}
+	return nil
+}
+
+// Only the explicit initial observation can close admission. The caller holds
+// this allocation's flock and has just received typed native absence.
+func (g *allocationGuard) settleInitialAbsence(q wire.Request, nativeErr error) (wire.Response, error) {
+	if q.Operation != "initial_info" || wire.ValidateRequest(q) != nil || !sdk.IsKind(nativeErr, sdk.ErrSandboxNotFound) {
+		return wire.Response{}, sandbox.ErrInvalid
+	}
+	if _, err := g.admissionClosed(); err != nil {
+		return wire.Response{}, err
+	}
+	if _, err := g.file.WriteAt([]byte("closed\n"), 0); err != nil {
+		return wire.Response{}, err
+	}
+	if err := g.file.Sync(); err != nil {
+		return wire.Response{}, err
+	}
+	// The directory entry must survive restart even when this observation was
+	// the first helper to open the allocation lock.
+	lockDir := filepath.Dir(g.file.Name())
+	for _, path := range []string{lockDir, filepath.Dir(lockDir)} {
+		dir, err := os.Open(path)
+		if err != nil {
+			return wire.Response{}, err
+		}
+		err = dir.Sync()
+		_ = dir.Close()
+		if err != nil {
+			return wire.Response{}, err
+		}
+	}
+	return wire.Response{State: &wire.State{Compute: q.Compute, Status: "absent"}, CreateSettled: true}, nil
+}
+
+func allocationLock(q wire.Request) (*allocationGuard, error) {
 	dir := filepath.Join(q.Config.RuntimeHome, "oac-locks")
 	if e := os.MkdirAll(dir, 0700); e != nil {
 		return nil, e
@@ -113,7 +193,12 @@ func allocationLock(q wire.Request) (func(), error) {
 		}
 		e = syscall.Flock(fd, syscall.LOCK_EX|syscall.LOCK_NB)
 		if e == nil {
-			return func() { _ = syscall.Flock(fd, syscall.LOCK_UN); _ = f.Close() }, nil
+			guard := &allocationGuard{file: f}
+			if !time.Now().Before(q.Deadline) {
+				guard.Close()
+				return nil, context.DeadlineExceeded
+			}
+			return guard, nil
 		}
 		if e != syscall.EWOULDBLOCK && e != syscall.EAGAIN {
 			f.Close()
diff --git a/services/core/tools/microsandbox-provider/observed_test.go b/services/core/tools/microsandbox-provider/observed_test.go
index 1a23c205f..3acbb2baa 100644
--- a/services/core/tools/microsandbox-provider/observed_test.go
+++ b/services/core/tools/microsandbox-provider/observed_test.go
@@ -41,6 +41,7 @@ func TestInitialIdentityNeedsAllLabelsAndBootstrapReceipt(t *testing.T) {
 	config := wire.Config{InstallationID: "installation"}
 	ref := sandbox.Reference{TenantID: "tenant", EnvironmentID: "environment", AllocationID: "allocation"}
 	labels := wire.Labels(config, ref)
+	labels[workspaceModeLabel] = "owned"
 	labels[bootstrapLabel] = "pending"
 	raw, _ := json.Marshal(map[string]any{"labels": labels})
 	state, e := qualifyCompute(config, ref, wire.Compute{ID: "local:4"}, "local:4", "running", string(raw))
diff --git a/services/core/tools/microsandbox-provider/restore_completion.go b/services/core/tools/microsandbox-provider/restore_completion.go
index be4a590b0..94e6ffe1c 100644
--- a/services/core/tools/microsandbox-provider/restore_completion.go
+++ b/services/core/tools/microsandbox-provider/restore_completion.go
@@ -14,12 +14,45 @@ import (
 // resume has verified the original full snapshot and its resource proof before
 // this step. ObserveOnly may finish this derived receipt, never repeat Restore.
 func (b backend) finishRestore(ctx context.Context, target wire.Compute) (wire.State, error) {
+	owned, partial, err := b.inspectOwned(ctx, target)
+	if err != nil {
+		return partial, err
+	}
+	live, err := owned.Connect(ctx)
+	if err != nil {
+		return partial, err
+	}
+	defer live.Detach(context.Background())
+	warnings, err := live.RestoreWarnings(ctx)
+	if err != nil || len(warnings) != 0 {
+		return partial, wire.ErrUnconfirmed
+	}
 	return finishRestoredTarget(b.q.Config, target, func(exact wire.Compute) (wire.State, string, error) {
 		h, state, err := b.inspectOwned(ctx, exact)
 		if err != nil {
 			return state, "", err
 		}
-		return state, h.ConfigJSON(), nil
+		raw := h.ConfigJSON()
+		var actual map[string]any
+		if json.Unmarshal([]byte(raw), &actual) != nil {
+			return state, "", sandbox.ErrInvalid
+		}
+		labels, _ := actual["labels"].(map[string]any)
+		if labels == nil {
+			labels = map[string]any{}
+			actual["labels"] = labels
+		}
+		for key, value := range workspaceLabels(b.q.Workspace) {
+			if labels[resourceProofLabel] != nil && labels[resourceProofLabel] != "" && labels[key] != value {
+				return state, "", sandbox.ErrOwnership
+			}
+			if current, exists := labels[key]; exists && current != value {
+				return state, "", sandbox.ErrOwnership
+			}
+			labels[key] = value
+		}
+		projected, _ := json.Marshal(actual)
+		return state, string(projected), nil
 	}, func(exact wire.Compute) error {
 		// Modify is name-based in the pinned SDK. The allocation flock and
 		// ownership checks before and after it retain the exact target fence.
@@ -27,7 +60,9 @@ func (b backend) finishRestore(ctx context.Context, target wire.Compute) (wire.S
 		if err != nil {
 			return err
 		}
-		_, err = h.Modify(ctx, sdk.ModifyOptions{Labels: map[string]string{resourceProofLabel: resourceProof(b.q.Config)}, Policy: sdk.ModificationPolicyNextStart})
+		labels := workspaceLabels(b.q.Workspace)
+		labels[resourceProofLabel] = resourceProof(b.q.Config)
+		_, err = h.Modify(ctx, sdk.ModifyOptions{Labels: labels, Policy: sdk.ModificationPolicyNextStart})
 		return err
 	})
 }
@@ -37,41 +72,41 @@ func (b backend) finishRestore(ctx context.Context, target wire.Compute) (wire.S
 func finishRestoredTarget(config wire.Config, target wire.Compute, readOwned func(wire.Compute) (wire.State, string, error), writeProof func(wire.Compute) error) (wire.State, error) {
 	state, raw, err := readOwned(target)
 	if err != nil {
-		return wire.State{}, err
+		return state, err
 	}
 	if state.Compute.ID == "" || state.Compute.RestoredFrom == nil || state.Status != "running" || !state.BootstrapComplete {
-		return wire.State{}, wire.ErrUnconfirmed
+		return state, wire.ErrUnconfirmed
 	}
 	// Pin the native ID discovered for the precommitted target name. Every
 	// subsequent read and write must still refer to this incarnation.
 	target = state.Compute
 	if err := qualifyConfiguration(config, target, raw, true); err != nil {
-		return wire.State{}, err
+		return state, err
 	}
 	var actual struct {
 		Labels map[string]string `json:"labels"`
 	}
 	if json.Unmarshal([]byte(raw), &actual) != nil {
-		return wire.State{}, sandbox.ErrInvalid
+		return state, sandbox.ErrInvalid
 	}
 	proof := actual.Labels[resourceProofLabel]
 	if proof != "" && proof != resourceProof(config) {
-		return wire.State{}, sandbox.ErrInvalid
+		return state, sandbox.ErrInvalid
 	}
 	if proof == "" {
 		if err := writeProof(target); err != nil {
-			return wire.State{}, err
+			return state, err
 		}
 	}
 	state, raw, err = readOwned(target)
 	if err != nil {
-		return wire.State{}, err
+		return state, err
 	}
 	if err := qualifyConfiguration(config, target, raw, false); err != nil {
-		return wire.State{}, err
+		return state, err
 	}
 	if state.Status != "running" || !state.BootstrapComplete {
-		return wire.State{}, wire.ErrUnconfirmed
+		return state, wire.ErrUnconfirmed
 	}
 	return state, nil
 }
diff --git a/services/core/tools/microsandbox-provider/restore_completion_test.go b/services/core/tools/microsandbox-provider/restore_completion_test.go
index 38cb5c4a3..2dbd5ec55 100644
--- a/services/core/tools/microsandbox-provider/restore_completion_test.go
+++ b/services/core/tools/microsandbox-provider/restore_completion_test.go
@@ -17,7 +17,7 @@ func TestRestoreCompletionRecoversOnlyDerivedProof(t *testing.T) {
 			config, actual := deploymentFixture()
 			actual["image"].(map[string]any)["Oci"].(map[string]any)["root_disk"].(map[string]any)["size_mib"] = nil
 			actual["snapshot_parent"] = "verified-snapshot"
-			labels := map[string]string{}
+			labels := map[string]string{workspaceModeLabel: "owned"}
 			actual["labels"] = labels
 			target := wire.Compute{Name: "restored-target", Generation: 1, RestoredFrom: &wire.SnapshotIdentity{ID: "verified-snapshot"}}
 			reads, writes := 0, 0
@@ -42,7 +42,7 @@ func TestRestoreCompletionRecoversOnlyDerivedProof(t *testing.T) {
 				labels[resourceProofLabel] = resourceProof(config)
 				return nil
 			}
-			if _, err := finishRestoredTarget(config, target, readOwned, writeProof); !errors.Is(err, interrupted) {
+			if partial, err := finishRestoredTarget(config, target, readOwned, writeProof); !errors.Is(err, interrupted) || partial.Compute.ID != "local:restored" {
 				t.Fatal("interrupted write became successful restore", err)
 			}
 			state, err := finishRestoredTarget(config, target, readOwned, writeProof)
@@ -66,7 +66,7 @@ func TestRestoreCompletionRejectsUnverifiedTargets(t *testing.T) {
 			config, actual := deploymentFixture()
 			actual["image"].(map[string]any)["Oci"].(map[string]any)["root_disk"].(map[string]any)["size_mib"] = nil
 			actual["snapshot_parent"] = "verified-snapshot"
-			labels := map[string]string{}
+			labels := map[string]string{workspaceModeLabel: "owned"}
 			actual["labels"] = labels
 			target := wire.Compute{Name: "restored-target", ID: "local:restored", Generation: 1, RestoredFrom: &wire.SnapshotIdentity{ID: "verified-snapshot"}}
 			actualID, status := target.ID, "running"
@@ -126,7 +126,7 @@ func TestRestoreCompletionPreservesInspectionErrors(t *testing.T) {
 	for _, failedRead := range []int{1, 2} {
 		config, actual := deploymentFixture()
 		actual["snapshot_parent"] = "verified-snapshot"
-		actual["labels"] = map[string]string{resourceProofLabel: resourceProof(config)}
+		actual["labels"] = map[string]string{workspaceModeLabel: "owned", resourceProofLabel: resourceProof(config)}
 		target := wire.Compute{Name: "restored-target", ID: "local:restored", Generation: 1, RestoredFrom: &wire.SnapshotIdentity{ID: "verified-snapshot"}}
 		unavailable := errors.New("native inspection unavailable")
 		reads := 0
diff --git a/services/core/tools/microsandbox-provider/snapshot.go b/services/core/tools/microsandbox-provider/snapshot.go
index 75916c102..6cb6ee539 100644
--- a/services/core/tools/microsandbox-provider/snapshot.go
+++ b/services/core/tools/microsandbox-provider/snapshot.go
@@ -4,6 +4,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"strconv"
 
@@ -95,9 +96,19 @@ func (b backend) suspend(ctx context.Context, q wire.SuspendRequest) (wire.State
 		if err = source.PauseWithGuestFlush(ctx, sdk.GuestFlushSkip); err != nil {
 			return wire.State{}, err
 		}
+		labels := b.snapshotLabels(q.OperationID, q.Source)
+		var captured struct {
+			Labels map[string]string `json:"labels"`
+		}
+		if json.Unmarshal([]byte(source.ConfigJSON()), &captured) != nil {
+			return wire.State{}, sandbox.ErrOwnership
+		}
+		for _, key := range []string{workspaceModeLabel, workspaceObjectLabel, workspacePathLabel} {
+			labels[key] = captured.Labels[key]
+		}
 		_, err = sdk.Snapshot.Create(ctx, sdk.SnapshotCreateOptions{
 			Name: "s-" + q.OperationID, Group: wire.Name(b.q.Config, b.q.Reference, 0), FromSandbox: q.Source.Name,
-			Full: true, RecordIntegrity: true, GuestFlush: sdk.GuestFlushSkip, Labels: b.snapshotLabels(q.OperationID, q.Source)})
+			Full: true, RecordIntegrity: true, GuestFlush: sdk.GuestFlushSkip, Labels: labels})
 		if err != nil {
 			return wire.State{}, err
 		}
@@ -148,6 +159,9 @@ func (b backend) resume(ctx context.Context, q wire.ResumeRequest) (wire.State,
 	if e = qualifySnapshotResources(b.q.Config, artifact.Labels()); e != nil {
 		return wire.State{}, e
 	}
+	if err := qualifyWorkspace(artifact.Labels(), b.q.Workspace); err != nil {
+		return wire.State{}, err
+	}
 	_, _, e = b.inspectOwned(ctx, q.Target)
 	if e == nil {
 		return b.finishRestore(ctx, q.Target)
@@ -169,7 +183,11 @@ func (b backend) resume(ctx context.Context, q wire.ResumeRequest) (wire.State,
 	} else if !sdk.IsKind(err, sdk.ErrSandboxNotFound) {
 		return wire.State{}, err
 	}
-	live, e := sdk.RestoreSandbox(ctx, artifact, q.Target.Name, sdk.WithRestoreNetworkPolicy(b.network()))
+	restore := sdk.RestoreConfig{NetworkPolicy: b.network(), ExternalMountPolicy: sdk.ExternalMountStrict}
+	if b.q.Workspace != nil {
+		restore.Volumes = map[string]sdk.MountConfig{"/environment": sdk.Mount.Bind(b.q.Workspace.Path, sdk.MountOptions{})}
+	}
+	live, e := sdk.RestoreSandbox(ctx, artifact, q.Target.Name, sdk.WithRestoreConfig(restore))
 	if e != nil {
 		return wire.State{}, e
 	}
@@ -180,10 +198,10 @@ func (b backend) resume(ctx context.Context, q wire.ResumeRequest) (wire.State,
 	state, err := b.finishRestore(ctx, target)
 	detachErr := live.Detach(context.Background())
 	if err != nil {
-		return wire.State{}, err
+		return state, err
 	}
 	if detachErr != nil {
-		return wire.State{}, detachErr
+		return state, detachErr
 	}
 	return state, nil
 }
diff --git a/services/core/tools/microsandbox-provider/snapshot_observation_test.go b/services/core/tools/microsandbox-provider/snapshot_observation_test.go
index 88ea625db..cf2a80b07 100644
--- a/services/core/tools/microsandbox-provider/snapshot_observation_test.go
+++ b/services/core/tools/microsandbox-provider/snapshot_observation_test.go
@@ -19,9 +19,10 @@ func TestCapturedSnapshotObservationDoesNotRequireExecutionQualification(t *test
 			ref := sandbox.Reference{TenantID: "tenant", EnvironmentID: "environment", AllocationID: "allocation"}
 			source := wire.Compute{Name: "original", ID: "local:original"}
 			labels := wire.Labels(config, ref)
+			labels[workspaceModeLabel] = "owned"
 			labels[bootstrapLabel] = "complete"
 			actual["labels"] = labels
-			snapshotLabels := map[string]string{resourceProofLabel: resourceProof(config)}
+			snapshotLabels := map[string]string{workspaceModeLabel: "owned", resourceProofLabel: resourceProof(config)}
 			switch drift {
 			case "cpu":
 				actual["resources"].(map[string]any)["cpus"] = 1
diff --git a/services/core/tools/microsandbox-provider/workspace_test.go b/services/core/tools/microsandbox-provider/workspace_test.go
new file mode 100644
index 000000000..ea726d3f1
--- /dev/null
+++ b/services/core/tools/microsandbox-provider/workspace_test.go
@@ -0,0 +1,56 @@
+//go:build linux
+
+package main
+
+import (
+	"encoding/json"
+	wire "github.com/MiniMax-AI/OpenAgentCore/services/core/internal/sandbox/microsandbox"
+	"testing"
+)
+
+func TestExternalEnvironmentQualificationRequiresExplicitOwnership(t *testing.T) {
+	for _, fault := range []string{"match", "missing mode", "foreign path", "owned mount", "wrong guest", "missing object"} {
+		t.Run(fault, func(t *testing.T) {
+			config, actual := deploymentFixture()
+			config.EnvironmentDiskMiB = 0
+			config.ExternalWorkspace = true
+			workspace := &wire.WorkspaceDirectory{Path: "/resolved/environment", ObjectID: "88888888-8888-4888-8888-888888888888"}
+			labels := workspaceLabels(workspace)
+			actual["labels"] = labels
+			mount := map[string]any{"type": "Bind", "host": workspace.Path, "guest": "/environment"}
+			actual["mounts"] = []any{mount}
+			switch fault {
+			case "missing mode":
+				delete(labels, workspaceModeLabel)
+			case "foreign path":
+				mount["host"] = "/foreign"
+			case "owned mount":
+				mount["type"] = "Owned"
+			case "wrong guest":
+				mount["guest"] = "/environment/workspace"
+			case "missing object":
+				delete(labels, workspaceObjectLabel)
+			}
+			raw, _ := json.Marshal(actual)
+			err := qualifyConfiguration(config, wire.Compute{}, string(raw), false)
+			if (err == nil) != (fault == "match") {
+				t.Fatal(fault, err)
+			}
+		})
+	}
+}
+func TestSnapshotWorkspaceIdentityAllowsReresolvedDirectory(t *testing.T) {
+	workspace := &wire.WorkspaceDirectory{Path: "/old", ObjectID: "88888888-8888-4888-8888-888888888888"}
+	labels := workspaceLabels(workspace)
+	workspace.Path = "/new"
+	if err := qualifyWorkspace(labels, workspace); err != nil {
+		t.Fatal(err)
+	}
+	if err := qualifyWorkspace(labels, nil); err == nil {
+		t.Fatal("external checkpoint accepted owned mode")
+	}
+	workspace.ObjectID = "99999999-9999-4999-8999-999999999999"
+	if err := qualifyWorkspace(labels, workspace); err == nil {
+		t.Fatal("foreign object accepted")
+	}
+}

From f90180de66bbc9c6bc7ba61dff4e0b5622078085 Mon Sep 17 00:00:00 2001
From: sam <sam@192.168.1.170>
Date: Sat, 10 Oct 2026 23:16:49 +0800
Subject: [PATCH 60/60] fix: align beta template build and translated lifecycle
 docs

---
 .github/workflows/e2b-template.yml |  1 -
 docs/zh/sandbox-provider.md        | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/e2b-template.yml b/.github/workflows/e2b-template.yml
index 44fce7615..9a0100767 100644
--- a/.github/workflows/e2b-template.yml
+++ b/.github/workflows/e2b-template.yml
@@ -125,7 +125,6 @@ jobs:
           revision="$(git rev-parse HEAD)"
           for harness in codex claude mcode; do
             builder="scripts/build-$harness-runtime.sh"
-            if [[ "$harness" == codex ]]; then builder=scripts/build-agents-runtime.sh; fi
             AGENTS_RUNTIME_BUILD_DIR="$output_root/$harness" bash "$builder"
             docker build --platform linux/amd64 --tag "oac-e2b-$harness:$revision" "$output_root/$harness"
             image="$(docker image inspect --format '{{.Id}}' "oac-e2b-$harness:$revision")"
diff --git a/docs/zh/sandbox-provider.md b/docs/zh/sandbox-provider.md
index 45d747dbf..3a6eb2e18 100644
--- a/docs/zh/sandbox-provider.md
+++ b/docs/zh/sandbox-provider.md
@@ -91,7 +91,7 @@ Microsandbox 在返回创建不存在回执前永久关闭初始 Create 准入
 
 `ErrInvalid`、`ErrOwnership`、`ErrExists`、`ErrNotFound`、`ErrComputeUnconfirmed` 和 `ErrCommandUnconfirmed` 保持其定义含义。未分类原生或 transport error 表示未知，不授权重试 mutation。Core 不将 provider diagnostics 读作生命周期事实，也不暴露原生错误文本或凭据；node transport 将错误映射为固定 code，直接 SDK 细节保持私有。
 
-暂停支持增加精确的 `Compute` 代次和不透明的 `RetainedState` 收据。原样持久化其身份与操作 ID。`ReconcileOnly` 观察原始尝试并可完成它拥有的清理，但不会开始另一次捕获或恢复。`ResumeCompute` 仅解冻保留的源实例，绝不冷启动已停止的源实例。清理针对精确计算实例和保留状态。声明支持前请阅读[共享暂停契约](#suspension)。
+暂停支持增加精确的 `Compute` 代次、名称和 ID，以及不透明的 `RetainedState` 收据。原样持久化操作 ID 和 Provider 保留状态的来源。暂停或恢复中的 `ReconcileOnly` 观察原始尝试，不会开始另一次捕获或恢复。`ResumeCompute` 仅解冻保留的源实例，绝不冷启动已停止的源实例。清理针对精确计算实例和保留状态，而非当前恰好同名的实例。声明支持前请阅读 [`runtime_compute.go`](https://github.com/MiniMax-AI/OpenAgentCore/blob/main/services/core/internal/execution/runtime_compute.go) 及其失败测试。
 
 ### 四个独立就绪事实 {#four-distinct-readiness-facts}
 
@@ -198,17 +198,17 @@ placement 自动完成：environment-to-node placement 与 Session 创建及其
 
 `ResumeRequest.Workspace` 携带 allocation 独立拥有的文件系统绑定；Core 在恢复前获取 ready 绑定。源实例必须已释放活跃执行能力，目标才可成为写者。adapter 在原生副作用前校验绑定；不支持独立文件系统的 adapter 拒绝非空绑定。`DeleteRetained` 仅删除 adapter 的计算保留状态，绝不删除 workspace。显式 Session 删除先完成 compute 清理，再删除独立存储，恢复期间保持单一活跃写者。
 
-Core 对支持暂停的 Provider 应用固定策略：空闲 300 秒后暂停，保留状态期限为 86400 秒；部署的 [`suspension`](../../contracts/agents-api/zh/sandbox-deployment.md#safe-response) 返回这些值。
+Core 对所有声明暂停支持的 Provider 应用统一固定策略：工作空闲 5 分钟（300 秒）后暂停，保留状态期限为 24 小时（86400 秒）；部署的 [`suspension`](../../contracts/agents-api/zh/sandbox-deployment.md#safe-response) 返回这些值。Core 暂停已经初始化的 Environment，包括尚未执行 Turn 的 Environment，前提是没有 root 或 Subagent Turn 排队、执行或等待，没有输入、文件操作或初始化待处理，且真实活动已空闲达到该时长。Core 在同一事务中使用数据库时钟记录 allocation 的初始化完成和 root 或 child 终结转换。候选筛选和持有 Session 锁的复查比较数据库经过时间与空闲时长，初始保留状态期限也锚定同一数据库观测，因此 Core 与数据库主机的时钟无需一致。公开历史中的原生完成时间戳保持不变，但不驱动空闲准入，心跳也不重置活动时间。确认计划暂停前，daemon 关闭准入并排空原生清理、输出收据和文件工作。
 
-初始化完成的 Environment 即使尚未执行 Turn，也会在没有根或 Subagent Turn、输入或文件操作待处理，且真实活动已超过部署空闲时长时暂停。共享数据库时钟、Session 锁和生命周期租约串行化准入；心跳从不重置空闲时间。排队工作和实时 Files 访问请求唤醒；历史和已发布 artifact 不会。daemon 在确认静止前排空原生清理、收据和文件工作。确认丢失只授权精确源实例回滚，绝不授权新捕获。
+Worker 租约、Session 锁和每个 node 的 gate 负责所有 Provider 的暂停。新 Turn claim、文件写入意图和捕获准入在 Session 锁下串行化，共享计算阶段检查；新待处理工作取消捕获并唤醒同一源实例。正常准备在经过认证的恢复握手后等待计算阶段变为 running；待处理输入的提升与生命周期转换冲突时，输入保持 pending。计算阶段和经 revision 校验的收据存储在 allocation 中。Core 在副作用前持久化静止、捕获和恢复意图，仅新收据执行捕获或恢复；恢复流程观察精确尝试，不重试结果未知的创建、捕获或恢复。已消费的保留状态不会使运行中的代次回滚。删除、撤销和保留期到期始终优先于唤醒，直至最后的数据库 compare-and-swap；未知清理身份会一直保留，直到确认所属资源已不存在。已消费产物和旧计算实例会被删除，因此暂停循环不会累积可写磁盘链。
 
-完整声明的 SandboxProvider 操作组在直接和节点放置中使用同一生命周期。RetainedState 是绑定分配、源实例和操作的不透明 adapter 收据，其原生 Data 上限为 64 KiB；它不承诺快照语义。Core 从不解释原生 Data。Initial 和 NewCompute 规划精确逻辑实例而不分配资源；不同逻辑代次可保留相同原生 ID。GetCompute 仅观察。RenewCompute 为精确的运行实例续租而不唤醒它；公共运行路径在保持所有权或清除唤醒前先观察并续租。
+排队工作和实时 Environment 文件访问会唤醒暂停的 Environment；历史和已发布 Artifact 的读取不会唤醒。计划暂停在 daemon 连接上使用 Environment 与 suspension token。由 PID 和启动时间隔离的本地控制信号（`RunCommandCompute`）唤醒 parked daemon，daemon 在准入工作前重新认证。确认前的临时断连通过有界尝试和退避重试同一已准备好的暂停；永久认证或协议拒绝会将其关闭。Core 负责保留状态的到期期限，daemon 没有相应定时器。静止确认丢失时可以通过明确回滚解冻同一源实例，但不授权捕获。
 
-Suspend 负责原生资源释放，返回绑定的保留句柄、suspended 状态、ResourcesReleased 和 SuspendSettled 后，Core 才释放活跃容量。ReconcileOnly 禁止重放原始捕获或暂停，但允许完成由持久保留产物证明安全的 adapter 清理。无保留状态的结果只有在带有 SuspendSettled 且源实例处于可恢复的运行或暂停状态时才允许回滚。其他所有不确定结果均保留所有权并关闭准入。Core 从不在 Suspend 后无条件销毁源实例。
+`Suspend` 负责原生资源释放，返回绑定的保留句柄、suspended 状态、`ResourcesReleased` 和 `SuspendSettled` 后，Core 才释放活跃容量。`ReconcileOnly` 禁止重放原始捕获或暂停，但允许完成由持久保留产物证明安全的 adapter 清理。无保留状态的结果只有在带有 `SuspendSettled` 且源实例处于可恢复的运行或暂停状态时才允许回滚。其他所有不确定结果均保留所有权并关闭准入。Core 从不在 `Suspend` 后无条件销毁源实例。
 
-Resume 将保留状态恰好消费一次并恢复到预先提交的目标。恢复逻辑观察同一次尝试。Core 持久化 waking、认证并恢复 daemon、删除已消费的保留资源，然后提交 running 并准入工作。DeleteRetained 是幂等产物清理，会保留运行中的计算资源。清理失败会保持 waking 阶段，不能触发再次恢复。KillCompute 仍然是破坏性操作；清理旧代次时不得终止共享原生 ID 的较新活跃实例。
+`Resume` 将保留状态恰好消费一次并恢复到预先提交的目标。恢复逻辑观察同一次尝试。Core 持久化 `waking`、认证并恢复 daemon、删除已消费的保留资源，然后提交 `running` 并准入工作。`DeleteRetained` 是幂等产物清理，会保留运行中的计算资源。清理失败会保持 `waking` 阶段，不能触发再次恢复。`KillCompute` 仍然是破坏性操作；清理旧代次时不得终止共享原生 ID 的较新活跃实例。
 
-现有 Session 锁、生命周期租约、空闲规则、容量查询和清理顺序继续作为权威。每个尚未释放的分配都占用 max_retained，包括运行中的分配。每个分配在预留时都写入共享计算协议版本，包括暂停阶段为 disabled 的分配。激活会拒绝任何协议版本缺失或不同的未释放分配；升级前必须由旧版本完成普通清理。Session 历史保留。
+现有 Session 锁、生命周期租约、空闲规则、容量查询和清理顺序继续作为权威。每个尚未释放的分配都占用 `max_retained`，包括运行中的分配。每个分配在预留时都写入共享计算协议版本，包括暂停阶段为 `disabled` 的分配。激活会拒绝任何协议版本缺失或不同的未释放分配；升级前必须由旧版本完成普通清理。Session 历史保留。
 
 ### 重置与归档 {#reset-and-archive}